Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..003763e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,68 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Issue: Bug report
+
+Our project, as you've probably heard, is getting really popular and truth is we're getting a bit overwhelmed by the activity surrounding it. There are just too many issues for us to manage properly.
+
+**Do the checklist before filing an issue:**
+ - [ ] Have a usage question? Ask your question on  [Discuss Forum](https://discuss.erpnext.com). We use [Discuss Forum](https://discuss.erpnext.com) for usage question and GitHub for bugs.
+ - [ ] Can you replicate the issue? 
+ - [ ] Is this something you can debug and fix? Send a pull request! Bug fixes and documentation fixes are welcome
+
+**Describe the bug** :chart_with_downwards_trend: 
+A clear and concise description of what the bug is.
+
+**To Reproduce** :page_with_curl:
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior** :chart_with_upwards_trend:
+A clear and concise description of what you expected to happen.
+
+**Screenshots** :crystal_ball:
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):** :cyclone:
+ - OS:
+    - [ ] Linux
+    - [ ] macOS
+    - [ ] Windows
+    - [ ] Others? Please mention: 
+ - Browser:
+    - [ ] Safari
+    - [ ] Chrome
+    - [ ] Firefox
+    - [ ] Other? Please mention: 
+
+**Smartphone (please complete the following information):** :iphone: :computer:
+ - Device:
+    - [ ] iPhone
+    - [ ] Android
+ - Browser:
+    - [ ] Safari
+    - [ ] Chrome
+    - [ ] Firefox
+    - [ ] Other? Please mention: 
+
+**Version Information**
+- Which branch are you on?
+    - [ ] `master` :star2: 
+    - [ ] `develop` :fire:
+- Frappe Version: 
+- ERPNext Version: 
+
+**Additional context** :page_facing_up:
+Add any other context about the problem here.
+
+**Possible Solution** :bookmark_tabs:
+Any idea what might be causing the issue. Or if you have a proposed solution to the problem,
+
+**Please don't be intimidated by the long list of options you've to fill. Try to fill out as much as you can. Remember, the more the information the easier it is for us to replicate and fix the issue** :grin: 
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..e09e5e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+Issue: Feature Request
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..1b2dbc1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,28 @@
+Pull-Request
+
+- [ ] Have you followed the guidelines in our Contributing document?
+- [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change?
+- [ ] Have you lint your code locally prior to submission?
+- [ ] Have you successfully run tests with your changes locally?
+- [ ] Does your commit message have an explanation for your changes and why you'd like us to include them?
+- [ ] Docs have been added / updated
+- [ ] Tests for the changes have been added (for bug fixes / features)
+- [ ] Did you modify the existing test cases? If yes, why?
+
+---
+
+What type of a PR is this? 
+
+- [ ] Changes to Existing Features
+- [ ] New Feature Submissions
+- [ ] Bug Fix
+- [ ] Breaking Change
+
+--- 
+
+- Motivation and Context (What existing problem does the pull request solve):
+- Related Issue: 
+- Screenshots (if applicable, remember, a picture tells a thousand words): 
+
+**Please don't be intimidated by the long list of options you've to fill. Try to fill out as much as you can. Remember, the more the information the easier it is for us to test and get your pull request merged** :grin: 
+
diff --git a/.gitignore b/.gitignore
index 68272c7..2b52a49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@
 dist/
 erpnext/docs/current
 *.swp
+<<<<<<< HEAD
 *.swo
 __pycache__
 *~
+=======
+>>>>>>> master
diff --git a/.travis.yml b/.travis.yml
index ad9822d..b8ffffb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@
 
 python:
   - "2.7"
+  - "3.6"
 
 services:
   - mysql
@@ -35,6 +36,7 @@
   - bench reinstall --yes
   - bench build
   - bench scheduler disable
+  - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10
 
@@ -51,3 +53,5 @@
         - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
         - bench migrate
       env: Patch Testing
+  allow_failures:
+    - python: "3.6"
\ No newline at end of file
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 540e223..b9e3cfc 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.1.28'
+__version__ = '10.1.36'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
@@ -79,6 +79,29 @@
 
 	return frappe.local.enable_perpetual_inventory[company]
 
+def get_default_finance_book(company=None):
+	if not company:
+		company = get_default_company()
+
+	if not hasattr(frappe.local, 'default_finance_book'):
+		frappe.local.default_finance_book = {}
+
+	if not company in frappe.local.default_finance_book:
+		frappe.local.default_finance_book[company] = frappe.db.get_value("Company",
+			company, "default_finance_book")
+
+	return frappe.local.default_finance_book[company]
+
+def get_party_account_type(party_type):
+	if not hasattr(frappe.local, 'party_account_types'):
+		frappe.local.party_account_types = {}
+
+	if not party_type in frappe.local.party_account_types:
+		frappe.local.party_account_types[party_type] = frappe.db.get_value("Party Type",
+			party_type, "account_type") or ''
+
+	return frappe.local.party_account_types[party_type]
+
 def get_region(company=None):
 	'''Return the default country based on flag, company or global settings
 
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 7e118f0..de28a59 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -1,711 +1,738 @@
 {
- "allow_copy": 1,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "beta": 0,
- "creation": "2013-01-30 12:49:46",
- "custom": 0,
- "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "beta": 0, 
+ "creation": "2013-01-30 12:49:46", 
+ "custom": 0, 
+ "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "properties",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "properties", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "account_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Account Name",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "account_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Account Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "account_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "account_number",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Account Number",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Account Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "is_group",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Group",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "root_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Root Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "root_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Root Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "report_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Report Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nBalance Sheet\nProfit and Loss",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "report_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Report Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nBalance Sheet\nProfit and Loss", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.is_group==0",
-   "fieldname": "account_currency",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Currency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_group==0", 
+   "fieldname": "account_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "inter_company_account", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inter Company Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "parent_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Parent Account",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "parent_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Parent Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "parent_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Setting Account Type helps in selecting this Account in transactions.",
-   "fieldname": "account_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Account Type",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "account_type",
-   "oldfieldtype": "Select",
-   "options": "\nAccumulated Depreciation\nBank\nCash\nChargeable\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Setting Account Type helps in selecting this Account in transactions.", 
+   "fieldname": "account_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Account Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "account_type", 
+   "oldfieldtype": "Select", 
+   "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Rate at which this tax is applied",
-   "fieldname": "tax_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "tax_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Rate at which this tax is applied", 
+   "fieldname": "tax_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "tax_rate", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "If the account is frozen, entries are allowed to restricted users.",
-   "fieldname": "freeze_account",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Frozen",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "freeze_account",
-   "oldfieldtype": "Select",
-   "options": "No\nYes",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "If the account is frozen, entries are allowed to restricted users.", 
+   "fieldname": "freeze_account", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Frozen", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "freeze_account", 
+   "oldfieldtype": "Select", 
+   "options": "No\nYes", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "balance_must_be",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Balance must be",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nDebit\nCredit",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "balance_must_be", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Balance must be", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDebit\nCredit", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "lft",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Lft",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "rgt",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rgt",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "old_parent",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Old Parent",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-money",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-04-04 03:23:20.011949",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Account",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-money", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-07 15:37:25.962506", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Account", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Auditor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "set_user_permissions": 1,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 1, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "account_number",
- "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 1,
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "account_number", 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index fe1977c..a71c4f2 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -32,9 +32,7 @@
 			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
 			depends_on: 'eval:doc.is_group && !doc.parent_account'},
 		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
-			options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
-				'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
-				'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
+			options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
 			description: __("Optional. This setting will be used to filter in various transactions.")
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 46fff7d..919f53b 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -1,10 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
+
 import frappe, os, json
 from frappe.utils import cstr
 from unidecode import unidecode
+from six import iteritems
 
 def create_charts(company, chart_template=None, existing_company=None):
 	chart = get_chart(chart_template, existing_company)
@@ -12,7 +13,7 @@
 		accounts = []
 
 		def _import_accounts(children, parent, root_type, root_account=False):
-			for account_name, child in children.items():
+			for account_name, child in iteritems(children):
 				if root_account:
 					root_type = child.get("root_type")
 
@@ -43,9 +44,9 @@
 
 					if root_account or frappe.local.flags.allow_unverified_charts:
 						account.flags.ignore_mandatory = True
-						
+
 					account.flags.ignore_permissions = True
-					
+
 					account.insert()
 
 					accounts.append(account_name_in_db)
@@ -81,7 +82,7 @@
 	chart = {}
 	if existing_company:
 		return get_account_tree_from_existing_company(existing_company)
-	
+
 	elif chart_template == "Standard":
 		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
@@ -122,6 +123,8 @@
 
 		for folder in folders:
 			path = os.path.join(os.path.dirname(__file__), folder)
+			if not os.path.exists(path):
+				continue
 
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
@@ -129,6 +132,7 @@
 					with open(os.path.join(path, fname), "r") as f:
 						_get_chart_name(f.read())
 
+	# if more than one charts, returned then add the standard
 	if len(charts) != 1 or with_standard:
 		charts += ["Standard", "Standard with Numbers"]
 
@@ -153,7 +157,7 @@
 	# find children
 	parent_account = parent.name if parent else ""
 	children = [acc for acc in all_accounts if cstr(acc.parent_account) == parent_account]
-			
+
 	# if no children, but a group account
 	if not children and parent.is_group:
 		tree["is_group"] = 1
@@ -163,7 +167,7 @@
 	for child in children:
 		# start new subtree
 		tree[child.account_name] = {}
-		
+
 		# assign account_type and root_type
 		if child.account_number:
 			tree[child.account_name]["account_number"] = child.account_number
@@ -173,7 +177,7 @@
 			tree[child.account_name]["tax_rate"] = child.tax_rate
 		if not parent:
 			tree[child.account_name]["root_type"] = child.root_type
-			
+
 		# call recursively to build a subtree for current account
 		build_account_tree(tree[child.account_name], child, all_accounts)
 
@@ -181,10 +185,10 @@
 def validate_bank_account(coa, bank_account):
 	accounts = []
 	chart = get_chart(coa)
-	
+
 	if chart:
 		def _get_account_names(account_master):
-			for account_name, child in account_master.items():
+			for account_name, child in iteritems(account_master):
 				if account_name not in ["account_number", "account_type",
 					"root_type", "is_group", "tax_rate"]:
 					accounts.append(account_name)
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
index bc7f965..2ec0b7f 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
@@ -147,8 +147,9 @@
                     }
                 },
                 "Duties and Taxes": {
-                    "account_type": "Tax",
-                    "is_group": 1
+                    "TDS": {
+                        "account_type": "Tax"
+                    }
                 },
                 "Loans (Liabilities)": {
                     "Secured Loans": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
index 5452040..161e52a 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
@@ -24,7 +24,8 @@
 	                "account_type": "Cash"
 	            },
 	            _("Loans and Advances (Assets)"): {
-	            	"is_group": 1
+                    	_("Employee Advances"): {
+                    	},
 	            },
 	            _("Securities and Deposits"): {
 	                _("Earnest Money"): {}
@@ -63,7 +64,10 @@
 				},
 	            _("Accumulated Depreciation"): {
 	            	"account_type": "Accumulated Depreciation"
-	            }
+	            },
+                _("CWIP Account"): {
+                    "account_type": "Capital Work in Progress",
+                }
 	        },
 	        _("Investments"): {
 	        	"is_group": 1
@@ -81,6 +85,9 @@
 	                _("Cost of Goods Sold"): {
 	                    "account_type": "Cost of Goods Sold"
 	                },
+                    _("Expenses Included In Asset Valuation"): {
+                        "account_type": "Expenses Included In Asset Valuation"
+                    },
 	                _("Expenses Included In Valuation"): {
 	                    "account_type": "Expenses Included In Valuation"
 	                },
@@ -146,6 +153,9 @@
 				    _("Stock Received But Not Billed"): {
 				        "account_type": "Stock Received But Not Billed"
 				    },
+                    _("Asset Received But Not Billed"): {
+                        "account_type": "Asset Received But Not Billed"
+                    }
 			    },
 				_("Duties and Taxes"): {
 					"account_type": "Tax",
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
index bad8453..6c83e3b 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
@@ -29,7 +29,9 @@
                     "account_number": "1100"
                 },
                 _("Loans and Advances (Assets)"): {
-                    "is_group": 1,
+                    _("Employee Advances"): {
+                        "account_number": "1610"
+                    },
                     "account_number": "1600"
                 },
                 _("Securities and Deposits"): {
@@ -85,6 +87,10 @@
                     "account_type": "Accumulated Depreciation",
                     "account_number": "1780"
                 },
+                _("CWIP Account"): {
+                    "account_type": "Capital Work in Progress",
+                    "account_number": "1790"
+                },
                 "account_number": "1700"
             },
             _("Investments"): {
@@ -108,6 +114,10 @@
                         "account_type": "Cost of Goods Sold",
                         "account_number": "5111"
                     },
+                    _("Expenses Included In Asset Valuation"): {
+                        "account_type": "Expenses Included In Asset Valuation",
+                        "account_number": "5112"
+                    },
                     _("Expenses Included In Valuation"): {
                         "account_type": "Expenses Included In Valuation",
                         "account_number": "5118"
@@ -228,6 +238,10 @@
                         "account_type": "Stock Received But Not Billed",
                         "account_number": "2210"
                     },
+                    _("Asset Received But Not Billed"): {
+                        "account_type": "Asset Received But Not Billed",
+                        "account_number": "2211"
+                    },
                     "account_number": "2200"
                 },
                 _("Duties and Taxes"): {
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/accounts/doctype/accounting_period/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/accounts/doctype/accounting_period/__init__.py
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.js b/erpnext/accounts/doctype/accounting_period/accounting_period.js
new file mode 100644
index 0000000..e3d805a
--- /dev/null
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.js
@@ -0,0 +1,24 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Accounting Period', {
+	onload: function(frm) {
+		if(frm.doc.closed_documents.length === 0 || (frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)) {
+			frappe.call({
+				method: "get_doctypes_for_closing",
+				doc:frm.doc,
+				callback: function(r) {
+					if(r.message) {
+						cur_frm.clear_table("closed_documents");
+						r.message.forEach(function(element) {
+							var c = frm.add_child("closed_documents");
+							c.document_type = element.document_type;
+							c.closed = element.closed;
+						});
+						refresh_field("closed_documents");
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.json b/erpnext/accounts/doctype/accounting_period/accounting_period.json
new file mode 100644
index 0000000..ed30b83
--- /dev/null
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.json
@@ -0,0 +1,349 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:period_name", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:50:14.672323", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "period_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Period Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nClosed", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "closed_documents", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Closed Documents", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Closed Document", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 19:14:47.593753", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Accounting Period", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.py b/erpnext/accounts/doctype/accounting_period/accounting_period.py
new file mode 100644
index 0000000..32441db
--- /dev/null
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AccountingPeriod(Document):
+	def validate(self):
+		self.validate_overlap()
+
+	def before_insert(self):
+		self.bootstrap_doctypes_for_closing()
+
+	def autoname(self):
+		company_abbr = frappe.db.get_value("Company", self.company, "abbr")
+		self.name = " - ".join([self.period_name, company_abbr])
+	
+	def validate_overlap(self):
+		existing_accounting_period = frappe.db.sql("""select name from `tabAccounting Period`
+			where (
+				(%(start_date)s between start_date and end_date)
+				or (%(end_date)s between start_date and end_date)
+				or (start_date between %(start_date)s and %(end_date)s)
+				or (end_date between %(start_date)s and %(end_date)s)
+			) and name!=%(name)s and company=%(company)s""",
+			{
+				"start_date": self.start_date,
+				"end_date": self.end_date,
+				"name": self.name,
+				"company": self.company
+			}, as_dict=True)
+
+		if len(existing_accounting_period) > 0:
+			frappe.throw("Accounting Period overlaps with {0}".format(existing_accounting_period[0].get("name")))
+
+	def get_doctypes_for_closing(self):
+		docs_for_closing = []
+		#if not self.closed_documents or len(self.closed_documents) == 0:
+		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", "Bank Reconciliation", "Asset", "Purchase Order", "Sales Order", "Leave Application", "Leave Allocation", "Stock Entry"]
+		closed_doctypes = [{"document_type": doctype, "closed": 1} for doctype in doctypes]
+		for closed_doctype in closed_doctypes:
+			docs_for_closing.append(closed_doctype)
+
+		return docs_for_closing
+
+	def bootstrap_doctypes_for_closing(self):
+		if len(self.closed_documents) == 0:
+			for doctype_for_closing in self.get_doctypes_for_closing():
+				self.append('closed_documents', {
+					"document_type": doctype_for_closing.document_type,
+					"closed": doctype_for_closing.closed
+				})
diff --git a/erpnext/accounts/doctype/accounting_period/test_accounting_period.js b/erpnext/accounts/doctype/accounting_period/test_accounting_period.js
new file mode 100644
index 0000000..71ce5b8
--- /dev/null
+++ b/erpnext/accounts/doctype/accounting_period/test_accounting_period.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Accounting Period", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Accounting Period
+		() => frappe.tests.make('Accounting Period', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/accounting_period/test_accounting_period.py b/erpnext/accounts/doctype/accounting_period/test_accounting_period.py
new file mode 100644
index 0000000..29deefd
--- /dev/null
+++ b/erpnext/accounts/doctype/accounting_period/test_accounting_period.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# class TestAccountingPeriod(unittest.TestCase):
+# 	def test_overlap(self):
+# 		ap1 = create_accounting_period({"start_date":"2018-04-01", "end_date":"2018-06-30", "company":"Wind Power LLC"})
+# 		ap1.save()
+# 		ap2 = create_accounting_period({"start_date":"2018-06-30", "end_date":"2018-07-10", "company":"Wind Power LLC"})
+# 		self.assertRaises(frappe.OverlapError, accounting_period_2.save())
+#
+# 	def tearDown(self):
+# 		pass
+#
+#
+# def create_accounting_period(**args):
+# 	accounting_period = frappe.new_doc("Accounting Period")
+# 	accounting_period.start_date = args.start_date or frappe.utils.datetime.date(2018, 4, 1)
+# 	accounting_period.end_date = args.end_date or frappe.utils.datetime.date(2018, 6, 30)
+# 	accounting_period.company = args.company
+# 	accounting_period.period_name = "_Test_Period_Name_1"
+#
+# 	return accounting_period
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/allowed_to_transact_with/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/allowed_to_transact_with/__init__.py
diff --git a/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json
new file mode 100644
index 0000000..f85bc52
--- /dev/null
+++ b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json
@@ -0,0 +1,74 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-16 21:50:05.860195", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-20 14:00:46.014502", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Allowed To Transact With", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py
new file mode 100644
index 0000000..a3e4bbc
--- /dev/null
+++ b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class AllowedToTransactWith(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/accounts/doctype/bank/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/accounts/doctype/bank/__init__.py
diff --git a/erpnext/accounts/doctype/bank/bank.js b/erpnext/accounts/doctype/bank/bank.js
new file mode 100644
index 0000000..1063a07
--- /dev/null
+++ b/erpnext/accounts/doctype/bank/bank.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/bank/bank.json b/erpnext/accounts/doctype/bank/bank.json
new file mode 100644
index 0000000..0a24726
--- /dev/null
+++ b/erpnext/accounts/doctype/bank/bank.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:bank_name", 
+ "beta": 0, 
+ "creation": "2018-04-07 16:59:59.496668", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-07 17:00:21.246202", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.py b/erpnext/accounts/doctype/bank/bank.py
new file mode 100644
index 0000000..b205d56
--- /dev/null
+++ b/erpnext/accounts/doctype/bank/bank.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Bank(Document):
+	pass
diff --git a/erpnext/accounts/doctype/bank/test_bank.js b/erpnext/accounts/doctype/bank/test_bank.js
new file mode 100644
index 0000000..9ec2644
--- /dev/null
+++ b/erpnext/accounts/doctype/bank/test_bank.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank
+		() => frappe.tests.make('Bank', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank/test_bank.py b/erpnext/accounts/doctype/bank/test_bank.py
new file mode 100644
index 0000000..d8741f2
--- /dev/null
+++ b/erpnext/accounts/doctype/bank/test_bank.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestBank(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_account/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_account/__init__.py
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.js b/erpnext/accounts/doctype/bank_account/bank_account.js
new file mode 100644
index 0000000..5ac41e4
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_account/bank_account.js
@@ -0,0 +1,28 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Account', {
+	setup: function(frm) {
+		frm.set_query("account", function() {
+			return {
+				filters: {
+					'account_type': 'Bank',
+					'company': frm.doc.company,
+					'is_group': 0
+				}
+			};
+		});
+	},
+	refresh: function(frm) {
+		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank Account' }
+		
+		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+
+		if (frm.doc.__islocal) {
+			frappe.contacts.clear_address_and_contact(frm);
+		}
+		else {
+			frappe.contacts.render_address_and_contact(frm);
+		}
+	}
+});
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.json b/erpnext/accounts/doctype/bank_account/bank_account.json
new file mode 100644
index 0000000..4f84cbb
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_account/bank_account.json
@@ -0,0 +1,533 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 1,
+ "autoname": "field:account_name",
+ "beta": 0,
+ "creation": "2017-05-29 21:35:13.136357",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "account_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Account Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Bank",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_account_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Bank Account No",
+   "length": 30,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "iban",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "IBAN",
+   "length": 25,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "branch_code",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Branch Code",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "swift_number",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "SWIFT number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "address_and_contact",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Address and Contact",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-map-marker",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Address HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Website",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Contact HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-05-30 17:44:06.032697",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Account",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  },
+  {
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "bank,account",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.py b/erpnext/accounts/doctype/bank_account/bank_account.py
new file mode 100644
index 0000000..e3aef15
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_account/bank_account.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+
+class BankAccount(Document):
+	def onload(self):
+		"""Load address and contacts in `__onload`"""
+		load_address_and_contact(self)
+
+	def on_trash(self):
+		delete_contact_and_address('BankAccount', self.name)
diff --git a/erpnext/accounts/doctype/bank_account/test_bank_account.js b/erpnext/accounts/doctype/bank_account/test_bank_account.js
new file mode 100644
index 0000000..c20a799
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_account/test_bank_account.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Account", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Account
+		() => frappe.tests.make('Bank Account', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_account/test_bank_account.py b/erpnext/accounts/doctype/bank_account/test_bank_account.py
new file mode 100644
index 0000000..43a3298
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_account/test_bank_account.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Bank Account')
+
+class TestBankAccount(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
index 0439b73..2a44cb3 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
@@ -1,24 +1,70 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
+cur_frm.add_fetch('bank_account','account','account');
+cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
+cur_frm.add_fetch('bank_account','iban','iban');
+cur_frm.add_fetch('bank_account','branch_code','branch_code');
+cur_frm.add_fetch('bank_account','swift_number','swift_number');
+
 frappe.ui.form.on('Bank Guarantee', {
-	refresh: function(frm) {
-		cur_frm.set_query("account", function() {
+	setup: function(frm) {
+		frm.set_query("bank", function() {
 			return {
-				"filters": {
-					"account_type": "Bank",
-					"is_group": 0
+				filters: {
+					company: frm.doc.company
 				}
 			};
 		});
-		cur_frm.set_query("project", function() {
+		frm.set_query("bank_account", function() {
 			return {
-				"filters": {
-					"customer": cur_frm.doc.customer
+				filters: {
+					company: frm.doc.company,
+					bank: frm.doc.bank
+				}
+			}
+		});
+		frm.set_query("project", function() {
+			return {
+				filters: {
+					customer: frm.doc.customer
 				}
 			};
 		});
 	},
+
+	bg_type: function(frm) {
+		if (frm.doc.bg_type == "Receiving") {
+			frm.set_value("reference_doctype", "Sales Order");
+		} else if (frm.doc.bg_type == "Providing") {
+			frm.set_value("reference_doctype", "Purchase Order");
+		}
+	},
+
+	reference_docname: function(frm) {
+		if (frm.doc.reference_docname && frm.doc.reference_doctype) {
+			let fields_to_fetch = ["project", "grand_total"];
+			let party_field = frm.doc.reference_doctype == "Sales Order" ? "customer" : "supplier";
+			fields_to_fetch.push(party_field);
+			frappe.call({
+				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials",
+				args: {
+					"column_list": fields_to_fetch,
+					"doctype": frm.doc.reference_doctype,
+					"docname": frm.doc.reference_docname
+				},
+				callback: function(r) {
+					if (r.message) {
+						if (r.message[party_field]) frm.set_value(party_field, r.message[party_field]);
+						if (r.message.project) frm.set_value("project", r.message.project);
+						if (r.message.grand_total) frm.set_value("amount", r.message.grand_total);
+					}
+				}
+			});
+
+		}
+	},
+
 	start_date: function(frm) {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
@@ -27,4 +73,4 @@
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
 	}
-});
\ No newline at end of file
+});
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
index 807c544..0d21cab 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
@@ -1,448 +1,1055 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "BG-.#####", 
- "beta": 0, 
- "creation": "2016-12-17 10:43:35.731631", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "BG-.#####",
+ "beta": 0,
+ "creation": "2016-12-17 10:43:35.731631",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bg_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank Guarantee Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nReceiving\nProviding",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Document Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "DocType",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Document Name",
+   "length": 0,
+   "no_copy": 0,
+   "options": "reference_doctype",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: doc.bg_type == \"Receiving\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Customer",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: doc.bg_type == \"Providing\"",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Supplier",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Supplier",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Project",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Project",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "validity", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Validity in Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_guarantee_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Guarantee Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Start Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fieldname": "validity",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Validity in Days",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "End Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_account_info",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank Account Info",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Bank",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Bank Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_account_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank Account No",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "iban",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "IBAN",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "branch_code",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Branch Code",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "swift_number",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "SWIFT number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_14",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "more_information",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Clauses and Conditions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "margin_details",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Other Details",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_guarantee_number",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Bank Guarantee Number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_break_10", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "More Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "name_of_beneficiary",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Name of Beneficiary",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "more_information", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Notes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Bank Guarantee", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "margin_money",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Margin Money",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "depends_on": "",
+   "fieldname": "charges",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Charges Incurred",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "fixed_deposit_number",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Fixed Deposit Number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Bank Guarantee",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-04-25 13:31:49.627831", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank Guarantee", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-05-30 17:35:43.391115",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Guarantee",
+ "name_case": "",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 0,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "customer", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "customer", 
- "track_changes": 0, 
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "customer",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "customer",
+ "track_changes": 0,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
index 71647b9..1a62c42 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py
@@ -3,8 +3,26 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.model.document import Document
+from frappe import _
 
 class BankGuarantee(Document):
-	pass
+	def validate(self):
+		if not (self.customer or self.supplier):
+			frappe.throw(_("Select the customer or supplier."))
+
+	def on_submit(self):
+		if not self.bank_guarantee_number:
+			frappe.throw(_("Enter the Bank Guarantee Number before submittting."))
+		if not self.name_of_beneficiary:
+			frappe.throw(_("Enter the name of the Beneficiary before submittting."))
+		if not self.name_of_bank:
+			frappe.throw(_("Enter the name of the bank or lending institution before submittting."))
+
+@frappe.whitelist()
+def get_vouchar_detials(column_list, doctype, docname):
+	print (column_list, doctype, docname)
+	return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s'''
+		.format(columns=", ".join(json.loads(column_list)), doctype=doctype), docname, as_dict=1)[0]
+
diff --git a/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.js b/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.js
new file mode 100644
index 0000000..0c60920
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Guarantee", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Guarantee
+		() => frappe.tests.make('Bank Guarantee', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py b/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py
index 0e56991..816743a 100644
--- a/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py
+++ b/erpnext/accounts/doctype/bank_guarantee/test_bank_guarantee.py
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 from __future__ import unicode_literals
 
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Bank Guarantee')
-
 class TestBankGuarantee(unittest.TestCase):
 	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_settings/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_settings/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.js b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.js
new file mode 100644
index 0000000..46aa4f2
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, sathishpy@gmail.com and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Statement Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.json b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.json
new file mode 100644
index 0000000..53fbf7d
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.json
@@ -0,0 +1,272 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "beta": 0, 
+ "creation": "2017-11-13 13:38:10.863592", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "'%d/%m/%Y'", 
+   "fieldname": "date_format", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date Format", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "statement_header_mapping", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Statement Header Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "header_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Statement Headers", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Settings Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transaction_data_mapping", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transaction Data Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapped_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mapped Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Settings Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-07 18:57:04.048423", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.py b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.py
new file mode 100644
index 0000000..6c4dd1b
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementSettings(Document):
+	def autoname(self):
+		self.name = self.bank + "-Statement-Settings"
diff --git a/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.js b/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.js
new file mode 100644
index 0000000..f2381c0
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Statement Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Statement Settings
+		() => frappe.tests.make('Bank Statement Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.py b/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.py
new file mode 100644
index 0000000..aa7fe83
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings/test_bank_statement_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestBankStatementSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_settings_item/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_settings_item/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.json b/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.json
new file mode 100644
index 0000000..7c93f26
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.json
@@ -0,0 +1,101 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-01-08 00:16:42.762980", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapped_header", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mapped Header", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stmt_header", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Header", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-01-08 00:19:14.841134", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Settings Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.py b/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.py
new file mode 100644
index 0000000..9438e9a
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_settings_item/bank_statement_settings_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementSettingsItem(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_transaction_entry/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_transaction_entry/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.js b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.js
new file mode 100644
index 0000000..d852935
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.js
@@ -0,0 +1,75 @@
+// Copyright (c) 2017, sathishpy@gmail.com and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Statement Transaction Entry', {
+	setup: function(frm) {
+		frm.events.account_filters(frm)
+		frm.events.invoice_filter(frm)
+	},
+	refresh: function(frm) {
+		frm.set_df_property("bank_account", "read_only", frm.doc.__islocal ? 0 : 1);
+		frm.set_df_property("from_date", "read_only", frm.doc.__islocal ? 0 : 1);
+		frm.set_df_property("to_date", "read_only", frm.doc.__islocal ? 0 : 1);
+	},
+	invoke_doc_function(frm, method) {
+		frappe.call({
+			doc: frm.doc,
+			method: method,
+			callback: function(r) {
+				if(!r.exe) {
+					frm.refresh_fields();
+				}
+			}
+		});
+	},
+	account_filters: function(frm) {
+		frm.fields_dict['bank_account'].get_query = function(doc, dt, dn) {
+			return {
+				filters:[
+					["Account", "account_type", "in", ["Bank"]]
+				]
+			}
+		};
+		frm.fields_dict['receivable_account'].get_query = function(doc, dt, dn) {
+			return {
+				filters: {"account_type": "Receivable"}
+			}
+		};
+		frm.fields_dict['payable_account'].get_query = function(doc, dt, dn) {
+			return {
+				filters: {"account_type": "Payable"}
+			}
+		};
+	},
+
+	invoice_filter: function(frm) {
+		frm.set_query("invoice", "payment_invoice_items", function(doc, cdt, cdn) {
+			row = locals[cdt][cdn]
+			if (row.party_type == "Customer") {
+				return {
+								filters:[[row.invoice_type, "customer", "in", [row.party]],
+												[row.invoice_type, "status", "!=", "Cancelled" ],
+											  [row.invoice_type, "posting_date", "<", row.transaction_date ],
+											  [row.invoice_type, "outstanding_amount", ">", 0 ]]
+							}
+			} else if (row.party_type == "Supplier") {
+				return {
+								filters:[[row.invoice_type, "supplier", "in", [row.party]],
+												[row.invoice_type, "status", "!=", "Cancelled" ],
+												[row.invoice_type, "posting_date", "<", row.transaction_date ],
+												[row.invoice_type, "outstanding_amount", ">", 0 ]]
+							}
+			}
+		});
+	},
+
+	match_invoices: function(frm) {
+		frm.events.invoke_doc_function(frm, "populate_matching_invoices");
+	},
+	create_payments: function(frm) {
+		frm.events.invoke_doc_function(frm, "create_payment_entries");
+	},
+	submit_payments: function(frm) {
+		frm.events.invoke_doc_function(frm, "submit_payment_entries");
+	},
+});
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.json b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.json
new file mode 100644
index 0000000..a7c56a1
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.json
@@ -0,0 +1,768 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "beta": 0, 
+ "creation": "2017-11-07 13:48:13.123185", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_settings", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bank Statement Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Settings", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bank", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Receivable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_statement", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bank Statement", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bank Transaction Entries", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_transaction_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Transactions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Payment Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "match_invoices", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Match Transaction to Invoices", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_14", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "create_payments", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create New Payment/Journal Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "submit_payments", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Submit/Reconcile Payments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_18", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Matching Invoices", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_invoice_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Invoice Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Invoice Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reconciled_transactions", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reconciled Transactions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reconciled_transaction_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reconciled Transactions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Payment Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Bank Statement Transaction Entry", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-07 17:01:47.480572", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Transaction Entry", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py
new file mode 100644
index 0000000..45663df
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py
@@ -0,0 +1,431 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from erpnext.accounts.utils import get_outstanding_invoices
+from frappe.utils import nowdate
+from datetime import datetime
+import csv, os, re, io
+import difflib
+import copy
+
+class BankStatementTransactionEntry(Document):
+	def autoname(self):
+		self.name = self.bank_account + "-" + self.from_date + "-" + self.to_date
+		mapper_name = self.bank + "-Statement-Settings"
+		if not frappe.db.exists("Bank Statement Settings", mapper_name):
+			self.create_settings(self.bank)
+		self.bank_settings = mapper_name
+
+	def create_settings(self, bank):
+		mapper = frappe.new_doc("Bank Statement Settings")
+		mapper.bank = bank
+		mapper.date_format = "%Y-%m-%d"
+		for header in ["Date", "Particulars", "Withdrawals", "Deposits", "Balance"]:
+			header_item = mapper.append("header_items", {})
+			header_item.mapped_header = header_item.stmt_header = header
+		mapper.save()
+
+	def on_update(self):
+		if (not self.bank_statement):
+			self.reconciled_transaction_items = self.new_transaction_items = []
+			return
+
+		if len(self.new_transaction_items + self.reconciled_transaction_items) == 0:
+			self.populate_payment_entries()
+		else:
+			self.match_invoice_to_payment()
+
+	def get_statement_headers(self):
+		if not self.bank_settings:
+			frappe.throw("Bank Data mapper doesn't exist")
+		mapper_doc = frappe.get_doc("Bank Statement Settings", self.bank_settings)
+		headers = [entry.stmt_header for entry in mapper_doc.header_items]
+		return headers
+
+	def populate_payment_entries(self):
+		if self.bank_statement is None: return
+		filename = self.bank_statement.split("/")[-1]
+		if (len(self.new_transaction_items + self.reconciled_transaction_items) > 0):
+			frappe.throw("Transactions already retreived from the statement")
+
+		date_format = frappe.get_value("Bank Statement Settings", self.bank_settings, "date_format")
+		if (date_format is None):
+			date_format = '%Y-%m-%d'
+		if self.bank_settings:
+			mapped_items = frappe.get_doc("Bank Statement Settings", self.bank_settings).mapped_items
+		transactions = get_transaction_entries(filename, self.get_statement_headers())
+		for entry in transactions:
+			date = entry["Date"].strip()
+			#print("Processing entry DESC:{0}-W:{1}-D:{2}-DT:{3}".format(entry["Particulars"], entry["Withdrawals"], entry["Deposits"], entry["Date"]))
+			if (not date): continue
+			transaction_date = datetime.strptime(date, date_format).date()
+			if (self.from_date and transaction_date < datetime.strptime(self.from_date, '%Y-%m-%d').date()): continue
+			if (self.to_date and transaction_date > datetime.strptime(self.to_date, '%Y-%m-%d').date()): continue
+			bank_entry = self.append('new_transaction_items', {})
+			bank_entry.transaction_date = transaction_date
+			bank_entry.description = entry["Particulars"]
+
+			mapped_item = next((entry for entry in mapped_items if entry.mapping_type == "Transaction" and entry.bank_data.lower() in bank_entry.description.lower()), None)
+			if (mapped_item is not None):
+				bank_entry.party_type = mapped_item.mapped_data_type
+				bank_entry.party = mapped_item.mapped_data
+			else:
+				bank_entry.party_type = "Supplier" if not entry["Deposits"].strip() else "Customer"
+				party_list = frappe.get_all(bank_entry.party_type, fields=["name"])
+				parties = [party.name for party in party_list]
+				matches = difflib.get_close_matches(bank_entry.description.lower(), parties, 1, 0.4)
+				if len(matches) > 0: bank_entry.party = matches[0]
+			bank_entry.amount = -float(entry["Withdrawals"]) if not entry["Deposits"].strip() else float(entry["Deposits"])
+		self.map_unknown_transactions()
+		self.map_transactions_on_journal_entry()
+
+	def map_transactions_on_journal_entry(self):
+		for entry in self.new_transaction_items:
+			vouchers = frappe.db.sql("""select name, posting_date from `tabJournal Entry`
+										where posting_date='{0}' and total_credit={1} and cheque_no='{2}' and docstatus != 2
+									""".format(entry.transaction_date, abs(entry.amount), entry.description), as_dict=True)
+			if (len(vouchers) == 1):
+				entry.reference_name = vouchers[0].name
+
+	def populate_matching_invoices(self):
+		self.payment_invoice_items = []
+		self.map_unknown_transactions()
+		added_invoices = []
+		for entry in self.new_transaction_items:
+			if (not entry.party or entry.party_type == "Account"): continue
+			account = self.receivable_account if entry.party_type == "Customer" else self.payable_account
+			invoices = get_outstanding_invoices(entry.party_type, entry.party, account)
+			transaction_date = datetime.strptime(entry.transaction_date, "%Y-%m-%d").date()
+			outstanding_invoices = [invoice for invoice in invoices if invoice.posting_date <= transaction_date]
+			amount = abs(entry.amount)
+			matching_invoices = [invoice for invoice in outstanding_invoices if invoice.outstanding_amount == amount]
+			sorted(outstanding_invoices, key=lambda k: k['posting_date'])
+			for e in (matching_invoices + outstanding_invoices):
+				added = next((inv for inv in added_invoices if inv == e.get('voucher_no')), None)
+				if (added is not None): continue
+				ent = self.append('payment_invoice_items', {})
+				ent.transaction_date = entry.transaction_date
+				ent.payment_description = entry.description
+				ent.party_type = entry.party_type
+				ent.party = entry.party
+				ent.invoice = e.get('voucher_no')
+				added_invoices += [ent.invoice]
+				ent.invoice_type = "Sales Invoice" if entry.party_type == "Customer" else "Purchase Invoice"
+				ent.invoice_date = e.get('posting_date')
+				ent.outstanding_amount = e.get('outstanding_amount')
+				ent.allocated_amount = min(float(e.get('outstanding_amount')), amount)
+				amount -= float(e.get('outstanding_amount'))
+				if (amount <= 5): break
+		self.match_invoice_to_payment()
+		self.populate_matching_vouchers()
+		self.map_transactions_on_journal_entry()
+
+	def match_invoice_to_payment(self):
+		added_payments = []
+		for entry in self.new_transaction_items:
+			if (not entry.party or entry.party_type == "Account"): continue
+			entry.account = self.receivable_account if entry.party_type == "Customer" else self.payable_account
+			amount = abs(entry.amount)
+			payment, matching_invoices = None, []
+			for inv_entry in self.payment_invoice_items:
+				if (inv_entry.payment_description != entry.description or inv_entry.transaction_date != entry.transaction_date): continue
+				if (inv_entry.party != entry.party): continue
+				matching_invoices += [inv_entry.invoice_type + "|" + inv_entry.invoice]
+				payment = get_payments_matching_invoice(inv_entry.invoice, entry.amount, entry.transaction_date)
+				doc = frappe.get_doc(inv_entry.invoice_type, inv_entry.invoice)
+				inv_entry.invoice_date = doc.posting_date
+				inv_entry.outstanding_amount = doc.outstanding_amount
+				inv_entry.allocated_amount = min(float(doc.outstanding_amount), amount)
+				amount -= inv_entry.allocated_amount
+				if (amount < 0): break
+
+			amount = abs(entry.amount)
+			if (payment is None):
+				order_doctype = "Sales Order" if entry.party_type=="Customer" else "Purchase Order"
+				from erpnext.controllers.accounts_controller import get_advance_payment_entries
+				payment_entries = get_advance_payment_entries(entry.party_type, entry.party, entry.account, order_doctype, against_all_orders=True)
+				payment_entries += self.get_matching_payments(entry.party, amount, entry.transaction_date)
+				payment = next((payment for payment in payment_entries if payment.amount == amount and payment not in added_payments), None)
+				if (payment is None):
+					print("Failed to find payments for {0}:{1}".format(entry.party, amount))
+					continue
+			added_payments += [payment]
+			entry.reference_type = payment.reference_type
+			entry.reference_name = payment.reference_name
+			entry.mode_of_payment = "Wire Transfer"
+			entry.outstanding_amount = min(amount, 0)
+			if (entry.payment_reference is None):
+				entry.payment_reference = entry.description
+			entry.invoices = ",".join(matching_invoices)
+			#print("Matching payment is {0}:{1}".format(entry.reference_type, entry.reference_name))
+
+	def get_matching_payments(self, party, amount, pay_date):
+		query = """select 'Payment Entry' as reference_type, name as reference_name, paid_amount as amount
+					from `tabPayment Entry` where party='{0}' and paid_amount={1} and posting_date='{2}' and docstatus != 2
+					""".format(party, amount, pay_date)
+		matching_payments = frappe.db.sql(query, as_dict=True)
+		return matching_payments
+
+	def map_unknown_transactions(self):
+		for entry in self.new_transaction_items:
+			if (entry.party): continue
+			inv_type = "Sales Invoice" if (entry.amount > 0) else "Purchase Invoice"
+			party_type = "customer" if (entry.amount > 0) else "supplier"
+
+			query = """select posting_date, name, {0}, outstanding_amount
+							from `tab{1}` where ROUND(outstanding_amount)={2} and posting_date < '{3}'
+							""".format(party_type, inv_type, round(abs(entry.amount)), entry.transaction_date)
+			invoices = frappe.db.sql(query, as_dict = True)
+			if(len(invoices) > 0):
+				entry.party = invoices[0].get(party_type)
+
+	def populate_matching_vouchers(self):
+		for entry in self.new_transaction_items:
+			if (not entry.party or entry.reference_name): continue
+			print("Finding matching voucher for {0}".format(entry.description))
+			amount = abs(entry.amount)
+			invoices = []
+			vouchers = get_matching_journal_entries(self.from_date, self.to_date, entry.party, self.bank_account, amount)
+			if len(vouchers) == 0: continue
+			for voucher in vouchers:
+				added = next((entry.invoice for entry in self.payment_invoice_items if entry.invoice == voucher.voucher_no), None)
+				if (added):
+					print("Found voucher {0}".format(added))
+					continue
+				print("Adding voucher {0} {1} {2}".format(voucher.voucher_no, voucher.posting_date, voucher.debit))
+				ent = self.append('payment_invoice_items', {})
+				ent.invoice_date = voucher.posting_date
+				ent.invoice_type = "Journal Entry"
+				ent.invoice = voucher.voucher_no
+				ent.payment_description = entry.description
+				ent.allocated_amount = max(voucher.debit, voucher.credit)
+
+				invoices += [ent.invoice_type + "|" + ent.invoice]
+				entry.reference_type = "Journal Entry"
+				entry.mode_of_payment = "Wire Transfer"
+				entry.reference_name = ent.invoice
+				#entry.account = entry.party
+				entry.invoices = ",".join(invoices)
+				break
+
+
+	def create_payment_entries(self):
+		for payment_entry in self.new_transaction_items:
+			if (not payment_entry.party): continue
+			if (payment_entry.reference_name): continue
+			print("Creating payment entry for {0}".format(payment_entry.description))
+			if (payment_entry.party_type == "Account"):
+				payment = self.create_journal_entry(payment_entry)
+				invoices = [payment.doctype + "|" + payment.name]
+				payment_entry.invoices = ",".join(invoices)
+			else:
+				payment = self.create_payment_entry(payment_entry)
+				invoices = [entry.reference_doctype + "|" + entry.reference_name for entry in payment.references if entry is not None]
+				payment_entry.invoices = ",".join(invoices)
+				payment_entry.mode_of_payment = payment.mode_of_payment
+				payment_entry.account = self.receivable_account if payment_entry.party_type == "Customer" else self.payable_account
+			payment_entry.reference_name = payment.name
+			payment_entry.reference_type = payment.doctype
+		frappe.msgprint(_("Successfully created payment entries"))
+
+	def create_payment_entry(self, pe):
+		payment = frappe.new_doc("Payment Entry")
+		payment.posting_date = pe.transaction_date
+		payment.payment_type = "Receive" if pe.party_type == "Customer" else "Pay"
+		payment.mode_of_payment = "Wire Transfer"
+		payment.party_type = pe.party_type
+		payment.party = pe.party
+		payment.paid_to = self.bank_account if pe.party_type == "Customer" else self.payable_account
+		payment.paid_from = self.receivable_account if pe.party_type == "Customer" else self.bank_account
+		payment.paid_amount = payment.received_amount = abs(pe.amount)
+		payment.reference_no = pe.description
+		payment.reference_date = pe.transaction_date
+		payment.save()
+		for inv_entry in self.payment_invoice_items:
+			if (pe.description != inv_entry.payment_description or pe.transaction_date != inv_entry.transaction_date): continue
+			if (pe.party != inv_entry.party): continue
+			reference = payment.append("references", {})
+			reference.reference_doctype = inv_entry.invoice_type
+			reference.reference_name = inv_entry.invoice
+			reference.allocated_amount = inv_entry.allocated_amount
+			print ("Adding invoice {0} {1}".format(reference.reference_name, reference.allocated_amount))
+		payment.setup_party_account_field()
+		payment.set_missing_values()
+		#payment.set_exchange_rate()
+		#payment.set_amounts()
+		#print("Created payment entry {0}".format(payment.as_dict()))
+		payment.save()
+		return payment
+
+	def create_journal_entry(self, pe):
+		je = frappe.new_doc("Journal Entry")
+		je.is_opening = "No"
+		je.voucher_type = "Bank Entry"
+		je.cheque_no = pe.description
+		je.cheque_date = pe.transaction_date
+		je.remark = pe.description
+		je.posting_date = pe.transaction_date
+		if (pe.amount < 0):
+			je.append("accounts", {"account": pe.party, "debit_in_account_currency": abs(pe.amount)})
+			je.append("accounts", {"account": self.bank_account, "credit_in_account_currency": abs(pe.amount)})
+		else:
+			je.append("accounts", {"account": pe.party, "credit_in_account_currency": pe.amount})
+			je.append("accounts", {"account": self.bank_account, "debit_in_account_currency": pe.amount})
+		je.save()
+		return je
+
+	def update_payment_entry(self, payment):
+		lst = []
+		invoices = payment.invoices.strip().split(',')
+		if (len(invoices) == 0): return
+		amount = float(abs(payment.amount))
+		for invoice_entry in invoices:
+			if (not invoice_entry.strip()): continue
+			invs = invoice_entry.split('|')
+			invoice_type, invoice = invs[0], invs[1]
+			outstanding_amount = frappe.get_value(invoice_type, invoice, 'outstanding_amount')
+
+			lst.append(frappe._dict({
+				'voucher_type': payment.reference_type,
+				'voucher_no' : payment.reference_name,
+				'against_voucher_type' : invoice_type,
+				'against_voucher'  : invoice,
+				'account' : payment.account,
+				'party_type': payment.party_type,
+				'party': frappe.get_value("Payment Entry", payment.reference_name, "party"),
+				'unadjusted_amount' : float(amount),
+				'allocated_amount' : min(outstanding_amount, amount)
+			}))
+			amount -= outstanding_amount
+		if lst:
+			from erpnext.accounts.utils import reconcile_against_document
+			try:
+				reconcile_against_document(lst)
+			except:
+				frappe.throw("Exception occurred while reconciling {0}".format(payment.reference_name))
+
+	def submit_payment_entries(self):
+		for payment in self.new_transaction_items:
+			if payment.reference_name is None: continue
+			doc = frappe.get_doc(payment.reference_type, payment.reference_name)
+			if doc.docstatus == 1:
+				if (payment.reference_type == "Journal Entry"): continue
+				if doc.unallocated_amount == 0: continue
+				print("Reconciling payment {0}".format(payment.reference_name))
+				self.update_payment_entry(payment)
+			else:
+				print("Submitting payment {0}".format(payment.reference_name))
+				if (payment.reference_type == "Payment Entry"):
+					if (payment.payment_reference):
+						doc.reference_no = payment.payment_reference
+					doc.mode_of_payment = payment.mode_of_payment
+				doc.save()
+				doc.submit()
+		self.move_reconciled_entries()
+		self.populate_matching_invoices()
+
+	def move_reconciled_entries(self):
+		idx = 0
+		while idx < len(self.new_transaction_items):
+			entry = self.new_transaction_items[idx]
+			print("Checking transaction {0}: {2} in {1} entries".format(idx, len(self.new_transaction_items), entry.description))
+			idx += 1
+			if entry.reference_name is None: continue
+			doc = frappe.get_doc(entry.reference_type, entry.reference_name)
+			if doc.docstatus == 1 and (entry.reference_type == "Journal Entry" or doc.unallocated_amount == 0):
+				self.remove(entry)
+				rc_entry = self.append('reconciled_transaction_items', {})
+				dentry = entry.as_dict()
+				dentry.pop('idx', None)
+				rc_entry.update(dentry)
+				idx -= 1
+
+
+def get_matching_journal_entries(from_date, to_date, account, against, amount):
+	query = """select voucher_no, posting_date, account, against, debit_in_account_currency as debit, credit_in_account_currency as credit
+							      from `tabGL Entry`
+								  where posting_date between '{0}' and '{1}' and account = '{2}' and against = '{3}' and debit = '{4}'
+								  """.format(from_date, to_date, account, against, amount)
+	jv_entries = frappe.db.sql(query, as_dict=True)
+	#print("voucher query:{0}\n Returned {1} entries".format(query, len(jv_entries)))
+	return jv_entries
+
+def get_payments_matching_invoice(invoice, amount, pay_date):
+	query = """select pe.name as reference_name, per.reference_doctype as reference_type, per.outstanding_amount, per.allocated_amount
+				from `tabPayment Entry Reference` as per JOIN `tabPayment Entry` as pe on pe.name = per.parent
+				where per.reference_name='{0}' and (posting_date='{1}' or reference_date='{1}') and pe.docstatus != 2
+				""".format(invoice, pay_date)
+	payments = frappe.db.sql(query, as_dict=True)
+	if (len(payments) == 0): return
+	payment = next((payment for payment in payments if payment.allocated_amount == amount), payments[0])
+	#Hack: Update the reference type which is set to invoice type
+	payment.reference_type = "Payment Entry"
+	return payment
+
+def is_headers_present(headers, row):
+	for header in headers:
+		if header not in row:
+			return False
+	return True
+
+def get_header_index(headers, row):
+	header_index = {}
+	for header in headers:
+		if header in row:
+			header_index[header] = row.index(header)
+	return header_index
+
+def get_transaction_info(headers, header_index, row):
+	transaction = {}
+	for header in headers:
+		transaction[header] = row[header_index[header]]
+		if (transaction[header] == None):
+			transaction[header] = ""
+	return transaction
+
+def get_transaction_entries(filename, headers):
+	header_index = {}
+	rows, transactions = [], []
+
+	if (filename.lower().endswith("xlsx")):
+		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
+		rows = read_xlsx_file_from_attached_file(file_id=filename)
+	elif (filename.lower().endswith("csv")):
+		from frappe.utils.file_manager import get_file_path
+		from frappe.utils.csvutils import read_csv_content
+		filepath = get_file_path(filename)
+		with open(filepath,'rb') as csvfile:
+			rows = read_csv_content(csvfile.read())
+	elif (filename.lower().endswith("xls")):
+		rows = get_rows_from_xls_file(filename)
+	else:
+		frappe.throw("Only .csv and .xlsx files are supported currently")
+
+	for row in rows:
+		if len(row) == 0 or row[0] == None or not row[0]: continue
+		#print("Processing row {0}".format(row))
+		if header_index:
+			transaction = get_transaction_info(headers, header_index, row)
+			transactions.append(transaction)
+		elif is_headers_present(headers, row):
+			header_index =  get_header_index(headers, row)
+	return transactions
+
+def get_rows_from_xls_file(filename):
+	from frappe.utils.file_manager import get_file_path
+	filepath = get_file_path(filename)
+	import xlrd
+	book = xlrd.open_workbook(filepath)
+	sheets = book.sheets()
+	rows = []
+	for row in range(1, sheets[0].nrows):
+		row_values = []
+		for col in range(1, sheets[0].ncols):
+			row_values.append(sheets[0].cell_value(row, col))
+		rows.append(row_values)
+	return rows
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.js b/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.js
new file mode 100644
index 0000000..46d570f
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Statement Transaction Entry", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Statement Transaction Entry
+		() => frappe.tests.make('Bank Statement Transaction Entry', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.py b/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.py
new file mode 100644
index 0000000..4589483
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/test_bank_statement_transaction_entry.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestBankStatementTransactionEntry(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_transaction_invoice_item/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.json b/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.json
new file mode 100644
index 0000000..bcffff0
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.json
@@ -0,0 +1,344 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-07 13:58:53.827058", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transaction_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transaction Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 4, 
+   "fieldname": "payment_description", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payment Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer\nSupplier\nAccount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Party", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "invoice_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purchase Invoice\nSales Invoice\nJournal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "invoice", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "invoice_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "outstanding_amount", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Outstanding Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "allocated_amount", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Allocated Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-11-15 09:41:45.840947", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Transaction Invoice Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.py b/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.py
new file mode 100644
index 0000000..cb1b158
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_invoice_item/bank_statement_transaction_invoice_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementTransactionInvoiceItem(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_transaction_payment_item/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_transaction_payment_item/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.json b/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.json
new file mode 100644
index 0000000..177dccd
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.json
@@ -0,0 +1,494 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-11-07 14:03:05.651413",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 1,
+   "fieldname": "transaction_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Transaction Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 4,
+   "fieldname": "description",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 1,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 1,
+   "fieldname": "party_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Party Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Customer\nSupplier\nAccount",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 2,
+   "fieldname": "party",
+   "fieldtype": "Dynamic Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Party",
+   "length": 0,
+   "no_copy": 0,
+   "options": "party_type",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_6",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference Type",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Payment Entry\nJournal Entry",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0, 
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "mode_of_payment",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Mode of Payment",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Mode of Payment",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "outstanding_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "outstanding_amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 2,
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Reference Name",
+   "length": 0,
+   "no_copy": 0,
+   "options": "reference_type",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "payment_reference",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Payment Reference",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "invoices",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Invoices",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-11-15 19:18:52.876221",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Statement Transaction Payment Item",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.py b/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.py
new file mode 100644
index 0000000..9840c0d
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementTransactionPaymentItem(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_transaction_settings/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_transaction_settings/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.js b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.js
new file mode 100644
index 0000000..46aa4f2
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, sathishpy@gmail.com and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Statement Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.json b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.json
new file mode 100644
index 0000000..474bb90
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.json
@@ -0,0 +1,266 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "beta": 0, 
+ "creation": "2017-11-13 13:38:10.863592", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "'%d/%m/%Y'", 
+   "fieldname": "date_format", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date Format", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "statement_header_mapping", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Statement Header Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "header_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Statement Headers", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Settings Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transaction_data_mapping", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transaction Data Mapping", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapped_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mapped Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Bank Statement Transaction Settings Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-01-12 10:34:32.840487", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.py b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.py
new file mode 100644
index 0000000..de9a85f
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings/bank_statement_transaction_settings.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementSettings(Document):
+	def autoname(self):
+		self.name = self.bank_account + "-Mappings"
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.js b/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.js
new file mode 100644
index 0000000..f2381c0
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Statement Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Statement Settings
+		() => frappe.tests.make('Bank Statement Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.py b/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.py
new file mode 100644
index 0000000..aa7fe83
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings/test_bank_statement_transaction_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestBankStatementSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/bank_statement_transaction_settings_item/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/bank_statement_transaction_settings_item/__init__.py
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.json b/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.json
new file mode 100644
index 0000000..47c3209
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.json
@@ -0,0 +1,166 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-11-13 13:42:00.335432", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Transaction", 
+   "fieldname": "mapping_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mapping Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Transaction", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_data", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Bank Data", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Account", 
+   "fieldname": "mapped_data_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mapped Data Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account\nCustomer\nSupplier\nAccount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mapped_data", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mapped Data", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "mapped_data_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-01-08 00:13:49.973501", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Statement Transaction Settings Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.py b/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.py
new file mode 100644
index 0000000..bf0a590
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_statement_transaction_settings_item/bank_statement_transaction_settings_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, sathishpy@gmail.com and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BankStatementTransactionSettingsItem(Document):
+	pass
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
index 45f549e..63322a7 100644
--- a/erpnext/accounts/doctype/budget/budget.json
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -11,6 +12,8 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -23,7 +26,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Budget Against", 
    "length": 0, 
@@ -39,9 +42,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -53,7 +59,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Company", 
    "length": 0, 
@@ -69,9 +75,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,9 +109,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,9 +143,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -145,7 +160,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Fiscal Year", 
    "length": 0, 
@@ -161,9 +176,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,77 +207,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Stop", 
-   "fieldname": "action_if_annual_budget_exceeded", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Action if Annual Budget Exceeded", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStop\nWarn\nIgnore", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Warn", 
-   "description": "", 
-   "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Action if Accumulated Monthly Budget Exceeded", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStop\nWarn\nIgnore", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded)", 
+   "depends_on": "eval:in_list([\"Stop\", \"Warn\"], doc.action_if_accumulated_monthly_budget_exceeded_on_po || doc.action_if_accumulated_monthly_budget_exceeded_on_mr || doc.action_if_accumulated_monthly_budget_exceeded_on_actual)", 
    "fieldname": "monthly_distribution", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -283,9 +241,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -312,9 +273,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -328,6 +292,273 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Control Section", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicable_on_material_request", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Applicable on Material Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Stop", 
+   "depends_on": "eval:doc.applicable_on_material_request == 1", 
+   "fieldname": "action_if_annual_budget_exceeded_on_mr", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Annual Budget Exceeded on MR", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Warn", 
+   "depends_on": "eval:doc.applicable_on_material_request == 1", 
+   "fieldname": "action_if_accumulated_monthly_budget_exceeded_on_mr", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Accumulated Monthly Budget Exceeded on MR", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_13", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicable_on_purchase_order", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Applicable on Purchase Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Stop", 
+   "depends_on": "eval:doc.applicable_on_purchase_order == 1", 
+   "fieldname": "action_if_annual_budget_exceeded_on_po", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Annual Budget Exceeded on PO", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Warn", 
+   "depends_on": "eval:doc.applicable_on_purchase_order == 1", 
+   "fieldname": "action_if_accumulated_monthly_budget_exceeded_on_po", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Accumulated Monthly Budget Exceeded on PO", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -340,13 +571,119 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "applicable_on_booking_actual_expenses", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Applicable on booking actual expenses", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Stop", 
+   "depends_on": "eval:doc.applicable_on_booking_actual_expenses == 1", 
+   "fieldname": "action_if_annual_budget_exceeded", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Annual Budget Exceeded on Actual", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Warn", 
+   "depends_on": "eval:doc.applicable_on_booking_actual_expenses == 1", 
+   "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Action if Accumulated Monthly Budget Exceeded on Actual", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -367,23 +704,24 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:25:32.342055", 
+ "modified": "2018-05-31 00:21:23.449225", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget", 
@@ -392,7 +730,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index f99d0bb..ce0d994 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -5,8 +5,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, getdate, add_months, get_last_day, fmt_money
+from frappe.utils import flt, getdate, add_months, get_last_day, fmt_money, nowdate
 from frappe.model.naming import make_autoname
+from erpnext.accounts.utils import get_fiscal_year
 from frappe.model.document import Document
 
 class BudgetError(frappe.ValidationError): pass
@@ -23,6 +24,7 @@
 		self.validate_duplicate()
 		self.validate_accounts()
 		self.set_null_value()
+		self.validate_applicable_for()
 
 	def validate_duplicate(self):
 		budget_against_field = frappe.scrub(self.budget_against)
@@ -61,13 +63,35 @@
 		else:
 			self.cost_center = None
 
-def validate_expense_against_budget(args):
+	def validate_applicable_for(self):
+		if (self.applicable_on_material_request
+			and not (self.applicable_on_purchase_order and self.applicable_on_booking_actual_expenses)):
+			frappe.throw(_("Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"))
+
+		elif (self.applicable_on_purchase_order
+			and not (self.applicable_on_booking_actual_expenses)):
+			frappe.throw(_("Please enable Applicable on Booking Actual Expenses"))
+
+		elif not(self.applicable_on_material_request
+			or self.applicable_on_purchase_order or self.applicable_on_booking_actual_expenses):
+			self.applicable_on_booking_actual_expenses = 1
+
+def validate_expense_against_budget(args, company=None):
 	args = frappe._dict(args)
-	if not args.cost_center and not args.project:
+
+	if company:
+		args.company = company
+		args.fiscal_year = get_fiscal_year(nowdate(), company=company)[0]
+
+	if not (args.get('account') and args.get('cost_center')) and args.item_code:
+		args.cost_center, args.account = get_item_details(args)
+
+	if not (args.cost_center or args.project) and not args.account:
 		return
+
 	for budget_against in ['project', 'cost_center']:
-		if args.get(budget_against) \
-				and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
+		if (args.get(budget_against) and args.account
+				and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})):
 
 			if args.project and budget_against == 'project':
 				condition = "and b.project='%s'" % frappe.db.escape(args.project)
@@ -84,8 +108,12 @@
 			budget_records = frappe.db.sql("""
 				select
 					b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
-					b.action_if_annual_budget_exceeded, 
-					b.action_if_accumulated_monthly_budget_exceeded
+					ifnull(b.applicable_on_material_request, 0) as for_material_request,
+					ifnull(applicable_on_purchase_order,0) as for_purchase_order,
+					ifnull(applicable_on_booking_actual_expenses,0) as for_actual_expenses,
+					b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded,
+					b.action_if_annual_budget_exceeded_on_mr, b.action_if_accumulated_monthly_budget_exceeded_on_mr,
+					b.action_if_annual_budget_exceeded_on_po, b.action_if_accumulated_monthly_budget_exceeded_on_po
 				from 
 					`tabBudget` b, `tabBudget Account` ba
 				where
@@ -102,8 +130,8 @@
 def validate_budget_records(args, budget_records):
 	for budget in budget_records:
 		if flt(budget.budget_amount):
-			yearly_action = budget.action_if_annual_budget_exceeded
-			monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+			amount = get_amount(args, budget)
+			yearly_action, monthly_action = get_actions(args, budget)
 
 			if monthly_action in ["Stop", "Warn"]:
 				budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
@@ -111,16 +139,15 @@
 				args["month_end_date"] = get_last_day(args.posting_date)
 
 				compare_expense_with_budget(args, budget_amount, 
-					_("Accumulated Monthly"), monthly_action, budget.budget_against)
+					_("Accumulated Monthly"), monthly_action, budget.budget_against, amount)
 
 			if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
 				and yearly_action != monthly_action:
 				compare_expense_with_budget(args, flt(budget.budget_amount), 
-						_("Annual"), yearly_action, budget.budget_against)
+						_("Annual"), yearly_action, budget.budget_against, amount)
 
-
-def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against):
-	actual_expense = get_actual_expense(args)
+def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against, amount=0):
+	actual_expense = amount or get_actual_expense(args)
 	if actual_expense > budget_amount:
 		diff = actual_expense - budget_amount
 		currency = frappe.db.get_value('Company', args.company, 'default_currency')
@@ -136,6 +163,58 @@
 		else:
 			frappe.msgprint(msg, indicator='orange')
 
+def get_actions(args, budget):
+	yearly_action = budget.action_if_annual_budget_exceeded
+	monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+
+	if args.get('doctype') == 'Material Request' and budget.for_material_request:
+		yearly_action = budget.action_if_annual_budget_exceeded_on_mr
+		monthly_action = budget.action_if_accumulated_monthly_budget_exceeded_on_mr
+
+	elif args.get('doctype') == 'Purchase Order' and budget.for_purchase_order:
+		yearly_action = budget.action_if_annual_budget_exceeded_on_po
+		monthly_action = budget.action_if_accumulated_monthly_budget_exceeded_on_po
+
+	return yearly_action, monthly_action
+
+def get_amount(args, budget):
+	amount = 0
+
+	if args.get('doctype') == 'Material Request' and budget.for_material_request:
+		amount = (get_requested_amount(args)
+			+ get_ordered_amount(args) + get_actual_expense(args))
+
+	elif args.get('doctype') == 'Purchase Order' and budget.for_purchase_order:
+		amount = get_ordered_amount(args) + get_actual_expense(args)
+
+	return amount
+
+def get_requested_amount(args):
+	item_code = args.get('item_code')
+	condition = get_project_condiion(args)
+
+	data = frappe.db.sql(""" select ifnull((sum(stock_qty - ordered_qty) * rate), 0) as amount
+		from `tabMaterial Request Item` where item_code = %s and docstatus = 1
+		and stock_qty > ordered_qty and {0}""".format(condition), item_code, as_list=1)
+
+	return data[0][0] if data else 0
+
+def get_ordered_amount(args):
+	item_code = args.get('item_code')
+	condition = get_project_condiion(args)
+
+	data = frappe.db.sql(""" select ifnull(sum(amount - billed_amt), 0) as amount
+		from `tabPurchase Order Item` where item_code = %s and docstatus = 1
+		and amount > billed_amt and {0}""".format(condition), item_code, as_list=1)
+
+	return data[0][0] if data else 0
+
+def get_project_condiion(args):
+	condition = "1=1"
+	if args.get('project'):
+		condition = "project = '%s'" %(args.get('project'))
+
+	return condition
 
 def get_actual_expense(args):
 	condition1 = " and gle.posting_date <= %(month_end_date)s" \
@@ -148,7 +227,7 @@
 			where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)"""
 	
 	elif args.budget_against_field == "Project":
-		condition2 = "and exists(select name from `tabProject` where name=gle.project)"
+		condition2 = "and exists(select name from `tabProject` where name=gle.project and gle.project = %(budget_against)s)"
 
 	return flt(frappe.db.sql("""
 		select sum(gle.debit) - sum(gle.credit)
@@ -161,7 +240,6 @@
 			{condition2}
 	""".format(condition1=condition1, condition2=condition2), (args))[0][0])
 
-
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}
 	if monthly_distribution:
@@ -182,3 +260,38 @@
 		dt = add_months(dt, 1)
 
 	return annual_budget * accumulated_percentage / 100
+
+def get_item_details(args):
+	cost_center, expense_account = None, None
+
+	if not args.get('company'):
+		return cost_center, expense_account
+
+	if args.item_code:
+		item_defaults = frappe.db.get_value('Item Default',
+			{'parent': args.item_code, 'company': args.get('company')},
+			['buying_cost_center', 'expense_account'])
+		if item_defaults:
+			cost_center, expense_account = item_defaults
+
+	if not (cost_center and expense_account):
+		for doctype in ['Item Group', 'Company']:
+			data = get_expense_cost_center(doctype,
+				args.get(frappe.scrub(doctype)))
+
+			if not cost_center and data:
+				cost_center = data[0]
+
+			if not expense_account and data:
+				expense_account = data[1]
+
+			if cost_center and expense_account:
+				return cost_center, expense_account
+
+	return cost_center, expense_account
+
+def get_expense_cost_center(doctype, value):
+	fields = (['default_cost_center', 'default_expense_account']
+		if doctype == 'Item Group' else ['cost_center', 'default_expense_account'])
+
+	return frappe.db.get_value(doctype, value, fields)
diff --git a/erpnext/accounts/doctype/budget_account/budget_account.json b/erpnext/accounts/doctype/budget_account/budget_account.json
index 172e092..ead0761 100644
--- a/erpnext/accounts/doctype/budget_account/budget_account.json
+++ b/erpnext/accounts/doctype/budget_account/budget_account.json
@@ -73,7 +73,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
index e78620e..9da4411 100644
--- a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
+++ b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
@@ -150,7 +150,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
index 51da9c0..e9993c3 100644
--- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
@@ -1020,7 +1020,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
index 0556e9b..24cd3dd 100644
--- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
@@ -27,10 +27,20 @@
 	doc = frappe.get_doc("Cheque Print Template", template_name)
 	
 	cheque_print.html = """
+<style>
+	.print-format {
+		padding: 0px;
+	}
+	@media screen {
+		.print-format {
+			padding: 0in;
+		}
+	}
+</style>
 <div style="position: relative; top:%(starting_position_from_top_edge)scm">
 	<div style="width:%(cheque_width)scm;height:%(cheque_height)scm;">
 		<span style="top:%(acc_pay_dist_from_top_edge)scm; left:%(acc_pay_dist_from_left_edge)scm;
-			border-bottom: solid 1px;border-top:solid 1px; position: absolute;">
+			border-bottom: solid 1px;border-top:solid 1px; width:2cm;text-align: center; position: absolute;">
 				%(message_to_show)s
 		</span>
 		<span style="top:%(date_dist_from_top_edge)scm; left:%(date_dist_from_left_edge)scm;
@@ -38,11 +48,11 @@
 			{{ frappe.utils.formatdate(doc.reference_date) or '' }}
 		</span>
 		<span style="top:%(acc_no_dist_from_top_edge)scm;left:%(acc_no_dist_from_left_edge)scm;
-			position: absolute;">
+			position: absolute;  min-width: 6cm;">
 			{{ doc.account_no or '' }}
 		</span>
 		<span style="top:%(payer_name_from_top_edge)scm;left: %(payer_name_from_left_edge)scm;
-			position: absolute;">
+			position: absolute;  min-width: 6cm;">
 			{{doc.party_name}}
 		</span>
 		<span style="top:%(amt_in_words_from_top_edge)scm; left:%(amt_in_words_from_left_edge)scm;
@@ -51,11 +61,11 @@
 				{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}
 		</span>
 		<span style="top:%(amt_in_figures_from_top_edge)scm;left: %(amt_in_figures_from_left_edge)scm;
-			position: absolute;">
+			position: absolute; min-width: 4cm;">
 			{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}
 		</span>
 		<span style="top:%(signatory_from_top_edge)scm;left: %(signatory_from_left_edge)scm;
-			position: absolute;">
+			position: absolute;  min-width: 6cm;">
 			{{doc.company}}
 		</span>
 	</div>
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/closed_document/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/closed_document/__init__.py
diff --git a/erpnext/accounts/doctype/closed_document/closed_document.json b/erpnext/accounts/doctype/closed_document/closed_document.json
new file mode 100644
index 0000000..f6ec76b
--- /dev/null
+++ b/erpnext/accounts/doctype/closed_document/closed_document.json
@@ -0,0 +1,104 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 18:51:29.720606", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "document_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Document Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "closed", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Closed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 18:51:41.118025", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Closed Document", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/closed_document/closed_document.py b/erpnext/accounts/doctype/closed_document/closed_document.py
new file mode 100644
index 0000000..048ceee
--- /dev/null
+++ b/erpnext/accounts/doctype/closed_document/closed_document.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ClosedDocument(Document):
+	pass
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index cbc37ff..a5bcaf4 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -15,8 +15,57 @@
 				}
 			}
 		})
+	},
+	refresh: function(frm) {
+		if (!frm.is_new()) {
+			frm.add_custom_button(__('Update Cost Center Number'), function () {
+				frm.trigger("update_cost_center_number");
+			});
+		}
+	},
+	update_cost_center_number: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Update Cost Center Number'),
+			fields: [
+				{
+					"label": 'Cost Center Number',
+					"fieldname": "cost_center_number",
+					"fieldtype": "Data",
+					"reqd": 1
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+				if(data.cost_center_number === frm.doc.cost_center_number) {
+					d.hide();
+					return;
+				}
+				frappe.call({
+					method: "erpnext.accounts.doctype.cost_center.cost_center.update_number_field",
+					args: {
+						doctype_name: frm.doc.doctype,
+						name: frm.doc.name,
+						field_name: d.fields[0].fieldname,
+						field_value: data.cost_center_number,
+						company: frm.doc.company
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
+								frappe.set_route("Form", "Cost Center", r.message);
+							} else {
+								me.set_value("cost_center_number", data.cost_center_number);
+							}
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Update')
+		});
+		d.show();
 	}
-})
+});
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	var intro_txt = '';
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 9eddeec..4da21f1 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:cost_center_name", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -38,9 +40,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,9 +72,42 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Cost Center Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -99,9 +136,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,9 +169,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,10 +198,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -188,9 +231,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -218,9 +263,11 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -248,9 +295,11 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -279,22 +328,23 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-02-17 16:22:27.129572", 
+ "modified": "2018-04-26 15:26:25.325778", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -302,7 +352,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -322,7 +371,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -342,7 +390,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -362,7 +409,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -382,7 +428,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
index fe1e907..24af0ce 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import cint, cstr
 from frappe.utils.nestedset import NestedSet
 
 class CostCenter(NestedSet):
@@ -62,8 +63,68 @@
 		super(CostCenter, self).after_rename(olddn, newdn, merge)
 
 		if not merge:
-			frappe.db.set_value("Cost Center", newdn, "cost_center_name",
-				" - ".join(newdn.split(" - ")[:-1]))
+			new_cost_center = frappe.db.get_value("Cost Center", newdn, ["cost_center_name", "cost_center_number"], as_dict=1)
+
+			# exclude company abbr
+			new_parts = newdn.split(" - ")[:-1]
+			# update cost center number and remove from parts
+			if new_parts[0][0].isdigit():
+				if len(new_parts) == 1:
+					new_parts = newdn.split(" ")
+				if new_cost_center.cost_center_number != new_parts[0]:
+					validate_field_number("Cost Center", self.name, new_parts[0], self.company, "cost_center_number")
+					self.cost_center_number = new_parts[0]
+					self.db_set("cost_center_number", new_parts[0])
+				new_parts = new_parts[1:]
+
+			# update cost center name
+			cost_center_name = " - ".join(new_parts)
+			if new_cost_center.cost_center_name != cost_center_name:
+				self.cost_center_name = cost_center_name
+				self.db_set("cost_center_name", cost_center_name)
 
 def on_doctype_update():
-	frappe.db.add_index("Cost Center", ["lft", "rgt"])
\ No newline at end of file
+	frappe.db.add_index("Cost Center", ["lft", "rgt"])
+
+def get_doc_name_autoname(field_value, doc_title, name, company):
+	if company:
+		name_split=name.split("-")
+		parts = [doc_title.strip(), name_split[len(name_split)-1].strip()]
+	else:
+		parts = [doc_title.strip()]
+	if cstr(field_value).strip():
+		parts.insert(0, cstr(field_value).strip())
+	return ' - '.join(parts)
+
+def validate_field_number(doctype_name, name, field_value, company, field_name):
+	if field_value:
+		if company:
+			doctype_with_same_number = frappe.db.get_value(doctype_name,
+				{field_name: field_value, "company": company, "name": ["!=", name]})
+		else:
+			doctype_with_same_number = frappe.db.get_value(doctype_name,
+				{field_name: field_value, "name": ["!=", name]})
+		if doctype_with_same_number:
+			frappe.throw(_("{0} Number {1} already used in account {2}")
+				.format(doctype_name, field_value, doctype_with_same_number))
+
+@frappe.whitelist()
+def update_number_field(doctype_name, name, field_name, field_value, company):
+
+	doc_title = frappe.db.get_value(doctype_name, name, frappe.scrub(doctype_name)+"_name")
+
+	validate_field_number(doctype_name, name, field_value, company, field_name)
+
+	frappe.db.set_value(doctype_name, name, field_name, field_value)
+
+	if doc_title[0].isdigit():
+		separator = " - " if " - " in doc_title else " "
+		doc_title = doc_title.split(separator, 1)[1]
+
+	frappe.db.set_value(doctype_name, name, frappe.scrub(doctype_name)+"_name", doc_title)
+
+	new_name = get_doc_name_autoname(field_value, doc_title, name, company)
+
+	if name != new_name:
+		frappe.rename_doc(doctype_name, name, new_name)
+		return new_name		
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/exchange_rate_revaluation/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/exchange_rate_revaluation/__init__.py
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
new file mode 100644
index 0000000..dd44450
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
@@ -0,0 +1,99 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Exchange Rate Revaluation', {
+	refresh: function(frm) {
+		if(frm.doc.docstatus==1) {
+			frm.add_custom_button(__('Make Journal Entry'), function() {
+				return frm.events.make_jv(frm);
+			});
+		}
+	},
+
+	get_entries: function(frm) {
+		frappe.call({
+			method: "get_accounts_data",
+			doc: cur_frm.doc,
+			callback: function(r){
+				frappe.model.clear_table(frm.doc, "accounts");
+				if(r.message) {
+					r.message.forEach((d) => {
+						cur_frm.add_child("accounts",d);
+					});
+					frm.events.get_total_gain_loss(frm);
+					refresh_field("accounts");
+				}
+			}
+		});
+	},
+
+	get_total_gain_loss: function(frm) {
+		if(!(frm.doc.accounts && frm.doc.accounts.length)) return;
+
+		let total_gain_loss = 0;
+		frm.doc.accounts.forEach((d) => {
+			d.gain_loss = flt(d.new_balance_in_base_currency, precision("new_balance_in_base_currency", d)) - flt(d.balance_in_base_currency, precision("balance_in_base_currency", d));
+			total_gain_loss += flt(d.gain_loss, precision("gain_loss", d));
+		});
+		
+		frm.set_value("total_gain_loss", flt(total_gain_loss, precision("total_gain_loss")));
+		frm.refresh_fields();
+	},
+
+	make_jv : function(frm) {
+		frappe.call({
+			method: "make_jv_entry",
+			doc: frm.doc,
+			callback: function(r){
+				if (r.message)
+					var doc = frappe.model.sync(r.message)[0];
+				frappe.set_route("Form", doc.doctype, doc.name);
+			}
+		});
+	}
+});
+
+frappe.ui.form.on("Exchange Rate Revaluation Account", {
+	new_exchange_rate: function(frm, cdt, cdn) {
+		var row = frappe.get_doc(cdt, cdn);
+		row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency),
+			precision("new_balance_in_base_currency", row));
+		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency);
+		refresh_field("accounts");
+		frm.events.get_total_gain_loss(frm);
+	},
+
+	account: function(frm, cdt, cdn) {
+		get_account_details(frm, cdt, cdn);
+	},
+
+	party: function(frm, cdt, cdn) {
+		get_account_details(frm, cdt, cdn);
+	},
+
+	accounts_remove: function(frm) {
+		frm.events.get_total_gain_loss(frm);
+	}
+});
+
+var get_account_details = function(frm, cdt, cdn) {
+	var row = frappe.get_doc(cdt, cdn);
+	if(!frm.doc.company || !frm.doc.posting_date) {
+		frappe.throw(__("Please select Company and Posting Date to getting entries"));
+	}
+	frappe.call({
+		method: "erpnext.accounts.doctype.exchange_rate_revaluation.exchange_rate_revaluation.get_account_details",
+		args:{
+			account: row.account,
+			company: frm.doc.company,
+			posting_date: frm.doc.posting_date,
+			party_type: row.party_type,
+			party: row.party
+		},
+		callback: function(r){
+			$.extend(row, r.message);
+			refresh_field("accounts");
+			frm.events.get_total_gain_loss(frm);
+		}
+	});
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
new file mode 100644
index 0000000..b37c67e
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
@@ -0,0 +1,379 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "ERV.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:25:55.943587", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_entries", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get Entries", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exchange Rate Revaluation Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Exchange Rate Revaluation Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_gain_loss", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Gain/Loss", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Exchange Rate Revaluation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-05 17:50:56.352167", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Exchange Rate Revaluation", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
new file mode 100644
index 0000000..aa19a9e
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
@@ -0,0 +1,170 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe import _
+from frappe.utils import flt
+from frappe.model.document import Document
+from frappe.model.meta import get_field_precision
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_balance_on
+
+class ExchangeRateRevaluation(Document):
+	def validate(self):
+		self.set_total_gain_loss()
+
+	def set_total_gain_loss(self):
+		total_gain_loss = 0
+		for d in self.accounts:
+			d.gain_loss = flt(d.new_balance_in_base_currency, d.precision("new_balance_in_base_currency")) \
+				- flt(d.balance_in_base_currency, d.precision("balance_in_base_currency"))
+			total_gain_loss += flt(d.gain_loss, d.precision("gain_loss"))
+		self.total_gain_loss = flt(total_gain_loss, self.precision("total_gain_loss"))
+	
+	def validate_mandatory(self):
+		if not (self.company and self.posting_date):
+			frappe.throw(_("Please select Company and Posting Date to getting entries"))
+
+	def get_accounts_data(self, account=None):
+		accounts = []
+		self.validate_mandatory()
+		company_currency = erpnext.get_company_currency(self.company)
+		precision = get_field_precision(frappe.get_meta("Exchange Rate Revaluation Account")
+			.get_field("new_balance_in_base_currency"), company_currency)
+		for d in self.get_accounts_from_gle():
+			
+			current_exchange_rate = d.balance / d.balance_in_account_currency \
+				if d.balance_in_account_currency else 0
+			new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, self.posting_date)
+			new_balance_in_base_currency = flt(d.balance_in_account_currency * new_exchange_rate)
+			gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision)
+			if gain_loss:
+				accounts.append({
+					"account": d.account,
+					"party_type": d.party_type,
+					"party": d.party,
+					"account_currency": d.account_currency,
+					"balance_in_base_currency": d.balance,
+					"balance_in_account_currency": d.balance_in_account_currency,
+					"current_exchange_rate": current_exchange_rate,
+					"new_exchange_rate": new_exchange_rate,
+					"new_balance_in_base_currency": new_balance_in_base_currency
+				})
+		return accounts
+
+	def get_accounts_from_gle(self):
+		company_currency = erpnext.get_company_currency(self.company)
+		accounts = frappe.db.sql_list("""
+			select name
+			from tabAccount
+			where is_group = 0
+				and report_type = 'Balance Sheet'
+				and root_type in ('Asset', 'Liability', 'Equity')
+				and account_type != 'Stock'
+				and company=%s
+				and account_currency != %s
+			order by name""",(self.company, company_currency))
+
+		account_details = frappe.db.sql("""
+			select 
+				account, party_type, party, account_currency,
+				sum(debit_in_account_currency) - sum(credit_in_account_currency) as balance_in_account_currency,
+				sum(debit) - sum(credit) as balance
+			from `tabGL Entry`
+			where account in (%s)
+			group by account, party_type, party
+			having sum(debit) != sum(credit)
+			order by account
+		""" % ', '.join(['%s']*len(accounts)), tuple(accounts), as_dict=1)
+
+		return account_details
+
+	def make_jv_entry(self):
+		if self.total_gain_loss == 0:
+			return
+
+		unrealized_exchange_gain_loss_account = frappe.db.get_value("Company", self.company,
+			"unrealized_exchange_gain_loss_account")
+		if not unrealized_exchange_gain_loss_account:
+			frappe.throw(_("Please set Unrealized Exchange Gain/Loss Account in Company {0}")
+				.format(self.company))
+
+		journal_entry = frappe.new_doc('Journal Entry')
+		journal_entry.voucher_type = 'Exchange Rate Revaluation'
+		journal_entry.company = self.company
+		journal_entry.posting_date = self.posting_date
+		journal_entry.multi_currency = 1
+
+		journal_entry_accounts = []
+		for d in self.accounts:
+			dr_or_cr = "debit_in_account_currency" \
+				if d.get("balance_in_account_currency") > 0 else "credit_in_account_currency"
+
+			reverse_dr_or_cr = "debit_in_account_currency" \
+				if dr_or_cr=="credit_in_account_currency" else "credit_in_account_currency"
+
+			journal_entry_accounts.append({
+				"account": d.get("account"),
+				"party_type": d.get("party_type"),
+				"party": d.get("party"),
+				"account_currency": d.get("account_currency"),
+				"balance": d.get("balance_in_account_currency"),
+				dr_or_cr: abs(d.get("balance_in_account_currency")),
+				"exchange_rate":d.get("new_exchange_rate"),
+				"reference_type": "Exchange Rate Revaluation",
+				"reference_name": self.name,
+				})
+			journal_entry_accounts.append({
+				"account": d.get("account"),
+				"party_type": d.get("party_type"),
+				"party": d.get("party"),
+				"account_currency": d.get("account_currency"),
+				"balance": d.get("balance_in_account_currency"),
+				reverse_dr_or_cr: abs(d.get("balance_in_account_currency")),
+				"exchange_rate": d.get("current_exchange_rate"),
+				"reference_type": "Exchange Rate Revaluation",
+				"reference_name": self.name
+				})
+
+		journal_entry_accounts.append({
+			"account": unrealized_exchange_gain_loss_account,
+			"balance": get_balance_on(unrealized_exchange_gain_loss_account),
+			"debit_in_account_currency": abs(self.total_gain_loss) if self.total_gain_loss < 0 else 0,
+			"credit_in_account_currency": self.total_gain_loss if self.total_gain_loss > 0 else 0,
+			"exchange_rate": 1,
+			"reference_type": "Exchange Rate Revaluation",
+			"reference_name": self.name,
+			})
+
+		journal_entry.set("accounts", journal_entry_accounts)
+		journal_entry.set_amounts_in_company_currency()
+		journal_entry.set_total_debit_credit()
+		return journal_entry.as_dict()
+
+@frappe.whitelist()
+def get_account_details(account, company, posting_date, party_type=None, party=None):
+	account_currency, account_type = frappe.db.get_value("Account", account,
+		["account_currency", "account_type"])
+	if account_type in ["Receivable", "Payable"] and not (party_type and party):
+		frappe.throw(_("Party Type and Party is mandatory for {0} account").format(account_type))
+
+	account_details = {}
+	company_currency = erpnext.get_company_currency(company)
+	balance = get_balance_on(account, party_type=party_type, party=party, in_account_currency=False)
+	if balance:
+		balance_in_account_currency = get_balance_on(account, party_type=party_type, party=party)
+		current_exchange_rate = balance / balance_in_account_currency if balance_in_account_currency else 0
+		new_exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
+		new_balance_in_base_currency = balance_in_account_currency * new_exchange_rate
+		account_details = {
+			"account_currency": account_currency,
+			"balance_in_base_currency": balance,
+			"balance_in_account_currency": balance_in_account_currency,
+			"current_exchange_rate": current_exchange_rate,
+			"new_exchange_rate": new_exchange_rate,
+			"new_balance_in_base_currency": new_balance_in_base_currency
+		}
+
+	return account_details
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.js b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.js
new file mode 100644
index 0000000..57c6a78
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Exchange Rate Revaluation", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Exchange Rate Revaluation
+		() => frappe.tests.make('Exchange Rate Revaluation', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
new file mode 100644
index 0000000..3b037d1
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestExchangeRateRevaluation(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/exchange_rate_revaluation_account/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/exchange_rate_revaluation_account/__init__.py
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
new file mode 100644
index 0000000..e834266
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
@@ -0,0 +1,446 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 18:30:06.110433", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Party", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Account Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "balance_in_account_currency", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Balance In Account Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "balances", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "current_exchange_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Current Exchange Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "balance_in_base_currency", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Balance In Base Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_exchange_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "New Exchange Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_balance_in_base_currency", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "New Balance In Base Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gain_loss", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Gain/Loss", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-05 17:03:03.512559", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Exchange Rate Revaluation Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.py b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.py
new file mode 100644
index 0000000..87d7b67
--- /dev/null
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ExchangeRateRevaluationAccount(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/accounts/doctype/finance_book/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/accounts/doctype/finance_book/__init__.py
diff --git a/erpnext/accounts/doctype/finance_book/finance_book.js b/erpnext/accounts/doctype/finance_book/finance_book.js
new file mode 100644
index 0000000..71191bb
--- /dev/null
+++ b/erpnext/accounts/doctype/finance_book/finance_book.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Finance Book', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/finance_book/finance_book.json b/erpnext/accounts/doctype/finance_book/finance_book.json
new file mode 100644
index 0000000..c9fb843
--- /dev/null
+++ b/erpnext/accounts/doctype/finance_book/finance_book.json
@@ -0,0 +1,133 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:finance_book_name", 
+ "beta": 0, 
+ "creation": "2018-04-13 17:42:43.252224", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "finance_book_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-book", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-09 14:55:01.394387", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Finance Book", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Auditor", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "finance_book_name", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/finance_book/finance_book.py b/erpnext/accounts/doctype/finance_book/finance_book.py
new file mode 100644
index 0000000..bc9fce2
--- /dev/null
+++ b/erpnext/accounts/doctype/finance_book/finance_book.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class FinanceBook(Document):
+	pass
diff --git a/erpnext/accounts/doctype/finance_book/test_finance_book.js b/erpnext/accounts/doctype/finance_book/test_finance_book.js
new file mode 100644
index 0000000..9fb7d4f
--- /dev/null
+++ b/erpnext/accounts/doctype/finance_book/test_finance_book.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Finance Book", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Finance Book
+		() => frappe.tests.make('Finance Book', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/finance_book/test_finance_book.py b/erpnext/accounts/doctype/finance_book/test_finance_book.py
new file mode 100644
index 0000000..771e813
--- /dev/null
+++ b/erpnext/accounts/doctype/finance_book/test_finance_book.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestFinanceBook(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index f12de79..4ca9f6b 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:year", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,9 +43,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,9 +74,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,9 +106,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -128,9 +136,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,21 +168,54 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "auto_created", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Auto Created", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:22:08.431278", 
+ "modified": "2018-04-25 14:21:41.273354", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year", 
@@ -180,7 +223,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -200,7 +242,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -220,7 +261,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -240,7 +280,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -260,7 +299,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -280,7 +318,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 517a2a3..92da787 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -104,6 +104,7 @@
 			start_year = cstr(new_fy.year_start_date.year)
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
+			new_fy.auto_created = 1
 
 			new_fy.insert(ignore_permissions=True)
 		except frappe.NameError:
diff --git a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
index 4e568f1..3eb0d74 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
@@ -42,7 +42,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 4412661..b4da2db 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -104,6 +106,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -164,6 +168,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -196,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -229,6 +235,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -262,6 +269,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -293,6 +301,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -324,6 +333,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -355,6 +365,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -386,6 +397,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -418,6 +430,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -450,6 +463,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -482,6 +496,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -514,6 +529,38 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "voucher_detail_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Voucher Detail No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -545,6 +592,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -576,6 +624,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -608,6 +657,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -640,6 +690,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -672,6 +723,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -704,6 +756,39 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -718,7 +803,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-20 12:40:09.611951", 
+ "modified": "2018-05-15 02:12:50.035755", 
+ "modified": "2018-04-23 02:15:22.297509", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 
@@ -726,7 +812,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -746,7 +831,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -766,7 +850,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -794,4 +877,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 98f68d5..6ad1df5 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -17,7 +17,8 @@
 					"from_date": frm.doc.posting_date,
 					"to_date": frm.doc.posting_date,
 					"company": frm.doc.company,
-					group_by_voucher: 0
+					"finance_book": frm.doc.finance_book,
+					"group_by_voucher": 0
 				};
 				frappe.set_route("query-report", "General Ledger");
 			}, "fa fa-table");
@@ -37,6 +38,55 @@
 
 		// hide /unhide fields based on currency
 		erpnext.journal_entry.toggle_fields_based_on_currency(frm);
+
+		if ((frm.doc.voucher_type == "Inter Company Journal Entry") && (frm.doc.docstatus == 1) && (!frm.doc.inter_company_journal_entry_reference)) {
+			frm.add_custom_button(__("Make Inter Company Journal Entry"),
+				function() {
+					frm.trigger("make_inter_company_journal_entry");
+				}
+			);
+		}
+	},
+
+	make_inter_company_journal_entry: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __("Select Company"),
+			fields: [
+				{
+					'fieldname': 'company',
+					'fieldtype': 'Link',
+					'label': __('Company'),
+					'options': 'Company',
+					"get_query": function () {
+						return {
+							filters: [
+								["Company", "name", "!=", frm.doc.company]
+							]
+						};
+					},
+					'reqd': 1
+				}
+			],
+		});
+		d.set_primary_action(__("Make"), function() {
+			d.hide();
+			var args = d.get_values();
+			frappe.call({
+				args: {
+					"name": frm.doc.name,
+					"voucher_type": frm.doc.voucher_type,
+					"company": args.company
+				},
+				method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_inter_company_journal_entry",
+				callback: function (r) {
+					if (r.message) {
+						var doc = frappe.model.sync(r.message)[0];
+						frappe.set_route("Form", doc.doctype, doc.name);
+					}
+				}
+			});
+		});
+		d.show();
 	},
 
 	multi_currency: function(frm) {
@@ -109,9 +159,14 @@
 			};
 		});
 
-		me.frm.set_query("party_type", "accounts", function() {
-			return{
-				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
+		me.frm.set_query("party_type", "accounts", function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
+
+			return {
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
+				filters: {
+					'account': row.account
+				}
 			}
 		});
 
@@ -549,9 +604,15 @@
 	},
 
 	account_query: function(frm) {
+		var inter_company = 0;
+		if (frm.doc.voucher_type == "Inter Company Journal Entry") {
+			inter_company = 1;
+		}
+
 		var filters = {
 			company: frm.doc.company,
-			is_group: 0
+			is_group: 0,
+			inter_company_account: inter_company
 		};
 		if(!frm.doc.multi_currency) {
 			$.extend(filters, {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 5522d6e..ffccf8e 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -96,7 +96,7 @@
    "no_copy": 0, 
    "oldfieldname": "voucher_type", 
    "oldfieldtype": "Select", 
-   "options": "Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry", 
+   "options": "Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -244,6 +244,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "2_add_edit_gl_entries", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -830,7 +862,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -847,6 +879,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.voucher_type== \"Inter Company Journal Entry\"", 
+   "fieldname": "inter_company_journal_entry_reference", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inter Company Journal Entry Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break98", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1520,7 +1585,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-04-30 17:34:38.429196", 
+ "modified": "2018-05-09 14:56:08.687994", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index d1c79d0..01ac14c 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext, json
-from frappe.utils import cstr, flt, fmt_money, formatdate, getdate
+from frappe.utils import cstr, flt, fmt_money, formatdate, getdate, nowdate, cint
 from frappe import msgprint, _, scrub
 from erpnext.controllers.accounts_controller import AccountsController
 from erpnext.accounts.utils import get_balance_on, get_account_currency
@@ -40,15 +40,17 @@
 		self.validate_credit_debit_note()
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
+		self.validate_inter_company_accounts()
 		if not self.title:
 			self.title = self.get_title()
 
 	def on_submit(self):
 		self.check_credit_limit()
 		self.make_gl_entries()
-		self.update_loan()
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.update_loan()
+		self.update_inter_company_jv()
 
 	def get_title(self):
 		return self.pay_to_recd_from or self.accounts[0].account
@@ -60,10 +62,24 @@
 				if d.reference_type in ("Sales Order", "Purchase Order", "Employee Advance"):
 					advance_paid.setdefault(d.reference_type, []).append(d.reference_name)
 
-		for voucher_type, order_list in advance_paid.items():
+		for voucher_type, order_list in iteritems(advance_paid):
 			for voucher_no in list(set(order_list)):
 				frappe.get_doc(voucher_type, voucher_no).set_total_advance_paid()
 
+	def validate_inter_company_accounts(self):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
+			doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)
+			account_currency = frappe.db.get_value("Company", self.company, "default_currency")
+			previous_account_currency = frappe.db.get_value("Company", doc.company, "default_currency")
+			if account_currency == previous_account_currency:
+				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
+					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
+
+	def update_inter_company_jv(self):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
+			frappe.db.set_value("Journal Entry", self.inter_company_journal_entry_reference,\
+				"inter_company_journal_entry_reference", self.name)
+
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
 		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
@@ -75,6 +91,8 @@
 		self.update_loan()
 		self.unlink_advance_entry_reference()
 		self.unlink_asset_reference()
+		self.unlink_inter_company_jv()
+		self.unlink_asset_adjustment_entry()
 
 	def unlink_advance_entry_reference(self):
 		for d in self.get("accounts"):
@@ -92,11 +110,25 @@
 				for s in asset.get("schedules"):
 					if s.journal_entry == self.name:
 						s.db_set("journal_entry", None)
-						asset.value_after_depreciation += s.depreciation_amount
 
-						asset.db_set("value_after_depreciation", asset.value_after_depreciation)
+						idx = cint(s.finance_book_id) or 1
+						finance_books = asset.get('finance_books')[idx - 1]
+						finance_books.value_after_depreciation += s.depreciation_amount
+						finance_books.db_update()
+
 						asset.set_status()
 
+	def unlink_inter_company_jv(self):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
+			frappe.db.set_value("Journal Entry", self.inter_company_journal_entry_reference,\
+				"inter_company_journal_entry_reference", "")
+			frappe.db.set_value("Journal Entry", self.name,\
+				"inter_company_journal_entry_reference", "")
+
+	def unlink_asset_adjustment_entry(self):
+		frappe.db.sql(""" update `tabAsset Adjustment`
+			set journal_entry = null where journal_entry = %s""", self.name)
+
 	def validate_party(self):
 		for d in self.get("accounts"):
 			account_type = frappe.db.get_value("Account", d.account, "account_type")
@@ -127,7 +159,7 @@
 				if (d.party_type == 'Customer' and flt(d.credit) > 0) or \
 						(d.party_type == 'Supplier' and flt(d.debit) > 0):
 					if d.is_advance=="No":
-						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account), alert=1)
+						msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account), alert=True)
 					elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
 						frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
 
@@ -187,7 +219,7 @@
 				d.reference_name = None
 			if not d.reference_name:
 				d.reference_type = None
-			if d.reference_type and d.reference_name and (d.reference_type in field_dict.keys()):
+			if d.reference_type and d.reference_name and (d.reference_type in list(field_dict)):
 				dr_or_cr = "credit_in_account_currency" \
 					if d.reference_type in ("Sales Order", "Sales Invoice") else "debit_in_account_currency"
 
@@ -436,7 +468,8 @@
 						"against_voucher": d.reference_name,
 						"remarks": self.remark,
 						"cost_center": d.cost_center,
-						"project": d.project
+						"project": d.project,
+						"finance_book": self.finance_book
 					})
 				)
 
@@ -907,4 +940,13 @@
 		bank_balance_in_company_currency = get_balance_on(account, in_account_currency=False)
 		exchange_rate = bank_balance_in_company_currency / bank_balance_in_account_currency
 
-	return exchange_rate
\ No newline at end of file
+	return exchange_rate
+
+@frappe.whitelist()
+def make_inter_company_journal_entry(name, voucher_type, company):
+	journal_entry = frappe.new_doc('Journal Entry')
+	journal_entry.voucher_type = voucher_type
+	journal_entry.company = company
+	journal_entry.posting_date = nowdate()
+	journal_entry.inter_company_journal_entry_reference = name
+	return journal_entry.as_dict()
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 98a2a29..eddcd5e 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -44,6 +44,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "250px"
   }, 
@@ -75,6 +76,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -107,6 +109,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -142,6 +145,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "180px"
   }, 
@@ -171,6 +175,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -201,6 +206,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -231,6 +237,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -262,6 +269,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -294,6 +302,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -325,6 +334,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -354,6 +364,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -384,6 +395,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -413,6 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -444,6 +457,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -477,6 +491,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -505,6 +520,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -536,6 +552,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -569,6 +586,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -598,6 +616,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -618,7 +637,7 @@
    "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -629,6 +648,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -660,8 +680,42 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])", 
+   "fieldname": "reference_due_date", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reference Due Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -691,6 +745,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -719,6 +774,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -751,6 +807,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -782,6 +839,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -795,7 +853,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-12-07 19:54:19.851534", 
+ "modified": "2018-05-05 17:50:25.961397", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 8b03e2e..9609e3d 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -109,7 +109,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 2340340..14f2d80 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -109,7 +109,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
index 373d090..8c9fc5e 100644
--- a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
+++ b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
@@ -68,7 +68,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
index 0dc6272..679750d 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
@@ -120,12 +120,12 @@
 		if party_type == "Customer":
 			party_doc.customer_name = party
 		else:
-			supplier_type = frappe.db.get_single_value("Buying Settings", "supplier_type")
-			if not supplier_type:
-				frappe.throw(_("Please Set Supplier Type in Buying Settings."))
+			supplier_group = frappe.db.get_single_value("Buying Settings", "supplier_group")
+			if not supplier_group:
+				frappe.throw(_("Please Set Supplier Group in Buying Settings."))
 
 			party_doc.supplier_name = party
-			party_doc.supplier_type = supplier_type
+			party_doc.supplier_group = supplier_group
 
 		party_doc.flags.ignore_mandatory = True
 		party_doc.save(ignore_permissions=True)		
diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
index a83bb26..aa32d95 100644
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -66,7 +66,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index f79efed..ca50e2d 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -12,10 +12,8 @@
 
 	setup: function(frm) {
 		frm.set_query("paid_from", function() {
-			var party_account_type = in_list(["Customer", "Student"], frm.doc.party_type) ?
-				"Receivable" : "Payable";
 			var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
-				["Bank", "Cash"] : party_account_type;
+				["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
 
 			return {
 				filters: {
@@ -29,16 +27,14 @@
 		frm.set_query("party_type", function() {
 			return{
 				"filters": {
-					"name": ["in",["Customer","Supplier", "Employee", "Student"]],
+					"name": ["in", Object.keys(frappe.boot.party_account_types)],
 				}
 			}
 		});
 
 		frm.set_query("paid_to", function() {
-			var party_account_type = in_list(["Customer", "Student"], frm.doc.party_type) ?
-				"Receivable" : "Payable";
 			var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
-				["Bank", "Cash"] : party_account_type;
+				["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
 
 			return {
 				filters: {
@@ -86,9 +82,9 @@
 		});
 
 		frm.set_query("reference_name", "references", function(doc, cdt, cdn) {
-			child = locals[cdt][cdn];
-			filters = {"docstatus": 1, "company": doc.company};
-			party_type_doctypes = ['Sales Invoice', 'Sales Order', 'Purchase Invoice', 
+			const child = locals[cdt][cdn];
+			const filters = {"docstatus": 1, "company": doc.company};
+			const party_type_doctypes = ['Sales Invoice', 'Sales Order', 'Purchase Invoice',
 				'Purchase Order', 'Expense Claim', 'Fees'];
 
 			if (in_list(party_type_doctypes, child.reference_doctype)) {
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 5bd57f9..e694c91 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -5,16 +5,16 @@
 from __future__ import unicode_literals
 import frappe, erpnext, json
 from frappe import _, scrub, ValidationError
-from frappe.utils import flt, comma_or, nowdate
+from frappe.utils import flt, comma_or, nowdate, getdate
 from erpnext.accounts.utils import get_outstanding_invoices, get_account_currency, get_balance_on
-from erpnext.accounts.party import get_party_account
+from erpnext.accounts.party import get_party_account, get_patry_tax_withholding_details
 from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.general_ledger import make_gl_entries
 from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
-from erpnext.controllers.accounts_controller import AccountsController
+from erpnext.controllers.accounts_controller import AccountsController, get_supplier_block_status
 
-from six import string_types
+from six import string_types, iteritems
 
 class InvalidPaymentEntry(ValidationError):
 	pass
@@ -58,6 +58,7 @@
 		self.set_remarks()
 		self.validate_duplicate_entry()
 		self.validate_allocated_amount()
+		self.ensure_supplier_is_not_blocked()
 
 	def on_submit(self):
 		self.setup_party_account_field()
@@ -146,7 +147,7 @@
 				ref_details = get_reference_details(d.reference_doctype,
 					d.reference_name, self.party_account_currency)
 
-				for field, value in ref_details.items():
+				for field, value in iteritems(ref_details):
 					if not d.get(field) or force:
 						d.set(field, value)
 
@@ -159,9 +160,9 @@
 			if not frappe.db.exists(self.party_type, self.party):
 				frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
 
-			if self.party_account and self.party_type != "Employee":
-				party_account_type = "Receivable" if self.party_type in ("Customer", "Student") else "Payable"
-				self.validate_account_type(self.party_account, [party_account_type])
+			if self.party_account:
+				self.validate_account_type(self.party_account,
+					[erpnext.get_party_account_type(self.party_type)])
 
 	def validate_bank_accounts(self):
 		if self.payment_type in ("Pay", "Internal Transfer"):
@@ -412,7 +413,6 @@
 			else:
 				against_account = self.paid_from
 
-
 			party_gl_dict = self.get_gl_dict({
 				"account": self.party_account,
 				"party_type": self.party_type,
@@ -421,7 +421,7 @@
 				"account_currency": self.party_account_currency
 			})
 
-			dr_or_cr = "credit" if self.party_type in ["Customer", "Student"] else "debit"
+			dr_or_cr = "credit" if erpnext.get_party_account_type(self.party_type) == 'Receivable' else "debit"
 
 			for d in self.get("references"):
 				gle = party_gl_dict.copy()
@@ -511,11 +511,28 @@
 		self.reference_no = reference_doc.name
 		self.reference_date = nowdate()
 
+	def calculate_deductions(self, tax_details):
+		return {
+			"account": tax_details['tax']['account_head'],
+			"cost_center": frappe.db.get_value("Company", self.company, "cost_center"),
+			"amount": self.total_allocated_amount * (tax_details['tax']['rate'] / 100)
+		}
+
 @frappe.whitelist()
 def get_outstanding_reference_documents(args):
 	if isinstance(args, string_types):
 		args = json.loads(args)
 
+	# confirm that Supplier is not blocked
+	if args.get('party_type') == 'Supplier':
+		supplier_status = get_supplier_block_status(args['party'])
+		if supplier_status['on_hold']:
+			if supplier_status['hold_type'] == 'All':
+				return []
+			elif supplier_status['hold_type'] == 'Payments':
+				if not supplier_status['release_date'] or getdate(nowdate()) <= supplier_status['release_date']:
+					return []
+
 	party_account_currency = get_account_currency(args.get("party_account"))
 	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")
 
@@ -600,6 +617,9 @@
 
 def get_negative_outstanding_invoices(party_type, party, party_account, party_account_currency, company_currency):
 	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
+	supplier_condition = ""
+	if voucher_type == "Purchase Invoice":
+		supplier_condition = "and (release_date is null or release_date <= CURDATE())"
 	if party_account_currency == company_currency:
 		grand_total_field = "base_grand_total"
 		rounded_total_field = "base_rounded_total"
@@ -617,9 +637,11 @@
 			`tab{voucher_type}`
 		where
 			{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
+			{supplier_condition}
 		order by
 			posting_date, name
 		""".format(**{
+			"supplier_condition": supplier_condition,
 			"rounded_total_field": rounded_total_field,
 			"grand_total_field": grand_total_field,
 			"voucher_type": voucher_type,
@@ -833,6 +855,9 @@
 	pe.mode_of_payment = doc.get("mode_of_payment")
 	pe.party_type = party_type
 	pe.party = doc.get(scrub(party_type))
+
+	pe.ensure_supplier_is_not_blocked()
+
 	pe.paid_from = party_account if payment_type=="Receive" else bank.account
 	pe.paid_to = party_account if payment_type=="Pay" else bank.account
 	pe.paid_from_account_currency = party_account_currency \
@@ -843,15 +868,19 @@
 	pe.allocate_payment_amount = 1
 	pe.letter_head = doc.get("letter_head")
 
-	pe.append("references", {
-		'reference_doctype': dt,
-		'reference_name': dn,
-		"bill_no": doc.get("bill_no"),
-		"due_date": doc.get("due_date"),
-		'total_amount': grand_total,
-		'outstanding_amount': outstanding_amount,
-		'allocated_amount': outstanding_amount
-	})
+	# only Purchase Invoice can be blocked individually
+	if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
+		frappe.msgprint(_('{0} is on hold till {1}'.format(doc.name, doc.release_date)))
+	else:
+		pe.append("references", {
+			'reference_doctype': dt,
+			'reference_name': dn,
+			"bill_no": doc.get("bill_no"),
+			"due_date": doc.get("due_date"),
+			'total_amount': grand_total,
+			'outstanding_amount': outstanding_amount,
+			'allocated_amount': outstanding_amount
+		})
 
 	pe.setup_party_account_field()
 	pe.set_missing_values()
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 435bee0..57516a1 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -40,6 +40,69 @@
 		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
 		self.assertEqual(so_advance_paid, 0)
 
+	def test_payment_entry_for_blocked_supplier_invoice(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Invoices'
+		supplier.save()
+
+		self.assertRaises(frappe.ValidationError, make_purchase_invoice)
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_payment_entry_for_blocked_supplier_payments(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Payments'
+		supplier.save()
+
+		pi = make_purchase_invoice()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Invoice', dn=pi.name,
+			bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_payment_entry_for_blocked_supplier_payments_today_date(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Payments'
+		supplier.release_date = nowdate()
+		supplier.save()
+
+		pi = make_purchase_invoice()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Invoice', dn=pi.name,
+			bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_payment_entry_for_blocked_supplier_payments_past_date(self):
+		# this test is meant to fail only if something fails in the try block
+		with self.assertRaises(Exception):
+			try:
+				supplier = frappe.get_doc('Supplier', '_Test Supplier')
+				supplier.on_hold = 1
+				supplier.hold_type = 'Payments'
+				supplier.release_date = '2018-03-01'
+				supplier.save()
+
+				pi = make_purchase_invoice()
+
+				get_payment_entry('Purchase Invoice', pi.name, bank_account="_Test Bank - _TC")
+
+				supplier.on_hold = 0
+				supplier.save()
+			except:
+				pass
+			else:
+				raise Exception
+
 	def test_payment_entry_against_si_usd_to_usd(self):
 		si = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
 			currency="USD", conversion_rate=50)
diff --git a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
index 10e147e..d69a5eb 100644
--- a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
@@ -93,7 +93,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
index bf18fca..8dc2628 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -11,16 +12,20 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "payment_gateway", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Payment Gateway", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,23 +35,29 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "is_default", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "label": "Is Default", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,23 +66,29 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -79,23 +96,29 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "payment_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Payment Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,49 +128,62 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "currency", 
+   "columns": 0,
+   "fetch_from": "payment_account.account_currency",
+   "fieldname": "currency",
    "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "payment_account.account_currency", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "payment_request_message", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -156,16 +192,20 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "default": "Please click on the link below to make your payment", 
    "fieldname": "message", 
    "fieldtype": "Small Text", 
@@ -173,7 +213,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "label": "Default Payment Request Message", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,23 +224,29 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0,
    "fieldname": "message_examples", 
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
+   "in_standard_filter": 0,
    "label": "Message Examples", 
    "length": 0, 
    "no_copy": 0, 
@@ -208,24 +256,26 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 01:35:06.341291", 
+ "modified": "2018-05-16 22:43:34.970491",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Gateway Account", 
@@ -234,7 +284,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -256,7 +305,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0,
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 0901046..4c24a9f 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -24,8 +24,10 @@
 	onload: function() {
 		var me = this;
 		this.frm.set_query("party_type", function() {
-			return{
-				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
+			return {
+				"filters": {
+					"name": ["in", Object.keys(frappe.boot.party_account_types)],
+				}
 			}
 		});
 
@@ -37,7 +39,7 @@
 					filters: {
 						"company": me.frm.doc.company,
 						"is_group": 0,
-						"account_type": (me.frm.doc.party_type == "Customer" ? "Receivable" : "Payable")
+						"account_type": frappe.boot.party_account_types[me.frm.doc.party_type]
 					}
 				};
 			}
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index fc4edae..b211b50 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -391,7 +391,7 @@
  "icon": "fa fa-resize-horizontal", 
  "idx": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 3c87fe5..7cd951a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -2,7 +2,7 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from frappe.utils import flt
 from frappe import msgprint, _
 from frappe.model.document import Document
@@ -30,8 +30,8 @@
 		return payment_entries
 
 	def get_jv_entries(self):
-		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
-			else "debit_in_account_currency"
+		dr_or_cr = ("credit_in_account_currency" if erpnext.get_party_account_type(self.party_type) == 'Receivable'
+			else "debit_in_account_currency")
 
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
@@ -104,8 +104,8 @@
 
 		self.get_invoice_entries()
 		self.validate_invoice()
-		dr_or_cr = "credit_in_account_currency" \
-			if self.party_type == "Customer" else "debit_in_account_currency"
+		dr_or_cr = ("credit_in_account_currency"
+			if erpnext.get_party_account_type(self.party_type) == 'Receivable' else "debit_in_account_currency")
 			
 		lst = []
 		for e in self.get('payments'):
@@ -173,11 +173,8 @@
 	def check_condition(self):
 		cond = " and posting_date >= '{0}'".format(frappe.db.escape(self.from_date)) if self.from_date else ""
 		cond += " and posting_date <= '{0}'".format(frappe.db.escape(self.to_date)) if self.to_date else ""
-
-		if self.party_type == "Customer":
-			dr_or_cr = "debit_in_account_currency"
-		else:
-			dr_or_cr = "credit_in_account_currency"
+		dr_or_cr = ("debit_in_account_currency" if erpnext.get_party_account_type(self.party_type) == 'Receivable'
+			else "credit_in_account_currency")
 
 		if self.minimum_amount:
 			cond += " and `{0}` >= {1}".format(dr_or_cr, flt(self.minimum_amount))
diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
index ab8761a..ce7ce98 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -162,7 +162,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index 57fce65..ba6f100 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -318,7 +318,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 1042071..e21afa4 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +106,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -193,6 +198,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -224,6 +230,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +262,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -287,6 +295,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -319,6 +328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -350,6 +360,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -379,6 +390,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -409,6 +421,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -440,6 +453,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -470,6 +484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -500,6 +515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -531,6 +547,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -539,6 +556,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "payment_gateway_account.payment_gateway",
    "fieldname": "payment_gateway", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -551,7 +569,7 @@
    "label": "Payment Gateway", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "payment_gateway_account.payment_gateway", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -562,6 +580,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -570,6 +589,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "payment_gateway_account.payment_account",
    "fieldname": "payment_account", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -582,7 +602,7 @@
    "label": "Payment Account", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "payment_gateway_account.payment_account", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -593,6 +613,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -623,6 +644,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -654,6 +676,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -685,6 +708,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -715,6 +739,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -728,7 +753,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-02 15:50:41.775006", 
+ "modified": "2018-05-16 22:43:28.136835",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
@@ -737,7 +762,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -757,7 +781,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
index 3ae7d62..83e3ba0 100644
--- a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
@@ -51,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 2, 
+   "fetch_from": "payment_term.description",
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -63,7 +64,7 @@
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "payment_term.description", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -115,6 +116,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 2, 
+   "fetch_from": "payment_term.invoice_portion", 
    "fieldname": "invoice_portion", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -127,7 +129,7 @@
    "label": "Invoice Portion", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "payment_term.invoice_portion", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -216,7 +218,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-03-08 11:26:18.266987", 
+ "modified": "2018-05-25 22:43:31.890251",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Schedule", 
diff --git a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
index 4f6a675..3ad450b 100644
--- a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
+++ b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
@@ -45,7 +45,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/pos_item_group/pos_item_group.json b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
index b278765..860c449 100644
--- a/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
+++ b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
@@ -45,7 +45,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index ed3de07..fd77ff5 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -69,6 +70,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -99,6 +101,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -131,6 +134,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -162,6 +166,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -192,6 +197,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -222,6 +228,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -252,6 +259,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -282,6 +290,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -312,6 +321,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -341,6 +351,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -373,6 +384,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -405,6 +417,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -413,6 +426,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "company.country",
    "fieldname": "country", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -425,7 +439,7 @@
    "label": "Country", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "company.country", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -436,6 +450,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -469,6 +484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -500,6 +516,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -530,6 +547,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -561,6 +579,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -590,6 +609,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -621,6 +641,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -651,6 +672,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -682,6 +704,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -711,6 +734,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -742,6 +766,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -772,6 +797,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -803,6 +829,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -835,6 +862,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -867,6 +895,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -896,6 +925,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -928,6 +958,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -960,6 +991,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -990,6 +1022,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1023,6 +1056,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1054,6 +1088,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1087,6 +1122,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1116,6 +1152,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1148,6 +1185,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1179,6 +1217,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1210,6 +1249,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1242,6 +1282,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1274,6 +1315,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1305,6 +1347,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1336,6 +1379,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1365,6 +1409,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1397,6 +1442,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1428,6 +1474,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1460,6 +1507,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1492,6 +1540,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1506,7 +1555,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-31 19:33:11.765731", 
+ "modified": "2018-05-16 22:43:37.272875",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 
@@ -1514,7 +1563,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1534,7 +1582,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index 20a90f4..fd41106 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -7,7 +7,7 @@
 from frappe.utils import cint, now
 from erpnext.accounts.doctype.sales_invoice.pos import get_child_nodes
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import set_account_for_mode_of_payment
-
+from six import iteritems
 from frappe.model.document import Document
 
 class POSProfile(Document):
@@ -39,7 +39,7 @@
 			self.expense_account], "Cost Center": [self.cost_center],
 			"Warehouse": [self.warehouse]}
 
-		for link_dt, dn_list in accounts.items():
+		for link_dt, dn_list in iteritems(accounts):
 			for link_dn in dn_list:
 				if link_dn and not frappe.db.exists({"doctype": link_dt,
 						"company": self.company, "name": link_dn}):
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index dcbf354..86694e6 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -33,7 +33,7 @@
 						${__("Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.")}
 					</li>
 					<li>
-						${__("Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.")}
+						${__("Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.")}
 					</li>
 					<li>
 						${__('Pricing Rules are further filtered based on quantity.')}
@@ -51,7 +51,7 @@
 								${__('Customer > Customer Group > Territory')}
 							</li>
 							<li>
-								${__('Supplier > Supplier Type')}
+								${__('Supplier > Supplier Group')}
 							</li>
 						</ul>
 					</li>
@@ -75,7 +75,7 @@
 		options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
 	}
 	if(cur_frm.doc.buying) {
-		$.merge(options, ["Supplier", "Supplier Type"]);
+		$.merge(options, ["Supplier", "Supplier Group"]);
 	}
 
 	set_field_options("applicable_for", options.join("\n"));
@@ -109,9 +109,112 @@
 			return {
 				filters: {
 					'selling': doc.selling,
-					'buying': doc.buying
+					'buying': doc.buying,
+					'currency': doc.currency
 				}
-			}
+			};
+		};
+	},
+
+	refresh: function(frm) {
+		var help_content =
+			`<table class="table table-bordered" style="background-color: #f9f9f9;">
+				<tr><td>
+					<h4>
+						<i class="fa fa-hand-right"></i>
+						${__('Notes')}
+					</h4>
+					<ul>
+						<li>
+							${__("Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.")}
+						</li>
+						<li>
+							${__("If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.")}
+						</li>
+						<li>
+							${__('Discount Percentage can be applied either against a Price List or for all Price List.')}
+						</li>
+						<li>
+							${__('To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.')}
+						</li>
+					</ul>
+				</td></tr>
+				<tr><td>
+					<h4><i class="fa fa-question-sign"></i>
+						${__('How Pricing Rule is applied?')}
+					</h4>
+					<ol>
+						<li>
+							${__("Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.")}
+						</li>
+						<li>
+							${__("Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.")}
+						</li>
+						<li>
+							${__('Pricing Rules are further filtered based on quantity.')}
+						</li>
+						<li>
+							${__('If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.')}
+						</li>
+						<li>
+							${__('Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:')}
+							<ul>
+								<li>
+									${__('Item Code > Item Group > Brand')}
+								</li>
+								<li>
+									${__('Customer > Customer Group > Territory')}
+								</li>
+								<li>
+									${__('Supplier > Supplier Type')}
+								</li>
+							</ul>
+						</li>
+						<li>
+							${__('If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.')}
+						</li>
+					</ol>
+				</td></tr>
+			</table>`;
+
+		set_field_options("pricing_rule_help", help_content);
+		frm.events.set_options_for_applicable_for(frm);
+	},
+
+	rate_or_discount: function(frm) {
+		if(frm.doc.rate_or_discount == 'Rate') {
+			frm.set_value('for_price_list', "");
 		}
+	},
+
+	selling: function(frm) {
+		frm.events.set_options_for_applicable_for(frm);
+	},
+
+	buying: function(frm) {
+		frm.events.set_options_for_applicable_for(frm);
+	},
+
+	//Dynamically change the description based on type of margin
+	margin_type: function(frm){
+		frm.set_df_property('margin_rate_or_amount', 'description', frm.doc.margin_type=='Percentage'?'In Percentage %':'In Amount');
+	},
+
+	set_options_for_applicable_for: function(frm) {
+		var options = [""];
+		var applicable_for = frm.doc.applicable_for;
+
+		if(frm.doc.selling) {
+			options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
+		}
+		if(frm.doc.buying) {
+			$.merge(options, ["Supplier", "Supplier Type"]);
+		}
+	
+		set_field_options("applicable_for", options.join("\n"));
+	
+		if(!in_list(options, applicable_for)) applicable_for = null;
+		frm.set_value("applicable_for", applicable_for);
 	}
-})
+	
+});
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 1c30fa4..ac59904 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -39,6 +39,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -69,6 +70,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -100,6 +102,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -131,6 +134,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -162,6 +166,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -193,6 +198,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -222,6 +228,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -253,6 +260,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -282,6 +290,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -311,6 +320,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -340,6 +350,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -369,6 +380,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -398,6 +410,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -419,7 +432,7 @@
    "label": "Applicable For", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", 
+   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Group",
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -429,6 +442,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -460,6 +474,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -491,6 +506,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -522,6 +538,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -553,6 +570,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -584,6 +602,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -615,6 +634,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -623,8 +643,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Supplier Type\"", 
-   "fieldname": "supplier_type", 
+   "depends_on": "eval:doc.applicable_for==\"Supplier Group\"",
+   "fieldname": "supplier_group",
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -633,10 +653,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Supplier Type", 
+   "label": "Supplier Group",
    "length": 0, 
    "no_copy": 0, 
-   "options": "Supplier Type", 
+   "options": "Supplier Group",
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -646,6 +666,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -675,6 +696,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -704,6 +726,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -733,6 +756,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -762,6 +786,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -791,6 +816,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -821,6 +847,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -850,6 +877,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -878,6 +906,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -908,6 +937,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -940,6 +970,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -971,6 +1002,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1003,6 +1035,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1032,6 +1065,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1064,6 +1098,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1093,6 +1128,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1124,6 +1160,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1152,6 +1189,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1182,6 +1220,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1212,6 +1251,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1243,6 +1283,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1273,6 +1314,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1302,6 +1344,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1316,7 +1359,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-12 17:21:22.559996", 
+ "modified": "2018-04-19 07:52:41.024618",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -1324,7 +1367,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1344,7 +1386,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1364,7 +1405,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1384,7 +1424,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1404,7 +1443,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index e047b6d..6c2ae7a 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -23,6 +23,7 @@
 		self.cleanup_fields_value()
 		self.validate_rate_or_discount()
 		self.validate_max_discount()
+		self.validate_price_list_with_currency()
 
 		if not self.margin_type: self.margin_rate_or_amount = 0.0
 
@@ -41,7 +42,7 @@
 			throw(_("Selling must be checked, if Applicable For is selected as {0}"
 				.format(self.applicable_for)))
 
-		if not self.buying and self.applicable_for in ["Supplier", "Supplier Type"]:
+		if not self.buying and self.applicable_for in ["Supplier", "Supplier Group"]:
 			throw(_("Buying must be checked, if Applicable For is selected as {0}"
 				.format(self.applicable_for)))
 
@@ -73,6 +74,11 @@
 			if max_discount and flt(self.discount_percentage) > flt(max_discount):
 				throw(_("Max discount allowed for item: {0} is {1}%").format(self.item_code, max_discount))
 
+	def validate_price_list_with_currency(self):
+		if self.currency and self.for_price_list:
+			price_list_currency = frappe.db.get_value("Price List", self.for_price_list, "currency")
+			if not self.currency == price_list_currency:
+				throw(_("Currency should be same as Price List Currency: {0}").format(price_list_currency))
 
 #--------------------------------------------------------------------------------
 
@@ -85,7 +91,7 @@
 			"customer_group": "something",
 			"territory": "something",
 			"supplier": "something",
-			"supplier_type": "something",
+			"supplier_group": "something",
 			"currency": "something",
 			"conversion_rate": "something",
 			"price_list": "something",
@@ -112,8 +118,8 @@
 
 	item_list = args.get("items")
 	args.pop("items")
-	
-	set_serial_nos_based_on_fifo = frappe.db.get_single_value("Stock Settings", 
+
+	set_serial_nos_based_on_fifo = frappe.db.get_single_value("Stock Settings",
 		"automatically_set_serial_nos_based_on_fifo")
 
 	for item in item_list:
@@ -123,7 +129,7 @@
 		if set_serial_nos_based_on_fifo and not args.get('is_return'):
 			out.append(get_serial_no_for_item(args_copy))
 	return out
-	
+
 def get_serial_no_for_item(args):
 	from erpnext.stock.get_item_details import get_serial_no
 
@@ -144,7 +150,7 @@
 		"name": args.name,
 		"pricing_rule": None
 	})
-	
+
 	if args.ignore_pricing_rule or not args.item_code:
 		if frappe.db.exists(args.doctype, args.name) and args.get("pricing_rule"):
 			item_details = remove_pricing_rule_for_item(args.get("pricing_rule"), item_details)
@@ -165,10 +171,10 @@
 			if customer:
 				args.customer_group, args.territory = customer
 
-		args.supplier = args.supplier_type = None
+		args.supplier = args.supplier_group = None
 
-	elif args.supplier and not args.supplier_type:
-		args.supplier_type = frappe.db.get_value("Supplier", args.supplier, "supplier_type")
+	elif args.supplier and not args.supplier_group:
+		args.supplier_group = frappe.db.get_value("Supplier", args.supplier, "supplier_group")
 		args.customer = args.customer_group = args.territory = None
 
 	pricing_rules = get_pricing_rules(args)
@@ -178,11 +184,8 @@
 		item_details.pricing_rule = pricing_rule.name
 		item_details.pricing_rule_for = pricing_rule.rate_or_discount
 
-		if pricing_rule.margin_type == 'Amount' and pricing_rule.currency == args.currency:
-			item_details.margin_type = pricing_rule.margin_type
-			item_details.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
-
-		elif pricing_rule.margin_type == 'Percentage':
+		if (pricing_rule.margin_type == 'Amount' and pricing_rule.currency == args.currency)\
+				or (pricing_rule.margin_type == 'Percentage'):
 			item_details.margin_type = pricing_rule.margin_type
 			item_details.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
 		else:
@@ -190,17 +193,13 @@
 			item_details.margin_rate_or_amount = 0.0
 
 		if pricing_rule.rate_or_discount == 'Rate':
+			pricing_rule_rate = 0.0
 			if pricing_rule.currency == args.currency:
-				item_details.update({
-					"price_list_rate": pricing_rule.rate,
-					"discount_percentage": 0.0
-				})
-
-			else:
-				item_details.update({
-					"price_list_rate": 0.0,
-					"discount_percentage": 0.0
-				})
+				pricing_rule_rate = pricing_rule.rate
+			item_details.update({
+				"price_list_rate": pricing_rule_rate,
+				"discount_percentage": 0.0
+			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage or args.discount_percentage
 
@@ -210,9 +209,9 @@
 	return item_details
 
 def remove_pricing_rule_for_item(pricing_rule, item_details):
-	pricing_rule = frappe.db.get_value('Pricing Rule', pricing_rule, 
-		['rate_or_discount', 'margin_type'], as_dict=1)
-	if pricing_rule and pricing_rule.rate_or_discount == 'Discount Percentage':
+	pricing_rule = frappe.db.get_value('Pricing Rule', pricing_rule,
+		['price_or_discount', 'margin_type'], as_dict=1)
+	if pricing_rule and pricing_rule.price_or_discount == 'Discount Percentage':
 		item_details.discount_percentage = 0.0
 
 	if pricing_rule and pricing_rule.margin_type in ['Percentage', 'Amount']:
@@ -227,14 +226,14 @@
 def remove_pricing_rules(item_list):
 	if isinstance(item_list, string_types):
 		item_list = json.loads(item_list)
-	
-	out = []	
+
+	out = []
 	for item in item_list:
 		item = frappe._dict(item)
 		out.append(remove_pricing_rule_for_item(item.get("pricing_rule"), item))
-		
+
 	return out
-	
+
 def get_pricing_rules(args):
 	def _get_tree_conditions(parenttype, allow_blank=True):
 		field = frappe.scrub(parenttype)
@@ -258,7 +257,7 @@
 	conditions = item_variant_condition = ""
 	values =  {"item_code": args.get("item_code"), "brand": args.get("brand")}
 
-	for field in ["company", "customer", "supplier", "supplier_type", "campaign", "sales_partner"]:
+	for field in ["company", "customer", "supplier", "supplier_group", "campaign", "sales_partner"]:
 		if args.get(field):
 			conditions += " and ifnull("+field+", '') in (%("+field+")s, '')"
 			values[field] = args.get(field)
@@ -306,8 +305,8 @@
 	if pricing_rules:
 		stock_qty = flt(args.get('qty')) * args.get('conversion_factor', 1)
 
-		pricing_rules = filter(lambda x: (flt(stock_qty)>=flt(x.min_qty)
-			and (flt(stock_qty)<=x.max_qty if x.max_qty else True)), pricing_rules)
+		pricing_rules = list(filter(lambda x: (flt(stock_qty)>=flt(x.min_qty)
+			and (flt(stock_qty)<=x.max_qty if x.max_qty else True)), pricing_rules))
 
 		# add variant_of property in pricing rule
 		for p in pricing_rules:
@@ -320,15 +319,15 @@
 	if pricing_rules:
 		max_priority = max([cint(p.priority) for p in pricing_rules])
 		if max_priority:
-			pricing_rules = filter(lambda x: cint(x.priority)==max_priority, pricing_rules)
+			pricing_rules = list(filter(lambda x: cint(x.priority)==max_priority, pricing_rules))
 
 	# apply internal priority
 	all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory",
-		"supplier", "supplier_type", "campaign", "sales_partner", "variant_of"]
+		"supplier", "supplier_group", "campaign", "sales_partner", "variant_of"]
 
 	if len(pricing_rules) > 1:
 		for field_set in [["item_code", "variant_of", "item_group", "brand"],
-			["customer", "customer_group", "territory"], ["supplier", "supplier_type"]]:
+			["customer", "customer_group", "territory"], ["supplier", "supplier_group"]]:
 				remaining_fields = list(set(all_fields) - set(field_set))
 				if if_all_rules_same(pricing_rules, remaining_fields):
 					pricing_rules = apply_internal_priority(pricing_rules, field_set, args)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 39f8039..9a6dead 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -27,6 +27,7 @@
 	},
 
 	refresh: function(doc) {
+		const me = this;
 		this._super();
 
 		hide_fields(this.frm.doc);
@@ -37,6 +38,27 @@
 			this.show_stock_ledger();
 		}
 
+		if(!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){
+			if(doc.on_hold) {
+				this.frm.add_custom_button(
+					__('Change Release Date'),
+					function() {me.change_release_date()},
+					__('Hold Invoice')
+				);
+				this.frm.add_custom_button(
+					__('Unblock Invoice'),
+					function() {me.unblock_invoice()},
+					__('Make')
+				);
+			} else if (!doc.on_hold) {
+				this.frm.add_custom_button(
+					__('Block Invoice'),
+					function() {me.block_invoice()},
+					__('Make')
+				);
+			}
+		}
+
 		if(!doc.is_return && doc.docstatus==1) {
 			if(doc.outstanding_amount != 0) {
 				this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
@@ -56,7 +78,6 @@
 		}
 
 		if(doc.docstatus===0) {
-			var me = this;
 			this.frm.add_custom_button(__('Purchase Order'), function() {
 				erpnext.utils.map_current_doc({
 					method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
@@ -92,8 +113,118 @@
 				})
 			}, __("Get items from"));
 		}
-
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
+
+		if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) {
+			frappe.model.with_doc("Supplier", me.frm.doc.supplier, function() {
+				var supplier = frappe.model.get_doc("Supplier", me.frm.doc.supplier);
+				var internal = supplier.is_internal_supplier;
+				var disabled = supplier.disabled;
+				if (internal == 1 && disabled == 0) {
+					me.frm.add_custom_button("Inter Company Invoice", function() {
+						me.make_inter_company_invoice(me.frm);
+					}, __("Make"));
+				}
+			});
+		}
+	},
+
+	unblock_invoice: function() {
+		const me = this;
+		frappe.call({
+			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice',
+			'args': {'name': me.frm.doc.name},
+			'callback': (r) => me.frm.reload_doc()
+		});
+	},
+
+	block_invoice: function() {
+		this.make_comment_dialog_and_block_invoice();
+	},
+
+	change_release_date: function() {
+		this.make_dialog_and_set_release_date();
+	},
+
+	can_change_release_date: function(date) {
+		const diff = frappe.datetime.get_diff(date, frappe.datetime.nowdate());
+		if (diff < 0) {
+			frappe.throw('New release date should be in the future');
+			return false;
+		} else {
+			return true;
+		}
+	},
+
+	make_comment_dialog_and_block_invoice: function(){
+		const me = this;
+
+		const title = __('Add Comment');
+		const fields = [
+			{
+				fieldname: 'hold_comment',
+				read_only: 0,
+				fieldtype:'Small Text',
+				label: __('Reason For Putting On Hold'),
+				default: ""
+			},
+		];
+
+		this.dialog = new frappe.ui.Dialog({
+			title: title,
+			fields: fields
+		});
+
+		this.dialog.set_primary_action(__('Save'), function() {
+			const dialog_data = me.dialog.get_values();
+			frappe.call({
+				'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice',
+				'args': {'name': me.frm.doc.name, 'hold_comment': dialog_data.hold_comment},
+				'callback': (r) => me.frm.reload_doc()
+			});
+			me.dialog.hide();
+		});
+
+		this.dialog.show();
+	},
+
+	make_dialog_and_set_release_date: function() {
+		const me = this;
+
+		const title = __('Set New Release Date');
+		const fields = [
+			{
+				fieldname: 'release_date',
+				read_only: 0,
+				fieldtype:'Date',
+				label: __('Release Date'),
+				default: me.frm.doc.release_date
+			},
+		];
+
+		this.dialog = new frappe.ui.Dialog({
+			title: title,
+			fields: fields
+		});
+
+		this.dialog.set_primary_action(__('Save'), function() {
+			me.dialog_data = me.dialog.get_values();
+			if(me.can_change_release_date(me.dialog_data.release_date)) {
+				me.dialog_data.name = me.frm.doc.name;
+				me.set_release_date(me.dialog_data);
+				me.dialog.hide();
+			}
+		});
+
+		this.dialog.show();
+	},
+
+	set_release_date: function(data) {
+		return frappe.call({
+			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date',
+			'args': data,
+			'callback': (r) => this.frm.reload_doc()
+		});
 	},
 
 	supplier: function() {
@@ -133,6 +264,13 @@
 		}
 	},
 
+	make_inter_company_invoice: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_inter_company_sales_invoice",
+			frm: frm
+		});
+	},
+
 	is_paid: function() {
 		hide_fields(this.frm.doc);
 		if(cint(this.frm.doc.is_paid)) {
@@ -185,9 +323,10 @@
 		var row = locals[cdt][cdn];
 		if(row.asset) {
 			frappe.call({
-				method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_fixed_asset_account",
+				method: "erpnext.assets.doctype.asset_category.asset_category.get_asset_category_account",
 				args: {
 					"asset": row.asset,
+					"fieldname": "fixed_asset_account",
 					"account": row.expense_account
 				},
 				callback: function(r, rt) {
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index f6faf11..b62a0f0 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -117,6 +117,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "supplier", 
+   "fetch_from": "supplier.supplier_name",
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -131,7 +132,7 @@
    "no_copy": 0, 
    "oldfieldname": "supplier_name", 
    "oldfieldtype": "Data", 
-   "options": "supplier.supplier_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -150,6 +151,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "supplier.tax_id",
    "fieldname": "tax_id", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -162,7 +164,7 @@
    "label": "Tax Id", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "supplier.tax_id", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -437,6 +439,165 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.on_hold", 
+   "columns": 0, 
+   "fieldname": "sb_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hold Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "on_hold", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hold Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.on_hold", 
+   "description": "Once set, this invoice will be on hold till the set date", 
+   "fieldname": "release_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Release Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb_17", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.on_hold", 
+   "fieldname": "hold_comment", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason For Putting On Hold", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "collapsible_depends_on": "bill_no", 
    "columns": 0, 
    "fieldname": "supplier_invoice_details", 
@@ -1346,6 +1507,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -3520,6 +3712,65 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Group same items",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_112",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "select_print_heading", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -3811,6 +4062,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "inter_company_invoice_reference", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inter Company Invoice Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -4040,7 +4323,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-03-10 07:33:12.760250", 
+ "modified": "2018-05-28 02:38:40.310899",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
@@ -4049,7 +4332,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 0, 
@@ -4069,7 +4351,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -4089,7 +4370,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -4109,7 +4389,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -4129,7 +4408,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 569664d..31b6ee9 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -1,14 +1,14 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
+
 import frappe, erpnext
-from frappe.utils import cint, formatdate, flt, getdate
+from frappe.utils import cint, cstr, formatdate, flt, getdate, nowdate
 from frappe import _, throw
 import frappe.defaults
 
 from erpnext.controllers.buying_controller import BuyingController
-from erpnext.accounts.party import get_party_account, get_due_date
+from erpnext.accounts.party import get_party_account, get_due_date, get_patry_tax_withholding_details
 from erpnext.accounts.utils import get_account_currency, get_fiscal_year
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_billed_amount_based_on_po
 from erpnext.stock import get_warehouse_account_map
@@ -17,6 +17,10 @@
 from erpnext.buying.utils import check_for_closed_status
 from erpnext.accounts.general_ledger import get_round_off_account_and_cost_center
 from frappe.model.mapper import get_mapped_doc
+from six import iteritems
+from erpnext.accounts.doctype.sales_invoice.sales_invoice import validate_inter_company_party, update_linked_invoice,\
+	unlink_inter_company_invoice
+from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -38,11 +42,19 @@
 			'overflow_type': 'billing'
 		}]
 
+	def before_save(self):
+		if not self.on_hold:
+			self.release_date = ''
+
+	def invoice_is_blocked(self):
+		return self.on_hold and (not self.release_date or self.release_date > getdate(nowdate()))
+
 	def validate(self):
 		if not self.is_opening:
 			self.is_opening = 'No'
 
 		self.validate_posting_time()
+		self.set_tax_withholding()
 		super(PurchaseInvoice, self).validate()
 
 		if not self.is_return:
@@ -50,7 +62,6 @@
 			self.pr_required()
 			self.validate_supplier_invoice()
 
-
 		# validate cash purchase
 		if (self.is_paid == 1):
 			self.validate_cash()
@@ -58,6 +69,7 @@
 		if self._action=="submit" and self.update_stock:
 			self.make_batches('warehouse')
 
+		self.validate_release_date()
 		self.check_conversion_rate()
 		self.validate_credit_to_acc()
 		self.clear_unallocated_advances("Purchase Invoice Advance", "advances")
@@ -70,9 +82,13 @@
 		self.validate_write_off_account()
 		self.validate_multiple_billing("Purchase Receipt", "pr_detail", "amount", "items")
 		self.validate_fixed_asset()
-		self.validate_fixed_asset_account()
 		self.create_remarks()
 		self.set_status()
+		validate_inter_company_party(self.doctype, self.supplier, self.company, self.inter_company_invoice_reference)
+
+	def validate_release_date(self):
+		if self.release_date and getdate(nowdate()) >= getdate(self.release_date):
+			frappe.msgprint('Release date must be in the future', raise_exception=True)
 
 	def validate_cash(self):
 		if not self.cash_bank_account and flt(self.paid_amount):
@@ -160,11 +176,11 @@
 		if self.update_stock:
 			for d in self.get('items'):
 				if not d.warehouse:
-					frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
+					frappe.throw(_("Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}").
+						format(d.idx, d.item_code, self.company))
 
 		super(PurchaseInvoice, self).validate_warehouse()
 
-
 	def validate_item_code(self):
 		for d in self.get('items'):
 			if not d.item_code:
@@ -302,22 +318,7 @@
 		self.make_gl_entries()
 
 		self.update_project()
-		self.update_fixed_asset()
-
-	def update_fixed_asset(self):
-		for d in self.get("items"):
-			if d.is_fixed_asset:
-				asset = frappe.get_doc("Asset", d.asset)
-				if self.docstatus==1:
-					asset.purchase_invoice = self.name
-					asset.purchase_date = self.posting_date
-					asset.supplier = self.supplier
-				else:
-					asset.purchase_invoice = None
-					asset.supplier = None
-
-				asset.flags.ignore_validate_update_after_submit = True
-				asset.save()
+		update_linked_invoice(self.doctype, self.name, self.inter_company_invoice_reference)
 
 	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		if not self.grand_total:
@@ -352,6 +353,7 @@
 
 		self.make_supplier_gl_entry(gl_entries)
 		self.make_item_gl_entries(gl_entries)
+		self.get_asset_gl_entry(gl_entries)
 		self.make_tax_gl_entries(gl_entries)
 
 		gl_entries = merge_similar_entries(gl_entries)
@@ -434,7 +436,7 @@
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 							"credit": flt(item.rm_supp_cost)
 						}, warehouse_account[self.supplier_warehouse]["account_currency"]))
-				else:
+				elif not item.is_fixed_asset:
 					gl_entries.append(
 						self.get_gl_dict({
 							"account": item.expense_account,
@@ -469,6 +471,73 @@
 							self.negative_expense_to_be_booked += flt(item.item_tax_amount, \
 								item.precision("item_tax_amount"))
 
+	def get_asset_gl_entry(self, gl_entries):
+		for item in self.get("items"):
+			if item.is_fixed_asset:
+				asset_accounts = self.get_company_default(["asset_received_but_not_billed",
+					"expenses_included_in_asset_valuation", "capital_work_in_progress_account"])
+
+				asset_amount = flt(item.net_amount) + flt(item.item_tax_amount/self.conversion_rate)
+				base_asset_amount = flt(item.base_net_amount + item.item_tax_amount)
+				item.expense_account = item.expense_account or asset_accounts[0]
+
+				if (not item.expense_account or frappe.db.get_value('Account',
+					item.expense_account, 'account_type') != 'Asset Received But Not Billed'):
+					frappe.throw(_("Row {0}: Expense account must be of type Asset Received But Not Billed").
+						format(item.idx))
+
+				if not self.update_stock:
+					asset_rbnb_currency = get_account_currency(item.expense_account)
+					gl_entries.append(self.get_gl_dict({
+						"account": item.expense_account,
+						"against": self.supplier,
+						"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+						"debit": base_asset_amount,
+						"debit_in_account_currency": (base_asset_amount
+							if asset_rbnb_currency == self.company_currency else asset_amount)
+					}))
+
+					if item.item_tax_amount:
+						asset_eiiav_currency = get_account_currency(asset_accounts[0])
+						gl_entries.append(self.get_gl_dict({
+							"account": asset_accounts[1],
+							"against": self.supplier,
+							"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+							"cost_center": item.cost_center,
+							"credit": item.item_tax_amount,
+							"credit_in_account_currency": (item.item_tax_amount
+								if asset_eiiav_currency == self.company_currency else
+									item.item_tax_amount / self.conversion_rate)
+						}))
+				else:
+					cwip_account = get_asset_category_account(item.asset,
+						'capital_work_in_progress_account') or asset_accounts[2]
+
+					cwip_account_currency = get_account_currency(cwip_account)
+					gl_entries.append(self.get_gl_dict({
+						"account": cwip_account,
+						"against": self.supplier,
+						"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+						"debit": base_asset_amount,
+						"debit_in_account_currency": (base_asset_amount
+							if cwip_account_currency == self.company_currency else asset_amount)
+					}))
+
+					if item.item_tax_amount and not cint(erpnext.is_perpetual_inventory_enabled(self.company)):
+						asset_eiiav_currency = get_account_currency(asset_accounts[1])
+						gl_entries.append(self.get_gl_dict({
+							"account": asset_accounts[1],
+							"against": self.supplier,
+							"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+							"cost_center": item.cost_center,
+							"credit": item.item_tax_amount,
+							"credit_in_account_currency": (item.item_tax_amount
+								if asset_eiiav_currency == self.company_currency else
+									item.item_tax_amount / self.conversion_rate)
+						}))
+
+		return gl_entries
+
 	def make_tax_gl_entries(self, gl_entries):
 		# tax table gl entries
 		valuation_tax = {}
@@ -504,7 +573,7 @@
 			total_valuation_amount = sum(valuation_tax.values())
 			amount_including_divisional_loss = self.negative_expense_to_be_booked
 			i = 1
-			for cost_center, amount in valuation_tax.items():
+			for cost_center, amount in iteritems(valuation_tax):
 				if i == len(valuation_tax):
 					applicable_amount = amount_including_divisional_loss
 				else:
@@ -524,7 +593,7 @@
 				i += 1
 
 		if self.auto_accounting_for_stock and self.update_stock and valuation_tax:
-			for cost_center, amount in valuation_tax.items():
+			for cost_center, amount in iteritems(valuation_tax):
 				gl_entries.append(
 					self.get_gl_dict({
 						"account": self.expenses_included_in_valuation,
@@ -632,9 +701,10 @@
 
 		self.make_gl_entries_on_cancel()
 		self.update_project()
-		self.update_fixed_asset()
 		frappe.db.set(self, 'status', 'Cancelled')
 
+		unlink_inter_company_invoice(self.doctype, self.name, self.inter_company_invoice_reference)
+
 	def update_project(self):
 		project_list = []
 		for d in self.items:
@@ -687,36 +757,33 @@
 		for pr in set(updated_pr):
 			frappe.get_doc("Purchase Receipt", pr).update_billing_percentage(update_modified=update_modified)
 
-	def validate_fixed_asset_account(self):
-		for d in self.get('items'):
-			if d.is_fixed_asset:
-				account_type = frappe.db.get_value("Account", d.expense_account, "account_type")
-				if account_type != 'Fixed Asset':
-					frappe.throw(_("Row {0}# Account must be of type 'Fixed Asset'").format(d.idx))
-
 	def on_recurring(self, reference_doc, auto_repeat_doc):
 		self.due_date = None
 
+	def block_invoice(self, hold_comment=None):
+		self.db_set('on_hold', 1)
+		self.db_set('hold_comment', cstr(hold_comment))
+
+	def unblock_invoice(self):
+		self.db_set('on_hold', 0)
+		self.db_set('release_date', None)
+
+	def set_tax_withholding(self):
+		tax_withholding_details = get_patry_tax_withholding_details(self)
+		for tax_details in tax_withholding_details:
+			if flt(self.get("rounded_total") or self.grand_total) >= flt(tax_details['threshold']):
+				if self.taxes:
+					if tax_details['tax']['description'] not in [tax.description for tax in self.taxes]:
+						self.append('taxes', tax_details['tax'])
+				else:
+					self.append('taxes', tax_details['tax'])
+
 @frappe.whitelist()
 def make_debit_note(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
 	return make_return_doc("Purchase Invoice", source_name, target_doc)
 
 @frappe.whitelist()
-def get_fixed_asset_account(asset, account=None):
-	if account:
-		if frappe.db.get_value("Account", account, "account_type") != "Fixed Asset":
-			account=None
-
-	if not account:
-		asset_category, company = frappe.db.get_value("Asset", asset, ["asset_category", "company"])
-
-		account = frappe.db.get_value("Asset Category Account",
-			filters={"parent": asset_category, "company_name": company}, fieldname="fixed_asset_account")
-
-	return account
-
-@frappe.whitelist()
 def make_stock_entry(source_name, target_doc=None):
 	doc = get_mapped_doc("Purchase Invoice", source_name, {
 		"Purchase Invoice": {
@@ -733,4 +800,29 @@
 		}
 	}, target_doc)
 
-	return doc
\ No newline at end of file
+	return doc
+
+@frappe.whitelist()
+def change_release_date(name, release_date=None):
+	if frappe.db.exists('Purchase Invoice', name):
+		pi = frappe.get_doc('Purchase Invoice', name)
+		pi.db_set('release_date', release_date)
+
+
+@frappe.whitelist()
+def unblock_invoice(name):
+	if frappe.db.exists('Purchase Invoice', name):
+		pi = frappe.get_doc('Purchase Invoice', name)
+		pi.unblock_invoice()
+
+
+@frappe.whitelist()
+def block_invoice(name, hold_comment):
+	if frappe.db.exists('Purchase Invoice', name):
+		pi = frappe.get_doc('Purchase Invoice', name)
+		pi.block_invoice(hold_comment)
+
+@frappe.whitelist()
+def make_inter_company_sales_invoice(source_name, target_doc=None):
+	from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_invoice
+	return make_inter_company_invoice("Purchase Invoice", source_name, target_doc)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
index 062a2d2..f101b6a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
@@ -9,7 +9,7 @@
 			'Payment Request': 'reference_name',
 			'Landed Cost Voucher': 'receipt_document',
 			'Purchase Invoice': 'return_against',
-			'Subscription': 'reference_document'
+			'Auto Repeat': 'reference_document'
 		},
 		'internal_links': {
 			'Purchase Order': ['items', 'purchase_order'],
@@ -30,7 +30,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
index 8283acc..4103e57 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -4,12 +4,16 @@
 // render
 frappe.listview_settings['Purchase Invoice'] = {
 	add_fields: ["supplier", "supplier_name", "base_grand_total", "outstanding_amount", "due_date", "company",
-		"currency", "is_return"],
+		"currency", "is_return", "release_date", "on_hold"],
 	get_indicator: function(doc) {
 		if(cint(doc.is_return)==1) {
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
 		} else if(flt(doc.outstanding_amount) > 0 && doc.docstatus==1) {
-			if(frappe.datetime.get_diff(doc.due_date) < 0) {
+			if(cint(doc.on_hold) && !doc.release_date) {
+				return [__("On Hold"), "darkgrey"];
+			} else if(cint(doc.on_hold) && doc.release_date && frappe.datetime.get_diff(doc.release_date, frappe.datetime.nowdate()) > 0) {
+				return [__("Temporarily on Hold"), "darkgrey"];
+			} else if(frappe.datetime.get_diff(doc.due_date) < 0) {
 				return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<,Today"];
 			} else {
 				return [__("Unpaid"), "orange", "outstanding_amount,>,0|due,>=,Today"];
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index a99a86a..339d275 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -6,6 +6,7 @@
 import unittest
 import frappe, erpnext
 import frappe.model
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from frappe.utils import cint, flt, today, nowdate, add_days
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
@@ -91,6 +92,106 @@
 
 		self.assertRaises(frappe.LinkExistsError, pi_doc.cancel)
 
+	def test_purchase_invoice_for_blocked_supplier(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.save()
+
+		self.assertRaises(frappe.ValidationError, make_purchase_invoice)
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_purchase_invoice_for_blocked_supplier_invoice(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Invoices'
+		supplier.save()
+
+		self.assertRaises(frappe.ValidationError, make_purchase_invoice)
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_purchase_invoice_for_blocked_supplier_payment(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Payments'
+		supplier.save()
+
+		pi = make_purchase_invoice()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Invoice', dn=pi.name, bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_purchase_invoice_for_blocked_supplier_payment_today_date(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Payments'
+		supplier.release_date = nowdate()
+		supplier.save()
+
+		pi = make_purchase_invoice()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Invoice', dn=pi.name,
+			bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_purchase_invoice_for_blocked_supplier_payment_past_date(self):
+		# this test is meant to fail only if something fails in the try block
+		with self.assertRaises(Exception):
+			try:
+				supplier = frappe.get_doc('Supplier', '_Test Supplier')
+				supplier.on_hold = 1
+				supplier.hold_type = 'Payments'
+				supplier.release_date = '2018-03-01'
+				supplier.save()
+
+				pi = make_purchase_invoice()
+
+				get_payment_entry('Purchase Invoice', dn=pi.name, bank_account="_Test Bank - _TC")
+
+				supplier.on_hold = 0
+				supplier.save()
+			except:
+				pass
+			else:
+				raise Exception
+
+	def test_purchase_invoice_blocked_invoice_must_be_in_future(self):
+		pi = make_purchase_invoice(do_not_save=True)
+		pi.release_date = nowdate()
+
+		self.assertRaises(frappe.ValidationError, pi.save)
+		pi.release_date = ''
+		pi.save()
+
+	def test_purchase_invoice_temporary_blocked(self):
+		pi = make_purchase_invoice(do_not_save=True)
+		pi.release_date = add_days(nowdate(), 10)
+		pi.save()
+		pi.submit()
+
+		pe = get_payment_entry('Purchase Invoice', dn=pi.name, bank_account="_Test Bank - _TC")
+
+		self.assertRaises(frappe.ValidationError, pe.save)
+
+	def test_purchase_invoice_explicit_block(self):
+		pi = make_purchase_invoice()
+		pi.block_invoice()
+
+		self.assertEqual(pi.on_hold, 1)
+
+		pi.unblock_invoice()
+
+		self.assertEqual(pi.on_hold, 0)
+
 	def test_gl_entries_with_perpetual_inventory_against_pr(self):
 		pr = frappe.copy_doc(pr_test_records[0])
 		set_perpetual_inventory(1, pr.company)
diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 49582a4..5801b17 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -215,7 +215,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index d1f99ab..eb77024 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -2033,6 +2033,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_location", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "po_detail", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -2258,7 +2291,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-22 15:15:25.297672", 
+ "modified": "2018-05-16 17:50:21.957780", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 50426df..bc42630 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -217,7 +217,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json b/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
index 6ba820e..23dc6c4 100644
--- a/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
+++ b/erpnext/accounts/doctype/salary_component_account/salary_component_account.json
@@ -71,7 +71,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
old mode 100644
new mode 100755
index be6078a..43a0d01
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
+
 
 import json
 
@@ -14,7 +14,7 @@
 from frappe.core.doctype.communication.email import make
 from frappe.utils import nowdate
 
-from six import string_types
+from six import string_types, iteritems
 
 
 @frappe.whitelist()
@@ -39,7 +39,7 @@
 	update_multi_mode_option(doc, pos_profile)
 	default_print_format = pos_profile.get('print_format') or "Point of Sale"
 	print_template = frappe.db.get_value('Print Format', default_print_format, 'html')
-	items_list = get_items_list(pos_profile)
+	items_list = get_items_list(pos_profile, doc.company)
 	customers = get_customers_list(pos_profile)
 
 	return {
@@ -97,7 +97,7 @@
 	doc.conversion_rate = 1.0
 
 	if doc.currency != company_data.default_currency:
-		doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency, doc.posting_date)
+		doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency, doc.posting_date, args="for_selling")
 
 	doc.selling_price_list = pos_profile.get('selling_price_list') or \
 		frappe.db.get_value('Selling Settings', None, 'selling_price_list')
@@ -151,25 +151,27 @@
 		doc.append('taxes', tax)
 
 
-def get_items_list(pos_profile):
-	cond = "1=1"
-	item_groups = []
+def get_items_list(pos_profile, company):
+	cond = ""
+	args_list = []
 	if pos_profile.get('item_groups'):
 		# Get items based on the item groups defined in the POS profile
 		for d in pos_profile.get('item_groups'):
-			item_groups.extend([d.name for d in get_child_nodes('Item Group', d.item_group)])
-		cond = "item_group in (%s)" % (', '.join(['%s'] * len(item_groups)))
+			args_list.extend([d.name for d in get_child_nodes('Item Group', d.item_group)])
+		if args_list:
+			cond = "and i.item_group in (%s)" % (', '.join(['%s'] * len(args_list)))
 
 	return frappe.db.sql("""
 		select
-			name, item_code, item_name, description, item_group, expense_account, has_batch_no,
-			has_serial_no, expense_account, selling_cost_center, stock_uom, image,
-			default_warehouse, is_stock_item, brand
+			i.name, i.item_code, i.item_name, i.description, i.item_group, i.has_batch_no,
+			i.has_serial_no, i.is_stock_item, i.brand, i.stock_uom, i.image,
+			id.expense_account, id.selling_cost_center, id.default_warehouse
 		from
-			tabItem
+			`tabItem` i LEFT JOIN `tabItem Default` id ON id.parent = i.name and id.company = %s
 		where
-			disabled = 0 and has_variants = 0 and is_sales_item = 1 and {cond}
-		""".format(cond=cond), tuple(item_groups), as_dict=1)
+			i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1
+			{cond}
+		""".format(cond=cond), tuple([company] + args_list), as_dict=1)
 
 
 def get_item_groups(pos_profile):
@@ -284,13 +286,13 @@
 	itemwise_barcode = {}
 	for item in items_list:
 		barcodes = frappe.db.sql("""
-		select barcode from `tabItem Barcode` where parent = '{0}'
-		""".format(item.item_code), as_dict=1)
+			select barcode from `tabItem Barcode` where parent = %s
+		""", item.item_code, as_dict=1)
 
 		for barcode in barcodes:
 			if item.item_code not in itemwise_barcode:
 				itemwise_barcode.setdefault(item.item_code, [])
-			itemwise_barcode[item.item_code].append(barcode)
+			itemwise_barcode[item.item_code].append(barcode.get("barcode"))
 
 	return itemwise_barcode
 
@@ -365,7 +367,7 @@
 	customers_list = make_customer_and_address(customers_list)
 	name_list = []
 	for docs in doc_list:
-		for name, doc in docs.items():
+		for name, doc in iteritems(docs):
 			if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
 				validate_records(doc)
 				si_doc = frappe.new_doc('Sales Invoice')
@@ -411,7 +413,7 @@
 
 def make_customer_and_address(customers):
 	customers_list = []
-	for customer, data in customers.items():
+	for customer, data in iteritems(customers):
 		data = json.loads(data)
 		cust_id = get_customer_id(data, customer)
 		if not cust_id:
@@ -508,7 +510,7 @@
 
 def make_email_queue(email_queue):
 	name_list = []
-	for key, data in email_queue.items():
+	for key, data in iteritems(email_queue):
 		name = frappe.db.get_value('Sales Invoice', {'offline_pos_name': key}, 'name')
 		data = json.loads(data)
 		sender = frappe.session.user
@@ -531,9 +533,12 @@
 			item_doc.item_code = item.get('item_code')
 			item_doc.item_name = item.get('item_name')
 			item_doc.description = item.get('description')
-			item_doc.default_warehouse = item.get('warehouse')
 			item_doc.stock_uom = item.get('stock_uom')
 			item_doc.item_group = item.get('item_group')
+			item_doc.append('item_defaults', {
+				"company": doc.get("company"),
+				"default_warehouse": item.get('warehouse')
+			})
 			item_doc.save(ignore_permissions=True)
 			frappe.db.commit()
 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 2fcca75..4e33cb8 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -101,6 +101,19 @@
 		}
 
 		this.set_default_print_format();
+		var me = this;
+		if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) {
+			frappe.model.with_doc("Customer", me.frm.doc.customer, function() {
+				var customer = frappe.model.get_doc("Customer", me.frm.doc.customer);
+				var internal = customer.is_internal_customer;
+				var disabled = customer.disabled;
+				if (internal == 1 && disabled == 0) {
+					me.frm.add_custom_button("Inter Company Invoice", function() {
+						me.make_inter_company_invoice();
+					}, __("Make"));
+				}
+			});
+		}
 	},
 
 	on_submit: function(doc, dt, dn) {
@@ -113,18 +126,6 @@
 		$.each(doc["items"], function(i, row) {
 			if(row.delivery_note) frappe.model.clear_doc("Delivery Note", row.delivery_note)
 		})
-
-		if(this.frm.doc.is_pos) {
-			this.frm.msgbox = frappe.msgprint(
-				`<a class="btn btn-primary" onclick="cur_frm.print_preview.printit(true)" style="margin-right: 5px;">
-					${__('Print')}</a>
-				<a class="btn btn-default" href="javascript:frappe.new_doc(cur_frm.doctype);">
-					${__('New')}</a>`
-				);
-
-		} else if(cint(frappe.boot.notification_settings.sales_invoice)) {
-			this.frm.email_doc(frappe.boot.notification_settings.sales_invoice_message);
-		}
 	},
 
 	set_default_print_format: function() {
@@ -213,11 +214,9 @@
 	tc_name: function() {
 		this.get_terms();
 	},
-
 	customer: function() {
 		var me = this;
 		if(this.frm.updating_party_details) return;
-
 		erpnext.utils.get_party_details(this.frm,
 			"erpnext.accounts.party.get_party_details", {
 				posting_date: this.frm.doc.posting_date,
@@ -230,6 +229,13 @@
 			})
 	},
 
+	make_inter_company_invoice: function() {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
+			frm: me.frm
+		});
+	},
+
 	debit_to: function() {
 		var me = this;
 		if(this.frm.doc.debit_to) {
@@ -633,4 +639,3 @@
 
 	refresh_field('total_billing_amount')
 }
-
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 5441122..c173e9c 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -15,1263 +15,1305 @@
  "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-user",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-user", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "{customer_name}",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Title",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "{customer_name}", 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Series",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "SINV-\nSINV-RET-",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 1,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "naming_series", 
+   "oldfieldtype": "Select", 
+   "options": "SINV-\nSINV-RET-", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Customer",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "customer",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "customer_name",
-   "oldfieldtype": "Data",
-   "options": "customer.customer_name",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "customer", 
+   "fetch_from": "customer.customer_name",
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer_name", 
+   "oldfieldtype": "Data", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "tax_id",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Tax Id",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Id", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Project",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "project_name",
-   "oldfieldtype": "Link",
-   "options": "Project",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "project_name", 
+   "oldfieldtype": "Link", 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_pos",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Include Payment (POS)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_pos",
-   "oldfieldtype": "Check",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_pos", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Include Payment (POS)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_pos", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_pos",
-   "fieldname": "pos_profile",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "POS Profile",
-   "length": 0,
-   "no_copy": 0,
-   "options": "POS Profile",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_pos", 
+   "fieldname": "pos_profile", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "POS Profile", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Profile", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "offline_pos_name",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Offline POS Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "offline_pos_name", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Offline POS Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Date",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "posting_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Posting Time",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "posting_time",
-   "oldfieldtype": "Time",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "posting_time", 
+   "oldfieldtype": "Time", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "set_posting_time",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Edit Posting Date and Time",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "due_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Payment Due Date",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "due_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Due Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "due_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Link",
-   "options": "Sales Invoice",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "amended_from", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_return",
-   "fieldname": "returns",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Returns",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_return", 
+   "fieldname": "returns", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Returns", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_return",
-   "fieldname": "is_return",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Return",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_return", 
+   "fieldname": "is_return", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Return", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_return",
-   "fieldname": "return_against",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Return Against Sales Invoice",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Sales Invoice",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_return", 
+   "fieldname": "return_against", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Return Against Sales Invoice", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "po_no",
-   "columns": 0,
-   "fieldname": "customer_po_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer PO Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "po_no", 
+   "columns": 0, 
+   "fieldname": "customer_po_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer PO Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "po_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer's Purchase Order",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "po_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer's Purchase Order", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_23",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_23", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "po_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer's Purchase Order Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "po_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer's Purchase Order Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "address_and_contact",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Address and Contact",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "address_and_contact", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address and Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_address",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Address",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "address_display",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Address",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "contact_person",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Contact Person",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Contact",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Contact", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "contact_display",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Contact",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Mobile No",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mobile No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "contact_email",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Contact Email",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Territory",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Territory",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "shipping_address_name",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Shipping Address Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_address_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shipping Address Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Shipping Address",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shipping_address", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shipping Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company_address",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Address Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Address Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Address",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "customer",
-   "fieldname": "currency_and_price_list",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Currency and Price List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "customer", 
+   "fieldname": "currency_and_price_list", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency and Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Currency",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "currency", 
+   "oldfieldtype": "Select", 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Rate at which Customer Currency is converted to customer's base currency",
-   "fieldname": "conversion_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Exchange Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "conversion_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "precision": "9",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Rate at which Customer Currency is converted to customer's base currency", 
+   "fieldname": "conversion_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exchange Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "conversion_rate", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "precision": "9", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
   }, 
   {
@@ -1721,6 +1763,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "base_total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -3952,6 +4025,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "inter_company_invoice_reference", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inter Company Invoice Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "customer_group", 
    "fieldtype": "Link", 
@@ -4824,7 +4929,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-04-30 16:19:54.711885",
+ "modified": "2018-05-22 17:20:54.711885",
  "modified_by": "Administrator",
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -4833,7 +4938,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -4853,7 +4957,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -4873,7 +4976,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -4893,7 +4995,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index a3ad049..d0994eb 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 import frappe.defaults
-from frappe.utils import cint, flt
+from frappe.utils import cint, flt, add_months, today, date_diff, getdate, add_days
 from frappe import _, msgprint, throw
 from erpnext.accounts.party import get_party_account, get_due_date
 from erpnext.controllers.stock_controller import update_gl_entries_after
@@ -22,6 +22,8 @@
 from erpnext.setup.doctype.company.company import update_company_current_month_sales
 from erpnext.accounts.general_ledger import get_round_off_account_and_cost_center
 
+from six import iteritems
+
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
 }
@@ -73,6 +75,7 @@
 		self.validate_account_for_change_amount()
 		self.validate_fixed_asset()
 		self.set_income_account_for_fixed_assets()
+		validate_inter_company_party(self.doctype, self.customer, self.company, self.inter_company_invoice_reference)
 
 		if cint(self.is_pos):
 			self.validate_pos()
@@ -146,6 +149,7 @@
 
 		update_company_current_month_sales(self.company)
 		self.update_project()
+		update_linked_invoice(self.doctype, self.name, self.inter_company_invoice_reference)
 
 	def validate_pos_paid_amount(self):
 		if len(self.payments) == 0 and self.is_pos:
@@ -186,6 +190,8 @@
 		update_company_current_month_sales(self.company)
 		self.update_project()
 
+		unlink_inter_company_invoice(self.doctype, self.name, self.inter_company_invoice_reference)
+
 	def update_status_updater_args(self):
 		if cint(self.update_stock):
 			self.status_updater.extend([{
@@ -335,9 +341,8 @@
 			# set pos values in items
 			for item in self.get("items"):
 				if item.get('item_code'):
-					for fname, val in get_pos_profile_item_details(pos,
-						frappe._dict(item.as_dict()), pos, True).items():
-
+					profile_details = get_pos_profile_item_details(pos, frappe._dict(item.as_dict()), pos)
+					for fname, val in iteritems(profile_details):
 						if (not for_validate) or (for_validate and not item.get(fname)):
 							item.set(fname, val)
 
@@ -695,7 +700,7 @@
 					account_currency = get_account_currency(item.income_account)
 					gl_entries.append(
 						self.get_gl_dict({
-							"account": item.income_account,
+							"account": item.income_account if not item.enable_deferred_revenue else item.deferred_revenue_account,
 							"against": self.customer,
 							"credit": item.base_net_amount,
 							"credit_in_account_currency": item.base_net_amount \
@@ -907,11 +912,128 @@
 			project.update_billed_amount()
 			project.save()
 
+
 	def verify_payment_amount_is_positive(self):
 		for entry in self.payments:
 			if entry.amount < 0:
 				frappe.throw(_("Row #{0} (Payment Table): Amount must be positive").format(entry.idx))
 
+	def book_income_for_deferred_revenue(self):
+		# book the income on the last day, but it will be trigger on the 1st of month at 12:00 AM
+		# start_date: 1st of the last month or the start date
+		# end_date: end_date or today-1
+
+		gl_entries = []
+		for item in self.get('items'):
+			last_gl_entry = False
+
+			booking_start_date = getdate(add_months(today(), -1))
+			booking_start_date = booking_start_date if booking_start_date>item.service_start_date else item.service_start_date
+
+			booking_end_date = getdate(add_days(today(), -1))
+			if booking_end_date>=item.service_end_date:
+				last_gl_entry = True
+				booking_end_date = item.service_end_date
+
+			total_days = date_diff(item.service_end_date, item.service_start_date)
+			total_booking_days = date_diff(booking_end_date, booking_start_date) + 1
+
+			account_currency = get_account_currency(item.income_account)
+			if not last_gl_entry:
+				base_amount = flt(item.base_net_amount*total_booking_days/flt(total_days), item.precision("base_net_amount"))
+				if account_currency==self.company_currency:
+					amount = base_amount
+				else:
+					amount = flt(item.net_amount*total_booking_days/flt(total_days), item.precision("net_amount"))
+			else:
+				gl_entries_details = frappe.db.sql('''
+					select sum(debit) as total_debit, sum(debit_in_account_currency) as total_debit_in_account_currency, voucher_detail_no
+					from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
+					group by voucher_detail_no
+				''', (self.company, item.deferred_revenue_account, "Sales Invoice", self.name, item.name), as_dict=True)[0]
+				base_amount = flt(item.base_net_amount - gl_entries_details.total_debit, item.precision("base_net_amount"))
+				if account_currency==self.company_currency:
+					amount = base_amount
+				else:
+					amount = flt(item.net_amount - gl_entries_details.total_debit_in_account_currency, item.precision("net_amount"))
+
+			# GL Entry for crediting the amount in the income
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": item.income_account,
+					"against": self.customer,
+					"credit": base_amount,
+					"credit_in_account_currency": amount,
+					"cost_center": item.cost_center,
+					'posting_date': booking_end_date
+				}, account_currency)
+			)
+			# GL Entry to debit the amount from the deferred account
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": item.deferred_revenue_account,
+					"against": self.customer,
+					"debit": base_amount,
+					"debit_in_account_currency": amount,
+					"cost_center": item.cost_center,
+					"voucher_detail_no": item.name,
+					'posting_date': booking_end_date
+				}, account_currency)
+			)
+
+		if gl_entries:
+			from erpnext.accounts.general_ledger import make_gl_entries
+			make_gl_entries(gl_entries, cancel=(self.docstatus == 2), merge_entries=True)
+
+
+def booked_deferred_revenue():
+	# check for the sales invoice for which GL entries has to be done
+	invoices = frappe.db.sql_list('''
+		select parent from `tabSales Invoice Item` where service_start_date<=%s and service_end_date>=%s
+	''', (today(), add_months(today(), -1)))
+
+	# ToDo also find the list on the basic of the GL entry, and make another list
+	for invoice in invoices:
+		doc = frappe.get_doc("Sales Invoice", invoice)
+		doc.book_income_for_deferred_revenue()
+
+
+def validate_inter_company_party(doctype, party, company, inter_company_invoice_reference):
+	if doctype == "Sales Invoice":
+		partytype, ref_partytype, internal = "Customer", "Supplier", "is_internal_customer"
+		ref_doc =  "Purchase Invoice"
+	else:
+		partytype, ref_partytype, internal = "Supplier", "Customer", "is_internal_supplier"
+		ref_doc =  "Sales Invoice"
+
+	if inter_company_invoice_reference:
+		doc = frappe.get_doc(ref_doc, inter_company_invoice_reference)
+		ref_party = doc.supplier if doctype == "Sales Invoice" else doc.customer
+		if not frappe.db.get_value(partytype, {"represents_company": doc.company}, "name") == party:
+			frappe.throw(_("Invalid {0} for Inter Company Invoice.").format(partytype))
+		if not frappe.db.get_value(ref_partytype, {"name": ref_party}, "represents_company") == company:
+			frappe.throw(_("Invalid Company for Inter Company Invoice."))
+
+	elif frappe.db.get_value(partytype, {"name": party, internal: 1}, "name") == party:
+		companies = frappe.db.sql("""select company from `tabAllowed To Transact With`
+			where parenttype = '{0}' and parent = '{1}'""".format(partytype, party), as_list = 1)
+		companies = [d[0] for d in companies]
+		if not company in companies:
+			frappe.throw(_("{0} not allowed to transact with {1}. Please change the Company.").format(partytype, company))
+
+def update_linked_invoice(doctype, name, inter_company_invoice_reference):
+	if inter_company_invoice_reference:
+		frappe.db.set_value(doctype, inter_company_invoice_reference,\
+			"inter_company_invoice_reference", name)
+
+def unlink_inter_company_invoice(doctype, name, inter_company_invoice_reference):
+	ref_doc = "Purchase Invoice" if doctype == "Sales Invoice" else "Sales Invoice"
+	if inter_company_invoice_reference:
+		frappe.db.set_value(doctype, name,\
+			"inter_company_invoice_reference", "")
+		frappe.db.set_value(ref_doc, inter_company_invoice_reference,\
+			"inter_company_invoice_reference", "")
+
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
@@ -992,3 +1114,88 @@
 	for data in self.payments:
 		if not data.account:
 			data.account = get_bank_cash_account(data.mode_of_payment, self.company).get("account")
+
+def get_inter_company_details(doc, doctype):
+	if doctype == "Sales Invoice":
+		party = frappe.db.get_value("Supplier", {"disabled": 0, "is_internal_supplier": 1, "represents_company": doc.company}, "name")
+		company = frappe.db.get_value("Customer", {"name": doc.customer}, "represents_company")
+	else:
+		party = frappe.db.get_value("Customer", {"disabled": 0, "is_internal_customer": 1, "represents_company": doc.company}, "name")
+		company = frappe.db.get_value("Supplier", {"name": doc.supplier}, "represents_company")
+
+	return {
+		"party": party,
+		"company": company
+	}
+
+
+def validate_inter_company_invoice(doc, doctype):
+
+	details = get_inter_company_details(doc, doctype)
+	price_list = doc.selling_price_list if doctype == "Sales Invoice" else doc.buying_price_list
+	valid_price_list = frappe.db.get_value("Price List", {"name": price_list, "buying": 1, "selling": 1})
+	if not valid_price_list:
+		frappe.throw(_("Selected Price List should have buying and selling fields checked."))
+
+	party = details.get("party")
+	if not party:
+		partytype = "Supplier" if doctype == "Sales Invoice" else "Customer"
+		frappe.throw(_("No {0} found for Inter Company Transactions.").format(partytype))
+
+	company = details.get("company")
+	default_currency = frappe.db.get_value("Company", company, "default_currency")
+	if default_currency != doc.currency:
+		frappe.throw(_("Company currencies of both the companies should match for Inter Company Transactions."))
+
+	return
+
+@frappe.whitelist()
+def make_inter_company_purchase_invoice(source_name, target_doc=None):
+	return make_inter_company_invoice("Sales Invoice", source_name, target_doc)
+
+def make_inter_company_invoice(doctype, source_name, target_doc=None):
+	if doctype == "Sales Invoice":
+		source_doc = frappe.get_doc("Sales Invoice", source_name)
+		target_doctype = "Purchase Invoice"
+	else:
+		source_doc = frappe.get_doc("Purchase Invoice", source_name)
+		target_doctype = "Sales Invoice"
+
+	validate_inter_company_invoice(source_doc, doctype)
+	details = get_inter_company_details(source_doc, doctype)
+
+	def set_missing_values(source, target):
+		target.run_method("set_missing_values")
+
+	def update_details(source_doc, target_doc, source_parent):
+		target_doc.inter_company_invoice_reference = source_doc.name
+		if target_doc.doctype == "Purchase Invoice":
+			target_doc.company = details.get("company")
+			target_doc.supplier = details.get("party")
+			target_doc.buying_price_list = source_doc.selling_price_list
+		else:
+			target_doc.company = details.get("company")
+			target_doc.customer = details.get("party")
+			target_doc.selling_price_list = source_doc.buying_price_list
+
+	doclist = get_mapped_doc(doctype, source_name,	{
+		doctype: {
+			"doctype": target_doctype,
+			"postprocess": update_details,
+			"field_no_map": [
+				"taxes_and_charges"
+			]
+		},
+		doctype +" Item": {
+			"doctype": target_doctype + " Item",
+			"field_no_map": [
+				"income_account",
+				"expense_account",
+				"cost_center",
+				"warehouse"
+			]
+		}
+
+	}, target_doc, set_missing_values)
+
+	return doclist
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index efd18b5..71fce77 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -9,7 +9,7 @@
 			'Payment Entry': 'reference_name',
 			'Payment Request': 'reference_name',
 			'Sales Invoice': 'return_against',
-			'Subscription': 'reference_document',
+			'Auto Repeat': 'reference_document',
 		},
 		'internal_links': {
 			'Sales Order': ['items', 'sales_order']
@@ -29,7 +29,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 8be5a0a..17cfd5c 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -16,7 +16,7 @@
 from frappe.model.naming import make_autoname
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data
-
+from six import iteritems
 class TestSalesInvoice(unittest.TestCase):
 	def make(self):
 		w = frappe.copy_doc(test_records[0])
@@ -277,7 +277,7 @@
 
 		# check if item values are calculated
 		for i, d in enumerate(si.get("items")):
-			for k, v in expected_values[i].items():
+			for k, v in iteritems(expected_values[i]):
 				self.assertEqual(d.get(k), v)
 
 		# check net total
@@ -523,7 +523,7 @@
 
 		# check if item values are calculated
 		for i, d in enumerate(si.get("items")):
-			for key, val in expected_values[i].items():
+			for key, val in iteritems(expected_values[i]):
 				self.assertEqual(d.get(key), val)
 
 		# check net total
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index dbbe368..14bf4d8 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -215,7 +215,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index bb73556..d1c1838 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1,2367 +1,2633 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-06-04 11:02:19",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-06-04 11:02:19", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcode",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 4,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Item",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 4, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_item_code",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer's Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_item_code", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer's Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Edit Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": "200px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "200px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "200px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_8",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image View",
-   "length": 0,
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Quantity",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOM Conversion Factor",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Qty as per Stock UOM",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_17",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Price List Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "ref_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "base_price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Price List Rate (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "base_ref_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "base_ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "discount_and_margin",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Discount and Margin",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "discount_and_margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Discount and Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "price_list_rate",
-   "fieldname": "margin_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Margin Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nPercentage\nAmount",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.margin_type && doc.price_list_rate",
-   "fieldname": "margin_rate_or_amount",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Margin Rate or Amount",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount",
-   "fieldname": "rate_with_margin",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rate With Margin",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "2",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
+   "fieldname": "rate_with_margin", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate With Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_19",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "price_list_rate",
-   "fieldname": "discount_percentage",
-   "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Discount (%) on Price List Rate with Margin",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "adj_rate",
-   "oldfieldtype": "Float",
-   "permlevel": 0,
-   "precision": "2",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Discount (%) on Price List Rate with Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "adj_rate", 
+   "oldfieldtype": "Float", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount",
-   "fieldname": "base_rate_with_margin",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rate With Margin (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "2",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", 
+   "fieldname": "base_rate_with_margin", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate With Margin (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "export_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "export_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Amount",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "export_amount",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "export_amount", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "base_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rate (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "basic_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "basic_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "base_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amount (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "pricing_rule",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Pricing Rule",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Pricing Rule",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pricing_rule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pricing Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Pricing Rule", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_21",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_21", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Net Rate",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Net Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Net Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Net Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_24",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_24", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "base_net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Net Rate (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "base_net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Net Amount (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1",
-   "columns": 0,
-   "fieldname": "drop_ship",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Drop Ship",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1", 
+   "columns": 0, 
+   "fieldname": "drop_ship", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Drop Ship", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delivered_by_supplier",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delivered By Supplier",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivered By Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "accounting",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accounting Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "accounting", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounting Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "income_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Income Account",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "income_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "print_width": "120px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "income_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "120px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "120px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expense Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expense Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "120px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": ":Company",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "print_width": "120px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": ":Company", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "cost_center", 
+   "oldfieldtype": "Link", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "120px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "120px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_18",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Weight Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "deferred_revenue", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deferred Revenue", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "weight_per_unit",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weight Per Unit",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "enable_deferred_revenue", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Enable Deferred Revenue", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_weight",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Weight",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "enable_deferred_revenue", 
+   "fieldname": "deferred_revenue_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deferred Revenue Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_21",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_50", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "weight_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weight UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "enable_deferred_revenue", 
+   "fieldname": "service_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Service Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no",
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "warehouse_and_reference",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "enable_deferred_revenue", 
+   "fieldname": "service_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Service End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_18", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Weight Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "target_warehouse",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Warehouse (Optional)",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "quality_inspection",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Quality Inspection",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Quality Inspection",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_weight", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Weight", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "batch_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Batch No",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Batch",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "weight_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "allow_zero_valuation_rate",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Zero Valuation Rate",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.serial_no || doc.batch_no", 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "warehouse_and_reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Serial No",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "serial_no",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "target_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Warehouse (Optional)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "brand",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Brand Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "brand",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "quality_inspection", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quality Inspection", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Quality Inspection", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_tax_rate",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Tax Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_tax_rate",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Batch No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Batch", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "actual_batch_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Available Batch Qty at Warehouse",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "print_width": "150px",
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_zero_valuation_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Zero Valuation Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_group", 
+   "oldfieldtype": "Link", 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "brand", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Brand Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_tax_rate", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Tax Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_tax_rate", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_batch_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Available Batch Qty at Warehouse", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "actual_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Available Qty at Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "actual_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Available Qty at Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "actual_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "edit_references",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "References",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "edit_references", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "References", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_order",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales Order",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "sales_order",
-   "oldfieldtype": "Link",
-   "options": "Sales Order",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_order", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Order", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "sales_order", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Order", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "so_detail",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales Order Item",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "so_detail",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "so_detail", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Order Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "so_detail", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_50",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_74", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delivery_note",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delivery Note",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "delivery_note",
-   "oldfieldtype": "Link",
-   "options": "Delivery Note",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivery_note", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivery Note", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "delivery_note", 
+   "oldfieldtype": "Link", 
+   "options": "Delivery Note", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "dn_detail",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delivery Note Item",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "dn_detail",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "dn_detail", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivery Note Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "dn_detail", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delivered_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delivered Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "delivered_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivered_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivered Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "delivered_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_fixed_asset",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Fixed Asset",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Fixed Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "asset",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Asset",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Asset",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_54",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_54", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "page_break",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Page Break",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "page_break", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Page Break", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2017-11-29 13:42:59.003120",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Invoice Item",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 0,
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-14 06:26:59.609228", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Sales Invoice Item", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
index b9e5c8d..438328d 100644
--- a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+++ b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +106,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -133,6 +136,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -172,6 +177,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "mode_of_payment.type",
    "fieldname": "type", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -184,7 +190,7 @@
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "mode_of_payment.type", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -195,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -226,6 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -256,6 +264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -269,7 +278,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-03-07 18:34:39.552769", 
+ "modified": "2018-05-16 22:42:52.033991",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Payment", 
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
index a0a6312..50eed24 100644
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -134,7 +134,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index 894d5ab..29e15d1 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -216,7 +216,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.js b/erpnext/accounts/doctype/share_transfer/share_transfer.js
index fbf12e5..af23b26 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.js
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.js
@@ -16,6 +16,11 @@
 				};
 			};
 		});
+		if (frm.doc.docstatus == 1) {
+			frm.add_custom_button(__('Make Journal Entry'), function () {
+				erpnext.share_transfer.make_jv(frm);
+			});
+		}
 	},
 	no_of_shares: (frm) => {
 		if (frm.doc.rate != undefined || frm.doc.rate != null){
@@ -26,6 +31,31 @@
 		if (frm.doc.no_of_shares != undefined || frm.doc.no_of_shares != null){
 			erpnext.share_transfer.update_amount(frm);
 		}
+	},
+	company: async function(frm) {
+		if (frm.doc.company) {
+			let currency = (await frappe.db.get_value("Company", frm.doc.company, "default_currency")).message.default_currency;
+			frm.set_query("equity_or_liability_account", function() {
+				return {
+					filters: {
+						"is_group":0,
+						"root_type": ["in",["Equity","Liability"]],
+						"company": frm.doc.company,
+						"account_currency": currency
+					}
+				};
+			});
+			frm.set_query("asset_account", function() {
+				return {
+					filters: {
+						"is_group":0,
+						"root_type":"Asset",
+						"company": frm.doc.company,
+						"account_currency": currency
+					}
+				};
+			});
+		}
 	}
 });
 
@@ -33,3 +63,50 @@
 	frm.doc.amount = frm.doc.no_of_shares * frm.doc.rate;
 	frm.refresh_field("amount");
 };
+
+erpnext.share_transfer.make_jv = function (frm) {
+	var account, payment_account, credit_applicant_type, credit_applicant,
+		debit_applicant_type, debit_applicant;
+
+	if (frm.doc.transfer_type == "Transfer") {
+		account = frm.doc.equity_or_liability_account;
+		payment_account = frm.doc.equity_or_liability_account;
+		credit_applicant_type = "Shareholder";
+		credit_applicant = frm.doc.to_shareholder;
+		debit_applicant_type = "Shareholder";
+		debit_applicant = frm.doc.from_shareholder;
+	}
+	else if (frm.doc.transfer_type == "Issue") {
+		account = frm.doc.asset_account;
+		payment_account = frm.doc.equity_or_liability_account;
+		credit_applicant_type = "Shareholder";
+		credit_applicant = frm.doc.to_shareholder;
+		debit_applicant_type = "";
+		debit_applicant = "";
+	}
+	else {
+		account = frm.doc.equity_or_liability_account;
+		payment_account = frm.doc.asset_account;
+		credit_applicant_type = "";
+		credit_applicant = "";
+		debit_applicant_type = "Shareholder";
+		debit_applicant = frm.doc.from_shareholder;
+	}
+	frappe.call({
+		args: {
+			"company": frm.doc.company,
+			"account": account,
+			"amount": frm.doc.amount,
+			"payment_account": payment_account,
+			"credit_applicant_type": credit_applicant_type,
+			"credit_applicant": credit_applicant,
+			"debit_applicant_type": debit_applicant_type,
+			"debit_applicant": debit_applicant
+		},
+		method: "erpnext.accounts.doctype.share_transfer.share_transfer.make_jv_entry",
+		callback: function (r) {
+			var doc = frappe.model.sync(r.message)[0];
+			frappe.set_route("Form", doc.doctype, doc.name);
+		}
+	});
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
index 9e6f49d..3bdaaa7 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.json
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -130,6 +133,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -162,6 +166,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -171,6 +176,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "eval:doc.transfer_type != 'Issue'", 
+   "fetch_from": "from_shareholder.folio_no",
    "fieldname": "from_folio_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -183,7 +189,7 @@
    "label": "From Folio No", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "from_shareholder.folio_no", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -194,6 +200,73 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.company", 
+   "fieldname": "equity_or_liability_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Equity/Liability Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.transfer_type != 'Transfer') && (doc.company)", 
+   "fieldname": "asset_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -223,6 +296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -255,6 +329,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -264,6 +339,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "eval:doc.transfer_type != 'Purchase'", 
+   "fetch_from": "to_shareholder.folio_no",
    "fieldname": "to_folio_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -276,7 +352,7 @@
    "label": "To Folio No", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "to_shareholder.folio_no", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -287,6 +363,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -316,6 +393,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -347,6 +425,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -378,6 +457,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -408,6 +488,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -437,6 +518,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -467,6 +549,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -498,6 +581,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -528,6 +612,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -557,6 +642,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -588,6 +674,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -617,6 +704,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -647,6 +735,38 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Share Transfer", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -656,11 +776,11 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "is_submittable": 0, 
+ "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-23 16:12:54.776896", 
+ "modified": "2018-05-17 15:25:36.429433", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Share Transfer", 
@@ -668,8 +788,7 @@
  "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
+   "amend": 1, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -684,7 +803,7 @@
    "role": "System Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 0, 
+   "submit": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.py b/erpnext/accounts/doctype/share_transfer/share_transfer.py
index 2a2d9ff..50ce9f2 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.py
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.py
@@ -8,14 +8,15 @@
 from frappe.model.document import Document
 from frappe.model.naming   import make_autoname
 from frappe.exceptions import ValidationError
+from frappe.utils import nowdate
 
 class ShareDontExists(ValidationError): pass
 
 class ShareTransfer(Document):
-	def before_save(self):
+	def before_submit(self):
 		if self.transfer_type == 'Issue':
-			company_doc = self.get_shareholder_doc(self.company)
-			company_doc.append('share_balance', {
+			shareholder = self.get_shareholder_doc(self.company)
+			shareholder.append('share_balance', {
 				'share_type': self.share_type,
 				'from_no': self.from_no,
 				'to_no': self.to_no,
@@ -25,7 +26,7 @@
 				'is_company': 1,
 				'current_state': 'Issued'
 			})
-			company_doc.save()
+			shareholder.save()
 
 			doc = frappe.get_doc('Shareholder', self.to_shareholder)
 			doc.append('share_balance', {
@@ -60,13 +61,13 @@
 		self.folio_no_validation()
 		if self.transfer_type == 'Issue':
 			if not self.get_shareholder_doc(self.company):
-				company_doc = frappe.get_doc({
+				shareholder = frappe.get_doc({
 					'doctype': 'Shareholder',
 					'title': self.company,
 					'company': self.company,
 					'is_company': 1
 				})
-				company_doc.insert()
+				shareholder.insert()
 			# validate share doesnt exist in company
 			ret_val = self.share_exists(self.get_shareholder_doc(self.company).name)
 			if ret_val != False:
@@ -275,3 +276,27 @@
 			return frappe.get_doc('Shareholder', doc[0]['name'])
 		else: #It will necessarily by 0 indicating it doesn't exist
 			return False
+
+@frappe.whitelist()
+def make_jv_entry( company, account, amount, payment_account,\
+	credit_applicant_type, credit_applicant, debit_applicant_type, debit_applicant):
+	journal_entry = frappe.new_doc('Journal Entry')
+	journal_entry.voucher_type = 'Journal Entry'
+	journal_entry.company = company
+	journal_entry.posting_date = nowdate()
+	account_amt_list = []
+
+	account_amt_list.append({
+		"account": account,
+		"debit_in_account_currency": amount,
+		"party_type": debit_applicant_type,
+		"party": debit_applicant,
+		})
+	account_amt_list.append({
+		"account": payment_account,
+		"credit_in_account_currency": amount,
+		"party_type": credit_applicant_type,
+		"party": credit_applicant,
+		})
+	journal_entry.set("accounts", account_amt_list)
+	return journal_entry.as_dict()
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
index a6df2ac..0a06f57 100644
--- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -89,7 +89,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
index fe28fcb..46fd377 100644
--- a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
+++ b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -42,7 +42,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.js b/erpnext/accounts/doctype/tax_rule/tax_rule.js
index 84c42a3..370890e 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.js
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.add_fetch("customer", "customer_group", "customer_group" );
-cur_frm.add_fetch("supplier", "supplier_type", "supplier_type" );
+cur_frm.add_fetch("supplier", "supplier_group_name", "supplier_group" );
 
 frappe.ui.form.on("Tax Rule", "tax_type", function(frm) {
 	frm.toggle_reqd("sales_tax_template", frm.doc.tax_type=="Sales");
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index a746daf..56ca055 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "TR.####", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,9 +42,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -69,9 +73,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -97,9 +103,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -128,9 +136,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -159,9 +169,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -188,9 +200,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -219,9 +233,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -250,9 +266,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -279,9 +297,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -308,9 +328,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -337,9 +359,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -367,9 +391,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -395,9 +421,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -426,15 +454,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "eval:doc.tax_type==\"Purchase\"", 
-   "fieldname": "supplier_type", 
+   "fieldname": "supplier_group",
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -443,10 +473,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Supplier Type", 
+   "label": "Supplier Group",
    "length": 0, 
    "no_copy": 0, 
-   "options": "Supplier Type", 
+   "options": "Supplier Group",
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -457,9 +487,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -486,9 +518,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -515,9 +549,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -544,9 +580,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -574,9 +612,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -603,9 +643,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -632,9 +674,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -660,9 +704,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -689,9 +735,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -717,9 +765,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -747,9 +797,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -775,9 +827,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -805,20 +859,21 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:22:42.501765", 
+ "modified": "2018-04-19 07:53:43.020808",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -827,7 +882,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index ddef657..56bd287 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -30,7 +30,7 @@
 
 	def validate_tax_template(self):
 		if self.tax_type== "Sales":
-			self.purchase_tax_template = self.supplier = self.supplier_type = None
+			self.purchase_tax_template = self.supplier = self.supplier_group = None
 			if self.customer:
 				self.customer_group = None
 
@@ -38,7 +38,7 @@
 			self.sales_tax_template = self.customer = self.customer_group = None
 
 			if self.supplier:
-				self.supplier_type = None
+				self.supplier_group = None
 
 		if not (self.sales_tax_template or self.purchase_tax_template):
 			frappe.throw(_("Tax Template is mandatory."))
@@ -53,7 +53,7 @@
 			"customer": 		self.customer,
 			"customer_group": 	self.customer_group,
 			"supplier":			self.supplier,
-			"supplier_type":	self.supplier_type,
+			"supplier_group":	self.supplier_group,
 			"billing_city":		self.billing_city,
 			"billing_county":	self.billing_county,
 			"billing_state": 	self.billing_state,
diff --git a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
index d411fee..d6f9a47 100644
--- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
@@ -43,7 +43,6 @@
 		tax_rule1 = make_tax_rule(customer_group= "All Customer Groups",
 			sales_tax_template = "_Test Sales Taxes and Charges Template - _TC", priority = 1, from_date = "2015-01-01")
 		tax_rule1.save()
-
 		self.assertEqual(get_tax_template("2015-01-01", {"customer_group" : "Commercial", "use_for_shopping_cart":0}),
 			"_Test Sales Taxes and Charges Template - _TC")
 
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/tax_withholding_account/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/tax_withholding_account/__init__.py
diff --git a/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json
new file mode 100644
index 0000000..06d6b08
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json
@@ -0,0 +1,105 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 18:43:14.898336", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 18:44:25.055382", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Tax Withholding Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.py b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.py
new file mode 100644
index 0000000..76e3fa3
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TaxWithholdingAccount(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/doctype/tax_withholding_category/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/doctype/tax_withholding_category/__init__.py
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js
new file mode 100644
index 0000000..da99a8d
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Tax Withholding Category', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
new file mode 100644
index 0000000..8edaf01
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
@@ -0,0 +1,316 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:42:06.431683", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "percent_of_tax_withheld", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Percent of Tax Withheld", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "threshold", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Threshold", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "book_on_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Book on Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "withhold_cumulative_tax_amount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Withhold Cumulative Tax Amount On First Invoice After Threshold", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Tax Withholding Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 13:57:52.489773", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Tax Withholding Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
new file mode 100644
index 0000000..61f4b60
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TaxWithholdingCategory(Document):
+	def validate(self):
+		if not frappe.db.get_value("Tax Withholding Category",
+			{"is_default": 1, "name": ("!=", self.name)}, "name"):
+			self.is_default = 1
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.js b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.js
new file mode 100644
index 0000000..eab98d4
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Tax Withholding Category", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Tax Withholding Category
+		() => frappe.tests.make('Tax Withholding Category', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
new file mode 100644
index 0000000..7d99011
--- /dev/null
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestTaxWithholdingCategory(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/accounts/email_alert/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/accounts/email_alert/__init__.py
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/email_alert/notification_for_new_fiscal_year/__init__.py
diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json
new file mode 100644
index 0000000..2e524d6
--- /dev/null
+++ b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.json
@@ -0,0 +1,28 @@
+{
+ "attach_print": 0, 
+ "condition": "doc.auto_created", 
+ "creation": "2018-04-25 14:19:05.440361", 
+ "days_in_advance": 0, 
+ "docstatus": 0, 
+ "doctype": "Email Alert", 
+ "document_type": "Fiscal Year", 
+ "enabled": 1, 
+ "event": "New", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "message": "<h3>{{_(\"Fiscal Year\")}}</h3>\n\n<p>{{ _(\"New fiscal year created :- \") }} {{ doc.name }}</p>", 
+ "modified": "2018-04-25 14:30:38.588534", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Notification for new fiscal year", 
+ "owner": "Administrator", 
+ "recipients": [
+  {
+   "email_by_role": "Accounts User"
+  }, 
+  {
+   "email_by_role": "Accounts Manager"
+  }
+ ], 
+ "subject": "Notification for new fiscal year {{ doc.name }}"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md
new file mode 100644
index 0000000..c674ab6
--- /dev/null
+++ b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.md
@@ -0,0 +1,3 @@
+<h3>{{_("Fiscal Year")}}</h3>
+
+<p>{{ _("New fiscal year created :- ") }} {{ doc.name }}</p>
\ No newline at end of file
diff --git a/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py
new file mode 100644
index 0000000..1bc4d18
--- /dev/null
+++ b/erpnext/accounts/email_alert/notification_for_new_fiscal_year/notification_for_new_fiscal_year.py
@@ -0,0 +1,5 @@
+from __future__ import unicode_literals
+
+def get_context(context):
+	# do your magic here
+	pass
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
old mode 100644
new mode 100755
index a32e182..2146ace
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -405,7 +405,7 @@
 
 	make_search: function () {
 		var me = this;
-		this.serach_item = frappe.ui.form.make_control({
+		this.search_item = frappe.ui.form.make_control({
 			df: {
 				"fieldtype": "Data",
 				"label": "Item",
@@ -416,13 +416,13 @@
 			only_input: true,
 		});
 
-		this.serach_item.make_input();
+		this.search_item.make_input();
 
-		this.serach_item.$input.on("keypress", function (event) {
+		this.search_item.$input.on("keypress", function (event) {
 
 			clearTimeout(me.last_search_timeout);
 			me.last_search_timeout = setTimeout(() => {
-				if((me.serach_item.$input.val() != "") || (event.which == 13)) {
+				if((me.search_item.$input.val() != "") || (event.which == 13)) {
 					me.items = me.get_items();
 					me.make_item_list();
 				}
@@ -679,7 +679,7 @@
 	set_focus: function () {
 		if (this.default_customer || this.frm.doc.customer) {
 			this.set_customer_value_in_party_field();
-			this.serach_item.$input.focus();
+			this.search_item.$input.focus();
 		} else {
 			this.party_field.$input.focus();
 		}
@@ -1051,6 +1051,7 @@
 						item_name: obj.name === obj.item_name ? "" : obj.item_name,
 						item_image: obj.image,
 						item_stock: __('Stock Qty') + ": " + me.get_actual_qty(obj),
+						item_uom: obj.stock_uom,
 						color: frappe.get_palette(obj.item_name),
 						abbr: frappe.get_abbr(obj.item_name)
 					})).tooltip().appendTo($wrap);
@@ -1073,8 +1074,8 @@
 		}
 
 		if (this.items.length == 1
-			&& this.serach_item.$input.val()) {
-			this.serach_item.$input.val("");
+			&& this.search_item.$input.val()) {
+			this.search_item.$input.val("");
 			this.add_to_cart();
 		}
 	},
@@ -1096,7 +1097,7 @@
 
 		this.items_list = this.apply_category();
 
-		key = this.serach_item.$input.val().toLowerCase().replace(/[&\/\\#,+()\[\]$~.'":*?<>{}]/g, '\\$&');
+		key = this.search_item.$input.val().toLowerCase().replace(/[&\/\\#,+()\[\]$~.'":*?<>{}]/g, '\\$&');
 		var re = new RegExp('%', 'g');
 		var reg = new RegExp(key.replace(re, '[\\w*\\s*[a-zA-Z0-9]*]*'))
 		search_status = true
@@ -1104,15 +1105,15 @@
 		if (key) {
 			return $.grep(this.items_list, function (item) {
 				if (search_status) {
-					if (in_list(me.batch_no_data[item.item_code], me.serach_item.$input.val())) {
+					if (in_list(me.batch_no_data[item.item_code], me.search_item.$input.val())) {
 						search_status = false;
-						return me.item_batch_no[item.item_code] = me.serach_item.$input.val()
+						return me.item_batch_no[item.item_code] = me.search_item.$input.val()
 					} else if (me.serial_no_data[item.item_code]
-						&& in_list(Object.keys(me.serial_no_data[item.item_code]), me.serach_item.$input.val())) {
+						&& in_list(Object.keys(me.serial_no_data[item.item_code]), me.search_item.$input.val())) {
 						search_status = false;
-						me.item_serial_no[item.item_code] = [me.serach_item.$input.val(), me.serial_no_data[item.item_code][me.serach_item.$input.val()]]
+						me.item_serial_no[item.item_code] = [me.search_item.$input.val(), me.serial_no_data[item.item_code][me.search_item.$input.val()]]
 						return true
-					} else if (in_list(me.barcode_data[item.item_code], me.serach_item.$input.val())) {
+					} else if (in_list(me.barcode_data[item.item_code], me.search_item.$input.val())) {
 						search_status = false;
 						return true;
 					} else if (reg.test(item.item_code.toLowerCase()) || (item.description && reg.test(item.description.toLowerCase())) ||
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 6f272cf..1db6ced 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-import frappe
+import frappe, erpnext
 from frappe import _, msgprint, scrub
 from frappe.defaults import get_user_permissions
 from frappe.model.utils import get_fetch_values
@@ -43,12 +43,12 @@
 	party = frappe.get_doc(party_type, party)
 	currency = party.default_currency if party.default_currency else get_company_currency(company)
 
+	out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_group)
+	out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company)
 	set_address_details(out, party, party_type, doctype, company)
 	set_contact_details(out, party, party_type)
 	set_other_values(out, party, party_type)
 	set_price_list(out, party, party_type, price_list)
-	out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_type)
-	out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company)
 
 	if not out.get("currency"):
 		out["currency"] = currency
@@ -83,6 +83,18 @@
 		out.update(get_company_address(company))
 		if out.company_address:
 			out.update(get_fetch_values(doctype, 'company_address', out.company_address))
+		get_regional_address_details(out, doctype, company)
+
+	elif doctype and doctype == "Purchase Invoice":
+		out.update(get_company_address(company))
+		if out.company_address:
+			out["shipping_address"] = out["company_address"]
+			out.update(get_fetch_values(doctype, 'shipping_address', out.shipping_address))
+		get_regional_address_details(out, doctype, company)
+
+@erpnext.allow_regional
+def get_regional_address_details(out, doctype, company):
+	pass
 
 def set_contact_details(out, party, party_type):
 	out.contact_person = get_default_contact(party_type, party.name)
@@ -105,7 +117,7 @@
 	if party_type=="Customer":
 		to_copy = ["customer_name", "customer_group", "territory", "language"]
 	else:
-		to_copy = ["supplier_name", "supplier_type", "language"]
+		to_copy = ["supplier_name", "supplier_group", "language"]
 	for f in to_copy:
 		out[f] = party.get(f)
 
@@ -130,15 +142,15 @@
 
 def set_price_list(out, party, party_type, given_price_list):
 	# price list
-	price_list = filter(None, get_user_permissions().get("Price List", []))
-	if isinstance(price_list, list):
-		price_list = price_list[0] if len(price_list)==1 else None
+	price_list = filter(None, get_user_permissions()
+		.get("Price List", {})
+		.get("docs", []))
+	price_list = list(price_list)
 
-	if not price_list:
-		price_list = get_default_price_list(party)
-
-	if not price_list:
-		price_list = given_price_list
+	if price_list:
+		price_list = price_list[0]
+	else:
+		price_list = get_default_price_list(party) or given_price_list
 
 	if price_list:
 		out.price_list_currency = frappe.db.get_value("Price List", price_list, "currency")
@@ -169,7 +181,7 @@
 def get_party_account(party_type, party, company):
 	"""Returns the account for the given `party`.
 		Will first search in party (Customer / Supplier) record, if not found,
-		will search in group (Customer Group / Supplier Type),
+		will search in group (Customer Group / Supplier Group),
 		finally will return default."""
 	if not company:
 		frappe.throw(_("Please select a Company"))
@@ -181,7 +193,7 @@
 		{"parenttype": party_type, "parent": party, "company": company}, "account")
 
 	if not account and party_type in ['Customer', 'Supplier']:
-		party_group_doctype = "Customer Group" if party_type=="Customer" else "Supplier Type"
+		party_group_doctype = "Customer Group" if party_type=="Customer" else "Supplier Group"
 		group = frappe.db.get_value(party_type, party, scrub(party_group_doctype))
 		account = frappe.db.get_value("Party Account",
 			{"parenttype": party_group_doctype, "parent": group, "company": company}, "account")
@@ -274,8 +286,8 @@
 			due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime("%Y-%m-%d")
 		else:
 			if party_type == "Supplier":
-				supplier_type = frappe.db.get_value(party_type, party, fieldname="supplier_type")
-				template_name = frappe.db.get_value("Supplier Type", supplier_type, fieldname="payment_terms")
+				supplier_group = frappe.db.get_value(party_type, party, fieldname="supplier_group")
+				template_name = frappe.db.get_value("Supplier Group", supplier_group, fieldname="payment_terms")
 				if template_name:
 					due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime("%Y-%m-%d")
 	# If due date is calculated from bill_date, check this condition
@@ -321,7 +333,7 @@
 					.format(formatdate(default_due_date)))
 
 @frappe.whitelist()
-def set_taxes(party, party_type, posting_date, company, customer_group=None, supplier_type=None,
+def set_taxes(party, party_type, posting_date, company, customer_group=None, supplier_group=None,
 	billing_address=None, shipping_address=None, use_for_shopping_cart=None):
 	from erpnext.accounts.doctype.tax_rule.tax_rule import get_tax_template, get_party_details
 	args = {
@@ -332,8 +344,8 @@
 	if customer_group:
 		args['customer_group'] = customer_group
 
-	if supplier_type:
-		args['supplier_type'] = supplier_type
+	if supplier_group:
+		args['supplier_group'] = supplier_group
 
 	if billing_address or shipping_address:
 		args.update(get_party_details(party, party_type, {"billing_address": billing_address, \
@@ -371,10 +383,10 @@
 				customer.customer_group, fieldname='payment_terms')
 	else:
 		supplier = frappe.db.get_value("Supplier", party_name,
-			fieldname=['payment_terms', "supplier_type"], as_dict=1)
+			fieldname=['payment_terms', "supplier_group"], as_dict=1)
 		template = supplier.payment_terms
-		if not template and supplier.supplier_type:
-			template = frappe.db.get_value("Supplier Type", supplier.supplier_type, fieldname='payment_terms')
+		if not template and supplier.supplier_group:
+			template = frappe.db.get_value("Supplier Group", supplier.supplier_group, fieldname='payment_terms')
 
 	if not template and company:
 		template = frappe.db.get_value("Company", company, fieldname='payment_terms')
@@ -400,10 +412,21 @@
 	from frappe.desk.form.load import get_communication_data
 
 	out = {}
+	fields = 'date(creation), count(name)'
+	after = add_years(None, -1).strftime('%Y-%m-%d')
+	group_by='group by date(creation)'
+
 	data = get_communication_data(doctype, name,
-		fields = 'date(creation), count(name)',
-		after = add_years(None, -1).strftime('%Y-%m-%d'),
-		group_by='group by date(creation)', as_dict=False)
+		fields=fields, after=after, group_by=group_by, as_dict=False)
+
+	# fetch and append data from Activity Log
+	data += frappe.db.sql("""select {fields}
+		from `tabActivity Log`
+		where reference_doctype='{doctype}' and reference_name='{name}'
+		and status!='Success' and creation > {after}
+		{group_by} order by creation desc
+		""".format(doctype=doctype, name=name, fields=fields,
+			group_by=group_by, after=after), as_dict=False)
 
 	timeline_items = dict(data)
 
@@ -448,7 +471,6 @@
 
 	return info
 
-
 def get_party_shipping_address(doctype, name):
 	"""
 	Returns an Address name (best guess) for the given doctype and name for which `address_type == 'Shipping'` is true.
@@ -476,3 +498,59 @@
 		return out[0][0]
 	else:
 		return ''
+
+def get_patry_tax_withholding_details(ref_doc):
+	supplier = frappe.get_doc("Supplier", ref_doc.supplier)
+	tax_withholding_details = []
+	for tax in supplier.tax_withholding_config:
+		tax_mapper = get_tax_mapper()
+
+		set_tax_withholding_details(tax_mapper, ref_doc, tax_withholding_category=tax.tax_withholding_category)
+
+		if tax.valid_till and date_diff(tax.valid_till, ref_doc.posting_date) > 0:
+			tax_mapper.update({
+				"rate": tax.applicable_percent
+			})
+
+		prepare_tax_withholding_details(tax_mapper, tax_withholding_details)
+
+	return tax_withholding_details
+
+def prepare_tax_withholding_details(tax_mapper, tax_withholding_details):
+	if tax_mapper.get('account_head'):
+		
+		tax_withholding_details.append({
+			"threshold": tax_mapper['threshold'],
+			"tax": tax_mapper
+		})
+
+		del tax_mapper['threshold']
+
+def set_tax_withholding_details(tax_mapper, ref_doc, tax_withholding_category=None, use_default=0):
+	if tax_withholding_category:
+		tax_withholding = frappe.get_doc("Tax Withholding Category", tax_withholding_category)
+	else:
+		tax_withholding = frappe.get_doc("Tax Withholding Category", {'is_default': 1, 'enabled': 1})
+
+	if tax_withholding.book_on_invoice and ref_doc.doctype=='Purchase Invoice' \
+		or tax_withholding.book_on_advance and ref_doc.doctype in ('Payment Entry', 'Journal Entry'):
+
+		for account_detail in tax_withholding.accounts:
+			if ref_doc.company == account_detail.company:
+				tax_mapper.update({
+					"account_head": account_detail.account,
+					"rate": tax_withholding.percent_of_tax_withheld,
+					"threshold": tax_withholding.threshold,
+					"description": tax_withholding.name
+				})
+
+def get_tax_mapper():
+	return {
+		"category": "Total",
+		"add_deduct_tax": "Deduct",
+		"charge_type": "On Net Total",
+		"rate": 0,
+		"description": '',
+		"account_head": '',
+		"threshold": 0.0
+	}
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index e95b0f3..1066a3e 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -11,6 +11,12 @@
 			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
 			"fieldname":"supplier",
 			"label": __("Supplier"),
 			"fieldtype": "Link",
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index 1418de3..d421b6e 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -11,6 +11,12 @@
 			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
 			"fieldname":"customer",
 			"label": __("Customer"),
 			"fieldtype": "Link",
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index fc730ed..bf906ce 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from frappe import _, scrub
 from frappe.utils import getdate, nowdate, flt, cint
 
@@ -112,7 +112,7 @@
 				_("Customer Group") + ":Link/Customer Group:120"
 			]
 		if args.get("party_type") == "Supplier":
-			columns += [_("Supplier Type") + ":Link/Supplier Type:80"]
+			columns += [_("Supplier Group") + ":Link/Supplier Group:80"]
 
 		columns.append(_("Remarks") + "::200")
 
@@ -205,11 +205,11 @@
 						# Delivery Note
 						row += [voucher_details.get(gle.voucher_no, {}).get("delivery_note")]
 
-					# customer territory / supplier type
+					# customer territory / supplier group
 					if args.get("party_type") == "Customer":
 						row += [self.get_territory(gle.party), self.get_customer_group(gle.party)]
 					if args.get("party_type") == "Supplier":
-						row += [self.get_supplier_type(gle.party)]
+						row += [self.get_supplier_group(gle.party)]
 
 					row.append(gle.remarks)
 					data.append(row)
@@ -271,15 +271,15 @@
 	def get_customer_group(self, party_name):
 		return self.get_party_map("Customer").get(party_name, {}).get("customer_group") or ""
 
-	def get_supplier_type(self, party_name):
-		return self.get_party_map("Supplier").get(party_name, {}).get("supplier_type") or ""
+	def get_supplier_group(self, party_name):
+		return self.get_party_map("Supplier").get(party_name, {}).get("supplier_group") or ""
 
 	def get_party_map(self, party_type):
 		if not hasattr(self, "party_map"):
 			if party_type == "Customer":
 				select_fields = "name, customer_name, territory, customer_group"
 			elif party_type == "Supplier":
-				select_fields = "name, supplier_name, supplier_type"
+				select_fields = "name, supplier_name, supplier_group"
 
 			self.party_map = dict(((r.name, r) for r in frappe.db.sql("select {0} from `tab{1}`"
 				.format(select_fields, party_type), as_dict=True)))
@@ -332,6 +332,15 @@
 			conditions.append("company=%s")
 			values.append(self.filters.company)
 
+		company_finance_book = erpnext.get_default_finance_book(self.filters.company)
+
+		if not self.filters.finance_book or (self.filters.finance_book == company_finance_book):
+			conditions.append("ifnull(finance_book,'') in (%s, '')")
+			values.append(company_finance_book)
+		elif self.filters.finance_book:
+			conditions.append("ifnull(finance_book,'') = %s")
+			values.append(self.filters.finance_book)
+
 		if self.filters.get(party_type_field):
 			conditions.append("party=%s")
 			values.append(self.filters.get(party_type_field))
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 08b24fb..c56ae0d 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -7,6 +7,9 @@
 from frappe.utils import flt
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport
 
+from six import iteritems
+from six.moves import zip
+
 class AccountsReceivableSummary(ReceivablePayableReport):
 	def run(self, args):
 		party_naming_by = frappe.db.get_value(args.get("naming_by")[0], None, args.get("naming_by")[1])
@@ -35,7 +38,7 @@
 				_("Customer Group") + ":Link/Customer Group:120"
 			]
 		if args.get("party_type") == "Supplier":
-			columns += [_("Supplier Type") + ":Link/Supplier Type:80"]
+			columns += [_("Supplier Group") + ":Link/Supplier Group:80"]
 			
 		columns.append({
 			"fieldname": "currency",
@@ -52,7 +55,7 @@
 
 		partywise_total = self.get_partywise_total(party_naming_by, args)
 
-		for party, party_dict in partywise_total.items():
+		for party, party_dict in iteritems(partywise_total):
 			row = [party]
 
 			if party_naming_by == "Naming Series":
@@ -66,7 +69,7 @@
 			if args.get("party_type") == "Customer":
 				row += [self.get_territory(party), self.get_customer_group(party)]
 			if args.get("party_type") == "Supplier":
-				row += [self.get_supplier_type(party)]
+				row += [self.get_supplier_group(party)]
 				
 			row.append(party_dict.currency)
 			data.append(row)
@@ -88,7 +91,7 @@
 					"range4": 0
 				})
 			)
-			for k in party_total[d.party].keys():
+			for k in list(party_total[d.party]):
 				if k != "currency":
 					party_total[d.party][k] += flt(d.get(k, 0))
 				
@@ -113,7 +116,7 @@
 		"outstanding_amt", "age", "range1", "range2", "range3", "range4", "currency"]
 
 		if args.get("party_type") == "Supplier":
-			cols += ["supplier_type", "remarks"]
+			cols += ["supplier_group", "remarks"]
 		if args.get("party_type") == "Customer":
 			cols += ["territory", "customer_group", "remarks"]
 
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
index 9fa99c7..126cd03 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
@@ -32,6 +32,12 @@
 			"options": "Asset"
 		},
 		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
 			"fieldname":"asset_category",
 			"label": __("Asset Category"),
 			"fieldtype": "Link",
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
index 5497384..fb59882 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
@@ -2,7 +2,7 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from frappe import _
 
 def execute(filters=None):
@@ -13,7 +13,7 @@
 	data = frappe.db.sql("""
 		select 
 			a.name as asset, a.asset_category, a.status, 
-			a.depreciation_method, a.purchase_date, a.gross_purchase_amount,
+			ds.depreciation_method, a.purchase_date, a.gross_purchase_amount,
 			ds.schedule_date as depreciation_date, ds.depreciation_amount, 
 			ds.accumulated_depreciation_amount, 
 			(a.gross_purchase_amount - ds.accumulated_depreciation_amount) as amount_after_depreciation,
@@ -30,9 +30,9 @@
 		order by
 			a.name asc, ds.schedule_date asc
 	""".format(conditions=get_filter_conditions(filters)), filters, as_dict=1)
-		
+
 	return data
-	
+
 def get_filter_conditions(filters):
 	conditions = ""
 	
@@ -42,6 +42,14 @@
 	if filters.get("asset_category"):
 		conditions += " and a.asset_category = %(asset_category)s"
 		
+	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+
+	if (not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book)):
+		filters['finance_book'] = company_finance_book
+		conditions += " and ifnull(ds.finance_book, '') in (%(finance_book)s, '') "
+	elif filters.get("finance_book"):
+		conditions += " and ifnull(ds.finance_book, '') = %(finance_book)s"
+
 	return conditions
 	
 def get_columns():
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index 97990fa..c71ecf4 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -58,7 +58,7 @@
 
 	return columns, data, message, chart
 
-def get_provisional_profit_loss(asset, liability, equity, period_list, company):
+def get_provisional_profit_loss(asset, liability, equity, period_list, company, consolidated=False):
 	provisional_profit_loss = {}
 	total_row = {}
 	if asset and (liability or equity):
@@ -73,22 +73,23 @@
 		has_value = False
 
 		for period in period_list:
+			key = period if consolidated else period.key
 			effective_liability = 0.0
 			if liability:
-				effective_liability += flt(liability[-2].get(period.key))
+				effective_liability += flt(liability[-2].get(key))
 			if equity:
-				effective_liability += flt(equity[-2].get(period.key))
+				effective_liability += flt(equity[-2].get(key))
 
-			provisional_profit_loss[period.key] = flt(asset[-2].get(period.key)) - effective_liability
-			total_row[period.key] = effective_liability + provisional_profit_loss[period.key]
+			provisional_profit_loss[key] = flt(asset[-2].get(key)) - effective_liability
+			total_row[key] = effective_liability + provisional_profit_loss[key]
 
-			if provisional_profit_loss[period.key]:
+			if provisional_profit_loss[key]:
 				has_value = True
 
-			total += flt(provisional_profit_loss[period.key])
+			total += flt(provisional_profit_loss[key])
 			provisional_profit_loss["total"] = total
 
-			total_row_total += flt(total_row[period.key])
+			total_row_total += flt(total_row[key])
 			total_row["total"] = total_row_total
 
 		if has_value:
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index bc457aa..26c8f99 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -8,6 +8,8 @@
 from frappe.utils import formatdate
 from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
 
+from six import iteritems
+
 def execute(filters=None):
 	if not filters: filters = {}
 
@@ -20,7 +22,7 @@
 	for cost_center in cost_centers:
 		cost_center_items = cam_map.get(cost_center)
 		if cost_center_items:
-			for account, monthwise_data in cost_center_items.items():
+			for account, monthwise_data in iteritems(cost_center_items):
 				row = [cost_center, account]
 				totals = [0, 0, 0]
 				for relevant_months in period_month_ranges:
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index c81db38..56de941 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -18,6 +18,60 @@
 	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
 		filters.periodicity, filters.accumulated_values, filters.company)
 
+	cash_flow_accounts = get_cash_flow_accounts()
+
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, 
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, 
+		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
+		
+	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
+
+	data = []
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	
+	for cash_flow_account in cash_flow_accounts:
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
+
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": cash_flow_accounts[0]['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
+
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, 
+				account['account_type'], period_list, filters.accumulated_values)
+			account_data.update({
+				"account_name": account['label'],
+				"account": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header'],
+				"currency": company_currency
+			})
+			data.append(account_data)
+			section_data.append(account_data)
+
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], 
+			period_list, company_currency)
+
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list, company_currency)
+	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
+
+	return columns, data
+
+def get_cash_flow_accounts():
 	operation_accounts = {
 		"section_name": "Operations",
 		"section_footer": _("Net Cash from Operations"),
@@ -49,80 +103,17 @@
 	}
 
 	# combine all cash flow accounts for iteration
-	cash_flow_accounts = [operation_accounts, investing_accounts, financing_accounts]
-
-	# compute net profit / loss
-	income = get_data(filters.company, "Income", "Credit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
-	expense = get_data(filters.company, "Expense", "Debit", period_list, 
-		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
-		
-	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
-
-	data = []
-	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
-	
-	for cash_flow_account in cash_flow_accounts:
-		section_data = []
-		data.append({
-			"account_name": cash_flow_account['section_header'], 
-			"parent_account": None,
-			"indent": 0.0, 
-			"account": cash_flow_account['section_header']
-		})
-
-		if len(data) == 1:
-			# add first net income in operations section
-			if net_profit_loss:
-				net_profit_loss.update({
-					"indent": 1, 
-					"parent_account": operation_accounts['section_header']
-				})
-				data.append(net_profit_loss)
-				section_data.append(net_profit_loss)
-
-		for account in cash_flow_account['account_types']:
-			account_data = get_account_type_based_data(filters.company, 
-				account['account_type'], period_list, filters.accumulated_values)
-			account_data.update({
-				"account_name": account['label'],
-				"account": account['label'], 
-				"indent": 1,
-				"parent_account": cash_flow_account['section_header'],
-				"currency": company_currency
-			})
-			data.append(account_data)
-			section_data.append(account_data)
-
-		add_total_row_account(data, section_data, cash_flow_account['section_footer'], 
-			period_list, company_currency)
-
-	add_total_row_account(data, data, _("Net Change in Cash"), period_list, company_currency)
-	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
-
-	return columns, data
-
+	return [operation_accounts, investing_accounts, financing_accounts]
 
 def get_account_type_based_data(company, account_type, period_list, accumulated_values):
 	data = {}
 	total = 0
 	for period in period_list:
 		start_date = get_start_date(period, accumulated_values, company)
-		gl_sum = frappe.db.sql_list("""
-			select sum(credit) - sum(debit)
-			from `tabGL Entry`
-			where company=%s and posting_date >= %s and posting_date <= %s 
-				and voucher_type != 'Period Closing Voucher'
-				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
-		""", (company, start_date if accumulated_values else period['from_date'],
-			period['to_date'], account_type))
 
-		if gl_sum and gl_sum[0]:
-			amount = gl_sum[0]
-			if account_type == "Depreciation":
-				amount *= -1
-		else:
-			amount = 0
+		amount = get_account_type_based_gl_data(company, start_date, period['to_date'], account_type)
+		if amount and account_type == "Depreciation":
+			amount *= -1
 
 		total += amount
 		data.setdefault(period["key"], amount)
@@ -130,16 +121,28 @@
 	data["total"] = total
 	return data
 
+def get_account_type_based_gl_data(company, start_date, end_date, account_type):
+	gl_sum = frappe.db.sql_list("""
+		select sum(credit) - sum(debit)
+		from `tabGL Entry`
+		where company=%s and posting_date >= %s and posting_date <= %s
+			and voucher_type != 'Period Closing Voucher'
+			and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+	""", (company, start_date, end_date, account_type))
+
+	return gl_sum[0] if gl_sum and gl_sum[0] else 0
 
 def get_start_date(period, accumulated_values, company):
+	if not accumulated_values and period.get('from_date'):
+		return period['from_date']
+
 	start_date = period["year_start_date"]
 	if accumulated_values:
 		start_date = get_fiscal_year(period.to_date, company=company)[1]
 
 	return start_date
 
-
-def add_total_row_account(out, data, label, period_list, currency):
+def add_total_row_account(out, data, label, period_list, currency, consolidated = False):
 	total_row = {
 		"account_name": "'" + _("{0}").format(label) + "'",
 		"account": "'" + _("{0}").format(label) + "'",
@@ -148,8 +151,9 @@
 	for row in data:
 		if row.get("parent_account"):
 			for period in period_list:
-				total_row.setdefault(period.key, 0.0)
-				total_row[period.key] += row.get(period.key, 0.0)
+				key = period if consolidated else period['key']
+				total_row.setdefault(key, 0.0)
+				total_row[key] += row.get(key, 0.0)
 			
 			total_row.setdefault("total", 0.0)
 			total_row["total"] += row["total"]
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/accounts/report/consolidated_financial_statement/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/accounts/report/consolidated_financial_statement/__init__.py
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
new file mode 100644
index 0000000..91a06f4
--- /dev/null
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
@@ -0,0 +1,52 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Consolidated Financial Statement"] = {
+	"filters": [
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"from_fiscal_year",
+			"label": __("Start Year"),
+			"fieldtype": "Link",
+			"options": "Fiscal Year",
+			"default": frappe.defaults.get_user_default("fiscal_year"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"to_fiscal_year",
+			"label": __("End Year"),
+			"fieldtype": "Link",
+			"options": "Fiscal Year",
+			"default": frappe.defaults.get_user_default("fiscal_year"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
+			"fieldname":"report",
+			"label": __("Report"),
+			"fieldtype": "Select",
+			"options": ["Profit and Loss Statement", "Balance Sheet", "Cash Flow"],
+			"default": "Balance Sheet",
+			"reqd": 1
+		},
+		{
+			"fieldname":"accumulated_in_group_company",
+			"label": __("Accumulated Values in Group Company"),
+			"fieldtype": "Check",
+			"default": 0
+		},
+	]
+}
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.json b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.json
new file mode 100644
index 0000000..e03f1af
--- /dev/null
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.json
@@ -0,0 +1,35 @@
+{
+ "add_total_row": 0, 
+ "creation": "2018-04-14 16:01:07.919565", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "Test AEF", 
+ "modified": "2018-04-14 16:01:07.919565", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Consolidated Financial Statement", 
+ "owner": "Administrator", 
+ "ref_doctype": "Account", 
+ "report_name": "Consolidated Financial Statement", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Auditor"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
new file mode 100644
index 0000000..380e3a2
--- /dev/null
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -0,0 +1,422 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe import _
+from frappe.utils import flt, cint
+from erpnext.accounts.report.financial_statements import get_fiscal_year_data, sort_accounts
+from erpnext.accounts.report.balance_sheet.balance_sheet import (get_provisional_profit_loss,
+	check_opening_balance, get_chart_data)
+from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import (get_net_profit_loss,
+	get_chart_data as get_pl_chart_data)
+from erpnext.accounts.report.cash_flow.cash_flow import (get_cash_flow_accounts, get_account_type_based_gl_data,
+	add_total_row_account)
+
+def execute(filters=None):
+	columns, data, message, chart = [], [], [], []
+
+	if not filters.get('company'):
+		return columns, data, message, chart
+
+	fiscal_year = get_fiscal_year_data(filters.get('from_fiscal_year'), filters.get('to_fiscal_year'))
+	companies_column, companies = get_companies(filters)
+	columns = get_columns(companies_column)
+
+	if filters.get('report') == "Balance Sheet":
+		data, message, chart = get_balance_sheet_data(fiscal_year, companies, columns, filters)
+	elif filters.get('report') == "Profit and Loss Statement":
+		data, message, chart = get_profit_loss_data(fiscal_year, companies, columns, filters)
+	else:
+		if cint(frappe.db.get_single_value('Accounts Settings', 'use_custom_cash_flow')):
+			from erpnext.accounts.report.cash_flow.custom_cash_flow import execute as execute_custom
+			return execute_custom(filters=filters)
+
+		data = get_cash_flow_data(fiscal_year, companies, filters)
+
+	return columns, data, message, chart
+
+def get_balance_sheet_data(fiscal_year, companies, columns, filters):
+	asset = get_data(companies, "Asset", "Debit", fiscal_year, filters=filters)
+
+	liability = get_data(companies, "Liability", "Credit", fiscal_year, filters=filters)
+
+	equity = get_data(companies, "Equity", "Credit", fiscal_year, filters=filters)
+
+	data = []
+	data.extend(asset or [])
+	data.extend(liability or [])
+	data.extend(equity or [])
+	
+	provisional_profit_loss, total_credit = get_provisional_profit_loss(asset, liability, equity,
+		companies, filters.get('company'), True)
+
+	message, opening_balance = check_opening_balance(asset, liability, equity)
+
+	if opening_balance and round(opening_balance,2) !=0:
+		unclosed ={
+			"account_name": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
+			"account": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
+			"warn_if_negative": True,
+			"currency": frappe.db.get_value("Company", filters.company, "default_currency")
+		}
+		for company in companies:
+			unclosed[company] = opening_balance
+			if provisional_profit_loss:
+				provisional_profit_loss[company] = provisional_profit_loss[company] - opening_balance
+
+		unclosed["total"]=opening_balance
+		data.append(unclosed)
+
+	if provisional_profit_loss:
+		data.append(provisional_profit_loss)
+	if total_credit:
+		data.append(total_credit)
+
+	chart = get_chart_data(filters, columns, asset, liability, equity)
+
+	return data, message, chart
+
+def get_profit_loss_data(fiscal_year, companies, columns, filters):
+	income, expense, net_profit_loss = get_income_expense_data(companies, fiscal_year, filters)
+
+	data = []
+	data.extend(income or [])
+	data.extend(expense or [])
+	if net_profit_loss:
+		data.append(net_profit_loss)
+
+	chart = get_pl_chart_data(filters, columns, income, expense, net_profit_loss)
+
+	return data, None, chart
+
+def get_income_expense_data(companies, fiscal_year, filters):
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	income = get_data(companies, "Income", "Credit", fiscal_year, filters, True)
+
+	expense = get_data(companies, "Expense", "Debit", fiscal_year, filters, True)
+
+	net_profit_loss = get_net_profit_loss(income, expense, companies, filters.company, company_currency, True)
+
+	return income, expense, net_profit_loss
+	
+def get_cash_flow_data(fiscal_year, companies, filters):
+	cash_flow_accounts = get_cash_flow_accounts()
+
+	income, expense, net_profit_loss = get_income_expense_data(companies, fiscal_year, filters)
+
+	data = []
+	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+
+	for cash_flow_account in cash_flow_accounts:
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'],
+			"parent_account": None,
+			"indent": 0.0,
+			"account": cash_flow_account['section_header']
+		})
+
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": cash_flow_accounts[0]['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
+
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(account['account_type'], companies, fiscal_year)
+			account_data.update({
+				"account_name": account['label'],
+				"account": account['label'],
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header'],
+				"currency": company_currency
+			})
+			data.append(account_data)
+			section_data.append(account_data)
+
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'],
+			companies, company_currency, True)
+
+	add_total_row_account(data, data, _("Net Change in Cash"), companies, company_currency, True)
+
+	return data
+
+def get_account_type_based_data(account_type, companies, fiscal_year):
+	data = {}
+	total = 0
+	for company in companies:
+		amount = get_account_type_based_gl_data(company,
+			fiscal_year.year_start_date, fiscal_year.year_end_date, account_type)
+
+		if amount and account_type == "Depreciation":
+			amount *= -1
+
+		total += amount
+		data.setdefault(company, amount)
+
+	data["total"] = total
+	return data
+
+def get_columns(companies):
+	columns = [{
+		"fieldname": "account",
+		"label": _("Account"),
+		"fieldtype": "Link",
+		"options": "Account",
+		"width": 300
+	}]
+
+	columns.append({
+		"fieldname": "currency",
+		"label": _("Currency"),
+		"fieldtype": "Link",
+		"options": "Currency",
+		"hidden": 1
+	})
+
+	for company in companies:
+		columns.append({
+			"fieldname": company,
+			"label": company,
+			"fieldtype": "Currency",
+			"width": 150
+		})
+
+	return columns
+
+def get_data(companies, root_type, balance_must_be, fiscal_year, filters=None, ignore_closing_entries=False):
+	accounts, accounts_by_name = get_account_heads(root_type,
+		companies, filters)
+
+	company_currency = get_company_currency(filters)
+
+	gl_entries_by_account = {}
+	for root in frappe.db.sql("""select lft, rgt from tabAccount
+			where root_type=%s and ifnull(parent_account, '') = ''""", root_type, as_dict=1):
+
+		set_gl_entries_by_account(fiscal_year.year_start_date,
+			fiscal_year.year_end_date, root.lft, root.rgt, filters,
+			gl_entries_by_account, accounts_by_name, ignore_closing_entries=False)
+
+	calculate_values(accounts_by_name, gl_entries_by_account, companies, fiscal_year, filters)
+	accumulate_values_into_parents(accounts, accounts_by_name, companies)
+	out = prepare_data(accounts, fiscal_year, balance_must_be, companies, company_currency)
+
+	if out:
+		add_total_row(out, root_type, balance_must_be, companies, company_currency)
+
+	return out
+
+def get_company_currency(filters=None):
+	return frappe.db.get_value("Company", filters.get('company'), "default_currency")
+
+def calculate_values(accounts_by_name, gl_entries_by_account, companies, fiscal_year, filters):
+	for entries in gl_entries_by_account.values():
+		for entry in entries:
+			key = entry.account_number or entry.account_name
+			d = accounts_by_name.get(key)
+			if d:
+				for company in companies:
+					# check if posting date is within the period
+					if (entry.company == company or (filters.get('accumulated_in_group_company'))
+						and entry.company in companies.get(company)):
+						d[company] = d.get(company, 0.0) + flt(entry.debit) - flt(entry.credit)
+
+				if entry.posting_date < fiscal_year.year_start_date:
+					d["opening_balance"] = d.get("opening_balance", 0.0) + flt(entry.debit) - flt(entry.credit)
+
+def accumulate_values_into_parents(accounts, accounts_by_name, companies):
+	"""accumulate children's values in parent accounts"""
+	for d in reversed(accounts):
+		if d.parent_account:
+			account = d.parent_account.split('-')[0].strip()
+			for company in companies:
+				accounts_by_name[account][company] = \
+					accounts_by_name[account].get(company, 0.0) + d.get(company, 0.0)
+
+			accounts_by_name[account]["opening_balance"] = \
+				accounts_by_name[account].get("opening_balance", 0.0) + d.get("opening_balance", 0.0)
+
+def get_account_heads(root_type, companies, filters):
+	accounts = get_accounts(root_type, filters)
+
+	if not accounts:
+		return None
+
+	accounts, accounts_by_name, parent_children_map = filter_accounts(accounts)
+
+	return accounts, accounts_by_name
+
+def get_companies(filters):
+	companies = {}
+	all_companies = get_subsidiary_companies(filters.get('company'))
+	companies.setdefault(filters.get('company'), all_companies)
+
+	for d in all_companies:
+		if d not in companies:
+			subsidiary_companies = get_subsidiary_companies(d)
+			companies.setdefault(d, subsidiary_companies)
+
+	return all_companies, companies
+
+def get_subsidiary_companies(company):
+	lft, rgt = frappe.db.get_value('Company',
+		company, ["lft", "rgt"])
+
+	return frappe.db.sql_list("""select name from `tabCompany`
+		where lft >= {0} and rgt <= {1} order by lft, rgt""".format(lft, rgt))
+
+def get_accounts(root_type, filters):
+	return frappe.db.sql(""" select name, is_group, company,
+			parent_account, lft, rgt, root_type, report_type, account_name, account_number
+		from
+			`tabAccount` where company = %s and root_type = %s
+		""" , (filters.get('company'), root_type), as_dict=1)
+
+def prepare_data(accounts, fiscal_year, balance_must_be, companies, company_currency):
+	data = []
+	year_start_date = fiscal_year.year_start_date
+	year_end_date = fiscal_year.year_end_date
+
+	for d in accounts:
+		# add to output
+		has_value = False
+		total = 0
+		row = frappe._dict({
+			"account_name": _(d.account_name),
+			"account": _(d.account_name),
+			"parent_account": _(d.parent_account),
+			"indent": flt(d.indent),
+			"year_start_date": year_start_date,
+			"year_end_date": year_end_date,
+			"currency": company_currency,
+			"opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be == "Debit" else -1)
+		})
+		for company in companies:
+			if d.get(company) and balance_must_be == "Credit":
+				# change sign based on Debit or Credit, since calculation is done using (debit - credit)
+				d[company] *= -1
+
+			row[company] = flt(d.get(company, 0.0), 3)
+
+			if abs(row[company]) >= 0.005:
+				# ignore zero values
+				has_value = True
+				total += flt(row[company])
+
+		row["has_value"] = has_value
+		row["total"] = total
+		data.append(row)
+
+	return data
+
+def set_gl_entries_by_account(from_date, to_date, root_lft, root_rgt, filters, gl_entries_by_account,
+	accounts_by_name, ignore_closing_entries=False):
+	"""Returns a dict like { "account": [gl entries], ... }"""
+
+	company_lft, company_rgt = frappe.db.get_value('Company',
+		filters.get('company'), ["lft", "rgt"])
+
+	additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)
+
+	gl_entries = frappe.db.sql("""select gl.posting_date, gl.account, gl.debit, gl.credit, gl.is_opening, gl.company,
+		gl.fiscal_year, gl.debit_in_account_currency, gl.credit_in_account_currency, gl.account_currency,
+		acc.account_name, acc.account_number
+		from `tabGL Entry` gl, `tabAccount` acc where acc.name = gl.account and gl.company in 
+		(select name from `tabCompany` where lft >= %(company_lft)s and rgt <= %(company_rgt)s)
+		{additional_conditions} and gl.posting_date <= %(to_date)s and acc.lft >= %(lft)s and acc.rgt <= %(rgt)s
+		order by gl.account, gl.posting_date""".format(additional_conditions=additional_conditions),
+		{
+			"from_date": from_date,
+			"to_date": to_date,
+			"lft": root_lft,
+			"rgt": root_rgt,
+			"company_lft": company_lft,
+			"company_rgt": company_rgt,
+		},
+		as_dict=True)
+
+	for entry in gl_entries:
+		key = entry.account_number or entry.account_name
+		validate_entries(key, entry, accounts_by_name)
+		gl_entries_by_account.setdefault(key, []).append(entry)
+
+	return gl_entries_by_account
+
+def validate_entries(key, entry, accounts_by_name):
+	if key not in accounts_by_name:
+		field = "Account number" if entry.account_number else "Account name"
+		frappe.throw(_("{0} {1} is not present in the parent company").format(field, key))
+
+def get_additional_conditions(from_date, ignore_closing_entries, filters):
+	additional_conditions = []
+
+	if ignore_closing_entries:
+		additional_conditions.append("ifnull(gl.voucher_type, '')!='Period Closing Voucher'")
+
+	if from_date:
+		additional_conditions.append("gl.posting_date >= %(from_date)s")
+
+	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+
+	if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
+		additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
+			frappe.db.escape(company_finance_book))
+	elif filters.get("finance_book"):
+		additional_conditions.append("ifnull(finance_book, '') = '%s' " %
+			frappe.db.escape(filters.get("finance_book")))
+
+	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
+
+def add_total_row(out, root_type, balance_must_be, companies, company_currency):
+	total_row = {
+		"account_name": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'",
+		"account": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'",
+		"currency": company_currency
+	}
+
+	for row in out:
+		if not row.get("parent_account"):
+			for company in companies:
+				total_row.setdefault(company, 0.0)
+				total_row[company] += row.get(company, 0.0)
+				row[company] = 0.0
+
+			total_row.setdefault("total", 0.0)
+			total_row["total"] += flt(row["total"])
+			row["total"] = ""
+
+	if "total" in total_row:
+		out.append(total_row)
+
+		# blank row after Total
+		out.append({})
+
+def filter_accounts(accounts, depth=10):
+	parent_children_map = {}
+	accounts_by_name = {}
+	for d in accounts:
+		key = d.account_number or d.account_name
+		accounts_by_name[key] = d
+		parent_children_map.setdefault(d.parent_account or None, []).append(d)
+
+	filtered_accounts = []
+
+	def add_to_list(parent, level):
+		if level < depth:
+			children = parent_children_map.get(parent) or []
+			sort_accounts(children, is_root=True if parent==None else False)
+
+			for child in children:
+				child.indent = level
+				filtered_accounts.append(child)
+				add_to_list(child.name, level + 1)
+
+	add_to_list(None, 0)
+
+	return filtered_accounts, accounts_by_name, parent_children_map
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index dd47ca0..f8eec9e 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -1,18 +1,19 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
+
 
 import re
 from past.builtins import cmp
 import functools
 
-import frappe
+import frappe, erpnext
 from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
 from erpnext.accounts.utils import get_fiscal_year
 from frappe import _
 from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate)
 
+from six import itervalues
 
 def get_period_list(from_fiscal_year, to_fiscal_year, periodicity, accumulated_values=False,
 	company=None, reset_period_on_fy_change=True):
@@ -166,7 +167,7 @@
 
 def calculate_values(
 		accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy):
-	for entries in gl_entries_by_account.values():
+	for entries in itervalues(gl_entries_by_account):
 		for entry in entries:
 			d = accounts_by_name.get(entry.account)
 			if not d:
@@ -376,6 +377,15 @@
 		if filters.get("cost_center"):
 			additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
 
+		company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+
+		if not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book):
+			additional_conditions.append("ifnull(finance_book, '') in ('%s', '')" %
+				frappe.db.escape(company_finance_book))
+		elif filters.get("finance_book"):
+			additional_conditions.append("ifnull(finance_book, '') = '%s' " %
+				frappe.db.escape(filters.get("finance_book")))
+
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 
 
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 9a2205a..40469ae 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -2,7 +2,7 @@
 <h4 class="text-center">
 	{% if (filters.party_name) { %}
 		{%= filters.party_name %}
-	{% } else if (filters.party) { %}
+	{% } else if (filters.party && filters.show_name) { %}
 		{%= filters.party %}
 	{% } else if (filters.account) { %}
 		{%= filters.account %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 68625db..e3d6151 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -12,6 +12,12 @@
 			"reqd": 1
 		},
 		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
@@ -46,6 +52,9 @@
 			"fieldname":"voucher_no",
 			"label": __("Voucher No"),
 			"fieldtype": "Data",
+			on_change: function() {
+				frappe.query_report_filters_by_name.group_by.set_value("");
+			}
 		},
 		{
 			"fieldname":"project",
@@ -69,31 +78,58 @@
 		{
 			"fieldname":"party",
 			"label": __("Party"),
-			"fieldtype": "Dynamic Link",
-			"get_options": function() {
+			"fieldtype": "MultiSelect",
+			get_data: function() {
+				if(!frappe.query_report_filters_by_name) return;
+
 				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
-				var party = frappe.query_report_filters_by_name.party.get_value();
-				if(party && !party_type) {
-					frappe.throw(__("Please select Party Type first"));
-				}
-				return party_type;
+				var parties = frappe.query_report_filters_by_name.party.get_value();
+				if(!party_type) return;
+
+				const values = parties.split(/\s*,\s*/).filter(d => d);
+				const txt = parties.match(/[^,\s*]*$/)[0] || '';
+				let data = [];
+
+				frappe.call({
+					type: "GET",
+					method:'frappe.desk.search.search_link',
+					async: false,
+					no_spinner: true,
+					args: {
+						doctype: frappe.query_report_filters_by_name.party_type.get_value(),
+						txt: txt,
+						filters: {
+							"name": ["not in", values]
+						}
+					},
+					callback: function(r) {
+						data = r.results;
+					}
+				});
+				return data;
 			},
 			on_change: function() {
 				var party_type = frappe.query_report_filters_by_name.party_type.get_value();
-				var party = frappe.query_report_filters_by_name.party.get_value();
-				if(!party_type || !party) {
-					frappe.query_report_filters_by_name.party_name.set_value("");
-					return;
-				}
-				var fieldname = erpnext.utils.get_party_name(party_type) || "name";
-				frappe.db.get_value(party_type, party, fieldname, function(value) {
-					frappe.query_report_filters_by_name.party_name.set_value(value[fieldname]);
-				});
+				var parties = frappe.query_report_filters_by_name.party.get_value();
+				const values = parties.split(/\s*,\s*/).filter(d => d);
 
-				if (party_type === "Customer" || party_type === "Supplier") {
-					frappe.db.get_value(party_type, party, "tax_id", function(value) {
-						frappe.query_report_filters_by_name.tax_id.set_value(value["tax_id"]);
+				if(!party_type || !parties || values.length>1) {
+					frappe.query_report_filters_by_name.party_name.set_value("");
+					frappe.query_report_filters_by_name.tax_id.set_value("");
+					return;
+				} else {
+					var party = values[0];
+					frappe.query_report_filters_by_name.show_name = true;
+					var fieldname = erpnext.utils.get_party_name(party_type) || "name";
+					frappe.db.get_value(party_type, party, fieldname, function(value) {
+						frappe.query_report_filters_by_name.party_name.set_value(value[fieldname]);
 					});
+
+					if (party_type === "Customer" || party_type === "Supplier") {
+						frappe.db.get_value(party_type, party, "tax_id", function(value) {
+							frappe.query_report_filters_by_name.tax_id.set_value(value["tax_id"]);
+						});
+					}
 				}
 			}
 		},
@@ -104,23 +140,19 @@
 			"hidden": 1
 		},
 		{
+			"fieldname":"group_by",
+			"label": __("Group by"),
+			"fieldtype": "Select",
+			"options": ["", "Group by Voucher", "Group by Account", "Group by Party"],
+			"default": "Group by Voucher"
+		},
+		{
 			"fieldname":"tax_id",
 			"label": __("Tax Id"),
 			"fieldtype": "Data",
 			"hidden": 1
 		},
 		{
-			"fieldname":"group_by_voucher",
-			"label": __("Group by Voucher"),
-			"fieldtype": "Check",
-			"default": 1
-		},
-		{
-			"fieldname":"group_by_account",
-			"label": __("Group by Account"),
-			"fieldtype": "Check",
-		},
-		{
 			"fieldname": "presentation_currency",
 			"label": __("Currency"),
 			"fieldtype": "Select",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 4789f9f..804e3fe 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -2,15 +2,19 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from erpnext import get_company_currency, get_default_company
 from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
 from frappe.utils import getdate, cstr, flt, fmt_money
 from frappe import _, _dict
 from erpnext.accounts.utils import get_account_currency
 
+from six import iteritems
 
 def execute(filters=None):
+	if not filters:
+		return [], []
+
 	account_details = {}
 
 	if filters and filters.get('print_in_account_currency') and \
@@ -20,6 +24,10 @@
 	for acc in frappe.db.sql("""select name, is_group from tabAccount""", as_dict=1):
 		account_details.setdefault(acc.name, acc)
 
+	if filters.get('party'):
+		parties = str(filters.get("party")).strip()
+		filters.party = [d.strip() for d in parties.split(',') if d]
+
 	validate_filters(filters, account_details)
 
 	validate_party(filters)
@@ -40,11 +48,11 @@
 	if filters.get("account") and not account_details.get(filters.account):
 		frappe.throw(_("Account {0} does not exists").format(filters.account))
 
-	if filters.get("account") and filters.get("group_by_account") \
-		and account_details[filters.account].is_group == 0:
+	if (filters.get("account") and filters.get("group_by") == 'Group by Account'
+		and account_details[filters.account].is_group == 0):
 		frappe.throw(_("Can not filter based on Account, if grouped by Account"))
 
-	if filters.get("voucher_no") and filters.get("group_by_voucher"):
+	if (filters.get("voucher_no") and filters.get("group_by") == 'Group by Voucher'):
 		frappe.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
 
 	if filters.from_date > filters.to_date:
@@ -57,14 +65,13 @@
 	if party:
 		if not party_type:
 			frappe.throw(_("To filter based on Party, select Party Type first"))
-		elif not frappe.db.exists(party_type, party):
-			frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
-
+		else:
+			for d in party:
+				if not frappe.db.exists(party_type, d):
+					frappe.throw(_("Invalid {0}: {1}").format(party_type, d))
 
 def set_account_currency(filters):
-	if not (filters.get("account") or filters.get("party")):
-		return filters
-	else:
+	if filters.get("account") or (filters.get('party') and len(filters.party) == 1):
 		filters["company_currency"] = frappe.db.get_value("Company", filters.company, "default_currency")
 		account_currency = None
 
@@ -73,7 +80,7 @@
 		elif filters.get("party"):
 			gle_currency = frappe.db.get_value(
 				"GL Entry", {
-					"party_type": filters.party_type, "party": filters.party, "company": filters.company
+					"party_type": filters.party_type, "party": filters.party[0], "company": filters.company
 				},
 				"account_currency"
 			)
@@ -81,15 +88,15 @@
 			if gle_currency:
 				account_currency = gle_currency
 			else:
-				account_currency = None if filters.party_type in ["Employee", "Student", "Shareholder"] else \
-					frappe.db.get_value(filters.party_type, filters.party, "default_currency")
+				account_currency = (None if filters.party_type in ["Employee", "Student", "Shareholder", "Member"] else
+					frappe.db.get_value(filters.party_type, filters.party, "default_currency"))
 
 		filters["account_currency"] = account_currency or filters.company_currency
 
 		if filters.account_currency != filters.company_currency:
 			filters["show_in_account_currency"] = 1
 
-		return filters
+	return filters
 
 def get_result(filters, account_details):
 	gl_entries = get_gl_entries(filters)
@@ -106,9 +113,9 @@
 	select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
 		sum(credit_in_account_currency) as credit_in_account_currency""" \
 
-
-	group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
-		if filters.get("group_by_voucher") else "group by name"
+	group_by_condition = "group by name"
+	if filters.get("group_by") == "Group by Voucher":
+		group_by_condition = "group by voucher_type, voucher_no, account, cost_center"
 
 	gl_entries = frappe.db.sql(
 		"""
@@ -144,19 +151,30 @@
 	if filters.get("voucher_no"):
 		conditions.append("voucher_no=%(voucher_no)s")
 
+	if filters.get("group_by") == "Group by Party" and not filters.get("party_type"):
+		conditions.append("party_type in ('Customer', 'Supplier')")
+
 	if filters.get("party_type"):
 		conditions.append("party_type=%(party_type)s")
 
 	if filters.get("party"):
-		conditions.append("party=%(party)s")
+		conditions.append("party in %(party)s")
 
-	if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
+	if not (filters.get("account") or filters.get("party") or
+		filters.get("group_by") in ["Group by Account", "Group by Party"]):
 		conditions.append("posting_date >=%(from_date)s")
 		conditions.append("posting_date <=%(to_date)s")
 
 	if filters.get("project"):
 		conditions.append("project=%(project)s")
 
+	company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+	if not filters.get("finance_book") or (filters.get("finance_book") == company_finance_book):
+		filters['finance_book'] = company_finance_book
+		conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
+	elif filters.get("finance_book"):
+		conditions.append("ifnull(finance_book, '') = %(finance_book)s")
+
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")
 
@@ -168,15 +186,17 @@
 
 def get_data_with_opening_closing(filters, account_details, gl_entries):
 	data = []
-	gle_map = initialize_gle_map(gl_entries)
+
+	gle_map = initialize_gle_map(gl_entries, filters)
 
 	totals, entries = get_accountwise_gle(filters, gl_entries, gle_map)
 
 	# Opening for filtered account
 	data.append(totals.opening)
 
-	if filters.get("group_by_account"):
-		for acc, acc_dict in gle_map.items():
+	if filters.get("group_by") in ["Group by Account", "Group by Party"]:
+		for acc, acc_dict in iteritems(gle_map):
+			# acc
 			if acc_dict.entries:
 				# opening
 				data.append({})
@@ -219,16 +239,19 @@
 	)
 
 
-def initialize_gle_map(gl_entries):
+def initialize_gle_map(gl_entries, filters):
 	gle_map = frappe._dict()
+	group_by = 'party' if filters.get('group_by') == 'Group by Party' else "account"
+
 	for gle in gl_entries:
-		gle_map.setdefault(gle.account, _dict(totals=get_totals_dict(), entries=[]))
+		gle_map.setdefault(gle.get(group_by), _dict(totals=get_totals_dict(), entries=[]))
 	return gle_map
 
 
 def get_accountwise_gle(filters, gl_entries, gle_map):
 	totals = get_totals_dict()
 	entries = []
+	group_by = 'party' if filters.get('group_by') == 'Group by Party' else "account"
 
 	def update_value_in_dict(data, key, gle):
 		data[key].debit += flt(gle.debit)
@@ -240,21 +263,21 @@
 	from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
 	for gle in gl_entries:
 		if gle.posting_date < from_date or cstr(gle.is_opening) == "Yes":
-			update_value_in_dict(gle_map[gle.account].totals, 'opening', gle)
+			update_value_in_dict(gle_map[gle.get(group_by)].totals, 'opening', gle)
 			update_value_in_dict(totals, 'opening', gle)
 
-			update_value_in_dict(gle_map[gle.account].totals, 'closing', gle)
+			update_value_in_dict(gle_map[gle.get(group_by)].totals, 'closing', gle)
 			update_value_in_dict(totals, 'closing', gle)
 
 		elif gle.posting_date <= to_date:
-			update_value_in_dict(gle_map[gle.account].totals, 'total', gle)
+			update_value_in_dict(gle_map[gle.get(group_by)].totals, 'total', gle)
 			update_value_in_dict(totals, 'total', gle)
-			if filters.get("group_by_account"):
-				gle_map[gle.account].entries.append(gle)
+			if filters.get("group_by") in ["Group by Account", "Group by Party"]:
+				gle_map[gle.get(group_by)].entries.append(gle)
 			else:
 				entries.append(gle)
 
-			update_value_in_dict(gle_map[gle.account].totals, 'closing', gle)
+			update_value_in_dict(gle_map[gle.get(group_by)].totals, 'closing', gle)
 			update_value_in_dict(totals, 'closing', gle)
 
 	return totals, entries
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 772d4f8..60252ea 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -149,7 +149,7 @@
 
 	def get_average_rate_based_on_group_by(self):
 		# sum buying / selling totals for group
-		for key in self.grouped.keys():
+		for key in list(self.grouped):
 			if self.filters.get("group_by") != "Invoice":
 				for i, row in enumerate(self.grouped[key]):
 					if i==0:
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 710099e..72661ff 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -49,7 +49,7 @@
 
 		row += [
 			d.credit_to, d.mode_of_payment, d.project, d.company, d.purchase_order,
-			purchase_receipt, expense_account, d.stock_qty, d.stock_uom, d.base_net_rate, d.base_net_amount
+			purchase_receipt, expense_account, d.stock_qty, d.stock_uom, d.base_net_amount / d.stock_qty, d.base_net_amount
 		]
 
 		total_tax = 0
@@ -120,8 +120,7 @@
 			`tabPurchase Invoice Item`.`project`, `tabPurchase Invoice Item`.`purchase_order`,
 			`tabPurchase Invoice Item`.`purchase_receipt`, `tabPurchase Invoice Item`.`po_detail`,
 			`tabPurchase Invoice Item`.`expense_account`, `tabPurchase Invoice Item`.`stock_qty`,
-			`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_rate`,
-			`tabPurchase Invoice Item`.`base_net_amount`,
+			`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_amount`,
 			`tabPurchase Invoice`.supplier_name, `tabPurchase Invoice`.mode_of_payment {0}
 		from `tabPurchase Invoice`, `tabPurchase Invoice Item`
 		where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index c8d9857..8687dce 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -33,7 +33,7 @@
 
 	return columns, data, None, chart
 
-def get_net_profit_loss(income, expense, period_list, company, currency=None):
+def get_net_profit_loss(income, expense, period_list, company, currency=None, consolidated=False):
 	total = 0
 	net_profit_loss = {
 		"account_name": "'" + _("Profit for the year") + "'",
@@ -45,21 +45,21 @@
 	has_value = False
 
 	for period in period_list:
-		total_income = flt(income[-2][period.key], 3) if income else 0
-		total_expense = flt(expense[-2][period.key], 3) if expense else 0
+		key = period if consolidated else period.key
+		total_income = flt(income[-2][key], 3) if income else 0
+		total_expense = flt(expense[-2][key], 3) if expense else 0
 
-		net_profit_loss[period.key] = total_income - total_expense
+		net_profit_loss[key] = total_income - total_expense
 
-		if net_profit_loss[period.key]:
+		if net_profit_loss[key]:
 			has_value=True
 
-		total += flt(net_profit_loss[period.key])
+		total += flt(net_profit_loss[key])
 		net_profit_loss["total"] = total
 
 	if has_value:
 		return net_profit_loss
 
-
 def get_chart_data(filters, columns, income, expense, net_profit_loss):
 	labels = [d.get("label") for d in columns[2:]]
 
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index cf599a0..7a298b3 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -42,7 +42,7 @@
 				row.append(inv.get(col))
 
 		row += [
-			supplier_details.get(inv.supplier), # supplier_type
+			supplier_details.get(inv.supplier), # supplier_group
 			inv.tax_id, inv.credit_to, inv.mode_of_payment, ", ".join(project),
 			inv.bill_no, inv.bill_date, inv.remarks,
 			", ".join(purchase_order), ", ".join(purchase_receipt), company_currency
@@ -83,7 +83,7 @@
 		columns += additional_table_columns
 
 	columns += [
-		_("Supplier Type") + ":Link/Supplier Type:120", _("Tax Id") + "::80", _("Payable Account") + ":Link/Account:120",
+		_("Supplier Group") + ":Link/Supplier Group:120", _("Tax Id") + "::80", _("Payable Account") + ":Link/Account:120",
 		_("Mode of Payment") + ":Link/Mode of Payment:80", _("Project") + ":Link/Project:80",
 		_("Bill No") + "::120", _("Bill Date") + ":Date:80", _("Remarks") + "::150",
 		_("Purchase Order") + ":Link/Purchase Order:100",
@@ -229,8 +229,8 @@
 
 def get_supplier_details(suppliers):
 	supplier_details = {}
-	for supp in frappe.db.sql("""select name, supplier_type from `tabSupplier`
+	for supp in frappe.db.sql("""select name, supplier_group from `tabSupplier`
 		where name in (%s)""" % ", ".join(["%s"]*len(suppliers)), tuple(suppliers), as_dict=1):
-			supplier_details.setdefault(supp.name, supp.supplier_type)
+			supplier_details.setdefault(supp.name, supp.supplier_group)
 
 	return supplier_details
diff --git a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
index 4fcc05b..0c11d52 100644
--- a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
+++ b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
@@ -5,22 +5,59 @@
 from frappe import _
 from frappe.utils import cstr
 
+
 def execute(filters=None):
 	columns, data = [], []
-	columns=get_columns()
-	data=get_sales_payment_data(filters, columns)
+	columns = get_columns(filters)
+	data = get_pos_sales_payment_data(filters) if filters.get('is_pos') else get_sales_payment_data(filters, columns)
 	return columns, data
 
-def get_columns():
+
+def get_pos_columns():
 	return [
 		_("Date") + ":Date:80",
 		_("Owner") + ":Data:200",
 		_("Payment Mode") + ":Data:240",
 		_("Sales and Returns") + ":Currency/currency:120",
 		_("Taxes") + ":Currency/currency:120",
-		_("Payments") + ":Currency/currency:120"
+		_("Payments") + ":Currency/currency:120",
+		_("Warehouse") + ":Data:200",
+		_("Cost Center") + ":Data:200"
 	]
 
+
+def get_columns(filters):
+	if filters.get('is_pos'):
+		return get_pos_columns()
+	else:
+		return [
+			_("Date") + ":Date:80",
+			_("Owner") + ":Data:200",
+			_("Payment Mode") + ":Data:240",
+			_("Sales and Returns") + ":Currency/currency:120",
+			_("Taxes") + ":Currency/currency:120",
+			_("Payments") + ":Currency/currency:120",
+			_("Warehouse") + ":Data:200"
+		]
+
+
+def get_pos_sales_payment_data(filters):
+	sales_invoice_data = get_pos_invoice_data(filters)
+	data = [
+		[
+			row['posting_date'],
+			row['owner'],
+			row['mode_of_payment'],
+			row['net_total'],
+			row['total_taxes'],
+			row['paid_amount'],
+			row['warehouse'],
+			row['cost_center']
+		] for row in sales_invoice_data]
+
+	return data
+
+
 def get_sales_payment_data(filters, columns):
 	data = []
 	show_payment_detail = False
@@ -51,16 +88,57 @@
 			data.append(row)
 	return data
 
+
 def get_conditions(filters):
 	conditions = "1=1"
-	if filters.get("from_date"): conditions += " and a.posting_date >= %(from_date)s"
-	if filters.get("to_date"): conditions += " and a.posting_date <= %(to_date)s"
-	if filters.get("company"): conditions += " and a.company=%(company)s"
-	if filters.get("customer"): conditions += " and a.customer = %(customer)s"
-	if filters.get("owner"): conditions += " and a.owner = %(owner)s"
-	if filters.get("is_pos"): conditions += " and a.is_pos = %(is_pos)s"
+	if filters.get("from_date"):
+		conditions += " and a.posting_date >= %(from_date)s"
+	if filters.get("to_date"):
+		conditions += " and a.posting_date <= %(to_date)s"
+	if filters.get("company"):
+		conditions += " and a.company=%(company)s"
+	if filters.get("customer"):
+		conditions += " and a.customer = %(customer)s"
+	if filters.get("owner"):
+		conditions += " and a.owner = %(owner)s"
+	if filters.get("is_pos"):
+		conditions += " and a.is_pos = %(is_pos)s"
 	return conditions
 
+
+def get_pos_invoice_data(filters):
+	conditions = get_conditions(filters)
+	result = frappe.db.sql(''
+						   'SELECT '
+						   'posting_date, owner, sum(net_total) as "net_total", sum(total_taxes) as "total_taxes", '
+						   'sum(paid_amount) as "paid_amount", sum(outstanding_amount) as "outstanding_amount", '
+						   'mode_of_payment, warehouse, cost_center '
+						   'FROM ('
+						   'SELECT '
+						   'parent, item_code, sum(amount) as "base_total", warehouse, cost_center '
+						   'from `tabSales Invoice Item`  group by parent'
+						   ') t1 '
+						   'left join '
+						   '(select parent, mode_of_payment from `tabSales Invoice Payment` group by parent) t3 '
+						   'on (t3.parent = t1.parent) '
+						   'JOIN ('
+						   'SELECT '
+						   'docstatus, company, is_pos, name, posting_date, owner, sum(base_total) as "base_total", '
+						   'sum(net_total) as "net_total", sum(total_taxes_and_charges) as "total_taxes", '
+						   'sum(base_paid_amount) as "paid_amount", sum(outstanding_amount) as "outstanding_amount" '
+						   'FROM `tabSales Invoice` '
+						   'GROUP BY name'
+						   ') a '
+						   'ON ('
+						   't1.parent = a.name and t1.base_total = a.base_total) '
+						   'WHERE a.docstatus = 1'
+						   ' AND {conditions} '
+						   'GROUP BY '
+						   'owner, posting_date, warehouse'.format(conditions=conditions), filters, as_dict=1
+						   )
+	return result
+
+
 def get_sales_invoice_data(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""
@@ -77,6 +155,7 @@
 			a.owner, a.posting_date
 	""".format(conditions=conditions), filters, as_dict=1)
 
+
 def get_mode_of_payments(filters):
 	mode_of_payments = {}
 	invoice_list = get_invoices(filters)
@@ -105,6 +184,7 @@
 			mode_of_payments.setdefault(d["owner"]+cstr(d["posting_date"]), []).append(d.mode_of_payment)
 	return mode_of_payments
 
+
 def get_invoices(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select a.name
@@ -112,6 +192,7 @@
 		where a.docstatus = 1 and {conditions}""".format(conditions=conditions),
 		filters, as_dict=1)
 
+
 def get_mode_of_payment_details(filters):
 	mode_of_payment_details = {}
 	invoice_list = get_invoices(filters)
@@ -160,4 +241,4 @@
 		for d in inv_mop_detail:
 			mode_of_payment_details.setdefault(d["owner"]+cstr(d["posting_date"]), []).append((d.mode_of_payment,d.paid_amount))
 
-	return mode_of_payment_details
\ No newline at end of file
+	return mode_of_payment_details
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index 7ccec30..29f798e 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -46,9 +46,10 @@
 		{
 			"fieldname":"party_type",
 			"label": __("Party Type"),
-			"fieldtype": "Select",
-			"options": ["Customer", "Supplier"],
-			"default": "Customer"
+			"fieldtype": "Link",
+			"options": "Party Type",
+			"default": "Customer",
+			"reqd": 1
 		},
 		{
 			"fieldname":"party",
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index 6480623..8be63a0 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -7,26 +7,28 @@
 from frappe.utils import flt, cint
 from erpnext.accounts.report.trial_balance.trial_balance import validate_filters
 
-
 def execute(filters=None):
 	validate_filters(filters)
-	
+
 	show_party_name = is_party_name_visible(filters)
-	
+
 	columns = get_columns(filters, show_party_name)
 	data = get_data(filters, show_party_name)
 
 	return columns, data
-	
+
 def get_data(filters, show_party_name):
-	party_name_field = "customer_name" if filters.get("party_type")=="Customer" else "supplier_name"
+	party_name_field = "{0}_name".format(frappe.scrub(filters.get('party_type')))
+	if filters.get('party_type') == 'Student':
+		party_name_field = 'first_name'
+
 	party_filters = {"name": filters.get("party")} if filters.get("party") else {}
 	parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], 
 		filters = party_filters, order_by="name")
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
 	opening_balances = get_opening_balances(filters)
 	balances_within_period = get_balances_within_period(filters)
-	
+
 	data = []
 	# total_debit, total_credit = 0, 0
 	total_row = frappe._dict({
@@ -41,28 +43,28 @@
 		row = { "party": party.name }
 		if show_party_name:
 			row["party_name"] = party.get(party_name_field)
-		
+
 		# opening
 		opening_debit, opening_credit = opening_balances.get(party.name, [0, 0])
 		row.update({
 			"opening_debit": opening_debit,
 			"opening_credit": opening_credit
 		})
-		
+
 		# within period
 		debit, credit = balances_within_period.get(party.name, [0, 0])
 		row.update({
 			"debit": debit,
 			"credit": credit
 		})
-				
+
 		# closing
 		closing_debit, closing_credit = toggle_debit_credit(opening_debit + debit, opening_credit + credit)
 		row.update({
 			"closing_debit": closing_debit,
 			"closing_credit": closing_credit
 		})
-		
+
 		# totals
 		for col in total_row:
 			total_row[col] += row.get(col)
@@ -70,24 +72,24 @@
 		row.update({
 			"currency": company_currency
 		})
-		
+
 		has_value = False
 		if (opening_debit or opening_credit or debit or credit or closing_debit or closing_credit):
 			has_value  =True
 		
 		if cint(filters.show_zero_values) or has_value:
 			data.append(row)
-		
+
 	# Add total row
-	
+
 	total_row.update({
 		"party": "'" + _("Totals") + "'",
 		"currency": company_currency
 	})
 	data.append(total_row)
-	
+
 	return data
-	
+
 def get_opening_balances(filters):
 	gle = frappe.db.sql("""
 		select party, sum(debit) as opening_debit, sum(credit) as opening_credit 
@@ -100,14 +102,14 @@
 			"from_date": filters.from_date,
 			"party_type": filters.party_type
 		}, as_dict=True)
-		
+
 	opening = frappe._dict()
 	for d in gle:
 		opening_debit, opening_credit = toggle_debit_credit(d.opening_debit, d.opening_credit)
 		opening.setdefault(d.party, [opening_debit, opening_credit])
-		
+
 	return opening
-	
+
 def get_balances_within_period(filters):
 	gle = frappe.db.sql("""
 		select party, sum(debit) as debit, sum(credit) as credit 
@@ -122,13 +124,13 @@
 			"to_date": filters.to_date,
 			"party_type": filters.party_type
 		}, as_dict=True)
-		
+
 	balances_within_period = frappe._dict()
 	for d in gle:
 		balances_within_period.setdefault(d.party, [d.debit, d.credit])
-		
+
 	return balances_within_period
-	
+
 def toggle_debit_credit(debit, credit):
 	if flt(debit) > flt(credit):
 		debit = flt(debit) - flt(credit)
@@ -136,9 +138,9 @@
 	else:
 		credit = flt(credit) - flt(debit)
 		debit = 0.0
-		
+
 	return debit, credit
-	
+
 def get_columns(filters, show_party_name):
 	columns = [
 		{
@@ -198,7 +200,7 @@
 			"hidden": 1
 		}
 	]
-	
+
 	if show_party_name:
 		columns.insert(1, {
 			"fieldname": "party_name",
@@ -206,17 +208,21 @@
 			"fieldtype": "Data",
 			"width": 200
 		})
-		
+
 	return columns
-		
+
 def is_party_name_visible(filters):
 	show_party_name = False
-	if filters.get("party_type") == "Customer":
-		party_naming_by = frappe.db.get_single_value("Selling Settings", "cust_master_name")
+
+	if filters.get('party_type') in ['Customer', 'Supplier']:
+		if filters.get("party_type") == "Customer":
+			party_naming_by = frappe.db.get_single_value("Selling Settings", "cust_master_name")
+		else:
+			party_naming_by = frappe.db.get_single_value("Buying Settings", "supp_master_name")
+
+		if party_naming_by == "Naming Series":
+			show_party_name = True
 	else:
-		party_naming_by = frappe.db.get_single_value("Buying Settings", "supp_master_name")
-		
-	if party_naming_by == "Naming Series":
 		show_party_name = True
-		
+
 	return show_party_name
\ No newline at end of file
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index ab194f4..adb8dca 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -1,14 +1,14 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
 
-import frappe
+
+import frappe, erpnext
 import frappe.defaults
 from frappe.utils import nowdate, cstr, flt, cint, now, getdate
 from frappe import throw, _
 from frappe.utils import formatdate, get_number_format_info
-
+from six import iteritems
 # imported to enable erpnext.accounts.utils.get_account_currency
 from erpnext.accounts.doctype.account.account import get_account_currency
 
@@ -322,7 +322,9 @@
 			and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
 			and t1.docstatus=1 """.format(dr_or_cr = args.get("dr_or_cr")), args)
 	else:
-		party_account_field = "paid_from" if args.party_type == "Customer" else "paid_to"
+		party_account_field = ("paid_from"
+			if erpnext.get_party_account_type(args.party_type) == 'Receivable' else "paid_to")
+
 		if args.voucher_detail_no:
 			ret = frappe.db.sql("""select t1.name
 				from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
@@ -421,7 +423,7 @@
 		if d.allocated_amount < original_row.allocated_amount:
 			new_row = payment_entry.append("references")
 			new_row.docstatus = 1
-			for field in reference_details.keys():
+			for field in list(reference_details):
 				new_row.set(field, original_row[field])
 
 			new_row.allocated_amount = original_row.allocated_amount - d.allocated_amount
@@ -495,7 +497,7 @@
 
 	if not value:
 		throw(_("Please set default {0} in Company {1}")
-		      .format(frappe.get_meta("Company").get_label(fieldname), company))
+			.format(frappe.get_meta("Company").get_label(fieldname), company))
 
 	return value
 
@@ -524,7 +526,7 @@
 	difference = {}
 	warehouse_account = get_warehouse_account_map()
 
-	for warehouse, account_data in warehouse_account.items():
+	for warehouse, account_data in iteritems(warehouse_account):
 		if account_data.get('account') in account_list:
 			account_balance = get_balance_on(account_data.get('account'), posting_date, in_account_currency=False)
 			stock_value = get_stock_value_on(warehouse, posting_date)
@@ -548,16 +550,16 @@
 	pr_valuation_amount = frappe.db.sql("""
 		select sum(pr_item.valuation_rate * pr_item.qty * pr_item.conversion_factor)
 		from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
-	    where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
+		where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
 		and pr.posting_date <= %s and pr_item.item_code in (%s)""" %
-	    ('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
+		('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
 
 	pi_valuation_amount = frappe.db.sql("""
 		select sum(pi_item.valuation_rate * pi_item.qty * pi_item.conversion_factor)
 		from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi
-	    where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
+		where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
 		and pi.posting_date <= %s and pi_item.item_code in (%s)""" %
-	    ('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
+		('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
 
 	# Balance should be
 	stock_rbnb = flt(pr_valuation_amount, 2) - flt(pi_valuation_amount, 2)
@@ -570,18 +572,36 @@
 	return flt(stock_rbnb) + flt(sys_bal)
 
 
+def get_held_invoices(party_type, party):
+	"""
+	Returns a list of names Purchase Invoices for the given party that are on hold
+	"""
+	held_invoices = None
+
+	if party_type == 'Supplier':
+		held_invoices = frappe.db.sql(
+			'select name from `tabPurchase Invoice` where release_date IS NOT NULL and release_date > CURDATE()',
+			as_dict=1
+		)
+		held_invoices = [d['name'] for d in held_invoices]
+
+	return held_invoices
+
+
 def get_outstanding_invoices(party_type, party, account, condition=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
 
-	if party_type in ("Customer", "Student"):
+	if erpnext.get_party_account_type(party_type) == 'Receivable':
 		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
 		payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
 	else:
 		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
 		payment_dr_or_cr = "payment_gl_entry.debit_in_account_currency - payment_gl_entry.credit_in_account_currency"
 
-	invoice = 'Sales Invoice' if party_type == 'Customer' else 'Purchase Invoice'
+	invoice = 'Sales Invoice' if erpnext.get_party_account_type(party_type) == 'Receivable' else 'Purchase Invoice'
+	held_invoices = get_held_invoices(party_type, party)
+
 	invoice_list = frappe.db.sql("""
 		select
 			voucher_no, voucher_type, posting_date, ifnull(sum({dr_or_cr}), 0) as invoice_amount,
@@ -620,20 +640,21 @@
 		}, as_dict=True)
 
 	for d in invoice_list:
-		due_date = frappe.db.get_value(d.voucher_type, d.voucher_no,
-			"posting_date" if party_type == "Employee" else "due_date")
+		if not d.voucher_type == "Purchase Invoice" or d.voucher_no not in held_invoices:
+			due_date = frappe.db.get_value(
+				d.voucher_type, d.voucher_no, "posting_date" if party_type == "Employee" else "due_date")
 
-		outstanding_invoices.append(
-			frappe._dict({
-				'voucher_no': d.voucher_no,
-				'voucher_type': d.voucher_type,
-				'posting_date': d.posting_date,
-				'invoice_amount': flt(d.invoice_amount),
-				'payment_amount': flt(d.payment_amount),
-				'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
-				'due_date': due_date
-			})
-		)
+			outstanding_invoices.append(
+				frappe._dict({
+					'voucher_no': d.voucher_no,
+					'voucher_type': d.voucher_type,
+					'posting_date': d.posting_date,
+					'invoice_amount': flt(d.invoice_amount),
+					'payment_amount': flt(d.payment_amount),
+					'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
+					'due_date': due_date
+				})
+			)
 
 	outstanding_invoices = sorted(outstanding_invoices, key=lambda k: k['due_date'] or getdate(nowdate()))
 
@@ -660,29 +681,24 @@
 def get_children(doctype, parent, company, is_root=False):
 	from erpnext.accounts.report.financial_statements import sort_accounts
 
-	fieldname = frappe.db.escape(doctype.lower().replace(' ','_'))
-	doctype = frappe.db.escape(doctype)
+	parent_fieldname = 'parent_' + doctype.lower().replace(' ', '_')
+	fields = [
+		'name as value',
+		'is_group as expandable'
+	]
+	filters = [['docstatus', '<', 2]]
 
-	# root
+	filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), '=', '' if is_root else parent])
+
 	if is_root:
-		fields = ", root_type, report_type, account_currency" if doctype=="Account" else ""
-		acc = frappe.db.sql(""" select
-			name as value, is_group as expandable {fields}
-			from `tab{doctype}`
-			where ifnull(`parent_{fieldname}`,'') = ''
-			and `company` = %s	and docstatus<2
-			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
-				company, as_dict=1)
+		fields += ['root_type', 'report_type', 'account_currency'] if doctype == 'Account' else []
+		filters.append(['company', '=', company])
+
 	else:
-		# other
-		fields = ", account_currency" if doctype=="Account" else ""
-		acc = frappe.db.sql("""select
-			name as value, is_group as expandable, parent_{fieldname} as parent {fields}
-			from `tab{doctype}`
-			where ifnull(`parent_{fieldname}`,'') = %s
-			and docstatus<2
-			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
-				parent, as_dict=1)
+		fields += ['account_currency'] if doctype == 'Account' else []
+		fields += [parent_fieldname + ' as parent']
+
+	acc = frappe.get_list(doctype, fields=fields, filters=filters)
 
 	if doctype == 'Account':
 		sort_accounts(acc, is_root, key="value")
diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json
index e508888..f14213b 100644
--- a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json
+++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -135,6 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -196,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +231,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -257,6 +264,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -265,6 +273,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "project.expected_end_date",
    "fieldname": "end_date", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -277,7 +286,7 @@
    "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "project.expected_end_date", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -288,6 +297,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -317,6 +327,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -347,6 +358,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -376,6 +388,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -407,6 +420,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -436,6 +450,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -445,6 +460,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "description": "The minimum length between each plant in the field for optimum growth", 
+   "fetch_from": "crop.crop_spacing", 
    "fieldname": "crop_spacing", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -457,7 +473,7 @@
    "label": "Crop Spacing", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "crop.crop_spacing", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -468,6 +484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -499,6 +516,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -528,6 +546,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -537,6 +556,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "description": "The minimum distance between rows of plants for optimum growth", 
+   "fetch_from": "crop.row_spacing", 
    "fieldname": "row_spacing", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -549,7 +569,7 @@
    "label": "Row Spacing", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "crop.row_spacing", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -560,6 +580,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -591,6 +612,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -623,6 +645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -654,6 +677,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -685,6 +709,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -716,6 +741,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -747,6 +773,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -778,6 +805,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -791,7 +819,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-18 12:54:29.071743", 
+ "modified": "2018-05-25 22:43:33.462001",
  "modified_by": "Administrator", 
  "module": "Agriculture", 
  "name": "Crop Cycle", 
@@ -800,7 +828,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -820,7 +847,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py
index 7d2e3fe..136858b 100644
--- a/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py
+++ b/erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.py
@@ -55,7 +55,7 @@
 	all_tasks = frappe.get_all('Task')
 	for task in all_tasks:
 		sample_task = frappe.get_doc('Task', task.name)
-		if sample_task.subject in all_task_dict.keys():
+		if sample_task.subject in list(all_task_dict):
 			if sample_task.exp_start_date != all_task_dict[sample_task.subject]['exp_start_date'] or sample_task.exp_end_date != all_task_dict[sample_task.subject]['exp_end_date']:
 				return False
 			all_task_dict.pop(sample_task.subject)
diff --git a/erpnext/agriculture/doctype/land_unit/land_unit.py b/erpnext/agriculture/doctype/land_unit/land_unit.py
index f577eca..269bbce 100644
--- a/erpnext/agriculture/doctype/land_unit/land_unit.py
+++ b/erpnext/agriculture/doctype/land_unit/land_unit.py
@@ -25,12 +25,12 @@
 	def on_trash(self):
 		ancestors = self.get_ancestors()
 		for ancestor in ancestors:
-			ancestor_doc = frappe.get_doc('Land Unit', ancestor)	
+			ancestor_doc = frappe.get_doc('Land Unit', ancestor)
 			ancestor_child_features, ancestor_non_child_features = ancestor_doc.feature_seperator(child_feature = self.get('land_unit_name'))
 			ancestor_features = ancestor_non_child_features
 			for index,feature in enumerate(ancestor_features):
 				ancestor_features[index] = json.loads(feature)
-			ancestor_doc.set_location_value(features = ancestor_features)	
+			ancestor_doc.set_location_value(features = ancestor_features)
 			ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')-self.get('area'),commit=True)
 		super(LandUnit, self).on_update()
 
@@ -42,7 +42,7 @@
 				features = json.loads(self.get('location')).get('features')
 			new_area = compute_area(features)
 			self.area_difference = new_area - flt(self.area)
-			self.area = new_area	
+			self.area = new_area
 
 			if self.get('parent_land_unit'):
 				ancestors = self.get_ancestors()
@@ -55,8 +55,8 @@
 					ancestor_features = list(set(ancestor_non_child_features))
 					child_features = set(ancestor_child_features)
 
-					if not (self_features.issubset(child_features) and child_features.issubset(self_features)): 
-						features_to_be_appended =	self_features - child_features 
+					if not (self_features.issubset(child_features) and child_features.issubset(self_features)):
+						features_to_be_appended =	self_features - child_features
 						features_to_be_discarded = 	child_features - self_features
 						for feature in features_to_be_discarded:
 							child_features.discard(feature)
@@ -67,7 +67,7 @@
 					ancestor_features.extend(child_features)
 					for index,feature in enumerate(ancestor_features):
 						ancestor_features[index] = json.loads(feature)
-					ancestor_doc.set_location_value(features = ancestor_features)	
+					ancestor_doc.set_location_value(features = ancestor_features)
 					ancestor_doc.db_set(fieldname='area', value=ancestor_doc.get('area')+\
 						self.get('area_difference'),commit=True)
 
@@ -84,18 +84,18 @@
 	def add_child_property(self):
 		location = self.get('location')
 		if location:
-			features = json.loads(location).get('features')	
+			features = json.loads(location).get('features')
 			if type(features) != list:
 				features = json.loads(features)
 			filter_features = [feature for feature in features if feature.get('properties').get('child_feature') != True]
 			for index,feature in enumerate(filter_features):
 				feature['properties'].update({'child_feature': True, 'feature_of': self.land_unit_name})
 				filter_features[index] = json.dumps(filter_features[index])
-			return filter_features 
+			return filter_features
 		return []
 
 	def feature_seperator(self, child_feature=None):
-		doc = self 
+		doc = self
 		child_features = []
 		non_child_features = []
 		location = doc.get('location')
@@ -108,11 +108,11 @@
 					child_features.extend([json.dumps(feature)])
 				else:
 					non_child_features.extend([json.dumps(feature)])
-		
+
 		return child_features, non_child_features
 
 
-def compute_area(features):                                
+def compute_area(features):
 	layer_area = 0
 	for feature in features:
 		if feature.get('geometry').get('type') == 'Polygon':
@@ -128,10 +128,10 @@
 	area = 0
 	if coords and len(coords) > 0:
 		area += math.fabs(ring_area(coords[0]));
-		for i in range(1, len(coords)): 
+		for i in range(1, len(coords)):
 			area -= math.fabs(ring_area(coords[i]));
 	return area;
-	
+
 def ring_area(coords):
 	p1 = 0
 	p2 = 0
@@ -142,7 +142,7 @@
 	i = 0
 	area = 0
 	coords_length = len(coords)
-	if coords_length > 2: 
+	if coords_length > 2:
 		for i in range(0, coords_length):
 			if i == coords_length - 2: # i = N-2
 				lower_index = coords_length - 2;
@@ -169,11 +169,10 @@
 	if is_root:
 		parent = ''
 
-	land_units = frappe.db.sql("""select name as value,
-		is_group as expandable
-		from `tabLand Unit`
-		where ifnull(`parent_land_unit`,'') = %s
-		order by name""", (parent), as_dict=1)
+	land_units = frappe.get_list(doctype,
+		fields = ['name as value', 'is_group as expandable'],
+		filters= [['ifnull(`parent_land_unit`, "")', '=', parent]],
+		order_by='name')
 
 	# return nodes
 	return land_units
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 236c4f9..658107b 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -23,6 +23,14 @@
 				}
 			};
 		});
+
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			};
+		});
 	},
 
 	refresh: function(frm) {
@@ -49,6 +57,19 @@
 					erpnext.asset.restore_asset(frm);
 				});
 			}
+
+			if (frm.doc.purchase_receipt) {
+				frm.add_custom_button("General Ledger", function() {
+					frappe.route_options = {
+						"voucher_no": frm.doc.name,
+						"from_date": frm.doc.available_for_use_date,
+						"to_date": frm.doc.available_for_use_date,
+						"company": frm.doc.company
+					};
+					frappe.set_route("query-report", "General Ledger");
+				});
+			}
+
 			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
 				frm.add_custom_button(__("Purchase Invoice"), function() {
 					frm.trigger("make_purchase_invoice");
@@ -59,6 +80,12 @@
 					frm.trigger("create_asset_maintenance");
 				}, __("Make"));
 			}
+			if (frm.doc.status != 'Fully Depreciated') {
+				frm.add_custom_button(__("Asset Adjustment"), function() {
+					frm.trigger("create_asset_adjustment");
+				}, __("Make"));
+			}
+
 			frm.page.set_inner_btn_group_as_primary(__("Make"));
 			frm.trigger("setup_chart");
 		}
@@ -123,17 +150,22 @@
 				},
 				callback: function(r, rt) {
 					if(r.message) {
-						$.each(r.message, function(field, value) {
-							frm.set_value(field, value);
-						})
+						frm.set_value('finance_books', r.message);
 					}
 				}
 			})
 		}
 	},
 
+	available_for_use_date: function(frm) {
+		$.each(frm.doc.finance_books || [], function(i, d) {
+			if(!d.depreciation_start_date) d.depreciation_start_date = frm.doc.available_for_use_date;
+		});
+		refresh_field("finance_books");
+	},
+
 	is_existing_asset: function(frm) {
-		frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
+		// frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
 	},
 
 	opening_accumulated_depreciation: function(frm) {
@@ -173,7 +205,8 @@
 			args: {
 				"asset": frm.doc.name,
 				"item_code": frm.doc.item_code,
-				"company": frm.doc.company
+				"company": frm.doc.company,
+				"serial_no": frm.doc.serial_no
 			},
 			method: "erpnext.assets.doctype.asset.asset.make_sales_invoice",
 			callback: function(r) {
@@ -200,6 +233,22 @@
 		})
 	},
 
+	create_asset_adjustment: function(frm) {
+		frappe.call({
+			args: {
+				"asset": frm.doc.name,
+				"asset_category": frm.doc.asset_category,
+				"company": frm.doc.company
+			},
+			method: "erpnext.assets.doctype.asset.asset.create_asset_adjustment",
+			freeze: 1,
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+			}
+		})
+	},
+
 	calculate_depreciation: function(frm) {
 		frappe.db.get_value("Asset Settings", {'name':"Asset Settings"}, 'schedule_based_on_fiscal_year', (data) => {
 			if (data.schedule_based_on_fiscal_year == 1) {
@@ -282,21 +331,56 @@
 		title: __("Transfer Asset"),
 		fields: [
 			{
-				"label": __("Target Warehouse"),
-				"fieldname": "target_warehouse",
+				"label": __("Target Location"),
+				"fieldname": "target_location",
 				"fieldtype": "Link",
-				"options": "Warehouse",
+				"options": "Location",
 				"get_query": function () {
 					return {
 						filters: [
-							["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
-							["Warehouse", "is_group", "=", 0]
+							["Location", "is_group", "=", 0]
 						]
 					}
 				},
 				"reqd": 1
 			},
 			{
+				"label": __("Select Serial No"),
+				"fieldname": "serial_nos",
+				"fieldtype": "Link",
+				"options": "Serial No",
+				"get_query": function () {
+					return {
+						filters: {
+							'asset': frm.doc.name
+						}
+					}
+				},
+				"onchange": function() {
+					let val = this.get_value();
+					if (val) {
+						let serial_nos = dialog.get_value("serial_no") || val;
+						if (serial_nos) {
+							serial_nos = serial_nos.split('\n');
+							serial_nos.push(val);
+
+							const unique_sn = serial_nos.filter(function(elem, index, self) {
+							    return index === self.indexOf(elem);
+							});
+
+							dialog.set_value("serial_no", unique_sn.join('\n'));
+							dialog.set_value("serial_nos", "");
+						}
+					}
+				}
+			},
+			{
+				"label": __("Serial No"),
+				"fieldname": "serial_no",
+				"read_only": 1,
+				"fieldtype": "Small Text"
+			},
+			{
 				"label": __("Date"),
 				"fieldname": "transfer_date",
 				"fieldtype": "Datetime",
@@ -317,8 +401,9 @@
 				args: {
 					"asset": frm.doc.name,
 					"transaction_date": args.transfer_date,
-					"source_warehouse": frm.doc.warehouse,
-					"target_warehouse": args.target_warehouse,
+					"source_location": frm.doc.location,
+					"target_location": args.target_location,
+					"serial_no": args.serial_no,
 					"company": frm.doc.company
 				}
 			},
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 49b574d..fb494be 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
- "autoname": "field:asset_name", 
+ "autoname": "naming_series:", 
  "beta": 0, 
  "creation": "2016-03-01 17:01:27.920130", 
  "custom": 0, 
@@ -18,6 +18,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "AST", 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "AST\nAT", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -25,7 +58,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Asset Name", 
    "length": 0, 
@@ -40,6 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,6 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -79,6 +114,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -91,7 +127,7 @@
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "item_code.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -102,6 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -117,7 +154,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 1, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Asset Category", 
    "length": 0, 
@@ -133,38 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped\nIn Maintenance\nOut of Order", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -196,6 +202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -228,6 +235,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -260,6 +268,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -292,6 +301,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -322,6 +332,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -351,6 +362,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -382,6 +394,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -390,19 +403,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "warehouse", 
+   "fieldname": "location", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Warehouse", 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Warehouse", 
+   "options": "Location", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -413,6 +426,39 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "custodian", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Custodian", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -444,6 +490,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -474,97 +521,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purchase_invoice", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Purchase Invoice", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Purchase Invoice", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "available_for_use_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Available-for-use Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_existing_asset", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Existing Asset", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -595,6 +552,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -626,6 +584,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -655,6 +614,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -686,6 +646,38 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "available_for_use_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Available-for-use Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -715,6 +707,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -723,9 +716,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "", 
-   "fieldname": "expected_value_after_useful_life", 
-   "fieldtype": "Currency", 
+   "fieldname": "calculate_depreciation", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -733,10 +725,9 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Expected Value After Useful Life", 
+   "label": "Calculate Depreciation", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -747,6 +738,38 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_existing_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Existing Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -779,6 +802,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -787,8 +811,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "section_break_20", 
-   "fieldtype": "Section Break", 
+   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
+   "fieldname": "number_of_depreciations_booked", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -796,8 +821,9 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Number of Depreciations Booked", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -808,6 +834,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -816,36 +843,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "calculate_depreciation", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Calculate Depreciation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
    "depends_on": "calculate_depreciation", 
    "fieldname": "section_break_23", 
    "fieldtype": "Section Break", 
@@ -869,6 +866,69 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "finance_books", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Finance Books", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_33", 
+   "fieldtype": "Section Break", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -902,6 +962,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -933,6 +994,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -963,6 +1025,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -992,37 +1055,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
-   "fieldname": "number_of_depreciations_booked", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Number of Depreciations Booked", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1053,6 +1086,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1084,6 +1118,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1115,6 +1150,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1146,6 +1182,254 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "insurance_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurance details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "policy_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Policy number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "insurer", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "insured_value", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insured value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_48", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "insurance_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurance Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "insurance_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Insurance End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "comprehensive_insurance", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Comprehensive Insurance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1176,6 +1460,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1207,6 +1492,228 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "other_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Other Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped\nIn Maintenance\nOut of Order\nIssue\nReceipt", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "booked_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Booked Fixed Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_51", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_receipt", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Receipt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Receipt", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_receipt_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Receipt Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_invoice", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Invoice", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1237,6 +1744,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1251,7 +1759,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-05 09:53:05.945328", 
+ "modified": "2018-05-16 22:43:21.897563",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset", 
@@ -1260,7 +1768,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1280,7 +1787,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1305,6 +1811,7 @@
  "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "title_field": "asset_name", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index cb14484..b6d3d6b 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -7,11 +7,14 @@
 from frappe import _
 from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff
 from frappe.model.document import Document
-from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
+from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
 from erpnext.assets.doctype.asset.depreciation \
 	import get_disposal_account_and_cost_center, get_depreciation_accounts
+from erpnext.accounts.general_ledger import make_gl_entries
+from erpnext.accounts.utils import get_account_currency
+from erpnext.controllers.accounts_controller import AccountsController
 
-class Asset(Document):
+class Asset(AccountsController):
 	def validate(self):
 		self.status = self.get_status()
 		self.validate_item()
@@ -25,7 +28,9 @@
 			self.validate_expected_value_after_useful_life()
 
 	def on_submit(self):
+		self.validate_in_use_date()
 		self.set_status()
+		self.update_stock_movement()
 
 	def on_cancel(self):
 		self.validate_cancellation()
@@ -44,30 +49,129 @@
 		elif item.is_stock_item:
 			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
 
+	def validate_in_use_date(self):
+		if not self.available_for_use_date:
+			frappe.throw(_("Available for use date is required"))
+
 	def set_missing_values(self):
-		if self.item_code:
-			item_details = get_item_details(self.item_code)
-			for field, value in item_details.items():
-				if not self.get(field):
-					self.set(field, value)
+		if not self.asset_category:
+			self.asset_category = frappe.db.get_value("Item", self.item_code, "asset_category")
+
+		if self.item_code and not self.get('finance_books'):
+			finance_books = get_item_details(self.item_code, self.asset_category)
+			self.set('finance_books', finance_books)
 
 	def validate_asset_values(self):
-		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
-			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
-
 		if not flt(self.gross_purchase_amount):
 			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
 
 		if not self.calculate_depreciation:
 			return
 
+		if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(nowdate()):
+			frappe.throw(_("Available-for-use Date is entered as past date"))
+
+	def make_depreciation_schedule(self):
+		if self.depreciation_method != 'Manual':
+			self.schedules = []
+
+		if not self.get("schedules") and self.available_for_use_date:
+			total_depreciations = sum([d.total_number_of_depreciations for d in self.get('finance_books')])
+
+			for d in self.get('finance_books'):
+				self.validate_asset_finance_books(d)
+
+				value_after_depreciation = (flt(self.gross_purchase_amount) -
+					flt(self.opening_accumulated_depreciation))
+
+				d.value_after_depreciation = value_after_depreciation
+
+				no_of_depreciations = cint(d.total_number_of_depreciations - 1) - cint(self.number_of_depreciations_booked)
+				end_date = add_months(d.depreciation_start_date,
+					no_of_depreciations * cint(d.frequency_of_depreciation))
+
+				total_days = date_diff(end_date, self.available_for_use_date)
+				rate_per_day = value_after_depreciation / total_days
+
+				number_of_pending_depreciations = cint(d.total_number_of_depreciations) - \
+					cint(self.number_of_depreciations_booked)
+
+				from_date = self.available_for_use_date
+				if number_of_pending_depreciations:
+					next_depr_date = getdate(add_months(self.available_for_use_date, 
+						number_of_pending_depreciations * 12))
+					if  (cint(frappe.db.get_value("Asset Settings", None, "schedule_based_on_fiscal_year")) == 1
+						and getdate(d.depreciation_start_date) < next_depr_date):
+
+						number_of_pending_depreciations += 1
+						for n in range(number_of_pending_depreciations):
+							if n == list(range(number_of_pending_depreciations))[-1]:
+								schedule_date = add_months(self.available_for_use_date, n * 12)
+								previous_scheduled_date = add_months(d.depreciation_start_date, (n-1) * 12)
+								depreciation_amount = \
+									self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
+										d, previous_scheduled_date, schedule_date)
+
+							elif n == list(range(number_of_pending_depreciations))[0]:
+								schedule_date = d.depreciation_start_date
+								depreciation_amount = \
+									self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
+										d, self.available_for_use_date, schedule_date)
+
+							else:
+								schedule_date = add_months(d.depreciation_start_date, n * 12)
+								depreciation_amount = \
+									 self.get_depreciation_amount_prorata_temporis(value_after_depreciation, d)
+
+							if value_after_depreciation != 0:
+								value_after_depreciation -= flt(depreciation_amount)
+
+								self.append("schedules", {
+									"schedule_date": schedule_date,
+									"depreciation_amount": depreciation_amount,
+									"depreciation_method": d.depreciation_method,
+									"finance_book": d.finance_book,
+									"finance_book_id": d.idx
+								})
+					else:
+						for n in range(number_of_pending_depreciations):
+							schedule_date = add_months(d.depreciation_start_date,
+								n * cint(d.frequency_of_depreciation))
+
+							if d.depreciation_method in ("Straight Line", "Manual"):
+								days = date_diff(schedule_date, from_date)
+								if n == 0: days += 1
+
+								depreciation_amount = days * rate_per_day
+								from_date = schedule_date
+							else:
+								depreciation_amount = self.get_depreciation_amount(value_after_depreciation,
+									d.total_number_of_depreciations, d)
+
+							if depreciation_amount:
+								value_after_depreciation -= flt(depreciation_amount)
+
+								self.append("schedules", {
+									"schedule_date": schedule_date,
+									"depreciation_amount": depreciation_amount,
+									"depreciation_method": d.depreciation_method,
+									"finance_book": d.finance_book,
+									"finance_book_id": d.idx
+								})
+
+	def validate_asset_finance_books(self, row):
+		if flt(row.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
+			frappe.throw(_("Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount")
+				.format(row.idx))
+
+		if not row.depreciation_start_date:
+			frappe.throw(_("Row {0}: Depreciation Start Date is required").format(row.idx))
+
 		if not self.is_existing_asset:
 			self.opening_accumulated_depreciation = 0
 			self.number_of_depreciations_booked = 0
-			if not self.next_depreciation_date:
-				frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
 		else:
-			depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
+			depreciable_amount = flt(self.gross_purchase_amount) - flt(row.expected_value_after_useful_life)
 			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
 					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
 						.format(depreciable_amount))
@@ -78,139 +182,89 @@
 			else:
 				self.number_of_depreciations_booked = 0
 
-			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
+			if cint(self.number_of_depreciations_booked) > cint(row.total_number_of_depreciations):
 				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
 
-		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
-			flt(self.opening_accumulated_depreciation))
+		if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(nowdate()):
+			frappe.msgprint(_("Depreciation Row {0}: Depreciation Start Date is entered as past date")
+				.format(row.idx), title=_('Warning'), indicator='red')
 
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
-			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
+		if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(self.purchase_date):
+			frappe.throw(_("Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date")
+				.format(row.idx))
 
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
-			frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
+		if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(self.available_for_use_date):
+			frappe.throw(_("Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date")
+				.format(row.idx))
 
-		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.available_for_use_date):
-			frappe.throw(_("Next Depreciation Date cannot be before Available-for-use Date"))
+	def set_accumulated_depreciation(self, ignore_booked_entry = False):
+		straight_line_idx = [d.idx for d in self.get("schedules") if d.depreciation_method == 'Straight Line']
+		finance_books = []
 
-		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
-			and not self.next_depreciation_date and self.calculate_depreciation):
-				frappe.throw(_("Please set Next Depreciation Date"))
-
-	def make_depreciation_schedule(self):
-
-		if self.depreciation_method != 'Manual':
-			self.schedules = []
-
-		if not self.get("schedules") and self.next_depreciation_date:
-			value_after_depreciation = flt(self.value_after_depreciation)
-
-			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
-				cint(self.number_of_depreciations_booked)
-			if number_of_pending_depreciations:
-				next_depr_date = getdate(add_months(self.available_for_use_date, 
-					number_of_pending_depreciations * 12))
-				if  (cint(frappe.db.get_value("Asset Settings", None, "schedule_based_on_fiscal_year")) == 1
-					and getdate(self.next_depreciation_date) < next_depr_date):
-
-					number_of_pending_depreciations += 1
-					for n in range(number_of_pending_depreciations):
-						if n == range(number_of_pending_depreciations)[-1]:
-							schedule_date = add_months(self.available_for_use_date, n * 12)
-							previous_scheduled_date = add_months(self.next_depreciation_date, (n-1) * 12)
-							depreciation_amount = \
-								self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
-									previous_scheduled_date, schedule_date)
-
-						elif n == range(number_of_pending_depreciations)[0]:
-							schedule_date = self.next_depreciation_date
-							depreciation_amount = \
-								self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
-									self.available_for_use_date, schedule_date)
-
-						else:
-							schedule_date = add_months(self.next_depreciation_date, n * 12)
-							depreciation_amount = \
-								 self.get_depreciation_amount_prorata_temporis(value_after_depreciation)
-
-						if value_after_depreciation != 0:
-							value_after_depreciation -= flt(depreciation_amount)
-
-							self.append("schedules", {
-								"schedule_date": schedule_date,
-								"depreciation_amount": depreciation_amount
-							})
-				else:
-					for n in range(number_of_pending_depreciations):
-						schedule_date = add_months(self.next_depreciation_date,
-							n * cint(self.frequency_of_depreciation))
-
-						depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
-						if depreciation_amount:
-							value_after_depreciation -= flt(depreciation_amount)
-
-							self.append("schedules", {
-								"schedule_date": schedule_date,
-								"depreciation_amount": depreciation_amount
-							})
-
-	def set_accumulated_depreciation(self):
-		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
-		value_after_depreciation = flt(self.value_after_depreciation)
 		for i, d in enumerate(self.get("schedules")):
+			if ignore_booked_entry and d.journal_entry:
+				continue
+
+			if d.finance_book_id not in finance_books:
+				accumulated_depreciation = flt(self.opening_accumulated_depreciation)
+				value_after_depreciation = flt(self.get_value_after_depreciation(d.finance_book_id))
+				finance_books.append(d.finance_book_id)
+
 			depreciation_amount = flt(d.depreciation_amount, d.precision("depreciation_amount"))
 			value_after_depreciation -= flt(depreciation_amount)
 
-			if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
+			if straight_line_idx and i == max(straight_line_idx) - 1:
+				book = self.get('finance_books')[cint(d.finance_book_id) - 1]
 				depreciation_amount += flt(value_after_depreciation -
-					flt(self.expected_value_after_useful_life), d.precision("depreciation_amount"))
+					flt(book.expected_value_after_useful_life), d.precision("depreciation_amount"))
 
 			d.depreciation_amount = depreciation_amount
 			accumulated_depreciation += d.depreciation_amount
 			d.accumulated_depreciation_amount = flt(accumulated_depreciation,
 				d.precision("accumulated_depreciation_amount"))
 
-	def get_depreciation_amount(self, depreciable_value):
-		if self.depreciation_method in ("Straight Line", "Manual"):
-			depreciation_amount = (flt(self.value_after_depreciation) -
-				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
-				cint(self.number_of_depreciations_booked))
-		else:
-			factor = 200.0 /  self.total_number_of_depreciations
-			depreciation_amount = flt(depreciable_value * factor / 100, 0)
+	def get_value_after_depreciation(self, idx):
+		return flt(self.get('finance_books')[cint(idx)-1].value_after_depreciation)
 
-			value_after_depreciation = flt(depreciable_value) - depreciation_amount
-			if value_after_depreciation < flt(self.expected_value_after_useful_life):
-				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
+	def get_depreciation_amount(self, depreciable_value, total_number_of_depreciations, row):
+		percentage_value = 100.0 if row.depreciation_method == 'Written Down Value' else 200.0
+
+		factor = percentage_value /  total_number_of_depreciations
+		depreciation_amount = flt(depreciable_value * factor / 100, 0)
+
+		value_after_depreciation = flt(depreciable_value) - depreciation_amount
+		if value_after_depreciation < flt(row.expected_value_after_useful_life):
+			depreciation_amount = flt(depreciable_value) - flt(row.expected_value_after_useful_life)
 
 		return depreciation_amount
 
-	def get_depreciation_amount_prorata_temporis(self, depreciable_value, start_date=None, end_date=None):
+	def get_depreciation_amount_prorata_temporis(self, depreciable_value, row, start_date=None, end_date=None):
 		if start_date and end_date:
 			prorata_temporis =  min(abs(flt(date_diff(str(end_date), str(start_date)))) / flt(frappe.db.get_value("Asset Settings", None, "number_of_days_in_fiscal_year")), 1)
 		else:
 			prorata_temporis = 1
 
-		if self.depreciation_method in ("Straight Line", "Manual"):
-			depreciation_amount = (flt(self.value_after_depreciation) -
-				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
+		if row.depreciation_method in ("Straight Line", "Manual"):
+			depreciation_amount = (flt(row.value_after_depreciation) -
+				flt(row.expected_value_after_useful_life)) / (cint(row.total_number_of_depreciations) -
 				cint(self.number_of_depreciations_booked)) * prorata_temporis
-
-			return depreciation_amount
 		else:
-			self.get_depreciation_amount(depreciable_value)
+			depreciation_amount = self.get_depreciation_amount(depreciable_value, row)
+
+		return depreciation_amount
 
 	def validate_expected_value_after_useful_life(self):
-		accumulated_depreciation_after_full_schedule = \
-			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
+		for row in self.get('finance_books'):
+			accumulated_depreciation_after_full_schedule = \
+				max([d.accumulated_depreciation_amount for d in self.get("schedules") if d.finance_book_id == row.idx])
 
-		asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
-			flt(accumulated_depreciation_after_full_schedule),
-			self.precision('expected_value_after_useful_life'))
+			asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
+				flt(accumulated_depreciation_after_full_schedule),
+				self.precision('gross_purchase_amount'))
 
-		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
-			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
-				.format(asset_value_after_full_schedule))
+			if row.expected_value_after_useful_life < asset_value_after_full_schedule:
+				frappe.throw(_("Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}")
+					.format(row.idx, asset_value_after_full_schedule))
 
 	def validate_cancellation(self):
 		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
@@ -219,6 +273,9 @@
 		if self.purchase_invoice:
 			frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
 
+		if self.purchase_receipt:
+			frappe.throw(_("Please cancel Purchase Receipt {0} first").format(self.purchase_receipt))
+
 	def delete_depreciation_entries(self):
 		for d in self.get("schedules"):
 			if d.journal_entry:
@@ -240,9 +297,15 @@
 			status = "Draft"
 		elif self.docstatus == 1:
 			status = "Submitted"
+			expected_value_after_useful_life = flt(sum([d.expected_value_after_useful_life
+				for d in self.get('finance_books')]))
+
+			value_after_depreciation = flt(sum([d.value_after_depreciation
+				for d in self.get('finance_books')]))
+
 			if self.journal_entry_for_scrap:
 				status = "Scrapped"
-			elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
+			elif flt(value_after_depreciation) <= expected_value_after_useful_life:
 				status = "Fully Depreciated"
 			elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
 				status = 'Partially Depreciated'
@@ -250,6 +313,45 @@
 			status = "Cancelled"
 		return status
 
+	def update_stock_movement(self):
+		asset_movement = frappe.db.get_value('Asset Movement',
+			{'asset': self.name, 'reference_name': self.purchase_receipt, 'docstatus': 0}, 'name')
+
+		if asset_movement:
+			doc = frappe.get_doc('Asset Movement', asset_movement)
+			doc.submit()
+
+	def make_gl_entries(self):
+		if self.purchase_receipt and self.purchase_receipt_amount:
+			from erpnext.accounts.general_ledger import make_gl_entries
+
+			gl_entries = []
+
+			cwip_account = get_cwip_account(self.name, self.asset_category, self.company)
+			fixed_aseet_account = get_asset_category_account(self.name, 'fixed_asset_account',
+					asset_category = self.asset_category, company = self.company)
+
+			gl_entries.append(self.get_gl_dict({
+				"account": cwip_account,
+				"against": fixed_aseet_account,
+				"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+				"posting_date": self.available_for_use_date,
+				"credit": self.purchase_receipt_amount,
+				"credit_in_account_currency": self.purchase_receipt_amount
+			}))
+
+			gl_entries.append(self.get_gl_dict({
+				"account": fixed_aseet_account,
+				"against": cwip_account,
+				"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+				"posting_date": self.available_for_use_date,
+				"debit": self.purchase_receipt_amount,
+				"debit_in_account_currency": self.purchase_receipt_amount
+			}))
+
+			make_gl_entries(gl_entries)
+			self.db_set('booked_fixed_asset', 1)
+
 def update_maintenance_status():
 	assets = frappe.get_all('Asset', filters = {'docstatus': 1, 'maintenance_required': 1})
 
@@ -260,6 +362,18 @@
 		if frappe.db.exists('Asset Repair', {'asset_name': asset.name, 'repair_status': 'Pending'}):
 			asset.set_status('Out of Order')
 
+def make_post_gl_entry():
+	assets = frappe.db.sql_list(""" select name from `tabAsset`
+		where ifnull(booked_fixed_asset, 0) = 0 and available_for_use_date = %s""", nowdate())
+
+	for asset in assets:
+		doc = frappe.get_doc('Asset', asset)
+		doc.make_gl_entries()
+
+def get_asset_naming_series():
+	meta = frappe.get_meta('Asset')
+	return meta.get_field("naming_series").options
+
 @frappe.whitelist()
 def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
 	pi = frappe.new_doc("Purchase Invoice")
@@ -271,7 +385,7 @@
 		"item_code": item_code,
 		"is_fixed_asset": 1,
 		"asset": asset,
-		"expense_account": get_fixed_asset_account(asset),
+		"expense_account": get_asset_category_account(asset, 'fixed_asset_account'),
 		"qty": 1,
 		"price_list_rate": gross_purchase_amount,
 		"rate": gross_purchase_amount
@@ -280,7 +394,7 @@
 	return pi
 
 @frappe.whitelist()
-def make_sales_invoice(asset, item_code, company):
+def make_sales_invoice(asset, item_code, company, serial_no=None):
 	si = frappe.new_doc("Sales Invoice")
 	si.company = company
 	si.currency = frappe.db.get_value("Company", company, "default_currency")
@@ -290,6 +404,7 @@
 		"is_fixed_asset": 1,
 		"asset": asset,
 		"income_account": disposal_account,
+		"serial_no": serial_no,
 		"cost_center": depreciation_cost_center,
 		"qty": 1
 	})
@@ -309,9 +424,23 @@
 	return asset_maintenance
 
 @frappe.whitelist()
+def create_asset_adjustment(asset, asset_category, company):
+	asset_maintenance = frappe.new_doc("Asset Adjustment")
+	asset_maintenance.update({
+		"asset": asset,
+		"company": company,
+		"asset_category": asset_category
+	})
+	return asset_maintenance
+
+@frappe.whitelist()
 def transfer_asset(args):
 	import json
 	args = json.loads(args)
+
+	if args.get('serial_no'):
+		args['quantity'] = len(args.get('serial_no').split('\n'))
+
 	movement_entry = frappe.new_doc("Asset Movement")
 	movement_entry.update(args)
 	movement_entry.insert()
@@ -322,17 +451,32 @@
 	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
 
 @frappe.whitelist()
-def get_item_details(item_code):
-	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
-
+def get_item_details(item_code, asset_category=None):
 	if not asset_category:
 		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
 
-	ret = frappe.db.get_value("Asset Category", asset_category,
-		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
+	asset_category_doc = frappe.get_doc('Asset Category', asset_category)
+	books = []
+	for d in asset_category_doc.finance_books:
+		books.append({
+			'finance_book': d.finance_book,
+			'depreciation_method': d.depreciation_method,
+			'total_number_of_depreciations': d.total_number_of_depreciations,
+			'frequency_of_depreciation': d.frequency_of_depreciation,
+			'start_date': nowdate()
+		})
 
-	ret.update({
-		"asset_category": asset_category
-	})
+	return books
 
-	return ret
+def get_cwip_account(asset, asset_category=None, company=None):
+	cwip_account = get_asset_category_account(asset, 'capital_work_in_progress_account',
+					asset_category = asset_category, company = company)
+
+	if not cwip_account:
+		cwip_account = frappe.db.get_value('Company', company, 'capital_work_in_progress_account')
+
+	if not cwip_account:
+		frappe.throw(_("Set Capital Work In Progress Account in asset category {0} or company {1}")
+			.format(asset_category, company))
+
+	return cwip_account
diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
index 94dad1b..89699f3 100644
--- a/erpnext/assets/doctype/asset/asset_dashboard.py
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -1,6 +1,9 @@
 def get_data():
 	return {
 		'fieldname': 'asset_name',
+		'non_standard_fieldnames': {
+			'Asset Movement': 'asset'
+		},
 		'transactions': [
 			{
 				'label': ['Maintenance'],
@@ -9,6 +12,10 @@
 			{
 				'label': ['Repair'],
 				'items': ['Asset Repair']
+			},
+			{
+				'label': ['Movement'],
+				'items': ['Asset Movement']
 			}
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 92a251e..aacaef5 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, today, getdate
+from frappe.utils import flt, today, getdate, cint
 
 def post_depreciation_entries(date=None):
 	# Return if automatic booking of asset depreciation is disabled
@@ -47,6 +47,7 @@
 			je.naming_series = depreciation_series
 			je.posting_date = d.schedule_date
 			je.company = asset.company
+			je.finance_book = d.finance_book
 			je.remark = "Depreciation Entry against {0} worth {1}".format(asset_name, d.depreciation_amount)
 
 			je.append("accounts", {
@@ -68,9 +69,12 @@
 			je.submit()
 
 			d.db_set("journal_entry", je.name)
-			asset.value_after_depreciation -= d.depreciation_amount
+			
+			idx = cint(d.finance_book_id)
+			finance_books = asset.get('finance_books')[idx - 1]
+			finance_books.value_after_depreciation -= d.depreciation_amount
+			finance_books.db_update()
 
-	asset.db_set("value_after_depreciation", asset.value_after_depreciation)
 	asset.set_status()
 
 	return asset
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/assets/doctype/asset_adjustment/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/assets/doctype/asset_adjustment/__init__.py
diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.js b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.js
new file mode 100644
index 0000000..346a2f1
--- /dev/null
+++ b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.js
@@ -0,0 +1,41 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Adjustment', {
+	setup: function(frm) {
+		frm.add_fetch('company', 'cost_center', 'cost_center');
+		frm.set_query('cost_center', function() {
+			return {
+				filters: {
+					company: frm.doc.company,
+					is_group: 0
+				}
+			}
+		});
+	},
+
+	asset: function(frm) {
+		frm.trigger("set_current_asset_value");
+	},
+
+	finance_book: function(frm) {
+		frm.trigger("set_current_asset_value");
+	},
+
+	set_current_asset_value: function(frm) {
+		if (frm.doc.finance_book && frm.doc.asset) {
+			frm.call({
+				method: "erpnext.assets.doctype.asset_adjustment.asset_adjustment.get_current_asset_value",
+				args: {
+					asset: frm.doc.asset,
+					finance_book: frm.doc.finance_book
+				},
+				callback: function(r) {
+					if (r.message) {
+						frm.set_value('current_asset_value', r.message);
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.json b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.json
new file mode 100644
index 0000000..9e8899d
--- /dev/null
+++ b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.json
@@ -0,0 +1,478 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-11 00:22:43.695151", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "asset.asset_category",
+   "fieldname": "asset_category", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "journal_entry", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Journal Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "current_asset_value", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Current Asset Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_asset_value", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "New Asset Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "difference_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Difference Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset Adjustment", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 12:12:38.110774", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Adjustment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "asset", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_adjustment/asset_adjustment.py b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.py
new file mode 100644
index 0000000..af806e4
--- /dev/null
+++ b/erpnext/assets/doctype/asset_adjustment/asset_adjustment.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, getdate, cint, date_diff
+from erpnext.assets.doctype.asset.depreciation import get_depreciation_accounts
+from frappe.model.document import Document
+
+class AssetAdjustment(Document):
+	def validate(self):
+		self.set_difference_amount()
+		self.set_current_asset_value()
+
+	def on_submit(self):
+		self.make_depreciation_entry()
+		self.reschedule_depreciations(self.new_asset_value)
+
+	def on_cancel(self):
+		if self.journal_entry:
+			frappe.throw(_("Cancel the journal entry {0} first").format(self.journal_entry))
+
+		self.reschedule_depreciations(self.current_asset_value)
+
+	def set_difference_amount(self):
+		self.difference_amount = flt(self.current_asset_value - self.new_asset_value)
+
+	def set_current_asset_value(self):
+		if not self.current_asset_value and self.asset and self.finance_book:
+			self.current_asset_value = get_current_asset_value(self.asset, self.finance_book)
+
+	def make_depreciation_entry(self):
+		asset = frappe.get_doc("Asset", self.asset)
+		fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account = \
+			get_depreciation_accounts(asset)
+
+		depreciation_cost_center, depreciation_series = frappe.db.get_value("Company", asset.company,
+			["depreciation_cost_center", "series_for_depreciation_entry"])
+
+		je = frappe.new_doc("Journal Entry")
+		je.voucher_type = "Depreciation Entry"
+		je.naming_series = depreciation_series
+		je.posting_date = self.date
+		je.company = self.company
+		je.remark = "Depreciation Entry against {0} worth {1}".format(self.asset, self.difference_amount)
+
+		je.append("accounts", {
+			"account": accumulated_depreciation_account,
+			"credit_in_account_currency": self.difference_amount,
+			"cost_center": depreciation_cost_center or self.cost_center
+		})
+
+		je.append("accounts", {
+			"account": depreciation_expense_account,
+			"debit_in_account_currency": self.difference_amount,
+			"cost_center": depreciation_cost_center or self.cost_center
+		})
+
+		je.flags.ignore_permissions = True
+		je.submit()
+
+		self.db_set("journal_entry", je.name)
+
+	def reschedule_depreciations(self, asset_value):
+		asset = frappe.get_doc('Asset', self.asset)
+
+		for d in asset.finance_books:
+			d.value_after_depreciation = asset_value
+
+			if d.depreciation_method in ("Straight Line", "Manual"):
+				end_date = max([s.schedule_date for s in asset.schedules if cint(s.finance_book_id) == d.idx])
+				total_days = date_diff(end_date, self.date)
+				rate_per_day = flt(d.value_after_depreciation) / flt(total_days)
+				from_date = self.date
+			else:
+				no_of_depreciations = len([e.name for e in asset.schedules
+					if (cint(s.finance_book_id) == d.idx and not e.journal_entry)])
+
+			value_after_depreciation = d.value_after_depreciation
+			for data in asset.schedules:
+				if cint(data.finance_book_id) == d.idx and not data.journal_entry:
+					if d.depreciation_method in ("Straight Line", "Manual"):
+						days = date_diff(data.schedule_date, from_date)
+						depreciation_amount = days * rate_per_day
+						from_date = data.schedule_date
+					else:
+						depreciation_amount = asset.get_depreciation_amount(value_after_depreciation,
+							no_of_depreciations, d)
+
+					if depreciation_amount:
+						value_after_depreciation -= flt(depreciation_amount)
+						data.depreciation_amount = depreciation_amount
+
+			d.db_update()
+
+		asset.set_accumulated_depreciation(ignore_booked_entry=True)
+		for asset_data in asset.schedules:
+			if not asset_data.journal_entry:
+				asset_data.db_update()
+
+@frappe.whitelist()
+def get_current_asset_value(asset, finance_book):
+	return frappe.db.get_value('Asset Finance Book',
+		{'parent': asset, 'parenttype': 'Asset', 'finance_book': finance_book}, 'value_after_depreciation', debug=1)
diff --git a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js b/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js
new file mode 100644
index 0000000..29d070a
--- /dev/null
+++ b/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Asset Adjustment", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Asset Adjustment
+		() => frappe.tests.make('Asset Adjustment', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py b/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py
new file mode 100644
index 0000000..209692e
--- /dev/null
+++ b/erpnext/assets/doctype/asset_adjustment/test_asset_adjustment.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAssetAdjustment(unittest.TestCase):
+	pass
diff --git a/erpnext/assets/doctype/asset_category/asset_category.js b/erpnext/assets/doctype/asset_category/asset_category.js
index aafe8a6..6f0c428 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.js
+++ b/erpnext/assets/doctype/asset_category/asset_category.js
@@ -40,5 +40,16 @@
 			};
 		});
 
+		frm.set_query('capital_work_in_progress_account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				"filters": {
+					"account_type": "Capital Work in Progress",
+					"is_group": 0,
+					"company": d.company_name
+				}
+			};
+		});
+
 	}
 });
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_category/asset_category.json b/erpnext/assets/doctype/asset_category/asset_category.json
index 3331d05..882cbe2 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.json
+++ b/erpnext/assets/doctype/asset_category/asset_category.json
@@ -49,38 +49,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Straight Line", 
-   "fieldname": "depreciation_method", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Depreciation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nStraight Line\nDouble Declining Balance\nManual", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -110,16 +78,16 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "total_number_of_depreciations", 
-   "fieldtype": "Int", 
+   "fieldname": "finance_book_detail", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Total Number of Depreciations", 
+   "label": "Finance Book Detail", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -129,7 +97,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -140,18 +108,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "frequency_of_depreciation", 
-   "fieldtype": "Int", 
+   "fieldname": "finance_books", 
+   "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Frequency of Depreciation (Months)", 
+   "label": "Finance Books", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Asset Finance Book", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -159,7 +128,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -236,7 +205,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-01 15:14:25.645077", 
+ "modified": "2018-05-12 14:56:04.116425", 
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Category", 
@@ -312,4 +281,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py
index 542bd12..bbdc6ec 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.py
+++ b/erpnext/assets/doctype/asset_category/asset_category.py
@@ -10,6 +10,22 @@
 
 class AssetCategory(Document):
 	def validate(self):
-		for field in ("total_number_of_depreciations", "frequency_of_depreciation"):
-			if cint(self.get(field))<1:
-				frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)
+		for d in self.finance_books:
+			for field in ("Total Number of Depreciations", "Frequency of Depreciation"):
+				if cint(d.get(frappe.scrub(field)))<1:
+					frappe.throw(_("Row {0}: {1} must be greater than 0").format(d.idx, field), frappe.MandatoryError)
+
+@frappe.whitelist()
+def get_asset_category_account(asset, fieldname, account=None, asset_category = None, company = None):
+	if not asset_category and company:
+		if account:
+			if frappe.db.get_value("Account", account, "account_type") != "Fixed Asset":
+				account=None
+
+		if not account:
+			asset_category, company = frappe.db.get_value("Asset", asset, ["asset_category", "company"])
+
+	account = frappe.db.get_value("Asset Category Account",
+		filters={"parent": asset_category, "company_name": company}, fieldname=fieldname)
+
+	return account
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_category_account/asset_category_account.json b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
index 679cc52..b7df557 100644
--- a/erpnext/assets/doctype/asset_category_account/asset_category_account.json
+++ b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
@@ -17,7 +17,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
    "fieldname": "company_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -48,7 +48,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
    "fieldname": "fixed_asset_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -135,6 +135,37 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "capital_work_in_progress_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Capital Work In Progress Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -147,7 +178,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-28 16:54:12.252271", 
+ "modified": "2018-05-10 17:06:48.839347", 
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Category Account", 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/assets/doctype/asset_finance_book/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/assets/doctype/asset_finance_book/__init__.py
diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
new file mode 100644
index 0000000..f75c851
--- /dev/null
+++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
@@ -0,0 +1,289 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-08 14:44:37.095570", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStraight Line\nDouble Declining Balance\nWritten Down Value\nManual", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_number_of_depreciations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Number of Depreciations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "frequency_of_depreciation", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Frequency of Depreciation (Months)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:parent.doctype == 'Asset'", 
+   "fieldname": "depreciation_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:parent.doctype == 'Asset'", 
+   "fieldname": "expected_value_after_useful_life", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expected Value After Useful Life", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "value_after_depreciation", 
+   "fieldtype": "Currency", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Value After Depreciation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-12 14:56:44.800046", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Asset Finance Book", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py
new file mode 100644
index 0000000..bdc2acf
--- /dev/null
+++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AssetFinanceBook(Document):
+	pass
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
index 1583daf..3c135d4 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
@@ -24,7 +24,28 @@
 				return indicator;
 			}
 		);
+
+		frm.set_query('select_serial_no', function(doc){
+			return {
+				asset: frm.doc.asset_name
+			}
+		})
 	},
+
+	select_serial_no: (frm) => {
+		let serial_nos = frm.doc.serial_no || frm.doc.select_serial_no;
+		if (serial_nos) {
+			serial_nos = serial_nos.split('\n');
+			serial_nos.push(frm.doc.select_serial_no);
+
+			const unique_sn = serial_nos.filter(function(elem, index, self) {
+			    return index === self.indexOf(elem);
+			});
+
+			frm.set_value("serial_no", unique_sn.join('\n'));
+		}
+	},
+
 	refresh: (frm) => {
 		if(!frm.is_new()) {
 			frm.trigger('make_dashboard');
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
index 72d96b0..efb2de3 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -50,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_name.asset_category",
    "fieldname": "asset_category", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -62,7 +64,7 @@
    "label": "Asset Category", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_name.asset_category", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -81,6 +84,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_name.item_code",
    "fieldname": "item_code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -93,7 +97,7 @@
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_name.item_code", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -104,6 +108,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -112,6 +117,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_name.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -124,7 +130,7 @@
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_name.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -135,6 +141,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,6 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -195,6 +203,71 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "select_serial_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Select Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Serial No", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -224,6 +297,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +329,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -284,6 +359,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -292,6 +368,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "maintenance_team.maintenance_manager",
    "fieldname": "maintenance_manager", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -304,7 +381,7 @@
    "label": "Maintenance Manager", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "maintenance_team.maintenance_manager", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -315,6 +392,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -323,6 +401,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "maintenance_team.maintenance_manager_name",
    "fieldname": "maintenance_manager_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -335,7 +414,7 @@
    "label": "Maintenance Manager Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "maintenance_team.maintenance_manager_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -346,6 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -376,6 +456,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -407,6 +488,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -420,7 +502,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-01 15:13:29.816396", 
+ "modified": "2018-05-22 17:20:54.711885",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Maintenance", 
@@ -429,7 +511,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -449,7 +530,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
index b63f755..767097d 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
@@ -42,6 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -81,6 +83,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_maintenance.asset_name",
    "fieldname": "asset_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -93,7 +96,7 @@
    "label": "Asset Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_maintenance.asset_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -104,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -133,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -141,6 +146,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_maintenance.item_code",
    "fieldname": "item_code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -153,7 +159,7 @@
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_maintenance.item_code", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -164,6 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -172,6 +179,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_maintenance.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -184,7 +192,7 @@
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_maintenance.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -195,6 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -224,6 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +265,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -263,6 +274,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.maintenance_type",
    "fieldname": "maintenance_type", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -275,7 +287,7 @@
    "label": "Maintenance Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.maintenance_type", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -286,6 +298,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -294,6 +307,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.periodicity",
    "fieldname": "periodicity", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -306,7 +320,7 @@
    "label": "Periodicity", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.periodicity", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -317,6 +331,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -325,6 +340,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.assign_to_name",
    "fieldname": "assign_to_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -337,7 +353,7 @@
    "label": "Assign To", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.assign_to_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -348,6 +364,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -377,6 +394,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -385,6 +403,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.next_due_date", 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -397,7 +416,7 @@
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.next_due_date", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -408,6 +427,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -438,6 +458,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -469,6 +490,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -498,6 +520,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -506,6 +529,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.has_certificate", 
    "fieldname": "has_certificate", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -518,7 +542,7 @@
    "label": "Has Certificate ", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.has_certificate", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -529,6 +553,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -560,6 +585,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -589,6 +615,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -597,6 +624,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "task.description",
    "fieldname": "description", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -609,7 +637,7 @@
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "task.description", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -620,6 +648,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -649,6 +678,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -679,6 +709,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -710,6 +741,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -723,7 +755,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-28 13:15:01.689318", 
+ "modified": "2018-05-25 22:43:39.866477",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Maintenance Log", 
@@ -732,7 +764,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
index bdf9054..8ce67cf 100644
--- a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
+++ b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 1
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -102,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +199,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +231,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -254,6 +261,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -284,6 +292,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -314,6 +323,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -343,6 +353,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -374,6 +385,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -403,6 +415,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -411,6 +424,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "assign_to.full_name",
    "fieldname": "assign_to_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -423,7 +437,7 @@
    "label": "Assign to Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "assign_to.full_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -434,6 +448,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -463,6 +478,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -493,6 +509,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -522,6 +539,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -552,6 +570,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -581,6 +600,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -612,6 +632,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -625,7 +646,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-28 12:22:34.151430", 
+ "modified": "2018-05-16 22:42:44.609383",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Maintenance Task", 
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
index 3405a7d..e2aa548 100644
--- a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -80,6 +82,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "maintenance_manager.full_name",
    "fieldname": "maintenance_manager_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -92,7 +95,7 @@
    "label": "Maintenance Manager Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "maintenance_manager.full_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -103,6 +106,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +136,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +168,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -192,6 +198,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +230,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -236,7 +244,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-01 15:13:00.374360", 
+ "modified": "2018-05-16 22:43:24.195349",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Maintenance Team", 
@@ -245,7 +253,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.json b/erpnext/assets/doctype/asset_movement/asset_movement.json
index 0c05552..8adbf57 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.json
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.json
@@ -18,6 +18,69 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Transfer", 
+   "fieldname": "purpose", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purpose", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nIssue\nReceipt\nTransfer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -79,37 +142,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -139,7 +171,96 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "source_warehouse", 
+   "fieldname": "quantity", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source_location", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -147,11 +268,194 @@
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Source Warehouse", 
+   "in_standard_filter": 0, 
+   "label": "Source Location", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Warehouse", 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "target_location", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Target Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reference_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reference DocType", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "DocType", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -170,27 +474,27 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "target_warehouse", 
-   "fieldtype": "Link", 
+   "fieldname": "reference_name", 
+   "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Target Warehouse", 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reference Name", 
    "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
+   "no_copy": 1, 
+   "options": "reference_doctype", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -236,7 +540,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-19 16:08:17.389257", 
+ "modified": "2018-05-10 23:16:20.791672", 
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Movement", 
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index 574c499..638987e 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -5,44 +5,55 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 from frappe.model.document import Document
 
 class AssetMovement(Document):
 	def validate(self):
 		self.validate_asset()
 		self.validate_warehouses()
-		
+
 	def validate_asset(self):
 		status, company = frappe.db.get_value("Asset", self.asset, ["status", "company"])
-		if status in ("Draft", "Scrapped", "Sold"):
+		if self.purpose == 'Transfer' and status in ("Draft", "Scrapped", "Sold"):
 			frappe.throw(_("{0} asset cannot be transferred").format(status))
-			
+
 		if company != self.company:
 			frappe.throw(_("Asset {0} does not belong to company {1}").format(self.asset, self.company))
-			
+
+		if self.serial_no and len(get_serial_nos(self.serial_no)) != self.quantity:
+			frappe.throw(_("Number of serial nos and quantity must be the same"))
+
+		if not(self.source_location or self.target_location or self.from_employee or self.to_employee):
+			frappe.throw(_("Either location or employee must be required"))
+
 	def validate_warehouses(self):
-		if not self.source_warehouse:
-			self.source_warehouse = frappe.db.get_value("Asset", self.asset, "warehouse")
-		
-		if self.source_warehouse == self.target_warehouse:
-			frappe.throw(_("Source and Target Warehouse cannot be same"))
+		if self.purpose in ['Transfer', 'Issue']:
+			self.source_location = frappe.db.get_value("Asset", self.asset, "location")
+
+		if self.source_location == self.target_location:
+			frappe.throw(_("Source and Target Location cannot be same"))
 
 	def on_submit(self):
-		self.set_latest_warehouse_in_asset()
+		self.set_latest_location_in_asset()
 		
 	def on_cancel(self):
-		self.set_latest_warehouse_in_asset()
-		
-	def set_latest_warehouse_in_asset(self):
-		latest_movement_entry = frappe.db.sql("""select target_warehouse from `tabAsset Movement`
+		self.set_latest_location_in_asset()
+
+	def set_latest_location_in_asset(self):
+		latest_movement_entry = frappe.db.sql("""select target_location from `tabAsset Movement`
 			where asset=%s and docstatus=1 and company=%s
 			order by transaction_date desc limit 1""", (self.asset, self.company))
 		
 		if latest_movement_entry:
-			warehouse = latest_movement_entry[0][0]
+			location = latest_movement_entry[0][0]
 		else:
-			warehouse = frappe.db.sql("""select source_warehouse from `tabAsset Movement`
+			location = frappe.db.sql("""select source_location from `tabAsset Movement`
 				where asset=%s and docstatus=2 and company=%s
 				order by transaction_date asc limit 1""", (self.asset, self.company))[0][0]
-		
-		frappe.db.set_value("Asset", self.asset, "warehouse", warehouse)
\ No newline at end of file
+
+		frappe.db.set_value("Asset", self.asset, "location", location)
+
+		if self.serial_no:
+			for d in get_serial_nos(self.serial_no):
+				frappe.db.set_value('Serial No', d, 'location', location)
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index edc17bd..dff485e 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -102,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -110,6 +113,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_name.item_code",
    "fieldname": "item_code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -122,7 +126,7 @@
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_name.item_code", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -133,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -141,6 +146,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "asset_name.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -153,7 +159,7 @@
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "asset_name.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -164,6 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -193,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -224,6 +232,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -263,6 +273,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "assign_to.full_name",
    "fieldname": "assign_to_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -275,7 +286,7 @@
    "label": "Assign To Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "assign_to.full_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -286,6 +297,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -315,6 +327,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -345,6 +358,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -377,6 +391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": ""
   }, 
@@ -407,6 +422,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -438,6 +454,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -467,6 +484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -497,6 +515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -526,6 +545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -556,6 +576,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -585,6 +606,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -615,6 +637,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -645,6 +668,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -658,7 +682,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-29 00:49:11.172141", 
+ "modified": "2018-05-16 22:43:27.684376",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset Repair", 
@@ -667,7 +691,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -687,7 +710,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
index 3303472..35a2c9d 100644
--- a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
+++ b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
@@ -19,6 +19,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -196,6 +227,67 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "finance_book_id", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Finance Book Id", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_method", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "\nStraight Line\nDouble Declining Balance\nWritten Down Value\nManual", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -208,7 +300,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-19 16:30:13.738170", 
+ "modified": "2018-05-10 15:12:41.679436", 
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Depreciation Schedule", 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/assets/doctype/location/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/assets/doctype/location/__init__.py
diff --git a/erpnext/assets/doctype/location/location.js b/erpnext/assets/doctype/location/location.js
new file mode 100644
index 0000000..c3783df
--- /dev/null
+++ b/erpnext/assets/doctype/location/location.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Location', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/assets/doctype/location/location.json b/erpnext/assets/doctype/location/location.json
new file mode 100644
index 0000000..d83fdf3
--- /dev/null
+++ b/erpnext/assets/doctype/location/location.json
@@ -0,0 +1,306 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:location_name", 
+ "beta": 0, 
+ "creation": "2018-05-07 12:49:22.595974", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Location Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_location", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Parent Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "lft", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "rgt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-07 19:21:06.051414", 
+ "modified_by": "Administrator", 
+ "module": "Assets", 
+ "name": "Location", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/location/location.py b/erpnext/assets/doctype/location/location.py
new file mode 100644
index 0000000..9d05720
--- /dev/null
+++ b/erpnext/assets/doctype/location/location.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.utils.nestedset import NestedSet
+
+class Location(NestedSet):
+	def on_update(self):
+		self.update_nsm_model()
+
+	def on_trash(self):
+		self.update_nsm_model()
+
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
+
+@frappe.whitelist()
+def get_children(doctype, parent=None, location=None, is_root=False):
+	if parent == None or parent == "All Locations":
+		parent = ""
+
+	return frappe.db.sql("""
+		select
+			name as value,
+			is_group as expandable
+		from
+			`tab{doctype}` comp
+		where
+			ifnull(parent_location, "")="{parent}"
+		""".format(
+			doctype = frappe.db.escape(doctype),
+			parent=frappe.db.escape(parent)
+		), as_dict=1)
+
+@frappe.whitelist()
+def add_node():
+	from frappe.desk.treeview import make_tree_args
+	args = frappe.form_dict
+	args = make_tree_args(**args)
+
+	if args.parent_location == 'All Locations':
+		args.parent_location = None
+
+	frappe.get_doc(args).insert()
\ No newline at end of file
diff --git a/erpnext/assets/doctype/location/location_tree.js b/erpnext/assets/doctype/location/location_tree.js
new file mode 100644
index 0000000..523dd63
--- /dev/null
+++ b/erpnext/assets/doctype/location/location_tree.js
@@ -0,0 +1,28 @@
+frappe.treeview_settings["Location"] = {
+	ignore_fields:["parent_location"],
+	get_tree_nodes: 'erpnext.assets.doctype.location.location.get_children',
+	add_tree_node: 'erpnext.assets.doctype.location.location.add_node',
+	filters: [
+		{
+			fieldname: "location",
+			fieldtype:"Link",
+			options: "Location",
+			label: __("Location")
+		},
+	],
+	breadcrumb: "Assets",
+	root_label: "All Locations",
+	get_tree_root: false,
+	menu_items: [
+		{
+			label: __("New Location"),
+			action: function() {
+				frappe.new_doc("Location", true);
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Location") !== -1'
+		}
+	],
+	onload: function(treeview) {
+		treeview.make_tree();
+	}
+};
\ No newline at end of file
diff --git a/erpnext/assets/doctype/location/test_location.js b/erpnext/assets/doctype/location/test_location.js
new file mode 100644
index 0000000..236b5c6
--- /dev/null
+++ b/erpnext/assets/doctype/location/test_location.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Location", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Location
+		() => frappe.tests.make('Location', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/assets/doctype/location/test_location.py b/erpnext/assets/doctype/location/test_location.py
new file mode 100644
index 0000000..9a46fd9
--- /dev/null
+++ b/erpnext/assets/doctype/location/test_location.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestLocation(unittest.TestCase):
+	pass
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
index 195661a..5155b0b 100644
--- a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -51,6 +52,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "", 
+   "fetch_from": "team_member.full_name",
    "fieldname": "full_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -63,7 +65,7 @@
    "label": "Full Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "team_member.full_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -74,6 +76,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,6 +108,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -118,7 +122,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-24 15:51:58.295745", 
+ "modified": "2018-05-16 22:43:15.255185",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Maintenance Team Member", 
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index bb2b47d..21e9485 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -1,231 +1,383 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-25 11:04:03", 
  "custom": 0, 
  "description": "Settings for Buying Module", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Supplier Name", 
    "fieldname": "supp_master_name", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Naming By", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier Name\nNaming Series", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "supplier_type", 
+   "columns": 0, 
+   "fieldname": "supplier_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "Default Supplier Type", 
+   "in_standard_filter": 0, 
+   "label": "Default Supplier Group", 
+   "length": 0, 
    "no_copy": 0, 
-   "options": "Supplier Type", 
+   "options": "Supplier Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "buying_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Buying Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "po_required", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Order Required", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "pr_required", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipt Required", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "maintain_same_rate", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintain same rate throughout purchase cycle", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "allow_multiple_items", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow Item to be added multiple times in a transaction", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "description": "If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt",
-   "fieldname": "disable_fetch_last_purchase_rate",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Disable Fetching Last Purchase Details in Purchase Order",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "description": "If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt", 
+   "fieldname": "disable_fetch_last_purchase_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disable Fetching Last Purchase Details in Purchase Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "subcontract", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Subcontract", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "backflush_raw_materials_of_subcontract_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Backflush Raw Materials of Subcontract Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM\nMaterial Transferred for Subcontract", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2017-12-27 15:20:06.052342", 
+ "max_attachments": 0, 
+ "modified": "2018-05-30 16:28:46.899823", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Buying Settings", 
@@ -233,7 +385,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -252,6 +403,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.py b/erpnext/buying/doctype/buying_settings/buying_settings.py
index 1f0184b..a634a09 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.py
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.py
@@ -10,7 +10,7 @@
 
 class BuyingSettings(Document):
 	def validate(self):
-		for key in ["supplier_type", "supp_master_name", "maintain_same_rate", "buying_price_list"]:
+		for key in ["supplier_group", "supp_master_name", "maintain_same_rate", "buying_price_list"]:
 			frappe.db.set_default(key, self.get(key, ""))
 
 		from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/buying/doctype/party_tax_withholding_config/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/buying/doctype/party_tax_withholding_config/__init__.py
diff --git a/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.json b/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.json
new file mode 100644
index 0000000..320485b
--- /dev/null
+++ b/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.json
@@ -0,0 +1,166 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-11 13:32:33.825307", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_withholding_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Tax Withholding Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Tax Withholding Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "valid_till", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Valid Till", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "applicable_percent", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Applicable Percent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "certificate_received", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Certificate Received", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-11 13:35:44.424855", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Party Tax Withholding Config", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.py b/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.py
new file mode 100644
index 0000000..bec7e83
--- /dev/null
+++ b/erpnext/buying/doctype/party_tax_withholding_config/party_tax_withholding_config.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PartyTaxWithholdingConfig(Document):
+	pass
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index c97db6d..671408f 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -409,12 +409,6 @@
 	}
 }
 
-cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
-	if(cint(frappe.boot.notification_settings.purchase_order)) {
-		cur_frm.email_doc(frappe.boot.notification_settings.purchase_order_message);
-	}
-}
-
 function set_schedule_date(frm) {
 	if(frm.doc.schedule_date){
 		erpnext.utils.copy_value_in_all_row(frm.doc, frm.doc.doctype, frm.doc.name, "items", "schedule_date");
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 35d2cf0..a7799b6 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -40,7 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,7 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,7 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -139,7 +139,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -171,7 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -203,7 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -212,6 +212,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "supplier.supplier_name",
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -224,7 +225,7 @@
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "supplier.supplier_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -234,7 +235,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -267,7 +268,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -301,7 +302,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -332,7 +333,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -366,7 +367,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -398,7 +399,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -430,7 +431,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -462,7 +463,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -495,7 +496,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -527,7 +528,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -560,7 +561,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -592,7 +593,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -622,7 +623,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -655,7 +656,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -686,7 +687,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -717,7 +718,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -749,7 +750,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -780,7 +781,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -811,7 +812,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -842,7 +843,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -873,7 +874,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -903,7 +904,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -933,7 +934,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -963,7 +964,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -993,7 +994,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1026,7 +1027,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1057,7 +1058,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1088,7 +1089,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1121,7 +1122,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1155,7 +1156,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1184,7 +1185,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1215,7 +1216,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1246,7 +1247,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1277,7 +1278,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1307,7 +1308,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1339,7 +1340,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1372,7 +1373,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1404,7 +1405,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1436,7 +1437,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1465,6 +1466,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -1497,7 +1529,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1530,7 +1562,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1559,7 +1591,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1591,7 +1623,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1624,7 +1656,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1655,7 +1687,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1687,7 +1719,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1721,7 +1753,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1751,7 +1783,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1783,7 +1815,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1813,7 +1845,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1846,7 +1878,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1877,7 +1909,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1908,7 +1940,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1940,7 +1972,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1973,7 +2005,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2006,7 +2038,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2039,7 +2071,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2069,7 +2101,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2102,7 +2134,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2135,7 +2167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2167,7 +2199,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2199,7 +2231,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2232,7 +2264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2264,7 +2296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2294,7 +2326,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2325,7 +2357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2357,7 +2389,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2387,7 +2419,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2420,7 +2452,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2452,7 +2484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2485,7 +2517,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2518,7 +2550,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2548,7 +2580,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2581,7 +2613,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2613,7 +2645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2645,7 +2677,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2676,7 +2708,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2707,7 +2739,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2739,7 +2771,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2771,7 +2803,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2804,7 +2836,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2837,7 +2869,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2869,7 +2901,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2900,7 +2932,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2934,7 +2966,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2966,7 +2998,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2998,7 +3030,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3028,7 +3060,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3062,7 +3094,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3096,7 +3128,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3128,7 +3160,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -3162,7 +3194,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3195,7 +3227,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3225,7 +3257,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3257,7 +3289,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3290,7 +3322,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3322,7 +3354,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3354,7 +3386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3388,7 +3420,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3419,7 +3451,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3451,7 +3483,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3483,7 +3515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3513,7 +3545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3545,7 +3577,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -3560,15 +3592,14 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-30 14:09:02.393746",
- "modified_by": "Administrator",
+ "modified": "2018-05-17 12:55:20.008156", 
+ "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3588,7 +3619,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3608,7 +3638,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3628,7 +3657,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index cce5d19..f258546 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -14,6 +14,7 @@
 from erpnext.buying.utils import validate_for_items, check_for_closed_status
 from erpnext.stock.utils import get_bin
 from six import string_types
+from erpnext.stock.doctype.item.item import get_item_defaults
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -210,6 +211,8 @@
 		self.update_prevdoc_status()
 		self.update_requested_qty()
 		self.update_ordered_qty()
+		self.validate_budget()
+
 		if self.is_subcontracted == "Yes":
 			self.update_reserved_qty_for_subcontract()
 
@@ -372,9 +375,9 @@
 		target.base_amount = target.amount * flt(source_parent.conversion_rate)
 		target.qty = target.amount / flt(obj.rate) if (flt(obj.rate) and flt(obj.billed_amt)) else flt(obj.qty)
 
-		item = frappe.db.get_value("Item", target.item_code, ["item_group", "buying_cost_center"], as_dict=1)
+		item = get_item_defaults(target.item_code, source_parent.company)
 		target.cost_center = frappe.db.get_value("Project", obj.project, "cost_center") \
-			or item.buying_cost_center \
+			or item.get("buying_cost_center") \
 			or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 
 	doc = get_mapped_doc("Purchase Order", source_name,	{
@@ -445,6 +448,7 @@
 							'qty': rm_item_data["qty"],
 							'from_warehouse': rm_item_data["warehouse"],
 							'stock_uom': rm_item_data["stock_uom"],
+							'main_item_code': rm_item_data["item_code"],
 							'allow_alternative_item': item_wh[rm_item_code].get('allow_alternative_item')
 						}
 					}
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
index d57b0e2..cce4b27 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -6,7 +6,7 @@
 		'non_standard_fieldnames': {
 			'Journal Entry': 'reference_name',
 			'Payment Entry': 'reference_name',
-			'Subscription': 'reference_document'
+			'Auto Repeat': 'reference_document'
 		},
 		'internal_links': {
 			'Material Request': ['items', 'material_request'],
@@ -24,7 +24,7 @@
 			},
 			{
 				'label': _('Reference'),
-				'items': ['Material Request', 'Supplier Quotation', 'Project', 'Subscription']
+				'items': ['Material Request', 'Supplier Quotation', 'Project', 'Auto Repeat']
 			},
 			{
 				'label': _('Sub-contracting'),
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 873fc74..0d46318 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -5,6 +5,7 @@
 import unittest
 import frappe
 import frappe.defaults
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from frappe.utils import flt, add_days, nowdate
 from erpnext.buying.doctype.purchase_order.purchase_order import (make_purchase_receipt, make_purchase_invoice, make_rm_stock_entry as make_subcontract_transfer_entry)
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
@@ -163,6 +164,77 @@
 
 		self.assertTrue(po.get('payment_schedule'))
 
+	def test_po_for_blocked_supplier_all(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.save()
+
+		self.assertEqual(supplier.hold_type, 'All')
+		self.assertRaises(frappe.ValidationError, create_purchase_order)
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_po_for_blocked_supplier_invoices(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Invoices'
+		supplier.save()
+
+		self.assertRaises(frappe.ValidationError, create_purchase_order)
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_po_for_blocked_supplier_payments(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.hold_type = 'Payments'
+		supplier.save()
+
+		po = create_purchase_order()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Order', dn=po.name, bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_po_for_blocked_supplier_payments_with_today_date(self):
+		supplier = frappe.get_doc('Supplier', '_Test Supplier')
+		supplier.on_hold = 1
+		supplier.release_date = nowdate()
+		supplier.hold_type = 'Payments'
+		supplier.save()
+
+		po = create_purchase_order()
+
+		self.assertRaises(
+			frappe.ValidationError, get_payment_entry, dt='Purchase Order', dn=po.name, bank_account="_Test Bank - _TC")
+
+		supplier.on_hold = 0
+		supplier.save()
+
+	def test_po_for_blocked_supplier_payments_past_date(self):
+		# this test is meant to fail only if something fails in the try block
+		with self.assertRaises(Exception):
+			try:
+				supplier = frappe.get_doc('Supplier', '_Test Supplier')
+				supplier.on_hold = 1
+				supplier.hold_type = 'Payments'
+				supplier.release_date = '2018-03-01'
+				supplier.save()
+
+				po = create_purchase_order()
+				get_payment_entry('Purchase Order', po.name, bank_account='_Test Bank - _TC')
+
+				supplier.on_hold = 0
+				supplier.save()
+			except:
+				pass
+			else:
+				raise Exception
+
 	def test_terms_does_not_copy(self):
 		po = create_purchase_order()
 
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index de87e04..2ff8075 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -61,11 +61,11 @@
 			fields: [
 				{	"fieldtype": "Select", "label": __("Get Suppliers By"),
 					"fieldname": "search_type",
-					"options": "Tag\nSupplier Type", "reqd": 1 },
-				{	"fieldtype": "Link", "label": __("Supplier Type"),
-					"fieldname": "supplier_type",
-					"options": "Supplier Type",	"reqd": 0,
-					"depends_on": "eval:doc.search_type == 'Supplier Type'"},
+					"options": "Tag\nSupplier Group", "reqd": 1 },
+				{	"fieldtype": "Link", "label": __("Supplier Group"),
+					"fieldname": "supplier_group",
+					"options": "Supplier Group",	"reqd": 0,
+					"depends_on": "eval:doc.search_type == 'Supplier Group'"},
 				{	"fieldtype": "Data", "label": __("Tag"),
 					"fieldname": "tag",	"reqd": 0,
 					"depends_on": "eval:doc.search_type == 'Tag'" },
@@ -121,14 +121,14 @@
 					},
 					callback: load_suppliers
 				});
-			} else if (args.supplier_type) {
+			} else if (args.supplier_group) {
 				return frappe.call({
 					method: "frappe.client.get_list",
 					args: {
 						doctype: "Supplier",
 						order_by: "name",
 						fields: ["name"],
-						filters: [["Supplier", "supplier_type", "=", args.supplier_type]]
+						filters: [["Supplier", "supplier_group_name", "=", args.supplier_group]]
 
 					},
 					callback: load_suppliers
diff --git a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
index 7eb741f..dbd9f02 100644
--- a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
@@ -56,7 +56,7 @@
 		frappe.delete_doc_if_exists("Supplier", "_Test Supplier '1", force=1)
 		supplier = frappe.new_doc("Supplier")
 		supplier.supplier_name = "_Test Supplier '1"
-		supplier.supplier_type = "_Test Supplier Type"
+		supplier.supplier_group = "_Test Supplier Group"
 		supplier.insert()
 
 		rfq = make_request_for_quotation(supplier_wt_appos)
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
index a7ae8a6..6833a4a 100644
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -715,7 +715,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
index 4babbe9..61ad336 100644
--- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +106,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -135,6 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -166,6 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -198,6 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -227,6 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -235,6 +242,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "supplier.supplier_name",
    "fieldname": "supplier_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -247,7 +255,7 @@
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "supplier.supplier_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -258,6 +266,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -266,6 +275,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 3, 
+   "fetch_from": "contact.email_id",
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -278,7 +288,7 @@
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "contact.email_id", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -289,6 +299,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -319,6 +330,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -332,7 +344,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-07-26 22:25:58.096584", 
+ "modified": "2018-05-16 22:43:30.212408",
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation Supplier", 
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 7fae7b9..d9032c8 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -4,6 +4,9 @@
 frappe.ui.form.on("Supplier", {
 	setup: function (frm) {
 		frm.set_query('default_price_list', { 'buying': 1 });
+		if (frm.doc.__islocal == 1) {
+			frm.set_value("represents_company", "");
+		}
 		frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
 			var d = locals[cdt][cdn];
 			return {
@@ -45,4 +48,13 @@
 			erpnext.utils.set_party_dashboard_indicators(frm);
 		}
 	},
+
+	is_internal_supplier: function(frm) {
+		if (frm.doc.is_internal_supplier == 1) {
+			frm.toggle_reqd("represents_company", true);
+		}
+		else {
+			frm.toggle_reqd("represents_company", false);
+		}
+	}
 });
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index efaec83..52b6778 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -43,6 +43,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -75,6 +76,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -106,6 +108,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -137,6 +140,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -167,6 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -175,6 +180,71 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_internal_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Internal Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_internal_supplier", 
+   "fieldname": "represents_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Represents Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "image", 
    "fieldtype": "Attach Image", 
    "hidden": 1, 
@@ -197,6 +267,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -234,7 +306,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "supplier_type", 
+   "fieldname": "supplier_group",
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -243,12 +315,12 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
-   "label": "Supplier Type", 
+   "label": "Supplier Group",
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier_type", 
    "oldfieldtype": "Link", 
-   "options": "Supplier Type", 
+   "options": "Supplier Group",
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -258,6 +330,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -289,6 +362,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -320,6 +394,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -350,6 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -380,6 +456,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -410,6 +487,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -440,6 +518,72 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "represents_company", 
+   "fieldname": "allowed_to_transact_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allowed To Transact With", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "represents_company", 
+   "fieldname": "companies", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allowed To Transact With", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Allowed To Transact With", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -470,6 +614,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -500,6 +645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -529,6 +675,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -559,6 +706,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -589,6 +737,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -621,6 +770,135 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "on_hold", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Block Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.on_hold", 
+   "fieldname": "hold_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hold Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nAll\nInvoices\nPayments", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.on_hold", 
+   "description": "Leave blank if the Supplier is blocked indefinitely", 
+   "fieldname": "release_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Release Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -653,6 +931,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -682,6 +961,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -710,6 +990,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -740,6 +1021,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -770,6 +1052,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -802,6 +1085,70 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "default_tax_withholding_config", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Tax Withholding Config", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_withholding_config", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Withholding Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Party Tax Withholding Config", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -832,6 +1179,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -864,6 +1212,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -896,6 +1245,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_30", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -926,6 +1306,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -941,7 +1322,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-26 04:50:15.317590", 
+ "modified": "2018-05-16 15:15:19.912308", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
@@ -950,7 +1331,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -970,7 +1350,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -990,7 +1369,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1010,7 +1388,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1030,7 +1407,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1050,7 +1426,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1070,7 +1445,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1092,7 +1466,7 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "supplier_name, supplier_type", 
+ "search_fields": "supplier_name, supplier_group",
  "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "title_field": "supplier_name", 
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 6aa3b01..b6d588e 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -10,6 +10,7 @@
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
 
+
 class Supplier(TransactionBase):
 	def get_feed(self):
 		return self.supplier_name
@@ -19,6 +20,13 @@
 		load_address_and_contact(self)
 		self.load_dashboard_info()
 
+	def before_save(self):
+		if not self.on_hold:
+			self.hold_type = ''
+			self.release_date = ''
+		elif self.on_hold and not self.hold_type:
+			self.hold_type = 'All'
+
 	def load_dashboard_info(self):
 		info = get_dashboard_info(self.doctype, self.name)
 		self.set_onload('dashboard_info', info)
@@ -35,7 +43,7 @@
 			self.naming_series = ''
 
 	def validate(self):
-		#validation for Naming Series mandatory field...
+		# validation for Naming Series mandatory field...
 		if frappe.defaults.get_global_default('supp_master_name') == 'Naming Series':
 			if not self.naming_series:
 				msgprint(_("Series is mandatory"), raise_exception=1)
diff --git a/erpnext/buying/doctype/supplier/supplier_list.js b/erpnext/buying/doctype/supplier/supplier_list.js
index ab25d2c..c776b00 100644
--- a/erpnext/buying/doctype/supplier/supplier_list.js
+++ b/erpnext/buying/doctype/supplier/supplier_list.js
@@ -1,3 +1,8 @@
 frappe.listview_settings['Supplier'] = {
-	add_fields: ["supplier_name", "supplier_type", "image"],
+	add_fields: ["supplier_name", "supplier_group", "image", "on_hold"],
+	get_indicator: function(doc) {
+		if(cint(doc.on_hold)) {
+			return [__("On Hold"), "red"];
+		}
+	}
 };
diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json
index 2536721..9c01989 100644
--- a/erpnext/buying/doctype/supplier/test_records.json
+++ b/erpnext/buying/doctype/supplier/test_records.json
@@ -2,39 +2,39 @@
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier With Template 1",
-  "supplier_type": "_Test Supplier Type",
+  "supplier_group": "_Test Supplier Group",
   "payment_terms": "_Test Payment Term Template 3"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier P",
-  "supplier_type": "_Test Supplier Type"
+  "supplier_group": "_Test Supplier Group"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier with Country",
-  "supplier_type": "_Test Supplier Type",
+  "supplier_group": "_Test Supplier Group",
   "country": "Greece"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier",
-  "supplier_type": "_Test Supplier Type"
+  "supplier_group": "_Test Supplier Group"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier 1",
-  "supplier_type": "_Test Supplier Type"
+  "supplier_group": "_Test Supplier Group"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier 2",
-  "supplier_type": "_Test Supplier Type"
+  "supplier_group": "_Test Supplier Group"
  },
  {
   "doctype": "Supplier",
   "supplier_name": "_Test Supplier USD",
-  "supplier_type": "_Test Supplier Type",
+  "supplier_group": "_Test Supplier Group",
   "accounts": [{
     "company": "_Test Company",
     "account": "_Test Payable USD - _TC"
diff --git a/erpnext/buying/doctype/supplier/test_supplier.js b/erpnext/buying/doctype/supplier/test_supplier.js
index 51e3c09..bf7c192 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.js
+++ b/erpnext/buying/doctype/supplier/test_supplier.js
@@ -7,7 +7,7 @@
 		() => {
 			return frappe.tests.make('Supplier', [
 				{supplier_name: 'Test Supplier'},
-				{supplier_type: 'Hardware'},
+				{supplier_group: 'Hardware'},
 				{country: 'India'},
 				{default_currency: 'INR'},
 				{accounts: [
@@ -66,7 +66,7 @@
 
 		() => {
 			assert.ok(cur_frm.doc.supplier_name == 'Test Supplier', "Name correct");
-			assert.ok(cur_frm.doc.supplier_type == 'Hardware', "Type correct");
+			assert.ok(cur_frm.doc.supplier_group == 'Hardware', "Type correct");
 			assert.ok(cur_frm.doc.default_currency == 'INR', "Currency correct");
 			assert.ok(cur_frm.doc.accounts[0].account == 'Creditors - '+frappe.get_abbr('For Testing'), " Account Head abbr correct");
 			assert.ok($('.address-box:nth-child(3) p').text().includes('Shipping City 3'), "Address correct");
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index 16dda5c..2211db7 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -36,14 +36,14 @@
 
         frappe.db.set_value("Supplier", "_Test Supplier With Template 1", "payment_terms", "")
 
-        # Set credit limit for the supplier type instead of supplier and evaluate the due date
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "_Test Payment Term Template 3")
+        # Set credit limit for the supplier group instead of supplier and evaluate the due date
+        frappe.db.set_value("Supplier Group", "_Test Supplier Group", "payment_terms", "_Test Payment Term Template 3")
 
         due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
         self.assertEqual(due_date, "2016-02-21")
 
-        # Payment terms for Supplier Type instead of supplier and evaluate the due date
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "_Test Payment Term Template 1")
+        # Payment terms for Supplier Group instead of supplier and evaluate the due date
+        frappe.db.set_value("Supplier Group", "_Test Supplier Group", "payment_terms", "_Test Payment Term Template 1")
 
         # Leap year
         due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier With Template 1")
@@ -53,7 +53,7 @@
         self.assertEqual(due_date, "2017-02-28")
 
         # Supplier with no default Payment Terms Template
-        frappe.db.set_value("Supplier Type", "_Test Supplier Type", "payment_terms", "")
+        frappe.db.set_value("Supplier Group", "_Test Supplier Group", "payment_terms", "")
         frappe.db.set_value("Supplier", "_Test Supplier", "payment_terms", "")
 
         due_date = get_due_date("2016-01-22", "Supplier", "_Test Supplier")
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 722c2d2..27f24bf 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -40,7 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,7 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,7 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -139,7 +139,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -148,6 +148,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "supplier.supplier_name",
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -160,7 +161,7 @@
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "supplier.supplier_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -170,7 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -201,7 +202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -235,7 +236,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -268,7 +269,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -302,7 +303,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -333,7 +334,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -364,7 +365,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -395,7 +396,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -425,7 +426,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -455,7 +456,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -485,7 +486,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -516,7 +517,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -547,7 +548,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -580,7 +581,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -614,7 +615,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -644,7 +645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -676,7 +677,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -708,7 +709,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -740,7 +741,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -770,7 +771,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -802,7 +803,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -835,7 +836,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -867,7 +868,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -896,6 +897,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -928,7 +960,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -961,7 +993,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -990,7 +1022,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1022,7 +1054,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1055,7 +1087,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1086,7 +1118,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1118,7 +1150,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1152,7 +1184,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1182,7 +1214,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1214,7 +1246,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1244,7 +1276,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1277,7 +1309,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1308,7 +1340,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1339,7 +1371,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1371,7 +1403,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1404,7 +1436,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1437,7 +1469,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1470,7 +1502,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1500,7 +1532,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1533,7 +1565,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1566,7 +1598,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1598,7 +1630,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1630,7 +1662,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1663,7 +1695,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1695,7 +1727,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1725,7 +1757,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1756,7 +1788,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1788,7 +1820,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1818,7 +1850,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1851,7 +1883,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1883,7 +1915,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1916,7 +1948,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1949,7 +1981,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1979,7 +2011,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2012,7 +2044,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2044,7 +2076,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2076,7 +2108,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2109,7 +2141,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2142,7 +2174,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2174,7 +2206,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2205,7 +2237,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2238,7 +2270,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2247,6 +2279,65 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Group same items",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_72",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2271,7 +2362,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2302,7 +2393,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2333,7 +2424,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2365,7 +2456,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2397,7 +2488,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2430,7 +2521,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2459,7 +2550,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2491,7 +2582,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2522,7 +2613,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2554,7 +2645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -2570,7 +2661,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-03-10 07:37:33.662363", 
+ "modified": "2018-05-28 02:45:48.616334", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -2578,7 +2669,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -2598,7 +2688,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -2618,7 +2707,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -2638,7 +2726,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -2658,7 +2745,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
index 4321f27..0387437 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
@@ -4,7 +4,7 @@
 	return {
 		'fieldname': 'supplier_quotation',
 		'non_standard_fieldnames': {
-			'Subscription': 'reference_document'
+			'Auto Repeat': 'reference_document'
 		},
 		'internal_links': {
 			'Material Request': ['items', 'material_request'],
@@ -22,7 +22,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index 442a8bb..06764a3 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -19,7 +19,7 @@
 			title: __("Purchase Analytics"),
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
-			doctypes: ["Item", "Item Group", "Supplier", "Supplier Type", "Company", "Fiscal Year",
+			doctypes: ["Item", "Item Group", "Supplier", "Supplier Group", "Company", "Fiscal Year",
 				"Purchase Invoice", "Purchase Invoice Item",
 				"Purchase Order", "Purchase Order Item[Purchase Analytics]",
 				"Purchase Receipt", "Purchase Receipt Item[Purchase Analytics]"],
@@ -27,11 +27,11 @@
 		});
 
 		this.tree_grids = {
-			"Supplier Type": {
-				label: __("Supplier Type / Supplier"),
+			"Supplier Group": {
+				label: __("Supplier Group / Supplier"),
 				show: true,
 				item_key: "supplier",
-				parent_field: "parent_supplier_type",
+				parent_field: "parent_supplier_group",
 				formatter: function(item) {
 					return item.supplier_name ? item.supplier_name + " (" + item.name + ")" : item.name;
 				}
@@ -77,7 +77,7 @@
 	},
 	filters: [
 		{fieldtype:"Select", label: __("Tree Type"), fieldname: "tree_type",
-			options:["Supplier Type", "Supplier", "Item Group", "Item"],
+			options:["Supplier Group", "Supplier", "Item Group", "Item"],
 			filter: function(val, item, opts, me) {
 				return me.apply_zero_filter(val, item, opts, me);
 			}},
@@ -110,22 +110,10 @@
 		var me = this;
 		if (!this.tl) {
 			// add 'Not Set' Supplier & Item
-			// Add 'All Supplier Types' Supplier Type
 			// (Supplier / Item are not mandatory!!)
-			// Set parent supplier type for tree view
-
-			$.each(frappe.report_dump.data["Supplier Type"], function(i, v) {
-				v['parent_supplier_type'] = __("All Supplier Types")
-			})
-
-			frappe.report_dump.data["Supplier Type"] = [{
-				name: __("All Supplier Types"),
-				id: "All Supplier Types",
-			}].concat(frappe.report_dump.data["Supplier Type"]);
-
 			frappe.report_dump.data["Supplier"].push({
 				name: __("Not Set"),
-				parent_supplier_type: __("All Supplier Types"),
+				parent_supplier_group: __("All Supplier Groups"),
 				id: "Not Set",
 			});
 
@@ -142,14 +130,15 @@
 
 
 		if(!this.data || me.item_type != me.tree_type) {
+			var items;
 			if(me.tree_type=='Supplier') {
-				var items = frappe.report_dump.data["Supplier"];
-			} if(me.tree_type=='Supplier Type') {
-				var items = this.prepare_tree("Supplier", "Supplier Type");
+				items = frappe.report_dump.data["Supplier"];
+			} else if(me.tree_type=='Supplier Group') {
+				items = this.prepare_tree("Supplier", "Supplier Group");
 			} else if(me.tree_type=="Item Group") {
-				var items = this.prepare_tree("Item", "Item Group");
+				items = this.prepare_tree("Item", "Item Group");
 			} else if(me.tree_type=="Item") {
-				var items = frappe.report_dump.data["Item"];
+				items = frappe.report_dump.data["Item"];
 			}
 
 			me.item_type = me.tree_type
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 088a119..a534421 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -34,8 +34,8 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Subscription",
-					"label": _("Subscription"),
+					"name": "Auto Repeat",
+					"label": _("Auto Repeat"),
 					"description": _("To make recurring documents")
 				},
 				{
@@ -128,6 +128,12 @@
 					"doctype": "GL Entry",
 					"is_query_report": True
 				},
+				{
+					"type": "report",
+					"name": "Consolidated Financial Statement",
+					"doctype": "GL Entry",
+					"is_query_report": True
+				},
 			]
 		},
 		{
@@ -453,6 +459,12 @@
 					"is_query_report": True,
 					"name": "Sales Payment Summary",
 					"doctype": "Sales Invoice"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Address And Contacts",
+					"doctype": "Address"
 				}
 			]
 		},
diff --git a/erpnext/config/assets.py b/erpnext/config/assets.py
index 73c1aee..d52f142 100644
--- a/erpnext/config/assets.py
+++ b/erpnext/config/assets.py
@@ -12,6 +12,10 @@
 				},
 				{
 					"type": "doctype",
+					"name": "Location",
+				},
+				{
+					"type": "doctype",
 					"name": "Asset Category",
 				},
 				{
@@ -41,6 +45,10 @@
 				},
 				{
 					"type": "doctype",
+					"name": "Asset Adjustment",
+				},
+				{
+					"type": "doctype",
 					"name": "Asset Repair",
 				},
 			]
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index ba29125..270519e 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -39,8 +39,8 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Supplier Type",
-					"description": _("Supplier Type master.")
+					"name": "Supplier Group",
+					"description": _("Supplier Group master.")
 				},
 				{
 					"type": "doctype",
@@ -198,13 +198,13 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Addresses And Contacts",
+					"name": "Address And Contacts",
 					"label": "Supplier Addresses And Contacts",
 					"doctype": "Address",
 					"route_options": {
 						"party_type": "Supplier"
 					}
-				},
+				}
 			]
 		},
 		{
diff --git a/erpnext/config/erpnext_integrations.py b/erpnext/config/erpnext_integrations.py
index 88c4779..e27b7cd 100644
--- a/erpnext/config/erpnext_integrations.py
+++ b/erpnext/config/erpnext_integrations.py
@@ -25,6 +25,11 @@
 				{
 					"type": "doctype",
 					"name": "Woocommerce Settings"
+				},
+				{
+					"type": "doctype",
+					"name": "Shopify Settings",
+					"description": _("Connect Shopify with ERPNext"),
 				}
 			]
 		}
diff --git a/erpnext/config/healthcare.py b/erpnext/config/healthcare.py
index 4e8bb48..f1339a7 100644
--- a/erpnext/config/healthcare.py
+++ b/erpnext/config/healthcare.py
@@ -33,6 +33,11 @@
 					"type": "page",
 					"name": "appointment-analytic",
 					"label": _("Appointment Analytics"),
+				},
+				{
+					"type": "doctype",
+					"name": "Clinical Procedure",
+					"label": _("Clinical Procedure"),
 				}
 			]
 		},
@@ -89,8 +94,8 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Patient Service Unit",
-					"label": _("Patient Service Unit")
+					"name": "Healthcare Service Unit",
+					"label": _("Healthcare Service Unit")
 				}
 			]
 		},
@@ -157,6 +162,11 @@
 					"type": "doctype",
 					"name": "Lab Test Template",
 					"label": _("Lab Test Template")
+				},
+				{
+					"type": "doctype",
+					"name": "Clinical Procedure Template",
+					"label": _("Clinical Procedure Template"),
 				}
 			]
 		}
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 4cd1b14..7ead572 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -9,46 +9,25 @@
 				{
 					"type": "doctype",
 					"name": "Employee",
-					"description": _("Employee records."),
 				},
 				{
 					"type": "doctype",
 					"name": "Employee Attendance Tool",
-					"label": _("Employee Attendance Tool"),
-					"description":_("Mark Attendance for multiple employees"),
 					"hide_count": True
 				},
 				{
 					"type": "doctype",
 					"name": "Attendance",
-					"description": _("Attendance record."),
+				},
+				{
+					"type": "doctype",
+					"name": "Attendance Request",
 				},
 				{
 					"type": "doctype",
 					"name": "Upload Attendance",
-					"description":_("Upload attendance from a .csv file"),
 					"hide_count": True
-				},
-			]
-		},
-		{
-			"label": _("Recruitment"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Job Applicant",
-					"description": _("Applicant for a Job."),
-				},
-				{
-					"type": "doctype",
-					"name": "Job Opening",
-					"description": _("Opening for a Job."),
-				},
-				{
-					"type": "doctype",
-					"name": "Job Offer",
-					"description": _("Offer candidate a Job."),
-				},
+				}
 			]
 		},
 		{
@@ -56,37 +35,40 @@
 			"items": [
 				{
 					"type": "doctype",
+					"name": "Leave Period",
+				},
+				{
+					"type": "doctype",
+					"name": "Leave Policy",
+				},
+				{
+					"type": "doctype",
 					"name": "Leave Application",
-					"description": _("Applications for leave."),
-				},
-				{
-					"type": "doctype",
-					"name":"Leave Type",
-					"description": _("Type of leaves like casual, sick etc."),
-				},
-				{
-					"type": "doctype",
-					"name": "Holiday List",
-					"description": _("Holiday master.")
 				},
 				{
 					"type": "doctype",
 					"name": "Leave Allocation",
-					"description": _("Allocate leaves for a period.")
 				},
 				{
 					"type": "doctype",
-					"name": "Leave Control Panel",
-					"label": _("Leave Allocation Tool"),
-					"description":_("Allocate leaves for the year."),
-					"hide_count": True
+					"name": "Compensatory Leave Request",
+				},
+				{
+					"type": "doctype",
+					"name": "Leave Encashment",
+				},
+				{
+					"type": "doctype",
+					"name":"Leave Type",
+				},
+				{
+					"type": "doctype",
+					"name": "Holiday List",
 				},
 				{
 					"type": "doctype",
 					"name": "Leave Block List",
-					"description": _("Block leave applications by department.")
 				},
-
 			]
 		},
 		{
@@ -94,47 +76,89 @@
 			"items": [
 				{
 					"type": "doctype",
+					"name": "Salary Structure Assignment",
+				},
+				{
+					"type": "doctype",
 					"name": "Salary Slip",
-					"description": _("Monthly salary statement."),
 				},
 				{
 					"type": "doctype",
-					"name": "Payroll Entry",
-					"label": _("Payroll Entry"),
-					"description":_("Generate Salary Slips"),
-					"hide_count": True
+					"name": "Payroll Entry"
 				},
 				{
 					"type": "doctype",
-					"name": "Salary Structure",
-					"description": _("Salary template master.")
+					"name": "Employee Benefit Application",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Benefit Claim",
+				},
+				{
+					"type": "doctype",
+					"name": "Additional Salary",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Declaration",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Proof Submission",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Incentive",
+				},
+				{
+					"type": "doctype",
+					"name": "Retention Bonus",
+				},
+			]
+		},
+		{
+			"label": _("Payroll Setup"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Payroll Period",
 				},
 				{
 					"type": "doctype",
 					"name": "Salary Component",
-					"label": _("Salary Components"),
-					"description": _("Earnings, Deductions and other Salary components")
 				},
-
+				{
+					"type": "doctype",
+					"name": "Salary Structure",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Category",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Sub Category"
+				}
 			]
 		},
 		{
-			"label": _("Expense Claims"),
+			"label": _("Travel and Expense Claim"),
 			"items": [
 				{
 					"type": "doctype",
 					"name": "Employee Advance",
-					"description": _("Manage advance amount given to the Employee"),
 				},
 				{
 					"type": "doctype",
 					"name": "Expense Claim",
-					"description": _("Claims for company expense."),
 				},
 				{
 					"type": "doctype",
 					"name": "Expense Claim Type",
-					"description": _("Types of Expense Claim.")
+				},
+				{
+					"type": "doctype",
+					"name": "Travel Request",
 				},
 			]
 		},
@@ -144,12 +168,10 @@
 				{
 					"type": "doctype",
 					"name": "Appraisal",
-					"description": _("Performance appraisal."),
 				},
 				{
 					"type": "doctype",
 					"name": "Appraisal Template",
-					"description": _("Template for performance appraisals.")
 				},
 				{
 					"type": "page",
@@ -165,12 +187,10 @@
 				{
 					"type": "doctype",
 					"name": "Loan Type",
-					"description": _("Define various loan types")
 				},
 				{
 					"type": "doctype",
 					"name": "Loan Application",
-					"description": _("Loan Application")
 				},
 				{
 					"type": "doctype",
@@ -179,6 +199,44 @@
 			]
 		},
 		{
+			"label": _("Employee Lifecycle"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Employee Transfer",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Promotion",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Separation"
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Onboarding"
+				}
+			]
+		},
+		{
+			"label": _("Recruitment"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Job Applicant",
+				},
+				{
+					"type": "doctype",
+					"name": "Job Opening",
+				},
+				{
+					"type": "doctype",
+					"name": "Job Offer",
+				},
+			]
+		},
+		{
 			"label": _("Training"),
 			"items": [
 				{
@@ -199,7 +257,23 @@
 				},
 			]
 		},
-
+		{
+			"label": _("Shift Management"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Shift Type",
+				},
+				{
+					"type": "doctype",
+					"name": "Shift Request",
+				},
+				{
+					"type": "doctype",
+					"name": "Shift Assignment",
+				}
+			]
+		},
 		{
 			"label": _("Fleet Management"),
 			"items": [
@@ -220,27 +294,26 @@
 				{
 					"type": "doctype",
 					"name": "HR Settings",
-					"description": _("Settings for HR Module")
 				},
 				{
 					"type": "doctype",
 					"name": "Employment Type",
-					"description": _("Types of employment (permanent, contract, intern etc.).")
 				},
 				{
 					"type": "doctype",
 					"name": "Branch",
-					"description": _("Organization branch master.")
 				},
 				{
 					"type": "doctype",
 					"name": "Department",
-					"description": _("Organization unit (department) master.")
 				},
 				{
 					"type": "doctype",
 					"name": "Designation",
-					"description": _("Employee designation (e.g. CEO, Director etc.).")
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Grade",
 				},
 				{
 					"type": "doctype",
@@ -248,7 +321,11 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Health Insurance"
+					"name": "Employee Health Insurance"
+				},
+				{
+					"type": "doctype",
+					"name": "Staffing Plan",
 				}
 			]
 		},
@@ -320,5 +397,16 @@
 					"youtube_id": "5SZHJF--ZFY"
 				}
 			]
+		},
+		{
+			"label": _("Analytics"),
+			"items": [
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Department Analytics",
+					"doctype": "Employee"
+				},
+			]
 		}
 	]
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index b48cafc..029fdac 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -120,7 +120,7 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Addresses And Contacts",
+					"name": "Address And Contacts",
 					"label": _("Sales Partner Addresses And Contacts"),
 					"doctype": "Address",
 					"route_options": {
@@ -230,7 +230,7 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Addresses And Contacts",
+					"name": "Address And Contacts",
 					"label": _("Customer Addresses And Contacts"),
 					"doctype": "Address",
 					"route_options": {
@@ -285,6 +285,12 @@
 					"name": "Customer Credit Balance",
 					"doctype": "Customer"
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Customers Without Any Sales Transactions",
+					"doctype": "Customer"
+				},
 			]
 		},
 		{
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 878b2f2..e38b30d 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -81,12 +81,6 @@
 					"type": "doctype",
 					"name": "Authorization Rule",
 					"description": _("Create rules to restrict transactions based on values.")
-				},
-				{
-					"type": "doctype",
-					"name": "Notification Control",
-					"label": _("Email Notifications"),
-					"description": _("Automatically compose message on submission of transactions.")
 				}
 			]
 		},
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 31a3f6c..76be942 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 from frappe import _, throw
-from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate, add_days, add_months, get_last_day
+from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate, add_days, add_months, get_last_day, nowdate
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.accounts.utils import get_fiscal_years, validate_fiscal_year, get_account_currency
 from erpnext.utilities.transaction_base import TransactionBase
@@ -13,7 +13,7 @@
 from erpnext.exceptions import InvalidCurrency
 from six import text_type
 
-force_item_fields = ("item_group", "brand", "stock_uom")
+force_item_fields = ("item_group", "brand", "stock_uom", "is_fixed_asset")
 
 class AccountsController(TransactionBase):
 	def __init__(self, *args, **kwargs):
@@ -36,10 +36,29 @@
 			if self.doctype in relevant_docs:
 				self.set_payment_schedule()
 
+	def ensure_supplier_is_not_blocked(self):
+		is_supplier_payment = self.doctype == 'Payment Entry' and self.party_type == 'Supplier'
+		is_buying_invoice = self.doctype in ['Purchase Invoice', 'Purchase Order']
+		supplier = None
+		supplier_name = None
+
+		if is_buying_invoice or is_supplier_payment:
+			supplier_name = self.supplier if is_buying_invoice else self.party
+			supplier = frappe.get_doc('Supplier', supplier_name)
+
+		if supplier and supplier_name and supplier.on_hold:
+			if (is_buying_invoice and supplier.hold_type in ['All', 'Invoices']) or \
+					(is_supplier_payment and supplier.hold_type in ['All', 'Payments']):
+				if not supplier.release_date or getdate(nowdate()) <= supplier.release_date:
+					frappe.msgprint(
+						_('{0} is blocked so this transaction cannot proceed'.format(supplier_name)), raise_exception=1)
+
 	def validate(self):
 		if self.get("_action") and self._action != "update_after_submit":
 			self.set_missing_values(for_validate=True)
 
+		self.ensure_supplier_is_not_blocked()
+
 		self.validate_date_with_fiscal_year()
 
 		if self.meta.get_field("currency"):
@@ -83,7 +102,8 @@
 			self.validate_non_invoice_documents_schedule()
 
 	def before_print(self):
-		if self.doctype in ['Purchase Order', 'Sales Order']:
+		if self.doctype in ['Purchase Order', 'Sales Order', 'Sales Invoice', 'Purchase Invoice',
+			'Supplier Quotation', 'Purchase Receipt', 'Delivery Note', 'Quotation']:
 			if self.get("group_same_items"):
 				self.group_similar_items()
 
@@ -148,8 +168,13 @@
 
 		if self.meta.get_field("currency"):
 			# price list part
-			fieldname = "selling_price_list" if buying_or_selling.lower() == "selling" \
-				else "buying_price_list"
+			if buying_or_selling.lower() == "selling":
+				fieldname = "selling_price_list"
+				args = "for_selling"
+			else:
+				fieldname = "buying_price_list"
+				args = "for_buying"
+
 			if self.meta.get_field(fieldname) and self.get(fieldname):
 				self.price_list_currency = frappe.db.get_value("Price List",
 					self.get(fieldname), "currency")
@@ -159,7 +184,7 @@
 
 				elif not self.plc_conversion_rate:
 					self.plc_conversion_rate = get_exchange_rate(self.price_list_currency,
-						self.company_currency, transaction_date)
+						self.company_currency, transaction_date, args)
 
 			# currency
 			if not self.currency:
@@ -169,7 +194,7 @@
 				self.conversion_rate = 1.0
 			elif not self.conversion_rate:
 				self.conversion_rate = get_exchange_rate(self.currency,
-					self.company_currency, transaction_date)
+					self.company_currency, transaction_date, args)
 
 	def set_missing_item_details(self, for_validate=False):
 		"""set missing item values"""
@@ -272,15 +297,16 @@
 	def get_gl_dict(self, args, account_currency=None):
 		"""this method populates the common properties of a gl entry record"""
 
-		fiscal_years = get_fiscal_years(self.posting_date, company=self.company)
+		posting_date = args.get('posting_date') or self.get('posting_date')
+		fiscal_years = get_fiscal_years(posting_date, company=self.company)
 		if len(fiscal_years) > 1:
-			frappe.throw(_("Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year").format(formatdate(self.posting_date)))
+			frappe.throw(_("Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year").format(formatdate(posting_date)))
 		else:
 			fiscal_year = fiscal_years[0][0]
 
 		gl_dict = frappe._dict({
 			'company': self.company,
-			'posting_date': self.posting_date,
+			'posting_date': posting_date,
 			'fiscal_year': fiscal_year,
 			'voucher_type': self.doctype,
 			'voucher_no': self.name,
@@ -596,43 +622,39 @@
 	def validate_fixed_asset(self):
 		for d in self.get("items"):
 			if d.is_fixed_asset:
-				if d.qty > 1:
-					frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
+				# if d.qty > 1:
+# 					frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
 
-				if d.meta.get_field("asset"):
-					if not d.asset:
-						frappe.throw(_("Row #{0}: Asset is mandatory for fixed asset purchase/sale")
-							.format(d.idx))
-					else:
-						asset = frappe.get_doc("Asset", d.asset)
+				if d.meta.get_field("asset") and d.asset:
+					asset = frappe.get_doc("Asset", d.asset)
 
-						if asset.company != self.company:
-							frappe.throw(_("Row #{0}: Asset {1} does not belong to company {2}")
-								.format(d.idx, d.asset, self.company))
+					if asset.company != self.company:
+						frappe.throw(_("Row #{0}: Asset {1} does not belong to company {2}")
+							.format(d.idx, d.asset, self.company))
 
-						elif asset.item_code != d.item_code:
-							frappe.throw(_("Row #{0}: Asset {1} does not linked to Item {2}")
-								.format(d.idx, d.asset, d.item_code))
+					elif asset.item_code != d.item_code:
+						frappe.throw(_("Row #{0}: Asset {1} does not linked to Item {2}")
+							.format(d.idx, d.asset, d.item_code))
 
-						elif asset.docstatus != 1:
-							frappe.throw(_("Row #{0}: Asset {1} must be submitted").format(d.idx, d.asset))
+					# elif asset.docstatus != 1:
+# 						frappe.throw(_("Row #{0}: Asset {1} must be submitted").format(d.idx, d.asset))
 
-						elif self.doctype == "Purchase Invoice":
-							if asset.status != "Submitted":
-								frappe.throw(_("Row #{0}: Asset {1} is already {2}")
-									.format(d.idx, d.asset, asset.status))
-							elif getdate(asset.purchase_date) != getdate(self.posting_date):
-								frappe.throw(_("Row #{0}: Posting Date must be same as purchase date {1} of asset {2}").format(d.idx, asset.purchase_date, d.asset))
-							elif asset.is_existing_asset:
-								frappe.throw(_("Row #{0}: Purchase Invoice cannot be made against an existing asset {1}").format(d.idx, d.asset))
+					elif self.doctype == "Purchase Invoice":
+						# if asset.status != "Submitted":
+# 							frappe.throw(_("Row #{0}: Asset {1} is already {2}")
+# 								.format(d.idx, d.asset, asset.status))
+						if getdate(asset.purchase_date) != getdate(self.posting_date):
+							frappe.throw(_("Row #{0}: Posting Date must be same as purchase date {1} of asset {2}").format(d.idx, asset.purchase_date, d.asset))
+						elif asset.is_existing_asset:
+							frappe.throw(_("Row #{0}: Purchase Invoice cannot be made against an existing asset {1}").format(d.idx, d.asset))
 
-						elif self.docstatus=="Sales Invoice" and self.docstatus == 1:
-							if self.update_stock:
-								frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
+					elif self.docstatus=="Sales Invoice" and self.docstatus == 1:
+						if self.update_stock:
+							frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
 
-							elif asset.status in ("Scrapped", "Cancelled", "Sold"):
-								frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}")
-									.format(d.idx, d.asset, asset.status))
+						elif asset.status in ("Scrapped", "Cancelled", "Sold"):
+							frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}")
+								.format(d.idx, d.asset, asset.status))
 
 	def delink_advance_entries(self, linked_doc_name):
 		total_allocated_amount = 0
@@ -663,6 +685,7 @@
 			if item.item_code in group_item_qty:
 				item.qty = group_item_qty[item.item_code]
 				item.amount = group_item_amount[item.item_code]
+				item.rate = flt(flt(item.amount)/flt(item.qty), item.precision("rate"))
 				del group_item_qty[item.item_code]
 			else:
 				duplicate_list.append(item)
@@ -710,7 +733,7 @@
 			if self.doctype == "Sales Order" and getdate(d.due_date) < getdate(self.transaction_date):
 				frappe.throw(_("Row {0}: Due Date cannot be before posting date").format(d.idx))
 			elif d.due_date in dates:
-				li.append('{0} in row {1}'.format(d.due_date, d.idx))
+				li.append(_("{0} in row {1}").format(d.due_date, d.idx))
 			dates.append(d.due_date)
 
 		if li:
@@ -967,3 +990,18 @@
 	elif term.due_date_based_on == "Month(s) after the end of the invoice month":
 		due_date = add_months(get_last_day(date), term.credit_months)
 	return due_date
+
+
+def get_supplier_block_status(party_name):
+	"""
+	Returns a dict containing the values of `on_hold`, `release_date` and `hold_type` of
+	a `Supplier`
+	"""
+	supplier = frappe.get_doc('Supplier', party_name)
+	info = {
+		'on_hold': supplier.on_hold,
+		'release_date': supplier.release_date,
+		'hold_type': supplier.hold_type
+	}
+	return info
+
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index de6ed79..bbe1a12 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -11,7 +11,9 @@
 from erpnext.buying.utils import validate_for_items, update_last_purchase_rate
 from erpnext.stock.stock_ledger import get_valuation_rate
 from erpnext.stock.doctype.stock_entry.stock_entry import get_used_alternative_items
+from erpnext.stock.doctype.serial_no.serial_no import get_auto_serial_nos, auto_make_serial_nos, get_serial_nos
 
+from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
 from erpnext.controllers.stock_controller import StockController
 
 class BuyingController(StockController):
@@ -72,13 +74,14 @@
 	def set_supplier_from_item_default(self):
 		if self.meta.get_field("supplier") and not self.supplier:
 			for d in self.get("items"):
-				supplier = frappe.db.get_value("Item", d.item_code, "default_supplier")
+				supplier = frappe.db.get_value("Item Default",
+					{"parent": d.item_code, "company": self.company}, "default_supplier")
 				if supplier:
 					self.supplier = supplier
 					break
 
 	def validate_stock_or_nonstock_items(self):
-		if self.meta.get_field("taxes") and not self.get_stock_items():
+		if self.meta.get_field("taxes") and not self.get_stock_items() and not self.get_asset_items():
 			tax_for_valuation = [d for d in self.get("taxes")
 				if d.category in ["Valuation", "Valuation and Total"]]
 
@@ -87,6 +90,12 @@
 					d.category = 'Total'
 				msgprint(_('Tax Category has been changed to "Total" because all the Items are non-stock items'))
 
+	def get_asset_items(self):
+		if self.doctype not in ['Purchase Invoice', 'Purchase Receipt']:
+			return []
+
+		return [d.item_code for d in self.items if d.is_fixed_asset]
+
 	def set_landed_cost_voucher_amount(self):
 		for d in self.get("items"):
 			lc_voucher_data = frappe.db.sql("""select sum(applicable_charges), cost_center
@@ -111,7 +120,7 @@
 
 			TODO: rename item_tax_amount to valuation_tax_amount
 		"""
-		stock_items = self.get_stock_items()
+		stock_items = self.get_stock_items() + self.get_asset_items()
 
 		stock_items_qty, stock_items_amount = 0, 0
 		last_stock_item_idx = 1
@@ -177,16 +186,22 @@
 	def create_raw_materials_supplied(self, raw_material_table):
 		if self.is_subcontracted=="Yes":
 			parent_items = []
-			for item in self.get("items"):
-				if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
-					item.rm_supp_cost = 0.0
-				if item.bom and item.item_code in self.sub_contracted_items:
-					self.update_raw_materials_supplied(item, raw_material_table)
+			backflush_raw_materials_based_on = frappe.db.get_single_value("Buying Settings",
+				"backflush_raw_materials_of_subcontract_based_on")
+			if (self.doctype == 'Purchase Receipt' and
+				backflush_raw_materials_based_on != 'BOM'):
+				self.update_raw_materials_supplied_based_on_stock_entries(raw_material_table)
+			else:
+				for item in self.get("items"):
+					if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
+						item.rm_supp_cost = 0.0
+					if item.bom and item.item_code in self.sub_contracted_items:
+						self.update_raw_materials_supplied_based_on_bom(item, raw_material_table)
 
-					if [item.item_code, item.name] not in parent_items:
-						parent_items.append([item.item_code, item.name])
+						if [item.item_code, item.name] not in parent_items:
+							parent_items.append([item.item_code, item.name])
 
-			self.cleanup_raw_materials_supplied(parent_items, raw_material_table)
+				self.cleanup_raw_materials_supplied(parent_items, raw_material_table)
 
 		elif self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
 			for item in self.get("items"):
@@ -195,7 +210,43 @@
 		if self.is_subcontracted == "No" and self.get("supplied_items"):
 			self.set('supplied_items', [])
 
-	def update_raw_materials_supplied(self, item, raw_material_table):
+	def update_raw_materials_supplied_based_on_stock_entries(self, raw_material_table):
+		self.set(raw_material_table, [])
+		purchase_orders = [d.purchase_order for d in self.items]
+		if purchase_orders:
+			items = get_subcontracted_raw_materials_from_se(purchase_orders)
+			backflushed_raw_materials = get_backflushed_subcontracted_raw_materials_from_se(purchase_orders, self.name)
+
+			for d in items:
+				qty = d.qty - backflushed_raw_materials.get(d.item_code, 0)
+				rm = self.append(raw_material_table, {})
+				rm.rm_item_code = d.item_code
+				rm.item_name = d.item_name
+				rm.main_item_code = d.main_item_code
+				rm.description = d.description
+				rm.stock_uom = d.stock_uom
+				rm.required_qty = qty
+				rm.consumed_qty = qty
+				rm.serial_no = d.serial_no
+				rm.batch_no = d.batch_no
+
+				# get raw materials rate
+				from erpnext.stock.utils import get_incoming_rate
+				rm.rate = get_incoming_rate({
+					"item_code": d.item_code,
+					"warehouse": self.supplier_warehouse,
+					"posting_date": self.posting_date,
+					"posting_time": self.posting_time,
+					"qty": -1 * qty,
+					"serial_no": rm.serial_no
+				})
+				if not rm.rate:
+					rm.rate = get_valuation_rate(d.item_code, self.supplier_warehouse,
+						self.doctype, self.name, currency=self.company_currency, company = self.company)
+
+				rm.amount = qty * flt(rm.rate)
+
+	def update_raw_materials_supplied_based_on_bom(self, item, raw_material_table):
 		exploded_item = 1
 		if hasattr(item, 'include_exploded_items'):
 			exploded_item = item.get('include_exploded_items')
@@ -208,8 +259,10 @@
 
 		raw_materials_cost = 0
 		items = list(set([d.item_code for d in bom_items]))
-		item_wh = frappe._dict(frappe.db.sql("""select item_code, default_warehouse
-			from `tabItem` where name in ({0})""".format(", ".join(["%s"] * len(items))), items))
+		item_wh = frappe._dict(frappe.db.sql("""select i.item_code, id.default_warehouse
+			from `tabItem` i, `tabItem Default` id
+			where id.parent=i.name and id.company=%s and i.name in ({0})"""
+			.format(", ".join(["%s"] * len(items))), [self.company] + items))
 
 		for bom_item in bom_items:
 			if self.doctype == "Purchase Order":
@@ -439,6 +492,12 @@
 		if self.get('is_return'):
 			return
 
+		if self.doctype in ['Purchase Receipt', 'Purchase Invoice']:
+			field = 'purchase_invoice' if self.doctype == 'Purchase Invoice' else 'purchase_receipt'
+
+			self.process_fixed_asset()
+			self.update_fixed_asset(field)
+
 		update_last_purchase_rate(self, is_submit = 1)
 
 	def on_cancel(self):
@@ -446,6 +505,145 @@
 			return
 
 		update_last_purchase_rate(self, is_submit = 0)
+		if self.doctype in ['Purchase Receipt', 'Purchase Invoice']:
+			field = 'purchase_invoice' if self.doctype == 'Purchase Invoice' else 'purchase_receipt'
+
+			self.delete_linked_asset()
+			self.update_fixed_asset(field, delete_asset=True)
+
+	def validate_budget(self):
+		if self.docstatus == 1:
+			for data in self.get('items'):
+				validate_expense_against_budget({
+					'item_code': data.item_code,
+					'item_group': data.item_group,
+					'posting_date': data.schedule_date,
+					'project': data.project,
+					'doctype': self.doctype
+				}, self.company)
+
+	def process_fixed_asset(self):
+		if self.doctype == 'Purchase Invoice' and not self.update_stock:
+			return
+
+		asset_items = self.get_asset_items()
+		if asset_items:
+			self.make_serial_nos_for_asset(asset_items)
+
+	def make_serial_nos_for_asset(self, asset_items):
+		items_data = get_asset_item_details(asset_items)
+
+		for d in self.items:
+			if d.is_fixed_asset:
+				item_data = items_data.get(d.item_code)
+				if not d.asset:
+					asset = self.make_asset(d)
+					d.db_set('asset', asset)
+
+				if item_data.get('has_serial_no'):
+					# If item has serial no
+					if item_data.get('serial_no_series') and not d.serial_no:
+						serial_nos = get_auto_serial_nos(item_data.get('serial_no_series'), d.qty)
+					elif d.serial_no:
+						serial_nos = d.serial_no
+					elif not d.serial_no:
+						frappe.throw(_("Serial no is mandatory for the item {0}").format(d.item_code))
+
+					auto_make_serial_nos({
+						'serial_no': serial_nos,
+						'item_code': d.item_code,
+						'via_stock_ledger': False,
+						'company': self.company,
+						'actual_qty': d.qty,
+						'purchase_document_type': self.doctype,
+						'purchase_document_no': self.name,
+						'asset': d.asset
+					})
+					d.db_set('serial_no', serial_nos)
+
+				if d.asset:
+					self.make_asset_movement(d)
+
+	def make_asset(self, row):
+		if not row.asset_location:
+			frappe.throw(_("Row {0}: Enter location for the asset item {1}").format(row.idx, row.item_code))
+
+		item_data = frappe.db.get_value('Item',
+			row.item_code, ['asset_naming_series', 'asset_category'], as_dict=1)
+
+		purchase_amount = flt(row.base_net_amount + row.item_tax_amount)
+		asset = frappe.get_doc({
+			'doctype': 'Asset',
+			'item_code': row.item_code,
+			'asset_name': row.item_name,
+			'status': 'Receipt',
+			'naming_series': item_data.get('asset_naming_series') or 'AST',
+			'asset_category': item_data.get('asset_category'),
+			'location': row.asset_location,
+			'company': self.company,
+			'purchase_date': self.posting_date,
+			'calculate_depreciation': 1,
+			'purchase_receipt_amount': purchase_amount,
+			'gross_purchase_amount': purchase_amount,
+			'purchase_receipt': self.name if self.doctype == 'Purchase Receipt' else None,
+			'purchase_invoice': self.name if self.doctype == 'Purchase Invoice' else None
+		})
+
+		asset.flags.ignore_validate = True
+		asset.flags.ignore_mandatory = True
+		asset.set_missing_values()
+		asset.insert()
+
+		frappe.msgprint(_("Asset {0} created").format(asset.name))
+		return asset.name
+
+	def make_asset_movement(self, row):
+		asset_movement = frappe.get_doc({
+			'doctype': 'Asset Movement',
+			'asset': row.asset,
+			'target_location': row.asset_location,
+			'purpose': 'Receipt',
+			'serial_no': row.serial_no,
+			'quantity': len(get_serial_nos(row.serial_no)),
+			'company': self.company,
+			'transaction_date': self.posting_date,
+			'reference_doctype': self.doctype,
+			'reference_name': self.name
+		}).insert()
+
+		return asset_movement.name
+
+	def update_fixed_asset(self, field, delete_asset = False):
+		for d in self.get("items"):
+			if d.is_fixed_asset and d.asset:
+				asset = frappe.get_doc("Asset", d.asset)
+
+				if delete_asset and asset.docstatus == 0:
+					frappe.delete_doc("Asset", asset.name)
+					d.db_set('asset', None)
+					continue
+
+				if self.docstatus in [0, 1] and not asset.get(field):
+					asset.set(field, self.name)
+					asset.purchase_date = self.posting_date
+					asset.supplier = self.supplier
+				elif self.docstatus == 2:
+					asset.set(field, None)
+					asset.supplier = None
+
+				asset.flags.ignore_validate_update_after_submit = True
+				asset.flags.ignore_mandatory = True
+				if asset.docstatus == 0:
+					asset.flags.ignore_validate = True
+
+				asset.save()
+
+	def delete_linked_asset(self):
+		if self.doctype == 'Purchase Invoice' and not self.get('update_stock'):
+			return
+
+		frappe.db.sql("delete from `tabAsset Movement` where reference_name=%s and docstatus = 0", self.name)
+		frappe.db.sql("delete from `tabSerial No` where purchase_document_no=%s", self.name)
 
 	def validate_schedule_date(self):
 		if not self.schedule_date:
@@ -480,3 +678,34 @@
 		msgprint(_("Specified BOM {0} does not exist for Item {1}").format(bom, item_code), raise_exception=1)
 
 	return bom_items
+
+def get_subcontracted_raw_materials_from_se(purchase_orders):
+	return frappe.db.sql("""
+		select
+			sed.item_name, sed.item_code, sum(sed.qty) as qty, sed.description,
+			sed.stock_uom, sed.subcontracted_item as main_item_code, sed.serial_no, sed.batch_no
+		from `tabStock Entry` se,`tabStock Entry Detail` sed
+		where
+			se.name = sed.parent and se.docstatus=1 and se.purpose='Subcontract'
+			and se.purchase_order= (%s) and ifnull(sed.t_warehouse, '') != ''
+		group by sed.item_code, sed.t_warehouse
+	""" % (','.join(['%s'] * len(purchase_orders))), tuple(purchase_orders), as_dict=1)
+
+def get_backflushed_subcontracted_raw_materials_from_se(purchase_orders, purchase_receipt):
+	return frappe._dict(frappe.db.sql("""
+		select
+			prsi.rm_item_code as item_code, sum(prsi.consumed_qty) as qty
+		from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pri, `tabPurchase Receipt Item Supplied` prsi
+		where
+			pr.name = pri.parent and pr.name = prsi.parent and pri.purchase_order= (%s)
+			and pri.item_code = prsi.main_item_code and pr.name != '%s'
+		group by prsi.rm_item_code
+	""" % (','.join(['%s'] * len(purchase_orders)), purchase_receipt), tuple(purchase_orders)))
+
+def get_asset_item_details(asset_items):
+	asset_items_data = {}
+	for d in frappe.get_all('Item', fields = ["name", "has_serial_no", "serial_no_series"],
+		filters = {'name': ('in', asset_items)}):
+		asset_items_data.setdefault(d.name, d)
+
+	return asset_items_data
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index fd13c13..a54cf7d 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -102,9 +102,9 @@
 def supplier_query(doctype, txt, searchfield, start, page_len, filters):
 	supp_master_name = frappe.defaults.get_user_default("supp_master_name")
 	if supp_master_name == "Supplier Name":
-		fields = ["name", "supplier_type"]
+		fields = ["name", "supplier_group"]
 	else:
-		fields = ["name", "supplier_name", "supplier_type"]
+		fields = ["name", "supplier_name", "supplier_group"]
 	fields = ", ".join(fields)
 
 	return frappe.db.sql("""select {field} from `tabSupplier`
@@ -157,9 +157,10 @@
 		# scan description only if items are less than 50000
 		description_cond = 'or tabItem.description LIKE %(txt)s'
 
-	return frappe.db.sql("""select tabItem.name, tabItem.item_group,
+	return frappe.db.sql("""select tabItem.name,
 		if(length(tabItem.item_name) > 40,
 			concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
+		tabItem.item_group,
 		if(length(tabItem.description) > 40, \
 			concat(substr(tabItem.description, 1, 40), "..."), description) as decription
 		from tabItem
@@ -168,6 +169,7 @@
 			and tabItem.disabled=0
 			and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
 			and (tabItem.`{key}` LIKE %(txt)s
+				or tabItem.item_code LIKE %(txt)s
 				or tabItem.item_group LIKE %(txt)s
 				or tabItem.item_name LIKE %(txt)s
 				or tabItem.item_code IN (select parent from `tabItem Barcode` where barcode LIKE %(txt)s
@@ -365,7 +367,7 @@
 
 	return frappe.db.sql("""select tabAccount.name from `tabAccount`
 		where (tabAccount.report_type = "Profit and Loss"
-				or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary"))
+				or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed"))
 			and tabAccount.is_group=0
 			and tabAccount.docstatus!=2
 			and tabAccount.{key} LIKE %(txt)s
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 2a22b32..4a358a4 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -340,10 +340,21 @@
 def check_active_sales_items(obj):
 	for d in obj.get("items"):
 		if d.item_code:
-			item = frappe.db.sql("""select docstatus,
-				income_account from tabItem where name = %s""",
-				d.item_code, as_dict=True)[0]
+			item = frappe.db.sql("""select i.docstatus, id.income_account
+				from `tabItem` i, `tabItem Default` id
+				where i.name=%s and id.parent=i.name and id.company=%s""",
+				(d.item_code, obj.company), as_dict=True)
 
-			if getattr(d, "income_account", None) and not item.income_account:
-				frappe.db.set_value("Item", d.item_code, "income_account",
-					d.income_account)
+			if getattr(d, "income_account", None):
+				doc = frappe.get_doc("Item", d.item_code)
+				if item and not item[0].income_account:
+					for default in doc.item_defaults:
+						if default.company == obj.company:
+							default.income_account = d.income_account
+							break
+				elif not item:
+					doc.append("item_defaults", {
+						"company": obj.company,
+						"income_account": d.income_account
+					})
+				doc.save()
\ No newline at end of file
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 8b0ea3e..31c034d 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -33,6 +33,10 @@
 				items, warehouses = self.get_items_and_warehouses()
 				update_gl_entries_after(self.posting_date, self.posting_time, warehouses, items,
 					warehouse_account)
+		elif self.doctype in ['Purchase Receipt', 'Purchase Invoice']:
+			gl_entries = []
+			gl_entries = self.get_asset_gl_entry(gl_entries)
+			make_gl_entries(gl_entries, from_repost=from_repost)
 
 	def get_gl_entries(self, warehouse_account=None, default_expense_account=None,
 			default_cost_center=None):
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 5ecff3f..a595b4b 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -38,6 +38,7 @@
 		self.manipulate_grand_total_for_inclusive_tax()
 		self.calculate_totals()
 		self._cleanup()
+		self.calculate_total_net_weight()
 
 	def validate_conversion_rate(self):
 		# validate conversion rate
@@ -164,9 +165,10 @@
 			return tax.rate
 
 	def calculate_net_total(self):
-		self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = 0.0
+		self.doc.total_qty = self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = 0.0
 		for item in self.doc.get("items"):
 			self.doc.total += item.amount
+			self.doc.total_qty += item.qty
 			self.doc.base_total += item.base_amount
 			self.doc.net_total += item.net_amount
 			self.doc.base_net_total += item.base_net_amount
@@ -328,6 +330,13 @@
 
 		self.set_rounded_total()
 
+	def calculate_total_net_weight(self):
+		if self.doc.meta.get_field('total_net_weight'):
+			self.doc.total_net_weight = 0.0
+			for d in self.doc.items:
+				if d.total_weight:
+					self.doc.total_net_weight += d.total_weight
+
 	def set_rounded_total(self):
 		if self.doc.meta.get_field("rounded_total"):
 			if self.doc.is_rounded_total_disabled():
@@ -518,10 +527,8 @@
 			if item.pricing_rule and not self.doc.ignore_pricing_rule:
 				pricing_rule = frappe.get_doc('Pricing Rule', item.pricing_rule)
 
-				if pricing_rule.margin_type == 'Amount' and pricing_rule.currency == self.doc.currency:
-					item.margin_type = pricing_rule.margin_type
-					item.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
-				elif pricing_rule.margin_type == 'Percentage':
+				if (pricing_rule.margin_type == 'Amount' and pricing_rule.currency == self.doc.currency)\
+						or (pricing_rule.margin_type == 'Percentage'):
 					item.margin_type = pricing_rule.margin_type
 					item.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
 				else:
@@ -567,7 +574,8 @@
 			itemised_tax=itemised_tax,
 			itemised_taxable_amount=itemised_taxable_amount,
 			tax_accounts=tax_accounts,
-			company_currency=erpnext.get_company_currency(doc.company)
+			conversion_rate=doc.conversion_rate,
+			currency=doc.currency
 		)
 	)
 
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index ef698c2..28a8fdd 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -235,16 +235,16 @@
 		based_on_details["addl_tables"] = ''
 
 	elif based_on == 'Supplier':
-		based_on_details["based_on_cols"] = ["Supplier:Link/Supplier:120", "Supplier Type:Link/Supplier Type:140"]
-		based_on_details["based_on_select"] = "t1.supplier, t3.supplier_type,"
+		based_on_details["based_on_cols"] = ["Supplier:Link/Supplier:120", "Supplier Group:Link/Supplier Group:140"]
+		based_on_details["based_on_select"] = "t1.supplier, t3.supplier_group,"
 		based_on_details["based_on_group_by"] = 't1.supplier'
 		based_on_details["addl_tables"] = ',`tabSupplier` t3'
 		based_on_details["addl_tables_relational_cond"] = " and t1.supplier = t3.name"
 
-	elif based_on == 'Supplier Type':
-		based_on_details["based_on_cols"] = ["Supplier Type:Link/Supplier Type:140"]
-		based_on_details["based_on_select"] = "t3.supplier_type,"
-		based_on_details["based_on_group_by"] = 't3.supplier_type'
+	elif based_on == 'Supplier Group':
+		based_on_details["based_on_cols"] = ["Supplier Group:Link/Supplier Group:140"]
+		based_on_details["based_on_select"] = "t3.supplier_group,"
+		based_on_details["based_on_group_by"] = 't3.supplier_group'
 		based_on_details["addl_tables"] = ',`tabSupplier` t3'
 		based_on_details["addl_tables_relational_cond"] = " and t1.supplier = t3.name"
 
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index fc886ac..5c203d9 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -227,7 +227,7 @@
 			exchange_rate = 1
 		else:
 			exchange_rate = get_exchange_rate(quotation.currency, company_currency,
-				quotation.transaction_date)
+				quotation.transaction_date, args="for_selling")
 
 		quotation.conversion_rate = exchange_rate
 
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 1e96976..ef2945b 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -64,6 +64,7 @@
 
 	opp_doc = frappe.get_doc({
 		"doctype": "Opportunity",
+		"company": args.company or "_Test Company",
 		"enquiry_from": args.enquiry_from or "Customer",
 		"opportunity_type": "Sales",
 		"with_items": args.with_items or 0,
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 0845d42..ee7c1e3 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -407,7 +407,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/demo/data/item.json b/erpnext/demo/data/item.json
index 6974b94..908de15 100644
--- a/erpnext/demo/data/item.json
+++ b/erpnext/demo/data/item.json
@@ -1,7 +1,9 @@
 [
  {
   "default_supplier": "Asiatic Solutions",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "For Upper Bearing",
   "image": "/assets/erpnext_demo/images/disc.png",
   "item_code": "Disc Collars",
@@ -10,7 +12,9 @@
  },
  {
   "default_supplier": "Nan Duskin",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "CAST IRON, MCMASTER PART NO. 3710T13",
   "image": "/assets/erpnext_demo/images/bearing.jpg",
   "item_code": "Bearing Block",
@@ -19,7 +23,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Wind Mill C Series for Commercial Use 18ft",
   "image": "/assets/erpnext_demo/images/wind-turbine-2.png",
   "item_code": "Wind MIll C Series",
@@ -28,7 +34,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Wind Mill A Series for Home Use 9ft",
   "image": "/assets/erpnext_demo/images/wind-turbine.png",
   "item_code": "Wind Mill A Series",
@@ -37,7 +45,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->",
   "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
   "item_code": "Wind Turbine",
@@ -51,7 +61,9 @@
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1.5 in. Diameter x 36 in. Mild Steel Tubing",
   "image": null,
   "item_code": "Bearing Pipe",
@@ -60,7 +72,9 @@
  },
  {
   "default_supplier": "New World Realty",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1/32 in. x 24 in. x 47 in. HDPE Opaque Sheet",
   "image": null,
   "item_code": "Wing Sheet",
@@ -69,7 +83,9 @@
  },
  {
   "default_supplier": "Eagle Hardware",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "3/16 in. x 6 in. x 6 in. Low Carbon Steel Plate",
   "image": null,
   "item_code": "Upper Bearing Plate",
@@ -78,7 +94,9 @@
  },
  {
   "default_supplier": "Asiatic Solutions",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "Bearing Assembly",
   "image": null,
   "item_code": "Bearing Assembly",
@@ -87,7 +105,9 @@
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "3/4 in. x 2 ft. x 4 ft. Pine Plywood",
   "image": null,
   "item_code": "Base Plate",
@@ -97,7 +117,9 @@
  },
  {
   "default_supplier": "Scott Ties",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "N/A",
   "image": null,
   "item_code": "Stand",
@@ -106,7 +128,9 @@
  },
  {
   "default_supplier": "Eagle Hardware",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1 in. x 3 in. x 1 ft. Multipurpose Al Alloy Bar",
   "image": null,
   "item_code": "Bearing Collar",
@@ -115,7 +139,9 @@
  },
  {
   "default_supplier": "Eagle Hardware",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1/4 in. x 6 in. x 6 in. Mild Steel Plate",
   "image": null,
   "item_code": "Base Bearing Plate",
@@ -124,7 +150,9 @@
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "15/32 in. x 4 ft. x 8 ft. 3-Ply Rtd Sheathing",
   "image": null,
   "item_code": "External Disc",
@@ -133,7 +161,9 @@
  },
  {
   "default_supplier": "Eagle Hardware",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1.25 in. Diameter x 6 ft. Mild Steel Tubing",
   "image": null,
   "item_code": "Shaft",
@@ -142,7 +172,9 @@
  },
  {
   "default_supplier": "Ks Merchandise",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "1/2 in. x 2 ft. x 4 ft. Pine Plywood",
   "image": null,
   "item_code": "Blade Rib",
@@ -151,7 +183,9 @@
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "For Bearing Collar",
   "image": null,
   "item_code": "Internal Disc",
@@ -160,7 +194,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Small</p>",
   "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
   "item_code": "Wind Turbine-S",
@@ -177,7 +213,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Medium</p>",
   "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
   "item_code": "Wind Turbine-M",
@@ -194,7 +232,9 @@
  },
  {
   "default_supplier": null,
-  "default_warehouse": "Finished Goods",
+  "item_defaults": [{
+      "default_warehouse": "Finished Goods"
+  }],
   "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Large</p>",
   "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
   "item_code": "Wind Turbine-L",
@@ -218,7 +258,9 @@
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "3/4 in. x 2 ft. x 4 ft. Pine Plywood",
   "image": null,
   "item_code": "Base Plate Un Painted",
@@ -284,7 +326,9 @@
   "has_batch_no": 1,
   "create_new_batch": 1,
   "valuation_rate": 200,
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores"
+  }],
   "description": "Corrugated Box",
   "item_code": "Corrugated Box",
   "item_name": "Corrugated Box",
diff --git a/erpnext/demo/data/item_education.json b/erpnext/demo/data/item_education.json
index 077fcaa..40e4701 100644
--- a/erpnext/demo/data/item_education.json
+++ b/erpnext/demo/data/item_education.json
@@ -1,63 +1,90 @@
 [
  {
   "default_supplier": "Asiatic Solutions",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Books",
   "item_group": "Raw Material",
   "item_name": "Books"
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Pencil",
   "item_group": "Raw Material",
   "item_name": "Pencil"
  },
  {
   "default_supplier": "New World Realty",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Tables",
   "item_group": "Raw Material",
   "item_name": "Tables"
  },
  {
   "default_supplier": "Eagle Hardware",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Chair",
   "item_group": "Raw Material",
   "item_name": "Chair"
  },
  {
   "default_supplier": "Asiatic Solutions",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Black Board",
   "item_group": "Sub Assemblies",
   "item_name": "Black Board"
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Chalk",
   "item_group": "Raw Material",
   "item_name": "Chalk"
  },
  {
   "default_supplier": "HomeBase",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Notepad",
   "item_group": "Raw Material",
   "item_name": "Notepad"
  },
  {
   "default_supplier": "Ks Merchandise",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "item_code": "Uniform",
   "item_group": "Raw Material",
   "item_name": "Uniform"
  },
  {
   "is_stock_item": 0,
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "description": "Computer",
   "item_code": "Computer",
   "item_name": "Computer",
@@ -65,7 +92,10 @@
  },
  {
   "is_stock_item": 0,
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "description": "Mobile",
   "item_code": "Mobile",
   "item_name": "Mobile",
@@ -73,7 +103,10 @@
  },
  {
   "is_stock_item": 0,
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "description": "ERP",
   "item_code": "ERP",
   "item_name": "ERP",
@@ -81,15 +114,20 @@
  },
  {
   "is_stock_item": 0,
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+      "default_warehouse": "Stores",
+      "company": "Whitmore College"
+  }],
   "description": "Autocad",
   "item_code": "Autocad",
   "item_name": "Autocad",
   "item_group": "All Item Groups"
  },
  {
-  "default_warehouse": "Stores",
-  "default_warehouse": "Stores",
+  "item_defaults": [{
+        "default_warehouse": "Stores",
+        "company": "Whitmore College"
+  }],
   "item_code": "Service",
   "item_group": "Services",
   "item_name": "Service",
diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py
index 2a894f7..0403c06 100644
--- a/erpnext/demo/setup/education.py
+++ b/erpnext/demo/setup/education.py
@@ -36,7 +36,8 @@
 		item = frappe.new_doc('Item')
 		item.update(i)
 		item.min_order_qty = random.randint(10, 30)
-		item.default_warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)[0].name
+		item.item_defaults[0].default_warehouse = frappe.get_all('Warehouse',
+			filters={'warehouse_name': item.item_defaults[0].default_warehouse}, limit=1)[0].name
 		item.insert()
 
 def make_student_applicants():
diff --git a/erpnext/demo/setup/manufacture.py b/erpnext/demo/setup/manufacture.py
index 4d8c450..4db510a 100644
--- a/erpnext/demo/setup/manufacture.py
+++ b/erpnext/demo/setup/manufacture.py
@@ -4,6 +4,7 @@
 import frappe
 from frappe.utils import nowdate, add_days
 from erpnext.demo.setup.setup_data import import_json
+from erpnext.demo.domains import data
 
 from six import iteritems
 
@@ -65,10 +66,11 @@
 	for i in items:
 		item = frappe.new_doc('Item')
 		item.update(i)
-		if item.default_warehouse:
-			warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)
+		if item.item_defaults[0].default_warehouse:
+			item.item_defaults[0].company = data.get("Manufacturing").get('company_name')
+			warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.item_defaults[0].default_warehouse}, limit=1)
 			if warehouse:
-				item.default_warehouse = warehouse[0].name
+				item.item_defaults[0].default_warehouse = warehouse[0].name
 		item.insert()
 
 def setup_product_bundle():
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 4ed4df9..41f24e1 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -138,20 +138,8 @@
 	import_json('Employee')
 
 def setup_salary_structure(employees, salary_slip_based_on_timesheet=0):
-	f = frappe.get_doc('Fiscal Year', frappe.defaults.get_global_default('fiscal_year'))
-
 	ss = frappe.new_doc('Salary Structure')
 	ss.name = "Sample Salary Structure - " + random_string(5)
-	for e in employees:
-		ss.append('employees', {
-			'employee': e.name,
-			'from_date': "2015-01-01",
-			'base': random.random() * 10000
-		})
-
-	ss.from_date = e.date_of_joining if (e.date_of_joining
-		and e.date_of_joining > f.year_start_date) else f.year_start_date
-	ss.to_date = f.year_end_date
 	ss.salary_slip_based_on_timesheet = salary_slip_based_on_timesheet
 
 	if salary_slip_based_on_timesheet:
@@ -179,6 +167,12 @@
 	})
 	ss.insert()
 
+	for e in employees:
+		sa  = frappe.new_doc("Salary Structure Assignment")
+		sa.employee = e.name
+		sa.from_date = "2015-01-01"
+		sa.base = random.random() * 10000
+
 	return ss
 
 def setup_user_roles():
@@ -241,10 +235,10 @@
 def setup_leave_allocation():
 	year = now_datetime().year
 	for employee in frappe.get_all('Employee', fields=['name']):
-		leave_types = frappe.get_all("Leave Type", fields=['name', 'max_days_allowed'])
+		leave_types = frappe.get_all("Leave Type", fields=['name', 'max_continuous_days_allowed'])
 		for leave_type in leave_types:
-			if not leave_type.max_days_allowed:
-				leave_type.max_days_allowed = 10
+			if not leave_type.max_continuous_days_allowed:
+				leave_type.max_continuous_days_allowed = 10
 
 		leave_allocation = frappe.get_doc({
 			"doctype": "Leave Allocation",
@@ -252,7 +246,7 @@
 			"from_date": "{0}-01-01".format(year),
 			"to_date": "{0}-12-31".format(year),
 			"leave_type": leave_type.name,
-			"new_leaves_allocated": random.randint(1, int(leave_type.max_days_allowed))
+			"new_leaves_allocated": random.randint(1, int(leave_type.max_continuous_days_allowed))
 		})
 		leave_allocation.insert()
 		leave_allocation.submit()
@@ -275,7 +269,7 @@
 		frappe.get_doc({
 			"doctype": "Supplier",
 			"supplier_name": s,
-			"supplier_type": random.choice(["Services", "Raw Material"]),
+			"supplier_group": random.choice(["Services", "Raw Material"]),
 		}).insert()
 
 def setup_warehouse():
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 6c6a7d4..b801686 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -105,10 +105,9 @@
 			and docstatus != 2""")
 	if sal_struct:
 		employees = frappe.db.sql("""
-				select employee from `tabSalary Structure Employee`
-				where parent IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True)
+				select employee from `tabSalary Structure Assignment`
+				where salary_structure IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True)
 		return employees
-
 	else:
 		return []
 
diff --git a/erpnext/demo/user/purchase.py b/erpnext/demo/user/purchase.py
index d9fc1f3..327f617 100644
--- a/erpnext/demo/user/purchase.py
+++ b/erpnext/demo/user/purchase.py
@@ -56,7 +56,7 @@
 	if company_currency == party_account_currency:
 		exchange_rate = 1
 	else:
-		exchange_rate = get_exchange_rate(party_account_currency, company_currency)
+		exchange_rate = get_exchange_rate(party_account_currency, company_currency, args="for_buying")
 
 	# make supplier quotations
 	if random.random() < 0.2:
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index 2fd2565..02e1d42 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -89,7 +89,7 @@
 		if company_currency == party_account_currency:
 			exchange_rate = 1
 		else:
-			exchange_rate = get_exchange_rate(party_account_currency, company_currency)
+			exchange_rate = get_exchange_rate(party_account_currency, company_currency, args="for_selling")
 
 		qtn = frappe.get_doc({
 			"creation": frappe.flags.current_date,
diff --git a/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation-submit.png b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation-submit.png
new file mode 100644
index 0000000..98f629f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation-submit.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation.png b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation.png
new file mode 100644
index 0000000..fbd584b
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/field_set_company.png b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/field_set_company.png
new file mode 100644
index 0000000..94484f6
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/field_set_company.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/journal-entry.png b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/journal-entry.png
new file mode 100644
index 0000000..cf204bb
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/exchange-rate-revaluation/journal-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/inter-company-jv-submit.png b/erpnext/docs/assets/img/accounts/inter-company-jv-submit.png
new file mode 100644
index 0000000..bde53da
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/inter-company-jv-submit.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/inter-company-jv.png b/erpnext/docs/assets/img/accounts/inter-company-jv.png
new file mode 100644
index 0000000..c8041fb
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/inter-company-jv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/internal-account.png b/erpnext/docs/assets/img/accounts/internal-account.png
new file mode 100644
index 0000000..eb990ac
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/internal-account.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/linked-jv.png b/erpnext/docs/assets/img/accounts/linked-jv.png
new file mode 100644
index 0000000..9f44486
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/linked-jv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/make-inter-company-invoice.png b/erpnext/docs/assets/img/accounts/make-inter-company-invoice.png
new file mode 100644
index 0000000..af55847
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/make-inter-company-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/make-internal-customer.png b/erpnext/docs/assets/img/accounts/make-internal-customer.png
new file mode 100644
index 0000000..cf7e040
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/make-internal-customer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/make-internal-supplier.png b/erpnext/docs/assets/img/accounts/make-internal-supplier.png
new file mode 100644
index 0000000..598eb65
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/make-internal-supplier.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/purchase-invoice-hold.png b/erpnext/docs/assets/img/accounts/purchase-invoice-hold.png
new file mode 100644
index 0000000..e87f9f5
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/purchase-invoice-hold.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/select-company-jv.png b/erpnext/docs/assets/img/accounts/select-company-jv.png
new file mode 100644
index 0000000..d005658
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/select-company-jv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-1.png b/erpnext/docs/assets/img/articles/allowance-percentage-1.png
deleted file mode 100644
index 4fbed90..0000000
--- a/erpnext/docs/assets/img/articles/allowance-percentage-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/allowance-percentage-2.png b/erpnext/docs/assets/img/articles/allowance-percentage-2.png
deleted file mode 100644
index a7b9688..0000000
--- a/erpnext/docs/assets/img/articles/allowance-percentage-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/limit-1.png b/erpnext/docs/assets/img/articles/limit-1.png
new file mode 100644
index 0000000..5e3cb27
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/limit-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/limit-2.png b/erpnext/docs/assets/img/articles/limit-2.png
new file mode 100644
index 0000000..ffa72b3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/limit-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/app_details.png b/erpnext/docs/assets/img/erpnext_integrations/app_details.png
new file mode 100644
index 0000000..3492eaa
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/app_details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/erp_configurations.png b/erpnext/docs/assets/img/erpnext_integrations/erp_configurations.png
new file mode 100644
index 0000000..12ff52d
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/erp_configurations.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/manage_private_apps.png b/erpnext/docs/assets/img/erpnext_integrations/manage_private_apps.png
new file mode 100644
index 0000000..62fbc73
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/manage_private_apps.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/menu_bar.png b/erpnext/docs/assets/img/erpnext_integrations/menu_bar.png
new file mode 100644
index 0000000..d69d0f7
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/menu_bar.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/sync_config.png b/erpnext/docs/assets/img/erpnext_integrations/sync_config.png
new file mode 100644
index 0000000..a6611c9
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/sync_config.png
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext_integrations/tax_config.png b/erpnext/docs/assets/img/erpnext_integrations/tax_config.png
new file mode 100644
index 0000000..3c6cc55
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext_integrations/tax_config.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/earned-leave.png b/erpnext/docs/assets/img/human-resources/earned-leave.png
new file mode 100644
index 0000000..8a365b6
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/earned-leave.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-grade.png b/erpnext/docs/assets/img/human-resources/employee-grade.png
new file mode 100644
index 0000000..931f6bf
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-grade.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-job-profile.png b/erpnext/docs/assets/img/human-resources/employee-job-profile.png
new file mode 100644
index 0000000..a0decd4
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-job-profile.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-leave-policy.png b/erpnext/docs/assets/img/human-resources/employee-leave-policy.png
new file mode 100644
index 0000000..d3427c2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-leave-policy.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-loan-application.png b/erpnext/docs/assets/img/human-resources/employee-loan-application.png
deleted file mode 100644
index 317de4f..0000000
--- a/erpnext/docs/assets/img/human-resources/employee-loan-application.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-loan.png b/erpnext/docs/assets/img/human-resources/employee-loan.png
deleted file mode 100644
index 19f3181..0000000
--- a/erpnext/docs/assets/img/human-resources/employee-loan.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-view.gif b/erpnext/docs/assets/img/human-resources/employee-view.gif
new file mode 100644
index 0000000..52633d0
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-view.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee.png b/erpnext/docs/assets/img/human-resources/employee.png
index ec2e70e..0120a76 100644
--- a/erpnext/docs/assets/img/human-resources/employee.png
+++ b/erpnext/docs/assets/img/human-resources/employee.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee_promotion.png b/erpnext/docs/assets/img/human-resources/employee_promotion.png
new file mode 100644
index 0000000..d9ca321
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee_promotion.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee_promotion_1.png b/erpnext/docs/assets/img/human-resources/employee_promotion_1.png
new file mode 100644
index 0000000..a0bc9cc
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee_promotion_1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee_transfer.png b/erpnext/docs/assets/img/human-resources/employee_transfer.png
new file mode 100644
index 0000000..edc641e
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee_transfer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee_transfer_1.png b/erpnext/docs/assets/img/human-resources/employee_transfer_1.png
new file mode 100644
index 0000000..f9f87e6
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee_transfer_1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-encashment.png b/erpnext/docs/assets/img/human-resources/leave-encashment.png
new file mode 100644
index 0000000..f537ddc
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-encashment.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-period-1.png b/erpnext/docs/assets/img/human-resources/leave-period-1.png
new file mode 100644
index 0000000..0079dbe
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-period-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-period-2.png b/erpnext/docs/assets/img/human-resources/leave-period-2.png
new file mode 100644
index 0000000..7d79133
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-period-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-period-grant.png b/erpnext/docs/assets/img/human-resources/leave-period-grant.png
new file mode 100644
index 0000000..f9193d0
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-period-grant.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/leave-policy.png b/erpnext/docs/assets/img/human-resources/leave-policy.png
new file mode 100644
index 0000000..6fdc686
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-policy.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/loan-application.png b/erpnext/docs/assets/img/human-resources/loan-application.png
new file mode 100644
index 0000000..3c6cfd2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/loan-application.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/loan.png b/erpnext/docs/assets/img/human-resources/loan.png
new file mode 100644
index 0000000..f2f71d4
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/loan.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/new-leave-type.png b/erpnext/docs/assets/img/human-resources/new-leave-type.png
index 3004b09..78fd04f 100644
--- a/erpnext/docs/assets/img/human-resources/new-leave-type.png
+++ b/erpnext/docs/assets/img/human-resources/new-leave-type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/repayment-schedule.png b/erpnext/docs/assets/img/human-resources/repayment-schedule.png
index f2ddf02..31085c1 100644
--- a/erpnext/docs/assets/img/human-resources/repayment-schedule.png
+++ b/erpnext/docs/assets/img/human-resources/repayment-schedule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/shift-assignment-calendar.png b/erpnext/docs/assets/img/human-resources/shift-assignment-calendar.png
new file mode 100644
index 0000000..7c8ec77
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/shift-assignment-calendar.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/shift-assignment.png b/erpnext/docs/assets/img/human-resources/shift-assignment.png
new file mode 100644
index 0000000..39c2857
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/shift-assignment.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/shift-request.png b/erpnext/docs/assets/img/human-resources/shift-request.png
new file mode 100644
index 0000000..77a7ad5
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/shift-request.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/shift-type.png b/erpnext/docs/assets/img/human-resources/shift-type.png
new file mode 100644
index 0000000..e03e45c
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/shift-type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/staffing-plan-detail.png b/erpnext/docs/assets/img/human-resources/staffing-plan-detail.png
new file mode 100644
index 0000000..63532b7
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/staffing-plan-detail.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/staffing-plan.png b/erpnext/docs/assets/img/human-resources/staffing-plan.png
new file mode 100644
index 0000000..f655029
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/staffing-plan.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/supplier1.1.png b/erpnext/docs/assets/img/human-resources/supplier1.1.png
new file mode 100644
index 0000000..48aa485
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/supplier1.1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png
new file mode 100644
index 0000000..dd37fee
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/scrap-1.png b/erpnext/docs/assets/img/manufacturing/scrap-1.png
new file mode 100644
index 0000000..3be19e3
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/scrap-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/scrap-2.gif b/erpnext/docs/assets/img/manufacturing/scrap-2.gif
new file mode 100644
index 0000000..0b9d42e
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/scrap-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/project/profitability-analysis.png b/erpnext/docs/assets/img/project/profitability-analysis.png
new file mode 100644
index 0000000..2c43adf
--- /dev/null
+++ b/erpnext/docs/assets/img/project/profitability-analysis.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-1.1.png b/erpnext/docs/assets/img/project/project-1.1.png
new file mode 100644
index 0000000..ea23665
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-1.1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-1.png b/erpnext/docs/assets/img/project/project-1.png
new file mode 100644
index 0000000..f416cd6
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-2.png b/erpnext/docs/assets/img/project/project-2.png
new file mode 100644
index 0000000..cadb20d
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-budgeting.png b/erpnext/docs/assets/img/project/project-budgeting.png
new file mode 100644
index 0000000..989cff2
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-budgeting.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-expense-claim-1.png b/erpnext/docs/assets/img/project/project-expense-claim-1.png
new file mode 100644
index 0000000..3ed5955
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-expense-claim-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-expense-claim-2.png b/erpnext/docs/assets/img/project/project-expense-claim-2.png
new file mode 100644
index 0000000..380a9a6
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-expense-claim-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-percent-complete.png b/erpnext/docs/assets/img/project/project-percent-complete.png
deleted file mode 100644
index cebfde3..0000000
--- a/erpnext/docs/assets/img/project/project-percent-complete.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-portal-2.png b/erpnext/docs/assets/img/project/project-portal-2.png
new file mode 100644
index 0000000..f86d707
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-portal-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-portal-user.png b/erpnext/docs/assets/img/project/project-portal-user.png
new file mode 100644
index 0000000..c12f203
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-portal-user.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-portal.gif b/erpnext/docs/assets/img/project/project-portal.gif
new file mode 100644
index 0000000..a89fb0b
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-portal.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-profitability-1.png b/erpnext/docs/assets/img/project/project-profitability-1.png
new file mode 100644
index 0000000..1928ee2
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-profitability-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project-profitability-2.png b/erpnext/docs/assets/img/project/project-profitability-2.png
new file mode 100644
index 0000000..39ba059
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project-profitability-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project.png b/erpnext/docs/assets/img/project/project.png
deleted file mode 100644
index c6bcd92..0000000
--- a/erpnext/docs/assets/img/project/project.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_cost_center.png b/erpnext/docs/assets/img/project/project_cost_center.png
deleted file mode 100644
index 09bd557..0000000
--- a/erpnext/docs/assets/img/project/project_cost_center.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_costing.png b/erpnext/docs/assets/img/project/project_costing.png
deleted file mode 100644
index c55976d..0000000
--- a/erpnext/docs/assets/img/project/project_costing.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_expense_claim_link.png b/erpnext/docs/assets/img/project/project_expense_claim_link.png
deleted file mode 100644
index 077cea1..0000000
--- a/erpnext/docs/assets/img/project/project_expense_claim_link.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_gantt_chart.png b/erpnext/docs/assets/img/project/project_gantt_chart.png
deleted file mode 100644
index 3eba443..0000000
--- a/erpnext/docs/assets/img/project/project_gantt_chart.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_sales_order.png b/erpnext/docs/assets/img/project/project_sales_order.png
deleted file mode 100644
index ff4030d..0000000
--- a/erpnext/docs/assets/img/project/project_sales_order.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_task.png b/erpnext/docs/assets/img/project/project_task.png
deleted file mode 100644
index 88f1e68..0000000
--- a/erpnext/docs/assets/img/project/project_task.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_task_grid.png b/erpnext/docs/assets/img/project/project_task_grid.png
deleted file mode 100644
index 935fba6..0000000
--- a/erpnext/docs/assets/img/project/project_task_grid.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_task_list.png b/erpnext/docs/assets/img/project/project_task_list.png
deleted file mode 100644
index 2a59caf..0000000
--- a/erpnext/docs/assets/img/project/project_task_list.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_time_log_link.png b/erpnext/docs/assets/img/project/project_time_log_link.png
deleted file mode 100644
index 08ac36c..0000000
--- a/erpnext/docs/assets/img/project/project_time_log_link.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_time_log_list.png b/erpnext/docs/assets/img/project/project_time_log_list.png
deleted file mode 100644
index 3b3724b..0000000
--- a/erpnext/docs/assets/img/project/project_time_log_list.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_total_expense_claim.png b/erpnext/docs/assets/img/project/project_total_expense_claim.png
deleted file mode 100644
index cbd3c01..0000000
--- a/erpnext/docs/assets/img/project/project_total_expense_claim.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_view_expense_claim.png b/erpnext/docs/assets/img/project/project_view_expense_claim.png
deleted file mode 100644
index 32056ca..0000000
--- a/erpnext/docs/assets/img/project/project_view_expense_claim.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_view_gantt_chart.png b/erpnext/docs/assets/img/project/project_view_gantt_chart.png
deleted file mode 100644
index 7039a45..0000000
--- a/erpnext/docs/assets/img/project/project_view_gantt_chart.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_view_task.png b/erpnext/docs/assets/img/project/project_view_task.png
deleted file mode 100644
index dfdff8b..0000000
--- a/erpnext/docs/assets/img/project/project_view_task.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/project_view_time_log.png b/erpnext/docs/assets/img/project/project_view_time_log.png
deleted file mode 100644
index dbf184e..0000000
--- a/erpnext/docs/assets/img/project/project_view_time_log.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-6.png b/erpnext/docs/assets/img/setup/workflow-6.png
new file mode 100644
index 0000000..a13d17c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-6.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-actions-email.png b/erpnext/docs/assets/img/setup/workflow-actions-email.png
new file mode 100644
index 0000000..0fe3bca
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-actions-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-actions-list.png b/erpnext/docs/assets/img/setup/workflow-actions-list.png
new file mode 100644
index 0000000..cb8ccc2
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-actions-list.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/customer-warehouse-2.png b/erpnext/docs/assets/img/stock/customer-warehouse-2.png
new file mode 100644
index 0000000..d44f88f
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/customer-warehouse-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/customer-warehouse.gif b/erpnext/docs/assets/img/stock/customer-warehouse.gif
new file mode 100644
index 0000000..c587b98
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/customer-warehouse.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png
index d2762dd..d9e1a6a 100644
--- a/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png
+++ b/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png
Binary files differ
diff --git a/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/job-offer.md
similarity index 100%
rename from erpnext/docs/user/manual/de/human-resources/offer-letter.md
rename to erpnext/docs/user/manual/de/human-resources/job-offer.md
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/index.txt b/erpnext/docs/user/manual/de/manufacturing/tools/index.txt
index 1f798d0..bdd357c 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/index.txt
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/index.txt
@@ -1,2 +1 @@
-production-planning-tool
-bom-replace-tool
+bom-update-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
deleted file mode 100644
index 63e51f8..0000000
--- a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Werkzeug zur Fertigungsplanung
-<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-
-Das Werkzeug zur Fertigungsplanung unterstützt Sie dabei die Fertigung zu planen und Artikel für eine Periode einzukaufen (normalerweise eine Woche oder ein Monat).
-
-Die Liste der Artikel kann über die offenen Kundenaufträge im System erstellt werden. Folgendes wird angelegt:
-
-* Fertigungsaufträge für jeden Artikel.
-* Materialanforderung für Artikel deren vorhergesagte Menge wahrscheinlich unter 0 fällt.
-
-Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu:
-
-> Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung
-
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
-
-### Schritt 1: Auswahl und Kundenauftrag
-
-* Wählen Sie einen Kundenauftrag für die Materialanforderung über die Filterfunktion (Zeit, Artikel und Kunde) aus.
-* Klicken Sie auf "Kundenaufträge aufrufen" um eine Übersicht zu erhalten.
-
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
-
-### Schritt 2: Artikel aus Kundenaufträgen abrufen
-
-Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern.
-
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
-
-### Schritt 3: Fertigungsaufträge erstellen
-
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
-
-### Schritt 4: Materialanfragen erstellen
-
-Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen.
-
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
-
-Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet:
-
-* Auswahl von offenen Kundenaufträge einer Periode auf Basis des erwarteten Lieferdatums.
-* Auswahl von Artikeln aus diesen Kundenaufträgen.
-
-Das Werkzeug erstellt eine Aktualisierung, wenn Sie bereits einen Kundenauftrag für einen bestimmten Artikel zu einem Kundenauftrag erstellt haben ("geplante Menge").
-
-Sie könnenjederzeit die Artikelliste bearbeiten und die zur Fertigung geplante Menge erhöhen bzw. vermindern.
-
-> Anmerkung: Wie ändern Sie einen Fertigungsplan? Des Ergebnis des Werkzeuges zur Produktionsplanung ist der Fertigungsauftrag. Sobald Ihre Aufträge erstellt wurden, können Sie sie ändern, indem Sie die Fertigungsaufträge ändern.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/accounts/exchange-rate-revaluation.md b/erpnext/docs/user/manual/en/accounts/exchange-rate-revaluation.md
new file mode 100644
index 0000000..d4887d0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/exchange-rate-revaluation.md
@@ -0,0 +1,35 @@
+# Exchange Rate Revaluation
+
+In ERPNext, you can make accounting entries in multiple currency. For example, if you have a bank account in foreign currency, you can make transactions in that currency and system will show bank balance in that specific currency only.
+
+## Setup
+
+To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
+
+<img class="screenshot" alt="Set Currency from Chart of Accounts"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/chart-of-accounts.png">
+
+You can also assign / modify the currency by opening specific Account record for existing Accounts.
+
+<img class="screenshot" alt="Modify Account Currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
+
+### Exchange Rate Revaluation
+
+Exchange Rate Revaluation feature is for dealing the situation when you have a multiple currency accounts in one company's chart of accounts
+
+Steps :
+
+1. Set the 'Unrealized Exchange / Gain Loss Account' field in Company DocType. This aacount is to balance the difference of total credit and total debit.
+
+<img class="screenshot" alt="Field Set for Comapny"  	src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/field_set_company.png">
+
+2. Select the Company.
+
+3. Click the Get Entries button. It shows the accounts which having different currency as compare to 'Default Currency' in Company DocType. It will fetch the new exchange rate automatically if not set in Currency Exchange DocType for that currency else it will fetch the 'Exchange Rate' from Currency Exchange DocType
+
+<img class="screenshot" alt="Exchange Rate Revaluation"  	src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation.png">
+
+4. On Submitting, 'Make Journal Entry' button will appear. This will create a journal entry for the Exchange Rate Revaluation.
+
+<img class="screenshot" alt="Exchange Rate Revaluation Submitting"  	src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation-submit.png">
+
+<img class="screenshot" alt="Journal Entry"  	src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/journal-entry.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
index 8520d86..3b84be9 100644
--- a/erpnext/docs/user/manual/en/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -4,8 +4,10 @@
 point-of-sale-pos-invoice
 point-of-sales
 purchase-invoice
+inter-company-invoices
 payments
 journal-entry
+inter-company-journal-entry
 payment-entry
 subscription
 multi-currency-accounting
diff --git a/erpnext/docs/user/manual/en/accounts/inter-company-invoices.md b/erpnext/docs/user/manual/en/accounts/inter-company-invoices.md
new file mode 100644
index 0000000..ed2ec42
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/inter-company-invoices.md
@@ -0,0 +1,32 @@
+
+# Inter Company Invoices
+
+Along with creating Purchase Invoices or Sales Invoices for a single company, you can create inter-linked invoices for multiple companies.
+
+Such as, you can create a Purchase Invoice for a company say 'Company ABC', and create a Sales Invoice against this Purchase Invoice for a company say 'Company XYZ' and link them together.
+
+#### To create Inter Company Invoices as mentioned in the above process, you need to follow the below steps:
+
+ - Go to the Customer list, select the customer which you would want to choose for the inter-linked invoices, enable the checkbox, **Is Internal Customer** as shown below:
+
+ <img class="screenshot" alt="Internal Customer" src="{{docs_base_url}}/assets/img/accounts/make-internal-customer.png">
+
+ - Along with that, add the company which the Customer represents, i.e. the company for which the Sales Invoice will be created.
+ - Next, fill up the child table **Allowed To Transact With** as shown in the image and add the company against which you will be creating a Purchase Invoice, which will be linked with the Sales Invoice created  using this Customer.
+ - *Easy peasy, right?* Now, you need to follow the similar procedure for setting up a Supplier for inter-linked invoices. And, in the **Represents Company** field, add the company which you added in the child table **Allowed To Transact With** for the Customer.
+ - And, in the child table **Allowed To Transact With** for the Supplier, add the company which the Customer represents or against which you are going to make an inter-linked Purchase Invoice. You can refer the below image to avoid any confusion.
+
+ <img class="screenshot" alt="Internal Supplier" src="{{docs_base_url}}/assets/img/accounts/make-internal-supplier.png">
+
+- Now, create a new Sales Invoice, fill up the fields, and remember to select the Customer who is an internal customer and company which the Customer represents.
+- Submit the Invoice.
+
+ <img class="screenshot" alt="Inter company invoice" src="{{docs_base_url}}/assets/img/accounts/make-inter-company-invoice.png">
+
+- Under the **Make** button dropdown, you will find a link **Inter Company Invoice**, on clicking the link, you will be routed to a new Purchase Invoice form page.
+- Here, the supplier and company will be auto-fetched depending on the company you selected in the Sales Invoice. ***Remember**: There can only be a single Internal Supplier or Customer per company.*
+- Submit the invoice, done! Now, both the invoices are inter-linked. *Also, on cancelling any of the invoices, the link will break as well.*
+
+You can follow the same process to create a Purchase Invoice and then an inter-linked Sales Invoice from the submitted Purchase Invoice.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/inter-company-journal-entry.md b/erpnext/docs/user/manual/en/accounts/inter-company-journal-entry.md
new file mode 100644
index 0000000..6bc2e5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/inter-company-journal-entry.md
@@ -0,0 +1,45 @@
+# Inter Company Journal Entry
+
+You can also create Inter Company Journal Entry if you are making transactions with multiple Companies.
+You can select the Accounts which you wish to use in the Inter Company transactions.
+Just go to,
+
+> Accounts > Company and Accounts > Chart Of Accounts
+
+Select the Account which you would like to set as an Internal Account for the transaction, and check the **Inter Company Account** checkbox. It can now be used for Inter Company Journal Entry Transactions.
+
+<img class="screenshot" alt="Internal Account" src="{{docs_base_url}}/assets/img/accounts/internal-account.png">
+
+You need to do the same for all the Companies' Accounts which you want to use for Inter Company Journal Entry transactions.
+
+Now, to create an Inter Company Journal Entry go to:
+
+> Accounts > Company and Accounts > Journal Entry > New
+
+<img class="screenshot" alt="Inter Company Journal Entry" src="{{docs_base_url}}/assets/img/accounts/inter-company-jv.png">
+
+In the Journal Entry, you must select,
+
+* Type of Voucher - **Inter Company Journal Entry**.
+* Add rows for the individual accounting entries. In each row, you must specify:
+  * The Internal account that will be affected. 
+  * The amount to Debit or Credit.
+  * The Cost Center (If it is an Income or Expense).
+
+On submitting the Journal Entry, you will find a button on the top right corner, **Make Inter Company Journal Entry**.
+
+<img class="screenshot" alt="Submitted Inter Company Journal Entry" src="{{docs_base_url}}/assets/img/accounts/inter-company-jv-submit.png">
+
+Click on the button, you will be asked to select the Company against which you wish to create the linked Journal Entry.
+
+<img class="screenshot" alt="Select Company" src="{{docs_base_url}}/assets/img/accounts/select-company-jv.png">
+
+On selecting the Company, you will be routed to another Journal Entry where the relevant fields will be mapped, i.e. Company, Voucher Type, Inter Company Journal Entry Reference etc. 
+
+<img class="screenshot" alt="Linked Journal Entry" src="{{docs_base_url}}/assets/img/accounts/linked-jv.png">
+
+Select the Internal accounts for the Company selected and submit the Journal Entry, make sure the total Debit and Credit Amounts are same as the previously created Journal Entry's total Credit and Debit Amounts respectively.
+
+You can also find the reference link at the bottom, which will be added in both the linked Journal Entries and will be removed if any of the Journal Entries are cancelled.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
index c4a3eb9..02c6c8b 100644
--- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
@@ -11,7 +11,7 @@
 
 3. Items categorized under specific Item Group has same selling or buying price.
 
-4. Customers balonging to specific Customer Group should get ### selling price, ot % of Discount on Items.
+4. Customers balonging to specific Customer Group should get ### selling price, or % of Discount on Items.
 
 5. Supplier's categorized under specific Supplier Type should have ### buying rate applied.
 
@@ -106,4 +106,4 @@
 
 For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html)
 
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index 8076bd8..122dfa3 100644
--- a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -92,4 +92,42 @@
 
 For more help, please contact your Accountant!
 
+#### Hold Payments For A Purchase Invoice
+There are two ways to put a purchase invoice on hold:
+- Date Span Hold
+- Explicit Hold
+
+##### Explicit Hold
+Explicit hold holds the purchase invoice indefinitely. 
+To do it, in the "Hold Invoice" section of the purchase invoice form, simply 
+check the "Hold Invoice" checkbox. In the "Reason For Putting On Hold" text 
+field, type a comment explaining why the invoice is to be put on hold.
+
+If you need to hold a submitted invoice, click the "Make" drop down button 
+and click "Block Invoice". Also add a comment explaining why the invoice is 
+to be put on hold in the dialog that pops up and click "Save".
+
+##### Date Span Hold
+Date span hold holds the purchase invoice until a 
+specified date. To do it, in the "Hold Invoice" section of the purchase 
+invoice form, check the "Hold Invoice" checkbox. Next, input the release date 
+in the dialog that pops up and click "Save". The release date is the date 
+that the hold on the document expires.
+
+After the invoice has been saved, you can change the release date by clicking 
+on the "Hold Invoice" drop down button and then "Change Release Date". This 
+action will cause a dialog to appear. 
+
+<img class="screenshot" alt="Purchase Invoice on hold" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice-hold.png">
+
+Select the new release date and click "Save". You should also enter a comment 
+in the "Reason For Putting On Hold" field.
+
+Take note of the following:
+- All purchases that have been placed on hold will not included in a Payment Entry's references table
+- The release date cannot be in the past.
+- You can only block or unblock a purchase invoice if it is unpaid.
+- You can only change the release date if the invoice is unpaid.
+ 
+
 {next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
index baf0fed..2f8a154 100644
--- a/erpnext/docs/user/manual/en/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -6,18 +6,11 @@
 
 `Explore > Supplier > New Supplier`
 
-<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
-
-<div>
-    <div class='embed-container'>
-        <iframe src='https://www.youtube.com/embed//zsrrVDk6VBs?start=213' frameborder='0' allowfullscreen>
-        </iframe>
-    </div>
-</div>
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier1.1.png">
 
 ### Contacts and Addresses
 
-Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find option to create Contact and Address for that Supplier.
+Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find the option to create Contact and Address for that Supplier.
 
 <img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-new-address-contact.png">
 
@@ -37,8 +30,25 @@
 
 You can add multiple companies in your ERPNext instance, and one Supplier can be used across multiple companies. In this case, you should define Companywise Payable Account for the Supplier in the "Default Payable Accounts" table.
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/anoGi_RpQ20" frameborder="0" allowfullscreen></iframe>
+<div>
+    <div class='embed-container'>
+        <iframe src='https://www.youtube.com/embed//zsrrVDk6VBs?start=213' frameborder='0' allowfullscreen>
+        </iframe>
+    </div>
+</div>
 
-(Check from 2:20)
+### Place Supplier On Hold
+In the Supplier form, check the "Block Supplier" checkbox. Next, choose the "Hold Type".
+
+The hold types are as follows:
+- Invoices: ERPNext will not allow Purchase Invoices or Purchase Orders to be created for the supplier
+- Payments: ERPNext will not allow Payment Entries to be created for the Supplier
+- All: ERPNext will apply both hold types above
+
+After selecting the hold type, you can optionally set a release date in the "Release Date" field.
+
+Take note of the following:
+- If you do not select a hold type, ERPNext will set it to "All"
+- If you do not set a release date, ERPNext will hold the Supplier indefinitely 
 
 {next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/fetch value in child table field b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/fetch value in child table field
new file mode 100644
index 0000000..8caf8f5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/fetch value in child table field
@@ -0,0 +1,17 @@
+## Example to fetch value in a child table field from master doctype
+
+
+### Sample Script to fetch expiry_date field from Batch doctype to Sales Invoice Item table
+
+Step 1: Create Custom Script for _**Sales Invoice**_ (parent) doctype
+
+Step 2: Script as below & Save
+
+```
+frappe.ui.form.on("Sales Invoice Item", "batch_no", function(frm, cdt, cdn) {
+	var d = locals[cdt][cdn];
+    	frappe.db.get_value("Batch", {"name": d.batch_no}, "expiry_date", function(value) {
+    		d.expiry_date = value.expiry_date;
+    	});
+});
+```
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
index c5740ca..b443cc8b 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
@@ -19,6 +19,6 @@
         <iframe src='https://www.youtube.com/embed/t8ZDDq4qtIk?end=52' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
index b7599b8..3473ad1 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
@@ -19,6 +19,6 @@
         <iframe src='https://www.youtube.com/embed/I1T7Z2JbcP4' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
index 4ad2ab8..0425072 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
@@ -2,13 +2,13 @@
 
 The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
 
-To mark the **Attedance* based on Student Group select the group based on 
+To mark the **Attedance* based on Student Group select the group based on
 
 **1. Batch
   2. Course
   3. Activity **
 
-Student detials will be autofetched and you can mark the attendance of the given date. 
+Student detials will be autofetched and you can mark the attendance of the given date.
 
 <img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/setup/student-attendance-tool.gif">
 
@@ -21,6 +21,6 @@
     <iframe src='https://www.youtube.com/embed//j9pgkPuyiaI?start=63' frameborder='0' allowfullscreen>
     </iframe>
   </div>
-<div>
+</div>
 
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/index.md b/erpnext/docs/user/manual/en/education/index.md
index ff505f0..4f96b79 100644
--- a/erpnext/docs/user/manual/en/education/index.md
+++ b/erpnext/docs/user/manual/en/education/index.md
@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 # ERPNext for Education
 
-The Education domain in ERPNext is designed to meet requirements of any organization which imparts knowledge and believe in doing it in an organized fashion. It has already been used at the schools, colleges and even at the private firms. 
+The Education domain in ERPNext is designed to meet requirements of any organization which imparts knowledge and believe in doing it in an organized fashion. It has already been used at the schools, colleges and even at the private firms.
 
 It helps you effectively manage administrative side and allows you to focus on what is most important for your institute, **to educate!**
 
@@ -32,7 +32,7 @@
         <iframe src='https://www.youtube.com/embed/t8ZDDq4qtIk?end=52' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 ### User Manual
 
diff --git a/erpnext/docs/user/manual/en/erpnext_integration/shopify_integration.md b/erpnext/docs/user/manual/en/erpnext_integration/shopify_integration.md
new file mode 100644
index 0000000..391bf2b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/erpnext_integration/shopify_integration.md
@@ -0,0 +1,42 @@
+# Shopify Integration
+
+The Shopify Connector pulls the orders from Shopify and creates Sales Order against them in ERPNext.
+
+While creating the sales order if Customer or Item is missing in ERPNext the system will create new Customer/Item by pulling respective details from Shopify.
+
+### How to Setup Connector?
+
+#### Create A  Private App in Shopify
+
+1. Click on Apps in menu bar
+<img class="screenshot" alt="Menu Section" src="{{docs_base_url}}/assets/img/erpnext_integrations/app_menu.png">
+
+2. Click on **Manage private apps** to create private app
+<img class="screenshot" alt="Manage Private Apps" src="{{docs_base_url}}/assets/img/erpnext_integrations/manage_private_apps.png">
+
+3. Fill up the details and create app. The each app has its own API key, Password and Shared secret
+<img class="screenshot" alt="App Details" src="{{docs_base_url}}/assets/img/erpnext_integrations/app_details.png">
+
+
+#### Setting Up Shopify  on ERPNext:-
+Once you have created a Private App on Shopify, setup App Credentials and other details in ERPNext.
+
+1. Select App Type as Private and Fill-up API key, Password and Shared Secret from Shopify's Private App.
+<img class="screenshot" alt="Setup Private App Credentials" src="{{docs_base_url}}/assets/img/erpnext_integrations/app_details.png">
+
+2. Setup Customer, Company and Inventory configurations
+<img class="screenshot" alt="ERP Configurations" src="{{docs_base_url}}/assets/img/erpnext_integrations/erp_configurations.png">
+
+3. Setup Sync Configurations.
+    The system pulls Orders from Shopify and creates Sales Order in ERPNext. You can configure ERPNext system to capture payment and fulfilments against orders.
+<img class="screenshot" alt="Sync Configure" src="{{docs_base_url}}/assets/img/erpnext_integrations/sync_config.png">
+
+4. Setup Tax Mapper.
+    Prepare tax and shipping charges mapper for each tax and shipping charge you apply in Shopify
+<img class="screenshot" alt="Taxes and Shipping Charges" src="{{docs_base_url}}/assets/img/erpnext_integrations/tax_config.png">
+
+
+After setting up all the configurations, enable the Shopify sync and save the settings. This will register the API's to Shopify and the system will start Order sync between Shopify and ERPNext.
+
+### Note:
+The connector won't handle Order cancellation. If you cancelled any order in Shopify then manually you have to cancel respective Sales Order and other documents in ERPNext.
diff --git a/erpnext/docs/user/manual/en/healthcare/index.md b/erpnext/docs/user/manual/en/healthcare/index.md
index 62e537d..7755158 100755
--- a/erpnext/docs/user/manual/en/healthcare/index.md
+++ b/erpnext/docs/user/manual/en/healthcare/index.md
@@ -19,7 +19,7 @@
         <iframe src='https://www.youtube.com/embed/1n4_YqX8ArA' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 ### User Manual
 
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
index 092d11d..c6aed24 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -1,6 +1,20 @@
 # Employee
 
-There are many fields you can add in your Employee records.
+An individual who works part-time or full-time under a contract of employment, and has recognized rights and duties is your Employee.
+
+In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details. 
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee-view.gif">
+
+You can further use this Employee master for performing various HR functions like:
+
+1. Processing Payroll
+1. Leave Allocation and Application
+1. Employee Advance and Expense Claim
+1. Loan Application
+1. Performance Appraisal
+
+### New Employee
 
 To create new Employee go to:
 
@@ -8,6 +22,14 @@
 
 <img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
 
+### Employee Deputation
+
+Once an Employee is created, you can update Department, Designation, Employee to whom he/she will report to etc.
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee-job-profile.png">
+
+<hr>
+
 <div class="embed-container">    
     <iframe src="https://www.youtube.com/embed/kkwOzeU4wFU?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
 </div>
diff --git a/erpnext/docs/user/manual/en/human-resources/employee_promption.md b/erpnext/docs/user/manual/en/human-resources/employee_promption.md
new file mode 100644
index 0000000..a3f1c2d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/employee_promption.md
@@ -0,0 +1,15 @@
+# Employee Promotion
+
+You can manage Employee Promotions using this document.
+
+To record an Employee Promotion go to
+
+> Human Resource > Employee Promotion > New Employee Promotion
+
+Select Employee and add all details to be updated to Promotion Details table.
+
+<img class="screenshot" alt="Employee Promotion" src="{{docs_base_url}}/assets/img/human-resources/employee_promotion.png">
+
+Promotion document can be submitted on or after Promotion Date. Once submitted all the changes added to Promotion Details table will applied to Employee.
+
+<img class="screenshot" alt="Employee Promotion" src="{{docs_base_url}}/assets/img/human-resources/employee_promotion_1.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/employee_transfer.md b/erpnext/docs/user/manual/en/human-resources/employee_transfer.md
new file mode 100644
index 0000000..307f9b9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/employee_transfer.md
@@ -0,0 +1,17 @@
+# Employee Transfer
+
+You can transfer Employees to different Company or Department by using Employee Transfer.
+
+To reocord an Employee Transfer go to
+
+> Human Resource > Employee Transfer > New Employee Transfer
+
+Select Employee and add all details to be updated to Transfer Details table.
+
+<img class="screenshot" alt="Employee Transfer" src="{{docs_base_url}}/assets/img/human-resources/employee_transfer.png">
+
+Transfer document can be submitted on or after Transfer Date. Once submitted all the changes added to Transfer Details table will applied to Employee.
+
+<img class="screenshot" alt="Employee Transfer" src="{{docs_base_url}}/assets/img/human-resources/employee_transfer_1.png">
+
+> Note : If Create New Employee ID is checked, a new Employee will be created with property changes in Transfer Details table and old Employee will be marked as releived. Leave allocations for the new Employee has to be manually created from Leave Period.
diff --git a/erpnext/docs/user/manual/en/human-resources/health-insurance.md b/erpnext/docs/user/manual/en/human-resources/health-insurance.md
index ed4d778..af4bee9 100644
--- a/erpnext/docs/user/manual/en/human-resources/health-insurance.md
+++ b/erpnext/docs/user/manual/en/human-resources/health-insurance.md
@@ -1,6 +1,4 @@
-# Health Insurance
-
-Health Insurance is an important information attached to Employee.
+# Employee Health Insurance
 
 To create Health Insurance Provider:
 
diff --git a/erpnext/docs/user/manual/en/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
index 120b64c..34b0c83 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/index.md
@@ -5,7 +5,7 @@
 Payroll Entry to generate Salary Slips. Most countries have complex tax
 rules stating which expenses the company can make on behalf of the Employees.
 There are a set of rules for the company to deduct taxes and social security
-from employee payroll. ERPNext allows to accomodate all types of taxes and
+from employee payroll. ERPNext allows to accommodate all types of taxes and
 their calculation.
 
 It also maintains a complete employee database including contact information,
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index 479e2dd..758cdaa 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -18,4 +18,6 @@
 daily-work-summary
 fleet-management
 loan-management
+employee-promotion
+employee-transfer
 articles
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index c735a6b..4472964 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -5,13 +5,13 @@
 track approval and usage of leaves. You have to mention the Employee, Leave
 Type and the period for which the leave is taken.
 
-> Human Resources > Leave Application > New Leave Application
+> Human Resources > Leaves and Holiday > Leave Application > New Leave Application
 
 <img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
 
 ###Setting Leave Approver
 
-* A leave approver is a user who can approve an leave application for an employee. 
+* A leave approver is a user who can approve an leave application for an employee.
 
 * You need to mention a list of Leave Approvers against an Employee in the Employee Master.
 
@@ -22,11 +22,11 @@
 settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
 for more info.
 
-You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html)
+To understand how ERPNext allows you configure leaves for employees, check [Leaves - Overview](/docs/user/manual/en/human-resources/leave.html)
 
 <div class="embed-container">
     <iframe src="https://www.youtube.com/embed/fc0p_AXebc8?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
     </iframe>
 </div>
 
-{next}
\ No newline at end of file
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/leave.md b/erpnext/docs/user/manual/en/human-resources/leave.md
index 5b32a2b..cbe8a66 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave.md
@@ -1,29 +1,48 @@
-#Overview
-This section enables you to manage leave schedule of your organization. It also explains the way employees can apply for leaves.  
-Employees create leave request and manager (leave approver) approves or rejects the request. You can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. You can also allocate leaves to your employees and generate reports to track leaves record.
+#Leaves - Overview
+This section will help you understand how ERPNext enables you to effectively manage the leave schedule of your organization. It also explains the way employees can apply for leaves.
+Employees create leave requests, which their respective managers (leave approver) can approve or reject. An Employee can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. The number and type of leaves an Employee can apply is controlled by Leave Allocations. You can create Leave Allocations for a Leave Period based on the company's Leave Policy. You can also allocate additional leaves to your employees and generate reports to track leaves taken by Employees.
 
 ---
 
 #Leave Type
+> Human Resources > Leaves and Holiday > Leave Type > New Leave Type
 
-> Human Resources > Setup > Leave Type > New Leave Type
-
-Leave Type refers to types of leave allotted to an employee by a company. An employee can select a particular Leave Type while requesting for a leave. You can create any number of Leave Types based on your company’s 
+Leave Type refers to types of leave allotted to an employee by a company. An employee can select a particular Leave Type while requesting for a leave. You can create any number of Leave Types based on your company’s
 requirement.
 
-<img class="screenshot" alt="New Leave Type" 
+<img class="screenshot" alt="New Leave Type"
 	src="{{docs_base_url}}/assets/img/human-resources/new-leave-type.png">
 
-**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.
+**Max Leaves Allowed:** This field allows you to set the maximum number of leaves of this Leave Type that Employees can apply within a Leave Period.
+
+**Applicable After (Working Days):** Employees who have worked with the company for this number of days are only allowed to apply for this Leave Type. Do note that any other leaves availed by the Employee after her joining date is also considered while calculating working days.
+
+**Maximum Continuous Days Applicable:** 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.
+**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves without 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.
+**Allow Negative 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.
 
+**Is Compensatory:** Compensatory leaves are leaves granted for working overtime or on holidays, normally compensated as an encashable leave. You can check this option to mark the Leave Type as compensatory. An Employee can request for compensatory leaves (Compensatory Leave Request) and on approval of such requests, Leave Allocations are created allowing her to apply for leaves of this type later on.
+
+**Is Optional:** Check this Optional Leaves are holidays which Employees can choose to avail from a list of holidays published by the company. The Holiday List for optional leaves can have any number of holidays but you can restrict the number of such leaves granted to an Employee in a Leave Period by setting the Max Days Leave Allowed field.
+
+**Encashment:** It is possible that Employees can receive cash from their Employer for unused leaves granted to them in a Leave Period. Not all Leave Types need to be encashable, so you should set "Allow Encashment" for Leave Types which are encashable. Leave encashment is allowed only in the last month of the Leave Period.
+
+<img class="screenshot" alt="Leave Encashment"
+	src="{{docs_base_url}}/assets/img/human-resources/leave-encashment.png">
+
+You can set the **Encashment Threshold Days** field so that the Employees wont be able to encash that many days. These days should be carry forwarded to the next Leave Period so that it can be either encashed or availed. You may also want to set the **Earning Component** for use in Salary Slip while paying out the encashed amount to Employees as part of their Salary.
+
+**Earned Leave:** Earned Leaves are leaves earned by an employee after working with the company for a certain amount of time. Checking "Is Earned Leave" will allot leaves pro rata by automatically updating Leave Allocation for leaves of this type at intervals set by **Earned Leave Frequency**. For example, if an employee earns 2 leaves of type Paid Leaves monthly, ERPNext automatically increments the Leave Allocation for Paid Leave at the end of every month by 2. The leave allotment process (background job) will only allot leaves considering the max leaves for the leave type, and will round to **Rounding** for fractions.
+
+<img class="screenshot" alt="Earned Leave"
+	src="{{docs_base_url}}/assets/img/human-resources/earned-leave.png">
+
 ###Default Leave Types
 There are some pre-loaded Leave Types in the system, as below:
 
@@ -35,30 +54,60 @@
 
 ---
 
-#Leave Allocation
+#Leave Policy
+> Human Resources > Leaves and Holiday > Leave Policy > New Leave Policy
 
-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.
+It is a practice for many enterprises to enforce a general Leave Policy to effectively track and manage Employee leaves. ERPNext allows you to create and manage multiple Leave Policies and allocate leaves to Employees as defined by the policy.
 
-###Manual Allocation
-> Human Resources > Setup > Leave Allocation > New Leave Allocation
+<img class="screenshot" alt="Leave Policy"
+	src="{{docs_base_url}}/assets/img/human-resources/leave-policy.png">
 
-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.
+### Enforcing the Leave Policy
+To enforce the Leave Policy, you can either:
+* Apply the Leave Policy in Employee Grade
+<img class="screenshot" alt="Employee Grade"
+	src="{{docs_base_url}}/assets/img/human-resources/employee-grade.png">
 
-<img class="screenshot" alt="Manual Leave Allocation" 
+This will ensure all leave allocations for all employees of this grade will be as per the Leave Policy
+
+* Update Employee record with appropriate Leave Policy. In case you need to selectively update the Leave Policy for a particular Employee, you can do so by updating the Employee record.
+
+<img class="screenshot" alt="Employee Leave Policy"
+	src="{{docs_base_url}}/assets/img/human-resources/employee-leave-policy.png">
+
+#Leave Period
+Most companies manage leaves based on a Leave Period. ERPNext allows you to create a Leave period by going to
+> Human Resources > Leaves and Holiday > Leave Period > New Leave Period
+
+	<img class="screenshot" alt="Leave Period"
+		src="{{docs_base_url}}/assets/img/human-resources/leave-period.png">
+
+#Granting Leaves to Employees
+Leave Management in ERPNext is based on Leave Allocations created for each employee. This means, Employees can only avail as many leaves (of each Leave Type) allocated to them. There are multiple ways by which you can create Leave Allocations for Employees.
+
+###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.
+
+###Allocating leaves for a Leave Period
+> Human Resources > Leaves and Holiday > Leave Period
+
+Leave Period helps you manage leaves for a period and also doubles up as a tool to help you grant leaves for a category of employees. The **Grant** button will generate Leave Allocations based on the Leave Policy applicable to each Employee. You can allocate leaves based on Employee Grade, Department or Designation. Also, note that **Carry Forward Leaves** check will enable you to carry forward any unused leaves (for Leave Types with Is Carry Forward turned on) from previous allocations to new ones.
+
+<img class="screenshot" alt="Grant Leaves from Leave Period"
+	src="{{docs_base_url}}/assets/img/human-resources/leave-period-grant.png">
+
+###Manual Allocation of leaves
+> Human Resources > Leaves and Holiday > Leave Allocation > New Leave Allocation
+
+To manually allocate leaves for an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+
+<img class="screenshot" alt="Manual Leave Allocation"
 	src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png">
 
-###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.
-
-<img class="screenshot" alt="Leave Allocation Tool"
-	src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png">
-
 ---
 
 #Leave Application
-> Human Resources > Documents > Leave Application > New Leave Application
+> Human Resources > Leaves and Holiday > 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.
 
@@ -73,7 +122,7 @@
 <img class="screenshot" alt="Leave Allocation Tool"
 	src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png">
 
-	
+
 **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.
@@ -84,9 +133,9 @@
 
 #Leave Block List
 
-> Human Resources > Setup > Leave Block List > New Leave Block List
+> Human Resources > Leaves and Holiday > 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.
 
 <img class="screenshot" alt="Leave Allocation Tool"
-	src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
+	src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/loan-management.md b/erpnext/docs/user/manual/en/human-resources/loan-management.md
index d8a548b..9457e1a 100644
--- a/erpnext/docs/user/manual/en/human-resources/loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/loan-management.md
@@ -18,7 +18,7 @@
 
 > Human Resources > Loan Management > Loan Application > New Loan Application
 
-<img class="screenshot" alt="Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan-application.png">
+<img class="screenshot" alt="Loan Application" src="{{docs_base_url}}/assets/img/human-resources/loan-application.png">
 
 #### In the Loan Application,
 
@@ -35,7 +35,7 @@
 
 > Human Resources > Loan Management > Loan > New Loan
 
-<img class="screenshot" alt="Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan.png">
+<img class="screenshot" alt="Loan Application" src="{{docs_base_url}}/assets/img/human-resources/loan.png">
 
 #### In the Loan,
 
diff --git a/erpnext/docs/user/manual/en/human-resources/shift-management.md b/erpnext/docs/user/manual/en/human-resources/shift-management.md
new file mode 100644
index 0000000..2279538
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/shift-management.md
@@ -0,0 +1,44 @@
+# Shift Management
+
+Shift Management section of Human Resources helps your Organization manage shifts of your employees.
+
+To use Shift Management in ERPNext,
+
+  1. Set Up a Shift Type.
+  2. Enter Shift Request.
+  3. View and Manage Shift Assignments.
+
+### Shift Type
+
+The Shift Type Set Up allows you to define the different types of Shifts in your Organization.
+
+To create a new Shift Type go to:
+
+Human Resources > Shift Management > Shift Type
+
+* Enter Shift Type, Start Time and End Time for quick entry.
+
+	<img class="screenshot" alt="Shift Type" src="{{docs_base_url}}/assets/img/human-resources/shift-type.png">
+
+### Shift Request
+
+Shift Request is used by an employee to request for a particular Shift Type.
+
+To create a new Shift Request Log go to:
+
+Human Resources > Shift Management > Shift Request
+
+* Enter Shift Type, Employee, Company, From Date and To Date.
+
+	<img class="screenshot" alt="Shift Request" src="{{docs_base_url}}/assets/img/human-resources/shift-request.png">
+
+### Shift Assignment
+
+* Once the Shift Request is submitted it automatically creates the Shift Assignments for an Employee.
+
+	<img class="screenshot" alt="Shift Assignment" src="{{docs_base_url}}/assets/img/human-resources/shift-assignment.png">
+
+* You can also view Calendar view of Shift Assignments.
+
+	<img class="screenshot" alt="Shift Assignment Calendar" 
+	src="{{docs_base_url}}/assets/img/human-resources/shift-assignment-calendar.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/staffing-plan.md b/erpnext/docs/user/manual/en/human-resources/staffing-plan.md
new file mode 100644
index 0000000..d16a1ec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/staffing-plan.md
@@ -0,0 +1,18 @@
+# Staffing Plan
+Staffing Plan helps you to plan human resource recruitments for your Company. ERPNext allows you to do this at a group company level helping you efficiently plan and budget new hirings for a period. Job Openings can only be created as per the number of vacancies and budget as per the active Staffing Plan.
+
+> Human Resources > Setup > Staffing Plan > New Staffing Plan
+
+<img class="screenshot" alt="Staffing Plan"
+	src="{{docs_base_url}}/assets/img/human-resources/staffing-plan.png">
+
+- **Designation:** The designations for which you are creating the Staffing Plan.
+- **Number of Positions:** The number of positions you plan to recruit for between the Staffing Plan from and to dates.
+- **Current Count:** This is the number of Employees already hired for the Designation.
+- **Vacancies:** The number of vacancies based on the Number of Positions you wish to recruit and the current Employee count.
+- **Estimated Cost Per Position:** You can specify the cost to company per position so that hiring officials can stick to the budget.
+
+<img class="screenshot" alt="Staffing Plan Detail"
+	src="{{docs_base_url}}/assets/img/human-resources/staffing-plan-detail.png">
+
+**Total Estimated Budget** Once you enter the recruitment plan for all the designations, Staffing Plan will draw up the total estimated budget.
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md b/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md
new file mode 100644
index 0000000..25c1eea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/scrap-management.md
@@ -0,0 +1,23 @@
+# Production Scrap Management
+
+Scrap means waste that either has no economic value or only the value of its basic material content recoverable through recycling.
+
+Scrap is generally availed at the end of the manufacture process. Also you can find some products that are damaged or that are unusable due to expiry or for some other reason, which needs to be scraped.
+
+In ERPNext, at the end of manufacturing process, scrap items are accounted in the scrap warehouse.s
+
+### Scrap in Bill of Materials
+
+You can update estimated scrap quantity of an item in the BOM, Scrap table. If required, you can reselect a raw-material item as scrap.
+
+<img class="screenshot" alt="Scrap in BOM" src="{{docs_base_url}}/assets/img/manufacturing/scrap-1.png">
+
+### Scrap in Manufacture Entry
+
+When production is completed, Finish / Manufacture Entry is created against a Production Order. In this entry, scrap item is fetched in the Item table, with only Target Warehouse updated for it. Ensure that Valuation Rate is updated for this item for the accounts posting purposes.
+
+<img class="screenshot" alt="Scrap in Manufacture Entry" src="{{docs_base_url}}/assets/img/manufacturing/scrap-2.gif">
+
+> Scrap from the BOM will only work if Manufacture Entry is created based on BOM, and not based on Material Transfer. This is configurable from Manufacturing Settings.
+
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-settings.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
index a385154..bdd357c 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
@@ -1,2 +1 @@
-production-planning-tool
 bom-update-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
deleted file mode 100644
index 4b7ee7a..0000000
--- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Production Planning Tool
-
-Production Planning Tool helps you plan production and purchase of Items for a
-period (usually a week or a month).
-
-<div class-"embed-container">
-  <iframe src="https://www.youtube.com/embed/i0E_RcngliQ?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
-  </iframe>
-</div>
-
-This list of Items can be generated from the open Sales Orders or pending Material Requests that can be Manufactured in the system
-and will generate:
-
-  * Work Orders for each Item.
-  * Purchase Requests for Items whose Projected Quantity is likely to fall below zero.
-
-To use the Production Planning Tool, go to:
-
-> Manufacturing > Tools > Production Planning Tool
-
-<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
-
-#### Step 1: Specify source to get Production Items
-
-* You can select Sales Order or Material Request according to where you want to source the items from
-* If you plan to add items manually, keep the "Get items from" field empty
-
-
-
-#### Step 2: Select and get Sales Order / Material Request
-
-* Use filters to get the Sales Order / Material Request
-* Click on Get Sales Order / Get Material Requests to generate a list.
-
-<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
-
-
-
-#### Step 3: Get Items
-
-* Get the items for the Sales Order / Material request list
-* You can add/remove or change quantity of these Items.
-
-<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
-
-#### Step 4: Create Work Orders
-
-<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
-
-
-
-#### Step 5: Create Material Request
-
-Create Material Request for Items with projected shortfall.
-
-<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
-
-
-
-The Production Planning Tool is used in two stages:
-
-  * Selection of open Sales Orders / pending Material Request for the period based on “Expected Delivery Date”.
-  * Selection of Items from those Sales Orders / Material Requests
-
-The tool will update if you have already created Production Orde rs for a
-particular Item against its Sales Order (“Planned Quantity”) or Material Request.
-
-You can always edit the Item list and increase / reduce quantities to plan
-your production.
-
-> Note: How do you change a Production Plan? The output of the Production
-Planning Tool is the Work Order. Once your orders are created, you can
-change them by amending the Work Orders.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/non_profit/index.md b/erpnext/docs/user/manual/en/non_profit/index.md
index 819cf79..db1fbe4 100644
--- a/erpnext/docs/user/manual/en/non_profit/index.md
+++ b/erpnext/docs/user/manual/en/non_profit/index.md
@@ -21,7 +21,7 @@
         <iframe src='https://www.youtube.com/embed/p3l0Kq-TU5Y' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 ### User Manual
 
diff --git a/erpnext/docs/user/manual/en/projects/index.md b/erpnext/docs/user/manual/en/projects/index.md
index e658eb8..16a952a 100644
--- a/erpnext/docs/user/manual/en/projects/index.md
+++ b/erpnext/docs/user/manual/en/projects/index.md
@@ -29,7 +29,7 @@
         <iframe src='https://www.youtube.com/embed/mI8IkiGhaPA' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 ### User Manual
 
diff --git a/erpnext/docs/user/manual/en/projects/index.txt b/erpnext/docs/user/manual/en/projects/index.txt
index 2f450ac..11f5901 100644
--- a/erpnext/docs/user/manual/en/projects/index.txt
+++ b/erpnext/docs/user/manual/en/projects/index.txt
@@ -1,7 +1,9 @@
 tasks
 project
-time-log-batch
+timesheet
+project-customer-portal
+project-profitability
+project-expense-claims
 activity-type
 activity-cost
 articles
-timesheet
diff --git a/erpnext/docs/user/manual/en/projects/project-customer-portal.md b/erpnext/docs/user/manual/en/projects/project-customer-portal.md
new file mode 100644
index 0000000..24ea099
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project-customer-portal.md
@@ -0,0 +1,21 @@
+# Project from Customer Portal
+
+If you are doing a Project for a Customer, then Customer will need to be updated on its progress on timely bases. In ERPNext, since it is a Customer Portal feature, you can let Customer update oneself on the Project's progress via Customer Portal.
+
+### Add User as a Website User
+
+For a Customer to be able to access Project from the portal, should be added as a Website User. A Customer can also sign up from the Login Page of your ERPNext account, using the same Email ID as mentioned in the Contact master. Or you can invite that User from the Contact master.
+
+<img class="screenshot" alt="Customer in Project" src="{{docs_base_url}}/assets/img/project/project-portal-2.png">
+
+### Add Customer and User in Project
+
+In the Project master, check Customer Details section. Select a Customer and Sales Order associated with this Project.
+
+<img class="screenshot" alt="Customer in Project" src="{{docs_base_url}}/assets/img/project/project-portal-user.png">
+
+### Portal View of Project
+
+When a Customer logins from the Portal, he/she will be able to view all the Task for that Project. Also, the customer will be able to update the status of the Tasks or comment when needed.
+
+<img class="screenshot" alt="Customer in Project" src="{{docs_base_url}}/assets/img/project/project-portal.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project-expense-claims.md b/erpnext/docs/user/manual/en/projects/project-expense-claims.md
new file mode 100644
index 0000000..76e0389
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project-expense-claims.md
@@ -0,0 +1,15 @@
+# Project and Managing Expenses
+
+The Employees working on the Project incur various expenses, sometimes from their own pocket. In ERPNext, then can claim such expenses using [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html)
+
+In this Expense Claim, they can also select a Project for which that expense was incurred.
+
+Based on the Expense Claims made for a particular project, total Expense Claim Amount is updated in the Project master, under project costing section.
+
+* You can create an Expense Claims directly and link it to the Project.
+
+<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project-expense-claim-1.png">
+
+* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
+
+<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project-expense-claim-2.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project-profitability.md b/erpnext/docs/user/manual/en/projects/project-profitability.md
new file mode 100644
index 0000000..cea7050
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project-profitability.md
@@ -0,0 +1,36 @@
+# Project Profitability
+
+Project and related activities are generally active for longer time periods. While developments happen on the Project, there are various income and expense incurred against it. Hence, it becomes important to track the Profitability of a Project and ensure that you don't overspend.
+
+### Project in Sales Transactions
+
+You can link a Project in all the sales transactions like Sales Order, Delivery Note, Sales Invoice, and Payment. Linking Project with the sales transactions will help you in tracking income received against that Project.
+
+In sales transactions, Project field is generally available in the More Information section.
+
+<img class="screenshot" alt="Project in Sales" src="{{docs_base_url}}/assets/img/project/project-profitability-1.png">
+
+
+#### Project in Purchase Transactions
+
+The project can also be linked to the purchase transactions like Purchase Order, Purchase Receipt, and Purchase Invoice.
+
+In the purchase transactions, Project's link field is available in the Item table. This is because you could be procuring material for multiple Projects from the same purchase entry.
+
+<img class="screenshot" alt="Project in Purchases" src="{{docs_base_url}}/assets/img/project/project-profitability-2.png">
+
+### Budgeting against Project
+
+You can create Budget for a Project as well. The expense limit defined in the Budget master will be validated in the expense transactions.
+
+<img class="screenshot" alt="Project Budgeting" src="{{docs_base_url}}/assets/img/project/project-budgeting.png">
+
+### Project Profitability
+
+Based on the all the income and expense entries created for the Project, you can get its profitability.
+
+> Accounts > Profitability Analysis
+
+Filter report based on Project to check Projectwise Profitability.
+
+<img class="screenshot" alt="Project Profitability" src="{{docs_base_url}}/assets/img/project/profitability-analysis.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index 82f0e6d..a8091b8 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -1,13 +1,20 @@
 # Project
 
-Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
+The project is an individual or collaborative enterprise, possibly involving research or design, that is carefully planned, usually by a project team, to achieve a particular aim
 
-<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
+In ERPNext, Project management in is Task driven. You can a create Project and divide into multiple and assignable Tasks.
 
-<div class="embed-container">
-  <iframe src="https://www.youtube.com/embed/gCzShu9Niu4?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
-  </iframe>
-</div>
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-1.1.png">
+
+### Managing Tasks
+
+The project is generally has a broader scope, and hence not assignable to an individual. Hence, you can divide the Project into multiple Tasks. These can be assigned to an individual and tracked better. 
+
+These Tasks can be created from a Project itself or a [Task](/docs/user/manual/en/projects/tasks.html) can be created separately as well.
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-1.png">
+
+### Task Completion
 
 You can also track % Completion of a Project using different methods.
 
@@ -15,100 +22,39 @@
   2. Task Progress
   3. Task Weight
 
-<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-percent-complete.png">
+<img class="screenshot" alt="Project 2" src="{{docs_base_url}}/assets/img/project/project-2.png">
 
 Some examples of how the % Completion is calculated based on Tasks.
 
-<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-calc.png">
+<img class="screenshot" alt="Project 3" src="{{docs_base_url}}/assets/img/project/percent-complete-calc.png">
 
-<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-formula.png">
+<img class="screenshot" alt="Project 4" src="{{docs_base_url}}/assets/img/project/percent-complete-formula.png">
 
-### Managing tasks
-Project can be divided into multiple Tasks.
-Task can be created via Project document itself or can be created via  [Task](/docs/user/manual/en/projects/tasks.html)
-
-<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
-
-* To view Task made against a Project click on 'Tasks'
-
-<img class="screenshot" alt="Project - View Task" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
-
-<img class="screenshot" alt="Project - Task List" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
-
-* You can also view the Tasks from the Project document itself
-
-<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
-
-* To add Weights to Tasks you can follow the below steps
-
-<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/tasks.png">
-<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/task-weights.png">
-
-
-### Managing time
-
-ERPNext uses [Time Log](/docs/user/manual/en/projects/time-log.html) to track the progress of a Project.
-You can create Time Logs against each task.
-The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
-
-* To view Time Log made against a Project click on 'Time Logs'
-
-<img class="screenshot" alt="Project - View Time Log" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
-
-<img class="screenshot" alt="Project - Time Log List" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
-
-* You can also create a Time Log directlly and link it to the Project.
-
-<img class="screenshot" alt="Project - Link Time Log" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
-
-### Managing expenses
-
-You can book [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html) against a project task.
-The system shall update the total amount from expense claims in the project costing section.
-
-* To view Expense Claims made against a Project click on 'Expense Claims'
-
-<img class="screenshot" alt="Project - View Expense Claim" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
-
-* You can also create a Expense Claims directlly and link it to the Project.
-
-<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
-
-* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
-
-<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
-
-### Cost Center
-
-You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
-
-<img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
-
-###Project Costing
+### Project Costing
 
 The Project Costing section helps you track the time, expenses and purchases incurred against the project.
 
 <img class="screenshot" alt="Project - Costing" src="{{docs_base_url}}/assets/img/project/project_costing.png">
 
-* The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project.
+* The Total Cost is composed of the costing amount from timesheets, the total cost of expense claims and the total cost of purchase invoices created against this project.
 
 * The Gross Margin is the difference between Total Billed Amount and the Total Cost Amount for this project.
 
-###Billing
+### Gantt Chart
 
-You can make/link a [Sales Order](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
+ERPNext gives you an illustrated view of tasks scheduled for that project in Gantt Chart View.
 
-<img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
+* To view Gantt chart against a project, go to the Task list and Apply filter on the Project.
 
-###Gantt Chart
+<img class="screenshot" alt="Project Gantt" src="{{docs_base_url}}/assets/img/project/project-1.1.png">
 
-A Gantt Chart illustrates a project schedule.
-ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
+### Project Help Video
 
-* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
+This is a tutorial video on how to manage Project and associate Tasks in ERPNext.
 
-<img class="screenshot" alt="Project - View Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
+<div class="embed-container">
+  <iframe src="https://www.youtube.com/embed/gCzShu9Niu4?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+  </iframe>
+</div>
 
-<img class="screenshot" alt="Project - Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
-
-{next}
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
deleted file mode 100644
index 6904f4e..0000000
--- a/erpnext/docs/user/manual/en/projects/time-log-batch.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Time Log Batch
-
-You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to 
-
-> Projects > Time Sheet > New Time Sheet
-
-OR
-
-Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" button and these Time Logs will be selected.
-
-<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
-
-###Making Sales Invoice
-
-* After submitting the Time Sheet, "Make Invoice" button shall appear.
-
-<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
-
-* Click on that button to raise a Sales Invoice against the Time Sheet.
-
-<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_sales_invoice.png">
-
-* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed".
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
index 3fa3dcc..491a022 100644
--- a/erpnext/docs/user/manual/en/selling/index.md
+++ b/erpnext/docs/user/manual/en/selling/index.md
@@ -12,6 +12,6 @@
 
 
 <div class="embed-container">
-    <iframe width="560" height="315" src="https://www.youtube.com/embed/1eP90MWoDQM?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+    <iframe src="https://www.youtube.com/embed/1eP90MWoDQM?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
     </iframe>
 </div>
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 2886c05..cf688c7 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -102,7 +102,7 @@
   <div class="embed-container">
     <iframe src="https://www.youtube.com/embed/a8Eh4zLIrkU?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
     </iframe>
-  <div> 
+  </div>
 </div>
 
 {next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index db444d1..4ff84df 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -1,6 +1,6 @@
 # User Permissions
 
-Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data containted in the document being accessed. This is particularly useful when you want to restrict based on:
+Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data contained in the document being accessed. This is particularly useful when you want to restrict based on:
 
 1. Allow user to access data belonging to one Company
 1. Allow user to access data related to a specific Customer or Territory
@@ -17,28 +17,14 @@
 
 <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/new-user-permission.png" class="screenshot" alt="Creating a new user permission">
 
-If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions.
-
-### Choosing Which Roles to Apply
-
-You can also manually edit the the roles for which you want the user permissions to apply. To do that go the the **Role Permission Manager** and select the role for which you want to Edit the User Permissions.
-
-Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types"
-
-<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/select-document-types.png" class="screenshot" alt="Select Document Types to Edit the Setting">
-
-Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it.
-
-<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/view-selected-documents.png" class="screenshot" alt="Select Document Types to Edit the Setting">
-
 ### Ignoring User Permissions on Certain Fields
 
-Another way of allowing documents to be seen that have been restricited by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form**
+Another way of allowing documents to be seen that have been restricted by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form**
 
-For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions"
+For example you don't want Assets to be restricted for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions"
 
 
-<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/ignore-user-user-permissions.png" class="screenshot" alt="Ignore User Permissions on specific properties">
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png" class="screenshot" alt="Ignore User Permissions on specific properties">
 
 
 ### Strict Permissions
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index e5e4c44..058f537 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -42,6 +42,14 @@
 > Note 4: If you wish to give the option to cancel, you will have to write a
 workflow transition step that says from submitted you can cancel.
 
+
+#### Enable/Disable Self approval
+
+> New in Version 11
+
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-6.png">
+
+
 #### Conditions
 
 > New in Version 11
@@ -71,9 +79,30 @@
 
 <img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-5.png">
 
-<div class-"embed-container">
-    <iframe src="https://www.youtube.com/embed/yObJUg9FxFs?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
-    </iframe>
+#### Workflow Actions
+
+> New in Version 11
+
+Workflow Actions is a single place to manage all the pending actions you can take on Workflows.
+
+If a User is eligible to take action on some workflows, emails will be sent to the user, with the relevant document as attachment, from where the user can `Approve` or `Reject` the Workflow.
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-actions-email.png">
+
+Also the users will see entries in their Workflow Action list.
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-actions-list.png">
+
+**Note:** You can set email template for Workflow Actions on each state.
+The template might consist message for users to proceed with the next Workflow Actions
+
+
+### Video Tutorial:
+
+<div>
+    <div class="embed-container">
+        <iframe src="https://www.youtube.com/embed/yObJUg9FxFs?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+        </iframe>
+    </div>
 </div>
 
 {next}
+
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
index 9b140a6..f5a589d 100644
--- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -1,22 +1,24 @@
 #Allow Over Delivery/Billing
 
-While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master.
+When creating a Delivery Note, system validates if item's qty is same as in the Sales Order. If item's qty has been increased, you will get the validation message of over-delivery or receipt. 
 
-<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-1.png">
+Considering the case fo sales, if you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master.
 
-Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
+<img alt="Itemised Limit Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/limit-1.png">
 
-For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50%, then you are allowed to make Purchase Receipt for upto 150 units.
+When creating an invoice, item's rate is also validated based on the preceding transaction like Sales Order. This also applies when creating Purchase Receipt or Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
+
+For example, if you have ordered 100 units of an item, and if item's over receipt percent is 50, then you are allowed to make Purchase Receipt for upto 150 units.
 
 Update global value for "Allow over delivery or receipt upto this percent" from Stock Settings. Value updated here will be applicable for all the items.
 
 1. Go to `Stock > Setup > Stock Settings`
 
-2. Set `Allowance Percentage`.
+2. Set `Limit Percentage`.
 
 3. Save Stock Settings.
 
-<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-2.png">
+<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/limit-2.png">
 
 
 <!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md b/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md
new file mode 100644
index 0000000..02bdadf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/material-transfer-from-delivery-note.md
@@ -0,0 +1,29 @@
+# Material Transfer from Delivery Note
+
+In ERPNext, you can create Material Transfer entry from [Stock Entry](/docs/user/manual/en/stock/stock-entry.html) document. However, there are some scenarios in the Material Transfer where it needs to be presented as a Delivery Note. 
+
+### Scenarios
+
+1. One of the examples is when you transfer a Material from your stores to project site, however, you need to present it as a Delivery Note to the client.
+
+2. Also, there are statutory requirements where taxes are to be applied on each transfer of Material. It is easier to manage in a transaction like Delivery Note, than in the Stock Entry.
+
+Considering these scenarios, the provision of Material Transfer has been added in the Delivery Note as well. Following are the steps to use Delivery Note for creating Material Transfer entry.
+
+### Steps
+
+#### Enable Customer Warehouse
+
+Delivery Note Item doctype as a hidden field of Customer Warehouse. You can enable it from [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html). Here is the quick demonstration of the same.
+
+<img class="screenshot" alt="Delivery Note Material Transfer" src="{{docs_base_url}}/assets/img/stock/customer-warehouse.gif">
+
+### Select Warehouses
+
+When creating a Delivery Note for Material Transfer, for an item select source Warehouse as From Warehouse.
+
+In the Customer Warehouse, select a Warehouse where Material is to be transferred or select a target warehouse.
+
+<img class="screenshot" alt="Delivery Note Material Transfer" src="{{docs_base_url}}/assets/img/stock/customer-warehouse-2.png">
+
+On the submission of a Delivery Note, item's stock will be deducted from "From Warehouse" and added to the "Customer Warehouse".
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
index 0661a2e..c7a0bb1 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
@@ -62,6 +62,6 @@
         <iframe src="https://www.youtube.com/embed/nlHX0ZZ84Lw?start=120" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
index ebf7716..4c6b8b3 100644
--- a/erpnext/docs/user/manual/en/stock/index.md
+++ b/erpnext/docs/user/manual/en/stock/index.md
@@ -25,7 +25,7 @@
         <iframe src='https://www.youtube.com/embed/7tPifRTfbGo' frameborder='0' allowfullscreen>
         </iframe>
     </div>
-<div>
+</div>
 
 ### User Manual
 
diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
index b582427..7d8a3cd 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -65,6 +65,6 @@
 <div class="embed-container">
 	<iframe src="https://www.youtube.com/embed/SngZtDIMdiQ?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
 	</iframe>
-<div>
+</div>
 
 {next}
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index 1c2eb9d..fc32093 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -32,10 +32,11 @@
 > Info: Material Request is not mandatory. It is ideal if you have centralized
 buying so that you can collect this information from various departments.
 
-
 <div>
-  <iframe src="https://www.youtube.com/embed/55Gk2j7Q8Zw?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
-  </iframe>
+  <div class="embed-container">
+    <iframe src="https://www.youtube.com/embed/55Gk2j7Q8Zw?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+    </iframe>
+  </div>
 </div>
 
 {next}
diff --git a/erpnext/docs/user/videos/learn/advance-payments.md b/erpnext/docs/user/videos/learn/advance-payments.md
index f08053f..5abcd83 100644
--- a/erpnext/docs/user/videos/learn/advance-payments.md
+++ b/erpnext/docs/user/videos/learn/advance-payments.md
@@ -1,7 +1,7 @@
 # Advance Payment
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/J46-6qtyZ9U" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/3wiIXId6dzg" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 2:52**
+**Duration: 3:11**
 
 In sales and purchase transaction, generally advance payments are involved. This tutorial covers how you can create advance payment entries against Sales Order and Purchase Order, and adjust the same in the final invoice.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/discounts.md b/erpnext/docs/user/videos/learn/discounts.md
new file mode 100644
index 0000000..e4668bb
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/discounts.md
@@ -0,0 +1,7 @@
+# Applying Discounts
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/0850LAIPUBU" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:23**
+
+This is a video tutorial on how to apply discounts in the sales and purchase transactions.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/email-account.md b/erpnext/docs/user/videos/learn/email-account.md
index 0ac4e98..b2b40d6 100644
--- a/erpnext/docs/user/videos/learn/email-account.md
+++ b/erpnext/docs/user/videos/learn/email-account.md
@@ -1,7 +1,7 @@
 # Email Account
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/YFYe0DrB95o" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ChsFbIuG06g" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 2:27**
+**Duration: 4:00**
 
 This video walks you through setting up Email Account for incoming and outgoing emails. For hosted users, outgoing email gateway is set by default. Based on incoming email, you can have new document (like Issue, Lead etc.) auto-created, and have email received on these id's appended to specified document.
diff --git a/erpnext/docs/user/videos/learn/email-inbox.md b/erpnext/docs/user/videos/learn/email-inbox.md
new file mode 100644
index 0000000..dd69bb8
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/email-inbox.md
@@ -0,0 +1,7 @@
+# Email Inbox
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/KkKwtRwGvKw" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:51**
+
+This is video tutorial on how a user can configure an Email Inbox for his/her ID. Email Inbox is integrated well with other functionalities like Support Issues, Opportuniies and Communication.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/employee-advance.md b/erpnext/docs/user/videos/learn/employee-advance.md
new file mode 100644
index 0000000..48b9f08
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/employee-advance.md
@@ -0,0 +1,7 @@
+# Employee Advance
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ja-zY0-7NsQ" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:46**
+
+In this video, we will learn how an advance amount is given to an Employee, and how to adjust the same against an Expense Claim.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md
index 4457de0..fde6b48 100644
--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -79,9 +79,17 @@
             Opening Account Balances</a>
             <span class="text-muted pull-right">4:40</span>
         </li>
+        <li><a href="/docs/user/videos/learn/opening-invoice-creation-tool.html">
+            Opening Invoices Creation Tool</a>
+            <span class="text-muted pull-right">2:30</span>
+        </li>
         <li><a href="/docs/user/videos/learn/email-account.html">
             Email Account</a>
-            <span class="text-muted pull-right">2:27</span>
+            <span class="text-muted pull-right">4:00</span>
+        </li>
+        <li><a href="/docs/user/videos/learn/email-inbox.html">
+            Email Inbox</a>
+            <span class="text-muted pull-right">2:51</span>
         </li>
         <li><a href="/docs/user/videos/learn/file-manager.html">
             File Manager</a>
@@ -119,6 +127,14 @@
 			Drop Ship</a>
             <span class="text-muted pull-right">2:26</span>
         </li>
+        <li><a href="/docs/user/videos/learn/pricing-rule.html">
+			Pricing Rule</a>
+            <span class="text-muted pull-right">3:56</span>
+        </li>
+        <li><a href="/docs/user/videos/learn/discounts.html">
+			Discounts</a>
+            <span class="text-muted pull-right">2:23</span>
+        </li>
     </ul>
     <br>
     <h3>Buying</h3>
@@ -143,6 +159,14 @@
             Taxes</a>
             <span class="text-muted pull-right">5:13</span>
         </li>
+        <li><a href="/docs/user/videos/learn/pricing-rule.html">
+			Pricing Rule</a>
+            <span class="text-muted pull-right">3:56</span>
+        </li>
+        <li><a href="/docs/user/videos/learn/discounts.html">
+			Discounts</a>
+            <span class="text-muted pull-right">2:23</span>
+        </li>
     </ul>
     <br>
     <h3>Stock</h3>
@@ -201,12 +225,16 @@
         </li>
         <li><a href="/docs/user/videos/learn/advance-payments.html">
             Advance Payments</a>
-              <span class="text-muted pull-right">2:52</span>
+              <span class="text-muted pull-right">3:11</span>
         </li>
         <li><a href="/docs/user/videos/learn/budgeting.html">
               Budgeting</a>
             <span class="text-muted pull-right">3:26</span>
         </li>
+        <li><a href="/docs/user/videos/learn/subscription.html">
+              Subscription Management</a>
+            <span class="text-muted pull-right">2:09</span>
+        </li>
     </ul>
     <br>
     <h3>Manufacturing</h3>
@@ -215,10 +243,6 @@
             Bill of Materials</a>
             <span class="text-muted pull-right">3:27</span>
         </li>
-        <li><a href="/docs/user/videos/learn/production-planning.html">
-            Production Planning Tool</a>
-              <span class="text-muted pull-right">1:41</span>
-        </li>
         <li><a href="/docs/user/videos/learn/work-order.html">
             Work Order</a>
             <span class="text-muted pull-right">2:24</span>
@@ -249,6 +273,10 @@
             Expense Claims</a>
             <span class="text-muted pull-right">2:52</span>
         </li>
+        <li><a href="/docs/user/videos/learn/employee-advance.html">
+            Employee Advance</a>
+            <span class="text-muted pull-right">3:46</span>
+        </li>
     </ul>
     <br>
     <h3>Retail</h3>
diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt
index 956703b..116ac6c 100644
--- a/erpnext/docs/user/videos/learn/index.txt
+++ b/erpnext/docs/user/videos/learn/index.txt
@@ -42,4 +42,10 @@
 services
 distributors
 manufacturing-make-to-order
-manufacturing-enigneer-to-order
\ No newline at end of file
+manufacturing-enigneer-to-order
+opening-invoice-creation-tool
+pricing-rule
+discounts
+email-inbox
+subscription
+employee-advance
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md b/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md
new file mode 100644
index 0000000..0670fa1
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/opening-invoice-creation-tool.md
@@ -0,0 +1,7 @@
+# Opening Invoices Creation Tool
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/vfWmugaO1zw" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:30**
+
+An important on-boarding step for an E R P software includes updating opening sales and purchase invoices. In E R P Next, it is made simple with Opening Invoices Creation Tool. You can use this tool for quickly creatio opening Sales and Purchase Invoices.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/payment-terms.md b/erpnext/docs/user/videos/learn/payment-terms.md
index 1832b7f..a3821a8 100644
--- a/erpnext/docs/user/videos/learn/payment-terms.md
+++ b/erpnext/docs/user/videos/learn/payment-terms.md
@@ -5,10 +5,8 @@
     </iframe>
 </div>    
 
-**Duration: 2:55**
+**Duration: 2:56**
 
 This tutorial shows you how to set payment terms in ERPNext. Payment Terms help in defining the multiple payment slabs during sales or purchase transactions.
 
 In Payment Terms you can define the breakup of the payment to be received (or made) in terms of different payment modes and the period after the due date. You can also create templates to quickly load the payment terms in a transaction.
-
-
diff --git a/erpnext/docs/user/videos/learn/pricing-rule.md b/erpnext/docs/user/videos/learn/pricing-rule.md
new file mode 100644
index 0000000..fcc808a
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/pricing-rule.md
@@ -0,0 +1,8 @@
+# Pricing Rule
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/y-9BIWZ5x8Q" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:56**
+
+If you apply discounts on the item based on certain conditions, you can use Pricing Rule to define these conditions. In the Pricing Rule, you define criterias based on these parameters for the auto application
+of discount or margin.
diff --git a/erpnext/docs/user/videos/learn/product-bundle.md b/erpnext/docs/user/videos/learn/product-bundle.md
index c17456a..c63fe89 100644
--- a/erpnext/docs/user/videos/learn/product-bundle.md
+++ b/erpnext/docs/user/videos/learn/product-bundle.md
@@ -1,6 +1,6 @@
 # Product Bundle
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/yk3kPrRyRRc" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/dxv78E3UF0U" frameborder="0" allowfullscreen></iframe>
 
 **Duration: 2:31**
 
diff --git a/erpnext/docs/user/videos/learn/production-planning.md b/erpnext/docs/user/videos/learn/production-planning.md
deleted file mode 100644
index 2af4c91..0000000
--- a/erpnext/docs/user/videos/learn/production-planning.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Production Planning Tool
-
-<iframe width="660" height="371" src="https://www.youtube.com/embed/CzatSl4zJ2Y" frameborder="0" allowfullscreen></iframe>
-
-**Duration: 1:41**
-
-Production Planning Tool helps you plan production and purchase of Items for a period.
-
-This video walks you through production planning for Sales Order item. Material Planning allows you to check required quantity of raw materials for manufacturing. You can create Material Request for the raw-material items for which sufficient stock is not available. From Production Planning Tool, you can also create Work Order for the finished items.
diff --git a/erpnext/docs/user/videos/learn/serialized-inventory.md b/erpnext/docs/user/videos/learn/serialized-inventory.md
index e3b97e1..da2c036 100644
--- a/erpnext/docs/user/videos/learn/serialized-inventory.md
+++ b/erpnext/docs/user/videos/learn/serialized-inventory.md
@@ -1,8 +1,8 @@
 # Serialized Inventory
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/gvOVlEwFDAk" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Q4tYKYTbVek" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 4:11**
+**Duration: 5:33**
 
 If an Item is serialized, a Serial Number (Serial No) record is maintained for each unit of that Item. This information is helpful in tracking the location of the Serial No, its warranty and end-of-life (expiry) information.
 
diff --git a/erpnext/docs/user/videos/learn/subscription.md b/erpnext/docs/user/videos/learn/subscription.md
new file mode 100644
index 0000000..8193e58
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/subscription.md
@@ -0,0 +1,7 @@
+# Subscription Management
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/CRQfGiMm3_U" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:09**
+
+In this video, we will learn about subscription management in ERPNext. Let's suppose you have to create a purchase invoice every month for paying the property rent. You should only create first Purchase Invoice manually, and then create a Subscription for it, so that purchase invoice is auto-created for subsequent each month.
\ No newline at end of file
diff --git a/erpnext/education/doctype/course_schedule/course_schedule.json b/erpnext/education/doctype/course_schedule/course_schedule.json
index 9b7d897..b288e47 100644
--- a/erpnext/education/doctype/course_schedule/course_schedule.json
+++ b/erpnext/education/doctype/course_schedule/course_schedule.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,7 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -83,6 +83,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "instructor.Instructor_name",
    "fieldname": "instructor_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -95,7 +96,7 @@
    "label": "Instructor Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "instructor.Instructor_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -106,7 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -136,7 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -169,7 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -201,7 +202,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,7 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -262,7 +263,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -294,7 +295,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -326,7 +327,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -356,7 +357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -387,7 +388,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -418,7 +419,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -449,7 +450,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -464,7 +465,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-04-30 12:49:51.094872", 
+ "modified": "2018-05-16 22:43:20.695636",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Course Schedule", 
diff --git a/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json
index 11932fe..2926fe8 100644
--- a/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json
+++ b/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +199,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +229,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -254,6 +261,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -262,6 +270,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "instructor.instructor_name",
    "fieldname": "instructor_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -274,7 +283,7 @@
    "label": "Instructor Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "instructor.instructor_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -285,6 +294,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -314,6 +324,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -345,6 +356,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -374,6 +386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -405,6 +418,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -437,6 +451,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -468,6 +483,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -498,6 +514,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -527,6 +544,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -557,6 +575,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -588,6 +607,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -602,7 +622,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-11-21 16:47:58.091740", 
+ "modified": "2018-05-16 22:43:29.363798",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Course Scheduling Tool", 
@@ -611,7 +631,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
diff --git a/erpnext/education/doctype/fees/fees.js b/erpnext/education/doctype/fees/fees.js
index 2a7218a..7346a8d 100644
--- a/erpnext/education/doctype/fees/fees.js
+++ b/erpnext/education/doctype/fees/fees.js
@@ -66,6 +66,9 @@
 				};
 				frappe.set_route("query-report", "General Ledger");
 			}, __("View"));
+			frm.add_custom_button(__("Payments"), function() {
+				frappe.set_route("List", "Payment Entry", {"Payment Entry Reference.reference_name": frm.doc.name});
+			}, __("View"));
 		}
 		if(frm.doc.docstatus===1 && frm.doc.outstanding_amount>0) {
 			frm.add_custom_button(__("Payment Request"), function() {
diff --git a/erpnext/education/doctype/fees/fees.json b/erpnext/education/doctype/fees/fees.json
index 971197c..5c6d8dc 100644
--- a/erpnext/education/doctype/fees/fees.json
+++ b/erpnext/education/doctype/fees/fees.json
@@ -42,6 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -81,6 +83,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "student.title",
    "fieldname": "student_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -93,7 +96,7 @@
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "student.title", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -104,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -135,6 +139,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -166,6 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -197,6 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -226,6 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -257,6 +265,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -288,6 +297,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -318,6 +328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -349,6 +360,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -379,6 +391,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -409,6 +422,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -440,6 +454,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -471,6 +486,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -502,6 +518,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -534,6 +551,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -563,6 +581,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -594,6 +613,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -625,6 +645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -656,6 +677,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -685,6 +707,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -716,6 +739,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -747,6 +771,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -778,6 +803,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -807,6 +833,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -837,6 +864,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -866,6 +894,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -897,6 +926,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -927,6 +957,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -958,6 +989,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -989,6 +1021,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1019,6 +1052,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1050,6 +1084,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1079,6 +1114,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1110,6 +1146,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1140,6 +1177,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1171,6 +1209,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1202,6 +1241,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1231,6 +1271,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1262,6 +1303,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1276,7 +1318,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-02-08 02:12:34.185245", 
+ "modified": "2018-05-16 22:43:07.408788",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Fees", 
@@ -1285,7 +1327,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1305,7 +1346,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1325,7 +1365,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/instructor/instructor.js b/erpnext/education/doctype/instructor/instructor.js
index 62d73b3..f9c7a2a 100644
--- a/erpnext/education/doctype/instructor/instructor.js
+++ b/erpnext/education/doctype/instructor/instructor.js
@@ -1,31 +1,53 @@
 cur_frm.add_fetch("employee", "department", "department");
 cur_frm.add_fetch("employee", "image", "image");
 
-frappe.ui.form.on("Instructor", "refresh", function(frm) {
-	if(!frm.doc.__islocal) {
-		frm.add_custom_button(__("Student Group"), function() {
-			frappe.route_options = {
-				instructor: frm.doc.name
-			}
-			frappe.set_route("List", "Student Group");
+frappe.ui.form.on("Instructor", {
+	employee: function(frm) {
+		if(!frm.doc.employee) return;
+		frappe.db.get_value('Employee', {name: frm.doc.employee}, 'company', (company) => {
+			frm.set_query("department", function() {
+				return {
+					"filters": {
+						"company": company,
+					}
+				};
+			});
+
+			frm.set_query("department", "instructor_log", function() {
+				return {
+					"filters": {
+						"company": company,
+					}
+				};
+			});
 		});
-		frm.add_custom_button(__("Course Schedule"), function() {
-			frappe.route_options = {
-				instructor: frm.doc.name
-			}
-			frappe.set_route("List", "Course Schedule");
-		});
-		frm.add_custom_button(__("As Examiner"), function() {
-			frappe.route_options = {
-				examiner: frm.doc.name
-			}
-			frappe.set_route("List", "Assessment Plan");
-		}, __("Assessment Plan"));
-		frm.add_custom_button(__("As Supervisor"), function() {
-			frappe.route_options = {
-				supervisor: frm.doc.name
-			}
-			frappe.set_route("List", "Assessment Plan");
-		}, __("Assessment Plan"));
+	},
+	refresh: function(frm) {
+		if(!frm.doc.__islocal) {
+			frm.add_custom_button(__("Student Group"), function() {
+				frappe.route_options = {
+					instructor: frm.doc.name
+				}
+				frappe.set_route("List", "Student Group");
+			});
+			frm.add_custom_button(__("Course Schedule"), function() {
+				frappe.route_options = {
+					instructor: frm.doc.name
+				}
+				frappe.set_route("List", "Course Schedule");
+			});
+			frm.add_custom_button(__("As Examiner"), function() {
+				frappe.route_options = {
+					examiner: frm.doc.name
+				}
+				frappe.set_route("List", "Assessment Plan");
+			}, __("Assessment Plan"));
+			frm.add_custom_button(__("As Supervisor"), function() {
+				frappe.route_options = {
+					supervisor: frm.doc.name
+				}
+				frappe.set_route("List", "Assessment Plan");
+			}, __("Assessment Plan"));
+		}
 	}
 });
diff --git a/erpnext/education/doctype/instructor/instructor.json b/erpnext/education/doctype/instructor/instructor.json
index 0aeedb6..9662fc4 100644
--- a/erpnext/education/doctype/instructor/instructor.json
+++ b/erpnext/education/doctype/instructor/instructor.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -140,6 +144,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
    "fieldname": "department", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -163,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -193,6 +199,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +230,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -254,6 +262,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -269,7 +278,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-12-27 09:23:46.973763", 
+ "modified": "2018-05-17 11:47:24.959464",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Instructor", 
@@ -278,7 +287,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -298,7 +306,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/program_course/program_course.json b/erpnext/education/doctype/program_course/program_course.json
index c3d45d8..79ef717 100644
--- a/erpnext/education/doctype/program_course/program_course.json
+++ b/erpnext/education/doctype/program_course/program_course.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -70,6 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -78,6 +80,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "course.course_name",
    "fieldname": "course_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -90,7 +93,7 @@
    "label": "Course Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "course.course_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -101,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -131,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -145,7 +150,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-11-10 19:10:10.231463", 
+ "modified": "2018-05-16 22:42:58.326734",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Program Course", 
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.json b/erpnext/education/doctype/program_enrollment/program_enrollment.json
index 00b1373..817c4bc 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -50,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "student.title",
    "fieldname": "student_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -62,7 +64,7 @@
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "student.title", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -135,6 +139,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -166,6 +171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -195,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -226,6 +233,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -257,6 +265,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -288,6 +297,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -319,6 +329,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -352,6 +363,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -383,6 +395,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -414,6 +427,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -443,6 +457,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -473,6 +488,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -503,6 +519,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -534,6 +551,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -564,6 +582,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -595,6 +614,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": ""
   }, 
@@ -626,6 +646,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -656,6 +677,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -671,7 +693,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-12-27 10:59:36.838548", 
+ "modified": "2018-05-16 22:43:04.881120",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Program Enrollment", 
@@ -680,7 +702,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json
index 87d9db3..502a401 100644
--- a/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json
+++ b/erpnext/education/doctype/program_enrollment_course/program_enrollment_course.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "course.course_name",
    "fieldname": "course_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "Course Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "course.course_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -85,7 +88,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:11:54.272255", 
+ "modified": "2018-05-16 22:42:39.136276",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Program Enrollment Course", 
diff --git a/erpnext/education/doctype/student/student.py b/erpnext/education/doctype/student/student.py
index 841c2e8..53bf6f7 100644
--- a/erpnext/education/doctype/student/student.py
+++ b/erpnext/education/doctype/student/student.py
@@ -26,12 +26,12 @@
 			if not meta.issingle:
 				if "student_name" in [f.fieldname for f in meta.fields]:
 					frappe.db.sql("""UPDATE `tab{0}` set student_name = %s where {1} = %s"""
-						.format(d, linked_doctypes[d]["fieldname"]),(self.title, self.name))
+						.format(d, linked_doctypes[d]["fieldname"][0]),(self.title, self.name))
 
 				if "child_doctype" in linked_doctypes[d].keys() and "student_name" in \
 					[f.fieldname for f in frappe.get_meta(linked_doctypes[d]["child_doctype"]).fields]:
 					frappe.db.sql("""UPDATE `tab{0}` set student_name = %s where {1} = %s"""
-						.format(linked_doctypes[d]["child_doctype"], linked_doctypes[d]["fieldname"]),(self.title, self.name))
+						.format(linked_doctypes[d]["child_doctype"], linked_doctypes[d]["fieldname"][0]),(self.title, self.name))
 
 	def check_unique(self):
 		"""Validates if the Student Applicant is Unique"""
diff --git a/erpnext/education/doctype/student_attendance/student_attendance.json b/erpnext/education/doctype/student_attendance/student_attendance.json
index 07530b4..f703053 100644
--- a/erpnext/education/doctype/student_attendance/student_attendance.json
+++ b/erpnext/education/doctype/student_attendance/student_attendance.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -140,6 +144,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "student.title",
    "fieldname": "student_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -152,7 +157,7 @@
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "student.title", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -163,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -226,6 +233,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -239,7 +247,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:09:51.041960", 
+ "modified": "2018-05-16 22:43:27.329881",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Attendance", 
@@ -248,7 +256,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
index a749929..ac768d7 100644
--- a/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
+++ b/erpnext/education/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -162,6 +166,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -170,6 +175,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "course.course_name",
    "fieldname": "course_code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -182,7 +188,7 @@
    "label": "Course Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "course.course_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -193,6 +199,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +230,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -236,7 +244,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:08:27.657591", 
+ "modified": "2018-05-16 22:42:54.254306",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Group Creation Tool Course", 
diff --git a/erpnext/education/doctype/student_group_instructor/student_group_instructor.json b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json
index c09d7d3..549b548 100644
--- a/erpnext/education/doctype/student_group_instructor/student_group_instructor.json
+++ b/erpnext/education/doctype/student_group_instructor/student_group_instructor.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -70,6 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -78,6 +80,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "instructor.instructor_name",
    "fieldname": "instructor_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -90,7 +93,7 @@
    "label": "Instructor Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "instructor.instructor_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -101,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -114,7 +118,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:11:31.439735", 
+ "modified": "2018-05-16 22:43:13.173633",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Group Instructor", 
diff --git a/erpnext/education/doctype/student_leave_application/student_leave_application.json b/erpnext/education/doctype/student_leave_application/student_leave_application.json
index 93ff1ad..bbf34a6 100644
--- a/erpnext/education/doctype/student_leave_application/student_leave_application.json
+++ b/erpnext/education/doctype/student_leave_application/student_leave_application.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -50,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "student.title",
    "fieldname": "student_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -62,7 +64,7 @@
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "student.title", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +106,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -133,6 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +168,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +230,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -253,6 +261,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -283,6 +292,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -296,7 +306,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:09:31.848381", 
+ "modified": "2018-05-16 22:42:40.945767",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Leave Application", 
@@ -305,7 +315,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -325,7 +334,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/student_log/student_log.json b/erpnext/education/doctype/student_log/student_log.json
index 9d55bb9..9b84ece 100644
--- a/erpnext/education/doctype/student_log/student_log.json
+++ b/erpnext/education/doctype/student_log/student_log.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -50,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "student.title",
    "fieldname": "student_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -62,7 +64,7 @@
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "student.title", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,6 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +232,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -256,6 +264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -287,6 +296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -316,6 +326,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -346,6 +357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -359,7 +371,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 19:04:50.483773", 
+ "modified": "2018-05-16 22:43:18.629501",
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Log", 
@@ -368,7 +380,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js
index d5103ca..565074d 100644
--- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js
+++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js
@@ -24,7 +24,7 @@
 		frm.page.clear_indicator();
 		frm.page.set_primary_action(__('Print Report Card'), () => {
 			let url = "/api/method/erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.preview_report_card";
-			open_url_post(url, frm.doc, true);
+			open_url_post(url, {"doc": frm.doc}, true);
 		});
 	},
 
diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
index 7b2e007..f997975 100644
--- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
+++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
@@ -3,7 +3,7 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.model.document import Document
 from erpnext.education.api import get_grade
 from frappe.utils.pdf import get_pdf
@@ -16,8 +16,8 @@
 
 
 @frappe.whitelist()
-def preview_report_card(**kwargs):
-	doc = frappe._dict(**kwargs)
+def preview_report_card(doc):
+	doc = frappe._dict(json.loads(doc))
 	doc.students = [doc.student]
 	if not (doc.student_name and doc.student_batch):
 		program_enrollment = frappe.get_all("Program Enrollment", fields=["student_batch_name", "student_name"],
@@ -33,7 +33,7 @@
 	course_criteria = get_courses_criteria(courses)
 
 	# get the assessment group as per the user selection
-	if int(doc.include_all_assessment):
+	if doc.include_all_assessment:
 		assessment_groups = get_child_assessment_groups(doc.assessment_group)
 	else:
 		assessment_groups = [doc.assessment_group]
@@ -55,7 +55,7 @@
 			"assessment_groups": assessment_groups,
 			"course_criteria": course_criteria,
 			"letterhead": letterhead.content,
-			"add_letterhead": int(doc.add_letterhead) if int(doc.add_letterhead) else 0
+			"add_letterhead": doc.add_letterhead if doc.add_letterhead else 0
 		})
 	final_template = frappe.render_template(base_template_path, {"body": html, "title": "Report Card"})
 
diff --git a/erpnext/erpnext_integrations/connectors/shopify_connection.py b/erpnext/erpnext_integrations/connectors/shopify_connection.py
new file mode 100644
index 0000000..88078ab
--- /dev/null
+++ b/erpnext/erpnext_integrations/connectors/shopify_connection.py
@@ -0,0 +1,257 @@
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+import json
+from frappe.utils import cstr, cint, nowdate, flt
+from erpnext.erpnext_integrations.utils import validate_webhooks_request
+from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note, make_sales_invoice
+from erpnext.erpnext_integrations.doctype.shopify_settings.sync_product import sync_item_from_shopify
+from erpnext.erpnext_integrations.doctype.shopify_settings.sync_customer import create_customer
+from erpnext.erpnext_integrations.doctype.shopify_log.shopify_log import make_shopify_log, dump_request_data
+
+@frappe.whitelist(allow_guest=True)
+@validate_webhooks_request("Shopify Settings", 'X-Shopify-Hmac-Sha256', secret_key='shared_secret')
+def store_request_data(order=None, event=None):
+	if frappe.request:
+		order = json.loads(frappe.request.data)
+		event = frappe.request.headers.get('X-Shopify-Topic')
+
+	dump_request_data(order, event)
+
+def sync_sales_order(order, request_id=None):
+	shopify_settings = frappe.get_doc("Shopify Settings")
+	frappe.flags.request_id = request_id
+
+	if not frappe.db.get_value("Sales Order", filters={"shopify_order_id": cstr(order['id'])}):
+		try:
+			validate_customer(order, shopify_settings)
+			validate_item(order, shopify_settings)
+			create_order(order, shopify_settings)
+		except Exception as e:
+			make_shopify_log(status="Error", message=e.message, exception=False)
+		else:
+			make_shopify_log(status="Success")
+
+def prepare_sales_invoice(order, request_id=None):
+	shopify_settings = frappe.get_doc("Shopify Settings")
+	frappe.flags.request_id = request_id
+
+	try:
+		sales_order = get_sales_order(cstr(order['id']))
+		if sales_order:
+			create_sales_invoice(order, shopify_settings, sales_order)
+		make_shopify_log(status="Success")
+	except Exception:
+		make_shopify_log(status="Error", exception=True)
+
+def prepare_delivery_note(order, request_id=None):
+	shopify_settings = frappe.get_doc("Shopify Settings")
+	frappe.flags.request_id = request_id
+
+	try:
+		sales_order = get_sales_order(cstr(order['id']))
+		if sales_order:
+			create_delivery_note(order, shopify_settings, sales_order)
+		make_shopify_log(status="Success")
+	except Exception:
+		make_shopify_log(status="Error", exception=True)
+
+def get_sales_order(shopify_order_id):
+	sales_order = frappe.db.get_value("Sales Order", filters={"shopify_order_id": shopify_order_id})
+	if sales_order:
+		so = frappe.get_doc("Sales Order", sales_order)
+		return so
+
+def validate_customer(order, shopify_settings):
+	customer_id = order.get("customer", {}).get("id")
+	if customer_id:
+		if not frappe.db.get_value("Customer", {"shopify_customer_id": customer_id}, "name"):
+			create_customer(order.get("customer"), shopify_settings)
+
+def validate_item(order, shopify_settings):
+	for item in order.get("line_items"):
+		if item.get("product_id") and not frappe.db.get_value("Item", {"shopify_product_id": item.get("product_id")}, "name"):
+			sync_item_from_shopify(shopify_settings, item)
+
+def create_order(order, shopify_settings, company=None):
+	so = create_sales_order(order, shopify_settings, company)
+	if so:
+		if order.get("financial_status") == "paid":
+			create_sales_invoice(order, shopify_settings, so)
+
+		if order.get("fulfillments"):
+			create_delivery_note(order, shopify_settings, so)
+
+def create_sales_order(shopify_order, shopify_settings, company=None):
+	product_not_exists = []
+	customer = frappe.db.get_value("Customer", {"shopify_customer_id": shopify_order.get("customer", {}).get("id")}, "name")
+	so = frappe.db.get_value("Sales Order", {"shopify_order_id": shopify_order.get("id")}, "name")
+
+	if not so:
+		items = get_order_items(shopify_order.get("line_items"), shopify_settings)
+
+		if not items:
+			message = 'Following items are exists in order but relevant record not found in Product master'
+			message += "\n" + ", ".join(product_not_exists)
+
+			make_shopify_log(status="Error", message=message, exception=True)
+
+			return ''
+
+		so = frappe.get_doc({
+			"doctype": "Sales Order",
+			"naming_series": shopify_settings.sales_order_series or "SO-Shopify-",
+			"shopify_order_id": shopify_order.get("id"),
+			"customer": customer or shopify_settings.default_customer,
+			"delivery_date": nowdate(),
+			"company": shopify_settings.company,
+			"selling_price_list": shopify_settings.price_list,
+			"ignore_pricing_rule": 1,
+			"items": items,
+			"taxes": get_order_taxes(shopify_order, shopify_settings),
+			"apply_discount_on": "Grand Total",
+			"discount_amount": get_discounted_amount(shopify_order),
+		})
+
+		if company:
+			so.update({
+				"company": company,
+				"status": "Draft"
+			})
+		so.flags.ignore_mandatory = True
+		so.save(ignore_permissions=True)
+		so.submit()
+
+	else:
+		so = frappe.get_doc("Sales Order", so)
+	
+	frappe.db.commit()
+	return so
+
+def create_sales_invoice(shopify_order, shopify_settings, so):
+	if not frappe.db.get_value("Sales Invoice", {"shopify_order_id": shopify_order.get("id")}, "name")\
+		and so.docstatus==1 and not so.per_billed and cint(shopify_settings.sync_sales_invoice):
+
+		si = make_sales_invoice(so.name, ignore_permissions=True)
+		si.shopify_order_id = shopify_order.get("id")
+		si.naming_series = shopify_settings.sales_invoice_series or "SI-Shopify-"
+		si.flags.ignore_mandatory = True
+		set_cost_center(si.items, shopify_settings.cost_center)
+		si.submit()
+		make_payament_entry_against_sales_invoice(si, shopify_settings)
+		frappe.db.commit()
+
+def set_cost_center(items, cost_center):
+	for item in items:
+		item.cost_center = cost_center
+
+def make_payament_entry_against_sales_invoice(doc, shopify_settings):
+	from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+	payemnt_entry = get_payment_entry(doc.doctype, doc.name, bank_account=shopify_settings.cash_bank_account)
+	payemnt_entry.flags.ignore_mandatory = True
+	payemnt_entry.reference_no = doc.name
+	payemnt_entry.reference_date = nowdate()
+	payemnt_entry.submit()
+
+def create_delivery_note(shopify_order, shopify_settings, so):
+	if not cint(shopify_settings.sync_delivery_note):
+		return
+
+	for fulfillment in shopify_order.get("fulfillments"):
+		if not frappe.db.get_value("Delivery Note", {"shopify_fulfillment_id": fulfillment.get("id")}, "name")\
+			and so.docstatus==1:
+
+			dn = make_delivery_note(so.name)
+			dn.shopify_order_id = fulfillment.get("order_id")
+			dn.shopify_fulfillment_id = fulfillment.get("id")
+			dn.naming_series = shopify_settings.delivery_note_series or "DN-Shopify-"
+			dn.items = get_fulfillment_items(dn.items, fulfillment.get("line_items"), shopify_settings)
+			dn.flags.ignore_mandatory = True
+			dn.save()
+			frappe.db.commit()
+
+def get_fulfillment_items(dn_items, fulfillment_items, shopify_settings):
+	return [dn_item.update({"qty": item.get("quantity")}) for item in fulfillment_items for dn_item in dn_items\
+			if get_item_code(item) == dn_item.item_code]
+
+def get_discounted_amount(order):
+	discounted_amount = 0.0
+	for discount in order.get("discount_codes"):
+		discounted_amount += flt(discount.get("amount"))
+	return discounted_amount
+
+def get_order_items(order_items, shopify_settings):
+	items = []
+	all_product_exists = True
+	product_not_exists = []
+
+	for shopify_item in order_items:
+		if not shopify_item.get('product_exists'):
+			all_product_exists = False
+			product_not_exists.append({'title':shopify_item.get('title'),
+				'shopify_order_id': shopify_item.get('id')})
+			continue
+
+		if all_product_exists:
+			item_code = get_item_code(shopify_item)
+			items.append({
+				"item_code": item_code,
+				"item_name": shopify_item.get("name"),
+				"rate": shopify_item.get("price"),
+				"delivery_date": nowdate(),
+				"qty": shopify_item.get("quantity"),
+				"stock_uom": shopify_item.get("sku"),
+				"warehouse": shopify_settings.warehouse
+			})
+		else:
+			items = []
+
+	return items
+
+def get_item_code(shopify_item):
+	item_code = frappe.db.get_value("Item", {"shopify_variant_id": shopify_item.get("variant_id")}, "item_code")
+	if not item_code:
+		item_code = frappe.db.get_value("Item", {"shopify_product_id": shopify_item.get("product_id")}, "item_code")
+	if not item_code:
+		item_code = frappe.db.get_value("Item", {"item_name": shopify_item.get("title")}, "item_code")
+
+	return item_code
+
+def get_order_taxes(shopify_order, shopify_settings):
+	taxes = []
+	for tax in shopify_order.get("tax_lines"):
+		taxes.append({
+			"charge_type": _("On Net Total"),
+			"account_head": get_tax_account_head(tax),
+			"description": "{0} - {1}%".format(tax.get("title"), tax.get("rate") * 100.0),
+			"rate": tax.get("rate") * 100.00,
+			"included_in_print_rate": 1 if shopify_order.get("taxes_included") else 0,
+			"cost_center": shopify_settings.cost_center
+		})
+
+	taxes = update_taxes_with_shipping_lines(taxes, shopify_order.get("shipping_lines"), shopify_settings)
+
+	return taxes
+
+def update_taxes_with_shipping_lines(taxes, shipping_lines, shopify_settings):
+	for shipping_charge in shipping_lines:
+		taxes.append({
+			"charge_type": _("Actual"),
+			"account_head": get_tax_account_head(shipping_charge),
+			"description": shipping_charge["title"],
+			"tax_amount": shipping_charge["price"],
+			"cost_center": shopify_settings.cost_center
+		})
+
+	return taxes
+
+def get_tax_account_head(tax):
+	tax_title = tax.get("title").encode("utf-8")
+
+	tax_account =  frappe.db.get_value("Shopify Tax Account", \
+		{"parent": "Shopify Settings", "shopify_tax": tax_title}, "tax_account")
+
+	if not tax_account:
+		frappe.throw("Tax Account not specified for Shopify Tax {0}".format(tax.get("title")))
+
+	return tax_account
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/erpnext_integrations/doctype/shopify_log/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/erpnext_integrations/doctype/shopify_log/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js
new file mode 100644
index 0000000..d3fe7d2b
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Shopify Log', {
+	refresh: function(frm) {
+		if (frm.doc.request_data && frm.doc.status=='Error'){
+			frm.add_custom_button('Resync', function() {
+				frappe.call({
+					method:"erpnext.erpnext_integrations.doctype.shopify_log.shopify_log.resync",
+					args:{
+						method:frm.doc.method,
+						name: frm.doc.name,
+						request_data: frm.doc.request_data
+					},
+					callback: function(r){
+						frappe.msgprint(__("Order rescheduled for sync"))
+					}
+				})
+			}).addClass('btn-primary');
+		}
+	}
+});
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.json b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.json
new file mode 100644
index 0000000..ab373ee
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.json
@@ -0,0 +1,268 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-03-14 10:02:06.227184", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Queued", 
+   "fieldname": "status", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "method", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "message", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Message", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "traceback", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Traceback", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "request_data", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Request Data", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 1, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-20 16:23:36.862381", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "Shopify Log", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py
new file mode 100644
index 0000000..e6e6579
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe.model.document import Document
+from erpnext.erpnext_integrations.utils import get_webhook_address
+
+class ShopifyLog(Document):
+	pass
+
+
+def make_shopify_log(status="Queued", message=None, exception=False):
+	# if name not provided by log calling method then fetch existing queued state log
+	if not frappe.flags.request_id:
+		return
+
+	log = frappe.get_doc("Shopify Log", frappe.flags.request_id)
+
+	if exception:
+		frappe.db.rollback()
+		log = frappe.get_doc({"doctype":"Shopify Log"}).insert(ignore_permissions=True)
+
+	log.message = message if message else ''
+	log.traceback = frappe.get_traceback()
+	log.status = status
+	log.save(ignore_permissions=True)
+	frappe.db.commit()
+
+def dump_request_data(data, event="create/order"):
+	event_mapper = {
+		"orders/create": get_webhook_address(connector_name='shopify_connection', method="sync_sales_order", exclude_uri=True),
+		"orders/paid" : get_webhook_address(connector_name='shopify_connection', method="prepare_sales_invoice", exclude_uri=True),
+		"orders/fulfilled": get_webhook_address(connector_name='shopify_connection', method="prepare_delivery_note", exclude_uri=True)
+	}
+
+	log = frappe.get_doc({
+		"doctype": "Shopify Log",
+		"request_data": json.dumps(data, indent=1),
+		"method": event_mapper[event]
+	}).insert(ignore_permissions=True)
+
+	frappe.db.commit()
+	frappe.enqueue(method=event_mapper[event], queue='short', timeout=300, async=True, 
+		**{"order": data, "request_id": log.name})
+
+@frappe.whitelist()
+def resync(method, name, request_data):
+	frappe.db.set_value("Shopify Log", name, "status", "Queued", update_modified=False)
+	frappe.enqueue(method=method, queue='short', timeout=300, async=True, 
+		**{"order": json.loads(request_data), "request_id": name})
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log_list.js b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log_list.js
new file mode 100644
index 0000000..0913ce4
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log_list.js
@@ -0,0 +1,12 @@
+frappe.listview_settings['Shopify Log'] = {
+	add_fields: ["status"],
+	get_indicator: function(doc) {
+		if(doc.status==="Success"){
+			return [__("Success"), "green", "status,=,Success"];
+        } else if(doc.status ==="Error"){
+			return [__("Error"), "red", "status,=,Error"];
+        } else if(doc.status ==="Queued"){
+			return [__("Queued"), "orange", "status,=,Queued"];
+        }
+	}
+}
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.js b/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.js
new file mode 100644
index 0000000..d22b6d5
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shopify Log", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shopify Log
+		() => frappe.tests.make('Shopify Log', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.py b/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.py
new file mode 100644
index 0000000..5892e1d
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/test_shopify_log.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Shopify Log')
+
+class TestShopifyLog(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/erpnext_integrations/doctype/shopify_settings/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/erpnext_integrations/doctype/shopify_settings/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.js b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.js
new file mode 100644
index 0000000..1574795
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.js
@@ -0,0 +1,90 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.provide("erpnext_integrations.shopify_settings");
+
+frappe.ui.form.on("Shopify Settings", "onload", function(frm){
+	frappe.call({
+		method:"erpnext.erpnext_integrations.doctype.shopify_settings.shopify_settings.get_series",
+		callback:function(r){
+			$.each(r.message, function(key, value){
+				set_field_options(key, value);
+			});
+		}
+	});
+	erpnext_integrations.shopify_settings.setup_queries(frm);
+})
+
+frappe.ui.form.on("Shopify Settings", "app_type", function(frm) {
+	frm.toggle_reqd("api_key", (frm.doc.app_type == "Private"));
+	frm.toggle_reqd("password", (frm.doc.app_type == "Private"));
+})
+
+frappe.ui.form.on("Shopify Settings", "refresh", function(frm){
+	if(!frm.doc.__islocal && frm.doc.enable_shopify === 1){
+		frm.toggle_reqd("price_list", true);
+		frm.toggle_reqd("warehouse", true);
+		frm.toggle_reqd("taxes", true);
+		frm.toggle_reqd("company", true);
+		frm.toggle_reqd("cost_center", true);
+		frm.toggle_reqd("cash_bank_account", true);
+		frm.toggle_reqd("sales_order_series", true);
+		frm.toggle_reqd("customer_group", true);
+		frm.toggle_reqd("shared_secret", true);
+
+		frm.toggle_reqd("sales_invoice_series", frm.doc.sync_sales_invoice);
+		frm.toggle_reqd("delivery_note_series", frm.doc.sync_delivery_note);
+
+	}
+})
+
+$.extend(erpnext_integrations.shopify_settings, {
+	setup_queries: function(frm) {
+		frm.fields_dict["warehouse"].get_query = function(doc) {
+			return {
+				filters:{
+					"company": doc.company,
+					"is_group": "No"
+				}
+			}
+		}
+
+		frm.fields_dict["taxes"].grid.get_field("tax_account").get_query = function(doc){
+			return {
+				"query": "erpnext.controllers.queries.tax_account_query",
+				"filters": {
+					"account_type": ["Tax", "Chargeable", "Expense Account"],
+					"company": doc.company
+				}
+			}
+		}
+
+		frm.fields_dict["cash_bank_account"].get_query = function(doc) {
+			return {
+				filters: [
+					["Account", "account_type", "in", ["Cash", "Bank"]],
+					["Account", "root_type", "=", "Asset"],
+					["Account", "is_group", "=",0],
+					["Account", "company", "=", doc.company]
+				]
+			}
+		}
+
+		frm.fields_dict["cost_center"].get_query = function(doc) {
+			return {
+				filters:{
+					"company": doc.company,
+					"is_group": "No"
+				}
+			}
+		}
+
+		frm.fields_dict["price_list"].get_query = function() {
+			return {
+				filters:{
+					"selling": 1
+				}
+			}
+		}
+	}
+})
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
new file mode 100644
index 0000000..cf1c0ad
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
@@ -0,0 +1,1257 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-05-18 05:21:07.270859", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "System", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "status html", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "enable_shopify", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Enable Shopify", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Public", 
+   "fieldname": "app_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "App Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Public\nPrivate", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "last_sync_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Last Sync Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "eg: frappe.myshopify.com", 
+   "fieldname": "shopify_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Shop URL", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.app_type==\"Private\"", 
+   "fieldname": "api_key", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "API Key", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.app_type==\"Private\"", 
+   "fieldname": "password", 
+   "fieldtype": "Password", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Password", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shared_secret", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shared secret", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "access_token", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Access Token", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_38", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Webhooks Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "webhooks", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Webhooks", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shopify Webhook Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_15", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order", 
+   "fieldname": "default_customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "description": "Customer Group will set to selected group while syncing customers from Shopify", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_dependent_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "For Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Cash Account will used for Sales Invoice creation", 
+   "fieldname": "cash_bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cash/Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "erp_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "price_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Price List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "update_price_in_erpnext_price_list", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Update Price from Shopify To ERPNext Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_26", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "", 
+   "description": "Default Warehouse to to create Sales Order and Delivery Note", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_25", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_order_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Order Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_27", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "sync_delivery_note", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Import Delivery Notes from Shopify on Shipment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.sync_delivery_note==1", 
+   "fieldname": "delivery_note_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivery Note Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "sync_sales_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Import Sales Invoice from Shopify if Payment is marked", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.sync_sales_invoice==1", 
+   "fieldname": "sales_invoice_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Invoice Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "html_16", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Map Shopify Taxes / Shipping Charges to ERPNext Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "taxes", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shopify Tax Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shopify Tax Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-11 19:04:53.396557", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "Shopify Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
new file mode 100644
index 0000000..fd4f498
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import get_request_session
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+from erpnext.erpnext_integrations.utils import get_webhook_address
+from erpnext.erpnext_integrations.doctype.shopify_log.shopify_log import make_shopify_log
+
+class ShopifySettings(Document):
+	def validate(self):
+		if self.enable_shopify == 1:
+			setup_custom_fields()
+			self.validate_access_credentials()
+			self.register_webhooks()
+		else:
+			self.unregister_webhooks()
+
+		self.validate_app_type()
+
+	def validate_access_credentials(self):
+		if self.app_type == "Private":
+			if not (self.get_password(raise_exception=False) and self.api_key and self.shopify_url):
+				frappe.msgprint(_("Missing value for Password, API Key or Shopify URL"), raise_exception=frappe.ValidationError)
+
+		else:
+			if not (self.access_token and self.shopify_url):
+				frappe.msgprint(_("Access token or Shopify URL missing"), raise_exception=frappe.ValidationError)
+
+	def validate_app_type(self):
+		if self.app_type == "Public":
+			frappe.throw(_("Support for public app is deprecated. Please setup private app, for more details refer user manual"))
+
+	def register_webhooks(self):
+		webhooks = ["orders/create", "orders/paid", "orders/fulfilled"]
+
+		url = get_shopify_url('admin/webhooks.json', self)
+		created_webhooks = [d.method for d in self.webhooks]
+
+		for method in webhooks:
+			if method in created_webhooks:
+				continue
+
+			session = get_request_session()
+			try:
+				d = session.post(url, data=json.dumps({
+					"webhook": {
+						"topic": method,
+						"address": get_webhook_address(connector_name='shopify_connection', method='store_request_data'),
+						"format": "json"
+						}
+					}), headers=get_header(self))
+				d.raise_for_status()
+				self.update_webhook_table(method, d.json())
+			except Exception as e:
+				make_shopify_log(status="Warning", method="register_webhooks",
+					message=e.message, exception=False)
+
+	def unregister_webhooks(self):
+		session = get_request_session()
+		deleted_webhooks = []
+
+		for d in self.webhooks:
+			url = get_shopify_url('admin/webhooks/{0}.json'.format(d.webhook_id), self)
+			try:
+				res = session.delete(url, headers=get_header(self))
+				res.raise_for_status()
+				deleted_webhooks.append(d)
+			except Exception as e:
+				frappe.log_error(message=frappe.get_traceback(), title=e.message[:140])
+
+		for d in deleted_webhooks:
+			self.remove(d)
+
+	def update_webhook_table(self, method, res):
+		self.append("webhooks", {
+			"webhook_id": res['webhook']['id'],
+			"method": method
+		})
+
+def get_shopify_url(path, settings):
+	if settings.app_type == "Private":
+		return 'https://{}:{}@{}/{}'.format(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
+	else:
+		return 'https://{}/{}'.format(settings.shopify_url, path)
+
+def get_header(settings):
+	header = {'Content-Type': 'application/json'}
+
+	if settings.app_type == "Private":
+		return header
+	else:
+		header["X-Shopify-Access-Token"] = settings.access_token
+		return header
+
+@frappe.whitelist()
+def get_series():
+	return {
+		"sales_order_series" : frappe.get_meta("Sales Order").get_options("naming_series") or "SO-Shopify-",
+		"sales_invoice_series" : frappe.get_meta("Sales Invoice").get_options("naming_series")  or "SI-Shopify-",
+		"delivery_note_series" : frappe.get_meta("Delivery Note").get_options("naming_series")  or "DN-Shopify-"
+	}
+
+def setup_custom_fields():
+	custom_fields = {
+		"Customer": [dict(fieldname='shopify_customer_id', label='Shopify Customer Id',
+			fieldtype='Data', insert_after='series', read_only=1, print_hide=1)],
+		"Address": [dict(fieldname='shopify_address_id', label='Shopify Address Id',
+			fieldtype='Data', insert_after='fax', read_only=1, print_hide=1)],
+		"Item": [
+			dict(fieldname='shopify_variant_id', label='Shopify Variant Id',
+				fieldtype='Data', insert_after='item_code', read_only=1, print_hide=1),
+			dict(fieldname='shopify_product_id', label='Shopify Product Id',
+				fieldtype='Data', insert_after='item_code', read_only=1, print_hide=1),
+			dict(fieldname='shopify_description', label='Shopify Description',
+				fieldtype='Text Editor', insert_after='description', read_only=1, print_hide=1)
+		],
+		"Sales Order": [dict(fieldname='shopify_order_id', label='Shopify Order Id',
+			fieldtype='Data', insert_after='title', read_only=1, print_hide=1)],
+		"Delivery Note":[
+			dict(fieldname='shopify_order_id', label='Shopify Order Id',
+				fieldtype='Data', insert_after='title', read_only=1, print_hide=1),
+			dict(fieldname='shopify_fulfillment_id', label='Shopify Fulfillment Id',
+				fieldtype='Data', insert_after='title', read_only=1, print_hide=1)
+		],
+		"Sales Invoice": [dict(fieldname='shopify_order_id', label='Shopify Order Id',
+			fieldtype='Data', insert_after='title', read_only=1, print_hide=1)]
+	}
+
+	create_custom_fields(custom_fields)
+
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
new file mode 100644
index 0000000..02e1fc9
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
@@ -0,0 +1,68 @@
+import frappe
+from frappe import _
+
+def create_customer(shopify_customer, shopify_settings):
+	import frappe.utils.nestedset
+
+	cust_name = (shopify_customer.get("first_name") + " " + (shopify_customer.get("last_name") \
+		and  shopify_customer.get("last_name") or "")) if shopify_customer.get("first_name")\
+		else shopify_customer.get("email")
+
+	try:
+		customer = frappe.get_doc({
+			"doctype": "Customer",
+			"name": shopify_customer.get("id"),
+			"customer_name" : cust_name,
+			"shopify_customer_id": shopify_customer.get("id"),
+			"sync_with_shopify": 1,
+			"customer_group": shopify_settings.customer_group,
+			"territory": frappe.utils.nestedset.get_root_of("Territory"),
+			"customer_type": _("Individual")
+		})
+		customer.flags.ignore_mandatory = True
+		customer.insert()
+
+		if customer:
+			create_customer_address(customer, shopify_customer)
+
+		frappe.db.commit()
+
+	except Exception as e:
+		raise e
+
+def create_customer_address(customer, shopify_customer):
+	if not shopify_customer.get("addresses"):
+		return
+
+	for i, address in enumerate(shopify_customer.get("addresses")):
+		address_title, address_type = get_address_title_and_type(customer.customer_name, i)
+		try :
+			frappe.get_doc({
+				"doctype": "Address",
+				"shopify_address_id": address.get("id"),
+				"address_title": address_title,
+				"address_type": address_type,
+				"address_line1": address.get("address1") or "Address 1",
+				"address_line2": address.get("address2"),
+				"city": address.get("city") or "City",
+				"state": address.get("province"),
+				"pincode": address.get("zip"),
+				"country": address.get("country"),
+				"phone": address.get("phone"),
+				"email_id": shopify_customer.get("email"),
+				"links": [{
+					"link_doctype": "Customer",
+					"link_name": customer.name
+				}]
+			}).insert(ignore_mandatory=True)
+
+		except Exception as e:
+			raise e
+
+def get_address_title_and_type(customer_name, index):
+	address_type = _("Billing")
+	address_title = customer_name
+	if frappe.db.get_value("Address", "{0}-{1}".format(customer_name.strip(), address_type)):
+		address_title = "{0}-{1}".format(customer_name.strip(), index)
+
+	return address_title, address_type
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
new file mode 100644
index 0000000..55f47a6
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
@@ -0,0 +1,302 @@
+import frappe
+from frappe import _
+from frappe.utils import cstr, cint, get_request_session
+from erpnext.erpnext_integrations.doctype.shopify_settings.shopify_settings import get_shopify_url, get_header
+
+shopify_variants_attr_list = ["option1", "option2", "option3"]
+
+def sync_item_from_shopify(shopify_settings, item):
+	url = get_shopify_url("/admin/products/{0}.json".format(item.get("product_id")), shopify_settings)
+	session = get_request_session()
+
+	try:
+		res = session.get(url, headers=get_header(shopify_settings))
+		res.raise_for_status()
+
+		shopify_item = res.json()["product"]
+		make_item(shopify_settings.warehouse, shopify_item)
+	except Exception as e:
+		raise e
+
+def make_item(warehouse, shopify_item):
+	add_item_weight(shopify_item)
+
+	if has_variants(shopify_item):
+		attributes = create_attribute(shopify_item)
+		create_item(shopify_item, warehouse, 1, attributes)
+		create_item_variants(shopify_item, warehouse, attributes, shopify_variants_attr_list)
+
+	else:
+		shopify_item["variant_id"] = shopify_item['variants'][0]["id"]
+		create_item(shopify_item, warehouse)
+
+def add_item_weight(shopify_item):
+	shopify_item["weight"] = shopify_item['variants'][0]["weight"]
+	shopify_item["weight_unit"] = shopify_item['variants'][0]["weight_unit"]
+
+def has_variants(shopify_item):
+	if len(shopify_item.get("options")) >= 1 and "Default Title" not in shopify_item.get("options")[0]["values"]:
+		return True
+	return False
+
+def create_attribute(shopify_item):
+	attribute = []
+	# shopify item dict
+	for attr in shopify_item.get('options'):
+		if not frappe.db.get_value("Item Attribute", attr.get("name"), "name"):
+			frappe.get_doc({
+				"doctype": "Item Attribute",
+				"attribute_name": attr.get("name"),
+				"item_attribute_values": [
+					{
+						"attribute_value": attr_value,
+						"abbr":attr_value
+					}
+					for attr_value in attr.get("values")
+				]
+			}).insert()
+			attribute.append({"attribute": attr.get("name")})
+
+		else:
+			# check for attribute values
+			item_attr = frappe.get_doc("Item Attribute", attr.get("name"))
+			if not item_attr.numeric_values:
+				set_new_attribute_values(item_attr, attr.get("values"))
+				item_attr.save()
+				attribute.append({"attribute": attr.get("name")})
+
+			else:
+				attribute.append({
+					"attribute": attr.get("name"),
+					"from_range": item_attr.get("from_range"),
+					"to_range": item_attr.get("to_range"),
+					"increment": item_attr.get("increment"),
+					"numeric_values": item_attr.get("numeric_values")
+				})
+
+	return attribute
+
+def set_new_attribute_values(item_attr, values):
+	for attr_value in values:
+		if not any((d.abbr.lower() == attr_value.lower() or d.attribute_value.lower() == attr_value.lower())\
+		for d in item_attr.item_attribute_values):
+			item_attr.append("item_attribute_values", {
+				"attribute_value": attr_value,
+				"abbr": attr_value
+			})
+
+def create_item(shopify_item, warehouse, has_variant=0, attributes=None,variant_of=None):
+	item_dict = {
+		"doctype": "Item",
+		"shopify_product_id": shopify_item.get("id"),
+		"shopify_variant_id": shopify_item.get("variant_id"),
+		"variant_of": variant_of,
+		"sync_with_shopify": 1,
+		"is_stock_item": 1,
+		"item_code": cstr(shopify_item.get("item_code")) or cstr(shopify_item.get("id")),
+		"item_name": shopify_item.get("title", '').strip(),
+		"description": shopify_item.get("body_html") or shopify_item.get("title"),
+		"shopify_description": shopify_item.get("body_html") or shopify_item.get("title"),
+		"item_group": get_item_group(shopify_item.get("product_type")),
+		"has_variants": has_variant,
+		"attributes":attributes or [],
+		"stock_uom": shopify_item.get("uom") or _("Nos"),
+		"stock_keeping_unit": shopify_item.get("sku") or get_sku(shopify_item),
+		"default_warehouse": warehouse,
+		"image": get_item_image(shopify_item),
+		"weight_uom": shopify_item.get("weight_unit"),
+		"weight_per_unit": shopify_item.get("weight"),
+		"default_supplier": get_supplier(shopify_item)
+	}
+
+	if not is_item_exists(item_dict, attributes, variant_of=variant_of):
+		item_details = get_item_details(shopify_item)
+		name = ''
+
+		if not item_details:
+			new_item = frappe.get_doc(item_dict)
+			new_item.insert()
+			name = new_item.name
+
+		if not name:
+			name = item_details.name
+
+		if not has_variant:
+			add_to_price_list(shopify_item, name)
+
+		frappe.db.commit()
+
+def create_item_variants(shopify_item, warehouse, attributes, shopify_variants_attr_list):
+	template_item = frappe.db.get_value("Item", filters={"shopify_product_id": shopify_item.get("id")},
+		fieldname=["name", "stock_uom"], as_dict=True)
+
+	if template_item:
+		for variant in shopify_item.get("variants"):
+			shopify_item_variant = {
+				"id" : variant.get("id"),
+				"item_code": variant.get("id"),
+				"title": variant.get("title"),
+				"product_type": shopify_item.get("product_type"),
+				"sku": variant.get("sku"),
+				"uom": template_item.stock_uom or _("Nos"),
+				"item_price": variant.get("price"),
+				"variant_id": variant.get("id"),
+				"weight_unit": variant.get("weight_unit"),
+				"weight": variant.get("weight")
+			}
+
+			for i, variant_attr in enumerate(shopify_variants_attr_list):
+				if variant.get(variant_attr):
+					attributes[i].update({"attribute_value": get_attribute_value(variant.get(variant_attr), attributes[i])})
+			create_item(shopify_item_variant, warehouse, 0, attributes, template_item.name)
+
+def get_attribute_value(variant_attr_val, attribute):
+	attribute_value = frappe.db.sql("""select attribute_value from `tabItem Attribute Value`
+		where parent = %s and (abbr = %s or attribute_value = %s)""", (attribute["attribute"], variant_attr_val,
+		variant_attr_val), as_list=1)
+	return attribute_value[0][0] if len(attribute_value)>0 else cint(variant_attr_val)
+
+def get_item_group(product_type=None):
+	import frappe.utils.nestedset
+	parent_item_group = frappe.utils.nestedset.get_root_of("Item Group")
+
+	if product_type:
+		if not frappe.db.get_value("Item Group", product_type, "name"):
+			item_group = frappe.get_doc({
+				"doctype": "Item Group",
+				"item_group_name": product_type,
+				"parent_item_group": parent_item_group,
+				"is_group": "No"
+			}).insert()
+			return item_group.name
+		else:
+			return product_type
+	else:
+		return parent_item_group
+
+
+def get_sku(item):
+	if item.get("variants"):
+		return item.get("variants")[0].get("sku")
+	return ""
+
+def add_to_price_list(item, name):
+	shopify_settings = frappe.db.get_value("Shopify Settings", None, ["price_list", "update_price_in_erpnext_price_list"], as_dict=1)
+	if not shopify_settings.update_price_in_erpnext_price_list:
+		return
+
+	item_price_name = frappe.db.get_value("Item Price",
+		{"item_code": name, "price_list": shopify_settings.price_list}, "name")
+
+	if not item_price_name:
+		frappe.get_doc({
+			"doctype": "Item Price",
+			"price_list": shopify_settings.price_list,
+			"item_code": name,
+			"price_list_rate": item.get("item_price") or item.get("variants")[0].get("price")
+		}).insert()
+	else:
+		item_rate = frappe.get_doc("Item Price", item_price_name)
+		item_rate.price_list_rate = item.get("item_price") or item.get("variants")[0].get("price")
+		item_rate.save()
+
+def get_item_image(shopify_item):
+	if shopify_item.get("image"):
+		return shopify_item.get("image").get("src")
+	return None
+
+def get_supplier(shopify_item):
+	if shopify_item.get("vendor"):
+		supplier = frappe.db.sql("""select name from tabSupplier
+			where name = %s or shopify_supplier_id = %s """, (shopify_item.get("vendor"),
+			shopify_item.get("vendor").lower()), as_list=1)
+
+		if not supplier:
+			supplier = frappe.get_doc({
+				"doctype": "Supplier",
+				"supplier_name": shopify_item.get("vendor"),
+				"shopify_supplier_id": shopify_item.get("vendor").lower(),
+				"supplier_type": get_supplier_type()
+			}).insert()
+			return supplier.name
+		else:
+			return shopify_item.get("vendor")
+	else:
+		return ""
+
+def get_supplier_type():
+	supplier_type = frappe.db.get_value("Supplier Type", _("Shopify Supplier"))
+	if not supplier_type:
+		supplier_type = frappe.get_doc({
+			"doctype": "Supplier Type",
+			"supplier_type": _("Shopify Supplier")
+		}).insert()
+		return supplier_type.name
+	return supplier_type
+
+def get_item_details(shopify_item):
+	item_details = {}
+
+	item_details = frappe.db.get_value("Item", {"shopify_product_id": shopify_item.get("id")},
+		["name", "stock_uom", "item_name"], as_dict=1)
+
+	if item_details:
+		return item_details
+
+	else:
+		item_details = frappe.db.get_value("Item", {"shopify_variant_id": shopify_item.get("id")},
+			["name", "stock_uom", "item_name"], as_dict=1)
+		return item_details
+
+def is_item_exists(shopify_item, attributes=None, variant_of=None):
+	if variant_of:
+		name = variant_of
+	else:
+		name = frappe.db.get_value("Item", {"item_name": shopify_item.get("item_name")})
+
+	if name:
+		item = frappe.get_doc("Item", name)
+		item.flags.ignore_mandatory=True
+
+		if not variant_of and not item.shopify_product_id:
+			item.shopify_product_id = shopify_item.get("shopify_product_id")
+			item.shopify_variant_id = shopify_item.get("shopify_variant_id")
+			item.save()
+			return True
+
+		if item.shopify_product_id and attributes and attributes[0].get("attribute_value"):
+			if not variant_of:
+				variant_of = frappe.db.get_value("Item",
+					{"shopify_product_id": item.shopify_product_id}, "variant_of")
+
+			# create conditions for all item attributes,
+			# as we are putting condition basis on OR it will fetch all items matching either of conditions
+			# thus comparing matching conditions with len(attributes)
+			# which will give exact matching variant item.
+
+			conditions = ["(iv.attribute='{0}' and iv.attribute_value = '{1}')"\
+				.format(attr.get("attribute"), attr.get("attribute_value")) for attr in attributes]
+
+			conditions = "( {0} ) and iv.parent = it.name ) = {1}".format(" or ".join(conditions), len(attributes))
+
+			parent = frappe.db.sql(""" select * from tabItem it where
+				( select count(*) from `tabItem Variant Attribute` iv
+					where {conditions} and it.variant_of = %s """.format(conditions=conditions) ,
+				variant_of, as_list=1)
+
+			if parent:
+				variant = frappe.get_doc("Item", parent[0][0])
+				variant.flags.ignore_mandatory = True
+
+				variant.shopify_product_id = shopify_item.get("shopify_product_id")
+				variant.shopify_variant_id = shopify_item.get("shopify_variant_id")
+				variant.save()
+			return False
+
+		if item.shopify_product_id and item.shopify_product_id != shopify_item.get("shopify_product_id"):
+			return False
+
+		return True
+
+	else:
+		return False
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_customer.json b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_customer.json
new file mode 100644
index 0000000..e91ce9a
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_customer.json
@@ -0,0 +1,59 @@
+{
+    "customer": {
+        "id": 2324518599,
+        "email": "andrew@wyatt.co.in",
+        "accepts_marketing": false,
+        "created_at": "2016-01-20T17:18:35+05:30",
+        "updated_at": "2016-01-20T17:22:23+05:30",
+        "first_name": "Andrew",
+        "last_name": "Wyatt",
+        "orders_count": 0,
+        "state": "disabled",
+        "total_spent": "0.00",
+        "last_order_id": null,
+        "note": "",
+        "verified_email": true,
+        "multipass_identifier": null,
+        "tax_exempt": false,
+        "tags": "",
+        "last_order_name": null,
+        "default_address": {
+            "id": 2476804295,
+            "first_name": "Andrew",
+            "last_name": "Wyatt",
+            "company": "Wyatt Inc.",
+            "address1": "B-11, Betahouse",
+            "address2": "Street 11, Sector 52",
+            "city": "Manhattan",
+            "province": "New York",
+            "country": "United States",
+            "zip": "10027",
+            "phone": "145-112211",
+            "name": "Andrew Wyatt",
+            "province_code": "NY",
+            "country_code": "US",
+            "country_name": "United States",
+            "default": true
+        },
+        "addresses": [
+            {
+                "id": 2476804295,
+                "first_name": "Andrew",
+                "last_name": "Wyatt",
+                "company": "Wyatt Inc.",
+                "address1": "B-11, Betahouse",
+                "address2": "Street 11, Sector 52",
+                "city": "Manhattan",
+                "province": "New York",
+                "country": "United States",
+                "zip": "10027",
+                "phone": "145-112211",
+                "name": "Andrew Wyatt",
+                "province_code": "NY",
+                "country_code": "US",
+                "country_name": "United States",
+                "default": true
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_item.json b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_item.json
new file mode 100644
index 0000000..296dede
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_item.json
@@ -0,0 +1,125 @@
+{
+	"product": {
+		"id": 4059739520,
+		"title": "Shopify Test Item",
+		"body_html": "<div>Hold back Spin Medallion-Set of 2</div>\n<div></div>\n<div>Finish: Plated/ Powder Coated</div>\n<div>Material: Iron</div>\n<div>Color Finish: Satin Silver, Brown Oil Rubbed, Roman Bronze</div>\n<div>Qty: 1 Set</div>",
+		"vendor": "Boa casa",
+		"product_type": "Curtain Accessories",
+		"created_at": "2016-01-18T17:16:37+05:30",
+		"handle": "1001624-01",
+		"updated_at": "2016-01-20T17:26:44+05:30",
+		"published_at": "2016-01-18T17:16:37+05:30",
+		"template_suffix": null,
+		"published_scope": "global",
+		"tags": "Category_Curtain Accessories, Type_Holdback",
+		"variants": [{
+			"id": 13917612359,
+			"product_id": 4059739520,
+			"title": "Test BALCK Item",
+			"price": "499.00",
+			"sku": "",
+			"position": 1,
+			"grams": 0,
+			"inventory_policy": "continue",
+			"compare_at_price": null,
+			"fulfillment_service": "manual",
+			"inventory_management": "shopify",
+			"option1": "BLACK",
+			"option2": null,
+			"option3": null,
+			"created_at": "2016-01-18T17:16:37+05:30",
+			"updated_at": "2016-01-20T17:26:44+05:30",
+			"requires_shipping": true,
+			"taxable": true,
+			"barcode": "",
+			"inventory_quantity": -1,
+			"old_inventory_quantity": -1,
+			"image_id": 8539321735,
+			"weight": 0,
+			"weight_unit": "kg"
+		}, {
+			"id": 13917612423,
+			"product_id": 4059739520,
+			"title": "Test BLUE Item",
+			"price": "499.00",
+			"sku": "",
+			"position": 2,
+			"grams": 0,
+			"inventory_policy": "continue",
+			"compare_at_price": null,
+			"fulfillment_service": "manual",
+			"inventory_management": "shopify",
+			"option1": "BLUE",
+			"option2": null,
+			"option3": null,
+			"created_at": "2016-01-18T17:16:37+05:30",
+			"updated_at": "2016-01-20T17:26:44+05:30",
+			"requires_shipping": true,
+			"taxable": true,
+			"barcode": "",
+			"inventory_quantity": -1,
+			"old_inventory_quantity": -1,
+			"image_id": null,
+			"weight": 0,
+			"weight_unit": "kg"
+		}, {
+			"id": 13917612487,
+			"product_id": 4059739520,
+			"title": "Test White Item",
+			"price": "499.00",
+			"sku": "",
+			"position": 3,
+			"grams": 0,
+			"inventory_policy": "continue",
+			"compare_at_price": null,
+			"fulfillment_service": "manual",
+			"inventory_management": "shopify",
+			"option1": "White",
+			"option2": null,
+			"option3": null,
+			"created_at": "2016-01-18T17:16:37+05:30",
+			"updated_at": "2016-01-18T17:16:37+05:30",
+			"requires_shipping": true,
+			"taxable": true,
+			"barcode": "",
+			"inventory_quantity": 0,
+			"old_inventory_quantity": 0,
+			"image_id": null,
+			"weight": 0,
+			"weight_unit": "kg"
+		}],
+		"options": [{
+			"id": 4985027399,
+			"product_id": 4059739520,
+			"name": "Colour",
+			"position": 1,
+			"values": [
+				"BLACK",
+				"BLUE",
+				"White"
+			]
+		}],
+		"images": [{
+			"id": 8539321735,
+			"product_id": 4059739520,
+			"position": 1,
+			"created_at": "2016-01-18T17:16:37+05:30",
+			"updated_at": "2016-01-18T17:16:37+05:30",
+			"src": "https://cdn.shopify.com/s/files/1/1123/0654/products/2015-12-17_6.png?v=1453117597",
+			"variant_ids": [
+				13917612359
+			]
+		}],
+		"image": {
+			"id": 8539321735,
+			"product_id": 4059739520,
+			"position": 1,
+			"created_at": "2016-01-18T17:16:37+05:30",
+			"updated_at": "2016-01-18T17:16:37+05:30",
+			"src": "https://cdn.shopify.com/s/files/1/1123/0654/products/2015-12-17_6.png?v=1453117597",
+			"variant_ids": [
+				13917612359
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_order.json b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_order.json
new file mode 100644
index 0000000..988a2f0
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_data/shopify_order.json
@@ -0,0 +1,270 @@
+{
+    "order": {
+        "id": 2414345735,
+        "email": "andrew@wyatt.co.in",
+        "closed_at": null,
+        "created_at": "2016-01-20T17:26:39+05:30",
+        "updated_at": "2016-01-20T17:27:15+05:30",
+        "number": 5,
+        "note": "",
+        "token": "660fed25987517b733644a8c9ec7c8e0",
+        "gateway": "manual",
+        "test": false,
+        "total_price": "1018.00",
+        "subtotal_price": "998.00",
+        "total_weight": 0,
+        "total_tax": "0.00",
+        "taxes_included": false,
+        "currency": "INR",
+        "financial_status": "paid",
+        "confirmed": true,
+        "total_discounts": "0.00",
+        "total_line_items_price": "998.00",
+        "cart_token": null,
+        "buyer_accepts_marketing": false,
+        "name": "#1005",
+        "referring_site": null,
+        "landing_site": null,
+        "cancelled_at": null,
+        "cancel_reason": null,
+        "total_price_usd": "15.02",
+        "checkout_token": null,
+        "reference": null,
+        "user_id": 55391175,
+        "location_id": null,
+        "source_identifier": null,
+        "source_url": null,
+        "processed_at": "2016-01-20T17:26:39+05:30",
+        "device_id": null,
+        "browser_ip": null,
+        "landing_site_ref": null,
+        "order_number": 1005,
+        "discount_codes": [],
+        "note_attributes": [],
+        "payment_gateway_names": [
+            "manual"
+        ],
+        "processing_method": "manual",
+        "checkout_id": null,
+        "source_name": "shopify_draft_order",
+        "fulfillment_status": "fulfilled",
+        "tax_lines": [],
+        "tags": "",
+        "contact_email": "andrew@wyatt.co.in",
+        "line_items": [
+            {
+                "id": 4125768135,
+                "variant_id": 13917612359,
+                "title": "Shopify Test Item",
+                "quantity": 1,
+                "price": "499.00",
+                "grams": 0,
+                "sku": "",
+                "variant_title": "Roman BALCK 1",
+                "vendor": "Boa casa",
+                "fulfillment_service": "manual",
+                "product_id": 4059739527,
+                "requires_shipping": true,
+                "taxable": true,
+                "gift_card": false,
+                "name": "Roman BALCK 1",
+                "variant_inventory_management": "shopify",
+                "properties": [],
+                "product_exists": true,
+                "fulfillable_quantity": 0,
+                "total_discount": "0.00",
+                "fulfillment_status": "fulfilled",
+                "tax_lines": []
+            },
+            {
+                "id": 4125768199,
+                "variant_id": 13917612423,
+                "title": "Shopify Test Item",
+                "quantity": 1,
+                "price": "499.00",
+                "grams": 0,
+                "sku": "",
+                "variant_title": "Satin BLUE 1",
+                "vendor": "Boa casa",
+                "fulfillment_service": "manual",
+                "product_id": 4059739527,
+                "requires_shipping": true,
+                "taxable": true,
+                "gift_card": false,
+                "name": "Satin BLUE 1",
+                "variant_inventory_management": "shopify",
+                "properties": [],
+                "product_exists": true,
+                "fulfillable_quantity": 0,
+                "total_discount": "0.00",
+                "fulfillment_status": "fulfilled",
+                "tax_lines": []
+            }
+        ],
+        "shipping_lines": [
+            {
+                "id": 2108906247,
+                "title": "International Shipping",
+                "price": "20.00",
+                "code": "International Shipping",
+                "source": "shopify",
+                "phone": null,
+                "tax_lines": []
+            }
+        ],
+        "billing_address": {
+            "first_name": "Andrew",
+            "address1": "B-11, Betahouse",
+            "phone": "145-112211",
+            "city": "Manhattan",
+            "zip": "10027",
+            "province": "New York",
+            "country": "United States",
+            "last_name": "Wyatt",
+            "address2": "Street 11, Sector 52",
+            "company": "Wyatt Inc.",
+            "latitude": 40.8138912,
+            "longitude": -73.96243270000001,
+            "name": "Andrew Wyatt",
+            "country_code": "US",
+            "province_code": "NY"
+        },
+        "shipping_address": {
+            "first_name": "Andrew",
+            "address1": "B-11, Betahouse",
+            "phone": "145-112211",
+            "city": "Manhattan",
+            "zip": "10027",
+            "province": "New York",
+            "country": "United States",
+            "last_name": "Wyatt",
+            "address2": "Street 11, Sector 52",
+            "company": "Wyatt Inc.",
+            "latitude": 40.8138912,
+            "longitude": -73.96243270000001,
+            "name": "Andrew Wyatt",
+            "country_code": "US",
+            "province_code": "NY"
+        },
+        "fulfillments": [
+            {
+                "id": 1849629255,
+                "order_id": 2414345735,
+                "status": "success",
+                "created_at": "2016-01-20T17:27:15+05:30",
+                "service": "manual",
+                "updated_at": "2016-01-20T17:27:15+05:30",
+                "tracking_company": null,
+                "tracking_number": null,
+                "tracking_numbers": [],
+                "tracking_url": null,
+                "tracking_urls": [],
+                "receipt": {},
+                "line_items": [
+                    {
+                        "id": 4125768199,
+                        "variant_id": 13917612423,
+                        "title": "1001624/01",
+                        "quantity": 1,
+                        "price": "499.00",
+                        "grams": 0,
+                        "sku": "",
+                        "variant_title": "Satin Silver",
+                        "vendor": "Boa casa",
+                        "fulfillment_service": "manual",
+                        "product_id": 4059739527,
+                        "requires_shipping": true,
+                        "taxable": true,
+                        "gift_card": false,
+                        "name": "1001624/01 - Satin Silver",
+                        "variant_inventory_management": "shopify",
+                        "properties": [],
+                        "product_exists": true,
+                        "fulfillable_quantity": 0,
+                        "total_discount": "0.00",
+                        "fulfillment_status": "fulfilled",
+                        "tax_lines": []
+                    }
+                ]
+            },
+            {
+                "id": 1849628167,
+                "order_id": 2414345735,
+                "status": "success",
+                "created_at": "2016-01-20T17:26:58+05:30",
+                "service": "manual",
+                "updated_at": "2016-01-20T17:26:58+05:30",
+                "tracking_company": null,
+                "tracking_number": null,
+                "tracking_numbers": [],
+                "tracking_url": null,
+                "tracking_urls": [],
+                "receipt": {},
+                "line_items": [
+                    {
+                        "id": 4125768135,
+                        "variant_id": 13917612359,
+                        "title": "1001624/01",
+                        "quantity": 1,
+                        "price": "499.00",
+                        "grams": 0,
+                        "sku": "",
+                        "variant_title": "Roman Bronze",
+                        "vendor": "Boa casa",
+                        "fulfillment_service": "manual",
+                        "product_id": 4059739527,
+                        "requires_shipping": true,
+                        "taxable": true,
+                        "gift_card": false,
+                        "name": "1001624/01 - Roman Bronze",
+                        "variant_inventory_management": "shopify",
+                        "properties": [],
+                        "product_exists": true,
+                        "fulfillable_quantity": 0,
+                        "total_discount": "0.00",
+                        "fulfillment_status": "fulfilled",
+                        "tax_lines": []
+                    }
+                ]
+            }
+        ],
+        "refunds": [],
+        "customer": {
+            "id": 2324518599,
+            "email": "andrew@wyatt.co.in",
+            "accepts_marketing": false,
+            "created_at": "2016-01-20T17:18:35+05:30",
+            "updated_at": "2016-01-20T17:26:39+05:30",
+            "first_name": "Andrew",
+            "last_name": "Wyatt",
+            "orders_count": 1,
+            "state": "disabled",
+            "total_spent": "1018.00",
+            "last_order_id": 2414345735,
+            "note": "",
+            "verified_email": true,
+            "multipass_identifier": null,
+            "tax_exempt": false,
+            "tags": "",
+            "last_order_name": "#1005",
+            "default_address": {
+                "id": 2476804295,
+                "first_name": "Andrew",
+                "last_name": "Wyatt",
+                "company": "Wyatt Inc.",
+                "address1": "B-11, Betahouse",
+                "address2": "Street 11, Sector 52",
+                "city": "Manhattan",
+                "province": "New York",
+                "country": "United States",
+                "zip": "10027",
+                "phone": "145-112211",
+                "name": "Andrew Wyatt",
+                "province_code": "NY",
+                "country_code": "US",
+                "country_name": "United States",
+                "default": true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.js b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.js
new file mode 100644
index 0000000..b2f82d5
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shopify Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shopify Settings
+		() => frappe.tests.make('Shopify Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
new file mode 100644
index 0000000..cd1ab16
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import frappe
+
+import unittest, os, json
+from frappe.utils import cstr
+from frappe.utils.fixtures import sync_fixtures
+from erpnext.erpnext_integrations.connectors.shopify_connection import create_order
+from erpnext.erpnext_integrations.doctype.shopify_settings.sync_product import make_item
+from erpnext.erpnext_integrations.doctype.shopify_settings.sync_customer import create_customer
+
+class ShopifySettings(unittest.TestCase):
+	def setUp(self):
+		frappe.set_user("Administrator")
+		sync_fixtures("erpnext_shopify")
+		frappe.reload_doctype("Customer")
+		frappe.reload_doctype("Sales Order")
+		frappe.reload_doctype("Delivery Note")
+		frappe.reload_doctype("Sales Invoice")
+
+		self.setup_shopify()
+
+	def setup_shopify(self):
+		shopify_settings = frappe.get_doc("Shopify Settings")
+		shopify_settings.taxes = []
+
+		shopify_settings.update({
+			"app_type": "Private",
+			"shopify_url": "test.myshopify.com",
+			"api_key": "17702c7c4452b9c5d235240b6e7a39da",
+			"password": "17702c7c4452b9c5d235240b6e7a39da",
+			"shared_secret": "17702c7c4452b9c5d235240b6e7a39da",
+			"price_list": "_Test Price List",
+			"warehouse": "_Test Warehouse - _TC",
+			"cash_bank_account": "Cash - _TC",
+			"customer_group": "_Test Customer Group",
+			"cost_center": "Main - _TC",
+			"taxes": [
+				{
+					"shopify_tax": "International Shipping",
+					"tax_account":"Legal Expenses - _TC"
+				}
+			],
+			"enable_shopify": 0,
+			"sales_order_series": "SO-",
+			"sync_sales_invoice": 1,
+			"sales_invoice_series": "SINV-",
+			"sync_delivery_note": 1,
+			"delivery_note_series": "DN-"
+		}).save(ignore_permissions=True)
+
+		self.shopify_settings = shopify_settings
+	
+	def test_order(self):
+		### Create Customer ###
+		with open (os.path.join(os.path.dirname(__file__), "test_data", "shopify_customer.json")) as shopify_customer:
+			shopify_customer = json.load(shopify_customer)
+		create_customer(shopify_customer.get("customer"), self.shopify_settings)
+
+		### Create Item ###
+		with open (os.path.join(os.path.dirname(__file__), "test_data", "shopify_item.json")) as shopify_item:
+			shopify_item = json.load(shopify_item)
+		make_item("_Test Warehouse - _TC", shopify_item.get("product"))
+
+
+		### Create Order ###
+		with open (os.path.join(os.path.dirname(__file__), "test_data", "shopify_order.json")) as shopify_order:
+			shopify_order = json.load(shopify_order)
+
+		create_order(shopify_order.get("order"), self.shopify_settings, "_Test Company")
+
+		sales_order = frappe.get_doc("Sales Order", {"shopify_order_id": cstr(shopify_order.get("order").get("id"))})
+
+		self.assertEqual(cstr(shopify_order.get("order").get("id")), sales_order.shopify_order_id)
+
+		#check for customer
+		shopify_order_customer_id = cstr(shopify_order.get("order").get("customer").get("id"))
+		sales_order_customer_id = frappe.get_value("Customer", sales_order.customer, "shopify_customer_id")
+
+		self.assertEqual(shopify_order_customer_id, sales_order_customer_id)
+
+		#check sales invoice
+		sales_invoice = frappe.get_doc("Sales Invoice", {"shopify_order_id": sales_order.shopify_order_id})
+		self.assertEqual(sales_invoice.rounded_total, sales_order.rounded_total)
+
+		#check delivery note
+		delivery_note_count = frappe.db.sql("""select count(*) from `tabDelivery Note`
+			where shopify_order_id = %s""", sales_order.shopify_order_id)[0][0]
+
+		self.assertEqual(delivery_note_count, len(shopify_order.get("order").get("fulfillments")))
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/erpnext_integrations/doctype/shopify_tax_account/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/erpnext_integrations/doctype/shopify_tax_account/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.json b/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.json
new file mode 100644
index 0000000..63c674c
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.json
@@ -0,0 +1,133 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-10-05 16:55:20.455371", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shopify_tax", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Shopify Tax/Shipping Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "ERPNext Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-09 11:36:49.272815", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "Shopify Tax Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.py b/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.py
new file mode 100644
index 0000000..74c13c0
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_tax_account/shopify_tax_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ShopifyTaxAccount(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/erpnext_integrations/doctype/shopify_webhook_detail/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.json b/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.json
new file mode 100644
index 0000000..e47ecdc
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-10 17:06:22.697427", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "webhook_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Webhook ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "method", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-11 12:43:09.456449", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "Shopify Webhook Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.py b/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.py
new file mode 100644
index 0000000..e127989
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/shopify_webhook_detail/shopify_webhook_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ShopifyWebhookDetail(Document):
+	pass
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
new file mode 100644
index 0000000..2c03686
--- /dev/null
+++ b/erpnext/erpnext_integrations/utils.py
@@ -0,0 +1,42 @@
+import frappe
+from frappe import _
+import base64, hashlib, hmac
+from six.moves.urllib.parse import urlparse
+
+def validate_webhooks_request(doctype,  hmac_key, secret_key='secret'):
+	def innerfn(fn):
+		settings = frappe.get_doc(doctype)
+
+		if frappe.request and settings and settings.get(secret_key) and not frappe.flags.in_test:
+			sig = base64.b64encode(
+				hmac.new(
+					settings.get(secret_key).encode('utf8'),
+					frappe.request.data,
+					hashlib.sha256
+				).digest()
+			)
+
+			if frappe.request.data and \
+				frappe.get_request_header(hmac_key) and \
+				not sig == bytes(frappe.get_request_header(hmac_key).encode()):
+					frappe.throw(_("Unverified Webhook Data"))
+			frappe.set_user(settings.modified_by)
+
+		return fn
+
+	return innerfn
+
+def get_webhook_address(connector_name, method, exclude_uri=False):
+	endpoint = "erpnext.erpnext_integrations.connectors.{0}.{1}".format(connector_name, method)
+
+	if exclude_uri:
+		return endpoint
+
+	try:
+		url = frappe.request.url
+	except RuntimeError:
+		url = "http://localhost:8000"
+
+	server_url = '{uri.scheme}://{uri.netloc}/api/method/{endpoint}'.format(uri=urlparse(url), endpoint=endpoint)
+
+	return server_url
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/clinical_procedure/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/healthcare/doctype/clinical_procedure/__init__.py
diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js
new file mode 100644
index 0000000..9fc5b37
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js
@@ -0,0 +1,305 @@
+// Copyright (c) 2017, ESS LLP and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Clinical Procedure', {
+	setup: function(frm) {
+		frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
+			var item = locals[cdt][cdn];
+			if(!item.item_code) {
+				frappe.throw(__("Please enter Item Code to get Batch Number"));
+			} else {
+				if (frm.doc.status == 'In Progress') {
+					var filters = {
+						'item_code': item.item_code,
+						'posting_date': frm.doc.start_date || frappe.datetime.nowdate()
+					};
+					if(frm.doc.warehouse) filters["warehouse"] = frm.doc.warehouse;
+				} else {
+					filters = {
+						'item_code': item.item_code
+					};
+				}
+				return {
+					query : "erpnext.controllers.queries.get_batch_no",
+					filters: filters
+				};
+			}
+		});
+	},
+	refresh: function(frm) {
+		frm.set_query("patient", function () {
+			return {
+				filters: {"disabled": 0}
+			};
+		});
+		frm.set_query("appointment", function () {
+			return {
+				filters: {
+					"procedure_template": ["not in", null],
+					"status": ['in', 'Open, Scheduled']
+				}
+			};
+		});
+		frm.set_query("service_unit", function(){
+			return {
+				filters: {
+					"is_group": false,
+					"allow_appointments": true
+				}
+			};
+		});
+		if(frm.doc.consume_stock){
+			frm.set_indicator_formatter('item_code',
+				function(doc) { return (doc.qty<=doc.actual_qty) ? "green" : "orange" ; });
+		}
+
+		if (!frm.doc.__islocal && frm.doc.status == 'In Progress'){
+
+			if(frm.doc.consume_stock){
+				var btn_label = 'Complete and Consume';
+				var msg = 'Complete '+frm.doc.name+' and Consume Stock?';
+			}else{
+				btn_label = 'Complete';
+				msg = 'Complete '+frm.doc.name+'?';
+			}
+
+			frm.add_custom_button(__(btn_label), function () {
+				frappe.confirm(
+					__(msg),
+					function(){
+						frappe.call({
+							doc: frm.doc,
+							method: "complete",
+							callback: function(r) {
+								if(!r.exc){
+									cur_frm.reload_doc();
+								}
+							}
+						});
+					}
+				);
+			});
+		}else if (frm.doc.status == 'Draft') {
+			frm.add_custom_button(__("Start"), function () {
+				frappe.call({
+					doc: frm.doc,
+					method: "start",
+					callback: function(r) {
+						if(!r.exc){
+							if(frm.doc.status == 'Draft'){
+								frappe.confirm(
+									__("Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer"),
+									function(){
+										frappe.call({
+											doc: frm.doc,
+											method: "make_material_transfer",
+											callback: function(r) {
+												if(!r.exc){
+													cur_frm.reload_doc();
+													var doclist = frappe.model.sync(r.message);
+													frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+												}
+											}
+										});
+									}
+								);
+							}else{
+								cur_frm.reload_doc();
+							}
+						}
+					}
+				});
+			});
+		}
+		if (frm.doc.__islocal){
+			frm.set_df_property("consumables", "hidden", 1);
+		}else{
+			frm.set_df_property("consumables", "hidden", 0);
+		}
+	},
+	onload: function(frm){
+		if(frm.doc.status == 'Completed'){
+			frm.set_df_property("items", "read_only", 1);
+		}
+		if(frm.is_new()) {
+			frm.add_fetch("procedure_template", "medical_department", "medical_department");
+			frm.set_value("start_time", null);
+		}
+	},
+	patient: function(frm) {
+		if(frm.doc.patient){
+			frappe.call({
+				"method": "erpnext.healthcare.doctype.patient.patient.get_patient_detail",
+				args: {
+					patient: frm.doc.patient
+				},
+				callback: function (data) {
+					let age = "";
+					if(data.message.dob){
+						age = calculate_age(data.message.dob);
+					}else if (data.message.age){
+						age = data.message.age;
+						if(data.message.age_as_on){
+							age = age+" as on "+data.message.age_as_on;
+						}
+					}
+					frm.set_value("patient_age", age);
+					frm.set_value("patient_sex", data.message.sex);
+				}
+			});
+		}else{
+			frm.set_value("patient_age", "");
+			frm.set_value("patient_sex", "");
+		}
+	},
+	appointment: function(frm) {
+		if(frm.doc.appointment){
+			frappe.call({
+				"method": "frappe.client.get",
+				args: {
+					doctype: "Patient Appointment",
+					name: frm.doc.appointment
+				},
+				callback: function (data) {
+					frm.set_value("patient", data.message.patient);
+					frm.set_value("procedure_template", data.message.procedure_template);
+					frm.set_value("medical_department", data.message.department);
+					frm.set_value("start_date", data.message.appointment_date);
+					frm.set_value("start_time", data.message.appointment_time);
+					frm.set_value("notes", data.message.notes);
+					frm.set_value("service_unit", data.message.service_unit);
+				}
+			});
+		}
+	},
+	procedure_template: function(frm) {
+		if(frm.doc.procedure_template){
+			frappe.call({
+				"method": "frappe.client.get",
+				args: {
+					doctype: "Clinical Procedure Template",
+					name: frm.doc.procedure_template
+				},
+				callback: function (data) {
+					frm.set_value("medical_department", data.message.medical_department);
+					frm.set_value("consume_stock", data.message.consume_stock);
+					if(!frm.doc.warehouse){
+						frappe.call({
+							method: "frappe.client.get_value",
+							args: {
+								doctype: "Stock Settings",
+								fieldname: "default_warehouse"
+							},
+							callback: function (data) {
+								frm.set_value("warehouse", data.message.default_warehouse);
+							}
+						});
+					}
+				}
+			});
+		}else{
+			frm.set_value("consume_stock", 0);
+		}
+	},
+	service_unit: function(frm) {
+		if(frm.doc.service_unit){
+			frappe.call({
+				method: "frappe.client.get_value",
+				args:{
+					fieldname: "warehouse",
+					doctype: "Healthcare Service Unit",
+					filters:{name: frm.doc.service_unit},
+				},
+				callback: function(data) {
+					if(data.message){
+						frm.set_value("warehouse", data.message.warehouse);
+					}
+				}
+			});
+		}
+	}
+});
+
+cur_frm.set_query("procedure_template", function(doc) {
+	return {
+		filters: {
+			'medical_department': doc.medical_department
+		}
+	};
+});
+
+cur_frm.set_query("appointment", function() {
+	return {
+		filters: {
+			status:['in',["Open"]]
+		}
+	};
+});
+
+frappe.ui.form.on('Clinical Procedure Item', {
+	qty: function(frm, cdt, cdn){
+		var d = locals[cdt][cdn];
+		frappe.model.set_value(cdt, cdn, "transfer_qty", d.qty*d.conversion_factor);
+	},
+	uom: function(doc, cdt, cdn){
+		var d = locals[cdt][cdn];
+		if(d.uom && d.item_code){
+			return frappe.call({
+				method: "erpnext.stock.doctype.stock_entry.stock_entry.get_uom_details",
+				args: {
+					item_code: d.item_code,
+					uom: d.uom,
+					qty: d.qty
+				},
+				callback: function(r) {
+					if(r.message) {
+						frappe.model.set_value(cdt, cdn, r.message);
+					}
+				}
+			});
+		}
+	},
+	item_code: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		let args = null;
+		if(d.item_code) {
+			args = {
+				'item_code'			: d.item_code,
+				'transfer_qty'		: d.transfer_qty,
+				'company'			: frm.doc.company,
+				'quantity'				: d.qty
+			};
+			return frappe.call({
+				doc: frm.doc,
+				method: "get_item_details",
+				args: args,
+				callback: function(r) {
+					if(r.message) {
+						var d = locals[cdt][cdn];
+						$.each(r.message, function(k, v){
+							d[k] = v;
+						});
+						refresh_field("items");
+					}
+				}
+			});
+		}
+	}
+});
+
+var calculate_age = function(birth) {
+	var ageMS = Date.parse(Date()) - Date.parse(birth);
+	var age = new Date();
+	age.setTime(ageMS);
+	var years =  age.getFullYear() - 1970;
+	return  years + " Year(s) " + age.getMonth() + " Month(s) " + age.getDate() + " Day(s)";
+};
+
+// List Stock items
+cur_frm.set_query("item_code", "items", function() {
+	return {
+		filters: {
+			is_stock_item:1
+		}
+	};
+});
diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json
new file mode 100644
index 0000000..c687393
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json
@@ -0,0 +1,697 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 1, 
+ "creation": "2017-04-07 12:52:43.542429", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "PRO-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "appointment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Appointment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Patient Appointment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "patient", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Patient", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Patient", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "patient_age", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Age", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "patient_sex", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "procedure_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Procedure Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Clinical Procedure Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "medical_department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Medical Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Medical Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "service_unit", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Service Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Service Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sample", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sample Collection", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_invoiced", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Invoiced", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "notes", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Notes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "consume_stock", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Consume Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.consume_stock == 1", 
+   "fieldname": "consumables", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Consumables", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Consumables", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Clinical Procedure Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Draft\nIn Progress\nCompleted\nPending\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-04 11:23:32.884076", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Clinical Procedure", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Nursing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py
new file mode 100644
index 0000000..6346f1f
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py
@@ -0,0 +1,183 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, ESS LLP and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import cint, flt, nowdate, nowtime
+from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_account
+from erpnext.healthcare.doctype.lab_test.lab_test import create_sample_doc
+from erpnext.stock.stock_ledger import get_previous_sle
+
+class ClinicalProcedure(Document):
+	def validate(self):
+		if self.consume_stock and not self.status == 'Draft':
+			if not self.warehouse:
+				frappe.throw(("Set warehouse for Procedure {0} ").format(self.name))
+			self.set_actual_qty()
+
+	def before_insert(self):
+		if self.consume_stock:
+			set_stock_items(self, self.procedure_template, "Clinical Procedure Template")
+			self.set_actual_qty();
+
+	def after_insert(self):
+		if self.appointment:
+			frappe.db.set_value("Patient Appointment", self.appointment, "status", "Closed")
+		template = frappe.get_doc("Clinical Procedure Template", self.procedure_template)
+		if template.sample:
+			patient = frappe.get_doc("Patient", self.patient)
+			sample_collection = create_sample_doc(template, patient, None)
+			frappe.db.set_value("Clinical Procedure", self.name, "sample", sample_collection.name)
+		self.reload()
+
+	def complete(self):
+		if self.consume_stock:
+			create_stock_entry(self)
+		frappe.db.set_value("Clinical Procedure", self.name, "status", 'Completed')
+
+	def start(self):
+		allow_start = self.set_actual_qty()
+		if allow_start:
+			self.status = 'In Progress'
+		else:
+			self.status = 'Draft'
+
+		self.save()
+
+	def set_actual_qty(self):
+		allow_negative_stock = cint(frappe.db.get_value("Stock Settings", None, "allow_negative_stock"))
+
+		allow_start = True
+		for d in self.get('items'):
+			previous_sle = get_previous_sle({
+				"item_code": d.item_code,
+				"warehouse": self.warehouse,
+				"posting_date": nowdate(),
+				"posting_time": nowtime()
+			})
+
+			# get actual stock at source warehouse
+			d.actual_qty = previous_sle.get("qty_after_transaction") or 0
+
+			# validate qty
+			if not allow_negative_stock and d.actual_qty < d.qty:
+				allow_start = False
+
+		return allow_start
+
+	def make_material_transfer(self):
+		stock_entry = frappe.new_doc("Stock Entry")
+
+		stock_entry.purpose = "Material Transfer"
+		stock_entry.to_warehouse = self.warehouse
+		expense_account = get_account(None, "expense_account", "Healthcare Settings", self.company)
+		for item in self.items:
+			if item.qty > item.actual_qty:
+				se_child = stock_entry.append('items')
+				se_child.item_code = item.item_code
+				se_child.item_name = item.item_name
+				se_child.uom = item.uom
+				se_child.stock_uom = item.stock_uom
+				se_child.qty = flt(item.qty-item.actual_qty)
+				se_child.t_warehouse = self.warehouse
+				# in stock uom
+				se_child.transfer_qty = flt(item.transfer_qty)
+				se_child.conversion_factor = flt(item.conversion_factor)
+				cost_center = frappe.db.get_value('Company', self.company, 'cost_center')
+				se_child.cost_center = cost_center
+				se_child.expense_account = expense_account
+		return stock_entry.as_dict()
+
+	def get_item_details(self, args=None):
+		item = frappe.db.sql("""select stock_uom, description, image, item_name,
+			expense_account, buying_cost_center, item_group from `tabItem`
+			where name = %s
+				and disabled=0
+				and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)""",
+			(args.get('item_code'), nowdate()), as_dict = 1)
+		if not item:
+			frappe.throw(_("Item {0} is not active or end of life has been reached").format(args.get('item_code')))
+
+		item = item[0]
+
+		ret = {
+			'uom'			      	: item.stock_uom,
+			'stock_uom'			  	: item.stock_uom,
+			'item_name' 		  	: item.item_name,
+			'quantity'				: 0,
+			'transfer_qty'			: 0,
+			'conversion_factor'		: 1
+		}
+		return ret
+
+
+@frappe.whitelist()
+def set_stock_items(doc, stock_detail_parent, parenttype):
+	item_dict = get_item_dict("Clinical Procedure Item", stock_detail_parent, parenttype)
+
+	for d in item_dict:
+		se_child = doc.append('items')
+		se_child.item_code = d["item_code"]
+		se_child.item_name = d["item_name"]
+		se_child.uom = d["uom"]
+		se_child.stock_uom = d["stock_uom"]
+		se_child.qty = flt(d["qty"])
+		# in stock uom
+		se_child.transfer_qty = flt(d["transfer_qty"])
+		se_child.conversion_factor = flt(d["conversion_factor"])
+		if d["batch_no"]:
+			se_child.batch_no = d["batch_no"]
+	return doc
+
+def get_item_dict(table, parent, parenttype):
+	query = """select * from `tab{table}` where parent = '{parent}' and parenttype = '{parenttype}' """
+
+	return frappe.db.sql(query.format(table=table, parent=parent, parenttype=parenttype), as_dict=True)
+
+def create_stock_entry(doc):
+	stock_entry = frappe.new_doc("Stock Entry")
+	stock_entry = set_stock_items(stock_entry, doc.name, "Clinical Procedure")
+	stock_entry.purpose = "Material Issue"
+	stock_entry.from_warehouse = doc.warehouse
+	stock_entry.company = doc.company
+	expense_account = get_account(None, "expense_account", "Healthcare Settings", doc.company)
+
+	for item_line in stock_entry.items:
+		cost_center = frappe.db.get_value('Company', doc.company, 'cost_center')
+		#item_line.s_warehouse = warehouse #deaful source warehouse set, stock entry to copy to lines
+		item_line.cost_center = cost_center
+		#if not expense_account:
+		#	expense_account = frappe.db.get_value("Item", item_line.item_code, "expense_account")
+		item_line.expense_account = expense_account
+
+	stock_entry.insert(ignore_permissions = True)
+	stock_entry.submit()
+
+@frappe.whitelist()
+def create_procedure(appointment):
+	appointment = frappe.get_doc("Patient Appointment",appointment)
+	procedure = frappe.new_doc("Clinical Procedure")
+	procedure.appointment = appointment.name
+	procedure.patient = appointment.patient
+	procedure.patient_age = appointment.patient_age
+	procedure.patient_sex = appointment.patient_sex
+	procedure.procedure_template = appointment.procedure_template
+	procedure.medical_department = appointment.department
+	procedure.start_date = appointment.appointment_date
+	procedure.start_time = appointment.appointment_time
+	procedure.notes = appointment.notes
+	procedure.service_unit = appointment.service_unit
+	consume_stock = frappe.db.get_value("Clinical Procedure Template", appointment.procedure_template, "consume_stock")
+	if consume_stock == 1:
+		procedure.consume_stock = True
+		warehouse = False
+		if appointment.service_unit:
+			warehouse = frappe.db.get_value("Healthcare Service Unit", appointment.service_unit, "warehouse")
+		if not warehouse:
+			warehouse = frappe.db.get_value("Stock Settings", None, "default_warehouse")
+		if warehouse:
+			procedure.warehouse = warehouse
+	return procedure.as_dict()
diff --git a/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.js b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.js
new file mode 100644
index 0000000..80ef3d5
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Clinical Procedure", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Clinical Procedure
+		() => frappe.tests.make('Clinical Procedure', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
new file mode 100644
index 0000000..09059e1
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, ESS LLP and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestClinicalProcedure(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/clinical_procedure_item/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/healthcare/doctype/clinical_procedure_item/__init__.py
diff --git a/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.json b/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.json
new file mode 100644
index 0000000..c0a3247
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.json
@@ -0,0 +1,385 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 1, 
+ "creation": "2017-10-05 16:15:10.876952", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Batch", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transfer Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actual Qty (at source/target)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-03-28 14:34:03.796229", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Clinical Procedure Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.py b/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.py
new file mode 100644
index 0000000..d59e517
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_item/clinical_procedure_item.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, earthians and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class ClinicalProcedureItem(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/clinical_procedure_template/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/healthcare/doctype/clinical_procedure_template/__init__.py
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js
new file mode 100644
index 0000000..583728d
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js
@@ -0,0 +1,175 @@
+// Copyright (c) 2017, earthians and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Clinical Procedure Template', {
+	template: function(frm) {
+		if(!frm.doc.item_code)
+			frm.set_value("item_code", frm.doc.template);
+		if(!frm.doc.description)
+			frm.set_value("description", frm.doc.template);
+		mark_change_in_item(frm);
+	},
+	rate: function(frm) {
+		mark_change_in_item(frm);
+	},
+	is_billable: function (frm) {
+		mark_change_in_item(frm);
+	},
+	item_group: function(frm) {
+		mark_change_in_item(frm);
+	},
+	description: function(frm) {
+		mark_change_in_item(frm);
+	},
+	medical_department: function(frm) {
+		mark_change_in_item(frm);
+	},
+	refresh: function(frm) {
+		frm.fields_dict["items"].grid.set_column_disp("barcode", false);
+		frm.fields_dict["items"].grid.set_column_disp("batch_no", false);
+		cur_frm.set_df_property("item_code", "read_only", frm.doc.__islocal ? 0 : 1);
+		if(!frm.doc.__islocal) {
+			cur_frm.add_custom_button(__('Change Item Code'), function() {
+				change_template_code(frm.doc);
+			} );
+			if(frm.doc.disabled == 1){
+				cur_frm.add_custom_button(__('Enable Template'), function() {
+					enable_template(frm.doc);
+				} );
+			}
+			else{
+				cur_frm.add_custom_button(__('Disable Template'), function() {
+					disable_template(frm.doc);
+				} );
+			}
+		}
+	}
+});
+
+var mark_change_in_item = function(frm) {
+	if(!frm.doc.__islocal){
+		frm.doc.change_in_item = 1;
+	}
+};
+
+var disable_template = function(doc){
+	frappe.call({
+		method: "erpnext.healthcare.doctype.clinical_procedure_template.clinical_procedure_template.disable_enable_template",
+		args: {status: 1, name: doc.name, item_code: doc.item_code, is_billable: doc.is_billable},
+		callback: function(){
+			cur_frm.reload_doc();
+		}
+	});
+};
+
+var enable_template = function(doc){
+	frappe.call({
+		method: "erpnext.healthcare.doctype.clinical_procedure_template.clinical_procedure_template.disable_enable_template",
+		args: {status: 0, name: doc.name, item_code: doc.item_code, is_billable: doc.is_billable},
+		callback: function(){
+			cur_frm.reload_doc();
+		}
+	});
+};
+
+
+var change_template_code = function(doc){
+	var d = new frappe.ui.Dialog({
+		title:__("Change Template Code"),
+		fields:[
+			{
+				"fieldtype": "Data",
+				"label": "Template Code",
+				"fieldname": "Item Code",
+				reqd:1
+			},
+			{
+				"fieldtype": "Button",
+				"label": __("Change Code"),
+				click: function() {
+					var values = d.get_values();
+					if(!values)
+						return;
+					change_item_code_from_template(values["Item Code"], doc);
+					d.hide();
+				}
+			}
+		]
+	});
+	d.show();
+	d.set_values({
+		'Item Code': doc.item_code
+	});
+};
+
+var change_item_code_from_template = function(item_code, doc){
+	frappe.call({
+		"method": "erpnext.healthcare.doctype.clinical_procedure_template.clinical_procedure_template.change_item_code_from_template",
+		"args": {item_code: item_code, doc: doc},
+		callback: function () {
+			cur_frm.reload_doc();
+			frappe.show_alert({
+				message: "Item Code renamed successfully",
+				indicator: "green"
+			});
+		}
+	});
+};
+
+frappe.ui.form.on('Clinical Procedure Item', {
+	qty: function(frm, cdt, cdn){
+		var d = locals[cdt][cdn];
+		frappe.model.set_value(cdt, cdn, "transfer_qty", d.qty*d.conversion_factor);
+	},
+	uom: function(doc, cdt, cdn){
+		var d = locals[cdt][cdn];
+		if(d.uom && d.item_code){
+			return frappe.call({
+				method: "erpnext.stock.doctype.stock_entry.stock_entry.get_uom_details",
+				args: {
+					item_code: d.item_code,
+					uom: d.uom,
+					qty: d.qty
+				},
+				callback: function(r) {
+					if(r.message) {
+						frappe.model.set_value(cdt, cdn, r.message);
+					}
+				}
+			});
+		}
+	},
+	item_code: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if(d.item_code) {
+			let args = {
+				'item_code'			: d.item_code,
+				'transfer_qty'		: d.transfer_qty,
+				'company'			: frm.doc.company,
+				'quantity'				: d.qty
+			};
+			return frappe.call({
+				doc: frm.doc,
+				method: "get_item_details",
+				args: args,
+				callback: function(r) {
+					if(r.message) {
+						var d = locals[cdt][cdn];
+						$.each(r.message, function(k, v){
+							d[k] = v;
+						});
+						refresh_field("items");
+					}
+				}
+			});
+		}
+	}
+});
+// List Stock items
+cur_frm.set_query("item_code", "items", function() {
+	return {
+		filters: {
+			is_stock_item:1
+		}
+	};
+});
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.json b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.json
new file mode 100644
index 0000000..aac4224
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.json
@@ -0,0 +1,784 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:template", 
+ "beta": 1, 
+ "creation": "2017-10-05 14:59:55.438359", 
+ "custom": 0, 
+ "description": "Procedure Template", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "template", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Template Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "medical_department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Medical Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Medical Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_billable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Billable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_billable", 
+   "fieldname": "rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "consume_stock", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Stock Consumption", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.consume_stock == 1", 
+   "fieldname": "consumables", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Consumables", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Clinical Procedure Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "sample_collection", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sample Collection", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sample", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Lab Test Sample", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "sample.sample_uom",
+   "fieldname": "sample_uom", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sample_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sample_details", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Collection Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "change_in_item", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Change In Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 22:43:29.674822",
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Clinical Procedure Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Medical Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Nursing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Physician", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Healthcare", 
+ "search_fields": "template", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "template", 
+ "track_changes": 1, 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
new file mode 100644
index 0000000..565fe90
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, earthians and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import nowdate
+
+class ClinicalProcedureTemplate(Document):
+	def on_update(self):
+		#Item and Price List update --> if (change_in_item)
+		if(self.change_in_item and self.is_billable == 1 and self.item):
+			updating_item(self)
+			if(self.rate != 0.0):
+				updating_rate(self)
+		elif(self.is_billable == 0 and self.item):
+			frappe.db.set_value("Item",self.item,"disabled",1)
+
+		frappe.db.set_value(self.doctype,self.name,"change_in_item",0)
+		self.reload()
+
+	def after_insert(self):
+		create_item_from_template(self)
+
+	#Call before delete the template
+	def on_trash(self):
+		if(self.item):
+			try:
+				frappe.delete_doc("Item",self.item)
+			except Exception:
+				frappe.throw("""Not permitted. Please disable the Procedure Template""")
+
+	def get_item_details(self, args=None):
+		item = frappe.db.sql("""select stock_uom, description, image, item_name,
+			expense_account, buying_cost_center, item_group from `tabItem`
+			where name = %s
+				and disabled=0
+				and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)""",
+			(args.get('item_code'), nowdate()), as_dict = 1)
+		if not item:
+			frappe.throw(_("Item {0} is not active or end of life has been reached").format(args.get('item_code')))
+
+		item = item[0]
+
+		ret = {
+			'uom'			      	: item.stock_uom,
+			'stock_uom'			  	: item.stock_uom,
+			'item_name' 		  	: item.item_name,
+			'quantity'				: 0,
+			'transfer_qty'			: 0,
+			'conversion_factor'		: 1
+		}
+		return ret
+
+def updating_item(self):
+	frappe.db.sql("""update `tabItem` set item_name=%s, item_group=%s, disabled=0,
+		description=%s, modified=NOW() where item_code=%s""",
+		(self.template, self.item_group , self.description, self.item))
+def updating_rate(self):
+	frappe.db.sql("""update `tabItem Price` set item_name=%s, price_list_rate=%s, modified=NOW() where
+	 item_code=%s""",(self.template, self.rate, self.item))
+
+def create_item_from_template(doc):
+	if(doc.is_billable == 1):
+		disabled = 0
+	else:
+		disabled = 1
+	#insert item
+	item =  frappe.get_doc({
+	"doctype": "Item",
+	"item_code": doc.template,
+	"item_name":doc.template,
+	"item_group": doc.item_group,
+	"description":doc.description,
+	"is_sales_item": 1,
+	"is_service_item": 1,
+	"is_purchase_item": 0,
+	"is_stock_item": 0,
+	"show_in_website": 0,
+	"is_pro_applicable": 0,
+	"disabled": disabled,
+	"stock_uom": "Unit"
+	}).insert(ignore_permissions=True)
+
+	#insert item price
+	#get item price list to insert item price
+	if(doc.rate != 0.0):
+		price_list_name = frappe.db.get_value("Price List", {"selling": 1})
+		if(doc.rate):
+			make_item_price(item.name, price_list_name, doc.rate)
+		else:
+			make_item_price(item.name, price_list_name, 0.0)
+	#Set item to the template
+	frappe.db.set_value("Clinical Procedure Template", doc.name, "item", item.name)
+
+	doc.reload() #refresh the doc after insert.
+
+def make_item_price(item, price_list_name, item_price):
+	frappe.get_doc({
+		"doctype": "Item Price",
+		"price_list": price_list_name,
+		"item_code": item,
+		"price_list_rate": item_price
+	}).insert(ignore_permissions=True)
+
+@frappe.whitelist()
+def change_item_code_from_template(item_code, doc):
+	args = json.loads(doc)
+	doc = frappe._dict(args)
+
+	if(frappe.db.exists({
+		"doctype": "Item",
+		"item_code": item_code})):
+		frappe.throw(_("Code {0} already exist").format(item_code))
+	else:
+		frappe.rename_doc("Item", doc.item_code, item_code, ignore_permissions = True)
+		frappe.db.set_value("Clinical Procedure Template", doc.name, "item_code", item_code)
+	return
+
+@frappe.whitelist()
+def disable_enable_template(status, name, item_code):
+	frappe.db.set_value("Clinical Procedure Template", name, "disabled", status)
+	if (frappe.db.exists({ #set Item's disabled field to status
+		"doctype": "Item",
+		"item_code": item_code})):
+			frappe.db.set_value("Item", item_code, "disabled", status)
+
+	return
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.js b/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.js
new file mode 100644
index 0000000..1dde8b5
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Clinical Procedure Template", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Clinical Procedure Template
+		() => frappe.tests.make('Clinical Procedure Template', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.py b/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.py
new file mode 100644
index 0000000..62e138b
--- /dev/null
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/test_clinical_procedure_template.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, earthians and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestClinicalProcedureTemplate(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/codification_table/codification_table.json b/erpnext/healthcare/doctype/codification_table/codification_table.json
index 7818a42..e65ae77 100644
--- a/erpnext/healthcare/doctype/codification_table/codification_table.json
+++ b/erpnext/healthcare/doctype/codification_table/codification_table.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "medical_code.code",
    "fieldname": "code", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "medical_code.code", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -80,6 +83,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "medical_code.description",
    "fieldname": "description", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -92,7 +96,7 @@
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "medical_code.description", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -103,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -116,7 +121,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-04 17:07:22.880451", 
+ "modified": "2018-05-16 22:43:27.047479",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Codification Table", 
diff --git a/erpnext/healthcare/doctype/consultation/consultation.js b/erpnext/healthcare/doctype/consultation/consultation.js
index dc4870f..727d175 100644
--- a/erpnext/healthcare/doctype/consultation/consultation.js
+++ b/erpnext/healthcare/doctype/consultation/consultation.js
@@ -35,6 +35,10 @@
 			create_medical_record(frm);
 		},"Create");
 
+		frm.add_custom_button(__("Procedure"),function(){
+			btn_create_procedure(frm);
+		},"Create");
+
 		frm.set_query("patient", function () {
 			return {
 				filters: {"disabled": 0}
@@ -127,6 +131,17 @@
 	frappe.new_doc("Vital Signs");
 };
 
+var btn_create_procedure = function (frm) {
+	if(!frm.doc.patient){
+		frappe.throw("Please select patient");
+	}
+	frappe.route_options = {
+		"patient": frm.doc.patient,
+		"medical_department": frm.doc.visit_department
+	};
+	frappe.new_doc("Clinical Procedure");
+};
+
 frappe.ui.form.on("Consultation", "appointment", function(frm){
 	if(frm.doc.appointment){
 		frappe.call({
@@ -238,6 +253,25 @@
 	}
 });
 
+frappe.ui.form.on("Procedure Prescription", {
+	procedure:  function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+		if(child.procedure){
+			frappe.call({
+				"method": "frappe.client.get_value",
+				args: {
+					doctype: "Clinical Procedure Template",
+					fieldname: "medical_department",
+					filters: {name: child.procedure}
+				},
+				callback: function (data) {
+					frappe.model.set_value(cdt, cdn, 'department',data.message.medical_department);
+				}
+			});
+		}
+	}
+});
+
 
 var calculate_age = function(birth) {
 	var ageMS = Date.parse(Date()) - Date.parse(birth);
diff --git a/erpnext/healthcare/doctype/consultation/consultation.json b/erpnext/healthcare/doctype/consultation/consultation.json
index c1bd37a..2f6de0c 100644
--- a/erpnext/healthcare/doctype/consultation/consultation.json
+++ b/erpnext/healthcare/doctype/consultation/consultation.json
@@ -880,6 +880,67 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "sb_procedures", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Procedures", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "procedure_prescription", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Procedures", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Procedure Prescription", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "consultation_comment", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -945,7 +1006,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-19 11:35:13.826577", 
+ "modified": "2018-03-19 11:35:13.826577", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Consultation", 
diff --git a/erpnext/healthcare/doctype/consultation/consultation.py b/erpnext/healthcare/doctype/consultation/consultation.py
index 451c491..ace5ac0 100755
--- a/erpnext/healthcare/doctype/consultation/consultation.py
+++ b/erpnext/healthcare/doctype/consultation/consultation.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.utils import getdate
+from frappe.utils import getdate, cstr
 import json
 from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account, get_income_account
 
@@ -108,9 +108,11 @@
 
 def update_consultation_to_medical_record(consultation):
 	medical_record_id = frappe.db.sql("select name from `tabPatient Medical Record` where reference_name=%s", (consultation.name))
-	if(medical_record_id[0][0]):
+	if medical_record_id and medical_record_id[0][0]:
 		subject = set_subject_field(consultation)
 		frappe.db.set_value("Patient Medical Record", medical_record_id[0][0], "subject", subject)
+	else:
+		insert_consultation_to_medical_record(consultation)
 
 def delete_medical_record(consultation):
 	frappe.db.sql("""delete from `tabPatient Medical Record` where reference_name = %s""", (consultation.name))
@@ -118,10 +120,12 @@
 def set_subject_field(consultation):
 	subject = "No Diagnosis "
 	if(consultation.diagnosis):
-		subject = "Diagnosis: "+ str(consultation.diagnosis)+". "
+		subject = "Diagnosis: \n"+ cstr(consultation.diagnosis)+". "
 	if(consultation.drug_prescription):
 		subject +="\nDrug(s) Prescribed. "
 	if(consultation.test_prescription):
 		subject += "\nTest(s) Prescribed."
+	if(consultation.procedure_prescription):
+		subject += "\nProcedure(s) Prescribed."
 
 	return subject
diff --git a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
index 7ad673d..ed852f1 100644
--- a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
+++ b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
@@ -61,5 +61,6 @@
 	appointment.physician = physician
 	appointment.department = department
 	appointment.appointment_date = appointment_date
+	appointment.company = "_Test Company"
 	appointment.save(ignore_permissions=True)
 	return appointment
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/healthcare_service_unit/__init__.py
similarity index 100%
rename from erpnext/healthcare/doctype/patient_service_unit/__init__.py
rename to erpnext/healthcare/doctype/healthcare_service_unit/__init__.py
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js
new file mode 100644
index 0000000..e966515
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Healthcare Service Unit', {
+	onload: function(frm) {
+		frm.list_route = "Tree/Healthcare Service Unit";
+
+		// get query select healthcare service unit
+		frm.fields_dict['parent_healthcare_service_unit'].get_query = function(doc) {
+			return{
+				filters:[
+					['Healthcare Service Unit', 'is_group', '=', 1],
+					['Healthcare Service Unit', 'name', '!=', doc.healthcare_service_unit_name]
+				]
+			};
+		};
+	},
+	refresh: function(frm) {
+		frm.trigger("set_root_readonly");
+		frm.add_custom_button(__("Healthcare Service Unit Tree"), function() {
+			frappe.set_route("Tree", "Healthcare Service Unit");
+		});
+	},
+	set_root_readonly: function(frm) {
+		// read-only for root healthcare service unit
+		frm.set_intro("");
+		if(!frm.doc.parent_healthcare_service_unit) {
+			frm.set_read_only();
+			frm.set_intro(__("This is a root healthcare service unit and cannot be edited."), true);
+		}
+	},
+	allow_appointments: function(frm) {
+		if(!frm.doc.allow_appointments){
+			frm.set_value("overlap_appointments", false);
+		}
+	},
+	is_group: function(frm) {
+		if(frm.doc.is_group){
+			frm.set_value("allow_appointments", false);
+		}
+	}
+});
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
new file mode 100644
index 0000000..d11ecdc
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
@@ -0,0 +1,420 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:healthcare_service_unit_name", 
+ "beta": 1, 
+ "creation": "2016-09-21 13:48:14.731437", 
+ "custom": 0, 
+ "description": "Healthcare Service Unit", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "healthcare_service_unit_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Service Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_healthcare_service_unit", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Parent Service Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Service Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_group != 1", 
+   "fieldname": "allow_appointments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Appointments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_group != 1 && doc.allow_appointments == 1", 
+   "fieldname": "overlap_appointments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Overlap", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_group != 1", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "lft", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "rgt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Healthcare Service Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-04 11:20:16.942603", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Healthcare Service Unit", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Nursing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Medical Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Physician", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "restrict_to_domain": "Healthcare", 
+ "search_fields": "healthcare_service_unit_name", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "healthcare_service_unit_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
new file mode 100644
index 0000000..21b0e6e
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+
+from frappe.utils.nestedset import NestedSet
+
+class HealthcareServiceUnit(NestedSet):
+	nsm_parent_field = 'parent_healthcare_service_unit'
+
+	def on_update(self):
+		super(HealthcareServiceUnit, self).on_update()
+		self.validate_one_root()
+
+	def validate(self):
+		if self.is_group:
+			self.allow_appointments = False
+			self.overlap_appointments = False
+		elif not self.allow_appointments:
+			self.overlap_appointments = False
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit_tree.js b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit_tree.js
new file mode 100644
index 0000000..4eb9475
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Healthcare Service Unit"] = {
+	ignore_fields:["parent_healthcare_service_unit"]
+};
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.js b/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.js
new file mode 100644
index 0000000..a67a411
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Healthcare Service Unit", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Healthcare Service Unit
+		() => frappe.tests.make('Healthcare Service Unit', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.py b/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.py
new file mode 100644
index 0000000..bced2fe
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/test_healthcare_service_unit.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestHealthcareServiceUnit(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json b/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
index cd9943b..127bebf 100644
--- a/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
+++ b/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -48,6 +49,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "test_code.test_name",
    "fieldname": "test_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -60,7 +62,7 @@
    "label": "Test", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "test_code.test_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -71,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -102,6 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -131,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -161,6 +166,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -191,6 +197,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -204,7 +211,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-04 17:42:32.976165", 
+ "modified": "2018-05-16 22:43:39.014193",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Lab Prescription", 
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.json b/erpnext/healthcare/doctype/lab_test/lab_test.json
index 981809f..a64c13c 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.json
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,7 +74,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -106,7 +106,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -115,6 +115,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.patient_name",
    "fieldname": "patient_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -127,7 +128,7 @@
    "label": "Patient Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "patient.patient_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -138,7 +139,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -169,7 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -201,7 +202,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -233,7 +234,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -264,7 +265,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -295,7 +296,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -327,7 +328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -357,7 +358,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -389,7 +390,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -421,7 +422,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -452,7 +453,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -483,7 +484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -515,7 +516,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -547,7 +548,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -580,7 +581,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -589,6 +590,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -601,7 +603,7 @@
    "label": "Technician Name", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -612,7 +614,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -621,6 +623,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.designation",
    "fieldname": "employee_designation", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -633,7 +636,7 @@
    "label": "Designation", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "employee.designation", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -644,7 +647,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -676,7 +679,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -707,7 +710,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -737,7 +740,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -768,7 +771,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -798,7 +801,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -830,7 +833,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -862,7 +865,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -892,7 +895,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -923,7 +926,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -953,7 +956,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -984,7 +987,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1014,7 +1017,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1045,7 +1048,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1075,7 +1078,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1106,7 +1109,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1137,7 +1140,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1168,7 +1171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1199,7 +1202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1231,7 +1234,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1262,7 +1265,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1293,7 +1296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1324,7 +1327,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1355,7 +1358,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1386,7 +1389,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1418,7 +1421,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1433,7 +1436,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-05 12:20:25.061368", 
+ "modified": "2018-05-16 22:43:40.341869",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Lab Test", 
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.py b/erpnext/healthcare/doctype/lab_test/lab_test.py
index 766491d..4e07ed6 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.py
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.py
@@ -6,7 +6,7 @@
 import frappe
 from frappe.model.document import Document
 import json
-from frappe.utils import getdate
+from frappe.utils import getdate, cstr
 from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account
 from frappe import _
 
@@ -228,9 +228,10 @@
 	return employee
 
 def insert_lab_test_to_medical_record(doc):
-	subject = str(doc.test_name)
+	subject = cstr(doc.test_name)
 	if(doc.test_comment):
-		subject += ", "+str(doc.test_comment)
+		subject += ", \n"+ cstr(doc.test_comment)
+
 	medical_record = frappe.new_doc("Patient Medical Record")
 	medical_record.patient = doc.patient
 	medical_record.subject = subject
@@ -244,7 +245,7 @@
 def delete_lab_test_from_medical_record(self):
 	medical_record_id = frappe.db.sql("select name from `tabPatient Medical Record` where reference_name=%s",(self.name))
 
-	if(medical_record_id[0][0]):
+	if medical_record_id and medical_record_id[0][0]:
 		frappe.delete_doc("Patient Medical Record", medical_record_id[0][0])
 
 def create_item_line(test_code, sales_invoice):
diff --git a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json b/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json
index 86be544..82d88ee 100644
--- a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json
+++ b/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json
@@ -42,6 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -82,6 +84,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "test_template.test_rate", 
    "fieldname": "test_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -94,7 +97,7 @@
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "test_template.test_rate", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -105,6 +108,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -113,6 +117,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "test_template.test_description",
    "fieldname": "test_description", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -125,7 +130,7 @@
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "test_template.test_description", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -136,6 +141,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -167,6 +173,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -199,6 +206,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -230,6 +238,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -259,6 +268,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -272,7 +282,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-04 16:55:45.081003", 
+ "modified": "2018-05-25 22:43:38.667043",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Lab Test Groups", 
diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json
index de1c76c..3e3878a 100644
--- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json
+++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json
@@ -40,7 +40,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,7 +72,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,7 +103,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -136,7 +136,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -168,7 +168,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -198,7 +198,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,7 +232,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -266,7 +266,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -299,7 +299,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -332,7 +332,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -364,7 +364,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -395,7 +395,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -425,7 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -458,7 +458,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -489,7 +489,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -521,7 +521,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -553,7 +553,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -584,7 +584,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -616,7 +616,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -648,7 +648,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -678,7 +678,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -709,7 +709,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -740,7 +740,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -772,7 +772,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -781,6 +781,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "sample.sample_uom",
    "fieldname": "sample_uom", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -793,7 +794,7 @@
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "sample.sample_uom", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -804,7 +805,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -836,7 +837,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -867,7 +868,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -899,7 +900,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -931,7 +932,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -945,7 +946,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-05 12:21:01.837502", 
+ "modified": "2018-05-16 22:43:26.086857",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Lab Test Template", 
diff --git a/erpnext/healthcare/doctype/patient/patient.js b/erpnext/healthcare/doctype/patient/patient.js
index b1150ab..b40f78d 100644
--- a/erpnext/healthcare/doctype/patient/patient.js
+++ b/erpnext/healthcare/doctype/patient/patient.js
@@ -40,7 +40,7 @@
 	},
 	onload: function (frm) {
 		if(!frm.doc.dob){
-			$(frm.fields_dict['age_html'].wrapper).html("Age not specified");
+			$(frm.fields_dict['age_html'].wrapper).html("");
 		}
 		if(frm.doc.dob){
 			$(frm.fields_dict['age_html'].wrapper).html("AGE : " + get_age(frm.doc.dob));
@@ -49,7 +49,7 @@
 });
 
 frappe.ui.form.on("Patient", "dob", function(frm) {
-	if(frm.doc.dob){
+	if(frm.doc.dob) {
 		var today = new Date();
 		var birthDate = new Date(frm.doc.dob);
 		if(today < birthDate){
@@ -61,6 +61,9 @@
 			$(frm.fields_dict['age_html'].wrapper).html("AGE : " + age_str);
 		}
 	}
+	else {
+		$(frm.fields_dict['age_html'].wrapper).html("");
+	}
 });
 
 var create_medical_record = function (frm) {
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index 41974a6..7d5ed8d 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -26,6 +26,7 @@
 			return {
 				filters: {
 					"is_group": false,
+					"allow_appointments": true
 				}
 			};
 		});
@@ -40,9 +41,16 @@
 				btn_update_status(frm, "Cancelled");
 			});
 
-			frm.add_custom_button(__("Consultation"),function(){
-				btn_create_consultation(frm);
-			},"Create");
+			if(frm.doc.procedure_template){
+				frm.add_custom_button(__("Procedure"),function(){
+					btn_create_procedure(frm);
+				},"Create");
+			}
+			else{
+				frm.add_custom_button(__("Consultation"),function(){
+					btn_create_consultation(frm);
+				},"Create");
+			}
 
 			frm.add_custom_button(__('Vital Signs'), function() {
 				btn_create_vital_signs(frm);
@@ -53,9 +61,16 @@
 				btn_update_status(frm, "Cancelled");
 			});
 
-			frm.add_custom_button(__("Consultation"),function(){
-				btn_create_consultation(frm);
-			},"Create");
+			if(frm.doc.procedure_template){
+				frm.add_custom_button(__("Procedure"),function(){
+					btn_create_procedure(frm);
+				},"Create");
+			}
+			else{
+				frm.add_custom_button(__("Consultation"),function(){
+					btn_create_consultation(frm);
+				},"Create");
+			}
 
 			frm.add_custom_button(__('Vital Signs'), function() {
 				btn_create_vital_signs(frm);
@@ -201,8 +216,85 @@
 			frm.disable_save();
 		}
 	},
+	get_procedure_from_consultation: function(frm) {
+		get_procedure_prescribed(frm);
+	}
 });
 
+var get_procedure_prescribed = function(frm){
+	if(frm.doc.patient){
+		frappe.call({
+			method:"erpnext.healthcare.doctype.patient_appointment.patient_appointment.get_procedure_prescribed",
+			args: {patient: frm.doc.patient},
+			callback: function(r){
+				show_procedure_templates(frm, r.message);
+			}
+		});
+	}
+	else{
+		frappe.msgprint("Please select Patient to get prescribed procedure");
+	}
+};
+
+var show_procedure_templates = function(frm, result){
+	var d = new frappe.ui.Dialog({
+		title: __("Prescribed Procedures"),
+		fields: [
+			{
+				fieldtype: "HTML", fieldname: "procedure_template"
+			}
+		]
+	});
+	var html_field = d.fields_dict.procedure_template.$wrapper;
+	html_field.empty();
+	$.each(result, function(x, y){
+		var row = $(repl('<div class="col-xs-12" style="padding-top:12px; text-align:center;" >\
+		<div class="col-xs-5"> %(consultation)s <br> %(consulting_physician)s <br> %(consultation_date)s </div>\
+		<div class="col-xs-5"> %(procedure_template)s <br>%(physician)s  <br> %(date)s</div>\
+		<div class="col-xs-2">\
+		<a data-name="%(name)s" data-procedure-template="%(procedure_template)s"\
+		data-consultation="%(consultation)s" data-physician="%(physician)s"\
+		data-date="%(date)s"  data-department="%(department)s">\
+		<button class="btn btn-default btn-xs">Add\
+		</button></a></div></div><div class="col-xs-12"><hr/><div/>', {name:y[0], procedure_template: y[1],
+				consultation:y[2], consulting_physician:y[3], consultation_date:y[4],
+				physician:y[5]? y[5]:'', date: y[6]? y[6]:'', department: y[7]? y[7]:''})).appendTo(html_field);
+		row.find("a").click(function() {
+			frm.doc.procedure_template = $(this).attr("data-procedure-template");
+			frm.doc.procedure_prescription = $(this).attr("data-name");
+			frm.doc.physician = $(this).attr("data-physician");
+			frm.doc.appointment_date = $(this).attr("data-date");
+			frm.doc.department = $(this).attr("data-department");
+			refresh_field("procedure_template");
+			refresh_field("procedure_prescription");
+			refresh_field("appointment_date");
+			refresh_field("physician");
+			refresh_field("department");
+			d.hide();
+			return false;
+		});
+	});
+	if(!result){
+		var msg = "There are no procedure prescribed for "+frm.doc.patient;
+		$(repl('<div class="col-xs-12" style="padding-top:20px;" >%(msg)s</div></div>', {msg: msg})).appendTo(html_field);
+	}
+	d.show();
+};
+
+var btn_create_procedure = function(frm){
+	var doc = frm.doc;
+	frappe.call({
+		method:"erpnext.healthcare.doctype.clinical_procedure.clinical_procedure.create_procedure",
+		args: {appointment: doc.name},
+		callback: function(data){
+			if(!data.exc){
+				var doclist = frappe.model.sync(data.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+			}
+		}
+	});
+};
+
 var btn_create_consultation = function(frm){
 	var doc = frm.doc;
 	frappe.call({
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
index 1cdf393..3c087ea 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,7 +74,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -106,7 +106,102 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "get_procedure_from_consultation", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Get prescribed procedures", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "procedure_prescription", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Procedure Prescription", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Procedure Prescription", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "procedure_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Procedure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Clinical Procedure Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -137,7 +232,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -168,7 +263,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -176,16 +271,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0,
+   "columns": 0, 
    "description": "In Minutes", 
    "fieldname": "duration", 
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1,
+   "in_filter": 1, 
    "in_global_search": 0, 
-   "in_list_view": 1,
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Duration", 
    "length": 0, 
@@ -200,7 +295,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,7 +327,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -264,7 +359,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -285,7 +380,7 @@
    "label": "Service Unit", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Patient Service Unit", 
+   "options": "Healthcare Service Unit", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -296,7 +391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -306,6 +401,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "", 
+   "fetch_from": "patient.patient_name",
    "fieldname": "patient_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -318,7 +414,7 @@
    "label": "Patient Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "patient.patient_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -329,7 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -338,6 +434,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.sex",
    "fieldname": "patient_sex", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -350,7 +447,7 @@
    "label": "Gender", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "patient.sex", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -361,7 +458,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -393,7 +490,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -426,7 +523,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -458,7 +555,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -489,7 +586,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -520,7 +617,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -550,7 +647,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -582,7 +679,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -614,7 +711,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -645,7 +742,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -676,7 +773,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -708,7 +805,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -740,7 +837,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -754,7 +851,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-13 12:10:00.123456",
+ "modified": "2018-05-16 22:43:39.359254",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Patient Appointment", 
@@ -763,7 +860,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -783,7 +879,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -803,7 +898,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
index 861f7c4..a9561a0 100755
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
@@ -24,6 +24,8 @@
 			self.reload()
 
 	def after_insert(self):
+		if self.procedure_prescription:
+			frappe.db.set_value("Procedure Prescription", self.procedure_prescription, "appointment_booked", True)
 		# Check fee validity exists
 		appointment = self
 		validity_exist = validity_exists(appointment.physician, appointment.patient)
@@ -122,10 +124,10 @@
 
 				if available_slots:
 					appointments = []
-					
+
 					if schedule.service_unit:
 						slot_name  = schedule.schedule+" - "+schedule.service_unit
-						allow_overlap = frappe.get_value('Patient Service Unit', schedule.service_unit, 'overlap_appointments')
+						allow_overlap = frappe.get_value('Healthcare Service Unit', schedule.service_unit, 'overlap_appointments')
 						if allow_overlap:
 							# fetch all appointments to physician by service unit
 							appointments = frappe.get_all(
@@ -164,9 +166,15 @@
 @frappe.whitelist()
 def update_status(appointment_id, status):
 	frappe.db.set_value("Patient Appointment", appointment_id, "status", status)
+	appointment_booked = True
 	if status == "Cancelled":
+		appointment_booked = False
 		appointment_cancel(appointment_id)
 
+	procedure_prescription = frappe.db.get_value("Patient Appointment", appointment_id, "procedure_prescription")
+	if procedure_prescription:
+		frappe.db.set_value("Procedure Prescription", procedure_prescription, "appointment_booked", appointment_booked)
+
 
 @frappe.whitelist()
 def set_open_appointments():
@@ -199,10 +207,14 @@
 	sales_invoice.appointment = appointment_doc.name
 	sales_invoice.due_date = getdate()
 	sales_invoice.is_pos = '0'
+	sales_invoice.company = appointment_doc.company
 	sales_invoice.debit_to = get_receivable_account(appointment_doc.company)
 
 	fee_validity = get_fee_validity(appointment_doc.physician, appointment_doc.patient, appointment_doc.appointment_date)
-	create_invoice_items(appointment_doc.physician, appointment_doc.company, sales_invoice)
+	procedure_template = False
+	if appointment_doc.procedure_template:
+		procedure_template = appointment_doc.procedure_template
+	create_invoice_items(appointment_doc.physician, appointment_doc.company, sales_invoice, procedure_template)
 
 	sales_invoice.save(ignore_permissions=True)
 	frappe.db.sql("""update `tabPatient Appointment` set sales_invoice=%s where name=%s""", (sales_invoice.name, appointment_doc.name))
@@ -256,18 +268,26 @@
 	return fee_validity
 
 
-def create_invoice_items(physician, company, invoice):
+def create_invoice_items(physician, company, invoice, procedure_template):
 	item_line = invoice.append("items")
-	item_line.item_name = "Consulting Charges"
-	item_line.description = "Consulting Charges:  " + physician
+	if procedure_template:
+		procedure_template_obj = frappe.get_doc("Clinical Procedure Template", procedure_template)
+		item_line.item_code = procedure_template_obj.item_code
+		item_line.item_name = procedure_template_obj.template
+		item_line.description = procedure_template_obj.description
+	else:
+		item_line.item_name = "Consulting Charges"
+		item_line.description = "Consulting Charges:  " + physician
+		item_line.uom = "Nos"
+		item_line.conversion_factor = 1
+		item_line.income_account = get_income_account(physician, company)
+		op_consulting_charge = frappe.db.get_value("Physician", physician, "op_consulting_charge")
+		if op_consulting_charge:
+			item_line.rate = op_consulting_charge
+			item_line.amount = op_consulting_charge
 	item_line.qty = 1
-	item_line.uom = "Nos"
-	item_line.conversion_factor = 1
-	item_line.income_account = get_income_account(physician, company)
-	op_consulting_charge = frappe.db.get_value("Physician", physician, "op_consulting_charge")
-	if op_consulting_charge:
-		item_line.rate = op_consulting_charge
-		item_line.amount = op_consulting_charge
+
+
 	return invoice
 
 
@@ -336,4 +356,12 @@
 		{"start": start, "end": end}, as_dict=True, update={"allDay": 0})
 	for item in data:
 		item.end = item.start + datetime.timedelta(minutes = item.duration)
-	return data
\ No newline at end of file
+
+	return data
+@frappe.whitelist()
+def get_procedure_prescribed(patient):
+	return frappe.db.sql("""select pp.name, pp.procedure, pp.parent, ct.physician,
+	ct.consultation_date, pp.physician, pp.date, pp.department
+	from tabConsultation ct, `tabProcedure Prescription` pp
+	where ct.patient='{0}' and pp.parent=ct.name and pp.appointment_booked=0
+	order by ct.creation desc""".format(patient))
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
index c35e397..dfff5a4 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
@@ -1,8 +1,8 @@
 
 frappe.views.calendar["Patient Appointment"] = {
 	field_map: {
-		"start": "appointment_date",
-		"end": "appointment_datetime",
+		"start": "start",
+		"end": "end",
 		"id": "name",
 		"title": "patient",
 		"allDay": "allDay",
@@ -43,4 +43,4 @@
 			'label': __('Status')
 		}
 	]
-};
+};
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json b/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json
index 8aa4ede..5606c0e 100644
--- a/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json
+++ b/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -130,6 +133,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -159,6 +163,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -189,6 +194,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -220,6 +226,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -251,6 +258,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -282,6 +290,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -313,6 +322,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -321,6 +331,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "reference_name.owner",
    "fieldname": "reference_owner", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -333,7 +344,7 @@
    "label": "Reference Owner", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "reference_name.owner", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
@@ -344,6 +355,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -376,6 +388,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -389,7 +402,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-27 14:37:40.468854", 
+ "modified": "2018-05-16 22:43:19.872990",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Patient Medical Record", 
@@ -398,7 +411,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js
deleted file mode 100644
index 197b4e5..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2017, earthians and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Patient Service Unit', {
-});
-
-// get query select patient service unit
-cur_frm.fields_dict['parent_patient_service_unit'].get_query = function(doc) {
-	return{
-		filters:[
-			['Patient Service Unit', 'is_group', '=', 1],
-			['Patient Service Unit', 'name', '!=', doc.patient_service_unit_name]
-		]
-	};
-};
diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json
deleted file mode 100644
index 0ca1a53..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json
+++ /dev/null
@@ -1,358 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:patient_service_unit_name", 
- "beta": 1, 
- "creation": "2016-09-21 13:48:14.731437", 
- "custom": 0, 
- "description": "Patinet Service Unit", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "patient_service_unit_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Service Unit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "parent_patient_service_unit", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Parent Service Unit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Patient Service Unit", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_group", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Is Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "overlap_appointments", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Overlap", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "lft", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "lft", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rgt", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "rgt", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "old_parent", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Old Parent", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Patient Service Unit", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-03-07 13:25:51.163029", 
- "modified_by": "Administrator", 
- "module": "Healthcare", 
- "name": "Patient Service Unit", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 1, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Nursing User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "user_permission_doctypes": "[\"Service Unit\"]", 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Medical Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Physician", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Healthcare", 
- "search_fields": "patient_service_unit_name", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "patient_service_unit_name", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py
deleted file mode 100644
index 6c177d8..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, earthians and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-
-from frappe.utils.nestedset import NestedSet
-
-class PatientServiceUnit(NestedSet):
-	nsm_parent_field = 'parent_patient_service_unit'
-
-	def on_update(self):
-		super(PatientServiceUnit, self).on_update()
-		self.validate_one_root()
diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js
deleted file mode 100644
index 0b03f2d..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js
+++ /dev/null
@@ -1,3 +0,0 @@
-frappe.treeview_settings["Patient Service Unit"] = {
-	ignore_fields:["parent_patient_service_unit"]
-};
diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js
deleted file mode 100644
index 320388a..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Patient Service Unit", function (assert) {
-	let done = assert.async();
-
-	// number of asserts
-	assert.expect(1);
-
-	frappe.run_serially([
-		// insert a new Patient Service Unit
-		() => frappe.tests.make('Patient Service Unit', [
-			// values to be set
-			{key: 'value'}
-		]),
-		() => {
-			assert.equal(cur_frm.doc.key, 'value');
-		},
-		() => done()
-	]);
-
-});
diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py
deleted file mode 100644
index ceb49fd..0000000
--- a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, earthians and Contributors
-# See license.txt
-from __future__ import unicode_literals
-import unittest
-
-class TestPatientServiceUnit(unittest.TestCase):
-	pass
diff --git a/erpnext/healthcare/doctype/physician/physician.js b/erpnext/healthcare/doctype/physician/physician.js
index 6ce0199..0b1a077 100755
--- a/erpnext/healthcare/doctype/physician/physician.js
+++ b/erpnext/healthcare/doctype/physician/physician.js
@@ -23,6 +23,7 @@
 			return {
 				filters: {
 					"is_group": false,
+					"allow_appointments": true
 				}
 			};
 		});
diff --git a/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js b/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
index 5b0b57f..c1b5581 100644
--- a/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
+++ b/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js
@@ -28,6 +28,7 @@
 				primary_action: () => {
 					var values = d.get_values();
 					if(values) {
+						let slot_added = false;
 						values.days.split(',').forEach(function(day){
 							day = $.trim(day);
 							if(['Sunday', 'Monday', 'Tuesday', 'Wednesday',
@@ -35,27 +36,75 @@
 								add_slots(day);
 							}
 						});
-						function add_slots(week_day){
-							let cur_time = moment(values.from_time, 'HH:mm:ss');
-							let end_time = moment(values.to_time, 'HH:mm:ss');
+						function check_overlap_or_add_slot(week_day, cur_time, end_time, add_slots_to_child){
+							let overlap = false;
 							while(cur_time < end_time) {
+								let add_to_child = true;
 								let to_time = cur_time.clone().add(values.duration, 'minutes');
 								if(to_time <= end_time) {
+									if(frm.doc.time_slots){
+										frm.doc.time_slots.forEach(function(slot) {
+											if(slot.day == week_day){
+												let slot_from_moment = moment(slot.from_time, 'HH:mm:ss');
+												let slot_to_moment = moment(slot.to_time, 'HH:mm:ss');
+												if(cur_time.isSame(slot_from_moment)	||	cur_time.isBetween(slot_from_moment, slot_to_moment)	||
+												to_time.isSame(slot_to_moment)	||	to_time.isBetween(slot_from_moment, slot_to_moment)){
+													overlap = true;
+													if(add_slots_to_child){
+														frappe.show_alert({
+															message:__('Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}',
+																[cur_time.format('HH:mm:ss'),	to_time.format('HH:mm:ss'),	slot.from_time,	slot.to_time]),
+															indicator:'orange'
+														});
+														add_to_child = false;
+													}
+												}
+											}
+										});
+									}
 									// add a new timeslot
-									frm.add_child('time_slots', {
-										from_time: cur_time.format('HH:mm:ss'),
-										to_time: to_time.format('HH:mm:ss'),
-										day: week_day
-									});
+									if(add_to_child && add_slots_to_child){
+										frm.add_child('time_slots', {
+											from_time: cur_time.format('HH:mm:ss'),
+											to_time: to_time.format('HH:mm:ss'),
+											day: week_day
+										});
+										slot_added = true;
+									}
 								}
 								cur_time = to_time;
 							}
+							return overlap;
+						}
+						function add_slots(week_day){
+							let cur_time = moment(values.from_time, 'HH:mm:ss');
+							let end_time = moment(values.to_time, 'HH:mm:ss');
+							if(check_overlap_or_add_slot(week_day, cur_time, end_time, false)){
+								frappe.confirm(__('Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?',	[week_day]),
+									function() {
+										// if Yes
+										check_overlap_or_add_slot(week_day, cur_time, end_time, true);
+									},
+									function() {
+										// if No
+										frappe.show_alert({
+											message:__('Slots for {0} are not added to the schedule',	[week_day]),
+											indicator:'red'
+										});
+									}
+								);
+							}
+							else{
+								check_overlap_or_add_slot(week_day, cur_time, end_time, true);
+							}
 						}
 						frm.refresh_field('time_slots');
-						frappe.show_alert({
-							message:__('Time slots added'),
-							indicator:'green'
-						});
+						if(slot_added){
+							frappe.show_alert({
+								message:__('Time slots added'),
+								indicator:'green'
+							});
+						}
 					}
 				},
 			});
diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json
index 69fe7b3..7fff2be 100644
--- a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json
+++ b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -61,7 +62,7 @@
    "label": "Service Unit", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Patient Service Unit", 
+   "options": "Healthcare Service Unit", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -85,7 +87,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-12-27 10:57:42.301295", 
+ "modified": "2018-05-02 03:38:09.935153", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Physician Service Unit Schedule", 
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/procedure_prescription/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/healthcare/doctype/procedure_prescription/__init__.py
diff --git a/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.json b/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.json
new file mode 100644
index 0000000..73bcf3f
--- /dev/null
+++ b/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.json
@@ -0,0 +1,263 @@
+{
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 1, 
+ "creation": "2017-11-17 15:52:48.324157", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "procedure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Procedure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Clinical Procedure Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "procedure.template",
+   "fieldname": "procedure_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Procedure Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Medical Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "physician", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Physician", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Physician", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "comments", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Comments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "appointment_booked", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Appointment Booked", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 22:43:37.924984",
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Procedure Prescription", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.py b/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.py
new file mode 100644
index 0000000..62ea9f1
--- /dev/null
+++ b/erpnext/healthcare/doctype/procedure_prescription/procedure_prescription.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class ProcedurePrescription(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/sample_collection/sample_collection.json b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
index 39788fb..03d8d90 100644
--- a/erpnext/healthcare/doctype/sample_collection/sample_collection.json
+++ b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
@@ -43,6 +43,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,6 +75,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,6 +107,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -165,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -173,6 +178,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.sex",
    "fieldname": "patient_sex", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -185,7 +191,7 @@
    "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "patient.sex", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -196,6 +202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -227,6 +234,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -256,6 +264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -287,6 +296,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -295,6 +305,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "sample.sample_uom",
    "fieldname": "sample_uom", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -307,7 +318,7 @@
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "sample.sample_uom", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -318,6 +329,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -349,6 +361,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -378,6 +391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -409,6 +423,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -439,6 +454,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -470,6 +486,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -500,6 +517,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -529,6 +547,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -559,6 +578,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -572,7 +592,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-10-05 11:58:46.016097", 
+ "modified": "2018-05-16 22:43:35.762002",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Sample Collection", 
@@ -581,7 +601,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 0, 
diff --git a/erpnext/healthcare/doctype/vital_signs/vital_signs.json b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
index 5f7fdd1..70a04fa 100644
--- a/erpnext/healthcare/doctype/vital_signs/vital_signs.json
+++ b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.patient_name",
    "fieldname": "patient_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "Patient Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "patient.patient_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +106,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,6 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +168,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -194,6 +200,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -223,6 +230,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -254,6 +262,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -284,6 +293,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -315,6 +325,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -346,6 +357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -377,6 +389,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -406,6 +419,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -436,6 +450,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -467,6 +482,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -498,6 +514,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -528,6 +545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -558,6 +576,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -588,6 +607,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -618,6 +638,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -649,6 +670,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -678,6 +700,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -708,6 +731,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -739,6 +763,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -769,6 +794,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -782,7 +808,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-22 17:31:16.620650", 
+ "modified": "2018-05-16 22:42:54.580491",
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Vital Signs", 
@@ -791,7 +817,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -811,7 +836,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/healthcare/doctype/vital_signs/vital_signs.py b/erpnext/healthcare/doctype/vital_signs/vital_signs.py
index a42ff02..bf4dace 100644
--- a/erpnext/healthcare/doctype/vital_signs/vital_signs.py
+++ b/erpnext/healthcare/doctype/vital_signs/vital_signs.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe.utils import cstr
 
 class VitalSigns(Document):
 	def on_submit(self):
@@ -27,22 +28,22 @@
 
 def delete_vital_signs_from_medical_record(doc):
 	medical_record_id = frappe.db.sql("select name from `tabPatient Medical Record` where reference_name=%s",(doc.name))
-	if(medical_record_id[0][0]):
+	if medical_record_id and medical_record_id[0][0]:
 		frappe.delete_doc("Patient Medical Record", medical_record_id[0][0])
 
 def set_subject_field(doc):
 	subject = ""
 	if(doc.temperature):
-		subject += "Temperature: "+ str(doc.temperature)+".\n"
+		subject += "Temperature: \n"+ cstr(doc.temperature)+". "
 	if(doc.pulse):
-		subject += "Pulse: "+ str(doc.pulse)+".\n"
+		subject += "Pulse: \n"+ cstr(doc.pulse)+". "
 	if(doc.respiratory_rate):
-		subject += "Respiratory Rate: "+ str(doc.respiratory_rate)+".\n"
+		subject += "Respiratory Rate: \n"+ cstr(doc.respiratory_rate)+". "
 	if(doc.bp):
-		subject += "BP: "+ str(doc.bp)+".\n"
+		subject += "BP: \n"+ cstr(doc.bp)+". "
 	if(doc.bmi):
-		subject += "BMI: "+ str(doc.bmi)+".\n"
+		subject += "BMI: \n"+ cstr(doc.bmi)+". "
 	if(doc.nutrition_note):
-		subject += "Note: "+ str(doc.nutrition_note)+"."
+		subject += "Note: \n"+ cstr(doc.nutrition_note)+". "
 
 	return subject
diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py
index fca1270..f30f42c 100644
--- a/erpnext/healthcare/setup.py
+++ b/erpnext/healthcare/setup.py
@@ -17,6 +17,7 @@
 	create_lab_test_items()
 	create_lab_test_template()
 	create_sensitivity()
+	add_healthcare_service_unit_tree_root()
 
 def create_medical_departments():
 	departments = [
@@ -260,3 +261,13 @@
 		{"doctype": "Sensitivity", "sensitivity": _("Intermediate")}
 	]
 	insert_record(records)
+
+def add_healthcare_service_unit_tree_root():
+	record = [
+	 {
+	  "doctype": "Healthcare Service Unit",
+	  "healthcare_service_unit_name": "All Healthcare Service Unit",
+	  "is_group": 1
+	 }
+	]
+	insert_record(record)
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index e77ed6f..914aacc 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -234,7 +234,12 @@
 		"erpnext.buying.doctype.supplier_scorecard.supplier_scorecard.refresh_scorecards",
 		"erpnext.setup.doctype.company.company.cache_companies_monthly_sales_history",
 		"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_latest_price_in_all_boms",
-		"erpnext.assets.doctype.asset.asset.update_maintenance_status"
+		"erpnext.assets.doctype.asset.asset.update_maintenance_status",
+		"erpnext.assets.doctype.asset.asset.make_post_gl_entry"
+  ],
+	"monthly": [
+		"erpnext.accounts.doctype.sales_invoice.sales_invoice.booked_deferred_revenue",
+		"erpnext.hr.utils.allocate_earned_leaves"
 	]
 }
 
@@ -268,7 +273,8 @@
 	'India': {
 		'erpnext.tests.test_regional.test_method': 'erpnext.regional.india.utils.test_method',
 		'erpnext.controllers.taxes_and_totals.get_itemised_tax_breakup_header': 'erpnext.regional.india.utils.get_itemised_tax_breakup_header',
-		'erpnext.controllers.taxes_and_totals.get_itemised_tax_breakup_data': 'erpnext.regional.india.utils.get_itemised_tax_breakup_data'
+		'erpnext.controllers.taxes_and_totals.get_itemised_tax_breakup_data': 'erpnext.regional.india.utils.get_itemised_tax_breakup_data',
+		'erpnext.accounts.party.get_regional_address_details': 'erpnext.regional.india.utils.get_regional_address_details'
 	},
 	'United Arab Emirates': {
 		'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data'
@@ -276,4 +282,4 @@
 	'Saudi Arabia': {
 		'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data'
 	}
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/additional_salary/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/additional_salary/__init__.py
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.js b/erpnext/hr/doctype/additional_salary/additional_salary.js
new file mode 100644
index 0000000..94e06ad
--- /dev/null
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Additional Salary', {
+	setup: function(frm) {
+		frm.set_query("salary_component", function() {
+			return {
+				filters: {
+					type: "earning",
+					is_additional_component: true
+				}
+			};
+		});
+		frm.set_query("employee", function() {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			};
+		});
+	}
+});
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.json b/erpnext/hr/doctype/additional_salary/additional_salary.json
new file mode 100644
index 0000000..420d599
--- /dev/null
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.json
@@ -0,0 +1,441 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2018-05-10 12:04:08.396461", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "ASC-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Salary Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Additional Salary", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-30 11:44:06.422122", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Additional Salary", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py
new file mode 100644
index 0000000..7482c8b
--- /dev/null
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import getdate, date_diff
+
+class AdditionalSalary(Document):
+	def validate(self):
+		self.validate_dates()
+		if self.amount <= 0:
+			frappe.throw(_("Amount should be greater than zero."))
+
+	def validate_dates(self):
+ 		date_of_joining, relieving_date = frappe.db.get_value("Employee", self.employee,
+			["date_of_joining", "relieving_date"])
+ 		if getdate(self.from_date) > getdate(self.to_date):
+ 			frappe.throw(_("To date can not be less than from date"))
+ 		elif date_of_joining and getdate(self.from_date) < getdate(date_of_joining):
+ 			frappe.throw(_("From date can not be less than employee's joining date"))
+ 		elif relieving_date and getdate(self.to_date) > getdate(relieving_date):
+ 			frappe.throw(_("To date can not greater than employee's relieving date"))
+
+	def get_amount(self, sal_start_date, sal_end_date):
+		# If additional salary dates in between the salary slip dates
+		# then return complete additional salary amount
+		if getdate(sal_start_date) <= getdate(self.from_date) <= getdate(sal_end_date)\
+			and getdate(sal_end_date) >= getdate(self.to_date) >= getdate(sal_start_date):
+			return self.amount
+		start_date = getdate(sal_start_date)
+		end_date = getdate(sal_end_date)
+		total_days = date_diff(getdate(self.to_date), getdate(self.from_date)) + 1
+		amount_per_day = self.amount / total_days
+		if getdate(sal_start_date) <= getdate(self.from_date):
+			start_date = getdate(self.from_date)
+		if getdate(sal_end_date) > getdate(self.to_date):
+			end_date = getdate(self.to_date)
+		no_of_days = date_diff(getdate(end_date), getdate(start_date))
+		return amount_per_day * no_of_days
+
+
+
+
+@frappe.whitelist()
+def get_additional_salary_component(employee, start_date, end_date):
+	additional_components = frappe.db.sql("""
+	select name from `tabAdditional Salary`
+	where employee=%(employee)s
+	and docstatus = 1
+	and (
+		(%(from_date)s between from_date and to_date)
+		or (%(to_date)s between from_date and to_date)
+		or (from_date between %(from_date)s and %(to_date)s)
+	)""", {
+		'employee': employee,
+		'from_date': start_date,
+		'to_date': end_date
+	})
+
+	if additional_components:
+		additional_components_array = []
+		for additional_component in additional_components:
+			struct_row = {}
+			additional_components_dict = {}
+			additional_component_obj = frappe.get_doc("Additional Salary", additional_component[0])
+			amount = additional_component_obj.get_amount(start_date, end_date)
+			salary_component = frappe.get_doc("Salary Component", additional_component_obj.salary_component)
+			struct_row['depends_on_lwp'] = salary_component.depends_on_lwp
+			struct_row['salary_component'] = salary_component.name
+			struct_row['abbr'] = salary_component.salary_component_abbr
+			struct_row['do_not_include_in_total'] = salary_component.do_not_include_in_total
+			additional_components_dict['amount'] = amount
+			additional_components_dict['struct_row'] = struct_row
+			additional_components_array.append(additional_components_dict)
+
+		if len(additional_components_array) > 0:
+			return additional_components_array
+	return False
diff --git a/erpnext/hr/doctype/additional_salary/test_additional_salary.js b/erpnext/hr/doctype/additional_salary/test_additional_salary.js
new file mode 100644
index 0000000..c18e187
--- /dev/null
+++ b/erpnext/hr/doctype/additional_salary/test_additional_salary.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Additional Salary", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Additional Salary
+		() => frappe.tests.make('Additional Salary', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/additional_salary/test_additional_salary.py b/erpnext/hr/doctype/additional_salary/test_additional_salary.py
new file mode 100644
index 0000000..949ba20
--- /dev/null
+++ b/erpnext/hr/doctype/additional_salary/test_additional_salary.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestAdditionalSalary(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 823fbd7..90dba6a 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,6 +106,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -138,6 +141,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -170,6 +174,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -200,6 +205,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -235,6 +241,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -267,6 +274,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -299,6 +307,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -307,6 +316,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "depends_on": "kra_template", 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
@@ -331,6 +373,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -363,6 +406,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -394,6 +438,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -425,6 +470,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -454,6 +500,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -484,6 +531,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -514,6 +562,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -546,6 +595,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -575,6 +625,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -607,6 +658,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }
@@ -622,7 +674,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:28:49.914065", 
+ "modified": "2018-05-17 09:46:21.763030",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
@@ -630,7 +682,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -650,7 +701,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -670,7 +720,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
index 49fe105..f22969b 100644
--- a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
+++ b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
@@ -202,7 +202,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 97402ac..ac6e400 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -108,7 +108,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
index d11ec64..34ea5d8 100644
--- a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
+++ b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
@@ -73,7 +73,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index 2078eab..171b574 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,6 +107,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -136,6 +139,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -169,6 +173,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -202,6 +207,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -231,6 +237,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -263,6 +270,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -295,6 +303,72 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "attendance_request", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Attendance Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Attendance Request", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -325,6 +399,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -339,7 +414,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:29:11.771376", 
+ "modified": "2018-05-17 09:55:51.504294",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
@@ -347,7 +422,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -367,7 +441,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -387,7 +460,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index 7b04f7d..ad162c6 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -8,6 +8,7 @@
 from frappe import _
 from frappe.model.document import Document
 from erpnext.hr.utils import set_employee_name
+from frappe.utils import cstr
 
 class Attendance(Document):
 	def validate_duplicate_record(self):
@@ -20,17 +21,19 @@
 		set_employee_name(self)
 
 	def check_leave_record(self):
-		leave_record = frappe.db.sql("""select leave_type, half_day from `tabLeave Application`
-			where employee = %s and %s between from_date and to_date
+		leave_record = frappe.db.sql("""select leave_type, half_day, half_day_date from `tabLeave Application`
+			where employee = %s and %s between from_date and to_date and status = 'Approved'
 			and docstatus = 1""", (self.employee, self.attendance_date), as_dict=True)
 		if leave_record:
-			if leave_record[0].half_day:
-				self.status = 'Half Day'
-				frappe.msgprint(_("Employee {0} on Half day on {1}").format(self.employee, self.attendance_date))
-			else:
-				self.status = 'On Leave'
-				self.leave_type = leave_record[0].leave_type
-				frappe.msgprint(_("Employee {0} on Leave on {1}").format(self.employee, self.attendance_date))
+			for d in leave_record:
+				if d.half_day_date == getdate(self.attendance_date):
+					self.status = 'Half Day'
+					frappe.msgprint(_("Employee {0} on Half day on {1}").format(self.employee, self.attendance_date))
+				else:
+					self.status = 'On Leave'
+					self.leave_type = d.leave_type
+					frappe.msgprint(_("Employee {0} on Leave on {1}").format(self.employee, self.attendance_date))
+
 		if self.status == "On Leave" and not leave_record:
 			frappe.throw(_("No leave record found for employee {0} for {1}").format(self.employee, self.attendance_date))
 
@@ -54,3 +57,36 @@
 		self.validate_attendance_date()
 		self.validate_duplicate_record()
 		self.check_leave_record()
+
+@frappe.whitelist()
+def get_events(start, end, filters=None):
+	events = []
+
+	employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user})
+
+	if not employee:
+		return events
+
+	from frappe.desk.reportview import get_filters_cond
+	conditions = get_filters_cond("Attendance", filters, [])
+	add_attendance(events, start, end, conditions=conditions)
+	return events
+
+def add_attendance(events, start, end, conditions=None):
+	query = """select name, attendance_date, status
+		from `tabAttendance` where
+		attendance_date between %(from_date)s and %(to_date)s
+		and docstatus < 2"""
+	if conditions:
+		query += conditions
+
+	for d in frappe.db.sql(query, {"from_date":start, "to_date":end}, as_dict=True):
+		e = {
+			"name": d.name,
+			"doctype": "Attendance",
+			"date": d.attendance_date,
+			"title": cstr(d.status),
+			"docstatus": d.docstatus
+		}
+		if e not in events:
+			events.append(e)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance/attendance_calendar.js b/erpnext/hr/doctype/attendance/attendance_calendar.js
new file mode 100644
index 0000000..b21afe5
--- /dev/null
+++ b/erpnext/hr/doctype/attendance/attendance_calendar.js
@@ -0,0 +1,18 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+frappe.views.calendar["Attendance"] = {
+	field_map: {
+		"start": "date",
+		"end": "date",
+		"id": "name",
+		"docstatus": 1
+	},
+	options: {
+		header: {
+			left: 'prev,next today',
+			center: 'title',
+			right: 'month'
+		}
+	},
+	get_events_method: "erpnext.hr.doctype.attendance.attendance.get_events"
+};
\ No newline at end of file
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/attendance_request/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/attendance_request/__init__.py
diff --git a/erpnext/hr/doctype/attendance_request/attendance_request.js b/erpnext/hr/doctype/attendance_request/attendance_request.js
new file mode 100644
index 0000000..2d25d14
--- /dev/null
+++ b/erpnext/hr/doctype/attendance_request/attendance_request.js
@@ -0,0 +1,14 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+cur_frm.add_fetch('employee', 'company', 'company');
+
+frappe.ui.form.on('Attendance Request', {
+	half_day: function(frm) {
+		if(frm.doc.half_day == 1){
+			frm.set_df_property('half_day_date', 'reqd', true);
+		}
+		else{
+			frm.set_df_property('half_day_date', 'reqd', false);
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/attendance_request/attendance_request.json b/erpnext/hr/doctype/attendance_request/attendance_request.json
new file mode 100644
index 0000000..c626941
--- /dev/null
+++ b/erpnext/hr/doctype/attendance_request/attendance_request.json
@@ -0,0 +1,510 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "EAR.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 15:37:40.918990", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "half_day", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Half Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "half_day", 
+   "fieldname": "half_day_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Half Day Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "explanation", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Explanation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reason", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Reason", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Work From Home\nOn Duty", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Attendance Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 12:02:39.993839", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Attendance Request", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/attendance_request/attendance_request.py b/erpnext/hr/doctype/attendance_request/attendance_request.py
new file mode 100644
index 0000000..4cab11f
--- /dev/null
+++ b/erpnext/hr/doctype/attendance_request/attendance_request.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import date_diff, add_days, getdate
+from erpnext.hr.doctype.employee.employee import is_holiday
+from erpnext.hr.utils import validate_dates
+
+class AttendanceRequest(Document):
+	def validate(self):
+		validate_dates(self, self.from_date, self.to_date)
+		if self.half_day:
+			if not getdate(self.from_date)<=getdate(self.half_day_date)<=getdate(self.to_date):
+				frappe.throw(_("Half day date should be in between from date and to date"))
+
+	def on_submit(self):
+		self.create_attendance()
+
+	def on_cancel(self):
+		attendance_list = frappe.get_list("Attendance", {'employee': self.employee, 'attendance_request': self.name})
+		if attendance_list:
+			for attendance in attendance_list:
+				attendance_obj = frappe.get_doc("Attendance", attendance['name'])
+				attendance_obj.cancel()
+
+	def create_attendance(self):
+		request_days = date_diff(self.to_date, self.from_date) + 1
+		for number in range(request_days):
+			attendance_date = add_days(self.from_date, number)
+			skip_attendance = self.validate_if_attendance_not_applicable(attendance_date)
+			if not skip_attendance:
+				attendance = frappe.new_doc("Attendance")
+				attendance.employee = self.employee
+				attendance.employee_name = self.employee_name
+				if self.half_day and date_diff(getdate(self.half_day_date), getdate(attendance_date)) == 0:
+					attendance.status = "Half Day"
+				else:
+					attendance.status = "Present"
+				attendance.attendance_date = attendance_date
+				attendance.company = self.company
+				attendance.attendance_request = self.name
+				attendance.save(ignore_permissions=True)
+				attendance.submit()
+
+	def validate_if_attendance_not_applicable(self, attendance_date):
+		# Check if attendance_date is a Holiday
+		if is_holiday(self.employee, attendance_date):
+			return True
+
+		# Check if employee on Leave
+		leave_record = frappe.db.sql("""select half_day from `tabLeave Application`
+			where employee = %s and %s between from_date and to_date
+			and docstatus = 1""", (self.employee, attendance_date), as_dict=True)
+		if leave_record:
+			return True
+
+		return False
diff --git a/erpnext/hr/doctype/attendance_request/test_attendance_request.js b/erpnext/hr/doctype/attendance_request/test_attendance_request.js
new file mode 100644
index 0000000..d40ec61
--- /dev/null
+++ b/erpnext/hr/doctype/attendance_request/test_attendance_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Attendance Request", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Attendance Request
+		() => frappe.tests.make('Attendance Request', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/attendance_request/test_attendance_request.py b/erpnext/hr/doctype/attendance_request/test_attendance_request.py
new file mode 100644
index 0000000..d737699
--- /dev/null
+++ b/erpnext/hr/doctype/attendance_request/test_attendance_request.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAttendanceRequest(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index 609456c..221b522 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -44,7 +44,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/compensatory_leave_request/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/compensatory_leave_request/__init__.py
diff --git a/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.js b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.js
new file mode 100644
index 0000000..bb57562
--- /dev/null
+++ b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.js
@@ -0,0 +1,14 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Compensatory Leave Request', {
+	refresh: function(frm) {
+		frm.set_query("leave_type", function() {
+			return {
+				filters: {
+					"is_compensatory": true
+				}
+			};
+		});
+	}
+});
diff --git a/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.json b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.json
new file mode 100644
index 0000000..9d2a966
--- /dev/null
+++ b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.json
@@ -0,0 +1,445 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "CLR-.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 14:51:39.326768", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "work_from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Work From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "work_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Work End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reason", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_allocation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Allocation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Allocation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Compensatory Leave Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 12:02:05.585184", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Compensatory Leave Request", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py
new file mode 100644
index 0000000..6a67d47
--- /dev/null
+++ b/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import date_diff, add_days
+from frappe.model.document import Document
+from erpnext.hr.utils import validate_dates, validate_overlap, get_leave_period
+
+class CompensatoryLeaveRequest(Document):
+
+	def validate(self):
+		validate_dates(self, self.work_from_date, self.work_end_date)
+		validate_overlap(self, self.work_from_date, self.work_end_date)
+
+	def on_submit(self):
+		if not self.leave_type:
+			frappe.throw(_("Please select a leave type to submit the request"))
+		else:
+			company = frappe.db.get_value("Employee", self.employee, "company")
+			date_difference = date_diff(self.work_end_date, self.work_from_date) + 1
+			leave_period = get_leave_period(self.work_from_date, self.work_end_date, company)
+			if leave_period:
+				leave_allocation = self.exists_allocation_for_period(leave_period)
+				if leave_allocation:
+					leave_allocation.new_leaves_allocated += date_difference
+					leave_allocation.submit()
+				else:
+					leave_allocation = self.create_leave_allocation(leave_period, date_difference)
+				self.db_set("leave_allocation", leave_allocation.name)
+			else:
+				frappe.throw(_("There is no leave period in between {0} and {1}").format(self.work_from_date, self.work_end_date))
+
+	def exists_allocation_for_period(self, leave_period):
+		leave_allocation = frappe.db.sql("""
+			select name
+			from `tabLeave Allocation`
+			where employee=%(employee)s and leave_type=%(leave_type)s
+				and docstatus=1
+				and (from_date between %(from_date)s and %(to_date)s
+					or to_date between %(from_date)s and %(to_date)s
+					or (from_date < %(from_date)s and to_date > %(to_date)s))
+		""", {
+			"from_date": leave_period[0].from_date,
+			"to_date": leave_period[0].to_date,
+			"employee": self.employee,
+			"leave_type": self.leave_type
+		}, as_dict=1)
+
+		if leave_allocation:
+			return frappe.get_doc("Leave Allocation", leave_allocation[0].name)
+		else:
+			return False
+
+	def create_leave_allocation(self, leave_period, date_difference):
+		is_carry_forward = frappe.db.get_value("Leave Type", self.leave_type, "is_carry_forward")
+		allocation = frappe.new_doc("Leave Allocation")
+		allocation.employee = self.employee
+		allocation.employee_name = self.employee_name
+		allocation.leave_type = self.leave_type
+		allocation.from_date = add_days(self.work_end_date, 1)
+		allocation.to_date = leave_period[0].to_date
+		allocation.new_leaves_allocated = date_difference
+		allocation.total_leaves_allocated = date_difference
+		allocation.description = self.reason
+		if is_carry_forward == 1:
+			allocation.carry_forward = True
+		allocation.save(ignore_permissions = True)
+		allocation.submit()
+		return allocation
diff --git a/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.js b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.js
new file mode 100644
index 0000000..bebcaac
--- /dev/null
+++ b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Compensatory Leave Request", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Compensatory Leave Request
+		() => frappe.tests.make('Compensatory Leave Request', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py
new file mode 100644
index 0000000..f2ca1f4
--- /dev/null
+++ b/erpnext/hr/doctype/compensatory_leave_request/test_compensatory_leave_request.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# class TestCompensatoryLeaveRequest(unittest.TestCase):
+# 	def get_compensatory_leave_request(self):
+# 		return frappe.get_doc('Compensatory Leave Request', dict(
+# 			employee = employee,
+# 			work_from_date = today,
+# 			work_to_date = today,
+# 			reason = 'test'
+# 		)).insert()
+#
+# 	def test_creation_of_leave_allocation(self):
+# 		employee = get_employee()
+# 		today = get_today()
+#
+# 		compensatory_leave_request = self.get_compensatory_leave_request(today)
+#
+# 		before = get_leave_balance(employee, compensatory_leave_request.leave_type)
+#
+# 		compensatory_leave_request.submit()
+#
+# 		self.assertEqual(get_leave_balance(employee, compensatory_leave_request.leave_type), before + 1)
+#
+# 	def test_max_compensatory_leave(self):
+# 		employee = get_employee()
+# 		today = get_today()
+#
+# 		compensatory_leave_request = self.get_compensatory_leave_request()
+#
+# 		frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 0)
+#
+# 		self.assertRaises(MaxLeavesLimitCrossed, compensatory_leave_request.submit)
+#
+# 		frappe.db.set_value('Leave Type', compensatory_leave_request.leave_type, 'max_leaves_allowed', 10)
+#
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
index 4d3b173..f187286 100644
--- a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
@@ -105,10 +105,13 @@
 
 
 def get_user_emails_from_group(group):
-	'''Returns list of email of users from the given group
+	'''Returns list of email of enabled users from the given group
 
 	:param group: Daily Work Summary Group `name`'''
-	group_doc = frappe.get_doc('Daily Work Summary Group', group)
-	emails = [d.email for d in group_doc.users]
+	group_doc = group
+	if isinstance(group_doc, str):
+		group_doc = frappe.get_doc('Daily Work Summary Group', group)
+
+	emails = [d.email for d in group_doc.users if frappe.db.get_value("User", d.user, "enabled")]
 
 	return emails
diff --git a/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
index b4c2133..eab6826 100644
--- a/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
+++ b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
@@ -15,8 +15,9 @@
 		self.setup_and_prepare_test()
 		for d in self.users:
 			# check that email is sent to users
-			self.assertTrue(d.email in [d.recipient for d in self.emails
-				if self.groups.subject in d.message])
+			if d.message:
+				self.assertTrue(d.email in [d.recipient for d in self.emails
+					if self.groups.subject in d.message])
 
 	def test_email_trigger_failed(self):
 		hour = '00:00'
diff --git a/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py b/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py
index a549a9b..67070bf 100644
--- a/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py
+++ b/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py
@@ -7,7 +7,7 @@
 from frappe.model.document import Document
 import frappe.utils
 from frappe import _
-
+from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_user_emails_from_group
 
 class DailyWorkSummaryGroup(Document):
 	def validate(self):
@@ -25,7 +25,7 @@
 		if (is_current_hour(group_doc.send_emails_at)
 			and not is_holiday_today(group_doc.holiday_list)
 			and group_doc.enabled):
-			emails = [d.email for d in group_doc.users]
+			emails = get_user_emails_from_group(group_doc)
 			# find emails relating to a company
 			if emails:
 				daily_work_summary = frappe.get_doc(
diff --git a/erpnext/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json b/erpnext/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json
index c3edad6..b22c051 100644
--- a/erpnext/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json
+++ b/erpnext/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "user.email",
    "fieldname": "email", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "email", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "user.email", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -85,7 +88,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-12 15:57:01.332287", 
+ "modified": "2018-05-16 22:43:00.481019",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Daily Work Summary Group User", 
diff --git a/erpnext/hr/doctype/department/department.js b/erpnext/hr/doctype/department/department.js
index 8f83db0..a945312 100644
--- a/erpnext/hr/doctype/department/department.js
+++ b/erpnext/hr/doctype/department/department.js
@@ -2,22 +2,16 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Department', {
-	onload: function(frm) {
-		frm.set_query("leave_approver", "leave_approvers", function(doc) {
-			return {
-				query:"erpnext.hr.doctype.department_approver.department_approver.get_department_approvers",
-				filters:{
-					user: doc.user_id
-				}
-			};
-		});
-		frm.set_query("expense_approver", "expense_approvers", function(doc) {
-			return {
-				query:"erpnext.hr.doctype.department_approver.department_approver.get_department_approvers",
-				filters:{
-					user: doc.user_id
-				}
-			};
-		});
+	refresh: function(frm) {
+		// read-only for root department
+		if(!frm.doc.parent_department) {
+			cur_frm.set_read_only();
+			cur_frm.set_intro(__("This is a root customer group and cannot be edited."));
+		}
+	},
+	validate: function(frm) {
+		if(frm.doc.name=="All Departments") {
+			frappe.throw(__("You cannot edit root node."));
+		}
 	}
 });
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index 40270d5..664679d 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
- "autoname": "field:department_name", 
+ "autoname": "",
  "beta": 0, 
  "creation": "2013-02-05 11:48:26", 
  "custom": 0, 
@@ -79,6 +79,38 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
@@ -402,7 +434,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-16 16:46:02.759012", 
+ "modified": "2018-05-11 12:18:18.839182",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Department", 
diff --git a/erpnext/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py
index fda1b69..09cd6d3 100644
--- a/erpnext/hr/doctype/department/department.py
+++ b/erpnext/hr/doctype/department/department.py
@@ -3,13 +3,27 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils.nestedset import NestedSet
+from frappe.utils.nestedset import NestedSet, get_root_of
 from erpnext.utilities.transaction_base import delete_events
 from frappe.model.document import Document
 
 class Department(NestedSet):
 	nsm_parent_field = 'parent_department'
 
+	def autoname(self):
+		root = get_root_of("Department")
+		if root and self.department_name != root:
+			abbr = frappe.db.get_value('Company', self.company, 'abbr')
+			self.name = '{0} - {1}'.format(self.department_name, abbr)
+		else:
+			self.name = self.department_name
+
+	def validate(self):
+		if not self.parent_department:
+			root = get_root_of("Department")
+			if root:
+				self.parent_department = root
+
 	def update_nsm_model(self):
 		frappe.utils.nestedset.update_nsm(self)
 
@@ -21,4 +35,23 @@
 		delete_events(self.doctype, self.name)
 
 def on_doctype_update():
-	frappe.db.add_index("Department", ["lft", "rgt"])
\ No newline at end of file
+	frappe.db.add_index("Department", ["lft", "rgt"])
+
+@frappe.whitelist()
+def get_children(doctype, parent=None, company=None, is_root=False):
+	condition = ''
+	if company == parent:
+		condition = "name='%s'".format(get_root_of("Department"))
+	elif company:
+		condition = "parent_department='{0}' and company='{1}'".format(parent, company)
+	else:
+		condition = "parent_department = '{0}'".format(parent)
+
+	return frappe.db.sql("""
+		select
+			name as value,
+			is_group as expandable
+		from `tab{doctype}`
+		where
+			{condition}
+		order by name""".format(doctype=doctype, condition=condition), as_dict=1)
diff --git a/erpnext/hr/doctype/department/department_tree.js b/erpnext/hr/doctype/department/department_tree.js
index 5652ad6..1f891fd 100644
--- a/erpnext/hr/doctype/department/department_tree.js
+++ b/erpnext/hr/doctype/department/department_tree.js
@@ -1,3 +1,27 @@
 frappe.treeview_settings["Department"] = {
-	ignore_fields:["parent_department"]
+	ignore_fields:["parent_department"],
+	get_tree_nodes: 'erpnext.hr.doctype.department.department.get_children',
+	filters: [
+		{
+			fieldname: "company",
+			fieldtype:"Link",
+			options: "Company",
+			label: __("Company"),
+		},
+	],
+	breadcrumb: "HR",
+	root_label: "All Departments",
+	get_tree_root: true,
+	menu_items: [
+		{
+			label: __("New Department"),
+			action: function() {
+				frappe.new_doc("Department", true);
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Department") !== -1'
+		}
+	],
+	onload: function(treeview) {
+		treeview.make_tree();
+	}
 };
\ No newline at end of file
diff --git a/erpnext/hr/doctype/department/test_records.json b/erpnext/hr/doctype/department/test_records.json
index 5bb5871..654925e 100644
--- a/erpnext/hr/doctype/department/test_records.json
+++ b/erpnext/hr/doctype/department/test_records.json
@@ -1,4 +1,4 @@
 [
-	{"doctype":"Department", "department_name":"_Test Department"},
-	{"doctype":"Department", "department_name":"_Test Department 1"}
+	{"doctype":"Department", "department_name":"_Test Department", "company": "_Test Company"},
+	{"doctype":"Department", "department_name":"_Test Department 1", "company": "_Test Company"}
 ]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/department_approver/department_approver.py b/erpnext/hr/doctype/department_approver/department_approver.py
index b65e8ff..d30d801 100644
--- a/erpnext/hr/doctype/department_approver/department_approver.py
+++ b/erpnext/hr/doctype/department_approver/department_approver.py
@@ -10,16 +10,6 @@
 class DepartmentApprover(Document):
 	pass
 
-def get_department_approvers(doctype, txt, searchfield, start, page_len, filters):
-	return get_approver_list(filters.get("user"))
-
-def get_approver_list(name):
-	return frappe.db.sql("""select user.name, user.first_name, user.last_name from
-		tabUser user where
-		user.enabled and
-		user.name != %s 
-		""", name or "")
-
 @frappe.whitelist()
 def get_approvers(doctype, txt, searchfield, start, page_len, filters):
 
@@ -27,6 +17,8 @@
 		frappe.throw(_("Please select Employee Record first."))
 
 	approvers = []
+	department_details = {}
+	department_list = []
 	employee_department = filters.get("department") or frappe.get_value("Employee", filters.get("employee"), "department")
 	if employee_department:
 		department_details = frappe.db.get_value("Department", {"name": employee_department}, ["lft", "rgt"], as_dict=True)
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 9315cfd..1d4a3cf 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -77,7 +77,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 240411d..7d153d4 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -37,6 +37,24 @@
 
 });
 frappe.ui.form.on('Employee',{
+	setup: function(frm) {
+		frm.set_query("leave_policy", function() {
+			return {
+				"filters": {
+					"docstatus": 1
+				}
+			};
+		});
+	},
+	onload:function(frm) {
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			};
+		});
+	},
 	prefered_contact_email:function(frm){		
 		frm.events.update_contact(frm)		
 	},
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index a5c9722..cc3fb7f 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -399,6 +399,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "job_applicant", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Job Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Job Applicant", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "date_of_joining", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -640,7 +672,7 @@
    "label": "Health Insurance Provider", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Health Insurance", 
+   "options": "Employee Health Insurance", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -978,6 +1010,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "notice_number_of_days", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -1204,6 +1268,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "leave_policy", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Policy", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Policy", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2670,7 +2766,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-16 09:08:06.852604", 
+ "modified": "2018-05-11 12:48:46.435484", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 0f11639..8035fc9 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -42,6 +42,8 @@
 		self.validate_status()
 		self.validate_reports_to()
 		self.validate_preferred_email()
+		if self.job_applicant:
+			self.validate_onboarding_process()
 
 		if self.user_id:
 			self.validate_for_enabled_user_id()
@@ -156,11 +158,22 @@
 	def on_trash(self):
 		self.update_nsm_model()
 		delete_events(self.doctype, self.name)
+		if frappe.db.exists("Employee Transfer", {'new_employee_id': self.name, 'docstatus': 1}):
+			emp_transfer = frappe.get_doc("Employee Transfer", {'new_employee_id': self.name, 'docstatus': 1})
+			emp_transfer.db_set("new_employee_id", '')
 
 	def validate_preferred_email(self):
 		if self.prefered_contact_email and not self.get(scrub(self.prefered_contact_email)):
 			frappe.msgprint(_("Please enter " + self.prefered_contact_email))
 
+	def validate_onboarding_process(self):
+		employee_onboarding = frappe.get_all("Employee Onboarding",
+			filters={"job_applicant": self.job_applicant, "docstatus": 1, "boarding_status": ("!=", "Completed")})
+		if employee_onboarding:
+			doc = frappe.get_doc("Employee Onboarding", employee_onboarding[0].name)
+			doc.validate_employee_creation()
+			doc.db_set("employee", self.name)
+
 def get_timeline_data(doctype, name):
 	'''Return timeline for attendance'''
 	return dict(frappe.db.sql('''select unix_timestamp(attendance_date), count(*)
@@ -305,27 +318,27 @@
 
 @frappe.whitelist()
 def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False):
-	condition = ''
+	filters = [['company', '=', company]]
+	fields = ['name as value', 'employee_name as title']
 
 	if is_root:
-		parent = ""
+		parent = ''
 	if parent and company and parent!=company:
-		condition = ' and reports_to = "{0}"'.format(frappe.db.escape(parent))
+		filters.append(['reports_to', '=', parent])
 	else:
-		condition = ' and ifnull(reports_to, "")=""'
+		filters.append(['reports_to', '=', ''])
 
-	employee = frappe.db.sql("""
-		select
-			name as value, employee_name as title,
-			exists(select name from `tabEmployee` where reports_to=emp.name) as expandable
-		from
-			`tabEmployee` emp
-		where company='{company}' {condition} order by name"""
-		.format(company=company, condition=condition),  as_dict=1)
+	employees = frappe.get_list(doctype, fields=fields,
+		filters=filters, order_by='name')
 
-	# return employee
-	return employee
+	for employee in employees:
+		is_expandable = frappe.get_all(doctype, filters=[
+			['reports_to', '=', employee.get('value')]
+		])
+		employee.expandable = 1 if is_expandable else 0
+
+	return employees
 
 
 def on_doctype_update():
-	frappe.db.add_index("Employee", ["lft", "rgt"])
\ No newline at end of file
+	frappe.db.add_index("Employee", ["lft", "rgt"])
diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py
index be92074..e1e1fce 100644
--- a/erpnext/hr/doctype/employee/employee_dashboard.py
+++ b/erpnext/hr/doctype/employee/employee_dashboard.py
@@ -12,7 +12,7 @@
 			},
 			{
 				'label': _('Payroll'),
-				'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
+				'items': ['Salary Slip', 'Timesheet']
 			},
 			{
 				'label': _('Training Events/Results'),
@@ -25,6 +25,10 @@
 			{
 				'label': _('Evaluation'),
 				'items': ['Appraisal']
+			},
+			{
+				'label': _('Employee Lifecycle'),
+				'items': ['Employee Transfer', 'Employee Promotion']
 			}
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/test_records.json b/erpnext/hr/doctype/employee/test_records.json
index 087265f..0bfd2aa 100644
--- a/erpnext/hr/doctype/employee/test_records.json
+++ b/erpnext/hr/doctype/employee/test_records.json
@@ -3,7 +3,7 @@
   "company": "_Test Company", 
   "date_of_birth": "1980-01-01", 
   "date_of_joining": "2010-01-01", 
-  "department": "_Test Department", 
+  "department": "_Test Department - _TC", 
   "doctype": "Employee", 
   "employee_name": "_Test Employee", 
   "gender": "Female", 
@@ -15,7 +15,7 @@
   "company": "_Test Company", 
   "date_of_birth": "1980-01-01", 
   "date_of_joining": "2010-01-01", 
-  "department": "_Test Department 1", 
+  "department": "_Test Department 1 - _TC", 
   "doctype": "Employee", 
   "employee_name": "_Test Employee 1", 
   "gender": "Male", 
@@ -27,7 +27,7 @@
   "company": "_Test Company", 
   "date_of_birth": "1980-01-01", 
   "date_of_joining": "2010-01-01", 
-  "department": "_Test Department 1", 
+  "department": "_Test Department 1 - _TC", 
   "doctype": "Employee", 
   "employee_name": "_Test Employee 2", 
   "gender": "Male", 
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js
index a9407be..f4285a2 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.js
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.js
@@ -84,15 +84,17 @@
 	},
 
 	employee: function (frm) {
-		return frappe.call({
-			method: "erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount",
-			args: {
-				"employee": frm.doc.employee,
-				"posting_date": frm.doc.posting_date
-			},
-			callback: function(r) {
-				frm.set_value("due_advance_amount",r.message);
-			}
-		});
+		if (frm.doc.employee) {
+			return frappe.call({
+				method: "erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount",
+				args: {
+					"employee": frm.doc.employee,
+					"posting_date": frm.doc.posting_date
+				},
+				callback: function(r) {
+					frm.set_value("due_advance_amount",r.message);
+				}
+			});
+		}
 	}
 });
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.json b/erpnext/hr/doctype/employee_advance/employee_advance.json
index a919d73..e15286f 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.json
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.json
@@ -42,7 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,7 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -83,6 +83,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -95,7 +96,7 @@
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -106,7 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -136,7 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -169,7 +170,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -178,6 +179,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "section_break_8", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -199,7 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -230,7 +264,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -260,7 +294,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -292,7 +326,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -324,7 +358,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -357,7 +391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -389,7 +423,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -419,7 +453,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -451,7 +485,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -483,7 +517,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -514,7 +548,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -544,7 +578,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -576,7 +610,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -608,7 +642,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -622,7 +656,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-10 17:09:35.969874", 
+ "modified": "2018-05-17 10:43:18.011693",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Advance", 
@@ -631,7 +665,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -651,7 +684,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
index f31bcf8..256e056 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -235,7 +235,7 @@
  "hide_toolbar": 1, 
  "idx": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_benefit_application/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_benefit_application/__init__.py
diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js
new file mode 100644
index 0000000..f96f262
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js
@@ -0,0 +1,58 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Benefit Application', {
+	setup: function(frm) {
+		frm.set_query("earning_component", "employee_benefits", function() {
+			return {
+				query : "erpnext.hr.doctype.employee_benefit_application.employee_benefit_application.get_earning_components",
+				filters: {date: frm.doc.date, employee: frm.doc.employee}
+			};
+		});
+	},
+	employee: function(frm) {
+		if(frm.doc.employee && frm.doc.date){
+			frappe.call({
+				method: "erpnext.hr.doctype.employee_benefit_application.employee_benefit_application.get_max_benefits",
+				args:{
+					employee: frm.doc.employee,
+					on_date: frm.doc.date
+				},
+				callback: function (data) {
+					if(!data.exc){
+						if(data.message){
+							frm.set_value("max_benefits", data.message);
+						}
+					}
+				}
+			});
+		}
+	}
+});
+
+frappe.ui.form.on("Employee Benefit Application Detail",{
+	amount:  function(frm) {
+		calculate_all(frm.doc);
+	},
+	employee_benefits_remove: function(frm) {
+		calculate_all(frm.doc);
+	}
+});
+
+var calculate_all = function(doc) {
+	var tbl = doc.employee_benefits || [];
+	var pro_rata_dispensed_amount = 0;
+	var total_amount = 0;
+	for(var i = 0; i < tbl.length; i++){
+		if(cint(tbl[i].amount) > 0) {
+			total_amount += flt(tbl[i].amount);
+		}
+		if(tbl[i].is_pro_rata_applicable == 1){
+			pro_rata_dispensed_amount += flt(tbl[i].amount);
+		}
+	}
+	doc.total_amount = total_amount;
+	doc.remainig_benefits = doc.max_benefits - total_amount;
+	doc.pro_rata_dispensed_amount = pro_rata_dispensed_amount;
+	refresh_many(['pro_rata_dispensed_amount', 'total_amount','remainig_benefits']);
+};
diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.json b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.json
new file mode 100644
index 0000000..7a8803a
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.json
@@ -0,0 +1,541 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "EBA.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:31:39.190787", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "max_benefits", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Benefits (Yearly)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "remainig_benefits", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Remainig Benefits (Yearly)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payroll_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Period", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pro_rata_dispensed_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pro Rata Dispensed Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Benefit Application", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_benefits", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Benefits", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Benefit Application Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 12:01:01.490375", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Benefit Application", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
new file mode 100644
index 0000000..2d33ce8
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import date_diff, getdate
+from frappe.model.document import Document
+from erpnext.hr.doctype.payroll_period.payroll_period import get_payroll_period_days
+from erpnext.hr.doctype.salary_structure_assignment.salary_structure_assignment import get_assigned_salary_structure
+
+class EmployeeBenefitApplication(Document):
+	def validate(self):
+		self.validate_duplicate_on_payroll_period()
+		if self.max_benefits <= 0:
+			frappe.throw(_("Employee {0} has no maximum benefit amount").format(self.employee))
+		self.validate_max_benefit_for_component()
+		if self.remainig_benefits > 0:
+			self.validate_remaining_benefit_amount()
+
+	def validate_remaining_benefit_amount(self):
+		# check salary structure earnings have flexi component (sum of max_benefit_amount)
+		# without pro-rata which satisfy the remainig_benefits
+		# else pro-rata component for the amount
+		# again comes the same validation and satisfy or throw
+		benefit_components = []
+		if self.employee_benefits:
+			for employee_benefit in self.employee_benefits:
+				benefit_components.append(employee_benefit.earning_component)
+		salary_struct_name = get_assigned_salary_structure(self.employee, self.date)
+		if salary_struct_name:
+			non_pro_rata_amount = 0
+			pro_rata_amount = 0
+			salary_structure = frappe.get_doc("Salary Structure", salary_struct_name)
+			if salary_structure.earnings:
+				for earnings in salary_structure.earnings:
+					if earnings.is_flexible_benefit == 1 and earnings.salary_component not in benefit_components:
+						is_pro_rata_applicable, max_benefit_amount = frappe.db.get_value("Salary Component", earnings.salary_component, ["is_pro_rata_applicable", "max_benefit_amount"])
+						if is_pro_rata_applicable == 1:
+							pro_rata_amount += max_benefit_amount
+						else:
+							non_pro_rata_amount += max_benefit_amount
+			if pro_rata_amount == 0  and non_pro_rata_amount == 0:
+				frappe.throw(_("Please add the remainig benefits {0} to any of the existing component").format(self.remainig_benefits))
+			elif non_pro_rata_amount > 0 and non_pro_rata_amount < self.remainig_benefits:
+				frappe.throw(_("You can claim only an amount of {0}, the rest amount {1} should be in the application \
+				as pro-rata component").format(non_pro_rata_amount, self.remainig_benefits - non_pro_rata_amount))
+			elif non_pro_rata_amount == 0:
+				frappe.throw(_("Please add the remainig benefits {0} to the application as \
+				pro-rata component").format(self.remainig_benefits))
+
+	def validate_max_benefit_for_component(self):
+		if self.employee_benefits:
+			max_benefit_amount = 0
+			for employee_benefit in self.employee_benefits:
+				self.validate_max_benefit(employee_benefit.earning_component)
+				max_benefit_amount += employee_benefit.amount
+			if max_benefit_amount > self.max_benefits:
+				frappe.throw(_("Maximum benefit amount of employee {0} exceeds {1}").format(self.employee, self.max_benefits))
+
+	def validate_max_benefit(self, earning_component_name):
+		max_benefit_amount = frappe.db.get_value("Salary Component", earning_component_name, "max_benefit_amount")
+		benefit_amount = 0
+		for employee_benefit in self.employee_benefits:
+			if employee_benefit.earning_component == earning_component_name:
+				benefit_amount += employee_benefit.amount
+		if benefit_amount > max_benefit_amount:
+			frappe.throw(_("Maximum benefit amount of component {0} exceeds {1}").format(earning_component_name, max_benefit_amount))
+
+	def validate_duplicate_on_payroll_period(self):
+		application = frappe.db.exists(
+			"Employee Benefit Application",
+			{
+				'employee': self.employee,
+				'payroll_period': self.payroll_period,
+				'docstatus': 1
+			}
+		)
+		if application:
+			frappe.throw(_("Employee {0} already submited an apllication {1} for the payroll period {2}").format(self.employee, application, self.payroll_period))
+
+@frappe.whitelist()
+def get_max_benefits(employee, on_date):
+	sal_struct = get_assigned_salary_structure(employee, on_date)
+	if sal_struct:
+		max_benefits = frappe.db.get_value("Salary Structure", sal_struct, "max_benefits")
+		if max_benefits > 0:
+			return max_benefits
+		else:
+			frappe.throw(_("Employee {0} has no max benefits in salary structure {1}").format(employee, sal_struct[0][0]))
+	else:
+		frappe.throw(_("Employee {0} has no salary structure assigned").format(employee))
+
+def get_benefit_component_amount(employee, start_date, end_date, struct_row, sal_struct):
+	# Considering there is only one application for an year
+	benefit_application_name = frappe.db.sql("""
+	select name from `tabEmployee Benefit Application`
+	where employee=%(employee)s
+	and docstatus = 1
+	and (date between %(start_date)s and %(end_date)s)
+	""", {
+		'employee': employee,
+		'start_date': start_date,
+		'end_date': end_date
+	})
+
+	payroll_period_days = get_payroll_period_days(start_date, end_date, frappe.db.get_value("Employee", employee, "company"))
+	if payroll_period_days:
+		# If there is application for benefit claim then fetch the amount from it.
+		if benefit_application_name:
+			benefit_application = frappe.get_doc("Employee Benefit Application", benefit_application_name[0][0])
+			return get_benefit_amount(benefit_application, start_date, end_date, struct_row, payroll_period_days)
+
+		# TODO: Check if there is benefit claim for employee then pro-rata devid the rest of amount (Late Benefit Application)
+		# else Split the max benefits to the pro-rata components with the ratio of thier max_benefit_amount
+		else:
+			component_max = frappe.db.get_value("Salary Component", struct_row.salary_component, "max_benefit_amount")
+			if component_max > 0:
+				return get_benefit_pro_rata_ratio_amount(sal_struct, component_max, payroll_period_days, start_date, end_date)
+	return False
+
+def get_benefit_pro_rata_ratio_amount(sal_struct, component_max, payroll_period_days, start_date, end_date):
+	total_pro_rata_max = 0
+	for sal_struct_row in sal_struct.get("earnings"):
+		is_pro_rata_applicable, max_benefit_amount = frappe.db.get_value("Salary Component", sal_struct_row.salary_component, ["is_pro_rata_applicable", "max_benefit_amount"])
+		if sal_struct_row.is_flexible_benefit == 1 and is_pro_rata_applicable == 1:
+			total_pro_rata_max += max_benefit_amount
+	if total_pro_rata_max > 0:
+		benefit_amount = component_max * sal_struct.max_benefits / total_pro_rata_max
+		if benefit_amount > component_max:
+			benefit_amount = component_max
+		return get_amount(payroll_period_days, start_date, end_date, benefit_amount)
+	return False
+
+def get_benefit_amount(application, start_date, end_date, struct_row, payroll_period_days):
+	amount = 0
+	for employee_benefit in application.employee_benefits:
+		if employee_benefit.earning_component == struct_row.salary_component:
+			amount += get_amount(payroll_period_days, start_date, end_date, employee_benefit.amount)
+	return amount if amount > 0 else False
+
+def get_amount(payroll_period_days, start_date, end_date, amount):
+	salary_slip_days = date_diff(getdate(end_date), getdate(start_date)) + 1
+	amount_per_day = amount / payroll_period_days
+	total_amount = amount_per_day * salary_slip_days
+	return total_amount
+
+def get_earning_components(doctype, txt, searchfield, start, page_len, filters):
+	if len(filters) < 2:
+		return {}
+	employee = filters['employee']
+	date = filters['date']
+	salary_structure = get_assigned_salary_structure(employee, date)
+
+	if salary_structure:
+		query = """select salary_component from `tabSalary Detail` where parent = '{salary_structure}'
+		and is_flexible_benefit = 1
+		order by name"""
+
+		return frappe.db.sql(query.format(**{
+			"salary_structure": salary_structure
+		}))
+
+	return {}
diff --git a/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.js b/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.js
new file mode 100644
index 0000000..b355e1c
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Benefit Application", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Benefit Application
+		() => frappe.tests.make('Employee Benefit Application', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.py b/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.py
new file mode 100644
index 0000000..34e1a8f
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application/test_employee_benefit_application.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestEmployeeBenefitApplication(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_benefit_application_detail/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_benefit_application_detail/__init__.py
diff --git a/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.json b/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.json
new file mode 100644
index 0000000..eba9b19
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.json
@@ -0,0 +1,176 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EBAD.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:36:18.389786", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "earning_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Earning Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "earning_component.is_pro_rata_applicable", 
+   "fieldname": "is_pro_rata_applicable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Pro-rata Applicable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "earning_component.max_benefit_amount", 
+   "fieldname": "max_benefit_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Max Benefit Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-26 12:00:37.588822", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Benefit Application Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.py b/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.py
new file mode 100644
index 0000000..3a502fe
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_application_detail/employee_benefit_application_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeBenefitApplicationDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_benefit_claim/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_benefit_claim/__init__.py
diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js
new file mode 100644
index 0000000..5e12828
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js
@@ -0,0 +1,16 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Benefit Claim', {
+	setup: function(frm) {
+		frm.set_query("earning_component", function() {
+			return {
+				query : "erpnext.hr.doctype.employee_benefit_application.employee_benefit_application.get_earning_components",
+				filters: {date: frm.doc.claim_date, employee: frm.doc.employee}
+			};
+		});
+	},
+	employee: function(frm) {
+		frm.set_value("earning_component", null);
+	}
+});
diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json
new file mode 100644
index 0000000..a59aaea
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json
@@ -0,0 +1,545 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "EBC.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:43:10.386409", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "claim_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Claim Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "earning_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Earning Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "earning_component.max_benefit_amount", 
+   "fieldname": "max_amount_eligible", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Amount Eligible", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "earning_component.is_pro_rata_applicable", 
+   "fieldname": "is_pro_rata_applicable", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Pro-Rata Applicable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "claimed_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Claimed Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_slip", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salary Slip", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Slip", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Benefit Claim", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "attachments", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Attachments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-26 12:43:21.082282",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Benefit Claim", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py
new file mode 100644
index 0000000..1aed7ce
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from erpnext.hr.doctype.employee_benefit_application.employee_benefit_application import get_max_benefits
+from erpnext.hr.utils import get_payroll_period
+from erpnext.hr.doctype.salary_structure_assignment.salary_structure_assignment import get_assigned_salary_structure
+
+class EmployeeBenefitClaim(Document):
+	def validate(self):
+		max_benefits = get_max_benefits(self.employee, self.claim_date)
+		payroll_period = get_payroll_period(self.claim_date, self.claim_date, frappe.db.get_value("Employee", self.employee, "company"))
+		self.validate_max_benefit_for_component(payroll_period)
+		self.validate_max_benefit_for_sal_struct(max_benefits)
+		self.validate_benefit_claim_amount(max_benefits, payroll_period)
+		if not self.is_pro_rata_applicable:
+			self.validate_non_pro_rata_benefit_claim(max_benefits, payroll_period)
+
+	def validate_benefit_claim_amount(self, max_benefits, payroll_period):
+		claimed_amount = self.claimed_amount
+		claimed_amount += self.get_previous_claimed_amount(payroll_period)
+		if max_benefits < claimed_amount:
+			frappe.throw(_("Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
+			amount").format(self.employee, max_benefits, claimed_amount-max_benefits))
+
+	def validate_max_benefit_for_sal_struct(self, max_benefits):
+		if self.claimed_amount > max_benefits:
+			frappe.throw(_("Maximum benefit amount of employee {0} exceeds {1}").format(self.employee, max_benefits))
+
+	def validate_max_benefit_for_component(self, payroll_period):
+		claimed_amount = self.claimed_amount
+		claimed_amount += self.get_previous_claimed_amount(payroll_period, self.earning_component)
+		if claimed_amount > self.max_amount_eligible:
+			frappe.throw(_("Maximum amount eligible for the component {0} exceeds {1}").format(self.earning_component, self.max_amount_eligible))
+
+	def validate_non_pro_rata_benefit_claim(self, max_benefits, payroll_period):
+		claimed_amount = self.claimed_amount
+		pro_rata_amount = self.get_pro_rata_amount_in_application(payroll_period.name)
+		if not pro_rata_amount:
+			# Get pro_rata_amount if there is no application,
+			# get salary structure for the date and calculate pro-rata amount
+			pro_rata_amount = self.get_benefit_pro_rata_ratio_amount()
+		if not pro_rata_amount:
+			pro_rata_amount = 0
+
+		claimed_amount += self.get_previous_claimed_amount(payroll_period, True)
+		if max_benefits < pro_rata_amount + claimed_amount:
+			frappe.throw(_("Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
+			amount and previous claimed amount").format(self.employee, max_benefits, pro_rata_amount+claimed_amount-max_benefits))
+
+	def get_benefit_pro_rata_ratio_amount(self):
+		sal_struct_name = get_assigned_salary_structure(self.employee, self.claim_date)
+		if sal_struct_name:
+			sal_struct = frappe.get_doc("Salary Structure", sal_struct_name)
+			total_pro_rata_max = 0
+			benefit_amount_total = 0
+			for sal_struct_row in sal_struct.get("earnings"):
+				is_pro_rata_applicable, max_benefit_amount = frappe.db.get_value("Salary Component", sal_struct_row.salary_component, ["is_pro_rata_applicable", "max_benefit_amount"])
+				if sal_struct_row.is_flexible_benefit == 1 and is_pro_rata_applicable == 1:
+					total_pro_rata_max += max_benefit_amount
+			if total_pro_rata_max > 0:
+				for sal_struct_row in sal_struct.get("earnings"):
+					is_pro_rata_applicable, max_benefit_amount = frappe.db.get_value("Salary Component", sal_struct_row.salary_component, ["is_pro_rata_applicable", "max_benefit_amount"])
+					if sal_struct_row.is_flexible_benefit == 1 and is_pro_rata_applicable == 1:
+						component_max = max_benefit_amount
+						benefit_amount = component_max * sal_struct.max_benefits / total_pro_rata_max
+						if benefit_amount > component_max:
+							benefit_amount = component_max
+						benefit_amount_total += benefit_amount
+				return benefit_amount_total
+		return False
+
+	def get_pro_rata_amount_in_application(self, payroll_period):
+		application = frappe.db.exists(
+			"Employee Benefit Application",
+			{
+				'employee': self.employee,
+				'payroll_period': payroll_period,
+				'docstatus': 1
+			}
+		)
+		if application:
+			return frappe.db.get_value("Employee Benefit Application", application, "pro_rata_dispensed_amount")
+		return False
+
+	def get_previous_claimed_amount(self, payroll_period, non_pro_rata=False, component=False):
+		total_claimed_amount = 0
+		query = """
+		select sum(claimed_amount) as 'total_amount'
+		from `tabEmployee Benefit Claim`
+		where employee=%(employee)s
+		and docstatus = 1
+		and (claim_date between %(start_date)s and %(end_date)s)
+		"""
+		if non_pro_rata:
+			query += "and is_pro_rata_applicable = 0"
+		if component:
+			query += "and earning_component = %(component)s"
+
+		sum_of_claimed_amount = frappe.db.sql(query, {
+			'employee': self.employee,
+			'start_date': payroll_period.start_date,
+			'end_date': payroll_period.end_date,
+			'component': component
+		}, as_dict=True)
+		if sum_of_claimed_amount and sum_of_claimed_amount[0].total_amount > 0:
+			total_claimed_amount = sum_of_claimed_amount[0].total_amount
+		return total_claimed_amount
+
+def get_benefit_claim_amount(employee, start_date, end_date, struct_row):
+	benefit_claim_details = frappe.db.sql("""
+	select claimed_amount from `tabEmployee Benefit Claim`
+	where employee=%(employee)s
+	and docstatus = 1 and is_pro_rata_applicable = 0
+	and earning_component = %(earning_component)s
+	and (claim_date between %(start_date)s and %(end_date)s)
+	""", {
+		'employee': employee,
+		'start_date': start_date,
+		'end_date': end_date,
+		'earning_component': struct_row.salary_component
+	}, as_dict = True)
+
+	if benefit_claim_details:
+		claimed_amount = 0
+		for claim_detail in benefit_claim_details:
+			claimed_amount += claim_detail.claimed_amount
+		return claimed_amount
+	return False
diff --git a/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.js b/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.js
new file mode 100644
index 0000000..3c808c0
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Benefit Claim", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Benefit Claim
+		() => frappe.tests.make('Employee Benefit Claim', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.py b/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.py
new file mode 100644
index 0000000..aff73e5
--- /dev/null
+++ b/erpnext/hr/doctype/employee_benefit_claim/test_employee_benefit_claim.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestEmployeeBenefitClaim(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_boarding_activity/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_boarding_activity/__init__.py
diff --git a/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.json b/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.json
new file mode 100644
index 0000000..95d6939
--- /dev/null
+++ b/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.json
@@ -0,0 +1,291 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-09 05:37:18.439763", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activity_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Activity Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Role", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Role", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "task", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Task", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Task", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Applicable in the case of Employee Onboarding", 
+   "fieldname": "required_for_employee_creation", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Required for Employee Creation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-10 06:54:47.282492", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Boarding Activity", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.py b/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.py
new file mode 100644
index 0000000..496f165
--- /dev/null
+++ b/erpnext/hr/doctype/employee_boarding_activity/employee_boarding_activity.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeBoardingActivity(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_education/employee_education.json b/erpnext/hr/doctype/employee_education/employee_education.json
index e41c6ca..ef216e3 100644
--- a/erpnext/hr/doctype/employee_education/employee_education.json
+++ b/erpnext/hr/doctype/employee_education/employee_education.json
@@ -174,7 +174,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json
index fcabbbc..f357b20 100644
--- a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json
+++ b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json
@@ -172,7 +172,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_grade/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_grade/__init__.py
diff --git a/erpnext/hr/doctype/employee_grade/employee_grade.js b/erpnext/hr/doctype/employee_grade/employee_grade.js
new file mode 100644
index 0000000..fa679fa
--- /dev/null
+++ b/erpnext/hr/doctype/employee_grade/employee_grade.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Grade', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_grade/employee_grade.json b/erpnext/hr/doctype/employee_grade/employee_grade.json
new file mode 100644
index 0000000..e619c7b
--- /dev/null
+++ b/erpnext/hr/doctype/employee_grade/employee_grade.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:14:24.174138", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_leave_policy", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Leave Policy", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Policy", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_salary_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Salary Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 16:14:24.174138", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Grade", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_grade/employee_grade.py b/erpnext/hr/doctype/employee_grade/employee_grade.py
new file mode 100644
index 0000000..42a9f16
--- /dev/null
+++ b/erpnext/hr/doctype/employee_grade/employee_grade.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeGrade(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_grade/test_employee_grade.js b/erpnext/hr/doctype/employee_grade/test_employee_grade.js
new file mode 100644
index 0000000..d684fb2
--- /dev/null
+++ b/erpnext/hr/doctype/employee_grade/test_employee_grade.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Grade", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Grade
+		() => frappe.tests.make('Employee Grade', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_grade/test_employee_grade.py b/erpnext/hr/doctype/employee_grade/test_employee_grade.py
new file mode 100644
index 0000000..93058cf
--- /dev/null
+++ b/erpnext/hr/doctype/employee_grade/test_employee_grade.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeGrade(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_health_insurance/__init__.py
similarity index 100%
rename from erpnext/hr/doctype/health_insurance/__init__.py
rename to erpnext/hr/doctype/employee_health_insurance/__init__.py
diff --git a/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.js b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.js
new file mode 100644
index 0000000..69d46e2
--- /dev/null
+++ b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Health Insurance', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.json b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.json
new file mode 100644
index 0000000..e63da39
--- /dev/null
+++ b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.json
@@ -0,0 +1,113 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:health_insurance_name", 
+ "beta": 0, 
+ "creation": "2017-03-27 14:32:51.628588", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "health_insurance_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Health Insurance Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-15 14:56:46.924890", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Health Insurance", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "health_insurance_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.py b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.py
new file mode 100644
index 0000000..abc01ef
--- /dev/null
+++ b/erpnext/hr/doctype/employee_health_insurance/employee_health_insurance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeHealthInsurance(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.js b/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.js
new file mode 100644
index 0000000..245cb32
--- /dev/null
+++ b/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Health Insurance", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Health Insurance
+		() => frappe.tests.make('Employee Health Insurance', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.py b/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.py
new file mode 100644
index 0000000..f0787f5
--- /dev/null
+++ b/erpnext/hr/doctype/employee_health_insurance/test_employee_health_insurance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeHealthInsurance(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_incentive/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_incentive/__init__.py
diff --git a/erpnext/hr/doctype/employee_incentive/employee_incentive.js b/erpnext/hr/doctype/employee_incentive/employee_incentive.js
new file mode 100644
index 0000000..d2ddfb6
--- /dev/null
+++ b/erpnext/hr/doctype/employee_incentive/employee_incentive.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Incentive', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_incentive/employee_incentive.json b/erpnext/hr/doctype/employee_incentive/employee_incentive.json
new file mode 100644
index 0000000..1ce4e36
--- /dev/null
+++ b/erpnext/hr/doctype/employee_incentive/employee_incentive.json
@@ -0,0 +1,322 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EI.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:13:43.404546", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "incentive_amount",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Incentive Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "payroll_date",
+   "fieldtype": "Date",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Date",
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Employee Incentive",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0,
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name",
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "",
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1,
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department",
+   "length": 0, 
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0, 
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 10:02:41.906151",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Incentive", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_incentive/employee_incentive.py b/erpnext/hr/doctype/employee_incentive/employee_incentive.py
new file mode 100644
index 0000000..6c9a315
--- /dev/null
+++ b/erpnext/hr/doctype/employee_incentive/employee_incentive.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeIncentive(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_incentive/test_employee_incentive.js b/erpnext/hr/doctype/employee_incentive/test_employee_incentive.js
new file mode 100644
index 0000000..10bc037
--- /dev/null
+++ b/erpnext/hr/doctype/employee_incentive/test_employee_incentive.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Incentive", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Incentive
+		() => frappe.tests.make('Employee Incentive', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_incentive/test_employee_incentive.py b/erpnext/hr/doctype/employee_incentive/test_employee_incentive.py
new file mode 100644
index 0000000..f7597ad
--- /dev/null
+++ b/erpnext/hr/doctype/employee_incentive/test_employee_incentive.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeIncentive(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
index 3d277af..98632b6 100644
--- a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
+++ b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
@@ -148,7 +148,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_onboarding/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_onboarding/__init__.py
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
new file mode 100644
index 0000000..e95e260
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
@@ -0,0 +1,59 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Onboarding', {
+	setup: function(frm) {
+		frm.add_fetch("employee_onboarding_template", "company", "company");
+		frm.add_fetch("employee_onboarding_template", "department", "department");
+		frm.add_fetch("employee_onboarding_template", "designation", "designation");
+		frm.add_fetch("employee_onboarding_template", "employee_grade", "employee_grade");
+	},
+
+	refresh: function(frm) {
+		if (frm.doc.employee) {
+			frm.add_custom_button(__('Employee'), function() {
+				frappe.set_route("Form", "Employee", frm.doc.employee);
+			},__("View"));
+		}
+		if (frm.doc.project) {
+			frm.add_custom_button(__('Project'), function() {
+				frappe.set_route("Form", "Project", frm.doc.project);
+			},__("View"));
+			frm.add_custom_button(__('Task'), function() {
+				frappe.set_route('List', 'Task', {project: frm.doc.project});
+			},__("View"));
+		}
+		if ((!frm.doc.employee) && (frm.doc.docstatus === 1)) {
+			frm.add_custom_button(__('Employee'), function () {
+				frappe.model.open_mapped_doc({
+					method: "erpnext.hr.doctype.employee_onboarding.employee_onboarding.make_employee",
+					frm: frm
+				});
+			}, __("Make"));
+			frm.page.set_inner_btn_group_as_primary(__("Make"));
+		}
+
+	},
+
+	employee_onboarding_template: function(frm) {
+		frm.set_value("activities" ,"");
+		if (frm.doc.employee_onboarding_template) {
+			frappe.call({
+				method: "erpnext.hr.utils.get_onboarding_details",
+				args: {
+					"parent": frm.doc.employee_onboarding_template,
+					"parenttype": "Employee Onboarding Template"
+				},
+				callback: function(r) {
+					if (r.message) {
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Employee Boarding Activity", "activities");
+							$.extend(row, d);
+						});
+					}
+					refresh_field("activities");
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json
new file mode 100644
index 0000000..d902950
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json
@@ -0,0 +1,571 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EOB.#####", 
+ "beta": 0, 
+ "creation": "2018-05-09 04:57:20.016220", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "job_applicant", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Job Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Job Applicant", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "job_offer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Job Offer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Job Offer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "job_applicant.applicant_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_joining", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date of Joining", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "boarding_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPending\nIn Process\nCompleted", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_onboarding_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Onboarding Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Onboarding Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "table_for_activity", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activities", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Boarding Activity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Onboarding", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 22:43:38.251845",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Onboarding", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py
new file mode 100644
index 0000000..fab0846
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from erpnext.hr.utils import EmployeeBoardingController
+from frappe.model.mapper import get_mapped_doc
+
+
+class EmployeeOnboarding(EmployeeBoardingController):
+	def validate(self):
+		super(EmployeeOnboarding, self).validate()
+
+	def validate_employee_creation(self):
+		if self.docstatus != 1:
+			frappe.throw(_("Submit this to create the Employee record"))
+		else:
+			for activity in self.activities:
+				if not activity.required_for_employee_creation:
+					continue
+				else:
+					task_status = frappe.db.get_value("Task", activity.task, "status")
+					if task_status not in ["Closed", "Cancelled"]:
+						frappe.throw(_("All the mandatory Task for employee creation hasn't been done yet."))
+
+	def on_submit(self):
+		super(EmployeeOnboarding, self).on_submit()
+
+	def on_cancel(self):
+		super(EmployeeOnboarding, self).on_cancel()
+
+
+@frappe.whitelist()
+def make_employee(source_name, target_doc=None):
+	doc = frappe.get_doc("Employee Onboarding", source_name)
+	doc.validate_employee_creation()
+	def set_missing_values(source, target):
+		target.personal_email = frappe.db.get_value("Job Applicant", source.job_applicant, "email_id")
+		target.status = "Active"
+	doc = get_mapped_doc("Employee Onboarding", source_name, {
+			"Employee Onboarding": {
+				"doctype": "Employee",
+				"field_map": {
+					"employee_grade": "grade",
+				}}
+		}, target_doc, set_missing_values)
+	return doc
+
diff --git a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.js b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.js
new file mode 100644
index 0000000..d15cef7
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Onboarding", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Onboarding
+		() => frappe.tests.make('Employee Onboarding', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
new file mode 100644
index 0000000..b37ae88
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeOnboarding(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_onboarding_activity/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_onboarding_activity/__init__.py
diff --git a/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.json b/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.json
new file mode 100644
index 0000000..4e91b72
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.json
@@ -0,0 +1,290 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-09 05:37:18.439763", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activity_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Activity Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Role", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Role", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.parenttype == \"Employee Onboarding\"", 
+   "fieldname": "completed", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Completed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "required_for_employee_creation", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Required for Employee Creation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-09 06:15:41.768236", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Onboarding Activity", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.py b/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.py
new file mode 100644
index 0000000..d170631
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_activity/employee_onboarding_activity.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeOnboardingActivity(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_onboarding_template/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_onboarding_template/__init__.py
diff --git a/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.js b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.js
new file mode 100644
index 0000000..2a531f3
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Onboarding Template', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.json b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.json
new file mode 100644
index 0000000..d0d3a62
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.json
@@ -0,0 +1,284 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EOBT.#####", 
+ "beta": 0, 
+ "creation": "2018-05-09 05:27:02.393377", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activities", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Boarding Activity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-09 07:05:21.051519", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Onboarding Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "designation", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.py b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.py
new file mode 100644
index 0000000..6f1c316
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_template/employee_onboarding_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeOnboardingTemplate(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.js b/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.js
new file mode 100644
index 0000000..10912ed
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Onboarding Template", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Onboarding Template
+		() => frappe.tests.make('Employee Onboarding Template', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.py b/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.py
new file mode 100644
index 0000000..f4b5b88
--- /dev/null
+++ b/erpnext/hr/doctype/employee_onboarding_template/test_employee_onboarding_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeOnboardingTemplate(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_promotion/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_promotion/__init__.py
diff --git a/erpnext/hr/doctype/employee_promotion/employee_promotion.js b/erpnext/hr/doctype/employee_promotion/employee_promotion.js
new file mode 100644
index 0000000..54e06f4
--- /dev/null
+++ b/erpnext/hr/doctype/employee_promotion/employee_promotion.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+{% include 'erpnext/hr/employee_property_update.js' %}
+
+frappe.ui.form.on('Employee Promotion', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_promotion/employee_promotion.json b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
new file mode 100644
index 0000000..d10a611
--- /dev/null
+++ b/erpnext/hr/doctype/employee_promotion/employee_promotion.json
@@ -0,0 +1,386 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EP.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:33:59.476562", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "promotion_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Promotion Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Promotion Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "promotion_details", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Promotion Detail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Property History", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Promotion", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 10:25:28.296685",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Promotion", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_promotion/employee_promotion.py b/erpnext/hr/doctype/employee_promotion/employee_promotion.py
new file mode 100644
index 0000000..5fcceed
--- /dev/null
+++ b/erpnext/hr/doctype/employee_promotion/employee_promotion.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import getdate
+from erpnext.hr.utils import update_employee
+
+class EmployeePromotion(Document):
+	def validate(self):
+		if frappe.get_value("Employee", self.employee, "status") == "Left":
+			frappe.throw(_("Cannot promote Employee with status Left"))
+
+	def before_submit(self):
+		if getdate(self.promotion_date) > getdate():
+			frappe.throw(_("Employee Promotion cannot be submitted before Promotion Date "),
+				frappe.DocstatusTransitionError)
+
+	def on_submit(self):
+		employee = frappe.get_doc("Employee", self.employee)
+		employee = update_employee(employee, self.promotion_details)
+		employee.save()
+
+	def on_cancel(self):
+		employee = frappe.get_doc("Employee", self.employee)
+		employee = update_employee(employee, self.promotion_details, True)
+		employee.save()
diff --git a/erpnext/hr/doctype/employee_promotion/test_employee_promotion.js b/erpnext/hr/doctype/employee_promotion/test_employee_promotion.js
new file mode 100644
index 0000000..5f0a5ba
--- /dev/null
+++ b/erpnext/hr/doctype/employee_promotion/test_employee_promotion.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Promotion", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Promotion
+		() => frappe.tests.make('Employee Promotion', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_promotion/test_employee_promotion.py b/erpnext/hr/doctype/employee_promotion/test_employee_promotion.py
new file mode 100644
index 0000000..420bbe6
--- /dev/null
+++ b/erpnext/hr/doctype/employee_promotion/test_employee_promotion.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import getdate, add_days
+from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+
+class TestEmployeePromotion(unittest.TestCase):
+	def setUp(self):
+		self.employee = make_employee("employee@promotions.com")
+		frappe.db.sql("""delete from `tabEmployee Promotion`""")
+
+	def test_submit_before_promotion_date(self):
+		promotion_obj = frappe.get_doc({
+			"doctype": "Employee Promotion",
+			"employee": self.employee,
+			"promotion_details" :[
+				{
+				"property": "Designation",
+				"current": "Software Developer",
+				"new": "Project Manager",
+				"fieldname": "designation"
+				}
+			]
+		})
+		promotion_obj.promotion_date = add_days(getdate(), 1)
+		promotion_obj.save()
+		self.assertRaises(frappe.DocstatusTransitionError, promotion_obj.submit)
+		promotion = frappe.get_doc("Employee Promotion", promotion_obj.name)
+		promotion.promotion_date = getdate()
+		promotion.submit()
+		self.assertEqual(promotion.docstatus, 1)
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_property_history/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_property_history/__init__.py
diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.json b/erpnext/hr/doctype/employee_property_history/employee_property_history.json
new file mode 100644
index 0000000..0a51579
--- /dev/null
+++ b/erpnext/hr/doctype/employee_property_history/employee_property_history.json
@@ -0,0 +1,161 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 18:24:30.579965", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 4, 
+   "fieldname": "property", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Property", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "current", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Current", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "new", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "New", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fieldname", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Field Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-02 18:19:54.436391", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Property History", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.py b/erpnext/hr/doctype/employee_property_history/employee_property_history.py
new file mode 100644
index 0000000..fb67852
--- /dev/null
+++ b/erpnext/hr/doctype/employee_property_history/employee_property_history.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeePropertyHistory(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_separation/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_separation/__init__.py
diff --git a/erpnext/hr/doctype/employee_separation/employee_separation.js b/erpnext/hr/doctype/employee_separation/employee_separation.js
new file mode 100644
index 0000000..3383079
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation/employee_separation.js
@@ -0,0 +1,49 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Separation', {
+	setup: function(frm) {
+		frm.add_fetch("employee_separation_template", "company", "company");
+		frm.add_fetch("employee_separation_template", "department", "department");
+		frm.add_fetch("employee_separation_template", "designation", "designation");
+		frm.add_fetch("employee_separation_template", "employee_grade", "employee_grade");
+	},
+
+	refresh: function(frm) {
+		if (frm.doc.employee) {
+			frm.add_custom_button(__('Employee'), function() {
+				frappe.set_route("Form", "Employee", frm.doc.employee);
+			},__("View"));
+		}
+		if (frm.doc.project) {
+			frm.add_custom_button(__('Project'), function() {
+				frappe.set_route("Form", "Project", frm.doc.project);
+			},__("View"));
+			frm.add_custom_button(__('Task'), function() {
+				frappe.set_route('List', 'Task', {project: frm.doc.project});
+			},__("View"));
+		}
+	},
+
+	employee_separation_template: function(frm) {
+		frm.set_value("activities" ,"");
+		if (frm.doc.employee_separation_template) {
+			frappe.call({
+				method: "erpnext.hr.utils.get_onboarding_details",
+				args: {
+					"parent": frm.doc.employee_separation_template,
+					"parenttype": "Employee Separation Template"
+				},
+				callback: function(r) {
+					if (r.message) {
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Employee Boarding Activity", "activities");
+							$.extend(row, d);
+						});
+					}
+					refresh_field("activities");
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/employee_separation/employee_separation.json b/erpnext/hr/doctype/employee_separation/employee_separation.json
new file mode 100644
index 0000000..7941576
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation/employee_separation.json
@@ -0,0 +1,568 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "ES.#####", 
+ "beta": 0, 
+ "creation": "2018-05-10 02:29:16.740490", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "resignation_letter_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Resignation Letter Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "boarding_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPending\nIn Process\nCompleted", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_separation_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Separation Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Separation Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "table_for_activity", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activities", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Boarding Activity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exit_interview", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exit Interview Summary", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Separation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 22:42:46.734328",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Separation", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_separation/employee_separation.py b/erpnext/hr/doctype/employee_separation/employee_separation.py
new file mode 100644
index 0000000..b908b63
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation/employee_separation.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from erpnext.hr.utils import EmployeeBoardingController
+
+class EmployeeSeparation(EmployeeBoardingController):
+	def validate(self):
+		super(EmployeeSeparation, self).validate()
+
+	def on_submit(self):
+		super(EmployeeSeparation, self).on_submit()
+	
+	def on_cancel(self):
+		super(EmployeeSeparation, self).on_cancel()
diff --git a/erpnext/hr/doctype/employee_separation/test_employee_separation.js b/erpnext/hr/doctype/employee_separation/test_employee_separation.js
new file mode 100644
index 0000000..d6c6359
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation/test_employee_separation.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Separation", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Separation
+		() => frappe.tests.make('Employee Separation', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_separation/test_employee_separation.py b/erpnext/hr/doctype/employee_separation/test_employee_separation.py
new file mode 100644
index 0000000..0773fb6
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation/test_employee_separation.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeSeparation(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_separation_template/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_separation_template/__init__.py
diff --git a/erpnext/hr/doctype/employee_separation_template/employee_separation_template.js b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.js
new file mode 100644
index 0000000..172ff9f
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Separation Template', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_separation_template/employee_separation_template.json b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.json
new file mode 100644
index 0000000..f1f440a
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.json
@@ -0,0 +1,284 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "EST.#####", 
+ "beta": 0, 
+ "creation": "2018-05-09 06:31:44.498557", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "activities", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Activities", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Boarding Activity", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-09 07:05:30.792336", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Separation Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "designation", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_separation_template/employee_separation_template.py b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.py
new file mode 100644
index 0000000..0508fc4
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation_template/employee_separation_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeSeparationTemplate(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.js b/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.js
new file mode 100644
index 0000000..66fd450
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Separation Template", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Separation Template
+		() => frappe.tests.make('Employee Separation Template', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.py b/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.py
new file mode 100644
index 0000000..3fd3d39
--- /dev/null
+++ b/erpnext/hr/doctype/employee_separation_template/test_employee_separation_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeSeparationTemplate(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_category/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_category/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.js b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.js
new file mode 100644
index 0000000..1df609f
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Tax Exemption Category', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
new file mode 100644
index 0000000..9a4c181
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.json
@@ -0,0 +1,194 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:51:36.971140", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "deduction_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Deduction Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "max_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Max Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 19:29:34.579934", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.py b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.py
new file mode 100644
index 0000000..4f705db
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/employee_tax_exemption_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeTaxExemptionCategory(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.js b/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.js
new file mode 100644
index 0000000..e0e43c3
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Tax Exemption Category", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Tax Exemption Category
+		() => frappe.tests.make('Employee Tax Exemption Category', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.py b/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.py
new file mode 100644
index 0000000..669fb71
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_category/test_employee_tax_exemption_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeTaxExemptionCategory(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_declaration/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_declaration/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js
new file mode 100644
index 0000000..4ef3af4
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js
@@ -0,0 +1,87 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Tax Exemption Declaration', {
+	refresh: function(frm){
+		if(frm.doc.__islocal){
+			frm.set_df_property('hra_declaration_section', 'hidden', 1);
+		}
+	},
+	setup: function(frm) {
+		frm.set_query('employee', function() {
+			return {
+				filters: {
+					'status': "Active"
+				}
+			}
+		});
+		frm.set_query('payroll_period', function() {
+			const fields = {'employee': 'Employee', 'company': 'Company'};
+
+			for (let [field, label] of Object.entries(fields)) {
+				if (!frm.doc[field]) {
+					frappe.msgprint(__("Please select {0}", [label]))
+				}
+			};
+
+			if (frm.doc.employee && frm.doc.company){
+				return {
+					filters: {
+						'company': frm.doc.company
+					}
+				}
+			}
+		});
+		frm.set_query('exemption_sub_category', 'declarations', function() {
+			return {
+				filters: {
+					'is_active': 1
+				}
+			}
+		});
+	},
+	employee: function(frm){
+		frm.trigger('set_null_value');
+	},
+	company: function(frm) {
+		if(frm.doc.company){
+			frappe.call({
+				method: "frappe.client.get_value",
+				args: {
+					doctype: "Company",
+					filters: {"name": frm.doc.company},
+					fieldname: "hra_component"
+				},
+				callback: function(r){
+					if(r.message.hra_component){
+						frm.set_df_property('hra_declaration_section', 'hidden', 0);
+					}
+				}
+			});
+		}
+	},
+	monthly_house_rent: function(frm) {
+		frm.trigger("calculate_hra_exemption");
+	},
+	rented_in_metro_city: function(frm) {
+		frm.trigger("calculate_hra_exemption");
+	},
+	calculate_hra_exemption: function(frm) {
+		frappe.call({
+			method: "calculate_hra_exemption",
+			doc: frm.doc,
+			callback: function(r) {
+				if (!r.exc){
+					frm.refresh_fields();
+				}
+			}
+		});
+	},
+	set_null_value(frm){
+		let fields = ['salary_structure_hra', 'monthly_house_rent','annual_hra_exemption',
+			'monthly_hra_exemption', 'total_exemption_amount', 'payroll_period'];
+		fields.forEach(function(field) {
+			frm.set_value(field, '');
+		});
+	}
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json
new file mode 100644
index 0000000..473150b
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.json
@@ -0,0 +1,637 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "ETED.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:53:36.175504", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.company", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payroll_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Period", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_exemption_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Exemption Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Tax Exemption Declaration", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "declarations", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Declarations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Declaration Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "hra_declaration_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "HRA Declaration", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_structure_hra", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "HRA as per Salary Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_house_rent", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly House Rent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rented_in_metro_city", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rented in Metro City", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "coloum_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": " ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "annual_hra_exemption", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Annual HRA Exemption", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_hra_exemption", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly HRA Exemption", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-30 18:09:50.662362", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Declaration", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py
new file mode 100644
index 0000000..a9b1e33
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from erpnext.hr.utils import validate_tax_declaration, calculate_eligible_hra_exemption
+
+class EmployeeTaxExemptionDeclaration(Document):
+	def validate(self):
+		validate_tax_declaration(self.declarations)
+		self.calculate_hra_exemption()
+		self.total_exemption_amount = 0
+		for item in self.declarations:
+			self.total_exemption_amount += item.amount
+		if self.annual_hra_exemption:
+			self.total_exemption_amount += self.annual_hra_exemption
+
+	def before_submit(self):
+		if frappe.db.exists({"doctype": "Employee Tax Exemption Declaration",
+							"employee": self.employee,
+							"payroll_period": self.payroll_period,
+							"docstatus": 1}):
+			frappe.throw(_("Tax Declaration of {0} for period {1} already submitted.")\
+			.format(self.employee, self.payroll_period), frappe.DocstatusTransitionError)
+
+	def calculate_hra_exemption(self):
+		exemptions = calculate_eligible_hra_exemption(self.company, self.employee, \
+						self.monthly_house_rent, self.rented_in_metro_city)
+		self.salary_structure_hra = exemptions["hra_amount"]
+		self.annual_hra_exemption = exemptions["annual_exemption"]
+		self.monthly_hra_exemption = exemptions["monthly_exemption"]
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.js b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.js
new file mode 100644
index 0000000..274a3a3
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Tax Exemption Declaration", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Tax Exemption Declaration
+		() => frappe.tests.make('Employee Tax Exemption Declaration', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
new file mode 100644
index 0000000..dff02ea
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+
+class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
+	def setup(self):
+		make_employee("employee@taxexepmtion.com")
+		make_employee("employee1@taxexepmtion.com")
+		create_payroll_period()
+		create_exemption_category()
+		frappe.db.sql("""delete from `tabEmployee Tax Exemption Declaration`""")
+
+	def test_exemption_amount_greater_than_category_max(self):
+		declaration = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Declaration",
+			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
+			"payroll_period": "Test Payroll Period",
+			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 150000)]
+		})
+		self.assertRaises(frappe.ValidationError, declaration.save)
+		declaration = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Declaration",
+			"payroll_period": "Test Payroll Period",
+			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
+			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 90000)]
+		})
+		self.assertTrue(declaration.save)
+
+	def test_duplicate_category_in_declaration(self):
+		declaration = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Declaration",
+			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
+			"payroll_period": "Test Payroll Period",
+			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 100000),
+							dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 50000),
+							]
+		})
+		self.assertRaises(frappe.ValidationError, declaration.save)
+
+	def test_duplicate_submission_for_payroll_period(self):
+		declaration = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Declaration",
+			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
+			"payroll_period": "Test Payroll Period",
+			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 100000),
+							dict(exemption_sub_category = "_Test1 Sub Category",
+							exemption_category = "_Test Category",
+							amount = 50000),
+							]
+		})
+		self.assertTrue(declaration.submit)
+		duplicate_declaration = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Declaration",
+			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
+			"payroll_period": "Test Payroll Period",
+			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
+							exemption_category = "_Test Category",
+							amount = 100000)
+							]
+		})
+		self.assertRaises(frappe.DocstatusTransitionError, duplicate_declaration.submit)
+		duplicate_declaration.employee = frappe.get_value("Employee", {"user_id":"employee1@taxexepmtion.com"}, "name")
+		self.assertTrue(duplicate_declaration.submit)
+
+def create_payroll_period():
+	if not frappe.db.exists("Payroll Period", "_Test Payroll Period"):
+		from datetime import date
+		payroll_period = frappe.get_doc(dict(
+			doctype = 'Payroll Period',
+			name = "_Test Payroll Period",
+			company = "_Test Company",
+			start_date = date(date.today().year, 1, 1),
+			end_date = date(date.today().year, 12, 31)
+		)).insert()
+
+def create_exemption_category():
+	if not frappe.db.exists("Employee Tax Exemption Category", "_Test Category"):
+		category = frappe.get_doc({
+			"doctype": "Employee Tax Exemption Category",
+			"name": "_Test Category",
+			"deduction_component": "_Test Tax",
+			"max_amount": 100000
+		}).insert()
+	if not frappe.db.exists("Employee Tax Exemption Sub Category", "_Test Category"):
+		frappe.get_doc({
+			"doctype": "Employee Tax Exemption Sub Category",
+			"name": "_Test Sub Category",
+			"exemption_category": "_Test Category",
+			"max_amount": 100000
+		}).insert()
+	if not frappe.db.exists("Employee Tax Exemption Sub Category", "_Test Category"):
+		frappe.get_doc({
+			"doctype": "Employee Tax Exemption Sub Category",
+			"name": "_Test1 Sub Category",
+			"exemption_category": "_Test Category",
+			"max_amount": 50000
+		}).insert()
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_declaration_category/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json
new file mode 100644
index 0000000..ebde4c9
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json
@@ -0,0 +1,140 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 16:56:23.333041", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exemption_sub_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Exemption Sub Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Sub Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "exemption_sub_category.exemption_category", 
+   "fieldname": "exemption_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Exemption Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-29 15:58:05.779031", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Declaration Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.py b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.py
new file mode 100644
index 0000000..362677e
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeTaxExemptionDeclarationCategory(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_proof_submission/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.js b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.js
new file mode 100644
index 0000000..99bec14
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Tax Exemption Proof Submission', {
+	setup: function(frm) {
+		frm.set_query('employee', function() {
+			return {
+				filters: {
+					'status': "Active"
+				}
+			}
+		});
+		frm.set_query('payroll_period', function() {
+			if(frm.doc.employee && frm.doc.company){
+				return {
+					filters: {
+						'company': frm.doc.company
+					}
+				}
+			}else {
+				frappe.msgprint(__("Please select Employee"));
+			}
+		});
+		frm.set_query('exemption_sub_category', 'tax_exemption_proofs', function() {
+			return {
+				filters: {
+					'is_active': 1
+				}
+			}
+		});
+	},
+	employee: function(frm){
+		if(frm.doc.employee){
+			frm.add_fetch('employee', 'company', 'company');
+		}else{
+			frm.set_value('company', '');
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.json b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.json
new file mode 100644
index 0000000..32203d8
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.json
@@ -0,0 +1,793 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "ETEPS.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 17:24:11.456132", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payroll_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Period", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "processed_in_payroll", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Processed in Payroll", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Exemption Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_exemption_proofs", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Exemption Proofs", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Proof Submission Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_9", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "house_rent_payment_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": " House Rent Payment Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rented_in_metro_city", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rented in Metro City", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rented_from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rented From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rented_to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rented To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_house_rent", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly House Rent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_hra_exemption", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly Eligible Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_eligible_hra_exemption", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Eligible HRA Exemption", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "attachment_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "attachments", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Attachments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Tax Exemption Proof Submission", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-30 20:26:05.714414", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Proof Submission", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.py
new file mode 100644
index 0000000..503cfe0
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import date_diff, flt
+from erpnext.hr.utils import validate_tax_declaration, calculate_eligible_hra_exemption
+
+class EmployeeTaxExemptionProofSubmission(Document):
+	def validate(self):
+		validate_tax_declaration(self.tax_exemption_proofs)
+		if self.house_rent_payment_amount:
+			self.validate_house_rent_dates()
+		self.get_monthly_hra()
+		self.calculate_hra_exemption()
+		self.calculate_total_exemption()
+
+	def get_monthly_hra(self):
+		factor = self.get_rented_days_factor()
+		self.monthly_house_rent = self.house_rent_payment_amount / factor
+
+	def validate_house_rent_dates(self):
+		if date_diff(self.rented_to_date, self.rented_from_date) < 14:
+			frappe.throw(_("House Rented dates should be atleast 15 days apart"))
+
+		proofs = frappe.db.sql("""select name from `tabEmployee Tax Exemption Proof Submission`
+			where docstatus=1 and employee='{0}' and payroll_period='{1}' and
+			(rented_from_date between '{2}' and '{3}' or rented_to_date between
+			'{2}' and '{2}')""".format(self.employee, self.payroll_period,
+			self.rented_from_date, self.rented_to_date))
+		if proofs:
+			frappe.throw(_("House rent paid days overlap with {0}").format(proofs[0][0]))
+
+	def calculate_hra_exemption(self):
+		exemptions = calculate_eligible_hra_exemption(self.company, self.employee, \
+						self.monthly_house_rent, self.rented_in_metro_city)
+		self.monthly_hra_exemption = exemptions["monthly_exemption"]
+		if self.monthly_hra_exemption:
+			factor = self.get_rented_days_factor(rounded=False)
+			self.total_eligible_hra_exemption = self.monthly_hra_exemption * factor
+		else:
+			self.monthly_hra_exemption, self.total_eligible_hra_exemption = 0, 0
+
+	def get_rented_days_factor(self, rounded=True):
+		factor = flt(date_diff(self.rented_to_date, self.rented_from_date) + 1)/30
+		factor = round(factor * 2)/2
+		return factor if factor else 0.5
+
+	def calculate_total_exemption(self):
+		self.total_amount = 0
+		for proof in self.tax_exemption_proofs:
+			self.total_amount += proof.amount
+		if self.monthly_house_rent and self.total_eligible_hra_exemption:
+			self.total_amount += self.total_eligible_hra_exemption
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.js b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.js
new file mode 100644
index 0000000..cec7508
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Tax Exemption Proof Submission", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Tax Exemption Proof Submission
+		() => frappe.tests.make('Employee Tax Exemption Proof Submission', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py
new file mode 100644
index 0000000..e54d919
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission/test_employee_tax_exemption_proof_submission.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+# from erpnext.hr.doctype.employee_tax_exemption_declaration.test_employee_tax_exemption_declaration import create_exemption_category, create_payroll_period
+#
+# class TestEmployeeTaxExemptionProofSubmission(unittest.TestCase):
+# 	def setup(self):
+# 		make_employee("employee@proofsubmission.com")
+# 		create_payroll_period()
+# 		create_exemption_category()
+# 		frappe.db.sql("""delete from `tabEmployee Tax Exemption Proof Submission`""")
+#
+# 	def test_exemption_amount_lesser_than_category_max(self):
+# 		declaration = frappe.get_doc({
+# 			"doctype": "Employee Tax Exemption Proof Submission",
+# 			"employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"),
+# 			"payroll_period": "Test Payroll Period",
+# 			"tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category",
+# 							type_of_proof = "Test Proof",
+# 							exemption_category = "_Test Category",
+# 							amount = 150000)]
+# 		})
+# 		self.assertRaises(frappe.ValidationError, declaration.save)
+# 		declaration = frappe.get_doc({
+# 			"doctype": "Employee Tax Exemption Proof Submission",
+# 			"payroll_period": "Test Payroll Period",
+# 			"employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"),
+# 			"tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category",
+# 							type_of_proof = "Test Proof",
+# 							exemption_category = "_Test Category",
+# 							amount = 100000)]
+# 		})
+# 		self.assertTrue(declaration.save)
+# 		self.assertTrue(declaration.submit)
+#
+# 	def test_duplicate_category_in_proof_submission(self):
+# 		declaration = frappe.get_doc({
+# 			"doctype": "Employee Tax Exemption Proof Submission",
+# 			"employee": frappe.get_value("Employee", {"user_id":"employee@proofsubmission.com"}, "name"),
+# 			"payroll_period": "Test Payroll Period",
+# 			"tax_exemption_proofs": [dict(exemption_sub_category = "_Test Sub Category",
+# 							exemption_category = "_Test Category",
+# 							type_of_proof = "Test Proof",
+# 							amount = 100000),
+# 							dict(exemption_sub_category = "_Test Sub Category",
+# 							exemption_category = "_Test Category",
+# 							amount = 50000),
+# 							]
+# 		})
+# 		self.assertRaises(frappe.ValidationError, declaration.save)
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json
new file mode 100644
index 0000000..c1c5896
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json
@@ -0,0 +1,169 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 17:19:03.006149", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exemption_sub_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Exemption Sub Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Sub Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "exemption_sub_category.exemption_category",
+   "fieldname": "exemption_category", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Exemption Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "type_of_proof", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Type of Proof", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 22:42:59.750733",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Proof Submission Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.py b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.py
new file mode 100644
index 0000000..c5d1a8f
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeTaxExemptionProofSubmissionDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_tax_exemption_sub_category/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_tax_exemption_sub_category/__init__.py
diff --git a/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.js b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.js
new file mode 100644
index 0000000..8a83a27
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Tax Exemption Sub Category', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.json b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.json
new file mode 100644
index 0000000..dc99785
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.json
@@ -0,0 +1,194 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-05-09 12:47:26.983095", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exemption_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Exemption Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Tax Exemption Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "max_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Max Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-09 13:25:01.595240", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Tax Exemption Sub Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.py b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.py
new file mode 100644
index 0000000..cd58136
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeTaxExemptionSubCategory(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.js b/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.js
new file mode 100644
index 0000000..8a1a6d1
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Tax Exemption Sub Category", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Tax Exemption Sub Category
+		() => frappe.tests.make('Employee Tax Exemption Sub Category', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.py b/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.py
new file mode 100644
index 0000000..5d705567
--- /dev/null
+++ b/erpnext/hr/doctype/employee_tax_exemption_sub_category/test_employee_tax_exemption_sub_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeTaxExemptionSubCategory(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_transfer/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_transfer/__init__.py
diff --git a/erpnext/hr/doctype/employee_transfer/employee_transfer.js b/erpnext/hr/doctype/employee_transfer/employee_transfer.js
new file mode 100644
index 0000000..af751a7
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+{% include 'erpnext/hr/employee_property_update.js' %}
+
+frappe.ui.form.on('Employee Transfer', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_transfer/employee_transfer.json b/erpnext/hr/doctype/employee_transfer/employee_transfer.json
new file mode 100644
index 0000000..618aaec
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.json
@@ -0,0 +1,513 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "ET.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:20:01.603830", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transfer Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Transfer Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_details", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Transfer Detail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Property History", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reallocate_leaves", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Re-allocate Leaves", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "create_new_employee_id", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create New Employee Id", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_employee_id", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Employee ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Employee Transfer", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 13:16:13.367663",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Transfer", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_transfer/employee_transfer.py b/erpnext/hr/doctype/employee_transfer/employee_transfer.py
new file mode 100644
index 0000000..6cdd22f
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer/employee_transfer.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import getdate
+from erpnext.hr.utils import update_employee
+
+class EmployeeTransfer(Document):
+	def validate(self):
+		if frappe.get_value("Employee", self.employee, "status") == "Left":
+			frappe.throw(_("Cannot transfer Employee with status Left"))
+		if self.new_company and self.company == self.new_company:
+			frappe.throw(_("New Company must be different from current company"))
+
+	def before_submit(self):
+		if getdate(self.transfer_date) > getdate():
+			frappe.throw(_("Employee Transfer cannot be submitted before Transfer Date "),
+				frappe.DocstatusTransitionError)
+
+	def on_submit(self):
+		employee = frappe.get_doc("Employee", self.employee)
+		if self.create_new_employee_id:
+			new_employee = frappe.copy_doc(employee)
+			new_employee.name = None
+			new_employee.employee_number = None
+			new_employee = update_employee(new_employee, self.transfer_details)
+			if self.new_company:
+				new_employee.company = self.new_company
+			#move user_id to new employee before insert
+			if employee.user_id and not self.validate_user_in_details():
+				new_employee.user_id = employee.user_id
+				employee.db_set("user_id", "")
+			new_employee.insert()
+			self.db_set("new_employee_id", new_employee.name)
+			#relieve the old employee
+			employee.db_set("relieving_date", self.transfer_date)
+			employee.db_set("status", "Left")
+		else:
+			employee = update_employee(employee, self.transfer_details)
+			if self.new_company:
+				employee.company = self.new_company
+			employee.save()
+
+	def on_cancel(self):
+		employee = frappe.get_doc("Employee", self.employee)
+		if self.create_new_employee_id:
+			if self.new_employee_id:
+				frappe.throw(_("Please delete the Employee <a href='#Form/Employee/{0}'>{0}</a>\
+					to cancel this document").format(self.new_employee_id))
+			#mark the employee as active
+			employee.status = "Active"
+			employee.relieving_date = ''
+			employee.save()
+		else:
+			employee = update_employee(employee, self.transfer_details, True)
+			employee.save()
+
+	def validate_user_in_details(self):
+		for item in self.transfer_details:
+			if item.fieldname == "user_id" and item.new != item.current:
+				return True
+		return False
diff --git a/erpnext/hr/doctype/employee_transfer/test_employee_transfer.js b/erpnext/hr/doctype/employee_transfer/test_employee_transfer.js
new file mode 100644
index 0000000..05a3e1a
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer/test_employee_transfer.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Transfer", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Transfer
+		() => frappe.tests.make('Employee Transfer', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_transfer/test_employee_transfer.py b/erpnext/hr/doctype/employee_transfer/test_employee_transfer.py
new file mode 100644
index 0000000..3dae1a9
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer/test_employee_transfer.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import getdate, add_days
+from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+
+class TestEmployeeTransfer(unittest.TestCase):
+	def setUp(self):
+		make_employee("employee2@transfers.com")
+		make_employee("employee3@transfers.com")
+		frappe.db.sql("""delete from `tabEmployee Transfer`""")
+
+	def test_submit_before_transfer_date(self):
+		transfer_obj = frappe.get_doc({
+			"doctype": "Employee Transfer",
+			"employee": frappe.get_value("Employee", {"user_id":"employee2@transfers.com"}, "name"),
+			"transfer_details" :[
+				{
+				"property": "Designation",
+				"current": "Software Developer",
+				"new": "Project Manager",
+				"fieldname": "designation"
+				}
+			]
+		})
+		transfer_obj.transfer_date = add_days(getdate(), 1)
+		transfer_obj.save()
+		self.assertRaises(frappe.DocstatusTransitionError, transfer_obj.submit)
+		transfer = frappe.get_doc("Employee Transfer", transfer_obj.name)
+		transfer.transfer_date = getdate()
+		transfer.submit()
+		self.assertEqual(transfer.docstatus, 1)
+
+	def test_new_employee_creation(self):
+		transfer = frappe.get_doc({
+			"doctype": "Employee Transfer",
+			"employee": frappe.get_value("Employee", {"user_id":"employee3@transfers.com"}, "name"),
+			"create_new_employee_id": 1,
+			"transfer_date": getdate(),
+			"transfer_details" :[
+				{
+				"property": "Designation",
+				"current": "Software Developer",
+				"new": "Project Manager",
+				"fieldname": "designation"
+				}
+			]
+		}).insert()
+		transfer.submit()
+		self.assertTrue(transfer.new_employee_id)
+		self.assertEqual(frappe.get_value("Employee", transfer.new_employee_id, "status"), "Active")
+		self.assertEqual(frappe.get_value("Employee", transfer.employee, "status"), "Left")
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/employee_transfer_property/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/employee_transfer_property/__init__.py
diff --git a/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.js b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.js
new file mode 100644
index 0000000..9987c82
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Transfer Property', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.json b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.json
new file mode 100644
index 0000000..829169d
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.json
@@ -0,0 +1,154 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 18:24:30.579965", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "property", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Property", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "current", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Current", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 18:25:54.889579", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employee Transfer Property", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.py b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.py
new file mode 100644
index 0000000..1a665dc
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer_property/employee_transfer_property.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class EmployeeTransferProperty(Document):
+	pass
diff --git a/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.js b/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.js
new file mode 100644
index 0000000..00a334a
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Employee Transfer Property", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Employee Transfer Property
+		() => frappe.tests.make('Employee Transfer Property', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.py b/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.py
new file mode 100644
index 0000000..39c20a6
--- /dev/null
+++ b/erpnext/hr/doctype/employee_transfer_property/test_employee_transfer_property.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestEmployeeTransferProperty(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index da84ce4..9dcae3c 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -48,7 +48,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 5e06488..0da8ac2 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -120,12 +120,6 @@
 	cur_frm.cscript.calculate_total(doc,cdt,cdn);
 };
 
-cur_frm.cscript.on_submit = function() {
-	if(cint(frappe.boot.notification_settings && frappe.boot.notification_settings.expense_claim)) {
-		cur_frm.email_doc(frappe.boot.notification_settings.expense_claim_message);
-	}
-};
-
 erpnext.expense_claim = {
 	set_title :function(frm) {
 		if (!frm.doc.task) {
@@ -153,9 +147,6 @@
 				]
 			};
 		});
-	},
-
-	onload: function(frm) {
 		frm.set_query("expense_approver", function() {
 			return {
 				query: "erpnext.hr.doctype.department_approver.department_approver.get_approvers",
@@ -167,6 +158,22 @@
 		});
 	},
 
+	onload: function(frm) {
+		if (frm.doc.docstatus == 0) {
+			return frappe.call({
+				method: "erpnext.hr.doctype.leave_application.leave_application.get_mandatory_approval",
+				args: {
+					doctype: frm.doc.doctype,
+				},
+				callback: function(r) {
+					if (!r.exc && r.message) {
+						frm.toggle_reqd("expense_approver", true);
+					}
+				}
+			});
+		}
+	},
+
 	refresh: function(frm) {
 		frm.trigger("toggle_fields");
 
@@ -187,11 +194,6 @@
 			frm.add_custom_button(__('Payment'),
 				function() { frm.events.make_payment_entry(frm); }, __("Make"));
 		}
-		frappe.db.get_value('HR Settings', {name: 'HR Settings'}, 'expense_approver_mandatory_in_expense_claim', (r) => {
-			if (frm.doc.docstatus < 1 && (r.expense_approver_mandatory_in_expense_claim == 1)) {
-				frm.toggle_reqd("expense_approver", true);
-			}
-		});
 	},
 
 	make_payment_entry: function(frm) {
@@ -211,7 +213,7 @@
 			}
 		});
 	},
-	
+
 	set_query_for_cost_center: function(frm) {
 		frm.fields_dict["cost_center"].get_query = function() {
 			return {
@@ -262,7 +264,7 @@
 					employee: frm.doc.employee
 				},
 				callback: function(r, rt) {
-				
+
 					if(r.message) {
 						$.each(r.message, function(i, d) {
 							var row = frappe.model.add_child(frm.doc, "Expense Claim Advance", "advances");
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 7960aa5..dec8d30 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -75,7 +75,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -84,6 +84,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -98,7 +99,7 @@
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -108,7 +109,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -118,7 +119,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "expense_approver", 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -127,21 +129,21 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Expense Approver", 
+   "label": "Department",
    "length": 0, 
    "no_copy": 0, 
-   "options": "User", 
+   "options": "Department",
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1,
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -171,7 +173,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -180,6 +182,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "expense_approver",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Expense Approver",
+   "length": 0,
+   "no_copy": 0,
+   "options": "User",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "default": "Draft", 
    "fieldname": "approval_status", 
    "fieldtype": "Select", 
@@ -204,7 +238,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -237,7 +271,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "160px"
   }, 
@@ -271,7 +305,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "160px"
   }, 
@@ -304,7 +338,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -335,7 +369,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -368,7 +402,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -398,7 +432,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -431,7 +465,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -463,7 +497,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -495,7 +529,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -527,7 +561,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -556,7 +590,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -588,7 +622,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -620,7 +654,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -652,7 +686,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -684,7 +718,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -715,7 +749,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -748,7 +782,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -781,7 +815,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -811,7 +845,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -844,7 +878,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -876,7 +910,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -907,7 +941,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -940,7 +974,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -973,7 +1007,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "160px"
   }, 
@@ -1005,7 +1039,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1037,7 +1071,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1069,7 +1103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1085,7 +1119,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-04-16 10:29:49.805051", 
+ "modified": "2018-05-17 12:24:53.744628",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
@@ -1128,7 +1162,6 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
-   "user_permission_doctypes": "[\"Employee\"]", 
    "write": 1
   }, 
   {
@@ -1148,7 +1181,6 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
-   "user_permission_doctypes": "[\"Company\",\"Expense Claim\",\"Fiscal Year\",\"Project\",\"Task\",\"User\"]", 
    "write": 1
   }, 
   {
@@ -1168,7 +1200,6 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
-   "user_permission_doctypes": "[\"Company\",\"Expense Claim\",\"Fiscal Year\",\"Project\",\"Task\",\"User\"]", 
    "write": 1
   }
  ], 
diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json
index a2bbe0b..c7d71d3 100644
--- a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json
+++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json
@@ -68,7 +68,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
index 99e7994..b808990 100644
--- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
+++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -70,6 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -136,6 +139,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -165,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -173,6 +178,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "expense_type.description",
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -187,7 +193,7 @@
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
-   "options": "expense_type.description", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -198,6 +204,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "300px"
   }, 
@@ -228,6 +235,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -261,6 +269,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -291,6 +300,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -324,6 +334,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }
@@ -338,7 +349,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-11 12:50:48.606727", 
+ "modified": "2018-05-16 22:42:56.727863",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Detail", 
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index f59111a..b60ba5f 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -101,7 +101,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/health_insurance/health_insurance.js b/erpnext/hr/doctype/health_insurance/health_insurance.js
deleted file mode 100644
index 504da27..0000000
--- a/erpnext/hr/doctype/health_insurance/health_insurance.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Health Insurance', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/hr/doctype/health_insurance/health_insurance.json b/erpnext/hr/doctype/health_insurance/health_insurance.json
deleted file mode 100644
index 301f0e5..0000000
--- a/erpnext/hr/doctype/health_insurance/health_insurance.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 1,
- "autoname": "field:health_insurance_name",
- "beta": 0,
- "creation": "2017-03-27 14:32:51.628588",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "health_insurance_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Health Insurance Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-03-13 08:19:33.710429",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Health Insurance",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  },
-  {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 0
-  }
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "health_insurance_name",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/health_insurance/health_insurance.py b/erpnext/hr/doctype/health_insurance/health_insurance.py
deleted file mode 100644
index c280254..0000000
--- a/erpnext/hr/doctype/health_insurance/health_insurance.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class HealthInsurance(Document):
-	pass
diff --git a/erpnext/hr/doctype/health_insurance/test_health_insurance.js b/erpnext/hr/doctype/health_insurance/test_health_insurance.js
deleted file mode 100644
index 81b0f8d..0000000
--- a/erpnext/hr/doctype/health_insurance/test_health_insurance.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Health Insurance", function (assert) {
-	let done = assert.async();
-
-	// number of asserts
-	assert.expect(1);
-
-	frappe.run_serially([
-		// insert a new Health Insurance
-		() => frappe.tests.make('Health Insurance', [
-			// values to be set
-			{key: 'value'}
-		]),
-		() => {
-			assert.equal(cur_frm.doc.key, 'value');
-		},
-		() => done()
-	]);
-
-});
diff --git a/erpnext/hr/doctype/health_insurance/test_health_insurance.py b/erpnext/hr/doctype/health_insurance/test_health_insurance.py
deleted file mode 100644
index 6978720..0000000
--- a/erpnext/hr/doctype/health_insurance/test_health_insurance.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-class TestHealthInsurance(unittest.TestCase):
-	pass
diff --git a/erpnext/hr/doctype/holiday/holiday.json b/erpnext/hr/doctype/holiday/holiday.json
index cc65631..6498530 100644
--- a/erpnext/hr/doctype/holiday/holiday.json
+++ b/erpnext/hr/doctype/holiday/holiday.json
@@ -68,7 +68,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index d1e02be..225785d 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -452,6 +452,66 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "show_leaves_of_all_department_members_in_calendar", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Leaves Of All Department Members In Calendar", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -465,7 +525,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-14 17:09:15.904645", 
+ "modified": "2018-05-03 15:36:13.015466", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "HR Settings", 
diff --git a/erpnext/hr/doctype/hr_settings/test_hr_settings.py b/erpnext/hr/doctype/hr_settings/test_hr_settings.py
index 00f183e..2d5b18b 100644
--- a/erpnext/hr/doctype/hr_settings/test_hr_settings.py
+++ b/erpnext/hr/doctype/hr_settings/test_hr_settings.py
@@ -3,6 +3,7 @@
 # See license.txt
 from __future__ import unicode_literals
 
+import frappe
 import unittest
 
 class TestHRSettings(unittest.TestCase):
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/identification_document_type/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/identification_document_type/__init__.py
diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.js b/erpnext/hr/doctype/identification_document_type/identification_document_type.js
new file mode 100644
index 0000000..351cf9d
--- /dev/null
+++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Identification Document Type', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.json b/erpnext/hr/doctype/identification_document_type/identification_document_type.json
new file mode 100644
index 0000000..33cbde7
--- /dev/null
+++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.json
@@ -0,0 +1,93 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:identification_document_type", 
+ "beta": 0, 
+ "creation": "2018-05-15 07:13:28.620570", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "identification_document_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Identification Document Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 04:34:00.448680", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Identification Document Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/identification_document_type/identification_document_type.py b/erpnext/hr/doctype/identification_document_type/identification_document_type.py
new file mode 100644
index 0000000..d9d81d2
--- /dev/null
+++ b/erpnext/hr/doctype/identification_document_type/identification_document_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class IdentificationDocumentType(Document):
+	pass
diff --git a/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js
new file mode 100644
index 0000000..6587909
--- /dev/null
+++ b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Identification Document Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Identification Document Type
+		() => frappe.tests.make('Identification Document Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py
new file mode 100644
index 0000000..1265afa
--- /dev/null
+++ b/erpnext/hr/doctype/identification_document_type/test_identification_document_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestIdentificationDocumentType(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/interest/interest.json b/erpnext/hr/doctype/interest/interest.json
index 955c40f..d6d2342 100644
--- a/erpnext/hr/doctype/interest/interest.json
+++ b/erpnext/hr/doctype/interest/interest.json
@@ -42,7 +42,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 2a97f28..dc8d82c 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -249,7 +249,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/job_offer/job_offer.json b/erpnext/hr/doctype/job_offer/job_offer.json
index 4375a12..272004c 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.json
+++ b/erpnext/hr/doctype/job_offer/job_offer.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -50,6 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "job_applicant.applicant_name",
    "fieldname": "applicant_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -62,7 +64,7 @@
    "label": "Applicant Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "job_applicant.applicant_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,6 +75,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -102,6 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -133,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -195,6 +201,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -226,6 +233,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +263,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -286,6 +295,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -315,6 +325,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -346,6 +357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -377,6 +389,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -529,6 +542,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -542,7 +556,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-15 03:32:54.903013", 
+ "modified": "2018-05-16 22:42:57.835937",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Offer", 
@@ -551,7 +565,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/job_opening/job_opening.js b/erpnext/hr/doctype/job_opening/job_opening.js
index e69de29..b303b24 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.js
+++ b/erpnext/hr/doctype/job_opening/job_opening.js
@@ -0,0 +1,47 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Job Opening', {
+	onload: function(frm) {
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			};
+		});
+	},
+	designation: function(frm) {
+		if(frm.doc.designation && frm.doc.company){
+			frappe.call({
+				"method": "erpnext.hr.doctype.staffing_plan.staffing_plan.get_active_staffing_plan_details",
+				args: {
+					company: frm.doc.company,
+					designation: frm.doc.designation,
+					department: frm.doc.department,
+					date: frappe.datetime.now_date() // ToDo - Date in Job Opening?
+				},
+				callback: function (data) {
+					if(data.message){
+						frm.set_value('staffing_plan', data.message[0].name);
+						frm.set_value('planned_vacancies', data.message[0].vacancies);
+					} else {
+						frm.set_value('staffing_plan', "");
+						frm.set_value('planned_vacancies', 0);
+						frappe.show_alert({
+							indicator: 'orange',
+							message: __('No Staffing Plans found for this Designation')
+						});
+					}
+				}
+			});
+		}
+		else{
+			frm.set_value('staffing_plan', "");
+			frm.set_value('planned_vacancies', 0);
+		}
+	},
+	company: function(frm) {
+		frm.set_value('designation', "");
+	}
+});
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index cde97e5..4437e02 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -15,6 +15,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,9 +41,262 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nClosed", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "staffing_plan", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Staffing Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Staffing Plan", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "staffing_plan", 
+   "fieldname": "planned_vacancies", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Planned number of Positions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -69,9 +323,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -99,38 +355,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 1
   }, 
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Open\nClosed", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,6 +386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -171,7 +401,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-22 12:36:26.807200", 
+ "modified": "2018-05-20 15:38:44.705823", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Opening", 
@@ -179,7 +409,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -199,7 +428,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/hr/doctype/job_opening/job_opening.py b/erpnext/hr/doctype/job_opening/job_opening.py
index 60c911a..cfe6290 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.py
+++ b/erpnext/hr/doctype/job_opening/job_opening.py
@@ -8,6 +8,7 @@
 
 from frappe.website.website_generator import WebsiteGenerator
 from frappe import _
+from erpnext.hr.doctype.staffing_plan.staffing_plan import get_designation_counts, get_active_staffing_plan_details
 
 class JobOpening(WebsiteGenerator):
 	website = frappe._dict(
@@ -19,6 +20,32 @@
 	def validate(self):
 		if not self.route:
 			self.route = frappe.scrub(self.job_title).replace('_', '-')
+		self.validate_current_vacancies()
+
+	def validate_current_vacancies(self):
+		if not self.staffing_plan:
+			staffing_plan = get_active_staffing_plan_details(self.company,
+				self.designation, self.department)
+			if staffing_plan:
+				self.staffing_plan = staffing_plan[0].name
+				self.planned_vacancies = staffing_plan[0].vacancies
+		elif not self.planned_vacancies:
+			planned_vacancies = frappe.db.sql("""
+				select vacancies from `tabStaffing Plan Detail`
+				where parent=%s and designation=%s""", (self.staffing_plan, self.designation))
+			self.planned_vacancies = planned_vacancies[0][0] if planned_vacancies else None
+
+		if self.staffing_plan and self.planned_vacancies:
+			staffing_plan_company = frappe.db.get_value("Staffing Plan", self.staffing_plan, "company")
+			lft, rgt = frappe.db.get_value("Company", staffing_plan_company, ["lft", "rgt"])
+
+			designation_counts = get_designation_counts(self.designation, self.company)
+			current_count = designation_counts['employee_count'] + designation_counts['job_openings']
+
+			if self.planned_vacancies <= current_count:
+				frappe.throw(_("Job Openings for designation {0} already open \
+					or hiring completed as per Staffing Plan {1}"
+					.format(self.designation, self.staffing_plan)))
 
 	def get_context(self, context):
 		context.parents = [{'route': 'jobs', 'title': _('All Jobs') }]
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 9b4a26e..7e6a957 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -42,6 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,6 +75,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,6 +105,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -111,6 +114,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -131,6 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -163,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "300px"
   }, 
@@ -193,6 +231,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +264,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -255,6 +295,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -285,6 +326,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -314,6 +356,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -343,6 +386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -373,6 +417,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -403,6 +448,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -432,6 +478,103 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.total_leaves_encashed>0", 
+   "fieldname": "total_leaves_encashed", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Leaves Encashed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "compensatory_request", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Compensatory Leave Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Compensatory Leave Request", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Period", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -464,6 +607,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -478,7 +622,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 18:41:38.845159", 
+ "modified": "2018-05-17 12:21:34.997953",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
@@ -486,7 +630,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -506,7 +649,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
index 58a7f30..7cffa4c 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
@@ -6,7 +6,7 @@
 from frappe.utils import flt, date_diff, formatdate
 from frappe import _
 from frappe.model.document import Document
-from erpnext.hr.utils import set_employee_name
+from erpnext.hr.utils import set_employee_name, get_leave_period
 from erpnext.hr.doctype.leave_application.leave_application import get_approved_leaves_for_period
 
 class OverlapError(frappe.ValidationError): pass
@@ -25,20 +25,34 @@
 		self.validate_total_leaves_allocated()
 		self.validate_lwp()
 		set_employee_name(self)
+		self.validate_leave_allocation_days()
+
+	def validate_leave_allocation_days(self):
+		company = frappe.db.get_value("Employee", self.employee, "company")
+		leave_period = get_leave_period(self.from_date, self.to_date, company)
+		max_leaves_allowed = frappe.db.get_value("Leave Type", self.leave_type, "max_leaves_allowed")
+		if max_leaves_allowed > 0:
+			leave_allocated = 0
+			if leave_period:
+				leave_allocated = get_leave_allocation_for_period(self.employee, self.leave_type, leave_period[0].from_date, leave_period[0].to_date)
+			leave_allocated += self.new_leaves_allocated
+			if leave_allocated > max_leaves_allowed:
+				frappe.throw(_("Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period")\
+				.format(self.leave_type, self.employee))
 
 	def on_update_after_submit(self):
 		self.validate_new_leaves_allocated_value()
 		self.set_total_leaves_allocated()
-		
+
 		frappe.db.set(self,'carry_forwarded_leaves', flt(self.carry_forwarded_leaves))
 		frappe.db.set(self,'total_leaves_allocated',flt(self.total_leaves_allocated))
-		
+
 		self.validate_against_leave_applications()
 
 	def validate_period(self):
 		if date_diff(self.to_date, self.from_date) <= 0:
 			frappe.throw(_("To date cannot be before from date"))
-			
+
 	def validate_lwp(self):
 		if frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
 			frappe.throw(_("Leave Type {0} cannot be allocated since it is leave without pay").format(self.leave_type))
@@ -52,58 +66,81 @@
 		leave_allocation = frappe.db.sql("""
 			select name from `tabLeave Allocation`
 			where employee=%s and leave_type=%s and docstatus=1
-			and to_date >= %s and from_date <= %s""", 
+			and to_date >= %s and from_date <= %s""",
 			(self.employee, self.leave_type, self.from_date, self.to_date))
 
 		if leave_allocation:
 			frappe.msgprint(_("{0} already allocated for Employee {1} for period {2} to {3}")
 				.format(self.leave_type, self.employee, formatdate(self.from_date), formatdate(self.to_date)))
-			
+
 			frappe.throw(_('Reference') + ': <a href="#Form/Leave Allocation/{0}">{0}</a>'
 				.format(leave_allocation[0][0]), OverlapError)
-				
+
 	def validate_back_dated_allocation(self):
 		future_allocation = frappe.db.sql("""select name, from_date from `tabLeave Allocation`
-			where employee=%s and leave_type=%s and docstatus=1 and from_date > %s 
+			where employee=%s and leave_type=%s and docstatus=1 and from_date > %s
 			and carry_forward=1""", (self.employee, self.leave_type, self.to_date), as_dict=1)
-		
+
 		if future_allocation:
 			frappe.throw(_("Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}")
-				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name), 
+				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name),
 					BackDatedAllocationError)
 
 	def set_total_leaves_allocated(self):
-		self.carry_forwarded_leaves = get_carry_forwarded_leaves(self.employee, 
+		self.carry_forwarded_leaves = get_carry_forwarded_leaves(self.employee,
 			self.leave_type, self.from_date, self.carry_forward)
-			
+
 		self.total_leaves_allocated = flt(self.carry_forwarded_leaves) + flt(self.new_leaves_allocated)
-		
-		if not self.total_leaves_allocated:
-			frappe.throw(_("Total leaves allocated is mandatory"))
+
+		if not self.total_leaves_allocated and not frappe.db.get_value("Leave Type", self.leave_type, "is_earned_leave"):
+			frappe.throw(_("Total leaves allocated is mandatory for Leave Type {0}".format(self.leave_type)))
 
 	def validate_total_leaves_allocated(self):
 		# Adding a day to include To Date in the difference
 		date_difference = date_diff(self.to_date, self.from_date) + 1
 		if date_difference < self.total_leaves_allocated:
 			frappe.throw(_("Total allocated leaves are more than days in the period"), OverAllocationError)
-			
+
 	def validate_against_leave_applications(self):
-		leaves_taken = get_approved_leaves_for_period(self.employee, self.leave_type, 
+		leaves_taken = get_approved_leaves_for_period(self.employee, self.leave_type,
 			self.from_date, self.to_date)
-		
+
 		if flt(leaves_taken) > flt(self.total_leaves_allocated):
 			if frappe.db.get_value("Leave Type", self.leave_type, "allow_negative"):
 				frappe.msgprint(_("Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken))
 			else:
 				frappe.throw(_("Total allocated leaves {0} cannot be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
 
+def get_leave_allocation_for_period(employee, leave_type, from_date, to_date):
+	leave_allocated = 0
+	leave_allocations = frappe.db.sql("""
+		select employee, leave_type, from_date, to_date, total_leaves_allocated
+		from `tabLeave Allocation`
+		where employee=%(employee)s and leave_type=%(leave_type)s
+			and docstatus=1
+			and (from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (from_date < %(from_date)s and to_date > %(to_date)s))
+	""", {
+		"from_date": from_date,
+		"to_date": to_date,
+		"employee": employee,
+		"leave_type": leave_type
+	}, as_dict=1)
+
+	if leave_allocations:
+		for leave_alloc in leave_allocations:
+			leave_allocated += leave_alloc.total_leaves_allocated
+
+	return leave_allocated
+
 @frappe.whitelist()
 def get_carry_forwarded_leaves(employee, leave_type, date, carry_forward=None):
 	carry_forwarded_leaves = 0
-	
+
 	if carry_forward:
 		validate_carry_forward(leave_type)
-		
+
 		previous_allocation = frappe.db.sql("""
 			select name, from_date, to_date, total_leaves_allocated
 			from `tabLeave Allocation`
@@ -111,14 +148,13 @@
 			order by to_date desc limit 1
 		""", (employee, leave_type, date), as_dict=1)
 		if previous_allocation:
-			leaves_taken = get_approved_leaves_for_period(employee, leave_type, 
+			leaves_taken = get_approved_leaves_for_period(employee, leave_type,
 				previous_allocation[0].from_date, previous_allocation[0].to_date)
-		
+
 			carry_forwarded_leaves = flt(previous_allocation[0].total_leaves_allocated) - flt(leaves_taken)
-			
+
 	return carry_forwarded_leaves
-		
+
 def validate_carry_forward(leave_type):
 	if not frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
 		frappe.throw(_("Leave Type {0} cannot be carry-forwarded").format(leave_type))
-	
diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index 242c987..a77dd32 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -5,11 +5,7 @@
 cur_frm.add_fetch('employee','company','company');
 
 frappe.ui.form.on("Leave Application", {
-	onload: function(frm) {
-		if (!frm.doc.posting_date) {
-			frm.set_value("posting_date", frappe.datetime.get_today());
-		}
-
+	setup: function(frm) {
 		frm.set_query("leave_approver", function() {
 			return {
 				query: "erpnext.hr.doctype.department_approver.department_approver.get_approvers",
@@ -18,15 +14,63 @@
 					doctype: frm.doc.doctype
 				}
 			};
-		});
+		}); 
 
 		frm.set_query("employee", erpnext.queries.employee);
 	},
+	onload: function(frm) {
+		if (!frm.doc.posting_date) {
+			frm.set_value("posting_date", frappe.datetime.get_today());
+		}
+		if (frm.doc.docstatus == 0) {
+			return frappe.call({
+				method: "erpnext.hr.doctype.leave_application.leave_application.get_mandatory_approval",
+				args: {
+					doctype: frm.doc.doctype,
+				},
+				callback: function(r) {
+					if (!r.exc && r.message) {
+						frm.toggle_reqd("leave_approver", true);
+					}
+				}
+			});
+		}
+	},
 
 	validate: function(frm) {
 		frm.toggle_reqd("half_day_date", frm.doc.half_day == 1);
 	},
 
+	make_dashboard: function(frm) {
+		var leave_details;
+		if (frm.doc.employee) {
+			frappe.call({
+				method: "erpnext.hr.doctype.leave_application.leave_application.get_leave_details",
+				async: false,
+				args: {
+					employee: frm.doc.employee,
+					date: frm.doc.posting_date
+				},
+				callback: function(r) {
+					if (!r.exc && r.message['leave_allocation']) {
+						leave_details = r.message['leave_allocation'];
+					}
+					if (!r.exc && r.message['leave_approver']) {
+						frm.set_value('leave_approver', r.message['leave_approver']);
+					}
+				}
+			});
+
+			$("div").remove(".form-dashboard-section");
+			let section = frm.dashboard.add_section(
+				frappe.render_template('leave_application_dashboard', {
+					data: leave_details
+				})
+			);
+			frm.dashboard.show();
+		}
+	},
+
 	refresh: function(frm) {
 		if (frm.is_new()) {
 			frm.trigger("calculate_total_days");
@@ -35,15 +79,19 @@
 		if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) {
 			frm.set_intro(__("Fill the form and save it"));
 		}
-		frappe.db.get_value('HR Settings', {name: 'HR Settings'}, 'leave_approver_mandatory_in_leave_application', (r) => {
-			if (frm.doc.docstatus < 1 && (r.leave_approver_mandatory_in_leave_application == 1)) {
-				frm.toggle_reqd("leave_approver", true);
+
+		if (!frm.doc.employee && frappe.defaults.get_user_permissions()) {
+			const perm = frappe.defaults.get_user_permissions();
+			if (perm && perm['Employee']) {
+				frm.set_value('employee', perm['Employee']["docs"][0])
 			}
-		});
+		}
 	},
 
 	employee: function(frm) {
+		frm.trigger("make_dashboard");
 		frm.trigger("get_leave_balance");
+		frm.trigger("set_leave_approver");
 	},
 
 	leave_approver: function(frm) {
@@ -103,6 +151,9 @@
 					if (!r.exc && r.message) {
 						frm.set_value('leave_balance', r.message);
 					}
+					else {
+						frm.set_value('leave_balance', "0");
+					}
 				}
 			});
 		}
@@ -139,4 +190,21 @@
 			});
 		}
 	},
+
+	set_leave_approver: function(frm) {
+		if(frm.doc.employee) {
+				// server call is done to include holidays in leave days calculations
+			return frappe.call({
+				method: 'erpnext.hr.doctype.leave_application.leave_application.get_leave_approver',
+				args: {
+					"employee": frm.doc.employee,
+				},
+				callback: function(r) {
+					if (r && r.message) {
+						frm.set_value('leave_approver', r.message);
+					}
+				}
+			});
+		}
+	}
 });
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 290120b..79f5f5c 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,7 +73,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -103,7 +103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -133,7 +133,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -164,7 +164,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -173,6 +173,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "leave_balance", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -194,7 +227,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -224,7 +257,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -254,7 +287,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -284,7 +317,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -314,7 +347,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -346,7 +379,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -377,7 +410,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -407,7 +440,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -438,7 +471,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -468,7 +501,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -500,7 +533,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -531,7 +564,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -561,7 +594,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -594,7 +627,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -624,7 +657,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -655,7 +688,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -686,7 +719,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -717,7 +750,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -746,7 +779,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -777,7 +810,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -808,7 +841,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -839,7 +872,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -854,7 +887,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2018-04-30 12:49:40.845022", 
+ "modified": "2018-05-17 10:13:40.623098",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -877,7 +910,6 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
-   "user_permission_doctypes": "[\"Company\",\"Employee\",\"Fiscal Year\",\"Leave Application\"]", 
    "write": 1
   }, 
   {
@@ -935,7 +967,6 @@
    "set_user_permissions": 1, 
    "share": 1, 
    "submit": 1, 
-   "user_permission_doctypes": "[\"Company\"]", 
    "write": 1
   }, 
   {
@@ -955,7 +986,6 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
-   "user_permission_doctypes": "[\"Company\",\"User\"]", 
    "write": 1
   }, 
   {
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 4231cc2..b3f2068 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -5,19 +5,20 @@
 import frappe
 from frappe import _
 from frappe.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_link_to_form, \
-	comma_or, get_fullname
-from erpnext.hr.utils import set_employee_name
+	comma_or, get_fullname, add_days, nowdate
+from erpnext.hr.utils import set_employee_name, get_leave_period
 from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
+from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import daterange
 
 class LeaveDayBlockedError(frappe.ValidationError): pass
 class OverlapError(frappe.ValidationError): pass
-class InvalidLeaveApproverError(frappe.ValidationError): pass
-class LeaveApproverIdentityError(frappe.ValidationError): pass
 class AttendanceAlreadyMarkedError(frappe.ValidationError): pass
+class NotAnOptionalHoliday(frappe.ValidationError): pass
 
 from frappe.model.document import Document
 class LeaveApplication(Document):
+
 	def get_feed(self):
 		return _("{0}: From {0} of type {1}").format(self.employee_name, self.leave_type)
 
@@ -31,6 +32,9 @@
 		self.validate_block_days()
 		self.validate_salary_processed_days()
 		self.validate_attendance()
+		if frappe.db.get_value("Leave Type", self.leave_type, 'is_optional_leave'):
+			self.validate_optional_leave()
+		self.validate_applicable_after()
 
 	def on_update(self):
 		if self.status == "Open" and self.docstatus < 1:
@@ -42,6 +46,7 @@
 			frappe.throw(_("Only Leave Applications with status 'Approved' and 'Rejected' can be submitted"))
 
 		self.validate_back_dated_application()
+		self.update_attendance()
 
 		# notify leave applier about approval
 		self.notify_employee()
@@ -52,6 +57,21 @@
 		# notify leave applier about cancellation
 		self.notify_employee()
 
+	def validate_applicable_after(self):
+		if self.leave_type:
+			leave_type = frappe.get_doc("Leave Type", self.leave_type)
+			if leave_type.applicable_after > 0:
+				date_of_joining = frappe.db.get_value("Employee", self.employee, "date_of_joining")
+				leave_days = get_approved_leaves_for_period(self.employee, False, date_of_joining, self.from_date)
+				number_of_days = date_diff(getdate(self.from_date), date_of_joining)
+				if number_of_days >= 0:
+					holidays = 0
+					if not frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"):
+						holidays = get_holidays(self.employee, date_of_joining, self.from_date)
+					number_of_days = number_of_days - leave_days - holidays
+					if number_of_days < leave_type.applicable_after:
+						frappe.throw(_("{0} applicable after {1} working days").format(self.leave_type, leave_type.applicable_after))
+
 	def validate_dates(self):
 		if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
 			frappe.throw(_("To date cannot be before from date"))
@@ -92,6 +112,43 @@
 			frappe.throw(_("Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}")
 				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name))
 
+	def update_attendance(self):
+		if self.status == "Approved":
+			attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s\
+				and (attendance_date between %s and %s) and docstatus < 2""",(self.employee, self.from_date, self.to_date), as_dict=1)
+
+			if attendance:
+				for d in attendance:
+					doc = frappe.get_doc("Attendance", d.name)
+					if getdate(self.half_day_date) == doc.attendance_date:
+						status = "Half Day"
+					else:
+						status = "On Leave"
+					frappe.db.sql("""update `tabAttendance` set status = %s, leave_type = %s\
+						where name = %s""",(status, self.leave_type, d.name))
+
+			elif getdate(self.to_date) <= getdate(nowdate()):
+				for dt in daterange(getdate(self.from_date), getdate(self.to_date)):
+					date = dt.strftime("%Y-%m-%d")
+					if not date == self.half_day_date:
+						doc = frappe.new_doc("Attendance")
+						doc.employee = self.employee
+						doc.attendance_date = date
+						doc.company = self.company
+						doc.status = "On Leave"
+						doc.leave_type = self.leave_type
+						doc.insert(ignore_permissions=True)
+						doc.submit()
+					else:
+						doc = frappe.new_doc("Attendance")
+						doc.employee = self.employee
+						doc.attendance_date = date
+						doc.company = self.company
+						doc.status = "Half Day"
+						doc.leave_type = self.leave_type
+						doc.insert(ignore_permissions=True)
+						doc.submit()
+
 	def validate_salary_processed_days(self):
 		if not frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
 			return
@@ -195,7 +252,7 @@
 		return leave_count_on_half_day_date * 0.5
 
 	def validate_max_days(self):
-		max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_days_allowed")
+		max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_continuous_days_allowed")
 		if max_days and self.total_leave_days > cint(max_days):
 			frappe.throw(_("Leave of type {0} cannot be longer than {1}").format(self.leave_type, max_days))
 
@@ -207,6 +264,19 @@
 			frappe.throw(_("Attendance for employee {0} is already marked for this day").format(self.employee),
 				AttendanceAlreadyMarkedError)
 
+	def validate_optional_leave(self):
+		leave_period = get_leave_period(self.from_date, self.to_date, self.company)
+		if not leave_period:
+			frappe.throw(_("Cannot find active Leave Period"))
+		optional_holiday_list = frappe.db.get_value("Leave Period", leave_period[0]["name"], "optional_holiday_list")
+		if not optional_holiday_list:
+			frappe.throw(_("Optional Holiday List not set for leave period {0}").format(leave_period[0]["name"]))
+		day = getdate(self.from_date)
+		while day <= getdate(self.to_date):
+			if not frappe.db.exists({"doctype": "Holiday", "parent": optional_holiday_list, "holiday_date": day}):
+				frappe.throw(_("{0} is not in Optional Holiday List").format(formatdate(day)), NotAnOptionalHoliday)
+			day = add_days(day, 1)
+
 	def notify_employee(self):
 		employee = frappe.get_doc("Employee", self.employee)
 		if not employee.user_id:
@@ -291,8 +361,31 @@
 	return number_of_days
 
 @frappe.whitelist()
+def get_leave_details(employee, date):
+	allocation_records = get_leave_allocation_records(date, employee).get(employee, frappe._dict())
+	leave_allocation = {}
+	for d in allocation_records:
+		allocation = allocation_records.get(d, frappe._dict())
+		date = allocation.to_date
+		leaves_taken = get_leaves_for_period(employee, d, allocation.from_date, date, status="Approved")
+		leaves_pending = get_leaves_for_period(employee, d, allocation.from_date, date, status="Open")
+		remaining_leaves = allocation.total_leaves_allocated - leaves_taken - leaves_pending
+		leave_allocation[d] = {
+			"total_leaves": allocation.total_leaves_allocated,
+			"leaves_taken": leaves_taken,
+			"pending_leaves": leaves_pending,
+			"remaining_leaves": remaining_leaves}
+
+	ret = {
+		'leave_allocation': leave_allocation,
+		'leave_approver': get_leave_approver(employee)
+	}
+
+	return ret
+
+@frappe.whitelist()
 def get_leave_balance_on(employee, leave_type, date, allocation_records=None,
-		consider_all_leaves_in_the_allocation_period=False):
+		consider_all_leaves_in_the_allocation_period=False, consider_encashed_leaves=True):
 	if allocation_records == None:
 		allocation_records = get_leave_allocation_records(date, employee).get(employee, frappe._dict())
 
@@ -300,16 +393,20 @@
 
 	if consider_all_leaves_in_the_allocation_period:
 		date = allocation.to_date
-	leaves_taken = get_approved_leaves_for_period(employee, leave_type, allocation.from_date, date)
+	leaves_taken = get_leaves_for_period(employee, leave_type, allocation.from_date, date, status="Approved")
 
-	return flt(allocation.total_leaves_allocated) - flt(leaves_taken)
+	leaves_encashed = 0
+	if frappe.db.get_value("Leave Type", leave_type, 'allow_encashment') and consider_encashed_leaves:
+		leaves_encashed = flt(allocation.total_leaves_encashed)
 
-def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
+	return flt(allocation.total_leaves_allocated) - (flt(leaves_taken) + flt(leaves_encashed))
+
+def get_leaves_for_period(employee, leave_type, from_date, to_date, status):
 	leave_applications = frappe.db.sql("""
 		select employee, leave_type, from_date, to_date, total_leave_days
 		from `tabLeave Application`
 		where employee=%(employee)s and leave_type=%(leave_type)s
-			and docstatus=1
+			and status = %(status)s and docstatus=1
 			and (from_date between %(from_date)s and %(to_date)s
 				or to_date between %(from_date)s and %(to_date)s
 				or (from_date < %(from_date)s and to_date > %(to_date)s))
@@ -317,6 +414,7 @@
 		"from_date": from_date,
 		"to_date": to_date,
 		"employee": employee,
+		"status": status,
 		"leave_type": leave_type
 	}, as_dict=1)
 
@@ -339,7 +437,7 @@
 	conditions = (" and employee='%s'" % employee) if employee else ""
 
 	leave_allocation_records = frappe.db.sql("""
-		select employee, leave_type, total_leaves_allocated, from_date, to_date
+		select employee, leave_type, total_leaves_allocated, total_leaves_encashed, from_date, to_date
 		from `tabLeave Allocation`
 		where %s between from_date and to_date and docstatus=1 {0}""".format(conditions), (date), as_dict=1)
 
@@ -348,7 +446,8 @@
 		allocated_leaves.setdefault(d.employee, frappe._dict()).setdefault(d.leave_type, frappe._dict({
 			"from_date": d.from_date,
 			"to_date": d.to_date,
-			"total_leaves_allocated": d.total_leaves_allocated
+			"total_leaves_allocated": d.total_leaves_allocated,
+			"total_leaves_encashed":d.total_leaves_encashed
 		}))
 
 	return allocated_leaves
@@ -407,11 +506,13 @@
 	add_leaves(events, start, end, match_conditions=match_conditions)
 
 def add_leaves(events, start, end, match_conditions=None):
-	query = """select name, from_date, to_date, employee_name, color, half_day,
-		employee, docstatus
+	query = """select name, from_date, to_date, employee_name, half_day,
+		status, employee, docstatus
 		from `tabLeave Application` where
 		from_date <= %(end)s and to_date >= %(start)s <= to_date
-		and docstatus < 2"""
+		and docstatus < 2
+		and status!="Rejected" """
+
 	if match_conditions:
 		query += match_conditions
 
@@ -461,3 +562,59 @@
 				"title": _("Holiday") + ": " + cstr(holiday.description),
 				"name": holiday.name
 			})
+
+@frappe.whitelist()
+def get_mandatory_approval(doctype):
+	mandatory = ""
+	if doctype == "Leave Application":
+		mandatory = frappe.db.get_single_value('HR Settings',
+				'leave_approver_mandatory_in_leave_application')
+	else:
+		mandatory = frappe.db.get_single_value('HR Settings',
+				'expense_approver_mandatory_in_expense_claim')
+
+	return mandatory
+
+def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
+	query = """
+		select employee, leave_type, from_date, to_date, total_leave_days
+		from `tabLeave Application`
+		where employee=%(employee)s
+			and docstatus=1
+			and (from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (from_date < %(from_date)s and to_date > %(to_date)s))
+	"""
+	if leave_type:
+		query += "and leave_type=%(leave_type)s"
+
+	leave_applications = frappe.db.sql(query,{
+		"from_date": from_date,
+		"to_date": to_date,
+		"employee": employee,
+		"leave_type": leave_type
+	}, as_dict=1)
+
+	leave_days = 0
+	for leave_app in leave_applications:
+		if leave_app.from_date >= getdate(from_date) and leave_app.to_date <= getdate(to_date):
+			leave_days += leave_app.total_leave_days
+		else:
+			if leave_app.from_date < getdate(from_date):
+				leave_app.from_date = from_date
+			if leave_app.to_date > getdate(to_date):
+				leave_app.to_date = to_date
+
+			leave_days += get_number_of_leave_days(employee, leave_type,
+				leave_app.from_date, leave_app.to_date)
+
+	return leave_days
+
+@frappe.whitelist()
+def get_leave_approver(employee, department=None):
+	if not department:
+		department = frappe.db.get_value('Employee', employee, 'department')
+
+	if department:
+		return frappe.db.get_value('Department Approver', {'parent': department,
+			'parentfield': 'leave_approver', 'idx': 1}, 'approver')
diff --git a/erpnext/hr/doctype/leave_application/leave_application_dashboard.html b/erpnext/hr/doctype/leave_application/leave_application_dashboard.html
new file mode 100644
index 0000000..2385b6a
--- /dev/null
+++ b/erpnext/hr/doctype/leave_application/leave_application_dashboard.html
@@ -0,0 +1,29 @@
+
+{% if data %}
+<h5 style="margin-top: 20px;"> {{ __("Allocated Leaves") }} </h5>
+<table class="table table-bordered small">
+	<thead>
+		<tr>
+			<th style="width: 20%">{{ __("Leave Type") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Total Allocated Leaves") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Used Leaves") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Pending Leaves") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Available Leaves") }}</th>
+		</tr>
+
+	</thead>
+	<tbody>
+		{% for(const [key, value] of Object.entries(data)) { %}
+			<tr>
+				<td> {%= key %} </td>
+				<td class="text-right"> {%= value["total_leaves"] %} </td>
+				<td class="text-right"> {%= value["leaves_taken"] %} </td>
+				<td class="text-right"> {%= value["pending_leaves"] %} </td>
+				<td class="text-right"> {%= value["remaining_leaves"] %} </td>
+			</tr>
+		{% } %}
+	</tbody>
+</table>
+{% } else { %}
+<p style="margin-top: 30px;"> No Leaves have been allocated. </p>
+{% } %}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index 4643e89..f7f688a 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -5,8 +5,9 @@
 import frappe
 import unittest
 
-from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
+from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError, NotAnOptionalHoliday, get_leave_balance_on
 from frappe.permissions import clear_user_permissions_for_doctype
+from frappe.utils import add_days, nowdate, now_datetime, get_datetime
 
 test_dependencies = ["Leave Allocation", "Leave Block List"]
 
@@ -70,7 +71,7 @@
 		add_role("test1@example.com", "Leave Approver")
 		clear_user_permissions_for_doctype("Employee")
 
-		frappe.db.set_value("Department", "_Test Department",
+		frappe.db.set_value("Department", "_Test Department - _TC",
 			"leave_block_list", "_Test Leave Block List")
 
 		make_allocation_record()
@@ -213,7 +214,7 @@
 		frappe.db.set_value("Leave Block List", "_Test Leave Block List",
 			"applies_to_all_departments", 1)
 		frappe.db.set_value("Employee", "_T-Employee-00002", "department",
-			"_Test Department")
+			"_Test Department - _TC")
 
 		frappe.set_user("test1@example.com")
 		application.insert()
@@ -224,6 +225,194 @@
 		frappe.db.set_value("Leave Block List", "_Test Leave Block List",
 			"applies_to_all_departments", 0)
 
+	def test_optional_leave(self):
+		leave_period = get_leave_period()
+		today = nowdate()
+		from datetime import date
+		holiday_list = frappe.get_doc(dict(
+			doctype = 'Holiday List',
+			holiday_list_name = 'test holiday list for optional holiday',
+			from_date = date(date.today().year, 1, 1),
+			to_date = date(date.today().year, 12, 31),
+			holidays = [
+				dict(holiday_date = today, description = 'test')
+			]
+		)).insert()
+		employee = get_employee()
+
+		frappe.db.set_value('Leave Period', leave_period.name, 'optional_holiday_list', holiday_list.name)
+		leave_type = frappe.get_doc(dict(
+			leave_type_name = 'Test Optional Type',
+			doctype = 'Leave Type',
+			is_optional_leave = 1
+		)).insert()
+
+		allocate_leaves(employee, leave_period, leave_type.name, 10)
+
+		date = add_days(today, - 1)
+
+		leave_application = frappe.get_doc(dict(
+			doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type.name,
+			from_date = date,
+			to_date = date,
+		))
+
+		# can only apply on optional holidays
+		self.assertTrue(NotAnOptionalHoliday, leave_application.insert)
+
+		leave_application.from_date = today
+		leave_application.to_date = today
+		leave_application.status = "Approved"
+		leave_application.insert()
+		leave_application.submit()
+
+		# check leave balance is reduced
+		self.assertEqual(get_leave_balance_on(employee.name, leave_type.name, today), 9)
+
+	def test_leaves_allowed(self):
+		employee = get_employee()
+		leave_period = get_leave_period()
+		frappe.delete_doc_if_exists("Leave Type", "Test Leave Type", force=1)
+		leave_type = frappe.get_doc(dict(
+			leave_type_name = 'Test Leave Type',
+			doctype = 'Leave Type',
+			max_leaves_allowed = 5
+		)).insert()
+
+		date = add_days(nowdate(), -7)
+
+		allocate_leaves(employee, leave_period, leave_type.name, 5)
+
+		leave_application = frappe.get_doc(dict(
+		doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type.name,
+			from_date = date,
+			to_date = add_days(date, 2),
+			company = "_Test Company",
+			docstatus = 1,
+            status = "Approved"
+		))
+
+		self.assertTrue(leave_application.insert())
+
+		leave_application = frappe.get_doc(dict(
+			doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type.name,
+			from_date = add_days(date, 4),
+			to_date = add_days(date, 7),
+			company = "_Test Company",
+			docstatus = 1,
+            status = "Approved"
+		))
+		self.assertRaises(frappe.ValidationError, leave_application.insert)
+
+	def test_applicable_after(self):
+		employee = get_employee()
+		leave_period = get_leave_period()
+		frappe.delete_doc_if_exists("Leave Type", "Test Leave Type", force=1)
+		leave_type = frappe.get_doc(dict(
+			leave_type_name = 'Test Leave Type',
+			doctype = 'Leave Type',
+			applicable_after = 15
+		)).insert()
+		date = add_days(nowdate(), -7)
+		frappe.db.set_value('Employee', employee.name, "date_of_joining", date)
+		allocate_leaves(employee, leave_period, leave_type.name, 10)
+
+		leave_application = frappe.get_doc(dict(
+			doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type.name,
+			from_date = date,
+			to_date = add_days(date, 4),
+			company = "_Test Company",
+			docstatus = 1,
+            status = "Approved"
+		))
+
+		self.assertRaises(frappe.ValidationError, leave_application.insert)
+
+		frappe.delete_doc_if_exists("Leave Type", "Test Leave Type 1", force=1)
+		leave_type_1 = frappe.get_doc(dict(
+			leave_type_name = 'Test Leave Type 1',
+			doctype = 'Leave Type'
+		)).insert()
+
+		allocate_leaves(employee, leave_period, leave_type_1.name, 10)
+
+		leave_application = frappe.get_doc(dict(
+		doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type_1.name,
+			from_date = date,
+			to_date = add_days(date, 4),
+			company = "_Test Company",
+			docstatus = 1,
+            status = "Approved"
+		))
+
+		self.assertTrue(leave_application.insert())
+		frappe.db.set_value('Employee', employee.name, "date_of_joining", "2010-01-01")
+
+	def test_max_continuous_leaves(self):
+		employee = get_employee()
+		leave_period = get_leave_period()
+		frappe.delete_doc_if_exists("Leave Type", "Test Leave Type", force=1)
+		leave_type = frappe.get_doc(dict(
+			leave_type_name = 'Test Leave Type',
+			doctype = 'Leave Type',
+			max_leaves_allowed = 15,
+			max_continuous_days_allowed = 3
+		)).insert()
+
+		date = add_days(nowdate(), -7)
+
+		allocate_leaves(employee, leave_period, leave_type.name, 10)
+
+		leave_application = frappe.get_doc(dict(
+			doctype = 'Leave Application',
+			employee = employee.name,
+			leave_type = leave_type.name,
+			from_date = date,
+			to_date = add_days(date, 4),
+			company = "_Test Company",
+			docstatus = 1,
+            status = "Approved"
+		))
+
+		self.assertRaises(frappe.ValidationError, leave_application.insert)
+
+	def test_earned_leave(self):
+		leave_period = get_leave_period()
+		employee = get_employee()
+
+		leave_type = frappe.get_doc(dict(
+			leave_type_name = 'Test Earned Leave Type',
+			doctype = 'Leave Type',
+			is_earned_leave = 1,
+			earned_leave_frequency = 'Monthly',
+			rounding = 0.5,
+			max_leaves_allowed = 6
+		)).insert()
+		leave_policy = frappe.get_doc({
+			"doctype": "Leave Policy",
+			"leave_policy_details": [{"leave_type": leave_type.name, "annual_allocation": 6}]
+		}).insert()
+		frappe.db.set_value("Employee", employee.name, "leave_policy", leave_policy.name)
+
+		allocate_leaves(employee, leave_period, leave_type.name, 0, eligible_leaves = 12)
+
+		from erpnext.hr.utils import allocate_earned_leaves
+		i = 0
+		while(i<14):
+			allocate_earned_leaves()
+			i += 1
+		self.assertEqual(get_leave_balance_on(employee.name, leave_type.name, nowdate()), 6)
+
 def make_allocation_record(employee=None, leave_type=None):
 	frappe.db.sql("delete from `tabLeave Allocation`")
 
@@ -237,4 +426,37 @@
 	})
 
 	allocation.insert(ignore_permissions=True)
-	allocation.submit()
\ No newline at end of file
+	allocation.submit()
+
+def get_employee():
+	return frappe.get_doc("Employee", "_T-Employee-00001")
+
+def get_leave_period():
+	leave_period_name = frappe.db.exists({
+		"doctype": "Leave Period",
+		"name": "Test Leave Period"
+	})
+	if leave_period_name:
+		return frappe.get_doc("Leave Period", leave_period_name[0][0])
+	else:
+		return frappe.get_doc(dict(
+				name = 'Test Leave Period',
+				doctype = 'Leave Period',
+				from_date = "{0}-01-01".format(now_datetime().year),
+				to_date = "{0}-12-31".format(now_datetime().year),
+				company = "_Test Company",
+				is_active = 1
+			)).insert()
+
+def allocate_leaves(employee, leave_period, leave_type, new_leaves_allocated, eligible_leaves=0):
+	frappe.get_doc({
+		"doctype": "Leave Allocation",
+		"__islocal": 1,
+		"employee": employee.name,
+		"employee_name": employee.employee_name,
+		"leave_type": leave_type,
+		"from_date": leave_period.from_date,
+		"to_date": leave_period.to_date,
+		"new_leaves_allocated": new_leaves_allocated,
+		"docstatus": 1
+	}).insert()
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index 16dbda8..fdb975b 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
@@ -207,7 +207,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
index 3abe406..0eb69a5 100644
--- a/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
+++ b/erpnext/hr/doctype/leave_block_list/test_leave_block_list.py
@@ -14,20 +14,20 @@
 
 	def test_get_applicable_block_dates(self):
 		frappe.set_user("test@example.com")
-		frappe.db.set_value("Department", "_Test Department", "leave_block_list",
+		frappe.db.set_value("Department", "_Test Department - _TC", "leave_block_list",
 			"_Test Leave Block List")
 		self.assertTrue(getdate("2013-01-02") in
 			[d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")])
 
 	def test_get_applicable_block_dates_for_allowed_user(self):
 		frappe.set_user("test1@example.com")
-		frappe.db.set_value("Department", "_Test Department 1", "leave_block_list",
+		frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list",
 			"_Test Leave Block List")
 		self.assertEqual([], [d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03")])
 
 	def test_get_applicable_block_dates_all_lists(self):
 		frappe.set_user("test1@example.com")
-		frappe.db.set_value("Department", "_Test Department 1", "leave_block_list",
+		frappe.db.set_value("Department", "_Test Department 1 - _TC", "leave_block_list",
 			"_Test Leave Block List")
 		self.assertTrue(getdate("2013-01-02") in
 			[d.block_date for d in get_applicable_block_dates("2013-01-01", "2013-01-03", all_lists=True)])
diff --git a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json
index fbc2991..fe10c78 100644
--- a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json
+++ b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json
@@ -42,7 +42,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json
index 1d0ac01..dbb9039 100644
--- a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json
+++ b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json
@@ -67,7 +67,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
index 0eb6414..7aeb8ea 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -26,6 +26,19 @@
 	refresh_field('no_of_days');
 }
 
-frappe.ui.form.on("Leave Control Panel", "refresh", function (frm) {
-	frm.disable_save();
+frappe.ui.form.on("Leave Control Panel", {
+	company: function(frm) {
+		if(frm.doc.company) {
+			frm.set_query("department", function() {
+				return {
+					"filters": {
+						"company": frm.doc.company,
+					}
+				};
+			});
+		}
+	},
+	refresh: function(frm) {
+		frm.disable_save();
+	}
 });
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index d3c3097..96a4681 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -39,6 +39,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -70,6 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -163,6 +167,71 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -191,6 +260,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -222,6 +292,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -252,6 +323,39 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_policy", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Policy", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Policy", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -279,9 +383,10 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -312,6 +417,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -341,6 +447,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -371,6 +478,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -385,7 +493,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 18:42:17.060492", 
+ "modified": "2018-04-13 16:17:15.115389", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Control Panel", 
@@ -393,7 +501,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
diff --git a/erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.py b/erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.py
new file mode 100644
index 0000000..9a907c8
--- /dev/null
+++ b/erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestLeaveControlPanel(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/leave_encashment/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/leave_encashment/__init__.py
diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.js b/erpnext/hr/doctype/leave_encashment/leave_encashment.js
new file mode 100644
index 0000000..701c2f0
--- /dev/null
+++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.js
@@ -0,0 +1,40 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Leave Encashment', {
+	setup: function(frm) {
+		frm.set_query("leave_type", function() {
+			return {
+				filters: {
+					allow_encashment: 1
+				}
+			}
+		})
+	},
+	refresh: function(frm) {
+		cur_frm.set_intro("");
+		if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) {
+			frm.set_intro(__("Fill the form and save it"));
+		}
+	},
+	employee: function(frm) {
+		frm.trigger("get_leave_details_for_encashment");
+	},
+	leave_type: function(frm) {
+		frm.trigger("get_leave_details_for_encashment");
+	},
+	encashment_date: function(frm) {
+		frm.trigger("get_leave_details_for_encashment");
+	},
+	get_leave_details_for_encashment: function(frm) {
+		if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type) {
+			return frappe.call({
+				method: "get_leave_details_for_encashment",
+				doc: frm.doc,
+				callback: function(r) {
+					frm.refresh_fields();
+					}
+			});
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.json b/erpnext/hr/doctype/leave_encashment/leave_encashment.json
new file mode 100644
index 0000000..e9a99fa
--- /dev/null
+++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.json
@@ -0,0 +1,576 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Leave-Encashment-.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 15:31:51.197046", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Leave Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Period", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Leave Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_allocation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Allocation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Leave Allocation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_balance", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Balance", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "encashable_days", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Encashable days", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Leave Encashment", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payroll", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "encashment_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Encashment Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "encashment_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Encashment Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "additional_salary", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Additional Salary", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Additional Salary", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-31 11:41:04.053874", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Encashment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.py b/erpnext/hr/doctype/leave_encashment/leave_encashment.py
new file mode 100644
index 0000000..a61210c
--- /dev/null
+++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import getdate, nowdate, flt
+from erpnext.hr.utils import set_employee_name
+from erpnext.hr.doctype.leave_application.leave_application import get_leave_balance_on
+from erpnext.hr.doctype.salary_structure_assignment.salary_structure_assignment import get_assigned_salary_structure
+
+class LeaveEncashment(Document):
+	def validate(self):
+		set_employee_name(self)
+		self.get_leave_details_for_encashment()
+
+		if not self.encashment_date:
+			self.encashment_date = getdate(nowdate())
+
+	def before_submit(self):
+		if self.encashment_amount <= 0:
+			frappe.throw(_("You can only submit Leave Encashment for a valid encashment amount"))
+
+	def on_submit(self):
+		if not self.leave_allocation:
+			self.leave_allocation = self.get_leave_allocation()
+		additional_salary = frappe.new_doc("Additional Salary")
+		additional_salary.company = frappe.get_value("Employee", self.employee, "company")
+		additional_salary.employee = self.employee
+		additional_salary.salary_component = frappe.get_value("Leave Type", self.leave_type, "earning_component")
+		additional_salary.from_date = self.encashment_date
+		additional_salary.to_date = self.encashment_date
+		additional_salary.amount = self.encashment_amount
+		additional_salary.submit()
+
+		self.db_set("additional_salary", additional_salary.name)
+
+		# Set encashed leaves in Allocation
+		frappe.db.set_value("Leave Allocation", self.leave_allocation, "total_leaves_encashed",
+				frappe.db.get_value('Leave Allocation', self.leave_allocation, 'total_leaves_encashed') + self.encashable_days)
+
+	def on_cancel(self):
+		if self.additional_salary:
+			frappe.get_doc("Additional Salary", self.additional_salary).cancel()
+			self.db_set("additional_salary", "")
+
+		if self.leave_allocation:
+			frappe.db.set_value("Leave Allocation", self.leave_allocation, "total_leaves_encashed",
+				frappe.db.get_value('Leave Allocation', self.leave_allocation, 'total_leaves_encashed') - self.encashable_days)
+
+	def get_leave_details_for_encashment(self):
+		salary_structure = get_assigned_salary_structure(self.employee, self.encashment_date or getdate(nowdate()))
+		if not salary_structure:
+			frappe.throw(_("No Salary Structure assigned for Employee {0} on given date {1}").format(self.employee, self.encashment_date))
+
+		if not frappe.db.get_value("Leave Type", self.leave_type, 'allow_encashment'):
+			frappe.throw(_("Leave Type {0} is not encashable").format(self.leave_type))
+
+		self.leave_balance = get_leave_balance_on(self.employee, self.leave_type,
+			self.encashment_date or getdate(nowdate()), consider_all_leaves_in_the_allocation_period=True)
+
+		encashable_days = self.leave_balance - frappe.db.get_value('Leave Type', self.leave_type, 'encashment_threshold_days')
+		self.encashable_days = encashable_days if encashable_days > 0 else 0
+
+		per_day_encashment = frappe.db.get_value('Salary Structure', salary_structure , 'leave_encashment_amount_per_day')
+		self.encashment_amount = self.encashable_days * per_day_encashment if per_day_encashment > 0 else 0
+
+		self.leave_allocation = self.get_leave_allocation()
+		return True
+
+	def get_leave_allocation(self):
+		leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation` where '{0}'
+		between from_date and to_date and docstatus=1 and leave_type='{1}'
+		and employee= '{2}'""".format(self.encashment_date or getdate(nowdate()), self.leave_type, self.employee))
+
+		return leave_allocation[0][0] if leave_allocation else None
diff --git a/erpnext/hr/doctype/leave_encashment/test_leave_encashment.js b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.js
new file mode 100644
index 0000000..cafd960
--- /dev/null
+++ b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Leave Encashment", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Leave Encashment
+		() => frappe.tests.make('Leave Encashment', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py
new file mode 100644
index 0000000..4af23b1
--- /dev/null
+++ b/erpnext/hr/doctype/leave_encashment/test_leave_encashment.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# class TestLeaveEncashment(unittest.TestCase):
+# 	def test_leave_balance_value_and_amount(self):
+# 		employee = get_employee()
+# 		leave_period = get_leave_period()
+# 		today = get_today()
+#
+# 		leave_type = frappe.get_doc(dict(
+# 			leave_type_name = 'Test Leave Type',
+# 			doctype = 'Leave Type',
+# 			allow_encashment = 1,
+# 			encashment_threshold_days = 3,
+# 			earning_component = 'Leave Encashment'
+# 		)).insert()
+#
+# 		allocate_leave(employee, leave_period, leave_type.name, 5)
+#
+# 		leave_encashment = frappe.get_doc(dict(
+# 			doctype = 'Leave Encashment',
+# 			employee = employee,
+# 			leave_period = leave_period,
+# 			leave_type = leave_type.name,
+# 			payroll_date = today
+# 		)).insert()
+#
+# 		self.assertEqual(leave_encashment.leave_balance, 5)
+# 		self.assertEqual(leave_encashment.encashable_days, 2)
+#
+# 		# TODO; validate value
+# 		salary_structure = get_current_structure(employee, today)
+# 		self.assertEqual(leave_encashment.encashment_value,
+# 			2 * frappe.db.get_value('Salary Structure', salary_structure, 'leave_encashment_amount_per_day'))
+
+
+		
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/leave_period/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/leave_period/__init__.py
diff --git a/erpnext/hr/doctype/leave_period/leave_period.js b/erpnext/hr/doctype/leave_period/leave_period.js
new file mode 100644
index 0000000..19633e2
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/leave_period.js
@@ -0,0 +1,36 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Leave Period', {
+	refresh: (frm)=>{
+		frm.set_df_property("grant_leaves", "hidden", frm.doc.__islocal ? 1:0);
+	},
+	from_date: (frm)=>{
+		if (frm.doc.from_date && !frm.doc.to_date) {
+			var a_year_from_start = frappe.datetime.add_months(frm.doc.from_date, 12);
+			frm.set_value("to_date", frappe.datetime.add_days(a_year_from_start, -1));
+		}
+	},
+	grant: (frm)=>{
+		frappe.call({
+			doc: frm.doc,
+			method: "grant_leave_allocation",
+			callback: function(r) {
+				if(!r.exc){
+					frm.reload_doc();
+				}
+			},
+			freeze: true,
+			freeze_message: __("Grant allocations......")
+		})
+	},
+	onload: (frm) => {
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			}
+		})
+	}
+});
diff --git a/erpnext/hr/doctype/leave_period/leave_period.json b/erpnext/hr/doctype/leave_period/leave_period.json
new file mode 100644
index 0000000..91f97e7
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/leave_period.json
@@ -0,0 +1,584 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 15:20:52.864288", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "optional_holiday_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Holiday List for Optional Leave", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Holiday List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "grant_leaves", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grant Leaves", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "filter_by", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Filter By", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grade", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Grade", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Grade", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "designation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Designation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grant", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "carry_forward_leaves", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Carry Forward Leaves", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 14:43:02.871669", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Period", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_period/leave_period.py b/erpnext/hr/doctype/leave_period/leave_period.py
new file mode 100644
index 0000000..39001ee
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/leave_period.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import getdate, cstr
+from frappe.model.document import Document
+from erpnext.hr.utils import validate_overlap, get_employee_leave_policy
+
+class LeavePeriod(Document):
+	def get_employees(self):
+		conditions, values = [], []
+		for field in ["grade", "designation", "department"]:
+			if self.get(field):
+				conditions.append("{0}=%s".format(field))
+				values.append(self.get(field))
+
+		condition_str = " and " + " and ".join(conditions) if len(conditions) else ""
+
+		e = frappe.db.sql("select name from tabEmployee where status='Active' {condition}"
+			.format(condition=condition_str), tuple(values))
+
+		return e
+
+	def validate(self):
+		self.validate_dates()
+		validate_overlap(self, self.from_date, self.to_date, self.company)
+
+	def grant_leave_allocation(self):
+		if self.employee:
+			self.grant_leave_alloc(self.employee)
+		else:
+			self.grant_leave_alloc_for_employees()
+
+	def grant_leave_alloc_for_employees(self):
+		employees = self.get_employees()
+		if employees:
+			for employee in employees:
+				self.grant_leave_alloc(cstr(employee[0]))
+		else:
+			frappe.msgprint(_("No employee found"))
+
+	def grant_leave_alloc(self, employee):
+		self.validate_allocation_exists(employee)
+		leave_policy = get_employee_leave_policy(employee)
+		if leave_policy:
+			for leave_policy_detail in leave_policy.leave_policy_details:
+				if not frappe.db.get_value("Leave Type", leave_policy_detail.leave_type, "is_lwp"):
+					self.create_leave_allocation(employee, leave_policy_detail.leave_type, leave_policy_detail.annual_allocation)
+
+	def validate_allocation_exists(self, employee):
+		leave_alloc = frappe.db.exists({
+				"doctype": "Leave Allocation",
+				"employee": employee,
+				"leave_period": self.name,
+				"docstatus": 1})
+		if leave_alloc:
+			frappe.throw(_("Employee {0} already have Leave Allocation {1} for this period").format(employee, leave_alloc[0][0])\
+			+ """ <b><a href="#Form/Leave Allocation/{0}">{0}</a></b>""".format(leave_alloc[0][0]))
+
+	def validate_dates(self):
+		if getdate(self.from_date) >= getdate(self.to_date):
+			frappe.throw(_("To date can not be equal or less than from date"))
+
+	def create_leave_allocation(self, employee, leave_type, new_leaves_allocated):
+		allocation = frappe.new_doc("Leave Allocation")
+		allocation.employee = employee
+		allocation.employee_name = frappe.db.get_value("Employee", employee, "employee_name")
+		allocation.leave_type = leave_type
+		allocation.from_date = self.from_date
+		allocation.to_date = self.to_date
+		'''Earned Leaves are allocated by scheduler, initially allocate 0'''
+		allocation.new_leaves_allocated = new_leaves_allocated if not frappe.db.get_value("Leave Type", leave_type, "is_earned_leave") else 0
+		allocation.leave_period = self.name
+		if self.carry_forward_leaves:
+			if frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
+				allocation.carry_forward = self.carry_forward_leaves
+		allocation.save(ignore_permissions = True)
+		allocation.submit()
+		frappe.msgprint(_("Leave Allocation {0} created").format(allocation.name))
diff --git a/erpnext/hr/doctype/leave_period/test_leave_period.js b/erpnext/hr/doctype/leave_period/test_leave_period.js
new file mode 100644
index 0000000..ec0a809
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/test_leave_period.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Leave Period", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Leave Period
+		() => frappe.tests.make('Leave Period', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/leave_period/test_leave_period.py b/erpnext/hr/doctype/leave_period/test_leave_period.py
new file mode 100644
index 0000000..3de9e60
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/test_leave_period.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# class TestLeavePeriod(unittest.TestCase):
+# 	def test_leave_grant(self):
+# 		employee = get_employee()
+# 		leave_policy = get_leave_policy()
+# 		leave_period = get_leave_period()
+#
+# 		frappe.db.set_value('Employee', employee, 'leave_policy', leave_policy)
+#
+# 		leave_period.employee = employee
+#
+# 		clear_leave_allocation(employee)
+#
+# 		leave_period.grant_leaves()
+#
+# 		for d in leave_policy:
+# 			self.assertEqual(get_leave_balance(employee, d.leave_type), d.annual_allocation)
+#
+# 		return leave_period
+#
+# 	def test_duplicate_grant(self):
+# 		leave_period = self.test_leave_grant()
+# 		self.assertRaises(DuplicateLeaveGrant, leave_period.grant_leaves)
+#
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/leave_policy/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/leave_policy/__init__.py
diff --git a/erpnext/hr/doctype/leave_policy/leave_policy.js b/erpnext/hr/doctype/leave_policy/leave_policy.js
new file mode 100644
index 0000000..fdf8e0c
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy/leave_policy.js
@@ -0,0 +1,31 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Leave Policy', {
+});
+
+frappe.ui.form.on('Leave Policy Detail',{
+	leave_type: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+		if(child.leave_type){
+			frappe.call({
+				method: "frappe.client.get_value",
+				args: {
+					doctype: "Leave Type",
+					fieldname: "max_leaves_allowed",
+					filters: { name: child.leave_type }
+				},
+				callback: function(r) {
+					if (r.message) {
+						child.annual_allocation = r.message.max_leaves_allowed;
+						refresh_field("leave_policy_details");
+					}
+				}
+			});
+		}
+		else{
+			child.annual_allocation = "";
+			refresh_field("leave_policy_details");
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/leave_policy/leave_policy.json b/erpnext/hr/doctype/leave_policy/leave_policy.json
new file mode 100644
index 0000000..13cd823
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy/leave_policy.json
@@ -0,0 +1,163 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "Leave-Policy-.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:06:19.507624", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_policy_details", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Policy Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Policy Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Leave Policy", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-14 13:13:27.915855", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Policy", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_policy/leave_policy.py b/erpnext/hr/doctype/leave_policy/leave_policy.py
new file mode 100644
index 0000000..964a5de
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy/leave_policy.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class LeavePolicy(Document):
+	def validate(self):
+		if self.leave_policy_details:
+			for lp_detail in self.leave_policy_details:
+				max_leaves_allowed = frappe.db.get_value("Leave Type", lp_detail.leave_type, "max_leaves_allowed")
+				if max_leaves_allowed > 0 and lp_detail.annual_allocation > max_leaves_allowed:
+					frappe.throw(_("Maximum leave allowed in the leave type {0} is {1}").format(lp_detail.leave_type, max_leaves_allowed))
diff --git a/erpnext/hr/doctype/leave_policy/test_leave_policy.js b/erpnext/hr/doctype/leave_policy/test_leave_policy.js
new file mode 100644
index 0000000..5404a63
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy/test_leave_policy.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Leave Policy", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Leave Policy
+		() => frappe.tests.make('Leave Policy', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/leave_policy/test_leave_policy.py b/erpnext/hr/doctype/leave_policy/test_leave_policy.py
new file mode 100644
index 0000000..3317ac3
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy/test_leave_policy.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestLeavePolicy(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/leave_policy_detail/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/leave_policy_detail/__init__.py
diff --git a/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.js b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.js
new file mode 100644
index 0000000..ee21f8d
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Leave Policy Detail', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.json b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.json
new file mode 100644
index 0000000..572b2f7
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.json
@@ -0,0 +1,104 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 16:01:20.928853", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "leave_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Leave Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "annual_allocation", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Annual Allocation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-14 13:00:34.511109", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Policy Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.py b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.py
new file mode 100644
index 0000000..c103f08
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy_detail/leave_policy_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class LeavePolicyDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.js b/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.js
new file mode 100644
index 0000000..1c8995b
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Leave Policy Detail", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Leave Policy Detail
+		() => frappe.tests.make('Leave Policy Detail', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.py b/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.py
new file mode 100644
index 0000000..610b1fa
--- /dev/null
+++ b/erpnext/hr/doctype/leave_policy_detail/test_leave_policy_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestLeavePolicyDetail(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index 9153bbf..8f7b5a8 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -1,254 +1,694 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:leave_type_name", 
- "creation": "2013-02-21 09:55:58", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:leave_type_name",
+ "beta": 0,
+ "creation": "2013-02-21 09:55:58",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "leave_type_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Leave Type Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "leave_type_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "leave_type_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Leave Type Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "leave_type_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "max_days_allowed", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Max Days Leave Allowed", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "max_days_allowed", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fieldname": "max_leaves_allowed",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Max Leaves Allowed",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "is_carry_forward", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Is Carry Forward", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_carry_forward", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "applicable_after",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Applicable After (Working Days)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "is_encash", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Is Encash", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_encash", 
-   "oldfieldtype": "Check", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "max_continuous_days_allowed",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Maximum Continuous Days Applicable",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "max_days_allowed",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "is_lwp", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Leave Without Pay", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "allow_negative", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Allow Negative Balance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_carry_forward",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Is Carry Forward",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "is_carry_forward",
+   "oldfieldtype": "Check",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "include_holiday", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Include holidays within leaves as leaves", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_lwp",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Leave Without Pay",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_optional_leave",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Optional Leave",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_negative",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Negative Balance",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "include_holiday",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Include holidays within leaves as leaves",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_compensatory",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Compensatory",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "encashment",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Encashment",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "allow_encashment",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Encashment",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "allow_encashment",
+   "fieldname": "encashment_threshold_days",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Encashment Threshold Days",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "allow_encashment",
+   "fieldname": "earning_component",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Earning Component",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Salary Component",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fieldname": "earned_leave",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Earned Leave",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_earned_leave",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Earned Leave",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "is_earned_leave",
+   "fieldname": "earned_leave_frequency",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Earned Leave Frequency",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Monthly\nQuarterly\nYearly",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0.5",
+   "depends_on": "is_earned_leave",
+   "fieldname": "rounding",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rounding",
+   "length": 0,
+   "no_copy": 0,
+   "options": "0.5\n1.0",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.659028", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Leave Type", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-flag",
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-06-03 18:32:51.803472",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Leave Type",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "HR User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "HR Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Employee", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 0,
+   "role": "Employee",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
   }
- ], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "track_changes": 0,
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/leave_type/test_leave_type.js b/erpnext/hr/doctype/leave_type/test_leave_type.js
index 4cde49b..d939a24 100644
--- a/erpnext/hr/doctype/leave_type/test_leave_type.js
+++ b/erpnext/hr/doctype/leave_type/test_leave_type.js
@@ -10,7 +10,7 @@
 		() => frappe.new_doc("Leave Type"),
 		() => frappe.timeout(1),
 		() => cur_frm.set_value("leave_type_name", "Test Leave type"),
-		() => cur_frm.set_value("max_days_allowed", "5"),
+		() => cur_frm.set_value("max_continuous_days_allowed", "5"),
 		() => frappe.click_check('Is Carry Forward'),
 		// save form
 		() => cur_frm.save(),
diff --git a/erpnext/hr/doctype/loan/loan.json b/erpnext/hr/doctype/loan/loan.json
index a073ec4..e305f54 100644
--- a/erpnext/hr/doctype/loan/loan.json
+++ b/erpnext/hr/doctype/loan/loan.json
@@ -400,7 +400,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "", 
+   "default": "",
+   "fetch_from": "loan_type.rate_of_interest",  
    "fieldname": "rate_of_interest", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -413,7 +414,7 @@
    "label": "Rate of Interest (%) / Year", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "loan_type.rate_of_interest", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -1072,7 +1073,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-08 15:32:58.948412", 
+ "modified": "2018-05-25 15:32:58.948412", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Loan", 
diff --git a/erpnext/hr/doctype/loan/test_loan.py b/erpnext/hr/doctype/loan/test_loan.py
index 6f87c2a..7a0401a 100644
--- a/erpnext/hr/doctype/loan/test_loan.py
+++ b/erpnext/hr/doctype/loan/test_loan.py
@@ -6,7 +6,7 @@
 import frappe
 import erpnext
 import unittest
-from frappe.utils import nowdate
+from frappe.utils import nowdate, add_days
 from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
 
 class TestLoan(unittest.TestCase):
@@ -58,6 +58,8 @@
 				"repayment_method": repayment_method,
 				"repayment_periods": repayment_periods,
 				"disbursement_date": nowdate(),
+				"repayment_start_date": add_days(nowdate(), 10),
+				"status": "Disbursed",
 				"mode_of_payment": frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name'),
 				"payment_account": frappe.db.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name"),
 				"loan_account": frappe.db.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name"),
diff --git a/erpnext/hr/doctype/loan_application/loan_application.json b/erpnext/hr/doctype/loan_application/loan_application.json
index ea305ef..44490df 100644
--- a/erpnext/hr/doctype/loan_application/loan_application.json
+++ b/erpnext/hr/doctype/loan_application/loan_application.json
@@ -491,6 +491,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "loan_type.rate_of_interest", 
    "fieldname": "rate_of_interest", 
    "fieldtype": "Percent", 
    "hidden": 0, 
@@ -503,7 +504,7 @@
    "label": "Rate of Interest", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "loan_type.rate_of_interest", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -718,7 +719,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-26 08:35:57.606555", 
+ "modified": "2018-05-25 08:35:57.606555", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Loan Application", 
diff --git a/erpnext/hr/doctype/offer_term/offer_term.json b/erpnext/hr/doctype/offer_term/offer_term.json
index cb059a1..3b7bd42 100644
--- a/erpnext/hr/doctype/offer_term/offer_term.json
+++ b/erpnext/hr/doctype/offer_term/offer_term.json
@@ -42,7 +42,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json
index 953cffa..fdd102e 100644
--- a/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json
+++ b/erpnext/hr/doctype/payroll_employee_detail/payroll_employee_detail.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -109,8 +113,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
    "fieldname": "department", 
-   "fieldtype": "Data", 
+   "fieldtype": "Link",
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -121,7 +126,7 @@
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.department", 
+   "options": "Department",
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -132,6 +137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -140,6 +146,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.designation",
    "fieldname": "designation", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -152,7 +159,7 @@
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.designation", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -163,6 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -176,7 +184,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-11-30 18:25:34.967999", 
+ "modified": "2018-05-17 10:32:12.974763",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Payroll Employee Detail", 
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
index 1e6dc51..d02e1f1 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
@@ -9,6 +9,14 @@
 			frm.doc.posting_date = frappe.datetime.nowdate();
 		}
 		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
+
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			};
+		});
 	},
 
 	refresh: function(frm) {
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
index 5cd1e53..54f1e45 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.json
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
@@ -41,6 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -70,6 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -103,6 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -167,6 +171,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -196,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -228,6 +234,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -259,6 +266,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -290,6 +298,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -319,6 +328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -349,6 +359,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -380,6 +391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -409,6 +421,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -441,6 +454,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -471,6 +485,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -502,35 +517,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -562,6 +549,99 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "deduct_tax_for_unclaimed_employee_benefits", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deduct Tax For Unclaimed Employee Benefits", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deduct Tax For Unsubmitted Tax Exemption Proof", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -592,6 +672,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -623,6 +704,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -652,6 +734,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -683,6 +766,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -712,6 +796,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -743,6 +828,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -775,6 +861,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -804,6 +891,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -834,6 +922,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -864,6 +953,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -878,7 +968,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-06 19:47:03.235021", 
+ "modified": "2018-04-27 12:42:45.054509", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Payroll Entry", 
@@ -887,7 +977,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 1025bc7..e70a5bd 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -38,18 +38,19 @@
 					ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s
 					{condition}""".format(condition=condition),
 				{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
-
 		if sal_struct:
-			cond += "and t2.parent IN %(sal_struct)s "
+			cond += "and t2.salary_structure IN %(sal_struct)s "
+			cond += "and ((%(from_date)s between t2.from_date and ifnull(t2.to_date, '2199-12-31')) or (%(to_date)s between t2.from_date and ifnull(t2.to_date, '2199-12-31')) or (t2.from_date between %(from_date)s and %(to_date)s))"
 			emp_list = frappe.db.sql("""
 				select
-					t1.name as employee, t1.employee_name, t1.department, t1.designation
+					t1.name as employee, t1.employee_name, t1.department, t1.designation, t2.name
 				from
-					`tabEmployee` t1, `tabSalary Structure Employee` t2
+					`tabEmployee` t1, `tabSalary Structure Assignment` t2
 				where
 					t1.docstatus!=2
 					and t1.name = t2.employee
-			%s """% cond, {"sal_struct": sal_struct}, as_dict=True)
+					and t2.docstatus = 1
+			%s """% cond, {"sal_struct": sal_struct, "from_date": self.start_date, "to_date": self.end_date}, as_dict=True)
 			return emp_list
 
 	def fill_employee_details(self):
@@ -183,7 +184,7 @@
 			Get loan details from submitted salary slip based on selected criteria
 		"""
 		cond = self.get_filter_condition()
-		return frappe.db.sql(""" select eld.loan_account,
+		return frappe.db.sql(""" select eld.loan_account, eld.loan,
 				eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment
 			from
 				`tabSalary Slip` t1, `tabSalary Slip Loan` eld
@@ -293,7 +294,7 @@
 					})
 
 				if data.interest_amount and not data.interest_income_account:
-					frappe.throw(_("Select interest income account in employee loan {0}").format(data.employee_loan))
+					frappe.throw(_("Select interest income account in loan {0}").format(data.loan))
 
 				if data.interest_income_account and data.interest_amount:
 					accounts.append({
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/payroll_period/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/payroll_period/__init__.py
diff --git a/erpnext/hr/doctype/payroll_period/payroll_period.js b/erpnext/hr/doctype/payroll_period/payroll_period.js
new file mode 100644
index 0000000..67caf9d
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period/payroll_period.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Payroll Period', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/payroll_period/payroll_period.json b/erpnext/hr/doctype/payroll_period/payroll_period.json
new file mode 100644
index 0000000..d3a9612
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period/payroll_period.json
@@ -0,0 +1,358 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "Prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 15:18:53.698553", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Periods", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "periods", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Periods", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Period Date", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Taxable Salary Slabs", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "taxable_salary_slabs", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Taxable Salary Slabs", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Taxable Salary Slab", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 12:29:07.207927", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Payroll Period", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_period/payroll_period.py b/erpnext/hr/doctype/payroll_period/payroll_period.py
new file mode 100644
index 0000000..66d6a45
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period/payroll_period.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import date_diff, getdate, formatdate
+from frappe.model.document import Document
+
+class PayrollPeriod(Document):
+	def validate(self):
+		self.validate_dates()
+		self.validate_overlap()
+
+	def validate_dates(self):
+		if getdate(self.start_date) > getdate(self.end_date):
+			frappe.throw(_("End date can not be less than start date"))
+
+	def validate_overlap(self):
+		query = """
+			select name
+			from `tab{0}`
+			where name != %(name)s
+			and company = %(company)s and (start_date between %(start_date)s and %(end_date)s \
+				or end_date between %(start_date)s and %(end_date)s \
+				or (start_date < %(start_date)s and end_date > %(end_date)s))
+			"""
+		if not self.name:
+			# hack! if name is null, it could cause problems with !=
+			self.name = "New "+self.doctype
+
+		overlap_doc = frappe.db.sql(query.format(self.doctype),{
+				"start_date": self.start_date,
+				"end_date": self.end_date,
+				"name": self.name,
+				"company": self.company
+			}, as_dict = 1)
+
+		if overlap_doc:
+			msg = _("A {0} exists between {1} and {2} (").format(self.doctype,
+				formatdate(self.start_date), formatdate(self.end_date)) \
+				+ """ <b><a href="#Form/{0}/{1}">{1}</a></b>""".format(self.doctype, overlap_doc[0].name) \
+				+ _(") for {0}").format(self.company)
+			frappe.throw(msg)
+
+def get_payroll_period_days(start_date, end_date, company):
+	payroll_period_dates = frappe.db.sql("""
+	select start_date, end_date from `tabPayroll Period`
+	where company=%(company)s
+	and (
+		(%(start_date)s between start_date and end_date)
+		or (%(end_date)s between start_date and end_date)
+		or (start_date between %(start_date)s and %(end_date)s)
+	)""", {
+		'company': company,
+		'start_date': start_date,
+		'end_date': end_date
+	})
+
+	if len(payroll_period_dates) > 0:
+		return date_diff(getdate(payroll_period_dates[0][1]), getdate(payroll_period_dates[0][0])) + 1
diff --git a/erpnext/hr/doctype/payroll_period/test_payroll_period.js b/erpnext/hr/doctype/payroll_period/test_payroll_period.js
new file mode 100644
index 0000000..8c4ded9
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period/test_payroll_period.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Payroll Period", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Payroll Period
+		() => frappe.tests.make('Payroll Period', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/payroll_period/test_payroll_period.py b/erpnext/hr/doctype/payroll_period/test_payroll_period.py
new file mode 100644
index 0000000..d06dc73
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period/test_payroll_period.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestPayrollPeriod(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/payroll_period_date/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/payroll_period_date/__init__.py
diff --git a/erpnext/hr/doctype/payroll_period_date/payroll_period_date.json b/erpnext/hr/doctype/payroll_period_date/payroll_period_date.json
new file mode 100644
index 0000000..29bd2a3
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period_date/payroll_period_date.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 15:17:30.513630", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 19:39:37.473294", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Payroll Period Date", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_period_date/payroll_period_date.py b/erpnext/hr/doctype/payroll_period_date/payroll_period_date.py
new file mode 100644
index 0000000..06ecb49
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_period_date/payroll_period_date.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PayrollPeriodDate(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/purpose_of_travel/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/purpose_of_travel/__init__.py
diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js
new file mode 100644
index 0000000..a9424d6
--- /dev/null
+++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Purpose of Travel', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json
new file mode 100644
index 0000000..68d2d6b
--- /dev/null
+++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.json
@@ -0,0 +1,93 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:purpose_of_travel", 
+ "beta": 0, 
+ "creation": "2018-05-15 07:00:30.933908", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purpose_of_travel", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purpose of Travel", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-15 07:05:26.219209", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Purpose of Travel", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py
new file mode 100644
index 0000000..62f62a5
--- /dev/null
+++ b/erpnext/hr/doctype/purpose_of_travel/purpose_of_travel.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PurposeofTravel(Document):
+	pass
diff --git a/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js
new file mode 100644
index 0000000..936c21c
--- /dev/null
+++ b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Purpose of Travel", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Purpose of Travel
+		() => frappe.tests.make('Purpose of Travel', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py
new file mode 100644
index 0000000..ccd950d
--- /dev/null
+++ b/erpnext/hr/doctype/purpose_of_travel/test_purpose_of_travel.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestPurposeofTravel(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/retention_bonus/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/retention_bonus/__init__.py
diff --git a/erpnext/hr/doctype/retention_bonus/retention_bonus.js b/erpnext/hr/doctype/retention_bonus/retention_bonus.js
new file mode 100644
index 0000000..58f6b53
--- /dev/null
+++ b/erpnext/hr/doctype/retention_bonus/retention_bonus.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Retention Bonus', {
+	setup: function(frm) {
+		frm.set_query("employee", function() {
+			return {
+				filters: {
+					"status": "Active"
+				}
+			};
+		});
+	},
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/retention_bonus/retention_bonus.json b/erpnext/hr/doctype/retention_bonus/retention_bonus.json
new file mode 100644
index 0000000..4406156
--- /dev/null
+++ b/erpnext/hr/doctype/retention_bonus/retention_bonus.json
@@ -0,0 +1,405 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "Retention-Bonus-.####", 
+ "beta": 0, 
+ "creation": "2018-05-13 14:59:42.038964", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bonus_payment_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Bonus Payment Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bonus_amount",
+   "fieldtype": "Currency",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Bonus Amount",
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Retention Bonus",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0,
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0,
+   "in_standard_filter": 0, 
+   "label": "Employee Name",
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "",
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1,
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0,
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department",
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department",
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1,
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.date_of_joining",
+   "fieldname": "date_of_joining",
+   "fieldtype": "Data",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Joining",
+   "length": 0, 
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0, 
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 10:36:01.865302",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Retention Bonus", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/retention_bonus/retention_bonus.py b/erpnext/hr/doctype/retention_bonus/retention_bonus.py
new file mode 100644
index 0000000..20d4c13
--- /dev/null
+++ b/erpnext/hr/doctype/retention_bonus/retention_bonus.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import getdate
+
+class RetentionBonus(Document):
+	def validate(self):
+		if frappe.get_value("Employee", self.employee, "status") == "Left":
+			frappe.throw(_("Cannot create Retention Bonus for left Employees"))
+		if getdate(self.bonus_payment_date) < getdate():
+			frappe.throw(_("Bonus Payment Date cannot be a past date"))
diff --git a/erpnext/hr/doctype/retention_bonus/test_retention_bonus.js b/erpnext/hr/doctype/retention_bonus/test_retention_bonus.js
new file mode 100644
index 0000000..a4b95d3
--- /dev/null
+++ b/erpnext/hr/doctype/retention_bonus/test_retention_bonus.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Retention Bonus", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Retention Bonus
+		() => frappe.tests.make('Retention Bonus', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/retention_bonus/test_retention_bonus.py b/erpnext/hr/doctype/retention_bonus/test_retention_bonus.py
new file mode 100644
index 0000000..eef4f14
--- /dev/null
+++ b/erpnext/hr/doctype/retention_bonus/test_retention_bonus.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestRetentionBonus(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js
index 86203ab..0b8bd12 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.js
+++ b/erpnext/hr/doctype/salary_component/salary_component.js
@@ -12,7 +12,50 @@
 					"is_group": 0,
 					"company": d.company
 				}
-			}
-		})
+			};
+		});
+		frm.set_query("earning_component_group", function() {
+			return {
+				filters: {
+					"is_group": 1,
+					"is_flexible_benefit": 1
+				}
+			};
+		});
+	},
+	is_flexible_benefit: function(frm) {
+		if(frm.doc.is_flexible_benefit){
+			set_value_for_condition_and_formula(frm);
+		}
+	},
+	type: function(frm) {
+		if(frm.doc.type=="Earning"){
+			frm.set_value("variable_based_on_taxable_salary", 0);
+		}
+		if(frm.doc.type=="Deduction"){
+			frm.set_value("is_flexible_benefit", 0);
+		}
+	},
+	variable_based_on_taxable_salary: function(frm) {
+		if(frm.doc.variable_based_on_taxable_salary){
+			set_value_for_condition_and_formula(frm);
+		}
+	},
+	create_separate_payment_entry_against_benefit_claim: function(frm) {
+		if(frm.doc.create_separate_payment_entry_against_benefit_claim){
+			frm.set_df_property("accounts", "reqd", 1);
+		}
+		else{
+			frm.set_df_property("accounts", "reqd", 0);
+		}
 	}
-});
\ No newline at end of file
+});
+
+var set_value_for_condition_and_formula = function(frm) {
+	frm.set_value("formula", null);
+	frm.set_value("condition", null);
+	frm.set_value("amount_based_on_formula", 0);
+	frm.set_value("statistical_component", 0);
+	frm.set_value("do_not_include_in_total", 0);
+	frm.set_value("depends_on_lwp", 0);
+};
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index 29d6015..f22bfc3 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:salary_component", 
@@ -12,6 +13,8 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,6 +25,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Name", 
@@ -37,9 +41,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -49,7 +56,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Abbr", 
@@ -66,10 +74,13 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "120px"
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -80,6 +91,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Type", 
@@ -96,9 +108,174 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.type == \"Earning\"", 
+   "fieldname": "is_additional_component", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Additional Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.type == \"Earning\"", 
+   "fieldname": "is_tax_applicable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Tax Applicable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "is_payable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Payable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -109,6 +286,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -124,19 +302,188 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "section_break_5", 
+   "depends_on": "eval:doc.type==\"Earning\"", 
+   "fieldname": "flexible_benefits", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Flexible Benefits", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_flexible_benefit", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Flexible Benefit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_flexible_benefit", 
+   "fieldname": "max_benefit_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Benefit Amount (Yearly)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_flexible_benefit", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_flexible_benefit && !doc.is_group", 
+   "fieldname": "earning_component_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Earning Component Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -151,9 +498,208 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_flexible_benefit", 
+   "fieldname": "is_pro_rata_applicable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Pro-rata Applicable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_flexible_benefit", 
+   "fieldname": "only_tax_impact", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Only Tax Impact (Cannot Claim But Part of Taxable Income)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_flexible_benefit", 
+   "fieldname": "create_separate_payment_entry_against_benefit_claim", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create Separate Payment Entry Against Benefit Claim", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.type=='Deduction'", 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "variable_based_on_taxable_salary", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variable Based On Taxable Salary", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_payable == 1", 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -164,6 +710,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Accounts", 
@@ -180,21 +727,348 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1", 
+   "fieldname": "condition_and_formula", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Condition and Formula", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "condition", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Condition", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ", 
+   "fieldname": "statistical_component", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Statistical Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depends_on_lwp", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Depends on Leave Without Pay", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "do_not_include_in_total", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Do not include in total", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "amount_based_on_formula", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount based on formula", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.amount_based_on_formula!==0", 
+   "fieldname": "formula", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Formula", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.amount_based_on_formula!==1", 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_28", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "help", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Help", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<h3>Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-16 12:44:37.733773", 
+ "modified": "2018-05-25 12:28:03.454487", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Component", 
@@ -203,7 +1077,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -211,7 +1084,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -223,10 +1095,12 @@
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_component/salary_component.py b/erpnext/hr/doctype/salary_component/salary_component.py
index 9108f31..7c92631 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.py
+++ b/erpnext/hr/doctype/salary_component/salary_component.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 from frappe.model.naming import append_number_if_name_exists
 
@@ -18,4 +17,4 @@
 
 		self.salary_component_abbr = self.salary_component_abbr.strip()
 		self.salary_component_abbr = append_number_if_name_exists('Salary Component', self.salary_component_abbr,
-			'salary_component_abbr', separator='_', filters={"name": ["!=", self.name]})
\ No newline at end of file
+			'salary_component_abbr', separator='_', filters={"name": ["!=", self.name]})
diff --git a/erpnext/hr/doctype/salary_component/test_salary_component.js b/erpnext/hr/doctype/salary_component/test_salary_component.js
new file mode 100644
index 0000000..c47d32d
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/test_salary_component.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Salary Component", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Salary Component
+		() => frappe.tests.make('Salary Component', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json
index 01d0277..a0d699a 100644
--- a/erpnext/hr/doctype/salary_detail/salary_detail.json
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.json
@@ -40,6 +40,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -49,6 +50,7 @@
    "collapsible": 0, 
    "columns": 1, 
    "depends_on": "eval:doc.parenttype=='Salary Structure'", 
+   "fetch_from": "salary_component.salary_component_abbr",
    "fieldname": "abbr", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -61,7 +63,7 @@
    "label": "Abbr", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "salary_component.salary_component_abbr", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -72,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +136,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -140,6 +145,100 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "is_tax_applicable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Tax Applicable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_flexible_benefit", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Flexible Benefit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "variable_based_on_taxable_salary", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variable Based On Taxable Salary", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_flexible_benefit != 1", 
    "fieldname": "section_break_2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -161,6 +260,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -192,6 +292,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -225,6 +326,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -258,6 +360,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -290,6 +393,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -321,6 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -351,6 +456,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -383,6 +489,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -413,6 +520,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -445,6 +553,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -458,7 +567,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-02 13:57:22.769751", 
+ "modified": "2018-05-22 15:11:02.341840", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Detail", 
@@ -473,4 +582,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 00deb0f..15a4653 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -14,6 +14,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,11 +42,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -74,15 +76,17 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name", 
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -97,7 +101,7 @@
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -107,17 +111,19 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department", 
    "fieldname": "department", 
-   "fieldtype": "Read Only", 
+   "fieldtype": "Link",
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -130,26 +136,28 @@
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Link", 
-   "options": "employee.department", 
+   "options": "Department", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1,
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "eval:doc.designation", 
+   "fetch_from": "employee.designation", 
    "fieldname": "designation", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -164,7 +172,7 @@
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Link", 
-   "options": "employee.designation", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -174,15 +182,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.branch", 
    "fieldname": "branch", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -197,7 +207,7 @@
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Link", 
-   "options": "employee.branch", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -207,11 +217,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -237,12 +248,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -270,11 +282,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -302,11 +315,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -333,11 +347,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -364,11 +379,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -394,11 +410,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -427,11 +444,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -459,11 +477,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -492,11 +511,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -522,11 +542,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -555,11 +576,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -589,11 +611,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -622,11 +645,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -655,11 +679,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -688,11 +713,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -720,11 +746,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -753,11 +780,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -783,11 +811,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -814,11 +843,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -846,11 +876,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -878,11 +909,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -910,11 +942,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -942,11 +975,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -972,11 +1006,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1005,11 +1040,107 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_32", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "deduct_tax_for_unclaimed_employee_benefits", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deduct Tax For Unclaimed Employee Benefits", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deduct Tax For Unsubmitted Tax Exemption Proof", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1036,11 +1167,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1067,12 +1199,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1102,11 +1235,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1133,12 +1267,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1167,11 +1302,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1198,11 +1334,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1231,11 +1368,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1260,11 +1398,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1293,11 +1432,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1325,11 +1465,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1343,7 +1484,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Loan", 
+   "label": "Employee Loan", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Salary Slip Loan", 
@@ -1357,11 +1498,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1387,11 +1529,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1420,11 +1563,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1453,11 +1597,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1483,11 +1628,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1516,11 +1662,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1547,11 +1694,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1581,11 +1729,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1611,11 +1760,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1642,11 +1792,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1672,11 +1823,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1705,7 +1857,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1720,7 +1872,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-26 05:16:47.169743", 
+ "modified": "2018-05-25 12:33:27.147636", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -1728,7 +1880,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -1744,12 +1895,10 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
-   "user_permission_doctypes": "[\"Branch\",\"Company\",\"Department\",\"Designation\",\"Fiscal Year\",\"Salary Slip\"]", 
    "write": 1
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1769,7 +1918,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1785,7 +1933,6 @@
    "set_user_permissions": 0, 
    "share": 0, 
    "submit": 0, 
-   "user_permission_doctypes": "[\"Employee\"]", 
    "write": 0
   }
  ], 
@@ -1799,4 +1946,4 @@
  "title_field": "employee_name", 
  "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 75eb73b..24ecf26 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -12,6 +12,10 @@
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
 from erpnext.utilities.transaction_base import TransactionBase
 from frappe.utils.background_jobs import enqueue
+from erpnext.hr.doctype.additional_salary.additional_salary import get_additional_salary_component
+from erpnext.hr.utils import get_payroll_period
+from erpnext.hr.doctype.employee_benefit_application.employee_benefit_application import get_benefit_component_amount
+from erpnext.hr.doctype.employee_benefit_claim.employee_benefit_claim import get_benefit_claim_amount
 
 class SalarySlip(TransactionBase):
 	def autoname(self):
@@ -58,6 +62,38 @@
 				if amount and struct_row.statistical_component == 0:
 					self.update_component_row(struct_row, amount, key)
 
+				if key=="earnings" and struct_row.is_flexible_benefit == 1:
+					self.add_employee_flexi_benefits(struct_row)
+
+				if key=="deductions" and struct_row.variable_based_on_taxable_salary:
+					tax_row, amount = self.calculate_variable_based_on_taxable_salary(struct_row.salary_component)
+					if tax_row and amount:
+						self.update_component_row(frappe._dict(tax_row), amount, key)
+
+		additional_components = get_additional_salary_component(self.employee, self.start_date, self.end_date)
+		if additional_components:
+			for additional_component in additional_components:
+				additional_component = frappe._dict(additional_component)
+				amount = additional_component.amount + self.get_amount_from_exisiting_component(frappe._dict(additional_component.struct_row).salary_component)
+				self.update_component_row(frappe._dict(additional_component.struct_row), amount, "earnings")
+
+	def add_employee_flexi_benefits(self, struct_row):
+		if frappe.db.get_value("Salary Component", struct_row.salary_component, "is_pro_rata_applicable") == 1:
+			benefit_component_amount = get_benefit_component_amount(self.employee, self.start_date, self.end_date, struct_row, self._salary_structure_doc)
+			if benefit_component_amount:
+				self.update_component_row(struct_row, benefit_component_amount, "earnings")
+		else:
+			benefit_claim_amount = get_benefit_claim_amount(self.employee, self.start_date, self.end_date, struct_row)
+			if benefit_claim_amount:
+				self.update_component_row(struct_row, benefit_claim_amount, "earnings")
+
+	def get_amount_from_exisiting_component(self, salary_component):
+		amount = 0
+		for d in self.get("earnings"):
+			if d.salary_component == salary_component:
+				amount = d.amount
+		return amount
+
 	def update_component_row(self, struct_row, amount, key):
 		component_row = None
 		for d in self.get(key):
@@ -104,8 +140,8 @@
 		'''Returns data for evaluating formula'''
 		data = frappe._dict()
 
-		data.update(frappe.get_doc("Salary Structure Employee",
-			{"employee": self.employee, "parent": self.salary_structure}).as_dict())
+		data.update(frappe.get_doc("Salary Structure Assignment",
+			{"employee": self.employee, "salary_structure": self.salary_structure}).as_dict())
 
 		data.update(frappe.get_doc("Employee", self.employee).as_dict())
 		data.update(self.as_dict())
@@ -166,10 +202,11 @@
 		if self.payroll_frequency:
 			cond = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
 
-		st_name = frappe.db.sql("""select parent from `tabSalary Structure Employee`
+		st_name = frappe.db.sql("""select salary_structure from `tabSalary Structure Assignment`
 			where employee=%s and (from_date <= %s or from_date <= %s)
 			and (to_date is null or to_date >= %s or to_date >= %s)
-			and parent in (select name from `tabSalary Structure`
+			and docstatus = 1
+			and salary_structure in (select name from `tabSalary Structure`
 				where is_active = 'Yes'%s)
 			"""% ('%s', '%s', '%s','%s','%s', cond),(self.employee, self.start_date, joining_date, self.end_date, relieving_date))
 
@@ -327,7 +364,7 @@
 	def sum_components(self, component_type, total_field):
 		joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
 			["date_of_joining", "relieving_date"])
-		
+
 		if not relieving_date:
 			relieving_date = getdate(self.end_date)
 
@@ -457,10 +494,176 @@
 			status = "Cancelled"
 		return status
 
+	def calculate_variable_based_on_taxable_salary(self, tax_component):
+		# TODO case both checked - restrict to and make this mandatory on final period of payroll?
+		# case only deduct_tax_for_unsubmitted_tax_exemption_proof checked not handled, calculate_variable_tax called
+		payroll_period = get_payroll_period(self.start_date, self.end_date, self.company)
+		if not payroll_period:
+			frappe.msgprint(_("Start and end dates not in a valid Payroll Period, \
+			cannot calculate {0}.").format(tax_component))
+			return False, False
+		if self.deduct_tax_for_unclaimed_employee_benefits and not self.deduct_tax_for_unsubmitted_tax_exemption_proof:
+			total_taxable_benefit = self.calculate_unclaimed_benefit_amount(payroll_period)
+			total_taxable_benefit += self.get_taxable_earnings(only_flexi=True)
+			return self.calculate_variable_tax(tax_component, payroll_period, benefit_amount=total_taxable_benefit)
+		elif self.deduct_tax_for_unclaimed_employee_benefits and self.deduct_tax_for_unsubmitted_tax_exemption_proof:
+			return self.calculate_tax_for_payroll_period(tax_component, payroll_period)
+		else:
+			return self.calculate_variable_tax(tax_component, payroll_period)
+
+	def calculate_variable_tax(self, tax_component, payroll_period, benefit_amount=0):
+		total_taxable_earning = self.get_taxable_earnings()
+		period_factor = self.get_period_factor(payroll_period.start_date, payroll_period.end_date)
+		annual_earning = total_taxable_earning * period_factor
+
+		# Calculate total exemption declaration
+		exemption_amount = 0
+		if frappe.db.exists("Employee Tax Exemption Declaration", {"employee": self.employee,
+		"payroll_period": payroll_period.name, "docstatus": 1}):
+			exemption_amount = frappe.db.get_value("Employee Tax Exemption Declaration",
+				{"employee": self.employee, "payroll_period": payroll_period.name, "docstatus": 1},
+				"total_exemption_amount")
+		annual_taxable_earning = annual_earning - exemption_amount
+
+		# Get tax calc by period
+		annual_tax = self.calculate_tax(payroll_period.name, annual_taxable_earning)
+
+		# Calc prorata tax
+		pro_rata_tax = annual_tax / period_factor
+		struct_row = self.get_salary_slip_row(tax_component)
+
+		# find the annual tax diff caused by benefit, add to pro_rata_tax
+		if benefit_amount > 0:
+			annual_tax_with_benefit = self.calculate_tax(payroll_period.name, annual_taxable_earning + benefit_amount)
+			pro_rata_tax += annual_tax_with_benefit - annual_tax
+		return struct_row, pro_rata_tax
+
+	def calculate_tax_for_payroll_period(self, tax_component, payroll_period):
+		# get total taxable income, total tax paid in payroll period
+		taxable_income, tax_paid = self.get_tax_detail_till_date(payroll_period, tax_component)
+		total_tax_exemption_proof = 0
+		if self.deduct_tax_for_unsubmitted_tax_exemption_proof:
+			sum_exemption_proof = frappe.db.sql("""select sum(total_amount) from
+			`tabEmployee Tax Exemption Proof Submission` where payroll_period='{0}' and docstatus=1
+			and employee='{1}'""".format(payroll_period.name, self.employee))
+			if sum_exemption_proof and sum_exemption_proof[0][0]:
+				total_tax_exemption_proof = sum_exemption_proof[0][0]
+		total_benefit_claim = 0
+		if self.deduct_tax_for_unclaimed_employee_benefits:
+			sum_benefit_claim = frappe.db.sql("""select sum(claimed_amount) from
+			`tabEmployee Benefit Claim` where docstatus=1 and employee='{0}' and claim_date between
+			'{1}' and '{2}'""".format(self.employee, payroll_period.start_date, self.end_date))
+			if sum_benefit_claim and sum_benefit_claim[0][0]:
+				total_benefit_claim = sum_benefit_claim[0][0]
+		total_taxable_earning = taxable_income - total_tax_exemption_proof - total_benefit_claim
+		# add taxable earnings of current salary_slip, include flexi
+		total_taxable_earning += self.get_taxable_earnings(include_flexi=1)
+		# calc annual tax by tax slab
+		annual_tax = self.calculate_tax(payroll_period.name, total_taxable_earning)
+		# get balance amount to tax, even if -ve add to deduction
+		pay_slip_tax = annual_tax - tax_paid
+		struct_row = self.get_salary_slip_row(tax_component)
+		return struct_row, pay_slip_tax
+
+	def calculate_unclaimed_benefit_amount(self, payroll_period):
+		total_benefit = 0
+		start_date = payroll_period.start_date
+		# if tax for unclaimed benefit deducted earlier set the start date
+		last_deducted =	frappe.db.sql("""select end_date from `tabSalary Slip` where
+				deduct_tax_for_unclaimed_employee_benefits=1 and docstatus=1 and
+				employee='{0}' and start_date between '{1}' and '{2}' and end_date
+				between '{1}' and '{2}' order by end_date desc limit 1""".format(
+				self.employee, payroll_period.start_date, payroll_period.end_date))
+		if last_deducted and last_deducted[0][0]:
+			start_date = getdate(last_deducted[0][0])
+		sum_benefit = frappe.db.sql("""select sum(sd.amount) from `tabSalary Detail` sd join
+					`tabSalary Slip` ss on sd.parent=ss.name where sd.parentfield='earnings'
+					and sd.is_tax_applicable=1 and is_flexible_benefit=1 and ss.docstatus=1
+					and ss.employee='{0}' and ss.start_date between '{1}' and '{2}' and
+					ss.end_date between '{1}' and '{2}'""".format(self.employee,
+					start_date, payroll_period.end_date))
+		if sum_benefit and sum_benefit[0][0]:
+			total_benefit = sum_benefit[0][0]
+		total_benefit_claim = 0
+		sum_benefit_claim = frappe.db.sql("""select sum(claimed_amount) from
+		`tabEmployee Benefit Claim` where docstatus=1 and employee='{0}' and claim_date
+		between '{1}' and '{2}'""".format(self.employee, start_date, self.end_date))
+		if sum_benefit_claim and sum_benefit_claim[0][0]:
+			total_benefit_claim = sum_benefit_claim[0][0]
+		return total_benefit - total_benefit_claim
+
+	def get_taxable_earnings(self, include_flexi=0, only_flexi=0):
+		# TODO remove this, iterate in self.earnings. map_doc fails to copy field values from Salary Structure to Slary Slip
+		tax_applicable_components = []
+		for earning in self._salary_structure_doc.earnings:
+			if only_flexi:
+				if earning.is_tax_applicable and earning.is_flexible_benefit:
+					tax_applicable_components.append(earning.salary_component)
+				continue
+			if include_flexi:
+				if earning.is_tax_applicable or (earning.is_tax_applicable and earning.is_flexible_benefit):
+					tax_applicable_components.append(earning.salary_component)
+			else:
+				if earning.is_tax_applicable and not earning.is_flexible_benefit:
+					tax_applicable_components.append(earning.salary_component)
+
+		taxable_earning = 0
+		for earning in self.earnings:
+			if earning.salary_component in tax_applicable_components:
+				taxable_earning += earning.amount
+		return taxable_earning
+
+	def calculate_tax(self, payroll_period, annual_earning):
+		payroll_period_obj = frappe.get_doc("Payroll Period", payroll_period)
+		taxable_amount = 0
+		for slab in payroll_period_obj.taxable_salary_slabs:
+			if annual_earning > slab.from_amount and annual_earning < slab.to_amount:
+				taxable_amount += (annual_earning - slab.from_amount) * slab.percent_deduction *.01
+			elif annual_earning > slab.from_amount and annual_earning > slab.to_amount:
+				taxable_amount += (slab.to_amount - slab.from_amount) * slab.percent_deduction * .01
+		return taxable_amount
+
+	def get_period_factor(self, start_date, end_date):
+		# period length is hard coded to keep tax calc consistent
+		frequency_days = {"Daily": 1, "Weekly": 7, "Fortnightly": 15, "Monthly": 30, "Bimonthly": 60}
+		payroll_days = date_diff(end_date, start_date) + 1
+		return flt(payroll_days)/frequency_days[self.payroll_frequency]
+
+	def get_tax_detail_till_date(self, payroll_period, tax_component):
+		total_taxable_income = 0
+		total_tax_paid = 0
+		sum_income = frappe.db.sql("""select sum(sd.amount) from `tabSalary Detail` sd join
+					`tabSalary Slip` ss on sd.parent=ss.name where sd.parentfield='earnings'
+					and sd.is_tax_applicable=1 and ss.docstatus=1 and ss.employee='{0}' and
+					ss.start_date between '{1}' and '{2}' and ss.end_date between '{1}' and
+					'{2}'""".format(self.employee, payroll_period.start_date,
+							payroll_period.end_date))
+		if sum_income and sum_income[0][0]:
+			total_taxable_income = sum_income[0][0]
+		sum_tax_paid = frappe.db.sql("""select sum(sd.amount) from `tabSalary Detail` sd join
+					`tabSalary Slip` ss on sd.parent=ss.name where sd.parentfield='deductions'
+					and sd.salary_component='{0}' and sd.variable_based_on_taxable_salary=1 and
+					ss.docstatus=1 and ss.employee='{1}' and ss.start_date between '{2}' and
+					'{3}' and ss.end_date between '{2}' and '{3}'""".format(tax_component,
+					self.employee, payroll_period.start_date, payroll_period.end_date))
+		if sum_tax_paid and sum_tax_paid[0][0]:
+			total_tax_paid = sum_tax_paid[0][0]
+		return total_taxable_income, total_tax_paid
+
+	def get_salary_slip_row(self, salary_component):
+		component = frappe.get_doc("Salary Component", salary_component)
+		# Data for update_component_row
+		struct_row = {}
+		struct_row['depends_on_lwp'] = component.depends_on_lwp
+		struct_row['salary_component'] = component.name
+		struct_row['abbr'] = component.salary_component_abbr
+		struct_row['do_not_include_in_total'] = component.do_not_include_in_total
+		return struct_row
+
 def unlink_ref_doc_from_salary_slip(ref_no):
 	linked_ss = frappe.db.sql_list("""select name from `tabSalary Slip`
 	where journal_entry=%s and docstatus < 2""", (ref_no))
 	if linked_ss:
 		for ss in linked_ss:
 			ss_doc = frappe.get_doc("Salary Slip", ss)
-			frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")
\ No newline at end of file
+			frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index cced29d..b10df8b 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -7,6 +7,7 @@
 import erpnext
 import calendar
 from erpnext.accounts.utils import get_fiscal_year
+from frappe.utils.make_random import get_random
 from frappe.utils import getdate, nowdate, add_days, add_months, flt
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
 from erpnext.hr.doctype.payroll_entry.test_payroll_entry import get_salary_component_account
@@ -269,36 +270,31 @@
 
 def make_salary_structure(sal_struct, payroll_frequency, employee):
 	if not frappe.db.exists('Salary Structure', sal_struct):
-		frappe.get_doc({
+		salary_structure = frappe.get_doc({
 			"doctype": "Salary Structure",
 			"name": sal_struct,
-			"company": erpnext.get_default_company(),
-			"employees": get_employee_details(employee),
+			"company": "_Test Company",
 			"earnings": get_earnings_component(),
 			"deductions": get_deductions_component(),
 			"payroll_frequency": payroll_frequency,
-			"payment_account": frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+			"payment_account": get_random("Account")
 		}).insert()
+		create_salary_structure_assignment(employee, salary_structure)
 
-	elif not frappe.db.get_value("Salary Structure Employee",{'parent':sal_struct, 'employee':employee},'name'):
-		sal_struct = frappe.get_doc("Salary Structure", sal_struct)
-		sal_struct.append("employees", {"employee": employee,
-			"employee_name": employee,
-			"base": 32000,
-			"variable": 3200,
-			"from_date": add_months(nowdate(),-1)
-			})
-		sal_struct.save()
-		sal_struct = sal_struct.name
+	elif not frappe.db.get_value("Salary Structure Assignment",{'salary_structure':sal_struct, 'employee':employee},'name'):
+		create_salary_structure_assignment(employee, sal_struct)
 	return sal_struct
 
-def get_employee_details(employee):
-	return [{"employee": employee,
-			"base": 50000,
-			"variable": 5000,
-			"from_date": add_months(nowdate(),-1)
-			}
-		]
+def create_salary_structure_assignment(employee, salary_structure):
+	salary_structure_assignment = frappe.new_doc("Salary Structure Assignment")
+	salary_structure_assignment.employee = employee
+	salary_structure_assignment.base = 50000
+	salary_structure_assignment.variable = 5000
+	salary_structure_assignment.from_date = add_months(nowdate(), -1)
+	salary_structure_assignment.salary_structure = salary_structure
+	salary_structure_assignment.company = erpnext.get_default_company()
+	salary_structure_assignment.save(ignore_permissions=True)
+	return salary_structure_assignment
 
 def get_earnings_component():
 	return [
@@ -353,4 +349,4 @@
 					"formula": 'base*.1',
 					"idx": 3
 				}
-			]
\ No newline at end of file
+			]
diff --git a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json
index 52f829e..7a9393c 100644
--- a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json
+++ b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json
@@ -67,7 +67,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index bdf3c22..56f5992 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -2,7 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 {% include "erpnext/public/js/controllers/accounts.js" %}
 
-cur_frm.add_fetch('employee', 'company', 'company');
 cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');
 
 
@@ -20,7 +19,9 @@
 		frm.set_query("salary_component", "earnings", function() {
 			return {
 				filters: {
-					type: "earning"
+					type: "earning",
+					is_additional_component: 0,
+					is_group: 0
 				}
 			}
 		});
@@ -31,14 +32,6 @@
 				}
 			}
 		});
-		frm.set_query("employee", "employees", function(doc) {
-			return {
-				query: "erpnext.controllers.queries.employee_query",
-				filters: {
-					company: doc.company
-				}
-			}
-		});
 		frm.set_query("payment_account", function () {
 			var account_types = ["Bank", "Cash"];
 			return {
@@ -56,63 +49,18 @@
 		frm.fields_dict['earnings'].grid.set_column_disp("default_amount", false);
 		frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
 
-		frm.add_custom_button(__("Preview Salary Slip"),
-			function() { frm.trigger('preview_salary_slip'); }, "fa fa-sitemap", "btn-default");
-
-		frm.add_custom_button(__("Add Employees"),function () {
-			frm.trigger('add_employees')
-		})
-
-	},
-
-	add_employees:function (frm) {
-		frm.$emp_dialog = new frappe.ui.Dialog({
-			title: __("Add Employees"),
-			fields: [
-				{fieldname:'company', fieldtype:'Link', options: 'Company', label: __('Company')},
-				{fieldname:'branch', fieldtype:'Link', options: 'Branch', label: __('Branch')},
-				{fieldname:'department', fieldtype:'Link', options: 'Department', label: __('Department')},
-				{fieldname:'designation', fieldtype:'Link', options: 'Designation', label: __('Designation')},
-				{fieldname:'base_variable', fieldtype:'Section Break'},
-				{fieldname:'base', fieldtype:'Currency', label: __('Base')},
-				{fieldname:'base_col_br', fieldtype:'Column Break'},
-				{fieldname:'variable', fieldtype:'Currency', label: __('Variable')}
-			]
+		frm.add_custom_button(__("Preview Salary Slip"), function() {
+			frm.trigger('preview_salary_slip');
 		});
-		frm.$emp_dialog.set_primary_action(__("Add"), function() {
-			frm.trigger('get_employees');
-		});
-		frm.$emp_dialog.show();
-	},
 
-	get_employees:function (frm) {
-		var filters = frm.$emp_dialog.get_values();
-		if ('variable' in filters) {
-			delete filters.variable
+		if(frm.doc.docstatus==1) {
+			frm.add_custom_button(__("Assign Salary Structure"), function() {
+				var doc = frappe.model.get_new_doc('Salary Structure Assignment');
+				doc.salary_structure = frm.doc.name;
+				doc.company = frm.doc.company;
+				frappe.set_route('Form', 'Salary Structure Assignment', doc.name);
+			});
 		}
-		if ('base' in filters) {
-			delete filters.base
-		}
-		frappe.call({
-			method:'erpnext.hr.doctype.salary_structure.salary_structure.get_employees',
-			args:{
-				filters: filters
-			},
-			callback:function (r) {
-				var employees = $.map(frm.doc.employees, function(d) { return d.employee });
-				for (var i=0; i< r.message.length; i++) {
-					if (employees.indexOf(r.message[i].name) === -1) {
-						var row = frappe.model.add_child(frm.doc, frm.fields_dict.employees.df.options, frm.fields_dict.employees.df.fieldname);
-						row.employee = r.message[i].name;
-						row.employee_name = r.message[i].employee_name;
-						row.base = frm.$emp_dialog.get_value('base');
-						row.variable = frm.$emp_dialog.get_value('variable');
-					}
-				}
-				frm.refresh_field('employees');
-				frm.$emp_dialog.hide()
-			}
-		})
 	},
 
 	salary_slip_based_on_timesheet: function(frm) {
@@ -120,38 +68,54 @@
 	},
 
 	preview_salary_slip: function(frm) {
-		var d = new frappe.ui.Dialog({
-			title: __("Preview Salary Slip"),
-			fields: [
-				{	"fieldname":"employee", "fieldtype":"Select", "label":__("Employee"),
-					options: $.map(frm.doc.employees, function(d) { return d.employee }), reqd: 1 },
-				{	fieldname:"fetch", "label":__("Show Salary Slip"), "fieldtype":"Button"}
-			]
-		});
-		d.get_input("fetch").on("click", function() {
-			var values = d.get_values();
-			if(!values) return;
-			var print_format;
-			frm.doc.salary_slip_based_on_timesheet ?
-				print_format="Salary Slip based on Timesheet" :
-				print_format="Salary Slip Standard";
+		frappe.call({
+			method: "erpnext.hr.doctype.salary_structure.salary_structure.get_employees",
+			args: {
+				salary_structure: frm.doc.name
+			},
+			callback: function(r) {
+				var employees = r.message;
+				var d = new frappe.ui.Dialog({
+					title: __("Preview Salary Slip"),
+					fields: [
+						{
+							"label":__("Employee"),
+							"fieldname":"employee",
+							"fieldtype":"Select",
+							options: employees
+						}, {
+							fieldname:"fetch",
+							"label":__("Show Salary Slip"),
+							"fieldtype":"Button"
+						}
+					]
+				});
+				d.get_input("fetch").on("click", function() {
+					var values = d.get_values();
+					if(!values) return;
+					var print_format;
+					frm.doc.salary_slip_based_on_timesheet ?
+						print_format="Salary Slip based on Timesheet" :
+						print_format="Salary Slip Standard";
 
-			frappe.call({
-				method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
-				args: {
-					source_name: frm.doc.name,
-					employee: values.employee,
-					as_print: 1,
-					print_format: print_format
-				},
-				callback: function(r) {
-					var new_window = window.open();
-					new_window.document.write(r.message);
-					// frappe.msgprint(r.message);
-				}
-			});
+					frappe.call({
+						method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
+						args: {
+							source_name: frm.doc.name,
+							employee: values.employee,
+							as_print: 1,
+							print_format: print_format
+						},
+						callback: function(r) {
+							var new_window = window.open();
+							new_window.document.write(r.message);
+							// frappe.msgprint(r.message);
+						}
+					});
+				});
+				d.show();
+			}
 		});
-		d.show();
 	},
 
 	toggle_fields: function(frm) {
@@ -161,15 +125,6 @@
 	}
 });
 
-frappe.ui.form.on('Salary Structure Employee', {
-	from_date: function(frm, cdt, cdn) {
-		validate_date(frm, cdt, cdn);
-	},
-	to_date: function(frm, cdt, cdn) {
-		validate_date(frm, cdt, cdn);
-	}
-});
-
 var validate_date = function(frm, cdt, cdn) {
 	var doc = locals[cdt][cdn];
 	if(doc.to_date && doc.from_date) {
@@ -211,7 +166,6 @@
 
 cur_frm.cscript.validate = function(doc, cdt, cdn) {
 	calculate_totals(doc);
-	if(doc.employee && doc.is_active == "Yes") frappe.model.clear_doc("Employee", doc.employee);
 }
 
 
@@ -226,5 +180,49 @@
 
 	deductions_remove: function(frm) {
 		calculate_totals(frm.doc);
+	},
+
+	salary_component: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+		if(child.salary_component){
+			frappe.call({
+				method: "frappe.client.get",
+				args: {
+					doctype: "Salary Component",
+					name: child.salary_component
+				},
+				callback: function(data) {
+					if(data.message){
+						var result = data.message;
+						frappe.model.set_value(cdt, cdn, 'condition', result.condition);
+						frappe.model.set_value(cdt, cdn, 'amount_based_on_formula', result.amount_based_on_formula);
+						if(result.amount_based_on_formula == 1){
+							frappe.model.set_value(cdt, cdn, 'formula', result.formula);
+						}
+						else{
+							frappe.model.set_value(cdt, cdn, 'amount', result.amount);
+						}
+						frappe.model.set_value(cdt, cdn, 'statistical_component', result.statistical_component);
+						frappe.model.set_value(cdt, cdn, 'depends_on_lwp', result.depends_on_lwp);
+						frappe.model.set_value(cdt, cdn, 'do_not_include_in_total', result.do_not_include_in_total);
+						frappe.model.set_value(cdt, cdn, 'variable_based_on_taxable_salary', result.variable_based_on_taxable_salary);
+						frappe.model.set_value(cdt, cdn, 'is_tax_applicable', result.is_tax_applicable);
+						frappe.model.set_value(cdt, cdn, 'is_flexible_benefit', result.is_flexible_benefit);
+						refresh_field("earnings");
+						refresh_field("deductions");
+					}
+				}
+			});
+		}
+	},
+
+	amount_based_on_formula: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+		if(child.amount_based_on_formula == 1){
+			frappe.model.set_value(cdt, cdn, 'amount', null);
+		}
+		else{
+			frappe.model.set_value(cdt, cdn, 'formula', null);
+		}
 	}
 })
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 945ebd0..5480c0e 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -40,6 +40,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -99,6 +101,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -133,6 +136,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -166,6 +170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -198,67 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Select employees for current Salary Structure", 
-   "fieldname": "employees", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employees", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Salary Structure Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -289,6 +234,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -320,6 +266,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -349,6 +296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -382,6 +330,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -414,6 +363,69 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_encashment_amount_per_day", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Encashment Amount Per Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "max_benefits", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Benefits (Amount)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -448,6 +460,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -479,6 +492,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -513,6 +527,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -544,6 +559,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -577,6 +593,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -607,6 +624,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -635,6 +653,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
@@ -668,6 +687,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -700,6 +720,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -730,6 +751,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -760,6 +782,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -791,6 +814,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -820,6 +844,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -851,6 +876,38 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Salary Structure", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -861,22 +918,21 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "is_submittable": 0, 
+ "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-10 18:45:07.120254", 
+ "modified": "2018-04-14 16:05:11.002259", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
  "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
+   "amend": 1, 
+   "cancel": 1, 
    "create": 1, 
-   "delete": 0, 
+   "delete": 1, 
    "email": 1, 
    "export": 0, 
    "if_owner": 0, 
@@ -888,13 +944,12 @@
    "role": "HR User", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 0, 
+   "submit": 1, 
    "write": 1
   }, 
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
+   "amend": 1, 
+   "cancel": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -908,7 +963,7 @@
    "role": "HR Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 0, 
+   "submit": 1, 
    "write": 1
   }
  ], 
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index d8b56e3..12e3445 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -4,65 +4,21 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import flt, cint, getdate
+from frappe.utils import flt, cint
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from frappe.model.document import Document
-from erpnext.hr.utils import set_employee_name
 
 class SalaryStructure(Document):
-	
 	def validate(self):
 		self.validate_amount()
-		for e in self.get('employees'):
-			set_employee_name(e)
-		self.validate_date()
 		self.strip_condition_and_formula_fields()
-
-	def get_ss_values(self,employee):
-		basic_info = frappe.db.sql("""select bank_name, bank_ac_no
-			from `tabEmployee` where name =%s""", employee)
-		ret = {'bank_name': basic_info and basic_info[0][0] or '',
-			'bank_ac_no': basic_info and basic_info[0][1] or ''}
-		return ret
+		self.validate_max_benefits_with_flexi()
 
 	def validate_amount(self):
 		if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet:
 			frappe.throw(_("Net pay cannot be negative"))
 
-	def validate_date(self):
-		for employee in self.get('employees'):
-			joining_date, relieving_date = frappe.db.get_value("Employee", employee.employee,
-				["date_of_joining", "relieving_date"])
-
-			if employee.from_date and joining_date and getdate(employee.from_date) < joining_date:
-				frappe.throw(_("From Date {0} for Employee {1} cannot be before employee's joining Date {2}")
-					    .format(employee.from_date, employee.employee, joining_date))
-
-		st_name = frappe.db.sql("""select parent from `tabSalary Structure Employee`
-			where
-			employee=%(employee)s
-			and (
-				(%(from_date)s between from_date and ifnull(to_date, '2199-12-31'))
-				or (%(to_date)s between from_date and ifnull(to_date, '2199-12-31'))
-				or (from_date between %(from_date)s and %(to_date)s)
-			)
-			and (
-				exists (select name from `tabSalary Structure`
-				where name = `tabSalary Structure Employee`.parent and is_active = 'Yes')
-			)
-			and parent != %(salary_struct)s""",
-			{
-				'employee': employee.employee,
-				'from_date': employee.from_date,
-				'to_date': (employee.to_date or '2199-12-31'),
-				'salary_struct': self.name
-			})
-
-		if st_name:
-			frappe.throw(_("Active Salary Structure {0} found for employee {1} for the given dates")
-				.format(st_name[0][0], employee.employee))
-
 	def strip_condition_and_formula_fields(self):
 		# remove whitespaces from condition and formula fields
 		for row in self.earnings:
@@ -73,12 +29,30 @@
 			row.condition = row.condition.strip() if row.condition else ""
 			row.formula = row.formula.strip() if row.formula else ""
 
+	def validate_max_benefits_with_flexi(self):
+		have_a_flexi = False
+		if self.earnings:
+			flexi_amount = 0
+			for earning_component in self.earnings:
+				if earning_component.is_flexible_benefit == 1:
+					have_a_flexi = True
+					max_of_component = frappe.db.get_value("Salary Component", earning_component.salary_component, "max_benefit_amount")
+					flexi_amount += max_of_component
+			if have_a_flexi and self.max_benefits == 0:
+				frappe.throw(_("Max benefits should be greater than zero to despense flexi"))
+			if self.max_benefits > flexi_amount:
+				frappe.throw(_("Total flexi component amount {0} should not be less \
+				than max benefits {1}").format(flexi_amount, self.max_benefits))
+		if not have_a_flexi and self.max_benefits > 0:
+			frappe.throw(_("Flexi component require to add max benefit"))
+
+
 @frappe.whitelist()
 def make_salary_slip(source_name, target_doc = None, employee = None, as_print = False, print_format = None):
 	def postprocess(source, target):
 		if employee:
-			employee_details = frappe.db.get_value("Employee", employee, 
-							["employee_name", "branch", "designation", "department"], as_dict=1)
+			employee_details = frappe.db.get_value("Employee", employee,
+				["employee_name", "branch", "designation", "department"], as_dict=1)
 			target.employee = employee
 			target.employee_name = employee_details.employee_name
 			target.branch = employee_details.branch
@@ -104,5 +78,7 @@
 
 
 @frappe.whitelist()
-def get_employees(**args):
-	return frappe.get_list('Employee',filters=args['filters'], fields=['name', 'employee_name'])
+def get_employees(salary_structure):
+	employees = frappe.get_list('Salary Structure Assignment',
+		filters={'salary_structure': salary_structure}, fields=['employee'])
+	return list(set([d.employee for d in employees]))
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/salary_structure_assignment/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/salary_structure_assignment/__init__.py
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.js b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.js
new file mode 100644
index 0000000..56a05e0
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.js
@@ -0,0 +1,46 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Salary Structure Assignment', {
+	setup: function(frm) {
+		frm.set_query("employee", function() {
+			return {
+				query: "erpnext.controllers.queries.employee_query",
+				filters: {
+					company: frm.doc.company
+				}
+			}
+		});
+		frm.set_query("salary_structure", function() {
+			return {
+				filters: {
+					company: frm.doc.company,
+					docstatus: 1,
+					is_active: "Yes"
+				}
+			}
+		});
+	},
+	employee: function(frm) {
+		if(frm.doc.employee){
+			frappe.call({
+				method: "frappe.client.get_value",
+				args:{
+					doctype: "Employee",
+					fieldname: "company",
+					filters:{
+						name: frm.doc.employee
+					}
+				},
+				callback: function(data) {
+					if(data.message){
+						frm.set_value("company", data.message.company);
+					}
+				}
+			});
+		}
+		else{
+			frm.set_value("company", null);
+		}
+	}
+});
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
new file mode 100644
index 0000000..a40ce3d
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
@@ -0,0 +1,508 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SSA-.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:38:41.769237", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "salary_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Salary Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Base", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "variable", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Salary Structure Assignment", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 11:25:20.009793",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Structure Assignment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
new file mode 100644
index 0000000..2168a36
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import getdate
+from frappe.model.document import Document
+
+class DuplicateAssignment(frappe.ValidationError): pass
+
+class SalaryStructureAssignment(Document):
+	def validate(self):
+		self.validate_dates()
+		self.validate_duplicate_assignments()
+
+	def validate_dates(self):
+		joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
+			["date_of_joining", "relieving_date"])
+
+		if self.from_date:
+			if joining_date and getdate(self.from_date) < joining_date:
+				frappe.throw(_("From Date {0} cannot be before employee's joining Date {1}")
+					.format(self.from_date, joining_date))
+
+			# flag - old_employee is for migrating the old employees data via patch
+			if relieving_date and getdate(self.from_date) > relieving_date and not self.flags.old_employee:
+				frappe.throw(_("From Date {0} cannot be after employee's relieving Date {1}")
+					.format(self.from_date, relieving_date))
+
+		if self.to_date:
+			if self.from_date and getdate(self.from_date) > getdate(self.to_date):
+				frappe.throw(_("From Date {0} cannot be after To Date {1}")
+					.format(self.from_date, self.to_date))
+			if relieving_date and getdate(self.to_date) > getdate(relieving_date) and not self.flags.old_employee:
+				frappe.throw(_("To Date {0} cannot be after employee's relieving Date {1}")
+					.format(self.to_date, relieving_date))
+
+	def validate_duplicate_assignments(self):
+		if not self.name:
+ 			# hack! if name is null, it could cause problems with !=
+ 			self.name = "New "+self.doctype
+		assignment = frappe.db.sql("""
+			select name from `tabSalary Structure Assignment`
+			where employee=%(employee)s
+			and name != %(name)s
+			and docstatus != 2
+			and (
+				(%(from_date)s between from_date and ifnull(to_date, '2199-12-31'))
+				or (%(to_date)s between from_date and ifnull(to_date, '2199-12-31'))
+				or (from_date between %(from_date)s and %(to_date)s)
+			)""", {
+				'employee': self.employee,
+				'from_date': self.from_date,
+				'to_date': (self.to_date or '2199-12-31'),
+				'name': self.name
+			})
+
+		if assignment:
+			frappe.throw(_("Active Salary Structure Assignment {0} found for employee {1} for the given dates").
+				format(assignment[0][0], self.employee), DuplicateAssignment)
+
+def get_assigned_salary_structure(employee, on_date):
+	if not employee or not on_date:
+		return None
+
+	salary_structure = frappe.db.sql("""
+		select salary_structure from `tabSalary Structure Assignment`
+		where employee=%(employee)s
+		and docstatus = 1
+		and (
+			(%(on_date)s between from_date and ifnull(to_date, '2199-12-31'))
+		)""", {
+			'employee': employee,
+			'on_date': on_date,
+		})
+
+	return salary_structure[0][0] if salary_structure else None
diff --git a/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.js b/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.js
new file mode 100644
index 0000000..2f52576
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Salary Structure Assignment", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Salary Structure Assignment
+		() => frappe.tests.make('Salary Structure Assignment', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.py b/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.py
new file mode 100644
index 0000000..a9833bf
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure_assignment/test_salary_structure_assignment.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestSalaryStructureAssignment(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
index 0e238d3..f2295ff 100644
--- a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
+++ b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "employee", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,13 +42,16 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -59,7 +64,7 @@
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -70,9 +75,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -83,6 +90,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "From Date", 
@@ -98,9 +106,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -111,6 +121,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "To Date", 
@@ -126,9 +137,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -156,9 +169,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -186,20 +201,21 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-23 17:08:44.518424", 
+ "modified": "2018-05-16 22:43:05.329951",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Employee", 
@@ -214,4 +230,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/shift_assignment/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/shift_assignment/__init__.py
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.js b/erpnext/hr/doctype/shift_assignment/shift_assignment.js
new file mode 100644
index 0000000..74708b1
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Shift Assignment', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.json b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
new file mode 100644
index 0000000..95ec8fc
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
@@ -0,0 +1,418 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SH.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:25:04.562730", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "shift_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Shift Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shift Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "present", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Present", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shift_request", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shift Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shift Request", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Shift Assignment", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 12:22:44.525175",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Shift Assignment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.py b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
new file mode 100644
index 0000000..fbbfe31
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import cint, cstr, date_diff, flt, formatdate, getdate
+
+class OverlapError(frappe.ValidationError): pass
+
+class ShiftAssignment(Document):
+	def validate(self):
+		self.validate_overlapping_dates();
+
+	def validate_overlapping_dates(self):
+			if not self.name:
+				self.name = "New Shift Assignment"
+
+			d = frappe.db.sql("""
+				select
+					name, shift_type, date
+				from `tabShift Assignment`
+				where employee = %(employee)s and docstatus < 2
+				and date = %(date)s
+				and name != %(name)s""", {
+					"employee": self.employee,
+					"shift_type": self.shift_type,
+					"date": self.date,
+					"name": self.name
+				}, as_dict = 1)
+
+			for date_overlap in d:
+				if date_overlap['name']:
+					self.throw_overlap_error(date_overlap)
+
+	def throw_overlap_error(self, d):
+		msg = _("Employee {0} has already applied for {1} on {2} : ").format(self.employee,
+			d['shift_type'], formatdate(d['date'])) \
+			+ """ <b><a href="#Form/Shift Request/{0}">{0}</a></b>""".format(d["name"])
+		frappe.throw(msg, OverlapError)
+
+@frappe.whitelist()
+def get_events(start, end, filters=None):
+	events = []
+
+	employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user}, ["name", "company"],
+		as_dict=True)
+	if employee:
+		employee, company = employee.name, employee.company
+	else:
+		employee=''
+		company=frappe.db.get_value("Global Defaults", None, "default_company")
+
+	from frappe.desk.reportview import get_filters_cond
+	conditions = get_filters_cond("Shift Assignment", filters, [])
+	add_assignments(events, start, end, conditions=conditions)
+	return events
+
+def add_assignments(events, start, end, conditions=None):
+	query = """select name, date, employee_name, 
+		employee, docstatus
+		from `tabShift Assignment` where
+		date <= %(date)s
+		and docstatus < 2"""
+	if conditions:
+		query += conditions
+
+	for d in frappe.db.sql(query, {"date":start, "date":end}, as_dict=True):
+		e = {
+			"name": d.name,
+			"doctype": "Shift Assignment",
+			"date": d.date,
+			"title": cstr(d.employee_name) + \
+				cstr(d.shift_type),
+			"docstatus": d.docstatus
+		}
+		if e not in events:
+			events.append(e)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js b/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
new file mode 100644
index 0000000..c2c9bc0
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
@@ -0,0 +1,19 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.views.calendar["Shift Assignment"] = {
+	field_map: {
+		"start": "date",
+		"end": "date",
+		"id": "name",
+		"docstatus": 1
+	},
+	options: {
+		header: {
+			left: 'prev,next today',
+			center: 'title',
+			right: 'month'
+		}
+	},
+	get_events_method: "erpnext.hr.doctype.shift_assignment.shift_assignment.get_events"
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_assignment/test_shift_assignment.js b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.js
new file mode 100644
index 0000000..7727287
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shift Assignment", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shift Assignment
+		() => frappe.tests.make('Shift Assignment', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
new file mode 100644
index 0000000..eb51adb
--- /dev/null
+++ b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestShiftAssignment(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/shift_request/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/shift_request/__init__.py
diff --git a/erpnext/hr/doctype/shift_request/shift_request.js b/erpnext/hr/doctype/shift_request/shift_request.js
new file mode 100644
index 0000000..1db7c7d
--- /dev/null
+++ b/erpnext/hr/doctype/shift_request/shift_request.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Shift Request', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/shift_request/shift_request.json b/erpnext/hr/doctype/shift_request/shift_request.json
new file mode 100644
index 0000000..21a670a
--- /dev/null
+++ b/erpnext/hr/doctype/shift_request/shift_request.json
@@ -0,0 +1,386 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SREQ.#####", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:32:27.974273", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shift_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Shift Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Shift Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Shift Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-17 10:23:55.480615",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Shift Request", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_request/shift_request.py b/erpnext/hr/doctype/shift_request/shift_request.py
new file mode 100644
index 0000000..7057d20
--- /dev/null
+++ b/erpnext/hr/doctype/shift_request/shift_request.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import formatdate, getdate
+
+class OverlapError(frappe.ValidationError): pass
+
+class ShiftRequest(Document):
+	def validate(self):
+		self.validate_dates();
+		self.validate_shift_request_overlap_dates();
+
+	def on_submit(self):
+		date_list = self.get_working_days(self.from_date, self.to_date)
+		for date in date_list:
+			assignment_doc = frappe.new_doc("Shift Assignment")
+			assignment_doc.company = self.company
+			assignment_doc.shift_type = self.shift_type
+			assignment_doc.employee = self.employee
+			assignment_doc.date = date
+			assignment_doc.shift_request = self.name
+			assignment_doc.insert()
+			assignment_doc.submit()
+
+	def validate_dates(self):
+		if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
+			frappe.throw(_("To date cannot be before from date"))
+
+	def validate_shift_request_overlap_dates(self):
+			if not self.name:
+				self.name = "New Shift Request"
+
+			d = frappe.db.sql("""
+				select
+					name, shift_type, from_date, to_date
+				from `tabShift Request`
+				where employee = %(employee)s and docstatus < 2
+				and ((%(from_date)s >= from_date
+					and %(from_date)s <= to_date) or
+					( %(to_date)s >= from_date
+					and %(to_date)s <= to_date ))
+				and name != %(name)s""", {
+					"employee": self.employee,
+					"shift_type": self.shift_type,
+					"from_date": self.from_date,
+					"to_date": self.to_date,
+					"name": self.name
+				}, as_dict=1)
+
+			for date_overlap in d:
+				if date_overlap ['name']:
+					self.throw_overlap_error(date_overlap)
+
+	def throw_overlap_error(self, d):
+		msg = _("Employee {0} has already applied for {1} between {2} and {3} : ").format(self.employee,
+			d['shift_type'], formatdate(d['from_date']), formatdate(d['to_date'])) \
+			+ """ <b><a href="#Form/Shift Request/{0}">{0}</a></b>""".format(d["name"])
+		frappe.throw(msg, OverlapError)
+
+	def get_working_days(self, start_date, end_date):
+		start_date, end_date = getdate(start_date), getdate(end_date)
+
+		from datetime import timedelta
+
+		date_list = []
+		employee_holiday_list = []
+
+		employee_holidays = frappe.db.sql("""select holiday_date from `tabHoliday`
+								where parent in (select holiday_list from `tabEmployee`
+								where name = %s)""",self.employee,as_dict=1)
+
+		for d in employee_holidays:
+			employee_holiday_list.append(d.holiday_date)
+
+		reference_date = start_date
+		
+		while reference_date <= end_date:
+			if reference_date not in employee_holiday_list:
+				date_list.append(reference_date)
+			reference_date += timedelta(days=1)
+
+		return date_list
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_request/test_shift_request.js b/erpnext/hr/doctype/shift_request/test_shift_request.js
new file mode 100644
index 0000000..9c8cd70
--- /dev/null
+++ b/erpnext/hr/doctype/shift_request/test_shift_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shift Request", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shift Request
+		() => frappe.tests.make('Shift Request', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/shift_request/test_shift_request.py b/erpnext/hr/doctype/shift_request/test_shift_request.py
new file mode 100644
index 0000000..d32443a
--- /dev/null
+++ b/erpnext/hr/doctype/shift_request/test_shift_request.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import nowdate
+
+class TestShiftRequest(unittest.TestCase):
+	def test_make_shift_request(self):
+		shift_request = frappe.get_doc({
+			"doctype": "Shift Request",
+			"shift_type": "Day Shift",
+			"company": "_Test Company",
+			"employee": "_T-Employee-00001",
+			"employee_name": "_Test Employee",
+			"start_date": nowdate(),
+			"end_date": nowdate()
+		})
+		shift_request.insert()
+		shift_request.submit()
+		shift_assignment = frappe.db.sql("""select employee
+											from `tabShift Assignment`
+											where shift_request = %s""", shift_request.name)
+		if shift_assignment:
+			employee = shift_assignment[0][0]
+		self.assertEqual(shift_request.employee, employee)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/shift_type/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/shift_type/__init__.py
diff --git a/erpnext/hr/doctype/shift_type/shift_type.js b/erpnext/hr/doctype/shift_type/shift_type.js
new file mode 100644
index 0000000..feae889
--- /dev/null
+++ b/erpnext/hr/doctype/shift_type/shift_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Shift Type', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/shift_type/shift_type.json b/erpnext/hr/doctype/shift_type/shift_type.json
new file mode 100644
index 0000000..d5af2e4
--- /dev/null
+++ b/erpnext/hr/doctype/shift_type/shift_type.json
@@ -0,0 +1,194 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 16:22:52.954783", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "start_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Start Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "end_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "End Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "holiday_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Holiday List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Holiday List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-13 17:48:00.309273", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Shift Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
new file mode 100644
index 0000000..88ae243
--- /dev/null
+++ b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ShiftType(Document):
+	pass
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_type/test_shift_type.js b/erpnext/hr/doctype/shift_type/test_shift_type.js
new file mode 100644
index 0000000..846f931
--- /dev/null
+++ b/erpnext/hr/doctype/shift_type/test_shift_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shift Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shift Type
+		() => frappe.tests.make('Shift Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/shift_type/test_shift_type.py b/erpnext/hr/doctype/shift_type/test_shift_type.py
new file mode 100644
index 0000000..d5afdf5
--- /dev/null
+++ b/erpnext/hr/doctype/shift_type/test_shift_type.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestShiftType(unittest.TestCase):
+	def test_make_shift_type(self):
+		shift_type = frappe.get_doc({
+			"doctype": "Shift Type",
+			"name": "Day Shift",
+			"start_time": "9:00:00",
+			"end_time": "18:00:00"
+		})
+		shift_type.insert()
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/staffing_plan/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/staffing_plan/__init__.py
diff --git a/erpnext/hr/doctype/staffing_plan/staffing_plan.js b/erpnext/hr/doctype/staffing_plan/staffing_plan.js
new file mode 100644
index 0000000..4fbc6b3
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan/staffing_plan.js
@@ -0,0 +1,112 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Staffing Plan', {
+	setup: function(frm) {
+		frm.set_query("designation", "staffing_details", function() {
+			let designations = [];
+			$.each(frm.doc.staffing_details, function(index, staff_detail) {
+				if(staff_detail.designation){
+					designations.push(staff_detail.designation)
+				}
+			})
+			// Filter out designations already selected in Staffing Plan Detail
+			return {
+				filters: [
+					['Designation', 'name', 'not in', designations],
+				]
+			}
+		});
+
+		frm.set_query("department", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company,
+				}
+			};
+		});
+	}
+});
+
+frappe.ui.form.on('Staffing Plan Detail', {
+	designation: function(frm, cdt, cdn) {
+		let child = locals[cdt][cdn]
+		if(frm.doc.company && child.designation){
+			frappe.call({
+				"method": "erpnext.hr.doctype.staffing_plan.staffing_plan.get_designation_counts",
+				args: {
+					designation: child.designation,
+					company: frm.doc.company
+				},
+				callback: function (data) {
+					if(data.message){
+						frappe.model.set_value(cdt, cdn, 'current_count', data.message.employee_count);
+						frappe.model.set_value(cdt, cdn, 'current_openings', data.message.job_openings);
+						if (child.number_of_positions < (data.message.employee_count +  data.message.job_openings)){
+							frappe.model.set_value(cdt, cdn, 'number_of_positions', data.message.employee_count +  data.message.job_openings);
+						}
+					}
+					else{ // No employees for this designation
+						frappe.model.set_value(cdt, cdn, 'current_count', 0);
+						frappe.model.set_value(cdt, cdn, 'current_openings', 0);
+					}
+				}
+			});
+		}
+	},
+
+	number_of_positions: function(frm, cdt, cdn) {
+		set_vacancies(frm, cdt, cdn);
+	},
+
+	current_count: function(frm, cdt, cdn) {
+		set_vacancies(frm, cdt, cdn);
+	},
+
+	estimated_cost_per_position: function(frm, cdt, cdn) {
+		let child = locals[cdt][cdn];
+		set_total_estimated_cost(frm, cdt, cdn);
+	}
+
+});
+
+var set_vacancies = function(frm, cdt, cdn) {
+	let child = locals[cdt][cdn]
+	if (child.number_of_positions < (child.current_count + child.current_openings)){
+		frappe.throw(__("Number of positions cannot be less then current count of employees"))
+	}
+
+	if(child.number_of_positions > 0) {
+		frappe.model.set_value(cdt, cdn, 'vacancies', child.number_of_positions - (child.current_count + child.current_openings));
+	}
+	else{
+		frappe.model.set_value(cdt, cdn, 'vacancies', 0);
+	}
+
+	set_total_estimated_cost(frm, cdt, cdn);
+}
+
+// Note: Estimated Cost is calculated on number of Vacancies
+// Validate for > 0 ?
+var set_total_estimated_cost = function(frm, cdt, cdn) {
+	let child = locals[cdt][cdn]
+	if(child.vacancies > 0 && child.estimated_cost_per_position) {
+		frappe.model.set_value(cdt, cdn, 'total_estimated_cost', child.vacancies * child.estimated_cost_per_position);
+	}
+	else {
+		frappe.model.set_value(cdt, cdn, 'total_estimated_cost', 0);
+	}
+	set_total_estimated_budget(frm);
+};
+
+var set_total_estimated_budget = function(frm) {
+	let estimated_budget = 0.0
+	if(frm.doc.staffing_details) {
+		$.each(frm.doc.staffing_details, function(index, staff_detail) {
+			if(staff_detail.total_estimated_cost){
+				estimated_budget += staff_detail.total_estimated_cost
+			}
+		})
+		frm.set_value('total_estimated_budget', estimated_budget);
+	}
+}
diff --git a/erpnext/hr/doctype/staffing_plan/staffing_plan.json b/erpnext/hr/doctype/staffing_plan/staffing_plan.json
new file mode 100644
index 0000000..9576bc3
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan/staffing_plan.json
@@ -0,0 +1,403 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "prompt", 
+ "beta": 0, 
+ "creation": "2018-04-13 18:07:21.582747", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "staffing_plan_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Staffing Plan Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "staffing_details", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Staffing Plan Detail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Staffing Plan Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0.00", 
+   "fieldname": "total_estimated_budget", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Estimated Budget", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Staffing Plan", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-28 18:30:27.041395", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Staffing Plan", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/staffing_plan/staffing_plan.py b/erpnext/hr/doctype/staffing_plan/staffing_plan.py
new file mode 100644
index 0000000..e1a5f8c
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan/staffing_plan.py
@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import getdate, nowdate, cint, flt
+
+class StaffingPlan(Document):
+	def validate(self):
+		# Validate Dates
+		if self.from_date and self.to_date and self.from_date > self.to_date:
+			frappe.throw(_("From Date cannot be greater than To Date"))
+
+		self.total_estimated_budget = 0
+
+		for detail in self.get("staffing_details"):
+			self.validate_overlap(detail)
+			self.validate_with_subsidiary_plans(detail)
+			self.validate_with_parent_plan(detail)
+
+			#Set readonly fields
+			designation_counts = get_designation_counts(detail.designation, self.company)
+			detail.current_count = designation_counts['employee_count']
+			detail.current_openings = designation_counts['job_openings']
+
+			if detail.number_of_positions < (detail.current_count + detail.current_openings):
+				frappe.throw(_("Number of positions cannot be less then current count of employees"))
+			elif detail.number_of_positions > 0:
+				detail.vacancies = detail.number_of_positions - (detail.current_count + detail.current_openings)
+				if detail.vacancies > 0 and detail.estimated_cost_per_position:
+					detail.total_estimated_cost = detail.vacancies * detail.estimated_cost_per_position
+				else: detail.total_estimated_cost = 0
+			else: detail.vacancies = detail.number_of_positions = detail.total_estimated_cost = 0
+			self.total_estimated_budget += detail.total_estimated_cost
+
+	def validate_overlap(self, staffing_plan_detail):
+		# Validate if any submitted Staffing Plan exist for any Designations in this plan
+		# and spd.vacancies>0 ?
+		overlap = frappe.db.sql("""select spd.parent
+			from `tabStaffing Plan Detail` spd join `tabStaffing Plan` sp on spd.parent=sp.name
+			where spd.designation=%s and sp.docstatus=1
+			and sp.to_date >= %s and sp.from_date <= %s and sp.company = %s
+		""", (staffing_plan_detail.designation, self.from_date, self.to_date, self.company))
+		if overlap and overlap [0][0]:
+			frappe.throw(_("Staffing Plan {0} already exist for designation {1}"
+				.format(overlap[0][0], staffing_plan_detail.designation)))
+
+	def validate_with_parent_plan(self, staffing_plan_detail):
+		if not frappe.db.get_value("Company", self.company, "parent_company"):
+			return # No parent, nothing to validate
+
+		# Get staffing plan applicable for the company (Parent Company)
+		parent_plan_details = get_active_staffing_plan_details(self.company, staffing_plan_detail.designation)
+		if not parent_plan_details:
+			return #no staffing plan for any parent Company in herarchy
+
+		# Fetch parent company which owns the staffing plan. NOTE: Parent could be higher up in the heirarchy
+		parent_company = frappe.db.get_value("Staffing Plan", parent_plan_details[0].name, "company")
+
+		# Parent plan available, validate with parent, siblings as well as children of staffing plan Company
+		if staffing_plan_detail.vacancies > cint(parent_plan_details[0].vacancies) or \
+			staffing_plan_detail.total_estimated_cost > flt(parent_plan_details[0].total_estimated_cost):
+			frappe.throw(_("You can only plan for upto {0} vacancies and budget {1} \
+				for {2} as per staffing plan {3} for parent company {4}"
+				.format(cint(parent_plan_details[0].vacancies),
+					parent_plan_details[0].total_estimated_cost,
+					frappe.bold(staffing_plan_detail.designation),
+					parent_plan_details[0].name,
+					parent_company)))
+
+		#Get vacanices already planned for all companies down the herarchy of Parent Company
+		lft, rgt = frappe.db.get_value("Company", parent_company, ["lft", "rgt"])
+		all_sibling_details = frappe.db.sql("""select sum(spd.vacancies) as vacancies,
+			sum(spd.total_estimated_cost) as total_estimated_cost
+			from `tabStaffing Plan Detail` spd join `tabStaffing Plan` sp on spd.parent=sp.name
+			where spd.designation=%s and sp.docstatus=1
+			and sp.to_date >= %s and sp.from_date <=%s
+			and sp.company in (select name from tabCompany where lft > %s and rgt < %s)
+		""", (staffing_plan_detail.designation, self.from_date, self.to_date, lft, rgt), as_dict = 1)[0]
+
+		if (cint(parent_plan_details[0].vacancies) < \
+			(staffing_plan_detail.vacancies + cint(all_sibling_details.vacancies))) or \
+			(flt(parent_plan_details[0].total_estimated_cost) < \
+			(staffing_plan_detail.total_estimated_cost + flt(all_sibling_details.total_estimated_cost))):
+			frappe.throw(_("{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
+				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}"
+				.format(cint(all_sibling_details.vacancies),
+					all_sibling_details.total_estimated_cost,
+					frappe.bold(staffing_plan_detail.designation),
+					parent_company,
+					cint(parent_plan_details[0].vacancies),
+					parent_plan_details[0].total_estimated_cost,
+					parent_plan_details[0].name)))
+
+	def validate_with_subsidiary_plans(self, staffing_plan_detail):
+		#Valdate this plan with all child company plan
+		children_details = frappe.db.sql("""select sum(spd.vacancies) as vacancies,
+			sum(spd.total_estimated_cost) as total_estimated_cost
+			from `tabStaffing Plan Detail` spd join `tabStaffing Plan` sp on spd.parent=sp.name
+			where spd.designation=%s and sp.docstatus=1
+			and sp.to_date >= %s and sp.from_date <=%s
+			and sp.company in (select name from tabCompany where parent_company = %s)
+		""", (staffing_plan_detail.designation, self.from_date, self.to_date, self.company), as_dict = 1)[0]
+
+		if children_details and \
+			staffing_plan_detail.vacancies < cint(children_details.vacancies) or \
+			staffing_plan_detail.total_estimated_cost < flt(children_details.total_estimated_cost):
+			frappe.throw(_("Subsidiary companies have already planned for {1} vacancies at a budget of {2}. \
+				Staffing Plan for {0} should allocate more vacancies and budget for {3} than planned for its subsidiary companies"
+				.format(self.company,
+					cint(children_details.vacancies),
+					children_details.total_estimated_cost,
+					frappe.bold(staffing_plan_detail.designation))))
+
+@frappe.whitelist()
+def get_designation_counts(designation, company):
+	if not designation:
+		return False
+
+	employee_counts_dict = {}
+	lft, rgt = frappe.db.get_value("Company", company, ["lft", "rgt"])
+	employee_counts_dict["employee_count"] = frappe.db.sql("""select count(*) from `tabEmployee`
+		where designation = %s and status='Active'
+			and company in (select name from tabCompany where lft>=%s and rgt<=%s)
+		""", (designation, lft, rgt))[0][0]
+
+	employee_counts_dict['job_openings'] = frappe.db.sql("""select count(*) from `tabJob Opening` \
+		where designation=%s and status='Open'
+			and company in (select name from tabCompany where lft>=%s and rgt<=%s)
+		""", (designation, lft, rgt))[0][0]
+
+	return employee_counts_dict
+
+@frappe.whitelist()
+def get_active_staffing_plan_details(company, designation, department=None, date=getdate(nowdate())):
+	if not company or not designation:
+		frappe.throw(_("Please select Company and Designation"))
+
+	conditions = ""
+	if(department): #Department is an optional field
+		conditions += " and sp.department='{0}'".format(frappe.db.escape(department))
+
+	if(date): #ToDo: Date should be mandatory?
+		conditions += " and '{0}' between sp.from_date and sp.to_date".format(date)
+
+	staffing_plan = frappe.db.sql("""
+		select sp.name, spd.vacancies, spd.total_estimated_cost
+		from `tabStaffing Plan Detail` spd join `tabStaffing Plan` sp on spd.parent=sp.name
+		where company=%s and spd.designation=%s and sp.docstatus=1 {0}
+	""".format(conditions), (company, designation), as_dict = 1)
+
+	if not staffing_plan:
+		parent_company = frappe.db.get_value("Company", company, "parent_company")
+		if parent_company:
+			staffing_plan = get_active_staffing_plan_details(parent_company,
+				designation, department, date)
+
+	# Only a single staffing plan can be active for a designation on given date
+	return staffing_plan if staffing_plan else None
diff --git a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.js b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.js
new file mode 100644
index 0000000..64320bc
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Staffing Plan", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Staffing Plan
+		() => frappe.tests.make('Staffing Plan', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py
new file mode 100644
index 0000000..426ab3a
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestStaffingPlan(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/staffing_plan_detail/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/staffing_plan_detail/__init__.py
diff --git a/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.json b/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.json
new file mode 100644
index 0000000..f1d1609
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.json
@@ -0,0 +1,297 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-04-13 18:04:20.978931",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Designation",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Designation",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "number_of_positions",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Number Of Positions",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "estimated_cost_per_position",
+   "fieldtype": "Currency",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Estimated Cost Per Position",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "current_count",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Current Count",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "current_openings",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Current Openings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "vacancies",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Vacancies",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+ },
+ {
+	"allow_bulk_edit": 0,
+	"allow_in_quick_entry": 0,
+	"allow_on_submit": 0,
+	"bold": 0,
+	"collapsible": 0,
+	"columns": 0,
+	"fieldname": "total_estimated_cost",
+	"fieldtype": "Currency",
+	"hidden": 0,
+	"ignore_user_permissions": 0,
+	"ignore_xss_filter": 0,
+	"in_filter": 0,
+	"in_global_search": 0,
+	"in_list_view": 1,
+	"in_standard_filter": 0,
+	"label": "Total Estimated Cost",
+	"length": 0,
+	"no_copy": 0,
+	"permlevel": 0,
+	"precision": "",
+	"print_hide": 0,
+	"print_hide_if_no_value": 0,
+	"read_only": 1,
+	"remember_last_selected_value": 0,
+	"report_hide": 0,
+	"reqd": 0,
+	"search_index": 0,
+	"set_only_once": 0,
+	"translatable": 0,
+	"unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2018-06-01 17:03:38.020993",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Staffing Plan Detail",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
diff --git a/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.py b/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.py
new file mode 100644
index 0000000..28a651e
--- /dev/null
+++ b/erpnext/hr/doctype/staffing_plan_detail/staffing_plan_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StaffingPlanDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/taxable_salary_slab/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/taxable_salary_slab/__init__.py
diff --git a/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.json b/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.json
new file mode 100644
index 0000000..8e6c1d8
--- /dev/null
+++ b/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.json
@@ -0,0 +1,165 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-04-13 17:42:13.516032", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "percent_deduction", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Percent Deduction", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "condition", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Condition", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 18:18:23.802576", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Taxable Salary Slab", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.py b/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.py
new file mode 100644
index 0000000..23e5ffb
--- /dev/null
+++ b/erpnext/hr/doctype/taxable_salary_slab/taxable_salary_slab.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TaxableSalarySlab(Document):
+	pass
diff --git a/erpnext/hr/doctype/training_event_employee/training_event_employee.json b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
index 76adcb0..d8b5148 100644
--- a/erpnext/hr/doctype/training_event_employee/training_event_employee.json
+++ b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
@@ -40,6 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -48,6 +49,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -60,7 +62,7 @@
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -71,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -79,6 +82,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -100,6 +136,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -132,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -163,6 +201,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -176,7 +215,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-05 08:49:41.869998", 
+ "modified": "2018-05-17 10:19:51.899523",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Event Employee", 
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.json b/erpnext/hr/doctype/training_feedback/training_feedback.json
index ece6ed1..35576c3 100644
--- a/erpnext/hr/doctype/training_feedback/training_feedback.json
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "Feedback.####", 
@@ -12,6 +13,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,13 +41,16 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -58,7 +63,7 @@
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -69,13 +74,49 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_from": "training_event.course",
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -99,9 +140,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -127,9 +170,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,13 +202,16 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "training_event.event_name",
    "fieldname": "event_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -186,13 +234,16 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "training_event.trainer_name",
    "fieldname": "trainer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -215,9 +266,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -243,9 +296,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -272,9 +327,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -301,20 +358,21 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:09:26.052837", 
+ "modified": "2018-05-17 11:59:49.029674",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Feedback", 
@@ -323,7 +381,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -343,7 +400,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
diff --git a/erpnext/hr/doctype/training_result_employee/training_result_employee.json b/erpnext/hr/doctype/training_result_employee/training_result_employee.json
index 477a8e6..ca71bf1 100644
--- a/erpnext/hr/doctype/training_result_employee/training_result_employee.json
+++ b/erpnext/hr/doctype/training_result_employee/training_result_employee.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -12,6 +13,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Employee", 
@@ -33,13 +36,16 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -50,6 +56,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -59,45 +66,86 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.employee_name",
    "fieldname": "employee_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "employee.employee_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "depends_on": "", 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
@@ -105,6 +153,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -114,13 +163,16 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,6 +183,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Hours", 
@@ -141,13 +194,16 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +214,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Grade", 
@@ -168,13 +225,16 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -185,6 +245,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -194,13 +255,16 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -211,6 +275,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Comments", 
@@ -221,24 +286,26 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0,
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-11-04 03:31:08.624394", 
+ "modified": "2018-05-17 10:09:57.777384",
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Result Employee", 
@@ -248,7 +315,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0,
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/travel_itinerary/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/travel_itinerary/__init__.py
diff --git a/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json
new file mode 100644
index 0000000..f887027
--- /dev/null
+++ b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.json
@@ -0,0 +1,512 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-15 07:40:59.181192", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_from", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Travel From", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_to", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Travel To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "mode_of_travel", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Mode of Travel", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nFlight\nTrain\nTaxi\nRented Car", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "meal_preference", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Meal Preference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nVegetarian\nNon-Vegetarian\nGluten Free\nNon Diary", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_advance_required", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Travel Advance Required", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "travel_advance_required", 
+   "fieldname": "advance_amount", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Advance Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "departure_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Departure Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "arrival_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Arrival Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lodging_required", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Lodging Required", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "lodging_required", 
+   "fieldname": "preferred_area_for_lodging", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Preferred Area for Lodging", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "lodging_required", 
+   "fieldname": "check_in_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Check-in Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "lodging_required", 
+   "fieldname": "check_out_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Check-out Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "other_details", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Other Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-15 09:55:20.138108", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Travel Itinerary", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py
new file mode 100644
index 0000000..0b369be
--- /dev/null
+++ b/erpnext/hr/doctype/travel_itinerary/travel_itinerary.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TravelItinerary(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/travel_request/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/travel_request/__init__.py
diff --git a/erpnext/hr/doctype/travel_request/test_travel_request.js b/erpnext/hr/doctype/travel_request/test_travel_request.js
new file mode 100644
index 0000000..7e64591
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request/test_travel_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Travel Request", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Travel Request
+		() => frappe.tests.make('Travel Request', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/hr/doctype/travel_request/test_travel_request.py b/erpnext/hr/doctype/travel_request/test_travel_request.py
new file mode 100644
index 0000000..dac5517
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request/test_travel_request.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestTravelRequest(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/travel_request/travel_request.js b/erpnext/hr/doctype/travel_request/travel_request.js
new file mode 100644
index 0000000..9dd48eb
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request/travel_request.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Travel Request', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/travel_request/travel_request.json b/erpnext/hr/doctype/travel_request/travel_request.json
new file mode 100644
index 0000000..6146b49
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request/travel_request.json
@@ -0,0 +1,914 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "TRQ.#####", 
+ "beta": 0, 
+ "creation": "2018-05-15 06:32:33.950356", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Travel Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDomestic\nInternational", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_funding", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Travel Funding", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nRequire Full Funding\nFully Sponsored\nPartially Sponsored, Require Partial Funding", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_proof", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Copy of Invitation/Announcement", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purpose_of_travel", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Purpose of Travel", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purpose of Travel", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details_of_sponsor", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Details of Sponsor (Name, Location)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Any other details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "employee_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.cell_number",
+   "fieldname": "cell_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.prefered_email",
+   "fieldname": "prefered_email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.date_of_birth", 
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "personal_id_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Identification Document Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Identification Document Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "personal_id_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Identification Document Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.passport_number",
+   "fieldname": "passport_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Passport Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "travel_itinerary", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Travel Itinerary", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "itinerary", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Travel Itinerary", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "costing_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Costing Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "costings", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Costing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Travel Request Costing", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "event_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Event Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "name_of_organizer", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Name of Organizer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_of_organizer", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address of Organizer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "other_details", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Other Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-05-25 22:43:34.438949",
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Travel Request", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/travel_request/travel_request.py b/erpnext/hr/doctype/travel_request/travel_request.py
new file mode 100644
index 0000000..01d3f34
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request/travel_request.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TravelRequest(Document):
+	pass
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/doctype/travel_request_costing/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/doctype/travel_request_costing/__init__.py
diff --git a/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json
new file mode 100644
index 0000000..b64b1a9
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.json
@@ -0,0 +1,257 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-15 10:28:37.429581", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expense_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Expense Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Expense Claim Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sponsored_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Sponsored Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "funded_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Funded Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "comments", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Comments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-15 10:42:07.960530", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Travel Request Costing", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py
new file mode 100644
index 0000000..9fa85e8
--- /dev/null
+++ b/erpnext/hr/doctype/travel_request_costing/travel_request_costing.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TravelRequestCosting(Document):
+	pass
diff --git a/erpnext/hr/doctype/vehicle_service/vehicle_service.json b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
index 635a0b6..7d9d0df 100644
--- a/erpnext/hr/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
@@ -131,7 +131,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/email_alert/retention_bonus/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/email_alert/retention_bonus/__init__.py
diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.json b/erpnext/hr/email_alert/retention_bonus/retention_bonus.json
new file mode 100644
index 0000000..90b8f0d
--- /dev/null
+++ b/erpnext/hr/email_alert/retention_bonus/retention_bonus.json
@@ -0,0 +1,26 @@
+{
+ "attach_print": 0, 
+ "condition": "doc.docstatus==1", 
+ "creation": "2018-05-15 18:52:36.362838", 
+ "date_changed": "bonus_payment_date", 
+ "days_in_advance": 14, 
+ "docstatus": 0, 
+ "doctype": "Email Alert", 
+ "document_type": "Retention Bonus", 
+ "enabled": 1, 
+ "event": "Days Before", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "message": "<p>{{ _(\"Hello\") }},</p>\n\n<p> {{ _(\"Retention Bonus for\") }} {{ doc.employee_name }} {{ _(\"due on\") }} {{ doc.bonus_payment_date }}</p>", 
+ "modified": "2018-05-15 19:00:24.294418", 
+ "modified_by": "ranjith@earthianslive.com", 
+ "module": "HR", 
+ "name": "Retention Bonus", 
+ "owner": "ranjith@earthianslive.com", 
+ "recipients": [
+  {
+   "email_by_role": "HR Manager"
+  }
+ ], 
+ "subject": "Retention Bonus alert for {{ doc.employee }}"
+}
\ No newline at end of file
diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.md b/erpnext/hr/email_alert/retention_bonus/retention_bonus.md
new file mode 100644
index 0000000..8f48193
--- /dev/null
+++ b/erpnext/hr/email_alert/retention_bonus/retention_bonus.md
@@ -0,0 +1,3 @@
+<p>{{ _("Hello") }},</p>
+
+<p> {{ _("Retention Bonus for") }} {{ doc.employee_name }} {{ _("due on") }} {{ doc.bonus_payment_date }}</p>
\ No newline at end of file
diff --git a/erpnext/hr/email_alert/retention_bonus/retention_bonus.py b/erpnext/hr/email_alert/retention_bonus/retention_bonus.py
new file mode 100644
index 0000000..2334f8b
--- /dev/null
+++ b/erpnext/hr/email_alert/retention_bonus/retention_bonus.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass
diff --git a/erpnext/hr/employee_property_update.js b/erpnext/hr/employee_property_update.js
new file mode 100644
index 0000000..60d06b4
--- /dev/null
+++ b/erpnext/hr/employee_property_update.js
@@ -0,0 +1,145 @@
+frappe.ui.form.on(cur_frm.doctype, {
+	setup: function(frm) {
+		frm.set_query("employee", function() {
+			return {
+				filters: {
+					"status": "Active"
+				}
+			};
+		});
+	},
+	onload: function(frm){
+		if(frm.doc.__islocal){
+			if(frm.doctype == "Employee Promotion"){
+				frm.doc.promotion_details = [];
+			}else if (frm.doctype == "Employee Transfer") {
+				frm.doc.transfer_details = [];
+			}
+		}
+	},
+	employee: function(frm) {
+		frm.add_fetch("employee", "company", "company");
+	},
+	refresh: function(frm) {
+		var table;
+		if(frm.doctype == "Employee Promotion"){
+			table = "promotion_details";
+		}else if (frm.doctype == "Employee Transfer") {
+			table = "transfer_details";
+		}
+		if(!table){return;}
+		cur_frm.fields_dict[table].grid.wrapper.find('.grid-add-row').hide();
+		cur_frm.fields_dict[table].grid.add_custom_button(__('Add Row'), () => {
+			if(!frm.doc.employee){
+				frappe.msgprint(__("Please select Employee"));
+				return;
+			}
+			frappe.call({
+				method: 'erpnext.hr.utils.get_employee_fields_label',
+				callback: function(r) {
+					if(r.message){
+						show_dialog(frm, table, r.message);
+					}
+				}
+			});
+		});
+	}
+});
+
+var show_dialog = function(frm, table, field_labels) {
+	var d = new frappe.ui.Dialog({
+		title: "Update Property",
+		fields: [
+			{fieldname: "property", label: __('Select Property'), fieldtype:"Select", options: field_labels},
+			{fieldname: "current", fieldtype: "Data", label:__('Current'), read_only: true},
+			{fieldname: "field_html", fieldtype: "HTML"}
+		],
+		primary_action_label: __('Add to Details'),
+		primary_action: () => {
+			d.get_primary_btn().attr('disabled', true);
+			if(d.data) {
+				var input = $('[data-fieldname="field_html"] input');
+				d.data.new = input.val();
+				$(input).remove();
+				add_to_details(frm, d, table);
+			}
+		}
+	});
+	d.fields_dict["property"].df.onchange = () => {
+		let property = d.get_values().property;
+		d.data.fieldname = property;
+		if(!property){return;}
+		frappe.call({
+			method: 'erpnext.hr.utils.get_employee_field_property',
+			args: {employee: frm.doc.employee, fieldname: property},
+			callback: function(r) {
+				if(r.message){
+					d.data.current = r.message.value;
+					d.data.property = r.message.label;
+					d.fields_dict.field_html.$wrapper.html("");
+					d.set_value('current', r.message.value);
+					render_dynamic_field(d, r.message.datatype, r.message.options, property);
+					d.get_primary_btn().attr('disabled', false);
+				}
+			}
+		});
+	};
+	d.get_primary_btn().attr('disabled', true);
+	d.data = {};
+	d.show();
+};
+
+var render_dynamic_field = function(d, fieldtype, options, fieldname) {
+	d.data.new = null;
+	var dynamic_field = frappe.ui.form.make_control({
+		df: {
+			"fieldtype": fieldtype,
+			"fieldname": fieldname,
+			"options": options || ''
+		},
+		parent: d.fields_dict.field_html.wrapper,
+		only_input: false
+	});
+	dynamic_field.make_input();
+	$(dynamic_field.label_area).text(__("New"));
+};
+
+var add_to_details = function(frm, d, table) {
+	let data = d.data;
+	if(data.fieldname){
+		if(validate_duplicate(frm, table, data.fieldname)){
+			frappe.show_alert({message:__("Property already added"), indicator:'orange'});
+			return false;
+		}
+		if(data.current == data.new){
+			frappe.show_alert({message:__("Nothing to change"), indicator:'orange'});
+			d.get_primary_btn().attr('disabled', false);
+			return false;
+		}
+		frm.add_child(table, {
+			fieldname: data.fieldname,
+			property: data.property,
+			current: data.current,
+			new: data.new
+		});
+		frm.refresh_field(table);
+		d.fields_dict.field_html.$wrapper.html("");
+		d.set_value("property", "");
+		d.set_value('current', "");
+		frappe.show_alert({message:__("Added to details"),indicator:'green'});
+		d.data = {};
+	}else {
+		frappe.show_alert({message:__("Value missing"),indicator:'red'});
+	}
+};
+
+var validate_duplicate =  function(frm, table, fieldname){
+	let duplicate = false;
+	$.each(frm.doc[table], function(i, detail) {
+		if(detail.fieldname === fieldname){
+			duplicate = true;
+			return;
+		}
+	});
+	return duplicate;
+};
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/hr/report/department_analytics/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/hr/report/department_analytics/__init__.py
diff --git a/erpnext/hr/report/department_analytics/department_analytics.js b/erpnext/hr/report/department_analytics/department_analytics.js
new file mode 100644
index 0000000..a0b6fc7
--- /dev/null
+++ b/erpnext/hr/report/department_analytics/department_analytics.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Department Analytics"] = {
+};
\ No newline at end of file
diff --git a/erpnext/hr/report/department_analytics/department_analytics.json b/erpnext/hr/report/department_analytics/department_analytics.json
new file mode 100644
index 0000000..1e26b33
--- /dev/null
+++ b/erpnext/hr/report/department_analytics/department_analytics.json
@@ -0,0 +1,28 @@
+{
+ "add_total_row": 0, 
+ "creation": "2018-05-15 15:37:20.883263", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2018-05-15 17:19:32.934321", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Department Analytics", 
+ "owner": "Administrator", 
+ "ref_doctype": "Employee", 
+ "report_name": "Department Analytics", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Employee"
+  }, 
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/department_analytics/department_analytics.py b/erpnext/hr/report/department_analytics/department_analytics.py
new file mode 100644
index 0000000..c4a9030
--- /dev/null
+++ b/erpnext/hr/report/department_analytics/department_analytics.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	if not filters: filters = {}
+	columns = get_columns()
+	employees = get_employees(filters)
+	departments_result = get_department(filters)
+	departments = []
+	if departments_result:
+		for department in departments_result:
+			departments.append(department)
+	chart = get_chart_data(departments,employees)
+	return columns, employees, None, chart
+
+def get_columns():
+	return [
+		_("Employee") + ":Link/Employee:120", _("Name") + ":Data:200", _("Date of Birth")+ ":Date:100",
+		_("Branch") + ":Link/Branch:120", _("Department") + ":Link/Department:120",
+		_("Designation") + ":Link/Designation:120", _("Gender") + "::60", _("Company") + ":Link/Company:120"
+	]
+
+def get_conditions(filters):
+	conditions = ""
+	if filters.get("department"): conditions += " and department = '%s'" % \
+		filters["department"].replace("'", "\\'")
+	return conditions
+
+def get_employees(filters):
+	conditions = get_conditions(filters)
+	return frappe.db.sql("""select name, employee_name, date_of_birth,
+	branch, department, designation,
+	gender, company from `tabEmployee` where status = 'Active' %s""" % conditions, as_list=1)
+
+def get_department(filters):
+	return frappe.db.sql("""select name from `tabDepartment`""" , as_list=1)
+	
+def get_chart_data(departments,employees):
+	if not departments:
+		departments = []
+	datasets = []
+	for department in departments:
+		if department:
+			total_employee = frappe.db.sql("""select count(*) from \
+				`tabEmployee` where \
+				department = %s""" ,(department[0]), as_list=1)
+			datasets.append(total_employee[0][0])
+	chart = {
+		"data": {
+			'labels': departments,
+			'datasets': [{'name': 'Employees','values': datasets}]
+		}
+	}
+	chart["type"] = "bar"
+	return chart
+
diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
index 8105e1a..a603015 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
@@ -39,8 +39,7 @@
 	
 	data = []
 	for employee in active_employees:
-		leave_approvers = [l.leave_approver for l in frappe.db.sql("""select leave_approver from `tabEmployee Leave Approver` where parent = %s""",
-							(employee.name),as_dict=True)]
+		leave_approvers = get_approvers(employee.department)
 		if (len(leave_approvers) and user in leave_approvers) or (user in ["Administrator", employee.user_id]) or ("HR Manager" in frappe.get_roles(user)):
 			row = [employee.name, employee.employee_name, employee.department]
 
@@ -54,7 +53,25 @@
 					allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
 
 				row += [leaves_taken, closing]
-			
+
 			data.append(row)
 		
-	return data
\ No newline at end of file
+	return data
+
+def get_approvers(department):
+	if not department:
+		return []
+
+	approvers = []
+	# get current department and all its child
+	department_details = frappe.db.get_value("Department", {"name": department}, ["lft", "rgt"], as_dict=True)
+	department_list = frappe.db.sql("""select name from `tabDepartment`
+		where lft >= %s and rgt <= %s order by lft desc
+		""", (department_details.lft, department_details.rgt), as_list = True)
+
+	# retrieve approvers list from current department and from its subsequent child departments
+	for d in department_list:
+		approvers.extend([l.leave_approver for l in frappe.db.sql("""select approver from `tabDepartment Approver` \
+			where parent = %s and parentfield = 'leave_approver'""", (d), as_dict=True)])
+
+	return approvers
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
index 698c4fb..0c338e0 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
@@ -22,6 +22,10 @@
 	holiday_map = get_holiday(holiday_list, filters["month"])
 
 	data = []
+	leave_types = frappe.db.sql("""select name from `tabLeave Type`""", as_list=True)
+	leave_list = [d[0] for d in leave_types]
+	columns.extend(leave_list)
+
 	for emp in sorted(att_map):
 		emp_det = emp_map.get(emp)
 		if not emp_det:
@@ -49,10 +53,35 @@
 			elif status == "Half Day":
 				total_p += 0.5
 				total_a += 0.5
+				total_l += 0.5
 
 		row += [total_p, total_l, total_a]
-		data.append(row)
 
+		if not filters.get("employee"):
+			filters.update({"employee": emp})
+			conditions += " and employee = %(employee)s"
+		elif not filters.get("employee") == emp:
+			filters.update({"employee": emp})
+
+		leave_details = frappe.db.sql("""select leave_type, status, count(*) as count from `tabAttendance`\
+			where leave_type is not NULL %s group by leave_type, status""" % conditions, filters, as_dict=1)
+
+		leaves = {}
+		for d in leave_details:
+			if d.status == "Half Day":
+				d.count = d.count * 0.5
+			if d.leave_type in leaves:
+				leaves[d.leave_type] += d.count
+			else:
+				leaves[d.leave_type] = d.count
+
+		for d in leave_list:
+			if d in leaves:
+				row.append(leaves[d])
+			else:
+				row.append("0.0")
+
+		data.append(row)
 	return columns, data
 
 def get_columns(filters):
diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py
index aa456aa..01c9784 100644
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -4,7 +4,343 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import formatdate, format_datetime, getdate, get_datetime, nowdate, flt
+from frappe.model.document import Document
+from frappe.desk.form import assign_to
+from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
+
+class EmployeeBoardingController(Document):
+	'''
+		Create the project and the task for the boarding process
+		Assign to the concerned person and roles as per the onboarding/separation template
+	'''
+	def validate(self):
+		# remove the task if linked before submitting the form
+		if self.amended_from:
+			for activity in self.activities:
+				activity.task = ''
+
+	def on_submit(self):
+		# create the project for the given employee onboarding
+		project_name = _(self.doctype) + " : "
+		if self.doctype == "Employee Onboarding":
+			project_name += self.job_applicant
+		else:
+			project_name += self.employee
+		project = frappe.get_doc({
+				"doctype": "Project",
+				"project_name": project_name,
+				"expected_start_date": self.date_of_joining if self.doctype == "Employee Onboarding" else self.resignation_letter_date,
+				"department": self.department,
+				"company": self.company
+			}).insert(ignore_permissions=True)
+		self.db_set("project", project.name)
+
+		# create the task for the given project and assign to the concerned person
+		for activity in self.activities:
+			task = frappe.get_doc({
+					"doctype": "Task",
+					"project": project.name,
+					"subject": activity.activity_name + " : " + self.employee_name,
+					"description": activity.description,
+					"department": self.department,
+					"company": self.company
+				}).insert(ignore_permissions=True)
+			activity.db_set("task", task.name)
+			users = [activity.user] if activity.user else []
+			if activity.role:
+				user_list = frappe.db.sql_list('''select distinct(parent) from `tabHas Role`
+					where parenttype='User' and role=%s''', activity.role)
+				users = users + user_list
+
+			# assign the task the users
+			if users:
+				self.assign_task_to_users(task, set(users))
+
+	def assign_task_to_users(self, task, users):
+		for user in users:
+			args = {
+				'assign_to' 	:	user,
+				'doctype'		:	task.doctype,
+				'name'			:	task.name,
+				'description'	:	task.description or task.subject,
+			}
+			assign_to.add(args)
+
+	def on_cancel(self):
+		# delete task project
+		for task in frappe.get_all("Task", filters={"project": self.project}):
+			frappe.delete_doc("Task", task.name)
+		frappe.delete_doc("Project", self.project)
+		self.db_set('project', '')
+		for activity in self.activities:
+			activity.db_set("task", "")
+
+
+@frappe.whitelist()
+def get_onboarding_details(parent, parenttype):
+	return frappe.get_list("Employee Boarding Activity",
+		fields=["activity_name", "role", "user", "required_for_employee_creation", "description"],
+		filters={"parent": parent, "parenttype": parenttype},
+		order_by= "idx")
 
 def set_employee_name(doc):
 	if doc.employee and not doc.employee_name:
 		doc.employee_name = frappe.db.get_value("Employee", doc.employee, "employee_name")
+
+def update_employee(employee, details, cancel=False):
+	for item in details:
+		fieldtype = frappe.get_meta("Employee").get_field(item.fieldname).fieldtype
+		new_data = item.new if not cancel else item.current
+		if fieldtype == "Date" and new_data:
+			new_data = getdate(new_data)
+		elif fieldtype =="Datetime" and new_data:
+			new_data = get_datetime(new_data)
+		setattr(employee, item.fieldname, new_data)
+	return employee
+
+@frappe.whitelist()
+def get_employee_fields_label():
+	fields = []
+	for df in frappe.get_meta("Employee").get("fields"):
+		if df.fieldtype in ["Data", "Date", "Datetime", "Float", "Int",
+		"Link", "Percent", "Select", "Small Text"] and df.fieldname not in ["lft", "rgt", "old_parent"]:
+			fields.append({"value": df.fieldname, "label": df.label})
+	return fields
+
+@frappe.whitelist()
+def get_employee_field_property(employee, fieldname):
+	if employee and fieldname:
+		field = frappe.get_meta("Employee").get_field(fieldname)
+		value = frappe.db.get_value("Employee", employee, fieldname)
+		options = field.options
+		if field.fieldtype == "Date":
+			value = formatdate(value)
+		elif field.fieldtype == "Datetime":
+			value = format_datetime(value)
+		return {
+			"value" : value,
+			"datatype" : field.fieldtype,
+			"label" : field.label,
+			"options" : options
+		}
+	else:
+		return False
+
+def validate_dates(doc, from_date, to_date):
+	date_of_joining, relieving_date = frappe.db.get_value("Employee", doc.employee, ["date_of_joining", "relieving_date"])
+	if getdate(from_date) > getdate(to_date):
+		frappe.throw(_("To date can not be less than from date"))
+	elif getdate(from_date) > getdate(nowdate()):
+		frappe.throw(_("Future dates not allowed"))
+	elif date_of_joining and getdate(from_date) < getdate(date_of_joining):
+		frappe.throw(_("From date can not be less than employee's joining date"))
+	elif relieving_date and getdate(to_date) > getdate(relieving_date):
+		frappe.throw(_("To date can not greater than employee's relieving date"))
+
+def validate_overlap(doc, from_date, to_date, company = None):
+	query = """
+		select name
+		from `tab{0}`
+		where name != %(name)s
+		"""
+	query += get_doc_condition(doc.doctype)
+
+	if not doc.name:
+		# hack! if name is null, it could cause problems with !=
+		doc.name = "New "+doc.doctype
+
+	overlap_doc = frappe.db.sql(query.format(doc.doctype),{
+			"employee": doc.employee,
+			"from_date": from_date,
+			"to_date": to_date,
+			"name": doc.name,
+			"company": company
+		}, as_dict = 1)
+
+	if overlap_doc:
+		exists_for = doc.employee
+		if company:
+			exists_for = company
+		throw_overlap_error(doc, exists_for, overlap_doc[0].name, from_date, to_date)
+
+def get_doc_condition(doctype):
+	if doctype == "Compensatory Leave Request":
+		return "and employee = %(employee)s and docstatus < 2 \
+		and (work_from_date between %(from_date)s and %(to_date)s \
+		or work_end_date between %(from_date)s and %(to_date)s \
+		or (work_from_date < %(from_date)s and work_end_date > %(to_date)s))"
+	elif doctype == "Leave Period":
+		return "and company = %(company)s and (from_date between %(from_date)s and %(to_date)s \
+			or to_date between %(from_date)s and %(to_date)s \
+			or (from_date < %(from_date)s and to_date > %(to_date)s))"
+
+def throw_overlap_error(doc, exists_for, overlap_doc, from_date, to_date):
+	msg = _("A {0} exists between {1} and {2} (").format(doc.doctype,
+		formatdate(from_date), formatdate(to_date)) \
+		+ """ <b><a href="#Form/{0}/{1}">{1}</a></b>""".format(doc.doctype, overlap_doc) \
+		+ _(") for {0}").format(exists_for)
+	frappe.throw(msg)
+
+def get_employee_leave_policy(employee):
+	leave_policy = frappe.db.get_value("Employee", employee, "leave_policy")
+	if not leave_policy:
+		employee_grade = frappe.db.get_value("Employee", employee, "grade")
+		if employee_grade:
+			leave_policy = frappe.db.get_value("Employee Grade", employee_grade, "default_leave_policy")
+			if not leave_policy:
+				frappe.throw(_("Employee {0} of grade {1} have no default leave policy").format(employee, employee_grade))
+		else:
+			frappe.throw(_("Employee {0} has no grade to get default leave policy").format(employee))
+	if leave_policy:
+		return frappe.get_doc("Leave Policy", leave_policy)
+
+def validate_tax_declaration(declarations):
+	subcategories = []
+	for declaration in declarations:
+		if declaration.exemption_sub_category in  subcategories:
+			frappe.throw(_("More than one selection for {0} not \
+			allowed").format(declaration.exemption_sub_category), frappe.ValidationError)
+		subcategories.append(declaration.exemption_sub_category)
+		max_amount = frappe.db.get_value("Employee Tax Exemption Sub Category", \
+		declaration.exemption_sub_category, "max_amount")
+		if declaration.amount > max_amount:
+			frappe.throw(_("Max exemption amount for {0} is {1}").format(\
+			declaration.exemption_sub_category, max_amount), frappe.ValidationError)
+
+def get_leave_period(from_date, to_date, company):
+	leave_period = frappe.db.sql("""
+		select name, from_date, to_date
+		from `tabLeave Period`
+		where company=%(company)s and is_active=1
+			and (from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (from_date < %(from_date)s and to_date > %(to_date)s))
+	""", {
+		"from_date": from_date,
+		"to_date": to_date,
+		"company": company
+	}, as_dict=1)
+
+	if leave_period:
+		return leave_period
+
+def get_payroll_period(from_date, to_date, company):
+	payroll_period = frappe.db.sql("""select name, start_date, end_date from
+		`tabPayroll Period`
+		where start_date<=%s and end_date>= %s and company=%s""", (from_date, to_date, company), as_dict=1)
+	return payroll_period[0] if payroll_period else None
+
+def allocate_earned_leaves():
+	'''Allocate earned leaves to Employees'''
+	e_leave_types = frappe.get_all("Leave Type",
+		fields=["name", "max_leaves_allowed", "earned_leave_frequency", "rounding"],
+		filters={'is_earned_leave' : 1})
+	today = getdate()
+	divide_by_frequency = {"Yearly": 1, "Quarterly": 4, "Monthly": 12}
+	if e_leave_types:
+		for e_leave_type in e_leave_types:
+			leave_allocations = frappe.db.sql("""select name, employee, from_date, to_date from `tabLeave Allocation` where '{0}'
+				between from_date and to_date and docstatus=1 and leave_type='{1}'"""
+				.format(today, e_leave_type.name), as_dict=1)
+			for allocation in leave_allocations:
+				leave_policy = get_employee_leave_policy(allocation.employee)
+				if not leave_policy:
+					continue
+				if not e_leave_type.earned_leave_frequency == "Monthly":
+					if not check_frequency_hit(allocation.from_date, today, e_leave_type.earned_leave_frequency):
+						continue
+				annual_allocation = frappe.db.sql("""select annual_allocation from `tabLeave Policy Detail`
+					where parent=%s and leave_type=%s""", (leave_policy.name, e_leave_type.name))
+				if annual_allocation and annual_allocation[0]:
+					earned_leaves = flt(annual_allocation[0][0]) / divide_by_frequency[e_leave_type.earned_leave_frequency]
+					if e_leave_type.rounding == "0.5":
+						earned_leaves = round(earned_leaves * 2) / 2
+					else:
+						earned_leaves = round(earned_leaves)
+
+					allocated_leaves = frappe.db.get_value('Leave Allocation', allocation.name, 'total_leaves_allocated')
+					new_allocation = flt(allocated_leaves) + flt(earned_leaves)
+					new_allocation = new_allocation if new_allocation <= e_leave_type.max_leaves_allowed else e_leave_type.max_leaves_allowed
+					frappe.db.set_value('Leave Allocation', allocation.name, 'total_leaves_allocated', new_allocation)
+
+def check_frequency_hit(from_date, to_date, frequency):
+	'''Return True if current date matches frequency'''
+	from_dt = get_datetime(from_date)
+	to_dt = get_datetime(to_date)
+	from dateutil import relativedelta
+	rd = relativedelta.relativedelta(to_dt, from_dt)
+	months = rd.months
+	if frequency == "Quarterly":
+		if not months % 3:
+			return True
+	elif frequency == "Yearly":
+		if not months % 12:
+			return True
+	return False
+
+def get_salary_assignment(employee, date):
+	assignment = frappe.db.sql("""
+		select * from `tabSalary Structure Assignment`
+		where employee=%(employee)s
+		and docstatus = 1
+		and (
+			(%(on_date)s between from_date and ifnull(to_date, '2199-12-31'))
+		)""", {
+			'employee': employee,
+			'on_date': date,
+		}, as_dict=1)
+	return assignment[0] if assignment else None
+
+def calculate_eligible_hra_exemption(company, employee, monthly_house_rent, rented_in_metro_city):
+	hra_component = frappe.db.get_value("Company", company, "hra_component")
+	annual_exemption, monthly_exemption, hra_amount = 0, 0, 0
+	if hra_component:
+		assignment = get_salary_assignment(employee, getdate())
+		if assignment and frappe.db.exists("Salary Detail", {
+			"parent": assignment.salary_structure,
+			"salary_component": hra_component, "parentfield": "earnings"}):
+			hra_amount = get_hra_from_salary_slip(employee, assignment.salary_structure, hra_component)
+			if hra_amount:
+				if monthly_house_rent:
+					annual_exemption = calculate_hra_exemption(assignment.salary_structure,
+					 				assignment.base, hra_amount, monthly_house_rent,
+									rented_in_metro_city)
+					if annual_exemption > 0:
+						monthly_exemption = annual_exemption / 12
+					else:
+						annual_exemption = 0
+	return {"hra_amount": hra_amount, "annual_exemption": annual_exemption, "monthly_exemption": monthly_exemption}
+
+def get_hra_from_salary_slip(employee, salary_structure, hra_component):
+	salary_slip = make_salary_slip(salary_structure, employee=employee)
+	for earning in salary_slip.earnings:
+		if earning.salary_component == hra_component:
+			return earning.amount
+
+def calculate_hra_exemption(salary_structure, base, monthly_hra, monthly_house_rent, rented_in_metro_city):
+	# TODO make this configurable
+	exemptions = []
+	frequency = frappe.get_value("Salary Structure", salary_structure, "payroll_frequency")
+	# case 1: The actual amount allotted by the employer as the HRA.
+	exemptions.append(get_annual_component_pay(frequency, monthly_hra))
+	actual_annual_rent = monthly_house_rent * 12
+	annual_base = get_annual_component_pay(frequency, base)
+	# case 2: Actual rent paid less 10% of the basic salary.
+	exemptions.append(flt(actual_annual_rent) - flt(annual_base * 0.1))
+	# case 3: 50% of the basic salary, if the employee is staying in a metro city (40% for a non-metro city).
+	exemptions.append(annual_base * 0.5 if rented_in_metro_city else annual_base * 0.4)
+	# return minimum of 3 cases
+	return min(exemptions)
+
+def get_annual_component_pay(frequency, amount):
+	if frequency == "Daily":
+		return amount * 365
+	elif frequency == "Weekly":
+		return amount * 52
+	elif frequency == "Fortnightly":
+		return amount * 26
+	elif frequency == "Monthly":
+		return amount * 12
+	elif frequency == "Bimonthly":
+		return amount * 6
\ No newline at end of file
diff --git a/erpnext/hub_node/__init__.py b/erpnext/hub_node/__init__.py
index 89ee926..65b1386 100644
--- a/erpnext/hub_node/__init__.py
+++ b/erpnext/hub_node/__init__.py
@@ -187,7 +187,7 @@
 		supplier_doc = frappe.get_doc({
 			'doctype': 'Supplier',
 			'supplier_name': supplier.supplier_name,
-			'supplier_type': supplier.supplier_type,
+			'supplier_group': supplier.supplier_group,
 			'supplier_email': supplier.supplier_email
 		}).insert()
 	else:
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.js b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
index 64d20b8..29d870b 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.js
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
@@ -6,8 +6,7 @@
 			}));
 
 		frm.trigger("enabled");
-		frm.add_custom_button(__('View Hub'),
-			() => frappe.set_route('Hub', 'Item'));
+
 		if (frm.doc.enabled) {
 			frm.add_custom_button(__('Sync'),
 				() => frm.call('sync'));
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
index 0a74436..7cd3086 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
@@ -202,7 +202,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index 2f159e9..b371dfc 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -43,6 +43,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -51,6 +52,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -65,7 +67,7 @@
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
-   "options": "item_code.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -75,6 +77,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -83,6 +86,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.description",
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -97,7 +101,7 @@
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Data", 
-   "options": "item_code.description", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -108,6 +112,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "300px"
   }, 
@@ -138,6 +143,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -169,6 +175,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -200,6 +207,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,6 +240,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -263,6 +272,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -295,6 +305,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -324,6 +335,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -355,6 +367,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -388,6 +401,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }
@@ -402,7 +416,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-10-17 08:37:28.964789", 
+ "modified": "2018-05-16 22:43:14.260729",
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule Item", 
diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
index e55f562..d2a0ffa 100644
--- a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
+++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
@@ -328,7 +328,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 531da8a..c706be9 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -68,6 +68,15 @@
 		frm.toggle_enable("item", frm.doc.__islocal);
 		toggle_operations(frm);
 
+		frm.set_indicator_formatter('item_code',
+			function(doc) {
+				if (doc.original_item){
+					return (doc.item_code != doc.original_item) ? "orange" : ""
+				}
+				return ""
+			}
+		)
+
 		if (!frm.doc.__islocal && frm.doc.docstatus<2) {
 			frm.add_custom_button(__("Update Cost"), function() {
 				frm.events.update_cost(frm);
@@ -85,6 +94,24 @@
 				frm.copy_doc();
 			});
 		}
+
+		if(frm.doc.items && frm.doc.allow_alternative_item) {
+			const has_alternative = frm.doc.items.find(i => i.allow_alternative_item === 1);
+			if (frm.doc.docstatus == 0 && has_alternative) {
+				frm.add_custom_button(__('Alternate Item'), () => {
+					erpnext.utils.select_alternate_items({
+						frm: frm,
+						child_docname: "items",
+						warehouse_field: "source_warehouse",
+						child_doctype: "BOM Item",
+						original_item_field: "original_item",
+						condition: (d) => {
+							if (d.allow_alternative_item) {return true;}
+						}
+					})
+				});
+			}
+		}
 	},
 
 	update_cost: function(frm) {
@@ -338,6 +365,14 @@
 	refresh_field("stock_qty", d.name, d.parentfield);
 });
 
+frappe.ui.form.on("BOM Item", "item_code", function(frm, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	frappe.db.get_value('Item', {name: d.item_code}, 'allow_alternative_item', (r) => {
+		d.allow_alternative_item = r.allow_alternative_item
+	})
+	refresh_field("allow_alternative_item", d.name, d.parentfield);
+});
+
 frappe.ui.form.on("BOM Operation", "operations_remove", function(frm) {
 	erpnext.bom.calculate_op_cost(frm.doc);
 	erpnext.bom.calculate_total(frm.doc);
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index b2f7bb3..69a75c4 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -13,6 +13,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -47,6 +48,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -79,6 +81,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -113,6 +116,39 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -144,6 +180,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -177,6 +214,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -206,6 +244,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -239,6 +278,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -272,6 +312,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -303,6 +344,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -334,6 +376,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -366,6 +409,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -398,6 +442,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -429,6 +474,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -460,6 +506,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -492,6 +539,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -522,6 +570,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -554,6 +603,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -585,6 +635,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -618,6 +669,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -651,6 +703,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -682,6 +735,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -715,6 +769,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -746,6 +801,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -778,6 +834,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -809,6 +866,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -840,6 +898,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -871,6 +930,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -903,6 +963,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -932,6 +993,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -964,6 +1026,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -996,6 +1059,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1028,6 +1092,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1058,6 +1123,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1089,6 +1155,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1119,6 +1186,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1151,6 +1219,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1181,6 +1250,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1214,6 +1284,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1245,6 +1316,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1274,37 +1346,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1335,6 +1377,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1365,6 +1408,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1395,6 +1439,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1426,6 +1471,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1458,6 +1504,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1489,6 +1536,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1522,6 +1570,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1554,6 +1603,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1586,6 +1636,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1617,6 +1668,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1650,6 +1702,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1681,6 +1734,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1714,6 +1768,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1746,6 +1801,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1778,6 +1834,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1820,7 +1877,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-26 22:51:40.232456", 
+ "modified": "2018-06-01 03:45:06.731308", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
@@ -1828,7 +1885,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1848,7 +1904,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 007299a..18914eb 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -303,7 +303,7 @@
 		if self.currency == self.company_currency():
 			self.conversion_rate = 1
 		elif self.conversion_rate == 1 or flt(self.conversion_rate) <= 0:
-			self.conversion_rate = get_exchange_rate(self.currency, self.company_currency())
+			self.conversion_rate = get_exchange_rate(self.currency, self.company_currency(), args="for_buying")
 
 	def validate_materials(self):
 		""" Validate raw material entries """
@@ -544,17 +544,19 @@
 				item.image,
 				item.stock_uom,
 				item.allow_alternative_item,
-				item.default_warehouse,
-				item.expense_account as expense_account,
-				item.buying_cost_center as cost_center
+				item_default.default_warehouse,
+				item_default.expense_account as expense_account,
+				item_default.buying_cost_center as cost_center
 				{select_columns}
 			from
-				`tab{table}` bom_item, `tabBOM` bom, `tabItem` item
+				`tab{table}` bom_item
+				JOIN `tabBOM` bom ON bom_item.parent = bom.name
+				JOIN `tabItem` item ON item.name = bom_item.item_code
+				LEFT JOIN `tabItem Default` item_default
+					ON item_default.parent = item.name and item_default.company = %(company)s
 			where
 				bom_item.docstatus < 2
 				and bom.name = %(bom)s
-				and bom_item.parent = bom.name
-				and item.name = bom_item.item_code
 				and is_stock_item = 1
 				{where_conditions}
 				group by item_code, stock_uom
@@ -564,14 +566,14 @@
 		query = query.format(table="BOM Explosion Item",
 			where_conditions="",
 			select_columns = ", bom_item.source_warehouse, (Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx")
-		items = frappe.db.sql(query, { "parent": bom, "qty": qty,	"bom": bom }, as_dict=True)
+		items = frappe.db.sql(query, { "parent": bom, "qty": qty, "bom": bom, "company": company }, as_dict=True)
 	elif fetch_scrap_items:
 		query = query.format(table="BOM Scrap Item", where_conditions="", select_columns=", bom_item.idx")
-		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
+		items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True)
 	else:
 		query = query.format(table="BOM Item", where_conditions="",
 			select_columns = ", bom_item.source_warehouse, bom_item.idx")
-		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
+		items = frappe.db.sql(query, { "qty": qty, "bom": bom, "company": company }, as_dict=True)
 
 	for item in items:
 		if item.item_code in item_dict:
@@ -591,6 +593,7 @@
 @frappe.whitelist()
 def get_bom_items(bom, company, qty=1, fetch_exploded=1):
 	items = get_bom_items_as_dict(bom, company, qty, fetch_exploded).values()
+	items = list(items)
 	items.sort(key = functools.cmp_to_key(lambda a, b: a.item_code > b.item_code and 1 or -1))
 	return items
 
@@ -623,18 +626,28 @@
 		return
 
 	if frappe.form_dict.parent:
-		return frappe.db.sql("""select
-			bom_item.item_code,
-			bom_item.bom_no as value,
-			bom_item.stock_qty,
-			if(ifnull(bom_item.bom_no, "")!="", 1, 0) as expandable,
-			item.image,
-			item.description
-			from `tabBOM Item` bom_item, tabItem item
-			where bom_item.parent=%s
-			and bom_item.item_code = item.name
-			order by bom_item.idx
-			""", frappe.form_dict.parent, as_dict=True)
+		bom_items = frappe.get_list('BOM Item',
+			fields=['item_code', 'bom_no as value', 'stock_qty'],
+			filters=[['parent', '=', frappe.form_dict.parent]],
+			order_by='idx')
+
+		item_names = tuple(d.get('item_code') for d in bom_items)
+
+		items = frappe.get_list('Item',
+			fields=['image', 'description', 'name'],
+			filters=[['name', 'in', item_names]]) # to get only required item dicts
+
+		for bom_item in bom_items:
+			# extend bom_item dict with respective item dict
+			bom_item.update(
+				# returns an item dict from items list which matches with item_code
+				(item for item in items if item.get('name')
+					== bom_item.get('item_code')).next()
+			)
+			bom_item.expandable = 0 if bom_item.value in ('', None)  else 1
+
+		return bom_items
+
 
 def get_boms_in_bottom_up_order(bom_no=None):
 	def _get_parent(bom_no):
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index 5147bd0..3f1fef0 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -100,6 +102,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -133,6 +136,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150px"
   }, 
@@ -165,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -195,6 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -227,6 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "250px"
   }, 
@@ -256,6 +263,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -286,6 +294,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -317,6 +326,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -346,6 +356,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -377,6 +388,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -408,6 +420,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -436,6 +449,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -468,6 +482,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -500,6 +515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -530,6 +546,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -560,6 +577,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -591,6 +609,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -622,6 +641,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -651,6 +671,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -684,6 +705,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150px"
   }, 
@@ -716,6 +738,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -745,6 +768,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -776,6 +800,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -807,6 +832,100 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_27", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_alternative_item", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Alternative Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "original_item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Original Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -820,7 +939,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-08-18 16:22:46.078661", 
+ "modified": "2018-04-17 11:01:32.458783", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Item", 
diff --git a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
index 7df728b..b6e20af 100644
--- a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
+++ b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
@@ -154,7 +154,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
index 8f28dd7..3fad2ef 100644
--- a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
+++ b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
@@ -154,7 +154,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 0c0c870..461b9ab 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -1,539 +1,585 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2014-11-27 14:12:07.542534",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2014-11-27 14:12:07.542534", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "capacity_planning",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Capacity Planning",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "capacity_planning", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Capacity Planning", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order",
-   "fieldname": "disable_capacity_planning",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Disable Capacity Planning and Time Tracking",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order", 
+   "fieldname": "disable_capacity_planning", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disable Capacity Planning and Time Tracking", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Plan time logs outside Workstation Working Hours.",
-   "fieldname": "allow_overtime",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Overtime",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Plan time logs outside Workstation Working Hours.", 
+   "fieldname": "allow_overtime", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Overtime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "allow_production_on_holidays",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Allow Production on Holidays",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "allow_production_on_holidays", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Allow Production on Holidays", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "30",
-   "description": "Try planning operations for X days in advance.",
-   "fieldname": "capacity_planning_for_days",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Capacity Planning For (Days)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "30", 
+   "description": "Try planning operations for X days in advance.", 
+   "fieldname": "capacity_planning_for_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Capacity Planning For (Days)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Default 10 mins",
-   "fieldname": "mins_between_operations",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Time Between Operations (in mins)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Default 10 mins", 
+   "fieldname": "mins_between_operations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Time Between Operations (in mins)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "over_production_allowance_percentage",
-   "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Over Production Allowance Percentage",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "overproduction_percentage_for_sales_order", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Overproduction Percentage For Sales Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "BOM",
-   "fieldname": "backflush_raw_materials_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Backflush Raw Materials Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "BOM\nMaterial Transferred for Manufacture",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "overproduction_percentage_for_work_order", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Overproduction Percentage For Work Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Allow multiple Material Consumption against a Work Order",
-   "fieldname": "material_consumption",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Multiple Material Consumption",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "BOM", 
+   "fieldname": "backflush_raw_materials_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Backflush Raw Materials Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM\nMaterial Transferred for Manufacture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",
-   "fieldname": "update_bom_costs_automatically",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Update BOM Cost Automatically",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Allow multiple Material Consumption against a Work Order", 
+   "fieldname": "material_consumption", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Multiple Material Consumption", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.", 
+   "fieldname": "update_bom_costs_automatically", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Update BOM Cost Automatically", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_wip_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Work In Progress Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_fg_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Finished Goods Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_wip_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Work In Progress Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_fg_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Finished Goods Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-wrench",
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2018-03-28 13:56:31.187520",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Manufacturing Settings",
- "name_case": "",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-wrench", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2018-05-28 00:46:25.310621", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "Manufacturing Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Manufacturing Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Manufacturing Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 69eb449..c231fba 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -103,7 +103,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 1d31042..46fdb85 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -28,42 +28,12 @@
 
 	def get_open_sales_orders(self):
 		""" Pull sales orders  which are pending to deliver based on criteria selected"""
-		so_filter = item_filter = ""
-		if self.from_date:
-			so_filter += " and so.transaction_date >= %(from_date)s"
-		if self.to_date:
-			so_filter += " and so.transaction_date <= %(to_date)s"
-		if self.customer:
-			so_filter += " and so.customer = %(customer)s"
-		if self.project:
-			so_filter += " and so.project = %(project)s"
+		open_so = get_sales_orders(self)
 
-		if self.item_code:
-			item_filter += " and so_item.item_code = %(item)s"
-
-		open_so = frappe.db.sql("""
-			select distinct so.name, so.transaction_date, so.customer, so.base_grand_total
-			from `tabSales Order` so, `tabSales Order Item` so_item
-			where so_item.parent = so.name
-				and so.docstatus = 1 and so.status not in ("Stopped", "Closed")
-				and so.company = %(company)s
-				and so_item.qty > so_item.delivered_qty {0} {1}
-				and (exists (select name from `tabBOM` bom where bom.item=so_item.item_code
-						and bom.is_active = 1)
-					or exists (select name from `tabPacked Item` pi
-						where pi.parent = so.name and pi.parent_item = so_item.item_code
-							and exists (select name from `tabBOM` bom where bom.item=pi.item_code
-								and bom.is_active = 1)))
-			""".format(so_filter, item_filter), {
-				"from_date": self.from_date,
-				"to_date": self.to_date,
-				"customer": self.customer,
-				"project": self.project,
-				"item": self.item_code,
-				"company": self.company
-			}, as_dict=1)
-
-		self.add_so_in_table(open_so)
+		if open_so:
+			self.add_so_in_table(open_so)
+		else:
+			frappe.msgprint(_("Sales orders are not available for production"))
 
 	def add_so_in_table(self, open_so):
 		""" Add sales orders in the table"""
@@ -136,23 +106,23 @@
 			item_condition = ' and so_item.item_code = "{0}"'.format(frappe.db.escape(self.item_code))
 
 		items = frappe.db.sql("""select distinct parent, item_code, warehouse,
-			(qty - delivered_qty)*conversion_factor as pending_qty
+			(qty - work_order_qty) * conversion_factor as pending_qty, name
 			from `tabSales Order Item` so_item
-			where parent in (%s) and docstatus = 1 and qty > delivered_qty
+			where parent in (%s) and docstatus = 1 and qty > work_order_qty
 			and exists (select name from `tabBOM` bom where bom.item=so_item.item_code
 					and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
 
 		if self.item_code:
-			item_condition = ' and pi.item_code = "{0}"'.format(frappe.db.escape(self.item_code))
+			item_condition = ' and so_item.item_code = "{0}"'.format(frappe.db.escape(self.item_code))
 
 		packed_items = frappe.db.sql("""select distinct pi.parent, pi.item_code, pi.warehouse as warehouse,
-			(((so_item.qty - so_item.delivered_qty) * pi.qty) / so_item.qty)
-				as pending_qty
+			(((so_item.qty - so_item.work_order_qty) * pi.qty) / so_item.qty)
+				as pending_qty, pi.parent_item, so_item.name
 			from `tabSales Order Item` so_item, `tabPacked Item` pi
 			where so_item.parent = pi.parent and so_item.docstatus = 1
 			and pi.parent_item = so_item.item_code
-			and so_item.parent in (%s) and so_item.qty > so_item.delivered_qty
+			and so_item.parent in (%s) and so_item.qty > so_item.work_order_qty
 			and exists (select name from `tabBOM` bom where bom.item=pi.item_code
 					and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
@@ -194,7 +164,8 @@
 				'bom_no': item_details and item_details.bom_no or '',
 				'planned_qty': data.pending_qty,
 				'pending_qty': data.pending_qty,
-				'planned_start_date': now_datetime()
+				'planned_start_date': now_datetime(),
+				'product_bundle_item': data.parent_item
 			})
 
 			if self.get_items_from == "Sales Order":
@@ -261,6 +232,9 @@
 			self.status = 'In Process'
 
 	def update_requested_status(self):
+		if not self.mr_items:
+			return
+
 		update_status = True
 		for d in self.mr_items:
 			if d.quantity != d.requested_qty:
@@ -276,6 +250,7 @@
 				"production_item"		: d.item_code,
 				"use_multi_level_bom"   : d.include_exploded_items,
 				"sales_order"			: d.sales_order,
+				"sales_order_item"		: d.sales_order_item,
 				"material_request"		: d.material_request,
 				"material_request_item"	: d.material_request_item,
 				"bom_no"				: d.bom_no,
@@ -284,7 +259,8 @@
 				"company"				: self.company,
 				"fg_warehouse"			: d.warehouse,
 				"production_plan"       : self.name,
-				"production_plan_item"  : d.name
+				"production_plan_item"  : d.name,
+				"product_bundle_item"	: d.product_bundle_item
 			}
 
 			item_details.update({
@@ -317,14 +293,18 @@
 				for d in frappe.db.sql("""select bei.item_code, item.default_bom as bom,
 						ifnull(sum(bei.stock_qty/ifnull(bom.quantity, 1)), 0) as qty, item.item_name,
 						bei.description, bei.stock_uom, item.min_order_qty, bei.source_warehouse,
-						item.default_material_request_type, item.min_order_qty, item.default_warehouse
+						item.default_material_request_type, item.min_order_qty, item_default.default_warehouse
 					from
-						`tabBOM Explosion Item` bei, `tabBOM` bom, `tabItem` item
+						`tabBOM Explosion Item` bei 
+						JOIN `tabBOM` bom ON bom.name = bei.parent
+						JOIN `tabItem` item ON item.name = bei.item_code
+						LEFT JOIN `tabItem Default` item_default
+							ON item_default.parent = item.name and item_default.company=%s
 					where
-						bom.name = bei.parent and item.name = bei.item_code 
-						and bei.docstatus < 2 and bom.name=%s and item.is_stock_item in (1, {0})
+						bei.docstatus < 2 
+						and bom.name=%s and item.is_stock_item in (1, {0})
 					group by bei.item_code, bei.stock_uom""".format(self.include_non_stock_items),
-					data.bom_no, as_dict=1):
+					(self.company, data.bom_no), as_dict=1):
 						bom_wise_item_details.setdefault(d.item_code, d)
 			else:
 				bom_wise_item_details = self.get_subitems(data, bom_wise_item_details, data.bom_no, 1)
@@ -341,16 +321,21 @@
 				item.is_sub_contracted_item as is_sub_contracted, bom_item.source_warehouse,
 				item.default_bom as default_bom, bom_item.description as description,
 				bom_item.stock_uom as stock_uom, item.min_order_qty as min_order_qty,
-				item.default_warehouse
+				item_default.default_warehouse
 			FROM
-				`tabBOM Item` bom_item, `tabBOM` bom, tabItem item
+				`tabBOM Item` bom_item
+				JOIN `tabBOM` bom ON bom.name = bom_item.parent
+				JOIN tabItem item ON bom_item.item_code = item.name
+				LEFT JOIN `tabItem Default` item_default
+					ON item.name = item_default.parent and item_default.company = %(company)s
 			where
-				bom.name = bom_item.parent and bom.name = %(bom)s
-				and bom_item.docstatus < 2 and bom_item.item_code = item.name
+				bom.name = %(bom)s
+				and bom_item.docstatus < 2
 				and item.is_stock_item in (1, {0})
 			group by bom_item.item_code""".format(self.include_non_stock_items),{
 				'bom': bom_no,
-				'parent_qty': parent_qty
+				'parent_qty': parent_qty,
+				'company': self.company
 			}, as_dict=1)
 
 		for d in items:
@@ -375,10 +360,10 @@
 		requested_qty = 0
 		if self.ignore_existing_ordered_qty:
 			requested_qty = total_qty
-		elif total_qty > projected_qty:
+		else:
 			requested_qty = total_qty - projected_qty
 
-		if requested_qty and requested_qty < row.min_order_qty:
+		if requested_qty > 0 and requested_qty < row.min_order_qty:
 			requested_qty = row.min_order_qty
 
 		if requested_qty > 0:
@@ -482,6 +467,44 @@
 
 		return item_details
 
+def get_sales_orders(self):
+	so_filter = item_filter = ""
+	if self.from_date:
+		so_filter += " and so.transaction_date >= %(from_date)s"
+	if self.to_date:
+		so_filter += " and so.transaction_date <= %(to_date)s"
+	if self.customer:
+		so_filter += " and so.customer = %(customer)s"
+	if self.project:
+		so_filter += " and so.project = %(project)s"
+
+	if self.item_code:
+		item_filter += " and so_item.item_code = %(item)s"
+
+	open_so = frappe.db.sql("""
+		select distinct so.name, so.transaction_date, so.customer, so.base_grand_total
+		from `tabSales Order` so, `tabSales Order Item` so_item
+		where so_item.parent = so.name
+			and so.docstatus = 1 and so.status not in ("Stopped", "Closed")
+			and so.company = %(company)s
+			and so_item.qty > so_item.work_order_qty {0} {1}
+			and (exists (select name from `tabBOM` bom where bom.item=so_item.item_code
+					and bom.is_active = 1)
+				or exists (select name from `tabPacked Item` pi
+					where pi.parent = so.name and pi.parent_item = so_item.item_code
+						and exists (select name from `tabBOM` bom where bom.item=pi.item_code
+							and bom.is_active = 1)))
+		""".format(so_filter, item_filter), {
+			"from_date": self.from_date,
+			"to_date": self.to_date,
+			"customer": self.customer,
+			"project": self.project,
+			"item": self.item_code,
+			"company": self.company
+		}, as_dict=1)
+
+	return open_so
+
 @frappe.whitelist()
 def get_bin_details(row):
 	if isinstance(row, string_types):
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 0a17708..7f753db 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -7,7 +7,9 @@
 import unittest
 from frappe.utils import nowdate, now_datetime, flt
 from erpnext.stock.doctype.item.test_item import create_item
+from erpnext.manufacturing.doctype.production_plan.production_plan import get_sales_orders
 from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
 class TestProductionPlan(unittest.TestCase):
 	def setUp(self):
@@ -26,7 +28,6 @@
 			'Test Production Item 1': ['Raw Material Item 1', 'Subassembly Item 1',
 			'Test Non Stock Raw Material']}.items():
 			if not frappe.db.get_value('BOM', {'item': item}):
-				print(item, raw_materials)
 				make_bom(item = item, raw_materials = raw_materials)
 
 	def test_production_plan(self):
@@ -95,6 +96,52 @@
 		sr2.cancel()
 		pln.cancel()
 
+	def test_production_plan_sales_orders(self):
+		item = 'Test Production Item 1'
+		so = make_sales_order(item_code=item, qty=5)
+		sales_order = so.name
+		sales_order_item = so.items[0].name
+
+		pln = frappe.new_doc('Production Plan')
+		pln.company = so.company
+		pln.get_items_from = 'Sales Order'
+
+		pln.append('sales_orders', {
+			'sales_order': so.name,
+			'sales_order_date': so.transaction_date,
+			'customer': so.customer,
+			'grand_total': so.grand_total
+		})
+
+		pln.get_so_items()
+		pln.submit()
+		pln.make_work_order()
+
+		work_order = frappe.db.get_value('Work Order', {'sales_order': sales_order,
+			'production_plan': pln.name, 'sales_order_item': sales_order_item}, 'name')
+
+		wo_doc = frappe.get_doc('Work Order', work_order)
+		wo_doc.update({
+			'wip_warehouse': '_Test Warehouse 1 - _TC',
+			'fg_warehouse': '_Test Warehouse - _TC'
+		})
+		wo_doc.submit()
+
+		so_wo_qty = frappe.db.get_value('Sales Order Item', sales_order_item, 'work_order_qty')
+		self.assertTrue(so_wo_qty, 5)
+
+		pln = frappe.new_doc('Production Plan')
+		pln.update({
+			'from_date': so.transaction_date,
+			'to_date': so.transaction_date,
+			'customer': so.customer,
+			'item_code': item
+		})
+		sales_orders = get_sales_orders(pln) or {}
+		sales_orders = [d.get('name') for d in sales_orders if d.get('name') == sales_order]
+
+		self.assertEqual(sales_orders, [])
+
 def create_production_plan(**args):
 	args = frappe._dict(args)
 
diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index 3a8bcd9..4e78f61 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -39,6 +39,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150px"
   }, 
@@ -106,6 +108,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -139,6 +142,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -171,6 +175,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -200,6 +205,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -231,6 +237,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -261,6 +268,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -293,6 +301,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -323,6 +332,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -354,6 +364,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -386,6 +397,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -420,6 +432,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "80px"
   }, 
@@ -453,6 +466,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "200px"
   }, 
@@ -484,6 +498,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -514,6 +529,39 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "product_bundle_item", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Product Bundle Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -527,7 +575,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-16 12:13:41.513586", 
+ "modified": "2018-04-25 17:19:24.572528", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Item", 
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index fc8eaa1..672ec26 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -121,6 +121,24 @@
 				})
 			})
 		}
+
+		if(frm.doc.required_items && frm.doc.allow_alternative_item) {
+			const has_alternative = frm.doc.required_items.find(i => i.allow_alternative_item === 1);
+			if (frm.doc.docstatus == 0 && has_alternative) {
+				frm.add_custom_button(__('Alternate Item'), () => {
+					erpnext.utils.select_alternate_items({
+						frm: frm,
+						child_docname: "required_items",
+						warehouse_field: "source_warehouse",
+						child_doctype: "Work Order Item",
+						original_item_field: "original_item",
+						condition: (d) => {
+							if (d.allow_alternative_item) {return true;}
+						}
+					})
+				});
+			}
+		}
 	},
 
 	show_progress: function(frm) {
@@ -140,15 +158,15 @@
 			added_min = 0.5;
 		}
 		message = title;
-
 		// pending qty
 		if(!frm.doc.skip_transfer){
 			var pending_complete = frm.doc.material_transferred_for_manufacturing - frm.doc.produced_qty;
 			if(pending_complete) {
 				var title = __('{0} items in progress', [pending_complete]);
+				var width = ((pending_complete / frm.doc.qty * 100) - added_min);
 				bars.push({
 					'title': title,
-					'width': ((pending_complete / frm.doc.qty * 100) - added_min)  + '%',
+					'width': (width > 100 ? "99.5" : width)  + '%',
 					'progress_class': 'progress-bar-warning'
 				})
 				message = message + '. ' + title;
@@ -338,7 +356,7 @@
 							erpnext.work_order.make_se(frm, 'Manufacture');
 						});
 
-						if(doc.material_transferred_for_manufacturing==doc.qty) {
+						if(doc.material_transferred_for_manufacturing>=doc.qty) {
 							// all materials transferred for manufacturing, make this primary
 							finish_btn.addClass('btn-primary');
 						}
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 1cc2459..29e0048 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -1487,6 +1487,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "product_bundle_item", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Product Bundle Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 90a7149..d10fd21 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -24,6 +24,8 @@
 class OperationTooLongError(frappe.ValidationError): pass
 class ItemHasVariantError(frappe.ValidationError): pass
 
+from six import string_types
+
 form_grid_templates = {
 	"operations": "templates/form_grid/work_order_grid.html"
 }
@@ -131,7 +133,7 @@
 		so_qty = flt(so_item_qty) + flt(dnpi_qty)
 
 		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
-			"over_production_allowance_percentage"))
+			"overproduction_percentage_for_sales_order"))
 
 		if total_qty > so_qty + (allowance_percentage/100 * so_qty):
 			frappe.throw(_("Cannot produce more Item {0} than Sales Order quantity {1}")
@@ -166,7 +168,7 @@
 				if stock_entries:
 					status = "In Process"
 					produced_qty = stock_entries.get("Manufacture")
-					if flt(produced_qty) == flt(self.qty):
+					if flt(produced_qty) >= flt(self.qty):
 						status = "Completed"
 		else:
 			status = 'Cancelled'
@@ -177,15 +179,20 @@
 		"""Update **Manufactured Qty** and **Material Transferred for Qty** in Work Order
 			based on Stock Entry"""
 
+		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
+			"overproduction_percentage_for_work_order"))
+
 		for purpose, fieldname in (("Manufacture", "produced_qty"),
 			("Material Transfer for Manufacture", "material_transferred_for_manufacturing")):
+
 			qty = flt(frappe.db.sql("""select sum(fg_completed_qty)
 				from `tabStock Entry` where work_order=%s and docstatus=1
 				and purpose=%s""", (self.name, purpose))[0][0])
 
-			if qty > self.qty:
+			completed_qty = self.qty + (allowance_percentage/100 * self.qty)
+			if qty > completed_qty:
 				frappe.throw(_("{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}").format(\
-					self.meta.get_label(fieldname), qty, self.qty, self.name), StockOverProductionError)
+					self.meta.get_label(fieldname), qty, completed_qty, self.name), StockOverProductionError)
 
 			self.db_set(fieldname, qty)
 
@@ -205,6 +212,7 @@
 		if not self.fg_warehouse:
 			frappe.throw(_("For Warehouse is required before Submit"))
 
+		self.update_work_order_qty_in_so()
 		self.update_reserved_qty_for_production()
 		self.update_completed_qty_in_material_request()
 		self.update_planned_qty()
@@ -214,6 +222,7 @@
 		self.validate_cancel()
 
 		frappe.db.set(self,'status', 'Cancelled')
+		self.update_work_order_qty_in_so()
 		self.delete_timesheet()
 		self.update_completed_qty_in_material_request()
 		self.update_planned_qty()
@@ -249,6 +258,25 @@
 			doc.set_status()
 			doc.db_set('status', doc.status)
 
+	def update_work_order_qty_in_so(self):
+		if not self.sales_order and not self.sales_order_item:
+			return
+
+		total_bundle_qty = 1
+		if self.product_bundle_item:
+			total_bundle_qty = frappe.db.sql(""" select sum(qty) from
+				`tabProduct Bundle Item` where parent = %s""", (frappe.db.escape(self.product_bundle_item)))[0][0]
+
+		cond = "product_bundle_item = %s" if self.product_bundle_item else "production_item = %s"
+
+		qty = frappe.db.sql(""" select sum(qty) from
+			`tabWork Order` where sales_order = %s and docstatus = 1 and {0}
+			""".format(cond), (self.sales_order, (self.product_bundle_item or self.production_item)), as_list=1)
+
+		work_order_qty = qty[0][0] if qty and qty[0][0] else 0
+		frappe.db.set_value('Sales Order Item',
+			self.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2))
+
 	def update_completed_qty_in_material_request(self):
 		if self.material_request:
 			frappe.get_doc("Material Request", self.material_request).update_completed_qty([self.material_request_item])
@@ -639,10 +667,10 @@
 
 @frappe.whitelist()
 def add_timesheet_detail(timesheet, args):
-	if isinstance(timesheet, unicode):
+	if isinstance(timesheet, string_types):
 		timesheet = frappe.get_doc('Timesheet', timesheet)
 
-	if isinstance(args, unicode):
+	if isinstance(args, string_types):
 		args = json.loads(args)
 
 	timesheet.append('time_logs', args)
diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
index 89ca714..a79182f 100644
--- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
@@ -129,7 +129,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/manufacturing/report/bom_variance_report/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/manufacturing/report/bom_variance_report/__init__.py
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js
new file mode 100644
index 0000000..97ba7b9
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js
@@ -0,0 +1,29 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["BOM Variance Report"] = {
+	"filters": [
+		{
+			"fieldname":"bom_no",
+			"label": __("BOM No"),
+			"fieldtype": "Link",
+			"options": "BOM"
+		},
+		{
+			"fieldname":"work_order",
+			"label": __("Work Order"),
+			"fieldtype": "Link",
+			"options": "Work Order",
+			"get_query": function() {
+				var bom_no = frappe.query_report_filters_by_name.bom_no.get_value();
+				return{
+					query: "erpnext.manufacturing.report.bom_variance_report.bom_variance_report.get_work_orders",
+					filters: {
+						'bom_no': bom_no
+					}
+				}
+			}
+		},
+	]
+}
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.json b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.json
new file mode 100644
index 0000000..91ed11e
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.json
@@ -0,0 +1,32 @@
+{
+ "add_total_row": 0, 
+ "creation": "2018-05-28 16:22:24.040106", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "Gadgets International", 
+ "modified": "2018-05-28 16:22:24.040106", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "BOM Variance Report", 
+ "owner": "Administrator", 
+ "ref_doctype": "Stock Entry", 
+ "report_name": "BOM Variance Report", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Manufacturing Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
new file mode 100644
index 0000000..c5627e0
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
@@ -0,0 +1,107 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	columns, data = [], []
+	columns = get_columns(filters)
+	data = get_data(filters)
+	return columns, data
+
+def get_columns(filters):
+	columns = [{
+			"label": _("Work Order"),
+			"fieldname": "work_order",
+			"fieldtype": "Link",
+			"options": "Work Order",
+			"width": 120
+		}]
+	
+	if not filters.get('bom_no'):
+		columns.extend([
+			{
+				"label": _("BOM No"),
+				"fieldname": "bom_no",
+				"fieldtype": "Link",
+				"options": "BOM",
+				"width": 180
+			}
+		])
+	
+	columns.extend([
+		{
+			"label": _("Finished Good"),
+			"fieldname": "production_item",
+			"fieldtype": "Link",
+			"options": "Item",
+			"width": 120
+		},
+		{
+			"label": _("Ordered Qty"),
+			"fieldname": "qty",
+			"fieldtype": "Float",
+			"width": 120
+		},
+		{
+			"label": _("Produced Qty"),
+			"fieldname": "produced_qty",
+			"fieldtype": "Float",
+			"width": 120
+		},
+		{
+			"label": _("Raw Material"),
+			"fieldname": "raw_material_code",
+			"fieldtype": "Link",
+			"options": "Item",
+			"width": 120
+		},
+		{
+			"label": _("Required Qty"),
+			"fieldname": "required_qty",
+			"fieldtype": "Float",
+			"width": 120
+		},
+		{
+			"label": _("Consumed Qty"),
+			"fieldname": "consumed_qty",
+			"fieldtype": "Float",
+			"width": 120
+		}
+	])
+
+	return columns
+	
+def get_data(filters):
+	cond = "1=1"
+
+	if filters.get('bom_no') and not filters.get('work_order'):
+		cond += " and bom_no = '%s'" % filters.get('bom_no')
+
+	if filters.get('work_order'):
+		cond += " and name = '%s'" % filters.get('work_order')
+
+	results = []
+	for d in frappe.db.sql(""" select name as work_order, qty, produced_qty, production_item, bom_no
+		from `tabWork Order` where produced_qty > qty and docstatus = 1 and {0}""".format(cond), as_dict=1):
+		results.append(d)
+
+		for data in frappe.get_all('Work Order Item', fields=["item_code as raw_material_code",
+			"required_qty", "consumed_qty"], filters={'parent': d.work_order, 'parenttype': 'Work Order'}):
+			results.append(data)
+
+	return results
+
+@frappe.whitelist()
+def get_work_orders(doctype, txt, searchfield, start, page_len, filters):
+	cond = "1=1"
+	if filters.get('bom_no'):
+		cond += " and bom_no = '%s'" % filters.get('bom_no')
+
+	return frappe.db.sql("""select name from `tabWork Order`
+		where name like %(name)s and {0} and produced_qty > qty and docstatus = 1
+		order by name limit {1}, {2}""".format(cond, start, page_len),{
+			'name': "%%%s%%" % txt
+		}, as_list=1)
diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html
index 0110950..321828f 100644
--- a/erpnext/non_profit/doctype/chapter/templates/chapter.html
+++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html
@@ -2,38 +2,40 @@
 
 {% block page_content %}
 <h1>{{ title }}</h1>
-<h3>Details</h3>
 <p>{{ introduction }}</p>
 {% if meetup_embed_html %}
 	{{ meetup_embed_html }}
 {% endif %}
-<h3>List of Members</h3>
+<h3>Member Details</h3>
 
 {% if members  %}
-	<table class="table table-bordered small" style="max-width: 500px;">
-		<tr>
-			<th width="15%" ></th>
-			<th>Member Details</th>
-		</tr>
+	<table class="table" style="max-width: 600px;">
 		{% set index = [1] %}
 		{% for user in members %}
 			{% if user.enabled == 1 %}
 				<tr>
-					<td>{{ index|length }}</td>
 					<td>
+						<div style="margin-bottom: 30px; max-width: 600px" class="with-border">
 						<div class="row">
-							<div class="col-lg-6 col-md-6 col-sm-6">{{ frappe.db.get_value('User', user.user, 'full_name') }}</div>
-							<div class="col-lg-6 col-md-6 col-sm-6 text-right">
+							<div class="col-lg-6 col-md-6 col-sm-6">
+             <div class="pull-left">
+								<b>{{ index|length }}. {{ frappe.db.get_value('User', user.user, 'full_name') }}</b></div>
+							</div>
+								<div class="pull-right">
 								{% if user.website_url %}
-									<a href="{{ user.website_url }}">{{ user.website_url or '' }}</a>
+									<a href="{{ user.website_url }}">{{ user.website_url | truncate (50) or '' }}</a>
 								{% endif %}
 							</div>
+							<div class="clearfix"></div>
+							</div>
+							<br><br>
 							<div class="col-lg-12">
 							{% if user.introduction %}
 								{{ user.introduction }}
 							{% endif %}
 							</div>
 						</div>
+					</div>
 					</td>
 				</tr>
 				{% set __ = index.append(1) %}
@@ -45,11 +47,13 @@
 {% endif %}
 
 <h3>Chapter Head</h3>
-<table class="table table-bordered small" style="max-width: 500px;">
+<div style="margin-bottom: 30px; max-width: 600px" class="with-border">
+
+<table class="table table-bordered small" style="max-width: 600px;">
 	{% set doc = frappe.get_doc('Member',chapter_head) %}
 	<tr>
 		<td style='width: 15%'>Name</td>
-		<td>{{ doc.member_name }}</td>
+		<td><b>{{ doc.member_name }}<b></td>
 	</tr>
 	<tr>
 		<td>Email</td>
@@ -60,8 +64,14 @@
 		<td>{{ frappe.db.get_value('User', doc.email, 'phone') or '' }}</td>
 	</tr>
 </table>
+</div>
+
+{% if address  %}
 <h3>Address</h3>
-<p>{{ address }}</p>
+<div style="margin-bottom: 30px; max-width: 600px" class="with-border">
+<p>{{ address or ''}}</p>
+</div>
+{% endif %}
 
 <p style="margin: 20px 0 30px;"><a href="/non_profit/join-chapter?name={{ name }}" class='btn btn-primary'>Join this Chapter</a></p>
 <p style="margin: 20px 0 30px;"><a href="/non_profit/leave-chapter?name={{ name }}" class=''>Leave this Chapter</a></p>
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index 9000d6e..d0bdecc 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -42,7 +42,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,7 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,7 +134,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -166,7 +166,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -198,7 +198,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -229,7 +229,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -260,7 +260,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -292,7 +292,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -301,6 +301,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "customer.customer_name",
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -313,7 +314,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer.customer_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -324,7 +325,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -355,7 +356,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -387,7 +388,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -419,7 +420,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -450,7 +451,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -480,7 +481,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -511,7 +512,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -526,7 +527,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-23 10:55:29.721224", 
+ "modified": "2018-05-16 22:42:55.734512",
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Member", 
@@ -535,7 +536,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -555,7 +555,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/non_profit/report/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/non_profit/report/__init__.py
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/non_profit/report/expiring_memberships/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/non_profit/report/expiring_memberships/__init__.py
diff --git a/erpnext/non_profit/report/expiring_memberships/expiring_memberships.js b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.js
new file mode 100644
index 0000000..be3a243
--- /dev/null
+++ b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.js
@@ -0,0 +1,24 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Expiring Memberships"] = {
+	"filters": [
+		{
+			"fieldname": "fiscal_year",
+			"label": __("Fiscal Year"),
+			"fieldtype": "Link",
+			"options": "Fiscal Year",
+			"default": frappe.defaults.get_user_default("fiscal_year"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"month",
+			"label": __("Month"),
+			"fieldtype": "Select",
+			"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+			"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+				"Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+		}
+	]
+}
diff --git a/erpnext/non_profit/report/expiring_memberships/expiring_memberships.json b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.json
new file mode 100644
index 0000000..c311057
--- /dev/null
+++ b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2018-05-24 11:44:08.942809", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "ERPNext Foundation", 
+ "modified": "2018-05-24 11:44:08.942809", 
+ "modified_by": "Administrator", 
+ "module": "Non Profit", 
+ "name": "Expiring Memberships", 
+ "owner": "Administrator", 
+ "ref_doctype": "Membership", 
+ "report_name": "Expiring Memberships", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Non Profit Manager"
+  }, 
+  {
+   "role": "Non Profit Member"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py
new file mode 100644
index 0000000..122db45
--- /dev/null
+++ b/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py
@@ -0,0 +1,33 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _,msgprint
+
+def execute(filters=None):
+	columns = get_columns(filters)
+	data = get_data(filters)
+	return columns, data
+
+def get_columns(filters):
+	return [
+			_("Membership Type") + ":Link/Membership Type:100", _("Membership ID") + ":Link/Membership:140",
+			_("Member ID") + ":Link/Member:140",  _("Member Name") + ":Data:140", _("Email") + ":Data:140",
+	 		_("Expiring On") + ":Date:120"
+	]
+
+def get_data(filters):
+
+	filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"].index(filters.month) + 1
+
+	return frappe.db.sql("""
+		select ms.membership_type,ms.name,m.name,m.member_name,m.email,ms.max_membership_date
+		from `tabMember` m
+		inner join (select name,membership_type,max(to_date) as max_membership_date,member
+					from `tabMembership`
+					where paid = 1
+					group by member
+					order by max_membership_date asc) ms
+		on m.name = ms.member
+		where month(max_membership_date) = %(month)s and year(max_membership_date) = %(year)s """,{'month': filters.get('month'),'year':filters.get('fiscal_year')})
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 982a721..d68603e 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -490,14 +490,12 @@
 erpnext.patches.v10_0.update_assessment_plan
 erpnext.patches.v10_0.update_assessment_result
 erpnext.patches.v10_0.added_extra_gst_custom_field
-erpnext.patches.v10_0.workflow_leave_application #2018-01-24 #2018-02-02 #2018-02-08
 erpnext.patches.v10_0.set_default_payment_terms_based_on_company
 erpnext.patches.v10_0.update_sales_order_link_to_purchase_order
 erpnext.patches.v10_0.added_extra_gst_custom_field_in_gstr2 #2018-02-13
 erpnext.patches.v10_0.item_barcode_childtable_migrate
 erpnext.patches.v10_0.rename_price_to_rate_in_pricing_rule
 erpnext.patches.v10_0.set_currency_in_pricing_rule
-erpnext.patches.v10_0.workflow_expense_claim
 erpnext.patches.v10_0.set_b2c_limit
 erpnext.patches.v10_0.update_translatable_fields
 erpnext.patches.v10_0.rename_offer_letter_to_job_offer
@@ -523,5 +521,27 @@
 erpnext.patches.v11_0.add_default_email_template_for_leave
 erpnext.patches.v11_0.set_default_email_template_in_hr
 erpnext.patches.v10_0.taxes_issue_with_pos
+erpnext.patches.v11_0.update_account_type_in_party_type
 erpnext.patches.v10_1.transfer_subscription_to_auto_repeat
 erpnext.patches.v10_1.drop_old_subscription_records
+erpnext.patches.v11_0.update_brand_in_item_price
+erpnext.patches.v11_0.create_default_success_action
+erpnext.patches.v11_0.add_healthcare_service_unit_tree_root
+erpnext.patches.v10_0.set_qty_in_transactions_based_on_serial_no_input
+erpnext.patches.v10_0.show_leaves_of_all_department_members_in_calendar
+erpnext.patches.v11_0.rename_field_max_days_allowed
+erpnext.patches.v11_0.create_salary_structure_assignments
+erpnext.patches.v11_0.rename_health_insurance
+erpnext.patches.v11_0.rebuild_tree_for_company
+erpnext.patches.v11_0.rename_supplier_type_to_supplier_group
+erpnext.patches.v11_0.create_department_records_for_each_company
+erpnext.patches.v11_0.make_location_from_warehouse
+erpnext.patches.v11_0.make_asset_finance_book_against_old_entries
+erpnext.patches.v11_0.check_buying_selling_in_currency_exchange
+erpnext.patches.v11_0.refactor_erpnext_shopify
+erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany
+erpnext.patches.v11_0.rename_overproduction_percent_field
+erpnext.patches.v11_0.update_backflush_subcontract_rm_based_on_bom
+erpnext.patches.v10_0.update_status_in_purchase_receipt
+erpnext.patches.v11_0.inter_state_field_for_gst
+erpnext.patches.v11_0.rename_members_with_naming_series #04-06-2018
diff --git a/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py b/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
new file mode 100644
index 0000000..083b7f4
--- /dev/null
+++ b/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
@@ -0,0 +1,21 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "stock_settings")
+
+	ss = frappe.get_doc("Stock Settings")
+	ss.set_qty_in_transactions_based_on_serial_no_input = 1
+
+	if ss.default_warehouse \
+		and not frappe.db.exists("Warehouse", ss.default_warehouse):
+			ss.default_warehouse = None
+
+	if ss.stock_uom and not frappe.db.exists("UOM", ss.stock_uom):
+		ss.stock_uom = None
+
+	ss.flags.ignore_mandatory = True
+	ss.save()
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py b/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py
new file mode 100644
index 0000000..1ae8b4a
--- /dev/null
+++ b/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py
@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("hr", "doctype", "hr_settings")
+	frappe.db.set_value("HR Settings", None, "show_leaves_of_all_department_members_in_calendar", 1)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_status_in_purchase_receipt.py b/erpnext/patches/v10_0/update_status_in_purchase_receipt.py
new file mode 100644
index 0000000..69e2bb8
--- /dev/null
+++ b/erpnext/patches/v10_0/update_status_in_purchase_receipt.py
@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "purchase_receipt")
+	frappe.db.sql('''
+		UPDATE `tabPurchase Receipt` SET status = "Completed" WHERE per_billed = 100 AND docstatus = 1
+	''')
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/workflow_expense_claim.py b/erpnext/patches/v10_0/workflow_expense_claim.py
deleted file mode 100644
index 9aa2cee..0000000
--- a/erpnext/patches/v10_0/workflow_expense_claim.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
-	if frappe.db.a_row_exists("Expense Claim"):
-		frappe.reload_doc("hr", "doctype", "expense_claim")
-		frappe.reload_doc("hr", "doctype", "vehicle_log")
-		frappe.reload_doc("hr", "doctype", "expense_claim_advance")
-		frappe.reload_doc("workflow", "doctype", "workflow")
-
-		states = {'Approved': 'Success', 'Rejected': 'Danger', 'Draft': 'Warning'}
-		for state, style in states.items():
-			if not frappe.db.exists("Workflow State", state):
-				frappe.get_doc({
-					'doctype': 'Workflow State',
-					'workflow_state_name': state,
-					'style': style
-				}).insert(ignore_permissions=True)
-
-		for action in ['Approve', 'Reject']:
-			if not frappe.db.exists("Workflow Action", action):
-				frappe.get_doc({
-					'doctype': 'Workflow Action',
-					'workflow_action_name': action
-				}).insert(ignore_permissions=True)
-
-		if not frappe.db.exists("Workflow", "Expense Approval"):
-			frappe.get_doc({
-				'doctype': 'Workflow',
-				'workflow_name': 'Expense Approval',
-				'document_type': 'Expense Claim',
-				'is_active': 1,
-				'workflow_state_field': 'workflow_state',
-				'states': [{
-					"state": 'Draft',
-					"doc_status": 0,
-					"allow_edit": 'Employee'
-				}, {
-					"state": 'Approved',
-					"doc_status": 1,
-					"allow_edit": 'Expense Approver'
-				}, {
-					"state": 'Rejected',
-					"doc_status": 0,
-					"allow_edit": 'Expense Approver'
-				}],
-				'transitions': [{
-					"state": 'Draft',
-					"action": 'Approve',
-					"next_state": 'Approved',
-					"allowed": 'Expense Approver'
-				},
-				{
-					"state": 'Draft',
-					"action": 'Reject',
-					"next_state": 'Rejected',
-					"allowed": 'Expense Approver'
-				}]
-			}).insert(ignore_permissions=True)
-
-		if frappe.db.has_column("Expense Claim", "status"):
-			frappe.db.sql("""update `tabExpense Claim` set workflow_state = approval_status""")
diff --git a/erpnext/patches/v10_0/workflow_leave_application.py b/erpnext/patches/v10_0/workflow_leave_application.py
deleted file mode 100644
index 0d33402..0000000
--- a/erpnext/patches/v10_0/workflow_leave_application.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
-	if frappe.db.a_row_exists("Leave Application"):
-		frappe.reload_doc("hr", "doctype", "leave_application")
-		frappe.reload_doc("workflow", "doctype", "workflow")
-		states = {'Approved': 'Success', 'Rejected': 'Danger', 'Open': 'Warning'}
-
-		for state, style in states.items():
-			if not frappe.db.exists("Workflow State", state):
-				frappe.get_doc({
-					'doctype': 'Workflow State',
-					'workflow_state_name': state,
-					'style': style
-				}).insert(ignore_permissions=True)
-
-		for action in ['Approve', 'Reject']:
-			if not frappe.db.exists("Workflow Action", action):
-				frappe.get_doc({
-					'doctype': 'Workflow Action',
-					'workflow_action_name': action
-				}).insert(ignore_permissions=True)
-
-		if not frappe.db.exists("Workflow", "Leave Approval"):
-			frappe.get_doc({
-				'doctype': 'Workflow',
-				'workflow_name': 'Leave Approval',
-				'document_type': 'Leave Application',
-				'is_active': 1,
-				'workflow_state_field': 'workflow_state',
-				'states': [{
-					"state": 'Open',
-					"doc_status": 0,
-					"allow_edit": 'Employee'
-				}, {
-					"state": 'Approved',
-					"doc_status": 1,
-					"allow_edit": 'Leave Approver'
-				}, {
-					"state": 'Rejected',
-					"doc_status": 0,
-					"allow_edit": 'Leave Approver'
-				}],
-				'transitions': [{
-					"state": 'Open',
-					"action": 'Approve',
-					"next_state": 'Approved',
-					"allowed": 'Leave Approver'
-				},
-				{
-					"state": 'Open',
-					"action": 'Reject',
-					"next_state": 'Rejected',
-					"allowed": 'Leave Approver'
-				}]
-			}).insert(ignore_permissions=True)
-
-		if frappe.db.has_column("Leave Application", "status"):
-			frappe.db.sql("""update `tabLeave Application` set workflow_state = status""")
-
-		if frappe.db.has_column("Leave Application", "workflow_state"):
-			frappe.db.sql("""update `tabWorkflow Document State` set doc_status = 0 where parent = "Leave Approval" \
-			and state = "Rejected" and doc_status = 1""")
-			frappe.db.sql("""update `tabLeave Application` set docstatus = 0  where workflow_state = "Rejected" and docstatus = 1""")
diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
index 481c557..a9078e3 100644
--- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
+++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
@@ -21,7 +21,8 @@
 	frappe.reload_doc('stock', 'doctype', 'delivery_note')
 
 	for doctype in to_rename:
-		rename_field(doctype, 'subscription', 'auto_repeat')
+		if frappe.db.has_column(doctype, 'subscription'):
+			rename_field(doctype, 'subscription', 'auto_repeat')
 
 	subscriptions = frappe.db.sql('select * from `tabSubscription`', as_dict=1)
 
diff --git a/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py
new file mode 100644
index 0000000..17368bf
--- /dev/null
+++ b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py
@@ -0,0 +1,13 @@
+import frappe
+from frappe import _
+
+def execute():
+	""" assign lft and rgt appropriately """
+	frappe.reload_doc("healthcare", "doctype", "healthcare_service_unit")
+
+	if not frappe.db.exists("Healthcare Service Unit", _('All Healthcare Service Unit')):
+		frappe.get_doc({
+			'doctype': 'Healthcare Service Unit',
+			'healthcare_service_unit_name': _('All Healthcare Service Unit'),
+			'is_group': 1
+		}).insert(ignore_permissions=True)
diff --git a/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py b/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py
new file mode 100644
index 0000000..ee336be
--- /dev/null
+++ b/erpnext/patches/v11_0/check_buying_selling_in_currency_exchange.py
@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+	frappe.reload_doc('setup', 'doctype', 'currency_exchange')
+	frappe.db.sql("""update `tabCurrency Exchange` set for_buying = 1, for_selling = 1""")
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/create_default_success_action.py b/erpnext/patches/v11_0/create_default_success_action.py
new file mode 100644
index 0000000..29687d2
--- /dev/null
+++ b/erpnext/patches/v11_0/create_default_success_action.py
@@ -0,0 +1,6 @@
+import frappe
+from erpnext.setup.install import create_default_success_action
+
+def execute():
+	frappe.reload_doc("core", "doctype", "success_action")
+	create_default_success_action()
diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py
new file mode 100644
index 0000000..a5b76e9
--- /dev/null
+++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py
@@ -0,0 +1,82 @@
+import frappe
+from frappe import _
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']:
+		frappe.reload_doc("hr", "doctype", doctype)
+
+	companies = frappe.db.get_all("Company", fields=["name", "abbr"])
+	departments = frappe.db.get_all("Department")
+	comp_dict = {}
+
+	# create a blank list for each company
+	for company in companies:
+		comp_dict[company.name] = {}
+
+	for department in departments:
+		# skip root node
+		if department.name == _("All Departments"):
+			continue
+
+		# for each company, create a copy of the doc
+		department_doc = frappe.get_doc("Department", department)
+		for company in companies:
+			copy_doc = frappe.copy_doc(department_doc)
+			copy_doc.update({"company": company.name})
+			copy_doc.insert()
+
+			# append list of new department for each company
+			comp_dict[company.name][department.name] = copy_doc.name
+
+	rebuild_tree('Department', 'parent_department')
+	doctypes = ["Asset", "Employee", "Leave Period", "Payroll Entry", "Staffing Plan", "Job Opening"]
+
+	for d in doctypes:
+		update_records(d, comp_dict)
+
+	update_instructors(comp_dict)
+
+def update_records(doctype, comp_dict):
+	when_then = []
+	for company in comp_dict:
+		records = comp_dict[company]
+
+		for department in records:
+			when_then.append('''
+				WHEN company = "%s" and department = "%s"
+				THEN "%s"
+			'''%(company, department, records[department]))
+
+	if not when_then:
+		return
+
+	frappe.db.sql("""
+		update
+			`tab%s`
+		set
+			department = CASE %s END
+	"""%(doctype, " ".join(when_then)))
+
+def update_instructors(comp_dict):
+	when_then = []
+	emp_details = frappe.get_all("Employee", fields=["name", "company"])
+
+	for employee in emp_details:
+		records = comp_dict[employee.company]
+
+		for department in records:
+			when_then.append('''
+				WHEN employee = "%s" and department = "%s"
+				THEN "%s"
+			'''%(employee.name, department, records[department]))
+
+	if not when_then:
+		return
+
+	frappe.db.sql("""
+		update
+			`tabInstructor`
+		set
+			department = CASE %s END
+	"""%(" ".join(when_then)))
diff --git a/erpnext/patches/v11_0/create_salary_structure_assignments.py b/erpnext/patches/v11_0/create_salary_structure_assignments.py
new file mode 100644
index 0000000..b5ee6c6
--- /dev/null
+++ b/erpnext/patches/v11_0/create_salary_structure_assignments.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from datetime import datetime
+from erpnext.hr.doctype.salary_structure_assignment.salary_structure_assignment import DuplicateAssignment
+
+def execute():
+	frappe.reload_doc("hr", "doctype", "salary_structure_assignment")
+	for d in frappe.db.sql("""
+		select sse.*, ss.company from `tabSalary Structure Employee` sse, `tabSalary Structure` ss
+		where ss.name = sse.parent AND sse.employee in (select name from `tabEmployee` where ifNull(status, '') != 'Left')""", as_dict=1):
+		try:
+			s = frappe.new_doc("Salary Structure Assignment")
+			s.employee = d.employee
+			s.employee_name = d.employee_name
+			s.salary_structure = d.parent
+			s.from_date = d.from_date
+			s.to_date = d.to_date if isinstance(d.to_date, datetime) else None
+			s.base = d.base
+			s.variable = d.variable
+			s.company = d.company
+
+			# to migrate the data of the old employees
+			s.flags.old_employee = True
+			s.save()
+			s.submit()
+		except DuplicateAssignment:
+			pass
+
+	frappe.db.sql("update `tabSalary Structure` set docstatus=1")
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/inter_state_field_for_gst.py b/erpnext/patches/v11_0/inter_state_field_for_gst.py
new file mode 100644
index 0000000..fa7c444
--- /dev/null
+++ b/erpnext/patches/v11_0/inter_state_field_for_gst.py
@@ -0,0 +1,58 @@
+import frappe
+from erpnext.regional.india.setup  import make_custom_fields
+
+def execute():
+	company = frappe.get_all('Company', filters = {'country': 'India'})
+	if not company:
+		return
+
+	make_custom_fields()
+
+	frappe.reload_doc("accounts", "doctype", "sales_taxes_and_charges")
+	frappe.reload_doc("accounts", "doctype", "purchase_taxes_and_charges")
+	frappe.reload_doc("accounts", "doctype", "sales_taxes_and_charges_template")
+	frappe.reload_doc("accounts", "doctype", "purchase_taxes_and_charges_template")
+
+	# set is_inter_state in Taxes And Charges Templates
+	if frappe.db.has_column("Sales Taxes And Charges Template", "is_inter_state") and\
+		frappe.db.has_column("Purchase Taxes And Charges Template", "is_inter_state"):
+
+		igst_accounts = set(frappe.db.sql_list('''SELECT igst_account from `tabGST Account` WHERE parent = "GST Settings"'''))
+		cgst_accounts = set(frappe.db.sql_list('''SELECT cgst_account FROM `tabGST Account` WHERE parenttype = "GST Settings"'''))
+
+		when_then_sales = get_formatted_data("Sales Taxes and Charges", igst_accounts, cgst_accounts)
+		when_then_purchase = get_formatted_data("Purchase Taxes and Charges", igst_accounts, cgst_accounts)
+
+		if when_then_sales:
+			frappe.db.sql('''update `tabSales Taxes and Charges Template`
+				set is_inter_state = Case {when_then} Else 0 End
+			'''.format(when_then=" ".join(when_then_sales)))
+
+		if when_then_purchase:
+			frappe.db.sql('''update `tabPurchase Taxes and Charges Template`
+				set is_inter_state = Case {when_then} Else 0 End
+			'''.format(when_then=" ".join(when_then_purchase)))
+
+def get_formatted_data(doctype, igst_accounts, cgst_accounts):
+	# fetch all the rows data from child table
+	all_details = frappe.db.sql('''
+		select parent, account_head from `tab{doctype}`
+		where parenttype="{doctype} Template"'''.format(doctype=doctype), as_dict=True)
+
+	# group the data in the form "parent: [list of accounts]""
+	group_detail = {}
+	for i in all_details:
+		if  not i['parent'] in group_detail: group_detail[i['parent']] = []
+		for j in all_details:
+			if i['parent']==j['parent']:
+				group_detail[i['parent']].append(j['account_head'])
+
+	# form when_then condition based on - if list of accounts for a document
+	# matches any account in igst_accounts list and not matches any in cgst_accounts list
+	when_then = []
+	for i in group_detail:
+		temp = set(group_detail[i])
+		if not temp.isdisjoint(igst_accounts) and temp.isdisjoint(cgst_accounts):
+			when_then.append('''When name='{name}' Then 1'''.format(name=i))
+
+	return when_then
diff --git a/erpnext/patches/v11_0/make_asset_finance_book_against_old_entries.py b/erpnext/patches/v11_0/make_asset_finance_book_against_old_entries.py
new file mode 100644
index 0000000..1c8bd68
--- /dev/null
+++ b/erpnext/patches/v11_0/make_asset_finance_book_against_old_entries.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	frappe.reload_doc('assets', 'doctype', 'asset_finance_book')
+	frappe.reload_doc('assets', 'doctype', 'depreciation_schedule')
+	frappe.reload_doc('assets', 'doctype', 'asset_category')
+	frappe.reload_doc('assets', 'doctype', 'asset')
+	frappe.reload_doc('assets', 'doctype', 'asset_movement')
+	frappe.reload_doc('assets', 'doctype', 'asset_category_account')
+
+	if frappe.db.has_column("Asset", "warehouse"):
+		frappe.db.sql(""" update `tabAsset` ast, `tabWarehouse` wh
+			set ast.location = wh.warehouse_name where ast.warehouse = wh.name""")
+
+		frappe.db.sql(""" update `tabAsset Movement` ast_mv
+			set ast_mv.source_location = (select warehouse_name from `tabWarehouse` where name = ast_mv.source_warehouse),
+			ast_mv.target_location = (select warehouse_name from `tabWarehouse` where name = ast_mv.target_warehouse)""")
+
+		for d in frappe.get_all('Asset'):
+			doc = frappe.get_doc('Asset', d.name)
+			if doc.calculate_depreciation:
+				fb = doc.append('finance_books', {
+					'depreciation_method': doc.depreciation_method,
+					'total_number_of_depreciations': doc.total_number_of_depreciations,
+					'frequency_of_depreciation': doc.frequency_of_depreciation,
+					'depreciation_start_date': doc.next_depreciation_date,
+					'expected_value_after_useful_life': doc.expected_value_after_useful_life,
+					'value_after_depreciation': doc.value_after_depreciation
+				})
+
+				fb.db_update()
+
+		frappe.db.sql(""" update `tabDepreciation Schedule` ds, `tabAsset` ast
+			set ds.depreciation_method = ast.depreciation_method, ds.finance_book_id = 1 where ds.parent = ast.name """)
+
+		for category in frappe.get_all('Asset Category'):
+			asset_category_doc = frappe.get_doc("Asset Category", category)
+			row = asset_category_doc.append('finance_books', {
+				'depreciation_method': asset_category_doc.depreciation_method,
+				'total_number_of_depreciations': asset_category_doc.total_number_of_depreciations,
+				'frequency_of_depreciation': asset_category_doc.frequency_of_depreciation
+			})
+
+			row.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/make_location_from_warehouse.py b/erpnext/patches/v11_0/make_location_from_warehouse.py
new file mode 100644
index 0000000..b5b2e17
--- /dev/null
+++ b/erpnext/patches/v11_0/make_location_from_warehouse.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	frappe.reload_doc('assets', 'doctype', 'location')
+	frappe.reload_doc('stock', 'doctype', 'warehouse')
+
+	for d in frappe.get_all('Warehouse',
+		fields = ['warehouse_name', 'is_group', 'parent_warehouse'], order_by="lft asc"):
+		try:
+			loc = frappe.new_doc('Location')
+			loc.location_name = d.warehouse_name
+			loc.is_group = d.is_group
+			loc.flags.ignore_mandatory = True
+			if d.parent_warehouse:
+				loc.parent_location = get_parent_warehouse_name(d.parent_warehouse)
+
+			loc.save(ignore_permissions=True)
+		except frappe.DuplicateEntryError:
+			continue
+
+	rebuild_tree("Location", "parent_location")
+
+def get_parent_warehouse_name(warehouse):
+	return frappe.db.get_value('Warehouse', warehouse, 'warehouse_name')
+			
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/make_quality_inspection_template.py b/erpnext/patches/v11_0/make_quality_inspection_template.py
index 67755e8..9720af4 100644
--- a/erpnext/patches/v11_0/make_quality_inspection_template.py
+++ b/erpnext/patches/v11_0/make_quality_inspection_template.py
@@ -5,8 +5,8 @@
 import frappe
 
 def execute():
-	frappe.reload_doc('stock', 'doctype', 'item')
 	frappe.reload_doc('stock', 'doctype', 'quality_inspection_template')
+	frappe.reload_doc('stock', 'doctype', 'item')
 
 	for data in frappe.get_all('Item Quality Inspection Parameter',
 		fields = ["distinct parent"], filters = {'parenttype': 'Item'}):
diff --git a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
new file mode 100644
index 0000000..8e17ea6
--- /dev/null
+++ b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
@@ -0,0 +1,59 @@
+# Copyright (c) 2018, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	'''
+
+	Fields to move from the item to item defaults child table
+	[ default_warehouse, buying_cost_center, expense_account, selling_cost_center, income_account ]
+
+	'''
+
+	frappe.reload_doc('stock', 'doctype', 'item_default')
+	frappe.reload_doc('stock', 'doctype', 'item')
+
+	companies = frappe.get_all("Company")
+	if len(companies) == 1:
+		frappe.db.sql('''
+				INSERT INTO `tabItem Default`
+					(name, parent, parenttype, parentfield, idx, company, default_warehouse,
+					buying_cost_center, selling_cost_center, expense_account, income_account, default_supplier)
+				SELECT
+					SUBSTRING(SHA2(name,224), 1, 10) as name, name as parent, 'Item' as parenttype,
+					'item_defaults' as parentfield, 1 as idx, %s as company, default_warehouse,
+					buying_cost_center, selling_cost_center, expense_account, income_account, default_supplier
+				FROM `tabItem`;
+		''', companies[0].name)
+	else:
+		item_details = frappe.get_all("Item", fields=["name", "default_warehouse", "buying_cost_center",
+									"expense_account", "selling_cost_center", "income_account"], limit=100)
+
+		for item in item_details:
+			item_defaults = []
+
+			def insert_into_item_defaults(doc_field_name, doc_field_value, company):
+				for d in item_defaults:
+					if d.get("company") == company:
+						d[doc_field_name] = doc_field_value
+						return
+				item_defaults.append({
+					"company": company,
+					doc_field_name: doc_field_value
+				})
+
+			for d in [
+						["default_warehouse", "Warehouse"], ["expense_account", "Account"], ["expense_account", "Account"],
+						["buying_cost_center", "Cost Center"], ["selling_cost_center", "Cost Center"]
+					]:
+				if item.get(d[0]):
+					company = frappe.get_value(d[1], item.get(d[0]), "company", cache=True)
+					insert_into_item_defaults(d[0], item.get(d[0]), company)
+
+			doc = frappe.get_doc("Item", item.name)
+			doc.extend("item_defaults", item_defaults)
+
+			for child_doc in doc.item_defaults:
+				child_doc.db_insert()
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rebuild_tree_for_company.py b/erpnext/patches/v11_0/rebuild_tree_for_company.py
new file mode 100644
index 0000000..0fc4780
--- /dev/null
+++ b/erpnext/patches/v11_0/rebuild_tree_for_company.py
@@ -0,0 +1,6 @@
+import frappe
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	frappe.reload_doc("setup", "doctype", "company")
+	rebuild_tree('Company', 'parent_company')
diff --git a/erpnext/patches/v11_0/refactor_erpnext_shopify.py b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
new file mode 100644
index 0000000..d344ae3
--- /dev/null
+++ b/erpnext/patches/v11_0/refactor_erpnext_shopify.py
@@ -0,0 +1,28 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.installer import remove_from_installed_apps
+
+def execute():
+	frappe.reload_doc('erpnext_integrations', 'doctype', 'shopify_settings')
+	frappe.reload_doc('erpnext_integrations', 'doctype', 'shopify_tax_account')
+	frappe.reload_doc('erpnext_integrations', 'doctype', 'shopify_log')
+
+	if 'erpnext_shopify' in frappe.get_installed_apps():
+		remove_from_installed_apps('erpnext_shopify')
+
+		frappe.db.sql('delete from `tabDesktop Icon` where app="erpnext_shopify" ')
+		frappe.delete_doc("Module Def", 'erpnext_shopify')
+
+		frappe.db.commit()
+
+		frappe.db.sql("truncate `tabShopify Log`")
+
+		setup_app_type()
+
+def setup_app_type():
+	shopify_settings = frappe.get_doc("Shopify Settings")
+	shopify_settings.app_type = 'Private'
+	shopify_settings.update_price_in_erpnext_price_list =  0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
+	shopify_settings.flags.ignore_mandatory = True
+	shopify_settings.ignore_permissions = True
+	shopify_settings.save()
diff --git a/erpnext/patches/v11_0/rename_field_max_days_allowed.py b/erpnext/patches/v11_0/rename_field_max_days_allowed.py
new file mode 100644
index 0000000..730b271
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_field_max_days_allowed.py
@@ -0,0 +1,12 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	frappe.db.sql("""
+		UPDATE `tabLeave Type`
+		SET max_days_allowed = '0'
+		WHERE trim(coalesce(max_days_allowed, '')) = ''
+	""")
+	frappe.db.sql_ddl("""ALTER table `tabLeave Type` modify max_days_allowed int(8) NOT NULL""")
+	frappe.reload_doc("hr", "doctype", "leave_type")
+	rename_field("Leave Type", "max_days_allowed", "max_continuous_days_allowed")
diff --git a/erpnext/patches/v11_0/rename_health_insurance.py b/erpnext/patches/v11_0/rename_health_insurance.py
new file mode 100644
index 0000000..24d1ddf
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_health_insurance.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2018, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+from frappe.model.rename_doc import rename_doc
+import frappe
+
+def execute():
+	rename_doc('DocType', 'Health Insurance', 'Employee Health Insurance', force=True)
+	frappe.reload_doc('hr', 'doctype', 'employee_health_insurance')
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rename_members_with_naming_series.py b/erpnext/patches/v11_0/rename_members_with_naming_series.py
new file mode 100644
index 0000000..9b85e68
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_members_with_naming_series.py
@@ -0,0 +1,12 @@
+import frappe
+
+def execute():
+	old_named_members = frappe.get_all("Member", filters = {"name": ("not like", "MEM-%")})
+	correctly_named_members = frappe.get_all("Member", filters = {"name": ("like", "MEM-%")})
+	current_index = len(correctly_named_members)
+
+	for member in old_named_members:
+		current_index += 1
+		frappe.rename_doc("Member", member["name"], "MEM-" + str(current_index).zfill(5))
+
+	frappe.db.sql("""update `tabMember` set naming_series = 'MEM-'""")
diff --git a/erpnext/patches/v11_0/rename_overproduction_percent_field.py b/erpnext/patches/v11_0/rename_overproduction_percent_field.py
new file mode 100644
index 0000000..077829f
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_overproduction_percent_field.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2018, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+from frappe.model.utils.rename_field import rename_field
+import frappe
+
+def execute():
+	frappe.reload_doc('manufacturing', 'doctype', 'manufacturing_settings')
+	rename_field('Manufacturing Settings', 'over_production_allowance_percentage', 'overproduction_percentage_for_sales_order')
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
new file mode 100644
index 0000000..1735c12
--- /dev/null
+++ b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
@@ -0,0 +1,35 @@
+import frappe
+from frappe.model.rename_doc import rename_doc
+from frappe.model.utils.rename_field import rename_field
+from frappe import _
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	if frappe.db.table_exists("Supplier Type") and not frappe.db.table_exists("Supplier Group"):
+		rename_doc("DocType", "Supplier Type", "Supplier Group", force=True)
+		frappe.reload_doc('setup', 'doctype', 'supplier_group')
+		frappe.reload_doc("accounts", "doctype", "pricing_rule")
+		frappe.reload_doc("accounts", "doctype", "tax_rule")
+		frappe.reload_doc("buying", "doctype", "buying_settings")
+		frappe.reload_doc("buying", "doctype", "supplier")
+		rename_field("Supplier Group", "supplier_type", "supplier_group_name")
+		rename_field("Supplier", "supplier_type", "supplier_group")
+		rename_field("Buying Settings", "supplier_type", "supplier_group")
+		rename_field("Pricing Rule", "supplier_type", "supplier_group")
+		rename_field("Tax Rule", "supplier_type", "supplier_group")
+
+	build_tree()
+
+def build_tree():
+	frappe.db.sql("""update `tabSupplier Group` set parent_supplier_group = '{0}'
+		where is_group = 0""".format(_('All Supplier Groups')))
+
+	if not frappe.db.exists("Supplier Group", _('All Supplier Groups')):
+		frappe.get_doc({
+			'doctype': 'Supplier Group',
+			'supplier_group_name': _('All Supplier Groups'),
+			'is_group': 1,
+			'parent_supplier_group': ''
+		}).insert(ignore_permissions=True)
+
+	rebuild_tree("Supplier Group", "parent_supplier_group")
diff --git a/erpnext/patches/v11_0/update_account_type_in_party_type.py b/erpnext/patches/v11_0/update_account_type_in_party_type.py
new file mode 100644
index 0000000..efa04fd
--- /dev/null
+++ b/erpnext/patches/v11_0/update_account_type_in_party_type.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc('setup', 'doctype', 'party_type')
+	party_types = {'Customer': 'Receivable', 'Supplier': 'Payable',
+		'Employee': 'Payable', 'Member': 'Receivable', 'Shareholder': 'Payable', 'Student': 'Receivable'}
+
+	for party_type, account_type in party_types.items():
+		frappe.db.set_value('Party Type', party_type, 'account_type', account_type)
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
new file mode 100644
index 0000000..f71d9b4
--- /dev/null
+++ b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc('buying', 'doctype', 'buying_settings')
+	frappe.db.set_value('Buying Settings', None, 'backflush_raw_materials_of_subcontract_based_on', 'BOM')
+	
+	frappe.reload_doc('stock', 'doctype', 'stock_entry_detail')
+	frappe.db.sql(""" update `tabStock Entry Detail` as sed, 
+		`tabStock Entry` as se, `tabPurchase Order Item Supplied` as pois
+		set
+			sed.subcontracted_item = pois.main_item_code
+		where
+			se.purpose = 'Subcontract' and sed.parent = se.name
+			and pois.rm_item_code = sed.item_code and se.docstatus = 1
+			and pois.parenttype = 'Purchase Order'""")
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/update_brand_in_item_price.py b/erpnext/patches/v11_0/update_brand_in_item_price.py
new file mode 100644
index 0000000..a19a6c4
--- /dev/null
+++ b/erpnext/patches/v11_0/update_brand_in_item_price.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+
+def execute():
+	frappe.reload_doc('stock', 'doctype', 'item_price')
+
+	frappe.db.sql(""" update `tabItem Price`, `tabItem`
+		set
+			`tabItem Price`.brand = `tabItem`.brand
+		where
+			`tabItem Price`.item_code = `tabItem`.name 
+			and `tabItem`.brand is not null and `tabItem`.brand != ''""")
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py
index 9bb1772..0cb9aec 100644
--- a/erpnext/patches/v11_0/update_department_lft_rgt.py
+++ b/erpnext/patches/v11_0/update_department_lft_rgt.py
@@ -5,7 +5,6 @@
 def execute():
 	""" assign lft and rgt appropriately """
 	frappe.reload_doc("hr", "doctype", "department")
-
 	if not frappe.db.exists("Department", _('All Departments')):
 		frappe.get_doc({
 			'doctype': 'Department',
diff --git a/erpnext/patches/v11_0/update_total_qty_field.py b/erpnext/patches/v11_0/update_total_qty_field.py
new file mode 100644
index 0000000..e618593
--- /dev/null
+++ b/erpnext/patches/v11_0/update_total_qty_field.py
@@ -0,0 +1,27 @@
+import frappe
+
+def execute():
+	frappe.reload_doc('buying', 'doctype', 'purchase_order')
+	frappe.reload_doc('buying', 'doctype', 'supplier_quotation')
+	frappe.reload_doc('selling', 'doctype', 'sales_order')
+	frappe.reload_doc('selling', 'doctype', 'quotation')
+	frappe.reload_doc('stock', 'doctype', 'delivery_note')
+	frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
+	frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
+
+	doctypes = ["Sales Order", "Sales Invoice", "Delivery Note",\
+		"Purchase Order", "Purchase Invoice", "Purchase Receipt", "Quotation", "Supplier Quotation"]
+
+	for doctype in doctypes:
+		frappe.db.sql('''
+			UPDATE
+				`tab%s` dt SET dt.total_qty =
+			(
+				SELECT SUM(dt_item.qty)
+				FROM
+					`tab%s Item` dt_item
+				WHERE
+					dt_item.parent=dt.name
+			)
+		''' % (doctype, doctype))
diff --git a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
index 4308526..b5172db 100644
--- a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
+++ b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
@@ -3,6 +3,8 @@
 def execute():
 	frappe.reload_doc('hr', 'doctype', 'salary_structure')
 	frappe.reload_doc('hr', 'doctype', 'salary_structure_employee')
+	if not frappe.db.has_column('Salary Structure', 'employees'):
+		return
 	for ss in frappe.db.sql(""" select employee, name from `tabSalary Structure`""", as_dict=True):
 		ss_doc = frappe.get_doc('Salary Structure', ss.name)
 		salary_employee = ss_doc.append('employees',{})
diff --git a/erpnext/patches/v7_1/update_missing_salary_component_type.py b/erpnext/patches/v7_1/update_missing_salary_component_type.py
index 25624f5..7d50ee4 100644
--- a/erpnext/patches/v7_1/update_missing_salary_component_type.py
+++ b/erpnext/patches/v7_1/update_missing_salary_component_type.py
@@ -10,6 +10,8 @@
 
 def execute():
 	frappe.reload_doc("accounts", "doctype", "salary_component_account")
+	frappe.reload_doc("hr", "doctype", "salary_component")
+	frappe.reload_doc("hr", "doctype", "taxable_salary_slab")
 	
 	for s in frappe.db.sql('''select name, type, salary_component_abbr from `tabSalary Component` 
 			where ifnull(type, "")="" or ifnull(salary_component_abbr, "") = ""''', as_dict=1):
diff --git a/erpnext/patches/v8_0/update_production_orders.py b/erpnext/patches/v8_0/update_production_orders.py
index 7d87d68..8e993cc 100644
--- a/erpnext/patches/v8_0/update_production_orders.py
+++ b/erpnext/patches/v8_0/update_production_orders.py
@@ -10,6 +10,9 @@
 		"BOM Item", "BOM Explosion Item", "BOM"):
 			frappe.reload_doctype(doctype)
 
+	frappe.reload_doc("stock", "doctype", "item")
+	frappe.reload_doc("stock", "doctype", "item_default")
+
 	# fetch all draft and submitted work orders
 	fields = ["name"]
 	if "source_warehouse" in frappe.db.get_table_columns("Work Order"):
diff --git a/erpnext/patches/v9_0/fix_subscription_next_date.py b/erpnext/patches/v9_0/fix_subscription_next_date.py
index 07af712..1789848 100644
--- a/erpnext/patches/v9_0/fix_subscription_next_date.py
+++ b/erpnext/patches/v9_0/fix_subscription_next_date.py
@@ -4,15 +4,20 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import getdate
-from erpnext.accounts.doctype.subscription.subscription import get_next_schedule_date
+from frappe.desk.doctype.auto_repeat.auto_repeat import get_next_schedule_date
 
 def execute():
-	frappe.reload_doctype('Subscription')
+	frappe.reload_doc('accounts', 'doctype', 'subscription')
+	fields = ["name", "reference_doctype", "reference_document",
+			"start_date", "frequency", "repeat_on_day"]
+
+	for d in fields:
+		if not frappe.db.has_column('Subscription', d):
+			return
 
 	doctypes = ('Purchase Order', 'Sales Order', 'Purchase Invoice', 'Sales Invoice')
 	for data in frappe.get_all('Subscription',
-		fields = ["name", "reference_doctype", "reference_document",
-			"start_date", "frequency", "repeat_on_day"],
+		fields = fields,
 		filters = {'reference_doctype': ('in', doctypes), 'docstatus': 1}):
 
 		recurring_id = frappe.db.get_value(data.reference_doctype, data.reference_document, "recurring_id")
diff --git a/erpnext/portal/doctype/homepage/homepage.json b/erpnext/portal/doctype/homepage/homepage.json
index e0e47d1..81433b1 100644
--- a/erpnext/portal/doctype/homepage/homepage.json
+++ b/erpnext/portal/doctype/homepage/homepage.json
@@ -199,7 +199,6 @@
  "idx": 0,
  "image_view": 0,
  "in_create": 0,
- "in_dialog": 0,
  "is_submittable": 0,
  "issingle": 1,
  "istable": 0,
diff --git a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
index 870c8b1..c8b4ae9 100644
--- a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
+++ b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
@@ -280,7 +280,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index 9d812dd..f2e9baa 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "AC-.#####", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -23,7 +25,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0,
+   "in_list_view": 1,
    "in_standard_filter": 1, 
    "label": "Activity Type", 
    "length": 0, 
@@ -39,21 +42,56 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
+   "fieldname": "employee",
+   "fieldtype": "Link",
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1,
+   "label": "Employee",
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee",
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break",
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0,
+   "in_list_view": 0, 
+   "in_standard_filter": 0,
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -66,38 +104,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -108,6 +119,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -124,19 +136,55 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Department",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Department",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "section_break_4", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -151,9 +199,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -166,6 +216,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Billing Rate", 
@@ -181,9 +232,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +247,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -208,9 +262,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +279,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Costing Rate", 
@@ -238,9 +295,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -251,6 +310,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "title", 
@@ -266,20 +326,21 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:46:58.605696", 
+ "modified": "2018-05-17 11:55:18.494628",
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Cost", 
@@ -288,7 +349,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -296,7 +356,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -311,8 +370,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0,
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json
index 18e6c0d..e00a2b2 100644
--- a/erpnext/projects/doctype/dependent_task/dependent_task.json
+++ b/erpnext/projects/doctype/dependent_task/dependent_task.json
@@ -43,7 +43,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 7fbeaee..1e36a95 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -87,25 +87,27 @@
 			}
 		});
 	},
-	edit_task: function (frm, doctype, name) {
+});
+
+frappe.ui.form.on("Project Task", {
+	edit_task: function(frm, doctype, name) {
 		var doc = frappe.get_doc(doctype, name);
-		if (doc.task_id) {
+		if(doc.task_id) {
 			frappe.set_route("Form", "Task", doc.task_id);
 		} else {
 			frappe.msgprint(__("Save the document first."));
 		}
 	},
-	edit_timesheet: function (frm, cdt, cdn) {
+
+	edit_timesheet: function(frm, cdt, cdn) {
 		var child = locals[cdt][cdn];
-		frappe.route_options = {
-			"project": frm.doc.project_name,
-			"task": child.task_id
-		};
+		frappe.route_options = {"project": frm.doc.project_name, "task": child.task_id};
 		frappe.set_route("List", "Timesheet");
 	},
-	make_timesheet: function (frm, cdt, cdn) {
+
+	make_timesheet: function(frm, cdt, cdn) {
 		var child = locals[cdt][cdn];
-		frappe.model.with_doctype('Timesheet', function () {
+		frappe.model.with_doctype('Timesheet', function() {
 			var doc = frappe.model.get_new_doc('Timesheet');
 			var row = frappe.model.add_child(doc, 'time_logs');
 			row.project = frm.doc.project_name;
@@ -114,13 +116,11 @@
 		})
 	},
 
-	status: function (frm, doctype, name) {
+	status: function(frm, doctype, name) {
 		frm.trigger('tasks_refresh');
 	},
-
 });
 
-
 frappe.ui.form.on("Project", "validate", function (frm) {
 	frappe.call({
 		method: "erpnext.projects.doctype.project.project.times_check",
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 43cee68..184656b 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -181,6 +181,36 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "percent_complete", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "% Completed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -214,6 +244,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "priority", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -308,36 +370,6 @@
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "percent_complete", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "% Completed", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
    "columns": 0, 
@@ -1709,7 +1741,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2018-03-28 10:19:32.743900", 
+ "modified": "2018-05-10 04:21:25.764015", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
@@ -1717,7 +1749,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1737,7 +1768,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1757,7 +1787,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index abb497c..93ff62d 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -77,8 +77,8 @@
 	def validate_weights(self):
 		sum = 0
 		for task in self.tasks:
-			if task.task_weight or 0 > 0:
-				sum = sum + task.task_weight
+			if task.task_weight > 0:
+				sum = flt(sum + task.task_weight, task.precision('task_weight'))
 		if sum > 0 and sum != 1:
 			frappe.throw(
 				_("Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly"))
diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json
index ea57589..a7cc810 100644
--- a/erpnext/projects/doctype/project_user/project_user.json
+++ b/erpnext/projects/doctype/project_user/project_user.json
@@ -67,7 +67,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index ee93bcc..9323e20 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -1152,6 +1152,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1283,7 +1315,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2018-04-30 12:48:52.743838", 
+ "modified": "2018-05-10 03:47:12.256088", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index fcaa344..d289b82 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -186,27 +186,25 @@
 
 @frappe.whitelist()
 def get_children(doctype, parent, task=None, project=None, is_root=False):
-	conditions = ''
+
+	filters = [['docstatus', '<', '2']]
 
 	if task:
-		# via filters
-		conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(task))
+		filters.append(['parent_task', '=', task])
 	elif parent and not is_root:
 		# via expand child
-		conditions += ' and parent_task = "{0}"'.format(frappe.db.escape(parent))
+		filters.append(['parent_task', '=', parent])
 	else:
-		conditions += ' and ifnull(parent_task, "")=""'
+		filters.append(['ifnull(`parent_task`, "")', '=', ''])
 
 	if project:
-		conditions += ' and project = "{0}"'.format(frappe.db.escape(project))
+		filters.append(['project', '=', project])
 
-	tasks = frappe.db.sql("""select name as value,
-		subject as title,
-		is_group as expandable
-		from `tabTask`
-		where docstatus < 2
-		{conditions}
-		order by name""".format(conditions=conditions), as_dict=1)
+	tasks = frappe.get_list(doctype, fields=[
+		'name as value',
+		'subject as title',
+		'is_group as expandable'
+	], filters=filters, order_by='name')
 
 	# return tasks
 	return tasks
diff --git a/erpnext/projects/doctype/task_depends_on/task_depends_on.json b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
index 25657af..dbbe9d3 100644
--- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json
+++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
@@ -133,7 +133,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 2458db0..c26da92 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -118,30 +118,21 @@
 
 
 def make_salary_structure(employee):
-	name = frappe.db.get_value('Salary Structure Employee', {'employee': employee}, 'parent')
+	name = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'salary_structure')
 	if name:
 		salary_structure = frappe.get_doc('Salary Structure', name)
 	else:
 		salary_structure = frappe.new_doc("Salary Structure")
 		salary_structure.name = "Timesheet Salary Structure Test"
 		salary_structure.salary_slip_based_on_timesheet = 1
-		salary_structure.from_date = add_days(nowdate(), -30)
 		salary_structure.salary_component = "Basic"
 		salary_structure.hour_rate = 50.0
 		salary_structure.company = "_Test Company"
 		salary_structure.payment_account = get_random("Account")
 
-		salary_structure.set('employees', [])
 		salary_structure.set('earnings', [])
 		salary_structure.set('deductions', [])
 
-		es = salary_structure.append('employees', {
-			"employee": employee,
-			"base": 1200,
-			"from_date": add_months(nowdate(),-1)
-		})
-
-
 		es = salary_structure.append('earnings', {
 			"salary_component": "_Test Allowance",
 			"amount": 100
@@ -154,12 +145,21 @@
 
 		salary_structure.save(ignore_permissions=True)
 
+		salary_structure_assignment = frappe.new_doc("Salary Structure Assignment")
+		salary_structure_assignment.employee = employee
+		salary_structure_assignment.base = 1200
+		salary_structure_assignment.from_date = add_months(nowdate(), -1)
+		salary_structure_assignment.salary_structure = salary_structure.name
+		salary_structure_assignment.company = "_Test Company"
+		salary_structure_assignment.save(ignore_permissions=True)
+
 	return salary_structure
 
 def make_timesheet(employee, simulate=False, billable = 0, activity_type="_Test Activity Type", project=None, task=None, company=None):
 	update_activity_type(activity_type)
 	timesheet = frappe.new_doc("Timesheet")
 	timesheet.employee = employee
+	timesheet.company = company or '_Test Company'
 	timesheet_detail = timesheet.append('time_logs', {})
 	timesheet_detail.billable = billable
 	timesheet_detail.activity_type = activity_type
@@ -168,7 +168,6 @@
 	timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours= timesheet_detail.hours)
 	timesheet_detail.project = project
 	timesheet_detail.task = task
-	timesheet_detail.company = company or '_Test Company'
 
 	for data in timesheet.get('time_logs'):
 		if simulate:
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index c088818..a9629f8 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -42,7 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,7 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,7 +105,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -138,7 +138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -167,7 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -200,7 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,7 +232,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -265,7 +265,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -299,7 +299,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -332,7 +332,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -341,19 +341,20 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "user", 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_global_search": 1, 
+   "in_global_search": 0,
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "User", 
+   "label": "Department",
    "length": 0, 
    "no_copy": 0, 
-   "options": "User", 
+   "options": "Department",
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -364,7 +365,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -394,7 +395,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -403,6 +404,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "User",
+   "length": 0,
+   "no_copy": 0,
+   "options": "User",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -425,7 +458,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -456,7 +489,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -489,7 +522,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -521,7 +554,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -550,7 +583,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -581,7 +614,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -611,7 +644,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -643,7 +676,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -674,7 +707,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -705,7 +738,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -736,7 +769,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -767,7 +800,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -797,7 +830,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -831,7 +864,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -862,7 +895,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -893,7 +926,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -923,7 +956,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -954,7 +987,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -985,7 +1018,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1000,7 +1033,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-11 00:47:24.844337", 
+ "modified": "2018-05-17 12:07:30.274613",
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet", 
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index c358a54..a2c4c1c 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -343,6 +343,7 @@
 	billing_amount = flt(timesheet.total_billable_amount) - flt(timesheet.total_billed_amount)
 	billing_rate = billing_amount / hours
 
+	target.company = timesheet.company
 	if customer:
 		target.customer = customer
 
@@ -380,6 +381,11 @@
 	target.start_date = doc.start_date
 	target.end_date = doc.end_date
 	target.posting_date = doc.modified
+	target.total_working_hours = doc.total_hours
+	target.append('timesheets', {
+		'time_sheet': doc.name,
+		'working_hours': doc.total_hours
+	})
 
 @frappe.whitelist()
 def get_activity_cost(employee=None, activity_type=None):
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
index b948238..b1f7372 100644
--- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
@@ -264,7 +264,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:parent.production_order", 
+   "depends_on": "eval:parent.work_order", 
    "fieldname": "completed_qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -296,7 +296,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:parent.production_order", 
+   "depends_on": "eval:parent.work_order", 
    "fieldname": "workstation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -359,7 +359,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:parent.production_order", 
+   "depends_on": "eval:parent.work_order", 
    "fieldname": "operation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -392,7 +392,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:parent.production_order", 
+   "depends_on": "eval:parent.work_order", 
    "fieldname": "operation_id", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -932,7 +932,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-03-21 17:13:32.561550", 
+ "modified": "2018-05-07 15:12:31.510813", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet Detail", 
diff --git a/erpnext/public/images/hub_logo.svg b/erpnext/public/images/hub_logo.svg
index 1612c6d..4af4821 100644
--- a/erpnext/public/images/hub_logo.svg
+++ b/erpnext/public/images/hub_logo.svg
@@ -1,37 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   viewBox="0 0 87.312496 91.397155"
-   class="hub-icon"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="330"
    height="345.43808"
-   width="330">
+   viewBox="0 0 87.312496 91.397155"
+   version="1.1"
+   id="svg4635"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="hub-logo.svg"
+   inkscape:export-filename="/home/raghu/Desktop/hub-logo.png"
+   inkscape:export-xdpi="95.878258"
+   inkscape:export-ydpi="95.878258">
+  <defs
+     id="defs4629" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="234.27717"
+     inkscape:cy="167.57445"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1149"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4632">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
   <g
-     transform="translate(121.51931,-138.66452)"
-     id="layer1">
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(121.51931,-138.66452)">
     <rect
-       ry="13.229166"
-       y="142.74918"
-       x="-121.51931"
-       height="87.3125"
-       width="87.3125"
-       id="rect828"
+       rx="13.229166"
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="/home/raghu/Desktop/send/hub-02.png"
        style="opacity:1;vector-effect:none;fill:#89da29;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       rx="13.229166" />
+       id="rect828"
+       width="87.3125"
+       height="87.3125"
+       x="-121.51931"
+       y="142.74918"
+       ry="13.229166" />
     <path
-       id="path830"
+       style="opacity:1;vector-effect:none;fill:#63c923;fill-opacity:1;stroke:none;stroke-width:3.96875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       clip-path="none"
        d="m -121.51931,202.96343 v 13.86892 c 0,7.32897 5.90017,13.22917 13.22916,13.22917 h 60.854162 c 6.610072,0 12.056133,-4.80013 13.061216,-11.1187 -43.339761,0.1608 -54.359752,-16.03276 -87.144538,-15.97939 z"
-       clip-path="none"
-       style="opacity:1;vector-effect:none;fill:#63c923;fill-opacity:1;stroke:none;stroke-width:3.96875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+       id="path830"
+       inkscape:connector-curvature="0" />
     <path
-       id="path832"
+       style="opacity:1;vector-effect:none;fill:#59b81c;fill-opacity:1;stroke:none;stroke-width:3.96875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       clip-path="none"
        d="m -34.20681,202.96343 c -32.784694,-0.0533 -43.804846,16.14019 -87.14455,15.97939 1.00509,6.31857 6.45115,11.1187 13.06122,11.1187 h 60.854164 c 7.328992,0 13.229166,-5.9002 13.229166,-13.22917 z"
-       clip-path="none"
-       style="opacity:1;vector-effect:none;fill:#59b81c;fill-opacity:1;stroke:none;stroke-width:3.96875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+       id="path832"
+       inkscape:connector-curvature="0" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.79375005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path834"
        d="m -84.351263,175.75725 c -1.30945,0 -2.376091,1.06665 -2.376091,2.37608 v 10.02885 0.001 c 0.06583,4.83083 4.01156,8.73477 8.857351,8.73486 4.8718,5e-5 8.846821,-3.94421 8.871295,-8.81134 v -0.001 -9.95288 c 0,-1.30943 -1.066113,-2.37557 -2.375589,-2.37557 -1.309396,0 -2.376064,1.06614 -2.376064,2.37557 v 9.8888 c 0,2.26045 -1.858169,4.10983 -4.119642,4.10983 -2.263616,0 -4.105699,-1.82766 -4.105699,-4.08968 v -9.90844 c 0,-1.30943 -1.066138,-2.37608 -2.375561,-2.37608 z m -20.887107,0.0925 c -1.30943,0 -2.37609,1.06717 -2.37609,2.3766 v 16.45119 c 0,1.30944 1.06666,2.37609 2.37609,2.37609 1.30945,0 2.37556,-1.06665 2.37556,-2.37609 v -5.97327 h 8.22534 v 5.97327 c 0,1.30944 1.066641,2.37609 2.376091,2.37609 1.309423,0 2.375561,-1.06665 2.375561,-2.37609 v -16.45119 c 0,-1.30943 -1.066138,-2.3766 -2.375561,-2.3766 -1.30945,0 -2.376091,1.06717 -2.376091,2.3766 v 5.72627 h -8.22534 v -5.72627 c 0,-1.30943 -1.06611,-2.3766 -2.37556,-2.3766 z m 41.77419,0 c -0.654712,0 -1.248675,0.26711 -1.678967,0.69764 -0.05368,0.0537 -0.105119,0.10983 -0.153458,0.16846 v 5.3e-4 c -0.04839,0.0586 -0.09427,0.11929 -0.136949,0.18242 v 5.3e-4 c -0.256381,0.37936 -0.406691,0.83617 -0.406691,1.32705 v 16.45119 c 0,0.1635 0.01693,0.3242 0.04858,0.47852 0.09512,0.46331 0.32594,0.87828 0.64852,1.20096 0.161369,0.16136 0.345308,0.29938 0.547264,0.40928 v 0 c 0.134567,0.0732 0.276781,0.13403 0.425318,0.18035 v 0 c 0.148537,0.0463 0.303186,0.0783 0.462518,0.0946 v 0 c 0.07959,0.008 0.160708,0.0124 0.242358,0.0124 h 8.33181 c 0.08747,0 0.167931,-0.0145 0.251142,-0.0238 l 0.09509,0.005 c 0.06019,0.003 0.119407,0.005 0.178779,0.006 h 0.0037 0.0048 c 3.578305,-2e-5 6.487954,-2.90916 6.487981,-6.48747 v -0.001 c -0.0026,-1.51334 -0.578009,-2.9475 -1.540484,-4.10673 0.962448,-1.15892 1.537785,-2.59314 1.540484,-4.10621 v -0.001 c -2.7e-5,-3.57831 -2.909676,-6.48744 -6.487981,-6.48746 h -0.533294 z m 8.865103,4.75062 c 0.96393,0 1.736831,0.77394 1.736831,1.73788 0,0.96394 -0.772901,1.73684 -1.736831,1.73684 v 0 h -0.532792 -5.955718 v -3.47317 h 5.956248 z m 0,8.21552 v 0 c 0.963507,5.3e-4 1.735799,0.77373 1.735799,1.73736 0,0.96394 -0.772901,1.73684 -1.736831,1.73684 h -0.0048 l -0.533294,0.0119 h -5.951591 v -3.4742 h 5.959846 z"
-       id="path834" />
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.79375005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       inkscape:connector-curvature="0" />
     <path
-       id="path838"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#63c923;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.93750048;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m -77.859375,138.66406 c -9.653316,0 -18.439915,3.93483 -24.767575,10.28125 a 3.9691471,3.9691471 0 1 0 5.621091,5.60352 c 4.899576,-4.9141 11.6422,-7.94727 19.146484,-7.94727 7.501101,0 14.241542,3.03098 19.140625,7.94141 a 3.9691471,3.9691471 0 1 0 5.619141,-5.60547 c -6.327038,-6.34169 -15.110547,-10.27344 -24.759766,-10.27344 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#63c923;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.93750048;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       id="path838"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index d256c08..08f8d43 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -49,7 +49,7 @@
 $.extend(frappe.breadcrumbs.preferred, {
 	"Item Group": "Stock",
 	"Customer Group": "Selling",
-	"Supplier Type": "Buying",
+	"Supplier Group": "Buying",
 	"Territory": "Selling",
 	"Sales Person": "Selling",
 	"Sales Partner": "Selling",
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 68bb2b8..bbeb8e9 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -236,7 +236,7 @@
 				items: my_items
 			},
 			callback: function(r) {
-				if(r.exc) return;
+				if(r.exc || !r.message) return;
 
 				var i = 0;
 				var item_length = cur_frm.doc.items.length;
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index f00b84f..71c098f 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -84,7 +84,6 @@
 
 	calculate_item_values: function() {
 		var me = this;
-
 		if (!this.discount_amount_applied) {
 			$.each(this.frm.doc["items"] || [], function(i, item) {
 				frappe.model.round_floats_in(item);
@@ -200,16 +199,16 @@
 
 	calculate_net_total: function() {
 		var me = this;
-		this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
+		this.frm.doc.total_qty = this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
 
 		$.each(this.frm.doc["items"] || [], function(i, item) {
 			me.frm.doc.total += item.amount;
+			me.frm.doc.total_qty += item.qty;
 			me.frm.doc.base_total += item.base_amount;
 			me.frm.doc.net_total += item.net_amount;
 			me.frm.doc.base_net_total += item.base_net_amount;
 			});
 
-
 		frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
 	},
 
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 102090b..7adb38e 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -106,7 +106,7 @@
 		}
 
 		if(
-			this.frm.docstatus < 2 
+			this.frm.docstatus < 2
 			&& this.frm.fields_dict["payment_terms_template"]
 			&& this.frm.fields_dict["payment_schedule"]
 			&& this.frm.doc.payment_terms_template
@@ -400,7 +400,7 @@
 				item.serial_no = valid_serial_nos.join('\n');
 
 				refresh_field("serial_no", item.name, item.parentfield);
-				if(!doc.is_return) {
+				if(!doc.is_return && cint(user_defaults.set_qty_in_transactions_based_on_serial_no_input)) {
 					frappe.model.set_value(item.doctype, item.name,
 						"qty", valid_serial_nos.length / item.conversion_factor);
 					frappe.model.set_value(item.doctype, item.name, "stock_qty", valid_serial_nos.length);
@@ -599,14 +599,13 @@
 		/* manqala 19/09/2016: let the translation date be whichever of the transaction_date or posting_date is available */
 		var transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
 		/* end manqala */
-
 		var me = this;
 		this.set_dynamic_labels();
-
 		var company_currency = this.get_company_currency();
 		// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
 		if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
 				&& !this.frm.doc.ignore_pricing_rule) {
+
 			this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
 				function(exchange_rate) {
 					me.frm.set_value("conversion_rate", exchange_rate);
@@ -668,13 +667,22 @@
 	},
 
 	get_exchange_rate: function(transaction_date, from_currency, to_currency, callback) {
+		var args;
+		if (["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"].includes(this.frm.doctype)) {
+			args = "for_selling";
+		}
+		else if (["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype)) {
+			args = "for_buying";
+		}
+
 		if (!transaction_date || !from_currency || !to_currency) return;
 		return frappe.call({
 			method: "erpnext.setup.utils.get_exchange_rate",
 			args: {
 				transaction_date: transaction_date,
 				from_currency: from_currency,
-				to_currency: to_currency
+				to_currency: to_currency,
+				args: args
 			},
 			callback: function(r) {
 				callback(flt(r.message));
@@ -733,7 +741,7 @@
 	},
 
 	conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) {
-		if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
+		if(doc.doctype != 'Material Request' && frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
 			var item = frappe.get_doc(cdt, cdn);
 			frappe.model.round_floats_in(item, ["qty", "conversion_factor"]);
 			item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
@@ -978,7 +986,7 @@
 			"customer_group": me.frm.doc.customer_group,
 			"territory": me.frm.doc.territory,
 			"supplier": me.frm.doc.supplier,
-			"supplier_type": me.frm.doc.supplier_type,
+			"supplier_group": me.frm.doc.supplier_group,
 			"currency": me.frm.doc.currency,
 			"conversion_rate": me.frm.doc.conversion_rate,
 			"price_list": me.frm.doc.selling_price_list || me.frm.doc.buying_price_list,
@@ -1097,6 +1105,8 @@
 					me.in_apply_price_list = false;
 				}
 			}
+		}).always(() => {
+			me.in_apply_price_list = false;
 		});
 	},
 
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 29e3999..7e31c57 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -71,6 +71,12 @@
 			"reqd": 1
 		},
 		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
+		{
 			"fieldname":"from_fiscal_year",
 			"label": __("Start Year"),
 			"fieldtype": "Link",
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index e812f19..fa843bc 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -504,10 +504,6 @@
 	{ label: 'Operation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/operation' },
 ]
 
-frappe.help.help_links['Form/Production Planning Tool'] = [
-	{ label: 'Production Planning Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/production-planning-tool' },
-]
-
 frappe.help.help_links['Form/BOM Update Tool'] = [
 	{ label: 'BOM Update Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/bom-update-tool' },
 ]
diff --git a/erpnext/public/js/hub/hub_factory.js b/erpnext/public/js/hub/hub_factory.js
index 01f55a3..6451e1d 100644
--- a/erpnext/public/js/hub/hub_factory.js
+++ b/erpnext/public/js/hub/hub_factory.js
@@ -35,7 +35,7 @@
 							});
 						}
 					});
-				} else {
+				} else if (!route[3]){
 					frappe.require(assets['Form'], () => {
 						erpnext.hub.pages[page_name] = new erpnext.hub[page+'Page']({
 							unique_id: route[2],
@@ -44,6 +44,15 @@
 							hub_settings: this.hub_settings
 						});
 					});
+				} else {
+					frappe.require(assets['List'], () => {
+						frappe.route_options = {};
+						frappe.route_options["company_name"] = route[2]
+						erpnext.hub.pages[page_name] = new erpnext.hub['ItemListing']({
+							parent: this.make_page(true, page_name),
+							hub_settings: this.hub_settings
+						});
+					});
 				}
 				window.hub_page = erpnext.hub.pages[page_name];
 			} else {
diff --git a/erpnext/public/js/hub/hub_form.js b/erpnext/public/js/hub/hub_form.js
index 62c44fc..4a8c4eb 100644
--- a/erpnext/public/js/hub/hub_form.js
+++ b/erpnext/public/js/hub/hub_form.js
@@ -444,8 +444,8 @@
 				{ label: __('Supplier Name'), fieldtype: 'Data', fieldname: 'supplier_name', default: item.company_name },
 				{ label: __('Supplier Email'), fieldtype: 'Data', fieldname: 'supplier_email', default: item.seller },
 				{ fieldtype: 'Column Break' },
-				{ label: __('Supplier Type'), fieldname: 'supplier_type',
-					fieldtype: 'Link', options: 'Supplier Type' }
+				{ label: __('Supplier Group'), fieldname: 'supplier_group',
+					fieldtype: 'Link', options: 'Supplier Group' }
 			];
 			fields = fields.map(f => { f.reqd = 1; return f; });
 
diff --git a/erpnext/public/js/hub/hub_listing.js b/erpnext/public/js/hub/hub_listing.js
index a979d28..0ff7970 100644
--- a/erpnext/public/js/hub/hub_listing.js
+++ b/erpnext/public/js/hub/hub_listing.js
@@ -58,12 +58,7 @@
 				label: __('Favourites'),
 				action: () => frappe.set_route('Hub', 'Favourites'),
 				standard: true
-			},
-			// {
-			// 	label: __('Toggle Sidebar'),
-			// 	action: () => this.toggle_side_bar(),
-			// 	standard: true
-			// }
+			}
 		];
 
 		return items;
@@ -85,7 +80,15 @@
 		});
 	}
 
-	setup_view() { }
+	setup_view() {
+		if(frappe.route_options){
+			const filters = [];
+			for (let field in frappe.route_options) {
+				var value = frappe.route_options[field];
+				this.page.fields_dict[field].set_value(value);
+			}
+		}
+	}
 
 	get_args() {
 		return {
@@ -110,18 +113,7 @@
 		this.data_dict = {};
 	}
 
-	freeze(toggle) {
-		// if(!this.$freeze) return;
-		// this.$freeze.toggle(toggle);
-		// if (this.$freeze.find('.image-view-container').length) return;
-
-		// const html = Array.from(new Array(4)).map(d => this.card_html({
-		// 	name: 'Loading...',
-		// 	item_name: 'Loading...'
-		// })).join('');
-
-		// this.$freeze.html(`<div class="image-view-container border-top">${html}</div>`);
-	}
+	freeze(toggle) { }
 
 	render() {
 		this.data_dict = {};
@@ -360,7 +352,7 @@
 	setup_defaults() {
 		super.setup_defaults();
 		this.doctype = 'Hub Item';
-		this.page_title = __('Products');
+		this.page_title = __('Marketplace');
 		this.fields = ['name', 'hub_item_code', 'image', 'item_name', 'item_code', 'company_name', 'description', 'country'];
 		this.filters = [];
 	}
@@ -529,7 +521,7 @@
 						(${reviewLength})
 					</div>
 					<div class="list-row-col">
-						<a href="${'#Hub/Company/'+company_name}"><p>${ company_name }</p></a>
+						<a href="${'#Hub/Company/'+company_name+'/Items'}"><p>${ company_name }</p></a>
 					</div>
 				</div>
 				<div class="image-view-body">
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
old mode 100644
new mode 100755
index f6ef5a4..52f3cf6
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -25,7 +25,7 @@
 				{% } %}
 			</div>
 			<span class="price-info">
-				{{item_price}}
+				{{item_price}} / {{item_uom}}
 			</span>
 		</a>
 	</div>
diff --git a/erpnext/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js
index 117d4eb..595a138 100644
--- a/erpnext/public/js/purchase_trends_filters.js
+++ b/erpnext/public/js/purchase_trends_filters.js
@@ -23,7 +23,7 @@
 				{ "value": "Item", "label": __("Item") },
 				{ "value": "Item Group", "label": __("Item Group") },
 				{ "value": "Supplier", "label": __("Supplier") },
-				{ "value": "Supplier Type", "label": __("Supplier Type") },
+				{ "value": "Supplier Group", "label": __("Supplier Group") },
 				{ "value": "Project", "label": __("Project") }
 			],
 			"default": "Item"
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index a9ac8c4..ed4b4d2 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -287,9 +287,13 @@
 
 			alternative_items.forEach(d => {
 				let row = frappe.get_doc(opts.child_doctype, d.docname);
-				let qty = row.qty;
+				let qty = null;
+				if (row.doctype === 'Work Order Item') {
+					qty = row.required_qty;
+				} else {
+					qty = row.qty;
+				}
 				row[item_field] = d.alternate_item;
-
 				frm.script_manager.trigger(item_field, row.doctype, row.name)
 					.then(() => {
 						frappe.model.set_value(row.doctype, row.name, 'qty', qty);
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 78def26..eabb81e 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -55,11 +55,13 @@
 				},
 				get_query: function() {
 					return {
-						filters: {
-							is_group: 0,
-							company: me.frm.doc.company
-						}
-					};
+						query: "erpnext.controllers.queries.warehouse_query",
+						filters: [
+							["Bin", "item_code", "=", me.item_code],
+							["Warehouse", "is_group", "=", 0],
+							["Warehouse", "company", "=", me.frm.doc.company]
+						]
+					}
 				}
 			},
 			{fieldtype:'Column Break'},
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 0073d33..0b75213 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -16,7 +16,7 @@
 	add_print_formats()
 	if not patch:
 		update_address_template()
-		make_fixtures()
+		make_fixtures(company)
 
 def update_address_template():
 	with open(os.path.join(os.path.dirname(__file__), 'address_template.html'), 'r') as f:
@@ -113,10 +113,10 @@
 	purchase_invoice_gst_fields = [
 			dict(fieldname='supplier_gstin', label='Supplier GSTIN',
 				fieldtype='Data', insert_after='supplier_address',
-				options='supplier_address.gstin', print_hide=1),
+				fetch_from='supplier_address.gstin', print_hide=1),
 			dict(fieldname='company_gstin', label='Company GSTIN',
-				fieldtype='Data', insert_after='shipping_address',
-				options='shipping_address.gstin', print_hide=1),
+				fieldtype='Data', insert_after='shipping_address_display',
+				fetch_from='shipping_address.gstin', print_hide=1),
 			dict(fieldname='place_of_supply', label='Place of Supply',
 				fieldtype='Data', insert_after='shipping_address',
 				print_hide=1, read_only=0),
@@ -136,16 +136,16 @@
 	sales_invoice_gst_fields = [
 			dict(fieldname='billing_address_gstin', label='Billing Address GSTIN',
 				fieldtype='Data', insert_after='customer_address',
-				options='customer_address.gstin', print_hide=1),
+				fetch_from='customer_address.gstin', print_hide=1),
 			dict(fieldname='customer_gstin', label='Customer GSTIN',
-				fieldtype='Data', insert_after='shipping_address',
-				options='shipping_address_name.gstin', print_hide=1),
+				fieldtype='Data', insert_after='shipping_address_name',
+				fetch_from='shipping_address_name.gstin', print_hide=1),
 			dict(fieldname='place_of_supply', label='Place of Supply',
 				fieldtype='Data', insert_after='customer_gstin',
 				print_hide=1, read_only=0),
 			dict(fieldname='company_gstin', label='Company GSTIN',
 				fieldtype='Data', insert_after='company_address',
-				options='company_address.gstin', print_hide=1),
+				fetch_from='company_address.gstin', print_hide=1),
 			dict(fieldname='port_code', label='Port Code',
 				fieldtype='Data', insert_after='reason_for_issuing_document', print_hide=1,
 				depends_on="eval:doc.invoice_type=='Export' "),
@@ -157,6 +157,11 @@
 				depends_on="eval:doc.invoice_type=='Export' ")
 		]
 
+	inter_state_gst_field = [
+		dict(fieldname='is_inter_state', label='Is Inter State',
+			fieldtype='Check', insert_after='disabled', print_hide=1)
+	]
+
 	custom_fields = {
 		'Address': [
 			dict(fieldname='gstin', label='Party GSTIN', fieldtype='Data',
@@ -168,7 +173,9 @@
 		],
 		'Purchase Invoice': invoice_gst_fields + purchase_invoice_gst_fields,
 		'Sales Invoice': invoice_gst_fields + sales_invoice_gst_fields,
-		"Delivery Note": sales_invoice_gst_fields,
+		'Delivery Note': sales_invoice_gst_fields,
+		'Sales Taxes and Charges Template': inter_state_gst_field,
+		'Purchase Taxes and Charges Template': inter_state_gst_field,
 		'Item': [
 			dict(fieldname='gst_hsn_code', label='HSN/SAC',
 				fieldtype='Link', options='GST HSN Code', insert_after='item_group'),
@@ -189,15 +196,13 @@
 
 	create_custom_fields(custom_fields, ignore_validate = frappe.flags.in_patch)
 
-def make_fixtures():
-	docs = [
-		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},
-		{'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'type': 'Deduction'},
-		{'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'type': 'Earning'},
-		{'doctype': 'Salary Component', 'salary_component': 'Basic', 'description': 'Basic', 'type': 'Earning'},
-		{'doctype': 'Salary Component', 'salary_component': 'Arrear', 'description': 'Arrear', 'type': 'Earning'},
-		{'doctype': 'Salary Component', 'salary_component': 'Leave Encashment', 'description': 'Leave Encashment', 'type': 'Earning'}
-	]
+def make_fixtures(company=None):
+	docs = []
+	company = company.name if company else frappe.db.get_value("Global Defaults", None, "default_company")
+
+	set_salary_components(docs)
+	set_tds_account(docs, company)
+	set_tax_withholding_category(docs, company)
 
 	for d in docs:
 		try:
@@ -206,3 +211,43 @@
 			doc.insert()
 		except frappe.NameError:
 			pass
+
+def set_salary_components(docs):
+	docs.extend([
+		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},
+		{'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'type': 'Deduction'},
+		{'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'type': 'Earning'},
+		{'doctype': 'Salary Component', 'salary_component': 'Basic', 'description': 'Basic', 'type': 'Earning'},
+		{'doctype': 'Salary Component', 'salary_component': 'Arrear', 'description': 'Arrear', 'type': 'Earning'},
+		{'doctype': 'Salary Component', 'salary_component': 'Leave Encashment', 'description': 'Leave Encashment', 'type': 'Earning'}
+	])
+
+def set_tax_withholding_category(docs, company):
+	accounts = []
+	tds_account = frappe.db.get_value("Account", filter={"account_type": "Payable",
+		"account_name": "TDS", "company": company})
+
+	if company and tds_account:
+		accounts = [
+				{
+					'company': company,
+					'account': tds_account
+				}
+			]
+
+	docs.extend([
+		{
+			'doctype': 'Tax Withholding Category', '__newname': 'TDS',
+			'percent_of_tax_withheld': 10,'threshold': 150000, 'book_on_invoice': 1,
+			'book_on_advance': 0, "withhold_cumulative_tax_amount": 0,
+			'accounts': accounts
+		}
+	])
+
+def set_tds_account(docs, company):
+	docs.extend([
+		{
+			'doctype': 'Account', 'account_name': 'TDS', 'account_type': 'Tax',
+			'parent_account': 'Duties and Taxes', 'company': company
+		}
+	])
\ No newline at end of file
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index b878a1e..f887841 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -3,6 +3,7 @@
 from frappe.utils import cstr
 from erpnext.regional.india import states, state_numbers
 from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount
+from erpnext.controllers.accounts_controller import get_taxes_and_charges
 
 def validate_gstin_for_india(doc, method):
 	if not hasattr(doc, 'gstin'):
@@ -61,19 +62,48 @@
 
 	return hsn_tax, hsn_taxable_amount
 
-def set_place_of_supply(doc, method):
-	if not frappe.get_meta('Address').has_field('gst_state'): return
-
-	if doc.doctype in ("Sales Invoice", "Delivery Note"):
-		address_name = doc.shipping_address_name or doc.customer_address
-	elif doc.doctype == "Purchase Invoice":
-		address_name = doc.shipping_address or doc.supplier_address
-
-	if address_name:
-		address = frappe.db.get_value("Address", address_name, ["gst_state", "gst_state_number"], as_dict=1)
-		doc.place_of_supply = cstr(address.gst_state_number) + "-" + cstr(address.gst_state)
+def set_place_of_supply(doc, method=None):
+	doc.place_of_supply = get_place_of_supply(doc, doc.doctype)
 
 # don't remove this function it is used in tests
 def test_method():
 	'''test function'''
 	return 'overridden'
+
+def get_place_of_supply(out, doctype):
+	if not frappe.get_meta('Address').has_field('gst_state'): return
+
+	if doctype in ("Sales Invoice", "Delivery Note"):
+		address_name = out.shipping_address_name or out.customer_address
+	elif doctype == "Purchase Invoice":
+		address_name = out.shipping_address or out.supplier_address
+
+	if address_name:
+		address = frappe.db.get_value("Address", address_name, ["gst_state", "gst_state_number"], as_dict=1)
+		return cstr(address.gst_state_number) + "-" + cstr(address.gst_state)
+
+def get_regional_address_details(out, doctype, company):
+
+	out.place_of_supply = get_place_of_supply(out, doctype)
+
+	if not out.place_of_supply: return
+
+	if doctype in ("Sales Invoice", "Delivery Note"):
+		master_doctype = "Sales Taxes and Charges Template"
+		if not (out.company_gstin or out.place_of_supply):
+			return
+	else:
+		master_doctype = "Purchase Taxes and Charges Template"
+		if not (out.supplier_gstin or out.place_of_supply):
+			return
+
+	if doctype in ("Sales Invoice", "Delivery Note") and out.company_gstin[:2] != out.place_of_supply[:2]\
+		or (doctype == "Purchase Invoice" and out.supplier_gstin[:2] != out.place_of_supply[:2]):
+		default_tax = frappe.db.get_value(master_doctype, {"company": company, "is_inter_state":1, "disabled":0})
+	else:
+		default_tax = frappe.db.get_value(master_doctype, {"company": company, "disabled":0, "is_default": 1})
+
+	if not default_tax:
+		return
+	out["taxes_and_charges"] = default_tax
+	out.taxes = get_taxes_and_charges(master_doctype, default_tax)
diff --git a/erpnext/regional/report/gstr_1/gstr_1.js b/erpnext/regional/report/gstr_1/gstr_1.js
index 3a63527..b2c8aed 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.js
+++ b/erpnext/regional/report/gstr_1/gstr_1.js
@@ -12,6 +12,21 @@
 			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
+			"fieldname":"company_address",
+			"label": __("Address"),
+			"fieldtype": "Link",
+			"options": "Address",
+			"get_query": function() {
+				var company = frappe.query_report_filters_by_name.company.get_value();
+				if (company) {
+					return {
+						"query": 'frappe.contacts.doctype.address.address.address_query',
+						"filters": { link_doctype: 'Company', link_name: company}
+					};
+				}
+			}
+		},
+		{
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 50a2e0d..690fbbc 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -23,7 +23,7 @@
 			posting_date,
 			base_grand_total,
 			base_rounded_total,
-			customer_gstin,
+			COALESCE(NULLIF(customer_gstin,''), NULLIF(billing_address_gstin, '')) as customer_gstin,
 			place_of_supply,
 			ecommerce_gstin,
 			reverse_charge,
@@ -102,7 +102,8 @@
 
 		for opts in (("company", " and company=%(company)s"),
 			("from_date", " and posting_date>=%(from_date)s"),
-			("to_date", " and posting_date<=%(to_date)s")):
+			("to_date", " and posting_date<=%(to_date)s"),
+			("company_address", " and company_address=%(company_address)s")):
 				if self.filters.get(opts[0]):
 					conditions += opts[1]
 
@@ -143,7 +144,17 @@
 		""" % (self.doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1)
 
 		for d in items:
-			self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, d.base_net_amount)
+			item_details = {}
+			item_details[d.item_code] = d.base_net_amount
+
+			if d.parent in self.invoice_items:
+				parent_dict = self.invoice_items[d.parent]
+				if d.item_code in parent_dict:
+					item_details[d.item_code] += parent_dict[d.item_code]
+				else:
+					item_details.update(parent_dict)
+
+			self.invoice_items[d.parent] = item_details
 
 	def get_items_based_on_tax_rate(self):
 		self.tax_details = frappe.db.sql("""
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/regional/report/hsn_wise_summary_of_outward_supplies/__init__.py
diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js
new file mode 100644
index 0000000..df0ef25
--- /dev/null
+++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js
@@ -0,0 +1,23 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["HSN-wise-summary of outward supplies"] = {
+	"filters": [
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"reqd": 1,
+			"default": frappe.defaults.get_user_default("Company")
+		},
+		{
+			"fieldname":"gst_hsn_code",
+			"label": __("HSN/SAC"),
+			"fieldtype": "Link",
+			"options": "GST HSN Code",
+			"width": "80"
+		}
+	]
+}
diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.json b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.json
new file mode 100644
index 0000000..0cafdc8
--- /dev/null
+++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.json
@@ -0,0 +1,29 @@
+{
+ "add_total_row": 0, 
+ "creation": "2018-04-26 10:49:29.159400", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "Standard", 
+ "modified": "2018-04-26 12:59:38.603649", 
+ "modified_by": "Administrator", 
+ "module": "Regional", 
+ "name": "HSN-wise-summary of outward supplies", 
+ "owner": "Administrator", 
+ "ref_doctype": "Sales Invoice", 
+ "report_name": "HSN-wise-summary of outward supplies", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
new file mode 100644
index 0000000..165458c
--- /dev/null
+++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
@@ -0,0 +1,217 @@
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe import _
+from frappe.utils import flt
+from frappe.model.meta import get_field_precision
+from frappe.utils.xlsxutils import handle_html
+
+def execute(filters=None):
+	return _execute(filters)
+
+def _execute(filters=None):
+	if not filters: filters = {}
+	columns = get_columns()
+
+	company_currency = erpnext.get_company_currency(filters.company)
+	item_list = get_items(filters)
+	if item_list:
+		itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)
+
+	data = []
+	for d in item_list:
+		row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty]
+		total_tax = 0
+		for tax in tax_columns:
+			item_tax = itemised_tax.get(d.name, {}).get(tax, {})
+			total_tax += flt(item_tax.get("tax_amount"))
+
+		row += [d.base_net_amount + total_tax]
+		row += [d.base_net_amount]
+
+		for tax in tax_columns:
+			item_tax = itemised_tax.get(d.name, {}).get(tax, {})
+			row += [item_tax.get("tax_amount", 0)]
+
+		data.append(row)
+	if data:
+		data = get_merged_data(columns, data) # merge same hsn code data
+	return columns, data
+
+def get_columns():
+	columns = [
+		{
+			"fieldname": "gst_hsn_code",
+			"label": _("HSN/SAC"),
+			"fieldtype": "Link",
+			"options": "GST HSN Code",
+			"width": 100
+		},
+		{
+			"fieldname": "description",
+			"label": _("Description"),
+			"fieldtype": "Data",
+			"width": 300
+		},
+		{
+			"fieldname": "stock_uom",
+			"label": _("Stock UOM"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "stock_qty",
+			"label": _("Stock Qty"),
+			"fieldtype": "Float",
+			"width": 90
+		},
+		{
+			"fieldname": "total_amount",
+			"label": _("Total Amount"),
+			"fieldtype": "Currency",
+			"width": 120
+		},
+		{
+			"fieldname": "taxable_amount",
+			"label": _("Total Taxable Amount"),
+			"fieldtype": "Currency",
+			"width": 170
+		}
+	]
+
+	return columns
+
+def get_conditions(filters):
+	conditions = ""
+
+	for opts in (("company", " and company=%(company)s"),
+		("gst_hsn_code", " and gst_hsn_code=%(gst_hsn_code)s")):
+			if filters.get(opts[0]):
+				conditions += opts[1]
+
+	return conditions
+
+def get_items(filters):
+	conditions = get_conditions(filters)
+	match_conditions = frappe.build_match_conditions("Sales Invoice")
+	if match_conditions:
+		match_conditions = " and {0} ".format(match_conditions)
+
+
+	return frappe.db.sql("""
+		select
+			`tabSales Invoice Item`.name, `tabSales Invoice Item`.base_price_list_rate,
+			`tabSales Invoice Item`.gst_hsn_code, `tabSales Invoice Item`.stock_qty,
+			`tabSales Invoice Item`.stock_uom, `tabSales Invoice Item`.base_net_amount,
+			`tabSales Invoice Item`.parent, `tabSales Invoice Item`.item_code,
+			`tabGST HSN Code`.description
+		from `tabSales Invoice`, `tabSales Invoice Item`, `tabGST HSN Code`
+		where `tabSales Invoice`.name = `tabSales Invoice Item`.parent
+			and `tabSales Invoice`.docstatus = 1
+			and `tabSales Invoice Item`.gst_hsn_code is not NULL
+			and `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name %s %s
+
+		""" % (conditions, match_conditions), filters, as_dict=1)
+
+
+def get_tax_accounts(item_list, columns, company_currency,
+		doctype="Sales Invoice", tax_doctype="Sales Taxes and Charges"):
+	import json
+	item_row_map = {}
+	tax_columns = []
+	invoice_item_row = {}
+	itemised_tax = {}
+	conditions = ""
+
+	tax_amount_precision = get_field_precision(frappe.get_meta(tax_doctype).get_field("tax_amount"),
+		currency=company_currency) or 2
+
+	for d in item_list:
+		invoice_item_row.setdefault(d.parent, []).append(d)
+		item_row_map.setdefault(d.parent, {}).setdefault(d.item_code or d.item_name, []).append(d)
+
+	tax_details = frappe.db.sql("""
+		select
+			parent, description, item_wise_tax_detail,
+			base_tax_amount_after_discount_amount
+		from `tab%s`
+		where
+			parenttype = %s and docstatus = 1
+			and (description is not null and description != '')
+			and parent in (%s)
+			%s
+		order by description
+	""" % (tax_doctype, '%s', ', '.join(['%s']*len(invoice_item_row)), conditions),
+		tuple([doctype] + list(invoice_item_row)))
+
+	for parent, description, item_wise_tax_detail, tax_amount in tax_details:
+		description = handle_html(description)
+		if description not in tax_columns and tax_amount:
+			# as description is text editor earlier and markup can break the column convention in reports
+			tax_columns.append(description)
+
+		if item_wise_tax_detail:
+			try:
+				item_wise_tax_detail = json.loads(item_wise_tax_detail)
+
+				for item_code, tax_data in item_wise_tax_detail.items():
+					if not frappe.db.get_value("Item", item_code, "gst_hsn_code"):
+						continue
+					itemised_tax.setdefault(item_code, frappe._dict())
+					if isinstance(tax_data, list):
+						tax_amount = tax_data[1]
+					else:
+						tax_amount = 0
+
+					for d in item_row_map.get(parent, {}).get(item_code, []):
+						item_tax_amount = tax_amount
+						if item_tax_amount:
+							itemised_tax.setdefault(d.name, {})[description] = frappe._dict({
+								"tax_amount": flt(item_tax_amount, tax_amount_precision)
+							})
+			except ValueError:
+				continue
+
+	tax_columns.sort()
+	for desc in tax_columns:
+		columns.append(desc + " Amount:Currency/currency:160")
+
+	# columns += ["Total Amount:Currency/currency:110"]
+	return itemised_tax, tax_columns
+
+def get_merged_data(columns, data):
+	merged_hsn_dict = {} # to group same hsn under one key and perform row addition
+	add_column_index = [] # store index of columns that needs to be added
+	tax_col = len(get_columns())
+	fields_to_merge = ["stock_qty", "total_amount", "taxable_amount"] # columns for which index needs to be found
+
+	for i,d in enumerate(columns):
+		# check if fieldname in to_merge list and ignore tax-columns
+		if i < tax_col and d["fieldname"] in fields_to_merge:
+			add_column_index.append(i)
+
+	for row in data:
+		if merged_hsn_dict.has_key(row[0]):
+			to_add_row = merged_hsn_dict.get(row[0])
+
+			# add columns from the add_column_index table
+			for k in add_column_index:
+				to_add_row[k] += row[k]
+
+			# add tax columns
+			for k in range(len(columns)):
+				if tax_col <= k < len(columns):
+					to_add_row[k] += row[k]
+
+			# update hsn dict with the newly added data
+			merged_hsn_dict[row[0]] = to_add_row
+		else:
+			merged_hsn_dict[row[0]] = row
+
+	# extract data rows to be displayed in report
+	data = [merged_hsn_dict[d] for d in merged_hsn_dict]
+
+	return data
+
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index ed8e6c8..88e66ca 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -5,7 +5,6 @@
 	setup: function(frm) {
 		frm.add_fetch('lead_name', 'company_name', 'customer_name');
 		frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
-
 		frm.set_query('customer_group', {'is_group': 0});
 		frm.set_query('default_price_list', { 'selling': 1});
 		frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
@@ -19,12 +18,15 @@
 			if(doc.party_account_currency) {
 				$.extend(filters, {"account_currency": doc.party_account_currency});
 			}
-
 			return {
 				filters: filters
 			}
 		});
 
+		if (frm.doc.__islocal == 1) {
+			frm.set_value("represents_company", "");
+		}
+
 		frm.set_query('customer_primary_contact', function(doc) {
 			return {
 				query: "erpnext.selling.doctype.customer.customer.get_customer_primary_contact",
@@ -58,6 +60,16 @@
 			frm.set_value("primary_address", "");
 		}
 	},
+
+	is_internal_customer: function(frm) {
+		if (frm.doc.is_internal_customer == 1) {
+			frm.toggle_reqd("represents_company", true);
+		}
+		else {
+			frm.toggle_reqd("represents_company", false);
+		}
+	},
+
 	customer_primary_contact: function(frm){
 		if(!frm.doc.customer_primary_contact){
 			frm.set_value("mobile_no", "");
@@ -73,7 +85,6 @@
 		}
 
 		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Customer'}
-
 		frm.toggle_display(['address_html','contact_html','primary_address_and_contact_detail'], !frm.doc.__islocal);
 
 		if(!frm.doc.__islocal) {
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index d43de10..efd7024 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -43,6 +43,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,6 +74,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 1, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,6 +107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -136,6 +139,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -168,6 +172,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -201,6 +206,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -233,6 +239,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -263,6 +270,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -291,6 +299,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -325,6 +334,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -358,6 +368,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -388,6 +399,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -419,6 +431,137 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_internal_customer", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Internal Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_internal_customer", 
+   "fieldname": "represents_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Represents Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "represents_company", 
+   "fieldname": "allowed_to_transact_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allowed To Transact With", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "represents_company", 
+   "fieldname": "companies", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allowed To Transact With", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Allowed To Transact With", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -449,6 +592,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -479,6 +623,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -509,6 +654,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -538,6 +684,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -569,6 +716,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -600,6 +748,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -629,6 +778,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -658,6 +808,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -686,6 +837,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -717,6 +869,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -748,6 +901,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -780,6 +934,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -788,6 +943,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "customer_primary_contact.mobile_no",
    "fieldname": "mobile_no", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -800,7 +956,7 @@
    "label": "Mobile No", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer_primary_contact.mobile_no", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -811,6 +967,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -819,6 +976,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "customer_primary_contact.email_id",
    "fieldname": "email_id", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -831,7 +989,7 @@
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer_primary_contact.email_id", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -842,6 +1000,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -871,6 +1030,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -903,6 +1063,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -935,6 +1096,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -965,6 +1127,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -997,6 +1160,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1027,6 +1191,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": ""
   }, 
@@ -1060,6 +1225,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1091,6 +1257,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1120,6 +1287,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1152,6 +1320,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1184,6 +1353,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1216,6 +1386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1246,6 +1417,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1278,6 +1450,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1310,6 +1483,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1341,6 +1515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1372,6 +1547,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1404,6 +1580,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1434,6 +1611,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -1449,7 +1627,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-09 10:44:35.801716", 
+ "modified": "2018-05-16 22:43:32.646869",
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
@@ -1458,7 +1636,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -1478,7 +1655,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1498,7 +1674,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1518,7 +1693,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -1538,7 +1712,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1558,7 +1731,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1578,7 +1750,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1598,7 +1769,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1618,7 +1788,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 78f892b..5a95b55 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -7,7 +7,7 @@
 from frappe import _, msgprint, throw
 import frappe.defaults
 from frappe.utils import flt, cint, cstr
-from frappe.desk.reportview import build_match_conditions
+from frappe.desk.reportview import build_match_conditions, get_filters_cond
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
 from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
@@ -179,7 +179,7 @@
 			frappe.db.set(self, "customer_name", newdn)
 
 
-def get_customer_list(doctype, txt, searchfield, start, page_len, filters):
+def get_customer_list(doctype, txt, searchfield, start, page_len, filters=None):
 	if frappe.db.get_default("cust_master_name") == "Customer Name":
 		fields = ["name", "customer_group", "territory"]
 	else:
@@ -188,6 +188,10 @@
 	match_conditions = build_match_conditions("Customer")
 	match_conditions = "and {}".format(match_conditions) if match_conditions else ""
 
+	if filters:
+		filter_conditions = get_filters_cond(doctype, filters, [])
+		match_conditions += "{}".format(filter_conditions)
+
 	return frappe.db.sql("""select %s from `tabCustomer` where docstatus < 2
 		and (%s like %s or customer_name like %s)
 		{match_conditions}
@@ -313,7 +317,7 @@
 	return address
 
 def get_customer_primary_contact(doctype, txt, searchfield, start, page_len, filters):
-	customer = frappe.db.escape(filters.get('customer'))
+	customer = filters.get('customer')
 	return frappe.db.sql("""
 		select `tabContact`.name from `tabContact`, `tabDynamic Link`
 			where `tabContact`.name = `tabDynamic Link`.parent and `tabDynamic Link`.link_name = %(customer)s
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 027626c..f4fcae4 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -44,7 +44,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
index 17bf278..79bcf10 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -238,7 +238,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/selling/doctype/lead_source/lead_source.json b/erpnext/selling/doctype/lead_source/lead_source.json
index e677915..868f6d1 100644
--- a/erpnext/selling/doctype/lead_source/lead_source.json
+++ b/erpnext/selling/doctype/lead_source/lead_source.json
@@ -69,7 +69,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
index d31b5fb..38f51de 100644
--- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -169,7 +169,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 92db12b..63e85fd 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -206,11 +206,6 @@
 
 }
 
-cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
-	if(cint(frappe.boot.notification_settings.quotation))
-		cur_frm.email_doc(frappe.boot.notification_settings.quotation_message);
-}
-
 frappe.ui.form.on("Quotation Item", "items_on_form_rendered", function(frm, cdt, cdn) {
 	// enable tax_amount field if Actual
 })
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index b58cd4e..6dc2c00 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -40,7 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,7 +72,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -105,7 +105,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -139,7 +139,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -173,7 +173,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -207,7 +207,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -216,6 +216,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "customer.customer_name",
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -228,7 +229,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer.customer_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -238,7 +239,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -268,7 +269,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -302,7 +303,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -337,7 +338,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -371,7 +372,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -403,7 +404,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -437,7 +438,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -470,7 +471,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -501,7 +502,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -533,7 +534,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -567,7 +568,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -597,7 +598,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -627,7 +628,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -658,7 +659,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -688,7 +689,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -720,7 +721,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -750,7 +751,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -785,7 +786,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -817,7 +818,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -848,7 +849,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -881,7 +882,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -916,7 +917,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -946,7 +947,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -980,7 +981,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1012,7 +1013,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1044,7 +1045,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1074,7 +1075,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1106,7 +1107,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1139,7 +1140,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "40px"
   }, 
@@ -1169,6 +1170,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -1201,7 +1233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1234,7 +1266,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1264,7 +1296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1296,7 +1328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1327,7 +1359,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1358,7 +1390,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1390,7 +1422,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1423,7 +1455,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1452,7 +1484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1484,7 +1516,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1513,7 +1545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1546,7 +1578,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1577,7 +1609,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1608,7 +1640,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1637,7 +1669,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1670,7 +1702,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1699,7 +1731,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1730,7 +1762,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1762,7 +1794,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1795,7 +1827,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1827,7 +1859,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1857,7 +1889,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1888,7 +1920,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1919,7 +1951,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1951,7 +1983,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1984,7 +2016,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2017,7 +2049,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2050,7 +2082,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2084,7 +2116,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2115,7 +2147,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2149,7 +2181,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2182,7 +2214,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2215,7 +2247,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2248,7 +2280,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2282,7 +2314,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2314,7 +2346,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2346,7 +2378,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2379,7 +2411,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2412,7 +2444,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2444,7 +2476,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2475,7 +2507,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2508,7 +2540,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2517,8 +2549,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "fieldtype": "Link", 
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -2526,22 +2558,20 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Print Heading", 
+   "label": "Group same items",
    "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
+   "no_copy": 0,
    "permlevel": 0, 
+   "precision": "",
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
-   "report_hide": 1, 
+   "report_hide": 0,
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2571,11 +2601,43 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Heading",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2602,7 +2664,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2633,7 +2695,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2665,7 +2727,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2697,7 +2759,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2730,7 +2792,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2763,7 +2825,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2796,7 +2858,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2826,7 +2888,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2861,7 +2923,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2893,7 +2955,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2925,7 +2987,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2957,7 +3019,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -2973,15 +3035,14 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2018-03-10 07:34:23.971888", 
- "modified_by": "Administrator", 
+ "modified": "2018-05-28 03:23:15.354674",
+ "modified_by": "Administrator",
  "module": "Selling", 
  "name": "Quotation", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3001,7 +3062,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3022,7 +3082,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3043,7 +3102,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3063,7 +3121,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3083,7 +3140,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3104,7 +3160,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3124,7 +3179,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/selling/doctype/quotation/quotation_dashboard.py b/erpnext/selling/doctype/quotation/quotation_dashboard.py
index c6297e2..d32fd0c 100644
--- a/erpnext/selling/doctype/quotation/quotation_dashboard.py
+++ b/erpnext/selling/doctype/quotation/quotation_dashboard.py
@@ -4,7 +4,7 @@
 	return {
 		'fieldname': 'prevdoc_docname',
 		'non_standard_fieldnames': {
-			'Subscription': 'reference_document',
+			'Auto Repeat': 'reference_document',
 		},
 		'transactions': [
 			{
@@ -13,7 +13,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index ced5ebf..3b36a2d 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -150,12 +150,10 @@
 		from erpnext.stock.doctype.item.test_item import make_item
 
 		first_item = make_item("_Test Laptop",
-							{"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC",
-							 "cost_center": "_Test Cost Center - _TC"})
+							{"is_stock_item": 1})
 
 		second_item = make_item("_Test CPU",
-							{"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC",
-							 "cost_center": "_Test Cost Center - _TC"})
+							{"is_stock_item": 1})
 
 		qo_item1 = [
 			{
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 20685de..9a2311d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -442,11 +442,6 @@
 				frappe.ui.form.is_saving = false;
 			}
 		});
-	},
-	on_submit: function(doc, cdt, cdn) {
-		if(cint(frappe.boot.notification_settings.sales_order)) {
-			this.frm.email_doc(frappe.boot.notification_settings.sales_order_message);
-		}
 	}
 });
 $.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index ea1b573..91eafee 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -41,7 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,7 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -137,7 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -170,7 +170,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -179,6 +179,7 @@
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "customer.customer_name",
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -191,7 +192,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer.customer_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -201,7 +202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -236,7 +237,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -266,7 +267,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -300,7 +301,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -335,7 +336,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -369,7 +370,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "160px"
   }, 
@@ -401,7 +402,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -435,7 +436,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -470,7 +471,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -502,7 +503,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -536,12 +537,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -567,12 +568,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -597,7 +598,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -628,7 +629,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -658,7 +659,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -688,7 +689,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -719,7 +720,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -748,13 +749,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -780,12 +781,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -810,7 +811,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -842,7 +843,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -874,7 +875,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -905,7 +906,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -938,7 +939,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -973,7 +974,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1003,7 +1004,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -1037,7 +1038,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1069,7 +1070,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1101,7 +1102,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1131,7 +1132,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1163,7 +1164,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1196,7 +1197,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1225,7 +1226,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1254,6 +1255,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -1286,7 +1318,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1319,7 +1351,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1349,7 +1381,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1381,7 +1413,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1412,7 +1444,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1443,7 +1475,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1475,7 +1507,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1508,7 +1540,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1537,7 +1569,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1569,7 +1601,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1598,7 +1630,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1631,7 +1663,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1662,7 +1694,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1693,7 +1725,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1722,7 +1754,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1755,7 +1787,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1786,7 +1818,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1817,7 +1849,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1849,7 +1881,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1882,7 +1914,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1914,7 +1946,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1943,7 +1975,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1975,7 +2007,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2007,7 +2039,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2039,7 +2071,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2072,7 +2104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2105,7 +2137,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2138,7 +2170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2172,7 +2204,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2203,7 +2235,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2237,7 +2269,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2271,7 +2303,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2304,7 +2336,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2337,7 +2369,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2369,7 +2401,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2403,7 +2435,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2435,7 +2467,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2467,7 +2499,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2499,7 +2531,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2531,7 +2563,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2564,7 +2596,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2597,7 +2629,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2629,7 +2661,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2662,7 +2694,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2696,7 +2728,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2728,7 +2760,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2758,7 +2790,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2791,7 +2823,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2825,9 +2857,9 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -2856,7 +2888,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2887,7 +2919,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2920,7 +2952,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2950,7 +2982,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2984,7 +3016,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3015,7 +3047,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3046,7 +3078,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -3081,7 +3113,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3113,7 +3145,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3147,7 +3179,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3177,7 +3209,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3211,7 +3243,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3243,7 +3275,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3276,7 +3308,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3309,7 +3341,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -3339,7 +3371,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -3372,7 +3404,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3406,7 +3438,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3437,7 +3469,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3470,7 +3502,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3501,7 +3533,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3533,7 +3565,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3565,7 +3597,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3595,7 +3627,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3627,7 +3659,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -3642,7 +3674,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-30 12:49:10.225292", 
+ "modified": "2018-05-17 12:32:28.126624", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 4ac29fd..46303b5 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -15,6 +15,8 @@
 from erpnext.controllers.selling_controller import SellingController
 from frappe.desk.doctype.auto_repeat.auto_repeat import get_next_schedule_date
 from erpnext.selling.doctype.customer.customer import check_credit_limit
+from erpnext.stock.doctype.item.item import get_item_defaults
+
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -493,11 +495,11 @@
 		target.amount = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.rate)
 		target.qty = flt(source.qty) - flt(source.delivered_qty)
 
-		item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1)
+		item = get_item_defaults(target.item_code, source_parent.company)
 
 		if item:
 			target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") \
-				or item.selling_cost_center \
+				or item.get("selling_cost_center") \
 				or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 
 	target_doc = get_mapped_doc("Sales Order", source_name, {
@@ -557,8 +559,8 @@
 		if source_parent.project:
 			target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center")
 		if not target.cost_center and target.item_code:
-			item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1)
-			target.cost_center = item.selling_cost_center \
+			item = get_item_defaults(target.item_code, target.company)
+			target.cost_center = item.get("selling_cost_center") \
 				or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 
 	doclist = get_mapped_doc("Sales Order", source_name, {
@@ -587,10 +589,6 @@
 		"Sales Team": {
 			"doctype": "Sales Team",
 			"add_if_empty": True
-		},
-		"Payment Schedule": {
-			"doctype": "Payment Schedule",
-			"add_if_empty": True
 		}
 	}, target_doc, postprocess, ignore_permissions=ignore_permissions)
 
@@ -755,9 +753,9 @@
 def get_supplier(doctype, txt, searchfield, start, page_len, filters):
 	supp_master_name = frappe.defaults.get_user_default("supp_master_name")
 	if supp_master_name == "Supplier Name":
-		fields = ["name", "supplier_type"]
+		fields = ["name", "supplier_group"]
 	else:
-		fields = ["name", "supplier_name", "supplier_type"]
+		fields = ["name", "supplier_name", "supplier_group"]
 	fields = ", ".join(fields)
 
 	return frappe.db.sql("""select {field} from `tabSupplier`
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
index 34ed6bc..35c643d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -8,7 +8,7 @@
 			'Journal Entry': 'reference_name',
 			'Payment Entry': 'reference_name',
 			'Payment Request': 'reference_name',
-			'Subscription': 'reference_document',
+			'Auto Repeat': 'reference_document',
 		},
 		'internal_links': {
 			'Quotation': ['items', 'prevdoc_docname']
@@ -32,7 +32,7 @@
 			},
 			{
 				'label': _('Reference'),
-				'items': ['Quotation', 'Subscription']
+				'items': ['Quotation', 'Auto Repeat']
 			},
 			{
 				'label': _('Payment'),
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index c5f7ef2..8388941 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -359,14 +359,9 @@
 
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
 
-		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1,
-        'default_supplier': '_Test Supplier',
-		    "expense_account": "_Test Account Cost for Goods Sold - _TC",
-		    "cost_center": "_Test Cost Center - _TC"
-			})
+		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1})
 
-		dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  		  	"cost_center": "_Test Cost Center - _TC"})
+		dn_item = make_item("_Test Regular Item", {"is_stock_item": 1})
 
 		so_items = [
 			{
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index fe53e4d..9639cf8 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -44,6 +44,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150px"
   }, 
@@ -74,6 +75,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -102,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -134,6 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150"
   }, 
@@ -165,6 +169,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -197,6 +202,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "300px"
   }, 
@@ -228,6 +234,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -257,6 +264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -287,6 +295,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -318,6 +327,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -347,6 +357,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -379,6 +390,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -413,6 +425,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
@@ -442,6 +455,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -473,6 +487,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -503,6 +518,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -533,6 +549,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -562,6 +579,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -595,6 +613,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
@@ -629,6 +648,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -660,6 +680,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -692,6 +713,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -723,6 +745,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -755,6 +778,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -784,6 +808,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -817,6 +842,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
@@ -850,6 +876,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -879,6 +906,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -913,6 +941,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -948,6 +977,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -977,6 +1007,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1010,6 +1041,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1044,6 +1076,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1075,6 +1108,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1104,6 +1138,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1135,6 +1170,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1166,6 +1202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1195,6 +1232,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1226,6 +1264,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1257,6 +1296,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1288,6 +1328,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1318,6 +1359,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1349,6 +1391,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1379,6 +1422,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1409,6 +1453,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1439,6 +1484,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1468,6 +1514,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1499,6 +1546,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1528,6 +1576,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1562,6 +1611,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1595,6 +1645,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1627,6 +1678,7 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1659,6 +1711,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1692,6 +1745,102 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "billed_amt", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Billed Amt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "gross_profit", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gross Profit", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1723,6 +1872,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1751,6 +1901,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1783,6 +1934,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
@@ -1814,6 +1966,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
@@ -1845,6 +1998,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1877,6 +2031,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
@@ -1886,6 +2041,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "work_order_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Work Order Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "returned_qty", 
    "fieldname": "returned_qty", 
    "fieldtype": "Float", 
@@ -1909,6 +2095,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1917,8 +2104,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "billed_amt", 
-   "fieldtype": "Currency", 
+   "fieldname": "section_break_63", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1926,81 +2113,19 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Billed Amt", 
    "length": 0, 
-   "no_copy": 1, 
-   "options": "currency", 
+   "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "valuation_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Valuation Rate", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gross_profit", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Gross Profit", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -2034,6 +2159,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50px"
   }, 
@@ -2068,6 +2194,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "50px"
   }, 
@@ -2100,6 +2227,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -2132,6 +2260,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -2146,7 +2275,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-11-30 14:05:39.173834", 
+ "modified": "2018-04-25 19:33:10.338965", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/selling/doctype/sales_team/sales_team.json b/erpnext/selling/doctype/sales_team/sales_team.json
index fcd61a1..c77f9f4 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.json
+++ b/erpnext/selling/doctype/sales_team/sales_team.json
@@ -157,7 +157,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/selling/report/address_and_contacts/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/selling/report/address_and_contacts/__init__.py
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.js b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
new file mode 100644
index 0000000..383f18b
--- /dev/null
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
@@ -0,0 +1,34 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Address And Contacts"] = {
+	"filters": [
+		{
+			"reqd": 1,
+			"fieldname":"party_type",
+			"label": __("Party Type"),
+			"fieldtype": "Link",
+			"options": "DocType",
+			"get_query": function() {
+				return {
+					"filters": {
+						"name": ["in","Customer,Supplier,Sales Partner"],
+					}
+				}
+			}
+		},
+		{
+			"fieldname":"party_name",
+			"label": __("Party Name"),
+			"fieldtype": "Dynamic Link",
+			"get_options": function() {
+				let party_type = frappe.query_report_filters_by_name.party_type.get_value();
+				if(!party_type) {
+					frappe.throw(__("Please select Party Type first"));
+				}
+				return party_type;
+			}
+		}
+	]
+}
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.json b/erpnext/selling/report/address_and_contacts/address_and_contacts.json
new file mode 100644
index 0000000..da38bab
--- /dev/null
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.json
@@ -0,0 +1,33 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2018-06-01 09:32:13.088771", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "Test", 
+ "modified": "2018-06-01 09:39:39.604944", 
+ "modified_by": "Administrator", 
+ "module": "Selling", 
+ "name": "Address And Contacts", 
+ "owner": "Administrator", 
+ "ref_doctype": "Address", 
+ "report_name": "Address And Contacts", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.py b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
new file mode 100644
index 0000000..0a46d2c
--- /dev/null
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
@@ -0,0 +1,120 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from six.moves import range
+from six import iteritems
+import frappe
+
+
+field_map = {
+	"Contact": [ "first_name", "last_name", "phone", "mobile_no", "email_id", "is_primary_contact" ],
+	"Address": [ "address_line1", "address_line2", "city", "state", "pincode", "country", "is_primary_address" ]
+}
+
+def execute(filters=None):
+	columns, data = get_columns(filters), get_data(filters)
+	return columns, data
+
+def get_columns(filters):
+	party_type = filters.get("party_type")
+	party_type_value = get_party_group(party_type)
+	return [
+		"{party_type}:Link/{party_type}".format(party_type=party_type),
+		"{party_value_type}::150".format(party_value_type = frappe.unscrub(str(party_type_value))),
+		"Address Line 1",
+		"Address Line 2",
+		"City",
+		"State",
+		"Postal Code",
+		"Country",
+		"Is Primary Address:Check",
+		"First Name",
+		"Last Name",
+		"Phone",
+		"Mobile No",
+		"Email Id",
+		"Is Primary Contact:Check"
+	]
+
+def get_data(filters):
+	party_type = filters.get("party_type")
+	party = filters.get("party_name")
+	party_group = get_party_group(party_type)
+
+	return get_party_addresses_and_contact(party_type, party, party_group)
+
+def get_party_addresses_and_contact(party_type, party, party_group):
+	data = []
+	filters = None
+	party_details = frappe._dict()
+
+	if not party_type:
+		return []
+
+	if party:
+		filters = { "name": party }
+
+	fetch_party_list = frappe.get_list(party_type, filters=filters, fields=["name", party_group], as_list=True)
+	party_list = [d[0] for d in fetch_party_list]
+	party_groups = {}
+	for d in fetch_party_list:
+		party_groups[d[0]] = d[1]
+
+	for d in party_list:
+		party_details.setdefault(d, frappe._dict())
+
+	party_details = get_party_details(party_type, party_list, "Address", party_details)
+	party_details = get_party_details(party_type, party_list, "Contact", party_details)
+
+	for party, details in iteritems(party_details):
+		addresses = details.get("address", [])
+		contacts  = details.get("contact", [])
+		if not any([addresses, contacts]):
+			result = [party]
+			result.append(party_groups[party])
+			result.extend(add_blank_columns_for("Contact"))
+			result.extend(add_blank_columns_for("Address"))
+			data.append(result)
+		else:
+			addresses = map(list, addresses)
+			contacts = map(list, contacts)
+
+			max_length = max(len(addresses), len(contacts))
+			for idx in range(0, max_length):
+				result = [party]
+				result.append(party_groups[party])
+				address = addresses[idx] if idx < len(addresses) else add_blank_columns_for("Address")
+				contact = contacts[idx] if idx < len(contacts) else add_blank_columns_for("Contact")
+				result.extend(address)
+				result.extend(contact)
+
+				data.append(result)
+	return data
+
+def get_party_details(party_type, party_list, doctype, party_details):
+	filters =  [
+		["Dynamic Link", "link_doctype", "=", party_type],
+		["Dynamic Link", "link_name", "in", party_list]
+	]
+	fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
+
+	records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
+	for d in records:
+		details = party_details.get(d[0])
+		details.setdefault(frappe.scrub(doctype), []).append(d[1:])
+
+	return party_details
+
+def add_blank_columns_for(doctype):
+	return ["" for field in field_map.get(doctype, [])]
+
+def get_party_group(party_type):
+	if not party_type: return
+	group = {
+		"Customer": "customer_group",
+		"Supplier": "supplier_group",
+		"Sales Partner": "partner_type"
+	}
+
+	return group[party_type]
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/selling/report/customers_without_any_sales_transactions/__init__.py
similarity index 100%
copy from erpnext/healthcare/doctype/patient_service_unit/__init__.py
copy to erpnext/selling/report/customers_without_any_sales_transactions/__init__.py
diff --git a/erpnext/selling/report/customers_without_any_sales_transactions/customers_without_any_sales_transactions.json b/erpnext/selling/report/customers_without_any_sales_transactions/customers_without_any_sales_transactions.json
new file mode 100644
index 0000000..2a4c2ae
--- /dev/null
+++ b/erpnext/selling/report/customers_without_any_sales_transactions/customers_without_any_sales_transactions.json
@@ -0,0 +1,30 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 0, 
+ "creation": "2018-05-17 15:25:06.015111", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2018-05-21 11:06:11.920622", 
+ "modified_by": "Administrator", 
+ "module": "Selling", 
+ "name": "Customers Without Any Sales Transactions", 
+ "owner": "Administrator", 
+ "query": "SELECT\n\t`tabCustomer`.name as \"Customer:Link/Customer:120\",\n\t`tabCustomer`.customer_name as \"Customer Name::120\",\n\t`tabCustomer`.territory as \"Territory:Link/Territory:120\",\n\t`tabCustomer`.customer_group as \"Customer Group:Link/Customer Group:120\"\nFROM\n\t`tabCustomer`\nWHERE\n\tnot exists(select name from `tabSales Invoice` where `tabCustomer`.name = `tabSales Invoice`.customer and `tabSales Invoice`.docstatus=1 limit 1)\n\tand not exists(select name from `tabSales Order` where `tabCustomer`.name = `tabSales Order`.customer and `tabSales Order`.docstatus=1 limit 1)", 
+ "ref_doctype": "Sales Invoice", 
+ "report_name": "Customers Without Any Sales Transactions", 
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "System Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
index e57636c..fd5bc4e 100644
--- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
@@ -91,17 +91,22 @@
 	start_date, end_date = get_fiscal_year(fiscal_year = filters["fiscal_year"])[1:]
 
 	item_details = frappe.db.sql("""
-		select
-			sum(soi.stock_qty * (st.allocated_percentage/100)) as qty,
-			sum(soi.base_net_amount * (st.allocated_percentage/100)) as amount,
-			st.sales_person, MONTHNAME(so.transaction_date) as month_name
+		SELECT st.sales_person, MONTHNAME(so.transaction_date) as month_name,
+		CASE
+			WHEN so.status = "Closed" THEN sum(soi.delivered_qty * soi.conversion_factor * (st.allocated_percentage/100))
+			ELSE sum(soi.stock_qty * (st.allocated_percentage/100))
+		END as qty,
+		CASE
+			WHEN so.status = "Closed" THEN sum(soi.delivered_qty * soi.conversion_factor * soi.base_net_rate * (st.allocated_percentage/100))
+			ELSE sum(soi.base_net_amount * (st.allocated_percentage/100))
+		END as amount
 		from
 			`tabSales Order Item` soi, `tabSales Order` so, `tabSales Team` st
 		where
 			soi.parent=so.name and so.docstatus=1 and st.parent=so.name
 			and so.transaction_date>=%s and so.transaction_date<=%s
-			and exists(select name from `tabSales Person` where lft >= %s and rgt <= %s and name=st.sales_person)
-			and exists(select name from `tabItem Group` where lft >= %s and rgt <= %s and name=soi.item_group)
+			and exists(SELECT name from `tabSales Person` where lft >= %s and rgt <= %s and name=st.sales_person)
+			and exists(SELECT name from `tabItem Group` where lft >= %s and rgt <= %s and name=soi.item_group)
 		group by
 			sales_person, month_name
 			""",
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 025e740..19b6774 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -15,11 +15,12 @@
 	data = []
 
 	for d in entries:
-		data.append([
-			d.name, d.customer, d.territory, d.posting_date, d.item_code,
-			item_details.get(d.item_code, {}).get("item_group"), item_details.get(d.item_code, {}).get("brand"),
-			d.stock_qty, d.base_net_amount, d.sales_person, d.allocated_percentage, d.contribution_amt
-		])
+		if d.stock_qty > 0:
+			data.append([
+				d.name, d.customer, d.territory, d.posting_date, d.item_code,
+				item_details.get(d.item_code, {}).get("item_group"), item_details.get(d.item_code, {}).get("brand"),
+				d.stock_qty, d.base_net_amount, d.sales_person, d.allocated_percentage, d.contribution_amt
+			])
 
 	if data:
 		total_row = [""]*len(data[0])
@@ -40,18 +41,34 @@
 
 def get_entries(filters):
 	date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date"
+	if filters["doc_type"] == "Sales Order":
+		qty_field = "delivered_qty"
+	else:
+		qty_field = "qty"
 	conditions, values = get_conditions(filters, date_field)
+
 	entries = frappe.db.sql("""
 		select
 			dt.name, dt.customer, dt.territory, dt.%s as posting_date, dt_item.item_code,
-			dt_item.stock_qty, dt_item.base_net_amount, st.sales_person, st.allocated_percentage,
-			dt_item.base_net_amount*st.allocated_percentage/100 as contribution_amt
+			st.sales_person, st.allocated_percentage,
+		CASE 
+			WHEN dt.status = "Closed" THEN dt_item.%s * dt_item.conversion_factor
+			ELSE dt_item.stock_qty
+		END as stock_qty,
+		CASE
+			WHEN dt.status = "Closed" THEN (dt_item.base_net_rate * dt_item.%s * dt_item.conversion_factor)
+			ELSE dt_item.base_net_amount
+		END as base_net_amount,
+		CASE
+			WHEN dt.status = "Closed" THEN ((dt_item.base_net_rate * dt_item.%s * dt_item.conversion_factor) * st.allocated_percentage/100)
+			ELSE dt_item.base_net_amount * st.allocated_percentage/100
+		END as contribution_amt
 		from
 			`tab%s` dt, `tab%s Item` dt_item, `tabSales Team` st
 		where
 			st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s
 			and dt.docstatus = 1 %s order by st.sales_person, dt.name desc
-		""" %(date_field, filters["doc_type"], filters["doc_type"], '%s', conditions),
+		""" %(date_field, qty_field, qty_field, qty_field, filters["doc_type"], filters["doc_type"], '%s', conditions),
 			tuple([filters["doc_type"]] + values), as_dict=1)
 
 	return entries
diff --git a/erpnext/setup/default_success_action.py b/erpnext/setup/default_success_action.py
new file mode 100644
index 0000000..e8494a1
--- /dev/null
+++ b/erpnext/setup/default_success_action.py
@@ -0,0 +1,26 @@
+from frappe import _
+
+doctype_list = [
+    'Purchase Receipt',
+    'Purchase Invoice',
+    'Quotation',
+    'Sales Order',
+    'Delivery Note',
+    'Sales Invoice'
+]
+
+def get_message(doctype):
+    return _("{0} has been submitted successfully".format(_(doctype)))
+
+def get_first_success_message(doctype):
+    return _("{0} has been submitted successfully".format(_(doctype)))
+
+def get_default_success_action():
+    return [{
+        'doctype': 'Success Action',
+        'ref_doctype': doctype,
+        'message': get_message(doctype),
+        'first_success_message': get_first_success_message(doctype),
+        'next_actions': 'new\nprint\nemail'
+    } for doctype in doctype_list]
+
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.json b/erpnext/setup/doctype/authorization_control/authorization_control.json
index 43afc06..823ff26 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.json
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.json
@@ -11,7 +11,7 @@
  "hide_toolbar": 0, 
  "idx": 1, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index 70047bc..56df330 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -558,7 +558,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 8d4ba74..064eff6 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -79,7 +79,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 84e0a20..16676ac 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -6,6 +6,16 @@
 frappe.ui.form.on("Company", {
 	setup: function(frm) {
 		erpnext.company.setup_queries(frm);
+		frm.set_query("hra_component", function(){
+			return {
+				filters: {"type": "Earning"}
+			}
+		});
+		frm.set_query("arrear_component", function(){
+			return {
+				filters: {"is_additional_component": 1}
+			}
+		});
 	},
 
 	company_name: function(frm) {
@@ -18,6 +28,16 @@
 		}
 	},
 
+	date_of_commencement: function(frm) {
+		if(frm.doc.date_of_commencement<frm.doc.date_of_incorporation)
+		{
+			frappe.throw(__("Date of Commencement should be greater than Date of Incorporation"));
+		}
+		if(!frm.doc.date_of_commencement){
+			frm.doc.date_of_incorporation = ""
+		}
+	},
+
 	refresh: function(frm) {
 		if(frm.doc.abbr && !frm.doc.__islocal) {
 			frm.set_df_property("abbr", "read_only", 1);
@@ -187,6 +207,7 @@
 		["round_off_account", {"root_type": "Expense"}],
 		["write_off_account", {"root_type": "Expense"}],
 		["exchange_gain_loss_account", {"root_type": "Expense"}],
+		["unrealized_exchange_gain_loss_account", {"root_type": "Expense"}],
 		["accumulated_depreciation_account",
 			{"root_type": "Asset", "account_type": "Accumulated Depreciation"}],
 		["depreciation_expense_account", {"root_type": "Expense", "account_type": "Depreciation"}],
@@ -196,6 +217,9 @@
 		["round_off_cost_center", {}],
 		["depreciation_cost_center", {}],
 		["default_employee_advance_account", {"root_type": "Asset"}],
+		["expenses_included_in_asset_valuation", {"account_type": "Expenses Included In Asset Valuation"}],
+		["capital_work_in_progress_account", {"account_type": "Capital Work in Progress"}],
+		["asset_received_but_not_billed", {"account_type": "Asset Received But Not Billed"}]
 	], function(i, v) {
 		erpnext.company.set_custom_query(frm, v);
 	});
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 31e1859..32f0ec4 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -42,6 +42,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -73,6 +74,7 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -105,6 +107,7 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -135,6 +138,70 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_group",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Is Group",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "default_finance_book",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Finance Book",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Finance Book",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -163,6 +230,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -193,6 +261,39 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "parent_company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Parent Comapny",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -223,6 +324,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -253,6 +355,37 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "transactions_annual_history",
+   "fieldtype": "Code",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Transactions Annual History",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   },
   {
@@ -284,6 +417,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -313,6 +447,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -344,6 +479,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -373,6 +509,38 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "default_currency",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Currency",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -404,6 +572,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -435,6 +604,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -465,36 +635,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_currency",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Currency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -524,6 +665,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -554,6 +696,7 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -585,6 +728,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -617,6 +761,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -649,6 +794,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -679,6 +825,38 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "date_of_establishment",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Date of Establishment",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -709,6 +887,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -742,6 +921,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -773,6 +953,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -806,6 +987,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -837,6 +1019,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -868,6 +1051,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -899,6 +1083,39 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "unrealized_exchange_gain_loss_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Unrealized Exchange Gain/Loss Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -928,6 +1145,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0,
    "width": "50%"
   },
@@ -962,6 +1180,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -993,6 +1212,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1024,6 +1244,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1055,6 +1276,40 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "default_deferred_revenue_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Default Deferred Revenue Account",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1087,6 +1342,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1118,6 +1374,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1147,6 +1404,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1178,6 +1436,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1207,6 +1466,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1240,6 +1500,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1272,6 +1533,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1302,6 +1564,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1333,6 +1596,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1364,6 +1628,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1394,6 +1659,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1423,6 +1689,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1453,6 +1720,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1483,6 +1751,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1513,6 +1782,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1544,6 +1814,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1575,6 +1846,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1605,6 +1877,39 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "expenses_included_in_asset_valuation",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Expenses Included In Asset Valuation",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1634,6 +1939,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1665,6 +1971,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1696,6 +2003,169 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "capital_work_in_progress_account",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Capital Work In Progress Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "asset_received_but_not_billed",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Asset Received But Not Billed",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+	{
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_66",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Payroll Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "hra_component",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "HRA Component",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Salary Component",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "arrear_component",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Arrear Component",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Salary Component",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+  "translatable": 0,
    "unique": 0
   },
   {
@@ -1726,6 +2196,38 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "date_of_incorporation",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Date of Incorporation",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1755,6 +2257,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1784,6 +2287,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0,
    "width": "50%"
   },
@@ -1793,6 +2297,38 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "depends_on": "eval:doc.date_of_incorporation",
+   "fieldname": "date_of_commencement",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Date of Commencement",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "phone_no",
    "fieldtype": "Data",
    "hidden": 0,
@@ -1817,6 +2353,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1849,6 +2386,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1881,6 +2419,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1912,6 +2451,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -1943,6 +2483,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0,
    "width": "50%"
   },
@@ -1976,6 +2517,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -2006,6 +2548,7 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
@@ -2036,6 +2579,100 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "lft",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Lft",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "rgt",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Rgt",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "old_parent",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "old_parent",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
  ],
@@ -2052,15 +2689,14 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2018-02-14 15:54:26.776363",
- "modified_by": "achilles@erpnext.com",
+ "modified": "2018-05-29 13:25:15.872138",
+ "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
  "owner": "Administrator",
  "permissions": [
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 1,
    "delete": 1,
@@ -2080,7 +2716,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2100,7 +2735,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2120,7 +2754,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2140,7 +2773,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2160,7 +2792,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2180,7 +2811,6 @@
   },
   {
    "amend": 0,
-   "apply_user_permissions": 0,
    "cancel": 0,
    "create": 0,
    "delete": 0,
@@ -2206,4 +2836,4 @@
  "sort_order": "ASC",
  "track_changes": 1,
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index fdea1b1..aebd2ee 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -2,8 +2,9 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe, os
+import frappe, os, json
 from frappe import _
+from frappe.utils import get_timestamp
 
 from frappe.utils import cint, today, formatdate
 import frappe.defaults
@@ -11,8 +12,11 @@
 
 from frappe.model.document import Document
 from frappe.contacts.address_and_contact import load_address_and_contact
+from frappe.utils.nestedset import NestedSet
 
-class Company(Document):
+class Company(NestedSet):
+	nsm_parent_field = 'parent_company'
+
 	def onload(self):
 		load_address_and_contact(self, "company")
 		self.get("__onload")["transactions_exist"] = self.check_if_transactions_exist()
@@ -42,8 +46,8 @@
 
 		self.abbr = self.abbr.strip()
 
-		if self.get('__islocal') and len(self.abbr) > 5:
-			frappe.throw(_("Abbreviation cannot have more than 5 characters"))
+		# if self.get('__islocal') and len(self.abbr) > 5:
+		# 	frappe.throw(_("Abbreviation cannot have more than 5 characters"))
 
 		if not self.abbr.strip():
 			frappe.throw(_("Abbreviation is mandatory"))
@@ -78,6 +82,7 @@
 				frappe.throw(_("Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."))
 
 	def on_update(self):
+		self.update_nsm_model()
 		if not frappe.db.sql("""select name from tabAccount
 				where company=%s and docstatus<2 limit 1""", self.name):
 			if not frappe.local.flags.ignore_chart_of_accounts:
@@ -165,6 +170,9 @@
 		self._set_default_account("round_off_account", "Round Off")
 		self._set_default_account("accumulated_depreciation_account", "Accumulated Depreciation")
 		self._set_default_account("depreciation_expense_account", "Depreciation")
+		self._set_default_account("capital_work_in_progress_account", "Capital Work in Progress")
+		self._set_default_account("asset_received_but_not_billed", "Asset Received But Not Billed")
+		self._set_default_account("expenses_included_in_asset_valuation", "Expenses Included In Asset Valuation")
 
 		if self.enable_perpetual_inventory:
 			self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
@@ -186,6 +194,36 @@
 		if not self.default_payable_account:
 			self.db_set("default_payable_account", self.default_payable_account)
 
+		if not self.default_payroll_payable_account:
+			payroll_payable_account = frappe.db.get_value("Account",
+				{"account_name": _("Payroll Payable"), "company": self.name, "is_group": 0})
+
+			self.db_set("default_payroll_payable_account", payroll_payable_account)
+
+		if not self.default_employee_advance_account:
+			employe_advance_account = frappe.db.get_value("Account",
+				{"account_name": _("Employee Advances"), "company": self.name, "is_group": 0})
+
+			self.db_set("default_employee_advance_account", employe_advance_account)
+
+		if not self.write_off_account:
+			write_off_acct = frappe.db.get_value("Account",
+				{"account_name": _("Write Off"), "company": self.name, "is_group": 0})
+
+			self.db_set("write_off_account", write_off_acct)
+
+		if not self.exchange_gain_loss_account:
+			exchange_gain_loss_acct = frappe.db.get_value("Account",
+				{"account_name": _("Exchange Gain/Loss"), "company": self.name, "is_group": 0})
+
+			self.db_set("exchange_gain_loss_account", exchange_gain_loss_acct)
+
+		if not self.disposal_account:
+			disposal_acct = frappe.db.get_value("Account",
+				{"account_name": _("Gain/Loss on Asset Disposal"), "company": self.name, "is_group": 0})
+
+			self.db_set("disposal_account", disposal_acct)
+
 	def _set_default_account(self, fieldname, account_type):
 		if self.get(fieldname):
 			return
@@ -246,13 +284,14 @@
 	def abbreviate(self):
 		self.abbr = ''.join([c[0].upper() for c in self.company_name.split()])
 
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
+
 	def on_trash(self):
 		"""
 			Trash accounts and cost centers for this company if no gl entry exists
 		"""
-		accounts = frappe.db.sql_list("select name from tabAccount where company=%s", self.name)
-		cost_centers = frappe.db.sql_list("select name from `tabCost Center` where company=%s", self.name)
-		warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name)
+		self.update_nsm_model()
 
 		rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name)
 		if not rec:
@@ -267,33 +306,19 @@
 			frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
 
 		frappe.defaults.clear_default("company", value=self.name)
-		frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name)
+		for doctype in ["Mode of Payment Account", "Item Default"]:
+			frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name)
 
 		# clear default accounts, warehouses from item
+		warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name)
 		if warehouses:
-			for f in ["default_warehouse", "website_warehouse"]:
-				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
-					% (f, f, ', '.join(['%s']*len(warehouses))), tuple(warehouses))
-
 			frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)"""
 				% ', '.join(['%s']*len(warehouses)), tuple(warehouses))
 
-		if accounts:
-			for f in ["income_account", "expense_account"]:
-				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
-					% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
-
-		if cost_centers:
-			for f in ["selling_cost_center", "buying_cost_center"]:
-				frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
-					% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
-
 		# reset default company
 		frappe.db.sql("""update `tabSingles` set value=""
 			where doctype='Global Defaults' and field='default_company'
 			and value=%s""", self.name)
-		# delete mode of payment account
-		frappe.db.sql("delete from `tabMode of Payment Account` where company=%s", self.name)
 
 		# delete BOMs
 		boms = frappe.db.sql_list("select name from tabBOM where company=%s", self.name)
@@ -383,8 +408,115 @@
 
 	frappe.db.set_value("Company", company, "sales_monthly_history", json.dumps(month_to_value_dict))
 
+def update_transactions_annual_history(company, commit=False):
+	transactions_history = get_all_transactions_annual_history(company)
+	frappe.db.set_value("Company", company, "transactions_annual_history", json.dumps(transactions_history))
+
+	if commit:
+		frappe.db.commit()
+
 def cache_companies_monthly_sales_history():
 	companies = [d['name'] for d in frappe.get_list("Company")]
 	for company in companies:
 		update_company_monthly_sales(company)
+		update_transactions_annual_history(company)
 	frappe.db.commit()
+
+@frappe.whitelist()
+def get_children(doctype, parent=None, company=None, is_root=False):
+	if parent == None or parent == "All Companies":
+		parent = ""
+
+	return frappe.db.sql("""
+		select
+			name as value,
+			is_group as expandable
+		from
+			`tab{doctype}` comp
+		where
+			ifnull(parent_company, "")="{parent}"
+		""".format(
+			doctype = frappe.db.escape(doctype),
+			parent=frappe.db.escape(parent)
+		), as_dict=1)
+
+@frappe.whitelist()
+def add_node():
+	from frappe.desk.treeview import make_tree_args
+	args = frappe.form_dict
+	args = make_tree_args(**args)
+
+	if args.parent_company == 'All Companies':
+		args.parent_company = None
+
+	frappe.get_doc(args).insert()
+
+def get_all_transactions_annual_history(company):
+	out = {}
+
+	items = frappe.db.sql('''
+		select transaction_date, count(*) as count
+
+		from (
+			select name, transaction_date, company
+			from `tabQuotation`
+
+			UNION ALL
+
+			select name, transaction_date, company
+			from `tabSales Order`
+
+			UNION ALL
+
+			select name, posting_date as transaction_date, company
+			from `tabDelivery Note`
+
+			UNION ALL
+
+			select name, posting_date as transaction_date, company
+			from `tabSales Invoice`
+
+			UNION ALL
+
+			select name, creation as transaction_date, company
+			from `tabIssue`
+
+			UNION ALL
+
+			select name, creation as transaction_date, company
+			from `tabProject`
+		) t
+
+		where
+			company=%s
+			and
+			transaction_date > date_sub(curdate(), interval 1 year)
+
+		group by
+			transaction_date
+			''', (company), as_dict=True)
+
+	for d in items:
+		timestamp = get_timestamp(d["transaction_date"])
+		out.update({ timestamp: d["count"] })
+
+	return out
+
+def get_timeline_data(doctype, name):
+	'''returns timeline data based on linked records in dashboard'''
+	out = {}
+	date_to_value_dict = {}
+
+	history = frappe.db.get_value("Company", name, "transactions_annual_history")
+
+	try:
+		date_to_value_dict = json.loads(history) if history and '{' in history else None
+	except ValueError:
+		date_to_value_dict = None
+
+	if date_to_value_dict is None:
+		update_transactions_annual_history(name, True)
+		history = frappe.db.get_value("Company", name, "transactions_annual_history")
+		return json.loads(history) if history and '{' in history else {}
+
+	return date_to_value_dict
diff --git a/erpnext/setup/doctype/company/company_tree.js b/erpnext/setup/doctype/company/company_tree.js
new file mode 100644
index 0000000..19b276c
--- /dev/null
+++ b/erpnext/setup/doctype/company/company_tree.js
@@ -0,0 +1,33 @@
+frappe.treeview_settings["Company"] = {
+	ignore_fields:["parent_company"],
+	get_tree_nodes: 'erpnext.setup.doctype.company.company.get_children',
+	add_tree_node: 'erpnext.setup.doctype.company.company.add_node',
+	filters: [
+		{
+			fieldname: "company",
+			fieldtype:"Link",
+			options: "Company",
+			label: __("Company"),
+			get_query: function() {
+				return {
+					filters: [["Company", 'is_group', '=', 1]]
+				};
+			}
+		},
+	],
+	breadcrumb: "Setup",
+	root_label: "All Companies",
+	get_tree_root: false,
+	menu_items: [
+		{
+			label: __("New Company"),
+			action: function() {
+				frappe.new_doc("Company", true);
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+		}
+	],
+	onload: function(treeview) {
+		treeview.make_tree();
+	}
+};
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index 76e1a6b..89c3736 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -23,7 +25,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,14 +36,17 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "5"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -50,6 +57,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "From Currency", 
@@ -65,10 +73,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "3"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -79,6 +89,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "To Currency", 
@@ -94,10 +105,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "3"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -108,6 +121,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Exchange Rate", 
@@ -123,22 +137,117 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "3"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "for_buying", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "For Buying", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "for_selling", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "For Selling", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-exchange", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-08 05:28:09.772560", 
+ "modified": "2018-05-15 11:23:35.639039", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency Exchange", 
@@ -146,7 +255,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -154,7 +262,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -167,7 +274,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -175,7 +281,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -188,7 +293,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -196,7 +300,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -209,7 +312,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -217,7 +319,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -232,8 +333,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "name", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.py b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
index ab892fb..4effb5a 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
@@ -5,9 +5,9 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _
+from frappe import _, throw
 from frappe.model.document import Document
-from frappe.utils import get_datetime_str, formatdate, nowdate
+from frappe.utils import get_datetime_str, formatdate, nowdate, cint
 
 class CurrencyExchange(Document):
 	def autoname(self):
@@ -20,4 +20,7 @@
 		self.validate_value("exchange_rate", ">", 0)
 
 		if self.from_currency == self.to_currency:
-			frappe.throw(_("From Currency and To Currency cannot be same"))
+			throw(_("From Currency and To Currency cannot be same"))
+
+		if not cint(self.for_buying) and not cint(self.for_selling):
+			throw(_("Currency Exchange must be applicable for Buying or for Selling."))
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.js b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.js
new file mode 100644
index 0000000..19fde2e
--- /dev/null
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Currency Exchange", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Currency Exchange
+		() => frappe.tests.make('Currency Exchange', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
index 6d5848a..c488b99 100644
--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -2,6 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 from __future__ import unicode_literals
 import frappe, unittest
+from frappe.utils import flt
 from erpnext.setup.utils import get_exchange_rate
 
 test_records = frappe.get_test_records('Currency Exchange')
@@ -44,7 +45,7 @@
 
 		# Start with allow_stale is True
 		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-01")
-		self.assertEqual(exchange_rate, 60.0)
+		self.assertEqual(flt(exchange_rate, 3), 60.0)
 
 		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
 		self.assertEqual(exchange_rate, 65.1)
@@ -56,7 +57,7 @@
 		self.clear_cache()
 		exchange_rate = get_exchange_rate("USD", "INR", "2015-12-15")
 		self.assertFalse(exchange_rate == 60)
-		self.assertEqual(exchange_rate, 66.894)
+		self.assertEqual(flt(exchange_rate, 3), 66.894)
 
 	def test_exchange_rate_strict(self):
 		# strict currency settings
@@ -69,7 +70,7 @@
 		# Will fetch from fixer.io
 		self.clear_cache()
 		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
-		self.assertEqual(exchange_rate, 67.79)
+		self.assertEqual(flt(exchange_rate, 3), 67.79)
 
 		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-30")
 		self.assertEqual(exchange_rate, 62.9)
@@ -77,7 +78,7 @@
 		# Exchange rate as on 15th Dec, 2015, should be fetched from fixer.io
 		self.clear_cache()
 		exchange_rate = get_exchange_rate("USD", "INR", "2015-12-15")
-		self.assertEqual(exchange_rate, 66.894)
+		self.assertEqual(flt(exchange_rate, 3), 66.894)
 
 		exchange_rate = get_exchange_rate("INR", "NGN", "2016-01-10")
 		self.assertEqual(exchange_rate, 65.1)
@@ -100,4 +101,4 @@
 		# Will fetch from fixer.io
 		self.clear_cache()
 		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
-		self.assertEqual(exchange_rate, 67.79)
\ No newline at end of file
+		self.assertEqual(flt(exchange_rate, 3), 67.79)
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 062a49a..3392c6c 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -379,7 +379,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index a75a59a..12f275c 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -1073,7 +1073,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 0cab383..5c50ddf 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -53,17 +53,19 @@
 		if recipients:
 			for user_id in recipients:
 				frappe.set_user(user_id)
-				msg_for_this_receipient = self.get_msg_html()
-				if msg_for_this_receipient:
+				frappe.set_user_lang(user_id)
+				msg_for_this_recipient = self.get_msg_html()
+				if msg_for_this_recipient:
 					frappe.sendmail(
 						recipients=user_id,
-						subject=_("{frequency} Digest").format(frequency=self.frequency),
-						message=msg_for_this_receipient,
+						subject=_("{0} Digest").format(self.frequency),
+						message=msg_for_this_recipient,
 						reference_doctype = self.doctype,
 						reference_name = self.name,
 						unsubscribe_message = _("Unsubscribe from this Email Digest"))
 
 		frappe.set_user(original_user)
+		frappe.set_user_lang(original_user)
 
 	def get_msg_html(self):
 		"""Build email digest content"""
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index ce3f2cf..a6c5964 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -225,7 +225,7 @@
  "icon": "fa fa-cog", 
  "idx": 1, 
  "in_create": 1, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "is_transaction_doc": 0, 
  "issingle": 1, 
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 6230706..29486b2 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -525,7 +525,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/notification_control/README.md b/erpnext/setup/doctype/notification_control/README.md
deleted file mode 100644
index 3c411b7..0000000
--- a/erpnext/setup/doctype/notification_control/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tool to automatically prompt sending of Email on Submission of various records.
\ No newline at end of file
diff --git a/erpnext/setup/doctype/notification_control/__init__.py b/erpnext/setup/doctype/notification_control/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/setup/doctype/notification_control/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/setup/doctype/notification_control/notification_control.js b/erpnext/setup/doctype/notification_control/notification_control.js
deleted file mode 100644
index 7f58ede..0000000
--- a/erpnext/setup/doctype/notification_control/notification_control.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.ui.form.on("Notification Control", {
-	refresh: function(frm) {
-		frm.page.set_primary_action(__('Update'), function() { frm.events.set_message(frm); });
-	},
-	select_transaction: function(frm) {
-		frm.set_value("custom_message", frm.doc[frm.events.get_fieldname(frm)]);
-	},
-	set_message: function(frm) {
-		if(frm.doc.select_transaction && frm.doc.select_transaction !== "") {
-			frm.set_value(frm.events.get_fieldname(frm), frm.doc.custom_message);
-		}
-		frm.save();
-	},
-	get_fieldname: function(frm) {
-		return frm.doc.select_transaction.replace(" ", "_").toLowerCase() + "_message";
-	},
-	after_save: function(frm) {
-		// update notification settings in current session
-		frappe.boot.notification_settings = frm.doc;
-	}
-});
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
deleted file mode 100644
index fc3316e..0000000
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ /dev/null
@@ -1,566 +0,0 @@
-{
- "allow_copy": 1, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2012-07-12 23:29:45", 
- "custom": 0, 
- "description": "Send automatic emails to Contacts on Submitting transactions.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "When any of the checked transactions are \"Submitted\", an email pop-up automatically opened to send an email to the associated \"Contact\" in that transaction, with the transaction as an attachment. The user may or may not send the email.", 
-   "fieldname": "send_autonotification_for", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Prompt for Email on Submission of", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "quotation", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Quotation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales_order", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Sales Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivery_note", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Delivery Note", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales_invoice", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Sales Invoice", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "purchase", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purchase", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "purchase_order", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Purchase Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "purchase_receipt", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Purchase Receipt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "expense_claim", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Expense Claim", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.", 
-   "fieldname": "customize_the_notification", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customize the Notification", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "select_transaction", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Select Transaction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "custom_message", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Custom Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "quotation_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quotation Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales_order_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Order Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivery_note_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Delivery Note Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales_invoice_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Invoice Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "purchase_order_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purchase Order Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "purchase_receipt_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purchase Receipt Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "expense_claim_approved_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Expense Claim Approved Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "expense_claim_rejected_message", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Expense Claim Rejected Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-envelope", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-06-01 13:06:06.981905", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Notification Control", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/notification_control/notification_control.py b/erpnext/setup/doctype/notification_control/notification_control.py
deleted file mode 100644
index c50baca..0000000
--- a/erpnext/setup/doctype/notification_control/notification_control.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.document import Document
-
-class NotificationControl(Document):
-	def validate(self):
-		frappe.clear_cache()
diff --git a/erpnext/setup/doctype/party_type/party_type.json b/erpnext/setup/doctype/party_type/party_type.json
index e1814ae..00f06a0 100644
--- a/erpnext/setup/doctype/party_type/party_type.json
+++ b/erpnext/setup/doctype/party_type/party_type.json
@@ -42,6 +42,39 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Account Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payable\nReceivable", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -55,7 +88,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-23 17:46:27.075001", 
+ "modified": "2018-04-26 13:00:49.457439", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Party Type", 
@@ -64,7 +97,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -84,7 +116,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -104,7 +135,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/setup/doctype/party_type/party_type.py b/erpnext/setup/doctype/party_type/party_type.py
index 74db037..8baddf4 100644
--- a/erpnext/setup/doctype/party_type/party_type.py
+++ b/erpnext/setup/doctype/party_type/party_type.py
@@ -11,10 +11,15 @@
 
 @frappe.whitelist()
 def get_party_type(doctype, txt, searchfield, start, page_len, filters):
+	cond = ''
+	if filters and filters.get('account'):
+		account_type = frappe.db.get_value('Account', filters.get('account'), 'account_type')
+		cond = "and account_type = '%s'" % account_type
+
 	return frappe.db.sql("""select name from `tabParty Type`
-			where `{key}` LIKE %(txt)s
+			where `{key}` LIKE %(txt)s {cond}
 			order by name limit %(start)s, %(page_len)s"""
-			.format(key=searchfield), {
+			.format(key=searchfield, cond=cond), {
 				'txt': "%%%s%%" % frappe.db.escape(txt),
 				'start': start, 'page_len': page_len
 			})
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index d992fcb..dc07f0c 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -71,7 +71,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index b95a936..5d778ee 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -44,7 +44,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 6c2d705..3c31c23 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -712,7 +712,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 9f46501..715d8da 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0,
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:sales_person_name", 
@@ -14,6 +15,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,9 +42,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,9 +74,11 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -102,9 +108,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -133,13 +141,47 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "1",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Enabled",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -160,9 +202,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,16 +233,18 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "1", 
-   "fieldname": "enabled", 
-   "fieldtype": "Check", 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -206,22 +252,25 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Enabled", 
+   "label": "Department",
    "length": 0, 
    "no_copy": 0, 
+   "options": "Department",
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1,
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -249,9 +298,11 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -279,9 +330,11 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -309,9 +362,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -340,9 +395,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -371,9 +428,11 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -403,21 +462,22 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
+ "has_web_view": 0,
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-user", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:25:12.583516", 
+ "modified": "2018-05-17 09:44:18.203325",
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -425,7 +485,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -445,7 +504,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -465,7 +523,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/setup/doctype/supplier_type/__init__.py b/erpnext/setup/doctype/supplier_group/__init__.py
similarity index 100%
rename from erpnext/setup/doctype/supplier_type/__init__.py
rename to erpnext/setup/doctype/supplier_group/__init__.py
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.js b/erpnext/setup/doctype/supplier_group/supplier_group.js
new file mode 100644
index 0000000..ac5bda6
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.js
@@ -0,0 +1,37 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.cscript.refresh = function(doc) {
+	cur_frm.set_intro(doc.__islocal ? "" : __("There is nothing to edit."));
+	cur_frm.cscript.set_root_readonly(doc);
+};
+
+cur_frm.cscript.set_root_readonly = function(doc) {
+	// read-only for root customer group
+	if(!doc.parent_supplier_group) {
+		cur_frm.set_read_only();
+		cur_frm.set_intro(__("This is a root supplier group and cannot be edited."));
+	} else {
+		cur_frm.set_intro(null);
+	}
+};
+
+// get query select Customer Group
+cur_frm.fields_dict['parent_supplier_group'].get_query = function() {
+	return {
+		filters: {
+			'is_group': 1
+		}
+	};
+};
+
+cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
+	var d  = locals[cdt][cdn];
+	return {
+		filters: {
+			'account_type': 'Payable',
+			'company': d.company,
+			"is_group": 0
+		}
+	};
+};
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.json b/erpnext/setup/doctype/supplier_group/supplier_group.json
new file mode 100644
index 0000000..dc8b263
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.json
@@ -0,0 +1,470 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:supplier_group_name", 
+ "beta": 0, 
+ "creation": "2013-01-10 16:34:24", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "supplier_group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0,
+   "in_standard_filter": 0, 
+   "label": "Supplier Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "supplier_type", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "parent_supplier_group",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Parent Supplier Group",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Supplier Group",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "is_group",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Is Group",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_credit_limit", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Limit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_terms", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_payable_account", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "Mention if non-standard receivable account applicable", 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Party Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "lft",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "lft",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "rgt",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "rgt",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "old_parent",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Old Parent",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Supplier Group",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 1,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-flag", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-20 00:54:48.724120",
+ "modified_by": "Administrator", 
+ "module": "Setup", 
+ "name": "Supplier Group", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Master Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 1, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase Master Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 1, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 1, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.py b/erpnext/setup/doctype/supplier_group/supplier_group.py
new file mode 100644
index 0000000..fa265d4
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils.nestedset import NestedSet, get_root_of
+
+class SupplierGroup(NestedSet):
+	nsm_parent_field = 'parent_supplier_group';
+	def validate(self):
+		if not self.parent_supplier_group:
+			self.parent_supplier_group = get_root_of("Supplier Group")
+
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
+
+	def on_update(self):
+		self.update_nsm_model()
+		self.validate_one_root()
+
+	def on_trash(self):
+		self.update_nsm_model()
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group_tree.js b/erpnext/setup/doctype/supplier_group/supplier_group_tree.js
new file mode 100644
index 0000000..7392699
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/supplier_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Supplier Group"] = {
+	ignore_fields:["parent_supplier_group"]
+};
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_group/test_records.json b/erpnext/setup/doctype/supplier_group/test_records.json
new file mode 100644
index 0000000..5848963
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/test_records.json
@@ -0,0 +1,8 @@
+[
+	{
+		"doctype": "Supplier Group",
+		"supplier_group_name": "_Test Supplier Group",
+		"parent_supplier_group": "All Supplier Groups"
+	}
+]
+   
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_group/test_supplier_group.js b/erpnext/setup/doctype/supplier_group/test_supplier_group.js
new file mode 100644
index 0000000..976dd2c
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/test_supplier_group.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Supplier Group", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Supplier Group
+		() => frappe.tests.make('Supplier Group', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/setup/doctype/supplier_group/test_supplier_group.py b/erpnext/setup/doctype/supplier_group/test_supplier_group.py
new file mode 100644
index 0000000..0e3d23d
--- /dev/null
+++ b/erpnext/setup/doctype/supplier_group/test_supplier_group.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+test_records = frappe.get_test_records('Supplier Group')
diff --git a/erpnext/setup/doctype/supplier_type/README.md b/erpnext/setup/doctype/supplier_type/README.md
deleted file mode 100644
index 0da4c70..0000000
--- a/erpnext/setup/doctype/supplier_type/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Supplier classification.
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.js b/erpnext/setup/doctype/supplier_type/supplier_type.js
deleted file mode 100644
index f1c5d70..0000000
--- a/erpnext/setup/doctype/supplier_type/supplier_type.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.cscript.refresh = function(doc) {
-	cur_frm.set_intro(doc.__islocal ? "" : __("There is nothing to edit."))
-}
-
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
-	var d  = locals[cdt][cdn];
-	return {
-		filters: {
-			'account_type': 'Payable',
-			'company': d.company,
-			"is_group": 0
-		}
-	}
-}
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
deleted file mode 100644
index d7d7084..0000000
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:supplier_type", 
- "beta": 0, 
- "creation": "2013-01-10 16:34:24", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_type", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "supplier_type", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_credit_limit", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit Limit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_terms", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Default Payment Terms Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Payment Terms Template", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_payable_account", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Default Payable Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "description": "Mention if non-standard receivable account applicable", 
-   "fieldname": "accounts", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Accounts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Party Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-09-04 18:54:10.093500", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Supplier Type", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Purchase Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.py b/erpnext/setup/doctype/supplier_type/supplier_type.py
deleted file mode 100644
index 0d23746..0000000
--- a/erpnext/setup/doctype/supplier_type/supplier_type.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.document import Document
-
-class SupplierType(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_type/test_records.json b/erpnext/setup/doctype/supplier_type/test_records.json
deleted file mode 100644
index fd632c5..0000000
--- a/erpnext/setup/doctype/supplier_type/test_records.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
-  "doctype": "Supplier Type",
-  "supplier_type": "_Test Supplier Type"
- }
-]
diff --git a/erpnext/setup/doctype/supplier_type/test_supplier_type.js b/erpnext/setup/doctype/supplier_type/test_supplier_type.js
deleted file mode 100644
index 085dddd..0000000
--- a/erpnext/setup/doctype/supplier_type/test_supplier_type.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Supplier Type", function (assert) {
-	let done = assert.async();
-
-	// number of asserts
-	assert.expect(1);
-
-	frappe.run_serially([
-		// insert a new Supplier Type
-		() => frappe.tests.make('Supplier Type', [
-			// values to be set
-			{key: 'value'}
-		]),
-		() => {
-			assert.equal(cur_frm.doc.key, 'value');
-		},
-		() => done()
-	]);
-
-});
diff --git a/erpnext/setup/doctype/supplier_type/test_supplier_type.py b/erpnext/setup/doctype/supplier_type/test_supplier_type.py
deleted file mode 100644
index 9fa8a44..0000000
--- a/erpnext/setup/doctype/supplier_type/test_supplier_type.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
-
-
-import frappe
-test_records = frappe.get_test_records('Supplier Type')
\ No newline at end of file
diff --git a/erpnext/setup/doctype/target_detail/target_detail.json b/erpnext/setup/doctype/target_detail/target_detail.json
index 9bc8550..509733b 100644
--- a/erpnext/setup/doctype/target_detail/target_detail.json
+++ b/erpnext/setup/doctype/target_detail/target_detail.json
@@ -122,7 +122,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index 40e54d8..5f25406 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -138,7 +138,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index b123d5e..81c2839 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -357,7 +357,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index e752d0f..e4322fe 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -77,7 +77,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/setup/doctype/website_item_group/website_item_group.json b/erpnext/setup/doctype/website_item_group/website_item_group.json
index 73084b5..8176e40 100644
--- a/erpnext/setup/doctype/website_item_group/website_item_group.json
+++ b/erpnext/setup/doctype/website_item_group/website_item_group.json
@@ -43,7 +43,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 8548f92..03da833 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -5,6 +5,7 @@
 
 import frappe
 from erpnext.accounts.doctype.cash_flow_mapper.default_cash_flow_mapper import DEFAULT_MAPPERS
+from .default_success_action import get_default_success_action
 from frappe import _
 from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
 from frappe.custom.doctype.custom_field.custom_field import create_custom_field
@@ -20,6 +21,7 @@
 	create_print_zero_amount_taxes_custom_field()
 	add_all_roles_to("Administrator")
 	create_default_cash_flow_mapper_templates()
+	create_default_success_action()
 	frappe.db.commit()
 
 
@@ -72,9 +74,13 @@
 
 
 def create_default_cash_flow_mapper_templates():
-	mappers = DEFAULT_MAPPERS
-
-	for mapper in mappers:
+	for mapper in DEFAULT_MAPPERS:
 		if not frappe.db.exists('Cash Flow Mapper', mapper['section_name']):
 			doc = frappe.get_doc(mapper)
 			doc.insert(ignore_permissions=True)
+
+def create_default_success_action():
+	for success_action in get_default_success_action():
+		if not frappe.db.exists('Success Action', success_action.get("ref_doctype")):
+			doc = frappe.get_doc(success_action)
+			doc.insert(ignore_permissions=True)
diff --git a/erpnext/setup/setup_wizard/operations/defaults_setup.py b/erpnext/setup/setup_wizard/operations/defaults_setup.py
index 08b8a06..086b60e 100644
--- a/erpnext/setup/setup_wizard/operations/defaults_setup.py
+++ b/erpnext/setup/setup_wizard/operations/defaults_setup.py
@@ -36,6 +36,7 @@
 	stock_settings.auto_indent = 1
 	stock_settings.auto_insert_price_list_rate_if_missing = 1
 	stock_settings.automatically_set_serial_nos_based_on_fifo = 1
+	stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
 	stock_settings.save()
 
 	selling_settings = frappe.get_doc("Selling Settings")
@@ -53,12 +54,6 @@
 	buying_settings.allow_multiple_items = 1
 	buying_settings.save()
 
-	notification_control = frappe.get_doc("Notification Control")
-	notification_control.quotation = 1
-	notification_control.sales_invoice = 1
-	notification_control.purchase_order = 1
-	notification_control.save()
-
 	hr_settings = frappe.get_doc("HR Settings")
 	hr_settings.emp_created_by = "Naming Series"
 	hr_settings.leave_approval_notification_template = "Leave Approval Notification"
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 8f761e5..afe982d 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -84,15 +84,15 @@
 
 		# leave type
 		{'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'),
-			'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1},
+			'allow_encashment': 1, 'is_carry_forward': 1, 'max_continuous_days_allowed': '3', 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'),
-			'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1, 'include_holiday': 1},
+			'allow_encashment': 0, 'is_carry_forward': 0, 'is_lwp':1, 'include_holiday': 1},
 
 		# Employment Type
 		{'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},
@@ -104,22 +104,6 @@
 		{'doctype': 'Employment Type', 'employee_type_name': _('Intern')},
 		{'doctype': 'Employment Type', 'employee_type_name': _('Apprentice')},
 
-		# Department
-		{'doctype': 'Department', 'department_name': _('All Departments'), 'is_group': 1, 'parent_department': ''},
-		{'doctype': 'Department', 'department_name': _('Accounts'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Marketing'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Sales'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Purchase'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Operations'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Production'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Dispatch'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Customer Service'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Human Resources'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Management'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Quality Management'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Research & Development'), 'parent_department': _('All Departments')},
-		{'doctype': 'Department', 'department_name': _('Legal'), 'parent_department': _('All Departments')},
-
 		# Designation
 		{'doctype': 'Designation', 'designation_name': _('CEO')},
 		{'doctype': 'Designation', 'designation_name': _('Manager')},
@@ -147,14 +131,15 @@
 		{'doctype': 'Customer Group', 'customer_group_name': _('Non Profit'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
 		{'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
 
-		# supplier type
-		{'doctype': 'Supplier Type', 'supplier_type': _('Services')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Local')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Raw Material')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Electrical')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Hardware')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Pharmaceutical')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Distributor')},
+		# supplier group
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('All Supplier Groups'), 'is_group': 1, 'name': _('All Supplier Groups'), 'parent_supplier_group': ''},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Services'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Local'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Raw Material'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Electrical'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Hardware'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Pharmaceutical'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
+		{'doctype': 'Supplier Group', 'supplier_group_name': _('Distributor'), 'is_group': 0, 'parent_supplier_group': _('All Supplier Groups')},
 
 		# Sales Person
 		{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': 1, "parent_sales_person": ""},
@@ -213,12 +198,12 @@
 		{'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"},
 		{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"},
 
-		{'doctype': "Party Type", "party_type": "Customer"},
-		{'doctype': "Party Type", "party_type": "Supplier"},
-		{'doctype': "Party Type", "party_type": "Employee"},
-		{'doctype': "Party Type", "party_type": "Member"},
-		{'doctype': "Party Type", "party_type": "Shareholder"},
-		{'doctype': "Party Type", "party_type": "Student"},
+		{'doctype': "Party Type", "party_type": "Customer", "account_type": "Receivable"},
+		{'doctype': "Party Type", "party_type": "Supplier", "account_type": "Payable"},
+		{'doctype': "Party Type", "party_type": "Employee", "account_type": "Payable"},
+		{'doctype': "Party Type", "party_type": "Member", "account_type": "Receivable"},
+		{'doctype': "Party Type", "party_type": "Shareholder", "account_type": "Payable"},
+		{'doctype': "Party Type", "party_type": "Student", "account_type": "Receivable"},
 
 		{'doctype': "Opportunity Type", "name": "Hub"},
 		{'doctype': "Opportunity Type", "name": _("Sales")},
@@ -275,6 +260,14 @@
 	from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import make_default_records
 	make_default_records()
 
+	make_fixture_records(records)
+
+	# set default customer group and territory
+	selling_settings = frappe.get_doc("Selling Settings")
+	selling_settings.set_default_customer_group_and_territory()
+	selling_settings.save()
+
+def make_fixture_records(records):
 	from frappe.modules import scrub
 	for r in records:
 		doc = frappe.new_doc(r.get("doctype"))
@@ -295,7 +288,23 @@
 			else:
 				raise
 
-	# set default customer group and territory
-	selling_settings = frappe.get_doc("Selling Settings")
-	selling_settings.set_default_customer_group_and_territory()
-	selling_settings.save()
+def install_post_company_fixtures(company=None):
+	records = [
+		# Department
+		{'doctype': 'Department', 'department_name': _('All Departments'), 'is_group': 1, 'parent_department': ''},
+		{'doctype': 'Department', 'department_name': _('Accounts'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Marketing'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Sales'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Purchase'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Operations'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Production'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Dispatch'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Customer Service'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Human Resources'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Management'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Quality Management'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Research & Development'), 'parent_department': _('All Departments'), 'company': company},
+		{'doctype': 'Department', 'department_name': _('Legal'), 'parent_department': _('All Departments'), 'company': company},
+	]
+
+	make_fixture_records(records)
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index d6491a8..101b6aa 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -56,6 +56,11 @@
 				'fail_msg': 'Failed to set defaults',
 				'tasks': [
 					{
+						'fn': setup_post_company_fixtures,
+						'args': args,
+						'fail_msg': _("Failed to setup post company fixtures")
+					},
+					{
 						'fn': stage_three,
 						'args': args,
 						'fail_msg': _("Failed to set defaults")
@@ -92,6 +97,7 @@
 	stage_fixtures(args)
 	setup_company(args)
 	setup_taxes(args)
+	setup_post_company_fixtures(args)
 	stage_three(args)
 	stage_four(args)
 	fin(args)
@@ -108,6 +114,9 @@
 def setup_taxes(args):
 	taxes_setup.create_sales_tax(args)
 
+def setup_post_company_fixtures(args):
+	install_fixtures.install_post_company_fixtures(args.get("company_name"))
+
 def stage_three(args):
 	defaults_setup.create_employee_for_self(args)
 	defaults_setup.set_default_settings(args)
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 8d9bba3..3fe862e 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -55,17 +55,15 @@
 	frappe.db.commit()
 
 @frappe.whitelist()
-def get_exchange_rate(from_currency, to_currency, transaction_date=None):
+def get_exchange_rate(from_currency, to_currency, transaction_date=None, args=None):
 	if not (from_currency and to_currency):
 		# manqala 19/09/2016: Should this be an empty return or should it throw and exception?
 		return
-
 	if from_currency == to_currency:
 		return 1
 
 	if not transaction_date:
 		transaction_date = nowdate()
-
 	currency_settings = frappe.get_doc("Accounts Settings").as_dict()
 	allow_stale_rates = currency_settings.get("allow_stale")
 
@@ -75,6 +73,11 @@
 		["to_currency", "=", to_currency]
 	]
 
+	if args == "for_buying":
+		filters.append(["for_buying", "=", "1"])
+	elif args == "for_selling":
+		filters.append(["for_selling", "=", "1"])
+
 	if not allow_stale_rates:
 		stale_days = currency_settings.get("stale_days")
 		checkpoint_date = add_days(transaction_date, -stale_days)
@@ -84,7 +87,6 @@
 	entries = frappe.get_all(
 		"Currency Exchange", fields=["exchange_rate"], filters=filters, order_by="date desc",
 		limit=1)
-
 	if entries:
 		return flt(entries[0].exchange_rate)
 
@@ -95,7 +97,7 @@
 
 		if not value:
 			import requests
-			api_url = "http://api.fixer.io/{0}".format(transaction_date)
+			api_url = "https://exchangeratesapi.io/api/{0}".format(transaction_date)
 			response = requests.get(api_url, params={
 				"base": from_currency,
 				"symbols": to_currency
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index ed782ad..724c1e9 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -14,6 +14,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -27,7 +28,7 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Enable Shopping Cart", 
+   "label": "Enable purchase of items via the website", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -39,16 +40,19 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
+   "description": "", 
+   "fieldname": "display_settings", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -56,6 +60,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Display Settings", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -68,15 +73,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Attachments can be shown without enabling the shopping cart", 
+   "description": "", 
    "fieldname": "show_attachments", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -99,10 +106,142 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.enabled==0", 
+   "description": "", 
+   "fieldname": "show_price", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Price", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "show_stock_availability", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Stock Availability", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "show_stock_availability", 
+   "fieldname": "show_quantity_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Stock Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -127,10 +266,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,10 +298,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,40 +332,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "show_quantity_in_website", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show Quantity in Website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -247,10 +362,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -278,10 +395,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -307,10 +426,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -338,10 +459,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -368,10 +491,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -401,10 +526,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -430,10 +557,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -461,6 +590,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -475,15 +605,14 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-05-19 09:31:38.078110", 
- "modified_by": "Administrator", 
+ "modified": "2018-05-31 03:11:58.911732", 
+ "modified_by": "sushant@digithinkit.com", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -509,4 +638,4 @@
  "sort_order": "ASC", 
  "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index aa4f163..5c24070 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -90,6 +90,4 @@
 		frappe.throw(_("You need to enable Shopping Cart"), ShoppingCartSetupError)
 
 def show_attachments():
-        return get_shopping_cart_settings().show_attachments
-
-
+	return get_shopping_cart_settings().show_attachments
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.js b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.js
new file mode 100644
index 0000000..c8485e7
--- /dev/null
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Shopping Cart Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Shopping Cart Settings
+		() => frappe.tests.make('Shopping Cart Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/shopping_cart/product_info.py b/erpnext/shopping_cart/product_info.py
index 33cac17..b5f129b 100644
--- a/erpnext/shopping_cart/product_info.py
+++ b/erpnext/shopping_cart/product_info.py
@@ -12,8 +12,6 @@
 @frappe.whitelist(allow_guest=True)
 def get_product_info_for_website(item_code):
 	"""get product price / stock info for website"""
-	if not is_cart_enabled():
-		return {}
 
 	cart_quotation = _get_cart_quotation()
 	cart_settings = get_shopping_cart_settings()
@@ -33,7 +31,7 @@
 		"in_stock": stock_status.in_stock if stock_status.is_stock_item else 1,
 		"qty": 0,
 		"uom": frappe.db.get_value("Item", item_code, "stock_uom"),
-		"show_stock_qty": show_quantity_in_website() if stock_status.is_stock_item else 0,
+		"show_stock_qty": show_quantity_in_website(),
 		"sales_uom": frappe.db.get_value("Item", item_code, "sales_uom")
 	}
 
@@ -43,13 +41,17 @@
 			if item:
 				product_info["qty"] = item[0].qty
 
-	return product_info
+	return {
+		"product_info": product_info,
+		"cart_settings": cart_settings
+	}
 
 def set_product_info_for_website(item):
 	"""set product price uom for website"""
 	product_info = get_product_info_for_website(item.item_code)
 
 	if product_info:
+		item.update(product_info)
 		item["stock_uom"] = product_info.get("uom")
 		item["sales_uom"] = product_info.get("sales_uom")
 		if product_info.get("price"):
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index bf914ed..7d6b41e 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -110,7 +110,6 @@
 		tax_rule_master = set_taxes(quotation.customer, "Customer", \
 			quotation.transaction_date, quotation.company, None, None, \
 			quotation.customer_address, quotation.shipping_address_name, 1)
-
 		self.assertEqual(quotation.taxes_and_charges, tax_rule_master)
 		self.assertEqual(quotation.total_taxes_and_charges, 1000.0)
 
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index f22c70c..62c9e7b 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -25,9 +25,6 @@
 		bootinfo.sysdefaults.quotation_valid_till = cint(frappe.db.get_single_value('Selling Settings',
 			'default_valid_till'))
 
-		bootinfo.notification_settings = frappe.get_doc("Notification Control",
-			"Notification Control")
-
 		# if no company, show a dialog box to create a new company
 		bootinfo.customer_count = frappe.db.sql("""select count(*) from tabCustomer""")[0][0]
 
@@ -39,6 +36,9 @@
 			default_letter_head, default_bank_account, enable_perpetual_inventory from `tabCompany`""",
 			as_dict=1, update={"doctype":":Company"})
 
+		party_account_types = frappe.db.sql(""" select name, ifnull(account_type, '') from `tabParty Type`""")
+		bootinfo.party_account_types = frappe._dict(party_account_types)
+
 def load_country_and_currency(bootinfo):
 	country = frappe.db.get_default("country")
 	if country and frappe.db.exists("Country", country):
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index daf6fdd..5de7998 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -208,15 +208,15 @@
 	},
 	"Supplier": {
 		"columns": ["name", "if(supplier_name=name, '', supplier_name) as supplier_name",
-			"supplier_type as parent_supplier_type"],
+			"supplier_group as parent_supplier_group"],
 		"conditions": ["docstatus < 2"],
 		"order_by": "name",
 		"links": {
-			"parent_supplier_type": ["Supplier Type", "name"],
+			"parent_supplier_group": ["Supplier Group", "name"],
 		}
 	},
-	"Supplier Type": {
-		"columns": ["name"],
+	"Supplier Group": {
+		"columns": ["name", "parent_supplier_group"],
 		"conditions": ["docstatus < 2"],
 		"order_by": "name"
 	},
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 5b4f4b5..9d13657 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -86,8 +86,13 @@
 	def autoname(self):
 		"""Generate random ID for batch if not specified"""
 		if not self.batch_id:
-			if frappe.db.get_value('Item', self.item, 'create_new_batch'):
-				if batch_uses_naming_series():
+			create_new_batch, batch_number_series = frappe.db.get_value('Item', self.item, 
+				['create_new_batch', 'batch_number_series'])
+
+			if create_new_batch:
+				if batch_number_series:
+					self.batch_id = make_autoname(batch_number_series)
+				elif batch_uses_naming_series():
 					self.batch_id = self.get_name_from_naming_series()
 				else:
 					self.batch_id = get_name_from_hash()
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index e6029aa..a2faa9a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -34,7 +34,7 @@
 
 		frm.set_query('transporter_name', function(doc) {
 			return {
-				filters: { 'supplier_type': "transporter" }
+				filters: { 'supplier_group': "transporter" }
 			}
 		});
 
@@ -66,11 +66,6 @@
 	},
 	print_without_amount: function(frm) {
 		erpnext.stock.delivery_note.set_print_hide(frm.doc);
-	},
-	on_submit: function(frm) {
-		if(cint(frappe.boot.notification_settings.delivery_note)) {
-			frm.email_doc(frappe.boot.notification_settings.delivery_note_message);
-		}
 	}
 });
 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 552483a..12e5b39 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -40,7 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,7 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -137,7 +137,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -170,7 +170,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -180,6 +180,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "customer", 
+   "fetch_from": "customer.customer_name",
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -192,7 +193,7 @@
    "label": "Customer Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "customer.customer_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -202,7 +203,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -232,7 +233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -266,7 +267,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -302,7 +303,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -338,7 +339,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -374,7 +375,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -407,7 +408,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -438,7 +439,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -471,7 +472,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -503,7 +504,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -536,7 +537,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -567,7 +568,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -601,7 +602,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -634,7 +635,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -665,7 +666,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -695,7 +696,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -726,7 +727,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -756,7 +757,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -786,7 +787,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -817,7 +818,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -847,7 +848,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -880,7 +881,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -911,7 +912,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -941,7 +942,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -973,7 +974,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1004,7 +1005,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1035,7 +1036,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1068,7 +1069,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1102,7 +1103,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1131,7 +1132,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1164,7 +1165,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1195,7 +1196,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1227,7 +1228,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1257,7 +1258,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1289,7 +1290,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1322,7 +1323,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1355,7 +1356,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1388,7 +1389,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1418,7 +1419,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1447,6 +1448,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -1479,7 +1511,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1513,7 +1545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1543,7 +1575,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1575,7 +1607,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1606,7 +1638,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1637,7 +1669,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1669,7 +1701,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1703,7 +1735,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1732,7 +1764,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1764,7 +1796,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1793,7 +1825,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1826,7 +1858,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1857,7 +1889,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1888,7 +1920,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1917,7 +1949,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1951,7 +1983,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1982,7 +2014,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2013,7 +2045,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2045,7 +2077,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2078,7 +2110,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2110,7 +2142,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2139,7 +2171,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2170,7 +2202,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2201,7 +2233,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2233,7 +2265,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2267,7 +2299,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2300,7 +2332,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2334,7 +2366,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2369,7 +2401,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "200px"
   }, 
@@ -2400,7 +2432,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2434,7 +2466,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2467,7 +2499,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2501,7 +2533,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2536,7 +2568,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2570,7 +2602,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2603,7 +2635,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2635,7 +2667,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2667,7 +2699,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2700,7 +2732,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2731,7 +2763,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2766,7 +2798,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -2802,7 +2834,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -2835,7 +2867,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2869,7 +2901,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2903,7 +2935,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2936,7 +2968,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2967,7 +2999,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2999,7 +3031,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3031,7 +3063,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3063,7 +3095,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3094,7 +3126,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3127,7 +3159,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3160,7 +3192,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3191,7 +3223,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3221,7 +3253,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3253,11 +3285,41 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Group same items",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -3283,7 +3345,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3318,7 +3380,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -3353,7 +3415,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3383,7 +3445,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3412,7 +3474,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3446,7 +3508,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3478,7 +3540,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3510,7 +3572,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3541,7 +3603,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3573,7 +3635,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3606,7 +3668,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3640,7 +3702,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -3671,7 +3733,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -3705,7 +3767,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3739,7 +3801,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3770,7 +3832,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3803,7 +3865,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -3819,15 +3881,14 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-04-30 15:35:02.234116",
- "modified_by": "Administrator",
+ "modified": "2018-05-28 03:03:35.035396",
+ "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3847,7 +3908,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3867,7 +3927,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3887,7 +3946,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3907,7 +3965,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 8886f33..1df07a2 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -82,6 +82,8 @@
 			for f in fieldname:
 				toggle_print_hide(self.meta if key == "parent" else item_meta, f)
 
+		super(DeliveryNote, self).before_print()
+
 	def set_actual_qty(self):
 		for d in self.get('items'):
 			if d.item_code and d.warehouse:
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index 2e150f7..cf28a52 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -6,7 +6,7 @@
 		'non_standard_fieldnames': {
 			'Stock Entry': 'delivery_note_no',
 			'Quality Inspection': 'reference_name',
-			'Subscription': 'reference_document',
+			'Auto Repeat': 'reference_document',
 		},
 		'internal_links': {
 			'Sales Order': ['items', 'against_sales_order'],
@@ -26,7 +26,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
index f7ec7e3..3e7dfc9 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
@@ -3,6 +3,14 @@
 
 frappe.ui.form.on('Delivery Trip', {
 	setup: function(frm) {
+		frm.set_query("driver", function() {
+			return {
+				filters: {
+					"status": "Active"
+				}
+			};
+		});
+
 		frm.set_query("address", "delivery_stops", function(doc, cdt, cdn) {
 			var row = locals[cdt][cdn];
 			if (row.customer) {
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.json b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
index a480562..181d428 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.json
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
@@ -42,7 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -74,7 +74,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -135,7 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -165,7 +165,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -196,7 +196,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -227,7 +227,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -257,7 +257,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -289,7 +289,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -298,6 +298,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "driver.full_name",
    "fieldname": "driver_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -310,7 +311,7 @@
    "label": "Driver Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "driver.full_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -321,7 +322,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -353,7 +354,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -384,7 +385,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -416,7 +417,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -448,7 +449,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -478,7 +479,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -511,7 +512,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -542,7 +543,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -556,7 +557,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-14 14:24:16.773657", 
+ "modified": "2018-05-16 22:42:43.660128",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Trip", 
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index f98cbb6..59e2f58 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -19,7 +19,9 @@
 
 		// should never check Private
 		frm.fields_dict["website_image"].df.is_private = 0;
-
+		if (frm.doc.is_fixed_asset) {
+			frm.trigger("set_asset_naming_series");
+		}
 	},
 
 	refresh: function(frm) {
@@ -124,7 +126,20 @@
 	},
 
 	is_fixed_asset: function(frm) {
-		frm.set_value("is_stock_item", frm.doc.is_fixed_asset ? 0 : 1);
+		frm.call({
+			method: "set_asset_naming_series",
+			doc: frm.doc,
+			callback: function() {
+				frm.set_value("is_stock_item", frm.doc.is_fixed_asset ? 0 : 1);
+				frm.trigger("set_asset_naming_series");
+			}
+		})
+	},
+
+	set_asset_naming_series: function(frm) {
+		if (frm.doc.__onload && frm.doc.__onload.asset_naming_series) {
+			frm.set_df_property("asset_naming_series", "options", frm.doc.__onload.asset_naming_series);
+		}
 	},
 
 	page_name: frappe.utils.warn_page_name_change,
@@ -201,27 +216,39 @@
 
 $.extend(erpnext.item, {
 	setup_queries: function(frm) {
-		frm.fields_dict['expense_account'].get_query = function(doc) {
+		frm.fields_dict["item_defaults"].grid.get_field("expense_account").get_query = function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
 			return {
 				query: "erpnext.controllers.queries.get_expense_account",
+				filters: { company: row.company }
 			}
 		}
 
-		frm.fields_dict['income_account'].get_query = function(doc) {
+		frm.fields_dict["item_defaults"].grid.get_field("income_account").get_query = function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
 			return {
-				query: "erpnext.controllers.queries.get_income_account"
+				query: "erpnext.controllers.queries.get_income_account",
+				filters: { company: row.company }
 			}
 		}
 
-		frm.fields_dict['buying_cost_center'].get_query = function(doc) {
+		frm.fields_dict["item_defaults"].grid.get_field("buying_cost_center").get_query = function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
 			return {
-				filters: { "is_group": 0 }
+				filters: { 
+					"is_group": 0,
+					"company": row.company
+				}
 			}
 		}
 
-		frm.fields_dict['selling_cost_center'].get_query = function(doc) {
+		frm.fields_dict["item_defaults"].grid.get_field("selling_cost_center").get_query = function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
 			return {
-				filters: { "is_group": 0 }
+				filters: {
+					"is_group": 0,
+					"company": row.company
+				}
 			}
 		}
 
@@ -252,9 +279,13 @@
 			return { query: "erpnext.controllers.queries.supplier_query" }
 		}
 
-		frm.fields_dict['default_warehouse'].get_query = function(doc) {
+		frm.fields_dict["item_defaults"].grid.get_field("default_warehouse").get_query = function(doc, cdt, cdn) {
+			const row = locals[cdt][cdn];
 			return {
-				filters: { "is_group": 0 }
+				filters: {
+					"is_group": 0,
+					"company": row.company
+				}
 			}
 		}
 
@@ -457,7 +488,8 @@
 							fields: ["attribute_value"],
 							limit_start: 0,
 							limit_page_length: 500,
-							parent: "Item"
+							parent: "Item",
+							order_by: "idx"
 						}
 					}).then((r) => {
 						if(r.message) {
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index e780fa6..b7c90d0 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,373 +1,385 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "beta": 0,
- "creation": "2013-05-03 10:45:46",
- "custom": 0,
- "default_print_format": "",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:item_code", 
+ "beta": 0, 
+ "creation": "2013-05-03 10:45:46", 
+ "custom": 0, 
+ "default_print_format": "", 
+ "description": "A Product or a Service that is bought, sold or kept in stock.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "name_and_description_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-flag",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "name_and_description_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-flag", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Series",
-   "length": 0,
-   "no_copy": 0,
-   "options": "ITEM-",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 1,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "item_code",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "variant_of",
-   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
-   "fieldname": "variant_of",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Variant Of",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 1,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcode",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_item_from_hub",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Item from Hub",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Disabled",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
+  }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "ITEM-", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "item_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "variant_of", 
+   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified", 
+   "fieldname": "variant_of", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Variant Of", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 1, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcode", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_group", 
+   "oldfieldtype": "Link", 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_item_from_hub", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Item from Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -396,3502 +408,3683 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "description": "",
-   "fieldname": "is_stock_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Maintain Stock",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_stock_item",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "description": "", 
+   "fieldname": "is_stock_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maintain Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_stock_item", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
-   "fieldname": "opening_stock",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Opening Stock",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Fixed Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.__islocal",
-   "fieldname": "standard_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Standard Selling Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_fixed_asset",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Fixed Asset",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 1,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "description": "", 
+   "fieldname": "tolerance", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow over delivery or receipt upto this percent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "tolerance", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset_category",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Asset Category",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Asset Category",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "description": "",
-   "fieldname": "tolerance",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow over delivery or receipt upto this percent",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "tolerance",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "brand", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Brand", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Link", 
+   "options": "Brand", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "brand",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Brand",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sb_barcodes", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcodes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcodes", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcodes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Barcode", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sb_barcodes",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcodes",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "is_stock_item", 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "inventory", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inventory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-truck", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcodes",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcodes",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Barcode",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "shelf_life_in_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Shelf Life In Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "is_stock_item",
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "inventory",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Inventory",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-truck",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "2099-12-31", 
+   "depends_on": "is_stock_item", 
+   "fieldname": "end_of_life", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "End of Life", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "end_of_life", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "default_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "default_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Purchase", 
+   "fieldname": "default_material_request_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Material Request Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "shelf_life_in_days",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Shelf Life In Days",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "valuation_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nFIFO\nMoving Average", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "2099-12-31",
-   "depends_on": "is_stock_item",
-   "fieldname": "end_of_life",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "End of Life",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "end_of_life",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Purchase",
-   "fieldname": "default_material_request_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Material Request Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "valuation_method",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Method",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nFIFO\nMoving Average",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 1,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "warranty_period", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Warranty Period (in days)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warranty_period", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "warranty_period",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Warranty Period (in days)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "warranty_period",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "weight_per_unit", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight Per Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "weight_per_unit",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weight Per Unit",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "weight_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weight UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "weight_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weight UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "reorder_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Auto re-order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-rss", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "reorder_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Auto re-order",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-rss",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Will also apply for variants unless overrridden", 
+   "fieldname": "reorder_levels", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reorder level based on Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Reorder", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Will also apply for variants unless overrridden",
-   "fieldname": "reorder_levels",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Reorder level based on Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Reorder",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "unit_of_measure_conversion", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Units of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "unit_of_measure_conversion",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Units of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Will also apply for variants", 
+   "fieldname": "uoms", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOMs", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom_conversion_details", 
+   "oldfieldtype": "Table", 
+   "options": "UOM Conversion Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Will also apply for variants",
-   "fieldname": "uoms",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOMs",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "uom_conversion_details",
-   "oldfieldtype": "Table",
-   "options": "UOM Conversion Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no || doc.is_fixed_asset", 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "serial_nos_and_batches", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial Nos and Batches", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no",
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "serial_nos_and_batches",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial Nos and Batches",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:doc.is_stock_item", 
+   "fieldname": "has_batch_no", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Has Batch No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "has_batch_no", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "has_batch_no",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Has Batch No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "has_batch_no",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "description": "", 
+   "fieldname": "create_new_batch", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Automatically Create New Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_batch_no",
-   "description": "",
-   "fieldname": "create_new_batch",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Automatically Create New Batch",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.has_batch_no==1 && doc.create_new_batch==1", 
+   "description": "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.", 
+   "fieldname": "batch_number_series", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Batch Number Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 1, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_batch_no",
-   "fieldname": "has_expiry_date",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Has Expiry Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "fieldname": "has_expiry_date", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Has Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_batch_no",
-   "fieldname": "retain_sample",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Retain Sample",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "has_batch_no", 
+   "fieldname": "retain_sample", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Retain Sample", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)",
-   "description": "Maximum sample quantity that can be retained",
-   "fieldname": "sample_quantity",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Max Sample Quantity",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)", 
+   "description": "Maximum sample quantity that can be retained", 
+   "fieldname": "sample_quantity", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Sample Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_37",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_37", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "eval:doc.is_stock_item",
-   "description": "",
-   "fieldname": "has_serial_no",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Has Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "has_serial_no",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset", 
+   "description": "", 
+   "fieldname": "has_serial_no", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Has Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "has_serial_no", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "has_serial_no",
-   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
-   "fieldname": "serial_no_series",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial Number Series",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset", 
+   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", 
+   "fieldname": "serial_no_series", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial Number Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "attributes",
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "variants_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Variants",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "attributes", 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "variants_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variants", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "depends_on": "eval:!doc.variant_of",
-   "description": "If this item has variants, then it cannot be selected in sales orders etc.",
-   "fieldname": "has_variants",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Has Variants",
-   "length": 0,
-   "no_copy": 1,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:!doc.variant_of", 
+   "description": "If this item has variants, then it cannot be selected in sales orders etc.", 
+   "fieldname": "has_variants", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Has Variants", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Item Attribute",
-   "depends_on": "has_variants",
-   "fieldname": "variant_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Variant Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Attribute\nManufacturer",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 1,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Item Attribute", 
+   "depends_on": "has_variants", 
+   "fieldname": "variant_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variant Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Attribute\nManufacturer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
-   "fieldname": "attributes",
-   "fieldtype": "Table",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Attributes",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Item Variant Attribute",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'", 
+   "fieldname": "attributes", 
+   "fieldtype": "Table", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Attributes", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Item Variant Attribute", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "purchase_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Purchase Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "defaults", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Defaults", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "is_purchase_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Purchase Item",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_defaults", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Defaults", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Default", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "purchase_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Purchase Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "purchase_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-shopping-cart", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "depends_on": "is_stock_item",
-   "description": "",
-   "fieldname": "min_order_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Minimum Order Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "min_order_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "is_purchase_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Purchase Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "safety_stock",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Safety Stock",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Purchase Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "purchase_details_cb",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0.00", 
+   "depends_on": "is_stock_item", 
+   "description": "", 
+   "fieldname": "min_order_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Minimum Order Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "min_order_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "Average time taken by the supplier to deliver",
-   "fieldname": "lead_time_days",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Lead Time in days",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "lead_time_days",
-   "oldfieldtype": "Int",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "safety_stock", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Safety Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "buying_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Buying Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_details_cb", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Expense Account",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "purchase_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Average time taken by the supplier to deliver", 
+   "fieldname": "lead_time_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Lead Time in days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "lead_time_days", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "last_purchase_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Last Purchase Rate",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "last_purchase_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "last_purchase_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Last Purchase Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "last_purchase_rate", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "supplier_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Supplier Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "default_supplier",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Supplier",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Supplier",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delivered by Supplier (Drop Ship)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delivered_by_supplier",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delivered by Supplier (Drop Ship)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "manufacturer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Manufacturer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Manufacturer", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "manufacturer",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Manufacturer",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Manufacturer",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "manufacturer_part_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Manufacturer Part Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "manufacturer_part_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Manufacturer Part Number",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Code for Suppliers",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "column_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code for Suppliers", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "supplier_items",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Supplier Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Supplier",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Supplier", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "foreign_trade_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Foreign Trade Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "foreign_trade_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Foreign Trade Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "country_of_origin",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Country of Origin",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Country",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "country_of_origin", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Country of Origin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_59",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_59", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customs_tariff_number",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customs Tariff Number",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Customs Tariff Number",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customs_tariff_number", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customs Tariff Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customs Tariff Number", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "sales_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-tag",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sales_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-tag", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Sales Unit of Measure",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Sales Unit of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "income_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Income Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "is_sales_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Sales Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "is_sales_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Sales Item",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "column_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "selling_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Selling Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "max_discount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Max Discount (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "max_discount", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "max_discount",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Max Discount (%)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "max_discount",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "deferred_revenue", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deferred Revenue", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "customer_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "enable_deferred_revenue", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Enable Deferred Revenue", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "customer_items",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Customer Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "enable_deferred_revenue", 
+   "fieldname": "deferred_revenue_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Deferred Revenue Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "item_tax_section_break",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Tax",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_85", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Will also apply for variants",
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Taxes",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_tax",
-   "oldfieldtype": "Table",
-   "options": "Item Tax",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "enable_deferred_revenue", 
+   "fieldname": "no_of_months", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "No of Months", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "inspection_criteria",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Inspection Criteria",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-search",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "customer_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "inspection_required_before_purchase",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Inspection Required before Purchase",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "inspection_required",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "customer_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Customer Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "inspection_required_before_delivery",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Inspection Required before Delivery",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "item_tax_section_break", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Tax", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-money", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
-   "fieldname": "quality_inspection_template",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Quality Inspection Template",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Quality Inspection Template",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Will also apply for variants", 
+   "fieldname": "taxes", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Taxes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_tax", 
+   "oldfieldtype": "Table", 
+   "options": "Item Tax", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "depends_on": "is_stock_item",
-   "fieldname": "manufacturing",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Manufacturing",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-cogs",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "inspection_criteria", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inspection Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-search", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "default_bom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default BOM",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "default_bom",
-   "oldfieldtype": "Link",
-   "options": "BOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "inspection_required_before_purchase", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inspection Required before Purchase", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "inspection_required", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "description": "If subcontracted to a vendor",
-   "fieldname": "is_sub_contracted_item",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Supply Raw Materials for Purchase",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_sub_contracted_item",
-   "oldfieldtype": "Select",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "inspection_required_before_delivery", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inspection Required before Delivery", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_74",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)", 
+   "fieldname": "quality_inspection_template", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quality Inspection Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Quality Inspection Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_code",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Code",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "manufacturing", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Manufacturing", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "fa fa-cogs", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "website_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-globe",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "default_bom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default BOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "default_bom", 
+   "oldfieldtype": "Link", 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.variant_of",
-   "fieldname": "show_in_website",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Show in Website",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "description": "If subcontracted to a vendor", 
+   "fieldname": "is_sub_contracted_item", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supply Raw Materials for Purchase", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_sub_contracted_item", 
+   "oldfieldtype": "Select", 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "variant_of",
-   "fieldname": "show_variant_in_website",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Show in Website (Variant)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_74", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "route",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Route",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "customer_code", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Customer Code", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Items with higher weightage will be shown higher",
-   "fieldname": "weightage",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Weightage",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "website_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "fa fa-globe", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show a slideshow at the top of the page",
-   "fieldname": "slideshow",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Slideshow",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Website Slideshow",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.variant_of", 
+   "fieldname": "show_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show in Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Item Image (if not slideshow)",
-   "fieldname": "website_image",
-   "fieldtype": "Attach",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "variant_of", 
+   "fieldname": "show_variant_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show in Website (Variant)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "thumbnail",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Thumbnail",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "route", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "cb72",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Items with higher weightage will be shown higher", 
+   "fieldname": "weightage", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Weightage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
-   "fieldname": "website_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Show a slideshow at the top of the page", 
+   "fieldname": "slideshow", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Slideshow", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Website Slideshow", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "List this Item in multiple groups on the website.",
-   "fieldname": "website_item_groups",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Item Groups",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Website Item Group",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Item Image (if not slideshow)", 
+   "fieldname": "website_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "website_specifications",
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "sb72",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Specifications",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "thumbnail", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Thumbnail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "copy_from_item_group",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Copy From Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb72", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "website_specifications",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Specifications",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Item Website Specification",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
+   "fieldname": "website_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "web_long_description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "description": "List this Item in multiple groups on the website.", 
+   "fieldname": "website_item_groups", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Item Groups", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Website Item Group", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_projected_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Projected Qty",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "website_specifications", 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "sb72", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Specifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:(!doc.is_item_from_hub)",
-   "fieldname": "hub_publishing_sb",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hub Publishing Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "copy_from_item_group", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Copy From Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "description": "Publish Item to hub.erpnext.com",
-   "fieldname": "publish_in_hub",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Publish in Hub",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "website_specifications", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Specifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Website Specification", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "hub_category_to_publish",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hub Category to Publish",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website", 
+   "fieldname": "web_long_description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
-   "fieldname": "hub_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hub Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_projected_qty", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Projected Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "synced_with_hub",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Synced With Hub",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(!doc.is_item_from_hub)", 
+   "fieldname": "hub_publishing_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hub Publishing Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "description": "Publish Item to hub.erpnext.com", 
+   "fieldname": "publish_in_hub", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Publish in Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)", 
+   "fieldname": "opening_stock", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Opening Stock", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_stock_item", 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.__islocal", 
+   "fieldname": "standard_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Standard Selling Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "hub_category_to_publish", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hub Category to Publish", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.", 
+   "fieldname": "hub_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Hub Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "synced_with_hub", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Synced With Hub", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-tag",
- "idx": 2,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 1,
- "modified": "2018-05-01 12:46:45.536665",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-tag", 
+ "idx": 2, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 1, 
+ "modified": "2018-05-28 14:18:03.234070", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Item", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Item Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Item Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Maintenance User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Maintenance User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Manufacturing User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_name,description,item_group,customer_code",
- "show_name_in_global_search": 1,
- "sort_field": "idx desc,modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
- "track_changes": 1,
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "item_name,description,item_group,customer_code", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "idx desc,modified desc", 
+ "sort_order": "DESC", 
+ "title_field": "item_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 8804043..51f8b7e 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -16,6 +16,7 @@
 from frappe.utils.html_utils import clean_html
 from frappe.website.doctype.website_slideshow.website_slideshow import \
 	get_slideshow
+
 from frappe.website.render import clear_cache
 from frappe.website.website_generator import WebsiteGenerator
 
@@ -42,10 +43,18 @@
 		super(Item, self).onload()
 
 		self.set_onload('stock_exists', self.stock_ledger_created())
+		self.set_asset_naming_series()
 		if self.is_fixed_asset:
 			asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
 			self.set_onload("asset_exists", True if asset else False)
 
+	def set_asset_naming_series(self):
+		if not hasattr(self, '_asset_naming_series'):
+			from erpnext.assets.doctype.asset.asset import get_asset_naming_series
+			self._asset_naming_series = get_asset_naming_series()
+
+		self.set_onload('asset_naming_series', self._asset_naming_series)
+
 	def autoname(self):
 		if frappe.db.get_default("item_naming_by") == "Naming Series":
 			if self.variant_of:
@@ -72,7 +81,8 @@
 	def after_insert(self):
 		'''set opening stock and item price'''
 		if self.standard_rate:
-			self.add_price()
+			for default in self.item_defaults:
+				self.add_price(default.default_price_list)
 
 		if self.opening_stock:
 			self.set_opening_stock()
@@ -115,6 +125,9 @@
 			self.old_website_item_groups = frappe.db.sql_list("""select item_group
 					from `tabWebsite Item Group`
 					where parentfield='website_item_groups' and parenttype='Item' and parent=%s""", self.name)
+		elif not self.item_defaults:
+			self.append("item_defaults", {"company": frappe.defaults.get_defaults().company})
+
 
 	def on_update(self):
 		invalidate_cache_for_item(self)
@@ -157,15 +170,16 @@
 		from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 
 		# default warehouse, or Stores
-		default_warehouse = (self.default_warehouse
-        		or frappe.db.get_single_value('Stock Settings', 'default_warehouse')
-                or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
+		for default in self.item_defaults:
+			default_warehouse = (default.default_warehouse
+					or frappe.db.get_single_value('Stock Settings', 'default_warehouse')
+					or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
 
-		if default_warehouse:
-			stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse,
-                                  qty=self.opening_stock, rate=self.valuation_rate)
+			if default_warehouse:
+				stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse, qty=self.opening_stock,
+												rate=self.valuation_rate, company=default.company)
 
-			stock_entry.add_comment("Comment", _("Opening Stock"))
+				stock_entry.add_comment("Comment", _("Opening Stock"))
 
 	def make_route(self):
 		if not self.route:
@@ -444,7 +458,7 @@
 					_("Conversion factor for default Unit of Measure must be 1 in row {0}").format(d.idx))
 
 	def validate_item_type(self):
-		if self.has_serial_no == 1 and self.is_stock_item == 0:
+		if self.has_serial_no == 1 and self.is_stock_item == 0 and not self.is_fixed_asset:
 			msgprint(_("'Has Serial No' can not be 'Yes' for non-stock item"), raise_exception=1)
 
 		if self.has_serial_no == 0 and self.serial_no_series:
@@ -527,8 +541,8 @@
 
 	def update_item_price(self):
 		frappe.db.sql("""update `tabItem Price` set item_name=%s,
-			item_description=%s, modified=NOW() where item_code=%s""",
-                    (self.item_name, self.description, self.name))
+			item_description=%s, brand=%s where item_code=%s""",
+                    (self.item_name, self.description, self.brand, self.name))
 
 	def on_trash(self):
 		super(Item, self).on_trash()
@@ -631,19 +645,20 @@
 
 	def update_template_item(self):
 		"""Set Show in Website for Template Item if True for its Variant"""
-		if self.variant_of and self.show_in_website:
-			self.show_variant_in_website = 1
-			self.show_in_website = 0
+		if self.variant_of:
+			if self.show_in_website:
+				self.show_variant_in_website = 1
+				self.show_in_website = 0
 
-		if self.show_variant_in_website:
-			# show template
-			template_item = frappe.get_doc("Item", self.variant_of)
+			if self.show_variant_in_website:
+				# show template
+				template_item = frappe.get_doc("Item", self.variant_of)
 
-			if not template_item.show_in_website:
-				template_item.show_in_website = 1
-				template_item.flags.dont_update_variants = True
-				template_item.flags.ignore_permissions = True
-				template_item.save()
+				if not template_item.show_in_website:
+					template_item.show_in_website = 1
+					template_item.flags.dont_update_variants = True
+					template_item.flags.ignore_permissions = True
+					template_item.save()
 
 	def update_variants(self):
 		if self.flags.dont_update_variants or \
@@ -667,10 +682,10 @@
 
 	def validate_stock_exists_for_template_item(self):
 		if self.stock_ledger_created() and self._doc_before_save:
-			if (self._doc_before_save.has_variants != self.has_variants
-                                or self._doc_before_save.variant_of != self.variant_of):
-				frappe.throw(_("Cannot change Variant properties after stock transction. You will have to make a new Item to do this.").format(self.name),
-                                    StockExistsForTemplate)
+			if (cint(self._doc_before_save.has_variants) != cint(self.has_variants)
+				or self._doc_before_save.variant_of != self.variant_of):
+				frappe.throw(_("Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.").format(self.name),
+					StockExistsForTemplate)
 
 			if self.has_variants or self.variant_of:
 				if not self.is_child_table_same('attributes'):
@@ -870,3 +885,20 @@
 	if not matched:
 		frappe.throw(
 			_("Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.").format(item))
+
+def get_item_defaults(item, company):
+	item_defaults = frappe.db.sql('''
+		select
+			i.item_name, i.description, i.stock_uom, i.name, i.is_stock_item, i.item_code, i.item_group,
+			id.expense_account, id.income_account, id.buying_cost_center, id.default_warehouse,
+			id.selling_cost_center, id.default_supplier
+		from
+			`tabItem` i LEFT JOIN `tabItem Default` id ON i.name = id.parent and id.company = %s
+		where
+			i.name = %s
+	''', (company, item), as_dict=1)
+	if item_defaults:
+		return item_defaults[0]
+	else:
+		return frappe.db.get_value("Item", item, ["name", "item_name", "description", "stock_uom",
+			"is_stock_item", "item_code", "item_group"], as_dict=1)
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index 3f0d7fa..6d6d282 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -35,9 +35,9 @@
 		item.update(properties)
 
 
-	if item.is_stock_item and not item.default_warehouse:
-		item.default_warehouse = "_Test Warehouse - _TC"
-
+	if item.is_stock_item:
+		for item_default in [doc for doc in item.get("item_defaults") if not doc.default_warehouse]:
+			item_default.default_warehouse = "_Test Warehouse - _TC"
 	item.insert()
 
 	return item
@@ -66,7 +66,7 @@
 			"warehouse": "_Test Warehouse - _TC",
 			"income_account": "Sales - _TC",
 			"expense_account": "_Test Account Cost for Goods Sold - _TC",
-			"cost_center": "_Test Cost Center 2 - _TC",
+			"cost_center": "_Test Cost Center - _TC",
 			"qty": 1.0,
 			"price_list_rate": 100.0,
 			"base_price_list_rate": 0.0,
@@ -144,15 +144,15 @@
 			})
 			item_attribute.save()
 
+		template = frappe.get_doc('Item', '_Test Variant Item')
+		template.item_group = "_Test Item Group D"
+		template.save()
+
 		variant = create_variant("_Test Variant Item", {"Test Size": "Extra Large"})
 		variant.item_code = "_Test Variant Item-XL"
 		variant.item_name = "_Test Variant Item-XL"
 		variant.save()
 
-		template = frappe.get_doc('Item', '_Test Variant Item')
-		template.item_group = "_Test Item Group D"
-		template.save()
-
 		variant = frappe.get_doc('Item', '_Test Variant Item-XL')
 		for fieldname in allow_fields:
 			self.assertEqual(template.get(fieldname), variant.get(fieldname))
@@ -199,7 +199,12 @@
 					"increment": 0.5
 				}
 			],
-			"default_warehouse": "_Test Warehouse - _TC",
+			"item_defaults": [
+				{
+					"default_warehouse": "_Test Warehouse - _TC",
+					"company": "_Test Company"
+				}
+			],
 			"has_variants": 1
 		})
 
@@ -305,5 +310,8 @@
 		item.item_group = "All Item Groups"
 		item.is_stock_item = is_stock_item or 1
 		item.valuation_rate = valuation_rate or 0.0
-		item.default_warehouse = warehouse or '_Test Warehouse - _TC'
+		item.append("item_defaults", {
+			"default_warehouse": warehouse or '_Test Warehouse - _TC',
+			"company": "_Test Company"
+		})
 		item.save()
diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json
index 7c5ad4f..fc44fa7 100644
--- a/erpnext/stock/doctype/item/test_records.json
+++ b/erpnext/stock/doctype/item/test_records.json
@@ -1,13 +1,9 @@
 [
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Item 1",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
@@ -17,6 +13,14 @@
   "apply_warehouse_wise_reorder_level": 1,
   "gst_hsn_code": "999800",
   "valuation_rate": 100,
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }],
   "reorder_levels": [
    {
     "material_request_type": "Purchase",
@@ -40,14 +44,10 @@
   "website_warehouse": "_Test Warehouse - _TC"
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Item 2",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
@@ -56,17 +56,21 @@
   "item_name": "_Test Item 2",
   "stock_uom": "_Test UOM",
   "show_in_website": 1,
-  "website_warehouse": "_Test Warehouse - _TC"
+  "website_warehouse": "_Test Warehouse - _TC",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Item Home Desktop 100 3",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
@@ -74,6 +78,14 @@
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Item Home Desktop 100",
   "valuation_rate": 100,
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }],
   "taxes": [
    {
     "doctype": "Item Tax",
@@ -85,53 +97,66 @@
   "stock_uom": "_Test UOM 1"
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Item Home Desktop 200 4",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item Home Desktop 200",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Item Home Desktop 200",
-  "stock_uom": "_Test UOM 1"
+  "stock_uom": "_Test UOM 1",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
   "description": "_Test Product Bundle Item 5",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 0,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Product Bundle Item",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Product Bundle Item",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test FG Item 6",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
   "item_code": "_Test FG Item",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test FG Item",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
   "description": "_Test Non Stock Item 7",
@@ -147,7 +172,6 @@
   "stock_uom": "_Test UOM"
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Serialized Item 8",
   "doctype": "Item",
   "has_batch_no": 0,
@@ -158,10 +182,17 @@
   "item_code": "_Test Serialized Item",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Serialized Item",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Serialized Item 9",
   "doctype": "Item",
   "has_batch_no": 0,
@@ -173,51 +204,63 @@
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Serialized Item With Series",
   "serial_no_series": "ABCD.#####",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Item Home Desktop Manufactured 10",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item Home Desktop Manufactured",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test Item Home Desktop Manufactured",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test FG Item 2 11",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
   "item_code": "_Test FG Item 2",
   "item_group": "_Test Item Group Desktops",
   "item_name": "_Test FG Item 2",
-  "stock_uom": "_Test UOM"
+  "stock_uom": "_Test UOM",
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }]
  },
  {
-  "default_warehouse": "_Test Warehouse - _TC",
   "description": "_Test Variant Item 12",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
@@ -226,6 +269,14 @@
   "item_name": "_Test Variant Item",
   "stock_uom": "_Test UOM",
   "has_variants": 1,
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }],
   "attributes": [
 	  {
 	  	"attribute": "Test Size"
@@ -242,14 +293,10 @@
   ]
  },
  {
-  "default_warehouse": "_Test Warehouse Group-C1 - _TC",
   "description": "_Test Item 1",
   "doctype": "Item",
-  "expense_account": "_Test Account Cost for Goods Sold - _TC",
-  "cost_center": "_Test Cost Center - _TC",
   "has_batch_no": 0,
   "has_serial_no": 0,
-  "income_account": "Sales - _TC",
   "inspection_required": 0,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
@@ -257,6 +304,14 @@
   "item_group": "_Test Item Group",
   "item_name": "_Test Item Warehouse Group Wise Reorder",
   "apply_warehouse_wise_reorder_level": 1,
+  "item_defaults": [{
+    "company": "_Test Company",
+    "default_warehouse": "_Test Warehouse Group-C1 - _TC",
+    "expense_account": "_Test Account Cost for Goods Sold - _TC",
+    "buying_cost_center": "_Test Cost Center - _TC",
+    "selling_cost_center": "_Test Cost Center - _TC",
+    "income_account": "Sales - _TC"
+  }],
   "reorder_levels": [
    {
 	"warehouse_group": "_Test Warehouse Group - _TC",
@@ -270,5 +325,4 @@
   "show_in_website": 1,
   "website_warehouse": "_Test Warehouse Group-C1 - _TC"
  }
-
 ]
diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.json b/erpnext/stock/doctype/item_alternative/item_alternative.json
index a13e307..fc3b976 100644
--- a/erpnext/stock/doctype/item_alternative/item_alternative.json
+++ b/erpnext/stock/doctype/item_alternative/item_alternative.json
@@ -41,7 +41,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -73,7 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -134,7 +134,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -143,6 +143,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.item_name",
    "fieldname": "item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -155,7 +156,7 @@
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "item_code.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -166,7 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -175,6 +176,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "alternative_item_code.item_name",
    "fieldname": "alternative_item_name", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -187,7 +189,7 @@
    "label": "Alternative Item Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "alternative_item_code.item_name", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -198,7 +200,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -212,7 +214,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-07 16:08:08.097107", 
+ "modified": "2018-05-16 22:43:35.377291",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Alternative", 
@@ -221,7 +223,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -241,7 +242,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -261,7 +261,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 8c02928..4b23cf0 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -226,7 +226,7 @@
  "hide_toolbar": 0, 
  "icon": "fa fa-edit", 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index 68edfc9..2807600 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -69,7 +69,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/stock/doctype/item_default/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/stock/doctype/item_default/__init__.py
diff --git a/erpnext/stock/doctype/item_default/item_default.json b/erpnext/stock/doctype/item_default/item_default.json
new file mode 100644
index 0000000..8ef6de7
--- /dev/null
+++ b/erpnext/stock/doctype/item_default/item_default.json
@@ -0,0 +1,449 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-03 02:29:24.444341", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Default Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_price_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Default Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Price List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "purchase_defaults", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Defaults", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "buying_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Buying Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Expense Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "selling_defaults", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Defaults", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "selling_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Selling Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-16 05:58:28.182186", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Item Default", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_default/item_default.py b/erpnext/stock/doctype/item_default/item_default.py
new file mode 100644
index 0000000..935f0ff
--- /dev/null
+++ b/erpnext/stock/doctype/item_default/item_default.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class ItemDefault(Document):
+	pass
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index fdc2df2..a342c0f 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -42,6 +42,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -130,6 +133,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -159,6 +163,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -189,6 +194,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -219,6 +225,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -251,6 +258,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -283,6 +291,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -311,6 +320,40 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "item_code.brand",
+   "fieldname": "brand", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Brand", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -340,6 +383,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -369,6 +413,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
    "unique": 0
   }
  ], 
@@ -383,7 +428,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-01 13:03:53.397382", 
+ "modified": "2018-05-16 22:43:08.371709",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 
@@ -391,7 +436,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -411,7 +455,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
diff --git a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
index 6147db9..f1e1fd3 100644
--- a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
@@ -70,7 +70,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index 43eb98d..fb4c558 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -142,7 +142,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 1, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json
index 163b427..6cff8e0 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.json
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.json
@@ -75,7 +75,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index e9c9d62..6c1bd09 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json
@@ -68,7 +68,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json
index 9da66a2..93005c0 100644
--- a/erpnext/stock/doctype/item_variant/item_variant.json
+++ b/erpnext/stock/doctype/item_variant/item_variant.json
@@ -70,7 +70,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/item_website_specification/item_website_specification.json b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
index 3c32adb..618c9f0 100644
--- a/erpnext/stock/doctype/item_website_specification/item_website_specification.json
+++ b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
@@ -68,7 +68,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
index d65da88..f49c147 100644
--- a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
+++ b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
@@ -168,7 +168,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index caf4e49..bd49adf 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -28,7 +28,40 @@
 				filters: {'company': doc.company}
 			}
 		}
-	}
+	},
+	get_item_data: function(frm, item) {
+		frm.call({
+			method: "erpnext.stock.get_item_details.get_item_details",
+			child: item,
+			args: {
+				args: {
+					item_code: item.item_code,
+					warehouse: item.warehouse,
+					doctype: frm.doc.doctype,
+					buying_price_list: frappe.defaults.get_default('buying_price_list'),
+					currency: frappe.defaults.get_default('Currency'),
+					name: frm.doc.name,
+					qty: item.qty || 1,
+					stock_qty: item.stock_qty,
+					company: frm.doc.company,
+					conversion_rate: 1,
+					name: frm.doc.name,
+					material_request_type: frm.doc.material_request_type,
+					plc_conversion_rate: 1,
+					rate: item.rate,
+					conversion_factor: item.conversion_factor
+				}
+			},
+			callback: function(r) {
+				const d = item;
+				if(!r.exc) {
+					$.each(r.message, function(k, v) {
+						if(!d[k]) d[k] = v;
+					});
+				}
+			}
+		});
+	},
 });
 
 frappe.ui.form.on("Material Request Item", {
@@ -37,10 +70,21 @@
 		if (flt(d.qty) < flt(d.min_order_qty)) {
 			frappe.msgprint(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
 		}
+
+		const item = locals[doctype][name];
+		frm.events.get_item_data(frm, item);
+	},
+
+	rate: function(frm, doctype, name) {
+		const item = locals[doctype][name];
+		frm.events.get_item_data(frm, item);
 	},
 
 	item_code: function(frm, doctype, name) {
+		const item = locals[doctype][name];
+		item.rate = 0
 		set_schedule_date(frm);
+		frm.events.get_item_data(frm, item);
 	},
 
 	schedule_date: function(frm, cdt, cdn) {
@@ -186,6 +230,10 @@
 		this.get_terms();
 	},
 
+	item_code: function() {
+		// to override item code trigger from transaction.js
+	},
+
 	validate_company_and_party: function(party_field) {
 		return true;
 	},
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index d4dc523..df40654 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -93,6 +93,8 @@
 		# frappe.db.set(self, 'status', 'Submitted')
 		self.update_requested_qty()
 		self.update_requested_qty_in_production_plan()
+		if self.material_request_type == 'Purchase':
+			self.validate_budget()
 
 	def before_save(self):
 		self.set_status(update=True)
diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py
index c3fe8f3..6cfb8af 100644
--- a/erpnext/stock/doctype/material_request/material_request_dashboard.py
+++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py
@@ -7,7 +7,7 @@
 		'transactions': [
 			{
 				'label': _('Related'),
-				'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order']
+				'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order', "Stock Entry"]
 			},
 			{
 				'label': _('Manufacturing'),
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index d31d9e7..5dc1579 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -44,11 +45,13 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,10 +76,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,11 +110,13 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -136,10 +143,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -168,11 +177,13 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "250px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -198,10 +209,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -228,10 +241,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -257,14 +272,16 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 2, 
+   "columns": 1, 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -289,11 +306,81 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "80px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 1, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "70px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
+   "width": "70px"
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -321,10 +408,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -354,11 +443,43 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -388,17 +509,19 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -406,9 +529,11 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -417,16 +542,18 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -434,57 +561,25 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "70px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "70px"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "conversion_factor", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM Conversion Factor", 
+   "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -511,10 +606,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -540,10 +637,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -573,10 +672,12 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -606,11 +707,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "100px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -638,10 +741,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -668,10 +773,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -698,10 +805,12 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -729,10 +838,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -760,10 +871,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -790,10 +903,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -818,10 +933,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -850,11 +967,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -883,11 +1002,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0, 
    "width": "70px"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -914,10 +1035,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -945,10 +1068,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -976,6 +1101,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -989,8 +1115,8 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-12 05:51:39.954530", 
- "modified_by": "Administrator", 
+ "modified": "2018-06-03 23:08:24.146513", 
+ "modified_by": "sushant@digithinkit.com", 
  "module": "Stock", 
  "name": "Material Request Item", 
  "owner": "Administrator", 
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index f9c1635..6c8b2b1 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -665,7 +665,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 74dfa05..fc53794 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -18,9 +18,12 @@
 		from `tabProduct Bundle Item` t1, `tabProduct Bundle` t2
 		where t2.new_item_code=%s and t1.parent = t2.name order by t1.idx""", item_code, as_dict=1)
 
-def get_packing_item_details(item):
-	return frappe.db.sql("""select item_name, description, stock_uom, default_warehouse from `tabItem`
-		where name = %s""", item, as_dict = 1)[0]
+def get_packing_item_details(item, company):
+	return frappe.db.sql("""
+		select i.item_name, i.description, i.stock_uom, id.default_warehouse
+		from `tabItem` i LEFT JOIN `tabItem Default` id ON id.parent=i.name and id.company=%s
+		where i.name = %s""",
+		(company, item), as_dict = 1)[0]
 
 def get_bin_qty(item, warehouse):
 	det = frappe.db.sql("""select actual_qty, projected_qty from `tabBin`
@@ -28,12 +31,13 @@
 	return det and det[0] or frappe._dict()
 
 def update_packing_list_item(doc, packing_item_code, qty, main_item_row, description):
-	item = get_packing_item_details(packing_item_code)
+	item = get_packing_item_details(packing_item_code, doc.company)
 
 	# check if exists
 	exists = 0
 	for d in doc.get("packed_items"):
-		if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and d.parent_detail_docname == main_item_row.name and d.description == description:
+		if d.parent_item == main_item_row.item_code and d.item_code == packing_item_code and\
+				d.parent_detail_docname == main_item_row.name and d.description == description:
 			pi, exists = d, 1
 			break
 
@@ -49,7 +53,8 @@
 	pi.qty = flt(qty)
 	pi.description = description
 	if not pi.warehouse:
-		pi.warehouse = item.default_warehouse or main_item_row.warehouse
+		pi.warehouse = (main_item_row.warehouse
+			if (doc.get('is_pos') or not item.default_warehouse) else item.default_warehouse)
 	if not pi.batch_no:
 		pi.batch_no = cstr(main_item_row.get("batch_no"))
 	if not pi.target_warehouse:
diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
index 009244c..1b22f13 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
@@ -430,7 +430,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/price_list_country/price_list_country.json b/erpnext/stock/doctype/price_list_country/price_list_country.json
index a7cef6f6..a0020c5 100644
--- a/erpnext/stock/doctype/price_list_country/price_list_country.json
+++ b/erpnext/stock/doctype/price_list_country/price_list_country.json
@@ -42,7 +42,7 @@
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 791b253..9289d69 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -35,6 +35,10 @@
 
 	},
 
+	onload_post_render: function(frm) {
+		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
+	},
+
 	refresh: function(frm) {
 		if(frm.doc.company) {
 			frm.trigger("toggle_display_account_head");
@@ -62,9 +66,22 @@
 		this._super();
 		if(this.frm.doc.docstatus===1) {
 			this.show_stock_ledger();
-			if (erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) {
-				this.show_general_ledger();
-			}
+			//removed for temporary
+			this.show_general_ledger();
+
+			this.frm.add_custom_button(__('Asset'), function() {
+				frappe.route_options = {
+					purchase_receipt: me.frm.doc.name,
+				};
+				frappe.set_route("List", "Asset");
+			}, __("View"));
+
+			this.frm.add_custom_button(__('Asset Movement'), function() {
+				frappe.route_options = {
+					reference_name: me.frm.doc.name,
+				};
+				frappe.set_route("List", "Asset Movement");
+			}, __("View"));
 		}
 
 		if(!this.frm.doc.is_return && this.frm.doc.status!="Closed") {
@@ -213,11 +230,6 @@
 	}
 }
 
-cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
-	if(cint(frappe.boot.notification_settings.purchase_receipt))
-		cur_frm.email_doc(frappe.boot.notification_settings.purchase_receipt_message);
-}
-
 frappe.provide("erpnext.buying");
 
 frappe.ui.form.on("Purchase Receipt", "is_subcontracted", function(frm) {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 4f9f301..f94e5a5 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -40,7 +40,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -71,7 +71,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -104,7 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -138,7 +138,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -172,7 +172,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -183,6 +183,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "supplier", 
+   "fetch_from": "supplier.supplier_name",
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -195,7 +196,7 @@
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "supplier.supplier_name", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -205,7 +206,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -236,7 +237,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -267,7 +268,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -303,7 +304,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -339,7 +340,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -372,7 +373,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -407,7 +408,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -439,7 +440,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -472,7 +473,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -503,7 +504,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -534,7 +535,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -565,7 +566,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -596,7 +597,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -626,7 +627,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -656,7 +657,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -686,7 +687,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -716,7 +717,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -749,7 +750,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -780,7 +781,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -811,7 +812,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -844,7 +845,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -878,7 +879,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -909,7 +910,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -941,7 +942,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -973,7 +974,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1005,7 +1006,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1035,7 +1036,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1067,7 +1068,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1100,7 +1101,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1132,7 +1133,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1162,6 +1163,37 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0,
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
   }, 
@@ -1194,7 +1226,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1228,7 +1260,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -1258,7 +1290,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1290,7 +1322,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1323,7 +1355,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1354,7 +1386,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1387,7 +1419,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1421,7 +1453,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1451,7 +1483,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1483,7 +1515,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1513,7 +1545,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1546,7 +1578,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1577,7 +1609,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1608,7 +1640,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1641,7 +1673,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1674,7 +1706,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1707,7 +1739,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1740,7 +1772,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1770,7 +1802,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -1804,7 +1836,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1837,7 +1869,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1869,7 +1901,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1901,7 +1933,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1934,7 +1966,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1966,7 +1998,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -1996,7 +2028,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2027,7 +2059,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2059,7 +2091,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2089,7 +2121,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2122,7 +2154,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2154,7 +2186,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2187,7 +2219,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2220,7 +2252,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2250,7 +2282,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2283,7 +2315,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2315,7 +2347,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2347,7 +2379,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2380,7 +2412,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2413,7 +2445,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2445,7 +2477,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2479,7 +2511,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2514,7 +2546,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2549,7 +2581,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50px"
   }, 
@@ -2583,7 +2615,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2615,7 +2647,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2647,7 +2679,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2679,7 +2711,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2714,7 +2746,7 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2749,7 +2781,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2783,7 +2815,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "150px"
   }, 
@@ -2816,7 +2848,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2847,7 +2879,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -2879,7 +2911,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2910,7 +2942,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2942,7 +2974,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -2973,7 +3005,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3004,7 +3036,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3037,7 +3069,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3068,15 +3100,74 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Group same items",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_97",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "fieldname": "other_details", 
    "fieldtype": "HTML", 
    "hidden": 1, 
@@ -3101,7 +3192,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "30%"
   }, 
@@ -3134,7 +3225,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3164,7 +3255,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3196,7 +3287,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3228,7 +3319,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0
   }, 
   {
@@ -3258,7 +3349,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "50%"
   }, 
@@ -3293,7 +3384,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }, 
@@ -3328,7 +3419,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
+   "translatable": 0,
    "unique": 0, 
    "width": "100px"
   }
@@ -3345,7 +3436,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-03-10 07:36:31.378606", 
+ "modified": "2018-05-28 02:59:59.609643",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
@@ -3353,7 +3444,6 @@
  "permissions": [
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3373,7 +3463,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3393,7 +3482,6 @@
   }, 
   {
    "amend": 1, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -3413,7 +3501,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -3433,7 +3520,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 46eee31..fa441b5 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -13,6 +13,8 @@
 from erpnext.accounts.utils import get_account_currency
 from frappe.desk.notifications import clear_doctype_notifications
 from erpnext.buying.utils import check_for_closed_status
+from six import iteritems
+from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -120,6 +122,8 @@
 		self.update_prevdoc_status()
 		if self.per_billed < 100:
 			self.update_billing_status()
+		else:
+			self.status = "Completed"
 
 		
 		# Updating stock ledger should always be called after updating prevdoc status,
@@ -253,6 +257,7 @@
 					d.rejected_warehouse not in warehouse_with_no_account:
 						warehouse_with_no_account.append(d.warehouse)
 
+		self.get_asset_gl_entry(gl_entries)
 		# Cost center-wise amount breakup for other charges included for valuation
 		valuation_tax = {}
 		for tax in self.get("taxes"):
@@ -281,7 +286,7 @@
 			total_valuation_amount = sum(valuation_tax.values())
 			amount_including_divisional_loss = negative_expense_to_be_booked
 			i = 1
-			for cost_center, amount in valuation_tax.items():
+			for cost_center, amount in iteritems(valuation_tax):
 				if i == len(valuation_tax):
 					applicable_amount = amount_including_divisional_loss
 				else:
@@ -305,6 +310,44 @@
 				"\n".join(warehouse_with_no_account))
 
 		return process_gl_map(gl_entries)
+		
+	def get_asset_gl_entry(self, gl_entries):
+		for d in self.get("items"):
+			if d.is_fixed_asset:
+				asset_accounts = self.get_company_default(["capital_work_in_progress_account",
+					"asset_received_but_not_billed"])
+
+				# CWIP entry
+				cwip_account = get_asset_category_account(d.asset,
+					'capital_work_in_progress_account') or asset_accounts[0]
+
+				asset_amount = flt(d.net_amount) + flt(d.item_tax_amount/self.conversion_rate)
+				base_asset_amount = flt(d.base_net_amount + d.item_tax_amount)
+
+				cwip_account_currency = get_account_currency(cwip_account)
+				gl_entries.append(self.get_gl_dict({
+					"account": cwip_account,
+					"against": asset_accounts[1],
+					"cost_center": d.cost_center,
+					"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+					"debit": base_asset_amount,
+					"debit_in_account_currency": (base_asset_amount
+						if cwip_account_currency == self.company_currency else asset_amount)
+				}))
+
+				# Asset received but not billed
+				asset_rbnb_currency = get_account_currency(asset_accounts[1])
+				gl_entries.append(self.get_gl_dict({
+					"account": asset_accounts[1],
+					"against": asset_accounts[0],
+					"cost_center": d.cost_center,
+					"remarks": self.get("remarks") or _("Accounting Entry for Asset"),
+					"credit": base_asset_amount,
+					"credit_in_account_currency": (base_asset_amount
+						if asset_rbnb_currency == self.company_currency else asset_amount)
+				}))
+
+		return gl_entries
 
 	def update_status(self, status):
 		self.set_status(update=True, status = status)
@@ -393,6 +436,8 @@
 				"parent": "purchase_receipt",
 				"purchase_order_item": "po_detail",
 				"purchase_order": "purchase_order",
+				"is_fixed_asset": "is_fixed_asset",
+				"asset": "asset",
 			},
 			"postprocess": update_item,
 			"filter": lambda d: abs(d.qty) - abs(invoiced_qty_map.get(d.name, 0))<=0
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 9ade1af..7ed7dd6 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -5,8 +5,9 @@
 		'fieldname': 'purchase_receipt_no',
 		'non_standard_fieldnames': {
 			'Purchase Invoice': 'purchase_receipt',
+			'Asset': 'purchase_receipt',
 			'Landed Cost Voucher': 'receipt_document',
-			'Subscription': 'reference_document'
+			'Auto Repeat': 'reference_document'
 		},
 		'internal_links': {
 			'Purchase Order': ['items', 'purchase_order'],
@@ -16,7 +17,7 @@
 		'transactions': [
 			{
 				'label': _('Related'),
-				'items': ['Purchase Invoice', 'Landed Cost Voucher']
+				'items': ['Purchase Invoice', 'Landed Cost Voucher', 'Asset']
 			},
 			{
 				'label': _('Reference'),
@@ -28,7 +29,7 @@
 			},
 			{
 				'label': _('Subscription'),
-				'items': ['Subscription']
+				'items': ['Auto Repeat']
 			},
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index d9f40cc..992a22a 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 
-from __future__ import unicode_literals
+
 import unittest
 import frappe, erpnext
 import frappe.defaults
@@ -12,7 +12,7 @@
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoDuplicateError
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.stock.doctype.item.test_item import make_item
-
+from six import iteritems
 class TestPurchaseReceipt(unittest.TestCase):
 	def setUp(self):
 		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
@@ -180,7 +180,7 @@
 	def test_purchase_return_for_serialized_items(self):
 		def _check_serial_no_values(serial_no, field_values):
 			serial_no = frappe.get_doc("Serial No", serial_no)
-			for field, value in field_values.items():
+			for field, value in iteritems(field_values):
 				self.assertEqual(cstr(serial_no.get(field)), value)
 
 		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -217,7 +217,7 @@
 		return_pr = make_purchase_receipt(item_code=item_code, qty=-10, uom="Unit",
 			stock_uom="Box", conversion_factor=0.1, is_return=1, return_against=pr.name)
 
-		self.assertEquals(abs(return_pr.items[0].stock_qty), 1.0)
+		self.assertEqual(abs(return_pr.items[0].stock_qty), 1.0)
 
 	def test_closed_purchase_receipt(self):
 		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_purchase_receipt_status
@@ -273,7 +273,7 @@
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
-		item_code = frappe.db.get_value('Item', {'has_serial_no': 1})
+		item_code = frappe.db.get_value('Item', {'has_serial_no': 1, 'is_fixed_asset': 0})
 		if not item_code:
 			item = make_item("Test Serial Item 1", dict(has_serial_no=1))
 			item_code = item.name
@@ -289,13 +289,60 @@
 			serial_no=serial_no, basic_rate=100, do_not_submit=True)
 		self.assertRaises(SerialNoDuplicateError, se.submit)
 
+	def test_serialized_asset_item(self):
+		asset_item = "Test Serialized Asset Item"
+
+		if not frappe.db.exists('Item', asset_item):
+			asset_category = frappe.get_all('Asset Category')
+
+			if asset_category:
+				asset_category = asset_category[0].name
+
+			if not asset_category:
+				doc = frappe.get_doc({
+					'doctype': 'Asset Category',
+					'asset_category_name': 'Test Asset Category',
+					'depreciation_method': 'Straight Line',
+					'total_number_of_depreciations': 12,
+					'frequency_of_depreciation': 1,
+					'accounts': [{
+						'company_name': '_Test Company',
+						'fixed_asset_account': '_Test Fixed Asset - _TC',
+						'accumulated_depreciation_account': 'Depreciation - _TC',
+						'depreciation_expense_account': 'Depreciation - _TC'
+					}]
+				}).insert()
+
+				asset_category = doc.name
+
+			asset_item = make_item(asset_item, {'is_stock_item':0,
+				'stock_uom': 'Box', 'is_fixed_asset': 1, 'has_serial_no': 1,
+				'asset_category': asset_category, 'serial_no_series': 'ABC.###'})
+
+		if not frappe.db.exists('Location', 'Test Location'):
+			frappe.get_doc({
+				'doctype': 'Location',
+				'location_name': 'Test Location'
+			}).insert()
+
+		pr = make_purchase_receipt(item_code=asset_item, qty=3)
+		asset = frappe.db.get_value('Asset', {'purchase_receipt': pr.name}, 'name')
+		asset_movement = frappe.db.get_value('Asset Movement', {'reference_name': pr.name}, 'name')
+		serial_nos = frappe.get_all('Serial No', {'asset': asset}, 'name')
+
+		self.assertEquals(len(serial_nos), 3)
+		pr.cancel()
+		serial_nos = frappe.get_all('Serial No', {'asset': asset}, 'name') or []
+		self.assertEquals(len(serial_nos), 0)
+		frappe.db.sql("delete from `tabLocation")
+		frappe.db.sql("delete from `tabAsset Category`")
+		frappe.db.sql("delete from `tabAsset`")
 
 def get_gl_entries(voucher_type, voucher_no):
 	return frappe.db.sql("""select account, debit, credit
 		from `tabGL Entry` where voucher_type=%s and voucher_no=%s
 		order by account desc""", (voucher_type, voucher_no), as_dict=1)
 
-
 def make_purchase_receipt(**args):
 	frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 	pr = frappe.new_doc("Purchase Receipt")
@@ -325,7 +372,8 @@
 		"conversion_factor": args.conversion_factor or 1.0,
 		"serial_no": args.serial_no,
 		"stock_uom": args.stock_uom or "_Test UOM",
-		"uom": args.uom or "_Test UOM"
+		"uom": args.uom or "_Test UOM",
+		"asset_location": "Test Location" if args.item_code == "Test Serialized Asset Item" else ""
 	})
 
 	if not args.do_not_save:
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 754bd71..9607fb9 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -632,6 +632,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.retain_sample", 
    "fieldname": "retain_sample", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -644,7 +645,7 @@
    "label": "Retain Sample", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "item_code.retain_sample", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -665,6 +666,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "retain_sample", 
+   "fetch_from": "item_code.sample_quantity", 
    "fieldname": "sample_quantity", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -677,7 +679,7 @@
    "label": "Sample Quantity", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "item_code.sample_quantity", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -1583,6 +1585,103 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Fixed Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_location", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_order", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -2395,7 +2494,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-22 15:15:38.793425", 
+ "modified": "2018-05-25 13:42:05.061386", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
diff --git a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
index a3b43e9..94aecfe 100644
--- a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -395,7 +395,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 1ff0332..edd29a2 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -676,6 +676,190 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "asset_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "asset", 
+   "fieldname": "asset_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nIssue\nReceipt\nTransfer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_24", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "location", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Location", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Location", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "delivery_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1342,7 +1526,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 11:51:38.163506", 
+ "modified": "2018-05-10 23:38:20.646770", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index a6d2a0b..67871c3 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -4,11 +4,12 @@
 from __future__ import unicode_literals
 import frappe
 
+from frappe.model.naming import make_autoname
 from frappe.utils import cint, cstr, flt, add_days, nowdate, getdate
 from frappe import _, ValidationError
 
 from erpnext.controllers.stock_controller import StockController
-
+from six.moves import map
 class SerialNoCannotCreateDirectError(ValidationError): pass
 class SerialNoCannotCannotChangeError(ValidationError): pass
 class SerialNoNotRequiredError(ValidationError): pass
@@ -173,7 +174,7 @@
 				serial_nos = map(lambda i: new if i.upper()==old.upper() else i, item[1].split('\n'))
 				frappe.db.sql("""update `tab%s` set serial_no = %s
 					where name=%s""" % (dt[0], '%s', '%s'),
-					('\n'.join(serial_nos), item[0]))
+					('\n'.join(list(serial_nos)), item[0]))
 
 	def on_stock_ledger_entry(self):
 		if self.via_stock_ledger and not self.get("__islocal"):
@@ -200,7 +201,7 @@
 				frappe.throw(_("Serial No {0} quantity {1} cannot be a fraction").format(sle.item_code, sle.actual_qty))
 
 			if len(serial_nos) and len(serial_nos) != abs(cint(sle.actual_qty)):
-				frappe.throw(_("{0} Serial Numbers required for Item {1}. You have provided {2}.").format(sle.actual_qty, sle.item_code, len(serial_nos)),
+				frappe.throw(_("{0} Serial Numbers required for Item {1}. You have provided {2}.").format(abs(sle.actual_qty), sle.item_code, len(serial_nos)),
 					SerialNoQtyError)
 
 			if len(serial_nos) != len(set(serial_nos)):
@@ -283,25 +284,31 @@
 def update_serial_nos(sle, item_det):
 	if sle.is_cancelled == "No" and not sle.serial_no and sle.actual_qty > 0 \
 			and item_det.has_serial_no == 1 and item_det.serial_no_series:
-		from frappe.model.naming import make_autoname
-		serial_nos = []
-		for i in range(cint(sle.actual_qty)):
-			serial_nos.append(make_autoname(item_det.serial_no_series, "Serial No"))
-		frappe.db.set(sle, "serial_no", "\n".join(serial_nos))
+		serial_nos = get_auto_serial_nos(item_det.serial_no_series, sle.actual_qty)
+		frappe.db.set(sle, "serial_no", serial_nos)
 		validate_serial_no(sle, item_det)
 
 	if sle.serial_no:
-		serial_nos = get_serial_nos(sle.serial_no)
-		for serial_no in serial_nos:
-			if frappe.db.exists("Serial No", serial_no):
-				sr = frappe.get_doc("Serial No", serial_no)
-				sr.via_stock_ledger = True
-				sr.item_code = sle.item_code
-				sr.warehouse = sle.warehouse if sle.actual_qty > 0 else None
-				sr.batch_no = sle.batch_no
-				sr.save(ignore_permissions=True)
-			elif sle.actual_qty > 0:
-				make_serial_no(serial_no, sle)
+		auto_make_serial_nos(sle)
+
+def get_auto_serial_nos(serial_no_series, qty):
+	serial_nos = []
+	for i in range(cint(qty)):
+		serial_nos.append(make_autoname(serial_no_series, "Serial No"))
+
+	return "\n".join(serial_nos)
+
+def auto_make_serial_nos(args):
+	serial_nos = get_serial_nos(args.get('serial_no'))
+	for serial_no in serial_nos:
+		if frappe.db.exists("Serial No", serial_no):
+			sr = frappe.get_doc("Serial No", serial_no)
+			sr.via_stock_ledger = True
+			sr.item_code = args.get('item_code')
+			sr.warehouse = args.get('warehouse') if args.get('actual_qty', 0) > 0 else None
+			sr.save(ignore_permissions=True)
+		elif args.get('actual_qty', 0) > 0:
+			make_serial_no(serial_no, args)
 
 def get_item_details(item_code):
 	return frappe.db.sql("""select name, has_batch_no, docstatus,
@@ -312,21 +319,27 @@
 	return [s.strip() for s in cstr(serial_no).strip().upper().replace(',', '\n').split('\n')
 		if s.strip()]
 
-def make_serial_no(serial_no, sle):
+def make_serial_no(serial_no, args):
 	sr = frappe.new_doc("Serial No")
 	sr.warehouse = None
 	sr.dont_update_if_missing.append("warehouse")
 	sr.flags.ignore_permissions = True
 
 	sr.serial_no = serial_no
-	sr.item_code = sle.item_code
-	sr.company = sle.company
-	sr.batch_no = sle.batch_no
-	sr.via_stock_ledger = True
-	sr.insert()
+	sr.item_code = args.get('item_code')
+	sr.company = args.get('company')
+	sr.via_stock_ledger = args.get('via_stock_ledger') or True
+	sr.asset = args.get('asset')
 
-	sr.warehouse = sle.warehouse
-	sr.save()
+	if args.get('purchase_document_type'):
+		sr.purchase_document_type = args.get('purchase_document_type')
+		sr.purchase_document_no = args.get('purchase_document_no')
+
+	sr.insert()
+	if args.get('warehouse'):
+		sr.warehouse = args.get('warehouse')
+		sr.save()
+
 	frappe.msgprint(_("Serial No {0} created").format(sr.name))
 	return sr.name
 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 7452da8..359d834 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -156,6 +156,29 @@
 				})
 			}, __("Get items from"));
 		}
+		if (frm.doc.docstatus===0 && frm.doc.purpose == "Material Issue") {
+			frm.add_custom_button(__('Expired Batches'), function() {
+				frappe.call({
+					method: "erpnext.stock.doctype.stock_entry.stock_entry.get_expired_batch_items",
+					callback: function(r) {
+						if (!r.exc && r.message) {
+							frm.set_value("items", []);
+							r.message.forEach(function(element) {
+								let d = frm.add_child("items");
+								d.item_code = element.item;
+								d.s_warehouse = element.warehouse;
+								d.qty = element.qty;
+								d.uom = element.stock_uom;
+								d.conversion_factor = 1;
+								d.batch_no = element.batch_no;
+								d.transfer_qty = element.qty;
+								frm.refresh_fields();
+							});
+						}
+					}
+				});
+			}, __("Get items from"));
+		}
 
 		if (frm.doc.company) {
 			frm.trigger("toggle_display_account_head");
@@ -350,7 +373,7 @@
 
 	target_warehouse_address: function(frm) {
 		erpnext.utils.get_address_display(frm, 'target_warehouse_address', 'target_address_display', false);
-	},
+	}
 })
 
 frappe.ui.form.on('Stock Entry Detail', {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 233138f..586e21d 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -10,11 +10,12 @@
 from erpnext.stock.stock_ledger import get_previous_sle, NegativeStockError, get_valuation_rate
 from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor
 from erpnext.stock.doctype.batch.batch import get_batch_no, set_batch_nos, get_batch_qty
+from erpnext.stock.doctype.item.item import get_item_defaults
 from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
 from erpnext.stock.utils import get_bin
 import json
 
-from six import string_types
+from six import string_types, itervalues, iteritems
 
 class IncorrectValuationRateError(frappe.ValidationError): pass
 class DuplicateEntryForWorkOrderError(frappe.ValidationError): pass
@@ -251,10 +252,13 @@
 	def check_if_operations_completed(self):
 		"""Check if Time Sheets are completed against before manufacturing to capture operating costs."""
 		prod_order = frappe.get_doc("Work Order", self.work_order)
+		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
+			"overproduction_percentage_for_work_order"))
 
 		for d in prod_order.get("operations"):
 			total_completed_qty = flt(self.fg_completed_qty) + flt(prod_order.produced_qty)
-			if total_completed_qty > flt(d.completed_qty):
+			completed_qty = d.completed_qty + (allowance_percentage/100 * d.completed_qty)
+			if total_completed_qty > flt(completed_qty):
 				frappe.throw(_("Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs")
 					.format(d.idx, d.operation, total_completed_qty, self.work_order), OperationsNotCompleteError)
 
@@ -437,7 +441,11 @@
 	def validate_purchase_order(self):
 		"""Throw exception if more raw material is transferred against Purchase Order than in
 		the raw materials supplied table"""
-		if self.purpose == "Subcontract" and self.purchase_order:
+		backflush_raw_materials_based_on = frappe.db.get_single_value("Buying Settings",
+			"backflush_raw_materials_of_subcontract_based_on")
+
+		if (self.purpose == "Subcontract" and self.purchase_order and
+			backflush_raw_materials_based_on == 'BOM'):
 			purchase_order = frappe.get_doc("Purchase Order", self.purchase_order)
 			for se_item in self.items:
 				item_code = se_item.original_item or se_item.item_code
@@ -468,8 +476,11 @@
 	def validate_finished_goods(self):
 		"""validation: finished good quantity should be same as manufacturing quantity"""
 		items_with_target_warehouse = []
+		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
+			"overproduction_percentage_for_work_order"))
+
 		for d in self.get('items'):
-			if self.purpose != "Subcontract" and d.bom_no and flt(d.transfer_qty) != flt(self.fg_completed_qty) and (d.t_warehouse != getattr(self, "pro_doc", frappe._dict()).scrap_warehouse):
+			if self.purpose != "Subcontract" and d.bom_no and flt(d.transfer_qty) > flt(self.fg_completed_qty) and (d.t_warehouse != getattr(self, "pro_doc", frappe._dict()).scrap_warehouse):
 				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
 					format(d.idx, d.transfer_qty, self.fg_completed_qty))
 
@@ -477,8 +488,14 @@
 				items_with_target_warehouse.append(d.item_code)
 
 		if self.work_order and self.purpose == "Manufacture":
-			production_item = frappe.db.get_value("Work Order",
-				self.work_order, "production_item")
+			production_item, wo_qty = frappe.db.get_value("Work Order",
+				self.work_order, ["production_item", "qty"])
+
+			allowed_qty = wo_qty + (allowance_percentage/100 * wo_qty)
+			if self.fg_completed_qty > allowed_qty:
+				frappe.throw(_("For quantity {0} should not be grater than work order quantity {1}")
+					.format(flt(self.fg_completed_qty), wo_qty))
+
 			if production_item not in items_with_target_warehouse:
 				frappe.throw(_("Finished Item {0} must be entered for Manufacture type entry")
 					.format(production_item))
@@ -562,14 +579,15 @@
 					pro_doc.run_method("update_planned_qty")
 
 	def get_item_details(self, args=None, for_update=False):
-		item = frappe.db.sql("""select stock_uom, description, image, item_name,
-				expense_account, buying_cost_center, item_group, has_serial_no,
-				has_batch_no, sample_quantity
-			from `tabItem`
-			where name = %s
-				and disabled=0
-				and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)""",
-			(args.get('item_code'), nowdate()), as_dict = 1)
+		item = frappe.db.sql("""select i.stock_uom, i.description, i.image, i.item_name, i.item_group,
+				i.has_batch_no, i.sample_quantity, i.has_serial_no,
+				id.expense_account, id.buying_cost_center
+			from `tabItem` i LEFT JOIN `tabItem Default` id ON i.name=id.parent and id.company=%s
+			where i.name=%s
+				and i.disabled=0
+				and (i.end_of_life is null or i.end_of_life='0000-00-00' or i.end_of_life > %s)""",
+			(self.company, args.get('item_code'), nowdate()), as_dict = 1)
+
 		if not item:
 			frappe.throw(_("Item {0} is not active or end of life has been reached").format(args.get("item_code")))
 
@@ -637,7 +655,7 @@
 				if self.work_order and self.purpose == "Material Transfer for Manufacture":
 					item_dict = self.get_pending_raw_materials()
 					if self.to_warehouse and self.pro_doc:
-						for item in item_dict.values():
+						for item in itervalues(item_dict):
 							item["to_warehouse"] = self.pro_doc.wip_warehouse
 					self.add_to_stock_entry_detail(item_dict)
 
@@ -664,7 +682,7 @@
 							from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
 							where po.name = poitemsup.parent
 								and po.name = %s""",self.purchase_order))
-					for item in item_dict.values():
+					for item in itervalues(item_dict):
 						if self.pro_doc and not self.pro_doc.skip_transfer:
 							item["from_warehouse"] = self.pro_doc.wip_warehouse
 						#Get Reserve Warehouse from PO
@@ -676,7 +694,7 @@
 
 					if self.purpose != "Subcontract":
 						scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty)
-						for item in scrap_item_dict.values():
+						for item in itervalues(scrap_item_dict):
 							if self.pro_doc and self.pro_doc.scrap_warehouse:
 								item["to_warehouse"] = self.pro_doc.scrap_warehouse
 
@@ -716,12 +734,11 @@
 			item_code = frappe.db.get_value("BOM", self.bom_no, "item")
 			to_warehouse = self.to_warehouse
 
-		item = frappe.db.get_value("Item", item_code, ["item_name",
-			"description", "stock_uom", "expense_account", "buying_cost_center", "name", "default_warehouse"], as_dict=1)
+		item = get_item_defaults(item_code, self.company)
 
 		if not self.work_order and not to_warehouse:
 			# in case of BOM
-			to_warehouse = item.default_warehouse
+			to_warehouse = item.get("default_warehouse")
 
 		self.add_to_stock_entry_detail({
 			item.name: {
@@ -731,8 +748,8 @@
 				"item_name": item.item_name,
 				"description": item.description,
 				"stock_uom": item.stock_uom,
-				"expense_account": item.expense_account,
-				"cost_center": item.buying_cost_center,
+				"expense_account": item.get("expense_account"),
+				"cost_center": item.get("buying_cost_center"),
 			}
 		}, bom_no = self.bom_no)
 
@@ -744,7 +761,7 @@
 			fetch_exploded = self.use_multi_level_bom)
 
 		used_alternative_items = get_used_alternative_items(work_order = self.work_order)
-		for item in item_dict.values():
+		for item in itervalues(item_dict):
 			# if source warehouse presents in BOM set from_warehouse as bom source_warehouse
 			if item["allow_alternative_item"]:
 				item["allow_alternative_item"] = frappe.db.get_value('Work Order',
@@ -769,7 +786,7 @@
 		item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=qty,
 			fetch_exploded = 0, fetch_scrap_items = 1)
 
-		for item in item_dict.values():
+		for item in itervalues(item_dict):
 			item.from_warehouse = ""
 		return item_dict
 
@@ -782,8 +799,8 @@
 
 		for item in wo_items:
 			qty = item.required_qty
-			item_account_details = frappe.db.get_value("Item", item.item_code, ["item_name",
-				"description", "stock_uom", "expense_account", "buying_cost_center", "name", "default_warehouse"], as_dict=1)
+
+			item_account_details = get_item_defaults(item.item_code, self.company)
 			# Take into account consumption if there are any.
 			if self.purpose == 'Manufacture':
 				req_qty_each = flt(item.required_qty / wo.qty)
@@ -807,8 +824,8 @@
 						"item_name": item.item_name,
 						"description": item.description,
 						"stock_uom": item_account_details.stock_uom,
-						"expense_account": item_account_details.expense_account,
-						"cost_center": item_account_details.buying_cost_center,
+						"expense_account": item_account_details.get("expense_account"),
+						"cost_center": item_account_details.get("buying_cost_center"),
 					}
 				})
 
@@ -905,7 +922,7 @@
 		"""
 		item_dict = self.get_pro_order_required_items()
 		max_qty = flt(self.pro_doc.qty)
-		for item, item_details in item_dict.items():
+		for item, item_details in iteritems(item_dict):
 			pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty)
 			desire_to_transfer = flt(self.fg_completed_qty) * flt(item_details.required_qty) / max_qty
 
@@ -968,6 +985,7 @@
 			se_child.expense_account = item_dict[d].get("expense_account") or expense_account
 			se_child.cost_center = item_dict[d].get("cost_center") or cost_center
 			se_child.allow_alternative_item = item_dict[d].get("allow_alternative_item", 0)
+			se_child.subcontracted_item = item_dict[d].get("main_item_code")
 
 			if item_dict[d].get("idx"):
 				se_child.idx = item_dict[d].get("idx")
@@ -1153,6 +1171,15 @@
 	return ret
 
 @frappe.whitelist()
+def get_expired_batch_items():
+	return frappe.db.sql("""select b.item, sum(sle.actual_qty) as qty, sle.batch_no, sle.warehouse, sle.stock_uom\
+	from `tabBatch` b, `tabStock Ledger Entry` sle
+	where b.expiry_date <= %s
+	and b.expiry_date is not NULL
+	and b.batch_id = sle.batch_no
+	group by sle.warehouse, sle.item_code, sle.batch_no""",(nowdate()), as_dict=1)
+
+@frappe.whitelist()
 def get_warehouse_details(args):
 	if isinstance(args, string_types):
 		args = json.loads(args)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index 8bf2610..8647d0f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -12,6 +12,7 @@
 
 	:item_code: Item to be moved
 	:qty: Qty to be moved
+	:company: Company Name (optional)
 	:from_warehouse: Optional
 	:to_warehouse: Optional
 	:rate: Optional
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 5fdab6f..940245c 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -46,6 +47,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -76,6 +78,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -109,6 +112,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -138,6 +142,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -171,6 +176,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -200,6 +206,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -233,6 +240,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -262,6 +270,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -292,6 +301,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -323,6 +333,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -357,6 +368,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -387,6 +399,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -418,6 +431,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -450,6 +464,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -480,6 +495,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -512,6 +528,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -545,6 +562,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -577,6 +595,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -609,6 +628,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -642,6 +662,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -674,6 +695,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -703,6 +725,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -736,6 +759,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -768,6 +792,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -801,6 +826,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -833,10 +859,12 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "item_code.retain_sample", 
    "fieldname": "retain_sample", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -849,7 +877,7 @@
    "label": "Retain Sample", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "item_code.retain_sample", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -865,6 +893,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -898,6 +927,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -928,6 +958,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -960,6 +991,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -989,6 +1021,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1022,6 +1055,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1055,6 +1089,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1085,6 +1120,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1117,6 +1153,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1146,6 +1183,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1179,6 +1217,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1209,6 +1248,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1240,6 +1280,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1272,6 +1313,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1304,6 +1346,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1336,6 +1379,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1365,6 +1409,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1397,6 +1442,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1428,6 +1474,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1457,6 +1504,39 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "subcontracted_item", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Subcontracted Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -1469,7 +1549,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-03-05 13:09:25.849700", 
+ "modified": "2018-05-30 20:06:00.623763", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index 8275c84..b6892f1 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -689,7 +689,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 1, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 3342768..ce32e01 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -49,7 +49,8 @@
 					args: {
 						warehouse: data.warehouse,
 						posting_date: frm.doc.posting_date,
-						posting_time: frm.doc.posting_time
+						posting_time: frm.doc.posting_time,
+						company:frm.doc.company
 					},
 					callback: function(r) {
 						var items = [];
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 938173d..e434233 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -268,12 +268,12 @@
 			self._cancel()
 
 @frappe.whitelist()
-def get_items(warehouse, posting_date, posting_time):
+def get_items(warehouse, posting_date, posting_time, company):
 	items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
 
-	items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0,
-		"has_batch_no": 0, "has_variants": 0, "disabled": 0, "default_warehouse": warehouse},
-			as_list=1)
+	items += frappe.db.sql_list('''select i.name from `tabItem` i, `tabItem Default` id where i.name = id.parent
+		and i.is_stock_item=1 and i.has_serial_no=0 and i.has_batch_no=0 and i.has_variants=0 and i.disabled=0
+		and id.default_warehouse=%s and id.company=%s''', (warehouse, company))
 
 	res = []
 	for item in set(items):
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 48f89ec..4d5423e 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -470,6 +470,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "1", 
+   "fieldname": "set_qty_in_transactions_based_on_serial_no_input", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Set Qty in Transactions based on Serial No Input", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "auto_material_request", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -773,7 +804,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-12 09:38:58.200950", 
+ "modified": "2018-05-03 12:38:12.905394", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Settings", 
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 23a18f4..97d24c6 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -11,8 +11,9 @@
 
 class StockSettings(Document):
 	def validate(self):
-		for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock", "default_warehouse"]:
-			frappe.db.set_default(key, self.get(key, ""))
+		for key in ["item_naming_by", "item_group", "stock_uom",
+			"allow_negative_stock", "default_warehouse", "set_qty_in_transactions_based_on_serial_no_input"]:
+				frappe.db.set_default(key, self.get(key, ""))
 
 		from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
 		set_by_naming_series("Item", "item_code",
diff --git a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
index a17cc2d..6f28651 100644
--- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
+++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
@@ -69,7 +69,7 @@
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 1bfa416..1bea00e 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -39,6 +39,8 @@
 		
 		frm.toggle_enable(['is_group', 'company'], false);
 
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Warehouse'};
+		
 		frm.fields_dict['parent_warehouse'].get_query = function(doc) {
 			return {
 				filters: {
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 9c47f98..ec60e84 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -144,17 +144,19 @@
 	if is_root:
 		parent = ""
 
-	warehouses = frappe.db.sql("""select name as value,
-		is_group as expandable
-		from `tabWarehouse`
-		where docstatus < 2
-		and ifnull(`parent_warehouse`,'') = %s
-		and (`company` = %s or company is null or company = '')
-		order by name""", (parent, company), as_dict=1)
+	fields = ['name as value', 'is_group as expandable']
+	filters = [
+		['docstatus', '<', '2'],
+		['ifnull(`parent_warehouse`, "")', '=', parent],
+		['company', 'in', (company, None,'')]
+	]
+
+	warehouses = frappe.get_list(doctype, fields=fields, filters=filters, order_by='name')
 
 	# return warehouses
 	for wh in warehouses:
 		wh["balance"] = get_stock_value_on(warehouse=wh.value)
+
 	return warehouses
 
 @frappe.whitelist()
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index b36cd39..59f43a6 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -4,13 +4,15 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, throw
-from frappe.utils import flt, cint, add_days, cstr
+from frappe.utils import flt, cint, add_days, cstr, add_months
 import json
 from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item, set_transaction_type
 from erpnext.setup.utils import get_exchange_rate
 from frappe.model.meta import get_field_precision
 from erpnext.stock.doctype.batch.batch import get_batch_no
 from erpnext import get_company_currency
+from erpnext.stock.doctype.item.item import get_item_defaults
+
 
 from six import string_types, iteritems
 
@@ -52,7 +54,7 @@
 
 		for bundle_item in bundled_items.items:
 			valuation_rate += \
-				flt(get_valuation_rate(bundle_item.item_code, out.get("warehouse")).get("valuation_rate") \
+				flt(get_valuation_rate(bundle_item.item_code, args.company, out.get("warehouse")).get("valuation_rate") \
 					* bundle_item.qty)
 
 		out.update({
@@ -60,7 +62,7 @@
 		})
 
 	else:
-		out.update(get_valuation_rate(args.item_code, out.get("warehouse")))
+		out.update(get_valuation_rate(args.item_code, args.company, out.get("warehouse")))
 
 	get_price_list_rate(args, item_doc, out)
 
@@ -101,6 +103,9 @@
 		out.bom = args.get('bom') or get_default_bom(args.item_code)
 
 	get_gross_profit(out)
+	if args.doctype == 'Material Request':
+		out.rate = args.rate or out.price_list_rate
+		out.amount = flt(args.qty * out.rate)
 
 	return out
 
@@ -201,11 +206,12 @@
 	user_default_warehouse = user_default_warehouse_list[0] \
 		if len(user_default_warehouse_list) == 1 else ""
 
-	warehouse = user_default_warehouse or item.default_warehouse or args.warehouse
+	item_defaults = get_item_defaults(item.name, args.company)
+	warehouse = user_default_warehouse or item_defaults.get("default_warehouse") or args.warehouse
 
 	material_request_type = ''
-	if args.get('doctype') == "Material Request":
-		material_request_type = frappe.db.get_value('Material Request',
+	if args.get('doctype') == "Material Request" and not args.get('material_request_type'):
+		args['material_request_type'] = frappe.db.get_value('Material Request',
 			args.get('name'), 'material_request_type')
 
 	#Set the UOM to the Default Sales UOM or Default Purchase UOM if configured in the Item Master
@@ -213,7 +219,7 @@
 		if args.get('doctype') in ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']:
 			args.uom = item.sales_uom if item.sales_uom else item.stock_uom
 		elif (args.get('doctype') in ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']) or \
-			(args.get('doctype') == 'Material Request' and material_request_type == 'Purchase'):
+			(args.get('doctype') == 'Material Request' and args.get('material_request_type') == 'Purchase'):
 			args.uom = item.purchase_uom if item.purchase_uom else item.stock_uom
 		else:
 			args.uom = item.stock_uom
@@ -224,9 +230,9 @@
 		"description": cstr(item.description).strip(),
 		"image": cstr(item.image).strip(),
 		"warehouse": warehouse,
-		"income_account": get_default_income_account(args, item),
-		"expense_account": get_default_expense_account(args, item),
-		"cost_center": get_default_cost_center(args, item),
+		"income_account": get_default_income_account(args, item_defaults),
+		"expense_account": get_default_expense_account(args, item_defaults),
+		"cost_center": get_default_cost_center(args, item_defaults),
 		'has_serial_no': item.has_serial_no,
 		'has_batch_no': item.has_batch_no,
 		"batch_no": None,
@@ -245,7 +251,7 @@
 		"net_rate": 0.0,
 		"net_amount": 0.0,
 		"discount_percentage": 0.0,
-		"supplier": item.default_supplier,
+		"supplier": item_defaults.get("default_supplier"),
 		"update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0,
 		"delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0,
 		"is_fixed_asset": item.is_fixed_asset,
@@ -254,6 +260,15 @@
 		"last_purchase_rate": item.last_purchase_rate if args.get("doctype") in ["Purchase Order"] else 0
 	})
 
+	if item.enable_deferred_revenue:
+		service_end_date = add_months(args.transaction_date, item.no_of_months)
+		out.update({
+			"enable_deferred_revenue": item.enable_deferred_revenue, 
+			"deferred_revenue_account": get_default_deferred_revenue_account(args, item),
+			"service_start_date": args.transaction_date,
+			"service_end_date": service_end_date
+		})
+
 	# calculate conversion factor
 	if item.stock_uom == args.uom:
 		out.conversion_factor = 1.0
@@ -274,8 +289,7 @@
 		["Account", "expense_account", "default_expense_account"],
 		["Cost Center", "cost_center", "cost_center"],
 		["Warehouse", "warehouse", ""]]:
-			company = frappe.db.get_value(d[0], out.get(d[1]), "company")
-			if not out[d[1]] or (company and args.company != company):
+			if not out[d[1]]:
 				out[d[1]] = frappe.db.get_value("Company", args.company, d[2]) if d[2] else None
 
 	for fieldname in ("item_name", "item_group", "barcodes", "brand", "stock_uom"):
@@ -285,27 +299,35 @@
 
 
 def get_default_income_account(args, item):
-	return (item.income_account
+	return (item.get("income_account")
 		or args.income_account
 		or frappe.db.get_value("Item Group", item.item_group, "default_income_account"))
 
 def get_default_expense_account(args, item):
-	return (item.expense_account
+	return (item.get("expense_account")
 		or args.expense_account
 		or frappe.db.get_value("Item Group", item.item_group, "default_expense_account"))
 
+def get_default_deferred_revenue_account(args, item):
+	if item.enable_deferred_revenue:
+		return (item.deferred_revenue_account
+			or args.deferred_revenue_account
+			or frappe.db.get_value("Company", args.company, "default_deferred_revenue_account"))
+	else:
+		return None
+
 def get_default_cost_center(args, item):
 	return (frappe.db.get_value("Project", args.get("project"), "cost_center")
-		or (item.selling_cost_center if args.get("customer") else item.buying_cost_center)
+		or (item.get("selling_cost_center") if args.get("customer") else item.get("buying_cost_center"))
 		or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
 		or args.get("cost_center"))
 
 def get_price_list_rate(args, item_doc, out):
 	meta = frappe.get_meta(args.parenttype or args.doctype)
 
-	if meta.get_field("currency"):
+	if meta.get_field("currency") or args.get('currency'):
 		validate_price_list(args)
-		if args.price_list:
+		if meta.get_field("currency") and args.price_list:
 			validate_conversion_rate(args, meta)
 
 		price_list_rate = get_price_list_rate_for(args.price_list, item_doc.name)
@@ -628,6 +650,11 @@
 	if not args.price_list:
 		return {}
 
+	if args.doctype in ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']:
+		args.update({"exchange_rate": "for_selling"})
+	elif args.doctype in ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']:
+		args.update({"exchange_rate": "for_buying"})
+
 	price_list_currency = get_price_list_currency(args.price_list)
 	price_list_uom_dependant = get_price_list_uom_dependant(args.price_list)
 	plc_conversion_rate = args.plc_conversion_rate
@@ -637,7 +664,7 @@
 		and price_list_currency != args.price_list_currency):
 			# cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
 			plc_conversion_rate = get_exchange_rate(price_list_currency, company_currency,
-				args.transaction_date) or plc_conversion_rate
+				args.transaction_date, args.exchange_rate) or plc_conversion_rate
 
 	return frappe._dict({
 		"price_list_currency": price_list_currency,
@@ -652,16 +679,17 @@
 		if bom:
 			return bom
 
-def get_valuation_rate(item_code, warehouse=None):
-	item = frappe.get_doc("Item", item_code)
-	if item.is_stock_item:
+def get_valuation_rate(item_code, company, warehouse=None):
+	item = get_item_defaults(item_code, company)
+	# item = frappe.get_doc("Item", item_code)
+	if item.get("is_stock_item"):
 		if not warehouse:
-			warehouse = item.default_warehouse
+			warehouse = item.get("default_warehouse")
 
 		return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
 			["valuation_rate"], as_dict=True) or {"valuation_rate": 0}
 
-	elif not item.is_stock_item:
+	elif not item.get("is_stock_item"):
 		valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty*conversion_factor)
 			from `tabPurchase Invoice Item`
 			where item_code = %s and docstatus=1""", item_code)
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
index ed010cd..30fcad8 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.py
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -20,6 +20,12 @@
 			"width": 120
 		},
 		{
+			"label": _("Brand"),
+			"fieldname": "brand",
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
 			"label": _("Warehouse"),
 			"fieldname": "warehouse",
 			"fieldtype": "Link",
@@ -71,7 +77,7 @@
 		conditions += "where a.item_code=%(item_code)s"
 
 	item_results = frappe.db.sql("""select a.item_code as item_name, a.name as price_list_name,
-		b.warehouse as warehouse, b.actual_qty as actual_qty
+		a.brand as brand, b.warehouse as warehouse, b.actual_qty as actual_qty
 		from `tabItem Price` a left join `tabBin` b
 		ON a.item_code = b.item_code
 		{conditions}"""
@@ -87,6 +93,7 @@
 		for item_dict in item_results:
 			data = {
 				'item_name': item_dict.item_name,
+				'brand': item_dict.brand,
 				'warehouse': item_dict.warehouse,
 				'stock_available': item_dict.actual_qty or 0,
 				'buying_price_list': "",
diff --git a/erpnext/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py
index ca01d19..0375d8f 100644
--- a/erpnext/stock/report/item_prices/item_prices.py
+++ b/erpnext/stock/report/item_prices/item_prices.py
@@ -21,7 +21,7 @@
 	data = []
 	for item in sorted(item_map):
 		data.append([item, item_map[item]["item_name"],item_map[item]["item_group"],
-			item_map[item]["description"], item_map[item]["stock_uom"],
+			item_map[item]["brand"], item_map[item]["description"], item_map[item]["stock_uom"],
 			flt(last_purchase_rate.get(item, 0), precision),
 			flt(val_rate_map.get(item, 0), precision),
 			pl.get(item, {}).get("Selling"),
@@ -34,7 +34,8 @@
 def get_columns(filters):
 	"""return columns based on filters"""
 
-	columns = [_("Item") + ":Link/Item:100", _("Item Name") + "::150",_("Item Group") + ":Link/Item Group:125", _("Description") + "::150", _("UOM") + ":Link/UOM:80",
+	columns = [_("Item") + ":Link/Item:100", _("Item Name") + "::150",_("Item Group") + ":Link/Item Group:125",
+		_("Brand") + "::100", _("Description") + "::150", _("UOM") + ":Link/UOM:80",
 		_("Last Purchase Rate") + ":Currency:90", _("Valuation Rate") + ":Currency:80",	_("Sales Price List") + "::180",
 		_("Purchase Price List") + "::180", _("BOM Rate") + ":Currency:90"]
 
@@ -45,9 +46,9 @@
 
 	item_map = {}
 
-	for i in frappe.db.sql("select name, item_group, item_name, description, \
-		stock_uom from tabItem \
-		order by item_code, item_group", as_dict=1):
+	for i in frappe.db.sql("""select name, item_group, item_name, description,
+		brand, stock_uom from tabItem
+		order by item_code, item_group""", as_dict=1):
 			item_map.setdefault(i.name, i)
 
 	return item_map
diff --git a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
index 137d603..3b901dc 100644
--- a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
+++ b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
@@ -1,14 +1,13 @@
 {
  "add_total_row": 0, 
- "apply_user_permissions": 1, 
  "creation": "2013-09-25 10:21:15", 
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 3, 
  "is_standard": "Yes", 
- "json": "{\"add_total_row\": 0, \"sort_by\": \"Item Price.modified\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Item Price\"], [\"price_list\", \"Item Price\"], [\"item_code\", \"Item Price\"], [\"item_name\", \"Item Price\"], [\"item_description\", \"Item Price\"], [\"price_list_rate\", \"Item Price\"], [\"buying\", \"Item Price\"], [\"selling\", \"Item Price\"], [\"currency\", \"Item Price\"]]}", 
- "modified": "2017-02-24 20:02:09.364303", 
+ "json": "{\"fields\": [[\"name\", \"Item Price\"], [\"price_list\", \"Item Price\"], [\"currency\", \"Item Price\"], [\"item_code\", \"Item Price\"], [\"brand\", \"Item Price\"], [\"price_list_rate\", \"Item Price\"], [\"docstatus\", \"Item Price\"]], \"order_by\": \"`tabItem Price`.`modified` asc\", \"add_total_row\": 0, \"filters\": []}", 
+ "modified": "2018-05-03 12:48:39.802088", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item-wise Price List Rate", 
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
index 2482cf8..c0535bf 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
@@ -14,6 +14,19 @@
 			"label": __("To Date"),
 			"fieldtype": "Date",
 			"default": frappe.datetime.get_today()
+		},
+		{
+			"fieldname":"item_group",
+			"label": __("Item Group"),
+			"fieldtype": "Link",
+			"options": "Item Group",
+			"reqd": 1
+		},
+		{
+			"fieldname":"brand",
+			"label": __("Brand"),
+			"fieldtype": "Link",
+			"options": "Brand"
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
index cc47ad9..618fd15 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
@@ -10,7 +10,7 @@
 	if not filters: filters = {}
 	float_preceision = frappe.db.get_default("float_preceision")
 
-	condition =get_condition(filters)
+	condition = get_condition(filters)
 
 	avg_daily_outgoing = 0
 	diff = ((getdate(filters.get("to_date")) - getdate(filters.get("from_date"))).days)+1
@@ -18,7 +18,7 @@
 		frappe.throw(_("'From Date' must be after 'To Date'"))
 
 	columns = get_columns()
-	items = get_item_info()
+	items = get_item_info(filters)
 	consumed_item_map = get_consumed_items(condition)
 	delivered_item_map = get_delivered_items(condition)
 
@@ -28,23 +28,31 @@
 		avg_daily_outgoing = flt(total_outgoing / diff, float_preceision)
 		reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
 
-		data.append([item.name, item.item_name, item.description, item.safety_stock, item.lead_time_days,
-			consumed_item_map.get(item.name, 0), delivered_item_map.get(item.name,0), total_outgoing,
-			avg_daily_outgoing, reorder_level])
+		data.append([item.name, item.item_name, item.item_group, item.brand, item.description,
+			item.safety_stock, item.lead_time_days, consumed_item_map.get(item.name, 0),
+			delivered_item_map.get(item.name,0), total_outgoing, avg_daily_outgoing, reorder_level])
 
 	return columns , data
 
 def get_columns():
 	return[
-			_("Item") + ":Link/Item:120", _("Item Name") + ":Data:120", _("Description") + "::160",
+			_("Item") + ":Link/Item:120", _("Item Name") + ":Data:120", _("Item Group") + ":Link/Item Group:100",
+			_("Brand") + ":Link/Brand:100", _("Description") + "::160",
 			_("Safety Stock") + ":Float:160", _("Lead Time Days") + ":Float:120", _("Consumed") + ":Float:120",
 			_("Delivered") + ":Float:120", _("Total Outgoing") + ":Float:120", _("Avg Daily Outgoing") + ":Float:160",
 			_("Reorder Level") + ":Float:120"
 	]
 
-def get_item_info():
-	return frappe.db.sql("""select name, item_name, description, safety_stock,
-		lead_time_days from tabItem""", as_dict=1)
+def get_item_info(filters):
+	from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition
+	conditions = [get_item_group_condition(filters.get("item_group"))]
+	if filters.get("brand"):
+		conditions.append("item.brand=%(brand)s")
+
+	return frappe.db.sql("""select name, item_name, description, brand, item_group,
+		safety_stock, lead_time_days from `tabItem` item where {}"""
+		.format(" and ".join(conditions)), filters, as_dict=1)
+
 
 def get_consumed_items(condition):
 	cn_items = frappe.db.sql("""select se_item.item_code,
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index e93957d..ecdd96a 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.utils import date_diff, flt
+from six import iteritems
 
 def execute(filters=None):
 
@@ -12,7 +13,7 @@
 	item_details = get_fifo_queue(filters)
 	to_date = filters["to_date"]
 	data = []
-	for item, item_dict in item_details.items():
+	for item, item_dict in iteritems(item_details):
 		fifo_queue = item_dict["fifo_queue"]
 		details = item_dict["details"]
 		if not fifo_queue: continue
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 52e4730..69abeeb 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -171,7 +171,7 @@
 		
 		no_transactions = True
 		float_precision = cint(frappe.db.get_default("float_precision")) or 3
-		for key, val in qty_dict.items():
+		for key, val in iteritems(qty_dict):
 			val = flt(val, float_precision)
 			qty_dict[key] = val
 			if key != "val_rate" and val:
@@ -212,7 +212,7 @@
 				item_details.setdefault(item.name, item)
 
 	if filters.get('show_variant_attributes', 0) == 1:
-		variant_values = get_variant_values_for(item_details.keys())
+		variant_values = get_variant_values_for(list(item_details))
 		item_details = {k: v.update(variant_values.get(k, {})) for k, v in iteritems(item_details)}
 
 	return item_details
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 1a91ab4..ec95561 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -56,7 +56,7 @@
 	item_conditions_sql = ''
 	if items:
 		item_conditions_sql = 'and sle.item_code in ({})'\
-			.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items]))
+			.format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items]))
 
 	return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
 			item_code, warehouse, actual_qty, qty_after_transaction, incoming_rate, valuation_rate,
diff --git a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
index 78d1c44..e8fcd65 100644
--- a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
+++ b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.utils import flt
+from six import iteritems
 
 def execute(filters=None):
 	columns = get_columns(filters)
@@ -13,7 +14,7 @@
 	material_transfer_vouchers = get_material_transfer_vouchers()
 	data = []
 
-	for item_code, suppliers in supplier_details.items():
+	for item_code, suppliers in iteritems(supplier_details):
 		consumed_qty = consumed_amount = delivered_qty = delivered_amount = 0.0
 		total_qty = total_amount = 0.0
 		if consumed_details.get(item_code):
@@ -85,7 +86,7 @@
 			item_supplier_map.setdefault(d.item_code, []).append(d.supplier)
 
 	if supplier:
-		for item_code, suppliers in item_supplier_map.items():
+		for item_code, suppliers in iteritems(item_supplier_map):
 			if supplier not in suppliers:
 				del item_supplier_map[item_code]
 
diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
index c5fb518..676cf54 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
@@ -10,7 +10,7 @@
 from frappe.utils import flt, cint, getdate
 from erpnext.stock.report.stock_balance.stock_balance import get_item_details, get_item_reorder_details, get_item_warehouse_map
 from erpnext.stock.report.stock_ageing.stock_ageing import get_fifo_queue, get_average_age
-
+from six import iteritems
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -39,9 +39,9 @@
 		item_value.setdefault((item, item_map[item]["item_group"]),[])
 		item_value[(item, item_map[item]["item_group"])].append(total_stock_value)
 
-	
+
 	# sum bal_qty by item
-	for (item, item_group), wh_balance in item_balance.items():
+	for (item, item_group), wh_balance in iteritems(item_balance):
 		total_stock_value = sum(item_value[(item, item_group)])
 		row = [item, item_group, total_stock_value]
 
@@ -87,7 +87,9 @@
 def get_warehouse_list(filters):
 	from frappe.defaults import get_user_permissions
 	condition = ''
-	user_permitted_warehouse = filter(None, get_user_permissions().get("Warehouse", []))
+	user_permitted_warehouse = filter(None, get_user_permissions()
+		.get("Warehouse", {})
+		.get("docs", []))
 	value = ()
 	if user_permitted_warehouse:
 		condition = "and name in %s"
@@ -96,7 +98,7 @@
 		condition = "and name = %s"
 		value = filters.get("warehouse")
 
-	return frappe.db.sql("""select name  
+	return frappe.db.sql("""select name
 		from `tabWarehouse` where is_group = 0
 		{condition}""".format(condition=condition), value, as_dict=1)
 
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index d2ec7c3..923a79c 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -926,6 +926,37 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "via_customer_portal", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Via Customer Portal", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -939,7 +970,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-13 13:03:14.748090", 
+ "modified": "2018-05-07 05:53:20.684275", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 6a18f11..dfcc2a8 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -17,6 +17,8 @@
 		return "{0}: {1}".format(_(self.status), self.subject)
 
 	def validate(self):
+		if (self.get("__islocal") and self.via_customer_portal):
+			self.flags.create_communication = True
 		if not self.raised_by:
 			self.raised_by = frappe.session.user
 		self.update_status()
@@ -26,6 +28,12 @@
 			from frappe.desk.form.assign_to import clear
 			clear(self.doctype, self.name)
 
+	def on_update(self):
+		# create the communication email and remove the description
+		if (self.flags.create_communication and self.via_customer_portal):
+			self.create_communication()
+			self.flags.communication_created = None
+
 	def set_lead_contact(self, email_id):
 		import email.utils
 		email_id = email.utils.parseaddr(email_id)[1]
@@ -53,6 +61,26 @@
 			# if no date, it should be set as None and not a blank string "", as per mysql strict config
 			self.resolution_date = None
 
+	def create_communication(self):
+		communication = frappe.new_doc("Communication")
+		communication.update({
+			"communication_type": "Communication",
+			"communication_medium": "Email",
+			"sent_or_received": "Received",
+			"email_status": "Open",
+			"subject": self.subject,
+			"sender": self.raised_by,
+			"content": self.description,
+			"status": "Linked",
+			"reference_doctype": "Issue",
+			"reference_name": self.name
+		})
+		communication.ignore_permissions = True
+		communication.ignore_mandatory = True
+		communication.save()
+
+		self.db_set("description", "")
+
 def get_list_context(context=None):
 	return {
 		"title": _("Issues"),
diff --git a/erpnext/hr/doctype/health_insurance/__init__.py b/erpnext/support/doctype/support_search_source/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/health_insurance/__init__.py
copy to erpnext/support/doctype/support_search_source/__init__.py
diff --git a/erpnext/support/doctype/support_search_source/support_search_source.json b/erpnext/support/doctype/support_search_source/support_search_source.json
new file mode 100644
index 0000000..db3a7bb
--- /dev/null
+++ b/erpnext/support/doctype/support_search_source/support_search_source.json
@@ -0,0 +1,668 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-05-16 21:15:21.207007", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Source Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Source Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "API\nLink", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.source_type==\"API\"", 
+   "fieldname": "api_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "API", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "base_url", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Base URL", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.source_type==\"API\"", 
+   "fieldname": "query_options_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Query Options", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "query_route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Query Route String", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb_1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "search_term_param_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Search Term Param Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.source_type==\"API\"", 
+   "fieldname": "response_options_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Response Options", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "response_result_key_path", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Response Result Key Path", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "post_route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Post Route String", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "post_route_key_list", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Post Route Key List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "response_post_cb", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "post_title_key", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Post Title Key", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "post_description_key", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Post Description Key", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.source_type==\"Link\"", 
+   "fieldname": "link_options_sb", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Link Options", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "source_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Source DocType", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_title_field", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result Title Field", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_preview_field", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result Preview Field", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_route_field", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result Route Field", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-05-18 18:36:37.129830", 
+ "modified_by": "Administrator", 
+ "module": "Support", 
+ "name": "Support Search Source", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/support_search_source/support_search_source.py b/erpnext/support/doctype/support_search_source/support_search_source.py
new file mode 100644
index 0000000..93e503a
--- /dev/null
+++ b/erpnext/support/doctype/support_search_source/support_search_source.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class SupportSearchSource(Document):
+	pass
diff --git a/erpnext/support/doctype/support_settings/support_settings.json b/erpnext/support/doctype/support_settings/support_settings.json
index 1ca03c7..2b79107 100644
--- a/erpnext/support/doctype/support_settings/support_settings.json
+++ b/erpnext/support/doctype/support_settings/support_settings.json
@@ -1,92 +1,560 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-02-17 13:07:35.686409", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-02-17 13:07:35.686409",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "7", 
-   "description": "Auto close Issue after 7 days", 
-   "fieldname": "close_issue_after_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Close Issue After Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "issues_sb",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Issues",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "7",
+   "description": "Auto close Issue after 7 days",
+   "fieldname": "close_issue_after_days",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Close Issue After Days",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "portal_sb",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Support Portal",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "get_started_sections",
+   "fieldtype": "Code",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Get Started Sections",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "show_latest_forum_posts",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show Latest Forum Posts",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "show_latest_forum_posts",
+   "fieldname": "forum_sb",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Forum Posts",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "forum_url",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Forum URL",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "get_latest_query",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Get Latest Query",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "response_key_list",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Response Key List",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "post_title_key",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Post Title Key",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "post_description_key",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Post Description Key",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "post_route_key",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Post Route Key",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "post_route_string",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Post Route String",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "search_apis_sb",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Search APIs",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "search_apis",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Search APIs",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Support Search Source",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-02-17 13:07:46.049536", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Support Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-05-17 02:11:33.462444",
+ "modified_by": "Administrator",
+ "module": "Support",
+ "name": "Support Settings",
+ "name_case": "",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 0,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/support_settings/test_support_settings.js b/erpnext/support/doctype/support_settings/test_support_settings.js
new file mode 100644
index 0000000..0787306
--- /dev/null
+++ b/erpnext/support/doctype/support_settings/test_support_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Support Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Support Settings
+		() => frappe.tests.make('Support Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/support/doctype/support_settings/test_support_settings.py b/erpnext/support/doctype/support_settings/test_support_settings.py
new file mode 100644
index 0000000..9c47f96
--- /dev/null
+++ b/erpnext/support/doctype/support_settings/test_support_settings.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestSupportSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/support/report/support_hour_distribution/support_hour_distribution.py b/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
index 905ea6a..08802b4 100644
--- a/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
+++ b/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _
 from frappe.utils import add_to_date, getdate, get_datetime
+from six import iteritems
 
 time_slots = {
 	'12AM - 3AM': '00:00:00-03:00:00',
@@ -33,7 +34,7 @@
 	time_slot_wise_total_count = {}
 	while(start_date <= getdate(filters.to_date)):
 		hours_count = {'date': start_date}
-		for key, value in time_slots.items():
+		for key, value in iteritems(time_slots):
 			start_time, end_time = value.split('-')
 			start_time = get_datetime("{0} {1}".format(start_date.strftime("%Y-%m-%d"), start_time))
 			end_time = get_datetime("{0} {1}".format(start_date.strftime("%Y-%m-%d"), end_time))
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 264b9df..a8c7ab9 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -18,7 +18,7 @@
  "is_standard": 1, 
  "login_required": 1, 
  "max_attachment_size": 0, 
- "modified": "2017-07-25 22:49:10.762704", 
+ "modified": "2018-05-07 05:54:22.213127", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "issues", 
@@ -83,6 +83,17 @@
    "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
+  }, 
+  {
+   "default": "1", 
+   "fieldname": "via_customer_portal", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "label": "Via Customer Portal", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "read_only": 1, 
+   "reqd": 0
   }
  ]
 }
\ No newline at end of file
diff --git a/erpnext/support/web_form/issues/issues.py b/erpnext/support/web_form/issues/issues.py
index 2334f8b..bb9197a 100644
--- a/erpnext/support/web_form/issues/issues.py
+++ b/erpnext/support/web_form/issues/issues.py
@@ -4,4 +4,5 @@
 
 def get_context(context):
 	# do your magic here
-	pass
+	if context.doc:
+		context.read_only = 1
\ No newline at end of file
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index 6fec94e..0e09f58 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -53,8 +53,8 @@
 				<br>
 				<div style="min-height: 100px; margin: 10px 0;">
 					<div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-						<h4 class="item-price" itemprop="price"></h4>
-						<div class="item-stock" itemprop="availability"></div>
+						<h4 class="item-price hide" itemprop="price"></h4>
+						<div class="item-stock hide" itemprop="availability"></div>
 					</div>
 					<div class="item-cart hide">
 						<div id="item-spinner">
diff --git a/erpnext/templates/includes/itemised_tax_breakup.html b/erpnext/templates/includes/itemised_tax_breakup.html
index 4162b3a..982397e 100644
--- a/erpnext/templates/includes/itemised_tax_breakup.html
+++ b/erpnext/templates/includes/itemised_tax_breakup.html
@@ -16,16 +16,16 @@
 				<tr>
 					<td>{{ item }}</td>
 					<td class='text-right'>
-						{{ frappe.utils.fmt_money(itemised_taxable_amount.get(item), None, company_currency) }}
+						{{ frappe.utils.fmt_money(itemised_taxable_amount.get(item), None, currency) }}
 					</td>
 					{% for tax_account in tax_accounts %}
 						{% set tax_details = taxes.get(tax_account) %}
 						{% if tax_details %}
 							<td class='text-right'>
 								{% if tax_details.tax_rate or not tax_details.tax_amount %}
-									({{ tax_details.tax_rate }}%) 
+									({{ tax_details.tax_rate }}%)
 								{% endif %}
-								{{ frappe.utils.fmt_money(tax_details.tax_amount, None, company_currency) }}
+								{{ frappe.utils.fmt_money(tax_details.tax_amount / conversion_rate, None, currency) }}
 							</td>
 						{% else %}
 							<td></td>
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index e96263f..798a6cf 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -12,29 +12,39 @@
 			item_code: get_item_code()
 		},
 		callback: function(r) {
-			$(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.in_stock));
-			if(r.message && r.message.price) {
-				$(".item-price")
-					.html(r.message.price.formatted_price_sales_uom + "<div style='font-size: small'>\
-						(" + r.message.price.formatted_price + " / " + r.message.uom + ")</div>");
-
-				if(r.message.in_stock==0) {
-					$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>");
+			if(r.message) {
+				if(r.message.cart_settings.enabled) {
+					$(".item-cart, .item-price, .item-stock").toggleClass("hide", (!!!r.message.product_info.price || !!!r.message.product_info.in_stock));
 				}
-				else if(r.message.in_stock==1) {
-					var qty_display = "{{ _("In stock") }}";
-					if (r.message.show_stock_qty) {
-						qty_display += " ("+r.message.stock_qty+")";
+				if(r.message.cart_settings.show_price) {
+					$(".item-price").toggleClass("hide", false);
+				}
+				if(r.message.cart_settings.show_stock_availability) {
+					$(".item-stock").toggleClass("hide", false);
+				}
+				if(r.message.product_info.price) {
+					$(".item-price")
+						.html(r.message.product_info.price.formatted_price_sales_uom + "<div style='font-size: small'>\
+							(" + r.message.product_info.price.formatted_price + " / " + r.message.product_info.uom + ")</div>");
+
+					if(r.message.product_info.in_stock==0) {
+						$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>");
 					}
-					$(".item-stock").html("<div style='color: green'>\
-						<i class='fa fa-check'></i> "+qty_display+"</div>");
-				}
+					else if(r.message.product_info.in_stock==1) {
+						var qty_display = "{{ _("In stock") }}";
+						if (r.message.product_info.show_stock_qty) {
+							qty_display += " ("+r.message.product_info.stock_qty+")";
+						}
+						$(".item-stock").html("<div style='color: green'>\
+							<i class='fa fa-check'></i> "+qty_display+"</div>");
+					}
 
-				if(r.message.qty) {
-					qty = r.message.qty;
-					toggle_update_cart(r.message.qty);
-				} else {
-					toggle_update_cart(0);
+					if(r.message.product_info.qty) {
+						qty = r.message.product_info.qty;
+						toggle_update_cart(r.message.product_info.qty);
+					} else {
+						toggle_update_cart(0);
+					}
 				}
 			}
 		}
diff --git a/erpnext/templates/includes/products_as_grid.html b/erpnext/templates/includes/products_as_grid.html
index 34c2ccd..a057f5d 100644
--- a/erpnext/templates/includes/products_as_grid.html
+++ b/erpnext/templates/includes/products_as_grid.html
@@ -12,10 +12,12 @@
 				<div>&nbsp</div>
 				<div style='font-size: small; margin-bottom: 10px;'>&nbsp</div>
 			{% endif %}
-			{% if in_stock or not is_stock_item %}
-				<div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div>
-			{% else %}
-				<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>
+			{% if show_stock_qty %}
+				{% if in_stock %}
+					<div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div>
+				{% else %}
+					<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>
+				{% endif %}
 			{% endif %}
 		</div>
 	</div>
diff --git a/erpnext/templates/pages/help.html b/erpnext/templates/pages/help.html
new file mode 100644
index 0000000..a49268a
--- /dev/null
+++ b/erpnext/templates/pages/help.html
@@ -0,0 +1,62 @@
+{% extends "templates/web.html" %}
+
+{% block title %} {{ _("Help") }} {% endblock %}
+
+{% block header %}<h1>{{ _("Help") }}</h1>
+
+<div style="margin-bottom: 20px;">
+	<form action='/search_help'>
+	<input name='q' class='form-control' type='text'
+		style='max-width: 400px; display: inline-block; margin-right: 10px;'
+		value='{{ frappe.form_dict.q or ''}}'
+		{% if not frappe.form_dict.q%}placeholder="{{ _("What do you need help with?") }}"{% endif %}>
+	<input type='submit'
+		class='btn btn-sm btn-primary btn-search' value="{{ _("Search") }}">
+	</form>
+</div>
+
+{% for section in get_started_sections %}
+<div style="margin-bottom: 30px;">
+	<h2>{{ section["name"] }}</h2>
+	{% for item in section["items"] %}
+	<div style="margin: 20px 0;">
+		<a href="{{ item.link }}"><b>{{ item.title }}</b></a>
+		{% if item.description -%}
+		<p>{{ item.description }}</p>
+		{%- endif %}
+	</div>
+	{% endfor %}
+	<p><a href="/kb/support">{{ _("See All Articles") }}</a></p>
+	<hr>
+</div>
+{% endfor %}
+
+<div style="margin-bottom: 30px;">
+	<h2>{{ _("Forum Activity") }}</h2>
+	{% for topic in topics %}
+	<div style="margin: 20px 0;">
+		<a href="{{ topic[post_params.link] }}">
+			<b>{{ topic[post_params.title] }}</b>
+		</a>
+		{% if topic[post_params.description] -%}
+		<p>{{ topic[post_params.description] }}</p>
+		{%- endif %}
+	</div>
+	{% endfor %}
+	<p><a href="{{ forum_url }}">{{ _("Visit the forums") }}</a></p>
+	<hr>
+</div>
+
+<div style="margin-bottom: 20px;">
+	<h2>{{ _("Your tickets") }}</h2>
+		{% for doc in issues %}
+			{% include "templates/includes/issue_row.html" %}
+		{% endfor %}
+	<p><a href="/issues">{{ _("See all open tickets") }}</a></p>
+</div>
+
+<a href="/issues?new=1" class="btn btn-default btn-new btn-sm">
+	{{ _("Open a new ticket") }}
+</a>
+
+{% endblock %}
diff --git a/erpnext/templates/pages/help.py b/erpnext/templates/pages/help.py
new file mode 100644
index 0000000..c484d25
--- /dev/null
+++ b/erpnext/templates/pages/help.py
@@ -0,0 +1,41 @@
+from __future__ import unicode_literals
+import frappe, json
+
+import requests
+
+def get_context(context):
+	context.no_cache = 1
+	settings = frappe.get_doc("Support Settings", "Support Settings")
+	s = settings
+
+	# Get Started sections
+	sections = json.loads(s.get_started_sections)
+	context.get_started_sections = sections
+
+	# Forum posts
+	topics_data, post_params = get_forum_posts(s)
+	context.post_params = post_params
+	context.forum_url = s.forum_url
+	context.topics = topics_data[:3]
+
+	# Issues
+	context.issues = frappe.get_list("Issue", fields=["name", "status", "subject", "modified"])[:3]
+
+def get_forum_posts(s):
+	response = requests.get(s.forum_url + '/' + s.get_latest_query)
+	response.raise_for_status()
+	response_json = response.json()
+
+	topics_data = {} # it will actually be an array
+	key_list = s.response_key_list.split(',')
+	for key in key_list:
+		topics_data = response_json.get(key) if not topics_data else topics_data.get(key)
+
+	for topic in topics_data:
+		topic["link"] = s.forum_url + '/' + s.post_route_string + '/' + str(topic.get(s.post_route_key))
+
+	post_params = {
+		"title": s.post_title_key,
+		"description": s.post_description_key
+	}
+	return topics_data, post_params
diff --git a/erpnext/templates/pages/regional/india/update_gstin.py b/erpnext/templates/pages/regional/india/update_gstin.py
index 8dcd48e..5493e54 100644
--- a/erpnext/templates/pages/regional/india/update_gstin.py
+++ b/erpnext/templates/pages/regional/india/update_gstin.py
@@ -1,5 +1,6 @@
 import frappe
 from frappe import _
+from six import iteritems
 
 def get_context(context):
 	context.no_cache = 1
@@ -28,7 +29,7 @@
 
 def update_gstin(context):
 	dirty = False
-	for key, value in frappe.form_dict.items():
+	for key, value in iteritems(frappe.form_dict):
 		if key != 'party':
 			address_name = frappe.get_value('Address', key)
 			if address_name:
diff --git a/erpnext/templates/pages/search_help.html b/erpnext/templates/pages/search_help.html
new file mode 100644
index 0000000..bf19540
--- /dev/null
+++ b/erpnext/templates/pages/search_help.html
@@ -0,0 +1,7 @@
+{% extends "templates/web.html" %}
+
+{% block page_content %}
+
+{% include "templates/includes/search_template.html" %}
+
+{% endblock %}
diff --git a/erpnext/templates/pages/search_help.py b/erpnext/templates/pages/search_help.py
new file mode 100644
index 0000000..e564e21
--- /dev/null
+++ b/erpnext/templates/pages/search_help.py
@@ -0,0 +1,99 @@
+from __future__ import unicode_literals
+import frappe, requests
+from frappe import _
+from jinja2 import utils
+from html2text import html2text
+from frappe.utils import sanitize_html
+from frappe.utils.global_search import search
+
+def get_context(context):
+	context.no_cache = 1
+	if frappe.form_dict.q:
+		query = str(utils.escape(sanitize_html(frappe.form_dict.q)))
+		context.title = _('Help Results for "{0}"').format(query)
+		context.route = '/search_help'
+		d = frappe._dict()
+		d.results_sections = get_help_results_sections(query)
+		context.update(d)
+	else:
+		context.title = _('Docs Search')
+
+@frappe.whitelist(allow_guest = True)
+def get_help_results_sections(text):
+	out = []
+	settings = frappe.get_doc("Support Settings", "Support Settings")
+
+	for api in settings.search_apis:
+		results = []
+		if api.source_type == "API":
+			response_json = get_response(api, text)
+			topics_data = get_topics_data(api, response_json)
+			results = prepare_api_results(api, topics_data)
+		else:
+			# Source type is Doctype
+			doctype = api.source_doctype
+			raw = search(text, 0, 20, doctype)
+			results = prepare_doctype_results(api, raw)
+
+		if results:
+			# Add section
+			out.append({
+				"title": api.source_name,
+				"results": results
+			})
+
+	return out
+
+def get_response(api, text):
+	response = requests.get(api.base_url + '/' + api.query_route, data={
+		api.search_term_param_name: text
+	})
+
+	response.raise_for_status()
+	return response.json()
+
+def get_topics_data(api, response_json):
+	if not response_json:
+		response_json = {}
+	topics_data = {} # it will actually be an array
+	key_list = api.response_result_key_path.split(',')
+
+	for key in key_list:
+		topics_data = response_json.get(key) if not topics_data else topics_data.get(key)
+
+	return topics_data or []
+
+def prepare_api_results(api, topics_data):
+	if not topics_data:
+		topics_data = []
+
+	results = []
+	for topic in topics_data:
+		route = api.base_url + '/' + (api.post_route  + '/' if api.post_route else "")
+		for key in api.post_route_key_list.split(','):
+			route += unicode(topic[key])
+
+		results.append(frappe._dict({
+			'title': topic[api.post_title_key],
+			'preview': html2text(topic[api.post_description_key]),
+			'route': route
+		}))
+	return results[:5]
+
+def prepare_doctype_results(api, raw):
+	results = []
+	for r in raw:
+		prepared_result = {}
+		parts = r["content"].split(' ||| ')
+
+		for part in parts:
+			pair = part.split(' : ', 1)
+			prepared_result[pair[0]] = pair[1]
+
+		results.append(frappe._dict({
+			'title': prepared_result[api.result_title_field],
+			'preview': prepared_result[api.result_preview_field],
+			'route': prepared_result[api.result_route_field]
+		}))
+
+	return results
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 4987d34..9fd8af5 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Kanselleer Materiaal Besoek {0} voordat u hierdie Garantie-eis kanselleer
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Assesseringsverslae
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Verbruikersprodukte
-DocType: Purchase Receipt,Subscription Detail,Inskrywing Detail
 DocType: Supplier Scorecard,Notify Supplier,Stel Verskaffer in kennis
 DocType: Item,Customer Items,Kliënt Items
 DocType: Project,Costing and Billing,Koste en faktuur
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Ouerrekening {1} kan nie &#39;n grootboek wees nie
 DocType: Item,Publish Item to hub.erpnext.com,Publiseer item op hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-pos kennisgewings
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,evaluering
 DocType: Item,Default Unit of Measure,Standaard eenheid van maatreël
 DocType: SMS Center,All Sales Partner Contact,Alle verkope vennote kontak
-DocType: Employee,Leave Approvers,Laat aanvaar
+DocType: Department,Leave Approvers,Laat aanvaar
 DocType: Sales Partner,Dealer,handelaar
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,ondersoeke
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Gaan beskikbaarheid
 DocType: Job Applicant,Job Applicant,Werksaansoeker
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dit is gebaseer op transaksies teen hierdie verskaffer. Sien die tydlyn hieronder vir besonderhede
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Wettig
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Werklike tipe belasting kan nie in Itemkoers in ry {0} ingesluit word nie.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Wettig
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Werklike tipe belasting kan nie in Itemkoers in ry {0} ingesluit word nie.
 DocType: Bank Guarantee,Customer,kliënt
 DocType: Purchase Receipt Item,Required By,Vereis deur
 DocType: Delivery Note,Return Against Delivery Note,Keer terug na afleweringsnota
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankrekening kan nie as {0} genoem word nie.
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofde (of groepe) waarteen rekeningkundige inskrywings gemaak word en saldo&#39;s word gehandhaaf.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Uitstaande vir {0} kan nie minder as nul wees nie ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Daar is geen salarisstrokies ingedien om te verwerk nie.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Daar is geen salarisstrokies ingedien om te verwerk nie.
 DocType: Manufacturing Settings,Default 10 mins,Verstek 10 minute
 DocType: Leave Type,Leave Type Name,Verlaat tipe naam
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Wys oop
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Dit is nodig om hierdie aksie vandag self te neem vir die bogenoemde herhalende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Reeks suksesvol opgedateer
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Uitteken
 DocType: Pricing Rule,Apply On,Pas aan
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Alle Verskaffer Kontak
 DocType: Support Settings,Support Settings,Ondersteuningsinstellings
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Verwagte einddatum kan nie minder wees as verwagte begin datum nie
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ry # {0}: Die tarief moet dieselfde wees as {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nuwe Verlof Aansoek
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ry # {0}: Die tarief moet dieselfde wees as {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Item Vervaldatum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Konsep
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Konsep
 DocType: Membership,membership validaty section,lidmaatskap validatie afdeling
 DocType: Mode of Payment Account,Mode of Payment Account,Betaalmetode
 DocType: Consultation,Consultation,konsultasie
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiaal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Maak webwerf
 DocType: Opening Invoice Creation Tool Item,Quantity,hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Rekeningtabel kan nie leeg wees nie.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Lenings (laste)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Rekeningtabel kan nie leeg wees nie.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Lenings (laste)
 DocType: Employee Education,Year of Passing,Jaar van verby
 DocType: Item,Country of Origin,Land van oorsprong
 DocType: Soil Texture,Soil Texture Criteria,Grondtekstuurkriteria
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primêre kontakbesonderhede
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Open probleme
 DocType: Production Plan Item,Production Plan Item,Produksieplan Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Gebruiker {0} is reeds toegewys aan Werknemer {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Gebruiker {0} is reeds toegewys aan Werknemer {1}
 DocType: Lab Test Groups,Add new line,Voeg nuwe reël by
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Gesondheidssorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in betaling (Dae)
@@ -89,7 +85,7 @@
 ,Delay Days,Vertragingsdae
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Diensuitgawes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,faktuur
+DocType: Subscription Invoice,Invoice,faktuur
 DocType: Purchase Invoice Item,Item Weight Details,Item Gewig Besonderhede
 DocType: Asset Maintenance Log,Periodicity,periodisiteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskale jaar {0} word vereis
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,abbr
 DocType: Appraisal Goal,Score (0-5),Telling (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ry {0}: {1} {2} stem nie ooreen met {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ry # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ry # {0}:
 DocType: Timesheet,Total Costing Amount,Totale kosteberekening
 DocType: Delivery Note,Vehicle No,Voertuignommer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Kies asseblief Pryslys
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Werk aan die gang
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Kies asseblief datum
 DocType: Daily Work Summary Group,Holiday List,Vakansie Lys
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,rekenmeester
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,rekenmeester
 DocType: Hub Settings,Selling Price List,Verkooppryslys
 DocType: Patient,Tobacco Current Use,Tabak huidige gebruik
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Verkoopprys
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Verkoopprys
 DocType: Cost Center,Stock User,Voorraad gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefoon nommer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nuut {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Aanvanklike e-pos kennisgewing gestuur
 ,Sales Partners Commission,Verkope Vennootskommissie
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Waarde na waardevermindering
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Verwante
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Bywoningsdatum kan nie minder wees as werknemer se toetredingsdatum nie
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Bywoningsdatum kan nie minder wees as werknemer se toetredingsdatum nie
 DocType: Grading Scale,Grading Scale Name,Gradering Skaal Naam
-DocType: Subscription,Repeat on Day,Herhaal op dag
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dit is &#39;n wortelrekening en kan nie geredigeer word nie.
 DocType: Sales Invoice,Company Address,Maatskappyadres
 DocType: BOM,Operations,bedrywighede
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan nie magtiging instel op grond van Korting vir {0}
+DocType: Subscription,Subscription Start Date,Inskrywing begin datum
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Heg .csv-lêer met twee kolomme, een vir die ou naam en een vir die nuwe naam"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nie in enige aktiewe fiskale jaar nie.
 DocType: Packed Item,Parent Detail docname,Ouer Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Verwysing: {0}, Item Kode: {1} en Kliënt: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Proeftydperk Einddatum kan nie voor die begin datum van die proeftydperk wees nie
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opening vir &#39;n werk.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM is nie gespesifiseer vir subkontrakterende item {0} by ry {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Dieselfde maatskappy is meer as een keer ingeskryf
 DocType: Patient,Married,Getroud
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nie toegelaat vir {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Kry items van
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Kry items van
 DocType: Price List,Price Not UOM Dependant,Prys Nie UOM Afhanklik
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Voorraad kan nie opgedateer word teen afleweringsnota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Remolie
 DocType: Tax Rule,Tax Type,Belasting Tipe
 ,Completed Work Orders,Voltooide werkorders
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Belasbare Bedrag
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Belasbare Bedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jy is nie gemagtig om inskrywings by te voeg of op te dateer voor {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (indien nie skyfievertoning nie)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werklike operasietyd
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ry # {0}: Verwysingsdokumenttipe moet een van koste-eis of joernaalinskrywing wees
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Kies BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ry # {0}: Verwysingsdokumenttipe moet een van koste-eis of joernaalinskrywing wees
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Kies BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koste van aflewerings
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Bestuur vooraf bedrag wat aan die Werknemer gegee word
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Aflewerings Kennisgewing
 DocType: Journal Entry,Opening Entry,Opening Toegang
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Slegs rekeninge betaal
-DocType: Employee Loan,Repay Over Number of Periods,Terugbetaling oor aantal periodes
+DocType: Loan,Repay Over Number of Periods,Terugbetaling oor aantal periodes
 DocType: Stock Entry,Additional Costs,Addisionele koste
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Rekening met bestaande transaksie kan nie na groep omskep word nie.
 DocType: Lead,Product Enquiry,Produk Ondersoek
 DocType: Education Settings,Validate Batch for Students in Student Group,Valideer bondel vir studente in studentegroep
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Geen verlofrekord vir werknemer {0} vir {1} gevind nie
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Geen verlofrekord vir werknemer {0} vir {1} gevind nie
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Voer asseblief die maatskappy eerste in
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Kies asseblief Maatskappy eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Kies asseblief Maatskappy eerste
 DocType: Employee Education,Under Graduate,Onder Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Stel asb. Standaard sjabloon vir verlofstatus kennisgewing in MH-instellings in.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Teiken
 DocType: BOM,Total Cost,Totale koste
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Werknemerslening
 DocType: Fee Schedule,Send Payment Request Email,Stuur betalingsversoek-e-pos
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Item {0} bestaan nie in die stelsel nie of het verval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Eiendom
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Suksesvol ongeregistreer.
 DocType: Assessment Result,Grade,graad
 DocType: Restaurant Table,No of Seats,Aantal plekke
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Om dinamiese vak by te voeg, gebruik jinja-tags soos <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Aflewer deur verskaffer
 DocType: Asset Maintenance Task,Asset Maintenance Task,Bate Onderhoudstaak
 DocType: SMS Center,All Contact,Alle Kontak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Jaarlikse salaris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Jaarlikse salaris
 DocType: Daily Work Summary,Daily Work Summary,Daaglikse werkopsomming
 DocType: Period Closing Voucher,Closing Fiscal Year,Afsluiting van fiskale jaar
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} is gevries
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Kies asseblief Bestaande Maatskappy om &#39;n Grafiek van Rekeninge te skep
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Voorraaduitgawes
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Kies asseblief Bestaande Maatskappy om &#39;n Grafiek van Rekeninge te skep
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Voorraaduitgawes
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Kies Doelwinkel
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Voer asseblief voorkeur kontak e-pos in
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Voer asseblief voorkeur kontak e-pos in
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Krediet in Maatskappy Valuta
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Primêre adres
 DocType: Production Plan,Material Request Detail,Materiaal Versoek Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standaard Kwotasie Geldigheidsdae
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om belasting in ry {0} in Item-tarief in te sluit, moet belasting in rye {1} ook ingesluit word"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om belasting in ry {0} in Item-tarief in te sluit, moet belasting in rye {1} ook ingesluit word"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Instellings vir HR Module
 DocType: SMS Center,SMS Center,Sms sentrum
 DocType: Sales Invoice,Change Amount,Verander bedrag
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Bestuurslisensie Kategorieë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Voer asseblief Verskaffingsdatum in
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak waardeverminderinginskrywing
+DocType: HR Settings,Leave Settings,Verlaat instellings
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Versoek Tipe
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Maak werknemer
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,uitsaai
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Opstel af van POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Deaktiveer die skep van tydlogboeke teen werkorders. Operasies sal nie opgespoor word teen werkorder nie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Uitvoering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Besonderhede van die operasies uitgevoer.
 DocType: Asset Maintenance Log,Maintenance Status,Onderhoudstatus
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Lidmaatskapbesonderhede
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Verskaffer is nodig teen Betaalbare rekening {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Items en pryse
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Totale ure: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Vanaf datum moet binne die fiskale jaar wees. Aanvaar vanaf datum = {0}
 DocType: Drug Prescription,Interval,interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,voorkeur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,voorkeur
 DocType: Grant Application,Individual,individuele
 DocType: Academic Term,Academics User,Akademiese gebruiker
 DocType: Cheque Print Template,Amount In Figure,Bedrag In Figuur
-DocType: Employee Loan Application,Loan Info,Leningsinligting
+DocType: Loan Application,Loan Info,Leningsinligting
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Beplan vir onderhoudsbesoeke.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Verskaffer Scorecard Periode
 DocType: Share Transfer,Share Transfer,Deeloordrag
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Item Sjabloon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemie
 DocType: Job Offer,Select Terms and Conditions,Kies Terme en Voorwaardes
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Uitwaarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Uitwaarde
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-instellings
 DocType: Production Plan,Sales Orders,Verkoopsbestellings
 DocType: Purchase Taxes and Charges,Valuation,waardasie
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Standaard Territorium
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,televisie
 DocType: Work Order Operation,Updated via 'Time Log',Opgedateer via &#39;Time Log&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Voorskotbedrag kan nie groter wees as {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Kies die kliënt of verskaffer.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Voorskotbedrag kan nie groter wees as {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Reekslys vir hierdie transaksie
 DocType: Company,Enable Perpetual Inventory,Aktiveer Perpetual Inventory
+DocType: Bank Guarantee,Charges Incurred,Heffings ingesluit
 DocType: Company,Default Payroll Payable Account,Standaard betaalstaat betaalbare rekening
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Werk e-posgroep
 DocType: Sales Invoice,Is Opening Entry,Is toegangsinskrywing
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Aangepaste resultaat
 DocType: Delivery Stop,Contact Name,Kontak naam
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursus assesseringskriteria
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Belasting ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Belasting ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studente ID:
 DocType: POS Customer Group,POS Customer Group,POS kliënt groep
 DocType: Land Unit,Land Unit describing various land assets,Grond Eenheid wat verskillende grondbates beskryf
@@ -374,9 +371,8 @@
 ,Open Work Orders,Oop werkorders
 DocType: Payment Term,Credit Months,Kredietmaande
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Netto betaal kan nie minder as 0 wees nie
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Om te stop met die stuur van herhalende fout kennisgewings van die stelsel, het ons die Gestremde veld in die intekening gekontroleer"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Aflosdatum moet groter wees as Datum van aansluiting
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Blare per jaar
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Aflosdatum moet groter wees as Datum van aansluiting
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Blare per jaar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ry {0}: Kontroleer asseblief &#39;Is vooruit&#39; teen rekening {1} indien dit &#39;n voorskot is.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Pakhuis {0} behoort nie aan maatskappy nie {1}
 DocType: Email Digest,Profit & Loss,Wins en verlies
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale kosteberekening (via tydblad)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Stel asseblief studente onder Studentegroepe op
 DocType: Item Website Specification,Item Website Specification,Item webwerf spesifikasie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Verlaat geblokkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Item {0} het sy einde van die lewe bereik op {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bankinskrywings
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Verlaat geblokkeer
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Item {0} het sy einde van die lewe bereik op {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bankinskrywings
 DocType: Crop,Annual,jaarlikse
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraadversoening Item
 DocType: Stock Entry,Sales Invoice No,Verkoopsfaktuur No
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studente Groepskeppingsinstrument Kursus
 DocType: Lead,Do Not Contact,Moenie kontak maak nie
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Mense wat by jou organisasie leer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Sagteware ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Sagteware ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestelhoeveelheid
 DocType: Pricing Rule,Supplier Type,Verskaffer Tipe
 DocType: Course Scheduling Tool,Course Start Date,Kursus begin datum
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publiseer in Hub
 DocType: Student Admission,Student Admission,Studentetoelating
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Item {0} is gekanselleer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materiaal Versoek
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Item {0} is gekanselleer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materiaal Versoek
 DocType: Bank Reconciliation,Update Clearance Date,Dateer opruimingsdatum op
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Aankoopbesonderhede
@@ -439,9 +435,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maksimum Graad
 DocType: Email Digest,New Quotations,Nuwe aanhalings
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-pos salarisstrokie aan werknemer gebaseer op voorkeur e-pos gekies in Werknemer
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Die eerste verlof goedkeur in die lys sal ingestel word as die verstekverlof
 DocType: Tax Rule,Shipping County,Versending County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Leer
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Leer
 DocType: Asset,Next Depreciation Date,Volgende Depresiasie Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiwiteitskoste per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellings vir rekeninge
@@ -451,7 +446,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstaande tjeks en deposito&#39;s om skoon te maak
 DocType: Item,Synced With Hub,Gesinkroniseer met hub
 DocType: Driver,Fleet Manager,Vlootbestuurder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Ry # {0}: {1} kan nie vir item {2} negatief wees nie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Ry # {0}: {1} kan nie vir item {2} negatief wees nie
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Verkeerde wagwoord
 DocType: Item,Variant Of,Variant Van
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide hoeveelheid kan nie groter wees as &#39;Hoeveelheid om te vervaardig&#39; nie
@@ -473,7 +468,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Stel asseblief die kamer prys op ()
 DocType: Journal Entry,Multi Currency,Multi Geld
 DocType: Opening Invoice Creation Tool,Invoice Type,Faktuur Tipe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Afleweringsnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Afleweringsnota
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opstel van Belasting
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Koste van Verkoop Bate
@@ -500,11 +495,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Werknemerbenaming (bv. HUB, Direkteur, ens.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarop die kliënt geldeenheid omgeskakel word na die kliënt se basiese geldeenheid
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusskeduleringsinstrument
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ry # {0}: Aankoopfaktuur kan nie teen &#39;n bestaande bate gemaak word nie {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Dringend] Fout tydens die skep van herhalende% s vir% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ry # {0}: Aankoopfaktuur kan nie teen &#39;n bestaande bate gemaak word nie {1}
 DocType: Land Unit,LInked Analysis,Ingelyfde Analise
 DocType: Item Tax,Tax Rate,Belastingkoers
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Aansoekperiode kan nie oor twee toekenningsrekords wees nie
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Aansoekperiode kan nie oor twee toekenningsrekords wees nie
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegeken vir Werknemer {1} vir periode {2} tot {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Aankoopfaktuur {0} is reeds ingedien
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Ry # {0}: lotnommer moet dieselfde wees as {1} {2}
@@ -518,7 +512,7 @@
 DocType: Purchase Order,% Received,% Ontvang
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skep studentegroepe
 DocType: Volunteer,Weekends,naweke
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredietnota Bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredietnota Bedrag
 DocType: Setup Progress Action,Action Document,Aksie Dokument
 DocType: Chapter Member,Website URL,URL van die webwerf
 ,Finished Goods,Voltooide goedere
@@ -531,6 +525,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Voeg items by
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Kwaliteit Inspeksie Parameter
+DocType: Leave Application,Leave Approver Name,Verlaat Goedgekeur Naam
 DocType: Depreciation Schedule,Schedule Date,Skedule Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Verdienste, Aftrekkings en ander Salary komponente"
 DocType: Packed Item,Packed Item,Gepakte item
@@ -547,7 +542,7 @@
 DocType: Request for Quotation,Request for Quotation,Versoek vir kwotasie
 DocType: Healthcare Settings,Require Lab Test Approval,Vereis laboratoriumtoetsgoedkeuring
 DocType: Salary Slip Timesheet,Working Hours,Werksure
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Totaal Uitstaande
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Totaal Uitstaande
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Verander die begin- / huidige volgordenommer van &#39;n bestaande reeks.
 DocType: Dosage Strength,Strength,krag
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Skep &#39;n nuwe kliënt
@@ -560,7 +555,7 @@
 DocType: Workstation,Consumable Cost,Verbruikskoste
 DocType: Purchase Receipt,Vehicle Date,Voertuigdatum
 DocType: Student Log,Medical,Medies
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Rede vir verlies
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Rede vir verlies
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Werk rekeningnommer op
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Leier Eienaar kan nie dieselfde wees as die Lood nie
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Toegewysde bedrag kan nie groter as onaangepaste bedrag wees nie
@@ -570,11 +565,10 @@
 DocType: Lab Test Template,Single,enkele
 DocType: Salary Slip,Total Loan Repayment,Totale Lening Terugbetaling
 DocType: Account,Cost of Goods Sold,Koste van goedere verkoop
-DocType: Subscription,Yearly,jaarlikse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Voer asseblief Koste Sentrum in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Voer asseblief Koste Sentrum in
 DocType: Drug Prescription,Dosage,dosis
 DocType: Journal Entry Account,Sales Order,Verkoopsbestelling
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gem. Verkoopprys
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Gem. Verkoopprys
 DocType: Assessment Plan,Examiner Name,Naam van eksaminator
 DocType: Lab Test Template,No Result,Geen resultaat
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
@@ -583,6 +577,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Voer asseblief die maatskappy se naam eerste in
 DocType: Purchase Invoice,Supplier Name,Verskaffernaam
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lees die ERPNext Handleiding
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Toon blare van alle Departementslede in die Jaarboek
 DocType: Purchase Invoice,01-Sales Return,01-verkope terug
 DocType: Account,Is Group,Is die groep
 DocType: Email Digest,Pending Purchase Orders,Hangende bestellings
@@ -603,7 +598,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale instellings vir alle vervaardigingsprosesse.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeninge Bevrore Upto
 DocType: SMS Log,Sent On,Gestuur
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attribuut {0} het verskeie kere gekies in Attributes Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attribuut {0} het verskeie kere gekies in Attributes Table
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer rekord is geskep met behulp van geselekteerde veld.
 DocType: Sales Order,Not Applicable,Nie van toepassing nie
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakansie meester.
@@ -626,8 +621,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Voorbehou vir verkoop
 DocType: Packing Slip,From Package No.,Uit pakketnr.
 DocType: Item Attribute,To Range,Om te bereik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriteite en deposito&#39;s
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan nie die waarderingsmetode verander nie, aangesien daar transaksies is teen sommige items wat nie sy eie waarderingsmetode het nie"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Sekuriteite en deposito&#39;s
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan nie die waarderingsmetode verander nie, aangesien daar transaksies is teen sommige items wat nie sy eie waarderingsmetode het nie"
 DocType: Student Report Generation Tool,Attended by Parents,Bygewoon deur ouers
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totale blare toegeken is verpligtend
 DocType: Patient,AB Positive,AB Positief
@@ -636,7 +631,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Bywoningsrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Salaris Komponent vir tydlaar-gebaseerde betaalstaat.
 DocType: Sales Order Item,Used for Production Plan,Gebruik vir Produksieplan
-DocType: Employee Loan,Total Payment,Totale betaling
+DocType: Loan,Total Payment,Totale betaling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Kan nie transaksie vir voltooide werkorder kanselleer nie.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tyd tussen bedrywighede (in mins)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} is gekanselleer sodat die aksie nie voltooi kan word nie
@@ -652,15 +647,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Lys &#39;n paar van jou kliënte. Hulle kan organisasies of individue wees.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Onderdele om te Bou
 DocType: POS Profile User,POS Profile User,POS Profiel gebruiker
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte inkomste
+DocType: Subscription Invoice,Subscription Invoice,Inskrywing Invoice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direkte inkomste
 DocType: Patient Appointment,Date TIme,Datum Tyd
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Kan nie filter op grond van rekening, indien gegroepeer volgens rekening nie"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administratiewe Beampte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administratiewe Beampte
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opstel van maatskappy en belasting
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Kies asseblief Kursus
 DocType: Codification Table,Codification Table,Kodifikasietabel
 DocType: Timesheet Detail,Hrs,ure
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Kies asseblief Maatskappy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Kies asseblief Maatskappy
 DocType: Stock Entry Detail,Difference Account,Verskilrekening
 DocType: Purchase Invoice,Supplier GSTIN,Verskaffer GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan nie die taak toemaak nie aangesien die afhanklike taak {0} nie gesluit is nie.
@@ -685,6 +681,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Kontantvloeikaartmap
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serie-item kan nie &#39;n breuk wees nie
 DocType: Journal Entry,Difference (Dr - Cr),Verskil (Dr - Cr)
+DocType: Bank Guarantee,Providing,Verskaffing
 DocType: Account,Profit and Loss,Wins en Verlies
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nie toegelaat nie, stel Lab Test Template op soos vereis"
 DocType: Patient,Risk Factors,Risiko faktore
@@ -740,11 +737,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Stel reeds standaard in posprofiel {0} vir gebruiker {1}, vriendelik gedeaktiveer"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finansiële / boekjaar.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Opgehoopte Waardes
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Jammer, Serial Nos kan nie saamgevoeg word nie"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Jammer, Serial Nos kan nie saamgevoeg word nie"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory is nodig in POS Profiel
 DocType: Supplier,Prevent RFQs,Voorkom RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Maak verkoopbestelling
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salarisstrokie ingedien vir tydperk vanaf {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Salarisstrokie ingedien vir tydperk vanaf {0} tot {1}
 DocType: Project Task,Project Task,Projektaak
 ,Lead Id,Lei Id
 DocType: C-Form Invoice Detail,Grand Total,Groot totaal
@@ -765,8 +762,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Versending wetsontwerp Datum
 DocType: Production Plan,Production Plan,Produksieplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Openingsfaktuurskeppingsinstrument
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Verkope terug
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Verkope terug
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Totale toegekende blare {0} moet nie minder wees as reeds goedgekeurde blare {1} vir die tydperk nie
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Stel aantal in Transaksies gebaseer op Serial No Input
 ,Total Stock Summary,Totale voorraadopsomming
 DocType: Announcement,Posted By,Gepos deur
 DocType: Item,Delivered by Supplier (Drop Ship),Aflewer deur verskaffer (Drop Ship)
@@ -777,15 +775,15 @@
 DocType: Quotation,Quotation To,Aanhaling aan
 DocType: Lead,Middle Income,Middelinkomste
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Verstekeenheid van item vir item {0} kan nie direk verander word nie omdat jy reeds &#39;n transaksie (s) met &#39;n ander UOM gemaak het. Jy sal &#39;n nuwe item moet skep om &#39;n ander standaard UOM te gebruik.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Verstekeenheid van item vir item {0} kan nie direk verander word nie omdat jy reeds &#39;n transaksie (s) met &#39;n ander UOM gemaak het. Jy sal &#39;n nuwe item moet skep om &#39;n ander standaard UOM te gebruik.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Toegewysde bedrag kan nie negatief wees nie
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel asseblief die Maatskappy in
 DocType: Share Balance,Share Balance,Aandelebalans
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Opleiding Resultaat Werknemer
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,&#39;N Logiese pakhuis waarteen voorraadinskrywings gemaak word.
-DocType: Repayment Schedule,Principal Amount,Hoofbedrag
-DocType: Employee Loan Application,Total Payable Interest,Totale betaalbare rente
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Hoofbedrag
+DocType: Loan Application,Total Payable Interest,Totale betaalbare rente
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totaal Uitstaande: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Verkoopsfaktuur Tydblad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Verwysingsnommer en verwysingsdatum is nodig vir {0}
@@ -794,10 +792,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Skep werknemerrekords om blare, koste-eise en betaalstaat te bestuur"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant bespreking
 DocType: Land Unit,Land Unit Name,Grond Eenheid Naam
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Voorstel Skryf
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Voorstel Skryf
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Inskrywing Aftrek
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Klaar maak
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Stel kliënte in kennis per e-pos
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Stel kliënte in kennis per e-pos
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Nog &#39;n verkoopspersoon {0} bestaan uit dieselfde werknemer-ID
 DocType: Employee Advance,Claimed Amount,Eisbedrag
 apps/erpnext/erpnext/config/education.py +180,Masters,meesters
@@ -815,13 +813,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betaling Gateway rekening nie geskep nie, skep asseblief een handmatig."
 DocType: Supplier Scorecard,Per Year,Per jaar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie in aanmerking vir toelating tot hierdie program soos per DOB nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 DocType: Sales Invoice,Sales Taxes and Charges,Verkoopsbelasting en Heffings
 DocType: Employee,Organization Profile,Organisasie Profiel
 DocType: Vital Signs,Height (In Meter),Hoogte (In meter)
 DocType: Student,Sibling Details,Sibling Besonderhede
 DocType: Vehicle Service,Vehicle Service,Voertuigdiens
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Outomaties aktiveer die terugvoerversoek gebaseer op toestande.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Outomaties aktiveer die terugvoerversoek gebaseer op toestande.
 DocType: Employee,Reason for Resignation,Rede vir bedanking
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Sjabloon vir prestasiebeoordelings.
 DocType: Sales Invoice,Credit Note Issued,Kredietnota Uitgereik
@@ -835,10 +832,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Onderhoudskedule
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dan word prysreëls uitgefiltreer op grond van kliënt, kliëntegroep, gebied, verskaffer, verskaffer tipe, veldtog, verkoopsvennoot, ens."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Netto verandering in voorraad
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Werknemersleningbestuur
 DocType: Employee,Passport Number,Paspoortnommer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Verhouding met Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Bestuurder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Bestuurder
 DocType: Payment Entry,Payment From / To,Betaling Van / Tot
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuwe kredietlimiet is minder as die huidige uitstaande bedrag vir die kliënt. Kredietlimiet moet ten minste {0} wees
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Stel asseblief rekening in pakhuis {0}
@@ -879,23 +875,23 @@
 DocType: Item,Material Transfer,Materiaal Oordrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Kon nie pad vind vir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening (Dr)
+DocType: Loan,Applicant,aansoeker
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Tydstip moet na {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Om herhalende dokumente te maak
 ,GST Itemised Purchase Register,GST Item Purchase Register
 DocType: Course Scheduling Tool,Reschedule,herskeduleer
-DocType: Employee Loan,Total Interest Payable,Totale rente betaalbaar
+DocType: Loan,Total Interest Payable,Totale rente betaalbaar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Belandkoste en koste geland
 DocType: Work Order Operation,Actual Start Time,Werklike Aanvangstyd
 DocType: BOM Operation,Operation Time,Operasie Tyd
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Voltooi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Basis
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Basis
 DocType: Timesheet,Total Billed Hours,Totale gefaktureerde ure
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Skryf af Bedrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Skryf af Bedrag
 DocType: Leave Block List Allow,Allow User,Laat gebruiker toe
 DocType: Journal Entry,Bill No,Rekening No
 DocType: Company,Gain/Loss Account on Asset Disposal,Wins / Verliesrekening op Bateverkope
 DocType: Vehicle Log,Service Details,Diensbesonderhede
-DocType: Subscription,Quarterly,kwartaallikse
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,gegroepeer
 DocType: Selling Settings,Delivery Note Required,Afleweringsnota benodig
@@ -906,7 +902,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tydstaat
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Grondstowwe gebaseer op
 DocType: Sales Invoice,Port Code,Hawe kode
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Warehouse
 DocType: Lead,Lead is an Organization,Lood is &#39;n organisasie
 DocType: Guardian Interest,Interest,belangstelling
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkope
@@ -918,12 +914,12 @@
 DocType: Account,Accounts,rekeninge
 DocType: Vehicle,Odometer Value (Last),Odometer Waarde (Laaste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates van verskaffer tellingskaart kriteria.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,bemarking
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,bemarking
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Betalinginskrywing is reeds geskep
 DocType: Request for Quotation,Get Suppliers,Kry Verskaffers
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Ry # {0}: Bate {1} word nie gekoppel aan Item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Salary Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Ry # {0}: Bate {1} word nie gekoppel aan Item {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Salary Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Rekening {0} is verskeie kere ingevoer
 DocType: Account,Expenses Included In Valuation,Uitgawes Ingesluit in Waardasie
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,U kan net hernu indien u lidmaatskap binne 30 dae verstryk
@@ -933,7 +929,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Kies slegs as u instellings vir kontantvloeimappers opstel
 DocType: Email Digest,Next email will be sent on:,Volgende e-pos sal gestuur word op:
 DocType: Supplier Scorecard,Per Week,Per week
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item het variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item het variante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totale Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nie gevind nie
 DocType: Bin,Stock Value,Voorraadwaarde
@@ -954,9 +950,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredietkaartinskrywing
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Maatskappy en Rekeninge
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,In Waarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,In Waarde
 DocType: Asset Settings,Depreciation Options,Waardevermindering Opsies
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ongeldige plasings tyd
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ongeldige plasings tyd
 DocType: Lead,Campaign Name,Veldtog Naam
 DocType: Hotel Room,Capacity,kapasiteit
 DocType: Selling Settings,Close Opportunity After Days,Sluit geleentheid na dae
@@ -981,7 +977,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kliënt se bestellingnommer
 DocType: Budget,Budget Against,Begroting teen
 DocType: Employee,Cell Number,Selfoonnommer
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Daar is geen werknemer vir die gegewe kriteria nie. Kontroleer dat Salarisstrokies nie reeds geskep is nie.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Daar is geen werknemer vir die gegewe kriteria nie. Kontroleer dat Salarisstrokies nie reeds geskep is nie.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Outomatiese Materiaal Versoeke Genereer
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,verloor
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,U kan nie huidige voucher insleutel in die kolom &quot;Teen Journal Entry &#39;nie
@@ -993,15 +989,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Kies asseblief &#39;n tabel
 DocType: BOM,Website Specifications,Webwerf spesifikasies
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is &#39;n ongeldige e-posadres in &#39;Ontvangers&#39;
 DocType: Special Test Items,Particulars,Besonderhede
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Vanaf {0} van tipe {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Vanaf {0} van tipe {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ry {0}: Omskakelfaktor is verpligtend
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Veelvuldige prysreëls bestaan volgens dieselfde kriteria. Beslis asseblief konflik deur prioriteit toe te ken. Prys Reëls: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan BOM nie deaktiveer of kanselleer nie aangesien dit gekoppel is aan ander BOM&#39;s
 DocType: Asset,Maintenance,onderhoud
+DocType: Subscriber,Subscriber,intekenaar
 DocType: Item Attribute Value,Item Attribute Value,Item Attribuutwaarde
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Werk asseblief jou projekstatus op
 DocType: Item,Maximum sample quantity that can be retained,Maksimum monster hoeveelheid wat behou kan word
@@ -1038,25 +1034,25 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Verstek instellings vir die winkelwagentje
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Voeg tydslaaie by
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Bate geskrap via Joernaal Inskrywing {0}
-DocType: Employee Loan,Interest Income Account,Rente Inkomsterekening
+DocType: Loan,Interest Income Account,Rente Inkomsterekening
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Hersien uitnodiging gestuur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,biotegnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Kantoor Onderhoud Uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Kantoor Onderhoud Uitgawes
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gaan na
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-pos rekening opstel
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Voer asseblief eers die item in
 DocType: Asset Repair,Downtime,Af tyd
 DocType: Account,Liability,aanspreeklikheid
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gekonfekteerde bedrag kan nie groter wees as eisbedrag in ry {0} nie.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gekonfekteerde bedrag kan nie groter wees as eisbedrag in ry {0} nie.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademiese kwartaal:
 DocType: Salary Detail,Do not include in total,Sluit nie in totaal in nie
 DocType: Company,Default Cost of Goods Sold Account,Verstek koste van goedere verkoop rekening
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Pryslys nie gekies nie
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Pryslys nie gekies nie
 DocType: Employee,Family Background,Familie agtergrond
 DocType: Request for Quotation Supplier,Send Email,Stuur e-pos
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Waarskuwing: Ongeldige aanhangsel {0}
 DocType: Item,Max Sample Quantity,Max Sample Hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Geen toestemming nie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Geen toestemming nie
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Aanhaling gevra
 DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pols
 DocType: Company,Default Bank Account,Verstekbankrekening
@@ -1067,11 +1063,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Items met &#39;n hoër gewig sal hoër vertoon word
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab toetse en Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankversoening Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Ry # {0}: Bate {1} moet ingedien word
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Ry # {0}: Bate {1} moet ingedien word
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevind nie
-DocType: Subscription,Stopped,gestop
 DocType: Item,If subcontracted to a vendor,As onderaannemer aan &#39;n ondernemer
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentegroep is reeds opgedateer.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentegroep is reeds opgedateer.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projekopdatering.
 DocType: SMS Center,All Customer Contact,Alle kliënte kontak
 DocType: Land Unit,Tree Details,Boom Besonderhede
@@ -1121,7 +1116,6 @@
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Invoer Bywoning
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alle Itemgroepe
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Stel outomaties boodskap op indiening van transaksies.
 DocType: Work Order,Item To Manufacture,Item om te vervaardig
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status is {2}
@@ -1135,7 +1129,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Herstel, as die gekose adres geredigeer word na die stoor"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Item Variant {0} bestaan reeds met dieselfde eienskappe
 DocType: Item,Hub Publishing Details,Hub Publishing Details
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Oopmaak&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Oopmaak&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Oop om te doen
 DocType: Notification Control,Delivery Note Message,Afleweringsnota Boodskap
 DocType: Lab Test Template,Result Format,Resultaatformaat
@@ -1145,7 +1139,7 @@
 DocType: Payroll Entry,Bimonthly,tweemaandelikse
 DocType: Vehicle Service,Brake Pad,Remskoen
 DocType: Fertilizer,Fertilizer Contents,Kunsmis Inhoud
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,navorsing en ontwikkeling
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,navorsing en ontwikkeling
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Bedrag aan rekening
 DocType: Company,Registration Details,Registrasie Besonderhede
 DocType: Timesheet,Total Billed Amount,Totale gefactureerde bedrag
@@ -1159,7 +1153,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Omskakel krediet limiet tjek by verkope bestelling
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Prestasiebeoordeling.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktiveer &#39;Gebruik vir winkelwagentje&#39;, aangesien winkelwagentjie geaktiveer is en daar moet ten minste een belastingreël vir die winkelwagentjie wees"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Inskrywing {0} is gekoppel aan bestelling {1}, maak seker of dit as voorskot in hierdie faktuur getrek word."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Inskrywing {0} is gekoppel aan bestelling {1}, maak seker of dit as voorskot in hierdie faktuur getrek word."
 DocType: Sales Invoice Item,Stock Details,Voorraadbesonderhede
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekwaarde
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punt van koop
@@ -1193,7 +1187,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimum sitplek
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaardes
 DocType: Examination Result,Examination Result,Eksamenuitslag
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Aankoop Ontvangst
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Aankoop Ontvangst
 ,Received Items To Be Billed,Items ontvang om gefaktureer te word
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Wisselkoers meester.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Verwysings Doctype moet een van {0} wees.
@@ -1201,15 +1195,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Kan nie tydgleuf in die volgende {0} dae vir operasie {1} vind nie
 DocType: Work Order,Plan material for sub-assemblies,Beplan materiaal vir sub-gemeentes
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Verkope Vennote en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} moet aktief wees
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Geen items beskikbaar vir oordrag nie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} moet aktief wees
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Geen items beskikbaar vir oordrag nie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Sluiting (Opening + Totaal)
 DocType: Journal Entry,Depreciation Entry,Waardevermindering Inskrywing
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Kies asseblief die dokument tipe eerste
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Kanselleer materiaalbesoeke {0} voordat u hierdie onderhoudsbesoek kanselleer
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standaard
 DocType: Pricing Rule,Rate or Discount,Tarief of Korting
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Reeksnommer {0} behoort nie aan item {1} nie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Reeksnommer {0} behoort nie aan item {1} nie
 DocType: Purchase Receipt Item Supplied,Required Qty,Vereiste aantal
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Gunstelinge
 DocType: Hub Settings,Custom Data,Aangepaste data
@@ -1221,9 +1215,9 @@
 DocType: Medical Code,Medical Code Standard,Mediese Kode Standaard
 DocType: Soil Texture,Clay Composition (%),Kleiskomposisie (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Stoor asseblief voor die toewys van taak.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balanswaarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balanswaarde
 DocType: Lab Test,Lab Technician,Lab tegnikus
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkooppryslys
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Verkooppryslys
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Indien gekontroleer, sal &#39;n kliënt geskep word, gekarteer na Pasiënt. Pasiëntfakture sal teen hierdie kliënt geskep word. U kan ook bestaande kliënt kies terwyl u pasiënt skep."
 DocType: Bank Reconciliation,Account Currency,Rekening Geld
@@ -1231,16 +1225,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Gee asseblief &#39;n afwykende rekening in die maatskappy
 DocType: Purchase Receipt,Range,verskeidenheid
 DocType: Supplier,Default Payable Accounts,Verstekbetaalbare rekeninge
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is nie aktief of bestaan nie
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Werknemer {0} is nie aktief of bestaan nie
 DocType: Fee Structure,Components,komponente
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Woocommerce Settings,Endpoints,eindpunte
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Gee asb. Bate-kategorie in Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Itemvarianante {0} opgedateer
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Itemvarianante {0} opgedateer
 DocType: Quality Inspection Reading,Reading 6,Lees 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","gegenereer word. As dit vertraag word, moet u die veld &quot;Herhaal op Dag van Maand&quot; handmatig verander"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kan nie {0} {1} {2} sonder enige negatiewe uitstaande faktuur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kan nie {0} {1} {2} sonder enige negatiewe uitstaande faktuur
 DocType: Share Transfer,From Folio No,Van Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Aankoopfaktuur Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ry {0}: Kredietinskrywing kan nie gekoppel word aan &#39;n {1}
@@ -1275,16 +1267,17 @@
 DocType: Asset,Available-for-use Date,Beskikbaar-vir-gebruik-datum
 DocType: Guardian,Guardian Name,Voognaam
 DocType: Cheque Print Template,Has Print Format,Het drukformaat
-DocType: Employee Loan,Sanctioned,beboet
+DocType: Loan,Sanctioned,beboet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,is verpligtend. Miskien is Geldwissel-rekord nie geskep vir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Ry # {0}: spesifiseer asseblief die serienommer vir item {1}
 DocType: Crop Cycle,Crop Cycle,Gewassiklus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Vir &#39;Product Bundle&#39; items, sal Warehouse, Serial No en Batch No oorweeg word vanaf die &#39;Packing List&#39;-tabel. As pakhuis en batch nommer dieselfde is vir alle verpakkingsitems vir &#39;n &#39;produkpakket&#39; -item, kan hierdie waardes in die hoofitemtafel ingevoer word, waardes sal na die &#39;paklys&#39;-tabel gekopieer word."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Vir &#39;Product Bundle&#39; items, sal Warehouse, Serial No en Batch No oorweeg word vanaf die &#39;Packing List&#39;-tabel. As pakhuis en batch nommer dieselfde is vir alle verpakkingsitems vir &#39;n &#39;produkpakket&#39; -item, kan hierdie waardes in die hoofitemtafel ingevoer word, waardes sal na die &#39;paklys&#39;-tabel gekopieer word."
 DocType: Student Admission,Publish on website,Publiseer op die webwerf
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Verskafferfaktuurdatum mag nie groter wees as die datum van inskrywing nie
+DocType: Subscription,Cancelation Date,Kansellasie Datum
 DocType: Purchase Invoice Item,Purchase Order Item,Bestelling Item
 DocType: Agriculture Task,Agriculture Task,Landboutaak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Inkomste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirekte Inkomste
 DocType: Student Attendance Tool,Student Attendance Tool,Studente Bywoning Gereedskap
 DocType: Restaurant Menu,Price List (Auto created),Pryslys (Outomaties geskep)
 DocType: Cheque Print Template,Date Settings,Datum instellings
@@ -1310,6 +1303,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,meter
 DocType: Workstation,Electricity Cost,Elektrisiteitskoste
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab testing date time kan nie voor die versameling date time
+DocType: Subscription Plan,Cost,koste
 DocType: HR Settings,Don't send Employee Birthday Reminders,Moenie Werknemer Verjaarsdag Herinnerings stuur nie
 DocType: Expense Claim,Total Advance Amount,Totale voorskotbedrag
 DocType: Delivery Stop,Estimated Arrival,Geskatte aankoms
@@ -1321,14 +1315,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Laai jou briefhoof en logo op. (jy kan dit later wysig).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Volgende Depresiasie Datum word ingeskryf as vervaldatum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,wit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,wit
 DocType: SMS Center,All Lead (Open),Alle Lood (Oop)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ry {0}: Aantal nie beskikbaar vir {4} in pakhuis {1} by die plasing van die inskrywing ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,U kan slegs maksimum een opsie kies uit die keuselys.
 DocType: Purchase Invoice,Get Advances Paid,Kry vooruitbetalings betaal
 DocType: Item,Automatically Create New Batch,Skep outomaties nuwe bondel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Toeken {0} na {1} (ry {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,maak
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Toeken {0} na {1} (ry {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,maak
 DocType: Student Admission,Admission Start Date,Toelating Aanvangsdatum
 DocType: Journal Entry,Total Amount in Words,Totale bedrag in woorde
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nuwe werknemer
@@ -1344,7 +1338,7 @@
 DocType: Holiday List,Holiday List Name,Vakansie Lys Naam
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Lening Bedrag
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Skedule Kursus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Voorraadopsies
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Voorraadopsies
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Deaktiveer die aankoop van Laaste Aankoopbesonderhede in Aankoopbestelling
 DocType: Journal Entry Account,Expense Claim,Koste-eis
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Wil jy hierdie geskrapde bate regtig herstel?
@@ -1363,11 +1357,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Verpakking Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankrekening
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Spesifiseer asseblief &#39;n {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Verwyder items sonder enige verandering in hoeveelheid of waarde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Verwyder items sonder enige verandering in hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Aflewering aan
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantskepping is in die ry.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Werkopsomming vir {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Eienskapstabel is verpligtend
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Die eerste verlof goedkeur in die lys sal as die verstek verlof aanvaar word.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Eienskapstabel is verpligtend
 DocType: Production Plan,Get Sales Orders,Verkoop bestellings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kan nie negatief wees nie
 DocType: Training Event,Self-Study,Selfstudie
@@ -1379,7 +1374,7 @@
 DocType: Workstation,Wages,lone
 DocType: Asset Maintenance,Maintenance Manager Name,Onderhoudbestuurder Naam
 DocType: Agriculture Task,Urgent,dringende
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Spesifiseer asseblief &#39;n geldige ry-ID vir ry {0} in tabel {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Spesifiseer asseblief &#39;n geldige ry-ID vir ry {0} in tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan nie veranderlike vind nie:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Kies asseblief &#39;n veld om van numpad te wysig
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Kan nie &#39;n vaste bateitem wees nie, aangesien Voorraadgrootboek geskep is."
@@ -1391,7 +1386,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kwaliteit Inspeksie Sjabloon Naam
 DocType: Project,First Email,Eerste e-pos
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerde pakhuis in verkoopsbestelling / voltooide goedere pakhuis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Verkoopbedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Verkoopbedrag
 DocType: Repayment Schedule,Interest Amount,Rente Bedrag
 DocType: Serial No,Creation Document No,Skeppingsdokument nr
 DocType: Share Transfer,Issue,Uitgawe
@@ -1405,10 +1400,10 @@
 DocType: Tax Rule,Shipping State,Versendstaat
 ,Projected Quantity as Source,Geprojekteerde hoeveelheid as bron
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item moet bygevoeg word deur gebruik te maak van die &#39;Kry Items van Aankoopontvangste&#39; -knoppie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Afleweringstoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Afleweringstoer
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Oordrag Tipe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Verkoopsuitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Verkoopsuitgawes
 DocType: Consultation,Diagnosis,diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standaard koop
 DocType: GL Entry,Against,teen
@@ -1417,12 +1412,13 @@
 DocType: Sales Partner,Implementation Partner,Implementeringsvennoot
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Poskode
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Verkoopsbestelling {0} is {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Kies rentekoersrekening in lening {0}
 DocType: Opportunity,Contact Info,Kontakbesonderhede
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Maak voorraadinskrywings
 DocType: Packing Slip,Net Weight UOM,Netto Gewig UOM
 DocType: Item,Default Supplier,Verstekverskaffer
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Oor Produksie Toelae Persentasie
-DocType: Employee Loan,Repayment Schedule,Terugbetalingskedule
+DocType: Loan,Repayment Schedule,Terugbetalingskedule
 DocType: Shipping Rule Condition,Shipping Rule Condition,Versending Reël Voorwaarde
 DocType: Holiday List,Get Weekly Off Dates,Kry weeklikse af datums
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Einddatum kan nie minder wees as die begin datum nie
@@ -1436,7 +1432,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde ouderdom
 DocType: Education Settings,Attendance Freeze Date,Bywoning Vries Datum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Lys &#39;n paar van u verskaffers. Hulle kan organisasies of individue wees.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Bekyk alle produkte
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Bekyk alle produkte
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum leeftyd (Dae)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Alle BOM&#39;s
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotelkamers van tipe {0} is nie beskikbaar op {1}
@@ -1444,14 +1440,16 @@
 DocType: Expense Claim,From Employee,Van Werknemer
 DocType: Driver,Cellphone Number,Selfoonnommer
 DocType: Project,Monitor Progress,Monitor vordering
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Waarskuwing: Stelsel sal nie oorbilling kontroleer nie, aangesien die bedrag vir item {0} in {1} nul is"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Waarskuwing: Stelsel sal nie oorbilling kontroleer nie, aangesien die bedrag vir item {0} in {1} nul is"
 DocType: Journal Entry,Make Difference Entry,Maak Verskil Inskrywing
+DocType: Supplier Quotation,Auto Repeat Section,Outo Herhaal afdeling
 DocType: Upload Attendance,Attendance From Date,Bywoning vanaf datum
 DocType: Appraisal Template Goal,Key Performance Area,Sleutelprestasie-area
 DocType: Program Enrollment,Transportation,Vervoer
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ongeldige kenmerk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} moet ingedien word
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Hoeveelheid moet minder as of gelyk wees aan {0}
+DocType: Department Approver,Department Approver,Departement Goedkeuring
 DocType: SMS Center,Total Characters,Totale karakters
 DocType: Employee Advance,Claimed,beweer
 DocType: Crop,Row Spacing,Ry Spacing
@@ -1461,6 +1459,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalingsversoeningfaktuur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Bydrae%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Soos vir die aankoop instellings as aankoop bestelling benodig == &#39;JA&#39;, dan moet die aankooporder eers vir item {0}"
+,HSN-wise-summary of outward supplies,HSN-wyse-opsomming van uiterlike voorrade
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Maatskappy registrasienommers vir u verwysing. Belastingnommers, ens."
 DocType: Sales Partner,Distributor,verspreider
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Stuur Pos
@@ -1474,7 +1473,7 @@
 DocType: Setup Progress Action,Action Name,Aksie Naam
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Beginjaar
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Eerste 2 syfers van GSTIN moet ooreenstem met staatsnommer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Begin datum van huidige faktuur se tydperk
 DocType: Salary Slip,Leave Without Pay,Los sonder betaling
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapasiteitsbeplanning fout
@@ -1492,26 +1491,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Velds sal eers oor kopieë gekopieer word.
 DocType: Setup Progress Action,Domains,domeine
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Werklike Aanvangsdatum&#39; kan nie groter wees as &#39;Werklike Einddatum&#39; nie.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,bestuur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,bestuur
 DocType: Cheque Print Template,Payer Settings,Betaler instellings
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit sal aangeheg word aan die itemkode van die variant. As u afkorting byvoorbeeld &quot;SM&quot; is en die itemkode &quot;T-SHIRT&quot; is, sal die itemkode van die variant &quot;T-SHIRT-SM&quot; wees."
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netto betaal (in woorde) sal sigbaar wees sodra jy die Salary Slip stoor.
 DocType: Purchase Invoice,Is Return,Is Terug
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,versigtigheid
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Begin dag is groter as einddag in taak &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Terug / Debiet Nota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Terug / Debiet Nota
 DocType: Price List Country,Price List Country,Pryslys Land
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} geldige reeksnommers vir item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Kode kan nie vir Serienommer verander word nie.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Item Kode kan nie vir Serienommer verander word nie.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Gesprekfaktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Voer asseblief die Kode in om groepsnommer te kry
 DocType: Stock Settings,Default Item Group,Standaard Itemgroep
-DocType: Employee Loan,Partially Disbursed,Gedeeltelik uitbetaal
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Gee inligting.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Gee inligting.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Verskaffer databasis.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,U kan nie &#39;n intekening herlaai wat nie gekanselleer is nie.
 DocType: Account,Balance Sheet,Balansstaat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kostesentrum vir item met itemkode &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kostesentrum vir item met itemkode &#39;
 DocType: Fee Validity,Valid Till,Geldig tot
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Totale Ouers Onderwysersvergadering
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Betaalmetode is nie gekonfigureer nie. Kontroleer asseblief of die rekening op Betalingsmodus of op POS-profiel gestel is.
@@ -1524,7 +1523,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ry # {0}: Afgekeurde hoeveelheid kan nie in Aankoopopgawe ingevoer word nie
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,"Om kliëntgroep vir die gekose kliënt te verander, word nie toegelaat nie."
 ,Purchase Order Items To Be Billed,Items bestel om te bestel om gefaktureer te word
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Opdatering van geskatte aankomstye.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Opdatering van geskatte aankomstye.
 DocType: Program Enrollment Tool,Enrollment Details,Inskrywingsbesonderhede
 DocType: Purchase Invoice Item,Net Rate,Netto tarief
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Kies asseblief &#39;n kliënt
@@ -1543,18 +1542,20 @@
 DocType: Global Defaults,Current Fiscal Year,Huidige fiskale jaar
 DocType: Purchase Order,Group same items,Groep dieselfde items
 DocType: Purchase Invoice,Disable Rounded Total,Deaktiveer Afgeronde Totaal
-DocType: Employee Loan Application,Repayment Info,Terugbetalingsinligting
+DocType: Department,Parent Department,Ouer Departement
+DocType: Loan Application,Repayment Info,Terugbetalingsinligting
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Inskrywings&#39; kan nie leeg wees nie
 DocType: Maintenance Team Member,Maintenance Role,Onderhoudsrol
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dupliseer ry {0} met dieselfde {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dupliseer ry {0} met dieselfde {1}
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Opstel van werknemers
 DocType: Sales Order,SO-,so-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel besprekingsgebruiker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Kies asseblief voorvoegsel eerste
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,navorsing
+DocType: Subscription Settings,Subscription Settings,Subskripsie-instellings
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,navorsing
 DocType: Maintenance Visit Purpose,Work Done,Werk gedoen
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Spesifiseer asb. Ten minste een eienskap in die tabel Eienskappe
 DocType: Announcement,All Students,Alle studente
@@ -1565,19 +1566,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","&#39;N Itemgroep bestaan met dieselfde naam, verander die itemnaam of verander die naamgroep"
 DocType: Crop Cycle,Less than a year,Minder as &#39;n jaar
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobiele Nr.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Res van die wêreld
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Res van die wêreld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Die item {0} kan nie Batch hê nie
 DocType: Crop,Yield UOM,Opbrengs UOM
 ,Budget Variance Report,Begrotingsverskilverslag
 DocType: Salary Slip,Gross Pay,Bruto besoldiging
 DocType: Item,Is Item from Hub,Is item van hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ry {0}: Aktiwiteitstipe is verpligtend.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividende Betaal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividende Betaal
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Rekeningkunde Grootboek
 DocType: Stock Reconciliation,Difference Amount,Verskilbedrag
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} op Verlof op {1}
 DocType: Purchase Invoice,Reverse Charge,Omgekeerde beheer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Behoue verdienste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Behoue verdienste
 DocType: Purchase Invoice,05-Change in POS,05-verandering in pos
 DocType: Vehicle Log,Service Detail,Diensbesonderhede
 DocType: BOM,Item Description,Item Beskrywing
@@ -1592,12 +1593,12 @@
 DocType: Opportunity Item,Opportunity Item,Geleentheidspunt
 ,Student and Guardian Contact Details,Student en voog Kontakbesonderhede
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Ry {0}: Vir verskaffer {0} E-pos adres is nodig om e-pos te stuur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tydelike opening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Tydelike opening
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Bekyk Hub
 ,Employee Leave Balance,Werknemerverlofbalans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo vir rekening {0} moet altyd {1} wees
 DocType: Patient Appointment,More Info,Meer inligting
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Waardasietempo benodig vir item in ry {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Waardasietempo benodig vir item in ry {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard aksies
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Voorbeeld: Meesters in Rekenaarwetenskap
 DocType: Purchase Invoice,Rejected Warehouse,Verwerp Warehouse
@@ -1607,7 +1608,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,om
 DocType: Supplier Quotation Item,Lead Time in days,Lei Tyd in dae
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Rekeninge betaalbare opsomming
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Betaling van salaris vanaf {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Betaling van salaris vanaf {0} tot {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nie gemagtig om bevrore rekening te redigeer nie {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kry uitstaande fakture
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Verkoopsbestelling {0} is nie geldig nie
@@ -1616,9 +1617,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Voorskrifte
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die totale uitgawe / oordraghoeveelheid {0} in materiaalversoek {1} \ kan nie groter wees as versoekte hoeveelheid {2} vir item {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,klein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,klein
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Openings faktuurskeppings-item
 DocType: Education Settings,Employee Number,Werknemernommer
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Kanselleer faktuur na grasietydperk
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Saaknommer (s) wat reeds in gebruik is. Probeer uit geval nr {0}
 DocType: Project,% Completed,% Voltooi
 ,Invoiced Amount (Exculsive Tax),Faktuurbedrag (Exklusiewe Belasting)
@@ -1632,7 +1634,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorietoetsingstyd
 DocType: Email Digest,Add Quote,Voeg kwotasie by
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM dekselfaktor benodig vir UOM: {0} in Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirekte uitgawes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ry {0}: Aantal is verpligtend
 DocType: Agriculture Analysis Criteria,Agriculture,Landbou
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sinkroniseer meesterdata
@@ -1662,16 +1664,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Vir {0} kan slegs kredietrekeninge gekoppel word teen &#39;n ander debietinskrywing
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taakgewigte moet wees: 1. Pas asseblief die gewigte van alle projektaakse dienooreenkomstig aan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Afleweringsnotasie {0} is nie ingedien nie
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Item {0} moet &#39;n Subkontrakteerde Item wees
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaal Uitrustings
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} moet &#39;n Subkontrakteerde Item wees
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitaal Uitrustings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prysreël word eers gekies gebaseer op &#39;Apply On&#39; -veld, wat Item, Itemgroep of Handelsnaam kan wees."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Stel asseblief die Item Kode eerste
 DocType: Item,ITEM-,item-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Totale toegewysde persentasie vir verkope span moet 100 wees
+DocType: Subscription Plan,Billing Interval Count,Rekeninginterval telling
 DocType: Sales Invoice Item,Edit Description,Wysig Beskrywing
 DocType: Antibiotic,Antibiotic,antibiotika
 ,Team Updates,Span Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Vir Verskaffer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Vir Verskaffer
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Rekeningtipe instel help om hierdie rekening in transaksies te kies.
 DocType: Purchase Invoice,Grand Total (Company Currency),Groot Totaal (Maatskappy Geld)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Skep Drukformaat
@@ -1697,7 +1700,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatiewe item mag nie dieselfde wees as die itemkode nie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} behoort nie aan item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} behoort nie aan item {1}
 DocType: Sales Partner,Target Distribution,Teikenverspreiding
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-finalisering van voorlopige assessering
 DocType: Salary Slip,Bank Account No.,Bankrekeningnommer
@@ -1713,7 +1716,7 @@
 DocType: BOM Operation,Workstation,werkstasie
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Versoek vir Kwotasieverskaffer
 DocType: Healthcare Settings,Registration Message,Registrasie Boodskap
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Voorskrif Dosering
 DocType: Attendance,HR Manager,HR Bestuurder
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Kies asseblief &#39;n maatskappy
@@ -1744,7 +1747,7 @@
 DocType: Project,Start and End Dates,Begin en einddatums
 ,Delivered Items To Be Billed,Aflewerings Items wat gefaktureer moet word
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Oop BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Pakhuis kan nie vir reeksnommer verander word nie.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Pakhuis kan nie vir reeksnommer verander word nie.
 DocType: Authorization Rule,Average Discount,Gemiddelde afslag
 DocType: Project Update,Great/Quickly,Groot / vinnig
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1753,8 +1756,8 @@
 DocType: Employee,EMP/,OBP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Kies asseblief bondels vir batch item
 DocType: Asset,Depreciation Schedules,Waardeverminderingskedules
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Volgende rekeninge kan gekies word in GST-instellings:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Aansoek tydperk kan nie buite verlof toekenning tydperk
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Volgende rekeninge kan gekies word in GST-instellings:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Aansoek tydperk kan nie buite verlof toekenning tydperk
 DocType: Activity Cost,Projects,projekte
 DocType: Payment Request,Transaction Currency,Transaksie Geld
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Van {0} | {1} {2}
@@ -1765,6 +1768,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Gem Daagliks Uitgaande
 DocType: POS Profile,Campaign,veldtog
 DocType: Supplier,Name and Type,Noem en tik
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Goedkeuringsstatus moet &#39;Goedgekeur&#39; of &#39;Afgekeur&#39; wees
 DocType: Physician,Contacts and Address,Kontakte en adres
 DocType: Purchase Invoice,Contact Person,Kontak persoon
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Verwagte begin datum&#39; kan nie groter wees as &#39;Verwagte einddatum&#39; nie
@@ -1778,19 +1782,20 @@
 DocType: Student Admission,Eligibility and Details,Geskiktheid en besonderhede
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Netto verandering in vaste bate
 DocType: Leave Control Panel,Leave blank if considered for all designations,Los leeg as dit oorweeg word vir alle benamings
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Heffing van tipe &#39;Werklik&#39; in ry {0} kan nie in Item Rate ingesluit word nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Heffing van tipe &#39;Werklik&#39; in ry {0} kan nie in Item Rate ingesluit word nie
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Vanaf Datetime
 DocType: Email Digest,For Company,Vir Maatskappy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasie-logboek.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Versoek vir kwotasie is gedeaktiveer om toegang te verkry tot die portaal, vir meer tjekpoortinstellings."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Verskaffer Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Koopbedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Koopbedrag
 DocType: Sales Invoice,Shipping Address Name,Posadres
 DocType: Material Request,Terms and Conditions Content,Terme en voorwaardes Inhoud
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Daar was foute om Kursusskedule te skep
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,kan nie groter as 100 wees nie
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Item {0} is nie &#39;n voorraaditem nie
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Die eerste uitgawes goedere in die lys sal ingestel word as die standaard uitgawes goedkeur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,kan nie groter as 100 wees nie
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Item {0} is nie &#39;n voorraaditem nie
 DocType: Maintenance Visit,Unscheduled,ongeskeduleerde
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Hang af op verlof sonder betaling
@@ -1811,14 +1816,15 @@
 DocType: Package Code,Package Code,Pakketkode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,vakleerling
 DocType: Purchase Invoice,Company GSTIN,Maatskappy GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatiewe Hoeveelheid word nie toegelaat nie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatiewe Hoeveelheid word nie toegelaat nie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Belasting detail tabel haal uit item meester as &#39;n tou en gestoor in hierdie veld. Gebruik vir Belasting en Heffings
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Werknemer kan nie aan homself rapporteer nie.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan nie aan homself rapporteer nie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","As die rekening gevries is, is inskrywings toegelaat vir beperkte gebruikers."
 DocType: Email Digest,Bank Balance,Bankbalans
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekeningkundige Inskrywing vir {0}: {1} kan slegs in valuta gemaak word: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Verlaat Goedkeuring Verpligtend In Verlof Aansoek
 DocType: Job Opening,"Job profile, qualifications required etc.","Werkprofiel, kwalifikasies benodig ens."
 DocType: Journal Entry Account,Account Balance,Rekening balans
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Belastingreël vir transaksies.
@@ -1846,15 +1852,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Bron pakhuis is verpligtend vir ry {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Die betalingstermyn by ry {0} is moontlik &#39;n duplikaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Landbou (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Packing Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kantoorhuur
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opstel SMS gateway instellings
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Packing Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantoorhuur
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Opstel SMS gateway instellings
 DocType: Disease,Common Name,Algemene naam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Invoer misluk!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nog geen adres bygevoeg nie.
 DocType: Workstation Working Hour,Workstation Working Hour,Werkstasie Werksuur
 DocType: Vital Signs,Blood Pressure,Bloeddruk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,ontleder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,ontleder
 DocType: Item,Inventory,Voorraad
 DocType: Item,Sales Details,Verkoopsbesonderhede
 DocType: Quality Inspection,QI-,QI-
@@ -1864,15 +1870,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Bevestig ingeskrewe kursus vir studente in studentegroep
 DocType: Notification Control,Expense Claim Rejected,Uitgawe Eis Afgekeur
 DocType: Item,Item Attribute,Item Attribuut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,regering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,regering
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Uitgawe Eis {0} bestaan reeds vir die Voertuiglogboek
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Instituut Naam
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Voer asseblief terugbetalingsbedrag in
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Voer asseblief terugbetalingsbedrag in
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Item Varianten
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,dienste
 DocType: HR Settings,Email Salary Slip to Employee,E-pos Salarisstrokie aan Werknemer
 DocType: Cost Center,Parent Cost Center,Ouer Koste Sentrum
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Kies moontlike verskaffer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Kies moontlike verskaffer
 DocType: Sales Invoice,Source,Bron
 DocType: Customer,"Select, to make the customer searchable with these fields","Kies, om die kliënt soekbaar te maak met hierdie velde"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Wys gesluit
@@ -1889,7 +1895,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Verpakkingstrokie (s) gekanselleer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Kontantvloei uit Belegging
 DocType: Program Course,Program Course,Programkursus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Vrag en vragkoste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Vrag en vragkoste
 DocType: Homepage,Company Tagline for website homepage,Maatskappynaam vir webwerf tuisblad
 DocType: Item Group,Item Group Name,Itemgroep Naam
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,geneem
@@ -1919,10 +1925,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Details
 DocType: Leave Block List,Block Holidays on important days.,Blok vakansie op belangrike dae.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Voer asseblief alle vereiste resultaatwaarde (s) in
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Rekeninge Ontvangbare Opsomming
-DocType: Employee Loan,Monthly Repayment Amount,Maandelikse Terugbetalingsbedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Rekeninge Ontvangbare Opsomming
+DocType: Loan,Monthly Repayment Amount,Maandelikse Terugbetalingsbedrag
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Opening fakture
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Stel asseblief gebruikers-ID-veld in &#39;n werknemer-rekord om werknemersrol in te stel
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Stel asseblief gebruikers-ID-veld in &#39;n werknemer-rekord om werknemersrol in te stel
 DocType: UOM,UOM Name,UOM Naam
 DocType: GST HSN Code,HSN Code,HSN-kode
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Bydrae Bedrag
@@ -1944,7 +1950,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Gebruiker {0} is reeds aan Geneesheer toegewys {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standaard pakhuis is nodig vir geselekteerde item
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Boks
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Moontlike Verskaffer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Moontlike Verskaffer
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Maandelikse Verspreiding
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Ontvangerlys is leeg. Maak asseblief Ontvangerlys
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Gesondheidsorg (beta)
@@ -1971,7 +1978,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Geen items om te pak nie
 DocType: Shipping Rule Condition,From Value,Uit Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Vervaardiging Hoeveelheid is verpligtend
-DocType: Employee Loan,Repayment Method,Terugbetaling Metode
+DocType: Loan,Repayment Method,Terugbetaling Metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","As dit gekontroleer is, sal die Tuisblad die standaard Itemgroep vir die webwerf wees"
 DocType: Quality Inspection Reading,Reading 4,Lees 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Eise vir maatskappy uitgawes.
@@ -1980,7 +1987,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifikaat benodig
 DocType: Company,Default Holiday List,Verstek Vakansie Lys
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Ry {0}: Van tyd tot tyd van {1} oorvleuel met {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Aandeleverpligtinge
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Aandeleverpligtinge
 DocType: Purchase Invoice,Supplier Warehouse,Verskaffer Pakhuis
 DocType: Opportunity,Contact Mobile No,Kontak Mobielnr
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Kies Maatskappy
@@ -1988,7 +1995,7 @@
 DocType: Student Report Generation Tool,Print Section,Afdrukafdeling
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Gebruiker {0} het geen standaard POS-profiel nie. Gaan standaard by ry {1} vir hierdie gebruiker.
 DocType: Student Group,Set 0 for no limit,Stel 0 vir geen limiet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Die dag (en) waarop u aansoek doen om verlof, is vakansiedae. Jy hoef nie aansoek te doen vir verlof nie."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Die dag (en) waarop u aansoek doen om verlof, is vakansiedae. Jy hoef nie aansoek te doen vir verlof nie."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Ry {idx}: {field} is nodig om die fakture {Opening} {facture_type} te skep
 DocType: Customer,Primary Address and Contact Detail,Primêre adres en kontakbesonderhede
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Stuur betaling-e-pos weer
@@ -1999,7 +2006,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Kies asseblief ten minste een domein.
 DocType: Dependent Task,Dependent Task,Afhanklike taak
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Omskakelingsfaktor vir verstek Eenheid van maatstaf moet 1 in ry {0} wees.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Verlof van tipe {0} kan nie langer wees as {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Verlof van tipe {0} kan nie langer wees as {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer beplanningsaktiwiteite vir X dae van vooraf.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardag herinnerings
 DocType: SMS Center,Receiver List,Ontvanger Lys
@@ -2011,7 +2018,7 @@
 DocType: Assessment Plan,Grading Scale,Graderingskaal
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid van maat {0} is meer as een keer in die Faktor Tabel ingevoer
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Reeds afgehandel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Voorraad in die hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Voorraad in die hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Suksesvolle invoer!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betaling Versoek bestaan reeds {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koste van uitgereikte items
@@ -2022,17 +2029,16 @@
 DocType: Quotation Item,Quotation Item,Kwotasie Item
 DocType: Customer,Customer POS Id,Kliënt Pos ID
 DocType: Account,Account Name,Rekeningnaam
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Vanaf datum kan nie groter wees as Datum
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Reeksnommer {0} hoeveelheid {1} kan nie &#39;n breuk wees nie
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Vanaf datum kan nie groter wees as Datum
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Reeksnommer {0} hoeveelheid {1} kan nie &#39;n breuk wees nie
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Voer asseblief die Woocommerce-bediener-URL in
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Verskaffer Tipe meester.
 DocType: Purchase Order Item,Supplier Part Number,Verskaffer artikel nommer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Gesprek koers kan nie 0 of 1 wees nie
 DocType: Share Balance,To No,Na nee
-DocType: Subscription,Reference Document,Verwysingsdokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} is gekanselleer of gestop
 DocType: Accounts Settings,Credit Controller,Kredietbeheerder
-DocType: Grant Application,Applicant Type,Aansoeker Tipe
+DocType: Loan,Applicant Type,Aansoeker Tipe
 DocType: Purchase Invoice,03-Deficiency in services,03-tekort aan dienste
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Versending Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standaard Mediese Kode Standaard
@@ -2043,13 +2049,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% gefaktureer
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Gereserveerde hoeveelheid
 DocType: Party Account,Party Account,Partyrekening
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Menslike hulpbronne
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Menslike hulpbronne
 DocType: Lead,Upper Income,Boonste Inkomste
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,verwerp
 DocType: Journal Entry Account,Debit in Company Currency,Debiet in Maatskappy Geld
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Vir Werknemer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Maak uitbetalinginskrywing
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Maak uitbetalinginskrywing
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ry {0}: Voorskot teen Verskaffer moet debiet wees
 DocType: Company,Default Values,Verstekwaardes
 DocType: Membership,INR,INR
@@ -2078,10 +2084,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totaal (Sonder Belasting)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter as 0 wees
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Voorraad beskikbaar
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Voorraad beskikbaar
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasiteitsbeplanning vir (Dae)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,verkryging
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Geen van die items het enige verandering in hoeveelheid of waarde nie.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Geen van die items het enige verandering in hoeveelheid of waarde nie.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Verpligte veld - Program
 DocType: Special Test Template,Result Component,Resultaat Komponent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Waarborg eis
@@ -2101,7 +2107,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Sluit vakansiedae in blare in as blare
 DocType: Sales Invoice,Packed Items,Gepakte items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Waarborg Eis teen Serienommer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Totale&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Totale&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiveer inkopiesentrum
 DocType: Employee,Permanent Address,Permanente adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2119,10 +2125,10 @@
 DocType: Selling Settings,Selling Settings,Verkoop instellings
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Bevestig Aksie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Aanlyn veilings
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Spesifiseer asb. Hoeveelheid of Waardasietempo of albei
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Spesifiseer asb. Hoeveelheid of Waardasietempo of albei
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,vervulling
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Kyk in die winkelwagen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Bemarkingsuitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Bemarkingsuitgawes
 ,Item Shortage Report,Item kortverslag
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kan nie standaard kriteria skep nie. Verander asseblief die kriteria
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewig word genoem, \ nBelang ook &quot;Gewig UOM&quot;"
@@ -2144,9 +2150,9 @@
 DocType: Upload Attendance,Get Template,Kry Sjabloon
 DocType: Material Request,Transferred,oorgedra
 DocType: Vehicle,Doors,deure
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Versamel fooi vir pasiëntregistrasie
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan nie eienskappe verander na voorraadtransaksie nie. Maak &#39;n nuwe item en dra voorraad na die nuwe item
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan nie eienskappe verander na voorraadtransaksie nie. Maak &#39;n nuwe item en dra voorraad na die nuwe item
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,Belastingafskrywing
 DocType: Packing Slip,PS-,PS-
@@ -2182,11 +2188,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Versoening JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Te veel kolomme. Voer die verslag uit en druk dit uit met behulp van &#39;n sigbladprogram.
 DocType: Purchase Invoice Item,Batch No,Lotnommer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Werknemersvorderings
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laat meerdere verkope bestellings toe teen &#39;n kliënt se aankoopbestelling
 DocType: Student Group Instructor,Student Group Instructor,Studentegroepinstrukteur
 DocType: Grant Application,Assessment  Mark (Out of 10),Assesseringspunt (uit 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Stel voorvoegsel vir nommering van reekse op u transaksies
 DocType: Employee Attendance Tool,Employees HTML,Werknemers HTML
@@ -2195,15 +2202,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Geleentheid Van veld is verpligtend
 DocType: Email Digest,Annual Expenses,Jaarlikse uitgawes
 DocType: Item,Variants,variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Maak &#39;n bestelling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Maak &#39;n bestelling
 DocType: SMS Center,Send To,Stuur na
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewysde bedrag
 DocType: Sales Team,Contribution to Net Total,Bydrae tot netto totaal
 DocType: Sales Invoice Item,Customer's Item Code,Kliënt se Item Kode
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraadversoening
 DocType: Territory,Territory Name,Territorium Naam
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Werk-in-Progress-pakhuis word vereis voor indiening
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,U kan slegs Planne met dieselfde faktuursiklus in &#39;n intekening hê
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aansoeker vir &#39;n werk.
 DocType: Purchase Order Item,Warehouse and Reference,Pakhuis en verwysing
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutêre inligting en ander algemene inligting oor u Verskaffer
@@ -2212,10 +2220,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Teen Joernaal Inskrywing {0} het geen ongeëwenaarde {1} inskrywing nie
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,evaluerings
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Opleidingsgebeure
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplikaatreeksnommer vir item {0} ingevoer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplikaatreeksnommer vir item {0} ingevoer
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Volg leidrade deur die leidingsbron.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,&#39;N Voorwaarde vir &#39;n verskepingsreël
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Kom asseblief in
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Kom asseblief in
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Onderhoud Log
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Stel asseblief die filter op grond van item of pakhuis
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Die netto gewig van hierdie pakket. (bereken outomaties as som van netto gewig van items)
@@ -2223,11 +2231,11 @@
 DocType: Sales Order,To Deliver and Bill,Om te lewer en rekening
 DocType: Student Group,Instructors,instrukteurs
 DocType: GL Entry,Credit Amount in Account Currency,Kredietbedrag in rekeninggeld
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} moet ingedien word
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} moet ingedien word
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Aandeelbestuur
 DocType: Authorization Control,Authorization Control,Magtigingskontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ry # {0}: Afgekeurde pakhuis is verpligtend teen verwerp item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,betaling
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} is nie gekoppel aan enige rekening nie, noem asseblief die rekening in die pakhuisrekord of stel verstekvoorraadrekening in maatskappy {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Bestuur jou bestellings
 DocType: Work Order Operation,Actual Time and Cost,Werklike Tyd en Koste
@@ -2237,7 +2245,7 @@
 DocType: Student Leave Application,Student Leave Application,Studenteverlof Aansoek
 DocType: Item,Will also apply for variants,Sal ook aansoek doen vir variante
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Bate kan nie gekanselleer word nie, want dit is reeds {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Werknemer {0} op Halwe dag op {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Werknemer {0} op Halwe dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totale werksure moet nie groter wees nie as maksimum werksure {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,op
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel items op die tyd van verkoop.
@@ -2247,7 +2255,7 @@
 DocType: Item,Barcodes,barcodes
 DocType: Hub Category,Hub Node,Hub Knoop
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jy het dubbele items ingevoer. Regstel asseblief en probeer weer.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Mede
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Mede
 DocType: Asset Movement,Asset Movement,Batebeweging
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nuwe karretjie
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} is nie &#39;n seriële item nie
@@ -2264,13 +2272,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Faktureer geldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid- of partyrekeninggeldeenheid
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Dui aan dat die pakket deel van hierdie aflewering is (Slegs Konsep)
 DocType: Soil Texture,Loam,leem
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Ry {0}: Due Date kan nie voor die posdatum wees nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Ry {0}: Due Date kan nie voor die posdatum wees nie
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Maak betalinginskrywing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid vir item {0} moet minder wees as {1}
 ,Sales Invoice Trends,Verkoopsfaktuur neigings
 DocType: Leave Application,Apply / Approve Leaves,Pas / keur Blare toe
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,vir
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan slegs ry verwys as die lading tipe &#39;Op vorige rybedrag&#39; of &#39;Vorige ry totaal&#39; is
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan slegs ry verwys as die lading tipe &#39;Op vorige rybedrag&#39; of &#39;Vorige ry totaal&#39; is
 DocType: Sales Order Item,Delivery Warehouse,Delivery Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Boom van finansiële kostesentrums.
 DocType: Serial No,Delivery Document No,Afleweringsdokument No
@@ -2284,7 +2291,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materiaalverbruik is nie in Vervaardigingsinstellings gestel nie.
 DocType: Student,Student Mobile Number,Student Mobiele Nommer
 DocType: Item,Has Variants,Het Varianten
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan nie oorbetaal vir Item {0} in ry {1} meer as {2}. Om oor-faktuur toe te laat, stel asseblief in Voorraadinstellings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan nie oorbetaal vir Item {0} in ry {1} meer as {2}. Om oor-faktuur toe te laat, stel asseblief in Voorraadinstellings"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update Response
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Jy het reeds items gekies van {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van die Maandelikse Verspreiding
@@ -2295,12 +2302,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Kies die program eerste
 DocType: Patient Appointment,Patient Age,Pasiënt ouderdom
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Bestuur van projekte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Reeksnommer {0} is alreeds teruggestuur
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Reeksnommer {0} is alreeds teruggestuur
 DocType: Supplier,Supplier of Goods or Services.,Verskaffer van goedere of dienste.
 DocType: Budget,Fiscal Year,Fiskale jaar
 DocType: Asset Maintenance Log,Planned,beplan
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Verstek ontvangbare rekeninge wat gebruik moet word indien dit nie in Pasiënt gestel word nie. Konsultasiekoste.
 DocType: Vehicle Log,Fuel Price,Brandstofprys
+DocType: Bank Guarantee,Margin Money,Margin Geld
 DocType: Budget,Budget,begroting
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Stel oop
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Vaste bate-item moet &#39;n nie-voorraaditem wees.
@@ -2314,16 +2322,16 @@
 DocType: Lead,Follow Up,Volg op
 DocType: Item,Is Sales Item,Is verkoopitem
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Itemgroep Boom
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} is nie opgestel vir Serial Nos. Check Item Master
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Item {0} is nie opgestel vir Serial Nos. Check Item Master
 DocType: Maintenance Visit,Maintenance Time,Onderhoudstyd
 ,Amount to Deliver,Bedrag om te lewer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Dieselfde item is verskeie kere ingevoer. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Die Termyn Aanvangsdatum kan nie vroeër wees as die Jaar Begindatum van die akademiese jaar waaraan die term gekoppel is nie (Akademiese Jaar ()). Korrigeer asseblief die datums en probeer weer.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Daar was foute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Werknemer {0} het reeds aansoek gedoen vir {1} tussen {2} en {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Daar was foute.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Werknemer {0} het reeds aansoek gedoen vir {1} tussen {2} en {3}:
 DocType: Guardian,Guardian Interests,Voogbelange
 DocType: Naming Series,Current Value,Huidige waarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Verskeie fiskale jare bestaan vir die datum {0}. Stel asseblief die maatskappy in die fiskale jaar
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Verskeie fiskale jare bestaan vir die datum {0}. Stel asseblief die maatskappy in die fiskale jaar
 DocType: Education Settings,Instructor Records to be created by,Instrukteur Rekords wat geskep moet word deur
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} geskep
 DocType: GST Account,GST Account,GST rekening
@@ -2342,8 +2350,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Betaaldatum kan nie voor die datum van inskrywing wees nie
 DocType: Website Item Group,Website Item Group,Webtuiste Itemgroep
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Bygevoeg aan gunstelinge
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrokie gevind vir die bogenoemde geselekteerde kriteria OF salarisstrokie wat reeds ingedien is nie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Pligte en Belastings
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrokie gevind vir die bogenoemde geselekteerde kriteria OF salarisstrokie wat reeds ingedien is nie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Pligte en Belastings
 DocType: Projects Settings,Projects Settings,Projekte Instellings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Voer asseblief Verwysingsdatum in
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingsinskrywings kan nie gefiltreer word deur {1}
@@ -2353,27 +2361,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Boom van itemgroepe.
 DocType: Production Plan,Total Produced Qty,Totale vervaardigde hoeveelheid
 DocType: Payroll Entry,Get Employee Details,Kry Werknemers Besonderhede
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kan nie rynommer groter as of gelyk aan huidige rynommer vir hierdie laai tipe verwys nie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kan nie rynommer groter as of gelyk aan huidige rynommer vir hierdie laai tipe verwys nie
 DocType: Asset,Sold,verkoop
 ,Item-wise Purchase History,Item-wyse Aankoop Geskiedenis
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik asseblief op &#39;Generate Schedule&#39; om Serial No te laai vir Item {0}
 DocType: Account,Frozen,bevrore
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbedrag (Maatskappy Geld)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Grondstowwe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Grondstowwe
 DocType: Payment Reconciliation Payment,Reference Row,Verwysingsreeks
 DocType: Installation Note,Installation Time,Installasie Tyd
 DocType: Sales Invoice,Accounting Details,Rekeningkundige Besonderhede
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Vee al die transaksies vir hierdie maatskappy uit
 DocType: Patient,O Positive,O Positief
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,beleggings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,beleggings
 DocType: Issue,Resolution Details,Besluit Besonderhede
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,toekennings
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Aanvaarding kriteria
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vul asseblief die Materiaal Versoeke in die tabel hierbo in
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Geen terugbetalings beskikbaar vir Joernaalinskrywings nie
 DocType: Item Attribute,Attribute Name,Eienskap Naam
 DocType: BOM,Show In Website,Wys op die webwerf
 DocType: Shopping Cart Settings,Show Quantity in Website,Wys hoeveelheid in die webwerf
-DocType: Employee Loan Application,Total Payable Amount,Totale betaalbare bedrag
+DocType: Loan Application,Total Payable Amount,Totale betaalbare bedrag
 DocType: Task,Expected Time (in hours),Verwagte Tyd (in ure)
 DocType: Item Reorder,Check in (group),Check in (groep)
 DocType: Soil Texture,Silt,slik
@@ -2392,7 +2401,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Maak betaling
 DocType: Room,Room Name,Kamer Naam
 DocType: Prescription Duration,Prescription Duration,Voorskrif Tydsduur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan nie voor {0} toegepas / gekanselleer word nie, aangesien verlofbalans reeds in die toekomstige verlofrekordrekord {1} oorgedra is."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan nie voor {0} toegepas / gekanselleer word nie, aangesien verlofbalans reeds in die toekomstige verlofrekordrekord {1} oorgedra is."
 DocType: Activity Cost,Costing Rate,Kostekoers
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kliënt Adresse en Kontakte
 ,Campaign Efficiency,Veldtogdoeltreffendheid
@@ -2410,11 +2419,11 @@
 DocType: Chapter,Chapter,Hoofstuk
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Paar
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Verstek rekening sal outomaties opgedateer word in POS Invoice wanneer hierdie modus gekies word.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Kies BOM en hoeveelheid vir produksie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Kies BOM en hoeveelheid vir produksie
 DocType: Asset,Depreciation Schedule,Waardeverminderingskedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Verkope Partner Adresse en Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Teen rekening
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Halfdag Datum moet tussen datum en datum wees
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Halfdag Datum moet tussen datum en datum wees
 DocType: Maintenance Schedule Detail,Actual Date,Werklike Datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Stel asseblief die Standaardkostesentrum in {0} maatskappy.
 DocType: Item,Has Batch No,Het lotnommer
@@ -2432,7 +2441,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Werklike Einddatum (via Tydblad)
 DocType: Soil Texture,Soil Type,Grondsoort
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Bedrag {0} {1} teen {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nuwe boodskap
 ,Quotation Trends,Aanhalingstendense
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Itemgroep nie genoem in itemmeester vir item {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandaat
@@ -2452,7 +2460,7 @@
 DocType: Hub Category,Hub Category,Hub Kategorie
 DocType: Purchase Invoice,SEZ,Sez
 DocType: Purchase Receipt,Vehicle Number,Voertuignommer
-DocType: Employee Loan,Loan Amount,Leningsbedrag
+DocType: Loan,Loan Amount,Leningsbedrag
 DocType: Student Report Generation Tool,Add Letterhead,Voeg Briefhoof
 DocType: Program Enrollment,Self-Driving Vehicle,Selfritvoertuig
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Verskaffer Scorecard Standing
@@ -2480,9 +2488,9 @@
 DocType: Cash Flow Mapper,Position,posisie
 DocType: Patient,Patient Details,Pasiëntbesonderhede
 DocType: Patient,B Positive,B Positief
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
 DocType: Leave Block List Allow,Leave Block List Allow,Laat blokblokkering toe
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
 DocType: Patient Medical Record,Patient Medical Record,Pasiënt Mediese Rekord
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groep na Nie-Groep
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2490,8 +2498,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totaal Werklik
 DocType: Lab Test UOM,Test UOM,Toets UOM
 DocType: Student Siblings,Student Siblings,Student broers en susters
+DocType: Subscription Plan Detail,Subscription Plan Detail,Inskrywingsplanbesonderhede
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,eenheid
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Spesifiseer asb. Maatskappy
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Spesifiseer asb. Maatskappy
 ,Customer Acquisition and Loyalty,Kliënt Verkryging en Lojaliteit
 DocType: Asset Maintenance Task,Maintenance Task,Onderhoudstaak
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Stel asseblief B2C-limiet in GST-instellings.
@@ -2505,6 +2514,7 @@
 ,BOM Search,BOM Soek
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Totale verbruikte materiaalkoste (via voorraadinskrywing)
 DocType: Hub Settings,Company Registered,Maatskappy geregistreer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Datum kan nie minder as vanaf datum wees nie
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiseer &quot;In voorraad&quot; of &quot;Nie in voorraad nie&quot; op Hub gebaseer op voorraad beskikbaar in hierdie pakhuis.
 DocType: Vehicle,Fuel Type,Brandstoftipe
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Spesifiseer asseblief geldeenheid in die Maatskappy
@@ -2512,17 +2522,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} word negatief {1} vir Item {2} by Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Materiële Versoeke is outomaties opgestel op grond van die item se herbestellingsvlak
 DocType: Email Digest,Pending Sales Orders,Hangende verkooporders
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
 DocType: Employee,Create User Permission,Skep gebruikertoestemming
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 DocType: Healthcare Settings,Remind Before,Herinner Voor
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Gespreksfaktor word benodig in ry {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van verkoopsbestelling, verkoopsfaktuur of tydskrifinskrywing wees"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van verkoopsbestelling, verkoopsfaktuur of tydskrifinskrywing wees"
 DocType: Salary Component,Deduction,aftrekking
 DocType: Item,Retain Sample,Behou monster
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ry {0}: Van tyd tot tyd is verpligtend.
 DocType: Stock Reconciliation Item,Amount Difference,Bedrag Verskil
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Itemprys bygevoeg vir {0} in Pryslys {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Itemprys bygevoeg vir {0} in Pryslys {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Voer asseblief die werknemer se ID van hierdie verkoopspersoon in
 DocType: Territory,Classification of Customers by region,Klassifikasie van kliënte volgens streek
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,In produksie
@@ -2532,8 +2543,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berekende Bankstaatbalans
 DocType: Normal Test Template,Normal Test Template,Normale toets sjabloon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,gestremde gebruiker
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,aanhaling
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Kan nie &#39;n RFQ vir geen kwotasie opstel nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,aanhaling
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Kan nie &#39;n RFQ vir geen kwotasie opstel nie
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totale aftrekking
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Kies &#39;n rekening om in rekeningmunt te druk
@@ -2541,7 +2552,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseer op transaksies teen hierdie pasiënt. Sien die tydlyn hieronder vir besonderhede
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Koste opgedateer
 DocType: Patient,Date of Birth,Geboortedatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Item {0} is reeds teruggestuur
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Item {0} is reeds teruggestuur
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskale Jaar ** verteenwoordig &#39;n finansiële jaar. Alle rekeningkundige inskrywings en ander belangrike transaksies word opgespoor teen ** Fiskale Jaar **.
 DocType: Opportunity,Customer / Lead Address,Kliënt / Loodadres
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Verskaffer Scorecard Setup
@@ -2552,14 +2563,15 @@
 DocType: Work Order Operation,Actual Operation Time,Werklike operasietyd
 DocType: Authorization Rule,Applicable To (User),Toepaslik op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,aftrek
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Pos beskrywing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Pos beskrywing
 DocType: Student Applicant,Applied,Toegepaste
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Heropen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Heropen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Aantal per Voorraad UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Naam
 DocType: Purchase Invoice,02-Post Sale Discount,02-Posverkoopprys
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesiale karakters behalwe &quot;-&quot;, &quot;#&quot;, &quot;.&quot; en &quot;/&quot; word nie toegelaat in die benoeming van reekse nie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hou tred met verkoopsveldtogte. Bly op hoogte van leidrade, kwotasies, verkoopsvolgorde, ens. Van veldtogte om opbrengs op belegging te meet."
+DocType: Department Approver,Approver,Goedkeurder
 ,SO Qty,SO Aantal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Die veld Aan Aandeelhouer kan nie leeg wees nie
 DocType: Guardian,Work Address,Werkadres
@@ -2573,21 +2585,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totale toegewysde bedrag (Maatskappy Geld)
 DocType: Purchase Order Item,To be delivered to customer,Om aan kliënt gelewer te word
 DocType: BOM,Scrap Material Cost,Skrootmateriaal Koste
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Rekeningnommer {0} hoort nie aan enige pakhuis nie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Rekeningnommer {0} hoort nie aan enige pakhuis nie
 DocType: Grant Application,Email Notification Sent,E-pos kennisgewing gestuur
 DocType: Purchase Invoice,In Words (Company Currency),In Woorde (Maatskappy Geld)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Item Kode, pakhuis, hoeveelheid benodig op ry"
-DocType: Pricing Rule,Supplier,verskaffer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Item Kode, pakhuis, hoeveelheid benodig op ry"
+DocType: Bank Guarantee,Supplier,verskaffer
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Wys betalingsbesonderhede
 DocType: Consultation,Consultation Time,Konsultasietyd
 DocType: C-Form,Quarter,kwartaal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Diverse uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Diverse uitgawes
 DocType: Global Defaults,Default Company,Verstek Maatskappy
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Uitgawe of Verskil rekening is verpligtend vir Item {0} aangesien dit die totale voorraadwaarde beïnvloed
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Naam
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-bo
-DocType: Employee Loan,Employee Loan Account,Werknemersleningrekening
 DocType: Leave Application,Total Leave Days,Totale Verlofdae
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: E-pos sal nie na gestremde gebruikers gestuur word nie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Aantal interaksies
@@ -2602,7 +2613,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Gewig (In Kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",hoofstukke / hoofstuknaam laat leeg outomaties ingestel nadat die hoofstuk gestoor is.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Stel asseblief GST-rekeninge in GST-instellings
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Stel asseblief GST-rekeninge in GST-instellings
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tipe besigheid
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kies asseblief Toegewysde bedrag, faktuurtipe en faktuurnommer in ten minste een ry"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Koste van nuwe aankope
@@ -2611,12 +2622,13 @@
 DocType: Grant Application,Grant Description,Toekennings Beskrywing
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Maatskappy Geld)
 DocType: Student Guardian,Others,ander
+DocType: Subscription,Discounts,afslag
 DocType: Payment Entry,Unallocated Amount,Nie-toegewysde bedrag
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Kan nie &#39;n ooreenstemmende item vind nie. Kies asseblief &#39;n ander waarde vir {0}.
 DocType: POS Profile,Taxes and Charges,Belasting en heffings
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","&#39;N Produk of &#39;n Diens wat gekoop, verkoop of in voorraad gehou word."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Geen verdere opdaterings nie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan lading tipe nie as &#39;Op vorige rybedrag&#39; of &#39;Op vorige ry totale&#39; vir eerste ry kies nie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan lading tipe nie as &#39;Op vorige rybedrag&#39; of &#39;Op vorige ry totale&#39; vir eerste ry kies nie
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Dit dek alle telkaarte wat aan hierdie opstelling gekoppel is
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kind Item moet nie &#39;n produkbond wees nie. Verwyder asseblief item `{0}` en stoor
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2624,45 +2636,48 @@
 DocType: Vehicle Service,Service Item,Diens Item
 DocType: Bank Guarantee,Bank Guarantee,Bankwaarborg
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik asseblief op &#39;Generate Schedule&#39; om skedule te kry
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 DocType: Bin,Ordered Quantity,Bestelde Hoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",bv. &quot;Bou gereedskap vir bouers&quot;
 DocType: Grading Scale,Grading Scale Intervals,Graderingskaalintervalle
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Wins vir die jaar
+DocType: Bank Guarantee,Name of Bank,Naam van Bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Rekeningkundige Inskrywing vir {2} kan slegs in valuta gemaak word: {3}
 DocType: Fee Schedule,In Process,In proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Korting
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Boom van finansiële rekeninge.
+DocType: Bank Guarantee,Reference Document Type,Verwysings dokument tipe
 DocType: Cash Flow Mapping,Cash Flow Mapping,Kontantvloeikaart
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} teen verkoopsbestelling {1}
 DocType: Account,Fixed Asset,Vaste bate
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pos word nie in verstekkontak gevind nie
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genereer Geheime
-DocType: Employee Loan,Account Info,Rekeninginligting
+DocType: Loan,Account Info,Rekeninginligting
 DocType: Activity Type,Default Billing Rate,Standaard faktuurkoers
 DocType: Fees,Include Payment,Sluit betaling in
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentegroepe geskep.
 DocType: Sales Invoice,Total Billing Amount,Totale faktuurbedrag
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program in die Fooistruktuur en Studentegroep {0} is anders.
 DocType: Fee Schedule,Receivable Account,Ontvangbare rekening
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Ry # {0}: Bate {1} is reeds {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Ry # {0}: Bate {1} is reeds {2}
 DocType: Quotation Item,Stock Balance,Voorraadbalans
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Verkoopsbestelling tot Betaling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,hoof uitvoerende beampte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,hoof uitvoerende beampte
 DocType: Purchase Invoice,With Payment of Tax,Met betaling van belasting
 DocType: Expense Claim Detail,Expense Claim Detail,Koste eis Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAAT VIR VERSKAFFER
 DocType: Land Unit,Is Container,Is Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Dit sal dag 1 van die gewas siklus wees
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Kies asseblief die korrekte rekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Kies asseblief die korrekte rekening
 DocType: Purchase Invoice Item,Weight UOM,Gewig UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lys van beskikbare Aandeelhouers met folio nommers
 DocType: Salary Structure Employee,Salary Structure Employee,Salarisstruktuur Werknemer
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Wys Variant Eienskappe
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Wys Variant Eienskappe
 DocType: Student,Blood Group,Bloedgroep
 DocType: Course,Course Name,Kursus naam
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers wat &#39;n spesifieke werknemer se verlof aansoeke kan goedkeur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kantoor Uitrustingen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kantoor Uitrustingen
 DocType: Purchase Invoice Item,Qty,Aantal
 DocType: Fiscal Year,Companies,maatskappye
 DocType: Supplier Scorecard,Scoring Setup,Scoring opstel
@@ -2681,7 +2696,7 @@
 DocType: Stock Entry,Total Incoming Value,Totale Inkomende Waarde
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debiet na is nodig
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tydskrifte help om tred te hou met tyd, koste en faktuur vir aktiwiteite wat deur u span gedoen is"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Aankooppryslys
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Aankooppryslys
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates van verskaffers telkaart veranderlikes.
 DocType: Job Offer Term,Offer Term,Aanbod Termyn
 DocType: Asset,Quality Manager,Kwaliteitsbestuurder
@@ -2693,13 +2708,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Totaal Onbetaald: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operasie
 DocType: Supplier Scorecard,Supplier Score,Verskaffer telling
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Totaal gefaktureerde Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Totaal gefaktureerde Amt
 DocType: Supplier,Warn RFQs,Waarsku RFQs
 DocType: BOM,Conversion Rate,Omskakelingskoers
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Produksoektog
 DocType: Assessment Plan,To Time,Tot tyd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeurende rol (bo gemagtigde waarde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Krediet Vir rekening moet &#39;n betaalbare rekening wees
+DocType: Loan,Total Amount Paid,Totale bedrag betaal
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Kies asseblief Studentetoelating wat verpligtend is vir die betaalde studenteversoeker
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} kan nie ouer of kind van {2} wees nie
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Kies asseblief &#39;n Pryslys om pryse te publiseer
@@ -2709,18 +2725,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Pryslys {0} is gedeaktiveer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ry {0}: Voltooide hoeveelheid kan nie meer wees as {1} vir operasie {2}
 DocType: Manufacturing Settings,Allow Overtime,Laat Oortyd toe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized Item {0} kan nie met behulp van Voorraadversoening opgedateer word nie. Gebruik asseblief Voorraadinskrywing
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized Item {0} kan nie met behulp van Voorraadversoening opgedateer word nie. Gebruik asseblief Voorraadinskrywing
 DocType: Training Event Employee,Training Event Employee,Opleiding Event Werknemer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimum monsters - {0} kan behou word vir bondel {1} en item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Voeg tydgleuwe by
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Reeksnommers benodig vir Item {1}. U het {2} verskaf.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Reeksnommers benodig vir Item {1}. U het {2} verskaf.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Waardasietarief
 DocType: Training Event,Advance,bevorder
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,om weer terug te keer.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless betaling gateway instellings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Uitruil wins / verlies
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Uitruil wins / verlies
 DocType: Opportunity,Lost Reason,Verlore Rede
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Ry # {0}: Rekening {1} behoort nie aan maatskappy nie {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Ry # {0}: Rekening {1} behoort nie aan maatskappy nie {2}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuwe adres
 DocType: Quality Inspection,Sample Size,Steekproefgrootte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vul asseblief die kwitansie dokument in
@@ -2738,7 +2753,6 @@
 DocType: Bin,Actual Quantity,Werklike Hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Voorbeeld: Volgende Dag Pos
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Rekeningnommer {0} nie gevind nie
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Intekening is {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fooiskedule Program
 DocType: Fee Schedule Program,Student Batch,Studentejoernaal
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Maak Student
@@ -2752,14 +2766,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nie afgelewer nie
 ,Bank Clearance Summary,Bank Opruimingsopsomming
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Skep en bestuur daaglikse, weeklikse en maandelikse e-posverdelings."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Skep en bestuur daaglikse, weeklikse en maandelikse e-posverdelings."
 DocType: Appraisal Goal,Appraisal Goal,Evalueringsdoel
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Stel Kategorie voor?
 DocType: Stock Reconciliation Item,Current Amount,Huidige Bedrag
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,geboue
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,geboue
 DocType: Fee Schedule,Fee Structure,Fooistruktuur
 DocType: Timesheet Detail,Costing Amount,Kosteberekening
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
 DocType: Student Admission Program,Application Fee,Aansoek fooi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Dien Salarisstrokie in
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm afslag vir Item {0} is {1}%
@@ -2767,12 +2780,13 @@
 DocType: Sales Partner,Address & Contacts,Adres &amp; Kontakte
 DocType: SMS Log,Sender Name,Sender Naam
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Landbou Analise Kriteria
+DocType: HR Settings,Leave Approval Notification Template,Verlaat goedkeuringskennisgewingsjabloon
 DocType: POS Profile,[Select],[Kies]
 DocType: Vital Signs,Blood Pressure (diastolic),Bloeddruk (diastoliese)
 DocType: SMS Log,Sent To,Gestuur na
 DocType: Agriculture Task,Holiday Management,Vakansiebestuur
 DocType: Payment Request,Make Sales Invoice,Maak verkoopfaktuur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Volgende kontak datum kan nie in die verlede wees nie
 DocType: Company,For Reference Only.,Slegs vir verwysing.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Geneesheer {0} nie beskikbaar op {1}
@@ -2790,7 +2804,7 @@
 DocType: Employee,New Workplace,Nuwe werkplek
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materiële verbruik
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Stel as gesluit
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Geen item met strepieskode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Geen item met strepieskode {0}
 DocType: Normal Test Items,Require Result Value,Vereis Resultaatwaarde
 DocType: Item,Show a slideshow at the top of the page,Wys &#39;n skyfievertoning bo-aan die bladsy
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMs
@@ -2805,19 +2819,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Geen aktiewe of standaard Salarestruktuur vir werknemer {0} vir die gegewe datums gevind nie
 DocType: Leave Block List,Allow Users,Laat gebruikers toe
 DocType: Purchase Order,Customer Mobile No,Kliënt Mobiele Nr
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,herhalende
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Kontantvloeiskaart-sjabloon Besonderhede
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Leningbestuur
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Volg afsonderlike inkomste en uitgawes vir produk vertikale of afdelings.
 DocType: Rename Tool,Rename Tool,Hernoem Gereedskap
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Dateer koste
 DocType: Item Reorder,Item Reorder,Item Herbestelling
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Toon Salary Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Oordragmateriaal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Toon Salary Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Oordragmateriaal
 DocType: Fees,Send Payment Request,Stuur betalingsversoek
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiseer die bedrywighede, bedryfskoste en gee &#39;n unieke operasie nee vir u bedrywighede."
 DocType: Water Analysis,Origin,oorsprong
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hierdie dokument is oor limiet deur {0} {1} vir item {4}. Maak jy &#39;n ander {3} teen dieselfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Kies verander bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Pryslys Geld
 DocType: Naming Series,User must always select,Gebruiker moet altyd kies
@@ -2832,14 +2846,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Is Inkomstebelasting Aanspreeklikheid
 DocType: Grading Scale Interval,Grade Description,Graad Beskrywing
 DocType: Stock Entry,Purchase Receipt No,Aankoop Kwitansie Nee
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Ernstigste Geld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Ernstigste Geld
 DocType: Sales Invoice, Shipping Bill Number,Poskaartjie Pos
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,naspeurbaarheid
 DocType: Asset Maintenance Log,Actions performed,Aktiwiteite uitgevoer
 DocType: Cash Flow Mapper,Section Leader,Afdeling Leier
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Bron van fondse (laste)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Bron van fondse (laste)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in ry {0} ({1}) moet dieselfde wees as vervaardigde hoeveelheid {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,werknemer
+DocType: Bank Guarantee,Fixed Deposit Number,Vaste deposito nommer
 DocType: Asset Repair,Failure Date,Mislukkingsdatum
 DocType: Sample Collection,Collected Time,Versamelde Tyd
 DocType: Company,Sales Monthly History,Verkope Maandelikse Geskiedenis
@@ -2856,10 +2871,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Is jy seker jy wil hierdie afspraak kanselleer?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Kamerpryse
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Verkope Pyplyn
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Stel asseblief die verstek rekening in Salaris Komponent {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Stel asseblief die verstek rekening in Salaris Komponent {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereis Aan
 DocType: Rename Tool,File to Rename,Lêer om hernoem te word
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Kies asseblief BOM vir item in ry {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Haal intekeningopdaterings
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Rekening {0} stem nie ooreen met Maatskappy {1} in rekeningmodus nie: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Spesifieke BOM {0} bestaan nie vir Item {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursus:
@@ -2869,7 +2885,7 @@
 DocType: Notification Control,Expense Claim Approved,Koste-eis Goedgekeur
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Geen werkbestellings geskep nie
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Salaris Slip van werknemer {0} wat reeds vir hierdie tydperk geskep is
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,farmaseutiese
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,farmaseutiese
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koste van gekoopte items
 DocType: Selling Settings,Sales Order Required,Verkope bestelling benodig
 DocType: Purchase Invoice,Credit To,Krediet aan
@@ -2887,7 +2903,7 @@
 DocType: Request for Quotation Supplier,No Quote,Geen kwotasie nie
 DocType: Warranty Claim,Raised By,Verhoog deur
 DocType: Payment Gateway Account,Payment Account,Betalingrekening
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Spesifiseer asseblief Maatskappy om voort te gaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Spesifiseer asseblief Maatskappy om voort te gaan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Netto verandering in rekeninge ontvangbaar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompenserende Off
 DocType: Job Offer,Accepted,aanvaar
@@ -2899,7 +2915,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Maak asseblief seker dat u regtig alle transaksies vir hierdie maatskappy wil verwyder. Jou meesterdata sal bly soos dit is. Hierdie handeling kan nie ongedaan gemaak word nie.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Soek Resultate
 DocType: Room,Room Number,Kamer nommer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ongeldige verwysing {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ongeldige verwysing {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Poslys van die skeepsreël
 DocType: Journal Entry Account,Payroll Entry,Betaalstaatinskrywing
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,View Fees Records
@@ -2909,7 +2925,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Voorbeeld
 DocType: Item Variant Settings,Allow Rename Attribute Value,Laat die kenmerk waarde toe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Vinnige Blaar Inskrywing
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Vinnige Blaar Inskrywing
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kan nie koers verander as BOM enige item genoem het nie
 DocType: Restaurant,Invoice Series Prefix,Faktuurreeksvoorvoegsel
 DocType: Employee,Previous Work Experience,Vorige werkservaring
@@ -2917,8 +2933,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Tik asseblief Beplande hoeveelheid vir item {0} by ry {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrasie van Google Maps is nie geaktiveer nie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} is nie ingedien nie
+DocType: Subscription,Trialling,uitte
 DocType: Member,Membership Expiry Date,Lidmaatskap Vervaldatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} moet negatief wees in ruil dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} moet negatief wees in ruil dokument
 ,Minutes to First Response for Issues,Notules tot eerste antwoord vir kwessies
 DocType: Purchase Invoice,Terms and Conditions1,Terme en Voorwaardes1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Die naam van die instituut waarvoor u hierdie stelsel opstel.
@@ -2937,7 +2954,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Eenheid van maatreël
 DocType: Fiscal Year,Year End Date,Jaarindeinde
 DocType: Task Depends On,Task Depends On,Taak hang af
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,geleentheid
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,geleentheid
 DocType: Operation,Default Workstation,Verstek werkstasie
 DocType: Notification Control,Expense Claim Approved Message,Koste-eis Goedgekeurde Boodskap
 DocType: Payment Entry,Deductions or Loss,Aftrekkings of verlies
@@ -2975,7 +2992,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Verlof sonder betaal stem nie ooreen met goedgekeurde Verlof aansoek rekords
 DocType: Campaign,Campaign-.####,Veldtog -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Verskaf asseblief die gespesifiseerde items teen die beste moontlike tariewe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Verskaf asseblief die gespesifiseerde items teen die beste moontlike tariewe
 DocType: Membership,USD,dollar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak faktuur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Oorblywende Saldo
@@ -2984,7 +3001,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Barcode {0} is nie &#39;n geldige {1} kode
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindejaar
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwotasie / Lood%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontrak Einddatum moet groter wees as Datum van aansluiting
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrak Einddatum moet groter wees as Datum van aansluiting
 DocType: Driver,Driver,bestuurder
 DocType: Vital Signs,Nutrition Values,Voedingswaardes
 DocType: Lab Test Template,Is billable,Is faktureerbaar
@@ -2995,7 +3012,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Werklike Aanvangsdatum (via Tydblad)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Dit is &#39;n voorbeeld webwerf wat outomaties deur ERPNext gegenereer word
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Veroudering Reeks 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Totale voorskotbedrag kan nie groter wees as die totale geëisde bedrag nie
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Totale voorskotbedrag kan nie groter wees as die totale geëisde bedrag nie
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteNum,CompteNum
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Kies kenmerkwaardes
 DocType: Purchase Invoice,Reason For Issuing document,Rede vir die uitreiking van dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Voorraadinskrywing {0} is nie ingedien nie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Voorraadinskrywing {0} is nie ingedien nie
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Kontantrekening
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Volgende kontak deur kan nie dieselfde wees as die hoof epos adres nie
 DocType: Tax Rule,Billing City,Billing City
@@ -3046,7 +3063,8 @@
 DocType: Warranty Claim,Service Address,Diens Adres
 DocType: Asset Maintenance Task,Calibration,kalibrasie
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} is &#39;n vakansiedag
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures and Fixtures
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Verlofstatus kennisgewing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures and Fixtures
 DocType: Item,Manufacture,vervaardiging
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
@@ -3062,7 +3080,6 @@
 DocType: Crop,Planting Area,Plantingsgebied
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Installation Note Item,Installed Qty,Geïnstalleerde hoeveelheid
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dit kan wees as gevolg van sommige ongeldige e-posadresse in die
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Jy het bygevoeg
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Opleidingsresultaat
@@ -3072,16 +3089,17 @@
 DocType: Products Settings,Products per Page,Produkte per bladsy
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande koers
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisasie tak meester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,of
 DocType: Sales Order,Billing Status,Rekeningstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Gee &#39;n probleem aan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility uitgawes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Bo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ry # {0}: Tydskrifinskrywings {1} het nie rekening {2} of alreeds teen &#39;n ander geskenkbewys aangepas nie
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Gewig
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Laat Goedkeuring Kennisgewing
 DocType: Buying Settings,Default Buying Price List,Verstek kooppryslys
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Salarisstrokie gebaseer op tydsopgawe
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Koopkoers
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Koopkoers
 DocType: Notification Control,Sales Order Message,Verkoopsvolgorde
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Stel verstekwaardes soos Maatskappy, Geld, Huidige fiskale jaar, ens."
 DocType: Payment Entry,Payment Type,Tipe van betaling
@@ -3103,6 +3121,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Winkelwagentjie instellings
 DocType: Journal Entry,Accounting Entries,Rekeningkundige Inskrywings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","As gekose prysreël vir &#39;koers&#39; gemaak word, sal dit pryslys oorskry. Prysreëlkoers is die finale koers, dus geen verdere afslag moet toegepas word nie. Dus, in transaksies soos verkoopsbestelling, bestelling ens., Sal dit in die &#39;Tarief&#39;-veld gesoek word, eerder as&#39; Pryslys-tarief&#39;-veld."
+DocType: Journal Entry,Paid Loan,Betaalde lening
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplikaat Inskrywing. Gaan asseblief die magtigingsreël {0}
 DocType: Journal Entry Account,Reference Due Date,Verwysingsdatum
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3119,7 +3138,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudskedule word nie vir al die items gegenereer nie. Klik asseblief op &#39;Generate Schedule&#39;
 ,To Produce,Te produseer
 apps/erpnext/erpnext/config/hr.py +93,Payroll,betaalstaat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Vir ry {0} in {1}. Om {2} in Item-koers in te sluit, moet rye {3} ook ingesluit word"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Vir ry {0} in {1}. Om {2} in Item-koers in te sluit, moet rye {3} ook ingesluit word"
 DocType: Patient Service Unit,Parent Service Unit,Ouer Diens Eenheid
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Maak gebruiker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasie van die pakket vir die aflewering (vir druk)
@@ -3137,7 +3156,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Inkomsterekening
 DocType: Payment Request,Amount in customer's currency,Bedrag in kliënt se geldeenheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,aflewering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,aflewering
 DocType: Volunteer,Weekdays,weeksdae
 DocType: Stock Reconciliation Item,Current Qty,Huidige hoeveelheid
 DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
@@ -3145,7 +3164,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Sleutelverantwoordelikheidsgebied
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentejoernaal help om bywoning, assessering en fooie vir studente op te spoor"
 DocType: Payment Entry,Total Allocated Amount,Totale toegewysde bedrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Stel verstekvoorraadrekening vir voortdurende voorraad
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Stel verstekvoorraadrekening vir voortdurende voorraad
 DocType: Item Reorder,Material Request Type,Materiaal Versoek Tipe
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Stuur Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage is vol, het nie gestoor nie"
@@ -3153,10 +3172,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kamer kapasiteit
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Reeds bestaan rekord vir die item {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,U sal rekords verloor van voorheen gegenereerde fakture. Is jy seker jy wil hierdie intekening herbegin?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registrasiefooi
 DocType: Budget,Cost Center,Kostesentrum
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Aankoopboodskap
 DocType: Tax Rule,Shipping Country,Versending Land
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Versteek Kliënt se Belasting-ID van Verkoopstransaksies
@@ -3165,20 +3185,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prysreël word gemaak om Pryslys te vervang / definieer kortingspersentasie, gebaseer op sekere kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Pakhuis kan slegs verander word via Voorraadinskrywing / Afleweringsnota / Aankoop Ontvangst
 DocType: Employee Education,Class / Percentage,Klas / Persentasie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Hoof van Bemarking en Verkope
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Hoof van Bemarking en Verkope
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Inkomstebelasting
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Volg Leiers volgens Nywerheidstipe.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Gaan na Letterheads
+DocType: Subscription,Cancel At End Of Period,Kanselleer aan die einde van die tydperk
 DocType: Item Supplier,Item Supplier,Item Verskaffer
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Kies asseblief &#39;n waarde vir {0} kwotasie_ tot {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Geen items gekies vir oordrag nie
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Kies asseblief &#39;n waarde vir {0} kwotasie_ tot {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Geen items gekies vir oordrag nie
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresse.
 DocType: Company,Stock Settings,Voorraadinstellings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samevoeging is slegs moontlik as die volgende eienskappe dieselfde in albei rekords is. Is Groep, Worteltipe, Maatskappy"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Vordering
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Wins / verlies op bateverkope
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Wins / verlies op bateverkope
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Slegs die Student Aansoeker met die status &quot;Goedgekeur&quot; sal in die onderstaande tabel gekies word.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Rekeningnommer vir rekening {0} is nie beskikbaar nie. <br> Stel asseblief u Kaart van Rekeninge korrek op.
 DocType: Task,Depends on Tasks,Hang af van take
@@ -3193,6 +3214,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nie in voorraad nie
 DocType: Volunteer,Volunteer Skills,Vrywilligersvaardighede
 DocType: Appraisal,HR User,HR gebruiker
+DocType: Bank Guarantee,Reference Document Name,Verwysings dokument naam
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belasting en heffings afgetrek
 apps/erpnext/erpnext/hooks.py +142,Issues,kwessies
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet een van {0} wees
@@ -3206,7 +3228,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} is gedeaktiveer
 DocType: Supplier,Billing Currency,Billing Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Ekstra groot
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Ekstra groot
+DocType: Loan,Loan Application,Leningsaansoek
 DocType: Crop,Scientific Name,Wetenskaplike Naam
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Totale blare
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Herstel, indien die gekose kontak na redigeer geredigeer word"
@@ -3215,13 +3238,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Tjeknommer
 ,Sales Browser,Verkope Browser
 DocType: Journal Entry,Total Credit,Totale Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Waarskuwing: Nog {0} # {1} bestaan teen voorraadinskrywings {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Waarskuwing: Nog {0} # {1} bestaan teen voorraadinskrywings {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,plaaslike
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Lenings en voorskotte (bates)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,debiteure
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,groot
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,groot
 DocType: Homepage Featured Product,Homepage Featured Product,Tuisblad Voorgestelde Produk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alle assesseringsgroepe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alle assesseringsgroepe
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nuwe pakhuis naam
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Totaal {0} ({1})
 DocType: C-Form Invoice Detail,Territory,gebied
@@ -3242,9 +3265,10 @@
 DocType: Fees,Fees,fooie
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiseer wisselkoers om een geldeenheid om te skakel na &#39;n ander
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Aanhaling {0} is gekanselleer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Totale uitstaande bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Totale uitstaande bedrag
 DocType: Sales Partner,Targets,teikens
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Registreer asseblief die SIREN nommer in die maatskappy inligting lêer
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 DocType: Price List,Price List Master,Pryslys Meester
 DocType: GST Account,CESS Account,CESS-rekening
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle verkoops transaksies kan gemerk word teen verskeie ** Verkope Persone ** sodat u teikens kan stel en monitor.
@@ -3252,6 +3276,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Kies Pasiënt
 DocType: Price List,Applicable for Countries,Toepaslik vir lande
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameter Naam
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Slegs verlof aansoeke met status &#39;Goedgekeur&#39; en &#39;Afgekeur&#39; kan ingedien word
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Studentegroepnaam is verpligtend in ry {0}
 DocType: Homepage,Products to be shown on website homepage,Produkte wat op die tuisblad van die webwerf gewys word
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dit is &#39;n wortelkundegroep en kan nie geredigeer word nie.
@@ -3284,14 +3309,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktuur wat reeds vir alle faktuurure geskep is
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Naam fout: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Is finansieringskoste
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Bywoning vir werknemer {0} is reeds gemerk
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Bywoning vir werknemer {0} is reeds gemerk
 DocType: Packing Slip,If more than one package of the same type (for print),As meer as een pakket van dieselfde tipe (vir druk)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Stel asseblief die standaardkliënt in Restaurantinstellings
 ,Salary Register,Salarisregister
 DocType: Warehouse,Parent Warehouse,Ouer Warehouse
-DocType: C-Form Invoice Detail,Net Total,Netto totaal
+DocType: Subscription,Net Total,Netto totaal
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Verstek BOM nie gevind vir Item {0} en Projek {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definieer verskillende leningstipes
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definieer verskillende leningstipes
 DocType: Bin,FCFS Rate,FCFS-tarief
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Uitstaande bedrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tyd (in mins)
@@ -3323,11 +3348,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Wortelrekening moet &#39;n groep wees
 DocType: Drug Prescription,Drug Prescription,Dwelm Voorskrif
 DocType: Fees,FEE.,TARIEF.
-DocType: Employee Loan,Repaid/Closed,Terugbetaal / gesluit
+DocType: Loan,Repaid/Closed,Terugbetaal / gesluit
 DocType: Item,Total Projected Qty,Totale Geprojekteerde Aantal
 DocType: Monthly Distribution,Distribution Name,Verspreidingsnaam
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardasietarief nie vir die item {0} gevind nie, wat vereis word om rekeningkundige inskrywings vir {1} {2} te doen. As die item as &#39;n nulwaardasyfersitem in die {1} verhandel, noem dit asseblief in die {1} Item-tabel. Andersins, skep asseblief &#39;n inkomende voorraadtransaksie vir die item of vermeld waardasietempo in die Item-rekord en probeer dan hierdie inskrywing in te dien / te kanselleer."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kursuskode
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kwaliteitsinspeksie benodig vir item {0}
 DocType: POS Settings,Use POS in Offline Mode,Gebruik POS in aflyn modus
@@ -3347,16 +3371,15 @@
 DocType: Purchase Invoice,Deemed Export,Geagte Uitvoer
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Oordrag vir Vervaardiging
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Afslagpersentasie kan óf teen &#39;n Pryslys óf vir alle Pryslys toegepas word.
-DocType: Subscription,Half-yearly,Halfjaarlikse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Rekeningkundige Inskrywing vir Voorraad
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,U het reeds geassesseer vir die assesseringskriteria ().
 DocType: Vehicle Service,Engine Oil,Enjin olie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Werkorders geskep: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Werkorders geskep: {0}
 DocType: Sales Invoice,Sales Team1,Verkoopspan1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Item {0} bestaan nie
 DocType: Sales Invoice,Customer Address,Kliënt Adres
-DocType: Employee Loan,Loan Details,Leningsbesonderhede
+DocType: Loan,Loan Details,Leningsbesonderhede
 DocType: Company,Default Inventory Account,Verstek voorraad rekening
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Die folio nommers kom nie ooreen nie
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ry {0}: Voltooide hoeveelheid moet groter as nul wees.
@@ -3368,19 +3391,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,&#39;N Skakel na al die grondeenhede waarin die Gewas groei
 DocType: Account,Root Type,Worteltipe
 DocType: Item,FIFO,EIEU
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ry # {0}: Kan nie meer as {1} vir Item {2} terugkeer nie.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ry # {0}: Kan nie meer as {1} vir Item {2} terugkeer nie.
 DocType: Item Group,Show this slideshow at the top of the page,Wys hierdie skyfievertoning bo-aan die bladsy
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belastingbedrag Na Korting Bedrag (Maatskappy Geld)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Teiken pakhuis is verpligtend vir ry {0}
 DocType: Cheque Print Template,Primary Settings,Primêre instellings
 DocType: Purchase Invoice,Select Supplier Address,Kies Verskaffersadres
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Voeg werknemers by
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Voeg werknemers by
 DocType: Purchase Invoice Item,Quality Inspection,Kwaliteit Inspeksie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Ekstra Klein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Ekstra Klein
 DocType: Company,Standard Template,Standaard Sjabloon
 DocType: Training Event,Theory,teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Waarskuwing: Materiaal Gevraagde hoeveelheid is minder as minimum bestelhoeveelheid
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Waarskuwing: Materiaal Gevraagde hoeveelheid is minder as minimum bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Rekening {0} is gevries
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Regspersoon / Filiaal met &#39;n afsonderlike Kaart van Rekeninge wat aan die Organisasie behoort.
 DocType: Payment Request,Mute Email,Demp e-pos
@@ -3400,11 +3423,10 @@
 DocType: SMS Log,No of Sent SMS,Geen van gestuurde SMS nie
 DocType: Antibiotic,Healthcare Administrator,Gesondheidsorgadministrateur
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Stel &#39;n teiken
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 DocType: Dosage Strength,Dosage Strength,Dosis Sterkte
 DocType: Account,Expense Account,Uitgawe rekening
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,sagteware
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Kleur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Kleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assesseringsplan Kriteria
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Vervaldatum is verpligtend vir geselekteerde item
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Voorkom Aankooporders
@@ -3417,18 +3439,18 @@
 DocType: Patient,Personal and Social History,Persoonlike en Sosiale Geskiedenis
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Gebruiker {0} geskep
 DocType: Fee Schedule,Fee Breakup for each student,Fooi vir elke student
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totale voorskot ({0}) teen Bestelling {1} kan nie groter wees as die Grand Total ({2}) nie.
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totale voorskot ({0}) teen Bestelling {1} kan nie groter wees as die Grand Total ({2}) nie.
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Kies Maandelikse Verspreiding om teikens oor verskillende maande te versprei.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Verander kode
 DocType: Purchase Invoice Item,Valuation Rate,Waardasietempo
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Pryslys Geldeenheid nie gekies nie
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Pryslys Geldeenheid nie gekies nie
 DocType: Purchase Invoice,Availed ITC Cess,Benut ITC Cess
 ,Student Monthly Attendance Sheet,Student Maandelikse Bywoningsblad
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Stuurreël is slegs van toepassing op Verkoop
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Aanvangsdatum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,totdat
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,totdat
 DocType: Rename Tool,Rename Log,Hernoem log
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentegroep of Kursusskedule is verpligtend
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Handhaaf Billing Ure en Werksure dieselfde op die tydskrif
@@ -3448,7 +3470,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lys jou produkte of dienste wat jy koop of verkoop.
 DocType: Water Analysis,Storage Temperature,Stoor temperatuur
 DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte Bywoning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,navorser
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,navorser
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programinskrywingsinstrument Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Begindatum moet minder wees as einddatum vir taak {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Naam of e-pos is verpligtend
@@ -3461,7 +3483,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} het tans &#39;n {1} Verskaffer Scorecard en RFQs aan hierdie verskaffer moet met omsigtigheid uitgereik word.
 DocType: Chapter,Non Profit Manager,Nie-winsgewende bestuurder
 DocType: BOM,Total Cost(Company Currency),Totale koste (Maatskappy Geld)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Rekeningnommer {0} geskep
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Rekeningnommer {0} geskep
 DocType: Homepage,Company Description for website homepage,Maatskappybeskrywing vir webwerf tuisblad
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",Vir die gerief van kliënte kan hierdie kodes gebruik word in drukformate soos fakture en afleweringsnotas
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Soepeler Naam
@@ -3471,11 +3493,10 @@
 DocType: Employee,You can enter any date manually,U kan enige datum handmatig invoer
 DocType: Healthcare Settings,Result Printed,Resultaat gedruk
 DocType: Asset Category Account,Depreciation Expense Account,Waardevermindering Uitgawe Rekening
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Proeftydperk
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Bekyk {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Proeftydperk
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Slegs blaar nodusse word in transaksie toegelaat
 DocType: Project,Total Costing Amount (via Timesheets),Totale kosteberekening (via tydskrifte)
-DocType: Employee Advance,Expense Approver,Uitgawe Goedkeuring
+DocType: Department,Expense Approver,Uitgawe Goedkeuring
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ry {0}: Voorskot teen kliënt moet krediet wees
 DocType: Project,Hourly,uurlikse
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Nie-Groep tot Groep
@@ -3484,7 +3505,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Tot Dattyd
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs vir die instandhouding van sms-leweringstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Betaal via Joernaal Inskrywing
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Gedruk Op
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Gedruk Op
 DocType: Item,Inspection Required before Delivery,Inspeksie benodig voor aflewering
 DocType: Item,Inspection Required before Purchase,Inspeksie Vereis Voor Aankope
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Hangende aktiwiteite
@@ -3494,7 +3515,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum bestelhoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Jou organisasie
 DocType: Fee Component,Fees Category,Gelde Kategorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vul asseblief die verlig datum in.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vul asseblief die verlig datum in.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Stel werknemers in kennis
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer die naam van die veldtog in as die bron van navraag veldtog is
@@ -3504,7 +3525,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Herbestel vlak
 DocType: Company,Chart Of Accounts Template,Sjabloon van rekeninge
 DocType: Attendance,Attendance Date,Bywoningsdatum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Itemprys opgedateer vir {0} in Pryslys {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Itemprys opgedateer vir {0} in Pryslys {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salarisuitval gebaseer op verdienste en aftrekking.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Rekening met kinder nodusse kan nie na grootboek omgeskakel word nie
 DocType: Purchase Invoice Item,Accepted Warehouse,Aanvaarde pakhuis
@@ -3512,10 +3533,11 @@
 DocType: Item,Valuation Method,Waardasie metode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Merk Halfdag
 DocType: Sales Invoice,Sales Team,Verkope span
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplikaatinskrywing
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplikaatinskrywing
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Vul die naam van die Begunstigde in voordat u dit ingedien het.
 DocType: Program Enrollment Tool,Get Students,Kry studente
 DocType: Serial No,Under Warranty,Onder Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Fout]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorde sal sigbaar wees sodra jy die verkoopsbestelling stoor.
 ,Employee Birthday,Werknemer Verjaarsdag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Kies asseblief Voltooiingsdatum vir voltooide herstel
@@ -3534,7 +3556,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Voorbehou vir subkontraktering
 DocType: Payment Reconciliation Invoice,Invoice Number,Faktuurnommer
 DocType: Shopping Cart Settings,Orders,bestellings
-DocType: Employee Leave Approver,Leave Approver,Verlaat Goedkeuring
+DocType: Department,Leave Approver,Verlaat Goedkeuring
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Kies asseblief &#39;n bondel
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Assessering Groep Naam
@@ -3576,7 +3598,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,OORSPRONG VIR ONTVANGER
 DocType: Asset Category Account,Accumulated Depreciation Account,Opgehoopte Waardeverminderingsrekening
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Hierdie e-pos is outogenerated
 DocType: Stock Settings,Freeze Stock Entries,Vries Voorraadinskrywings
 DocType: Program Enrollment,Boarding Student,Studente
 DocType: Asset,Expected Value After Useful Life,Verwagte Waarde Na Nuttige Lewe
@@ -3601,12 +3622,12 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Bywoningsrekord {0} bestaan teen Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Verwysing # {0} gedateer {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Waardevermindering Uitgeëis as gevolg van verkoop van bates
-DocType: Member,Member,lid
+DocType: Loan,Member,lid
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Bestuur adresse
 DocType: Work Order Item,Work Order Item,Werk bestelling Item
 DocType: Pricing Rule,Item Code,Itemkode
 DocType: Serial No,Warranty / AMC Details,Waarborg / AMC Besonderhede
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Kies studente handmatig vir die aktiwiteitsgebaseerde groep
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Kies studente handmatig vir die aktiwiteitsgebaseerde groep
 DocType: Journal Entry,User Remark,Gebruikers opmerking
 DocType: Lead,Market Segment,Marksegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landboubestuurder
@@ -3614,7 +3635,7 @@
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werkgeskiedenis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Sluiting (Dr)
 DocType: Cheque Print Template,Cheque Size,Kyk Grootte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serienommer {0} nie op voorraad nie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serienommer {0} nie op voorraad nie
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Belasting sjabloon vir die verkoop van transaksies.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skryf af Uitstaande bedrag
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Rekening {0} stem nie ooreen met Maatskappy {1}
@@ -3622,7 +3643,6 @@
 DocType: Stock Settings,Default Stock UOM,Standaard Voorraad UOM
 DocType: Asset,Number of Depreciations Booked,Aantal Afskrywings Geboek
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Aantal Totaal
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Teen werknemerslening: {0}
 DocType: Landed Cost Item,Receipt Document,Kwitansie Dokument
 DocType: Employee Education,School/University,Skool / Universiteit
 DocType: Payment Request,Reference Details,Verwysingsbesonderhede
@@ -3633,7 +3653,7 @@
 DocType: Asset,Double Declining Balance,Dubbele dalende saldo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Geslote bestelling kan nie gekanselleer word nie. Ontkoppel om te kanselleer.
 DocType: Student Guardian,Father,Vader
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Op Voorraad Voorraad&#39; kan nie gekontroleer word vir vaste bateverkope nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Op Voorraad Voorraad&#39; kan nie gekontroleer word vir vaste bateverkope nie
 DocType: Bank Reconciliation,Bank Reconciliation,Bankversoening
 DocType: Attendance,On Leave,Op verlof
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Kry opdaterings
@@ -3647,9 +3667,9 @@
 DocType: Lead,Lower Income,Laer Inkomste
 DocType: Restaurant Order Entry,Current Order,Huidige bestelling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Bron en teiken pakhuis kan nie dieselfde wees vir ry {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verskilrekening moet &#39;n Bate / Aanspreeklikheidsrekening wees, aangesien hierdie Voorraadversoening &#39;n Openingsinskrywing is"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verskilrekening moet &#39;n Bate / Aanspreeklikheidsrekening wees, aangesien hierdie Voorraadversoening &#39;n Openingsinskrywing is"
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Gaan na Programme
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ry {0} # Toegewysde hoeveelheid {1} kan nie groter wees as onopgeëiste bedrag nie {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ry {0} # Toegewysde hoeveelheid {1} kan nie groter wees as onopgeëiste bedrag nie {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Aankoopordernommer benodig vir item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Vanaf datum&#39; moet na &#39;tot datum&#39; wees
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan nie status verander as student {0} is gekoppel aan studenteprogram nie {1}
@@ -3672,7 +3692,6 @@
 DocType: Payment Terms Template,Payment Terms,Betalingsvoorwaardes
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produksies Bestellings kan nie opgewek word vir:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,minuut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 DocType: Purchase Invoice,Purchase Taxes and Charges,Koopbelasting en heffings
 DocType: Chapter,Meetup Embed HTML,Ontmoet HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Gaan na verskaffers
@@ -3691,30 +3710,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Kwotasie {0} nie van tipe {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudskedule item
 DocType: Sales Order,%  Delivered,% Afgelewer
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Stel asseblief die E-posadres vir die Student in om die betalingsversoek te stuur
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Stel asseblief die E-posadres vir die Student in om die betalingsversoek te stuur
 DocType: Patient,Medical History,Mediese geskiedenis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bankoortrekkingsrekening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bankoortrekkingsrekening
 DocType: Patient,Patient ID,Pasiënt ID
 DocType: Physician Schedule,Schedule Name,Skedule Naam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Maak Salary Slip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Voeg alle verskaffers by
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Voeg alle verskaffers by
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ry # {0}: Toegewysde bedrag kan nie groter wees as die uitstaande bedrag nie.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Blaai deur BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Beveiligde Lenings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Beveiligde Lenings
 DocType: Purchase Invoice,Edit Posting Date and Time,Wysig die datum en tyd van die boeking
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Stel asseblief Waardeverminderingsverwante Rekeninge in Bate-kategorie {0} of Maatskappy {1}
 DocType: Lab Test Groups,Normal Range,Normale omvang
 DocType: Academic Term,Academic Year,Akademiese jaar
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Beskikbaar verkoop
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Openingsaldo-ekwiteit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Openingsaldo-ekwiteit
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,oorblywende
 DocType: Appraisal,Appraisal,evaluering
+DocType: Loan,Loan Account,Leningsrekening
 DocType: Purchase Invoice,GST Details,GST Besonderhede
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-pos gestuur aan verskaffer {0}
 DocType: Item,Default Sales Unit of Measure,Standaard verkoopseenheid van maatreël
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademiese jaar:
+DocType: Subscription,Past Due Date,Verlede Vervaldatum
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Moenie toelaat dat alternatiewe item vir die item {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum word herhaal
@@ -3727,7 +3748,7 @@
 DocType: Patient Appointment,Patient Appointment,Pasiënt Aanstelling
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeurende rol kan nie dieselfde wees as die rol waarvan die reël van toepassing is op
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Uitschrijven van hierdie e-pos verhandeling
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Kry Verskaffers By
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Kry Verskaffers By
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nie gevind vir item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Gaan na Kursusse
 DocType: Accounts Settings,Show Inclusive Tax In Print,Wys Inklusiewe Belasting In Druk
@@ -3735,10 +3756,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Boodskap gestuur
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Rekening met kinder nodusse kan nie as grootboek gestel word nie
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Koers waarteen Pryslys-geldeenheid omgeskakel word na die kliënt se basiese geldeenheid
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Netto Bedrag (Maatskappy Geld)
 DocType: Physician,Physician Schedules,Geneeskundige Skedules
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Totale voorskotbedrag kan nie groter wees as die totale sanksiebedrag nie
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Totale voorskotbedrag kan nie groter wees as die totale sanksiebedrag nie
 DocType: Salary Slip,Hour Rate,Uurtarief
 DocType: Stock Settings,Item Naming By,Item Naming By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},&#39;N Ander periode sluitingsinskrywing {0} is gemaak na {1}
@@ -3755,6 +3777,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nie toegelaat om voorraadtransaksies ouer as {0} by te werk nie.
 DocType: BOM,Inspection Required,Inspeksie benodig
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Voer die bankwaarborgnommer in voordat u ingedien word.
 DocType: Driving License Category,Class,klas
 DocType: Sales Order,Fully Billed,Volledig gefaktureer
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Werkorder kan nie teen &#39;n Item Sjabloon verhoog word nie
@@ -3765,7 +3788,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Die bruto gewig van die pakket. Gewoonlik netto gewig + verpakkingsmateriaal gewig. (vir druk)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met hierdie rol word toegelaat om gevriesde rekeninge te stel en rekeningkundige inskrywings teen bevrore rekeninge te skep / te verander
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 DocType: Serial No,Is Cancelled,Is gekanselleer
 DocType: Student Group,Group Based On,Groep gebaseer op
 DocType: Journal Entry,Bill Date,Rekeningdatum
@@ -3776,9 +3798,10 @@
 DocType: Cheque Print Template,Cheque Height,Kontroleer hoogte
 DocType: Supplier,Supplier Details,Verskafferbesonderhede
 DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Expense Claim,Approval Status,Goedkeuring Status
 DocType: Hub Settings,Publish Items to Hub,Wys items na Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Van waarde moet minder wees as om in ry {0} te waardeer.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Elektroniese oorbetaling
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Elektroniese oorbetaling
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Kyk alles
 ,Issued Items Against Work Order,Uitgereik Items Teen Werk Orde
 DocType: Vehicle Log,Invoice Ref,Faktuur Ref
@@ -3809,12 +3832,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tariefnommer
 DocType: Work Order Item,Available Qty at WIP Warehouse,Beskikbare hoeveelheid by WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,geprojekteerde
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Rekeningnommer {0} hoort nie by pakhuis {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Rekeningnommer {0} hoort nie by pakhuis {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Stelsel sal nie oorlewering en oorboeking vir Item {0} nagaan nie aangesien hoeveelheid of bedrag 0 is
 DocType: Notification Control,Quotation Message,Kwotasie Boodskap
-DocType: Employee Loan,Employee Loan Application,Werknemerleningsaansoek
 DocType: Issue,Opening Date,Openingsdatum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Slaan asseblief eers die pasiënt op
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Slaan asseblief eers die pasiënt op
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Bywoning is suksesvol gemerk.
 DocType: Program Enrollment,Public Transport,Publieke vervoer
 DocType: Soil Texture,Silt Composition (%),Silt Samestelling (%)
@@ -3832,7 +3854,7 @@
 ,Item Balance (Simple),Item Balans (Eenvoudig)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Wetsontwerpe wat deur verskaffers ingesamel word.
 DocType: POS Profile,Write Off Account,Skryf Rekening
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debiet Nota Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debiet Nota Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Keer terug teen aankoopfaktuur
 DocType: Item,Warranty Period (in days),Garantie Periode (in dae)
@@ -3855,6 +3877,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Verkoopsvolgorde
 DocType: Sales Invoice Item,Delivered Qty,Aflewerings Aantal
 DocType: Assessment Plan,Assessment Plan,Assesseringsplan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kliënt {0} is geskep.
 DocType: Stock Settings,Limit Percent,Limiet persentasie
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tans is geen voorraad beskikbaar in enige pakhuis nie
@@ -3868,14 +3891,15 @@
 DocType: Journal Entry,Stock Entry,Voorraadinskrywing
 DocType: Payment Entry,Payment References,Betalingsverwysings
 DocType: C-Form,C-FORM-,C-vorm-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Aantal intervalle vir die interval veld bv. As interval &#39;dae&#39; en faktuur interval is 3, sal fakture elke 3 dae gegenereer word"
 DocType: Vehicle,Insurance Details,Versekeringsbesonderhede
 DocType: Account,Payable,betaalbaar
 DocType: Share Balance,Share Type,Deel Tipe
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Voer asseblief terugbetalingsperiodes in
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Voer asseblief terugbetalingsperiodes in
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debiteure ({0})
 DocType: Pricing Rule,Margin,marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuwe kliënte
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto wins%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto wins%
 DocType: Appraisal Goal,Weightage (%),Gewig (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Verander POS-profiel
 DocType: Bank Reconciliation Detail,Clearance Date,Opruimingsdatum
@@ -3885,10 +3909,11 @@
 DocType: Lead,Address Desc,Adres Beskrywing
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party is verpligtend
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rye met duplikaat-sperdatums in ander rye is gevind: {lys}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rye met duplikaat-sperdatums in ander rye is gevind: {lys}
 DocType: Topic,Topic Name,Onderwerp Naam
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Stel asb. Standaard sjabloon vir verlofgoedkeuring kennisgewing in MH-instellings in.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Ten minste een van die verkope of koop moet gekies word
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Kies &#39;n werknemer om die werknemer vooraf te kry.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Kies &#39;n werknemer om die werknemer vooraf te kry.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Kies asseblief &#39;n geldige datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Kies die aard van jou besigheid.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3907,7 +3932,7 @@
 DocType: Asset Movement,Source Warehouse,Bron pakhuis
 DocType: Installation Note,Installation Date,Installasie Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Deel Grootboek
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Ry # {0}: Bate {1} behoort nie aan maatskappy nie {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Ry # {0}: Bate {1} behoort nie aan maatskappy nie {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Verkoopsfaktuur {0} geskep
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: C-Form,Total Invoiced Amount,Totale gefaktureerde bedrag
@@ -3916,7 +3941,7 @@
 DocType: Account,Accumulated Depreciation,Opgehoopte waardevermindering
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Staande Naam
 DocType: Stock Entry,Customer or Supplier Details,Kliënt- of Verskafferbesonderhede
-DocType: Employee Loan Application,Required by Date,Vereis volgens datum
+DocType: Loan Application,Required by Date,Vereis volgens datum
 DocType: Lead,Lead Owner,Leier Eienaar
 DocType: Production Plan,Sales Orders Detail,Verkoopsbestellings Detail
 DocType: Bin,Requested Quantity,Gevraagde Hoeveelheid
@@ -3929,10 +3954,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Betaling - Totale Aftrekking - Lening Terugbetaling
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Huidige BOM en Nuwe BOM kan nie dieselfde wees nie
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Salaris Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Datum van aftrede moet groter wees as datum van aansluiting
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Datum van aftrede moet groter wees as datum van aansluiting
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Veelvuldige Varianten
 DocType: Sales Invoice,Against Income Account,Teen Inkomsterekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% afgelewer
+DocType: Subscription,Trial Period Start Date,Aanvangsdatum van die proeftydperk
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde hoeveelheid {1} kan nie minder wees as die minimum bestelhoeveelheid {2} (gedefinieer in Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelikse Verspreidingspersentasie
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Log in as &#39;n ander gebruiker.
@@ -3953,12 +3979,11 @@
 DocType: Student Guardian,Student Guardian,Studente Voog
 DocType: Member,Member Name,Lid Naam
 DocType: Stock Settings,Use Naming Series,Gebruik Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Waardasietoelae kan nie as Inklusief gemerk word nie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Waardasietoelae kan nie as Inklusief gemerk word nie
 DocType: POS Profile,Update Stock,Werk Voorraad
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,in die intekening
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verskillende UOM vir items sal lei tot foutiewe (Totale) Netto Gewigwaarde. Maak seker dat die netto gewig van elke item in dieselfde UOM is.
 DocType: Membership,Payment Details,Betaling besonderhede
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM-koers
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM-koers
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Gestopte werkbestelling kan nie gekanselleer word nie. Staak dit eers om te kanselleer
 DocType: Asset,Journal Entry for Scrap,Tydskrifinskrywing vir afval
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Trek asseblief items van afleweringsnotas
@@ -3978,6 +4003,7 @@
 DocType: Land Unit,Land Unit,Grond Eenheid
 ,Purchase Analytics,Koop Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Afleweringsnota Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Huidige faktuur {0} ontbreek
 DocType: Asset Maintenance Log,Task,taak
 DocType: Purchase Taxes and Charges,Reference Row #,Verwysingsreeks #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Lotnommer is verpligtend vir item {0}
@@ -3989,7 +4015,7 @@
 DocType: Company,Exchange Gain / Loss Account,Uitruil wins / verlies rekening
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Werknemer en Bywoning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Doel moet een van {0} wees
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Vul die vorm in en stoor dit
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Vul die vorm in en stoor dit
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Gemeenskapsforum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Werklike hoeveelheid in voorraad
 DocType: Homepage,"URL for ""All Products""",URL vir &quot;Alle Produkte&quot;
@@ -4003,7 +4029,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standaard verkoopkoers
 DocType: Account,Rate at which this tax is applied,Koers waarteen hierdie belasting toegepas word
 DocType: Cash Flow Mapper,Section Name,Afdeling Naam
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Herbestel Aantal
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Herbestel Aantal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Huidige werksopnames
 DocType: Company,Stock Adjustment Account,Voorraadaanpassingsrekening
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskryf
@@ -4014,9 +4040,9 @@
 DocType: Task,depends_on,hang af van
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In wagtyd vir die opdatering van die jongste prys in alle materiaal. Dit kan &#39;n paar minute neem.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naam van nuwe rekening. Nota: skep asseblief nie rekeninge vir kliënte en verskaffers nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landverstandige standaard adres sjablonen
 DocType: Water Analysis,Appearance,voorkoms
+DocType: HR Settings,Leave Status Notification Template,Verstek Status Notifikasie Sjabloon
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Gem. Kooppryslys
 DocType: Sales Order Item,Supplier delivers to Customer,Verskaffer lewer aan die kliënt
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Lid inligting.
@@ -4039,7 +4065,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nie toegelaat. Skakel asseblief die Toets Sjabloon uit
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentasie toewysing moet gelyk wees aan 100%
 DocType: Crop Cycle,Linked Land Unit,Gekoppelde Grond Eenheid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Kies asseblief Posdatum voordat jy Party kies
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Kies asseblief Posdatum voordat jy Party kies
 DocType: Program Enrollment,School House,Skoolhuis
 DocType: Serial No,Out of AMC,Uit AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Aantal afskrywings wat bespreek word, kan nie groter wees as die totale aantal afskrywings nie"
@@ -4054,7 +4080,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Gaan na gebruikers
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Betaalde bedrag + Skryf af Die bedrag kan nie groter as Grand Total wees nie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is nie &#39;n geldige lotnommer vir item {1} nie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota: Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota: Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ongeldige GSTIN of Tik NA vir Ongeregistreerde
 DocType: Training Event,Seminar,seminaar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programinskrywingsfooi
@@ -4070,14 +4096,14 @@
 DocType: Hub Settings,Publish Availability,Publiseer Beskikbaarheid
 DocType: Company,Create Chart Of Accounts Based On,Skep grafiek van rekeninge gebaseer op
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan dit nie omskakel na nie-groep. Kindertakke bestaan.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Geboortedatum kan nie groter wees as vandag nie.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Geboortedatum kan nie groter wees as vandag nie.
 ,Stock Ageing,Voorraadveroudering
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Studente {0} bestaan teen studente aansoeker {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ronde aanpassing (Maatskappy Geld)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tydstaat
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,joernaal:
 DocType: Volunteer,Afternoon,middag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; is gedeaktiveer
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; is gedeaktiveer
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Stel as oop
 DocType: Cheque Print Template,Scanned Cheque,Geskandeerde tjek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur outomatiese e-posse na Kontakte om transaksies in te dien.
@@ -4093,7 +4119,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projek {0} bestaan reeds
 DocType: Medical Department,Nursing User,Verpleegkundige gebruiker
 DocType: Plant Analysis,Plant Analysis Criterias,Plant Analise Kriteria
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,verantwoordelikhede
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Reeksnommer {0} hoort nie by bondel {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,verantwoordelikhede
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van hierdie aanhaling is beëindig.
 DocType: Expense Claim Account,Expense Claim Account,Koste-eisrekening
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staaf wisselkoerse toe
@@ -4115,11 +4142,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Maak Variante
 DocType: Item,Default BOM,Standaard BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Totale gefaktureerde bedrag (via verkoopsfakture)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debiet Nota Bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debiet Nota Bedrag
 DocType: Project Update,Not Updated,Nie opgedateer nie
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Daar is teenstrydighede tussen die koers, aantal aandele en die bedrag wat bereken word"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Voer asseblief die maatskappy se naam weer in om te bevestig
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Totaal Uitstaande Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Totaal Uitstaande Amt
 DocType: Journal Entry,Printing Settings,Druk instellings
 DocType: Employee Advance,Advance Account,Voorskotrekening
 DocType: Job Offer,Job Offer Terms,Werkaanbod Terme
@@ -4128,7 +4155,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Versekeringsmaatskappy
 DocType: Asset Category Account,Fixed Asset Account,Vaste bate rekening
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,veranderlike
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,veranderlike
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Van afleweringsnota
 DocType: Chapter,Members,lede
 DocType: Student,Student Email Address,Student e-pos adres
@@ -4151,7 +4178,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,intern
 DocType: Delivery Stop,Address Name,Adres Naam
 DocType: Stock Entry,From BOM,Van BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Verdeel {0} eenhede van {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Verdeel {0} eenhede van {1}
 DocType: Assessment Code,Assessment Code,Assesseringskode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,basiese
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransaksies voor {0} word gevries
@@ -4159,25 +4186,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Verwysingsnommer is verpligtend as u verwysingsdatum ingevoer het
 DocType: Bank Reconciliation Detail,Payment Document,Betalingsdokument
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Kon nie die kriteria formule evalueer nie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum van aansluiting moet groter wees as Geboortedatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum van aansluiting moet groter wees as Geboortedatum
+DocType: Subscription,Plans,planne
 DocType: Salary Slip,Salary Structure,Salarisstruktuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,lugredery
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Uitgawe Materiaal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,&#39;N Fout het voorgekom tydens die skep van herhalende
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Uitgawe Materiaal
 DocType: Material Request Item,For Warehouse,Vir pakhuis
 DocType: Employee,Offer Date,Aanbod Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,kwotasies
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Jy is in die aflyn modus. Jy sal nie kan herlaai voordat jy netwerk het nie.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Geen studentegroepe geskep nie.
 DocType: Purchase Invoice Item,Serial No,Serienommer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelikse Terugbetalingsbedrag kan nie groter wees as Leningbedrag nie
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelikse Terugbetalingsbedrag kan nie groter wees as Leningbedrag nie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Voer asseblief eers Maintaince Details in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Ry # {0}: Verwagte Afleweringsdatum kan nie voor Aankoopdatum wees nie
 DocType: Purchase Invoice,Print Language,Druktaal
 DocType: Salary Slip,Total Working Hours,Totale werksure
 DocType: Sales Invoice,Customer PO Details,Kliënt PO Besonderhede
-DocType: Subscription,Next Schedule Date,Volgende skedule Datum
 DocType: Stock Entry,Including items for sub assemblies,Insluitende items vir sub-gemeentes
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tydelike Openingsrekening
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Invoerwaarde moet positief wees
@@ -4205,11 +4231,11 @@
 DocType: Issue,Opening Time,Openingstyd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Van en tot datums benodig
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Sekuriteite en kommoditeitsuitruilings
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard eenheid van maatstaf vir variant &#39;{0}&#39; moet dieselfde wees as in Sjabloon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard eenheid van maatstaf vir variant &#39;{0}&#39; moet dieselfde wees as in Sjabloon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Bereken Gebaseer Op
 DocType: Delivery Note Item,From Warehouse,Uit pakhuis
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Geen werknemers vir die genoemde kriteria
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
 DocType: Hotel Settings,Default Customer,Verstekkliënt
 DocType: Assessment Plan,Supervisor Name,Toesighouer Naam
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Moenie bevestig of aanstelling geskep is vir dieselfde dag nie
@@ -4233,16 +4259,16 @@
 DocType: Journal Entry Account,Employee Advance,Werknemersvooruitgang
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequency
 DocType: Lab Test Template,Sensitivity,sensitiwiteit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Rou materiaal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Rou materiaal
 DocType: Leave Application,Follow via Email,Volg via e-pos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Plante en Masjinerie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Plante en Masjinerie
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belastingbedrag na afslagbedrag
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daaglikse werkopsommingsinstellings
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Voer asseblief Reqd by Date in
 DocType: Payment Entry,Internal Transfer,Interne Oordrag
 DocType: Asset Maintenance,Maintenance Tasks,Onderhoudstake
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Die teiken hoeveelheid of teikenwaarde is verpligtend
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Kies asseblief die Posdatum eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Kies asseblief die Posdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Openingsdatum moet voor sluitingsdatum wees
 DocType: Leave Control Panel,Carry Forward,Voort te sit
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostesentrum met bestaande transaksies kan nie na grootboek omgeskakel word nie
@@ -4250,13 +4276,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Opgesiene Siekte
 ,Produced,geproduseer
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Terugbetaling Startdatum kan nie voor Uitbetalingsdatum wees nie.
 DocType: Item,Item Code for Suppliers,Item Kode vir Verskaffers
 DocType: Issue,Raised By (Email),Verhoog deur (e-pos)
 DocType: Training Event,Trainer Name,Afrigter Naam
 DocType: Mode of Payment,General,algemene
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Laaste Kommunikasie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan nie aftrek wanneer die kategorie vir &#39;Waardasie&#39; of &#39;Waardasie en Totaal&#39; is nie.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Required for Serialized Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan nie aftrek wanneer die kategorie vir &#39;Waardasie&#39; of &#39;Waardasie en Totaal&#39; is nie.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Required for Serialized Item {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Pas betalings met fakture
 DocType: Journal Entry,Bank Entry,Bankinskrywing
 DocType: Authorization Rule,Applicable To (Designation),Toepaslik by (Aanwysing)
@@ -4270,7 +4297,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Aktiveer / deaktiveer geldeenhede.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} op Halfdag Verlof op {1}
 DocType: Production Plan,Get Material Request,Kry materiaalversoek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Posuitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Posuitgawes
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Vermaak en ontspanning
 ,Item Variant Details,Item Variant Besonderhede
@@ -4281,9 +4308,9 @@
 DocType: Drug Prescription,Hour,Uur
 DocType: Restaurant Order Entry,Last Sales Invoice,Laaste Verkoopfaktuur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Kies asseblief hoeveelheid teen item {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nuwe reeksnommer kan nie pakhuis hê nie. Pakhuis moet ingestel word deur Voorraadinskrywing of Aankoop Ontvangst
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nuwe reeksnommer kan nie pakhuis hê nie. Pakhuis moet ingestel word deur Voorraadinskrywing of Aankoop Ontvangst
 DocType: Lead,Lead Type,Lood Tipe
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Jy is nie gemagtig om bladsye op Blokdata te keur nie
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Jy is nie gemagtig om bladsye op Blokdata te keur nie
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Al hierdie items is reeds gefaktureer
 DocType: Company,Monthly Sales Target,Maandelikse verkoopsdoel
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan goedgekeur word deur {0}
@@ -4291,7 +4318,7 @@
 DocType: Item,Default Material Request Type,Standaard Materiaal Versoek Tipe
 DocType: Supplier Scorecard,Evaluation Period,Evalueringsperiode
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,onbekend
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Werkorde nie geskep nie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Werkorde nie geskep nie
 DocType: Shipping Rule,Shipping Rule Conditions,Posbusvoorwaardes
 DocType: Purchase Invoice,Export Type,Uitvoer Tipe
 DocType: Salary Slip Loan,Salary Slip Loan,Salaris Slip Lening
@@ -4307,7 +4334,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Opsomming van faktuuropgawe
 DocType: Education Settings,Education Manager,Onderwysbestuurder
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Die minimum lengte tussen elke plant in die veld vir optimale groei
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Gegroepeerde item {0} kan nie met behulp van Voorraadversoening opgedateer word nie, maar gebruik Voorraadinvoer"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Gegroepeerde item {0} kan nie met behulp van Voorraadversoening opgedateer word nie, maar gebruik Voorraadinvoer"
 DocType: Quality Inspection,Report Date,Verslagdatum
 DocType: Student,Middle Name,Middelnaam
 DocType: C-Form,Invoices,fakture
@@ -4338,20 +4365,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pos adres moet uniek wees, bestaan reeds vir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Kwitansie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Kwitansie
 ,Sales Register,Verkoopsregister
 DocType: Daily Work Summary Group,Send Emails At,Stuur e-pos aan
 DocType: Quotation,Quotation Lost Reason,Kwotasie Verlore Rede
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaksieverwysingsnommer {0} gedateer {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Daar is niks om te wysig nie.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Uitgawe Goedkeuring Verpligte Uitgawe Eis
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Opsomming vir hierdie maand en hangende aktiwiteite
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Voeg gebruikers by jou organisasie, behalwe jouself."
 DocType: Customer Group,Customer Group Name,Kliënt Groep Naam
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nog geen kliënte!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantvloeistaat
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Geen wesenlike versoek geskep nie
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisensie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kies asseblief Carry Forward as u ook die vorige fiskale jaar se balans wil insluit, verlaat na hierdie fiskale jaar"
@@ -4374,11 +4402,12 @@
 DocType: Vehicle,Chassis No,Chassisnr
 DocType: Payment Request,Initiated,geïnisieer
 DocType: Production Plan Item,Planned Start Date,Geplande begin datum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Kies asseblief &#39;n BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Kies asseblief &#39;n BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Benut ITC Geïntegreerde Belasting
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
+DocType: Bank Guarantee,Clauses and Conditions,Klousules en Voorwaardes
 DocType: Serial No,Creation Document Type,Skepping dokument tipe
 DocType: Project Task,View Timesheet,Bekyk tydrooster
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Einddatum moet groter wees as begin datum
 DocType: Leave Type,Is Encash,Is Encash
 DocType: Leave Allocation,New Leaves Allocated,Nuwe blare toegeken
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projek-wyse data is nie beskikbaar vir aanhaling nie
@@ -4392,9 +4421,10 @@
 DocType: Patient,Alcohol Current Use,Alkohol Huidige Gebruik
 DocType: Student Admission Program,Student Admission Program,Studente Toelatingsprogram
 DocType: Payment Entry,Account Paid To,Rekening betaal
+DocType: Subscription Settings,Grace Period,Grasie priode
 DocType: Item Alternative,Alternative Item Name,Alternatiewe Item Naam
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ouer Item {0} mag nie &#39;n voorraaditem wees nie
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Kon nie 'n Salarisstrokie indien nie <br> Moontlike redes: <br> \ 1. Netto betaling is minder as 0. <br> \ 2. Maatskappy-e-posadres wat in werknemermeester gespesifiseer is, is nie geldig nie. <br>"
@@ -4404,7 +4434,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget vir rekening {1} teen {2} {3} is {4}. Dit sal oorskry met {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Ry {0} # Rekening moet van die tipe &#39;vaste bate&#39; wees
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Uit Aantal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,en ongeskik Gestremd in die
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Reeks is verpligtend
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansiële dienste
 DocType: Student Sibling,Student ID,Student ID
@@ -4416,14 +4445,16 @@
 DocType: Complaint,Complaint,klagte
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte blare
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Maak terugbetalinginskrywing
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alle Departemente
 DocType: Patient,Alcohol Past Use,Alkohol Gebruik
 DocType: Fertilizer Content,Fertilizer Content,Kunsmis Inhoud
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematies / Stuck
 DocType: Tax Rule,Billing State,Billing State
 DocType: Share Transfer,Transfer,oordrag
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Werkorder {0} moet gekanselleer word voordat u hierdie verkooporder kanselleer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Haal ontplof BOM (insluitend sub-gemeentes)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Haal ontplof BOM (insluitend sub-gemeentes)
 DocType: Authorization Rule,Applicable To (Employee),Toepasbaar op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Verpligte datum is verpligtend
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Toename vir kenmerk {0} kan nie 0 wees nie
@@ -4447,10 +4478,11 @@
 DocType: Cheque Print Template,Message to show,Boodskap om te wys
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Kleinhandel
 DocType: Student Attendance,Absent,afwesig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produk Bundel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produk Bundel
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Kan nie telling begin vanaf {0}. U moet standpunte van 0 tot 100 hê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ry {0}: ongeldige verwysing {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankope Belasting en Heffings Sjabloon
+DocType: Subscription,Current Invoice Start Date,Huidige faktuur begin datum
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Beide debiet- of kredietbedrag word benodig vir {2}
 DocType: GL Entry,Remarks,opmerkings
@@ -4460,11 +4492,13 @@
 DocType: Task,Parent Task,Ouertaak
 DocType: Journal Entry,Write Off Based On,Skryf af gebaseer op
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Maak Lood
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Druk en skryfbehoeftes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Druk en skryfbehoeftes
 DocType: Stock Settings,Show Barcode Field,Toon strepieskode veld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Stuur verskaffer e-pos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris wat reeds vir die tydperk tussen {0} en {1} verwerk is, kan die verlengde aansoekperiode nie tussen hierdie datumreeks wees nie."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Stuur verskaffer e-pos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris wat reeds vir die tydperk tussen {0} en {1} verwerk is, kan die verlengde aansoekperiode nie tussen hierdie datumreeks wees nie."
+DocType: Fiscal Year,Auto Created,Outomaties geskep
 DocType: Chapter Member,Leave Reason,Verlaat rede
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktuur {0} bestaan nie meer nie
 DocType: Guardian Interest,Guardian Interest,Voogbelang
 DocType: Volunteer,Availability,beskikbaarheid
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Stel verstekwaardes vir POS-fakture
@@ -4472,14 +4506,13 @@
 DocType: Project,Time to send,Tyd om te stuur
 DocType: Timesheet,Employee Detail,Werknemersbesonderhede
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-pos ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Volgende Datum se dag en Herhaal op Dag van Maand moet gelyk wees
 DocType: Lab Prescription,Test Code,Toets Kode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Instellings vir webwerf tuisblad
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;s word nie toegelaat vir {0} as gevolg van &#39;n telkaart wat staan van {1}
 DocType: Job Offer,Awaiting Response,In afwagting van antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Bo
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Totale bedrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ongeldige kenmerk {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Totale bedrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ongeldige kenmerk {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Noem as nie-standaard betaalbare rekening
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Kies asseblief die assesseringsgroep anders as &#39;Alle assesseringsgroepe&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ry {0}: Koste sentrum is nodig vir &#39;n item {1}
@@ -4490,7 +4523,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Wateranalise
 DocType: Chapter,Region,streek
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opsioneel. Hierdie instelling sal gebruik word om in verskillende transaksies te filter.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatiewe Waardasietarief word nie toegelaat nie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatiewe Waardasietarief word nie toegelaat nie
 DocType: Holiday List,Weekly Off,Weeklikse af
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Herlaai gekoppelde analise
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Vir bv. 2012, 2012-13"
@@ -4506,7 +4539,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Koste van geskrap Bate
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Koste sentrum is verpligtend vir item {2}
 DocType: Vehicle,Policy No,Polisnr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Kry Items van Produk Bundel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Kry Items van Produk Bundel
 DocType: Asset,Straight Line,Reguit lyn
 DocType: Project User,Project User,Projekgebruiker
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,verdeel
@@ -4542,21 +4575,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,pad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Kan nie Kostesentrum omskakel na grootboek nie aangesien dit nodusse het
 DocType: Production Plan,Total Planned Qty,Totale Beplande Aantal
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Openingswaarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Openingswaarde
 DocType: Salary Detail,Formula,formule
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serie #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serie #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Verkooprekening
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Verkooprekening
 DocType: Purchase Invoice Item,Total Weight,Totale Gewig
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Kommissie op verkope
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Kommissie op verkope
 DocType: Job Offer Term,Value / Description,Waarde / beskrywing
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ry # {0}: Bate {1} kan nie ingedien word nie, dit is reeds {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ry # {0}: Bate {1} kan nie ingedien word nie, dit is reeds {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Verwagte afleweringsdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant bestellinginskrywing
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debiet en Krediet nie gelyk aan {0} # {1}. Verskil is {2}.
 DocType: Asset Maintenance Task,Assign To Name,Toewys aan naam
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Vermaak Uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Vermaak Uitgawes
 DocType: Hub Settings,Enabled Users,Aktiveer gebruikers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Materiaal Versoek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Oop item {0}
@@ -4569,24 +4602,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aansoeke om verlof.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Rekening met bestaande transaksie kan nie uitgevee word nie
 DocType: Vehicle,Last Carbon Check,Laaste Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Regskoste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Regskoste
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Kies asseblief die hoeveelheid op ry
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Maak Openingsverkope en Aankoopfakture
 DocType: Purchase Invoice,Posting Time,Posietyd
 DocType: Timesheet,% Amount Billed,% Bedrag gefaktureer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoon uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefoon uitgawes
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontroleer dit as u die gebruiker wil dwing om &#39;n reeks te kies voordat u dit stoor. Daar sal geen standaard wees as u dit kontroleer nie.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Geen item met reeksnommer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Geen item met reeksnommer {0}
 DocType: Email Digest,Open Notifications,Maak kennisgewings oop
 DocType: Payment Entry,Difference Amount (Company Currency),Verskilbedrag (Maatskappy Geld)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direkte uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direkte uitgawes
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuwe kliëntinkomste
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiskoste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Reiskoste
 DocType: Maintenance Visit,Breakdown,Afbreek
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Voeg gepas veld in. Inskrywing in die doktipe {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Rekening: {0} met valuta: {1} kan nie gekies word nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Rekening: {0} met valuta: {1} kan nie gekies word nie
 DocType: Purchase Receipt Item,Sample Quantity,Monster Hoeveelheid
+DocType: Bank Guarantee,Name of Beneficiary,Naam van Begunstigde
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Werk BOM koste outomaties via Scheduler, gebaseer op die jongste waarderings koers / prys lys koers / laaste aankoop koers van grondstowwe."
 DocType: Bank Reconciliation Detail,Cheque Date,Check Date
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Ouerrekening {1} behoort nie aan maatskappy nie: {2}
@@ -4598,14 +4631,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Proef
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Salaris Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nuwe akademiese jaar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Opgawe / Kredietnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Opgawe / Kredietnota
 DocType: Stock Settings,Auto insert Price List rate if missing,Voer outomaties pryslys in indien dit ontbreek
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Totale betaalde bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Totale betaalde bedrag
 DocType: GST Settings,B2C Limit,B2C Limiet
 DocType: Work Order Item,Transferred Qty,Oordragte hoeveelheid
 apps/erpnext/erpnext/config/learn.py +11,Navigating,opgevolg
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Beplanning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Beplanning
 DocType: Share Balance,Issued,Uitgereik
+DocType: Loan,Repayment Start Date,Terugbetaling Begin Datum
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentaktiwiteit
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Verskaffer ID
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Besonderhede
@@ -4618,10 +4652,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Soort blare soos gemaklik, siek ens."
 DocType: Email Digest,Send regular summary reports via Email.,Stuur gereelde opsommingsverslae per e-pos.
 DocType: Payment Entry,PE-,IE:
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Stel asseblief die verstekrekening in Koste-eis Tipe {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Stel asseblief die verstekrekening in Koste-eis Tipe {0}
 DocType: Assessment Result,Student Name,Studente naam
 DocType: Brand,Item Manager,Itembestuurder
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Betaalstaat betaalbaar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Betaalstaat betaalbaar
 DocType: Buying Settings,Default Supplier Type,Standaard Verskaffer Tipe
 DocType: Plant Analysis,Collection Datetime,Versameling Datetime
 DocType: Work Order,Total Operating Cost,Totale bedryfskoste
@@ -4631,9 +4665,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Gebruiker {0} bestaan nie
 DocType: Payment Term,Day(s) after invoice date,Dag (en) na faktuur datum
 DocType: Payment Schedule,Payment Schedule,Betalingskedule
-DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,staat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Betalinginskrywing bestaan reeds
+DocType: Subscription,Trial Period End Date,Proefperiode Einddatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nie outhroized sedert {0} oorskry limiete
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salaris sjabloon meester.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologie
@@ -4650,9 +4684,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Aanhalings aan Leads of Customers.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol Toegestaan om gevriesde voorraad te wysig
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alle kliënte groepe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alle kliënte groepe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Opgehoop maandeliks
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verpligtend. Miskien is Geldwissel-rekord nie vir {1} tot {2} geskep nie.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verpligtend. Miskien is Geldwissel-rekord nie vir {1} tot {2} geskep nie.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Belasting sjabloon is verpligtend.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Rekening {0}: Ouerrekening {1} bestaan nie
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Pryslyskoers (Maatskappy Geld)
@@ -4661,14 +4695,15 @@
 DocType: Lab Prescription,Test Created,Toets geskep
 DocType: Healthcare Settings,Custom Signature in Print,Aangepaste handtekening in druk
 DocType: Account,Temporary,tydelike
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kliënt LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kliënt LPO No.
 DocType: Program,Courses,kursusse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentasie toekenning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,sekretaris
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","As dit gedeaktiveer word, sal &#39;In Woorde&#39;-veld nie sigbaar wees in enige transaksie nie"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Hierdie aksie sal toekomstige fakturering stop. Is jy seker jy wil hierdie intekening kanselleer?
 DocType: Serial No,Distinct unit of an Item,Duidelike eenheid van &#39;n item
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriteria Naam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Stel asseblief die Maatskappy in
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Stel asseblief die Maatskappy in
 DocType: Pricing Rule,Buying,koop
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Siektes en Misstowwe
 DocType: HR Settings,Employee Records to be created by,Werknemersrekords wat geskep moet word deur
@@ -4677,17 +4712,17 @@
 DocType: POS Profile,Apply Discount On,Pas afslag aan
 DocType: Member,Membership Type,Lidmaatskap Tipe
 ,Reqd By Date,Reqd By Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,krediteure
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,krediteure
 DocType: Assessment Plan,Assessment Name,Assesseringsnaam
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Wys PDC in Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Wys PDC in Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ry # {0}: Volgnommer is verpligtend
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Werksaanbod
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Instituut Afkorting
 ,Item-wise Price List Rate,Item-item Pryslys
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Verskaffer Kwotasie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Verskaffer Kwotasie
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorde sal sigbaar wees sodra jy die Kwotasie stoor.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan nie &#39;n breuk in ry {1} wees nie.
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan nie &#39;n breuk in ry {1} wees nie.
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} wat reeds in item {1} gebruik is
@@ -4705,7 +4740,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Totale Variansie
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Indien geaktiveer, sal die stelsel outomaties rekeningkundige inskrywings vir voorraad plaas."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,makelaars
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Bywoning vir werknemer {0} is reeds gemerk vir hierdie dag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Bywoning vir werknemer {0} is reeds gemerk vir hierdie dag
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",In Notules Opgedateer via &#39;Time Log&#39;
 DocType: Customer,From Lead,Van Lood
@@ -4716,6 +4751,7 @@
 DocType: Lab Test,Approved Date,Goedgekeurde Datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaardverkope
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Ten minste een pakhuis is verpligtend
+DocType: Subscriber,Subscriber Name,Inskrywer naam
 DocType: Serial No,Out of Warranty,Buite waarborg
 DocType: BOM Update Tool,Replace,vervang
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Geen produkte gevind.
@@ -4725,19 +4761,18 @@
 DocType: Request for Quotation Item,Project Name,Projek Naam
 DocType: Customer,Mention if non-standard receivable account,Noem as nie-standaard ontvangbare rekening
 DocType: Journal Entry Account,If Income or Expense,As inkomste of uitgawes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Kies rentekoersrekening in werknemerslening {0}
 DocType: Work Order,Required Items,Vereiste items
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraadwaarde Verskil
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Menslike hulpbronne
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaalversoening Betaling
 DocType: Disease,Treatment Task,Behandelingstaak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Belasting Bates
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Belasting Bates
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Joernaal-inskrywing {0} het nie rekening {1} of alreeds teen ander geskenkbewyse aangepas nie
 DocType: Item,Moving Average,Beweeg gemiddeld
 DocType: BOM Update Tool,The BOM which will be replaced,Die BOM wat vervang sal word
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektroniese toerusting
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektroniese toerusting
 DocType: Asset,Maintenance Required,Onderhoud Vereiste
 DocType: Account,Debit,debiet-
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Blare moet in veelvoude van 0.5 toegeken word
@@ -4746,7 +4781,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Uitstaande Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Stel teikens itemgroep-wys vir hierdie verkoopspersoon.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Vries Voorrade Ouer As [Dae]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ry # {0}: Bate is verpligtend vir die aankoop / verkoop van vaste bates
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ry # {0}: Bate is verpligtend vir die aankoop / verkoop van vaste bates
 DocType: Asset Maintenance Team,Maintenance Team Name,Onderhoudspannaam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Indien twee of meer prysreëls gevind word op grond van bogenoemde voorwaardes, word Prioriteit toegepas. Prioriteit is &#39;n getal tussen 0 en 20 terwyl die standaardwaarde nul is (leeg). Hoër getal beteken dat dit voorrang sal hê indien daar verskeie prysreëls met dieselfde voorwaardes is."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Kliënt is verpligtend as &#39;Geleentheid Van&#39; as Kliënt gekies word
@@ -4755,19 +4790,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laat die volgende gebruikers toe om Laat aansoeke vir blokdae goed te keur.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Soorte koste-eis.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopsyfer vir item {0} is laer as sy {1}. Verkoopsyfer moet ten minste {2} wees
-DocType: Item,Taxes,belasting
+DocType: Subscription,Taxes,belasting
 DocType: Purchase Invoice,capital goods,kapitaalgoedere
 DocType: Purchase Invoice Item,Weight Per Unit,Gewig Per Eenheid
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Betaal en nie afgelewer nie
 DocType: Project,Default Cost Center,Verstek koste sentrum
-DocType: Bank Guarantee,End Date,Einddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Voorraadtransaksies
 DocType: Budget,Budget Accounts,Begrotingsrekeninge
 DocType: Employee,Internal Work History,Interne werkgeskiedenis
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Opgehoopte Waardevermindering Bedrag
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private ekwiteit
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Verskaffer Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,Volledig Uitbetaal
 DocType: Employee Advance,Due Advance Amount,Vooruitbetaalde bedrag
 DocType: Maintenance Visit,Customer Feedback,Kliëntterugvoer
 DocType: Account,Expense,koste
@@ -4791,7 +4824,7 @@
 ,Employee Information,Werknemersinligting
 DocType: Stock Entry Detail,Additional Cost,Addisionele koste
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Kan nie filter gebaseer op Voucher No, indien gegroepeer deur Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Maak Verskaffer Kwotasie
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Maak Verskaffer Kwotasie
 DocType: Quality Inspection,Incoming,inkomende
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standaard belasting sjablonen vir verkope en aankoop word gemaak.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Assesseringsresultaat rekord {0} bestaan reeds.
@@ -4799,7 +4832,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel asseblief die Maatskappyfilter leeg as Groep By &#39;Maatskappy&#39; is.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posdatum kan nie toekomstige datum wees nie
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Ry # {0}: reeksnommer {1} stem nie ooreen met {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,vir die herhaling van die herhalende
 DocType: Stock Entry,Target Warehouse Address,Teiken pakhuis adres
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Toevallige verlof
 DocType: Agriculture Task,End Day,Einde Dag
@@ -4824,11 +4856,10 @@
 DocType: Material Request,% Ordered,% Bestel
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Vir Kursusgebaseerde Studentegroep, sal die kursus vir elke student van die ingeskrewe Kursusse in Programinskrywing bekragtig word."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,stukwerk
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gem. Koopkoers
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Gem. Koopkoers
 DocType: Share Balance,From No,Van No
 DocType: Task,Actual Time (in Hours),Werklike tyd (in ure)
 DocType: Employee,History In Company,Geskiedenis In Maatskappy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nuwe boodskap van {sender}
 DocType: Customer,Customer Primary Address,Primêre adres van die kliënt
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,nuusbriewe
 DocType: Drug Prescription,Description/Strength,Beskrywing / Krag
@@ -4837,22 +4868,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Dieselfde item is verskeie kere ingevoer
 DocType: Department,Leave Block List,Los blokkie lys
 DocType: Purchase Invoice,Tax ID,Belasting ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} is nie opgestel vir Serial Nos. Kolom moet leeg wees
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} is nie opgestel vir Serial Nos. Kolom moet leeg wees
 DocType: Accounts Settings,Accounts Settings,Rekeninge Instellings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,goed te keur
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Ongeformateerde adres vir {0}, regstel asseblief om voort te gaan."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Ongeformateerde adres vir {0}, regstel asseblief om voort te gaan."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Aantal nuwe rekeninge, dit sal as &#39;n voorvoegsel in die rekeningnaam ingesluit word"
 DocType: Maintenance Team Member,Team Member,Spanmaat
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Geen resultaat om in te dien nie
 DocType: Customer,Sales Partner and Commission,Verkoopsvennoot en Kommissie
-DocType: Employee Loan,Rate of Interest (%) / Year,Rentekoers (%) / Jaar
+DocType: Loan,Rate of Interest (%) / Year,Rentekoers (%) / Jaar
 ,Project Quantity,Projek Hoeveelheid
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} vir alle items is nul, mag u verander word &quot;Versprei koste gebaseer op &#39;"
 DocType: Opportunity,To Discuss,Om te bespreek
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} eenhede van {1} benodig in {2} om hierdie transaksie te voltooi.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rentekoers (%) Jaarliks
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Tydelike rekeninge
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Swart
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Tydelike rekeninge
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Swart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Shareholder,Contact List,Kontaklys
 DocType: Account,Auditor,ouditeur
@@ -4860,16 +4891,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} items geproduseer
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Leer meer
 DocType: Cheque Print Template,Distance from top edge,Afstand van boonste rand
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Pryslys {0} is gedeaktiveer of bestaan nie
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Pryslys {0} is gedeaktiveer of bestaan nie
 DocType: Purchase Invoice,Return,terugkeer
 DocType: Pricing Rule,Disable,afskakel
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Betaalmetode is nodig om betaling te maak
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Betaalmetode is nodig om betaling te maak
 DocType: Project Task,Pending Review,Hangende beoordeling
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Wysig in volle bladsy vir meer opsies soos bates, reeksnommers, bondels ens."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Aanstellings en konsultasies
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is nie in die bondel {2} ingeskryf nie
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Bate {0} kan nie geskrap word nie, want dit is reeds {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Kontrole vereis
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Kontrole vereis
 DocType: Task,Total Expense Claim (via Expense Claim),Totale koste-eis (via koste-eis)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Merk afwesig
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kon nie maatskappy opstel nie
@@ -4881,7 +4912,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Fooi-komponent
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Vloot bestuur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Voeg items by
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Voeg items by
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Gewasse en lande
 DocType: Cheque Print Template,Regular,gereelde
 DocType: Fertilizer,Density (if liquid),Digtheid (indien vloeistof)
@@ -4906,24 +4937,26 @@
 DocType: Payment Entry,Paid Amount,Betaalde bedrag
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Verken Verkoopsiklus
 DocType: Assessment Plan,Supervisor,toesighouer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Behoud Voorraad Inskrywing
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Behoud Voorraad Inskrywing
 ,Available Stock for Packing Items,Beskikbare voorraad vir verpakking items
 DocType: Item Variant,Item Variant,Item Variant
 ,Work Order Stock Report,Werk Bestelling Voorraad Verslag
+DocType: Purchase Receipt,Auto Repeat Detail,Outo Herhaal Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Assesseringsresultate-instrument
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,As Toesighouer
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Stel Kategorie voor
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,"Bestellings wat ingedien is, kan nie uitgevee word nie"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Rekeningbalans reeds in Debiet, jy mag nie &#39;Balans moet wees&#39; as &#39;Krediet&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gehalte bestuur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gehalte bestuur
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is gedeaktiveer
 DocType: Project,Total Billable Amount (via Timesheets),Totale Rekeninge Bedrag (via Tydstate)
 DocType: Agriculture Task,Previous Business Day,Vorige sakedag
-DocType: Employee Loan,Repay Fixed Amount per Period,Herstel vaste bedrag per Periode
+DocType: Loan,Repay Fixed Amount per Period,Herstel vaste bedrag per Periode
 DocType: Employee,Health Insurance No,Gesondheidsversekering Nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Gee asseblief die hoeveelheid vir item {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredietnota Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredietnota Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Totale Belasbare Bedrag
 DocType: Employee External Work History,Employee External Work History,Werknemer Eksterne Werk Geskiedenis
 DocType: Opening Invoice Creation Tool,Purchase,aankoop
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Saldo Aantal
@@ -4934,15 +4967,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} vir {1}
 DocType: Healthcare Settings,Valid number of days,Geldige aantal dae
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kostesentrums
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Herbegin inskrywing
 DocType: Land Unit,Linked Plant Analysis,Gekoppelde plant analise
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Beoordeel by watter verskaffer se geldeenheid omgeskakel word na die maatskappy se basiese geldeenheid
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ry # {0}: Tydsbesteding stryd met ry {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Laat zero waarderingspercentage toe
+DocType: Bank Guarantee,Receiving,ontvang
 DocType: Training Event Employee,Invited,Genooi
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Meervoudige aktiewe Salarisstrukture vir werknemer {0} vir die gegewe datums
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway rekeninge.
 DocType: Employee,Employment Type,Indiensnemingstipe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Vaste Bates
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Vaste Bates
 DocType: Payment Entry,Set Exchange Gain / Loss,Stel ruilverhoging / verlies
 ,GST Purchase Register,GST Aankoopregister
 ,Cash Flow,Kontantvloei
@@ -4962,9 +4997,10 @@
 DocType: Academic Term,Term Start Date,Termyn Begindatum
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lys van alle aandeel transaksies
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppentelling
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Bevestig asseblief aangehegte {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Beide proefperiode begin datum en proeftydperk einddatum moet ingestel word
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gemiddelde koers
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totale Betalingsbedrag in Betaalskedule moet gelyk wees aan Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totale Betalingsbedrag in Betaalskedule moet gelyk wees aan Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankstaatbalans soos per Algemene Grootboek
 DocType: Job Applicant,Applicant Name,Aansoeker Naam
 DocType: Authorization Rule,Customer / Item Name,Kliënt / Item Naam
@@ -4994,6 +5030,7 @@
 DocType: Work Order,Warehouses,pakhuise
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} bate kan nie oorgedra word nie
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel Kamerpryse
+DocType: Subscription,Days Until Due,Dae Tot Dinsdag
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Hierdie item is &#39;n variant van {0} (Sjabloon).
 DocType: Workstation,per hour,per uur
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Koop
@@ -5002,13 +5039,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Vir Batch-gebaseerde Studentegroep sal die Studente-batch vir elke student van die Programinskrywing gekwalifiseer word.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan nie uitgevee word nie aangesien voorraad grootboekinskrywing vir hierdie pakhuis bestaan.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,verspreiding
+DocType: Journal Entry Account,Loan,lening
 DocType: Expense Claim Advance,Expense Claim Advance,Koste Eis Voorskot
 DocType: Lab Test,Report Preference,Verslagvoorkeur
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Vrywillige inligting.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projek bestuurder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projek bestuurder
 ,Quoted Item Comparison,Genoteerde Item Vergelyking
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Oorvleuel in die telling tussen {0} en {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,versending
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,versending
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksimum afslag wat toegelaat word vir item: {0} is {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Netto batewaarde soos aan
 DocType: Crop,Produce,produseer
@@ -5018,7 +5056,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materiële Verbruik vir Vervaardiging
 DocType: Item Alternative,Alternative Item Code,Alternatiewe Item Kode
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol wat toegelaat word om transaksies voor te lê wat groter is as kredietlimiete.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Kies items om te vervaardig
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Kies items om te vervaardig
 DocType: Delivery Stop,Delivery Stop,Afleweringstop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Meesterdata-sinkronisering, dit kan tyd neem"
 DocType: Item,Material Issue,Materiële Uitgawe
@@ -5028,15 +5066,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Seep en wasmiddel
 DocType: BOM,Show Items,Wys items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van die tyd kan nie groter wees as die tyd nie.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Wil u al die kliënte per e-pos in kennis stel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Wil u al die kliënte per e-pos in kennis stel?
+DocType: Subscription Plan,Billing Interval,Rekeninginterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestel
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,CV
 DocType: Hub Settings,Hub Username,Hub Gebruikersnaam
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Assesseringskriteria Groep
 DocType: Healthcare Settings,Patient Name By,Pasiënt Naam By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Toevallingsjoernaal Inskrywing vir salarisse vanaf {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Toevallingsjoernaal Inskrywing vir salarisse vanaf {0} tot {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Oopopgehoopte waardevermindering moet minder wees as gelyk aan {0}
 DocType: Warehouse,Warehouse Name,Pakhuisnaam
 DocType: Naming Series,Select Transaction,Kies transaksie
@@ -5050,22 +5088,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kan u hoogte, gewig, allergieë, mediese sorg, ens. Handhaaf"
 DocType: Leave Block List,Applies to Company,Van toepassing op Maatskappy
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Kan nie kanselleer nie aangesien ingevoerde Voorraadinskrywing {0} bestaan
-DocType: Employee Loan,Disbursement Date,Uitbetalingsdatum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Ontvangers&#39; is nie gespesifiseer nie
+DocType: Loan,Disbursement Date,Uitbetalingsdatum
 DocType: BOM Update Tool,Update latest price in all BOMs,Werk die nuutste prys in alle BOM&#39;s
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Mediese Rekord
 DocType: Vehicle,Vehicle,voertuig
 DocType: Purchase Invoice,In Words,In Woorde
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Voer die naam van die bank of leningsinstelling in voordat u dit ingedien het.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} moet ingedien word
 DocType: POS Profile,Item Groups,Itemgroepe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Vandag is {0} se verjaardag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Vandag is {0} se verjaardag!
 DocType: Sales Order Item,For Production,Vir Produksie
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Voeg asseblief &#39;n Tydelike Openingsrekening in die Grafiek van Rekeninge by
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Voeg asseblief &#39;n Tydelike Openingsrekening in die Grafiek van Rekeninge by
 DocType: Customer,Customer Primary Contact,Kliënt Primêre Kontak
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Tydperk Sluitingsjoernaal
 DocType: Project Task,View Task,Bekyk Taak
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lei%
+DocType: Bank Guarantee,Bank Guarantee Type,Bank Waarborg Tipe
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Faktuur Gedeelte
 ,Asset Depreciations and Balances,Bate Afskrywing en Saldo&#39;s
@@ -5076,9 +5115,8 @@
 DocType: Production Plan,Include Subcontracted Items,Sluit onderaannemerte items in
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,aansluit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Tekort
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Kan nie Variant eienskappe verander na voorraad transaksie. Jy sal &#39;n nuwe item moet maak om dit te doen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Item variant {0} bestaan met dieselfde eienskappe
-DocType: Employee Loan,Repay from Salary,Terugbetaal van Salaris
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Item variant {0} bestaan met dieselfde eienskappe
+DocType: Loan,Repay from Salary,Terugbetaal van Salaris
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Versoek betaling teen {0} {1} vir bedrag {2}
 DocType: Salary Slip,Salary Slip,Salarisstrokie
@@ -5102,11 +5140,11 @@
 DocType: Employee Education,Employee Education,Werknemersonderwys
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikaat-itemgroep wat in die itemgroeptabel gevind word
 DocType: Land Unit,Parent Land Unit,Ouergrondseenheid
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Dit is nodig om Itembesonderhede te gaan haal.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Dit is nodig om Itembesonderhede te gaan haal.
 DocType: Fertilizer,Fertilizer Name,Kunsmis Naam
 DocType: Salary Slip,Net Pay,Netto salaris
 DocType: Cash Flow Mapping Accounts,Account,rekening
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Rekeningnommer {0} is reeds ontvang
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Rekeningnommer {0} is reeds ontvang
 ,Requested Items To Be Transferred,Gevraagde items wat oorgedra moet word
 DocType: Expense Claim,Vehicle Log,Voertuiglogboek
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Aanwesigheid van &#39;n koors (temp&gt; 38.5 ° C / 101.3 ° F of volgehoue temperatuur&gt; 38 ° C / 100.4 ° F)
@@ -5147,24 +5185,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Enige ander opmerkings, noemenswaardige poging wat in die rekords moet plaasvind."
 DocType: Asset Maintenance,Manufacturing User,Vervaardigingsgebruiker
 DocType: Purchase Invoice,Raw Materials Supplied,Grondstowwe voorsien
-DocType: C-Form,Series,reeks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Geld van die pryslys {0} moet {1} of {2} wees.
 DocType: Appraisal,Appraisal Template,Appraisal Template
 DocType: Soil Texture,Ternary Plot,Ternêre Plot
 DocType: Item Group,Item Classification,Item Klassifikasie
 DocType: Driver,License Number,Lisensienommer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Besigheids Ontwikkelings Bestuurder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Besigheids Ontwikkelings Bestuurder
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Onderhoud Besoek Doel
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Faktuur Pasiënt Registrasie
 DocType: Crop,Period,tydperk
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Algemene lêer
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Werknemer {0} op verlof op {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Werknemer {0} op verlof op {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Bekyk Leads
 DocType: Program Enrollment Tool,New Program,Nuwe Program
 DocType: Item Attribute Value,Attribute Value,Attribuutwaarde
 ,Itemwise Recommended Reorder Level,Itemwise Recommended Reorder Level
 DocType: Salary Detail,Salary Detail,Salarisdetail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Kies asseblief eers {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Kies asseblief eers {0}
 DocType: Appointment Type,Physician,dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verval.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultasies
@@ -5172,15 +5209,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan nie groter wees as die beplande hoeveelheid ({2}) in werkorder {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tydskrif vir vervaardiging.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotaal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan nie Variant eiendomme verander na voorraad transaksie. Jy sal &#39;n nuwe item moet maak om dit te doen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandaat
 DocType: Physician,Charges,koste
 DocType: Production Plan,Get Items For Work Order,Kry items vir werkorder
 DocType: Salary Detail,Default Amount,Verstekbedrag
 DocType: Lab Test Template,Descriptive,beskrywende
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Pakhuis nie in die stelsel gevind nie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Pakhuis nie in die stelsel gevind nie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Hierdie maand se opsomming
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteit Inspeksie Lees
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Vries voorraad ouer as` moet kleiner as% d dae wees.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Vries voorraad ouer as` moet kleiner as% d dae wees.
 DocType: Tax Rule,Purchase Tax Template,Aankoop belasting sjabloon
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Stel &#39;n verkoopsdoel wat u vir u onderneming wil bereik.
 ,Project wise Stock Tracking,Projek-wyse Voorraad dop
@@ -5208,11 +5246,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Kon nie webwerf skep nie
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Gesprek Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retensie Voorraad Inskrywing reeds geskep of monster hoeveelheid nie verskaf nie
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retensie Voorraad Inskrywing reeds geskep of monster hoeveelheid nie verskaf nie
 DocType: Program,Program Abbreviation,Program Afkorting
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kostes word opgedateer in Aankoopontvangste teen elke item
 DocType: Warranty Claim,Resolved By,Besluit deur
-DocType: Bank Guarantee,Start Date,Begindatum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Laat blare toe vir &#39;n tydperk.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tjeks en deposito&#39;s is verkeerd skoongemaak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Rekening {0}: Jy kan nie homself as ouerrekening toewys nie
@@ -5227,11 +5264,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ure
 DocType: Project,Expected Start Date,Verwagte begin datum
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korreksie in Faktuur
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Werkorde wat reeds geskep is vir alle items met BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Werkorde wat reeds geskep is vir alle items met BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Besonderhede Verslag
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kooppryslys
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kooppryslys
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Verwyder item as koste nie op daardie item van toepassing is nie
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Kanselleer intekening
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Kies asseblief Onderhoudstatus as Voltooi of verwyder Voltooiingsdatum
 DocType: Supplier,Default Payment Terms Template,Standaard betaling terme sjabloon
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Die transaksie geldeenheid moet dieselfde wees as die betaling gateway valuta
@@ -5242,7 +5280,6 @@
 DocType: Employee,Educational Qualification,opvoedkundige kwalifikasie
 DocType: Workstation,Operating Costs,Bedryfskoste
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aksie indien opgehoopte maandelikse begroting oorskry
-DocType: Subscription,Submit on creation,Dien op die skepping in
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Geld vir {0} moet {1} wees
 DocType: Asset,Disposal Date,Vervreemdingsdatum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pos sal gestuur word aan alle Aktiewe Werknemers van die maatskappy op die gegewe uur, indien hulle nie vakansie het nie. Opsomming van antwoorde sal om middernag gestuur word."
@@ -5260,6 +5297,7 @@
 DocType: Batch,Parent Batch,Ouer-bondel
 DocType: Cheque Print Template,Cheque Print Template,Gaan afdruk sjabloon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiek van kostesentrums
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Aantal dae na faktuurdatum het verloop voordat u intekening of inskrywing vir inskrywing as onbetaalde kansellasie kanselleer
 DocType: Lab Test Template,Sample Collection,Voorbeeld versameling
 ,Requested Items To Be Ordered,Gevraagde items om bestel te word
 DocType: Price List,Price List Name,Pryslys Naam
@@ -5268,7 +5306,7 @@
 DocType: Account,Income,Inkomste
 DocType: Industry Type,Industry Type,Nywerheidstipe
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Iets het verkeerd geloop!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Waarskuwing: Laat aansoek bevat die volgende blokdatums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Waarskuwing: Laat aansoek bevat die volgende blokdatums
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Verkoopsfaktuur {0} is reeds ingedien
 DocType: Supplier Scorecard Scoring Criteria,Score,telling
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskale jaar {0} bestaan nie
@@ -5288,12 +5326,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Verkooppunt Profiel
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} moet &#39;n waarde tussen 0 en 100 wees
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Volgende Depresiasie Datum kan nie voor Beskikbaar-vir-gebruik-datum wees nie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Onversekerde Lenings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Onversekerde Lenings
 DocType: Cost Center,Cost Center Name,Koste Sentrum Naam
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksimum werksure teen Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Geskeduleerde Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Totale Betaalde Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Totale Betaalde Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Boodskappe groter as 160 karakters word in verskeie boodskappe verdeel
 DocType: Purchase Receipt Item,Received and Accepted,Ontvang en aanvaar
 DocType: Hub Settings,Company and Seller Profile,Maatskappy en Verkoper Profiel
@@ -5307,10 +5345,9 @@
 DocType: Item,Variant Based On,Variant gebaseer op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totale gewig toegeken moet 100% wees. Dit is {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Jou verskaffers
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Korrigeer asseblief die
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan nie as verlore gestel word nie aangesien verkoopsbestelling gemaak is.
 DocType: Request for Quotation Item,Supplier Part No,Verskaffer Deelnr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan nie aftrek as die kategorie vir &#39;Waardasie&#39; of &#39;Vaulering en Totaal&#39; is nie.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan nie aftrek as die kategorie vir &#39;Waardasie&#39; of &#39;Vaulering en Totaal&#39; is nie.
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anoniem
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Ontvang van
 DocType: Lead,Converted,Omgeskakel
@@ -5324,6 +5361,7 @@
 DocType: Asset,Assets,bates
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,rekenaar
 DocType: Item,List this Item in multiple groups on the website.,Lys hierdie item in verskeie groepe op die webwerf.
+DocType: Subscription,Current Invoice End Date,Huidige Faktuur Einddatum
 DocType: Payment Term,Due Date Based On,Vervaldatum gebaseer op
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Stel asseblief die standaardkliëntegroep en -gebied in Verkoopinstellings
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} bestaan nie
@@ -5331,7 +5369,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} bestaan nie in die stelsel nie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Jy is nie gemagtig om die bevrore waarde te stel nie
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kry ongekonfronteerde inskrywings
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Geen terugbetalings gekies vir Joernaalinskrywings nie
 DocType: Payment Reconciliation,From Invoice Date,Vanaf faktuur datum
+DocType: Loan,Disbursed,uitbetaal
 DocType: Healthcare Settings,Laboratory Settings,Laboratorium instellings
 DocType: Patient Appointment,Service Unit,Diens Eenheid
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Suksesvol Stel Verskaffer
@@ -5344,12 +5384,12 @@
 DocType: Share Balance,No of Shares,Aantal Aandele
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Het &#39;n serienummer&#39; kan nie &#39;Ja&#39; wees vir nie-voorraaditem
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Kies Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Bywoning kan nie vir toekomstige datums gemerk word nie
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Bywoning kan nie vir toekomstige datums gemerk word nie
 DocType: Pricing Rule,Pricing Rule Help,Pricing Rule Help
 DocType: School House,House Name,Huis Naam
 DocType: Fee Schedule,Total Amount per Student,Totale bedrag per student
 DocType: Purchase Taxes and Charges,Account Head,Rekeninghoof
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektriese
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektriese
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg die res van jou organisasie as jou gebruikers by. U kan ook uitnodigingskliënte by u portaal voeg deur dit by kontakte te voeg
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waardeverskil (Uit - In)
 DocType: Grant Application,Requested Amount,Gevraagde Bedrag
@@ -5359,7 +5399,7 @@
 DocType: Crop Cycle,Detected Diseases,Gevonde Siektes
 DocType: Stock Entry,Default Source Warehouse,Default Source Warehouse
 DocType: Item,Customer Code,Kliënt Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Verjaardag Herinnering vir {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Verjaardag Herinnering vir {0}
 DocType: Asset Maintenance Task,Last Completion Date,Laaste Voltooiingsdatum
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dae sedert Laaste bestelling
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet &#39;n balansstaatrekening wees
@@ -5367,9 +5407,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Verlaat bloklys naam
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versekering Aanvangsdatum moet minder wees as Versekerings-einddatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraadbates
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Voorraadbates
 DocType: Restaurant,Active Menu,Aktiewe kieslys
 DocType: Target Detail,Target Qty,Teiken Aantal
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Teen Lening: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout instellings
 DocType: Student Attendance,Present,teenwoordig
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Afleweringsnotasie {0} moet nie ingedien word nie
@@ -5378,9 +5419,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salaris Slip van werknemer {0} reeds geskep vir tydskrif {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Production Plan Item,Ordered Qty,Bestelde hoeveelheid
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Item {0} is gedeaktiveer
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Item {0} is gedeaktiveer
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevrore Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM bevat geen voorraaditem nie
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM bevat geen voorraaditem nie
 DocType: Chapter,Chapter Head,Hoof Hoof
 DocType: Payment Term,Month(s) after the end of the invoice month,Maand (en) na die einde van die faktuur maand
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projek aktiwiteit / taak.
@@ -5388,11 +5429,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstrokies
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab resultaat datetime kan nie wees voordat die datetime word getoets
 DocType: POS Profile,Allow user to edit Discount,Laat gebruiker toe om korting te wysig
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Kry kliënte van
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Kry kliënte van
 DocType: Purchase Invoice Item,Include Exploded Items,Sluit ontplofte items in
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Koop moet gekontroleer word, indien toepaslik vir is gekies as {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder as 100 wees
 DocType: Shipping Rule,Restrict to Countries,Beperk tot lande
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skryf af Bedrag (Maatskappy Geld)
 DocType: Sales Invoice Timesheet,Billing Hours,Rekeningure
 DocType: Project,Total Sales Amount (via Sales Order),Totale verkoopsbedrag (via verkoopsbestelling)
@@ -5409,6 +5451,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Assesseringsbestuurder
 DocType: Payment Entry,Allocate Payment Amount,Ken die betaling bedrag toe
+DocType: Subscription Plan,Subscription Plan,Inskrywing plan
 DocType: Employee External Work History,Salary,Salaris
 DocType: Serial No,Delivery Document Type,Afleweringsdokument Tipe
 DocType: Sales Order,Partly Delivered,Gedeeltelik afgelewer
@@ -5433,9 +5476,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Veroudering Reeks 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum sterkte
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voorinstellings installeer
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Geen afleweringsnota gekies vir kliënt {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Geen afleweringsnota gekies vir kliënt {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM vervang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Kies items gebaseer op Afleweringsdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Kies items gebaseer op Afleweringsdatum
 DocType: Grant Application,Has any past Grant Record,Het enige vorige Grant-rekord
 ,Sales Analytics,Verkope Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Beskikbaar {0}
@@ -5453,7 +5496,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstowwe Voorsien Koste
 DocType: Selling Settings,Settings for Selling Module,Instellings vir Verkoop Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotel Kamer Bespreking
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kliëntediens
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kliëntediens
 DocType: BOM,Thumbnail,Duimnaelskets
 DocType: Item Customer Detail,Item Customer Detail,Item kliënt detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Bied kandidaat &#39;n werk aan.
@@ -5469,7 +5512,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studente is ingeskryf
 DocType: Fees,Student Details,Studente Besonderhede
 DocType: Purchase Invoice Item,Stock Qty,Voorraad Aantal
-DocType: Employee Loan,Repayment Period in Months,Terugbetalingsperiode in maande
+DocType: Loan,Repayment Period in Months,Terugbetalingsperiode in maande
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fout: Nie &#39;n geldige ID nie?
 DocType: Naming Series,Update Series Number,Werk reeksnommer
 DocType: Account,Equity,Billikheid
@@ -5478,7 +5521,7 @@
 DocType: Task,Closing Date,Sluitingsdatum
 DocType: Sales Order Item,Produced Quantity,Geproduceerde Hoeveelheid
 DocType: Timesheet,Work Detail,Werk Detail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ingenieur
 DocType: Journal Entry,Total Amount Currency,Totale Bedrag Geld
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Soek subvergaderings
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Itemkode benodig by ry nr {0}
@@ -5523,13 +5566,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Skenker Tipe inligting.
 DocType: Request for Quotation,Supplier Detail,Verskaffer Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fout in formule of toestand: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Gefaktureerde bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Gefaktureerde bedrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria gewigte moet tot 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Bywoning
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Voorraaditems
 DocType: BOM,Materials,materiaal
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien nie gekontroleer nie, moet die lys by elke Departement gevoeg word waar dit toegepas moet word."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Skep {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source and Target Warehouse kan nie dieselfde wees nie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Posdatum en plasingstyd is verpligtend
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Belasting sjabloon vir die koop van transaksies.
@@ -5553,14 +5595,14 @@
 DocType: Shipping Rule,Fixed,vaste
 DocType: Vehicle Service,Clutch Plate,Koppelplaat
 DocType: Company,Round Off Account,Round Off Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administratiewe uitgawes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administratiewe uitgawes
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Ouer Kliëntegroep
-DocType: Journal Entry,Subscription,inskrywing
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,inskrywing
 DocType: Purchase Invoice,Contact Email,Kontak e-pos
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Fooi skepping hangende
 DocType: Appraisal Goal,Score Earned,Telling verdien
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Kennis tydperk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Kennis tydperk
 DocType: Asset Category,Asset Category Name,Bate Kategorie Naam
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Hierdie is &#39;n wortelgebied en kan nie geredigeer word nie.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nuwe verkope persoon se naam
@@ -5573,7 +5615,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Los ongeskik as jy nie joernaal wil oorweeg as jy kursusgebaseerde groepe maak nie.
 DocType: Asset,Frequency of Depreciation (Months),Frekwensie van waardevermindering (maande)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kredietrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kredietrekening
 DocType: Landed Cost Item,Landed Cost Item,Landed Koste Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Toon zero waardes
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid item verkry na vervaardiging / herverpakking van gegewe hoeveelhede grondstowwe
@@ -5581,7 +5623,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Ontvangbare / Betaalbare Rekening
 DocType: Delivery Note Item,Against Sales Order Item,Teen Verkooporder Item
 DocType: Hub Settings,Company Logo,Maatskappy Logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Spesifiseer asseblief kenmerkwaarde vir attribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Spesifiseer asseblief kenmerkwaarde vir attribuut {0}
 DocType: Item,Default Warehouse,Standaard pakhuis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Begroting kan nie toegeken word teen Groeprekening {0}
 DocType: Healthcare Settings,Patient Registration,Pasiëntregistrasie
@@ -5615,11 +5657,10 @@
 DocType: Journal Entry,Total Debit,Totale Debiet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standaard voltooide goedere pakhuis
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Kies asseblief Pasiënt
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Verkoopspersoon
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Verkoopspersoon
 DocType: Hotel Room Package,Amenities,geriewe
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Begroting en Koste Sentrum
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Veelvuldige verstekmodus van betaling is nie toegelaat nie
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,vir die
 ,Appointment Analytics,Aanstelling Analytics
 DocType: Vehicle Service,Half Yearly,Half jaarliks
 DocType: Lead,Blog Subscriber,Blog intekenaar
@@ -5635,6 +5676,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Los leeg as jy studente groepe per jaar maak
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien gekontroleer, Totale nommer. van werksdae sal vakansiedae insluit, en dit sal die waarde van salaris per dag verminder"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Programme wat die huidige sleutel gebruik, sal nie toegang hê nie, is jy seker?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Totale voorskot
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Verander sjabloonkode
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Die Termyn Einddatum kan nie vroeër as die Termyn begin datum wees nie. Korrigeer asseblief die datums en probeer weer.
@@ -5645,8 +5687,9 @@
 DocType: Opportunity Item,Basic Rate,Basiese tarief
 DocType: GL Entry,Credit Amount,Kredietbedrag
 DocType: Cheque Print Template,Signatory Position,Ondertekenende Posisie
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Stel as verlore
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Stel as verlore
 DocType: Timesheet,Total Billable Hours,Totale billike ure
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Aantal dae waarop die intekenaar fakture moet betaal wat gegenereer word deur hierdie intekening
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Ontvangst Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dit is gebaseer op transaksies teen hierdie kliënt. Sien die tydlyn hieronder vir besonderhede
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Ry {0}: Toegewysde bedrag {1} moet minder of gelyk wees aan Betaling Inskrywingsbedrag {2}
@@ -5665,12 +5708,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kry Laaste Aankoopprys
 DocType: Company,Company Info,Maatskappyinligting
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Kies of voeg nuwe kliënt by
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Koste sentrum is nodig om &#39;n koste-eis te bespreek
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Koste sentrum is nodig om &#39;n koste-eis te bespreek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van fondse (bates)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseer op die bywoning van hierdie Werknemer
 DocType: Assessment Result,Summary,opsomming
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Puntbywoning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debietrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debietrekening
 DocType: Fiscal Year,Year Start Date,Jaar Begindatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant bestellinginskrywing item
@@ -5682,7 +5725,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Aankoopbedrag
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Verskaffer kwotasie {0} geskep
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Eindejaar kan nie voor die beginjaar wees nie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Werknemervoordele
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Werknemervoordele
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Gepakte hoeveelheid moet gelyke hoeveelheid vir Item {0} in ry {1}
 DocType: Work Order,Manufactured Qty,Vervaardigde Aantal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Die aandele bestaan nie met die {0}
@@ -5690,12 +5733,12 @@
 DocType: Asset,Out of Order,Buite werking
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerde hoeveelheid
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignoreer werkstasie-tyd oorvleuel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Stel asseblief &#39;n standaard Vakansie Lys vir Werknemer {0} of Maatskappy {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Stel asseblief &#39;n standaard Vakansie Lys vir Werknemer {0} of Maatskappy {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} bestaan nie
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Kies lotnommer
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Wetsontwerpe wat aan kliënte gehef word.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projek-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ry nr {0}: Bedrag kan nie groter wees as hangende bedrag teen koste-eis {1} nie. Hangende bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ry nr {0}: Bedrag kan nie groter wees as hangende bedrag teen koste-eis {1} nie. Hangende bedrag is {2}
 DocType: Patient Service Unit,Medical Administrator,Mediese Administrateur
 DocType: Assessment Plan,Schedule,skedule
 DocType: Account,Parent Account,Ouerrekening
@@ -5725,15 +5768,16 @@
 DocType: Asset Repair,Repair Status,Herstel Status
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Rekeningkundige joernaalinskrywings
 DocType: Delivery Note Item,Available Qty at From Warehouse,Beskikbare hoeveelheid by From Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Kies asseblief eers werknemersrekord.
 DocType: POS Profile,Account for Change Amount,Verantwoord Veranderingsbedrag
 DocType: Purchase Invoice,input service,insetdiens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ry {0}: Party / Rekening stem nie ooreen met {1} / {2} in {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Onderhoudspanlid
 DocType: Agriculture Analysis Criteria,Soil Analysis,Grondanalise
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kursuskode:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Voer asseblief koste-rekening in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Voer asseblief koste-rekening in
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van Aankope, Aankoopfaktuur of Tydskrifinskrywing wees"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ry # {0}: Verwysingsdokumenttipe moet een van Aankope, Aankoopfaktuur of Tydskrifinskrywing wees"
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","As die item &#39;n variant van &#39;n ander item is, sal beskrywing, beeld, prys, belasting ens van die sjabloon gestel word tensy dit spesifiek gespesifiseer word"
 DocType: Serial No,Purchase / Manufacture Details,Aankoop- / Vervaardigingsbesonderhede
@@ -5781,19 +5825,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Toelating vir {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Seisoenaliteit vir die opstel van begrotings, teikens ens."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Veranderlike Naam
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Item {0} is &#39;n sjabloon, kies asseblief een van sy variante"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} is &#39;n sjabloon, kies asseblief een van sy variante"
 DocType: Asset,Asset Category,Asset Kategorie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Netto salaris kan nie negatief wees nie
 DocType: Purchase Order,Advance Paid,Voorskot Betaal
 DocType: Item,Item Tax,Itembelasting
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiaal aan verskaffer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiaal aan verskaffer
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Materiaal Versoek Beplanning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Aksynsfaktuur
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Drempel {0}% verskyn meer as een keer
 DocType: Expense Claim,Employees Email Id,Werknemers E-pos ID
 DocType: Employee Attendance Tool,Marked Attendance,Gemerkte Bywoning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Huidige Laste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Huidige Laste
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer het die gegewe ure oorskry.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Stuur massa-SMS na jou kontakte
 DocType: Patient,A Positive,&#39;N positiewe
@@ -5804,9 +5848,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werklike hoeveelheid is verpligtend
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} het tans &#39;n {1} Verskaffer Scorecard, en aankope bestellings aan hierdie verskaffer moet met omsigtigheid uitgereik word."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Bate Onderhoudspan
-DocType: Employee Loan,Loan Type,Lening Tipe
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} is suksesvol ingedien
+DocType: Loan,Loan Type,Lening Tipe
 DocType: Scheduling Tool,Scheduling Tool,Skeduleringsinstrument
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredietkaart
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredietkaart
 DocType: BOM,Item to be manufactured or repacked,Item wat vervaardig of herverpak moet word
 DocType: Employee Education,Major/Optional Subjects,Hoofvakke / Opsionele Vakke
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5838,7 +5883,7 @@
 DocType: Item,Units of Measure,Eenhede van maatreël
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat produksie toe op vakansie
 DocType: Sales Invoice,Customer's Purchase Order Date,Kliënt se Aankoopdatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitaalvoorraad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitaalvoorraad
 DocType: Shopping Cart Settings,Show Public Attachments,Wys publieke aanhangsels
 DocType: Packing Slip,Package Weight Details,Pakket Gewig Besonderhede
 DocType: Restaurant Reservation,Reservation Time,Besprekingstyd
@@ -5853,7 +5898,7 @@
 DocType: Purchase Order,To Receive and Bill,Om te ontvang en rekening
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Ry # {0}: Reqd by Date kan nie voor transaksiedatum wees nie
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Voorgestelde Produkte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Ontwerper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terme en Voorwaardes Sjabloon
 DocType: Serial No,Delivery Details,Afleweringsbesonderhede
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostesentrum word benodig in ry {0} in Belasting tabel vir tipe {1}
@@ -5863,20 +5908,20 @@
 DocType: Driver,Expiry Date,Verval datum
 DocType: Healthcare Settings,Employee name and designation in print,Werknemer naam en aanwysing in druk
 ,accounts-browser,rekeninge-leser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Kies asseblief Kategorie eerste
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Kies asseblief Kategorie eerste
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekmeester.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Om oor-faktuur of oorbestelling toe te laat, werk &quot;Toelae&quot; in Voorraadinstellings of die Item op."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Moenie enige simbool soos $ ens langs die geldeenhede wys nie.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Half Day)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Half Day)
 DocType: Payment Term,Credit Days,Kredietdae
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Kies asseblief Pasiënt om Lab Tests te kry
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Maak Studentejoernaal
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is vorentoe
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Kry items van BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Kry items van BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lood Tyddae
 DocType: Cash Flow Mapping,Is Income Tax Expense,Is Inkomstebelastinguitgawe
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ry # {0}: Posdatum moet dieselfde wees as aankoopdatum {1} van bate {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ry # {0}: Posdatum moet dieselfde wees as aankoopdatum {1} van bate {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontroleer of die Student by die Instituut se koshuis woon.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul asseblief die bestellings in die tabel hierbo in
 ,Stock Summary,Voorraadopsomming
@@ -5887,10 +5932,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Rede vir vertrek
 DocType: BOM Operation,Operating Cost(Company Currency),Bedryfskoste (Maatskappy Geld)
-DocType: Employee Loan Application,Rate of Interest,Rentekoers
+DocType: Loan Application,Rate of Interest,Rentekoers
 DocType: Expense Claim Detail,Sanctioned Amount,Beperkte bedrag
 DocType: Item,Shelf Life In Days,Raklewe in dae
 DocType: GL Entry,Is Opening,Is opening
+DocType: Department,Expense Approvers,Uitgawes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ry {0}: Debietinskrywing kan nie met &#39;n {1} gekoppel word nie.
 DocType: Journal Entry,Subscription Section,Subskripsie afdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Rekening {0} bestaan nie
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index b067a7c..ad255e2 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,የቁስ ይጎብኙ {0} ይህን የዋስትና የይገባኛል ጥያቄ በመሰረዝ በፊት ይቅር
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,የግምገማ ሪፖርቶች
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,የሸማቾች ምርቶች
-DocType: Purchase Receipt,Subscription Detail,የምዝገባ ዝርዝር
 DocType: Supplier Scorecard,Notify Supplier,አቅራቢውን አሳውቅ
 DocType: Item,Customer Items,የደንበኛ ንጥሎች
 DocType: Project,Costing and Billing,ዋጋና አከፋፈል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,መለያ {0}: የወላጅ መለያ {1} ያሰኘንን ሊሆን አይችልም
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com ወደ ንጥል አትም
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,የኢሜይል ማሳወቂያዎች
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ግምገማ
 DocType: Item,Default Unit of Measure,ይለኩ ነባሪ ክፍል
 DocType: SMS Center,All Sales Partner Contact,ሁሉም የሽያጭ ባልደረባ ያግኙን
-DocType: Employee,Leave Approvers,Approvers ውጣ
+DocType: Department,Leave Approvers,Approvers ውጣ
 DocType: Sales Partner,Dealer,ሻጭ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,ምርመራዎች
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ተገኝነትን ያረጋግጡ
 DocType: Job Applicant,Job Applicant,ሥራ አመልካች
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ይሄ በዚህ አቅራቢው ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,ሕጋዊ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},ትክክለኛው ዓይነት የግብር ረድፍ ውስጥ ንጥል ተመን ውስጥ ሊካተቱ አይችሉም {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,ሕጋዊ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},ትክክለኛው ዓይነት የግብር ረድፍ ውስጥ ንጥል ተመን ውስጥ ሊካተቱ አይችሉም {0}
 DocType: Bank Guarantee,Customer,ደምበኛ
 DocType: Purchase Receipt Item,Required By,በ ያስፈልጋል
 DocType: Delivery Note,Return Against Delivery Note,የመላኪያ ማስታወሻ ላይ ይመለሱ
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},የባንክ ሂሳብ እንደ የሚባል አይችልም {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ኃላፊዎች (ወይም ቡድኖች) ይህም ላይ አካውንቲንግ ግቤቶችን ናቸው እና ሚዛን ጠብቆ ነው.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ያልተከፈሉ {0} ሊሆን አይችልም ከ ዜሮ ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ወደ ሥራ ለመግባት የሚያስፈልጉ የደመወዝ ሠሌዳዎች የሉም.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ወደ ሥራ ለመግባት የሚያስፈልጉ የደመወዝ ሠሌዳዎች የሉም.
 DocType: Manufacturing Settings,Default 10 mins,10 ደቂቃ ነባሪ
 DocType: Leave Type,Leave Type Name,አይነት ስም ውጣ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ክፍት አሳይ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ዛሬም ይህንን እርምጃ እራሱ ከላይ ከተጠቀሰበት ጊዜ መውሰድ አስፈላጊ ነው
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ጨርሰህ ውጣ
 DocType: Pricing Rule,Apply On,ላይ ተግብር
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ሁሉም አቅራቢው ያግኙን
 DocType: Support Settings,Support Settings,የድጋፍ ቅንብሮች
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,የሚጠበቀው የማብቂያ ቀን የተጠበቀው የመጀመሪያ ቀን ያነሰ መሆን አይችልም
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,የረድፍ # {0}: ተመን ጋር ተመሳሳይ መሆን አለበት {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,አዲስ ፈቃድ ማመልከቻ
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,የረድፍ # {0}: ተመን ጋር ተመሳሳይ መሆን አለበት {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,ባች ንጥል የሚቃጠልበት ሁኔታ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ባንክ ረቂቅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ባንክ ረቂቅ
 DocType: Membership,membership validaty section,የአባልነት ማረጋገጫ ክፍል
 DocType: Mode of Payment Account,Mode of Payment Account,የክፍያ መለያ ሁነታ
 DocType: Consultation,Consultation,ምክክር
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ቁሳዊ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ድረገፅ ማድረግ
 DocType: Opening Invoice Creation Tool Item,Quantity,ብዛት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ብድር (ተጠያቂነቶች)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ብድር (ተጠያቂነቶች)
 DocType: Employee Education,Year of Passing,ያለፉት ዓመት
 DocType: Item,Country of Origin,የትውልድ ቦታ
 DocType: Soil Texture,Soil Texture Criteria,የአፈር የግንባታ መስፈርት
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,ዋና እውቂያ ዝርዝሮች
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ክፍት ጉዳዮች
 DocType: Production Plan Item,Production Plan Item,የምርት ዕቅድ ንጥል
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},አባል {0} አስቀድሞ ሰራተኛ ተመድቧል {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},አባል {0} አስቀድሞ ሰራተኛ ተመድቧል {1}
 DocType: Lab Test Groups,Add new line,አዲስ መስመር ያክሉ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,የጤና ጥበቃ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ክፍያ መዘግየት (ቀኖች)
@@ -89,7 +85,7 @@
 ,Delay Days,የዘገየ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,የዋጋ ዝርዝር
+DocType: Subscription Invoice,Invoice,የዋጋ ዝርዝር
 DocType: Purchase Invoice Item,Item Weight Details,የንጥል ክብደት ዝርዝሮች
 DocType: Asset Maintenance Log,Periodicity,PERIODICITY
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,በጀት ዓመት {0} ያስፈልጋል
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ውጤት (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ረድፍ {0}: {1} {2} ጋር አይዛመድም {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,የረድፍ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,የረድፍ # {0}:
 DocType: Timesheet,Total Costing Amount,ጠቅላላ የኳንቲቲ መጠን
 DocType: Delivery Note,Vehicle No,የተሽከርካሪ ምንም
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,የዋጋ ዝርዝር እባክዎ ይምረጡ
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,ገና በሂደት ላይ ያለ ስራ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,ቀን ይምረጡ
 DocType: Daily Work Summary Group,Holiday List,የበዓል ዝርዝር
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,ሒሳብ ሠራተኛ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,ሒሳብ ሠራተኛ
 DocType: Hub Settings,Selling Price List,የዋጋ ዝርዝር ዋጋ
 DocType: Patient,Tobacco Current Use,የትምባሆ ወቅታዊ አጠቃቀም
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,የሽያጭ ፍጥነት
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,የሽያጭ ፍጥነት
 DocType: Cost Center,Stock User,የአክሲዮን ተጠቃሚ
 DocType: Soil Analysis,(Ca+Mg)/K,(ካም + ኤምግ) / ኬ
 DocType: Company,Phone No,ስልክ የለም
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},አዲስ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,የመጀመሪያ ኢሜይል ማሳወቂያ ተላከ
 ,Sales Partners Commission,የሽያጭ አጋሮች ኮሚሽን
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,የእርጅና በኋላ እሴት
 DocType: Student,O+,ሆይ; +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ተዛማጅ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,የትምህርት ክትትል የቀን ሠራተኛ ዎቹ በመቀላቀል ቀን ያነሰ መሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,የትምህርት ክትትል የቀን ሠራተኛ ዎቹ በመቀላቀል ቀን ያነሰ መሆን አይችልም
 DocType: Grading Scale,Grading Scale Name,አሰጣጥ በስምምነት ስም
-DocType: Subscription,Repeat on Day,በቀን ይድገሙት
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ይህ ሥር መለያ ነው እና አርትዕ ሊደረግ አይችልም.
 DocType: Sales Invoice,Company Address,የኩባንያ አድራሻ
 DocType: BOM,Operations,ክወናዎች
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ለ ቅናሽ ላይ የተመሠረተ ፈቃድ ማዘጋጀት አይቻልም {0}
+DocType: Subscription,Subscription Start Date,የደንበኝነት ምዝገባ የመጀመሪያ ቀን
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ሁለት ዓምዶች, አሮጌውን ስም አንዱ አዲስ ስም አንድ ጋር .csv ፋይል አያይዝ"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} እንጂ ማንኛውም ገባሪ በጀት ዓመት ውስጥ.
 DocType: Packed Item,Parent Detail docname,የወላጅ ዝርዝር DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ማጣቀሻ: {0}, የእቃ ኮድ: {1} እና የደንበኞች: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,የሙከራ ጊዜ ክፍለጊዜ ቀን ከመሞቱ በፊት የሚጀምርበት ቀን
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,ኪግ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,የሥራ ዕድል።
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},በንጥል {1} ውስጥ የንጥል ግዢን {0} በተመለከተ ቦም አልተገለጸም
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,በዚሁ ኩባንያ ከአንድ ጊዜ በላይ ገባ ነው
 DocType: Patient,Married,ያገባ
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},አይፈቀድም {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ከ ንጥሎችን ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,ከ ንጥሎችን ያግኙ
 DocType: Price List,Price Not UOM Dependant,የዋጋ ተመን UOM ጥገኛ አይደለም
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ፍሬን ኦይል
 DocType: Tax Rule,Tax Type,የግብር አይነት
 ,Completed Work Orders,የስራ ትዕዛዞችን አጠናቅቋል
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,ግብር የሚከፈልበት መጠን
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,ግብር የሚከፈልበት መጠን
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: BOM,Item Image (if not slideshow),ንጥል ምስል (የተንሸራታች አይደለም ከሆነ)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(ሰዓት ተመን / 60) * ትክክለኛ ኦፕሬሽን ሰዓት
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ረድፍ # {0}: የማጣቀሻ ሰነድ አይነት ከክፍያ መጠየቂያ ወይም የጆርናል ምዝገባ አንድ አካል መሆን አለበት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,ይምረጡ BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ረድፍ # {0}: የማጣቀሻ ሰነድ አይነት ከክፍያ መጠየቂያ ወይም የጆርናል ምዝገባ አንድ አካል መሆን አለበት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,ይምረጡ BOM
 DocType: SMS Log,SMS Log,ኤስ ኤም ኤስ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,የደረሱ ንጥሎች መካከል ወጪ
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ለሠራተኛው የተሰጠውን የገንዘብ መጠን ያስተዳድሩ
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,የማድረስ ማሳወቂያ
 DocType: Journal Entry,Opening Entry,በመክፈት ላይ የሚመዘገብ መረጃ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,መለያ ክፍያ ብቻ
-DocType: Employee Loan,Repay Over Number of Periods,ጊዜዎች በላይ ቁጥር ብድራትን
+DocType: Loan,Repay Over Number of Periods,ጊዜዎች በላይ ቁጥር ብድራትን
 DocType: Stock Entry,Additional Costs,ተጨማሪ ወጪዎች
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መለያ ቡድን ሊቀየር አይችልም.
 DocType: Lead,Product Enquiry,የምርት Enquiry
 DocType: Education Settings,Validate Batch for Students in Student Group,የተማሪ ቡድን ውስጥ ተማሪዎች ለ ባች Validate
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ሠራተኛ አልተገኘም ምንም ፈቃድ መዝገብ {0} ለ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ሠራተኛ አልተገኘም ምንም ፈቃድ መዝገብ {0} ለ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,መጀመሪያ ኩባንያ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,መጀመሪያ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,መጀመሪያ ኩባንያ እባክዎ ይምረጡ
 DocType: Employee Education,Under Graduate,ምረቃ በታች
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,እባክዎ በ HR ቅንብሮች ውስጥ ለመተው ሁኔታን ለመተው እባክዎ ነባሪ አብነት ያስቀምጡ.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ዒላማ ላይ
 DocType: BOM,Total Cost,ጠቅላላ ወጪ
 DocType: Soil Analysis,Ca/K,ካ / ካ
-DocType: Journal Entry Account,Employee Loan,የሰራተኛ ብድር
 DocType: Fee Schedule,Send Payment Request Email,የክፍያ ጥያቄ ኤሜል ይላኩ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} ንጥል ሥርዓት ውስጥ የለም ወይም ጊዜው አልፎበታል
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,መጠነሰፊ የቤት ግንባታ
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,በተሳካ ሁኔታ አልተመዘገበም.
 DocType: Assessment Result,Grade,ደረጃ
 DocType: Restaurant Table,No of Seats,የመቀመጫዎች ቁጥር
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ተለዋዋጭ ርዕሰ ጉዳይን ለማከል, እንደ እንዲህ ያሉ የጃንጃ መለያን ይጠቀሙ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,አቅራቢ በ ደርሷል
 DocType: Asset Maintenance Task,Asset Maintenance Task,የንብረት ጥገና ተግባር
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,ዓመታዊ ደመወዝ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,ዓመታዊ ደመወዝ
 DocType: Daily Work Summary,Daily Work Summary,ዕለታዊ የስራ ማጠቃለያ
 DocType: Period Closing Voucher,Closing Fiscal Year,በጀት ዓመት መዝጊያ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} የታሰሩ ነው
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,የክምችት ወጪ
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,የክምችት ወጪ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ዒላማ መጋዘን ይምረጡ
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ተመራጭ የእውቂያ ኢሜይል ያስገቡ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,ተመራጭ የእውቂያ ኢሜይል ያስገቡ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra የሚመዘገብ መረጃ
 DocType: Journal Entry Account,Credit in Company Currency,ኩባንያ የምንዛሬ ውስጥ የብድር
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,ዋና አድራሻ
 DocType: Production Plan,Material Request Detail,የቁስ ንብረት ጥያቄ ዝርዝር
 DocType: Selling Settings,Default Quotation Validity Days,ነባሪ ትዕዛዝ ዋጋ መስጫ ቀናት
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
 DocType: SMS Center,SMS Center,ኤስ ኤም ኤስ ማዕከል
 DocType: Sales Invoice,Change Amount,ለውጥ መጠን
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,የመንጃ ፍቃድ ምድቦች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,እባክዎ የመላኪያ ቀን ያስገቡ
 DocType: Depreciation Schedule,Make Depreciation Entry,የእርጅና Entry አድርግ
+DocType: HR Settings,Leave Settings,ቅንጅቶች ውጣ
 DocType: Appraisal Template Goal,KRA,ክራ
 DocType: Lead,Request Type,ጥያቄ አይነት
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,የሰራተኛ አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ብሮድካስቲንግ
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),የ POS (በኦንላይን / ከመስመር ውጭ) የመጫኛ ሞድ
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,ከስራ ስራዎች ጋር የጊዜ ሪፖርቶች መፍጠርን ያሰናክላል. በስራ ቅደም ተከተል ላይ ክዋኔዎች ክትትል አይደረግባቸውም
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ማስፈጸም
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ማስፈጸም
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ስለ ስራዎች ዝርዝሮች ፈጽሟል.
 DocType: Asset Maintenance Log,Maintenance Status,ጥገና ሁኔታ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,የአባልነት ዝርዝሮች
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: አቅራቢው ተከፋይ ሂሳብ ላይ ያስፈልጋል {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ንጥሎች እና የዋጋ አሰጣጥ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ጠቅላላ ሰዓት: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ቀን ጀምሮ በ የበጀት ዓመት ውስጥ መሆን አለበት. ቀን ጀምሮ ከወሰድን = {0}
 DocType: Drug Prescription,Interval,የጊዜ ክፍተት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ምርጫ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ምርጫ
 DocType: Grant Application,Individual,የግለሰብ
 DocType: Academic Term,Academics User,ምሑራንን ተጠቃሚ
 DocType: Cheque Print Template,Amount In Figure,ስእል ውስጥ የገንዘብ መጠን
-DocType: Employee Loan Application,Loan Info,ብድር መረጃ
+DocType: Loan Application,Loan Info,ብድር መረጃ
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,የጥገና ጉብኝት ያቅዱ.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,የአገልግሎት አቅራቢ ካርድ ጊዜ
 DocType: Share Transfer,Share Transfer,ትልልፍን አጋራ
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,የንጥል አብነት
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ባዮኬሚስትሪ
 DocType: Job Offer,Select Terms and Conditions,ይምረጡ ውሎች እና ሁኔታዎች
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ውጪ ዋጋ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ውጪ ዋጋ
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ቅንጅቶች
 DocType: Production Plan,Sales Orders,የሽያጭ ትዕዛዞች
 DocType: Purchase Taxes and Charges,Valuation,መገመት
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,ነባሪ ግዛት
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ቴሌቪዥን
 DocType: Work Order Operation,Updated via 'Time Log',«ጊዜ Log&quot; በኩል Updated
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ደንቡን ወይም አቅራቢውን ይምረጡ.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,ጁላይዜዮት
 DocType: Naming Series,Series List for this Transaction,ለዚህ ግብይት ተከታታይ ዝርዝር
 DocType: Company,Enable Perpetual Inventory,ለተመራ ቆጠራ አንቃ
+DocType: Bank Guarantee,Charges Incurred,ክፍያዎች ወጥተዋል
 DocType: Company,Default Payroll Payable Account,ነባሪ የደመወዝ ክፍያ የሚከፈል መለያ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,አዘምን የኢሜይል ቡድን
 DocType: Sales Invoice,Is Opening Entry,Entry በመክፈት ላይ ነው
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,ብጁ ውጤት
 DocType: Delivery Stop,Contact Name,የዕውቂያ ስም
 DocType: Course Assessment Criteria,Course Assessment Criteria,የኮርስ ግምገማ መስፈርት
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,የግብር መታወቂያ:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,የግብር መታወቂያ:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,የተማሪ መታወቂያ:
 DocType: POS Customer Group,POS Customer Group,POS የደንበኛ ቡድን
 DocType: Land Unit,Land Unit describing various land assets,የተለያዩ የመሬት ይዝታዎችን የሚገልጽ የመሬት ክፍል
@@ -374,9 +371,8 @@
 ,Open Work Orders,የሥራ ትዕዛዞችን ይክፈቱ
 DocType: Payment Term,Credit Months,የብድር ቀናቶች
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,የተጣራ ክፍያ ከ 0 መሆን አይችልም
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",በስርዓቱ ተደጋጋሚ የስህተት ማሳወቂያን መላክ ለማቆም በመመዝገቢያ ውስጥ የነቃ መስክን መርምረናል
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,ዓመት በአንድ ማምለኩን
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,ዓመት በአንድ ማምለኩን
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ረድፍ {0}: ያረጋግጡ መለያ ላይ &#39;Advance ነው&#39; {1} ይህን የቅድሚያ ግቤት ከሆነ.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} የመጋዘን ኩባንያ የእርሱ ወገን አይደለም {1}
 DocType: Email Digest,Profit & Loss,ትርፍ እና ኪሳራ
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,እባክዎ ተማሪዎች በተማሪዎች ቡድኖች ውስጥ ያዋቅሯቸው
 DocType: Item Website Specification,Item Website Specification,ንጥል የድር ጣቢያ ዝርዝር
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ባንክ ግቤቶችን
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ውጣ የታገዱ
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ባንክ ግቤቶችን
 DocType: Crop,Annual,ዓመታዊ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቅ ንጥል
 DocType: Stock Entry,Sales Invoice No,የሽያጭ ደረሰኝ የለም
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,የተማሪ ቡድን የፈጠራ መሣሪያ ኮርስ
 DocType: Lead,Do Not Contact,ያነጋግሩ አትበል
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,በእርስዎ ድርጅት ውስጥ የሚያስተምሩ ሰዎች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,ሶፍትዌር ገንቢ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,ሶፍትዌር ገንቢ
 DocType: Item,Minimum Order Qty,የስራ ልምድ ትዕዛዝ ብዛት
 DocType: Pricing Rule,Supplier Type,አቅራቢው አይነት
 DocType: Course Scheduling Tool,Course Start Date,የኮርስ መጀመሪያ ቀን
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,ማዕከል ውስጥ አትም
 DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,ቁሳዊ ጥያቄ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ከፍተኛ ደረጃ
 DocType: Email Digest,New Quotations,አዲስ ጥቅሶች
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,የተቀጣሪ ውስጥ የተመረጡ ተመራጭ ኢሜይል ላይ የተመሠረተ ሰራተኛ ኢሜይሎች የደመወዝ ወረቀት
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,በዝርዝሩ ውስጥ የመጀመሪያው ፈቃድ አጽዳቂ ነባሪ ፈቃድ አጽዳቂ ተዘጋጅቷል ይሆናል
 DocType: Tax Rule,Shipping County,የመርከብ ካውንቲ
-apps/erpnext/erpnext/config/desktop.py +167,Learn,ይወቁ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ይወቁ
 DocType: Asset,Next Depreciation Date,ቀጣይ የእርጅና ቀን
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,የተቀጣሪ በአንድ እንቅስቃሴ ወጪ
 DocType: Accounts Settings,Settings for Accounts,መለያዎች ቅንብሮች
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ያልተከፈሉ Cheques እና ማጽዳት ተቀማጭ
 DocType: Item,Synced With Hub,ማዕከል ጋር ተመሳስሏል
 DocType: Driver,Fleet Manager,መርከቦች ሥራ አስኪያጅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},የረድፍ # {0}: {1} ንጥል አሉታዊ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},የረድፍ # {0}: {1} ንጥል አሉታዊ ሊሆን አይችልም {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,የተሳሳተ የይለፍ ቃል
 DocType: Item,Variant Of,ነው ተለዋጭ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},እባክዎን የሆቴል የክፍል ደረጃ በ {} ላይ ያዘጋጁ
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Opening Invoice Creation Tool,Invoice Type,የደረሰኝ አይነት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,የመላኪያ ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,የመላኪያ ማስታወሻ
 DocType: Consultation,Encounter Impression,የግፊት ማሳያ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ግብሮች በማቀናበር ላይ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,የተሸጠ ንብረት ዋጋ
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,የደንበኛ ምንዛሬ ደንበኛ መሰረታዊ ምንዛሬ በመለወጥ ነው በ ተመን
 DocType: Course Scheduling Tool,Course Scheduling Tool,የኮርስ ዕቅድ መሣሪያ
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[አስቸኳይ] ለ% s ተደጋጋሚ% s በመፍጠር ላይ ሳለ ስህተት
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,የግብር ተመን
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,የመመዝገቢያ ጊዜ በሁለት የምደባ መዛግብት ውስጥ ሊገኝ አይችልም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,የመመዝገቢያ ጊዜ በሁለት የምደባ መዛግብት ውስጥ ሊገኝ አይችልም
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} አስቀድሞ የሰራተኛ የተመደበው {1} ወደ ጊዜ {2} ለ {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% ደርሷል
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,የተማሪ ቡድኖች ይፍጠሩ
 DocType: Volunteer,Weekends,የሳምንት መጨረሻ ቀናት
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,የብድር ማስታወሻ መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,የብድር ማስታወሻ መጠን
 DocType: Setup Progress Action,Action Document,የእርምጃ ሰነድ
 DocType: Chapter Member,Website URL,የድር ጣቢያ ዩ አር ኤል
 ,Finished Goods,ጨርሷል ምርቶች
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ማሳያ
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ንጥሎች አክል
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ንጥል ጥራት ምርመራ መለኪያ
+DocType: Leave Application,Leave Approver Name,አጽዳቂ ስም ውጣ
 DocType: Depreciation Schedule,Schedule Date,መርሐግብር ቀን
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ገቢዎች, ተቀናሾች እና ሌሎች ደመወዝ ክፍሎች"
 DocType: Packed Item,Packed Item,የታሸጉ ንጥል
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,ትዕምርተ ጥያቄ
 DocType: Healthcare Settings,Require Lab Test Approval,የቤተሙከራ ፍቃድ ማፅደቅ ጠይቅ
 DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,ድምር ውጤት
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,ድምር ውጤት
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
 DocType: Dosage Strength,Strength,ጥንካሬ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Consumable ወጪ
 DocType: Purchase Receipt,Vehicle Date,የተሽከርካሪ ቀን
 DocType: Student Log,Medical,የሕክምና
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ማጣት ለ ምክንያት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ማጣት ለ ምክንያት
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,የሂሳብ ቁጥር ያዘምኑ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,በእርሳስ ባለቤቱ ግንባር ጋር ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,ያላገባ
 DocType: Salary Slip,Total Loan Repayment,ጠቅላላ ብድር የሚያየን
 DocType: Account,Cost of Goods Sold,የዕቃዎችና ወጪ የተሸጡ
-DocType: Subscription,Yearly,በየአመቱ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
 DocType: Drug Prescription,Dosage,የመመገቢያ
 DocType: Journal Entry Account,Sales Order,የሽያጭ ትዕዛዝ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
 DocType: Assessment Plan,Examiner Name,መርማሪ ስም
 DocType: Lab Test Template,No Result,ምንም ውጤት
 DocType: Purchase Invoice Item,Quantity and Rate,ብዛት እና ደረጃ ይስጡ
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,የመጀመሪያ የኩባንያ ስም ያስገቡ
 DocType: Purchase Invoice,Supplier Name,አቅራቢው ስም
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,የ ERPNext መመሪያ ያንብቡ
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,በቀን መቁጠሪያ ውስጥ የሁሉም የመጓጓዣ አባላት ቅጠሎች ያሳዩ
 DocType: Purchase Invoice,01-Sales Return,01-የሽያጭ ምላሽ
 DocType: Account,Is Group,; ይህ ቡድን
 DocType: Email Digest,Pending Purchase Orders,የግዢ ትዕዛዞች በመጠባበቅ ላይ
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,አስገዳጅ መስክ - የትምህርት ዓመት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ከ {2} {3} ጋር አልተያያዘም
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,በዛ ኢሜይል አንድ ክፍል ሆኖ ይሄዳል ያለውን የመግቢያ ጽሑፍ ያብጁ. እያንዳንዱ ግብይት የተለየ የመግቢያ ጽሑፍ አለው.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},ኩባንያው ነባሪ ተከፋይ መለያ ለማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},ኩባንያው ነባሪ ተከፋይ መለያ ለማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},የሥራ ትዕዛዝ በግዳጅ ትዕዛዝ {0} ላይ አልተፈቀደም.
 DocType: Setup Progress Action,Min Doc Count,አነስተኛ ዳክ ሂሳብ
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,"በሙሉ አቅማቸው ባለማምረታቸው, ሂደቶች ዓለም አቀፍ ቅንብሮች."
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen እስከሁለት መለያዎች
 DocType: SMS Log,Sent On,ላይ የተላከ
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
 DocType: HR Settings,Employee record is created using selected field. ,የተቀጣሪ መዝገብ የተመረጠው መስክ በመጠቀም የተፈጠረ ነው.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,የበዓል ጌታ.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ለሽያጭ የተያዘ
 DocType: Packing Slip,From Package No.,ጥቅል ቁጥር ከ
 DocType: Item Attribute,To Range,ወደ ክልል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ዋስትና እና ተቀማጭ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ይህን የለውም ይህም አንዳንድ ንጥሎች ላይ ግብይቶችን አሉ እንደ ግምቱ ስልት መቀየር አይቻልም የራሱን ከግምቱ ዘዴ ነው
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,ዋስትና እና ተቀማጭ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ይህን የለውም ይህም አንዳንድ ንጥሎች ላይ ግብይቶችን አሉ እንደ ግምቱ ስልት መቀየር አይቻልም የራሱን ከግምቱ ዘዴ ነው
 DocType: Student Report Generation Tool,Attended by Parents,በወላጆች ተምረዋል
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
 DocType: Patient,AB Positive,AB አዎንታዊ ነው
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,የ ተሳትፎ ሬኮርዱ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet የተመሠረተ ለደምዎዝ ደመወዝ ክፍለ አካል.
 DocType: Sales Order Item,Used for Production Plan,የምርት ዕቅድ ላይ ውሏል
-DocType: Employee Loan,Total Payment,ጠቅላላ ክፍያ
+DocType: Loan,Total Payment,ጠቅላላ ክፍያ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,ለ Completed Work Order ግብይት መሰረዝ አይችሉም.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ደቂቃዎች ውስጥ) ክወናዎች መካከል ሰዓት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} እርምጃ ሊጠናቀቅ አልቻለም, ስለዚህ ተሰርዟል"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,የእርስዎ ደንበኞች መካከል ጥቂቶቹን ዘርዝር. እነዚህ ድርጅቶች ወይም ግለሰቦች ሊሆን ይችላል.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,በቂ ክፍሎች መመሥረት የሚቻለው
 DocType: POS Profile User,POS Profile User,POS የመገለጫ ተጠቃሚ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ቀጥታ ገቢ
+DocType: Subscription Invoice,Subscription Invoice,የምዝገባ ደረሰኝ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,ቀጥታ ገቢ
 DocType: Patient Appointment,Date TIme,ቀን እቅድ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","መለያ ተመድበው ከሆነ, መለያ ላይ የተመሠረተ ማጣሪያ አይቻልም"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,አስተዳደር ክፍል ኃላፊ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,አስተዳደር ክፍል ኃላፊ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ኩባንያዎችን እና ግብሮችን ማቀናበር
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ኮርስ ይምረጡ
 DocType: Codification Table,Codification Table,የማጣቀሻ ሰንጠረዥ
 DocType: Timesheet Detail,Hrs,ሰዓቶች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,ኩባንያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,ኩባንያ ይምረጡ
 DocType: Stock Entry Detail,Difference Account,ልዩነት መለያ
 DocType: Purchase Invoice,Supplier GSTIN,አቅራቢ GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,የገንዘብ ማጓጓዣ ሞዱል
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
 DocType: Journal Entry,Difference (Dr - Cr),ልዩነት (ዶክተር - CR)
+DocType: Bank Guarantee,Providing,መስጠት
 DocType: Account,Profit and Loss,ትርፍ ማጣት
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","አልተፈቀደም, እንደ አስፈላጊነቱ የቤተ ሙከራ ሙከራ ቅንብርን ያዋቅሩ"
 DocType: Patient,Risk Factors,የጭንቀት ሁኔታዎች
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,አቅራቢ ደረሰኝ የለም
 DocType: Territory,For reference,ለማጣቀሻ
 DocType: Healthcare Settings,Appointment Confirmation,የቀጠሮ ማረጋገጫ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",መሰረዝ አይቻልም መለያ የለም {0}: ይህ የአክሲዮን ግብይቶች ላይ የዋለው እንደ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",መሰረዝ አይቻልም መለያ የለም {0}: ይህ የአክሲዮን ግብይቶች ላይ የዋለው እንደ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),የመመዝገቢያ ጊዜ (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ሰላም
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,አንቀሳቅስ ንጥል
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","ቀድሞውኑ በ pos profile {0} ለ ተጠቃሚ {1} አስቀድሞ ተዋቅሯል, በደግነት የተሰናከለ ነባሪ"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,የፋይናንስ / የሂሳብ ዓመት ነው.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ሲጠራቀሙ እሴቶች
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","ይቅርታ, ተከታታይ ቁጥሮች ሊዋሃዱ አይችሉም"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","ይቅርታ, ተከታታይ ቁጥሮች ሊዋሃዱ አይችሉም"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,በ POS የመገለጫ ግዛት ያስፈልጋል
 DocType: Supplier,Prevent RFQs,RFQs ይከላከሉ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},የጊዜ ቆይታ ከ {0} እስከ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},የጊዜ ቆይታ ከ {0} እስከ {1}
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 ,Lead Id,ቀዳሚ መታወቂያ
 DocType: C-Form Invoice Detail,Grand Total,አጠቃላይ ድምር
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,የማጓጓዣ ክፍያ ቀን
 DocType: Production Plan,Production Plan,የምርት ዕቅድ
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,የጋብቻ ክፍያ መጠየቂያ መሳሪያ መፍጠሩ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,የሽያጭ ተመለስ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ማስታወሻ: ጠቅላላ የተመደበ ቅጠሎች {0} አስቀድሞ ተቀባይነት ቅጠሎች ያነሰ መሆን የለበትም {1} ወደ ጊዜ
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,በ Serial No Entput ላይ በመመርኮዝ ስንት ግምት ያዘጋጁ
 ,Total Stock Summary,ጠቅላላ የአክሲዮን ማጠቃለያ
 DocType: Announcement,Posted By,በ ተለጥፏል
 DocType: Item,Delivered by Supplier (Drop Ship),አቅራቢው ደርሷል (ጣል መርከብ)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,እናንተ አስቀድሞ ከሌላ UOM አንዳንድ ግብይት (ዎች) ምክንያቱም ንጥል ለ ይለኩ ነባሪ ክፍል {0} በቀጥታ ሊቀየር አይችልም. የተለየ ነባሪ UOM ለመጠቀም አዲስ ንጥል መፍጠር አለብዎት.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ካምፓኒው ማዘጋጀት እባክዎ
 DocType: Share Balance,Share Balance,የሒሳብ ሚዛን
 DocType: Purchase Order Item,Billed Amt,የሚከፈል Amt
 DocType: Training Result Employee,Training Result Employee,ስልጠና ውጤት ሰራተኛ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,የአክሲዮን ግቤቶች አደረገ ናቸው ላይ አንድ ምክንያታዊ መጋዘን.
-DocType: Repayment Schedule,Principal Amount,ዋና ዋና መጠን
-DocType: Employee Loan Application,Total Payable Interest,ጠቅላላ የሚከፈል የወለድ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ዋና ዋና መጠን
+DocType: Loan Application,Total Payable Interest,ጠቅላላ የሚከፈል የወለድ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ድምር ውጤት: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,የሽያጭ ደረሰኝ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ማጣቀሻ የለም እና ማጣቀሻ ቀን ያስፈልጋል {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
 DocType: Restaurant Reservation,Restaurant Reservation,የምግብ ቤት ቦታ ማስያዣ
 DocType: Land Unit,Land Unit Name,የመሬት መለኪያ ስም
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,ሐሳብ መጻፍ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ማጠራቀሚያ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ደንበኛዎችን በኢሜይል ያሳውቁ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ደንበኛዎችን በኢሜይል ያሳውቁ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ሌላው የሽያጭ ሰው {0} ተመሳሳይ የሰራተኛ መታወቂያ ጋር አለ
 DocType: Employee Advance,Claimed Amount,የይገባኛል የተጠየቀው መጠን
 apps/erpnext/erpnext/config/education.py +180,Masters,ጌቶች
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","ክፍያ ማስተናገጃ መለያ አልተፈጠረም, በእጅ አንድ ፍጠር."
 DocType: Supplier Scorecard,Per Year,በዓመት
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,በእያንዳንዱ DOB ውስጥ በዚህ ፕሮግራም ውስጥ ለመግባት ብቁ አይደሉም
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
 DocType: Sales Invoice,Sales Taxes and Charges,የሽያጭ ግብሮች እና ክፍያዎች
 DocType: Employee,Organization Profile,ድርጅት መገለጫ
 DocType: Vital Signs,Height (In Meter),ቁመት (በሜትር)
 DocType: Student,Sibling Details,እህትህ ዝርዝሮች
 DocType: Vehicle Service,Vehicle Service,የተሽከርካሪ አገልግሎት
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,በራስ-ሰር ሁኔታዎች ላይ ተመስርቶ ግብረመልስ ጥያቄ ይኖሩ ይሆናል.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,በራስ-ሰር ሁኔታዎች ላይ ተመስርቶ ግብረመልስ ጥያቄ ይኖሩ ይሆናል.
 DocType: Employee,Reason for Resignation,ሥራ መልቀቅ ለ ምክንያት
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,አፈጻጸም ማስተመኖች አብነት.
 DocType: Sales Invoice,Credit Note Issued,የብድር ማስታወሻ ቀርቧል
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,ጥገና ፕሮግራም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","በዚያን ጊዜ የዋጋ አሰጣጥ ደንቦቹ ወዘተ የደንበኞች, የደንበኞች ቡድን, ክልል, አቅራቢው, አቅራቢው ዓይነት, ዘመቻ, የሽያጭ ባልደረባ ላይ የተመሠረቱ ውጭ ይጣራሉ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ቆጠራ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,የሰራተኛ የብድር አስተዳደር
 DocType: Employee,Passport Number,የፓስፖርት ቁጥር
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ጋር በተያያዘ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,አስተዳዳሪ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,አስተዳዳሪ
 DocType: Payment Entry,Payment From / To,/ ከ ወደ ክፍያ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},እባክዎ በ Warehouse {0} ውስጥ መለያ ያዘጋጁ
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,ቁሳዊ ማስተላለፍ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,ለ ዱካ ማግኘት አልተቻለም
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),በመክፈት ላይ (ዶክተር)
+DocType: Loan,Applicant,አመልካች
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},መለጠፍ ማህተም በኋላ መሆን አለበት {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ተደጋጋሚ ሰነዶችን ለመስራት
 ,GST Itemised Purchase Register,GST የተሰሉ ግዢ ይመዝገቡ
 DocType: Course Scheduling Tool,Reschedule,እንደገና ሰንጠረዥ
-DocType: Employee Loan,Total Interest Payable,ተከፋይ ጠቅላላ የወለድ
+DocType: Loan,Total Interest Payable,ተከፋይ ጠቅላላ የወለድ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ደረስን ወጪ ግብሮች እና ክፍያዎች
 DocType: Work Order Operation,Actual Start Time,ትክክለኛው የማስጀመሪያ ሰዓት
 DocType: BOM Operation,Operation Time,ኦፕሬሽን ሰዓት
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,ጪረሰ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,መሠረት
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,መሠረት
 DocType: Timesheet,Total Billed Hours,ጠቅላላ የሚከፈል ሰዓቶች
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,መጠን ጠፍቷል ይጻፉ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,መጠን ጠፍቷል ይጻፉ
 DocType: Leave Block List Allow,Allow User,ተጠቃሚ ፍቀድ
 DocType: Journal Entry,Bill No,ቢል ምንም
 DocType: Company,Gain/Loss Account on Asset Disposal,የንብረት ማስወገድ ላይ ረብ / ማጣት መለያ
 DocType: Vehicle Log,Service Details,የአገልግሎት ዝርዝሮች
-DocType: Subscription,Quarterly,የሩብ ዓመት
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,የተደረደሩ
 DocType: Selling Settings,Delivery Note Required,የመላኪያ ማስታወሻ ያስፈልጋል
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,የጊዜ ሉህ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ጥሬ እቃዎች ላይ የተመረኮዘ ላይ
 DocType: Sales Invoice,Port Code,የወደብ ኮድ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,የመጠባበቂያ ክምችት
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,የመጠባበቂያ ክምችት
 DocType: Lead,Lead is an Organization,መሪ ድርጅት ነው
 DocType: Guardian Interest,Interest,ዝንባሌ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ቅድመ ሽያጭ
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,መለያዎች
 DocType: Vehicle,Odometer Value (Last),ቆጣሪው ዋጋ (የመጨረሻ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,የአቅራቢዎች የውጤት መለኪያ መስፈርት ደንቦች.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,ማርኬቲንግ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,ማርኬቲንግ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,የክፍያ Entry አስቀድሞ የተፈጠረ ነው
 DocType: Request for Quotation,Get Suppliers,አቅራቢዎችን ያግኙ
 DocType: Purchase Receipt Item Supplied,Current Stock,የአሁኑ የአክሲዮን
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ቅድመ-የቀጣሪ
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ቅድመ-የቀጣሪ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,አባልነትዎ በ 30 ቀናት ውስጥ የሚያልቅ ከሆነ ብቻ መታደስ የሚችሉት
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,የ &quot;Cash Flow Mapper&quot; ሰነዶች ካለህ ብቻ ምረጥ
 DocType: Email Digest,Next email will be sent on:,ቀጣይ ኢሜይል ላይ ይላካል:
 DocType: Supplier Scorecard,Per Week,በሳምንት
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,ንጥል ተለዋጮች አለው.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ጠቅላላ ተማሪ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ንጥል {0} አልተገኘም
 DocType: Bin,Stock Value,የክምችት እሴት
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],የምዕራፍ ቅዱሳት መጻሕፍትን መዝገቦች [FEC]
 DocType: Journal Entry,Credit Card Entry,ክሬዲት ካርድ Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ኩባንያ እና መለያዎች
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,እሴት ውስጥ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,እሴት ውስጥ
 DocType: Asset Settings,Depreciation Options,የዋጋ ቅነሳ አማራጮች
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,ልክ ያልሆነ የመለጠጫ ጊዜ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,ልክ ያልሆነ የመለጠጫ ጊዜ
 DocType: Lead,Campaign Name,የዘመቻ ስም
 DocType: Hotel Room,Capacity,ችሎታ
 DocType: Selling Settings,Close Opportunity After Days,ቀናት በኋላ ዝጋ አጋጣሚ
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ደንበኛ የግዢ ትዕዛዝ ምንም
 DocType: Budget,Budget Against,በጀት ላይ
 DocType: Employee,Cell Number,የእጅ ስልክ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ለተሰጠው መስፈርት ምንም ሰራተኛ የለም. የደመወዝ ወረቀት አስቀድመው አልተፈጠሩም.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ለተሰጠው መስፈርት ምንም ሰራተኛ የለም. የደመወዝ ወረቀት አስቀድመው አልተፈጠሩም.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ራስ-ቁሳዊ ጥያቄዎች የመነጩ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ጠፍቷል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,አንተ አምድ &#39;ጆርናል የሚመዘገብ ላይ »ውስጥ የአሁኑ ቫውቸር ሊገባ አይችልም
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,እባክህ ሰንጠረዥ ምረጥ
 DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} በ &#39;ተቀባዮች&#39; ውስጥ ልክ ያልሆነ የኢሜይል አድራሻ ነው.
 DocType: Special Test Items,Particulars,ዝርዝሮች
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ከ {0} አይነት {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: ከ {0} አይነት {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ረድፍ {0}: የልወጣ ምክንያት የግዴታ ነው
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","በርካታ ዋጋ ደንቦች ተመሳሳይ መስፈርት ጋር አለ, ቅድሚያ ሰጥቷቸዋል ግጭት ለመፍታት ይሞክሩ. ዋጋ: ሕጎች: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,አቦዝን ወይም ሌሎች BOMs ጋር የተያያዘ ነው እንደ BOM ማስቀረት አይቻልም
 DocType: Asset,Maintenance,ጥገና
+DocType: Subscriber,Subscriber,ደንበኛ
 DocType: Item Attribute Value,Item Attribute Value,ንጥል ዋጋ የአይነት
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,እባክዎ የፕሮጀክት ሁኔታዎን ያዘምኑ
 DocType: Item,Maximum sample quantity that can be retained,ሊቆይ የሚችል ከፍተኛ የናሙና መጠን
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ወደ ግዢ ሳጥን ጨመር ነባሪ ቅንብሮች
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,ጊዜያቶችን ጨምር
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ጆርናል Entry በኩል በመዛጉ ንብረት {0}
-DocType: Employee Loan,Interest Income Account,የወለድ ገቢ መለያ
+DocType: Loan,Interest Income Account,የወለድ ገቢ መለያ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,የግብዓት ግብዣ ተልኳል
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ባዮቴክኖሎጂ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ቢሮ ጥገና ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ቢሮ ጥገና ወጪዎች
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,መሄድ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,የኢሜይል መለያ በማቀናበር ላይ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,መጀመሪያ ንጥል ያስገቡ
 DocType: Asset Repair,Downtime,ታግዷል
 DocType: Account,Liability,ኃላፊነት
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ማዕቀብ መጠን ረድፍ ውስጥ የይገባኛል ጥያቄ መጠን መብለጥ አይችልም {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ማዕቀብ መጠን ረድፍ ውስጥ የይገባኛል ጥያቄ መጠን መብለጥ አይችልም {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,አካዳሚያዊ ውል:
 DocType: Salary Detail,Do not include in total,በአጠቃላይ አያካትቱ
 DocType: Company,Default Cost of Goods Sold Account,ጥሪታቸውንም እየሸጡ መለያ ነባሪ ዋጋ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},የናሙና መጠን {0} ከተላከ በላይ መሆን አይሆንም {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
 DocType: Employee,Family Background,የቤተሰብ ዳራ
 DocType: Request for Quotation Supplier,Send Email,ኢሜይል ይላኩ
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
 DocType: Item,Max Sample Quantity,ከፍተኛ መጠን ናሙና ብዛት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,ምንም ፍቃድ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,ምንም ፍቃድ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,ጥቅስ ተጠይቋል
 DocType: Vital Signs,Heart Rate / Pulse,የልብ ምት / የልብ ምት
 DocType: Company,Default Bank Account,ነባሪ የባንክ ሂሳብ
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,ከፍተኛ weightage ጋር ንጥሎች ከፍተኛ ይታያል
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,የላብራቶሪ ሙከራዎች እና ወሳኝ ምልክቶች
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ባንክ ማስታረቅ ዝርዝር
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ምንም ሰራተኛ አልተገኘም
-DocType: Subscription,Stopped,አቁሟል
 DocType: Item,If subcontracted to a vendor,አንድ አቅራቢው subcontracted ከሆነ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,የፕሮጀክት ዝመና.
 DocType: SMS Center,All Customer Contact,ሁሉም የደንበኛ ያግኙን
 DocType: Land Unit,Tree Details,ዛፍ ዝርዝሮች
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ሁሉም ንጥል ቡድኖች
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,በራስ-ሰር ግብይቶች ማቅረቢያ ላይ መልዕክት ያዘጋጁ.
 DocType: Work Order,Item To Manufacture,ንጥል ለማምረት
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} ሁኔታ {2} ነው
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",የተመረጠው አድራሻ ከተቀመጠ በኋላ ማስተካከያ ከተደረገበት አይምረጡ
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 DocType: Item,Hub Publishing Details,ሃቢ የህትመት ዝርዝሮች
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;በመክፈት ላይ&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;በመክፈት ላይ&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
 DocType: Lab Test Template,Result Format,የውጤት ፎርማት
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,በሚካሄዴ
 DocType: Vehicle Service,Brake Pad,የብሬክ ፓድ
 DocType: Fertilizer,Fertilizer Contents,የማዳበሪያ ይዘት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,የጥናት ምርምር እና ልማት
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,የጥናት ምርምር እና ልማት
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ቢል የገንዘብ መጠን
 DocType: Company,Registration Details,ምዝገባ ዝርዝሮች
 DocType: Timesheet,Total Billed Amount,ጠቅላላ የሚከፈል መጠን
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,በሽያጭ ትዕዛዝ ላይ የብድር መጠን ወሰን ያለፈበት ይመልከቱ
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,የአፈጻጸም መርምር.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ማንቃት ወደ ግዢ ሳጥን ጨመር የነቃ ነው እንደ &#39;ወደ ግዢ ሳጥን ጨመር ተጠቀም&#39; እና ወደ ግዢ ሳጥን ጨመር ቢያንስ አንድ የግብር ሕግ ሊኖር ይገባል
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",የክፍያ Entry {0} ትዕዛዝ በዚህ መጠየቂያ ውስጥ አስቀድሞ እንደ አፈረሰ ያለበት ከሆነ {1} ፈትሽ ላይ የተያያዘ ነው.
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",የክፍያ Entry {0} ትዕዛዝ በዚህ መጠየቂያ ውስጥ አስቀድሞ እንደ አፈረሰ ያለበት ከሆነ {1} ፈትሽ ላይ የተያያዘ ነው.
 DocType: Sales Invoice Item,Stock Details,የክምችት ዝርዝሮች
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,የፕሮጀክት ዋጋ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,ነጥብ-መካከል-ሽያጭ
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,አነስተኛ ቦታ መያዝ
 DocType: Item Attribute,Item Attribute Values,ንጥል መገለጫ ባህሪ እሴቶች
 DocType: Examination Result,Examination Result,ምርመራ ውጤት
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,የግዢ ደረሰኝ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,የግዢ ደረሰኝ
 ,Received Items To Be Billed,ተቀብሏል ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,ምንዛሬ ተመን ጌታቸው.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},ማጣቀሻ Doctype ውስጥ አንዱ መሆን አለበት {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
 DocType: Work Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ለሽግግር ምንም የለም
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ለሽግግር ምንም የለም
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),መዝጊያ (መከፈቻ + ጠቅላላ)
 DocType: Journal Entry,Depreciation Entry,የእርጅና Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,በመጀመሪያ ስለ ሰነዱ አይነት ይምረጡ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ይህ ጥገና ይጎብኙ በመሰረዝ በፊት ይቅር ቁሳዊ ጥገናዎች {0}
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 ደረጃ
 DocType: Pricing Rule,Rate or Discount,ደረጃ ወይም ቅናሽ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ተከታታይ አይ {0} ንጥል የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},ተከታታይ አይ {0} ንጥል የእርሱ ወገን አይደለም {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ያስፈልጋል ብዛት
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,ተወዳጆች
 DocType: Hub Settings,Custom Data,ብጁ ውሂብ
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,የሕክምና ኮድ መደበኛ
 DocType: Soil Texture,Clay Composition (%),የሸክላ አዘጋጅ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,እባክዎ ስራ ከመመደባቸው በፊት ያስቀምጡ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ቀሪ ዋጋ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ቀሪ ዋጋ
 DocType: Lab Test,Lab Technician,ላብራቶሪ ቴክኒሽያን
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,የሽያጭ ዋጋ ዝርዝር
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,የሽያጭ ዋጋ ዝርዝር
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",ምልክት ከተደረገ ደንበኛው ታካሚን ይመርጣል. የታካሚ ደረሰኞች በዚህ ደንበኛ ላይ ይወጣሉ. ታካሚን በመፍጠር ላይ እያለ ነባር ደንበኛ መምረጥም ይችላሉ.
 DocType: Bank Reconciliation,Account Currency,መለያ ምንዛሬ
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,ኩባንያ ውስጥ ዙር ጠፍቷል መለያ መጥቀስ እባክዎ
 DocType: Purchase Receipt,Range,ርቀት
 DocType: Supplier,Default Payable Accounts,ነባሪ ተከፋይ መለያዎች
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
 DocType: Item Barcode,Item Barcode,የእሴት ባር ኮድ
 DocType: Woocommerce Settings,Endpoints,መቁጠሪያዎች
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","እንዲፈጠር. ዘግይቶ ከሆነ, «በወር ቀን ውስጥ ይድገሙት» የሚለውን መስክ እራስዎ መቀየር አለብዎት"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
 DocType: Share Transfer,From Folio No,ከ Folio ቁጥር
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,የደረሰኝ የቅድሚያ ግዢ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ረድፍ {0}: የሥዕል ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,ሊሰራ የሚችልበት ቀን
 DocType: Guardian,Guardian Name,አሳዳጊ ስም
 DocType: Cheque Print Template,Has Print Format,አትም ቅርጸት አለው
-DocType: Employee Loan,Sanctioned,ማዕቀብ
+DocType: Loan,Sanctioned,ማዕቀብ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ መዝገብ አልተፈጠረም ነው
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},የረድፍ # {0}: ንጥል ምንም መለያ ይግለጹ {1}
 DocType: Crop Cycle,Crop Cycle,ከርክም ዑደት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","«የምርት ጥቅል &#39;ንጥሎች, መጋዘን, መለያ የለም እና ባች ምንም የ« ማሸጊያ ዝርዝር »ማዕድ ይብራራል. መጋዘን እና የጅምላ የለም ማንኛውም &#39;የምርት ጥቅል&#39; ንጥል ሁሉ ማሸጊያ ንጥሎች ተመሳሳይ ከሆነ, እነዚህ እሴቶች በዋናው ንጥል ሰንጠረዥ ውስጥ ገብቶ ሊሆን ይችላል, እሴቶች ማዕድ &#39;ዝርዝር ማሸግ&#39; ይገለበጣሉ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","«የምርት ጥቅል &#39;ንጥሎች, መጋዘን, መለያ የለም እና ባች ምንም የ« ማሸጊያ ዝርዝር »ማዕድ ይብራራል. መጋዘን እና የጅምላ የለም ማንኛውም &#39;የምርት ጥቅል&#39; ንጥል ሁሉ ማሸጊያ ንጥሎች ተመሳሳይ ከሆነ, እነዚህ እሴቶች በዋናው ንጥል ሰንጠረዥ ውስጥ ገብቶ ሊሆን ይችላል, እሴቶች ማዕድ &#39;ዝርዝር ማሸግ&#39; ይገለበጣሉ."
 DocType: Student Admission,Publish on website,ድር ላይ ያትሙ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,አቅራቢው ደረሰኝ ቀን መለጠፍ ቀን በላይ ሊሆን አይችልም
+DocType: Subscription,Cancelation Date,የመሰረዝ ቀን
 DocType: Purchase Invoice Item,Purchase Order Item,ትዕዛዝ ንጥል ይግዙ
 DocType: Agriculture Task,Agriculture Task,የግብርና ስራ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ቀጥተኛ ያልሆነ ገቢ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,ቀጥተኛ ያልሆነ ገቢ
 DocType: Student Attendance Tool,Student Attendance Tool,የተማሪ የትምህርት ክትትል መሣሪያ
 DocType: Restaurant Menu,Price List (Auto created),የዋጋ ዝርዝር (በራስ የተፈጠረ)
 DocType: Cheque Print Template,Date Settings,ቀን ቅንብሮች
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,መቁጠሪያ
 DocType: Workstation,Electricity Cost,ኤሌክትሪክ ወጪ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,የቤተሙከራ ፍተሻው የቆይታ ወቅት ከክምችት የጊዜ ገደብ ውስጥ መሆን አይችልም
+DocType: Subscription Plan,Cost,ወጭ
 DocType: HR Settings,Don't send Employee Birthday Reminders,የተቀጣሪ የልደት አስታዋሾች አትላክ
 DocType: Expense Claim,Total Advance Amount,የጠቅላላ የቅድሚያ ክፍያ
 DocType: Delivery Stop,Estimated Arrival,የተገመተው መድረሻ
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
 DocType: Timesheet Detail,Bill,ቢል
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ነጭ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,ነጭ
 DocType: SMS Center,All Lead (Open),ሁሉም ቀዳሚ (ክፈት)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,ከቼክ ሳጥኖች ውስጥ ከፍተኛውን አንድ አማራጭ ብቻ መምረጥ ይችላሉ.
 DocType: Purchase Invoice,Get Advances Paid,እድገት የሚከፈልበት ያግኙ
 DocType: Item,Automatically Create New Batch,በራስ-ሰር አዲስ ባች ፍጠር
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} ወደ {1} (ረድፍ {2}) መመደብን
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,አድርግ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} ወደ {1} (ረድፍ {2}) መመደብን
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,አድርግ
 DocType: Student Admission,Admission Start Date,ምዝገባ መጀመሪያ ቀን
 DocType: Journal Entry,Total Amount in Words,ቃላት ውስጥ ጠቅላላ መጠን
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,አዲስ ተቀጣሪ
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
 DocType: Repayment Schedule,Balance Loan Amount,ቀሪ የብድር መጠን
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,መርሐግብር ኮርስ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,የክምችት አማራጮች
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,የክምችት አማራጮች
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,በመጨረሻ ግዢ ዝርዝሮች በግዢ ትዕዛዝ ማምጣት ያሰናክሉ
 DocType: Journal Entry Account,Expense Claim,የወጪ የይገባኛል ጥያቄ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ማሸጊያ የማያፈስ ንጥል
 DocType: Purchase Invoice,Cash/Bank Account,በጥሬ ገንዘብ / የባንክ መለያ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ይጥቀሱ እባክዎ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
 DocType: Delivery Note,Delivery To,ወደ መላኪያ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,ተለዋጭ ፍጥረት ተሰልፏል.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},የ {0} የጥናት ማጠቃለያ
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,በዝርዝሩ ውስጥ የመጀመሪያ የመጠቆም ፀባይ እንደ ነባሪው በመምሪያ ያሻሽሉ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Plan,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
 DocType: Training Event,Self-Study,በራስ ጥናት ማድረግ
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,ደመወዝ
 DocType: Asset Maintenance,Maintenance Manager Name,የጥገና አስተዳዳሪ ስም
 DocType: Agriculture Task,Urgent,አስቸኳይ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},ሰንጠረዥ ውስጥ ረድፍ {0} ትክክለኛ የረድፍ መታወቂያ እባክዎን ለይተው {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},ሰንጠረዥ ውስጥ ረድፍ {0} ትክክለኛ የረድፍ መታወቂያ እባክዎን ለይተው {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ተለዋዋጭ መለየት አልተቻለም:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,እባክዎ ከፓፖፓድ ለማርትዕ መስክ ይምረጡ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,የክምች ሌደር አስከብር ቋሚ የንብረት ንጥል ሊሆን አይችልም.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,የጥራት ቁጥጥር አብነት መለያን
 DocType: Project,First Email,የመጀመሪያ ኢሜይል
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,የሽያጭ ትዕዛዝ / ያለቀለት ዕቃዎች መጋዘን ውስጥ የተያዘ መጋዘን
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ሽያጭ መጠን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ሽያጭ መጠን
 DocType: Repayment Schedule,Interest Amount,የወለድ መጠን
 DocType: Serial No,Creation Document No,ፍጥረት ሰነድ የለም
 DocType: Share Transfer,Issue,ርዕሰ ጉዳይ
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,መላኪያ መንግስት
 ,Projected Quantity as Source,ምንጭ ፕሮጀክት ብዛት
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ንጥል አዝራር &#39;የግዢ ደረሰኞች ከ ንጥሎች ያግኙ&#39; በመጠቀም መታከል አለበት
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,የመላኪያ ጉዞ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,የመላኪያ ጉዞ
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,የማስተላለፍ አይነት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,የሽያጭ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,የሽያጭ ወጪዎች
 DocType: Consultation,Diagnosis,ምርመራ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,መደበኛ ሊገዙ
 DocType: GL Entry,Against,ላይ
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,አካባቢያዊ መለያ ቁጥር
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},በብድር ውስጥ የወለድ ገቢን ይምረጡ {0}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
 DocType: Packing Slip,Net Weight UOM,የተጣራ ክብደት UOM
 DocType: Item,Default Supplier,ነባሪ አቅራቢ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,የምርት በል መቶኛ በላይ
-DocType: Employee Loan,Repayment Schedule,ብድር መክፈል ፕሮግራም
+DocType: Loan,Repayment Schedule,ብድር መክፈል ፕሮግራም
 DocType: Shipping Rule Condition,Shipping Rule Condition,የመርከብ አገዛዝ ሁኔታ
 DocType: Holiday List,Get Weekly Off Dates,ሳምንታዊ ጠፍቷል ቀኖች ያግኙ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,የማብቂያ ቀን ከመጀመሪያ ቀን ያነሰ መሆን አይችልም
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,አማካይ ዕድሜ
 DocType: Education Settings,Attendance Freeze Date,በስብሰባው እሰር ቀን
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,የእርስዎ አቅራቢዎች መካከል ጥቂቶቹን ዘርዝር. እነዚህ ድርጅቶች ወይም ግለሰቦች ሊሆን ይችላል.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ሁሉም ምርቶች ይመልከቱ
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,ሁሉም ምርቶች ይመልከቱ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),ዝቅተኛው ሊድ ዕድሜ (ቀኖች)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,ሁሉም BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},የ {0} ዓይነት የሆቴል ክፍሎች በ {1} ላይ አይገኙም
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,የሰራተኛ ከ
 DocType: Driver,Cellphone Number,የሞባይል ስልክ ቁጥር
 DocType: Project,Monitor Progress,የክትትል ሂደት
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
 DocType: Journal Entry,Make Difference Entry,ለችግሮችህ Entry አድርግ
+DocType: Supplier Quotation,Auto Repeat Section,ራስ-ሰር ይድገሙ
 DocType: Upload Attendance,Attendance From Date,ቀን ጀምሮ በስብሰባው
 DocType: Appraisal Template Goal,Key Performance Area,ቁልፍ አፈጻጸም አካባቢ
 DocType: Program Enrollment,Transportation,መጓጓዣ
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
+DocType: Department Approver,Department Approver,Department Approve
 DocType: SMS Center,Total Characters,ጠቅላላ ቁምፊዎች
 DocType: Employee Advance,Claimed,ይገባኛል ጥያቄ የቀረበበት
 DocType: Crop,Row Spacing,ረድፍ ክፍተት
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ክፍያ እርቅ ደረሰኝ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,አስተዋጽዖ%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","የ ሊገዙ ቅንብሮች መሠረት የግዢ ትዕዛዝ ያስፈልጋል ከሆነ == &#39;አዎ&#39; ከዚያም የግዥ ደረሰኝ ለመፍጠር, የተጠቃሚ ንጥል መጀመሪያ የግዢ ትዕዛዝ መፍጠር አለብዎት {0}"
+,HSN-wise-summary of outward supplies,HSN-ጥልቀት-የውጭ አቅርቦቶች ማጠቃለያ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,የእርስዎ ማጣቀሻ የኩባንያ ምዝገባ ቁጥሮች. የግብር ቁጥሮች ወዘተ
 DocType: Sales Partner,Distributor,አከፋፋይ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ወደ ግዢ ሳጥን ጨመር መላኪያ ደንብ
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,የእርምጃ ስም
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,የጀመረበት ዓመት
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN የመጀመሪያው 2 አሃዞች ስቴት ቁጥር ጋር መዛመድ አለበት {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,የአሁኑ መጠየቂያ ያለው ጊዜ የመጀመሪያ ቀን
 DocType: Salary Slip,Leave Without Pay,Pay ያለ ውጣ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,የአቅም ዕቅድ ስህተት
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,መስኮች በሚፈጠሩበት ጊዜ ብቻ ይገለበጣሉ.
 DocType: Setup Progress Action,Domains,ጎራዎች
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ትክክለኛው የማስጀመሪያ ቀን&#39; &#39;ትክክለኛው መጨረሻ ቀን&#39; በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,አስተዳደር
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,አስተዳደር
 DocType: Cheque Print Template,Payer Settings,ከፋዩ ቅንብሮች
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል &quot;SM&quot; ነው; ለምሳሌ ያህል, ንጥል ኮድ &quot;ቲሸርት&quot;, &quot;ቲሸርት-SM&quot; ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
 DocType: Purchase Invoice,Is Return,መመለሻ ነው
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ጥንቃቄ
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',የመጀመሪያ ቀን በተግባር ውስጥ &#39;{0}&#39; ውስጥ ከሚኖረው የመጨረሻ ቀን የበለጠ ነው
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
 DocType: Price List Country,Price List Country,የዋጋ ዝርዝር አገር
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} ንጥል ትክክለኛ ተከታታይ ቁጥሮች {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ንጥል ኮድ መለያ ቁጥር ሊቀየር አይችልም
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,ንጥል ኮድ መለያ ቁጥር ሊቀየር አይችልም
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ልወጣ መንስኤ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ባች ቁጥር ለማግኘት ንጥል ኮድ ያስገቡ
 DocType: Stock Settings,Default Item Group,ነባሪ ንጥል ቡድን
-DocType: Employee Loan,Partially Disbursed,በከፊል በመገኘቱ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,መረጃ ስጥ.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,መረጃ ስጥ.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,አቅራቢው ጎታ.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,የማይሰረዝ የደንበኝነት ምዝገባን ዳግም ማስጀመር አይችሉም.
 DocType: Account,Balance Sheet,ወጭና ገቢ ሂሳብ መመዝገቢያ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
 DocType: Fee Validity,Valid Till,ልክ ነጠ
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,ጠቅላላ የወላጆች መምህራን ስብሰባ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,የረድፍ # {0}: ብዛት ግዢ መመለስ ውስጥ ገብቶ ሊሆን አይችልም ተቀባይነት አላገኘም
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ለተመረጠው ደንበኛ የደንበኞች ቡድን መቀየር አይፈቀድም.
 ,Purchase Order Items To Be Billed,የግዢ ትዕዛዝ ንጥሎች እንዲከፍሉ ለማድረግ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,የተገመተው የመድረሻ ጊዜዎችን በማዘመን ላይ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,የተገመተው የመድረሻ ጊዜዎችን በማዘመን ላይ.
 DocType: Program Enrollment Tool,Enrollment Details,የመመዝገቢያ ዝርዝሮች
 DocType: Purchase Invoice Item,Net Rate,የተጣራ ተመን
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,እባክዎ ደንበኛ ይምረጡ
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,የአሁኑ በጀት ዓመት
 DocType: Purchase Order,Group same items,ቡድን ተመሳሳይ ንጥሎች
 DocType: Purchase Invoice,Disable Rounded Total,የተጠጋጋ ጠቅላላ አሰናክል
-DocType: Employee Loan Application,Repayment Info,ብድር መክፈል መረጃ
+DocType: Department,Parent Department,የወላጅ መምሪያ
+DocType: Loan Application,Repayment Info,ብድር መክፈል መረጃ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;ግቤቶች&#39; ባዶ ሊሆን አይችልም
 DocType: Maintenance Team Member,Maintenance Role,የጥገና ሚና
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},ጋር የተባዛ ረድፍ {0} ተመሳሳይ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},ጋር የተባዛ ረድፍ {0} ተመሳሳይ {1}
 ,Trial Balance,በችሎት ሒሳብ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ሰራተኞች በማቀናበር ላይ
 DocType: Sales Order,SO-,ነቅሸ
 DocType: Hotel Room Reservation,Hotel Reservation User,የሆቴል መያዣ ተጠቃሚ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ምርምር
+DocType: Subscription Settings,Subscription Settings,የምዝገባ ቅንብሮች
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ምርምር
 DocType: Maintenance Visit Purpose,Work Done,ሥራ ተከናውኗል
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,በ አይነታዎች ሰንጠረዥ ውስጥ ቢያንስ አንድ መገለጫ ባህሪ ይግለጹ
 DocType: Announcement,All Students,ሁሉም ተማሪዎች
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
 DocType: Crop Cycle,Less than a year,ከአንድ ዓመት ያነሰ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ወደ ተቀረው ዓለም
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ወደ ተቀረው ዓለም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
 DocType: Crop,Yield UOM,ትርፍ UOM
 ,Budget Variance Report,በጀት ልዩነት ሪፖርት
 DocType: Salary Slip,Gross Pay,አጠቃላይ ክፍያ
 DocType: Item,Is Item from Hub,ንጥል ከዋኝ ነው
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ረድፍ {0}: የእንቅስቃሴ አይነት የግዴታ ነው.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ትርፍ የሚከፈልበት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ትርፍ የሚከፈልበት
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,አካውንቲንግ የሒሳብ መዝገብ
 DocType: Stock Reconciliation,Difference Amount,ልዩነት መጠን
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ዶክተር {0} በ ላይ ይውጡ {1}
 DocType: Purchase Invoice,Reverse Charge,የምላሹ ክፍያ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,የያዛችሁባቸው ተይዞባቸዋል ገቢዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,የያዛችሁባቸው ተይዞባቸዋል ገቢዎች
 DocType: Purchase Invoice,05-Change in POS,05-በ POS ለውጥ
 DocType: Vehicle Log,Service Detail,የአገልግሎት ዝርዝር
 DocType: BOM,Item Description,ንጥል መግለጫ
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,አጋጣሚ ንጥል
 ,Student and Guardian Contact Details,የተማሪ እና አሳዳጊ ያግኙን ዝርዝሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ረድፍ {0}: አቅራቢ ለማግኘት {0} የኢሜይል አድራሻ ኢሜይል መላክ ያስፈልጋል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ጊዜያዊ በመክፈት ላይ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,ጊዜያዊ በመክፈት ላይ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ማዕከሉን ይመልከቱ
 ,Employee Leave Balance,የሰራተኛ ፈቃድ ሒሳብ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},መለያ ቀሪ {0} ሁልጊዜ መሆን አለበት {1}
 DocType: Patient Appointment,More Info,ተጨማሪ መረጃ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},ረድፍ ውስጥ ንጥል ያስፈልጋል ከግምቱ ተመን {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},ረድፍ ውስጥ ንጥል ያስፈልጋል ከግምቱ ተመን {0}
 DocType: Supplier Scorecard,Scorecard Actions,የውጤት ካርድ ድርጊቶች
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ምሳሌ: የኮምፒውተር ሳይንስ ሊቃውንት
 DocType: Purchase Invoice,Rejected Warehouse,ውድቅ መጋዘን
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ወደ
 DocType: Supplier Quotation Item,Lead Time in days,ቀናት ውስጥ በእርሳስ ሰዓት
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,መለያዎች ተከፋይ ማጠቃለያ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},ወደ {0} ከ ደመወዝ ክፍያ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},ወደ {0} ከ ደመወዝ ክፍያ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},የታሰረው መለያ አርትዕ ለማድረግ ፈቃድ የለውም {0}
 DocType: Journal Entry,Get Outstanding Invoices,ያልተከፈሉ ደረሰኞች ያግኙ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,የሙከራ ምርመራዎች ትዕዛዝ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ትንሽ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ትንሽ
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,የደረሰኝ ቅሬታ ማቅረቢያ መሣሪያን መክፈት
 DocType: Education Settings,Employee Number,የሰራተኛ ቁጥር
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ከግድግዳ ጊዜ በኋላ የተቆረጠ ክፍያ መጠየቂያ ካርዱን ሰርዝ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},የጉዳይ አይ (ዎች) አስቀድሞ ስራ ላይ ነው. መያዣ ማንም ከ ይሞክሩ {0}
 DocType: Project,% Completed,% ተጠናቋል
 ,Invoiced Amount (Exculsive Tax),በደረሰኝ የተቀመጠው መጠን (Exculsive ታክስ)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,የላቦራቶሪ ሙከራ ጊዜ
 DocType: Email Digest,Add Quote,Quote አክል
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM ያስፈልጋል UOM coversion ምክንያት: {0} ንጥል ውስጥ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,በተዘዋዋሪ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,በተዘዋዋሪ ወጪዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ረድፍ {0}: ብዛት የግዴታ ነው
 DocType: Agriculture Analysis Criteria,Agriculture,ግብርና
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,አመሳስል መምህር ውሂብ
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,የካፒታል ዕቃዎች
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,የካፒታል ዕቃዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. &#39;"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,እባክህ መጀመሪያ የንጥል ኮድ አዘጋጅ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
+DocType: Subscription Plan,Billing Interval Count,የማስከፈያ የጊዜ ክፍተት ቆጠራ
 DocType: Sales Invoice Item,Edit Description,አርትዕ መግለጫ
 DocType: Antibiotic,Antibiotic,አንቲባዮቲክ
 ,Team Updates,ቡድን ዝማኔዎች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,አቅራቢ ለ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,አቅራቢ ለ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,የመለያ አይነት በማዘጋጀት ላይ ግብይቶችን በዚህ መለያ በመምረጥ ረገድ ይረዳል.
 DocType: Purchase Invoice,Grand Total (Company Currency),ጠቅላላ ድምር (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,አትም ቅርጸት ፍጠር
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS ንጥል ቡድን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ጥንቅር ኢሜይል:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ተለዋጭ ንጥል እንደ የንጥል ኮድ ተመሳሳይ መሆን የለበትም
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
 DocType: Sales Partner,Target Distribution,ዒላማ ስርጭት
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-ጊዜያዊ ግምገማ ማጠናቀቅ
 DocType: Salary Slip,Bank Account No.,የባንክ ሂሳብ ቁጥር
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,ከገቢር
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ትዕምርተ አቅራቢ ጥያቄ
 DocType: Healthcare Settings,Registration Message,የምዝገባ መልዕክት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ሃርድዌር
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ሃርድዌር
 DocType: Prescription Dosage,Prescription Dosage,የመድኃኒት መመዘኛ
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,ይጀምሩ እና ቀኖች የማይኖርበት
 ,Delivered Items To Be Billed,የደረሱ ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ክፍት BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,መጋዘን መለያ ቁጥር ሊቀየር አይችልም
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,መጋዘን መለያ ቁጥር ሊቀየር አይችልም
 DocType: Authorization Rule,Average Discount,አማካይ ቅናሽ
 DocType: Project Update,Great/Quickly,ታላላቅ / በፍጥነት
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,በስብስብ ንጥል ቡድኖች ይምረጡ
 DocType: Asset,Depreciation Schedules,የእርጅና መርሐግብሮች
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,መለያዎችን በመከተል በ GST ቅንብሮች ውስጥ ሊመረጡ ይችላሉ:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,የማመልከቻው ወቅት ውጪ ፈቃድ አመዳደብ ጊዜ ሊሆን አይችልም
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,መለያዎችን በመከተል በ GST ቅንብሮች ውስጥ ሊመረጡ ይችላሉ:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,የማመልከቻው ወቅት ውጪ ፈቃድ አመዳደብ ጊዜ ሊሆን አይችልም
 DocType: Activity Cost,Projects,ፕሮጀክቶች
 DocType: Payment Request,Transaction Currency,የግብይት ምንዛሬ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},ከ {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,አማካኝ ዕለታዊ የወጪ
 DocType: POS Profile,Campaign,ዘመቻ
 DocType: Supplier,Name and Type,ስም እና አይነት
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ &#39;የጸደቀ&#39; ወይም &#39;ተቀባይነት አላገኘም »መሆን አለበት
 DocType: Physician,Contacts and Address,እውቂያዎች እና አድራሻ
 DocType: Purchase Invoice,Contact Person,የሚያነጋግሩት ሰው
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;የሚጠበቀው መጀመሪያ ቀን&#39; ከዜሮ በላይ &#39;የሚጠበቀው መጨረሻ ቀን&#39; ሊሆን አይችልም
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,ብቁነት እና ዝርዝሮች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,ቋሚ ንብረት ውስጥ የተጣራ ለውጥ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ሁሉንም ስያሜዎች እየታሰቡ ከሆነ ባዶውን ይተው
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},ከፍተኛ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ከ DATETIME
 DocType: Email Digest,For Company,ኩባንያ ለ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ኮሙኒኬሽን መዝገብ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","ትዕምርተ ጥያቄ ተጨማሪ ቼክ መተላለፊያውን ቅንብሮች, ፖርታል ከ ለመድረስ ተሰናክሏል."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,የአምራች ውጤት መሥሪያ ካርታ ተለዋዋጭ ነጥብ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,የግዢ መጠን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,የግዢ መጠን
 DocType: Sales Invoice,Shipping Address Name,የሚላክበት አድራሻ ስም
 DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,የጊዜ ሰሌዳን የሚፈጥሩ ስህተቶች ነበሩ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,በዝርዝሩ ውስጥ ያለው የመጀመሪያ ወጪ ተቀባይ እንደ ነባሪው ወጪ አውጪ ይዋቀራል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,ጥቅል ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,ሞያ ተማሪ
 DocType: Purchase Invoice,Company GSTIN,የኩባንያ GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,አሉታዊ ብዛት አይፈቀድም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,አሉታዊ ብዛት አይፈቀድም
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",እንደ ሕብረቁምፊ ንጥል ከጌታው አልተሰበሰበም እና በዚህ መስክ ውስጥ የተከማቸ ግብር ዝርዝር ሰንጠረዥ. ግብር እና ክፍያዎች ጥቅም ላይ
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","መለያ የታሰሩ ከሆነ, ግቤቶች የተገደቡ ተጠቃሚዎች ይፈቀዳል."
 DocType: Email Digest,Bank Balance,ባንክ ሒሳብ
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ፈቃድ ሰጪ አመልካች ትተው ማመልከቻ ማመልከቻ
 DocType: Job Opening,"Job profile, qualifications required etc.","ኢዮብ መገለጫ, ብቃት ያስፈልጋል ወዘተ"
 DocType: Journal Entry Account,Account Balance,የመለያ ቀሪ ሂሳብ
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ግብይቶች ለ የግብር ሕግ.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ምንጭ መጋዘን ረድፍ ግዴታ ነው {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,በረድፍ {0} ላይ ያለው የክፍያ ጊዜ ምናልባት የተባዛ ሊሆን ይችላል.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),እርሻ (ቤታ)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ማሸጊያ የማያፈስ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,የቢሮ ኪራይ
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,አዋቅር ኤስ ፍኖት ቅንብሮች
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ማሸጊያ የማያፈስ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,የቢሮ ኪራይ
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,አዋቅር ኤስ ፍኖት ቅንብሮች
 DocType: Disease,Common Name,የተለመደ ስም
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ማስመጣት አልተሳካም!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ምንም አድራሻ ገና ታክሏል.
 DocType: Workstation Working Hour,Workstation Working Hour,ከገቢር የሥራ ሰዓት
 DocType: Vital Signs,Blood Pressure,የደም ግፊት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,ተንታኝ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,ተንታኝ
 DocType: Item,Inventory,ንብረት ቆጠራ
 DocType: Item,Sales Details,የሽያጭ ዝርዝሮች
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,የተማሪ ቡድን ውስጥ ተማሪዎች ለ ቡ ኮርስ Validate
 DocType: Notification Control,Expense Claim Rejected,የወጪ የይገባኛል ጥያቄ ተቀባይነት አላገኘም
 DocType: Item,Item Attribute,ንጥል መገለጫ ባህሪ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,መንግሥት
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,መንግሥት
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ወጪ የይገባኛል ጥያቄ {0} ቀደም የተሽከርካሪ ምዝግብ ማስታወሻ ለ አለ
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ተቋም ስም
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ብድር መክፈል መጠን ያስገቡ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ብድር መክፈል መጠን ያስገቡ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,ንጥል አይነቶች
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,አገልግሎቶች
 DocType: HR Settings,Email Salary Slip to Employee,የተቀጣሪ ወደ የኢሜይል የቀጣሪ
 DocType: Cost Center,Parent Cost Center,የወላጅ ወጪ ማዕከል
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ይቻላል አቅራቢ ይምረጡ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ይቻላል አቅራቢ ይምረጡ
 DocType: Sales Invoice,Source,ምንጭ
 DocType: Customer,"Select, to make the customer searchable with these fields",ደንበኞቹን በእነዚህ መስኮች እንዲፈለጉ ለማድረግ ይምረጡ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,አሳይ ተዘግቷል
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,ተሰርዟል ማሸጊያ የማያፈስ (ዎች)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ንዋይ ከ የገንዘብ ፍሰት
 DocType: Program Course,Program Course,ፕሮግራም ኮርስ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ጭነት እና ማስተላለፍ ክፍያዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ጭነት እና ማስተላለፍ ክፍያዎች
 DocType: Homepage,Company Tagline for website homepage,ድር መነሻ ገጽ ለ ኩባንያ መጻፊያ
 DocType: Item Group,Item Group Name,ንጥል የቡድን ስም
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,የተወሰደ
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,የማስታወሻ ዝርዝሮች
 DocType: Leave Block List,Block Holidays on important days.,አስፈላጊ ቀናት ላይ አግድ በዓላት.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),እባክዎን ሁሉንም አስፈላጊ የፍጆታ እሴት (ሮች) ያስገቡ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,መለያዎች የሚሰበሰብ ሂሳብ ማጠቃለያ
-DocType: Employee Loan,Monthly Repayment Amount,ወርሃዊ የሚያየን መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,መለያዎች የሚሰበሰብ ሂሳብ ማጠቃለያ
+DocType: Loan,Monthly Repayment Amount,ወርሃዊ የሚያየን መጠን
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ክፍያ መጠየቂያዎች መክፈቻ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,የተቀጣሪ ሚና ለማዘጋጀት አንድ ሰራተኛ መዝገብ ውስጥ የተጠቃሚ መታወቂያ መስኩን እባክዎ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,የተቀጣሪ ሚና ለማዘጋጀት አንድ ሰራተኛ መዝገብ ውስጥ የተጠቃሚ መታወቂያ መስኩን እባክዎ
 DocType: UOM,UOM Name,UOM ስም
 DocType: GST HSN Code,HSN Code,HSN ኮድ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,አስተዋጽዖ መጠን
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ተጠቃሚ {0} አስቀድሞም ለሐኪም ተመድቦለታል {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,ሳጥን
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,በተቻለ አቅራቢ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,በተቻለ አቅራቢ
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,ወርሃዊ ስርጭት
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ተቀባይ ዝርዝር ባዶ ነው. ተቀባይ ዝርዝር ይፍጠሩ
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),የጤና እንክብካቤ (ቤታ)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ምንም ንጥሎች ለመሸከፍ
 DocType: Shipping Rule Condition,From Value,እሴት ከ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ከማኑፋክቸሪንግ ብዛት የግዴታ ነው
-DocType: Employee Loan,Repayment Method,ብድር መክፈል ስልት
+DocType: Loan,Repayment Method,ብድር መክፈል ስልት
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ከተመረጠ, መነሻ ገጽ ድር ነባሪ ንጥል ቡድን ይሆናል"
 DocType: Quality Inspection Reading,Reading 4,4 ማንበብ
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ኩባንያ ወጪ የይገባኛል.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,የምስክር ወረቀት ያስፈልጋል
 DocType: Company,Default Holiday List,የበዓል ዝርዝር ነባሪ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ረድፍ {0}: ታይም እና ወደ ጊዜ ጀምሮ {1} ጋር ተደራቢ ነው {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,የክምችት ተጠያቂነቶች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,የክምችት ተጠያቂነቶች
 DocType: Purchase Invoice,Supplier Warehouse,አቅራቢው መጋዘን
 DocType: Opportunity,Contact Mobile No,የእውቂያ ሞባይል የለም
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,ኩባንያ ይምረጡ
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,የህትመት ክፍል
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ተጠቃሚ {0} ምንም ነባሪ POS የመገለጫ ስም የለውም. ለዚህ ተጠቃሚ ነባሪ {1} ላይ ነባሪ ይመልከቱ.
 DocType: Student Group,Set 0 for no limit,ምንም ገደብ ለ 0 አዘጋጅ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,ክፍት {idx}: {መክፈቻ} የግብዣ {invoice_type} ሒሳቦች ለመፍጠር ይጠየቃል
 DocType: Customer,Primary Address and Contact Detail,ተቀዳሚ አድራሻ እና የእውቂያ ዝርዝሮች
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,የክፍያ ኢሜይል ላክ
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,እባክህ ቢያንስ አንድ ጎራ ምረጥ.
 DocType: Dependent Task,Dependent Task,ጥገኛ ተግባር
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,አስቀድሞ X ቀኖች ለ ቀዶ ዕቅድ ይሞክሩ.
 DocType: HR Settings,Stop Birthday Reminders,አቁም የልደት ቀን አስታዋሾች
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,የፍለጋ ንጥል
 DocType: Payment Schedule,Payment Amount,የክፍያ መጠን
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,አሰጣጥ በስምምነት
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ቀድሞውኑ ተጠናቋል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,የእጅ ውስጥ የአክሲዮን
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,የእጅ ውስጥ የአክሲዮን
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,ማስመጣት ተሳክቷል!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},የክፍያ መጠየቂያ አስቀድሞ አለ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,የተሰጠው ንጥሎች መካከል ወጪ
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,ትዕምርተ ንጥል
 DocType: Customer,Customer POS Id,የደንበኛ POS መታወቂያ
 DocType: Account,Account Name,የአድራሻ ስም
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,ቀን ቀን ወደ በላይ ሊሆን አይችልም ከ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,ተከታታይ አይ {0} ብዛት {1} ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,ቀን ቀን ወደ በላይ ሊሆን አይችልም ከ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,ተከታታይ አይ {0} ብዛት {1} ክፍልፋይ ሊሆን አይችልም
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,እባክዎ የ Woocommerce አገልጋይ ዩ አር ኤል ያስገቡ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,አቅራቢው አይነት ጌታቸው.
 DocType: Purchase Order Item,Supplier Part Number,አቅራቢው ክፍል ቁጥር
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,የልወጣ ተመን 0 ወይም 1 መሆን አይችልም
 DocType: Share Balance,To No,ወደ አይደለም
-DocType: Subscription,Reference Document,የማጣቀሻ ሰነድ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ተሰርዟል ወይም አቁሟል ነው
 DocType: Accounts Settings,Credit Controller,የብድር መቆጣጠሪያ
-DocType: Grant Application,Applicant Type,የአመልካች ዓይነት
+DocType: Loan,Applicant Type,የአመልካች ዓይነት
 DocType: Purchase Invoice,03-Deficiency in services,03-በአገልግሎቶች እጥረት
 DocType: Delivery Note,Vehicle Dispatch Date,የተሽከርካሪ አስወገደ ቀን
 DocType: Healthcare Settings,Default Medical Code Standard,ነባሪ የሕክምና ኮድ መደበኛ
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% የሚከፈል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,የተጠበቁ ናቸው ብዛት
 DocType: Party Account,Party Account,የድግስ መለያ
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,የሰው ሀይል አስተዳደር
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,የሰው ሀይል አስተዳደር
 DocType: Lead,Upper Income,የላይኛው ገቢ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,አይቀበሉ
 DocType: Journal Entry Account,Debit in Company Currency,ኩባንያ የምንዛሬ ውስጥ ዴቢት
 DocType: BOM Item,BOM Item,BOM ንጥል
 DocType: Appraisal,For Employee,የሰራተኛ ለ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,የሚያጠብ የገባበት አድርግ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,የሚያጠብ የገባበት አድርግ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ረድፍ {0}: አቅራቢው ላይ በቅድሚያ ዘዴዎ መሆን አለበት
 DocType: Company,Default Values,ነባሪ ዋጋዎች
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ጠቅላላ (ያለ ግብር)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,በእርሳስ ቆጠራ
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 የበለጠ መሆን አለበት
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ክምችት ይገኛል
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,ክምችት ይገኛል
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ቀኖች) ያህል አቅም ዕቅድ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,የግዥ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ንጥሎች መካከል አንዳቸውም መጠን ወይም ዋጋ ላይ ምንም ዓይነት ለውጥ የላቸውም.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ንጥሎች መካከል አንዳቸውም መጠን ወይም ዋጋ ላይ ምንም ዓይነት ለውጥ የላቸውም.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,አስገዳጅ መስክ - ፕሮግራም
 DocType: Special Test Template,Result Component,የውጤት አካል
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,የዋስትና የይገባኛል ጥያቄ
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ቅጠሎች እንደ ቅጠል ውስጥ በዓላት አካትት
 DocType: Sales Invoice,Packed Items,የታሸጉ ንጥሎች
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,መለያ ቁጥር ላይ የዋስትና የይገባኛል ጥያቄ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ጠቅላላ&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ጠቅላላ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ወደ ግዢ ሳጥን ጨመር አንቃ
 DocType: Employee,Permanent Address,ቀዋሚ አድራሻ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,ቅንብሮች መሸጥ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,እርምጃን አረጋግጥ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,የመስመር ላይ ጨረታዎች
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ብዛት ወይም ዋጋ ትመና Rate ወይም ሁለቱንም ይግለጹ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ብዛት ወይም ዋጋ ትመና Rate ወይም ሁለቱንም ይግለጹ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,መፈጸም
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,ጨመር ውስጥ ይመልከቱ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,የገበያ ወጪ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,የገበያ ወጪ
 ,Item Shortage Report,ንጥል እጥረት ሪፖርት
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,መደበኛ መስፈርት መፍጠር አይቻልም. እባክዎ መስፈርቱን ዳግም ይሰይሙ
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,አብነት ያግኙ
 DocType: Material Request,Transferred,ተላልፈዋል
 DocType: Vehicle,Doors,በሮች
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ለታካሚ ምዝገባ የከፈሉ
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ከግብይት ግብይት በኋላ የባህርይ ለውጦችን መለወጥ አይቻልም. አዲስ ንጥል ያዘጋጁ እና ወደ አዲሱ ንጥል ዝዋይ ያስተላልፉ
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ከግብይት ግብይት በኋላ የባህርይ ለውጦችን መለወጥ አይቻልም. አዲስ ንጥል ያዘጋጁ እና ወደ አዲሱ ንጥል ዝዋይ ያስተላልፉ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,የግብር የፈጠረብኝን
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ማስታረቅ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,በጣም ብዙ አምዶች. ሪፖርቱን ለመላክ እና የተመን መተግበሪያ በመጠቀም ያትሙ.
 DocType: Purchase Invoice Item,Batch No,የጅምላ የለም
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ተቀጣሪ ሠራተኞች
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,አንድ የደንበኛ የግዢ ትዕዛዝ ላይ በርካታ የሽያጭ ትዕዛዞች ፍቀድ
 DocType: Student Group Instructor,Student Group Instructor,የተማሪ ቡድን አስተማሪ
 DocType: Grant Application,Assessment  Mark (Out of 10),የምክክር ማርክ (ከ 10 ውስጥ)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ተንቀሳቃሽ አይ
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ዋና
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ዋና
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ተለዋጭ
 DocType: Naming Series,Set prefix for numbering series on your transactions,በእርስዎ ግብይቶች ላይ ተከታታይ ቁጥር አዘጋጅ ቅድመ ቅጥያ
 DocType: Employee Attendance Tool,Employees HTML,ተቀጣሪዎች ኤችቲኤምኤል
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,መስክ ከ አጋጣሚ የግዴታ ነው
 DocType: Email Digest,Annual Expenses,ዓመታዊ ወጪዎች
 DocType: Item,Variants,ተለዋጮች
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
 DocType: SMS Center,Send To,ወደ ላክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
 DocType: Payment Reconciliation Payment,Allocated amount,በጀት መጠን
 DocType: Sales Team,Contribution to Net Total,ኔት ጠቅላላ መዋጮ
 DocType: Sales Invoice Item,Customer's Item Code,ደንበኛ ንጥል ኮድ
 DocType: Stock Reconciliation,Stock Reconciliation,የክምችት ማስታረቅ
 DocType: Territory,Territory Name,ግዛት ስም
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,የስራ-በ-እድገት መጋዘን አስገባ በፊት ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,በአንድ የደንበኝነት ምዝገባ ውስጥ አንድ አይነት የክፍያ ዑደት ብቻ ሊኖርዎት ይችላል
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ሥራ አመልካች
 DocType: Purchase Order Item,Warehouse and Reference,መጋዘን እና ማጣቀሻ
 DocType: Supplier,Statutory info and other general information about your Supplier,የእርስዎ አቅራቢው ስለ ህጋዊ መረጃ እና ሌሎች አጠቃላይ መረጃ
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ጆርናል ላይ የሚመዘገብ {0} ማንኛውም ያላገኘውን {1} ግቤት የለውም
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ማስተመኖች
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,የስልጠና ዝግጅቶች
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ተከታታይ ምንም ንጥል ገባ አባዛ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},ተከታታይ ምንም ንጥል ገባ አባዛ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,በ &quot;ምንጭ&quot; መሪዎችን ይከታተሉ.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,አንድ መላኪያ አገዛዝ አንድ ሁኔታ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ያስገቡ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ያስገቡ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,የጥገና መዝገብ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,ንጥል ወይም መጋዘን ላይ የተመሠረተ ማጣሪያ ማዘጋጀት እባክዎ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),በዚህ ጥቅል የተጣራ ክብደት. (ንጥሎች ውስጥ የተጣራ ክብደት ድምር እንደ ሰር የሚሰላው)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,አድርስ እና ቢል
 DocType: Student Group,Instructors,መምህራን
 DocType: GL Entry,Credit Amount in Account Currency,መለያ ምንዛሬ ውስጥ የብድር መጠን
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,የማጋራት አስተዳደር
 DocType: Authorization Control,Authorization Control,ፈቀዳ ቁጥጥር
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ክፍያ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ክፍያ
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","መጋዘን {0} ማንኛውም መለያ የተገናኘ አይደለም, ኩባንያ ውስጥ በመጋዘን መዝገብ ውስጥ መለያ ወይም ማዘጋጀት ነባሪ ቆጠራ መለያ መጥቀስ እባክዎ {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,የእርስዎን ትዕዛዞች ያቀናብሩ
 DocType: Work Order Operation,Actual Time and Cost,ትክክለኛው ጊዜ እና ወጪ
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,የተማሪ ፈቃድ ማመልከቻ
 DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ላይ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,በሽያጭ ጊዜ ላይ ጥቅል ንጥሎች.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,ባርኮዶች
 DocType: Hub Category,Hub Node,ማዕከል መስቀለኛ መንገድ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,አንተ የተባዙ ንጥሎች አስገብተዋል. ለማስተካከል እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,የሥራ ጓደኛ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,የሥራ ጓደኛ
 DocType: Asset Movement,Asset Movement,የንብረት ንቅናቄ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,የስራ ትዕዛዝ {0} ገቢ መሆን አለባቸው
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,አዲስ ጨመር
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,የማስከፈያ ምንዛሬ ከሁለቱም የኩባንያዎች ምንዛሬ ወይም የፓርቲው የመገበያያ ገንዘብ ጋር እኩል መሆን አለበት
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),የጥቅል ይህን የመላኪያ (ብቻ ረቂቅ) አንድ ክፍል እንደሆነ ይጠቁማል
 DocType: Soil Texture,Loam,ፈገግታ
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,ረድፍ {0}: የሚላክበት ቀኑ ከተለቀቀበት ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,ረድፍ {0}: የሚላክበት ቀኑ ከተለቀቀበት ቀን በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,የክፍያ Entry አድርግ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ንጥል ለ ብዛት {0} ያነሰ መሆን አለበት {1}
 ,Sales Invoice Trends,የሽያጭ ደረሰኝ አዝማሚያዎች
 DocType: Leave Application,Apply / Approve Leaves,ቅጠሎች አጽድቅ / ተግብር
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ያህል
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ወይም &#39;ቀዳሚ ረድፍ ጠቅላላ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; ክፍያ አይነት ከሆነ ብቻ ነው ረድፍ ሊያመለክት ይችላል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ወይም &#39;ቀዳሚ ረድፍ ጠቅላላ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; ክፍያ አይነት ከሆነ ብቻ ነው ረድፍ ሊያመለክት ይችላል
 DocType: Sales Order Item,Delivery Warehouse,የመላኪያ መጋዘን
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,የገንዘብ ወጪ ማዕከላት ዛፍ.
 DocType: Serial No,Delivery Document No,ማቅረቢያ ሰነድ የለም
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ቁሳቁሶች በፋብሪካ ማቀናበሪያዎች አልተዘጋጀም.
 DocType: Student,Student Mobile Number,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Item,Has Variants,ተለዋጮች አለው
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{0} በ {1} ከ {2} በላይ በአለው ነገር ላይ ማለፍ አይቻልም. ከመጠን በላይ-ወጪ የሚጠይቁትን, እባክዎ በማከማቻ ቅንጅቶች ውስጥ ያስቀምጡ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{0} በ {1} ከ {2} በላይ በአለው ነገር ላይ ማለፍ አይቻልም. ከመጠን በላይ-ወጪ የሚጠይቁትን, እባክዎ በማከማቻ ቅንጅቶች ውስጥ ያስቀምጡ"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ምላሽ ስጥ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
@@ -2311,6 +2318,7 @@
 DocType: Asset Maintenance Log,Planned,የታቀደ
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,በታካሚ ውስጥ ካልተቀመጠ የምክር መክፈያ ክፍያን ለመተካት ካልተወሰዱ የሚጠቀሙባቸው ነባሪ ሂሳቦች.
 DocType: Vehicle Log,Fuel Price,የነዳጅ ዋጋ
+DocType: Bank Guarantee,Margin Money,የማዳበያ ገንዘብ
 DocType: Budget,Budget,ባጀት
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ክፍት የሚሆን
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
@@ -2324,16 +2332,16 @@
 DocType: Lead,Follow Up,ክትትል
 DocType: Item,Is Sales Item,የሽያጭ ንጥል ነው
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ንጥል የቡድን ዛፍ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. ንጥል ጌታ ይመልከቱ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. ንጥል ጌታ ይመልከቱ
 DocType: Maintenance Visit,Maintenance Time,ጥገና ሰዓት
 ,Amount to Deliver,መጠን ለማዳን
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},አንድ አይነት ንጥል ብዙ ጊዜ ተጨምሯል. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጀመሪያ ቀን የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,ስህተቶች ነበሩ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,ተቀጣሪ {0} ቀድሞውኑ በ {2} እና በ {3} መካከል በ {1} አመልክቷል:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,ስህተቶች ነበሩ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,ተቀጣሪ {0} ቀድሞውኑ በ {2} እና በ {3} መካከል በ {1} አመልክቷል:
 DocType: Guardian,Guardian Interests,አሳዳጊ ፍላጎቶች
 DocType: Naming Series,Current Value,የአሁኑ ዋጋ
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
 DocType: Education Settings,Instructor Records to be created by,የአስተማሪው መዝገብ በ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ተፈጥሯል
 DocType: GST Account,GST Account,GST መለያ
@@ -2352,8 +2360,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
 DocType: Website Item Group,Website Item Group,የድር ጣቢያ ንጥል ቡድን
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,ወደ ተወዳጆች ታክሏል
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ከላይ ከተዘረዘሩት መስፈርቶች ወይም የደመወዝ ወረቀት አስቀድሞ ገቢ የተደረገበት ደመወዝ አልተገኘም
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ተግባርና ግብሮች
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ከላይ ከተዘረዘሩት መስፈርቶች ወይም የደመወዝ ወረቀት አስቀድሞ ገቢ የተደረገበት ደመወዝ አልተገኘም
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,ተግባርና ግብሮች
 DocType: Projects Settings,Projects Settings,የፕሮጀክት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,የማጣቀሻ ቀን ያስገቡ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} የክፍያ ግቤቶች ተጣርተው ሊሆን አይችልም {1}
@@ -2363,27 +2371,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ንጥል ቡድኖች መካከል ዛፍ.
 DocType: Production Plan,Total Produced Qty,ጠቅላላ የተጨመረለት ብዛት
 DocType: Payroll Entry,Get Employee Details,የሰራተኛ ዝርዝሮችን ያግኙ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ይህ የክፍያ ዓይነት የአሁኑ ረድፍ ቁጥር ይበልጣል ወይም እኩል ረድፍ ቁጥር ሊያመለክት አይችልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ይህ የክፍያ ዓይነት የአሁኑ ረድፍ ቁጥር ይበልጣል ወይም እኩል ረድፍ ቁጥር ሊያመለክት አይችልም
 DocType: Asset,Sold,የተሸጠ
 ,Item-wise Purchase History,ንጥል-ጥበብ የግዢ ታሪክ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ተከታታይ ምንም ንጥል ታክሏል ለማምጣት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ {0}
 DocType: Account,Frozen,የቀዘቀዘ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),የመሠረት መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,ጥሬ ዕቃዎች
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,ጥሬ ዕቃዎች
 DocType: Payment Reconciliation Payment,Reference Row,ማጣቀሻ ረድፍ
 DocType: Installation Note,Installation Time,መጫን ሰዓት
 DocType: Sales Invoice,Accounting Details,አካውንቲንግ ዝርዝሮች
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ይህ ኩባንያ ሁሉም ግብይቶች ሰርዝ
 DocType: Patient,O Positive,አዎንታዊ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ኢንቨስትመንት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ኢንቨስትመንት
 DocType: Issue,Resolution Details,ጥራት ዝርዝሮች
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,አመዳደብ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ቅበላ መስፈርቶች
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ከላይ በሰንጠረዡ ውስጥ ቁሳዊ ጥያቄዎች ያስገቡ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ለጆርናሉ ምዝገባ ምንም ክፍያ አይኖርም
 DocType: Item Attribute,Attribute Name,ስም ይስጡ
 DocType: BOM,Show In Website,ድር ጣቢያ ውስጥ አሳይ
 DocType: Shopping Cart Settings,Show Quantity in Website,ድረ ውስጥ ብዛት አሳይ
-DocType: Employee Loan Application,Total Payable Amount,ጠቅላላ የሚከፈል መጠን
+DocType: Loan Application,Total Payable Amount,ጠቅላላ የሚከፈል መጠን
 DocType: Task,Expected Time (in hours),(ሰዓቶች ውስጥ) የሚጠበቀው ሰዓት
 DocType: Item Reorder,Check in (group),(ቡድን) ውስጥ ይመልከቱ
 DocType: Soil Texture,Silt,ዝለል
@@ -2402,7 +2411,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ክፍያ አድርግ
 DocType: Room,Room Name,ክፍል ስም
 DocType: Prescription Duration,Prescription Duration,የትዕዛዝ መጠን
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ በፊት {0} ቀርቷል / መተግበር አይችልም ተወው {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ በፊት {0} ቀርቷል / መተግበር አይችልም ተወው {1}
 DocType: Activity Cost,Costing Rate,ዋጋና የዋጋ ተመን
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,የደንበኛ አድራሻዎች እና እውቂያዎች
 ,Campaign Efficiency,የዘመቻ ቅልጥፍና
@@ -2420,11 +2429,11 @@
 DocType: Chapter,Chapter,ምዕራፍ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,ሁለት
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ይህ ሁነታ ሲመረቅ ነባሪ መለያ በ POS ክፍያ መጠየቂያ ካርዱ ውስጥ በራስ-ሰር ይዘምናል.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
 DocType: Asset,Depreciation Schedule,የእርጅና ፕሮግራም
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,የሽያጭ አጋር አድራሻዎች እና እውቂያዎች
 DocType: Bank Reconciliation Detail,Against Account,መለያ ላይ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ግማሽ ቀን ቀን ቀን ጀምሮ እና ቀን ወደ መካከል መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ግማሽ ቀን ቀን ቀን ጀምሮ እና ቀን ወደ መካከል መሆን አለበት
 DocType: Maintenance Schedule Detail,Actual Date,ትክክለኛ ቀን
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,እባክዎ በ {0} ኩባንያ ውስጥ ያለውን ነባሪ ዋጋ ማስተካከያ ያዘጋጁ.
 DocType: Item,Has Batch No,የጅምላ አይ አለው
@@ -2442,7 +2451,6 @@
 DocType: Task,Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል)
 DocType: Soil Texture,Soil Type,የአፈር አይነት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,አዲስ መልዕክት
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
 DocType: GoCardless Mandate,GoCardless Mandate,የ GoCardless ትዕዛዝ
@@ -2462,7 +2470,7 @@
 DocType: Hub Category,Hub Category,Hub ምድብ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
-DocType: Employee Loan,Loan Amount,የብድር መጠን
+DocType: Loan,Loan Amount,የብድር መጠን
 DocType: Student Report Generation Tool,Add Letterhead,Letterhead አክል
 DocType: Program Enrollment,Self-Driving Vehicle,የራስ-መንዳት ተሽከርካሪ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,የአቅራቢ ካርድ መስጫ ቋሚ
@@ -2490,9 +2498,9 @@
 DocType: Cash Flow Mapper,Position,ቦታ
 DocType: Patient,Patient Details,የታካሚ ዝርዝሮች
 DocType: Patient,B Positive,ቢ አዎንታዊ
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
 DocType: Patient Medical Record,Patient Medical Record,ታካሚ የሕክምና መዝገብ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ያልሆኑ ቡድን ቡድን
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ስፖርት
@@ -2500,8 +2508,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ትክክለኛ ጠቅላላ
 DocType: Lab Test UOM,Test UOM,የኡሞ ሞክርን ይሞክሩ
 DocType: Student Siblings,Student Siblings,የተማሪ እህቶቼ
+DocType: Subscription Plan Detail,Subscription Plan Detail,የደንበኝነት ምዝገባ ዕቅድ ዝርዝር
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,መለኪያ
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,ኩባንያ እባክዎን ይግለጹ
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,ኩባንያ እባክዎን ይግለጹ
 ,Customer Acquisition and Loyalty,የደንበኛ ማግኛ እና ታማኝነት
 DocType: Asset Maintenance Task,Maintenance Task,የጥገና ተግባር
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,እባክዎ በ GST ቅንብሮች ውስጥ B2C ወሰን ያዘጋጁ.
@@ -2515,6 +2524,7 @@
 ,BOM Search,BOM ፍለጋ
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ጠቅላላ የዋጋ ቁሳቁስ ወጪ (በቅጥፈት መግቢያ በኩል)
 DocType: Hub Settings,Company Registered,ኩባንያ የተመዘገበ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,ቀኑን ወደ ቀን መቀነስ አይችልም
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",በዚህ መጋዘን ውስጥ ባለው ክምችት ላይ &quot;ውክልና አልደረሰም&quot; የሚለውን በ Hub ላይ ያትሙ.
 DocType: Vehicle,Fuel Type,የነዳጅ አይነት
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ኩባንያ ውስጥ ምንዛሬ ይግለጹ
@@ -2522,17 +2532,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ባች ውስጥ የአክሲዮን ቀሪ {0} ይሆናል አሉታዊ {1} መጋዘን ላይ ንጥል {2} ለ {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ቁሳዊ ጥያቄዎች የሚከተሉት ንጥል ዳግም-ትዕዛዝ ደረጃ ላይ ተመስርቶ በራስ-ሰር ከፍ ተደርጓል
 DocType: Email Digest,Pending Sales Orders,የሽያጭ ትዕዛዞች በመጠባበቅ ላይ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
 DocType: Employee,Create User Permission,የተጠቃሚ ፍቃድ ፍጠር
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
 DocType: Healthcare Settings,Remind Before,ከዚህ በፊት አስታውሳ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM የመለወጥ ምክንያት ረድፍ ውስጥ ያስፈልጋል {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
 DocType: Salary Component,Deduction,ቅናሽ
 DocType: Item,Retain Sample,ናሙና አጥሩ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
 DocType: Stock Reconciliation Item,Amount Difference,መጠን ያለው ልዩነት
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ይህ የሽያጭ ሰው የሰራተኛ መታወቂያ ያስገቡ
 DocType: Territory,Classification of Customers by region,ክልል በ ደንበኞች መካከል ምደባ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,በምርት ውስጥ
@@ -2542,8 +2553,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,የተሰላው ባንክ መግለጫ ቀሪ
 DocType: Normal Test Template,Normal Test Template,መደበኛ የሙከራ ቅንብር
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ተሰናክሏል ተጠቃሚ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ጥቅስ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,የተቀበሉት አር.ኤም.ፒ. ወደ &quot;ምንም&quot; የለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ጥቅስ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,የተቀበሉት አር.ኤም.ፒ. ወደ &quot;ምንም&quot; የለም
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ጠቅላላ ተቀናሽ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,በመለያው ምንዛሬ ለማተም አንድ መለያ ይምረጡ
@@ -2551,7 +2562,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ይህ በ E ዚህ ህመምተኛ ላይ የተደረጉ ግብይቶች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ወጪ ዘምኗል
 DocType: Patient,Date of Birth,የትውልድ ቀን
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,ንጥል {0} አስቀድሞ ተመለሱ ተደርጓል
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,ንጥል {0} አስቀድሞ ተመለሱ ተደርጓል
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** በጀት ዓመት ** አንድ የፋይናንስ ዓመት ይወክላል. ሁሉም የሂሳብ ግቤቶች እና ሌሎች ዋና ዋና ግብይቶች ** ** በጀት ዓመት ላይ ክትትል ነው.
 DocType: Opportunity,Customer / Lead Address,ደንበኛ / በእርሳስ አድራሻ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,የአቅራቢን የመሳሪያ ካርድ ማዋቀር
@@ -2562,14 +2573,15 @@
 DocType: Work Order Operation,Actual Operation Time,ትክክለኛው ኦፕሬሽን ሰዓት
 DocType: Authorization Rule,Applicable To (User),የሚመለከታቸው ለማድረግ (ተጠቃሚ)
 DocType: Purchase Taxes and Charges,Deduct,ቀነሰ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,የሥራው ዝርዝር
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,የሥራው ዝርዝር
 DocType: Student Applicant,Applied,የተተገበረ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,ዳግም-ክፈት
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,ዳግም-ክፈት
 DocType: Sales Invoice Item,Qty as per Stock UOM,ብዛት የአክሲዮን UOM መሰረት
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ስም
 DocType: Purchase Invoice,02-Post Sale Discount,02-የልኡክ ጽሁፍ ሽያጭ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","በስተቀር ልዩ ቁምፊዎች &quot;-&quot; &quot;.&quot;, &quot;#&quot; እና &quot;/&quot; ተከታታይ እየሰየሙ ውስጥ አይፈቀድም"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","የሽያጭ ዘመቻዎች ይከታተሉ. እርሳሶች, ጥቅሶች ተከታተል, የሽያጭ ትዕዛዝ ወዘተ ዘመቻዎች ከ ኢንቨስትመንት ላይ ተመለስ ለመለካት."
+DocType: Department Approver,Approver,አጽዳቂ
 ,SO Qty,ምት ብዛት
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ወደ አጋርነት ያለው መስክ ባዶ ሊሆን አይችልም
 DocType: Guardian,Work Address,የስራ አድራሻ
@@ -2583,21 +2595,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ጠቅላላ የተመደበ መጠን (የኩባንያ የምንዛሬ)
 DocType: Purchase Order Item,To be delivered to customer,የደንበኛ እስኪደርስ ድረስ
 DocType: BOM,Scrap Material Cost,ቁራጭ ቁሳዊ ወጪ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,ተከታታይ አይ {0} ማንኛውም መጋዘን ይኸው የእርሱ ወገን አይደለም
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,ተከታታይ አይ {0} ማንኛውም መጋዘን ይኸው የእርሱ ወገን አይደለም
 DocType: Grant Application,Email Notification Sent,የኢሜይል ማሳወቂያ ተልኳል
 DocType: Purchase Invoice,In Words (Company Currency),ቃላት ውስጥ (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","የእቃ ቁጥር, መጋዘን, ብዛት በረድፍ ላይ ያስፈልጋል"
-DocType: Pricing Rule,Supplier,አቅራቢ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","የእቃ ቁጥር, መጋዘን, ብዛት በረድፍ ላይ ያስፈልጋል"
+DocType: Bank Guarantee,Supplier,አቅራቢ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,የክፍያ ዝርዝሮችን አሳይ
 DocType: Consultation,Consultation Time,የማማከር ጊዜ
 DocType: C-Form,Quarter,ሩብ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ልዩ ልዩ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ልዩ ልዩ ወጪዎች
 DocType: Global Defaults,Default Company,ነባሪ ኩባንያ
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ወይም ወጪ ያለው ልዩነት መለያ ንጥል {0} እንደ ተፅዕኖዎች በአጠቃላይ የአክሲዮን ዋጋ ግዴታ ነው
 DocType: Payment Request,PR,የህዝብ ግንኙነት
 DocType: Cheque Print Template,Bank Name,የባንክ ስም
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,የሰራተኛ የብድር መለያ
 DocType: Leave Application,Total Leave Days,ጠቅላላ ፈቃድ ቀናት
 DocType: Email Digest,Note: Email will not be sent to disabled users,ማስታወሻ: የኢሜይል ተሰናክሏል ተጠቃሚዎች አይላክም
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ምንጭጌ ብዛት
@@ -2612,7 +2623,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ክብደት (በኪልግራም)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",ምዕራፎች / ምዕራፍ_ስም ምዕራፍን ካስቀመጡ በኋላ ባዶ ቦታ ይዘጋሉ.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,እባክዎ በ GST ቅንብሮች ውስጥ GST መለያዎችን ያዘጋጁ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,እባክዎ በ GST ቅንብሮች ውስጥ GST መለያዎችን ያዘጋጁ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,የንግድ ዓይነት
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ቢያንስ አንድ ረድፍ ውስጥ የተመደበ መጠን, የደረሰኝ አይነት እና የደረሰኝ ቁጥር እባክዎ ይምረጡ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,አዲስ ግዢ ወጪ
@@ -2621,12 +2632,13 @@
 DocType: Grant Application,Grant Description,መግለጫ መስጠት
 DocType: Purchase Invoice Item,Rate (Company Currency),መጠን (የኩባንያ የምንዛሬ)
 DocType: Student Guardian,Others,ሌሎች
+DocType: Subscription,Discounts,ቅናሾች
 DocType: Payment Entry,Unallocated Amount,unallocated መጠን
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,አንድ ተዛማጅ ንጥል ማግኘት አልተቻለም. ለ {0} ሌላ ዋጋ ይምረጡ.
 DocType: POS Profile,Taxes and Charges,ግብሮች እና ክፍያዎች
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",አንድ ምርት ወይም ገዙ ይሸጣሉ ወይም በስቶክ ውስጥ የተቀመጠ ነው አንድ አገልግሎት.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,ምንም ተጨማሪ ዝማኔዎች
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,የመጀመሪያውን ረድፍ ለ &#39;ቀዳሚ ረድፍ ጠቅላላ ላይ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; እንደ ክፍያ አይነት መምረጥ ወይም አይቻልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,የመጀመሪያውን ረድፍ ለ &#39;ቀዳሚ ረድፍ ጠቅላላ ላይ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; እንደ ክፍያ አይነት መምረጥ ወይም አይቻልም
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ይሄ በዚህ ቅንብር ላይ የተሳሰሩ ሁሉንም የውጤቶች ካርዶች ይሸፍናል
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,የልጅ ንጥል አንድ ምርት ጥቅል መሆን የለበትም. ንጥል ለማስወገድ `{0}` እና ያስቀምጡ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ባንኪንግ
@@ -2634,45 +2646,48 @@
 DocType: Vehicle Service,Service Item,የአገልግሎት ንጥል
 DocType: Bank Guarantee,Bank Guarantee,ባንክ ዋስትና
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ፕሮግራም ለማግኘት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
 DocType: Bin,Ordered Quantity,የዕቃው መረጃ ብዛት
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ለምሳሌ &quot;ግንበኞች ለ መሣሪያዎች ገንባ&quot;
 DocType: Grading Scale,Grading Scale Intervals,አሰጣጥ በስምምነት ጣልቃ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,የዓመቱ ትርፍ
+DocType: Bank Guarantee,Name of Bank,የባንክ ስም
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {3}
 DocType: Fee Schedule,In Process,በሂደት ላይ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ቅናሽ
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,የገንዘብ መለያዎች ዛፍ.
+DocType: Bank Guarantee,Reference Document Type,የማጣቀሻ ሰነድ ዓይነት
 DocType: Cash Flow Mapping,Cash Flow Mapping,የገንዘብ ፍሰት ማካተት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} የሽያጭ ትዕዛዝ ላይ {1}
 DocType: Account,Fixed Asset,የተወሰነ ንብረት
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized ቆጠራ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ኢሜይል በነባሪ እውቂያ አልተገኘም
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ሚስጥራዊ አፍልቅ
-DocType: Employee Loan,Account Info,የመለያ መረጃ
+DocType: Loan,Account Info,የመለያ መረጃ
 DocType: Activity Type,Default Billing Rate,ነባሪ አከፋፈል ተመን
 DocType: Fees,Include Payment,ክፍያ አካት
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} የተማሪ ቡድኖች ተፈጥሯል.
 DocType: Sales Invoice,Total Billing Amount,ጠቅላላ የሂሳብ አከፋፈል መጠን
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,በ &quot;Fee Structure&quot; እና &quot;Student Group&quot; {0} ውስጥ ያለው ፕሮግራም የተለያዩ ናቸው.
 DocType: Fee Schedule,Receivable Account,የሚሰበሰብ መለያ
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
 DocType: Quotation Item,Stock Balance,የአክሲዮን ቀሪ
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ክፍያ የሽያጭ ትዕዛዝ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,ዋና ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,ዋና ሥራ አስኪያጅ
 DocType: Purchase Invoice,With Payment of Tax,በግብር ክፍያ
 DocType: Expense Claim Detail,Expense Claim Detail,የወጪ የይገባኛል ጥያቄ ዝርዝር
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,አቅራቢ ለማግኘት TRIPLICATE
 DocType: Land Unit,Is Container,መያዣ ነው
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ይህ የሰብል ኡደት 1 ቀን ይሆናል
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,ትክክለኛውን መለያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,ትክክለኛውን መለያ ይምረጡ
 DocType: Purchase Invoice Item,Weight UOM,የክብደት UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ሊገኙ የሚችሉ አክሲዮኖችን ዝርዝር በ folio ቁጥሮች
 DocType: Salary Structure Employee,Salary Structure Employee,ደመወዝ መዋቅር ሰራተኛ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,ተለዋዋጭ ባህርያት አሳይ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,ተለዋዋጭ ባህርያት አሳይ
 DocType: Student,Blood Group,የደም ቡድን
 DocType: Course,Course Name,የኮርሱ ስም
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,በአንድ የተወሰነ ሠራተኛ ፈቃድ መተግበሪያዎች ማጽደቅ የሚችሉ ተጠቃሚዎች
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ቢሮ ዕቃዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ቢሮ ዕቃዎች
 DocType: Purchase Invoice Item,Qty,ብዛት
 DocType: Fiscal Year,Companies,ኩባንያዎች
 DocType: Supplier Scorecard,Scoring Setup,የውጤት አሰጣጥ ቅንብር
@@ -2691,7 +2706,7 @@
 DocType: Stock Entry,Total Incoming Value,ጠቅላላ ገቢ ዋጋ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ዴት ወደ ያስፈልጋል
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,የግዢ ዋጋ ዝርዝር
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,የግዢ ዋጋ ዝርዝር
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,የአቅራቢዎች የውጤት መለኪያዎች አብነቶች.
 DocType: Job Offer Term,Offer Term,ቅናሽ የሚቆይበት ጊዜ
 DocType: Asset,Quality Manager,የጥራት ሥራ አስኪያጅ
@@ -2703,13 +2718,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},ጠቅላላ የማይከፈላቸው: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ድር ጣቢያ ኦፕሬሽን
 DocType: Supplier Scorecard,Supplier Score,የአቅራቢ ነጥብ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,ጠቅላላ የተጠየቀበት Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,ጠቅላላ የተጠየቀበት Amt
 DocType: Supplier,Warn RFQs,RFQs ያስጠንቅቁ
 DocType: BOM,Conversion Rate,የልወጣ ተመን
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,የምርት ፍለጋ
 DocType: Assessment Plan,To Time,ጊዜ ወደ
 DocType: Authorization Rule,Approving Role (above authorized value),(ፍቃድ ዋጋ በላይ) ሚና ማጽደቅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,መለያ ወደ ብድር የሚከፈል መለያ መሆን አለበት
+DocType: Loan,Total Amount Paid,ጠቅላላ መጠን የተከፈለ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ለክፍያ ለተማሪው የሚያስፈልገውን የተማሪ ቅበላ የሚለውን እባክዎ ይምረጡ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} መካከል ወላጅ ወይም ልጅ ሊሆን አይችልም {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,እባክዎን የዋጋ ዝርዝር ለማተም ዋጋ ዝርዝርን ይምረጡ
@@ -2719,18 +2735,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,የዋጋ ዝርዝር {0} ተሰናክሏል
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ረድፍ {0}: ተጠናቋል ብዛት በላይ ሊሆን አይችልም {1} ክወና {2}
 DocType: Manufacturing Settings,Allow Overtime,የትርፍ ሰዓት ፍቀድ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized ንጥል {0} መጠቀም እባክዎ የአክሲዮን የገባበት የአክሲዮን ማስታረቅ በመጠቀም መዘመን አይችልም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized ንጥል {0} መጠቀም እባክዎ የአክሲዮን የገባበት የአክሲዮን ማስታረቅ በመጠቀም መዘመን አይችልም
 DocType: Training Event Employee,Training Event Employee,ስልጠና ክስተት ሰራተኛ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ከፍተኛ ቁጥር ያላቸው - {0} ለቡድን {1} እና ንጥል {2} ሊቀመጡ ይችላሉ.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,የሰዓት ማሸጊያዎችን ያክሉ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ንጥል ያስፈልጋል መለያ ቁጥር {1}. ያቀረቡት {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ንጥል ያስፈልጋል መለያ ቁጥር {1}. ያቀረቡት {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,የአሁኑ ግምቱ ተመን
 DocType: Training Event,Advance,ቅድሚያ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,የ GoCardless የክፍያ አፈፃፀም ቅንብሮች
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,የ Exchange ቅሰም / ማጣት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,የ Exchange ቅሰም / ማጣት
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},ረድፍ # {0}: መለያ {1} የኩባንያውን አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},ረድፍ # {0}: መለያ {1} የኩባንያውን አይደለም {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ማግኘት አልተቻለም.
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,አዲስ አድራሻ
 DocType: Quality Inspection,Sample Size,የናሙና መጠን
@@ -2749,7 +2764,6 @@
 DocType: Bin,Actual Quantity,ትክክለኛ ብዛት
 DocType: Shipping Rule,example: Next Day Shipping,ለምሳሌ: ቀጣይ ቀን መላኪያ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,አልተገኘም ተከታታይ ምንም {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},ምዝገባው {0}
 DocType: Fee Schedule Program,Fee Schedule Program,የክፍያ መርሐግብር ፕሮግራም
 DocType: Fee Schedule Program,Student Batch,የተማሪ ባች
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,የተማሪ አድርግ
@@ -2764,14 +2778,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ኢ-commerce GSTIN
 DocType: Sales Order,Not Delivered,ደርሷል አይደለም
 ,Bank Clearance Summary,የባንክ መልቀቂያ ማጠቃለያ
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ይፍጠሩ እና, ዕለታዊ ሳምንታዊ እና ወርሃዊ የኢሜይል ዜናዎች ያስተዳድሩ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","ይፍጠሩ እና, ዕለታዊ ሳምንታዊ እና ወርሃዊ የኢሜይል ዜናዎች ያስተዳድሩ."
 DocType: Appraisal Goal,Appraisal Goal,ግምገማ ግብ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,ምድብ ጥቆማ ነው?
 DocType: Stock Reconciliation Item,Current Amount,የአሁኑ መጠን
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ሕንፃዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ሕንፃዎች
 DocType: Fee Schedule,Fee Structure,ክፍያ መዋቅር
 DocType: Timesheet Detail,Costing Amount,ዋጋና የዋጋ መጠን
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
 DocType: Student Admission Program,Application Fee,የመተግበሪያ ክፍያ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,የቀጣሪ አስገባ
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ንጥል {0} ነው {1}% ለ Maxiumm ቅናሽ
@@ -2779,12 +2792,13 @@
 DocType: Sales Partner,Address & Contacts,አድራሻ እና እውቂያዎች
 DocType: SMS Log,Sender Name,የላኪ ስም
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,የግብርና ትንተና መስፈርት
+DocType: HR Settings,Leave Approval Notification Template,የአፈፃፀም ማሳወቂያ ቅጽ አብነት
 DocType: POS Profile,[Select],[ምረጥ]
 DocType: Vital Signs,Blood Pressure (diastolic),የደም ግፊት (ዳቲኮል)
 DocType: SMS Log,Sent To,ወደ ተልኳል
 DocType: Agriculture Task,Holiday Management,የበዓል አያያዝ
 DocType: Payment Request,Make Sales Invoice,የሽያጭ ደረሰኝ አድርግ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,ሶፍትዌሮችን
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,ሶፍትዌሮችን
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
 DocType: Company,For Reference Only.,ማጣቀሻ ያህል ብቻ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},ሀኪም {0} በ {1} ላይ አይገኝም
@@ -2802,7 +2816,7 @@
 DocType: Employee,New Workplace,አዲስ በሥራ ቦታ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,የቁሳቁሶች አጠቃቀም
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ተዘግቷል እንደ አዘጋጅ
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},ባር ኮድ ጋር ምንም ንጥል {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},ባር ኮድ ጋር ምንም ንጥል {0}
 DocType: Normal Test Items,Require Result Value,የ ውጤት ውጤት እሴት
 DocType: Item,Show a slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ አንድ ስላይድ ትዕይንት አሳይ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2817,19 +2831,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
 DocType: Leave Block List,Allow Users,ተጠቃሚዎች ፍቀድ
 DocType: Purchase Order,Customer Mobile No,የደንበኛ ተንቀሳቃሽ ምንም
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ተደጋጋሚ
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,የገንዘብ ፍሰት ማካካሻ አብነት ዝርዝሮች
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,የብድር አስተዳደር
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,የተለየ ገቢ ይከታተሉ እና ምርት ከላይ ወደታች የወረዱ ወይም መከፋፈል ለ የወጪ.
 DocType: Rename Tool,Rename Tool,መሣሪያ ዳግም ሰይም
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,አዘምን ወጪ
 DocType: Item Reorder,Item Reorder,ንጥል አስይዝ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,አሳይ የቀጣሪ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,አስተላልፍ ሐሳብ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,አሳይ የቀጣሪ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,አስተላልፍ ሐሳብ
 DocType: Fees,Send Payment Request,የክፍያ ጥያቄን ላክ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","የ ክወናዎች, የክወና ወጪ ይጥቀሱ እና ቀዶ ሕክምና ምንም ልዩ ክወና መስጠት."
 DocType: Water Analysis,Origin,መነሻ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
@@ -2844,14 +2858,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,የገቢ ታክስ ተጠያቂነት ነው
 DocType: Grading Scale Interval,Grade Description,ኛ መግለጫ
 DocType: Stock Entry,Purchase Receipt No,የግዢ ደረሰኝ የለም
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ልባዊ ገንዘብ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ልባዊ ገንዘብ
 DocType: Sales Invoice, Shipping Bill Number,የማጓጓዣ ሂሳብ ቁጥር
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 DocType: Asset Maintenance Log,Actions performed,ድርጊቶች አከናውነዋል
 DocType: Cash Flow Mapper,Section Leader,ክፍል መሪ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),የገንዘብ ምንጭ (ተጠያቂነቶች)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),የገንዘብ ምንጭ (ተጠያቂነቶች)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ረድፍ ውስጥ ብዛት {0} ({1}) የሚመረተው ብዛት እንደ አንድ አይነት መሆን አለበት {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ተቀጣሪ
+DocType: Bank Guarantee,Fixed Deposit Number,የተወሰነ የንብረት ቆጠራ ቁጥር
 DocType: Asset Repair,Failure Date,የመሳሪያ ቀን
 DocType: Sample Collection,Collected Time,የተሰበሰበበት ጊዜ
 DocType: Company,Sales Monthly History,ሽያጭ ወርሃዊ ታሪክ
@@ -2868,10 +2883,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,እርግጠኛ ነዎት ይህንን ቀጠሮ መሰረዝ ይፈልጋሉ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,የሆቴል ክፍት የዋጋ ማቅረቢያ ጥቅል
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,የሽያጭ Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ያስፈልጋል ላይ
 DocType: Rename Tool,File to Rename,ዳግም ሰይም ፋይል
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,የደንበኝነት ምዝገባ ዝመናዎችን በማምጣት ላይ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},መለያ {0} {1} መለያ ሁነታ ውስጥ ኩባንያ ጋር አይዛመድም: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},ንጥል ለማግኘት የለም የተጠቀሰዉ BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,ኮርስ:
@@ -2881,7 +2897,7 @@
 DocType: Notification Control,Expense Claim Approved,የወጪ የይገባኛል ጥያቄ ተፈቅዷል
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,ምንም የሥራ ስራዎች አልተፈጠሩም
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ሠራተኛ የቀጣሪ {0} አስቀድሞ በዚህ ጊዜ የተፈጠሩ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,የህክምና
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,የህክምና
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,የተገዙ ንጥሎች መካከል ወጪ
 DocType: Selling Settings,Sales Order Required,የሽያጭ ትዕዛዝ ያስፈልጋል
 DocType: Purchase Invoice,Credit To,ወደ ክሬዲት
@@ -2899,7 +2915,7 @@
 DocType: Request for Quotation Supplier,No Quote,ምንም መግለጫ የለም
 DocType: Warranty Claim,Raised By,በ አስነስቷል
 DocType: Payment Gateway Account,Payment Account,የክፍያ መለያ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,መለያዎች የሚሰበሰብ ሂሳብ ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,የማካካሻ አጥፋ
 DocType: Job Offer,Accepted,ተቀባይነት አግኝቷል
@@ -2911,7 +2927,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,የፍለጋ ውጤቶች
 DocType: Room,Room Number,የክፍል ቁጥር
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},ልክ ያልሆነ ማጣቀሻ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},ልክ ያልሆነ ማጣቀሻ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,መላኪያ ደንብ መሰየሚያ
 DocType: Journal Entry Account,Payroll Entry,የክፍያ ገቢዎች
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ክፍያዎች መዛግብትን ይመልከቱ
@@ -2921,7 +2937,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
 DocType: Lab Test Sample,Lab Test Sample,የቤተ ሙከራ የሙከራ ናሙና
 DocType: Item Variant Settings,Allow Rename Attribute Value,የባህሪ እሴት ዳግም ሰይም ፍቀድ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
 DocType: Restaurant,Invoice Series Prefix,ደረሰኝ የተከታታይ ቅደም ተከተል
 DocType: Employee,Previous Work Experience,ቀዳሚ የሥራ ልምድ
@@ -2929,8 +2945,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ረድፍ ላይ ንጥል {0} ለማግኘት የታቀደ ብዛት ያስገቡ {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,የ Google ካርታዎች ማዋሃድ አልነቃም
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ማቅረብ አይደለም
+DocType: Subscription,Trialling,ፈዛዛ
 DocType: Member,Membership Expiry Date,የአባልነት ጊዜ ማብቂያ ቀን
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} መመለሻ ሰነድ ላይ አሉታዊ መሆን አለበት
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} መመለሻ ሰነድ ላይ አሉታዊ መሆን አለበት
 ,Minutes to First Response for Issues,ጉዳዮች የመጀመርያ ምላሽ ደቂቃ
 DocType: Purchase Invoice,Terms and Conditions1,ውል እና Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
@@ -2949,7 +2966,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,የመለኪያ አሃድ
 DocType: Fiscal Year,Year End Date,ዓመት መጨረሻ ቀን
 DocType: Task Depends On,Task Depends On,ተግባር ላይ ይመረኮዛል
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,ዕድል
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,ዕድል
 DocType: Operation,Default Workstation,ነባሪ ከገቢር
 DocType: Notification Control,Expense Claim Approved Message,ወጪ የይገባኛል ጥያቄ ፀድቋል መልዕክት
 DocType: Payment Entry,Deductions or Loss,ቅናሽ ወይም ማጣት
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ተቀባይነት ፈቃድ ማመልከቻ መዛግብት ጋር አይዛመድም Pay ያለ ይነሱ
 DocType: Campaign,Campaign-.####,የዘመቻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ቀጣይ እርምጃዎች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
 DocType: Membership,USD,ዩኤስዶላር
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,የገንዘብ መጠየቂያ ደረሰኝ አድርግ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ቀሪ ቆንጆ
@@ -2996,7 +3013,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,ባር ኮድ {0} ትክክለኛ {1} ኮድ አይደለም
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,የመጨረሻ ዓመት
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / በእርሳስ%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
 DocType: Driver,Driver,ነጂ
 DocType: Vital Signs,Nutrition Values,የተመጣጠነ ምግብ እሴት
 DocType: Lab Test Template,Is billable,ሂሳብ የሚጠይቅ ነው
@@ -3007,7 +3024,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),ትክክለኛው የማስጀመሪያ ቀን (ሰዓት ሉህ በኩል)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ይህ አንድ ምሳሌ ድር ጣቢያ ERPNext ከ በራስ-የመነጨ ነው
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,ጥበቃና ክልል 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,የጠቅላላ የቅድመ ክፍያ መጠን ከተጠየቀው ጠቅላላ መጠን በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,የጠቅላላ የቅድመ ክፍያ መጠን ከተጠየቀው ጠቅላላ መጠን በላይ ሊሆን አይችልም
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3042,7 +3059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,የባህርይ እሴቶች ይምረጡ
 DocType: Purchase Invoice,Reason For Issuing document,ለሰነድ የማስወጫ ምክንያት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
 DocType: Payment Reconciliation,Bank / Cash Account,ባንክ / በጥሬ ገንዘብ መለያ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,ቀጣይ የእውቂያ በ ቀዳሚ የኢሜይል አድራሻ ጋር ተመሳሳይ ሊሆን አይችልም
 DocType: Tax Rule,Billing City,አከፋፈል ከተማ
@@ -3059,7 +3076,8 @@
 DocType: Warranty Claim,Service Address,የአገልግሎት አድራሻ
 DocType: Asset Maintenance Task,Calibration,መለካት
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} የአንድ ድርጅት ቀን ነው
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures እና አለማድረስ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,የአቋም መግለጫ ይተው
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures እና አለማድረስ
 DocType: Item,Manufacture,ማምረት
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,የቤተ ሙከራ ሙከራ ሪፖርት
@@ -3075,7 +3093,6 @@
 DocType: Crop,Planting Area,መትከል አካባቢ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ጠቅላላ (ብዛት)
 DocType: Installation Note Item,Installed Qty,ተጭኗል ብዛት
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ይሄ በ ውስጥ ባሉ አንዳንድ ልክ ያልሆኑ የኢሜል አድራሻዎች ምክንያት ሊሆን ይችላል
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,አልፈዋል
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ስልጠና ውጤት
@@ -3085,16 +3102,17 @@
 DocType: Products Settings,Products per Page,ምርቶች በአንድ ገጽ
 DocType: Stock Ledger Entry,Outgoing Rate,የወጪ ተመን
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ወይም
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ወይም
 DocType: Sales Order,Billing Status,አከፋፈል ሁኔታ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ችግር ሪፖርት ያድርጉ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,መገልገያ ወጪ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,መገልገያ ወጪ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-በላይ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,የረድፍ # {0}: ጆርናል የሚመዘገብ {1} መለያ የለውም {2} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
 DocType: Supplier Scorecard Criteria,Criteria Weight,መስፈርት ክብደት
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,የአፈጻጸም ማሳወቂያ ይተው
 DocType: Buying Settings,Default Buying Price List,ነባሪ መግዛትና ዋጋ ዝርዝር
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet ላይ የተመሠረተ የቀጣሪ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,የግዢ ዋጋ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,የግዢ ዋጋ
 DocType: Notification Control,Sales Order Message,የሽያጭ ትዕዛዝ መልዕክት
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ወዘተ ኩባንያ, የምንዛሬ, የአሁኑ የበጀት ዓመት, እንደ አዘጋጅ ነባሪ እሴቶች"
 DocType: Payment Entry,Payment Type,የክፍያ አይነት
@@ -3116,6 +3134,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ወደ ግዢ ሳጥን ጨመር ቅንብሮች
 DocType: Journal Entry,Accounting Entries,አካውንቲንግ ግቤቶችን
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","የተመረጠ ዋጋ አሰጣጥ ለ &lt;ደረጃ&gt; እንዲሆን ከተደረገ, የዋጋ ዝርዝርን ይደመስሰዋል. የዋጋ አሰጣጥ ደንብ የመጨረሻ ደረጃ ነው, ስለዚህ ምንም ተጨማሪ ቅናሽ አይተገበርም. ስለዚህ እንደ የሽያጭ ትዕዛዝ, የግዢ ትዕዛዝ ወዘተ በሚደረጉባቸው ግብሮች ውስጥ, &#39;የዝርዝር ውድድር&#39; መስክ ከማስተመን ይልቅ በ &lt;ደረጃ&gt; አጻጻፍ ውስጥ ይካተታል."
+DocType: Journal Entry,Paid Loan,የሚከፈል ብድር
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entry አባዛ. ያረጋግጡ ማረጋገጫ አገዛዝ {0}
 DocType: Journal Entry Account,Reference Due Date,ማጣቀሻ ቀነ ገደብ
 DocType: Purchase Order,Ref SQ,ማጣቀሻ ካሬ
@@ -3132,7 +3151,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
 ,To Produce,ለማምረት
 apps/erpnext/erpnext/config/hr.py +93,Payroll,የመክፈል ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ረድፍ {0} ውስጥ {1}. ንጥል መጠን ውስጥ ከ {2} ማካተት, ረድፎች {3} ደግሞ መካተት አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ረድፍ {0} ውስጥ {1}. ንጥል መጠን ውስጥ ከ {2} ማካተት, ረድፎች {3} ደግሞ መካተት አለበት"
 DocType: Patient Service Unit,Parent Service Unit,የወላጅ አገልግሎት ክፍል
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ተጠቃሚ አድርግ
 DocType: Packing Slip,Identification of the package for the delivery (for print),የማቅረብ ያለውን ጥቅል መታወቂያ (የህትመት ለ)
@@ -3150,7 +3169,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,የገቢ መለያ
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ርክክብ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ርክክብ
 DocType: Volunteer,Weekdays,የሳምንቱ ቀናት
 DocType: Stock Reconciliation Item,Current Qty,የአሁኑ ብዛት
 DocType: Restaurant Menu,Restaurant Menu,የምግብ ቤት ምናሌ
@@ -3158,7 +3177,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ዘላቂ በመጋዘኑ አዘጋጅ ነባሪ ቆጠራ መለያ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ዘላቂ በመጋዘኑ አዘጋጅ ነባሪ ቆጠራ መለያ
 DocType: Item Reorder,Material Request Type,ቁሳዊ ጥያቄ አይነት
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,የእርዳታ ግምገማን ኢሜይል ላክ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage ሙሉ ነው, ሊያድን አይችልም ነበር"
@@ -3166,10 +3185,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,የቦታ መጠን
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},ለንጥል {0} ቀድሞውኑ መዝገብ አለ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,ማጣቀሻ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,ከዚህ ቀደም የተደረጉ የፋይናንስ ደረሰኞች መዝገቦችን ያጣሉ. እርግጠኛ ነዎት ይህንን ምዝገባ እንደገና መጀመር ይፈልጋሉ?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,የምዝገባ ክፍያ
 DocType: Budget,Cost Center,የወጭ ማዕከል
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,የቫውቸር #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,የቫውቸር #
 DocType: Notification Control,Purchase Order Message,ትዕዛዝ መልዕክት ግዢ
 DocType: Tax Rule,Shipping Country,የሚላክበት አገር
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,የሽያጭ ግብይቶች ከ የደንበኛ የግብር መታወቂያ ደብቅ
@@ -3178,20 +3198,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","የዋጋ ደ በአንዳንድ መስፈርቶች ላይ የተመሠረቱ, / ዋጋ ዝርዝር እንዲተኩ ቅናሽ መቶኛ ለመግለጽ ነው."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,መጋዘን ብቻ የክምችት Entry በኩል ሊቀየር ይችላል / የመላኪያ ማስታወሻ / የግዢ ደረሰኝ
 DocType: Employee Education,Class / Percentage,ክፍል / መቶኛ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ማርኬቲንግ እና ሽያጭ ክፍል ኃላፊ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ማርኬቲንግ እና ሽያጭ ክፍል ኃላፊ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,የገቢ ግብር
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ወደ ፊደል ወረቀቶች ሂድ
+DocType: Subscription,Cancel At End Of Period,በማለቂያ ጊዜ ሰርዝ
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ለመተላለፍ ምንም የተመረጡ ንጥሎች የሉም
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ለመተላለፍ ምንም የተመረጡ ንጥሎች የሉም
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ሁሉም አድራሻዎች.
 DocType: Company,Stock Settings,የክምችት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","የሚከተሉትን ባሕሪያት በሁለቱም መዝገቦች ላይ ተመሳሳይ ከሆነ ሕዋሶችን ብቻ ነው. ቡድን, ሥር ዓይነት, ኩባንያ ነው?"
 DocType: Vehicle,Electric,የኤሌክትሪክ
 DocType: Task,% Progress,% ሂደት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,የንብረት ማስወገድ ላይ ረብ / ማጣት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,የንብረት ማስወገድ ላይ ረብ / ማጣት
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",&quot;የተረጋገጠ&quot; / የተረጋገጠ / የተማሪው አመልካች አመልካች ብቻ ከዚህ በታች ባለው ሠንጠረዥ ይመደባል.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,ለመለያ {0} የሂሳብ ቁጥር አይገኝም. <br> እባክዎ የመለያዎችዎን ሰንጠረዥ በትክክል ያዋቅሩ.
 DocType: Task,Depends on Tasks,ተግባራት ላይ ይመረኮዛል
@@ -3206,6 +3227,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,አይደለም የክምችት ውስጥ
 DocType: Volunteer,Volunteer Skills,የፈቃደኝነት ክህሎቶች
 DocType: Appraisal,HR User,የሰው ሀይል ተጠቃሚ
+DocType: Bank Guarantee,Reference Document Name,የማጣቀሻ ሰነድ ስም
 DocType: Purchase Invoice,Taxes and Charges Deducted,ግብሮች እና ክፍያዎች ይቀነሳል
 apps/erpnext/erpnext/hooks.py +142,Issues,ችግሮች
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ሁኔታ ውስጥ አንዱ መሆን አለበት {0}
@@ -3219,7 +3241,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ተሰናክሏል
 DocType: Supplier,Billing Currency,አከፋፈል ምንዛሬ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,በጣም ትልቅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,በጣም ትልቅ
+DocType: Loan,Loan Application,የብድር ማመልከቻ
 DocType: Crop,Scientific Name,ሳይንሳዊ ስም
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ጠቅላላ ቅጠሎች
 DocType: Customer,"Reselect, if the chosen contact is edited after save","የተመረጠውን ይምረጡ, የተመረጠው እውቂያ ከተቀመጡ በኋላ አርትዕ ከተደረገ"
@@ -3228,13 +3251,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ቼክ ቁጥር
 ,Sales Browser,የሽያጭ አሳሽ
 DocType: Journal Entry,Total Credit,ጠቅላላ ክሬዲት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},ማስጠንቀቂያ: ሌላው {0} # {1} የአክሲዮን ግቤት ላይ አለ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},ማስጠንቀቂያ: ሌላው {0} # {1} የአክሲዮን ግቤት ላይ አለ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,አካባቢያዊ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ብድር እና እድገት (እሴቶች)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ተበዳሪዎች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,ትልቅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,ትልቅ
 DocType: Homepage Featured Product,Homepage Featured Product,መነሻ ገጽ ተለይተው የቀረቡ ምርት
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ሁሉም የግምገማ ቡድኖች
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ሁሉም የግምገማ ቡድኖች
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,አዲስ መጋዘን ስም
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),ጠቅላላ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ግዛት
@@ -3255,9 +3278,10 @@
 DocType: Fees,Fees,ክፍያዎች
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ምንዛሪ ተመን ወደ ሌላ በአንድ ምንዛሬ መለወጥ ግለፅ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ጥቅስ {0} ተሰርዟል
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,ጠቅላላ ያልተወራረደ መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,ጠቅላላ ያልተወራረደ መጠን
 DocType: Sales Partner,Targets,ዒላማዎች
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,እባኮን በኩባንያው ውስጥ በሚገኙ የፋብሪካ መረጃዎች ውስጥ የሲንደን ቁጥርን ይመዝግቡ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 DocType: Price List,Price List Master,የዋጋ ዝርዝር መምህር
 DocType: GST Account,CESS Account,CESS መለያ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ማዘጋጀት እና ዒላማዎች ለመከታተል እንዲችሉ ሁሉም የሽያጭ ግብይቶች በርካታ ** የሽያጭ አካላት ** ላይ መለያ ተሰጥተዋቸዋል ይችላል.
@@ -3266,6 +3290,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ታካሚን ይምረጡ
 DocType: Price List,Applicable for Countries,አገሮች የሚመለከታቸው
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,የመግቢያ ስም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ብቻ ማቅረብ ይችላሉ &#39;ተቀባይነት አላገኘም&#39; &#39;ጸድቋል »እና ሁኔታ ጋር መተግበሪያዎች ውጣ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},የተማሪ ቡድን ስም ረድፍ ላይ ግዴታ ነው {0}
 DocType: Homepage,Products to be shown on website homepage,ምርቶች ድር መነሻ ገጽ ላይ የሚታየውን
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ይህ ሥር የደንበኛ ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -3298,14 +3323,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,ደረሰኝ አስቀድሞ ለሁሉም የክፍያ ሰዓቶች ተፈጥሯል
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ስም ስህተት: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,የፋይናንስ ወጪ ነው
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
 DocType: Packing Slip,If more than one package of the same type (for print),ከሆነ ተመሳሳይ ዓይነት ከአንድ በላይ ጥቅል (የህትመት ለ)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,እባክዎ በሆቴሎች ቅንጅቶች ውስጥ ነባሪ ደንበኛ ያዘጋጁ
 ,Salary Register,ደመወዝ ይመዝገቡ
 DocType: Warehouse,Parent Warehouse,የወላጅ መጋዘን
-DocType: C-Form Invoice Detail,Net Total,የተጣራ ጠቅላላ
+DocType: Subscription,Net Total,የተጣራ ጠቅላላ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},ነባሪ BOM ንጥል አልተገኘም {0} እና ፕሮጀክት {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,የተለያዩ የብድር ዓይነቶችን በይን
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,የተለያዩ የብድር ዓይነቶችን በይን
 DocType: Bin,FCFS Rate,FCFS ተመን
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ያልተከፈሉ መጠን
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(ደቂቃዎች ውስጥ) ሰዓት
@@ -3337,11 +3362,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,ሥር መለያ ቡድን መሆን አለበት
 DocType: Drug Prescription,Drug Prescription,የመድሃኒት ማዘዣ
 DocType: Fees,FEE.,ክፍያ.
-DocType: Employee Loan,Repaid/Closed,/ ይመልስ ተዘግቷል
+DocType: Loan,Repaid/Closed,/ ይመልስ ተዘግቷል
 DocType: Item,Total Projected Qty,ጠቅላላ ፕሮጀክት ብዛት
 DocType: Monthly Distribution,Distribution Name,የስርጭት ስም
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","የ {1} {2} የሂሳብ መመዝገቢያዎችን ለማቅረብ የሚያስፈልገውን የንጥል አይነት {0} አልተገኘም. ንጥሉ በ {1} ላይ የዜሮ ደረጃ አሰጣጥ ንጥል ነገርን እየቀጠረ ከሆነ እባክዎ በ {1} ንጥል ሰንጠረዥ ውስጥ ይጥቀሱ. አለበለዚያ እባክዎን ለእጩ ንጥል የገቢ የእዳ ልውውጥ ግብይትን ይንገሩን ወይም በአይገባሪው መዝገብ ውስጥ ጠቋሚ ግምት ይለዩ, ከዚያም ይህንን ግቤት / ማስገባት ይሞክሩ."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 DocType: Course,Course Code,የኮርስ ኮድ
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},ንጥል ያስፈልጋል ጥራት ምርመራ {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ን ከመስመር ውጪ ሁነታ ይጠቀሙ
@@ -3361,16 +3385,15 @@
 DocType: Purchase Invoice,Deemed Export,የሚታወቀው
 DocType: Stock Entry,Material Transfer for Manufacture,ማምረት ቁሳዊ ማስተላለፍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,የቅናሽ መቶኛ አንድ ዋጋ ዝርዝር ላይ ወይም ሁሉንም የዋጋ ዝርዝር ለማግኘት ወይም ተግባራዊ ሊሆኑ ይችላሉ.
-DocType: Subscription,Half-yearly,ግማሽ-ዓመታዊ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
 DocType: Lab Test,LabTest Approver,LabTest አፀደቀ
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,ቀድሞውንም ግምገማ መስፈርት ከገመገምን {}.
 DocType: Vehicle Service,Engine Oil,የሞተር ዘይት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},የስራ ስራዎች ተፈጠረ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},የስራ ስራዎች ተፈጠረ: {0}
 DocType: Sales Invoice,Sales Team1,የሽያጭ Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,ንጥል {0} የለም
 DocType: Sales Invoice,Customer Address,የደንበኛ አድራሻ
-DocType: Employee Loan,Loan Details,ብድር ዝርዝሮች
+DocType: Loan,Loan Details,ብድር ዝርዝሮች
 DocType: Company,Default Inventory Account,ነባሪ ቆጠራ መለያ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,የመደበኛ ቁጥሮች አይዛመዱም
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
@@ -3382,19 +3405,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ሰብላቱ እያደገ ላለው ለሁሉም የመሬት አሃዶች አገናኝ
 DocType: Account,Root Type,ስርወ አይነት
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},የረድፍ # {0}: በላይ መመለስ አይቻልም {1} ንጥል ለ {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},የረድፍ # {0}: በላይ መመለስ አይቻልም {1} ንጥል ለ {2}
 DocType: Item Group,Show this slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ ይህን ተንሸራታች ትዕይንት አሳይ
 DocType: BOM,Item UOM,ንጥል UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),የቅናሽ መጠን በኋላ የግብር መጠን (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},የዒላማ የመጋዘን ረድፍ ግዴታ ነው {0}
 DocType: Cheque Print Template,Primary Settings,ዋና ቅንብሮች
 DocType: Purchase Invoice,Select Supplier Address,ይምረጡ አቅራቢው አድራሻ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ሰራተኞችን አክል
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ሰራተኞችን አክል
 DocType: Purchase Invoice Item,Quality Inspection,የጥራት ምርመራ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,የበለጠ አነስተኛ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,የበለጠ አነስተኛ
 DocType: Company,Standard Template,መደበኛ አብነት
 DocType: Training Event,Theory,ፍልስፍና
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,መለያ {0} የታሰሩ ነው
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ወደ ድርጅት ንብረት መለያዎች የተለየ ሰንጠረዥ ጋር ሕጋዊ አካሌ / ንዑስ.
 DocType: Payment Request,Mute Email,ድምጸ-ኢሜይል
@@ -3414,11 +3437,10 @@
 DocType: SMS Log,No of Sent SMS,የተላከ ኤስ የለም
 DocType: Antibiotic,Healthcare Administrator,የጤና አጠባበቅ አስተዳዳሪ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ዒላማ ያዘጋጁ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
 DocType: Dosage Strength,Dosage Strength,የመመገቢያ ኃይል
 DocType: Account,Expense Account,የወጪ መለያ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ሶፍትዌር
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,ቀለም
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,ቀለም
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ግምገማ ዕቅድ መስፈርት
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,ለተመረጠው ንጥል የግዜ ማብቂያ ቀን ግዴታ ነው
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,የግዢ ትዕዛዞችን ይከላከሉ
@@ -3431,18 +3453,18 @@
 DocType: Patient,Personal and Social History,የግል እና ማህበራዊ ታሪክ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,የተጠቃሚ {0} ተፈጥሯል
 DocType: Fee Schedule,Fee Breakup for each student,ለእያንዳንዱ ተማሪ ክፍያ ይፈጽማል
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ከማያምኑ ወራት በመላ ዒላማ ማሰራጨት ወርሃዊ ስርጭት ይምረጡ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,ኮድ ቀይር
 DocType: Purchase Invoice Item,Valuation Rate,ግምቱ ተመን
 DocType: Stock Reconciliation,SR/,ድራይቨር /
 DocType: Vehicle,Diesel,በናፍጣ
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
 DocType: Purchase Invoice,Availed ITC Cess,በ ITC Cess ማግኘት
 ,Student Monthly Attendance Sheet,የተማሪ ወርሃዊ ክትትል ሉህ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,የማጓጓዣ ደንብ ለሽያጭ ብቻ ነው የሚመለከተው
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ፕሮጀክት መጀመሪያ ቀን
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,ድረስ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ድረስ
 DocType: Rename Tool,Rename Log,ምዝግብ ማስታወሻ ዳግም ሰይም
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,የተማሪ ቡድን ወይም ኮርስ ፕሮግራም የግዴታ ነው
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Timesheet ላይ አንድ ዓይነት አከፋፈል ሰዓቶች እና የሥራ ሰዓቶች ይኑራችሁ
@@ -3462,7 +3484,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,የምትገዛቸውን ወይም የምትሸጧቸውን ምርቶች ወይም አገልግሎቶች ይዘርዝሩ.
 DocType: Water Analysis,Storage Temperature,የማከማቻ መጠን
 DocType: Employee Attendance Tool,Unmarked Attendance,ምልክታቸው ክትትል
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ተመራማሪ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ተመራማሪ
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,ፕሮግራም ምዝገባ መሣሪያ ተማሪ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},የመጀመሪያ ቀን ለድርጊቱ ከሚጠናቀቅበት የመጨረሻ ቀን ያነሰ መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,ስም ወይም ኢሜይል የግዴታ ነው
@@ -3475,7 +3497,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ አቋም አለው, እና ለዚህ አቅራቢ (RFQs) በጥብቅ ማስጠንቀቂያ ሊሰጠው ይገባል."
 DocType: Chapter,Non Profit Manager,የጥቅመ-ዓለም ስራ አስኪያጅ
 DocType: BOM,Total Cost(Company Currency),ጠቅላላ ወጪ (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} የተፈጠረ ተከታታይ የለም
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} የተፈጠረ ተከታታይ የለም
 DocType: Homepage,Company Description for website homepage,ድር መነሻ ገጽ ለ ኩባንያ መግለጫ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ደንበኞች ወደ ምቾት ሲባል, እነዚህ ኮዶች ደረሰኞች እና የመላኪያ ማስታወሻዎች እንደ የህትመት ቅርጸቶች ውስጥ ጥቅም ላይ ሊውል ይችላል"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ስም
@@ -3485,11 +3507,10 @@
 DocType: Employee,You can enter any date manually,እራስዎ ማንኛውንም ቀን ያስገቡ ይችላሉ
 DocType: Healthcare Settings,Result Printed,ውጤት ታተመ
 DocType: Asset Category Account,Depreciation Expense Account,የእርጅና የወጪ መለያ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,የሙከራ ጊዜ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},አሳይ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,የሙከራ ጊዜ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ብቻ ቅጠል እባጮች ግብይት ውስጥ ይፈቀዳሉ
 DocType: Project,Total Costing Amount (via Timesheets),ጠቅላላ ወለድ ሂሳብ (በዳገርስ ወረቀቶች በኩል)
-DocType: Employee Advance,Expense Approver,የወጪ አጽዳቂ
+DocType: Department,Expense Approver,የወጪ አጽዳቂ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ረድፍ {0}: የደንበኛ ላይ በቅድሚያ ክሬዲት መሆን አለበት
 DocType: Project,Hourly,በሰዓት
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ወደ ቡድን ያልሆነ ቡድን
@@ -3498,7 +3519,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME ወደ
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,ኤስኤምኤስ የመላኪያ ሁኔታ የመጠበቅ ምዝግብ ማስታወሻዎች
 DocType: Accounts Settings,Make Payment via Journal Entry,ጆርናል Entry በኩል ክፍያ አድርግ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Printed ላይ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Printed ላይ
 DocType: Item,Inspection Required before Delivery,የምርመራው አሰጣጥ በፊት የሚያስፈልግ
 DocType: Item,Inspection Required before Purchase,የምርመራው ግዢ በፊት የሚያስፈልግ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,በመጠባበቅ ላይ እንቅስቃሴዎች
@@ -3508,7 +3529,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,አነስተኛ የትዕዛዝ ብዛት
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,የእርስዎ ድርጅት
 DocType: Fee Component,Fees Category,ክፍያዎች ምድብ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,ለሠራተኛ አሳውቅ
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ጥያቄ ምንጭ ዘመቻ ከሆነ ዘመቻ ስም ያስገቡ
@@ -3518,7 +3539,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,አስይዝ ደረጃ
 DocType: Company,Chart Of Accounts Template,መለያዎች አብነት ነው ገበታ
 DocType: Attendance,Attendance Date,በስብሰባው ቀን
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},የእቃ ዋጋ {0} ውስጥ የዋጋ ዝርዝር ዘምኗል {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},የእቃ ዋጋ {0} ውስጥ የዋጋ ዝርዝር ዘምኗል {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ማግኘት እና ተቀናሽ ላይ የተመሠረተ ደመወዝ መፈረካከስ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መለያ ያሰኘንን ወደ ሊቀየር አይችልም
 DocType: Purchase Invoice Item,Accepted Warehouse,ተቀባይነት መጋዘን
@@ -3526,10 +3547,11 @@
 DocType: Item,Valuation Method,ግምቱ ስልት
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,ማርቆስ ግማሽ ቀን
 DocType: Sales Invoice,Sales Team,የሽያጭ ቡድን
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,የተባዛ ግቤት
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,የተባዛ ግቤት
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,ከማስረከቡ በፊት የአመክንዮቹን ስም ያስገቡ.
 DocType: Program Enrollment Tool,Get Students,ተማሪዎች ያግኙ
 DocType: Serial No,Under Warranty,የዋስትና በታች
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ስህተት]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ስህተት]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,አንተ ወደ የሽያጭ ትዕዛዝ ለማዳን አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 ,Employee Birthday,የሰራተኛ የልደት ቀን
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,እባክዎ ለተጠናቀቀው ጥገና የተጠናቀቀ ቀን ይምረጡ
@@ -3548,7 +3570,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ለንዑስ ኮንትራቶች የተያዘ
 DocType: Payment Reconciliation Invoice,Invoice Number,የክፍያ መጠየቂያ ቁጥር
 DocType: Shopping Cart Settings,Orders,ትዕዛዞች
-DocType: Employee Leave Approver,Leave Approver,አጽዳቂ ውጣ
+DocType: Department,Leave Approver,አጽዳቂ ውጣ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ስብስብ ይምረጡ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,ግምገማ ቡድን ስም
@@ -3592,7 +3614,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,የተጋለጠ ንጥል ነገር
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ተቀባይ ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,ሲጠራቀሙ የእርጅና መለያ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ይሄ ኢሜይል በራስ-መርሐግብር ነው
 DocType: Stock Settings,Freeze Stock Entries,አርጋ Stock ግቤቶችን
 DocType: Program Enrollment,Boarding Student,የመሳፈሪያ የተማሪ
 DocType: Asset,Expected Value After Useful Life,ጠቃሚ ሕይወት በኋላ የሚጠበቀው እሴት
@@ -3617,21 +3638,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},በስብሰባው ሪከርድ {0} የተማሪ ላይ አለ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},የማጣቀሻ # {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,የእርጅና ምክንያት ንብረቶች አወጋገድ ላይ ተሰናብቷል
-DocType: Member,Member,አባል
+DocType: Loan,Member,አባል
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,አድራሻዎች ያቀናብሩ
 DocType: Work Order Item,Work Order Item,የስራ ቅደም ተከተል ንጥል
 DocType: Pricing Rule,Item Code,ንጥል ኮድ
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
 DocType: Lead,Market Segment,ገበያ ክፍሉ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,የግብርና ሥራ አስኪያጅ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
 DocType: Supplier Scorecard Period,Variables,ልዩነቶች
 DocType: Employee Internal Work History,Employee Internal Work History,የተቀጣሪ ውስጣዊ የስራ ታሪክ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),የመመዝገቢያ ጊዜ (ዶክተር)
 DocType: Cheque Print Template,Cheque Size,ቼክ መጠን
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,አይደለም አክሲዮን ውስጥ ተከታታይ አይ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,አይደለም አክሲዮን ውስጥ ተከታታይ አይ {0}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ግብይቶች ለመሸጥ የግብር አብነት.
 DocType: Sales Invoice,Write Off Outstanding Amount,ያልተከፈሉ መጠን ጠፍቷል ይጻፉ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},መለያ {0} ኩባንያ ጋር አይዛመድም {1}
@@ -3639,7 +3660,6 @@
 DocType: Stock Settings,Default Stock UOM,ነባሪ የክምችት UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,ኳታ ጠቅላላ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},የተቀጣሪ ብድር ላይ: {0}
 DocType: Landed Cost Item,Receipt Document,ደረሰኝ ሰነድ
 DocType: Employee Education,School/University,ትምህርት ቤት / ዩኒቨርስቲ
 DocType: Payment Request,Reference Details,የማጣቀሻ ዝርዝሮች
@@ -3650,7 +3670,7 @@
 DocType: Asset,Double Declining Balance,ድርብ ካልተቀበሉት ቀሪ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ዝግ ትዕዛዝ ተሰርዟል አይችልም. ለመሰረዝ Unclose.
 DocType: Student Guardian,Father,አባት
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
 DocType: Bank Reconciliation,Bank Reconciliation,ባንክ ማስታረቅ
 DocType: Attendance,On Leave,አረፍት ላይ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ዝማኔዎች አግኝ
@@ -3664,10 +3684,10 @@
 DocType: Lead,Lower Income,የታችኛው ገቢ
 DocType: Restaurant Order Entry,Current Order,የአሁን ትዕዛዝ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},የመነሻ እና የመድረሻ መጋዘን ረድፍ ጋር ተመሳሳይ መሆን አይችልም {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ወደ ፕሮግራሞች ሂድ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ረድፍ {0} # የተመደበ መጠን {1} ከቀረበበት የይገባኛል መጠን በላይ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ረድፍ {0} # የተመደበ መጠን {1} ከቀረበበት የይገባኛል መጠን በላይ ሊሆን አይችልም {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ቀን ጀምሮ&#39; በኋላ &#39;እስከ ቀን&#39; መሆን አለበት
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
@@ -3690,7 +3710,6 @@
 DocType: Payment Terms Template,Payment Terms,የክፍያ ውል
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,ደቂቃ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ግብሮች እና ክፍያዎች ይግዙ
 DocType: Chapter,Meetup Embed HTML,ማገናኘት ኤች.ቲ.ኤም.ኤል
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ወደ አቅራቢዎች ይሂዱ
@@ -3709,30 +3728,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ጥቅስ {0} ሳይሆን አይነት {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ጥገና ፕሮግራም ንጥል
 DocType: Sales Order,%  Delivered,% ደርሷል
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,የክፍያ ጥያቄውን ለመላክ የተማሪውን የኢሜይል መታወቂያ ያዘጋጁ
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,የክፍያ ጥያቄውን ለመላክ የተማሪውን የኢሜይል መታወቂያ ያዘጋጁ
 DocType: Patient,Medical History,የህክምና ታሪክ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ባንክ ኦቨርድራፍት መለያ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ባንክ ኦቨርድራፍት መለያ
 DocType: Patient,Patient ID,የታካሚ መታወቂያ
 DocType: Physician Schedule,Schedule Name,መርሐግብር ያስይዙ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,የቀጣሪ አድርግ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,ሁሉንም አቅራቢዎች አክል
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,ሁሉንም አቅራቢዎች አክል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,የረድፍ # {0}: የተመደበ መጠን የላቀ መጠን የበለጠ ሊሆን አይችልም.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,አስስ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
 DocType: Purchase Invoice,Edit Posting Date and Time,አርትዕ የመለጠፍ ቀን እና ሰዓት
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},የንብረት ምድብ {0} ወይም ኩባንያ ውስጥ መቀነስ ጋር የተያያዙ መለያዎች ማዘጋጀት እባክዎ {1}
 DocType: Lab Test Groups,Normal Range,መደበኛ ክልል
 DocType: Academic Term,Academic Year,የትምህርት ዘመን
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,ሊሸጥ የሚቻል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,በመክፈት ላይ ቀሪ ፍትህ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,በመክፈት ላይ ቀሪ ፍትህ
 DocType: Lead,CRM,ሲ
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,የቀረ
 DocType: Appraisal,Appraisal,ግምት
+DocType: Loan,Loan Account,የብድር መለያን
 DocType: Purchase Invoice,GST Details,የ GST ዝርዝሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},አቅራቢ ተልኳል ኢሜይል ወደ {0}
 DocType: Item,Default Sales Unit of Measure,ነባሪ የሽያጭ ብዜት መለኪያ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,የትምህርት ዘመን:
+DocType: Subscription,Past Due Date,ያለፈ ጊዜ ያለፈበት ቀን
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ለንጥል የተለየ አማራጭ ለማዘጋጀት አይፈቀድም {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ቀን ተደግሟል
@@ -3745,7 +3766,7 @@
 DocType: Patient Appointment,Patient Appointment,የታካሚ ቀጠሮ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ሚና ማጽደቅ ያለውን አገዛዝ ወደ የሚመለከታቸው ነው ሚና ጋር ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ይህን የኢሜይል ጥንቅር ምዝገባ ይውጡ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,አቅራቢዎችን በ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,አቅራቢዎችን በ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ለንጥል {1} አልተገኘም
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,ወደ ኮርሶች ይሂዱ
 DocType: Accounts Settings,Show Inclusive Tax In Print,Inclusive Tax In Print ውስጥ አሳይ
@@ -3753,10 +3774,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,መልዕክት ተልኳል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,ልጅ እንደ አንጓዎች ጋር መለያ የመቁጠር ሊዘጋጅ አይችልም
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ፍጥነት ዋጋ ዝርዝር ምንዛሬ ላይ የደንበኛ መሰረት ከሆነው ምንዛሬ በመለወጥ ላይ ነው
 DocType: Purchase Invoice Item,Net Amount (Company Currency),የተጣራ መጠን (የኩባንያ የምንዛሬ)
 DocType: Physician,Physician Schedules,የሐኪም መርሐ-ግብር
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,የጠቅላላ የቅድመ ክፍያ መጠን ከማዕቀዛት ጠቅላላ መጠን በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,የጠቅላላ የቅድመ ክፍያ መጠን ከማዕቀዛት ጠቅላላ መጠን በላይ ሊሆን አይችልም
 DocType: Salary Slip,Hour Rate,ሰዓቲቱም ተመን
 DocType: Stock Settings,Item Naming By,ንጥል በ መሰየምን
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ሌላው ክፍለ ጊዜ መዝጊያ Entry {0} በኋላ ተደርጓል {1}
@@ -3774,6 +3796,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},አይደለም በላይ የቆዩ የአክሲዮን ግብይቶችን ለማዘመን አይፈቀድላቸውም {0}
 DocType: BOM,Inspection Required,የምርመራ ያስፈልጋል
 DocType: Purchase Invoice Item,PR Detail,የህዝብ ግንኙነት ዝርዝር
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,ከማቅረብዎ በፊት የባንክ ዋስትና ቁጥር ቁጥር ያስገቡ.
 DocType: Driving License Category,Class,ክፍል
 DocType: Sales Order,Fully Billed,ሙሉ በሙሉ የሚከፈል
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,የሥራ ትዕዛዝ በእቃዎች ቅንብር ላይ ሊነሳ አይችልም
@@ -3784,7 +3807,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),የጥቅል ያለው አጠቃላይ ክብደት. አብዛኛውን ጊዜ የተጣራ ክብደት + ጥቅል ቁሳዊ ክብደት. (የህትመት ለ)
 DocType: Assessment Plan,Program,ፕሮግራም
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ይህን ሚና ያላቸው ተጠቃሚዎች የታሰሩ መለያዎች ላይ የሂሳብ ግቤቶች የታሰሩ መለያዎች ማዘጋጀት እና ለመፍጠር ቀይር / የተፈቀደላቸው
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 DocType: Serial No,Is Cancelled,ተሰርዟል ነው
 DocType: Student Group,Group Based On,የቡድን የተመረኮዘ ላይ
 DocType: Journal Entry,Bill Date,ቢል ቀን
@@ -3795,9 +3817,10 @@
 DocType: Cheque Print Template,Cheque Height,ቼክ ቁመት
 DocType: Supplier,Supplier Details,አቅራቢ ዝርዝሮች
 DocType: Setup Progress,Setup Progress,የማዋቀር ሂደት
+DocType: Expense Claim,Approval Status,የማጽደቅ ሁኔታ
 DocType: Hub Settings,Publish Items to Hub,ማዕከል ንጥሎች አትም
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},እሴት ረድፍ ውስጥ እሴት ያነሰ መሆን አለበት ከ {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ሁሉንም ይመልከቱ
 ,Issued Items Against Work Order,ከስራ ትእዛዝ ጋር የተገኙ እቃዎች
 DocType: Vehicle Log,Invoice Ref,የደረሰኝ ዳኛ
@@ -3827,12 +3850,11 @@
 DocType: Customs Tariff Number,Tariff Number,ታሪፍ ቁጥር
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP መጋዘን ላይ ይገኛል ብዛት
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ፕሮጀክት
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},ተከታታይ አይ {0} መጋዘን የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},ተከታታይ አይ {0} መጋዘን የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ማስታወሻ: {0} ብዛት ወይም መጠን 0 ነው እንደ የመላኪያ-ደጋግሞ-ማስያዣ ንጥል ለ ስርዓት ይመልከቱ አይደለም
 DocType: Notification Control,Quotation Message,ትዕምርተ መልዕክት
-DocType: Employee Loan,Employee Loan Application,የሰራተኛ ብድር ማመልከቻ
 DocType: Issue,Opening Date,መክፈቻ ቀን
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,እባክዎን በሽተኛው መጀመሪያውን ያስቀምጡ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,እባክዎን በሽተኛው መጀመሪያውን ያስቀምጡ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,በስብሰባው ላይ በተሳካ ሁኔታ ምልክት ተደርጎበታል.
 DocType: Program Enrollment,Public Transport,የሕዝብ ማመላለሻ
 DocType: Soil Texture,Silt Composition (%),የበቆሎ ቅንብር (%)
@@ -3850,7 +3872,7 @@
 ,Item Balance (Simple),ንጥል ሚዛን (ቀላል)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,አቅራቢዎች ያሳደጉት ደረሰኞች.
 DocType: POS Profile,Write Off Account,መለያ ጠፍቷል ይጻፉ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Amt ማስታወሻ ዴቢት
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Amt ማስታወሻ ዴቢት
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,የቅናሽ መጠን
 DocType: Purchase Invoice,Return Against Purchase Invoice,ላይ የግዢ ደረሰኝ ይመለሱ
 DocType: Item,Warranty Period (in days),(ቀናት ውስጥ) የዋስትና ክፍለ ጊዜ
@@ -3873,6 +3895,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
 DocType: Sales Invoice Item,Delivered Qty,ደርሷል ብዛት
 DocType: Assessment Plan,Assessment Plan,ግምገማ ዕቅድ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,የተራዘመ የጆርናሉ ምዝገባ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ደንበኛ {0} ተፈጥሯል.
 DocType: Stock Settings,Limit Percent,ገድብ መቶኛ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,በአሁኑ ጊዜ በማንኛውም መጋዘን ውስጥ ምንም አክሲዮስ የለም
@@ -3886,14 +3909,15 @@
 DocType: Journal Entry,Stock Entry,የክምችት የሚመዘገብ መረጃ
 DocType: Payment Entry,Payment References,የክፍያ ማጣቀሻዎች
 DocType: C-Form,C-FORM-,ሲ-የተለጠጡ
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ለዕለቱ የቦታ ክፍተት መካከል ልዩነቶች ለምሳሌ ያለፈበት ጊዜ &quot;ቀናት&quot; እና የሂሳብ አከፋፈይ የጊዜ ቆጠራው 3 እንደሆነ, በየሦስት ቀናት ክፍያዎች ይወጣሉ"
 DocType: Vehicle,Insurance Details,ኢንሹራንስ ዝርዝሮች
 DocType: Account,Payable,ትርፍ የሚያስገኝ
 DocType: Share Balance,Share Type,ዓይነት አጋራ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ተበዳሪዎች ({0})
 DocType: Pricing Rule,Margin,ህዳግ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,አዲስ ደንበኞች
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,አጠቃላይ ትርፍ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,አጠቃላይ ትርፍ%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS የመልዕክት መለወጥ
 DocType: Bank Reconciliation Detail,Clearance Date,መልቀቂያ ቀን
@@ -3903,10 +3927,11 @@
 DocType: Lead,Address Desc,DESC አድራሻ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,ፓርቲ የግዴታ ነው
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},በሌሎች ረድፎች ውስጥ የተባዙ ቀነ-ግቢዎች ያለባቸው ረድፎች ተገኝተዋል: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},በሌሎች ረድፎች ውስጥ የተባዙ ቀነ-ግቢዎች ያለባቸው ረድፎች ተገኝተዋል: {list}
 DocType: Topic,Topic Name,ርዕስ ስም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,እባክዎ በ HR ቅንብሮች ውስጥ የመልቀቂያ ማሳወቂያ ለመተው እባክዎ ነባሪ አብነት ያስቀምጡ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,የ መሸጥ ወይም መግዛትና ውስጥ ቢያንስ አንድ መመረጥ አለበት
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ሰራተኞቹን ለማሻሻል ሰራተኛን ይምረጡ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ሰራተኞቹን ለማሻሻል ሰራተኛን ይምረጡ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,እባክዎ ትክክለኛ ቀን ይምረጡ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,የንግድ ተፈጥሮ ይምረጡ.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3925,7 +3950,7 @@
 DocType: Asset Movement,Source Warehouse,ምንጭ መጋዘን
 DocType: Installation Note,Installation Date,መጫን ቀን
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledger አጋራ
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},የረድፍ # {0}: የንብረት {1} ኩባንያ የእርሱ ወገን አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},የረድፍ # {0}: የንብረት {1} ኩባንያ የእርሱ ወገን አይደለም {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,የሽያጭ ደረሰኝ {0} ተፈጥሯል
 DocType: Employee,Confirmation Date,ማረጋገጫ ቀን
 DocType: C-Form,Total Invoiced Amount,ጠቅላላ በደረሰኝ የተቀመጠው መጠን
@@ -3934,7 +3959,7 @@
 DocType: Account,Accumulated Depreciation,ሲጠራቀሙ መቀነስ
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ቋሚ ስም
 DocType: Stock Entry,Customer or Supplier Details,የደንበኛ ወይም አቅራቢ ዝርዝሮች
-DocType: Employee Loan Application,Required by Date,ቀን በሚጠይቀው
+DocType: Loan Application,Required by Date,ቀን በሚጠይቀው
 DocType: Lead,Lead Owner,በእርሳስ ባለቤት
 DocType: Production Plan,Sales Orders Detail,የሽያጭ ትዕዛዞች ዝርዝር
 DocType: Bin,Requested Quantity,ጠይቀዋል ብዛት
@@ -3947,10 +3972,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ጠቅላላ ክፍያ - ጠቅላላ ተቀናሽ - የብድር የሚያየን
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,የአሁኑ BOM ኒው BOM ተመሳሳይ መሆን አይችልም
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,የቀጣሪ መታወቂያ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,ጡረታ መካከል ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,ጡረታ መካከል ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,በርካታ ስሪቶች
 DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ደርሷል
+DocType: Subscription,Trial Period Start Date,የሙከራ ጊዜ የመጀመሪያ ቀን
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ንጥል {0}: የዕቃው ብዛት {1} ዝቅተኛ ትዕዛዝ ብዛት {2} (ንጥል ፍቺ) ይልቅ ያነሰ ሊሆን አይችልም.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ወርሃዊ ስርጭት መቶኛ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,እባክህ እንደ ሌላ ተጠቃሚ ግባ.
@@ -3971,12 +3997,11 @@
 DocType: Student Guardian,Student Guardian,የተማሪ አሳዳጊ
 DocType: Member,Member Name,የአባላት ስም
 DocType: Stock Settings,Use Naming Series,ስም መስጠት ስሞችን ተጠቀም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
 DocType: POS Profile,Update Stock,አዘምን Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,በመመዝገቢያ ውስጥ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ንጥሎች በተለያዩ UOM ትክክል (ጠቅላላ) የተጣራ ክብደት ዋጋ ሊመራ ይችላል. እያንዳንዱ ንጥል የተጣራ ክብደት ተመሳሳይ UOM ውስጥ መሆኑን እርግጠኛ ይሁኑ.
 DocType: Membership,Payment Details,የክፍያ ዝርዝሮች
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ተመን
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM ተመን
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","የተቋረጠው የሥራ ትዕዛዝ ሊተው አይችልም, መተው መጀመሪያ ይጥፉ"
 DocType: Asset,Journal Entry for Scrap,ቁራጭ ለ ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,የመላኪያ ማስታወሻ የመጡ ንጥሎችን ለመንቀል እባክዎ
@@ -3996,6 +4021,7 @@
 DocType: Land Unit,Land Unit,የመሬት አሃድ
 ,Purchase Analytics,የግዢ ትንታኔ
 DocType: Sales Invoice Item,Delivery Note Item,የመላኪያ ማስታወሻ ንጥል
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,አሁን ያለው ደረሰኝ {0} ይጎድላል
 DocType: Asset Maintenance Log,Task,ተግባር
 DocType: Purchase Taxes and Charges,Reference Row #,ማጣቀሻ ረድፍ #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ባች ቁጥር ንጥል ግዴታ ነው {0}
@@ -4007,7 +4033,7 @@
 DocType: Company,Exchange Gain / Loss Account,የ Exchange ቅሰም / ማጣት መለያ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,የሰራተኛ እና ክትትል
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ዓላማ ውስጥ አንዱ መሆን አለበት {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ቅጹን መሙላት እና ማስቀመጥ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ቅጹን መሙላት እና ማስቀመጥ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,የማህበረሰብ መድረክ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,በክምችት ውስጥ ትክክለኛው ብዛት
 DocType: Homepage,"URL for ""All Products""",&quot;ሁሉም ምርቶች» ለ ዩ አር ኤል
@@ -4021,7 +4047,7 @@
 DocType: Lab Test Template,Standard Selling Rate,መደበኛ ሽያጭ ተመን
 DocType: Account,Rate at which this tax is applied,ይህ ግብር ተግባራዊ ሲሆን በ ተመን
 DocType: Cash Flow Mapper,Section Name,የክፍል ስም
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,አስይዝ ብዛት
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,አስይዝ ብዛት
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,የአሁኑ ክፍት የሥራ ቦታዎች
 DocType: Company,Stock Adjustment Account,የአክሲዮን የማስተካከያ መለያ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ሰረዘ
@@ -4032,9 +4058,9 @@
 DocType: Task,depends_on,እንደ ሁኔታው
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,በሁሉም የሂሳብ ማሻሻያ ሂሳቦች ውስጥ የቅርብ ጊዜውን ዋጋ ለማዘመን ሰልፍ ተደርጎ. ጥቂት ደቂቃዎችን ሊወስድ ይችላል.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,አዲስ መለያ ስም. ማስታወሻ: ደንበኞች እና አቅራቢዎች መለያዎችን መፍጠር እባክዎ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,አገር ጥበብ ነባሪ አድራሻ አብነቶች
 DocType: Water Analysis,Appearance,መልክ
+DocType: HR Settings,Leave Status Notification Template,የአቋም መግለጫ ቅጽ ላይ ይተው
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,አማካ. የዋጋ ዝርዝር ደረጃን መግዛት
 DocType: Sales Order Item,Supplier delivers to Customer,አቅራቢው የደንበኛ ወደ ያድነዋል
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,የአባላት መረጃ.
@@ -4057,7 +4083,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,አይፈቀድም. እባክዎን የሙከራ ቅጽዎን ያጥፉ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,መቶኛ ምደባዎች 100% ጋር እኩል መሆን አለበት
 DocType: Crop Cycle,Linked Land Unit,የተቆራኘ የመሬት ክፍል
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 DocType: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
@@ -4073,7 +4099,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ወደ ተጠቃሚዎች ሂድ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,የሚከፈልበት መጠን መጠን ግራንድ ጠቅላላ በላይ ሊሆን አይችልም ጠፍቷል ጻፍ; +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ንጥል ትክክለኛ ባች ቁጥር አይደለም {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},ማስታወሻ: አይተውህም ዓይነት በቂ ፈቃድ ቀሪ የለም {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},ማስታወሻ: አይተውህም ዓይነት በቂ ፈቃድ ቀሪ የለም {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,ልክ ያልሆነ GSTIN ወይም ያልተመዘገበ ለ NA ያስገቡ
 DocType: Training Event,Seminar,ሴሚናሩ
 DocType: Program Enrollment Fee,Program Enrollment Fee,ፕሮግራም ምዝገባ ክፍያ
@@ -4089,14 +4115,14 @@
 DocType: Hub Settings,Publish Availability,ተገኝነት አትም
 DocType: Company,Create Chart Of Accounts Based On,መለያዎች ላይ የተመሠረተ ላይ ነው ገበታ ፍጠር
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ለቡድን ያልሆኑ ወደ መለወጥ አይችልም. የልጅ ተግባራት ይገኛሉ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,የትውልድ ቀን በዛሬው ጊዜ በላይ ሊሆን አይችልም.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,የትውልድ ቀን በዛሬው ጊዜ በላይ ሊሆን አይችልም.
 ,Stock Ageing,የክምችት ጥበቃና
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ተማሪ {0} ተማሪ አመልካች ላይ እንዳሉ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),የሬጅ ማስተካከያ (የኩባንያው የገንዘብ ምንዛሬ)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ባች:
 DocType: Volunteer,Afternoon,ከሰአት
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ክፍት እንደ አዘጋጅ
 DocType: Cheque Print Template,Scanned Cheque,የተቃኘው ቼክ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,በማስገባት ላይ ግብይቶች ላይ እውቂያዎች ራስ-ሰር ኢሜይሎች ይላኩ.
@@ -4112,7 +4138,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,ፕሮጀክት {0} አስቀድሞም ይገኛል
 DocType: Medical Department,Nursing User,የነርሶች ተጠቃሚ
 DocType: Plant Analysis,Plant Analysis Criterias,የአትክልት ትንታኔ መስፈርቶች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ሃላፊነቶች
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} የቡድን {1} አይደለም
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ሃላፊነቶች
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,የዚህ ጥቅስ ዋጋ ያለው ጊዜ ተጠናቅቋል.
 DocType: Expense Claim Account,Expense Claim Account,የወጪ የይገባኛል ጥያቄ መለያ
 DocType: Accounts Settings,Allow Stale Exchange Rates,የተለመዱ ትውልዶች ፍቀድ
@@ -4134,11 +4161,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ተለዋጮችን ይፍጠሩ
 DocType: Item,Default BOM,ነባሪ BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),አጠቃላይ የተጠየቀው መጠን (በሽያጭ ደረሰኞች በኩል)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ዴቢት ማስታወሻ መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ዴቢት ማስታወሻ መጠን
 DocType: Project Update,Not Updated,አልተዘመነም
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","በፋፍቱ, በትርፍ እና በሂሳብ መካከል የተንኮል አለ"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,ዳግም-ዓይነት ኩባንያ ስም ለማረጋገጥ እባክዎ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,ጠቅላላ ያልተወራረደ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,ጠቅላላ ያልተወራረደ Amt
 DocType: Journal Entry,Printing Settings,ማተም ቅንብሮች
 DocType: Employee Advance,Advance Account,የቅድሚያ ሂሳብ
 DocType: Job Offer,Job Offer Terms,የሥራ አቅርቦቶች
@@ -4147,7 +4174,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,አውቶሞቲቭ
 DocType: Vehicle,Insurance Company,ኢንሹራንስ ኩባንያ
 DocType: Asset Category Account,Fixed Asset Account,የተወሰነ የንብረት መለያ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ተለዋጭ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ተለዋጭ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,የመላኪያ ማስታወሻ ከ
 DocType: Chapter,Members,አባላት
 DocType: Student,Student Email Address,የተማሪ የኢሜይል አድራሻ
@@ -4170,7 +4197,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,እሥረኛ
 DocType: Delivery Stop,Address Name,አድራሻ ስም
 DocType: Stock Entry,From BOM,BOM ከ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{0} ንጥሎችን በ {1} ማካተት
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{0} ንጥሎችን በ {1} ማካተት
 DocType: Assessment Code,Assessment Code,ግምገማ ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,መሠረታዊ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} በበረዶ በፊት የአክሲዮን ዝውውሮች
@@ -4178,25 +4205,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,አንተ የማጣቀሻ ቀን ያስገቡት ከሆነ ማጣቀሻ ምንም የግዴታ ነው
 DocType: Bank Reconciliation Detail,Payment Document,የክፍያ ሰነድ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,መስፈርት ቀመርን ለመገምገም ስህተት
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,በመቀላቀል ቀን የልደት ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,በመቀላቀል ቀን የልደት ቀን የበለጠ መሆን አለበት
+DocType: Subscription,Plans,እቅዶች
 DocType: Salary Slip,Salary Structure,ደመወዝ መዋቅር
 DocType: Account,Bank,ባንክ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,የአየር መንገድ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,እትም ይዘት
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ተደጋጋሚነትን በመፍጠር ላይ ስህተት አጋጥሟል
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,እትም ይዘት
 DocType: Material Request Item,For Warehouse,መጋዘን ለ
 DocType: Employee,Offer Date,ቅናሽ ቀን
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ጥቅሶች
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ምንም የተማሪ ቡድኖች ተፈጥሯል.
 DocType: Purchase Invoice Item,Serial No,መለያ ቁጥር
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ወርሃዊ የሚያየን መጠን ብድር መጠን በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,ወርሃዊ የሚያየን መጠን ብድር መጠን በላይ ሊሆን አይችልም
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,በመጀመሪያ Maintaince ዝርዝሮችን ያስገቡ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,ረድፍ # {0}: የተጠበቀው የትዕዛዝ ቀን ከግዢ ትዕዛዝ ቀን በፊት ሊሆን አይችልም
 DocType: Purchase Invoice,Print Language,የህትመት ቋንቋ
 DocType: Salary Slip,Total Working Hours,ጠቅላላ የሥራ ሰዓቶች
 DocType: Sales Invoice,Customer PO Details,የደንበኛ PO ዝርዝሮች
-DocType: Subscription,Next Schedule Date,ቀጣይ የጊዜ ሰሌዳ
 DocType: Stock Entry,Including items for sub assemblies,ንዑስ አብያተ ክርስቲያናት ለ ንጥሎችን በማካተት ላይ
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ጊዜያዊ የመክፈቻ መለያ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
@@ -4224,11 +4250,11 @@
 DocType: Issue,Opening Time,የመክፈቻ ሰዓት
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,እንዲሁም ያስፈልጋል ቀናት ወደ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,ዋስትና እና ምርት ልውውጥ
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ለተጠቀሱት መስፈርቶች ምንም ሰራተኞች የሉም
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
 DocType: Hotel Settings,Default Customer,ነባሪ ደንበኛ
 DocType: Assessment Plan,Supervisor Name,ሱፐርቫይዘር ስም
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ቀጠሮው ለተመሳሳይ ቀን መደረግ እንዳለበት አረጋግጡ
@@ -4252,16 +4278,16 @@
 DocType: Journal Entry Account,Employee Advance,Employee Advance
 DocType: Payroll Entry,Payroll Frequency,የመክፈል ዝርዝር ድግግሞሽ
 DocType: Lab Test Template,Sensitivity,ትብነት
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,ጥሬ ሐሳብ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,ጥሬ ሐሳብ
 DocType: Leave Application,Follow via Email,በኢሜይል በኩል ተከተል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,እጽዋት እና መሳሪያዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,እጽዋት እና መሳሪያዎች
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,የቅናሽ መጠን በኋላ የግብር መጠን
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ዕለታዊ የስራ ማጠቃለያ ቅንብሮች
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,እባክዎ በቀን Reqd ያስገባሉ
 DocType: Payment Entry,Internal Transfer,ውስጣዊ ማስተላለፍ
 DocType: Asset Maintenance,Maintenance Tasks,የጥገና ተግባራት
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ወይ የዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
 DocType: Leave Control Panel,Carry Forward,አስተላልፍ መሸከም
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል የሒሳብ መዝገብ ላይ ሊቀየር አይችልም
@@ -4269,13 +4295,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext ውህዶች
 DocType: Crop Cycle,Detected Disease,በሽታ ተገኝቷል
 ,Produced,ፕሮዲዩስ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,የምላሽ መጀመሪያ ቀን ከክፍያ ቀን በፊት ሊሆን አይችልም.
 DocType: Item,Item Code for Suppliers,አቅራቢዎች ለ ንጥል ኮድ
 DocType: Issue,Raised By (Email),በ አስነስቷል (ኢሜይል)
 DocType: Training Event,Trainer Name,አሰልጣኝ ስም
 DocType: Mode of Payment,General,ጠቅላላ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,የመጨረሻው ኮሙኒኬሽን
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serialized ንጥል ሲሪያል ቁጥሮች ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serialized ንጥል ሲሪያል ቁጥሮች ያስፈልጋል {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ደረሰኞች ጋር አዛምድ ክፍያዎች
 DocType: Journal Entry,Bank Entry,ባንክ የሚመዘገብ መረጃ
 DocType: Authorization Rule,Applicable To (Designation),የሚመለከታቸው ለማድረግ (ምደባ)
@@ -4288,7 +4315,7 @@
 DocType: Guardian,Interests,ፍላጎቶች
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ አቦዝን ምንዛሬዎች ያንቁ.
 DocType: Production Plan,Get Material Request,የቁስ ጥያቄ ያግኙ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,የፖስታ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,የፖስታ ወጪዎች
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ጠቅላላ (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,መዝናኛ እና መዝናኛዎች
 ,Item Variant Details,የንጥል ልዩ ዝርዝሮች
@@ -4299,9 +4326,9 @@
 DocType: Drug Prescription,Hour,ሰአት
 DocType: Restaurant Order Entry,Last Sales Invoice,የመጨረሻው የሽያጭ ደረሰኝ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},እባክዎ ከንጥል {0} ላይ Qty ን ይምረጡ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲስ መለያ ምንም መጋዘን ሊኖረው አይችልም. መጋዘን የክምችት Entry ወይም የግዢ ደረሰኝ በ መዘጋጀት አለበት
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲስ መለያ ምንም መጋዘን ሊኖረው አይችልም. መጋዘን የክምችት Entry ወይም የግዢ ደረሰኝ በ መዘጋጀት አለበት
 DocType: Lead,Lead Type,በእርሳስ አይነት
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,እነዚህ ሁሉ ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
 DocType: Company,Monthly Sales Target,ወርሃዊ የሽያጭ ዒላማ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},መጽደቅ ይችላል {0}
@@ -4309,7 +4336,7 @@
 DocType: Item,Default Material Request Type,ነባሪ የቁስ ጥያቄ አይነት
 DocType: Supplier Scorecard,Evaluation Period,የግምገማ ጊዜ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,ያልታወቀ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,የሥራ ትዕዛዝ አልተፈጠረም
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,የሥራ ትዕዛዝ አልተፈጠረም
 DocType: Shipping Rule,Shipping Rule Conditions,የመርከብ ደ ሁኔታዎች
 DocType: Purchase Invoice,Export Type,ወደ ውጪ ላክ
 DocType: Salary Slip Loan,Salary Slip Loan,የደመወዝ ወረቀት ብድር
@@ -4325,7 +4352,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,የክፍያ መጠየቂያ አጭር ማጠቃለያ
 DocType: Education Settings,Education Manager,የትምህርት ሥራ አስኪያጅ
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,በመስክ ውስጥ በእያንዳንዱ ተክል ውስጥ ዝቅተኛ እድገትን ማሳየት ያስፈልጋል
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",በስብስብ ንጥል {0} የአክሲዮን ማስታረቅ በመጠቀም መዘመን አይችልም; ይልቁንስ ስቶክ የገባበት ይጠቀሙ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",በስብስብ ንጥል {0} የአክሲዮን ማስታረቅ በመጠቀም መዘመን አይችልም; ይልቁንስ ስቶክ የገባበት ይጠቀሙ
 DocType: Quality Inspection,Report Date,ሪፖርት ቀን
 DocType: Student,Middle Name,የአባት ስም
 DocType: C-Form,Invoices,ደረሰኞች
@@ -4356,20 +4383,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ደረሰኝ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ደረሰኝ
 ,Sales Register,የሽያጭ መመዝገቢያ
 DocType: Daily Work Summary Group,Send Emails At,ላይ ኢሜይሎች ላክ
 DocType: Quotation,Quotation Lost Reason,ጥቅስ የጠፋ ምክንያት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,አርትዕ ለማድረግ ምንም ነገር የለም.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,የቅፅ እይታ
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,የወጪ ፍቃድ አስገዳጅ በክፍያ ጥያቄ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",ከርስዎ ውጭ ሌሎችን ወደ እርስዎ ድርጅት ያክሏቸው.
 DocType: Customer Group,Customer Group Name,የደንበኛ የቡድን ስም
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ገና ምንም ደንበኞች!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,ምንም የተፈጥሮ ጥያቄ አልተፈጠረም
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ፈቃድ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,እናንተ ደግሞ ካለፈው በጀት ዓመት ሚዛን በዚህ የበጀት ዓመት ወደ ቅጠሎች ማካተት የሚፈልጉ ከሆነ ወደፊት አኗኗራችሁ እባክዎ ይምረጡ
@@ -4392,11 +4420,12 @@
 DocType: Vehicle,Chassis No,ለጥንካሬ ምንም
 DocType: Payment Request,Initiated,A ነሳሽነት
 DocType: Production Plan Item,Planned Start Date,የታቀደ መጀመሪያ ቀን
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,እባክዎን BOM ይምረጡ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,እባክዎን BOM ይምረጡ
 DocType: Purchase Invoice,Availed ITC Integrated Tax,በ ITC የተዋቀረ ቀረጥ አግኝቷል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
+DocType: Bank Guarantee,Clauses and Conditions,ደንቦች እና ሁኔታዎች
 DocType: Serial No,Creation Document Type,የፍጥረት የሰነድ አይነት
 DocType: Project Task,View Timesheet,የጊዜ ሠንጠረዥ ይመልከቱ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,የማብቂያ ቀን ከመጀመሪያ ቀን በላይ መሆን አለበት
 DocType: Leave Type,Is Encash,Encash ነው
 DocType: Leave Allocation,New Leaves Allocated,አዲስ ቅጠሎች የተመደበ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ፕሮጀክት-ጥበብ ውሂብ ትዕምርተ አይገኝም
@@ -4410,9 +4439,10 @@
 DocType: Patient,Alcohol Current Use,የአልኮል መጠጥ አጠቃቀም
 DocType: Student Admission Program,Student Admission Program,የተማሪ መግቢያ ፕሮግራም
 DocType: Payment Entry,Account Paid To,መለያ ወደ የሚከፈልበት
+DocType: Subscription Settings,Grace Period,ያለመቀጫ ክፍያ የሚከፈልበት ጊዜ
 DocType: Item Alternative,Alternative Item Name,ተለዋጭ እቃ ስም
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,የወላጅ ንጥል {0} አንድ የአክሲዮን ንጥል መሆን የለበትም
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ማንኛውም የደመወዝ ወረቀት ማስገባት አልተቻለም <br> \ ሊሆኑ የሚችሉ ምክንያቶች <br> 1. የተጣራ ደት ከ 0 ያነሰ ነው. <br> \ 2. በሠራተሪ ጌታው የተገለፀ የኢሚዩኤል አድራሻ አይሰራም. <br>
@@ -4422,7 +4452,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},መለያ {0} በጀት {1} ላይ {2} {3} ነው {4}. ይህ በ መብለጥ ይሆናል {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ብዛት ውጪ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,እና ያልተነካነ በ ውስጥ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,ተከታታይ ግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,የፋይናንስ አገልግሎቶች
 DocType: Student Sibling,Student ID,የተማሪ መታወቂያ
@@ -4434,14 +4463,16 @@
 DocType: Complaint,Complaint,ቅሬታ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,የክፍያ ተመላሽ ማድረግ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,ሁሉም መምሪያዎች
 DocType: Patient,Alcohol Past Use,አልኮል ጊዜ ያለፈበት አጠቃቀም
 DocType: Fertilizer Content,Fertilizer Content,የማዳበሪያ ይዘት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,CR
 DocType: Project Update,Problematic/Stuck,ችግር / ያልተቆራረጠ
 DocType: Tax Rule,Billing State,አከፋፈል መንግስት
 DocType: Share Transfer,Transfer,ያስተላልፉ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ይህን የሽያጭ ትእዛዝን ከመሰረዝዎ በፊት የስራ ትዕዛዝ {0} መሰረዝ አለበት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
 DocType: Authorization Rule,Applicable To (Employee),የሚመለከታቸው ለማድረግ (ሰራተኛ)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
@@ -4465,10 +4496,11 @@
 DocType: Cheque Print Template,Message to show,መልዕክት ለማሳየት
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,ችርቻሮ
 DocType: Student Attendance,Absent,ብርቅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,የምርት ጥቅል
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,የምርት ጥቅል
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,ከ {0} ጀምሮ የሚሰጠውን ውጤት ማግኘት አልተቻለም. ከ 0 እስከ 100 የሚደርሱ የተቆለፉ ደረጃዎች ሊኖሩዎት ይገባል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ረድፍ {0}: ልክ ያልሆነ ማጣቀሻ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ግብር እና ክፍያዎች አብነት ይግዙ
+DocType: Subscription,Current Invoice Start Date,የአሁኑ ደረሰኝ የመጀመሪያ ቀን
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: የዴቢት ወይም የክሬዲት መጠን ወይ ያስፈልጋል {2}
 DocType: GL Entry,Remarks,አስተያየት
@@ -4478,11 +4510,13 @@
 DocType: Task,Parent Task,የወላጅ ተግባር
 DocType: Journal Entry,Write Off Based On,ላይ የተመሠረተ ላይ ጠፍቷል ይጻፉ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ሊድ አድርግ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,አትም የጽህፈት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,አትም የጽህፈት
 DocType: Stock Settings,Show Barcode Field,አሳይ ባርኮድ መስክ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ደመወዝ አስቀድሞ {0} እና {1}, ለዚህ የቀን ክልል መካከል ሊሆን አይችልም የማመልከቻ ጊዜ ተወው መካከል ለተወሰነ ጊዜ በሂደት ላይ."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ደመወዝ አስቀድሞ {0} እና {1}, ለዚህ የቀን ክልል መካከል ሊሆን አይችልም የማመልከቻ ጊዜ ተወው መካከል ለተወሰነ ጊዜ በሂደት ላይ."
+DocType: Fiscal Year,Auto Created,በራሱ የተፈጠረ
 DocType: Chapter Member,Leave Reason,ምክንያትን ተው
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ደረሰኝ {0} ከአሁን በኋላ የለም
 DocType: Guardian Interest,Guardian Interest,አሳዳጊ የወለድ
 DocType: Volunteer,Availability,መገኘት
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,ለ POS መጋሪያዎች ነባሪ ዋጋዎችን ያዋቅሩ
@@ -4490,14 +4524,13 @@
 DocType: Project,Time to send,ለመላክ ሰዓት
 DocType: Timesheet,Employee Detail,የሰራተኛ ዝርዝር
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ኢሜይል መታወቂያ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,በሚቀጥለው ቀን ቀን እና እኩል መሆን አለበት ወር ቀን ላይ ይድገሙ
 DocType: Lab Prescription,Test Code,የሙከራ ኮድ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ድር መነሻ ገጽ ቅንብሮች
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},በ {0} ነጥብ የምርጫ ካርድ ደረጃ ምክንያት በ {0} አይፈቀድም RFQs አይፈቀዱም.
 DocType: Job Offer,Awaiting Response,ምላሽ በመጠባበቅ ላይ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ከላይ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ጠቅላላ መጠን {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ጠቅላላ መጠን {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,መጥቀስ መደበኛ ያልሆኑ ተከፋይ ሂሳብ ከሆነ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',&#39;ሁሉም ግምገማ ቡድኖች&#39; ይልቅ ሌላ ግምገማ ቡድን ይምረጡ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ረድፍ {0}: ወለድ ማዕከሉን ለአንድ ንጥል {1} ያስፈልጋል
@@ -4508,7 +4541,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,የውሃ ትንተና
 DocType: Chapter,Region,ክልል
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ከተፈለገ. ይህ ቅንብር በተለያዩ ግብይቶችን ለማጣራት ጥቅም ላይ ይውላል.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
 DocType: Holiday List,Weekly Off,ሳምንታዊ አጥፋ
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,የተገናኙን ትንታኔ ዳግም ለመጫን
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ለምሳሌ በ 2012, 2012-13 ለ"
@@ -4524,7 +4557,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,በመዛጉ ንብረት ዋጋ
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ወጪ ማዕከል ንጥል ግዴታ ነው; {2}
 DocType: Vehicle,Policy No,መመሪያ የለም
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
 DocType: Asset,Straight Line,ቀጥተኛ መስመር
 DocType: Project User,Project User,የፕሮጀክት ተጠቃሚ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,ሰነጠቀ
@@ -4560,21 +4593,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,ዱካ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ይህ ልጅ መገናኛ ነጥቦች አሉት እንደ የመቁጠር ወደ ወጪ ማዕከል መለወጥ አይቻልም
 DocType: Production Plan,Total Planned Qty,የታቀደ አጠቃላይ ቅደም ተከተል
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,በመክፈት ላይ እሴት
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,በመክፈት ላይ እሴት
 DocType: Salary Detail,Formula,ፎርሙላ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,ተከታታይ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,ተከታታይ #
 DocType: Lab Test Template,Lab Test Template,የሙከራ መለኪያ አብነት
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,የሽያጭ መለያ
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,የሽያጭ መለያ
 DocType: Purchase Invoice Item,Total Weight,ጠቅላላ ክብደት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,የሽያጭ ላይ ኮሚሽን
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,የሽያጭ ላይ ኮሚሽን
 DocType: Job Offer Term,Value / Description,እሴት / መግለጫ
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
 DocType: Purchase Order Item,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
 DocType: Restaurant Order Entry,Restaurant Order Entry,የምግብ ቤት የመግቢያ ግቢ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ዴቢት እና የብድር {0} ለ # እኩል አይደለም {1}. ልዩነት ነው; {2}.
 DocType: Asset Maintenance Task,Assign To Name,ወደ ስም ሰይም
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,መዝናኛ ወጪ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,መዝናኛ ወጪ
 DocType: Hub Settings,Enabled Users,የነቁ ተጠቃሚዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,የቁስ ጥያቄ አድርግ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ክፍት ንጥል {0}
@@ -4587,24 +4620,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ፈቃድን መተግበሪያዎች.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,ነባር የግብይት ጋር መለያ ሊሰረዝ አይችልም
 DocType: Vehicle,Last Carbon Check,የመጨረሻው ካርቦን ፈትሽ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,የህግ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,የህግ ወጪዎች
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,ረድፍ ላይ ብዛት ይምረጡ
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,ክፍት ሽያጭ እና የግዢ ደረሰኞችን ይክፈቱ
 DocType: Purchase Invoice,Posting Time,መለጠፍ ሰዓት
 DocType: Timesheet,% Amount Billed,% መጠን የሚከፈል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,የስልክ ወጪ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,የስልክ ወጪ
 DocType: Sales Partner,Logo,አርማ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ሳያስቀምጡ በፊት ተከታታይ ለመምረጥ ተጠቃሚው ለማስገደድ የሚፈልጉ ከሆነ ይህን ምልክት ያድርጉ. ይህን ለማረጋገጥ ከሆነ ምንም ነባሪ ይሆናል.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},ተከታታይ ምንም ጋር ምንም ንጥል {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},ተከታታይ ምንም ጋር ምንም ንጥል {0}
 DocType: Email Digest,Open Notifications,ክፍት ማሳወቂያዎች
 DocType: Payment Entry,Difference Amount (Company Currency),ልዩነት መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ቀጥተኛ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ቀጥተኛ ወጪዎች
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,አዲስ ደንበኛ ገቢ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,የጉዞ ወጪ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,የጉዞ ወጪ
 DocType: Maintenance Visit,Breakdown,መሰባበር
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ብጁ ዶሴ ዶክተሩን በዶክትሪፕስ {0} ውስጥ ያክሉ
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
 DocType: Purchase Receipt Item,Sample Quantity,ናሙና መጠኑ
+DocType: Bank Guarantee,Name of Beneficiary,የዋና ተጠቃሚ ስም
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",በቅርብ ጊዜ የተመን ዋጋ / የዋጋ ዝርዝር / በመጨረሻው የጥሬ ዕቃ ዋጋ ላይ በመመርኮዝ የወኪል ማስተካከያውን በጊዜ መርሐግብር በኩል በራስሰር ያስከፍላል.
 DocType: Bank Reconciliation Detail,Cheque Date,ቼክ ቀን
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},መለያ {0}: የወላጅ መለያ {1} ኩባንያ የእርሱ ወገን አይደለም: {2}
@@ -4616,14 +4649,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,የሥራ ልማድ የሚፈትን ጊዜ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ደመወዝ ክፍሎች
 DocType: Program Enrollment Tool,New Academic Year,አዲስ የትምህርት ዓመት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
 DocType: Stock Settings,Auto insert Price List rate if missing,ራስ-ያስገቡ ዋጋ ዝርዝር መጠን ይጎድለዋል ከሆነ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ጠቅላላ የሚከፈልበት መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ጠቅላላ የሚከፈልበት መጠን
 DocType: GST Settings,B2C Limit,B2C ገደብ
 DocType: Work Order Item,Transferred Qty,ተላልፈዋል ብዛት
 apps/erpnext/erpnext/config/learn.py +11,Navigating,በመዳሰስ ላይ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ማቀድ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ማቀድ
 DocType: Share Balance,Issued,የተሰጠበት
+DocType: Loan,Repayment Start Date,የክፍያ ቀን ጅምር
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,የተማሪ እንቅስቃሴ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,አቅራቢ መታወቂያ
 DocType: Payment Request,Payment Gateway Details,ክፍያ ፍኖት ዝርዝሮች
@@ -4636,10 +4670,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ድንገተኛ እንደ ቅጠል አይነት, ታሞ ወዘተ"
 DocType: Email Digest,Send regular summary reports via Email.,በኢሜይል በኩል መደበኛ የማጠቃለያ ሪፖርቶች ላክ.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 DocType: Assessment Result,Student Name,የተማሪ ስም
 DocType: Brand,Item Manager,ንጥል አስተዳዳሪ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,ተከፋይ የመክፈል ዝርዝር
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,ተከፋይ የመክፈል ዝርዝር
 DocType: Buying Settings,Default Supplier Type,ነባሪ አቅራቢ አይነት
 DocType: Plant Analysis,Collection Datetime,የስብስብ ጊዜ
 DocType: Work Order,Total Operating Cost,ጠቅላላ ማስኬጃ ወጪ
@@ -4649,9 +4683,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,አባል {0} የለም
 DocType: Payment Term,Day(s) after invoice date,ቀን (ኦች) ከደረሰኝ ቀን በኋላ
 DocType: Payment Schedule,Payment Schedule,የክፍያ ዕቅድ
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ማላጠር
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,የክፍያ Entry አስቀድሞ አለ
+DocType: Subscription,Trial Period End Date,የሙከራ ክፍለ ጊዜ መጨረሻ ቀን
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ገደብ አልፏል ጀምሮ authroized አይደለም
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ደመወዝ አብነት ጌታቸው.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,ፓዮሎጂ
@@ -4668,9 +4702,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,የሚመራ ወይም ደንበኞች ወደ በመጥቀስ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ሚና የታሰረው የአክሲዮን አርትዕ ማድረግ ተፈቅዷል
 ,Territory Target Variance Item Group-Wise,ክልል ዒላማ ልዩነት ንጥል ቡድን ጥበበኛ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,የግብር መለጠፊያ የግዴታ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,መለያ {0}: የወላጅ መለያ {1} የለም
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ዋጋ ዝርዝር ተመን (የኩባንያ የምንዛሬ)
@@ -4679,14 +4713,15 @@
 DocType: Lab Prescription,Test Created,ሙከራ ተፈጥሯል
 DocType: Healthcare Settings,Custom Signature in Print,በፋርማ ውስጥ ብጁ ፊርማ
 DocType: Account,Temporary,ጊዜያዊ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,የደንበኛ LPO ቁጥር
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,የደንበኛ LPO ቁጥር
 DocType: Program,Courses,ኮርሶች
 DocType: Monthly Distribution Percentage,Percentage Allocation,መቶኛ ምደባዎች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,ጸሐፊ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,ጸሐፊ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","አቦዝን ከሆነ, መስክ ቃላት ውስጥ &#39;ምንም ግብይት ውስጥ የሚታይ አይሆንም"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ይህ እርምጃ የወደፊት የክፍያ መጠየቂያ ሂሳብን ያቆማል. እርግጠኛ ነዎት ይህን የደንበኝነት ምዝገባ መሰረዝ ይፈልጋሉ?
 DocType: Serial No,Distinct unit of an Item,አንድ ንጥል ላይ የተለዩ አሃድ
 DocType: Supplier Scorecard Criteria,Criteria Name,የመመዘኛ ስም
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,ኩባንያ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,ኩባንያ ማዘጋጀት እባክዎ
 DocType: Pricing Rule,Buying,ሊገዙ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,በሽታዎች እና ማዳበሪያዎች
 DocType: HR Settings,Employee Records to be created by,ሠራተኛ መዛግብት መፈጠር አለበት
@@ -4695,17 +4730,17 @@
 DocType: POS Profile,Apply Discount On,ቅናሽ ላይ ተግብር
 DocType: Member,Membership Type,የአባላት ዓይነት
 ,Reqd By Date,Reqd ቀን በ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,አበዳሪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,አበዳሪዎች
 DocType: Assessment Plan,Assessment Name,ግምገማ ስም
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC ን በህትመት ውስጥ አሳይ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC ን በህትመት ውስጥ አሳይ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,የረድፍ # {0}: መለያ ምንም ግዴታ ነው
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ንጥል ጥበበኛ የግብር ዝርዝር
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,የስራ እድል
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ተቋም ምህፃረ ቃል
 ,Item-wise Price List Rate,ንጥል-ጥበብ ዋጋ ዝርዝር ተመን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,አቅራቢው ትዕምርተ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,አቅራቢው ትዕምርተ
 DocType: Quotation,In Words will be visible once you save the Quotation.,የ ትዕምርተ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ብዛት ({0}) ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ብዛት ({0}) ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
@@ -4723,7 +4758,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ጠቅላላ ልዩነት
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","የነቃ ከሆነ, ስርዓት በራስ ሰር ክምችት ለ የሂሳብ ግቤቶች መለጠፍ ነው."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,የደላላ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ሠራተኛ {0} ክትትልን ቀድሞውኑ ለዚህ ቀን ምልክት ነው
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ሠራተኛ {0} ክትትልን ቀድሞውኑ ለዚህ ቀን ምልክት ነው
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",ደቂቃዎች ውስጥ «ጊዜ Log&quot; በኩል ዘምኗል
 DocType: Customer,From Lead,ሊድ ከ
@@ -4734,6 +4769,7 @@
 DocType: Lab Test,Approved Date,የተፈቀደበት ቀን
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,ቢያንስ አንድ መጋዘን የግዴታ ነው
+DocType: Subscriber,Subscriber Name,የተመዝጋቢ ስም
 DocType: Serial No,Out of Warranty,የዋስትና ውጪ
 DocType: BOM Update Tool,Replace,ተካ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ምንም ምርቶች አልተገኙም.
@@ -4748,13 +4784,13 @@
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,የሰው ኃይል
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,የክፍያ ማስታረቅ ክፍያ
 DocType: Disease,Treatment Task,የሕክምና ተግባር
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,የግብር ንብረቶች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,የግብር ንብረቶች
 DocType: BOM Item,BOM No,BOM ምንም
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ጆርናል Entry {0} {1} ወይም አስቀድመው በሌሎች ቫውቸር ጋር የሚዛመድ መለያ የለውም
 DocType: Item,Moving Average,በመውሰድ ላይ አማካኝ
 DocType: BOM Update Tool,The BOM which will be replaced,የሚተካ የ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,የኤሌክትሮኒክ ዕቃዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,የኤሌክትሮኒክ ዕቃዎች
 DocType: Asset,Maintenance Required,ጥገና ይጠበቃል
 DocType: Account,Debit,ዴቢት
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ቅጠሎች 0.5 ላይ ብዜት ውስጥ ይመደባል አለበት
@@ -4763,7 +4799,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ያልተከፈሉ Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,አዘጋጅ ግቦች ንጥል ቡድን-ጥበብ ይህን የሽያጭ ሰው ነውና.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],እሰር አክሲዮኖች የቆየ ይልቅ [ቀኖች]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,የረድፍ # {0}: ንብረት ቋሚ ንብረት ግዢ / ለሽያጭ ግዴታ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,የረድፍ # {0}: ንብረት ቋሚ ንብረት ግዢ / ለሽያጭ ግዴታ ነው
 DocType: Asset Maintenance Team,Maintenance Team Name,የጥገና ቡድን ስም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ሁለት ወይም ከዚያ በላይ የዋጋ ደንቦች ከላይ ሁኔታዎች ላይ ተመስርቶ አልተገኙም ከሆነ, ቅድሚያ ተፈጻሚ ነው. ነባሪ እሴት ዜሮ (ባዶ) ነው እያለ ቅድሚያ 20 0 መካከል ያለ ቁጥር ነው. ከፍተኛ ቁጥር ተመሳሳይ ሁኔታዎች ጋር በርካታ የዋጋ ደንቦች አሉ ከሆነ የበላይነቱን የሚወስዱ ይሆናል ማለት ነው."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,&#39;Opportunity From&#39; ከታወቀ ደንበኛው እንደ ደንበኛ ከተመረጠ ወሳኝ ነው
@@ -4772,19 +4808,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,የሚከተሉት ተጠቃሚዎች የማገጃ ቀናት ፈቃድ መተግበሪያዎች ማጽደቅ ፍቀድ.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,የወጪ የይገባኛል ዓይነቶች.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ንጥል ፍጥነት መሸጥ {0} ያነሰ ነው ያለው {1}. ተመን መሸጥ መሆን አለበት atleast {2}
-DocType: Item,Taxes,ግብሮች
+DocType: Subscription,Taxes,ግብሮች
 DocType: Purchase Invoice,capital goods,የካፒታል ዕቃዎች
 DocType: Purchase Invoice Item,Weight Per Unit,ክብደት በያንዳንዱ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,የሚከፈልበት እና ደርሷል አይደለም
 DocType: Project,Default Cost Center,ነባሪ ዋጋ ማዕከል
-DocType: Bank Guarantee,End Date,የመጨረሻ ቀን
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,የክምችት ግብይቶች
 DocType: Budget,Budget Accounts,በጀት መለያዎች
 DocType: Employee,Internal Work History,ውስጣዊ የሥራ ታሪክ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,ሲጠራቀሙ የእርጅና መጠን
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,የግል ፍትህ
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,የአቅራቢ መለኪያ ጥቅል ተለዋዋጭ
-DocType: Employee Loan,Fully Disbursed,ሙሉ በሙሉ በመገኘቱ
 DocType: Employee Advance,Due Advance Amount,የሚከፈል የቅድሚያ ክፍያ መጠን
 DocType: Maintenance Visit,Customer Feedback,የደንበኛ ግብረ መልስ
 DocType: Account,Expense,ወጭ
@@ -4808,7 +4842,7 @@
 ,Employee Information,የሰራተኛ መረጃ
 DocType: Stock Entry Detail,Additional Cost,ተጨማሪ ወጪ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
 DocType: Quality Inspection,Incoming,ገቢ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ለሽያጭ እና ለግዢ ነባሪ የግብር አብነቶች ተፈጥረዋል.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,የአመሳሾቹ ውጤት ዘገባ {0} አስቀድሞም ይገኛል.
@@ -4816,7 +4850,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',የቡድን በ «ኩባንያ &#39;ከሆነ ኩባንያ ባዶ ማጣሪያ ያዘጋጁ እባክዎ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,መለጠፍ ቀን ወደፊት ቀን ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ተደጋጋሚውን ለመፍጠር
 DocType: Stock Entry,Target Warehouse Address,የዒላማ መሸጫ ቤት አድራሻ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,ተራ ፈቃድ
 DocType: Agriculture Task,End Day,የመጨረሻ ቀን
@@ -4841,11 +4874,10 @@
 DocType: Material Request,% Ordered,% የዕቃው መረጃ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","የትምህርት የተመሠረተ የተማሪዎች ቡድን, የቀየረ ፕሮግራም ምዝገባ ውስጥ የተመዘገቡ ኮርሶች ጀምሮ ለእያንዳንዱ ተማሪ ሊረጋገጥ ይሆናል."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ጭማቂዎች
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
 DocType: Share Balance,From No,ከ
 DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
 DocType: Employee,History In Company,ኩባንያ ውስጥ ታሪክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},አዲስ መልዕክት ከ {ላኪ}
 DocType: Customer,Customer Primary Address,የደንበኛ ዋና አድራሻ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ጋዜጣዎች
 DocType: Drug Prescription,Description/Strength,መግለጫ / ጥንካሬ
@@ -4854,22 +4886,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ተመሳሳይ ንጥል በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Department,Leave Block List,አግድ ዝርዝር ውጣ
 DocType: Purchase Invoice,Tax ID,የግብር መታወቂያ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. አምድ ባዶ መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. አምድ ባዶ መሆን አለበት
 DocType: Accounts Settings,Accounts Settings,ቅንብሮች መለያዎች
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,ማጽደቅ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","ያልተለወጠ አድራሻ ለ {0}, ለመቀጠል እባክዎ ያስተካክሉ."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","ያልተለወጠ አድራሻ ለ {0}, ለመቀጠል እባክዎ ያስተካክሉ."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","የአዳዲስ መለያ ቁጥር, እንደ ቅጥያ በመለያው ስም ውስጥ ይካተታል"
 DocType: Maintenance Team Member,Team Member,የቡድን አባል
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,ለማስገባት ምንም ውጤት የለም
 DocType: Customer,Sales Partner and Commission,የሽያጭ አጋር እና ኮሚሽን
-DocType: Employee Loan,Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት
+DocType: Loan,Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት
 ,Project Quantity,የፕሮጀክት ብዛት
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
 DocType: Opportunity,To Discuss,ለመወያየት
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
 DocType: Loan Type,Rate of Interest (%) Yearly,የወለድ ምጣኔ (%) ዓመታዊ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,ጊዜያዊ መለያዎች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ጥቁር
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,ጊዜያዊ መለያዎች
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ጥቁር
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ፍንዳታ ንጥል
 DocType: Shareholder,Contact List,የዕውቂያ ዝርዝር
 DocType: Account,Auditor,ኦዲተር
@@ -4877,16 +4909,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,ምርት {0} ንጥሎች
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ተጨማሪ እወቅ
 DocType: Cheque Print Template,Distance from top edge,ከላይ ጠርዝ ያለው ርቀት
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,የዋጋ ዝርዝር {0} ተሰናክሏል ወይም የለም
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,የዋጋ ዝርዝር {0} ተሰናክሏል ወይም የለም
 DocType: Purchase Invoice,Return,ተመለስ
 DocType: Pricing Rule,Disable,አሰናክል
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
 DocType: Project Task,Pending Review,በመጠባበቅ ላይ ያለ ክለሳ
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","እንደ እሴቶች, ተከታታይ ኤሎች, ወዘተ የመሳሰሉ ተጨማሪ አማራጮች ውስጥ ሙሉ ገጽ ውስጥ ያርትዑ."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ቀጠሮዎችና ምክክሮች
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} በ ባች ውስጥ አልተመዘገበም ነው {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",አስቀድሞ እንደ የንብረት {0} በመዛጉ አይችልም {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ቼኮች አስፈላጊ ናቸው
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ቼኮች አስፈላጊ ናቸው
 DocType: Task,Total Expense Claim (via Expense Claim),(የወጪ የይገባኛል በኩል) ጠቅላላ የወጪ የይገባኛል ጥያቄ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ማርቆስ የተዉ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,ኩባንያ ማቀናበር አልተሳካም
@@ -4898,7 +4930,7 @@
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,መርከቦች አስተዳደር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,ከ ንጥሎችን ያክሉ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,ከ ንጥሎችን ያክሉ
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ሰብሎች እና መሬት
 DocType: Cheque Print Template,Regular,መደበኛ
 DocType: Fertilizer,Density (if liquid),ጥፍለቅ (ፈሳሽ ከሆነ)
@@ -4923,24 +4955,26 @@
 DocType: Payment Entry,Paid Amount,የሚከፈልበት መጠን
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,የሽያጭ ዑደት ያስሱ
 DocType: Assessment Plan,Supervisor,ተቆጣጣሪ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,የቁልፍ አስመጪነት ማቆየት
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,የቁልፍ አስመጪነት ማቆየት
 ,Available Stock for Packing Items,ማሸግ ንጥሎች አይገኝም የአክሲዮን
 DocType: Item Variant,Item Variant,ንጥል ተለዋጭ
 ,Work Order Stock Report,የሥራ ትዕዛዝ ክምችት ሪፖርት
+DocType: Purchase Receipt,Auto Repeat Detail,ራስ-ሰር ዝርዝር ድግግሞሽ
 DocType: Assessment Result Tool,Assessment Result Tool,ግምገማ ውጤት መሣሪያ
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,ተቆጣጣሪ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,ምድብ ጥቆማ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ቁራጭ ንጥል
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","አስቀድሞ ዴቢት ውስጥ ቀሪ ሒሳብ, አንተ &#39;ምንጭ&#39; እንደ &#39;ሚዛናዊ መሆን አለብህ&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,የጥራት ሥራ አመራር
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,የጥራት ሥራ አመራር
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
 DocType: Project,Total Billable Amount (via Timesheets),ጠቅላላ የክፍያ መጠን (በዳበጣ ሉሆች በኩል)
 DocType: Agriculture Task,Previous Business Day,ቀዳሚ የስራ ቀን
-DocType: Employee Loan,Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን
+DocType: Loan,Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን
 DocType: Employee,Health Insurance No,የጤና ኢንሹራንስ ቁጥር
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,የብድር ማስታወሻ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,የብድር ማስታወሻ Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,ጠቅላላ የተቆረጠለት መጠን
 DocType: Employee External Work History,Employee External Work History,የተቀጣሪ ውጫዊ የስራ ታሪክ
 DocType: Opening Invoice Creation Tool,Purchase,የግዢ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ሒሳብ ብዛት
@@ -4951,15 +4985,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ለ {1}
 DocType: Healthcare Settings,Valid number of days,ትክክለኛዎቹ ቀናት
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,የወጭ ማዕከላት
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,የደንበኝነት ምዝገባን እንደገና ያስጀምሩ
 DocType: Land Unit,Linked Plant Analysis,የተገናኘ የአትክልት ትንታኔ
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ይህም አቅራቢ ምንዛሬ ላይ ተመን ኩባንያ መሰረታዊ ምንዛሬ በመለወጥ ላይ ነው
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},የረድፍ # {0}: ረድፍ ጋር ጊዜዎች ግጭቶች {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ዜሮ ከግምቱ ተመን ፍቀድ
+DocType: Bank Guarantee,Receiving,መቀበል
 DocType: Training Event Employee,Invited,የተጋበዙ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም በርካታ ገባሪ ደመወዝ መዋቅሮች
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,አዋቅር ጌትዌይ መለያዎች.
 DocType: Employee,Employment Type,የቅጥር ዓይነት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ቋሚ ንብረት
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ቋሚ ንብረት
 DocType: Payment Entry,Set Exchange Gain / Loss,የ Exchange ቅሰም አዘጋጅ / ማጣት
 ,GST Purchase Register,GST ግዢ ይመዝገቡ
 ,Cash Flow,የገንዘብ ፍሰት
@@ -4979,9 +5015,10 @@
 DocType: Academic Term,Term Start Date,የሚለው ቃል መጀመሪያ ቀን
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,የሁሉም የገበያ ግብይቶች ዝርዝር
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp ቆጠራ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},ለማግኘት እባክዎ አባሪ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ሁለቱም የፍርድ ሂደት የመጀመሪያ ቀን እና ሙከራ ክፍለ ጊዜ ማብቂያ ቀን መዘጋጀት አለበት
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,አማካኝ ደረጃ
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ጠቅላላ የክፍያ መጠን በክፍያ ሠንጠረዥ ውስጥ ከትልቅ / ጠቅላላ ድምር ጋር መሆን አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ጠቅላላ የክፍያ መጠን በክፍያ ሠንጠረዥ ውስጥ ከትልቅ / ጠቅላላ ድምር ጋር መሆን አለበት
+DocType: Subscription Plan Detail,Plan,ዕቅድ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,አጠቃላይ የሒሳብ መዝገብ መሠረት የባንክ መግለጫ ቀሪ
 DocType: Job Applicant,Applicant Name,የአመልካች ስም
 DocType: Authorization Rule,Customer / Item Name,ደንበኛ / ንጥል ስም
@@ -5011,6 +5048,7 @@
 DocType: Work Order,Warehouses,መጋዘኖችን
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ንብረት ማስተላለፍ አይቻልም
 DocType: Hotel Room Pricing,Hotel Room Pricing,የሆቴል ዋጋ መወጣት
+DocType: Subscription,Days Until Due,እስከሚደርስ ድረስ
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ይህ ንጥል {0} (አብነት) የሆነ ተለዋጭ ነው.
 DocType: Workstation,per hour,በ ሰዓት
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,የግዥ
@@ -5019,13 +5057,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ባች የተመሠረተ የተማሪዎች ቡድን ለማግኘት, የተማሪዎች ባች በ ፕሮግራም ምዝገባ ከ እያንዳንዱ ተማሪ ሊረጋገጥ ይሆናል."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,የአክሲዮን የመቁጠር ግቤት ይህን መጋዘን የለም እንደ መጋዘን ሊሰረዝ አይችልም.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ስርጭት
+DocType: Journal Entry Account,Loan,ብድር
 DocType: Expense Claim Advance,Expense Claim Advance,የወጪ ማሳሰቢያ ቅደም ተከተል
 DocType: Lab Test,Report Preference,ምርጫ ሪፖርት ያድርጉ
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,የፈቃደኛ መረጃ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
 ,Quoted Item Comparison,የተጠቀሰ ንጥል ንጽጽር
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},በ {0} እና በ {1} መካከል በማቀናጀት ይደራረቡ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,የደንበኞች አገልግሎት
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,የደንበኞች አገልግሎት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ንጥል የሚፈቀደው ከፍተኛ ቅናሽ: {0} {1}% ነው
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,የተጣራ የንብረት እሴት ላይ
 DocType: Crop,Produce,ምርት
@@ -5035,7 +5074,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ለመግጫ ቁሳቁሶች
 DocType: Item Alternative,Alternative Item Code,አማራጭ የንጥል ኮድ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ካልተዋቀረ የብድር ገደብ መብለጥ መሆኑን ግብይቶችን ማቅረብ አይፈቀድም ነው ሚና.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
 DocType: Delivery Stop,Delivery Stop,የማድረስ ማቆሚያ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
 DocType: Item,Material Issue,ቁሳዊ ችግር
@@ -5045,15 +5084,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ሳሙና እና ሳሙና
 DocType: BOM,Show Items,አሳይ ንጥሎች
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ከጊዜ ወደ ጊዜ በላይ ሊሆን አይችልም.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ሁሉንም ደንበኞች በኢሜል ማሳወቅ ይፈልጋሉ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ሁሉንም ደንበኞች በኢሜል ማሳወቅ ይፈልጋሉ?
+DocType: Subscription Plan,Billing Interval,የማስከፈያ ልዩነት
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,የተንቀሳቃሽ ምስል እና ቪዲዮ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,የዕቃው መረጃ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,እንደ ገና መጀመር
 DocType: Hub Settings,Hub Username,የሃብ የተጠቃሚ ስም
 DocType: Salary Detail,Component,ክፍል
 DocType: Assessment Criteria,Assessment Criteria Group,የግምገማ መስፈርት ቡድን
 DocType: Healthcare Settings,Patient Name By,የታካሚ ስም በ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},የደመወዝ ጭማሪ ከ {0} እስከ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},የደመወዝ ጭማሪ ከ {0} እስከ {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
@@ -5067,22 +5106,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","እዚህ ወዘተ ቁመት, ክብደት, አለርጂ, የሕክምና ጉዳዮች ጠብቀን መኖር እንችላለን"
 DocType: Leave Block List,Applies to Company,ኩባንያ የሚመለከተው ለ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
-DocType: Employee Loan,Disbursement Date,ከተዛወሩ ቀን
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ተቀባዮች&#39; አልተገለፀም
+DocType: Loan,Disbursement Date,ከተዛወሩ ቀን
 DocType: BOM Update Tool,Update latest price in all BOMs,በሁሉም የ BOM ዎች ውስጥ የቅርብ ጊዜውን ዋጋ ያዘምኑ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,የህክምና መዝገብ
 DocType: Vehicle,Vehicle,ተሽከርካሪ
 DocType: Purchase Invoice,In Words,ቃላት ውስጥ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,ከማቅረብ በፊት የባንኩ ወይም የአበዳሪ ተቋሙ ስም ያስገቡ.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} መቅረብ አለበት
 DocType: POS Profile,Item Groups,ንጥል ቡድኖች
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ዛሬ {0} »ን የልደት ቀን ነው!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ዛሬ {0} »ን የልደት ቀን ነው!
 DocType: Sales Order Item,For Production,ለምርት
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,እባክዎ በመለያዎች ሰንጠረዥ ውስጥ ጊዜያዊ የመክፈቻ መለያ ያክሉ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,እባክዎ በመለያዎች ሰንጠረዥ ውስጥ ጊዜያዊ የመክፈቻ መለያ ያክሉ
 DocType: Customer,Customer Primary Contact,የደንበኛ ዋና ደረጃ ግንኙነት
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,የዘመኑን ግዜ ጆርናል
 DocType: Project Task,View Task,ይመልከቱ ተግባር
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / በእርሳስ%
+DocType: Bank Guarantee,Bank Guarantee Type,የባንክ ዋስትና ቃል አይነት
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,የገንዘብ መጠየቂያ ደረሰኝ
 ,Asset Depreciations and Balances,የንብረት Depreciations እና ሚዛን
@@ -5093,9 +5133,8 @@
 DocType: Production Plan,Include Subcontracted Items,ንዐስ የተሠሩ ንጥሎችን አካትት
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,የድብደባ ትራንስፖርት ካለ በኋላ ተለዋዋጭ ባህሪያትን መለወጥ አይቻልም. ይህን ለማድረግ አዲስ ንጥል ማዘጋጀት ይኖርብዎታል.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
-DocType: Employee Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+DocType: Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
 DocType: Leave Application,LAP/,ጭን /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
 DocType: Salary Slip,Salary Slip,የቀጣሪ
@@ -5119,11 +5158,11 @@
 DocType: Employee Education,Employee Education,የሰራተኛ ትምህርት
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ንጥል ቡድን ሠንጠረዥ ውስጥ አልተገኘም አባዛ ንጥል ቡድን
 DocType: Land Unit,Parent Land Unit,ወላጅ መሬት መለኪያ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
 DocType: Fertilizer,Fertilizer Name,የማዳበሪያ ስም
 DocType: Salary Slip,Net Pay,የተጣራ ክፍያ
 DocType: Cash Flow Mapping Accounts,Account,ሒሳብ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,ተከታታይ አይ {0} አስቀድሞ ደርሷል
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,ተከታታይ አይ {0} አስቀድሞ ደርሷል
 ,Requested Items To Be Transferred,ተጠይቋል ንጥሎች መወሰድ
 DocType: Expense Claim,Vehicle Log,የተሽከርካሪ ምዝግብ ማስታወሻ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ትኩሳት (የሙቀት&gt; 38.5 ° ሴ / 101.3 ° ፋ ወይም ዘላቂነት&gt; 38 ° C / 100.4 ° ፋ)
@@ -5164,39 +5203,39 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
 DocType: Asset Maintenance,Manufacturing User,ማኑፋክቸሪንግ ተጠቃሚ
 DocType: Purchase Invoice,Raw Materials Supplied,ጥሬ እቃዎች አቅርቦት
-DocType: C-Form,Series,ተከታታይ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},የዋጋ ዝርዝር {0} ልኬት {1} ወይም {2} መሆን አለበት
 DocType: Appraisal,Appraisal Template,ግምገማ አብነት
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,ንጥል ምደባ
 DocType: Driver,License Number,የፍቃድ ቁጥር
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,የንግድ ልማት ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,የንግድ ልማት ሥራ አስኪያጅ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ጥገና ይጎብኙ ዓላማ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,የህመምተኞች ምዝገባ ደረሰኝ
 DocType: Crop,Period,ወቅት
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,አጠቃላይ የሒሳብ መዝገብ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ላይ ፈቃድ ላይ ሠራተኛ {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ላይ ፈቃድ ላይ ሠራተኛ {0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ይመልከቱ እርሳሶች
 DocType: Program Enrollment Tool,New Program,አዲስ ፕሮግራም
 DocType: Item Attribute Value,Attribute Value,ዋጋ ይስጡ
 ,Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር
 DocType: Salary Detail,Salary Detail,ደመወዝ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
 DocType: Appointment Type,Physician,ሐኪም
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ምክክሮች
 DocType: Sales Invoice,Commission,ኮሚሽን
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,የአምራች ሰዓት ሉህ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ድምር
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ከምርት ግብይት በኋላ ተለዋዋጭ ባህሪያትን መለወጥ አይቻልም. ይህን ለማድረግ አዲስ ንጥል ማዘጋጀት ይኖርብዎታል.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,የ GoCardless SEPA ኃላፊ
 DocType: Physician,Charges,ክፍያዎች
 DocType: Production Plan,Get Items For Work Order,ለስራ ትእዛዝ ዕቃዎችን ያግኙ
 DocType: Salary Detail,Default Amount,ነባሪ መጠን
 DocType: Lab Test Template,Descriptive,ገላጭ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
 DocType: Quality Inspection Reading,Quality Inspection Reading,የጥራት ምርመራ ንባብ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,ለኩባንያዎ ሊያገኙት የሚፈልጉትን የሽያጭ ግብ ያዘጋጁ.
 ,Project wise Stock Tracking,ፕሮጀክት ጥበበኛ የአክሲዮን ክትትል
@@ -5224,11 +5263,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ድር ጣቢያ መፍጠር አልተሳካም
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ልወጣ ዝርዝር
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,የማቆየት የውጭ አክሲዮን ቀድሞውኑ ተፈጥሯል ወይም ናሙና አልቀረበም
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,የማቆየት የውጭ አክሲዮን ቀድሞውኑ ተፈጥሯል ወይም ናሙና አልቀረበም
 DocType: Program,Program Abbreviation,ፕሮግራም ምህፃረ ቃል
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው
 DocType: Warranty Claim,Resolved By,በ የተፈታ
-DocType: Bank Guarantee,Start Date,ቀን ጀምር
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ለተወሰነ ጊዜ ቅጠል ይመድባሉ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques እና ተቀማጭ ትክክል ጸድቷል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,መለያ {0}: አንተ ወላጅ መለያ ራሱን እንደ መመደብ አይችሉም
@@ -5243,11 +5281,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ሰዓቶች
 DocType: Project,Expected Start Date,የሚጠበቀው መጀመሪያ ቀን
 DocType: Purchase Invoice,04-Correction in Invoice,04-በቅርስ ውስጥ ማስተካከያ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,የሥራ ቦርድ ቀደም ሲል ለ BOM ከተዘጋጁ ነገሮች ሁሉ ቀድሞ ተፈጥሯል
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,የሥራ ቦርድ ቀደም ሲል ለ BOM ከተዘጋጁ ነገሮች ሁሉ ቀድሞ ተፈጥሯል
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,የተራዘመ የዝርዝር ሪፖርት
 DocType: Setup Progress Action,Setup Progress Action,የማዘጋጀት ሂደት የእንቅስቃሴ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,የዋጋ ዝርዝርን መግዛት
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,የዋጋ ዝርዝርን መግዛት
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ክስ ይህ ንጥል ተገቢነት አይደለም ከሆነ ንጥል አስወግድ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,የደንበኝነት ምዝገባን ተወው
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,እባክዎ የጥገና ሁኔታ እንደተጠናቀቀ ይምረጡ ወይም የተጠናቀቀው ቀንን ያስወግዱ
 DocType: Supplier,Default Payment Terms Template,ነባሪ የክፍያ ውል አብነት
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,የግብይት ምንዛሬ ክፍያ ማስተናገጃ ምንዛሬ ጋር አንድ አይነት መሆን አለበት
@@ -5258,7 +5297,6 @@
 DocType: Employee,Educational Qualification,ተፈላጊ የትምህርት ደረጃ
 DocType: Workstation,Operating Costs,ማስኬጃ ወጪዎች
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,እርምጃ ወርኃዊ በጀት የታለፈው ሲጠራቀሙ ከሆነ
-DocType: Subscription,Submit on creation,ፍጥረት ላይ አስገባ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
 DocType: Asset,Disposal Date,ማስወገድ ቀን
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","እነርሱ በዓል ከሌለዎት ኢሜይሎችን, በተሰጠው ሰዓት ላይ ኩባንያ ሁሉ ንቁ ሠራተኞች ይላካል. ምላሾች ማጠቃለያ እኩለ ሌሊት ላይ ይላካል."
@@ -5276,6 +5314,7 @@
 DocType: Batch,Parent Batch,የወላጅ ባች
 DocType: Cheque Print Template,Cheque Print Template,ቼክ የህትመት አብነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ወጪ ማዕከላት ገበታ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,የደንበኝነት ምዝገባን ከመሰረዝዎ ወይም ምዝገባው እንደማይከፈል ከመመዝገብ በፊት የክፍያ መጠየቂያ ቀን ካለፈ በኋላ ያሉት ቀናት
 DocType: Lab Test Template,Sample Collection,የናሙና ስብስብ
 ,Requested Items To Be Ordered,ተጠይቋል ንጥሎች ሊደረደር ወደ
 DocType: Price List,Price List Name,የዋጋ ዝርዝር ስም
@@ -5284,7 +5323,7 @@
 DocType: Account,Income,ገቢ
 DocType: Industry Type,Industry Type,ኢንዱስትሪ አይነት
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,የሆነ ስህተት ተከስቷል!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,ማስጠንቀቂያ: ውጣ መተግበሪያ የሚከተለውን የማገጃ ቀናት ይዟል
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,ማስጠንቀቂያ: ውጣ መተግበሪያ የሚከተለውን የማገጃ ቀናት ይዟል
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,የደረሰኝ {0} አስቀድሞ ገብቷል የሽያጭ
 DocType: Supplier Scorecard Scoring Criteria,Score,ግብ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,በጀት ዓመት {0} የለም
@@ -5304,12 +5343,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,ነጥብ-መካከል-ሽያጭ መገለጫ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} በ 0 እና 100 መካከል የሆነ እሴት መሆን አለበት
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,የሚቀጥለው የአለሜሽን ቀን ከመደበኛ ጋር የሚውል ቀን ከመሆኑ በፊት ሊሆን አይችልም
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ደህንነቱ ያልተጠበቀ ብድሮች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,ደህንነቱ ያልተጠበቀ ብድሮች
 DocType: Cost Center,Cost Center Name,ኪሳራ ማዕከል ስም
 DocType: Student,B+,ለ +
 DocType: HR Settings,Max working hours against Timesheet,ከፍተኛ Timesheet ላይ ሰዓት መስራት
 DocType: Maintenance Schedule Detail,Scheduled Date,የተያዘለት ቀን
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ጠቅላላ የክፍያ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ጠቅላላ የክፍያ Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ቁምፊዎች በላይ መልዕክቶች በርካታ መልዕክቶች ይከፋፈላሉ
 DocType: Purchase Receipt Item,Received and Accepted,ተቀብሏል እና ተቀባይነት
 DocType: Hub Settings,Company and Seller Profile,የኩባንያ እና የሻጭ መገለጫ
@@ -5323,10 +5362,9 @@
 DocType: Item,Variant Based On,ተለዋጭ የተመረኮዘ ላይ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,የእርስዎ አቅራቢዎች
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,እባክዎ ያስተካክሉ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
 DocType: Request for Quotation Item,Supplier Part No,አቅራቢው ክፍል የለም
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,ስም የለሽ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ከ ተቀብሏል
 DocType: Lead,Converted,የተቀየሩ
@@ -5340,6 +5378,7 @@
 DocType: Asset,Assets,ንብረቶች
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,ኮምፕዩተር
 DocType: Item,List this Item in multiple groups on the website.,ድር ላይ በርካታ ቡድኖች ውስጥ ይህን ንጥል ዘርዝር.
+DocType: Subscription,Current Invoice End Date,የአሁኑ የገንዘብ መጠየቂያ ደረሰኝ ቀን
 DocType: Payment Term,Due Date Based On,በመነሻ ላይ የተመሠረተ ቀን
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,እባክዎ በሽያጭ ቅንጅቶች ውስጥ ነባሪ የደንበኛ ቡድን እና ግዛት ያዋቅሩ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} የለም
@@ -5347,7 +5386,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,ንጥል: {0} ሥርዓት ውስጥ የለም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,አንተ ቀጥ እሴት ለማዘጋጀት ፍቃድ አይደለም
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ግቤቶችን ያግኙ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ለጆርናሉ ምዝገባ ምንም ተመላሽ ገንዘቦች አልተመረጡም
 DocType: Payment Reconciliation,From Invoice Date,የደረሰኝ ቀን ጀምሮ
+DocType: Loan,Disbursed,ወጡ
 DocType: Healthcare Settings,Laboratory Settings,የላቦራቶሪ ቅንብሮች
 DocType: Patient Appointment,Service Unit,የአገልግሎት ክፍል
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,አቅራቢውን በተሳካ ሁኔታ አዘጋጅ
@@ -5360,12 +5401,12 @@
 DocType: Share Balance,No of Shares,የአክስቶች ቁጥር
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,ሁኔታን ይምረጡ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
 DocType: Pricing Rule,Pricing Rule Help,የዋጋ አሰጣጥ ደንብ እገዛ
 DocType: School House,House Name,ቤት ስም
 DocType: Fee Schedule,Total Amount per Student,የተማሪ ጠቅላላ ድምር በተማሪ
 DocType: Purchase Taxes and Charges,Account Head,መለያ ኃላፊ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ኤሌክትሪክ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ኤሌክትሪክ
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,የእርስዎ ተጠቃሚዎች እንደ ድርጅት የቀረውን ያክሉ. በተጨማሪም አድራሻዎች ከእነርሱ በማከል ፖርታል ወደ ደንበኞች መጋበዝ ማከል ይችላሉ
 DocType: Stock Entry,Total Value Difference (Out - In),ጠቅላላ ዋጋ ያለው ልዩነት (ውጭ - ውስጥ)
 DocType: Grant Application,Requested Amount,የተጠየቀው መጠን
@@ -5375,7 +5416,7 @@
 DocType: Crop Cycle,Detected Diseases,የተገኙ በሽታዎች
 DocType: Stock Entry,Default Source Warehouse,ነባሪ ምንጭ መጋዘን
 DocType: Item,Customer Code,የደንበኛ ኮድ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
 DocType: Asset Maintenance Task,Last Completion Date,መጨረሻ የተጠናቀቀበት ቀን
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
@@ -5383,9 +5424,10 @@
 DocType: GoCardless Settings,GoCardless Settings,የ GoCardless ቅንጅቶች
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,የክምችት ንብረቶች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,የክምችት ንብረቶች
 DocType: Restaurant,Active Menu,ገባሪ ምናሌ
 DocType: Target Detail,Target Qty,ዒላማ ብዛት
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ከብድር ላይ: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout ቅንብሮች
 DocType: Student Attendance,Present,ስጦታ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,የመላኪያ ማስታወሻ {0} መቅረብ የለበትም
@@ -5394,9 +5436,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
 DocType: Vehicle Log,Odometer,ቆጣሪው
 DocType: Production Plan Item,Ordered Qty,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
 DocType: Chapter,Chapter Head,የምዕራፍ ራስ
 DocType: Payment Term,Month(s) after the end of the invoice month,በወሩ ደረሰኝ ወሩ መጨረሻ ላይ
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,የፕሮጀክት እንቅስቃሴ / ተግባር.
@@ -5404,11 +5446,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ደመወዝ ቡቃያ አመንጭ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,የላብራቶሪ የውጤት ዘመን የቆይታ ጊዜ ከመስጠቱ በፊት ሊሆን አይችልም
 DocType: POS Profile,Allow user to edit Discount,ተጠቃሚ ቅናሽን አርትዕ እንዲያደርግ ይፍቀዱ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ደንበኞችን ያግኙ ከ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ደንበኞችን ያግኙ ከ
 DocType: Purchase Invoice Item,Include Exploded Items,የተበተኑ ንጥሎችን አካት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","የሚመለከታቸው ያህል ሆኖ ተመርጧል ከሆነ መግዛትና, ምልክት መደረግ አለበት {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ቅናሽ ከ 100 መሆን አለበት
 DocType: Shipping Rule,Restrict to Countries,ለአገሮች እገዳ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),መጠን ጠፍቷል ጻፍ (የኩባንያ የምንዛሬ)
 DocType: Sales Invoice Timesheet,Billing Hours,አከፋፈል ሰዓቶች
 DocType: Project,Total Sales Amount (via Sales Order),ጠቅላላ የሽያጭ መጠን (በሽያጭ ትእዛዝ)
@@ -5425,6 +5468,7 @@
 DocType: Soil Texture,Sandy Clay,ሳንዲ ሸክላ
 DocType: Grant Application,Assessment  Manager,የግምገማ አቀናባሪ
 DocType: Payment Entry,Allocate Payment Amount,የክፍያ መጠን ለመመደብ
+DocType: Subscription Plan,Subscription Plan,የምዝገባ ዕቅድ
 DocType: Employee External Work History,Salary,ደመወዝ
 DocType: Serial No,Delivery Document Type,የመላኪያ የሰነድ አይነት
 DocType: Sales Order,Partly Delivered,በከፊል ደርሷል
@@ -5449,9 +5493,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,ጥበቃና ክልል 2
 DocType: SG Creation Tool Course,Max Strength,ከፍተኛ ጥንካሬ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ቅድመ-ቅምዶችን በመጫን ላይ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ለደንበኛ {@} ለማድረስ የማድረሻ መላኪያ አልተሰጠም
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ለደንበኛ {@} ለማድረስ የማድረሻ መላኪያ አልተሰጠም
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM ተተክቷል
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,በሚላክበት ቀን መሰረት የሆኑ ንጥሎችን ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,በሚላክበት ቀን መሰረት የሆኑ ንጥሎችን ይምረጡ
 DocType: Grant Application,Has any past Grant Record,ከዚህ በፊት የተመዝጋቢ መዝገብ አለው
 ,Sales Analytics,የሽያጭ ትንታኔ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ይገኛል {0}
@@ -5469,7 +5513,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ጥሬ እቃዎች አቅርቦት ወጪ
 DocType: Selling Settings,Settings for Selling Module,ሞዱል መሸጥ ቅንብሮች
 DocType: Hotel Room Reservation,Hotel Room Reservation,የሆቴል ክፍል ማስያዣ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,የደንበኞች ግልጋሎት
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,የደንበኞች ግልጋሎት
 DocType: BOM,Thumbnail,ድንክዬ
 DocType: Item Customer Detail,Item Customer Detail,ንጥል የደንበኛ ዝርዝር
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ቅናሽ እጩ አንድ ኢዮብ.
@@ -5485,7 +5529,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} ተማሪዎች ተመዝግበዋል
 DocType: Fees,Student Details,የተማሪ ዝርዝሮች
 DocType: Purchase Invoice Item,Stock Qty,የአክሲዮን ብዛት
-DocType: Employee Loan,Repayment Period in Months,ወራት ውስጥ ብድር መክፈል ክፍለ ጊዜ
+DocType: Loan,Repayment Period in Months,ወራት ውስጥ ብድር መክፈል ክፍለ ጊዜ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ስህተት: ልክ ያልሆነ መታወቂያ?
 DocType: Naming Series,Update Series Number,አዘምን ተከታታይ ቁጥር
 DocType: Account,Equity,ፍትህ
@@ -5494,7 +5538,7 @@
 DocType: Task,Closing Date,መዝጊያ ቀን
 DocType: Sales Order Item,Produced Quantity,ምርት ብዛት
 DocType: Timesheet,Work Detail,የስራ ዝርዝር
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,መሀንዲስ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,መሀንዲስ
 DocType: Journal Entry,Total Amount Currency,ጠቅላላ መጠን ምንዛሬ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,የፍለጋ ንዑስ ትላልቅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},ንጥል ኮድ ረድፍ ምንም ያስፈልጋል {0}
@@ -5539,13 +5583,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ለጋሽ አይነት መረጃ.
 DocType: Request for Quotation,Supplier Detail,በአቅራቢዎች ዝርዝር
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ ስህተት: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,በደረሰኝ የተቀመጠው መጠን
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,በደረሰኝ የተቀመጠው መጠን
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,የመመዘኛ ክብደት እስከ 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,መገኘት
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,የአክሲዮን ንጥሎች
 DocType: BOM,Materials,እቃዎች
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ምልክት አልተደረገበትም ከሆነ, ዝርዝር ተግባራዊ መሆን አለበት የት እያንዳንዱ ክፍል መታከል አለባቸው."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} በመፍጠር ላይ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ምንጭ እና ዒላማ መጋዘን ተመሳሳይ መሆን አይችልም
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,ቀን በመለጠፍ እና ሰዓት መለጠፍ ግዴታ ነው
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ግብይቶች ለመግዛት የግብር አብነት.
@@ -5569,14 +5612,14 @@
 DocType: Shipping Rule,Fixed,ተጠግኗል
 DocType: Vehicle Service,Clutch Plate,ክላች ፕሌት
 DocType: Company,Round Off Account,መለያ ጠፍቷል በዙሪያቸው
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,አስተዳደራዊ ወጪዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,አስተዳደራዊ ወጪዎች
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ማማከር
 DocType: Customer Group,Parent Customer Group,የወላጅ የደንበኞች ቡድን
-DocType: Journal Entry,Subscription,ምዝገባ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,ምዝገባ
 DocType: Purchase Invoice,Contact Email,የዕውቂያ ኢሜይል
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ክፍያ የሚፈጽም ክፍያ
 DocType: Appraisal Goal,Score Earned,የውጤት የተገኙ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,ማስታወቂያ ክፍለ ጊዜ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,ማስታወቂያ ክፍለ ጊዜ
 DocType: Asset Category,Asset Category Name,የንብረት ምድብ ስም
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ይህ ሥር ክልል ነው እና አርትዕ ሊደረግ አይችልም.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,አዲስ የሽያጭ ሰው ስም
@@ -5589,7 +5632,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,እርስዎ ኮርስ ላይ የተመሠረቱ ቡድኖች በማድረግ ላይ ሳለ ባች ከግምት የማይፈልጉ ከሆነ አልተመረጠም ተወው.
 DocType: Asset,Frequency of Depreciation (Months),የእርጅና ድግግሞሽ (ወራት)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,የብድር መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,የብድር መለያ
 DocType: Landed Cost Item,Landed Cost Item,አረፈ ወጪ ንጥል
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ዜሮ እሴቶች አሳይ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ንጥል መጠን በጥሬ ዕቃዎች የተሰጠው መጠን ከ እየቀናነሱ / ማኑፋክቸሪንግ በኋላ አገኘሁ
@@ -5597,7 +5640,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,የሚሰበሰብ / ሊከፈል መለያ
 DocType: Delivery Note Item,Against Sales Order Item,የሽያጭ ትዕዛዝ ንጥል ላይ
 DocType: Hub Settings,Company Logo,የኩባንያ አርማ
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},በጀት ቡድን መለያ ላይ ሊመደብ አይችልም {0}
 DocType: Healthcare Settings,Patient Registration,ታካሚ ምዝገባ
@@ -5631,11 +5674,10 @@
 DocType: Journal Entry,Total Debit,ጠቅላላ ዴቢት
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ነባሪ ጨርሷል ዕቃዎች መጋዘን
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,እባክዎ ታካሚን ይምረጡ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,የሽያጭ ሰው
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,የሽያጭ ሰው
 DocType: Hotel Room Package,Amenities,ምግቦች
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,በጀት እና ወጪ ማዕከል
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ባለብዙ ነባሪ የክፍያ ስልት አይፈቀድም
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ለ
 ,Appointment Analytics,የቀጠሮ ትንታኔ
 DocType: Vehicle Service,Half Yearly,ግማሽ ዓመታዊ
 DocType: Lead,Blog Subscriber,የጦማር የተመዝጋቢ
@@ -5651,6 +5693,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,እርስዎ በዓመት ተማሪዎች ቡድኖች ለማድረግ ከሆነ ባዶ ይተዉት
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ከተመረጠ, ጠቅላላ የለም. የስራ ቀናት በዓላት ያካትታል; ይህም ደመወዝ በእያንዳንዱ ቀን ዋጋ እንዲቀንስ ያደርጋል"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","የአሁኑን ቁልፍ የሚጠቀሙ መተግበሪያዎች መዳረስ አይችሉም, እርግጠኛ ነዎት?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,ጠቅላላ የቅድሚያ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,የአብነት ኮድ ይቀይሩ
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን የሚቆይበት ጊዜ የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም. ቀናት ለማረም እና እንደገና ይሞክሩ.
@@ -5661,8 +5704,9 @@
 DocType: Opportunity Item,Basic Rate,መሰረታዊ ደረጃ
 DocType: GL Entry,Credit Amount,የብድር መጠን
 DocType: Cheque Print Template,Signatory Position,ፈራሚ የስራ መደቡ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,የጠፋ እንደ አዘጋጅ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,የጠፋ እንደ አዘጋጅ
 DocType: Timesheet,Total Billable Hours,ጠቅላላ የሚከፈልበት ሰዓቶች
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,ተመዝጋቢው በዚህ የደንበኝነት ምዝገባ የተፈጠሩ ደረሰኞችን መክፈል ያለባቸው ቀኖች
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,የክፍያ ደረሰኝ ማስታወሻ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ይሄ በዚህ የደንበኛ ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ረድፍ {0}: የተመደበ መጠን {1} ከ ያነሰ መሆን ወይም የክፍያ Entry መጠን ጋር እኩል መሆን አለበት {2}
@@ -5681,12 +5725,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ፈንድ (ንብረት) ውስጥ ማመልከቻ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ይህ የዚህ ሰራተኛ መካከል በስብሰባው ላይ የተመሠረተ ነው
 DocType: Assessment Result,Summary,ማጠቃለያ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ዴት መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ዴት መለያ
 DocType: Fiscal Year,Year Start Date,ዓመት መጀመሪያ ቀን
 DocType: Attendance,Employee Name,የሰራተኛ ስም
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,የምግብ ቤት ዕቃ ማስገቢያ ንጥል
@@ -5698,7 +5742,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,የግዢ መጠን
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},የታሸጉ የብዛት ረድፍ ውስጥ ንጥል {0} ለ ብዛት ጋር እኩል መሆን አለባቸው {1}
 DocType: Work Order,Manufactured Qty,የሚመረተው ብዛት
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},የአጋራቶቹ ከ {0} ጋር አይገኙም.
@@ -5706,12 +5750,12 @@
 DocType: Asset,Out of Order,ከትዕዛዝ ውጪ
 DocType: Purchase Receipt Item,Accepted Quantity,ተቀባይነት ብዛት
 DocType: Projects Settings,Ignore Workstation Time Overlap,የትርፍ ሰአት ጊዜን መደራገርን ችላ ይበሉ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ምረጥ ባች ቁጥሮች
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ደንበኞች ከሞት ደረሰኞች.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,የፕሮጀክት መታወቂያ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
 DocType: Patient Service Unit,Medical Administrator,የሕክምና አስተዳዳሪ
 DocType: Assessment Plan,Schedule,ፕሮግራም
 DocType: Account,Parent Account,የወላጅ መለያ
@@ -5741,15 +5785,16 @@
 DocType: Asset Repair,Repair Status,የጥገና ሁኔታ
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,ዲግሪ መጽሔት ግቤቶች.
 DocType: Delivery Note Item,Available Qty at From Warehouse,መጋዘን ከ ላይ ይገኛል ብዛት
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,በመጀመሪያ የተቀጣሪ ሪኮርድ ይምረጡ.
 DocType: POS Profile,Account for Change Amount,ለውጥ መጠን መለያ
 DocType: Purchase Invoice,input service,የግቤት አገልግሎት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ረድፍ {0}: ፓርቲ / መለያዎ ጋር አይመሳሰልም {1} / {2} ውስጥ {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,የጥገና ቡድን አባል
 DocType: Agriculture Analysis Criteria,Soil Analysis,የአፈር ምርመራ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,የኮርስ ኮድ:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
 DocType: Account,Stock,አክሲዮን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
 DocType: Employee,Current Address,ወቅታዊ አድራሻ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","በግልጽ ካልተገለጸ በስተቀር ንጥል ከዚያም መግለጫ, ምስል, ዋጋ, ግብር አብነቱን ከ ማዘጋጀት ይሆናል ወዘተ ሌላ ንጥል ተለዋጭ ከሆነ"
 DocType: Serial No,Purchase / Manufacture Details,የግዢ / ማምረት ዝርዝሮች
@@ -5797,19 +5842,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},ለ የመግቢያ {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","ቅንብር በጀቶችን, ዒላማዎች ወዘተ ወቅታዊ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ተለዋዋጭ ስም
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} ንጥል አብነት ነው, በውስጡ ከተለዋጮችዎ አንዱ ይምረጡ"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} ንጥል አብነት ነው, በውስጡ ከተለዋጮችዎ አንዱ ይምረጡ"
 DocType: Asset,Asset Category,የንብረት ምድብ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,የተጣራ ክፍያ አሉታዊ መሆን አይችልም
 DocType: Purchase Order,Advance Paid,የቅድሚያ ክፍያ የሚከፈልበት
 DocType: Item,Item Tax,ንጥል ግብር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,አቅራቢው ቁሳዊ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,አቅራቢው ቁሳዊ
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,የቁሳዊ ጥያቄ ዕቅድ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ኤክሳይስ ደረሰኝ
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ከአንድ ጊዜ በላይ ይመስላል
 DocType: Expense Claim,Employees Email Id,ሰራተኞች ኢሜይል መታወቂያ
 DocType: Employee Attendance Tool,Marked Attendance,ምልክት ተደርጎበታል ክትትል
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,የቅርብ ግዜ አዳ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,የቅርብ ግዜ አዳ
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,የሰዓት ቆጣሪ ከተሰጠባቸው ሰዓቶች አልፏል.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,የመገናኛ ኤስ የእርስዎን እውቂያዎች ላክ
 DocType: Patient,A Positive,አዎንታዊ
@@ -5820,9 +5865,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ትክክለኛው ብዛት የግዴታ ነው
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ መለያ ደረጃ አለው, እና ለእዚህ አቅራቢ ግዢ ትዕዛዞች በጥንቃቄ ማስቀመጥ አለበት."
 DocType: Asset Maintenance Team,Asset Maintenance Team,የንብረት ጥገና ቡድን
-DocType: Employee Loan,Loan Type,የብድር አይነት
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} በተሳካ ሁኔታ ገብቷል
+DocType: Loan,Loan Type,የብድር አይነት
 DocType: Scheduling Tool,Scheduling Tool,ዕቅድ ማውጫ መሣሪያ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,የዱቤ ካርድ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,የዱቤ ካርድ
 DocType: BOM,Item to be manufactured or repacked,ንጥል የሚመረተው ወይም repacked ዘንድ
 DocType: Employee Education,Major/Optional Subjects,ሜጀር / አማራጭ ጉዳዮች
 DocType: Sales Invoice Item,Drop Ship,ጣል መርከብ
@@ -5854,7 +5900,7 @@
 DocType: Item,Units of Measure,ይለኩ አሃዶች
 DocType: Manufacturing Settings,Allow Production on Holidays,በዓላት ላይ ምርት ፍቀድ
 DocType: Sales Invoice,Customer's Purchase Order Date,ደንበኛ የግዢ ትዕዛዝ ቀን
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,አቢይ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,አቢይ Stock
 DocType: Shopping Cart Settings,Show Public Attachments,የህዝብ አባሪዎች አሳይ
 DocType: Packing Slip,Package Weight Details,የጥቅል ክብደት ዝርዝሮች
 DocType: Restaurant Reservation,Reservation Time,ቦታ ማስያዣ ሰዓት
@@ -5869,7 +5915,7 @@
 DocType: Purchase Order,To Receive and Bill,ይቀበሉ እና ቢል
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,ረድፍ # {0}: በቀን ማስተካከያ ቀን ከክ ልደት ቀን በፊት መሆን አይችልም
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ተለይተው የቀረቡ ምርቶች
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ዕቅድ ሠሪ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ዕቅድ ሠሪ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ውል እና ሁኔታዎች አብነት
 DocType: Serial No,Delivery Details,የመላኪያ ዝርዝሮች
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},አይነት ወጪ ማዕከል ረድፍ ውስጥ ያስፈልጋል {0} ግብሮች ውስጥ ሰንጠረዥ {1}
@@ -5879,20 +5925,20 @@
 DocType: Driver,Expiry Date,የአገልግሎት ማብቂያ ጊዜ
 DocType: Healthcare Settings,Employee name and designation in print,የሰራተኛ ስም እና ስያሜ በጽሁፍ
 ,accounts-browser,መለያዎች-አሳሽ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,የመጀመሪያው ምድብ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,የመጀመሪያው ምድብ ይምረጡ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ፕሮጀክት ዋና.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","የክምችት ቅንብሮች ወይም ንጥል ላይ &quot;አበል&quot; ማዘመን, አከፋፈል ላይ ወይም በላይ-ትዕዛዝን መፍቀድ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ምንዛሬዎች ወደ ወዘተ $ እንደ ማንኛውም ምልክት ቀጥሎ አታሳይ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(ግማሽ ቀን)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(ግማሽ ቀን)
 DocType: Payment Term,Credit Days,የሥዕል ቀኖች
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,የፈተና ሙከራዎችን ለማግኘት እባክዎ ታካሚውን ይምረጡ
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,የተማሪ ባች አድርግ
 DocType: Fee Schedule,FRQ.,ፈካሚ.
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ሰዓት ቀኖች ሊመራ
 DocType: Cash Flow Mapping,Is Income Tax Expense,የገቢ ግብር ታክስ ነው
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,የተማሪ ተቋም ዎቹ ሆስተል ላይ የሚኖር ከሆነ ይህን ምልክት ያድርጉ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ከላይ በሰንጠረዡ ውስጥ የሽያጭ ትዕዛዞች ያስገቡ
 ,Stock Summary,የአክሲዮን ማጠቃለያ
@@ -5903,10 +5949,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ማጣቀሻ ቀን
 DocType: Employee,Reason for Leaving,የምትሄድበት ምክንያት
 DocType: BOM Operation,Operating Cost(Company Currency),የክወና ወጪ (የኩባንያ የምንዛሬ)
-DocType: Employee Loan Application,Rate of Interest,የወለድ ተመን
+DocType: Loan Application,Rate of Interest,የወለድ ተመን
 DocType: Expense Claim Detail,Sanctioned Amount,ማዕቀብ መጠን
 DocType: Item,Shelf Life In Days,ዘመናዊ ህይወት በጊዜ ውስጥ
 DocType: GL Entry,Is Opening,በመክፈት ላይ ነው
+DocType: Department,Expense Approvers,ወጪዎች አንፃር
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ረድፍ {0}: ዴት ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
 DocType: Journal Entry,Subscription Section,የምዝገባ ክፍል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,መለያ {0} የለም
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index e812f46..9070950 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء الزيارة {0} قبل إلغاء طلب الضمانة
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,تقارير التقييم
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,منتجات المستهلك
-DocType: Purchase Receipt,Subscription Detail,تفاصيل الاشتراك
 DocType: Supplier Scorecard,Notify Supplier,إعلام المورد
 DocType: Item,Customer Items,منتجات العميل
 DocType: Project,Costing and Billing,التكلفة و الفواتير
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,الحساب {0}: الحساب الرئيسي {1} لا يمكن أن يكون حساب دفتر أستاذ
 DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,إشعارات البريد الإلكتروني
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,تقييم
 DocType: Item,Default Unit of Measure,وحدة القياس الافتراضية
 DocType: SMS Center,All Sales Partner Contact,بيانات الإتصال لكل شركاء البيع
-DocType: Employee,Leave Approvers,المخول بالموافقة على الإجازة
+DocType: Department,Leave Approvers,المخول بالموافقة على الإجازة
 DocType: Sales Partner,Dealer,تاجر
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,تحقيقات
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,التحقق من الصلاحية
 DocType: Job Applicant,Job Applicant,طالب الوظيفة
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ويستند هذا على المعاملات مقابل هذا المورد. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,قانوني
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},نوع الضريبة الفعلي لا يمكن أن تتضمن في معدل المادة في الصف {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,قانوني
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},نوع الضريبة الفعلي لا يمكن تضمينه في معدل الصنف في الصف {0}
 DocType: Bank Guarantee,Customer,زبون
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
 DocType: Delivery Note,Return Against Delivery Note,البضاعة المعادة مقابل اشعار تسليم
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},لا يمكن تسمية الحساب المصرفي باسم {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,رؤساء (أو مجموعات) التي تتم ضد القيود المحاسبية ويتم الاحتفاظ التوازنات.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,لم يتم تقديم أي قسائم مرتبات مقدمة.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,لم يتم تقديم أي قسائم مرتبات مقدمة.
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,اسم نوع الاجازة
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,عرض مفتوح
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ومن الضروري اتخاذ هذا الإجراء اليوم نفسه من أجل تكرار ذكره أعلاه
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,دفع
 DocType: Pricing Rule,Apply On,تنطبق على
@@ -56,13 +53,12 @@
 DocType: SMS Center,All Supplier Contact,بيانات اتصال جميع الموردين
 DocType: Support Settings,Support Settings,إعدادات الدعم
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,لا يمكن أن يكون (تاريخ الانتهاء المتوقع) قبل (تاريخ البدء المتوقع)
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: يجب أن يكون السعر كما هو {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,طلب إجازة جديد
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: يجب أن يكون السعر كما هو {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,حالة انتهاء صلاحية الدفعة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,خطاب ضمان مصرفي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,خطاب ضمان مصرفي
 DocType: Membership,membership validaty section,قسم صلاحية العضوية
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
-DocType: Consultation,Consultation,تشاور
+DocType: Consultation,Consultation,استشارة
 DocType: Accounts Settings,Show Payment Schedule in Print,عرض جدول الدفع في الطباعة
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,المبيعات والعائدات
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,اظهار المتغيرات
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,جعل الموقع
 DocType: Opening Invoice Creation Tool Item,Quantity,كمية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),القروض (الخصوم)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),القروض (الخصوم)
 DocType: Employee Education,Year of Passing,سنة التخرج
 DocType: Item,Country of Origin,بلد المنشأ
 DocType: Soil Texture,Soil Texture Criteria,معايير نسيج التربة
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,تفاصيل الاتصال الأساسية
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,القضايا المفتوحة
 DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
 DocType: Lab Test Groups,Add new line,إضافة سطر جديد
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,الرعاية الصحية
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),التأخير في الدفع (أيام)
@@ -89,7 +85,7 @@
 ,Delay Days,تأخير أيام
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الصيانة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,فاتورة
+DocType: Subscription Invoice,Invoice,فاتورة
 DocType: Purchase Invoice Item,Item Weight Details,وزن السلعة التفاصيل
 DocType: Asset Maintenance Log,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوبة
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,اسم مختصر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},الصف {0}: {1} {2} لا يتطابق مع {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,الصف # {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,الصف # {0}
 DocType: Timesheet,Total Costing Amount,المبلغ الكلي التكاليف
 DocType: Delivery Note,Vehicle No,السيارة لا
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,يرجى تحديد قائمة الأسعار
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,التقدم في العمل
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,يرجى تحديد التاريخ
 DocType: Daily Work Summary Group,Holiday List,قائمة العطلات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,محاسب
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,محاسب
 DocType: Hub Settings,Selling Price List,قائمة أسعار البيع
 DocType: Patient,Tobacco Current Use,التبغ الاستخدام الحالي
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,معدل البيع
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,معدل البيع
 DocType: Cost Center,Stock User,مخزون العضو
 DocType: Soil Analysis,(Ca+Mg)/K,(الكالسيوم +المغنيسيوم ) / ك
 DocType: Company,Phone No,رقم الهاتف
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},جديد {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,تم إرسال إشعار البريد الإلكتروني المبدئي
 ,Sales Partners Commission,عمولة المناديب
 DocType: Soil Texture,Sandy Clay Loam,التربة الطينية الخصبة
@@ -123,20 +118,21 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +46,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,الطبيب الجدول الزمني فتحة الوقت
 DocType: Payment Request,Payment Request,طلب الدفع
-DocType: Asset,Value After Depreciation,قيمة بعد الاستهلاك
+DocType: Asset,Value After Depreciation,قيمة بعد الاهلاك
 DocType: Student,O+,O+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ذات صلة
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,تاريخ الحضور لا يمكن أن يكون قبل تاريخ إلتحاق الموظف بالعمل
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,تاريخ الحضور لا يمكن أن يكون قبل تاريخ إلتحاق الموظف بالعمل
 DocType: Grading Scale,Grading Scale Name,الدرجات اسم النطاق
-DocType: Subscription,Repeat on Day,كرر يوم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,.هذا حساب جذري و لايمكن تعديله
 DocType: Sales Invoice,Company Address,عنوان الشركة
 DocType: BOM,Operations,العمليات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لا يمكن تحديد التخويل على أساس الخصم ل {0}
+DocType: Subscription,Subscription Start Date,تاريخ بدء الاشتراك
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",إرفاق ملف csv مع عمودين، واحدة للاسم القديم واحدة للاسم الجديد
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ليس في أي سنة مالية نشطة.
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",المرجع: {0}، رمز العنصر: {1} والعميل: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,لا يمكن أن يكون تاريخ انتهاء الفترة التجريبية قبل تاريخ بدء الفترة التجريبية
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,كجم
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,إعلان عن وظيفة شاغرة
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},لم يتم تحديد بوم للتعاقد من الباطن البند {0} في الصف {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Patient,Married,متزوج
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},غير مسموح به {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,الحصول على البنود من
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,الحصول على البنود من
 DocType: Price List,Price Not UOM Dependant,السعر لا تعتمد على أوم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
@@ -158,9 +154,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,صناديق التقاعد
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,تاريخ الاستهلاك التالي لا يمكن أن يكون قبل تاريخ الشراء
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,تاريخ الاهلاك التالي لا يمكن أن يكون قبل تاريخ الشراء
 DocType: Crop,Perennial,الدائمة
-DocType: Consultation,Consultation Date,تاريخ التشاور
+DocType: Consultation,Consultation Date,تاريخ الاستشارة
 DocType: Accounts Settings,Use Custom Cash Flow Format,استخدم تنسيق التدفق النقدي المخصص
 DocType: SMS Center,All Sales Person,كل مندوبي المبيعات
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,زيت الفرامل
 DocType: Tax Rule,Tax Type,نوع الضريبة
 ,Completed Work Orders,أوامر العمل المكتملة
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,المبلغ الخاضع للضريبة
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,المبلغ الخاضع للضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: BOM,Item Image (if not slideshow),صورة البند (إن لم يكن عرض شرائح)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,الصف # {0}: يجب أن يكون نوع المستند المرجعي واحدا من &quot;مطالبة النفقات&quot; أو &quot;دفتر اليومية&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,حدد مكتب الإدارة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,الصف # {0}: يجب أن يكون نوع المستند المرجعي واحدا من &quot;مطالبة النفقات&quot; أو &quot;دفتر اليومية&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,حدد مكتب الإدارة
 DocType: SMS Log,SMS Log,SMS سجل رسائل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,إدارة المبلغ المدفوع مقدما للموظف
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,إشعار التسليم
 DocType: Journal Entry,Opening Entry,فتح دخول
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب الدفع فقط
-DocType: Employee Loan,Repay Over Number of Periods,سداد على عدد فترات
+DocType: Loan,Repay Over Number of Periods,سداد على عدد فترات
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة
 DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Education Settings,Validate Batch for Students in Student Group,التحقق من صحة الدفعة للطلاب في مجموعة الطلاب
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},لا يوجد سجل ايجازات للموظف {0} عند {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},لا يوجد سجل ايجازات للموظف {0} عند {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,فضلا ادخل الشركة اولا
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,يرجى اختيار الشركة أولاً
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,يرجى اختيار الشركة أولاً
 DocType: Employee Education,Under Graduate,دبلومة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,يرجى تعيين القالب الافتراضي لإشعار حالة الإجازات في إعدادات الموارد البشرية.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
 DocType: Soil Analysis,Ca/K,كاليفورنيا / K
-DocType: Journal Entry Account,Employee Loan,قرض الموظف
 DocType: Fee Schedule,Send Payment Request Email,إرسال طلب الدفع البريد الإلكتروني
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو انتهت صلاحيته
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,العقارات
@@ -226,26 +222,23 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,المورد نوع / المورد
 DocType: Naming Series,Prefix,بادئة
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,موقع الحدث
-DocType: Asset Settings,Asset Settings,إعدادات مادة العرض
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,المواد الاستهلاكية
+DocType: Asset Settings,Asset Settings,إعدادات الأصول
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,المواد الاهلاكية
 DocType: Student,B-,B-
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,تم إلغاء التسجيل بنجاح.
 DocType: Assessment Result,Grade,درجة
 DocType: Restaurant Table,No of Seats,عدد المقاعد
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","لإضافة موضوع ديناميكي، استخدم علامات جينيا مثل <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل المورد
 DocType: Asset Maintenance Task,Asset Maintenance Task,مهمة صيانة الأصول
 DocType: SMS Center,All Contact,جميع جهات الاتصال
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,الراتب السنوي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,الراتب السنوي
 DocType: Daily Work Summary,Daily Work Summary,ملخص العمل اليومي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} مجمد
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,مصاريف المخزون
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,مصاريف المخزون
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,حدد مستودع الهدف
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,الرجاء إدخال البريد الإلكتروني لجهة الاتصال المفضلة
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,الرجاء إدخال البريد الإلكتروني لجهة الاتصال المفضلة
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,الدخول كونترا
 DocType: Journal Entry Account,Credit in Company Currency,المدين في عملة الشركة
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,عنوان أساسي
 DocType: Production Plan,Material Request Detail,المواد طلب التفاصيل
 DocType: Selling Settings,Default Quotation Validity Days,أيام صلاحية عرض الأسعار الافتراضية
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز رسائل SMS
 DocType: Sales Invoice,Change Amount,تغيير المبلغ
@@ -275,27 +268,29 @@
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,عرض نقاط البيع فقط
 DocType: Driver,Driving License Categories,فئات رخصة القيادة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,الرجاء إدخال تاريخ التسليم
-DocType: Depreciation Schedule,Make Depreciation Entry,انشئ قيد استهلاك
+DocType: Depreciation Schedule,Make Depreciation Entry,انشئ قيد اهلاك
+DocType: HR Settings,Leave Settings,اترك الإعدادات
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,طلب نوع
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,أنشئ موظف
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,إذاعة
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),وضع الإعداد بوس (الانترنت / غير متصل)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,تعطيل إنشاء سجلات الوقت ضد أوامر العمل. لا يجوز تعقب العمليات ضد أمر العمل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,تنفيذ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,تنفيذ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,تفاصيل التشغيل أنجزت.
 DocType: Asset Maintenance Log,Maintenance Status,حالة الصيانة
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,تفاصيل العضوية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: المورد مطلوب  بالمقابلة بالحساب الدائن {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,البنود والتسعيرات
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},مجموع الساعات: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},(من التاريخ) يجب أن يكون ضمن السنة المالية. بافتراض (من التاريخ) = {0}
 DocType: Drug Prescription,Interval,فترة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,تفضيل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,تفضيل
 DocType: Grant Application,Individual,فرد
 DocType: Academic Term,Academics User,المستخدمين الأكادميين
 DocType: Cheque Print Template,Amount In Figure,المبلغ في الشكل
-DocType: Employee Loan Application,Loan Info,معلومات قرض
+DocType: Loan Application,Loan Info,معلومات قرض
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,التخطيط لزيارات الصيانة.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,المورد بطاقة الأداء
 DocType: Share Transfer,Share Transfer,نقل المشاركة
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,قالب البند
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,الكيمياء الحيوية
 DocType: Job Offer,Select Terms and Conditions,اختر الشروط والأحكام
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,القيمة الخارجه
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,القيمة الخارجه
 DocType: Woocommerce Settings,Woocommerce Settings,إعدادات Woocommerce
 DocType: Production Plan,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,الإقليم الافتراضي
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,تلفزيون
 DocType: Work Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,حدد العميل أو المورد.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 DocType: Company,Enable Perpetual Inventory,تمكين المخزون الدائم
+DocType: Bank Guarantee,Charges Incurred,الرسوم المتكبدة
 DocType: Company,Default Payroll Payable Account,الحساب الافتراضي لدفع الرواتب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,نتيجة مخصصة
 DocType: Delivery Stop,Contact Name,اسم جهة الاتصال
 DocType: Course Assessment Criteria,Course Assessment Criteria,معايير تقييم المقرر التعليمي
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,الرقم الضريبي:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,الرقم الضريبي:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,هوية الطالب:
 DocType: POS Customer Group,POS Customer Group,مجموعة عملاء نقطة البيع
 DocType: Land Unit,Land Unit describing various land assets,وحدة الأراضي التي تصف مختلف الأصول العقارية
@@ -374,9 +371,8 @@
 ,Open Work Orders,فتح أوامر العمل
 DocType: Payment Term,Credit Months,أشهر الائتمان
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,صافي الأجر لا يمكن أن يكون أقل من 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",لإيقاف إرسال إشعارات الخطأ المتكررة من النظام، حددنا الحقل المعطل في الاشتراك
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,تاريخ ترك العمل يجب أن يكون بعد تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,الأجزات في السنة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تاريخ ترك العمل يجب أن يكون بعد تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,الأجزات في السنة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"الصف {0}: يرجى اختيار ""دفعة مقدمة"" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
 DocType: Email Digest,Profit & Loss,الخسارة و الأرباح
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,يرجى إعداد الطلاب تحت مجموعات الطلاب
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,إجازة محظورة
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},البند {0} قد وصل إلى نهاية عمره في {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,مدخلات البنك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,إجازة محظورة
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},البند {0} قد وصل إلى نهاية عمره في {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,مدخلات البنك
 DocType: Crop,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,جرد عناصر المخزون
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,دورة المجموعة الطلابية أداة الخلق
 DocType: Lead,Do Not Contact,عدم الاتصال
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,الأشخاص الذين يعلمون في مؤسستك
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,البرنامج المطور
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,البرنامج المطور
 DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Course Scheduling Tool,Course Start Date,تاريخ بدء المقرر التعليمي
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,نشر في المحور
 DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,تم إلغاء البند {0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,طلب مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,تم إلغاء البند {0}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,طلب مواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,تفاصيل شراء
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ماكس الصف
 DocType: Email Digest,New Quotations,عرض مسعر جديد
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ارسال كشف الراتب إلي البريد الاكتروني المفضل من قبل الموظف
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول المخول بالموافقة على الإجازة في القائمة علي انه الافتراضي
 DocType: Tax Rule,Shipping County,مقاطعة البريدية
-apps/erpnext/erpnext/config/desktop.py +167,Learn,تعلم
+apps/erpnext/erpnext/config/desktop.py +159,Learn,تعلم
 DocType: Asset,Next Depreciation Date,تاريخ االاستهالك التالي
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,تكلفة النشاط لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات و الإيداعات المعلقة لتوضيح او للمقاصة
 DocType: Item,Synced With Hub,مزامن مع المحور
 DocType: Driver,Fleet Manager,مدير قافلة المركبات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},الصف # {0}: {1} لا يمكن أن يكون سالبا للبند {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},الصف # {0}: {1} لا يمكن أن يكون سالبا للبند {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المصنعة لا يمكن أن تكون أكبر من ""الكمية لتصنيع"""
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},يرجى تحديد سعر غرفة الفندق على {}
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Opening Invoice Creation Tool,Invoice Type,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,اشعار تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,اشعار تسليم
 DocType: Consultation,Encounter Impression,لقاء الانطباع
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,إعداد الضرائب
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,تكلفة الأصول المباعة
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",المسمى الوظيفي للموظف (مثل الرئيس التنفيذي او مدير الحسابات الخ.. )
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
 DocType: Course Scheduling Tool,Course Scheduling Tool,أداة الجدول الزمني للمقرر التعليمي
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن انشاء فاتورة شراء  مقابل الأصول الموجودة {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[عاجل] حدث خطأ أثناء إنشاء٪ s متكررة ل٪ s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن انشاء فاتورة شراء  مقابل الأصول الموجودة {1}
 DocType: Land Unit,LInked Analysis,تحليل ملزم
 DocType: Item Tax,Tax Rate,معدل الضريبة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,لا يمكن أن تكون فترة الطلب عبر سجلين مخصصين
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,فترة الطلب لا يمكن ان تكون خلال سجلين مخصصين
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} تم تخصيصه بالفعل للموظف {1} للفترة {2} إلى {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,فاتورة الشراء {0} تم ترحيلها من قبل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: رقم الباتش يجب أن يكون نفس {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,إنشاء مجموعات الطلاب
 DocType: Volunteer,Weekends,عطلة نهاية الأسبوع
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ملاحظة الائتمان المبلغ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ملاحظة الائتمان المبلغ
 DocType: Setup Progress Action,Action Document,إجراء مستند
 DocType: Chapter Member,Website URL,رابط الموقع
 ,Finished Goods,السلع تامة الصنع
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext تجريبي
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,إضافة بنود
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,معلمة البند التفتيش الجودة
+DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 DocType: Depreciation Schedule,Schedule Date,جدول التسجيل
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",المكاسب و الاستقطاعات و مكونات الراتب الاخرى
 DocType: Packed Item,Packed Item,عنصر معبأ
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
 DocType: Healthcare Settings,Require Lab Test Approval,يلزم الموافقة على اختبار المختبر
 DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,إجمالي المعلقة
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,إجمالي المعلقة
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
 DocType: Dosage Strength,Strength,قوة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,إنشاء زبون جديد
@@ -559,10 +554,10 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +116,Patient not found,لم يتم العثور على المريض
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
-DocType: Workstation,Consumable Cost,تكلفة المواد الاستهلاكية
+DocType: Workstation,Consumable Cost,تكلفة المواد الاهلاكية
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 DocType: Student Log,Medical,طبي
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,سبب الفقدان
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,سبب الفقدان
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,تحديث رقم الحساب
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,(مالك الزبون المحتمل) لا يمكن أن يكون نفسه (الزبون المحتمل)
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,القيمة المخصصة لا يمكن ان تكون أكبر من القيمة الغير معدلة
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,أعزب
 DocType: Salary Slip,Total Loan Repayment,إجمالي سداد القروض
 DocType: Account,Cost of Goods Sold,تكلفة البضاعة المباعة
-DocType: Subscription,Yearly,سنويا
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,الرجاء إدخال مركز التكلفة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,الرجاء إدخال مركز التكلفة
 DocType: Drug Prescription,Dosage,جرعة
 DocType: Journal Entry Account,Sales Order,طلبات العملاء
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,متوسط سعر المبيعات
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,متوسط سعر المبيعات
 DocType: Assessment Plan,Examiner Name,اسم الممتحن
 DocType: Lab Test Template,No Result,لا نتيجة
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,الرجاء إدخال اسم الشركة اولاً
 DocType: Purchase Invoice,Supplier Name,اسم المورد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,اقرا دليل مستخدم  ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,إظهار أوراق جميع أعضاء القسم في التقويم
 DocType: Purchase Invoice,01-Sales Return,01-مرتجع مبيعات
 DocType: Account,Is Group,هل مجموعة
 DocType: Email Digest,Pending Purchase Orders,اوامر الشراء المعلقة
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,حقل إلزامي - السنة الأكاديمية
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} غير مرتبط {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,تخصيص النص الاستهلالي الذي يذهب كجزء من أن البريد الإلكتروني. كل معاملة له نص منفصل استهلالي.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},يرجى تعيين الحساب الافتراضي المستحق للشركة {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},يرجى تعيين الحساب الافتراضي المستحق للشركة {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},المعاملة غير مسموح بها في مقابل أمر العمل المتوقف {0}
 DocType: Setup Progress Action,Min Doc Count,مين دوك كونت
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,إعدادات العالمية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,تم اختيار الخاصية {0} عدة مرات في جدول الخصائص
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,تم اختيار الخاصية {0} عدة مرات في جدول الخصائص
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,العطلة الرئيسية
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,محفوظة للبيع
 DocType: Packing Slip,From Package No.,من رقم حزمة
 DocType: Item Attribute,To Range,تتراوح
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",لا یمکن تغییر طریقة التقییم حیث أن ھناك معاملات مقابل بعض البنود التي لیس لدیھا طریقة تقییم خاصة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,الأوراق المالية و الودائع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",لا یمکن تغییر طریقة التقییم حیث أن ھناك معاملات مقابل بعض البنود التي لیس لدیھا طریقة تقییم خاصة
 DocType: Student Report Generation Tool,Attended by Parents,حضر من قبل الآباء
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع الإجازات المخصصة إلزامية
 DocType: Patient,AB Positive,AB إيجابي
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,سجل الحضور.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,مكون الرواتب لكشف المرتبات على أساس الجدول الزمني.
 DocType: Sales Order Item,Used for Production Plan,تستخدم لخطة الإنتاج
-DocType: Employee Loan,Total Payment,إجمالي الدفعة
+DocType: Loan,Total Payment,إجمالي الدفعة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,لا يمكن إلغاء المعاملة لأمر العمل المكتمل.
 DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت بين العمليات (في دقيقة)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,أدرج بعض من زبائنك. ويمكن أن تكون منظمات أو أفراد.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,يكفي لبناء أجزاء
 DocType: POS Profile User,POS Profile User,نقاط البيع الشخصية الملف الشخصي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,دخل مباشر
+DocType: Subscription Invoice,Subscription Invoice,فاتورة الاشتراك
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,دخل مباشر
 DocType: Patient Appointment,Date TIme,تاريخ التاريخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",لا يمكن الفلتره علي اساس (الحساب)، إذا تم وضعه في مجموعة على اساس (حساب)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,موظف إداري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,موظف إداري
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,إنشاء الشركة والضرائب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,الرجاء تحديد الدورة التدريبية
 DocType: Codification Table,Codification Table,جدول التدوين
 DocType: Timesheet Detail,Hrs,ساعات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,يرجى اختيار الشركة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,يرجى اختيار الشركة
 DocType: Stock Entry Detail,Difference Account,حساب الفرق
 DocType: Purchase Invoice,Supplier GSTIN,مورد غستين
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,لا يمكن إغلاق المهمة لان المهمة التابعة لها {0} غير مغلقة.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,قالب رسم التدفق النقدي
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
+DocType: Bank Guarantee,Providing,توفير
 DocType: Account,Profit and Loss,الربح والخسارة
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",غير مسموح به، قم بتهيئة قالب اختبار المختبر كما هو مطلوب
 DocType: Patient,Risk Factors,عوامل الخطر
@@ -701,7 +698,7 @@
 DocType: Detected Disease,Disease,مرض
 apps/erpnext/erpnext/config/projects.py +29,Define Project type.,تعريف نوع المشروع.
 DocType: Supplier Scorecard,Weighting Function,وظيفة الترجيح
-DocType: Physician,OP Consulting Charge,أوب كونسولتينغ تشارج
+DocType: Physician,OP Consulting Charge,رسوم الاستشارة
 apps/erpnext/erpnext/utilities/user_progress.py +28,Setup your ,إعداد الخاص بك
 DocType: Student Report Generation Tool,Show Marks,إظهار العلامات
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لشركة
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 DocType: Healthcare Settings,Appointment Confirmation,تأكيد الموعد
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),إغلاق (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,مرحبا
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,حرك بند
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",تم تعيين الإعداد الافتراضي في الملف الشخصي لنقطة البيع {0} للمستخدم {1}، يرجى تعطيل الإعداد الافتراضي
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,مالي / سنة محاسبية.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,القيم المتراكمة
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,مطلوب الإقليم في الملف الشخصي نقاط البيع
 DocType: Supplier,Prevent RFQs,منع رفق
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,أنشاء طلب مبيعات
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},زلة الراتب المقدمة للفترة من {0} إلى {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},زلة الراتب المقدمة للفترة من {0} إلى {1}
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,تاريخ فاتورة الشحن
 DocType: Production Plan,Production Plan,خطة الإنتاج
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,فتح أداة إنشاء الفاتورة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,مبيعات المعاده
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الإجازات المخصصة {0} لا ينبغي أن تكون أقل من الإجازات المعتمدة بالفعل {1} للفترة
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,تعيين الكمية في المعاملات استناداً إلى Serial No Input
 ,Total Stock Summary,ملخص إجمالي المخزون
 DocType: Announcement,Posted By,منشور من قبل
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مورد (هبوط السفينة)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,مناقصة لـ
 DocType: Lead,Middle Income,الدخل المتوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),افتتاحي (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,لا يمكن أن تكون القيمة المخصصة سالبة
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,يرجى تعيين الشركة
 DocType: Share Balance,Share Balance,رصيد السهم
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
 DocType: Training Result Employee,Training Result Employee,نتيجة تدريب الموظفين
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع منطقي لقاء ما تم إدخاله من مخزون.
-DocType: Repayment Schedule,Principal Amount,المبلغ الرئيسي
-DocType: Employee Loan Application,Total Payable Interest,مجموع الفوائد الدائنة
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,المبلغ الرئيسي
+DocType: Loan Application,Total Payable Interest,مجموع الفوائد الدائنة
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},المجموع: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاتورة المبيعات الجدول الزمني
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},رقم المرجع وتاريخ المرجع مطلوب ل {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات موظف لإدارة الإجازات والمطالبة بالنفقات والرواتب
 DocType: Restaurant Reservation,Restaurant Reservation,حجز المطعم
 DocType: Land Unit,Land Unit Name,اسم وحدة الأراضي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,تجهيز العروض
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,تجهيز العروض
 DocType: Payment Entry Deduction,Payment Entry Deduction,دفع الاشتراك خصم
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,تغليف
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,إعلام العملاء عبر البريد الإلكتروني
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,إعلام العملاء عبر البريد الإلكتروني
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,مندوب مبيعات آخر {0} موجود بنفس رقم هوية الموظف
 DocType: Employee Advance,Claimed Amount,المبلغ المطالب به
 apps/erpnext/erpnext/config/education.py +180,Masters,الماستر(البيانات الرئيسية)
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",حساب بوابة الدفع لم يتم انشاءه، يرجى إنشاء واحد يدويا.
 DocType: Supplier Scorecard,Per Year,كل سنة
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,غير مؤهل للقبول في هذا البرنامج حسب دوب
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة البند&gt; العلامة التجارية
 DocType: Sales Invoice,Sales Taxes and Charges,الضرائب على المبيعات والرسوم
 DocType: Employee,Organization Profile,ملف المؤسسة
 DocType: Vital Signs,Height (In Meter),الارتفاع (بالمتر)
 DocType: Student,Sibling Details,تفاصيل الأخوة
 DocType: Vehicle Service,Vehicle Service,خدمة السيارة
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,يؤدي تلقائيا على طلب ردود الفعل على أساس الظروف.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,يؤدي تلقائيا على طلب ردود الفعل على أساس الظروف.
 DocType: Employee,Reason for Resignation,سبب الاستقالة
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,نموذج لتقييم الأداء.
 DocType: Sales Invoice,Credit Note Issued,الائتمان مذكرة صادرة
@@ -834,17 +831,16 @@
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,فاتورة / مجلة تفاصيل الدخول
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ليس في السنة المالية {2}
 DocType: Buying Settings,Settings for Buying Module,إعدادات لشراء وحدة
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},الاصل {0} لا ينتمي إلى شركة {1}
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},الأصل {0} لا ينتمي إلى شركة {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,فضلا ادخل استلام المشتريات اولا
 DocType: Buying Settings,Supplier Naming By,المورد تسمية بواسطة
 DocType: Activity Type,Default Costing Rate,سعر التكلفة الافتراضي
 DocType: Maintenance Schedule,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيت قاعدة التسعير على أساس العملاء، مجموعة العملاء، الأرض، المورد، نوع المورد ، الحملة، شريك المبيعات الخ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,صافي التغير في المخزون
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,إدارة قروض الموظفين
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,العلاقة مع ولي الامر 2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,مدير
 DocType: Payment Entry,Payment From / To,الدفع من / إلى
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد المسموح به للدين الجديد أقل من المبلغ  الحالي المستحق على الزبون. يجب أن يكون الحد المسموح به للدين على الأقل {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},يرجى تعيين الحساب في مستودع {0}
@@ -863,7 +859,7 @@
 DocType: GST Settings,GST Settings,إعدادات غست
 DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,سوف تظهر الطالب كما موجود في طالب تقرير الحضور الشهري
-DocType: Depreciation Schedule,Depreciation Amount,قيمة الأستهلاك
+DocType: Depreciation Schedule,Depreciation Amount,قيمة الإهلاك
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,تحويل إلى تصنيف (مجموعة)
 DocType: Delivery Trip,TOUR-.#####,جولة-.#####
 DocType: Activity Cost,Activity Type,نوع النشاط
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,نقل المواد
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,تعذر العثور على مسار ل
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),افتتاحي  (Dr)
+DocType: Loan,Applicant,طالب وظيفة
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},الطابع الزمني للترحيل يجب أن يكون بعد {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,لجعل المستندات المتكررة
 ,GST Itemised Purchase Register,غست موزعة شراء سجل
 DocType: Course Scheduling Tool,Reschedule,إعادة جدولة
-DocType: Employee Loan,Total Interest Payable,مجموع الفائدة الواجب دفعها
+DocType: Loan,Total Interest Payable,مجموع الفائدة الواجب دفعها
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,الضرائب التكلفة هبطت والرسوم
 DocType: Work Order Operation,Actual Start Time,الفعلي وقت البدء
 DocType: BOM Operation,Operation Time,زمن التشغيل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,إنهاء
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,الاساسي
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,الاساسي
 DocType: Timesheet,Total Billed Hours,مجموع الساعات وصفت
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,شطب المبلغ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,شطب المبلغ
 DocType: Leave Block List Allow,Allow User,تسمح للمستخدم
 DocType: Journal Entry,Bill No,رقم الفاتورة
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب الربح / الخسارة الخاص بالتخلص من الأصول
 DocType: Vehicle Log,Service Details,تفاصيل الخدمة
-DocType: Subscription,Quarterly,فصلي
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,مجمعة
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم مطلوبة
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ورقة الوقت
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush المواد الخام مبني على
 DocType: Sales Invoice,Port Code,رمز الميناء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,احتياطي مستودع
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,احتياطي مستودع
 DocType: Lead,Lead is an Organization,الرصاص هو منظمة
 DocType: Guardian Interest,Interest,فائدة
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل البيع
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,حسابات
 DocType: Vehicle,Odometer Value (Last),قراءة عداد المسافات (الأخيرة)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,نماذج من معايير بطاقة الأداء المورد.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,التسويق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,التسويق
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,تدوين المدفوعات تم انشاؤه بالفعل
 DocType: Request for Quotation,Get Suppliers,الحصول على الموردين
 DocType: Purchase Receipt Item Supplied,Current Stock,المخزون الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصل {1} غير مترابط مع البند {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,معاينة كشف الراتب
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصل {1} غير مترابط مع البند {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,معاينة كشف الراتب
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,تم إدخال الحساب {0} عدة مرات
 DocType: Account,Expenses Included In Valuation,المصروفات متضمنة في تقييم السعر
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,لا يمكنك التجديد إلا إذا انتهت عضويتك خلال 30 يوما
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,حدد فقط إذا كان لديك إعداد مخطط مخطط التدفق النقدي
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكترونية التالي في :
 DocType: Supplier Scorecard,Per Week,في الاسبوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,البند لديه متغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,البند لديه متغيرات.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,إجمالي الطالب
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],فيشير ديس إكوريتورس كومبتابليز [فيك]
 DocType: Journal Entry,Credit Card Entry,إدخال بطاقة إئتمان
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,الشركة و الحسابات
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,القيمة القادمة
-DocType: Asset Settings,Depreciation Options,خيارات الاستهلاك
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,وقت نشر غير صالح
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,القيمة القادمة
+DocType: Asset Settings,Depreciation Options,خيارات الاهلاك
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,وقت نشر غير صالح
 DocType: Lead,Campaign Name,اسم الحملة
 DocType: Hotel Room,Capacity,سعة
 DocType: Selling Settings,Close Opportunity After Days,فرصة قريبة بعد يوم
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,رقم أمر الشراء الصادر من الزبون
 DocType: Budget,Budget Against,الميزانية مقابل
 DocType: Employee,Cell Number,رقم الهاتف
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ليس هناك موظف لمعايير معينة. تحقق من عدم إنشاء قسائم الراتب.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ليس هناك موظف لمعايير معينة. تحقق من عدم إنشاء قسائم الراتب.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,إنشاء طلب مواد تلقائي
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,لا يمكنك إدخال مستند الصرف الحالي المقابل للإدخال بدفتر اليومية في العمود
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,يرجى تحديد جدول
 DocType: BOM,Website Specifications,موقع المواصفات
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} هو عنوان بريد إلكتروني غير صالح في &quot;المستلمين&quot;
 DocType: Special Test Items,Particulars,تفاصيل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: من {0} من نوع {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: من {0} من نوع {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,الصف {0}: معامل التحويل إلزامي
 DocType: Student,A+,+A
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",توجد قواعد أسعار متعددة بنفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قاعدة السعر: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن تعطيل أو إلغاء قائمة المواد لانها مترابطة مع قوائم مواد اخرى
 DocType: Asset,Maintenance,صيانة
+DocType: Subscriber,Subscriber,مكتتب
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,يرجى تحديث حالة المشروع الخاص بك
 DocType: Item,Maximum sample quantity that can be retained,الحد الأقصى لعدد العينات التي يمكن الاحتفاظ بها
@@ -1064,27 +1060,27 @@
 DocType: Expense Claim Detail,Expense Claim Type,نوع  المطالبة  بالنفقات
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,الإعدادات الافتراضية لسلة التسوق
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,إضافة فسحات زمنية
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},الأصول تم تخريدها عبر إدخال قيد دفتر اليومية {0}
-DocType: Employee Loan,Interest Income Account,الحساب الخاص بإيرادات الفائدة
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},الأصول تم اهمالها عبر إدخال قيد دفتر اليومية {0}
+DocType: Loan,Interest Income Account,الحساب الخاص بإيرادات الفائدة
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,تم إرسال دعوة المراجعة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,التكنولوجيا الحيوية
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,نفقات صيانة المكاتب
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,نفقات صيانة المكاتب
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,اذهب إلى
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,إعداد حساب بريد إلكتروني
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,الرجاء إدخال البند أولا
 DocType: Asset Repair,Downtime,التوقف
 DocType: Account,Liability,الخصوم
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,لا يمكن أن يكون المبلغ الموافق عليه أكبر من مبلغ المطالبة في الصف {0}.
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,المدة الأكاديمية :
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,لا يمكن أن يكون المبلغ الموافق عليه أكبر من مبلغ المطالبة في الصف {0}.
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,الفترة الأكاديمية :
 DocType: Salary Detail,Do not include in total,لا تدرج في المجموع
 DocType: Company,Default Cost of Goods Sold Account,الحساب الافتراضي لتكلفة البضائع المباعة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,قائمة الأسعار غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,معلومات عن العائلة
 DocType: Request for Quotation Supplier,Send Email,إرسال بريد الإلكتروني
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 DocType: Item,Max Sample Quantity,الحد الأقصى لعدد العينات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,لا يوجد تصريح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,لا يوجد تصريح
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,طلب اقتباس
 DocType: Vital Signs,Heart Rate / Pulse,معدل ضربات القلب / نبض
 DocType: Company,Default Bank Account,حساب مصرفي افتراضي
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,البنود ذات الاهمية العالية سوف تظهر بالاعلى
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,اختبارات المختبر وعلامات حيوية
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل التسويات المصرفية
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصل {1} يجب أن يتم تقديمه
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصل {1} يجب أن يتم تقديمه
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,لا يوجد موظف
-DocType: Subscription,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,تحديث المشروع.
 DocType: SMS Center,All Customer Contact,كافة جهات اتصال العميل
 DocType: Land Unit,Tree Details,تفاصيل شجرة
@@ -1117,7 +1112,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,لايوجد مهام
 DocType: Item Variant Settings,Copy Fields to Variant,نسخ الحقول إلى متغير
-DocType: Asset,Opening Accumulated Depreciation,الاستهلاك التراكمي الافتتاحي
+DocType: Asset,Opening Accumulated Depreciation,الاهلاك التراكمي الافتتاحي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,يجب أن تكون النتيجة أقل من أو يساوي 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,أداة انتساب برنامج
 apps/erpnext/erpnext/config/accounts.py +335,C-Form records,سجلات النموذج - س
@@ -1126,7 +1121,7 @@
 DocType: Email Digest,Email Digest Settings,إعدادات الملخصات المرسله عبر الايميل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +367,Thank you for your business!,شكرا لك على عملك!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,دعم الاستفسارات من العملاء.
-DocType: Setup Progress Action,Action Doctype,إجراء مستند نوع
+DocType: Setup Progress Action,Action Doctype,إجراء Doctype
 DocType: HR Settings,Retirement Age,سن التقاعد
 DocType: Bin,Moving Average Rate,معدل المتوسط المتحرك
 DocType: Production Plan,Select Items,اختر العناصر
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,سجل الحضور
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,كل مجموعات الصنف
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,يشغل تلقائيا على طلب التزويد ب (رد الفعل) على أساس الشروط.
 DocType: Work Order,Item To Manufacture,السلعة لتصنيع
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} الحالة هي {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",إعادة تحديد، إذا تم تحرير عنوان المختار بعد حفظ
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,متغير البند {0} موجود بالفعل مع نفس الخصائص
 DocType: Item,Hub Publishing Details,هاب تفاصيل النشر
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','افتتاحي'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','افتتاحي'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,الاعمال للانجاز المفتوحة
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Lab Test Template,Result Format,تنسيق النتيجة
@@ -1173,8 +1167,8 @@
 DocType: Payroll Entry,Bimonthly,نصف شهري
 DocType: Vehicle Service,Brake Pad,وسادة الفرامل
 DocType: Fertilizer,Fertilizer Contents,محتوى الأسمدة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,البحث و التطوير
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,القيمة لإصدار فاتورة
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,البحث و التطوير
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,فوترة الإجمالي
 DocType: Company,Registration Details,تفاصيل التسجيل
 DocType: Timesheet,Total Billed Amount,المبلغ الكلي وصفت
 DocType: Item Reorder,Re-Order Qty,إعادة ترتيب الكميه
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,تجاوز الحد الائتماني في أمر المبيعات
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,تقييم الأداء.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",تمكين &quot;استخدام لسلة التسوق، كما تم تمكين سلة التسوق وأن يكون هناك واحد على الأقل القاعدة الضريبية لسلة التسوق
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",تدوين المدفوعات {0} مترابط مع الطلب {1}، تحقق مما اذا كان ينبغي أن يتم سحبها كدفعة مقدمة في هذه الفاتورة.
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",تدوين المدفوعات {0} مترابط مع الطلب {1}، تحقق مما اذا كان ينبغي أن يتم سحبها كدفعة مقدمة في هذه الفاتورة.
 DocType: Sales Invoice Item,Stock Details,تفاصيل المخزون
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,قيمة المشروع
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,نقطة البيع
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,الحد الأدنى للجلوس
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 DocType: Examination Result,Examination Result,نتيجة الامتحان
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,إيصال استلام مشتريات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,إيصال استلام مشتريات
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,الماستر الخاص بأسعار صرف العملات.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},يجب أن يكون مرجع DOCTYPE واحد من {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Work Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,لا توجد عناصر متاحة للنقل
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,لا توجد عناصر متاحة للنقل
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),الإغلاق (الافتتاح + الإجمالي)
 DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,يرجى تحديد نوع الوثيقة أولاً
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الخاصة بالزيارة {0} قبل إلغاء زيارة الصيانة هذه
 DocType: Crop Cycle,ISO 8016 standard,إسو 8016 القياسية
 DocType: Pricing Rule,Rate or Discount,معدل أو خصم
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},رقم المسلسل {0} لا ينتمي إلى البند {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},رقم المسلسل {0} لا ينتمي إلى البند {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب الكمية
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,المفضلة
 DocType: Hub Settings,Custom Data,البيانات المخصصة
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,الرمز الطبي القياسي
 DocType: Soil Texture,Clay Composition (%),تركيب الطين (٪)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,يرجى حفظ قبل تعيين المهمة.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,قيمة الرصيد
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,قيمة الرصيد
 DocType: Lab Test,Lab Technician,فني مختبر
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,قائمة مبيعات الأسعار
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,قائمة مبيعات الأسعار
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",إذا تم تحديده، سيتم إنشاء عميل، يتم تعيينه إلى المريض. سيتم إنشاء فواتير المرضى ضد هذا العميل. يمكنك أيضا تحديد العميل الحالي أثناء إنشاء المريض.
 DocType: Bank Reconciliation,Account Currency,عملة الحساب
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,يرجى ذكر حساب التقريب في الشركة
 DocType: Purchase Receipt,Range,نطاق
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,الموظف {0} غير نشط أو غير موجود
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,الموظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
 DocType: Item Barcode,Item Barcode,البند الباركود
 DocType: Woocommerce Settings,Endpoints,النهاية
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},الرجاء إدخال فئة الأصول في البند {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,تم تحديث متغيرات البند {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,تم تحديث متغيرات البند {0}
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",التي سيتم إنشاؤها. إذا تأخرت، سيكون لديك لتغيير يدويا &quot;كرر في يوم من الشهر&quot; حقل من هذا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة
 DocType: Share Transfer,From Folio No,من فوليو نو
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,عربون  فاتورة الشراء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط قيد دائن مع {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,متاح للاستخدام التاريخ
 DocType: Guardian,Guardian Name,اسم ولي الأمر
 DocType: Cheque Print Template,Has Print Format,لديها تنسيق طباعة
-DocType: Employee Loan,Sanctioned,تقرها
+DocType: Loan,Sanctioned,تقرها
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لم يتم انشاء سجل تحويل العملة ل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 DocType: Crop Cycle,Crop Cycle,دورة المحاصيل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 DocType: Student Admission,Publish on website,نشر على الموقع الإلكتروني
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
+DocType: Subscription,Cancelation Date,تاريخ الإلغاء
 DocType: Purchase Invoice Item,Purchase Order Item,صنف امر الشراء
-DocType: Agriculture Task,Agriculture Task,مهمة اضافية
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,دخل غير مباشرة
+DocType: Agriculture Task,Agriculture Task,مهمة زراعية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,دخل غير مباشرة
 DocType: Student Attendance Tool,Student Attendance Tool,أداة طالب الحضور
 DocType: Restaurant Menu,Price List (Auto created),قائمة الأسعار (تم إنشاؤها تلقائيا)
 DocType: Cheque Print Template,Date Settings,إعدادات التاريخ
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,متر
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,لا يمكن أن يكون وقت اختبار المختبر قبل تاريخ جمع البيانات
+DocType: Subscription Plan,Cost,كلفة
 DocType: HR Settings,Don't send Employee Birthday Reminders,عدم ارسال تذكير للموضفين بأعياد الميلاد
 DocType: Expense Claim,Total Advance Amount,إجمالي المبلغ المدفوع مقدما
 DocType: Delivery Stop,Estimated Arrival,الوصول المتوقع
@@ -1348,15 +1342,15 @@
 DocType: BOM Website Item,BOM Website Item,بند الموقع الالكتروني بقائمة المواد
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
 DocType: Timesheet Detail,Bill,فاتورة
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,تم إدخال تاريخ الاستهلاك التالي بتاريخ سابق
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,أبيض
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,تم إدخال تاريخ الاهلاك التالي بتاريخ سابق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع الزبائن المحتملين (مفتوح)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,يمكنك فقط تحديد خيار واحد كحد أقصى من قائمة مربعات الاختيار.
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 DocType: Item,Automatically Create New Batch,إنشاء دفعة جديدة تلقائيا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),تعيين {0} إلى {1} (الصف {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,إنشاء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),تعيين {0} إلى {1} (الصف {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,إنشاء
 DocType: Student Admission,Admission Start Date,تاريخ بداية القبول
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,موظف جديد
@@ -1365,14 +1359,14 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +130,Order Type must be one of {0},يجب أن يكون نوع الطلب واحدا من {0}
 DocType: Lead,Next Contact Date,تاريخ جهة الاتصال التالية
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,الكمية الافتتاحية
-DocType: Healthcare Settings,Appointment Reminder,تذكير التعيين
+DocType: Healthcare Settings,Appointment Reminder,تذكير بالموعد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير القيمة
 DocType: Program Enrollment Tool Student,Student Batch Name,طالب اسم دفعة
 DocType: Consultation,Doctor,طبيب
 DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
 DocType: Repayment Schedule,Balance Loan Amount,رصيد مبلغ القرض
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,دورة الجدول الزمني
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,خيارات المخزون
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,خيارات المخزون
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,تعطيل جلب آخر تفاصيل الشراء في أمر الشراء
 DocType: Journal Entry Account,Expense Claim,طلب النفقات
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,هل تريد حقا  استعادة هذه الأصول المخردة ؟
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,مادة كشف التعبئة
 DocType: Purchase Invoice,Cash/Bank Account,حساب النقد / البنك
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},الرجاء تحديد {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,وقد وضعت قائمة الانتظار في قائمة الانتظار.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},ملخص العمل ل {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,جدول الخصائص إلزامي
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,سيتم تعيين أول موافقة على الإذن في القائمة كمقابل الإجازة الافتراضي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,جدول الخصائص إلزامي
 DocType: Production Plan,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} لا يمكن أن يكون سالبا
 DocType: Training Event,Self-Study,دراسة ذاتية
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,أجور
 DocType: Asset Maintenance,Maintenance Manager Name,اسم مدير الصيانة
 DocType: Agriculture Task,Urgent,عاجل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,تعذر العثور على متغير:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,الرجاء تحديد حقل لتعديله من المفكرة
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,لا يمكن أن يكون عنصر الأصول الثابتة كما يتم إنشاء دفتر الأستاذ.
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,قالب فحص الجودة اسم
 DocType: Project,First Email,البريد الإلكتروني الأول
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,كمية البيع
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,كمية البيع
 DocType: Repayment Schedule,Interest Amount,مبلغ الفائدة
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Share Transfer,Issue,قضية
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,الدولة الشحن
 ,Projected Quantity as Source,المتوقع الكمية كمصدر
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"الصنف يجب اضافته مستخدما  مفتاح ""احصل علي الأصناف من المشتريات المستلمة """
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,رحلة التسليم
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,رحلة التسليم
 DocType: Student,A-,-A
 DocType: Share Transfer,Transfer Type,نوع النقل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,نفقات المبيعات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,نفقات المبيعات
 DocType: Consultation,Diagnosis,التشخيص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,مقابل
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,الرمز البريدي
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},اوامر البيع {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},اختر حساب دخل الفائدة في القرض {0}
 DocType: Opportunity,Contact Info,معلومات الاتصال
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,إنشاء إدخالات مخزون
 DocType: Packing Slip,Net Weight UOM,الوزن الصافي لوحدة القياس
 DocType: Item,Default Supplier,مزود الافتراضي
 DocType: Manufacturing Settings,Over Production Allowance Percentage,أكثر من الإنتاج بدل النسبة المئوية
-DocType: Employee Loan,Repayment Schedule,الجدول الزمني للسداد
+DocType: Loan,Repayment Schedule,الجدول الزمني للسداد
 DocType: Shipping Rule Condition,Shipping Rule Condition,حالة قاعدة الشحن
 DocType: Holiday List,Get Weekly Off Dates,الحصول على مواعيد الإيقاف الأسبوعي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,(تاريخ الانتهاء) لا يمكن أن يكون أقل من (تاريخ البدء)
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
 DocType: Education Settings,Attendance Freeze Date,تاريخ تجميد الحضور
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,ادرج بعض من الموردين الخاصين بك. ويمكن أن يكونوا منظمات أو أفراد.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,عرض جميع المنتجات
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,عرض جميع المنتجات
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),الحد الأدنى لسن الرصاص (أيام)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,كل الأصناف المركبة
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},الفندق غرف نوع {0} غير متوفرة على {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,من الموظف
 DocType: Driver,Cellphone Number,رقم الهاتف المحمول
 DocType: Project,Monitor Progress,التقدم المرئى
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
+DocType: Supplier Quotation,Auto Repeat Section,قسم التكرار التلقائي
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
 DocType: Appraisal Template Goal,Key Performance Area,وصف معيار التقييم
 DocType: Program Enrollment,Transportation,النقل
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,خاصية غير صالحة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} يجب أن يتم تقديمه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو تساوي {0}
+DocType: Department Approver,Department Approver,موافقة القسم
 DocType: SMS Center,Total Characters,مجموع أحرف
 DocType: Employee Advance,Claimed,ادعى
 DocType: Crop,Row Spacing,المسافة بين السطور
@@ -1488,7 +1486,8 @@
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,تفاصيل الفاتورة نموذج - س
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,دفع فاتورة المصالحة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,المساهمة %
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",وفقا لإعدادات الشراء إذا طلب الشراء == &#39;نعم&#39;، ثم لإنشاء فاتورة الشراء، يحتاج المستخدم إلى إنشاء أمر الشراء أولا للبند {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",وفقا لإعدادات الشراء إذا طلب الشراء == 'نعم'، لإنشاء فاتورة الشراء، يحتاج المستخدم إلى إنشاء أمر الشراء أولا للبند {0}
+,HSN-wise-summary of outward supplies,HSN-wise-summary of outward supplies
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ارقام تسجيل الشركة و ارقام ملفات الضرائب..... الخ
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,اسم الإجراء
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,بداية السنة
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},يجب أن يتطابق أول رقمين من غستين مع رقم الدولة {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,تاريخ بدء فترة الفاتورة الحالية
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,خطأ في تخطيط الإنتاجية
@@ -1516,30 +1515,30 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,لا شيء للطلب
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,حدد النطاقات الخاصة بك
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},سجل ميزانية اخر '{0}' مدخل مسبقاً   {1} '{2}' للسنة المالية {3}
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,سيتم نسخ الحقول فقط في وقت الإنشاء.
 DocType: Setup Progress Action,Domains,المجالات
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""تاريخ البدء الفعلي"" لا يمكن أن يكون بعد ""تاريخ الانتهاء الفعلي"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,الإدارة
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,الإدارة
 DocType: Cheque Print Template,Payer Settings,إعدادات الدافع
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,صافي الأجر (بالحروف) تكون مرئية بمجرد حفظ كشف راتب.
 DocType: Purchase Invoice,Is Return,هو العائد
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,الحذر
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',يوم البدء أكبر من يوم النهاية في المهمة &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ارجاع / اشعار مدين
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ارجاع / اشعار مدين
 DocType: Price List Country,Price List Country,قائمة الأسعار البلد
 DocType: Item,UOMs,وحدات القياس
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} أرقام تسلسلية صالحة للبند {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز السلعة للرقم التسلسلي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز السلعة للرقم التسلسلي
 DocType: Purchase Invoice Item,UOM Conversion Factor,عامل تحويل وحدة القياس
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,الرجاء إدخال كود البند للحصول على رقم باتش
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية للمواد
-DocType: Employee Loan,Partially Disbursed,صرف جزئ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,منح المعلومات.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,منح المعلومات.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,لا يمكنك إعادة تشغيل اشتراك غير ملغى.
 DocType: Account,Balance Sheet,المركز المالي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',مركز تكلفة للبند مع كود البند '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',مركز تكلفة للبند مع كود البند '
 DocType: Fee Validity,Valid Till,صالح حتى
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,مجموع اجتماع الأهل المعلمين
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",(طريقة الدفع) لم يتم ضبطها. يرجى التحقق، ما إذا كان كان تم تعيين حساب على (طريقة الدفع) أو على (ملف نقاط البيع).
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0}: لا يمكن إدخال الكمية المرفوضة في المشتريات الراجعة
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,لا يسمح بتغيير مجموعة العملاء للعميل المحدد.
 ,Purchase Order Items To Be Billed,تم اصدار فاتورة لأصناف امر الشراء
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,تحديث أوقات الوصول المقدرة.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,تحديث أوقات الوصول المقدرة.
 DocType: Program Enrollment Tool,Enrollment Details,تفاصيل التسجيل
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,يرجى تحديد عميل
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Purchase Order,Group same items,مادة نفس المجموعة
 DocType: Purchase Invoice,Disable Rounded Total,تعطيل الاجمالي المقرب
-DocType: Employee Loan Application,Repayment Info,معلومات السداد
+DocType: Department,Parent Department,قسم الآباء
+DocType: Loan Application,Repayment Info,معلومات السداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,المدخلات لا يمكن أن تكون فارغة
 DocType: Maintenance Team Member,Maintenance Role,دور الصيانة
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},صف مكرر {0} مع نفس {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},صف مكرر {0} مع نفس {1}
 ,Trial Balance,ميزان المراجعة
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,إعداد الموظفين
 DocType: Sales Order,SO-,وبالتالي-
 DocType: Hotel Room Reservation,Hotel Reservation User,فندق حجز المستخدم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,الرجاء اختيار البادئة اولا
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ابحاث
+DocType: Subscription Settings,Subscription Settings,إعدادات الاشتراك
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ابحاث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,يرجى تحديد خاصية واحدة على الأقل في جدول (الخاصيات)
 DocType: Announcement,All Students,جميع الطلاب
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",توجد مجموعة بند بنفس الاسم، يرجى تغيير اسم البند أو إعادة تسمية مجموعة البند
 DocType: Crop Cycle,Less than a year,أقل من عام
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,رقم موبايل الطالب
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 DocType: Crop,Yield UOM,العائد أوم
 ,Budget Variance Report,تقرير إنحرافات الموازنة
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
 DocType: Item,Is Item from Hub,هو البند من المحور
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,الصف {0}: نوع النشاط إلزامي.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,توزيع الأرباح
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,توزيع الأرباح
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,موازنة دفتر الأستاذ
 DocType: Stock Reconciliation,Difference Amount,مقدار الفرق
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},الدكتور {0} على الإجازة في {1}
 DocType: Purchase Invoice,Reverse Charge,تهمة العكسي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,أرباح محتجزة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,أرباح محتجزة
 DocType: Purchase Invoice,05-Change in POS,05-تغيير في نقاط البيع
 DocType: Vehicle Log,Service Detail,خدمة التفاصيل
 DocType: BOM,Item Description,وصف البند
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 ,Student and Guardian Contact Details,طالب والجارديان تفاصيل الاتصال
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,الصف {0}: للمورد {0} عنوان البريد الالكتروني مطلوب ليتم إرسال الايميل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,افتتاحي مؤقت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,افتتاحي مؤقت
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,مشاهدة ملف هاب
 ,Employee Leave Balance,رصيد اجازات الموظف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},يجب أن يكون رصيد الحساب {0} دائما {1}
 DocType: Patient Appointment,More Info,المزيد من المعلومات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},التقييم المعدل المطلوب لعنصر في الصف {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},التقييم المعدل المطلوب لعنصر في الصف {0}
 DocType: Supplier Scorecard,Scorecard Actions,إجراءات بطاقة الأداء
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,مثال: ماجستير في علوم الحاسوب
 DocType: Purchase Invoice,Rejected Warehouse,رفض مستودع
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,إلى
 DocType: Supplier Quotation Item,Lead Time in days,المهلة بالايام
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,ملخص الحسابات الدائنة
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},دفع الراتب من {0} إلى {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},دفع الراتب من {0} إلى {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},غير مخول بتعديل الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على فواتير معلقة
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,وصفات اختبار المختبر
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,صغير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,صغير
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,فتح أداة إنشاء الفاتورة البند
 DocType: Education Settings,Employee Number,رقم الموظف
+DocType: Subscription Settings,Cancel Invoice After Grace Period,إلغاء الفاتورة بعد فترة سماح
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
 DocType: Project,% Completed,٪ مكتمل
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,اختبار المختبر داتيتيم
 DocType: Email Digest,Add Quote,إضافة  عرض سعر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},معامل التحويل لوحدة القياس مطلوبةل:{0} في البند: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,نفقات غير مباشرة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,نفقات غير مباشرة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 DocType: Agriculture Analysis Criteria,Agriculture,الزراعة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,مزامنة البيانات الرئيسية
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حساب الدائن يمكن ربطه مقابل قيد مدين أخر
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,اشعار تسليم {0} لم يتم تقديمها
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,المعدات الكبيرة
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,المعدات الكبيرة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",خاصية قاعدة التسعير يمكن تطبيقها على  بند، فئة بنود او علامة التجارية.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,يرجى تعيين رمز العنصر أولا
 DocType: Item,ITEM-,بند-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
+DocType: Subscription Plan,Billing Interval Count,عدد الفواتير الفوترة
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 DocType: Antibiotic,Antibiotic,مضاد حيوي
 ,Team Updates,فريق التحديثات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,للمورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,للمورد
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,إنشاء تنسيق طباعة
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,مجموعة المواد لنقطة البيع
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,الملخصات من خلال البريد الإلكتروني:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,يجب ألا يكون الصنف البديل هو نفسه رمز الصنف
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},قائمة المواد {0} لا تنتمي إلى البند {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},قائمة المواد {0} لا تنتمي إلى البند {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06- الانتهاء من التقييم المؤقت
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
@@ -1737,11 +1740,11 @@
 DocType: Quality Inspection Reading,Reading 8,قراءة 8
 DocType: Sales Partner,Agent,وكيل
 DocType: Purchase Invoice,Taxes and Charges Calculation,حساب الضرائب والرسوم
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,كتاب استهلاك الأُصُول المدخلة تلقائيا
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,كتاب اهلاك الأُصُول المدخلة تلقائيا
 DocType: BOM Operation,Workstation,محطة العمل
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,طلب تسعيرة مزود
 DocType: Healthcare Settings,Registration Message,رسالة التسجيل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,هاردوير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,هاردوير
 DocType: Prescription Dosage,Prescription Dosage,وصفة الجرعة
 DocType: Attendance,HR Manager,مدير الموارد البشرية
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,الرجاء اختيار الشركة
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,تواريخ البدء والانتهاء
 ,Delivered Items To Be Billed,وحدات سلمت و لم يتم اصدار فواتيرها
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},فتح قائمة المواد {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
 DocType: Authorization Rule,Average Discount,متوسط التخفيض
 DocType: Project Update,Great/Quickly,كبيرة / بسرعة
 DocType: Purchase Invoice Item,UOM,وحدق القياس
@@ -1780,9 +1783,9 @@
 DocType: POS Profile,Accounting,المحاسبة
 DocType: Employee,EMP/,/EMP
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,يرجى تحديد دفعات لعنصر مطابق
-DocType: Asset,Depreciation Schedules,جداول الاستهلاك الزمني
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,قد يتم اختيار الحسابات التالية في إعدادات ضريبة السلع والخدمات:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن تكون خارج نطاق فترة الاجازات المخصصة
+DocType: Asset,Depreciation Schedules,جداول الاهلاك الزمني
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,قد يتم اختيار الحسابات التالية في إعدادات ضريبة السلع والخدمات:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن تكون خارج نطاق فترة الاجازات المخصصة
 DocType: Activity Cost,Projects,مشاريع
 DocType: Payment Request,Transaction Currency,عملية العملات
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},من {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,متوسط الصادر اليومي
 DocType: POS Profile,Campaign,حملة
 DocType: Supplier,Name and Type,اسم ونوع
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',حالة الموافقة يجب ان تكون (موافق عليه) او (مرفوض)
 DocType: Physician,Contacts and Address,جهات الاتصال والعنوان
 DocType: Purchase Invoice,Contact Person,الشخص الذي يمكن الاتصال به
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""تاريخ البدء المتوقع"" لا يمكن أن يكون بعد ""تاريخ الانتهاء المتوقع"""
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,الأهلية والتفاصيل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
 DocType: Leave Control Panel,Leave blank if considered for all designations,اتركها فارغه اذا كنت تريد تطبيقها لجميع المسميات الوظيفية
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,الرسوم من النوع (فعلي) في الصف {0} لا يمكن تضمينها في سعر البند
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,الرسوم من النوع (فعلي) في الصف {0} لا يمكن تضمينها في سعر البند
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,من (التاريخ والوقت)
 DocType: Email Digest,For Company,للشركة
 apps/erpnext/erpnext/config/support.py +17,Communication log.,سجل التواصل.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل الوصول إلى طلب عرض الاسعار من خلال البوابة الالكترونية، للمزيد تحقق من إعدادات البوابة الالكترونية.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سجل الأداء بطاقة الأداء المتغير
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,قيمة الشراء
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,قيمة الشراء
 DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاسم
 DocType: Material Request,Terms and Conditions Content,محتويات الشروط والأحكام
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,حدثت أخطاء أثناء إنشاء جدول الدورات التدريبية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,البند {0} ليس بند مخزون
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,سيتم تعيين أول Expense Approver في القائمة كمصاريف النفقات الافتراضية.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,البند {0} ليس بند مخزون
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,مملوك
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1839,15 +1844,16 @@
 DocType: Package Code,Package Code,كود حزمة
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,وضع تحت التدريب
 DocType: Purchase Invoice,Company GSTIN,شركة غستين
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,لا يسمح بالكميه السالبه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,لا يسمح بالكميه السالبه
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","التفاصيل الضرائب الجدول المنال من سيده البند كسلسلة وتخزينها في هذا المجال.
  المستخدمة للضرائب والرسوم"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقارير إلى نفسه.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقارير إلى نفسه.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا الحساب مجمد، يسمح بالدخول إلى المستخدمين المحددين.
 DocType: Email Digest,Bank Balance,الرصيد المصرفي
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},قيد محاسبي لي {0}: {1} يمكن إجراؤه بالعملة: {2} فقط
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,إجازة الموافقة إلزامية في طلب الإجازة
 DocType: Job Opening,"Job profile, qualifications required etc.",الملف الوظيفي ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,قد يكون مصطلح الدفع في الصف {0} مكررا.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),الزراعة (تجريبي)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,قائمة بمحتويات الشحنة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ايجار مكتب
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,إعدادات العبارة  SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,قائمة بمحتويات الشحنة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ايجار مكتب
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,إعدادات العبارة  SMS
 DocType: Disease,Common Name,اسم شائع
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,فشل الاستيراد !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,لم تتم إضافة أي عنوان حتى الآن.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
 DocType: Vital Signs,Blood Pressure,ضغط الدم
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,المحلل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,محلل
 DocType: Item,Inventory,جرد
 DocType: Item,Sales Details,تفاصيل المبيعات
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,التحقق من صحة دورة المسجلين للطلاب في مجموعة الطلاب
 DocType: Notification Control,Expense Claim Rejected,تم رفض طلب النفقات
 DocType: Item,Item Attribute,البند السمة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,حكومة
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,حكومة
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,المطالبة بالنفقات {0} بالفعل موجوده في سجل المركبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,اسم المؤسسة
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,الرجاء إدخال قيمة السداد
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,الرجاء إدخال قيمة السداد
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,متغيرات البند
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,الخدمات
 DocType: HR Settings,Email Salary Slip to Employee,إرسال كشف الراتب للموظفين بالبريد الالكتروني
 DocType: Cost Center,Parent Cost Center,مركز التكلفة الأب
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,اختر مزود ممكن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,اختر مزود ممكن
 DocType: Sales Invoice,Source,المصدر
 DocType: Customer,"Select, to make the customer searchable with these fields",حدد، لجعل العميل قابلا للبحث باستخدام هذه الحقول
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,مشاهدة مغلقة
@@ -1911,14 +1917,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,لم يتم العثور على أية سجلات في جدول الدفعات
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},هذا {0} يتعارض مع {1} عن {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلاب HTML
-DocType: POS Profile,Apply Discount,تطبيق التخفيض
+DocType: POS Profile,Apply Discount,تطبيق تخفيض
 DocType: GST HSN Code,GST HSN Code,غست هسن كود
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,مشاريع مفتوحة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,القائمة بمحتويات الشحنة إلغاؤها
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,تم إلغاء قائمة الشحنة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,التدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,رسوم الشحن
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,رسوم الشحن
 DocType: Homepage,Company Tagline for website homepage,توجية الشركة للصفحة الرئيسيه بالموقع الألكتروني
 DocType: Item Group,Item Group Name,اسم مجموعة السلعة
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ
@@ -1939,7 +1945,7 @@
 ,Support Hour Distribution,دعم توزيع ساعة
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 DocType: Student,Leaving Certificate Number,ترك رقم الشهادة
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +58,"Appointment cancelled, Please review and cancel the invoice {0}",تم إلغاء التعيين، يرجى مراجعة وإلغاء الفاتورة {0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +58,"Appointment cancelled, Please review and cancel the invoice {0}",تم إلغاء الموعد، يرجى مراجعة وإلغاء الفاتورة {0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,الكمية المتاحة من الباتش فى المخزن
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,تحديث تنسيق الطباعة
 DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعدة
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,تفاصيل العضوية
 DocType: Leave Block List,Block Holidays on important days.,حظر الاجازات في الايام المهمة
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),يرجى إدخال جميع قيم النتائج المطلوبة
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,ملخص الحسابات المدينة
-DocType: Employee Loan,Monthly Repayment Amount,قيمة السداد الشهري
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,ملخص الحسابات المدينة
+DocType: Loan,Monthly Repayment Amount,قيمة السداد الشهري
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,فتح الفواتير
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,الرجاء حدد هوية المستخدم في سجلات الموظف للتمكن من تحديد الدور الوظيفي للموظف
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,الرجاء حدد هوية المستخدم في سجلات الموظف للتمكن من تحديد الدور الوظيفي للموظف
 DocType: UOM,UOM Name,اسم وحدة القايس
 DocType: GST HSN Code,HSN Code,رمز هسن
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,قيمة المساهمة
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},تم تعيين المستخدم {0} بالفعل إلى الطبيب {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,المستودع الافتراضي للصنف المحدد متطلب
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,صندوق
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,مورد محتمل
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,مورد محتمل
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,التوزيع الشهري
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المرسل اليهم فارغة. يرجى إنشاء قائمة المرسل اليهم
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),الرعاية الصحية (إصدار تجريبي)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
-DocType: Employee Loan,Repayment Method,طريقة السداد
+DocType: Loan,Repayment Method,طريقة السداد
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",إذا تحققت، الصفحة الرئيسية ستكون المجموعة الافتراضية البند للموقع
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,مطالبات بمصاريف للشركة.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,الشهادة مطلوبة
 DocType: Company,Default Holiday List,قائمة العطل الافتراضية
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: (من الوقت) و (إلى وقت) ل {1}  يتداخل مع {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,خصوم المخزون
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,خصوم المخزون
 DocType: Purchase Invoice,Supplier Warehouse,المورد مستودع
 DocType: Opportunity,Contact Mobile No,الاتصال المحمول لا
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,حدد الشركة
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,قسم الطباعة
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,المستخدم {0} ليس لديه أي ملف تعريف افتراضي ل بوس. تحقق من الافتراضي في الصف {1} لهذا المستخدم.
 DocType: Student Group,Set 0 for no limit,مجموعة 0 لأي حد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,الصف {إدكس}: {فيلد} مطلوب لإنشاء الفواتير {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,العنوان الرئيسي وتفاصيل الاتصال
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال الدفعة عبر البريد الإلكتروني
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,الرجاء تحديد نطاق واحد على الأقل.
 DocType: Dependent Task,Dependent Task,مهمة تابعة
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},نوع الاجازة {0} لا يمكن أن يكون أطول من {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},نوع الاجازة {0} لا يمكن أن يكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,ايقاف التذكير بأعياد الميلاد
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},الرجاء تحديد الحساب افتراضي لدفع الرواتب في الشركة {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},الرجاء تحديد الحساب افتراضي لدفع الرواتب في الشركة {0}
 DocType: SMS Center,Receiver List,قائمة الاستقبال
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,بحث البند
 DocType: Payment Schedule,Payment Amount,دفع مبلغ
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,مقياس الدرجات
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,أنجزت بالفعل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,الأسهم، إلى داخل، أعطى
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,الأسهم، إلى داخل، أعطى
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,استيراد الناجحة !
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},طلب الدفعة موجود بالفعل {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة المواد المصروفة
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,بند المناقصة
 DocType: Customer,Customer POS Id,الرقم التعريفي لنقاط البيع للعملاء
 DocType: Account,Account Name,اسم الحساب
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,(من تاريخ) لا يمكن أن يكون أكبر (الي التاريخ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,المسلسل لا {0} كمية {1} لا يمكن أن يكون جزء
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,(من تاريخ) لا يمكن أن يكون أكبر (الي التاريخ)
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,المسلسل لا {0} كمية {1} لا يمكن أن يكون جزء
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,الرجاء إدخال عنوان URL لخادم Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,رقم قطعة المورد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,لا يمكن أن يكون معدل التحويل 0 أو 1
 DocType: Share Balance,To No,إلى لا
-DocType: Subscription,Reference Document,وثيقة مرجعية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ملغى أو موقف
 DocType: Accounts Settings,Credit Controller,مراقب الرصيد دائن
-DocType: Grant Application,Applicant Type,نوع مقدم الطلب
+DocType: Loan,Applicant Type,نوع مقدم الطلب
 DocType: Purchase Invoice,03-Deficiency in services,03 - نقص في الخدمات
 DocType: Delivery Note,Vehicle Dispatch Date,سيارة الإرسال التسجيل
 DocType: Healthcare Settings,Default Medical Code Standard,المعايير الطبية الافتراضية
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ مفوترة
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,الموارد البشرية
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,الدخل الأعلى
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ارفض
 DocType: Journal Entry Account,Debit in Company Currency,الخصم في الشركة العملات
 DocType: BOM Item,BOM Item,بند قائمة المواد
 DocType: Appraisal,For Employee,للموظف
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,أنشي قيد صرق قرض
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,أنشي قيد صرق قرض
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,الصف {0}:  الدفعة المقدمة مقابل المورد يجب أن تكون مدين
 DocType: Company,Default Values,قيم افتراضية
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),الإجمالي (بدون ضريبة)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,عدد الرصاص
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} يجب أن يكون أكبر من 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,مخزون متاح
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,مخزون متاح
 DocType: Manufacturing Settings,Capacity Planning For (Days),القدرة على التخطيط لل(أيام)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,الشراء
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,حقل إلزامي - البرنامج
 DocType: Special Test Template,Result Component,مكون النتيجة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,مطالبة بالضمان
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ايام العطل التي ضمن الإجازات تحسب إجازة
 DocType: Sales Invoice,Packed Items,عناصر معبأة
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,المطالبة الضمان ضد رقم المسلسل
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;مجموع&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;مجموع&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,تمكين سلة التسوق
 DocType: Employee,Permanent Address,العنوان الدائم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,15 +2155,15 @@
 DocType: Selling Settings,Selling Settings,إعدادات البيع
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,تأكيد الإجراء
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,مزادات على الانترنت
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,استيفاء
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,عرض في العربة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,نفقات تسويقية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,نفقات تسويقية
 ,Item Shortage Report,تقرير نقص السلعة
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,لا يمكن إنشاء معايير قياسية. يرجى إعادة تسمية المعايير
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,تاريخ الاستهلاك التالي للأصول الجديدة الزامي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,تاريخ الاهلاك التالي للأصول الجديدة الزامي
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,مجموعة منفصلة بالطبع مقرها لكل دفعة
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,واحد وحدة من عنصر.
 DocType: Fee Category,Fee Category,فئة الرسوم
@@ -2165,7 +2171,7 @@
 DocType: Drug Prescription,Dosage by time interval,الجرعة بواسطة الفاصل الزمني
 DocType: Cash Flow Mapper,Section Header,مقطع الرأس
 ,Student Fee Collection,طالب رسوم مجموعة
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +24,Appointment Duration (mins),الموعد المحدد (دقيقة)
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +24,Appointment Duration (mins),المدة الزمنية للموعد (دقيقة)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,اعمل قيد محاسبي لكل حركة للمخزون
 DocType: Leave Allocation,Total Leaves Allocated,إجمالي الاجازات المخصصة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,الحصول على نموذج
 DocType: Material Request,Transferred,نقل
 DocType: Vehicle,Doors,الأبواب
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,اكتمل الإعداد ERPNext !
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,اكتمل الإعداد ERPNext !
 DocType: Healthcare Settings,Collect Fee for Patient Registration,تحصيل رسوم تسجيل المريض
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,لا يمكن تغيير سمات بعد معاملة الأسهم. جعل عنصر جديد ونقل الأسهم إلى البند الجديد
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,لا يمكن تغيير سمات بعد معاملة الأسهم. جعل عنصر جديد ونقل الأسهم إلى البند الجديد
 DocType: Course Assessment Criteria,Weightage,الوزن
 DocType: Purchase Invoice,Tax Breakup,تفكيك الضرائب
 DocType: Packing Slip,PS-,ملحوظة:
@@ -2204,7 +2210,7 @@
 ,Item-wise Sales Register,سجل مبيعات الصنف
 DocType: Asset,Gross Purchase Amount,اجمالي مبلغ المشتريات
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,أرصدة الافتتاح
-DocType: Asset,Depreciation Method,طريقة الاستهلاك
+DocType: Asset,Depreciation Method,طريقة الاهلاك
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,هل هذه الضريبة متضمنة في الاسعار الأساسية؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,إجمالي المستهدف
 DocType: Soil Texture,Sand Composition (%),تكوين الرمل (٪)
@@ -2213,11 +2219,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,المصالحة JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Purchase Invoice Item,Batch No,رقم دفعة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,سلف الموظفين
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح بعدة أوامر البيع ضد طلب شراء العميل
 DocType: Student Group Instructor,Student Group Instructor,مجموعة الطالب
 DocType: Grant Application,Assessment  Mark (Out of 10),علامة التقييم (من أصل 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 رقم الجوال
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,رئيسي
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
@@ -2226,15 +2233,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,(الفرصة من) حقل إلزامي
 DocType: Email Digest,Annual Expenses,المصروفات السنوية
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,انشاء طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,انشاء طلب شراء
 DocType: SMS Center,Send To,أرسل إلى
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
 DocType: Sales Team,Contribution to Net Total,المساهمة في صافي إجمالي
 DocType: Sales Invoice Item,Customer's Item Code,كود صنف العميل
 DocType: Stock Reconciliation,Stock Reconciliation,جرد المخزون
 DocType: Territory,Territory Name,اسم الأرض
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,يمكنك فقط الحصول على خطط مع دورة الفواتير نفسها في الاشتراك
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,المتقدم للحصول على الوظيفة.
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
@@ -2243,10 +2251,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه  أي قيد {1} غيرمتطابق
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,تقييمات
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,أحداث التدريب
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,تقدم العروض حسب المصدر الرصاص.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرط للحصول على قانون الشحن
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,من فضلك ادخل
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,من فضلك ادخل
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,سجل الصيانة
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,يرجى ضبط الفلتر على أساس البند أو المخزن
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن صافي من هذه الحزمة. (تحسب تلقائيا مجموع الوزن الصافي للسلعة)
@@ -2254,11 +2262,11 @@
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: Student Group,Instructors,المحاضرون
 DocType: GL Entry,Credit Amount in Account Currency,المبلغ الدائن بعملة الحساب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,قائمة المواد {0} يجب تقديمها
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,قائمة المواد {0} يجب تقديمها
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,إدارة المشاركة
 DocType: Authorization Control,Authorization Control,التحكم في الترخيص
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: (مخزن المواد المرفوضه) إلزامي مقابل البند المرفوض {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,دفع
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",مستودع {0} غير مرتبط بأي حساب، يرجى ذكر الحساب في سجل المستودع أو تعيين حساب المخزون الافتراضي في الشركة {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,إدارة طلباتك
 DocType: Work Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
@@ -2267,8 +2275,8 @@
 DocType: Course,Course Abbreviation,اختصار المقرر التعليمي
 DocType: Student Leave Application,Student Leave Application,طالب ترك التطبيق
 DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، لانها بالفعل {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},الموظف {0} لديه اجازة نصف يوم في {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصل، لانه بالفعل {0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},الموظف {0} لديه اجازة نصف يوم في {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,في
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,حزمة البنود في وقت البيع.
@@ -2278,7 +2286,7 @@
 DocType: Item,Barcodes,الباركود
 DocType: Hub Category,Hub Node,المحور عقدة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,مساعد
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,مساعد
 DocType: Asset Movement,Asset Movement,حركة الأصول
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,يجب تقديم طلب العمل {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,سلة جديدة
@@ -2296,13 +2304,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,يجب أن تكون عملة الفوترة مساوية لعملة الشركة الافتراضية أو عملة حساب الطرف
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
 DocType: Soil Texture,Loam,طين
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ النشر
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ النشر
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,انشئ تدوين مدفوعات
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
 DocType: Leave Application,Apply / Approve Leaves,تقديم / الموافقة على أجازة
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,لأجل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,شجرة من مراكز التكلفة المالية.
 DocType: Serial No,Delivery Document No,الوثيقة لا تسليم
@@ -2313,10 +2320,10 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Selling must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق البيع، إذا تم تحديد مطبق للك {0}
 DocType: Production Plan Material Request,Material Request Date,تاريخ طلب المادة
 DocType: Purchase Order Item,Supplier Quotation Item,المورد اقتباس الإغلاق
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,لم يتم تعيين استهلاك المواد في إعدادات التصنيع.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,لم يتم تعيين اهلاك المواد في إعدادات التصنيع.
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",لا يمكن المبالغة في البند {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة، يرجى تعيينه في إعدادات الأسهم
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",لا يمكن المبالغة في البند {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة، يرجى تعيينه في إعدادات الأسهم
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,تحديث الرد
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
@@ -2327,12 +2334,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,حدد البرنامج أولا
 DocType: Patient Appointment,Patient Age,عمر المريض
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,إدارة المشاريع
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,المسلسل no {0} قد تم إرجاعه بالفعل
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,المسلسل no {0} قد تم إرجاعه بالفعل
 DocType: Supplier,Supplier of Goods or Services.,المورد من السلع أو الخدمات.
 DocType: Budget,Fiscal Year,السنة المالية
 DocType: Asset Maintenance Log,Planned,مخطط
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,الحسابات المستحقة القبض الافتراضية لاستخدامها إذا لم يتم تعيين في المريض لحجز رسوم التشاور.
 DocType: Vehicle Log,Fuel Price,أسعار الوقود
+DocType: Bank Guarantee,Margin Money,المال الهامش
 DocType: Budget,Budget,ميزانية
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,تعيين فتح
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,بند الأصول الثابتة يجب أن لا يكون بند مخزون.
@@ -2346,16 +2354,16 @@
 DocType: Lead,Follow Up,متابعة
 DocType: Item,Is Sales Item,صنف المبيعات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,شجرة فئات البنود
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
 ,Amount to Deliver,المبلغ تسليم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},تم إدخال نفس العنصر عدة مرات. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ البدء الأجل لا يمكن أن يكون أقدم من تاريخ بداية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,كانت هناك أخطاء .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,الموظف {0} قد طبق بالفعل على {1} بين {2} و {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,كانت هناك أخطاء .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,الموظف {0} قد طبق بالفعل على {1} بين {2} و {3}:
 DocType: Guardian,Guardian Interests,الجارديان الهوايات
 DocType: Naming Series,Current Value,القيمة الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد سنوات مالية متعددة للتاريخ {0}. يرجى تحديد الشركة في السنة المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد سنوات مالية متعددة للتاريخ {0}. يرجى تحديد الشركة في السنة المالية
 DocType: Education Settings,Instructor Records to be created by,سجلات المعلم ليتم إنشاؤها من قبل
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} تم انشاؤه
 DocType: GST Account,GST Account,حساب ضريبة السلع والخدمات
@@ -2373,9 +2381,9 @@
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ الترحيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,وأضاف إلى المفضلة
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,لم يتم العثور على أي زلة الراتب لتقديم المعايير المذكورة أعلاه أو زلة الراتب قدمت بالفعل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,الرسوم والضرائب
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,إضافة الى المفضلة
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,لم يتم العثور على أي زلة الراتب لتقديم المعايير المذكورة أعلاه أو زلة الراتب قدمت بالفعل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,الرسوم والضرائب
 DocType: Projects Settings,Projects Settings,إعدادات المشاريع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,من فضلك ادخل تاريخ المرجع
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} لا يمكن فلترة المدفوعات المدخلة  {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,شجرة مجموعات البنود .
 DocType: Production Plan,Total Produced Qty,إجمالي الكمية المنتجة
 DocType: Payroll Entry,Get Employee Details,الحصول على تفاصيل الموظف
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 DocType: Asset,Sold,تم البيع
 ,Item-wise Purchase History,الحركة التاريخيه للمشتريات وفقا للصنف
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"الرجاء النقر على ""إنشاء جدول"" لجلب الرقم التسلسلي المضاف للبند {0}"
 DocType: Account,Frozen,مجمد
 DocType: Sales Invoice Payment,Base Amount (Company Currency),المبلغ الأساسي (عملة الشركة )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,مواد أولية
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,مواد أولية
 DocType: Payment Reconciliation Payment,Reference Row,إشارة الصف
 DocType: Installation Note,Installation Time,تثبيت الزمن
 DocType: Sales Invoice,Accounting Details,تفاصيل المحاسبة
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,حذف جميع المعاملات لهذه الشركة
 DocType: Patient,O Positive,O إيجابي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,الاستثمارات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,المخصصات
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,معايير القبول
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,الرجاء إدخال طلبات المواد في الجدول أعلاه
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,لا توجد مدفوعات متاحة لمدخل المجلة
 DocType: Item Attribute,Attribute Name,السمة اسم
 DocType: BOM,Show In Website,تظهر في الموقع
 DocType: Shopping Cart Settings,Show Quantity in Website,تظهر الكمية في الموقع
-DocType: Employee Loan Application,Total Payable Amount,المبلغ الكلي المستحق
+DocType: Loan Application,Total Payable Amount,المبلغ الكلي المستحق
 DocType: Task,Expected Time (in hours),الوقت المتوقع (بالساعات)
 DocType: Item Reorder,Check in (group),تحقق في (مجموعة)
 DocType: Soil Texture,Silt,طمي
@@ -2424,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,قم بالدفع
 DocType: Room,Room Name,اسم القاعة
 DocType: Prescription Duration,Prescription Duration,مدة الوصفة الطبية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",الاجازة لا يمكن تطبيقها او إلغائها قبل {0}، لان رصيد الإجازات قد تم تحويله الي سجل تخصيص إجازات مستقبلي {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",الاجازة لا يمكن تطبيقها او إلغائها قبل {0}، لان رصيد الإجازات قد تم تحويله الي سجل تخصيص إجازات مستقبلي {1}
 DocType: Activity Cost,Costing Rate,سعر التكلفة
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,عنوان العميل ومعلومات الاتصال الخاصة به
 ,Campaign Efficiency,كفاءة الحملة
@@ -2442,11 +2451,11 @@
 DocType: Chapter,Chapter,الفصل
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,زوج
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,سيتم تحديث الحساب الافتراضي تلقائيا في فاتورة نقاط البيع عند تحديد هذا الوضع.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
-DocType: Asset,Depreciation Schedule,جدول الاستهلاك الزمني
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
+DocType: Asset,Depreciation Schedule,جدول الاهلاك الزمني
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,عناوين شركاء المبيعات والاتصالات
 DocType: Bank Reconciliation Detail,Against Account,مقابل الحساب
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,يجب أن يكون تاريخ نصف يوم ما بين التاريخ والتاريخ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,يجب أن يكون تاريخ نصف يوم ما بين التاريخ والتاريخ
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,يرجى تعيين مركز التكلفة الافتراضي في الشركة {0}.
 DocType: Item,Has Batch No,ودفعة واحدة لا
@@ -2459,12 +2468,11 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,لا يمكن أن تولد السرية
 DocType: Volunteer,Volunteer Type,نوع التطوع
 DocType: Student,Personal Details,تفاصيل شخصي
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"يرجى تحديد ""مركز تكلفة استهلاك الأصول"" للشركة {0}"
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"يرجى تحديد ""مركز تكلفة اهلاك الأصول"" للشركة {0}"
 ,Maintenance Schedules,جداول الصيانة
 DocType: Task,Actual End Date (via Time Sheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)
 DocType: Soil Texture,Soil Type,نوع التربة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},مبلغ {0} {1} مقابل {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,رسالة جديدة
 ,Quotation Trends,مؤشرات المناقصة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},فئة البند غير مذكورة في ماستر البند لهذا البند {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless الانتداب
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,فئة المحور
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
-DocType: Employee Loan,Loan Amount,قيمة القرض
+DocType: Loan,Loan Amount,قيمة القرض
 DocType: Student Report Generation Tool,Add Letterhead,إضافة ترويسة
 DocType: Program Enrollment,Self-Driving Vehicle,سيارة ذاتية القيادة
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,المورد بطاقة الأداء الدائمة
@@ -2511,10 +2519,10 @@
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 DocType: Cash Flow Mapper,Position,موضع
 DocType: Patient,Patient Details,تفاصيل المريض
-DocType: Patient,B Positive,B إيجابي
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1، حيث أن البند هو اصول ثابتة. الرجاء استخدام صف منفصل لكمية متعددة.
+DocType: Patient,B Positive,B موجب
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1، حيث أن البند هو اصول ثابتة. الرجاء استخدام صف منفصل لكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او به مسافة
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او به مسافة
 DocType: Patient Medical Record,Patient Medical Record,السجل الطبي للمريض
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,(من تصنيف (مجموعة) إلى تصنيف (غير المجموعة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,الرياضة
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,الإجمالي الفعلي
 DocType: Lab Test UOM,Test UOM,اختبار أوم
 DocType: Student Siblings,Student Siblings,الإخوة والأخوات الطلاب
+DocType: Subscription Plan Detail,Subscription Plan Detail,تفاصيل خطة الاشتراك
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,وحدة
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,يرجى تحديد شركة
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,يرجى تحديد شركة
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Asset Maintenance Task,Maintenance Task,مهمة الصيانة
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,الرجاء تعيين حد B2C في إعدادات غست.
@@ -2537,6 +2546,7 @@
 ,BOM Search,BOM البحث
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),إجمالي تكلفة المواد المستهلكة (عبر إدخال المخزون)
 DocType: Hub Settings,Company Registered,شركة مسجلة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,لا يمكن أن يكون تاريخ التاريخ أقل من تاريخ
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",نشر &quot;في الأوراق المالية&quot; أو &quot;غير متوفر&quot; على المحور استنادا إلى الأسهم المتوفرة في هذا المستودع.
 DocType: Vehicle,Fuel Type,نوع الوقود
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,يرجى تحديد العملة للشركة
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},توازن الأسهم في الدفعة {0} ستصبح سلبية {1} القطعة ل{2} في {3} مستودع
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود
 DocType: Email Digest,Pending Sales Orders,طلبات مبيعات معلقة
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 DocType: Employee,Create User Permission,خلق إذن المستخدم
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة البند&gt; العلامة التجارية
 DocType: Healthcare Settings,Remind Before,تذكير من قبل
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},معامل تحويل وحدة القياس مطلوب في الصف: {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون نوع الوثيقة المرجعي واحدة منن الاتي اما طلب مبيعات او فاتورة مبيعات أو قيد دفتر يومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون نوع الوثيقة المرجعي واحدة منن الاتي اما طلب مبيعات او فاتورة مبيعات أو قيد دفتر يومية
 DocType: Salary Component,Deduction,خصم
 DocType: Item,Retain Sample,الاحتفاظ عينة
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية.
 DocType: Stock Reconciliation Item,Amount Difference,مقدار الفرق
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},سعر السلعة تم اضافتة لـ {0} في قائمة الأسعار {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},سعر السلعة تم اضافتة لـ {0} في قائمة الأسعار {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,الرجاء إدخال (رقم هوية الموظف) لمندوب المبيعات هذا
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,في الانتاج
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,حساب رصيد الحساب المصرفي
 DocType: Normal Test Template,Normal Test Template,قالب الاختبار العادي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,المستخدم معطل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,عرض أسعار
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,لا يمكن تعيين رفق وردت إلى أي اقتباس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,عرض أسعار
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,لا يمكن تعيين رفق وردت إلى أي اقتباس
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,حدد حسابا للطباعة بعملة الحساب
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ويستند هذا إلى المعاملات ضد هذا المريض. انظر الجدول الزمني أدناه للحصول على التفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,تم تحديث التكلفة
 DocType: Patient,Date of Birth,تاريخ الميلاد
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,تمت إرجاع البند {0} من قبل
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,تمت إرجاع البند {0} من قبل
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** تمثل السنة المالية. يتم تتبع جميع القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل ** السنة المالية **.
 DocType: Opportunity,Customer / Lead Address,الزبون/ عنوان الزبون المحتمل
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,إعداد بطاقة الأداء المورد
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),قابلة للتطبيق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,الوصف الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,الوصف الوظيفي
 DocType: Student Applicant,Applied,طُبق
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,إعادة فتح
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,إعادة فتح
 DocType: Sales Invoice Item,Qty as per Stock UOM,الكمية حسب السهم لوحدة قياس السهم
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,اسم Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-خصم ما بعد البيع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع حملات المبيعات. تتبع الزبون المحتمل، العروض، طلبات المبيعات ... الخ من الحملات لقياس العائد على الاستثمار.
+DocType: Department Approver,Approver,المخول بالموافقة
 ,SO Qty,كمية طلبات الشراء
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,لا يمكن ترك الحقل للمساهم فارغا
 DocType: Guardian,Work Address,عنوان العمل
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),إجمالي المبلغ المخصص (شركة العملات)
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 DocType: BOM,Scrap Material Cost,التكلفة الخردة المواد
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,رقم المسلسل {0} لا تنتمي إلى أي مستودع
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,رقم المسلسل {0} لا تنتمي إلى أي مستودع
 DocType: Grant Application,Email Notification Sent,تم إرسال إشعار البريد الإلكتروني
 DocType: Purchase Invoice,In Words (Company Currency),في الأحرف ( عملة الشركة )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",رمز البند، مستودع، الكمية المطلوبة على الصف
-DocType: Pricing Rule,Supplier,المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",رمز البند، مستودع، الكمية المطلوبة على الصف
+DocType: Bank Guarantee,Supplier,المورد
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,عرض تفاصيل الدفع
-DocType: Consultation,Consultation Time,وقت التشاور
+DocType: Consultation,Consultation Time,وقت الاستشارة
 DocType: C-Form,Quarter,ربع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,نفقات متنوعة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,نفقات متنوعة
 DocType: Global Defaults,Default Company,الشركة الافتراضية
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب النفقات أو حساب الفروقات إلزامي للبند {0} لأنه يؤثر على القيمة الإجمالية للمخزون
 DocType: Payment Request,PR,العلاقات العامة
 DocType: Cheque Print Template,Bank Name,اسم المصرف
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-أعلى
-DocType: Employee Loan,Employee Loan Account,حساب قرض الحاص بالموظف
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسال الايميل إلى المستخدم الغير نشط
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,عدد مرات التفاعل
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),الوزن (بالكيلوجرام)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",فصول / Chapter_name ترك فارغة تعيين تلقائيا بعد حفظ الفصل.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,يرجى تعيين حسابات ضريبة السلع والخدمات في إعدادات غست
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,يرجى تعيين حسابات ضريبة السلع والخدمات في إعدادات غست
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,نوع من الاعمال
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",الرجاء تحديد القيمة المخصصة و نوع الفاتورة ورقم الفاتورة على الأقل  في صف واحد
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,تكلفة الشراء الجديد
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,وصف المنحة
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
 DocType: Student Guardian,Others,آخرون
+DocType: Subscription,Discounts,خصومات
 DocType: Payment Entry,Unallocated Amount,المبلغ غير المخصصة
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على بند مطابق. يرجى اختيار قيمة أخرى ل {0}.
 DocType: POS Profile,Taxes and Charges,الضرائب والرسوم
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",منتج أو خدمة تم شراؤها أو بيعها أو حفظها في المخزون.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,لا مزيد من التحديثات
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,وهذا يغطي جميع بطاقات الأداء مرتبطة بهذا الإعداد
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,البند الأبن لا ينبغي أن يكون (حزمة منتجات). الرجاء إزالة البند `{0}` والحفظ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,الخدمات المصرفية
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,خدمة البند
 DocType: Bank Guarantee,Bank Guarantee,ضمان بنكي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"يرجى النقر على ""إنشاء الجدول الزمني"" للحصول على الجدول الزمني"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة ترقيم الإعداد للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Bin,Ordered Quantity,الكمية التي تم طلبها
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","مثلا ""أدوات البناء للبنائين"""
 DocType: Grading Scale,Grading Scale Intervals,فواصل درجات مقياس
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,الربح السنوي
+DocType: Bank Guarantee,Name of Bank,اسم البنك
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}
 DocType: Fee Schedule,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,التخفيض من ناحية البنود
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,شجرة الحسابات المالية.
+DocType: Bank Guarantee,Reference Document Type,مرجع نوع الوثيقة
 DocType: Cash Flow Mapping,Cash Flow Mapping,تخطيط التدفق النقدي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} مقابل طلب مبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,جرد المتسلسلة
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,لم يتم العثور على البريد الإلكتروني في جهة الاتصال الافتراضية
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,توليد سر
-DocType: Employee Loan,Account Info,معلومات الحساب
+DocType: Loan,Account Info,معلومات الحساب
 DocType: Activity Type,Default Billing Rate,سعر الفوترة الافتراضي
 DocType: Fees,Include Payment,تضمين الدفع
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} تم إنشاء مجموعات الطلاب.
 DocType: Sales Invoice,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,البرنامج في هيكل الرسوم ومجموعة الطلاب {0} مختلفة.
 DocType: Fee Schedule,Receivable Account,حساب مدين
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصل {1} هو بالفعل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصل {1} هو بالفعل {2}
 DocType: Quotation Item,Stock Balance,رصيد المخزون
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ترتيب مبيعات لدفع
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,المدير التنفيذي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,المدير التنفيذي
 DocType: Purchase Invoice,With Payment of Tax,مع دفع الضرائب
 DocType: Expense Claim Detail,Expense Claim Detail,تفاصيل  المطالبة بالنفقات
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,تريبليكات للمورد
 DocType: Land Unit,Is Container,حاوية
 DocType: Crop Cycle,This will be day 1 of the crop cycle,وسيكون هذا اليوم 1 من دورة المحاصيل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,يرجى اختيارالحساب الصحيح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,يرجى اختيارالحساب الصحيح
 DocType: Purchase Invoice Item,Weight UOM,وحدة قياس الوزن
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,قائمة المساهمين المتاحين بأرقام الأوراق
 DocType: Salary Structure Employee,Salary Structure Employee,هيكلية مرتب الموظف
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,عرض سمات متغير
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,عرض سمات متغير
 DocType: Student,Blood Group,فصيلة الدم
 DocType: Course,Course Name,اسم المقرر التعليمي
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,المستخدمين الذين يمكنهم الموافقة على الطلبات إجازة موظف معين
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,أدوات مكتبية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,أدوات مكتبية
 DocType: Purchase Invoice Item,Qty,الكمية
 DocType: Fiscal Year,Companies,شركات
 DocType: Supplier Scorecard,Scoring Setup,سجل الإعداد
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,مدين الي مطلوب
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة أسعار الشراء
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,قائمة أسعار الشراء
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,نماذج من متغيرات بطاقة الأداء المورد.
 DocType: Job Offer Term,Offer Term,عرض عمل
 DocType: Asset,Quality Manager,مدير الجودة
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},عدد غير مدفوع: {0}
 DocType: BOM Website Operation,BOM Website Operation,عملية الموقع الالكتروني بقائمة المواد
 DocType: Supplier Scorecard,Supplier Score,المورد نقاط
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,إجمالي الفاتورة AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,إجمالي الفاتورة AMT
 DocType: Supplier,Warn RFQs,تحذير رفق
 DocType: BOM,Conversion Rate,معدل التحويل
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,بحث عن منتج
 DocType: Assessment Plan,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الدور الوظيفي الذي لديه صلاحية الموافقة على قيمة اعلى من القيمة المرخص بها
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,دائن الى حساب يجب أن يكون حساب دائن
+DocType: Loan,Total Amount Paid,مجموع المبلغ المدفوع
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,يرجى اختيار قبول الطالب الذي هو إلزامي للمتقدم طالب طالب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},تكرار قائمة المواد: {0} لا يمكن ان يكون أب او أبن من {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,يرجى تحديد قائمة الأسعار لنشر التسعير
@@ -2741,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قائمة الأسعار {0} معطله
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},الصف {0}: الكمية المكتملة لا يمكن أن تكون أكثر من {1} للعملية {2}
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",المسلسل البند {0} لا يمكن تحديثه باستخدام الأسهم المصالحة، يرجى استخدام دخول الأسهم
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",المسلسل البند {0} لا يمكن تحديثه باستخدام الأسهم المصالحة، يرجى استخدام دخول الأسهم
 DocType: Training Event Employee,Training Event Employee,تدريب الموظف للحدث
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,الحد الأقصى للعينات - {0} يمكن الاحتفاظ بالدفعة {1} والبند {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,إضافة فسحة وقت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} الرقم التسلسلي مطلوب للعنصر {1}. لقد قدمت {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} الرقم التسلسلي مطلوب للعنصر {1}. لقد قدمت {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,معدل التقييم الحالي
 DocType: Training Event,Advance,متقدم
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,لجعل تكرار مرة أخرى.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,إعدادات بوابة الدفع GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,أرباح / خسائر الناتجة عن صرف العملة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,أرباح / خسائر الناتجة عن صرف العملة
 DocType: Opportunity,Lost Reason,فقد السبب
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},تعذر العثور على دوكتيب {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,الكمية الفعلية
 DocType: Shipping Rule,example: Next Day Shipping,مثال:شحن اليوم التالي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,الرقم التسلسلي {0} غير موجود
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},تم الاشتراك {0}
 DocType: Fee Schedule Program,Fee Schedule Program,برنامج جدول الرسوم
 DocType: Fee Schedule Program,Student Batch,دفعة طالب
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,أنشاء طالب
@@ -2781,19 +2795,18 @@
 DocType: Leave Block List Date,Block Date,تاريخ الحظر
 DocType: Crop,Crop,ا &amp; قتصاص
 DocType: Purchase Receipt,Supplier Delivery Note,المورد تسليم مذكرة
-apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,تقدم الآن
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,تطبيق
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},الكمية الفعلية {0} / الكمية المنتظره {1}
 DocType: Purchase Invoice,E-commerce GSTIN,التجارة الإلكترونية غستين
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
 ,Bank Clearance Summary,ملخص التخليص البنكى
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",إنشاء وإدارة البريد الإلكتروني يوميا وأسبوعية وشهرية .
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",إنشاء وإدارة البريد الإلكتروني يوميا وأسبوعية وشهرية .
 DocType: Appraisal Goal,Appraisal Goal,الغاية من التقييم
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,اقتراح فئة؟
 DocType: Stock Reconciliation Item,Current Amount,المبلغ الحالي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,المباني
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,المباني
 DocType: Fee Schedule,Fee Structure,هيكلية الرسوم
 DocType: Timesheet Detail,Costing Amount,تكلف مبلغ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 DocType: Student Admission Program,Application Fee,رسوم الإستمارة
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,الموافقة كشف الرواتب
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,أعلي تخفيض للبند {0} هو {1}٪
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
 DocType: SMS Log,Sender Name,اسم المرسل
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,معايير التحليل الزراعي
+DocType: HR Settings,Leave Approval Notification Template,اترك قالب إعلام الموافقة
 DocType: POS Profile,[Select],[اختر ]
 DocType: Vital Signs,Blood Pressure (diastolic),ضغط الدم (الانبساطي)
 DocType: SMS Log,Sent To,يرسل الى
 DocType: Agriculture Task,Holiday Management,إدارة العطلات
 DocType: Payment Request,Make Sales Invoice,انشاء فاتورة المبيعات
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,البرامج الالكترونية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,البرامج الالكترونية
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,(تاريخ الاتصال التالي) لا يمكن أن تكون في الماضي
 DocType: Company,For Reference Only.,للإشارة او المرجعية فقط.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},طبيب {0} غير متوفر على {1}
@@ -2822,9 +2836,9 @@
 DocType: Journal Entry,Reference Number,الرقم المرجعي لل
 DocType: Employee,Employment Details,تفاصيل الوظيفة
 DocType: Employee,New Workplace,مكان العمل الجديد
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,استهلاك المواد
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,اهلاك المواد
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,على النحو مغلق
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},أي عنصر مع الباركود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},أي عنصر مع الباركود {0}
 DocType: Normal Test Items,Require Result Value,تتطلب قيمة النتيجة
 DocType: Item,Show a slideshow at the top of the page,تظهر الشرائح في أعلى الصفحة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,قوائم المواد
@@ -2832,26 +2846,26 @@
 DocType: Project Type,Projects Manager,مدير المشاريع
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +33,Ageing Based On,العمرعلى أساس
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +61,Appointment cancelled,تم إلغاء التعيين
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +61,Appointment cancelled,تم إلغاء الموعد
 DocType: Item,End of Life,نهاية الحياة
 apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,السفر
 DocType: Student Report Generation Tool,Include All Assessment Group,تشمل جميع مجموعة التقييم
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,لا يوجد هيكل راتب افتراضيي نشط للموظف {0} للتواريخ المحددة
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
 DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,تواتري
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,تفاصيل نموذج رسم التدفق النقدي
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,إدارة القروض
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,تتبع الدخل والنفقات منفصل عن القطاعات المنتج أو الانقسامات.
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,عرض كشف الراتب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,نقل المواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,عرض كشف الراتب
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,نقل المواد
 DocType: Fees,Send Payment Request,إرسال طلب الدفع
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 DocType: Water Analysis,Origin,الأصل
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,هي مسؤولية ضريبة الدخل
 DocType: Grading Scale Interval,Grade Description,الصف الوصف
 DocType: Stock Entry,Purchase Receipt No,لا شراء استلام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,العربون
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,العربون
 DocType: Sales Invoice, Shipping Bill Number,رقم فاتورة الشحن
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,التتبع
 DocType: Asset Maintenance Log,Actions performed,الإجراءات المنجزة
 DocType: Cash Flow Mapper,Section Leader,قائد قسم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),(مصدر الأموال  (الخصوم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),(مصدر الأموال  (الخصوم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,موظف
+DocType: Bank Guarantee,Fixed Deposit Number,رقم الوديعة الثابتة
 DocType: Asset Repair,Failure Date,تاريخ الفشل
 DocType: Sample Collection,Collected Time,الوقت الذي تم جمعه
 DocType: Company,Sales Monthly History,المبيعات التاريخ الشهري
@@ -2890,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,هل تريد بالتأكيد إلغاء هذا الموعد؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,غرفة فندق بريسينغ باكيج
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط أنابيب المبيعات
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},الرجاء تحديد حساب افتراضي في مكون الراتب {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},الرجاء تحديد حساب افتراضي في مكون الراتب {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب في
 DocType: Rename Tool,File to Rename,إعادة تسمية الملف
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},الرجاء تحديد قائمة المواد للبند في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,جلب تحديثات الاشتراك
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},الحساب {0} لا يتطابق مع الشركة {1} في طريقة الحساب: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,دورة:
@@ -2903,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,اعتمد طلب النفقات
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,لم يتم إنشاء أوامر العمل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,كشف الراتب للموظف {0} تم إنشاؤه لهذه الفترة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,الأدوية
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,الأدوية
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
 DocType: Selling Settings,Sales Order Required,اوامر البيع المطلوبة
 DocType: Purchase Invoice,Credit To,دائن الى
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,لا اقتباس
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,يرجى تحديد الشركة للمتابعة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,يرجى تحديد الشركة للمتابعة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,صافي التغير في الحسابات المدينة
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,تعويض
 DocType: Job Offer,Accepted,مقبول
@@ -2933,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,نتائج البحث
 DocType: Room,Room Number,رقم القاعة
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},مرجع غير صالح {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},مرجع غير صالح {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,ملصق قاعدة الشحن
 DocType: Journal Entry Account,Payroll Entry,دخول الرواتب
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,عرض سجلات الرسوم
@@ -2943,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
 DocType: Lab Test Sample,Lab Test Sample,عينة اختبار المختبر
 DocType: Item Variant Settings,Allow Rename Attribute Value,السماح بميزة إعادة التسمية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,قيد دفتر يومية سريع
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,قيد دفتر يومية سريع
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير السعر اذا قائمة المواد جعلت مقابل أي بند
 DocType: Restaurant,Invoice Series Prefix,بادئة سلسلة الفاتورة
 DocType: Employee,Previous Work Experience,خبرة العمل السابق
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},الرجاء إدخال الكمية المخططة للبند {0} في الصف {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,لم يتم تمكين تكامل خرائط غوغل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} لم يتم تقديمه
+DocType: Subscription,Trialling,تجربته
 DocType: Member,Membership Expiry Date,تاريخ انتهاء العضوية
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} يجب أن يكون سالبة في وثيقة الارجاع
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} يجب أن يكون سالبة في وثيقة الارجاع
 ,Minutes to First Response for Issues,دقائق إلى الاستجابة الأولى لقضايا
 DocType: Purchase Invoice,Terms and Conditions1,1 الشروط والأحكام
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,وحدة القياس
 DocType: Fiscal Year,Year End Date,تاريخ نهاية العام
 DocType: Task Depends On,Task Depends On,المهمة تعتمد على
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,فرصة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,فرصة
 DocType: Operation,Default Workstation,محطة العمل الافتراضية
 DocType: Notification Control,Expense Claim Approved Message,رسالة اعتماد طلب النفقات
 DocType: Payment Entry,Deductions or Loss,الخصومات أو الخسارة
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,حدد كحضور
 DocType: Share Transfer,From Shareholder,من المساهم
 DocType: Project,% Complete Method,الطريقة الكاملة٪
-apps/erpnext/erpnext/healthcare/setup.py +181,Drug,المخدرات
+apps/erpnext/erpnext/healthcare/setup.py +181,Drug,الادوية
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},لا يمكن أن يكون تاريخ بدء الصيانة قبل تاريخ التسليم لرقم التسلسلي {0}
 DocType: Work Order,Actual End Date,تاريخ الإنتهاء الفعلي
 DocType: Cash Flow Mapping,Is Finance Cost Adjustment,هو تعديل تكاليف التمويل
@@ -2997,19 +3014,19 @@
 DocType: BOM Update Tool,Replace BOM,استبدال بوم
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,الرمز {0} موجود بالفعل
 DocType: Employee Advance,Purpose,غرض
-DocType: Company,Fixed Asset Depreciation Settings,إعدادات استهلاك الأصول الثابتة
+DocType: Company,Fixed Asset Depreciation Settings,إعدادات اهلاك الأصول الثابتة
 DocType: Item,Will also apply for variants unless overrridden,سوف تطبق أيضا على المتغيرات الا اذا تم التغير فوقها
 DocType: Purchase Invoice,Advances,الدفعات المقدمة
 DocType: Work Order,Manufacture against Material Request,تصنيع ضد طلب مواد
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +14,Assessment Group: ,مجموعة التقييم:
 DocType: Item Reorder,Request for,طلب ل
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,الموافقة العضو لا يمكن أن يكون نفس المستخدم القاعدة تنطبق على
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,المستخدم الذي لدية صلاحية الموافقة لايمكن ان يكون نفس المستخدم الذي تنطبق عليه القاعدة
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),التسعير الاساسي استنادأ لوحدة القياس
 DocType: SMS Log,No of Requested SMS,رقم رسائل SMS  التي طلبت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,الإجازة بدون راتب لا تتطابق مع سجلات (طلب الإجازة) الموافق عليها
 DocType: Campaign,Campaign-.####,حملة # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,الخطوات القادمة
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,يرجى تزويدنا بالبنود المحددة بأفضل الأسعار الممكنة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,يرجى تزويدنا بالبنود المحددة بأفضل الأسعار الممكنة
 DocType: Membership,USD,دولار أمريكي
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,جعل الفاتورة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,الرصيد المتبقي
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,الباركود {0} ليس رمز {1} صالحا
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,نهاية السنة
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,مناقصة / زبون محتمل٪
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد بعد تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد بعد تاريخ الالتحاق بالعمل
 DocType: Driver,Driver,سائق
 DocType: Vital Signs,Nutrition Values,قيم التغذية
 DocType: Lab Test Template,Is billable,هو قابل للفوترة
@@ -3029,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),تاريخ البدء الفعلي (عبر ورقة الوقت)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,مدى العمر 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,لا يمكن أن يكون إجمالي المبلغ المدفوع أكبر من المبلغ الإجمالي المطالب به
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,لا يمكن أن يكون إجمالي المبلغ المدفوع أكبر من المبلغ الإجمالي المطالب به
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج المزيد من البند {0} اكثر من كمية طلب المبيعات {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,حدد قيم السمات
 DocType: Purchase Invoice,Reason For Issuing document,سبب إصدار المستند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,(جهة الاتصال التالية) لا يمكن أن يكون نفس (عنوان البريد الإلكتروني للزبون المحتمل)
 DocType: Tax Rule,Billing City,مدينة الفوترة
@@ -3101,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,عنوان الخدمة
 DocType: Asset Maintenance Task,Calibration,معايرة
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} عطلة للشركة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,أثاث وتركيبات
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ترك إخطار الحالة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,أثاث وتركيبات
 DocType: Item,Manufacture,صناعة
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,شركة الإعداد
 ,Lab Test Report,تقرير اختبار المختبر
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,زرع
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
 DocType: Installation Note Item,Installed Qty,الكميات الثابتة
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,قد يكون هذا بسبب بعض عناوين البريد الإلكتروني غير الصالحة في
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,لقد أضفت
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,نتيجة التدريب
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,المنتجات لكل صفحة
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,الماستر الخاص بفروع المؤسسة.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,أو
 DocType: Sales Order,Billing Status,الحالة الفواتير
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,أبلغ عن مشكلة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,نفقات المرافق
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,نفقات المرافق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 و أكثر
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: قيد دفتر اليومية {1} لا يملك حساب {2} أو قد تطابق بالفعل مع ايصال أخرى
 DocType: Supplier Scorecard Criteria,Criteria Weight,معايير الوزن
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,اترك إشعار الموافقة
 DocType: Buying Settings,Default Buying Price List,قائمة اسعار الشراء الافتراضية
 DocType: Payroll Entry,Salary Slip Based on Timesheet,كشف الرواتب بناء على سجل التوقيت
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,معدل شراء
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,معدل شراء
 DocType: Notification Control,Sales Order Message,رسالة اوامر البيع
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تعيين القيم الافتراضية مثل الشركة، والعملة، والسنة المالية الحالية، وما إلى ذلك.
 DocType: Payment Entry,Payment Type,الدفع نوع
@@ -3152,12 +3170,13 @@
 ,sales-browser,مبيعات متصفح
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,حساب الاستاد
 DocType: Patient Medical Record,PMR-,PMR-
-DocType: Drug Prescription,Drug Code,قانون المخدرات
+DocType: Drug Prescription,Drug Code,رقم الدواء
 DocType: Target Detail,Target  Amount,المبلغ المستهدف
 DocType: POS Profile,Print Format for Online,تنسيق الطباعة ل أونلين
 DocType: Shopping Cart Settings,Shopping Cart Settings,إعدادات سلة التسوق
 DocType: Journal Entry,Accounting Entries,القيود المحاسبة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",إذا تم تحديد قاعدة التسعير المحددة &#39;معدل&#39;، فإنه سيتم استبدال قائمة الأسعار. التسعير معدل القاعدة هو المعدل النهائي، لذلك لا ينبغي تطبيق أي خصم آخر. وبالتالي، في المعاملات مثل أمر المبيعات، أمر الشراء وما إلى ذلك، فإنه سيتم جلب في حقل &quot;معدل&quot;، بدلا من حقل &quot;قائمة الأسعار السعر&quot;.
+DocType: Journal Entry,Paid Loan,قرض مدفوع
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},إدخال مكرر. يرجى التحقق من قاعدة التخويل {0}
 DocType: Journal Entry Account,Reference Due Date,تاريخ الاستحقاق المرجعي
 DocType: Purchase Order,Ref SQ,المرجع SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"لم يتم إنشاء جدول الصيانة لجميع البنود. يرجى النقر على ""إنشاء الجدول الزمني"""
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/config/hr.py +93,Payroll,دفع الرواتب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 DocType: Patient Service Unit,Parent Service Unit,وحدة خدمة الوالدين
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,إنشاء مستخدم
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
@@ -3186,13 +3205,13 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Customizing Forms
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +74,Arrear,متأخر
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,قيمة الاستهلاك خلال فترة
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,قيمة الإهلاك خلال فترة
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,يجب ألا يكون النموذج المعطل هو النموذج الافتراضي
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +314,For row {0}: Enter planned qty,بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,حساب الدخل
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,تسليم
 DocType: Volunteer,Weekdays,أيام الأسبوع
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: Restaurant Menu,Restaurant Menu,قائمة المطاعم
@@ -3200,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,وصف معيار التقييم
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,تعيين حساب المخزون الافتراضي للمخزون الدائم
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,تعيين حساب المخزون الافتراضي للمخزون الدائم
 DocType: Item Reorder,Material Request Type,نوع طلب المواد
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,إرسال بريد إلكتروني منح مراجعة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",التخزين المحلي ممتلئة، لم يتم الحفظ
@@ -3208,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,سعة الغرفة
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},يوجد سجل للعنصر {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,المرجع
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,ستفقد سجلات الفواتير التي تم إنشاؤها من قبل. هل أنت متأكد من أنك تريد إعادة تشغيل هذا الاشتراك؟
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,رسوم التسجيل
 DocType: Budget,Cost Center,مركز التكلفة
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,سند #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,سند #
 DocType: Notification Control,Purchase Order Message,رسالة امر الشراء
 DocType: Tax Rule,Shipping Country,دولة الشحن
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,إخفاء المعرف الضريبي العملاء من المعاملات المبيعات
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",خاصية قاعدة التسعير تم تكوينها لتقوم بعمليات اعادة كتابة لقوائم الاسعار و تحديد نسبة التخفيض، استنادا إلى بعض المعايير.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر الحركات المخزنية/ التوصيل ملاحظة / شراء الإيصال
 DocType: Employee Education,Class / Percentage,الفئة / النسبة المئوية
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,رئيس التسويق والمبيعات
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,رئيس التسويق والمبيعات
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ضريبة الدخل
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,انتقل إلى الرسائل
+DocType: Subscription,Cancel At End Of Period,الغاء في نهاية الفترة
 DocType: Item Supplier,Item Supplier,البند مزود
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,لم يتم تحديد أي عناصر للنقل
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,لم يتم تحديد أي عناصر للنقل
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
 DocType: Vehicle,Electric,كهربائي
 DocType: Task,% Progress,٪ التقدم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,الربح / الخسارة عند التخلص من الأصول
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,الربح / الخسارة عند التخلص من الأصول
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",لن يتم تحديد سوى طالب مقدم الطلب بالحالة &quot;موافق عليه&quot; في الجدول أدناه.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,رقم الحساب للحساب {0} غير متوفر. <br> يرجى إعداد مخطط الحسابات بشكل صحيح.
 DocType: Task,Depends on Tasks,يعتمد على المهام
@@ -3248,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,غير متوفر
 DocType: Volunteer,Volunteer Skills,المهارات التطوعية
 DocType: Appraisal,HR User,مستخدم الموارد البشرية
+DocType: Bank Guarantee,Reference Document Name,اسم الوثيقة المرجعية
 DocType: Purchase Invoice,Taxes and Charges Deducted,خصم الضرائب والرسوم
 apps/erpnext/erpnext/hooks.py +142,Issues,قضايا
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},يجب أن تكون حالة واحدة من {0}
@@ -3261,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} معطل
 DocType: Supplier,Billing Currency,الفواتير العملات
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,كبير جدا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,كبير جدا
+DocType: Loan,Loan Application,طلب القرض
 DocType: Crop,Scientific Name,الاسم العلمي
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,مجموع الإجازات
 DocType: Customer,"Reselect, if the chosen contact is edited after save",إعادة تحديد، إذا تم تحرير جهة الاتصال التي تم اختيارها بعد حفظ
@@ -3270,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,رقم الشيك
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,مدينون
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,كبير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,كبير
 DocType: Homepage Featured Product,Homepage Featured Product,الصفحة الرئيسية المنتج المميز
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,جميع مجموعات التقييم
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,جميع مجموعات التقييم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,اسم المخزن الجديد
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),إجمالي {0} ({1})
 DocType: C-Form Invoice Detail,Territory,إقليم
@@ -3288,7 +3311,7 @@
 DocType: Vehicle Log,Fuel Qty,كمية الوقود
 DocType: Stock Entry,Target Warehouse Name,اسم المستودع المستهدف
 DocType: Work Order Operation,Planned Start Time,المخططة بداية
-DocType: Course,Assessment,تقييم
+DocType: Course,Assessment,الأصول
 DocType: Payment Entry Reference,Allocated,تخصيص
 apps/erpnext/erpnext/config/accounts.py +267,Close Balance Sheet and book Profit or Loss.,اغلاق الميزانية و دفتر الربح أو الخسارة.
 DocType: Student Applicant,Application Status,حالة الطلب
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,رسوم
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,العرض المسعر {0} تم إلغائه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,إجمالي المبلغ المستحق
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,إجمالي المبلغ المستحق
 DocType: Sales Partner,Targets,أهداف
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,يرجى تسجيل رقم سيرين في ملف معلومات الشركة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Price List,Price List Master,قائمة الأسعار ماستر
 DocType: GST Account,CESS Account,سيس حساب
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن ان تكون مشارة لعدة ** موظفين مبيعات** بحيث يمكنك تعيين و مراقبة اهداف البيع المحددة
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,حدد المريض
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,اسم المعلمة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يمكن فقط تقديم  (طلب الاجازة ) الذي حالته (موافق عليه) و (مرفوض)
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
 DocType: Homepage,Products to be shown on website homepage,المنتجات التي سيتم عرضها على موقعه الإلكتروني
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
@@ -3352,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,الفاتورة التي تم إنشاؤها بالفعل لجميع ساعات الفوترة
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},خطأ اسم : {0}
 DocType: Cash Flow Mapping,Is Finance Cost,تكلفة التمويل
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,تم وضع علامة حضور للموظف {0} بالفعل
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,تم وضع علامة حضور للموظف {0} بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,يرجى تعيين العملاء الافتراضي في إعدادات المطعم
 ,Salary Register,راتب التسجيل
 DocType: Warehouse,Parent Warehouse,المستودع الأصل
-DocType: C-Form Invoice Detail,Net Total,صافي المجموع
+DocType: Subscription,Net Total,صافي المجموع
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},لم يتم العثور على بوم الافتراضي للعنصر {0} والمشروع {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,تحديد أنواع القروض المختلفة
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,تحديد أنواع القروض المختلفة
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,المبلغ المعلقة
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),الوقت (دقيقة)
@@ -3391,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,الحساب الجذري يجب أن يكون  مجموعة
 DocType: Drug Prescription,Drug Prescription,وصفة الدواء
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,سداد / مغلق
+DocType: Loan,Repaid/Closed,سداد / مغلق
 DocType: Item,Total Projected Qty,توقعات مجموع الكمية
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",لم يتم العثور على معدل التقييم للبند {0}، المطلوب القيام به إدخالات المحاسبة ل {1} {2}. إذا كان العنصر يتم التعامل به على أنه عنصر معدل تقييم صفر في {1}، يرجى ذكر أنه في جدول {1} إيتم. خلاف ذلك، يرجى إنشاء معاملة الأسهم الواردة لهذا البند أو ذكر معدل التقييم في سجل البند، ثم حاول تقديم / إلغاء هذا الإدخال
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; تسمية السلسلة
 DocType: Course,Course Code,كود المقرر التعليمي
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},فحص الجودة مطلوب للبند {0}
 DocType: POS Settings,Use POS in Offline Mode,استخدام بوس في وضع غير متصل بالشبكة
@@ -3415,40 +3439,39 @@
 DocType: Purchase Invoice,Deemed Export,يعتبر التصدير
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,نسبة الخصم يمكن تطبيقها إما مقابل قائمة الأسعار محددة أو لجميع قائمة الأسعار.
-DocType: Subscription,Half-yearly,نصف سنوية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,القيود المحاسبية للمخزون
 DocType: Lab Test,LabTest Approver,لابتيست أبروفر
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,لقد سبق أن قيمت معايير التقييم {}.
 DocType: Vehicle Service,Engine Oil,زيت المحرك
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},أوامر العمل التي تم إنشاؤها: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},أوامر العمل التي تم إنشاؤها: {0}
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,عنوان العميل
-DocType: Employee Loan,Loan Details,تفاصيل القرض
+DocType: Loan,Loan Details,تفاصيل القرض
 DocType: Company,Default Inventory Account,حساب المخزون الافتراضي
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,أرقام الورقة غير متطابقة
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,الصف {0}: يجب أن تكون الكمية المكتملة أكبر من الصفر.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +262,Payment Request for {0},طلب الدفع ل {0}
 DocType: Item Barcode,Barcode Type,نوع الباركود
-DocType: Antibiotic,Antibiotic Name,اسم المضادات الحيوية
+DocType: Antibiotic,Antibiotic Name,اسم المضاد الحيوي
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,اختر صنف...
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,رابط لكل وحدات الأراضي التي تنمو فيها المحاصيل
 DocType: Account,Root Type,نوع الجذر
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن الارجاع أكثر من {1} للبند {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن الارجاع أكثر من {1} للبند {2}
 DocType: Item Group,Show this slideshow at the top of the page,تظهر هذه الشرائح في أعلى الصفحة
 DocType: BOM,Item UOM,وحدة قياس البند
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},المستودع المستهدف إلزامي لصف {0}
 DocType: Cheque Print Template,Primary Settings,الإعدادات الأولية
 DocType: Purchase Invoice,Select Supplier Address,حدد مزود العناوين
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,إضافة موظفين
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,إضافة موظفين
 DocType: Purchase Invoice Item,Quality Inspection,فحص الجودة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,صغير جدا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,صغير جدا
 DocType: Company,Standard Template,قالب قياسي
 DocType: Training Event,Theory,نظرية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,الكيان القانوني و الشركات التابعة التى لها لدليل حسابات منفصل تنتمي إلى المنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
@@ -3468,12 +3491,11 @@
 DocType: SMS Log,No of Sent SMS,رقم رسائل SMS  التي أرسلت
 DocType: Antibiotic,Healthcare Administrator,مدير الرعاية الصحية
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,تعيين الهدف
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة ترقيم الإعداد للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Dosage Strength,Dosage Strength,قوة الجرعة
 DocType: Account,Expense Account,حساب النفقات
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,البرمجيات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,اللون
-DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة تقييم
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,اللون
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة التقييم
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,تاريخ انتهاء الصلاحية إلزامي للعنصر المحدد
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,منع أوامر الشراء
 apps/erpnext/erpnext/healthcare/setup.py +258,Susceptible,سريع التأثر
@@ -3485,18 +3507,18 @@
 DocType: Patient,Personal and Social History,التاريخ الشخصي والاجتماعي
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,تم إنشاء المستخدم {0}
 DocType: Fee Schedule,Fee Breakup for each student,رسوم فصل لكل طالب
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اختر التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,تغيير رمز
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
 DocType: Stock Reconciliation,SR/,ريال سعودى/
 DocType: Vehicle,Diesel,ديزل
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,قائمة أسعار العملات غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,قائمة أسعار العملات غير محددة
 DocType: Purchase Invoice,Availed ITC Cess,استفاد من إيتس سيس
 ,Student Monthly Attendance Sheet,طالب ورقة الحضور الشهري
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,الشحن القاعدة المعمول بها فقط للبيع
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,تاريخ بدء المشروع
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,حتى
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,حتى
 DocType: Rename Tool,Rename Log,إعادة تسمية الدخول
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,مجموعة الطالب أو جدول الدورات إلزامي
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,الحفاظ على ساعات الفواتير وساعات العمل نفسه على الجدول الزمني
@@ -3516,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,قائمة المنتجات أو الخدمات التي تشتريها أو تبيعها.
 DocType: Water Analysis,Storage Temperature,درجة حرارة التخزين
 DocType: Employee Attendance Tool,Unmarked Attendance,تم تسجيله غير حاضر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,الباحث
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,الباحث
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,برنامج انتساب أداة الطلاب
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},يجب أن يكون تاريخ البدء أقل من تاريخ الانتهاء للمهمة {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,الاسم أو البريد الإلكتروني إلزامي
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} لديه حاليا {1} بطاقة أداء بطاقة الموردين، ويجب أن يتم إصدار طلبات إعادة الشراء إلى هذا المورد بحذر.
 DocType: Chapter,Non Profit Manager,مدير غير الربح
 DocType: BOM,Total Cost(Company Currency),التكلفة الإجمالية (شركة العملات)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,المسلسل لا {0} خلق
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,المسلسل لا {0} خلق
 DocType: Homepage,Company Description for website homepage,وصف الشركة للصفة الرئيسيه بالموقع الألكتروني
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,اسم Suplier
@@ -3538,12 +3560,11 @@
 DocType: Sales Invoice,Time Sheet List,الساعة قائمة ورقة
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
 DocType: Healthcare Settings,Result Printed,النتيجة المطبوعة
-DocType: Asset Category Account,Depreciation Expense Account,حساب نفقات الاستهلاك
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,فترة الاختبار
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},عرض {0}
+DocType: Asset Category Account,Depreciation Expense Account,حساب نفقات الاهلاك
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,فترة الاختبار
 DocType: Customer Group,Only leaf nodes are allowed in transaction,المصنف ليس مجموعة فقط مسموح به في المعاملات
 DocType: Project,Total Costing Amount (via Timesheets),إجمالي مبلغ التكلفة (عبر الجداول الزمنية)
-DocType: Employee Advance,Expense Approver,موافق النفقات
+DocType: Department,Expense Approver,موافق النفقات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,الصف {0}:  الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن
 DocType: Project,Hourly,باستمرار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,من تصنيف (غير المجموعة) إلى تصنيف ( المجموعة)
@@ -3552,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,إلى التاريخ والوقت
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,سجلات للحفاظ على  حالات التسليم لرسائل
 DocType: Accounts Settings,Make Payment via Journal Entry,قم بالدفع عن طريق قيد دفتر اليومية
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,طبع في
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,طبع في
 DocType: Item,Inspection Required before Delivery,التفتيش المطلوبة قبل تسليم
 DocType: Item,Inspection Required before Purchase,التفتيش المطلوبة قبل الشراء
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,الأنشطة المعلقة
@@ -3562,8 +3583,8 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,أقل كمية ممكن طلبها
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,مؤسستك
 DocType: Fee Component,Fees Category,فئة الرسوم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,من فضلك ادخل تاريخ ترك العمل.
-apps/erpnext/erpnext/controllers/trends.py +149,Amt,القيمة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,من فضلك ادخل تاريخ ترك العمل.
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,الإجمالي
 DocType: Supplier Scorecard,Notify Employee,إعلام الموظف
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,ناشر الصحف
@@ -3572,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,مستوى اعادة الطلب
 DocType: Company,Chart Of Accounts Template,نمودج  دليل الحسابات
 DocType: Attendance,Attendance Date,تاريخ الحضور
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تقسيم الراتب بناءَ على الكسب والاستقطاع.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,الحساب المتفرع منه عقدة ابن لايمكن ان يحول الي حساب دفتر استاد
 DocType: Purchase Invoice Item,Accepted Warehouse,مستودع مقبول
@@ -3580,10 +3601,11 @@
 DocType: Item,Valuation Method,تقييم الطريقة
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,حدد كنصف يوم
 DocType: Sales Invoice,Sales Team,فريق المبيعات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,تكرار دخول
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,تكرار دخول
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,أدخل اسم المستفيد قبل التقديم.
 DocType: Program Enrollment Tool,Get Students,الحصول على الطلاب
 DocType: Serial No,Under Warranty,تحت الضمان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[خطأ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[خطأ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,يرجى تحديد تاريخ الانتهاء للإصلاح المكتمل
@@ -3602,10 +3624,10 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,محجوزة للتعاقد من الباطن
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
 DocType: Shopping Cart Settings,Orders,أوامر
-DocType: Employee Leave Approver,Leave Approver,المخول بالموافقة علي الاجازات
+DocType: Department,Leave Approver,المخول بالموافقة علي الاجازات
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,يرجى تحديد دفعة
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
-DocType: Assessment Group,Assessment Group Name,اسم المجموعة التقييم
+DocType: Assessment Group,Assessment Group Name,اسم مجموعة التقييم
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
 DocType: Landed Cost Item,Receipt Document Type,استلام نوع الوثيقة
 DocType: Daily Work Summary Settings,Select Companies,اختر الشركات
@@ -3619,7 +3641,7 @@
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +72,Select Department...,حدد القسم ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات الحالية لا يمكن تحويلها إلى مجموعة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} {2} {3},القيمة {0} {1} {2} {3}
-DocType: Account,Depreciation,إستهلاك
+DocType: Account,Depreciation,إهلاك
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +102,The number of shares and the share numbers are inconsistent,عدد الأسهم وأعداد الأسهم غير متناسقة
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
 DocType: Employee Attendance Tool,Employee Attendance Tool,أداة الحضور للموظفين
@@ -3646,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,المحور تتبع البند
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,الأصل للمستلم
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاستهلاك المتراكم
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,تم إنشاء هذا البريد الإلكتروني تلقائيا
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
 DocType: Program Enrollment,Boarding Student,طالب الصعود
 DocType: Asset,Expected Value After Useful Life,القيمة المتوقعة بعد حياة مفيدة
@@ -3662,38 +3683,37 @@
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 apps/erpnext/erpnext/controllers/buying_controller.py +420,{0} {1} is cancelled or closed,{0} {1} تم إلغائه أو مغلق
-DocType: Asset,Calculate Depreciation,حساب الاستهلاك
+DocType: Asset,Calculate Depreciation,حساب الاهلاك
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +35,Net Cash from Investing,صافي النقد من الاستثمار
 DocType: Work Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,الأصول {0} يجب تقديمه
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,الاصل {0} يجب تقديمه
 DocType: Fee Schedule Program,Total Students,مجموع الطلاب
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},سجل الحضور {0} موجود مقابل الطالب {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},المرجع # {0} بتاريخ {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,تم إلغاء الاستهلاك بسبب التخلص من الأصول
-DocType: Member,Member,عضو
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,تم إلغاء الإهلاك بسبب التخلص من الأصول
+DocType: Loan,Member,عضو
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,إدارة العناوين
 DocType: Work Order Item,Work Order Item,بند أمر العمل
 DocType: Pricing Rule,Item Code,كود البند
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
 DocType: Agriculture Analysis Criteria,Agriculture Manager,مدير الزراعة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}
 DocType: Supplier Scorecard Period,Variables,المتغيرات
 DocType: Employee Internal Work History,Employee Internal Work History,سجل عمل الموظف داخل الشركة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),إغلاق (Dr)
 DocType: Cheque Print Template,Cheque Size,مقاس الصك
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,رقم المسلسل {0} ليس في الأوراق المالية
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,رقم المسلسل {0} ليس في الأوراق المالية
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,قالب الضريبية لبيع صفقة.
 DocType: Sales Invoice,Write Off Outstanding Amount,شطب المبلغ المستحق
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},الحساب {0} لا يتطابق مع الشركة {1}
 DocType: Education Settings,Current Academic Year,السنة الدراسية الحالية
 DocType: Stock Settings,Default Stock UOM,افتراضي وحدة قياس السهم
-DocType: Asset,Number of Depreciations Booked,عدد الاستهلاكات المستنفده مسبقا
+DocType: Asset,Number of Depreciations Booked,عدد الاهلاكات المستنفده مسبقا
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,الكمية المجموع
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},مقابل قرض للموظف: {0}
 DocType: Landed Cost Item,Receipt Document,وثيقة استلام
 DocType: Employee Education,School/University,مدرسة / جامعة
 DocType: Payment Request,Reference Details,إشارة تفاصيل
@@ -3701,10 +3721,10 @@
 DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,القيمة المقدم فاتورة بها
 DocType: Share Transfer,(including),(تتضمن)
-DocType: Asset,Double Declining Balance,استهلاك تناقصي مزدوج
+DocType: Asset,Double Declining Balance,اهلاك تناقصي
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,الطلب المغلق لايمكن إلغاؤه. ازالة الاغلاق لكي تتمكن من الالغاء
 DocType: Student Guardian,Father,الآب
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
 DocType: Bank Reconciliation,Bank Reconciliation,تسويات مصرفية
 DocType: Attendance,On Leave,في إجازة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,الحصول على التحديثات
@@ -3718,10 +3738,10 @@
 DocType: Lead,Lower Income,دخل أدنى
 DocType: Restaurant Order Entry,Current Order,النظام الحالي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ الصروف لا يمكن أن يكون أكبر من المبلغ المخصص للقرض {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ الصروف لا يمكن أن يكون أكبر من المبلغ المخصص للقرض {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,انتقل إلى البرامج
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},الصف {0} # المبلغ المخصص {1} لا يمكن أن يكون أكبر من المبلغ غير المطالب به {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},الصف {0} # المبلغ المخصص {1} لا يمكن أن يكون أكبر من المبلغ غير المطالب به {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},مطلوب رقم امر الشراء للصنف {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الحالة  لان الطالب {0} مترابط مع استمارة الطالب {1}
@@ -3738,13 +3758,12 @@
 apps/erpnext/erpnext/config/stock.py +113,Serial No and Batch,رقم المسلسل و الدفعة
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +52,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع العشرات من معايير التقييم يجب أن يكون {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,الرجاء تعيين عدد الاستهلاكات المستنفده مسبقا
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,الرجاء تعيين عدد الاهلاكات المستنفده مسبقا
 DocType: Supplier Scorecard Period,Calculations,العمليات الحسابية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,القيمة أو الكمية
 DocType: Payment Terms Template,Payment Terms,شروط الدفع
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,دقيقة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 DocType: Chapter,Meetup Embed HTML,ميتوب تضمين هتمل
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,الذهاب إلى الموردين
@@ -3763,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},عرض مسعر {0} ليس من النوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,عنصر جدول الصيانة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,يرجى تعيين معرف البريد الإلكتروني للطالب لإرسال طلب الدفع
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,يرجى تعيين معرف البريد الإلكتروني للطالب لإرسال طلب الدفع
 DocType: Patient,Medical History,التاريخ المرضي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,حساب السحب من البنك بدون رصيد
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,حساب السحب من البنك بدون رصيد
 DocType: Patient,Patient ID,معرف المريض
 DocType: Physician Schedule,Schedule Name,اسم الجدول الزمني
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,أنشاء كشف رانب
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,إضافة جميع الموردين
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,إضافة جميع الموردين
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,تصفح قائمة المواد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,القروض المضمونة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,القروض المضمونة
 DocType: Purchase Invoice,Edit Posting Date and Time,تحرير تاريخ النشر والوقت
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},يرجى تحديد الحسابات المتعلقة بالاستهلاك في فئة الأصول {0} أو الشركة {1}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},يرجى تحديد الحسابات المتعلقة بالاهلاك في فئة الأصول {0} أو الشركة {1}
 DocType: Lab Test Groups,Normal Range,المعدل الطبيعي
 DocType: Academic Term,Academic Year,السنة الدراسية
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,بيع المتاحة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,الرصيد الافتتاحي لحقوق الملكية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,الرصيد الافتتاحي لحقوق الملكية
 DocType: Lead,CRM,إدارة علاقات الزبائن
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,المتبقية
 DocType: Appraisal,Appraisal,تقييم
+DocType: Loan,Loan Account,حساب القرض
 DocType: Purchase Invoice,GST Details,غست التفاصيل
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},الايميل تم ارساله إلى المورد {0}
 DocType: Item,Default Sales Unit of Measure,وحدة المبيعات الافتراضية للقياس
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,السنة الأكاديمية:
+DocType: Subscription,Past Due Date,تاريخ الاستحقاق السابق
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},لا تسمح بتعيين عنصر بديل للعنصر {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,التاريخ مكرر
@@ -3799,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,تعيين المريض
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approving Role cannot be same as role the rule is Applicable To
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,إلغاء الاشتراك من هذا البريد الإلكتروني دايجست
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,الحصول على الموردين من قبل
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,الحصول على الموردين من قبل
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} لم يتم العثور على العنصر {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,انتقل إلى الدورات التدريبية
 DocType: Accounts Settings,Show Inclusive Tax In Print,عرض الضريبة الشاملة في الطباعة
@@ -3807,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,تم ارسال الرسالة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,الحساب الذي لديه حسابات فرعية لا يمكن تعيينه كحساب استاذ
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد برنامج تسمية المعلم في التعليم&gt; إعدادات التعليم
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ  ( بعملة الشركة )
 DocType: Physician,Physician Schedules,جداول الطبيب
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,لا يمكن أن يكون إجمالي المبلغ المدفوع أكبر من المبلغ الإجمالي المعتمد
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,لا يمكن أن يكون إجمالي المبلغ المدفوع أكبر من المبلغ الإجمالي المعتمد
 DocType: Salary Slip,Hour Rate,سعرالساعة
 DocType: Stock Settings,Item Naming By,تسمية السلعة بواسطة
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},قيد إقفال فترة أخرى {0} تم إنشائها بعد {1}
@@ -3828,6 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},لا يسمح لتحديث المعاملات المخزنية أقدم من {0}
 DocType: BOM,Inspection Required,التفتيش مطلوب
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,أدخل رقم الضمان البنكي قبل التقديم.
 DocType: Driving License Category,Class,صف دراسي
 DocType: Sales Order,Fully Billed,وصفت تماما
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,لا يمكن رفع أمر العمل مقابل قالب العنصر
@@ -3838,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Assessment Plan,Program,برنامج
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد برنامج تسمية المعلم في التعليم&gt; إعدادات التعليم
 DocType: Serial No,Is Cancelled,ألغي
 DocType: Student Group,Group Based On,المجموعة بناء على
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
@@ -3849,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,ارتفاع الصك
 DocType: Supplier,Supplier Details,تفاصيل المورد
 DocType: Setup Progress,Setup Progress,إعداد التقدم
+DocType: Expense Claim,Approval Status,حالة الموافقة
 DocType: Hub Settings,Publish Items to Hub,نشر عناصر إلى المحور
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},(من القيمة) يجب أن تكون أقل من (الي القيمة) في الصف {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,حوالة مصرفية
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,حدد الكل
 ,Issued Items Against Work Order,البنود الصادرة ضد طلب العمل
 DocType: Vehicle Log,Invoice Ref,مرجع الفاتورة
@@ -3882,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,عدد التعرفة
 DocType: Work Order Item,Available Qty at WIP Warehouse,الكمية المتوفرة في مستودع ويب
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,المخطط له
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},رقم المسلسل {0} لا ينتمي إلى مستودع {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},رقم المسلسل {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة: لن يتحقق النظام من التسليم الزائد والحجز الزائد للبند {0} حيث أن الكمية أو القيمة هي 0
 DocType: Notification Control,Quotation Message,خطاب المناقصة
-DocType: Employee Loan,Employee Loan Application,طلب قرض لموظف
 DocType: Issue,Opening Date,تاريخ الفتح
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,يرجى حفظ المريض أولا
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,يرجى حفظ المريض أولا
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
 DocType: Program Enrollment,Public Transport,النقل العام
 DocType: Soil Texture,Silt Composition (%),تكوين الطمي (٪)
@@ -3895,7 +3917,7 @@
 DocType: Healthcare Settings,Avoid Confirmation,تجنب التأكيد
 DocType: Purchase Receipt Item,Rate and Amount,معدل والمبلغ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +176,Account Type for {0} must be {1},نوع الحساب {0} يجب ان يكون {1}
-DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,حسابات الدخل الافتراضي لاستخدامها إذا لم يتم تعيين في الطبيب لحجز رسوم التشاور.
+DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,حسابات الدخل الافتراضي لاستخدامها إذا لم يتم تعيين رسوم الاستشارة للطبيب.
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,الإجازات والعطلات
 DocType: Education Settings,Current Academic Term,المدة الأكاديمية الحالية
 DocType: Sales Order,Not Billed,لا صفت
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),البند الرصيد (بسيط)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,فواتير حولت من قبل الموردين.
 DocType: POS Profile,Write Off Account,شطب حساب
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ديبيت نوت أمت
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ديبيت نوت أمت
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,قيمة الخصم
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,تاريخ اوامر البيع
 DocType: Sales Invoice Item,Delivered Qty,الكمية المستلمة
 DocType: Assessment Plan,Assessment Plan,خطة التقييم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,عكس دخول المجلة
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,تم إنشاء العميل {0}.
 DocType: Stock Settings,Limit Percent,الحد في المئة
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,حاليا لا يوجد مخزون متاح في أي مستودع
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,إدخال مخزون
 DocType: Payment Entry,Payment References,المراجع الدفع
 DocType: C-Form,C-FORM-,C-نموذج-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",عدد الفواصل الزمنية للحقل الفاصل على سبيل المثال ، إذا كانت الفاصل الزمني هو &quot;أيام&quot; وعدد الفوترة للفوترة هو 3 ، فسيتم إنشاء الفواتير كل 3 أيام
 DocType: Vehicle,Insurance Details,تفاصيل التأمين
 DocType: Account,Payable,واجب الدفع
 DocType: Share Balance,Share Type,نوع المشاركة
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,الرجاء إدخال فترات السداد
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,الرجاء إدخال فترات السداد
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),المدينين ({0})
 DocType: Pricing Rule,Margin,هامش
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,الزبائن الجدد
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,الربح الإجمالي٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,الربح الإجمالي٪
 DocType: Appraisal Goal,Weightage (%),الوزن(٪)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,تغيير الملف الشخصي بوس
 DocType: Bank Reconciliation Detail,Clearance Date,تاريخ الاستحقاق
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,معالجة التفاصيل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,الطرف المعني إلزامي
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {ليست}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {ليست}
 DocType: Topic,Topic Name,اسم الموضوع
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,يرجى تعيين القالب الافتراضي لإشعار إجازة الموافقة في إعدادات الموارد البشرية.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة من الخيارات على الاقل اما البيع او الشراء
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,حدد الموظف للحصول على تقدم الموظف.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,حدد الموظف للحصول على تقدم الموظف.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,يرجى تحديد تاريخ صالح
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,حدد طبيعة عملك.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3975,12 +4000,12 @@
 No Result for tests with no results. Also, no Lab Test is created. e.g.. Sub Tests for Grouped results.",واحد للنتائج التي تتطلب فقط إدخال واحد، نتيجة أوم والقيمة العادية <br> مجمع للنتائج التي تتطلب حقول الإدخال متعددة مع أسماء الأحداث المقابلة، نتيجة أومس والقيم العادية <br> وصفي للاختبارات التي تحتوي على مكونات نتائج متعددة وحقول إدخال النتيجة المقابلة. <br> مجمعة لنماذج الاختبار التي هي مجموعة من نماذج الاختبار الأخرى. <br> لا توجد نتيجة للاختبارات مع عدم وجود نتائج. أيضا، لا يتم إنشاء مختبر اختبار. على سبيل المثال. الاختبارات الفرعية للنتائج المجمعة.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +86,Row #{0}: Duplicate entry in References {1} {2},الصف # {0}: إدخال مكرر في المراجع {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.js +18,As Examiner,كما الفاحص
+apps/erpnext/erpnext/education/doctype/instructor/instructor.js +18,As Examiner,كممتحن
 DocType: Appointment Type,Default Duration,المدة الافتراضية
 DocType: Asset Movement,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,مشاركة دفتر الأستاذ
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصل {1} لا تتبع الشركة {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصل {1} لا تتبع الشركة {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,تم إنشاء فاتورة المبيعات {0}
 DocType: Employee,Confirmation Date,تاريخ التأكيد
 DocType: C-Form,Total Invoiced Amount,إجمالي مبلغ الفاتورة
@@ -3989,23 +4014,24 @@
 DocType: Account,Accumulated Depreciation,إستهلاك متراكم
 DocType: Supplier Scorecard Scoring Standing,Standing Name,اسم الدائمة
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
-DocType: Employee Loan Application,Required by Date,مطلوب حسب التاريخ
+DocType: Loan Application,Required by Date,مطلوب حسب التاريخ
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
 DocType: Production Plan,Sales Orders Detail,تفاصيل أوامر المبيعات
 DocType: Bin,Requested Quantity,الكمية المطلوبة
 DocType: Patient,Marital Status,الحالة الإجتماعية
 DocType: Stock Settings,Auto Material Request,طلب مواد تلقائي
-DocType: Woocommerce Settings,API consumer secret,سر عميل API
+DocType: Woocommerce Settings,API consumer secret,كلمة مرور  اهلاك API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,متوفر (كمية باتش) عند (من المخزن)
 DocType: Customer,CUST-,-CUST
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +50,Idevise,Idevise
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,اجمالي الأجر - إجمالي الخصم - سداد القروض
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,قائمة المواد الحالية و قائمة المواد الجديد لا يمكن أن تكون نفس بعضهما
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,هوية كشف الراتب
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون بعد تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون بعد تاريخ الالتحاق بالعمل
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,متغيرات متعددة
 DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تم التسليم
+DocType: Subscription,Trial Period Start Date,فترة بداية الفترة التجريبية
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,النسبة المئوية للتوزيع الشهري
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,الرجاء تسجيل الدخول كمستخدم آخر.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,الجارديان طالب
 DocType: Member,Member Name,اسم العضو
 DocType: Stock Settings,Use Naming Series,استخدام سلسلة التسمية
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
 DocType: POS Profile,Update Stock,تحديث المخزون
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,في الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 DocType: Membership,Payment Details,تفاصيل الدفع
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,سعر قائمة المواد
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,سعر قائمة المواد
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء طلب العمل المتوقف ، قم بإلغاء إيقافه أولاً للإلغاء
 DocType: Asset,Journal Entry for Scrap,قيد دفتر يومية للتخريد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,يرجى سحب البنوود من اشعار التسليم
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,وحدة الأراضي
 ,Purchase Analytics,تحليلات المشتريات
 DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السلعة
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,الفاتورة الحالية {0} مفقودة
 DocType: Asset Maintenance Log,Task,مهمة
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,حساب الربح / الخسارة الناتتج عن الصرف
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,الموظف والحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,املأ النموذج واحفظه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,املأ النموذج واحفظه
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,منتديات
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,الكمية الفعلية في المخزون
 DocType: Homepage,"URL for ""All Products""",URL ل &quot;جميع المنتجات&quot;
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,مستوى البيع السعر
 DocType: Account,Rate at which this tax is applied,السعر الذي يتم فيه تطبيق هذه الضريبة
 DocType: Cash Flow Mapper,Section Name,اسم القسم
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,الكمية المحددة عند اعادة الطلب
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,الكمية المحددة عند اعادة الطلب
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لا تصلح
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,يعتمد على
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,قائمة الانتظار لتحديث أحدث الأسعار في جميع بيل المواد. قد يستغرق بضع دقائق.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للزبائن والموردين
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,نماذج العناوين الافتراضية للبلدان
-DocType: Water Analysis,Appearance,مظهر خارجي
+DocType: Water Analysis,Appearance,المظهر الخارجي
+DocType: HR Settings,Leave Status Notification Template,ترك قالب إعلام الحالة
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,متوسط قائمة أسعار الشراء
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,معلومات العضو
@@ -4097,7 +4123,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +58,Asset Maintenance,صيانة الأصول
 ,Sales Payment Summary,ملخص دفع المبيعات
 DocType: Restaurant,Restaurant,مطعم
-DocType: Woocommerce Settings,API consumer key,مفتاح عميل API
+DocType: Woocommerce Settings,API consumer key,مفتاح اهلاك API
 apps/erpnext/erpnext/accounts/party.py +320,Due / Reference Date cannot be after {0},تاريخ الاستحقاق أو المرجع لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 DocType: Patient,Account Details,تفاصيل الحساب
@@ -4112,10 +4138,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,غير مسموح به. الرجاء تعطيل نموذج الاختبار
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,مجموع النسب المخصصة يجب ان تساوي 100 %
 DocType: Crop Cycle,Linked Land Unit,وحدة الأراضي المرتبطة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,يرجى اختيار تاريخ الترحيل قبل اختيار الطرف المعني
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,يرجى اختيار تاريخ الترحيل قبل اختيار الطرف المعني
 DocType: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاستهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاستهلاكات خلال العمر الافتراضي النافع
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاهلاكات خلال العمر الافتراضي النافع
 DocType: Purchase Order,Order Confirmation Date,تاريخ تأكيد الطلب
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,إنشاء زيارة صيانة
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +215,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال بالمستخدم الذي لديه دور مدير المبيعات الماستر {0}
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,انتقل إلى المستخدمين
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},ملاحظة: لا يوجد رصيد إجازات كافي لنوع الإجازة {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},ملاحظة: لا يوجد رصيد إجازات كافي لنوع الإجازة {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,غستين غير صالح أو أدخل نا لغير المسجلين
 DocType: Training Event,Seminar,ندوة
 DocType: Program Enrollment Fee,Program Enrollment Fee,رسوم التسجيل برنامج
@@ -4138,20 +4164,20 @@
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,لا يمكن حذف المعاملات من قبل خالق الشركة
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,تم العثور على عدد غير صحيح من إدخالات دفتر الأستاذ العام. ربما تكون قد حددت حسابا خاطئا في المعاملة.
 DocType: Employee,Prefered Contact Email,البريد الإلكتروني المفضل للتواصل
-DocType: Cheque Print Template,Cheque Width,عرض الصك
+DocType: Cheque Print Template,Cheque Width,عرض الشيك
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,تحقق من سعر البيع للالبند ضد سعر الشراء أو معدل التقييم
 DocType: Fee Schedule,Fee Schedule,جدول التكاليف
 DocType: Hub Settings,Publish Availability,نشر توافر
 DocType: Company,Create Chart Of Accounts Based On,إنشاء دليل الحسابات استنادا إلى
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,لا يمكن تحويله إلى غير مجموعة. مهام الطفل موجودة.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون بعد تاريخ اليوم.
-,Stock Ageing,الأسهم شيخوخة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون بعد تاريخ اليوم.
+,Stock Ageing,التبويب التاريخي للمخزن
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},طالب {0} موجودة ضد طالب طالب {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),تعديل التقريب (عملة الشركة)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,ساعات العمل
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,دفعة:
 DocType: Volunteer,Afternoon,بعد الظهر
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Cheque Print Template,Scanned Cheque,الممسوحة ضوئيا شيك
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,المشروع {0} موجود بالفعل
 DocType: Medical Department,Nursing User,التمريض المستخدم
 DocType: Plant Analysis,Plant Analysis Criterias,معمل تحليل النبات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,المسؤوليات
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},المسلسل لا {0} لا ينتمي إلى الدفعة {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,المسؤوليات
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,انتهت فترة صلاحية هذا الاقتباس.
 DocType: Expense Claim Account,Expense Claim Account,حساب المطالبة بالنفقات
 DocType: Accounts Settings,Allow Stale Exchange Rates,السماح لأسعار الصرف الثابتة
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,جعل المتغيرات
 DocType: Item,Default BOM,الافتراضي BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),إجمالي مبلغ الفاتورة (عبر فواتير المبيعات)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,مبلغ مذكرة الخصم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,مبلغ مذكرة الخصم
 DocType: Project Update,Not Updated,غير محدث
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",هناك تناقضات بين المعدل، لا من الأسهم والمبلغ المحسوب
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,يرجى إعادة كتابة اسم الشركة للتأكيد
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,إجمالي المعلقة AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,إجمالي المعلقة AMT
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
 DocType: Employee Advance,Advance Account,حساب متقدم
 DocType: Job Offer,Job Offer Terms,شروط عرض الوظيفة
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,سيارات
 DocType: Vehicle,Insurance Company,تفاصيل التأمين
 DocType: Asset Category Account,Fixed Asset Account,حساب الأصول الثابتة
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,متغير
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,متغير
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,من اشعار التسليم
 DocType: Chapter,Members,الأعضاء
 DocType: Student,Student Email Address,طالب عنوان البريد الإلكتروني
@@ -4216,7 +4243,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +79,Cash or Bank Account is mandatory for making payment entry,النقد أو الحساب المصرفي إلزامي لإجراء الدفع
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,عنوان الطالب
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
-apps/erpnext/erpnext/accounts/doctype/account/account.py +251,Account Number {0} already used in account {1},رقم الحساب {0} مستخدم في الحساب {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +251,Account Number {0} already used in account {1},رقم الحساب {0} بالفعل مستخدم في الحساب {1}
 DocType: GoCardless Mandate,Mandate,تفويض
 DocType: POS Profile,POS Profile Name,بوس اسم الملف الشخصي
 DocType: Hotel Room Reservation,Booked,حجز
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,المتدرب
 DocType: Delivery Stop,Address Name,اسم العنوان
 DocType: Stock Entry,From BOM,من BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},تقسيم {0} وحدات من {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},تقسيم {0} وحدات من {1}
 DocType: Assessment Code,Assessment Code,كود التقييم
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,الأساسي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات المخزنية قبل {0}
@@ -4233,25 +4260,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,رقم المرجع  إلزامي إذا أدخلت تاريخ المرجع
 DocType: Bank Reconciliation Detail,Payment Document,وثيقة الدفع
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,حدث خطأ أثناء تقييم صيغة المعايير
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل بعد تاريخ الميلاد
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل بعد تاريخ الميلاد
+DocType: Subscription,Plans,خطط
 DocType: Salary Slip,Salary Structure,هيكل المرتبات
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,قضية المواد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,حدث خطأ أثناء إنشاء متكرر
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,تاريخ العرض الخاص بالوظيفة
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,عروض مسعرة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,لم يتم إنشاء مجموعات الطلاب.
 DocType: Purchase Invoice Item,Serial No,رقم المسلسل
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,قيمة السداد الشهري لا يمكن أن يكون أكبر من قيمة القرض
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,قيمة السداد الشهري لا يمكن أن يكون أكبر من قيمة القرض
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,الرجاء إدخال تفاصيل الصيانة أولا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء
 DocType: Purchase Invoice,Print Language,لغة الطباعة
 DocType: Salary Slip,Total Working Hours,مجموع ساعات العمل
 DocType: Sales Invoice,Customer PO Details,العملاء بو التفاصيل
-DocType: Subscription,Next Schedule Date,تاريخ الجدول التالي
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك السلع للمجموعات الفرعية
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,حساب الافتتاح المؤقت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,إدخال القيمة يجب أن يكون موجبا
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,التواريخ من وإلى مطلوبة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية والبورصات
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من المخزن
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,لا يوجد موظفون للمعايير المذكورة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,لا توجد بنود في قائمة المواد للتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,لا توجد بنود في قائمة المواد للتصنيع
 DocType: Hotel Settings,Default Customer,العميل الافتراضي
 DocType: Assessment Plan,Supervisor Name,اسم المشرف
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,لا تؤكد إذا تم إنشاء التعيين لنفس اليوم
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,تقدم الموظف
 DocType: Payroll Entry,Payroll Frequency,الدورة الزمنية لدفع الرواتب
 DocType: Lab Test Template,Sensitivity,حساسية
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,المواد الخام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,المواد الخام
 DocType: Leave Application,Follow via Email,متابعة عبر البريد الإلكتروني
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,وحدات التصنيع  والآلات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,وحدات التصنيع  والآلات
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد خصم المبلغ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,إعدادات ملخص العمل اليومي
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,الرجاء إدخال ريد حسب التاريخ
 DocType: Payment Entry,Internal Transfer,نقل داخلي
 DocType: Asset Maintenance,Maintenance Tasks,مهام الصيانة
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,يرجى تحديد تاريخ الترحيل أولا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,يرجى تحديد تاريخ الترحيل أولا
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,تاريخ الافتتاح يجب ان يكون قبل تاريخ الاغلاق
 DocType: Leave Control Panel,Carry Forward,المضي قدما
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مركز التكلفة مع المعاملات الحالية لا يمكن تحويلها إلى حساب استاد
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,دمج ERPNext
 DocType: Crop Cycle,Detected Disease,الكشف عن المرض
 ,Produced,أنتجت
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,لا يمكن أن يكون تاريخ بداية السداد قبل تاريخ الصرف.
 DocType: Item,Item Code for Suppliers,رمز السلعة للموردين
 DocType: Issue,Raised By (Email),التي أثارها (بريد إلكتروني)
 DocType: Training Event,Trainer Name,اسم المدرب
 DocType: Mode of Payment,General,عام
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخر الاتصالات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,مطابقة المدفوعات مع الفواتير
 DocType: Journal Entry,Bank Entry,حركة بنكية
 DocType: Authorization Rule,Applicable To (Designation),قابلة للتطبيق على (المسمى الوظيفي)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,تمكين / تعطيل العملات .
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},الدكتور {0} على إجازة نصف يوم على {1}
 DocType: Production Plan,Get Material Request,الحصول على المواد طلب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,نفقات بريدية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,نفقات بريدية
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,الترفيه وتسلية
 ,Item Variant Details,البند تفاصيل متغير
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,الساعة
 DocType: Restaurant Order Entry,Last Sales Invoice,آخر فاتورة المبيعات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},الرجاء اختيار الكمية ضد العنصر {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
 DocType: Lead,Lead Type,نوع مبادرة البيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,تم فوترة كل هذه البنود
 DocType: Company,Monthly Sales Target,هدف المبيعات الشهرية
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن الموافقة عليها بواسطة {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,النوع الافتراضي لـ مستند 'طلب مواد'
 DocType: Supplier Scorecard,Evaluation Period,فترة التقييم
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,غير معروف
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,أمر العمل لم يتم إنشاؤه
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,أمر العمل لم يتم إنشاؤه
 DocType: Shipping Rule,Shipping Rule Conditions,شروط قاعدة الشحن
 DocType: Purchase Invoice,Export Type,نوع التصدير
 DocType: Salary Slip Loan,Salary Slip Loan,قرض زلة الراتب
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ملخص الفواتير الافتتاحية
 DocType: Education Settings,Education Manager,مدير التعليم
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,الحد الأدنى لطول كل محطة في الميدان لتحقيق النمو الأمثل
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","لا يمكن تحديث العنصر المدفوع {0} باستخدام ""تسوية المخزون""، بدلا من ذلك استخدام ""إدخال المخزون"""
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","لا يمكن تحديث العنصر المدفوع {0} باستخدام ""تسوية المخزون""، بدلا من ذلك استخدام ""إدخال المخزون"""
 DocType: Quality Inspection,Report Date,تقرير تاريخ
 DocType: Student,Middle Name,الاسم الأوسط
 DocType: C-Form,Invoices,الفواتير
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريد من نوعه، موجود بالفعل ل{0}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,إيصال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,إيصال
 ,Sales Register,سجل مبيعات
 DocType: Daily Work Summary Group,Send Emails At,إرسال رسائل البريد الإلكتروني في
 DocType: Quotation,Quotation Lost Reason,سبب خسارة المناقصة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,لا يوجد شيء لتحريره
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,عرض النموذج
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,الموافقة على المصروفات إلزامية في مطالبة النفقات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",أضف مستخدمين إلى مؤسستك، بخلاف نفسك.
 DocType: Customer Group,Customer Group Name,أسم فئة الزبون
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,لا زبائن حتى الان!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,بيان التدفقات النقدية
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,لم يتم إنشاء طلب مادي
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},لا يمكن أن تتجاوز قيمة القرض الحد الأقصى المحدد للقروض {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},لا يمكن أن تتجاوز قيمة القرض الحد الأقصى المحدد للقروض {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,رخصة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد المضي قدما إذا كنت تريد ان تتضمن اجازات السنة السابقة
@@ -4436,7 +4464,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,تمكين القالب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Please enter Write Off Account,الرجاء إدخال حساب الشطب
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر طلب
-DocType: Patient,B Negative,B سلبي
+DocType: Patient,B Negative,B سالب
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,يجب إلغاء حالة الصيانة أو إكمالها لإرسالها
 DocType: Hotel Room,Hotel Room,غرفة الفندق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
@@ -4448,11 +4476,12 @@
 DocType: Vehicle,Chassis No,رقم الشاسيه
 DocType: Payment Request,Initiated,بدأت
 DocType: Production Plan Item,Planned Start Date,المخطط لها تاريخ بدء
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,يرجى تحديد بوم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,يرجى تحديد بوم
 DocType: Purchase Invoice,Availed ITC Integrated Tax,الاستفادة من الضرائب المتكاملة إيتس
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
+DocType: Bank Guarantee,Clauses and Conditions,الشروط والأحكام
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
 DocType: Project Task,View Timesheet,عرض الجدول الزمني
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,يجب أن يكون تاريخ الانتهاء أكبر من تاريخ البدء
 DocType: Leave Type,Is Encash,هل الإجازات غير المستخدمة مدفوعة
 DocType: Leave Allocation,New Leaves Allocated,إنشاء تخصيص إجازة جديدة
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,البيانات الخاصة بالمشروع غير متوفرة للعرض المسعر
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,الاستخدام الحالي للكحول
 DocType: Student Admission Program,Student Admission Program,برنامج قبول الطالب
 DocType: Payment Entry,Account Paid To,حساب مدفوع ل
+DocType: Subscription Settings,Grace Period,فترة سماح
 DocType: Item Alternative,Alternative Item Name,اسم الصنف البديل
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,البند الأب {0} يجب ألا يكون بند مخزون
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",لا يمكن تقديم أي زلة الراتب <br> \ أسباب محتملة: <br> \ 1. صافي الأجر أقل من 0. <br> \ 2. عنوان البريد الإلكتروني للشركة المحدد في ماستر الموظف غير صالح. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',"الصف {0} # يجب أن يكون الحساب من نوع ""الأصول الثابتة"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,كمية خارجة
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,و أونككيد معطل في
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,الترقيم المتسلسل إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,الخدمات المالية
 DocType: Student Sibling,Student ID,هوية الطالب
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,شكوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,جعل إدخال السداد
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,جميع الإدارات
 DocType: Patient,Alcohol Past Use,الاستخدام الماضي للكحول
 DocType: Fertilizer Content,Fertilizer Content,محتوى الأسمدة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,إشكالية / عالقون
 DocType: Tax Rule,Billing State,الدولة الفواتير
 DocType: Share Transfer,Transfer,نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,يجب إلغاء طلب العمل {0} قبل إلغاء أمر المبيعات هذا
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),قابلة للتطبيق على (الموظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,(تاريخ الاستحقاق) إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,الاضافة للخاصية {0} لا يمكن أن تكون 0
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,رسالة للإظهار
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,بيع قطاعي
 DocType: Student Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,حزم المنتجات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,حزم المنتجات
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,تعذر العثور على النتيجة بدءا من {0}. يجب أن يكون لديك درجات دائمة تغطي 0 إلى 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},الصف {0}: مرجع غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
+DocType: Subscription,Current Invoice Start Date,تاريخ بدء الفاتورة الحالي
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: إما مبلغ دائن أو مدين مطلوب ل{2}
 DocType: GL Entry,Remarks,ملاحظات
@@ -4534,11 +4566,13 @@
 DocType: Task,Parent Task,المهمة الرئيسية
 DocType: Journal Entry,Write Off Based On,شطب بناء على
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,إنشاء زبون محتمل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,طباعة وقرطاسية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,طباعة وقرطاسية
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تم انجاز الراتب للفترة ما بين {0} و {1}، (طلب الاجازة) لا يمكن أن يكون بين هذا النطاق الزمني.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تم انجاز الراتب للفترة ما بين {0} و {1}، (طلب الاجازة) لا يمكن أن يكون بين هذا النطاق الزمني.
+DocType: Fiscal Year,Auto Created,إنشاء تلقائي
 DocType: Chapter Member,Leave Reason,ترك السبب
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,الفاتورة {0} لم تعد موجودة
 DocType: Guardian Interest,Guardian Interest,الجارديان الفائدة
 DocType: Volunteer,Availability,توفر
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,إعداد القيم الافتراضية لفواتير نقاط البيع
@@ -4546,14 +4580,13 @@
 DocType: Project,Time to send,الوقت لارسال
 DocType: Timesheet,Employee Detail,تفاصيل الموظف
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 معرف البريد الإلكتروني
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,يوم (التاريخ التالي) و (كرر في اليوم من شهر) يجب أن تكون متساوية
 DocType: Lab Prescription,Test Code,رمز الاختبار
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,إعدادات موقعه الإلكتروني
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},لا يسمح ب رفق ل {0} بسبب وضع بطاقة الأداء ل {1}
 DocType: Job Offer,Awaiting Response,انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,فوق
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},إجمالي المبلغ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},خاصية غير صالحة {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},إجمالي المبلغ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},خاصية غير صالحة {0} {1}
 DocType: Supplier,Mention if non-standard payable account,أذكر إذا كان الحساب غير القياسي مستحق الدفع
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',يرجى اختيار مجموعة التقييم بخلاف &quot;جميع مجموعات التقييم&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},الصف {0}: مركز التكلفة مطلوب لعنصر {1}
@@ -4564,7 +4597,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,تحليل المياه
 DocType: Chapter,Region,منطقة
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لفلترت المعاملات المختلفة.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,معدل التقييم السالب غير مسموح به
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,معدل التقييم السالب غير مسموح به
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,إعادة تحميل التحليل المرتبط
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",على سبيل المثال 2012، 2013
@@ -4580,7 +4613,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,تكلفة الأصول الملغاة او المخردة
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي للبند {2}
 DocType: Vehicle,Policy No,رقم بوليصة التأمين
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
 DocType: Asset,Straight Line,خط مستقيم
 DocType: Project User,Project User,المشروع العضو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,انشق، مزق
@@ -4616,21 +4649,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,مسار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى حساب دفتر الأستاذ لانه مرتبط بعقدة ابن
 DocType: Production Plan,Total Planned Qty,مجموع الكمية المخطط لها
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,القيمة الافتتاحية
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,القيمة الافتتاحية
 DocType: Salary Detail,Formula,صيغة
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,المسلسل #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,المسلسل #
 DocType: Lab Test Template,Lab Test Template,قالب اختبار المختبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,حساب مبيعات
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,حساب مبيعات
 DocType: Purchase Invoice Item,Total Weight,الوزن الكلي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,عمولة على المبيعات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,عمولة على المبيعات
 DocType: Job Offer Term,Value / Description,القيمة / الوصف
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 DocType: Purchase Order Item,Expected Delivery Date,تاريخ التسليم المتوقع
 DocType: Restaurant Order Entry,Restaurant Order Entry,مطعم دخول الطلب
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}.
-DocType: Asset Maintenance Task,Assign To Name,تعيين إلى الاسم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,نفقات الترفيه
+DocType: Asset Maintenance Task,Assign To Name,تعيين إلى اسم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,نفقات الترفيه
 DocType: Hub Settings,Enabled Users,تمكين المستخدمين
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,جعل المواد طلب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},فتح البند {0}
@@ -4643,43 +4676,44 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,طلبات الحصول على إجازة.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,لا يمكن حذف حساب جرت عليه أي عملية
 DocType: Vehicle,Last Carbon Check,آخر تحقق للكربون
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,نفقات قانونية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,نفقات قانونية
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,يرجى تحديد الكمية على الصف
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,جعل المبيعات فتح وفواتير الشراء
 DocType: Purchase Invoice,Posting Time,نشر التوقيت
 DocType: Timesheet,% Amount Billed,المبلغ٪ صفت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,نفقات الهاتف
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,نفقات الهاتف
 DocType: Sales Partner,Logo,شعار
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
 DocType: Email Digest,Open Notifications,فتح الإشعارات
 DocType: Payment Entry,Difference Amount (Company Currency),فروق المبلغ ( عملة الشركة ) .
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,النفقات المباشرة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,النفقات المباشرة
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ايرادات الزبائن الجدد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,نفقات السفر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,نفقات السفر
 DocType: Maintenance Visit,Breakdown,انهيار
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},إضافة حقل مخصص في مستند نوع {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
 DocType: Purchase Receipt Item,Sample Quantity,عينة الكمية
+DocType: Bank Guarantee,Name of Beneficiary,اسم المستفيد
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تحديث تكلفة بوم تلقائيا عبر جدولة، استنادا إلى أحدث معدل التقييم / سعر قائمة معدل / آخر معدل شراء المواد الخام.
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: الحساب الرئيسي {1} لا ينتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +106,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,As on Date,كما في تاريخ
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,As on Date,في الوقت
 DocType: Appraisal,HR,الموارد البشرية
 DocType: Program Enrollment,Enrollment Date,تاريخ التسجيل
 DocType: Healthcare Settings,Out Patient SMS Alerts,خارج التنبيهات سمز المريض
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,فترة التجربة
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,مكون الراتب
 DocType: Program Enrollment Tool,New Academic Year,العام الدراسي الجديد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ارجاع / اشعار دائن
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ارجاع / اشعار دائن
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,إجمالي المبلغ المدفوع
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,إجمالي المبلغ المدفوع
 DocType: GST Settings,B2C Limit,الحد B2C
 DocType: Work Order Item,Transferred Qty,نقل الكمية
 apps/erpnext/erpnext/config/learn.py +11,Navigating,التنقل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,التخطيط
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,التخطيط
 DocType: Share Balance,Issued,نشر
+DocType: Loan,Repayment Start Date,تاريخ بداية السداد
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,نشاط الطالب
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,المورد رقم
 DocType: Payment Request,Payment Gateway Details,تفاصيل الدفع بوابة
@@ -4692,10 +4726,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع الإجازة مثل اضطرارية، مرضية الخ.
 DocType: Email Digest,Send regular summary reports via Email.,إرسال تقارير موجزة منتظمة عبر البريد الإلكتروني.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في (نوع المطالبة بالنفقات) {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في (نوع المطالبة بالنفقات) {0}
 DocType: Assessment Result,Student Name,أسم الطالب
 DocType: Brand,Item Manager,مدير البند
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,رواتب واجبة الدفع
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,رواتب واجبة الدفع
 DocType: Buying Settings,Default Supplier Type,نوع المورد الافتراضي
 DocType: Plant Analysis,Collection Datetime,جمع داتيتيم
 DocType: Work Order,Total Operating Cost,إجمالي تكاليف التشغيل
@@ -4705,9 +4739,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,المستخدم {0} غير موجود
 DocType: Payment Term,Day(s) after invoice date,يوم (أيام) بعد تاريخ الفاتورة
 DocType: Payment Schedule,Payment Schedule,جدول الدفع
-DocType: Subscription,SUB-,الفرعية-
 DocType: Item Attribute Value,Abbreviation,اسم مختصر
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,تدوين المدفوعات موجود بالفعل
+DocType: Subscription,Trial Period End Date,تاريخ انتهاء الفترة التجريبية
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,غير مخول عندما {0} تتجاوز الحدود
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,الماستر الخاص بنمودج الراتب.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,علم الأمراض
@@ -4724,9 +4758,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,قدم عروض مسعرة للزبائن المحتملين أو الزبائن المتعامل معهم سابقا.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,جميع مجموعات الزبائن
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,جميع مجموعات الزبائن
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,متراكمة شهريا
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,قالب الضرائب إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,الحساب {0}: الحسابه الأب {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
@@ -4735,14 +4769,15 @@
 DocType: Lab Prescription,Test Created,تم إنشاء الاختبار
 DocType: Healthcare Settings,Custom Signature in Print,التوقيع المخصص في الطباعة
 DocType: Account,Temporary,مؤقت
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,العميل لبو رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,العميل لبو رقم
 DocType: Program,Courses,الدورات
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,أمين
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,أمين
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",إذا تم تعطيله، فلن يكون الحقل 'بالحروف' مرئيا في أي معاملة
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,سيوقف هذا الإجراء الفوترة المستقبلية. هل أنت متأكد من أنك تريد إلغاء هذا الاشتراك؟
 DocType: Serial No,Distinct unit of an Item,وحدة متميزة من عنصر
 DocType: Supplier Scorecard Criteria,Criteria Name,اسم المعايير
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,يرجى تعيين الشركة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,يرجى تعيين الشركة
 DocType: Pricing Rule,Buying,شراء
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,الأمراض والأسمدة
 DocType: HR Settings,Employee Records to be created by,سجلات الموظفين المراد إنشاؤها من قبل
@@ -4751,23 +4786,23 @@
 DocType: POS Profile,Apply Discount On,تطبيق تخفيض على
 DocType: Member,Membership Type,نوع العضوية
 ,Reqd By Date,Reqd حسب التاريخ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,الدائنين
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,الدائنين
 DocType: Assessment Plan,Assessment Name,اسم تقييم
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,إظهار بك في الطباعة
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,إظهار بك في الطباعة
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,الصف # {0}: الرقم التسلسلي إلزامي
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند ضريبة التفاصيل
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,عرض عمل
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,اختصار المؤسسة
 ,Item-wise Price List Rate,معدل قائمة الأسعار للصنف
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},الكمية ({0}) لا يمكن أن تكون جزءا من الصف {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},الكمية ({0}) لا يمكن أن تكون جزءا من الصف {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,-ATT
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 DocType: Hotel Room,Extra Bed Capacity,سرير إضافي
-DocType: Item,Opening Stock,فتح المخزون
+DocType: Item,Opening Stock,مخزون أول المدة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,الزبون مطلوب
 DocType: Lab Test,Result Date,تاريخ النتيجة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +99,PDC/LC Date,بك / لك التاريخ
@@ -4779,7 +4814,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,مجموع الفروق
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",إذا تم التمكين، سيقوم النظام بترحيل القيود المحاسبية الخاصة بالمخزون تلقائيا.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,أعمال سمسرة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,تم بالفعل تسجيل الحضور للموظف {0} لهذا اليوم
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,تم بالفعل تسجيل الحضور للموظف {0} لهذا اليوم
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","في دقائق 
  تحديث عبر 'وقت دخول """
@@ -4791,6 +4826,7 @@
 DocType: Lab Test,Approved Date,تاريخ الموافقة
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
+DocType: Subscriber,Subscriber Name,اسم المشترك
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Update Tool,Replace,استبدل
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,لم يتم العثور على منتجات.
@@ -4800,19 +4836,18 @@
 DocType: Request for Quotation Item,Project Name,اسم المشروع
 DocType: Customer,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},اختر حساب دخل الفائدة في قرض الموظف {0}
 DocType: Work Order,Required Items,الأصناف المطلوبة
 DocType: Stock Ledger Entry,Stock Value Difference,فرق قيمة المخزون
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 DocType: Disease,Treatment Task,العلاج المهمة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ضريبية الأصول
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ضريبية الأصول
 DocType: BOM Item,BOM No,رقم قائمة المواد
 DocType: Instructor,INS/,/INS
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,قيد دفتر اليومية {0} ليس لديه حساب {1} أو قد تم مطابقته مع إيصال أخرى
 DocType: Item,Moving Average,المتوسط المتحرك
 DocType: BOM Update Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,المعدات الإلكترونية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,المعدات الإلكترونية
 DocType: Asset,Maintenance Required,صيانة مطلوبة
 DocType: Account,Debit,مدين
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,يجب تخصيص الإجازات في مضاعفات 0.5 (مثلا 10.5 يوم او 4.5 او 30 يوم او 1 يوم)
@@ -4821,7 +4856,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,القيمة القائمة
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأرصدة أقدم من [ أيام]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامية عن شراء و بيع الأصول الثابتة
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامية عن شراء و بيع الأصول الثابتة
 DocType: Asset Maintenance Team,Maintenance Team Name,اسم فريق الصيانة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",إذا تم العثور على اثنين أو أكثر من قواعد التسعير استنادا إلى الشروط المذكورة أعلاه، يتم تطبيق الأولوية. الأولوية هي رقم بين 0 إلى 20 بينما القيمة الافتراضية هي صفر (فارغ). يعني الرقم الأعلى أنه سيكون له الأسبقية إذا كانت هناك قواعد تسعير متعددة بنفس الشروط.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,العميل إلزامي إذا تم اختيار &quot;فرصة من&quot; كعميل
@@ -4830,19 +4865,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,السماح للمستخدمين التاليين للموافقة على طلبات الحصول على إجازة في الأيام المحظورة
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,أنواع النفقات المطلوبة.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},سعر البيع للبند {0} أقل من {1}. يجب أن يكون سعر البيع على الأقل {2}
-DocType: Item,Taxes,الضرائب
+DocType: Subscription,Taxes,الضرائب
 DocType: Purchase Invoice,capital goods,السلع الرأسمالية
 DocType: Purchase Invoice Item,Weight Per Unit,الوزن لكل وحدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,تم الدفع ولم يتم التسليم
 DocType: Project,Default Cost Center,مركز التكلفة الافتراضي
-DocType: Bank Guarantee,End Date,نهاية التاريخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,قيود المخزون
 DocType: Budget,Budget Accounts,حسابات الميزانية
 DocType: Employee,Internal Work History,سجل العمل الداخلي
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,قيمة الاستهلاك المتراكمة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,رأس المال الخاص
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,مورد بطاقة الأداء المتغير
-DocType: Employee Loan,Fully Disbursed,تم صرفها بالكامل
 DocType: Employee Advance,Due Advance Amount,مبلغ مقدم مستحق
 DocType: Maintenance Visit,Customer Feedback,ملاحظات الزبائن
 DocType: Account,Expense,نفقة
@@ -4866,7 +4899,7 @@
 ,Employee Information,معلومات الموظف
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,إنشاء عرض مسعر خاص بالمورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,إنشاء عرض مسعر خاص بالمورد
 DocType: Quality Inspection,Incoming,الوارد
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,يتم إنشاء قوالب الضرائب الافتراضية للمبيعات والشراء.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,سجل نتيجة التقييم {0} موجود بالفعل.
@@ -4874,7 +4907,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',الرجاء تعيين فلتر الشركة فارغا إذا كانت المجموعة بي هي &#39;كومباني&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,تاريخ النشر لا يمكن أن يكون تاريخ مستقبلي
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: الرقم التسلسلي {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,لتوليد المتكررة
 DocType: Stock Entry,Target Warehouse Address,عنوان المستودع المستهدف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,أجازة عادية
 DocType: Agriculture Task,End Day,نهاية اليوم
@@ -4899,11 +4931,10 @@
 DocType: Material Request,% Ordered,٪ تم طلبها
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",بالنسبة للطلاب مجموعة مقرها دورة، سيتم التحقق من صحة الدورة لكل طالب من الدورات المسجلة في التسجيل البرنامج.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,الأجرة المدفوعة لكمية العمل المنجز
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,متوسط  سعر شراء
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,متوسط  سعر شراء
 DocType: Share Balance,From No,من لا
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,الحركة التاريخيه في الشركة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},رسالة جديدة من {سيندر}
 DocType: Customer,Customer Primary Address,عنوان العميل الأساسي
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,النشرات الإخبارية
 DocType: Drug Prescription,Description/Strength,الوصف / القوة
@@ -4912,22 +4943,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,تم إدخال البند نفسه عدة مرات
 DocType: Department,Leave Block List,قائمة الايام المحضور الإجازة فيها
 DocType: Purchase Invoice,Tax ID,البطاقة الضريبية
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
 DocType: Accounts Settings,Accounts Settings,إعدادات الحسابات
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,وافق
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",عنوان غير صحيح ل {0}، يرجى إصلاح للمتابعة.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",عنوان غير صحيح ل {0}، يرجى إصلاح للمتابعة.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",عدد الحساب الجديد، سيتم تضمينه في اسم الحساب كبادئة
 DocType: Maintenance Team Member,Team Member,أعضاء الفريق
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,لا توجد نتيجة لإرسال
 DocType: Customer,Sales Partner and Commission,مبيعات الشريك واللجنة
-DocType: Employee Loan,Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة
+DocType: Loan,Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة
 ,Project Quantity,مشروع الكمية
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",إجمالي {0} لجميع المواد والصفر، قد يكون عليك تغيير &quot;توزيع التكاليف على أساس &#39;
 DocType: Opportunity,To Discuss,لمناقشة
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} وحدات من  {1} لازمة في {2} لإكمال هذه المعاملة.
 DocType: Loan Type,Rate of Interest (%) Yearly,معدل الفائدة (٪) سنوي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,حسابات مؤقتة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,أسود
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,حسابات مؤقتة
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,قائمة المواد للبند المفصص
 DocType: Shareholder,Contact List,قائمة جهات الاتصال
 DocType: Account,Auditor,مدقق الحسابات
@@ -4935,16 +4966,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} عناصر منتجة
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,أعرف أكثر
 DocType: Cheque Print Template,Distance from top edge,المسافة من الحافة العلوية
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,قائمة الأسعار {0} تعطيل أو لا وجود لها
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,قائمة الأسعار {0} تعطيل أو لا وجود لها
 DocType: Purchase Invoice,Return,عودة
 DocType: Pricing Rule,Disable,تعطيل
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,طريقة الدفع مطلوبة لإجراء الدفع
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,طريقة الدفع مطلوبة لإجراء الدفع
 DocType: Project Task,Pending Review,في انتظار المراجعة
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",يمكنك التعديل في الصفحة الكاملة للحصول على مزيد من الخيارات مثل مواد العرض، والرقم التسلسلي، والدفقات، إلخ.
-apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,التعيينات والمشاورات
+apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,المواعيد والاستشارات
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} غير مسجل في الدفعة {2}
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",الأصول {0} لا يمكن تخريده، لانه بالفعل {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,الشيكات المطلوبة
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",الأصل {0} لا يمكن اهماله، لانه بالفعل {1}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,الشيكات المطلوبة
 DocType: Task,Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,حدد كغائب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,أخفق إعداد الشركة
@@ -4956,7 +4987,7 @@
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,إدارة أسطول المركبات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,إضافة بنود من
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,إضافة بنود من
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,المحاصيل والأراضي
 DocType: Cheque Print Template,Regular,منتظم
 DocType: Fertilizer,Density (if liquid),الكثافة (إذا كانت سائلة)
@@ -4974,50 +5005,54 @@
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد التي تم تسليمها مقابل اشعار التسليم هذا
 DocType: Asset Maintenance Log,Has Certificate,لديه شهادة
 DocType: Project,Customer Details,تفاصيل العميل
-DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,تحقق مما إذا كانت مادة العرض تتطلب الصيانة الوقائية أو المعايرة
+DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,تحقق مما إذا كان الأصل تتطلب الصيانة الوقائية أو المعايرة
 apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,لا يمكن أن يحتوي اختصار الشركة على أكثر من 5 أحرف
 DocType: Employee,Reports to,إرسال التقارير إلى
 ,Unpaid Expense Claim,غير المسددة المطالبة النفقات
 DocType: Payment Entry,Paid Amount,المبلغ المدفوع
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,استكشاف دورة المبيعات
 DocType: Assessment Plan,Supervisor,مشرف
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,الاحتفاظ الأسهم
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,الاحتفاظ الأسهم
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,السلعة  البديلة
 ,Work Order Stock Report,تقرير مخزون أمر العمل
+DocType: Purchase Receipt,Auto Repeat Detail,تكرار تفاصيل السيارات
 DocType: Assessment Result Tool,Assessment Result Tool,أداة نتيجة التقييم
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,كمشرف
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,اقتراح فئة
 DocType: BOM Scrap Item,BOM Scrap Item,البند الخردة بقائمة المواد
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,لا يمكن حذف طلبات مقدمة / مسجلة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",رصيد الحساب رصيد مدين، لا يسمح لك بتغييره 'الرصيد يجب أن يكون دائن'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,إدارة الجودة
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,إدارة الجودة
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,البند {0} تم تعطيله
 DocType: Project,Total Billable Amount (via Timesheets),إجمالي المبلغ القابل للفوترة (عبر الجداول الزمنية)
 DocType: Agriculture Task,Previous Business Day,يوم العمل السابق
-DocType: Employee Loan,Repay Fixed Amount per Period,سداد قيمة ثابتة لكل فترة
-DocType: Employee,Health Insurance No,التأمين الصحي رقم
+DocType: Loan,Repay Fixed Amount per Period,سداد قيمة ثابتة لكل فترة
+DocType: Employee,Health Insurance No,رقم التأمين الصحي
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال الكمية للبند {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ملاحظة ائتمان
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ملاحظة ائتمان
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,إجمالي المبلغ الخاضع للضريبة
 DocType: Employee External Work History,Employee External Work History,سجل عمل الموظف خارج الشركة
 DocType: Opening Invoice Creation Tool,Purchase,الشراء
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,رصيد الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,كمية الرصيد
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,الأهداف لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +15,Enrolling students,تسجيل الطلاب
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
-DocType: Appointment Type,Appointment Type,نوع التعيين
+DocType: Appointment Type,Appointment Type,نوع الموعد
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ل {1}
 DocType: Healthcare Settings,Valid number of days,عدد الأيام الصالحة
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,مراكز التكلفة
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,إعادة تشغيل الاشتراك
 DocType: Land Unit,Linked Plant Analysis,تحليل النباتات المرتبطة
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة المورد قاعدة الشركة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},الصف # {0}: التوقيت يتعارض مع الصف {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,السماح بقيمة صفر
+DocType: Bank Guarantee,Receiving,يستلم
 DocType: Training Event Employee,Invited,دعوة
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,وجود اكثر من هيكل راتب نشط للموظف {0} للتواريخ المحددة
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,إعدادت بوابة الحسايات.
 DocType: Employee,Employment Type,نوع الوظيفة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,الاصول الثابتة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,الاصول الثابتة
 DocType: Payment Entry,Set Exchange Gain / Loss,تعيين كسب تبادل / الخسارة
 ,GST Purchase Register,غست شراء سجل
 ,Cash Flow,التدفق النقدي
@@ -5031,15 +5066,16 @@
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Training Event,Internet,الإنترنت
 DocType: Special Test Template,Special Test Template,قالب اختبار خاص
-DocType: Account,Stock Adjustment,الأسهم التكيف
+DocType: Account,Stock Adjustment,تسوية المخزون
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},تكلفة النشاط الافتراضية موجودة لنوع النشاط - {0}
 DocType: Work Order,Planned Operating Cost,المخطط تكاليف التشغيل
 DocType: Academic Term,Term Start Date,المدى تاريخ بدء
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,قائمة بجميع معاملات الأسهم
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,أوب كونت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},الرجاء جد {0} # {1} المرفقه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,يجب تعيين كل من تاريخ بدء الفترة التجريبية وتاريخ انتهاء الفترة التجريبية
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,المعدل المتوسط
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير
+DocType: Subscription Plan Detail,Plan,خطة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,كشف رصيد الحساب المصرفي وفقا لدفتر الأستاذ العام
 DocType: Job Applicant,Applicant Name,اسم طالب الوظيفة
 DocType: Authorization Rule,Customer / Item Name,الزبون / أسم البند
@@ -5071,6 +5107,7 @@
 DocType: Work Order,Warehouses,المستودعات
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} أصول لا يمكن نقلها
 DocType: Hotel Room Pricing,Hotel Room Pricing,فندق غرفة التسعير
+DocType: Subscription,Days Until Due,أيام حتى موعد الاستحقاق
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,هذا العنصر هو متغير {0} (قالب).
 DocType: Workstation,per hour,كل ساعة
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,المشتريات
@@ -5079,23 +5116,24 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",بالنسبة لمجموعة الطالب القائمة على الدفعة، سيتم التحقق من الدفعة الطالب لكل طالب من تسجيل البرنامج.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,توزيع
+DocType: Journal Entry Account,Loan,قرض
 DocType: Expense Claim Advance,Expense Claim Advance,النفقات المطالبة مقدما
 DocType: Lab Test,Report Preference,تفضيل التقرير
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,معلومات التطوع.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,مدير المشروع
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,مدير المشروع
 ,Quoted Item Comparison,مقارنة بند المناقصة
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},التداخل في التسجيل بين {0} و {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ارسال
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ارسال
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,الحد الاعلى المسموح به في التخفيض للمنتج : {0} هو  {1}٪
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,صافي قيمة الأصول كما في
 DocType: Crop,Produce,إنتاج
 DocType: Hotel Settings,Default Taxes and Charges,الضرائب والرسوم الافتراضية
 DocType: Account,Receivable,مستحق
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: لا يسمح بتغيير (المورد) لان أمر الشراء موجود بالفعل
-DocType: Stock Entry,Material Consumption for Manufacture,استهلاك المواد للتصنيع
+DocType: Stock Entry,Material Consumption for Manufacture,اهلاك المواد للتصنيع
 DocType: Item Alternative,Alternative Item Code,رمز الصنف البديل
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الوظيفي الذي يسمح له بتقديم المعاملات التي تتجاوز حدود الدين المحددة.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,حدد العناصر لتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,حدد العناصر لتصنيع
 DocType: Delivery Stop,Delivery Stop,توقف التسليم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",مزامنة البيانات الماستر قد يستغرق بعض الوقت
 DocType: Item,Material Issue,صرف مواد
@@ -5105,16 +5143,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
 DocType: BOM,Show Items,إظهار العناصر
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,(من الوقت) لا يمكن أن يكون بعد من (الي الوقت).
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟
+DocType: Subscription Plan,Billing Interval,فواتير الفوترة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,الصور المتحركة والفيديو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,تم طلبه
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,استئنف
 DocType: Hub Settings,Hub Username,اسم المستخدم Hub
 DocType: Salary Detail,Component,مكون
 DocType: Assessment Criteria,Assessment Criteria Group,مجموعة معايير تقييم
 DocType: Healthcare Settings,Patient Name By,اسم المريض بي
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},مدخل يومية تراكمية للرواتب من {0} إلى {1}
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},الاستهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},مدخل يومية تراكمية للرواتب من {0} إلى {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},الاهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي {0}
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,الرجاء إدخال الدور الوظيفي المخول بالتصديق أو المستخدم المخول بالتصديق
@@ -5127,22 +5165,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك ادراج تفاصيل عن الحالة الصحية مثل الطول والوزن، الحساسية، المخاوف الطبية
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن الإلغاء لان هناك تدوينات مخزون مقدمة {0} موجوده
-DocType: Employee Loan,Disbursement Date,تاريخ الصرف
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,لم يتم تحديد &quot;المستلمين&quot;
+DocType: Loan,Disbursement Date,تاريخ الصرف
 DocType: BOM Update Tool,Update latest price in all BOMs,تحديث آخر الأسعار في جميع بومس
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,السجل الطبي
 DocType: Vehicle,Vehicle,مركبة
 DocType: Purchase Invoice,In Words,في كلمات
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,أدخل اسم البنك أو مؤسسة الإقراض قبل التقديم.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} يجب تسليمها
 DocType: POS Profile,Item Groups,مجموعات السلعة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Sales Order Item,For Production,للإنتاج
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,الرجاء إضافة حساب فتح مؤقت في مخطط الحسابات
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,الرجاء إضافة حساب فتح مؤقت في مخطط الحسابات
 DocType: Customer,Customer Primary Contact,العميل الاتصال الأساسي
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,مجلة إغلاق الفترة
 DocType: Project Task,View Task,عرض المهمة
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,أوب / ليد٪
+DocType: Bank Guarantee,Bank Guarantee Type,نوع الضمان المصرفي
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,جزء الفاتورة
 ,Asset Depreciations and Balances,إستهلاك الأصول والأرصدة
@@ -5153,9 +5192,8 @@
 DocType: Production Plan,Include Subcontracted Items,تضمين العناصر من الباطن
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,لا يمكن تغيير خصائص المتغير بعد نقل المخزون. سيكون لديك لجعل عنصر جديد للقيام بذلك.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,متغير البند {0} موجود بنفس الخاصية
-DocType: Employee Loan,Repay from Salary,سداد من الراتب
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,متغير البند {0} موجود بنفس الخاصية
+DocType: Loan,Repay from Salary,سداد من الراتب
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},طلب الدفعة مقابل {0} {1} لقيمة {2}
 DocType: Salary Slip,Salary Slip,كشف الراتب
@@ -5163,7 +5201,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +221,Student Batches,دفعات الطالب
 DocType: Pricing Rule,Margin Rate or Amount,نسبة الهامش أو المبلغ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",.إنشاء التعبئة زلات لحزم ليتم تسليمها. المستخدمة لإخطار رقم   الحزمة، محتويات الحزمة وزنها.
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",إنشاء قائمة بحتويات الشحنة للشحنة المراد تسليمها. يجب عليك الإبلاغ عن رقم الشحنة، محتوياتها ووزنها.
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,أيام الدفع
 DocType: Stock Settings,Convert Item Description to Clean HTML,تحويل وصف السلعة لتنظيف هتمل
@@ -5179,11 +5217,11 @@
 DocType: Employee Education,Employee Education,المستوى التعليمي للموظف
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,تم العثور على فئة بنود مكررة في جدول فئات البنود
 DocType: Land Unit,Parent Land Unit,وحدة أراضي الوالدين
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,هناك حاجة لجلب تفاصيل البند.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,هناك حاجة لجلب تفاصيل البند.
 DocType: Fertilizer,Fertilizer Name,اسم السماد
 DocType: Salary Slip,Net Pay,صافي الراتب
 DocType: Cash Flow Mapping Accounts,Account,حساب
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,رقم المسلسل {0} وقد وردت بالفعل
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,رقم المسلسل {0} وقد وردت بالفعل
 ,Requested Items To Be Transferred,العناصر المطلوبة على أن يتم تحويلها
 DocType: Expense Claim,Vehicle Log,دخول السيارة
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود حمى (درجة الحرارة&gt; 38.5 درجة مئوية / 101.3 درجة فهرنهايت أو درجة حرارة ثابتة&gt; 38 درجة مئوية / 100.4 درجة فهرنهايت)
@@ -5221,43 +5259,43 @@
 DocType: Budget,Warn,تحذير
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +108,Are you sure you want to unregister?,هل تريد بالتأكيد إلغاء التسجيل؟
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +926,All items have already been transferred for this Work Order.,جميع الإصناف تم نقلها لأمر الشراء هذا
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، والجهود الجديرة بالذكر التي ينبغي أن تدون في السجلات.
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، وجهود جديرة بالذكر يجب أن تدون في السجلات.
 DocType: Asset Maintenance,Manufacturing User,مستخدم التصنيع
 DocType: Purchase Invoice,Raw Materials Supplied,المواد الخام الموردة
-DocType: C-Form,Series,سلسلة ترقيم الوثيقة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},العملة من قائمة الأسعار {0} يجب أن تكون {1} أو {2}
 DocType: Appraisal,Appraisal Template,نموذج التقييم
 DocType: Soil Texture,Ternary Plot,مؤامرة ثلاثية
 DocType: Item Group,Item Classification,تصنيف البند
 DocType: Driver,License Number,رقم الرخصة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,مدير تطوير الأعمال
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,مدير تطوير الأعمال
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,صيانة زيارة الغرض
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,تسجيل فاتورة المريض
 DocType: Crop,Period,فترة
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,دفتر الأستاذ العام
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},الموظف {0} لديه إجازة في {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},الموظف {0} لديه إجازة في {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,مشاهدة العروض
 DocType: Program Enrollment Tool,New Program,برنامج جديد
 DocType: Item Attribute Value,Attribute Value,السمة القيمة
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 DocType: Salary Detail,Salary Detail,تفاصيل الراتب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,الرجاء اختيار {0} أولاً
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,الرجاء اختيار {0} أولاً
 DocType: Appointment Type,Physician,الطبيب المعالج
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,المشاورات
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,الاستشارات
 DocType: Sales Invoice,Commission,عمولة
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في طلب العمل {3}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورقة الوقت للتصنيع.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,حاصل الجمع
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,لا يمكن تغيير خصائص المتغير بعد معاملة المخزون. سيكون عليك عمل عنصر جديد للقيام بذلك.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA التكليف
 DocType: Physician,Charges,شحنة
 DocType: Production Plan,Get Items For Work Order,الحصول على البنود لأمر العمل
 DocType: Salary Detail,Default Amount,المبلغ الافتراضي
 DocType: Lab Test Template,Descriptive,وصفي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ملخص هذا الشهر
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,شراء قالب الضرائب
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,عين هدف المبيعات الذي تريد تحقيقه لشركتك.
 ,Project wise Stock Tracking,مشروع تتبع حركة الأسهم الحكمة
@@ -5267,7 +5305,7 @@
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,مطلوب مجموعة العملاء في الملف الشخصي نقاط البيع
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Please set Next Depreciation Date,يرجى تعيين تاريخ استهلاك التالي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Please set Next Depreciation Date,يرجى تعيين تاريخ اهلاك التالي
 DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
 apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,مطابقة الفواتيرالغير مترابطة والمدفوعات.
 DocType: POS Settings,POS Settings,إعدادات نقاط البيع
@@ -5285,11 +5323,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,أخفق إنشاء موقع ويب
 DocType: Soil Analysis,Mg/K,ملغ / كيلو
 DocType: UOM Conversion Detail,UOM Conversion Detail,تفاصيل تحويل وحدة القياس
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,الاحتفاظ الأسهم دخول بالفعل إنشاء أو عينة الكمية غير المقدمة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,الاحتفاظ الأسهم دخول بالفعل إنشاء أو عينة الكمية غير المقدمة
 DocType: Program,Program Abbreviation,اختصار برنامج
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,تحديث الرسوم في اضافة المشتريات لكل صنف
 DocType: Warranty Claim,Resolved By,حلها عن طريق
-DocType: Bank Guarantee,Start Date,تاريخ البدء
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,تخصيص إجازات لفترة معينة.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,الشيكات والودائع موضحة او المقاصة تمت بشكل غير صحيح
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,الحساب {0}: لا يمكنك جعله حساب رئيسي
@@ -5304,11 +5341,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعات
 DocType: Project,Expected Start Date,تاريخ البدأ المتوقع
 DocType: Purchase Invoice,04-Correction in Invoice,04-تصحيح في الفاتورة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,تم إنشاء أمر العمل بالفعل لكافة العناصر باستخدام قائمة المواد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,تم إنشاء أمر العمل بالفعل لكافة العناصر باستخدام قائمة المواد
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,تفاصيل تقرير التقرير
 DocType: Setup Progress Action,Setup Progress Action,إعداد إجراء التقدم
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,قائمة أسعار الشراء
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,قائمة أسعار الشراء
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,إلغاء الاشتراك
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,يرجى تحديد حالة الصيانة على أنها اكتملت أو أزل تاريخ الاكتمال
 DocType: Supplier,Default Payment Terms Template,نموذج شروط الدفع الافتراضية
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
@@ -5319,7 +5357,6 @@
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,الإجراء في حالة تجاوزت المخصصات الشهرية الميزانية
-DocType: Subscription,Submit on creation,إرسال على خلق
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},العملة {0} يجب أن تكون {1}
 DocType: Asset,Disposal Date,تاريخ التخلص
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",سيتم إرسال رسائل البريد الإلكتروني لجميع الموظفين العاملين في الشركة في ساعة معينة، إذا لم يكن لديهم عطلة. سيتم إرسال ملخص الردود في منتصف الليل.
@@ -5335,8 +5372,9 @@
 DocType: Cash Flow Mapper,Section Footer,تذييل القسم
 apps/erpnext/erpnext/stock/doctype/item/item.js +304,Add / Edit Prices,إضافة و تعديل الأسعار
 DocType: Batch,Parent Batch,دفعة الأم
-DocType: Cheque Print Template,Cheque Print Template,نمودج طباعة الصك
+DocType: Cheque Print Template,Cheque Print Template,نمودج طباعة الشيك
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,دليل مراكز التكلفة
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,عدد الأيام التي انقضت بعد تاريخ الفاتورة قبل إلغاء الاشتراك أو وضع علامة على الاشتراك كمبلغ غير مدفوع
 DocType: Lab Test Template,Sample Collection,جمع العينات
 ,Requested Items To Be Ordered,البنود المطلوبة إلى أن يؤمر
 DocType: Price List,Price List Name,قائمة الأسعار اسم
@@ -5345,13 +5383,13 @@
 DocType: Account,Income,الإيرادات
 DocType: Industry Type,Industry Type,نوع صناعة
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,حدث خطأ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,تحذير: طلب اجازة يحتوي على تواريخ محظورة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,تحذير: طلب اجازة يحتوي على تواريخ محظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
 DocType: Supplier Scorecard Scoring Criteria,Score,أحرز هدفاً
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,السنة المالية {0} غير موجودة
 DocType: Asset Maintenance Log,Completion Date,تاريخ الانتهاء
 DocType: Purchase Invoice Item,Amount (Company Currency),المبلغ (عملة الشركة)
-DocType: Agriculture Analysis Criteria,Agriculture User,مستخدم إضافي
+DocType: Agriculture Analysis Criteria,Agriculture User,مستخدم زراعي
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,صالحة حتى تاريخ لا يمكن أن يكون قبل تاريخ المعاملة
 apps/erpnext/erpnext/stock/stock_ledger.py +381,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} وحدات من {1} لازمة ل {2} في {3} {4} ل {5} لإكمال هذه المعاملة.
 DocType: Fee Schedule,Student Category,طالب الفئة
@@ -5365,12 +5403,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,ملف نقطة البيع
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} يجب أن تكون القيمة بين 0 و 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,تاريخ االستهالك التالي ال ميكن أن يكون قبل التاريخ املتاح لالستخدام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,القروض غير المضمونة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,القروض غير المضمونة
 DocType: Cost Center,Cost Center Name,اسم مركز تكلفة
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,اقصى عدد ساعات عمل بسجل التوقيت
 DocType: Maintenance Schedule Detail,Scheduled Date,المقرر تاريخ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,مجموع المبالغ المدفوعة AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,مجموع المبالغ المدفوعة AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,سيتم تقسيم الرسائل التي تزيد عن 160 حرفا إلى رسائل متعددة
 DocType: Purchase Receipt Item,Received and Accepted,تلقت ومقبول
 DocType: Hub Settings,Company and Seller Profile,الشركة والبائع الملف الشخصي
@@ -5384,16 +5422,15 @@
 DocType: Item,Variant Based On,البديل القائم على
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,الموردون
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,يرجى تصحيح
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,لا يمكن تحديدها كمفقودة اذا تم انشاء طلب المبيعات.
 DocType: Request for Quotation Item,Supplier Part No,رقم قطعة المورد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,مجهول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,مستلم من
 DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,يحتوي على رقم تسلسلي
 DocType: Employee,Date of Issue,تاريخ الإصدار
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",وفقا لإعدادات الشراء في حالة شراء ريسيبت مطلوب == &#39;نعم&#39;، ثم لإنشاء فاتورة الشراء، يحتاج المستخدم إلى إنشاء إيصال الشراء أولا للبند {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",وفقا لإعدادات الشراء في حالة ايصال الشراء مطلوب == 'نعم'، لإنشاء فاتورة شراء، يحتاج المستخدم إلى إنشاء إيصال الشراء أولا للبند {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +167,Row #{0}: Set Supplier for item {1},الصف # {0}: حدد المورد للبند {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر.
 apps/erpnext/erpnext/stock/doctype/item/item.py +195,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
@@ -5401,6 +5438,7 @@
 DocType: Asset,Assets,الأصول
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,الحاسوب
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
+DocType: Subscription,Current Invoice End Date,تاريخ انتهاء الفاتورة الحالي
 DocType: Payment Term,Due Date Based On,تاريخ الاستحقاق بناء على
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,يرجى تعيين مجموعة العملاء الافتراضية والأقاليم في إعدادات البيع
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} غير موجود
@@ -5408,7 +5446,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,.أنت غير مخول لتغيير القيم المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,لم يتم اختيار السداد لمدخل المجلة
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
+DocType: Loan,Disbursed,صرف
 DocType: Healthcare Settings,Laboratory Settings,إعدادات المختبر
 DocType: Patient Appointment,Service Unit,وحدة الخدمة
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,بنجاح تعيين المورد
@@ -5421,12 +5461,12 @@
 DocType: Share Balance,No of Shares,عدد األسهم
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,حدد الحالة
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,لا يمكن اثبات الحضور لتاريخ مستقبلي
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,لا يمكن اثبات الحضور لتاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات قاعدة التسعير
 DocType: School House,House Name,اسم المنزل
 DocType: Fee Schedule,Total Amount per Student,إجمالي المبلغ لكل طالب
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,الكهرباء
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,الكهرباء
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,أضف بقية أفراد مؤسستك كمستخدمين. يمكنك أيضا إضافة دعوة العملاء إلى بوابتك عن طريق إضافتهم من جهات الاتصال
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
 DocType: Grant Application,Requested Amount,الكمية المطلوبة
@@ -5436,7 +5476,7 @@
 DocType: Crop Cycle,Detected Diseases,الأمراض المكتشفة
 DocType: Stock Entry,Default Source Warehouse,المصدر الافتراضي مستودع
 DocType: Item,Customer Code,كود العميل
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},التذكير بعيد ميلاد {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},التذكير بعيد ميلاد {0}
 DocType: Asset Maintenance Task,Last Completion Date,تاريخ الانتهاء الأخير
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,الأيام منذ آخر طلب
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
@@ -5444,9 +5484,10 @@
 DocType: GoCardless Settings,GoCardless Settings,إعدادات GoCardless
 DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بداية التأمين قبل  تاريخ نهاية التأمين
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,اصول المخزون
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,اصول المخزون
 DocType: Restaurant,Active Menu,القائمة النشطة
 DocType: Target Detail,Target Qty,الهدف الكمية
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},مقابل القرض: {0}
 DocType: Shopping Cart Settings,Checkout Settings,إعدادات الدفع
 DocType: Student Attendance,Present,حاضر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا تكون مسجلة
@@ -5455,9 +5496,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},كشف الراتب للموظف {0} تم إنشاؤه لسجل التوقيت {1}
 DocType: Vehicle Log,Odometer,عداد المسافات
 DocType: Production Plan Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,تم تعطيل البند {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,تم تعطيل البند {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,فاتورة الموارد لا تحتوي على أي عنصر مخزون
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,فاتورة الموارد لا تحتوي على أي عنصر مخزون
 DocType: Chapter,Chapter Head,رئيس الفصل
 DocType: Payment Term,Month(s) after the end of the invoice month,شهر (أشهر) بعد نهاية شهر الفاتورة
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,نشاط او مهمة لمشروع .
@@ -5465,11 +5506,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,إنشاء كشوفات الرواتب
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,لا يمكن أن يكون نتيجة المختبر داتيتيم قبل اختبار داتيتيم
 DocType: POS Profile,Allow user to edit Discount,السماح للمستخدم بتعديل الخصم
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,الحصول على العملاء من
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,الحصول على العملاء من
 DocType: Purchase Invoice Item,Include Exploded Items,تضمين العناصر المتفجرة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
 DocType: Shipping Rule,Restrict to Countries,تقييد البلدان
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; تسمية السلسلة
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
 DocType: Project,Total Sales Amount (via Sales Order),إجمالي مبلغ المبيعات (عبر أمر المبيعات)
@@ -5486,6 +5528,7 @@
 DocType: Soil Texture,Sandy Clay,الصلصال الرملي
 DocType: Grant Application,Assessment  Manager,مدير التقييم
 DocType: Payment Entry,Allocate Payment Amount,تخصيص مبلغ الدفع
+DocType: Subscription Plan,Subscription Plan,خطة الاشتراك
 DocType: Employee External Work History,Salary,الراتب
 DocType: Serial No,Delivery Document Type,تسليم الوثيقة نوع
 DocType: Sales Order,Partly Delivered,سلمت جزئيا
@@ -5511,9 +5554,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,مدى العمر 2
 DocType: SG Creation Tool Course,Max Strength,القوة القصوى
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,تثبيت الإعدادات المسبقة
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},لم يتم تحديد ملاحظة التسليم للعميل {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},لم يتم تحديد ملاحظة التسليم للعميل {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,تم استبدال قائمة المواد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,حدد العناصر بناء على تاريخ التسليم
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,حدد العناصر بناء على تاريخ التسليم
 DocType: Grant Application,Has any past Grant Record,لديه أي سجل المنحة الماضية
 ,Sales Analytics,تحليلات المبيعات
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},متاح {0}
@@ -5531,7 +5574,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,المواد الخام الموردة التكلفة
 DocType: Selling Settings,Settings for Selling Module,إعدادات لبيع وحدة
 DocType: Hotel Room Reservation,Hotel Room Reservation,حجز غرفة الفندق
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,خدمة الزبائن
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,خدمة الزبائن
 DocType: BOM,Thumbnail,المصغرات
 DocType: Item Customer Detail,Item Customer Detail,تفاصيل الزبون لهذا البند
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,عرض عمل للمرشح للوظيفة
@@ -5547,7 +5590,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} تم تسجيل الطلاب
 DocType: Fees,Student Details,تفاصيل الطالب
 DocType: Purchase Invoice Item,Stock Qty,الأسهم الكمية
-DocType: Employee Loan,Repayment Period in Months,فترة السداد بالأشهر
+DocType: Loan,Repayment Period in Months,فترة السداد بالأشهر
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,خطأ: هوية غير صالحة؟
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,حقوق الملكية
@@ -5556,7 +5599,7 @@
 DocType: Task,Closing Date,تاريخ الإنتهاء
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
 DocType: Timesheet,Work Detail,تفاصيل العمل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,مهندس
 DocType: Journal Entry,Total Amount Currency,مجموع المبلغ العملات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,جمعيات البحث الفرعية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},كود البند مطلوب في الصف رقم {0}
@@ -5601,13 +5644,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,المانح نوع المعلومات.
 DocType: Request for Quotation,Supplier Detail,المورد التفاصيل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,قيمة الفواتير
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,قيمة الفواتير
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,يجب أن تضيف معايير الأوزان ما يصل إلى 100٪
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,الحضور
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,المخزن عناصر
 DocType: BOM,Materials,المواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",إذا لم يتم الاختيار، فان القائمة ستضاف إلى كل قسم حيث لابد من تطبيقها.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},إنشاء {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,المخزن المصدر و المخزن المستهدف  لا يمكن أن يكون واحدا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,قالب الضرائب لشراء صفقة.
@@ -5631,14 +5673,14 @@
 DocType: Shipping Rule,Fixed,ثابت
 DocType: Vehicle Service,Clutch Plate,صفائح التعشيق
 DocType: Company,Round Off Account,جولة قبالة حساب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,نفقات إدارية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,نفقات إدارية
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,مجموعة عملاء أولياء الأمور
-DocType: Journal Entry,Subscription,اشتراك
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,اشتراك
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,إنشاء الرسوم معلقة
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,مدة الاشعار
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,مدة الاشعار
 DocType: Asset Category,Asset Category Name,اسم فئة الأصول
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,هذا هو الجذر الأرض والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,اسم مندوب المبيعات جديد
@@ -5650,8 +5692,8 @@
 DocType: Bin,Reserved Qty for Production,الكمية المحجوزة للانتاج
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ترك دون تحديد إذا كنت لا ترغب في النظر في دفعة مع جعل مجموعات مقرها بالطبع.
-DocType: Asset,Frequency of Depreciation (Months),تواتر او تكرار الاستهلاك (أشهر)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,حساب دائن
+DocType: Asset,Frequency of Depreciation (Months),تواتر او تكرار الاهلاك (أشهر)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,حساب دائن
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,إظهار القيم صفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,الكمية من البنود التي تم الحصول عليها بعد التصنيع / إعادة التعبئة من الكميات المعطاء من المواد الخام
@@ -5659,13 +5701,13 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل بند طلب مبيعات
 DocType: Hub Settings,Company Logo,شعار الشركة
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة الخاصية {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة الخاصية {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget cannot be assigned against Group Account {0}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},لايمكن أسناد الميزانية للمجموعة Account {0}
 DocType: Healthcare Settings,Patient Registration,تسجيل المريض
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأب
 DocType: Delivery Note,Print Without Amount,طباعة بدون قيمة
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,تاريخ الاستهلاك
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,تاريخ الإهلاك
 ,Work Orders in Progress,أوامر العمل في التقدم
 DocType: Issue,Support Team,فريق الدعم
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),انتهاء (في يوم)
@@ -5693,16 +5735,15 @@
 DocType: Journal Entry,Total Debit,مجموع الخصم
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,المخزن الافتراضي للبضائع التامة الصنع
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,يرجى تحديد المريض
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,رجل المبيعات
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,رجل المبيعات
 DocType: Hotel Room Package,Amenities,وسائل الراحة
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,الميزانيه و مركز التكلفة
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,لا يسمح بوضع الدفع الافتراضي المتعدد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ل
-,Appointment Analytics,تعيين أناليتيكش
+,Appointment Analytics,موعد تحليلات
 DocType: Vehicle Service,Half Yearly,نصف سنوي
 DocType: Lead,Blog Subscriber,مدونه المشترك
 DocType: Guardian,Alternate Number,عدد بديل
-DocType: Healthcare Settings,Consultations in valid days,المشاورات في أيام صالحة
+DocType: Healthcare Settings,Consultations in valid days,ايام الاستشارات الصحيحة
 DocType: Assessment Plan Criteria,Maximum Score,الدرجة القصوى
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,إنشاء قواعد لتقييد المعاملات على أساس القيم.
 DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,حسابات رسم التدفق النقدي
@@ -5712,7 +5753,8 @@
 DocType: Opening Invoice Creation Tool,Create Missing Party,إنشاء طرف مفقود
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,اتركه فارغا إذا جعلت مجموعات الطلاب في السنة
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",إذا تم، المشاركات لا. من أيام عمل وسوف تشمل أيام العطل، وهذا سوف يقلل من قيمة الراتب لكل يوم
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",لن تتمكن التطبيقات التي تستخدم المفتاح الحالي من الدخول ، هل أنت متأكد؟
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",التطبيقات التي تستخدم المفتاح الحالي لن تتمكن من الدخول ، هل انت متأكد ؟
+DocType: Subscription Settings,Prorate,بنسبة كذا
 DocType: Purchase Invoice,Total Advance,إجمالي المقدمة
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,تغيير قالب القالب
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون أقدم من تاريخ بدء الأجل. يرجى تصحيح التواريخ وحاول مرة أخرى.
@@ -5723,8 +5765,9 @@
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ دائن
 DocType: Cheque Print Template,Signatory Position,الوظيفة الموقعة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,على النحو المفقودة
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,على النحو المفقودة
 DocType: Timesheet,Total Billable Hours,مجموع الساعات فوترة
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,عدد الأيام التي يتعين على المشترك دفع الفواتير الناتجة عن هذا الاشتراك
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,إشعار إيصال الدفع
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ويستند هذا على المعاملات ضد هذا العميل. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},صف {0}: يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي قيمة تدوين المدفوعات {2}
@@ -5743,12 +5786,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Company,Company Info,معلومات عن الشركة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,تحديد أو إضافة عميل جديد
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,مركز التكلفة مطلوب لتسجيل المطالبة بالنفقات
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,مركز التكلفة مطلوب لتسجيل المطالبة بالنفقات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استخدام الاموال (الأصول)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
 DocType: Assessment Result,Summary,ملخص
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,تسجيل الحضور
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,حساب مدين
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,حساب مدين
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,مطعم دخول البند البند
@@ -5760,7 +5803,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,قيمة الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,نهاية العام لا يمكن أن يكون قبل بداية العام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,الميزات للموظف
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,الميزات للموظف
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},الكمية المعبأة يجب ان تساي كمية البند {0} في الصف {1}
 DocType: Work Order,Manufactured Qty,الكمية المصنعة
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},الأسهم غير موجودة مع {0}
@@ -5768,12 +5811,12 @@
 DocType: Asset,Out of Order,خارج عن السيطرة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 DocType: Projects Settings,Ignore Workstation Time Overlap,تجاهل تداخل وقت محطة العمل
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو الشركة {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو الشركة {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} غير موجود
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,حدد أرقام الدفعة
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,فواتير حولت للزبائن.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,هوية المشروع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},رقم الصف {0}: لا يمكن أن يكون المبلغ أكبر من المبلغ المعلق مقابل المطالبة بالنفقات {1}. المبلغ المعلق هو {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},رقم الصف {0}: لا يمكن أن يكون المبلغ أكبر من المبلغ المعلق مقابل المطالبة بالنفقات {1}. المبلغ المعلق هو {2}
 DocType: Patient Service Unit,Medical Administrator,المدير الطبي
 DocType: Assessment Plan,Schedule,جدول
 DocType: Account,Parent Account,حساب اب
@@ -5803,15 +5846,16 @@
 DocType: Asset Repair,Repair Status,حالة الإصلاح
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,القيود المحاسبية لدفتر اليومية
 DocType: Delivery Note Item,Available Qty at From Warehouse,متوفر (كمية ) عند (من المخزن)
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,الرجاء اختيارسجل الموظف أولا.
 DocType: POS Profile,Account for Change Amount,حساب لتغيير المبلغ
 DocType: Purchase Invoice,input service,خدمة الإدخال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,عضو فريق الصيانة
 DocType: Agriculture Analysis Criteria,Soil Analysis,تحليل التربة
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,رمز المقرر:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,الرجاء إدخال حساب المصاريف
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}:  يجب أن يكون نوع الوثيقة المرجعي واحدة منن الاتي اما  طلب شراء او فاتورة شراء أو قيد دفتر يومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}:  يجب أن يكون نوع الوثيقة المرجعي واحدة منن الاتي اما  طلب شراء او فاتورة شراء أو قيد دفتر يومية
 DocType: Employee,Current Address,العنوان الحالي
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
@@ -5859,22 +5903,22 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},قبول ل {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 DocType: Supplier Scorecard Scoring Variable,Variable Name,اسم المتغير
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
 DocType: Asset,Asset Category,فئة الأصول
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,صافي الأجور لا يمكن أن يكون بالسالب
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,ضريبة السلعة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,مواد للمورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,مواد للمورد
 DocType: Soil Texture,Loamy Sand,التربة الطميية
 DocType: Production Plan,Material Request Planning,تخطيط طلب المواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,المكوس الفاتورة
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ يظهر أكثر من مرة
 DocType: Expense Claim,Employees Email Id,البريد الإلكتروني  للموظف
 DocType: Employee Attendance Tool,Marked Attendance,حضور مسجل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,الخصوم المتداولة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,الخصوم المتداولة
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,الموقت تجاوزت الساعات المعطاة.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,إرسال SMS الشامل لجهات الاتصال الخاصة بك
-DocType: Patient,A Positive,A إيجابي
+DocType: Patient,A Positive,A موجب
 DocType: Program,Program Name,إسم البرنامج
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,النظر في ضريبة أو رسم ل
 DocType: Driver,Driving License Category,رخصة قيادة الفئة
@@ -5882,9 +5926,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر.
 DocType: Asset Maintenance Team,Asset Maintenance Team,فريق صيانة الأصول
-DocType: Employee Loan,Loan Type,نوع القرض
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,تم تقديم {0} بنجاح
+DocType: Loan,Loan Type,نوع القرض
 DocType: Scheduling Tool,Scheduling Tool,أداة الجدولة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,بطاقة ائتمان
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,بطاقة ائتمان
 DocType: BOM,Item to be manufactured or repacked,البند الذي سيتم تصنيعه أو إعادة تعبئته
 DocType: Employee Education,Major/Optional Subjects,المواد الرئيسية والاختيارية التي تم دراستها
 DocType: Sales Invoice Item,Drop Ship,هبوط السفينة
@@ -5916,7 +5961,7 @@
 DocType: Item,Units of Measure,وحدات القياس
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
 DocType: Sales Invoice,Customer's Purchase Order Date,تاريخ امر الشراء العميل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,رأس المال
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,رأس المال
 DocType: Shopping Cart Settings,Show Public Attachments,عرض المرفقات العامة
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 DocType: Restaurant Reservation,Reservation Time,وقت الحجز
@@ -5931,7 +5976,7 @@
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,الصف # {0}: ريد بي ديت لا يمكن أن يكون قبل تاريخ المعاملة
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,منتجات مميزة
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,مصمم
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,قالب الشروط والأحكام
 DocType: Serial No,Delivery Details,تفاصيل الدفع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},مركز التكلفة مطلوب في الصف {0} في جدول الضرائب للنوع {1}
@@ -5941,20 +5986,20 @@
 DocType: Driver,Expiry Date,تاريخ انتهاء الصلاحية
 DocType: Healthcare Settings,Employee name and designation in print,اسم الموظف وتعيينه في الطباعة
 ,accounts-browser,متصفح الحسابات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,الرجاء اختيار الفئة اولا
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,الرجاء اختيار الفئة اولا
 apps/erpnext/erpnext/config/projects.py +13,Project master.,الماستر الخاص بالمشاريع.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",للسماح الإفراط في الفواتير أو الإفراط في الطلب، وتحديث &quot;بدل&quot; في إعدادات المالية أو البند.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $  بجانب العملات.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(نصف يوم)
 DocType: Payment Term,Credit Days,الائتمان أيام
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,يرجى اختيار المريض للحصول على اختبارات مختبر
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,إنشاء دفعة من الطلبة
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,هل تضاف في العام التالي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,تنزيل الاصناف من BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,تنزيل الاصناف من BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,المدة الزمنية بين بدء وإنهاء عملية الإنتاج
 DocType: Cash Flow Mapping,Is Income Tax Expense,هو ضريبة الدخل
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ الترحيل يجب أن يكون نفس تاريخ شراء {1} الأصل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ الترحيل يجب أن يكون نفس تاريخ شراء {1} الأصل {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,تحقق من ذلك إذا كان الطالب يقيم في نزل المعهد.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,الرجاء إدخال طلب المبيعات في الجدول أعلاه
 ,Stock Summary,ملخص الأوراق المالية
@@ -5965,10 +6010,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,تاريخ المرجع
 DocType: Employee,Reason for Leaving,سبب ترك العمل
 DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل (عملة الشركة)
-DocType: Employee Loan Application,Rate of Interest,معدل الفائدة
+DocType: Loan Application,Rate of Interest,معدل الفائدة
 DocType: Expense Claim Detail,Sanctioned Amount,القيمة المقرر صرفه
 DocType: Item,Shelf Life In Days,العمر الافتراضي في الأيام
 DocType: GL Entry,Is Opening,هل قيد افتتاحي
+DocType: Department,Expense Approvers,Expense Exprovers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},الصف {0}: لا يمكن ربط قيد مدين مع {1}
 DocType: Journal Entry,Subscription Section,قسم الاشتراك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,حساب {0} غير موجود
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index bced780..f281ace 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Отмени Материал посещение {0}, преди да анулирате този гаранционен иск"
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Доклади за оценка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Потребителски продукти
-DocType: Purchase Receipt,Subscription Detail,Подробности за абонамента
 DocType: Supplier Scorecard,Notify Supplier,Уведомете доставчика
 DocType: Item,Customer Items,Клиентски елементи
 DocType: Project,Costing and Billing,Остойностяване и фактуриране
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Сметка {0}: Родителска сметка {1} не може да бъде Главна счетоводна книга
 DocType: Item,Publish Item to hub.erpnext.com,Публикуване т да hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Известия по имейл
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,оценка
 DocType: Item,Default Unit of Measure,Мерна единица по подразбиране
 DocType: SMS Center,All Sales Partner Contact,Всички продажби Partner Контакт
-DocType: Employee,Leave Approvers,Одобряващи отсъствия
+DocType: Department,Leave Approvers,Одобряващи отсъствия
 DocType: Sales Partner,Dealer,Търговец
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Изследвания
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Провери наличността
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Това се основава на сделки срещу този доставчик. Вижте график по-долу за повече подробности
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Правен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Актуалния вид данък не може да бъде включен в цената на артикула от ред {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Правен
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Актуалния вид данък не може да бъде включен в цената на артикула от ред {0}
 DocType: Bank Guarantee,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Изисквани от
 DocType: Delivery Note,Return Against Delivery Note,Върнете Срещу Бележка за доставка
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Банкова сметка не може да бъде с име като {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или групи), срещу които са направени счетоводни записвания и баланси се поддържат."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Няма изпратени заплата за обработка.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Няма изпратени заплата за обработка.
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Тип отсъствие - Име
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Покажи отворен
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Необходимо е само днес да предприемем това действие за споменатото по-горе повтаряне
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Номерацията е успешно обновена
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Поръчка
 DocType: Pricing Rule,Apply On,Приложи върху
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,All доставчика Свържи се с
 DocType: Support Settings,Support Settings,Настройки на модул Поддръжка
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Очаквана крайна дата не може да бъде по-малка от очакваната начална дата
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Нова молба за отсъствие
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Партида - Статус на срок на годност
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Банков чек
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Банков чек
 DocType: Membership,membership validaty section,член валиден раздел
 DocType: Mode of Payment Account,Mode of Payment Account,Вид на разплащателна сметка
 DocType: Consultation,Consultation,консултация
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материал
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Създаване на уебсайт
 DocType: Opening Invoice Creation Tool Item,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Списъка със сметки не може да бъде празен.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Заеми (пасиви)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Списъка със сметки не може да бъде празен.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на изтичане
 DocType: Item,Country of Origin,Страна на произход
 DocType: Soil Texture,Soil Texture Criteria,Критерии за почвената текстура
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Основни данни за контакт
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,открити въпроси
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
 DocType: Lab Test Groups,Add new line,Добавете нов ред
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Грижа за здравето
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Забавяне на плащане (дни)
@@ -89,7 +85,7 @@
 ,Delay Days,Дни в забава
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Фактура
+DocType: Subscription Invoice,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Елемент за теглото на елемента
 DocType: Asset Maintenance Log,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} се изисква
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не съвпада с {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ред # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ред # {0}:
 DocType: Timesheet,Total Costing Amount,Общо Остойностяване сума
 DocType: Delivery Note,Vehicle No,Превозно средство - Номер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Моля изберете Ценоразпис
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Незавършено производство
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Моля, изберете дата"
 DocType: Daily Work Summary Group,Holiday List,Списък на празиниците
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Счетоводител
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Счетоводител
 DocType: Hub Settings,Selling Price List,Ценова листа за продажба
 DocType: Patient,Tobacco Current Use,Тютюновата текуща употреба
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Продажна цена
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Продажна цена
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Телефон No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Нов {0} # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Първоначално изпратено имейл съобщение
 ,Sales Partners Commission,Комисионна за Търговски партньори
 DocType: Soil Texture,Sandy Clay Loam,Пясъчен глинест слой
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Стойност след амортизация
 DocType: Student,O+,O+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,сроден
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,дата Присъствие не може да бъде по-малко от дата присъедини служител
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,дата Присъствие не може да бъде по-малко от дата присъедини служител
 DocType: Grading Scale,Grading Scale Name,Оценъчна скала - Име
-DocType: Subscription,Repeat on Day,Повторете в деня
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Това е корен сметка и не може да се редактира.
 DocType: Sales Invoice,Company Address,Адрес на компанията
 DocType: BOM,Operations,Операции
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не можете да зададете разрешение въз основа на Отстъпка за {0}
+DocType: Subscription,Subscription Start Date,Начална дата на абонамента
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепете .csv файл с две колони, по един за старото име и един за новото име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не в някоя активна фискална година.
 DocType: Packed Item,Parent Detail docname,Родител Подробности docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референция: {0}, кода на елемента: {1} и клиента: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Крайната дата на пробния период не може да бъде преди началната дата на пробния период
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Откриване на работа.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM не е посочена за подизпълнение елемент {0} на ред {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Patient,Married,Омъжена
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не е разрешен за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Вземете елементи от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Вземете елементи от
 DocType: Price List,Price Not UOM Dependant,Цената не е зависима от UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Спирачна течност
 DocType: Tax Rule,Tax Type,Данъчна тип
 ,Completed Work Orders,Завършени работни поръчки
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Облагаема сума
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Облагаема сума
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: BOM,Item Image (if not slideshow),Позиция - снимка (ако не слайдшоу)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтният Тип на документа трябва да е от декларация за разходи или запис в дневника
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Изберете BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтният Тип на документа трябва да е от декларация за разходи или запис в дневника
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Изберете BOM
 DocType: SMS Log,SMS Log,SMS Журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Разходи за доставени изделия
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,"Управлявайте авансовата сума, предоставена на служителя"
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Уведомление за доставка
 DocType: Journal Entry,Opening Entry,Начално записване
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Сметка за плащане
-DocType: Employee Loan,Repay Over Number of Periods,Погасяване Над брой периоди
+DocType: Loan,Repay Over Number of Periods,Погасяване Над брой периоди
 DocType: Stock Entry,Additional Costs,Допълнителни разходи
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
 DocType: Lead,Product Enquiry,Каталог Запитване
 DocType: Education Settings,Validate Batch for Students in Student Group,Валидирайте партида за студенти в студентска група
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Няма запис за отпуск за служител {0} за {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Няма запис за отпуск за служител {0} за {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Моля, въведете първата компания"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Моля, изберете първо фирма"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Моля, изберете първо фирма"
 DocType: Employee Education,Under Graduate,Под Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Моля, задайте шаблона по подразбиране за известие за отпадане на статуса в настройките на HR."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Цел - На
 DocType: BOM,Total Cost,Обща Цена
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Служител кредит
 DocType: Fee Schedule,Send Payment Request Email,Изпращане на имейл с искане за плащане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Позиция {0} не съществува в системата или е с изтекъл срок
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Недвижим имот
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Успешно е било регистрирано.
 DocType: Assessment Result,Grade,Клас
 DocType: Restaurant Table,No of Seats,Брой на седалките
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","За да добавите динамичен обект, използвайте джиджи тагове като <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: Asset Maintenance Task,Asset Maintenance Task,Задача за поддръжка на активи
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Годишна заплата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Годишна заплата
 DocType: Daily Work Summary,Daily Work Summary,Ежедневната работа Резюме
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} е замразен
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Сток Разходи
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Сток Разходи
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Изберете склад - цел
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Моля, въведете Предпочитан контакт Email"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Моля, въведете Предпочитан контакт Email"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Обратно записване
 DocType: Journal Entry Account,Credit in Company Currency,Кредит във валута на фирмата
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Основен адрес
 DocType: Production Plan,Material Request Detail,Подробности за заявка за материал
 DocType: Selling Settings,Default Quotation Validity Days,Начални дни на валидност на котировката
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Настройки за модул ТРЗ
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Промяна сума
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Категории лицензионни шофьори
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Моля, въведете дата на доставка"
 DocType: Depreciation Schedule,Make Depreciation Entry,Направи запис за амортизация
+DocType: HR Settings,Leave Settings,Оставете настройките
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Заявка Тип
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Създай Служител
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Радиопредаване
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Режим на настройка на POS (онлайн / офлайн)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Деактивира създаването на дневници срещу работните поръчки. Операциите не трябва да бъдат проследени срещу работната поръчка
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Изпълнение
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Изпълнение
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Asset Maintenance Log,Maintenance Status,Статус на поддръжка
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Детайли за членството
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: изисква се доставчик при сметка за задължения {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Позиции и ценообразуване
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Общо часове: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от датата = {0}"
 DocType: Drug Prescription,Interval,интервал
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Предпочитание
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Предпочитание
 DocType: Grant Application,Individual,Индивидуален
 DocType: Academic Term,Academics User,Потребители Академици
 DocType: Cheque Print Template,Amount In Figure,Сума На фигура
-DocType: Employee Loan Application,Loan Info,Заем - Информация
+DocType: Loan Application,Loan Info,Заем - Информация
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посещения за поддръжка.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период на таблицата за доставчиците
 DocType: Share Transfer,Share Transfer,Трансфер на акции
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Шаблон на елемент
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,биохимия
 DocType: Job Offer,Select Terms and Conditions,Изберете Общи условия
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Изх. стойност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Изх. стойност
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 DocType: Production Plan,Sales Orders,Поръчки за продажба
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Територия по подразбиране
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Телевизия
 DocType: Work Order Operation,Updated via 'Time Log',Updated чрез &quot;Time Log&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Сумата на аванса не може да бъде по-голяма от {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Изберете клиента или доставчика.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Сумата на аванса не може да бъде по-голяма от {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Списък с номерации за тази транзакция
 DocType: Company,Enable Perpetual Inventory,Активиране на постоянен инвентаризация
+DocType: Bank Guarantee,Charges Incurred,Възнаграждения
 DocType: Company,Default Payroll Payable Account,По подразбиране ТРЗ Задължения сметка
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Актуализация Email Group
 DocType: Sales Invoice,Is Opening Entry,Се отваря Влизане
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Потребителски резултат
 DocType: Delivery Stop,Contact Name,Контакт - име
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерии за оценка на курса
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Данъчен номер:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Данъчен номер:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Идент. № на студента:
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Land Unit,Land Unit describing various land assets,"Земя, описваща различни поземлени активи"
@@ -374,9 +371,8 @@
 ,Open Work Orders,Отваряне на поръчки за работа
 DocType: Payment Term,Credit Months,Кредитни месеци
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Pay не може да бъде по-малко от 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","За да престанете да изпращате известия за повтарящи се грешки от системата, проверихме полето &quot;Забранено&quot; в абонамента"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Отпуск на година
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Отпуск на година
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете &quot;е Advance&quot; срещу Account {1}, ако това е предварително влизане."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Склад {0} не принадлежи на фирмата {1}
 DocType: Email Digest,Profit & Loss,Печалба & загуба
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Моля, настройте студентите под групи студенти"
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Оставете Блокиран
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Банкови записи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Оставете Блокиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Банкови записи
 DocType: Crop,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Фактура за продажба - Номер
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Група инструмент за създаване на курса
 DocType: Lead,Do Not Contact,Не притеснявайте
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Хората, които учат във вашата организация"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Разработчик на софтуер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Разработчик на софтуер
 DocType: Item,Minimum Order Qty,Минимално количество за поръчка
 DocType: Pricing Rule,Supplier Type,Доставчик Тип
 DocType: Course Scheduling Tool,Course Start Date,Курс Начална дата
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Публикувай в Hub
 DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Територия
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Точка {0} е отменена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Заявка за материал
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Точка {0} е отменена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Заявка за материал
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Закупуване - Детайли
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Максимална оценка
 DocType: Email Digest,New Quotations,Нови Оферти
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Имейли заплата приплъзване на служител на базата на предпочитан имейл избран в Employee
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 DocType: Tax Rule,Shipping County,Доставка Област
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Уча
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Уча
 DocType: Asset,Next Depreciation Date,Следваща дата на амортизация
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Разходите за дейността според Служител
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Неуредени Чекове и Депозити
 DocType: Item,Synced With Hub,Синхронизирано с хъб
 DocType: Driver,Fleet Manager,Мениджър на автопарк
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Ред {0} {1} не може да бъде отрицателен за позиция {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Ред {0} {1} не може да бъде отрицателен за позиция {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Грешна Парола
 DocType: Item,Variant Of,Вариант на
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Изпълнено Количество не може да бъде по-голямо от ""Количество за производство"""
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Моля, посочете цената на стаята в хотел {}"
 DocType: Journal Entry,Multi Currency,Много валути
 DocType: Opening Invoice Creation Tool,Invoice Type,Вид фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Складова разписка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Складова разписка
 DocType: Consultation,Encounter Impression,Среща впечатление
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Разходи за продадения актив
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Инструмент за създаване на график на курса
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Грешка при създаване на повтарящи се% s за% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
 DocType: Land Unit,LInked Analysis,Свързан Анализ
 DocType: Item Tax,Tax Rate,Данъчна Ставка
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Периодът на кандидатстване не може да бъде в две записи за разпределение
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Периодът на кандидатстване не може да бъде в две записи за разпределение
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Служител {1} за период {2} {3}, за да"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече е изпратена
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Получени
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Създаване на ученически групи
 DocType: Volunteer,Weekends,Събота и неделя
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Кредитна бележка Сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Кредитна бележка Сума
 DocType: Setup Progress Action,Action Document,Документ за действие
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Готова продукция
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Добави елементи
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Позиция проверка на качеството на параметър
+DocType: Leave Application,Leave Approver Name,Одобряващ отсъствия - Име
 DocType: Depreciation Schedule,Schedule Date,График Дата
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Доходи, удръжки и други компоненти за заплати"
 DocType: Packed Item,Packed Item,Опакован артикул
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Запитване за оферта
 DocType: Healthcare Settings,Require Lab Test Approval,Изисква се одобрение от лабораторни тестове
 DocType: Salary Slip Timesheet,Working Hours,Работно Време
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Общо неизпълнени
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Общо неизпълнени
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.
 DocType: Dosage Strength,Strength,сила
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Създаване на нов клиент
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Консумативи цена
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
 DocType: Student Log,Medical,Медицински
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Причина за загубата
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Причина за загубата
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Актуализиране на номера на профила
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Собственикът на Потенциален клиент не може да бъде същия като потенциалния клиент
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Разпределени сума може да не по-голяма от некоригирана стойност
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Единичен
 DocType: Salary Slip,Total Loan Repayment,Общо кредит за погасяване
 DocType: Account,Cost of Goods Sold,Себестойност на продадените стоки
-DocType: Subscription,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Моля, въведете Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Моля, въведете Cost Center"
 DocType: Drug Prescription,Dosage,дозиране
 DocType: Journal Entry Account,Sales Order,Поръчка за продажба
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ср. Курс продава
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Ср. Курс продава
 DocType: Assessment Plan,Examiner Name,Наименование на ревизора
 DocType: Lab Test Template,No Result,Няма резултати
 DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Моля, въведете име на компанията първа"
 DocType: Purchase Invoice,Supplier Name,Доставчик Наименование
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочетете инструкциите ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Показване на листата на всички членове на катедрата в календара
 DocType: Purchase Invoice,01-Sales Return,01-връщане на продажбите
 DocType: Account,Is Group,Е група
 DocType: Email Digest,Pending Purchase Orders,В очакване на поръчки за покупка
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Задължително поле - академична година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} не е свързана с {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Персонализирайте уводен текст, който върви като част от този имейл. Всяка транзакция има отделен въвеждащ текст."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Моля, задайте по подразбиране платим акаунт за фирмата {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Моля, задайте по подразбиране платим акаунт за фирмата {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Транзакцията не е разрешена срещу спряна поръчка за работа {0}
 DocType: Setup Progress Action,Min Doc Count,Мин
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Основен празник
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Запазено за продажба
 DocType: Packing Slip,From Package No.,От Пакет номер
 DocType: Item Attribute,To Range,До диапазон
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да се промени методът на оценка, тъй като има транзакции срещу някои позиции, които нямат собствен метод за оценка"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Ценни книжа и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да се промени методът на оценка, тъй като има транзакции срещу някои позиции, които нямат собствен метод за оценка"
 DocType: Student Report Generation Tool,Attended by Parents,Участваха родители
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Общо отсъствия разпределени е задължително
 DocType: Patient,AB Positive,AB Положителен
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присъствие запис.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заплата Компонент за график базирани работни заплати.
 DocType: Sales Order Item,Used for Production Plan,Използвани за производство на План
-DocType: Employee Loan,Total Payment,Общо плащане
+DocType: Loan,Total Payment,Общо плащане
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Не може да се анулира транзакцията за Завършена поръчка за работа.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време между операциите (в минути)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е анулиран, затова действието не може да бъде завършено"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Изброите някои от вашите клиенти. Те могат да бъдат организации или индивидуални лица.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достатъчно Части за изграждане
 DocType: POS Profile User,POS Profile User,Потребителски потребителски профил на POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Преки приходи
+DocType: Subscription Invoice,Subscription Invoice,Фактура за абонамент
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Преки приходи
 DocType: Patient Appointment,Date TIme,Време за среща
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по сметка, ако е групирано по сметка"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административният директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Административният директор
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Създаване на дружество и данъци
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Моля, изберете Курс"
 DocType: Codification Table,Codification Table,Кодификационна таблица
 DocType: Timesheet Detail,Hrs,Часове
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Моля изберете фирма
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Моля изберете фирма
 DocType: Stock Entry Detail,Difference Account,Разлика Акаунт
 DocType: Purchase Invoice,Supplier GSTIN,Доставчик GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Не може да се затвори задача, тъй като зависим задача {0} не е затворена."
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Шаблон за картографиране на парични потоци
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
+DocType: Bank Guarantee,Providing,Осигуряване
 DocType: Account,Profit and Loss,Приходи и разходи
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Не е разрешено, конфигурирайте шаблона за лабораторен тест според изискванията"
 DocType: Patient,Risk Factors,Рискови фактори
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Доставчик - Фактура номер
 DocType: Territory,For reference,За референция
 DocType: Healthcare Settings,Appointment Confirmation,Потвърждение за назначаване
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в транзакции с материали"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в транзакции с материали"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Закриване (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравейте
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Преместване на елемент
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Вече е зададен по подразбиране в pos профил {0} за потребител {1}, който е деактивиран по подразбиране"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Натрупаните стойности
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Територията е задължителна в POS профила
 DocType: Supplier,Prevent RFQs,Предотвратяване на RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Направи поръчка за продажба
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},"Талон за заплатите, подаден за период от {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},"Талон за заплатите, подаден за период от {0} до {1}"
 DocType: Project Task,Project Task,Задача по проект
 ,Lead Id,Потенциален клиент - Номер
 DocType: C-Form Invoice Detail,Grand Total,Общо
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Доставка на сметката
 DocType: Production Plan,Production Plan,План за производство
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Отваряне на инструмента за създаване на фактури
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Продажби - Връщане
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Продажби - Връщане
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забележка: Общо отпуснати листа {0} не трябва да бъдат по-малки от вече одобрените листа {1} за периода
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Задайте количество в транзакции въз основа на сериен № вход
 ,Total Stock Summary,Общо обобщение на наличностите
 DocType: Announcement,Posted By,Публикувано от
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Оферта до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Моля, задайте фирмата"
 DocType: Share Balance,Share Balance,Баланс на акциите
 DocType: Purchase Order Item,Billed Amt,Фактурирана Сума
 DocType: Training Result Employee,Training Result Employee,Обучение Резултати Employee
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за който са направени стоковите разписки."
-DocType: Repayment Schedule,Principal Amount,размер на главницата
-DocType: Employee Loan Application,Total Payable Interest,Общо дължими лихви
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,размер на главницата
+DocType: Loan Application,Total Payable Interest,Общо дължими лихви
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Общо неизключение: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Фактурата за продажба - График
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
 DocType: Restaurant Reservation,Restaurant Reservation,Ресторант Резервация
 DocType: Land Unit,Land Unit Name,Име на единица земя
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Предложение за писане
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Предложение за писане
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плащането - отстъпка/намаление
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Обобщавайки
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Уведомявайте клиентите си по имейл
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Уведомявайте клиентите си по имейл
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Съществува друга продажбите Person {0} със същия Employee ID
 DocType: Employee Advance,Claimed Amount,Сумата по иск
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Профил на Портал за плащания не е създаден, моля създайте един ръчно."
 DocType: Supplier Scorecard,Per Year,На година
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не отговарят на условията за приемане в тази програма съгласно DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Sales Invoice,Sales Taxes and Charges,Продажби данъци и такси
 DocType: Employee,Organization Profile,Организация на профил
 DocType: Vital Signs,Height (In Meter),Височина (в метър)
 DocType: Student,Sibling Details,събрат Детайли
 DocType: Vehicle Service,Vehicle Service,Service Vehicle
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Автоматично задейства искане за обратна връзка въз основа на условия.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Автоматично задейства искане за обратна връзка въз основа на условия.
 DocType: Employee,Reason for Resignation,Причина за Оставка
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Шаблон за атестирането.
 DocType: Sales Invoice,Credit Note Issued,Кредитно Известие Издадено
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,График за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Нетна промяна в Инвентаризация
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Служител - управление на кредита
 DocType: Employee,Passport Number,Номер на паспорт
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Връзка с Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Мениджър
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Мениджър
 DocType: Payment Entry,Payment From / To,Плащане от / към
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Моля, задайте профил в Склад {0}"
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Прехвърляне на материал
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Не можах да намеря път за
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Откриване (Dr)
+DocType: Loan,Applicant,кандидат
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Време на осчетоводяване трябва да е след {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Да правите периодични документи
 ,GST Itemised Purchase Register,GST Подробен регистър на покупките
 DocType: Course Scheduling Tool,Reschedule,пренасрочвайте
-DocType: Employee Loan,Total Interest Payable,"Общо дължима лихва,"
+DocType: Loan,Total Interest Payable,"Общо дължима лихва,"
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Приземи Разходни данъци и такси
 DocType: Work Order Operation,Actual Start Time,Действително Начално Време
 DocType: BOM Operation,Operation Time,Операция - време
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,завършек
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,база
 DocType: Timesheet,Total Billed Hours,Общо Фактурирани Часа
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Сума за отписване
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Сума за отписване
 DocType: Leave Block List Allow,Allow User,Позволи на потребителя
 DocType: Journal Entry,Bill No,Фактура - Номер
 DocType: Company,Gain/Loss Account on Asset Disposal,Печалба / Загуба на профила за продажба на активи
 DocType: Vehicle Log,Service Details,Детайли за услугата
-DocType: Subscription,Quarterly,Тримесечно
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Складова разписка е задължителна
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Изписване на суровини въз основа на
 DocType: Sales Invoice,Port Code,Пристанищен код
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Резервен склад
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Резервен склад
 DocType: Lead,Lead is an Organization,Водещият е организация
 DocType: Guardian Interest,Interest,Лихва
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предварителни продажби
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километраж Стойност (Последна)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони на критериите за оценка на доставчика.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Запис за плащането вече е създаден
 DocType: Request for Quotation,Get Suppliers,Вземи доставчици
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличност
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Преглед на фиш за заплата
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Преглед на фиш за заплата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Можете да го подновите само ако вашето членство изтече в рамките на 30 дни
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Изберете само ако имате настройки за документиране на паричните потоци
 DocType: Email Digest,Next email will be sent on:,Следващият имейл ще бъде изпратен на:
 DocType: Supplier Scorecard,Per Week,На седмица
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Позицията има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Позицията има варианти.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Общо студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерена
 DocType: Bin,Stock Value,Стойността на наличностите
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Кредитна карта - Запис
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компания и сметки
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,В стойност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,В стойност
 DocType: Asset Settings,Depreciation Options,Опции за амортизация
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Невалидно време за публикуване
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Невалидно време за публикуване
 DocType: Lead,Campaign Name,Име на кампанията
 DocType: Hotel Room,Capacity,Капацитет
 DocType: Selling Settings,Close Opportunity After Days,Затвори възможността след брой дни
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Поръчка на Клиента - Номер
 DocType: Budget,Budget Against,Бюджет срещу
 DocType: Employee,Cell Number,Клетка номер
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадените критерии няма служител. Проверете дали заплатите не са вече създадени.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадените критерии няма служител. Проверете дали заплатите не са вече създадени.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Материал Исканията Генерирани
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Моля, изберете таблица"
 DocType: BOM,Website Specifications,Сайт Спецификации
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е невалиден имейл адрес в полето &quot;Получатели&quot;
 DocType: Special Test Items,Particulars,подробности
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} от вид {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: От {0} от вид {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Няколко правила за цените съществува по същите критерии, моля, разрешаване на конфликти чрез възлагане приоритет. Правила Цена: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмените BOM тъй като е свързан с други спецификации на материали (BOM)
 DocType: Asset,Maintenance,Поддръжка
+DocType: Subscriber,Subscriber,абонат
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибут - Стойност
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Моля, актуализирайте състоянието на проекта си"
 DocType: Item,Maximum sample quantity that can be retained,"Максимално количество проба, което може да бъде запазено"
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройките по подразбиране за пазарската количка
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Добавете времеви слотове
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset бракуват чрез вестник Влизане {0}
-DocType: Employee Loan,Interest Income Account,Сметка Приходи от лихви
+DocType: Loan,Interest Income Account,Сметка Приходи от лихви
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Преглед на изпратената покана
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Биотехнология
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Разходи за поддръжка на офис
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Разходи за поддръжка на офис
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Отидете
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Създаване на имейл акаунт
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Asset Repair,Downtime,престой
 DocType: Account,Liability,Отговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Академичен термин:
 DocType: Salary Detail,Do not include in total,Не включвай в общо
 DocType: Company,Default Cost of Goods Sold Account,Себестойност на продадените стоки - Сметка по подразбиране
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Количеството на пробата {0} не може да бъде повече от полученото количество {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Не е избран ценоразпис
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Не е избран ценоразпис
 DocType: Employee,Family Background,Семейна среда
 DocType: Request for Quotation Supplier,Send Email,Изпрати е-мейл
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
 DocType: Item,Max Sample Quantity,Макс. Количество проби
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Няма разрешение
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Няма разрешение
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Заявката е поискана
 DocType: Vital Signs,Heart Rate / Pulse,Сърдечна честота / импулс
 DocType: Company,Default Bank Account,Банкова сметка по подразб.
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Лабораторни тестове и жизнени знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банково извлечение - Подробности
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Няма намерен служител
-DocType: Subscription,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студентската група вече е актуализирана.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студентската група вече е актуализирана.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Актуализация на проекта.
 DocType: SMS Center,All Customer Contact,Всички клиенти Контакти
 DocType: Land Unit,Tree Details,Дърво - Детайли
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Импорт - Присъствие
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Всички стокови групи
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Work Order,Item To Manufacture,Артикул за производство
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} статусът е {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Преименувайте отново, ако избраният адрес се редактира след запазване"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 DocType: Item,Hub Publishing Details,Подробна информация за издателя
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Начален баланс"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Начален баланс"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Складова разписка - Съобщение
 DocType: Lab Test Template,Result Format,Формат на резултатите
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Два пъти месечно
 DocType: Vehicle Service,Brake Pad,Спирачна накладка
 DocType: Fertilizer,Fertilizer Contents,Съдържание на тора
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Проучване & развитие
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Проучване & развитие
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Сума за Bill
 DocType: Company,Registration Details,Регистрация Детайли
 DocType: Timesheet,Total Billed Amount,Общо Обявен сума
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Поставете проверка на кредитния лимит по поръчка за продажба
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Оценката на изпълнението.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Активирането на &quot;Използване на количката&quot;, тъй като количката е включен и трябва да има най-малко една данъчна правило за количката"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плащането Влизане {0} е свързан срещу Поръчка {1}, проверете дали тя трябва да се извади като предварително в тази фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плащането Влизане {0} е свързан срещу Поръчка {1}, проверете дали тя трябва да се извади като предварително в тази фактура."
 DocType: Sales Invoice Item,Stock Details,Фондова Детайли
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проект - Стойност
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Точка на продажба
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Минимално сядане
 DocType: Item Attribute,Item Attribute Values,Позиция атрибут - Стойности
 DocType: Examination Result,Examination Result,Разглеждане Резултати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които да се фактирират"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Обмяна На Валута - основен курс
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Референтен Doctype трябва да бъде един от {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Work Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Търговски дистрибутори и територия
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} трябва да бъде активен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Няма налични елементи за прехвърляне
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} трябва да бъде активен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Няма налични елементи за прехвърляне
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Затваряне (отваряне + общо)
 DocType: Journal Entry,Depreciation Entry,Амортизация - Запис
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди да анулирате тази поддръжка посещение
 DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
 DocType: Pricing Rule,Rate or Discount,Процент или Отстъпка
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериен № {0} не принадлежи на позиция {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Сериен № {0} не принадлежи на позиция {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необходим Количество
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Любими
 DocType: Hub Settings,Custom Data,Персонализирани данни
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Стандартен медицински код
 DocType: Soil Texture,Clay Composition (%),Състав на глина (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Моля, запазете, преди да зададете задача."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Балансова стойност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Балансова стойност
 DocType: Lab Test,Lab Technician,Лабораторен техник
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажби Ценоразпис
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Продажби Ценоразпис
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ако е поставена отметка, клиентът ще бъде създаден, преместен на пациента. Фактурите за пациента ще бъдат създадени срещу този клиент. Можете също така да изберете съществуващ клиент, докато създавате пациент."
 DocType: Bank Reconciliation,Account Currency,Валута на сметката
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Моля, посочете закръглят Account в Company"
 DocType: Purchase Receipt,Range,Диапазон
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,Компоненти
 DocType: Item Barcode,Item Barcode,Позиция Barcode
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","да бъдат генерирани. Ако бъде забавено, ще трябва да промените ръчно полето &quot;Повторение на деня на месеца&quot; на това"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
 DocType: Share Transfer,From Folio No,От фолио №
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка - аванс
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Налична за използване дата
 DocType: Guardian,Guardian Name,Наименование Guardian
 DocType: Cheque Print Template,Has Print Format,Има формат за печат
-DocType: Employee Loan,Sanctioned,санкционирана
+DocType: Loan,Sanctioned,санкционирана
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,е задължително. Може би не е създаден запис на полето за обмен на валута за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
 DocType: Crop Cycle,Crop Cycle,Цикъл на реколта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
 DocType: Student Admission,Publish on website,Публикуване на интернет страницата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,"Дата Доставчик на фактура не може да бъде по-голяма, отколкото Публикуване Дата"
+DocType: Subscription,Cancelation Date,Дата на анулиране
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
 DocType: Agriculture Task,Agriculture Task,Задача за селското стопанство
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Непряк доход
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Непряк доход
 DocType: Student Attendance Tool,Student Attendance Tool,Student Присъствие Tool
 DocType: Restaurant Menu,Price List (Auto created),Ценоразпис (създадено автоматично)
 DocType: Cheque Print Template,Date Settings,Дата Настройки
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,метър
 DocType: Workstation,Electricity Cost,Разход за ток
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Продължителността на лабораторното тестване не може да бъде преди датата на събиране
+DocType: Subscription Plan,Cost,цена
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте на служителите напомняне за рождени дни
 DocType: Expense Claim,Total Advance Amount,Обща сума на аванса
 DocType: Delivery Stop,Estimated Arrival,Очаквано пристигане
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Качете ваш дизайн за заглавно писмо и лого. (Можете да ги редактирате по-късно).
 DocType: Timesheet Detail,Bill,Фактура
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бял
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Можете да изберете само една опция от списъка с отметки.
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
 DocType: Item,Automatically Create New Batch,Автоматично създаване на нова папка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Присвояване на {0} до {1} (ред {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Правя
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Присвояване на {0} до {1} (ред {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Правя
 DocType: Student Admission,Admission Start Date,Прием - Начална дата
 DocType: Journal Entry,Total Amount in Words,Обща сума - Словом
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Нов служител
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Име на списък на празниците
 DocType: Repayment Schedule,Balance Loan Amount,Баланс на заема
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,График на курса
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Сток Options
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Сток Options
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Деактивиране на извличането на последните данни за покупката в поръчката за покупка
 DocType: Journal Entry Account,Expense Claim,Expense претенция
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Приемо-предавателен протокол - ред
 DocType: Purchase Invoice,Cash/Bank Account,Сметка за Каса / Банка
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Моля, посочете {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Създаването на варианти е поставено на опашка.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Обобщена работа за {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Умение маса е задължително
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Първият отпуск в списъка ще бъде зададен като по подразбиране.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Plan,Get Sales Orders,Вземи поръчките за продажби
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} не може да бъде отрицателно
 DocType: Training Event,Self-Study,Самоподготовка
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Заплати
 DocType: Asset Maintenance,Maintenance Manager Name,Име на мениджъра на поддръжката
 DocType: Agriculture Task,Urgent,Спешно
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Моля, посочете валиден Row ID за ред {0} в таблица {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Моля, посочете валиден Row ID за ред {0} в таблица {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Променливата не може да се намери:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Моля, изберете поле, което да редактирате от numpad"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Не може да бъде фиксирана позиция на активите, тъй като е създадена складова книга."
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Име на шаблона за проверка на качеството
 DocType: Project,First Email,Първи имейл
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажба Сума
 DocType: Repayment Schedule,Interest Amount,Сума на лихва
 DocType: Serial No,Creation Document No,Създаване документ №
 DocType: Share Transfer,Issue,Изписване
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Доставка - състояние
 ,Projected Quantity as Source,Прогнозно количество като Източник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Позициите трябва да се добавят с помощта на ""Вземи от поръчка за покупки"" бутона"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Планиране на доставките
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Планиране на доставките
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип трансфер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Продажби Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Продажби Разходи
 DocType: Consultation,Diagnosis,диагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Партньор за внедряване
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Пощенски код
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Изберете сметка за доходи от лихви в заем {0}
 DocType: Opportunity,Contact Info,Информация за контакт
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Въвеждане на складови записи
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
 DocType: Item,Default Supplier,Доставчик по подразбиране
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Свръхпроизводство - позволен процент
-DocType: Employee Loan,Repayment Schedule,погасителен план
+DocType: Loan,Repayment Schedule,погасителен план
 DocType: Shipping Rule Condition,Shipping Rule Condition,Правило за условия на доставка
 DocType: Holiday List,Get Weekly Off Dates,Вземи Седмични почивни дни
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Крайна дата не може да бъде по-малка от началната дата
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
 DocType: Education Settings,Attendance Freeze Date,Дата на замразяване на присъствие
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Изборите някои от вашите доставчици. Те могат да бъдат организации или индивидуални лица.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Преглед на всички продукти
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Преглед на всички продукти
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минимална водеща възраст (дни)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Всички спецификации на материали
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Хотел Стаи тип {0} не са налице на {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,От служител
 DocType: Driver,Cellphone Number,номер на мобилен телефон
 DocType: Project,Monitor Progress,Наблюдение на напредъка
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да провери за некоректно фактуриране, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да провери за некоректно фактуриране, тъй като сума за позиция {0} в {1} е нула"
 DocType: Journal Entry,Make Difference Entry,Направи Разлика Влизане
+DocType: Supplier Quotation,Auto Repeat Section,Секция за автоматично повтаряне
 DocType: Upload Attendance,Attendance From Date,Присъствие От дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключова област на ефективността
 DocType: Program Enrollment,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Невалиден атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} трябва да бъде изпратено
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малко или равно на {0}
+DocType: Department Approver,Department Approver,Сервиз на отдела
 DocType: SMS Center,Total Characters,Общо знаци
 DocType: Employee Advance,Claimed,Твърдеше
 DocType: Crop,Row Spacing,Разстояние между редовете
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Заплащане помирение Invoice
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Принос %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Както е описано в Настройките за купуване, ако поръчката за доставка е задължителна == &quot;ДА&quot;, тогава за да се създаде фактура за покупка, потребителят трябва първо да създаде поръчка за покупка за елемент {0}"
+,HSN-wise-summary of outward supplies,HSN-мъдро обобщение на външните доставки
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Регистрационен номер на дружеството, за ваше сведение. Данъчни номера и т.н."
 DocType: Sales Partner,Distributor,Дистрибутор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка за пазаруване - Правила за доставка
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Име на действието
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Старт Година
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Първите 2 цифри на GSTIN трябва да съвпадат с номер на държавата {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Начална дата на периода на текущата фактура за
 DocType: Salary Slip,Leave Without Pay,Неплатен отпуск
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Грешка при Планиране на капацитета
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Полетата ще бъдат копирани само по време на създаването.
 DocType: Setup Progress Action,Domains,Домейни
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Управление
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Управление
 DocType: Cheque Print Template,Payer Settings,Настройки платеца
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
 DocType: Purchase Invoice,Is Return,Дали Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Внимание
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Началният ден е по-голям от крайния ден в задачата &quot;{0}&quot;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Връщане / дебитно известие
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Връщане / дебитно известие
 DocType: Price List Country,Price List Country,Ценоразпис - Държава
 DocType: Item,UOMs,Мерни единици
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} валидни серийни номера за Артикул {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код не може да се променя за сериен номер
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Код не може да се променя за сериен номер
 DocType: Purchase Invoice Item,UOM Conversion Factor,Мерна единица - фактор на превръщане
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Моля, въведете Код, за да получите Batch Номер"
 DocType: Stock Settings,Default Item Group,Група елементи по подразбиране
-DocType: Employee Loan,Partially Disbursed,Частично Изплатени
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Дайте информация.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Дайте информация.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Доставчик - база данни.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Не можете да рестартирате абонамент, който не е анулиран."
 DocType: Account,Balance Sheet,Баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
 DocType: Fee Validity,Valid Till,Валиден До
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Обща среща на учителите по родители
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Промяната на клиентската група за избрания клиент не е разрешена.
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Актуализиране на очакваните часове на пристигане.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Актуализиране на очакваните часове на пристигане.
 DocType: Program Enrollment Tool,Enrollment Details,Детайли за записване
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,"Моля, изберете клиент"
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Текуща фискална година
 DocType: Purchase Order,Group same items,Групирай същите елементи
 DocType: Purchase Invoice,Disable Rounded Total,Забранете Закръглена Сума Общо
-DocType: Employee Loan Application,Repayment Info,Възстановяване Info
+DocType: Department,Parent Department,Отдел &quot;Майки&quot;
+DocType: Loan Application,Repayment Info,Възстановяване Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
 DocType: Maintenance Team Member,Maintenance Role,Роля за поддръжка
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Дублиран ред {0} със същия {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Дублиран ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Фискална година {0} не е намерена
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Фискална година {0} не е намерена
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Създаване Служители
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Потребителски резервационен хотел
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Моля изберете префикс първо
 DocType: Student,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Проучване
+DocType: Subscription Settings,Subscription Settings,Настройки за абонамент
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Проучване
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Announcement,All Students,Всички студенти
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Crop Cycle,Less than a year,По-малко от година
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има партида
 DocType: Crop,Yield UOM,Добив UOM
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
 DocType: Item,Is Item from Hub,Елементът е от Центъра
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Вид дейност е задължително.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Дивиденти - изплащани
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Дивиденти - изплащани
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Счетоводен Дневник
 DocType: Stock Reconciliation,Difference Amount,Разлика Сума
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Д-р {0} в Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,Обратно начисляване
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Неразпределена Печалба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Неразпределена Печалба
 DocType: Purchase Invoice,05-Change in POS,05-Промяна в ПОС
 DocType: Vehicle Log,Service Detail,Детайли за услуга
 DocType: BOM,Item Description,Позиция Описание
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Възможност - позиция
 ,Student and Guardian Contact Details,Студентски и Guardian Данни за контакт
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,"Row {0}: За доставчика {0} имейл адрес е необходим, за да изпратите имейл"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Временно Откриване
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Временно Откриване
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Преглед на Центъра
 ,Employee Leave Balance,Служител - полагащ се отпуск в дни
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Балансът на сметке {0} винаги трябва да е {1}
 DocType: Patient Appointment,More Info,Повече Информация
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
 DocType: Supplier Scorecard,Scorecard Actions,Действия в Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Пример: Магистър по компютърни науки
 DocType: Purchase Invoice,Rejected Warehouse,Отхвърлени Warehouse
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,да се
 DocType: Supplier Quotation Item,Lead Time in days,Време за въвеждане в дни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Задължения Резюме
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Изплащане на заплата от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Изплащане на заплата от {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Предписания за лабораторни тестове
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Малък
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Малък
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Отваряне на елемента от инструмента за създаване на фактури
 DocType: Education Settings,Employee Number,Брой на служителите
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Отмяна на фактурата след гратисен период
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече се ползва. Опитайте от Дело Номер {0}
 DocType: Project,% Completed,% Завършен
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (без данък)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораторно тестване
 DocType: Email Digest,Add Quote,Добави оферта
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Непреки разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Непреки разходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 DocType: Agriculture Analysis Criteria,Agriculture,Земеделие
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Синхронизиране на основни данни
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Позиция {0} трябва да бъде позиция за подизпълнители
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капиталови Активи
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Позиция {0} трябва да бъде позиция за подизпълнители
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Капиталови Активи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,"Моля, първо задайте кода на елемента"
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
+DocType: Subscription Plan,Billing Interval Count,Графичен интервал на фактуриране
 DocType: Sales Invoice Item,Edit Description,Редактиране на Описание
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,Екип - промени
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общо (фирмена валута)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Създаване на формат за печат
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS Позиция Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Алтернативната позиция не трябва да е същата като кода на елемента
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
 DocType: Sales Partner,Target Distribution,Цел - Разпределение
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Финализиране на временната оценка
 DocType: Salary Slip,Bank Account No.,Банкова сметка номер
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Работна станция
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запитване за оферта  - Доставчик
 DocType: Healthcare Settings,Registration Message,Регистрационно съобщение
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Хардуер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Хардуер
 DocType: Prescription Dosage,Prescription Dosage,Дозировка за рецепта
 DocType: Attendance,HR Manager,ЧР мениджър
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Моля изберете фирма
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Начална и крайна дата
 ,Delivered Items To Be Billed,"Доставени изделия, които да се фактурират"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Складът не може да се променя за Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Складът не може да се променя за Serial No.
 DocType: Authorization Rule,Average Discount,Средна отстъпка
 DocType: Project Update,Great/Quickly,Голям / Бързо
 DocType: Purchase Invoice Item,UOM,мерна единица
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Моля, изберете партиди за договорени покупки"
 DocType: Asset,Depreciation Schedules,Амортизационни Списъци
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Следните профили могат да бъдат избрани в настройките на GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Следните профили могат да бъдат избрани в настройките на GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валута на транзакция
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},От {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Ср Daily Outgoing
 DocType: POS Profile,Campaign,Кампания
 DocType: Supplier,Name and Type,Име и вид
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Одобрение Status трябва да бъде &quot;Одобрена&quot; или &quot;Отхвърлени&quot;
 DocType: Physician,Contacts and Address,Контакти и адрес
 DocType: Purchase Invoice,Contact Person,Лице за контакт
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очаквана начална дата"" не може да бъде след ""Очаквана крайна дата"""
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Допустимост и подробности
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако се отнася за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,От дата/час
 DocType: Email Digest,For Company,За компания
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникации - журнал.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запитване за оферта е забранено да достъп от портал, за повече настройки за проверка портал."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Профил за проследяване на проследяващия доставчик
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сума на покупките
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Сума на покупките
 DocType: Sales Invoice,Shipping Address Name,Адрес за доставка Име
 DocType: Material Request,Terms and Conditions Content,Правила и условия - съдържание
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки при създаването на График на курса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,не може да бъде по-голямо от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Първият разпоредител на разходите в списъка ще бъде зададен като подразбиращ се излишък на разходи.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,не може да бъде по-голямо от 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от неплатен отпуск
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,пакет Код
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Чирак
 DocType: Purchase Invoice,Company GSTIN,Фирма GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Отрицателно количество не е позволено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Отрицателно количество не е позволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Данъчна подробно маса, извлечен от т майстор като низ и се съхранява в тази област. Използва се за данъци и такси"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Баланс на банка
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Оставете призванието задължително в отпуск
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на работа, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Данъчно правило за транзакции.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Източник склад е задължително за ред {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Срокът за плащане на ред {0} е вероятно дубликат.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Селското стопанство (бета)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Приемо-предавателен протокол
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Офис под наем
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Setup SMS Gateway
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Офис под наем
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Настройки Setup SMS Gateway
 DocType: Disease,Common Name,Често срещано име
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Импортирането неуспешно!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Не е добавен адрес все още.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станция - Работно време
 DocType: Vital Signs,Blood Pressure,Кръвно налягане
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Аналитик
 DocType: Item,Inventory,Инвентаризация
 DocType: Item,Sales Details,Продажби Детайли
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Утвърждаване на записания курс за студенти в студентската група
 DocType: Notification Control,Expense Claim Rejected,Expense искането се отхвърля
 DocType: Item,Item Attribute,Позиция атрибут
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Правителство
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Правителство
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense претенция {0} вече съществува за Дневника Vehicle
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Наименование институт
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Моля, въведете погасяване сума"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Моля, въведете погасяване сума"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Елемент Варианти
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,Email Заплата поднасяне на служителите
 DocType: Cost Center,Parent Cost Center,Разходен център - Родител
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Изберете Възможен доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Изберете Възможен доставчик
 DocType: Sales Invoice,Source,Източник
 DocType: Customer,"Select, to make the customer searchable with these fields","Изберете, за да направите клиента достъпен за търсене с тези полета"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Покажи затворен
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Парични потоци от инвестиционна
 DocType: Program Course,Program Course,програма на курса
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Товарни и спедиция Такси
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Homepage,Company Tagline for website homepage,Фирма Лозунгът за уебсайт страница
 DocType: Item Group,Item Group Name,Име на група позиции
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Детайли за членовете на семейството
 DocType: Leave Block List,Block Holidays on important days.,Блокиране на празници на важни дни.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),"Моля, въведете всички задължителни резултатни стойности"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Вземания Резюме
-DocType: Employee Loan,Monthly Repayment Amount,Месечна погасителна сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Вземания Резюме
+DocType: Loan,Monthly Repayment Amount,Месечна погасителна сума
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Отваряне на фактури
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
 DocType: UOM,UOM Name,Мерна единица - Име
 DocType: GST HSN Code,HSN Code,HSN код
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Принос Сума
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Потребител {0} вече е назначен за лекар {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Кутия
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Възможен доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Възможен доставчик
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Месечно разпределение
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Списък Receiver е празна. Моля, създайте Списък Receiver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Здравеопазване (бета)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Няма елементи за опаковане
 DocType: Shipping Rule Condition,From Value,От стойност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Произвеждано количество е задължително
-DocType: Employee Loan,Repayment Method,Възстановяване Метод
+DocType: Loan,Repayment Method,Възстановяване Метод
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако е избрано, на началната страница ще бъде по подразбиране т Групата за сайта"
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Искане за фирмен разход.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Изисква се сертификат
 DocType: Company,Default Holiday List,Списък на почивни дни по подразбиране
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: От време и До време на {1} се припокрива с {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Сток Задължения
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Сток Задължения
 DocType: Purchase Invoice,Supplier Warehouse,Доставчик Склад
 DocType: Opportunity,Contact Mobile No,Контакт - мобилен номер
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Изберете фирма
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,Раздел за печат
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Потребителят {0} няма профили по подразбиране за POS. Проверете по подразбиране в ред {1} за този потребител.
 DocType: Student Group,Set 0 for no limit,Определете 0 за без лимит
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,"Ред {idx}: {field} е необходим, за да се създадат Фактурите {invoice_type} Отваряне"
 DocType: Customer,Primary Address and Contact Detail,Основен адрес и данни за контакт
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно изпращане на плащане Email
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,"Моля, изберете поне един домейн."
 DocType: Dependent Task,Dependent Task,Зависима задача
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
 DocType: SMS Center,Receiver List,Получател - Списък
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Търсене позиция
 DocType: Payment Schedule,Payment Amount,Сума За Плащане
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,Оценъчна скала
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Вече приключен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Склад в ръка
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Склад в ръка
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Импортът е успешен!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Вече съществува заявка за плащане {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за изписани стоки
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Оферта Позиция
 DocType: Customer,Customer POS Id,Идентификационен номер на ПОС на клиента
 DocType: Account,Account Name,Име на Сметка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото е днешна дата"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Сериен № {0} количество {1} не може да бъде една малка част
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото е днешна дата"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Сериен № {0} количество {1} не може да бъде една малка част
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Моля, въведете URL адреса на Woocommerce Server"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Част номер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
 DocType: Share Balance,To No,До номер
-DocType: Subscription,Reference Document,Референтен документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
 DocType: Accounts Settings,Credit Controller,Кредит контрольор
-DocType: Grant Application,Applicant Type,Тип на кандидата
+DocType: Loan,Applicant Type,Тип на кандидата
 DocType: Purchase Invoice,03-Deficiency in services,03-Недостиг на услуги
 DocType: Delivery Note,Vehicle Dispatch Date,Камион Дата на изпращане
 DocType: Healthcare Settings,Default Medical Code Standard,Стандартен стандарт за медицински кодове
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Начислен
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Запазено Количество
 DocType: Party Account,Party Account,Сметка на компания
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човешки Ресурси
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Човешки Ресурси
 DocType: Lead,Upper Income,Upper подоходно
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Отхвърляне
 DocType: Journal Entry Account,Debit in Company Currency,Дебит сума във валута на фирмата
 DocType: BOM Item,BOM Item,BOM Позиция
 DocType: Appraisal,For Employee,За служител
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Направи Изплащането Влизане
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Направи Изплащането Влизане
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Общо (без данъци)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водещ брой
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} трябва да е по-голяма от 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Наличен наличност
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Наличен наличност
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планиране на капацитет за (дни)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,доставяне
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Задължително поле - Програма
 DocType: Special Test Template,Result Component,Компонент за резултатите
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Гаранционен иск
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Включи празници в рамките на отпуските като отпуски
 DocType: Sales Invoice,Packed Items,Опаковани артикули
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранция иск срещу Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Обща сума&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Обща сума&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Активиране на количката
 DocType: Employee,Permanent Address,Постоянен Адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,Продажби - Настройка
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Потвърдете действието
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Онлайн Търгове
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,изпълняване
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Виж в кошницата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Разходите за маркетинг
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,"Не може да се създадат стандартни критерии. Моля, преименувайте критериите"
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,Вземи шаблон
 DocType: Material Request,Transferred,Прехвърлен
 DocType: Vehicle,Doors,Врати
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext инсталирането приключи!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext инсталирането приключи!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Съберете такса за регистрация на пациента
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Атрибутите не могат да се променят след сделка с акции. Направете нов елемент и преместете запас в новата позиция
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Атрибутите не могат да се променят след сделка с акции. Направете нов елемент и преместете запас в новата позиция
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Данъчно разделяне
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Равнение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Експортирайте доклада и го отпечатайте с помощта на приложение за електронни таблици.
 DocType: Purchase Invoice Item,Batch No,Партиден №
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Аванси на служителите
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешаване на  множество Поръчки за продажби срещу поръчка на клиента
 DocType: Student Group Instructor,Student Group Instructor,Инструктор на група студенти
 DocType: Grant Application,Assessment  Mark (Out of 10),Маркер за оценка (от 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Не
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Основен
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Възможност - От"" полето е задължително"
 DocType: Email Digest,Annual Expenses,годишните разходи
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Разпределена сума
 DocType: Sales Team,Contribution to Net Total,Принос към Net Общо
 DocType: Sales Invoice Item,Customer's Item Code,Клиентски Код на позиция
 DocType: Stock Reconciliation,Stock Reconciliation,Склад за помирение
 DocType: Territory,Territory Name,Територия Име
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Склад за Незавършено производство се изисква преди изпращане
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Можете да имате планове само със същия цикъл на таксуване в абонамент
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявител на Йов.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Оценки
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Събития за обучение
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дублиран Пореден № за позиция {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Дублиран Пореден № за позиция {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Следенето се проследява от водещия източник.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,"Моля, въведете"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,"Моля, въведете"
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Дневник за поддръжка
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или Warehouse"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нетното тегло на този пакет. (Изчислява се автоматично като сума от нетно тегло на позициите)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,Да се доставят и фактурира
 DocType: Student Group,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Кредитна сметка във валута на сметката
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} трябва да бъде изпратен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} трябва да бъде изпратен
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Управление на акции
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Плащане
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Склад {0} не е свързан с нито един профил, моля, посочете профила в склада, или задайте профил по подразбиране за рекламни места в компанията {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Управление на вашите поръчки
 DocType: Work Order Operation,Actual Time and Cost,Действителното време и разходи
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,Student оставите приложението
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Дълготраен актив не може да бъде отменен, тъй като вече е {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,Баркодове
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Въвели сте дублиращи се елементи. Моля, поправи и опитай отново."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Сътрудник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Сътрудник
 DocType: Asset Movement,Asset Movement,Движение на активи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Поръчката за работа {0} трябва да бъде изпратена
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Нова пазарска количка
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Валутата за фактуриране трябва да бъде равна или на валутата на валутата или валутата на партията
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 DocType: Soil Texture,Loam,глинеста почва
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Ред {0}: Дневната дата не може да бъде преди датата на публикуване
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Ред {0}: Дневната дата не може да бъде преди датата на публикуване
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Въвеждане на плащане
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
 ,Sales Invoice Trends,Тенденциите във фактурите за продажба
 DocType: Leave Application,Apply / Approve Leaves,Нанесете / Одобряване Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,За
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Може да се отнася ред само ако типът такса е ""На предишния ред - Сума"" или ""Предишния ред - Общо"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Може да се отнася ред само ако типът такса е ""На предишния ред - Сума"" или ""Предишния ред - Общо"""
 DocType: Sales Order Item,Delivery Warehouse,Склад за доставка
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дърво на разходните центрове.
 DocType: Serial No,Delivery Document No,Доставка документ №
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Материалната консумация не е зададена в настройките за производство.
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не може да надхвърля стойността {0} на ред {1} повече от {2}. За да позволите прекалено таксуване, моля, задайте настройките за запас"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не може да надхвърля стойността {0} на ред {1} повече от {2}. За да позволите прекалено таксуване, моля, задайте настройките за запас"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Актуализиране на отговора
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Първо изберете програмата
 DocType: Patient Appointment,Patient Age,Възраст на пациента
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Управление на Проекти
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Серийният номер {0} вече е върнат
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Серийният номер {0} вече е върнат
 DocType: Supplier,Supplier of Goods or Services.,Доставчик на стоки или услуги.
 DocType: Budget,Fiscal Year,Фискална Година
 DocType: Asset Maintenance Log,Planned,планиран
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"По подразбиране сметки за вземания, които трябва да се използват, ако не са зададени в Пациента да резервира такси за консултация."
 DocType: Vehicle Log,Fuel Price,цена на гориво
+DocType: Bank Guarantee,Margin Money,Маржин пари
 DocType: Budget,Budget,Бюджет
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Задайте Отвори
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Последвай
 DocType: Item,Is Sales Item,Е-продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Позиция Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Позиция {0} не е настройка за серийни номера. Проверете настройките.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Позиция {0} не е настройка за серийни номера. Проверете настройките.
 DocType: Maintenance Visit,Maintenance Time,Поддръжка на времето
 ,Amount to Deliver,Сума за Избави
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Същият елемент е въведен няколко пъти. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Дата на срока Start не може да бъде по-рано от началото на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Служител {0} вече кандидатства за {1} между {2} и {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Имаше грешки.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Служител {0} вече кандидатства за {1} между {2} и {3}:
 DocType: Guardian,Guardian Interests,Guardian Интереси
 DocType: Naming Series,Current Value,Текуща стойност
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
 DocType: Education Settings,Instructor Records to be created by,"Инструктори, които трябва да бъдат създадени от"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} е създаден(а)
 DocType: GST Account,GST Account,GST профил
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Добавено към Любими
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не бе намерено известие за заплата за изброените по-горе критерии или вече изпратена бележка за заплатата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Мита и такси
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не бе намерено известие за заплата за изброените по-горе критерии или вече изпратена бележка за заплатата
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Мита и такси
 DocType: Projects Settings,Projects Settings,Настройки на проекти
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Моля, въведете Референтна дата"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}  записи на плащания не може да се филтрира по  {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дърво на стокови групи.
 DocType: Production Plan,Total Produced Qty,Общ брой произведени количества
 DocType: Payroll Entry,Get Employee Details,Получете подробности за служителите
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мъдър История на покупките
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзен
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовата сума (Валута на компанията)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Суровини
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Суровини
 DocType: Payment Reconciliation Payment,Reference Row,Референтен Ред
 DocType: Installation Note,Installation Time,Време за монтаж
 DocType: Sales Invoice,Accounting Details,Счетоводство Детайли
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Изтриване на всички транзакции за тази фирма
 DocType: Patient,O Positive,O Положителен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Разпределяния
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерии за приемане
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Моля, въведете Материал Исканията в таблицата по-горе"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Няма налични изплащания за вписване в дневника
 DocType: Item Attribute,Attribute Name,Име на атрибута
 DocType: BOM,Show In Website,Покажи в уебсайта
 DocType: Shopping Cart Settings,Show Quantity in Website,Покажи Количество в сайта
-DocType: Employee Loan Application,Total Payable Amount,Общо Задължения Сума
+DocType: Loan Application,Total Payable Amount,Общо Задължения Сума
 DocType: Task,Expected Time (in hours),Очаквано време (в часове)
 DocType: Item Reorder,Check in (group),Проверете в (група)
 DocType: Soil Texture,Silt,тиня
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Направи плащане
 DocType: Room,Room Name,стая Име
 DocType: Prescription Duration,Prescription Duration,Продължителност на рецептата
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Остави, не може да се прилага / отмени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Остави, не може да се прилага / отмени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
 DocType: Activity Cost,Costing Rate,Остойностяване Курсове
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Адреси на клиенти и контакти
 ,Campaign Efficiency,Ефективност на кампаниите
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,глава
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Двойка
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"По подразбиране профилът ще бъде автоматично актуализиран в POS фактура, когато е избран този режим."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Изберете BOM и Количество за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Изберете BOM и Количество за производство
 DocType: Asset,Depreciation Schedule,Амортизационен план
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Адреси и контакти за партньори за продажби
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,"Половин ден Дата трябва да бъде между ""От Дата"" и ""До дата"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,"Половин ден Дата трябва да бъде между ""От Дата"" и ""До дата"""
 DocType: Maintenance Schedule Detail,Actual Date,Действителна дата
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,"Моля, задайте Центъра за разходи по подразбиране в {0} компания."
 DocType: Item,Has Batch No,Има партиден №
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet)
 DocType: Soil Texture,Soil Type,Тип на почвата
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Ново съобщение
 ,Quotation Trends,Оферта Тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Категория хъб
 DocType: Purchase Invoice,SEZ,СИЗ
 DocType: Purchase Receipt,Vehicle Number,Номер на превозно средство
-DocType: Employee Loan,Loan Amount,Заета сума
+DocType: Loan,Loan Amount,Заета сума
 DocType: Student Report Generation Tool,Add Letterhead,Добавяне на буквите
 DocType: Program Enrollment,Self-Driving Vehicle,Самоходно превозно средство
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Стойност на таблицата с доставчици
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,позиция
 DocType: Patient,Patient Details,Детайли за пациента
 DocType: Patient,B Positive,B Положителен
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 DocType: Patient Medical Record,Patient Medical Record,Медицински запис на пациента
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група към не-група
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спортове
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Общо Край
 DocType: Lab Test UOM,Test UOM,Тестова мерна единица
 DocType: Student Siblings,Student Siblings,студентските Братя и сестри
+DocType: Subscription Plan Detail,Subscription Plan Detail,Подробности за абонаментния план
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Моля, посочете фирма"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Моля, посочете фирма"
 ,Customer Acquisition and Loyalty,Спечелени и лоялност на клиенти
 DocType: Asset Maintenance Task,Maintenance Task,Задача за поддръжка
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,"Моля, задайте B2C Limit в настройките на GST."
@@ -2516,6 +2525,7 @@
 ,BOM Search,BOM Търсене
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Общо разходи за потребление на материали (чрез вписване в наличност)
 DocType: Hub Settings,Company Registered,Регистрирана фирма
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Датата не може да бъде по-малка от Дата
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Публикувайте &quot;На склад&quot; или &quot;Не на склад&quot; на Hub въз основа на наличностите, налични в този склад."
 DocType: Vehicle,Fuel Type,гориво
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Моля, посочете валута във фирмата"
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
 DocType: Email Digest,Pending Sales Orders,Чакащи Поръчки за продажби
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
 DocType: Employee,Create User Permission,Създаване на потребителско разрешение
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Healthcare Settings,Remind Before,Напомняй преди
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Мерна единица - фактор на превръщане се изисква на ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
 DocType: Salary Component,Deduction,Намаление
 DocType: Item,Retain Sample,Запазете пробата
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: От време и До време - е задължително.
 DocType: Stock Reconciliation Item,Amount Difference,сума Разлика
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
 DocType: Territory,Classification of Customers by region,Класификация на клиентите по регион
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,В производството
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Изчисли Баланс на банково извлечение
 DocType: Normal Test Template,Normal Test Template,Нормален тестов шаблон
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,забранени потребители
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Оферта
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Не може да се зададе получена RFQ в Без котировка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Оферта
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Не може да се зададе получена RFQ в Без котировка
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Изберете профил, който да печата във валута на профила"
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Това се основава на транзакции срещу този пациент. За подробности вижте графиката по-долу
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Разходите са обновени
 DocType: Patient,Date of Birth,Дата на раждане
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Позиция {0} вече е върната
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Позиция {0} вече е върната
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи движения се записват към ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенциален клиент - Адрес
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Настройка на таблицата с доставчици
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Описание На Работа
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Описание На Работа
 DocType: Student Applicant,Applied,приложен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Пре-отворена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Пре-отворена
 DocType: Sales Invoice Item,Qty as per Stock UOM,Количество по мерна единица на склад
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Наименование Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02 Отстъпка след продажба
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете кампаниите по продажби. Следете потенциални клиенти, оферти, поръчки за продажба и  т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
+DocType: Department Approver,Approver,Одобряващ
 ,SO Qty,SO Количество
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,"Полето ""До Акционер"" не може да бъде празно"
 DocType: Guardian,Work Address,Служебен адрес
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Общата отпусната сума (Company валути)
 DocType: Purchase Order Item,To be delivered to customer,Да бъде доставен на клиент
 DocType: BOM,Scrap Material Cost,Скрап Cost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Сериен № {0} не принадлежи на нито един склад
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Сериен № {0} не принадлежи на нито един склад
 DocType: Grant Application,Email Notification Sent,Изпратено е известие за имейл
 DocType: Purchase Invoice,In Words (Company Currency),Словом (фирмена валута)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Код на артикула, склад, количеството се изисква на ред"
-DocType: Pricing Rule,Supplier,Доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Код на артикула, склад, количеството се изисква на ред"
+DocType: Bank Guarantee,Supplier,Доставчик
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Показване на данните за плащане
 DocType: Consultation,Consultation Time,Време за консултации
 DocType: C-Form,Quarter,Тримесечие
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Други разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Други разходи
 DocType: Global Defaults,Default Company,Фирма по подразбиране
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Име на банката
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-По-горе
-DocType: Employee Loan,Employee Loan Account,Служител кредит профил
 DocType: Leave Application,Total Leave Days,Общо дни отсъствие
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забележка: Email няма да бъдат изпратени на ползвателите с увреждания
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Брой взаимодействия
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Тегло (в килограми)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",глави / име_на_ глава leave blank automatically set след запаметяване на главата.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,"Моля, задайте GST профили в настройките на GST"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,"Моля, задайте GST профили в настройките на GST"
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Вид на бизнеса
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Разходи за нова покупка
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Описание на безвъзмездните средства
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
 DocType: Student Guardian,Others,Други
+DocType: Subscription,Discounts,Отстъпки
 DocType: Payment Entry,Unallocated Amount,Неразпределена сума
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Няма съвпадащи записи. Моля изберете някоя друга стойност за {0}.
 DocType: POS Profile,Taxes and Charges,Данъци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или Услуга, която се купува, продава, или се съхраняват на склад."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Не повече актуализации
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Това обхваща всички показатели, свързани с тази настройка"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Дете позиция не трябва да бъде пакетен продукт. Моля, премахнете позиция `{0}` и запишете"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Банки и разплащания
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,Service точка
 DocType: Bank Guarantee,Bank Guarantee,Банкова гаранция
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
 DocType: Bin,Ordered Quantity,Поръчано количество
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
 DocType: Grading Scale,Grading Scale Intervals,Оценъчна скала - Интервали
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Печалба за годината
+DocType: Bank Guarantee,Name of Bank,Име на банката
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: осчетоводяване за {2} може да се направи само във валута: {3}
 DocType: Fee Schedule,In Process,В Процес
 DocType: Authorization Rule,Itemwise Discount,Отстъпка на ниво позиция
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дърво на финансовите сметки.
+DocType: Bank Guarantee,Reference Document Type,Референтен Document Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Картографиране на паричните потоци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} по Поръчка за Продажба {1}
 DocType: Account,Fixed Asset,Дълготраен актив
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Сериализирани Инвентаризация
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Имейл не е намерен в контакта по подразбиране
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генериране на тайна
-DocType: Employee Loan,Account Info,Информация за профила
+DocType: Loan,Account Info,Информация за профила
 DocType: Activity Type,Default Billing Rate,Курс по подразбиране за фактуриране
 DocType: Fees,Include Payment,Включване на плащането
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} студентски групи са създадени.
 DocType: Sales Invoice,Total Billing Amount,Общо Фактурирана Сума
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програмите в структурата на таксите и студентската група {0} са различни.
 DocType: Fee Schedule,Receivable Account,Вземания - Сметка
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
 DocType: Quotation Item,Stock Balance,Наличности
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Поръчка за продажба до Плащане
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Изпълнителен директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Изпълнителен директор
 DocType: Purchase Invoice,With Payment of Tax,С изплащане на данък
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ТРИПЛИКАТ ЗА ДОСТАВЧИК
 DocType: Land Unit,Is Container,Има контейнер
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Това ще бъде ден 1 от цикъла на култивиране
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Моля изберете правилния акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Моля изберете правилния акаунт
 DocType: Purchase Invoice Item,Weight UOM,Тегло мерна единица
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Списък на наличните акционери с номера на фолиото
 DocType: Salary Structure Employee,Salary Structure Employee,Структура на заплащането на служителите
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Показване на атрибутите на варианта
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Показване на атрибутите на варианта
 DocType: Student,Blood Group,Кръвна група
 DocType: Course,Course Name,Наименование на курс
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Потребителите, които могат да одобряват заявленията за отпуск специфичен служителя"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Офис оборудване
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Офис оборудване
 DocType: Purchase Invoice Item,Qty,Количество
 DocType: Fiscal Year,Companies,Фирми
 DocType: Supplier Scorecard,Scoring Setup,Настройване на точките
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Дебит сметка се изисква
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването по дейности, извършени от вашия екип"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Покупка Ценоразпис
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на таблицата с резултатите от доставчика.
 DocType: Job Offer Term,Offer Term,Оферта Условия
 DocType: Asset,Quality Manager,Мениджър по качеството
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Общо Неплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Операция
 DocType: Supplier Scorecard,Supplier Score,Доклад за доставчиците
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Общо фактурирана сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Общо фактурирана сума
 DocType: Supplier,Warn RFQs,Предупреждавайте RFQ
 DocType: BOM,Conversion Rate,Обменен курс
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Търсене на продукти
 DocType: Assessment Plan,To Time,До време
 DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Кредитът на сметка трябва да бъде Платим акаунт
+DocType: Loan,Total Amount Paid,Обща платена сума
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Моля, изберете Студентски прием, който е задължителен за платения кандидат за студент"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Моля, изберете Ценоразпис, за да публикувате ценообразуване"
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ценоразпис {0} е деактивиран
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завършено количество не може да бъде повече от {1} за операция {2}
 DocType: Manufacturing Settings,Allow Overtime,Разрешаване на Извънредно раб.време
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализираната позиция {0} не може да бъде актуализирана с помощта на Ресурси за покупка, моля, използвайте Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализираната позиция {0} не може да бъде актуализирана с помощта на Ресурси за покупка, моля, използвайте Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Обучение Събитие на служителите
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максималните проби - {0} могат да бъдат запазени за партида {1} и елемент {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Добавете времеви слотове
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} серийни номера, необходими за т {1}. Вие сте предоставили {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Курс на преоценка
 DocType: Training Event,Advance,напредък
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,за повторно извършване отново.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Настройки за GoCardless payment gateway
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Печалба / загуба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Печалба / загуба
 DocType: Opportunity,Lost Reason,Причина за загубата
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Профил {1} не принадлежи на фирма {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Профил {1} не принадлежи на фирма {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType не може да се намери {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нов адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,Действителното количество
 DocType: Shipping Rule,example: Next Day Shipping,Например: Доставка на следващия ден
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериен № {0} не е намерен
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Абонаментът е {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма за таксуване на таксите
 DocType: Fee Schedule Program,Student Batch,Student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Създаване на Студент
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Електронна търговия GSTIN
 DocType: Sales Order,Not Delivered,Не е доставен
 ,Bank Clearance Summary,Резюме - Банков Клирънс
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Създаване и управление на дневни, седмични и месечни имейл бюлетини."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Създаване и управление на дневни, седмични и месечни имейл бюлетини."
 DocType: Appraisal Goal,Appraisal Goal,Оценка Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Предложете категория?
 DocType: Stock Reconciliation Item,Current Amount,Текуща сума
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Сгради
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Сгради
 DocType: Fee Schedule,Fee Structure,Структура на таксите
 DocType: Timesheet Detail,Costing Amount,Остойностяване Сума
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Student Admission Program,Application Fee,Такса за кандидатстване
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Знаете Заплата Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Максимална отстъпка за позиция {0} е {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
 DocType: SMS Log,Sender Name,Подател Име
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Критерии за анализ на селското стопанство
+DocType: HR Settings,Leave Approval Notification Template,Оставете шаблона за уведомление за одобрение
 DocType: POS Profile,[Select],[Избор]
 DocType: Vital Signs,Blood Pressure (diastolic),Кръвно налягане (диастолично)
 DocType: SMS Log,Sent To,Изпратени На
 DocType: Agriculture Task,Holiday Management,Управление на ваканциите
 DocType: Payment Request,Make Sales Invoice,Направи фактурата за продажба
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,софтуери
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,софтуери
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
 DocType: Company,For Reference Only.,Само за справка.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Лекарят {0} не е налице на {1}
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,Ново работно място
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Материалната консумация
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Задай като Затворен
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Няма позиция с баркод {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Няма позиция с баркод {0}
 DocType: Normal Test Items,Require Result Value,Изискайте резултатна стойност
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,списъците с материали
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Не активна или по подразбиране Заплата Структура намери за служител {0} за дадените дати
 DocType: Leave Block List,Allow Users,Разрешаване на потребителите
 DocType: Purchase Order,Customer Mobile No,Клиент - мобилен номер
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Повтарящ се
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Детайли на шаблона за картографиране на паричните потоци
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Управление на заемите
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Абонирай се за отделни приходи и разходи за вертикали продуктови или подразделения.
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Актуализация на стойността
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Покажи фиш за заплата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Прехвърляне на материал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Покажи фиш за заплата
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Прехвърляне на материал
 DocType: Fees,Send Payment Request,Изпращане на искане за плащане
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 DocType: Water Analysis,Origin,произход
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,количество сметка Select промяна
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Отговорност за облагане на дохода
 DocType: Grading Scale Interval,Grade Description,Клас - Описание
 DocType: Stock Entry,Purchase Receipt No,Покупка Квитанция номер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задатък
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Задатък
 DocType: Sales Invoice, Shipping Bill Number,Доставка на номера на сметката
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Проследяване
 DocType: Asset Maintenance Log,Actions performed,Извършени действия
 DocType: Cash Flow Mapper,Section Leader,Ръководител на секцията
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Източник на средства (пасиви)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Източник на средства (пасиви)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Служител
+DocType: Bank Guarantee,Fixed Deposit Number,Номер на фиксиран депозит
 DocType: Asset Repair,Failure Date,Дата на неуспех
 DocType: Sample Collection,Collected Time,Събрано време
 DocType: Company,Sales Monthly History,Месечна история на продажбите
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Наистина ли искате да отмените тази среща?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за хотелско ценообразуване
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline Продажби
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Извличане на актуализации на абонаментите
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Профилът {0} не съвпада с фирмата {1} в режим на профила: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,курс:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Няма създадени работни поръчки
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Заплата поднасяне на служител {0} вече е създаден за този период
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Лекарствена
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Лекарствена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Разходи за закупени стоки
 DocType: Selling Settings,Sales Order Required,Поръчка за продажба е задължителна
 DocType: Purchase Invoice,Credit To,Кредит на
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Без цитат
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Gateway Account,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Нетна промяна в Вземания
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Компенсаторни Off
 DocType: Job Offer,Accepted,Приет
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Резултати от търсенето
 DocType: Room,Room Number,Номер на стая
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Невалидна референция {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Невалидна референция {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 DocType: Journal Entry Account,Payroll Entry,Въвеждане на заплати
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Преглед на записите за таксите
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторна проба за изпитване
 DocType: Item Variant Settings,Allow Rename Attribute Value,Разрешаване на преименуване на стойност на атрибута
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick вестник Влизане
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
 DocType: Restaurant,Invoice Series Prefix,Префикс на серията фактури
 DocType: Employee,Previous Work Experience,Предишен трудов опит
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Интеграцията на Google Карти не е активирана
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не е изпратена
+DocType: Subscription,Trialling,изпробване
 DocType: Member,Membership Expiry Date,Дата на изтичане на членството
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,"{0} трябва да бъде отрицателен, в документа за замяна"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,"{0} трябва да бъде отрицателен, в документа за замяна"
 ,Minutes to First Response for Issues,Минути за първи отговор на проблем
 DocType: Purchase Invoice,Terms and Conditions1,Условия за ползване - 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Името на института, за който искате да създадете тази система."
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Мерна единица
 DocType: Fiscal Year,Year End Date,Година Крайна дата
 DocType: Task Depends On,Task Depends On,Задачата зависи от
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Възможност
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Възможност
 DocType: Operation,Default Workstation,Работно място по подразбиране
 DocType: Notification Control,Expense Claim Approved Message,Expense претенция Одобрен Message
 DocType: Payment Entry,Deductions or Loss,Удръжки или загуба
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Неплатен отпуск не съвпада с одобрените записи оставите приложението
 DocType: Campaign,Campaign-.####,Кампания -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Моля, доставете определени елементи на възможно най-добрите цени"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Моля, доставете определени елементи на възможно най-добрите цени"
 DocType: Membership,USD,щатски долар
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направи фактура
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Оставащ баланс
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Баркодът {0} не е валиден код {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Край Година
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Цитат / Водещ%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Driver,Driver,шофьор
 DocType: Vital Signs,Nutrition Values,Хранителни стойности
 DocType: Lab Test Template,Is billable,Таксува се
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Действително Начална дата (чрез Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Застаряването на населението Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Общият размер на авансовото плащане не може да бъде по-голям от общия размер на претендираната сума
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Общият размер на авансовото плащане не може да бъде по-голям от общия размер на претендираната сума
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече позиция {0} от количеството в поръчка за продажба {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Изберете стойности на атрибутите
 DocType: Purchase Invoice,Reason For Issuing document,Причина за издаващия документ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Банкова / Кеш Сметка
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Следваща Контакт не може да бъде същата като на Водещия имейл адрес
 DocType: Tax Rule,Billing City,(Фактура) Град
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,Услуга - Адрес
 DocType: Asset Maintenance Task,Calibration,калибровка
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} е фирмен празник
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Мебели и тела
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Оставете уведомление за състояние
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Мебели и тела
 DocType: Item,Manufacture,Производство
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Настройка на компанията
 ,Lab Test Report,Лабораторен тестов доклад
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,Район за засаждане
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (количество)
 DocType: Installation Note Item,Installed Qty,Инсталирано количество
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Това може да се дължи на някои невалидни имейл адреси в
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Вие добавихте
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Обучение Резултати
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Продукти на страница
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курс
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Браншова организация майстор.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,или
 DocType: Sales Order,Billing Status,(Фактура) Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Докладвай проблем
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Комунални Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Комунални Разходи
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90 -
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row {0}: вестник Влизане {1} Няма профил {2} или вече съчетани срещу друг ваучер
 DocType: Supplier Scorecard Criteria,Criteria Weight,Критерии Тегло
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Оставете уведомление за одобрение
 DocType: Buying Settings,Default Buying Price List,Ценови лист за закупуване по подразбиране
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Заплата Slip Въз основа на график
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Закупуване - Цена
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Закупуване - Цена
 DocType: Notification Control,Sales Order Message,Поръчка за продажба - Съобщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 DocType: Payment Entry,Payment Type,Вид на плащане
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Количка за пазаруване - настройка
 DocType: Journal Entry,Accounting Entries,Счетоводни записи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако е избрано правило за ценообразуване за &quot;Оцени&quot;, то ще презапише Ценовата листа. Ценовата ставка е окончателната ставка, така че не трябва да се прилага допълнителна отстъпка. Следователно, при транзакции като поръчка за продажба, поръчка за покупка и т.н., тя ще бъде изтеглена в полето &quot;Оцени&quot;, а не в полето &quot;Ценова листа&quot;."
+DocType: Journal Entry,Paid Loan,Платен заем
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Дублиране на вписване. Моля, проверете Оторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Дата на референтната дата
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да произведа
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ведомост
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За ред {0} в {1}. За да {2} включат в курс ред, редове {3} трябва да се включат и те"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За ред {0} в {1}. За да {2} включат в курс ред, редове {3} трябва да се включат и те"
 DocType: Patient Service Unit,Parent Service Unit,Отдел за обслужване на родители
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Създаване на потребител
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,групи SH-
 DocType: Account,Income Account,Сметка за доход
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Доставка
 DocType: Volunteer,Weekdays,делници
 DocType: Stock Reconciliation Item,Current Qty,Текущо количество
 DocType: Restaurant Menu,Restaurant Menu,Ресторант Меню
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Ключова област на отговорност
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Задайте профил по подразбиране за инвентара за вечни запаси
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Задайте профил по подразбиране за инвентара за вечни запаси
 DocType: Item Reorder,Material Request Type,Заявка за материал - тип
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Изпратете имейл за преглед на одобрението
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage е пълен, не беше записан"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Капацитет на помещението
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Вече съществува запис за елемента {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,"Ще загубите записите на фактури, генерирани преди това. Наистина ли искате да рестартирате този абонамент?"
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Регистрационна такса
 DocType: Budget,Cost Center,Разходен център
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Поръчка за покупка на ЛС
 DocType: Tax Rule,Shipping Country,Доставка Държава
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скриване на данъчния идентификационен номер на клиента от сделки за продажба
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складът  може да се променя само чрез Стокова разписка / Бележка за доставка / Разписка за Покупка
 DocType: Employee Education,Class / Percentage,Клас / Процент
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Данък общ доход
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Изводи от Industry Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Отидете на Letterheads
+DocType: Subscription,Cancel At End Of Period,Отменете в края на периода
 DocType: Item Supplier,Item Supplier,Позиция - Доставчик
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Няма избрани елементи за прехвърляне
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Няма избрани елементи за прехвърляне
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
 DocType: Vehicle,Electric,електрически
 DocType: Task,% Progress,% Прогрес
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Печалба / загуба от продажбата на активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Печалба / загуба от продажбата на активи
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Само кандидат-студентът със статус &quot;Одобрен&quot; ще бъде избран в таблицата по-долу.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"Номерът на профила за {0} не е налице. <br> Моля, настроите правилно Вашата сметка."
 DocType: Task,Depends on Tasks,Зависи от Задачи
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Не е в наличност
 DocType: Volunteer,Volunteer Skills,Доброволни умения
 DocType: Appraisal,HR User,ЧР потребителя
+DocType: Bank Guarantee,Reference Document Name,Име на референтния документ
 DocType: Purchase Invoice,Taxes and Charges Deducted,Данъци и такси - Удръжки
 apps/erpnext/erpnext/hooks.py +142,Issues,Изписвания
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус трябва да бъде един от {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,(Фактура) Валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Много Голям
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Много Голям
+DocType: Loan,Loan Application,Искане за кредит
 DocType: Crop,Scientific Name,Научно наименование
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Общо отсъствия
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Преименувайте отново, ако избраният контакт се редактира след запазване"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Номер
 ,Sales Browser,Браузър на продажбите
 DocType: Journal Entry,Total Credit,Общо кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Местен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и аванси (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Длъжници
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Голям
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Голям
 DocType: Homepage Featured Product,Homepage Featured Product,Начална страница Featured Каталог
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Всички оценка Групи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Всички оценка Групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нов Склад Име
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Общо {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територия
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,Такси
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Посочете Валутен курс за конвертиране на една валута в друга
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Оферта {0} е отменена
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Общият размер
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Общият размер
 DocType: Sales Partner,Targets,Цели
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Моля, регистрирайте номера SIREN в информационния файл на компанията"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Price List,Price List Master,Ценоразпис - основен
 DocType: GST Account,CESS Account,CESS профил
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изберете пациент
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име на параметъра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само приложения със статут &quot;Одобрен&quot; и &quot;Отхвърлени&quot; може да бъде подадено
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Име на групата е задължително в ред {0}
 DocType: Homepage,Products to be shown on website homepage,"Продукти, които се показват на сайта на началната страница"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Фактурата вече е създадена за всички часове на плащане
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Наименование грешка: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Финансовата цена е
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Моля, задайте клиент по подразбиране в настройките на ресторанта"
 ,Salary Register,Заплата Регистрирайте се
 DocType: Warehouse,Parent Warehouse,Склад - Родител
-DocType: C-Form Invoice Detail,Net Total,Нето Общо
+DocType: Subscription,Net Total,Нето Общо
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Стандартният BOM не е намерен за елемент {0} и проект {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Определяне на различни видове кредитни
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Определяне на различни видове кредитни
 DocType: Bin,FCFS Rate,FCFS Курсове
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Дължима сума
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Времето (в минути)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Корена на профил трябва да бъде група
 DocType: Drug Prescription,Drug Prescription,Лекарствена рецепта
 DocType: Fees,FEE.,ТАКСА.
-DocType: Employee Loan,Repaid/Closed,Платени / Затворен
+DocType: Loan,Repaid/Closed,Платени / Затворен
 DocType: Item,Total Projected Qty,Общото прогнозно Количество
 DocType: Monthly Distribution,Distribution Name,Дистрибутор - Име
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Процентът на оценка не е намерен за елемент {0}, от който се изисква да извършва счетоводни записи за {1} {2}. Ако елементът извършва транзакция като елемент с нулева стойност в {1}, моля посочете това в таблицата {1} Елемент. В противен случай, моля, създайте транзакция за входящ фонд за артикула или споменете коефициента на оценка в регистрационния артикул и след това опитайте да подадете / анулирате този запис"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 DocType: Course,Course Code,Код на курса
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 DocType: POS Settings,Use POS in Offline Mode,Използвайте POS в режим Офлайн
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,Смятан за износ
 DocType: Stock Entry,Material Transfer for Manufacture,Прехвърляне на материал за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Отстъпка Процент може да бъде приложена или за ценоразпис или за всички ценови листи (ценоразписи).
-DocType: Subscription,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Счетоводен запис за Складова наличност
 DocType: Lab Test,LabTest Approver,LabTest Схема
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Вече оценихте критериите за оценка {}.
 DocType: Vehicle Service,Engine Oil,Моторно масло
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Създадени работни поръчки: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Създадени работни поръчки: {0}
 DocType: Sales Invoice,Sales Team1,Търговски отдел1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Клиент - Адрес
-DocType: Employee Loan,Loan Details,Заем - Детайли
+DocType: Loan,Loan Details,Заем - Детайли
 DocType: Company,Default Inventory Account,Сметка по подразбиране за инвентаризация
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Номерата на фолиото не съвпадат
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Връзка към всички земни единици, в които расте Растението"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
 DocType: Item Group,Show this slideshow at the top of the page,Покажете слайдшоу в горната част на страницата
 DocType: BOM,Item UOM,Позиция - Мерна единица
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сума на данъка след сумата на отстъпката (фирмена валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Целеви склад е задължителен за ред {0}
 DocType: Cheque Print Template,Primary Settings,Основни настройки
 DocType: Purchase Invoice,Select Supplier Address,Изберете доставчик Адрес
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Добави Служители
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Добави Служители
 DocType: Purchase Invoice Item,Quality Inspection,Проверка на качеството
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Стандартен шаблон
 DocType: Training Event,Theory,Теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическо лице / Дъщерно дружество с отделен сметкоплан, част от организацията."
 DocType: Payment Request,Mute Email,Mute Email
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,Брои на изпратените SMS
 DocType: Antibiotic,Healthcare Administrator,Здравен администратор
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Задайте насочване
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
 DocType: Dosage Strength,Dosage Strength,Сила на дозиране
 DocType: Account,Expense Account,Expense Account
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Софтуер
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Цвят
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Цвят
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,План за оценка Критерии
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,За избрания елемент е задължително да изтече срокът
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Предотвратяване на поръчки за покупка
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,Лична и социална история
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Потребител {0} е създаден
 DocType: Fee Schedule,Fee Breakup for each student,Разпределение на таксите за всеки студент
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Промяна на кода
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Не е избрана валута на ценоразписа
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Не е избрана валута на ценоразписа
 DocType: Purchase Invoice,Availed ITC Cess,Наблюдаваше ITC Cess
 ,Student Monthly Attendance Sheet,Student Месечен Присъствие Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,"Правило за доставка, приложимо само за продажбата"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Проект Начална дата
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,До
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Преименуване - журнал
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студентската група или графикът на курса е задължителна
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Поддържане на плащане часа и работно време Същите по график
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Посочете продуктите или услугите, които купувате или продавате."
 DocType: Water Analysis,Storage Temperature,Температура на съхранение
 DocType: Employee Attendance Tool,Unmarked Attendance,Неотбелязано присъствие
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Изследовател
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Изследовател
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Програма за записване Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Началната дата трябва да бъде по-малка от крайната дата за задача {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Име или имейл е задължително
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} понастоящем има {1} карта с резултати за доставчика, а RFQ на този доставчик трябва да се издават с повишено внимание."
 DocType: Chapter,Non Profit Manager,Мениджър с нестопанска цел
 DocType: BOM,Total Cost(Company Currency),Обща стойност (Company валути)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Сериен № {0} е създаден
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Сериен № {0} е създаден
 DocType: Homepage,Company Description for website homepage,Описание на компанията за началната страница на уеб сайта
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Наименование Доставчик
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
 DocType: Healthcare Settings,Result Printed,Резултат отпечатан
 DocType: Asset Category Account,Depreciation Expense Account,Сметка за амортизационните разходи
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Изпитателен Срок
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Преглед на {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Изпитателен Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в транзакция
 DocType: Project,Total Costing Amount (via Timesheets),Обща сума за изчисляване на разходите (чрез Timesheets)
-DocType: Employee Advance,Expense Approver,Expense одобряващ
+DocType: Department,Expense Approver,Expense одобряващ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
 DocType: Project,Hourly,всеки час
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-група на група
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Към дата и час
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка на SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,Направи Плащане чрез вестник Влизане
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,отпечатан на
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,отпечатан на
 DocType: Item,Inspection Required before Delivery,Инспекция е изисквана преди доставка
 DocType: Item,Inspection Required before Purchase,Инспекция е задължително преди покупка
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Предстоящите дейности
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Минимално Количество за Поръчка
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Вашата организация
 DocType: Fee Component,Fees Category,Такси - Категория
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Моля, въведете облекчаване дата."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Сума
 DocType: Supplier Scorecard,Notify Employee,Уведомявайте служителя
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Пренареждане Level
 DocType: Company,Chart Of Accounts Template,Сметкоплан - Шаблон
 DocType: Attendance,Attendance Date,Присъствие Дата
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Елемент Цена актуализиран за {0} в Ценовата листа {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Елемент Цена актуализиран за {0} в Ценовата листа {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
 DocType: Purchase Invoice Item,Accepted Warehouse,Приет Склад
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,Метод на оценка
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Маркирай половин ден
 DocType: Sales Invoice,Sales Team,Търговски отдел
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Дублиран елемент
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дублиран елемент
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Въведете името на бенефициента преди да го изпратите.
 DocType: Program Enrollment Tool,Get Students,Вземете студентите
 DocType: Serial No,Under Warranty,В гаранция
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Словом ще бъде видим след като запазите поръчката за продажба.
 ,Employee Birthday,Рожден ден на Служител
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,"Моля, изберете Дата на завършване за завършен ремонт"
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Запазено за подписване на договори
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
 DocType: Shopping Cart Settings,Orders,Поръчки
-DocType: Employee Leave Approver,Leave Approver,Одобряващ отсъствия
+DocType: Department,Leave Approver,Одобряващ отсъствия
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Моля, изберете партида"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Име Оценка Group
@@ -3593,7 +3615,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Хубав проследяван елемент
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГИНАЛ ЗА ПОЛУЧАТЕЛЯ
 DocType: Asset Category Account,Accumulated Depreciation Account,Сметка за Натрупана амортизация
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Този имейл е автоматично генериран
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
 DocType: Program Enrollment,Boarding Student,Студент на борда
 DocType: Asset,Expected Value After Useful Life,Очакваната стойност след полезния живот
@@ -3618,21 +3639,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Присъствие Record {0} съществува срещу Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Амортизацията е прекратена поради продажба на активи
-DocType: Member,Member,Член
+DocType: Loan,Member,Член
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управление на адреси
 DocType: Work Order Item,Work Order Item,Елемент за работа
 DocType: Pricing Rule,Item Code,Код
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
 DocType: Journal Entry,User Remark,Потребителска забележка
 DocType: Lead,Market Segment,Пазарен сегмент
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Мениджър на земеделието
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
 DocType: Supplier Scorecard Period,Variables,Променливи
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен - История на работа
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Закриване (Dr)
 DocType: Cheque Print Template,Cheque Size,Чек Размер
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Сериен № {0} не е в наличност
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Сериен № {0} не е в наличност
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Данъчен шаблон за сделки при продажба.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отписване на дължимата сума
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Профилът {0} не съвпада с фирмата {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,Мерна единица за стоки по подразбиране
 DocType: Asset,Number of Depreciations Booked,Брой на осчетоводени амортизации
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Общ брой
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Срещу служителите на кредита: {0}
 DocType: Landed Cost Item,Receipt Document,Получаване на документация
 DocType: Employee Education,School/University,Училище / Университет
 DocType: Payment Request,Reference Details,Референтен Детайли
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,Двоен неснижаем остатък
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,"Затворена поръчка не може да бъде анулирана. Отворете, за да отмените."
 DocType: Student Guardian,Father,баща
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Актуализация на склад"" не може да бъде избрано при продажба на активи"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Актуализация на склад"" не може да бъде избрано при продажба на активи"
 DocType: Bank Reconciliation,Bank Reconciliation,Банково извлечение
 DocType: Attendance,On Leave,В отпуск
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получаване на актуализации
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,По-ниски доходи
 DocType: Restaurant Order Entry,Current Order,Текуща поръчка
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Източник и целеви склад не могат да бъдат един и същ за ред {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Отидете на Програми
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Ред {0} # Разпределената сума {1} не може да бъде по-голяма от сумата, която не е поискана {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Ред {0} # Разпределената сума {1} не може да бъде по-голяма от сумата, която не е поискана {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""От дата"" трябва да е преди ""До дата"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,Условия за плащане
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Минута
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 DocType: Chapter,Meetup Embed HTML,Meetup Вграждане на HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Отидете на Доставчици
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Оферта {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване - позиция
 DocType: Sales Order,%  Delivered,% Доставени
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Моля, задайте имейл адреса на студента, за да изпратите заявката за плащане"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Моля, задайте имейл адреса на студента, за да изпратите заявката за плащане"
 DocType: Patient,Medical History,Медицинска история
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Банков Овърдрафт Акаунт
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Банков Овърдрафт Акаунт
 DocType: Patient,Patient ID,Идент.номер на пациента
 DocType: Physician Schedule,Schedule Name,Име на графиката
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Направи фиш за заплата
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Добавете всички доставчици
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Добавете всички доставчици
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Разпределената сума не може да бъде по-голяма от остатъка.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Разгледай BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Обезпечени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Обезпечени кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Редактиране на Дата и час на публикуване
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Моля, задайте на амортизация, свързани акаунти в категория активи {0} или Фирма {1}"
 DocType: Lab Test Groups,Normal Range,Нормален диапазон
 DocType: Academic Term,Academic Year,Академична година
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Налични продажби
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Началното салдо Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Началното салдо Капитал
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,оставащ
 DocType: Appraisal,Appraisal,Оценка
+DocType: Loan,Loan Account,Кредитна сметка
 DocType: Purchase Invoice,GST Details,GST Детайли
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Изпратен имейл доставчика {0}
 DocType: Item,Default Sales Unit of Measure,Единица по продажби по подразбиране
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Академична година:
+DocType: Subscription,Past Due Date,Изтекъл срок
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Не позволявайте да зададете алтернативен елемент за елемента {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датата се повтаря
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,Назначаване на пациент
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Приемане роля не може да бъде същата като ролята на правилото се прилага за
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Отписване от този Email бюлетин
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Вземи доставчици от
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Вземи доставчици от
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} не е намерен за елемент {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Отидете на Курсове
 DocType: Accounts Settings,Show Inclusive Tax In Print,Показване на включения данък в печат
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Съобщението е изпратено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Сметка с деца възли не могат да бъдат определени като книга
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието&gt; Настройки за обучение"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Скоростта, с която Ценоразпис валута се превръща в основна валута на клиента"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (фирмена валута)
 DocType: Physician,Physician Schedules,Лекарски графики
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Общият размер на авансовото плащане не може да бъде по-голям от общия размер на санкцията
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Общият размер на авансовото плащане не може да бъде по-голям от общия размер на санкцията
 DocType: Salary Slip,Hour Rate,Цена на час
 DocType: Stock Settings,Item Naming By,"Позиция наименуването им,"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е позволено да се актуализира борсови сделки по-стари от {0}
 DocType: BOM,Inspection Required,"Инспекция, изискван"
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Въведете номера на банковата гаранция преди да я изпратите.
 DocType: Driving License Category,Class,клас
 DocType: Sales Order,Fully Billed,Напълно фактуриран
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Работната поръчка не може да бъде повдигната срещу шаблон за елемент
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Assessment Plan,Program,програма
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието&gt; Настройки за обучение"
 DocType: Serial No,Is Cancelled,Е отменен
 DocType: Student Group,Group Based On,Групирано по
 DocType: Journal Entry,Bill Date,Фактура - Дата
@@ -3796,9 +3818,10 @@
 DocType: Cheque Print Template,Cheque Height,Чек Височина
 DocType: Supplier,Supplier Details,Доставчик - детайли
 DocType: Setup Progress,Setup Progress,Настройка на напредъка
+DocType: Expense Claim,Approval Status,Одобрение Status
 DocType: Hub Settings,Publish Items to Hub,Публикуване продукти в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От стойност трябва да е по-малко, отколкото стойността в ред {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Банков Превод
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Избери всичко
 ,Issued Items Against Work Order,Издадени елементи срещу поръчка за работа
 DocType: Vehicle Log,Invoice Ref,Фактура Референция
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,тарифен номер
 DocType: Work Order Item,Available Qty at WIP Warehouse,Наличен брой в WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Прогнозно
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Сериен № {0} не принадлежи на склад {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Сериен № {0} не принадлежи на склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
 DocType: Notification Control,Quotation Message,Оферта - Съобщение
-DocType: Employee Loan,Employee Loan Application,Служител Искане за кредит
 DocType: Issue,Opening Date,Откриване Дата
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,"Моля, запишете първо данните на пациента"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,"Моля, запишете първо данните на пациента"
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Присъствие е маркирано успешно.
 DocType: Program Enrollment,Public Transport,Обществен транспорт
 DocType: Soil Texture,Silt Composition (%),Състав на Silt (%)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),Баланс на елемента (опростен)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Фактури издадени от доставчици.
 DocType: POS Profile,Write Off Account,Отпишат Акаунт
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Дебитно известие сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Дебитно известие сума
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
@@ -3875,6 +3897,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Поръчка за продажба - Дата
 DocType: Sales Invoice Item,Delivered Qty,Доставено Количество
 DocType: Assessment Plan,Assessment Plan,План за оценка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Вписване на обратния дневник
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} е създаден.
 DocType: Stock Settings,Limit Percent,Процент лимит
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Понастоящем няма налични запаси в нито един склад
@@ -3888,14 +3911,15 @@
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Payment Entry,Payment References,плащане Референции
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Брой интервали за интервалното поле, напр. Ако интервалът е &quot;Дни&quot; и интервалът на фактуриране е 3, фактурите ще се генерират на всеки 3 дни"
 DocType: Vehicle,Insurance Details,Застраховка Детайли
 DocType: Account,Payable,Платим
 DocType: Share Balance,Share Type,Тип на акциите
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Длъжници ({0})
 DocType: Pricing Rule,Margin,марж
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Брутна Печалба %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Брутна Печалба %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Промяна на POS профила
 DocType: Bank Reconciliation Detail,Clearance Date,Клирънсът Дата
@@ -3905,10 +3929,11 @@
 DocType: Lead,Address Desc,Адрес Описание
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Компания е задължителна
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Бяха открити редове с дублиращи се дати в други редове: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Бяха открити редове с дублиращи се дати в други редове: {list}
 DocType: Topic,Topic Name,Тема Наименование
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Моля, задайте шаблон по подразбиране за уведомление за одобрение на отпадане в настройките на HR."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Поне една от продажба или закупуване трябва да бъдат избрани
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Изберете служител, за да накарате служителя предварително."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Изберете служител, за да накарате служителя предварително."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,"Моля, изберете валидна дата"
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Изберете естеството на вашия бизнес.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,Източник Склад
 DocType: Installation Note,Installation Date,Дата на инсталация
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Акционерна книга
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Създадена е фактура за продажба {0}
 DocType: Employee,Confirmation Date,Потвърждение Дата
 DocType: C-Form,Total Invoiced Amount,Общо Сума по фактура
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,Натрупани амортизации
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Постоянно име
 DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик - Детайли
-DocType: Employee Loan Application,Required by Date,Изисвани до дата
+DocType: Loan Application,Required by Date,Изисвани до дата
 DocType: Lead,Lead Owner,Потенциален клиент - собственик
 DocType: Production Plan,Sales Orders Detail,Детайли на поръчките за продажба
 DocType: Bin,Requested Quantity,заявеното количество
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Общо Приспадане - кредит за погасяване
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Текущ BOM и нов BOM не могат да бъдат едни и същи
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Фиш за заплата ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Няколко варианта
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставени
+DocType: Subscription,Trial Period Start Date,Начална дата на пробния период
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечено процентно разпределение
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,"Моля, влезте като друг потребител."
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Име на участник
 DocType: Stock Settings,Use Naming Series,Използвайте серията за наименуване
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Наличности
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в абонамента
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 DocType: Membership,Payment Details,Подробности на плащане
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курс
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Курс
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Спиралата поръчка за работа не може да бъде отменена, първо я отменете, за да я отмените"
 DocType: Asset,Journal Entry for Scrap,Вестник Влизане за скрап
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,Земна единица
 ,Purchase Analytics,Закупуване - Анализи
 DocType: Sales Invoice Item,Delivery Note Item,Складова разписка - Позиция
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Текущата фактура {0} липсва
 DocType: Asset Maintenance Log,Task,Задача
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Ред #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Номер на партидата е задължителна за позиция {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Печалба / загуба на профила
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Служител и Присъствие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Цел трябва да бъде един от {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Попълнете формата и да го запишете
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Попълнете формата и да го запишете
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Реално количество в наличност
 DocType: Homepage,"URL for ""All Products""",URL за &quot;Всички продукти&quot;
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard Selling Rate
 DocType: Account,Rate at which this tax is applied,"Скоростта, с която се прилага този данък"
 DocType: Cash Flow Mapper,Section Name,Име на секцията
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Пренареждане Количество
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Пренареждане Количество
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущи свободни работни места
 DocType: Company,Stock Adjustment Account,Корекция на наличности - Сметка
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписвам
@@ -4034,9 +4060,9 @@
 DocType: Task,depends_on,зависи от
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Нарежда се за актуализиране на последната цена във всички сметки. Може да отнеме няколко минути.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблон на адрес по подразбиране за държавата
 DocType: Water Analysis,Appearance,Външен вид
+DocType: HR Settings,Leave Status Notification Template,Оставете шаблона за уведомление за състояние
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Ср. Купуване на ценова листа
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Информация за членовете.
@@ -4059,7 +4085,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,"Не е разрешено. Моля, деактивирайте тестовия шаблон"
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равно на 100%
 DocType: Crop Cycle,Linked Land Unit,Свързано поземлено звено
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 DocType: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Отидете на Потребители
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отписана сума не може да бъде по-голяма от обща сума
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за Артикул {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Невалиден GSTIN или Enter NA за нерегистриран
 DocType: Training Event,Seminar,семинар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Програма такса за записване
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 DocType: Company,Create Chart Of Accounts Based On,Създаване на индивидуален сметкоплан на базата на
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не може да се конвертира в не-група. Децата работят.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Студент {0} съществува срещу ученик кандидат {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Корекция на закръгляването (валута на компанията)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,график
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Партида:
 DocType: Volunteer,Afternoon,следобед
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Отворен
 DocType: Cheque Print Template,Scanned Cheque,Сканиран чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Проект {0} вече съществува
 DocType: Medical Department,Nursing User,Потребител на сестрински грижи
 DocType: Plant Analysis,Plant Analysis Criterias,Критерии за анализ на растенията
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Отговорности
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Сериен номер {0} не принадлежи на партида {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Отговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодът на валидност на тази котировка е приключил.
 DocType: Expense Claim Account,Expense Claim Account,Expense претенция профил
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешаване на стационарни обменни курсове
@@ -4136,11 +4163,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Направете варианти
 DocType: Item,Default BOM,BOM по подразбиране
 DocType: Project,Total Billed Amount (via Sales Invoices),Обща таксувана сума (чрез фактури за продажби)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Дебитно известие - сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Дебитно известие - сума
 DocType: Project Update,Not Updated,Не е актуализиран
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Има несъответствия между процента, не на акциите и изчислената сума"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Общият размер на неизплатените Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Общият размер на неизплатените Amt
 DocType: Journal Entry,Printing Settings,Настройки за печат
 DocType: Employee Advance,Advance Account,Адванс акаунт
 DocType: Job Offer,Job Offer Terms,Условия за оферта за работа
@@ -4149,7 +4176,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Автомобилен
 DocType: Vehicle,Insurance Company,Застрахователно дружество
 DocType: Asset Category Account,Fixed Asset Account,Дълготраен актив - Сметка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,променлив
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,променлив
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,От Стокова разписка
 DocType: Chapter,Members,Потребители
 DocType: Student,Student Email Address,Student имейл адрес
@@ -4172,7 +4199,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Интерниран
 DocType: Delivery Stop,Address Name,Адрес Име
 DocType: Stock Entry,From BOM,От BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Разделяне на {0} единици от {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Разделяне на {0} единици от {1}
 DocType: Assessment Code,Assessment Code,Код за оценка
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
@@ -4180,25 +4207,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платежен документ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Грешка при оценката на формулата за критерии
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
+DocType: Subscription,Plans,планове
 DocType: Salary Slip,Salary Structure,Структура Заплата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Изписване на материал
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Възникна грешка при създаването на повтарящи се
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Изписване на материал
 DocType: Material Request Item,For Warehouse,За склад
 DocType: Employee,Offer Date,Оферта - Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Оферти
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Няма създаден студентски групи.
 DocType: Purchase Invoice Item,Serial No,Сериен Номер
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна погасителна сума не може да бъде по-голяма от Размер на заема
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна погасителна сума не може да бъде по-голяма от Размер на заема
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Ред # {0}: Очакваната дата на доставка не може да бъде преди датата на поръчката за покупка
 DocType: Purchase Invoice,Print Language,Print Език
 DocType: Salary Slip,Total Working Hours,Общо работни часове
 DocType: Sales Invoice,Customer PO Details,Подробни данни за клиента
-DocType: Subscription,Next Schedule Date,Следваща дата на графика
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Временна сметка за откриване
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,"Въведете стойност, която да бъде положителна"
@@ -4226,11 +4252,11 @@
 DocType: Issue,Opening Time,Наличност - Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,От и до датите са задължителни
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете на основата на
 DocType: Delivery Note Item,From Warehouse,От склад
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Няма служители за посочените критерии
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
 DocType: Hotel Settings,Default Customer,Клиент по подразбиране
 DocType: Assessment Plan,Supervisor Name,Наименование на надзорник
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потвърждавайте дали среща е създадена за същия ден
@@ -4254,16 +4280,16 @@
 DocType: Journal Entry Account,Employee Advance,Служител Advance
 DocType: Payroll Entry,Payroll Frequency,ТРЗ Честота
 DocType: Lab Test Template,Sensitivity,чувствителност
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Суровина
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следвайте по имейл
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Заводи и машини
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Заводи и машини
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума на данъка след сумата на отстъпката
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневни Settings Work Резюме
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,"Моля, въведете Reqd по дата"
 DocType: Payment Entry,Internal Transfer,вътрешен трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи за поддръжка
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или целта Количество или целева сума е задължителна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
 DocType: Leave Control Panel,Carry Forward,Пренасяне
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Разходен център със съществуващи операции не може да бъде превърнат в книга
@@ -4271,13 +4297,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Интеграции
 DocType: Crop Cycle,Detected Disease,Открита болест
 ,Produced,Продуциран
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Началната дата на погасяване не може да бъде преди датата на изплащане.
 DocType: Item,Item Code for Suppliers,Код на доставчици
 DocType: Issue,Raised By (Email),Повдигнат от (Email)
 DocType: Training Event,Trainer Name,Наименование Trainer
 DocType: Mode of Payment,General,Общ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последна комуникация
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Краен Плащания с фактури
 DocType: Journal Entry,Bank Entry,Банков запис
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
@@ -4291,7 +4318,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Включване / Изключване на валути.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Д-р {0} в Полудневен отпуск на {1}
 DocType: Production Plan,Get Material Request,Вземи заявка за материал
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Пощенски разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Пощенски разходи
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (сума)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Забавление и отдих
 ,Item Variant Details,Елементи на варианта на елемента
@@ -4302,9 +4329,9 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна фактура за продажби
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},"Моля, изберете брой спрямо елемент {0}"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Тип потенциален клиент
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
 DocType: Company,Monthly Sales Target,Месечна цел за продажби
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да бъде одобрен от {0}
@@ -4312,7 +4339,7 @@
 DocType: Item,Default Material Request Type,Тип заявка за материали по подразбиране
 DocType: Supplier Scorecard,Evaluation Period,Период на оценяване
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,неизвестен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Работната поръчка не е създадена
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Работната поръчка не е създадена
 DocType: Shipping Rule,Shipping Rule Conditions,Условия за доставка
 DocType: Purchase Invoice,Export Type,Тип експорт
 DocType: Salary Slip Loan,Salary Slip Loan,Кредит за заплащане
@@ -4328,7 +4355,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Откриване на обобщение на фактурите
 DocType: Education Settings,Education Manager,Мениджър на образованието
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Минималната дължина между всяко растение в полето за оптимален растеж
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Доставената позиция {0} не може да бъде актуализирана чрез използване на складовото помирение
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Доставената позиция {0} не може да бъде актуализирана чрез използване на складовото помирение
 DocType: Quality Inspection,Report Date,Справка Дата
 DocType: Student,Middle Name,Презиме
 DocType: C-Form,Invoices,Фактури
@@ -4359,20 +4386,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Касова бележка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Касова бележка
 ,Sales Register,Продажбите Регистрация
 DocType: Daily Work Summary Group,Send Emails At,Изпрати имейли до
 DocType: Quotation,Quotation Lost Reason,Оферта Причина за загубване
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Справка за транзакция номер {0} от дата {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Изглед на формата
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Задължителният разпоредител с разходи в декларацията за разходи
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Добавете потребители към вашата организация, различни от вас."
 DocType: Customer Group,Customer Group Name,Група клиенти - Име
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Все още няма клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Отчет за паричните потоци
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Не е създадена материална заявка
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Разрешително
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
@@ -4395,11 +4423,12 @@
 DocType: Vehicle,Chassis No,Шаси Номер
 DocType: Payment Request,Initiated,Образувани
 DocType: Production Plan Item,Planned Start Date,Планирана начална дата
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,"Моля, изберете BOM"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,"Моля, изберете BOM"
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Наблюдава интегрирания данък за ИТС
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
+DocType: Bank Guarantee,Clauses and Conditions,Клаузи и условия
 DocType: Serial No,Creation Document Type,Създаване на тип документ
 DocType: Project Task,View Timesheet,Преглед на график
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крайната дата трябва да е по-голяма от началната дата
 DocType: Leave Type,Is Encash,Дали инкасира
 DocType: Leave Allocation,New Leaves Allocated,Нови листа Отпуснати
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
@@ -4413,9 +4442,10 @@
 DocType: Patient,Alcohol Current Use,Алкохолът текуща употреба
 DocType: Student Admission Program,Student Admission Program,Програма за прием на студенти
 DocType: Payment Entry,Account Paid To,Сметка за плащане към
+DocType: Subscription Settings,Grace Period,Гратисен период
 DocType: Item Alternative,Alternative Item Name,Алтернативно име на елемента
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител позиция {0} не трябва да бъде позиция с наличности
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Не можаха да се изпратят никакви изплащания <br> \ Възможни причини: <br> \ 1. Нетните заплати са по-малки от 0. <br> \ 2. Имейл адресът на фирмата, посочен в капитана на служителя, не е валиден. <br>"
@@ -4425,7 +4455,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет за сметка {1} по {2} {3} е {4}. Той ще буде превишен с {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Изх. Количество
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и отключен Disabled в
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Номерацията е задължителна
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Финансови Услуги
 DocType: Student Sibling,Student ID,Идент. № на студента
@@ -4437,14 +4466,16 @@
 DocType: Complaint,Complaint,оплакване
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Направете вход за погасяване
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Всички отдели
 DocType: Patient,Alcohol Past Use,Използване на алкохол в миналото
 DocType: Fertilizer Content,Fertilizer Content,Съдържание на тор
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Проблемни / Stuck
 DocType: Tax Rule,Billing State,(Фактура) Състояние
 DocType: Share Transfer,Transfer,Прехвърляне
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Поръчката за работа {0} трябва да бъде анулирана преди отмяната на тази поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Срок за плащане е задължителен
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Увеличаване на атрибут {0} не може да бъде 0
@@ -4468,10 +4499,11 @@
 DocType: Cheque Print Template,Message to show,Съобщение за показване
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,На дребно
 DocType: Student Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Не може да се намери резултат от {0}. Трябва да имате точки от 0 до 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Невалидно позоваване {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
+DocType: Subscription,Current Invoice Start Date,Текуща дата на началната фактура
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Изисква се дебитна или кредитна сума за {2}
 DocType: GL Entry,Remarks,Забележки
@@ -4481,11 +4513,13 @@
 DocType: Task,Parent Task,Родителска задача
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Създаване на Възможност
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печат и консумативи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Печат и консумативи
 DocType: Stock Settings,Show Barcode Field,Покажи поле за баркод
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Изпрати Доставчик имейли
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Заплата вече обработени за период между {0} и {1}, Оставете период заявление не може да бъде между този период от време."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Изпрати Доставчик имейли
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Заплата вече обработени за период между {0} и {1}, Оставете период заявление не може да бъде между този период от време."
+DocType: Fiscal Year,Auto Created,Автоматично създадена
 DocType: Chapter Member,Leave Reason,Причина за отсъствие
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Фактурата {0} вече не съществува
 DocType: Guardian Interest,Guardian Interest,Guardian Интерес
 DocType: Volunteer,Availability,Наличност
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Настройване на стандартните стойности за POS фактури
@@ -4493,14 +4527,13 @@
 DocType: Project,Time to send,Време за изпращане
 DocType: Timesheet,Employee Detail,Служител - Детайли
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификационен номер на имейл за Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
 DocType: Lab Prescription,Test Code,Тестов код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки за уебсайт страница
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Не са разрешени RFQ за {0} поради наличието на {1}
 DocType: Job Offer,Awaiting Response,Очаква отговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Горе
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Обща сума {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Обща сума {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Посочете дали е нестандартна платима сметка
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Моля, изберете групата за оценка, различна от &quot;Всички групи за оценка&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: Изисква се разходен център за елемент {1}
@@ -4511,7 +4544,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Воден анализ
 DocType: Chapter,Region,Област
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Отрицателна сума не е позволена
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицателна сума не е позволена
 DocType: Holiday List,Weekly Off,Седмичен Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Презареждане на свързания анализ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Например 2012, 2012-13"
@@ -4527,7 +4560,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Разходите за Брак на активи
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
 DocType: Vehicle,Policy No,Полица номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Вземи елементите  от продуктов пакет
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Вземи елементите  от продуктов пакет
 DocType: Asset,Straight Line,Права
 DocType: Project User,Project User,Потребител в проект
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,разцепване
@@ -4563,21 +4596,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,път
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Не може да конвертирате Cost Center да Леджър, тъй като има дете възли"
 DocType: Production Plan,Total Planned Qty,Общ планиран брой
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Наличност - Стойност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Наличност - Стойност
 DocType: Salary Detail,Formula,формула
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Лабораторен тестов шаблон
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Профил за продажби
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Профил за продажби
 DocType: Purchase Invoice Item,Total Weight,Общо тегло
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комисионна за покупко-продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Комисионна за покупко-продажба
 DocType: Job Offer Term,Value / Description,Стойност / Описание
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,(Фактура) Държава
 DocType: Purchase Order Item,Expected Delivery Date,Очаквана дата на доставка
 DocType: Restaurant Order Entry,Restaurant Order Entry,Реклама в ресторанта
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
 DocType: Asset Maintenance Task,Assign To Name,Присвояване на име
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представителни Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Представителни Разходи
 DocType: Hub Settings,Enabled Users,Активирани потребители
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Направи Материал Заявка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Open т {0}
@@ -4590,24 +4623,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Молби за отпуск.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 DocType: Vehicle,Last Carbon Check,Последна проверка на въглерода
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни разноски
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Правни разноски
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Моля, изберете количество на ред"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Отваряне на фактурите за продажби и покупки
 DocType: Purchase Invoice,Posting Time,Време на осчетоводяване
 DocType: Timesheet,% Amount Billed,% Фактурирана сума
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Разходите за телефония
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Разходите за телефония
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Маркирайте това, ако искате да задължите потребителя да избере серия преди да запише. Няма да има по подразбиране, ако маркирате това."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Няма позиция със сериен номер {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Няма позиция със сериен номер {0}
 DocType: Email Digest,Open Notifications,Отворени Известия
 DocType: Payment Entry,Difference Amount (Company Currency),Разлика сума (валути на фирмата)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Преки разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Преки разходи
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Пътни Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Добавяне на абонамент за персонализирано поле в доctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
 DocType: Purchase Receipt Item,Sample Quantity,Количество проба
+DocType: Bank Guarantee,Name of Beneficiary,Име на бенефициента
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Актуализиране на BOM струва автоматично чрез Scheduler, въз основа на последната скорост на оценка / ценоразпис / последната сума на покупката на суровини."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
@@ -4619,14 +4652,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Изпитание
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Заплата Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новата учебна година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Връщане / кредитно известие
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Връщане / кредитно известие
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Общо платената сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Общо платената сума
 DocType: GST Settings,B2C Limit,B2C лимит
 DocType: Work Order Item,Transferred Qty,Прехвърлено Количество
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигация
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Планиране
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Планиране
 DocType: Share Balance,Issued,Изписан
+DocType: Loan,Repayment Start Date,Начална дата на погасяване
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Студентска дейност
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id на доставчик
 DocType: Payment Request,Payment Gateway Details,Gateway за плащания - Детайли
@@ -4639,10 +4673,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Вид на листа като случайни, болни и т.н."
 DocType: Email Digest,Send regular summary reports via Email.,Изпрати редовни обобщени доклади чрез електронна поща.
 DocType: Payment Entry,PE-,РЕ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
 DocType: Assessment Result,Student Name,Студент - Име
 DocType: Brand,Item Manager,Мениджъра на позиция
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,ТРЗ Задължения
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,ТРЗ Задължения
 DocType: Buying Settings,Default Supplier Type,Тип доставчик по подразбиране
 DocType: Plant Analysis,Collection Datetime,Дата на събиране на колекцията
 DocType: Work Order,Total Operating Cost,Общо оперативни разходи
@@ -4652,9 +4686,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Потребителят {0} не съществува
 DocType: Payment Term,Day(s) after invoice date,Ден (и) след датата на фактурата
 DocType: Payment Schedule,Payment Schedule,Схема на плащане
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Абревиатура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Плащането вече съществува
+DocType: Subscription,Trial Period End Date,Крайна дата на пробния период
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized тъй {0} надхвърля границите
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Заплата основен шаблон.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,патология
@@ -4671,9 +4705,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Оферта до потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Всички групи клиенти
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Всички групи клиенти
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Натрупвано месечно
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Данъчен шаблон е задължителен.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Сметка {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
@@ -4682,14 +4716,15 @@
 DocType: Lab Prescription,Test Created,Създаден е тест
 DocType: Healthcare Settings,Custom Signature in Print,Персонализиран подпис в печат
 DocType: Account,Temporary,Временен
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Клиентски номер на LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Клиентски номер на LPO
 DocType: Program,Courses,Курсове
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ако забраните, ""Словом"" полето няма да се вижда в никоя транзакция"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Това действие ще спре бъдещо таксуване. Наистина ли искате да отмените този абонамент?
 DocType: Serial No,Distinct unit of an Item,Обособена единица на артикул
 DocType: Supplier Scorecard Criteria,Criteria Name,Име на критерия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,"Моля, задайте фирмата"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,"Моля, задайте фирмата"
 DocType: Pricing Rule,Buying,Купуване
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Болести и торове
 DocType: HR Settings,Employee Records to be created by,Архивите на служителите да бъдат създадени от
@@ -4698,17 +4733,17 @@
 DocType: POS Profile,Apply Discount On,Нанесете отстъпка от
 DocType: Member,Membership Type,Тип членство
 ,Reqd By Date,Необходим до дата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Кредитори
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Кредитори
 DocType: Assessment Plan,Assessment Name,оценка Име
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Показване на PDC в печат
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Показване на PDC в печат
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Пореден № е задължително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция Wise Tax Подробности
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Предложение за работа
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Институт Съкращение
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,Словом ще бъде видим след като запазите офертата.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количеството ({0}) не може да бъде част от реда {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количеството ({0}) не може да бъде част от реда {1}
 DocType: Consultation,C-,С-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
@@ -4726,7 +4761,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Общото отклонение
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е активирана, системата ще публикуваме счетоводни записвания за инвентара автоматично."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Брокераж
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Присъствие на служител {0} вече е маркиран за този ден
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Присъствие на служител {0} вече е маркиран за този ден
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",в протокола Updated чрез &quot;Time Log&quot;
 DocType: Customer,From Lead,От потенциален клиент
@@ -4737,6 +4772,7 @@
 DocType: Lab Test,Approved Date,Одобрена дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Поне един склад е задължително
+DocType: Subscriber,Subscriber Name,Име на абоната
 DocType: Serial No,Out of Warranty,Извън гаранция
 DocType: BOM Update Tool,Replace,Заменете
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Няма намерени продукти.
@@ -4746,19 +4782,18 @@
 DocType: Request for Quotation Item,Project Name,Име на проекта
 DocType: Customer,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Изберете сметка за доходи от лихви в заем за служители {0}
 DocType: Work Order,Required Items,Необходими неща
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Човешки Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Заплащане помирение плащане
 DocType: Disease,Treatment Task,Лечение на лечението
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Данъчни активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Данъчни активи
 DocType: BOM Item,BOM No,BOM Номер
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Пълзяща средна стойност
 DocType: BOM Update Tool,The BOM which will be replaced,"BOM,  който ще бъде заменен"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,електронно оборудване
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,електронно оборудване
 DocType: Asset,Maintenance Required,Необходима е поддръжка
 DocType: Account,Debit,Дебит
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Отпуските трябва да бъдат разпределени в кратни на 0,5"
@@ -4767,7 +4802,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Дължима сума
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Дефинират целите т Group-мъдър за тази Продажби Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Запаси по-стари от [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row {0}: Asset е задължително за дълготраен актив покупка / продажба
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row {0}: Asset е задължително за дълготраен актив покупка / продажба
 DocType: Asset Maintenance Team,Maintenance Team Name,Име на екипа за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повече ценови правила са открити на базата на горните условия, се прилага приоритет. Приоритет е число между 0 до 20, докато стойността по подразбиране е нула (празно). Висше номер означава, че ще имат предимство, ако има няколко ценови правила с едни и същи условия."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Клиентът е задължителен, ако от клиента е избран &quot;Възможност От&quot;"
@@ -4776,19 +4811,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Позволете на следните потребители да одобрят Оставете Applications за блокови дни.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Видове разноски иск.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Процентът на продажбата за елемент {0} е по-нисък от {1}. Процентът на продажба трябва да бъде най-малко {2}
-DocType: Item,Taxes,Данъци
+DocType: Subscription,Taxes,Данъци
 DocType: Purchase Invoice,capital goods,капиталови стоки
 DocType: Purchase Invoice Item,Weight Per Unit,Тегло на единица
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Платени и недоставени
 DocType: Project,Default Cost Center,Разходен център по подразбиране
-DocType: Bank Guarantee,End Date,Крайна Дата
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,сделки с акции
 DocType: Budget,Budget Accounts,бюджетни сметки
 DocType: Employee,Internal Work History,Вътрешен Work История
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Сума на Натрупана Амортизация
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Променлива на таблицата за доставчиците
-DocType: Employee Loan,Fully Disbursed,пълното изразходване на средствата
 DocType: Employee Advance,Due Advance Amount,Разсрочена сума
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка на клиент
 DocType: Account,Expense,Разход
@@ -4812,7 +4845,7 @@
 ,Employee Information,Служител - Информация
 DocType: Stock Entry Detail,Additional Cost,Допълнителен разход
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако е групирано по ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Въведи оферта на доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Въведи оферта на доставчик
 DocType: Quality Inspection,Incoming,Входящ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Създават се стандартни данъчни шаблони за продажби и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Отчет за резултата от оценката {0} вече съществува.
@@ -4820,7 +4853,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Моля, поставете фирмения филтър празен, ако Group By е &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Публикуване Дата не може да бъде бъдеща дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за генериране на повтарящи се
 DocType: Stock Entry,Target Warehouse Address,Адрес на целевия склад
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Регулярен отпуск
 DocType: Agriculture Task,End Day,Край на деня
@@ -4845,11 +4877,10 @@
 DocType: Material Request,% Ordered,% Поръчани
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За курсовата студентска група, курсът ще бъде валидиран за всеки студент от записаните курсове по програма за записване."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Работа заплащана на парче
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ср. Курс купува
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Ср. Курс купува
 DocType: Share Balance,From No,От №
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История във фирмата
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Ново съобщение от {sender}
 DocType: Customer,Customer Primary Address,Първичен адрес на клиента
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Бютелини с новини
 DocType: Drug Prescription,Description/Strength,Описание / Сила
@@ -4858,22 +4889,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Същата позиция е въведена много пъти
 DocType: Department,Leave Block List,Оставете Block List
 DocType: Purchase Invoice,Tax ID,Данъчен номер
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е настройка за серийни номера. Колоната трябва да бъде празно
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е настройка за серийни номера. Колоната трябва да бъде празно
 DocType: Accounts Settings,Accounts Settings,Настройки на Сметки
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Одобрявам
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted адрес за {0}, моля, поправете, за да продължите."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted адрес за {0}, моля, поправете, за да продължите."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Нов профил, той ще бъде включен в името на профила като префикс"
 DocType: Maintenance Team Member,Team Member,Член на екипа
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Няма отговор за изпращане
 DocType: Customer,Sales Partner and Commission,Търговски партньор и комисионни
-DocType: Employee Loan,Rate of Interest (%) / Year,Лихвен процент (%) / Година
+DocType: Loan,Rate of Interest (%) / Year,Лихвен процент (%) / Година
 ,Project Quantity,Проект Количество
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Opportunity,To Discuss,Да обсъдим
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
 DocType: Loan Type,Rate of Interest (%) Yearly,Лихвен процент (%) Годишен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Временни сметки
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Черен
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Временни сметки
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Детайла позиция
 DocType: Shareholder,Contact List,Списък с контакти
 DocType: Account,Auditor,Одитор
@@ -4881,16 +4912,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} произведени артикули
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Научете повече
 DocType: Cheque Print Template,Distance from top edge,Разстояние от горния ръб
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Ценоразпис {0} е забранено или не съществува
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Ценоразпис {0} е забранено или не съществува
 DocType: Purchase Invoice,Return,Връщане
 DocType: Pricing Rule,Disable,Изключване
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Начин на плащане се изисква за извършване на плащане
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Начин на плащане се изисква за извършване на плащане
 DocType: Project Task,Pending Review,До Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Редактирайте цялата страница за повече опции, като активи, серийни номера, партиди и т.н."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Назначения и консултации
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е записан в пакета {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Дълготраен актив {0} не може да се бракува, тъй като вече е {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Необходими са проверки
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Необходими са проверки
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Маркирай като отсъстващ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Създаването на фирма не бе успешно
@@ -4902,7 +4933,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управление на автопарка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Добавяне на елементи от
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Добавяне на елементи от
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Култури и земи
 DocType: Cheque Print Template,Regular,Редовен
 DocType: Fertilizer,Density (if liquid),Плътност (ако е течност)
@@ -4927,24 +4958,26 @@
 DocType: Payment Entry,Paid Amount,Платената сума
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Разгледайте цикъла на продажбите
 DocType: Assessment Plan,Supervisor,Ръководител
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Вписване на запасите от запаси
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Вписване на запасите от запаси
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Артикул вариант
 ,Work Order Stock Report,Доклад за работните поръчки
+DocType: Purchase Receipt,Auto Repeat Detail,Автоматично повторение
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка Резултати Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Като супервайзор
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Предложете категория
 DocType: BOM Scrap Item,BOM Scrap Item,BOM позиция за брак
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Баланса на сметката вече е в 'Дебит'. Не е позволено да задавате 'Балансът задължително трябва да бъде в Кребит'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Управление на качеството
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Управление на качеството
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Позиция {0} е деактивирана
 DocType: Project,Total Billable Amount (via Timesheets),Обща таксуваема сума (чрез Timesheets)
 DocType: Agriculture Task,Previous Business Day,Предишен работен ден
-DocType: Employee Loan,Repay Fixed Amount per Period,Погасяване фиксирана сума за Период
+DocType: Loan,Repay Fixed Amount per Period,Погасяване фиксирана сума за Период
 DocType: Employee,Health Insurance No,Здравно осигуряване №
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Кредитна бележка Сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Кредитна бележка Сума
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Обща облагаема сума
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 DocType: Opening Invoice Creation Tool,Purchase,Покупка
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Баланс - Количество
@@ -4955,15 +4988,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 DocType: Healthcare Settings,Valid number of days,Валиден брой дни
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Разходни центрове
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Рестартирайте абонамента
 DocType: Land Unit,Linked Plant Analysis,Свързан анализ на растенията
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Скоростта, с която доставчик валута се превръща в основна валута на компанията"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: тайминги конфликти с ред {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешаване на нулева стойност
+DocType: Bank Guarantee,Receiving,получаване
 DocType: Training Event Employee,Invited,Поканен
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Множество намерени за служител {0} за дадените дати активни конструкции за заплати
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Gateway сметки за настройка.
 DocType: Employee,Employment Type,Тип заетост
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Дълготрайни активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Дълготрайни активи
 DocType: Payment Entry,Set Exchange Gain / Loss,Определете Exchange Печалба / загуба
 ,GST Purchase Register,Регистър на покупките в GST
 ,Cash Flow,Паричен поток
@@ -4983,9 +5018,10 @@
 DocType: Academic Term,Term Start Date,Условия - Начална дата
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Списък на всички транзакции с акции
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Трябва да се настрои и началната дата на пробния период и крайната дата на изпитателния период
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Средна цена
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общата сума за плащане в График на плащанията трябва да е равна на Голямо / Закръглено Общо
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общата сума за плащане в График на плащанията трябва да е равна на Голямо / Закръглено Общо
+DocType: Subscription Plan Detail,Plan,план
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банково извлечение по Главна книга
 DocType: Job Applicant,Applicant Name,Заявител Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Име на артикул
@@ -5015,6 +5051,7 @@
 DocType: Work Order,Warehouses,Складове
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} активът не може да се прехвърля
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ценообразуване в хотелски стаи
+DocType: Subscription,Days Until Due,Дни до разсрочване
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Тази позиция е вариант на {0} (шаблон).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупуване
@@ -5023,13 +5060,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","За групова студентска група, студентската партида ще бъде валидирана за всеки студент от програмата за записване."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може да се изтрие, тъй като съществува записвания за материални движения за този склад."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Дистрибуция
+DocType: Journal Entry Account,Loan,заем
 DocType: Expense Claim Advance,Expense Claim Advance,Разходи за възстановяване на разходи
 DocType: Lab Test,Report Preference,Предпочитание за отчета
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Информация за доброволци.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Ръководител На Проект
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Ръководител На Проект
 ,Quoted Item Comparison,Сравнение на редове от оферти
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Припокриване на точкуването между {0} и {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Изпращане
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Максимална отстъпка разрешена за позиция: {0} е {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Нетната стойност на активите, както на"
 DocType: Crop,Produce,продукция
@@ -5039,7 +5077,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Материалната консумация за производство
 DocType: Item Alternative,Alternative Item Code,Алтернативен код на елемента
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Изберете артикули за Производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Изберете артикули за Производство
 DocType: Delivery Stop,Delivery Stop,Спиране на доставката
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Изписване на материал
@@ -5049,15 +5087,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапуни & почистващи препарати
 DocType: BOM,Show Items,Показване на артикули
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"""От време"" не може да бъде по-голямо отколкото на ""До време""."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Искате ли да уведомите всички клиенти по имейл?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Искате ли да уведомите всички клиенти по имейл?
+DocType: Subscription Plan,Billing Interval,Интервал на фактуриране
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продължи
 DocType: Hub Settings,Hub Username,Потребителско име
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии за оценка Group
 DocType: Healthcare Settings,Patient Name By,Име на пациента по
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Набиране на дневника за начисленията за заплати от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Набиране на дневника за начисленията за заплати от {0} до {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
 DocType: Warehouse,Warehouse Name,Склад - Име
 DocType: Naming Series,Select Transaction,Изберете транзакция
@@ -5071,22 +5109,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
 DocType: Leave Block List,Applies to Company,Отнася се за Фирма
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се отмени, защото {0} съществуват операции за този материал"
-DocType: Employee Loan,Disbursement Date,Изплащане - Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Получатели&quot; не са посочени
+DocType: Loan,Disbursement Date,Изплащане - Дата
 DocType: BOM Update Tool,Update latest price in all BOMs,Актуализирайте последната цена във всички спецификации
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Медицински запис
 DocType: Vehicle,Vehicle,Превозно средство
 DocType: Purchase Invoice,In Words,Словом
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Въведете името на банката или кредитната институция преди да я изпратите.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} трябва да бъде изпратено
 DocType: POS Profile,Item Groups,Групи елементи
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Днес е рожденния ден на {0}!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Днес е рожденния ден на {0}!
 DocType: Sales Order Item,For Production,За производство
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Моля, добавете временна отваряща сметка в сметкоплана"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Моля, добавете временна отваряща сметка в сметкоплана"
 DocType: Customer,Customer Primary Contact,Първичен контакт на клиента
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Период за закриване на периоди
 DocType: Project Task,View Task,Виж задачи
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Оп / Олово%
+DocType: Bank Guarantee,Bank Guarantee Type,Вид банкова гаранция
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Част от фактурите
 ,Asset Depreciations and Balances,Активи амортизации и баланси
@@ -5097,9 +5136,8 @@
 DocType: Production Plan,Include Subcontracted Items,Включете подизпълнители
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Присъедини
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Не може да се променят параметрите на Variant след преобразуване на запасите. Ще трябва да направите нова позиция, за да направите това."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
-DocType: Employee Loan,Repay from Salary,Погасяване от Заплата
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+DocType: Loan,Repay from Salary,Погасяване от Заплата
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Искане за плащане срещу {0} {1} за количество {2}
 DocType: Salary Slip,Salary Slip,Фиш за заплата
@@ -5123,11 +5161,11 @@
 DocType: Employee Education,Employee Education,Служител - Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate група т намерена в таблицата на т група
 DocType: Land Unit,Parent Land Unit,Звено за родители
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
 DocType: Fertilizer,Fertilizer Name,Име на тора
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Cash Flow Mapping Accounts,Account,Сметка
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Сериен № {0} е бил вече получен
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Сериен № {0} е бил вече получен
 ,Requested Items To Be Transferred,Желани артикули да бъдат прехвърлени
 DocType: Expense Claim,Vehicle Log,Превозното средство - Журнал
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наличие на треска (температура&gt; 38,5 ° С или поддържана температура&gt; 38 ° C / 100,4 ° F)"
@@ -5168,24 +5206,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
 DocType: Asset Maintenance,Manufacturing User,Потребител - производство
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини - доставени
-DocType: C-Form,Series,Номерация
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Валутата на ценовата листа {0} трябва да бъде {1} или {2}
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Soil Texture,Ternary Plot,Ternary Парцел
 DocType: Item Group,Item Classification,Класификация на позиция
 DocType: Driver,License Number,Номер на лиценза
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Мениджър Бизнес развитие
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Мениджър Бизнес развитие
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Поддръжка посещение Предназначение
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Фактура за регистриране на пациента
 DocType: Crop,Period,Период
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Главна книга
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Служител {0} в отпуск на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Служител {0} в отпуск на {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Преглед на потенциалните клиенти
 DocType: Program Enrollment Tool,New Program,Нова програма
 DocType: Item Attribute Value,Attribute Value,Атрибут Стойност
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 DocType: Salary Detail,Salary Detail,Заплата Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Моля изберете {0} първо
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Моля изберете {0} първо
 DocType: Appointment Type,Physician,лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Партида {0} на артикул {1} е изтекла.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултации
@@ -5193,15 +5230,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не може да бъде по-голямо от планираното количество ({2}) в работната поръчка {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet за производство.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Междинна сума
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Не може да се променят свойствата на Variant след транзакция с акции. Ще трябва да направите нова позиция, за да направите това."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA мандат
 DocType: Physician,Charges,Такси
 DocType: Production Plan,Get Items For Work Order,Получете поръчки за работа
 DocType: Salary Detail,Default Amount,Сума по подразбиране
 DocType: Lab Test Template,Descriptive,описателен
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Складът не е открит в системата
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Складът не е открит в системата
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме този месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Проверка на качеството Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Задайте цел на продажбите, която искате да постигнете за фирмата си."
 ,Project wise Stock Tracking,Проект мъдър фондова Tracking
@@ -5229,11 +5267,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Създаването на уебсайт не бе успешно
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Мерна единица - превръщане - детайли
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Вече е създадено влизане в запасите от запаси или не е предоставено количество проба
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Вече е създадено влизане в запасите от запаси или не е предоставено количество проба
 DocType: Program,Program Abbreviation,програма Съкращение
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока
 DocType: Warranty Claim,Resolved By,Разрешен от
-DocType: Bank Guarantee,Start Date,Начална Дата
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Разпределяне на листа за период.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекове Депозити и неправилно изчистени
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Сметка {0}: Не можете да назначите себе си за родителска сметка
@@ -5248,11 +5285,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часове
 DocType: Project,Expected Start Date,Очаквана начална дата
 DocType: Purchase Invoice,04-Correction in Invoice,04-Корекция в фактурата
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Работна поръчка вече е създадена за всички елементи с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Работна поръчка вече е създадена за всички елементи с BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Отчет за подробните варианти
 DocType: Setup Progress Action,Setup Progress Action,Настройка на напредъка на настройката
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Ценоразпис - Закупуване
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Ценоразпис - Закупуване
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Анулиране на абонамента
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,"Моля, изберете Статус на поддръжка като завършен или премахнете дата на завършване"
 DocType: Supplier,Default Payment Terms Template,Шаблон за стандартни условия за плащане
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Валута на транзакция трябва да бъде същата като Плащане Портал валута
@@ -5263,7 +5301,6 @@
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие в случай, че сумарния месечен Бюджет е превишен"
-DocType: Subscription,Submit on creation,Подаване на създаване
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
 DocType: Asset,Disposal Date,Отписване - Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Имейли ще бъдат изпратени на всички активни служители на компанията в даден час, ако те не разполагат с почивка. Обобщение на отговорите ще бъдат изпратени в полунощ."
@@ -5281,6 +5318,7 @@
 DocType: Batch,Parent Batch,Родителска партида
 DocType: Cheque Print Template,Cheque Print Template,Чек шаблони за печат
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Списък на Разходни центрове
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Брой дни след изтичане на датата на фактурата преди анулиране на абонамента за записване или маркиране като неплатен
 DocType: Lab Test Template,Sample Collection,Колекция от проби
 ,Requested Items To Be Ordered,Заявени продукти за да поръчка
 DocType: Price List,Price List Name,Ценоразпис Име
@@ -5289,7 +5327,7 @@
 DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Вид индустрия
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нещо се обърка!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
 DocType: Supplier Scorecard Scoring Criteria,Score,резултат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Фискална година {0} не съществува
@@ -5309,12 +5347,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,POS профил
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} трябва да бъде стойност между 0 и 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,"Следващата дата на амортизация не може да бъде преди датата, която е налице за използване"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необезпечени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Разходен център - Име
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Max работно време срещу график
 DocType: Maintenance Schedule Detail,Scheduled Date,Предвидена дата
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,"Общата сума, изплатена Amt"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,"Общата сума, изплатена Amt"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Съобщения по-големи от 160 знака, ще бъдат разделени на няколко съобщения"
 DocType: Purchase Receipt Item,Received and Accepted,Получена и приета
 DocType: Hub Settings,Company and Seller Profile,Профил на фирмата и продавача
@@ -5328,10 +5366,9 @@
 DocType: Item,Variant Based On,Вариант на базата на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Вашите доставчици
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Моля, поправете"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
 DocType: Request for Quotation Item,Supplier Part No,Доставчик Част номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,анонимен
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Получени от
 DocType: Lead,Converted,Преобразуван
@@ -5345,6 +5382,7 @@
 DocType: Asset,Assets,Дълготраен активи
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
+DocType: Subscription,Current Invoice End Date,Текуща дата на фактурата
 DocType: Payment Term,Due Date Based On,Базисна дата на базата на
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,"Моля, задайте стандартната група и територията на клиентите в настройките за продажби"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} не съществува
@@ -5352,7 +5390,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи неизравнени записвания
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Няма избрани изплащания за вписване в дневника
 DocType: Payment Reconciliation,From Invoice Date,От Дата на фактура
+DocType: Loan,Disbursed,Изплатени
 DocType: Healthcare Settings,Laboratory Settings,Лабораторни настройки
 DocType: Patient Appointment,Service Unit,Обслужващо звено
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Успешно задайте доставчика
@@ -5365,12 +5405,12 @@
 DocType: Share Balance,No of Shares,Брой акции
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Изберете Статус
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: School House,House Name,Наименование Къща
 DocType: Fee Schedule,Total Amount per Student,Обща сума на студент
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Електрически
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Електрически
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавете останалата част от вашата организация, както на потребителите си. Можете да добавите и покани на клиентите да си портал, като ги добавите от Контакти"
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика (Изх - Вх)
 DocType: Grant Application,Requested Amount,Исканата сума
@@ -5380,7 +5420,7 @@
 DocType: Crop Cycle,Detected Diseases,Открити болести
 DocType: Stock Entry,Default Source Warehouse,Склад по подразбиране
 DocType: Item,Customer Code,Клиент - Код
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Напомняне за рожден ден за {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Напомняне за рожден ден за {0}
 DocType: Asset Maintenance Task,Last Completion Date,Последна дата на приключване
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след последната поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
@@ -5388,9 +5428,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Настройки
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малка от застраховка Крайна дата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Наличност на Активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Наличност на Активи
 DocType: Restaurant,Active Menu,Активно меню
 DocType: Target Detail,Target Qty,Целево Количество
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Срещу кредит: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Поръчка - Настройки
 DocType: Student Attendance,Present,Настояще
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Складова разписка {0} не трябва да бъде подадена
@@ -5399,9 +5440,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
 DocType: Vehicle Log,Odometer,одометър
 DocType: Production Plan Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Точка {0} е деактивирана
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Точка {0} е деактивирана
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM не съдържа материали / стоки
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM не съдържа материали / стоки
 DocType: Chapter,Chapter Head,Заглавие на глава
 DocType: Payment Term,Month(s) after the end of the invoice month,Месец (и) след края на месеца на фактурата
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Дейността на проект / задача.
@@ -5409,11 +5450,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериране на фишове за заплати
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Резултатът от датата на лабораторията не може да бъде преди тестване на датата
 DocType: POS Profile,Allow user to edit Discount,Позволете на потребителя да редактира отстъпка
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Вземи клиенти от
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Вземи клиенти от
 DocType: Purchase Invoice Item,Include Exploded Items,Включете експлодираните елементи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Купуването трябва да се провери, ако е маркирано като {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпката трябва да е по-малко от 100
 DocType: Shipping Rule,Restrict to Countries,Ограничаване до държави
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Сума за отписване (фирмена валута)
 DocType: Sales Invoice Timesheet,Billing Hours,Фактурирани часове
 DocType: Project,Total Sales Amount (via Sales Order),Обща продажна сума (чрез поръчка за продажба)
@@ -5430,6 +5472,7 @@
 DocType: Soil Texture,Sandy Clay,Санди Клей
 DocType: Grant Application,Assessment  Manager,Мениджър за оценка
 DocType: Payment Entry,Allocate Payment Amount,Разпределяне на сумата за плащане
+DocType: Subscription Plan,Subscription Plan,План за абонамент
 DocType: Employee External Work History,Salary,Заплата
 DocType: Serial No,Delivery Document Type,Тип документ за Доставка
 DocType: Sales Order,Partly Delivered,Частично Доставени
@@ -5454,9 +5497,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Застаряването на населението Range 2
 DocType: SG Creation Tool Course,Max Strength,Максимална здравина
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталиране на предварителни настройки
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},За клиента не е избрано известие за доставка {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},За клиента не е избрано известие за доставка {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM заменя
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Изберете Елементи въз основа на Дата на доставка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Изберете Елементи въз основа на Дата на доставка
 DocType: Grant Application,Has any past Grant Record,Има ли някакъв минал регистър за безвъзмездни средства
 ,Sales Analytics,Анализ на продажбите
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Налични {0}
@@ -5474,7 +5517,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Цена на доставени суровини
 DocType: Selling Settings,Settings for Selling Module,Настройки на модул - Продажба
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервация на хотелски стаи
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Обслужване на клиенти
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Обслужване на клиенти
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Клиентска Позиция - Детайли
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Предложи оферта на кандидата за работа.
@@ -5490,7 +5533,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Студенти са записани
 DocType: Fees,Student Details,Студентски детайли
 DocType: Purchase Invoice Item,Stock Qty,Коефициент на запас
-DocType: Employee Loan,Repayment Period in Months,Възстановяването Период в месеци
+DocType: Loan,Repayment Period in Months,Възстановяването Период в месеци
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Грешка: Не е валиден документ за самоличност?
 DocType: Naming Series,Update Series Number,Актуализация на номер за номериране
 DocType: Account,Equity,Справедливост
@@ -5499,7 +5542,7 @@
 DocType: Task,Closing Date,Крайна дата
 DocType: Sales Order Item,Produced Quantity,Произведено количество
 DocType: Timesheet,Work Detail,Работни подробности
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Инженер
 DocType: Journal Entry,Total Amount Currency,Обща сума във валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Търсене под Изпълнения
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Код на позиция се изисква за ред номер {0}
@@ -5544,13 +5587,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Информация за типа на дарителя.
 DocType: Request for Quotation,Supplier Detail,Доставчик - детайли
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка във формула или състояние: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Фактурирана сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Фактурирана сума
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Теглата на критериите трябва да достигнат до 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Посещаемост
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Артикулите за наличност
 DocType: BOM,Materials,Материали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не се проверява, списъкът ще трябва да бъдат добавени към всеки отдел, където тя трябва да се приложи."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Създаване на {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Източник и целеви склад не може да бъде един и същ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Данъчен шаблон за сделки при закупуване.
@@ -5574,14 +5616,14 @@
 DocType: Shipping Rule,Fixed,Фиксиран
 DocType: Vehicle Service,Clutch Plate,Съединител Плейт
 DocType: Company,Round Off Account,Закръгляне - Акаунт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Административни разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Административни разходи
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Клиентска група - Родител
-DocType: Journal Entry,Subscription,абонамент
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,абонамент
 DocType: Purchase Invoice,Contact Email,Контакт Email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Изчаква се създаването на такси
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Срок на предизвестие
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Срок на предизвестие
 DocType: Asset Category,Asset Category Name,Asset Категория Име
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Това е корен територия и не може да се редактира.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Нов отговорник за продажби - Име
@@ -5594,7 +5636,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставете без отметка, ако не искате да разгледате партида, докато правите курсови групи."
 DocType: Asset,Frequency of Depreciation (Months),Честота на амортизация (месеца)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
@@ -5602,7 +5644,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
 DocType: Hub Settings,Company Logo,Лого на фирмата
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Склад по подразбиране
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 DocType: Healthcare Settings,Patient Registration,Регистриране на пациента
@@ -5636,11 +5678,10 @@
 DocType: Journal Entry,Total Debit,Общо дебит
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,По подразбиране - Склад за готова продукция
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,"Моля, изберете пациент"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Търговец
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Търговец
 DocType: Hotel Room Package,Amenities,Удобства
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет и Разходен център
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Не е разрешен няколко начина на плащане по подразбиране
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Анализ за назначаване
 DocType: Vehicle Service,Half Yearly,Полугодишна
 DocType: Lead,Blog Subscriber,Блог - Абонат
@@ -5656,6 +5697,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Оставете празно, ако правите групи ученици на година"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е избрано, Total не. на работните дни ще включва празници, а това ще доведе до намаляване на стойността на Заплата на ден"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Приложенията, използващи текущия ключ, няма да имат достъп, вярно ли е?"
+DocType: Subscription Settings,Prorate,разпределям пропорционално
 DocType: Purchase Invoice,Total Advance,Общо аванс
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Промяна на кода на шаблона
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Term крайна дата не може да бъде по-рано от датата Term старт. Моля, коригирайте датите и опитайте отново."
@@ -5666,8 +5708,9 @@
 DocType: Opportunity Item,Basic Rate,Основен курс
 DocType: GL Entry,Credit Amount,Кредитна сметка
 DocType: Cheque Print Template,Signatory Position,подписалите Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Задай като Загубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Задай като Загубени
 DocType: Timesheet,Total Billable Hours,Общо Billable Часа
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Брой дни, през които абонатът трябва да плати фактури, генерирани от този абонамент"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Заплащане Получаване Забележка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Това се основава на сделки срещу този клиент. Вижте график по-долу за повече подробности
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на сумата на плащане Влизане {2}
@@ -5686,12 +5729,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Вземи курс от последна покупка
 DocType: Company,Company Info,Информация за компанията
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Изберете или добавите нов клиент
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Това се основава на присъствието на този служител
 DocType: Assessment Result,Summary,резюме
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Маркиране на присъствието
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Дебит сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Дебит сметка
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Рекламен елемент за поръчка на ресторант
@@ -5703,7 +5746,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,сума на покупката
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Оферта на доставчик  {0} е създадена
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Краят на годината не може да бъде преди началото на годината
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Доходи на наети лица
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Доходи на наети лица
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Опакованото количество трябва да е равно на количество за артикул {0} на ред {1}
 DocType: Work Order,Manufactured Qty,Произведено Количество
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Акциите не съществуват с {0}
@@ -5711,12 +5754,12 @@
 DocType: Asset,Out of Order,Извънредно
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 DocType: Projects Settings,Ignore Workstation Time Overlap,Игнорирайте времето за припокриване на работната станция
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Изберете партидни номера
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Фактури издадени на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 DocType: Patient Service Unit,Medical Administrator,Медицински администратор
 DocType: Assessment Plan,Schedule,Разписание
 DocType: Account,Parent Account,Родител Акаунт
@@ -5746,15 +5789,16 @@
 DocType: Asset Repair,Repair Status,Ремонт Състояние
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Счетоводни записи в дневник
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Моля, изберете първо запис на служител."
 DocType: POS Profile,Account for Change Amount,Сметка за ресто
 DocType: Purchase Invoice,input service,входна услуга
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Член на екипа за поддръжка
 DocType: Agriculture Analysis Criteria,Soil Analysis,Анализ на почвите
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Код на курса:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Моля, въведете Expense Account"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
@@ -5802,19 +5846,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Прием за {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име на променливата
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Позиция {0} е шаблон, моля изберете една от неговите варианти"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Позиция {0} е шаблон, моля изберете една от неговите варианти"
 DocType: Asset,Asset Category,Дълготраен актив Категория
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net заплащането не може да бъде отрицателна
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция - Данък
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Материал на доставчик
 DocType: Soil Texture,Loamy Sand,Сладък пясък
 DocType: Production Plan,Material Request Planning,Планиране на материални заявки
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Акцизи - фактура
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Праг за {0}% се появява повече от веднъж
 DocType: Expense Claim,Employees Email Id,Служители Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Маркирано като присъствие
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Текущи задължения
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Текущи задължения
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Таймерът надхвърли зададени часове.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Изпратете маса SMS към вашите контакти
 DocType: Patient,A Positive,А Положителен
@@ -5825,9 +5869,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} понастоящем има {1} карта на Доставчика за покупки и поръчките за покупка на този доставчик трябва да се издават с повишено внимание.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Екип за поддръжка на активи
-DocType: Employee Loan,Loan Type,Вид на кредита
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} бе изпратен успешно
+DocType: Loan,Loan Type,Вид на кредита
 DocType: Scheduling Tool,Scheduling Tool,Scheduling Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Кредитна Карта
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Кредитна Карта
 DocType: BOM,Item to be manufactured or repacked,Т да се произвеждат или преопаковани
 DocType: Employee Education,Major/Optional Subjects,Основни / избираеми предмети
 DocType: Sales Invoice Item,Drop Ship,Капка Корабно
@@ -5859,7 +5904,7 @@
 DocType: Item,Units of Measure,Мерни единици за измерване
 DocType: Manufacturing Settings,Allow Production on Holidays,Разрешаване на производство на празници
 DocType: Sales Invoice,Customer's Purchase Order Date,Поръчка на Клиента - Дата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Показване на публичните прикачени файлове
 DocType: Packing Slip,Package Weight Details,Тегло на пакет - Детайли
 DocType: Restaurant Reservation,Reservation Time,Време за резервация
@@ -5874,7 +5919,7 @@
 DocType: Purchase Order,To Receive and Bill,За получаване и фактуриране
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Ред # {0}: Reqd by Date не може да бъде преди датата на транзакцията
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Подбрани продукти
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Условия за ползване - Шаблон
 DocType: Serial No,Delivery Details,Детайли за доставка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Разходен център се изисква в ред {0} в таблица за данъци вид {1}
@@ -5884,20 +5929,20 @@
 DocType: Driver,Expiry Date,Срок На Годност
 DocType: Healthcare Settings,Employee name and designation in print,Наименование и наименование на служителя в печат
 ,accounts-browser,сметки-браузър
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Моля, изберете Категория първо"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстор Project.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","За да се позволи на над-фактуриране или над-поръчка, актуализира &quot;квота&quot; в Сток Settings или елемента."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва символи като $ и т.н. до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Половин ден)
 DocType: Payment Term,Credit Days,Дни - Кредит
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Моля, изберете Пациент, за да получите лабораторни тестове"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Направи Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Е пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Вземи позициите от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Вземи позициите от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Време за въвеждане - Дни
 DocType: Cash Flow Mapping,Is Income Tax Expense,Разходите за данък върху дохода
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверете това, ако студентът пребивава в хостел на института."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
 ,Stock Summary,фондова Резюме
@@ -5908,10 +5953,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Дата
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: BOM Operation,Operating Cost(Company Currency),Експлоатационни разходи (Валути на фирмата)
-DocType: Employee Loan Application,Rate of Interest,Размерът на лихвата
+DocType: Loan Application,Rate of Interest,Размерът на лихвата
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: Item,Shelf Life In Days,Живот през дните
 DocType: GL Entry,Is Opening,Се отваря
+DocType: Department,Expense Approvers,Одобрители на разходи
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
 DocType: Journal Entry,Subscription Section,Абонаментна секция
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Сметка {0} не съществува
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 1778bc4..875beae 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,উপাদান যান {0} এই পাটা দাবি বাতিল আগে বাতিল
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,মূল্যায়ন প্রতিবেদনগুলি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
-DocType: Purchase Receipt,Subscription Detail,সাবস্ক্রিপশন বিস্তারিত
 DocType: Supplier Scorecard,Notify Supplier,সরবরাহকারীকে সূচিত করুন
 DocType: Item,Customer Items,গ্রাহক চলছে
 DocType: Project,Costing and Billing,খোয়াতে এবং বিলিং
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট তথ্য {1} একটি খতিয়ান হতে পারবেন না
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com আইটেমটি প্রকাশ করুন
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ইমেল বিজ্ঞপ্তি
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,মূল্যায়ন
 DocType: Item,Default Unit of Measure,মেজার ডিফল্ট ইউনিট
 DocType: SMS Center,All Sales Partner Contact,সমস্ত বিক্রয় সঙ্গী সাথে যোগাযোগ
-DocType: Employee,Leave Approvers,Approvers ত্যাগ
+DocType: Department,Leave Approvers,Approvers ত্যাগ
 DocType: Sales Partner,Dealer,ব্যাপারী
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,তদন্ত
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,গ্রহণযোগ্যতা যাচাই
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,এই সরবরাহকারী বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,আইনগত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},প্রকৃত টাইপ ট্যাক্স সারিতে আইটেম রেট অন্তর্ভুক্ত করা যাবে না {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,আইনগত
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},প্রকৃত টাইপ ট্যাক্স সারিতে আইটেম রেট অন্তর্ভুক্ত করা যাবে না {0}
 DocType: Bank Guarantee,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
 DocType: Delivery Note,Return Against Delivery Note,হুণ্ডি বিরুদ্ধে ফিরে
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"প্রধান (বা গ্রুপ), যার বিরুদ্ধে হিসাব থেকে তৈরি করা হয় এবং উদ্বৃত্ত বজায় রাখা হয়."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,প্রসারিত করতে কোন জমা বেতন স্লিপ আছে।
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,প্রসারিত করতে কোন জমা বেতন স্লিপ আছে।
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,খোলা দেখাও
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,উপরে উল্লিখিত পুনরাবৃত্তির জন্য নিজেই আজ এই পদক্ষেপ নেওয়া প্রয়োজন
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,চেকআউট
 DocType: Pricing Rule,Apply On,উপর প্রয়োগ
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,সমস্ত সরবরাহকারী যোগাযোগ
 DocType: Support Settings,Support Settings,সাপোর্ট সেটিং
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,ব্যাচ আইটেম মেয়াদ শেষ হওয়ার স্থিতি
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ব্যাংক খসড়া
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ব্যাংক খসড়া
 DocType: Membership,membership validaty section,সদস্যতা বৈধতা অধ্যায়
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 DocType: Consultation,Consultation,পরামর্শ
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,উপাদান
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ওয়েবসাইট তৈরি করা
 DocType: Opening Invoice Creation Tool Item,Quantity,পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ঋণ (দায়)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
 DocType: Item,Country of Origin,মাত্রিভূমি
 DocType: Soil Texture,Soil Texture Criteria,মৃত্তিকা টেক্সচারের মানদণ্ড
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,প্রাথমিক যোগাযোগের বিবরণ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,এমনকি আপনি যদি
 DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
 DocType: Lab Test Groups,Add new line,নতুন লাইন যোগ করুন
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
@@ -89,7 +85,7 @@
 ,Delay Days,বিলম্বিত দিনগুলি
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,চালান
+DocType: Subscription Invoice,Invoice,চালান
 DocType: Purchase Invoice Item,Item Weight Details,আইটেম ওজন বিশদ
 DocType: Asset Maintenance Log,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,সারি # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,সারি # {0}:
 DocType: Timesheet,Total Costing Amount,মোট খোয়াতে পরিমাণ
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,মূল্য তালিকা নির্বাচন করুন
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,কাজ চলছে
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,দয়া করে তারিখ নির্বাচন
 DocType: Daily Work Summary Group,Holiday List,ছুটির তালিকা
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,হিসাবরক্ষক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,হিসাবরক্ষক
 DocType: Hub Settings,Selling Price List,মূল্য তালিকা বিক্রি
 DocType: Patient,Tobacco Current Use,তামাক বর্তমান ব্যবহার
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,বিক্রি হার
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,বিক্রি হার
 DocType: Cost Center,Stock User,স্টক ইউজার
 DocType: Soil Analysis,(Ca+Mg)/K,(CA ম্যাগনেসিয়াম + +) / কে
 DocType: Company,Phone No,ফোন নম্বর
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},নতুন {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,প্রাথমিক ইমেল বিজ্ঞপ্তি পাঠানো
 ,Sales Partners Commission,সেলস পার্টনার্স কমিশন
 DocType: Soil Texture,Sandy Clay Loam,স্যান্ডী ক্লে লোম
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,মূল্য অবচয় পর
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,সংশ্লিষ্ট
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,এ্যাটেনডেন্স তারিখ কর্মচারী এর যোগদান তারিখের কম হতে পারে না
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,এ্যাটেনডেন্স তারিখ কর্মচারী এর যোগদান তারিখের কম হতে পারে না
 DocType: Grading Scale,Grading Scale Name,শূন্য স্কেল নাম
-DocType: Subscription,Repeat on Day,দিন পুনরাবৃত্তি
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,এটি একটি root অ্যাকাউন্ট এবং সম্পাদনা করা যাবে না.
 DocType: Sales Invoice,Company Address,প্রতিস্থান এর ঠিকানা
 DocType: BOM,Operations,অপারেশনস
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},জন্য ছাড়ের ভিত্তিতে অনুমোদন সেট করা যায় না {0}
+DocType: Subscription,Subscription Start Date,সাবস্ক্রিপশন শুরু তারিখ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","দুই কলাম, পুরাতন নাম জন্য এক এবং নতুন নামের জন্য এক সঙ্গে CSV ফাইল সংযুক্ত"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} কোনো সক্রিয় অর্থবছরে না.
 DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","রেফারেন্স: {0}, আইটেম কোড: {1} এবং গ্রাহক: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ট্রায়ালের মেয়াদ শেষের তারিখটি ট্রায়ালের মেয়াদ শুরু তারিখের আগে হতে পারে না
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,কেজি
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,একটি কাজের জন্য খোলা.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{1} সারি {1} এ উপসম্পাদক আইটেমের জন্য BOM নির্দিষ্ট করা হয়নি
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Patient,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},অনুমোদিত নয় {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,থেকে আইটেম পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,থেকে আইটেম পান
 DocType: Price List,Price Not UOM Dependant,দাম না UOM নির্ভরশীলতা
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ব্রেক অয়েল
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
 ,Completed Work Orders,সম্পন্ন কাজ আদেশ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,করযোগ্য অর্থ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,করযোগ্য অর্থ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: BOM,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,সারি # {0}: রেফারেন্স দস্তাবেজ প্রকার ব্যয় দাবি বা জার্নাল এন্ট্রি এক হতে হবে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,সারি # {0}: রেফারেন্স দস্তাবেজ প্রকার ব্যয় দাবি বা জার্নাল এন্ট্রি এক হতে হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM নির্বাচন
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,কর্মচারীকে দেওয়া অগ্রিম পরিমাণ পরিচালনা করুন
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ডেলিভারি বিজ্ঞপ্তি
 DocType: Journal Entry,Opening Entry,প্রারম্ভিক ভুক্তি
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,হিসাব চুকিয়ে শুধু
-DocType: Employee Loan,Repay Over Number of Periods,শোধ ওভার পর্যায়কাল সংখ্যা
+DocType: Loan,Repay Over Number of Periods,শোধ ওভার পর্যায়কাল সংখ্যা
 DocType: Stock Entry,Additional Costs,অতিরিক্ত খরচ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
 DocType: Education Settings,Validate Batch for Students in Student Group,শিক্ষার্থীর গ্রুপ ছাত্ররা জন্য ব্যাচ যাচাই
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},কোন ছুটি রেকর্ড কর্মচারী জন্য পাওয়া {0} জন্য {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},কোন ছুটি রেকর্ড কর্মচারী জন্য পাওয়া {0} জন্য {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
 DocType: Employee Education,Under Graduate,গ্রাজুয়েট অধীনে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,এইচআর সেটিংসে স্থিতি বিজ্ঞপ্তি ত্যাগের জন্য ডিফল্ট টেমপ্লেটটি সেট করুন।
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,টার্গেটের
 DocType: BOM,Total Cost,মোট খরচ
 DocType: Soil Analysis,Ca/K,ক্যাচ / কে
-DocType: Journal Entry Account,Employee Loan,কর্মচারী ঋণ
 DocType: Fee Schedule,Send Payment Request Email,পেমেন্ট অনুরোধ ইমেইল পাঠান
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,আবাসন
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,সফলভাবে অনিবন্ধিত.
 DocType: Assessment Result,Grade,শ্রেণী
 DocType: Restaurant Table,No of Seats,আসন সংখ্যা নেই
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ডাইনামিক বিষয় যোগ করতে, jinja ট্যাগ ব্যবহার করুন <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: Asset Maintenance Task,Asset Maintenance Task,সম্পদ রক্ষণাবেক্ষণ টাস্ক
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,বার্ষিক বেতন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,বার্ষিক বেতন
 DocType: Daily Work Summary,Daily Work Summary,দৈনন্দিন কাজ সারাংশ
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} হিমায়িত করা
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,স্টক খরচ
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,স্টক খরচ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,নির্বাচন উদ্দিষ্ট ওয়্যারহাউস
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,অনুগ্রহ করে লিখুন পছন্দের যোগাযোগ ইমেইল
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,অনুগ্রহ করে লিখুন পছন্দের যোগাযোগ ইমেইল
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্রি
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Plan,Material Request Detail,উপাদান অনুরোধ বিস্তারিত
 DocType: Selling Settings,Default Quotation Validity Days,ডিফল্ট কোটেশন বৈধতা দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: Sales Invoice,Change Amount,পরিমাণ পরিবর্তন
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,ড্রাইভিং লাইসেন্স বিভাগ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ডেলিভারি তারিখ লিখুন দয়া করে
 DocType: Depreciation Schedule,Make Depreciation Entry,অবচয় এণ্ট্রি করুন
+DocType: HR Settings,Leave Settings,সেটিংস ছেড়ে যান
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,অনুরোধ টাইপ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,কর্মচারী করুন
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,সম্প্রচার
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),পিওএস (অনলাইন / অফলাইন) সেটআপ মোড
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,কাজের আদেশগুলির বিরুদ্ধে সময় লগগুলি তৈরি করতে অক্ষম। অপারেশন কর্ম আদেশ বিরুদ্ধে ট্র্যাক করা হবে না
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,সম্পাদন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,সম্পাদন
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
 DocType: Asset Maintenance Log,Maintenance Status,রক্ষণাবেক্ষণ অবস্থা
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,সদস্যতা বিবরণ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; টেরিটরি
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: সরবরাহকারী প্রদেয় অ্যাকাউন্ট বিরুদ্ধে প্রয়োজন বোধ করা হয় {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,চলছে এবং প্রাইসিং
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},মোট ঘন্টা: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},জন্ম থেকে অর্থবছরের মধ্যে হওয়া উচিত. জন্ম থেকে Assuming = {0}
 DocType: Drug Prescription,Interval,অন্তর
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,পক্ষপাত
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,পক্ষপাত
 DocType: Grant Application,Individual,ব্যক্তি
 DocType: Academic Term,Academics User,শিক্ষাবিদগণ ব্যবহারকারী
 DocType: Cheque Print Template,Amount In Figure,পরিমাণ চিত্র
-DocType: Employee Loan Application,Loan Info,ঋণ তথ্য
+DocType: Loan Application,Loan Info,ঋণ তথ্য
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,রক্ষণাবেক্ষণ পরিদর্শন জন্য পরিকল্পনা.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,সরবরাহকারী স্কোরকার্ডের সময়কাল
 DocType: Share Transfer,Share Transfer,স্থানান্তর ভাগ করুন
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,আইটেম টেমপ্লেট
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,প্রাণরসায়ন
 DocType: Job Offer,Select Terms and Conditions,নির্বাচন শর্তাবলী
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,আউট মূল্য
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,আউট মূল্য
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce সেটিংস
 DocType: Production Plan,Sales Orders,বিক্রয় আদেশ
 DocType: Purchase Taxes and Charges,Valuation,মাননির্ণয়
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,ডিফল্ট টেরিটরি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,টিভি
 DocType: Work Order Operation,Updated via 'Time Log',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,গ্রাহক বা সরবরাহকারী নির্বাচন করুন।
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
 DocType: Company,Enable Perpetual Inventory,চিরস্থায়ী পরিসংখ্যা সক্ষম করুন
+DocType: Bank Guarantee,Charges Incurred,চার্জ প্রযোজ্য
 DocType: Company,Default Payroll Payable Account,ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,আপডেট ইমেল গ্রুপ
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,কাস্টম ফলাফল
 DocType: Delivery Stop,Contact Name,যোগাযোগের নাম
 DocType: Course Assessment Criteria,Course Assessment Criteria,কোর্সের অ্যাসেসমেন্ট নির্ণায়ক
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ট্যাক্স আইডি:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ট্যাক্স আইডি:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,শিক্ষার্থী আইডি:
 DocType: POS Customer Group,POS Customer Group,পিওএস গ্রাহক গ্রুপ
 DocType: Land Unit,Land Unit describing various land assets,ভূমি ইউনিট বিভিন্ন জমি সম্পদ বর্ণনা
@@ -374,9 +371,8 @@
 ,Open Work Orders,ওপেন ওয়ার্ক অর্ডার
 DocType: Payment Term,Credit Months,ক্রেডিট মাস
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,নিট পে 0 কম হতে পারে না
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","সিস্টেম থেকে পুনরাবৃত্তিমূলক ত্রুটির নোটিফিকেশন প্রেরণ বন্ধ করতে, আমরা সাবস্ক্রিপশনটিতে অক্ষম ক্ষেত্র চেক করেছি"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,প্রতি বছর পত্রাদি
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,প্রতি বছর পত্রাদি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
 DocType: Email Digest,Profit & Loss,লাভ ক্ষতি
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,ছাত্রদের অধীন ছাত্রদের সেটআপ করুন
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ব্যাংক দাখিলা
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ব্যাংক দাখিলা
 DocType: Crop,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,শিক্ষার্থীর গ্রুপ সৃষ্টি টুল কোর্স
 DocType: Lead,Do Not Contact,যোগাযোগ না
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,যাদের কাছে আপনার প্রতিষ্ঠানের পড়ান
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,সফ্টওয়্যার ডেভেলপার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Course Scheduling Tool,Course Start Date,কোর্স শুরুর তারিখ
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,হাব প্রকাশ
 DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,ক্রয় বিবরণ
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,সর্বোচ্চ গ্রেড
 DocType: Email Digest,New Quotations,নতুন উদ্ধৃতি
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,কর্মচারী থেকে ইমেল বেতন স্লিপ কর্মচারী নির্বাচিত পছন্দসই ই-মেইল উপর ভিত্তি করে
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 DocType: Tax Rule,Shipping County,শিপিং কাউন্টি
-apps/erpnext/erpnext/config/desktop.py +167,Learn,শেখা
+apps/erpnext/erpnext/config/desktop.py +159,Learn,শেখা
 DocType: Asset,Next Depreciation Date,পরবর্তী অবচয় তারিখ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,বিশিষ্ট চেক এবং পরিষ্কার আমানত
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
 DocType: Driver,Fleet Manager,দ্রুত ব্যবস্থাপক
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},সারি # {0}: {1} আইটেমের জন্য নেতিবাচক হতে পারে না {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},সারি # {0}: {1} আইটেমের জন্য নেতিবাচক হতে পারে না {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,ভুল গুপ্তশব্দ
 DocType: Item,Variant Of,মধ্যে variant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{} এ হোটেল রুম রেট সেট করুন
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Opening Invoice Creation Tool,Invoice Type,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,চালান পত্র
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,চালান পত্র
 DocType: Consultation,Encounter Impression,এনকোডেড ইমপ্রেসন
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,বিক্রি অ্যাসেট খরচ
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Course Scheduling Tool,Course Scheduling Tool,কোর্সের পূর্বপরিকল্পনা টুল
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[ঊর্ধ্বতন]% s এর জন্য% s পুনরাবৃত্তি তৈরির সময় ত্রুটি
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
 DocType: Land Unit,LInked Analysis,লিনাক্স বিশ্লেষণ
 DocType: Item Tax,Tax Rate,করের হার
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,অ্যাপ্লিকেশন সময়সীমা দুটি বরাদ্দ রেকর্ড জুড়ে হতে পারে না
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,অ্যাপ্লিকেশন সময়সীমা দুটি বরাদ্দ রেকর্ড জুড়ে হতে পারে না
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% গৃহীত
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ছাত্র সংগঠনগুলো তৈরি করুন
 DocType: Volunteer,Weekends,সপ্তাহান্তে
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ক্রেডিট নোট পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ক্রেডিট নোট পরিমাণ
 DocType: Setup Progress Action,Action Document,অ্যাকশন ডকুমেন্ট
 DocType: Chapter Member,Website URL,ওয়েবসাইট URL
 ,Finished Goods,সমাপ্ত পণ্য
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ডেমো
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,উপকরণ অ্যাড
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,আইটেম গুণ পরিদর্শন পরামিতি
+DocType: Leave Application,Leave Approver Name,রাজসাক্ষী নাম
 DocType: Depreciation Schedule,Schedule Date,সূচি তারিখ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","আয়, Deductions এবং অন্যান্য বেতন উপাদান"
 DocType: Packed Item,Packed Item,বস্তাবন্দী আইটেম
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
 DocType: Healthcare Settings,Require Lab Test Approval,ল্যাব টেস্ট অনুমোদন প্রয়োজন
 DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,পুরো অসাধারন
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,পুরো অসাধারন
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
 DocType: Dosage Strength,Strength,শক্তি
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Consumable খরচ
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
 DocType: Student Log,Medical,মেডিকেল
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,হারানোর জন্য কারণ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,হারানোর জন্য কারণ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,অ্যাকাউন্ট নম্বর আপডেট করুন
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,লিড মালিক লিড হিসাবে একই হতে পারে না
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,একক
 DocType: Salary Slip,Total Loan Repayment,মোট ঋণ পরিশোধ
 DocType: Account,Cost of Goods Sold,বিক্রি সামগ্রীর খরচ
-DocType: Subscription,Yearly,বাত্সরিক
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
 DocType: Drug Prescription,Dosage,ডোজ
 DocType: Journal Entry Account,Sales Order,বিক্রয় আদেশ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,গড়. হার বিক্রী
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,গড়. হার বিক্রী
 DocType: Assessment Plan,Examiner Name,পরীক্ষক নাম
 DocType: Lab Test Template,No Result,কোন ফল
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ম্যানুয়াল পড়ুন
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,ক্যালেন্ডারে সকল বিভাগের সদস্যদের তালিকা দেখান
 DocType: Purchase Invoice,01-Sales Return,01-বিক্রয় রিটার্ন
 DocType: Account,Is Group,দলটির
 DocType: Email Digest,Pending Purchase Orders,ক্রয় আদেশ অপেক্ষারত
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,আবশ্যিক ক্ষেত্র - শিক্ষাবর্ষ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} সাথে যুক্ত নয়
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,যে ইমেইল এর একটি অংশ হিসাবে যে যায় পরিচায়ক টেক্সট কাস্টমাইজ করুন. প্রতিটি লেনদেনের একটি পৃথক পরিচায়ক টেক্সট আছে.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},কোম্পানির জন্য ডিফল্ট প্রদেয় অ্যাকাউন্ট সেট দয়া করে {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},কোম্পানির জন্য ডিফল্ট প্রদেয় অ্যাকাউন্ট সেট দয়া করে {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},লেনদেন বন্ধ আদেশ আদেশ {0} বিরুদ্ধে অনুমোদিত নয়
 DocType: Setup Progress Action,Min Doc Count,মিনি ডক গণনা
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,বিক্রয়ের জন্য সংরক্ষিত
 DocType: Packing Slip,From Package No.,প্যাকেজ নং থেকে
 DocType: Item Attribute,To Range,পরিসীমা
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","মূল্যনির্ধারণ পদ্ধতি পরিবর্তন করা যাবে না, যেহেতু কিছু আইটেম বিরুদ্ধে লেনদেনের যার ফলে এটি নেই হয় নিজের মূল্যনির্ধারণ পদ্ধতি"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,সিকিউরিটিজ এবং আমানত
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","মূল্যনির্ধারণ পদ্ধতি পরিবর্তন করা যাবে না, যেহেতু কিছু আইটেম বিরুদ্ধে লেনদেনের যার ফলে এটি নেই হয় নিজের মূল্যনির্ধারণ পদ্ধতি"
 DocType: Student Report Generation Tool,Attended by Parents,মাতাপিতা দ্বারা গৃহীত
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Patient,AB Positive,এবি ইতিবাচক
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,উপস্থিতি দলিল.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড ভিত্তিক মাইনে জন্য বেতন কম্পোনেন্ট.
 DocType: Sales Order Item,Used for Production Plan,উৎপাদন পরিকল্পনা জন্য ব্যবহৃত
-DocType: Employee Loan,Total Payment,মোট পরিশোধ
+DocType: Loan,Total Payment,মোট পরিশোধ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,সম্পূর্ণ ওয়ার্ক অর্ডারের জন্য লেনদেন বাতিল করা যাবে না
 DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনিট) অপারেশনস মধ্যে সময়
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} বাতিল করা হয়েছে, যাতে কর্ম সম্পন্ন করা যাবে না"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,পর্যাপ্ত যন্ত্রাংশ তৈরি করুন
 DocType: POS Profile User,POS Profile User,পিওএস প্রোফাইল ব্যবহারকারী
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,সরাসরি আয়
+DocType: Subscription Invoice,Subscription Invoice,সাবস্ক্রিপশন ইনভয়েস
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,সরাসরি আয়
 DocType: Patient Appointment,Date TIme,তারিখ সময়
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,প্রশাসনিক কর্মকর্তা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,প্রশাসনিক কর্মকর্তা
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,কোম্পানী এবং ট্যাক্স সেট আপ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,দয়া করে কোর্সের নির্বাচন
 DocType: Codification Table,Codification Table,সংশোধনী সারণি
 DocType: Timesheet Detail,Hrs,ঘন্টা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Stock Entry Detail,Difference Account,পার্থক্য অ্যাকাউন্ট
 DocType: Purchase Invoice,Supplier GSTIN,সরবরাহকারী GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,ক্যাশ ফ্লো ম্যাপিং টেমপ্লেট
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
+DocType: Bank Guarantee,Providing,প্রদান
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","অনুমতি নেই, প্রয়োজনে ল্যাব টেস্ট টেমপ্লেট কনফিগার করুন"
 DocType: Patient,Risk Factors,ঝুঁকির কারণ
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
 DocType: Healthcare Settings,Appointment Confirmation,নিয়োগের নিশ্চয়তা
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,হ্যালো
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,আইটেম সরান
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","ইতিমধ্যে ব্যবহারকারীর {1} জন্য পজ প্রোফাইল {0} ডিফল্ট সেট করেছে, দয়া করে প্রতিবন্ধী ডিফল্ট অক্ষম"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,সঞ্চিত মূল্যবোধ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,পিওএস প্রোফাইলে অঞ্চলটি প্রয়োজনীয়
 DocType: Supplier,Prevent RFQs,RFQs রোধ করুন
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} থেকে {1} পর্যায়কালের জন্য বেতন স্লিপ জমা
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} থেকে {1} পর্যায়কালের জন্য বেতন স্লিপ জমা
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,শপিং বিল ডেট
 DocType: Production Plan,Production Plan,উৎপাদন পরিকল্পনা
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ইনভয়েস ক্রিয়েশন টুল খুলছে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,সেলস প্রত্যাবর্তন
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,দ্রষ্টব্য: মোট বরাদ্দ পাতা {0} ইতিমধ্যে অনুমোদন পাতার চেয়ে কম হওয়া উচিত নয় {1} সময়ের জন্য
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,সিরিয়াল কোন ইনপুটের উপর ভিত্তি করে লেনদেনের পরিমাণ নির্ধারণ করুন
 ,Total Stock Summary,মোট শেয়ার সারাংশ
 DocType: Announcement,Posted By,কারো দ্বারা কোন কিছু ডাকঘরে পাঠানো
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,কোম্পানির সেট করুন
 DocType: Share Balance,Share Balance,ভাগ ব্যালেন্স
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Training Result Employee,Training Result Employee,প্রশিক্ষণ ফল কর্মচারী
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
-DocType: Repayment Schedule,Principal Amount,প্রধান পরিমাণ
-DocType: Employee Loan Application,Total Payable Interest,মোট প্রদেয় সুদের
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,প্রধান পরিমাণ
+DocType: Loan Application,Total Payable Interest,মোট প্রদেয় সুদের
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},মোট অসামান্য: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,সেলস চালান শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
 DocType: Restaurant Reservation,Restaurant Reservation,রেস্টুরেন্ট রিজার্ভেশন
 DocType: Land Unit,Land Unit Name,জমি ইউনিট নাম
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,প্রস্তাবনা লিখন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,প্রস্তাবনা লিখন
 DocType: Payment Entry Deduction,Payment Entry Deduction,পেমেন্ট এণ্ট্রি সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,মোড়ক উম্মচন
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ইমেল মাধ্যমে গ্রাহকদের বিজ্ঞপ্তি
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ইমেল মাধ্যমে গ্রাহকদের বিজ্ঞপ্তি
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,অন্য বিক্রয় ব্যক্তি {0} একই কর্মচারী আইডি দিয়ে বিদ্যমান
 DocType: Employee Advance,Claimed Amount,দাবি করা পরিমাণ
 apps/erpnext/erpnext/config/education.py +180,Masters,মাস্টার্স
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","পেমেন্ট গেটওয়ে অ্যাকাউন্ট আমি ক্রীড়াচ্ছলে সৃষ্টি করিনি, এক ম্যানুয়ালি তৈরি করুন."
 DocType: Supplier Scorecard,Per Year,প্রতি বছরে
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB অনুযায়ী এই প্রোগ্রামে ভর্তির জন্য যোগ্য নয়
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Sales Invoice,Sales Taxes and Charges,বিক্রয় করের ও চার্জ
 DocType: Employee,Organization Profile,সংস্থার প্রোফাইল
 DocType: Vital Signs,Height (In Meter),উচ্চতা (মিটার)
 DocType: Student,Sibling Details,সহোদর বিস্তারিত
 DocType: Vehicle Service,Vehicle Service,যানবাহন পরিষেবা
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,স্বয়ংক্রিয়ভাবে প্রতিক্রিয়া অবস্থার উপর ভিত্তি করে অনুরোধ আরম্ভ করে.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,স্বয়ংক্রিয়ভাবে প্রতিক্রিয়া অবস্থার উপর ভিত্তি করে অনুরোধ আরম্ভ করে.
 DocType: Employee,Reason for Resignation,পদত্যাগ করার কারণ
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,কর্মক্ষমতা মূল্যায়ন জন্য টেমপ্লেট.
 DocType: Sales Invoice,Credit Note Issued,ক্রেডিট নোট ইস্যু
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,কর্মচারী ঋণ ব্যবস্থাপনা
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 সাথে সর্ম্পক
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ম্যানেজার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,ম্যানেজার
 DocType: Payment Entry,Payment From / To,পেমেন্ট থেকে / প্রতি
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},গুদামে অ্যাকাউন্ট সেট করুন {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,উপাদান স্থানান্তর
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,জন্য পথ খুঁজে পাওয়া যায়নি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),খোলা (ড)
+DocType: Loan,Applicant,আবেদক
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},পোস্ট টাইমস্ট্যাম্প পরে হবে {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,পুনরাবৃত্তি নথি তৈরি করতে
 ,GST Itemised Purchase Register,GST আইটেমাইজড ক্রয় নিবন্ধন
 DocType: Course Scheduling Tool,Reschedule,পুনরায় সঞ্চালনের জন্য নির্ধারণ
-DocType: Employee Loan,Total Interest Payable,প্রদেয় মোট সুদ
+DocType: Loan,Total Interest Payable,প্রদেয় মোট সুদ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ল্যান্ড খরচ কর ও শুল্ক
 DocType: Work Order Operation,Actual Start Time,প্রকৃত আরম্ভের সময়
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,শেষ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,ভিত্তি
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,ভিত্তি
 DocType: Timesheet,Total Billed Hours,মোট বিল ঘন্টা
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,পরিমাণ বন্ধ লিখুন
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,পরিমাণ বন্ধ লিখুন
 DocType: Leave Block List Allow,Allow User,অনুমতি
 DocType: Journal Entry,Bill No,বিল কোন
 DocType: Company,Gain/Loss Account on Asset Disposal,অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির হিসাব
 DocType: Vehicle Log,Service Details,পরিষেবা বিশদ
-DocType: Subscription,Quarterly,ত্রৈমাসিক
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,গোষ্ঠীবদ্ধ
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,টাইম শিট
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush কাঁচামালের ভিত্তিতে
 DocType: Sales Invoice,Port Code,পোর্ট কোড
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,রিজার্ভ গুদামে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,রিজার্ভ গুদামে
 DocType: Lead,Lead is an Organization,লিড একটি সংস্থা
 DocType: Guardian Interest,Interest,স্বার্থ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,প্রাক সেলস
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,অ্যাকাউন্ট
 DocType: Vehicle,Odometer Value (Last),দূরত্বমাপণী মূল্য (শেষ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,সরবরাহকারী স্কোরকার্ড মাপদণ্ডের টেমপ্লেট।
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,মার্কেটিং
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,মার্কেটিং
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
 DocType: Request for Quotation,Get Suppliers,সরবরাহকারীরা পান
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,প্রি বেতন স্লিপ
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,প্রি বেতন স্লিপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,আপনার সদস্যপদ 30 দিনের মধ্যে মেয়াদ শেষ হয়ে গেলে আপনি শুধুমাত্র নবায়ন করতে পারেন
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,যদি আপনি সেটআপ ক্যাশ ফ্লো ম্যাপার ডকুমেন্টগুলি নির্বাচন করেন তবে কেবল নির্বাচন করুন
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Supplier Scorecard,Per Week,প্রতি সপ্তাহে
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,মোট ছাত্র
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],ফিসার ডেস ইকরিটেস কমপ্যাটবলস [এফকে]
 DocType: Journal Entry,Credit Card Entry,ক্রেডিট কার্ড এন্ট্রি
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,কোম্পানি অ্যান্ড অ্যাকাউন্টস
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,মান
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,মান
 DocType: Asset Settings,Depreciation Options,হ্রাস বিকল্প
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,অবৈধ পোস্টিং সময়
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,অবৈধ পোস্টিং সময়
 DocType: Lead,Campaign Name,প্রচারাভিযান নাম
 DocType: Hotel Room,Capacity,ধারণক্ষমতা
 DocType: Selling Settings,Close Opportunity After Days,বন্ধ সুযোগ দিন পরে
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,গ্রাহকের ক্রয় আদেশ কোন
 DocType: Budget,Budget Against,বাজেট বিরুদ্ধে
 DocType: Employee,Cell Number,মোবাইল নম্বর
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,প্রদত্ত মানদণ্ডের জন্য কোনও কর্মচারী নেই। পরীক্ষা করুন যে বেতন স্লিপগুলি ইতিমধ্যে তৈরি করা হয়নি।
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,প্রদত্ত মানদণ্ডের জন্য কোনও কর্মচারী নেই। পরীক্ষা করুন যে বেতন স্লিপগুলি ইতিমধ্যে তৈরি করা হয়নি।
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,একটি টেবিল নির্বাচন করুন
 DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;প্রাপকদের&#39; একটি অবৈধ ইমেল ঠিকানা
 DocType: Special Test Items,Particulars,বিবরণ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 DocType: Student,A+,একটি A
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","একাধিক দাম বিধি একই মানদণ্ড সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ করে সংঘাত সমাধান করুন. দাম নিয়মাবলী: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Asset,Maintenance,রক্ষণাবেক্ষণ
+DocType: Subscriber,Subscriber,গ্রাহক
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,দয়া করে আপনার প্রকল্প স্থিতি আপডেট করুন
 DocType: Item,Maximum sample quantity that can be retained,সর্বাধিক নমুনা পরিমাণ যা বজায় রাখা যায়
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,শপিং কার্ট জন্য ডিফল্ট সেটিংস
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Timeslots যোগ করুন
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},অ্যাসেট জার্নাল এন্ট্রি মাধ্যমে বাতিল {0}
-DocType: Employee Loan,Interest Income Account,সুদ আয় অ্যাকাউন্ট
+DocType: Loan,Interest Income Account,সুদ আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,পর্যালোচনা আমন্ত্রণ প্রেরিত
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,বায়োটেকনোলজি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,অফিস রক্ষণাবেক্ষণ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,অফিস রক্ষণাবেক্ষণ খরচ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,যাও
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ইমেইল অ্যাকাউন্ট সেট আপ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Asset Repair,Downtime,ডাউনটাইম
 DocType: Account,Liability,দায়
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,একাডেমিক টার্ম:
 DocType: Salary Detail,Do not include in total,মোট অন্তর্ভুক্ত করবেন না
 DocType: Company,Default Cost of Goods Sold Account,জিনিষপত্র বিক্রি অ্যাকাউন্ট ডিফল্ট খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},নমুনা পরিমাণ {0} প্রাপ্ত পরিমাণের চেয়ে বেশি হতে পারে না {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,মূল্যতালিকা নির্বাচিত না
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Request for Quotation Supplier,Send Email,বার্তা পাঠাও
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 DocType: Item,Max Sample Quantity,সর্বোচ্চ নমুনা পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,অনুমতি নেই
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,অনুমতি নেই
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,উদ্ধৃতি অনুরোধ
 DocType: Vital Signs,Heart Rate / Pulse,হার্ট রেট / পালস
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,উচ্চ গুরুত্ব দিয়ে চলছে উচ্চ দেখানো হবে
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ল্যাব টেস্ট এবং গুরুত্বপূর্ণ চিহ্ন
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ব্যাংক পুনর্মিলন বিস্তারিত
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,কোন কর্মচারী পাওয়া
-DocType: Subscription,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,প্রকল্প আপডেট
 DocType: SMS Center,All Customer Contact,সব গ্রাহকের যোগাযোগ
 DocType: Land Unit,Tree Details,বৃক্ষ বিস্তারিত
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,সকল আইটেম গ্রুপ
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Work Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",সংরক্ষণ করার পরে যদি নির্বাচিত ঠিকানাটি সম্পাদনা করা হয় তবে নির্বাচন বাতিল করুন
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Item,Hub Publishing Details,হাব প্রকাশনা বিবরণ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',' শুরু'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',' শুরু'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
 DocType: Lab Test Template,Result Format,ফলাফল ফরম্যাট
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,দ্বিমাসিক
 DocType: Vehicle Service,Brake Pad,ব্রেক প্যাড
 DocType: Fertilizer,Fertilizer Contents,সার সার্টিফিকেট
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,গবেষণা ও উন্নয়ন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,গবেষণা ও উন্নয়ন
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,বিল পরিমাণ
 DocType: Company,Registration Details,রেজিস্ট্রেশন বিস্তারিত
 DocType: Timesheet,Total Billed Amount,মোট বিল পরিমাণ
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,সেলস অর্ডার এ ক্রেডিট সীমা চেক বাইপাস
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,কর্মক্ষমতা মূল্যায়ন.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","সক্ষম করা হলে, &#39;শপিং কার্ট জন্য প্রদর্শন করো&#39; এ শপিং কার্ট যেমন সক্রিয় করা হয় এবং শপিং কার্ট জন্য অন্তত একটি ট্যাক্স নিয়ম আছে উচিত"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","পেমেন্ট এণ্ট্রি {0} অর্ডার {1}, চেক যদি এটা এই চালান অগ্রিম হিসেবে টানা করা উচিত বিরুদ্ধে সংযুক্ত করা হয়."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","পেমেন্ট এণ্ট্রি {0} অর্ডার {1}, চেক যদি এটা এই চালান অগ্রিম হিসেবে টানা করা উচিত বিরুদ্ধে সংযুক্ত করা হয়."
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,বিক্রয় বিন্দু
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,ন্যূনতম আসন
 DocType: Item Attribute,Item Attribute Values,আইটেম বৈশিষ্ট্য মূল্যবোধ
 DocType: Examination Result,Examination Result,পরীক্ষার ফলাফল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,কেনার রশিদ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},রেফারেন্স DOCTYPE এক হতে হবে {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Work Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,স্থানান্তর জন্য কোন আইটেম উপলব্ধ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,স্থানান্তর জন্য কোন আইটেম উপলব্ধ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),বন্ধ (খোলা + মোট)
 DocType: Journal Entry,Depreciation Entry,অবচয় এণ্ট্রি
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
 DocType: Crop Cycle,ISO 8016 standard,আইএসও 8016 স্ট্যান্ডার্ড
 DocType: Pricing Rule,Rate or Discount,রেট বা ডিসকাউন্ট
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,প্রয়োজনীয় Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,প্রিয়
 DocType: Hub Settings,Custom Data,কাস্টম ডেটা
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,মেডিকেল কোড স্ট্যান্ডার্ড
 DocType: Soil Texture,Clay Composition (%),ক্লে গঠন (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,টাস্ক নির্ধারণের আগে সংরক্ষণ করুন
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ব্যালেন্স মূল্য
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ব্যালেন্স মূল্য
 DocType: Lab Test,Lab Technician,ল্যাব কারিগর
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,বিক্রয় মূল্য তালিকা
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,বিক্রয় মূল্য তালিকা
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","যদি চেক করা হয়, একটি গ্রাহক তৈরি করা হবে, রোগীর কাছে ম্যাপ করা হবে এই গ্রাহকের বিরুদ্ধে রোগীর ইনভয়েসিস তৈরি করা হবে। আপনি পেশেন্ট তৈরির সময় বিদ্যমান গ্রাহক নির্বাচন করতে পারেন।"
 DocType: Bank Reconciliation,Account Currency,অ্যাকাউন্ট মুদ্রা
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,কোম্পানি এ সুসম্পন্ন অ্যাকাউন্ট উল্লেখ করতে হবে
 DocType: Purchase Receipt,Range,পরিসর
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
 DocType: Item Barcode,Item Barcode,আইটেম বারকোড
 DocType: Woocommerce Settings,Endpoints,এন্ডপয়েন্ট
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","উত্পন্ন করা হবে বিলম্বিত হলে, আপনাকে এই &quot;মাস মাসের পুনরাবৃত্তি&quot; ক্ষেত্রটিকে ম্যানুয়ালি পরিবর্তন করতে হবে"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
 DocType: Share Transfer,From Folio No,ফোলিও নং থেকে
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,উপলভ্য-ব্যবহারের তারিখ
 DocType: Guardian,Guardian Name,অভিভাবকের নাম
 DocType: Cheque Print Template,Has Print Format,প্রিন্ট ফরম্যাট রয়েছে
-DocType: Employee Loan,Sanctioned,অনুমোদিত
+DocType: Loan,Sanctioned,অনুমোদিত
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ড এজন্য তৈরি করা হয়নি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 DocType: Crop Cycle,Crop Cycle,ফসল চক্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
 DocType: Student Admission,Publish on website,ওয়েবসাইটে প্রকাশ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,সরবরাহকারী চালান তারিখ পোস্টিং তারিখ তার চেয়ে অনেক বেশী হতে পারে না
+DocType: Subscription,Cancelation Date,বাতিলকরণ তারিখ
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
 DocType: Agriculture Task,Agriculture Task,কৃষি কাজ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,পরোক্ষ আয়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,পরোক্ষ আয়
 DocType: Student Attendance Tool,Student Attendance Tool,ছাত্র এ্যাটেনডেন্স টুল
 DocType: Restaurant Menu,Price List (Auto created),মূল্য তালিকা (অটো তৈরি)
 DocType: Cheque Print Template,Date Settings,তারিখ সেটিং
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,মিটার
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ল্যাব টেস্টিং ডেটটাইম সংগ্রহের সময়কালের আগে হতে পারে না
+DocType: Subscription Plan,Cost,মূল্য
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
 DocType: Expense Claim,Total Advance Amount,মোট অগ্রিম পরিমাণ
 DocType: Delivery Stop,Estimated Arrival,আনুমানিক আগমন
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
 DocType: Timesheet Detail,Bill,বিল
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,সাদা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,সাদা
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,চেক বাক্সগুলির তালিকা থেকে আপনি কেবলমাত্র একাধিক বিকল্প নির্বাচন করতে পারেন।
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
 DocType: Item,Automatically Create New Batch,নিউ ব্যাচ স্বয়ংক্রিয়ভাবে তৈরি করুন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} থেকে {1} (সারি {2}) নিযুক্ত করা হচ্ছে
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,করা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} থেকে {1} (সারি {2}) নিযুক্ত করা হচ্ছে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,করা
 DocType: Student Admission,Admission Start Date,ভর্তি শুরুর তারিখ
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,নতুন কর্মচারী
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
 DocType: Repayment Schedule,Balance Loan Amount,ব্যালেন্স ঋণের পরিমাণ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,সূচি কোর্স
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,বিকল্প তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,বিকল্প তহবিল
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,ক্রয় আদেশে শেষ কেনাকাটা আনা অক্ষম করুন
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লিপ আইটেম
 DocType: Purchase Invoice,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},উল্লেখ করুন একটি {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,বৈকল্পিক সৃষ্টি সারি করা হয়েছে।
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} এর জন্য কাজ সারাংশ
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,তালিকায় প্রথম ত্যাগ গ্রহনকারীকে ডিফল্ট রও অ্যাপারওর হিসাবে সেট করা হবে।
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Plan,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} নেতিবাচক হতে পারে না
 DocType: Training Event,Self-Study,নিজ পাঠ
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,মজুরি
 DocType: Asset Maintenance,Maintenance Manager Name,রক্ষণাবেক্ষণ ম্যানেজার নাম
 DocType: Agriculture Task,Urgent,জরুরী
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},টেবিলের সারি {0} জন্য একটি বৈধ সারি আইডি উল্লেখ করুন {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},টেবিলের সারি {0} জন্য একটি বৈধ সারি আইডি উল্লেখ করুন {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,পরিবর্তনশীল খুঁজে পাওয়া যায়নি:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,নমপ্যাড থেকে সম্পাদনা করার জন্য দয়া করে একটি ক্ষেত্র নির্বাচন করুন
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,স্টক লেজার তৈরি করা হয়েছে হিসাবে একটি নির্দিষ্ট সম্পদ আইটেম হতে পারে না।
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,গুণ পরিদর্শন টেমপ্লেট নাম
 DocType: Project,First Email,প্রথম ইমেল
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,বিক্রয় আদেশ / সমাপ্ত পণ্য গুদাম সংরক্ষিত ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,বিক্রয় পরিমাণ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,বিক্রয় পরিমাণ
 DocType: Repayment Schedule,Interest Amount,সুদের পরিমাণ
 DocType: Serial No,Creation Document No,ক্রিয়েশন ডকুমেন্ট
 DocType: Share Transfer,Issue,ইস্যু
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 ,Projected Quantity as Source,উত্স হিসাবে অভিক্ষিপ্ত পরিমাণ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ডেলিভারি ট্রিপ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ডেলিভারি ট্রিপ
 DocType: Student,A-,এ-
 DocType: Share Transfer,Transfer Type,স্থানান্তর প্রকার
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,সেলস খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,সেলস খরচ
 DocType: Consultation,Diagnosis,রোগ নির্ণয়
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,জিপ কোড
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ঋণের সুদ আয় অ্যাকাউন্ট নির্বাচন করুন {0}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
 DocType: Item,Default Supplier,ডিফল্ট সরবরাহকারী
 DocType: Manufacturing Settings,Over Production Allowance Percentage,উত্পাদনের ভাতা শতকরা ওভার
-DocType: Employee Loan,Repayment Schedule,ঋণ পরিশোধের সময় নির্ধারণ
+DocType: Loan,Repayment Schedule,ঋণ পরিশোধের সময় নির্ধারণ
 DocType: Shipping Rule Condition,Shipping Rule Condition,শিপিং রুল অবস্থা
 DocType: Holiday List,Get Weekly Off Dates,সাপ্তাহিক ছুটি তারিখগুলি করুন
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,শেষ তারিখ জন্ম কম হতে পারে না
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,গড় বয়স
 DocType: Education Settings,Attendance Freeze Date,এ্যাটেনডেন্স ফ্রিজ তারিখ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,সকল পণ্য দেখুন
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,সকল পণ্য দেখুন
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),নূন্যতম লিড বয়স (দিন)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,সকল BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},হোটেলের রুম {0} {1} এ অনুপলব্ধ
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,কর্মী থেকে
 DocType: Driver,Cellphone Number,মোবাইল নম্বর
 DocType: Project,Monitor Progress,মনিটর অগ্রগতি
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
 DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ট্রি করতে
+DocType: Supplier Quotation,Auto Repeat Section,অটো পুনরাবৃত্তি বিভাগ
 DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি
 DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন
 DocType: Program Enrollment,Transportation,পরিবহন
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
+DocType: Department Approver,Department Approver,ডিপার্টমেন্ট অফার
 DocType: SMS Center,Total Characters,মোট অক্ষর
 DocType: Employee Advance,Claimed,দাবি করা
 DocType: Crop,Row Spacing,সারি ব্যবধান
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,পেমেন্ট রিকনসিলিয়েশন চালান
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,অবদান%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ক্রয় সেটিংস অনুযায়ী যদি ক্রয় আদেশ প্রয়োজনীয় == &#39;হ্যাঁ, তারপর ক্রয় চালান তৈরি করার জন্য, ব্যবহারকারী আইটেমের জন্য প্রথম ক্রয় অর্ডার তৈরি করতে হবে {0}"
+,HSN-wise-summary of outward supplies,এইচএসএন-ভিত্তিক বাহ্যিক সরবরাহের সারসংক্ষেপ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,আপনার অবগতির জন্য কোম্পানি রেজিস্ট্রেশন নম্বর. ট্যাক্স নম্বর ইত্যাদি
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,কর্ম নাম
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,শুরুর বছর
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN প্রথম 2 সংখ্যার রাজ্য নম্বর দিয়ে সুসংগত হওয়া আবশ্যক {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / এলসি
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / এলসি
 DocType: Purchase Invoice,Start date of current invoice's period,বর্তমান চালান এর সময়সীমার তারিখ শুরু
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,সৃষ্টির সময় ক্ষেত্রগুলি শুধুমাত্র কপি করা হবে।
 DocType: Setup Progress Action,Domains,ডোমেইন
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ম্যানেজমেন্ট
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,ম্যানেজমেন্ট
 DocType: Cheque Print Template,Payer Settings,প্রদায়ক সেটিংস
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
 DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,সতর্কতা
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',শুরু দিনটি টাস্কের শেষ দিনের চেয়ে বড় &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,রিটার্ন / ডেবিট নোট
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,রিটার্ন / ডেবিট নোট
 DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} আইটেম জন্য বৈধ সিরিয়াল আমরা {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,আইটেম কোড সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,আইটেম কোড সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ব্যাচ নম্বর পেতে আইটেম কোড লিখুন দয়া করে
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
-DocType: Employee Loan,Partially Disbursed,আংশিকভাবে বিতরণ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,তথ্য মঞ্জুর
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,তথ্য মঞ্জুর
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,সরবরাহকারী ডাটাবেস.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,আপনি সাবস্ক্রিপশনটি বাতিল না করা পুনরায় শুরু করতে পারবেন না
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
 DocType: Fee Validity,Valid Till,বৈধ পর্যন্ত
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,মোট মাতাপিতা শিক্ষক সভা
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,নির্বাচিত গ্রাহকের জন্য গ্রাহক গোষ্ঠী পরিবর্তিত হচ্ছে না।
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,আনুমানিক আগমনের সময়গুলি আপডেট করা হচ্ছে
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,আনুমানিক আগমনের সময়গুলি আপডেট করা হচ্ছে
 DocType: Program Enrollment Tool,Enrollment Details,নামকরণ বিবরণ
 DocType: Purchase Invoice Item,Net Rate,নিট হার
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,একটি গ্রাহক নির্বাচন করুন
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Purchase Order,Group same items,গ্রুপ একই আইটেম
 DocType: Purchase Invoice,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
-DocType: Employee Loan Application,Repayment Info,ঋণ পরিশোধের তথ্য
+DocType: Department,Parent Department,পিতামাতা বিভাগ
+DocType: Loan Application,Repayment Info,ঋণ পরিশোধের তথ্য
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
 DocType: Maintenance Team Member,Maintenance Role,রক্ষণাবেক্ষণ ভূমিকা
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,এমপ্লয়িজ স্থাপনের
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,হোটেল রিজার্ভেশন ইউজার
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Student,O-,o-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,গবেষণা
+DocType: Subscription Settings,Subscription Settings,সাবস্ক্রিপশন সেটিংস
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,গবেষণা
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Announcement,All Students,সকল শিক্ষার্থীরা
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Crop Cycle,Less than a year,এক বছরেরও কম
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,শিক্ষার্থীর মোবাইল নং
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 DocType: Crop,Yield UOM,ফলন
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
 DocType: Item,Is Item from Hub,হাব থেকে আইটেম
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,সারি {0}: কার্যকলাপ প্রকার বাধ্যতামূলক.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,লভ্যাংশ দেওয়া
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,লভ্যাংশ দেওয়া
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,অ্যাকাউন্টিং লেজার
 DocType: Stock Reconciliation,Difference Amount,পার্থক্য পরিমাণ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ডঃ {0} ছেড়ে চলে গেছেন {1}
 DocType: Purchase Invoice,Reverse Charge,বিপরীত চার্জ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ধরে রাখা উপার্জন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ধরে রাখা উপার্জন
 DocType: Purchase Invoice,05-Change in POS,05-পিওএস মধ্যে পরিবর্তন
 DocType: Vehicle Log,Service Detail,পরিষেবা বিস্তারিত
 DocType: BOM,Item Description,পন্নের বর্ণনা
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,সুযোগ আইটেম
 ,Student and Guardian Contact Details,ছাত্র এবং গার্ডিয়ান যোগাযোগের তথ্য
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,সারি {0}: সরবরাহকারী জন্য {0} ইমেল ঠিকানা ইমেল পাঠাতে প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,অস্থায়ী খোলা
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,অস্থায়ী খোলা
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,দেখুন হাব
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 DocType: Patient Appointment,More Info,অধিক তথ্য
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},মূল্যনির্ধারণ হার সারিতে আইটেম জন্য প্রয়োজনীয় {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},মূল্যনির্ধারণ হার সারিতে আইটেম জন্য প্রয়োজনীয় {0}
 DocType: Supplier Scorecard,Scorecard Actions,স্কোরকার্ড অ্যাকশনগুলি
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,উদাহরণ: কম্পিউটার বিজ্ঞানে মাস্টার্স
 DocType: Purchase Invoice,Rejected Warehouse,পরিত্যক্ত গুদাম
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,থেকে
 DocType: Supplier Quotation Item,Lead Time in days,দিন সময় লিড
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,অ্যাকাউন্ট প্রদেয় সংক্ষিপ্ত
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} থেকে বেতন পরিশোধ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} থেকে বেতন পরিশোধ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ল্যাব টেস্ট প্রেসক্রিপশন
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ছোট
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ছোট
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,চালান ইনভয়েস ক্রিয়েশন টুল আইটেম
 DocType: Education Settings,Employee Number,চাকুরিজীবী সংখ্যা
+DocType: Subscription Settings,Cancel Invoice After Grace Period,গ্রেস পিরিয়ড পরে চালান বাতিল করুন
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
 DocType: Project,% Completed,% সম্পন্ন হয়েছে
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ল্যাবরেটরি টেস্টিং ডেটটাইম
 DocType: Email Digest,Add Quote,উক্তি করো
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,পরোক্ষ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 DocType: Agriculture Analysis Criteria,Agriculture,কৃষি
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,সিঙ্ক মাস্টার ডেটা
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ক্যাপিটাল উপকরণ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,প্রথম আইটেম কোড প্রথম সেট করুন
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
+DocType: Subscription Plan,Billing Interval Count,বিলিং বিরতি গণনা
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 DocType: Antibiotic,Antibiotic,জীবাণু-প্রতিরোধী
 ,Team Updates,টিম আপডেট
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,প্রিন্ট বিন্যাস তৈরি করুন
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,পিওএস আইটেম গ্রুপ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,বিকল্প আইটেম আইটেম কোড হিসাবে একই হতে হবে না
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 আঞ্চলিক মূল্যায়নের চূড়ান্তকরণ
 DocType: Salary Slip,Bank Account No.,ব্যাংক একাউন্ট নং
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,ওয়ার্কস্টেশন
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,উদ্ধৃতি সরবরাহকারী জন্য অনুরোধ
 DocType: Healthcare Settings,Registration Message,নিবন্ধন বার্তা
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,হার্ডওয়্যারের
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,হার্ডওয়্যারের
 DocType: Prescription Dosage,Prescription Dosage,প্রেসক্রিপশন ডোজ
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,একটি কোম্পানি নির্বাচন করুন
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,শুরু এবং তারিখগুলি End
 ,Delivered Items To Be Billed,বিতরণ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ওপেন BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
 DocType: Project Update,Great/Quickly,গ্রেট / দ্রুত
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,ইএমপি /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,শ্রেণীবদ্ধ আইটেমের জন্য ব্যাচ দয়া করে নির্বাচন করুন
 DocType: Asset,Depreciation Schedules,অবচয় সূচী
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,জিএসটি সেটিংসে নিম্নলিখিত অ্যাকাউন্টগুলি নির্বাচন করা যেতে পারে:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,জিএসটি সেটিংসে নিম্নলিখিত অ্যাকাউন্টগুলি নির্বাচন করা যেতে পারে:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
 DocType: Payment Request,Transaction Currency,লেনদেন মুদ্রা
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},থেকে {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,গড় দৈনিক আউটগোয়িং
 DocType: POS Profile,Campaign,প্রচারাভিযান
 DocType: Supplier,Name and Type,নাম এবং টাইপ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
 DocType: Physician,Contacts and Address,পরিচিতি এবং ঠিকানা
 DocType: Purchase Invoice,Contact Person,ব্যক্তি যোগাযোগ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,যোগ্যতা এবং বিবরণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
 apps/erpnext/erpnext/config/support.py +17,Communication log.,যোগাযোগ লগ ইন করুন.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",উদ্ধৃতি জন্য অনুরোধ আরো চেক পোর্টাল সেটিংস জন্য পোর্টাল থেকে অ্যাক্সেস করতে অক্ষম হয়.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,সরবরাহকারী স্কোরকার্ড ভেরিয়েবল স্কোরিং
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,রাজধানীতে পরিমাণ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,রাজধানীতে পরিমাণ
 DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা নাম
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,কোর্স সময়সূচী তৈরি ত্রুটি ছিল
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,তালিকার প্রথম ব্যয় নির্ধারণকারীকে ডিফল্ট ব্যয়ের ব্যয় হিসাবে নির্ধারণ করা হবে।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,প্যাকেজ কোড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,শিক্ষানবিস
 DocType: Purchase Invoice,Company GSTIN,কোম্পানির GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",পংক্তিরূপে উল্লিখিত হয় আইটেমটি মাস্টার থেকে সংগৃহীত এবং এই ক্ষেত্রের মধ্যে সংরক্ষিত ট্যাক্স বিস্তারিত টেবিল. কর ও চার্জের জন্য ব্যবহৃত
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্ট নিথর হয় তাহলে, এন্ট্রি সীমিত ব্যবহারকারীদের অনুমতি দেওয়া হয়."
 DocType: Email Digest,Bank Balance,অধিকোষস্থিতি
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,আবেদন ত্যাগ করুন
 DocType: Job Opening,"Job profile, qualifications required etc.","পেশা প্রফাইল, যোগ্যতা প্রয়োজন ইত্যাদি"
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,সারি {0} এর পেমেন্ট টার্ম সম্ভবত একটি ডুপ্লিকেট।
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),কৃষি (বিটা)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,প্যাকিং স্লিপ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,অফিস ভাড়া
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,অফিস ভাড়া
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
 DocType: Disease,Common Name,সাধারণ নাম
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,আমদানি ব্যর্থ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
 DocType: Vital Signs,Blood Pressure,রক্তচাপ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,বিশ্লেষক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,বিশ্লেষক
 DocType: Item,Inventory,জায়
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,শিক্ষার্থীর গ্রুপ ছাত্ররা জন্য নাম নথিভুক্ত কোর্সের যাচাই
 DocType: Notification Control,Expense Claim Rejected,ব্যয় দাবি প্রত্যাখ্যান
 DocType: Item,Item Attribute,আইটেম বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,সরকার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,সরকার
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ব্যয় দাবি {0} ইতিমধ্যে জন্য যানবাহন লগ বিদ্যমান
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,প্রতিষ্ঠানের নাম
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ঋণ পরিশোধের পরিমাণ প্রবেশ করুন
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ঋণ পরিশোধের পরিমাণ প্রবেশ করুন
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,আইটেম রুপভেদ
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,সেবা
 DocType: HR Settings,Email Salary Slip to Employee,কর্মচারী ইমেল বেতন স্লিপ
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,সম্ভাব্য সরবরাহকারী নির্বাচন
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,সম্ভাব্য সরবরাহকারী নির্বাচন
 DocType: Sales Invoice,Source,উত্স
 DocType: Customer,"Select, to make the customer searchable with these fields",এই ক্ষেত্রগুলির সাথে গ্রাহককে অনুসন্ধান করতে নির্বাচন করুন
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,দেখান বন্ধ
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো
 DocType: Program Course,Program Course,প্রোগ্রাম কোর্স
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Homepage,Company Tagline for website homepage,ওয়েবসাইট হোমপেজে জন্য এখানে ক্লিক ট্যাগলাইন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ধরা
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,মেমরিরশিপ বিস্তারিত
 DocType: Leave Block List,Block Holidays on important days.,গুরুত্বপূর্ণ দিন অবরোধ ছুটির দিন.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),সব প্রয়োজনীয় ফলাফল মান (গুলি) ইনপুট করুন
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
-DocType: Employee Loan,Monthly Repayment Amount,মাসিক পরিশোধ পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
+DocType: Loan,Monthly Repayment Amount,মাসিক পরিশোধ পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,খোলা ইনভয়েসাস
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
 DocType: UOM,UOM Name,UOM নাম
 DocType: GST HSN Code,HSN Code,HSN কোড
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,অথর্
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ব্যবহারকারী {0} ইতিমধ্যেই চিকিত্সককে নিযুক্ত করা হয়েছে {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,বক্স
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,সম্ভাব্য সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,সম্ভাব্য সরবরাহকারী
+DocType: Journal Entry,JV-RET-,জেভি-RET-
 DocType: Budget,Monthly Distribution,মাসিক বন্টন
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),স্বাস্থ্যসেবা (বিটা)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
-DocType: Employee Loan,Repayment Method,পরিশোধ পদ্ধতি
+DocType: Loan,Repayment Method,পরিশোধ পদ্ধতি
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","যদি চেক করা, হোম পেজে ওয়েবসাইটের জন্য ডিফল্ট আইটেম গ্রুপ হতে হবে"
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,শংসাপত্র প্রয়োজনীয়
 DocType: Company,Default Holiday List,হলিডে তালিকা ডিফল্ট
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},সারি {0}: থেকে সময় এবং টাইম {1} সঙ্গে ওভারল্যাপিং হয় {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,শেয়ার দায়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,শেয়ার দায়
 DocType: Purchase Invoice,Supplier Warehouse,সরবরাহকারী ওয়্যারহাউস
 DocType: Opportunity,Contact Mobile No,যোগাযোগ মোবাইল নম্বর
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,কোম্পানী নির্বাচন করুন
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,মুদ্রণ অধ্যায়
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ব্যবহারকারী {0} এর কোনো ডিফল্ট POS প্রোফাইল নেই। এই ব্যবহারকারীর জন্য সারি {1} ডিফল্ট চেক করুন
 DocType: Student Group,Set 0 for no limit,কোন সীমা 0 সেট
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,সারি {idx}: {ক্ষেত্র} খুলতে {invoice_type} ইনভয়েসস তৈরি করতে হবে
 DocType: Customer,Primary Address and Contact Detail,প্রাথমিক ঠিকানা এবং যোগাযোগ বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,অন্তত একটি ডোমেন নির্বাচন করুন।
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,অনুসন্ধান আইটেম
 DocType: Payment Schedule,Payment Amount,পরিশোধিত অর্থ
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,শূন্য স্কেল
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ইতিমধ্যে সম্পন্ন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,শেয়ার হাতে
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,শেয়ার হাতে
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,আমদানি সফল!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
 DocType: Customer,Customer POS Id,গ্রাহক পিওএস আইডি
 DocType: Account,Account Name,অ্যাকাউন্ট নাম
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,সিরিয়াল কোন {0} পরিমাণ {1} একটি ভগ্নাংশ হতে পারবেন না
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,সিরিয়াল কোন {0} পরিমাণ {1} একটি ভগ্নাংশ হতে পারবেন না
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,দয়া করে Woocommerce সার্ভার URL প্রবেশ করুন
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 DocType: Share Balance,To No,না
-DocType: Subscription,Reference Document,রেফারেন্স নথি
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা
 DocType: Accounts Settings,Credit Controller,ক্রেডিট কন্ট্রোলার
-DocType: Grant Application,Applicant Type,আবেদনকারী প্রকার
+DocType: Loan,Applicant Type,আবেদনকারী প্রকার
 DocType: Purchase Invoice,03-Deficiency in services,03-সেবা দারিদ্র্য
 DocType: Delivery Note,Vehicle Dispatch Date,যানবাহন ডিসপ্যাচ তারিখ
 DocType: Healthcare Settings,Default Medical Code Standard,ডিফল্ট মেডিকেল কোড স্ট্যান্ডার্ড
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% চালান করা হয়েছে
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,মানব সম্পদ
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,মানব সম্পদ
 DocType: Lead,Upper Income,আপার আয়
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,প্রত্যাখ্যান
 DocType: Journal Entry Account,Debit in Company Currency,কোম্পানি মুদ্রা ডেবিট
 DocType: BOM Item,BOM Item,BOM আইটেম
 DocType: Appraisal,For Employee,কর্মী
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,বিতরণ এণ্ট্রি করুন
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,বিতরণ এণ্ট্রি করুন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
 DocType: Company,Default Values,ডিফল্ট মান
 DocType: Membership,INR,আইএনআর
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),মোট (কর ছাড়)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,লিড কাউন্ট
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 থেকে বেশী হতে হবে"
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,পরিমান মত মজুত আছে
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,পরিমান মত মজুত আছে
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,আসাদন
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,আবশ্যিক ক্ষেত্র - কার্যক্রমের
 DocType: Special Test Template,Result Component,ফলাফল কম্পোনেন্ট
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,পাটা দাবি
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,পাতার হিসাবে পাতার মধ্যে ছুটির অন্তর্ভুক্ত
 DocType: Sales Invoice,Packed Items,বস্তাবন্দী আইটেম
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ক্রমিক নং বিরুদ্ধে পাটা দাবি
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',সর্বমোট
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',সর্বমোট
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,অ্যাকশন নিশ্চিত করুন
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,অনলাইন নিলাম
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,সিদ্ধি
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,কার্ট দেখুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,বিপণন খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,স্ট্যান্ডার্ড মানদণ্ড তৈরি করতে পারবেন না মানদণ্ডের নাম পরিবর্তন করুন
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Material Request,Transferred,স্থানান্তরিত
 DocType: Vehicle,Doors,দরজা
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,রোগীর নিবন্ধন জন্য ফি সংগ্রহ করুন
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,স্টক লেনদেনের পরে বৈশিষ্ট্য পরিবর্তন করা যাবে না। নতুন আইটেম তৈরি করুন এবং নতুন আইটেমের স্টক স্থানান্তর করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,স্টক লেনদেনের পরে বৈশিষ্ট্য পরিবর্তন করা যাবে না। নতুন আইটেম তৈরি করুন এবং নতুন আইটেমের স্টক স্থানান্তর করুন
 DocType: Course Assessment Criteria,Weightage,গুরুত্ব
 DocType: Purchase Invoice,Tax Breakup,ট্যাক্স ছুটি
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,রিকনসিলিয়েশন JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Purchase Invoice Item,Batch No,ব্যাচ নাম্বার
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,কর্মচারী অগ্রিম
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 DocType: Student Group Instructor,Student Group Instructor,শিক্ষার্থীর গ্রুপ প্রশিক্ষক
 DocType: Grant Application,Assessment  Mark (Out of 10),মূল্যায়ন মার্ক (10 এর মধ্যে)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 মোবাইল কোন
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,প্রধান
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Email Digest,Annual Expenses,বার্ষিক খরচ
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
 DocType: Sales Team,Contribution to Net Total,একুন অবদান
 DocType: Sales Invoice Item,Customer's Item Code,গ্রাহকের আইটেম কোড
 DocType: Stock Reconciliation,Stock Reconciliation,শেয়ার রিকনসিলিয়েশন
 DocType: Territory,Territory Name,টেরিটরি নাম
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,আপনি শুধুমাত্র একটি সাবস্ক্রিপশন একই বিলিং চক্র সঙ্গে পরিকল্পনা করতে পারেন
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,একটি কাজের জন্য আবেদনকারী.
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,appraisals
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,প্রশিক্ষণ ইভেন্টস
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,লিড উত্স দ্বারা অগ্রসর হয় ট্র্যাক
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,অনুগ্রহ করে প্রবেশ করুন
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,অনুগ্রহ করে প্রবেশ করুন
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,রক্ষণাবেক্ষণ লগ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,দয়া করে আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),এই প্যাকেজের নিট ওজন. (আইটেম নিট ওজন যোগফল আকারে স্বয়ংক্রিয়ভাবে হিসাব)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,রক্ষা কর এবং বিল থেকে
 DocType: Student Group,Instructors,প্রশিক্ষক
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,ভাগ ব্যবস্থাপনা
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,প্রদান
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","গুদাম {0} কোনো অ্যাকাউন্টে লিঙ্ক করা হয় না, দয়া করে কোম্পানিতে গুদাম রেকর্ডে অ্যাকাউন্ট বা সেট ডিফল্ট জায় অ্যাকাউন্ট উল্লেখ {1}।"
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,আপনার আদেশ পরিচালনা
 DocType: Work Order Operation,Actual Time and Cost,প্রকৃত সময় এবং খরচ
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,শিক্ষার্থীর ছুটি আবেদন
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,উপর
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,বারকোড
 DocType: Hub Category,Hub Node,হাব নোড
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,সহযোগী
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,সহযোগী
 DocType: Asset Movement,Asset Movement,অ্যাসেট আন্দোলন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,কাজের আদেশ {0} জমা দিতে হবে
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,নিউ কার্ট
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,বিলিং মুদ্রা ডিফল্ট কোম্পানির মুদ্রার বা পার্টি অ্যাকাউন্ট মুদ্রার সমান হতে হবে
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 DocType: Soil Texture,Loam,দোআঁশ মাটি
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,সারি {0}: ডেট তারিখ তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,সারি {0}: ডেট তারিখ তারিখ পোস্ট করার আগে হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,পেমেন্ট এন্ট্রি করতে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
 ,Sales Invoice Trends,বিক্রয় চালান প্রবণতা
 DocType: Leave Application,Apply / Approve Leaves,পাতার অনুমোদন / প্রয়োগ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,জন্য
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',বা &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; চার্জ টাইপ শুধুমাত্র যদি সারিতে পাঠাতে পারেন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',বা &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; চার্জ টাইপ শুধুমাত্র যদি সারিতে পাঠাতে পারেন
 DocType: Sales Order Item,Delivery Warehouse,ডেলিভারি ওয়্যারহাউস
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,আর্থিক খরচ কেন্দ্রগুলি বৃক্ষ.
 DocType: Serial No,Delivery Document No,ডেলিভারি ডকুমেন্ট
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,উত্পাদন খরচ উত্পাদন সেটিংস সেট করা হয় না।
 DocType: Student,Student Mobile Number,শিক্ষার্থীর মোবাইল নম্বর
 DocType: Item,Has Variants,ধরন আছে
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} এর চেয়ে বেশি {1} সারিতে আইটেম {0} জন্য ওভারব্রিল করা যাবে না। ওভার-বিলিং করার অনুমতি দেওয়ার জন্য, স্টক সেটিংসে সেট করুন"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} এর চেয়ে বেশি {1} সারিতে আইটেম {0} জন্য ওভারব্রিল করা যাবে না। ওভার-বিলিং করার অনুমতি দেওয়ার জন্য, স্টক সেটিংসে সেট করুন"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,প্রতিক্রিয়া আপডেট করুন
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,প্রোগ্রাম প্রথম নির্বাচন করুন
 DocType: Patient Appointment,Patient Age,রোগীর বয়স
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,প্রকল্প পরিচালনার
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} ইতিমধ্যেই ফিরে এসেছে
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} ইতিমধ্যেই ফিরে এসেছে
 DocType: Supplier,Supplier of Goods or Services.,পণ্য বা সেবার সরবরাহকারী.
 DocType: Budget,Fiscal Year,অর্থবছর
 DocType: Asset Maintenance Log,Planned,পরিকল্পিত
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,পরামর্শদাতা চার্জগুলি বুক করতে রোগীর ক্ষেত্রে সেট না করা হলে ডিফল্ট গ্রহণযোগ্য অ্যাকাউন্টগুলি ব্যবহার করা হবে।
 DocType: Vehicle Log,Fuel Price,জ্বালানীর দাম
+DocType: Bank Guarantee,Margin Money,মার্জিন টাকা
 DocType: Budget,Budget,বাজেট
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,খুলুন সেট করুন
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,অনুসরণ করুন
 DocType: Item,Is Sales Item,সেলস আইটেম
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,আইটেমটি গ্রুপ বৃক্ষ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. আইটেম মাস্টার চেক
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. আইটেম মাস্টার চেক
 DocType: Maintenance Visit,Maintenance Time,রক্ষণাবেক্ষণ সময়
 ,Amount to Deliver,পরিমাণ প্রদান করতে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},একই আইটেম বহুবার প্রবেশ করা হয়েছে। {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শুরুর তারিখ চেয়ে একাডেমিক ইয়ার ইয়ার স্টার্ট তারিখ যা শব্দটি সংযুক্ত করা হয় তার আগে না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,ত্রুটি রয়েছে.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,কর্মচারী {0} ইতিমধ্যে {1} এবং {3} এর মধ্যে {1} জন্য প্রয়োগ করেছেন:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,ত্রুটি রয়েছে.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,কর্মচারী {0} ইতিমধ্যে {1} এবং {3} এর মধ্যে {1} জন্য প্রয়োগ করেছেন:
 DocType: Guardian,Guardian Interests,গার্ডিয়ান রুচি
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
 DocType: Education Settings,Instructor Records to be created by,প্রশিক্ষক রেকর্ডস দ্বারা তৈরি করা হবে
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} তৈরি হয়েছে
 DocType: GST Account,GST Account,জিএসটি অ্যাকাউন্ট
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,প্রিয়তে যোগ করা হয়েছে
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,কোনও বেতন স্লিপ পাওয়া যায় নিচের নির্বাচিত মানদণ্ডের জন্য অথবা ইতিমধ্যে জমা দেওয়া বেতন স্লিপের জন্য
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,কর্তব্য এবং কর
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,কোনও বেতন স্লিপ পাওয়া যায় নিচের নির্বাচিত মানদণ্ডের জন্য অথবা ইতিমধ্যে জমা দেওয়া বেতন স্লিপের জন্য
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,কর্তব্য এবং কর
 DocType: Projects Settings,Projects Settings,প্রকল্প সেটিংস
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,আইটেম গ্রুপ বৃক্ষ.
 DocType: Production Plan,Total Produced Qty,মোট উত্পাদিত পরিমাণ
 DocType: Payroll Entry,Get Employee Details,কর্মচারী বিবরণ পেতে
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
 DocType: Asset,Sold,বিক্রীত
 ,Item-wise Purchase History,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 DocType: Sales Invoice Payment,Base Amount (Company Currency),বেজ পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,কাচামাল
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,কাচামাল
 DocType: Payment Reconciliation Payment,Reference Row,রেফারেন্স সারি
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
 DocType: Sales Invoice,Accounting Details,অ্যাকাউন্টিং এর বর্ণনা
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,এই কোম্পানির জন্য সব লেনদেন মুছে
 DocType: Patient,O Positive,ও ইতিবাচক
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,বিনিয়োগ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,বরাে
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,উপরে টেবিল উপাদান অনুরোধ দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,জার্নাল এন্ট্রি জন্য কোন প্রতিস্থাপনের উপলব্ধ
 DocType: Item Attribute,Attribute Name,নাম গুন
 DocType: BOM,Show In Website,ওয়েবসাইট দেখান
 DocType: Shopping Cart Settings,Show Quantity in Website,ওয়েবসাইট মধ্যে পরিমাণ দেখান
-DocType: Employee Loan Application,Total Payable Amount,মোট প্রদেয় টাকার পরিমাণ
+DocType: Loan Application,Total Payable Amount,মোট প্রদেয় টাকার পরিমাণ
 DocType: Task,Expected Time (in hours),(ঘণ্টায়) প্রত্যাশিত সময়
 DocType: Item Reorder,Check in (group),চেক ইন করুন (গ্রুপ)
 DocType: Soil Texture,Silt,পলি
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,পেমেন্ট করুন
 DocType: Room,Room Name,রুমের নাম
 DocType: Prescription Duration,Prescription Duration,প্রেসক্রিপশন সময়কাল
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে, আগে {0} বাতিল / প্রয়োগ করা যাবে না ছেড়ে {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে, আগে {0} বাতিল / প্রয়োগ করা যাবে না ছেড়ে {1}"
 DocType: Activity Cost,Costing Rate,খোয়াতে হার
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,গ্রাহক ঠিকানা এবং পরিচিতি
 ,Campaign Efficiency,ক্যাম্পেইন দক্ষতা
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,অধ্যায়
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,জুড়ি
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচিত হলে ডিফল্ট অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস ইনভয়েস আপডেট হবে।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
 DocType: Asset,Depreciation Schedule,অবচয় সূচি
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,সেলস অংশীদার ঠিকানা ও যোগাযোগ
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} কোম্পানির মধ্যে ডিফল্ট মূল্য কেন্দ্র সেট করুন।
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে)
 DocType: Soil Texture,Soil Type,মৃত্তিকা টাইপ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,নতুন বার্তা
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless ম্যান্ডেট
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,হাব বিভাগ
 DocType: Purchase Invoice,SEZ,এসইজেড
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
-DocType: Employee Loan,Loan Amount,ঋণের পরিমাণ
+DocType: Loan,Loan Amount,ঋণের পরিমাণ
 DocType: Student Report Generation Tool,Add Letterhead,লেটারহেড যোগ করুন
 DocType: Program Enrollment,Self-Driving Vehicle,স্বচালিত যানবাহন
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,সরবরাহকারী স্কোরকার্ড স্থায়ী
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,অবস্থান
 DocType: Patient,Patient Details,রোগীর বিবরণ
 DocType: Patient,B Positive,বি ইতিবাচক
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 DocType: Patient Medical Record,Patient Medical Record,রোগীর চিকিৎসা রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,স্পোর্টস
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,প্রকৃত মোট
 DocType: Lab Test UOM,Test UOM,পরীক্ষা UOM
 DocType: Student Siblings,Student Siblings,ছাত্র সহোদর
+DocType: Subscription Plan Detail,Subscription Plan Detail,সাবস্ক্রিপশন পরিকল্পনা বিস্তারিত
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,একক
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,কোম্পানি উল্লেখ করুন
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Asset Maintenance Task,Maintenance Task,রক্ষণাবেক্ষণ টাস্ক
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,জিএসটি সেটিংস এ B2C সীমা সেট করুন দয়া করে।
@@ -2516,6 +2525,7 @@
 ,BOM Search,খোঁজো
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),মোট খরচকৃত উপাদান খরচ (স্টক এন্ট্রি মাধ্যমে)
 DocType: Hub Settings,Company Registered,কোম্পানি নিবন্ধিত
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,তারিখ থেকে তারিখ থেকে কম হতে পারে না
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",এই গুদামে পাওয়া স্টকের উপর ভিত্তি করে &quot;স্টক ইন&quot; বা &quot;স্টক ইন নয়&quot; প্রকাশ করুন।
 DocType: Vehicle,Fuel Type,জ্বালানীর ধরণ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ব্যাচ স্টক ব্যালেন্স {0} হয়ে যাবে ঋণাত্মক {1} ওয়্যারহাউস এ আইটেম {2} জন্য {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,উপাদান অনুরোধ নিম্নলিখিত আইটেম এর পুনরায় আদেশ স্তরের উপর ভিত্তি করে স্বয়ংক্রিয়ভাবে উত্থাপিত হয়েছে
 DocType: Email Digest,Pending Sales Orders,সেলস অর্ডার অপেক্ষারত
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
 DocType: Employee,Create User Permission,ব্যবহারকারীর অনুমতি তৈরি করুন
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Healthcare Settings,Remind Before,আগে স্মরণ করিয়ে দিন
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Salary Component,Deduction,সিদ্ধান্তগ্রহণ
 DocType: Item,Retain Sample,নমুনা রাখা
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
 DocType: Stock Reconciliation Item,Amount Difference,পরিমাণ পার্থক্য
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,উৎপাদন
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,হিসাব ব্যাংক ব্যালেন্সের
 DocType: Normal Test Template,Normal Test Template,সাধারণ টেস্ট টেমপ্লেট
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,প্রতিবন্ধী ব্যবহারকারী
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,উদ্ধৃতি
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,কোন উদ্ধৃত কোন প্রাপ্ত RFQ সেট করতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,কোন উদ্ধৃত কোন প্রাপ্ত RFQ সেট করতে পারবেন না
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,অ্যাকাউন্ট মুদ্রার মুদ্রণ করতে একটি অ্যাকাউন্ট নির্বাচন করুন
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,এই রোগীর বিরুদ্ধে লেনদেনের উপর নির্ভর করে। বিস্তারিত জানার জন্য নীচের টাইমলাইনে দেখুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,খরচ আপডেট
 DocType: Patient,Date of Birth,জন্ম তারিখ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,সরবরাহকারী স্কোরকার্ড সেটআপ
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,কাজের বর্ণনা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,কাজের বর্ণনা
 DocType: Student Applicant,Applied,ফলিত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,পুনরায় খুলুন
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,পুনরায় খুলুন
 DocType: Sales Invoice Item,Qty as per Stock UOM,স্টক Qty UOM অনুযায়ী
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 নাম
 DocType: Purchase Invoice,02-Post Sale Discount,02-পোস্ট বিক্রয় ডিসকাউন্ট
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
+DocType: Department Approver,Approver,রাজসাক্ষী
 ,SO Qty,তাই Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,শেয়ারহোল্ডারের জন্য ক্ষেত্র ফাঁকা হতে পারে না
 DocType: Guardian,Work Address,কাজের ঠিকানা
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),সর্বমোট পরিমাণ (কোম্পানি মুদ্রা)
 DocType: Purchase Order Item,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 DocType: BOM,Scrap Material Cost,স্ক্র্যাপ উপাদান খরচ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
 DocType: Grant Application,Email Notification Sent,ইমেল বিজ্ঞপ্তি পাঠানো হয়েছে
 DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","আইটেম কোড, গুদাম, পরিমাণ সারি প্রয়োজন হয়"
-DocType: Pricing Rule,Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","আইটেম কোড, গুদাম, পরিমাণ সারি প্রয়োজন হয়"
+DocType: Bank Guarantee,Supplier,সরবরাহকারী
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,পেমেন্ট বিবরণ দেখান
 DocType: Consultation,Consultation Time,পরামর্শ সময়
 DocType: C-Form,Quarter,সিকি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,বিবিধ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,বিবিধ খরচ
 DocType: Global Defaults,Default Company,ডিফল্ট কোম্পানি
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
 DocType: Payment Request,PR,জনসংযোগ
 DocType: Cheque Print Template,Bank Name,ব্যাংকের নাম
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-সর্বোপরি
-DocType: Employee Loan,Employee Loan Account,কর্মচারী ঋণ অ্যাকাউন্ট
 DocType: Leave Application,Total Leave Days,মোট ছুটি দিন
 DocType: Email Digest,Note: Email will not be sent to disabled users,উল্লেখ্য: এটি ইমেল প্রতিবন্ধী ব্যবহারকারীদের পাঠানো হবে না
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,মিথস্ক্রিয়া সংখ্যা
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ওজন (কিলোগ্রামে)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",অধ্যায়গুলি / অধ্যায়_অন্যান্য পাঠ্য সংরক্ষণের পরে স্বয়ংক্রিয়ভাবে ফাঁকা রাখুন।
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST সেটিংসগুলিতে GST অ্যাকাউন্টগুলি সেট করুন
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST সেটিংসগুলিতে GST অ্যাকাউন্টগুলি সেট করুন
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ব্যবসার ধরন
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,নতুন ক্রয়ের খরচ
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,অনুদান বিবরণ
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
 DocType: Student Guardian,Others,অন্যরা
+DocType: Subscription,Discounts,ডিসকাউন্ট
 DocType: Payment Entry,Unallocated Amount,অব্যবহৃত পরিমাণ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.
 DocType: POS Profile,Taxes and Charges,কর ও শুল্ক
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","একটি পণ্য বা, কেনা বিক্রি বা মজুত রাখা হয় যে একটি সেবা."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,আর কোনো আপডেট
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,এই সেটআপ সংযুক্ত সব স্কোরকার্ড জুড়ে
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,শিশু আইটেম একটি প্রোডাক্ট বান্ডেল করা উচিত হবে না. আইটেম অপসারণ `{0} &#39;এবং সংরক্ষণ করুন
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ব্যাংকিং
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,সেবা আইটেম
 DocType: Bank Guarantee,Bank Guarantee,ব্যাংক গ্যারান্টি
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ&gt; নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
 DocType: Grading Scale,Grading Scale Intervals,শূন্য স্কেল অন্তরাল
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,বছরের জন্য লাভ
+DocType: Bank Guarantee,Name of Bank,ব্যাংকের নাম
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2} জন্য অ্যাকাউন্টিং এণ্ট্রি শুধুমাত্র মুদ্রা তৈরি করা যাবে না: {3}
 DocType: Fee Schedule,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,আর্থিক হিসাব বৃক্ষ.
+DocType: Bank Guarantee,Reference Document Type,রেফারেন্স ডকুমেন্ট টাইপ
 DocType: Cash Flow Mapping,Cash Flow Mapping,ক্যাশ ফ্লো ম্যাপিং
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} সেলস আদেশের বিপরীতে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ইমেল ডিফল্ট পরিচিতিতে পাওয়া যায় নি
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,সিক্রেট তৈরি করুন
-DocType: Employee Loan,Account Info,অ্যাকাউন্ট তথ্য
+DocType: Loan,Account Info,অ্যাকাউন্ট তথ্য
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
 DocType: Fees,Include Payment,পেমেন্ট অন্তর্ভুক্ত করুন
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ছাত্র সংগঠনগুলো সৃষ্টি করেছেন।
 DocType: Sales Invoice,Total Billing Amount,মোট বিলিং পরিমাণ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ফি গঠন এবং ছাত্র গ্রুপ {0} প্রোগ্রাম পৃথক হয়।
 DocType: Fee Schedule,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
 DocType: Quotation Item,Stock Balance,স্টক ব্যালেন্স
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,সিইও
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,সিইও
 DocType: Purchase Invoice,With Payment of Tax,ট্যাক্স পরিশোধ সঙ্গে
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,সরবরাহকারী জন্য তৃতীয়ক
 DocType: Land Unit,Is Container,কনটেইনার হচ্ছে
 DocType: Crop Cycle,This will be day 1 of the crop cycle,এই ফসল চক্র দিন 1 হবে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Purchase Invoice Item,Weight UOM,ওজন UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ফোলিও নম্বরগুলি সহ উপলব্ধ অংশীদারদের তালিকা
 DocType: Salary Structure Employee,Salary Structure Employee,বেতন কাঠামো কর্মচারী
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,বৈকল্পিক গুণাবলী দেখান
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,বৈকল্পিক গুণাবলী দেখান
 DocType: Student,Blood Group,রক্তের গ্রুপ
 DocType: Course,Course Name,কোর্সের নাম
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,একটি নির্দিষ্ট কর্মচারী হুকুমে অ্যাপ্লিকেশন অনুমোদন করতে পারেন ব্যবহারকারীরা
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,অফিস সরঞ্জাম
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,অফিস সরঞ্জাম
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,কোম্পানি
 DocType: Supplier Scorecard,Scoring Setup,স্কোরিং সেটআপ
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,মোট ইনকামিং মূল্য
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ক্রয়মূল্য তালিকা
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,সরবরাহকারী স্কোরকার্ড ভেরিয়েবলের টেমপ্লেট
 DocType: Job Offer Term,Offer Term,অপরাধ টার্ম
 DocType: Asset,Quality Manager,গুনগতমান ব্যবস্থাপক
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},মোট অপ্রদত্ত: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ওয়েবসাইট অপারেশন
 DocType: Supplier Scorecard,Supplier Score,সরবরাহকারী স্কোর
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,মোট চালানে মাসিক
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,মোট চালানে মাসিক
 DocType: Supplier,Warn RFQs,RFQs সতর্ক করুন
 DocType: BOM,Conversion Rate,রূপান্তর হার
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,পণ্য অনুসন্ধান
 DocType: Assessment Plan,To Time,সময়
 DocType: Authorization Rule,Approving Role (above authorized value),(কঠিন মূল্য উপরে) ভূমিকা অনুমোদন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
+DocType: Loan,Total Amount Paid,মোট পরিমাণ পরিশোধ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,অনুগ্রহ করে ছাত্র ভর্তি নির্বাচন করুন যা প্রদত্ত শিক্ষার্থী আবেদনকারীর জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,মূল্য প্রকাশ করার জন্য একটি মূল্য তালিকা নির্বাচন করুন
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},সারি {0}: সমাপ্ত Qty চেয়ে বেশি হতে পারে না {1} অপারেশন জন্য {2}
 DocType: Manufacturing Settings,Allow Overtime,ওভারটাইম মঞ্জুরি
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ধারাবাহিকভাবে আইটেম {0} শেয়ার এণ্ট্রি শেয়ার সামঞ্জস্যবিধান ব্যবহার করে, ব্যবহার করুন আপডেট করা যাবে না"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ধারাবাহিকভাবে আইটেম {0} শেয়ার এণ্ট্রি শেয়ার সামঞ্জস্যবিধান ব্যবহার করে, ব্যবহার করুন আপডেট করা যাবে না"
 DocType: Training Event Employee,Training Event Employee,প্রশিক্ষণ ইভেন্ট কর্মচারী
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,সর্বাধিক নমুনা - {0} ব্যাচ {1} এবং আইটেম {2} জন্য রাখা যেতে পারে।
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,সময় স্লট যোগ করুন
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} আইটেম জন্য প্রয়োজন সিরিয়াল নাম্বার {1}. আপনার দেওয়া {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,বর্তমান মূল্যনির্ধারণ হার
 DocType: Training Event,Advance,আগাম
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,আবার পুনরাবৃত্তির জন্য
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless পেমেন্ট গেটওয়ে সেটিংস
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,এক্সচেঞ্জ লাভ / ক্ষতির
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,এক্সচেঞ্জ লাভ / ক্ষতির
 DocType: Opportunity,Lost Reason,লস্ট কারণ
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},সারি # {0}: অ্যাকাউন্ট {1} কোম্পানীর অন্তর্গত নয় {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},সারি # {0}: অ্যাকাউন্ট {1} কোম্পানীর অন্তর্গত নয় {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ডক টাইপ {0} খুঁজে পাওয়া যায়নি
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ
 DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},সাবস্ক্রিপশন {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ফি শিগগির প্রোগ্রাম
 DocType: Fee Schedule Program,Student Batch,ছাত্র ব্যাচ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,স্টুডেন্ট করুন
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ই-কমার্স জিএসটিআইএন
 DocType: Sales Order,Not Delivered,বিতরিত হয় নি
 ,Bank Clearance Summary,ব্যাংক পরিস্কারের সংক্ষিপ্ত
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
 DocType: Appraisal Goal,Appraisal Goal,মূল্যায়ন গোল
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,বিভাগটি প্রস্তাব?
 DocType: Stock Reconciliation Item,Current Amount,বর্তমান পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ভবন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ভবন
 DocType: Fee Schedule,Fee Structure,ফি গঠন
 DocType: Timesheet Detail,Costing Amount,খোয়াতে পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Student Admission Program,Application Fee,আবেদন ফী
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,বেতন স্লিপ জমা
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,আইটেম {0} হল {1}% জন্য Maxiumm ছাড়
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
 DocType: SMS Log,Sender Name,প্রেরকের নাম
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,কৃষি বিশ্লেষণ মানদণ্ড
+DocType: HR Settings,Leave Approval Notification Template,অনুমোদন বিজ্ঞপ্তি টেমপ্লেট ছাড়াই
 DocType: POS Profile,[Select],[নির্বাচন]
 DocType: Vital Signs,Blood Pressure (diastolic),রক্তচাপ (ডায়স্টোলিক)
 DocType: SMS Log,Sent To,প্রেরিত
 DocType: Agriculture Task,Holiday Management,হলিডে ম্যানেজমেন্ট
 DocType: Payment Request,Make Sales Invoice,বিক্রয় চালান করুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,সফটওয়্যার
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,সফটওয়্যার
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},চিকিত্সক {0} {1} এ উপলব্ধ নয়
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,নতুন কর্মক্ষেত্রে
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,উপাদান ব্যবহার
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,বন্ধ হিসাবে সেট করুন
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},বারকোড কোনো আইটেম {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},বারকোড কোনো আইটেম {0}
 DocType: Normal Test Items,Require Result Value,ফলাফল মান প্রয়োজন
 DocType: Item,Show a slideshow at the top of the page,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,প্রদত্ত তারিখ জন্য কর্মচারী {0} জন্য পাওয়া যায়নি সক্রিয় বা ডিফল্ট বেতন কাঠামো
 DocType: Leave Block List,Allow Users,ব্যবহারকারীদের মঞ্জুরি
 DocType: Purchase Order,Customer Mobile No,গ্রাহক মোবাইল কোন
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,আবৃত্ত
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ক্যাশ ফ্লো ম্যাপিং টেমপ্লেট বিবরণ
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ঋণ ব্যবস্থাপনা
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,পৃথক আয় সন্ধান এবং পণ্য verticals বা বিভাগের জন্য ব্যয়.
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,বেতন দেখান স্লিপ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,বেতন দেখান স্লিপ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ট্রান্সফার উপাদান
 DocType: Fees,Send Payment Request,অর্থ প্রদানের অনুরোধ পাঠান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 DocType: Water Analysis,Origin,উত্স
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,আয়কর দায় আছে
 DocType: Grading Scale Interval,Grade Description,গ্রেড বর্ণনা
 DocType: Stock Entry,Purchase Receipt No,কেনার রসিদ কোন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,অগ্রিক
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,অগ্রিক
 DocType: Sales Invoice, Shipping Bill Number,শিপিং বিল নম্বর
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
 DocType: Asset Maintenance Log,Actions performed,কর্ম সঞ্চালিত
 DocType: Cash Flow Mapper,Section Leader,সেকশন লিডার
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,কর্মচারী
+DocType: Bank Guarantee,Fixed Deposit Number,স্থায়ী আমানত নম্বর
 DocType: Asset Repair,Failure Date,ব্যর্থতা তারিখ
 DocType: Sample Collection,Collected Time,সংগ্রহকৃত সময়
 DocType: Company,Sales Monthly History,বিক্রয় মাসিক ইতিহাস
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,আপনি কি এই অ্যাপয়েন্টমেন্টটি বাতিল করতে চান?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,হোটেল রুম প্রাইসিং প্যাকেজ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,সেলস পাইপলাইন
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,সদস্যতা আপডেটগুলি আনুন
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},অ্যাকাউন্ট {0} {1} অ্যাকাউন্টের মোডে কোম্পানির সঙ্গে মিলছে না: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,কোর্স:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,কোনও ওয়ার্ক অর্ডার তৈরি করা হয়নি
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে এই সময়ের জন্য সৃষ্টি
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ফার্মাসিউটিক্যাল
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ফার্মাসিউটিক্যাল
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ক্রয় আইটেম খরচ
 DocType: Selling Settings,Sales Order Required,সেলস আদেশ প্রয়োজন
 DocType: Purchase Invoice,Credit To,ক্রেডিট
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,কোন উদ্ধৃতি নেই
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Gateway Account,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,পূরক অফ
 DocType: Job Offer,Accepted,গৃহীত
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,অনুসন্ধান ফলাফল
 DocType: Room,Room Number,রুম নম্বর
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 DocType: Journal Entry Account,Payroll Entry,পেরোল এণ্ট্রি
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,দেখুন ফি রেকর্ড
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Lab Test Sample,Lab Test Sample,ল্যাব পরীক্ষার নমুনা
 DocType: Item Variant Settings,Allow Rename Attribute Value,নামকরণ অ্যাট্রিবিউট মান অনুমোদন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
 DocType: Restaurant,Invoice Series Prefix,ইনভয়েস সিরিজ প্রিফিক্স
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,গুগল ম্যাপস ইন্টিগ্রেশন সক্রিয় নয়
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,সদস্যপদ মেয়াদ শেষের তারিখ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} রিটার্ন নথিতে অবশ্যই নেতিবাচক হতে হবে
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} রিটার্ন নথিতে অবশ্যই নেতিবাচক হতে হবে
 ,Minutes to First Response for Issues,সমস্যার জন্য প্রথম প্রতিক্রিয়া মিনিট
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,পরিমাপের একক
 DocType: Fiscal Year,Year End Date,বছর শেষ তারিখ
 DocType: Task Depends On,Task Depends On,কাজের উপর নির্ভর করে
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,সুযোগ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,সুযোগ
 DocType: Operation,Default Workstation,ডিফল্ট ওয়ার্কস্টেশন
 DocType: Notification Control,Expense Claim Approved Message,ব্যয় দাবি অনুমোদিত পাঠান
 DocType: Payment Entry,Deductions or Loss,Deductions বা হ্রাস
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,বিনা বেতনে ছুটি অনুমোদিত ছুটি অ্যাপ্লিকেশন রেকর্ডের সঙ্গে মিলছে না
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
 DocType: Membership,USD,আমেরিকান ডলার
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,চালান করুন
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,অবশিষ্ট জমা খরছ
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,বারকোড {0} একটি বৈধ {1} কোড নয়
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,শেষ বছর
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / লিড%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Driver,Driver,চালক
 DocType: Vital Signs,Nutrition Values,পুষ্টি মান
 DocType: Lab Test Template,Is billable,বিল
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),প্রকৃত স্টার্ট তারিখ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,বুড়ো বিন্যাস 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,মোট অগ্রিম পরিমাণ মোট দাবি পরিমাণ বেশী হতে পারে না
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,মোট অগ্রিম পরিমাণ মোট দাবি পরিমাণ বেশী হতে পারে না
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,অ্যাট্রিবিউট মান নির্বাচন করুন
 DocType: Purchase Invoice,Reason For Issuing document,দস্তাবেজ ইস্যু করার জন্য কারণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,পরবর্তী সংস্পর্শের মাধ্যমে লিড ইমেল ঠিকানা হিসাবে একই হতে পারে না
 DocType: Tax Rule,Billing City,বিলিং সিটি
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,সেবা ঠিকানা
 DocType: Asset Maintenance Task,Calibration,ক্রমাঙ্কন
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} একটি কোম্পানী ছুটির দিন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,আসবাবপত্র এবং রাজধানী
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,শর্তাবলী |
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,আসবাবপত্র এবং রাজধানী
 DocType: Item,Manufacture,উত্পাদন
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,সেটআপ কোম্পানি
 ,Lab Test Report,ল্যাব টেস্ট রিপোর্ট
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,রোপণ এলাকা
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,এই কারণে কিছু অবৈধ ইমেইল ঠিকানা হতে পারে
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,আপনি যোগ করেছেন
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,প্রশিক্ষণ ফল
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,পণ্য প্রতি পৃষ্ঠা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,সংস্থার শাখা মাস্টার.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,একটি সমস্যা রিপোর্ট
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ইউটিলিটি খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ইউটিলিটি খরচ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-উপরে
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,সারি # {0}: জার্নাল এন্ট্রি {1} অ্যাকাউন্ট নেই {2} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
 DocType: Supplier Scorecard Criteria,Criteria Weight,মাপদণ্ড ওজন
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,অনুমোদন বিজ্ঞপ্তি ত্যাগ করুন
 DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
 DocType: Payroll Entry,Salary Slip Based on Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড উপর ভিত্তি করে
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,কেনা দর
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,কেনা দর
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 DocType: Payment Entry,Payment Type,শোধের ধরণ
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,শপিং কার্ট সেটিংস
 DocType: Journal Entry,Accounting Entries,হিসাব থেকে
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","যদি নির্বাচিত মূল্যনির্ধারণের নিয়মটি &#39;হারের&#39; জন্য তৈরি করা হয়, এটি মূল্য তালিকা ওভাররাইট করবে। মূল্যনির্ধারণ নিয়ম হার হল চূড়ান্ত হার, তাই কোনও ছাড়ের প্রয়োগ করা উচিত নয়। অতএব, বিক্রয় আদেশ, ক্রয় আদেশ ইত্যাদি লেনদেনের ক্ষেত্রে &#39;মূল্য তালিকা রেট&#39; ক্ষেত্রের পরিবর্তে &#39;হার&#39; ক্ষেত্রের মধ্যে আনা হবে।"
+DocType: Journal Entry,Paid Loan,প্রদেয় ঋণ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ডুপ্লিকেট এন্ট্রি. দয়া করে চেক করুন অনুমোদন রুল {0}
 DocType: Journal Entry Account,Reference Due Date,রেফারেন্স দরুন তারিখ
 DocType: Purchase Order,Ref SQ,সুত্র সাকা
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/config/hr.py +93,Payroll,বেতনের
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 DocType: Patient Service Unit,Parent Service Unit,প্যারেন্ট সার্ভিস ইউনিট
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,করুন নিচে
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,বিলি
 DocType: Volunteer,Weekdays,কাজের
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: Restaurant Menu,Restaurant Menu,রেস্টুরেন্ট মেনু
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,চিরস্থায়ী জায় জন্য ডিফল্ট জায় অ্যাকাউন্ট সেট
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,চিরস্থায়ী জায় জন্য ডিফল্ট জায় অ্যাকাউন্ট সেট
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,গ্রান্ট রিভিউ ইমেল পাঠান
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,রুম ক্যাপাসিটি
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},ইতোমধ্যে আইটেমের জন্য বিদ্যমান রেকর্ড {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,সুত্র
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,আপনি পূর্বে উত্পন্ন ইনভয়েসগুলির রেকর্ডগুলি হারাবেন। আপনি কি এই সাবস্ক্রিপশনটি পুনরায় চালু করতে চান?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,নিবন্ধন ফি
 DocType: Budget,Cost Center,খরচ কেন্দ্র
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,ভাউচার #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,ভাউচার #
 DocType: Notification Control,Purchase Order Message,আদেশ বার্তাতে ক্রয়
 DocType: Tax Rule,Shipping Country,শিপিং দেশ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,সেলস লেনদেন থেকে গ্রাহকের ট্যাক্স আইডি লুকান
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি এর মাধ্যমে পরিবর্তন করা যাবে / হুণ্ডি / কেনার রসিদ
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,আয়কর
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,লেটার হেডসে যান
+DocType: Subscription,Cancel At End Of Period,মেয়াদ শেষের সময় বাতিল
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,স্থানান্তর জন্য কোন আইটেম নির্বাচিত
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,স্থানান্তর জন্য কোন আইটেম নির্বাচিত
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 DocType: Vehicle,Electric,বৈদ্যুতিক
 DocType: Task,% Progress,% অগ্রগতি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,লাভ / অ্যাসেট নিষ্পত্তির হ্রাস
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,লাভ / অ্যাসেট নিষ্পত্তির হ্রাস
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",শুধুমাত্র &quot;অনুমোদিত&quot; স্ট্যাটাসের সাথে ছাত্র আবেদনকারীকে নীচের সারণিতে নির্বাচিত করা হবে।
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,অ্যাকাউন্ট {0} জন্য অ্যাকাউন্ট নম্বর উপলব্ধ নয়। <br> আপনার অ্যাকাউন্ট সঠিকভাবে সঠিকভাবে সেট করুন।
 DocType: Task,Depends on Tasks,কার্যগুলি উপর নির্ভর করে
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,মজুদ নাই
 DocType: Volunteer,Volunteer Skills,স্বেচ্ছাসেবক দক্ষতা
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
+DocType: Bank Guarantee,Reference Document Name,রেফারেন্স নথি নাম
 DocType: Purchase Invoice,Taxes and Charges Deducted,কর ও শুল্ক বাদ
 apps/erpnext/erpnext/hooks.py +142,Issues,সমস্যা
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},স্থিতি এক হতে হবে {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,অতি বৃহদাকার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,অতি বৃহদাকার
+DocType: Loan,Loan Application,ঋণ আবেদন
 DocType: Crop,Scientific Name,বৈজ্ঞানিক নাম
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,মোট পাতা
 DocType: Customer,"Reselect, if the chosen contact is edited after save",সংরক্ষণ করার পরে নির্বাচিত নির্বাচনটি সম্পাদন করা হলে তা বাতিল করুন
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,চেক সংখ্যা
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,স্থানীয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ঋণ গ্রহিতা
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,বড়
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,বড়
 DocType: Homepage Featured Product,Homepage Featured Product,হোম পেজ বৈশিষ্ট্যযুক্ত পণ্য
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,সকল অ্যাসেসমেন্ট গোষ্ঠীসমূহ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,সকল অ্যাসেসমেন্ট গোষ্ঠীসমূহ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,নতুন গুদাম নাম
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),মোট {0} ({1})
 DocType: C-Form Invoice Detail,Territory,এলাকা
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,ফি
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,বিনিময় হার অন্য মধ্যে এক মুদ্রা রূপান্তর উল্লেখ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,মোট বকেয়া পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,মোট বকেয়া পরিমাণ
 DocType: Sales Partner,Targets,লক্ষ্যমাত্রা
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,কোম্পানির তথ্য ফাইলের SIREN নম্বর নিবন্ধন করুন
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম&gt; এইচআর সেটিংস সেট আপ করুন
 DocType: Price List,Price List Master,মূল্য তালিকা মাস্টার
 DocType: GST Account,CESS Account,CESS অ্যাকাউন্ট
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,রোগীর নির্বাচন করুন
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,পরামিতি নাম
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,শুধু ত্যাগ অবস্থা অ্যাপ্লিকেশন অনুমোদিত &#39;&#39; এবং &#39;প্রত্যাখ্যাত&#39; জমা করা যেতে পারে
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},স্টুডেন্ট গ্রুপের নাম সারিতে বাধ্যতামূলক {0}
 DocType: Homepage,Products to be shown on website homepage,পণ্য ওয়েবসাইট হোমপেজে দেখানো হবে
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,চালান ইতিমধ্যে সমস্ত বিলিং ঘন্টা জন্য তৈরি
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},নাম ত্রুটি: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,অর্থ খরচ হয়
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,রেস্টুরেন্ট সেটিংস এ ডিফল্ট গ্রাহক সেট করুন
 ,Salary Register,বেতন নিবন্ধন
 DocType: Warehouse,Parent Warehouse,পেরেন্ট ওয়্যারহাউস
-DocType: C-Form Invoice Detail,Net Total,সর্বমোট
+DocType: Subscription,Net Total,সর্বমোট
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},ডিফল্ট BOM আইটেমের জন্য পাওয়া যায়নি {0} এবং প্রকল্প {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,বিভিন্ন ঋণ ধরনের নির্ধারণ
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,বিভিন্ন ঋণ ধরনের নির্ধারণ
 DocType: Bin,FCFS Rate,FCFs হার
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,বাকির পরিমাণ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),সময় (মিনিট)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
 DocType: Drug Prescription,Drug Prescription,ড্রাগ প্রেসক্রিপশন
 DocType: Fees,FEE.,ফি.
-DocType: Employee Loan,Repaid/Closed,শোধ / বন্ধ
+DocType: Loan,Repaid/Closed,শোধ / বন্ধ
 DocType: Item,Total Projected Qty,মোট অভিক্ষিপ্ত Qty
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","আইটেম {0} জন্য মূল্যমানের হার পাওয়া যায়নি, যা {1} {2} এর জন্য অ্যাকাউন্টিং এন্ট্রি করতে হবে। যদি আইটেমটি {1} এ শূন্য মূল্যায়ন হারের আইটেম হিসাবে রূপান্তরিত হয় তবে দয়া করে {1} আইটেম টেবিলে উল্লেখ করুন। অন্যথায়, আইটেমের জন্য একটি ইনকামিং স্টক লেনদেন তৈরি করুন বা আইটেম রেকর্ডে মূল্যায়ন হার উল্লেখ করুন, এবং তারপর এই এন্ট্রি জমা / বাতিল করার চেষ্টা করুন"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপের মাধ্যমে&gt; সেটিংস&gt; নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
 DocType: Course,Course Code,কোর্স কোড
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: POS Settings,Use POS in Offline Mode,অফলাইন মোডে পিওএস ব্যবহার করুন
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,ডেমিড এক্সপোর্ট
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ডিসকাউন্ট শতাংশ একটি মূল্য তালিকা বিরুদ্ধে বা সব মূল্য তালিকা জন্য হয় প্রয়োগ করা যেতে পারে.
-DocType: Subscription,Half-yearly,অর্ধ বার্ষিক
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Lab Test,LabTest Approver,LabTest আবির্ভাব
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,"আপনি ইতিমধ্যে মূল্যায়ন মানদণ্ডের জন্য মূল্যায়ন করে নিলে, {}।"
 DocType: Vehicle Service,Engine Oil,ইঞ্জিনের তেল
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},তৈরি ওয়ার্ক অর্ডার: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},তৈরি ওয়ার্ক অর্ডার: {0}
 DocType: Sales Invoice,Sales Team1,সেলস team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
-DocType: Employee Loan,Loan Details,ঋণ বিবরণ
+DocType: Loan,Loan Details,ঋণ বিবরণ
 DocType: Company,Default Inventory Account,ডিফল্ট পরিসংখ্যা অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ফোলিও নম্বরগুলি মিলছে না
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,সমস্ত জমি ইউনিট যা ফসল ক্রমবর্ধমান হয় একটি লিঙ্ক
 DocType: Account,Root Type,Root- র ধরন
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},সারি # {0}: বেশী ফিরে যাবে না {1} আইটেম জন্য {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},সারি # {0}: বেশী ফিরে যাবে না {1} আইটেম জন্য {2}
 DocType: Item Group,Show this slideshow at the top of the page,পৃষ্ঠার উপরের এই স্লাইডশো প্রদর্শন
 DocType: BOM,Item UOM,আইটেম UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Cheque Print Template,Primary Settings,প্রাথমিক সেটিংস
 DocType: Purchase Invoice,Select Supplier Address,সরবরাহকারী ঠিকানা নির্বাচন
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,এমপ্লয়িজ যোগ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,এমপ্লয়িজ যোগ
 DocType: Purchase Invoice Item,Quality Inspection,উচ্চমানের তদন্ত
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,অতিরিক্ত ছোট
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,অতিরিক্ত ছোট
 DocType: Company,Standard Template,স্ট্যান্ডার্ড টেমপ্লেট
 DocType: Training Event,Theory,তত্ত্ব
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,এসএমএস পাঠানোর কোন
 DocType: Antibiotic,Healthcare Administrator,স্বাস্থ্যসেবা প্রশাসক
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,একটি টার্গেট সেট করুন
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ&gt; নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
 DocType: Dosage Strength,Dosage Strength,ডোজ স্ট্রেংথ
 DocType: Account,Expense Account,দামী হিসাব
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,সফটওয়্যার
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,রঙিন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,রঙিন
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,অ্যাসেসমেন্ট পরিকল্পনা নির্ণায়ক
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,নির্বাচিত আইটেমের জন্য মেয়াদ শেষের তারিখ বাধ্যতামূলক
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ক্রয় আদেশ আটকান
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,ব্যক্তিগত ও সামাজিক ইতিহাস
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ব্যবহারকারী {0} তৈরি করেছেন
 DocType: Fee Schedule,Fee Breakup for each student,প্রতিটি ছাত্র জন্য ফি ভাঙ্গন
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,কোড পরিবর্তন করুন
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
 DocType: Stock Reconciliation,SR/,এসআর /
 DocType: Vehicle,Diesel,ডীজ়ল্
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
 DocType: Purchase Invoice,Availed ITC Cess,এজিড আইটিসি সেস
 ,Student Monthly Attendance Sheet,শিক্ষার্থীর মাসের এ্যাটেনডেন্স পত্রক
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,শপিং শাসন কেবল বিক্রয় জন্য প্রযোজ্য
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,প্রজেক্ট আরম্ভের তারিখ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,পর্যন্ত
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,পর্যন্ত
 DocType: Rename Tool,Rename Log,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,শিক্ষার্থীর গ্রুপ বা কোর্সের সূচি বাধ্যতামূলক
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,বিলিং ঘন্টা এবং ওয়ার্কিং ঘন্টা শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড একই বজায়
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,আপনার পণ্য বা পরিষেবাগুলি যে আপনি কিনতে বা বিক্রয় তালিকা।
 DocType: Water Analysis,Storage Temperature,সংগ্রহস্থল তাপমাত্রা
 DocType: Employee Attendance Tool,Unmarked Attendance,অচিহ্নিত এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,গবেষক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,গবেষক
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,প্রোগ্রাম তালিকাভুক্তি টুল ছাত্র
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},শুরু তারিখ টাস্ক {0} জন্য শেষ তারিখের চেয়ে কম হওয়া উচিত
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,নাম বা ইমেল বাধ্যতামূলক
@@ -3475,7 +3497,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,প্রিসেটগুলি ইনস্টল করতে ব্যর্থ হয়েছে
 DocType: Chapter,Non Profit Manager,অ লাভ ম্যানেজার
 DocType: BOM,Total Cost(Company Currency),মোট খরচ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} নির্মিত সিরিয়াল কোন
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} নির্মিত সিরিয়াল কোন
 DocType: Homepage,Company Description for website homepage,ওয়েবসাইট হোমপেজে জন্য এখানে বর্ণনা
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","গ্রাহকদের সুবিধার জন্য, এই কোড চালান এবং বিলি নোট মত মুদ্রণ বিন্যাস ব্যবহার করা যেতে পারে"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier নাম
@@ -3485,11 +3507,10 @@
 DocType: Employee,You can enter any date manually,আপনি নিজে কোনো তারিখ লিখতে পারেন
 DocType: Healthcare Settings,Result Printed,ফলাফল মুদ্রিত
 DocType: Asset Category Account,Depreciation Expense Account,অবচয় ব্যায়ের অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,অবেক্ষাধীন সময়ের
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} দেখুন
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,অবেক্ষাধীন সময়ের
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Project,Total Costing Amount (via Timesheets),মোট খরচ পরিমাণ (টাইমসাইটের মাধ্যমে)
-DocType: Employee Advance,Expense Approver,ব্যয় রাজসাক্ষী
+DocType: Department,Expense Approver,ব্যয় রাজসাক্ষী
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
 DocType: Project,Hourly,ঘনঘন
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,অ গ্রুপ গ্রুপ
@@ -3498,7 +3519,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime করুন
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
 DocType: Accounts Settings,Make Payment via Journal Entry,জার্নাল এন্ট্রি মাধ্যমে টাকা প্রাপ্তির
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,মুদ্রিত উপর
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,মুদ্রিত উপর
 DocType: Item,Inspection Required before Delivery,পরিদর্শন ডেলিভারি আগে প্রয়োজনীয়
 DocType: Item,Inspection Required before Purchase,ইন্সপেকশন ক্রয়ের আগে প্রয়োজনীয়
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,মুলতুবি কার্যক্রম
@@ -3508,7 +3529,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,ন্যূনতম চাহিদার পরিমাণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,তোমার অর্গানাইজেশন
 DocType: Fee Component,Fees Category,ফি শ্রেণী
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,কর্মচারীকে জানান
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
@@ -3518,7 +3539,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Company,Chart Of Accounts Template,একাউন্টস টেমপ্লেটের চার্ট
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},আইটেম দাম {0} মূল্য তালিকা জন্য আপডেট {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},আইটেম দাম {0} মূল্য তালিকা জন্য আপডেট {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Purchase Invoice Item,Accepted Warehouse,গৃহীত ওয়্যারহাউস
@@ -3526,10 +3547,11 @@
 DocType: Item,Valuation Method,মূল্যনির্ধারণ পদ্ধতি
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,মার্ক অর্ধদিবস
 DocType: Sales Invoice,Sales Team,বিক্রয় দল
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ডুপ্লিকেট এন্ট্রি
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ডুপ্লিকেট এন্ট্রি
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,জমা দেওয়ার আগে প্রাপকের নাম লিখুন।
 DocType: Program Enrollment Tool,Get Students,শিক্ষার্থীরা পান
 DocType: Serial No,Under Warranty,ওয়ারেন্টিযুক্ত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ত্রুটি]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ত্রুটি]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 ,Employee Birthday,কর্মচারী জন্মদিনের
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,সম্পূর্ণ মেরামতের জন্য সমাপ্তির তারিখ নির্বাচন করুন
@@ -3548,7 +3570,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,সাব কন্ট্রাক্টিং জন্য সংরক্ষিত
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
 DocType: Shopping Cart Settings,Orders,আদেশ
-DocType: Employee Leave Approver,Leave Approver,রাজসাক্ষী ত্যাগ
+DocType: Department,Leave Approver,রাজসাক্ষী ত্যাগ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,দয়া করে একটি ব্যাচ নির্বাচন
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,অ্যাসেসমেন্ট গ্রুপের নাম
@@ -3592,7 +3614,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,হাব ট্র্যাক আইটেম
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,প্রাপকের জন্য মূল
 DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,এই ইমেলটি স্বয়ংক্রিয়ভাবে তৈরি করা হয়েছে
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
 DocType: Program Enrollment,Boarding Student,বোর্ডিং শিক্ষার্থীর
 DocType: Asset,Expected Value After Useful Life,প্রত্যাশিত মান দরকারী জীবন পর
@@ -3617,21 +3638,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},এ্যাটেনডেন্স রেকর্ড {0} শিক্ষার্থীর বিরুদ্ধে বিদ্যমান {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,অবচয় সম্পদ নিষ্পত্তির কারণে বিদায় নিয়েছে
-DocType: Member,Member,সদস্য
+DocType: Loan,Member,সদস্য
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Work Order Item,Work Order Item,কাজ অর্ডার আইটেম
 DocType: Pricing Rule,Item Code,পণ্য সংকেত
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,কৃষি ম্যানেজার
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 DocType: Supplier Scorecard Period,Variables,ভেরিয়েবল
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),বন্ধ (ড)
 DocType: Cheque Print Template,Cheque Size,চেক সাইজ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,লেনদেন বিক্রি জন্য ট্যাক্স টেমপ্লেট.
 DocType: Sales Invoice,Write Off Outstanding Amount,বকেয়া পরিমাণ লিখুন বন্ধ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},অ্যাকাউন্ট {0} কোম্পানির সঙ্গে মেলে না {1}
@@ -3639,7 +3660,6 @@
 DocType: Stock Settings,Default Stock UOM,ডিফল্ট শেয়ার UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations সংখ্যা বুক
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,মোট পরিমাণ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},কর্মচারী ঋণ বিরুদ্ধে: {0}
 DocType: Landed Cost Item,Receipt Document,রশিদ ডকুমেন্ট
 DocType: Employee Education,School/University,স্কুল / বিশ্ববিদ্যালয়
 DocType: Payment Request,Reference Details,রেফারেন্স বিস্তারিত
@@ -3650,7 +3670,7 @@
 DocType: Asset,Double Declining Balance,ডাবল পড়ন্ত ব্যালেন্স
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,বন্ধ অর্ডার বাতিল করা যাবে না. বাতিল করার অবারিত করা.
 DocType: Student Guardian,Father,পিতা
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
 DocType: Attendance,On Leave,ছুটিতে
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,আপডেট পান
@@ -3664,10 +3684,10 @@
 DocType: Lead,Lower Income,নিম্ন আয়
 DocType: Restaurant Order Entry,Current Order,বর্তমান আদেশ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,প্রোগ্রামে যান
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},সারি {0} # বরাদ্দকৃত পরিমাণ {1} দাবি না করা পরিমাণের চেয়ে বড় হতে পারে না {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},সারি {0} # বরাদ্দকৃত পরিমাণ {1} দাবি না করা পরিমাণের চেয়ে বড় হতে পারে না {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
@@ -3690,7 +3710,6 @@
 DocType: Payment Terms Template,Payment Terms,পরিশোধের শর্ত
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,মিনিট
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম&gt; এইচআর সেটিংস সেট আপ করুন
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 DocType: Chapter,Meetup Embed HTML,Meetup এম্বেড HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,সরবরাহকারী যান
@@ -3709,30 +3728,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
 DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,শিক্ষার্থীর জন্য অর্থ প্রদানের অনুরোধ পাঠানোর জন্য ইমেল আইডি সেট করুন
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,শিক্ষার্থীর জন্য অর্থ প্রদানের অনুরোধ পাঠানোর জন্য ইমেল আইডি সেট করুন
 DocType: Patient,Medical History,চিকিৎসা ইতিহাস
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
 DocType: Patient,Patient ID,রোগীর আইডি
 DocType: Physician Schedule,Schedule Name,সূচি নাম
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,বেতন স্লিপ করুন
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,সমস্ত সরবরাহকারী যোগ করুন
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,সমস্ত সরবরাহকারী যোগ করুন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,সারি # {0}: বরাদ্দ বকেয়া পরিমাণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না।
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ব্রাউজ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,নিরাপদ ঋণ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,নিরাপদ ঋণ
 DocType: Purchase Invoice,Edit Posting Date and Time,পোস্টিং তারিখ এবং সময় সম্পাদনা
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},সম্পদ শ্রেণী {0} বা কোম্পানির অবচয় সম্পর্কিত হিসাব নির্ধারণ করুন {1}
 DocType: Lab Test Groups,Normal Range,সাধারণ অন্তর্ভুক্তি
 DocType: Academic Term,Academic Year,শিক্ষাবর্ষ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,উপলভ্য বিক্রি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
 DocType: Lead,CRM,সিআরএম
 DocType: Purchase Invoice,N,এন
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,অবশিষ্ট
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
+DocType: Loan,Loan Account,ঋণ অ্যাকাউন্ট
 DocType: Purchase Invoice,GST Details,জিএসটি বিশ্লেষণ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},সরবরাহকারী পাঠানো ইমেল {0}
 DocType: Item,Default Sales Unit of Measure,পরিমাপের ডিফল্ট সেলস ইউনিট
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,শিক্ষাবর্ষ:
+DocType: Subscription,Past Due Date,অতীত তারিখের তারিখ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},আইটেম জন্য বিকল্প আইটেম সেট করতে অনুমতি দেয় না {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
@@ -3745,7 +3766,7 @@
 DocType: Patient Appointment,Patient Appointment,রোগীর অ্যাপয়েন্টমেন্ট
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ভূমিকা অনুমোদন নিয়ম প্রযোজ্য ভূমিকা হিসাবে একই হতে পারে না
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,এই ইমেইল ডাইজেস্ট থেকে সদস্যতা রদ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,দ্বারা সরবরাহকারী পেতে
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,দ্বারা সরবরাহকারী পেতে
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},আইটেম {1} জন্য পাওয়া যায়নি {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,কোর্স যান
 DocType: Accounts Settings,Show Inclusive Tax In Print,প্রিন্ট ইন ইনজেকশন ট্যাক্স দেখান
@@ -3753,10 +3774,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,বার্তা পাঠানো
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট খতিয়ান হিসাবে সেট করা যাবে না
 DocType: C-Form,II,২
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংস এ প্রশিক্ষক নামকরণ পদ্ধতি স্থাপন করুন
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,হারে যা মূল্যতালিকা মুদ্রার এ গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
 DocType: Physician,Physician Schedules,চিকিত্সক
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,মোট অগ্রিম পরিমাণ মোট অনুমোদিত পরিমাণের চেয়ে বেশি হতে পারে না
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,মোট অগ্রিম পরিমাণ মোট অনুমোদিত পরিমাণের চেয়ে বেশি হতে পারে না
 DocType: Salary Slip,Hour Rate,ঘন্টা হার
 DocType: Stock Settings,Item Naming By,দফে নামকরণ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
@@ -3774,6 +3796,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},বেশী না পুরোনো স্টক লেনদেন হালনাগাদ করার অনুমতি {0}
 DocType: BOM,Inspection Required,ইন্সপেকশন প্রয়োজনীয়
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,জমা দেওয়ার আগে ব্যাংক গ্যারান্টি নম্বর লিখুন।
 DocType: Driving License Category,Class,শ্রেণী
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,একটি আইটেম টেমপ্লেট বিরুদ্ধে কাজ আদেশ উত্থাপিত করা যাবে না
@@ -3784,7 +3807,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Assessment Plan,Program,কার্যক্রম
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংস এ প্রশিক্ষক নামকরণ পদ্ধতি স্থাপন করুন
 DocType: Serial No,Is Cancelled,বাতিল করা হয়
 DocType: Student Group,Group Based On,গ্রুপ উপর ভিত্তি করে
 DocType: Journal Entry,Bill Date,বিল তারিখ
@@ -3795,9 +3817,10 @@
 DocType: Cheque Print Template,Cheque Height,চেক উচ্চতা
 DocType: Supplier,Supplier Details,সরবরাহকারী
 DocType: Setup Progress,Setup Progress,সেটআপ অগ্রগতি
+DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 DocType: Hub Settings,Publish Items to Hub,হাব আইটেম প্রকাশ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},মূল্য সারিতে মান কম হতে হবে থেকে {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,ওয়্যার ট্রান্সফার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,সবগুলু যাচাই করুন
 ,Issued Items Against Work Order,কাজের আদেশ বিরুদ্ধে আইটেম দেওয়া
 DocType: Vehicle Log,Invoice Ref,চালান সুত্র
@@ -3828,12 +3851,11 @@
 DocType: Customs Tariff Number,Tariff Number,ট্যারিফ নম্বর
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP ওয়্যারহাউস এ উপলব্ধ করে চলছে
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,অভিক্ষিপ্ত
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
 DocType: Notification Control,Quotation Message,উদ্ধৃতি পাঠান
-DocType: Employee Loan,Employee Loan Application,কর্মচারী ঋণ আবেদন
 DocType: Issue,Opening Date,খোলার তারিখ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,দয়া করে প্রথমে রোগীর সংরক্ষণ করুন
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,দয়া করে প্রথমে রোগীর সংরক্ষণ করুন
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,এ্যাটেনডেন্স সফলভাবে হিসাবে চিহ্নিত হয়েছে.
 DocType: Program Enrollment,Public Transport,পাবলিক ট্রান্সপোর্ট
 DocType: Soil Texture,Silt Composition (%),গাদা গঠন (%)
@@ -3851,7 +3873,7 @@
 ,Item Balance (Simple),আইটেম ব্যালেন্স (সরল)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
 DocType: POS Profile,Write Off Account,অ্যাকাউন্ট বন্ধ লিখতে
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ডেবিট নোট Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ডেবিট নোট Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
@@ -3874,6 +3896,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,বিক্রয় আদেশ তারিখ
 DocType: Sales Invoice Item,Delivered Qty,বিতরিত Qty
 DocType: Assessment Plan,Assessment Plan,অ্যাসেসমেন্ট প্ল্যান
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,বিপরীত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,গ্রাহক {0} তৈরি করা হয়।
 DocType: Stock Settings,Limit Percent,সীমা শতকরা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,বর্তমানে কোন গুদামে পন্য উপলব্ধ নেই
@@ -3887,14 +3910,15 @@
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Payment Entry,Payment References,পেমেন্ট তথ্যসূত্র
 DocType: C-Form,C-FORM-,সি-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ব্যবধানের ক্ষেত্রগুলির জন্য অন্তর্বর্তী সংখ্যা উদাহরণস্বরূপ যদি বিরতি হল &#39;দিন&#39; এবং বিলিং বিরতির সংখ্যা 3, প্রতি 3 দিনে চালান উত্পন্ন হবে"
 DocType: Vehicle,Insurance Details,বীমা বিবরণ
 DocType: Account,Payable,প্রদেয়
 DocType: Share Balance,Share Type,শেয়ার প্রকার শেয়ার করুন
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ঋণ গ্রহিতা ({0})
 DocType: Pricing Rule,Margin,মার্জিন
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,নতুন গ্রাহকরা
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,পুরো লাভ %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,পুরো লাভ %
 DocType: Appraisal Goal,Weightage (%),গুরুত্ব (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,পিওএস প্রোফাইল পরিবর্তন করুন
 DocType: Bank Reconciliation Detail,Clearance Date,পরিস্কারের তারিখ
@@ -3904,10 +3928,11 @@
 DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,পার্টির বাধ্যতামূলক
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},অন্যান্য সারিতে ডুপ্লিকেট স্থায়ী তারিখগুলির সাথে সারি পাওয়া গেছে: {তালিকা}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},অন্যান্য সারিতে ডুপ্লিকেট স্থায়ী তারিখগুলির সাথে সারি পাওয়া গেছে: {তালিকা}
 DocType: Topic,Topic Name,টপিক নাম
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,এইচআর সেটিংস এ অনুমোদন বিজ্ঞপ্তি বরখাস্ত করতে ডিফল্ট টেমপ্লেট সেট করুন।
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,কর্মচারী অগ্রিম পেতে একটি কর্মচারী নির্বাচন করুন
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,কর্মচারী অগ্রিম পেতে একটি কর্মচারী নির্বাচন করুন
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,একটি বৈধ তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,আপনার ব্যবসার প্রকৃতি নির্বাচন করুন.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3926,7 +3951,7 @@
 DocType: Asset Movement,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,লেজার শেয়ার করুন
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,সেলস ইনভয়েস {0} তৈরি করেছে
 DocType: Employee,Confirmation Date,নিশ্চিতকরণ তারিখ
 DocType: C-Form,Total Invoiced Amount,মোট invoiced পরিমাণ
@@ -3935,7 +3960,7 @@
 DocType: Account,Accumulated Depreciation,সঞ্চিত অবচয়
 DocType: Supplier Scorecard Scoring Standing,Standing Name,স্থায়ী নাম
 DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
-DocType: Employee Loan Application,Required by Date,তারিখ দ্বারা প্রয়োজনীয়
+DocType: Loan Application,Required by Date,তারিখ দ্বারা প্রয়োজনীয়
 DocType: Lead,Lead Owner,লিড মালিক
 DocType: Production Plan,Sales Orders Detail,বিক্রয় আদেশ বিস্তারিত
 DocType: Bin,Requested Quantity,অনুরোধ পরিমাণ
@@ -3948,10 +3973,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,গ্রস পে - মোট সিদ্ধান্তগ্রহণ - ঋণ পরিশোধ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,বেতন স্লিপ আইডি
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,একাধিক বৈকল্পিক
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% বিতরণ করা হয়েছে
+DocType: Subscription,Trial Period Start Date,ট্রায়াল সময়কাল শুরু তারিখ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,অন্য ব্যবহারকারী হিসাবে লগইন করুন দয়া করে
@@ -3972,12 +3998,11 @@
 DocType: Student Guardian,Student Guardian,ছাত্র গার্ডিয়ান
 DocType: Member,Member Name,সদস্যের নাম
 DocType: Stock Settings,Use Naming Series,নামকরণ সিরিজ ব্যবহার করুন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
 DocType: POS Profile,Update Stock,আপডেট শেয়ার
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,সাবস্ক্রিপশন মধ্যে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 DocType: Membership,Payment Details,অর্থ প্রদানের বিবরণ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM হার
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","বন্ধ করা অর্ডারের অর্ডার বাতিল করা যাবে না, বাতিল করার জন্য এটি প্রথম থেকে বন্ধ করুন"
 DocType: Asset,Journal Entry for Scrap,স্ক্র্যাপ জন্য জার্নাল এন্ট্রি
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
@@ -3997,6 +4022,7 @@
 DocType: Land Unit,Land Unit,জমি ইউনিট
 ,Purchase Analytics,ক্রয় অ্যানালিটিক্স
 DocType: Sales Invoice Item,Delivery Note Item,হুণ্ডি আইটেম
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,বর্তমান চালান {0} অনুপস্থিত
 DocType: Asset Maintenance Log,Task,কার্য
 DocType: Purchase Taxes and Charges,Reference Row #,রেফারেন্স সারি #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ব্যাচ নম্বর আইটেম জন্য বাধ্যতামূলক {0}
@@ -4008,7 +4034,7 @@
 DocType: Company,Exchange Gain / Loss Account,এক্সচেঞ্জ লাভ / ক্ষতির অ্যাকাউন্ট
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,কর্মচারী এবং অ্যাটেনডেন্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,কমিউনিটি ফোরাম
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,স্টক মধ্যে প্রকৃত Qty এ
 DocType: Homepage,"URL for ""All Products""",জন্য &quot;সকল পণ্য&quot; URL টি
@@ -4022,7 +4048,7 @@
 DocType: Lab Test Template,Standard Selling Rate,স্ট্যান্ডার্ড বিক্রয় হার
 DocType: Account,Rate at which this tax is applied,"এই ট্যাক্স প্রয়োগ করা হয়, যা এ হার"
 DocType: Cash Flow Mapper,Section Name,বিভাগের নাম
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,রেকর্ডার Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,রেকর্ডার Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,বর্তমান জব
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,খরচ লেখা
@@ -4033,9 +4059,9 @@
 DocType: Task,depends_on,নির্ভর করে
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,সমস্ত বিল উপকরণ মধ্যে সর্বশেষ মূল্য আপডেট করার জন্য সারিবদ্ধ। এটি কয়েক মিনিট সময় নিতে পারে।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; টেরিটরি
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,দেশ অনুযায়ী ডিফল্ট ঠিকানা টেমপ্লেট
 DocType: Water Analysis,Appearance,চেহারা
+DocType: HR Settings,Leave Status Notification Template,শর্তাবলী
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,গড়। মূল্য তালিকা রেট কেনা
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,সদস্য তথ্য
@@ -4058,7 +4084,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,অননুমোদিত. টেস্ট টেমপ্লেট অক্ষম করুন
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
 DocType: Crop Cycle,Linked Land Unit,লিঙ্কড ল্যান্ড ইউনিট
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
@@ -4074,7 +4100,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ব্যবহারকারীদের কাছে যান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,অবৈধ GSTIN বা অনিবন্ধিত জন্য na লিখুন
 DocType: Training Event,Seminar,সেমিনার
 DocType: Program Enrollment Fee,Program Enrollment Fee,প্রোগ্রাম তালিকাভুক্তি ফি
@@ -4090,14 +4116,14 @@
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 DocType: Company,Create Chart Of Accounts Based On,হিসাব উপর ভিত্তি করে চার্ট তৈরি করুন
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,এটি অ-গ্রুপে রূপান্তর করা যাবে না শিশু কাজগুলি বিদ্যমান।
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
 ,Stock Ageing,শেয়ার বুড়ো
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ছাত্র {0} ছাত্র আবেদনকারী বিরুদ্ধে অস্তিত্ব {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),গোলাকার সমন্বয় (কোম্পানী মুদ্রা)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ব্যাচ:
 DocType: Volunteer,Afternoon,বিকেল
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Cheque Print Template,Scanned Cheque,স্ক্যান করা চেক
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
@@ -4113,7 +4139,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,প্রকল্প {0} ইতিমধ্যে বিদ্যমান
 DocType: Medical Department,Nursing User,নার্সিং ব্যবহারকারী
 DocType: Plant Analysis,Plant Analysis Criterias,উদ্ভিদ বিশ্লেষণ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,দায়িত্ব
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},সিরিয়াল না {0} ব্যাচের অন্তর্গত নয় {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,দায়িত্ব
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,এই উদ্ধৃতির বৈধতা মেয়াদ শেষ হয়েছে।
 DocType: Expense Claim Account,Expense Claim Account,ব্যয় দাবি অ্যাকাউন্ট
 DocType: Accounts Settings,Allow Stale Exchange Rates,স্টেলা এক্সচেঞ্জের হার মঞ্জুর করুন
@@ -4135,11 +4162,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,বৈকল্পিক করুন
 DocType: Item,Default BOM,ডিফল্ট BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),মোট বিল পরিমাণ (বিক্রয় চালান মাধ্যমে)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ডেবিট নোট পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ডেবিট নোট পরিমাণ
 DocType: Project Update,Not Updated,আপডেট নেই
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","হার, ভাগের সংখ্যা এবং গণনা করা পরিমাণের মধ্যে বিচ্ছিন্নতা আছে"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
 DocType: Employee Advance,Advance Account,অগ্রিম অ্যাকাউন্ট
 DocType: Job Offer,Job Offer Terms,কাজের প্রস্তাব শর্তাবলী
@@ -4148,7 +4175,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,স্বয়ংচালিত
 DocType: Vehicle,Insurance Company,বীমা কোম্পানী
 DocType: Asset Category Account,Fixed Asset Account,পরিসম্পদ অ্যাকাউন্ট
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,পরিবর্তনশীল
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,পরিবর্তনশীল
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Chapter,Members,সদস্য
 DocType: Student,Student Email Address,ছাত্র ইমেইল ঠিকানা
@@ -4171,7 +4198,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,অন্তরীণ করা
 DocType: Delivery Stop,Address Name,ঠিকানা নাম
 DocType: Stock Entry,From BOM,BOM থেকে
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} এর বিভাজন {0} ইউনিট
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} এর বিভাজন {0} ইউনিট
 DocType: Assessment Code,Assessment Code,অ্যাসেসমেন্ট কোড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
@@ -4179,25 +4206,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 DocType: Bank Reconciliation Detail,Payment Document,পেমেন্ট ডকুমেন্ট
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,মানদণ্ড সূত্র মূল্যায়ন ত্রুটি
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
+DocType: Subscription,Plans,পরিকল্পনা সমূহ
 DocType: Salary Slip,Salary Structure,বেতন কাঠামো
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ইস্যু উপাদান
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,পুনরাবৃত্তি তৈরির সময় একটি ত্রুটি ঘটেছে
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,উদ্ধৃতি
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,কোন ছাত্র সংগঠনের সৃষ্টি.
 DocType: Purchase Invoice Item,Serial No,ক্রমিক নং
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,মাসিক পরিশোধ পরিমাণ ঋণের পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,মাসিক পরিশোধ পরিমাণ ঋণের পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,সারি # {0}: ক্রয় আদেশ তারিখের আগে উপলব্ধ ডেলিভারি তারিখটি হতে পারে না
 DocType: Purchase Invoice,Print Language,প্রিন্ট ভাষা
 DocType: Salary Slip,Total Working Hours,মোট ওয়ার্কিং ঘন্টা
 DocType: Sales Invoice,Customer PO Details,গ্রাহক পি.ও.
-DocType: Subscription,Next Schedule Date,পরবর্তী তালিকা তারিখ
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,অস্থায়ী খোলার অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,লিখুন মান ধনাত্মক হবে
@@ -4225,11 +4251,11 @@
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,উল্লিখিত মানদণ্ড জন্য কোন কর্মচারী
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
 DocType: Hotel Settings,Default Customer,ডিফল্ট গ্রাহক
 DocType: Assessment Plan,Supervisor Name,সুপারভাইজার নাম
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,একই দিনের জন্য অ্যাপয়েন্টমেন্ট তৈরি করা হয় কিনা তা নিশ্চিত করবেন না
@@ -4253,16 +4279,16 @@
 DocType: Journal Entry Account,Employee Advance,কর্মচারী অ্যাডভান্স
 DocType: Payroll Entry,Payroll Frequency,বেতনের ফ্রিকোয়েন্সি
 DocType: Lab Test Template,Sensitivity,সংবেদনশীলতা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,কাঁচামাল
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,কাঁচামাল
 DocType: Leave Application,Follow via Email,ইমেইলের মাধ্যমে অনুসরণ করুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,চারাগাছ ও মেশিনারি
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,চারাগাছ ও মেশিনারি
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,দৈনন্দিন কাজের সংক্ষিপ্ত সেটিং
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,তারিখ দ্বারা Reqd লিখুন দয়া করে
 DocType: Payment Entry,Internal Transfer,অভ্যন্তরীণ স্থানান্তর
 DocType: Asset Maintenance,Maintenance Tasks,রক্ষণাবেক্ষণ কাজ
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
 DocType: Leave Control Panel,Carry Forward,সামনে আগাও
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র খতিয়ান রূপান্তরিত করা যাবে না
@@ -4270,13 +4296,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext একত্রিতকরণ
 DocType: Crop Cycle,Detected Disease,সনাক্ত রোগ
 ,Produced,উত্পাদিত
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,পরিশোধনকালের তারিখ পরিশোধ না করার তারিখ আগে হতে পারে।
 DocType: Item,Item Code for Suppliers,সরবরাহকারীদের জন্য আইটেম কোড
 DocType: Issue,Raised By (Email),দ্বারা উত্থাপিত (ইমেইল)
 DocType: Training Event,Trainer Name,প্রশিক্ষকদের নাম
 DocType: Mode of Payment,General,সাধারণ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,গত কমিউনিকেশন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
@@ -4290,7 +4317,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},ডেলি {0} অর্ধেক দিন ত্যাগ করুন {1}
 DocType: Production Plan,Get Material Request,উপাদান অনুরোধ করুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ঠিকানা খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ঠিকানা খরচ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 ,Item Variant Details,আইটেম বৈকল্পিক বিবরণ
@@ -4301,9 +4328,9 @@
 DocType: Drug Prescription,Hour,ঘন্টা
 DocType: Restaurant Order Entry,Last Sales Invoice,শেষ সেলস ইনভয়েস
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},আইটেম {0} বিরুদ্ধে Qty নির্বাচন করুন
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
 DocType: Company,Monthly Sales Target,মাসিক বিক্রয় লক্ষ্য
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},দ্বারা অনুমোদিত হতে পারে {0}
@@ -4311,7 +4338,7 @@
 DocType: Item,Default Material Request Type,ডিফল্ট উপাদান অনুরোধ প্রকার
 DocType: Supplier Scorecard,Evaluation Period,মূল্যায়ন সময়ের
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,অজানা
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,কাজ অর্ডার তৈরি করা হয়নি
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,কাজ অর্ডার তৈরি করা হয়নি
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
 DocType: Purchase Invoice,Export Type,রপ্তানি প্রকার
 DocType: Salary Slip Loan,Salary Slip Loan,বেতন স্লিপ ঋণ
@@ -4327,7 +4354,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,খোলা ইনভয়েসস সারাংশ
 DocType: Education Settings,Education Manager,শিক্ষা ম্যানেজার
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,সর্বোত্তম বৃদ্ধি জন্য ক্ষেত্রের প্রতিটি উদ্ভিদ মধ্যে সর্বনিম্ন দৈর্ঘ্য
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","শ্রেণীবদ্ধ আইটেম {0} শেয়ার সামঞ্জস্যবিধান ব্যবহার আপডেট করা যাবে না, এর পরিবর্তে শেয়ার এণ্ট্রি ব্যবহার"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","শ্রেণীবদ্ধ আইটেম {0} শেয়ার সামঞ্জস্যবিধান ব্যবহার আপডেট করা যাবে না, এর পরিবর্তে শেয়ার এণ্ট্রি ব্যবহার"
 DocType: Quality Inspection,Report Date,প্রতিবেদন তারিখ
 DocType: Student,Middle Name,নামের মধ্যাংশ
 DocType: C-Form,Invoices,চালান
@@ -4358,20 +4385,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,প্রাপ্তি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,প্রাপ্তি
 ,Sales Register,সেলস নিবন্ধন
 DocType: Daily Work Summary Group,Send Emails At,ইমেইল পাঠান এ
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ফর্ম দেখুন
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ব্যয় দাবি মধ্যে ব্যয়বহুল ব্যয়বহুল
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","আপনার প্রতিষ্ঠান ছাড়া ব্যবহারকারীদের যোগ করুন, আপনার নিজের চেয়ে অন্য।"
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,এখনও কোন গ্রাহকরা!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,কোন উপাদান অনুরোধ তৈরি
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,লাইসেন্স
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
@@ -4394,11 +4422,12 @@
 DocType: Vehicle,Chassis No,চেসিস কোন
 DocType: Payment Request,Initiated,প্রবর্তিত
 DocType: Production Plan Item,Planned Start Date,পরিকল্পনা শুরুর তারিখ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,একটি BOM নির্বাচন করুন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,একটি BOM নির্বাচন করুন
 DocType: Purchase Invoice,Availed ITC Integrated Tax,সুবিধাভোগী আইটিসি ইন্টিগ্রেটেড ট্যাক্স
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
+DocType: Bank Guarantee,Clauses and Conditions,ক্লাউজ এবং শর্তাবলী
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
 DocType: Project Task,View Timesheet,টাইমসাইট দেখুন
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,শেষ তারিখ শুরু তারিখের চেয়ে বেশি হওয়া আবশ্যক
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Leave Allocation,New Leaves Allocated,নতুন পাতার বরাদ্দ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
@@ -4412,9 +4441,10 @@
 DocType: Patient,Alcohol Current Use,অ্যালকোহল বর্তমান ব্যবহার
 DocType: Student Admission Program,Student Admission Program,ছাত্র ভর্তি প্রোগ্রাম
 DocType: Payment Entry,Account Paid To,অ্যাকাউন্টে অর্থ প্রদান করা
+DocType: Subscription Settings,Grace Period,গ্রেস পিরিয়ড
 DocType: Item Alternative,Alternative Item Name,বিকল্প আইটেমের নাম
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",কোনো বেতন স্লিপ জমা দিতে পারে নি <br> \ সম্ভাব্য কারণ: <br> \ 1. নেট পে কম 0 <br> \ ২। কর্মচারীর মাস্টারে উল্লেখিত কোম্পানির ইমেল ঠিকানা বৈধ নয়। <br>
@@ -4424,7 +4454,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} অ্যাকাউন্টের জন্য বাজেট {1} বিরুদ্ধে {2} {3} হল {4}. এটা দ্বারা অতিক্রম করবে {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty আউট
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,এবং নিষ্ক্রিয় মধ্যে অক্ষম
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,সিরিজ বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 DocType: Student Sibling,Student ID,শিক্ষার্থী আইডি
@@ -4436,14 +4465,16 @@
 DocType: Complaint,Complaint,অভিযোগ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,পুনঃঅর্থায়ন এন্ট্রি করুন
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,সব বিভাগে
 DocType: Patient,Alcohol Past Use,অ্যালকোহল অতীত ব্যবহার
 DocType: Fertilizer Content,Fertilizer Content,সার কনটেন্ট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,CR
 DocType: Project Update,Problematic/Stuck,সমস্যাযুক্ত / আটকে
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
 DocType: Share Transfer,Transfer,হস্তান্তর
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,এই অর্ডার অর্ডার বাতিল করার আগে অর্ডার অর্ডার {0} বাতিল করা আবশ্যক
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
@@ -4467,10 +4498,11 @@
 DocType: Cheque Print Template,Message to show,বার্তা দেখাতে
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,খুচরা
 DocType: Student Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} এ শুরু হওয়া স্কোর খুঁজে পাওয়া অসম্ভব। আপনাকে 0 থেকে 100 টাকায় দাঁড়াতে দাঁড়াতে হবে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
+DocType: Subscription,Current Invoice Start Date,বর্তমান ইনভয়েস স্টার্ট তারিখ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: উভয় ক্ষেত্রেই ডেবিট বা ক্রেডিট পরিমাণ জন্য প্রয়োজন বোধ করা হয় {2}
 DocType: GL Entry,Remarks,মন্তব্য
@@ -4480,11 +4512,13 @@
 DocType: Task,Parent Task,বাবা টাস্ক
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,লিড করুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
 DocType: Stock Settings,Show Barcode Field,দেখান বারকোড ফিল্ড
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","বেতন ইতিমধ্যে মধ্যে {0} এবং {1}, আবেদন সময়ের ত্যাগ এই তারিখ সীমার মধ্যে হতে পারে না সময়ের জন্য প্রক্রিয়া."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","বেতন ইতিমধ্যে মধ্যে {0} এবং {1}, আবেদন সময়ের ত্যাগ এই তারিখ সীমার মধ্যে হতে পারে না সময়ের জন্য প্রক্রিয়া."
+DocType: Fiscal Year,Auto Created,অটো প্রস্তুত
 DocType: Chapter Member,Leave Reason,কারণ ছাড়ুন
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ইনভয়েস {0} আর নেই
 DocType: Guardian Interest,Guardian Interest,গার্ডিয়ান সুদ
 DocType: Volunteer,Availability,উপস্থিতি
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,পিওএস ইনভয়েসেসের জন্য ডিফল্ট মান সেটআপ করুন
@@ -4492,14 +4526,13 @@
 DocType: Project,Time to send,পাঠাতে সময়
 DocType: Timesheet,Employee Detail,কর্মচারী বিস্তারিত
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ইমেইল আইডি
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,পরবর্তী তারিখ দিবস এবং মাসের দিন পুনরাবৃত্তি সমান হতে হবে
 DocType: Lab Prescription,Test Code,পরীক্ষার কোড
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ওয়েবসাইট হোমপেজে জন্য সেটিংস
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য RFQs অনুমোদিত নয়
 DocType: Job Offer,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,উপরে
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},মোট পরিমাণ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},মোট পরিমাণ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
 DocType: Supplier,Mention if non-standard payable account,উল্লেখ করো যদি অ-মানক প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',দয়া করে মূল্যায়ন &#39;সমস্ত অ্যাসেসমেন্ট গোষ্ঠীসমূহ&#39; ছাড়া অন্য গোষ্ঠী নির্বাচন করুন
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},সারি {0}: একটি কেনার জন্য খরচ কেন্দ্র প্রয়োজন {1}
@@ -4510,7 +4543,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,জল বিশ্লেষণ
 DocType: Chapter,Region,এলাকা
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,লিঙ্কড বিশ্লেষণ পুনরায় লোড করুন
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","যেমন 2012, 2012-13 জন্য"
@@ -4526,7 +4559,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,বাতিল অ্যাসেট খরচ
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
 DocType: Vehicle,Policy No,নীতি কোন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 DocType: Asset,Straight Line,সোজা লাইন
 DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,বিভক্ত করা
@@ -4562,21 +4595,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,পথ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,এটা সন্তানের নোড আছে খতিয়ান করার খরচ কেন্দ্র রূপান্তর করতে পারবেন না
 DocType: Production Plan,Total Planned Qty,মোট পরিকল্পিত পরিমাণ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,খোলা মূল্য
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,খোলা মূল্য
 DocType: Salary Detail,Formula,সূত্র
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,সিরিয়াল #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,সিরিয়াল #
 DocType: Lab Test Template,Lab Test Template,ল্যাব টেস্ট টেমপ্লেট
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,বিক্রয় অ্যাকাউন্ট
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,বিক্রয় অ্যাকাউন্ট
 DocType: Purchase Invoice Item,Total Weight,সম্পূর্ণ ওজন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,বিক্রয় কমিশনের
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,বিক্রয় কমিশনের
 DocType: Job Offer Term,Value / Description,মূল্য / বিবরণ:
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 DocType: Purchase Order Item,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 DocType: Restaurant Order Entry,Restaurant Order Entry,রেস্টুরেন্ট অর্ডার এন্ট্রি
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
 DocType: Asset Maintenance Task,Assign To Name,নাম সন্নিবেশ করান
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,আমোদ - প্রমোদ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,আমোদ - প্রমোদ খরচ
 DocType: Hub Settings,Enabled Users,সক্রিয় ব্যবহারকারীগণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,উপাদান অনুরোধ করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ওপেন আইটেম {0}
@@ -4589,24 +4622,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ছুটি জন্য অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
 DocType: Vehicle,Last Carbon Check,সর্বশেষ কার্বন চেক
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,আইনি খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,আইনি খরচ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,দয়া করে সারিতে পরিমাণ নির্বাচন
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,খোলা বিক্রয় এবং ক্রয় ইনভয়েসিস তৈরি করুন
 DocType: Purchase Invoice,Posting Time,পোস্টিং সময়
 DocType: Timesheet,% Amount Billed,% পরিমাণ চালান করা হয়েছে
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,টেলিফোন খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,টেলিফোন খরচ
 DocType: Sales Partner,Logo,লোগো
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
 DocType: Email Digest,Open Notifications,খোলা বিজ্ঞপ্তি
 DocType: Payment Entry,Difference Amount (Company Currency),পার্থক্য পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,সরাসরি খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,সরাসরি খরচ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,নতুন গ্রাহক রাজস্ব
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ভ্রমণ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},কাস্টম ক্ষেত্র যোগ করুন doctype {0} মধ্যে সাবস্ক্রিপশন
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
 DocType: Purchase Receipt Item,Sample Quantity,নমুনা পরিমাণ
+DocType: Bank Guarantee,Name of Beneficiary,সুবিধা গ্রহণকারীর নাম
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",সর্বশেষ মূল্যনির্ধারণ হার / মূল্য তালিকা হার / কাঁচামালের সর্বশেষ ক্রয়ের হারের ভিত্তিতে স্বয়ংক্রিয়ভাবে নির্ধারিত BOM- এর মূল্য নির্ধারনের মাধ্যমে।
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
@@ -4618,14 +4651,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,পরীক্ষাকাল
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,বেতন উপাদান
 DocType: Program Enrollment Tool,New Academic Year,নতুন শিক্ষাবর্ষ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,মোট প্রদত্ত পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 DocType: GST Settings,B2C Limit,B2C সীমা
 DocType: Work Order Item,Transferred Qty,স্থানান্তর করা Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,সমুদ্রপথে
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,পরিকল্পনা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,পরিকল্পনা
 DocType: Share Balance,Issued,জারি
+DocType: Loan,Repayment Start Date,ফেরত শুরুর তারিখ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,শিক্ষার্থীদের কর্মকাণ্ড
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,সরবরাহকারী আইডি
 DocType: Payment Request,Payment Gateway Details,পেমেন্ট গেটওয়ে বিস্তারিত
@@ -4638,10 +4672,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","নৈমিত্তিক মত পাতা ধরণ, অসুস্থ ইত্যাদি"
 DocType: Email Digest,Send regular summary reports via Email.,ইমেইলের মাধ্যমে নিয়মিত সংক্ষিপ্ত রিপোর্ট পাঠান.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 DocType: Assessment Result,Student Name,শিক্ষার্থীর নাম
 DocType: Brand,Item Manager,আইটেম ম্যানেজার
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,বেতনের প্রদেয়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,বেতনের প্রদেয়
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
 DocType: Plant Analysis,Collection Datetime,সংগ্রহের Datetime
 DocType: Work Order,Total Operating Cost,মোট অপারেটিং খরচ
@@ -4651,9 +4685,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ব্যবহারকারী {0} অস্তিত্ব নেই
 DocType: Payment Term,Day(s) after invoice date,চালান তারিখের পর দিন (গুলি)
 DocType: Payment Schedule,Payment Schedule,অর্থ প্রদানের সময়সূচী
-DocType: Subscription,SUB-,সাব-
 DocType: Item Attribute Value,Abbreviation,সংক্ষেপ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,পেমেন্ট এণ্ট্রি আগে থেকেই আছে
+DocType: Subscription,Trial Period End Date,ট্রায়াল সময়কাল শেষ তারিখ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} সীমা অতিক্রম করে, যেহেতু authroized না"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,বেতন টেমপ্লেট মাস্টার.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,রোগবিদ্যা
@@ -4670,9 +4704,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,সকল গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,সকল গ্রাহকের গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,সঞ্চিত মাসিক
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
@@ -4681,14 +4715,15 @@
 DocType: Lab Prescription,Test Created,টেস্ট তৈরি হয়েছে
 DocType: Healthcare Settings,Custom Signature in Print,প্রিন্ট কাস্টম স্বাক্ষর
 DocType: Account,Temporary,অস্থায়ী
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,গ্রাহক এলপিও নম্বর
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,গ্রাহক এলপিও নম্বর
 DocType: Program,Courses,গতিপথ
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,সম্পাদক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,সম্পাদক
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","অক্ষম করেন, ক্ষেত্র কথার মধ্যে &#39;কোনো লেনদেনে দৃশ্যমান হবে না"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,এই ক্রিয়া ভবিষ্যতের বিলিং বন্ধ করবে আপনি কি এই সদস্যতা বাতিল করতে চান?
 DocType: Serial No,Distinct unit of an Item,একটি আইটেম এর স্বতন্ত্র ইউনিট
 DocType: Supplier Scorecard Criteria,Criteria Name,ধাপ নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,সেট করুন কোম্পানির
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,সেট করুন কোম্পানির
 DocType: Pricing Rule,Buying,ক্রয়
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,রোগ ও সার
 DocType: HR Settings,Employee Records to be created by,কর্মচারী রেকর্ড করে তৈরি করা
@@ -4697,17 +4732,17 @@
 DocType: POS Profile,Apply Discount On,Apply ছাড়ের উপর
 DocType: Member,Membership Type,মেম্বারশিপ টাইপ
 ,Reqd By Date,Reqd তারিখ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ঋণদাতাদের
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ঋণদাতাদের
 DocType: Assessment Plan,Assessment Name,অ্যাসেসমেন্ট নাম
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,প্রিন্টে PDC দেখান
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,প্রিন্টে PDC দেখান
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,সারি # {0}: সিরিয়াল কোন বাধ্যতামূলক
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অনুযায়ী ট্যাক্স বিস্তারিত
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,কাজের প্রস্তাব
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ইনস্টিটিউট সমাহার
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},পরিমাণ ({0}) সারিতে ভগ্নাংশ হতে পারে না {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},পরিমাণ ({0}) সারিতে ভগ্নাংশ হতে পারে না {1}
 DocType: Consultation,C-,সি
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
@@ -4725,7 +4760,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,মোট ভেদাংক
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","সক্রিয় করা হলে, সিস্টেম স্বয়ংক্রিয়ভাবে পরিসংখ্যা জন্য অ্যাকাউন্টিং এন্ট্রি পোস্ট করতে হবে."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,দালালি
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,কর্মচারী {0} জন্য এ্যাটেনডেন্স ইতিমধ্যে এই দিনের জন্য চিহ্নিত করা হয়
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,কর্মচারী {0} জন্য এ্যাটেনডেন্স ইতিমধ্যে এই দিনের জন্য চিহ্নিত করা হয়
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",মিনিটের মধ্যে &#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 DocType: Customer,From Lead,লিড
@@ -4736,6 +4771,7 @@
 DocType: Lab Test,Approved Date,অনুমোদিত তারিখ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
+DocType: Subscriber,Subscriber Name,গ্রাহক নাম
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Update Tool,Replace,প্রতিস্থাপন করা
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,কোন পণ্য পাওয়া যায় নি।
@@ -4745,19 +4781,18 @@
 DocType: Request for Quotation Item,Project Name,প্রকল্পের নাম
 DocType: Customer,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},কর্মচারী ঋণের সুদ আয় অ্যাকাউন্ট নির্বাচন করুন {0}
 DocType: Work Order,Required Items,প্রয়োজনীয় সামগ্রী
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,মানব সম্পদ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,পেমেন্ট পুনর্মিলন পরিশোধের
 DocType: Disease,Treatment Task,চিকিত্সা কাজ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ট্যাক্স সম্পদ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ট্যাক্স সম্পদ
 DocType: BOM Item,BOM No,BOM কোন
 DocType: Instructor,INS/,আইএনএস /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Update Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ইলেকট্রনিক উপকরণ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ইলেকট্রনিক উপকরণ
 DocType: Asset,Maintenance Required,রক্ষণাবেক্ষণ প্রয়োজন
 DocType: Account,Debit,ডেবিট
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
@@ -4766,7 +4801,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,বিশিষ্ট মাসিক
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,সেট লক্ষ্যমাত্রা আইটেমটি গ্রুপ-ভিত্তিক এই বিক্রয় ব্যক্তি.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ফ্রিজ স্টক চেয়ে পুরোনো [দিন]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,সারি # {0}: অ্যাসেট স্থায়ী সম্পদ ক্রয় / বিক্রয়ের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,সারি # {0}: অ্যাসেট স্থায়ী সম্পদ ক্রয় / বিক্রয়ের জন্য বাধ্যতামূলক
 DocType: Asset Maintenance Team,Maintenance Team Name,রক্ষণাবেক্ষণ টিম নাম
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","দুই বা ততোধিক দামে উপরোক্ত অবস্থার উপর ভিত্তি করে পাওয়া যায়, অগ্রাধিকার প্রয়োগ করা হয়. ডিফল্ট মান শূন্য (ফাঁকা) যখন অগ্রাধিকার 0 থেকে 20 এর মধ্যে একটি সংখ্যা হয়. উচ্চতর সংখ্যা একই অবস্থার সঙ্গে একাধিক প্রাইসিং নিয়ম আছে যদি তা প্রাধান্য নিতে হবে."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,গ্রাহককে যদি &#39;সুযোগ থেকে&#39; বেছে নেওয়া হয় তবে গ্রাহক বাধ্যতামূলক
@@ -4775,19 +4810,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,নিম্নলিখিত ব্যবহারকারীদের ব্লক দিনের জন্য চলে যায় অ্যাপ্লিকেশন অনুমোদন করার অনুমতি দিন.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ব্যয় দাবি প্রকারভেদ.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},তার {1} আইটেমের জন্য হার বিক্রী {0} চেয়ে কম। বিক্রী হার কত হওয়া উচিত অন্তত {2}
-DocType: Item,Taxes,কর
+DocType: Subscription,Taxes,কর
 DocType: Purchase Invoice,capital goods,মূলধন পণ্য
 DocType: Purchase Invoice Item,Weight Per Unit,ওজন প্রতি ইউনিট
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,প্রদত্ত এবং বিতরিত হয় নি
 DocType: Project,Default Cost Center,ডিফল্ট খরচের কেন্দ্র
-DocType: Bank Guarantee,End Date,শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,শেয়ার লেনদেন
 DocType: Budget,Budget Accounts,বাজেট হিসাব
 DocType: Employee,Internal Work History,অভ্যন্তরীণ কাজের ইতিহাস
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,সঞ্চিত অবচয় পরিমাণ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,সরবরাহকারী স্কোরকার্ড ভেরিয়েবল
-DocType: Employee Loan,Fully Disbursed,সম্পূর্ণ বিতরণ
 DocType: Employee Advance,Due Advance Amount,দরুন অগ্রিম পরিমাণ
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
@@ -4811,7 +4844,7 @@
 ,Employee Information,কর্মচারী তথ্য
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,বিক্রয় এবং ক্রয় জন্য ডিফল্ট ট্যাক্স টেমপ্লেট তৈরি করা হয়।
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,মূল্যায়ন ফলাফল রেকর্ড {0} ইতিমধ্যে বিদ্যমান।
@@ -4819,7 +4852,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',দয়া করে কোম্পানির ফাঁকা ফিল্টার সেট করুন যদি একদল &#39;কোম্পানি&#39; হল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,পোস্টিং তারিখ ভবিষ্যতে তারিখে হতে পারে না
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,পুনরাবৃত্তির জন্য প্রস্তুত
 DocType: Stock Entry,Target Warehouse Address,লক্ষ্য গুদাম ঠিকানা
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Agriculture Task,End Day,শেষ দিন
@@ -4844,11 +4876,10 @@
 DocType: Material Request,% Ordered,% আদেশ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","কোর্সের ভিত্তিক স্টুডেন্ট গ্রুপের জন্য, কোর্স প্রোগ্রাম তালিকাভুক্তি মধ্যে নাম নথিভুক্ত কোর্স থেকে শিক্ষার্থীর জন্য যাচাই করা হবে না।"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ফুরণ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,গড়. রাজধানীতে হার
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Share Balance,From No,না থেকে
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{প্রেরক} থেকে নতুন বার্তা
 DocType: Customer,Customer Primary Address,গ্রাহক প্রাথমিক ঠিকানা
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,নিউজ লেটার
 DocType: Drug Prescription,Description/Strength,বর্ণনা / স্ট্রেংথ
@@ -4857,22 +4888,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,একই আইটেমকে একাধিক বার প্রবেশ করা হয়েছে
 DocType: Department,Leave Block List,ব্লক তালিকা ত্যাগ
 DocType: Purchase Invoice,Tax ID,ট্যাক্স আইডি
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. কলাম ফাঁকা রাখা আবশ্যক
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. কলাম ফাঁকা রাখা আবশ্যক
 DocType: Accounts Settings,Accounts Settings,সেটিংস অ্যাকাউন্ট
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,অনুমোদন করা
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} এর জন্য বিদ্বেষপূর্ণ ঠিকানা, দয়া করে চালিয়ে যেতে স্থির করুন।"
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} এর জন্য বিদ্বেষপূর্ণ ঠিকানা, দয়া করে চালিয়ে যেতে স্থির করুন।"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","নতুন অ্যাকাউন্টের সংখ্যা, এটি একটি উপসর্গ হিসাবে অ্যাকাউন্টের নাম অন্তর্ভুক্ত করা হবে"
 DocType: Maintenance Team Member,Team Member,দলের সদস্য
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,কোন ফলাফল জমা নেই
 DocType: Customer,Sales Partner and Commission,বিক্রয় অংশীদার এবং কমিশন
-DocType: Employee Loan,Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার
+DocType: Loan,Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার
 ,Project Quantity,প্রকল্প পরিমাণ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে"
 DocType: Opportunity,To Discuss,আলোচনা করতে
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
 DocType: Loan Type,Rate of Interest (%) Yearly,সুদের হার (%) বাত্সরিক
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,কালো
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,কালো
 DocType: BOM Explosion Item,BOM Explosion Item,BOM বিস্ফোরণ আইটেম
 DocType: Shareholder,Contact List,যোগাযোগ তালিকা
 DocType: Account,Auditor,নিরীক্ষক
@@ -4880,16 +4911,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} উত্পাদিত আইটেম
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,আরও জানুন
 DocType: Cheque Print Template,Distance from top edge,উপরের প্রান্ত থেকে দূরত্ব
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,মূল্য তালিকা {0} অক্ষম করা থাকে বা কোন অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,মূল্য তালিকা {0} অক্ষম করা থাকে বা কোন অস্তিত্ব নেই
 DocType: Purchase Invoice,Return,প্রত্যাবর্তন
 DocType: Pricing Rule,Disable,অক্ষম
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","সম্পদের মত আরও বিকল্পগুলির জন্য সম্পূর্ণ পৃষ্ঠাতে সম্পাদনা করুন, সিরিয়াল নাম্বার, ব্যাচ ইত্যাদি"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,নিয়োগ এবং পরামর্শ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ব্যাচ মধ্যে নাম নথিভুক্ত করা হয় না {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","অ্যাসেট {0}, বাতিল করা যাবে না এটা আগে থেকেই {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,চেক প্রয়োজন
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,চেক প্রয়োজন
 DocType: Task,Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,মার্ক অনুপস্থিত
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,কোম্পানী সেট আপ করতে ব্যর্থ হয়েছে
@@ -4901,7 +4932,7 @@
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,থেকে আইটেম যোগ করুন
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,থেকে আইটেম যোগ করুন
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ফসল এবং জমি
 DocType: Cheque Print Template,Regular,নিয়মিত
 DocType: Fertilizer,Density (if liquid),ঘনত্ব (যদি তরল)
@@ -4926,24 +4957,26 @@
 DocType: Payment Entry,Paid Amount,দেওয়া পরিমাণ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,বিক্রয় চক্র এক্সপ্লোর পরিচালনা করুন
 DocType: Assessment Plan,Supervisor,কর্মকর্তা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,ধারণ স্টক এণ্ট্রি
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,ধারণ স্টক এণ্ট্রি
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 ,Work Order Stock Report,ওয়ার্ক অর্ডার স্টক রিপোর্ট
+DocType: Purchase Receipt,Auto Repeat Detail,অটো পুনরাবৃত্তি বিস্তারিত
 DocType: Assessment Result Tool,Assessment Result Tool,অ্যাসেসমেন্ট রেজাল্ট টুল
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,সুপারভাইজার হিসেবে
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,বিভাগে পরামর্শ দিন
 DocType: BOM Scrap Item,BOM Scrap Item,BOM স্ক্র্যাপ আইটেম
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,গুনমান ব্যবস্থাপনা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,গুনমান ব্যবস্থাপনা
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
 DocType: Project,Total Billable Amount (via Timesheets),মোট বিলযোগ্য পরিমাণ (টাইমসাইটের মাধ্যমে)
 DocType: Agriculture Task,Previous Business Day,আগের ব্যবসা দিবস
-DocType: Employee Loan,Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ
+DocType: Loan,Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ
 DocType: Employee,Health Insurance No,স্বাস্থ্য বীমা না
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ক্রেডিট নোট Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ক্রেডিট নোট Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,মোট করযোগ্য পরিমাণ
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 DocType: Opening Invoice Creation Tool,Purchase,ক্রয়
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ব্যালেন্স Qty
@@ -4954,15 +4987,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{1} এর জন্য {0}
 DocType: Healthcare Settings,Valid number of days,বৈধ সংখ্যা দিন
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,খরচ কেন্দ্র
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,সদস্যতা পুনর্সূচনা করুন
 DocType: Land Unit,Linked Plant Analysis,লিঙ্কড প্ল্যান্ট বিশ্লেষণ
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,যা সরবরাহকারী মুদ্রার হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},সারি # {0}: সারিতে সঙ্গে উপস্থাপনার দ্বন্দ্ব {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,জিরো মূল্যনির্ধারণ রেট অনুমতি দিন
+DocType: Bank Guarantee,Receiving,গ্রহণ
 DocType: Training Event Employee,Invited,আমন্ত্রিত
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,একাধিক সক্রিয় বেতন কাঠামো দেওয়া তারিখগুলি জন্য কর্মচারী {0} পাওয়া যায়নি
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,সেটআপ গেটওয়ে অ্যাকাউন্ট.
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
 DocType: Payment Entry,Set Exchange Gain / Loss,সেট এক্সচেঞ্জ লাভ / ক্ষতির
 ,GST Purchase Register,GST ক্রয় নিবন্ধন
 ,Cash Flow,নগদ প্রবাহ
@@ -4982,9 +5017,10 @@
 DocType: Academic Term,Term Start Date,টার্ম শুরুর তারিখ
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,সমস্ত শেয়ার লেনদেনের তালিকা
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP কাউন্ট
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,উভয় ট্রায়াল সময়কাল শুরু তারিখ এবং ট্রায়াল সময়কাল শেষ তারিখ সেট করা আবশ্যক
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,গড় হার
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,পেমেন্ট শংসাপত্রের মোট পরিশোধের পরিমাণ গ্র্যান্ড / গোলাকার মোট সমান হওয়া আবশ্যক
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,পেমেন্ট শংসাপত্রের মোট পরিশোধের পরিমাণ গ্র্যান্ড / গোলাকার মোট সমান হওয়া আবশ্যক
+DocType: Subscription Plan Detail,Plan,পরিকল্পনা
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,জেনারেল লেজার অনুযায়ী ব্যাংক ব্যালেন্সের
 DocType: Job Applicant,Applicant Name,আবেদনকারীর নাম
 DocType: Authorization Rule,Customer / Item Name,গ্রাহক / আইটেম নাম
@@ -5014,6 +5050,7 @@
 DocType: Work Order,Warehouses,ওয়ারহাউস
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} সম্পদ স্থানান্তরিত করা যাবে না
 DocType: Hotel Room Pricing,Hotel Room Pricing,হোটেল রুম মূল্য
+DocType: Subscription,Days Until Due,দরুন পর্যন্ত দিন
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,এই আইটেম {0} (টেমপ্লেট) এর ভেরিয়েন্ট হয়।
 DocType: Workstation,per hour,প্রতি ঘণ্টা
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ক্রয়
@@ -5022,13 +5059,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ব্যাচ ভিত্তিক স্টুডেন্ট গ্রুপের জন্য, শিক্ষার্থী ব্যাচ প্রোগ্রাম তালিকাভুক্তি থেকে শিক্ষার্থীর জন্য যাচাই করা হবে না।"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,বিতরণ
+DocType: Journal Entry Account,Loan,ঋণ
 DocType: Expense Claim Advance,Expense Claim Advance,ব্যয় দাবি আগাম
 DocType: Lab Test,Report Preference,রিপোর্টের পছন্দ
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,স্বেচ্ছাসেবক তথ্য
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,প্রকল্প ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,প্রকল্প ব্যবস্থাপক
 ,Quoted Item Comparison,উদ্ধৃত আইটেম তুলনা
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} এবং {1} এর মধ্যে স্কোরিংয়ের উপর ওভারল্যাপ করুন
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,প্রাণবধ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,নিট অ্যাসেট ভ্যালু হিসেবে
 DocType: Crop,Produce,উৎপাদন করা
@@ -5038,7 +5076,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,পণ্যদ্রব্য জন্য উপাদান ব্যবহার
 DocType: Item Alternative,Alternative Item Code,বিকল্প আইটেম কোড
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
 DocType: Delivery Stop,Delivery Stop,ডেলিভারি স্টপ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
 DocType: Item,Material Issue,উপাদান ইস্যু
@@ -5048,15 +5086,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
 DocType: BOM,Show Items,আইটেম দেখান
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,সময় সময় তার চেয়ে অনেক বেশী হতে পারে না.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,আপনি কি ইমেলের মাধ্যমে সমস্ত গ্রাহকদের অবহিত করতে চান?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,আপনি কি ইমেলের মাধ্যমে সমস্ত গ্রাহকদের অবহিত করতে চান?
+DocType: Subscription Plan,Billing Interval,বিলিং বিরতি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,জীবনবৃত্তান্ত
 DocType: Hub Settings,Hub Username,হাব ইউজারনেম
 DocType: Salary Detail,Component,উপাদান
 DocType: Assessment Criteria,Assessment Criteria Group,অ্যাসেসমেন্ট নির্ণায়ক গ্রুপ
 DocType: Healthcare Settings,Patient Name By,রোগীর নাম দ্বারা
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} থেকে {1} পর্যন্ত বেতন জন্য আগমন জার্নাল এন্ট্রি
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} থেকে {1} পর্যন্ত বেতন জন্য আগমন জার্নাল এন্ট্রি
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
@@ -5070,22 +5108,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
 DocType: Leave Block List,Applies to Company,প্রতিষ্ঠানের ক্ষেত্রে প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
-DocType: Employee Loan,Disbursement Date,ব্যয়ন তারিখ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;প্রাপক&#39; নির্দিষ্ট না
+DocType: Loan,Disbursement Date,ব্যয়ন তারিখ
 DocType: BOM Update Tool,Update latest price in all BOMs,সমস্ত BOMs মধ্যে সর্বশেষ মূল্য আপডেট করুন
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,মেডিকেল সংরক্ষণ
 DocType: Vehicle,Vehicle,বাহন
 DocType: Purchase Invoice,In Words,শব্দসমূহে
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,জমা দেওয়ার আগে ব্যাংক বা ঋণ প্রতিষ্ঠানের নাম লিখুন।
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} জমা দিতে হবে
 DocType: POS Profile,Item Groups,আইটেম গোষ্ঠীসমূহ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
 DocType: Sales Order Item,For Production,উত্পাদনের জন্য
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,দয়া করে চার্ট অফ অ্যাকাউন্টগুলির একটি অস্থায়ী খোলার অ্যাকাউন্ট যোগ করুন
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,দয়া করে চার্ট অফ অ্যাকাউন্টগুলির একটি অস্থায়ী খোলার অ্যাকাউন্ট যোগ করুন
 DocType: Customer,Customer Primary Contact,গ্রাহক প্রাথমিক যোগাযোগ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,কালকাল ক্লাউজিং জার্নাল
 DocType: Project Task,View Task,দেখুন টাস্ক
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / লিড%
+DocType: Bank Guarantee,Bank Guarantee Type,ব্যাংক গ্যারান্টি প্রকার
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ইনভয়েস অংশন
 ,Asset Depreciations and Balances,অ্যাসেট Depreciations এবং উদ্বৃত্ত
@@ -5096,9 +5135,8 @@
 DocType: Production Plan,Include Subcontracted Items,Subcontracted আইটেম অন্তর্ভুক্ত করুন
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,যোগদান
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,স্টক ট্রান্সফার পরে বৈকল্পিক বৈশিষ্ট্য পরিবর্তন করা যাবে না। আপনি এটি করতে একটি নতুন আইটেম করতে হবে।
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
-DocType: Employee Loan,Repay from Salary,বেতন থেকে শুধা
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+DocType: Loan,Repay from Salary,বেতন থেকে শুধা
 DocType: Leave Application,LAP/,ভাঁজ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
@@ -5122,11 +5160,11 @@
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ডুপ্লিকেট আইটেম গ্রুপ আইটেম গ্রুপ টেবিল অন্তর্ভুক্ত
 DocType: Land Unit,Parent Land Unit,প্যারেন্ট ল্যান্ড ইউনিট
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
 DocType: Fertilizer,Fertilizer Name,সারের নাম
 DocType: Salary Slip,Net Pay,নেট বেতন
 DocType: Cash Flow Mapping Accounts,Account,হিসাব
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
 ,Requested Items To Be Transferred,অনুরোধ করা চলছে স্থানান্তর করা
 DocType: Expense Claim,Vehicle Log,যানবাহন লগ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),একটি জ্বরের উপস্থিতি (তাপমাত্রা&gt; 38.5 ° সে / 101.3 ° ফা বা স্থায়ী তাপ&gt; 38 ° সে / 100.4 ° ফা)
@@ -5167,24 +5205,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
 DocType: Asset Maintenance,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Invoice,Raw Materials Supplied,কাঁচামালের সরবরাহ
-DocType: C-Form,Series,সিরিজ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},মূল্য তালিকা মুদ্রা {0} {1} বা {2} হতে হবে
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Soil Texture,Ternary Plot,টেরনারি প্লট
 DocType: Item Group,Item Classification,আইটেম সাইট
 DocType: Driver,License Number,অনুজ্ঞাপত্র নম্বর
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,রক্ষণাবেক্ষণ যান উদ্দেশ্য
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,চালান রোগীর নিবন্ধন
 DocType: Crop,Period,কাল
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,জেনারেল লেজার
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},কর্মচারী {0} উপর ছুটিতে {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},কর্মচারী {0} উপর ছুটিতে {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,দেখুন বাড়ে
 DocType: Program Enrollment Tool,New Program,নতুন প্রোগ্রাম
 DocType: Item Attribute Value,Attribute Value,মূল্য গুন
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 DocType: Salary Detail,Salary Detail,বেতন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 DocType: Appointment Type,Physician,চিকিত্সক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,আলোচনা
@@ -5192,15 +5229,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) কর্ম আদেশ {3} থেকে পরিকল্পিত পরিমাণ ({2}) এর চেয়ে বড় হতে পারে না
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,উত্পাদন জন্য টাইম শিট.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,উপমোট
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,স্টক লেনদেনের পরে বৈকল্পিক বৈশিষ্ট্য পরিবর্তন করা যাবে না। আপনি এটি করতে একটি নতুন আইটেম করতে হবে।
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA আদেশ
 DocType: Physician,Charges,চার্জ
 DocType: Production Plan,Get Items For Work Order,কাজের আদেশ জন্য আইটেম পান
 DocType: Salary Detail,Default Amount,ডিফল্ট পরিমাণ
 DocType: Lab Test Template,Descriptive,বর্ণনামূলক
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,এই মাস এর সংক্ষিপ্ত
 DocType: Quality Inspection Reading,Quality Inspection Reading,গুণ পরিদর্শন ফাইন্যান্স
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,আপনি আপনার কোম্পানির জন্য অর্জন করতে চান একটি বিক্রয় লক্ষ্য সেট করুন।
 ,Project wise Stock Tracking,প্রকল্প জ্ঞানী স্টক ট্র্যাকিং
@@ -5228,11 +5266,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ওয়েবসাইট তৈরি করতে ব্যর্থ
 DocType: Soil Analysis,Mg/K,Mg / কে
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,ধারণন স্টক এন্ট্রি ইতিমধ্যে তৈরি বা নমুনা পরিমাণ প্রদান না
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,ধারণন স্টক এন্ট্রি ইতিমধ্যে তৈরি বা নমুনা পরিমাণ প্রদান না
 DocType: Program,Program Abbreviation,প্রোগ্রাম সমাহার
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
-DocType: Bank Guarantee,Start Date,শুরুর তারিখ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,একটি নির্দিষ্ট সময়ের জন্য পাতার বরাদ্দ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,চেক এবং আমানত ভুল সাফ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
@@ -5247,11 +5284,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ঘন্টা
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
 DocType: Purchase Invoice,04-Correction in Invoice,04 ইনভয়েস ইন সংশোধন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM এর সাথে সমস্ত আইটেমের জন্য ইতিমধ্যেই তৈরি করা অর্ডার অর্ডার
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM এর সাথে সমস্ত আইটেমের জন্য ইতিমধ্যেই তৈরি করা অর্ডার অর্ডার
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,বৈকল্পিক বিবরণ প্রতিবেদন
 DocType: Setup Progress Action,Setup Progress Action,সেটআপ অগ্রগতি অ্যাকশন
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,মূল্য তালিকা কেনা
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,মূল্য তালিকা কেনা
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,সাবস্ক্রিপশন বাতিল করুন
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,সম্পূর্ণ হিসাবে পরিচর্যা স্থিতি নির্বাচন করুন বা সমাপ্তি তারিখ সরান
 DocType: Supplier,Default Payment Terms Template,ডিফল্ট অর্থ প্রদানের টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,লেনদেনের কারেন্সি পেমেন্ট গেটওয়ে মুদ্রা একক হিসাবে একই হতে হবে
@@ -5262,7 +5300,6 @@
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,অ্যাকশন যদি সঞ্চিত মাসিক বাজেট অতিক্রম করেছে
-DocType: Subscription,Submit on creation,জমা দিন সৃষ্টির উপর
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
 DocType: Asset,Disposal Date,নিষ্পত্তি তারিখ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ইমেল দেওয়া ঘন্টা এ কোম্পানির সব সক্রিয় এমপ্লয়িজ পাঠানো হবে, যদি তারা ছুটির দিন না. প্রতিক্রিয়া সংক্ষিপ্তসার মধ্যরাতে পাঠানো হবে."
@@ -5280,6 +5317,7 @@
 DocType: Batch,Parent Batch,মূল ব্যাচ
 DocType: Cheque Print Template,Cheque Print Template,চেক প্রিন্ট টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,সাবস্ক্রিপশন বাতিল বা সাবস্ক্রিপশন অনির্ধারিত হিসাবে চিহ্নিত করার আগে চালান তালিকা শেষ হওয়ার তারিখের সংখ্যা
 DocType: Lab Test Template,Sample Collection,নমুনা সংগ্রহ
 ,Requested Items To Be Ordered,অনুরোধ করা চলছে আদেশ করা
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
@@ -5288,7 +5326,7 @@
 DocType: Account,Income,আয়
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,কিছু ভুল হয়েছে!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
 DocType: Supplier Scorecard Scoring Criteria,Score,স্কোর
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,অর্থবছরের {0} অস্তিত্ব নেই
@@ -5308,12 +5346,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 এবং 100 এর মধ্যে একটি মান হওয়া উচিত
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,পরবর্তী অবচয় তারিখটি আগে উপলব্ধ নাও হতে পারে ব্যবহারের জন্য তারিখ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,জামানতবিহীন ঋণ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,ম্যাক্স শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড বিরুদ্ধে কাজ ঘন্টা
 DocType: Maintenance Schedule Detail,Scheduled Date,নির্ধারিত তারিখ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,মোট পরিশোধিত মাসিক
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,মোট পরিশোধিত মাসিক
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 অক্ষরের বেশী বেশী বার্তা একাধিক বার্তা বিভক্ত করা হবে
 DocType: Purchase Receipt Item,Received and Accepted,গৃহীত হয়েছে এবং গৃহীত
 DocType: Hub Settings,Company and Seller Profile,কোম্পানী এবং বিক্রেতা প্রোফাইল
@@ -5327,10 +5365,9 @@
 DocType: Item,Variant Based On,ভেরিয়েন্ট উপর ভিত্তি করে
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,আপনার সরবরাহকারীদের
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,দয়া করে সংশোধন করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 DocType: Request for Quotation Item,Supplier Part No,সরবরাহকারী পার্ট কোন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,নামবিহীন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,থেকে পেয়েছি
 DocType: Lead,Converted,ধর্মান্তরিত
@@ -5344,6 +5381,7 @@
 DocType: Asset,Assets,সম্পদ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
+DocType: Subscription,Current Invoice End Date,বর্তমান ইনভয়েস শেষ তারিখ
 DocType: Payment Term,Due Date Based On,দরুন উপর ভিত্তি করে তারিখ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,বিক্রিত সেটিংসের মধ্যে ডিফল্ট গ্রাহক গোষ্ঠী এবং এলাকা সেট করুন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} অস্তিত্ব নেই
@@ -5351,7 +5389,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,জার্নাল এন্ট্রি জন্য কোন প্রতিস্থাপিত নির্বাচন
 DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
+DocType: Loan,Disbursed,বিতরণ
 DocType: Healthcare Settings,Laboratory Settings,ল্যাবরেটরি সেটিংস
 DocType: Patient Appointment,Service Unit,সার্ভিস ইউনিট
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,সফলভাবে সরবরাহকারী সেট
@@ -5364,12 +5404,12 @@
 DocType: Share Balance,No of Shares,শেয়ারের সংখ্যা
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,স্থিতি নির্বাচন করুন
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: School House,House Name,হাউস নাম
 DocType: Fee Schedule,Total Amount per Student,প্রতি শিক্ষার্থীর মোট পরিমাণ
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,বৈদ্যুতিক
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,বৈদ্যুতিক
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,আপনার প্রতিষ্ঠানের বাকি আপনার ব্যবহারকারী হিসেবে যুক্ত করো. এছাড়াও আপনি তাদের পরিচিতি থেকে যোগ করে আপনার পোর্টাল গ্রাহকরা আমন্ত্রণ যোগ করতে পারেন
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
 DocType: Grant Application,Requested Amount,অনুরোধ পরিমাণ
@@ -5379,7 +5419,7 @@
 DocType: Crop Cycle,Detected Diseases,সনাক্ত রোগ
 DocType: Stock Entry,Default Source Warehouse,ডিফল্ট সোর্স ওয়্যারহাউস
 DocType: Item,Customer Code,গ্রাহক কোড
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 DocType: Asset Maintenance Task,Last Completion Date,শেষ সমাপ্তি তারিখ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
@@ -5387,9 +5427,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless সেটিংস
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,স্টক সম্পদ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,স্টক সম্পদ
 DocType: Restaurant,Active Menu,সক্রিয় মেনু
 DocType: Target Detail,Target Qty,উদ্দিষ্ট Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ঋণের বিরুদ্ধে: {0}
 DocType: Shopping Cart Settings,Checkout Settings,চেকআউট সেটিং
 DocType: Student Attendance,Present,বর্তমান
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,হুণ্ডি {0} সম্পন্ন করা সম্ভব নয়
@@ -5398,9 +5439,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
 DocType: Vehicle Log,Odometer,দূরত্বমাপণী
 DocType: Production Plan Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
 DocType: Chapter,Chapter Head,অধ্যায় হেড
 DocType: Payment Term,Month(s) after the end of the invoice month,চালান মাস শেষে মাস (গণ)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
@@ -5408,11 +5449,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,বেতন Slips নির্মাণ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ল্যাব ফলাফল datetime পরীক্ষার তারিখের আগে না হতে পারে
 DocType: POS Profile,Allow user to edit Discount,ব্যবহারকারীকে ছাড়ের সম্পাদনা করতে অনুমতি দিন
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,থেকে গ্রাহকদের পান
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,থেকে গ্রাহকদের পান
 DocType: Purchase Invoice Item,Include Exploded Items,বিস্ফোরিত আইটেম অন্তর্ভুক্ত করুন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয় তাহলে কেনার, চেক করা আবশ্যক {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
 DocType: Shipping Rule,Restrict to Countries,দেশগুলিতে সীমাবদ্ধ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপের মাধ্যমে&gt; সেটিংস&gt; নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
 DocType: Sales Invoice Timesheet,Billing Hours,বিলিং ঘন্টা
 DocType: Project,Total Sales Amount (via Sales Order),মোট বিক্রয় পরিমাণ (বিক্রয় আদেশের মাধ্যমে)
@@ -5429,6 +5471,7 @@
 DocType: Soil Texture,Sandy Clay,স্যান্ডী ক্লে
 DocType: Grant Application,Assessment  Manager,অ্যাসেসমেন্ট ম্যানেজার
 DocType: Payment Entry,Allocate Payment Amount,বরাদ্দ পেমেন্ট পরিমাণ
+DocType: Subscription Plan,Subscription Plan,সাবস্ক্রিপশন পরিকল্পনা
 DocType: Employee External Work History,Salary,বেতন
 DocType: Serial No,Delivery Document Type,ডেলিভারি ডকুমেন্ট টাইপ
 DocType: Sales Order,Partly Delivered,আংশিক বিতরণ
@@ -5453,9 +5496,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,বুড়ো বিন্যাস 2
 DocType: SG Creation Tool Course,Max Strength,সর্বোচ্চ শক্তি
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,প্রিসেটগুলি ইনস্টল করা হচ্ছে
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},গ্রাহকের জন্য কোন ডেলিভারি নোট নির্বাচিত {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},গ্রাহকের জন্য কোন ডেলিভারি নোট নির্বাচিত {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM প্রতিস্থাপিত
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ডেলিভারি তারিখ উপর ভিত্তি করে আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ডেলিভারি তারিখ উপর ভিত্তি করে আইটেম নির্বাচন করুন
 DocType: Grant Application,Has any past Grant Record,কোন অতীতের গ্রান্ট রেকর্ড আছে
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},উপলভ্য {0}
@@ -5473,7 +5516,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,কাঁচামালের সরবরাহ খরচ
 DocType: Selling Settings,Settings for Selling Module,মডিউল বিক্রী জন্য সেটিংস
 DocType: Hotel Room Reservation,Hotel Room Reservation,হোটেল রুম সংরক্ষণ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,গ্রাহক সেবা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,গ্রাহক সেবা
 DocType: BOM,Thumbnail,ছোট
 DocType: Item Customer Detail,Item Customer Detail,আইটেম গ্রাহক বিস্তারিত
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,অপরাধ প্রার্থী একটি কাজের.
@@ -5489,7 +5532,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} শিক্ষার্থীদের নাম তালিকাভুক্ত করা হয়েছে
 DocType: Fees,Student Details,ছাত্রের বিবরণ
 DocType: Purchase Invoice Item,Stock Qty,স্টক Qty
-DocType: Employee Loan,Repayment Period in Months,মাস মধ্যে ঋণ পরিশোধের সময় সীমা
+DocType: Loan,Repayment Period in Months,মাস মধ্যে ঋণ পরিশোধের সময় সীমা
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ত্রুটি: একটি বৈধ আইডি?
 DocType: Naming Series,Update Series Number,আপডেট সিরিজ সংখ্যা
 DocType: Account,Equity,ন্যায়
@@ -5498,7 +5541,7 @@
 DocType: Task,Closing Date,বন্ধের তারিখ
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
 DocType: Timesheet,Work Detail,বিস্তারিত বিস্তারিত
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ইঞ্জিনিয়ার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ইঞ্জিনিয়ার
 DocType: Journal Entry,Total Amount Currency,মোট পরিমাণ মুদ্রা
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,অনুসন্ধান সাব সমাহারগুলি
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
@@ -5543,13 +5586,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,দাতা প্রকার তথ্য
 DocType: Request for Quotation,Supplier Detail,সরবরাহকারী বিস্তারিত
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},সূত্র বা অবস্থায় ত্রুটি: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Invoiced পরিমাণ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Invoiced পরিমাণ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,পরিমাপ ওজন 100% পর্যন্ত যোগ করা আবশ্যক
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,উপস্থিতি
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,শেয়ার চলছে
 DocType: BOM,Materials,উপকরণ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","সংযত না হলে, তালিকা থেকে এটি প্রয়োগ করা হয়েছে যেখানে প্রতিটি ডিপার্টমেন্ট যোগ করা হবে."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} তৈরি করা হচ্ছে
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,উত্স ও উদ্দিষ্ট গুদাম একই হতে পারে না
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,লেনদেন কেনার জন্য ট্যাক্স টেমপ্লেট.
@@ -5573,14 +5615,14 @@
 DocType: Shipping Rule,Fixed,স্থায়ী
 DocType: Vehicle Service,Clutch Plate,ক্লাচ প্লেট
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,প্রশাসনিক খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,প্রশাসনিক খরচ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
-DocType: Journal Entry,Subscription,চাঁদা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,চাঁদা
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ফি নির্মাণ মুলতুবি
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,বিজ্ঞপ্তি সময়কাল
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,বিজ্ঞপ্তি সময়কাল
 DocType: Asset Category,Asset Category Name,অ্যাসেট শ্রেণী নাম
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,এটি একটি root অঞ্চল এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,নতুন সেলস পারসন নাম
@@ -5593,7 +5635,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,চেকমুক্ত রেখে যান আপনি ব্যাচ বিবেচনা করার সময় অবশ্যই ভিত্তিক দলের উপার্জন করতে চাই না।
 DocType: Asset,Frequency of Depreciation (Months),অবচয় এর ফ্রিকোয়েন্সি (মাস)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ক্রেডিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
@@ -5601,7 +5643,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
 DocType: Hub Settings,Company Logo,কোম্পানী লোগো
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 DocType: Healthcare Settings,Patient Registration,রোগীর নিবন্ধন
@@ -5635,11 +5677,10 @@
 DocType: Journal Entry,Total Debit,খরচের অঙ্ক
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ডিফল্ট তৈরি পণ্য গুদাম
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,রোগীর নির্বাচন করুন
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,সেলস পারসন
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,সেলস পারসন
 DocType: Hotel Room Package,Amenities,সুযোগ-সুবিধা
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,পেমেন্ট একাধিক ডিফল্ট মোড অনুমতি দেওয়া হয় না
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,জন্য
 ,Appointment Analytics,নিয়োগের বিশ্লেষণ
 DocType: Vehicle Service,Half Yearly,অর্ধ বার্ষিক
 DocType: Lead,Blog Subscriber,ব্লগ গ্রাহক
@@ -5655,6 +5696,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ফাঁকা ছেড়ে দিন যদি আপনি প্রতি বছরে শিক্ষার্থীদের গ্রুপ করা
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","চেক করা থাকলে, মোট কোন. কার্যদিবসের ছুটির অন্তর্ভুক্ত করা হবে, এবং এই বেতন প্রতি দিন মূল্য কমাতে হবে"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","বর্তমান কী ব্যবহার করে অ্যাপস অ্যাক্সেস করতে পারবে না, আপনি কি নিশ্চিত?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,মোট অগ্রিম
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,টেম্পলেট কোড পরিবর্তন করুন
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,টার্ম শেষ তারিখ চেয়ে টার্ম শুরুর তারিখ আগেই হতে পারে না. তারিখ সংশোধন করে আবার চেষ্টা করুন.
@@ -5665,8 +5707,9 @@
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 DocType: Cheque Print Template,Signatory Position,স্বাক্ষরকারী অবস্থান
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,লস্ট হিসেবে সেট
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,লস্ট হিসেবে সেট
 DocType: Timesheet,Total Billable Hours,মোট বিলযোগ্য ঘন্টা
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,গ্রাহককে এই সাবস্ক্রিপশন দ্বারা উত্পন্ন চালান প্রদান করতে হবে এমন দিনের সংখ্যা
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,পরিশোধের রশিদের উল্লেখ্য
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,এই গ্রাহকের বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা পেমেন্ট এন্ট্রি পরিমাণ সমান নয় {2}
@@ -5685,12 +5728,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,এই কর্মচারী উপস্থিতি উপর ভিত্তি করে
 DocType: Assessment Result,Summary,সারাংশ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,মার্ক এ্যাটেনডেন্স
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ডেবিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,রেস্টুরেন্ট অর্ডার এন্ট্রি আইটেম
@@ -5702,7 +5745,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ক্রয় মূল
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,কর্মচারীর সুবিধা
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,কর্মচারীর সুবিধা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Work Order,Manufactured Qty,শিল্পজাত Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},{0} এর সাথে শেয়ার নেই
@@ -5710,12 +5753,12 @@
 DocType: Asset,Out of Order,অর্ডার আউট
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
 DocType: Projects Settings,Ignore Workstation Time Overlap,ওয়ার্কস্টেশন সময় ওভারল্যাপ উপেক্ষা করুন
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ব্যাচ নাম্বার নির্বাচন
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
 DocType: Patient Service Unit,Medical Administrator,মেডিকেল অ্যাডমিনিস্ট্রেটর
 DocType: Assessment Plan,Schedule,সময়সূচি
 DocType: Account,Parent Account,মূল অ্যাকাউন্ট
@@ -5745,15 +5788,16 @@
 DocType: Asset Repair,Repair Status,স্থায়ী অবস্থা মেরামত
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 DocType: POS Profile,Account for Change Amount,পরিমাণ পরিবর্তনের জন্য অ্যাকাউন্ট
 DocType: Purchase Invoice,input service,ইনপুট পরিষেবা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,রক্ষণাবেক্ষণ দলের সদস্য
 DocType: Agriculture Analysis Criteria,Soil Analysis,মাটি বিশ্লেষণ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,কোর্স কোড:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Employee,Current Address,বর্তমান ঠিকানা
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
@@ -5801,19 +5845,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},জন্য অ্যাডমিশন {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,পরিবর্তনশীল নাম
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
 DocType: Asset,Asset Category,অ্যাসেট শ্রেণী
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,নেট বেতন নেতিবাচক হতে পারে না
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,সরবরাহকারী উপাদান
 DocType: Soil Texture,Loamy Sand,দোআঁশ বালি
 DocType: Production Plan,Material Request Planning,উপাদান অনুরোধ পরিকল্পনা
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,আবগারি চালান
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ট্রেশহোল্ড {0}% একবারের বেশি প্রদর্শিত
 DocType: Expense Claim,Employees Email Id,এমপ্লয়িজ ইমেইল আইডি
 DocType: Employee Attendance Tool,Marked Attendance,চিহ্নিত এ্যাটেনডেন্স
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,বর্তমান দায়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,বর্তমান দায়
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,টাইমার দেওয়া ঘন্টা অতিক্রম করেছে।
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ভর এসএমএস আপনার পরিচিতি পাঠান
 DocType: Patient,A Positive,হ্যাঁ সূচক
@@ -5824,9 +5868,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} বর্তমানে একটি {1} সরবরাহকারী স্কোরকার্ড দাঁড়িয়ে আছে, এবং এই সরবরাহকারীকে ক্রয় আদেশগুলি সতর্কতার সাথে জারি করা উচিত।"
 DocType: Asset Maintenance Team,Asset Maintenance Team,সম্পদ রক্ষণাবেক্ষণ টিম
-DocType: Employee Loan,Loan Type,ঋণ প্রকার
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} সফলভাবে জমা দেওয়া হয়েছে
+DocType: Loan,Loan Type,ঋণ প্রকার
 DocType: Scheduling Tool,Scheduling Tool,পূর্বপরিকল্পনা টুল
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ক্রেডিট কার্ড
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা repacked করা
 DocType: Employee Education,Major/Optional Subjects,মেজর / ঐচ্ছিক বিষয়াবলী
 DocType: Sales Invoice Item,Drop Ship,ড্রপ জাহাজ
@@ -5858,7 +5903,7 @@
 DocType: Item,Units of Measure,পরিমাপ ইউনিট
 DocType: Manufacturing Settings,Allow Production on Holidays,ছুটির উৎপাদন মঞ্জুরি
 DocType: Sales Invoice,Customer's Purchase Order Date,গ্রাহকের ক্রয় আদেশ তারিখ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,মূলধন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,মূলধন
 DocType: Shopping Cart Settings,Show Public Attachments,জন সংযুক্তিসমূহ দেখান
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
 DocType: Restaurant Reservation,Reservation Time,সংরক্ষণের সময়
@@ -5873,7 +5918,7 @@
 DocType: Purchase Order,To Receive and Bill,জখন এবং বিল থেকে
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,সারি # {0}: তারিখ দ্বারা রেকিড লেনদেন তারিখের আগে হতে পারে না
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,বৈশিষ্ট্যযুক্ত পণ্য
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ডিজাইনার
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
@@ -5883,20 +5928,20 @@
 DocType: Driver,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
 DocType: Healthcare Settings,Employee name and designation in print,প্রিন্টে কর্মচারী নাম এবং পদবী
 ,accounts-browser,হিসাব-ব্রাউজার
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +13,Project master.,প্রকল্প মাস্টার.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ওভার বিলিং বা ওভার ক্রম মঞ্জুরির জন্য &quot;ভাতা&quot; আপডেট স্টক সেটিং বা আইটেম মধ্যে.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(অর্ধদিবস)
 DocType: Payment Term,Credit Days,ক্রেডিট দিন
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ল্যাব পরীক্ষা পেতে রোগীর নির্বাচন করুন
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
 DocType: Fee Schedule,FRQ.,FRQ।
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,সময় দিন লিড
 DocType: Cash Flow Mapping,Is Income Tax Expense,আয়কর ব্যয় হয়
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,এই চেক শিক্ষার্থীর ইন্সটিটিউটের হোস্টেল এ অবস্থিত হয়।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
 ,Stock Summary,শেয়ার করুন সংক্ষিপ্ত
@@ -5907,10 +5952,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,সুত্র তারিখ
 DocType: Employee,Reason for Leaving,ত্যাগ করার জন্য কারণ
 DocType: BOM Operation,Operating Cost(Company Currency),অপারেটিং খরচ (কোম্পানি মুদ্রা)
-DocType: Employee Loan Application,Rate of Interest,সুদের হার
+DocType: Loan Application,Rate of Interest,সুদের হার
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: Item,Shelf Life In Days,দিন শেল্ফ লাইফ
 DocType: GL Entry,Is Opening,খোলার
+DocType: Department,Expense Approvers,ব্যয় অ্যাপস
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 DocType: Journal Entry,Subscription Section,সাবস্ক্রিপশন বিভাগ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 0ea20e8..f967e84 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Izveštaji o proceni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Detalji pretplate
 DocType: Supplier Scorecard,Notify Supplier,Obavijestiti dobavljača
 DocType: Item,Customer Items,Customer Predmeti
 DocType: Project,Costing and Billing,Cijena i naplata
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite stavku da hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail obavijesti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,procjena
 DocType: Item,Default Unit of Measure,Zadana mjerna jedinica
 DocType: SMS Center,All Sales Partner Contact,Svi kontakti distributera
-DocType: Employee,Leave Approvers,Ostavite odobravateljima
+DocType: Department,Leave Approvers,Ostavite odobravateljima
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Istrage
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ovo se zasniva na transakcije protiv tog dobavljača. Pogledajte vremenski okvir ispod za detalje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Pravni
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Stvarni tip porez ne može biti uključen u stopu stavka u nizu {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Pravni
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Stvarni tip porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: Bank Guarantee,Customer,Kupci
 DocType: Purchase Receipt Item,Required By,Potrebna Do
 DocType: Delivery Note,Return Against Delivery Note,Vratiti protiv Isporuka Napomena
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ili grupe) protiv kojih Računovodstvo unosi se izrađuju i sredstva se održavaju.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nema podnesenih plata za obradu.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nema podnesenih plata za obradu.
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaži otvoren
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Neophodno je i danas preduzeti ovu akciju za gore pomenuto ponavljanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serija Updated uspješno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Provjeri
 DocType: Pricing Rule,Apply On,Primjeni na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Support Settings,Support Settings,podrška Postavke
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Stavka Status isteka
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Nacrt
 DocType: Membership,membership validaty section,članak validaty sekcija
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 DocType: Consultation,Consultation,Konsultacije
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materijal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Pravljenje web stranice
 DocType: Opening Invoice Creation Tool Item,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Računi stol ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Računi stol ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
 DocType: Item,Country of Origin,Zemlja porijekla
 DocType: Soil Texture,Soil Texture Criteria,Kriterijumi za teksturu tla
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primarni kontakt podaci
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otvorena pitanja
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 DocType: Lab Test Groups,Add new line,Dodajte novu liniju
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Zdravstvena zaštita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
@@ -89,7 +85,7 @@
 ,Delay Days,Dani odlaganja
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Detaljna težina stavke
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Costing iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Molimo odaberite Cjenik
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Radovi u toku
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Molimo izaberite datum
 DocType: Daily Work Summary Group,Holiday List,Lista odmora
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Računovođa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Računovođa
 DocType: Hub Settings,Selling Price List,Prodajni cjenik
 DocType: Patient,Tobacco Current Use,Upotreba duvana
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prodajna stopa
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Prodajna stopa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonski broj
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Novi {0}: {1} #
 DocType: Delivery Trip,Initial Email Notification Sent,Poslato je prvo obaveštenje o e-mailu
 ,Sales Partners Commission,Prodaja Partneri komisija
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Vrijednost Nakon Amortizacija
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,povezan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Datum prisustvo ne može biti manji od datuma pristupanja zaposlenog
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Datum prisustvo ne može biti manji od datuma pristupanja zaposlenog
 DocType: Grading Scale,Grading Scale Name,Pravilo Scale Ime
-DocType: Subscription,Repeat on Day,Ponavljam na dan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: Sales Invoice,Company Address,Company Adresa
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
+DocType: Subscription,Subscription Start Date,Datum početka pretplate
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Priložiti .csv datoteku s dvije kolone, jedan za stari naziv i jedna za novo ime"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne u bilo kojem aktivnom fiskalne godine.
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, Šifra: {1} i kupaca: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Krajnji datum probnog perioda ne može biti pre početka probnog perioda
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nije naveden za stavku podizvođača {0} na redu {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista firma je ušao više od jednom
 DocType: Patient,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dozvoljeno za {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Get stavke iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Get stavke iz
 DocType: Price List,Price Not UOM Dependant,Cena nije UOM zavisna
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake ulje
 DocType: Tax Rule,Tax Type,Vrste poreza
 ,Completed Work Orders,Završene radne naloge
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,oporezivi iznos
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,oporezivi iznos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Satnica / 60) * Puna radno vrijeme
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Red # {0}: Referentni tip dokumenta mora biti jedan od potraživanja troškova ili unosa dnevnika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Izaberite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Red # {0}: Referentni tip dokumenta mora biti jedan od potraživanja troškova ili unosa dnevnika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Izaberite BOM
 DocType: SMS Log,SMS Log,SMS log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih Predmeti
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Upravljaju iznos koji se daje zaposlenom
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Obaveštenje o isporuci
 DocType: Journal Entry,Opening Entry,Otvaranje unos
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun plaćaju samo
-DocType: Employee Loan,Repay Over Number of Periods,Otplatiti Preko broj perioda
+DocType: Loan,Repay Over Number of Periods,Otplatiti Preko broj perioda
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
 DocType: Lead,Product Enquiry,Na upit
 DocType: Education Settings,Validate Batch for Students in Student Group,Potvrditi Batch za studente u Studentskom Group
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nema odmora Snimanje pronađena za zaposlenog {0} za {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nema odmora Snimanje pronađena za zaposlenog {0} za {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Molimo najprije odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Molimo najprije odaberite Company
 DocType: Employee Education,Under Graduate,Pod diplomski
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Molimo podesite podrazumevani obrazac za obaveštenje o statusu ostavljanja u HR postavkama.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,zaposlenik kredita
 DocType: Fee Schedule,Send Payment Request Email,Pošaljite zahtev za plaćanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nekretnine
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Uspešno neregistrovani.
 DocType: Assessment Result,Grade,razred
 DocType: Restaurant Table,No of Seats,Broj sedišta
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Da biste dodali dinamički predmet, koristite oznake tipa jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: Asset Maintenance Task,Asset Maintenance Task,Zadatak održavanja sredstava
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Godišnja zarada
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Godišnja zarada
 DocType: Daily Work Summary,Daily Work Summary,Svakodnevni rad Pregled
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} je smrznuto
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Troškovi
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Odaberite Target Skladište
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite Preferred Kontakt mail
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Unesite Preferred Kontakt mail
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Primarna adresa
 DocType: Production Plan,Material Request Detail,Zahtev za materijal za materijal
 DocType: Selling Settings,Default Quotation Validity Days,Uobičajeni dani valute kvotiranja
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Vozačke dozvole Kategorije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Molimo unesite datum isporuke
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Amortizacija Entry
+DocType: HR Settings,Leave Settings,Ostavite podešavanja
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Make zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,radiodifuzija
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Način podešavanja POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Onemogućava kreiranje evidencija vremena protiv radnih naloga. Operacije neće biti praćene radnim nalogom
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,izvršenje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalji o poslovanju obavlja.
 DocType: Asset Maintenance Log,Maintenance Status,Održavanje statusa
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalji o članstvu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: dobavljača se protiv plaćaju račun {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ukupan broj sati: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Prednost
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Prednost
 DocType: Grant Application,Individual,Pojedinac
 DocType: Academic Term,Academics User,akademici korisnika
 DocType: Cheque Print Template,Amount In Figure,Iznos Na slici
-DocType: Employee Loan Application,Loan Info,kredit Info
+DocType: Loan Application,Loan Info,kredit Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Period perioda ocenjivanja dobavljača
 DocType: Share Transfer,Share Transfer,Share Transfer
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Šablon predmeta
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemija
 DocType: Job Offer,Select Terms and Conditions,Odaberite uvjeti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out vrijednost
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce postavke
 DocType: Production Plan,Sales Orders,Sales Orders
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Zadani teritorij
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizija
 DocType: Work Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Izaberite kupca ili dobavljača.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Enable Perpetual Inventory,Omogućiti vječni zaliha
+DocType: Bank Guarantee,Charges Incurred,Napunjene naknade
 DocType: Company,Default Payroll Payable Account,Uobičajeno zarade plaćaju nalog
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update-mail Group
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Prilagođeni rezultat
 DocType: Delivery Stop,Contact Name,Kontakt ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji procjene naravno
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Porezni ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Porezni ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student ID:
 DocType: POS Customer Group,POS Customer Group,POS kupaca Grupa
 DocType: Land Unit,Land Unit describing various land assets,Zemaljska jedinica koja opisuje različite imovine zemljišta
@@ -374,9 +371,8 @@
 ,Open Work Orders,Otvorite radne naloge
 DocType: Payment Term,Credit Months,Kreditni meseci
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Neto Pay ne može biti manja od 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Da biste zaustavili slanje ponavljajućih obaveštenja o greškama iz sistema, u pretplatu smo označili polje Disabled"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Ostavlja per Godina
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Ostavlja per Godina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Email Digest,Profit & Loss,Dobiti i gubitka
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Molimo da podesite studente pod studentskim grupama
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,banka unosi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,banka unosi
 DocType: Crop,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ne kontaktirati
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Ljudi koji predaju u vašoj organizaciji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Course Scheduling Tool,Course Start Date,Naravno Ozljede Datum
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Objavite u Hub
 DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Kupnja Detalji
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nove ponude
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poruke plate slip zaposlenog na osnovu preferirani mail izabrane u zaposlenih
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,Dostava županije
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Učiti
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učiti
 DocType: Asset,Next Depreciation Date,Sljedeća Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Trošak po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti očistiti
 DocType: Item,Synced With Hub,Pohranjen Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ne može biti negativan za stavku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ne može biti negativan za stavku {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Pogrešna lozinka
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Molimo podesite Hotel Room Rate na {}
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Otpremnica
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Poreza
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Troškovi prodate imovine
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno rasporedu Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Hitno] Greška prilikom kreiranja ponavljajućeg% s za% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Period primene ne može biti preko dve evidencije alokacije
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Period primene ne može biti preko dve evidencije alokacije
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Primljeno
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Napravi studentske grupe
 DocType: Volunteer,Weekends,Vikendi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredit Napomena Iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredit Napomena Iznos
 DocType: Setup Progress Action,Action Document,Akcioni dokument
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,gotovih proizvoda
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj Predmeti
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete artikala
+DocType: Leave Application,Leave Approver Name,Ostavite Approver Ime
 DocType: Depreciation Schedule,Schedule Date,Raspored Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Zarada, Odbici i ostale komponente plata"
 DocType: Packed Item,Packed Item,Dostava Napomena Pakiranje artikla
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Healthcare Settings,Require Lab Test Approval,Zahtevati odobrenje za testiranje laboratorija
 DocType: Salary Slip Timesheet,Working Hours,Radno vrijeme
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total Outstanding
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 DocType: Dosage Strength,Strength,Snaga
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Kreiranje novog potrošača
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,potrošni cost
 DocType: Purchase Receipt,Vehicle Date,Vozilo Datum
 DocType: Student Log,Medical,liječnički
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Razlog za gubljenje
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Razlog za gubljenje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Ažurirajte broj računa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti isti kao olovo
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od neprilagođena iznosa
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Singl
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
-DocType: Subscription,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Unesite troška
 DocType: Drug Prescription,Dosage,Doziranje
 DocType: Journal Entry Account,Sales Order,Narudžbe kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosj. Prodaja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Prosj. Prodaja Rate
 DocType: Assessment Plan,Examiner Name,Examiner Naziv
 DocType: Lab Test Template,No Result,Bez rezultata
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Pokažite liste svih članova departmana u kalendaru
 DocType: Purchase Invoice,01-Sales Return,01-Povratak prodaje
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,U očekivanju Narudžbenice
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obavezna polja - akademska godina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nije povezan sa {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Prilagodite uvodni tekst koji ide kao dio tog e-maila. Svaka transakcija ima zaseban uvodni tekst.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Molimo postavite zadani plaća račun za kompaniju {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Molimo postavite zadani plaća račun za kompaniju {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakcija nije dozvoljena zaustavljen Radni nalog {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zapis o radniku je kreiran odabirom polja .
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodaju
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ne možete promijeniti način vrednovanja, jer postoje transakcije protiv nekih stvari koje nemaju svoj vlastiti način vrednovanja"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ne možete promijeniti način vrednovanja, jer postoje transakcije protiv nekih stvari koje nemaju svoj vlastiti način vrednovanja"
 DocType: Student Report Generation Tool,Attended by Parents,Prisustvuju roditelji
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Patient,AB Positive,AB Pozitivan
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Gledatelja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za obračun plata na osnovu timesheet.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
-DocType: Employee Loan,Total Payment,Ukupna uplata
+DocType: Loan,Total Payment,Ukupna uplata
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Ne mogu otkazati transakciju za Završeni radni nalog.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazan tako da akcija ne može završiti
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta dijelova za izgradnju
 DocType: POS Profile User,POS Profile User,POS korisnik profila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direktni prihodi
+DocType: Subscription Invoice,Subscription Invoice,Pretplata faktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direktni prihodi
 DocType: Patient Appointment,Date TIme,Date TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Osnivanje preduzeća i porezi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Molimo odaberite predmeta
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Molimo odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Molimo odaberite Company
 DocType: Stock Entry Detail,Difference Account,Konto razlike
 DocType: Purchase Invoice,Supplier GSTIN,dobavljač GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Šablon za mapiranje toka gotovine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
+DocType: Bank Guarantee,Providing,Pružanje
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nije dopušteno, konfigurirati Lab Test Template po potrebi"
 DocType: Patient,Risk Factors,Faktori rizika
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 DocType: Healthcare Settings,Appointment Confirmation,Potvrda o imenovanju
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Zatvaranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,zdravo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Move Stavka
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Već je postavljeno podrazumevano u profilu pos {0} za korisnika {1}, obično je onemogućeno podrazumevano"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akumulirani Vrijednosti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Teritorija je potrebna u POS profilu
 DocType: Supplier,Prevent RFQs,Sprečite RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Provjerite prodajnog naloga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Plata za slanje poslata za period od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Plata za slanje poslata za period od {0} do {1}
 DocType: Project Task,Project Task,Projektni zadatak
 ,Lead Id,Lead id
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Datum isporuke
 DocType: Production Plan,Production Plan,Plan proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvaranje alata za kreiranje fakture
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupna izdvojena lišće {0} ne smije biti manja od već odobrenih lišće {1} za period
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Postavite količinu u transakcijama na osnovu Serijski broj ulaza
 ,Total Stock Summary,Ukupno Stock Pregled
 DocType: Announcement,Posted By,Postavljeno od
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),P.S. (Pot)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Molimo vas da postavite poduzeća
 DocType: Share Balance,Share Balance,Podeli Balans
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Training Result Employee,Training Result Employee,Obuka Rezultat zaposlenih
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
-DocType: Repayment Schedule,Principal Amount,iznos glavnice
-DocType: Employee Loan Application,Total Payable Interest,Ukupno plaćaju interesa
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,iznos glavnice
+DocType: Loan Application,Total Payable Interest,Ukupno plaćaju interesa
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Ukupno izvanredan: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 DocType: Land Unit,Land Unit Name,Naziv jedinice zemljišta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Zavijanje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Obaveštavajte kupce putem e-pošte
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Obaveštavajte kupce putem e-pošte
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna osoba Sales {0} postoji s istim ID zaposlenih
 DocType: Employee Advance,Claimed Amount,Zahtevani iznos
 apps/erpnext/erpnext/config/education.py +180,Masters,Majstori
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa kreiranu, molimo vas da napravite ručno."
 DocType: Supplier Scorecard,Per Year,Godišnje
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nije prihvatljiv za prijem u ovom programu prema DOB-u
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
 DocType: Vital Signs,Height (In Meter),Visina (u metrima)
 DocType: Student,Sibling Details,Polubrat Detalji
 DocType: Vehicle Service,Vehicle Service,Servis vozila
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatski aktivira zahtjev povratne informacije na osnovu uslova.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatski aktivira zahtjev povratne informacije na osnovu uslova.
 DocType: Employee,Reason for Resignation,Razlog za ostavku
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Predložak za ocjene rada .
 DocType: Sales Invoice,Credit Note Issued,Kreditne Napomena Zadani
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Raspored održavanja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Neto promjena u zalihama
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Zaposlenik kredit za upravljanje
 DocType: Employee,Passport Number,Putovnica Broj
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Odnos sa Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,menadžer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,menadžer
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Molimo postavite nalog u skladištu {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Materijal transfera
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Ne mogu pronaći putanju za
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),P.S. (Dug)
+DocType: Loan,Applicant,Podnosilac prijave
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Da se ponavljaju dokumenti
 ,GST Itemised Purchase Register,PDV Specificirane Kupovina Registracija
 DocType: Course Scheduling Tool,Reschedule,Ponovo raspored
-DocType: Employee Loan,Total Interest Payable,Ukupno kamata
+DocType: Loan,Total Interest Payable,Ukupno kamata
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Sleteo Troškovi poreza i naknada
 DocType: Work Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,završiti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,baza
 DocType: Timesheet,Total Billed Hours,Ukupno Fakturisana Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Napišite paušalni iznos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Napišite paušalni iznos
 DocType: Leave Block List Allow,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Račun br
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / gubitak računa na Asset Odlaganje
 DocType: Vehicle Log,Service Details,usluga Detalji
-DocType: Subscription,Quarterly,Kvartalno
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Grupisano
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush sirovine na osnovu
 DocType: Sales Invoice,Port Code,Port Code
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervni skladište
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervni skladište
 DocType: Lead,Lead is an Organization,Olovo je organizacija
 DocType: Guardian Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Konta
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (Zadnje)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šabloni za kriterijume rezultata dobavljača.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Plaćanje Ulaz je već stvorena
 DocType: Request for Quotation,Get Suppliers,Uzmite dobavljača
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Plaća Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Plaća Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je ušao više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Možete obnoviti samo ako vaše članstvo istekne u roku od 30 dana
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Samo izaberite ako imate postavke Map Flower Documents
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Supplier Scorecard,Per Week,Po tjednu
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company i računi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,u vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,u vrijednost
 DocType: Asset Settings,Depreciation Options,Opcije amortizacije
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Neispravno vreme slanja poruka
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Neispravno vreme slanja poruka
 DocType: Lead,Campaign Name,Naziv kampanje
 DocType: Hotel Room,Capacity,Kapacitet
 DocType: Selling Settings,Close Opportunity After Days,Zatvori Opportunity Nakon nekoliko dana
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Budget,Budget Against,budžet protiv
 DocType: Employee,Cell Number,Mobitel Broj
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterijume nema zaposlenika. Proverite da li su listovi plata još uvek nisu kreirani.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterijume nema zaposlenika. Proverite da li su listovi plata još uvek nisu kreirani.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izaberite tabelu
 DocType: BOM,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &#39;Primaocima&#39;
 DocType: Special Test Items,Particulars,Posebnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Asset,Maintenance,Održavanje
+DocType: Subscriber,Subscriber,Pretplatnik
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Molimo Vas da ažurirate svoj status projekta
 DocType: Item,Maximum sample quantity that can be retained,Maksimalna količina uzorka koja se može zadržati
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Početne postavke za Košarica
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Dodaj Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset odbačen preko Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Prihod od kamata računa
+DocType: Loan,Interest Income Account,Prihod od kamata računa
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Poslato
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnologija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Troškovi održavanja ureda
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Idi
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Postavljanje e-pošte
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Unesite predmeta prvi
 DocType: Asset Repair,Downtime,Zaustavljanje
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademski termin:
 DocType: Salary Detail,Do not include in total,Ne uključujte u potpunosti
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Količina uzorka {0} ne može biti veća od primljene količine {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 DocType: Item,Max Sample Quantity,Maksimalna količina uzorka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Bez dozvole
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Bez dozvole
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citiraj zatraženo
 DocType: Vital Signs,Heart Rate / Pulse,Srčana brzina / impuls
 DocType: Company,Default Bank Account,Zadani bankovni račun
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratorijski testovi i vitalni znaci
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Niti jedan zaposlenik pronađena
-DocType: Subscription,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Student Grupa je već ažurirana.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Student Grupa je već ažurirana.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Ažuriranje projekta.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 DocType: Land Unit,Tree Details,Tree Detalji
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Sve grupe artikala
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
 DocType: Work Order,Item To Manufacture,Artikal za proizvodnju
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} {2} status
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Ponovo odaberite, ako je izabrana adresa uređena nakon čuvanja"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 DocType: Item,Hub Publishing Details,Detalji izdavanja stanice
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Otvaranje&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Otvaranje&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Lab Test Template,Result Format,Format rezultata
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,časopis koji izlazi svaka dva mjeseca
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Sadržaj đubriva
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Istraživanje i razvoj
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznos za naplatu
 DocType: Company,Registration Details,Registracija Brodu
 DocType: Timesheet,Total Billed Amount,Ukupno Fakturisana iznos
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Provjerite kreditni limit za obilaznicu na nalogu za prodaju
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Ocjenjivanje.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi se za korpa &quot;, kao košarica je omogućen i treba da postoji barem jedan poreza pravilo za Košarica"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plaćanje Entry {0} je povezan protiv Order {1}, proverite da li treba da se povuče kao napredak u ovom računu."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plaćanje Entry {0} je povezan protiv Order {1}, proverite da li treba da se povuče kao napredak u ovom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-prodaju
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimalno sedenje
 DocType: Item Attribute,Item Attribute Values,Stavka Atributi vrijednosti
 DocType: Examination Result,Examination Result,ispitivanje Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referentni Doctype mora biti jedan od {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materijal za podsklopove
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nema stavki za prenos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nema stavki za prenos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
 DocType: Journal Entry,Depreciation Entry,Amortizacija Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Stopa ili popust
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoriti
 DocType: Hub Settings,Custom Data,Korisnički podaci
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Glina sastav (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Molimo vas da sačuvate pre nego što dodate zadatak.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Vrijednost bilance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Vrijednost bilance
 DocType: Lab Test,Lab Technician,Laboratorijski tehničar
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Sales Cjenovnik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ako se proveri, biće kreiran korisnik, mapiran na Pacijent. Pacijentove fakture će biti stvorene protiv ovog Korisnika. Takođe možete izabrati postojećeg kupca prilikom stvaranja Pacijenta."
 DocType: Bank Reconciliation,Account Currency,Valuta račun
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Navedite zaokružimo računa u Company
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,komponente
 DocType: Item Barcode,Item Barcode,Barkod artikla
 DocType: Woocommerce Settings,Endpoints,Krajnje tačke
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","da se generiše. Ako je odloženo, morate ručno promijeniti polje &quot;Ponovi na dan dana&quot; ovoga"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
 DocType: Share Transfer,From Folio No,Od Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Narudzbine avans
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Datum dostupan za upotrebu
 DocType: Guardian,Guardian Name,Guardian ime
 DocType: Cheque Print Template,Has Print Format,Ima Print Format
-DocType: Employee Loan,Sanctioned,sankcionisani
+DocType: Loan,Sanctioned,sankcionisani
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,Obavezan unos. Možda nije kreirana valuta za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &#39;proizvoda Bundle&#39; stavki, Magacin, serijski broj i serijski broj smatrat će se iz &#39;Pakiranje List&#39; stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo &#39;Bundle proizvoda&#39; stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u &#39;Pakiranje List&#39; stol."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &#39;proizvoda Bundle&#39; stavki, Magacin, serijski broj i serijski broj smatrat će se iz &#39;Pakiranje List&#39; stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo &#39;Bundle proizvoda&#39; stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u &#39;Pakiranje List&#39; stol."
 DocType: Student Admission,Publish on website,Objaviti na web stranici
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
+DocType: Subscription,Cancelation Date,Datum otkazivanja
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 DocType: Agriculture Task,Agriculture Task,Poljoprivreda zadatak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Neizravni dohodak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Neizravni dohodak
 DocType: Student Attendance Tool,Student Attendance Tool,Student Posjeta Tool
 DocType: Restaurant Menu,Price List (Auto created),Cenovnik (Automatski kreiran)
 DocType: Cheque Print Template,Date Settings,Datum Postavke
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Labiranje testiranja datotime ne može biti pre snimanja datetime
+DocType: Subscription Plan,Cost,Troškovi
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 DocType: Expense Claim,Total Advance Amount,Ukupan avansni iznos
 DocType: Delivery Stop,Estimated Arrival,Procijenjeni dolazak
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
 DocType: Timesheet Detail,Bill,račun
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bijel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Bijel
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Količina nije dostupan za {4} u skladištu {1} na postavljanje trenutku stupanja ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Iz liste polja za potvrdu možete izabrati najviše jedne opcije.
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 DocType: Item,Automatically Create New Batch,Automatski Create New Batch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Dodjeljivanje {0} do {1} (red {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Napraviti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Dodjeljivanje {0} do {1} (red {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Napraviti
 DocType: Student Admission,Admission Start Date,Prijem Ozljede Datum
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novi zaposleni
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
 DocType: Repayment Schedule,Balance Loan Amount,Balance Iznos kredita
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Raspored predmeta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Stock Opcije
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Stock Opcije
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Onemogućite preuzimanje zadnje kupovne detalje u narudžbenici
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Da li zaista želite da vratite ovaj ukinut imovine?
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: Purchase Invoice,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Kreiranje varijante je stavljeno u red.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Pregled radova za {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Atribut sto je obavezno
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvi dozvoljni otpust na listi biće postavljen kao podrazumevani Leave Approver.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Plan,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ne može biti negativna
 DocType: Training Event,Self-Study,Samo-studiranje
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,Plata
 DocType: Asset Maintenance,Maintenance Manager Name,Ime menadžera održavanja
 DocType: Agriculture Task,Urgent,Hitan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Molimo navedite važeću Row ID za redom {0} {1} u tabeli
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Molimo navedite važeću Row ID za redom {0} {1} u tabeli
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nije moguće pronaći varijablu:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Molimo izaberite polje za uređivanje iz numpad-a
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Ne može biti osnovna stavka sredstva kao što je stvorena knjiga zaliha.
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvalitetno ime za proveru kvaliteta
 DocType: Project,First Email,Prva e-pošta
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Share Transfer,Issue,Tiketi
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,State dostava
 ,Projected Quantity as Source,Projektovanih količina kao izvor
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Dostava putovanja
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Dostava putovanja
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tip prenosa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Prodajni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Prodajni troškovi
 DocType: Consultation,Diagnosis,Dijagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Provedba partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Izaberete račun prihoda od kamata u pozajmici {0}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Izrada Stock unosi
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjom Ispravka Procenat
-DocType: Employee Loan,Repayment Schedule,otplata Raspored
+DocType: Loan,Repayment Schedule,otplata Raspored
 DocType: Shipping Rule Condition,Shipping Rule Condition,Uslov pravila transporta
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Education Settings,Attendance Freeze Date,Posjećenost Freeze Datum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Pogledaj sve proizvode
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalna Olovo Starost (Dana)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Svi sastavnica
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Sobe Hotela tipa {0} nisu dostupne na {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Od zaposlenika
 DocType: Driver,Cellphone Number,Broj mobitela
 DocType: Project,Monitor Progress,Napredak monitora
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Odjeljak
 DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Područje djelovanja
 DocType: Program Enrollment,Transportation,Prevoznik
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Invalid Atributi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
+DocType: Department Approver,Department Approver,Odjel Odobrenja
 DocType: SMS Center,Total Characters,Ukupno Likovi
 DocType: Employee Advance,Claimed,Tvrdio
 DocType: Crop,Row Spacing,Razmak redova
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Doprinos%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Prema Kupnja Postavke ako Narudžbenice željeni == &#39;DA&#39;, onda za stvaranje fakturi, korisnik treba prvo stvoriti Narudžbenice za stavku {0}"
+,HSN-wise-summary of outward supplies,HSN-mudar-rezime izvora isporuke
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Naziv akcije
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Početak godine
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Prva 2 cifre GSTIN treba se podudarati s državnim broj {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Početak datum tekućeg razdoblja dostavnice
 DocType: Salary Slip,Leave Without Pay,Ostavite bez plaće
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapaciteta za planiranje Error
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja će se kopirati samo u trenutku kreiranja.
 DocType: Setup Progress Action,Domains,Domena
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnog datuma završetka """
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,upravljanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,upravljanje
 DocType: Cheque Print Template,Payer Settings,Payer Postavke
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Oprez
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Dan početka je veći od kraja dana u zadatku &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Povratak / Debit Napomena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Povratak / Debit Napomena
 DocType: Price List Country,Price List Country,Cijena Lista država
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod artikla ne može se mijenjati za serijski broj.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kod artikla ne može se mijenjati za serijski broj.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konverzijski faktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Unesite Šifra da Batch Broj
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Grant informacije.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Grant informacije.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Šifarnik dobavljača
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Ne možete ponovo pokrenuti pretplatu koja nije otkazana.
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
 DocType: Fee Validity,Valid Till,Valid Till
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Ukupno sastanak učitelja roditelja
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Promena klijentske grupe za izabranog klijenta nije dozvoljena.
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
 DocType: Program Enrollment Tool,Enrollment Details,Detalji upisa
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Izaberite kupca
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Purchase Order,Group same items,Grupa iste stavke
 DocType: Purchase Invoice,Disable Rounded Total,Ugasiti zaokruženi iznos
-DocType: Employee Loan Application,Repayment Info,otplata Info
+DocType: Department,Parent Department,Odeljenje roditelja
+DocType: Loan Application,Repayment Info,otplata Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 DocType: Maintenance Team Member,Maintenance Role,Uloga održavanja
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Postavljanje Zaposlenih
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Rezervacija korisnika hotela
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Odaberite prefiks prvi
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,istraživanje
+DocType: Subscription Settings,Subscription Settings,Podešavanja pretplate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Molimo navedite barem jedan atribut atribute tabeli
 DocType: Announcement,All Students,Svi studenti
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Crop Cycle,Less than a year,Manje od godinu dana
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 DocType: Crop,Yield UOM,Primarni UOM
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
 DocType: Item,Is Item from Hub,Je stavka iz Hub-a
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Red {0}: Aktivnost Tip je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Isplaćene dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Isplaćene dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Iznos
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} na Ušću na {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Zadržana dobit
 DocType: Purchase Invoice,05-Change in POS,05-Promena u POS
 DocType: Vehicle Log,Service Detail,Servis Detail
 DocType: BOM,Item Description,Opis artikla
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Poslovna prilika artikla
 ,Student and Guardian Contact Details,Student i Guardian Kontakt detalji
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljač {0}-mail adresa je potrebno za slanje e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Privremeno Otvaranje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Privremeno Otvaranje
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,View Hub
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 DocType: Patient Appointment,More Info,Više informacija
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
 DocType: Supplier Scorecard,Scorecard Actions,Action Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Primer: Masters u Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Odbijen galerija
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,Za
 DocType: Supplier Quotation Item,Lead Time in days,Potencijalni kupac u danima
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Računi se plaćaju Sažetak
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testiranje laboratorijskih testova
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Mali
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Stavka o otvaranju fakture kreiranja stavke
 DocType: Education Settings,Employee Number,Broj radnika
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Otkaži fakturu nakon grejs perioda
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,Završen%
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijsko ispitivanje Datetime
 DocType: Email Digest,Add Quote,Dodaj Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Neizravni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 DocType: Agriculture Analysis Criteria,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Molimo prvo postavite kod za stavku
 DocType: Item,ITEM-,Artikl-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+DocType: Subscription Plan,Billing Interval Count,Interval broja obračuna
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Team Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Napravi Print Format
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Stavka Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativni predmet ne sme biti isti kao kod stavke
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Završetak privremene procjene
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljač
 DocType: Healthcare Settings,Registration Message,Poruka za upis
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardver
 DocType: Prescription Dosage,Prescription Dosage,Dosage na recept
 DocType: Attendance,HR Manager,Šef ljudskih resursa
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Molimo odaberite poduzeća
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Datume početka i završetka
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otvorena BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Project Update,Great/Quickly,Odlično / brzo
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Molimo odaberite serija za dozirana stavku
 DocType: Asset,Depreciation Schedules,Amortizacija rasporedi
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Sledeći nalogi mogu biti izabrani u GST Podešavanja:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Sledeći nalogi mogu biti izabrani u GST Podešavanja:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Odlazni
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Naziv i tip
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Physician,Contacts and Address,Kontakti i adresa
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',""" Očekivani datum početka ' ne može biti veći od očekivanog datuma završetka"""
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Prihvatljivost i Detalji
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevni pregled komunikacije
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup iz portala, za više postavki portal ček."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljač Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Iznos nabavke
 DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Bilo je grešaka u kreiranju rasporeda kursa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi Expens Approver na listi biće postavljen kao podrazumevani Expens Approver.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ne može biti veća od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
@@ -1839,15 +1844,16 @@
 DocType: Package Code,Package Code,paket kod
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,šegrt
 DocType: Purchase Invoice,Company GSTIN,kompanija GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porez detalj stol učitani iz stavka master kao string i pohranjeni u ovoj oblasti.
  Koristi se za poreza i naknada"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Zaposleni ne može prijaviti samog sebe.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposleni ne može prijaviti samog sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Ostavite odobrenje u obaveznoj aplikaciji
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Porez pravilo za transakcije.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Rok plaćanja na redu {0} je možda duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Poljoprivreda (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Odreskom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,najam ureda
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke Setup SMS gateway
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Odreskom
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,najam ureda
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Postavke Setup SMS gateway
 DocType: Disease,Common Name,Zajedničko ime
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Još nema unijete adrese.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 DocType: Vital Signs,Blood Pressure,Krvni pritisak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Potvrditi upisala kurs za studente u Studentskom Group
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Item,Item Attribute,Stavka Atributi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Vlada
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Preuzmi {0} već postoji za putnom
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institut ime
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Unesite iznos otplate
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Unesite iznos otplate
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Stavka Varijante
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Usluge
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Plaća Slip na zaposlenog
 DocType: Cost Center,Parent Cost Center,Roditelj troška
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Odaberite Moguće dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Odaberite Moguće dobavljač
 DocType: Sales Invoice,Source,Izvor
 DocType: Customer,"Select, to make the customer searchable with these fields",Izaberite da biste potrošaču omogućili pretragu sa ovim poljima
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show zatvoren
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Novčani tok iz ulagačkih
 DocType: Program Course,Program Course,program kursa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Homepage,Company Tagline for website homepage,Kompanija Tagline za web stranice homepage
 DocType: Item Group,Item Group Name,Naziv grupe artikla
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Details
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays o važnim dana.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Molimo unesite sve potrebne vrijednosti rezultata (i)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Potraživanja Pregled
-DocType: Employee Loan,Monthly Repayment Amount,Mjesečna otplate Iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Potraživanja Pregled
+DocType: Loan,Monthly Repayment Amount,Mjesečna otplate Iznos
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Otvaranje faktura
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
 DocType: UOM,UOM Name,UOM Ime
 DocType: GST HSN Code,HSN Code,HSN Kod
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Doprinos Iznos
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Korisnik {0} je već dodeljen lekaru {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kutija
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,moguće dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,moguće dobavljač
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mjesečni Distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Zdravstvo (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nema stavki za omot
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
-DocType: Employee Loan,Repayment Method,otplata Način
+DocType: Loan,Repayment Method,otplata Način
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ako je označeno, na početnu stranicu će biti default Stavka grupe za web stranicu"
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifikat je potreban
 DocType: Company,Default Holiday List,Uobičajeno Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: Od vremena i do vremena od {1} je preklapaju s {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Izaberite kompaniju
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Odsek za štampu
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Korisnik {0} nema podrazumevani POS profil. Provjerite Podrazumevano na Rowu {1} za ovog Korisnika.
 DocType: Student Group,Set 0 for no limit,Set 0 za no limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Red {idx}: {polje} je potreban za kreiranje Opening {invoice_type} faktura
 DocType: Customer,Primary Address and Contact Detail,Primarna adresa i kontakt detalji
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovo pošaljite mail plaćanja
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Izaberite najmanje jedan domen.
 DocType: Dependent Task,Dependent Task,Zavisna Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
 DocType: SMS Center,Receiver List,Lista primalaca
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Traži Stavka
 DocType: Payment Schedule,Payment Amount,Plaćanje Iznos
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,Pravilo Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,već završena
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock u ruci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock u ruci
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
 DocType: Customer,Customer POS Id,Kupac POS Id
 DocType: Account,Account Name,Naziv konta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Molimo unesite URL adresu Woocommerce Servera
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 DocType: Share Balance,To No,Da ne
-DocType: Subscription,Reference Document,referentni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
-DocType: Grant Application,Applicant Type,Tip podnosioca zahteva
+DocType: Loan,Applicant Type,Tip podnosioca zahteva
 DocType: Purchase Invoice,03-Deficiency in services,03-Nedostatak usluga
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standardni medicinski kodni standard
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturisana
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Viši Prihodi
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,odbiti
 DocType: Journal Entry Account,Debit in Company Currency,Debit u Company valuta
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make isplata Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Make isplata Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora biti debitne
 DocType: Company,Default Values,Default vrijednosti
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Ukupno (bez poreza)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Available
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Available
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet planiranje (Dana)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,nabavka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obavezna polja - Program
 DocType: Special Test Template,Result Component,Komponenta rezultata
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantni  rok
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Uključiti praznika u roku od lišća što je lišće
 DocType: Sales Invoice,Packed Items,Pakirano Predmeti
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantni rok protiv Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Ukupno&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Ukupno&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Enable Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potvrdi akciju
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ispunjenje
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Pogledaj u košaricu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Troškovi marketinga
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Ne mogu napraviti standardne kriterijume. Molim preimenovati kriterijume
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Material Request,Transferred,prebačen
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Prikupiti naknadu za registraciju pacijenta
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ne mogu promijeniti atribute nakon transakcije sa akcijama. Napravite novu stavku i prenesite zalihu na novu stavku
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ne mogu promijeniti atribute nakon transakcije sa akcijama. Napravite novu stavku i prenesite zalihu na novu stavku
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,porez Raspad
 DocType: Packing Slip,PS-,PS-
@@ -2212,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Napredak zaposlenih
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instruktor
 DocType: Grant Application,Assessment  Mark (Out of 10),Oznaka ocene (od 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Nema
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika iz polja je obavezna
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Izdvojena iznosu
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Regija Ime
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Planove možete imati samo sa istim ciklusom naplate na Pretplati
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i upute
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
@@ -2242,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Appraisals
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Događaji obuke
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Vodite praćenje po izvorima izvora.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Molimo unesite
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Molimo unesite
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Dnevnik održavanja
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
@@ -2253,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Share Management
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Plaćanje
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Skladište {0} nije povezan na bilo koji račun, navedite račun u zapisnik skladištu ili postaviti zadani popis računa u firmi {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Upravljanje narudžbe
 DocType: Work Order Operation,Actual Time and Cost,Stvarno vrijeme i troškovi
@@ -2267,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Leave aplikacije
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
@@ -2277,7 +2285,7 @@
 DocType: Item,Barcodes,Barkodovi
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Pomoćnik
 DocType: Asset Movement,Asset Movement,Asset pokret
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Radni nalog {0} mora biti dostavljen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,novi Košarica
@@ -2295,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti jednaka valuti valute kompanije ili valute partijskog računa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Red {0}: Due Date ne može biti pre datuma objavljivanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Red {0}: Due Date ne može biti pre datuma objavljivanja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Napravite unos Plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree financijskih troškova centara.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
@@ -2315,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Potrošnja materijala nije podešena u proizvodnim postavkama.
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne mogu preoptereti za stavku {0} u redu {1} više od {2}. Da biste omogućili prekomerno obračunavanje, molimo vas postavite u postavke zaliha"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne mogu preoptereti za stavku {0} u redu {1} više od {2}. Da biste omogućili prekomerno obračunavanje, molimo vas postavite u postavke zaliha"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update Response
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
@@ -2326,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Prvo izaberite program
 DocType: Patient Appointment,Patient Age,Pacijentsko doba
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Upravljanje projektima
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serijski broj {0} je već vraćen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serijski broj {0} je već vraćen
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Asset Maintenance Log,Planned,Planirano
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Podrazumevani računi potraživanja koji će se koristiti ako nisu postavljeni u Pacijentu da rezervišu Konsultacije.
 DocType: Vehicle Log,Fuel Price,Cena goriva
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Budžet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Set Open
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
@@ -2345,16 +2353,16 @@
 DocType: Lead,Follow Up,Pratite gore
 DocType: Item,Is Sales Item,Je artikl namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupe artikala
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Održavanje Vrijeme
 ,Amount to Deliver,Iznose Deliver
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Ista stavka je uneta više puta. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Ozljede Datum ne može biti ranije od godine Početak Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposleni {0} već je prijavio za {1} između {2} i {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Bilo je grešaka .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposleni {0} već je prijavio za {1} između {2} i {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
 DocType: Education Settings,Instructor Records to be created by,Instruktorske zapise koje kreira
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} kreirao
 DocType: GST Account,GST Account,GST račun
@@ -2374,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Dodato u Favorites
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nijedan obrazovni list koji je dostavljen za navedene kriterijume ILI već dostavljen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Carine i porezi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nijedan obrazovni list koji je dostavljen za navedene kriterijume ILI već dostavljen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Carine i porezi
 DocType: Projects Settings,Projects Settings,Postavke projekata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosi isplate ne mogu biti filtrirani po {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree stavke skupina .
 DocType: Production Plan,Total Produced Qty,Ukupno proizvedeni količina
 DocType: Payroll Entry,Get Employee Details,Dobijte podatke o zaposleniku
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 DocType: Asset,Sold,prodan
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Iznos (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Sirovine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Sirovine
 DocType: Payment Reconciliation Payment,Reference Row,referentni Row
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Izbrisati sve transakcije za ovu kompaniju
 DocType: Patient,O Positive,O Pozitivno
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investicije
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investicije
 DocType: Issue,Resolution Details,Detalji o rjesenju problema
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Nema otplate dostupnih za unos novina
 DocType: Item Attribute,Attribute Name,Atributi Ime
 DocType: BOM,Show In Website,Pokaži Na web stranice
 DocType: Shopping Cart Settings,Show Quantity in Website,Pokaži Količina u Web stranice
-DocType: Employee Loan Application,Total Payable Amount,Ukupan iznos
+DocType: Loan Application,Total Payable Amount,Ukupan iznos
 DocType: Task,Expected Time (in hours),Očekivano trajanje (u satima)
 DocType: Item Reorder,Check in (group),Check in (grupa)
 DocType: Soil Texture,Silt,Silt
@@ -2424,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,izvrši plaćanje
 DocType: Room,Room Name,Soba Naziv
 DocType: Prescription Duration,Prescription Duration,Trajanje recepta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adrese i kontakti kupaca
 ,Campaign Efficiency,kampanja efikasnost
@@ -2442,11 +2451,11 @@
 DocType: Chapter,Chapter,Poglavlje
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Podrazumevani nalog će se automatski ažurirati u POS računu kada je izabran ovaj režim.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Prodajni partner adrese i kontakti
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Poludnevni datum treba biti između Od datuma i Do datuma
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Poludnevni datum treba biti između Od datuma i Do datuma
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Molimo da podesite Centar za podrazumevane troškove u kompaniji {0}.
 DocType: Item,Has Batch No,Je Hrpa Ne
@@ -2464,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet)
 DocType: Soil Texture,Soil Type,Vrsta zemljišta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nova poruka
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,Glavna kategorija
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
-DocType: Employee Loan,Loan Amount,Iznos kredita
+DocType: Loan,Loan Amount,Iznos kredita
 DocType: Student Report Generation Tool,Add Letterhead,Dodaj slovo
 DocType: Program Enrollment,Self-Driving Vehicle,Self-vožnje vozila
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Standing Scorecard Standing
@@ -2512,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,Pozicija
 DocType: Patient,Patient Details,Detalji pacijenta
 DocType: Patient,B Positive,B Pozitivan
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 DocType: Patient Medical Record,Patient Medical Record,Medicinski zapis pacijenta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa Non-grupa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportovi
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Ukupno Actual
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,student Siblings
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detalji pretplate
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,jedinica
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Navedite tvrtke
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Asset Maintenance Task,Maintenance Task,Zadatak održavanja
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Molimo postavite B2C Limit u GST Settings.
@@ -2537,6 +2546,7 @@
 ,BOM Search,BOM pretraga
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Ukupni troškovi potrošnje materijala (preko zaliha zaliha)
 DocType: Hub Settings,Company Registered,Registrovana kompanija
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Datum ne može biti manji od datuma
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Objavite &quot;Na lageru&quot; ili &quot;Nema na lageru&quot; na Hub-u na osnovu raspoloživih zaliha u ovom skladištu.
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valuta u Company
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nakon materijala Zahtjevi su automatski podignuta na osnovu nivou ponovnog reda stavke
 DocType: Email Digest,Pending Sales Orders,U očekivanju Prodajni nalozi
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
 DocType: Employee,Create User Permission,Kreirajte dozvolu korisnika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
 DocType: Healthcare Settings,Remind Before,Podsjeti prije
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 DocType: Item,Retain Sample,Zadrži uzorak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i do vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Razlika
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite zaposlenih Id ove prodaje osoba
 DocType: Territory,Classification of Customers by region,Klasifikacija Kupci po regiji
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,U proizvodnji
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato Banka bilans
 DocType: Normal Test Template,Normal Test Template,Normalni testni šablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invaliditetom korisnika
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Ponude
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Ne možete postaviti primljeni RFQ na No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Ponude
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Ne možete postaviti primljeni RFQ na No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Izaberite nalog za štampanje u valuti računa
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ovo se zasniva na transakcijama protiv ovog pacijenta. Za detalje pogledajte vremenski okvir ispod
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Troškova Ažurirano
 DocType: Patient,Date of Birth,Datum rođenja
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Artikal {0} je već vraćen
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Adresa Lead-a
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Podešavanje Scorecard-a
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Opis posla
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Opis posla
 DocType: Student Applicant,Applied,Applied
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Ponovno otvorena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Ponovno otvorena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Količina po burzi UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ime
 DocType: Purchase Invoice,02-Post Sale Discount,Popust za prodaju 02-post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne kampanje. Pratite Lead-ove, Ponude, Porudžbenice itd iz Kampanje i procijeniti povrat investicije."
+DocType: Department Approver,Approver,Odobritelj
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Polje Za dioničara ne može biti prazno
 DocType: Guardian,Work Address,rad Adresa
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupan dodijeljeni iznos (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpadnog materijala troškova
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
 DocType: Grant Application,Email Notification Sent,Poslato obaveštenje o pošti
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Šifra proizvoda, skladište, količina su potrebna u redu"
-DocType: Pricing Rule,Supplier,Dobavljači
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Šifra proizvoda, skladište, količina su potrebna u redu"
+DocType: Bank Guarantee,Supplier,Dobavljači
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Prikaži podatke o plaćanju
 DocType: Consultation,Consultation Time,Vrijeme konsultacije
 DocType: C-Form,Quarter,Četvrtina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Razni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,Iznad
-DocType: Employee Loan,Employee Loan Account,Zaposlenik kredit računa
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan invalide
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Broj Interaction
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",poglavlja / chapter_name ostavite prazno automatski nakon podešavanja poglavlja.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Molimo postavite GST račune u GST podešavanjima
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Molimo postavite GST račune u GST podešavanjima
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tip poslovanja
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Troškovi New Kupovina
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,Grant Opis
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 DocType: Student Guardian,Others,Drugi
+DocType: Subscription,Discounts,Popusti
 DocType: Payment Entry,Unallocated Amount,neraspoređenih Iznos
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodati ili držati u čoporu."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nema više ažuriranja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ovo pokriva sve sisteme rezultata povezanih sa ovim postavkama
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Molimo vas da uklonite stavku `{0}` i uštedite
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankarstvo
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,Servis Stavka
 DocType: Bank Guarantee,Bank Guarantee,Bankarska garancija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Grading Scale,Grading Scale Intervals,Pravilo Scale Intervali
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Dobit za godinu
+DocType: Bank Guarantee,Name of Bank,Naziv banke
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Računovodstvo Ulaz za {2} može se vršiti samo u valuti: {3}
 DocType: Fee Schedule,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tree financijskih računa.
+DocType: Bank Guarantee,Reference Document Type,Referentni dokument Tip
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapiranje tokova gotovine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serijalizovanoj zaliha
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pošta nije pronađena u podrazumevanom kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generiraj tajnu
-DocType: Employee Loan,Account Info,Account Info
+DocType: Loan,Account Info,Account Info
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
 DocType: Fees,Include Payment,Uključi plaćanje
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} studentskih grupa stvorio.
 DocType: Sales Invoice,Total Billing Amount,Ukupan iznos naplate
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program u strukturi naknada i studentskoj grupi {0} su različiti.
 DocType: Fee Schedule,Receivable Account,Potraživanja račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
 DocType: Quotation Item,Stock Balance,Kataloški bilanca
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Naloga prodaje na isplatu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Uz plaćanje poreza
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tri primjerka ZA SUPPLIER
 DocType: Land Unit,Is Container,Je kontejner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ovo će biti dan 1 ciklusa usjeva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Molimo odaberite ispravan račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Molimo odaberite ispravan račun
 DocType: Purchase Invoice Item,Weight UOM,Težina UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Spisak dostupnih akcionara sa brojevima folije
 DocType: Salary Structure Employee,Salary Structure Employee,Plaća Struktura zaposlenih
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Prikaži varijante atributa
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Prikaži varijante atributa
 DocType: Student,Blood Group,Krvna grupa
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,uredske opreme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,uredske opreme
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Companies
 DocType: Supplier Scorecard,Scoring Setup,Podešavanje bodova
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,To je potrebno Debit
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Kupoprodajna cijena List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šabloni varijabli indeksa dobavljača.
 DocType: Job Offer Term,Offer Term,Ponuda Term
 DocType: Asset,Quality Manager,Quality Manager
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Operacija
 DocType: Supplier Scorecard,Supplier Score,Ocjena dobavljača
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Ukupno Fakturisana Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Ukupno Fakturisana Amt
 DocType: Supplier,Warn RFQs,Upozorite RFQs
 DocType: BOM,Conversion Rate,Stopa konverzije
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Traži proizvod
 DocType: Assessment Plan,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
+DocType: Loan,Total Amount Paid,Ukupan iznos plaćen
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Molimo izaberite Studentski prijem koji je obavezan za učeniku koji je platio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Izaberite cjenovnik za objavljivanje cijene
@@ -2741,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je onemogućen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završena Količina ne može biti više od {1} za rad {2}
 DocType: Manufacturing Settings,Allow Overtime,Omogućiti Prekovremeni rad
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijalizovanoj Stavka {0} ne može se ažurirati pomoću Stock pomirenje, molimo vas da koristite Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijalizovanoj Stavka {0} ne može se ažurirati pomoću Stock pomirenje, molimo vas da koristite Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Treningu zaposlenih
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimalni uzorci - {0} mogu biti zadržani za seriju {1} i stavku {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Dodajte vremenske utore
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za artikal {1}. koji ste trazili {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za artikal {1}. koji ste trazili {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Rate
 DocType: Training Event,Advance,Advance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,zbog ponovnog ponavljanja.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless postavke gateway plaćanja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange dobitak / gubitak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange dobitak / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada kompaniji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada kompaniji {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nije moguće pronaći DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nije pronađena
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Pretplata je bila {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program raspoređivanja naknada
 DocType: Fee Schedule Program,Student Batch,student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Make Student
@@ -2786,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne Isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Predloži kategoriju?
 DocType: Stock Reconciliation Item,Current Amount,Trenutni iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgrade
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,zgrade
 DocType: Fee Schedule,Fee Structure,naknada Struktura
 DocType: Timesheet Detail,Costing Amount,Costing Iznos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
 DocType: Student Admission Program,Application Fee,naknada aplikacija
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Slanje plaće Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm popusta za točke {0} je {1} %
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Ime / Naziv pošiljaoca
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriterijumi za analizu poljoprivrede
+DocType: HR Settings,Leave Approval Notification Template,Napustite šablon za upozorenje o odobrenju
 DocType: POS Profile,[Select],[ izaberite ]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni pritisak (dijastolni)
 DocType: SMS Log,Sent To,Poslati
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Ostvariti prodaju fakturu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,softvera
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,softvera
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za referencu samo.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lekar {0} nije dostupan na {1}
@@ -2824,7 +2838,7 @@
 DocType: Employee,New Workplace,Novi radnom mjestu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Potrošnja materijala
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Postavi status Zatvoreno
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No Stavka s Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No Stavka s Barcode {0}
 DocType: Normal Test Items,Require Result Value,Zahtevaj vrednost rezultata
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2839,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nema aktivnih ili zadani Plaća Struktura nađeni za zaposlenog {0} za navedeni datumi
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Mobilni broj kupca
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ponavlja
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalji šablona za mapiranje gotovog toka
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Upravljanje zajmovima
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite odvojene prihoda i rashoda za vertikala proizvod ili podjele.
 DocType: Rename Tool,Rename Tool,Preimenovanje alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Pokaži Plaća Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Pokaži Plaća Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Prijenos materijala
 DocType: Fees,Send Payment Request,Pošaljite zahtev za plaćanje
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Water Analysis,Origin,Poreklo
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Izaberite promjene iznos računa
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Da li je porez na dohodak
 DocType: Grading Scale Interval,Grade Description,Grade Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,kapara
 DocType: Sales Invoice, Shipping Bill Number,Broj pošiljke
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sljedivost
 DocType: Asset Maintenance Log,Actions performed,Izvršene akcije
 DocType: Cash Flow Mapper,Section Leader,Rukovodilac odjela
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Radnik
+DocType: Bank Guarantee,Fixed Deposit Number,Fiksni depozitni broj
 DocType: Asset Repair,Failure Date,Datum otkaza
 DocType: Sample Collection,Collected Time,Prikupljeno vreme
 DocType: Company,Sales Monthly History,Prodaja mesečne istorije
@@ -2890,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Da li ste sigurni da želite da otkažete ovaj termin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket za hotelsku sobu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Izvrši ažuriranje pretplate
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Računa {0} ne odgovara Company {1} u režimu računa: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurs:
@@ -2903,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Stvaranje radnih naloga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plaća listić od zaposlenika {0} već kreirali za ovaj period
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 DocType: Purchase Invoice,Credit To,Kreditne Da
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nema citata
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Plaćanje računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Neto promjena u Potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,kompenzacijski Off
 DocType: Job Offer,Accepted,Prihvaćeno
@@ -2933,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo Vas da proverite da li ste zaista želite izbrisati sve transakcije za ovu kompaniju. Tvoj gospodar podaci će ostati kao što je to. Ova akcija se ne može poništiti.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Search Results
 DocType: Room,Room Number,Broj sobe
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Invalid referentni {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Invalid referentni {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 DocType: Journal Entry Account,Payroll Entry,Unos plata
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,View Fees Records
@@ -2943,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Lab Test Sample,Lab Test Sample,Primjer laboratorijskog testa
 DocType: Item Variant Settings,Allow Rename Attribute Value,Dozvoli preimenovati vrednost atributa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Brzi unos u dnevniku
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 DocType: Restaurant,Invoice Series Prefix,Prefix serije računa
 DocType: Employee,Previous Work Experience,Radnog iskustva
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integracija Google mapa nije omogućena
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nije proslijedjen
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Datum isteka članstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} mora biti negativan za uzvrat dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} mora biti negativan za uzvrat dokumentu
 ,Minutes to First Response for Issues,Minuta na prvi odgovor na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Prilika (Opportunity)
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Prilika (Opportunity)
 DocType: Operation,Default Workstation,Uobičajeno Workstation
 DocType: Notification Control,Expense Claim Approved Message,Rashodi Zahtjev Odobren poruku
 DocType: Payment Entry,Deductions or Loss,Smanjenja ili gubitak
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plate ne odgovara odobrenim Records Ostaviti Primjena
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
 DocType: Membership,USD,Američki dolar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravite fakturu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Preostali iznos
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Bar kod {0} nije važeći {1} kod
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,do kraja godine
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Driver,Driver,Vozač
 DocType: Vital Signs,Nutrition Values,Vrednosti ishrane
 DocType: Lab Test Template,Is billable,Da li se može naplatiti
@@ -3029,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni Ozljede Datum (preko Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Starenje Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Ukupan iznos uplate ne može biti veći od ukupne tražene iznose
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Ukupan iznos uplate ne može biti veći od ukupne tražene iznose
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Odaberite vrijednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdavanje dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Sljedeća kontaktirati putem ne može biti isti kao Lead-mail adresa
 DocType: Tax Rule,Billing City,Billing Grad
@@ -3101,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,Usluga Adresa
 DocType: Asset Maintenance Task,Calibration,Kalibracija
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} je praznik kompanije
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures i raspored
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Ostavite obaveštenje o statusu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures i raspored
 DocType: Item,Manufacture,Proizvodnja
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Izvještaj o laboratorijskom testu
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,Sala za sadnju
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ovo može biti zbog nekih nevažećih e-mail adresa u
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,trening Rezultat
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,Proizvodi po stranici
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,komunalna Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nema nalog {2} ili već usklađeni protiv drugog vaučer
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterij Težina
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Ostavite odobrenje za odobrenje
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Plaća za klađenje na Timesheet osnovu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Procenat kupovine
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Procenat kupovine
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Zadane vrijednosti kao što su tvrtke , valute , tekuće fiskalne godine , itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Košarica Settings
 DocType: Journal Entry,Accounting Entries,Računovodstvo unosi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako je izabrano odredište za cenu &quot;Rate&quot;, on će prepisati cenovnik. Pravilnost cena je konačna stopa, tako da se ne bi trebao koristiti dodatni popust. Stoga, u transakcijama kao što su Prodajni nalog, Narudžbenica i slično, to će biti preuzeto u polju &#39;Rate&#39;, a ne &#39;Polje cijena&#39;."
+DocType: Journal Entry,Paid Loan,Paid Loan
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Dupli unos. Provjerite pravila za autorizaciju {0}
 DocType: Journal Entry Account,Reference Due Date,Referentni rok za dostavljanje
 DocType: Purchase Order,Ref SQ,Ref. SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,platni spisak
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
 DocType: Patient Service Unit,Parent Service Unit,Jedinica za roditeljsku službu
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Make korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
@@ -3192,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Konto prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Isporuka
 DocType: Volunteer,Weekdays,Radnim danima
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: Restaurant Menu,Restaurant Menu,Restoran meni
@@ -3200,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Postaviti zadani račun inventar za trajnu inventar
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Postaviti zadani račun inventar za trajnu inventar
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Pošaljite e-poruku za Grant Review
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage je puna, nije spasio"
@@ -3208,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapacitet sobe
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Već postoji zapis za stavku {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Izgubićete podatke o prethodno generisanim računima. Da li ste sigurni da želite ponovo pokrenuti ovu pretplatu?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Kotizaciju
 DocType: Budget,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Country
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Sakriti poreza Id klijenta iz transakcija prodaje
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Stock Stupanje / Dostavnica / kupiti primitka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Voditelj marketinga i prodaje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Porez na dohodak
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Idite u Letterheads
+DocType: Subscription,Cancel At End Of Period,Otkaži na kraju perioda
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nije izabrana stavka za prenos
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nije izabrana stavka za prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Napredak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Dobit / Gubitak imovine Odlaganje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Dobit / Gubitak imovine Odlaganje
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Samo studentski kandidat sa statusom &quot;Odobreno&quot; biće izabran u donjoj tabeli.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Broj računa za račun {0} nije dostupan. <br> Molimo pravilno podesite svoj račun.
 DocType: Task,Depends on Tasks,Ovisi o Zadaci
@@ -3248,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nije raspoloživo
 DocType: Volunteer,Volunteer Skills,Volonterske veštine
 DocType: Appraisal,HR User,HR korisnika
+DocType: Bank Guarantee,Reference Document Name,Referentni naziv dokumenta
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
 apps/erpnext/erpnext/hooks.py +142,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
@@ -3261,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Ekstra veliki
+DocType: Loan,Loan Application,Aplikacija za kredit
 DocType: Crop,Scientific Name,Naučno ime
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Ukupno Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Ponovo izaberi, ako je odabrani kontakt uređen nakon čuvanja"
@@ -3270,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Broj čeka
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Veliki
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Istaknuti proizvoda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Sve procjene Grupe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Sve procjene Grupe
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladište Ime
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regija
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,naknade
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Odredite Exchange Rate pretvoriti jedne valute u drugu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Ponuda {0} je otkazana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Ukupno preostali iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Ukupno preostali iznos
 DocType: Sales Partner,Targets,Mete
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Molimo registrirajte broj SIREN-a u informacijskoj datoteci kompanije
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 DocType: Price List,Price List Master,Cjenik Master
 DocType: GST Account,CESS Account,CESS nalog
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izaberite Pacijent
 DocType: Price List,Applicable for Countries,Za zemlje u
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Ime parametra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo Prijave sa statusom &quot;Odobreno &#39;i&#39; Odbijena &#39;se može podnijeti
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Ime grupe je obavezno u redu {0}
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na sajtu homepage
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
@@ -3352,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Račun je već kreiran za sva vremena plaćanja
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ime greška: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Da li je finansijski trošak
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Podesite podrazumevani kupac u podešavanjima restorana
 ,Salary Register,Plaća Registracija
 DocType: Warehouse,Parent Warehouse,Parent Skladište
-DocType: C-Form Invoice Detail,Net Total,Osnovica
+DocType: Subscription,Net Total,Osnovica
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Uobičajeno sastavnice nije pronađen za Stavka {0} i projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definirati različite vrste kredita
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Izvanredna Iznos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (u min)
@@ -3391,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root račun mora biti grupa
 DocType: Drug Prescription,Drug Prescription,Prescription drugs
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Otplaćen / Closed
+DocType: Loan,Repaid/Closed,Otplaćen / Closed
 DocType: Item,Total Projected Qty,Ukupni planirani Količina
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa procene nije pronađena za stavku {0}, koja je obavezna da izvrši računovodstvene unose za {1} {2}. Ako je stavka transakcija kao stavka nulte stope procjene u {1}, molimo vas da navedete to u tabeli {1} Item. U suprotnom, molimo vas da kreirate dolaznu transakciju sa akcijama za stavku ili da navedete stopu procene u zapisu Stavke, a zatim pokušajte da podnesete / poništite ovaj unos"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 DocType: Course,Course Code,Šifra predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: POS Settings,Use POS in Offline Mode,Koristite POS u Offline načinu
@@ -3415,16 +3439,15 @@
 DocType: Purchase Invoice,Deemed Export,Pretpostavljeni izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
-DocType: Subscription,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ste već ocijenili za kriterije procjene {}.
 DocType: Vehicle Service,Engine Oil,Motorno ulje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Objavljeni radni nalogi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Objavljeni radni nalogi: {0}
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-DocType: Employee Loan,Loan Details,kredit Detalji
+DocType: Loan,Loan Details,kredit Detalji
 DocType: Company,Default Inventory Account,Uobičajeno zaliha računa
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio brojevi se ne podudaraju
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
@@ -3436,19 +3459,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Veza sa svim zemljišnim jedinicama u kojima rastu usevi
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: ne mogu vratiti više od {1} {2} za tačka
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: ne mogu vratiti više od {1} {2} za tačka
 DocType: Item Group,Show this slideshow at the top of the page,Prikaži ovaj slideshow na vrhu stranice
 DocType: BOM,Item UOM,Mjerna jedinica artikla
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Iznos PDV-a Nakon Popust Iznos (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Cheque Print Template,Primary Settings,primarni Postavke
 DocType: Purchase Invoice,Select Supplier Address,Izaberite dobavljač adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Dodaj zaposlenog
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Dodaj zaposlenog
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 DocType: Payment Request,Mute Email,Mute-mail
@@ -3468,11 +3491,10 @@
 DocType: SMS Log,No of Sent SMS,Ne poslanih SMS
 DocType: Antibiotic,Healthcare Administrator,Administrator zdravstvene zaštite
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Postavite cilj
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
 DocType: Dosage Strength,Dosage Strength,Snaga doziranja
 DocType: Account,Expense Account,Rashodi račun
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Boja
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteriji Plan Procjena
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Datum isteka je obavezan za odabranu stavku
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Sprečite kupovne naloge
@@ -3485,18 +3507,18 @@
 DocType: Patient,Personal and Social History,Lična i društvena istorija
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Korisnik {0} kreiran
 DocType: Fee Schedule,Fee Breakup for each student,Naknada za svaki student
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Promeni kod
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dizel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Cjenik valuta ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Cjenik valuta ne bira
 DocType: Purchase Invoice,Availed ITC Cess,Iskoristio ITC Cess
 ,Student Monthly Attendance Sheet,Student Mjesečni Posjeta list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o isporuci primenjuje se samo za prodaju
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka Projekta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Do
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Student Grupe ili Terminski plan je obavezno
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavati Billing vrijeme i Radno vrijeme ista na Timesheet
@@ -3516,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Navedite svoje proizvode ili usluge koje kupujete ili prodajete.
 DocType: Water Analysis,Storage Temperature,Temperatura skladištenja
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Posjeta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,istraživač
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Upis Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Datum početka trebalo bi da bude manji od datuma završetka zadatka {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ili e-obavezno
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} trenutno ima {1} Scorecard stava i RFQs ovog dobavljača treba izdati oprezno.
 DocType: Chapter,Non Profit Manager,Neprofitni menadžer
 DocType: BOM,Total Cost(Company Currency),Ukupni troškovi (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serijski Ne {0} stvorio
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Homepage,Company Description for website homepage,Kompanija Opis za web stranice homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ime
@@ -3539,11 +3561,10 @@
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
 DocType: Healthcare Settings,Result Printed,Result Printed
 DocType: Asset Category Account,Depreciation Expense Account,Troškovi amortizacije računa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Probni rad
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Pregled {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Probni rad
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Project,Total Costing Amount (via Timesheets),Ukupni iznos troškova (preko Timesheeta)
-DocType: Employee Advance,Expense Approver,Rashodi Approver
+DocType: Department,Expense Approver,Rashodi Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
 DocType: Project,Hourly,Po satu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-grupe do grupe
@@ -3552,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To datuma i vremena
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
 DocType: Accounts Settings,Make Payment via Journal Entry,Izvršiti uplatu preko Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,otisnut na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,otisnut na
 DocType: Item,Inspection Required before Delivery,Inspekcija Potrebna prije isporuke
 DocType: Item,Inspection Required before Purchase,Inspekcija Obavezno prije kupnje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
@@ -3562,7 +3583,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalna količina narudžbine
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,naknade Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Unesite olakšavanja datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Obavesti zaposlenika
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
@@ -3572,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Ponovno red Level
 DocType: Company,Chart Of Accounts Template,Kontni plan Template
 DocType: Attendance,Attendance Date,Gledatelja Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
@@ -3580,10 +3601,11 @@
 DocType: Item,Valuation Method,Vrednovanje metoda
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Unesite ime Korisnika pre podnošenja.
 DocType: Program Enrollment Tool,Get Students,Get Studenti
 DocType: Serial No,Under Warranty,Pod jamstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Greska]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Greska]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendani zaposlenih
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Molimo izaberite Datum završetka za završeno popravljanje
@@ -3602,7 +3624,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervisano za podugovaranje
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 DocType: Shopping Cart Settings,Orders,Narudžbe
-DocType: Employee Leave Approver,Leave Approver,Ostavite odobravatelju
+DocType: Department,Leave Approver,Ostavite odobravatelju
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Molimo odaberite serije
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Procjena Ime grupe
@@ -3646,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Gusjen stavka
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL primatelja
 DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ovaj e-mail je autogenerisan
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost Nakon Korisni Life
@@ -3671,21 +3692,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Rekord {0} postoji protiv Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortizacija Eliminisan zbog raspolaganje imovinom
-DocType: Member,Member,Član
+DocType: Loan,Member,Član
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje Adrese
 DocType: Work Order Item,Work Order Item,Work Order Item
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Poljoprivredni menadžer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
 DocType: Supplier Scorecard Period,Variables,Varijable
 DocType: Employee Internal Work History,Employee Internal Work History,Istorija rada zaposlenog u preduzeću
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Zatvaranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Računa {0} ne odgovara Company {1}
@@ -3693,7 +3714,6 @@
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Asset,Number of Depreciations Booked,Broj Amortizacija Booked
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Količina Ukupno
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Protiv zaposlenih kredita: {0}
 DocType: Landed Cost Item,Receipt Document,dokument o prijemu
 DocType: Employee Education,School/University,Škola / Univerzitet
 DocType: Payment Request,Reference Details,Reference Detalji
@@ -3704,7 +3724,7 @@
 DocType: Asset,Double Declining Balance,Double degresivne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena kako se ne može otkazati. Otvarati da otkaže.
 DocType: Student Guardian,Father,otac
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
@@ -3718,10 +3738,10 @@
 DocType: Lead,Lower Income,Niži Prihodi
 DocType: Restaurant Order Entry,Current Order,Trenutna porudžbina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Idi na programe
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Raspodijeljena količina {1} ne može biti veća od nezadovoljne količine {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Raspodijeljena količina {1} ne može biti veća od nezadovoljne količine {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
@@ -3744,7 +3764,6 @@
 DocType: Payment Terms Template,Payment Terms,Uslovi plaćanja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 DocType: Chapter,Meetup Embed HTML,Upoznajte Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Idite na dobavljače
@@ -3763,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Raspored održavanja stavki
 DocType: Sales Order,%  Delivered,Isporučeno%
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Molimo da podesite Email ID za Student da pošaljete Zahtev za plaćanje
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Molimo da podesite Email ID za Student da pošaljete Zahtev za plaćanje
 DocType: Patient,Medical History,Medicinska istorija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Prekoračenje računa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank Prekoračenje računa
 DocType: Patient,Patient ID,ID pacijenta
 DocType: Physician Schedule,Schedule Name,Ime rasporeda
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Dodajte sve dobavljače
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Dodajte sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: dodijeljeni iznos ne može biti veći od preostalog iznosa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Browse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,osigurani krediti
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit knjiženja datuma i vremena
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo podesite Računi se odnose amortizacije u Asset Kategorija {0} ili kompanije {1}
 DocType: Lab Test Groups,Normal Range,Normalni opseg
 DocType: Academic Term,Academic Year,akademska godina
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Dostupna prodaja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Početno stanje Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Početno stanje Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ostali
 DocType: Appraisal,Appraisal,Procjena
+DocType: Loan,Loan Account,Račun zajma
 DocType: Purchase Invoice,GST Details,Detalji GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mail poslati na dobavljač {0}
 DocType: Item,Default Sales Unit of Measure,Podrazumevana jedinica prodaje mjere
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademska godina:
+DocType: Subscription,Past Due Date,Datum prošlosti
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ne dozvolite postavljanje alternativne stavke za stavku {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
@@ -3799,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacijenta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjavili od ovog mail Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Uzmite dobavljača
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Uzmite dobavljača
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nije pronađen za stavku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Idi na kurseve
 DocType: Accounts Settings,Show Inclusive Tax In Print,Prikaži inkluzivni porez u štampi
@@ -3807,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poruka je poslana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao glavnu knjigu
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju&gt; Obrazovne postavke
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
 DocType: Physician,Physician Schedules,Raspored lekara
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Ukupan iznos avansa ne može biti veći od ukupnog sankcionisanog iznosa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Ukupan iznos avansa ne može biti veći od ukupnog sankcionisanog iznosa
 DocType: Salary Slip,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Artikal imenovan po
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
@@ -3828,6 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno osvježavanje burzovnih transakcija stariji od {0}
 DocType: BOM,Inspection Required,Inspekcija Obvezno
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Unesite broj garancije banke pre podnošenja.
 DocType: Driving License Category,Class,Klasa
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Nalog za rad ne može se pokrenuti protiv šablona za stavke
@@ -3838,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju&gt; Obrazovne postavke
 DocType: Serial No,Is Cancelled,Je otkazan
 DocType: Student Group,Group Based On,Grupa na osnovu
 DocType: Journal Entry,Bill Date,Datum računa
@@ -3849,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Setup Progress,Setup Progress,Napredak podešavanja
+DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavite Stavke za Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Provjerite sve
 ,Issued Items Against Work Order,Izdate stavke protiv radnog naloga
 DocType: Vehicle Log,Invoice Ref,Račun Ref
@@ -3882,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarifni broj
 DocType: Work Order Item,Available Qty at WIP Warehouse,Dostupno Količina u WIP Skladište
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projektovan
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
-DocType: Employee Loan,Employee Loan Application,Zaposlenik Zahtjev za kredit
 DocType: Issue,Opening Date,Otvaranje Datum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Molim vas prvo sačuvajte pacijenta
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Molim vas prvo sačuvajte pacijenta
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Posjećenost je uspješno označen.
 DocType: Program Enrollment,Public Transport,Javni prijevoz
 DocType: Soil Texture,Silt Composition (%),Silt sastav (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Balans predmeta (Jednostavno)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debit note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debit note Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Datum narudžbe kupca
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 DocType: Assessment Plan,Assessment Plan,plan procjene
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Povratni dnevnik
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klijent {0} je kreiran.
 DocType: Stock Settings,Limit Percent,limit Procenat
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih trgovina na zalihama
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Kataloški Stupanje
 DocType: Payment Entry,Payment References,plaćanje Reference
 DocType: C-Form,C-FORM-,C-oplate
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Broj intervala za intervalno polje npr. Ako je Interval &quot;Dani&quot; i broj intervala obračuna je 3, fakture će biti generirane svakih 3 dana"
 DocType: Vehicle,Insurance Details,osiguranje Detalji
 DocType: Account,Payable,Plativ
 DocType: Share Balance,Share Type,Tip deljenja
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite rokovi otplate
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Unesite rokovi otplate
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi Kupci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Promenite POS profil
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party je obavezno
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Redovi sa dupliciranim datumima u drugim redovima su pronađeni: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Redovi sa dupliciranim datumima u drugim redovima su pronađeni: {list}
 DocType: Topic,Topic Name,Topic Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Molimo postavite podrazumevani obrazac za obavještenje o odobrenju odobrenja u HR postavkama.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Izaberi zaposlenog da unapredi radnika.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Izaberi zaposlenog da unapredi radnika.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Izaberite važeći datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Odaberite priroda vašeg poslovanja.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Prodajna faktura {0} kreirana
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,Akumuliranu amortizaciju
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalno ime
 DocType: Stock Entry,Customer or Supplier Details,Detalji o Kupcu ili Dobavljacu
-DocType: Employee Loan Application,Required by Date,Potreban po datumu
+DocType: Loan Application,Required by Date,Potreban po datumu
 DocType: Lead,Lead Owner,Vlasnik Lead-a
 DocType: Production Plan,Sales Orders Detail,Prodajna narudžbina Detail
 DocType: Bin,Requested Quantity,Tražena količina
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Pay - Ukupno odbitak - Otplata kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Plaća Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Višestruke varijante
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
+DocType: Subscription,Trial Period Start Date,Datum početka probnog perioda
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Molimo prijavite se kao drugi korisnik.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,student Guardian
 DocType: Member,Member Name,Ime člana
 DocType: Stock Settings,Use Naming Series,Koristite nazive serije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,u pretplati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 DocType: Membership,Payment Details,Detalji plaćanja
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Prekinuto radno porudžbanje ne može se otkazati, Unstop prvi da otkaže"
 DocType: Asset,Journal Entry for Scrap,Journal Entry za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Zemaljska jedinica
 ,Purchase Analytics,Kupnja Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Stavka otpremnice
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nedostaje trenutna faktura {0}
 DocType: Asset Maintenance Log,Task,Zadatak
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange dobitak / gubitak računa
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposleni i dolaznost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Svrha mora biti jedan od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Ispunite obrazac i spremite ga
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Stvarne Količina na lageru
 DocType: Homepage,"URL for ""All Products""",URL za &quot;Svi proizvodi&quot;
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard prodajni kurs
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 DocType: Cash Flow Mapper,Section Name,Naziv odeljka
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Ponovno red Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Ponovno red Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni Otvori Posao
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Očekuje se ažuriranje najnovije cene u svim materijalima. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Ime novog računa. Napomena: Molimo vas da ne stvaraju račune za kupcima i dobavljačima
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Water Analysis,Appearance,Izgled
+DocType: HR Settings,Leave Status Notification Template,Ostavite šablon za statusno stanje
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Kupovni cjenovnik
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informacije o članovima.
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nije dozvoljeno. Molim vas isključite Test Template
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
 DocType: Crop Cycle,Linked Land Unit,Linked Land Unit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Idite na Korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za artikal {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Nevažeći GSTIN ili Enter NA neregistriranim
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Upis Naknada
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Napravite Kontni plan na osnovu
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne mogu ga pretvoriti u ne-grupu. Postoje zadaci za decu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
 ,Stock Ageing,Kataloški Starenje
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} postoje protiv podnosioca prijave student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagođavanje zaokruživanja (valuta kompanije)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Serija:
 DocType: Volunteer,Afternoon,Popodne
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
 DocType: Cheque Print Template,Scanned Cheque,skeniranim Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekat {0} već postoji
 DocType: Medical Department,Nursing User,Korisnik medicinske sestre
 DocType: Plant Analysis,Plant Analysis Criterias,Kriterijumi za analizu biljaka
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serijski broj {0} ne pripada Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok važnosti ove ponude je završen.
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Preuzmi računa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dozvolite stare kurseve
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Pravite varijante
 DocType: Item,Default BOM,Zadani BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Ukupan fakturisani iznos (preko faktura prodaje)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debitne Napomena Iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debitne Napomena Iznos
 DocType: Project Update,Not Updated,Nije ažurirano
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Postoje nedoslednosti između stope, bez dionica i iznosa obračunatog"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Ukupno Outstanding Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Journal Entry,Printing Settings,Printing Settings
 DocType: Employee Advance,Advance Account,Advance Account
 DocType: Job Offer,Job Offer Terms,Uslovi ponude posla
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobilska industrija
 DocType: Vehicle,Insurance Company,Insurance Company
 DocType: Asset Category Account,Fixed Asset Account,Osnovnih sredstava računa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,varijabla
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,varijabla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
 DocType: Chapter,Members,Članovi
 DocType: Student,Student Email Address,Student-mail adresa
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,stažista
 DocType: Delivery Stop,Address Name,Adresa ime
 DocType: Stock Entry,From BOM,Iz BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Razdvajanje {0} jedinica {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Razdvajanje {0} jedinica {1}
 DocType: Assessment Code,Assessment Code,procjena Kod
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
@@ -4233,25 +4260,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 DocType: Bank Reconciliation Detail,Payment Document,plaćanje Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Greška u procjeni formula za kriterijume
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+DocType: Subscription,Plans,Planovi
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Tiketi - materijal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Došlo je do greške prilikom stvaranja ponavljajuće
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Tiketi - materijal
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No studentskih grupa stvorio.
 DocType: Purchase Invoice Item,Serial No,Serijski br
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečna otplate iznos ne može biti veći od iznos kredita
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečna otplate iznos ne može biti veći od iznos kredita
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Red # {0}: Očekivani datum isporuke ne može biti pre datuma kupovine naloga
 DocType: Purchase Invoice,Print Language,print Jezik
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Sales Invoice,Customer PO Details,Kupac PO Detalji
-DocType: Subscription,Next Schedule Date,Sledeći datum rasporeda
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Privremeni račun za otvaranje
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Unesite vrijednost mora biti pozitivan
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nema zaposlenih po navedenim kriterijumima
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
 DocType: Hotel Settings,Default Customer,Podrazumevani korisnik
 DocType: Assessment Plan,Supervisor Name,Supervizor ime
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne potvrdite da li je zakazan termin za isti dan
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,Advance Employee
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequency
 DocType: Lab Test Template,Sensitivity,Osjetljivost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,sirovine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Biljke i Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Biljke i Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Svakodnevni rad Pregled Postavke
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Molimo unesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interna Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Zadaci održavanja
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Detektovana bolest
 ,Produced,Proizvedeno
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Datum početka otplate ne može biti prije datuma isplate.
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Pokrenuo (E-mail)
 DocType: Training Event,Trainer Name,trener ime
 DocType: Mode of Payment,General,Opšti
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje Komunikacija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Meč plaćanja fakture
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} na pola dana Ostavite na {1}
 DocType: Production Plan,Get Material Request,Get materijala Upit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Poštanski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 ,Item Variant Details,Detalji varijante proizvoda
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Sat
 DocType: Restaurant Order Entry,Last Sales Invoice,Poslednja prodaja faktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Molimo izaberite Qty protiv stavke {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 DocType: Company,Monthly Sales Target,Mesečni cilj prodaje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,Uobičajeno materijala Upit Tip
 DocType: Supplier Scorecard,Evaluation Period,Period evaluacije
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nepoznat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Radni nalog nije kreiran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Radni nalog nije kreiran
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: Purchase Invoice,Export Type,Tip izvoza
 DocType: Salary Slip Loan,Salary Slip Loan,Loan Slip Loan
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Otvaranje rezimea faktura
 DocType: Education Settings,Education Manager,Menadžer obrazovanja
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimalna dužina između svake biljke u polju za optimalan rast
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Dozirano Stavka {0} ne može se ažurirati pomoću Stock pomirenje, umjesto da koriste Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Dozirano Stavka {0} ne može se ažurirati pomoću Stock pomirenje, umjesto da koriste Stock Entry"
 DocType: Quality Inspection,Report Date,Prijavi Datum
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Fakture
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Group,Send Emails At,Pošalji e-mailova
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Troškovi odobrenja obavezni u potraživanju troškova
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Dodajte korisnike u svoju organizaciju, osim sebe."
 DocType: Customer Group,Customer Group Name,Naziv vrste djelatnosti Kupca
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Ne Kupci još!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanim tokovima
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nije napravljen materijalni zahtev
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
@@ -4448,11 +4476,12 @@
 DocType: Vehicle,Chassis No,šasija Ne
 DocType: Payment Request,Initiated,Inicirao
 DocType: Production Plan Item,Planned Start Date,Planirani Ozljede Datum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Izaberite BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Izaberite BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Korišćen ITC integrisani porez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
+DocType: Bank Guarantee,Clauses and Conditions,Klauzule i uslovi
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Project Task,View Timesheet,View Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Krajnji datum mora biti veći od početnog datuma
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekat - mudar podaci nisu dostupni za ponudu
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,Upotreba alkohola
 DocType: Student Admission Program,Student Admission Program,Studentski program za prijem studenata
 DocType: Payment Entry,Account Paid To,Račun Paid To
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternativni naziv predmeta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nije moguće podneti bilo koji plati <br> \ Mogući razlozi: <br> \ 1. Neto plaća je manja od 0. <br> \ 2. E-adresa kompanije naznačena u masteru zaposlenog nije važeća. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžeta za računa {1} protiv {2} {3} je {4}. To će premašiti po {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Od kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Onemogućeno u
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,financijske usluge
 DocType: Student Sibling,Student ID,student ID
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,Žalba
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Unošenje otplate
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Svi odjeli
 DocType: Patient,Alcohol Past Use,Upotreba alkohola u prošlosti
 DocType: Fertilizer Content,Fertilizer Content,Sadržaj đubriva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematic / Stuck
 DocType: Tax Rule,Billing State,State billing
 DocType: Share Transfer,Transfer,Prijenos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Radni nalog {0} mora biti otkazan prije otkazivanja ovog prodajnog naloga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,Poruke za prikaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Maloprodaja
 DocType: Student Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nije moguće pronaći rezultat od {0}. Morate imati stojeće rezultate koji pokrivaju 0 do 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
+DocType: Subscription,Current Invoice Start Date,Trenutni datum početka fakture
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ili debitne ili kreditne iznos je potreban za {2}
 DocType: GL Entry,Remarks,Primjedbe
@@ -4534,11 +4566,13 @@
 DocType: Task,Parent Task,Zadatak roditelja
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Make Olovo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print i pribora
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print i pribora
 DocType: Stock Settings,Show Barcode Field,Pokaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Pošalji dobavljač Email
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća je već pripremljena za period od {0} i {1}, Ostavi period aplikacija ne može da bude između tog datuma opseg."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Pošalji dobavljač Email
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća je već pripremljena za period od {0} i {1}, Ostavi period aplikacija ne može da bude između tog datuma opseg."
+DocType: Fiscal Year,Auto Created,Automatski kreiran
 DocType: Chapter Member,Leave Reason,Ostavite razlog
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Račun {0} više ne postoji
 DocType: Guardian Interest,Guardian Interest,Guardian interesa
 DocType: Volunteer,Availability,Dostupnost
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Podesi podrazumevane vrednosti za POS Račune
@@ -4546,14 +4580,13 @@
 DocType: Project,Time to send,Vreme za slanje
 DocType: Timesheet,Employee Detail,Detalji o radniku
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
 DocType: Lab Prescription,Test Code,Test Code
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ-ovi nisu dozvoljeni za {0} zbog stanja karte za rezultat {1}
 DocType: Job Offer,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Iznad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Ukupni iznos {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Ukupni iznos {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Navesti ukoliko nestandardnog plaća račun
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Molimo odaberite grupu procjene, osim &#39;Svi Procjena grupe&#39;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Red {0}: Troškovni centar je potreban za stavku {1}
@@ -4564,7 +4597,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
 DocType: Chapter,Region,Regija
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Ponovo učitaj analizu
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -4580,7 +4613,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Troškovi Rashodovan imovine
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
 DocType: Vehicle,Policy No,Politika Nema
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 DocType: Asset,Straight Line,Duž
 DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Podijeliti
@@ -4616,21 +4649,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Put
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
 DocType: Production Plan,Total Planned Qty,Ukupna planirana količina
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,otvaranje vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,otvaranje vrijednost
 DocType: Salary Detail,Formula,formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab test šablon
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Račun prodaje
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Račun prodaje
 DocType: Purchase Invoice Item,Total Weight,Ukupna tezina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodaju
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisija za prodaju
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran za unos naloga
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
 DocType: Asset Maintenance Task,Assign To Name,Dodeli ime
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Zabava Troškovi
 DocType: Hub Settings,Enabled Users,Omogućeni korisnici
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Make Materijal Upit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Otvorena Stavka {0}
@@ -4643,24 +4676,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Prijave za odsustvo.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnji Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Pravni troškovi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Molimo odaberite Količina na red
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Otvorite račune za prodaju i kupovinu
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Timesheet,% Amount Billed,% Naplaćenog iznosa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Stavka s rednim brojem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Stavka s rednim brojem {0}
 DocType: Email Digest,Open Notifications,Otvorena obavjestenja
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Iznos (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direktni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direktni troškovi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,putni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajte prilagođeno polje Pretplata u doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Purchase Receipt Item,Sample Quantity,Količina uzorka
+DocType: Bank Guarantee,Name of Beneficiary,Ime korisnika
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automatsko ažuriranje troškova BOM-a putem Planera, na osnovu najnovije procene stope / cenovnika / poslednje stope sirovina."
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
@@ -4672,14 +4705,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Povratak / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Povratak / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Ukupno uplaćeni iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigacija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,planiranje
 DocType: Share Balance,Issued,Izdao
+DocType: Loan,Repayment Start Date,Datum početka otplate
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,student aktivnost
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dobavljač Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
@@ -4692,10 +4726,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovne zbirne izvještaje putem e-maila.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Molimo podesite zadani račun u Rashodi Preuzmi Tip {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Molimo podesite zadani račun u Rashodi Preuzmi Tip {0}
 DocType: Assessment Result,Student Name,ime studenta
 DocType: Brand,Item Manager,Stavka Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll plaćaju
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll plaćaju
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Plant Analysis,Collection Datetime,Kolekcija Datetime
 DocType: Work Order,Total Operating Cost,Ukupni trošak
@@ -4705,9 +4739,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Korisnik {0} ne postoji
 DocType: Payment Term,Day(s) after invoice date,Dan (a) nakon datuma fakture
 DocType: Payment Schedule,Payment Schedule,Raspored plaćanja
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Plaćanje Entry već postoji
+DocType: Subscription,Trial Period End Date,Datum završetka probnog perioda
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologija
@@ -4724,9 +4758,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulirani Mjesečno
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
@@ -4735,14 +4769,15 @@
 DocType: Lab Prescription,Test Created,Test Created
 DocType: Healthcare Settings,Custom Signature in Print,Prilagođeni potpis u štampi
 DocType: Account,Temporary,Privremen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Korisnički LPO br.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Korisnički LPO br.
 DocType: Program,Courses,kursevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretarica
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretarica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite, &#39;riječima&#39; polju neće biti vidljivi u bilo koju transakciju"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ova akcija će zaustaviti buduće obračunavanje. Da li ste sigurni da želite otkazati ovu pretplatu?
 DocType: Serial No,Distinct unit of an Item,Različite jedinice strane jedinice
 DocType: Supplier Scorecard Criteria,Criteria Name,Ime kriterijuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Molimo podesite Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Molimo podesite Company
 DocType: Pricing Rule,Buying,Nabavka
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Bolesti i đubriva
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -4751,17 +4786,17 @@
 DocType: POS Profile,Apply Discount On,Nanesite popusta na
 DocType: Member,Membership Type,Tip članstva
 ,Reqd By Date,Reqd Po datumu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditori
 DocType: Assessment Plan,Assessment Name,procjena ime
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Pokažite PDC u Štampanje
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Pokažite PDC u Štampanje
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial No je obavezno
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ponudu za posao
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut Skraćenica
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u nizu {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u nizu {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
@@ -4779,7 +4814,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ukupno Varijansa
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Posjećenost za zaposlenog {0} je već označena za ovaj dan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Posjećenost za zaposlenog {0} je već označena za ovaj dan
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","u minutama 
  ažurirano preko 'Time Log'"
@@ -4791,6 +4826,7 @@
 DocType: Lab Test,Approved Date,Odobreni datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+DocType: Subscriber,Subscriber Name,Ime pretplatnika
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Update Tool,Replace,Zamijeniti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nema proizvoda.
@@ -4800,19 +4836,18 @@
 DocType: Request for Quotation Item,Project Name,Naziv projekta
 DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Izaberete račun prihoda od kamata u zaposlenom kreditu {0}
 DocType: Work Order,Required Items,potrebna Predmeti
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 DocType: Disease,Treatment Task,Tretman zadataka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,porezna imovina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronske opreme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronske opreme
 DocType: Asset,Maintenance Required,Potrebno održavanje
 DocType: Account,Debit,Zaduženje
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
@@ -4821,7 +4856,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Izvanredna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset je obavezan za osnovno sredstvo kupovinu / prodaju
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset je obavezan za osnovno sredstvo kupovinu / prodaju
 DocType: Asset Maintenance Team,Maintenance Team Name,Naziv tima za održavanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako su dva ili više Pravila cijene se nalaze na osnovu gore uvjetima, Prioritet se primjenjuje. Prioritet je broj od 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost, ako postoji više pravila cijenama s istim uslovima."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Korisnik je obavezan ako je izabrana opcija &quot;Opcija od&quot; kao Korisnik
@@ -4830,19 +4865,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Vrste Rashodi zahtjevu.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopa za stavke prodaje {0} je niža od {1}. stopa prodaje bi trebao biti atleast {2}
-DocType: Item,Taxes,Porezi
+DocType: Subscription,Taxes,Porezi
 DocType: Purchase Invoice,capital goods,kapitalna dobra
 DocType: Purchase Invoice Item,Weight Per Unit,Težina po jedinici
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Platio i nije dostavila
 DocType: Project,Default Cost Center,Standard Cost Center
-DocType: Bank Guarantee,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transakcije
 DocType: Budget,Budget Accounts,računa budžeta
 DocType: Employee,Internal Work History,Interni History Work
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Ispravka vrijednosti iznos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Varijabilni pokazatelj dobavljača
-DocType: Employee Loan,Fully Disbursed,potpuno Isplaćeno
 DocType: Employee Advance,Due Advance Amount,Due Advance Amount
 DocType: Maintenance Visit,Customer Feedback,Ocjena Kupca
 DocType: Account,Expense,rashod
@@ -4866,7 +4899,7 @@
 ,Employee Information,Informacija o zaposlenom
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Osnovani porezni predlošci za prodaju i kupovinu su stvoreni.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Evidencija Rezultat zapisa {0} već postoji.
@@ -4874,7 +4907,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za stvaranje ponavljajuće
 DocType: Stock Entry,Target Warehouse Address,Adresa ciljne magacine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual dopust
 DocType: Agriculture Task,End Day,Krajnji dan
@@ -4899,11 +4931,10 @@
 DocType: Material Request,% Ordered,% Poruceno
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za studentske grupe na osnovu Naravno, kurs će biti potvrđeni za svakog studenta iz upisao jezika u upisu Programa."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,rad plaćen na akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosj. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Share Balance,From No,Od br
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nova poruka od {pošiljaoca}
 DocType: Customer,Customer Primary Address,Primarna adresa klijenta
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Drug Prescription,Description/Strength,Opis / snaga
@@ -4912,22 +4943,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Isto artikal je ušao više puta
 DocType: Department,Leave Block List,Ostavite Block List
 DocType: Purchase Invoice,Tax ID,Porez ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Podešavanja konta
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,odobriti
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatirana adresa za {0}, popravite za nastavak."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatirana adresa za {0}, popravite za nastavak."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Broj novog naloga, on će biti uključen u ime računa kao prefiks"
 DocType: Maintenance Team Member,Team Member,Član tima
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nije rezultat koji se šalje
 DocType: Customer,Sales Partner and Commission,Prodajnog partnera i Komisije
-DocType: Employee Loan,Rate of Interest (%) / Year,Kamatnu stopu (%) / godina
+DocType: Loan,Rate of Interest (%) / Year,Kamatnu stopu (%) / godina
 ,Project Quantity,projekt Količina
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;"
 DocType: Opportunity,To Discuss,Za diskusiju
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinicama {1} potrebno {2} za završetak ove transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatnu stopu (%) Godišnji
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Crn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Privremeni računi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Crn
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Shareholder,Contact List,Lista kontakata
 DocType: Account,Auditor,Revizor
@@ -4935,16 +4966,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} artikala proizvedenih
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Nauči više
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornje ivice
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Popis Cijena {0} je isključena ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Popis Cijena {0} je isključena ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Pricing Rule,Disable,Ugasiti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Način plaćanja je potrebno izvršiti uplatu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Način plaćanja je potrebno izvršiti uplatu
 DocType: Project Task,Pending Review,Na čekanju
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Uredite na celoj stranici za više opcija kao što su imovina, serijski nos, serije itd."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Imenovanja i konsultacije
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne može biti ukinuta, jer je već {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Potrebni provjeri
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Potrebni provjeri
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Nije uspela kompanija podesiti
@@ -4956,7 +4987,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Dodaj stavke iz
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Crop &amp; Lands
 DocType: Cheque Print Template,Regular,redovan
 DocType: Fertilizer,Density (if liquid),Gustina (ako je tečnost)
@@ -4981,24 +5012,26 @@
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Istražite kola prodaje
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Zadržavanje zaliha zaliha
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Zadržavanje zaliha zaliha
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 ,Work Order Stock Report,Izveštaj o radnom nalogu
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kao supervizor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Predloži kategoriju
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpad Stavka
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,upravljanja kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,upravljanja kvalitetom
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućena
 DocType: Project,Total Billable Amount (via Timesheets),Ukupan iznos iznosa (preko Timesheeta)
 DocType: Agriculture Task,Previous Business Day,Prethodni radni dan
-DocType: Employee Loan,Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu
+DocType: Loan,Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu
 DocType: Employee,Health Insurance No,Zdravstveno osiguranje br
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredit Napomena Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredit Napomena Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Ukupan iznos oporezivanja
 DocType: Employee External Work History,Employee External Work History,Istorija rada zaposlenog izvan preduzeća
 DocType: Opening Invoice Creation Tool,Purchase,Kupiti
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilans kol
@@ -5009,15 +5042,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} za
 DocType: Healthcare Settings,Valid number of days,Veliki broj dana
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Troška
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Restart pretplata
 DocType: Land Unit,Linked Plant Analysis,Analiza povezanih biljaka
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings sukobi s redom {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dozvolite Zero Vrednovanje Rate
+DocType: Bank Guarantee,Receiving,Primanje
 DocType: Training Event Employee,Invited,pozvan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih Plaća Strukture nađeni za zaposlenog {0} za navedeni datumi
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Podešavanje Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dugotrajna imovina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Dugotrajna imovina
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange dobitak / gubitak
 ,GST Purchase Register,PDV Kupovina Registracija
 ,Cash Flow,Priliv novca
@@ -5037,9 +5072,10 @@
 DocType: Academic Term,Term Start Date,Term Ozljede Datum
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Spisak svih dionica transakcija
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},U prilogu {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Moraju se podesiti datum početka probnog perioda i datum završetka probnog perioda
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prosečna stopa
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -5069,6 +5105,7 @@
 DocType: Work Order,Warehouses,Skladišta
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovine ne može se prenositi
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotelska soba Pricing
+DocType: Subscription,Days Until Due,Dani do dospijeća
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ovaj artikal je varijanta {0} (Template).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
@@ -5077,13 +5114,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Za studentske grupe Batch bazi Studentskog Batch će biti potvrđeni za svakog studenta iz Upis Programa.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribucija
+DocType: Journal Entry Account,Loan,Loan
 DocType: Expense Claim Advance,Expense Claim Advance,Advance Expense Claim
 DocType: Lab Test,Report Preference,Prednost prijave
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Volonterske informacije.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Menadzer projekata
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Menadzer projekata
 ,Quoted Item Comparison,Citirano Stavka Poređenje
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Preklapanje u bodovima između {0} i {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Neto vrijednost imovine kao i na
 DocType: Crop,Produce,Proizvesti
@@ -5093,7 +5131,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Potrošnja materijala za proizvodnju
 DocType: Item Alternative,Alternative Item Code,Alternativni kod artikla
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Odaberi stavke za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Odaberi stavke za proizvodnju
 DocType: Delivery Stop,Delivery Stop,Dostava Stop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
 DocType: Item,Material Issue,Materijal Issue
@@ -5103,15 +5141,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
 DocType: BOM,Show Items,Pokaži Predmeti
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od vremena ne može biti veća nego vremena.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Želite li obavijestiti sve kupce putem e-pošte?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Želite li obavijestiti sve kupce putem e-pošte?
+DocType: Subscription Plan,Billing Interval,Interval zaračunavanja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Nastavi
 DocType: Hub Settings,Hub Username,Hub Username
 DocType: Salary Detail,Component,sastavni
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji procjene Group
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Unos teksta na obračun za plate od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Unos teksta na obračun za plate od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -5125,22 +5163,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na preduzeće
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
-DocType: Employee Loan,Disbursement Date,datuma isplate
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Primaoci&#39; nisu navedeni
+DocType: Loan,Disbursement Date,datuma isplate
 DocType: BOM Update Tool,Update latest price in all BOMs,Ažurirajte najnoviju cenu u svim BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,vozilo
 DocType: Purchase Invoice,In Words,Riječima
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Pre podnošenja navedite ime banke ili kreditne institucije.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} moraju biti dostavljeni
 DocType: POS Profile,Item Groups,stavka grupe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Danas je {0} 's rođendan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Danas je {0} 's rođendan!
 DocType: Sales Order Item,For Production,Za proizvodnju
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Molimo da dodate račun za privremeni otvaranje na kontnom planu
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Molimo da dodate račun za privremeni otvaranje na kontnom planu
 DocType: Customer,Customer Primary Contact,Primarni kontakt klijenta
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Časopis za zatvaranje perioda
 DocType: Project Task,View Task,Pogledaj Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Tip garancije banke
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Portfelj fakture
 ,Asset Depreciations and Balances,Imovine Amortizacija i vage
@@ -5151,9 +5190,8 @@
 DocType: Production Plan,Include Subcontracted Items,Uključite predmete sa podugovaračima
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,pristupiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Ne mogu promijeniti svojstva varijante nakon transakcije. Za to ćete morati napraviti novu stavku.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
-DocType: Employee Loan,Repay from Salary,Otplatiti iz Plata
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+DocType: Loan,Repay from Salary,Otplatiti iz Plata
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Tražeći isplatu protiv {0} {1} za iznos {2}
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
@@ -5177,11 +5215,11 @@
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenog
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikat stavka grupa naći u tabeli stavka grupa
 DocType: Land Unit,Parent Land Unit,Roditeljska jedinica
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
 DocType: Fertilizer,Fertilizer Name,Ime đubriva
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski Ne {0} već je primila
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serijski Ne {0} već je primila
 ,Requested Items To Be Transferred,Traženi stavki za prijenos
 DocType: Expense Claim,Vehicle Log,vozilo se Prijavite
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisustvo groznice (temperatura&gt; 38,5 ° C / 101,3 ° F ili trajna temperatura&gt; 38 ° C / 100,4 ° F)"
@@ -5222,24 +5260,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
 DocType: Asset Maintenance,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
-DocType: C-Form,Series,serija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta cenovnika {0} mora biti {1} ili {2}
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Soil Texture,Ternary Plot,Ternary plot
 DocType: Item Group,Item Classification,Stavka Klasifikacija
 DocType: Driver,License Number,Broj licence
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Svrha posjete za odrzavanje
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Registracija računa pacijenta
 DocType: Crop,Period,Period
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Glavna knjiga
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposlenik {0} na odmoru na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zaposlenik {0} na odmoru na {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj potencijalne kupce
 DocType: Program Enrollment Tool,New Program,novi program
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 DocType: Salary Detail,Salary Detail,Plaća Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Odaberite {0} Prvi
 DocType: Appointment Type,Physician,Lekar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacije
@@ -5247,15 +5284,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne može biti veća od planirane količine ({2}) u radnom nalogu {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet za proizvodnju.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,suma stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ne mogu promijeniti svojstva varijante nakon transakcije sa akcijama. Za to ćete morati napraviti novu stavku.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandat
 DocType: Physician,Charges,Naknade
 DocType: Production Plan,Get Items For Work Order,Dobijte stavke za radni nalog
 DocType: Salary Detail,Default Amount,Zadani iznos
 DocType: Lab Test Template,Descriptive,Deskriptivno
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Skladište nije pronađeno u sistemu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ovaj mjesec je sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvaliteta Inspekcija čitanje
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Postavite cilj prodaje koji želite ostvariti za svoju kompaniju.
 ,Project wise Stock Tracking,Supervizor pracenje zaliha
@@ -5283,11 +5321,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Neuspelo je kreirati web stranicu
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Već stvoreni unos zadržavanja zaliha ili količina uzorka nisu obezbeđeni
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Već stvoreni unos zadržavanja zaliha ili količina uzorka nisu obezbeđeni
 DocType: Program,Program Abbreviation,program Skraćenica
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
 DocType: Warranty Claim,Resolved By,Riješen Do
-DocType: Bank Guarantee,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodijeli odsustva za period.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depoziti pogrešno spašava
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
@@ -5302,11 +5339,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
 DocType: Purchase Invoice,04-Correction in Invoice,04-Ispravka u fakturi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Radni nalog već je kreiran za sve predmete sa BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Radni nalog već je kreiran za sve predmete sa BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Varijanta Detalji Izveštaj
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kupovni cjenovnik
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kupovni cjenovnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Uklonite stavku ako naknada nije primjenjiv na tu stavku
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Otkaži pretplatu
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Izaberite stanje održavanja kao završeno ili uklonite datum završetka
 DocType: Supplier,Default Payment Terms Template,Podrazumevani obrazac za plaćanje
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transakcija valuta mora biti isti kao i Payment Gateway valutu
@@ -5317,7 +5355,6 @@
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akcija ako Akumulirani Mjesečni budžet Exceeded
-DocType: Subscription,Submit on creation,Dostavi na stvaranju
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odlaganje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E će biti poslana svim aktivnih radnika kompanije u datom sat, ako nemaju odmor. Sažetak odgovora će biti poslan u ponoć."
@@ -5335,6 +5372,7 @@
 DocType: Batch,Parent Batch,roditelja Batch
 DocType: Cheque Print Template,Cheque Print Template,Ček Ispis Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Broj dana od dana kada je faktura protekla prije otkazivanja pretplate ili obilježavanja pretplate kao neplaćenog
 DocType: Lab Test Template,Sample Collection,Prikupljanje uzoraka
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
 DocType: Price List,Price List Name,Cjenik Ime
@@ -5343,7 +5381,7 @@
 DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nešto nije bilo u redu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 DocType: Supplier Scorecard Scoring Criteria,Score,skor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
@@ -5363,12 +5401,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} treba da bude vrednost između 0 i 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Sledeći datum amortizacije ne može biti pre raspoloživog datuma upotrebe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksimalni radni sati protiv Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Planski datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Ukupno Paid Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Ukupno Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera će biti odvojena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 DocType: Hub Settings,Company and Seller Profile,Profil firme i prodavca
@@ -5382,10 +5420,9 @@
 DocType: Item,Variant Based On,Varijanta na osnovu
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Molim vas ispravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač dio br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonimno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Dobili od
 DocType: Lead,Converted,Pretvoreno
@@ -5399,6 +5436,7 @@
 DocType: Asset,Assets,Imovina
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
+DocType: Subscription,Current Invoice End Date,Trenutni datum završetka računa
 DocType: Payment Term,Due Date Based On,Due Date Based On
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Molimo podesite podrazumevanu grupu korisnika i teritoriju u prodajnom podešavanju
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ne postoji
@@ -5406,7 +5444,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Za unos novina nije izabrana otplata
 DocType: Payment Reconciliation,From Invoice Date,Iz Datum računa
+DocType: Loan,Disbursed,Isplaćeno
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske postavke
 DocType: Patient Appointment,Service Unit,Servisna jedinica
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Uspešno postavite dobavljača
@@ -5419,12 +5459,12 @@
 DocType: Share Balance,No of Shares,Broj akcija
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Izaberite Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: School House,House Name,nazivu
 DocType: Fee Schedule,Total Amount per Student,Ukupan iznos po učeniku
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Električna
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak organizacije kao korisnika. Također možete dodati pozvati kupce da vaš portal dodavanjem iz kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
 DocType: Grant Application,Requested Amount,Traženi iznos
@@ -5434,7 +5474,7 @@
 DocType: Crop Cycle,Detected Diseases,Otkrivene bolesti
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 DocType: Asset Maintenance Task,Last Completion Date,Zadnji datum završetka
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
@@ -5442,9 +5482,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,dionicama u vrijednosti
 DocType: Restaurant,Active Menu,Aktivni meni
 DocType: Target Detail,Target Qty,Ciljana Kol
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Protiv kredita: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Plaćanje Postavke
 DocType: Student Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
@@ -5453,9 +5494,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Production Plan Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
 DocType: Chapter,Chapter Head,Glava poglavlja
 DocType: Payment Term,Month(s) after the end of the invoice month,Mesec (i) nakon kraja mjeseca fakture
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektna aktivnost / zadatak.
@@ -5463,11 +5504,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Datetime rezultata laboratorije ne može biti pre testiranja datetime
 DocType: POS Profile,Allow user to edit Discount,Dozvolite korisniku da uredi popust
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Uzmite kupce
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Uzmite kupce
 DocType: Purchase Invoice Item,Include Exploded Items,Uključite eksplodirane predmete
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba provjeriti, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
 DocType: Shipping Rule,Restrict to Countries,Ograničiti zemlje
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 DocType: Project,Total Sales Amount (via Sales Order),Ukupan iznos prodaje (preko prodajnog naloga)
@@ -5484,6 +5526,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Menadžer procjene
 DocType: Payment Entry,Allocate Payment Amount,Izdvojiti plaćanja Iznos
+DocType: Subscription Plan,Subscription Plan,Plan pretplate
 DocType: Employee External Work History,Salary,Plata
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Sales Order,Partly Delivered,Djelomično Isporučeno
@@ -5509,9 +5552,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Starenje Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instaliranje podešavanja
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nije odabrana beleška za isporuku za kupca {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nije odabrana beleška za isporuku za kupca {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM zamijenjeno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Izaberite stavke na osnovu datuma isporuke
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Izaberite stavke na osnovu datuma isporuke
 DocType: Grant Application,Has any past Grant Record,Ima bilo kakav prošli Grant Record
 ,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Dostupno {0}
@@ -5529,7 +5572,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelska rezervacija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Služba za korisnike
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuda kandidata posao.
@@ -5545,7 +5588,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studenti su upisani
 DocType: Fees,Student Details,Student Detalji
 DocType: Purchase Invoice Item,Stock Qty,zalihama Količina
-DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
+DocType: Loan,Repayment Period in Months,Rok otplate u mjesecima
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Greška: Ne važeći id?
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
@@ -5554,7 +5597,7 @@
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 DocType: Timesheet,Work Detail,Work Detail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,inženjer
 DocType: Journal Entry,Total Amount Currency,Ukupan iznos valute
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupština
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
@@ -5599,13 +5642,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informacije o donatoru.
 DocType: Request for Quotation,Supplier Detail,dobavljač Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturisanog
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturisanog
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Tegovi kriterijuma moraju dodati do 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Pohađanje
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Stock Predmeti
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Kreiranje {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvor i Target skladište ne može biti isto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
@@ -5629,14 +5671,14 @@
 DocType: Shipping Rule,Fixed,Fiksna
 DocType: Vehicle Service,Clutch Plate,kvačila
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
-DocType: Journal Entry,Subscription,Pretplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Pretplata
 DocType: Purchase Invoice,Contact Email,Kontakt email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Čekanje stvaranja naknade
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Otkazni rok
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Otkazni rok
 DocType: Asset Category,Asset Category Name,Asset Ime kategorije
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To jekorijen teritorij i ne može se mijenjati .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime prodaja novih lica
@@ -5649,7 +5691,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite nekontrolisano ako ne želite uzeti u obzir batch prilikom donošenja grupe naravno na bazi.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost amortizacije (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Pokazati nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina predmeta dobije nakon proizvodnju / pakiranje od navedenih količina sirovina
@@ -5657,7 +5699,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
 DocType: Hub Settings,Company Logo,Logo kompanije
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacijenata
@@ -5691,11 +5733,10 @@
 DocType: Journal Entry,Total Debit,Ukupno zaduženje
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Uobičajeno Gotovi proizvodi skladište
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Molimo izaberite Pacijent
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Referent prodaje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Referent prodaje
 DocType: Hotel Room Package,Amenities,Pogodnosti
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budžet i troškova Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Višestruki način plaćanja nije dozvoljen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje analitike
 DocType: Vehicle Service,Half Yearly,Polu godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
@@ -5711,6 +5752,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Ostavite prazno ako napravite grupa studenata godišnje
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikacije koje koriste trenutni ključ neće moći da pristupe, da li ste sigurni?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Promijenite šablon kod
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termin Završni datum ne može biti ranije od termina Ozljede Datum. Molimo ispravite datume i pokušajte ponovo.
@@ -5721,8 +5763,9 @@
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 DocType: Cheque Print Template,Signatory Position,potpisnik Pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Postavi kao Lost
 DocType: Timesheet,Total Billable Hours,Ukupno naplative Hours
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Broj dana kada pretplatnik mora platiti fakture koje generiše ova pretplata
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje potvrda o primitku
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ovo se zasniva na transakcije protiv ovog kupaca. Pogledajte vremenski okvir ispod za detalje
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Red {0}: Raspoređeni iznos {1} mora biti manji od ili jednak iznos plaćanja Entry {2}
@@ -5741,12 +5784,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o preduzeću
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Odaberite ili dodati novi kupac
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo ovog zaposlenih
 DocType: Assessment Result,Summary,Sažetak
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Obeležite prisustvo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Zaduži račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime i prezime radnika
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restoran za unos stavke
@@ -5758,7 +5801,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kupovina Iznos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Work Order,Manufactured Qty,Proizvedeno Kol
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcije ne postoje sa {0}
@@ -5766,12 +5809,12 @@
 DocType: Asset,Out of Order,Ne radi
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 DocType: Projects Settings,Ignore Workstation Time Overlap,Prezreti vremensko preklapanje radne stanice
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Izaberite šarže
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 DocType: Patient Service Unit,Medical Administrator,Medicinski administrator
 DocType: Assessment Plan,Schedule,Raspored
 DocType: Account,Parent Account,Roditelj račun
@@ -5801,15 +5844,16 @@
 DocType: Asset Repair,Repair Status,Status popravke
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
 DocType: POS Profile,Account for Change Amount,Nalog za promjene Iznos
 DocType: Purchase Invoice,input service,ulazna usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Član tima za održavanje
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza tla
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Šifra predmeta:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
@@ -5857,19 +5901,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Priznanja za {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Ime promenljive
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
 DocType: Asset,Asset Category,Asset Kategorija
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plaća ne može biti negativna
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Porez artikla
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materijal dobavljaču
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Planiranje zahtjeva za materijal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Akcizama Račun
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Označena Posjeta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kratkoročne obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kratkoročne obveze
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Tajmer je prekoračio zadate sate.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Pošalji masovne SMS poruke svojim kontaktima
 DocType: Patient,A Positive,Pozitivan
@@ -5880,9 +5924,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutno ima {1} Scorecard stava, a narudžbine za ovaj dobavljač treba izdati oprezno."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tim za održavanje imovine
-DocType: Employee Loan,Loan Type,Vrsta kredita
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} je uspešno podnet
+DocType: Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,zakazivanje alata
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Artikal će biti proizveden ili prepakiran
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5914,7 +5959,7 @@
 DocType: Item,Units of Measure,Jedinice mjere
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite Production o praznicima
 DocType: Sales Invoice,Customer's Purchase Order Date,Kupca narudžbenice Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitala
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitala
 DocType: Shopping Cart Settings,Show Public Attachments,Pokaži Javna Prilozi
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Restaurant Reservation,Reservation Time,Vrijeme rezervacije
@@ -5929,7 +5974,7 @@
 DocType: Purchase Order,To Receive and Bill,Da primi i Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Red # {0}: Reqd po datumu ne može biti pre datuma transakcije
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Istaknuti Proizvodi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
@@ -5939,20 +5984,20 @@
 DocType: Driver,Expiry Date,Datum isteka
 DocType: Healthcare Settings,Employee name and designation in print,Ime i oznaka zaposlenika u štampi
 ,accounts-browser,računi pretraživač
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Molimo odaberite kategoriju prvi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Direktor Projekata
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Da biste omogućili nad-naplate ili preko-naručivanje, ažurirati &quot;Ispravka&quot; raspoloživo Settings ili stavku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pola dana)
 DocType: Payment Term,Credit Days,Kreditne Dani
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Izaberite Pacijent da biste dobili laboratorijske testove
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Potencijalni kupac - ukupno dana
 DocType: Cash Flow Mapping,Is Income Tax Expense,Da li je porez na prihod?
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Označite ovu ako student boravi na Instituta Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
 ,Stock Summary,Stock Pregled
@@ -5963,10 +6008,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref: Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: BOM Operation,Operating Cost(Company Currency),Operativni trošak (Company Valuta)
-DocType: Employee Loan Application,Rate of Interest,Kamatna stopa
+DocType: Loan Application,Rate of Interest,Kamatna stopa
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: Item,Shelf Life In Days,Rok trajanja u danima
 DocType: GL Entry,Is Opening,Je Otvaranje
+DocType: Department,Expense Approvers,Izdaci za troškove
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
 DocType: Journal Entry,Subscription Section,Subscription Section
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} ne postoji
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index df32abf..8dc5dd2 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Informes d&#39;avaluació
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Productes de Consum
-DocType: Purchase Receipt,Subscription Detail,Detall de la subscripció
 DocType: Supplier Scorecard,Notify Supplier,Notifica el proveïdor
 DocType: Item,Customer Items,Articles de clients
 DocType: Project,Costing and Billing,Càlcul de costos i facturació
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificacions per correu electrònic
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,avaluació
 DocType: Item,Default Unit of Measure,Unitat de mesura per defecte
 DocType: SMS Center,All Sales Partner Contact,Tot soci de vendes Contacte
-DocType: Employee,Leave Approvers,Aprovadors d'absències
+DocType: Department,Leave Approvers,Aprovadors d'absències
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Investigacions
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Això es basa en transaccions amb aquest proveïdor. Veure cronologia avall per saber més
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l&#39;article a la fila {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l&#39;article a la fila {0}
 DocType: Bank Guarantee,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
 DocType: Delivery Note,Return Against Delivery Note,Retorn Contra lliurament Nota
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,No hi ha enviaments salaris enviats per processar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,No hi ha enviaments salaris enviats per processar.
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra oberts
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,És necessari prendre aquesta acció avui mateix per a l&#39;esmentat recurrent
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,caixa
 DocType: Pricing Rule,Apply On,Aplicar a
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
 DocType: Support Settings,Support Settings,Configuració de respatller
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Lots article Estat de caducitat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Lletra bancària
 DocType: Membership,membership validaty section,secció validació de membres
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 DocType: Consultation,Consultation,Consulta
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Fent lloc web
 DocType: Opening Invoice Creation Tool Item,Quantity,Quantitat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Préstecs (passius)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
 DocType: Item,Country of Origin,País d&#39;origen
 DocType: Soil Texture,Soil Texture Criteria,Criteris de textura del sòl
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalls de contacte primaris
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,qüestions obertes
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 DocType: Lab Test Groups,Add new line,Afegeix una nova línia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sanitari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard en el pagament (dies)
@@ -89,7 +85,7 @@
 ,Delay Days,Dies de retard
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Factura
+DocType: Subscription Invoice,Invoice,Factura
 DocType: Purchase Invoice Item,Item Weight Details,Detalls del pes de l&#39;element
 DocType: Asset Maintenance Log,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Fila # {0}:
 DocType: Timesheet,Total Costing Amount,Suma càlcul del cost total
 DocType: Delivery Note,Vehicle No,Vehicle n
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Seleccionla llista de preus
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Treball en curs
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Si us plau seleccioni la data
 DocType: Daily Work Summary Group,Holiday List,Llista de vacances
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Accountant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Accountant
 DocType: Hub Settings,Selling Price List,Llista de preus de venda
 DocType: Patient,Tobacco Current Use,Ús del corrent del tabac
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Velocitat de venda
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Velocitat de venda
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telèfon No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nou {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notificació de correu electrònic inicial enviada
 ,Sales Partners Commission,Comissió dels revenedors
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Valor després de la depreciació
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,connex
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,data de l&#39;assistència no pot ser inferior a la data d&#39;unir-se als empleats
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,data de l&#39;assistència no pot ser inferior a la data d&#39;unir-se als empleats
 DocType: Grading Scale,Grading Scale Name,Nom Escala de classificació
-DocType: Subscription,Repeat on Day,Repeteixi el dia
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Es tracta d'un compte principal i no es pot editar.
 DocType: Sales Invoice,Company Address,Direcció de l&#39;empresa
 DocType: BOM,Operations,Operacions
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No es pot establir l'autorització sobre la base de Descompte per {0}
+DocType: Subscription,Subscription Start Date,Data d&#39;inici de la subscripció
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjunta el fitxer .csv amb dues columnes, una per al nom antic i un altre per al nou nom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en qualsevol any fiscal activa.
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l&#39;article: {1} i el Client: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Període de prova Data de finalització No pot ser abans de la data de començament del període de prova
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,L'obertura per a una ocupació.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},La BOM no està especificada per subcontractar l&#39;element {0} a la fila {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s&#39;introdueix més d&#39;una vegada
 DocType: Patient,Married,Casat
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No està permès per {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtenir articles de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Obtenir articles de
 DocType: Price List,Price Not UOM Dependant,Preu no dependent de l&#39;UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,oli dels frens
 DocType: Tax Rule,Tax Type,Tipus d&#39;Impostos
 ,Completed Work Orders,Comandes de treball realitzats
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,base imposable
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,base imposable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: BOM,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l&#39;Operació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d&#39;entrada de diari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Seleccioneu la llista de materials
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d&#39;entrada de diari
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Seleccioneu la llista de materials
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gestioneu l&#39;import anticipat que es dóna a l&#39;empleat
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Notificació de lliurament
 DocType: Journal Entry,Opening Entry,Entrada Obertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Només compte de pagament
-DocType: Employee Loan,Repay Over Number of Periods,Retornar al llarg Nombre de períodes
+DocType: Loan,Repay Over Number of Periods,Retornar al llarg Nombre de períodes
 DocType: Stock Entry,Additional Costs,Despeses addicionals
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
 DocType: Lead,Product Enquiry,Consulta de producte
 DocType: Education Settings,Validate Batch for Students in Student Group,Validar lots per a estudiants en grup d&#39;alumnes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No hi ha registre de vacances trobats per als empleats {0} de {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},No hi ha registre de vacances trobats per als empleats {0} de {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Si us plau ingressi empresa primer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Si us plau seleccioneu l'empresa primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Si us plau seleccioneu l'empresa primer
 DocType: Employee Education,Under Graduate,Baix de Postgrau
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Establiu la plantilla predeterminada per deixar la notificació d&#39;estat a la configuració de recursos humans.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Cost total
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,préstec empleat
 DocType: Fee Schedule,Send Payment Request Email,Enviar correu electrònic de sol·licitud de pagament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,S&#39;ha registrat sense èxit.
 DocType: Assessment Result,Grade,grau
 DocType: Restaurant Table,No of Seats,No de seients
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Per afegir un tema dinàmic, utilitzeu etiquetes com ara jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tasca de manteniment d&#39;actius
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salari Anual
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salari Anual
 DocType: Daily Work Summary,Daily Work Summary,Resum diari de Treball
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} està congelat
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despeses d'estoc
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Despeses d'estoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selecciona una destinació de dipòsit
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Si us plau, introdueixi preferit del contacte de correu electrònic"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Si us plau, introdueixi preferit del contacte de correu electrònic"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Entrada Contra
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Adreça principal
 DocType: Production Plan,Material Request Detail,Detall de sol·licitud de material
 DocType: Selling Settings,Default Quotation Validity Days,Dates de validesa de cotització per defecte
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: Sales Invoice,Change Amount,Import de canvi
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Categories de llicències de conducció
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Introduïu la data de lliurament
 DocType: Depreciation Schedule,Make Depreciation Entry,Fer l&#39;entrada de Depreciació
+DocType: HR Settings,Leave Settings,Deixeu els paràmetres
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipus de sol·licitud
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,fer Empleat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radiodifusió
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Mode de configuració de TPV (en línia o fora de línia)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Desactiva la creació de registres de temps contra ordres de treball. Les operacions no es poden fer seguiment de l&#39;Ordre de treball
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Execució
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Execució
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Asset Maintenance Log,Maintenance Status,Estat de manteniment
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalls de membres
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: es requereix Proveïdor contra el compte per pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articles i preus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total hores: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferència
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferència
 DocType: Grant Application,Individual,Individual
 DocType: Academic Term,Academics User,acadèmics usuari
 DocType: Cheque Print Template,Amount In Figure,A la Figura quantitat
-DocType: Employee Loan Application,Loan Info,Informació sobre préstecs
+DocType: Loan Application,Loan Info,Informació sobre préstecs
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Pla de visites de manteniment.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Període del quadre de subministrament
 DocType: Share Transfer,Share Transfer,Transferència d&#39;accions
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Plantilla d&#39;elements
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Bioquímica
 DocType: Job Offer,Select Terms and Conditions,Selecciona Termes i Condicions
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,valor fora
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,valor fora
 DocType: Woocommerce Settings,Woocommerce Settings,Configuració de Woocommerce
 DocType: Production Plan,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Territori per defecte
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisió
 DocType: Work Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Seleccioneu el client o el proveïdor.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Company,Enable Perpetual Inventory,Habilitar Inventari Permanent
+DocType: Bank Guarantee,Charges Incurred,Despeses incorregudes
 DocType: Company,Default Payroll Payable Account,La nòmina per defecte del compte per pagar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Grup alerta per correu electrònic
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Resultat personalitzat
 DocType: Delivery Stop,Contact Name,Nom de Contacte
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criteris d&#39;avaluació del curs
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Identificació fiscal:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Identificació fiscal:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Identificador de l&#39;estudiant:
 DocType: POS Customer Group,POS Customer Group,POS Grup de Clients
 DocType: Land Unit,Land Unit describing various land assets,Unitat de terrenys que descriu diversos actius de la terra
@@ -374,9 +371,8 @@
 ,Open Work Orders,Ordres de treball obertes
 DocType: Payment Term,Credit Months,Mesos de Crèdit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Per deixar d&#39;enviar notificacions de errors repetitives del sistema, hem marcat el camp Desactivat a la subscripció"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Deixa per any
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Email Digest,Profit & Loss,D&#39;pèrdues i guanys
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Configureu els estudiants sota grups d&#39;estudiants
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,entrades bancàries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,entrades bancàries
 DocType: Crop,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs eina de creació de grup d&#39;alumnes
 DocType: Lead,Do Not Contact,No entri en contacte
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Les persones que ensenyen en la seva organització
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Course Scheduling Tool,Course Start Date,Curs Data d&#39;Inici
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Informació de compra
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Grau màxim
 DocType: Email Digest,New Quotations,Noves Cites
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Els correus electrònics de lliscament salarial als empleats basades en el correu electrònic preferit seleccionat en Empleat
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Tax Rule,Shipping County,Comtat d&#39;enviament
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Aprendre
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprendre
 DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Xecs pendents i Dipòsits per aclarir
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Estableix la tarifa de l&#39;habitació de l&#39;hotel a {}
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Opening Invoice Creation Tool,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Nota de lliurament
 DocType: Consultation,Encounter Impression,Impressió de trobada
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Cost d&#39;actiu venut
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Course Scheduling Tool,Course Scheduling Tool,Eina de Programació de golf
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] S&#39;ha produït un error en crear% s per a% s recurrents
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
 DocType: Land Unit,LInked Analysis,Anàlisi lliscada
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,El període d&#39;aplicació no pot estar en dos registres d&#39;assignació
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,El període d&#39;aplicació no pot estar en dos registres d&#39;assignació
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat a empleat {1} per al període {2} a {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Rebut
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
 DocType: Volunteer,Weekends,Caps de setmana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Nota de Crèdit Monto
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Nota de Crèdit Monto
 DocType: Setup Progress Action,Action Document,Document d&#39;Acció
 DocType: Chapter Member,Website URL,URL del lloc web
 ,Finished Goods,Béns Acabats
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,demostració ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Afegir els articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Article de qualitat de paràmetres d'Inspecció
+DocType: Leave Application,Leave Approver Name,Nom de l'aprovador d'absències
 DocType: Depreciation Schedule,Schedule Date,Horari Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Els ingressos, deduccions i altres components salarials"
 DocType: Packed Item,Packed Item,Article amb embalatge
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
 DocType: Healthcare Settings,Require Lab Test Approval,Requereix aprovació de la prova de laboratori
 DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total pendent
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total pendent
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
 DocType: Dosage Strength,Strength,Força
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Crear un nou client
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Cost de consumibles
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
 DocType: Student Log,Medical,Metge
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Motiu de pèrdua
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Motiu de pèrdua
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Actualitza el número del compte
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Propietari plom no pot ser la mateixa que la de plom
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Solter
 DocType: Salary Slip,Total Loan Repayment,El reemborsament total del préstec
 DocType: Account,Cost of Goods Sold,Cost de Vendes
-DocType: Subscription,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Si us plau entra el centre de cost
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Si us plau entra el centre de cost
 DocType: Drug Prescription,Dosage,Dosificació
 DocType: Journal Entry Account,Sales Order,Ordre de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. La venda de Tarifa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. La venda de Tarifa
 DocType: Assessment Plan,Examiner Name,Nom de l&#39;examinador
 DocType: Lab Test Template,No Result,sense Resultat
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
 DocType: Purchase Invoice,Supplier Name,Nom del proveïdor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Llegiu el Manual ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Mostra fulles de tots els membres del departament al calendari
 DocType: Purchase Invoice,01-Sales Return,01-Devolució de vendes
 DocType: Account,Is Group,És el Grup
 DocType: Email Digest,Pending Purchase Orders,A l&#39;espera d&#39;ordres de compra
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Camp obligatori - Any Acadèmic
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} no està associat a {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalitza el text d'introducció que va com una part d'aquest correu electrònic. Cada transacció té un text introductori independent.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},No s&#39;ha permès la transacció contra l&#39;ordre de treball aturat {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Mantinguts per a la venda
 DocType: Packing Slip,From Package No.,Del paquet número
 DocType: Item Attribute,To Range,Per Abast
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Valors i Dipòsits
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
 DocType: Student Report Generation Tool,Attended by Parents,Assistit pels pares
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Patient,AB Positive,AB Positiu
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre d'assistència.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El component salarial per a la nòmina de part d&#39;hores basat.
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
-DocType: Employee Loan,Total Payment,El pagament total
+DocType: Loan,Total Payment,El pagament total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,No es pot cancel·lar la transacció per a l&#39;ordre de treball finalitzat.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} es va cancel·lar pel que l&#39;acció no es pot completar
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peces suficient per construir
 DocType: POS Profile User,POS Profile User,Usuari de perfil de TPV
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingrés Directe
+DocType: Subscription Invoice,Subscription Invoice,Factura de subscripció
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Ingrés Directe
 DocType: Patient Appointment,Date TIme,Data i hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Oficial Administratiu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Creació d&#39;empreses i impostos
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
 DocType: Codification Table,Codification Table,Taula de codificació
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Seleccioneu de l&#39;empresa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry Detail,Difference Account,Compte de diferències
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN proveïdor
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Plantilla de cartografia de fluxos d&#39;efectiu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
+DocType: Bank Guarantee,Providing,Proporcionar
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","No està permès, configureu la Plantilla de prova de laboratori segons sigui necessari"
 DocType: Patient,Risk Factors,Factors de risc
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 DocType: Healthcare Settings,Appointment Confirmation,Confirmació de cita
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Tancament (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hola
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,moure element
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Ja heu definit el valor per defecte al perfil de pos {0} per a l&#39;usuari {1}, amabilitat per defecte"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Els valors acumulats
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,El territori es requereix en el perfil de POS
 DocType: Supplier,Prevent RFQs,Evita les RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Fes la teva comanda de vendes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Slip de pagament enviat per al període de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Slip de pagament enviat per al període de {0} a {1}
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Data de facturació d&#39;enviament
 DocType: Production Plan,Production Plan,Pla de producció
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Obrir l&#39;eina de creació de la factura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Devolucions de vendes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Els fulls totals assignats {0} no ha de ser inferior a les fulles ja aprovats {1} per al període
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Establir Qty en les transaccions basades en la entrada sense sèrie
 ,Total Stock Summary,Resum de la total
 DocType: Announcement,Posted By,Publicat per
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Si us plau ajust la Companyia
 DocType: Share Balance,Share Balance,Comparteix equilibri
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Training Result Employee,Training Result Employee,Empleat Formació Resultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
-DocType: Repayment Schedule,Principal Amount,Suma de Capital
-DocType: Employee Loan Application,Total Payable Interest,L&#39;interès total a pagar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Suma de Capital
+DocType: Loan Application,Total Payable Interest,L&#39;interès total a pagar
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total pendent: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venda de parts d&#39;hores
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurants
 DocType: Land Unit,Land Unit Name,Nom de la unitat de la terra
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Redacció de propostes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d&#39;entrada
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Embolcall
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Notifica als clients per correu electrònic
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Notifica als clients per correu electrònic
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
 DocType: Employee Advance,Claimed Amount,Quantia reclamada
 apps/erpnext/erpnext/config/education.py +180,Masters,Màsters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
 DocType: Supplier Scorecard,Per Year,Per any
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No és elegible per a l&#39;admissió en aquest programa segons la DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
 DocType: Sales Invoice,Sales Taxes and Charges,Els impostos i càrrecs de venda
 DocType: Employee,Organization Profile,Perfil de l'organització
 DocType: Vital Signs,Height (In Meter),Alçada (en metro)
 DocType: Student,Sibling Details,Detalls de germans
 DocType: Vehicle Service,Vehicle Service,Servei en el vehicle
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automàticament la sol·licitud de realimentació sobre la base de condicions.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,desencadena automàticament la sol·licitud de realimentació sobre la base de condicions.
 DocType: Employee,Reason for Resignation,Motiu del cessament
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Plantilla per a les avaluacions d'acompliment.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crèdit Publicat
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Canvi net en l&#39;Inventari
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Administració de Préstecs empleat
 DocType: Employee,Passport Number,Nombre de Passaport
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relació amb Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerent
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Gerent
 DocType: Payment Entry,Payment From / To,El pagament de / a
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Establiu el compte a Magatzem {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Transferència de material
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,No s&#39;ha pogut trobar la ruta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Obertura (Dr)
+DocType: Loan,Applicant,Sol · licitant
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Per fer documents recurrents
 ,GST Itemised Purchase Register,GST per elements de Compra Registre
 DocType: Course Scheduling Tool,Reschedule,Reprogramar
-DocType: Employee Loan,Total Interest Payable,L&#39;interès total a pagar
+DocType: Loan,Total Interest Payable,L&#39;interès total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Work Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,acabat
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,base
 DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Anota la quantitat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Anota la quantitat
 DocType: Leave Block List Allow,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
 DocType: Vehicle Log,Service Details,Detalls del servei
-DocType: Subscription,Quarterly,Trimestral
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Agrupats
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matèries primeres Based On
 DocType: Sales Invoice,Port Code,Codi del port
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserva Magatzem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserva Magatzem
 DocType: Lead,Lead is an Organization,El plom és una organització
 DocType: Guardian Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valor del comptaquilòmetres (última)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Plantilles de criteri de quadre de comandament de proveïdors.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Màrqueting
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Màrqueting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Ja està creat Entrada Pagament
 DocType: Request for Quotation,Get Suppliers,Obteniu proveïdors
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Salari vista prèvia de lliscament
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Salari vista prèvia de lliscament
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Només podeu renovar si la vostra pertinença caduca en un termini de 30 dies
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Seleccioneu només si heu configurat els documents del cartera de flux d&#39;efectiu
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Supplier Scorecard,Per Week,Per setmana
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total d&#39;estudiants
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa i Comptabilitat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,en Valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,en Valor
 DocType: Asset Settings,Depreciation Options,Opcions de depreciació
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Hora de publicació no vàlida
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Hora de publicació no vàlida
 DocType: Lead,Campaign Name,Nom de la campanya
 DocType: Hotel Room,Capacity,Capacitat
 DocType: Selling Settings,Close Opportunity After Days,Tancar Oportunitat Després Dies
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Budget,Budget Against,contra pressupost
 DocType: Employee,Cell Number,Número de cel·la
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hi ha cap empleat per als criteris establerts. Comproveu que ja no s&#39;hagin creat salaris.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hi ha cap empleat per als criteris establerts. Comproveu que ja no s&#39;hagin creat salaris.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l&#39;element {2}. Heu proporcionat {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleccioneu una taula
 DocType: BOM,Website Specifications,Especificacions del lloc web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} és una adreça electrònica no vàlida a &quot;Destinataris&quot;
 DocType: Special Test Items,Particulars,Particulars
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Asset,Maintenance,Manteniment
+DocType: Subscriber,Subscriber,Subscriptor
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Actualitzeu el vostre estat del projecte
 DocType: Item,Maximum sample quantity that can be retained,Quantitat màxima de mostra que es pot conservar
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustos predeterminats del Carro de Compres
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Afegeix Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Actius rebutjat a través d&#39;entrada de diari {0}
-DocType: Employee Loan,Interest Income Account,Compte d&#39;Utilitat interès
+DocType: Loan,Interest Income Account,Compte d&#39;Utilitat interès
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Revisa la invitació enviada
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotecnologia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Despeses de manteniment d'oficines
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Despeses de manteniment d'oficines
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Anar a
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuració de comptes de correu electrònic
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Si us plau entra primer l'article
 DocType: Asset Repair,Downtime,Temps d&#39;inactivitat
 DocType: Account,Liability,Responsabilitat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Terme acadèmic:
 DocType: Salary Detail,Do not include in total,No s&#39;inclouen en total
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},La quantitat de mostra {0} no pot ser més de la quantitat rebuda {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Llista de preus no seleccionat
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Request for Quotation Supplier,Send Email,Enviar per correu electrònic
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 DocType: Item,Max Sample Quantity,Quantitat màxima de mostra
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,No permission
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,No permission
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Cita sol·licitada
 DocType: Vital Signs,Heart Rate / Pulse,Taxa / pols del cor
 DocType: Company,Default Bank Account,Compte bancari per defecte
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Proves de laboratori i signes vitals
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No s'ha trobat cap empeat
-DocType: Subscription,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Actualització del projecte.
 DocType: SMS Center,All Customer Contact,Contacte tot client
 DocType: Land Unit,Tree Details,Detalls de l&#39;arbre
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,Stephen
 DocType: Upload Attendance,Import Attendance,Importa Assistència
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Tots els grups d'articles
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Work Order,Item To Manufacture,Article a fabricar
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} l'estat és {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Torneu a seleccionar, si l&#39;adreça escollida s&#39;edita després de desar-la"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 DocType: Item,Hub Publishing Details,Detalls de publicació del Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Obertura&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Obertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Obert a fer
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Lab Test Template,Result Format,Format de resultats
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,bimensual
 DocType: Vehicle Service,Brake Pad,Pastilla de fre
 DocType: Fertilizer,Fertilizer Contents,Contingut de fertilitzants
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Investigació i Desenvolupament
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
 DocType: Timesheet,Total Billed Amount,Suma total Anunciada
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Comprovació del límit de crèdit bypass a l&#39;ordre de vendes
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,L'avaluació de l'acompliment.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punt de venda
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Seient mínim
 DocType: Item Attribute,Item Attribute Values,Element Valors d'atributs
 DocType: Examination Result,Examination Result,examen Resultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referència Doctype ha de ser un {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Work Order,Plan material for sub-assemblies,Material de Pla de subconjunts
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} ha d'estar activa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Sense articles disponibles per a la transferència
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Sense articles disponibles per a la transferència
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Tancament (obertura + total)
 DocType: Journal Entry,Depreciation Entry,Entrada depreciació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
 DocType: Crop Cycle,ISO 8016 standard,Norma ISO 8016
 DocType: Pricing Rule,Rate or Discount,Tarifa o descompte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favorits
 DocType: Hub Settings,Custom Data,Dades personalitzades
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Codi mèdic estàndard
 DocType: Soil Texture,Clay Composition (%),Composició de fang (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Deseu abans d&#39;assignar una tasca.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valor Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valor Saldo
 DocType: Lab Test,Lab Technician,Tècnic de laboratori
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Llista de preus de venda
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si està marcada, es crearà un client, assignat a Pacient. Les factures del pacient es crearan contra aquest client. També podeu seleccionar el client existent mentre feu el pacient."
 DocType: Bank Reconciliation,Account Currency,Compte moneda
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Si us plau, Compte Off rodona a l&#39;empresa"
 DocType: Purchase Receipt,Range,Abast
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
 DocType: Item Barcode,Item Barcode,Codi de barres d'article
 DocType: Woocommerce Settings,Endpoints,Punts extrems
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","per generar. Si es retarda, haurà de canviar manualment el camp &quot;Repetir el dia del mes&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
 DocType: Share Transfer,From Folio No,Des del Folio núm
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Data disponible per a ús
 DocType: Guardian,Guardian Name,nom tutor
 DocType: Cheque Print Template,Has Print Format,Format d&#39;impressió té
-DocType: Employee Loan,Sanctioned,sancionada
+DocType: Loan,Sanctioned,sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
 DocType: Crop Cycle,Crop Cycle,Cicle de cultius
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
 DocType: Student Admission,Publish on website,Publicar al lloc web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
+DocType: Subscription,Cancelation Date,Data de cancel·lació
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 DocType: Agriculture Task,Agriculture Task,Tasca de l&#39;agricultura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Ingressos Indirectes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Ingressos Indirectes
 DocType: Student Attendance Tool,Student Attendance Tool,Eina d&#39;assistència dels estudiants
 DocType: Restaurant Menu,Price List (Auto created),Llista de preus (creada automàticament)
 DocType: Cheque Print Template,Date Settings,Configuració de la data
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metre
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,La prova de laboratori datetime no pot ser abans de la data de cobrament
+DocType: Subscription Plan,Cost,Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
 DocType: Expense Claim,Total Advance Amount,Import avançat total
 DocType: Delivery Stop,Estimated Arrival,Arribada estimada
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
 DocType: Timesheet Detail,Bill,projecte de llei
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanc
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l&#39;entrada ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Només podeu seleccionar un màxim d&#39;una opció a la llista de caselles de verificació.
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
 DocType: Item,Automatically Create New Batch,Crear nou lot de forma automàtica
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Assignant {0} a {1} (fila {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Assignant {0} a {1} (fila {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Fer
 DocType: Student Admission,Admission Start Date,L&#39;entrada Data d&#39;Inici
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nou empleat
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstec Monto
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendari de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opcions sobre accions
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Desactiva l&#39;obtenció dels últims detalls de la compra a l&#39;ordre de compra
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Albarà d'article
 DocType: Purchase Invoice,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Si us plau especificar un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,S&#39;ha creat la creació de variants.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Resum de treball per a {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,El primer Agrovador d&#39;abandonament de la llista serà establert com a Deixat aprovador per defecte.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Plan,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} no pot ser negatiu
 DocType: Training Event,Self-Study,Acte estudi
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,Salari
 DocType: Asset Maintenance,Maintenance Manager Name,Nom del gestor de manteniment
 DocType: Agriculture Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,No es pot trobar la variable:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Seleccioneu un camp per editar des del teclat numèric
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,No es pot convertir en un element d&#39;actiu fix quan es creï Stock Ledger.
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nom de plantilla d&#39;inspecció de qualitat
 DocType: Project,First Email,Primer correu electrònic
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Quantitat de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Quantitat de Venda
 DocType: Repayment Schedule,Interest Amount,Suma d&#39;interès
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Share Transfer,Issue,Incidència
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 ,Projected Quantity as Source,Quantitat projectada com Font
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Viatge de lliurament
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Viatge de lliurament
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipus de transferència
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Despeses de venda
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Despeses de venda
 DocType: Consultation,Diagnosis,Diagnòstic
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra Standard
 DocType: GL Entry,Against,Contra
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Codi ZIP
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Seleccioneu el compte de renda d&#39;interessos en el préstec {0}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
 DocType: Item,Default Supplier,Per defecte Proveïdor
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Sobre Producció Assignació Percentatge
-DocType: Employee Loan,Repayment Schedule,Calendari de reemborsament
+DocType: Loan,Repayment Schedule,Calendari de reemborsament
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condicions d'enviaments
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Dates
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 DocType: Education Settings,Attendance Freeze Date,L&#39;assistència Freeze Data
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Veure tots els Productes
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Veure tots els Productes
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),El plom sobre l&#39;edat mínima (Dies)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,totes les llistes de materials
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Les habitacions de tipus {0} de l&#39;hotel no estan disponibles a {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,D'Empleat
 DocType: Driver,Cellphone Number,Número de telèfon
 DocType: Project,Monitor Progress,Progrés del monitor
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
 DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència
+DocType: Supplier Quotation,Auto Repeat Section,Secció de repetició automàtica
 DocType: Upload Attendance,Attendance From Date,Assistència des de data
 DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment
 DocType: Program Enrollment,Transportation,Transports
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atribut no vàlid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} s'ha de Presentar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
+DocType: Department Approver,Department Approver,Departament aprover
 DocType: SMS Center,Total Characters,Personatges totals
 DocType: Employee Advance,Claimed,Reclamat
 DocType: Crop,Row Spacing,Espaiat de fila
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de Pagament de Reconciliació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Contribució%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","D&#39;acord amb la configuració de comprar si l&#39;ordre de compra Obligatori == &#39;SÍ&#39;, a continuació, per a la creació de la factura de compra, l&#39;usuari necessita per crear l&#39;ordre de compra per al primer element {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-summary of outward supplies
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Els números de registre de l'empresa per la seva referència. Nombres d'impostos, etc."
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Nom de l&#39;acció
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Any d&#39;inici
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},2 primers dígits de GSTIN ha de coincidir amb el nombre d&#39;Estat {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Data inicial del període de facturació actual
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Planificació de la capacitat d&#39;error
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Els camps es copiaran només en el moment de la creació.
 DocType: Setup Progress Action,Domains,Dominis
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Administració
 DocType: Cheque Print Template,Payer Settings,Configuració del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
 DocType: Purchase Invoice,Is Return,És la tornada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Precaució
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',El dia d&#39;inici és superior al final del dia a la tasca &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retorn / dèbit Nota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retorn / dèbit Nota
 DocType: Price List Country,Price List Country,Preu de llista País
 DocType: Item,UOMs,UOMS
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM factor de conversió
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d&#39;article per obtenir el nombre de lot"
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
-DocType: Employee Loan,Partially Disbursed,parcialment Desemborsament
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Concedeix informació.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Concedeix informació.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de dades de proveïdors.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,No podeu reiniciar una subscripció que no es cancel·la.
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
 DocType: Fee Validity,Valid Till,Vàlid fins a
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Reunió total del professorat dels pares
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,No es permet canviar el grup de clients del client seleccionat.
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Actualització dels temps d&#39;arribada estimats.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualització dels temps d&#39;arribada estimats.
 DocType: Program Enrollment Tool,Enrollment Details,Detalls d&#39;inscripció
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Seleccioneu un client
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Purchase Order,Group same items,Grup mateixos articles
 DocType: Purchase Invoice,Disable Rounded Total,Desactivar total arrodonit
-DocType: Employee Loan Application,Repayment Info,Informació de la devolució
+DocType: Department,Parent Department,Departament de pares
+DocType: Loan Application,Repayment Info,Informació de la devolució
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entrades' no pot estar buit
 DocType: Maintenance Team Member,Maintenance Role,Paper de manteniment
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Any fiscal {0} no trobat
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Any fiscal {0} no trobat
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Configuració d&#39;Empleats
 DocType: Sales Order,SO-,TAN-
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuari de la reserva d&#39;hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Seleccioneu el prefix primer
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Recerca
+DocType: Subscription Settings,Subscription Settings,Configuració de la subscripció
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Announcement,All Students,tots els alumnes
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 DocType: Crop Cycle,Less than a year,Menys d&#39;un any
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nº d&#39;Estudiants mòbil
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 DocType: Crop,Yield UOM,Rendiment UOM
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
 DocType: Item,Is Item from Hub,És l&#39;element del centre
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Fila {0}: Tipus d&#39;activitat és obligatòria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividends pagats
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividends pagats
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Comptabilitat principal
 DocType: Stock Reconciliation,Difference Amount,Diferència Monto
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},El {{{{0}}} a la {1}}
 DocType: Purchase Invoice,Reverse Charge,Revertir la carga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Guanys Retingudes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Guanys Retingudes
 DocType: Purchase Invoice,05-Change in POS,05-Canvi en el TPV
 DocType: Vehicle Log,Service Detail,Detall del servei
 DocType: BOM,Item Description,Descripció de l'Article
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Opportunity Item
 ,Student and Guardian Contact Details,Alumne i tutor detalls de contacte
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Per proveïdor es requereix {0} Adreça de correu electrònic per enviar correu electrònic
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Obertura Temporal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Obertura Temporal
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Veure concentrador
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Patient Appointment,More Info,Més Info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
 DocType: Supplier Scorecard,Scorecard Actions,Accions de quadre de comandament
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Exemple: Mestratge en Ciències de la Computació
 DocType: Purchase Invoice,Rejected Warehouse,Magatzem no conformitats
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Supplier Quotation Item,Lead Time in days,Termini d&#39;execució en dies
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Comptes per Pagar Resum
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},El pagament del salari de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},El pagament del salari de {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripcions de proves de laboratori
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Petit
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Obrir l&#39;element de la eina de creació de la factura
 DocType: Education Settings,Employee Number,Número d'empleat
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Cancel·lar la factura després del període de gràcia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 DocType: Project,% Completed,% Completat
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Prova de laboratori Datetime
 DocType: Email Digest,Add Quote,Afegir Cita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Despeses Indirectes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
 DocType: Agriculture Analysis Criteria,Agriculture,Agricultura
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sincronització de dades mestres
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Configureu primer el codi de l&#39;element
 DocType: Item,ITEM-,ARTICLE-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
+DocType: Subscription Plan,Billing Interval Count,Compte d&#39;interval de facturació
 DocType: Sales Invoice Item,Edit Description,Descripció
 DocType: Antibiotic,Antibiotic,Antibiòtics
 ,Team Updates,actualitzacions equip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Format d&#39;impressió
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Grup d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Resum:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,L&#39;element alternatiu no ha de ser el mateix que el codi de l&#39;element
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalització de l&#39;avaluació provisional
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Lloc de treball
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sol·licitud de Cotització Proveïdor
 DocType: Healthcare Settings,Registration Message,Missatge de registre
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Maquinari
 DocType: Prescription Dosage,Prescription Dosage,Dosificació de recepta
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Seleccioneu una Empresa
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Les dates d&#39;inici i fi
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Obrir la llista de materials {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
 DocType: Authorization Rule,Average Discount,Descompte Mig
 DocType: Project Update,Great/Quickly,Gran / Ràpidament
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Seleccioneu lots per lots per al punt
 DocType: Asset,Depreciation Schedules,programes de depreciació
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Els comptes següents es podrien seleccionar a Configuració de GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Els comptes següents es podrien seleccionar a Configuració de GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
 DocType: Payment Request,Transaction Currency,moneda de la transacció
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Des {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Mitjana diària sortint
 DocType: POS Profile,Campaign,Campanya
 DocType: Supplier,Name and Type,Nom i Tipus
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
 DocType: Physician,Contacts and Address,Contactes i adreça
 DocType: Purchase Invoice,Contact Person,Persona De Contacte
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',La 'Data Prevista d'Inici' no pot ser major que la 'Data de Finalització Prevista'
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Elegibilitat i detalls
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Canvi net en actius fixos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sol·licitud de Cotització es desactiva amb l&#39;accés des del portal, per més ajustos del portal de verificació."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quadre de puntuació de proveïdors Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Import Comprar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Import Comprar
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,S&#39;ha produït un error en crear un calendari de cursos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,El primer Approver de despeses de la llista s&#39;establirà com a aprovador d&#39;inversió predeterminat.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Detail,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1839,15 +1844,16 @@
 DocType: Package Code,Package Code,codi paquet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Aprenent
 DocType: Purchase Invoice,Company GSTIN,companyia GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,No s'admenten quantitats negatives
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impost taula de detalls descarregui de mestre d'articles com una cadena i emmagatzemada en aquest camp.
  S'utilitza per a les taxes i càrrecs"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Deixeu l&#39;aprovació obligatòria a l&#39;aplicació Deixar
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Regla fiscal per a les transaccions.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,El termini de pagament a la fila {0} és possiblement un duplicat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agricultura (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Llista de presència
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,lloguer de l'oficina
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Llista de presència
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,lloguer de l'oficina
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 DocType: Disease,Common Name,Nom comú
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
 DocType: Vital Signs,Blood Pressure,Pressió sanguínea
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analista
 DocType: Item,Inventory,Inventari
 DocType: Item,Sales Details,Detalls de venda
 DocType: Quality Inspection,QI-,qi
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validar matriculats Curs per a estudiants en grup d&#39;alumnes
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Item,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Govern
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Govern
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relació de despeses {0} ja existeix per al registre de vehicles
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,nom Institut
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Si us plau, ingressi la suma d&#39;amortització"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Si us plau, ingressi la suma d&#39;amortització"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variants de l&#39;article
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Serveis
 DocType: HR Settings,Email Salary Slip to Employee,Enviar correu electrònic am salari a l'empleat
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Seleccionar Possible Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Seleccionar Possible Proveïdor
 DocType: Sales Invoice,Source,Font
 DocType: Customer,"Select, to make the customer searchable with these fields","Seleccioneu, per fer que el client es pugui cercar amb aquests camps"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra tancada
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Flux d&#39;efectiu d&#39;inversió
 DocType: Program Course,Program Course,curs programa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight and Forwarding Charges
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Homepage,Company Tagline for website homepage,Lema de l&#39;empresa per a la pàgina d&#39;inici pàgina web
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Detalls de Memebership
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Introduïu tots els valors del resultat requerits.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Comptes per Cobrar Resum
-DocType: Employee Loan,Monthly Repayment Amount,Quantitat de pagament mensual
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Comptes per Cobrar Resum
+DocType: Loan,Monthly Repayment Amount,Quantitat de pagament mensual
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Obertura de factures
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
 DocType: GST HSN Code,HSN Code,codi HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Quantitat aportada
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L&#39;usuari {0} ja està assignat al metge {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Caixa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,possible Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,possible Proveïdor
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Distribució Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La llista de receptors és buida. Si us plau, crea la Llista de receptors"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Assistència sanitària (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
-DocType: Employee Loan,Repayment Method,Mètode d&#39;amortització
+DocType: Loan,Repayment Method,Mètode d&#39;amortització
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si se selecciona, la pàgina d&#39;inici serà el grup per defecte de l&#39;article per al lloc web"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Les reclamacions per compte de l'empresa.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificat obligatori
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del temps i Temps de {1} es solapen amb {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Liabilities
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Liabilities
 DocType: Purchase Invoice,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Seleccioneu l&#39;empresa
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Imprimeix la secció
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,L&#39;usuari {0} no té cap perfil de POS per defecte. Comprova la configuració predeterminada a la fila {1} per a aquest usuari.
 DocType: Student Group,Set 0 for no limit,Ajust 0 indica sense límit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Fila {idx}: {field} és obligatòria per crear l&#39;obertura {invoice_type} Factures
 DocType: Customer,Primary Address and Contact Detail,Direcció principal i detall de contacte
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Seleccioneu com a mínim un domini.
 DocType: Dependent Task,Dependent Task,Tasca dependent
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
 DocType: SMS Center,Receiver List,Llista de receptors
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,cerca article
 DocType: Payment Schedule,Payment Amount,Quantitat de pagament
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ja acabat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,A la mà de la
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,A la mà de la
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importació correcta!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Cita d'article
 DocType: Customer,Customer POS Id,Aneu client POS
 DocType: Account,Account Name,Nom del Compte
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Introduïu l&#39;URL del servidor Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
 DocType: Share Balance,To No,No
-DocType: Subscription,Reference Document,Document de referència
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} està cancel·lat o parat
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Tipus de sol·licitant
+DocType: Loan,Applicant Type,Tipus de sol·licitant
 DocType: Purchase Invoice,03-Deficiency in services,03-Deficiència en els serveis
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
 DocType: Healthcare Settings,Default Medical Code Standard,Codi per defecte de codi mèdic
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Anunciat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humans
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rebutjar
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Per als Empleats
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Fer l&#39;entrada de desemborsament
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Fer l&#39;entrada de desemborsament
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
 DocType: Company,Default Values,Valors Predeterminats
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (sense impostos)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Comptador de plom
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock disponible
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock disponible
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,obtenció
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Camp obligatori - Programa
 DocType: Special Test Template,Result Component,Component de resultats
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamació de la Garantia
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Inclogui les vacances dins de les fulles com les fulles
 DocType: Sales Invoice,Packed Items,Dinar Articles
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamació de garantia davant el No. de sèrie
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Total&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Total&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilita Compres
 DocType: Employee,Permanent Address,Adreça Permanent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Confirma l&#39;acció
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Subhastes en línia
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Realització
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,veure Cistella
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despeses de Màrqueting
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,No es poden crear criteris estàndard. Canvia el nom dels criteris
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Material Request,Transferred,transferit
 DocType: Vehicle,Doors,portes
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Configuració ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Recull la tarifa per al registre del pacient
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,No es poden canviar els atributs després de la transacció d&#39;accions. Realitzeu un element nou i transfereixi valors al nou element
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,No es poden canviar els atributs després de la transacció d&#39;accions. Realitzeu un element nou i transfereixi valors al nou element
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,desintegració impostos
 DocType: Packing Slip,PS-,PD-
@@ -2212,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Purchase Invoice Item,Batch No,Lot número
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Avantatges dels empleats
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 DocType: Student Group Instructor,Student Group Instructor,Instructor grup d&#39;alumnes
 DocType: Grant Application,Assessment  Mark (Out of 10),Marc d&#39;avaluació (de 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Email Digest,Annual Expenses,Les despeses anuals
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
 DocType: Sales Team,Contribution to Net Total,Contribució neta total
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
 DocType: Territory,Territory Name,Nom del Territori
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Només podeu tenir plans amb el mateix cicle de facturació en una subscripció
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sol·licitant d'ocupació.
 DocType: Purchase Order Item,Warehouse and Reference,Magatzem i Referència
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el Proveïdor
@@ -2242,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,taxacions
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Esdeveniments de formació
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Seguiment de conductes per Lead Source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,"Si us plau, entra"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,"Si us plau, entra"
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Registre de manteniment
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El pes net d'aquest paquet. (Calculats automàticament com la suma del pes net d'articles)
@@ -2253,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: Student Group,Instructors,els instructors
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} ha de ser presentat
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestió d&#39;accions
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pagament
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Magatzem {0} no està vinculada a cap compte, si us plau esmentar el compte en el registre de magatzem o un conjunt predeterminat compte d&#39;inventari en companyia {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gestionar les seves comandes
 DocType: Work Order Operation,Actual Time and Cost,Temps real i Cost
@@ -2267,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,Aplicació Deixar estudiant
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total d&#39;hores de treball no han de ser més grans que les hores de treball max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,En
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
@@ -2277,7 +2285,7 @@
 DocType: Item,Barcodes,Codis de barres
 DocType: Hub Category,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,L&#39;ordre de treball {0} s&#39;ha de presentar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,nou carro
@@ -2295,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturació ha de ser igual a la moneda de la companyia per defecte o la moneda del compte de partit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Fila {0}: data de venciment no pot ser abans de la data de publicació
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Fila {0}: data de venciment no pot ser abans de la data de publicació
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Feu Entrada Pagament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
 ,Sales Invoice Trends,Tendències de Factures de Vendes
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Fulles
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Per
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
 DocType: Serial No,Delivery Document No,Lliurament document nº
@@ -2315,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,El consum de material no està establert en la configuració de fabricació.
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No es pot superar l&#39;element {0} a la fila {1} més que {2}. Per permetre una facturació excessiva, configureu-la a Configuració de valors"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No es pot superar l&#39;element {0} a la fila {1} més que {2}. Per permetre una facturació excessiva, configureu-la a Configuració de valors"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualitza la resposta
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
@@ -2326,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccioneu primer el programa
 DocType: Patient Appointment,Patient Age,Edat del pacient
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Gestió de Projectes
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,El número de sèrie {0} ja no s&#39;ha retornat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,El número de sèrie {0} ja no s&#39;ha retornat
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
 DocType: Budget,Fiscal Year,Any Fiscal
 DocType: Asset Maintenance Log,Planned,Planificat
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Compte per cobrar per defecte que s&#39;utilitzarà si no s&#39;estableix a Patient per reservar càrrecs de consulta.
 DocType: Vehicle Log,Fuel Price,Preu del combustible
+DocType: Bank Guarantee,Margin Money,Marge de diners
 DocType: Budget,Budget,Pressupost
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Estableix obert
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
@@ -2345,16 +2353,16 @@
 DocType: Lead,Follow Up,Segueix
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},S&#39;ha introduït el mateix element diverses vegades. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Hi han hagut errors.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,L&#39;empleat {0} ja ha sol·licitat {1} entre {2} i {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Hi han hagut errors.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,L&#39;empleat {0} ja ha sol·licitat {1} entre {2} i {3}:
 DocType: Guardian,Guardian Interests,Interessos de la guarda
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
 DocType: Education Settings,Instructor Records to be created by,Instructor Records a ser creat per
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: GST Account,GST Account,Compte GST
@@ -2374,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,S&#39;ha afegit a preferits
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No s&#39;ha trobat resoldre salarial per presentar els criteris seleccionats anteriorment o el resguard salarial ja presentat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Taxes i impostos
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No s&#39;ha trobat resoldre salarial per presentar els criteris seleccionats anteriorment o el resguard salarial ja presentat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Taxes i impostos
 DocType: Projects Settings,Projects Settings,Configuració dels projectes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arbre dels grups d'articles.
 DocType: Production Plan,Total Produced Qty,Quantitat total produïda
 DocType: Payroll Entry,Get Employee Details,Obteniu detalls dels empleats
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
 DocType: Asset,Sold,venut
 ,Item-wise Purchase History,Historial de compres d'articles
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
 DocType: Account,Frozen,Bloquejat
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Import base (Companyia de divises)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Matèries primeres
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Matèries primeres
 DocType: Payment Reconciliation Payment,Reference Row,referència Fila
 DocType: Installation Note,Installation Time,Temps d'instal·lació
 DocType: Sales Invoice,Accounting Details,Detalls de Comptabilitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
 DocType: Patient,O Positive,O positiu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Inversions
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteris d'acceptació
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,No hi ha reemborsaments disponibles per a l&#39;entrada del diari
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 DocType: BOM,Show In Website,Mostra en el lloc web
 DocType: Shopping Cart Settings,Show Quantity in Website,Quantitat mostrar a la pàgina web
-DocType: Employee Loan Application,Total Payable Amount,La quantitat total a pagar
+DocType: Loan Application,Total Payable Amount,La quantitat total a pagar
 DocType: Task,Expected Time (in hours),Temps esperat (en hores)
 DocType: Item Reorder,Check in (group),El procés de registre (grup)
 DocType: Soil Texture,Silt,Silt
@@ -2424,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Fer pagament
 DocType: Room,Room Name,Nom de la sala
 DocType: Prescription Duration,Prescription Duration,Durada de la prescripció
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adreces de clients i contactes
 ,Campaign Efficiency,eficiència campanya
@@ -2442,11 +2451,11 @@
 DocType: Chapter,Chapter,Capítol
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Parell
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,El compte predeterminada s&#39;actualitzarà automàticament a la factura POS quan aquest mode estigui seleccionat.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
 DocType: Asset,Depreciation Schedule,Programació de la depreciació
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Les adreces soci de vendes i contactes
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Mig dia de la data ha d&#39;estar entre De la data i Fins a la data
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Mig dia de la data ha d&#39;estar entre De la data i Fins a la data
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Establiu el Centre de costos per defecte a {0} empresa.
 DocType: Item,Has Batch No,Té número de lot
@@ -2464,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d&#39;hores)
 DocType: Soil Texture,Soil Type,Tipus de sòl
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nou missatge
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandat sense GoCard
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,Categoria de concentrador
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
-DocType: Employee Loan,Loan Amount,Total del préstec
+DocType: Loan,Loan Amount,Total del préstec
 DocType: Student Report Generation Tool,Add Letterhead,Afegeix un capçalera
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicle auto-conducció
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Quadre de comandament del proveïdor
@@ -2512,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,Posició
 DocType: Patient,Patient Details,Detalls del pacient
 DocType: Patient,B Positive,B Positiu
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 DocType: Patient Medical Record,Patient Medical Record,Registre mèdic del pacient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup de No-Grup
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Esports
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Actual total
 DocType: Lab Test UOM,Test UOM,Prova UOM
 DocType: Student Siblings,Student Siblings,Els germans dels estudiants
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detall del pla de subscripció
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unitat
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Si us plau, especifiqui l'empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Asset Maintenance Task,Maintenance Task,Tasca de manteniment
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Establiu el límit B2C a la configuració de GST.
@@ -2537,6 +2546,7 @@
 ,BOM Search,BOM Cercar
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Cost del material consumit total (a través de l&#39;entrada d&#39;accions)
 DocType: Hub Settings,Company Registered,Empresa registrada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,La data no pot ser inferior a la data
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publica &quot;En existència&quot; o &quot;No està en existència&quot; al Hub basant-se en les existències disponibles en aquest magatzem.
 DocType: Vehicle,Fuel Type,Tipus de combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Després de sol·licituds de materials s&#39;han plantejat de forma automàtica segons el nivell de re-ordre de l&#39;article
 DocType: Email Digest,Pending Sales Orders,A l&#39;espera d&#39;ordres de venda
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 DocType: Employee,Create User Permission,Crea permís d&#39;usuari
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
 DocType: Healthcare Settings,Remind Before,Recordeu abans
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
 DocType: Salary Component,Deduction,Deducció
 DocType: Item,Retain Sample,Conserveu la mostra
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
 DocType: Stock Reconciliation Item,Amount Difference,diferència suma
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
 DocType: Territory,Classification of Customers by region,Classificació dels clients per regió
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,En producció
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat equilibri extracte bancari
 DocType: Normal Test Template,Normal Test Template,Plantilla de prova normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Oferta
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,No es pot establir una RFQ rebuda a cap quota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Oferta
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,No es pot establir una RFQ rebuda a cap quota
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducció total
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Seleccioneu un compte per imprimir a la moneda del compte
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Això es basa en operacions contra aquest pacient. Vegeu la línia de temps a continuació per obtenir detalls
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Cost Actualitzat
 DocType: Patient,Date of Birth,Data de naixement
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Article {0} ja s'ha tornat
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuració del quadre de comandaments del proveïdor
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descripció del Treball
 DocType: Student Applicant,Applied,aplicat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Torna a obrir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Torna a obrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,nom Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Descompte de venda post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió."
+DocType: Department Approver,Approver,Aprovador
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,El camp A l&#39;Accionista no pot estar en blanc
 DocType: Guardian,Work Address,Direcció del treball
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total assignat (Companyia de divises)
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 DocType: BOM,Scrap Material Cost,Cost de materials de rebuig
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
 DocType: Grant Application,Email Notification Sent,Notificació per correu electrònic enviada
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Codi d&#39;article, magatzem, quantitat es requereix a la fila"
-DocType: Pricing Rule,Supplier,Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Codi d&#39;article, magatzem, quantitat es requereix a la fila"
+DocType: Bank Guarantee,Supplier,Proveïdor
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Mostra els detalls del pagament
 DocType: Consultation,Consultation Time,Temps de consulta
 DocType: C-Form,Quarter,Trimestre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Despeses diverses
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nom del banc
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Sobre
-DocType: Employee Loan,Employee Loan Account,Compte de Préstec empleat
 DocType: Leave Application,Total Leave Days,Dies totals d'absències
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correu electrònic no serà enviat als usuaris amb discapacitat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d&#39;Interacció
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Pes (en quilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",capítols / title_name deixar en blanc automàticament després d&#39;emmagatzemar el capítol.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Establiu els Comptes GST a la configuració de GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Establiu els Comptes GST a la configuració de GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tipus de negoci
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Cost de Compra de Nova
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,Descripció de la subvenció
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
 DocType: Student Guardian,Others,Altres
+DocType: Subscription,Discounts,Descomptes
 DocType: Payment Entry,Unallocated Amount,Suma sense assignar
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hi ha més actualitzacions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Cobreix totes les taules de seguiment vinculades a aquesta configuració
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Nen Article no ha de ser un paquet de productes. Si us plau remoure l&#39;article `` {0} i guardar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banca
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,servei d&#39;articles
 DocType: Bank Guarantee,Bank Guarantee,garantia bancària
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
 DocType: Bin,Ordered Quantity,Quantitat demanada
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Grading Scale,Grading Scale Intervals,Intervals de classificació en l&#39;escala
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Benefici de l&#39;exercici
+DocType: Bank Guarantee,Name of Bank,Nom del banc
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Comptabilitat per a {2} només pot fer-se en moneda: {3}
 DocType: Fee Schedule,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Arbre dels comptes financers.
+DocType: Bank Guarantee,Reference Document Type,Referència Tipus de document
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cartografia del flux d&#39;efectiu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventari serialitzat
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,No s&#39;ha trobat el correu electrònic al contacte predeterminat
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genera el secret
-DocType: Employee Loan,Account Info,Informació del compte
+DocType: Loan,Account Info,Informació del compte
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Fees,Include Payment,Inclou el pagament
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grups d&#39;estudiants creats.
 DocType: Sales Invoice,Total Billing Amount,Suma total de facturació
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,El programa a l&#39;Estructura de tarifes i al grup d&#39;estudiants {0} són diferents.
 DocType: Fee Schedule,Receivable Account,Compte per Cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
 DocType: Quotation Item,Stock Balance,Saldos d'estoc
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Ordres de venda al Pagament
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Amb el pagament de l&#39;impost
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Triplicat per PROVEÏDOR
 DocType: Land Unit,Is Container,És contenidor
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Aquest serà el dia 1 del cicle del cultiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Seleccioneu el compte correcte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Seleccioneu el compte correcte
 DocType: Purchase Invoice Item,Weight UOM,UDM del pes
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Llista d&#39;accionistes disponibles amb números de foli
 DocType: Salary Structure Employee,Salary Structure Employee,Empleat Estructura salarial
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Mostra atributs de variants
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Mostra atributs de variants
 DocType: Student,Blood Group,Grup sanguini
 DocType: Course,Course Name,Nom del curs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Material d'oficina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Material d'oficina
 DocType: Purchase Invoice Item,Qty,Quantitat
 DocType: Fiscal Year,Companies,Empreses
 DocType: Supplier Scorecard,Scoring Setup,Configuració de puntuacions
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Es requereix dèbit per
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Llista de preus de Compra
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantilles de variables de quadre de comandament de proveïdors.
 DocType: Job Offer Term,Offer Term,Oferta Termini
 DocType: Asset,Quality Manager,Gerent de Qualitat
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total no pagat: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operació Pàgina Web de llista de materials
 DocType: Supplier Scorecard,Supplier Score,Puntuació del proveïdor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Total facturat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Total facturat Amt
 DocType: Supplier,Warn RFQs,Adverteu RFQs
 DocType: BOM,Conversion Rate,Taxa de conversió
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cercar producte
 DocType: Assessment Plan,To Time,Per Temps
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
+DocType: Loan,Total Amount Paid,Import total pagat
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Si us plau, seleccioneu Admissió d&#39;estudiants que és obligatòria per al sol·licitant estudiant pagat"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Seleccioneu una llista de preus per publicar preus
@@ -2741,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La llista de preus {0} està deshabilitada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Complet Quantitat no pot contenir més de {1} per a l&#39;operació {2}
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Article serialitzat {0} no es pot actualitzar mitjançant la Reconciliació, utilitzi l&#39;entrada"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Article serialitzat {0} no es pot actualitzar mitjançant la Reconciliació, utilitzi l&#39;entrada"
 DocType: Training Event Employee,Training Event Employee,Formació dels treballadors Esdeveniment
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Es poden conservar mostres màximes: {0} per a lots {1} i element {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Afegeix franges horàries
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoració actual Taxa
 DocType: Training Event,Advance,Avanç
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,per tornar a fer-ho de manera recurrent.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Configuració de la passarel·la de pagament GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Guany en Canvi / Pèrdua
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Guany en Canvi / Pèrdua
 DocType: Opportunity,Lost Reason,Raó Perdut
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: el compte {1} no pertany a l&#39;empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: el compte {1} no pertany a l&#39;empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},No es pot trobar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no trobat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},La subscripció ha estat {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa de tarifes Programa
 DocType: Fee Schedule Program,Student Batch,lot estudiant
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,fer Estudiant
@@ -2786,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Comerç electrònic GSTIN
 DocType: Sales Order,Not Delivered,No Lliurat
 ,Bank Clearance Summary,Resum Liquidació del Banc
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
 DocType: Appraisal Goal,Appraisal Goal,Avaluació Meta
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Suggereix una categoria?
 DocType: Stock Reconciliation Item,Current Amount,suma actual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,edificis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,edificis
 DocType: Fee Schedule,Fee Structure,Estructura de tarifes
 DocType: Timesheet Detail,Costing Amount,Pago Monto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Student Admission Program,Application Fee,Taxa de sol·licitud
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Presentar nòmina
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Criteris d&#39;anàlisi agrícola
+DocType: HR Settings,Leave Approval Notification Template,Deixeu la plantilla de notificació d&#39;aprovació
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressió sanguínia (diastòlica)
 DocType: SMS Log,Sent To,Enviat A
 DocType: Agriculture Task,Holiday Management,Gestió de vacances
 DocType: Payment Request,Make Sales Invoice,Fer Factura Vendes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,programaris
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,programaris
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
 DocType: Company,For Reference Only.,Només de referència.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},El metge {0} no està disponible a {1}
@@ -2824,7 +2838,7 @@
 DocType: Employee,New Workplace,Nou lloc de treball
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Consum de material
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establir com Tancada
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Número d'article amb Codi de barres {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Número d'article amb Codi de barres {0}
 DocType: Normal Test Items,Require Result Value,Requereix un valor de resultat
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2839,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Sense estructura activa o salari per defecte trobat d&#39;empleat {0} per a les dates indicades
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periódico
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalls de la plantilla d&#39;assignació de fluxos d&#39;efectiu
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Gestió de préstecs
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguiment d'Ingressos i Despeses per separat per a les verticals de productes o divisions.
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Slip Mostra Salari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transferir material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Slip Mostra Salari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transferir material
 DocType: Fees,Send Payment Request,Enviar sol·licitud de pagament
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 DocType: Water Analysis,Origin,Origen
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l&#39;element {4}. Estàs fent una altra {3} contra el mateix {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Seleccioneu el canvi import del compte
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,La responsabilitat fiscal de la renda
 DocType: Grading Scale Interval,Grade Description,grau Descripció
 DocType: Stock Entry,Purchase Receipt No,Número de rebut de compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Diners Earnest
 DocType: Sales Invoice, Shipping Bill Number,Número de factura d&#39;enviament
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traçabilitat
 DocType: Asset Maintenance Log,Actions performed,Accions realitzades
 DocType: Cash Flow Mapper,Section Leader,Líder de secció
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Font dels fons (Passius)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Font dels fons (Passius)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Empleat
+DocType: Bank Guarantee,Fixed Deposit Number,Número de dipòsit fixat
 DocType: Asset Repair,Failure Date,Data de fracàs
 DocType: Sample Collection,Collected Time,Temps recopilats
 DocType: Company,Sales Monthly History,Historial mensual de vendes
@@ -2890,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Estàs segur que vols cancel·lar aquesta cita?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paquet de tarifes de l&#39;habitació de l&#39;hotel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline vendes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Obteniu actualitzacions de subscripció
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Compte {0} no coincideix amb el de la seva empresa {1} en la manera de compte: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Curs:
@@ -2903,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,No s&#39;ha creat cap Ordre de treball
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmacèutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 DocType: Purchase Invoice,Credit To,Crèdit Per
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,Sense pressupost
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Compensatori
 DocType: Job Offer,Accepted,Acceptat
@@ -2933,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d&#39;aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Resultats de la cerca
 DocType: Room,Room Number,Número d&#39;habitació
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Invàlid referència {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Invàlid referència {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 DocType: Journal Entry Account,Payroll Entry,Entrada de nòmina
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Veure registres de tarifes
@@ -2943,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 DocType: Lab Test Sample,Lab Test Sample,Exemple de prova de laboratori
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permet canviar el nom del valor de l&#39;atribut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Seient Ràpida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Restaurant,Invoice Series Prefix,Prefix de la sèrie de factures
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,La integració de Google Maps no està habilitada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no está presentat
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Data de venciment de la pertinença
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ha de ser negatiu en el document de devolució
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ha de ser negatiu en el document de devolució
 ,Minutes to First Response for Issues,Minuts fins a la primera resposta per Temes
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oportunitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oportunitat
 DocType: Operation,Default Workstation,Per defecte l'estació de treball
 DocType: Notification Control,Expense Claim Approved Message,Missatge Reclamació d'aprovació de Despeses
 DocType: Payment Entry,Deductions or Loss,Deduccions o Pèrdua
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
 DocType: Campaign,Campaign-.####,Campanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fer Factura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,El saldo restant
@@ -3017,7 +3034,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +86,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,De cap d&#39;any
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Plom
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Driver,Driver,Conductor
 DocType: Vital Signs,Nutrition Values,Valors nutricionals
 DocType: Lab Test Template,Is billable,És facturable
@@ -3028,7 +3045,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Data d&#39;inici real (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Rang Envelliment 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,L&#39;import total anticipat no pot ser superior a l&#39;import total reclamat
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,L&#39;import total anticipat no pot ser superior a l&#39;import total reclamat
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3083,7 +3100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Seleccioneu els valors de l&#39;atribut
 DocType: Purchase Invoice,Reason For Issuing document,Raó per emetre el document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Per següent Contacte no pot ser la mateixa que la de plom Adreça de correu electrònic
 DocType: Tax Rule,Billing City,Facturació Ciutat
@@ -3100,7 +3117,8 @@
 DocType: Warranty Claim,Service Address,Adreça de Servei
 DocType: Asset Maintenance Task,Calibration,Calibratge
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} és una festa d&#39;empresa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mobles i Accessoris
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Deixeu la notificació d&#39;estat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mobles i Accessoris
 DocType: Item,Manufacture,Manufactura
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Configuració de l&#39;empresa
 ,Lab Test Report,Informe de prova de laboratori
@@ -3116,7 +3134,6 @@
 DocType: Crop,Planting Area,Àrea de plantació
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Això podria ser degut a algunes adreces electròniques no vàlides a la
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Heu afegit
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,formació Resultat
@@ -3126,16 +3143,17 @@
 DocType: Products Settings,Products per Page,Productes per pàgina
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informa d'un problema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Despeses de serveis públics
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Per sobre de 90-
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteris de pes
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Deixeu la notificació d&#39;aprovació
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Sobre la base de nòmina de part d&#39;hores
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tarifa de compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Tarifa de compra
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establir valors predeterminats com a Empresa, vigència actual any fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipus de Pagament
@@ -3157,6 +3175,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustaments de la cistella de la compra
 DocType: Journal Entry,Accounting Entries,Assentaments comptables
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si es selecciona la regla de preus per a &quot;Tarifa&quot;, sobreescriurà la llista de preus. La tarifa de la tarifa de preus és la tarifa final, de manera que no s&#39;ha d&#39;aplicar un descompte addicional. Per tant, en transaccions com ara Ordre de vendes, Ordre de compra, etc., s&#39;obtindrà en el camp &quot;Tarifa&quot;, en lloc del camp &quot;Tarifa de tarifes de preus&quot;."
+DocType: Journal Entry,Paid Loan,Préstec pagat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Entrada duplicada. Si us plau, consulteu Regla d'autorització {0}"
 DocType: Journal Entry Account,Reference Due Date,Referència Data de venciment
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3173,7 +3192,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,nòmina de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
 DocType: Patient Service Unit,Parent Service Unit,Unitat de servei al pare
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,fer usuari
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
@@ -3191,7 +3210,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Compte d'ingressos
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Lliurament
 DocType: Volunteer,Weekdays,Dies laborables
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: Restaurant Menu,Restaurant Menu,Menú de restaurant
@@ -3199,7 +3218,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
 DocType: Payment Entry,Total Allocated Amount,total assignat
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Envieu un correu electrònic de revisió de la subvenció
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
@@ -3207,10 +3226,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Capacitat de l&#39;habitació
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Ja existeix un registre per a l&#39;element {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Àrbitre
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Perdin registres de factures generades prèviament. Esteu segur que voleu reiniciar aquesta subscripció?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Quota d&#39;inscripció
 DocType: Budget,Cost Center,Centre de Cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Comprovant #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Comprovant #
 DocType: Notification Control,Purchase Order Message,Missatge de les Ordres de Compra
 DocType: Tax Rule,Shipping Country,País d&#39;enviament
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Amaga ID d&#39;Impostos del client segons Transaccions de venda
@@ -3219,20 +3239,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magatzem només es pot canviar a través d'entrada d'estoc / Nota de lliurament / recepció de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Director de Màrqueting i Vendes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Director de Màrqueting i Vendes
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Impost sobre els guanys
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Aneu als membres
+DocType: Subscription,Cancel At End Of Period,Cancel·la al final de període
 DocType: Item Supplier,Item Supplier,Article Proveïdor
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,No hi ha elements seleccionats per a la transferència
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,No hi ha elements seleccionats per a la transferència
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
 DocType: Vehicle,Electric,elèctric
 DocType: Task,% Progress,% Progrés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Guany / Pèrdua per venda d&#39;actius
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Guany / Pèrdua per venda d&#39;actius
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Només es seleccionarà el sol·licitant d&#39;estudiants amb l&#39;estat &quot;Aprovat&quot; a la taula següent.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,El número de compte del compte {0} no està disponible. <br> Configureu el vostre Gràfic de comptes correctament.
 DocType: Task,Depends on Tasks,Depèn de Tasques
@@ -3247,6 +3268,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,No en Stock
 DocType: Volunteer,Volunteer Skills,Habilitats de voluntariat
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Nom del document de referència
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
 apps/erpnext/erpnext/hooks.py +142,Issues,Qüestions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estat ha de ser un {0}
@@ -3260,7 +3282,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra gran
+DocType: Loan,Loan Application,Sol·licitud de préstec
 DocType: Crop,Scientific Name,Nom científic
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,fulles totals
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Torneu a seleccionar, si el contacte escollit s&#39;edita després de desar-lo"
@@ -3269,13 +3292,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Gran
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Gran
 DocType: Homepage Featured Product,Homepage Featured Product,Pàgina d&#39;inici Producte destacat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Tots els grups d&#39;avaluació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Tots els grups d&#39;avaluació
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Magatzem nou nom
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territori
@@ -3296,9 +3319,10 @@
 DocType: Fees,Fees,taxes
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Total Monto Pendent
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Total Monto Pendent
 DocType: Sales Partner,Targets,Blancs
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Si us plau, registri el número SIREN en el fitxer d&#39;informació de l&#39;empresa"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 DocType: Price List,Price List Master,Llista de preus Mestre
 DocType: GST Account,CESS Account,Compte CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
@@ -3307,6 +3331,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Seleccioneu el pacient
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nom del paràmetre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Només Deixa aplicacions amb estat &quot;Aprovat&quot; i &quot;Rebutjat&quot; pot ser presentat
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
 DocType: Homepage,Products to be shown on website homepage,Els productes que es mostren a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
@@ -3351,14 +3376,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Factura ja creada per a totes les hores de facturació
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nom d&#39;error: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,El cost financer
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Establiu el client predeterminat a la Configuració del restaurant
 ,Salary Register,salari Registre
 DocType: Warehouse,Parent Warehouse,Magatzem dels pares
-DocType: C-Form Invoice Detail,Net Total,Total Net
+DocType: Subscription,Net Total,Total Net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Per defecte la llista de materials que no es troba d&#39;article {0} i {1} Projecte
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definir diversos tipus de préstecs
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definir diversos tipus de préstecs
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Quantitat Pendent
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en minuts)
@@ -3390,11 +3415,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Compte arrel ha de ser un grup
 DocType: Drug Prescription,Drug Prescription,Prescripció per drogues
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Reemborsat / Tancat
+DocType: Loan,Repaid/Closed,Reemborsat / Tancat
 DocType: Item,Total Projected Qty,Quantitat total projectada
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","No s&#39;ha trobat el percentatge de valoració de l&#39;element {0}, que es requereix per fer entrades de comptabilitat per {1} {2}. Si l&#39;element es transacciona com a element de la taxa de valoració zero a {1}, mencioneu-lo a la taula {1} Element. En cas contrari, creeu una transacció d&#39;accions entrants per l&#39;element o mencioneu el percentatge de valoració al registre de l&#39;element i, a continuació, intenteu enviar / cancel·lar aquesta entrada."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 DocType: Course,Course Code,Codi del curs
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilitzeu TPV en mode fora de línia
@@ -3414,16 +3438,15 @@
 DocType: Purchase Invoice,Deemed Export,Es considera exportar
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
-DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Vostè ja ha avaluat pels criteris d&#39;avaluació {}.
 DocType: Vehicle Service,Engine Oil,d&#39;oli del motor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Ordres de treball creades: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Ordres de treball creades: {0}
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
-DocType: Employee Loan,Loan Details,Detalls de préstec
+DocType: Loan,Loan Details,Detalls de préstec
 DocType: Company,Default Inventory Account,Compte d&#39;inventari per defecte
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Els números del foli no coincideixen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
@@ -3435,19 +3458,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un enllaç a totes les Unitats de Terres en les quals el Cultiu creix
 DocType: Account,Root Type,Escrigui root
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No es pot tornar més de {1} per a l&#39;article {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No es pot tornar més de {1} per a l&#39;article {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mostra aquesta presentació de diapositives a la part superior de la pàgina
 DocType: BOM,Item UOM,Article UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Cheque Print Template,Primary Settings,ajustos primaris
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar adreça del proveïdor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Afegir Empleats
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Afegir Empleats
 DocType: Purchase Invoice Item,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Petit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Petit
 DocType: Company,Standard Template,plantilla estàndard
 DocType: Training Event,Theory,teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 DocType: Payment Request,Mute Email,Silenciar-mail
@@ -3467,11 +3490,10 @@
 DocType: SMS Log,No of Sent SMS,No d'SMS enviats
 DocType: Antibiotic,Healthcare Administrator,Administrador sanitari
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Estableix una destinació
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
 DocType: Dosage Strength,Dosage Strength,Força de dosificació
 DocType: Account,Expense Account,Compte de Despeses
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteris d&#39;avaluació del pla
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,La data de caducitat és obligatòria per a l&#39;element seleccionat
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar les comandes de compra
@@ -3484,18 +3506,18 @@
 DocType: Patient,Personal and Social History,Història personal i social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,S&#39;ha creat l&#39;usuari {0}
 DocType: Fee Schedule,Fee Breakup for each student,Taxa d&#39;interrupció per cada estudiant
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Canvia el codi
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dièsel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 DocType: Purchase Invoice,Availed ITC Cess,Aprovat ITC Cess
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,La norma d&#39;enviament només és aplicable per a la venda
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Fins
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grup d&#39;estudiant o Horari del curs és obligatòria
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenir Hores i hores de treball de facturació igual en part d&#39;hores
@@ -3515,7 +3537,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Indiqueu els vostres productes o serveis que compreu o veniu.
 DocType: Water Analysis,Storage Temperature,Temperatura del magatzem
 DocType: Employee Attendance Tool,Unmarked Attendance,L&#39;assistència sense marcar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudiant Eina d&#39;Inscripció Programa
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},La data d&#39;inici hauria de ser inferior a la data de finalització de la tasca {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nom o Email és obligatori
@@ -3528,7 +3550,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} té actualment un {1} Quadre de comandament del proveïdor en posició i les RFQs a aquest proveïdor s&#39;han de fer amb precaució.
 DocType: Chapter,Non Profit Manager,Gerent sense ànim de lucre
 DocType: BOM,Total Cost(Company Currency),Cost total (Companyia de divises)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} creat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} creat
 DocType: Homepage,Company Description for website homepage,Descripció de l&#39;empresa per a la pàgina d&#39;inici pàgina web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,nom suplir
@@ -3538,11 +3560,10 @@
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Healthcare Settings,Result Printed,Resultat imprès
 DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Període De Prova
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visualitza {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Període De Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Project,Total Costing Amount (via Timesheets),Import total de costos (a través de fulls de temps)
-DocType: Employee Advance,Expense Approver,Aprovador de despeses
+DocType: Department,Expense Approver,Aprovador de despeses
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
 DocType: Project,Hourly,Hora per hora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,No al Grup Grup
@@ -3551,7 +3572,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fa el pagament via entrada de diari
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,impresa:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,impresa:
 DocType: Item,Inspection Required before Delivery,Inspecció requerida abans del lliurament
 DocType: Item,Inspection Required before Purchase,Inspecció requerida abans de la compra
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activitats pendents
@@ -3561,7 +3582,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantitat mínima de comanda
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,la seva Organització
 DocType: Fee Component,Fees Category,taxes Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Please enter relieving date.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Notificar a l&#39;empleat
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
@@ -3571,7 +3592,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Nivell de Reabastecimiento
 DocType: Company,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
 DocType: Attendance,Attendance Date,Assistència Data
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Purchase Invoice Item,Accepted Warehouse,Magatzem Acceptat
@@ -3579,10 +3600,11 @@
 DocType: Item,Valuation Method,Mètode de Valoració
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Medi Dia Marcos
 DocType: Sales Invoice,Sales Team,Equip de vendes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Introduïu el nom del Beneficiari abans de presentar-lo.
 DocType: Program Enrollment Tool,Get Students,obtenir estudiants
 DocType: Serial No,Under Warranty,Sota Garantia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules seran visibles un cop que es guarda la comanda de vendes.
 ,Employee Birthday,Aniversari d'Empleat
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Seleccioneu Data de finalització de la reparació completada
@@ -3601,7 +3623,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reservat per subcontractació
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Ordres
-DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
+DocType: Department,Leave Approver,Aprovador d'absències
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Seleccioneu un lot
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nom del grup d&#39;avaluació
@@ -3645,7 +3667,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Element del rastreig del cub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PER RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Aquest correu electrònic està autogenerat
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
 DocType: Program Enrollment,Boarding Student,Estudiant d&#39;embarcament
 DocType: Asset,Expected Value After Useful Life,Valor esperat després de la vida útil
@@ -3670,21 +3691,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,La depreciació Eliminat causa de la disposició dels béns
-DocType: Member,Member,Membre
+DocType: Loan,Member,Membre
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrar Direccions
 DocType: Work Order Item,Work Order Item,Element de comanda de treball
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Gerent d&#39;Agricultura
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
 DocType: Supplier Scorecard Period,Variables,Les variables
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Tancament (Dr)
 DocType: Cheque Print Template,Cheque Size,xec Mida
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Outstanding Amount
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Compte {0} no coincideix amb el de l&#39;empresa {1}
@@ -3692,7 +3713,6 @@
 DocType: Stock Settings,Default Stock UOM,UDM d'estoc predeterminat
 DocType: Asset,Number of Depreciations Booked,Nombre de reserva Depreciacions
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Quantitat total
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Préstec contra de l&#39;empleat: {0}
 DocType: Landed Cost Item,Receipt Document,la recepció de documents
 DocType: Employee Education,School/University,Escola / Universitat
 DocType: Payment Request,Reference Details,Detalls Referència
@@ -3703,7 +3723,7 @@
 DocType: Asset,Double Declining Balance,Doble saldo decreixent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ordre tancat no es pot cancel·lar. Unclose per cancel·lar.
 DocType: Student Guardian,Father,pare
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 DocType: Attendance,On Leave,De baixa
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
@@ -3717,10 +3737,10 @@
 DocType: Lead,Lower Income,Lower Income
 DocType: Restaurant Order Entry,Current Order,Ordre actual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Vés als programes
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La fila {0} # quantitat assignada {1} no pot ser major que la quantitat no reclamada {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La fila {0} # quantitat assignada {1} no pot ser major que la quantitat no reclamada {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
@@ -3743,7 +3763,6 @@
 DocType: Payment Terms Template,Payment Terms,Condicions de pagament
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 DocType: Chapter,Meetup Embed HTML,Reunió HTML incrustar
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Aneu als proveïdors
@@ -3762,30 +3781,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configureu l&#39;identificador de correu electrònic de l&#39;estudiant per enviar la sol·licitud de pagament
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Configureu l&#39;identificador de correu electrònic de l&#39;estudiant per enviar la sol·licitud de pagament
 DocType: Patient,Medical History,Historial mèdic
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Overdraft Account
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank Overdraft Account
 DocType: Patient,Patient ID,Identificador del pacient
 DocType: Physician Schedule,Schedule Name,Programar el nom
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Feu nòmina
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Afegeix tots els proveïdors
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Afegeix tots els proveïdors
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Navegar per llista de materials
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Préstecs Garantits
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Préstecs Garantits
 DocType: Purchase Invoice,Edit Posting Date and Time,Edita data i hora d&#39;enviament
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Si us plau, estableix els comptes relacionats de depreciació d&#39;actius en Categoria {0} o de la seva empresa {1}"
 DocType: Lab Test Groups,Normal Range,Rang normal
 DocType: Academic Term,Academic Year,Any escolar
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Venda disponible
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo inicial Equitat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Saldo inicial Equitat
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,restant
 DocType: Appraisal,Appraisal,Avaluació
+DocType: Loan,Loan Account,Compte de préstec
 DocType: Purchase Invoice,GST Details,Detalls de GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},El correu electrònic enviat al proveïdor {0}
 DocType: Item,Default Sales Unit of Measure,Unitat de vendes predeterminada de mesura
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Any escolar:
+DocType: Subscription,Past Due Date,Data vençuda
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},No permetis establir un element alternatiu per a l&#39;element {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data repetida
@@ -3798,7 +3819,7 @@
 DocType: Patient Appointment,Patient Appointment,Cita del pacient
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol d'aprovador no pot ser el mateix que el rol al que la regla s'ha d'aplicar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Obteniu proveïdors per
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Obteniu proveïdors per
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} no s&#39;ha trobat per a l&#39;element {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Anar als cursos
 DocType: Accounts Settings,Show Inclusive Tax In Print,Mostra impostos inclosos en impressió
@@ -3806,10 +3827,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Missatge enviat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;educació&gt; Configuració de l&#39;educació
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Velocitat a la qual la llista de preus de divises es converteix la moneda base del client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
 DocType: Physician,Physician Schedules,Horaris mèdics
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,L&#39;import anticipat total no pot ser superior al total de la quantitat sancionada
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,L&#39;import anticipat total no pot ser superior al total de la quantitat sancionada
 DocType: Salary Slip,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Article Naming Per
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
@@ -3827,6 +3849,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans de {0}
 DocType: BOM,Inspection Required,Inspecció requerida
 DocType: Purchase Invoice Item,PR Detail,Detall PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Introduïu el número de garantia bancària abans de presentar-lo.
 DocType: Driving License Category,Class,Classe
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,L&#39;Ordre de treball no es pot plantar contra una plantilla d&#39;elements
@@ -3837,7 +3860,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Assessment Plan,Program,programa
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;educació&gt; Configuració de l&#39;educació
 DocType: Serial No,Is Cancelled,Està cancel·lat
 DocType: Student Group,Group Based On,Grup d&#39;acord amb
 DocType: Journal Entry,Bill Date,Data de la factura
@@ -3848,9 +3870,10 @@
 DocType: Cheque Print Template,Cheque Height,xec Alçada
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Setup Progress,Setup Progress,Progrés de configuració
+DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Marqueu totes les
 ,Issued Items Against Work Order,Articles publicats contra l&#39;ordre de treball
 DocType: Vehicle Log,Invoice Ref,Ref factura
@@ -3881,12 +3904,11 @@
 DocType: Customs Tariff Number,Tariff Number,Nombre de tarifes
 DocType: Work Order Item,Available Qty at WIP Warehouse,Quantitats disponibles en magatzem WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projectat
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
 DocType: Notification Control,Quotation Message,Cita Missatge
-DocType: Employee Loan,Employee Loan Application,Sol·licitud de Préstec empleat
 DocType: Issue,Opening Date,Data d'obertura
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Deseu primer el pacient
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Deseu primer el pacient
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
 DocType: Program Enrollment,Public Transport,Transport públic
 DocType: Soil Texture,Silt Composition (%),Composició de sèrum (%)
@@ -3904,7 +3926,7 @@
 ,Item Balance (Simple),Saldo de l&#39;element (senzill)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota de càrrec Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota de càrrec Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
@@ -3927,6 +3949,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 DocType: Assessment Plan,Assessment Plan,pla d&#39;avaluació
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Entrada periòdica inversa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,S&#39;ha creat el client {0}.
 DocType: Stock Settings,Limit Percent,límit de percentatge
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualment no hi ha existències disponibles en cap magatzem
@@ -3940,14 +3963,15 @@
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Payment Entry,Payment References,Referències de pagament
 DocType: C-Form,C-FORM-,C-FORM
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Nombre d&#39;intervals per al camp d&#39;interval, per exemple, si l&#39;interval és &quot;Dies&quot; i el recompte d&#39;interval de facturació és de 3, es generaran factures cada 3 dies."
 DocType: Vehicle,Insurance Details,Detalls d&#39;Assegurances
 DocType: Account,Payable,Pagador
 DocType: Share Balance,Share Type,Tipus de compartició
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Deutors ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Benefici Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Benefici Brut%
 DocType: Appraisal Goal,Weightage (%),Ponderació (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Canvieu el perfil de POS
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
@@ -3957,10 +3981,11 @@
 DocType: Lead,Address Desc,Descripció de direcció
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Part és obligatòria
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},S&#39;han trobat fitxes amb dates de venciment duplicades en altres files: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},S&#39;han trobat fitxes amb dates de venciment duplicades en altres files: {list}
 DocType: Topic,Topic Name,Nom del tema
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Establiu la plantilla predeterminada per deixar la notificació d&#39;aprovació a la configuració de recursos humans.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Seleccioneu un empleat per fer avançar l&#39;empleat.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Seleccioneu un empleat per fer avançar l&#39;empleat.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Seleccioneu una data vàlida
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3979,7 +4004,7 @@
 DocType: Asset Movement,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Comparteix el compilador
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,S&#39;ha creat la factura de vendes {0}
 DocType: Employee,Confirmation Date,Data de confirmació
 DocType: C-Form,Total Invoiced Amount,Suma total facturada
@@ -3988,7 +4013,7 @@
 DocType: Account,Accumulated Depreciation,Depreciació acumulada
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nom estable
 DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
-DocType: Employee Loan Application,Required by Date,Requerit per Data
+DocType: Loan Application,Required by Date,Requerit per Data
 DocType: Lead,Lead Owner,Responsable del client potencial
 DocType: Production Plan,Sales Orders Detail,Detall de comandes de venda
 DocType: Bin,Requested Quantity,quantitat sol·licitada
@@ -4001,10 +4026,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagament Brut - Deducció total - Pagament de Préstecs
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Salari Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variants múltiples
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Lliurat
+DocType: Subscription,Trial Period Start Date,Data de començament del període de prova
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Inicieu sessió com un altre usuari.
@@ -4025,12 +4051,11 @@
 DocType: Student Guardian,Student Guardian,Guardià de l&#39;estudiant
 DocType: Member,Member Name,Nom de membre
 DocType: Stock Settings,Use Naming Series,Utilitzeu la sèrie de noms
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,en la subscripció
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 DocType: Membership,Payment Details,Detalls del pagament
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","No es pot cancel·lar la comanda de treball parada, sense desactivar-lo primer a cancel·lar"
 DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
@@ -4050,6 +4075,7 @@
 DocType: Land Unit,Land Unit,Unitat de la terra
 ,Purchase Analytics,Anàlisi de Compres
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Falta la factura actual {0}
 DocType: Asset Maintenance Log,Task,Tasca
 DocType: Purchase Taxes and Charges,Reference Row #,Referència Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
@@ -4061,7 +4087,7 @@
 DocType: Company,Exchange Gain / Loss Account,Guany de canvi de compte / Pèrdua
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,I assistència d&#39;empleats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Propòsit ha de ser un de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Ompliu el formulari i deseu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Ompliu el formulari i deseu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Cant que aquesta en estoc
 DocType: Homepage,"URL for ""All Products""",URL de &quot;Tots els productes&quot;
@@ -4075,7 +4101,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Estàndard tipus venedor
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
 DocType: Cash Flow Mapper,Section Name,Nom de la secció
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Quantitat per a generar comanda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Quantitat per a generar comanda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertes d&#39;ocupació actuals
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancel
@@ -4086,9 +4112,9 @@
 DocType: Task,depends_on,depèn de
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cua per actualitzar l&#39;últim preu en tota la factura de materials. Pot trigar uns quants minuts.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom del nou compte. Nota: Si us plau no crear comptes de clients i proveïdors
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,País savi defecte Plantilles de direcció
 DocType: Water Analysis,Appearance,Aparença
+DocType: HR Settings,Leave Status Notification Template,Deixeu la plantilla de notificació d&#39;estat
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Mitjana Preu de la tarifa de compra
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informació dels membres.
@@ -4111,7 +4137,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,No permès. Desactiva la plantilla de prova
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
 DocType: Crop Cycle,Linked Land Unit,Unitat de terra enllaçada
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
@@ -4127,7 +4153,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Aneu als usuaris
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN invàlida o Enter NA per no registrat
 DocType: Training Event,Seminar,seminari
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programa de quota d&#39;inscripció
@@ -4143,14 +4169,14 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 DocType: Company,Create Chart Of Accounts Based On,Crear pla de comptes basada en
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,No es pot convertir a no grup. Existeixen tasques infantils.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Estudiant {0} existeix contra l&#39;estudiant sol·licitant {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajust d&#39;arrodoniment (moneda d&#39;empresa)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Horari
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarda
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Cheque Print Template,Scanned Cheque,escanejada Xec
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
@@ -4166,7 +4192,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,El projecte {0} ja existeix
 DocType: Medical Department,Nursing User,Usuari d&#39;infermeria
 DocType: Plant Analysis,Plant Analysis Criterias,Criteris d&#39;anàlisi de plantes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},El número de sèrie {0} no pertany a Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El període de validesa d&#39;aquesta cita ha finalitzat.
 DocType: Expense Claim Account,Expense Claim Account,Compte de Despeses
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permet els tipus d&#39;intercanvi moderats
@@ -4188,11 +4215,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Feu variants
 DocType: Item,Default BOM,BOM predeterminat
 DocType: Project,Total Billed Amount (via Sales Invoices),Import total facturat (mitjançant factures de vendes)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Nota de dèbit Quantitat
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Nota de dèbit Quantitat
 DocType: Project Update,Not Updated,No s&#39;ha actualitzat
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Hi ha incongruències entre la taxa, la de les accions i l&#39;import calculat"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Viu total Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Viu total Amt
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
 DocType: Employee Advance,Advance Account,Compte avançat
 DocType: Job Offer,Job Offer Terms,Termes de la oferta de feina
@@ -4201,7 +4228,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automòbil
 DocType: Vehicle,Insurance Company,Companyia asseguradora
 DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;actiu fix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,De la nota de lliurament
 DocType: Chapter,Members,Membres
 DocType: Student,Student Email Address,Estudiant Adreça de correu electrònic
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,nom direcció
 DocType: Stock Entry,From BOM,A partir de la llista de materials
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},S&#39;està dividint {0} unitats de {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},S&#39;està dividint {0} unitats de {1}
 DocType: Assessment Code,Assessment Code,codi avaluació
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
@@ -4233,25 +4260,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 DocType: Bank Reconciliation Detail,Payment Document,El pagament del document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,S&#39;ha produït un error en avaluar la fórmula de criteris
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
+DocType: Subscription,Plans,Plans
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Material Issue
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,S&#39;ha produït un error en crear-lo recurrent
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cites
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No hi ha grups d&#39;estudiants van crear.
 DocType: Purchase Invoice Item,Serial No,Número de sèrie
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Fila # {0}: la data de lliurament prevista no pot ser abans de la data de la comanda de compra
 DocType: Purchase Invoice,Print Language,Llenguatge d&#39;impressió
 DocType: Salary Slip,Total Working Hours,Temps de treball total
 DocType: Sales Invoice,Customer PO Details,Detalls de la PO dels clients
-DocType: Subscription,Next Schedule Date,Next Schedule Date
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Compte d&#39;obertura temporal
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Introduir el valor ha de ser positiu
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Cap empleat pels criteris esmentats
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
 DocType: Hotel Settings,Default Customer,Client per defecte
 DocType: Assessment Plan,Supervisor Name,Nom del supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirmeu si es crea una cita per al mateix dia
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,Avanç dels empleats
 DocType: Payroll Entry,Payroll Frequency,La nòmina de freqüència
 DocType: Lab Test Template,Sensitivity,Sensibilitat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Matèria Primera
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Les plantes i maquinàries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Les plantes i maquinàries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustos diàries Resum Treball
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Introduïu Reqd per data
 DocType: Payment Entry,Internal Transfer,transferència interna
 DocType: Asset Maintenance,Maintenance Tasks,Tasques de manteniment
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cal la Quantitat destí i la origen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Seleccioneu Data de comptabilització primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Seleccioneu Data de comptabilització primer
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
 DocType: Leave Control Panel,Carry Forward,Portar endavant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centre de costos de les transaccions existents no es pot convertir en llibre major
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integracions
 DocType: Crop Cycle,Detected Disease,Malaltia detectada
 ,Produced,Produït
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,La data d&#39;inici del reemborsament no pot ser abans de la data de desemborsament.
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
 DocType: Training Event,Trainer Name,nom entrenador
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,última Comunicació
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Els pagaments dels partits amb les factures
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Activar / desactivar les divises.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} a mitja jornada sortiu el {1}
 DocType: Production Plan,Get Material Request,Obtenir Sol·licitud de materials
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Despeses postals
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 ,Item Variant Details,Detalls de la variant de l&#39;element
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Hora
 DocType: Restaurant Order Entry,Last Sales Invoice,Factura de la darrera compra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Seleccioneu Qty contra l&#39;element {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 DocType: Company,Monthly Sales Target,Objectiu de vendes mensuals
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,El material predeterminat Tipus de sol·licitud
 DocType: Supplier Scorecard,Evaluation Period,Període d&#39;avaluació
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,desconegut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,No s&#39;ha creat l&#39;ordre de treball
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,No s&#39;ha creat l&#39;ordre de treball
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: Purchase Invoice,Export Type,Tipus d&#39;exportació
 DocType: Salary Slip Loan,Salary Slip Loan,Préstec antilliscant
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Obrir el resum de factures
 DocType: Education Settings,Education Manager,Gerent d&#39;Educació
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,La longitud mínima entre cada planta del camp per a un creixement òptim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Article batched {0} no es pot actualitzar mitjançant la Reconciliació, en lloc d&#39;utilitzar l&#39;entrada"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Article batched {0} no es pot actualitzar mitjançant la Reconciliació, en lloc d&#39;utilitzar l&#39;entrada"
 DocType: Quality Inspection,Report Date,Data de l'informe
 DocType: Student,Middle Name,Segon nom
 DocType: C-Form,Invoices,Factures
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,rebut
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,rebut
 ,Sales Register,Registre de vendes
 DocType: Daily Work Summary Group,Send Emails At,En enviar correus electrònics
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vista de formularis
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Aprovació de despeses obligatòria en la reclamació de despeses
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Afegiu usuaris a la vostra organització, a part de tu mateix."
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Els clients no hi ha encara!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,No s&#39;ha creat cap sol·licitud de material
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
@@ -4448,11 +4476,12 @@
 DocType: Vehicle,Chassis No,nº de xassís
 DocType: Payment Request,Initiated,Iniciada
 DocType: Production Plan Item,Planned Start Date,Data d'inici prevista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Seleccioneu un BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Seleccioneu un BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Impost integrat ITC aprofitat
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
+DocType: Bank Guarantee,Clauses and Conditions,Clàusules i condicions
 DocType: Serial No,Creation Document Type,Creació de tipus de document
 DocType: Project Task,View Timesheet,Veure full de temps
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La data de finalització ha de ser superior a la data d&#39;inici
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,Alcohol ús actual
 DocType: Student Admission Program,Student Admission Program,Programa d&#39;admissió dels estudiants
 DocType: Payment Entry,Account Paid To,Compte pagat fins
+DocType: Subscription Settings,Grace Period,Període de gràcia
 DocType: Item Alternative,Alternative Item Name,Nom de l&#39;element alternatiu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",No s'ha pogut enviar cap resguard salarial <br> \ Motius possibles: <br> 1. El sou net és inferior a 0. <br> \ 2. L'adreça electrònica de l'empresa especificada en el mestre d'empleat no és vàlida. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Pressupost per al compte {1} contra {2} {3} {4} és. Es superarà per {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Quantitat de sortida
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i desactivat deshabilitat al
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Sèries és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,Queixa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Feu ingrés de reemborsament
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Tots els Departaments
 DocType: Patient,Alcohol Past Use,Ús del passat alcohòlic
 DocType: Fertilizer Content,Fertilizer Content,Contingut d&#39;abonament
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problemàtic / atrapat
 DocType: Tax Rule,Billing State,Estat de facturació
 DocType: Share Transfer,Transfer,Transferència
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,L&#39;ordre de treball {0} s&#39;ha de cancel·lar abans de cancel·lar aquesta comanda de venda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,Missatge a mostrar
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Venda al detall
 DocType: Student Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,No s&#39;ha pogut trobar la puntuació a partir de {0}. Has de tenir puntuacions de peu que abasten 0 a 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
+DocType: Subscription,Current Invoice Start Date,Data d&#39;inici de factura actual
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bé es requereix targeta de dèbit o crèdit per import {2}
 DocType: GL Entry,Remarks,Observacions
@@ -4534,11 +4566,13 @@
 DocType: Task,Parent Task,Tasca dels pares
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,fer plom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impressió i papereria
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Impressió i papereria
 DocType: Stock Settings,Show Barcode Field,Mostra Camp de codi de barres
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salari ja processada per al període entre {0} i {1}, Deixa període d&#39;aplicació no pot estar entre aquest interval de dates."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salari ja processada per al període entre {0} i {1}, Deixa període d&#39;aplicació no pot estar entre aquest interval de dates."
+DocType: Fiscal Year,Auto Created,Creada automàticament
 DocType: Chapter Member,Leave Reason,Deixeu la raó
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,La factura {0} ja no existeix
 DocType: Guardian Interest,Guardian Interest,guardià interès
 DocType: Volunteer,Availability,Disponibilitat
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configuració dels valors predeterminats per a les factures de POS
@@ -4546,14 +4580,13 @@
 DocType: Project,Time to send,Temps per enviar
 DocType: Timesheet,Employee Detail,Detall dels empleats
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de correu electrònic
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
 DocType: Lab Prescription,Test Code,Codi de prova
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustos per a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Les RFQ no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}
 DocType: Job Offer,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Per sobre de
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Import total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Import total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},atribut no vàlid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Esmentar si compta per pagar no estàndard
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Si us plau, seleccioneu el grup d&#39;avaluació que no sigui &#39;Tots els grups d&#39;avaluació&#39;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Fila {0}: es requereix centre de costos per a un element {1}
@@ -4564,7 +4597,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Anàlisi de l&#39;aigua
 DocType: Chapter,Region,Regió
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Torneu a carregar l&#39;anàlisi enllaçat
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
@@ -4580,7 +4613,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Cost d&#39;Actius Scrapped
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
 DocType: Vehicle,Policy No,sense política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obtenir elements del paquet del producte
 DocType: Asset,Straight Line,Línia recta
 DocType: Project User,Project User,usuari projecte
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,divisió
@@ -4616,21 +4649,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Camí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
 DocType: Production Plan,Total Planned Qty,Total de quantitats planificades
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valor d&#39;obertura
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valor d&#39;obertura
 DocType: Salary Detail,Formula,fórmula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Plantilla de prova de laboratori
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Compte de vendes
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Compte de vendes
 DocType: Purchase Invoice Item,Total Weight,Pes total
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comissió de Vendes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Comissió de Vendes
 DocType: Job Offer Term,Value / Description,Valor / Descripció
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
 DocType: Tax Rule,Billing Country,Facturació País
 DocType: Purchase Order Item,Expected Delivery Date,Data de lliurament esperada
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de comanda de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
 DocType: Asset Maintenance Task,Assign To Name,Assigna al nom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despeses d'Entreteniment
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Despeses d'Entreteniment
 DocType: Hub Settings,Enabled Users,Usuaris habilitats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Fer Sol·licitud de materials
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Obrir element {0}
@@ -4643,24 +4676,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Les sol·licituds de llicència.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 DocType: Vehicle,Last Carbon Check,Últim control de Carboni
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Despeses legals
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Despeses legals
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Feu factures d&#39;obertura i compra de factures
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
 DocType: Timesheet,% Amount Billed,% Import Facturat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despeses telefòniques
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Despeses telefòniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Element amb Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Element amb Serial No {0}
 DocType: Email Digest,Open Notifications,Obrir Notificacions
 DocType: Payment Entry,Difference Amount (Company Currency),Diferència Suma (Companyia de divises)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Despeses directes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Despeses directes
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despeses de viatge
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Afegeix una subscripció de camp personalitzada a la doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Purchase Receipt Item,Sample Quantity,Quantitat de mostra
+DocType: Bank Guarantee,Name of Beneficiary,Nom del beneficiari
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualitza el cost de la BOM automàticament mitjançant Scheduler, en funció de la taxa de valoració / tarifa de preu més recent / la darrera tarifa de compra de matèries primeres."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
@@ -4672,14 +4705,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,components de sous
 DocType: Program Enrollment Tool,New Academic Year,Nou Any Acadèmic
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retorn / Nota de Crèdit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retorn / Nota de Crèdit
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Suma total de pagament
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Suma total de pagament
 DocType: GST Settings,B2C Limit,Límit B2C
 DocType: Work Order Item,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planificació
 DocType: Share Balance,Issued,Emès
+DocType: Loan,Repayment Start Date,Data d&#39;inici del reemborsament
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Activitat de l&#39;estudiant
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Identificador de Proveïdor
 DocType: Payment Request,Payment Gateway Details,Passarel·la de Pagaments detalls
@@ -4692,10 +4726,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipus de fulles com casual, malalts, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periòdics resumits per correu electrònic.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
 DocType: Assessment Result,Student Name,Nom de l&#39;estudiant
 DocType: Brand,Item Manager,Administració d&#39;elements
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,nòmina per pagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,nòmina per pagar
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
 DocType: Plant Analysis,Collection Datetime,Col · lecció Datetime
 DocType: Work Order,Total Operating Cost,Cost total de funcionament
@@ -4705,9 +4739,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,L'usuari {0} no existeix
 DocType: Payment Term,Day(s) after invoice date,Dia (s) després de la data de la factura
 DocType: Payment Schedule,Payment Schedule,Calendari de pagaments
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Entrada de pagament ja existeix
+DocType: Subscription,Trial Period End Date,Període de prova Data de finalització
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salary template master.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologia
@@ -4724,9 +4758,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Tots els Grups de clients
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulat Mensual
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
@@ -4735,14 +4769,15 @@
 DocType: Lab Prescription,Test Created,Prova creada
 DocType: Healthcare Settings,Custom Signature in Print,Signatura personalitzada a la impressió
 DocType: Account,Temporary,Temporal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Número de LPO del client
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Número de LPO del client
 DocType: Program,Courses,cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secretari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivat, &quot;en les paraules de camp no serà visible en qualsevol transacció"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Aquesta acció aturarà la facturació futura. Estàs segur que vols cancel·lar aquesta subscripció?
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Supplier Scorecard Criteria,Criteria Name,Nom del criteri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Si us plau ajust l&#39;empresa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Si us plau ajust l&#39;empresa
 DocType: Pricing Rule,Buying,Compra
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Malalties i fertilitzants
 DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per
@@ -4751,17 +4786,17 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descompte en les
 DocType: Member,Membership Type,Tipus de pertinença
 ,Reqd By Date,Reqd Per Data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Creditors
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Creditors
 DocType: Assessment Plan,Assessment Name,nom avaluació
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Mostra el PDC a la impressió
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Mostra el PDC a la impressió
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de tots els articles
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Oferta de treball
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut Abreviatura
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
@@ -4779,7 +4814,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variància total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si està activat, el sistema comptabilitza els assentaments comptables per a l'inventari automàticament."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Corretatge
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,L&#39;assistència per a l&#39;empleat {0} ja està marcat per al dia d&#39;avui
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,L&#39;assistència per a l&#39;empleat {0} ja està marcat per al dia d&#39;avui
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
  Actualitzat a través de 'Hora de registre'"
@@ -4791,6 +4826,7 @@
 DocType: Lab Test,Approved Date,Data aprovada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
+DocType: Subscriber,Subscriber Name,Nom del subscriptor
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Update Tool,Replace,Reemplaçar
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No s&#39;han trobat productes.
@@ -4800,19 +4836,18 @@
 DocType: Request for Quotation Item,Project Name,Nom del projecte
 DocType: Customer,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Seleccioneu el compte de renda d&#39;interessos en el préstec d&#39;empleat {0}
 DocType: Work Order,Required Items,elements necessaris
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Recursos Humans
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 DocType: Disease,Treatment Task,Tasca del tractament
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Actius per impostos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Actius per impostos
 DocType: BOM Item,BOM No,No BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Update Tool,The BOM which will be replaced,Llista de materials que serà substituïda
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equips Electrònics
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Equips Electrònics
 DocType: Asset,Maintenance Required,Manteniment obligatori
 DocType: Account,Debit,Dèbit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
@@ -4821,7 +4856,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Excel·lent Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establir Grup d'articles per aquest venedor.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congela els estocs més vells de [dies]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
 DocType: Asset Maintenance Team,Maintenance Team Name,Nom de l&#39;equip de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,El client és obligatori si es selecciona &quot;Oportunitat des de&quot; com a client
@@ -4830,19 +4865,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Deixi els següents usuaris per aprovar sol·licituds de llicència per a diversos dies de bloc.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipus de Compte de despeses.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},tarifa per a la venda d&#39;element {0} és més baix que el seu {1}. tipus venedor ha de tenir una antiguitat {2}
-DocType: Item,Taxes,Impostos
+DocType: Subscription,Taxes,Impostos
 DocType: Purchase Invoice,capital goods,béns d&#39;equip
 DocType: Purchase Invoice Item,Weight Per Unit,Pes per unitat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,A càrrec i no lliurats
 DocType: Project,Default Cost Center,Centre de cost predeterminat
-DocType: Bank Guarantee,End Date,Data de finalització
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Les transaccions de valors
 DocType: Budget,Budget Accounts,comptes Pressupost
 DocType: Employee,Internal Work History,Historial de treball intern
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,La depreciació acumulada Import
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variable del quadre de comandament del proveïdor
-DocType: Employee Loan,Fully Disbursed,desemborsat en la seva totalitat
 DocType: Employee Advance,Due Advance Amount,Import anticipat degut
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
@@ -4866,7 +4899,7 @@
 ,Employee Information,Informació de l'empleat
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Es creen plantilles d&#39;impostos predeterminades per a vendes i compra.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,El registre del resultat de l&#39;avaluació {0} ja existeix.
@@ -4874,7 +4907,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Si us plau ajust empresa de filtres en blanc si és Agrupa per &#39;empresa&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,per generar el recurrent
 DocType: Stock Entry,Target Warehouse Address,Adreça de destinació de magatzem
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Deixar Casual
 DocType: Agriculture Task,End Day,Dia final
@@ -4899,11 +4931,10 @@
 DocType: Material Request,% Ordered,Demanem%
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per grup d&#39;alumnes basat curs, aquest serà validat per cada estudiant dels cursos matriculats en el Programa d&#39;Inscripció."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Treball a preu fet
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Quota de compra mitja
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Quota de compra mitja
 DocType: Share Balance,From No,Del núm
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nou missatge de {sender}
 DocType: Customer,Customer Primary Address,Direcció principal del client
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Butlletins
 DocType: Drug Prescription,Description/Strength,Descripció / força
@@ -4912,22 +4943,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,El mateix article s&#39;ha introduït diverses vegades
 DocType: Department,Leave Block List,Deixa Llista de bloqueig
 DocType: Purchase Invoice,Tax ID,Identificació Tributària
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
 DocType: Accounts Settings,Accounts Settings,Ajustaments de comptabilitat
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,aprovar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","L&#39;adreça de format incorrecte de {0}, corregiu-la per continuar."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","L&#39;adreça de format incorrecte de {0}, corregiu-la per continuar."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Nombre de compte nou, s&#39;inclourà al nom del compte com a prefix"
 DocType: Maintenance Team Member,Team Member,Membre de l&#39;equip
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Cap resultat per enviar
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
-DocType: Employee Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
+DocType: Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
 ,Project Quantity,projecte Quantitat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
 DocType: Opportunity,To Discuss,Per Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa d&#39;interès (%) anual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Negre
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Comptes temporals
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Shareholder,Contact List,Llista de contactes
 DocType: Account,Auditor,Auditor
@@ -4935,16 +4966,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} articles produïts
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Aprèn més
 DocType: Cheque Print Template,Distance from top edge,Distància des de la vora superior
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
 DocType: Purchase Invoice,Return,Retorn
 DocType: Pricing Rule,Disable,Desactiva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
 DocType: Project Task,Pending Review,Pendent de Revisió
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Editeu a la pàgina completa per obtenir més opcions com a actius, números de sèrie, lots, etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Nomenaments i consultes
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no està inscrit en el Lot {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Xecs obligatoris
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Xecs obligatoris
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marc Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,No s&#39;ha pogut configurar l&#39;empresa
@@ -4956,7 +4987,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestió de Flotes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Afegir elements de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Afegir elements de
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Cultius i Terres
 DocType: Cheque Print Template,Regular,regular
 DocType: Fertilizer,Density (if liquid),Densitat (si és líquid)
@@ -4981,24 +5012,26 @@
 DocType: Payment Entry,Paid Amount,Quantitat pagada
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Exploreu el cicle de vendes
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retenció d&#39;existències
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retenció d&#39;existències
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 ,Work Order Stock Report,Informe d&#39;accions de la comanda de treball
+DocType: Purchase Receipt,Auto Repeat Detail,Detall automàtic de repetició
 DocType: Assessment Result Tool,Assessment Result Tool,Eina resultat de l&#39;avaluació
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Com a supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugerir categoria
 DocType: BOM Scrap Item,BOM Scrap Item,La llista de materials de ferralla d&#39;articles
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,comandes presentats no es poden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestió de la Qualitat
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
 DocType: Project,Total Billable Amount (via Timesheets),Import total facturat (mitjançant fulls de temps)
 DocType: Agriculture Task,Previous Business Day,Dia laborable anterior
-DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
+DocType: Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
 DocType: Employee,Health Insurance No,Assegurança de Salut No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota de Crèdit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota de Crèdit Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Import total impost
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 DocType: Opening Invoice Creation Tool,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Saldo Quantitat
@@ -5009,15 +5042,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 DocType: Healthcare Settings,Valid number of days,Nombre de dies vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centres de costos
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Reinicia la subscripció
 DocType: Land Unit,Linked Plant Analysis,Anàlisi de plantes enllaçades
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Equivalència a la qual la divisa del proveïdor es converteixen a la moneda base de la companyia
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictes Timings amb fila {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permetre zero taxa de valorització
+DocType: Bank Guarantee,Receiving,Recepció
 DocType: Training Event Employee,Invited,convidat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
 DocType: Employee,Employment Type,Tipus d'Ocupació
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Actius Fixos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Actius Fixos
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajust de guany de l&#39;intercanvi / Pèrdua
 ,GST Purchase Register,GST Compra Registre
 ,Cash Flow,Flux d&#39;Efectiu
@@ -5037,9 +5072,10 @@
 DocType: Academic Term,Term Start Date,Termini Data d&#39;Inici
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Llista de totes les transaccions d&#39;accions
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Comte del OPP
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Troba adjunt {0} #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Tant la data d&#39;inici del període de prova com la data de finalització del període de prova s&#39;han d&#39;establir
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tarifa mitjana
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;import total del pagament en el calendari de pagaments ha de ser igual a Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;import total del pagament en el calendari de pagaments ha de ser igual a Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Pla
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
 DocType: Authorization Rule,Customer / Item Name,Client / Nom de l'article
@@ -5069,6 +5105,7 @@
 DocType: Work Order,Warehouses,Magatzems
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actiu no es pot transferir
 DocType: Hotel Room Pricing,Hotel Room Pricing,Preus de l&#39;habitació de l&#39;hotel
+DocType: Subscription,Days Until Due,Dies fins a vençuts
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Aquest article és una variant de {0} (plantilla).
 DocType: Workstation,per hour,per hores
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
@@ -5077,13 +5114,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Per grup d&#39;alumnes amb base de lots, el lot dels estudiants serà vàlida per a tots els estudiants de la inscripció en el programa."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribució
+DocType: Journal Entry Account,Loan,Préstec
 DocType: Expense Claim Advance,Expense Claim Advance,Avançament de la reclamació de despeses
 DocType: Lab Test,Report Preference,Prefereixen informes
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informació voluntària.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Gerent De Projecte
 ,Quoted Item Comparison,Citat article Comparació
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Superposició entre puntuació entre {0} i {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,El valor net d&#39;actius com a
 DocType: Crop,Produce,Produir
@@ -5093,7 +5131,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Consum de material per a la fabricació
 DocType: Item Alternative,Alternative Item Code,Codi d&#39;element alternatiu
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Seleccionar articles a Fabricació
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Seleccionar articles a Fabricació
 DocType: Delivery Stop,Delivery Stop,Parada de lliurament
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
@@ -5103,15 +5141,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabó i Detergent
 DocType: BOM,Show Items,Mostra elements
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Des del temps no pot ser més gran que en tant.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vols notificar a tots els clients per correu electrònic?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vols notificar a tots els clients per correu electrònic?
+DocType: Subscription Plan,Billing Interval,Interval de facturació
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Resum
 DocType: Hub Settings,Hub Username,Nom d&#39;usuari del concentrador
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criteris d&#39;avaluació del Grup
 DocType: Healthcare Settings,Patient Name By,Nom del pacient mitjançant
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Salari de la publicació de la periodificació de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Salari de la publicació de la periodificació de {0} a {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
@@ -5125,22 +5163,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
-DocType: Employee Loan,Disbursement Date,Data de desemborsament
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,No s&#39;especifiquen els &quot;destinataris&quot;
+DocType: Loan,Disbursement Date,Data de desemborsament
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualitzeu el preu més recent en totes les BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Registre mèdic
 DocType: Vehicle,Vehicle,vehicle
 DocType: Purchase Invoice,In Words,En Paraules
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Introduïu el nom del banc o de la institució creditícia abans de presentar-lo.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} s&#39;ha de presentar
 DocType: POS Profile,Item Groups,els grups d&#39;articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Avui és {0} 's aniversari!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Avui és {0} 's aniversari!
 DocType: Sales Order Item,For Production,Per Producció
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Afegiu un compte d&#39;obertura temporal al gràfic de comptes
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Afegiu un compte d&#39;obertura temporal al gràfic de comptes
 DocType: Customer,Customer Primary Contact,Contacte principal del client
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Període tancament de la revista
 DocType: Project Task,View Task,Vista de tasques
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /% Plom
+DocType: Bank Guarantee,Bank Guarantee Type,Tipus de Garantia Bancària
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Factura de la porció
 ,Asset Depreciations and Balances,Les depreciacions d&#39;actius i saldos
@@ -5151,9 +5190,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inclou articles subcontractats
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,unir-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,No es poden canviar les propietats de variants després de la transició d&#39;existències. Haureu de fer un nou element per fer-ho.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
-DocType: Employee Loan,Repay from Salary,Pagar del seu sou
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+DocType: Loan,Repay from Salary,Pagar del seu sou
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
 DocType: Salary Slip,Salary Slip,Slip Salari
@@ -5177,11 +5215,11 @@
 DocType: Employee Education,Employee Education,Formació Empleat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,grup d&#39;articles duplicat trobat en la taula de grup d&#39;articles
 DocType: Land Unit,Parent Land Unit,Unitat de terres primàries
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
 DocType: Fertilizer,Fertilizer Name,Nom del fertilitzant
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Cash Flow Mapping Accounts,Account,Compte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
 ,Requested Items To Be Transferred,Articles sol·licitats per a ser transferits
 DocType: Expense Claim,Vehicle Log,Inicia vehicle
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presència d&#39;una febre (temperatura&gt; 38,5 ° C / 101.3 ° F o temperatura sostinguda&gt; 38 ° C / 100.4 ° F)"
@@ -5222,39 +5260,39 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
 DocType: Asset Maintenance,Manufacturing User,Usuari de fabricació
 DocType: Purchase Invoice,Raw Materials Supplied,Matèries primeres subministrades
-DocType: C-Form,Series,Sèrie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},La moneda de la llista de preus {0} ha de ser {1} o {2}
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Soil Texture,Ternary Plot,Parcel·la ternària
 DocType: Item Group,Item Classification,Classificació d'articles
 DocType: Driver,License Number,Número de llicència
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Facturació Registre de pacients
 DocType: Crop,Period,Període
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Comptabilitat General
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Empleat {0} en excedència {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Empleat {0} en excedència {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veure ofertes
 DocType: Program Enrollment Tool,New Program,nou Programa
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 DocType: Salary Detail,Salary Detail,Detall de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Seleccioneu {0} primer
 DocType: Appointment Type,Physician,Metge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultes
 DocType: Sales Invoice,Commission,Comissió
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Full de temps per a la fabricació.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,total parcial
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No es poden canviar les propietats de variants després de la transacció d&#39;accions. Haureu de fer un nou element per fer-ho.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandat de SEPA GoCardless
 DocType: Physician,Charges,Càrrecs
 DocType: Production Plan,Get Items For Work Order,Obtenir articles per a l&#39;ordre de treball
 DocType: Salary Detail,Default Amount,Default Amount
 DocType: Lab Test Template,Descriptive,Descriptiva
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Magatzem no trobat al sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magatzem no trobat al sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resum d&#39;aquest Mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Definiu un objectiu de vendes que vulgueu aconseguir per a la vostra empresa.
 ,Project wise Stock Tracking,Projecte savi Stock Seguiment
@@ -5282,11 +5320,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,No s&#39;ha pogut crear el lloc web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retenció d&#39;existències ja creades o la quantitat de mostra no subministrada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retenció d&#39;existències ja creades o la quantitat de mostra no subministrada
 DocType: Program,Program Abbreviation,abreviatura programa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Warranty Claim,Resolved By,Resolta Per
-DocType: Bank Guarantee,Start Date,Data De Inici
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Els xecs i dipòsits esborren de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
@@ -5301,11 +5338,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
 DocType: Purchase Invoice,04-Correction in Invoice,04-Correcció en factura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Ordre de treball ja creada per a tots els articles amb BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Ordre de treball ja creada per a tots els articles amb BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Informe de detalls de variants
 DocType: Setup Progress Action,Setup Progress Action,Configuració de l&#39;acció de progrés
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Llista de preus de compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Llista de preus de compra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Cancel·la la subscripció
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Seleccioneu Estat de manteniment com a finalitzat o suprimiu la data de finalització
 DocType: Supplier,Default Payment Terms Template,Plantilla de condicions de pagament per defecte
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Moneda de la transacció ha de ser la mateixa que la moneda de pagament de porta d&#39;enllaç
@@ -5316,7 +5354,6 @@
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acció si s&#39;acumula pressupost mensual excedit
-DocType: Subscription,Submit on creation,Presentar a la creació
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
 DocType: Asset,Disposal Date,disposició Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Els correus electrònics seran enviats a tots els empleats actius de l&#39;empresa a l&#39;hora determinada, si no tenen vacances. Resum de les respostes serà enviat a la mitjanit."
@@ -5334,6 +5371,7 @@
 DocType: Batch,Parent Batch,lots dels pares
 DocType: Cheque Print Template,Cheque Print Template,Plantilla d&#39;impressió de xecs
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gràfic de centres de cost
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,El nombre de dies després de la data de la factura ha passat abans de cancel·lar la subscripció o la subscripció de marca com a no remunerada
 DocType: Lab Test Template,Sample Collection,Col.lecció de mostres
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
 DocType: Price List,Price List Name,nom de la llista de preus
@@ -5342,7 +5380,7 @@
 DocType: Account,Income,Ingressos
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Quelcom ha fallat!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 DocType: Supplier Scorecard Scoring Criteria,Score,puntuació
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Any fiscal {0} no existeix
@@ -5362,12 +5400,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ha de ser un valor entre 0 i 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,La següent data de depreciació no pot ser abans de la data d&#39;ús disponible
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Préstecs sense garantia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Màxim les hores de treball contra la part d&#39;hores
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total pagat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total pagat Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Els missatges de més de 160 caràcters es divideixen en diversos missatges
 DocType: Purchase Receipt Item,Received and Accepted,Rebut i acceptat
 DocType: Hub Settings,Company and Seller Profile,Perfil de l&#39;empresa i del venedor
@@ -5381,10 +5419,9 @@
 DocType: Item,Variant Based On,En variant basada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Els seus Proveïdors
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Correu la correcció
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anònim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Rebut des
 DocType: Lead,Converted,Convertit
@@ -5398,6 +5435,7 @@
 DocType: Asset,Assets,Actius
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
+DocType: Subscription,Current Invoice End Date,Data de finalització de la factura actual
 DocType: Payment Term,Due Date Based On,Data de venciment basada
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Estableix el grup i grup de clients predeterminats a la Configuració de vendes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} no existeix
@@ -5405,7 +5443,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,No hi ha reemborsaments seleccionats per a l&#39;entrada del diari
 DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
+DocType: Loan,Disbursed,Desemborsament
 DocType: Healthcare Settings,Laboratory Settings,Configuració del Laboratori
 DocType: Patient Appointment,Service Unit,Unitat de servei
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,S&#39;ha establert el proveïdor amb èxit
@@ -5418,12 +5458,12 @@
 DocType: Share Balance,No of Shares,No d&#39;accions
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Selecciona l&#39;estat
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: School House,House Name,Nom de la casa
 DocType: Fee Schedule,Total Amount per Student,Import total per estudiant
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elèctric
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
 DocType: Grant Application,Requested Amount,Import sol·licitat
@@ -5433,7 +5473,7 @@
 DocType: Crop Cycle,Detected Diseases,Malalties detectades
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Recordatori d'aniversari per {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 DocType: Asset Maintenance Task,Last Completion Date,Última data de finalització
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
@@ -5441,9 +5481,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Configuració sense GoCard
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Actius
 DocType: Restaurant,Active Menu,Menú actiu
 DocType: Target Detail,Target Qty,Objectiu Quantitat
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Contra el préstec: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Comanda Ajustaments
 DocType: Student Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
@@ -5452,9 +5493,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
 DocType: Vehicle Log,Odometer,comptaquilòmetres
 DocType: Production Plan Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM no conté cap article comuna
 DocType: Chapter,Chapter Head,Capítol Cap
 DocType: Payment Term,Month(s) after the end of the invoice month,Mes (s) després del final del mes de la factura
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Activitat del projecte / tasca.
@@ -5462,11 +5503,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,El resultat del laboratori no es pot fer abans de provar datetime
 DocType: POS Profile,Allow user to edit Discount,Permet que l&#39;usuari editeu Descompte
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Obteniu clients
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Obteniu clients
 DocType: Purchase Invoice Item,Include Exploded Items,Inclou articles explotats
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 DocType: Shipping Rule,Restrict to Countries,Restringeix als països
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
 DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
 DocType: Project,Total Sales Amount (via Sales Order),Import total de vendes (a través de l&#39;ordre de vendes)
@@ -5483,6 +5525,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Director d&#39;avaluació
 DocType: Payment Entry,Allocate Payment Amount,Distribuir l&#39;import de pagament
+DocType: Subscription Plan,Subscription Plan,Pla de subscripció
 DocType: Employee External Work History,Salary,Salari
 DocType: Serial No,Delivery Document Type,Tipus de document de lliurament
 DocType: Sales Order,Partly Delivered,Parcialment Lliurat
@@ -5507,9 +5550,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Rang 2 Envelliment
 DocType: SG Creation Tool Course,Max Strength,força màx
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instal·lació de valors predeterminats
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},No s&#39;ha seleccionat cap nota de lliurament per al client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},No s&#39;ha seleccionat cap nota de lliurament per al client {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM reemplaçat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
 DocType: Grant Application,Has any past Grant Record,Té algun registre de Grant passat
 ,Sales Analytics,Analytics de venda
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponible {0}
@@ -5527,7 +5570,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva d&#39;habitació de l&#39;hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Servei Al Client
 DocType: BOM,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidat a Job.
@@ -5543,7 +5586,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Els estudiants han estat inscrits
 DocType: Fees,Student Details,Detalls dels estudiants
 DocType: Purchase Invoice Item,Stock Qty,existència Quantitat
-DocType: Employee Loan,Repayment Period in Months,Termini de devolució en Mesos
+DocType: Loan,Repayment Period in Months,Termini de devolució en Mesos
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No és un document d&#39;identitat vàlid?
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
 DocType: Account,Equity,Equitat
@@ -5552,7 +5595,7 @@
 DocType: Task,Closing Date,Data de tancament
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
 DocType: Timesheet,Work Detail,Detall del treball
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Enginyer
 DocType: Journal Entry,Total Amount Currency,Suma total de divises
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
@@ -5597,13 +5640,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informació del tipus de donant.
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error en la fórmula o condició: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Quantitat facturada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Quantitat facturada
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Els pesos dels criteris han de sumar fins al 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Assistència
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,stockItems
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},S&#39;està creant {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen i destí de dipòsit no pot ser el mateix
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
@@ -5627,14 +5669,14 @@
 DocType: Shipping Rule,Fixed,S&#39;ha solucionat
 DocType: Vehicle Service,Clutch Plate,placa d&#39;embragatge
 DocType: Company,Round Off Account,Per arrodonir el compte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Despeses d'Administració
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Despeses d'Administració
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
-DocType: Journal Entry,Subscription,Subscripció
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Subscripció
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creació de tarifes pendents
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Període de Notificació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Període de Notificació
 DocType: Asset Category,Asset Category Name,Nom de la categoria d&#39;actius
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nom nou encarregat de vendes
@@ -5647,7 +5689,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixa sense marcar si no vol tenir en compte per lots alhora que els grups basats en curs.
 DocType: Asset,Frequency of Depreciation (Months),Freqüència de Depreciació (Mesos)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Compte de Crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
@@ -5655,7 +5697,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
 DocType: Hub Settings,Company Logo,Logotip de l&#39;empresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 DocType: Healthcare Settings,Patient Registration,Registre de pacients
@@ -5689,11 +5731,10 @@
 DocType: Journal Entry,Total Debit,Dèbit total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Defecte Acabat Productes Magatzem
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Seleccioneu Pacient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,Serveis
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Pressupost i de centres de cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per a la
 ,Appointment Analytics,Anàlisi de cites
 DocType: Vehicle Service,Half Yearly,Semestrals
 DocType: Lead,Blog Subscriber,Bloc subscriptor
@@ -5709,6 +5750,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deixar en blanc si fas grups d&#39;estudiants per any
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si es marca, número total. de dies de treball s'inclouran els festius, i això reduirà el valor de Salari per dia"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Les aplicacions que utilitzin la clau actual no podran accedir, segurament?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Avanç total
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Canvieu el codi de la plantilla
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La data final de durada no pot ser anterior a la data d&#39;inici Termini. Si us plau, corregeixi les dates i torna a intentar-ho."
@@ -5719,8 +5761,9 @@
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 DocType: Cheque Print Template,Signatory Position,posició signatari
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Establir com a Perdut
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Establir com a Perdut
 DocType: Timesheet,Total Billable Hours,Total d&#39;hores facturables
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Nombre de dies que el subscriptor ha de pagar les factures generades per aquesta subscripció
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagament de rebuts Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Això es basa en transaccions en contra d&#39;aquest client. Veure cronologia avall per saber més
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a la quantitat d&#39;entrada de pagament {2}
@@ -5739,12 +5782,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Company,Company Info,Qui Som
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Seleccionar o afegir nou client
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
 DocType: Assessment Result,Summary,Resum
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Compte Dèbit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Element de l&#39;entrada a la comanda del restaurant
@@ -5756,7 +5799,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Import de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Cita Proveïdor {0} creat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Work Order,Manufactured Qty,Quantitat fabricada
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Les accions no existeixen amb {0}
@@ -5764,12 +5807,12 @@
 DocType: Asset,Out of Order,No funciona
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignora la superposició del temps d&#39;estació de treball
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Seleccioneu els números de lot
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures enviades als clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
 DocType: Patient Service Unit,Medical Administrator,Administrador mèdic
 DocType: Assessment Plan,Schedule,Horari
 DocType: Account,Parent Account,Compte primària
@@ -5799,15 +5842,16 @@
 DocType: Asset Repair,Repair Status,Estat de reparació
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Seleccioneu Employee Record primer.
 DocType: POS Profile,Account for Change Amount,Compte per al Canvi Monto
 DocType: Purchase Invoice,input service,servei d&#39;entrada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Membre de l&#39;equip de manteniment
 DocType: Agriculture Analysis Criteria,Soil Analysis,Anàlisi del sòl
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Codi del curs:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Si us plau ingressi Compte de Despeses
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
@@ -5855,19 +5899,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Les admissions per {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nom de la variable
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
 DocType: Asset,Asset Category,categoria actius
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salari net no pot ser negatiu
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materials de Proveïdor
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Sol·licitud de material de planificació
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Impostos Especials Factura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Llindar {0}% apareix més d&#39;una vegada
 DocType: Expense Claim,Employees Email Id,Empleats Identificació de l'email
 DocType: Employee Attendance Tool,Marked Attendance,assistència marcada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passiu exigible
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Passiu exigible
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,El temporitzador va superar les hores indicades.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
 DocType: Patient,A Positive,Un positiu
@@ -5878,9 +5922,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d&#39;aquest proveïdor s&#39;han de fer amb precaució."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Equip de manteniment d&#39;actius
-DocType: Employee Loan,Loan Type,Tipus de préstec
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} s&#39;ha enviat correctament
+DocType: Loan,Loan Type,Tipus de préstec
 DocType: Scheduling Tool,Scheduling Tool,Eina de programació
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
@@ -5912,7 +5957,7 @@
 DocType: Item,Units of Measure,Unitats de mesura
 DocType: Manufacturing Settings,Allow Production on Holidays,Permetre Producció en Vacances
 DocType: Sales Invoice,Customer's Purchase Order Date,Data de l'ordre de compra del client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Mostra adjunts Públiques
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
 DocType: Restaurant Reservation,Reservation Time,Temps de reserva
@@ -5927,7 +5972,7 @@
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,La fila # {0}: la reqd per data no pot ser abans de la data de la transacció
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,productes destacats
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Dissenyador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
@@ -5937,20 +5982,20 @@
 DocType: Driver,Expiry Date,Data De Caducitat
 DocType: Healthcare Settings,Employee name and designation in print,Nom de l&#39;empleat i designació en format imprès
 ,accounts-browser,comptes en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Si us plau, Selecciona primer la Categoria"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projecte mestre.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per permetre que l&#39;excés de facturació o excés de comandes, actualitzar &quot;Assignació&quot; a l&#39;arxiu Configuració o l&#39;article."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Mig dia)
 DocType: Payment Term,Credit Days,Dies de Crèdit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Seleccioneu Pacient per obtenir proves de laboratori
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Fer lots Estudiant
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Temps de Lliurament Dies
 DocType: Cash Flow Mapping,Is Income Tax Expense,La despesa de l&#39;impost sobre la renda
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Comprovar això si l&#39;estudiant està residint a l&#39;alberg de l&#39;Institut.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
 ,Stock Summary,Resum de la
@@ -5961,10 +6006,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: BOM Operation,Operating Cost(Company Currency),Cost de funcionament (Companyia de divises)
-DocType: Employee Loan Application,Rate of Interest,Tipus d&#39;interès
+DocType: Loan Application,Rate of Interest,Tipus d&#39;interès
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: Item,Shelf Life In Days,Vida útil en dies
 DocType: GL Entry,Is Opening,Està obrint
+DocType: Department,Expense Approvers,Aplicacions de despeses de despesa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
 DocType: Journal Entry,Subscription Section,Secció de subscripció
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,El compte {0} no existeix
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 1508561..ff546f9 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Zprávy o hodnocení
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Spotřební zboží
-DocType: Purchase Receipt,Subscription Detail,Detail předplatného
 DocType: Supplier Scorecard,Notify Supplier,Informujte dodavatele
 DocType: Item,Customer Items,Zákazník položky
 DocType: Project,Costing and Billing,Kalkulace a fakturace
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mailová upozornění
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ohodnocení
 DocType: Item,Default Unit of Measure,Výchozí Měrná jednotka
 DocType: SMS Center,All Sales Partner Contact,Všechny Partneři Kontakt
-DocType: Employee,Leave Approvers,Schvalovatelé dovolených
+DocType: Department,Leave Approvers,Schvalovatelé dovolených
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Vyšetřování
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Zkontrolujte dostupnost
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To je založeno na transakcích proti tomuto dodavateli. Viz časovou osu níže podrobnosti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Právní
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Právní
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
 DocType: Bank Guarantee,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
 DocType: Delivery Note,Return Against Delivery Note,Návrat Proti dodací list
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Neprovádějí se žádné předání platů.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Neprovádějí se žádné předání platů.
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Ukázat otevřené
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Je nutné tuto akci učinit i dnes pro výše uvedené opakování
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Odhlásit se
 DocType: Pricing Rule,Apply On,Naneste na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Support Settings,Support Settings,Nastavení podpůrných
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Leave Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Batch položky vypršení platnosti Stav
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Návrh
 DocType: Membership,membership validaty section,členství platná část
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 DocType: Consultation,Consultation,Konzultace
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Vytváření webových stránek
 DocType: Opening Invoice Creation Tool Item,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Účty tabulka nemůže být prázdné.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Úvěry (závazky)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Účty tabulka nemůže být prázdné.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 DocType: Item,Country of Origin,Země původu
 DocType: Soil Texture,Soil Texture Criteria,Kritéria textury půdy
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primární kontaktní údaje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otevřené problémy
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 DocType: Lab Test Groups,Add new line,Přidat nový řádek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zpoždění s platbou (dny)
@@ -89,7 +85,7 @@
 ,Delay Days,Delay Dny
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Položka podrobnosti o hmotnosti
 DocType: Asset Maintenance Log,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Řádek č. {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Řádek č. {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulace Částka
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Prosím, vyberte Ceník"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Na cestě
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte datum"
 DocType: Daily Work Summary Group,Holiday List,Seznam dovolené
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Účetní
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Účetní
 DocType: Hub Settings,Selling Price List,Prodejní ceník
 DocType: Patient,Tobacco Current Use,Aktuální tabákové použití
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prodejní sazba
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Prodejní sazba
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefon
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nový {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Původní e-mailové oznámení bylo odesláno
 ,Sales Partners Commission,Obchodní partneři Komise
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Hodnota po odpisech
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Příbuzný
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Datum návštěvnost nemůže být nižší než spojovací data zaměstnance
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Datum návštěvnost nemůže být nižší než spojovací data zaměstnance
 DocType: Grading Scale,Grading Scale Name,Klasifikační stupnice Name
-DocType: Subscription,Repeat on Day,Opakujte v den
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: Sales Invoice,Company Address,adresa společnosti
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
+DocType: Subscription,Subscription Start Date,Datum zahájení předplatného
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} není v žádném aktivním fiskální rok.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, kód položky: {1} a zákazník: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Datum ukončení zkušebního období nemůže být před datem zahájení zkušebního období
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Kusovník není zadán pro subdodavatelskou položku {0} na řádku {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Patient,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Není dovoleno {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Položka získaná z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Položka získaná z
 DocType: Price List,Price Not UOM Dependant,Cena není závislá na UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Daňové Type
 ,Completed Work Orders,Dokončené pracovní příkazy
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Zdanitelná částka
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Zdanitelná částka
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodinová sazba / 60) * Skutečný čas operace
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Řádek # {0}: Referenční typ dokumentu musí být jedním z nákladového tvrzení nebo záznamu v deníku
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Vybrat BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Řádek # {0}: Referenční typ dokumentu musí být jedním z nákladového tvrzení nebo záznamu v deníku
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Vybrat BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Spravujte zálohu poskytnutou zaměstnanci
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Oznámení o doručení
 DocType: Journal Entry,Opening Entry,Otevření Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Účet Pay Pouze
-DocType: Employee Loan,Repay Over Number of Periods,Splatit Over počet období
+DocType: Loan,Repay Over Number of Periods,Splatit Over počet období
 DocType: Stock Entry,Additional Costs,Dodatečné náklady
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 DocType: Education Settings,Validate Batch for Students in Student Group,Ověřit dávku pro studenty ve skupině studentů
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Žádný záznam volno nalezených pro zaměstnance {0} na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Žádný záznam volno nalezených pro zaměstnance {0} na {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Prosím nastavte výchozí šablonu pro ohlášení stavu o stavu v HR nastaveních.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,zaměstnanec Loan
 DocType: Fee Schedule,Send Payment Request Email,Odeslat e-mail s žádostí o platbu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nemovitost
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Úspěšně bylo zrušeno registrace.
 DocType: Assessment Result,Grade,Školní známka
 DocType: Restaurant Table,No of Seats,Počet sedadel
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Chcete-li přidat dynamický objekt, použijte jinja tagy jako <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: Asset Maintenance Task,Asset Maintenance Task,Úloha údržby aktiv
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Roční Plat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Roční Plat
 DocType: Daily Work Summary,Daily Work Summary,Denní práce Souhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Náklady
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Náklady
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Vyberte objekt Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Prosím, zadejte Preferred Kontakt e-mail"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Prosím, zadejte Preferred Kontakt e-mail"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,primární adresa
 DocType: Production Plan,Material Request Detail,Podrobnosti o vyžádání materiálu
 DocType: Selling Settings,Default Quotation Validity Days,Výchozí dny platnosti kotací
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,změna Částka
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Kategorie řidičských oprávnění
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Zadejte prosím datum doručení
 DocType: Depreciation Schedule,Make Depreciation Entry,Udělat Odpisy Entry
+DocType: HR Settings,Leave Settings,Ponechte nastavení
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Udělat zaměstnance
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Režim nastavení POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Zakáže vytváření časových protokolů proti pracovním příkazům. Operace nesmí být sledovány proti pracovní objednávce
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Provedení
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Asset Maintenance Log,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Podrobnosti o členství
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodavatel je vyžadován oproti splatnému účtu {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Celkem hodin: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Přednost
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Přednost
 DocType: Grant Application,Individual,Individuální
 DocType: Academic Term,Academics User,akademici Uživatel
 DocType: Cheque Print Template,Amount In Figure,Na obrázku výše
-DocType: Employee Loan Application,Loan Info,Informace o úvěr
+DocType: Loan Application,Loan Info,Informace o úvěr
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Období dodavatele skóre karty
 DocType: Share Transfer,Share Transfer,Sdílet přenos
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Šablona položky
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemie
 DocType: Job Offer,Select Terms and Conditions,Vyberte Podmínky
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,limitu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,limitu
 DocType: Woocommerce Settings,Woocommerce Settings,Nastavení Woocommerce
 DocType: Production Plan,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Výchozí Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televize
 DocType: Work Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Vyberte zákazníka nebo dodavatele.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Enable Perpetual Inventory,Povolit trvalý inventář
+DocType: Bank Guarantee,Charges Incurred,Poplatky vznikly
 DocType: Company,Default Payroll Payable Account,"Výchozí mzdy, splatnou Account"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Aktualizace Email Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Vlastní výsledek
 DocType: Delivery Stop,Contact Name,Kontakt Jméno
 DocType: Course Assessment Criteria,Course Assessment Criteria,Hodnotící kritéria hřiště
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,DIČ:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,DIČ:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student ID:
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Land Unit,Land Unit describing various land assets,Pozemní jednotka popisující různé pozemky
@@ -374,9 +371,8 @@
 ,Open Work Orders,Otevřete pracovní objednávky
 DocType: Payment Term,Credit Months,Kreditní měsíce
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Čistý Pay nemůže být nižší než 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Chcete-li zastavit odesílání upozornění na opakované chyby ze systému, jsme v odběru zkontrolovali pole Zakázáno"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Dovolených za rok
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Dovolených za rok
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Email Digest,Profit & Loss,Ztráta zisku
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Prosím, nastavte studenty pod studentskými skupinami"
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,bankovní Příspěvky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,bankovní Příspěvky
 DocType: Crop,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool hřiště
 DocType: Lead,Do Not Contact,Nekontaktujte
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Lidé, kteří vyučují ve vaší organizaci"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Course Scheduling Tool,Course Start Date,Začátek Samozřejmě Datum
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max stupeň
 DocType: Email Digest,New Quotations,Nové Citace
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-maily výplatní pásce, aby zaměstnanci na základě přednostního e-mailu vybraného v zaměstnaneckých"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,vodní doprava County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Učit se
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učit se
 DocType: Asset,Next Depreciation Date,Vedle Odpisy Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnost na jednoho zaměstnance
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikající Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Driver,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Řádek # {0}: {1} nemůže být negativní na položku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Řádek # {0}: {1} nemůže být negativní na položku {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Špatné Heslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Prosím, nastavte Hotel Room Rate na {}"
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Dodací list
 DocType: Consultation,Encounter Impression,Setkání s impresi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Náklady prodaných aktiv
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozřejmě Plánování Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgentní] Chyba při vytváření opakujících se %s pro %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
 DocType: Land Unit,LInked Analysis,Llnked Analysis
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Období žádosti nesmí být v rámci dvou alokačních záznamů
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Období žádosti nesmí být v rámci dvou alokačních záznamů
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Přijaté
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvoření skupiny studentů
 DocType: Volunteer,Weekends,Víkendy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Částka kreditní poznámky
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Částka kreditní poznámky
 DocType: Setup Progress Action,Action Document,Akční dokument
 DocType: Chapter Member,Website URL,URL webu
 ,Finished Goods,Hotové zboží
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Přidat položky
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
+DocType: Leave Application,Leave Approver Name,Jméno schvalovatele dovolené
 DocType: Depreciation Schedule,Schedule Date,Plán Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Zisk, rabaty a ostatní součásti Plat"
 DocType: Packed Item,Packed Item,Zabalená položka
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Žádost o cenovou nabídku
 DocType: Healthcare Settings,Require Lab Test Approval,Požadovat schválení testu laboratoře
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Naprosto vynikající
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Naprosto vynikající
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 DocType: Dosage Strength,Strength,Síla
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Vytvořit nový zákazník
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Spotřební Cost
 DocType: Purchase Receipt,Vehicle Date,Datum Vehicle
 DocType: Student Log,Medical,Lékařský
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Aktualizovat číslo účtu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Olovo Majitel nemůže být stejný jako olovo
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Přidělená částka nemůže větší než množství neupravené
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Jednolůžkový
 DocType: Salary Slip,Total Loan Repayment,Celková splátky
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Subscription,Yearly,Ročně
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Drug Prescription,Dosage,Dávkování
 DocType: Journal Entry Account,Sales Order,Prodejní objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Prodej Rate
 DocType: Assessment Plan,Examiner Name,Jméno Examiner
 DocType: Lab Test Template,No Result,Žádný výsledek
 DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Přečtěte si ERPNext Manuál
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Zobrazit listy všech členů katedry v kalendáři
 DocType: Purchase Invoice,01-Sales Return,01-Návrat prodeje
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,Čeká objednávek
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Povinná oblast - Akademický rok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} není přidružen k {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Nastavte prosím výchozí splatný účet společnosti {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Nastavte prosím výchozí splatný účet společnosti {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakce není povolena proti zastavenému pracovnímu příkazu {0}
 DocType: Setup Progress Action,Min Doc Count,Minimální počet dokumentů
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Vyhrazeno pro prodej
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda oceňování nelze změnit, neboť existují transakce proti některým položkám, které nemají vlastní metodu oceňování"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda oceňování nelze změnit, neboť existují transakce proti některým položkám, které nemají vlastní metodu oceňování"
 DocType: Student Report Generation Tool,Attended by Parents,Zúčastnili se rodiče
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Patient,AB Positive,AB pozitivní
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponent pro mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
-DocType: Employee Loan,Total Payment,Celková platba
+DocType: Loan,Total Payment,Celková platba
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nelze zrušit transakci pro dokončenou pracovní objednávku.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušena, takže akce nemůže být dokončena"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dost Části vybudovat
 DocType: POS Profile User,POS Profile User,Uživatel profilu POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
+DocType: Subscription Invoice,Subscription Invoice,Předplatné faktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Přímý příjmů
 DocType: Patient Appointment,Date TIme,Čas schůzky
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Založení společnosti a daně
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnost Kurz
 DocType: Codification Table,Codification Table,Kodifikační tabulka
 DocType: Timesheet Detail,Hrs,hod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Prosím, vyberte Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 DocType: Purchase Invoice,Supplier GSTIN,Dodavatel GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Šablona mapování peněžních toků
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
+DocType: Bank Guarantee,Providing,Poskytování
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Není povoleno, podle potřeby nastavte šablonu testování laboratoře"
 DocType: Patient,Risk Factors,Rizikové faktory
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
 DocType: Healthcare Settings,Appointment Confirmation,Potvrzení jmenování
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Uzavření (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ahoj
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Přemístit položku
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",Již nastavený výchozí profil {0} pro uživatele {1} je laskavě vypnut výchozí
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Neuhrazená Hodnoty
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Území je vyžadováno v POS profilu
 DocType: Supplier,Prevent RFQs,Zabraňte RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Ujistěte se prodejní objednávky
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Zápis o platu odeslán na období od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Zápis o platu odeslán na období od {0} do {1}
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Přepravní účet
 DocType: Production Plan,Production Plan,Plán produkce
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otevření nástroje pro vytváření faktur
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by neměla být menší než které již byly schváleny listy {1} pro období
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Nastavte počet transakcí na základě sériového č. Vstupu
 ,Total Stock Summary,Shrnutí souhrnného stavu
 DocType: Announcement,Posted By,Přidal
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáváno dodavatelem (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte společnost
 DocType: Share Balance,Share Balance,Sázení podílů
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Training Result Employee,Training Result Employee,Vzdělávací Výsledek
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
-DocType: Repayment Schedule,Principal Amount,jistina
-DocType: Employee Loan Application,Total Payable Interest,Celkem Splatné úroky
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,jistina
+DocType: Loan Application,Total Payable Interest,Celkem Splatné úroky
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Celková nevyřízená hodnota: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodejní faktury časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervace restaurace
 DocType: Land Unit,Land Unit Name,Název půdní jednotky
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukce
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Obalte se
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Informujte zákazníky e-mailem
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Informujte zákazníky e-mailem
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Další prodeje osoba {0} existuje se stejným id zaměstnance
 DocType: Employee Advance,Claimed Amount,Požadovaná částka
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Platební brána účet nevytvořili, prosím, vytvořte ručně."
 DocType: Supplier Scorecard,Per Year,Za rok
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Není způsobilý pro přijetí do tohoto programu podle DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Sales Invoice,Sales Taxes and Charges,Prodej Daně a poplatky
 DocType: Employee,Organization Profile,Profil organizace
 DocType: Vital Signs,Height (In Meter),Výška (v metru)
 DocType: Student,Sibling Details,sourozenec Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozidel
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automaticky spouští žádost o zpětné vazby založené na podmínkách.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automaticky spouští žádost o zpětné vazby založené na podmínkách.
 DocType: Employee,Reason for Resignation,Důvod rezignace
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Šablona pro hodnocení výkonu.
 DocType: Sales Invoice,Credit Note Issued,Dobropisu vystaveného
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Čistá Změna stavu zásob
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Zaměstnanec úvěru Vedení
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Souvislost s Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manažer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manažer
 DocType: Payment Entry,Payment From / To,Platba z / do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavte prosím účet ve skladu {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nelze najít cestu pro
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening (Dr)
+DocType: Loan,Applicant,Žadatel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Provádět opakované dokumenty
 ,GST Itemised Purchase Register,GST Itemised Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Změna plánu
-DocType: Employee Loan,Total Interest Payable,Celkem splatných úroků
+DocType: Loan,Total Interest Payable,Celkem splatných úroků
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Work Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Čas operace
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Dokončit
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Báze
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Báze
 DocType: Timesheet,Total Billed Hours,Celkem Předepsané Hodiny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Odepsat Částka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Odepsat Částka
 DocType: Leave Block List Allow,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráty na majetku likvidaci
 DocType: Vehicle Log,Service Details,Podrobnosti o službě
-DocType: Subscription,Quarterly,Čtvrtletně
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Skupinové
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Rozvrh hodin
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Se zpětným suroviny na základě
 DocType: Sales Invoice,Port Code,Port Code
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervní sklad
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervní sklad
 DocType: Lead,Lead is an Organization,Vedoucí je organizace
 DocType: Guardian Interest,Interest,Zajímat
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Předprodej
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Údaj měřiče ujeté vzdálenosti (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šablony kritérií kritérií pro dodavatele.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Vstup Platba je již vytvořili
 DocType: Request for Quotation,Get Suppliers,Získejte dodavatele
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview výplatní pásce
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview výplatní pásce
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Můžete obnovit pouze tehdy, pokud vaše členství vyprší během 30 dnů"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Zvolte pouze, pokud máte nastavené dokumenty pro mapování cash flow"
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Supplier Scorecard,Per Week,Za týden
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Celkový počet studentů
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Společnost a účty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,v Hodnota
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,v Hodnota
 DocType: Asset Settings,Depreciation Options,Možnosti odpisů
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Neplatný čas přidávání
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Neplatný čas přidávání
 DocType: Lead,Campaign Name,Název kampaně
 DocType: Hotel Room,Capacity,Kapacita
 DocType: Selling Settings,Close Opportunity After Days,V blízkosti Příležitost po několika dnech
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Budget,Budget Against,rozpočet Proti
 DocType: Employee,Cell Number,Číslo buňky
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pro daná kritéria neexistuje žádný zaměstnanec. Zkontrolujte, zda nebyly dosud vytvořeny platové kursy."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pro daná kritéria neexistuje žádný zaměstnanec. Zkontrolujte, zda nebyly dosud vytvořeny platové kursy."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte prosím tabulku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v adresáři &quot;Příjemci&quot;
 DocType: Special Test Items,Particulars,Podrobnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Asset,Maintenance,Údržba
+DocType: Subscriber,Subscriber,Odběratel
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Aktualizujte stav projektu
 DocType: Item,Maximum sample quantity that can be retained,"Maximální množství vzorku, které lze zadržet"
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Přidat Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset vyhozen přes položka deníku {0}
-DocType: Employee Loan,Interest Income Account,Účet Úrokové výnosy
+DocType: Loan,Interest Income Account,Účet Úrokové výnosy
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Prohlížení pozvánky odesláno
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Náklady Office údržby
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Jít do
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavení e-mailový účet
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Asset Repair,Downtime,Nefunkčnost
 DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademické označení:
 DocType: Salary Detail,Do not include in total,Nezahrnujte celkem
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Množství vzorku {0} nemůže být větší než přijaté množství {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 DocType: Item,Max Sample Quantity,Max. Množství vzorku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nemáte oprávnění
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nemáte oprávnění
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Požadovaná citace
 DocType: Vital Signs,Heart Rate / Pulse,Srdeční frekvence / puls
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratorní testy a vitální znaky
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Žádný zaměstnanec nalezeno
-DocType: Subscription,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentská skupina je již aktualizována.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentská skupina je již aktualizována.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Aktualizace projektu.
 DocType: SMS Center,All Customer Contact,Vše Kontakt Zákazník
 DocType: Land Unit,Tree Details,Tree Podrobnosti
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Všechny skupiny položek
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Work Order,Item To Manufacture,Položka k výrobě
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} je stav {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Znovu vyberte, pokud je zvolená adresa po uložení upravena"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 DocType: Item,Hub Publishing Details,Podrobnosti o publikování Hubu
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Otevírací"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Otevírací"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otevřená dělat
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Lab Test Template,Result Format,Formát výsledků
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,dvouměsíčník
 DocType: Vehicle Service,Brake Pad,Brzdový pedál
 DocType: Fertilizer,Fertilizer Contents,Obsah hnojiv
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Výzkum a vývoj
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
 DocType: Timesheet,Total Billed Amount,Celková částka Fakturovaný
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Zablokujte kontrolu úvěrového limitu na objednávce
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Hodnocení výkonu.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolení &quot;použití pro nákupního košíku&quot;, jak je povoleno Nákupní košík a tam by měla být alespoň jedna daňová pravidla pro Košík"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je propojen na objednávku {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je propojen na objednávku {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Místě prodeje
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimální počet sedadel
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetření Výsledek
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referenční Doctype musí být jedním z {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Work Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,K přenosu nejsou k dispozici žádné položky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,K přenosu nejsou k dispozici žádné položky
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Uzavření (otevření + celkem)
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Cena nebo sleva
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Oblíbené
 DocType: Hub Settings,Custom Data,Vlastní data
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Standardní zdravotnický kód
 DocType: Soil Texture,Clay Composition (%),Složení jílů (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Uložte prosím před přiřazením úkolu.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Zůstatek Hodnota
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Zůstatek Hodnota
 DocType: Lab Test,Lab Technician,Laboratorní technik
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodejní ceník
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Prodejní ceník
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Pokud je zaškrtnuto, vytvoří se zákazník, mapovaný na pacienta. Faktury pacientů budou vytvořeny proti tomuto zákazníkovi. Při vytváření pacienta můžete také vybrat existujícího zákazníka."
 DocType: Bank Reconciliation,Account Currency,Měna účtu
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,Komponenty
 DocType: Item Barcode,Item Barcode,Položka Barcode
 DocType: Woocommerce Settings,Endpoints,Koncové body
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","generovat. Pokud je opožděno, musíte ručně změnit pole &quot;Opakovat v den měsíce&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
 DocType: Share Transfer,From Folio No,Z folia č
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Datum k dispozici
 DocType: Guardian,Guardian Name,Jméno Guardian
 DocType: Cheque Print Template,Has Print Format,Má formát tisku
-DocType: Employee Loan,Sanctioned,schválený
+DocType: Loan,Sanctioned,schválený
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,je povinné. Možná chybí záznam směnného kurzu pro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro &quot;produktem Bundle předměty, sklad, sériové číslo a dávkové No bude považována ze&quot; Balení seznam &#39;tabulky. Pokud Warehouse a Batch No jsou stejné pro všechny balení položky pro jakoukoli &quot;Výrobek balík&quot; položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, budou hodnoty zkopírovány do &quot;Balení seznam&quot; tabulku."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro &quot;produktem Bundle předměty, sklad, sériové číslo a dávkové No bude považována ze&quot; Balení seznam &#39;tabulky. Pokud Warehouse a Batch No jsou stejné pro všechny balení položky pro jakoukoli &quot;Výrobek balík&quot; položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, budou hodnoty zkopírovány do &quot;Balení seznam&quot; tabulku."
 DocType: Student Admission,Publish on website,Publikovat na webových stránkách
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
+DocType: Subscription,Cancelation Date,Datum zrušení
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 DocType: Agriculture Task,Agriculture Task,Zemědělské úkoly
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Nepřímé příjmy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Nepřímé příjmy
 DocType: Student Attendance Tool,Student Attendance Tool,Student Účast Tool
 DocType: Restaurant Menu,Price List (Auto created),Ceník (vytvořeno automaticky)
 DocType: Cheque Print Template,Date Settings,Datum Nastavení
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metr
 DocType: Workstation,Electricity Cost,Cena elektřiny
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Laboratoř data testování nemůže být před datem sběru
+DocType: Subscription Plan,Cost,Náklady
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 DocType: Expense Claim,Total Advance Amount,Celková výše zálohy
 DocType: Delivery Stop,Estimated Arrival,odhadovaný příjezd
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
 DocType: Timesheet Detail,Bill,Účet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bílá
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Bílá
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Množství není k dispozici pro {4} ve skladu {1} při účtování čas vložení údajů ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Ze seznamu zaškrtávacích políček můžete vybrat pouze jednu možnost.
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 DocType: Item,Automatically Create New Batch,Automaticky vytvořit novou dávku
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Přiřazení {0} až {1} (řádek {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Přiřazení {0} až {1} (řádek {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Dělat
 DocType: Student Admission,Admission Start Date,Vstupné Datum zahájení
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nový zaměstnanec
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Název seznamu dovolené
 DocType: Repayment Schedule,Balance Loan Amount,Balance Výše úvěru
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Akciové opce
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Akciové opce
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Zakázat načíst poslední nákupní údaje v objednávce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Opravdu chcete obnovit tento vyřazen aktivum?
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Položka balícího listu
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Zadejte {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Tvorba variantu byla zařazena do fronty.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Souhrn práce pro {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Atribut tabulka je povinné
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvním schvalovacím přístupem v seznamu bude nastaven výchozí přístup.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Plan,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nemůže být negativní
 DocType: Training Event,Self-Study,Samostudium
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,Mzdy
 DocType: Asset Maintenance,Maintenance Manager Name,Název správce údržby
 DocType: Agriculture Task,Urgent,Naléhavý
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nelze najít proměnnou:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Vyberte pole, které chcete upravit z čísla"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nemůže být položka fixního aktiva, protože je vytvořena účetní kniha akcií."
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Jméno šablony inspekce kvality
 DocType: Project,First Email,První e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodejní Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodejní Částka
 DocType: Repayment Schedule,Interest Amount,Zájem Částka
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Share Transfer,Issue,Problém
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,Přepravní State
 ,Projected Quantity as Source,Množství projekcí as Zdroj
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidána pomocí tlačítka""položka získaná z dodacího listu"""
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Výlet za doručení
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Výlet za doručení
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Typ přenosu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Prodejní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Prodejní náklady
 DocType: Consultation,Diagnosis,Diagnóza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Prodejní objednávky {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Vyberte účet úrokového výnosu v úvěru {0}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Tvorba přírůstků zásob
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Procento příspěvcích
-DocType: Employee Loan,Repayment Schedule,splátkový kalendář
+DocType: Loan,Repayment Schedule,splátkový kalendář
 DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Education Settings,Attendance Freeze Date,Datum ukončení účasti
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Zobrazit všechny produkty
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Zobrazit všechny produkty
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimální doba plnění (dny)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Všechny kusovníky
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotel Pokoje typu {0} nejsou k dispozici v {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Od Zaměstnance
 DocType: Driver,Cellphone Number,Mobilní číslo
 DocType: Project,Monitor Progress,Monitorování pokroku
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
+DocType: Supplier Quotation,Auto Repeat Section,Sekce automatického opakování
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Neplatný Atribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
+DocType: Department Approver,Department Approver,Schválení oddělení
 DocType: SMS Center,Total Characters,Celkový počet znaků
 DocType: Employee Advance,Claimed,Reklamace
 DocType: Crop,Row Spacing,Rozteč řádků
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Příspěvek%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Podle Nákupních nastavení, pokud je objednávka požadována == &#39;ANO&#39;, pak pro vytvoření nákupní faktury musí uživatel nejprve vytvořit nákupní objednávku pro položku {0}"
+,HSN-wise-summary of outward supplies,HSN - shrnutí vnějších dodávek
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Název akce
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začátek Rok
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},První dvě číslice GSTIN by se měly shodovat s číslem státu {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Datum období současného faktury je Začátek
 DocType: Salary Slip,Leave Without Pay,Volno bez nároku na mzdu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Plánování kapacit Chyba
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Pole budou kopírovány pouze v době vytváření.
 DocType: Setup Progress Action,Domains,Domény
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Řízení
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Řízení
 DocType: Cheque Print Template,Payer Settings,Nastavení plátce
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Pozor
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Den začátku je větší než koncový den v úloze &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / vrubopis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / vrubopis
 DocType: Price List Country,Price List Country,Ceník Země
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Prosím, zadejte kód položky se dostat číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-DocType: Employee Loan,Partially Disbursed,částečně Vyplacené
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Poskytněte informace.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Poskytněte informace.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Nelze znovu spustit odběr, který není zrušen."
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 DocType: Fee Validity,Valid Till,Platný do
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Celkové setkání učitelů rodičů
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Změna skupiny zákazníků pro vybraného zákazníka není povolena.
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aktualizace odhadovaných časů příjezdu.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizace odhadovaných časů příjezdu.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o zápisu
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vyberte zákazníka
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Purchase Order,Group same items,Skupina stejné položky
 DocType: Purchase Invoice,Disable Rounded Total,Zakázat Zaoblený Celkem
-DocType: Employee Loan Application,Repayment Info,splácení Info
+DocType: Department,Parent Department,Oddělení rodičů
+DocType: Loan Application,Repayment Info,splácení Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
 DocType: Maintenance Team Member,Maintenance Role,Úloha údržby
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Nastavení Zaměstnanci
 DocType: Sales Order,SO-,TAK-
 DocType: Hotel Room Reservation,Hotel Reservation User,Uživatel rezervace ubytování
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Student,O-,Ó-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Výzkum
+DocType: Subscription Settings,Subscription Settings,Nastavení předplatného
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Uveďte prosím alespoň jeden atribut v tabulce atributy
 DocType: Announcement,All Students,Všichni studenti
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Skupina položek již existuje. Prosím, změňte název položky nebo přejmenujte skupinu položek"
 DocType: Crop Cycle,Less than a year,Méně než rok
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 DocType: Crop,Yield UOM,Výnos UOM
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
 DocType: Item,Is Item from Hub,Je položka z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Řádek {0}: typ činnosti je povinná.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendy placené
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendy placené
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účetní Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdíl Částka
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} v Nechat na {1}
 DocType: Purchase Invoice,Reverse Charge,Zpětné nabíjení
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Nerozdělený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Nerozdělený zisk
 DocType: Purchase Invoice,05-Change in POS,05 - Změna POS
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 ,Student and Guardian Contact Details,Student a Guardian Kontaktní údaje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Řádek {0}: Pro dodavatele je zapotřebí {0} E-mailová adresa pro odeslání e-mailu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Dočasné Otevření
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Dočasné Otevření
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Zobrazit Hub
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Patient Appointment,More Info,Více informací
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
 DocType: Supplier Scorecard,Scorecard Actions,Akční body Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Příklad: Masters v informatice
 DocType: Purchase Invoice,Rejected Warehouse,Zamítnuto Warehouse
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,na
 DocType: Supplier Quotation Item,Lead Time in days,Čas leadu ve dnech
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Předpisy pro laboratorní testy
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Malý
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otevření položky nástroje pro vytváření faktur
 DocType: Education Settings,Employee Number,Počet zaměstnanců
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Zrušit faktura po období odkladu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončeno
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorní testování Datetime
 DocType: Email Digest,Add Quote,Přidat nabídku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Nepřímé náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 DocType: Agriculture Analysis Criteria,Agriculture,Zemědělství
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Nejprve nastavte kód položky
 DocType: Item,ITEM-,POLOŽKA-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+DocType: Subscription Plan,Billing Interval Count,Počet fakturačních intervalů
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,tým Aktualizace
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Vytvořit formát tisku
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativní položka nesmí být stejná jako kód položky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Dokončení předběžného posouzení
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Pracovní stanice
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žádost o cenovou nabídku dodavatele
 DocType: Healthcare Settings,Registration Message,Registrační zpráva
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Technické vybavení
 DocType: Prescription Dosage,Prescription Dosage,Dávkování na předpis
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vyberte společnost
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Datum zahájení a ukončení
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otevřená BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Project Update,Great/Quickly,Skvělé / rychlé
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Zvolte dávky pro doručenou položku
 DocType: Asset,Depreciation Schedules,odpisy Plány
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,V nastavení GST lze vybrat následující účty:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,V nastavení GST lze vybrat následující účty:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,Transakční měna
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: POS Profile,Campaign,Kampaň
 DocType: Supplier,Name and Type,Název a typ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Physician,Contacts and Address,Kontakty a adresa
 DocType: Purchase Invoice,Contact Person,Kontaktní osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávané datum započetí"" nemůže být větší než ""Očekávané datum ukončení"""
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Způsobilost a podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žádost o cenovou nabídku je zakázán přístup z portálu pro více Zkontrolujte nastavení portálu.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabilní skóre skóre dodavatele skóre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Nákup Částka
 DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo k chybám při vytváření plánu rozvrhů
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Položka {0} není skladem
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,První Průvodce výdajů v seznamu bude nastaven jako výchozí schvalovatel výdajů.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nemůže být větší než 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
@@ -1839,15 +1844,16 @@
 DocType: Package Code,Package Code,Code Package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Učeň
 DocType: Purchase Invoice,Company GSTIN,Společnost GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativní množství není dovoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativní množství není dovoleno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Povolení odchody je povinné v aplikaci Nechat
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Platba v řádku {0} je možná duplikát.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Zemědělství (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Balící list
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pronájem kanceláře
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavení SMS brány
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Balící list
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Nastavení SMS brány
 DocType: Disease,Common Name,Běžné jméno
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 DocType: Vital Signs,Blood Pressure,Krevní tlak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Ověřte zapsaný kurz pro studenty ve skupině studentů
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Item,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Vláda
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na pojistná {0} již existuje pro jízd
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Jméno Institute
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Prosím, zadejte splácení Částka"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Prosím, zadejte splácení Částka"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Položka Varianty
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Služby
 DocType: HR Settings,Email Salary Slip to Employee,Email výplatní pásce pro zaměstnance
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Vyberte Možné dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Vyberte Možné dodavatele
 DocType: Sales Invoice,Source,Zdroj
 DocType: Customer,"Select, to make the customer searchable with these fields","Zvolte, chcete-li, aby se zákazník prohledal s těmito poli"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show uzavřen
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Balící list(y) stornován(y)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Peněžní tok z investičních
 DocType: Program Course,Program Course,Program kurzu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Homepage,Company Tagline for website homepage,Firma fb na titulní stránce webu
 DocType: Item Group,Item Group Name,Položka Název skupiny
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Podrobnosti o členství
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Zadejte prosím všechny požadované hodnoty výsledků
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Pohledávky Shrnutí
-DocType: Employee Loan,Monthly Repayment Amount,Výše měsíční splátky
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Pohledávky Shrnutí
+DocType: Loan,Monthly Repayment Amount,Výše měsíční splátky
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Otevření faktur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
 DocType: GST HSN Code,HSN Code,Kód HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Výše příspěvku
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Uživatel {0} je již přiřazen lékaři {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Krabice
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,možné Dodavatel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,možné Dodavatel
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Zdravotnictví (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Výrobní množství je povinné
-DocType: Employee Loan,Repayment Method,splácení Metoda
+DocType: Loan,Repayment Method,splácení Metoda
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Pokud je zaškrtnuto, domovská stránka bude výchozí bod skupina pro webové stránky"
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Nároky na náklady firmy.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Potřebný certifikát
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Řádek {0}: čas od času i na čas z {1} se překrývá s {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Závazky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Závazky
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Vyberte společnost
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Sekce tisku
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Uživatel {0} nemá žádný výchozí POS profil. Zaškrtněte výchozí v řádku {1} pro tohoto uživatele.
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pro žádný limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Řádek {idx}: {field} je vyžadován pro vytvoření faktur otevření {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Primární adresa a podrobnosti kontaktu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslat e-mail Payment
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vyberte alespoň jednu doménu.
 DocType: Dependent Task,Dependent Task,Závislý Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Hledání položky
 DocType: Payment Schedule,Payment Amount,Částka platby
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,Klasifikační stupnice
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,již byly dokončeny
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Skladem v ruce
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Skladem v ruce
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Platba Poptávka již existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Položka Nabídky
 DocType: Customer,Customer POS Id,Identifikační číslo zákazníka
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Zadejte adresu URL serveru Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 DocType: Share Balance,To No,Ne
-DocType: Subscription,Reference Document,referenční dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} je zrušena nebo zastavena
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Typ žadatele
+DocType: Loan,Applicant Type,Typ žadatele
 DocType: Purchase Invoice,03-Deficiency in services,03 - Nedostatek služeb
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Výchozí standard zdravotnického kódu
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% účtovano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Odmítnout
 DocType: Journal Entry Account,Debit in Company Currency,Debetní ve společnosti Měna
 DocType: BOM Item,BOM Item,Položka kusovníku
 DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Udělat vyplácení Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Udělat vyplácení Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Řádek {0}: Advance proti dodavatelem musí být odepsat
 DocType: Company,Default Values,Výchozí hodnoty
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Celkem (bez daně)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet vedoucích
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí být větší než 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Skladem k dispozici
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Skladem k dispozici
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Procurement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Povinná oblast - Program
 DocType: Special Test Template,Result Component,Komponent výsledků
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Záruční reklamace
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Zahrnout dovolenou v listech jsou listy
 DocType: Sales Invoice,Packed Items,Zabalené položky
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reklamační proti sériového čísla
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Celkový&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Celkový&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potvrďte akci
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Splnění
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Zobrazit Košík
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingové náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Nelze vytvořit standardní kritéria. Kritéria přejmenujte
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Material Request,Transferred,Přestoupil
 DocType: Vehicle,Doors,dveře
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Vybírat poplatek za registraci pacienta
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Atributy nelze změnit po transakci akcií. Vytvořte novou položku a přeneste materiál do nové položky
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Atributy nelze změnit po transakci akcií. Vytvořte novou položku a přeneste materiál do nové položky
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Rozdělení daní
 DocType: Packing Slip,PS-,PS-
@@ -2212,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Zaměstnanecké zálohy
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Instruktor skupiny studentů
 DocType: Grant Application,Assessment  Mark (Out of 10),Známka hodnocení (z 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žádné
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Hlavní
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,roční náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,V předplatném můžete mít pouze Plány se stejným fakturačním cyklem
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
@@ -2242,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ocenění
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Školení
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Track Leads by Lead Source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Prosím Vstupte
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Prosím Vstupte
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Protokol údržby
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
@@ -2253,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,Dodat a Bill
 DocType: Student Group,Instructors,instruktoři
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} musí být předloženy
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Správa sdílených položek
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Platba
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Platba
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} není propojen s žádným účtem, uveďte prosím účet v záznamu skladu nebo nastavte výchozí inventární účet ve firmě {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Správa objednávek
 DocType: Work Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
@@ -2267,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,Student nechat aplikaci
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
@@ -2277,7 +2285,7 @@
 DocType: Item,Barcodes,Čárové kódy
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Objednávka práce {0} musí být odeslána
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,New košík
@@ -2295,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Měna fakturace se musí rovnat buď měně výchozí měny nebo měně stran účtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Soil Texture,Loam,Hlína
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Řádek {0}: K datu splatnosti nemůže být datum odeslání
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Řádek {0}: K datu splatnosti nemůže být datum odeslání
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pro
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Sklad pro příjem
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Strom Nákl.střediska finančních.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
@@ -2315,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Spotřeba materiálu není nastavena v nastavení výroby.
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nelze přepsat položku {0} v řádku {1} více než {2}. Chcete-li povolit přeúčtování, nastavte prosím nastavení akcií"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nelze přepsat položku {0} v řádku {1} více než {2}. Chcete-li povolit přeúčtování, nastavte prosím nastavení akcií"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aktualizace odpovědi
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
@@ -2326,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Nejprve vyberte program
 DocType: Patient Appointment,Patient Age,Věk pacienta
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Správa projektů
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Sériové číslo {0} již bylo vráceno
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Sériové číslo {0} již bylo vráceno
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget,Fiscal Year,Fiskální rok
 DocType: Asset Maintenance Log,Planned,Plánováno
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Standardní pohledávky, které mají být použity, pokud nejsou nastaveny v Pacientovi pro rezervaci konzultačních poplatků."
 DocType: Vehicle Log,Fuel Price,palivo Cena
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Rozpočet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Nastavit Otevřít
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
@@ -2345,16 +2353,16 @@
 DocType: Lead,Follow Up,Následovat
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Strom skupin položek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Částka, která má dodávat"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Stejná položka byla zadána několikrát. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum zahájení nemůže být dříve než v roce datum zahájení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Zaměstnanec {0} již požádal {1} mezi {2} a {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Byly tam chyby.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Zaměstnanec {0} již požádal {1} mezi {2} a {3}:
 DocType: Guardian,Guardian Interests,Guardian Zájmy
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
 DocType: Education Settings,Instructor Records to be created by,"Záznamy instruktorů, které mají být vytvořeny"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvořil
 DocType: GST Account,GST Account,Účet GST
@@ -2374,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Přidáno do Oblíbených
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žádný výplatní list nebyl předložen za výše uvedené kritéria NEBO platový výpis již předložen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Odvody a daně
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žádný výplatní list nebyl předložen za výše uvedené kritéria NEBO platový výpis již předložen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Odvody a daně
 DocType: Projects Settings,Projects Settings,Nastavení projektů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky nelze filtrovat přes {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Strom skupiny položek.
 DocType: Production Plan,Total Produced Qty,Celkový vyrobený počet
 DocType: Payroll Entry,Get Employee Details,Získejte podrobnosti o zaměstnancích
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 DocType: Asset,Sold,Prodáno
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základna Částka (Company měna)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Suroviny
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Suroviny
 DocType: Payment Reconciliation Payment,Reference Row,referenční Row
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účetní detaily
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
 DocType: Patient,O Positive,O pozitivní
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokace
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,K dispozici nejsou žádné splátky pro zápis do deníku
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: BOM,Show In Website,Show pro webové stránky
 DocType: Shopping Cart Settings,Show Quantity in Website,Vykazují množství webových stránek
-DocType: Employee Loan Application,Total Payable Amount,Celková částka Splatné
+DocType: Loan Application,Total Payable Amount,Celková částka Splatné
 DocType: Task,Expected Time (in hours),Předpokládaná doba (v hodinách)
 DocType: Item Reorder,Check in (group),Check in (skupina)
 DocType: Soil Texture,Silt,Silt
@@ -2424,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Zaplatit
 DocType: Room,Room Name,Room Jméno
 DocType: Prescription Duration,Prescription Duration,Doba trvání předpisu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulace Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adresy zákazníků a kontakty
 ,Campaign Efficiency,Efektivita kampaně
@@ -2442,11 +2451,11 @@
 DocType: Chapter,Chapter,Kapitola
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pár
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Výchozí účet bude automaticky aktualizován v POS faktuře při výběru tohoto režimu.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
 DocType: Asset,Depreciation Schedule,Plán odpisy
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy prodejních partnerů a kontakty
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date by měla být v rozmezí Datum od a do dnešního dne
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date by měla být v rozmezí Datum od a do dnešního dne
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Nastavte výchozí cenové centrum ve společnosti {0}.
 DocType: Item,Has Batch No,Má číslo šarže
@@ -2464,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet)
 DocType: Soil Texture,Soil Type,Typ půdy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nová zpráva
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,Kategorie Hubu
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
-DocType: Employee Loan,Loan Amount,Částka půjčky
+DocType: Loan,Loan Amount,Částka půjčky
 DocType: Student Report Generation Tool,Add Letterhead,Přidat hlavičkový papír
 DocType: Program Enrollment,Self-Driving Vehicle,Samohybné vozidlo
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Dodávka tabulky dodavatelů
@@ -2512,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,Pozice
 DocType: Patient,Patient Details,Podrobnosti pacienta
 DocType: Patient,B Positive,B Pozitivní
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportovní
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Celkem Aktuální
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Studentské Sourozenci
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detail plánu předplatného
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Jednotka
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Uveďte prosím, firmu"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Asset Maintenance Task,Maintenance Task,Úloha údržby
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Nastavte prosím B2C Limit v nastavení GST.
@@ -2537,6 +2546,7 @@
 ,BOM Search,Vyhledání kusovníku
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Celkové náklady na spotřebu materiálu (přes vstup zboží)
 DocType: Hub Settings,Company Registered,Společnost je registrovaná
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Datum k datu nemůže být menší než od data
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publikujte &quot;na skladě&quot; nebo &quot;není na skladě&quot; na Hubu na základě skladových zásob dostupných v tomto skladu.
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
 DocType: Email Digest,Pending Sales Orders,Čeká Prodejní objednávky
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 DocType: Employee,Create User Permission,Vytvořit oprávnění uživatele
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Healthcare Settings,Remind Before,Připomenout dříve
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 DocType: Item,Retain Sample,Zachovat vzorek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Řádek {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,výše Rozdíl
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadejte ID zaměstnance z tohoto prodeje osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Ve výrobě
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočtená výpis z bankovního účtu zůstatek
 DocType: Normal Test Template,Normal Test Template,Normální šablona testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Nabídka
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nelze nastavit přijatou RFQ na Žádnou nabídku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Nabídka
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nelze nastavit přijatou RFQ na Žádnou nabídku
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Vyberte účet, který chcete vytisknout v měně účtu"
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To je založeno na transakcích proti tomuto pacientovi. Podrobnosti viz časová osa níže
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Náklady Aktualizováno
 DocType: Patient,Date of Birth,Datum narození
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Bod {0} již byla vrácena
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavení tabulky dodavatelů
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Popis Práce
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Popis Práce
 DocType: Student Applicant,Applied,Aplikovaný
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Znovu otevřít
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Znovu otevřít
 DocType: Sales Invoice Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Jméno Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02 Sleva po prodeji
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
+DocType: Department Approver,Approver,Schvalovatel
 ,SO Qty,SO Množství
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Pole Akcionář nemůže být prázdné
 DocType: Guardian,Work Address,pracovní adresa
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná částka (Company měna)
 DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
 DocType: Grant Application,Email Notification Sent,Zasláno oznámení o e-mailu
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kód položky, sklad, množství je nutné v řádku"
-DocType: Pricing Rule,Supplier,Dodavatel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kód položky, sklad, množství je nutné v řádku"
+DocType: Bank Guarantee,Supplier,Dodavatel
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Zobrazit údaje o platbě
 DocType: Consultation,Consultation Time,Doba konzultace
 DocType: C-Form,Quarter,Čtvrtletí
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Různé výdaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Nad
-DocType: Employee Loan,Employee Loan Account,Zaměstnanec úvěrového účtu
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Počet interakcí
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Hmotnost (v kilogramech)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitoly / název_kapitoly nechte prázdné pole automaticky po uložení kapitoly.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Nastavte prosím účet GST v Nastavení GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Nastavte prosím účet GST v Nastavení GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Typ podnikání
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Náklady na nový nákup
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,Grant Popis
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 DocType: Student Guardian,Others,Ostatní
+DocType: Subscription,Discounts,Slevy
 DocType: Payment Entry,Unallocated Amount,nepřidělené Částka
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Žádné další aktualizace
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Toto pokrývá všechny body, které jsou spojeny s tímto nastavením"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dítě Položka by neměla být produkt Bundle. Odeberte položku `{0}` a uložit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankovnictví
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,servis Položka
 DocType: Bank Guarantee,Bank Guarantee,Bankovní záruka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
 DocType: Bin,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Grading Scale,Grading Scale Intervals,Třídění dílků
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Zisk za rok
+DocType: Bank Guarantee,Name of Bank,Jméno banky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účetní Vstup pro {2} mohou být prováděny pouze v měně: {3}
 DocType: Fee Schedule,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Strom finančních účtů.
+DocType: Bank Guarantee,Reference Document Type,Referenční Typ dokumentu
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapování peněžních toků
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized Zásoby
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail nebyl nalezen ve výchozím kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generovat tajemství
-DocType: Employee Loan,Account Info,Informace o účtu
+DocType: Loan,Account Info,Informace o účtu
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
 DocType: Fees,Include Payment,Zahrnout platbu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentské skupiny byly vytvořeny.
 DocType: Sales Invoice,Total Billing Amount,Celková částka fakturace
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program ve struktuře poplatků a studentské skupině {0} jsou různé.
 DocType: Fee Schedule,Receivable Account,Účet pohledávky
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Prodejní objednávky na platby
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,výkonný ředitel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,výkonný ředitel
 DocType: Purchase Invoice,With Payment of Tax,S platbou daně
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE PRO DODAVATELE
 DocType: Land Unit,Is Container,Je kontejner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Bude to první den cyklu plodin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Prosím, vyberte správný účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Purchase Invoice Item,Weight UOM,Hmotnostní jedn.
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Seznam dostupných akcionářů s čísly folií
 DocType: Salary Structure Employee,Salary Structure Employee,Plat struktura zaměstnanců
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Zobrazit atributy variantu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Zobrazit atributy variantu
 DocType: Student,Blood Group,Krevní Skupina
 DocType: Course,Course Name,Název kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kancelářské Vybavení
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
 DocType: Supplier Scorecard,Scoring Setup,Nastavení bodování
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debetní K je vyžadováno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablony proměnných tabulky dodavatelů dodavatelů.
 DocType: Job Offer Term,Offer Term,Nabídka Term
 DocType: Asset,Quality Manager,Manažer kvality
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Celkové nezaplacené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webové stránky Provoz
 DocType: Supplier Scorecard,Supplier Score,Skóre dodavatele
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Celkové fakturované Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Supplier,Warn RFQs,Upozornění na RFQ
 DocType: BOM,Conversion Rate,Míra konverze
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Hledat výrobek
 DocType: Assessment Plan,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválení role (nad oprávněné hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
+DocType: Loan,Total Amount Paid,Celková částka zaplacena
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vyberte studentský vstup, který je povinný pro žáka placeného studenta"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vyberte ceník pro publikování cen
@@ -2741,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ceník {0} je zakázána
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Řádek {0}: Dokončené Množství nemůže být více než {1} pro provoz {2}
 DocType: Manufacturing Settings,Allow Overtime,Povolit Přesčasy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializovaná položka {0} nemůže být aktualizována pomocí odsouhlasení akcií, použijte prosím položku Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializovaná položka {0} nemůže být aktualizována pomocí odsouhlasení akcií, použijte prosím položku Stock"
 DocType: Training Event Employee,Training Event Employee,Vzdělávání zaměstnanců Event
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximální počet vzorků - {0} lze zadat pro dávky {1} a položku {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Přidat časové úseky
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění
 DocType: Training Event,Advance,Záloha
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pro opětovné opakování.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Nastavení platební brány GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange zisk / ztráta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange zisk / ztráta
 DocType: Opportunity,Lost Reason,Důvod ztráty
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Řádek # {0}: Účet {1} nepatří společnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Řádek # {0}: Účet {1} nepatří společnosti {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nelze najít DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Předplatné bylo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rozpisu poplatků
 DocType: Fee Schedule Program,Student Batch,Student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Udělat Student
@@ -2786,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Navrhnout kategorii?
 DocType: Stock Reconciliation Item,Current Amount,Aktuální výše
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,budovy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,budovy
 DocType: Fee Schedule,Fee Structure,Struktura poplatků
 DocType: Timesheet Detail,Costing Amount,Kalkulace Částka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Student Admission Program,Application Fee,poplatek za podání žádosti
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Odeslat výplatní pásce
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kritéria analýzy zemědělství
+DocType: HR Settings,Leave Approval Notification Template,Ponechat šablonu oznámení o schválení
 DocType: POS Profile,[Select],[Vybrat]
 DocType: Vital Signs,Blood Pressure (diastolic),Krevní tlak (diastolický)
 DocType: SMS Log,Sent To,Odeslána
 DocType: Agriculture Task,Holiday Management,Správa prázdnin
 DocType: Payment Request,Make Sales Invoice,Proveďte prodejní faktuře
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Programy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Programy
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lékař {0} není dostupný v {1}
@@ -2824,7 +2838,7 @@
 DocType: Employee,New Workplace,Nové pracoviště
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Spotřeba materiálu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavit jako Zavřeno
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No Položka s čárovým kódem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No Položka s čárovým kódem {0}
 DocType: Normal Test Items,Require Result Value,Požadovat hodnotu výsledku
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,kusovníky
@@ -2839,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Žádný aktivní nebo implicitní Plat Struktura nalezených pro zaměstnance {0} pro dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Opakující se
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Podrobné informace o šabloně mapování peněžních toků
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Správa úvěrů
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aktualizace nákladů
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Show výplatní pásce
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Show výplatní pásce
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Přenos materiálu
 DocType: Fees,Send Payment Request,Odeslat žádost o platbu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Water Analysis,Origin,Původ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Prosím nastavte opakující se po uložení
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Vybrat změna výše účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Je odpovědnost za dani z příjmu
 DocType: Grading Scale Interval,Grade Description,Grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Earnest Money
 DocType: Sales Invoice, Shipping Bill Number,Přepravní číslo účtu
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledovatelnost
 DocType: Asset Maintenance Log,Actions performed,Akce byly provedeny
 DocType: Cash Flow Mapper,Section Leader,Vedoucí sekce
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaměstnanec
+DocType: Bank Guarantee,Fixed Deposit Number,Číslo pevného vkladu
 DocType: Asset Repair,Failure Date,Datum selhání
 DocType: Sample Collection,Collected Time,Shromážděný čas
 DocType: Company,Sales Monthly History,Měsíční historie prodeje
@@ -2890,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Opravdu chcete tuto schůzku zrušit?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Balíček ceny pokojů hotelu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodejní Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Soubor k přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Načíst aktualizace předplatného
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Účet {0} neodpovídá společnosti {1} v účtu účtu: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Chod:
@@ -2903,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nebyly vytvořeny žádné pracovní příkazy
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Výplatní pásce zaměstnance {0} již vytvořili pro toto období
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 DocType: Purchase Invoice,Credit To,Kredit:
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,Žádná citace
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Vyrovnávací Off
 DocType: Job Offer,Accepted,Přijato
@@ -2933,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Ujistěte se, že opravdu chcete vymazat všechny transakce pro tuto společnost. Vaše kmenová data zůstanou, jak to je. Tuto akci nelze vrátit zpět."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Výsledky vyhledávání
 DocType: Room,Room Number,Číslo pokoje
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Neplatná reference {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Neplatná reference {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 DocType: Journal Entry Account,Payroll Entry,Příspěvek mzdy
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Zobrazení záznamů o poplatcích
@@ -2943,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Lab Test Sample,Lab Test Sample,Laboratorní testovací vzorek
 DocType: Item Variant Settings,Allow Rename Attribute Value,Povolit přejmenování hodnoty atributu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Rychlý vstup Journal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Restaurant,Invoice Series Prefix,Předvolba série faktur
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrace Map Google není povolena
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} není odesláno
+DocType: Subscription,Trialling,Testování
 DocType: Member,Membership Expiry Date,Datum ukončení členství
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} musí být negativní ve vratném dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} musí být negativní ve vratném dokumentu
 ,Minutes to First Response for Issues,Zápisy do první reakce na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Název institutu pro který nastavujete tento systém.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Příležitost
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Příležitost
 DocType: Operation,Default Workstation,Výchozí Workstation
 DocType: Notification Control,Expense Claim Approved Message,Zpráva o schválení úhrady výdajů
 DocType: Payment Entry,Deductions or Loss,Odpočty nebo ztráta
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Nechat bez nároku na odměnu nesouhlasí se schválenými záznamů nechat aplikaci
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
 DocType: Membership,USD,americký dolar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Zůstatek účtu
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Čárový kód {0} není platný kód {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,konec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Driver,Driver,Řidič
 DocType: Vital Signs,Nutrition Values,Výživové hodnoty
 DocType: Lab Test Template,Is billable,Je fakturován
@@ -3029,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Skutečné datum zahájení (přes Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Celková výše zálohy nesmí být vyšší než celková nároková částka
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Celková výše zálohy nesmí být vyšší než celková nároková částka
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Vyberte hodnoty atributů
 DocType: Purchase Invoice,Reason For Issuing document,Důvod pro vydávací dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Skladový pohyb {0} není založen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Skladový pohyb {0} není založen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Následující Kontakt Tím nemůže být stejný jako hlavní e-mailovou adresu
 DocType: Tax Rule,Billing City,Fakturace City
@@ -3101,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,Servisní adresy
 DocType: Asset Maintenance Task,Calibration,Kalibrace
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} je obchodní svátek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Nábytek a svítidla
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Odešlete oznámení o stavu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Nábytek a svítidla
 DocType: Item,Manufacture,Výroba
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Nastavení společnosti
 ,Lab Test Report,Zkušební protokol
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,Plocha pro výsadbu
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Mohlo to být způsobeno některými neplatnými e-mailovými adresami v adresáři
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Přidali jste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Trénink Výsledek
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,Produkty na stránku
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Řádek # {0}: Journal Entry {1} nemá účet {2} nebo již uzavřeno proti jinému poukazu
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kritéria Váha
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Zanechat oznámení o schválení
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Plat Slip na základě časového rozvrhu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rychlost nákupu
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Rychlost nákupu
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Nákupní košík Nastavení
 DocType: Journal Entry,Accounting Entries,Účetní záznamy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Je-li vybráno pravidlo pro stanovení cen, provede se přepínání ceníku. Cenová sazba Pravidlo je konečná sazba, takže by neměla být použita žádná další sleva. Proto v transakcích, jako je Prodejní objednávka, Objednávka apod., Bude vybírána v poli &#39;Cena&#39; namísto &#39;Pole cenových listů&#39;."
+DocType: Journal Entry,Paid Loan,Placený úvěr
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicitní záznam. Zkontrolujte autorizační pravidlo {0}
 DocType: Journal Entry Account,Reference Due Date,Referenční datum splatnosti
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzdy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
 DocType: Patient Service Unit,Parent Service Unit,Rodičovská služba
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Udělat uživatele
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
@@ -3192,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Částka v měně zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Dodávka
 DocType: Volunteer,Weekdays,V pracovní dny
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: Restaurant Menu,Restaurant Menu,Nabídka restaurací
@@ -3200,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Nastavte výchozí inventář pro trvalý inventář
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Nastavte výchozí inventář pro trvalý inventář
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Odeslání e-mailu o revizi grantu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Místní úložiště je plné, nezachránil"
@@ -3208,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapacita místností
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Již existuje záznam pro položku {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Ztratíte záznamy o dříve vygenerovaných fakturách. Opravdu chcete tento odběr restartovat?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registrační poplatek
 DocType: Budget,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
 DocType: Tax Rule,Shipping Country,Země dodání
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Inkognito daně zákazníka z prodejních transakcí
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Změnu skladu je možné provést pouze prostřednictvím Skladového pohybu / dodacím listem / nákupním dokladem
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Vedoucí marketingu a prodeje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Daň z příjmů
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Přejděte na Letterheads
+DocType: Subscription,Cancel At End Of Period,Zrušit na konci období
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nebyly vybrány žádné položky pro přenos
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nebyly vybrány žádné položky pro přenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
 DocType: Vehicle,Electric,Elektrický
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Zisk / ztráta z aktiv likvidaci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Zisk / ztráta z aktiv likvidaci
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Do následující tabulky bude vybrán pouze žadatel o studium se statusem &quot;Schváleno&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"Číslo účtu pro účet {0} není k dispozici. <br> Prosím, nastavte účetní řád správně."
 DocType: Task,Depends on Tasks,Závisí na Úkoly
@@ -3248,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Není skladem
 DocType: Volunteer,Volunteer Skills,Dobrovolnické dovednosti
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Název referenčního dokumentu
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
 apps/erpnext/erpnext/hooks.py +142,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
@@ -3261,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Velké
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Velké
+DocType: Loan,Loan Application,Žádost o půjčku
 DocType: Crop,Scientific Name,Odborný název
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Celkem Listy
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Zvolte znovu, pokud je vybraný kontakt po uložení změněn"
@@ -3270,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Velký
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Velký
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodní Doporučené zboží
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Všechny skupiny Assessment
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Všechny skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Název nového skladu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Celkem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,Poplatky
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Nabídka {0} je zrušena
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Celková dlužná částka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Celková dlužná částka
 DocType: Sales Partner,Targets,Cíle
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Zaregistrujte prosím číslo SIREN v informačním souboru společnosti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Price List,Price List Master,Ceník Master
 DocType: GST Account,CESS Account,Účet CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vyberte pacienta
 DocType: Price List,Applicable for Countries,Pro země
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Název parametru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechte pouze aplikace, které mají status &quot;schváleno&quot; i &quot;Zamítnuto&quot; může být předložena"
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Název skupiny je povinné v řadě {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkty, které mají být uvedeny na internetových stránkách domovské"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
@@ -3352,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktura již vytvořená pro všechny fakturační hodiny
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Název chyba: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Jsou finanční náklady
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nastavte výchozího zákazníka v nastavení restaurace
 ,Salary Register,plat Register
 DocType: Warehouse,Parent Warehouse,Nadřízený sklad
-DocType: C-Form Invoice Detail,Net Total,Net Total
+DocType: Subscription,Net Total,Net Total
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Výchozí kusovník nebyl nalezen pro položku {0} a projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definovat různé typy půjček
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definovat různé typy půjček
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Dlužné částky
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v min)
@@ -3391,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root účet musí být skupina
 DocType: Drug Prescription,Drug Prescription,Předepisování léků
 DocType: Fees,FEE.,POPLATEK.
-DocType: Employee Loan,Repaid/Closed,Splacena / Zavřeno
+DocType: Loan,Repaid/Closed,Splacena / Zavřeno
 DocType: Item,Total Projected Qty,Celková předpokládaná Množství
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Hodnota ocenění nebyla nalezena u položky {0}, která je povinna provést účetní záznamy za {1} {2}. Pokud položka transakce probíhá jako položka s nulovou hodnotou v {1}, uveďte ji v tabulce {1} položky. V opačném případě prosím vytvořte příchozí akciovou transakci pro položku nebo zmiňte ohodnocení v záznamu o položce a zkuste odeslat / zrušit tuto položku"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 DocType: Course,Course Code,Kód předmětu
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: POS Settings,Use POS in Offline Mode,Používejte POS v režimu offline
@@ -3415,16 +3439,15 @@
 DocType: Purchase Invoice,Deemed Export,Považován za export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
-DocType: Subscription,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Lab Test,LabTest Approver,Nástroj LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Již jste hodnotili kritéria hodnocení {}.
 DocType: Vehicle Service,Engine Oil,Motorový olej
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Vytvořené zakázky: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Vytvořené zakázky: {0}
 DocType: Sales Invoice,Sales Team1,Sales Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
-DocType: Employee Loan,Loan Details,půjčka Podrobnosti
+DocType: Loan,Loan Details,půjčka Podrobnosti
 DocType: Company,Default Inventory Account,Výchozí účet inventáře
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Čísla fólií se neodpovídají
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
@@ -3436,19 +3459,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Spojení se všemi pozemními jednotkami, ve kterých rostou"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Řádek # {0}: Nelze vrátit více než {1} pro bodu {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Řádek # {0}: Nelze vrátit více než {1} pro bodu {2}
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,Položka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Cheque Print Template,Primary Settings,primární Nastavení
 DocType: Purchase Invoice,Select Supplier Address,Vybrat Dodavatel Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Přidejte Zaměstnanci
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Přidejte Zaměstnanci
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Malé
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Malé
 DocType: Company,Standard Template,standardní šablona
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
@@ -3468,11 +3491,10 @@
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Antibiotic,Healthcare Administrator,Správce zdravotní péče
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Nastavte cíl
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
 DocType: Dosage Strength,Dosage Strength,Síla dávkování
 DocType: Account,Expense Account,Účtet nákladů
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Barevné
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Barevné
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Datum vypršení platnosti je pro vybranou položku povinné
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zabránit nákupním objednávkám
@@ -3485,18 +3507,18 @@
 DocType: Patient,Personal and Social History,Osobní a sociální historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Uživatel {0} byl vytvořen
 DocType: Fee Schedule,Fee Breakup for each student,Rozdělení poplatků za každého studenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Změnit kód
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Ceníková Měna není zvolena
 DocType: Purchase Invoice,Availed ITC Cess,Využil ITC Cess
 ,Student Monthly Attendance Sheet,Student měsíční návštěvnost Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravidlo plavby platí pouze pro prodej
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Dokud
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentská skupina nebo program je povinný
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Udržovat fakturace hodin a pracovní doby stejný na časový rozvrh
@@ -3516,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Seznamte své produkty nebo služby, které kupujete nebo prodáváte."
 DocType: Water Analysis,Storage Temperature,Skladovací teplota
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštěvnost
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Výzkumník
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Registrace do programu Student Tool
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Datum zahájení by mělo být menší než datum ukončení úkolu {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Jméno nebo e-mail je povinné
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a RFQ tohoto dodavatele by měla být vydána s opatrností.
 DocType: Chapter,Non Profit Manager,Neziskový manažer
 DocType: BOM,Total Cost(Company Currency),Celkové náklady (Company měna)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Pořadové číslo {0} vytvořil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Homepage,Company Description for website homepage,Společnost Popis pro webové stránky domovskou stránku
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Jméno suplier
@@ -3539,11 +3561,10 @@
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Healthcare Settings,Result Printed,Tiskový výsledek
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Zkušební doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Zobrazit {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Zkušební doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Project,Total Costing Amount (via Timesheets),Celková částka kalkulování (prostřednictvím časových lístků)
-DocType: Employee Advance,Expense Approver,Schvalovatel výdajů
+DocType: Department,Expense Approver,Schvalovatel výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
 DocType: Project,Hourly,Hodinově
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-skupiny ke skupině
@@ -3552,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Provést platbu přes Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Vytištěno na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Vytištěno na
 DocType: Item,Inspection Required before Delivery,Inspekce Požadované před porodem
 DocType: Item,Inspection Required before Purchase,Inspekce Požadované před nákupem
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevyřízené Aktivity
@@ -3562,7 +3583,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimální množství pro objednání
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Vaše organizace
 DocType: Fee Component,Fees Category,Kategorie poplatky
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Zadejte zmírnění datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Upozornit zaměstnance
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
@@ -3572,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablony
 DocType: Attendance,Attendance Date,Účast Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Purchase Invoice Item,Accepted Warehouse,Schválený sklad
@@ -3580,10 +3601,11 @@
 DocType: Item,Valuation Method,Metoda ocenění
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Půldenní
 DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Před odesláním zadejte jméno příjemce.
 DocType: Program Enrollment Tool,Get Students,Získat studenty
 DocType: Serial No,Under Warranty,V rámci záruky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Zvolte datum dokončení dokončené opravy
@@ -3602,7 +3624,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Vyhrazeno pro uzavření smlouvy
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
 DocType: Shopping Cart Settings,Orders,Objednávky
-DocType: Employee Leave Approver,Leave Approver,Schvalovatel absenece
+DocType: Department,Leave Approver,Schvalovatel absenece
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vyberte dávku
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Název skupiny Assessment
@@ -3646,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hubová sledovaná položka
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINÁL PRO PŘÍJEMCE
 DocType: Asset Category Account,Accumulated Depreciation Account,Účet oprávek
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tento e-mail je automaticky generován
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Program Enrollment,Boarding Student,Stravující student
 DocType: Asset,Expected Value After Useful Life,Očekávaná hodnota po celou dobu životnosti
@@ -3671,21 +3692,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Účast Record {0} existuje proti Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Odpisy vypadl v důsledku nakládání s majetkem
-DocType: Member,Member,Člen
+DocType: Loan,Member,Člen
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Správa adres
 DocType: Work Order Item,Work Order Item,Položka objednávky
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Zemědělský manažer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
 DocType: Supplier Scorecard Period,Variables,Proměnné
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,Šek Velikost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Pořadové číslo {0} není skladem
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Účet {0} neodpovídá společnosti {1}
@@ -3693,7 +3714,6 @@
 DocType: Stock Settings,Default Stock UOM,Výchozí Skladem UOM
 DocType: Asset,Number of Depreciations Booked,Počet Odpisy rezervováno
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Množství celkem
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Proti zaměstnanců úvěru: {0}
 DocType: Landed Cost Item,Receipt Document,příjem dokumentů
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
@@ -3704,7 +3724,7 @@
 DocType: Asset,Double Declining Balance,Double degresivní
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Uzavřená objednávka nemůže být zrušen. Otevřít zrušit.
 DocType: Student Guardian,Father,Otec
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Aktualizace Sklad"" nemohou být zaškrtnuty na prodej dlouhodobého majetku"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Aktualizace Sklad"" nemohou být zaškrtnuty na prodej dlouhodobého majetku"
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 DocType: Attendance,On Leave,Na odchodu
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
@@ -3718,10 +3738,10 @@
 DocType: Lead,Lower Income,S nižšími příjmy
 DocType: Restaurant Order Entry,Current Order,Aktuální objednávka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Přejděte na položku Programy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Řádek {0} # Přidělená částka {1} nemůže být vyšší než částka, která nebyla požadována. {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Řádek {0} # Přidělená částka {1} nemůže být vyšší než částka, která nebyla požadována. {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
@@ -3744,7 +3764,6 @@
 DocType: Payment Terms Template,Payment Terms,Platební podmínky
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Přejděte na dodavatele
@@ -3763,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Prosím, nastavte ID e-mailu, aby Student odeslal Žádost o platbu"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Prosím, nastavte ID e-mailu, aby Student odeslal Žádost o platbu"
 DocType: Patient,Medical History,Zdravotní historie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Kontokorentní úvěr na účtu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Kontokorentní úvěr na účtu
 DocType: Patient,Patient ID,ID pacienta
 DocType: Physician Schedule,Schedule Name,Název plánu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Vytvořit výplatní pásku
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Přidat všechny dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Přidat všechny dodavatele
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Řádek # {0}: Přidělená částka nesmí být vyšší než zůstatek.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Procházet kusovník
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Zajištěné úvěry
 DocType: Purchase Invoice,Edit Posting Date and Time,Úpravy účtování Datum a čas
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizace účty s ním souvisejících v kategorii Asset {0} nebo {1} Company"
 DocType: Lab Test Groups,Normal Range,Normální vzdálenost
 DocType: Academic Term,Academic Year,Akademický rok
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Dostupné prodeje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Počáteční stav Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Počáteční stav Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Zbývající
 DocType: Appraisal,Appraisal,Ocenění
+DocType: Loan,Loan Account,Úvěrový účet
 DocType: Purchase Invoice,GST Details,Podrobnosti GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mailu zaslaného na dodavatele {0}
 DocType: Item,Default Sales Unit of Measure,Výchozí prodejní jednotka měření
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademický rok:
+DocType: Subscription,Past Due Date,Datum splatnosti
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Neumožňuje nastavit alternativní položku pro položku {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
@@ -3799,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,Setkání pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odhlásit se z tohoto Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Získejte dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Získejte dodavatele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nebyl nalezen pro položku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Přejděte na Kurzy
 DocType: Accounts Settings,Show Inclusive Tax In Print,Zobrazit inkluzivní daň v tisku
@@ -3807,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Zpráva byla odeslána
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Účet s podřízené uzly nelze nastavit jako hlavní knihy
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání&gt; Nastavení vzdělávání"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu zákazníka"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
 DocType: Physician,Physician Schedules,Lékařské plány
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Celková výše zálohy nesmí být vyšší než celková částka sankce
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Celková výše zálohy nesmí být vyšší než celková částka sankce
 DocType: Salary Slip,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
@@ -3828,6 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: BOM,Inspection Required,Kontrola Povinné
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Zadejte číslo bankovní záruky před odesláním.
 DocType: Driving License Category,Class,Třída
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Pracovní příkaz nelze vznést proti šabloně položky
@@ -3838,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání&gt; Nastavení vzdělávání"
 DocType: Serial No,Is Cancelled,Je Zrušeno
 DocType: Student Group,Group Based On,Skupina založená na
 DocType: Journal Entry,Bill Date,Datum účtu
@@ -3849,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,Šek Výška
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Setup Progress,Setup Progress,Pokročilé nastavení
+DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Zkontrolovat vše
 ,Issued Items Against Work Order,Vydávané položky proti pracovní zakázce
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
@@ -3882,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarif Počet
 DocType: Work Order Item,Available Qty at WIP Warehouse,Dostupné množství v WIP skladu
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Plánovaná
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
-DocType: Employee Loan,Employee Loan Application,Zaměstnanec žádost o úvěr
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Nejprve uložit pacienta
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Nejprve uložit pacienta
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Účast byla úspěšně označena.
 DocType: Program Enrollment,Public Transport,Veřejná doprava
 DocType: Soil Texture,Silt Composition (%),Složené složení (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Balance položky (jednoduché)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debit Note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debit Note Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Zadání reverzního deníku
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvořen.
 DocType: Stock Settings,Limit Percent,Limit Procento
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,V současné době žádné skladové zásoby nejsou k dispozici
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Skladový pohyb
 DocType: Payment Entry,Payment References,Platební Reference
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Počet intervalů pro intervalové pole, např. Pokud je interval &quot;Dny&quot; a počet fakturačních intervalů je 3, budou faktury generovány každých 3 dny"
 DocType: Vehicle,Insurance Details,pojištění Podrobnosti
 DocType: Account,Payable,Splatný
 DocType: Share Balance,Share Type,Typ sdílení
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadejte dobu splácení"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Prosím, zadejte dobu splácení"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dlužníci ({0})
 DocType: Pricing Rule,Margin,Marže
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Změňte profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},V jiných řádcích byly nalezeny řádky s duplicitními daty: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},V jiných řádcích byly nalezeny řádky s duplicitními daty: {list}
 DocType: Topic,Topic Name,Název tématu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Prosím nastavte výchozí šablonu pro Notification Notification při nastavení HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Vyberte zaměstnance, chcete-li zaměstnance předem."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Vyberte zaměstnance, chcete-li zaměstnance předem."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vyberte prosím platný datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Vyberte podstatu svého podnikání.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Sdílet knihu
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Byla vytvořena prodejní faktura {0}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,oprávky
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stálé jméno
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
-DocType: Employee Loan Application,Required by Date,Vyžadováno podle data
+DocType: Loan Application,Required by Date,Vyžadováno podle data
 DocType: Lead,Lead Owner,Majitel leadu
 DocType: Production Plan,Sales Orders Detail,Detail prodejních objednávek
 DocType: Bin,Requested Quantity,Požadované množství
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Hrubé mzdy - Total dedukce - splátky
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Aktuální BOM a nový BOM nemůže být stejný
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Plat Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Více variant
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodáno
+DocType: Subscription,Trial Period Start Date,Datum zahájení zkušebního období
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Přihlaste se jako další uživatel.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Jméno člena
 DocType: Stock Settings,Use Naming Series,Používejte sérii pojmenování
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v předplatném
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 DocType: Membership,Payment Details,Platební údaje
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zastavená pracovní objednávka nemůže být zrušena, zrušte její zrušení"
 DocType: Asset,Journal Entry for Scrap,Zápis do deníku do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Pozemní jednotka
 ,Purchase Analytics,Nákup Analytika
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Aktuální faktura {0} chybí
 DocType: Asset Maintenance Log,Task,Úkol
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Zisk / ztráty
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaměstnanců a docházky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Vyplňte formulář a uložte jej
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Aktuální množství na skladě
 DocType: Homepage,"URL for ""All Products""",URL pro &quot;všechny produkty&quot;
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standardní prodejní cena
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 DocType: Cash Flow Mapper,Section Name,Název oddílu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Změna pořadí Množství
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuální pracovní příležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odepsat
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,záleží na
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naladil se na aktualizaci nejnovější ceny ve všech kusovnících. Může to trvat několik minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavateli"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Water Analysis,Appearance,Vzhled
+DocType: HR Settings,Leave Status Notification Template,Ponechat šablonu oznamování stavu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Průměrné Nákupní cena ceníku
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Členové informace.
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nepovoleno. Vypněte testovací šablonu
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Crop Cycle,Linked Land Unit,Propojená pozemní jednotka
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Přejděte na položku Uživatelé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Uhrazená částka + odepsaná částka nesmí být větší než celková částka
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Neplatná hodnota GSTIN nebo Zadejte NA pro neregistrované
 DocType: Training Event,Seminar,Seminář
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program zápisné
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvořte účtový rozvrh založený na
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nelze jej převést na jinou než skupinu. Dětské úkoly existují.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
 ,Stock Ageing,Reklamní Stárnutí
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Existují Student {0} proti uchazeč student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Úprava zaokrouhlení (měna společnosti)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Rozvrh hodin
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Dávka:
 DocType: Volunteer,Afternoon,Odpoledne
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} již existuje
 DocType: Medical Department,Nursing User,Ošetřujícího uživatele
 DocType: Plant Analysis,Plant Analysis Criterias,Kritéria analýzy rostlin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Odpovědnost
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Sériové číslo {0} nepatří do skupiny Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Odpovědnost
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnost této nabídky skončila.
 DocType: Expense Claim Account,Expense Claim Account,Náklady na pojistná Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povolit stávající kurzy měn
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Vytvořte varianty
 DocType: Item,Default BOM,Výchozí BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Celková fakturační částka (prostřednictvím prodejních faktur)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Částka pro debetní poznámku
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Částka pro debetní poznámku
 DocType: Project Update,Not Updated,Neaktualizováno
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Existují nesrovnalosti mezi sazbou, počtem akcií a vypočítanou částkou"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Celkem Vynikající Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
 DocType: Employee Advance,Advance Account,Advance účet
 DocType: Job Offer,Job Offer Terms,Podmínky nabídky práce
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobilový
 DocType: Vehicle,Insurance Company,Pojišťovna
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Proměnná
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Proměnná
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
 DocType: Chapter,Members,Členové
 DocType: Student,Student Email Address,Student E-mailová adresa
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Internovat
 DocType: Delivery Stop,Address Name,adresa Jméno
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Rozdělení {0} jednotek {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Rozdělení {0} jednotek {1}
 DocType: Assessment Code,Assessment Code,Kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
@@ -4233,25 +4260,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 DocType: Bank Reconciliation Detail,Payment Document,platba Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Chyba při vyhodnocování vzorce kritéria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+DocType: Subscription,Plans,Plány
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Vydání Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Při vytváření opakování se vyskytla chyba
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citace
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Žádné studentské skupiny vytvořen.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Měsíční splátka částka nemůže být větší než Výše úvěru
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Měsíční splátka částka nemůže být větší než Výše úvěru
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Řádek # {0}: Očekávaný datum dodání nemůže být před datem objednávky
 DocType: Purchase Invoice,Print Language,Tisk Language
 DocType: Salary Slip,Total Working Hours,Celkové pracovní doby
 DocType: Sales Invoice,Customer PO Details,Podrobnosti PO zákazníka
-DocType: Subscription,Next Schedule Date,Další rozvrh datum
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Účet dočasného zahájení
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Zadejte hodnota musí být kladná
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Žádní zaměstnanci nesplnili uvedená kritéria
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
 DocType: Hotel Settings,Default Customer,Výchozí zákazník
 DocType: Assessment Plan,Supervisor Name,Jméno Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrzujte, zda je událost vytvořena ve stejný den"
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,Zaměstnanec Advance
 DocType: Payroll Entry,Payroll Frequency,Mzdové frekvence
 DocType: Lab Test Template,Sensitivity,Citlivost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Surovina
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Rostliny a strojní vybavení
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Rostliny a strojní vybavení
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodenní práci Souhrnné Nastavení
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Zadejte Reqd podle data
 DocType: Payment Entry,Internal Transfer,vnitřní Převod
 DocType: Asset Maintenance,Maintenance Tasks,Úkoly údržby
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrace
 DocType: Crop Cycle,Detected Disease,Zjištěná nemoc
 ,Produced,Produkoval
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Datum zahájení splacení nemůže být před datem vyplacení.
 DocType: Item,Item Code for Suppliers,Položka Kód pro dodavatele
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
 DocType: Training Event,Trainer Name,Jméno trenér
 DocType: Mode of Payment,General,Obecný
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Poslední komunikace
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Zápas platby fakturami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} v půldenní dovolené na {1}
 DocType: Production Plan,Get Material Request,Získat Materiál Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Poštovní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 ,Item Variant Details,Podrobnosti o variantě položky
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Hodina
 DocType: Restaurant Order Entry,Last Sales Invoice,Poslední prodejní faktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Zvolte prosím množství v položce {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nové seriové číslo nemůže mít záznam skladu. Sklad musí být nastaven přes skladovou kartu nebo nákupní doklad
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nové seriové číslo nemůže mít záznam skladu. Sklad musí být nastaven přes skladovou kartu nebo nákupní doklad
 DocType: Lead,Lead Type,Typ leadu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 DocType: Company,Monthly Sales Target,Měsíční prodejní cíl
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,Výchozí typ požadavku na zásobování
 DocType: Supplier Scorecard,Evaluation Period,Hodnocené období
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Neznámý
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Pracovní příkaz nebyl vytvořen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Pracovní příkaz nebyl vytvořen
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: Purchase Invoice,Export Type,Typ exportu
 DocType: Salary Slip Loan,Salary Slip Loan,Úvěrový půjček
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Otevření souhrnu faktur
 DocType: Education Settings,Education Manager,Správce vzdělávání
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimální délka mezi jednotlivými rostlinami v terénu pro optimální růst
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Doručená položka {0} nemůže být aktualizována s využitím skladového uspokojení, místo toho použijte položku Sklad"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Doručená položka {0} nemůže být aktualizována s využitím skladového uspokojení, místo toho použijte položku Sklad"
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: Student,Middle Name,Prostřední jméno
 DocType: C-Form,Invoices,Faktury
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Příjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Group,Send Emails At,Posílat e-maily At
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Zobrazení formuláře
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Povinnost pojistitele výdajů v nárocích na výdaje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Přidejte uživatele do vaší organizace, kromě vás."
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Zatím žádné zákazníky!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Přehled o peněžních tocích
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Žádná materiálová žádost nebyla vytvořena
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
@@ -4448,11 +4476,12 @@
 DocType: Vehicle,Chassis No,podvozek Žádné
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Plan Item,Planned Start Date,Plánované datum zahájení
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vyberte kusovníku
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vyberte kusovníku
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Využil integrovanou daň z ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
+DocType: Bank Guarantee,Clauses and Conditions,Doložky a podmínky
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Project Task,View Timesheet,Zobrazit časový rozvrh
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Datum ukončení musí být větší než datum zahájení
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,Alkohol Současné použití
 DocType: Student Admission Program,Student Admission Program,Studentský přijímací program
 DocType: Payment Entry,Account Paid To,Účet Věnována
+DocType: Subscription Settings,Grace Period,Doba odkladu
 DocType: Item Alternative,Alternative Item Name,Název alternativní položky
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nepodařilo se odeslat žádnou platební kartu <br> \ Možné důvody: <br> \ 1. Čistá mzda je menší než 0. <br> \ 2. E-mailová adresa společnosti uvedená v kapitole zaměstnanců není platná. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude přesahovat o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Množství
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,a zrušeno Zakázáno v
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Student ID
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,Stížnost
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Zadejte položku vrácení peněz
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Všechny oddělení
 DocType: Patient,Alcohol Past Use,Alkohol v minulosti
 DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problém / Stuck
 DocType: Tax Rule,Billing State,Fakturace State
 DocType: Share Transfer,Transfer,Převod
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Objednávka práce {0} musí být zrušena před zrušením této objednávky
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,Zpráva ukázat
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Maloobchodní
 DocType: Student Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle Product
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nelze najít skóre začínající na {0}. Musíte mít stojící skóre pokrývající 0 až 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
+DocType: Subscription,Current Invoice Start Date,Aktuální datum zahájení faktury
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetní nebo kreditní částku je nutné pro {2}
 DocType: GL Entry,Remarks,Poznámky
@@ -4534,11 +4566,13 @@
 DocType: Task,Parent Task,Rodičovská úloha
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Udělat Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tisk a papírnictví
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Tisk a papírnictví
 DocType: Stock Settings,Show Barcode Field,Show čárového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Poslat Dodavatel e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat již zpracovány pro období mezi {0} a {1}, ponechte dobu použitelnosti nemůže být mezi tomto časovém období."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Poslat Dodavatel e-maily
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat již zpracovány pro období mezi {0} a {1}, ponechte dobu použitelnosti nemůže být mezi tomto časovém období."
+DocType: Fiscal Year,Auto Created,Automaticky vytvořeno
 DocType: Chapter Member,Leave Reason,Nechte důvod
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} již neexistuje
 DocType: Guardian Interest,Guardian Interest,Guardian Zájem
 DocType: Volunteer,Availability,Dostupnost
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Nastavení výchozích hodnot pro POS faktury
@@ -4546,13 +4580,12 @@
 DocType: Project,Time to send,Čas odeslání
 DocType: Timesheet,Employee Detail,Detail zaměstnanec
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
 DocType: Lab Prescription,Test Code,Testovací kód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavení titulní stránce webu
 DocType: Job Offer,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Výše
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Celková částka {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Celková částka {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Neplatný atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Uvedete-li neštandardní splatný účet
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vyberte jinou skupinu hodnocení než skupinu Všechny skupiny
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Řádek {0}: pro položku {1} je požadováno nákladové středisko.
@@ -4563,7 +4596,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analýza vody
 DocType: Chapter,Region,Kraj
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativní ocenění není povoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativní ocenění není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Znovu načtení propojené analýzy
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
@@ -4579,7 +4612,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Náklady na sešrotována aktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
 DocType: Vehicle,Policy No,Ne politika
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Položka získaná ze souboru výrobků
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Položka získaná ze souboru výrobků
 DocType: Asset,Straight Line,Přímka
 DocType: Project User,Project User,projekt Uživatel
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Rozdělit
@@ -4615,21 +4648,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Cesta
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
 DocType: Production Plan,Total Planned Qty,Celkový plánovaný počet
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,otevření Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,otevření Value
 DocType: Salary Detail,Formula,Vzorec
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Šablona zkušebního laboratoře
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Prodejní účet
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Prodejní účet
 DocType: Purchase Invoice Item,Total Weight,Celková váha
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provize z prodeje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Provize z prodeje
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
 DocType: Tax Rule,Billing Country,Fakturace Země
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky restaurace
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
 DocType: Asset Maintenance Task,Assign To Name,Přiřaďte k názvu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Výdaje na reprezentaci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Výdaje na reprezentaci
 DocType: Hub Settings,Enabled Users,Uživatelé povoleni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Udělat Materiál Request
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Otevřít položku {0}
@@ -4642,24 +4675,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Žádosti o dovolenou.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Poslední Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Výdaje na právní služby
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Výdaje na právní služby
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vyberte množství v řadě
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Udělat počáteční prodejní a nákupní faktury
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturované částky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonní Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Položka s Serial č {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Položka s Serial č {0}
 DocType: Email Digest,Open Notifications,Otevřené Oznámení
 DocType: Payment Entry,Difference Amount (Company Currency),Rozdíl Částka (Company měna)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Přímé náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Přímé náklady
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cestovní výdaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Přidání vlastního pole Subscription do doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Purchase Receipt Item,Sample Quantity,Množství vzorku
+DocType: Bank Guarantee,Name of Beneficiary,Název příjemce
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualizujte náklady na BOM automaticky pomocí programu Plánovač, založený na nejnovější hodnotící sazbě / ceníku / posledním nákupu surovin."
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
@@ -4671,14 +4704,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Celkem uhrazené částky
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Celkem uhrazené částky
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigace
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Plánování
 DocType: Share Balance,Issued,Vydáno
+DocType: Loan,Repayment Start Date,Datum zahájení splacení
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentská aktivita
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platební brána Podrobnosti
@@ -4691,10 +4725,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Prosím nastavit výchozí účet v Expense reklamační typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Prosím nastavit výchozí účet v Expense reklamační typu {0}
 DocType: Assessment Result,Student Name,Jméno studenta
 DocType: Brand,Item Manager,Manažer Položka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Mzdové Splatné
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Mzdové Splatné
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Plant Analysis,Collection Datetime,Čas odběru
 DocType: Work Order,Total Operating Cost,Celkové provozní náklady
@@ -4704,9 +4738,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uživatel: {0} neexistuje
 DocType: Payment Term,Day(s) after invoice date,Den (dní) po datu faktury
 DocType: Payment Schedule,Payment Schedule,Platební kalendář
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Platba Entry již existuje
+DocType: Subscription,Trial Period End Date,Datum ukončení zkušebního období
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologie
@@ -4723,9 +4757,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromaděné za měsíc
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
@@ -4734,14 +4768,15 @@
 DocType: Lab Prescription,Test Created,Test byl vytvořen
 DocType: Healthcare Settings,Custom Signature in Print,Vlastní podpis v tisku
 DocType: Account,Temporary,Dočasný
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Zákaznické číslo LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Zákaznické číslo LPO
 DocType: Program,Courses,předměty
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretářka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokud zakázat, &quot;ve slovech&quot; poli nebude viditelný v jakékoli transakce"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Tato akce zastaví budoucí fakturaci. Opravdu chcete zrušit tento odběr?
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Supplier Scorecard Criteria,Criteria Name,Název kritéria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Nastavte společnost
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Nastavte společnost
 DocType: Pricing Rule,Buying,Nákupy
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Nemoci a hnojiva
 DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
@@ -4750,17 +4785,17 @@
 DocType: POS Profile,Apply Discount On,Použít Sleva na
 DocType: Member,Membership Type,Typ členství
 ,Reqd By Date,Př p Podle data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Věřitelé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Věřitelé
 DocType: Assessment Plan,Assessment Name,Název Assessment
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Zobrazit PDC v tisku
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Zobrazit PDC v tisku
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Řádek # {0}: Výrobní číslo je povinné
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Nabídka práce
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,institut Zkratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Množství ({0}) nemůže být zlomek v řádku {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Množství ({0}) nemůže být zlomek v řádku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
@@ -4778,7 +4813,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Makléřská
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Účast na zaměstnance {0} je již označen pro tento den
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Účast na zaměstnance {0} je již označen pro tento den
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
  aktualizovat přes ""Time Log"""
@@ -4790,6 +4825,7 @@
 DocType: Lab Test,Approved Date,Datum schválení
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+DocType: Subscriber,Subscriber Name,Jméno účastníka
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Update Tool,Replace,Vyměnit
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nenašli se žádné produkty.
@@ -4799,19 +4835,18 @@
 DocType: Request for Quotation Item,Project Name,Název projektu
 DocType: Customer,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Vyberte účet úrokového výnosu v zaměstnaneckém úvěru {0}
 DocType: Work Order,Required Items,Povinné předměty
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Lidské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 DocType: Disease,Treatment Task,Úloha léčby
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Daňové Aktiva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,Číslo kusovníku
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Update Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronická zařízení
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronická zařízení
 DocType: Asset,Maintenance Required,Nutná údržba
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Dovolené musí být přiděleny v násobcích 0,5"
@@ -4820,7 +4855,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Vynikající Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Řádek # {0}: Prostředek je povinné pro dlouhodobého majetku nákupu / prodeji
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Řádek # {0}: Prostředek je povinné pro dlouhodobého majetku nákupu / prodeji
 DocType: Asset Maintenance Team,Maintenance Team Name,Název týmu údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Zákazník je povinný, pokud je vybrán jako příležitost zákazník &#39;Příležitost od&#39;"
@@ -4829,19 +4864,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Druhy výdajů nároku.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Prodejní cena pro položku {0} je nižší než její {1}. Míra prodeje by měla být nejméně {2}
-DocType: Item,Taxes,Daně
+DocType: Subscription,Taxes,Daně
 DocType: Purchase Invoice,capital goods,investiční majetek
 DocType: Purchase Invoice Item,Weight Per Unit,Hmotnost na jednotku
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Uhrazené a nedoručené
 DocType: Project,Default Cost Center,Výchozí Center Náklady
-DocType: Bank Guarantee,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Sklad Transakce
 DocType: Budget,Budget Accounts,rozpočtové účty
 DocType: Employee,Internal Work History,Vnitřní práce History
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Oprávky Částka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variabilní ukazatel ukazatele dodavatele
-DocType: Employee Loan,Fully Disbursed,zcela vyčerpán
 DocType: Employee Advance,Due Advance Amount,Splatná částka předem
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
@@ -4865,7 +4898,7 @@
 ,Employee Information,Informace o zaměstnanci
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Výchozí daňové šablony pro prodej a nákup jsou vytvořeny.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Výsledky hodnocení {0} již existuje.
@@ -4873,7 +4906,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavte filtr společnosti prázdný, pokud je Skupina By je &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Vysílání datum nemůže být budoucí datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pro generování opakování
 DocType: Stock Entry,Target Warehouse Address,Cílová adresa skladu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Den konce
@@ -4898,11 +4930,10 @@
 DocType: Material Request,% Ordered,% objednáno
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Pro kurzovou studentskou skupinu bude kurz pro každého studenta ověřen z přihlášených kurzů při zápisu do programu.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Share Balance,From No,Od č
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nová zpráva od {odesílatele}
 DocType: Customer,Customer Primary Address,Primární adresa zákazníka
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Zpravodaje
 DocType: Drug Prescription,Description/Strength,Popis / Pevnost
@@ -4911,22 +4942,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Stejný bod byl zadán vícekrát
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Purchase Invoice,Tax ID,DIČ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavení účtu
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Schvalovat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformátovaná adresa pro {0}, opravte prosím a pokračujte."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformátovaná adresa pro {0}, opravte prosím a pokračujte."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",Číslo nového účtu bude do názvu účtu zahrnuto jako předčíslí
 DocType: Maintenance Team Member,Team Member,Člen týmu
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Žádný výsledek k odeslání
 DocType: Customer,Sales Partner and Commission,Prodej Partner a Komise
-DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sazba (%) / rok
+DocType: Loan,Rate of Interest (%) / Year,Úroková sazba (%) / rok
 ,Project Quantity,projekt Množství
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotek {1} zapotřebí {2} pro dokončení této transakce.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sazba (%) Roční
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Černá
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Dočasné Účty
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Černá
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Shareholder,Contact List,Seznam kontaktů
 DocType: Account,Auditor,Auditor
@@ -4934,16 +4965,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} předměty vyrobené
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Další informace
 DocType: Cheque Print Template,Distance from top edge,Vzdálenost od horního okraje
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Ceníková cena {0} je zakázáno nebo neexistuje
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Ceníková cena {0} je zakázáno nebo neexistuje
 DocType: Purchase Invoice,Return,Zpáteční
 DocType: Pricing Rule,Disable,Zakázat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Způsob platby je povinen provést platbu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Způsob platby je povinen provést platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Upravte celou stránku pro další možnosti, jako jsou majetek, sériový nos, šarže atd."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Setkání a konzultace
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} není zapsána v dávce {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aktiva {0} nemůže být vyhozen, jak je tomu již {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Potřebné kontroly
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Potřebné kontroly
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Nepodařilo se nastavit firmu
@@ -4955,7 +4986,7 @@
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatek Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Přidat položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Přidat položky z
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Plodiny a půdy
 DocType: Cheque Print Template,Regular,Pravidelný
 DocType: Fertilizer,Density (if liquid),Hustota (pokud je kapalina)
@@ -4980,24 +5011,26 @@
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Prozkoumejte prodejní cyklus
 DocType: Assessment Plan,Supervisor,Dozorce
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 ,Work Order Stock Report,Zpráva o stavu pracovní smlouvy
+DocType: Purchase Receipt,Auto Repeat Detail,Auto opakovat detail
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledek
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Jako školitel
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Navrhněte kategorii
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Předložené objednávky nelze smazat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Řízení kvality
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} byl zakázán
 DocType: Project,Total Billable Amount (via Timesheets),Celková fakturační částka (prostřednictvím časových lístků)
 DocType: Agriculture Task,Previous Business Day,Předchozí pracovní den
-DocType: Employee Loan,Repay Fixed Amount per Period,Splatit pevná částka na období
+DocType: Loan,Repay Fixed Amount per Period,Splatit pevná částka na období
 DocType: Employee,Health Insurance No,Zdravotní pojištění č
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Úvěrová poznámka Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Úvěrová poznámka Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Celková zdanitelná částka
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Opening Invoice Creation Tool,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Zůstatek Množství
@@ -5008,15 +5041,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pro {1}
 DocType: Healthcare Settings,Valid number of days,Platný počet dnů
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Nákladové středisko
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Restartujte předplatné
 DocType: Land Unit,Linked Plant Analysis,Analýza propojených rostlin
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povolit nulovou míru oceňování
+DocType: Bank Guarantee,Receiving,Příjem
 DocType: Training Event Employee,Invited,Pozván
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Více aktivní Plat Structures nalezených pro zaměstnance {0} pro dané termíny
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Nastavení brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Dlouhodobý majetek
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange zisk / ztráta
 ,GST Purchase Register,GST Nákupní registr
 ,Cash Flow,Tok peněz
@@ -5036,9 +5071,10 @@
 DocType: Academic Term,Term Start Date,Termín Datum zahájení
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Seznam všech transakcí s akciemi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Musí být nastaven datum zahájení zkušebního období a datum ukončení zkušebního období
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Průměrné hodnocení
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková částka platby v rozpisu plateb se musí rovnat hodnotě Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková částka platby v rozpisu plateb se musí rovnat hodnotě Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Plán
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -5068,6 +5104,7 @@
 DocType: Work Order,Warehouses,Sklady
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktivum nemůže být převedeno
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ceny pokojů v hotelu
+DocType: Subscription,Days Until Due,Dny do splatnosti
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Tato položka je variantou {0} (šablony).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nákup
@@ -5076,13 +5113,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Pro dávkovou studentskou skupinu bude studentská dávka ověřena pro každého studenta ze zápisu do programu.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribuce
+DocType: Journal Entry Account,Loan,Půjčka
 DocType: Expense Claim Advance,Expense Claim Advance,Nároky na úhradu nákladů
 DocType: Lab Test,Report Preference,Předvolba reportu
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informace o dobrovolnictví.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Citoval Položka Porovnání
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Překrývající bodování mezi {0} a {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Čistá hodnota aktiv i na
 DocType: Crop,Produce,Vyrobit
@@ -5092,7 +5130,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Spotřeba materiálu pro výrobu
 DocType: Item Alternative,Alternative Item Code,Alternativní kód položky
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Vyberte položky do Výroba
 DocType: Delivery Stop,Delivery Stop,Zastávka doručení
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
 DocType: Item,Material Issue,Material Issue
@@ -5102,15 +5140,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Zobrazit položky
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemůže být větší než na čas.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Chcete upozornit všechny zákazníky e-mailem?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Chcete upozornit všechny zákazníky e-mailem?
+DocType: Subscription Plan,Billing Interval,Interval fakturace
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Životopis
 DocType: Hub Settings,Hub Username,Uživatelské jméno Hubu
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotící kritéria Group
 DocType: Healthcare Settings,Patient Name By,Jméno pacienta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Záznam o akruálním deníku pro platy od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Záznam o akruálním deníku pro platy od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -5124,22 +5162,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde můžete upravovat svou výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pro firmy
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože existuje skladový záznam {0}"
-DocType: Employee Loan,Disbursement Date,výplata Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Příjemci&quot; nejsou specifikováni
+DocType: Loan,Disbursement Date,výplata Datum
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualizujte nejnovější cenu všech kusovníků
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Zdravotní záznam
 DocType: Vehicle,Vehicle,Vozidlo
 DocType: Purchase Invoice,In Words,Slovy
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Před zasláním zadejte název banky nebo instituce poskytující úvěr.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musí být odesláno
 DocType: POS Profile,Item Groups,Položka Skupiny
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Sales Order Item,For Production,Pro Výrobu
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Přidejte účet dočasného otevírání do Účtovacího plánu
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Přidejte účet dočasného otevírání do Účtovacího plánu
 DocType: Customer,Customer Primary Contact,Primární kontakt zákazníka
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Časopis uzavírání období
 DocType: Project Task,View Task,Zobrazit Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
+DocType: Bank Guarantee,Bank Guarantee Type,Typ bankovní záruky
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fakturační část
 ,Asset Depreciations and Balances,Asset Odpisy a zůstatků
@@ -5150,9 +5189,8 @@
 DocType: Production Plan,Include Subcontracted Items,Zahrnout subdodávané položky
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Připojit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Vlastnosti Variantu nelze změnit po přemístění zásob. Budete muset vytvořit novou položku, abyste to udělali."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
-DocType: Employee Loan,Repay from Salary,Splatit z platu
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+DocType: Loan,Repay from Salary,Splatit z platu
 DocType: Leave Application,LAP/,ÚSEK/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Požadovala vyplacení proti {0} {1} na částku {2}
 DocType: Salary Slip,Salary Slip,Výplatní páska
@@ -5176,11 +5214,11 @@
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicitní skupinu položek uvedeny v tabulce na položku ve skupině
 DocType: Land Unit,Parent Land Unit,Rodičovská jednotka
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
 DocType: Fertilizer,Fertilizer Name,Jméno hnojiva
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Cash Flow Mapping Accounts,Account,Účet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
 DocType: Expense Claim,Vehicle Log,jízd
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Přítomnost horečky (teplota&gt; 38,5 ° C nebo trvalá teplota&gt; 38 ° C / 100,4 ° F)"
@@ -5221,24 +5259,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
 DocType: Asset Maintenance,Manufacturing User,Výroba Uživatel
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
-DocType: C-Form,Series,Série
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Měna ceníku {0} musí být {1} nebo {2}
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Položka Klasifikace
 DocType: Driver,License Number,Číslo licence
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Fakturační registrace pacienta
 DocType: Crop,Period,Období
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Hlavní Účetní Kniha
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaměstnanec {0} jsou na dovolené z {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zaměstnanec {0} jsou na dovolené z {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobrazit Vodítka
 DocType: Program Enrollment Tool,New Program,nový program
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Prosím, nejprve vyberte {0}"
 DocType: Appointment Type,Physician,Lékař
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Šarže {0} položky {1} vypršela.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konzultace
@@ -5246,15 +5283,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nemůže být větší než plánované množství ({2}) v pracovní objednávce {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas list pro výrobu.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,mezisoučet
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Vlastnosti Variantu nelze změnit po transakci akcií. Budete muset vytvořit novou položku, abyste to udělali."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA mandát
 DocType: Physician,Charges,Poplatky
 DocType: Production Plan,Get Items For Work Order,Získat položky pro pracovní objednávku
 DocType: Salary Detail,Default Amount,Výchozí částka
 DocType: Lab Test Template,Descriptive,Popisný
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Sklad nebyl nalezen v systému
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tento měsíc je shrnutí
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Nastavte cíl prodeje, který byste chtěli dosáhnout pro vaši společnost."
 ,Project wise Stock Tracking,Sledování zboží dle projektu
@@ -5282,11 +5320,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Nepodařilo se vytvořit webové stránky
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Záznam již vytvořeného záznamu o skladování nebo neposkytnuté množství vzorku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Záznam již vytvořeného záznamu o skladování nebo neposkytnuté množství vzorku
 DocType: Program,Program Abbreviation,Program Zkratka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
-DocType: Bank Guarantee,Start Date,Datum zahájení
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávně vymazány
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -5301,11 +5338,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
 DocType: Purchase Invoice,04-Correction in Invoice,04 - oprava faktury
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Pracovní zakázka již vytvořena pro všechny položky s kusovníkem
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Pracovní zakázka již vytvořena pro všechny položky s kusovníkem
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Zpráva Variant Podrobnosti
 DocType: Setup Progress Action,Setup Progress Action,Pokročilé nastavení
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Nákupní ceník
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Nákupní ceník
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Zrušit předplatné
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Zvolte Stav údržby jako Dokončené nebo odeberte datum dokončení
 DocType: Supplier,Default Payment Terms Template,Výchozí šablony platebních podmínek
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Měna transakce musí být stejná jako platební brána měnu
@@ -5316,7 +5354,6 @@
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akční pokud souhrnné měsíční rozpočet překročen
-DocType: Subscription,Submit on creation,Předložení návrhu na vytvoření
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Měna pro {0} musí být {1}
 DocType: Asset,Disposal Date,Likvidace Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budou zaslány všem aktivním zaměstnancům společnosti v danou hodinu, pokud nemají dovolenou. Shrnutí odpovědí budou zaslány do půlnoci."
@@ -5334,6 +5371,7 @@
 DocType: Batch,Parent Batch,Nadřazená dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablony tisku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Počet dní po uplynutí data fakturace před zrušením předplatného nebo označením předplatného jako nezaplaceného
 DocType: Lab Test Template,Sample Collection,Kolekce vzorků
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
 DocType: Price List,Price List Name,Ceník Jméno
@@ -5342,7 +5380,7 @@
 DocType: Account,Income,Příjem
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 DocType: Supplier Scorecard Scoring Criteria,Score,Skóre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskální rok {0} neexistuje
@@ -5362,12 +5400,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} by měla být hodnota mezi 0 a 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Další datum odpisování nemůže být před datem k dispozici
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maximální pracovní doba proti časového rozvrhu
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Celkem uhrazeno Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Obdrženo a přijato
 DocType: Hub Settings,Company and Seller Profile,Profil společnosti a prodávajícího
@@ -5381,10 +5419,9 @@
 DocType: Item,Variant Based On,Varianta založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vaši Dodavatelé
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Opravte prosím
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žádný dodavatel Part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonymní
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Přijaté Od
 DocType: Lead,Converted,Převedené
@@ -5398,6 +5435,7 @@
 DocType: Asset,Assets,Aktiva
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
+DocType: Subscription,Current Invoice End Date,Aktuální datum ukončení faktury
 DocType: Payment Term,Due Date Based On,Datum splatnosti založeno na
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Nastavte výchozí skupinu zákazníků a území v nastavení prodeje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} neexistuje
@@ -5405,7 +5443,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nebudou vybrány žádné splátky pro deník
 DocType: Payment Reconciliation,From Invoice Date,Z faktury Datum
+DocType: Loan,Disbursed,Vyčerpáno
 DocType: Healthcare Settings,Laboratory Settings,Laboratorní nastavení
 DocType: Patient Appointment,Service Unit,Servisní jednotka
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Úspěšně nastavit dodavatele
@@ -5418,12 +5458,12 @@
 DocType: Share Balance,No of Shares,Počet akcií
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Vyberte možnost Stav
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Jméno dům
 DocType: Fee Schedule,Total Amount per Student,Celková částka na jednoho studenta
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrický
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Přidejte zbytek vaší organizace jako uživatele. Můžete také přidat pozvat zákazníky na portálu tím, že přidáním z Kontaktů"
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 DocType: Grant Application,Requested Amount,Požadovaná částka
@@ -5433,7 +5473,7 @@
 DocType: Crop Cycle,Detected Diseases,Zjištěné nemoci
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdrojový sklad
 DocType: Item,Customer Code,Code zákazníků
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Narozeninová připomínka pro {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 DocType: Asset Maintenance Task,Last Completion Date,Poslední datum dokončení
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
@@ -5441,9 +5481,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Nastavení GoCardless
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Stock Aktiva
 DocType: Restaurant,Active Menu,Aktivní nabídka
 DocType: Target Detail,Target Qty,Target Množství
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Proti půjčce: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Pokladna Nastavení
 DocType: Student Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
@@ -5452,9 +5493,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo ujetých kilometrů
 DocType: Production Plan Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
 DocType: Chapter,Chapter Head,Hlava kapitoly
 DocType: Payment Term,Month(s) after the end of the invoice month,Měsíc (měsíce) po skončení měsíce faktury
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektová činnost / úkol.
@@ -5462,11 +5503,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Výsledek datového laboratoře nemůže být před datem testování
 DocType: POS Profile,Allow user to edit Discount,Umožnit uživateli upravit slevu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Získejte zákazníky z
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Získejte zákazníky z
 DocType: Purchase Invoice Item,Include Exploded Items,Zahrnout výbušné položky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: Shipping Rule,Restrict to Countries,Omezte na země
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hodiny
 DocType: Project,Total Sales Amount (via Sales Order),Celková částka prodeje (prostřednictvím objednávky prodeje)
@@ -5483,6 +5525,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Správce hodnocení
 DocType: Payment Entry,Allocate Payment Amount,Přidělit částku platby
+DocType: Subscription Plan,Subscription Plan,Plán předplatného
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
@@ -5508,9 +5551,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Síla
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalace předvoleb
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Pro zákazníka nebyl vybrán žádný zákazník {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Pro zákazníka nebyl vybrán žádný zákazník {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM nahradil
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Vyberte položky podle data doručení
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Vyberte položky podle data doručení
 DocType: Grant Application,Has any past Grant Record,Má nějaký minulý grantový záznam
 ,Sales Analytics,Prodejní Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},K dispozici {0}
@@ -5528,7 +5571,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervace pokojů v hotelu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Služby zákazníkům
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Nabídka kandidát Job.
@@ -5544,7 +5587,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studenti byli zapsáni
 DocType: Fees,Student Details,Podrobnosti studenta
 DocType: Purchase Invoice Item,Stock Qty,Množství zásob
-DocType: Employee Loan,Repayment Period in Months,Splácení doba v měsících
+DocType: Loan,Repayment Period in Months,Splácení doba v měsících
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Chyba: Není platný id?
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
@@ -5553,7 +5596,7 @@
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
 DocType: Timesheet,Work Detail,Detail práce
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inženýr
 DocType: Journal Entry,Total Amount Currency,Celková částka Měna
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhledávání Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
@@ -5598,13 +5641,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informace o typu dárce.
 DocType: Request for Quotation,Supplier Detail,dodavatel Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Chyba ve vzorci nebo stavu: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturovaná částka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturovaná částka
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritéria váhy musí obsahovat až 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Účast
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,sklade
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Vytváření {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cílové skladů nemohou být stejné
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
@@ -5628,14 +5670,14 @@
 DocType: Shipping Rule,Fixed,Pevný
 DocType: Vehicle Service,Clutch Plate,Kotouč spojky
 DocType: Company,Round Off Account,Zaokrouhlovací účet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-DocType: Journal Entry,Subscription,Předplatné
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Předplatné
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Vytváření poplatků čeká
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Výpovědní Lhůta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Výpovědní Lhůta
 DocType: Asset Category,Asset Category Name,Asset název kategorie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jméno Nová Sales Osoba
@@ -5648,7 +5690,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechte nekontrolované, pokud nechcete dávat pozor na dávku při sestavování kurzových skupin."
 DocType: Asset,Frequency of Depreciation (Months),Frekvence odpisy (měsíce)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Úvěrový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
@@ -5656,7 +5698,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
 DocType: Hub Settings,Company Logo,Logo společnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí sklad
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 DocType: Healthcare Settings,Patient Registration,Registrace pacienta
@@ -5690,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,Celkem Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí sklad hotových výrobků
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Vyberte pacienta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodej Osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodej Osoba
 DocType: Hotel Room Package,Amenities,Vybavení
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Rozpočet a nákladového střediska
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Vícenásobný výchozí způsob platby není povolen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pro
 ,Appointment Analytics,Aplikace Analytics
 DocType: Vehicle Service,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -5710,6 +5751,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Nechte prázdné, pokud rodíte studentské skupiny ročně"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikace s použitím aktuálního klíče nebudou mít přístup, jste si jisti?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Total Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Změnit kód šablony
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termínovaný Datum ukončení nesmí být starší než Počáteční datum doby platnosti. Opravte data a zkuste to znovu.
@@ -5720,8 +5762,9 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 DocType: Cheque Print Template,Signatory Position,Signatář Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Nastavit jako Lost
 DocType: Timesheet,Total Billable Hours,Celkem zúčtovatelné hodiny
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Počet dní, které musí účastník platit faktury generované tímto odběrem"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplacení Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To je založeno na transakcích proti tomuto zákazníkovi. Viz časovou osu níže podrobnosti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Řádek {0}: Přidělená částka {1} musí být menší než nebo se rovná částce zaplacení výstavního {2}
@@ -5740,12 +5783,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Společnost info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Vyberte nebo přidání nového zákazníka
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založeno na účasti základu tohoto zaměstnance
 DocType: Assessment Result,Summary,souhrn
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Označit účast
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debetní účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debetní účet
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Položka objednávky restaurace
@@ -5757,7 +5800,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Částka nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Zaměstnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Zaměstnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Work Order,Manufactured Qty,Vyrobeno Množství
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcie neexistují s {0}
@@ -5765,12 +5808,12 @@
 DocType: Asset,Out of Order,Mimo provoz
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorovat překrytí pracovní stanice
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo {1} Company
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo {1} Company
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Zvolte čísla šarží
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
 DocType: Patient Service Unit,Medical Administrator,Lékařský administrátor
 DocType: Assessment Plan,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
@@ -5800,15 +5843,16 @@
 DocType: Asset Repair,Repair Status,Stav opravy
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
 DocType: POS Profile,Account for Change Amount,Účet pro změnu Částka
 DocType: Purchase Invoice,input service,vstupní službu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Člen týmu údržby
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analýza půd
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kód předmětu:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -5856,19 +5900,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Přijímací řízení pro {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Název proměnné
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
 DocType: Asset,Asset Category,Asset Kategorie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net plat nemůže být záporný
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiál Dodavateli
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Plánování požadavků na materiál
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Spotřební Faktura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Práh {0}% objeví více než jednou
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštěvnost
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Krátkodobé závazky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Krátkodobé závazky
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Časovač překročil danou dobu.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Patient,A Positive,Pozitivní
@@ -5879,9 +5923,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a objednávky na nákup tohoto dodavatele by měly být vydány s opatrností.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tým pro údržbu aktiv
-DocType: Employee Loan,Loan Type,Typ úvěru
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} byla úspěšně odeslána
+DocType: Loan,Loan Type,Typ úvěru
 DocType: Scheduling Tool,Scheduling Tool,Plánování Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka k výrobě nebo zabalení
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
@@ -5913,7 +5958,7 @@
 DocType: Item,Units of Measure,Jednotky měření
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Invoice,Customer's Purchase Order Date,Zákazníka Objednávka Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Základní kapitál
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Základní kapitál
 DocType: Shopping Cart Settings,Show Public Attachments,Zobrazit veřejné přílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Restaurant Reservation,Reservation Time,Čas rezervace
@@ -5928,7 +5973,7 @@
 DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Řádek # {0}: Reqd by Date nemůže být před datem transakce
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,představované výrobky
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
@@ -5938,20 +5983,20 @@
 DocType: Driver,Expiry Date,Datum vypršení platnosti
 DocType: Healthcare Settings,Employee name and designation in print,Jméno a označení zaměstnance v tisku
 ,accounts-browser,Účty-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Nejdřív vyberte kategorii
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Chcete-li povolit over-fakturaci nebo over-objednávání, aktualizujte &quot;příspěvek&quot; v Nastavení skladem, nebo výtisku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(půlden)
 DocType: Payment Term,Credit Days,Úvěrové dny
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Vyberte Patient pro získání laboratorních testů
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Udělat Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Položka získaná z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Položka získaná z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Dodací lhůta dny
 DocType: Cash Flow Mapping,Is Income Tax Expense,Jsou náklady na daň z příjmů
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Zkontrolujte, zda student bydlí v Hostelu ústavu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
 ,Stock Summary,Sklad Souhrn
@@ -5962,10 +6007,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Provozní náklady (Company měna)
-DocType: Employee Loan Application,Rate of Interest,Úroková sazba
+DocType: Loan Application,Rate of Interest,Úroková sazba
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: Item,Shelf Life In Days,Životnost v dnech
 DocType: GL Entry,Is Opening,Se otevírá
+DocType: Department,Expense Approvers,Odpůrci výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
 DocType: Journal Entry,Subscription Section,Sekce odběru
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Účet {0} neexistuje
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 10fc8f5..3d3b739 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,12 +1,12 @@
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Åbning'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Åbning'
 DocType: Lead,Lead,Bly
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
 DocType: Timesheet,% Amount Billed,% Beløb Billed
 DocType: Purchase Order,% Billed,% Billed
 ,Lead Id,Bly Id
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Total'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Total'
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selling Beløb
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
@@ -16,7 +16,7 @@
 DocType: Lead,Lead Owner,Bly Owner
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,o
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index ac5f132..223353d 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Evalueringsrapporter
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Forbrugerprodukter
-DocType: Purchase Receipt,Subscription Detail,Abonnementsdetaljer
 DocType: Supplier Scorecard,Notify Supplier,Underret Leverandør
 DocType: Item,Customer Items,Kundevarer
 DocType: Project,Costing and Billing,Omkostningsberegning og fakturering
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail-meddelelser
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Evaluering
 DocType: Item,Default Unit of Measure,Standard Måleenhed
 DocType: SMS Center,All Sales Partner Contact,Alle forhandlerkontakter
-DocType: Employee,Leave Approvers,Fraværsgodkendere
+DocType: Department,Leave Approvers,Fraværsgodkendere
 DocType: Sales Partner,Dealer,Forhandler
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Undersøgelser
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Tjek tilgængelighed
 DocType: Job Applicant,Job Applicant,Ansøger
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner for denne leverandør. Se tidslinje nedenfor for detaljer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juridisk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i vare sats i række {0}"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juridisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i vare sats i række {0}"
 DocType: Bank Guarantee,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
 DocType: Delivery Note,Return Against Delivery Note,Retur mod følgeseddel
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Der er ikke indgivet lønlister til behandling.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Der er ikke indgivet lønlister til behandling.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Fraværstypenavn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åben
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det er nødvendigt at tage denne handling i dag selv for ovennævnte tilbagevendende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Nummerserien opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,bestilling
 DocType: Pricing Rule,Apply On,Gælder for
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
 DocType: Support Settings,Support Settings,Support Indstillinger
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Forventet slutdato kan ikke være mindre end forventet startdato
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Ny fraværsanmodning
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Partivare-udløbsstatus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Draft
 DocType: Membership,membership validaty section,medlemskab validaty sektion
 DocType: Mode of Payment Account,Mode of Payment Account,Betalingsmådekonto
 DocType: Consultation,Consultation,Konsultation
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Gør hjemmeside
 DocType: Opening Invoice Creation Tool Item,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Regnskab tabel kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Lån (passiver)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Regnskab tabel kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
 DocType: Item,Country of Origin,Oprindelsesland
 DocType: Soil Texture,Soil Texture Criteria,Kriterier for jordstruktur
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primær kontaktoplysninger
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Åbne spørgsmål
 DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
 DocType: Lab Test Groups,Add new line,Tilføj ny linje
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dage)
@@ -89,7 +85,7 @@
 ,Delay Days,Forsinkelsesdage
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Vægt Vægt Detaljer
 DocType: Asset Maintenance Log,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Forkortelse
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} passer ikke med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Række # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Række # {0}:
 DocType: Timesheet,Total Costing Amount,Total Costing Beløb
 DocType: Delivery Note,Vehicle No,Køretøjsnr.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Vælg venligst prisliste
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Varer i arbejde
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Vælg venligst dato
 DocType: Daily Work Summary Group,Holiday List,Helligdagskalender
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Revisor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Revisor
 DocType: Hub Settings,Selling Price List,Salgsprisliste
 DocType: Patient,Tobacco Current Use,Tobaks nuværende anvendelse
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Salgspris
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Salgspris
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonnr.
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Ny {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Indledende Email Notification Sent
 ,Sales Partners Commission,Forhandlerprovision
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Værdi efter afskrivninger
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relaterede
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Fremmødedato kan ikke være mindre end medarbejderens ansættelsesdato
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Fremmødedato kan ikke være mindre end medarbejderens ansættelsesdato
 DocType: Grading Scale,Grading Scale Name,Karakterbekendtgørelsen Navn
-DocType: Subscription,Repeat on Day,Gentag på dagen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
 DocType: Sales Invoice,Company Address,Virksomhedsadresse
 DocType: BOM,Operations,Operationer
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
+DocType: Subscription,Subscription Start Date,Abonnements startdato
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæft .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ikke i noget aktivt regnskabsår.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, varekode: {1} og kunde: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Prøveperiode Slutdato kan ikke være før startperiode for prøveperiode
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Rekruttering
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke specificeret til underleverancer punkt {0} i række {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er indtastet mere end én gang
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tilladt for {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Hent varer fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Hent varer fra
 DocType: Price List,Price Not UOM Dependant,Pris Ikke UOM Afhængig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Bremse Oil
 DocType: Tax Rule,Tax Type,Skat Type
 ,Completed Work Orders,Afsluttede arbejdsordrer
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Skattepligtigt beløb
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Skattepligtigt beløb
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har ikke tilladelse til at tilføje eller opdatere poster før {0}
 DocType: BOM,Item Image (if not slideshow),Varebillede (hvis ikke lysbilledshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Reference Document Type skal være en af Expense Claim eller Journal Entry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Vælg stykliste
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Reference Document Type skal være en af Expense Claim eller Journal Entry
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Vælg stykliste
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Administrer forskudsbeløb til medarbejderen
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Leveringsmeddelelse
 DocType: Journal Entry,Opening Entry,Åbningsbalance
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Betal kun
-DocType: Employee Loan,Repay Over Number of Periods,Tilbagebetale over antallet af perioder
+DocType: Loan,Repay Over Number of Periods,Tilbagebetale over antallet af perioder
 DocType: Stock Entry,Additional Costs,Yderligere omkostninger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 DocType: Education Settings,Validate Batch for Students in Student Group,Valider batch for studerende i studentegruppe
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen orlov rekord fundet for medarbejderen {0} for {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ingen orlov rekord fundet for medarbejderen {0} for {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Indtast venligst firma først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Vælg venligst firma først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Vælg venligst firma først
 DocType: Employee Education,Under Graduate,Under Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Angiv standardskabelon for meddelelsen om statusstatus i HR-indstillinger.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Omkostninger i alt
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Medarbejderlån
 DocType: Fee Schedule,Send Payment Request Email,Send betalingsanmodning e-mail
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Successivt uregistreret.
 DocType: Assessment Result,Grade,Grad
 DocType: Restaurant Table,No of Seats,Ingen pladser
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",For at tilføje dynamisk emne skal du bruge jinja tags som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset Maintenance Task
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Årsløn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Årsløn
 DocType: Daily Work Summary,Daily Work Summary,Daglige arbejde Summary
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Udgifter
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Udgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Vælg Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Indtast foretrukket kontakt e-mail
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Indtast foretrukket kontakt e-mail
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra indtastning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit (firmavaluta)
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Primæradresse
 DocType: Production Plan,Material Request Detail,Materialeforespørgsel Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standard Quotation Gyldighedsdage
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 DocType: Sales Invoice,Change Amount,ændring beløb
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Kørekortskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Indtast venligst Leveringsdato
 DocType: Depreciation Schedule,Make Depreciation Entry,Foretag Afskrivninger indtastning
+DocType: HR Settings,Leave Settings,Forlad indstillinger
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anmodningstype
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Opret medarbejder
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Opsætningstilstand for POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Deaktiverer oprettelse af tidslogfiler mod arbejdsordrer. Operationer må ikke spores mod Arbejdsordre
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Udførelse
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Udførelse
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Asset Maintenance Log,Maintenance Status,Vedligeholdelsesstatus
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Medlemskabsdetaljer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandøren er påkrævet mod Betalings konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Varer og Priser
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total time: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preference
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preference
 DocType: Grant Application,Individual,Privatperson
 DocType: Academic Term,Academics User,akademikere Bruger
 DocType: Cheque Print Template,Amount In Figure,Beløb I figur
-DocType: Employee Loan Application,Loan Info,Låneinformation
+DocType: Loan Application,Loan Info,Låneinformation
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Leverandør Scorecard Periode
 DocType: Share Transfer,Share Transfer,Deloverførsel
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Vare skabelon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemi
 DocType: Job Offer,Select Terms and Conditions,Vælg betingelser
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Out Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Out Value
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Indstillinger
 DocType: Production Plan,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Standardområde
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Fjernsyn
 DocType: Work Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Vælg kunde eller leverandør.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 DocType: Company,Enable Perpetual Inventory,Aktiver evigt lager
+DocType: Bank Guarantee,Charges Incurred,Afgifter opkrævet
 DocType: Company,Default Payroll Payable Account,Standard Payroll Betales konto
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Opdatér E-mailgruppe
 DocType: Sales Invoice,Is Opening Entry,Åbningspost
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Brugerdefineret resultat
 DocType: Delivery Stop,Contact Name,Kontaktnavn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier for kursusvurdering
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Skatte ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Skatte ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studiekort:
 DocType: POS Customer Group,POS Customer Group,Kassesystem-kundegruppe
 DocType: Land Unit,Land Unit describing various land assets,"Land Enhed, der beskriver forskellige jordaktiver"
@@ -374,9 +371,8 @@
 ,Open Work Orders,Åbne arbejdsordrer
 DocType: Payment Term,Credit Months,Kredit måneder
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Nettoløn kan ikke være mindre end 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","For at stoppe med at sende gentagne fejlmeddelelser fra systemet, har vi markeret Deaktiveret felt i abonnementet"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Fravær pr. år
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Fravær pr. år
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til firmaet {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Opsæt venligst studerende under elevgrupper
 DocType: Item Website Specification,Item Website Specification,Varebeskrivelse til hjemmesiden
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Fravær blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Entries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Fravær blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Entries
 DocType: Crop,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lagerafstemningsvare
 DocType: Stock Entry,Sales Invoice No,Salgsfakturanr.
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Elevgruppeværktøj til dannelse af fag
 DocType: Lead,Do Not Contact,Må ikke komme i kontakt
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Personer der underviser i din organisation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum ordremængde
 DocType: Pricing Rule,Supplier Type,Leverandørtype
 DocType: Course Scheduling Tool,Course Start Date,Kursusstartdato
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Offentliggør i Hub
 DocType: Student Admission,Student Admission,Studerende optagelse
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materialeanmodning
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materialeanmodning
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Indkøbsdetaljer
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nye tilbud
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Lønseddel sendes til medarbejderen på e-mail, på baggrund af den foretrukne e-mailadresse der er valgt for medarbejderen"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første fraværsgodkender i listen, vil blive markeret som standard-fraværsgodkender"
 DocType: Tax Rule,Shipping County,Anvendes ikke
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Hjælp
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Hjælp
 DocType: Asset,Next Depreciation Date,Næste afskrivningsdato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Anvendes ikke
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 DocType: Driver,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Forkert adgangskode
 DocType: Item,Variant Of,Variant af
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Indstil hotelpris på {}
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Fakturatype
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Følgeseddel
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Udgifter Solgt Asset
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Medarbejderbetegnelse (fx CEO, direktør osv.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusplanlægningsværktøj
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Fejl under oprettelse af tilbagevendende% s for% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
 DocType: Land Unit,LInked Analysis,Analyseret
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Ansøgningsperioden kan ikke være på tværs af to tildelingsregistre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Ansøgningsperioden kan ikke være på tværs af to tildelingsregistre
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede godkendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Række # {0}: Partinr. skal være det samme som {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Modtaget
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opret Elevgrupper
 DocType: Volunteer,Weekends,weekender
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredit Note Beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredit Note Beløb
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Færdigvarer
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tilføj varer
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kvalitetskontrolparameter
+DocType: Leave Application,Leave Approver Name,Fraværsgodkendernavn
 DocType: Depreciation Schedule,Schedule Date,Tidsplan Dato
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Tillæg, fradrag og andre lønarter"
 DocType: Packed Item,Packed Item,Pakket vare
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Anmodning om tilbud
 DocType: Healthcare Settings,Require Lab Test Approval,Kræv labtestgodkendelse
 DocType: Salary Slip Timesheet,Working Hours,Arbejdstider
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Samlet Udestående
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Samlet Udestående
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
 DocType: Dosage Strength,Strength,Styrke
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Opret ny kunde
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
 DocType: Purchase Receipt,Vehicle Date,Køretøj dato
 DocType: Student Log,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Tabsårsag
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Tabsårsag
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Opdater konto nummer
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Emneejer kan ikke være den samme som emnet
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Allokeret beløb kan ikke større end ikke-justerede beløb
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Enkeltværelse
 DocType: Salary Slip,Total Loan Repayment,Samlet lån til tilbagebetaling
 DocType: Account,Cost of Goods Sold,Vareforbrug
-DocType: Subscription,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Indtast omkostningssted
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Indtast omkostningssted
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gns. Salgssats
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Gns. Salgssats
 DocType: Assessment Plan,Examiner Name,Censornavn
 DocType: Lab Test Template,No Result,ingen Resultat
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Indtast venligst firmanavn først
 DocType: Purchase Invoice,Supplier Name,Leverandørnavn
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext-håndbogen
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Vis blade af alle afdelingsmedlemmer i kalender
 DocType: Purchase Invoice,01-Sales Return,01-Salg Retur
 DocType: Account,Is Group,Er en kontogruppe
 DocType: Email Digest,Pending Purchase Orders,Afventende indkøbsordrer
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obligatorisk felt - skoleår
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} er ikke forbundet med {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Indtast venligst standardbetalt konto for virksomheden {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Indtast venligst standardbetalt konto for virksomheden {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transaktion er ikke tilladt mod stoppet Arbejdsordre {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,ikke gældende
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Ferie mester.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserveret til salg
 DocType: Packing Slip,From Package No.,Fra pakkenr.
 DocType: Item Attribute,To Range,At Rækkevidde
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke ændre værdiansættelsesmetode, da der er transaktioner mod nogle poster, der ikke har egen værdiansættelsesmetode"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Værdipapirer og Indlån
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke ændre værdiansættelsesmetode, da der er transaktioner mod nogle poster, der ikke har egen værdiansættelsesmetode"
 DocType: Student Report Generation Tool,Attended by Parents,Deltaget af forældre
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tildelt fravær allokeret i alt er obligatorisk
 DocType: Patient,AB Positive,AB Positive
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Fremmøde rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønart til tidsregistering
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
-DocType: Employee Loan,Total Payment,Samlet betaling
+DocType: Loan,Total Payment,Samlet betaling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Kan ikke annullere transaktionen for Afsluttet Arbejdsordre.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er annulleret, så handlingen kan ikke gennemføres"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Nævn et par af dine kunder. Disse kunne være firmaer eller privatpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Dele til Build
 DocType: POS Profile User,POS Profile User,POS profil bruger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte indkomst
+DocType: Subscription Invoice,Subscription Invoice,Abonnementsfaktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direkte indkomst
 DocType: Patient Appointment,Date TIme,Dato Tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Kontorfuldmægtig
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opsætning af selskab og skatter
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vælg kursus
 DocType: Codification Table,Codification Table,Kodifikationstabel
 DocType: Timesheet Detail,Hrs,timer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Vælg firma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Vælg firma
 DocType: Stock Entry Detail,Difference Account,Differencekonto
 DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Cash Flow Mapping Template
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serienummervare kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
+DocType: Bank Guarantee,Providing,At sørge for
 DocType: Account,Profit and Loss,Resultatopgørelse
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ikke tilladt, konfigurere Lab Test Template efter behov"
 DocType: Patient,Risk Factors,Risikofaktorer
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør fakturanr.
 DocType: Territory,For reference,For reference
 DocType: Healthcare Settings,Appointment Confirmation,Udnævnelse Bekræftelse
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette serienummer {0}, eftersom det bruges på lagertransaktioner"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette serienummer {0}, eftersom det bruges på lagertransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Lukning (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hej
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Flyt vare
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Angiv allerede standard i pos profil {0} for bruger {1}, venligt deaktiveret standard"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akkumulerede værdier
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Beklager, serienumre kan ikke blive slået sammen"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Beklager, serienumre kan ikke blive slået sammen"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Område er påkrævet i POS-profil
 DocType: Supplier,Prevent RFQs,Forebygg RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Opret salgsordre
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Lønslip indgivet for perioden fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Lønslip indgivet for perioden fra {0} til {1}
 DocType: Project Task,Project Task,Sagsopgave
 ,Lead Id,Emne-Id
 DocType: C-Form Invoice Detail,Grand Total,Beløb i alt
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Fragtregningsdato
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Åbning af fakturaoprettelsesværktøj
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Salg Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Salg Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Bemærk: I alt tildelt blade {0} bør ikke være mindre end allerede godkendte blade {1} for perioden
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Indstil antal i transaktioner baseret på serienummerindgang
 ,Total Stock Summary,Samlet lageroversigt
 DocType: Announcement,Posted By,Bogført af
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Angiv venligst selskabet
 DocType: Share Balance,Share Balance,Aktiebalance
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Træning Resultat Medarbejder
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk lager hvor lagerændringer foretages.
-DocType: Repayment Schedule,Principal Amount,hovedstol
-DocType: Employee Loan Application,Total Payable Interest,Samlet Betales Renter
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,hovedstol
+DocType: Loan Application,Total Payable Interest,Samlet Betales Renter
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Samlet Udestående: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salgsfaktura tidsregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservation
 DocType: Land Unit,Land Unit Name,Land Enhedsnavn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Forslag Skrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling indtastning Fradrag
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Afslutter
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Underret kunder via e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Underret kunder via e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden salgsmedarbejder {0} eksisterer med samme Medarbejder-id
 DocType: Employee Advance,Claimed Amount,Påstået beløb
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
 DocType: Supplier Scorecard,Per Year,Per år
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ikke berettiget til optagelse i dette program i henhold til DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Sales Invoice,Sales Taxes and Charges,Salg Moms og afgifter
 DocType: Employee,Organization Profile,Organisationsprofil
 DocType: Vital Signs,Height (In Meter),Højde (i meter)
 DocType: Student,Sibling Details,søskende Detaljer
 DocType: Vehicle Service,Vehicle Service,Køretøj service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,udløser automatisk feedback anmodning baseret på betingelser.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,udløser automatisk feedback anmodning baseret på betingelser.
 DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Skabelon til præstationsvurderinger.
 DocType: Sales Invoice,Credit Note Issued,Kreditnota udstedt
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelsesplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så vil prisreglerne blive filtreret på kunde, kundegruppe, område, leverandør, leverandørtype, kampagne, salgspartner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Netto Ændring i Inventory
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Medarbejder Lån Management
 DocType: Employee,Passport Number,Pasnummer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Forholdet til Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Leder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Leder
 DocType: Payment Entry,Payment From / To,Betaling fra/til
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Venligst indstil konto i lager {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Kunne ikke finde vej til
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Åbning (dr)
+DocType: Loan,Applicant,Ansøger
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,At lave tilbagevendende dokumenter
 ,GST Itemised Purchase Register,GST Itemized Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Omlæg
-DocType: Employee Loan,Total Interest Payable,Samlet Renteudgifter
+DocType: Loan,Total Interest Payable,Samlet Renteudgifter
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
 DocType: Work Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Slutte
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Grundlag
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Grundlag
 DocType: Timesheet,Total Billed Hours,Total Billed Timer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Skriv Off Beløb
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Skriv Off Beløb
 DocType: Leave Block List Allow,Allow User,Tillad Bruger
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst/tabskonto vedr. salg af anlægsaktiv
 DocType: Vehicle Log,Service Details,Service Detaljer
-DocType: Subscription,Quarterly,Kvartalsvis
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,grupperet
 DocType: Selling Settings,Delivery Note Required,Følgeseddel er påkrævet
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tidsregistrering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush råstoffer baseret på
 DocType: Sales Invoice,Port Code,Port kode
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Warehouse
 DocType: Lead,Lead is an Organization,Bly er en organisation
 DocType: Guardian Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre-Sale
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Regnskab
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (sidste aflæsning)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Skabeloner af leverandør scorecard kriterier.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Betalingspost er allerede dannet
 DocType: Request for Quotation,Get Suppliers,Få leverandører
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel lagerbeholdning
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Lønseddel kladde
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Lønseddel kladde
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Du kan kun forny, hvis dit medlemskab udløber inden for 30 dage"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Vælg kun, hvis du har opsætningen Cash Flow Mapper-dokumenter"
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Supplier Scorecard,Per Week,Per uge
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Vare har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Vare har varianter.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Samlet studerende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Firma og regnskab
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,I Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,I Value
 DocType: Asset Settings,Depreciation Options,Afskrivningsmuligheder
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ugyldig postetid
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ugyldig postetid
 DocType: Lead,Campaign Name,Kampagne Navn
 DocType: Hotel Room,Capacity,Kapacitet
 DocType: Selling Settings,Close Opportunity After Days,Luk salgsmulighed efter dage
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kundens indkøbsordrenr.
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,Mobiltelefonnr.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Der er ingen medarbejder for de givne kriterier. Kontroller, at Lønningslister ikke allerede er oprettet."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Der er ingen medarbejder for de givne kriterier. Kontroller, at Lønningslister ikke allerede er oprettet."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatisk materialeanmodning dannet
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Du kan ikke indtaste det aktuelle bilag i ""Mod Kassekladde 'kolonne"
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vælg venligst en tabel
 DocType: BOM,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-mail-adresse i &#39;Modtagere&#39;
 DocType: Special Test Items,Particulars,Oplysninger
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
 DocType: Warranty Claim,CI-,Cl-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Række {0}: konverteringsfaktor er obligatorisk
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere en stykliste, som det er forbundet med andre styklister"
 DocType: Asset,Maintenance,Vedligeholdelse
+DocType: Subscriber,Subscriber,abonnent
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Opdater venligst din projektstatus
 DocType: Item,Maximum sample quantity that can be retained,"Maksimal prøvemængde, der kan opbevares"
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Tilføj Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Anlægsasset er kasseret via finanspost {0}
-DocType: Employee Loan,Interest Income Account,Renter Indkomst konto
+DocType: Loan,Interest Income Account,Renter Indkomst konto
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Gennemgå invitation sendt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Kontorholdudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Kontorholdudgifter
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gå til
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Opsætning Email-konto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Indtast vare først
 DocType: Asset Repair,Downtime,nedetid
 DocType: Account,Liability,Passiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademisk Term:
 DocType: Salary Detail,Do not include in total,Inkluder ikke i alt
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Prøvekvantitet {0} kan ikke være mere end modtaget mængde {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebaggrund
 DocType: Request for Quotation Supplier,Send Email,Send e-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Advarsel: ugyldig vedhæftet fil {0}
 DocType: Item,Max Sample Quantity,Max prøve antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Ingen tilladelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Ingen tilladelse
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citat krævet
 DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
 DocType: Company,Default Bank Account,Standard bankkonto
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab Tests og Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen medarbejder fundet
-DocType: Subscription,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentgruppen er allerede opdateret.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen er allerede opdateret.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projektopdatering.
 DocType: SMS Center,All Customer Contact,Alle kundekontakter
 DocType: Land Unit,Tree Details,Tree Detaljer
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Importér fremmøde
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alle varegrupper
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Work Order,Item To Manufacture,Item Til Fremstilling
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status er {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vælg igen, hvis den valgte adresse redigeres efter gem"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Åbner'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Åbner'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åbn Opgaver
 DocType: Notification Control,Delivery Note Message,Følgeseddelmeddelelse
 DocType: Lab Test Template,Result Format,Resultatformat
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Hver anden måned
 DocType: Vehicle Service,Brake Pad,Bremseklods
 DocType: Fertilizer,Fertilizer Contents,Indhold af gødning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Forskning &amp; Udvikling
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Forskning &amp; Udvikling
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Beløb til fakturering
 DocType: Company,Registration Details,Registrering Detaljer
 DocType: Timesheet,Total Billed Amount,Samlet Faktureret beløb
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Bypass kreditgrænse tjek på salgsordre
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Præstationsvurdering.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering »anvendelse til indkøbskurv"", som indkøbskurv er aktiveret, og der skal være mindst én momsregel til Indkøbskurven"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling indtastning {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling indtastning {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Sagsværdi
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Kassesystem
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Mindste plads
 DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
 DocType: Examination Result,Examination Result,eksamensresultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Købskvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Købskvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Henvisning Doctype skal være en af {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Forhandlere og områder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Stykliste {0} skal være aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Ingen emner til overførsel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Stykliste {0} skal være aktiv
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Ingen emner til overførsel
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Lukning (Åbning + I alt)
 DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Pris eller rabat
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,foretrukne
 DocType: Hub Settings,Custom Data,Brugerdefinerede data
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Ler sammensætning (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Gem venligst før du tildeler opgave.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balance Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balance Value
 DocType: Lab Test,Lab Technician,Laboratorie tekniker
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salgsprisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Salgsprisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Hvis markeret, oprettes en kunde, der er kortlagt til patienten. Patientfakturaer vil blive oprettet mod denne kunde. Du kan også vælge eksisterende kunde, mens du opretter patient."
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
 DocType: Purchase Receipt,Range,Periode
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,Lønarter
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Woocommerce Settings,Endpoints,endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","at blive genereret. Hvis forsinket, skal du manuelt ændre feltet &quot;Gentag på dag i måneden&quot; her"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
 DocType: Share Transfer,From Folio No,Fra Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Tilgængelig-til-brug-dato
 DocType: Guardian,Guardian Name,Guardian Navn
 DocType: Cheque Print Template,Has Print Format,Har Print Format
-DocType: Employee Loan,Sanctioned,sanktioneret
+DocType: Loan,Sanctioned,sanktioneret
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Måske Valutaveksling rekord er ikke skabt til
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Række # {0}: Angiv serienummer for vare {1}
 DocType: Crop Cycle,Crop Cycle,Afgrødecyklus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For produktpakke-varer, lagre, serienumre og partier vil blive betragtet fra pakkelistetabellen. Hvis lager og parti er ens for alle pakkede varer for enhver produktpakkevare, kan disse værdier indtastes for den vigtigste vare, og værdierne vil blive kopieret til pakkelistetabellen."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For produktpakke-varer, lagre, serienumre og partier vil blive betragtet fra pakkelistetabellen. Hvis lager og parti er ens for alle pakkede varer for enhver produktpakkevare, kan disse værdier indtastes for den vigtigste vare, og værdierne vil blive kopieret til pakkelistetabellen."
 DocType: Student Admission,Publish on website,Udgiv på hjemmesiden
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Leverandørfakturadato kan ikke være større end bogføringsdatoen
+DocType: Subscription,Cancelation Date,Annulleringsdato
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre vare
 DocType: Agriculture Task,Agriculture Task,Landbrugsopgave
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Indkomst
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirekte Indkomst
 DocType: Student Attendance Tool,Student Attendance Tool,Student Deltagelse Tool
 DocType: Restaurant Menu,Price List (Auto created),Prisliste (Auto oprettet)
 DocType: Cheque Print Template,Date Settings,Datoindstillinger
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektricitetsomkostninger
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab testning datetime kan ikke være før datetime samling
+DocType: Subscription Plan,Cost,Koste
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke medarbejderfødselsdags- påmindelser
 DocType: Expense Claim,Total Advance Amount,Samlet forskudsbeløb
 DocType: Delivery Stop,Estimated Arrival,Forventet ankomst
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload dit brevhoved og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Faktureres
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Næste afskrivningsdato er indtastet som tidligere dato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Hvid
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle emner (åbne)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Antal ikke tilgængelig for {4} i lageret {1} på udstationering tid af posten ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Du kan kun vælge maksimalt en mulighed fra listen over afkrydsningsfelter.
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
 DocType: Item,Automatically Create New Batch,Opret automatisk et nyt parti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Tildele {0} til {1} (række {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Opret
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Tildele {0} til {1} (række {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Opret
 DocType: Student Admission,Admission Start Date,Optagelse Startdato
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Ny medarbejder
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lånebeløb
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Kursusskema
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Aktieoptioner
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Aktieoptioner
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Deaktiver Hent Seneste Købsdetaljer i Indkøbsordre
 DocType: Journal Entry Account,Expense Claim,Udlæg
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Vil du virkelig gendanne dette kasserede anlægsaktiv?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakkeseddelvare
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Angiv en {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantoprettelse er blevet køet.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Arbejdsoversigt for {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Attributtabellen er obligatorisk
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Den første tilladelse til tilladelse i listen vil blive indstillet som standardladetilladelse.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Plan,Get Sales Orders,Hent salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kan ikke være negativ
 DocType: Training Event,Self-Study,Selvstudie
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Løn
 DocType: Asset Maintenance,Maintenance Manager Name,Maintenance Manager Navn
 DocType: Agriculture Task,Urgent,Hurtigst muligt
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan ikke finde variabel:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Vælg venligst et felt for at redigere fra numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Kan ikke være en fast aktivpost, da lagerliste oprettes."
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvalitetsinspektionsskabelon
 DocType: Project,First Email,Første Email
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Salgsbeløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Salgsbeløb
 DocType: Repayment Schedule,Interest Amount,Renter Beløb
 DocType: Serial No,Creation Document No,Oprettet med dok.-nr.
 DocType: Share Transfer,Issue,Issue
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Forsendelse stat
 ,Projected Quantity as Source,Forventet mængde som kilde
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Varer skal tilføjes ved hjælp af knappen: ""Hent varer fra købskvitteringer"""
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Leveringsrejse
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Leveringsrejse
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Overførselstype
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Salgsomkostninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Salgsomkostninger
 DocType: Consultation,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Implementering Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Vælg renteindtægter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt vægtenhed
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
-DocType: Employee Loan,Repayment Schedule,tilbagebetaling Schedule
+DocType: Loan,Repayment Schedule,tilbagebetaling Schedule
 DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelsesregelbetingelse
 DocType: Holiday List,Get Weekly Off Dates,Hent ugentlige fridage til kalenderen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
 DocType: Education Settings,Attendance Freeze Date,Tilmelding senest d.
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Nævn et par af dine leverandører. Disse kunne være firmaer eller privatpersoner.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Se alle produkter
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Mindste levealder (dage)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Alle styklister
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotelværelser af typen {0} er ikke tilgængelige på {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,Fra Medarbejder
 DocType: Driver,Cellphone Number,telefon nummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke for overfakturering, da beløbet for vare {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke for overfakturering, da beløbet for vare {0} i {1} er nul"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
+DocType: Supplier Quotation,Auto Repeat Section,Automatisk gentag sektion
 DocType: Upload Attendance,Attendance From Date,Fremmøde fradato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ugyldig Attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} skal godkendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
+DocType: Department Approver,Department Approver,Afdelingsgodkendelse
 DocType: SMS Center,Total Characters,Total tegn
 DocType: Employee Advance,Claimed,hævdede
 DocType: Crop,Row Spacing,Rækkevidde
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalingsafstemningsfaktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Bidrag%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","I henhold til købsindstillingerne, hvis købsordren er påkrævet == &#39;JA&#39; og derefter for at oprette Købsfaktura skal brugeren først oprette indkøbsordre for vare {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-sammendrag af ydre forsyninger
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv forsendelsesregler
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Handlingsnavn
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Startår
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},De første 2 cifre i GSTIN skal svare til statens nummer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende fakturaperiode
 DocType: Salary Slip,Leave Without Pay,Fravær uden løn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapacitetsplanlægningsfejl
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Felter vil blive kopieret over kun på tidspunktet for oprettelsen.
 DocType: Setup Progress Action,Domains,Domæner
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,payer Indstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til varen af varianten. For eksempel, hvis dit forkortelse er ""SM"", og varenummeret er ""T-SHIRT"", så vil variantens varenummer blive ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
 DocType: Purchase Invoice,Is Return,Er Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Advarsel
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Startdagen er større end slutdagen i opgaven &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retur / debetnota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prislisteland
 DocType: Item,UOMs,Enheder
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} gyldige serienumre for vare {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Varenr. kan ikke ændres for Serienummer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Varenr. kan ikke ændres for Serienummer
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få partinr.
 DocType: Stock Settings,Default Item Group,Standard varegruppe
-DocType: Employee Loan,Partially Disbursed,Delvist udbetalt
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Giv oplysninger.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Giv oplysninger.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Du kan ikke genstarte en abonnement, der ikke annulleres."
 DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
 DocType: Fee Validity,Valid Till,Gyldig til
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Samlet forældreundervisningsmøde
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalingsmåde er ikke konfigureret. Kontroller, om konto er blevet indstillet på betalingsmåden eller på Kassesystemprofilen."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Ændring af kundegruppe for den valgte kunde er ikke tilladt.
 ,Purchase Order Items To Be Billed,Indkøbsordre varer til fakturering
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Opdaterer forventede ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Opdaterer forventede ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Indtastningsdetaljer
 DocType: Purchase Invoice Item,Net Rate,Nettosats
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vælg venligst en kunde
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Indeværende regnskabsår
 DocType: Purchase Order,Group same items,Gruppe samme elementer
 DocType: Purchase Invoice,Disable Rounded Total,Deaktiver Afrundet Total
-DocType: Employee Loan Application,Repayment Info,tilbagebetaling Info
+DocType: Department,Parent Department,Forældreafdeling
+DocType: Loan Application,Repayment Info,tilbagebetaling Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 DocType: Maintenance Team Member,Maintenance Role,Vedligeholdelsesrolle
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Opsætning af Medarbejdere
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruger
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Vælg venligst præfiks først
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Forskning
+DocType: Subscription Settings,Subscription Settings,Abonnementsindstillinger
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbejdet udført
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Angiv mindst én attribut i Attributter tabellen
 DocType: Announcement,All Students,Alle studerende
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
 DocType: Crop Cycle,Less than a year,Mindre end et år
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studerende mobiltelefonnr.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resten af verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Vare {0} kan ikke have parti
 DocType: Crop,Yield UOM,Udbytte UOM
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Bruttoløn
 DocType: Item,Is Item from Hub,Er vare fra nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitetstypen er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Betalt udbytte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Betalt udbytte
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskab Ledger
 DocType: Stock Reconciliation,Difference Amount,Differencebeløb
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} på forladt den {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Overført overskud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Overført overskud
 DocType: Purchase Invoice,05-Change in POS,05-ændring i POS
 DocType: Vehicle Log,Service Detail,service Detail
 DocType: BOM,Item Description,Varebeskrivelse
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Salgsmulighed Vare
 ,Student and Guardian Contact Details,Studerende og Guardian Kontaktoplysninger
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Række {0}: For leverandør {0} E-mail-adresse er nødvendig for at sende e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Midlertidig åbning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Midlertidig åbning
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Se nav
 ,Employee Leave Balance,Medarbejder Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 DocType: Patient Appointment,More Info,Mere info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Værdiansættelsesbeløb påkrævet for varen i række {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Værdiansættelsesbeløb påkrævet for varen i række {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard Actions
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Eksempel: Masters i Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Afvist lager
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,til
 DocType: Supplier Quotation Item,Lead Time in days,Gennemsnitlig leveringstid i dage
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Udbetaling af løn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Udbetaling af løn fra {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere låst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hent åbne fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den samlede overførselsmængde {0} i materialeanmodning {1} \ kan ikke være større end den anmodede mængde {2} for vare {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Lille
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Lille
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Åbning af fakturaoprettelsesværktøj
 DocType: Education Settings,Employee Number,Medarbejdernr.
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Annuller faktura efter Grace Period
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
 DocType: Project,% Completed,% afsluttet
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorietestning Datetime
 DocType: Email Digest,Add Quote,Tilføj tilbud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
 DocType: Agriculture Analysis Criteria,Agriculture,Landbrug
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Udstyr
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel skal først baseres på feltet 'Gælder for', som kan indeholde vare, varegruppe eller varemærke."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Indstil varenummeret først
 DocType: Item,ITEM-,VARE-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+DocType: Subscription Plan,Billing Interval Count,Faktureringsintervaltælling
 DocType: Sales Invoice Item,Edit Description,Rediger beskrivelse
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Team opdateringer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Beløb i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opret Print Format
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,Kassesystem-varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail nyhedsbrev:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativt element må ikke være det samme som varekode
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Afslutning af foreløbig vurdering
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Arbejdsstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Anmodning om tilbud Leverandør
 DocType: Healthcare Settings,Registration Message,Registreringsmeddelelse
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Receptpligtig dosering
 DocType: Attendance,HR Manager,HR-chef
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vælg firma
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Start- og slutdato
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Åben stykliste {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for serienummeret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for serienummeret
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
 DocType: Project Update,Great/Quickly,Great / Hurtigt
 DocType: Purchase Invoice Item,UOM,Enhed
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,MA/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Vælg venligst batches for batched item
 DocType: Asset,Depreciation Schedules,Afskrivninger Tidsplaner
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Følgende konti kan vælges i GST-indstillinger:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Følgende konti kan vælges i GST-indstillinger:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Sager
 DocType: Payment Request,Transaction Currency,Transaktionsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
 DocType: POS Profile,Campaign,Kampagne
 DocType: Supplier,Name and Type,Navn og type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
 DocType: Physician,Contacts and Address,Kontakter og adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Støtteberettigelse og detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad feltet stå tomt hvis det skal gælde for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra datotid
 DocType: Email Digest,For Company,Til firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Adgang til portal er deaktiveret for anmodning om tilbud. Check portal instillinger
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoringsvariabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Køb Beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Køb Beløb
 DocType: Sales Invoice,Shipping Address Name,Leveringsadressenavn
 DocType: Material Request,Terms and Conditions Content,Vilkår og -betingelsesindhold
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Der opstod fejl ved at oprette kursusplan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den første udgiftsgodkendelse i listen bliver indstillet som standard Expense Approver.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,må ikke være større end 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Detail,Depends on Leave Without Pay,Afhænger af fravær uden løn
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,Pakkekode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Lærling
 DocType: Purchase Invoice,Company GSTIN,Firma GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Medarbejder kan ikke referere til sig selv.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Medarbejder kan ikke referere til sig selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Forlad godkendelsesprocedure
 DocType: Job Opening,"Job profile, qualifications required etc.","Stillingsprofil, kvalifikationskrav mv."
 DocType: Journal Entry Account,Account Balance,Konto saldo
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Momsregel til transaktioner.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Betalingsperioden i række {0} er muligvis et duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Landbrug (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakkeseddel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontorleje
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakkeseddel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 DocType: Disease,Common Name,Almindeligt navn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import mislykkedes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
 DocType: Vital Signs,Blood Pressure,Blodtryk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytiker
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Valider indskrevet kursus for studerende i studentegruppe
 DocType: Notification Control,Expense Claim Rejected,Udlæg afvist
 DocType: Item,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Regeringen
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Udlæg {0} findes allerede for kørebogen
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institut Navn
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Indtast tilbagebetaling Beløb
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Indtast tilbagebetaling Beløb
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Item Varianter
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,E-mail lønseddel til medarbejder
 DocType: Cost Center,Parent Cost Center,Overordnet omkostningssted
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Vælg Mulig leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Vælg Mulig leverandør
 DocType: Sales Invoice,Source,Kilde
 DocType: Customer,"Select, to make the customer searchable with these fields","Vælg, for at gøre kunden søgbar med disse felter"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis lukket
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakkeseddel (ler) annulleret
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Pengestrømme fra investeringsaktiviteter
 DocType: Program Course,Program Course,Kursusprogram
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline for website hjemmeside
 DocType: Item Group,Item Group Name,Varegruppenavn
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Detaljer
 DocType: Leave Block List,Block Holidays on important days.,Blokér ferie på vigtige dage.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Indtast alle nødvendige Resultatværdier (r)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Debitor Resumé
-DocType: Employee Loan,Monthly Repayment Amount,Månedlige ydelse Beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Debitor Resumé
+DocType: Loan,Monthly Repayment Amount,Månedlige ydelse Beløb
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Åbning af fakturaer
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
 DocType: UOM,UOM Name,Enhedsnavn
 DocType: GST HSN Code,HSN Code,HSN kode
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Bidrag Beløb
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bruger {0} er allerede tildelt Læger {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kasse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mulig leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mulig leverandør
+DocType: Journal Entry,JV-RET-,JV-Retsinformation
 DocType: Budget,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sundhedspleje (beta)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Produktionmængde er obligatorisk
-DocType: Employee Loan,Repayment Method,tilbagebetaling Metode
+DocType: Loan,Repayment Method,tilbagebetaling Metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis markeret, vil hjemmesiden være standard varegruppe til hjemmesiden"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Krav om selskabets regning.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certifikat er påkrævet
 DocType: Company,Default Holiday List,Standard helligdagskalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Række {0}: Fra tid og til tid af {1} overlapper med {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Passiver
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Passiver
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt mobiltelefonnr.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Vælg firma
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,Udskrivningsafsnit
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Bruger {0} har ingen standard POS-profil. Tjek standard i række {1} for denne bruger.
 DocType: Student Group,Set 0 for no limit,Sæt 0 for ingen grænse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Række {idx}: {field} er påkrævet for at oprette Fakturaerne for åbning {faktura_type}
 DocType: Customer,Primary Address and Contact Detail,Primæradresse og kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gensend Betaling E-mail
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vælg mindst et domæne.
 DocType: Dependent Task,Dependent Task,Afhængig opgave
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Fravær af typen {0} må ikke vare længere end {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Fravær af typen {0} må ikke vare længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
 DocType: SMS Center,Receiver List,Modtageroversigt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Søg Vare
 DocType: Payment Schedule,Payment Amount,Betaling Beløb
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,karakterbekendtgørelsen
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Allerede afsluttet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock i hånden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock i hånden
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import vellykket!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalingsanmodning findes allerede {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Tilbudt vare
 DocType: Customer,Customer POS Id,Kundens POS-id
 DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} mængde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Indtast venligst Woocommerce Server URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandørtype-master.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 DocType: Share Balance,To No,Til nr
-DocType: Subscription,Reference Document,referencedokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Ansøgers Type
+DocType: Loan,Applicant Type,Ansøgers Type
 DocType: Purchase Invoice,03-Deficiency in services,03-mangel på tjenesteydelser
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Medical Code Standard
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faktureret
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret mængde
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Medarbejdere
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Medarbejdere
 DocType: Lead,Upper Income,Upper Indkomst
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Afvise
 DocType: Journal Entry Account,Debit in Company Currency,Debet (firmavaluta)
 DocType: BOM Item,BOM Item,Styklistevarer
 DocType: Appraisal,For Employee,Til medarbejder
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make Udbetaling indtastning
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Make Udbetaling indtastning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Række {0}: Advance mod Leverandøren skal debitere
 DocType: Company,Default Values,Standardværdier
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),I alt (uden skat)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} skal være større end 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Lager til rådighed
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Lager til rådighed
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Indkøb
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ingen af varerne har nogen ændring i mængde eller værdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ingen af varerne har nogen ændring i mængde eller værdi.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligatorisk felt - Program
 DocType: Special Test Template,Result Component,Resultat Komponent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantikrav
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage indenfor fraværsperioden som fravær
 DocType: Sales Invoice,Packed Items,Pakkede varer
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mod serienummer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','I alt'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','I alt'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,Salgsindstillinger
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Bekræft handling
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller værdiansættelsebeløb eller begge
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller værdiansættelsebeløb eller begge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Opfyldelse
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Se i indkøbskurven
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markedsføringsomkostninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kan ikke oprette standard kriterier. Venligst omdøber kriterierne
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,Hent skabelon
 DocType: Material Request,Transferred,overført
 DocType: Vehicle,Doors,Døre
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Indsamle gebyr for patientregistrering
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan ikke ændre attributter efter aktiehandel. Lav en ny vare og overfør lager til den nye vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan ikke ændre attributter efter aktiehandel. Lav en ny vare og overfør lager til den nye vare
 DocType: Course Assessment Criteria,Weightage,Vægtning
 DocType: Purchase Invoice,Tax Breakup,Skatteafbrydelse
 DocType: Packing Slip,PS-,PS
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Udlæs rapporten og udskriv den ved hjælp af et regnearksprogram.
 DocType: Purchase Invoice Item,Batch No,Partinr.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Medarbejderudviklingen
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod kundens indkøbsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 DocType: Grant Application,Assessment  Mark (Out of 10),Bedømmelsesmærke (ud af 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Formynder 2 mobiltelefonnr.
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Salgsmulighed Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige Omkostninger
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Opret indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Opret indkøbsordre
 DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Der er ikke nok dage til rådighed til fraværstype {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens varenr.
 DocType: Stock Reconciliation,Stock Reconciliation,Lagerafstemning
 DocType: Territory,Territory Name,Områdenavn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Du kan kun have planer med samme faktureringsperiode i en abonnement
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger.
 DocType: Purchase Order Item,Warehouse and Reference,Lager og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig information og andre generelle oplysninger om din leverandør
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Medarbejdervurderinger
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Træningsarrangementer
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Doppelte serienumre er indtastet for vare {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Doppelte serienumre er indtastet for vare {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Sporledninger af blykilde.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Kom ind
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Kom ind
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Vedligeholdelseslog
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Indstil filter baseret på Item eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: Student Group,Instructors,Instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Stykliste {0} skal godkendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Stykliste {0} skal godkendes
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Aktieforvaltning
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Betaling
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Lager {0} er ikke knyttet til nogen konto, angiv venligst kontoen i lagerplaceringen eller angiv standard lagerkonto i firma {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Administrér dine ordrer
 DocType: Work Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Arbejdstid i alt bør ikke være større end maksimal arbejdstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,Stregkoder
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Arbejdsordre {0} skal indsendes
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Ny kurv
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta skal være lig med enten standardfirmaets valuta eller part konto konto valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun udkast)"
 DocType: Soil Texture,Loam,lerjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Række {0}: Forfaldsdato kan ikke være før bogføringsdato
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Række {0}: Forfaldsdato kan ikke være før bogføringsdato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Indtast indbetaling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
 DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend fravær
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,For
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree of finansielle omkostningssteder.
 DocType: Serial No,Delivery Document No,Levering dokument nr
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materialforbrug er ikke angivet i fremstillingsindstillinger.
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan ikke overbillet for vare {0} i række {1} mere end {2}. For at tillade overfakturering, skal du angive lagerindstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan ikke overbillet for vare {0} i række {1} mere end {2}. For at tillade overfakturering, skal du angive lagerindstillinger"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Opdater svar
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Vælg programmet først
 DocType: Patient Appointment,Patient Age,Patientalder
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Håndtering af sager
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serienummeret {0} er allerede returneret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serienummeret {0} er allerede returneret
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
 DocType: Budget,Fiscal Year,Regnskabsår
 DocType: Asset Maintenance Log,Planned,planlagt
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Standardfordelbare konti, der skal bruges, hvis de ikke er indstillet til patienten for at bestille konsultationsafgifter."
 DocType: Vehicle Log,Fuel Price,Brændstofpris
+DocType: Bank Guarantee,Margin Money,Margen penge
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Sæt Åbn
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Opfølgning
 DocType: Item,Is Sales Item,Er salgsvare
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppetræ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke sat op til serienumre. Tjek vare-masteren
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke sat op til serienumre. Tjek vare-masteren
 DocType: Maintenance Visit,Maintenance Time,Vedligeholdelsestid
 ,Amount to Deliver,"Beløb, Deliver"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Samme vare er indtastet flere gange. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Betingelsernes startdato kan ikke være tidligere end startdatoen for skoleåret, som udtrykket er forbundet med (Studieår {}). Ret venligst datoerne og prøv igen."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Der var fejl.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Der var fejl.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Aktuel værdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 DocType: Education Settings,Instructor Records to be created by,"Instruktør Records, der skal oprettes af"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oprettet
 DocType: GST Account,GST Account,GST-konto
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
 DocType: Website Item Group,Website Item Group,Hjemmeside-varegruppe
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Tilføjet til Favoritter
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønseddel fundet for at indsende for ovennævnte udvalgte kriterier ELLER lønsliste allerede indsendt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skatter og afgifter
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønseddel fundet for at indsende for ovennævnte udvalgte kriterier ELLER lønsliste allerede indsendt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Skatter og afgifter
 DocType: Projects Settings,Projects Settings,Projekter Indstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Indtast referencedato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingsposter ikke kan filtreres med {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Varegruppetræer
 DocType: Production Plan,Total Produced Qty,I alt produceret antal
 DocType: Payroll Entry,Get Employee Details,Få medarbejderdetaljer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 DocType: Asset,Sold,solgt
 ,Item-wise Purchase History,Vare-wise Købshistorik
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klik på ""Generer plan"" for at hente serienummeret tilføjet til vare {0}"
 DocType: Account,Frozen,Frosne
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Beløb (Company Currency)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Råmateriale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Råmateriale
 DocType: Payment Reconciliation Payment,Reference Row,henvisning Row
 DocType: Installation Note,Installation Time,Installation Time
 DocType: Sales Invoice,Accounting Details,Regnskabsdetaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
 DocType: Patient,O Positive,O Positive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investeringer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investeringer
 DocType: Issue,Resolution Details,Løsningsdetaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Tildelinger af fravær
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Accept kriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Indtast materialeanmodninger i ovenstående tabel
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Ingen tilbagebetalinger til rådighed for Journal Entry
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: BOM,Show In Website,Vis på hjemmesiden
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Mængde i Website
-DocType: Employee Loan Application,Total Payable Amount,Samlet Betales Beløb
+DocType: Loan Application,Total Payable Amount,Samlet Betales Beløb
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 DocType: Item Reorder,Check in (group),Check i (gruppe)
 DocType: Soil Texture,Silt,silt
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Foretag indbetaling
 DocType: Room,Room Name,Værelsesnavn
 DocType: Prescription Duration,Prescription Duration,Receptpligtig varighed
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Fravær kan ikke anvendes/annulleres før {0}, da fraværssaldoen allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Fravær kan ikke anvendes/annulleres før {0}, da fraværssaldoen allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kundeadresser og kontakter
 ,Campaign Efficiency,Kampagneeffektivitet
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,Kapitel
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Standardkontoen opdateres automatisk i POS-faktura, når denne tilstand er valgt."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Vælg stykliste og produceret antal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Vælg stykliste og produceret antal
 DocType: Asset,Depreciation Schedule,Afskrivninger Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Forhandleradresser og kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Halv Dag Dato skal være mellem Fra dato og Til dato
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Halv Dag Dato skal være mellem Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Faktisk dato
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Angiv standardkostningscenteret i {0} firmaet.
 DocType: Item,Has Batch No,Har partinr.
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Tidsregistreringen)
 DocType: Soil Texture,Soil Type,Jordtype
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Ny besked
 ,Quotation Trends,Tilbud trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Varegruppe ikke er nævnt i vare-masteren for vare {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandat
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Nav kategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
-DocType: Employee Loan,Loan Amount,Lånebeløb
+DocType: Loan,Loan Amount,Lånebeløb
 DocType: Student Report Generation Tool,Add Letterhead,Tilføj brevpapir
 DocType: Program Enrollment,Self-Driving Vehicle,Selvkørende køretøj
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverandør Scorecard Standing
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,Position
 DocType: Patient,Patient Details,Patientdetaljer
 DocType: Patient,B Positive,B positiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
 DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe til ikke-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Samlede faktiske
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Student Søskende
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonnementsplandetaljer
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Enhed
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Angiv venligst firma
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Angiv venligst firma
 ,Customer Acquisition and Loyalty,Kundetilgang og -loyalitet
 DocType: Asset Maintenance Task,Maintenance Task,Vedligeholdelsesopgave
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Indstil venligst B2C-begrænsning i GST-indstillinger.
@@ -2516,6 +2525,7 @@
 ,BOM Search,BOM Søg
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Samlet forbrugt materialeomkostning (via lagerindtastning)
 DocType: Hub Settings,Company Registered,Firma Registreret
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Dato kan ikke være mindre end fra dato
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Udgiv &quot;På lager&quot; eller &quot;Ikke på lager&quot; på Hub baseret på lager tilgængelig på dette lager.
 DocType: Vehicle,Fuel Type,Brændstofstype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Angiv venligst valuta i firmaet
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i parti {0} vil blive negativ {1} for vare {2} på lager {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materialeanmodninger er blevet dannet automatisk baseret på varens genbestillelsesniveau
 DocType: Email Digest,Pending Sales Orders,Afventende salgsordrer
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 DocType: Employee,Create User Permission,Opret brugertilladelse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Healthcare Settings,Remind Before,Påmind før
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
 DocType: Salary Component,Deduction,Fradrag
 DocType: Item,Retain Sample,Behold prøve
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,Differencebeløb
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Varepris tilføjet for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Varepris tilføjet for {0} i prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
 DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,I produktion
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnede kontoudskrift balance
 DocType: Normal Test Template,Normal Test Template,Normal testskabelon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Deaktiveret bruger
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Tilbud
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Kan ikke indstille en modtaget RFQ til No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Tilbud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Kan ikke indstille en modtaget RFQ til No Quote
 DocType: Quotation,QTN-,T-
 DocType: Salary Slip,Total Deduction,Fradrag i alt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Vælg en konto, der skal udskrives i kontovaluta"
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er baseret på transaktioner mod denne patient. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Omkostninger opdateret
 DocType: Patient,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Element {0} er allerede blevet returneret
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Emne Adresse
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverandør Scorecard Setup
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratræk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Anvendt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Genåbne
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Genåbne
 DocType: Sales Invoice Item,Qty as per Stock UOM,Mængde pr. lagerenhed
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Navn
 DocType: Purchase Invoice,02-Post Sale Discount,02-post salg rabat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på emner, tilbud, salgsordrer osv fra kampagne til Return on Investment."
+DocType: Department Approver,Approver,Godkender
 ,SO Qty,SO Antal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Feltet Til Aktionær kan ikke være tomt
 DocType: Guardian,Work Address,Arbejdsadresse
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Samlet tildelte beløb (Company Currency)
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 DocType: BOM,Scrap Material Cost,Skrot materialeomkostninger
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serienummer {0} tilhører ikke noget lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serienummer {0} tilhører ikke noget lager
 DocType: Grant Application,Email Notification Sent,E-mail-meddelelse sendt
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Varenummer, lager, mængde er påkrævet på række"
-DocType: Pricing Rule,Supplier,Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Varenummer, lager, mængde er påkrævet på række"
+DocType: Bank Guarantee,Supplier,Leverandør
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Vis betalingsoplysninger
 DocType: Consultation,Consultation Time,Hørings tid
 DocType: C-Form,Quarter,Kvarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Diverse udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Diverse udgifter
 DocType: Global Defaults,Default Company,Standardfirma
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgifts- eller differencekonto er obligatorisk for vare {0}, da det påvirker den samlede lagerværdi"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank navn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-over
-DocType: Employee Loan,Employee Loan Account,Medarbejder Lån konto
 DocType: Leave Application,Total Leave Days,Totalt antal fraværsdage
 DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til deaktiverede brugere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Vægt (i kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitler / kapitelnavn skal efterlades automatisk automatisk efter opbevaring af kapitel.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Indstil venligst GST-konti i GST-indstillinger
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Indstil venligst GST-konti i GST-indstillinger
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Type virksomhed
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Udgifter til nye køb
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Grant Beskrivelse
 DocType: Purchase Invoice Item,Rate (Company Currency),Sats (firmavaluta)
 DocType: Student Guardian,Others,Andre
+DocType: Subscription,Discounts,Rabatter
 DocType: Payment Entry,Unallocated Amount,Ufordelt beløb
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
 DocType: POS Profile,Taxes and Charges,Moms
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ikke flere opdateringer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Dette dækker alle scorecards knyttet til denne opsætning
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Underordnet vare bør ikke være en produktpakke. Fjern vare `{0}` og gem
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,tjenesten Item
 DocType: Bank Guarantee,Bank Guarantee,Bank garanti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: Bin,Ordered Quantity,Bestilt antal
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Grading Scale,Grading Scale Intervals,Grading Scale Intervaller
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Årets resultat
+DocType: Bank Guarantee,Name of Bank,Bankens navn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskabsføring for {2} kan kun foretages i valuta: {3}
 DocType: Fee Schedule,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tree af finansielle konti.
+DocType: Bank Guarantee,Reference Document Type,Referencedokument type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cash Flow Mapping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Anlægsaktiv
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serienummer-lager
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email ikke fundet i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generer Secret
-DocType: Employee Loan,Account Info,Kontooplysninger
+DocType: Loan,Account Info,Kontooplysninger
 DocType: Activity Type,Default Billing Rate,Standard-faktureringssats
 DocType: Fees,Include Payment,Inkluder betaling
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Student gruppe oprettet.
 DocType: Sales Invoice,Total Billing Amount,Samlet faktureringsbeløb
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program i gebyrstrukturen og studentegruppen {0} er forskellige.
 DocType: Fee Schedule,Receivable Account,Tilgodehavende konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Salgsordre til betaling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Direktør
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Direktør
 DocType: Purchase Invoice,With Payment of Tax,Med betaling af skat
 DocType: Expense Claim Detail,Expense Claim Detail,Udlægsdetalje
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FOR LEVERANDØR
 DocType: Land Unit,Is Container,Er Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Dette bliver dag 1 i afgrødecyklussen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Vælg korrekt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Vælg korrekt konto
 DocType: Purchase Invoice Item,Weight UOM,Vægtenhed
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Liste over tilgængelige aktionærer med folio numre
 DocType: Salary Structure Employee,Salary Structure Employee,Lønstruktur medarbejder
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Vis variant attributter
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Vis variant attributter
 DocType: Student,Blood Group,Blood Group
 DocType: Course,Course Name,Kursusnavn
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontorudstyr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kontorudstyr
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Firmaer
 DocType: Supplier Scorecard,Scoring Setup,Scoring Setup
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,Samlet værdi indgående
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debet-til skal angives
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidskladder hjælper med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøbsprisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Indkøbsprisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Skabeloner af leverandør scorecard variabler.
 DocType: Job Offer Term,Offer Term,Tilbudsbetingelser
 DocType: Asset,Quality Manager,Kvalitetschef
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Sum ubetalt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 DocType: Supplier Scorecard,Supplier Score,Leverandør score
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Samlet faktureret beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Samlet faktureret beløb
 DocType: Supplier,Warn RFQs,Advar RFQ&#39;er
 DocType: BOM,Conversion Rate,Omregningskurs
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Søg efter vare
 DocType: Assessment Plan,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
+DocType: Loan,Total Amount Paid,Samlede beløb betalt
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vælg venligst Student Admission, som er obligatorisk for den betalte studentansøger"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vælg venligst en prisliste for at offentliggøre priser
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktiveret
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Række {0}: Afsluttet Antal kan ikke være mere end {1} til drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillad overarbejde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serienummervare {0} kan ikke opdateres ved hjælp af lagerafstemning, brug venligst lagerposter"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serienummervare {0} kan ikke opdateres ved hjælp af lagerafstemning, brug venligst lagerposter"
 DocType: Training Event Employee,Training Event Employee,Træning Begivenhed Medarbejder
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimale prøver - {0} kan beholdes for Batch {1} og Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Tilføj tidspor
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for vare {1}. Du har angivet {2}."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for vare {1}. Du har angivet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelsesbeløb
 DocType: Training Event,Advance,Rykke
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,for at gøre tilbagevendende igen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless betalings gateway indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gevinst / Tab
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Gevinst / Tab
 DocType: Opportunity,Lost Reason,Tabsårsag
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Række nr. {0}: Konto {1} tilhører ikke firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Række nr. {0}: Konto {1} tilhører ikke firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kunne ikke finde DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} ikke fundet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonnementet har været {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Program
 DocType: Fee Schedule Program,Student Batch,Elevgruppe
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Opret studerende
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Ikke leveret
 ,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opret og administrér de daglige, ugentlige og månedlige e-mail-nyhedsbreve."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Opret og administrér de daglige, ugentlige og månedlige e-mail-nyhedsbreve."
 DocType: Appraisal Goal,Appraisal Goal,Vurderingsmål
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Foreslå kategori?
 DocType: Stock Reconciliation Item,Current Amount,Det nuværende beløb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Bygninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Bygninger
 DocType: Fee Schedule,Fee Structure,Gebyr struktur
 DocType: Timesheet Detail,Costing Amount,Koster Beløb
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Student Admission Program,Application Fee,Tilmeldingsgebyr
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Godkend lønseddel
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maksimal rabat for vare {0} er {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,Adresse & kontaktpersoner
 DocType: SMS Log,Sender Name,Afsendernavn
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Landbrugsanalyse kriterier
+DocType: HR Settings,Leave Approval Notification Template,Forlad godkendelsesskabelonen
 DocType: POS Profile,[Select],[Vælg]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtryk (diastolisk)
 DocType: SMS Log,Sent To,Sendt Til
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Opret salgsfaktura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Næste kontakt d. kan ikke være i fortiden
 DocType: Company,For Reference Only.,Kun til reference.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Læge {0} ikke tilgængelig på {1}
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,Ny Arbejdsplads
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materialeforbrug
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ingen vare med stregkode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ingen vare med stregkode {0}
 DocType: Normal Test Items,Require Result Value,Kræver resultatværdi
 DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,styklister
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard-lønstruktur fundet for medarbejder {0} for de givne datoer
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunde mobiltelefonnr.
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Tilbagevendende
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping Template Detaljer
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Lånestyring
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Genbestil vare
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Vis lønseddel
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Vis lønseddel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Materiale
 DocType: Fees,Send Payment Request,Send betalingsanmodning
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
 DocType: Water Analysis,Origin,Oprindelse
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Er indkomstskat ansvar
 DocType: Grading Scale Interval,Grade Description,Grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Købskvitteringsnr.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Earnest Money
 DocType: Sales Invoice, Shipping Bill Number,Forsendelsesregning nummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sporbarhed
 DocType: Asset Maintenance Log,Actions performed,Handlinger udført
 DocType: Cash Flow Mapper,Section Leader,Sektion Leader
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Finansieringskilde (Passiver)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Finansieringskilde (Passiver)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Antal i række {0} ({1}), skal være det samme som den fremstillede mængde {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Medarbejder
+DocType: Bank Guarantee,Fixed Deposit Number,Fast indbetalingsnummer
 DocType: Asset Repair,Failure Date,Fejldato
 DocType: Sample Collection,Collected Time,Samlet tid
 DocType: Company,Sales Monthly History,Salg Månedlig historie
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,"Er du sikker på, at du vil annullere denne aftale?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel værelsesprispakke
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Salgspipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Angiv standardkonto i lønart {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Angiv standardkonto i lønart {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Forfalder den
 DocType: Rename Tool,File to Rename,Fil der skal omdøbes
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Hent abonnementsopdateringer
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stemmer ikke overens med virksomhed {1} i kontoens tilstand: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Specificeret stykliste {0} findes ikke for vare {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Rute:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,Udlæg godkendt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Ingen arbejdsordrer er oprettet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lønseddel for medarbejder {0} er allerede oprettet for denne periode
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutiske
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre påkrævet
 DocType: Purchase Invoice,Credit To,Credit Til
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Intet citat
 DocType: Warranty Claim,Raised By,Oprettet af
 DocType: Payment Gateway Account,Payment Account,Betalingskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Angiv venligst firma for at fortsætte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Angiv venligst firma for at fortsætte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Nettoændring i Debitor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompenserende Off
 DocType: Job Offer,Accepted,Accepteret
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Søgeresultater
 DocType: Room,Room Number,Værelsesnummer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ugyldig henvisning {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ugyldig henvisning {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Forsendelseregeltekst
 DocType: Journal Entry Account,Payroll Entry,Lønning Entry
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Se Gebyrer Records
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
 DocType: Item Variant Settings,Allow Rename Attribute Value,Tillad omdøbe attributværdi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Hurtig kassekladde
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Hurtig kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefix
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integration af Google Maps er ikke aktiveret
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke godkendt
+DocType: Subscription,Trialling,afprøvning
 DocType: Member,Membership Expiry Date,Medlemskabets udløbsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} skal være negativ til retur dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} skal være negativ til retur dokument
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og betingelser 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Navnet på det institut, som du konfigurerer dette system."
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,Sidste dag i året
 DocType: Task Depends On,Task Depends On,Opgave afhænger af
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Salgsmulighed
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Salgsmulighed
 DocType: Operation,Default Workstation,Standard Workstation
 DocType: Notification Control,Expense Claim Approved Message,Udlæg godkendelsesbesked
 DocType: Payment Entry,Deductions or Loss,Fradrag eller Tab
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Fravær uden løn stemmer ikke med de godkendte fraværsansøgninger
 DocType: Campaign,Campaign-.####,Kampagne -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Faktura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Resterende saldo
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Stregkode {0} er ikke en gyldig {1} kode
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Slutår
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tilbud/emne %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
 DocType: Driver,Driver,Chauffør
 DocType: Vital Signs,Nutrition Values,Ernæringsværdier
 DocType: Lab Test Template,Is billable,Kan faktureres
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Tidsregistreringen)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Samlet forskudsbeløb kan ikke være større end det samlede beløb
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Samlet forskudsbeløb kan ikke være større end det samlede beløb
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Vælg Attributværdier
 DocType: Purchase Invoice,Reason For Issuing document,Årsag til udstedelse af dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lagerindtastning {0} er ikke godkendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Lagerindtastning {0} er ikke godkendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Næste kontakt af kan ikke være den samme som emnets e-mailadresse
 DocType: Tax Rule,Billing City,Fakturering By
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,Tjeneste Adresse
 DocType: Asset Maintenance Task,Calibration,Kalibrering
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} er en firmas ferie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Havemøbler og Kampprogram
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Forlad statusmeddelelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Havemøbler og Kampprogram
 DocType: Item,Manufacture,Fremstilling
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,Planteområde
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (antal)
 DocType: Installation Note Item,Installed Qty,Antal installeret
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dette kan skyldes nogle ugyldige e-mailadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Du tilføjede
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Træning Resultat
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Produkter pr. Side
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisation filial-master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,"El, vand og varmeudgifter"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,"El, vand og varmeudgifter"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-over
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kassekladde {1} har ikke konto {2} eller allerede matchet mod en anden kupon
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vægt
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Forlad godkendelsesmeddelelse
 DocType: Buying Settings,Default Buying Price List,Standard indkøbsprisliste
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Lønseddel baseret på timeregistreringen
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Købspris
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Købspris
 DocType: Notification Control,Sales Order Message,Salgsordrebesked
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Firma, Valuta, indeværende regnskabsår, m.v."
 DocType: Payment Entry,Payment Type,Betalingstype
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
 DocType: Journal Entry,Accounting Entries,Bogføringsposter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis den valgte prissætningsregel er lavet til &#39;Rate&#39;, overskrives den Prisliste. Prissætning Regelpris er den endelige sats, så ingen yderligere rabat bør anvendes. Derfor vil i transaktioner som salgsordre, indkøbsordre osv. Blive hentet i feltet &#39;Rate&#39; i stedet for &#39;Prislistefrekvens&#39;."
+DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Reference Due Date
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vedligeholdelsesplan er ikke dannet for alle varer. Klik på ""Generér plan'"
 ,To Produce,At producere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Løn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
 DocType: Patient Service Unit,Parent Service Unit,Moderselskab
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Opret Bruger
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Indtægtskonto
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Levering
 DocType: Volunteer,Weekdays,Hverdage
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Elevgrupper hjælper dig med at administrere fremmøde, vurderinger og gebyrer for eleverne"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Indstil standard lagerkonto for evigvarende opgørelse
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Indstil standard lagerkonto for evigvarende opgørelse
 DocType: Item Reorder,Material Request Type,Materialeanmodningstype
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Send Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage er fuld, kan ikke gemme"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Rum Kapacitet
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Der findes allerede en rekord for varen {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,"Du vil miste optegnelser over tidligere genererede fakturaer. Er du sikker på, at du vil genstarte dette abonnement?"
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registreringsafgift
 DocType: Budget,Cost Center,Omkostningssted
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Bilagsnr.
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Bilagsnr.
 DocType: Notification Control,Purchase Order Message,Indkøbsordre meddelelse
 DocType: Tax Rule,Shipping Country,Forsendelsesland
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skjul kundens CVR-nummer fra salgstransaktioner
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prisfastsættelseregler laves for at overskrive prislisten og for at fastlægge rabatprocenter baseret på forskellige kriterier.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,"Lager kan kun ændres via lagerindtastning, følgeseddel eller købskvittering"
 DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Salg- og marketingschef
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Salg- og marketingschef
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Indkomstskat
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Analysér emner efter branchekode.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Gå til Letterheads
+DocType: Subscription,Cancel At End Of Period,Annuller ved slutningen af perioden
 DocType: Item Supplier,Item Supplier,Vareleverandør
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Ingen emner valgt til overførsel
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Ingen emner valgt til overførsel
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Lagerindstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster: Er en kontogruppe, Rodtype og firma"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% fremskridt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Gevinst/tab vedr. salg af anlægsaktiv
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Gevinst/tab vedr. salg af anlægsaktiv
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Kun den studerendes ansøger med statusen &quot;Godkendt&quot; vælges i nedenstående tabel.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Kontonummer for konto {0} er ikke tilgængeligt. <br> Opsæt venligst dit kontoplan korrekt.
 DocType: Task,Depends on Tasks,Afhænger af opgaver
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ikke på lager
 DocType: Volunteer,Volunteer Skills,Frivillige Færdigheder
 DocType: Appraisal,HR User,HR-bruger
+DocType: Bank Guarantee,Reference Document Name,Reference dokumentnavn
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
 apps/erpnext/erpnext/hooks.py +142,Issues,Spørgsmål
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SF-RET
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
+DocType: Loan,Loan Application,Lån ansøgning
 DocType: Crop,Scientific Name,Videnskabeligt navn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Fravær i alt
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Vælg, hvis den valgte kontakt redigeres efter gem"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Anvendes ikke
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Samlet kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lagerpost {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lagerpost {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Featured Product
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alle Assessment Grupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alle Assessment Grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nyt lagernavn
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),I alt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Område
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,Gebyrer
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Tilbud {0} er ikke længere gyldigt
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Samlede udestående beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Samlede udestående beløb
 DocType: Sales Partner,Targets,Mål
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Indtast venligst SIREN-nummeret i virksomhedens informationsfil
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Price List,Price List Master,Master-Prisliste
 DocType: GST Account,CESS Account,CESS-konto
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vælg patient
 DocType: Price List,Applicable for Countries,Gældende for lande
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternavn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; og &quot;Afvist&quot; kan indsendes
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Elevgruppenavn er obligatorisk i rækken {0}
 DocType: Homepage,Products to be shown on website homepage,Produkter til at blive vist på hjemmesidens startside
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dette er en rod-kundegruppe og kan ikke redigeres.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktura er allerede oprettet for alle faktureringstimer
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Navn fejl: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Er finansiering omkostninger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til udskrivning)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Indstil standardkunde i Restaurantindstillinger
 ,Salary Register,Løn Register
 DocType: Warehouse,Parent Warehouse,Forældre Warehouse
-DocType: C-Form Invoice Detail,Net Total,Netto i alt
+DocType: Subscription,Net Total,Netto i alt
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Standard BOM ikke fundet for Item {0} og Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definer forskellige låneformer
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definer forskellige låneformer
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Udestående beløb
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i minutter)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root Der skal være en gruppe
 DocType: Drug Prescription,Drug Prescription,Lægemiddel recept
 DocType: Fees,FEE.,BETALING.
-DocType: Employee Loan,Repaid/Closed,Tilbagebetales / Lukket
+DocType: Loan,Repaid/Closed,Tilbagebetales / Lukket
 DocType: Item,Total Projected Qty,Den forventede samlede Antal
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Værdiansættelsesrate ikke fundet for posten {0}, som er påkrævet for at foretage regnskabsposter for {1} {2}. Hvis varen handler som en nulværdieringsgrad i {1}, skal du nævne det i {1} Item-tabellen. Ellers skal du oprette en indgående aktietransaktion for varen eller nævne værdiansættelsesfrekvensen i vareposten og derefter forsøge at indsende / annullere denne post"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kursuskode
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kvalitetskontrol kræves for vare {0}
 DocType: POS Settings,Use POS in Offline Mode,Brug POS i offline-tilstand
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,Forsøgt eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-DocType: Subscription,Half-yearly,Halvårlig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Du har allerede vurderet for bedømmelseskriterierne {}.
 DocType: Vehicle Service,Engine Oil,Motorolie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Arbejdsordrer oprettet: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Arbejdsordrer oprettet: {0}
 DocType: Sales Invoice,Sales Team1,Salgs TEAM1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kundeadresse
-DocType: Employee Loan,Loan Details,Lånedetaljer
+DocType: Loan,Loan Details,Lånedetaljer
 DocType: Company,Default Inventory Account,Standard lagerkonto
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numrene matcher ikke
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Et link til alle de jordarealer, hvor afgrøden vokser"
 DocType: Account,Root Type,Rodtype
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
 DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
 DocType: BOM,Item UOM,Vareenhed
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Cheque Print Template,Primary Settings,Primære indstillinger
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandør Adresse
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Tilføj medarbejdere
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Tilføj medarbejdere
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontrol
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Standardskabelon
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,Antal afsendte SMS'er
 DocType: Antibiotic,Healthcare Administrator,Sundhedsadministrator
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Indstil et mål
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: Dosage Strength,Dosage Strength,Doseringsstyrke
 DocType: Account,Expense Account,Udgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Farve
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Farve
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vurdering Plan Kriterier
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Udløbsdato er obligatorisk for den valgte vare
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Forhindre indkøbsordrer
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,Personlig og social historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bruger {0} oprettet
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver elev
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Skift kode
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelsesbeløb
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Prisliste Valuta ikke valgt
 DocType: Purchase Invoice,Availed ITC Cess,Benyttet ITC Cess
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Forsendelsesregel gælder kun for salg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Sag startdato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Indtil
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøb log
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Elevgruppe eller kursusplan er obligatorisk
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligehold faktureringstimer og arbejdstimer i samme tidskladde
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Skriv dine produkter eller tjenester, som du køber eller sælger."
 DocType: Water Analysis,Storage Temperature,Stuetemperatur
 DocType: Employee Attendance Tool,Unmarked Attendance,umærket Deltagelse
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Forsker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Tilmelding Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Startdatoen skal være mindre end slutdatoen for opgaven {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navn eller E-mail er obligatorisk
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} har for øjeblikket et {1} leverandør scorecard stående, og RFQs til denne leverandør skal udleveres med forsigtighed."
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Totale omkostninger (firmavaluta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serienummer {0} oprettet
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serienummer {0} oprettet
 DocType: Homepage,Company Description for website homepage,Firmabeskrivelse til hjemmesiden
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Af hensyn til kunderne, kan disse koder bruges i udskriftsformater ligesom fakturaer og følgesedler"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Navn
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
 DocType: Healthcare Settings,Result Printed,Resultat trykt
 DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Prøvetid
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Se {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Project,Total Costing Amount (via Timesheets),Samlet Omkostningsbeløb (via tidsskemaer)
-DocType: Employee Advance,Expense Approver,Udlægsgodkender
+DocType: Department,Expense Approver,Udlægsgodkender
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 DocType: Project,Hourly,Hver time
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Ikke-gruppe til gruppe
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til datotid
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Foretag betaling via kassekladden
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Trykt On
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Trykt On
 DocType: Item,Inspection Required before Delivery,Kontrol påkrævet før levering
 DocType: Item,Inspection Required before Purchase,Kontrol påkrævet før køb
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afventende aktiviteter
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimumsordrenummer
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Din organisation
 DocType: Fee Component,Fees Category,Gebyrer Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Indtast lindre dato.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Underrette medarbejder
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Genbestil Level
 DocType: Company,Chart Of Accounts Template,Kontoplan Skabelon
 DocType: Attendance,Attendance Date,Fremmødedato
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønnen opdelt på tillæg og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepteret lager
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,Værdiansættelsesmetode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Halvdags
 DocType: Sales Invoice,Sales Team,Salgsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Indtast modtagerens navn før indsendelse.
 DocType: Program Enrollment Tool,Get Students,Hent studerende
 DocType: Serial No,Under Warranty,Under garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Fejl]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Fejl]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"""I Ord"" vil være synlig, når du gemmer salgsordren."
 ,Employee Birthday,Medarbejder Fødselsdag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Vælg venligst Afslutningsdato for Afsluttet Reparation
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reserveret til underentreprise
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Ordrer
-DocType: Employee Leave Approver,Leave Approver,Fraværsgodkender
+DocType: Department,Leave Approver,Fraværsgodkender
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vælg venligst et parti
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
@@ -3593,7 +3615,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,OPRINDELIGT FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Denne email er autogenereret
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Forventet værdi efter forventet brugstid
@@ -3618,21 +3639,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Tilstedeværelse {0} eksisterer for studerende {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Bortfaldne afskrivninger grundet afhændelse af aktiver
-DocType: Member,Member,Medlem
+DocType: Loan,Member,Medlem
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrér adresser
 DocType: Work Order Item,Work Order Item,Arbejdsordre
 DocType: Pricing Rule,Item Code,Varenr.
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
 DocType: Journal Entry,User Remark,Brugerbemærkning
 DocType: Lead,Market Segment,Markedssegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landbrugschef
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end det samlede negative udestående beløb {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end det samlede negative udestående beløb {0}
 DocType: Supplier Scorecard Period,Variables,Variable
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Lukning (dr)
 DocType: Cheque Print Template,Cheque Size,Anvendes ikke
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serienummer {0} ikke er på lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serienummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Beskatningsskabelon for salgstransaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} stemmer ikke overens med firma {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,Standard lagerenhed
 DocType: Asset,Number of Depreciations Booked,Antal Afskrivninger Reserveret
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Antal i alt
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Imod medarbejderlån: {0}
 DocType: Landed Cost Item,Receipt Document,Kvittering dokument
 DocType: Employee Education,School/University,Skole / Universitet
 DocType: Payment Request,Reference Details,Henvisning Detaljer
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,Dobbelt Faldende Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Lukket ordre kan ikke annulleres. Unclose at annullere.
 DocType: Student Guardian,Father,Far
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 DocType: Attendance,On Leave,Fraværende
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,Lavere indkomst
 DocType: Restaurant Order Entry,Current Order,Nuværende ordre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differencebeløbet skal være af kontotypen Aktiv / Fordring, da denne lagerafstemning er en åbningsbalance"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differencebeløbet skal være af kontotypen Aktiv / Fordring, da denne lagerafstemning er en åbningsbalance"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Gå til Programmer
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Række {0} # Tildelt mængde {1} kan ikke være større end uanmeldt mængde {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Række {0} # Tildelt mængde {1} kan ikke være større end uanmeldt mængde {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Indkøbsordrenr. påkrævet for vare {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,Betalingsbetingelser
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Purchase Invoice,Purchase Taxes and Charges,Indkøb Moms og afgifter
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Gå til leverandører
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Tilbud {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveret
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Angiv e-mail-id til den studerende for at sende betalingsanmodningen
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Angiv e-mail-id til den studerende for at sende betalingsanmodningen
 DocType: Patient,Medical History,Medicinsk historie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank kassekredit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank kassekredit
 DocType: Patient,Patient ID,Patient-ID
 DocType: Physician Schedule,Schedule Name,Planlægningsnavn
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Opret lønseddel
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Tilføj alle leverandører
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Tilføj alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allokeret beløb kan ikke være større end udestående beløb.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Gennemse styklister
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Sikrede lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Sikrede lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Redigér bogføringsdato og -tid
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Venligst sæt Afskrivninger relaterede konti i Asset kategori {0} eller Company {1}
 DocType: Lab Test Groups,Normal Range,Normal rækkevidde
 DocType: Academic Term,Academic Year,Skoleår
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Tilgængelig salg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Åbning Balance Egenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Resterende
 DocType: Appraisal,Appraisal,Vurdering
+DocType: Loan,Loan Account,Lånekonto
 DocType: Purchase Invoice,GST Details,GST Detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mail sendt til leverandør {0}
 DocType: Item,Default Sales Unit of Measure,Standard salgsforanstaltning
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademi år:
+DocType: Subscription,Past Due Date,Forfaldsdato
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Tillad ikke at indstille alternativt element til varen {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datoen er gentaget
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,Patientaftale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Afmeld dette e-mail-nyhedsbrev
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Få leverandører af
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Få leverandører af
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ikke fundet for punkt {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Gå til kurser
 DocType: Accounts Settings,Show Inclusive Tax In Print,Vis inklusiv skat i tryk
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto med barn noder kan ikke indstilles som hovedbog
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse&gt; Uddannelsesindstillinger
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (firmavaluta)
 DocType: Physician,Physician Schedules,Lægeplaner
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Samlet forskudsbeløb kan ikke være større end det samlede sanktionerede beløb
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Samlet forskudsbeløb kan ikke være større end det samlede sanktionerede beløb
 DocType: Salary Slip,Hour Rate,Timesats
 DocType: Stock Settings,Item Naming By,Item Navngivning By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
 DocType: BOM,Inspection Required,Inspection Nødvendig
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Indtast bankgarantienummeret før indsendelse.
 DocType: Driving License Category,Class,klasse
 DocType: Sales Order,Fully Billed,Fuldt Billed
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Arbejdsordre kan ikke rejses imod en vare skabelon
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagematerialevægt. (til udskrivning)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse&gt; Uddannelsesindstillinger
 DocType: Serial No,Is Cancelled,Er Annulleret
 DocType: Student Group,Group Based On,Gruppe baseret på
 DocType: Journal Entry,Bill Date,Bill Dato
@@ -3796,9 +3818,10 @@
 DocType: Cheque Print Template,Cheque Height,Anvendes ikke
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Expense Claim,Approval Status,Godkendelsesstatus
 DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Vælg alle
 ,Issued Items Against Work Order,Udstedte varer mod arbejdsordre
 DocType: Vehicle Log,Invoice Ref,Fakturareference
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarif nummer
 DocType: Work Order Item,Available Qty at WIP Warehouse,Tilgængelig antal på WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Forventet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serienummer {0} hører ikke til lager {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serienummer {0} hører ikke til lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
 DocType: Notification Control,Quotation Message,Tilbudsbesked
-DocType: Employee Loan,Employee Loan Application,Medarbejder låneansøgning
 DocType: Issue,Opening Date,Åbning Dato
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Gem venligst patienten først
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Gem venligst patienten først
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
 DocType: Program Enrollment,Public Transport,Offentlig transport
 DocType: Soil Texture,Silt Composition (%),Silt Sammensætning (%)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),Varebalance (Enkel)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oprettet af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debet notat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debet notat Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabatbeløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
@@ -3875,6 +3897,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Salgsordredato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er oprettet.
 DocType: Stock Settings,Limit Percent,Begrænsningsprocent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Der er i øjeblikket ingen lager på lageret
@@ -3888,14 +3911,15 @@
 DocType: Journal Entry,Stock Entry,Lagerindtastning
 DocType: Payment Entry,Payment References,Betalingsreferencer
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Antal intervaller for intervalfeltet, fx hvis Interval er &#39;Days&#39; og Billing Interval Count er 3, vil fakturaer blive genereret hver 3. dag"
 DocType: Vehicle,Insurance Details,Forsikring Detaljer
 DocType: Account,Payable,Betales
 DocType: Share Balance,Share Type,Share Type
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitorer ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Gross Profit%
 DocType: Appraisal Goal,Weightage (%),Vægtning (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Skift POS-profil
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
@@ -3905,10 +3929,11 @@
 DocType: Lead,Address Desc,Adresse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rækker med dubletter forfaldsdatoer i andre rækker blev fundet: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rækker med dubletter forfaldsdatoer i andre rækker blev fundet: {list}
 DocType: Topic,Topic Name,Emnenavn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Angiv standardskabelon for tilladelse til godkendelse af tilladelser i HR-indstillinger.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Vælg en medarbejder for at få medarbejderen forskud.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Vælg en medarbejder for at få medarbejderen forskud.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vælg venligst en gyldig dato
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Vælg arten af din virksomhed.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,Kildelager
 DocType: Installation Note,Installation Date,Installation Dato
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Del Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Salgsfaktura {0} oprettet
 DocType: Employee,Confirmation Date,Bekræftet den
 DocType: C-Form,Total Invoiced Amount,Totalt faktureret beløb
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,Akkumulerede afskrivninger
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående navn
 DocType: Stock Entry,Customer or Supplier Details,Kunde- eller leverandørdetaljer
-DocType: Employee Loan Application,Required by Date,Kræves af Dato
+DocType: Loan Application,Required by Date,Kræves af Dato
 DocType: Lead,Lead Owner,Emneejer
 DocType: Production Plan,Sales Orders Detail,Salgsordrer Detail
 DocType: Bin,Requested Quantity,Anmodet mængde
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttoløn - Fradrag i alt - Tilbagebetaling af lån
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Nuværende stykliste og ny stykliste må ikke være ens
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Lønseddel id
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Pensioneringsdato skal være større end ansættelsesdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Pensioneringsdato skal være større end ansættelsesdato
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flere varianter
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveret
+DocType: Subscription,Trial Period Start Date,Prøveperiode Startdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Log venligst ind som en anden bruger.
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Medlems navn
 DocType: Stock Settings,Use Naming Series,Brug navngivningsserie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i abonnementet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 DocType: Membership,Payment Details,Betalingsoplysninger
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stoppet Arbejdsordre kan ikke annulleres, Unstop det først for at annullere"
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Træk varene fra følgeseddel
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,Jord enhed
 ,Purchase Analytics,Indkøbsanalyser
 DocType: Sales Invoice Item,Delivery Note Item,Følgeseddelvare
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nuværende faktura {0} mangler
 DocType: Asset Maintenance Log,Task,Opgave
 DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partinummer er obligatorisk for vare {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gevinst / Tab konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbejder og fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Formålet skal være en af {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Udfyld skærmbilledet og gem det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Udfyld skærmbilledet og gem det
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktisk antal på lager
 DocType: Homepage,"URL for ""All Products""",URL til &quot;Alle produkter&quot;
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard salgspris
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
 DocType: Cash Flow Mapper,Section Name,Sektionens navn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Genbestil Antal
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Genbestil Antal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle ledige stillinger
 DocType: Company,Stock Adjustment Account,Stock Justering konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskriv
@@ -4034,9 +4060,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kø for opdatering af seneste pris i alle Materialebevis. Det kan tage et par minutter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Bemærk: Du må ikke oprette konti for kunder og leverandører
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Standard-adresseskabeloner sorteret efter lande
 DocType: Water Analysis,Appearance,Udseende
+DocType: HR Settings,Leave Status Notification Template,Meddelelsesskabelon for meddelelsesstatus
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Gennemsnitlig. Pris for købsprisliste
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Medlemsoplysninger.
@@ -4059,7 +4085,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ikke tilladt. Deaktiver venligst testskabelonen
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel fordeling bør være lig med 100%
 DocType: Crop Cycle,Linked Land Unit,Linked Land Unit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Gå til Brugere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end beløb i alt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke et gyldigt partinummer for vare {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok dage til rådighed til fraværstype {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok dage til rådighed til fraværstype {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ugyldig GSTIN eller Indtast NA for Uregistreret
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tilmelding Gebyr
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 DocType: Company,Create Chart Of Accounts Based On,Opret kontoplan baseret på
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan ikke konvertere det til ikke-gruppe. Børneopgaver eksisterer.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} findes mod studerende ansøger {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Afrundingsjustering (Company Valuta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tidsregistrering
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Parti:
 DocType: Volunteer,Afternoon,Eftermiddag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Cheque Print Template,Scanned Cheque,Anvendes ikke
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} eksisterer allerede
 DocType: Medical Department,Nursing User,Sygeplejerske bruger
 DocType: Plant Analysis,Plant Analysis Criterias,Plant Analyse Kriterier
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Ansvar
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serienummer {0} tilhører ikke Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Ansvar
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighedsperioden for dette citat er afsluttet.
 DocType: Expense Claim Account,Expense Claim Account,Udlægskonto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillad forældede valutakurser
@@ -4137,11 +4164,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Lav variant
 DocType: Item,Default BOM,Standard stykliste
 DocType: Project,Total Billed Amount (via Sales Invoices),Samlet faktureret beløb (via salgsfakturaer)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debet Note Beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debet Note Beløb
 DocType: Project Update,Not Updated,Ikke opdateret
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Der er uoverensstemmelser mellem kursen, antal aktier og det beregnede beløb"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Total Enestående Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Total Enestående Amt
 DocType: Journal Entry,Printing Settings,Udskrivningsindstillinger
 DocType: Employee Advance,Advance Account,Advance konto
 DocType: Job Offer,Job Offer Terms,Jobtilbudsbetingelser
@@ -4150,7 +4177,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskab
 DocType: Asset Category Account,Fixed Asset Account,Anlægsaktivkonto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
 DocType: Chapter,Members,Medlemmer
 DocType: Student,Student Email Address,Studerende e-mailadresse
@@ -4173,7 +4200,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,Adresse Navn
 DocType: Stock Entry,From BOM,Fra stykliste
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Splitting {0} enheder af {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Splitting {0} enheder af {1}
 DocType: Assessment Code,Assessment Code,Assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Grundlæggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktioner før {0} er frosset
@@ -4181,25 +4208,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 DocType: Bank Reconciliation Detail,Payment Document,Betaling dokument
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Fejl ved evaluering af kriterieformlen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Ansættelsesdato skal være større end fødselsdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Ansættelsesdato skal være større end fødselsdato
+DocType: Subscription,Plans,Planer
 DocType: Salary Slip,Salary Structure,Lønstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Issue Materiale
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Der opstod en fejl under oprettelse af tilbagevendende
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,Til lager
 DocType: Employee,Offer Date,Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ingen elevgrupper oprettet.
 DocType: Purchase Invoice Item,Serial No,Serienummer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Række nr. {0}: Forventet leveringsdato kan ikke være før købsdato
 DocType: Purchase Invoice,Print Language,Udskrivningssprog
 DocType: Salary Slip,Total Working Hours,Arbejdstid i alt
 DocType: Sales Invoice,Customer PO Details,Kunde PO Detaljer
-DocType: Subscription,Next Schedule Date,Næste planlægningsdato
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Midlertidig åbningskonto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Indtast værdien skal være positiv
@@ -4227,11 +4253,11 @@
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Fra og Til dato kræves
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra lager
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ingen ansatte for de nævnte kriterier
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
 DocType: Hotel Settings,Default Customer,Standardkunden
 DocType: Assessment Plan,Supervisor Name,supervisor Navn
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bekræft ikke, om en aftale er oprettet for samme dag"
@@ -4255,16 +4281,16 @@
 DocType: Journal Entry Account,Employee Advance,Ansatte Advance
 DocType: Payroll Entry,Payroll Frequency,Lønafregningsfrekvens
 DocType: Lab Test Template,Sensitivity,Følsomhed
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Råmateriale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Planter og Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Planter og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige Arbejde Resumé Indstillinger
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Indtast venligst Reqd by Date
 DocType: Payment Entry,Internal Transfer,Intern overførsel
 DocType: Asset Maintenance,Maintenance Tasks,Vedligeholdelsesopgaver
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Vælg bogføringsdato først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Vælg bogføringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
 DocType: Leave Control Panel,Carry Forward,Benyt fortsat fravær fra sidste regnskabsår
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
@@ -4272,13 +4298,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Opdaget sygdom
 ,Produced,Produceret
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tilbagebetaling Startdato kan ikke være før Udbetalingsdato.
 DocType: Item,Item Code for Suppliers,Varenr. for leverandører
 DocType: Issue,Raised By (Email),Oprettet af (e-mail)
 DocType: Training Event,Trainer Name,Trainer Navn
 DocType: Mode of Payment,General,Generelt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Sidste kommunikation
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serienummer påkrævet for serienummervare {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serienummer påkrævet for serienummervare {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
@@ -4292,7 +4319,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Aktivér / deaktivér valuta.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} på halv dag forladt den {1}
 DocType: Production Plan,Get Material Request,Hent materialeanmodning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Portoudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Portoudgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 ,Item Variant Details,Varevarianter Detaljer
@@ -4303,9 +4330,9 @@
 DocType: Drug Prescription,Hour,Time
 DocType: Restaurant Order Entry,Last Sales Invoice,Sidste salgsfaktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Vælg venligst antal imod vare {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager angivet. Lageret skal sættes ved lagerindtastning eller købskvittering
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager angivet. Lageret skal sættes ved lagerindtastning eller købskvittering
 DocType: Lead,Lead Type,Emnetype
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende fravær på blokerede dage
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende fravær på blokerede dage
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Alle disse varer er allerede blevet faktureret
 DocType: Company,Monthly Sales Target,Månedligt salgsmål
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
@@ -4313,7 +4340,7 @@
 DocType: Item,Default Material Request Type,Standard materialeanmodningstype
 DocType: Supplier Scorecard,Evaluation Period,Evalueringsperiode
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Ukendt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Arbejdsordre er ikke oprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Arbejdsordre er ikke oprettet
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelsesregelbetingelser
 DocType: Purchase Invoice,Export Type,Eksporttype
 DocType: Salary Slip Loan,Salary Slip Loan,Salary Slip Lån
@@ -4329,7 +4356,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Åbning af fakturaoversigt
 DocType: Education Settings,Education Manager,Uddannelsesleder
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimale længde mellem hver plante i marken for optimal vækst
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Parti-vare {0} kan ikke opdateres ved hjælp af lagerafstemning, men brug lagerindtastning i stedet"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Parti-vare {0} kan ikke opdateres ved hjælp af lagerafstemning, men brug lagerindtastning i stedet"
 DocType: Quality Inspection,Report Date,Rapporteringsdato
 DocType: Student,Middle Name,Mellemnavn
 DocType: C-Form,Invoices,Fakturaer
@@ -4360,20 +4387,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Kvittering
 ,Sales Register,Salgs Register
 DocType: Daily Work Summary Group,Send Emails At,Send e-mails på
 DocType: Quotation,Quotation Lost Reason,Tilbud afvist - årsag
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formularvisning
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Expense Approver Obligatorisk i Expense Claim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Tilføj brugere til din organisation, bortset fra dig selv."
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Ingen kunder endnu!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsanalyse
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Ingen væsentlig forespørgsel oprettet
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Vælg dette felt, hvis du også ønsker at inkludere foregående regnskabsår fraværssaldo til indeværende regnskabsår"
@@ -4396,11 +4424,12 @@
 DocType: Vehicle,Chassis No,Stelnummer
 DocType: Payment Request,Initiated,Indledt
 DocType: Production Plan Item,Planned Start Date,Planlagt startdato
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vælg venligst en BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vælg venligst en BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Benyttet ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+DocType: Bank Guarantee,Clauses and Conditions,Klausuler og betingelser
 DocType: Serial No,Creation Document Type,Oprettet dokumenttype
 DocType: Project Task,View Timesheet,Se tidsskema
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Slutdato skal være større end startdato
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Leave Allocation,New Leaves Allocated,Nye fravær Allokeret
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Sagsdata er ikke tilgængelige for tilbuddet
@@ -4414,9 +4443,10 @@
 DocType: Patient,Alcohol Current Use,Alkohol Nuværende Brug
 DocType: Student Admission Program,Student Admission Program,Studenter Adgangsprogram
 DocType: Payment Entry,Account Paid To,Konto Betalt Til
+DocType: Subscription Settings,Grace Period,Afdragsfri periode
 DocType: Item Alternative,Alternative Item Name,Alternativt varenavn
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Overordnet bare {0} må ikke være en lagervare
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Kunne ikke indsende nogen Løn <br> \ Mulige årsager: <br> \ 1. Netto løn er mindre end 0. <br> \ 2. Virksomhedens e-mailadresse angivet i medarbejdermesteren er ikke gyldig. <br>
@@ -4426,7 +4456,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget for konto {1} mod {2} {3} er {4}. Det vil overstige med {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Række {0} # konto skal være af typen 'Anlægsaktiv'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Antal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked Disabled in the
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Nummerserien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Studiekort
@@ -4438,14 +4467,16 @@
 DocType: Complaint,Complaint,Klage
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Lav tilbagebetalingstildeling
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alle afdelinger
 DocType: Patient,Alcohol Past Use,Alkohol tidligere brug
 DocType: Fertilizer Content,Fertilizer Content,Gødning Indhold
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematisk / Stuck
 DocType: Tax Rule,Billing State,Anvendes ikke
 DocType: Share Transfer,Transfer,Overførsel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,"Arbejdsordren {0} skal annulleres, inden afbestillingen af denne salgsordre"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
@@ -4469,10 +4500,11 @@
 DocType: Cheque Print Template,Message to show,Besked for at vise
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Retail
 DocType: Student Attendance,Absent,Ikke-tilstede
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produktpakke
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produktpakke
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Kunne ikke finde nogen score fra {0}. Du skal have stående scoringer på mellem 0 og 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Indkøb Moms- og afgiftsskabelon
+DocType: Subscription,Current Invoice Start Date,Nuværende faktura startdato
 DocType: Timesheet,TS-,TS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet- eller kreditbeløb er påkrævet for {2}
 DocType: GL Entry,Remarks,Bemærkninger
@@ -4482,11 +4514,13 @@
 DocType: Task,Parent Task,Forældreopgave
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Opret emne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print og papirvarer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print og papirvarer
 DocType: Stock Settings,Show Barcode Field,Vis stregkodefelter
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Send Leverandør Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Løn allerede behandlet for perioden {0} til {1}, ferie ansøgningsperiode kan ikke være i dette datointerval."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Send Leverandør Emails
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Løn allerede behandlet for perioden {0} til {1}, ferie ansøgningsperiode kan ikke være i dette datointerval."
+DocType: Fiscal Year,Auto Created,Automatisk oprettet
 DocType: Chapter Member,Leave Reason,Forlad grunden
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} eksisterer ikke længere
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
 DocType: Volunteer,Availability,tilgængelighed
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Indstil standardværdier for POS-fakturaer
@@ -4494,14 +4528,13 @@
 DocType: Project,Time to send,Tid til at sende
 DocType: Timesheet,Employee Detail,Medarbejderoplysninger
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Næste dagsdato og Gentagelsesdag i måneden skal være ens
 DocType: Lab Prescription,Test Code,Testkode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Indstillinger for hjemmesidens startside
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;er er ikke tilladt for {0} på grund af et scorecard stående på {1}
 DocType: Job Offer,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Frem
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Samlede beløb {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Samlede beløb {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Angiv hvis ikke-standard betalingskonto
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vælg venligst vurderingsgruppen bortset fra &#39;Alle vurderingsgrupper&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Række {0}: Omkostningscenter er påkrævet for en vare {1}
@@ -4512,7 +4545,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vandanalyse
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negative Værdiansættelses Rate er ikke tilladt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Værdiansættelses Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugedag fri
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Genindlæs tilknyttet analyse
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
@@ -4528,7 +4561,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Udgifter kasseret anlægsaktiv
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningssted er obligatorisk for vare {2}
 DocType: Vehicle,Policy No,Politik Ingen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Hent varer fra produktpakke
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Hent varer fra produktpakke
 DocType: Asset,Straight Line,Lineær afskrivning
 DocType: Project User,Project User,Sagsbruger
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Dele
@@ -4564,21 +4597,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Sti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
 DocType: Production Plan,Total Planned Qty,Samlet planlagt antal
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,åbning Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,åbning Value
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serienummer
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serienummer
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Salgskonto
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Salgskonto
 DocType: Purchase Invoice Item,Total Weight,Totalvægt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Salgsprovisioner
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Salgsprovisioner
 DocType: Job Offer Term,Value / Description,/ Beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og kredit ikke ens for {0} # {1}. Forskellen er {2}.
 DocType: Asset Maintenance Task,Assign To Name,Tildel til navn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Repræsentationsudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Repræsentationsudgifter
 DocType: Hub Settings,Enabled Users,Aktiverede brugere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Opret materialeanmodning
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Åbent Item {0}
@@ -4591,24 +4624,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Søg om tilladelse til fravær.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Sidste synsdato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Advokatudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Advokatudgifter
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vælg venligst antal på række
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Gør åbning af salgs- og købsfakturaer
 DocType: Purchase Invoice,Posting Time,Bogføringsdato og -tid
 DocType: Timesheet,% Amount Billed,% Faktureret beløb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonudgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ingen vare med serienummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ingen vare med serienummer {0}
 DocType: Email Digest,Open Notifications,Åbne Meddelelser
 DocType: Payment Entry,Difference Amount (Company Currency),Differencebeløb (firmavaluta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direkte udgifter
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Omsætning nye kunder
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Rejseudgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Rejseudgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tilføj brugerdefineret felt Abonnement i doktypen {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Purchase Receipt Item,Sample Quantity,Prøvekvantitet
+DocType: Bank Guarantee,Name of Beneficiary,Navn på modtager
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Opdater BOM omkostninger automatisk via Scheduler, baseret på seneste værdiansættelsesrate / prisliste sats / sidste købspris for råvarer."
 DocType: Bank Reconciliation Detail,Cheque Date,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
@@ -4620,14 +4653,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Kriminalforsorgen
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Lønarter
 DocType: Program Enrollment Tool,New Academic Year,Nyt skoleår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Samlet indbetalt beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Samlet indbetalt beløb
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,Overført antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planlægning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planlægning
 DocType: Share Balance,Issued,Udstedt
+DocType: Loan,Repayment Start Date,Tilbagebetaling Startdato
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentaktivitet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverandør id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
@@ -4640,10 +4674,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
 DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
 DocType: Assessment Result,Student Name,Elevnavn
 DocType: Brand,Item Manager,Varechef
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Udbetalt løn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Udbetalt løn
 DocType: Buying Settings,Default Supplier Type,Standard-leverandørtype
 DocType: Plant Analysis,Collection Datetime,Samling Datetime
 DocType: Work Order,Total Operating Cost,Samlede driftsomkostninger
@@ -4653,9 +4687,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Brugeren {0} eksisterer ikke
 DocType: Payment Term,Day(s) after invoice date,Dag (er) efter faktura dato
 DocType: Payment Schedule,Payment Schedule,Betalingsplan
-DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Betaling indtastning findes allerede
+DocType: Subscription,Trial Period End Date,Prøveperiode Slutdato
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Løn skabelon mester.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologi
@@ -4672,9 +4706,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Tilbud til emner eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
 ,Territory Target Variance Item Group-Wise,Områdemål Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Akkumuleret månedlig
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske er valutaveksling record ikke lavet for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske er valutaveksling record ikke lavet for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Momsskabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
@@ -4683,14 +4717,15 @@
 DocType: Lab Prescription,Test Created,Test oprettet
 DocType: Healthcare Settings,Custom Signature in Print,Brugerdefineret signatur i udskrivning
 DocType: Account,Temporary,Midlertidig
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kunde LPO nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kunde LPO nr.
 DocType: Program,Courses,Kurser
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvis fordeling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretær
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Words&#39; område vil ikke være synlig i enhver transaktion"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"Denne handling stopper fremtidig fakturering. Er du sikker på, at du vil annullere dette abonnement?"
 DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterier Navn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Angiv venligst firma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Angiv venligst firma
 DocType: Pricing Rule,Buying,Køb
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Sygdomme og gødninger
 DocType: HR Settings,Employee Records to be created by,Medarbejdere skal oprettes af
@@ -4699,17 +4734,17 @@
 DocType: POS Profile,Apply Discount On,Påfør Rabat på
 DocType: Member,Membership Type,Medlemskabstype
 ,Reqd By Date,Reqd Efter dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditorer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditorer
 DocType: Assessment Plan,Assessment Name,Vurdering Navn
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Vis PDC i Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Vis PDC i Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Række # {0}: serienummer er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Jobtilbud
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut Forkortelse
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Leverandørtilbud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Leverandørtilbud
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""I Ord"" vil være synlig, når du gemmer tilbuddet."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Mængde ({0}) kan ikke være en brøkdel i række {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Mængde ({0}) kan ikke være en brøkdel i række {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
@@ -4727,7 +4762,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Samlet Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Deltagelse for medarbejder {0} er allerede markeret for denne dag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Deltagelse for medarbejder {0} er allerede markeret for denne dag
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Emne
@@ -4738,6 +4773,7 @@
 DocType: Lab Test,Approved Date,Godkendt dato
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Mindst ét lager skal angives
+DocType: Subscriber,Subscriber Name,Abonnentnavn
 DocType: Serial No,Out of Warranty,Garanti udløbet
 DocType: BOM Update Tool,Replace,Udskift
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ingen produkter fundet.
@@ -4747,19 +4783,18 @@
 DocType: Request for Quotation Item,Project Name,Sagsnavn
 DocType: Customer,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Vælg renteindtægter konto i medarbejderlån {0}
 DocType: Work Order,Required Items,Nødvendige varer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Menneskelige Ressourcer
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
 DocType: Disease,Treatment Task,Behandlingstjeneste
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skatteaktiver
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,Styklistenr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Update Tool,The BOM which will be replaced,Den stykliste som vil blive erstattet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektronisk udstyr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektronisk udstyr
 DocType: Asset,Maintenance Required,Vedligeholdelse kræves
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Fravær skal angives i multipla af 0,5"
@@ -4768,7 +4803,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Række {0}: Aktiv er obligatorisk for anlægsaktiv køb / salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Række {0}: Aktiv er obligatorisk for anlægsaktiv køb / salg
 DocType: Asset Maintenance Team,Maintenance Team Name,Vedligeholdelsesnavn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Kunde er obligatorisk, hvis &#39;Mulighed Fra&#39; er valgt som kunde"
@@ -4777,19 +4812,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillad følgende brugere til at godkende fraværsansøgninger på blokerede dage.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Udlægstyper.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salgsprisen for vare {0} er lavere end dens {1}. Salgsprisen skal være mindst {2}
-DocType: Item,Taxes,Moms
+DocType: Subscription,Taxes,Moms
 DocType: Purchase Invoice,capital goods,kapitalgoder
 DocType: Purchase Invoice Item,Weight Per Unit,Vægt pr. Enhed
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Betalt og ikke leveret
 DocType: Project,Default Cost Center,Standard omkostningssted
-DocType: Bank Guarantee,End Date,Slutdato
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagertransaktioner
 DocType: Budget,Budget Accounts,Budget Regnskab
 DocType: Employee,Internal Work History,Intern Arbejde Historie
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumuleret Afskrivninger Beløb
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Leverandør Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,fuldt udbetalt
 DocType: Employee Advance,Due Advance Amount,Forfaldne beløb
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Udlæg
@@ -4813,7 +4846,7 @@
 ,Employee Information,Medarbejder Information
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",Kan ikke filtrere baseret på bilagsnr. hvis der sorteres efter Bilagstype
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Opret Leverandørtilbud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Opret Leverandørtilbud
 DocType: Quality Inspection,Incoming,Indgående
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standard skat skabeloner til salg og køb oprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Vurdering Resultatoptegnelsen {0} eksisterer allerede.
@@ -4821,7 +4854,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Indstil Firmafilter blankt, hvis Group By er &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,for at generere den tilbagevendende
 DocType: Stock Entry,Target Warehouse Address,Mållagerhusadresse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Slutdagen
@@ -4846,11 +4878,10 @@
 DocType: Material Request,% Ordered,% Bestilt
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursusbaseret studentegruppe vil kurset blive valideret for hver elev fra de tilmeldte kurser i programtilmelding.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gns. købssats
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Gns. købssats
 DocType: Share Balance,From No,Fra nr
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
 DocType: Employee,History In Company,Historie I Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Ny besked fra {afsender}
 DocType: Customer,Customer Primary Address,Kunde primære adresse
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhedsbreve
 DocType: Drug Prescription,Description/Strength,Beskrivelse / Strength
@@ -4859,22 +4890,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Samme vare er blevet indtastet flere gange
 DocType: Department,Leave Block List,Blokér fraværsansøgninger
 DocType: Purchase Invoice,Tax ID,CVR-nr.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke opsat til serienumre. Kolonnen skal være tom
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke opsat til serienumre. Kolonnen skal være tom
 DocType: Accounts Settings,Accounts Settings,Kontoindstillinger
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Godkende
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformateret adresse til {0}, skal du rette for at fortsætte."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformateret adresse til {0}, skal du rette for at fortsætte."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Antal nye konti, det vil blive inkluderet i kontonavnet som et præfiks"
 DocType: Maintenance Team Member,Team Member,Medarbejder
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Intet resultat at indsende
 DocType: Customer,Sales Partner and Commission,Forhandler og provision
-DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / år
+DocType: Loan,Rate of Interest (%) / Year,Rente (%) / år
 ,Project Quantity,Sagsmængde
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;"
 DocType: Opportunity,To Discuss,Samtaleemne
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} enheder af {1} skal bruges i {2} at fuldføre denne transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Midlertidige konti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Sort
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Midlertidige konti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Sort
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
 DocType: Shareholder,Contact List,Kontakt liste
 DocType: Account,Auditor,Revisor
@@ -4882,16 +4913,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} varer produceret
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Lær mere
 DocType: Cheque Print Template,Distance from top edge,Afstand fra overkanten
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Prisliste {0} er deaktiveret eller findes ikke
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Prisliste {0} er deaktiveret eller findes ikke
 DocType: Purchase Invoice,Return,Retur
 DocType: Pricing Rule,Disable,Deaktiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Betalingsmåde er forpligtet til at foretage en betaling
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Betalingsmåde er forpligtet til at foretage en betaling
 DocType: Project Task,Pending Review,Afventende anmeldelse
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Rediger på fuld side for flere muligheder som aktiver, serienummer, partier osv."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Udnævnelser og konsultationer
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke indskrevet i batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Anlægsaktiv {0} kan ikke kasseres, da det allerede er {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Checks påkrævet
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Checks påkrævet
 DocType: Task,Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Markér ikke-tilstede
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kunne ikke opsætte firmaet
@@ -4903,7 +4934,7 @@
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Gebyr Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Firmabiler
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Tilføj varer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Tilføj varer fra
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Afgrøder og lande
 DocType: Cheque Print Template,Regular,Fast
 DocType: Fertilizer,Density (if liquid),Tæthed (hvis væske)
@@ -4928,24 +4959,26 @@
 DocType: Payment Entry,Paid Amount,Betalt beløb
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Udforsk salgscyklus
 DocType: Assessment Plan,Supervisor,Tilsynsførende
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Varevariant
 ,Work Order Stock Report,Arbejdsordre lagerrapport
+DocType: Purchase Receipt,Auto Repeat Detail,Automatisk gentag detaljer
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Som Supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Foreslå kategori
 DocType: BOM Scrap Item,BOM Scrap Item,Stykliste skrotvare
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Godkendte ordrer kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kvalitetssikring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kvalitetssikring
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Vare {0} er blevet deaktiveret
 DocType: Project,Total Billable Amount (via Timesheets),Samlet fakturerbart beløb (via timesheets)
 DocType: Agriculture Task,Previous Business Day,Tidligere Erhvervsdag
-DocType: Employee Loan,Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode
+DocType: Loan,Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode
 DocType: Employee,Health Insurance No,Sygesikring nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Indtast mængde for vare {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditnota Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditnota Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Samlet skattepligtigt beløb
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Opening Invoice Creation Tool,Purchase,Indkøb
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance Antal
@@ -4956,15 +4989,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 DocType: Healthcare Settings,Valid number of days,Gyldigt antal dage
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Omkostningssteder
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Genstart abonnement
 DocType: Land Unit,Linked Plant Analysis,Linked Plant Analysis
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillad nulværdi
+DocType: Bank Guarantee,Receiving,Modtagelse
 DocType: Training Event Employee,Invited,inviteret
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive lønstrukturer fundet for medarbejder {0} for de givne datoer
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Opsætning Gateway konti.
 DocType: Employee,Employment Type,Beskæftigelsestype
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anlægsaktiver
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Anlægsaktiver
 DocType: Payment Entry,Set Exchange Gain / Loss,Sæt Exchange Gevinst / Tab
 ,GST Purchase Register,GST købsregistrering
 ,Cash Flow,Pengestrøm
@@ -4984,9 +5019,10 @@
 DocType: Academic Term,Term Start Date,Betingelser startdato
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Liste over alle aktietransaktioner
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Begge prøveperiode Startdato og prøveperiode Slutdato skal indstilles
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gennemsnitlig sats
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samlet betalingsbeløb i betalingsplan skal svare til Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samlet betalingsbeløb i betalingsplan skal svare til Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
 DocType: Job Applicant,Applicant Name,Ansøgernavn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Varenavn
@@ -5016,6 +5052,7 @@
 DocType: Work Order,Warehouses,Lagre
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv kan ikke overføres
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel værelsespriser
+DocType: Subscription,Days Until Due,Dage indtil forfaldsdato
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Denne vare er en variant af {0} (skabelon).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Indkøb
@@ -5024,13 +5061,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",For Batch-baserede Studentegruppe bliver Student Batch Valideret for hver Student fra Programindskrivningen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kan ikke slettes, da der eksisterer lagerposter for dette lager."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribution
+DocType: Journal Entry Account,Loan,Lån
 DocType: Expense Claim Advance,Expense Claim Advance,Udgiftskrav Advance
 DocType: Lab Test,Report Preference,Rapportindstilling
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Frivillig information.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektleder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektleder
 ,Quoted Item Comparison,Sammenligning Citeret Vare
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Overlappe i scoring mellem {0} og {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksimal rabat tilladt for vare: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Indre værdi som på
 DocType: Crop,Produce,Fremstille
@@ -5040,7 +5078,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materialeforbrug til fremstilling
 DocType: Item Alternative,Alternative Item Code,Alternativ varekode
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Vælg varer til Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Vælg varer til Produktion
 DocType: Delivery Stop,Delivery Stop,Leveringsstop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
 DocType: Item,Material Issue,Materiale Issue
@@ -5050,15 +5088,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
 DocType: BOM,Show Items,Vis elementer
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra Tiden kan ikke være større end til anden.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vil du anmelde alle kunderne via e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vil du anmelde alle kunderne via e-mail?
+DocType: Subscription Plan,Billing Interval,Faktureringsinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Genoptag
 DocType: Hub Settings,Hub Username,Nav brugernavn
 DocType: Salary Detail,Component,Lønart
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Group
 DocType: Healthcare Settings,Patient Name By,Patientnavn By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Entry for løn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Entry for løn fra {0} til {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
 DocType: Warehouse,Warehouse Name,Lagernavn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
@@ -5072,22 +5110,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
 DocType: Leave Block List,Applies to Company,Gælder for hele firmaet
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Kan ikke annullere, for en godkendt lagerindtastning {0} eksisterer"
-DocType: Employee Loan,Disbursement Date,Udbetaling Dato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Modtagere&#39; er ikke angivet
+DocType: Loan,Disbursement Date,Udbetaling Dato
 DocType: BOM Update Tool,Update latest price in all BOMs,Opdater seneste pris i alle BOM&#39;er
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicinsk post
 DocType: Vehicle,Vehicle,Køretøj
 DocType: Purchase Invoice,In Words,I Words
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Indtast navnet på banken eller låneinstitutionen før indsendelse.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} skal indsendes
 DocType: POS Profile,Item Groups,Varegrupper
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
 DocType: Sales Order Item,For Production,For Produktion
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Tilføj venligst en midlertidig åbningskonto i kontoplan
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Tilføj venligst en midlertidig åbningskonto i kontoplan
 DocType: Customer,Customer Primary Contact,Kunde primær kontakt
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periode Lukning Journal
 DocType: Project Task,View Task,Vis opgave
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Bankgaranti Type
 DocType: Material Request,MREQ-,MANM-
 DocType: Payment Schedule,Invoice Portion,Fakturaafdeling
 ,Asset Depreciations and Balances,Asset Afskrivninger og Vægte
@@ -5098,9 +5137,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inkluder underleverancer
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Tilslutte
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Kan ikke ændre Variant egenskaber efter lagertransmission. Du bliver nødt til at lave en ny vare til at gøre dette.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
-DocType: Employee Loan,Repay from Salary,Tilbagebetale fra Løn
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+DocType: Loan,Repay from Salary,Tilbagebetale fra Løn
 DocType: Leave Application,LAP/,ANFR/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Anmodning betaling mod {0} {1} for beløb {2}
 DocType: Salary Slip,Salary Slip,Lønseddel
@@ -5124,11 +5162,11 @@
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Samme varegruppe findes to gange i varegruppetabellen
 DocType: Land Unit,Parent Land Unit,Moderselskab
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
 DocType: Fertilizer,Fertilizer Name,Gødning Navn
 DocType: Salary Slip,Net Pay,Nettoløn
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} er allerede blevet modtaget
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serienummer {0} er allerede blevet modtaget
 ,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
 DocType: Expense Claim,Vehicle Log,Kørebog
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Tilstedeværelse af feber (temp&gt; 38,5 ° C eller vedvarende temperatur&gt; 38 ° C / 100,4 ° F)"
@@ -5169,24 +5207,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: Asset Maintenance,Manufacturing User,Produktionsbruger
 DocType: Purchase Invoice,Raw Materials Supplied,Leverede råvarer
-DocType: C-Form,Series,Nummerserie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} skal være {1} eller {2}
 DocType: Appraisal,Appraisal Template,Vurderingsskabelon
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Item Klassifikation
 DocType: Driver,License Number,Licens nummer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Formål med vedligeholdelsesbesøg
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Faktura Patientregistrering
 DocType: Crop,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Finansbogholderi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Medarbejder {0} tjenestefrihed af {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Medarbejder {0} tjenestefrihed af {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se emner
 DocType: Program Enrollment Tool,New Program,nyt Program
 DocType: Item Attribute Value,Attribute Value,Attribut Værdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
 DocType: Salary Detail,Salary Detail,Løn Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Vælg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Vælg {0} først
 DocType: Appointment Type,Physician,Læge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} af varer {1} er udløbet.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Høringer
@@ -5194,15 +5231,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan ikke være større end den planlagte mængde ({2}) i Work Order {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tidsregistrering til Produktion.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan ikke ændre Variantegenskaber efter aktiehandel. Du bliver nødt til at lave en ny vare til at gøre dette.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandat
 DocType: Physician,Charges,Afgifter
 DocType: Production Plan,Get Items For Work Order,Få varer til arbejdsordre
 DocType: Salary Detail,Default Amount,Standard Mængde
 DocType: Lab Test Template,Descriptive,Beskrivende
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Lager ikke fundet i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Lager ikke fundet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Denne måneds Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontrol-aflæsning
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
 DocType: Tax Rule,Purchase Tax Template,Indkøb Momsskabelon
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Indstil et salgsmål, du gerne vil opnå for din virksomhed."
 ,Project wise Stock Tracking,Opfølgning på lager sorteret efter sager
@@ -5230,11 +5268,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Kunne ikke oprette websted
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry allerede oprettet eller Sample Mængde ikke angivet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry allerede oprettet eller Sample Mængde ikke angivet
 DocType: Program,Program Abbreviation,Program Forkortelse
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i købskvitteringen for hver enkelt vare
 DocType: Warranty Claim,Resolved By,Løst af
-DocType: Bank Guarantee,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
@@ -5249,11 +5286,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timer
 DocType: Project,Expected Start Date,Forventet startdato
 DocType: Purchase Invoice,04-Correction in Invoice,04-korrektion i fakturaen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Arbejdsordre allerede oprettet for alle varer med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Arbejdsordre allerede oprettet for alle varer med BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Details Report
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Købsprisliste
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Købsprisliste
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Annuller abonnement
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Vælg venligst Vedligeholdelsesstatus som Afsluttet eller fjern Afslutningsdato
 DocType: Supplier,Default Payment Terms Template,Standard betalingsbetingelser skabelon
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaktion valuta skal være samme som Payment Gateway valuta
@@ -5264,7 +5302,6 @@
 DocType: Employee,Educational Qualification,Uddannelseskvalifikation
 DocType: Workstation,Operating Costs,Driftsomkostninger
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action hvis Akkumulerede Månedligt budget overskredet
-DocType: Subscription,Submit on creation,Godkend ved oprettelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta for {0} skal være {1}
 DocType: Asset,Disposal Date,Salgsdato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mails vil blive sendt til alle aktive medarbejdere i selskabet ved den givne time, hvis de ikke har ferie. Sammenfatning af svarene vil blive sendt ved midnat."
@@ -5282,6 +5319,7 @@
 DocType: Batch,Parent Batch,Overordnet parti
 DocType: Cheque Print Template,Cheque Print Template,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram af omkostningssteder
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Antal dage efter fakturadato er udløbet, før abonnement eller markeringsabonnement ophæves som ubetalt"
 DocType: Lab Test Template,Sample Collection,Prøveopsamling
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
 DocType: Price List,Price List Name,Prislistenavn
@@ -5290,7 +5328,7 @@
 DocType: Account,Income,Indtægter
 DocType: Industry Type,Industry Type,Branchekode
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Advarsel: Fraværsansøgningen indeholder følgende blokerede dage
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Advarsel: Fraværsansøgningen indeholder følgende blokerede dage
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Salgsfaktura {0} er allerede blevet godkendt
 DocType: Supplier Scorecard Scoring Criteria,Score,score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskabsår {0} findes ikke
@@ -5310,12 +5348,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Kassesystemprofil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} skal være en værdi mellem 0 og 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Næste afskrivningsdato kan ikke være før tilgængelig dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Usikrede lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Omkostningsstednavn
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbejdstid mod Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total Betalt Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total Betalt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
 DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
 DocType: Hub Settings,Company and Seller Profile,Firma og Sælger Profil
@@ -5329,10 +5367,9 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ret venligst
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonym
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Modtaget fra
 DocType: Lead,Converted,Konverteret
@@ -5346,6 +5383,7 @@
 DocType: Asset,Assets,Aktiver
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
+DocType: Subscription,Current Invoice End Date,Nuværende faktura Slutdato
 DocType: Payment Term,Due Date Based On,Forfaldsdato baseret på
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Angiv standard kundegruppe og område i Sælgerindstillinger
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} findes ikke
@@ -5353,7 +5391,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hent ikke-afstemte poster
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Ingen tilbagebetalinger valgt til Journal Entry
 DocType: Payment Reconciliation,From Invoice Date,Fra fakturadato
+DocType: Loan,Disbursed,udbetalt
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieindstillinger
 DocType: Patient Appointment,Service Unit,Serviceenhed
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Vellykket Indstil Leverandør
@@ -5366,12 +5406,12 @@
 DocType: Share Balance,No of Shares,Antal Aktier
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Vælg Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Hjælp til prisfastsættelsesregel
 DocType: School House,House Name,Husnavn
 DocType: Fee Schedule,Total Amount per Student,Samlede beløb pr. Studerende
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrisk
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsæt resten af din organisation som dine brugere. Du kan også tilføje invitere kunder til din portal ved at tilføje dem fra Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi (difference udgående - indgående)
 DocType: Grant Application,Requested Amount,Ønsket beløb
@@ -5381,7 +5421,7 @@
 DocType: Crop Cycle,Detected Diseases,Opdagede sygdomme
 DocType: Stock Entry,Default Source Warehouse,Standardkildelager
 DocType: Item,Customer Code,Kundekode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Birthday Reminder for {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Birthday Reminder for {0}
 DocType: Asset Maintenance Task,Last Completion Date,Sidste sluttidspunkt
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
@@ -5389,9 +5429,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Indstillinger
 DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Lageraktiver
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Lageraktiver
 DocType: Restaurant,Active Menu,Aktiv Menu
 DocType: Target Detail,Target Qty,Target Antal
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Mod lån: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Kassen Indstillinger
 DocType: Student Attendance,Present,Tilstede
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Følgeseddel {0} må ikke godkendes
@@ -5400,9 +5441,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Medarbejder {0} lønseddel er allerede overført til tidsregistreringskladde {1}
 DocType: Vehicle Log,Odometer,kilometertæller
 DocType: Production Plan Item,Ordered Qty,Bestilt antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Vare {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Vare {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
 DocType: Chapter,Chapter Head,Kapitel Hoved
 DocType: Payment Term,Month(s) after the end of the invoice month,Måned (e) efter afslutningen af faktura måned
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Sagsaktivitet / opgave.
@@ -5410,11 +5451,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab resultatet datetime kan ikke være før testen datetime
 DocType: POS Profile,Allow user to edit Discount,Tillad brugeren at redigere rabat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Få kunder fra
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Få kunder fra
 DocType: Purchase Invoice Item,Include Exploded Items,Inkluder eksploderede elementer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Indkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
 DocType: Shipping Rule,Restrict to Countries,Begræns til lande
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Fakturerede timer
 DocType: Project,Total Sales Amount (via Sales Order),Samlet Salgsbeløb (via salgsordre)
@@ -5431,6 +5473,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Vurderingsleder
 DocType: Payment Entry,Allocate Payment Amount,Tildel Betaling Beløb
+DocType: Subscription Plan,Subscription Plan,Abonnementsplan
 DocType: Employee External Work History,Salary,Løn
 DocType: Serial No,Delivery Document Type,Levering Dokumenttype
 DocType: Sales Order,Partly Delivered,Delvist leveret
@@ -5455,9 +5498,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installation af forudindstillinger
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Ingen leveringskort valgt til kunden {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Ingen leveringskort valgt til kunden {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Stykliste erstattet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Vælg varer baseret på Leveringsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Vælg varer baseret på Leveringsdato
 DocType: Grant Application,Has any past Grant Record,Har nogen tidligere Grant Record
 ,Sales Analytics,Salgsanalyser
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Tilgængelige {0}
@@ -5475,7 +5518,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Indstillinger for salgsmodul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelværelse Reservation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kundeservice
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilbyd ansøger en stilling
@@ -5491,7 +5534,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studerende er blevet tilmeldt
 DocType: Fees,Student Details,Studentoplysninger
 DocType: Purchase Invoice Item,Stock Qty,Antal på lager
-DocType: Employee Loan,Repayment Period in Months,Tilbagebetaling Periode i måneder
+DocType: Loan,Repayment Period in Months,Tilbagebetaling Periode i måneder
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
 DocType: Naming Series,Update Series Number,Opdatering Series Number
 DocType: Account,Equity,Egenkapital
@@ -5500,7 +5543,7 @@
 DocType: Task,Closing Date,Closing Dato
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
 DocType: Timesheet,Work Detail,Arbejdsdetalje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingeniør
 DocType: Journal Entry,Total Amount Currency,Samlet beløb Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Varenr. kræves på rækkenr. {0}
@@ -5545,13 +5588,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donor Type oplysninger.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fejl i formel eller betingelse: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Faktureret beløb
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Faktureret beløb
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterier vægt skal tilføje op til 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Fremmøde
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Lagervarer
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, skal hver afdeling vælges, hvor det skal anvendes."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Oprettelse af {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være samme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Bogføringsdato og -tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Momsskabelon til købstransaktioner.
@@ -5575,14 +5617,14 @@
 DocType: Shipping Rule,Fixed,Fast
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afrundningskonto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrationsomkostninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrationsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kundegruppe
-DocType: Journal Entry,Subscription,Abonnement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Kontakt e-mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Gebyr oprettelse afventer
 DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Opsigelsesperiode
 DocType: Asset Category,Asset Category Name,Asset Kategori Navn
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er et overordnet område og kan ikke redigeres.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navn på ny salgsmedarbejder
@@ -5595,7 +5637,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Markér ikke, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
 DocType: Asset,Frequency of Depreciation (Months),Hyppigheden af afskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kreditkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kreditkonto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nulværdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
@@ -5603,7 +5645,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
 DocType: Hub Settings,Company Logo,Firma Logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard-lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
 DocType: Healthcare Settings,Patient Registration,Patientregistrering
@@ -5637,11 +5679,10 @@
 DocType: Journal Entry,Total Debit,Samlet debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard færdigvarer Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Vælg venligst Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Salgsmedarbejder
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Salgsmedarbejder
 DocType: Hotel Room Package,Amenities,Faciliteter
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget og Omkostningssted
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Flere standard betalingsmåder er ikke tilladt
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
 ,Appointment Analytics,Aftale Analytics
 DocType: Vehicle Service,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -5657,6 +5698,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lad feltet stå tomt, hvis du laver elevergrupper hvert år"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apps, der bruger den nuværende nøgle, vil ikke kunne få adgang til, er du sikker?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,Samlet Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Skift skabelonkode
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Betingelsernes slutdato kan ikke være tidligere end betingelsernes startdato. Ret venligst datoerne og prøv igen.
@@ -5667,8 +5709,9 @@
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Kreditbeløb
 DocType: Cheque Print Template,Signatory Position,undertegnende holdning
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Sæt som Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Sæt som Lost
 DocType: Timesheet,Total Billable Hours,Total fakturerbare timer
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Antal dage, som abonnenten skal betale fakturaer genereret af dette abonnement"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betalingskvittering
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er baseret på transaktioner for denne kunde. Se tidslinje nedenfor for detaljer
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Række {0}: Allokeret beløb {1} skal være mindre end eller lig med Payment indtastning beløb {2}
@@ -5687,12 +5730,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Hent sidste købssats
 DocType: Company,Company Info,Firmainformation
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Vælg eller tilføj ny kunde
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Aktiver)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
 DocType: Assessment Result,Summary,Resumé
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debetkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debetkonto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejdernavn
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Bestillingsartikel
@@ -5704,7 +5747,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Indkøbsbeløb
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverandørtilbud {0} oprettet
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Slutår kan ikke være før startår
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Personalegoder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Personalegoder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
 DocType: Work Order,Manufactured Qty,Fremstillet mængde
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Aktierne findes ikke med {0}
@@ -5712,12 +5755,12 @@
 DocType: Asset,Out of Order,Virker ikke
 DocType: Purchase Receipt Item,Accepted Quantity,Mængde
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorer arbejdstidens overlapning
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Vælg batchnumre
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger sendt til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Sags-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rækkenr. {0}: Beløb kan ikke være større end Udestående Beløb overfor Udlæg {1}. Udestående Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rækkenr. {0}: Beløb kan ikke være større end Udestående Beløb overfor Udlæg {1}. Udestående Beløb er {2}
 DocType: Patient Service Unit,Medical Administrator,Medicinsk administrator
 DocType: Assessment Plan,Schedule,Køreplan
 DocType: Account,Parent Account,Parent Konto
@@ -5747,15 +5790,16 @@
 DocType: Asset Repair,Repair Status,Reparation Status
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængeligt antal fra vores lager
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Vælg Medarbejder Record først.
 DocType: POS Profile,Account for Change Amount,Konto for returbeløb
 DocType: Purchase Invoice,input service,input service
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Vedligeholdelse Teammedlem
 DocType: Agriculture Analysis Criteria,Soil Analysis,Jordanalyse
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kursuskode:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Indkøbs- og produktionsdetaljer
@@ -5803,19 +5847,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Indlæggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt navn
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
 DocType: Asset,Asset Category,Asset Kategori
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettoløn kan ikke være negativ
 DocType: Purchase Order,Advance Paid,Forudbetalt
 DocType: Item,Item Tax,Varemoms
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiale til leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiale til leverandøren
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Materialeforespørgselsplanlægning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Skattestyrelsen Faktura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Grænsen {0}% forekommer mere end én gang
 DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Markant Deltagelse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kortfristede forpligtelser
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timeren oversteg de angivne timer.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Send masse-SMS til dine kontakter
 DocType: Patient,A Positive,En positiv
@@ -5826,9 +5870,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øjeblikket en {1} leverandør scorecard stående, og købsordrer til denne leverandør bør udstedes med forsigtighed."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
-DocType: Employee Loan,Loan Type,Lånetype
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} er blevet indsendt succesfuldt
+DocType: Loan,Loan Type,Lånetype
 DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5860,7 +5905,7 @@
 DocType: Item,Units of Measure,Måleenheder
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad produktion på helligdage
 DocType: Sales Invoice,Customer's Purchase Order Date,Kundens indkøbsordredato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedhæftede filer
 DocType: Packing Slip,Package Weight Details,Pakkevægtdetaljer
 DocType: Restaurant Reservation,Reservation Time,Reservationstid
@@ -5875,7 +5920,7 @@
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd by Date kan ikke være før Transaktionsdato
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Fremhævede varer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Skabelon til vilkår og betingelser
 DocType: Serial No,Delivery Details,Levering Detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Omkostningssted kræves i række {0} i Skattetabellen for type {1}
@@ -5885,20 +5930,20 @@
 DocType: Driver,Expiry Date,Udløbsdato
 DocType: Healthcare Settings,Employee name and designation in print,Ansattes navn og betegnelse i print
 ,accounts-browser,konti-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vælg kategori først
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vælg kategori først
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Sags-master.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","For at tillade overfakturering eller overbestilling, skal du opdatere ""Allowance"" i lager- eller vareindstillingerne."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Vis ikke valutasymbol (fx. $) ved siden af valutaen.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Halv dag)
 DocType: Payment Term,Credit Days,Kreditdage
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Vælg patienten for at få labtest
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Masseopret elever
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er fortsat fravær fra sidste regnskabsår
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Hent varer fra stykliste
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Hent varer fra stykliste
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lead Time dage
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er indkomstskat udgift
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Tjek dette, hvis den studerende er bosiddende på instituttets Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
 ,Stock Summary,Stock Summary
@@ -5909,10 +5954,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Driftsomkostninger (Company Valuta)
-DocType: Employee Loan Application,Rate of Interest,Rentesats
+DocType: Loan Application,Rate of Interest,Rentesats
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: Item,Shelf Life In Days,Holdbarhed i dage
 DocType: GL Entry,Is Opening,Er Åbning
+DocType: Department,Expense Approvers,Cost Approves
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
 DocType: Journal Entry,Subscription Section,Abonnementsafdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} findes ikke
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 0e7a007..82d81e5 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Bewertungsberichte
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Verbrauchsgüter
-DocType: Purchase Receipt,Subscription Detail,Abonnement Detail
 DocType: Supplier Scorecard,Notify Supplier,Lieferanten benachrichtigen
 DocType: Item,Customer Items,Kunden-Artikel
 DocType: Project,Costing and Billing,Kalkulation und Abrechnung
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
 DocType: Item,Publish Item to hub.erpnext.com,Artikel über hub.erpnext.com veröffentlichen
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-Mail-Benachrichtigungen
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Beurteilung
 DocType: Item,Default Unit of Measure,Standardmaßeinheit
 DocType: SMS Center,All Sales Partner Contact,Alle Vertriebspartnerkontakte
-DocType: Employee,Leave Approvers,Urlaubsgenehmiger
+DocType: Department,Leave Approvers,Urlaubsgenehmiger
 DocType: Sales Partner,Dealer,Händler
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Untersuchungen
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Verfügbarkeit prüfen
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Lieferanten. Siehe Zeitleiste unten für Details
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Rechtswesen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Rechtswesen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein
 DocType: Bank Guarantee,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Benötigt von
 DocType: Delivery Note,Return Against Delivery Note,Zurück zum Lieferschein
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankname {0} ungültig
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Typen (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Es gibt keine eingereichten Salary Slips zu verarbeiten.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Es gibt keine eingereichten Salary Slips zu verarbeiten.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,zeigen open
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,"Es ist notwendig, diese Handlung heute selbst für die oben erwähnten wiederkehrenden zu nehmen"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Nummernkreise erfolgreich geändert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Auschecken
 DocType: Pricing Rule,Apply On,Anwenden auf
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
 DocType: Support Settings,Support Settings,Support-Einstellungen
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
 ,Batch Item Expiry Status,Stapelobjekt Ablauf-Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bankwechsel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bankwechsel
 DocType: Membership,membership validaty section,Mitgliedschaft validity Abschnitt
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 DocType: Consultation,Consultation,Beratung
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Stoff
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Website erstellen
 DocType: Opening Invoice Creation Tool Item,Quantity,Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Kontenliste darf nicht leer sein.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Kontenliste darf nicht leer sein.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
 DocType: Employee Education,Year of Passing,Abschlussjahr
 DocType: Item,Country of Origin,Herkunftsland
 DocType: Soil Texture,Soil Texture Criteria,Bodentextur Kriterien
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primäre Kontaktdaten
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,offene Probleme
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
 DocType: Lab Test Groups,Add new line,Neue Zeile hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Gesundheitswesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zahlungsverzug (Tage)
@@ -89,7 +85,7 @@
 ,Delay Days,Verzögerungstage
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Rechnung
+DocType: Subscription Invoice,Invoice,Rechnung
 DocType: Purchase Invoice Item,Item Weight Details,Artikel Gewicht Details
 DocType: Asset Maintenance Log,Periodicity,Häufigkeit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Zeile # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Zeile # {0}:
 DocType: Timesheet,Total Costing Amount,Gesamtkalkulation Betrag
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Bitte eine Preisliste auswählen
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Laufende Arbeit/-en
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Bitte wählen Sie Datum
 DocType: Daily Work Summary Group,Holiday List,Urlaubsübersicht
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Buchhalter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Buchhalter
 DocType: Hub Settings,Selling Price List,Verkaufspreisliste
 DocType: Patient,Tobacco Current Use,Tabakstrom Verwendung
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Verkaufsrate
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Verkaufsrate
 DocType: Cost Center,Stock User,Lager-Benutzer
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonnummer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Neu {0}: #{1}
 DocType: Delivery Trip,Initial Email Notification Sent,Erste E-Mail-Benachrichtigung gesendet
 ,Sales Partners Commission,Vertriebspartner-Provision
 DocType: Soil Texture,Sandy Clay Loam,Sandiger Ton Lehm
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Wert nach Abschreibung
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Zugehörig
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Die Teilnahme Datum kann nicht kleiner sein als Verbindungsdatum des Mitarbeiters
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Die Teilnahme Datum kann nicht kleiner sein als Verbindungsdatum des Mitarbeiters
 DocType: Grading Scale,Grading Scale Name,Notenskala Namen
-DocType: Subscription,Repeat on Day,Wiederholen am Tag
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dies ist ein Root-Konto und kann nicht bearbeitet werden.
 DocType: Sales Invoice,Company Address,Firmenanschrift
 DocType: BOM,Operations,Arbeitsvorbereitung
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden
+DocType: Subscription,Subscription Start Date,Startdatum des Abonnements
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",".csv-Datei mit zwei Zeilen, eine für den alten und eine für den neuen Namen, anhängen"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nicht in einem aktiven Geschäftsjahr.
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Testzeitraum-Enddatum Kann nicht vor dem Startdatum der Testzeitraumperiode liegen
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Stellenausschreibung
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Die Stückliste ist für die Lohnbearbeitungseinheit {0} in der Zeile {1} nicht angegeben.
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Gleiche Firma wurde mehr als einmal eingegeben
 DocType: Patient,Married,Verheiratet
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nicht zulässig für {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Holen Sie Elemente aus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Holen Sie Elemente aus
 DocType: Price List,Price Not UOM Dependant,Preis nicht UOM abhängig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Bremsöl
 DocType: Tax Rule,Tax Type,Steuerart
 ,Completed Work Orders,Abgeschlossene Arbeitsaufträge
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Steuerpflichtiger Betrag
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Steuerpflichtiger Betrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: BOM,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referenzdokumenttyp muss einer der Kostenansprüche oder des Journaleintrags sein
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Wählen Sie BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referenzdokumenttyp muss einer der Kostenansprüche oder des Journaleintrags sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Wählen Sie BOM
 DocType: SMS Log,SMS Log,SMS-Protokoll
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Aufwendungen für gelieferte Artikel
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Verwalten Sie den Vorschussbetrag an den Mitarbeiter
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Versandbenachrichtigung
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Reines Zahlungskonto
-DocType: Employee Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
+DocType: Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 DocType: Lead,Product Enquiry,Produktanfrage
 DocType: Education Settings,Validate Batch for Students in Student Group,Validiere Charge für Studierende in der Studentengruppe
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Kein Urlaubssatz für Mitarbeiter gefunden {0} von {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Kein Urlaubssatz für Mitarbeiter gefunden {0} von {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Bitte zuerst die Firma angeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Bitte zuerst Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Bitte zuerst Firma auswählen
 DocType: Employee Education,Under Graduate,Schulabgänger
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Bitte legen Sie die Standardvorlage für Abwesenheitsbenachrichtigung in HR-Einstellungen fest.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,MItarbeiterdarlehen
 DocType: Fee Schedule,Send Payment Request Email,Sende Zahlungsauftrag E-Mail
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Immobilien
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Erfolgreich nicht registriert.
 DocType: Assessment Result,Grade,Klasse
 DocType: Restaurant Table,No of Seats,Anzahl der Sitze
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Um dynamisches Thema hinzuzufügen, benutze Jinja-Tags wie <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset-Wartungsaufgabe
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Jahresgehalt
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Jahresgehalt
 DocType: Daily Work Summary,Daily Work Summary,tägliche Arbeitszusammenfassung
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ist gesperrt
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Lagerkosten
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Lagerkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Wählen Sie Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Bitte geben Sie Bevorzugte Kontakt per E-Mail
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Bitte geben Sie Bevorzugte Kontakt per E-Mail
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Gegenbuchung
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Hauptadresse
 DocType: Production Plan,Material Request Detail,Materialanforderungsdetail
 DocType: Selling Settings,Default Quotation Validity Days,Standard-Angebotsgültigkeitstage
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: Sales Invoice,Change Amount,Anzahl ändern
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Führerscheinkategorien
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Bitte geben Sie das Lieferdatum ein
 DocType: Depreciation Schedule,Make Depreciation Entry,Neuen Abschreibungseintrag erstellen
+DocType: HR Settings,Leave Settings,Einstellungen verlassen
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anfragetyp
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Mitarbeiter anlegen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Rundfunk
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Einrichtungsmodus des POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Deaktiviert die Erstellung von Zeitprotokollen für Arbeitsaufträge. Vorgänge dürfen nicht gegen den Arbeitsauftrag verfolgt werden
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Ausführung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Ausführung
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
 DocType: Asset Maintenance Log,Maintenance Status,Wartungsstatus
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Mitgliedschaftsdetails
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Für das Kreditorenkonto ist ein Lieferant erforderlich {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikel und Preise
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Stundenzahl: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, Von-Datum = {0}"
 DocType: Drug Prescription,Interval,Intervall
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Präferenz
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Präferenz
 DocType: Grant Application,Individual,Einzelperson
 DocType: Academic Term,Academics User,Benutzer: Lehre
 DocType: Cheque Print Template,Amount In Figure,Betrag als Zahl
-DocType: Employee Loan Application,Loan Info,Darlehensinformation
+DocType: Loan Application,Loan Info,Darlehensinformation
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Supplier Scorecard Zeitraum
 DocType: Share Transfer,Share Transfer,Weitergabe übertragen
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Artikelvorlage
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemie
 DocType: Job Offer,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Out Wert
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Out Wert
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Einstellungen
 DocType: Production Plan,Sales Orders,Kundenaufträge
 DocType: Purchase Taxes and Charges,Valuation,Bewertung
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Standardregion
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Fernsehen
 DocType: Work Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Wählen Sie den Kunden oder den Lieferanten aus.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,Journalcode
 DocType: Naming Series,Series List for this Transaction,Nummernkreise zu diesem Vorgang
 DocType: Company,Enable Perpetual Inventory,Permanente Inventur aktivieren
+DocType: Bank Guarantee,Charges Incurred,Gebühren entstanden
 DocType: Company,Default Payroll Payable Account,Standardabrechnungskreditorenkonto
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,E-Mail-Gruppe aktualisieren
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Benutzerdefiniertes Ergebnis
 DocType: Delivery Stop,Contact Name,Ansprechpartner
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursbeurteilungskriterien
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Steuer ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Steuer ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studenten ID:
 DocType: POS Customer Group,POS Customer Group,POS Kundengruppe
 DocType: Land Unit,Land Unit describing various land assets,Land Unit beschreibt verschiedene Land Vermögenswerte
@@ -374,9 +371,8 @@
 ,Open Work Orders,Arbeitsaufträge öffnen
 DocType: Payment Term,Credit Months,Kreditmonate
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Pay kann nicht kleiner als 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Um das Senden von sich wiederholenden Fehlerbenachrichtigungen aus dem System zu beenden, haben wir das Feld Deaktiviert im Abonnement aktiviert."
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Abwesenheiten pro Jahr
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Abwesenheiten pro Jahr
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
 DocType: Email Digest,Profit & Loss,Profiteinbuße
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Bitte richten Sie Schüler unter Schülergruppen ein
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank-Einträge
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank-Einträge
 DocType: Crop,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool-Kurs
 DocType: Lead,Do Not Contact,Nicht Kontakt aufnehmen
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Menschen, die in Ihrer Organisation lehren"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software-Entwickler
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Course Scheduling Tool,Course Start Date,Kursbeginn
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Einkaufsdetails
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Neue Angebote
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-Mails Gehaltsabrechnung an Mitarbeiter auf Basis von bevorzugten E-Mail in Mitarbeiter ausgewählt
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
 DocType: Tax Rule,Shipping County,Versand-Landesbezirk/-Gemeinde/-Kreis
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Lernen
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lernen
 DocType: Asset,Next Depreciation Date,Nächstes Abschreibungsdatum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Mitarbeiter
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 DocType: Driver,Fleet Manager,Flottenmanager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Bitte setzen Sie den Zimmerpreis auf {}
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Opening Invoice Creation Tool,Invoice Type,Rechnungstyp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Lieferschein
 DocType: Consultation,Encounter Impression,Begegnung Eindruck
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Herstellungskosten des verkauften Vermögens
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursplanung Werkzeug
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kauf Rechnung kann nicht gegen einen bereits bestehenden Asset vorgenommen werden {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Dringend] Fehler beim Erstellen von wiederkehrenden% s für% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kauf Rechnung kann nicht gegen einen bereits bestehenden Asset vorgenommen werden {1}
 DocType: Land Unit,LInked Analysis,Verknüpfte Analyse
 DocType: Item Tax,Tax Rate,Steuersatz
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Der Bewerbungszeitraum kann nicht über zwei Zuordnungssätze liegen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Der Bewerbungszeitraum kann nicht über zwei Zuordnungssätze liegen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% erhalten
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Studentengruppen erstellen
 DocType: Volunteer,Weekends,Wochenenden
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Gutschriftbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Gutschriftbetrag
 DocType: Setup Progress Action,Action Document,Aktions-Dokument
 DocType: Chapter Member,Website URL,Webseiten-URL
 ,Finished Goods,Fertigerzeugnisse
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Mehrere Artikel hinzufügen
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
+DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
 DocType: Depreciation Schedule,Schedule Date,Geplantes Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Gehalt, Abzüge und andere Gehaltskomponenten"
 DocType: Packed Item,Packed Item,Verpackter Artikel
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Angebotsanfrage
 DocType: Healthcare Settings,Require Lab Test Approval,Erforderliche Labortests genehmigen
 DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Absolut aussergewöhnlich
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Absolut aussergewöhnlich
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.
 DocType: Dosage Strength,Strength,Stärke
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Erstellen Sie einen neuen Kunden
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Verbrauchskosten
 DocType: Purchase Receipt,Vehicle Date,Fahrzeug-Datum
 DocType: Student Log,Medical,Medizinisch
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Grund für das Verlieren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Grund für das Verlieren
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Kontonummer aktualisieren
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Lead-Besitzer können nicht gleich dem Lead sein
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Zugeteilter Betrag kann nicht größer sein als nicht angepasster Betrag
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Ledig
 DocType: Salary Slip,Total Loan Repayment,Insgesamt Loan Rückzahlung
 DocType: Account,Cost of Goods Sold,Selbstkosten
-DocType: Subscription,Yearly,Jährlich
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Bitte die Kostenstelle eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Bitte die Kostenstelle eingeben
 DocType: Drug Prescription,Dosage,Dosierung
 DocType: Journal Entry Account,Sales Order,Kundenauftrag
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
 DocType: Assessment Plan,Examiner Name,Prüfer-Name
 DocType: Lab Test Template,No Result,Kein Ergebnis
 DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Bitte zuerst den Firmennamen angeben
 DocType: Purchase Invoice,Supplier Name,Lieferantenname
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lesen Sie das ERPNext-Handbuch
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Zeige Blätter aller Abteilungsmitglieder im Kalender
 DocType: Purchase Invoice,01-Sales Return,01-Verkaufsrückgabe
 DocType: Account,Is Group,Ist Gruppe
 DocType: Email Digest,Pending Purchase Orders,Bis Bestellungen
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Pflichtfeld - Akademisches Jahr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ist nicht mit {2} {3} verknüpft
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Einleitenden Text anpassen, der zu dieser E-Mail gehört. Jede Transaktion hat einen eigenen Einleitungstext."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Bitte setzen Sie das Zahlungsverzugskonto für die Firma {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Bitte setzen Sie das Zahlungsverzugskonto für die Firma {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Die Transaktion ist für den angehaltenen Arbeitsauftrag {0} nicht zulässig.
 DocType: Setup Progress Action,Min Doc Count,Min
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserviert für Verkauf
 DocType: Packing Slip,From Package No.,Von Paket Nr.
 DocType: Item Attribute,To Range,Bis-Bereich
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Wertpapiere und Einlagen
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt"
 DocType: Student Report Generation Tool,Attended by Parents,Von Eltern besucht
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
 DocType: Patient,AB Positive,AB +
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Anwesenheitsnachweis
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Gehaltskomponente für Zeiterfassung basierte Abrechnung.
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
-DocType: Employee Loan,Total Payment,Gesamtzahlung
+DocType: Loan,Total Payment,Gesamtzahlung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Die Transaktion für den abgeschlossenen Arbeitsauftrag kann nicht storniert werden.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} wurde abgebrochen, deshalb kann die Aktion nicht abgeschlossen werden"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genug Teile zu bauen
 DocType: POS Profile User,POS Profile User,POS-Profilbenutzer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Erträge
+DocType: Subscription Invoice,Subscription Invoice,Abonnementrechnung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direkte Erträge
 DocType: Patient Appointment,Date TIme,Terminzeit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativer Benutzer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administrativer Benutzer
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Gründung von Unternehmen und Steuern
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Bitte wählen Sie Kurs
 DocType: Codification Table,Codification Table,Kodifizierungstabelle
 DocType: Timesheet Detail,Hrs,Std
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Bitte Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Bitte Firma auswählen
 DocType: Stock Entry Detail,Difference Account,Differenzkonto
 DocType: Purchase Invoice,Supplier GSTIN,Lieferant GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Cashflow-Mapping-Vorlage
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
+DocType: Bank Guarantee,Providing,Bereitstellung
 DocType: Account,Profit and Loss,Gewinn und Verlust
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nicht zulässig, konfigurieren Sie Lab Test Vorlage wie erforderlich"
 DocType: Patient,Risk Factors,Risikofaktoren
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
 DocType: Healthcare Settings,Appointment Confirmation,Terminbestätigung
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Schlußstand (Haben)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Element verschieben
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Im Standardprofil {0} für den Benutzer {1} ist der Standard bereits festgelegt, standardmäßig deaktiviert"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Kumulierte Werte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory ist im POS-Profil erforderlich
 DocType: Supplier,Prevent RFQs,Vermeidung von Ausschreibungen
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Kundenauftrag erstellen
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Gehaltszettel für Zeitraum von {0} bis {1} eingereicht
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Gehaltszettel für Zeitraum von {0} bis {1} eingereicht
 DocType: Project Task,Project Task,Projektvorgang
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Lieferschein-Datum
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Öffnen des Rechnungserstellungswerkzeugs
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Rücklieferung
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Rücklieferung
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Hinweis: Die aufteilbaren Gesamt Blätter {0} sollte nicht kleiner sein als bereits genehmigt Blätter {1} für den Zeitraum
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Legen Sie Menge in Transaktionen basierend auf Serial No Input fest
 ,Total Stock Summary,Gesamt Stock Zusammenfassung
 DocType: Announcement,Posted By,Geschrieben von
 DocType: Item,Delivered by Supplier (Drop Ship),durch Lieferanten geliefert (Streckengeschäft)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Bitte setzen Sie das Unternehmen
 DocType: Share Balance,Share Balance,Anteilsbestand
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Training Result Employee,Training Result Employee,Trainingsergebnis Mitarbeiter
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
-DocType: Repayment Schedule,Principal Amount,Nennbetrag
-DocType: Employee Loan Application,Total Payable Interest,Insgesamt fällige Zinsen
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Nennbetrag
+DocType: Loan Application,Total Payable Interest,Insgesamt fällige Zinsen
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Gesamtsumme: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Ausgangsrechnung-Zeiterfassung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservierung
 DocType: Land Unit,Land Unit Name,Name der Landeinheit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Verfassen von Angeboten
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Verfassen von Angeboten
 DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlungsabzug
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Aufwickeln
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Benachrichtigen Sie Kunden per E-Mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Benachrichtigen Sie Kunden per E-Mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
 DocType: Employee Advance,Claimed Amount,Anspruchsbetrag
 apps/erpnext/erpnext/config/education.py +180,Masters,Stämme
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
 DocType: Supplier Scorecard,Per Year,Pro Jahr
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nicht für die Aufnahme in dieses Programm nach DOB geeignet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Sales Invoice,Sales Taxes and Charges,Umsatzsteuern und Gebühren auf den Verkauf
 DocType: Employee,Organization Profile,Firmenprofil
 DocType: Vital Signs,Height (In Meter),Höhe (In Meter)
 DocType: Student,Sibling Details,Geschwister-Details
 DocType: Vehicle Service,Vehicle Service,Fahrzeug-Service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatisch löst die Anfrage Feedback basierend auf Bedingungen.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatisch löst die Anfrage Feedback basierend auf Bedingungen.
 DocType: Employee,Reason for Resignation,Kündigungsgrund
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Sales Invoice,Credit Note Issued,Gutschrift ausgelöst
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Nettoveränderung des Bestands
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Verwaltung der Mitarbeiterdarlehen
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Beziehung mit Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Leiter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Leiter
 DocType: Payment Entry,Payment From / To,Zahlung von / an
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Bitte Konto in Lager {0} setzen
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Materialübertrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Konnte keinen Weg finden
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Anfangsstand (Soll)
+DocType: Loan,Applicant,Antragsteller
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Buchungszeitstempel muss nach {0} liegen
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Um wiederkehrende Dokumente zu machen
 ,GST Itemised Purchase Register,GST Itemized Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Neu planen
-DocType: Employee Loan,Total Interest Payable,Gesamtsumme der Zinszahlungen
+DocType: Loan,Total Interest Payable,Gesamtsumme der Zinszahlungen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren
 DocType: Work Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Fertig
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Basis
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Basis
 DocType: Timesheet,Total Billed Hours,Insgesamt Angekündigt Stunden
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Abschreibungs-Betrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Abschreibungs-Betrag
 DocType: Leave Block List Allow,Allow User,Benutzer zulassen
 DocType: Journal Entry,Bill No,Rechnungsnr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten
 DocType: Vehicle Log,Service Details,Service Details
-DocType: Subscription,Quarterly,Quartalsweise
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Gruppiert
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Zeitblatt
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Rückmeldung Rohmaterialien auf Basis von
 DocType: Sales Invoice,Port Code,Portcode
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Lager reservieren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Lager reservieren
 DocType: Lead,Lead is an Organization,Lead ist eine Organisation
 DocType: Guardian Interest,Interest,Zinsen
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vorverkauf
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Rechnungswesen
 DocType: Vehicle,Odometer Value (Last),(letzter) Tachostand
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Vorlagen der Lieferanten-Scorecard-Kriterien.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Payment Eintrag bereits erstellt
 DocType: Request for Quotation,Get Suppliers,Holen Sie sich Lieferanten
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Vermögens {1} nicht auf Artikel verknüpft {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Vorschau Gehaltsabrechnung
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Vermögens {1} nicht auf Artikel verknüpft {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Vorschau Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Sie können nur verlängern, wenn Ihre Mitgliedschaft innerhalb von 30 Tagen abläuft"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Wählen Sie nur aus, wenn Sie Cash Flow Mapper-Dokumente eingerichtet haben"
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Supplier Scorecard,Per Week,Pro Woche
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Gesamtstudent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kreditkarten-Buchung
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Firma und Konten
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Wert bei
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Wert bei
 DocType: Asset Settings,Depreciation Options,Abschreibungsoptionen
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ungültige Buchungszeit
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ungültige Buchungszeit
 DocType: Lead,Campaign Name,Kampagnenname
 DocType: Hotel Room,Capacity,Kapazität
 DocType: Selling Settings,Close Opportunity After Days,Gelegenheit schliessen nach
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftragsnr.
 DocType: Budget,Budget Against,Budget gegen
 DocType: Employee,Cell Number,Mobiltelefonnummer
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Es gibt keinen Angestellten für die gegebenen Kriterien. Überprüfen Sie, ob Gehaltsabrechnungen nicht bereits erstellt wurden."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Es gibt keinen Angestellten für die gegebenen Kriterien. Überprüfen Sie, ob Gehaltsabrechnungen nicht bereits erstellt wurden."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatische Materialanfragen generiert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Bitte wählen Sie eine Tabelle
 DocType: BOM,Website Specifications,Webseiten-Spezifikationen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} ist eine ungültige E-Mail-Adresse in ""Empfänger"""
 DocType: Special Test Items,Particulars,Einzelheiten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Es sind mehrere Preisregeln mit gleichen Kriterien vorhanden, lösen Sie Konflikte, indem Sie Prioritäten zuweisen. Preis Regeln: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Asset,Maintenance,Wartung
+DocType: Subscriber,Subscriber,Teilnehmer
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Bitte aktualisieren Sie Ihren Projektstatus
 DocType: Item,Maximum sample quantity that can be retained,"Maximale Probenmenge, die beibehalten werden kann"
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Zeitfenster hinzufügen
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Gegenstand entsorgt über Journaleintrag {0}
-DocType: Employee Loan,Interest Income Account,Zinserträge Konto
+DocType: Loan,Interest Income Account,Zinserträge Konto
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Einladung überprüfen gesendet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Büro-Wartungskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Büro-Wartungskosten
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gehe zu
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Einrichten E-Mail-Konto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Bitte zuerst den Artikel angeben
 DocType: Asset Repair,Downtime,Ausfallzeit
 DocType: Account,Liability,Verbindlichkeit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademischer Ausdruck:
 DocType: Salary Detail,Do not include in total,Nicht in Summe
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Die Beispielmenge {0} darf nicht mehr als die empfangene Menge {1} sein
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Preisliste nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Request for Quotation Supplier,Send Email,E-Mail absenden
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 DocType: Item,Max Sample Quantity,Max. Probenmenge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Keine Berechtigung
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Keine Berechtigung
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Angebot angefordert
 DocType: Vital Signs,Heart Rate / Pulse,Herzfrequenz / Puls
 DocType: Company,Default Bank Account,Standardbankkonto
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Labortests und Lebenszeichen
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Kein Mitarbeiter gefunden
-DocType: Subscription,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projektaktualisierung
 DocType: SMS Center,All Customer Contact,Alle Kundenkontakte
 DocType: Land Unit,Tree Details,Baum-Details
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alle Artikelgruppen
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
 DocType: Work Order,Item To Manufacture,Zu fertigender Artikel
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} Status ist {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Wählen Sie erneut, wenn die gewählte Adresse nach dem Speichern bearbeitet wird"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 DocType: Item,Hub Publishing Details,Hub-Veröffentlichungsdetails
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Eröffnung"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Eröffnung"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,offene Aufgaben
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Lab Test Template,Result Format,Ergebnisformat
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,Zweimonatlich
 DocType: Vehicle Service,Brake Pad,Bremsklotz
 DocType: Fertilizer,Fertilizer Contents,Dünger Inhalt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Forschung & Entwicklung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Forschung & Entwicklung
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Rechnungsbetrag
 DocType: Company,Registration Details,Details zur Registrierung
 DocType: Timesheet,Total Billed Amount,Gesamtrechnungsbetrag
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Kreditlimitprüfung im Kundenauftrag umgehen
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Mitarbeiterbeurteilung
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung {0} ist mit der Bestellung {1} verknüpft, überprüfen Sie bitte, ob es als Anteil in dieser Rechnung gezogen werden sollte."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung {0} ist mit der Bestellung {1} verknüpft, überprüfen Sie bitte, ob es als Anteil in dieser Rechnung gezogen werden sollte."
 DocType: Sales Invoice Item,Stock Details,Lagerdetails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Verkaufsstelle
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Mindestbestuhlung
 DocType: Item Attribute,Item Attribute Values,Artikel-Attributwerte
 DocType: Examination Result,Examination Result,Prüfungsergebnis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Von Lieferanten gelieferte Artikel, die noch abgerechnet werden müssen"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referenz Doctype muss man von {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Work Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Stückliste {0} muss aktiv sein
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Keine Artikel zur Übertragung verfügbar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Stückliste {0} muss aktiv sein
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Keine Artikel zur Übertragung verfügbar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Schließen (Eröffnung + Gesamt)
 DocType: Journal Entry,Depreciation Entry,Abschreibungs Eintrag
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 Standard
 DocType: Pricing Rule,Rate or Discount,Rate oder Rabatt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Erforderliche Anzahl
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoriten
 DocType: Hub Settings,Custom Data,Benutzerdefinierte Daten
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Medizinischer Code Standard
 DocType: Soil Texture,Clay Composition (%),Tonzusammensetzung (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Bitte vor dem Zuweisen der Aufgabe speichern.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Bilanzwert
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Bilanzwert
 DocType: Lab Test,Lab Technician,Labortechniker
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Verkaufspreisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Wenn aktiviert, wird ein Kunde erstellt, der Patient zugeordnet ist. Patientenrechnungen werden gegen diesen Kunden angelegt. Sie können den vorhandenen Kunden auch beim Erstellen von Patient auswählen."
 DocType: Bank Reconciliation,Account Currency,Kontenwährung
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
 DocType: Purchase Receipt,Range,Bandbreite
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Fee Structure,Components,Komponenten
 DocType: Item Barcode,Item Barcode,Artikelbarcode
 DocType: Woocommerce Settings,Endpoints,Endpunkte
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","erzeugt werden Wenn Sie verspätet sind, müssen Sie das Feld &quot;Wiederholen am Tag des Monats&quot; manuell ändern"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
 DocType: Share Transfer,From Folio No,Aus Folio Nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Verfügbarkeitsdatum
 DocType: Guardian,Guardian Name,Wächter-Name
 DocType: Cheque Print Template,Has Print Format,Hat ein Druckformat
-DocType: Employee Loan,Sanctioned,sanktionierte
+DocType: Loan,Sanctioned,sanktionierte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ist zwingend erforderlich. Vielleicht wurde kein Datensatz für den Geldwechsel erstellt für
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
 DocType: Crop Cycle,Crop Cycle,Erntezyklus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Für Artikel aus ""Produkt-Bundles"" werden Lager, Seriennummer und Chargennummer aus der Tabelle ""Packliste"" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle ""Hauptpositionen"" eingetragen werden, Die Werte werden in die Tabelle ""Packliste"" kopiert."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Für Artikel aus ""Produkt-Bundles"" werden Lager, Seriennummer und Chargennummer aus der Tabelle ""Packliste"" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle ""Hauptpositionen"" eingetragen werden, Die Werte werden in die Tabelle ""Packliste"" kopiert."
 DocType: Student Admission,Publish on website,Veröffentlichen Sie auf der Website
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
+DocType: Subscription,Cancelation Date,Stornierungsdatum
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
 DocType: Agriculture Task,Agriculture Task,Landwirtschaftsaufgabe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte Erträge
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirekte Erträge
 DocType: Student Attendance Tool,Student Attendance Tool,Schülerteilnahme Werkzeug
 DocType: Restaurant Menu,Price List (Auto created),Preisliste (automatisch erstellt)
 DocType: Cheque Print Template,Date Settings,Datums-Einstellungen
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,Stromkosten
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab-Testdatum kann nicht vor dem Erfassungsdatum liegen
+DocType: Subscription Plan,Cost,Kosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
 DocType: Expense Claim,Total Advance Amount,Gesamtvorauszahlungsbetrag
 DocType: Delivery Stop,Estimated Arrival,Voraussichtliche Ankunft
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
 DocType: Timesheet Detail,Bill,Rechnung
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Weiß
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Weiß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Menge nicht für {4} in Lager {1} zum Zeitpunkt des Eintrags Entsendung ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Sie können nur eine Option aus der Liste der Kontrollkästchen auswählen.
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
 DocType: Item,Automatically Create New Batch,Automatisch neue Charge erstellen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Zuweisen von {0} zu {1} (Zeile {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Erstellen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Zuweisen von {0} zu {1} (Zeile {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Erstellen
 DocType: Student Admission,Admission Start Date,Stichtag zum Zulassungsbeginn
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Neuer Angestellter
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
 DocType: Repayment Schedule,Balance Loan Amount,Bilanz Darlehensbetrag
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Unterrichtszeiten
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Lager-Optionen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Lager-Optionen
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Deaktivieren Sie das Abrufen der letzten Kaufdetails in der Bestellung
 DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Wollen Sie dieses entsorgte Gut wirklich wiederherstellen?
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
 DocType: Purchase Invoice,Cash/Bank Account,Bar-/Bankkonto
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Bitte geben Sie eine {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Die Variantenerstellung wurde in die Warteschlange gestellt.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Arbeitszusammenfassung für {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Der erste Genehmiger für Abwesenheit in der Liste wird als Standardgenehmiger für Abwesenheit festgelegt.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Plan,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kann nicht negativ sein
 DocType: Training Event,Self-Study,Selbststudium
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,Lohn
 DocType: Asset Maintenance,Maintenance Manager Name,Name des Wartungs-Managers
 DocType: Agriculture Task,Urgent,Dringend
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Variable kann nicht gefunden werden:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Bitte wähle ein Feld aus numpad aus
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Kann keine Anlageposition sein, wenn das Stock Ledger erstellt wird."
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Name der Qualitätsinspektionsvorlage
 DocType: Project,First Email,Erste E-Mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Verkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Verkaufsbetrag
 DocType: Repayment Schedule,Interest Amount,Zinsbetrag
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Share Transfer,Issue,Anfrage
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,Versandstatus
 ,Projected Quantity as Source,Projizierte Menge als Quelle
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Liefertrip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Liefertrip
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Übertragungsart
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Vertriebskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Vertriebskosten
 DocType: Consultation,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postleitzahl
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Wählen Sie das Zinsertragskonto im Darlehen {0}
 DocType: Opportunity,Contact Info,Kontakt-Information
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Lagerbuchungen erstellen
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
 DocType: Item,Default Supplier,Standardlieferant
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Prozensatz erlaubter Überproduktion
-DocType: Employee Loan,Repayment Schedule,Rückzahlungsplan
+DocType: Loan,Repayment Schedule,Rückzahlungsplan
 DocType: Shipping Rule Condition,Shipping Rule Condition,Versandbedingung
 DocType: Holiday List,Get Weekly Off Dates,Wöchentliche Abwesenheitstermine abrufen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter
 DocType: Education Settings,Attendance Freeze Date,Anwesenheit Einfrieren Datum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Alle Produkte
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Alle Produkte
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum Lead Alter (Tage)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Alle Stücklisten
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotelzimmer vom Typ {0} sind auf {1} nicht verfügbar
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Von Mitarbeiter
 DocType: Driver,Cellphone Number,Handynummer
 DocType: Project,Monitor Progress,Überwachung der Fortschritte
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
 DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen
+DocType: Supplier Quotation,Auto Repeat Section,Automatischer Wiederholungsabschnitt
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
 DocType: Appraisal Template Goal,Key Performance Area,Entscheidender Leistungsbereich
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ungültige Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Menge muss kleiner oder gleich {0} sein
+DocType: Department Approver,Department Approver,Abteilungsgenehmiger
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
 DocType: Employee Advance,Claimed,Behauptet
 DocType: Crop,Row Spacing,Zeilenabstand
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rechnung zum Zahlungsabgleich
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Beitrag in %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Nach den Kaufeinstellungen, wenn Bestellbedarf == &#39;JA&#39;, dann für die Erstellung der Kaufrechnung, muss der Benutzer die Bestellung zuerst für den Eintrag {0}"
+,HSN-wise-summary of outward supplies,HSN-weise Zusammenfassung von Lieferungen nach außen
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Meldenummern des Unternehmens für Ihre Unterlagen. Steuernummern usw.
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Aktionsname
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Startjahr
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Die ersten 2 Ziffern von GSTIN sollten mit der Statusnummer {0} übereinstimmen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Fehler in der Kapazitätsplanung
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Felder werden nur zum Zeitpunkt der Erstellung kopiert.
 DocType: Setup Progress Action,Domains,Domainen
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Verwaltung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Verwaltung
 DocType: Cheque Print Template,Payer Settings,Payer Einstellungen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Vorsicht
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Starttag ist größer als Endtag in Aufgabe &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / Lastschrift
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / Lastschrift
 DocType: Price List Country,Price List Country,Preisliste Land
 DocType: Item,UOMs,Maßeinheiten
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
 DocType: Purchase Invoice Item,UOM Conversion Factor,Maßeinheit-Umrechnungsfaktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Bitte geben Sie Item Code zu Chargennummer erhalten
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
-DocType: Employee Loan,Partially Disbursed,teil~~POS=TRUNC Zahlter
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Gewähren Sie Informationen.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Gewähren Sie Informationen.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Lieferantendatenbank
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Sie können ein nicht abgebrochenes Abonnement nicht neu starten.
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
 DocType: Fee Validity,Valid Till,Gültig bis
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Total Eltern Lehrer Treffen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Die Änderung der Kundengruppe für den ausgewählten Kunden ist nicht zulässig.
 ,Purchase Order Items To Be Billed,"Bei Lieferanten bestellte Artikel, die noch abgerechnet werden müssen"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aktualisierung der geschätzten Ankunftszeiten
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualisierung der geschätzten Ankunftszeiten
 DocType: Program Enrollment Tool,Enrollment Details,Anmeldedetails
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Bitte wählen Sie einen Kunden aus
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Purchase Order,Group same items,Gruppe gleichen Artikel
 DocType: Purchase Invoice,Disable Rounded Total,"""Gesamtsumme runden"" abschalten"
-DocType: Employee Loan Application,Repayment Info,Die Rückzahlung Info
+DocType: Department,Parent Department,Elternabteilung
+DocType: Loan Application,Repayment Info,Die Rückzahlung Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 DocType: Maintenance Team Member,Maintenance Role,Wartungsrolle
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dupliziere Zeile {0} mit demselben {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dupliziere Zeile {0} mit demselben {1}
 ,Trial Balance,Probebilanz
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Mitarbeiter anlegen
-DocType: Sales Order,SO-,DAMIT-
+DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservierung Benutzer
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Bitte zuerst Präfix auswählen
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Forschung
+DocType: Subscription Settings,Subscription Settings,Abonnementeinstellungen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Announcement,All Students,Alle Schüler
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 DocType: Crop Cycle,Less than a year,Weniger als ein Jahr
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobil-Nr
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 DocType: Crop,Yield UOM,Ertrag UOM
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
 DocType: Item,Is Item from Hub,Ist ein Gegenstand aus dem Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Ausgeschüttete Dividenden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Ausgeschüttete Dividenden
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Hauptbuch
 DocType: Stock Reconciliation,Difference Amount,Differenzmenge
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} bei Verlassen auf {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Gewinnrücklagen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Gewinnrücklagen
 DocType: Purchase Invoice,05-Change in POS,05-Änderung am POS
 DocType: Vehicle Log,Service Detail,Service Detail
 DocType: BOM,Item Description,Artikelbeschreibung
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Chance-Artikel
 ,Student and Guardian Contact Details,Student and Guardian Kontaktdaten
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,"Zeile {0}: um E-Mails senden zu können, ist eine E-Mail-Adresse für den Anbieter {0} erforderlich."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Temporäre Eröffnungskonten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Temporäre Eröffnungskonten
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Hub anzeigen
 ,Employee Leave Balance,Übersicht der Urlaubskonten der Mitarbeiter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
 DocType: Patient Appointment,More Info,Weitere Informationen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard-Aktionen
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Beispiel: Master in Informatik
 DocType: Purchase Invoice,Rejected Warehouse,Ausschusslager
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,nach
 DocType: Supplier Quotation Item,Lead Time in days,Lieferzeit in Tagen
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Übersicht der Verbindlichkeiten
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Die Zahlung des Gehalts von {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Die Zahlung des Gehalts von {0} {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Labortestverordnungen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Klein
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Eröffnen des Rechnungserstellungswerkzeugs
 DocType: Education Settings,Employee Number,Mitarbeiternummer
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Abbrechen der Rechnung nach der Kulanzfrist
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
 DocType: Project,% Completed,% abgeschlossen
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Labortest Datetime
 DocType: Email Digest,Add Quote,Angebot hinzufügen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte Aufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
 DocType: Agriculture Analysis Criteria,Agriculture,Landwirtschaft
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Betriebsvermögen
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Bitte legen Sie zuerst den Itemcode fest
 DocType: Item,ITEM-,ARTKL-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
+DocType: Subscription Plan,Billing Interval Count,Abrechnungsintervall Anzahl
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Team-Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Druckformat erstellen
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Artikelgruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-Mail-Bericht:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativartikel muss nicht gleich Artikelcode sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
 DocType: Sales Partner,Target Distribution,Aufteilung der Zielvorgaben
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Abschluss der vorläufigen Beurteilung
 DocType: Salary Slip,Bank Account No.,Bankkonto-Nr.
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Arbeitsplatz
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Angebotsanfrage Lieferant
 DocType: Healthcare Settings,Registration Message,Registrierungsnachricht
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Verschreibungspflichtige Dosierung
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Bitte ein Unternehmen auswählen
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Start- und Enddatum
 ,Delivered Items To Be Billed,"Gelieferte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
 DocType: Project Update,Great/Quickly,Großartig / Schnell
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,MA/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Bitte wählen Sie Chargen für Chargen
 DocType: Asset,Depreciation Schedules,Abschreibungen Termine
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,In den GST-Einstellungen können folgende Konten ausgewählt werden:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,In den GST-Einstellungen können folgende Konten ausgewählt werden:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
 DocType: Payment Request,Transaction Currency,Transaktionswährung
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Von {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Durchschnittlicher täglicher Abgang
 DocType: POS Profile,Campaign,Kampagne
 DocType: Supplier,Name and Type,Name und Typ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder ""Abgelehnt"" sein"
 DocType: Physician,Contacts and Address,Kontakte und Adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Voraussichtliches Startdatum"" kann nicht nach dem ""Voraussichtlichen Enddatum"" liegen"
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Teilnahmeberechtigung und Details
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Von Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationsprotokoll
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Angebotsanfrage ist für den Zugriff aus dem Portal deaktiviert, für mehr Kontrolle Portaleinstellungen."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Einkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Einkaufsbetrag
 DocType: Sales Invoice,Shipping Address Name,Lieferadresse Bezeichnung
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Beim Erstellen des Kursplans sind Fehler aufgetreten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Der erste Ausgabengenehmiger in der Liste wird als standardmäßiger Ausgabengenehmiger festgelegt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,Kann nicht größer als 100 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Detail,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
@@ -1839,14 +1844,15 @@
 DocType: Package Code,Package Code,Paketnummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Auszubildende(r)
 DocType: Purchase Invoice,Company GSTIN,Unternehmen GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Die Tabelle Steuerdetails wird aus dem Artikelstamm als Zeichenfolge entnommen und in diesem Feld gespeichert. Wird verwendet für Steuern und Abgaben
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Berechtigungsauslöser in Abwesenheitsanwendung auslassen
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Steuerregel für Transaktionen
@@ -1874,15 +1880,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Die Zahlungsbedingung in Zeile {0} ist möglicherweise ein Duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Landwirtschaft (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Packzettel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Büromiete
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Packzettel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 DocType: Disease,Common Name,Gemeinsamen Namen
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import fehlgeschlagen!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
 DocType: Vital Signs,Blood Pressure,Blutdruck
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytiker
 DocType: Item,Inventory,Lagerbestand
 DocType: Item,Sales Details,Verkaufsdetails
 DocType: Quality Inspection,QI-,QI-
@@ -1892,15 +1898,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validieren Sie den eingeschriebenen Kurs für Studierende in der Studentengruppe
 DocType: Notification Control,Expense Claim Rejected,Aufwandsabrechnung abgelehnt
 DocType: Item,Item Attribute,Artikelattribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Regierung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Regierung
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostenabrechnung {0} existiert bereits für das Fahrzeug Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Name des Institutes
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Bitte geben Sie Rückzahlungsbetrag
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Bitte geben Sie Rückzahlungsbetrag
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Artikelvarianten
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Dienstleistungen
 DocType: HR Settings,Email Salary Slip to Employee,Gehaltsabrechnung per E-Mail an Mitarbeiter senden
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Wählen Mögliche Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Wählen Mögliche Lieferant
 DocType: Sales Invoice,Source,Quelle
 DocType: Customer,"Select, to make the customer searchable with these fields","Wählen Sie, um den Kunden mit diesen Feldern durchsuchbar zu machen"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige geschlossen
@@ -1917,7 +1923,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Cashflow aus Investitionen
 DocType: Program Course,Program Course,Programm Kurs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Fracht- und Versandkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Homepage,Company Tagline for website homepage,Unternehmensschlagzeile für die Internet-Homepage
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Vergriffen
@@ -1947,10 +1953,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Mitgliedschaftsdetails
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Bitte geben Sie alle erforderlichen Ergebniswerte ein
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Übersicht der Forderungen
-DocType: Employee Loan,Monthly Repayment Amount,Monatlicher Rückzahlungsbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Übersicht der Forderungen
+DocType: Loan,Monthly Repayment Amount,Monatlicher Rückzahlungsbetrag
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Rechnungen öffnen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
 DocType: UOM,UOM Name,Maßeinheit-Name
 DocType: GST HSN Code,HSN Code,HSN-Code
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Beitragshöhe
@@ -1972,7 +1978,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Benutzer {0} ist bereits dem Arzt {1} zugeordnet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kiste
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Mögliche Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Mögliche Lieferant
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Monatsbezogene Verteilung
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Empfängerliste ist leer. Bitte eine Empfängerliste erstellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Gesundheitswesen (Beta)
@@ -1999,7 +2006,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Keine Artikel zum Verpacken
 DocType: Shipping Rule Condition,From Value,Von-Wert
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
-DocType: Employee Loan,Repayment Method,Rückzahlweg
+DocType: Loan,Repayment Method,Rückzahlweg
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Wenn diese Option aktiviert, wird die Startseite der Standardartikelgruppe für die Website sein"
 DocType: Quality Inspection Reading,Reading 4,Ablesewert 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
@@ -2008,7 +2015,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Zertifikat erforderlich
 DocType: Company,Default Holiday List,Standard-Urlaubsliste
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Zeile {0}: Zeitüberlappung in {1} mit {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Lager-Verbindlichkeiten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Invoice,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Unternehmen auswählen
@@ -2016,7 +2023,7 @@
 DocType: Student Report Generation Tool,Print Section,Druckbereich
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Der Benutzer {0} hat kein Standard-POS-Profil. Aktivieren Sie für diesen Benutzer die Standardeinstellung in der Zeile {1}.
 DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,"Zeile {idx}: {field} wird benötigt, um die Eröffnungsrechnung {invoice_type} zu erstellen"
 DocType: Customer,Primary Address and Contact Detail,Primäre Adresse und Kontaktdetails
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Zahlungsemail erneut senden
@@ -2027,10 +2034,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Bitte wählen Sie mindestens eine Domain aus.
 DocType: Dependent Task,Dependent Task,Abhängiger Vorgang
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie Standard-Abrechnungskreditorenkonto in Gesellschaft {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie Standard-Abrechnungskreditorenkonto in Gesellschaft {0}
 DocType: SMS Center,Receiver List,Empfängerliste
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Suche Artikel
 DocType: Payment Schedule,Payment Amount,Zahlungsbetrag
@@ -2040,7 +2047,7 @@
 DocType: Assessment Plan,Grading Scale,Bewertungsskala
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Schon erledigt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importvorgang erfolgreich!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
@@ -2051,17 +2058,16 @@
 DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Customer,Customer POS Id,Kunden-POS-ID
 DocType: Account,Account Name,Kontenname
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Bitte geben Sie die Woocommerce Server URL ein
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Lieferanten-Artikelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
 DocType: Share Balance,To No,Zu Nein
-DocType: Subscription,Reference Document,Referenzdokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder  beendet
 DocType: Accounts Settings,Credit Controller,Kredit-Controller
-DocType: Grant Application,Applicant Type,Bewerbertyp
+DocType: Loan,Applicant Type,Bewerbertyp
 DocType: Purchase Invoice,03-Deficiency in services,03-Mangel an Dienstleistungen
 DocType: Delivery Note,Vehicle Dispatch Date,Datum des Versands mit dem Fahrzeug
 DocType: Healthcare Settings,Default Medical Code Standard,Default Medical Code Standard
@@ -2072,13 +2078,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% berechnet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personalwesen
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Ablehnen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
 DocType: BOM Item,BOM Item,Stücklisten-Artikel
 DocType: Appraisal,For Employee,Für Mitarbeiter
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Machen Disbursement Eintrag
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Machen Disbursement Eintrag
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
 DocType: Company,Default Values,Standardwerte
 DocType: Membership,INR,INR
@@ -2107,10 +2113,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Summe (ohne Steuern)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Anzahl Leads
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} muss größer 0 sein
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Lager verfügbar
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Lager verfügbar
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beschaffung
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Pflichtfeld - Programm
 DocType: Special Test Template,Result Component,Ergebniskomponente
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantieanspruch
@@ -2130,7 +2136,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Urlaube innerhalb von Abwesenheiten als Abwesenheiten mit einbeziehen
 DocType: Sales Invoice,Packed Items,Verpackte Artikel
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantieantrag zu Serien-Nr.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Gesamtbetrag'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Gesamtbetrag'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Warenkorb aktivieren
 DocType: Employee,Permanent Address,Feste Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2148,10 +2154,10 @@
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Aktion bestätigen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online-Auktionen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Erfüllung
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Ansicht Warenkorb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kann keine Standardkriterien erstellen. Bitte benennen Sie die Kriterien um
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
@@ -2173,9 +2179,9 @@
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Material Request,Transferred,Übergeben
 DocType: Vehicle,Doors,Türen
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Sammeln Sie die Gebühr für die Patientenregistrierung
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Attribute nach Bestandsgeschäft können nicht geändert werden. Erstelle einen neuen Artikel und übertrage den Bestand auf den neuen Artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Attribute nach Bestandsgeschäft können nicht geändert werden. Erstelle einen neuen Artikel und übertrage den Bestand auf den neuen Artikel
 DocType: Course Assessment Criteria,Weightage,Gewichtung
 DocType: Purchase Invoice,Tax Breakup,Steuererhebung
 DocType: Packing Slip,PS-,PS-
@@ -2211,11 +2217,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Purchase Invoice Item,Batch No,Chargennummer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Mitarbeiter Fortschritte
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zusammenfassen mehrerer Kundenaufträge zu einer Kundenbestellung erlauben
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instructor
 DocType: Grant Application,Assessment  Mark (Out of 10),Bewertungsnote (von 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil Nein
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Haupt
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Haupt
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
@@ -2224,15 +2231,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Chance von"" ist zwingend erforderlich"
 DocType: Email Digest,Annual Expenses,Jährliche Kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Lieferantenauftrag anlegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Lieferantenauftrag anlegen
 DocType: SMS Center,Send To,Senden an
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
 DocType: Sales Team,Contribution to Net Total,Beitrag zum Gesamtnetto
 DocType: Sales Invoice Item,Customer's Item Code,Kunden-Artikel-Nr.
 DocType: Stock Reconciliation,Stock Reconciliation,Bestandsabgleich
 DocType: Territory,Territory Name,Name der Region (Gebiet)
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Sie können nur Pläne mit demselben Abrechnungszyklus in einem Abonnement haben
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Bewerber für einen Job
 DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz
 DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten
@@ -2241,10 +2249,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Beurteilungen
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Schulungsveranstaltungen
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Verfolgen Sie Leads nach Lead Source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Bitte eingeben
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Bitte eingeben
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Wartungsprotokoll
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet)
@@ -2252,11 +2260,11 @@
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
 DocType: Student Group,Instructors,Lehrer
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Aktienverwaltung
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Bezahlung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Bezahlung
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",Lager {0} ist nicht mit einem Konto verknüpft. Bitte wählen Sie ein Konto in den Einstellungen für das Lager oder legen Sie das Standard Lagerkonto in den Einstellungen für  {1} fest.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Verwalten Sie Ihre Aufträge
 DocType: Work Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
@@ -2266,7 +2274,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} am {1} nur halbtags anwesend
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Mitarbeiter {0} am {1} nur halbtags anwesend
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
@@ -2276,7 +2284,7 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,Hub-Knoten
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Mitarbeiter/-in
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Mitarbeiter/-in
 DocType: Asset Movement,Asset Movement,Asset-Bewegung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Arbeitsauftrag {0} muss eingereicht werden
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,neue Produkte Warenkorb
@@ -2294,13 +2302,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Die Abrechnungswährung muss entweder der Währung der Standardfirma oder der Währung des Partnerkontos entsprechen
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 DocType: Soil Texture,Loam,Lehm
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Zeile {0}: Fälligkeitsdatum darf nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Zeile {0}: Fälligkeitsdatum darf nicht vor dem Buchungsdatum liegen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Zahlungsbuchung erstellen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
 ,Sales Invoice Trends,Ausgangsrechnung-Trendanalyse
 DocType: Leave Application,Apply / Approve Leaves,Urlaub eintragen/genehmigen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Für
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist"
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Baum der finanziellen Kostenstellen.
 DocType: Serial No,Delivery Document No,Lieferdokumentennummer
@@ -2314,7 +2321,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Der Materialverbrauch ist in den Produktionseinstellungen nicht festgelegt.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Für Artikel {0} in Zeile {1} kann mehr als {2} nicht überbucht werden. Um Überfakturierung zu ermöglichen, legen Sie bitte in Stock Settings fest"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Für Artikel {0} in Zeile {1} kann mehr als {2} nicht überbucht werden. Um Überfakturierung zu ermöglichen, legen Sie bitte in Stock Settings fest"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update-Antwort
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
@@ -2325,12 +2332,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Wählen Sie zuerst das Programm aus
 DocType: Patient Appointment,Patient Age,Patient Alter
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Projekte verwalten
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Seriennr. {0} wurde bereits zurückgegeben
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Seriennr. {0} wurde bereits zurückgegeben
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
 DocType: Budget,Fiscal Year,Geschäftsjahr
 DocType: Asset Maintenance Log,Planned,Geplant
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Default-Forderungskonten, die verwendet werden sollen, wenn sie nicht in Patient eingestellt sind, um Konsultationsgebühren zu buchen."
 DocType: Vehicle Log,Fuel Price,Kraftstoff-Preis
+DocType: Bank Guarantee,Margin Money,Margengeld
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Set offen
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
@@ -2344,16 +2352,16 @@
 DocType: Lead,Follow Up,Nachverfolgen
 DocType: Item,Is Sales Item,Ist Verkaufsartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenbaumstruktur
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 DocType: Maintenance Visit,Maintenance Time,Wartungszeit
 ,Amount to Deliver,Liefermenge
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Gleiches Element wurde mehrfach eingegeben. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Startdatum kann nicht früher als das Jahr Anfang des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Es sind Fehler aufgetreten.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Der Mitarbeiter {0} hat bereits einen Antrag auf {1} zwischen {2} und {3} gestellt:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Es sind Fehler aufgetreten.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Der Mitarbeiter {0} hat bereits einen Antrag auf {1} zwischen {2} und {3} gestellt:
 DocType: Guardian,Guardian Interests,Wächter Interessen
 DocType: Naming Series,Current Value,Aktueller Wert
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
 DocType: Education Settings,Instructor Records to be created by,Instructor Records werden erstellt von
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} erstellt
 DocType: GST Account,GST Account,GST Konto
@@ -2372,8 +2380,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Zu den Favoriten hinzugefügt
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Es wurde kein Lohnzettel für die oben ausgewählten Kriterien oder den bereits eingereichten Gehaltsbeleg gefunden
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Zölle und Steuern
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Es wurde kein Lohnzettel für die oben ausgewählten Kriterien oder den bereits eingereichten Gehaltsbeleg gefunden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Zölle und Steuern
 DocType: Projects Settings,Projects Settings,Projekteinstellungen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Bitte den Stichtag eingeben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
@@ -2383,27 +2391,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Artikelgruppenstruktur
 DocType: Production Plan,Total Produced Qty,Gesamtproduktionsmenge
 DocType: Payroll Entry,Get Employee Details,Erhalten Sie Mitarbeiterdetails
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
 DocType: Asset,Sold,Verkauft
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
 DocType: Account,Frozen,Gesperrt
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbetrag (Gesellschaft Währung)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Rohes Material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Rohes Material
 DocType: Payment Reconciliation Payment,Reference Row,Referenzreihe
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
 DocType: Patient,O Positive,0 +
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investitionen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Zuteilungen
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akzeptanzkriterien
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Keine Rückzahlungen für die Journalbuchung verfügbar
 DocType: Item Attribute,Attribute Name,Attributname
 DocType: BOM,Show In Website,Auf der Webseite anzeigen
 DocType: Shopping Cart Settings,Show Quantity in Website,Zeigen Menge in Webseite
-DocType: Employee Loan Application,Total Payable Amount,Zahlenden Gesamtbetrag
+DocType: Loan Application,Total Payable Amount,Zahlenden Gesamtbetrag
 DocType: Task,Expected Time (in hours),Voraussichtliche Zeit (in Stunden)
 DocType: Item Reorder,Check in (group),Check-in (Gruppe)
 DocType: Soil Texture,Silt,Schlick
@@ -2422,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Zahlung ausführen
 DocType: Room,Room Name,Raumname
 DocType: Prescription Duration,Prescription Duration,Verschreibungsdauer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} genehmigt/abgelehnt werden."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} genehmigt/abgelehnt werden."
 DocType: Activity Cost,Costing Rate,Kalkulationsbetrag
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 ,Campaign Efficiency,Effizienz der Kampagne
@@ -2440,11 +2449,11 @@
 DocType: Chapter,Chapter,Gruppe
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Paar
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Das Standardkonto wird in POS-Rechnung automatisch aktualisiert, wenn dieser Modus ausgewählt ist."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für die Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für die Produktion
 DocType: Asset,Depreciation Schedule,Abschreibungsplan
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Vertriebspartner Adressen und Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Halbtages Datum sollte zwischen Von-Datum und eine aktuelle
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Halbtages Datum sollte zwischen Von-Datum und eine aktuelle
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Legen Sie die Standardkostenstelle in der Firma {0} fest.
 DocType: Item,Has Batch No,Hat Chargennummer
@@ -2462,7 +2471,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung)
 DocType: Soil Texture,Soil Type,Bodenart
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Neue Nachricht
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless-Mandat
@@ -2482,7 +2490,7 @@
 DocType: Hub Category,Hub Category,Hub-Kategorie
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
-DocType: Employee Loan,Loan Amount,Darlehensbetrag
+DocType: Loan,Loan Amount,Darlehensbetrag
 DocType: Student Report Generation Tool,Add Letterhead,Briefkopf hinzufügen
 DocType: Program Enrollment,Self-Driving Vehicle,Selbstfahrendes Fahrzeug
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Standing
@@ -2510,9 +2518,9 @@
 DocType: Cash Flow Mapper,Position,Position
 DocType: Patient,Patient Details,Patientendetails
 DocType: Patient,B Positive,B Positiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 DocType: Patient Medical Record,Patient Medical Record,Patient Medizinische Aufzeichnung
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe an konzernfremde
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2520,8 +2528,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Summe Tatsächlich
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Studenten Geschwister
+DocType: Subscription Plan Detail,Subscription Plan Detail,Details zum Abonnementplan
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Einheit
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Bitte Firma angeben
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Bitte Firma angeben
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
 DocType: Asset Maintenance Task,Maintenance Task,Wartungsaufgabe
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Bitte setzen Sie B2C Limit in den GST Einstellungen.
@@ -2535,6 +2544,7 @@
 ,BOM Search,Stücklisten-Suche
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Summe der verbrauchten Materialkosten (über die Bestandsbuchung)
 DocType: Hub Settings,Company Registered,Firma registriert
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Bis Datum darf nicht kleiner sein als Von Datum
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Veröffentlichen Sie &quot;In Stock&quot; oder &quot;Nicht verfügbar&quot; auf Hub basierend auf dem in diesem Lager verfügbaren Bestand.
 DocType: Vehicle,Fuel Type,Treibstoffart
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Bitte die Firmenwährung angeben
@@ -2542,17 +2552,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert
 DocType: Email Digest,Pending Sales Orders,Bis Kundenaufträge
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 DocType: Employee,Create User Permission,Erstellen Sie Benutzerberechtigungen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Healthcare Settings,Remind Before,Vorher erinnern
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
 DocType: Salary Component,Deduction,Abzug
 DocType: Item,Retain Sample,Probe aufbewahren
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.
 DocType: Stock Reconciliation Item,Amount Difference,Mengendifferenz
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben
 DocType: Territory,Classification of Customers by region,Einteilung der Kunden nach Region
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,In Produktion
@@ -2562,8 +2573,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berechneter Stand des Bankauszugs
 DocType: Normal Test Template,Normal Test Template,Normale Testvorlage
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivierter Benutzer
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Angebot
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,"Kann einen empfangenen RFQ nicht auf ""kein Zitat"" setzen."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Angebot
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,"Kann einen empfangenen RFQ nicht auf ""kein Zitat"" setzen."
 DocType: Quotation,QTN-,ANG-
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Wählen Sie ein Konto aus, das in der Kontowährung gedruckt werden soll"
@@ -2571,7 +2582,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dies beruht auf Transaktionen gegen diesen Patienten. Siehe Zeitleiste unten für Details
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kosten aktualisiert
 DocType: Patient,Date of Birth,Geburtsdatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
 DocType: Opportunity,Customer / Lead Address,Kunden- / Lead-Adresse
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Scorecard Setup
@@ -2582,14 +2593,15 @@
 DocType: Work Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Tätigkeitsbeschreibung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Tätigkeitsbeschreibung
 DocType: Student Applicant,Applied,angewandt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Wiedereröffnen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Wiedereröffnen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Namen
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Sale Rabatt
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufskampagne verfolgen: Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen."
+DocType: Department Approver,Approver,Genehmiger
 ,SO Qty,Kd.-Auftr.-Menge
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Das Feld An Aktionär darf nicht leer sein
 DocType: Guardian,Work Address,Arbeitsadresse
@@ -2603,21 +2615,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Aufteilbaren Gesamtbetrag (Gesellschaft Währung)
 DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
 DocType: BOM,Scrap Material Cost,Ausschusssmaterialkosten
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
 DocType: Grant Application,Email Notification Sent,E-Mail-Benachrichtigung gesendet
 DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Artikelnummer, Lager, Menge sind in der Zeile erforderlich"
-DocType: Pricing Rule,Supplier,Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Artikelnummer, Lager, Menge sind in der Zeile erforderlich"
+DocType: Bank Guarantee,Supplier,Lieferant
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Zahlungsdetails anzeigen
 DocType: Consultation,Consultation Time,Konsultationszeit
 DocType: C-Form,Quarter,Quartal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Sonstige Aufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Sonstige Aufwendungen
 DocType: Global Defaults,Default Company,Standardfirma
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen auf den gesamten Lagerwert hat"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Name der Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Über
-DocType: Employee Loan,Employee Loan Account,Mitarbeiterdarlehenskonto
 DocType: Leave Application,Total Leave Days,Urlaubstage insgesamt
 DocType: Email Digest,Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Anzahl der Interaktion
@@ -2632,7 +2643,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Gewicht (in Kilogramm)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chapters / chapter_name lassen das Feld nach dem Speichern des Kapitels automatisch leer.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Bitte legen Sie die GST-Konten in den GST-Einstellungen fest
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Bitte legen Sie die GST-Konten in den GST-Einstellungen fest
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Geschäftsart
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kosten eines neuen Kaufs
@@ -2641,12 +2652,13 @@
 DocType: Grant Application,Grant Description,Gewähren Beschreibung
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
 DocType: Student Guardian,Others,Andere
+DocType: Subscription,Discounts,Rabatte
 DocType: Payment Entry,Unallocated Amount,Nicht zugewiesene Betrag
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.
 DocType: POS Profile,Taxes and Charges,Steuern und Gebühren
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt oder Dienstleistung, die gekauft, verkauft oder auf Lager gehalten wird."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Keine Updates mehr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Dies deckt alle mit diesem Setup verbundenen Scorecards ab
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Unterartikel sollte nicht ein Produkt-Bundle sein. Bitte Artikel `{0}` entfernen und speichern.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankwesen
@@ -2654,45 +2666,48 @@
 DocType: Vehicle Service,Service Item,Serviceposition
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 DocType: Bin,Ordered Quantity,Bestellte Menge
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Grading Scale,Grading Scale Intervals,Notenskala Intervalle
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Jahresüberschuss
+DocType: Bank Guarantee,Name of Bank,Name der Bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Konteneintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}
 DocType: Fee Schedule,In Process,Während des Fertigungsprozesses
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Baum der Finanzbuchhaltung.
+DocType: Bank Guarantee,Reference Document Type,Referenz-Dokumententyp
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cashflow-Mapping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
 DocType: Account,Fixed Asset,Anlagevermögen
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialisierter Lagerbestand
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-Mail nicht im Standardkontakt gefunden
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Geheimnis erzeugen
-DocType: Employee Loan,Account Info,Kontoinformation
+DocType: Loan,Account Info,Kontoinformation
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
 DocType: Fees,Include Payment,Zahlung einschließen
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Schülergruppen erstellt.
 DocType: Sales Invoice,Total Billing Amount,Gesamtrechnungsbetrag
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Das Programm in der Gebührenstruktur und die Studentengruppe {0} unterscheiden sich.
 DocType: Fee Schedule,Receivable Account,Forderungskonto
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Vermögens {1} ist bereits {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Vermögens {1} ist bereits {2}
 DocType: Quotation Item,Stock Balance,Lagerbestand
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Mit Zahlung der Steuer
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE FÜR LIEFERANTEN
 DocType: Land Unit,Is Container,Ist ein Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Dies ist Tag 1 des Erntezyklus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Bitte richtiges Konto auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Bitte richtiges Konto auswählen
 DocType: Purchase Invoice Item,Weight UOM,Gewichts-Maßeinheit
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Liste der verfügbaren Aktionäre mit Folio-Nummern
 DocType: Salary Structure Employee,Salary Structure Employee,Gehaltsstruktur Mitarbeiter
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Zeige Variantenattribute
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Zeige Variantenattribute
 DocType: Student,Blood Group,Blutgruppe
 DocType: Course,Course Name,Kursname
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Büroausstattung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Büroausstattung
 DocType: Purchase Invoice Item,Qty,Menge
 DocType: Fiscal Year,Companies,Firmen
 DocType: Supplier Scorecard,Scoring Setup,Scoring Setup
@@ -2711,7 +2726,7 @@
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debit Um erforderlich
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Einkaufspreisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Vorlagen der Lieferanten-Scorecard-Variablen.
 DocType: Job Offer Term,Offer Term,Angebotsfrist
 DocType: Asset,Quality Manager,Qualitätsmanager
@@ -2723,13 +2738,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Noch nicht bezahlt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webseite Vorgang
 DocType: Supplier Scorecard,Supplier Score,Lieferantenbewertung
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Gesamtrechnungsbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Gesamtrechnungsbetrag
 DocType: Supplier,Warn RFQs,Warnung Ausschreibungen
 DocType: BOM,Conversion Rate,Wechselkurs
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Produkt Suche
 DocType: Assessment Plan,To Time,Bis-Zeit
 DocType: Authorization Rule,Approving Role (above authorized value),Genehmigende Rolle (über dem autorisierten Wert)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
+DocType: Loan,Total Amount Paid,Gezahlte Gesamtsumme
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Bitte wählen Sie den Studenteneintritt aus, der für den bezahlten Studenten obligatorisch ist"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Bitte wählen Sie eine Preisliste aus, um Preise zu veröffentlichen"
@@ -2739,18 +2755,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preisliste {0} ist deaktiviert
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Abgeschlossene Menge kann nicht mehr sein als {1} für den Betrieb {2}
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized Item {0} kann nicht mit der Bestandsabstimmung aktualisiert werden. Bitte verwenden Sie den Stock Entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized Item {0} kann nicht mit der Bestandsabstimmung aktualisiert werden. Bitte verwenden Sie den Stock Entry
 DocType: Training Event Employee,Training Event Employee,Schulungsveranstaltung Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximum Samples - {0} kann für Batch {1} und Item {2} beibehalten werden.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Zeitfenster hinzufügen
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel {1} erforderlich. Sie haben {2} zur Verfügung gestellt.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel {1} erforderlich. Sie haben {2} zur Verfügung gestellt.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Training Event,Advance,Vorschuss
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,um wiederkehrend zu sein.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless-Gateway-Einstellungen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange-Gewinn / Verlust
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange-Gewinn / Verlust
 DocType: Opportunity,Lost Reason,Verlustgrund
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Zeile # {0}: Konto {1} gehört nicht zur Firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Zeile # {0}: Konto {1} gehört nicht zur Firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kann DocType {0} nicht finden
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
@@ -2769,7 +2784,6 @@
 DocType: Bin,Actual Quantity,Tatsächlicher Bestand
 DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonnement wurde {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Zeitplan Programm
 DocType: Fee Schedule Program,Student Batch,Student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Schüler anlegen
@@ -2784,14 +2798,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-Commerce GSTIN
 DocType: Sales Order,Not Delivered,Nicht geliefert
 ,Bank Clearance Summary,Zusammenfassung Bankabwicklungen
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
 DocType: Appraisal Goal,Appraisal Goal,Bewertungsziel
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Kategorie vorschlagen?
 DocType: Stock Reconciliation Item,Current Amount,Aktuelle Höhe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Gebäude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Gebäude
 DocType: Fee Schedule,Fee Structure,Gebührenstruktur
 DocType: Timesheet Detail,Costing Amount,Kalkulationsbetrag
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Student Admission Program,Application Fee,Anmeldegebühr
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Gehaltsabrechnung übertragen
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
@@ -2799,12 +2812,13 @@
 DocType: Sales Partner,Address & Contacts,Adresse & Kontaktinformationen
 DocType: SMS Log,Sender Name,Absendername
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Landwirtschaft Analysekriterien
+DocType: HR Settings,Leave Approval Notification Template,Lassen Sie die Genehmigungsbenachrichtigungsvorlage
 DocType: POS Profile,[Select],[Select]
 DocType: Vital Signs,Blood Pressure (diastolic),Blutdruck (diastolisch)
 DocType: SMS Log,Sent To,Gesendet An
 DocType: Agriculture Task,Holiday Management,Ferienmanagement
 DocType: Payment Request,Make Sales Invoice,Verkaufsrechnung erstellen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Software
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Software
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Arzt {0} nicht verfügbar auf {1}
@@ -2822,7 +2836,7 @@
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materialverbrauch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,"Als ""abgeschlossen"" markieren"
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Kein Artikel mit Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Kein Artikel mit Barcode {0}
 DocType: Normal Test Items,Require Result Value,Erforderlichen Ergebniswert
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Stücklisten
@@ -2837,19 +2851,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten
 DocType: Leave Block List,Allow Users,Benutzer zulassen
 DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Wiederkehrend
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Details zur Cashflow-Mapping-Vorlage
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Darlehensverwaltung
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Einnahmen und Ausgaben für Produktbereiche oder Abteilungen separat verfolgen.
 DocType: Rename Tool,Rename Tool,Werkzeug zum Umbenennen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Anzeigen Gehaltsabrechnung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Material übergeben
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Anzeigen Gehaltsabrechnung
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Material übergeben
 DocType: Fees,Send Payment Request,Zahlungsauftrag senden
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 DocType: Water Analysis,Origin,Ursprung
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Wählen Sie Änderungsbetrag Konto
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
@@ -2864,14 +2878,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Ist Einkommensteuerpflicht
 DocType: Grading Scale Interval,Grade Description,Grade Beschreibung
 DocType: Stock Entry,Purchase Receipt No,Kaufbeleg Nr.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
-DocType: Sales Invoice, Shipping Bill Number,Versandscheinnummer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Anzahlung
+DocType: Sales Invoice, Shipping Bill Number,Lieferscheinnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Rückverfolgbarkeit
 DocType: Asset Maintenance Log,Actions performed,Aktionen ausgeführt
 DocType: Cash Flow Mapper,Section Leader,Abteilungsleiter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Mittelherkunft (Verbindlichkeiten)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Mittelherkunft (Verbindlichkeiten)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Mitarbeiter
+DocType: Bank Guarantee,Fixed Deposit Number,Feste Einzahlungsnummer
 DocType: Asset Repair,Failure Date,Fehlerdatum
 DocType: Sample Collection,Collected Time,Gesammelte Zeit
 DocType: Company,Sales Monthly History,Verkäufe Monatliche Geschichte
@@ -2888,10 +2903,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,"Sind Sie sicher, dass Sie diesen Termin stornieren möchten?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Preisangebot für das Hotelzimmer
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Vertriebspipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Abruf von Abonnement-Updates
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stimmt nicht mit der Firma {1} im Rechnungsmodus überein: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurs:
@@ -2901,7 +2917,7 @@
 DocType: Notification Control,Expense Claim Approved,Aufwandsabrechnung genehmigt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Keine Arbeitsaufträge erstellt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Arzneimittel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Arzneimittel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
 DocType: Purchase Invoice,Credit To,Gutschreiben auf
@@ -2919,7 +2935,7 @@
 DocType: Request for Quotation Supplier,No Quote,Kein Zitat
 DocType: Warranty Claim,Raised By,Gemeldet durch
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Ausgleich für
 DocType: Job Offer,Accepted,Genehmigt
@@ -2931,7 +2947,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Bitte sicher stellen, dass wirklich alle Transaktionen für diese Firma gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Suchergebnisse
 DocType: Room,Room Number,Zimmernummer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ungültige Referenz {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ungültige Referenz {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
 DocType: Journal Entry Account,Payroll Entry,Personalabrechnung
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Gebührensätze anzeigen
@@ -2941,7 +2957,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
 DocType: Lab Test Sample,Lab Test Sample,Labortestprobe
 DocType: Item Variant Settings,Allow Rename Attribute Value,Zulassen Attributwert umbenennen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Schnellbuchung
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Restaurant,Invoice Series Prefix,Rechnungsserie Präfix
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
@@ -2949,8 +2965,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Die Google Maps-Integration ist nicht aktiviert
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
+DocType: Subscription,Trialling,Erprobung
 DocType: Member,Membership Expiry Date,Ablaufdatum der Mitgliedschaft
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} muss im Retourenschein negativ sein
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} muss im Retourenschein negativ sein
 ,Minutes to First Response for Issues,Minutes to First Response für Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Der Name des Instituts, für die Sie setzen dieses System."
@@ -2969,7 +2986,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Maßeinheit
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Vorgang hängt ab von
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Chance
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Chance
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
 DocType: Notification Control,Expense Claim Approved Message,Benachrichtigung über genehmigte Aufwandsabrechnung
 DocType: Payment Entry,Deductions or Loss,Abzüge oder Verlust
@@ -3007,7 +3024,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Unbezahlter Urlaub passt nicht zu den bestätigten Urlaubsanträgen.
 DocType: Campaign,Campaign-.####,Kampagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
 DocType: Membership,USD,US Dollar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Rechnung erstellen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Verbleibendes Saldo
@@ -3016,7 +3033,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Der Barcode {0} ist kein gültiger {1} Code
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ende Jahr
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Driver,Driver,Treiber
 DocType: Vital Signs,Nutrition Values,Ernährungswerte
 DocType: Lab Test Template,Is billable,Ist abrechenbar
@@ -3027,7 +3044,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Das tatsächliche Startdatum (durch Zeiterfassung)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Alter Bereich 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Der gesamte Vorauszahlungsbetrag darf nicht höher sein als der gesamte beanspruchte Betrag
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Der gesamte Vorauszahlungsbetrag darf nicht höher sein als der gesamte beanspruchte Betrag
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3082,7 +3099,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Wählen Sie Attributwerte
 DocType: Purchase Invoice,Reason For Issuing document,Grund für das ausstellende Dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"""Nächster Kontakt durch"" kann nicht identisch mit der Lead E-Mail-Adresse sein"
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
@@ -3099,7 +3116,8 @@
 DocType: Warranty Claim,Service Address,Serviceadresse
 DocType: Asset Maintenance Task,Calibration,Kalibrierung
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ist ein Firmenurlaub
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Betriebs- und Geschäftsausstattung
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Verlassen Sie die Statusbenachrichtigung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Betriebs- und Geschäftsausstattung
 DocType: Item,Manufacture,Fertigung
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Einrichtung Unternehmen
 ,Lab Test Report,Lab Testbericht
@@ -3115,7 +3133,6 @@
 DocType: Crop,Planting Area,Pflanzfläche
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dies könnte wegen einiger ungültiger E-Mail-Adressen in der
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Du hast hinzugefügt
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Trainingsergebnis
@@ -3125,16 +3142,17 @@
 DocType: Products Settings,Products per Page,Produkte pro Seite
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Stammdaten zu Unternehmensfilialen
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,oder
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Versorgungsaufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Über 90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterien Gewicht
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Genehmigungsbenachrichtigung verlassen
 DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Gehaltsabrechnung Basierend auf Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kaufrate
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Kaufrate
 DocType: Notification Control,Sales Order Message,Benachrichtigung über Kundenauftrag
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Standardwerte wie Firma, Währung, aktuelles Geschäftsjahr usw. festlegen"
 DocType: Payment Entry,Payment Type,Zahlungsart
@@ -3156,6 +3174,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Warenkorb-Einstellungen
 DocType: Journal Entry,Accounting Entries,Buchungen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn die ausgewählte Preisregel für &quot;Rate&quot; festgelegt wurde, wird die Preisliste überschrieben. Der Preisregelpreis ist der Endpreis, daher sollte kein weiterer Rabatt angewendet werden. Daher wird es in Transaktionen wie Kundenauftrag, Bestellung usw. im Feld &#39;Preis&#39; und nicht im Feld &#39;Preislistenpreis&#39; abgerufen."
+DocType: Journal Entry,Paid Loan,Bezahlter Kredit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Doppelter Eintrag/doppelte Buchung. Bitte überprüfen Sie Autorisierungsregel {0}
 DocType: Journal Entry Account,Reference Due Date,Referenz Fälligkeitsdatum
 DocType: Purchase Order,Ref SQ,Ref-SQ
@@ -3172,7 +3191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 ,To Produce,Zu produzieren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lohn-und Gehaltsabrechnung
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
 DocType: Patient Service Unit,Parent Service Unit,Übergeordnete Serviceeinheit
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Benutzer anlegen
 DocType: Packing Slip,Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck)
@@ -3190,7 +3209,7 @@
 DocType: Shareholder,SH-,SCH-
 DocType: Account,Income Account,Ertragskonto
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Auslieferung
 DocType: Volunteer,Weekdays,Wochentage
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: Restaurant Menu,Restaurant Menu,Speisekarte
@@ -3198,7 +3217,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
 DocType: Payment Entry,Total Allocated Amount,Insgesamt zugewiesener Betrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Inventurkonto für permanente Inventur auswählen
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Inventurkonto für permanente Inventur auswählen
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Senden Sie Grant Review E-Mail
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
@@ -3206,10 +3225,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Raumkapazität
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Es existiert bereits ein Datensatz für den Artikel {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Sie werden Datensätze von zuvor generierten Rechnungen verlieren. Möchten Sie dieses Abonnement wirklich neu starten?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registrierungsgebühr
 DocType: Budget,Cost Center,Kostenstelle
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Beleg #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Beleg #
 DocType: Notification Control,Purchase Order Message,Lieferantenauftrags-Nachricht
 DocType: Tax Rule,Shipping Country,Zielland der Lieferung
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ausblenden Kundensteuernummer aus Verkaufstransaktionen
@@ -3218,20 +3238,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Employee Education,Class / Percentage,Klasse / Anteil
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Leiter Marketing und Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Leiter Marketing und Vertrieb
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Einkommensteuer
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Gehe zu Briefköpfe
+DocType: Subscription,Cancel At End Of Period,Am Ende der Periode abbrechen
 DocType: Item Supplier,Item Supplier,Artikellieferant
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Keine Elemente für die Übertragung ausgewählt
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Keine Elemente für die Übertragung ausgewählt
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
 DocType: Vehicle,Electric,elektrisch
 DocType: Task,% Progress,% Fortschritt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Gewinn / Verlust aus der Veräußerung von Vermögenswerten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Gewinn / Verlust aus der Veräußerung von Vermögenswerten
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",In der folgenden Tabelle wird nur der Studienbewerber mit dem Status &quot;Genehmigt&quot; ausgewählt.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Kontonummer für Konto {0} ist nicht verfügbar. <br> Bitte richten Sie Ihren Kontenplan korrekt ein.
 DocType: Task,Depends on Tasks,Abhängig von Vorgang
@@ -3246,6 +3267,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nicht lagernd
 DocType: Volunteer,Volunteer Skills,Freiwillige Fähigkeiten
 DocType: Appraisal,HR User,Nutzer Personalabteilung
+DocType: Bank Guarantee,Reference Document Name,Name des Referenzdokuments
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
 apps/erpnext/erpnext/hooks.py +142,Issues,Probleme
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein
@@ -3259,7 +3281,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 DocType: Sales Invoice,SINV-RET-,SINV-Ret
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Besonders groß
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Besonders groß
+DocType: Loan,Loan Application,Kreditantrag
 DocType: Crop,Scientific Name,Wissenschaftlicher Name
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,insgesamt Blätter
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Wählen Sie erneut, wenn der ausgewählte Kontakt nach dem Speichern bearbeitet wird"
@@ -3268,13 +3291,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Schecknummer
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Groß
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Groß
 DocType: Homepage Featured Product,Homepage Featured Product,auf Webseite vorgestelltes Produkt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alle Bewertungsgruppen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alle Bewertungsgruppen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Neuer Lagername
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Insgesamt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
@@ -3295,9 +3318,10 @@
 DocType: Fees,Fees,Gebühren
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Angebot {0} wird storniert
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Offener Gesamtbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Offener Gesamtbetrag
 DocType: Sales Partner,Targets,Ziele
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Bitte registrieren Sie die SIREN-Nummer in der Unternehmensinformationsdatei
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie das Mitarbeiterbenennungssystem in Human Resource&gt; HR Settings ein
 DocType: Price List,Price List Master,Preislisten-Vorlagen
 DocType: GST Account,CESS Account,CESS-Konto
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
@@ -3306,6 +3330,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Wählen Sie Patient aus
 DocType: Price List,Applicable for Countries,Anwenden für Länder
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametername
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nur Urlaubsanträge mit dem Status ""Gewährt"" und ""Abgelehnt"" können übermittelt werden."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkte, die auf der Webseite angezeigt werden"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
@@ -3350,14 +3375,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Die Rechnung wurde bereits für alle Abrechnungsstunden erstellt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Name Fehler: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Ist Finanzen Kosten
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
 DocType: Packing Slip,If more than one package of the same type (for print),Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Bitte setzen Sie den Standardkunden in den Restauranteinstellungen
 ,Salary Register,Gehalt Register
 DocType: Warehouse,Parent Warehouse,Übergeordnetes Lager
-DocType: C-Form Invoice Detail,Net Total,Nettosumme
+DocType: Subscription,Net Total,Nettosumme
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Standard-Stückliste nicht gefunden für Position {0} und Projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definieren Sie verschiedene Darlehensarten
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definieren Sie verschiedene Darlehensarten
 DocType: Bin,FCFS Rate,"""Wer-zuerst-kommt-mahlt-zuerst""-Anteil (Windhundverfahren)"
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Ausstehender Betrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Zeit (in Min)
@@ -3389,11 +3414,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root-Konto muss eine Gruppe sein
 DocType: Drug Prescription,Drug Prescription,Medikament Rezept
 DocType: Fees,FEE.,GEBÜHR.
-DocType: Employee Loan,Repaid/Closed,Vergolten / Geschlossen
+DocType: Loan,Repaid/Closed,Vergolten / Geschlossen
 DocType: Item,Total Projected Qty,Prognostizierte Gesamtmenge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Bewertungsrate, die für die Position {0} nicht gefunden wurde, die für die Buchungseinträge für {1} {2} erforderlich ist. Wenn die Position als Nullbewertungssatz in der {1} abgewickelt wird, erwähnen Sie bitte in der Tabelle {1}. Andernfalls erstellen Sie bitte eine eingehende Bestandsabwicklung für die Position oder erwähnen Sie den Bewertungssatz im Positionsdatensatz und versuchen Sie dann, diesen Eintrag einzureichen"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setzen Sie die Namensserie für {0} über Setup&gt; Einstellungen&gt; Namensserie
 DocType: Course,Course Code,Kursnummer
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
 DocType: POS Settings,Use POS in Offline Mode,POS im Offline-Modus verwenden
@@ -3413,16 +3437,15 @@
 DocType: Purchase Invoice,Deemed Export,Ausgenommener Export
 DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
-DocType: Subscription,Half-yearly,Halbjährlich
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Lagerbuchung
 DocType: Lab Test,LabTest Approver,LabTest Genehmiger
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Sie haben bereits für die Bewertungskriterien beurteilt.
 DocType: Vehicle Service,Engine Oil,Motoröl
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Arbeitsaufträge erstellt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Arbeitsaufträge erstellt: {0}
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
-DocType: Employee Loan,Loan Details,Darlehensdetails
+DocType: Loan,Loan Details,Darlehensdetails
 DocType: Company,Default Inventory Account,Standard Inventurkonto
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Die Folionummern stimmen nicht überein
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
@@ -3434,19 +3457,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Eine Verknüpfung zu allen Landeinheiten, in denen die Kulturpflanze wächst"
 DocType: Account,Root Type,Root-Typ
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Zeile # {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Zeile # {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden
 DocType: Item Group,Show this slideshow at the top of the page,Diese Diaschau oben auf der Seite anzeigen
 DocType: BOM,Item UOM,Artikelmaßeinheit
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Steuerbetrag nach Abzug von Rabatt (Firmenwährung)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
 DocType: Cheque Print Template,Primary Settings,Primäre Einstellungen
 DocType: Purchase Invoice,Select Supplier Address,Lieferantenadresse auswählen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Mitarbeiter hinzufügen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Mitarbeiter hinzufügen
 DocType: Purchase Invoice Item,Quality Inspection,Qualitätsprüfung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Besonders klein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Besonders klein
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 DocType: Payment Request,Mute Email,Mute Email
@@ -3466,11 +3489,10 @@
 DocType: SMS Log,No of Sent SMS,Anzahl abgesendeter SMS
 DocType: Antibiotic,Healthcare Administrator,Gesundheitswesen Administrator
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Ziel setzen
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 DocType: Dosage Strength,Dosage Strength,Dosierungsstärke
 DocType: Account,Expense Account,Aufwandskonto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Farbe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Farbe
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriterien des Beurteilungsplans
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Das Verfallsdatum ist für den ausgewählten Artikel obligatorisch
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vermeidung von Bestellungen
@@ -3483,18 +3505,18 @@
 DocType: Patient,Personal and Social History,Persönliche und gesellschaftliche Geschichte
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Benutzer {0} erstellt
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup für jeden Schüler
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Code ändern
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Preislistenwährung nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 DocType: Purchase Invoice,Availed ITC Cess,Erreichte ITC Cess
 ,Student Monthly Attendance Sheet,Schülermonatsanwesenheits
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Versandregel gilt nur für den Verkauf
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Startdatum des Projekts
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Bis
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Student Group oder Kursplan ist Pflicht
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pflegen Abrechnungszeiten und Arbeitszeiten Same auf Stundenzettel
@@ -3514,7 +3536,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Liste Ihrer Produkte oder Dienstleistungen, die Sie kaufen oder verkaufen."
 DocType: Water Analysis,Storage Temperature,Lagertemperatur
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarkierte Teilnahme
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Wissenschaftler
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Wissenschaftler
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programm-Enrollment-Tool Studenten
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Startdatum sollte weniger als Enddatum für Aufgabe {0} sein
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Name oder E-Mail-Adresse ist zwingend erforderlich
@@ -3527,7 +3549,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Anfragen an diesen Lieferanten sollten mit Vorsicht ausgegeben werden."
 DocType: Chapter,Non Profit Manager,Non-Profit-Manager
 DocType: BOM,Total Cost(Company Currency),Gesamtkosten (Gesellschaft Währung)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Seriennummer {0} erstellt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Seriennummer {0} erstellt
 DocType: Homepage,Company Description for website homepage,Firmen-Beschreibung für Internet-Homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Namen
@@ -3537,11 +3559,10 @@
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
 DocType: Healthcare Settings,Result Printed,Ergebnis Gedruckt
 DocType: Asset Category Account,Depreciation Expense Account,Aufwandskonto Abschreibungen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Probezeit
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ansicht {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Probezeit
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Project,Total Costing Amount (via Timesheets),Gesamtkalkulationsbetrag (über Arbeitszeittabellen)
-DocType: Employee Advance,Expense Approver,Ausgabenbewilliger
+DocType: Department,Expense Approver,Ausgabenbewilliger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
 DocType: Project,Hourly,Stündlich
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group-Gruppe
@@ -3550,7 +3571,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Bis Datum und Uhrzeit
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
 DocType: Accounts Settings,Make Payment via Journal Entry,Zahlung über Journaleintrag
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Gedruckt auf
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Gedruckt auf
 DocType: Item,Inspection Required before Delivery,Inspektion Notwendige vor der Auslieferung
 DocType: Item,Inspection Required before Purchase,"Inspektion erforderlich, bevor Kauf"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ausstehende Aktivitäten
@@ -3560,7 +3581,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Mindestbestellmenge
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Ihre Organisation
 DocType: Fee Component,Fees Category,Gebühren Kategorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Menge
 DocType: Supplier Scorecard,Notify Employee,Mitarbeiter benachrichtigen
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Namen der Kampagne eingeben, wenn der Ursprung der Anfrage eine Kampagne ist"
@@ -3570,7 +3591,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Meldebestand
 DocType: Company,Chart Of Accounts Template,Kontenvorlage
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Purchase Invoice Item,Accepted Warehouse,Annahmelager
@@ -3578,10 +3599,11 @@
 DocType: Item,Valuation Method,Bewertungsmethode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Halbtages
 DocType: Sales Invoice,Sales Team,Verkaufsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Doppelter Eintrag/doppelte Buchung
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Doppelter Eintrag/doppelte Buchung
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Geben Sie den Namen des Empfängers vor dem Absenden ein.
 DocType: Program Enrollment Tool,Get Students,Holen Studenten
 DocType: Serial No,Under Warranty,Innerhalb der Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Fehler]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Fehler]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Kundenauftrag speichern."
 ,Employee Birthday,Mitarbeiter-Geburtstag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Bitte wählen Sie das Abschlussdatum für die abgeschlossene Reparatur
@@ -3600,7 +3622,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reserviert für Unteraufträge
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
 DocType: Shopping Cart Settings,Orders,Bestellungen
-DocType: Employee Leave Approver,Leave Approver,Urlaubsgenehmiger
+DocType: Department,Leave Approver,Urlaubsgenehmiger
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Bitte wählen Sie eine Charge
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Name der Beurteilungsgruppe
@@ -3644,7 +3666,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Nabenverfolgungsartikel
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FÜR EMPFÄNGER
 DocType: Asset Category Account,Accumulated Depreciation Account,Abschreibungskonto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Diese E-Mail ist automatisch generiert
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Erwartungswert nach der Ausmusterung
@@ -3669,21 +3690,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Besucherrekord {0} existiert gegen Studenten {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Die Abschreibungen Ausgeschieden aufgrund der Veräußerung von Vermögenswerten
-DocType: Member,Member,Mitglied
+DocType: Loan,Member,Mitglied
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Adressen verwalten
 DocType: Work Order Item,Work Order Item,Arbeitsauftragsposition
 DocType: Pricing Rule,Item Code,Artikelabkürzung
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landwirtschaftsmanager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
 DocType: Supplier Scorecard Period,Variables,Variablen
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Schlußstand (Soll)
 DocType: Cheque Print Template,Cheque Size,Scheck Größe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Steuervorlage für Verkaufstransaktionen
 DocType: Sales Invoice,Write Off Outstanding Amount,Offenen Betrag abschreiben
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} stimmt nicht mit der Firma {1} überein
@@ -3691,7 +3712,6 @@
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
 DocType: Asset,Number of Depreciations Booked,Anzahl der gebuchten Abschreibungen
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Menge Gesamt
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Gegen Mitarbeiterdarlehen: {0}
 DocType: Landed Cost Item,Receipt Document,Eingangsbeleg
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Payment Request,Reference Details,Referenzdetails
@@ -3702,7 +3722,7 @@
 DocType: Asset,Double Declining Balance,Doppelte degressive
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Geschlosser Auftrag kann nicht abgebrochen werden. Bitte  wiedereröffnen um abzubrechen.
 DocType: Student Guardian,Father,Vater
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 DocType: Attendance,On Leave,Im Urlaub
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
@@ -3716,10 +3736,10 @@
 DocType: Lead,Lower Income,Niedrigeres Einkommen
 DocType: Restaurant Order Entry,Current Order,Aktueller Auftrag
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Gehen Sie zu Programme
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Zeile {0} # Der zugewiesene Betrag {1} darf nicht größer sein als der nicht beanspruchte Betrag {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Zeile {0} # Der zugewiesene Betrag {1} darf nicht größer sein als der nicht beanspruchte Betrag {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
@@ -3742,7 +3762,6 @@
 DocType: Payment Terms Template,Payment Terms,Zahlungsbedingungen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Fertigungsaufträge können nicht angehoben werden:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minute
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie das Mitarbeiterbenennungssystem in Human Resource&gt; HR Settings ein
 DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -abgaben
 DocType: Chapter,Meetup Embed HTML,Meetup HTML einbetten
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Gehen Sie zu Lieferanten
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposten
 DocType: Sales Order,%  Delivered,%  geliefert
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Bitte legen Sie die E-Mail-ID für den Studenten an, um die Zahlungsanfrage zu senden"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Bitte legen Sie die E-Mail-ID für den Studenten an, um die Zahlungsanfrage zu senden"
 DocType: Patient,Medical History,Krankengeschichte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Kontokorrentkredit-Konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Kontokorrentkredit-Konto
 DocType: Patient,Patient ID,Patienten-ID
 DocType: Physician Schedule,Schedule Name,Planungsname
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Gehaltsabrechnung erstellen
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Alle Lieferanten hinzufügen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Alle Lieferanten hinzufügen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile # {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Stückliste durchsuchen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Gedeckte Kredite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Gedeckte Kredite
 DocType: Purchase Invoice,Edit Posting Date and Time,Buchungsdatum und -uhrzeit bearbeiten
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Bitte setzen Abschreibungen im Zusammenhang mit Konten in der Anlagekategorie {0} oder Gesellschaft {1}
 DocType: Lab Test Groups,Normal Range,Normalbereich
 DocType: Academic Term,Academic Year,Schuljahr
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Verfügbarer Verkauf
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Anfangsstand Eigenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Anfangsstand Eigenkapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Verbleibend
 DocType: Appraisal,Appraisal,Bewertung
+DocType: Loan,Loan Account,Kreditkonto
 DocType: Purchase Invoice,GST Details,GST Details
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-Mail an Lieferanten versandt {0}
 DocType: Item,Default Sales Unit of Measure,Default Sales Maßeinheit
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademisches Jahr:
+DocType: Subscription,Past Due Date,Fälligkeitsdatum
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},"Nicht zulassen, alternative Artikel für den Artikel {0} festzulegen"
 DocType: Opportunity,OPTY-,CHNC-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ereignis wiederholen
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,Patiententermin
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige, auf die die Regel anzuwenden ist"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Holen Sie sich Lieferanten durch
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Holen Sie sich Lieferanten durch
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} für Artikel {1} nicht gefunden
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Gehen Sie zu den Kursen
 DocType: Accounts Settings,Show Inclusive Tax In Print,Inklusivsteuer im Druck anzeigen
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mitteilung gesendet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto mit untergeordneten Knoten kann nicht als Hauptbuch festgelegt werden
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Bitte richten Sie das Instructor Naming System in Education&gt; Education Settings ein
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
 DocType: Physician,Physician Schedules,Arzt Termine
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Der gesamte Vorschussbetrag darf nicht höher sein als der Gesamtbetrag der Sanktion
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Der gesamte Vorschussbetrag darf nicht höher sein als der Gesamtbetrag der Sanktion
 DocType: Salary Slip,Hour Rate,Stundensatz
 DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Aktualisierung von Transaktionen älter als {0} nicht erlaubt
 DocType: BOM,Inspection Required,Prüfung erforderlich
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Geben Sie die Bankgarantie-Nummer vor dem Absenden ein.
 DocType: Driving License Category,Class,Klasse
 DocType: Sales Order,Fully Billed,Voll berechnet
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Arbeitsauftrag kann nicht gegen eine Artikelbeschreibungsvorlage ausgelöst werden
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Verpackungsgweicht. (Für den Ausdruck)
 DocType: Assessment Plan,Program,Programm
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Bitte richten Sie das Instructor Naming System in Education&gt; Education Settings ein
 DocType: Serial No,Is Cancelled,Ist storniert
 DocType: Student Group,Group Based On,Gruppe basiert auf
 DocType: Journal Entry,Bill Date,Rechnungsdatum
@@ -3847,9 +3869,10 @@
 DocType: Cheque Print Template,Cheque Height,Scheck Höhe
 DocType: Supplier,Supplier Details,Lieferantendetails
 DocType: Setup Progress,Setup Progress,Setup Fortschritt
+DocType: Expense Claim,Approval Status,Genehmigungsstatus
 DocType: Hub Settings,Publish Items to Hub,Artikel über den Hub veröffentlichen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Von-Wert muss weniger sein als Bis-Wert in Zeile {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Überweisung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Überweisung
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Alle prüfen
 ,Issued Items Against Work Order,Ausgegebene Artikel gegen Arbeitsauftrag
 DocType: Vehicle Log,Invoice Ref,Rechnung Ref
@@ -3880,12 +3903,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarifnummer
 DocType: Work Order Item,Available Qty at WIP Warehouse,Verfügbare Menge bei WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Geplant
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
-DocType: Employee Loan,Employee Loan Application,MItarbeiterdarlehensantrag
 DocType: Issue,Opening Date,Eröffnungsdatum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Bitte speichern Sie den Patienten zuerst
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Bitte speichern Sie den Patienten zuerst
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
 DocType: Program Enrollment,Public Transport,Öffentlicher Verkehr
 DocType: Soil Texture,Silt Composition (%),Schlammzusammensetzung (%)
@@ -3903,7 +3925,7 @@
 ,Item Balance (Simple),Artikelguthaben (einfach)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debit Note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debit Note Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Garantiefrist (in Tagen)
@@ -3926,6 +3948,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Kundenauftrags-Datum
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
 DocType: Assessment Plan,Assessment Plan,Beurteilungsplan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Journaleintrag umkehren
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunde {0} wird erstellt.
 DocType: Stock Settings,Limit Percent,Limit-Prozent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Derzeit ist kein Bestand in einem Lager verfügbar
@@ -3939,14 +3962,15 @@
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Payment Entry,Payment References,Bezahlung Referenzen
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Anzahl der Intervalle für das Intervallfeld, z. B. wenn das Intervall &quot;Tage&quot; ist und das Abrechnungsintervall 3 beträgt, werden die Rechnungen alle 3 Tage generiert"
 DocType: Vehicle,Insurance Details,Versicherungsdetails
 DocType: Account,Payable,Zahlbar
 DocType: Share Balance,Share Type,Art der Freigabe
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Schuldnern ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Rohgewinn %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Rohgewinn %
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Ändern Sie das POS-Profil
 DocType: Bank Reconciliation Detail,Clearance Date,Abrechnungsdatum
@@ -3956,10 +3980,11 @@
 DocType: Lead,Address Desc,Adresszusatz
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partei ist obligatorisch
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {list}
 DocType: Topic,Topic Name,Thema Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Bitte legen Sie die Standardvorlage für Abwesenheitsmitteilung in den HR-Einstellungen fest.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Wählen Sie einen Mitarbeiter aus, um den Mitarbeiter vorab zu erreichen."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Wählen Sie einen Mitarbeiter aus, um den Mitarbeiter vorab zu erreichen."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Bitte wähle ein gültiges Datum aus
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Wählen Sie die Art Ihres Unternehmens.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3978,7 +4003,7 @@
 DocType: Asset Movement,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Aktienbuch
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Vermögens {1} gehört nicht zur Gesellschaft {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Vermögens {1} gehört nicht zur Gesellschaft {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Verkaufsrechnung {0} erstellt
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
@@ -3987,7 +4012,7 @@
 DocType: Account,Accumulated Depreciation,Kumulierte Abschreibungen
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Standing Name
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
-DocType: Employee Loan Application,Required by Date,Erforderlich by Date
+DocType: Loan Application,Required by Date,Erforderlich by Date
 DocType: Lead,Lead Owner,Eigentümer des Leads
 DocType: Production Plan,Sales Orders Detail,Kundenauftragsdetails
 DocType: Bin,Requested Quantity,die angeforderte Menge
@@ -4000,10 +4025,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttolohn - Gesamtabzug - Darlehensrückzahlung
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Gehaltsabrechnung ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Mehrere Varianten
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% geliefert
+DocType: Subscription,Trial Period Start Date,Testzeitraum Startdatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Bitte melden Sie sich als anderer Benutzer an.
@@ -4024,12 +4050,11 @@
 DocType: Student Guardian,Student Guardian,Studenten Wächter
 DocType: Member,Member Name,Mitgliedsname
 DocType: Stock Settings,Use Naming Series,Verwenden Sie die Namensreihen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,im Abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 DocType: Membership,Payment Details,Zahlungsdetails
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Stückpreis
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Der angehaltene Arbeitsauftrag kann nicht abgebrochen werden. Stoppen Sie ihn zuerst, um ihn abzubrechen"
 DocType: Asset,Journal Entry for Scrap,Journaleintrag für Ausschuss
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
@@ -4049,6 +4074,7 @@
 DocType: Land Unit,Land Unit,Landeinheit
 ,Purchase Analytics,Einkaufsanalyse
 DocType: Sales Invoice Item,Delivery Note Item,Lieferschein-Artikel
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Die aktuelle Rechnung {0} fehlt
 DocType: Asset Maintenance Log,Task,Aufgabe
 DocType: Purchase Taxes and Charges,Reference Row #,Referenz-Zeile #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
@@ -4060,7 +4086,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange-Gewinn / Verlustrechnung
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Mitarbeiter und Teilnahme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Formular ausfüllen und speichern
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Formular ausfüllen und speichern
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community-Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Tatsächliche Menge auf Lager
 DocType: Homepage,"URL for ""All Products""",URL für &quot;Alle Produkte&quot;
@@ -4074,7 +4100,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard-Verkaufspreis
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
 DocType: Cash Flow Mapper,Section Name,Abteilungsname
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Nachbestellmenge
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Nachbestellmenge
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle Stellenangebote
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abschreiben
@@ -4085,9 +4111,9 @@
 DocType: Task,depends_on,hängt ab von
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Warteschlange für die Aktualisierung der neuesten Preis in allen Stückliste. Es kann einige Minuten dauern.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landesspezifische Standard-Adressvorlagen
 DocType: Water Analysis,Appearance,Aussehen
+DocType: HR Settings,Leave Status Notification Template,Lassen Sie die Statusbenachrichtigungsvorlage
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Durchschn. Preislistenpreis kaufen
 DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Mitgliederinformation.
@@ -4110,7 +4136,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nicht gestattet. Bitte deaktivieren Sie die Testvorlage
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
 DocType: Crop Cycle,Linked Land Unit,Verbundene Landeinheit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
@@ -4126,7 +4152,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Gehen Sie zu den Benutzern
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag darf nicht größer der Gesamtsumme sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ungültiges GSTIN oder NA für unregistriert eingeben
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm Einschreibegebühr
@@ -4142,14 +4168,14 @@
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 DocType: Company,Create Chart Of Accounts Based On,"Kontenplan erstellen, basierend auf"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kann es nicht in Nicht-Gruppe konvertieren. Untergeordnete Aufgaben sind vorhanden.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} existiert gegen Studienbewerber {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rundungsanpassung (Firmenwährung)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Zeiterfassung
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Stapel:
 DocType: Volunteer,Afternoon,Nachmittag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
 DocType: Cheque Print Template,Scanned Cheque,Gescannte Scheck
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Ausführen von Transaktionen automatisch E-Mails an Kontakte senden.
@@ -4165,7 +4191,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} existiert bereits
 DocType: Medical Department,Nursing User,Krankenpfleger
 DocType: Plant Analysis,Plant Analysis Criterias,Kriterien für die Pflanzenanalyse
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Verantwortung
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Seriennr. {0} gehört nicht zu Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Verantwortung
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gültigkeitszeitraum dieses Angebots ist beendet.
 DocType: Expense Claim Account,Expense Claim Account,Kostenabrechnung Konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,feste Wechselkurse erlauben
@@ -4187,11 +4214,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Stellen Sie Varianten her
 DocType: Item,Default BOM,Standardstückliste
 DocType: Project,Total Billed Amount (via Sales Invoices),Gesamtabrechnungsbetrag (über Verkaufsrechnungen)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Lastschriftbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Lastschriftbetrag
 DocType: Project Update,Not Updated,Nicht aktualisiert
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Es gibt Unstimmigkeiten zwischen dem Kurs, der Anzahl der Aktien und dem berechneten Betrag"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Offener Gesamtbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
 DocType: Employee Advance,Advance Account,Vorauskonto
 DocType: Job Offer,Job Offer Terms,Stellenangebot Bedingungen
@@ -4200,7 +4227,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Fahrzeugbau
 DocType: Vehicle,Insurance Company,Versicherungsunternehmen
 DocType: Asset Category Account,Fixed Asset Account,Feste Asset-Konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Von Lieferschein
 DocType: Chapter,Members,Mitglieder
 DocType: Student,Student Email Address,Studenten E-Mail-Adresse
@@ -4223,7 +4250,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Praktikant
 DocType: Delivery Stop,Address Name,Adress-Name
 DocType: Stock Entry,From BOM,Von Stückliste
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Aufteilen von {0} Einheiten von {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Aufteilen von {0} Einheiten von {1}
 DocType: Assessment Code,Assessment Code,Beurteilungs-Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
@@ -4231,25 +4258,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
 DocType: Bank Reconciliation Detail,Payment Document,Zahlungsbeleg
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Fehler bei der Auswertung der Kriterienformel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
+DocType: Subscription,Plans,Pläne
 DocType: Salary Slip,Salary Structure,Gehaltsstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Material ausgeben
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Beim Erstellen von Wiederholungen ist ein Fehler aufgetreten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Material ausgeben
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Angebote
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Keine Studentengruppen erstellt.
 DocType: Purchase Invoice Item,Serial No,Seriennummer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Monatlicher Rückzahlungsbetrag kann nicht größer sein als Darlehensbetrag
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Monatlicher Rückzahlungsbetrag kann nicht größer sein als Darlehensbetrag
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein
 DocType: Purchase Invoice,Print Language,Drucksprache
 DocType: Salary Slip,Total Working Hours,Gesamtarbeitszeit
 DocType: Sales Invoice,Customer PO Details,Kundenauftragsdetails
-DocType: Subscription,Next Schedule Date,Nächste Termine Datum
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Temporäres Eröffnungskonto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Geben Sie Wert muss positiv sein
@@ -4277,11 +4303,11 @@
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Von- und Bis-Daten erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Keine Mitarbeiter für die genannten Kriterien
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
 DocType: Hotel Settings,Default Customer,Standardkunde
 DocType: Assessment Plan,Supervisor Name,Name des Vorgesetzten
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bestätigen Sie nicht, ob der Termin für denselben Tag erstellt wurde"
@@ -4305,16 +4331,16 @@
 DocType: Journal Entry Account,Employee Advance,Mitarbeitervorschuss
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequency
 DocType: Lab Test Template,Sensitivity,Empfindlichkeit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Rohmaterial
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Pflanzen und Maschinen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Pflanzen und Maschinen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,tägliche Arbeitszusammenfassung-Einstellungen
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Bitte geben Sie Requd by Date ein
 DocType: Payment Entry,Internal Transfer,Interner Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Wartungsaufgaben
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
@@ -4322,13 +4348,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrationen
 DocType: Crop Cycle,Detected Disease,Erkannte Krankheit
 ,Produced,Produziert
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Das Rückzahlungsstartdatum darf nicht vor dem Auszahlungsdatum liegen.
 DocType: Item,Item Code for Suppliers,Artikelnummer für Lieferanten
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
 DocType: Training Event,Trainer Name,Trainer-Name
 DocType: Mode of Payment,General,Allgemein
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Letzte Kommunikation
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Wertbestimmtung"" oder ""Wertbestimmung und Summe"" ist"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Wertbestimmtung"" oder ""Wertbestimmung und Summe"" ist"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Zahlungen und Rechnungen abgleichen
 DocType: Journal Entry,Bank Entry,Bankbuchung
 DocType: Authorization Rule,Applicable To (Designation),Anwenden auf (Bezeichnung)
@@ -4342,7 +4369,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} am Halbtag Leave am {1}
 DocType: Production Plan,Get Material Request,Get-Material anfordern
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Portoaufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Portoaufwendungen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 ,Item Variant Details,Details der Artikelvariante
@@ -4353,9 +4380,9 @@
 DocType: Drug Prescription,Hour,Stunde
 DocType: Restaurant Order Entry,Last Sales Invoice,Letzte Verkaufsrechnung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Bitte wählen Sie Menge für Artikel {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Lead-Typ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 DocType: Company,Monthly Sales Target,Monatliches Verkaufsziel
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
@@ -4363,7 +4390,7 @@
 DocType: Item,Default Material Request Type,Standard-Material anfordern Typ
 DocType: Supplier Scorecard,Evaluation Period,Bewertungszeitraum
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Unbekannt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Arbeitsauftrag wurde nicht erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Arbeitsauftrag wurde nicht erstellt
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: Purchase Invoice,Export Type,Exporttyp
 DocType: Salary Slip Loan,Salary Slip Loan,Gehalts-Slip-Darlehen
@@ -4379,7 +4406,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Rechnungszusammenfassung öffnen
 DocType: Education Settings,Education Manager,Ausbildungsleiter
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Die minimale Länge zwischen jeder Pflanze im Feld für optimales Wachstum
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Chargenartikel {0} kann nicht durch Lagerabgleich aktualisiert werden. Bitte stattdessen einen Lagereintrag verwenden.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Chargenartikel {0} kann nicht durch Lagerabgleich aktualisiert werden. Bitte stattdessen einen Lagereintrag verwenden.
 DocType: Quality Inspection,Report Date,Berichtsdatum
 DocType: Student,Middle Name,Zweiter Vorname
 DocType: C-Form,Invoices,Eingangsrechnungen
@@ -4410,20 +4437,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, diese wird bereits für {0} verwendet"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Kaufbeleg
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Kaufbeleg
 ,Sales Register,Übersicht über den Umsatz
 DocType: Daily Work Summary Group,Send Emails At,Die E-Mails senden um
 DocType: Quotation,Quotation Lost Reason,Grund für verlorenes Angebotes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formularansicht
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Ausgabengenehmiger in Spesenabrechnung erforderlich
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Fügen Sie, neben Ihnen selbst, weitere Benutzer zu Ihrer Organisation hinzu."
 DocType: Customer Group,Customer Group Name,Kundengruppenname
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Noch keine Kunden!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Geldflussrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Es wurde keine Materialanforderung erstellt
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lizenz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
@@ -4446,11 +4474,12 @@
 DocType: Vehicle,Chassis No,Fahrwerksnummer
 DocType: Payment Request,Initiated,Initiiert
 DocType: Production Plan Item,Planned Start Date,Geplanter Starttermin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Bitte wählen Sie eine Stückliste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Bitte wählen Sie eine Stückliste
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Erhaltene ITC Integrierte Steuer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
+DocType: Bank Guarantee,Clauses and Conditions,Klauseln und Bedingungen
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
 DocType: Project Task,View Timesheet,Arbeitszeittabelle anzeigen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Enddatum muss größer sein als Startdatum
 DocType: Leave Type,Is Encash,Ist Inkasso
 DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
@@ -4464,9 +4493,10 @@
 DocType: Patient,Alcohol Current Use,Aktueller Alkoholkonsum
 DocType: Student Admission Program,Student Admission Program,Studentenzulassungsprogramm
 DocType: Payment Entry,Account Paid To,Eingangskonto
+DocType: Subscription Settings,Grace Period,Zahlungsfrist
 DocType: Item Alternative,Alternative Item Name,Alternativer Artikelname
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Es konnte kein Gehaltschein eingereicht werden <br> \ Mögliche Gründe: <br> \ 1. Nettogehalt ist kleiner als 0. <br> \ 2. Die im Mitarbeiterstamm angegebene Firmen-E-Mail-Adresse ist nicht gültig. <br>
@@ -4476,7 +4506,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget für Konto {1} gegen {2} {3} ist {4}. Es wird durch {5} überschritten.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',"Konto in Zeile {0} muss vom Typ ""Anlagevermögen"" sein"
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ausgabe-Menge
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,und unchcked Deaktiviert in der
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serie ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finanzdienstleistungen
 DocType: Student Sibling,Student ID,Studenten ID
@@ -4488,14 +4517,16 @@
 DocType: Complaint,Complaint,Beschwerde
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Machen Sie einen Rückzahlungseintrag
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alle Abteilungen
 DocType: Patient,Alcohol Past Use,Vergangener Alkoholkonsum
 DocType: Fertilizer Content,Fertilizer Content,Dünger Inhalt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Haben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Haben
 DocType: Project Update,Problematic/Stuck,Problematisch / Fest
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
 DocType: Share Transfer,Transfer,Übertragung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Der Arbeitsauftrag {0} muss vor dem Stornieren dieses Kundenauftrags storniert werden
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
@@ -4519,10 +4550,11 @@
 DocType: Cheque Print Template,Message to show,Nachricht anzeigen
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Einzelhandel
 DocType: Student Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produkt-Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Der Score konnte nicht gefunden werden bei {0}. Sie müssen stehende Noten von 0 bis 100 haben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -abgaben
+DocType: Subscription,Current Invoice Start Date,Aktuelles Rechnungsstartdatum
 DocType: Timesheet,TS-,ZB-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Debit- oder Kreditbetrag ist für {2} erforderlich
 DocType: GL Entry,Remarks,Bemerkungen
@@ -4532,11 +4564,13 @@
 DocType: Task,Parent Task,Übergeordnete Aufgabe
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Lead erstellen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Drucken und Papierwaren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Drucken und Papierwaren
 DocType: Stock Settings,Show Barcode Field,Anzeigen Barcode-Feld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Lieferantenemails senden
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gehalt bereits verarbeitet für den Zeitraum zwischen {0} und {1}, freiBewerbungsFrist kann nicht zwischen diesem Datum liegen."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Lieferantenemails senden
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gehalt bereits verarbeitet für den Zeitraum zwischen {0} und {1}, freiBewerbungsFrist kann nicht zwischen diesem Datum liegen."
+DocType: Fiscal Year,Auto Created,Automatisch erstellt
 DocType: Chapter Member,Leave Reason,Verlasse die Vernunft
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Die Rechnung {0} existiert nicht mehr
 DocType: Guardian Interest,Guardian Interest,Wächter Interesse
 DocType: Volunteer,Availability,Verfügbarkeit
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Standardwerte für POS-Rechnungen einrichten
@@ -4544,14 +4578,13 @@
 DocType: Project,Time to send,Zeit zu senden
 DocType: Timesheet,Employee Detail,Mitarbeiterdetails
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-Mail-ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
 DocType: Lab Prescription,Test Code,Testcode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Einstellungen für die Internet-Homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs sind nicht zulässig für {0} aufgrund einer Scorecard von {1}
 DocType: Job Offer,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Über
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Gesamtbetrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ungültiges Attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Gesamtbetrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ungültiges Attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Erwähnen Sie, wenn nicht standardmäßig zahlbares Konto"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Bitte wählen Sie die Bewertungsgruppe außer &quot;All Assessment Groups&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Zeile {0}: Kostenstelle ist für einen Eintrag {1} erforderlich
@@ -4562,7 +4595,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Wasseranalyse
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
 DocType: Holiday List,Weekly Off,Wöchentlich frei
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reload verknüpfte Analyse
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für z. B. 2012, 2012-13"
@@ -4578,7 +4611,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kosten für Ausschuss-Entsorgung
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
 DocType: Vehicle,Policy No,Politik keine
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 DocType: Asset,Straight Line,Gerade Linie
 DocType: Project User,Project User,Projektarbeit Benutzer
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Teilt
@@ -4614,21 +4647,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Pfad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat"
 DocType: Production Plan,Total Planned Qty,Geplante Gesamtmenge
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Öffnungswert
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Öffnungswert
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serien #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serien #
 DocType: Lab Test Template,Lab Test Template,Labortestvorlage
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Verkaufskonto
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Verkaufskonto
 DocType: Purchase Invoice Item,Total Weight,Gesamtgewicht
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provision auf den Umsatz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Provision auf den Umsatz
 DocType: Job Offer Term,Value / Description,Wert / Beschreibung
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
 DocType: Purchase Order Item,Expected Delivery Date,Geplanter Liefertermin
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestellung
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
 DocType: Asset Maintenance Task,Assign To Name,Zu Name zuweisen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Bewirtungskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Bewirtungskosten
 DocType: Hub Settings,Enabled Users,Aktivierte Benutzer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Materialanforderung anlegen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Offene-Posten {0}
@@ -4641,24 +4674,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Urlaubsanträge
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 DocType: Vehicle,Last Carbon Check,Last Kohlenstoff prüfen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rechtskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Rechtskosten
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Bitte wählen Sie die Menge aus
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Machen Sie offene Rechnungen für Verkauf und Kauf
 DocType: Purchase Invoice,Posting Time,Buchungszeit
 DocType: Timesheet,% Amount Billed,% des Betrages berechnet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Hier aktivieren, wenn der Benutzer gezwungen sein soll, vor dem Speichern eine Serie auszuwählen. Bei Aktivierung gibt es keine Standardvorgabe."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
 DocType: Email Digest,Open Notifications,Offene Benachrichtigungen
 DocType: Payment Entry,Difference Amount (Company Currency),Differenzbetrag (Gesellschaft Währung)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direkte Aufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direkte Aufwendungen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reisekosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Reisekosten
 DocType: Maintenance Visit,Breakdown,Ausfall
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Benutzerdefiniertes Feld Abonnement im Doctype {0} hinzufügen
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Purchase Receipt Item,Sample Quantity,Beispielmenge
+DocType: Bank Guarantee,Name of Beneficiary,Name des Begünstigten
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualisieren Sie die Stücklistenkosten automatisch über den Scheduler, basierend auf dem aktuellen Bewertungspreis / Preisliste / letzter Kaufpreis der Rohstoffe."
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
@@ -4670,14 +4703,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probezeit
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Gehaltskomponenten
 DocType: Program Enrollment Tool,New Academic Year,Neues Studienjahr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / Gutschrift
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / Gutschrift
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Summe gezahlte Beträge
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Summe gezahlte Beträge
 DocType: GST Settings,B2C Limit,B2C-Grenze
 DocType: Work Order Item,Transferred Qty,Übergebene Menge
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigieren
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planung
 DocType: Share Balance,Issued,Ausgestellt
+DocType: Loan,Repayment Start Date,Startdatum der Rückzahlung
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentische Tätigkeit
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Lieferanten-ID
 DocType: Payment Request,Payment Gateway Details,Payment Gateway-Details
@@ -4690,10 +4724,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Grund für Beurlaubung, wie Erholung, krank usw."
 DocType: Email Digest,Send regular summary reports via Email.,Regelmäßig zusammenfassende Berichte per E-Mail senden.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
 DocType: Assessment Result,Student Name,Name des Studenten
 DocType: Brand,Item Manager,Artikel-Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll Kreditoren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll Kreditoren
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
 DocType: Plant Analysis,Collection Datetime,Sammlung Datetime
 DocType: Work Order,Total Operating Cost,Gesamtbetriebskosten
@@ -4703,9 +4737,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Benutzer {0} existiert nicht
 DocType: Payment Term,Day(s) after invoice date,Tag (e) nach Rechnungsdatum
 DocType: Payment Schedule,Payment Schedule,Zahlungsplan
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abkürzung
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Zahlung existiert bereits
+DocType: Subscription,Trial Period End Date,Testzeitraum Enddatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Pathologie
@@ -4722,9 +4756,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alle Kundengruppen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Monatlich akkumuliert
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
@@ -4733,14 +4767,15 @@
 DocType: Lab Prescription,Test Created,Test erstellt
 DocType: Healthcare Settings,Custom Signature in Print,Kundenspezifische Unterschrift im Druck
 DocType: Account,Temporary,Temporär
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kunden-LPO-Nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kunden-LPO-Nr.
 DocType: Program,Courses,Kurse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretärin
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretärin
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Wenn deaktivieren, wird &quot;in den Wörtern&quot; Feld nicht in einer Transaktion sichtbar sein"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"Diese Aktion wird die zukünftige Abrechnung stoppen. Sind Sie sicher, dass Sie dieses Abonnement kündigen möchten?"
 DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterien Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Bitte setzen Unternehmen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Bitte setzen Unternehmen
 DocType: Pricing Rule,Buying,Einkauf
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Krankheiten und Dünger
 DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze werden erstellt nach
@@ -4749,17 +4784,17 @@
 DocType: POS Profile,Apply Discount On,Rabatt anwenden auf
 DocType: Member,Membership Type,Art der Mitgliedschaft
 ,Reqd By Date,Benötigt nach Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Gläubiger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Gläubiger
 DocType: Assessment Plan,Assessment Name,Name der Beurteilung
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Zeige PDC im Druck
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Zeige PDC im Druck
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-Details
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Jobangebot
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abkürzung des Institutes
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Menge ({0}) kann in Zeile {1} keine Teilmenge sein
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Menge ({0}) kann in Zeile {1} keine Teilmenge sein
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
@@ -4777,7 +4812,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Gesamtabweichung
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, bucht das System Bestandsbuchungen automatisch."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Maklerprovision
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Die Teilnahme für Mitarbeiter {0} ist bereits für diesen Tag markiert
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Die Teilnahme für Mitarbeiter {0} ist bereits für diesen Tag markiert
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
 DocType: Customer,From Lead,Von Lead
@@ -4788,6 +4823,7 @@
 DocType: Lab Test,Approved Date,Genehmigter Termin
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
+DocType: Subscriber,Subscriber Name,Name des Abonnenten
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Update Tool,Replace,Ersetzen
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Keine Produkte gefunden
@@ -4797,19 +4833,18 @@
 DocType: Request for Quotation Item,Project Name,Projektname
 DocType: Customer,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Zinsertragskonto in Mitarbeiterdarlehen auswählen {0}
 DocType: Work Order,Required Items,Erforderliche Elemente
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Personal
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Zahlung zum Zahlungsabgleich
 DocType: Disease,Treatment Task,Behandlungsaufgabe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Steuerguthaben
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Steuerguthaben
 DocType: BOM Item,BOM No,Stücklisten-Nr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Update Tool,The BOM which will be replaced,"Die Stückliste (BOM), wird ersetzt."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektronische Ausrüstungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektronische Ausrüstungen
 DocType: Asset,Maintenance Required,Wartung erforderlich
 DocType: Account,Debit,Soll
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
@@ -4818,7 +4853,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Offener Betrag
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Vermögens ist obligatorisch für Anlage Kauf / Verkauf
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Vermögens ist obligatorisch für Anlage Kauf / Verkauf
 DocType: Asset Maintenance Team,Maintenance Team Name,Name des Wartungsteams
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Der Kunde ist obligatorisch, wenn &quot;Verkaufschance&quot; als Kunde ausgewählt wurde"
@@ -4827,19 +4862,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können."
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Arten der Aufwandsabrechnung
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Der Verkaufspreis für Artikel {0} ist niedriger als {1}. Der Verkaufspreis sollte wenigstens {2} sein.
-DocType: Item,Taxes,Steuern
+DocType: Subscription,Taxes,Steuern
 DocType: Purchase Invoice,capital goods,Kapitalgüter
 DocType: Purchase Invoice Item,Weight Per Unit,Gewicht pro Einheit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Bezahlt und nicht ausgeliefert
 DocType: Project,Default Cost Center,Standardkostenstelle
-DocType: Bank Guarantee,End Date,Enddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagerbuchungen
 DocType: Budget,Budget Accounts,Budget Konten
 DocType: Employee,Internal Work History,Interne Arbeits-Historie
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Aufgelaufener Abschreibungsbetrag
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Supplier Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,in voller Höhe ausgezahlt
 DocType: Employee Advance,Due Advance Amount,Fälliger Vorschussbetrag
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Kosten
@@ -4863,7 +4896,7 @@
 ,Employee Information,Mitarbeiterinformationen
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standardsteuervorlagen für Verkauf und Einkauf werden erstellt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Beurteilungsergebnis {0} existiert bereits.
@@ -4871,7 +4904,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Bitte setzen Sie den Firmenfilter leer, wenn Group By &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Buchungsdatum kann nicht Datum in der Zukunft sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,zur Erzeugung der wiederkehrenden
 DocType: Stock Entry,Target Warehouse Address,Ziellageradresse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Erholungsurlaub
 DocType: Agriculture Task,End Day,Ende Tag
@@ -4896,11 +4928,10 @@
 DocType: Material Request,% Ordered,% bestellt
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Für die Kursbasierte Studentengruppe wird der Kurs für jeden Schüler aus den eingeschriebenen Kursen in der Programmregistrierung validiert.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkordarbeit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Share Balance,From No,Von Nr
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Neue Nachricht von {Absender}
 DocType: Customer,Customer Primary Address,Hauptadresse des Kunden
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter
 DocType: Drug Prescription,Description/Strength,Beschreibung / Stärke
@@ -4909,22 +4940,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Das gleiche Einzelteil wurde mehrfach eingegeben
 DocType: Department,Leave Block List,Urlaubssperrenliste
 DocType: Purchase Invoice,Tax ID,Steuer ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein
 DocType: Accounts Settings,Accounts Settings,Konteneinstellungen
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Genehmigen
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatierte Adresse für {0}, bitte korrigieren, um fortzufahren."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatierte Adresse für {0}, bitte korrigieren, um fortzufahren."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",Die Nummer des neuen Kontos wird als Präfix in den Kontonamen aufgenommen
 DocType: Maintenance Team Member,Team Member,Teammitglied
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Kein Ergebnis zur Einreichung
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
-DocType: Employee Loan,Rate of Interest (%) / Year,Zinssatz (%) / Jahr
+DocType: Loan,Rate of Interest (%) / Year,Zinssatz (%) / Jahr
 ,Project Quantity,Projekt Menge
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
 DocType: Opportunity,To Discuss,Infos zur Diskussion
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} zum Abschluss dieser Transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Zinssatz (%) Jahres
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Temporäre Konten
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Schwarz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Temporäre Konten
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Schwarz
 DocType: BOM Explosion Item,BOM Explosion Item,Position der aufgelösten Stückliste
 DocType: Shareholder,Contact List,Kontaktliste
 DocType: Account,Auditor,Prüfer
@@ -4932,16 +4963,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} Elemente hergestellt
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Erfahren Sie mehr
 DocType: Cheque Print Template,Distance from top edge,Die Entfernung von der Oberkante
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Preisliste {0} ist deaktiviert oder nicht vorhanden ist
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Preisliste {0} ist deaktiviert oder nicht vorhanden ist
 DocType: Purchase Invoice,Return,Zurück
 DocType: Pricing Rule,Disable,Deaktivieren
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,"Modus der Zahlung ist erforderlich, um eine Zahlung zu leisten"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,"Modus der Zahlung ist erforderlich, um eine Zahlung zu leisten"
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Bearbeiten Sie in Vollansicht für weitere Optionen wie Assets, Seriennummern, Chargen usw."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Termine und Konsultationen
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ist nicht im Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",Anlagewert-{0} ist bereits entsorgt {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Überprüfungen erforderlich
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Überprüfungen erforderlich
 DocType: Task,Total Expense Claim (via Expense Claim),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnung)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Abwesend setzen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Fehler beim Einrichten der Firma
@@ -4953,7 +4984,7 @@
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flottenmanagement
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Elemente hinzufügen aus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Elemente hinzufügen aus
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Kulturen und Länder
 DocType: Cheque Print Template,Regular,Regulär
 DocType: Fertilizer,Density (if liquid),Dichte (falls flüssig)
@@ -4978,24 +5009,26 @@
 DocType: Payment Entry,Paid Amount,Gezahlter Betrag
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Entdecken Sie den Verkaufszyklus
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Vorratsbestandseintrag
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Vorratsbestandseintrag
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 ,Work Order Stock Report,Arbeitsauftragsbericht
+DocType: Purchase Receipt,Auto Repeat Detail,Auto-Wiederholung Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Beurteilungsergebniswerkzeug
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Als Vorgesetzter
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Kategorie vorschlagen
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Ausschussartikel
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Qualitätsmanagement
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Qualitätsmanagement
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Artikel {0} wurde deaktiviert
 DocType: Project,Total Billable Amount (via Timesheets),Gesamter abrechenbarer Betrag (über Arbeitszeittabellen)
 DocType: Agriculture Task,Previous Business Day,Voriger Geschäftstag
-DocType: Employee Loan,Repay Fixed Amount per Period,Repay fixen Betrag pro Periode
+DocType: Loan,Repay Fixed Amount per Period,Repay fixen Betrag pro Periode
 DocType: Employee,Health Insurance No,Krankenversicherung Nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditnachweis amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditnachweis amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Total Steuerbetrag
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
 DocType: Opening Invoice Creation Tool,Purchase,Einkauf
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilanzmenge
@@ -5006,15 +5039,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} für {1}
 DocType: Healthcare Settings,Valid number of days,Gültige Anzahl von Tagen
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kostenstellen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Abonnement neu starten
 DocType: Land Unit,Linked Plant Analysis,Linked-Plant-Analyse
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Nullbewertung zulassen
+DocType: Bank Guarantee,Receiving,Empfang
 DocType: Training Event Employee,Invited,Eingeladen
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Mehrere aktive Gehaltsstrukturen für Mitarbeiter gefunden {0} für die angegebenen Daten
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup-Gateway-Konten.
 DocType: Employee,Employment Type,Art der Beschäftigung
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anlagevermögen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Anlagevermögen
 DocType: Payment Entry,Set Exchange Gain / Loss,Stellen Sie Exchange-Gewinn / Verlust
 ,GST Purchase Register,GST Kaufregister
 ,Cash Flow,Cash Flow
@@ -5034,9 +5069,10 @@
 DocType: Academic Term,Term Start Date,Semesteranfang
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Liste aller Aktientransaktionen
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Anzahl der Chancen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Das Startdatum für die Testperiode und das Enddatum für die Testperiode müssen festgelegt werden
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Durchschnittsrate
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein
+DocType: Subscription Plan Detail,Plan,Planen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
 DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
@@ -5066,6 +5102,7 @@
 DocType: Work Order,Warehouses,Lager
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} Anlagevermögen kann nicht übertragen werden
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel Zimmerpreise
+DocType: Subscription,Days Until Due,Tage bis Fälligkeit
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Dieser Artikel ist eine Variante von {0} (Vorlage).
 DocType: Workstation,per hour,pro Stunde
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Einkauf
@@ -5074,13 +5111,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Für die Batch-basierte Studentengruppe wird die Student Batch für jeden Schüler aus der Programmregistrierung validiert.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Großhandel
+DocType: Journal Entry Account,Loan,Darlehen
 DocType: Expense Claim Advance,Expense Claim Advance,Spesenabrechnung
 DocType: Lab Test,Report Preference,Berichtsvorgabe
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Freiwillige Informationen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektleiter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektleiter
 ,Quoted Item Comparison,Vergleich angebotener Artikel
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Überlappung beim Scoring zwischen {0} und {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Versand
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maximal erlaubter Rabatt für Artikel: {0} ist {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Nettoinventarwert als auf
 DocType: Crop,Produce,Produzieren
@@ -5090,7 +5128,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materialverbrauch für die Herstellung
 DocType: Item Alternative,Alternative Item Code,Alternativer Artikelcode
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
 DocType: Delivery Stop,Delivery Stop,Liefer Stopp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
 DocType: Item,Material Issue,Materialentnahme
@@ -5100,15 +5138,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Reinigungsmittel
 DocType: BOM,Show Items,Elemente anzeigen
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Von Zeit sein kann, nicht größer ist als auf die Zeit."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Möchten Sie alle Kunden per E-Mail benachrichtigen?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Möchten Sie alle Kunden per E-Mail benachrichtigen?
+DocType: Subscription Plan,Billing Interval,Abrechnungsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Fortsetzen
 DocType: Hub Settings,Hub Username,Hub-Benutzername
 DocType: Salary Detail,Component,Komponente
 DocType: Assessment Criteria,Assessment Criteria Group,Beurteilungskriterien Gruppe
 DocType: Healthcare Settings,Patient Name By,Patientenname Von
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Abrechnungseintrag für Gehälter von {0} bis {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Abrechnungseintrag für Gehälter von {0} bis {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
@@ -5122,22 +5160,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 DocType: Leave Block List,Applies to Company,Gilt für Firma
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
-DocType: Employee Loan,Disbursement Date,Valuta-
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,"Keine ""Empfänger"" angegeben"
+DocType: Loan,Disbursement Date,Valuta-
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualisieren Sie den aktuellen Preis in allen Stücklisten
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Krankenakte
 DocType: Vehicle,Vehicle,Fahrzeug
 DocType: Purchase Invoice,In Words,In Worten
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Geben Sie den Namen der Bank oder des kreditgebenden Instituts vor dem Absenden ein.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} muss eingereicht werden
 DocType: POS Profile,Item Groups,Artikelgruppen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Sales Order Item,For Production,Für die Produktion
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Bitte fügen Sie ein vorübergehendes Eröffnungskonto im Kontenplan hinzu
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Bitte fügen Sie ein vorübergehendes Eröffnungskonto im Kontenplan hinzu
 DocType: Customer,Customer Primary Contact,Hauptkontakt des Kunden
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periodenabschluss-Journal
 DocType: Project Task,View Task,Aufgabe anzeigen
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Chance/ Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Art der Bankgarantie
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Rechnungsteil
 ,Asset Depreciations and Balances,Anlagenbschreibungen und Balances
@@ -5148,9 +5187,8 @@
 DocType: Production Plan,Include Subcontracted Items,Subkontrahierte Artikel einbeziehen
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Beitreten
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Nach der Bestandsübertragung können die Varianteneigenschaften nicht geändert werden. Sie müssen dafür einen neuen Artikel erstellen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
-DocType: Employee Loan,Repay from Salary,Repay von Gehalts
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+DocType: Loan,Repay from Salary,Repay von Gehalts
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Anfordern Zahlung gegen {0} {1} für Menge {2}
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
@@ -5174,11 +5212,11 @@
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden
 DocType: Land Unit,Parent Land Unit,Elternlandeinheit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
 DocType: Fertilizer,Fertilizer Name,Dünger Name
 DocType: Salary Slip,Net Pay,Nettolohn
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
 ,Requested Items To Be Transferred,"Angeforderte Artikel, die übertragen werden sollen"
 DocType: Expense Claim,Vehicle Log,Fahrzeug Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Vorhandensein eines Fiebers (Temp .: 38,5 ° C / 101,3 ° F oder anhaltende Temperatur&gt; 38 ° C / 100,4 ° F)"
@@ -5219,24 +5257,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
 DocType: Asset Maintenance,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Invoice,Raw Materials Supplied,Gelieferte Rohmaterialien
-DocType: C-Form,Series,Nummernkreise
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Die Währung der Preisliste {0} muss {1} oder {2}
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Soil Texture,Ternary Plot,Ternäres Grundstück
 DocType: Item Group,Item Classification,Artikeleinteilung
 DocType: Driver,License Number,Lizenznummer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Leiter der kaufmännischen Abteilung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Leiter der kaufmännischen Abteilung
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Zweck des Wartungsbesuchs
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Rechnungsempfänger
 DocType: Crop,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Hauptbuch
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Mitarbeiter {0} am {1} im Urlaub
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Mitarbeiter {0} am {1} im Urlaub
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Leads anzeigen
 DocType: Program Enrollment Tool,New Program,Neues Programm
 DocType: Item Attribute Value,Attribute Value,Attributwert
 ,Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand
 DocType: Salary Detail,Salary Detail,Gehalt Details
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Bitte zuerst {0} auswählen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Bitte zuerst {0} auswählen
 DocType: Appointment Type,Physician,Arzt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultationen
@@ -5244,15 +5281,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) darf nicht größer als die geplante Menge ({2}) im Arbeitsauftrag {3} sein
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Zeitblatt für die Fertigung.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Zwischensumme
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kann die Eigenschaften des Bestands nach der Bestandsbuchung nicht ändern. Sie müssen dafür einen neuen Artikel erstellen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA-Mandat
 DocType: Physician,Charges,Gebühren
 DocType: Production Plan,Get Items For Work Order,Holen Sie sich Artikel zum Arbeitsauftrag
 DocType: Salary Detail,Default Amount,Standard-Betrag
 DocType: Lab Test Template,Descriptive,Beschreibend
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Lager im System nicht gefunden
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Lager im System nicht gefunden
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Zusammenfassung dieses Monats
 DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Setzen Sie ein Verkaufsziel, das Sie für Ihr Unternehmen erreichen möchten."
 ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung
@@ -5280,11 +5318,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Fehler beim Erstellen der Website
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Aufbewahrungsbestandseintrag bereits angelegt oder Musterbestand nicht bereitgestellt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Aufbewahrungsbestandseintrag bereits angelegt oder Musterbestand nicht bereitgestellt
 DocType: Program,Program Abbreviation,Programm Abkürzung
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert
 DocType: Warranty Claim,Resolved By,Entschieden von
-DocType: Bank Guarantee,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Schecks und Kautionen fälschlicherweise gelöscht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
@@ -5299,11 +5336,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Stunden
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korrektur in der Rechnung
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Arbeitsauftrag wurde bereits für alle Artikel mit Stückliste angelegt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Arbeitsauftrag wurde bereits für alle Artikel mit Stückliste angelegt
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Bericht über Variantendetails
 DocType: Setup Progress Action,Setup Progress Action,Setup Fortschrittsaktion
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kauf Preisliste
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kauf Preisliste
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechnet werden können"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Abonnement beenden
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Bitte wählen Sie Wartungsstatus als erledigt oder entfernen Sie das Abschlussdatum
 DocType: Supplier,Default Payment Terms Template,Standardvorlage für Zahlungsbedingungen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaktionswährung muß gleiche wie Payment Gateway Währung
@@ -5314,7 +5352,6 @@
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Erwünschte Aktion bei überschrittenem kumuliertem Monatsbudget
-DocType: Subscription,Submit on creation,Buchen beim Erstellen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Währung für {0} muss {1} sein
 DocType: Asset,Disposal Date,Verkauf Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-Mails werden an alle aktiven Mitarbeiter des Unternehmens an der angegebenen Stunde gesendet werden, sofern sie nicht im Urlaub sind. Die Zusammenfassung der Antworten wird um Mitternacht versandt werden."
@@ -5332,6 +5369,7 @@
 DocType: Batch,Parent Batch,Übergeordnete Charge
 DocType: Cheque Print Template,Cheque Print Template,Scheck Druckvorlage
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenstellenplan
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Anzahl der Tage nach Rechnungsdatum, bevor Abonnement oder Zeichnungsabonnement als unbezahlt storniert werden"
 DocType: Lab Test Template,Sample Collection,Beispielsammlung
 ,Requested Items To Be Ordered,"Angefragte Artikel, die bestellt werden sollen"
 DocType: Price List,Price List Name,Preislistenname
@@ -5340,7 +5378,7 @@
 DocType: Account,Income,Einkommen
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Etwas ist schiefgelaufen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
 DocType: Supplier Scorecard Scoring Criteria,Score,Ergebnis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Das Geschäftsjahr {0} existiert nicht
@@ -5360,12 +5398,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} sollte ein Wert zwischen 0 und 100 sein
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ungesicherte Kredite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Max Arbeitszeit gegen Stundenzettel
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplantes Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Summe gezahlte Beträge
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Summe gezahlte Beträge
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt
 DocType: Purchase Receipt Item,Received and Accepted,Erhalten und bestätigt
 DocType: Hub Settings,Company and Seller Profile,Firmen- und Verkäuferprofil
@@ -5379,10 +5417,9 @@
 DocType: Item,Variant Based On,Variante basierend auf
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Ihre Lieferanten
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Bitte korrigieren Sie die
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
 DocType: Request for Quotation Item,Supplier Part No,Lieferant Teile-Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abschreiben, wenn die Kategorie ""Bewertung"" oder ""Bewertung und Total 'ist"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abschreiben, wenn die Kategorie ""Bewertung"" oder ""Bewertung und Total 'ist"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonym
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Erhalten von
 DocType: Lead,Converted,umgewandelt
@@ -5396,6 +5433,7 @@
 DocType: Asset,Assets,Vermögenswerte
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
+DocType: Subscription,Current Invoice End Date,Aktuelles Rechnungsenddatum
 DocType: Payment Term,Due Date Based On,Fälligkeitsdatum basiert auf
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Bitte legen Sie die Standard-Kundengruppe und das Territorium in Selling Settings fest
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} existiert nicht
@@ -5403,7 +5441,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Keine Rückzahlungen für die Journalbuchung ausgewählt
 DocType: Payment Reconciliation,From Invoice Date,Ab Rechnungsdatum
+DocType: Loan,Disbursed,Ausgezahlt
 DocType: Healthcare Settings,Laboratory Settings,Laboreinstellungen
 DocType: Patient Appointment,Service Unit,Serviceeinheit
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Setzen Sie den Lieferanten erfolgreich
@@ -5416,12 +5456,12 @@
 DocType: Share Balance,No of Shares,Anzahl der Aktien
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Wählen Sie Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: School House,House Name,Hausname
 DocType: Fee Schedule,Total Amount per Student,Gesamtbetrag pro Student
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektro
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektro
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten die Einladung senden
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
 DocType: Grant Application,Requested Amount,Gewünschter Betrag
@@ -5431,7 +5471,7 @@
 DocType: Crop Cycle,Detected Diseases,Erkannte Krankheiten
 DocType: Stock Entry,Default Source Warehouse,Standard-Ausgangslager
 DocType: Item,Customer Code,Kunden-Nr.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Geburtstagserinnerung für {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 DocType: Asset Maintenance Task,Last Completion Date,Letztes Fertigstellungsdatum
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
@@ -5439,9 +5479,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardlose Einstellungen
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Wertpapiere
 DocType: Restaurant,Active Menu,Aktives Menü
 DocType: Target Detail,Target Qty,Zielmenge
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Gegen Darlehen: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Kasse Einstellungen
 DocType: Student Attendance,Present,Anwesend
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht gebucht werden
@@ -5450,9 +5491,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
 DocType: Vehicle Log,Odometer,Tacho
 DocType: Production Plan Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Stückliste enthält keine Lagerware
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Stückliste enthält keine Lagerware
 DocType: Chapter,Chapter Head,Gruppen-Vorstand
 DocType: Payment Term,Month(s) after the end of the invoice month,Monat (e) nach dem Ende des Rechnungsmonats
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektaktivität/-vorgang.
@@ -5460,11 +5501,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab-Ergebnis datetime kann nicht vor dem Testen von datetime liegen
 DocType: POS Profile,Allow user to edit Discount,"Erlaube dem Nutzer, den Rabatt zu bearbeiten"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Holen Sie Kunden von
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Holen Sie Kunden von
 DocType: Purchase Invoice Item,Include Exploded Items,Explodierte Elemente einschließen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
 DocType: Shipping Rule,Restrict to Countries,Auf Länder beschränken
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setzen Sie die Namensserie für {0} über Setup&gt; Einstellungen&gt; Namensserie
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
 DocType: Sales Invoice Timesheet,Billing Hours,Abgerechnete Stunden
 DocType: Project,Total Sales Amount (via Sales Order),Gesamtverkaufsbetrag (über Kundenauftrag)
@@ -5481,6 +5523,7 @@
 DocType: Soil Texture,Sandy Clay,Sandiger Lehm
 DocType: Grant Application,Assessment  Manager,Bewertungsmanager
 DocType: Payment Entry,Allocate Payment Amount,Zahlungsbetrag zuweisen
+DocType: Subscription Plan,Subscription Plan,Abonnement
 DocType: Employee External Work History,Salary,Gehalt
 DocType: Serial No,Delivery Document Type,Lieferdokumententyp
 DocType: Sales Order,Partly Delivered,Teilweise geliefert
@@ -5506,9 +5549,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Alter Bereich 2
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voreinstellungen installieren
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Kein Lieferschein für den Kunden {} ausgewählt
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Kein Lieferschein für den Kunden {} ausgewählt
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Stückliste ersetzt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Wählen Sie die Positionen nach dem Lieferdatum aus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Wählen Sie die Positionen nach dem Lieferdatum aus
 DocType: Grant Application,Has any past Grant Record,Hat einen früheren Grant Record
 ,Sales Analytics,Vertriebsanalyse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Verfügbar {0}
@@ -5526,7 +5569,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien
 DocType: Selling Settings,Settings for Selling Module,Einstellungen Verkauf
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelzimmer Reservierung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kundenservice
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kundenservice
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Bewerber/-in einen Arbeitsplatz anbieten
@@ -5542,7 +5585,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studenten wurden angemeldet
 DocType: Fees,Student Details,Studenten Details
 DocType: Purchase Invoice Item,Stock Qty,Lagermenge
-DocType: Employee Loan,Repayment Period in Months,Rückzahlungsfrist in Monaten
+DocType: Loan,Repayment Period in Months,Rückzahlungsfrist in Monaten
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fehler: Keine gültige ID?
 DocType: Naming Series,Update Series Number,Nummernkreis-Wert aktualisieren
 DocType: Account,Equity,Eigenkapital
@@ -5551,7 +5594,7 @@
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
 DocType: Timesheet,Work Detail,Arbeit Detail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingenieur
 DocType: Journal Entry,Total Amount Currency,Insgesamt Betrag Währung
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Unterbaugruppen suchen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
@@ -5596,13 +5639,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informationen zum Spendertyp
 DocType: Request for Quotation,Supplier Detail,Lieferant Details
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fehler in Formel oder Bedingung: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Rechnungsbetrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Rechnungsbetrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteriengewichte müssen zusammen 100% ergeben.
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Anwesenheit
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Lagerartikel
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Erstellen von {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Quelle und Ziel-Warehouse kann nicht gleich sein
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Steuervorlage für Einkaufstransaktionen
@@ -5626,14 +5668,14 @@
 DocType: Shipping Rule,Fixed,Fest
 DocType: Vehicle Service,Clutch Plate,Kupplungsscheibe
 DocType: Company,Round Off Account,Abschlusskonto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Verwaltungskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Verwaltungskosten
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
-DocType: Journal Entry,Subscription,Abonnement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Gebührenermittlung ausstehend
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Mitteilungsfrist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Mitteilungsfrist
 DocType: Asset Category,Asset Category Name,Anlagekategorie Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dies ist ein Root-Gebiet und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Neuer Verkaufspersonenname
@@ -5646,7 +5688,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Nicht anhaken, wenn Sie keine Stapelverarbeitung beim Anlegen von Kurs basierten Gruppen wünschen."
 DocType: Asset,Frequency of Depreciation (Months),Die Häufigkeit der Abschreibungen (Monate)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Guthabenkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Nullwerte anzeigen
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial
@@ -5654,7 +5696,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
 DocType: Hub Settings,Company Logo,Firmenlogo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 DocType: Healthcare Settings,Patient Registration,Patientenregistrierung
@@ -5688,11 +5730,10 @@
 DocType: Journal Entry,Total Debit,Gesamt-Soll
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard-Fertigwarenlager
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Bitte wählen Sie Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vertriebsmitarbeiter
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vertriebsmitarbeiter
 DocType: Hotel Room Package,Amenities,Ausstattung
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget und Kostenstellen
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mehrere Standard-Zahlungsarten sind nicht erlaubt
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,für die
 ,Appointment Analytics,Terminanalytik
 DocType: Vehicle Service,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
@@ -5708,6 +5749,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lassen Sie dies leer, wenn Sie Studentengruppen pro Jahr anlegen."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Urlaubstage und dies reduziert den Wert des Gehalts pro Tag."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apps, die den aktuellen Schlüssel verwenden, können nicht darauf zugreifen, sind Sie sicher?"
+DocType: Subscription Settings,Prorate,Prorieren
 DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Vorlagencode ändern
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Der Begriff Enddatum kann nicht früher als der Begriff Startdatum. Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
@@ -5718,8 +5760,9 @@
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 DocType: Cheque Print Template,Signatory Position,Unterzeichner Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,"Als ""verloren"" markieren"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,"Als ""verloren"" markieren"
 DocType: Timesheet,Total Billable Hours,Insgesamt abrechenbare Stunden
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Anzahl der Tage, an denen der Abonnent die von diesem Abonnement generierten Rechnungen bezahlen muss"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Zahlungsnachweis
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Kunden. Siehe Zeitleiste unten für Details
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Zeile {0}: Zugewiesener Betrag {1} muss kleiner oder gleich der Zahlungsmenge {2} sein
@@ -5738,12 +5781,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Company,Company Info,Informationen über das Unternehmen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Wählen oder neue Kunden hinzufügen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,"Eine Kostenstelle ist erforderlich, um einen Aufwandsanspruch zu buchen."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,"Eine Kostenstelle ist erforderlich, um einen Aufwandsanspruch zu buchen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dies hängt von der Anwesenheit dieses Mitarbeiters ab
 DocType: Assessment Result,Summary,Zusammenfassung
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Markieren Sie die Anwesenheit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Sollkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Sollkonto
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurantbestellzugangsposten
@@ -5755,7 +5798,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Gesamtbetrag des Einkaufs
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,End-Jahr kann nicht gleich oder kleiner dem Start-Jahr sein.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Vergünstigungen an Mitarbeiter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Vergünstigungen an Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Work Order,Manufactured Qty,Produzierte Menge
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Die Freigaben existieren nicht mit der {0}
@@ -5763,12 +5806,12 @@
 DocType: Asset,Out of Order,Außer Betrieb
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 DocType: Projects Settings,Ignore Workstation Time Overlap,Arbeitszeitüberlappung ignorieren
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Wählen Sie Chargennummern aus
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rechnungen an Kunden
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
 DocType: Patient Service Unit,Medical Administrator,Medizinischer Administrator
 DocType: Assessment Plan,Schedule,Zeitplan
 DocType: Account,Parent Account,Übergeordnetes Konto
@@ -5798,15 +5841,16 @@
 DocType: Asset Repair,Repair Status,Reparaturstatus
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
 DocType: POS Profile,Account for Change Amount,Konto für Änderungsbetrag
 DocType: Purchase Invoice,input service,Eingabeservice
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
 DocType: Maintenance Team Member,Maintenance Team Member,Wartungsteammitglied
 DocType: Agriculture Analysis Criteria,Soil Analysis,Bodenanalyse
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kurscode:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Bitte das Aufwandskonto angeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
@@ -5854,19 +5898,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Zulassung für {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variablennamen
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
 DocType: Asset,Asset Category,Anlagekategorie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolohn kann nicht negativ sein
 DocType: Purchase Order,Advance Paid,Angezahlt
 DocType: Item,Item Tax,Artikelsteuer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material an den Lieferanten
 DocType: Soil Texture,Loamy Sand,Lehmiger Sand
 DocType: Production Plan,Material Request Planning,Materialanforderungsplanung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Verbrauch Rechnung
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} erscheint% mehr als einmal
 DocType: Expense Claim,Employees Email Id,E-Mail-ID des Mitarbeiters
 DocType: Employee Attendance Tool,Marked Attendance,Marked Teilnahme
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Laufende Verbindlichkeiten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Laufende Verbindlichkeiten
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer hat die angegebenen Stunden überschritten.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
 DocType: Patient,A Positive,A +
@@ -5877,9 +5921,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset-Wartungsteam
-DocType: Employee Loan,Loan Type,Art des Darlehens
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} wurde erfolgreich gesendet
+DocType: Loan,Loan Type,Art des Darlehens
 DocType: Scheduling Tool,Scheduling Tool,Scheduling-Werkzeug
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditkarte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditkarte
 DocType: BOM,Item to be manufactured or repacked,Zu fertigender oder umzupackender Artikel
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 DocType: Sales Invoice Item,Drop Ship,Streckengeschäft
@@ -5911,7 +5956,7 @@
 DocType: Item,Units of Measure,Maßeinheiten
 DocType: Manufacturing Settings,Allow Production on Holidays,Fertigung im Urlaub zulassen
 DocType: Sales Invoice,Customer's Purchase Order Date,Kundenauftragsdatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Grundkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Grundkapital
 DocType: Shopping Cart Settings,Show Public Attachments,Öffentliche Anhänge anzeigen
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
 DocType: Restaurant Reservation,Reservation Time,Reservierungszeit
@@ -5926,7 +5971,7 @@
 DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Zeilennr. {0}: Erforderlich nach Datum darf nicht vor dem Transaktionsdatum liegen
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Ausgewählte Artikel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Konstrukteur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
@@ -5936,20 +5981,20 @@
 DocType: Driver,Expiry Date,Verfallsdatum
 DocType: Healthcare Settings,Employee name and designation in print,Name und Bezeichnung des Mitarbeiters im Druck
 ,accounts-browser,Konten-Browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Bitte zuerst Kategorie auswählen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt-Stammdaten
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Um eine Überberechnung oder eine Überbestellung zu ermöglichen, muss die Einstellung in den Lagereinstellungen oder im Artikel angepasst werden."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Halbtags)
 DocType: Payment Term,Credit Days,Zahlungsziel
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Bitte wählen Sie Patient, um Labortests zu erhalten"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Machen Schüler Batch
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lieferzeittage
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ist Einkommensteueraufwand
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Datum der Veröffentlichung muss als Kaufdatum gleich sein {1} des Asset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Datum der Veröffentlichung muss als Kaufdatum gleich sein {1} des Asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Überprüfen Sie dies, wenn der Student im Gasthaus des Instituts wohnt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
 ,Stock Summary,Lager-Zusammenfassung
@@ -5960,10 +6005,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref-Datum
 DocType: Employee,Reason for Leaving,Grund für den Austritt
 DocType: BOM Operation,Operating Cost(Company Currency),Betriebskosten (Gesellschaft Währung)
-DocType: Employee Loan Application,Rate of Interest,Zinssatz
+DocType: Loan Application,Rate of Interest,Zinssatz
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: Item,Shelf Life In Days,Haltbarkeit in Tagen
 DocType: GL Entry,Is Opening,Ist Eröffnungsbuchung
+DocType: Department,Expense Approvers,Ausgabengenehmiger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
 DocType: Journal Entry,Subscription Section,Abonnementbereich
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} existiert nicht
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index f9a5bed..ef9c5cf 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ακύρωση επίσκεψης {0} πριν από την ακύρωση αυτής της αίτησης εγγύησης
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Εκθέσεις αξιολόγησης
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
-DocType: Purchase Receipt,Subscription Detail,Λεπτομέρειες συνδρομής
 DocType: Supplier Scorecard,Notify Supplier,Ειδοποιήστε τον προμηθευτή
 DocType: Item,Customer Items,Είδη πελάτη
 DocType: Project,Costing and Billing,Κοστολόγηση και Τιμολόγηση
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν μπορεί να είναι καθολικός
 DocType: Item,Publish Item to hub.erpnext.com,Δημοσίευση είδους στο hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Ειδοποιήσεις μέσω email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Αξιολόγηση
 DocType: Item,Default Unit of Measure,Προεπιλεγμένη μονάδα μέτρησης
 DocType: SMS Center,All Sales Partner Contact,Όλες οι επαφές συνεργάτη πωλήσεων
-DocType: Employee,Leave Approvers,Υπεύθυνοι έγκρισης άδειας
+DocType: Department,Leave Approvers,Υπεύθυνοι έγκρισης άδειας
 DocType: Sales Partner,Dealer,ˆΈμπορος
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Διερευνήσεις
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Ελέγξτε διαθεσιμότητα
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Αυτό βασίζεται σε πράξεις εναντίον αυτής της επιχείρησης. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Νομικός
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Πραγματική φορολογική του τύπου δεν μπορεί να περιλαμβάνεται στην τιμή Θέση στη γραμμή {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Νομικός
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Πραγματική φορολογική του τύπου δεν μπορεί να περιλαμβάνεται στην τιμή Θέση στη γραμμή {0}
 DocType: Bank Guarantee,Customer,Πελάτης
 DocType: Purchase Receipt Item,Required By,Απαιτείται από
 DocType: Delivery Note,Return Against Delivery Note,Επιστροφή Ενάντια Δελτίο Αποστολής
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Κύριες εγγραφές (ή ομάδες) κατά τις οποίες δημιουργούνται λογιστικές εγγραφές διατηρούνται υπόλοιπα.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Δεν υπάρχουν υποβληθέντα δελτία μισθοδοσίας για επεξεργασία.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Δεν υπάρχουν υποβληθέντα δελτία μισθοδοσίας για επεξεργασία.
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Εμφάνιση ανοιχτή
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Είναι απαραίτητο να αναλάβουμε αυτήν την ενέργεια σήμερα για την προαναφερθείσα επανάληψη
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Αποχώρηση
 DocType: Pricing Rule,Apply On,Εφάρμοσε σε
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Όλες οι επαφές προμηθευτή
 DocType: Support Settings,Support Settings,Ρυθμίσεις υποστήριξη
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Παρτίδα Θέση λήξης Κατάσταση
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Τραπεζική επιταγή
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Τραπεζική επιταγή
 DocType: Membership,membership validaty section,ένταξη έγκυρη ενότητα
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 DocType: Consultation,Consultation,Διαβούλευση
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Υλικό
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Δημιουργία ιστότοπου
 DocType: Opening Invoice Creation Tool Item,Quantity,Ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Δάνεια (παθητικό )
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
 DocType: Item,Country of Origin,Χώρα προέλευσης
 DocType: Soil Texture,Soil Texture Criteria,Κριτήρια υφής εδάφους
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Κύρια στοιχεία επικοινωνίας
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Ανοιχτά Θέματα
 DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
 DocType: Lab Test Groups,Add new line,Προσθέστε νέα γραμμή
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
@@ -89,7 +85,7 @@
 ,Delay Days,Ημέρες καθυστέρησης
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Τιμολόγιο
+DocType: Subscription Invoice,Invoice,Τιμολόγιο
 DocType: Purchase Invoice Item,Item Weight Details,Λεπτομέρειες βάρους στοιχείου
 DocType: Asset Maintenance Log,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Γραμμή # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Γραμμή # {0}:
 DocType: Timesheet,Total Costing Amount,Σύνολο Κοστολόγηση Ποσό
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Εργασία σε εξέλιξη
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Παρακαλώ επιλέξτε ημερομηνία
 DocType: Daily Work Summary Group,Holiday List,Λίστα αργιών
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Λογιστής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Λογιστής
 DocType: Hub Settings,Selling Price List,Τιμοκατάλογος πώλησης
 DocType: Patient,Tobacco Current Use,Καπνός τρέχουσα χρήση
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Πωλήσεις
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Πωλήσεις
 DocType: Cost Center,Stock User,Χρηματιστήριο χρήστη
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / Κ
 DocType: Company,Phone No,Αρ. Τηλεφώνου
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Νέο {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Αρχική ειδοποίηση ηλεκτρονικού ταχυδρομείου που αποστέλλεται
 ,Sales Partners Commission,Προμήθεια συνεργάτη πωλήσεων
 DocType: Soil Texture,Sandy Clay Loam,Άμμος Πηλός Πηλού
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Αξία μετά την απόσβεση
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Συγγενεύων
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,ημερομηνία συμμετοχή δεν μπορεί να είναι μικρότερη από την ημερομηνία που ενώνει εργαζομένου
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,ημερομηνία συμμετοχή δεν μπορεί να είναι μικρότερη από την ημερομηνία που ενώνει εργαζομένου
 DocType: Grading Scale,Grading Scale Name,Κλίμακα βαθμολόγησης Όνομα
-DocType: Subscription,Repeat on Day,Επαναλάβετε την Ημέρα
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Αυτό είναι ένας κύριος λογαριασμός και δεν μπορεί να επεξεργαστεί.
 DocType: Sales Invoice,Company Address,Διεύθυνση εταιρείας
 DocType: BOM,Operations,Λειτουργίες
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Δεν είναι δυνατός ο ορισμός της άδειας με βάση την έκπτωση για {0}
+DocType: Subscription,Subscription Start Date,Ημερομηνία Έναρξης Συνδρομής
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Επισυνάψτε αρχείο .csv με δύο στήλες, μία για το παλιό όνομα και μία για το νέο όνομα"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} δεν είναι σε καμία ενεργή χρήση.
 DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Αναφορά: {0}, Κωδικός είδους: {1} και Πελάτης: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Η ημερομηνία λήξης της δοκιμαστικής περιόδου δεν μπορεί να είναι πριν την ημερομηνία έναρξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Άνοιγμα θέσης εργασίας.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Το BOM δεν έχει οριστεί για την υπεργολαβία του στοιχείου {0} στη σειρά {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Patient,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Δεν επιτρέπεται η {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Πάρτε τα στοιχεία από
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Πάρτε τα στοιχεία από
 DocType: Price List,Price Not UOM Dependant,Τιμή Δεν εξαρτάται από UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
 ,Completed Work Orders,Ολοκληρωμένες Εντολές Εργασίας
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Υποχρεωτικό ποσό
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Υποχρεωτικό ποσό
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: BOM,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Γραμμή # {0}: Ο τύπος εγγράφου αναφοράς πρέπει να είναι ένας από τους λογαριασμούς διεκδίκησης εξόδων ή καταχώρησης ημερολογίου
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Επιλέξτε BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Γραμμή # {0}: Ο τύπος εγγράφου αναφοράς πρέπει να είναι ένας από τους λογαριασμούς διεκδίκησης εξόδων ή καταχώρησης ημερολογίου
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Επιλέξτε BOM
 DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Κόστος των προϊόντων που έχουν παραδοθεί
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Διαχειριστείτε το ποσό προκαταβολής που δίνεται στον Υπάλληλο
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Ειδοποίηση παράδοσης
 DocType: Journal Entry,Opening Entry,Αρχική καταχώρηση
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Ο λογαριασμός πληρώνουν μόνο
-DocType: Employee Loan,Repay Over Number of Periods,Εξοφλήσει Πάνω αριθμός των περιόδων
+DocType: Loan,Repay Over Number of Periods,Εξοφλήσει Πάνω αριθμός των περιόδων
 DocType: Stock Entry,Additional Costs,Πρόσθετα έξοδα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Lead,Product Enquiry,Ερώτηση για προϊόν
 DocType: Education Settings,Validate Batch for Students in Student Group,Επικύρωση παρτίδας για σπουδαστές σε ομάδα σπουδαστών
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Δεν ρεκόρ άδεια βρέθηκαν για εργαζόμενο {0} για {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Δεν ρεκόρ άδεια βρέθηκαν για εργαζόμενο {0} για {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Επιλέξτε την εταιρεία πρώτα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Επιλέξτε την εταιρεία πρώτα
 DocType: Employee Education,Under Graduate,Τελειόφοιτος
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Ορίστε το προεπιλεγμένο πρότυπο για την Ενημέρωση κατάστασης αδείας στις Ρυθμίσεις HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Στόχος στις
 DocType: BOM,Total Cost,Συνολικό κόστος
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Υπάλληλος Δανείου
 DocType: Fee Schedule,Send Payment Request Email,Αποστολή ηλεκτρονικού ταχυδρομείου αίτησης πληρωμής
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Ακίνητα
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Ανέβηκε με επιτυχία.
 DocType: Assessment Result,Grade,Βαθμός
 DocType: Restaurant Table,No of Seats,Αριθμός καθισμάτων
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Για να προσθέσετε δυναμικό θέμα, χρησιμοποιήστε τις ετικέτες jinja όπως <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: Asset Maintenance Task,Asset Maintenance Task,Εργασία συντήρησης ενεργητικού
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Ετήσιος Μισθός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Ετήσιος Μισθός
 DocType: Daily Work Summary,Daily Work Summary,Καθημερινή Σύνοψη εργασίας
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Έξοδα αποθέματος
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Έξοδα αποθέματος
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Επιλέξτε Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Παρακαλούμε, εισάγετε Ώρες Επικοινωνίας Email"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Παρακαλούμε, εισάγετε Ώρες Επικοινωνίας Email"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρωσης
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,κύρια ΔΙΕΥΘΥΝΣΗ
 DocType: Production Plan,Material Request Detail,Λεπτομέρειες αιτήματος υλικού
 DocType: Selling Settings,Default Quotation Validity Days,Προεπιλεγμένες ημέρες ισχύος της προσφοράς
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: Sales Invoice,Change Amount,αλλαγή Ποσό
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Κατηγορίες Άδειας οδήγησης
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Εισαγάγετε την ημερομηνία παράδοσης
 DocType: Depreciation Schedule,Make Depreciation Entry,Κάντε Αποσβέσεις Έναρξη
+DocType: HR Settings,Leave Settings,Αφήστε τις ρυθμίσεις
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Τύπος αίτησης
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Κάντε Υπάλληλος
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Εκπομπή
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Λειτουργία ρύθμισης POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Απενεργοποιεί τη δημιουργία αρχείων καταγραφής χρόνου κατά των παραγγελιών εργασίας. Οι πράξεις δεν πρέπει να παρακολουθούνται ενάντια στην εντολή εργασίας
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Εκτέλεση
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Εκτέλεση
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
 DocType: Asset Maintenance Log,Maintenance Status,Κατάσταση συντήρησης
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Στοιχεία μέλους
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Προμηθευτής υποχρεούται έναντι πληρωμή του λογαριασμού {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Προϊόντα και Τιμολόγηση
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Σύνολο ωρών: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Το πεδίο από ημερομηνία πρέπει να είναι εντός της χρήσης. Υποθέτοντας από ημερομηνία = {0}
 DocType: Drug Prescription,Interval,Διάστημα
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Προτίμηση
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Προτίμηση
 DocType: Grant Application,Individual,Άτομο
 DocType: Academic Term,Academics User,ακαδημαϊκοί χρήστη
 DocType: Cheque Print Template,Amount In Figure,Ποσό Στο Σχήμα
-DocType: Employee Loan Application,Loan Info,Πληροφορίες δανείων
+DocType: Loan Application,Loan Info,Πληροφορίες δανείων
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Σχέδιο για επισκέψεις συντήρησης.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Περίοδος Scorecard Προμηθευτή
 DocType: Share Transfer,Share Transfer,Μεταφορά μετοχών
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Πρότυπο στοιχείου
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Βιοχημεία
 DocType: Job Offer,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,από Αξία
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,από Αξία
 DocType: Woocommerce Settings,Woocommerce Settings,Ρυθμίσεις Woocommerce
 DocType: Production Plan,Sales Orders,Παραγγελίες πωλήσεων
 DocType: Purchase Taxes and Charges,Valuation,Αποτίμηση
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Προεπιλεγμένη περιοχή
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Τηλεόραση
 DocType: Work Order Operation,Updated via 'Time Log',Ενημέρωση μέσω 'αρχείου καταγραφής χρονολογίου'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Επιλέξτε τον πελάτη ή τον προμηθευτή.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
 DocType: Company,Enable Perpetual Inventory,Ενεργοποίηση διαρκούς απογραφής
+DocType: Bank Guarantee,Charges Incurred,Οι χρεώσεις προέκυψαν
 DocType: Company,Default Payroll Payable Account,Προεπιλογή Μισθοδοσίας με πληρωμή Λογαριασμού
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Ενημέρωση Email Ομάδα
 DocType: Sales Invoice,Is Opening Entry,Είναι αρχική καταχώρηση
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Προσαρμοσμένο αποτέλεσμα
 DocType: Delivery Stop,Contact Name,Όνομα επαφής
 DocType: Course Assessment Criteria,Course Assessment Criteria,Κριτήρια Αξιολόγησης Μαθήματος
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Τον αριθμό φορολογικού μητρώου:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Τον αριθμό φορολογικού μητρώου:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Αναγνωριστικό φοιτητή:
 DocType: POS Customer Group,POS Customer Group,POS Ομάδα Πελατών
 DocType: Land Unit,Land Unit describing various land assets,Μονάδα γης που περιγράφει διάφορα περιουσιακά στοιχεία γης
@@ -374,9 +371,8 @@
 ,Open Work Orders,Άνοιγμα παραγγελιών εργασίας
 DocType: Payment Term,Credit Months,Πιστωτικοί Μήνες
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Καθαρές αποδοχές δεν μπορεί να είναι μικρότερη από 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Για να σταματήσετε να στέλνετε ειδοποιήσεις επαναλαμβανόμενων σφαλμάτων από το σύστημα, έχουμε επιλέξει το πεδίο Απενεργοποιημένο στη συνδρομή"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Αφήνει ανά έτος
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Αφήνει ανά έτος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
 DocType: Email Digest,Profit & Loss,Απώλειες κερδών
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Ρυθμίστε τους φοιτητές κάτω από ομάδες φοιτητών
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Τράπεζα Καταχωρήσεις
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Τράπεζα Καταχωρήσεις
 DocType: Crop,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Μάθημα Ομάδα μαθητή Εργαλείο Δημιουργίας
 DocType: Lead,Do Not Contact,Μην επικοινωνείτε
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Οι άνθρωποι που διδάσκουν σε οργανισμό σας
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Προγραμματιστής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Προγραμματιστής
 DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Course Scheduling Tool,Course Start Date,Φυσικά Ημερομηνία Έναρξης
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Μέγιστη βαθμολογία
 DocType: Email Digest,New Quotations,Νέες προσφορές
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails εκκαθαριστικό σημείωμα αποδοχών σε εργαζόμενο με βάση την προτιμώμενη email επιλέγονται Εργαζομένων
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 DocType: Tax Rule,Shipping County,County ναυτιλία
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Μαθαίνω
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Μαθαίνω
 DocType: Asset,Next Depreciation Date,Επόμενο Ημερομηνία Αποσβέσεις
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Εξαιρετική επιταγές και καταθέσεις για να καθαρίσετε
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το Hub
 DocType: Driver,Fleet Manager,στόλου Διευθυντής
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} δεν μπορεί να είναι αρνητικό για το στοιχείο {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} δεν μπορεί να είναι αρνητικό για το στοιχείο {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Λάθος Κωδικός
 DocType: Item,Variant Of,Παραλλαγή του
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Παρακαλείστε να ορίσετε την τιμή δωματίου στην {}
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Opening Invoice Creation Tool,Invoice Type,Τύπος τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Δελτίο αποστολής
 DocType: Consultation,Encounter Impression,Αντιμετώπιση εντυπώσεων
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Κόστος πωληθέντων περιουσιακών στοιχείων
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Course Scheduling Tool,Course Scheduling Tool,Φυσικά εργαλείο προγραμματισμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Σφάλμα κατά τη δημιουργία επαναλαμβανόμενων% s για% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
 DocType: Land Unit,LInked Analysis,Αναλυτική ανάλυση
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Η περίοδος υποβολής αιτήσεων δεν μπορεί να εκτείνεται σε δύο εγγραφές κατανομής
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Η περίοδος υποβολής αιτήσεων δεν μπορεί να εκτείνεται σε δύο εγγραφές κατανομής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
@@ -519,8 +513,8 @@
 DocType: Purchase Order,% Received,% Παραλήφθηκε
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Δημιουργία Ομάδων Φοιτητών
 DocType: Volunteer,Weekends,Σαββατοκύριακα
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Ποσό πιστωτικής σημείωσης
-DocType: Setup Progress Action,Action Document,Έγγραφο δράσης
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Ποσό πιστωτικής σημείωσης
+DocType: Setup Progress Action,Action Document,Έγγραφο Ενέργειας
 DocType: Chapter Member,Website URL,Url ιστοτόπου
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Προσθήκη Ειδών
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Παράμετρος ελέγχου ποιότητας είδους
+DocType: Leave Application,Leave Approver Name,Όνομα υπευθύνου έγκρισης άδειας
 DocType: Depreciation Schedule,Schedule Date,Ημερομηνία χρονοδιαγράμματος
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Κέρδη, Μειώσεις και άλλα συστατικά Μισθός"
 DocType: Packed Item,Packed Item,Συσκευασμένο είδος
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
 DocType: Healthcare Settings,Require Lab Test Approval,Απαιτείται έγκριση δοκιμής εργαστηρίου
 DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Σύνολο εξαιρετικών
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Σύνολο εξαιρετικών
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
 DocType: Dosage Strength,Strength,Δύναμη
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
 DocType: Student Log,Medical,Ιατρικός
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Αιτιολογία απώλειας
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Αιτιολογία απώλειας
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Ενημέρωση αριθμού λογαριασμού
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Ο μόλυβδος Ιδιοκτήτης δεν μπορεί να είναι ίδιο με το μόλυβδο
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Μονό
 DocType: Salary Slip,Total Loan Repayment,Σύνολο Αποπληρωμή δανείων
 DocType: Account,Cost of Goods Sold,Κόστος πωληθέντων
-DocType: Subscription,Yearly,Ετήσια
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
 DocType: Drug Prescription,Dosage,Δοσολογία
 DocType: Journal Entry Account,Sales Order,Παραγγελία πώλησης
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Μέση τιμή πώλησης
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Μέση τιμή πώλησης
 DocType: Assessment Plan,Examiner Name,Όνομα εξεταστής
 DocType: Lab Test Template,No Result,Κανένα αποτέλεσμα
 DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
 DocType: Purchase Invoice,Supplier Name,Όνομα προμηθευτή
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Διαβάστε το Εγχειρίδιο ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Εμφάνιση φύλλων όλων των μελών του Τμήματος στο Ημερολόγιο
 DocType: Purchase Invoice,01-Sales Return,01-επιστροφή πωλήσεων
 DocType: Account,Is Group,Είναι η ομάδα
 DocType: Email Digest,Pending Purchase Orders,Εν αναμονή Εντολές Αγοράς
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Υποχρεωτικό πεδίο - ακαδημαϊκό έτος
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} δεν συσχετίζεται με {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Προσαρμόστε το εισαγωγικό κείμενο που αποστέλλεται ως μέρος του εν λόγω email. Κάθε συναλλαγή έχει ένα ξεχωριστό εισαγωγικό κείμενο.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Ορίστε προεπιλεγμένο πληρωτέο λογαριασμό για την εταιρεία {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Ορίστε προεπιλεγμένο πληρωτέο λογαριασμό για την εταιρεία {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Η συναλλαγή δεν επιτρέπεται σε περίπτωση διακοπής της παραγγελίας εργασίας {0}
 DocType: Setup Progress Action,Min Doc Count,Ελάχιστη μέτρηση εγγράφων
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Προορίζεται για την πώληση
 DocType: Packing Slip,From Package No.,Από αρ. συσκευασίας
 DocType: Item Attribute,To Range,Να Σειρά
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Δεν είναι δυνατή η αλλαγή της μεθόδου αποτίμησης, καθώς υπάρχουν συναλλαγές έναντι ορισμένων στοιχείων που δεν έχουν τη δική της μέθοδο αποτίμησης"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Κινητές αξίες και καταθέσεις
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Δεν είναι δυνατή η αλλαγή της μεθόδου αποτίμησης, καθώς υπάρχουν συναλλαγές έναντι ορισμένων στοιχείων που δεν έχουν τη δική της μέθοδο αποτίμησης"
 DocType: Student Report Generation Tool,Attended by Parents,Παρακολούθησαν οι Γονείς
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Patient,AB Positive,AB θετικό
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Καταχωρήσεις προσέλευσης.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Συστατικό μισθός για το φύλλο κατανομής χρόνου με βάση μισθοδοσίας.
 DocType: Sales Order Item,Used for Production Plan,Χρησιμοποιείται για το σχέδιο παραγωγής
-DocType: Employee Loan,Total Payment,Σύνολο πληρωμών
+DocType: Loan,Total Payment,Σύνολο πληρωμών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Δεν είναι δυνατή η ακύρωση της συναλλαγής για την Ολοκληρωμένη Παραγγελία Εργασίας.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου μεταξύ των λειτουργιών (σε λεπτά)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"Η {0} {1} ακυρώνεται, επομένως η ενέργεια δεν μπορεί να ολοκληρωθεί"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Αρκετά τμήματα για να χτίσει
 DocType: POS Profile User,POS Profile User,Χρήστης προφίλ POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Άμεσα έσοδα
+DocType: Subscription Invoice,Subscription Invoice,Τιμολόγιο συνδρομής
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Άμεσα έσοδα
 DocType: Patient Appointment,Date TIme,Ημερομηνία ώρα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Διοικητικός λειτουργός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Διοικητικός λειτουργός
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Δημιουργία εταιρείας και φόροι
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Επιλέξτε Course
 DocType: Codification Table,Codification Table,Πίνακας κωδικοποίησης
 DocType: Timesheet Detail,Hrs,ώρες
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Επιλέξτε Εταιρεία
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Επιλέξτε Εταιρεία
 DocType: Stock Entry Detail,Difference Account,Λογαριασμός διαφορών
 DocType: Purchase Invoice,Supplier GSTIN,Προμηθευτής GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Πρότυπο χαρτογράφησης ταμειακών ροών
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
+DocType: Bank Guarantee,Providing,Χορήγηση
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Δεν επιτρέπεται, ρυθμίστε το Πρότυπο δοκιμής Lab όπως απαιτείται"
 DocType: Patient,Risk Factors,Παράγοντες κινδύνου
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
 DocType: Healthcare Settings,Appointment Confirmation,Επιβεβαίωση συνάντησης
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Κλείσιμο (cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Χαίρετε
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Μετακίνηση στοιχείου
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Έχει ήδη οριστεί προεπιλεγμένο προφίλ {0} για το χρήστη {1}, είναι ευγενικά απενεργοποιημένο"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,συσσωρευμένες Αξίες
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Το έδαφος απαιτείται στο POS Profile
 DocType: Supplier,Prevent RFQs,Αποτρέψτε τις RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Δημιούργησε παραγγελία πώλησης
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Το δελτίο αποδοχών που υποβλήθηκε για περίοδο από {0} έως {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Το δελτίο αποδοχών που υποβλήθηκε για περίοδο από {0} έως {1}
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID Σύστασης
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Ημερομηνία αποστολής λογαριασμού
 DocType: Production Plan,Production Plan,Σχέδιο παραγωγής
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Άνοιγμα εργαλείου δημιουργίας τιμολογίου
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Επιστροφή πωλήσεων
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Σημείωση: Σύνολο των κατανεμημένων φύλλα {0} δεν πρέπει να είναι μικρότερη από τα φύλλα που έχουν ήδη εγκριθεί {1} για την περίοδο
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Ορισμός ποσότητας στις συναλλαγές με βάση την αύξουσα σειρά εισόδου
 ,Total Stock Summary,Συνολική σύνοψη μετοχών
 DocType: Announcement,Posted By,Αναρτήθηκε από
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ρυθμίστε την εταιρεία
 DocType: Share Balance,Share Balance,Ισοζύγιο μετοχών
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Training Result Employee,Training Result Employee,Εκπαίδευση Εργαζομένων Αποτέλεσμα
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
-DocType: Repayment Schedule,Principal Amount,Κύριο ποσό
-DocType: Employee Loan Application,Total Payable Interest,Σύνολο πληρωτέοι τόκοι
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Κύριο ποσό
+DocType: Loan Application,Total Payable Interest,Σύνολο πληρωτέοι τόκοι
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Σύνολο ανεκτέλεστα: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Πωλήσεις Τιμολόγιο Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
 DocType: Restaurant Reservation,Restaurant Reservation,Εστιατόριο Κράτηση
 DocType: Land Unit,Land Unit Name,Όνομα μονάδας γης
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Συγγραφή πρότασης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Συγγραφή πρότασης
 DocType: Payment Entry Deduction,Payment Entry Deduction,Έκπτωση Έναρξη Πληρωμής
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Τυλίγοντας
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Ειδοποιήστε τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Ειδοποιήστε τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ένα άλλο πρόσωπο Πωλήσεις {0} υπάρχει με την ίδια ταυτότητα υπαλλήλου
 DocType: Employee Advance,Claimed Amount,Απαιτούμενο ποσό
 apps/erpnext/erpnext/config/education.py +180,Masters,Κύριες εγγραφές
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Πληρωμή Gateway Ο λογαριασμός δεν δημιουργήθηκε, παρακαλούμε δημιουργήστε ένα χέρι."
 DocType: Supplier Scorecard,Per Year,Ανά έτος
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Δεν είναι επιλέξιμες για εισαγωγή σε αυτό το πρόγραμμα σύμφωνα με το DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Sales Invoice,Sales Taxes and Charges,Φόροι και επιβαρύνσεις πωλήσεων
 DocType: Employee,Organization Profile,Προφίλ οργανισμού
 DocType: Vital Signs,Height (In Meter),Ύψος (σε μετρητή)
 DocType: Student,Sibling Details,Αδέλφια Λεπτομέρειες
 DocType: Vehicle Service,Vehicle Service,Υπηρεσία οχημάτων
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Αυτόματα ενεργοποιεί το αίτημα ανατροφοδότηση με βάση τις συνθήκες.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Αυτόματα ενεργοποιεί το αίτημα ανατροφοδότηση με βάση τις συνθήκες.
 DocType: Employee,Reason for Resignation,Αιτία παραίτησης
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Πρότυπο για την αξιολόγηση της απόδοσης.
 DocType: Sales Invoice,Credit Note Issued,Πιστωτικό σημείωμα εκδοθέν
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Διαχείριση Δανείων των εργαζομένων
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Σχέση με Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Προϊστάμενος
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Προϊστάμενος
 DocType: Payment Entry,Payment From / To,Πληρωμή Από / Προς
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ορίστε τον λογαριασμό στην αποθήκη {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Μεταφορά υλικού
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Δεν ήταν δυνατή η εύρεση διαδρομής
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Άνοιγμα ( dr )
+DocType: Loan,Applicant,Αιτών
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Η χρονοσήμανση αποστολής πρέπει να είναι μεταγενέστερη της {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Για να κάνετε επαναλαμβανόμενα έγγραφα
 ,GST Itemised Purchase Register,Μητρώο αγορών στοιχείων GST
 DocType: Course Scheduling Tool,Reschedule,Επαναπρογραμματίζω
-DocType: Employee Loan,Total Interest Payable,Σύνολο Τόκοι πληρωτέοι
+DocType: Loan,Total Interest Payable,Σύνολο Τόκοι πληρωτέοι
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Φόροι και εβπιβαρύνσεις κόστους αποστολής εμπορευμάτων
 DocType: Work Order Operation,Actual Start Time,Πραγματική ώρα έναρξης
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Φινίρισμα
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Βάση
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Βάση
 DocType: Timesheet,Total Billed Hours,Σύνολο Τιμολογημένος Ώρες
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Διαγραφή ποσού
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Διαγραφή ποσού
 DocType: Leave Block List Allow,Allow User,Επίτρεψε χρήστη
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
 DocType: Company,Gain/Loss Account on Asset Disposal,Ο λογαριασμός Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
 DocType: Vehicle Log,Service Details,Λεπτομέρειες υπηρεσιών
-DocType: Subscription,Quarterly,Τριμηνιαίος
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Ομαδοποιημένο
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Πρόγραμμα
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush πρώτων υλών Βάσει των
 DocType: Sales Invoice,Port Code,Κωδικός λιμένα
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Αποθήκη αποθεμάτων
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Αποθήκη αποθεμάτων
 DocType: Lead,Lead is an Organization,Ο ηγέτης είναι ένας Οργανισμός
 DocType: Guardian Interest,Interest,Ενδιαφέρον
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Προπωλήσεις
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Λογαριασμοί
 DocType: Vehicle,Odometer Value (Last),Οδόμετρο Αξία (Τελευταία)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Πρότυπα κριτηρίων βαθμολογίας προμηθευτή.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 DocType: Request for Quotation,Get Suppliers,Αποκτήστε Προμηθευτές
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Μισθός Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Μισθός Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Μπορείτε να το ανανεώσετε μόνο αν λήξει η ιδιότητά σας εντός 30 ημερών
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Επιλέξτε μόνο εάν έχετε εγκαταστήσει έγγραφα χαρτογράφησης ροών ροής μετρητών
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Supplier Scorecard,Per Week,Ανά εβδομάδα
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Σύνολο φοιτητών
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Καταχώηρση πιστωτικής κάρτας
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Η εταιρεία και οι Λογαριασμοί
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,στην Αξία
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,στην Αξία
 DocType: Asset Settings,Depreciation Options,Επιλογές απόσβεσης
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Μη έγκυρος χρόνος απόσπασης
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Μη έγκυρος χρόνος απόσπασης
 DocType: Lead,Campaign Name,Όνομα εκστρατείας
 DocType: Hotel Room,Capacity,Χωρητικότητα
 DocType: Selling Settings,Close Opportunity After Days,Κλείστε Ευκαιρία μετά από μέρες
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη
 DocType: Budget,Budget Against,προϋπολογισμού κατά
 DocType: Employee,Cell Number,Αριθμός κινητού
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Δεν υπάρχει υπάλληλος για τα συγκεκριμένα κριτήρια. Βεβαιωθείτε ότι δεν έχουν ήδη δημιουργηθεί οι μισθοί.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Δεν υπάρχει υπάλληλος για τα συγκεκριμένα κριτήρια. Βεβαιωθείτε ότι δεν έχουν ήδη δημιουργηθεί οι μισθοί.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Επιλέξτε έναν πίνακα
 DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στους ""Παραλήπτες"""
 DocType: Special Test Items,Particulars,Λεπτομέρειες
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Πολλαπλές Κανόνες Τιμή υπάρχει με τα ίδια κριτήρια, παρακαλούμε επίλυση των συγκρούσεων με την ανάθεση προτεραιότητα. Κανόνες Τιμή: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Asset,Maintenance,Συντήρηση
+DocType: Subscriber,Subscriber,Συνδρομητής
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Ενημερώστε την κατάσταση του έργου σας
 DocType: Item,Maximum sample quantity that can be retained,Μέγιστη ποσότητα δείγματος που μπορεί να διατηρηθεί
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Προεπιλεγμένες ρυθμίσεις για το καλάθι αγορών
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Προσθέστε Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset διαλυθεί μέσω Εφημερίδα Έναρξη {0}
-DocType: Employee Loan,Interest Income Account,Ο λογαριασμός Έσοδα από Τόκους
+DocType: Loan,Interest Income Account,Ο λογαριασμός Έσοδα από Τόκους
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Αναθεώρηση πρόσκλησης αποστέλλεται
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Βιοτεχνολογία
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Δαπάνες συντήρησης γραφείου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Δαπάνες συντήρησης γραφείου
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Παω σε
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ρύθμιση λογαριασμού ηλεκτρονικού ταχυδρομείου
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Asset Repair,Downtime,Χρόνος αργίας
 DocType: Account,Liability,Υποχρέωση
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Ακαδημαϊκός όρος:
 DocType: Salary Detail,Do not include in total,Μην συμπεριλάβετε συνολικά
 DocType: Company,Default Cost of Goods Sold Account,Προεπιλογή Κόστος Πωληθέντων Λογαριασμού
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Η ποσότητα δείγματος {0} δεν μπορεί να είναι μεγαλύτερη από την ποσότητα που ελήφθη {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Request for Quotation Supplier,Send Email,Αποστολή email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 DocType: Item,Max Sample Quantity,Μέγιστη ποσότητα δείγματος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Δεν έχετε άδεια
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Δεν έχετε άδεια
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Quote Ζητήθηκε
 DocType: Vital Signs,Heart Rate / Pulse,Καρδιακός ρυθμός / παλμός
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Εργαστηριακές εξετάσεις και ζωτικά σημάδια
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Δεν βρέθηκε υπάλληλος
-DocType: Subscription,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Ενημέρωση έργου.
 DocType: SMS Center,All Customer Contact,Όλες οι επαφές πελάτη
 DocType: Land Unit,Tree Details,δέντρο Λεπτομέρειες
@@ -1126,7 +1121,7 @@
 DocType: Email Digest,Email Digest Settings,Ρυθμίσεις ενημερωτικών άρθρων μέσω email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +367,Thank you for your business!,Ευχαριστούμε για την επιχείρησή σας!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Ερωτήματα υποστήριξης από πελάτες.
-DocType: Setup Progress Action,Action Doctype,Δράση Doctype
+DocType: Setup Progress Action,Action Doctype,Ενέργεια Doctype
 DocType: HR Settings,Retirement Age,Ηλικία συνταξιοδότησης
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Plan,Select Items,Επιλέξτε είδη
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Όλες οι ομάδες ειδών
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Work Order,Item To Manufacture,Είδος προς κατασκευή
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Επαναφέρετε την επιλογή, εάν η επιλεγμένη διεύθυνση επεξεργαστεί μετά την αποθήκευση"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 DocType: Item,Hub Publishing Details,Στοιχεία δημοσίευσης Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',«Άνοιγμα»
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',«Άνοιγμα»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ανοικτή To Do
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
 DocType: Lab Test Template,Result Format,Μορφή αποτελεσμάτων
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,Διμηνιαίος
 DocType: Vehicle Service,Brake Pad,Τακάκια φρένων
 DocType: Fertilizer,Fertilizer Contents,Περιεχόμενο λιπασμάτων
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Έρευνα & ανάπτυξη
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Έρευνα & ανάπτυξη
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Ποσό χρέωσης
 DocType: Company,Registration Details,Στοιχεία εγγραφής
 DocType: Timesheet,Total Billed Amount,Τιμολογημένο ποσό
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Παράκαμψη ελέγχου πιστωτικού ορίου στην εντολή πώλησης
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Αξιολόγηση της απόδοσης.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ενεργοποίηση »Χρησιμοποιήστε για το καλάθι αγορών», όπως είναι ενεργοποιημένο το καλάθι αγορών και θα πρέπει να υπάρχει τουλάχιστον μία φορολογική Κανόνας για το καλάθι αγορών"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Έναρξη πληρωμής {0} συνδέεται κατά Παραγγελία {1}, ελέγξτε αν θα πρέπει να τραβηχτεί, όπως εκ των προτέρων σε αυτό το τιμολόγιο."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Έναρξη πληρωμής {0} συνδέεται κατά Παραγγελία {1}, ελέγξτε αν θα πρέπει να τραβηχτεί, όπως εκ των προτέρων σε αυτό το τιμολόγιο."
 DocType: Sales Invoice Item,Stock Details,Χρηματιστήριο Λεπτομέρειες
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Αξία έργου
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-Sale
@@ -1200,7 +1194,7 @@
 ,Available Qty,Διαθέσιμη ποσότητα
 DocType: Purchase Taxes and Charges,On Previous Row Total,Στο σύνολο της προηγούμενης γραμμής
 DocType: Purchase Invoice Item,Rejected Qty,απορρίφθηκε Ποσότητα
-DocType: Setup Progress Action,Action Field,Πεδίο δράσης
+DocType: Setup Progress Action,Action Field,Πεδίο Ενέργειας
 DocType: Healthcare Settings,Manage Customer,Διαχείριση του πελάτη
 DocType: Delivery Trip,Delivery Stops,Η παράδοση σταματά
 DocType: Salary Slip,Working Days,Εργάσιμες ημέρες
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Ελάχιστη χωρητικότητα
 DocType: Item Attribute,Item Attribute Values,Τιμές χαρακτηριστικού είδους
 DocType: Examination Result,Examination Result,Αποτέλεσμα εξέτασης
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},DocType αναφοράς πρέπει να είναι ένα από {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Work Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Δεν υπάρχουν διαθέσιμα στοιχεία για μεταφορά
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Δεν υπάρχουν διαθέσιμα στοιχεία για μεταφορά
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Κλείσιμο (Άνοιγμα + Σύνολο)
 DocType: Journal Entry,Depreciation Entry,αποσβέσεις Έναρξη
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
 DocType: Crop Cycle,ISO 8016 standard,Πρότυπο ISO 8016
 DocType: Pricing Rule,Rate or Discount,Τιμή ή Έκπτωση
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Απαιτούμενη ποσότητα
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Αγαπημένα
 DocType: Hub Settings,Custom Data,Προσαρμοσμένα δεδομένα
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Πρότυπο Ιατρικού Κώδικα
 DocType: Soil Texture,Clay Composition (%),Σύνθεση πηλού (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Αποθηκεύστε πριν από την εκχώρηση της εργασίας.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Αξία ισολογισμού
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Αξία ισολογισμού
 DocType: Lab Test,Lab Technician,Τεχνικός εργαστηρίου
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Τιμοκατάλογος πωλήσεων
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Τιμοκατάλογος πωλήσεων
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Εάν επιλεγεί, θα δημιουργηθεί ένας πελάτης, χαρτογραφημένος στον Ασθενή. Τα τιμολόγια ασθενών θα δημιουργηθούν έναντι αυτού του Πελάτη. Μπορείτε επίσης να επιλέξετε τον υπάρχοντα Πελάτη ενώ δημιουργείτε τον Ασθενή."
 DocType: Bank Reconciliation,Account Currency,Ο λογαριασμός Νόμισμα
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Λογαριασμό Εταιρεία
 DocType: Purchase Receipt,Range,Εύρος
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
 DocType: Item Barcode,Item Barcode,Barcode είδους
 DocType: Woocommerce Settings,Endpoints,Τελικά σημεία
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","να δημιουργηθεί. Εάν καθυστερήσετε, θα πρέπει να αλλάξετε με μη αυτόματο τρόπο το πεδίο &quot;Επαναλάβετε την ημέρα του μήνα&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
 DocType: Share Transfer,From Folio No,Από τον αριθμό Folio
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Ημερομηνία διαθέσιμη για χρήση
 DocType: Guardian,Guardian Name,Όνομα Guardian
 DocType: Cheque Print Template,Has Print Format,Έχει Εκτύπωση Format
-DocType: Employee Loan,Sanctioned,Καθιερωμένος
+DocType: Loan,Sanctioned,Καθιερωμένος
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,είναι υποχρεωτική. Ίσως συναλλάγματος αρχείο δεν έχει δημιουργηθεί για
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
 DocType: Crop Cycle,Crop Cycle,Κύκλος καλλιέργειας
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
 DocType: Student Admission,Publish on website,Δημοσιεύει στην ιστοσελίδα
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Τιμολόγιο προμηθευτή ημερομηνία αυτή δεν μπορεί να είναι μεγαλύτερη από την απόσπαση Ημερομηνία
+DocType: Subscription,Cancelation Date,Ημερομηνία ακύρωσης
 DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς
 DocType: Agriculture Task,Agriculture Task,Γεωργική εργασία
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Έμμεσα έσοδα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Έμμεσα έσοδα
 DocType: Student Attendance Tool,Student Attendance Tool,Εργαλείο φοίτηση μαθητή
 DocType: Restaurant Menu,Price List (Auto created),Τιμοκατάλογος (Δημιουργήθηκε αυτόματα)
 DocType: Cheque Print Template,Date Settings,Ρυθμίσεις ημερομηνίας
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Μέτρο
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Ο χρόνος δοκιμής εργαστηρίου δεν μπορεί να είναι πριν από την ημερομηνία συλλογής
+DocType: Subscription Plan,Cost,Κόστος
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
 DocType: Expense Claim,Total Advance Amount,Συνολικό Ποσό Προκαταβολής
 DocType: Delivery Stop,Estimated Arrival,αναμενόμενη άφιξη
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
 DocType: Timesheet Detail,Bill,Νομοσχέδιο
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Λευκό
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Λευκό
 DocType: SMS Center,All Lead (Open),Όλες οι Συστάσεις (ανοιχτές)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Μπορείτε να επιλέξετε μία μέγιστη επιλογή από τη λίστα των πλαισίων ελέγχου.
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
 DocType: Item,Automatically Create New Batch,Δημιουργία αυτόματης νέας παρτίδας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Αντιστοίχιση {0} έως {1} (σειρά {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Δημιούργησε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Αντιστοίχιση {0} έως {1} (σειρά {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Δημιούργησε
 DocType: Student Admission,Admission Start Date,Η είσοδος Ημερομηνία Έναρξης
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Νέος υπάλληλος
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
 DocType: Repayment Schedule,Balance Loan Amount,Υπόλοιπο Ποσό Δανείου
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Μάθημα πρόγραμμα
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Δικαιώματα Προαίρεσης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Απενεργοποίηση Λήψης τελευταίων στοιχείων αγοράς στην Εντολή αγοράς
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκευασίας
 DocType: Purchase Invoice,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Παρακαλείστε να προσδιορίσετε ένα {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Η δημιουργία παραλλαγών έχει τεθεί σε ουρά.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Συνοπτική εργασία για {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Η πρώτη προσέγγιση απόρριψης στη λίστα θα οριστεί ως η προεπιλεγμένη άδεια προσέγγισης αδείας.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Plan,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
 DocType: Training Event,Self-Study,Αυτοδιδασκαλίας
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,œΜισθοί
 DocType: Asset Maintenance,Maintenance Manager Name,Όνομα διαχειριστή συντήρησης
 DocType: Agriculture Task,Urgent,Επείγον
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Παρακαλείστε να προσδιορίσετε μια έγκυρη ταυτότητα Σειρά για τη σειρά {0} στο τραπέζι {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Παρακαλείστε να προσδιορίσετε μια έγκυρη ταυτότητα Σειρά για τη σειρά {0} στο τραπέζι {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Δεν είναι δυνατή η εύρεση μεταβλητής:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Επιλέξτε ένα πεδίο για επεξεργασία από numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Δεν μπορεί να είναι ένα στοιχείο πάγιου στοιχείου ενεργητικού, καθώς δημιουργείται Ledger Stock."
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Όνομα προτύπου επιθεώρησης ποιότητας
 DocType: Project,First Email,Το πρώτο μήνυμα ηλεκτρονικού ταχυδρομείου
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Ποσό πώλησης
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Ποσό πώλησης
 DocType: Repayment Schedule,Interest Amount,Ποσό Τόκου
 DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας
 DocType: Share Transfer,Issue,Θέμα
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
 ,Projected Quantity as Source,Προβλεπόμενη ποσότητα ως πηγής
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Ταξίδι παράδοσης
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Ταξίδι παράδοσης
 DocType: Student,A-,Α-
 DocType: Share Transfer,Transfer Type,Τύπος μεταφοράς
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Έξοδα πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Έξοδα πωλήσεων
 DocType: Consultation,Diagnosis,Διάγνωση
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Ταχυδρομικός κώδικας
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Επιλέξτε το λογαριασμό εσόδων από τόκους στο δάνειο {0}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
 DocType: Item,Default Supplier,Προεπιλεγμένος προμηθευτής
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Πάνω Παραγωγής Επίδομα Ποσοστό
-DocType: Employee Loan,Repayment Schedule,Χρονοδιάγραμμα αποπληρωμής
+DocType: Loan,Repayment Schedule,Χρονοδιάγραμμα αποπληρωμής
 DocType: Shipping Rule Condition,Shipping Rule Condition,Όρος κανόνα αποστολής
 DocType: Holiday List,Get Weekly Off Dates,Βρες ημερομηνίες εβδομαδιαίων αργιών
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Η ημερομηνία λήξης δεν μπορεί να είναι προγενέστερη της ημερομηνίας έναρξης
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Μέσος όρος ηλικίας
 DocType: Education Settings,Attendance Freeze Date,Ημερομηνία παγώματος της παρουσίας
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Δείτε όλα τα προϊόντα
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Δείτε όλα τα προϊόντα
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Ελάχιστη ηλικία μόλυβδου (ημέρες)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Όλα BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Τα δωμάτια του ξενοδοχείου {0} δεν είναι διαθέσιμα στις {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Από υπάλληλο
 DocType: Driver,Cellphone Number,αριθμός κινητού
 DocType: Project,Monitor Progress,Παρακολουθήστε την πρόοδο
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
 DocType: Journal Entry,Make Difference Entry,Δημιούργησε καταχώηρηση διαφοράς
+DocType: Supplier Quotation,Auto Repeat Section,Τμήμα αυτόματης επανάληψης
 DocType: Upload Attendance,Attendance From Date,Συμμετοχή από ημερομηνία
 DocType: Appraisal Template Goal,Key Performance Area,Βασικός τομέας επιδόσεων
 DocType: Program Enrollment,Transportation,Μεταφορά
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Ποσότητα πρέπει να είναι μικρότερη ή ίση με {0}
+DocType: Department Approver,Department Approver,Διευθυντής Τμήματος
 DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων
 DocType: Employee Advance,Claimed,Ισχυρίζεται
 DocType: Crop,Row Spacing,Διαχωρισμός γραμμών
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Τιμολόγιο συμφωνίας πληρωμής
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Συμβολή (%)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Σύμφωνα με τις ρυθμίσεις αγοράς, αν απαιτείται εντολή αγοράς == &#39;ΝΑΙ&#39;, τότε για τη δημιουργία τιμολογίου αγοράς, ο χρήστης πρέπει να δημιουργήσει πρώτα την εντολή αγοράς για στοιχείο {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-περίληψη των εξωτερικών προμηθειών
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Αριθμοί μητρώου των επιχειρήσεων για την αναφορά σας. Αριθμοί φόρου κ.λ.π.
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
@@ -1499,10 +1498,10 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +230,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
 DocType: Salary Slip,Deductions,Κρατήσεις
 DocType: Leave Allocation,LAL/,LAL /
-DocType: Setup Progress Action,Action Name,Όνομα δράσης
+DocType: Setup Progress Action,Action Name,Όνομα Ενέργειας
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Έτος έναρξης
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Τα πρώτα 2 ψηφία GSTIN θα πρέπει να ταιριάζουν με τον αριθμό κατάστασης {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Ημερομηνία έναρξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Τα πεδία θα αντιγραφούν μόνο κατά τη στιγμή της δημιουργίας.
 DocType: Setup Progress Action,Domains,Τομείς
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Διαχείριση
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Διαχείριση
 DocType: Cheque Print Template,Payer Settings,Ρυθμίσεις πληρωτή
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
 DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Προσοχή
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Η ημέρα έναρξης είναι μεγαλύτερη από την ημέρα λήξης της εργασίας &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
 DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
 DocType: Item,UOMs,Μ.Μ.
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} Έγκυροι σειριακοί αριθμοί για το είδος {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ο κωδικός είδους δεν μπορεί να αλλάξει για τον σειριακό αριθμό
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Ο κωδικός είδους δεν μπορεί να αλλάξει για τον σειριακό αριθμό
 DocType: Purchase Invoice Item,UOM Conversion Factor,Συντελεστής μετατροπής Μ.Μ.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Παρακαλώ εισάγετε τον κωδικό του Είδους να πάρει Αριθμός Παρτίδας
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
-DocType: Employee Loan,Partially Disbursed,"Εν μέρει, προέβη στη χορήγηση"
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Χορήγηση πληροφοριών.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Χορήγηση πληροφοριών.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Βάση δεδομένων προμηθευτών.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Δεν μπορείτε να κάνετε επανεκκίνηση μιας συνδρομής που δεν ακυρώνεται.
 DocType: Account,Balance Sheet,Ισολογισμός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
 DocType: Fee Validity,Valid Till,Εγκυρο μέχρι
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Συνολική συνάντηση δασκάλων γονέων
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Η αλλαγή της ομάδας πελατών για τον επιλεγμένο πελάτη δεν επιτρέπεται.
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Ενημέρωση των εκτιμώμενων χρόνων άφιξης.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ενημέρωση των εκτιμώμενων χρόνων άφιξης.
 DocType: Program Enrollment Tool,Enrollment Details,Στοιχεία εγγραφής
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Επιλέξτε έναν πελάτη
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Purchase Order,Group same items,Ομάδα ίδια στοιχεία
 DocType: Purchase Invoice,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
-DocType: Employee Loan Application,Repayment Info,Πληροφορίες αποπληρωμής
+DocType: Department,Parent Department,Τμήμα Γονέων
+DocType: Loan Application,Repayment Info,Πληροφορίες αποπληρωμής
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
 DocType: Maintenance Team Member,Maintenance Role,Ρόλος συντήρησης
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Ρύθμιση εργαζόμενοι
 DocType: Sales Order,SO-,ΈΤΣΙ-
 DocType: Hotel Room Reservation,Hotel Reservation User,Χρήστης κράτησης ξενοδοχείων
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 DocType: Student,O-,Ο-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Έρευνα
+DocType: Subscription Settings,Subscription Settings,Ρυθμίσεις συνδρομής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Έρευνα
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Announcement,All Students,Όλοι οι φοιτητές
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Crop Cycle,Less than a year,Λιγότερο από ένα χρόνο
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Φοιτητής Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 DocType: Crop,Yield UOM,Απόδοση UOM
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
 DocType: Item,Is Item from Hub,Είναι στοιχείο από τον κεντρικό υπολογιστή
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Σειρά {0}: Τύπος δραστηριότητας είναι υποχρεωτική.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Μερίσματα που καταβάλλονται
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Μερίσματα που καταβάλλονται
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Λογιστική Λογιστική
 DocType: Stock Reconciliation,Difference Amount,Διαφορά Ποσό
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Δρ {0} στο Αφήστε το {1}
 DocType: Purchase Invoice,Reverse Charge,Αντίστροφη χρέωση
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Αδιανέμητα Κέρδη
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Αδιανέμητα Κέρδη
 DocType: Purchase Invoice,05-Change in POS,05-Αλλαγή POS
 DocType: Vehicle Log,Service Detail,Λεπτομέρεια υπηρεσία
 DocType: BOM,Item Description,Περιγραφή είδους
@@ -1615,17 +1616,17 @@
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},Ρυθμίστε ένα ενεργό μενού για το εστιατόριο {0}
 DocType: Student,STUD.,ΚΟΥΜΠΊ ΚΟΛΆΡΟΥ.
 DocType: Work Order,Qty To Manufacture,Ποσότητα για κατασκευή
-DocType: Email Digest,New Income,νέα εισοδήματος
+DocType: Email Digest,New Income,Νέο εισόδημα
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο αγορών
 DocType: Opportunity Item,Opportunity Item,Είδος ευκαιρίας
 ,Student and Guardian Contact Details,Φοιτητής και Guardian Λεπτομέρειες Επικοινωνία
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Σειρά {0}: Για τον προμηθευτή {0} η διεύθυνση ηλεκτρονικού ταχυδρομείου που απαιτείται για να στείλετε e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Προσωρινό άνοιγμα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Προσωρινό άνοιγμα
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Προβολή Hub
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 DocType: Patient Appointment,More Info,Περισσότερες πληροφορίες
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Αποτίμηση Βαθμολογήστε που απαιτούνται για τη θέση στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Αποτίμηση Βαθμολογήστε που απαιτούνται για τη θέση στη γραμμή {0}
 DocType: Supplier Scorecard,Scorecard Actions,Ενέργειες καρτών αποτελεσμάτων
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Παράδειγμα: Μάστερ στην Επιστήμη των Υπολογιστών
 DocType: Purchase Invoice,Rejected Warehouse,Αποθήκη απορριφθέντων
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,να
 DocType: Supplier Quotation Item,Lead Time in days,Χρόνος των ημερών
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Σύνοψη πληρωτέων λογαριασμών
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Καταβολή του μισθού από {0} έως {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Καταβολή του μισθού από {0} έως {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Προδιαγραφές εργαστηριακών δοκιμών
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Μικρό
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Μικρό
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Άνοιγμα στοιχείου εργαλείου δημιουργίας τιμολογίου
 DocType: Education Settings,Employee Number,Αριθμός υπαλλήλων
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Ακύρωση τιμολογίου μετά την περίοδο χάριτος
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
 DocType: Project,% Completed,% Ολοκληρώθηκε
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Εργαστηριακή δοκιμή
 DocType: Email Digest,Add Quote,Προσθήκη Παράθεση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Έμμεσες δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 DocType: Agriculture Analysis Criteria,Agriculture,Γεωργία
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Κεφάλαιο εξοπλισμών
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Ορίστε πρώτα τον Κωδικό στοιχείου
 DocType: Item,ITEM-,ΕΊΔΟΣ-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
+DocType: Subscription Plan,Billing Interval Count,Χρονικό διάστημα χρέωσης
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 DocType: Antibiotic,Antibiotic,Αντιβιοτικό
 ,Team Updates,Ενημερώσεις ομάδα
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Δημιουργία Εκτύπωση Format
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Θέση του Ομίλου
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Το εναλλακτικό στοιχείο δεν πρέπει να είναι ίδιο με τον κωδικό είδους
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Οριστικοποίηση της προσωρινής αξιολόγησης
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Σταθμός εργασίας
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Αίτηση για Προσφορά Προμηθευτής
 DocType: Healthcare Settings,Registration Message,Μήνυμα εγγραφής
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Δοσολογία Δοσολογίας
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Ημερομηνίες έναρξης και λήξης
 ,Delivered Items To Be Billed,Είδη για χρέωση που έχουν παραδοθεί
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Ανοίξτε το BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
 DocType: Project Update,Great/Quickly,Μεγάλη / Γρήγορη
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Παρακαλώ επιλέξτε παρτίδες για το παραδοθέν αντικείμενο
 DocType: Asset,Depreciation Schedules,Δρομολόγια αποσβέσεων
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Μπορούν να επιλεγούν οι ακόλουθοι λογαριασμοί στις ρυθμίσεις GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Μπορούν να επιλεγούν οι ακόλουθοι λογαριασμοί στις ρυθμίσεις GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
 DocType: Payment Request,Transaction Currency,Νόμισμα συναλλαγής
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Από {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Μέσος όρος ημερησίως εξερχομένων
 DocType: POS Profile,Campaign,Εκστρατεία
 DocType: Supplier,Name and Type,Όνομα και Τύπος
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
 DocType: Physician,Contacts and Address,Επαφές και διεύθυνση
 DocType: Purchase Invoice,Contact Person,Κύρια εγγραφή επικοινωνίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',Η αναμενόμενη ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη από την αναμενόμενη ημερομηνία λήξης
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Επιλεξιμότητα και Λεπτομέρειες
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Από ημερομηνία και ώρα
 DocType: Email Digest,For Company,Για την εταιρεία
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Αρχείο καταγραφής επικοινωνίας
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Αίτηση Προσφοράς είναι απενεργοποιημένη η πρόσβαση από την πύλη, για περισσότερες ρυθμίσεις πύλης ελέγχου."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Μεταβλητή βαθμολόγησης του Προμηθευτή Scorecard
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ποσό αγοράς
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Ποσό αγοράς
 DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης αποστολής
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Παρουσιάστηκαν σφάλματα κατά τη δημιουργία του προγράμματος μαθημάτων
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Ο πρώτος εξομοιωτής δαπανών στη λίστα θα οριστεί ως προεπιλεγμένος Εξομοιωτής Εξόδων.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1839,14 +1844,15 @@
 DocType: Package Code,Package Code,Κωδικός πακέτου
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Μαθητευόμενος
 DocType: Purchase Invoice,Company GSTIN,Εταιρεία GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Ο πίνακας λεπτομερειών φόρου υπολογίζεται από την κύρια εγγραφή του είδους σαν αλφαριθμητικό και αποθηκεύεται σε αυτό το πεδίο. Χρησιμοποιείται για φόρους και τέλη
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός έχει παγώσει, οι καταχωρήσεις επιτρέπονται σε ορισμένους χρήστες."
 DocType: Email Digest,Bank Balance,Τράπεζα Υπόλοιπο
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Απαλλαγή από την υποχρέωση προσέγγισης υποχρεωτική στην άδεια
 DocType: Job Opening,"Job profile, qualifications required etc.","Επαγγελματικό προφίλ, τα προσόντα που απαιτούνται κ.λ.π."
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
@@ -1874,15 +1880,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Ο όρος πληρωμής στη σειρά {0} είναι πιθανώς διπλό.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Γεωργία (βήτα)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Δελτίο συσκευασίας
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ενοίκιο γραφείου
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ενοίκιο γραφείου
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 DocType: Disease,Common Name,Συνηθισμένο όνομα
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
 DocType: Vital Signs,Blood Pressure,Πίεση αίματος
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Αναλυτής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Αναλυτής
 DocType: Item,Inventory,Απογραφή
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 DocType: Quality Inspection,QI-,QI-
@@ -1892,15 +1898,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Επικυρώστε το εγγεγραμμένο μάθημα για φοιτητές στην ομάδα σπουδαστών
 DocType: Notification Control,Expense Claim Rejected,Η αξίωσης δαπανών απορρίφθηκε
 DocType: Item,Item Attribute,Χαρακτηριστικό είδους
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Κυβέρνηση
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Κυβέρνηση
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Αξίωση βάρος {0} υπάρχει ήδη για το όχημα Σύνδεση
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,όνομα Ινστιτούτου
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Παρακαλούμε, εισάγετε αποπληρωμής Ποσό"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Παρακαλούμε, εισάγετε αποπληρωμής Ποσό"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Παραλλαγές του Είδους
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Υπηρεσίες
 DocType: HR Settings,Email Salary Slip to Employee,Email Μισθός Slip σε Εργαζομένους
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Επιλέξτε Πιθανή Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Επιλέξτε Πιθανή Προμηθευτής
 DocType: Sales Invoice,Source,Πηγή
 DocType: Customer,"Select, to make the customer searchable with these fields","Επιλέξτε, για να κάνετε τον πελάτη να αναζητηθεί με αυτά τα πεδία"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Εμφάνιση κλειστά
@@ -1917,7 +1923,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές
 DocType: Program Course,Program Course,Πορεία του προγράμματος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 DocType: Homepage,Company Tagline for website homepage,Η εταιρεία Tagline για την ιστοσελίδα αρχική σελίδα
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Πάρθηκε
@@ -1947,10 +1953,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Λεπτομέρειες για τη γυναίκα
 DocType: Leave Block List,Block Holidays on important days.,Αποκλεισμός αδειών στις σημαντικές ημέρες.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Εισαγάγετε όλες τις απαιτούμενες Αποτελέσματα
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών
-DocType: Employee Loan,Monthly Repayment Amount,Μηνιαία επιστροφή Ποσό
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών
+DocType: Loan,Monthly Repayment Amount,Μηνιαία επιστροφή Ποσό
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Άνοιγμα Τιμολογίων
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
 DocType: UOM,UOM Name,Όνομα Μ.Μ.
 DocType: GST HSN Code,HSN Code,Κωδικός HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Ποσό συνεισφοράς
@@ -1972,7 +1978,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Ο χρήστης {0} έχει ήδη αντιστοιχιστεί στο Physician {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Κουτί
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,πιθανές Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,πιθανές Προμηθευτής
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Μηνιαία διανομή
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Υγειονομική περίθαλψη (beta)
@@ -1999,7 +2006,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
-DocType: Employee Loan,Repayment Method,Τρόπος αποπληρωμής
+DocType: Loan,Repayment Method,Τρόπος αποπληρωμής
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Αν επιλεγεί, η σελίδα θα είναι η προεπιλεγμένη Θέση του Ομίλου για την ιστοσελίδα"
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
@@ -2008,7 +2015,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Απαιτείται πιστοποιητικό
 DocType: Company,Default Holiday List,Προεπιλεγμένη λίστα διακοπών
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Σειρά {0}: από το χρόνο και την ώρα της {1} είναι η επικάλυψη με {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Υποχρεώσεις αποθέματος
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Υποχρεώσεις αποθέματος
 DocType: Purchase Invoice,Supplier Warehouse,Αποθήκη προμηθευτή
 DocType: Opportunity,Contact Mobile No,Αριθμός κινητού επαφής
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Επιλέξτε Εταιρεία
@@ -2016,7 +2023,7 @@
 DocType: Student Report Generation Tool,Print Section,Εκτύπωση ενότητας
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Ο χρήστης {0} δεν έχει προεπιλεγμένο προφίλ POS. Έλεγχος προεπιλογής στη γραμμή {1} για αυτόν τον χρήστη.
 DocType: Student Group,Set 0 for no limit,Ορίστε 0 για χωρίς όριο
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Η σειρά {idx}: {field} είναι απαραίτητη για τη δημιουργία των τιμολογίων {invoice_type} Opening
 DocType: Customer,Primary Address and Contact Detail,Κύρια διεύθυνση και στοιχεία επικοινωνίας
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
@@ -2027,10 +2034,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Επιλέξτε τουλάχιστον έναν τομέα.
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Αναζήτηση Είδους
 DocType: Payment Schedule,Payment Amount,Ποσό πληρωμής
@@ -2040,7 +2047,7 @@
 DocType: Assessment Plan,Grading Scale,Κλίμακα βαθμολόγησης
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,έχουν ήδη ολοκληρωθεί
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Χρηματιστήριο στο χέρι
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Χρηματιστήριο στο χέρι
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Εισαγωγή επιτυχής!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
@@ -2051,17 +2058,16 @@
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
 DocType: Customer,Customer POS Id,Αναγνωριστικό POS πελάτη
 DocType: Account,Account Name,Όνομα λογαριασμού
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Ο σειριακός αριθμός {0} ποσότητα {1} δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Ο σειριακός αριθμός {0} ποσότητα {1} δεν μπορεί να είναι ένα κλάσμα
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Πληκτρολογήστε τη διεύθυνση URL του διακομιστή Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
 DocType: Share Balance,To No,Σε Όχι
-DocType: Subscription,Reference Document,έγγραφο αναφοράς
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} έχει ακυρωθεί ή σταματήσει
 DocType: Accounts Settings,Credit Controller,Ελεγκτής πίστωσης
-DocType: Grant Application,Applicant Type,Τύπος αιτούντος
+DocType: Loan,Applicant Type,Τύπος αιτούντος
 DocType: Purchase Invoice,03-Deficiency in services,03-Ανεπάρκεια υπηρεσιών
 DocType: Delivery Note,Vehicle Dispatch Date,Ημερομηνία κίνησης οχήματος
 DocType: Healthcare Settings,Default Medical Code Standard,Προεπιλεγμένο πρότυπο ιατρικού κώδικα
@@ -2072,13 +2078,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Χρεώθηκαν
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Δεσμευμένη ποσότητα
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ανθρώπινοι πόροι
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ανθρώπινοι πόροι
 DocType: Lead,Upper Income,Άνω εισοδήματος
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Απορρίπτω
 DocType: Journal Entry Account,Debit in Company Currency,Χρεωστικές στην Εταιρεία Νόμισμα
 DocType: BOM Item,BOM Item,Είδος Λ.Υ.
 DocType: Appraisal,For Employee,Για τον υπάλληλο
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Κάντε εκταμίευση Έναρξη
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Κάντε εκταμίευση Έναρξη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
 DocType: Membership,INR,INR
@@ -2107,10 +2113,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Σύνολο (χωρίς Φόρο)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Αρχικός αριθμός
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} πρέπει να είναι μεγαλύτερη από μηδέν
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Διαθέσιμο διαθέσιμο
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Διαθέσιμο διαθέσιμο
 DocType: Manufacturing Settings,Capacity Planning For (Days),Ο προγραμματισμός της δυναμικότητας Για (Ημέρες)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Προμήθεια
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Υποχρεωτικό πεδίο - Πρόγραμμα
 DocType: Special Test Template,Result Component,Στοιχείο αποτελέσματος
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Αξίωση εγγύησης
@@ -2130,7 +2136,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,"Περιλαμβάνουν διακοπές σε φύλλα, όπως τα φύλλα"
 DocType: Sales Invoice,Packed Items,Συσκευασμένα είδη
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Αξίωση εγγύησης για τον σειριακό αρ.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Σύνολο&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Σύνολο&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ενεργοποίηση του καλαθιού αγορών
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2148,10 +2154,10 @@
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Επιβεβαιώστε τη δράση
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online δημοπρασίες
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Εκπλήρωση
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Προβολή Καλάθι
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Δαπάνες marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Δεν είναι δυνατή η δημιουργία τυπικών κριτηρίων. Παρακαλούμε μετονομάστε τα κριτήρια
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
@@ -2173,9 +2179,9 @@
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Material Request,Transferred,Μεταφέρθηκε
 DocType: Vehicle,Doors,πόρτες
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Συλλογή αμοιβής για εγγραφή ασθενούς
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Δεν είναι δυνατή η αλλαγή χαρακτηριστικών μετά από συναλλαγή μετοχών. Δημιουργήστε ένα νέο αντικείμενο και μεταφέρετε το απόθεμα στο νέο στοιχείο
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Δεν είναι δυνατή η αλλαγή χαρακτηριστικών μετά από συναλλαγή μετοχών. Δημιουργήστε ένα νέο αντικείμενο και μεταφέρετε το απόθεμα στο νέο στοιχείο
 DocType: Course Assessment Criteria,Weightage,Ζύγισμα
 DocType: Purchase Invoice,Tax Breakup,Φορολογική διακοπή
 DocType: Packing Slip,PS-,PS-
@@ -2184,7 +2190,7 @@
 DocType: Payment Schedule,Payment Term,Ορος πληρωμής
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
 DocType: Land Unit,Area,Περιοχή
-apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Νέα Επικοινωνία
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Νέα Επαφή
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Purchase Invoice,Place of Supply,Τόπος παροχής
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
@@ -2211,11 +2217,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Συμφωνία json
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Purchase Invoice Item,Batch No,Αρ. Παρτίδας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Προώθηση εργαζομένων
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 DocType: Student Group Instructor,Student Group Instructor,Φοιτητής ομάδας εκπαιδευτών
 DocType: Grant Application,Assessment  Mark (Out of 10),Βαθμός αξιολόγησης (από 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Όχι
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Κύριο
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
@@ -2224,15 +2231,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Email Digest,Annual Expenses,ετήσια Έξοδα
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
 DocType: Sales Team,Contribution to Net Total,Συμβολή στο καθαρό σύνολο
 DocType: Sales Invoice Item,Customer's Item Code,Κωδικός είδους πελάτη
 DocType: Stock Reconciliation,Stock Reconciliation,Συμφωνία αποθέματος
 DocType: Territory,Territory Name,Όνομα περιοχής
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Μπορείτε να έχετε μόνο σχέδια με τον ίδιο κύκλο χρέωσης σε μια συνδρομή
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Αιτών εργασία
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
@@ -2241,10 +2249,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,εκτιμήσεις
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Εκδηλώσεις Εκπαίδευσης
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Το κομμάτι οδηγεί με βάση την πηγή.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Παρακαλώ περάστε
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Παρακαλώ περάστε
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Αρχείο καταγραφής συντήρησης
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Παρακαλούμε να ορίσετε το φίλτρο σύμφωνα με το σημείο ή την αποθήκη
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Το καθαρό βάρος της εν λόγω συσκευασίας. (Υπολογίζεται αυτόματα ως το άθροισμα του καθαρού βάρους των ειδών)
@@ -2252,11 +2260,11 @@
 DocType: Sales Order,To Deliver and Bill,Για να παρέχουν και να τιμολογούν
 DocType: Student Group,Instructors,εκπαιδευτές
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Διαχείριση μετοχών
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Πληρωμή
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Η αποθήκη {0} δεν συνδέεται με κανένα λογαριασμό, αναφέρετε τον λογαριασμό στο αρχείο αποθήκης ή ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος στην εταιρεία {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Διαχειριστείτε τις παραγγελίες σας
 DocType: Work Order Operation,Actual Time and Cost,Πραγματικός χρόνος και κόστος
@@ -2266,7 +2274,7 @@
 DocType: Student Leave Application,Student Leave Application,Φοιτητής Αφήστε Εφαρμογή
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Στις
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
@@ -2276,10 +2284,10 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,Κόμβος Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Συνεργάτης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Συνεργάτης
 DocType: Asset Movement,Asset Movement,Asset Κίνημα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Η παραγγελία εργασίας {0} πρέπει να υποβληθεί
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,νέα καλαθιού
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Νέο Καλάθι
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 DocType: Vehicle,Wheels,τροχοί
@@ -2294,13 +2302,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Το νόμισμα χρέωσης πρέπει να είναι ίσο είτε με το νόμισμα της εταιρείας προεπιλογής είτε με το νόμισμα του λογαριασμού κόμματος
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 DocType: Soil Texture,Loam,Παχύ χώμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Γραμμή {0}: Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία δημοσίευσης
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Γραμμή {0}: Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία δημοσίευσης
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Δημιούργησε καταχώηρση πληρωμής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
 ,Sales Invoice Trends,Τάσεις τιμολογίου πώλησης
 DocType: Leave Application,Apply / Approve Leaves,Εφαρμογή / έγκριση αδειών
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Για
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Μπορεί να παραπέμψει σε γραμμή μόνο εφόσον ο τύπος χρέωσης είναι ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Μπορεί να παραπέμψει σε γραμμή μόνο εφόσον ο τύπος χρέωσης είναι ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής
 DocType: Sales Order Item,Delivery Warehouse,Αποθήκη Παράδοση
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Δέντρο των Κέντρων οικονομικό κόστος.
 DocType: Serial No,Delivery Document No,Αρ. εγγράφου παράδοσης
@@ -2314,7 +2321,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Η κατανάλωση υλικού δεν έχει οριστεί στις Ρυθμίσεις κατασκευής.
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Δεν είναι δυνατή η υπερπαραγωγή στοιχείου {0} στη σειρά {1} περισσότερο από {2}. Για να επιτρέψετε την υπερβολική τιμολόγηση, ρυθμίστε τις ρυθμίσεις αποθεμάτων"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Δεν είναι δυνατή η υπερπαραγωγή στοιχείου {0} στη σειρά {1} περισσότερο από {2}. Για να επιτρέψετε την υπερβολική τιμολόγηση, ρυθμίστε τις ρυθμίσεις αποθεμάτων"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ενημέρωση απόκρισης
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
@@ -2325,12 +2332,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Επιλέξτε πρώτα το πρόγραμμα
 DocType: Patient Appointment,Patient Age,Ηλικία ασθενούς
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Διαχείριση έργων
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Ο σειριακός αριθμός {0} έχει ήδη επιστραφεί
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Ο σειριακός αριθμός {0} έχει ήδη επιστραφεί
 DocType: Supplier,Supplier of Goods or Services.,Προμηθευτής αγαθών ή υπηρεσιών.
 DocType: Budget,Fiscal Year,Χρήση
 DocType: Asset Maintenance Log,Planned,Σχεδιασμένος
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Προκαθορισμένοι εισπρακτέοι λογαριασμοί που πρέπει να χρησιμοποιηθούν εάν δεν έχουν οριστεί στον Ασθενή για την κράτηση των τελών διαβούλευσης.
 DocType: Vehicle Log,Fuel Price,των τιμών των καυσίμων
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Προϋπολογισμός
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Ορίστε Άνοιγμα
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
@@ -2344,16 +2352,16 @@
 DocType: Lead,Follow Up,Ακολουθω
 DocType: Item,Is Sales Item,Είναι είδος πώλησης
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Δέντρο ομάδων ειδών
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Ελέγξτε την κύρια εγγραφή είδους
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Ελέγξτε την κύρια εγγραφή είδους
 DocType: Maintenance Visit,Maintenance Time,Ώρα συντήρησης
 ,Amount to Deliver,Ποσό Παράδοση
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Το ίδιο στοιχείο εισήχθη πολλές φορές. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Η Ημερομηνία Τίτλος έναρξης δεν μπορεί να είναι νωρίτερα από το έτος έναρξης Ημερομηνία του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Υπήρχαν σφάλματα.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Ο εργαζόμενος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Υπήρχαν σφάλματα.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Ο εργαζόμενος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}:
 DocType: Guardian,Guardian Interests,Guardian Ενδιαφέροντα
 DocType: Naming Series,Current Value,Τρέχουσα αξία
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
 DocType: Education Settings,Instructor Records to be created by,Εγγραφές εκπαιδευτών που θα δημιουργηθούν από το
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} Δημιουργήθηκε
 DocType: GST Account,GST Account,Λογαριασμός GST
@@ -2372,8 +2380,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Προστέθηκε στα Αγαπημένα
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Δεν υποβλήθηκε κανένα δελτίο αποδοχών για τα παραπάνω επιλεγμένα κριτήρια Ή το φύλλο μισθοδοσίας που έχετε ήδη υποβάλει
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Δασμοί και φόροι
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Δεν υποβλήθηκε κανένα δελτίο αποδοχών για τα παραπάνω επιλεγμένα κριτήρια Ή το φύλλο μισθοδοσίας που έχετε ήδη υποβάλει
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Δασμοί και φόροι
 DocType: Projects Settings,Projects Settings,Ρυθμίσεις έργων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} εγγραφές πληρωμών δεν μπορεί να φιλτράρεται από {1}
@@ -2383,27 +2391,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Δέντρο ομάδων ειδών.
 DocType: Production Plan,Total Produced Qty,Συνολική Ποσότητα Παραγωγής
 DocType: Payroll Entry,Get Employee Details,Λάβετε στοιχεία για τον υπάλληλο
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
 DocType: Asset,Sold,Πωληθεί
 ,Item-wise Purchase History,Ιστορικό αγορών ανά είδος
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Βάση Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Πρώτες ύλες
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Πρώτες ύλες
 DocType: Payment Reconciliation Payment,Reference Row,Σειρά αναφοράς
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
 DocType: Sales Invoice,Accounting Details,Λογιστική Λεπτομέρειες
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Διαγράψτε όλες τις συναλλαγές για αυτή την Εταιρεία
 DocType: Patient,O Positive,O Θετική
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Επενδύσεις
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,χορηγήσεις
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Κριτήρια αποδοχής
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Παρακαλούμε, εισάγετε αιτήσεις Υλικό στον παραπάνω πίνακα"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Δεν υπάρχουν διαθέσιμες επιστροφές για την καταχώριση ημερολογίου
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 DocType: BOM,Show In Website,Εμφάνιση στην ιστοσελίδα
 DocType: Shopping Cart Settings,Show Quantity in Website,Εμφάνιση Ποσότητα στην ιστοσελίδα
-DocType: Employee Loan Application,Total Payable Amount,Συνολικό πληρωτέο ποσό
+DocType: Loan Application,Total Payable Amount,Συνολικό πληρωτέο ποσό
 DocType: Task,Expected Time (in hours),Αναμενόμενη διάρκεια (σε ώρες)
 DocType: Item Reorder,Check in (group),Άφιξη (ομάδα)
 DocType: Soil Texture,Silt,Λάσπη
@@ -2422,7 +2431,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Κάνω πληρωμή
 DocType: Room,Room Name,Όνομα δωμάτιο
 DocType: Prescription Duration,Prescription Duration,Διάρκεια συνταγογράφησης
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Αφήστε που δεν μπορούν να εφαρμοστούν / ακυρωθεί πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Αφήστε που δεν μπορούν να εφαρμοστούν / ακυρωθεί πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
 DocType: Activity Cost,Costing Rate,Κοστολόγηση Τιμή
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Διευθύνσεις πελατών και των επαφών
 ,Campaign Efficiency,Αποτελεσματικότητα καμπάνιας
@@ -2440,11 +2449,11 @@
 DocType: Chapter,Chapter,Κεφάλαιο
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Ζεύγος
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός θα ενημερωθεί αυτόματα στο POS Τιμολόγιο, όταν αυτή η λειτουργία είναι επιλεγμένη."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
 DocType: Asset,Depreciation Schedule,Πρόγραμμα αποσβέσεις
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Διευθύνσεις συνεργατών πωλήσεων και επαφές
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Μισό Ημερομηνία Ημέρα θα πρέπει να είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Μισό Ημερομηνία Ημέρα θα πρέπει να είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
 DocType: Maintenance Schedule Detail,Actual Date,Πραγματική ημερομηνία
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Ορίστε το προεπιλεγμένο κέντρο κόστους στην εταιρεία {0}.
 DocType: Item,Has Batch No,Έχει αρ. Παρτίδας
@@ -2462,7 +2471,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο)
 DocType: Soil Texture,Soil Type,Τύπος εδάφους
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Νέο μήνυμα
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Εντολή
@@ -2482,7 +2490,7 @@
 DocType: Hub Category,Hub Category,Κατηγορία Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
-DocType: Employee Loan,Loan Amount,Ποσο δανειου
+DocType: Loan,Loan Amount,Ποσο δανειου
 DocType: Student Report Generation Tool,Add Letterhead,Προσθέστε επιστολόχαρτο
 DocType: Program Enrollment,Self-Driving Vehicle,Αυτοκίνητο όχημα
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Βαθμολογία προμηθευτή Scorecard
@@ -2503,16 +2511,16 @@
 DocType: Salary Slip,net pay info,καθαρών αποδοχών πληροφορίες
 DocType: Woocommerce Settings,Enable Sync,Ενεργοποίηση συγχρονισμού
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Αυτή η τιμή ενημερώνεται στον κατάλογο προεπιλεγμένων τιμών πωλήσεων.
-DocType: Email Digest,New Expenses,νέα Έξοδα
+DocType: Email Digest,New Expenses,Νέα Έξοδα
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Amount,Ποσό PDC / LC
 DocType: Shareholder,Shareholder,Μέτοχος
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 DocType: Cash Flow Mapper,Position,Θέση
 DocType: Patient,Patient Details,Λεπτομέρειες ασθενούς
 DocType: Patient,B Positive,Β Θετικό
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 DocType: Patient Medical Record,Patient Medical Record,Ιατρικό αρχείο ασθενούς
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Αθλητισμός
@@ -2520,8 +2528,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Πραγματικό σύνολο
 DocType: Lab Test UOM,Test UOM,Δοκιμή UOM
 DocType: Student Siblings,Student Siblings,φοιτητής αδέλφια
+DocType: Subscription Plan Detail,Subscription Plan Detail,Λεπτομέρειες σχεδίου συνδρομής
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Μονάδα
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Παρακαλώ ορίστε εταιρεία
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Παρακαλώ ορίστε εταιρεία
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Asset Maintenance Task,Maintenance Task,Συντήρηση
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Ορίστε το όριο B2C στις ρυθμίσεις GST.
@@ -2535,6 +2544,7 @@
 ,BOM Search,BOM Αναζήτηση
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Συνολικό Κόστος Κατανεμημένου Υλικού (μέσω Εισαγωγής στο Χρηματιστήριο)
 DocType: Hub Settings,Company Registered,Εταιρεία καταχωρημένη
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Η ημερομηνία δεν μπορεί να είναι μικρότερη από την ημερομηνία
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Δημοσιεύστε &quot;Διαθέσιμο&quot; ή &quot;Δεν είναι διαθέσιμο&quot; στο Hub βάσει του διαθέσιμου αποθέματος σε αυτήν την αποθήκη.
 DocType: Vehicle,Fuel Type,Τύπος καυσίμου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
@@ -2542,17 +2552,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Το ισοζύγιο αποθεμάτων στην παρτίδα {0} θα γίνει αρνητικό {1} για το είδος {2} στην αποθήκη {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
 DocType: Email Digest,Pending Sales Orders,Εν αναμονή Παραγγελίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
 DocType: Employee,Create User Permission,Δημιουργία άδειας χρήστη
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Healthcare Settings,Remind Before,Υπενθύμιση Πριν
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
 DocType: Salary Component,Deduction,Κρατήση
 DocType: Item,Retain Sample,Διατηρήστε δείγμα
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
 DocType: Stock Reconciliation Item,Amount Difference,ποσό Διαφορά
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
 DocType: Territory,Classification of Customers by region,Ταξινόμηση των πελατών ανά περιοχή
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Σε παραγωγή
@@ -2562,8 +2573,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Υπολογιζόμενο Τράπεζα ισορροπία Δήλωση
 DocType: Normal Test Template,Normal Test Template,Πρότυπο πρότυπο δοκιμής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Απενεργοποιημένος χρήστης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Προσφορά
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Δεν είναι δυνατή η ρύθμιση ενός ληφθέντος RFQ σε καμία παράθεση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Προσφορά
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Δεν είναι δυνατή η ρύθμιση ενός ληφθέντος RFQ σε καμία παράθεση
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Επιλέξτε ένα λογαριασμό για εκτύπωση σε νόμισμα λογαριασμού
@@ -2571,7 +2582,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές κατά αυτού του Ασθενούς. Για λεπτομέρειες, δείτε την παρακάτω γραμμή χρόνου"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Patient,Date of Birth,Ημερομηνία γέννησης
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση Σύστασης
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Ρύθμιση πίνακα καρτών προμηθευτή
@@ -2582,14 +2593,15 @@
 DocType: Work Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Περιγραφή Δουλειάς
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Περιγραφή Δουλειάς
 DocType: Student Applicant,Applied,Εφαρμοσμένος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Άνοιγμα ξανά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Άνοιγμα ξανά
 DocType: Sales Invoice Item,Qty as per Stock UOM,Ποσότητα σύμφωνα με τη Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Όνομα Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02 Έκπτωση μετά την πώληση
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε Συστάσεις, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων."
+DocType: Department Approver,Approver,Ο εγκρίνων
 ,SO Qty,Ποσότητα παρ. πώλησης
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Το πεδίο Ο Μεριδιούχος δεν μπορεί να είναι κενό
 DocType: Guardian,Work Address,Διεύθυνση εργασίας
@@ -2603,21 +2615,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Συνολικό ποσό που χορηγήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Order Item,To be delivered to customer,Να παραδοθεί στον πελάτη
 DocType: BOM,Scrap Material Cost,Άχρηστα Υλικών Κατασκευής Νέων Κτιρίων
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
 DocType: Grant Application,Email Notification Sent,Αποστολή ειδοποίησης ηλεκτρονικού ταχυδρομείου
 DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Κωδικός είδους, αποθήκη, ποσότητα που απαιτείται στη σειρά"
-DocType: Pricing Rule,Supplier,Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Κωδικός είδους, αποθήκη, ποσότητα που απαιτείται στη σειρά"
+DocType: Bank Guarantee,Supplier,Προμηθευτής
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Δείξτε λεπτομέρειες πληρωμής
 DocType: Consultation,Consultation Time,Ώρα διαβούλευσης
 DocType: C-Form,Quarter,Τρίμηνο
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Διάφορες δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Διάφορες δαπάνες
 DocType: Global Defaults,Default Company,Προεπιλεγμένη εταιρεία
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Όνομα τράπεζας
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Παραπάνω
-DocType: Employee Loan,Employee Loan Account,Ο λογαριασμός δανείου των εργαζομένων
 DocType: Leave Application,Total Leave Days,Σύνολο ημερών άδειας
 DocType: Email Digest,Note: Email will not be sent to disabled users,Σημείωση: το email δε θα σταλεί σε απενεργοποιημένους χρήστες
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Αριθμός Αλληλεπίδρασης
@@ -2632,7 +2643,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Βάρος (σε χιλιόγραμμα)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",κεφάλαια / όνομα_κλειδιού αφήστε αυτόματα να τεθεί κενό μετά την αποθήκευση κεφαλαίου.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Ορίστε λογαριασμούς GST στις ρυθμίσεις GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Ορίστε λογαριασμούς GST στις ρυθμίσεις GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Είδος επιχείρησης
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Το κόστος της Νέας Αγοράς
@@ -2641,12 +2652,13 @@
 DocType: Grant Application,Grant Description,Περιγραφή επιχορήγησης
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
 DocType: Student Guardian,Others,Άλλα
+DocType: Subscription,Discounts,Εκπτώσεις
 DocType: Payment Entry,Unallocated Amount,μη διατεθέντων Ποσό
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.
 DocType: POS Profile,Taxes and Charges,Φόροι και επιβαρύνσεις
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Ένα προϊόν ή μια υπηρεσία που αγοράζεται, πωλείται ή διατηρείται σε απόθεμα."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Δεν περισσότερες ενημερώσεις
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Αυτό καλύπτει όλες τις κάρτες αποτελεσμάτων που συνδέονται με αυτό το πρόγραμμα Εγκατάστασης
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Παιδί στοιχείο δεν πρέπει να είναι ένα Bundle προϊόντων. Παρακαλώ αφαιρέστε το αντικείμενο `{0}` και να αποθηκεύσετε
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Κατάθεση
@@ -2654,45 +2666,48 @@
 DocType: Vehicle Service,Service Item,υπηρεσία Στοιχείο
 DocType: Bank Guarantee,Bank Guarantee,Τραπεζική εγγύηση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Grading Scale,Grading Scale Intervals,Διαστήματα Κλίμακα βαθμολόγησης
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Κέρδος για το έτος
+DocType: Bank Guarantee,Name of Bank,Ονομα τράπεζας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: λογιστική καταχώριση για {2} μπορεί να γίνει μόνο στο νόμισμα: {3}
 DocType: Fee Schedule,In Process,Σε επεξεργασία
 DocType: Authorization Rule,Itemwise Discount,Έκπτωση ανά είδος
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Δέντρο των χρηματοοικονομικών λογαριασμών.
+DocType: Bank Guarantee,Reference Document Type,Αναφορά Τύπος εγγράφου
 DocType: Cash Flow Mapping,Cash Flow Mapping,Χαρτογράφηση ταμειακών ροών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
 DocType: Account,Fixed Asset,Πάγιο
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Απογραφή συνέχειες
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Δεν βρέθηκε διεύθυνση ηλεκτρονικού ταχυδρομείου στην προεπιλεγμένη επαφή
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Δημιουργία μυστικού
-DocType: Employee Loan,Account Info,Πληροφορίες λογαριασμού
+DocType: Loan,Account Info,Πληροφορίες λογαριασμού
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
 DocType: Fees,Include Payment,Συμπεριλάβετε την πληρωμή
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Δημιουργία ομάδων σπουδαστών.
 DocType: Sales Invoice,Total Billing Amount,Συνολικό Ποσό Χρέωσης
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Το πρόγραμμα στη δομή των αμοιβών και στην Ομάδα σπουδαστών {0} είναι διαφορετικό.
 DocType: Fee Schedule,Receivable Account,Εισπρακτέα λογαριασμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
 DocType: Quotation Item,Stock Balance,Ισοζύγιο αποθέματος
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Με την πληρωμή του φόρου
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ΤΡΙΛΙΚΑ ΓΙΑ ΠΡΟΜΗΘΕΥΤΗ
 DocType: Land Unit,Is Container,Είναι Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Αυτή θα είναι η πρώτη ημέρα του κύκλου καλλιέργειας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Purchase Invoice Item,Weight UOM,Μονάδα μέτρησης βάρους
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Κατάλογος διαθέσιμων Μετόχων με αριθμούς φακέλων
 DocType: Salary Structure Employee,Salary Structure Employee,Δομή μισθό του υπαλλήλου
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Εμφάνιση παραμέτρων παραλλαγών
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Εμφάνιση παραμέτρων παραλλαγών
 DocType: Student,Blood Group,Ομάδα αίματος
 DocType: Course,Course Name,Όνομα Μαθήματος
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Χρήστες που μπορούν να εγκρίνουν αιτήσεις για έναν συγκεκριμένο εργαζόμενο
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Εξοπλισμός γραφείου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Εξοπλισμός γραφείου
 DocType: Purchase Invoice Item,Qty,Ποσότητα
 DocType: Fiscal Year,Companies,Εταιρείες
 DocType: Supplier Scorecard,Scoring Setup,Ρύθμιση βαθμολόγησης
@@ -2711,7 +2726,7 @@
 DocType: Stock Entry,Total Incoming Value,Συνολική εισερχόμενη αξία
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Χρεωστικό να απαιτείται
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Τιμοκατάλογος αγορών
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Πρότυπα των μεταβλητών βαθμολογίας του προμηθευτή.
 DocType: Job Offer Term,Offer Term,Προσφορά Όρος
 DocType: Asset,Quality Manager,Υπεύθυνος διασφάλισης ποιότητας
@@ -2723,13 +2738,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Το σύνολο των απλήρωτων: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM λειτουργίας της ιστοσελίδας
 DocType: Supplier Scorecard,Supplier Score,Βαθμός προμηθευτή
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Συνολικό ποσό που τιμολογήθηκε
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Συνολικό ποσό που τιμολογήθηκε
 DocType: Supplier,Warn RFQs,Προειδοποίηση RFQ
 DocType: BOM,Conversion Rate,Συναλλαγματική ισοτιμία
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Αναζήτηση προϊόντων
 DocType: Assessment Plan,To Time,Έως ώρα
 DocType: Authorization Rule,Approving Role (above authorized value),Έγκριση Ρόλος (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
+DocType: Loan,Total Amount Paid,Συνολικό ποσό που καταβλήθηκε
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Επιλέξτε φοιτητική εισαγωγή, η οποία είναι υποχρεωτική για τον αιτούντα πληρωμένο φοιτητή"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Επιλέξτε τιμοκατάλογο για να δημοσιεύσετε τιμολόγηση
@@ -2739,18 +2755,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Σειρά {0}: Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {1} για τη λειτουργία {2}
 DocType: Manufacturing Settings,Allow Overtime,Επιτρέψτε Υπερωρίες
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Το Serialized Item {0} δεν μπορεί να ενημερωθεί χρησιμοποιώντας τη Συμφωνία Χρηματιστηρίου, παρακαλούμε χρησιμοποιήστε την ένδειξη Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Το Serialized Item {0} δεν μπορεί να ενημερωθεί χρησιμοποιώντας τη Συμφωνία Χρηματιστηρίου, παρακαλούμε χρησιμοποιήστε την ένδειξη Stock"
 DocType: Training Event Employee,Training Event Employee,Κατάρτιση Εργαζομένων Event
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Τα μέγιστα δείγματα - {0} μπορούν να διατηρηθούν για το Batch {1} και το στοιχείο {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Προσθήκη χρονικών θυρίδων
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} αύξοντες αριθμούς που απαιτούνται για τη θέση {1}. Έχετε προβλέπεται {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Τρέχουσα Αποτίμηση Τιμή
 DocType: Training Event,Advance,Προκαταβολή
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,για την επανάληψη της επανάληψης.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ρυθμίσεις πύλης πληρωμής
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ανταλλαγή Κέρδος / Ζημιά
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Ανταλλαγή Κέρδος / Ζημιά
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Σειρά # {0}: Ο λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Σειρά # {0}: Ο λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Δεν είναι δυνατή η εύρεση του DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
@@ -2769,7 +2784,6 @@
 DocType: Bin,Actual Quantity,Πραγματική ποσότητα
 DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Η συνδρομή ήταν {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Πρόγραμμα προγράμματος χρεώσεων
 DocType: Fee Schedule Program,Student Batch,Batch φοιτητής
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Κάντε Φοιτητής
@@ -2784,14 +2798,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Ηλεκτρονικό εμπόριο GSTIN
 DocType: Sales Order,Not Delivered,Δεν έχει παραδοθεί
 ,Bank Clearance Summary,Περίληψη εκκαθάρισης τράπεζας
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
 DocType: Appraisal Goal,Appraisal Goal,Στόχος αξιολόγησης
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Προτείνετε κατηγορία;
 DocType: Stock Reconciliation Item,Current Amount,τρέχουσα Ποσό
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,κτίρια
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,κτίρια
 DocType: Fee Schedule,Fee Structure,Δομή χρέωση
 DocType: Timesheet Detail,Costing Amount,Κοστολόγηση Ποσό
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Student Admission Program,Application Fee,Τέλη της αίτησης
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Υποβολή βεβαίωσης αποδοχών
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Η μέγιστη έκπτωση για το είδος {0} είναι {1} %
@@ -2799,12 +2812,13 @@
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
 DocType: SMS Log,Sender Name,Όνομα αποστολέα
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Κριτήρια Γεωργικής Ανάλυσης
+DocType: HR Settings,Leave Approval Notification Template,Αφήστε το πρότυπο ειδοποίησης έγκρισης
 DocType: POS Profile,[Select],[ Επιλέξτε ]
 DocType: Vital Signs,Blood Pressure (diastolic),Πίεση αίματος (διαστολική)
 DocType: SMS Log,Sent To,Αποστέλλονται
 DocType: Agriculture Task,Holiday Management,Διαχείριση Διακοπών
 DocType: Payment Request,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,λογισμικά
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,λογισμικά
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Ο γιατρός {0} δεν είναι διαθέσιμος στις {1}
@@ -2822,7 +2836,7 @@
 DocType: Employee,New Workplace,Νέος χώρος εργασίας
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Κατανάλωση υλικών
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ορισμός ως Έκλεισε
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Δεν βρέθηκε είδος με barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Δεν βρέθηκε είδος με barcode {0}
 DocType: Normal Test Items,Require Result Value,Απαιτείται τιμή αποτελέσματος
 DocType: Item,Show a slideshow at the top of the page,Δείτε μια παρουσίαση στην κορυφή της σελίδας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMs
@@ -2837,19 +2851,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
 DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Επαναλαμβανόμενες
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Στοιχεία πρότυπου χαρτογράφησης ταμειακών ροών
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Διαχείριση δανείων
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Παρακολουθήστε ξεωριστά έσοδα και έξοδα για τις κάθετες / διαιρέσεις προϊόντος
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Εμφάνιση Μισθός Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Εμφάνιση Μισθός Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Μεταφορά υλικού
 DocType: Fees,Send Payment Request,Αίτηση πληρωμής
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 DocType: Water Analysis,Origin,Προέλευση
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
@@ -2864,14 +2878,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Είναι η ευθύνη φόρου εισοδήματος
 DocType: Grading Scale Interval,Grade Description,βαθμός Περιγραφή
 DocType: Stock Entry,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Κερδιζμένα χρήματα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Κερδιζμένα χρήματα
 DocType: Sales Invoice, Shipping Bill Number,Αριθμός λογαριασμού αποστολής
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ιχνηλασιμότητα
 DocType: Asset Maintenance Log,Actions performed,Ενέργειες που εκτελούνται
 DocType: Cash Flow Mapper,Section Leader,Τμήμα ηγέτης
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Πηγή χρηματοδότησης ( παθητικού )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Πηγή χρηματοδότησης ( παθητικού )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Υπάλληλος
+DocType: Bank Guarantee,Fixed Deposit Number,Αριθμός σταθερής κατάθεσης
 DocType: Asset Repair,Failure Date,Ημερομηνία αποτυχίας
 DocType: Sample Collection,Collected Time,Συλλεγμένος χρόνος
 DocType: Company,Sales Monthly History,Μηνιαίο ιστορικό πωλήσεων
@@ -2888,10 +2903,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτό το ραντεβού;
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Πακέτο τιμολόγησης δωματίων ξενοδοχείου
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline πωλήσεις
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Λήψη ενημερώσεων συνδρομής
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Ο λογαριασμός {0} δεν αντιστοιχεί στην εταιρεία {1} στη λειτουργία λογαριασμού: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Σειρά μαθημάτων:
@@ -2901,7 +2917,7 @@
 DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Δεν δημιουργήθηκαν εντολές εργασίας
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {0} έχει ήδη δημιουργηθεί για την περίοδο αυτή
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Φαρμακευτικός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Φαρμακευτικός
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Το κόστος των αγορασθέντων ειδών
 DocType: Selling Settings,Sales Order Required,Η παραγγελία πώλησης είναι απαραίτητη
 DocType: Purchase Invoice,Credit To,Πίστωση προς
@@ -2919,7 +2935,7 @@
 DocType: Request for Quotation Supplier,No Quote,Δεν υπάρχει παράθεση
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Gateway Account,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Job Offer,Accepted,Αποδεκτό
@@ -2931,7 +2947,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Αποτελέσματα Αναζήτησης
 DocType: Room,Room Number,Αριθμός δωματίου
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 DocType: Journal Entry Account,Payroll Entry,Εισαγωγή μισθοδοσίας
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Προβολή εγγραφών αμοιβών
@@ -2941,7 +2957,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Lab Test Sample,Lab Test Sample,Δοκιμαστικό δείγμα εργαστηρίου
 DocType: Item Variant Settings,Allow Rename Attribute Value,Επιτρέψτε τη μετονομασία της τιμής του χαρακτηριστικού
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Restaurant,Invoice Series Prefix,Πρόθεμα σειράς τιμολογίων
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
@@ -2949,8 +2965,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Η ενοποίηση των Χαρτών Google δεν είναι ενεργοποιημένη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
+DocType: Subscription,Trialling,Δοκιμάζοντας
 DocType: Member,Membership Expiry Date,Ημερομηνία λήξης μέλους
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} πρέπει να είναι αρνητική στο έγγραφο επιστροφή
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} πρέπει να είναι αρνητική στο έγγραφο επιστροφή
 ,Minutes to First Response for Issues,Λεπτά για να First Response για θέματα
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
@@ -2969,7 +2986,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Μονάδα μέτρησης
 DocType: Fiscal Year,Year End Date,Ημερομηνία λήξης έτους
 DocType: Task Depends On,Task Depends On,Εργασία Εξαρτάται από
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Ευκαιρία
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Ευκαιρία
 DocType: Operation,Default Workstation,Προεπιλογμένος σταθμός εργασίας
 DocType: Notification Control,Expense Claim Approved Message,Μήνυμα έγκρισης αξίωσης δαπανών
 DocType: Payment Entry,Deductions or Loss,Μειώσεις ή Ζημία
@@ -3007,7 +3024,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Άδειας άνευ αποδοχών δεν ταιριάζει με τα εγκεκριμένα αρχεία Αφήστε Εφαρμογή
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Δημιούργησε τιμολόγιο
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Εναπομείναν ποσό
@@ -3016,7 +3033,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Ο γραμμικός κώδικας {0} δεν είναι έγκυρος κώδικας {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,στο τέλος του έτους
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Ποσοστό / Μόλυβδος%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Driver,Driver,Οδηγός
 DocType: Vital Signs,Nutrition Values,Τιμές Διατροφής
 DocType: Lab Test Template,Is billable,Είναι χρεώσιμο
@@ -3027,7 +3044,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Πραγματική Ημερομηνία Έναρξης (μέσω Ώρα Φύλλο)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Eύρος γήρανσης 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Το συνολικό ποσό προκαταβολής δεν μπορεί να είναι μεγαλύτερο από το συνολικό απαιτούμενο ποσό
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Το συνολικό ποσό προκαταβολής δεν μπορεί να είναι μεγαλύτερο από το συνολικό απαιτούμενο ποσό
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3082,7 +3099,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Επιλέξτε Τιμές Χαρακτηριστικών
 DocType: Purchase Invoice,Reason For Issuing document,Λόγος για το έγγραφο έκδοσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Επόμενο Επικοινωνία Με το να μην μπορεί να είναι ίδιο με το Lead Διεύθυνση E-mail
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
@@ -3099,7 +3116,8 @@
 DocType: Warranty Claim,Service Address,Διεύθυνση υπηρεσίας
 DocType: Asset Maintenance Task,Calibration,Βαθμονόμηση
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} είναι μια εορταστική περίοδος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Έπιπλα και φωτιστικών
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Αφήστε την ειδοποίηση κατάστασης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Έπιπλα και φωτιστικών
 DocType: Item,Manufacture,Παραγωγή
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Εγκαταστήστε την εταιρεία
 ,Lab Test Report,Αναφορά δοκιμών εργαστηρίου
@@ -3115,7 +3133,6 @@
 DocType: Crop,Planting Area,Περιοχή φύτευσης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Αυτό θα μπορούσε να οφείλεται σε ορισμένες μη έγκυρες διευθύνσεις ηλεκτρονικού ταχυδρομείου στο
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Προσθέσατε
 DocType: Purchase Taxes and Charges,Parenttype,Γονικός τύπος
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,εκπαίδευση Αποτέλεσμα
@@ -3125,16 +3142,17 @@
 DocType: Products Settings,Products per Page,Προϊόντα ανά σελίδα
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Αναφορά Θέματος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Έξοδα κοινής ωφέλειας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Έξοδα κοινής ωφέλειας
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Παραπάνω
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Σειρά # {0}: Εφημερίδα Έναρξη {1} δεν έχει λογαριασμό {2} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
 DocType: Supplier Scorecard Criteria,Criteria Weight,Κριτήρια Βάρος
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Αφήστε την ειδοποίηση έγκρισης
 DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Μισθός Slip Βάσει Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ποσοστό αγοράς
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Ποσοστό αγοράς
 DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 DocType: Payment Entry,Payment Type,Τύπος πληρωμής
@@ -3156,6 +3174,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ρυθμίσεις καλαθιού αγορών
 DocType: Journal Entry,Accounting Entries,Λογιστικές εγγραφές
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Αν επιλεγεί ο Κανόνας τιμολόγησης για το &#39;Rate&#39;, θα αντικατασταθεί η Τιμοκατάλογος. Τιμολόγηση Η τιμή του κανόνα είναι ο τελικός ρυθμός, οπότε δεν πρέπει να εφαρμοστεί περαιτέρω έκπτωση. Ως εκ τούτου, σε συναλλαγές όπως η εντολή πώλησης, η εντολή αγοράς κτλ., Θα μεταφερθεί στο πεδίο &#39;Τιμή&#39; αντί για &#39;Τιμοκατάλογος&#39;."
+DocType: Journal Entry,Paid Loan,Καταβεβλημένο δάνειο
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Διπλότυπη καταχώρηση. Παρακαλώ ελέγξτε τον κανόνα εξουσιοδότησης {0}
 DocType: Journal Entry Account,Reference Due Date,Ημερομηνία λήξης αναφοράς
 DocType: Purchase Order,Ref SQ,Ref sq
@@ -3172,7 +3191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Μισθολόγιο
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
 DocType: Patient Service Unit,Parent Service Unit,Μονάδα μητρικής υπηρεσίας
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Κάντε χρήστη
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
@@ -3190,7 +3209,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Λογαριασμός εσόδων
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Παράδοση
 DocType: Volunteer,Weekdays,Εργάσιμες
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: Restaurant Menu,Restaurant Menu,Εστιατόριο μενού
@@ -3198,7 +3217,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος για διαρκή απογραφή
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος για διαρκή απογραφή
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου επισκόπησης
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage είναι πλήρης, δεν έσωσε"
@@ -3206,10 +3225,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Χωρητικότητα δωματίου
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Υπάρχει ήδη η εγγραφή για το στοιχείο {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Αναφορά
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Θα χάσετε τα αρχεία των τιμολογίων που δημιουργήσατε προηγουμένως. Είστε βέβαιοι ότι θέλετε να κάνετε επανεκκίνηση αυτής της συνδρομής;
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Τέλος εγγραφής
 DocType: Budget,Cost Center,Κέντρο κόστους
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Αποδεικτικό #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Αποδεικτικό #
 DocType: Notification Control,Purchase Order Message,Μήνυμα παραγγελίας αγοράς
 DocType: Tax Rule,Shipping Country,Αποστολές Χώρα
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Απόκρυψη ΑΦΜ του πελάτη από συναλλαγές Πωλήσεις
@@ -3218,20 +3238,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω καταχώρησης αποθέματος / σημειώματος παράδοσης / αποδεικτικού παραλαβής αγοράς
 DocType: Employee Education,Class / Percentage,Κλάση / ποσοστό
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Φόρος εισοδήματος
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Πηγαίνετε στο Letterheads
+DocType: Subscription,Cancel At End Of Period,Ακύρωση στο τέλος της περιόδου
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Δεν έχουν επιλεγεί στοιχεία για μεταφορά
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Δεν έχουν επιλεγεί στοιχεία για μεταφορά
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
 DocType: Vehicle,Electric,Ηλεκτρικός
-DocType: Task,% Progress,Πρόοδος%
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
+DocType: Task,% Progress,Πρόοδος %
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Μόνο ο αιτών φοιτητής με την κατάσταση &quot;Εγκρίθηκε&quot; θα επιλεγεί στον παρακάτω πίνακα.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Ο αριθμός λογαριασμού για λογαριασμό {0} δεν είναι διαθέσιμος. <br> Ρυθμίστε σωστά το Λογαριασμό σας.
 DocType: Task,Depends on Tasks,Εξαρτάται από Εργασίες
@@ -3246,6 +3267,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Όχι στο Χρηματιστήριο
 DocType: Volunteer,Volunteer Skills,Εθελοντικές δεξιότητες
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
+DocType: Bank Guarantee,Reference Document Name,Όνομα εγγράφου αναφοράς
 DocType: Purchase Invoice,Taxes and Charges Deducted,Φόροι και επιβαρύνσεις που παρακρατήθηκαν
 apps/erpnext/erpnext/hooks.py +142,Issues,Θέματα
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Η κατάσταση πρέπει να είναι ένα από τα {0}
@@ -3259,7 +3281,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 DocType: Sales Invoice,SINV-RET-,SINV-αναδρομική έναρξη
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Πολύ Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Πολύ Μεγάλο
+DocType: Loan,Loan Application,Αίτηση για δάνειο
 DocType: Crop,Scientific Name,Επιστημονικό όνομα
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Σύνολο Φύλλα
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Επαναφέρετε την επιλογή, εάν η επιλεγμένη επαφή έχει τροποποιηθεί μετά την αποθήκευση"
@@ -3268,13 +3291,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Αριθμός επιταγής
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Τοπικός
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Χρεώστες
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Μεγάλο
 DocType: Homepage Featured Product,Homepage Featured Product,Αρχική σελίδα Προτεινόμενο Προϊόν
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Όλες οι Ομάδες Αξιολόγησης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Όλες οι Ομάδες Αξιολόγησης
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Νέα Αποθήκη Όνομα
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Σύνολο {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Περιοχή
@@ -3295,9 +3318,10 @@
 DocType: Fees,Fees,Αμοιβές
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Καθορίστε την ισοτιμία να μετατραπεί ένα νόμισμα σε ένα άλλο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Sales Partner,Targets,Στόχοι
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Καταχωρίστε τον αριθμό SIREN στο αρχείο πληροφοριών της εταιρείας
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Price List,Price List Master,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: GST Account,CESS Account,Λογαριασμός CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
@@ -3306,6 +3330,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Επιλέξτε Ασθενή
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Όνομα παραμέτρου
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Αφήστε Εφαρμογές με την ιδιότητα μόνο «Εγκρίθηκε» και «Απορρίπτεται» μπορούν να υποβληθούν
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Ομάδα Φοιτητών Όνομα είναι υποχρεωτικό στη σειρά {0}
 DocType: Homepage,Products to be shown on website homepage,Προϊόντα που πρέπει να αναγράφονται στην ιστοσελίδα του
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
@@ -3350,14 +3375,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Τιμολόγιο που έχει ήδη δημιουργηθεί για όλες τις ώρες χρέωσης
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error Όνομα: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Είναι το κόστος χρηματοδότησης
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ορίστε τον προεπιλεγμένο πελάτη στις Ρυθμίσεις εστιατορίου
 ,Salary Register,μισθός Εγγραφή
 DocType: Warehouse,Parent Warehouse,μητρική Αποθήκη
-DocType: C-Form Invoice Detail,Net Total,Καθαρό σύνολο
+DocType: Subscription,Net Total,Καθαρό σύνολο
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Το προεπιλεγμένο BOM δεν βρέθηκε για τα στοιχεία {0} και Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Ορίστε διάφορους τύπους δανείων
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Ορίστε διάφορους τύπους δανείων
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Οφειλόμενο ποσό
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Χρόνος (σε λεπτά)
@@ -3389,11 +3414,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
 DocType: Drug Prescription,Drug Prescription,Φαρμακευτική συνταγή
 DocType: Fees,FEE.,ΤΕΛΗ.
-DocType: Employee Loan,Repaid/Closed,Αποπληρωθεί / Έκλεισε
+DocType: Loan,Repaid/Closed,Αποπληρωθεί / Έκλεισε
 DocType: Item,Total Projected Qty,Συνολικές προβλεπόμενες Ποσότητα
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ο συντελεστής αποτίμησης δεν βρέθηκε για το Στοιχείο {0}, το οποίο απαιτείται για τη διενέργεια λογιστικών εγγραφών για {1} {2}. Αν το στοιχείο πραγματοποιεί συναλλαγές ως στοιχείο μηδενικού επιτοκίου αποτίμησης στην {1}, παρακαλούμε αναφέρατε ότι στον πίνακα {1} Στοιχείο. Διαφορετικά, δημιουργήστε μια εισερχόμενη συναλλαγή μετοχών για το στοιχείο ή αναφερθείτε στην τιμή αποτίμησης στο αρχείο στοιχείων και, στη συνέχεια, δοκιμάστε να υποβάλετε / ακυρώσετε αυτήν την καταχώριση"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία Series για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Κωδικός Μαθήματος
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 DocType: POS Settings,Use POS in Offline Mode,Χρησιμοποιήστε το POS στη λειτουργία χωρίς σύνδεση
@@ -3413,16 +3437,15 @@
 DocType: Purchase Invoice,Deemed Export,Θεωρείται Εξαγωγή
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Το ποσοστό έκπτωσης μπορεί να εφαρμοστεί είτε ανά τιμοκατάλογο ή για όλους τους τιμοκαταλόγους
-DocType: Subscription,Half-yearly,Εξαμηνιαία
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Lab Test,LabTest Approver,Έλεγχος LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Έχετε ήδη αξιολογήσει τα κριτήρια αξιολόγησης {}.
 DocType: Vehicle Service,Engine Oil,Λάδι μηχανής
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Δημιουργούνται εντολές εργασίας: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Δημιουργούνται εντολές εργασίας: {0}
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
-DocType: Employee Loan,Loan Details,Λεπτομέρειες δανείου
+DocType: Loan,Loan Details,Λεπτομέρειες δανείου
 DocType: Company,Default Inventory Account,Προεπιλεγμένος λογαριασμός αποθέματος
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Οι αριθμοί των φύλλων δεν ταιριάζουν
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
@@ -3434,19 +3457,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Ένας σύνδεσμος με όλες τις μονάδες γης στις οποίες αναπτύσσεται η καλλιέργεια
 DocType: Account,Root Type,Τύπος ρίζας
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Σειρά # {0}: Δεν μπορεί να επιστρέψει πάνω από {1} για τη θέση {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Σειρά # {0}: Δεν μπορεί να επιστρέψει πάνω από {1} για τη θέση {2}
 DocType: Item Group,Show this slideshow at the top of the page,Εμφάνιση αυτής της παρουσίασης στην κορυφή της σελίδας
 DocType: BOM,Item UOM,Μ.Μ. Είδους
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Ποσό Φόρου Μετά Ποσό έκπτωσης (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Cheque Print Template,Primary Settings,πρωτοβάθμια Ρυθμίσεις
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε Διεύθυνση Προμηθευτή
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Προσθέστε Υπαλλήλους
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Προσθέστε Υπαλλήλους
 DocType: Purchase Invoice Item,Quality Inspection,Επιθεώρηση ποιότητας
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,πρότυπο πρότυπο
 DocType: Training Event,Theory,Θεωρία
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 DocType: Payment Request,Mute Email,Σίγαση Email
@@ -3466,11 +3489,10 @@
 DocType: SMS Log,No of Sent SMS,Αρ. Απεσταλμένων SMS
 DocType: Antibiotic,Healthcare Administrator,Διαχειριστής Υγειονομικής περίθαλψης
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Ορίστε έναν στόχο
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
 DocType: Dosage Strength,Dosage Strength,Δοσομετρική αντοχή
 DocType: Account,Expense Account,Λογαριασμός δαπανών
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Λογισμικό
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Χρώμα
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Χρώμα
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Κριτήρια Σχεδίου Αξιολόγησης
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Η ημερομηνία λήξης είναι υποχρεωτική για το επιλεγμένο στοιχείο
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Αποτροπή παραγγελιών αγοράς
@@ -3483,18 +3505,18 @@
 DocType: Patient,Personal and Social History,Προσωπική και κοινωνική ιστορία
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Ο χρήστης {0} δημιουργήθηκε
 DocType: Fee Schedule,Fee Breakup for each student,Διάρθρωση τέλους για κάθε φοιτητή
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Αλλαγή κωδικού
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Ντίζελ
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
 DocType: Purchase Invoice,Availed ITC Cess,Επωφεληθεί ITC Cess
 ,Student Monthly Attendance Sheet,Φοιτητής Φύλλο Μηνιαία Συμμετοχή
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Κανονισμός αποστολής ισχύει μόνο για την πώληση
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Ημερομηνία έναρξης του έργου
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Μέχρι
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Μέχρι
 DocType: Rename Tool,Rename Log,Αρχείο καταγραφής μετονομασίας
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Το πρόγραμμα σπουδών ή το πρόγραμμα σπουδών είναι υποχρεωτικό
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Διατηρήστε Ώρες χρέωσης και Ώρες Λειτουργίας ίδιο σε Timesheet
@@ -3514,7 +3536,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Καταγράψτε τα προϊόντα ή τις υπηρεσίες σας που αγοράζετε ή πουλάτε.
 DocType: Water Analysis,Storage Temperature,Θερμοκρασία αποθήκευσης
 DocType: Employee Attendance Tool,Unmarked Attendance,Χωρίς διακριτικά Συμμετοχή
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Ερευνητής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Ερευνητής
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Πρόγραμμα Εγγραφή Εργαλείο Φοιτητών
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Η ημερομηνία έναρξης θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης της εργασίας {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Όνομα ή Email είναι υποχρεωτικό
@@ -3527,7 +3549,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} διαθέτει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτών και οι RFQ σε αυτόν τον προμηθευτή θα πρέπει να εκδίδονται με προσοχή.
 DocType: Chapter,Non Profit Manager,Μη κερδοσκοπικός διευθυντής
 DocType: BOM,Total Cost(Company Currency),Συνολικό Κόστος (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Ο σειριακός αριθμός {0} δημιουργήθηκε
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Ο σειριακός αριθμός {0} δημιουργήθηκε
 DocType: Homepage,Company Description for website homepage,Περιγραφή Εταιρείας για την ιστοσελίδα αρχική σελίδα
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Για την εξυπηρέτηση των πελατών, οι κωδικοί αυτοί μπορούν να χρησιμοποιηθούν σε μορφές εκτύπωσης, όπως τιμολόγια και δελτία παράδοσης"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Όνομα suplier
@@ -3537,11 +3559,10 @@
 DocType: Employee,You can enter any date manually,Μπορείτε να εισάγετε οποιαδήποτε ημερομηνία με το χέρι
 DocType: Healthcare Settings,Result Printed,Αποτέλεσμα εκτυπωμένο
 DocType: Asset Category Account,Depreciation Expense Account,Ο λογαριασμός Αποσβέσεις
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Δοκιμαστική περίοδος
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Προβολή {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Δοκιμαστική περίοδος
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Project,Total Costing Amount (via Timesheets),Συνολικό ποσό κοστολόγησης (μέσω Timesheets)
-DocType: Employee Advance,Expense Approver,Υπεύθυνος έγκρισης δαπανών
+DocType: Department,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 DocType: Project,Hourly,Ωριαίος
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Μη-ομάδα σε ομάδα
@@ -3550,7 +3571,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Έως ημερομηνία και ώρα
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Κάντε Πληρωμή μέσω Εφημερίδα Έναρξη
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Τυπώθηκε σε
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Τυπώθηκε σε
 DocType: Item,Inspection Required before Delivery,Επιθεώρησης Απαιτούμενη πριν από την παράδοση
 DocType: Item,Inspection Required before Purchase,Επιθεώρησης Απαιτούμενη πριν από την αγορά
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Εν αναμονή Δραστηριότητες
@@ -3560,7 +3581,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Ο οργανισμός σας
 DocType: Fee Component,Fees Category,τέλη Κατηγορία
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ποσό
 DocType: Supplier Scorecard,Notify Employee,Ειδοποιήστε τον υπάλληλο
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
@@ -3570,7 +3591,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Company,Chart Of Accounts Template,Διάγραμμα του προτύπου Λογαριασμών
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Είδους Τιμή ενημερωθεί για {0} στον κατάλογο τιμή {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Είδους Τιμή ενημερωθεί για {0} στον κατάλογο τιμή {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Purchase Invoice Item,Accepted Warehouse,Έγκυρη Αποθήκη
@@ -3578,10 +3599,11 @@
 DocType: Item,Valuation Method,Μέθοδος αποτίμησης
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Μισή Μέρα
 DocType: Sales Invoice,Sales Team,Ομάδα πωλήσεων
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Διπλότυπη καταχώρηση.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Διπλότυπη καταχώρηση.
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Καταχωρίστε το όνομα του Δικαιούχου πριν από την υποβολή.
 DocType: Program Enrollment Tool,Get Students,Πάρτε Φοιτητές
 DocType: Serial No,Under Warranty,Στα πλαίσια της εγγύησης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Σφάλμα]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Σφάλμα]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία πώλησης.
 ,Employee Birthday,Γενέθλια υπαλλήλων
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Παρακαλούμε επιλέξτε Ημερομηνία ολοκλήρωσης για την ολοκλήρωση της επισκευής
@@ -3600,7 +3622,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Προορίζεται για υποσύνολο
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
 DocType: Shopping Cart Settings,Orders,Παραγγελίες
-DocType: Employee Leave Approver,Leave Approver,Υπεύθυνος έγκρισης άδειας
+DocType: Department,Leave Approver,Υπεύθυνος έγκρισης άδειας
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Επιλέξτε μια παρτίδα
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Όνομα ομάδας αξιολόγησης
@@ -3644,7 +3666,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Στοιχείο παρακολούθησης διαύλου
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ΠΡΩΤΟΤΥΠΟ ΓΙΑ ΔΙΚΑΙΟΥΧΟ
 DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου δημιουργείται αυτόματα
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
 DocType: Program Enrollment,Boarding Student,Επιβιβαζόμενος φοιτητής
 DocType: Asset,Expected Value After Useful Life,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή
@@ -3669,21 +3690,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Συμμετοχή Εγγραφή {0} υπάρχει κατά Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Οι αποσβέσεις Αποκλεισμός λόγω πώλησης των περιουσιακών στοιχείων
-DocType: Member,Member,Μέλος
+DocType: Loan,Member,Μέλος
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Work Order Item,Work Order Item,Στοιχείο παραγγελίας εργασίας
 DocType: Pricing Rule,Item Code,Κωδικός είδους
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Διευθυντής Γεωργίας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
 DocType: Supplier Scorecard Period,Variables,Μεταβλητές
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Κλείσιμο (dr)
 DocType: Cheque Print Template,Cheque Size,Επιταγή Μέγεθος
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Φορολογικό πρότυπο για συναλλαγές πώλησης.
 DocType: Sales Invoice,Write Off Outstanding Amount,Διαγραφή οφειλόμενου ποσού
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Ο λογαριασμός {0} δεν αντιστοιχεί στην εταιρεία {1}
@@ -3691,7 +3712,6 @@
 DocType: Stock Settings,Default Stock UOM,Προεπιλεγμένη Μ.Μ. Αποθέματος
 DocType: Asset,Number of Depreciations Booked,Αριθμός Αποσβέσεις κράτηση
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Ποσότητα Σύνολο
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Ενάντια Εργαζόμενος Δάνειο: {0}
 DocType: Landed Cost Item,Receipt Document,έγγραφο παραλαβής
 DocType: Employee Education,School/University,Σχολείο / πανεπιστήμιο
 DocType: Payment Request,Reference Details,Λεπτομέρειες αναφοράς
@@ -3702,7 +3722,7 @@
 DocType: Asset,Double Declining Balance,Διπλά φθίνοντος υπολοίπου
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Κλειστά ώστε να μην μπορεί να ακυρωθεί. Ανοίγω για να ακυρώσετε.
 DocType: Student Guardian,Father,Πατέρας
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
 DocType: Attendance,On Leave,Σε ΑΔΕΙΑ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Λήψη ενημερώσεων
@@ -3716,10 +3736,10 @@
 DocType: Lead,Lower Income,Χαμηλότερο εισόδημα
 DocType: Restaurant Order Entry,Current Order,Τρέχουσα διαταγή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Μεταβείτε στα Προγράμματα
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Η σειρά {0} # Το κατανεμημένο ποσό {1} δεν μπορεί να είναι μεγαλύτερο από το ποσό που δεν ζητήθηκε {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Η σειρά {0} # Το κατανεμημένο ποσό {1} δεν μπορεί να είναι μεγαλύτερο από το ποσό που δεν ζητήθηκε {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
@@ -3742,7 +3762,6 @@
 DocType: Payment Terms Template,Payment Terms,Οροι πληρωμής
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Λεπτό
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
 DocType: Chapter,Meetup Embed HTML,Meetup Ενσωμάτωση HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Πηγαίνετε στους προμηθευτές
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Ορίστε το αναγνωριστικό ηλεκτρονικού ταχυδρομείου για τον σπουδαστή για να στείλετε το αίτημα πληρωμής
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Ορίστε το αναγνωριστικό ηλεκτρονικού ταχυδρομείου για τον σπουδαστή για να στείλετε το αίτημα πληρωμής
 DocType: Patient,Medical History,Ιατρικό ιστορικό
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
 DocType: Patient,Patient ID,Αναγνωριστικό ασθενούς
 DocType: Physician Schedule,Schedule Name,Όνομα προγράμματος
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Δημιούργησε βεβαίωση αποδοχών
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Προσθήκη όλων των προμηθευτών
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Προσθήκη όλων των προμηθευτών
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Σειρά # {0}: Το κατανεμημένο ποσό δεν μπορεί να είναι μεγαλύτερο από το οφειλόμενο ποσό.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Αναζήτηση BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Εξασφαλισμένα δάνεια
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Εξασφαλισμένα δάνεια
 DocType: Purchase Invoice,Edit Posting Date and Time,Επεξεργασία δημοσίευσης Ημερομηνία και ώρα
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Παρακαλούμε να ορίσετε τους σχετικούς λογαριασμούς Αποσβέσεις στο Asset Κατηγορία {0} ή της Εταιρείας {1}
 DocType: Lab Test Groups,Normal Range,Φυσιολογικό εύρος
 DocType: Academic Term,Academic Year,Ακαδημαϊκό Έτος
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Διαθέσιμη πώληση
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,Ν
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Παραμένων
 DocType: Appraisal,Appraisal,Εκτίμηση
+DocType: Loan,Loan Account,Λογαριασμός δανείου
 DocType: Purchase Invoice,GST Details,Λεπτομέρειες GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email αποσταλεί στον προμηθευτή {0}
 DocType: Item,Default Sales Unit of Measure,Μονάδα προεπιλεγμένων πωλήσεων του μέτρου
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Ακαδημαϊκό έτος:
+DocType: Subscription,Past Due Date,Ημερομηνία Προθεσμίας
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Δεν επιτρέπεται να ορίσετε εναλλακτικό στοιχείο για το στοιχείο {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Η ημερομηνία επαναλαμβάνεται
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,Αναμονή ασθενούς
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Ο εγκρίνων ρόλος δεν μπορεί να είναι ίδιος με το ρόλο στον οποίο κανόνας πρέπει να εφαρμόζεται
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Κατάργηση εγγραφής από αυτό το email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Αποκτήστε προμηθευτές από
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Αποκτήστε προμηθευτές από
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},Δεν βρέθηκε {0} για το στοιχείο {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Μεταβείτε στα Μαθήματα
 DocType: Accounts Settings,Show Inclusive Tax In Print,Εμφάνιση αποκλειστικού φόρου στην εκτύπωση
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Το μήνυμα εστάλη
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Ο λογαριασμός με κόμβους παιδί δεν μπορεί να οριστεί ως καθολικό
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
 DocType: Physician,Physician Schedules,Πρόγραμμα γιατρού
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Το συνολικό ποσό προκαταβολής δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό που έχει επιβληθεί
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Το συνολικό ποσό προκαταβολής δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό που έχει επιβληθεί
 DocType: Salary Slip,Hour Rate,Χρέωση ανά ώρα
 DocType: Stock Settings,Item Naming By,Ονομασία είδους κατά
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
 DocType: BOM,Inspection Required,Απαιτείται έλεγχος
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Καταχωρίστε τον αριθμό τραπεζικής εγγύησης πριν από την υποβολή.
 DocType: Driving License Category,Class,Τάξη
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Η εντολή εργασίας δεν μπορεί να προβληθεί εναντίον ενός προτύπου στοιχείου
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Assessment Plan,Program,Πρόγραμμα
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Serial No,Is Cancelled,Είναι ακυρωμένο
 DocType: Student Group,Group Based On,Ομάδα με βάση
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
@@ -3847,9 +3869,10 @@
 DocType: Cheque Print Template,Cheque Height,Επιταγή Ύψος
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
 DocType: Setup Progress,Setup Progress,Πρόοδος εγκατάστασης
+DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 DocType: Hub Settings,Publish Items to Hub,Δημοσιεύστε είδη στο hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Η ΄από τιμή' πρέπει να είναι μικρότερη από την 'έως τιμή' στη γραμμή {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Τραπεζικό έμβασμα
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Ελεγξε τα ολα
 ,Issued Items Against Work Order,Εκδίδονται αντικείμενα κατά της εντολής εργασίας
 DocType: Vehicle Log,Invoice Ref,τιμολόγιο Ref
@@ -3880,12 +3903,11 @@
 DocType: Customs Tariff Number,Tariff Number,Αριθμός Δασμολογική
 DocType: Work Order Item,Available Qty at WIP Warehouse,Διαθέσιμος αριθμός στο WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Προβλεπόμενη
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
 DocType: Notification Control,Quotation Message,Μήνυμα προσφοράς
-DocType: Employee Loan,Employee Loan Application,Αίτηση Δανείου εργαζόμενο
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Παρακαλώ αποθηκεύστε πρώτα τον ασθενή
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Παρακαλώ αποθηκεύστε πρώτα τον ασθενή
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Η φοίτηση έχει επισημανθεί με επιτυχία.
 DocType: Program Enrollment,Public Transport,Δημόσια συγκοινωνία
 DocType: Soil Texture,Silt Composition (%),Σύνθεση Silt (%)
@@ -3903,7 +3925,7 @@
 ,Item Balance (Simple),Υπόλοιπο στοιχείου (απλό)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
 DocType: POS Profile,Write Off Account,Διαγραφή λογαριασμού
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Χρεωστική Σημείωση Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Χρεωστική Σημείωση Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
@@ -3926,6 +3948,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
 DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
 DocType: Assessment Plan,Assessment Plan,σχέδιο αξιολόγησης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Αντίστροφη εγγραφή ημερολογίου
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Ο πελάτης {0} δημιουργείται.
 DocType: Stock Settings,Limit Percent,όριο Ποσοστό
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Επί του παρόντος δεν υπάρχει διαθέσιμο απόθεμα σε καμία αποθήκη
@@ -3939,14 +3962,15 @@
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Payment Entry,Payment References,Αναφορές πληρωμής
 DocType: C-Form,C-FORM-,C-διατυ-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Ο αριθμός των διαστημάτων για το διάστημα διαστήματος, π.χ. εάν το διάστημα είναι &quot;ημέρες&quot; και ο αριθμός χρεώσεων είναι 3, τα τιμολόγια θα δημιουργούνται κάθε 3 ημέρες"
 DocType: Vehicle,Insurance Details,ασφάλιση Λεπτομέρειες
 DocType: Account,Payable,Πληρωτέος
 DocType: Share Balance,Share Type,Τύπος Μετοχής
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Οφειλέτες ({0})
 DocType: Pricing Rule,Margin,Περιθώριο
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι πελάτες
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Μικτό κέρδος (%)
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι Πελάτες
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Μικτό κέρδος (%)
 DocType: Appraisal Goal,Weightage (%),Ζύγισμα (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Αλλάξτε το προφίλ POS
 DocType: Bank Reconciliation Detail,Clearance Date,Ημερομηνία εκκαθάρισης
@@ -3956,10 +3980,11 @@
 DocType: Lead,Address Desc,Περιγραφή διεύθυνσης
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Κόμμα είναι υποχρεωτική
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Σειρές με διπλές ημερομηνίες λήξης σε άλλες σειρές βρέθηκαν: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Σειρές με διπλές ημερομηνίες λήξης σε άλλες σειρές βρέθηκαν: {list}
 DocType: Topic,Topic Name,θέμα Όνομα
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Ρυθμίστε το προεπιλεγμένο πρότυπο για την ειδοποίηση για την απουσία έγκρισης στις ρυθμίσεις HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις επιλογές πωλήση - αγορά
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Επιλέξτε έναν υπάλληλο για να προχωρήσει ο εργαζόμενος.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Επιλέξτε έναν υπάλληλο για να προχωρήσει ο εργαζόμενος.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Επιλέξτε μια έγκυρη ημερομηνία
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Επιλέξτε τη φύση της επιχείρησής σας.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3978,7 +4003,7 @@
 DocType: Asset Movement,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Λογαριασμός μετοχών
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Το τιμολόγιο πωλήσεων {0} δημιουργήθηκε
 DocType: Employee,Confirmation Date,Ημερομηνία επιβεβαίωσης
 DocType: C-Form,Total Invoiced Amount,Συνολικό ποσό που τιμολογήθηκε
@@ -3987,7 +4012,7 @@
 DocType: Account,Accumulated Depreciation,Συσσωρευμένες αποσβέσεις
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Μόνιμο όνομα
 DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
-DocType: Employee Loan Application,Required by Date,Απαιτείται από την Ημερομηνία
+DocType: Loan Application,Required by Date,Απαιτείται από την Ημερομηνία
 DocType: Lead,Lead Owner,Ιδιοκτήτης επαφής
 DocType: Production Plan,Sales Orders Detail,Λεπτομέρειες για τις παραγγελίες πωλήσεων
 DocType: Bin,Requested Quantity,ζήτησε Ποσότητα
@@ -4000,10 +4025,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Μεικτές Αποδοχές - Σύνολο Έκπτωση - Αποπληρωμή δανείου
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Μισθός ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Πολλαπλές παραλλαγές
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Παραδόθηκαν
+DocType: Subscription,Trial Period Start Date,Ημερομηνία έναρξης δοκιμαστικής περιόδου
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Συνδεθείτε ως άλλος χρήστης.
@@ -4024,12 +4050,11 @@
 DocType: Student Guardian,Student Guardian,Guardian φοιτητής
 DocType: Member,Member Name,Ονομα μέλους
 DocType: Stock Settings,Use Naming Series,Χρησιμοποιήστε τη σειρά ονομάτων
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,στη συνδρομή
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 DocType: Membership,Payment Details,Οι λεπτομέρειες πληρωμής
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Τιμή Λ.Υ.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Δεν είναι δυνατή η ακύρωση της Παραγγελίας Παραγγελίας, Απεγκαταστήστε την πρώτα για ακύρωση"
 DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
@@ -4049,6 +4074,7 @@
 DocType: Land Unit,Land Unit,Μονάδα γης
 ,Purchase Analytics,Ανάλυση αγοράς
 DocType: Sales Invoice Item,Delivery Note Item,Είδος δελτίου αποστολής
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Δεν υπάρχει τρέχον τιμολόγιο {0}
 DocType: Asset Maintenance Log,Task,Έργασία
 DocType: Purchase Taxes and Charges,Reference Row #,Γραμμή αναφοράς #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Ο αριθμός παρτίδας είναι απαραίτητος για το είδος {0}
@@ -4060,7 +4086,7 @@
 DocType: Company,Exchange Gain / Loss Account,Ανταλλαγή Κέρδος / Λογαριασμός Αποτελεσμάτων
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Των εργαζομένων και φοίτηση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Κοινότητα Φόρουμ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Πραγματική ποσότητα στο απόθεμα
 DocType: Homepage,"URL for ""All Products""",URL για &quot;Όλα τα προϊόντα»
@@ -4074,7 +4100,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Τυπική τιμή πώλησης
 DocType: Account,Rate at which this tax is applied,Ποσοστό με το οποίο επιβάλλεται ο φόρος αυτός
 DocType: Cash Flow Mapper,Section Name,Όνομα τμήματος
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Αναδιάταξη ποσότητας
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Αναδιάταξη ποσότητας
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Θέσεις Εργασίας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Διαγράφω
@@ -4085,9 +4111,9 @@
 DocType: Task,depends_on,εξαρτάται από
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ρυθμιζόμενη για ενημέρωση της τελευταίας τιμής σε όλους τους λογαριασμούς. Μπορεί να χρειαστούν μερικά λεπτά.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Προκαθορισμένα πρότυπα διεύθυνσης ανά χώρα
 DocType: Water Analysis,Appearance,Εμφάνιση
+DocType: HR Settings,Leave Status Notification Template,Αφήστε το πρότυπο ειδοποίησης κατάστασης
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Μέγ. Αγορά Τιμή Τιμοκατάλογος
 DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Πληροφορίες μελών.
@@ -4110,7 +4136,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Δεν επιτρέπεται. Απενεργοποιήστε το πρότυπο δοκιμής
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
 DocType: Crop Cycle,Linked Land Unit,Συνδεδεμένη Μονάδα Γης
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
@@ -4126,7 +4152,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Μεταβείτε στους χρήστες
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Μη έγκυρο GSTIN ή Enter NA για μη εγγεγραμμένο
 DocType: Training Event,Seminar,Σεμινάριο
 DocType: Program Enrollment Fee,Program Enrollment Fee,Πρόγραμμα τελών εγγραφής
@@ -4142,14 +4168,14 @@
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 DocType: Company,Create Chart Of Accounts Based On,Δημιουργία Λογιστικού Σχεδίου Based On
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Δεν είναι δυνατή η μετατροπή του σε μη ομάδα. Παιδικά καθήκοντα υπάρχουν.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
 ,Stock Ageing,Γήρανση αποθέματος
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Φοιτητής {0} υπάρχει εναντίον των φοιτητών αιτών {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Προσαρμογή στρογγυλοποίησης (νόμισμα εταιρείας)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Πρόγραμμα
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Σύνολο παραγωγής:
 DocType: Volunteer,Afternoon,Απόγευμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Cheque Print Template,Scanned Cheque,σαρωμένα Επιταγή
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
@@ -4165,7 +4191,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Το έργο {0} υπάρχει ήδη
 DocType: Medical Department,Nursing User,Χρήστης νοσηλευτικής
 DocType: Plant Analysis,Plant Analysis Criterias,Κριτήρια ανάλυσης εγκαταστάσεων
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Αρμοδιότητες
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Ο αριθμός σειράς {0} δεν ανήκει στην Παρτίδα {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Αρμοδιότητες
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Η περίοδος ισχύος αυτής της προσφοράς έχει λήξει.
 DocType: Expense Claim Account,Expense Claim Account,Λογαριασμός Εξόδων αξίωσης
 DocType: Accounts Settings,Allow Stale Exchange Rates,Να επιτρέπεται η μετατροπή σε Stale Exchange Rate
@@ -4187,11 +4214,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Κάνετε παραλλαγές
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
 DocType: Project,Total Billed Amount (via Sales Invoices),Συνολικό ποσό χρέωσης (μέσω τιμολογίων πωλήσεων)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Ποσό χρεωστικού σημειώματος
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Ποσό χρεωστικού σημειώματος
 DocType: Project Update,Not Updated,Δεν ενημερώθηκε
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Υπάρχουν ανακολουθίες μεταξύ του ποσοστού, του αριθμού των μετοχών και του ποσού που υπολογίζεται"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
 DocType: Employee Advance,Advance Account,Προκαθορισμένος λογαριασμός
 DocType: Job Offer,Job Offer Terms,Όροι προσφοράς εργασίας
@@ -4200,7 +4227,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Αυτοκίνητο
 DocType: Vehicle,Insurance Company,Ασφαλιστική εταιρεία
 DocType: Asset Category Account,Fixed Asset Account,Σταθερή Λογαριασμού Ενεργητικού
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Μεταβλητή
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Μεταβλητή
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Από το δελτίο αποστολής
 DocType: Chapter,Members,Μέλη
 DocType: Student,Student Email Address,Φοιτητής διεύθυνση ηλεκτρονικού ταχυδρομείου
@@ -4223,7 +4250,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Εκπαιδευόμενος
 DocType: Delivery Stop,Address Name,Διεύθυνση
 DocType: Stock Entry,From BOM,Από BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Διαίρεση μονάδων {0} από {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Διαίρεση μονάδων {0} από {1}
 DocType: Assessment Code,Assessment Code,Κωδικός αξιολόγηση
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
@@ -4231,25 +4258,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 DocType: Bank Reconciliation Detail,Payment Document,έγγραφο πληρωμής
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Σφάλμα κατά την αξιολόγηση του τύπου κριτηρίων
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
+DocType: Subscription,Plans,Σχέδια
 DocType: Salary Slip,Salary Structure,Μισθολόγιο
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Υλικό θέματος
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Παρουσιάστηκε σφάλμα κατά τη δημιουργία επαναλαμβανόμενων
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Υλικό θέματος
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Προσφορές
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Δεν Ομάδες Φοιτητών δημιουργήθηκε.
 DocType: Purchase Invoice Item,Serial No,Σειριακός αριθμός
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Μηνιαία επιστροφή ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Μηνιαία επιστροφή ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Σειρά # {0}: Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να γίνει πριν από την Ημερομηνία Παραγγελίας Αγοράς
 DocType: Purchase Invoice,Print Language,Εκτύπωση Γλώσσα
 DocType: Salary Slip,Total Working Hours,Σύνολο ωρών εργασίας
 DocType: Sales Invoice,Customer PO Details,Στοιχεία PO Πελατών
-DocType: Subscription,Next Schedule Date,Επόμενη ημερομηνία προγραμματισμού
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Προσωρινός λογαριασμός έναρξης
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
@@ -4277,11 +4303,11 @@
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Δεν υπάρχουν υπάλληλοι για τα προαναφερθέντα κριτήρια
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
 DocType: Hotel Settings,Default Customer,Προεπιλεγμένος πελάτης
 DocType: Assessment Plan,Supervisor Name,Όνομα Επόπτη
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Μην επιβεβαιώνετε εάν το ραντεβού δημιουργείται για την ίδια ημέρα
@@ -4305,16 +4331,16 @@
 DocType: Journal Entry Account,Employee Advance,Προώθηση εργαζομένων
 DocType: Payroll Entry,Payroll Frequency,Μισθοδοσία Συχνότητα
 DocType: Lab Test Template,Sensitivity,Ευαισθησία
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Πρώτη ύλη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Φυτά και Μηχανήματα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Φυτά και Μηχανήματα
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Καθημερινή Ρυθμίσεις Περίληψη εργασίας
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Πληκτρολογήστε Reqd by Date
 DocType: Payment Entry,Internal Transfer,εσωτερική Μεταφορά
 DocType: Asset Maintenance,Maintenance Tasks,Συνθήκες Συντήρησης
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
 DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε καθολικό
@@ -4322,13 +4348,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Ενσωμάτωση
 DocType: Crop Cycle,Detected Disease,Εντοπίστηκε ασθένεια
 ,Produced,Παράχθηκε
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Η Ημερομηνία έναρξης αποπληρωμής δεν μπορεί να γίνει πριν από την Ημερομηνία Εκταμίευσης.
 DocType: Item,Item Code for Suppliers,Κώδικας στοιχείων για Προμηθευτές
 DocType: Issue,Raised By (Email),Δημιουργήθηκε από (email)
 DocType: Training Event,Trainer Name,Όνομα εκπαιδευτής
 DocType: Mode of Payment,General,Γενικός
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Τελευταία ανακοίνωση
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
@@ -4342,7 +4369,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Ο Dr {0} σε Ημιδιατροφή αφήνει την {1}
 DocType: Production Plan,Get Material Request,Πάρτε Αίτημα Υλικό
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Ταχυδρομικές δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Ταχυδρομικές δαπάνες
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 ,Item Variant Details,Λεπτομέρειες παραλλαγής στοιχείου
@@ -4353,9 +4380,9 @@
 DocType: Drug Prescription,Hour,Ώρα
 DocType: Restaurant Order Entry,Last Sales Invoice,Τελευταίο τιμολόγιο πωλήσεων
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Παρακαλούμε επιλέξτε Qty έναντι στοιχείου {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
 DocType: Company,Monthly Sales Target,Μηνιαίο Στόχο Πωλήσεων
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Μπορεί να εγκριθεί από {0}
@@ -4363,7 +4390,7 @@
 DocType: Item,Default Material Request Type,Προεπιλογή Τύπος Υλικού Αίτηση
 DocType: Supplier Scorecard,Evaluation Period,Περίοδος αξιολόγησης
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Άγνωστος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Η εντολή εργασίας δεν δημιουργήθηκε
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Η εντολή εργασίας δεν δημιουργήθηκε
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
 DocType: Purchase Invoice,Export Type,Τύπος εξαγωγής
 DocType: Salary Slip Loan,Salary Slip Loan,Δανείου μισθοδοσίας
@@ -4379,7 +4406,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Άνοιγμα των τιμολογίων Περίληψη
 DocType: Education Settings,Education Manager,Διευθυντής Εκπαίδευσης
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Το ελάχιστο μήκος μεταξύ κάθε εγκατάστασης στο πεδίο για βέλτιστη ανάπτυξη
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Το πακέτο στοιχείου {0} δεν μπορεί να ενημερωθεί χρησιμοποιώντας τη Συμφωνία Χρηματιστηρίου, αντί να χρησιμοποιήσει την Καταχώρηση Χρημάτων"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Το πακέτο στοιχείου {0} δεν μπορεί να ενημερωθεί χρησιμοποιώντας τη Συμφωνία Χρηματιστηρίου, αντί να χρησιμοποιήσει την Καταχώρηση Χρημάτων"
 DocType: Quality Inspection,Report Date,Ημερομηνία έκθεσης
 DocType: Student,Middle Name,Μεσαίο όνομα
 DocType: C-Form,Invoices,Τιμολόγια
@@ -4410,20 +4437,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδική, υπάρχει ήδη για {0}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Daily Work Summary Group,Send Emails At,Αποστολή email τους στο
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Προβολή μορφής
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Έγκριση δαπανών Υποχρεωτική αξίωση
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Προσθέστε χρήστες στον οργανισμό σας, εκτός από τον εαυτό σας."
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Κανένας πελάτης ακόμα!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Κατάσταση ταμειακών ροών
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Δεν δημιουργήθηκε κανένα υλικό υλικό
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Άδεια
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
@@ -4446,11 +4474,12 @@
 DocType: Vehicle,Chassis No,σασί Όχι
 DocType: Payment Request,Initiated,Ξεκίνησε
 DocType: Production Plan Item,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Επιλέξτε ένα BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Επιλέξτε ένα BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Επωφελήθηκε ο ενοποιημένος φόρος ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
+DocType: Bank Guarantee,Clauses and Conditions,Ρήτρες και προϋποθέσεις
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
 DocType: Project Task,View Timesheet,Προβολή φύλλου εργασίας
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Η ημερομηνία λήξης πρέπει να είναι μεγαλύτερη από την ημερομηνία έναρξης
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Leave Allocation,New Leaves Allocated,Νέες άδειες που κατανεμήθηκαν
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
@@ -4464,9 +4493,10 @@
 DocType: Patient,Alcohol Current Use,Αλκοόλ τρέχουσα χρήση
 DocType: Student Admission Program,Student Admission Program,Πρόγραμμα Εισαγωγής Φοιτητών
 DocType: Payment Entry,Account Paid To,Καταβάλλεται στα
+DocType: Subscription Settings,Grace Period,Περίοδος χάριτος
 DocType: Item Alternative,Alternative Item Name,Εναλλακτικό όνομα στοιχείου
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Δεν ήταν δυνατή η υποβολή οποιουδήποτε φύλλου πληρωμής <br> \ Πιθανές αιτίες: <br> \ 1. Η καθαρή αμοιβή είναι μικρότερη από 0. <br> \ 2. Η διεύθυνσή ηλεκτρονικού ταχυδρομείου της εταιρείας που καθορίζεται στον κύριο υπάλληλο δεν ισχύει. <br>
@@ -4476,7 +4506,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} προϋπολογισμού για το λογαριασμό {1} από {2} {3} είναι {4}. Θα υπερβαίνει {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ποσότητα εκτός
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,και απενεργοποιημένος Απενεργοποιημένος στο
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Η σειρά είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 DocType: Student Sibling,Student ID,φοιτητής ID
@@ -4488,14 +4517,16 @@
 DocType: Complaint,Complaint,Καταγγελία
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Κάντε την καταβολή αποπληρωμής
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Όλα τα Τμήματα
 DocType: Patient,Alcohol Past Use,Χρήση αλκοόλ στο παρελθόν
 DocType: Fertilizer Content,Fertilizer Content,Περιεκτικότητα σε λιπάσματα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Προβληματική / Σπασμένη
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
 DocType: Share Transfer,Transfer,Μεταφορά
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Η εντολή εργασίας {0} πρέπει να ακυρωθεί πριν την ακύρωση αυτής της εντολής πώλησης
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
@@ -4519,10 +4550,11 @@
 DocType: Cheque Print Template,Message to show,Μήνυμα για να δείξει
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Λιανική πώληση
 DocType: Student Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Δεν είναι δυνατή η εύρεση βαθμολογίας ξεκινώντας από το {0}. Πρέπει να έχετε διαρκή βαθμολογίες που καλύπτουν από 0 έως 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
+DocType: Subscription,Current Invoice Start Date,Τρέχουσα ημερομηνία έναρξης τιμολογίου
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Είτε χρεωστικό ή πιστωτικό ποσό που απαιτείται για την {2}
 DocType: GL Entry,Remarks,Παρατηρήσεις
@@ -4532,11 +4564,13 @@
 DocType: Task,Parent Task,Γονική εργασία
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Δημιουργία Σύστασης
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Εκτύπωση και Χαρτικά
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Εκτύπωση και Χαρτικά
 DocType: Stock Settings,Show Barcode Field,Εμφάνιση Barcode πεδίο
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Αποστολή Emails Προμηθευτής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Μισθός ήδη υποβάλλονται σε επεξεργασία για χρονικό διάστημα από {0} και {1}, Αφήστε περίοδος εφαρμογής δεν μπορεί να είναι μεταξύ αυτού του εύρους ημερομηνιών."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Αποστολή Emails Προμηθευτής
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Μισθός ήδη υποβάλλονται σε επεξεργασία για χρονικό διάστημα από {0} και {1}, Αφήστε περίοδος εφαρμογής δεν μπορεί να είναι μεταξύ αυτού του εύρους ημερομηνιών."
+DocType: Fiscal Year,Auto Created,Δημιουργήθηκε αυτόματα
 DocType: Chapter Member,Leave Reason,Αφήστε τον λόγο
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Το τιμολόγιο {0} δεν υπάρχει πλέον
 DocType: Guardian Interest,Guardian Interest,Guardian Ενδιαφέροντος
 DocType: Volunteer,Availability,Διαθεσιμότητα
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Ρυθμίστε τις προεπιλεγμένες τιμές για τα τιμολόγια POS
@@ -4544,14 +4578,13 @@
 DocType: Project,Time to send,Ώρα για αποστολή
 DocType: Timesheet,Employee Detail,Λεπτομέρεια των εργαζομένων
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Όνομα ταυτότητας ηλεκτρονικού ταχυδρομείου Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,επόμενη ημέρα Ημερομηνία και Επαναλάβετε την Ημέρα του μήνα πρέπει να είναι ίση
 DocType: Lab Prescription,Test Code,Κωδικός δοκιμής
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ρυθμίσεις για την ιστοσελίδα αρχική σελίδα
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Οι RFQ δεν επιτρέπονται για {0} λόγω μίας κάρτας αποτελεσμάτων {1}
 DocType: Job Offer,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Παραπάνω
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Συνολικό ποσό {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Συνολικό ποσό {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Αναφέρετε εάν ο μη τυποποιημένος πληρωτέος λογαριασμός
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Παρακαλώ επιλέξτε την ομάδα αξιολόγησης, εκτός από τις &quot;Όλες οι ομάδες αξιολόγησης&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Σειρά {0}: Απαιτείται κέντρο κόστους για ένα στοιχείο {1}
@@ -4562,7 +4595,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Ανάλυση Νερού
 DocType: Chapter,Region,Περιοχή
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Ανανέωση συνδεδεμένης ανάλυσης
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα το 2012, 2012-13"
@@ -4578,7 +4611,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Το κόστος των αποσυρόμενων Ενεργητικού
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
 DocType: Vehicle,Policy No,Πολιτική Όχι
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 DocType: Asset,Straight Line,Ευθεία
 DocType: Project User,Project User,Ο χρήστης του έργου
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Σπλιτ
@@ -4614,21 +4647,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Μονοπάτι
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Δεν είναι δυνατή η μετατροπή του κέντρου κόστους σε καθολικό, όπως έχει κόμβους-παιδιά"
 DocType: Production Plan,Total Planned Qty,Συνολική προγραμματισμένη ποσότητα
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Αξία ανοίγματος
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Αξία ανοίγματος
 DocType: Salary Detail,Formula,Τύπος
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Σειριακός αριθμός #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Σειριακός αριθμός #
 DocType: Lab Test Template,Lab Test Template,Πρότυπο δοκιμής εργαστηρίου
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Λογαριασμός πωλήσεων
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Λογαριασμός πωλήσεων
 DocType: Purchase Invoice Item,Total Weight,Συνολικό βάρος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Προμήθεια επί των πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Προμήθεια επί των πωλήσεων
 DocType: Job Offer Term,Value / Description,Αξία / Περιγραφή
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 DocType: Purchase Order Item,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 DocType: Restaurant Order Entry,Restaurant Order Entry,Είσοδος Παραγγελίας Εστιατορίου
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
 DocType: Asset Maintenance Task,Assign To Name,Αναθέστε στο όνομα
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Δαπάνες ψυχαγωγίας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Δαπάνες ψυχαγωγίας
 DocType: Hub Settings,Enabled Users,Ενεργοποιημένοι χρήστες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Κάντε την ζήτηση Υλικό
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Ανοικτή Θέση {0}
@@ -4641,24 +4674,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Αιτήσεις για χορήγηση άδειας.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
 DocType: Vehicle,Last Carbon Check,Τελευταία Carbon Έλεγχος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Νομικές δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Νομικές δαπάνες
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Παρακαλούμε επιλέξτε ποσότητα σε σειρά
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Κάντε το άνοιγμα των τιμολογίων πωλήσεων και αγοράς
 DocType: Purchase Invoice,Posting Time,Ώρα αποστολής
 DocType: Timesheet,% Amount Billed,Ποσό που χρεώνεται%
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Δαπάνες τηλεφώνου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Δαπάνες τηλεφώνου
 DocType: Sales Partner,Logo,Λογότυπο
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Ελέγξτε αυτό, αν θέλετε να αναγκάσει τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει καμία προεπιλογή αν επιλέξετε αυτό."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
 DocType: Email Digest,Open Notifications,Ανοίξτε Ειδοποιήσεις
 DocType: Payment Entry,Difference Amount (Company Currency),Διαφορά Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Άμεσες δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Άμεσες δαπάνες
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Νέα έσοδα πελατών
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Έξοδα μετακίνησης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Προσθήκη προσαρμοσμένου πεδίου συνδρομής στο doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
 DocType: Purchase Receipt Item,Sample Quantity,Ποσότητα δείγματος
+DocType: Bank Guarantee,Name of Beneficiary,Όνομα δικαιούχου
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ενημέρωση κόστους BOM αυτόματα μέσω Scheduler, με βάση το τελευταίο ποσοστό αποτίμησης / τιμοκαταλόγου / τελευταίο ποσοστό αγοράς πρώτων υλών."
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
@@ -4670,14 +4703,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Επιτήρηση
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Εξαρτήματα μισθό
 DocType: Program Enrollment Tool,New Academic Year,Νέο Ακαδημαϊκό Έτος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 DocType: GST Settings,B2C Limit,Όριο B2C
 DocType: Work Order Item,Transferred Qty,Μεταφερόμενη ποσότητα
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Πλοήγηση
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Προγραμματισμός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Προγραμματισμός
 DocType: Share Balance,Issued,Εκδόθηκε
+DocType: Loan,Repayment Start Date,Ημερομηνία έναρξης επιστροφής
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Δραστηριότητα σπουδαστών
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID προμηθευτή
 DocType: Payment Request,Payment Gateway Details,Πληρωμή Gateway Λεπτομέρειες
@@ -4690,10 +4724,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Τύπος των φύλλων, όπως τυπική, για λόγους υγείας κλπ."
 DocType: Email Digest,Send regular summary reports via Email.,"Αποστολή τακτικών συνοπτικών εκθέσεων, μέσω email."
 DocType: Payment Entry,PE-,ΡΕ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
 DocType: Assessment Result,Student Name,ΟΝΟΜΑ ΜΑΘΗΤΗ
 DocType: Brand,Item Manager,Θέση Διευθυντή
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Μισθοδοσία Πληρωτέο
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Μισθοδοσία Πληρωτέο
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
 DocType: Plant Analysis,Collection Datetime,Ώρα συλλογής
 DocType: Work Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
@@ -4703,9 +4737,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Ο χρήστης {0} δεν υπάρχει
 DocType: Payment Term,Day(s) after invoice date,Ημέρα (ες) μετά την ημερομηνία τιμολόγησης
 DocType: Payment Schedule,Payment Schedule,ΠΡΟΓΡΑΜΜΑ ΠΛΗΡΩΜΩΝ
-DocType: Subscription,SUB-,ΥΠΟ-
 DocType: Item Attribute Value,Abbreviation,Συντομογραφία
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Έναρξη πληρωμής υπάρχει ήδη
+DocType: Subscription,Trial Period End Date,Ημερομηνία λήξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Δεν επιτρέπεται δεδομένου ότι το {0} υπερβαίνει τα όρια
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Κύρια εγγραφή προτύπου μισθολογίου.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Παθολογία
@@ -4722,9 +4756,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Προσφορές σε Συστάσεις ή Πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Όλες οι ομάδες πελατών
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Όλες οι ομάδες πελατών
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,συσσωρευμένες Μηνιαία
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
@@ -4733,14 +4767,15 @@
 DocType: Lab Prescription,Test Created,Δοκιμή δημιουργήθηκε
 DocType: Healthcare Settings,Custom Signature in Print,Προσαρμοσμένη υπογραφή στην εκτύπωση
 DocType: Account,Temporary,Προσωρινός
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Αριθμός πελάτη LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Αριθμός πελάτη LPO
 DocType: Program,Courses,μαθήματα
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Γραμματέας
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Γραμματέας
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Αν απενεργοποιήσετε, «σύμφωνα με τα λόγια« πεδίο δεν θα είναι ορατό σε κάθε συναλλαγή"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Αυτή η ενέργεια θα σταματήσει τη μελλοντική χρέωση. Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν τη συνδρομή;
 DocType: Serial No,Distinct unit of an Item,Διακριτή μονάδα ενός είδους
 DocType: Supplier Scorecard Criteria,Criteria Name,Όνομα κριτηρίου
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Ρυθμίστε την εταιρεία
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Ρυθμίστε την εταιρεία
 DocType: Pricing Rule,Buying,Αγορά
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Ασθένειες &amp; Λιπάσματα
 DocType: HR Settings,Employee Records to be created by,Εγγραφές των υπαλλήλων που πρόκειται να δημιουργηθούν από
@@ -4749,17 +4784,17 @@
 DocType: POS Profile,Apply Discount On,Εφαρμόστε έκπτωση σε
 DocType: Member,Membership Type,Τύπος μέλους
 ,Reqd By Date,Reqd Με ημερομηνία
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Πιστωτές
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Πιστωτές
 DocType: Assessment Plan,Assessment Name,Όνομα αξιολόγηση
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Εμφάνιση του PDC στην εκτύπωση
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Εμφάνιση του PDC στην εκτύπωση
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Σειρά # {0}: Αύξων αριθμός είναι υποχρεωτική
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές λεπτομέρειες για είδη
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Προσφορά εργασίας
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Ινστιτούτο Σύντμηση
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Η ποσότητα ({0}) δεν μπορεί να είναι κλάσμα στη σειρά {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Η ποσότητα ({0}) δεν μπορεί να είναι κλάσμα στη σειρά {1}
 DocType: Consultation,C-,ΝΤΟ-
 DocType: Attendance,ATT-,ΑΤΤ
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
@@ -4777,7 +4812,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Συνολική διακύμανση
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Εάν είναι ενεργοποιημένο, το σύστημα θα καταχωρεί λογιστικές εγγραφές για την απογραφή αυτόματα."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Μεσιτεία
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Η φοίτηση για εργαζόμενο {0} έχει ήδη επισημανθεί για αυτήν την ημέρα
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Η φοίτηση για εργαζόμενο {0} έχει ήδη επισημανθεί για αυτήν την ημέρα
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","Σε λεπτά 
  ενημέρωση μέσω «αρχείου καταγραφής ώρας»"
@@ -4789,6 +4824,7 @@
 DocType: Lab Test,Approved Date,Εγκεκριμένη ημερομηνία
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
+DocType: Subscriber,Subscriber Name,Όνομα συνδρομητή
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
 DocType: BOM Update Tool,Replace,Αντικατάσταση
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Δεν βρέθηκαν προϊόντα.
@@ -4798,19 +4834,18 @@
 DocType: Request for Quotation Item,Project Name,Όνομα έργου
 DocType: Customer,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Επιλέξτε το λογαριασμό εσόδων από τόκους στο δάνειο {0}
 DocType: Work Order,Required Items,Απαιτούμενα Στοιχεία
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Ανθρώπινο Δυναμικό
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας
 DocType: Disease,Treatment Task,Εργασία θεραπείας
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Φορολογικές απαιτήσεις
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Φορολογικές απαιτήσεις
 DocType: BOM Item,BOM No,Αρ. Λ.Υ.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
 DocType: Item,Moving Average,Κινητός μέσος
 DocType: BOM Update Tool,The BOM which will be replaced,Η Λ.Υ. που θα αντικατασταθεί
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ηλεκτρονικού εξοπλισμού
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ηλεκτρονικού εξοπλισμού
 DocType: Asset,Maintenance Required,Απαιτείται συντήρηση
 DocType: Account,Debit,Χρέωση
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
@@ -4819,7 +4854,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Οφειλόμενο ποσό
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ορίστε στόχους ανά ομάδα είδους για αυτόν τον πωλητή
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Πάγωμα αποθεμάτων παλαιότερα από [ημέρες]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Σειρά # {0}: Asset είναι υποχρεωτική για πάγιο περιουσιακό αγορά / πώληση
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Σειρά # {0}: Asset είναι υποχρεωτική για πάγιο περιουσιακό αγορά / πώληση
 DocType: Asset Maintenance Team,Maintenance Team Name,Όνομα ομάδας συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Αν δύο ή περισσότεροι κανόνες τιμολόγησης που βρέθηκαν με βάση τις παραπάνω προϋποθέσεις, εφαρμόζεται σειρά προτεραιότητας. Η προτεραιότητα είναι ένας αριθμός μεταξύ 0 και 20, ενώ η προεπιλεγμένη τιμή είναι μηδέν (κενό). Μεγαλύτερος αριθμός σημαίνει ότι θα υπερισχύσει εάν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με τους ίδιους όρους."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Ο Πελάτης είναι υποχρεωτικός εάν επιλέξει &#39;Περίπτωση Από&#39; ως Πελάτη
@@ -4828,19 +4863,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Επίτρεψε στους παρακάτω χρήστες να εγκρίνουν αιτήσεις αδειών για αποκλεισμένες ημέρες.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Τύποι των αιτημάτων εξόδων.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Το ποσοστό πωλήσεων για το στοιχείο {0} είναι μικρότερο από το {1} του. Το ποσοστό πώλησης πρέπει να είναι τουλάχιστον {2}
-DocType: Item,Taxes,Φόροι
+DocType: Subscription,Taxes,Φόροι
 DocType: Purchase Invoice,capital goods,κεφαλαιακά αγαθά
 DocType: Purchase Invoice Item,Weight Per Unit,Βάρος ανά μονάδα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Καταβληθεί και δεν παραδόθηκαν
 DocType: Project,Default Cost Center,Προεπιλεγμένο κέντρο κόστους
-DocType: Bank Guarantee,End Date,Ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Συναλλαγές απόθεμα
 DocType: Budget,Budget Accounts,προϋπολογισμός Λογαριασμών
 DocType: Employee,Internal Work History,Ιστορία εσωτερική εργασία
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Συσσωρευμένες Αποσβέσεις Ποσό
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Μεταβλητή του πίνακα αποτελεσμάτων του προμηθευτή
-DocType: Employee Loan,Fully Disbursed,εκταμιευθεί στο σύνολό τους
 DocType: Employee Advance,Due Advance Amount,Προκαταβολή ποσού
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
@@ -4864,7 +4897,7 @@
 ,Employee Information,Πληροφορίες υπαλλήλου
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Προεπιλεγμένα πρότυπα φόρου για τις πωλήσεις και την αγορά δημιουργούνται.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Η καταγραφή Αποτέλεσμα Αξιολόγησης {0} υπάρχει ήδη.
@@ -4872,7 +4905,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Ρυθμίστε το φίλτρο Εταιρεία κενό, εάν η ομάδα είναι &quot;Εταιρεία&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Απόσπαση ημερομηνία αυτή δεν μπορεί να είναι μελλοντική ημερομηνία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,για τη δημιουργία της επαναλαμβανόμενης
 DocType: Stock Entry,Target Warehouse Address,Διεύθυνση στόχου αποθήκης
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Περιστασιακή άδεια
 DocType: Agriculture Task,End Day,Ημέρα λήξης
@@ -4897,11 +4929,10 @@
 DocType: Material Request,% Ordered,% Παραγγέλθηκαν
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Για το Student Group, το μάθημα θα επικυρωθεί για κάθε φοιτητή από τα εγγεγραμμένα μαθήματα στην εγγραφή του προγράμματος."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Εργασία με το κομμάτι
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Μέση τιμή αγοράς
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Share Balance,From No,Από τον αριθμό
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Νέο μήνυμα από {sender}
 DocType: Customer,Customer Primary Address,Πελάτης κύριας διεύθυνσης
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Ενημερωτικά Δελτία
 DocType: Drug Prescription,Description/Strength,Περιγραφή / Αντοχή
@@ -4910,22 +4941,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Το ίδιο στοιχείο έχει εισαχθεί πολλές φορές
 DocType: Department,Leave Block List,Λίστα ημερών Άδειας
 DocType: Purchase Invoice,Tax ID,Τον αριθμό φορολογικού μητρώου
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Η στήλη πρέπει να είναι κενή
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Η στήλη πρέπει να είναι κενή
 DocType: Accounts Settings,Accounts Settings,Ρυθμίσεις λογαριασμών
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Εγκρίνω
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Μικροδιαμορφωμένη διεύθυνση για το {0}, διορθώστε για να συνεχίσετε."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Μικροδιαμορφωμένη διεύθυνση για το {0}, διορθώστε για να συνεχίσετε."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Αριθμός νέου λογαριασμού, θα συμπεριληφθεί στο όνομα λογαριασμού ως πρόθεμα"
 DocType: Maintenance Team Member,Team Member,Μέλος της ομάδας
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Δεν υπάρχει αποτέλεσμα για υποβολή
 DocType: Customer,Sales Partner and Commission,Συνεργάτης Πωλήσεων και της Επιτροπής
-DocType: Employee Loan,Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος
+DocType: Loan,Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος
 ,Project Quantity,έργο Ποσότητα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;"
 DocType: Opportunity,To Discuss,Για συζήτηση
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} για να ολοκληρώσετε τη συναλλαγή αυτή.
 DocType: Loan Type,Rate of Interest (%) Yearly,Επιτόκιο (%) Ετήσιο
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Προσωρινή Λογαριασμοί
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Μαύρος
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Προσωρινή Λογαριασμοί
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Shareholder,Contact List,Λίστα επαφών
 DocType: Account,Auditor,Ελεγκτής
@@ -4933,16 +4964,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} αντικείμενα που παράγονται
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Μάθε περισσότερα
 DocType: Cheque Print Template,Distance from top edge,Απόσταση από το άνω άκρο
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Τιμοκατάλογος {0} είναι απενεργοποιημένη ή δεν υπάρχει
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Τιμοκατάλογος {0} είναι απενεργοποιημένη ή δεν υπάρχει
 DocType: Purchase Invoice,Return,Απόδοση
 DocType: Pricing Rule,Disable,Απενεργοποίηση
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Επεξεργαστείτε ολόκληρη τη σελίδα για περισσότερες επιλογές, όπως στοιχεία ενεργητικού, σειριακά νούμερα, παρτίδες κ.λπ."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Διορισμοί και διαβουλεύσεις
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} δεν είναι εγγεγραμμένος στην παρτίδα {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Περιουσιακό στοιχείο {0} δεν μπορεί να καταργηθεί, δεδομένου ότι είναι ήδη {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Απαιτούμενοι έλεγχοι
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Απαιτούμενοι έλεγχοι
 DocType: Task,Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Απών
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Δεν ήταν δυνατή η εγκατάσταση της εταιρείας
@@ -4954,7 +4985,7 @@
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Διαχείριση στόλου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Προσθήκη στοιχείων από
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Προσθήκη στοιχείων από
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Καλλιέργειες &amp; εκτάσεις
 DocType: Cheque Print Template,Regular,Τακτικός
 DocType: Fertilizer,Density (if liquid),Πυκνότητα (εάν είναι υγρή)
@@ -4979,24 +5010,26 @@
 DocType: Payment Entry,Paid Amount,Καταβληθέν ποσό
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Εξερευνήστε τον κύκλο πωλήσεων
 DocType: Assessment Plan,Supervisor,Επόπτης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Εισαγωγή Αποθέματος Αποθήκευσης
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Εισαγωγή Αποθέματος Αποθήκευσης
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 ,Work Order Stock Report,Έκθεση αποθέματος παραγγελίας εργασίας
+DocType: Purchase Receipt,Auto Repeat Detail,Λεπτομέρειες αυτόματης επανάληψης
 DocType: Assessment Result Tool,Assessment Result Tool,Εργαλείο Αποτέλεσμα Αξιολόγησης
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Ως επόπτης
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Προτείνετε κατηγορία
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Άχρηστα Στοιχείο
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Διαχείριση ποιότητας
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Διαχείριση ποιότητας
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
 DocType: Project,Total Billable Amount (via Timesheets),Συνολικό χρεώσιμο ποσό (μέσω Timesheets)
 DocType: Agriculture Task,Previous Business Day,Προηγούμενη εργάσιμη ημέρα
-DocType: Employee Loan,Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο
+DocType: Loan,Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο
 DocType: Employee,Health Insurance No,Ασφάλεια υγείας αριθ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Πιστωτική Σημείωση Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Πιστωτική Σημείωση Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Συνολικό φορολογητέο ποσό
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 DocType: Opening Invoice Creation Tool,Purchase,Αγορά
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Ισολογισμός ποσότητας
@@ -5007,15 +5040,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} για {1}
 DocType: Healthcare Settings,Valid number of days,Έγκυος αριθμός ημερών
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Κέντρα κόστους
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Κάντε επανεκκίνηση της συνδρομής
 DocType: Land Unit,Linked Plant Analysis,Ανάλυση συνδεδεμένων εγκαταστάσεων
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα του προμηθευτή μετατρέπεται στο βασικό νόμισμα της εταιρείας
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Γραμμή #{0}: υπάρχει χρονική διένεξη με τη γραμμή {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Να επιτρέπεται η μηδενική τιμή αποτίμησης
+DocType: Bank Guarantee,Receiving,Λήψη
 DocType: Training Event Employee,Invited,Καλεσμένος
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Πολλαπλές ενεργό Δομές Μισθός βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Ρύθμιση λογαριασμών πύλη.
 DocType: Employee,Employment Type,Τύπος απασχόλησης
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Πάγια
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Πάγια
 DocType: Payment Entry,Set Exchange Gain / Loss,Ορίστε Χρηματιστήριο Κέρδος / Ζημιά
 ,GST Purchase Register,Εγγραφή αγοράς GST
 ,Cash Flow,Κατάσταση Ταμειακών Ροών
@@ -5035,9 +5070,10 @@
 DocType: Academic Term,Term Start Date,Term Ημερομηνία Έναρξης
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Κατάλογος όλων των συναλλαγών μετοχών
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Αρίθμηση Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Επισυνάπτεται #{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Πρέπει να οριστεί τόσο η ημερομηνία έναρξης της δοκιμαστικής περιόδου όσο και η ημερομηνία λήξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Μέσος όρος
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Το συνολικό ποσό πληρωμής στο Πρόγραμμα Πληρωμών πρέπει να είναι ίσο με το Μεγάλο / Στρογγυλεμένο Σύνολο
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Το συνολικό ποσό πληρωμής στο Πρόγραμμα Πληρωμών πρέπει να είναι ίσο με το Μεγάλο / Στρογγυλεμένο Σύνολο
+DocType: Subscription Plan Detail,Plan,Σχέδιο
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
 DocType: Authorization Rule,Customer / Item Name,Πελάτης / όνομα είδους
@@ -5067,6 +5103,7 @@
 DocType: Work Order,Warehouses,Αποθήκες
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} περιουσιακού στοιχείου δεν μπορεί να μεταφερθεί
 DocType: Hotel Room Pricing,Hotel Room Pricing,Τιμολόγηση δωματίου στο ξενοδοχείο
+DocType: Subscription,Days Until Due,Ημέρες μέχρι λήξης
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Αυτό το στοιχείο είναι μια παραλλαγή του {0} (πρότυπο).
 DocType: Workstation,per hour,Ανά ώρα
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Αγοραστικός
@@ -5075,13 +5112,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Για τη Ομάδα Φοιτητών που βασίζεται σε παρτίδες, η Φάκελος Φοιτητών θα επικυρωθεί για κάθε Φοιτητή από την εγγραφή του Προγράμματος."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Διανομή
+DocType: Journal Entry Account,Loan,Δάνειο
 DocType: Expense Claim Advance,Expense Claim Advance,Εκκαθάριση Αξίας εξόδων
 DocType: Lab Test,Report Preference,Προτίμηση αναφοράς
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Πληροφορίες εθελοντών.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Υπεύθυνος έργου
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Υπεύθυνος έργου
 ,Quoted Item Comparison,Εισηγμένες Στοιχείο Σύγκριση
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Επικάλυψη της βαθμολόγησης μεταξύ {0} και {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Αποστολή
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Καθαρή Αξία Ενεργητικού, όπως για"
 DocType: Crop,Produce,Παράγω
@@ -5091,7 +5129,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Κατανάλωση Υλικών για Κατασκευή
 DocType: Item Alternative,Alternative Item Code,Κωδικός εναλλακτικού στοιχείου
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
 DocType: Delivery Stop,Delivery Stop,Διακοπή παράδοσης
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
 DocType: Item,Material Issue,Υλικά Θέματος
@@ -5101,15 +5139,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
 DocType: BOM,Show Items,Εμφάνιση Είδη
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Από χρόνος δεν μπορεί να είναι μεγαλύτερη από ό, τι σε καιρό."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Θέλετε να ενημερώσετε όλους τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου;
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Θέλετε να ενημερώσετε όλους τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου;
+DocType: Subscription Plan,Billing Interval,Διάρκεια χρέωσης
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ΒΙΟΓΡΑΦΙΚΟ
 DocType: Hub Settings,Hub Username,Όνομα χρήστη Hub
 DocType: Salary Detail,Component,Συστατικό
 DocType: Assessment Criteria,Assessment Criteria Group,Κριτήρια Αξιολόγησης Ομάδα
 DocType: Healthcare Settings,Patient Name By,Όνομα ασθενούς από
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Εισαγωγή ημερολογίου εκκαθάρισης για τους μισθούς από {0} έως {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Εισαγωγή ημερολογίου εκκαθάρισης για τους μισθούς από {0} έως {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
@@ -5123,22 +5161,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
 DocType: Leave Block List,Applies to Company,Ισχύει για την εταιρεία
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
-DocType: Employee Loan,Disbursement Date,Ημερομηνία εκταμίευσης
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,Οι &quot;παραλήπτες&quot; δεν προσδιορίζονται
+DocType: Loan,Disbursement Date,Ημερομηνία εκταμίευσης
 DocType: BOM Update Tool,Update latest price in all BOMs,Ενημερώστε την τελευταία τιμή σε όλα τα BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Ιατρικό αρχείο
 DocType: Vehicle,Vehicle,Όχημα
 DocType: Purchase Invoice,In Words,Με λόγια
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Καταχωρίστε το όνομα της τράπεζας ή του ιδρύματος δανεισμού πριν από την υποβολή.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} πρέπει να υποβληθεί
 DocType: POS Profile,Item Groups,Ομάδες στοιχείο
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
 DocType: Sales Order Item,For Production,Για την παραγωγή
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Προσθέστε έναν προσωρινό λογαριασμό ανοίγματος στο Λογαριασμό λογαριασμού
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Προσθέστε έναν προσωρινό λογαριασμό ανοίγματος στο Λογαριασμό λογαριασμού
 DocType: Customer,Customer Primary Contact,Αρχική επικοινωνία με τον πελάτη
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Περίοδος κλεισίματος περιοδικού
 DocType: Project Task,View Task,Προβολή εργασιών
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Τύπος τραπεζικής εγγύησης
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Τμήμα τιμολογίου
 ,Asset Depreciations and Balances,Ενεργητικού Αποσβέσεις και Υπόλοιπα
@@ -5149,9 +5188,8 @@
 DocType: Production Plan,Include Subcontracted Items,Συμπεριλάβετε αντικείμενα με υπεργολαβία
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Δεν είναι δυνατή η αλλαγή των ιδιοτήτων των παραλλαγών μετά τη μεταβίβαση αποθέματος. Θα χρειαστεί να δημιουργήσετε ένα νέο στοιχείο για να το κάνετε αυτό.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
-DocType: Employee Loan,Repay from Salary,Επιστρέψει από το μισθό
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+DocType: Loan,Repay from Salary,Επιστρέψει από το μισθό
 DocType: Leave Application,LAP/,ΑΓΚΑΛΙΆ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Ζητώντας την καταβολή εναντίον {0} {1} για ποσό {2}
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
@@ -5175,11 +5213,11 @@
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Διπλότυπη ομάδα στοιχείο που βρέθηκαν στο τραπέζι ομάδα στοιχείου
 DocType: Land Unit,Parent Land Unit,Μονάδα Γονικής Γης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
 DocType: Fertilizer,Fertilizer Name,Όνομα λιπάσματος
 DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
 DocType: Cash Flow Mapping Accounts,Account,Λογαριασμός
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
 ,Requested Items To Be Transferred,Είδη που ζητήθηκε να μεταφερθούν
 DocType: Expense Claim,Vehicle Log,όχημα Σύνδεση
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Παρουσία πυρετού (θερμοκρασία&gt; 38,5 ° C / 101,3 ° F ή διατηρούμενη θερμοκρασία&gt; 38 ° C / 100,4 ° F)"
@@ -5220,24 +5258,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
 DocType: Asset Maintenance,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Invoice,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
-DocType: C-Form,Series,Σειρά
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Το νόμισμα του τιμοκαταλόγου {0} πρέπει να είναι {1} ή {2}
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Soil Texture,Ternary Plot,Τρισδιάστατο οικόπεδο
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
 DocType: Driver,License Number,ΑΡΙΘΜΟΣ ΑΔΕΙΑΣ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Σκοπός επίσκεψης συντήρησης
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Τιμολόγιο Εγγραφή ασθενούς
 DocType: Crop,Period,Περίοδος
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Γενικό καθολικό
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Υπάλληλος {0} σε άδεια για {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Υπάλληλος {0} σε άδεια για {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Δείτε Συστάσεις
 DocType: Program Enrollment Tool,New Program,νέο Πρόγραμμα
 DocType: Item Attribute Value,Attribute Value,Χαρακτηριστικό αξία
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 DocType: Salary Detail,Salary Detail,μισθός Λεπτομέρειες
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 DocType: Appointment Type,Physician,Γιατρός
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Διαβουλεύσεις
@@ -5245,15 +5282,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) δεν μπορεί να είναι μεγαλύτερη από την προγραμματισμένη ποσότητα ({2}) στην Παραγγελία Εργασίας {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Ώρα Φύλλο για την κατασκευή.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Μερικό σύνολο
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Δεν είναι δυνατή η αλλαγή ιδιοτήτων παραλλαγής μετά από συναλλαγή μετοχών. Θα χρειαστεί να δημιουργήσετε ένα νέο στοιχείο για να το κάνετε αυτό.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless Εντολή SEPA
 DocType: Physician,Charges,Ταρίφα
 DocType: Production Plan,Get Items For Work Order,Λάβετε στοιχεία για παραγγελία εργασίας
 DocType: Salary Detail,Default Amount,Προεπιλεγμένο ποσό
 DocType: Lab Test Template,Descriptive,Περιγραφικός
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Περίληψη Αυτό το Μήνα
 DocType: Quality Inspection Reading,Quality Inspection Reading,Μέτρηση επιθεώρησης ποιότητας
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Ορίστε έναν στόχο πωλήσεων που θέλετε να επιτύχετε για την εταιρεία σας.
 ,Project wise Stock Tracking,Παρακολούθηση αποθέματος με βάση το έργο
@@ -5281,11 +5319,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Αποτυχία δημιουργίας ιστότοπου
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Έχει ήδη δημιουργηθεί η καταχώριση αποθέματος αποθήκευσης ή δεν έχει παρασχεθεί ποσότητα δείγματος
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Έχει ήδη δημιουργηθεί η καταχώριση αποθέματος αποθήκευσης ή δεν έχει παρασχεθεί ποσότητα δείγματος
 DocType: Program,Program Abbreviation,Σύντμηση πρόγραμμα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
-DocType: Bank Guarantee,Start Date,Ημερομηνία έναρξης
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Κατανομή αδειών για μία περίοδο.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Οι επιταγές και καταθέσεις εκκαθαριστεί ορθά
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
@@ -5300,11 +5337,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ώρες
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
 DocType: Purchase Invoice,04-Correction in Invoice,04-Διόρθωση στο τιμολόγιο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Παραγγελία εργασίας που έχει ήδη δημιουργηθεί για όλα τα στοιχεία με BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Παραγγελία εργασίας που έχει ήδη δημιουργηθεί για όλα τα στοιχεία με BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Αναφορά λεπτομερειών παραλλαγής
 DocType: Setup Progress Action,Setup Progress Action,Ενέργεια προόδου εγκατάστασης
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Αγορά Τιμοκατάλογων
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Αγορά Τιμοκατάλογων
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Ακύρωση συνδρομής
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Επιλέξτε Κατάσταση συντήρησης ως Ολοκληρώθηκε ή αφαιρέστε Ημερομηνία ολοκλήρωσης
 DocType: Supplier,Default Payment Terms Template,Προκαθορισμένο πρότυπο όρων πληρωμής
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Νόμισμα συναλλαγής πρέπει να είναι ίδια με πύλη πληρωμής νόμισμα
@@ -5314,8 +5352,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Δράση αν συσσωρευμένη μηνιαία Προϋπολογισμός Υπέρβαση
-DocType: Subscription,Submit on creation,Υποβολή στη δημιουργία
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ενέργεια αν συσσωρευμένη μηνιαία Προϋπολογισμός Υπέρβαση
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
 DocType: Asset,Disposal Date,Ημερομηνία διάθεσης
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Μηνύματα ηλεκτρονικού ταχυδρομείου θα αποσταλεί σε όλους τους ενεργούς υπαλλήλους της εταιρείας στη δεδομένη ώρα, αν δεν έχουν διακοπές. Σύνοψη των απαντήσεων θα αποσταλούν τα μεσάνυχτα."
@@ -5333,6 +5370,7 @@
 DocType: Batch,Parent Batch,Γονική Παρτίδα
 DocType: Cheque Print Template,Cheque Print Template,Επιταγή Πρότυπο Εκτύπωση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Ο αριθμός ημερών μετά την παρέλευση της ημερομηνίας λήξης του τιμολογίου πριν την ακύρωση της συνδρομής ή της εγγραφής της εγγραφής ως μη καταβληθείσας
 DocType: Lab Test Template,Sample Collection,Συλλογή δειγμάτων
 ,Requested Items To Be Ordered,Είδη που ζητήθηκε να παραγγελθούν
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
@@ -5341,7 +5379,7 @@
 DocType: Account,Income,Έσοδα
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Κάτι πήγε στραβά!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
 DocType: Supplier Scorecard Scoring Criteria,Score,Σκορ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Φορολογικό Έτος {0} δεν υπάρχει
@@ -5361,12 +5399,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} θα πρέπει να είναι μια τιμή μεταξύ 0 και 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να γίνει πριν από την Ημερομηνία διαθέσιμο προς χρήση
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ακάλυπτά δάνεια
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Ακάλυπτά δάνεια
 DocType: Cost Center,Cost Center Name,Όνομα κέντρου κόστους
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ώρες εργασίας κατά Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Προγραμματισμένη ημερομηνία
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Συνολικό καταβεβλημένο ποσό
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Συνολικό καταβεβλημένο ποσό
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Τα μηνύματα που είναι μεγαλύτερα από 160 χαρακτήρες θα χωρίζονται σε πολλαπλά μηνύματα
 DocType: Purchase Receipt Item,Received and Accepted,Που έχουν παραληφθεί και έγιναν αποδεκτά
 DocType: Hub Settings,Company and Seller Profile,Προφίλ εταιρείας και πωλητή
@@ -5380,10 +5418,9 @@
 DocType: Item,Variant Based On,Παραλλαγή Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Οι προμηθευτές σας
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Παρακαλούμε διορθώστε το
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 DocType: Request for Quotation Item,Supplier Part No,Προμηθευτής Μέρος Όχι
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Ανώνυμος
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Ελήφθη Από
 DocType: Lead,Converted,Έχει μετατραπεί
@@ -5397,6 +5434,7 @@
 DocType: Asset,Assets,Περιουσιακά στοιχεία
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
+DocType: Subscription,Current Invoice End Date,Τρέχουσα ημερομηνία λήξης τιμολογίου
 DocType: Payment Term,Due Date Based On,Η ημερομηνία λήξης βασίζεται σε
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Ορίστε την προεπιλεγμένη ομάδα πελατών και την επικράτεια στις Ρυθμίσεις πώλησης
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} δεν υπάρχει
@@ -5404,7 +5442,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Δεν έχουν επιλεγεί αποπληρωμές για καταχώριση ημερολογίου
 DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
+DocType: Loan,Disbursed,Εκταμιεύτηκε
 DocType: Healthcare Settings,Laboratory Settings,Ρυθμίσεις εργαστηρίου
 DocType: Patient Appointment,Service Unit,Μονάδα υπηρεσιών
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Ορίστε με επιτυχία τον προμηθευτή
@@ -5417,12 +5457,12 @@
 DocType: Share Balance,No of Shares,Αριθμός μετοχών
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Επιλέξτε Κατάσταση
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: School House,House Name,Όνομα Σπίτι
 DocType: Fee Schedule,Total Amount per Student,Συνολικό ποσό ανά φοιτητή
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Ηλεκτρικός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Ηλεκτρικός
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Προσθέστε το υπόλοιπο του οργανισμού σας καθώς οι χρήστες σας. Μπορείτε επίσης να προσθέσετε προσκαλέσει πελάτες στην πύλη σας με την προσθήκη τους από τις Επαφές
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
 DocType: Grant Application,Requested Amount,Απαιτούμενο ποσό
@@ -5432,7 +5472,7 @@
 DocType: Crop Cycle,Detected Diseases,Ανιχνεύθηκαν ασθένειες
 DocType: Stock Entry,Default Source Warehouse,Προεπιλεγμένη αποθήκη πηγής
 DocType: Item,Customer Code,Κωδικός πελάτη
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 DocType: Asset Maintenance Task,Last Completion Date,Τελευταία ημερομηνία ολοκλήρωσης
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
@@ -5440,9 +5480,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Ρυθμίσεις
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ενεργητικό αποθέματος
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Ενεργητικό αποθέματος
 DocType: Restaurant,Active Menu,Ενεργό μενού
 DocType: Target Detail,Target Qty,Ποσ.-στόχος
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Ενάντια στο δάνειο: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Ταμείο Ρυθμίσεις
 DocType: Student Attendance,Present,Παρόν
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Το δελτίο αποστολής {0} δεν πρέπει να υποβάλλεται
@@ -5451,9 +5492,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
 DocType: Vehicle Log,Odometer,Οδόμετρο
 DocType: Production Plan Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
 DocType: Chapter,Chapter Head,Κεφάλαιο κεφαλής
 DocType: Payment Term,Month(s) after the end of the invoice month,Μήνας (-ες) μετά το τέλος του μήνα του τιμολογίου
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Δραστηριότητες / εργασίες έργου
@@ -5461,11 +5502,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Δημιουργία βεβαιώσεων αποδοχών
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Η ημερομηνία λήξης των αποτελεσμάτων του εργαστηρίου δεν μπορεί να γίνει πριν από την ημερομηνία δοκιμής
 DocType: POS Profile,Allow user to edit Discount,Να επιτρέπεται στο χρήστη να επεξεργαστεί έκπτωση
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Αποκτήστε πελάτες από
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Αποκτήστε πελάτες από
 DocType: Purchase Invoice Item,Include Exploded Items,Συμπεριλάβετε εκραγμένα στοιχεία
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",Η επιλογή αγορά πρέπει να οριστεί αν είναι επιλεγμένο το πεδίο 'εφαρμοστέο σε' ως {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
 DocType: Shipping Rule,Restrict to Countries,Περιορίστε σε χώρες
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
 DocType: Sales Invoice Timesheet,Billing Hours,Ώρες χρέωσης
 DocType: Project,Total Sales Amount (via Sales Order),Συνολικό Ποσό Πωλήσεων (μέσω Παραγγελίας)
@@ -5482,6 +5524,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Διαχειριστής αξιολόγησης
 DocType: Payment Entry,Allocate Payment Amount,Διαθέστε Ποσό Πληρωμής
+DocType: Subscription Plan,Subscription Plan,Σχέδιο εγγραφής
 DocType: Employee External Work History,Salary,Μισθός
 DocType: Serial No,Delivery Document Type,Τύπος εγγράφου παράδοσης
 DocType: Sales Order,Partly Delivered,Έχει παραδοθεί μερικώς
@@ -5506,9 +5549,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Eύρος γήρανσης 2
 DocType: SG Creation Tool Course,Max Strength,Μέγιστη Αντοχή
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Εγκατάσταση προρυθμίσεων
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Δεν έχει επιλεγεί καμία παραλαβή για τον πελάτη {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Δεν έχει επιλεγεί καμία παραλαβή για τον πελάτη {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Επιλέξτε στοιχεία βάσει της ημερομηνίας παράδοσης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Επιλέξτε στοιχεία βάσει της ημερομηνίας παράδοσης
 DocType: Grant Application,Has any past Grant Record,Έχει κάποιο παρελθόν Grant Record
 ,Sales Analytics,Ανάλυση πωλήσεων
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Διαθέσιμο {0}
@@ -5526,7 +5569,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Κόστος πρώτων υλών που προμηθεύτηκαν
 DocType: Selling Settings,Settings for Selling Module,Ρυθμίσεις για τη λειτουργική μονάδα πωλήσεων
 DocType: Hotel Room Reservation,Hotel Room Reservation,Κρατήσεις Ξενοδοχείων
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Εξυπηρέτηση πελατών
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Εξυπηρέτηση πελατών
 DocType: BOM,Thumbnail,Μικρογραφία
 DocType: Item Customer Detail,Item Customer Detail,Λεπτομέρειες πελατών είδους
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Προσφορά υποψήφιος δουλειά.
@@ -5542,7 +5585,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Οι σπουδαστές έχουν εγγραφεί
 DocType: Fees,Student Details,Στοιχεία σπουδαστών
 DocType: Purchase Invoice Item,Stock Qty,Ποσότητα αποθέματος
-DocType: Employee Loan,Repayment Period in Months,Αποπληρωμή Περίοδος σε μήνες
+DocType: Loan,Repayment Period in Months,Αποπληρωμή Περίοδος σε μήνες
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
 DocType: Account,Equity,Διαφορά ενεργητικού - παθητικού
@@ -5551,7 +5594,7 @@
 DocType: Task,Closing Date,Καταληκτική ημερομηνία
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
 DocType: Timesheet,Work Detail,Λεπτομέρειες εργασίας
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Μηχανικός
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Μηχανικός
 DocType: Journal Entry,Total Amount Currency,Σύνολο Νόμισμα Ποσό
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Συνελεύσεις Αναζήτηση Sub
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
@@ -5596,13 +5639,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Πληροφορίες τύπου δότη.
 DocType: Request for Quotation,Supplier Detail,Προμηθευτής Λεπτομέρειες
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Σφάλμα στον τύπο ή την κατάσταση: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Ποσό τιμολόγησης
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Ποσό τιμολόγησης
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Τα βάρη των κριτηρίων πρέπει να ανέλθουν στο 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Συμμετοχή
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Χρηματιστήριο Είδη
 DocType: BOM,Materials,Υλικά
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Αν δεν είναι επιλεγμένο, η λίστα θα πρέπει να προστίθεται σε κάθε τμήμα όπου πρέπει να εφαρμοστεί."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Δημιουργία {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Προέλευσης και προορισμού αποθήκη δεν μπορεί να είναι ίδια
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Φορολογικό πρότυπο για συναλλαγές αγοράς.
@@ -5626,14 +5668,14 @@
 DocType: Shipping Rule,Fixed,Σταθερός
 DocType: Vehicle Service,Clutch Plate,Πιάτο συμπλεκτών
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Δαπάνες διοικήσεως
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Δαπάνες διοικήσεως
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
-DocType: Journal Entry,Subscription,Συνδρομή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Συνδρομή
 DocType: Purchase Invoice,Contact Email,Email επαφής
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Δημιουργία τελών σε εκκρεμότητα
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Ανακοίνωση Περίοδος
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Ανακοίνωση Περίοδος
 DocType: Asset Category,Asset Category Name,Asset Όνομα κατηγορίας
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Αυτή είναι μια κύρια περιοχή και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Όνομα νέο πρόσωπο πωλήσεων
@@ -5646,7 +5688,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Αφήστε ανεξέλεγκτη αν δεν θέλετε να εξετάσετε παρτίδα ενώ κάνετε ομάδες μαθημάτων.
 DocType: Asset,Frequency of Depreciation (Months),Συχνότητα αποσβέσεων (μήνες)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Λογαριασμός Πίστωσης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
@@ -5654,7 +5696,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
 DocType: Hub Settings,Company Logo,Λογότυπο Εταιρείας
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
 DocType: Healthcare Settings,Patient Registration,Εγγραφή ασθενούς
@@ -5688,11 +5730,10 @@
 DocType: Journal Entry,Total Debit,Συνολική χρέωση
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Προεπιλογή Έτοιμα προϊόντα Αποθήκη
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Επιλέξτε Ασθενή
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Πωλητής
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Πωλητής
 DocType: Hotel Room Package,Amenities,Ανεσεις
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Δεν επιτρέπεται πολλαπλή μέθοδος προεπιλογής πληρωμής
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,για το
 ,Appointment Analytics,Αντιστοίχιση Analytics
 DocType: Vehicle Service,Half Yearly,Εξαμηνιαία
 DocType: Lead,Blog Subscriber,Συνδρομητής blog
@@ -5708,6 +5749,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Αφήστε κενό αν κάνετε ομάδες φοιτητών ανά έτος
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Εάν είναι επιλεγμένο, ο συνολικός αριθμός των εργάσιμων ημερών θα περιλαμβάνει τις αργίες, και αυτό θα μειώσει την αξία του μισθού ανά ημέρα"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Οι εφαρμογές που χρησιμοποιούν το τρέχον κλειδί δεν θα έχουν πρόσβαση, είστε βέβαιοι;"
+DocType: Subscription Settings,Prorate,Φροντίστε
 DocType: Purchase Invoice,Total Advance,Σύνολο προκαταβολών
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Αλλαγή κωδικού προτύπου
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι νωρίτερα από την Ημερομηνία Τίτλος Έναρξη. Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
@@ -5718,12 +5760,13 @@
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 DocType: Cheque Print Template,Signatory Position,υπογράφοντα Θέση
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Ορισμός ως απολεσθέν
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Ορισμός ως απολεσθέν
 DocType: Timesheet,Total Billable Hours,Σύνολο χρεώσιμες ώρες
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Αριθμός ημερών που ο συνδρομητής πρέπει να πληρώσει τιμολόγια που δημιουργούνται από αυτήν τη συνδρομή
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Απόδειξη πληρωμής Σημείωση
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Αυτό βασίζεται σε συναλλαγές κατά αυτόν τον πελάτη. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Σειρά {0}: Κατανέμεται ποσό {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό Έναρξη Πληρωμής {2}
-DocType: Program Enrollment Tool,New Academic Term,Νέος Ακαδημαϊκός Όρος
+DocType: Program Enrollment Tool,New Academic Term,Νέα Ακαδημαϊκή Περίοδος
 ,Course wise Assessment Report,Μαθησιακή έκθεση αξιολόγησης
 DocType: Purchase Invoice,Availed ITC State/UT Tax,Επωφεληθήκατε από τον φόρο ITC του κράτους / UT
 DocType: Tax Rule,Tax Rule,Φορολογικές Κανόνας
@@ -5738,12 +5781,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Αυτό βασίζεται στην προσέλευση του υπαλλήλου αυτού
 DocType: Assessment Result,Summary,Περίληψη
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Μαρτυρία Συμμετοχής
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Χρεωστικός Λογαριασμός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Χρεωστικός Λογαριασμός
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Στοιχείο εισόδου παραγγελίας εστιατορίου
@@ -5755,7 +5798,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ποσό αγορά
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Παροχές σε εργαζομένους
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Παροχές σε εργαζομένους
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Work Order,Manufactured Qty,Παραγόμενη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Τα μερίδια δεν υπάρχουν με το {0}
@@ -5763,12 +5806,12 @@
 DocType: Asset,Out of Order,Εκτός λειτουργίας
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 DocType: Projects Settings,Ignore Workstation Time Overlap,Παράκαμψη της χρονικής επικάλυψης του σταθμού εργασίας
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Επιλέξτε αριθμούς παρτίδων
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
 DocType: Patient Service Unit,Medical Administrator,Ιατρικός Διαχειριστής
 DocType: Assessment Plan,Schedule,Χρονοδιάγραμμα
 DocType: Account,Parent Account,Γονικός λογαριασμός
@@ -5798,15 +5841,16 @@
 DocType: Asset Repair,Repair Status,Κατάσταση επισκευής
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 DocType: POS Profile,Account for Change Amount,Ο λογαριασμός για την Αλλαγή Ποσό
 DocType: Purchase Invoice,input service,υπηρεσία εισόδου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Μέλος της ομάδας συντήρησης
 DocType: Agriculture Analysis Criteria,Soil Analysis,Ανάλυση εδάφους
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Κωδικός Μαθήματος:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
@@ -5854,19 +5898,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions για {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Όνομα μεταβλητής
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
 DocType: Asset,Asset Category,Κατηγορία Παγίου
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Η καθαρή αμοιβή δεν μπορεί να είναι αρνητική
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Υλικό Προμηθευτή
 DocType: Soil Texture,Loamy Sand,Ελαφριά άμμος
 DocType: Production Plan,Material Request Planning,Σχεδιασμός Αίτησης Υλικού
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Κατώφλι {0}% εμφανίζεται περισσότερες από μία φορά
 DocType: Expense Claim,Employees Email Id,Email ID υπαλλήλων
 DocType: Employee Attendance Tool,Marked Attendance,Αισθητή Συμμετοχή
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Βραχυπρόθεσμες υποχρεώσεις
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Βραχυπρόθεσμες υποχρεώσεις
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Ο χρονοδιακόπτης υπερέβη τις συγκεκριμένες ώρες.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Αποστολή μαζικών SMS στις επαφές σας
 DocType: Patient,A Positive,Ένα θετικό
@@ -5877,9 +5921,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} έχει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτή και οι εντολές αγοράς σε αυτόν τον προμηθευτή πρέπει να εκδίδονται με προσοχή.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Ομάδα συντήρησης περιουσιακών στοιχείων
-DocType: Employee Loan,Loan Type,Τύπος Δανείου
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} έχει υποβληθεί με επιτυχία
+DocType: Loan,Loan Type,Τύπος Δανείου
 DocType: Scheduling Tool,Scheduling Tool,εργαλείο προγραμματισμού
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Πιστωτική κάρτα
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Πιστωτική κάρτα
 DocType: BOM,Item to be manufactured or repacked,Είδος που θα κατασκευαστεί ή θα ανασυσκευαστεί
 DocType: Employee Education,Major/Optional Subjects,Σημαντικές / προαιρετικά θέματα
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5911,7 +5956,7 @@
 DocType: Item,Units of Measure,Μονάδες μέτρησης
 DocType: Manufacturing Settings,Allow Production on Holidays,Επίτρεψε παραγωγή σε αργίες
 DocType: Sales Invoice,Customer's Purchase Order Date,Ημερομηνία παραγγελίας αγοράς πελάτη
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Μετοχικού Κεφαλαίου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Μετοχικού Κεφαλαίου
 DocType: Shopping Cart Settings,Show Public Attachments,Εμφάνιση δημόσιων συνημμένων
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
 DocType: Restaurant Reservation,Reservation Time,Χρόνος κράτησης
@@ -5926,7 +5971,7 @@
 DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Γραμμή # {0}: Το Reqd by Date δεν μπορεί να είναι πριν από την Ημερομηνία Συναλλαγής
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Προτεινόμενα Προϊόντα
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Σχεδιαστής
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
@@ -5936,20 +5981,20 @@
 DocType: Driver,Expiry Date,Ημερομηνία λήξης
 DocType: Healthcare Settings,Employee name and designation in print,Όνομα και ορισμός του υπαλλήλου σε έντυπη μορφή
 ,accounts-browser,λογαριασμούς-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Κύρια εγγραφή έργου.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Για να καταστεί δυνατή η υπερβολική τιμολόγηση ή πάνω-παραγγελίας, ενημέρωση &quot;Επίδομα&quot; στις Ρυθμίσεις Χρηματιστήριο ή το στοιχείο."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Μισή ημέρα)
 DocType: Payment Term,Credit Days,Ημέρες πίστωσης
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Επιλέξτε Ασθενή για να πάρετε Εργαστηριακές εξετάσεις
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Κάντε παρτίδας Φοιτητής
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Ημέρες ανοχής
 DocType: Cash Flow Mapping,Is Income Tax Expense,Είναι η δαπάνη φόρου εισοδήματος
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Ελέγξτε αν ο φοιτητής διαμένει στο Hostel του Ινστιτούτου.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
 ,Stock Summary,Χρηματιστήριο Περίληψη
@@ -5960,10 +6005,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ημ. αναφοράς
 DocType: Employee,Reason for Leaving,Αιτιολογία αποχώρησης
 DocType: BOM Operation,Operating Cost(Company Currency),Λειτουργικό κόστος (Εταιρεία νομίσματος)
-DocType: Employee Loan Application,Rate of Interest,Βαθμός ενδιαφέροντος
+DocType: Loan Application,Rate of Interest,Βαθμός ενδιαφέροντος
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: Item,Shelf Life In Days,Διάρκεια Ζωής στις Ημέρες
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
+DocType: Department,Expense Approvers,Έγκριση εξόδων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 DocType: Journal Entry,Subscription Section,Τμήμα συνδρομής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
diff --git a/erpnext/translations/en-US.csv b/erpnext/translations/en-US.csv
index 5f9101f..b5a1ef4 100644
--- a/erpnext/translations/en-US.csv
+++ b/erpnext/translations/en-US.csv
@@ -1,17 +1,45 @@
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Checks Required
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Checks Required
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row #{0}: Clearance date {1} cannot be before Check Date {2}
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,People who teach at your organization
+apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submitting/canceling this entry"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave cannot be applied/canceled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}"
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before canceling this Warranty Claim
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +58,"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Outstanding Checks and Deposits to clear
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +61,Appointment cancelled,Appointment canceled
 DocType: Payment Entry,Cheque/Reference Date,Check/Reference Date
 DocType: Cheque Print Template,Scanned Cheque,Scanned Check
 DocType: Cheque Print Template,Cheque Size,Check Size
+apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Maintenance Status has to be Canceled or Completed to Submit
+apps/erpnext/erpnext/setup/doctype/company/company.py +78,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be canceled to change the default currency."
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Maintenance Visit {0} must be canceled before cancelling this Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be canceled before cancelling this Sales Order
 DocType: Bank Reconciliation Detail,Cheque Date,Check Date
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order cannot be canceled, Unstop it first to cancel"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +166,Material Request {0} is cancelled or stopped,Material Request {0} is canceled or stopped
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Closed order cannot be canceled. Unclose to cancel.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Schedule {0} must be canceled before cancelling this Sales Order
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment on Cancelation of Invoice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery Notes {0} must be canceled before cancelling this Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Work Order {0} must be canceled before cancelling this Sales Order
 apps/erpnext/erpnext/config/accounts.py +272,Setup cheque dimensions for printing,Setup check dimensions for printing
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Packing Slip(s) canceled
 DocType: Payment Entry,Cheque/Reference No,Check/Reference No
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
 DocType: Cheque Print Template,Cheque Print Template,Check Print Template
+apps/erpnext/erpnext/controllers/buying_controller.py +420,{0} {1} is cancelled or closed,{0} {1} is canceled or closed
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Quotation {0} is canceled
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Timesheet {0} is already completed or cancelled,Timesheet {0} is already completed or canceled
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,Payment Canceled. Please check your GoCardless Account for more details
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Item {0} is canceled
+DocType: Serial No,Is Cancelled,Is Canceled
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} is canceled or stopped
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Color
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before canceling this Maintenance Visit
 DocType: Employee,Cheque,Check
 DocType: Cheque Print Template,Cheque Height,Check Height
 DocType: Cheque Print Template,Cheque Width,Check Width
diff --git a/erpnext/translations/es-AR.csv b/erpnext/translations/es-AR.csv
index 7cae681..f31403a 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -1,7 +1,7 @@
 DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
 DocType: Purchase Invoice Item,Item,Producto
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdidas
 DocType: Cheque Print Template,Cheque Size,Tamaño de Cheque
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Hacer lotes de Estudiante
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},"Empleado {0}, la jornada del día {1}"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},"Empleado {0}, la jornada del día {1}"
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index 4f04116..1c6a879 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -5,8 +5,8 @@
 DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación Padre
 DocType: Student,Guardians,Guardianes
 DocType: Fee Schedule,Fee Schedule,Programa de Tarifas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Student,Guardian Details,Detalles del Guardián
diff --git a/erpnext/translations/es-MX.csv b/erpnext/translations/es-MX.csv
index 85ef5b7..f98d494 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -10,7 +10,7 @@
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Fortaleza de Grupo Estudiante
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida  por Ventas de Activos' en la empresa {0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Mostrar Recibo de Nómina
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Mostrar Recibo de Nómina
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -54,18 +54,19 @@
  9. Considerar impuesto o cargo para: En esta sección se puede especificar si el impuesto / cargo es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Tipo de Permiso {0} no se puede arrastar o trasladar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +163,Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","El Artículo de Servico, el Tipo, la Frecuencia y la Cantidad de Gasto son requeridos"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Lab Test Template,Standard Selling Rate,Tarifa de Venta Estándar
 DocType: Program Enrollment,School House,Casa Escuela
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +54,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Leave Encashment,Cobro de Permiso
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index 1b39c51..0aa4fd2 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -1,7 +1,7 @@
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Lista de Materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
 DocType: Purchase Invoice,Tax ID,RUC
 DocType: BOM Item,Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
 DocType: Timesheet Detail,Bill,Factura
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 0d22eb8..ba982e4 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,7 +1,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
 DocType: HR Settings,Employee Settings,Configuración del Empleado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
 DocType: Naming Series,User must always select,Usuario elegirá siempre
 DocType: Account,Cost of Goods Sold,Costo de las Ventas
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en algún año fiscal activo.
@@ -9,8 +9,8 @@
 DocType: Packing Slip,From Package No.,Del Paquete N º
 ,Quotation Trends,Tendencias de Cotización
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Promedio de Compra
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Número de orden {0} creado
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Promedio de Compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Número de orden {0} creado
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
@@ -23,7 +23,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
 DocType: Journal Entry,Print Heading,Título de impresión
 DocType: Workstation,Electricity Cost,Coste de electricidad
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comisión de Ventas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Comisión de Ventas
 DocType: BOM,Costing,Costeo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
@@ -40,21 +40,20 @@
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nuevo {0}: # {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +49,Abbreviation is mandatory,La Abreviación es mandatoria
 DocType: Item,End of Life,Final de la Vida
 ,Reqd By Date,Solicitado Por Fecha
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
-DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
+DocType: Department,Leave Approver,Supervisor de Vacaciones
 DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
 DocType: Maintenance Schedule,Generate Schedule,Generar Horario
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Task,depends_on,depende de
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Préstamos Garantizados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Préstamos Garantizados
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Crear cotización de proveedor
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre de Nuevo Centro de Coste
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
@@ -62,7 +61,7 @@
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +42,WIP Warehouse,WIP Almacén
 DocType: Work Order,Actual Start Date,Fecha de inicio actual
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
@@ -88,7 +87,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
 DocType: Email Digest,New Sales Orders,Nueva Órden de Venta
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Dinero Ganado
 DocType: Quotation,Term Details,Detalles de los Terminos
 DocType: Crop,Target Warehouse,Inventario Objetivo
 DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
@@ -102,12 +101,12 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo On
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Hacer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Hacer
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Maquinaria y Equipos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Maquinaria y Equipos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no esta presentado
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
@@ -120,15 +119,14 @@
 DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +282,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Vista en árbol para la administración de los territorios
 apps/erpnext/erpnext/stock/utils.py +207,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
 DocType: Target Detail,Target Detail,Objetivo Detalle
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Pasivo Corriente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Pasivo Corriente
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 apps/erpnext/erpnext/setup/doctype/company/company.js +106,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
 DocType: Account,Credit,Crédito
@@ -137,7 +135,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Recibos de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Recibos de Compra
 DocType: Pricing Rule,Disable,Inhabilitar
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Attendance,Leave Type,Tipo de Vacaciones
@@ -146,7 +144,7 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir al Grupo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Número de orden {0} no está en stock
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
 DocType: Naming Series,Setup Series,Serie de configuración
@@ -157,7 +155,7 @@
 DocType: Item Reorder,Re-Order Level,Reordenar Nivel
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +585,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Warranty Claim,Service Address,Dirección del Servicio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
@@ -165,7 +163,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
 DocType: Account,Frozen,Congelado
 DocType: Attendance,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +81,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 DocType: Production Plan,Not Started,Sin comenzar
@@ -173,14 +171,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferido
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +237,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
 DocType: Opening Invoice Creation Tool,Sales,Venta
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
-DocType: Employee,Leave Approvers,Supervisores de Vacaciones
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
+DocType: Department,Leave Approvers,Supervisores de Vacaciones
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Total Monto Pendiente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Total Monto Pendiente
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
@@ -224,9 +222,9 @@
 DocType: Supplier Quotation,Supplier Address,Dirección del proveedor
 DocType: Purchase Order Item,Expected Delivery Date,Fecha Esperada de Envio
 DocType: Product Bundle,Parent Item,Artículo Principal
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Desarrollador de Software
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Desarrollador de Software
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Gastos de Comercialización
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Gastos de Comercialización
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 apps/erpnext/erpnext/utilities/user_progress.py +252,user@example.com,user@example.com
@@ -235,16 +233,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +156,Root Type is mandatory,Tipo Root es obligatorio
 DocType: Patient Appointment,Scheduled,Programado
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de ausencia sin pago
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total Pagado Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total Pagado Amt
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde el último pedido' debe ser mayor o igual a cero
 DocType: Material Request Item,For Warehouse,Por almacén
 ,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
 DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 DocType: Item,Synced With Hub,Sincronizado con Hub
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serie es obligatorio
 ,Item Shortage Report,Reportar carencia de producto
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
@@ -259,7 +257,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
@@ -290,21 +288,21 @@
 DocType: Pricing Rule,Pricing Rule,Reglas de Precios
 DocType: Project Task,View Task,Vista de tareas
 DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Cotizaciónes a Proveedores
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Cotizaciónes a Proveedores
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} contra el tipo de actividad - {1}
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +616,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Conjunto/Paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Conjunto/Paquete de productos
 DocType: Material Request,Requested For,Solicitados para
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
 DocType: Production Plan,Select Items,Seleccione Artículos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestión de la Calidad
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestión de la Calidad
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Los detalles de las operaciones realizadas.
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Evaluación del Desempeño .
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
@@ -313,7 +311,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
 DocType: Employee External Work History,Salary,Salario
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Inventario de Pasivos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Inventario de Pasivos
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
 DocType: Target Detail,Target  Amount,Monto Objtetivo
@@ -328,7 +326,7 @@
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Registrar pago
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
@@ -351,7 +349,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Quotation Item,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +215,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
@@ -369,10 +367,10 @@
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
 ,Lead Details,Iniciativas
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Delivery Note,Vehicle No,Vehículo No
 DocType: Lead,Lower Income,Ingreso Bajo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Cantidad Entregada
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nueva Empresa
 DocType: Employee,Permanent Address Is,Dirección permanente es
@@ -398,7 +396,7 @@
 DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
 DocType: Employee,Reports to,Informes al
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -421,24 +419,22 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
 DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nueva Aplicación de Permiso
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,Electrónica
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
 apps/erpnext/erpnext/stock/doctype/item/item.py +510,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 DocType: Lead,Lead,Iniciativas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +241,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periódico
 DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
 DocType: Payment Entry Reference,Supplier Invoice No,Factura del Proveedor No
 DocType: Payment Gateway Account,Payment Account,Pago a cuenta
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,Seleccione el año fiscal ...
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de vacaciones: {0}
 DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
 DocType: Opportunity,With Items,Con artículos
@@ -464,14 +460,14 @@
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hooks.py +142,Issues,Problemas
 DocType: BOM Update Tool,Current BOM,Lista de materiales actual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Fila # {0}:
 DocType: Timesheet,% Amount Billed,% Monto Facturado
 DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
 DocType: Employee,Company Email,Correo de la compañía
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Números de serie únicos para cada producto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Los gastos de servicios públicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Los gastos de servicios públicos
 DocType: Account,Parent Account,Cuenta Primaria
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
@@ -501,7 +497,7 @@
 DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
 DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oportunidades
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oportunidades
 DocType: Salary Slip,Salary Slip,Planilla
 DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Proveedor Id
@@ -515,7 +511,7 @@
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Asset Movement,Stock Manager,Gerente
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Apertura de saldos de capital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Apertura de saldos de capital
 DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
 DocType: Employee,Health Details,Detalles de la Salud
@@ -539,9 +535,9 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Órdenes de venta al Pago
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
 DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
 DocType: Notification Control,Customize the Notification,Personalice la Notificación
@@ -550,12 +546,12 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opciones sobre Acciones
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opciones sobre Acciones
 DocType: Account,Receivable,Cuenta por Cobrar
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Mayor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
 DocType: BOM,Manufacturing,Producción
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entradas' no puede estar vacío
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
@@ -576,17 +572,18 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Quotation,Shopping Cart,Cesta de la compra
-DocType: Pricing Rule,Supplier,Proveedores
+DocType: Bank Guarantee,Supplier,Proveedores
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro Mayor Contable
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Gastos de Ventas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Gastos de Ventas
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
+DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
 DocType: BOM,Item Description,Descripción del Artículo
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Inventario de Gastos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Inventario de Gastos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Tiempo de Entrega en Días
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Activos por Impuestos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Activos por Impuestos
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
 DocType: Item,Has Serial No,Tiene No de Serie
@@ -605,11 +602,12 @@
 DocType: Item,Is Purchase Item,Es una compra de productos
 DocType: Serial No,Delivery Document No,Entrega del documento No
 DocType: Notification Control,Notification Control,Control de Notificación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Oficial Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Oficial Administrativo
 DocType: BOM,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Cuenta de sobregiros
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Cuenta de sobregiros
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
 DocType: Daily Work Summary Group,Holiday List,Lista de Feriados
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
@@ -642,25 +640,25 @@
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
 DocType: Asset Repair,Manufacturing Manager,Gerente de Manufactura
 DocType: BOM,Item UOM,Unidad de Medida del Artículo
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Total Monto Facturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Total Monto Facturado
 DocType: Leave Application,Total Leave Days,Total Vacaciones
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re Abrir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re Abrir
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no encontrado
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +167,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Volver Ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Volver Ventas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotor
 DocType: Payment Schedule,Payment Amount,Pago recibido
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +567,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
@@ -680,20 +678,19 @@
 DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Gobierno
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Gobierno
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
-DocType: Subscription,Stopped,Detenido
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +76,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretario
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secretario
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
 DocType: Work Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
 DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento  excepto el rol que se especifica a continuación .
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Derechos e Impuestos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Derechos e Impuestos
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de la lista de materiales
 DocType: Asset Maintenance,Manufacturing User,Usuario de Manufactura
 ,Profit and Loss Statement,Estado de Pérdidas y Ganancias
@@ -704,7 +701,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
 ,Monthly Attendance Sheet,Hoja de Asistencia Mensual
 DocType: Upload Attendance,Get Template,Verificar Plantilla
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
@@ -731,7 +728,7 @@
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +110,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
@@ -748,7 +745,7 @@
 DocType: Work Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,Sus productos o servicios
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
 DocType: Assessment Plan,To Time,Para Tiempo
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No se ha añadido ninguna dirección todavía.
 ,Terretory,Territorios
@@ -763,15 +760,15 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
 DocType: Employee,Place of Issue,Lugar de emisión
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,La órden de compra {0} no existe
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,es mandatorio. Quizás el registro de Cambio de Moneda no ha sido creado para
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
@@ -782,11 +779,11 @@
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
 DocType: Employee Education,School/University,Escuela / Universidad
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
 DocType: Supplier,Is Frozen,Está Inactivo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
 DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
@@ -794,7 +791,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Asset Maintenance Log,Periodicity,Periodicidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región
@@ -802,7 +799,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Can. en balance
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 DocType: BOM,Exploded_items,Vista detallada
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
@@ -811,7 +808,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +133,{0} is not a stock Item,{0} no es un producto de stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,La fecha de vencimiento es obligatorio
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Reordenar Cantidad
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Reordenar Cantidad
 DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
 DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Salir Cant.
@@ -856,7 +853,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Contribución Monto
 DocType: Work Order,Item To Manufacture,Artículo Para Fabricación
 DocType: Notification Control,Quotation Message,Cotización Mensaje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Activos de Inventario
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
@@ -876,13 +873,13 @@
 DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
 DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
 DocType: Account,Round Off,Redondear
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Establecer como Perdidos
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Establecer como Perdidos
 ,Sales Partners Commission,Comisiones de Ventas
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
 apps/erpnext/erpnext/controllers/buying_controller.py +165,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
 DocType: Lead,Person Name,Nombre de la persona
@@ -906,7 +903,7 @@
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Entradas en el diario de contabilidad.
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Social
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
 DocType: Account,Expense Account,Cuenta de gastos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
@@ -915,7 +912,7 @@
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
@@ -926,9 +923,9 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Las direcciones de clientes y contactos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
 DocType: Item Price,Item Price,Precios de Productos
@@ -950,7 +947,7 @@
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
 DocType: Work Order,Actual Operating Cost,Costo de operación actual
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Gastos por Servicios Telefónicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Gastos por Servicios Telefónicos
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
 DocType: Holiday,Holiday,Feriado
@@ -963,17 +960,17 @@
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Números
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 ,Sales Browser,Navegador de Ventas
 DocType: Employee,Contact Details,Datos del Contacto
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Los usuarios que pueden aprobar las solicitudes de licencia de un empleado específico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +245,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,No puede ser mayor que 100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,No puede ser mayor que 100
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Notas de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Notas de Entrega
 DocType: Bin,Stock Value,Valor de Inventario
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
@@ -989,21 +986,21 @@
 DocType: Shipping Rule,Calculate Based On,Calcular basado en
 DocType: Work Order,Qty To Manufacture,Cantidad Para Fabricación
 DocType: BOM Item,Basic Rate (Company Currency),Precio Base (Moneda Local)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Monto Total Soprepasado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Monto Total Soprepasado
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Monto Sobrepasado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Tarjeta de Crédito
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Tarjeta de Crédito
 apps/erpnext/erpnext/accounts/party.py +259,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Por proveedor
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +995,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Total'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Total'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución .
 DocType: Territory,For reference,Por referencia
@@ -1012,7 +1009,7 @@
 DocType: Purchase Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 ,Delivery Note Trends,Tendencia de Notas de Entrega
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
 apps/erpnext/erpnext/stock/doctype/item/item.py +479,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
@@ -1020,9 +1017,9 @@
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
 DocType: Account,Root Type,Tipo Root
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
 DocType: Sales Order Item,Gross Profit,Utilidad bruta
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Almacén no se encuentra en el sistema
 ,Serial No Status,Número de orden Estado
 DocType: Bin,Ordered Quantity,Cantidad Pedida
 DocType: Item,UOMs,Unidades de Medida
@@ -1033,7 +1030,7 @@
 DocType: Purchase Invoice Item,Weight UOM,Peso Unidad de Medida
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
 DocType: Production Plan,Get Sales Orders,Recibe Órdenes de Venta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +132,Successfully Reconciled,Reconciliado con éxito
 DocType: Payroll Entry,Select Employees,Seleccione Empleados
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 5c789b8..d843d81 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Informes de Evaluación
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Productos de consumo
-DocType: Purchase Receipt,Subscription Detail,Detalle de Suscripción
 DocType: Supplier Scorecard,Notify Supplier,Notificar al Proveedor
 DocType: Item,Customer Items,Partidas de deudores
 DocType: Project,Costing and Billing,Cálculo de Costos y Facturación
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: la cuenta padre {1} no puede ser una cuenta de libro mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificaciones por correo electrónico
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Evaluación
 DocType: Item,Default Unit of Measure,Unidad de Medida (UdM) predeterminada
 DocType: SMS Center,All Sales Partner Contact,Listado de todos los socios de ventas
-DocType: Employee,Leave Approvers,Supervisores de ausencias
+DocType: Department,Leave Approvers,Supervisores de ausencias
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Investigaciones
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Consultar disponibilidad
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Esto se basa en transacciones con este proveedor. Ver cronología abajo para más detalles
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}
 DocType: Bank Guarantee,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado por
 DocType: Delivery Note,Return Against Delivery Note,Devolución contra nota de entrega
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,No hay boletas de salario enviadas para procesar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,No hay boletas de salario enviadas para procesar.
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar abiertos
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Es necesario tomar esta acción hoy mismo para la recurrente mencionada
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Secuencia actualizada correctamente
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Pedido
 DocType: Pricing Rule,Apply On,Aplicar en
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Support Settings,Support Settings,Configuración de respaldo
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila #{0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila #{0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Estado de Caducidad de Lote de Productos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Giro bancario
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Giro bancario
 DocType: Membership,membership validaty section,sección de validación de membresía
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 DocType: Consultation,Consultation,Consulta
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Hacer sitio web
 DocType: Opening Invoice Creation Tool Item,Quantity,Cantidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Préstamos (pasivos)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de Finalización
 DocType: Item,Country of Origin,País de origen
 DocType: Soil Texture,Soil Texture Criteria,Criterio de Textura del Suelo
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalles de Contacto Principal
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidencias Abiertas
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
 DocType: Lab Test Groups,Add new line,Añadir nueva línea
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Asistencia médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retraso en el pago (días)
@@ -89,7 +85,7 @@
 ,Delay Days,Días de Demora
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto de Servicio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Factura
+DocType: Subscription Invoice,Invoice,Factura
 DocType: Purchase Invoice Item,Item Weight Details,Detalles del Peso del Artículo
 DocType: Asset Maintenance Log,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año Fiscal {0} es necesario
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Fila #{0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Fila #{0}:
 DocType: Timesheet,Total Costing Amount,Importe total del cálculo del coste
 DocType: Delivery Note,Vehicle No,Nro de Vehículo.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Por favor, seleccione la lista de precios"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Trabajo en proceso
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor seleccione la fecha
 DocType: Daily Work Summary Group,Holiday List,Lista de festividades
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Contador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Contador
 DocType: Hub Settings,Selling Price List,Lista de Precios de Venta
 DocType: Patient,Tobacco Current Use,Consumo Actual de Tabaco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Tasa de Ventas
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Tasa de Ventas
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Teléfono No.
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nuevo/a {0}: #{1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notificación Inicial de Correo Electrónico Enviada
 ,Sales Partners Commission,Comisiones de socios de ventas
 DocType: Soil Texture,Sandy Clay Loam,Arcilla Arenosa Marga
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Valor después de Depreciación
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relacionado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,La fecha de la asistencia no puede ser inferior a la fecha de ingreso de los empleados
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,La fecha de la asistencia no puede ser inferior a la fecha de ingreso de los empleados
 DocType: Grading Scale,Grading Scale Name,Nombre de  Escala de Calificación
-DocType: Subscription,Repeat on Day,Repita el Día
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
 DocType: Sales Invoice,Company Address,Dirección de la Compañía
 DocType: BOM,Operations,Operaciones
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de descuento para {0}
+DocType: Subscription,Subscription Start Date,Fecha de inicio de la suscripción
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en cualquier año fiscal activa.
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,La fecha de finalización del período de prueba no puede ser anterior a la fecha de inicio del período de prueba
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},La Lista de Materiales no está especificada para la subcontratación del elemento {0} en la fila {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La misma Compañia es ingresada mas de una vez
 DocType: Patient,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No está permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtener artículos de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Obtener artículos de
 DocType: Price List,Price Not UOM Dependant,Precio no Dependiente de UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
@@ -178,13 +174,13 @@
 DocType: Delivery Trip,Departure Time,Hora de Salida
 DocType: Vehicle Service,Brake Oil,Aceite de Frenos
 DocType: Tax Rule,Tax Type,Tipo de impuestos
-,Completed Work Orders,Órdenes de trabajo completadas
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Base Imponible
+,Completed Work Orders,Órdenes de Trabajo completadas
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Base Imponible
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por hora / 60) * Tiempo real de la operación
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila #{0}: El tipo de documento de referencia debe ser uno de Reembolso de Gastos o Asiento Contable
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Seleccione la lista de materiales
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila #{0}: El tipo de documento de referencia debe ser uno de Reembolso de Gastos o Asiento Contable
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Seleccione la lista de materiales
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Administrar la cantidad adelantada entregada al Empleado
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Notificación de Entrega
 DocType: Journal Entry,Opening Entry,Asiento de apertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sólo cuenta de pago
-DocType: Employee Loan,Repay Over Number of Periods,Devolución por cantidad de períodos
+DocType: Loan,Repay Over Number of Periods,Devolución por cantidad de períodos
 DocType: Stock Entry,Additional Costs,Costes adicionales
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
 DocType: Education Settings,Validate Batch for Students in Student Group,Validar lote para estudiantes en grupo de estudiantes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No hay registro de vacaciones encontrados para los empleados {0} de {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},No hay registro de vacaciones encontrados para los empleados {0} de {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Por favor, ingrese primero la compañía"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Por favor, seleccione primero la compañía"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Estudiante
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Configure la plantilla predeterminada para Dejar la notificación de estado en la configuración de Recursos Humanos.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Préstamo de Empleado
 DocType: Fee Schedule,Send Payment Request Email,Enviar Solicitud de Pago por Email
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Bienes raíces
@@ -221,7 +217,7 @@
 DocType: Purchase Invoice Item,Is Fixed Asset,Es activo fijo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +313,"Available qty is {0}, you need {1}","Cantidad disponible es {0}, necesita {1}"
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +679,Work Order has been {0},La orden de trabajo ha sido {0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +679,Work Order has been {0},La Órden de Trabajo ha sido {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,Grupo de clientes duplicado encontrado en la tabla de grupo de clientes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Baja Satisfactoria.
 DocType: Assessment Result,Grade,Grado
 DocType: Restaurant Table,No of Seats,Nro de Asientos
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Para añadir temas dinámicos, utilice etiquetas jinja como <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tarea de mantenimiento de activos
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salario Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumen diario de Trabajo
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} está congelado
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Gastos sobre existencias
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Gastos sobre existencias
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Seleccionar Almacén Objetivo
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, introduzca el contacto de correo electrónico preferido"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Por favor, introduzca el contacto de correo electrónico preferido"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Dirección Primaria
 DocType: Production Plan,Material Request Detail,Detalle de Solicitud de Material
 DocType: Selling Settings,Default Quotation Validity Days,Días de Validez de Cotizaciones Predeterminados
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,Importe de Cambio
@@ -276,29 +269,31 @@
 DocType: Driver,Driving License Categories,Categorías de Licencia de Conducir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Por favor, introduzca la Fecha de Entrega"
 DocType: Depreciation Schedule,Make Depreciation Entry,Hacer la Entrada de Depreciación
+DocType: HR Settings,Leave Settings,Deje la configuración
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo de solicitud
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Crear Empleado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Difusión
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modo de configuración de POS (Online / Offline)
-DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Desactiva la creación de registros de tiempo contra Órdenes de trabajo. Las operaciones no se rastrearán en función de la orden de trabajo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Ejecución
+DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Desactiva la creación de Registros de Tiempo contra Órdenes de Trabajo. Las operaciones no se rastrearán en función de la Orden de Trabajo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Ejecución
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Asset Maintenance Log,Maintenance Status,Estado del Mantenimiento
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalles de Membresía
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: se requiere un proveedor para la cuenta por pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Productos y Precios
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Horas totales: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Drug Prescription,Interval,Intervalo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferencia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferencia
 DocType: Grant Application,Individual,Individual
 DocType: Academic Term,Academics User,Usuario Académico
 DocType: Cheque Print Template,Amount In Figure,Monto en Figura
-DocType: Employee Loan Application,Loan Info,Información del Préstamo
+DocType: Loan Application,Loan Info,Información del Préstamo
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Período de Calificación de Proveedores
-DocType: Share Transfer,Share Transfer,Compartir transferencia
+DocType: Share Transfer,Share Transfer,Compartir Transferencia
 DocType: POS Profile,Customer Groups,Grupos de Clientes
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Estados Financieros
 DocType: Guardian,Students,Estudiantes
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Plantilla del Artículo
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Bioquímica
 DocType: Job Offer,Select Terms and Conditions,Seleccione términos y condiciones
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Fuera de Valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Fuera de Valor
 DocType: Woocommerce Settings,Woocommerce Settings,Configuración de Woocommerce
 DocType: Production Plan,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
@@ -329,15 +324,17 @@
 DocType: Bank Guarantee,Bank Account,Cuenta Bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',No puede eliminar Tipo de proyecto &#39;Externo&#39;
-apps/erpnext/erpnext/public/js/utils.js +194,Select Alternate Item,Seleccionar elemento alternativo
+apps/erpnext/erpnext/public/js/utils.js +194,Select Alternate Item,Seleccionar Artículo Alternativo
 DocType: Employee,Create User,Crear usuario
 DocType: Selling Settings,Default Territory,Territorio predeterminado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisión
 DocType: Work Order Operation,Updated via 'Time Log',Actualizado a través de la gestión de tiempos
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Cantidad de avance no puede ser mayor que {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Seleccione el cliente o proveedor.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Cantidad de avance no puede ser mayor que {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: Company,Enable Perpetual Inventory,Habilitar Inventario Perpetuo
+DocType: Bank Guarantee,Charges Incurred,Cargos incurridos
 DocType: Company,Default Payroll Payable Account,La nómina predeterminada de la cuenta por pagar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Editar Grupo de Correo Electrónico
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Resultado Personalizado
 DocType: Delivery Stop,Contact Name,Nombre de contacto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de Evaluación del Curso
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Identificación del impuesto:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Identificación del Impuesto:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Identificación del Estudiante:
 DocType: POS Customer Group,POS Customer Group,POS Grupo de Clientes
 DocType: Land Unit,Land Unit describing various land assets,Unidad de tierra describiendo varios activos de tierra
@@ -371,12 +368,11 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
 DocType: Lab Test,Submitted Date,Fecha de Envío
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creada en contra de este proyecto
-,Open Work Orders,Abrir órdenes de trabajo
+,Open Work Orders,Abrir Órdenes de Trabajo
 DocType: Payment Term,Credit Months,Meses de Crédito
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pago Neto no puede ser menor que 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Para dejar de enviar notificaciones de errores repetitivos desde el sistema, hemos marcado el campo Deshabilitado en la suscripción"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
 DocType: Email Digest,Profit & Loss,Perdidas & Ganancias
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Importe total del cálculo del coste (mediante el cuadro de horario de trabajo)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Por favor, configure los estudiantes en grupos de estudiantes"
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Asientos Bancarios
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Asientos Bancarios
 DocType: Crop,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso herramienta de creación de grupo de alumnos
 DocType: Lead,Do Not Contact,No contactar
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Personas que enseñan en su organización
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Desarrollador de Software.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Course Scheduling Tool,Course Start Date,Fecha de inicio del Curso
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Detalles de Compra
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Grado máximo
 DocType: Email Digest,New Quotations,Nuevas Cotizaciones
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envíe por correo electrónico el recibo de salario al empleado basándose en el correo electrónico preferido seleccionado en Empleado
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Tax Rule,Shipping County,País de envío
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Aprender
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprender
 DocType: Asset,Next Depreciation Date,Siguiente Fecha de Depreciación
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
@@ -452,14 +447,14 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
 DocType: Driver,Fleet Manager,Gerente de Fota
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Fila #{0}: {1} no puede ser negativo para el elemento {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Fila #{0}: {1} no puede ser negativo para el elemento {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Contraseña Incorrecta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +111,Circular Reference Error,Error de referencia circular
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,Boleta de calificaciones estudiantil
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,Boleta de Calificaciones Estudiantil
 DocType: Appointment Type,Is Inpatient,Es paciente hospitalizado
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nombre del Tutor1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
@@ -471,10 +466,10 @@
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Esto se basa en transacciones contra esta Compañía. Vea la cronología a continuación para más detalles
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistente
-apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Configura la tarifa de la habitación del hotel el {}
+apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Configura la Tarifa de la Habitación del Hotel el {}
 DocType: Journal Entry,Multi Currency,Multi Moneda
 DocType: Opening Invoice Creation Tool,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Nota de entrega
 DocType: Consultation,Encounter Impression,Encuentro de la Impresión
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Costo del activo vendido
@@ -501,17 +496,16 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de Cursos
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila #{0}: Factura de compra no se puede hacer frente a un activo existente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgente] Error al crear recurrente %s para %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila #{0}: Factura de compra no se puede hacer frente a un activo existente {1}
 DocType: Land Unit,LInked Analysis,Análisis Vinculado
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,El período de solicitud no puede estar en dos registros de asignación
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,El período de solicitud no puede estar en dos registros de asignación
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el empleado {1} para el periodo {2} hasta {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Fila #{0}: El lote no puede ser igual a {1} {2}
 DocType: Material Request Plan Item,Material Request Plan Item,Artículo de Plan de Solicitud de Material
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
-DocType: Project Update,Good/Steady,Bueno / constante
+DocType: Project Update,Good/Steady,Bueno / Constante
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
 apps/erpnext/erpnext/accounts/party.py +248,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
 DocType: Volunteer,Weekends,Fines de Semana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Monto de Nota de Credito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Monto de Nota de Credito
 DocType: Setup Progress Action,Action Document,Documento de Acción
 DocType: Chapter Member,Website URL,URL del Sitio Web
 ,Finished Goods,Productos terminados
@@ -527,12 +521,13 @@
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Asset Maintenance Log,Maintenance Type,Tipo de Mantenimiento
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} no está inscrito en el Curso {2}
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nombre del estudiante:
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nombre del Estudiante:
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Parece que hay un problema con la configuración GoCardless del servidor. No se preocupe, en caso de falla, la cantidad será reembolsada a su cuenta."
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Parece que hay un problema con la configuración del servidor GoCardless. No se preocupe, en caso de falla, la cantidad será reembolsada a su cuenta."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demostración ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Añadir los artículos
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
+DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias
 DocType: Depreciation Schedule,Schedule Date,Fecha de programa
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Los ingresos, deducciones y otros componentes salariales"
 DocType: Packed Item,Packed Item,Artículo empacado
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Solicitud de Cotización
 DocType: Healthcare Settings,Require Lab Test Approval,Requerir la aprobación de la Prueba de Laboratorio
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabajo
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total Excepcional
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total Excepcional
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 DocType: Dosage Strength,Strength,Fuerza
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Crear un nuevo cliente
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Coste de consumibles
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
 DocType: Student Log,Medical,Médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Razón de pérdida
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Razón de pérdida
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Actualizar Número de Cuenta
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Propietario de Iniciativa no puede ser igual que el de la Iniciativa
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,importe asignado no puede superar el importe no ajustado
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Soltero
 DocType: Salary Slip,Total Loan Repayment,Amortización total del préstamo
 DocType: Account,Cost of Goods Sold,Costo sobre ventas
-DocType: Subscription,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, introduzca el centro de costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Por favor, introduzca el centro de costos"
 DocType: Drug Prescription,Dosage,Dosificación
 DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Precio de venta promedio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Precio de venta promedio
 DocType: Assessment Plan,Examiner Name,Nombre del examinador
 DocType: Lab Test Template,No Result,Sin resultados
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Precios
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lea el Manual ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Mostrar hojas de todos los miembros del departamento en el calendario
 DocType: Purchase Invoice,01-Sales Return,01-Devoluciones de Ventas
 DocType: Account,Is Group,Es un grupo
 DocType: Email Digest,Pending Purchase Orders,A la espera de órdenes de compra
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Campo obligatorio - Año Académico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} no está asociado con {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de este correo electrónico. Cada transacción tiene un texto introductorio separado.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Establezca la cuenta de pago predeterminada para la empresa {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transacción no permitida contra Orden de trabajo detenida {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Establezca la cuenta de pago predeterminada para la empresa {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transacción no permitida contra Órden de Trabajo detenida {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
@@ -619,7 +614,7 @@
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +46,PieceRef,PieceRef
 DocType: Request for Quotation,Message for Supplier,Mensaje para los Proveedores
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,Orden de trabajo
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,Órden de Trabajo
 DocType: Driver,DRIVER-.#####,CONDUCTOR-.#####
 DocType: Sales Invoice,Total Qty,Cantidad Total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,ID de correo electrónico del Tutor2
@@ -630,9 +625,9 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venta
 DocType: Packing Slip,From Package No.,Desde Paquete Nro.
 DocType: Item Attribute,To Range,A rango
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No se puede cambiar el método de valoración, ya que hay transacciones contra algunos elementos que no tiene su propio método de valoración"
-DocType: Student Report Generation Tool,Attended by Parents,Asistido por los padres
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Valores y depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No se puede cambiar el método de valoración, ya que hay transacciones contra algunos elementos que no tiene su propio método de valoración"
+DocType: Student Report Generation Tool,Attended by Parents,Asistido por los Padres
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Las hojas totales asignadas son obligatorias
 DocType: Patient,AB Positive,AB Positivo
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
@@ -640,8 +635,8 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registros de asistencias.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente de salario para la nómina basada en hoja de salario.
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
-DocType: Employee Loan,Total Payment,Pago total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,No se puede cancelar la transacción para la Orden de trabajo completada.
+DocType: Loan,Total Payment,Pago total
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,No se puede cancelar la transacción para la Orden de Trabajo completada.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} está cancelado por lo tanto la acción no puede ser completada
 DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piezas suficiente para construir
 DocType: POS Profile User,POS Profile User,Usuario de Perfil POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingreso directo
+DocType: Subscription Invoice,Subscription Invoice,Factura de suscripción
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Ingreso directo
 DocType: Patient Appointment,Date TIme,Fecha y Hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Funcionario administrativo
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Configuración de Compañía e Impuestos
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Por favor seleccione Curso
 DocType: Codification Table,Codification Table,Tabla de Codificación
 DocType: Timesheet Detail,Hrs,Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Por favor, seleccione la empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry Detail,Difference Account,Cuenta para la Diferencia
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN de Proveedor
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
@@ -686,14 +682,15 @@
 DocType: Purchase Invoice Item,Item,Productos
 apps/erpnext/erpnext/healthcare/setup.py +256,High Sensitivity,Alta Sensibilidad
 apps/erpnext/erpnext/config/non_profit.py +48,Volunteer Type information.,Información de Tipo de Voluntario
-DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Plantilla de mapeo de flujo de caja
+DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Plantilla de mapeo de Flujo de Caja
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
+DocType: Bank Guarantee,Providing,Siempre que
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","No permitido, configure la Plantilla de Prueba de Laboratorio según sea necesario"
 DocType: Patient,Risk Factors,Factores de Riesgo
 DocType: Patient,Occupational Hazards and Environmental Factors,Riesgos Laborales y Factores Ambientales
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +279,Stock Entries already created for Work Order ,Entradas de stock ya creadas para Orden de trabajo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +279,Stock Entries already created for Work Order ,Entradas de Stock ya creadas para Órden de Trabajo
 DocType: Vital Signs,Respiratory rate,Frecuencia Respiratoria
 apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,Gestión de sub-contrataciones
 DocType: Vital Signs,Body Temperature,Temperatura Corporal
@@ -703,7 +700,7 @@
 DocType: Supplier Scorecard,Weighting Function,Función de ponderación
 DocType: Physician,OP Consulting Charge,Cargo de Consultoría OP
 apps/erpnext/erpnext/utilities/user_progress.py +28,Setup your ,Configure su
-DocType: Student Report Generation Tool,Show Marks,Mostrar marcas
+DocType: Student Report Generation Tool,Show Marks,Mostrar Marcas
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +70,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +52,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
 DocType: Healthcare Settings,Appointment Confirmation,Confirmación de la Cita
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Cierre (Cred)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hola
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Mover Elemento
@@ -729,7 +726,7 @@
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
 apps/erpnext/erpnext/accounts/party.py +396,{0} {1} is not active,{0} {1} no está activo
-DocType: Woocommerce Settings,Freight and Forwarding Account,Cuenta de flete y reenvío
+DocType: Woocommerce Settings,Freight and Forwarding Account,Cuenta de Flete y Reenvío
 apps/erpnext/erpnext/config/accounts.py +272,Setup cheque dimensions for printing,Configurar dimensiones de cheque para la impresión
 DocType: Salary Slip,Salary Slip Timesheet,Registro de Horas de Nómina
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
@@ -738,18 +735,18 @@
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Todas las Evaluaciones del Proveedor
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Target warehouse in row {0} must be same as Work Order,El almacén de destino en la fila {0} debe ser igual que la orden de trabajo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Target warehouse in row {0} must be same as Work Order,El Almacén de Destino en la fila {0} debe ser igual que la Órden de Trabajo
 apps/erpnext/erpnext/stock/doctype/item/item.py +155,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +34,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Ya se configuró por defecto en el perfil de pos {0} para el usuario {1}, amablemente desactivado por defecto"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores acumulados
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Se requiere territorio en el perfil de punto de venta
 DocType: Supplier,Prevent RFQs,Evitar las Solicitudes de Presupuesto (RFQs)
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Crear Orden de Venta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Recibo de Salario enviado para el período de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Recibo de Salario enviado para el período de {0} a {1}
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
@@ -767,11 +764,12 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +108,Create Variant,Crear Variante
-DocType: Sales Invoice,Shipping Bill Date,Fecha de facturación de envío
+DocType: Sales Invoice,Shipping Bill Date,Fecha de Facturación de Envío
 DocType: Production Plan,Production Plan,Plan de Producción
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Herramienta de Apertura de Creación de Facturas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Devoluciones de ventas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota:  Las vacaciones totales asignadas {0} no debe ser inferior a las vacaciones ya aprobadas {1} para el período
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Establezca la cantidad en transacciones basadas en la entrada en serie sin
 ,Total Stock Summary,Resumen de stock total
 DocType: Announcement,Posted By,Publicado por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (Envío Triangulado)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Presupuesto para
 DocType: Lead,Middle Income,Ingreso Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Monto asignado no puede ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Por favor establezca la empresa
-DocType: Share Balance,Share Balance,Compartir saldo
+DocType: Share Balance,Share Balance,Compartir Saldo
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Training Result Employee,Training Result Employee,Resultado del Entrenamiento del Empleado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el que se crean las entradas de inventario
-DocType: Repayment Schedule,Principal Amount,Cantidad Principal
-DocType: Employee Loan Application,Total Payable Interest,Interés Total a Pagar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Cantidad Principal
+DocType: Loan Application,Total Payable Interest,Interés Total a Pagar
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total Pendiente: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Horas de Factura de Venta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de Restaurante
 DocType: Land Unit,Land Unit Name,Nombre de la Unidad de Tierra
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Redacción de propuestas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Redacción de propuestas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Deducción de Entrada de Pago
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Terminando
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Notificar a los Clientes por Correo Electrónico
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Notificar a los Clientes por Correo Electrónico
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 DocType: Employee Advance,Claimed Amount,Cantidad Reclamada
 apps/erpnext/erpnext/config/education.py +180,Masters,Maestros
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Cuenta de Pasarela de Pago no creada, por favor crear una manualmente."
 DocType: Supplier Scorecard,Per Year,Por Año
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No es elegible para la admisión en este programa según la fecha de nacimiento
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
 DocType: Vital Signs,Height (In Meter),Altura (en Metros)
 DocType: Student,Sibling Details,Detalles de hermanos
 DocType: Vehicle Service,Vehicle Service,Servicio del Vehículo
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitida
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Cambio neto en el inventario
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Administración de Préstamos de Empleado
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relación con Tutor2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Gerente
 DocType: Payment Entry,Payment From / To,Pago de / a
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Configura la Cuenta en Almacén {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Transferencia de Material
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,No se pudo encontrar la ruta para
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Apertura (Deb)
+DocType: Loan,Applicant,Solicitante
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Para hacer documentos recurrentes
 ,GST Itemised Purchase Register,Registro detallado de la TPS
 DocType: Course Scheduling Tool,Reschedule,Reprogramar
-DocType: Employee Loan,Total Interest Payable,Interés total a pagar
+DocType: Loan,Total Interest Payable,Interés total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Work Order Operation,Actual Start Time,Hora de inicio real
 DocType: BOM Operation,Operation Time,Tiempo de Operación
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Terminar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Base
 DocType: Timesheet,Total Billed Hours,Total de Horas Facturadas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Importe de Desajuste
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Importe de Desajuste
 DocType: Leave Block List Allow,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancias/pérdidas por enajenación de activos fijos
 DocType: Vehicle Log,Service Details,Detalles del servicio
-DocType: Subscription,Quarterly,Trimestral
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Agrupado
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en
 DocType: Sales Invoice,Port Code,Código de Puerto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Almacén de Reserva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Almacén de Reserva
 DocType: Lead,Lead is an Organization,La Iniciativa es una Organización
 DocType: Guardian Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Cuentas
 DocType: Vehicle,Odometer Value (Last),Valor del cuentakilómetros (Última)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Plantillas de criterios de Calificación de Proveedores.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Entrada de Pago ya creada
 DocType: Request for Quotation,Get Suppliers,Obtener Proveedores
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Fila #{0}:  Activo {1} no vinculado al elemento {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Previsualización de Nómina
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Fila #{0}:  Activo {1} no vinculado al elemento {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Previsualización de Nómina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Solo puede renovar si su membresía vence dentro de los 30 días
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Seleccione solo si tiene documentos de Cash Flow Mapper configurados
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Supplier Scorecard,Per Week,Por Semana
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total de Estudiantes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Producto {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa y Contabilidad
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,En Valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,En Valor
 DocType: Asset Settings,Depreciation Options,Opciones de Depreciación
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Tiempo de Publicación no Válido
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Tiempo de Publicación no Válido
 DocType: Lead,Campaign Name,Nombre de la campaña
 DocType: Hotel Room,Capacity,Capacidad
 DocType: Selling Settings,Close Opportunity After Days,Cerrar Oportunidad Después Días
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Budget,Budget Against,Contra Presupuesto
 DocType: Employee,Cell Number,Número de movil
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hay empleado para los criterios dados. Verifique que las hojas salariales aún no se hayan creado.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hay empleado para los criterios dados. Verifique que las hojas salariales aún no se hayan creado.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Solicitudes de Material Automáticamente Generadas
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
@@ -1000,19 +996,19 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Por favor seleccione una mesa
 DocType: BOM,Website Specifications,Especificaciones del sitio web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} es una dirección de correo electrónico no válida en &quot;Destinatarios&quot;
 DocType: Special Test Items,Particulars,Datos Particulares
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Asset,Maintenance,Mantenimiento
+DocType: Subscriber,Subscriber,Abonado
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
-apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Actualice su estado de proyecto
+apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Actualice su Estado de Proyecto
 DocType: Item,Maximum sample quantity that can be retained,Cantidad máxima de muestra que se puede retener
-DocType: Project Update,How is the Project Progressing Right Now?,¿Cómo está progresando el proyecto ahora?
+DocType: Project Update,How is the Project Progressing Right Now?,¿Cómo está progresando el Proyecto ahora?
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +459,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Fila {0}# El elemento {1} no puede transferirse más de {2} a la Orden de Compra {3}
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campañas de venta.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Timesheet,hacer parte de horas
@@ -1041,31 +1037,31 @@
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Parcialmente Ordenado
 DocType: Lab Test,Lab Test,Prueba de Laboratorio
-DocType: Student Report Generation Tool,Student Report Generation Tool,Herramienta de generación de informes estudiantiles
+DocType: Student Report Generation Tool,Student Report Generation Tool,Herramienta de Generación de Informes Estudiantiles
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para carrito de compras
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Añadir Intervalos de Tiempo
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Activos desechado a través de entrada de diario {0}
-DocType: Employee Loan,Interest Income Account,Cuenta de Utilidad interés
+DocType: Loan,Interest Income Account,Cuenta de Utilidad interés
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Invitación de Revisión enviada
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotecnología
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Gastos de Mantenimiento de Oficina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Gastos de Mantenimiento de Oficina
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Ir a
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuración de cuentas de correo electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Asset Repair,Downtime,Tiempo de Inactividad
 DocType: Account,Liability,Obligaciones
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Término Académico:
 DocType: Salary Detail,Do not include in total,No incluir en total
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},La Cantidad de Muestra {0} no puede ser más que la Cantidad Recibida {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar correo electronico
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 DocType: Item,Max Sample Quantity,Cantidad de Muestra Máxima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Sin permiso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Sin permiso
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Presupuesto Solicitado
 DocType: Vital Signs,Heart Rate / Pulse,Frecuencia Cardíaca / Pulso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
@@ -1076,19 +1072,18 @@
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Pruebas de Laboratorio y Signos Vitales
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Fila  #{0}: Activo {1} debe ser presentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Fila  #{0}: Activo {1} debe ser presentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Empleado no encontrado
-DocType: Subscription,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
-apps/erpnext/erpnext/config/projects.py +18,Project Update.,Actualización del proyecto.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
+apps/erpnext/erpnext/config/projects.py +18,Project Update.,Actualización del Proyecto.
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
 DocType: Land Unit,Tree Details,Detalles del árbol
 DocType: Training Event,Event Status,Estado de Eventos
 DocType: Volunteer,Availability Timeslot,Intervalo de tiempo de disponibilidad
 ,Support Analytics,Soporte Analítico
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +365,"If you have any questions, please get back to us.","Si usted tiene alguna pregunta, por favor consultenos."
-DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
+DocType: Cash Flow Mapper,Cash Flow Mapper,Mapeador de Flujo de Caja
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Monto Mínimo de Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: El centro de costos {2} no pertenece a la empresa {3}
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Asistente de importación
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Todos los Grupos de Artículos
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Work Order,Item To Manufacture,Producto para Manufactura
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} el estado es {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vuelva a seleccionar, si la dirección elegida se edita después de guardar"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 DocType: Item,Hub Publishing Details,Detalle de Publicación del Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Apertura&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Apertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Lista de tareas abiertas
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Lab Test Template,Result Format,Formato del Resultado
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Bimensual
 DocType: Vehicle Service,Brake Pad,Pastilla de Freno
 DocType: Fertilizer,Fertilizer Contents,Contenido del Fertilizante
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Investigación y desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Investigación y desarrollo
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
 DocType: Timesheet,Total Billed Amount,Monto total Facturado
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Evitar el control de límite de crédito en la Orden de Venta
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Evaluación de desempeño.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitar' Uso para el carro de la compra', ya que el carro de la compra está habilitado y debería haber al menos una regla de impuestos para el carro de la compra."
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazada con la Orden {1}, comprobar si se debe ser retirado como avance en esta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazada con la Orden {1}, comprobar si se debe ser retirado como avance en esta factura."
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punto de Venta (POS)
@@ -1194,15 +1188,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +108,Setup your Institute in ERPNext,Configura tu Instituto en ERPNext
 DocType: Agriculture Analysis Criteria,Plant Analysis,Análisis de Planta
 DocType: Job Applicant,Hold,Mantener
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +128,Alternate Item,Artículo alternativo
-DocType: Project Update,Progress Details,Detalles de progreso
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +128,Alternate Item,Artículo Alternativo
+DocType: Project Update,Progress Details,Detalles de Progreso
 DocType: Employee,Date of Joining,Fecha de Ingreso
 DocType: Naming Series,Update Series,Definir Secuencia
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Restaurant Table,Minimum Seating,Asientos Mínimos
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 DocType: Examination Result,Examination Result,Resultado del examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Doctype de referencia debe ser uno de {0}
@@ -1210,18 +1204,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Socios Comerciales y Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,No hay Elementos disponibles para transferir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,No hay Elementos disponibles para transferir
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Cierre (Apertura + Total)
 DocType: Journal Entry,Depreciation Entry,Entrada de Depreciación
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
 DocType: Crop Cycle,ISO 8016 standard,Estándar ISO 8016
 DocType: Pricing Rule,Rate or Discount,Tarifa o Descuento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoritos
-DocType: Hub Settings,Custom Data,Datos personalizados
+DocType: Hub Settings,Custom Data,Datos Personalizados
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Warehouses with existing transaction can not be converted to ledger.,Complejos de depósito de transacciones existentes no se pueden convertir en el libro mayor.
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,Publicación por internet
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Norma del Código Médico
 DocType: Soil Texture,Clay Composition (%),Composición de arcilla (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Por favor, guarde antes de asignar la tarea."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valor de balance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valor de balance
 DocType: Lab Test,Lab Technician,Técnico de Laboratorio
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista de precios para la venta
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si se selecciona, se creará un cliente, asignado a Paciente. Se crearán facturas de pacientes contra este cliente. También puede seleccionar al cliente existente mientras crea el paciente."
 DocType: Bank Reconciliation,Account Currency,Divisa de cuenta
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo"
 DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Fee Structure,Components,componentes
 DocType: Item Barcode,Item Barcode,Código de Barras del Producto
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el  artículo {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","A ser generaro. Si se demora, tendrá que cambiar manualmente el campo ""Repetir el día del mes"" de este documento"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
 DocType: Share Transfer,From Folio No,Desde Folio Nro
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
@@ -1259,11 +1251,11 @@
 DocType: Work Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
 DocType: Payment Terms Template,Payment Terms Template,Plantilla de Términos de Pago
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,La marca
-DocType: Manufacturing Settings,Allow Multiple Material Consumption,Permitir el consumo de material múltiple
+DocType: Manufacturing Settings,Allow Multiple Material Consumption,Permitir el Consumo de Material Múltiple
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
 DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
-DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,Permitir el consumo de material múltiple contra una orden de trabajo
+DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,Permitir el Consumo de Material Múltiple contra una Orden de Trabajo
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
 apps/erpnext/erpnext/accounts/page/pos/pos.js +789,New Sales Invoice,Nueva factura de venta
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
@@ -1277,23 +1269,24 @@
 DocType: Program Fee,Program Fee,Cuota del Programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
 It also updates latest price in all the BOMs.","Reemplazar una lista de materiales determinada en todas las demás listas de materiales donde se utiliza. Reemplazará el enlace de la lista de materiales antigua, actualizará el coste y regenerará la tabla ""Posición de explosión de la lista de materiales"" según la nueva lista de materiales. También actualiza el precio más reciente en todas las listas de materiales."
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +447,The following Work Orders were created:,Se crearon las siguientes órdenes de trabajo:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +447,The following Work Orders were created:,Se crearon las siguientes Órdenes de Trabajo:
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
-,Employee Advance Summary,Resumen de avance del empleado
+,Employee Advance Summary,Resumen de Avance del Empleado
 DocType: Asset,Available-for-use Date,Fecha disponible para usar
 DocType: Guardian,Guardian Name,Nombre del Tutor
 DocType: Cheque Print Template,Has Print Format,Tiene Formato de Impresión
-DocType: Employee Loan,Sanctioned,Sancionada
+DocType: Loan,Sanctioned,Sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Posiblemente el registro de cambio de divisa no ha sido creado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Fila #{0}: Por favor, especifique el número de serie para el producto {1}"
 DocType: Crop Cycle,Crop Cycle,Ciclo de Cultivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 DocType: Student Admission,Publish on website,Publicar en el sitio web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Fecha de Factura de Proveedor no puede ser mayor que la fecha de publicación
+DocType: Subscription,Cancelation Date,Fecha de cancelación
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 DocType: Agriculture Task,Agriculture Task,Tarea de Agricultura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Ingresos indirectos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Ingresos indirectos
 DocType: Student Attendance Tool,Student Attendance Tool,Herramienta de asistencia de los estudiantes
 DocType: Restaurant Menu,Price List (Auto created),Lista de Precios (Creada Automáticamente)
 DocType: Cheque Print Template,Date Settings,Ajustes de Fecha
@@ -1308,7 +1301,7 @@
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +25,Print Report Card,Imprimir boleta de calificaciones
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +25,Print Report Card,Imprimir Boleta de Calificaciones
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Fila {0}: factura {1} no es válida, puede que esté cancelada / no existe. \ Por favor, introduzca una factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metro
 DocType: Workstation,Electricity Cost,Costos de Energía Eléctrica
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,La hora de prueba de laboratorio no puede ser antes de la fecha de recopilación
+DocType: Subscription Plan,Cost,Costo
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
 DocType: Expense Claim,Total Advance Amount,Monto Total Anticipado
 DocType: Delivery Stop,Estimated Arrival,Llegada Estimada
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
 DocType: Timesheet Detail,Bill,Cuenta
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La próxima fecha de depreciación  se introduce como fecha pasada
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanco
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Solo puede seleccionar un máximo de una opción de la lista de casillas de verificación.
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 DocType: Item,Automatically Create New Batch,Crear Automáticamente Nuevo Lote
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Asignando {0} a {1} (fila {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Asignando {0} a {1} (fila {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Crear
 DocType: Student Admission,Admission Start Date,Fecha de inicio de la admisión
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nuevo Empleado
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del balance del préstamo
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendario de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opciones de stock
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Inhabilitar la obtención de los últimos datos de compra en la Orden de Compra
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
@@ -1372,15 +1366,16 @@
 DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: Purchase Invoice,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Por favor especificar un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,La creación de Variantes se ha puesto en cola.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Resumen de Trabajo para {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Tabla de atributos es obligatoria
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,El primer Permiso de aprobación en la lista se establecerá como el Autorizador de permiso predeterminado.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Tabla de atributos es obligatoria
 DocType: Production Plan,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} no puede ser negativo
 DocType: Training Event,Self-Study,Autoestudio
-apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +27,Soil compositions do not add up to 100,Las composiciones de suelo no suman 100
+apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +27,Soil compositions do not add up to 100,Las Composiciones de Suelo no suman 100
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +567,Discount,Descuento
 DocType: Membership,Membership,Membresía
 DocType: Asset,Total Number of Depreciations,Número total de amortizaciones
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Salarios
 DocType: Asset Maintenance,Maintenance Manager Name,Nombre del Administrador de Mantenimiento
 DocType: Agriculture Task,Urgent,Urgente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,No se puede encontrar la variable:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Por favor, seleccione un campo para editar desde numpad"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,No puede ser un elemento de Activo Fijo ya que se creo un Libro de Stock .
@@ -1398,9 +1393,9 @@
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
 DocType: POS Profile,Sales Invoice Payment,Pago de Facturas de Venta
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nombre de Plantilla de Inspección de Calidad
-DocType: Project,First Email,Primer correo electrónico
+DocType: Project,First Email,Primer Correo Electrónico
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Cantidad de venta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Cantidad de venta
 DocType: Repayment Schedule,Interest Amount,Cantidad de Interés
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Share Transfer,Issue,Incidencia
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Estado de envío
 ,Projected Quantity as Source,Cantidad proyectada como Fuente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Viaje de Entrega
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Viaje de Entrega
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo de Transferencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Gastos de venta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Gastos de venta
 DocType: Consultation,Diagnosis,Diagnóstico
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Socio de Implementación
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Orden de Venta {0} es {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Seleccione la cuenta de ingresos por intereses en préstamo {0}
 DocType: Opportunity,Contact Info,Información de contacto
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Crear Asientos de Stock
 DocType: Packing Slip,Net Weight UOM,Unidad de medida para el peso neto
 DocType: Item,Default Supplier,Proveedor predeterminado
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción
-DocType: Employee Loan,Repayment Schedule,Calendario de reembolso
+DocType: Loan,Repayment Schedule,Calendario de reembolso
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla de envío
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
@@ -1445,22 +1441,24 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Education Settings,Attendance Freeze Date,Fecha de Congelación de Asistencia
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver todos los Productos
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Ver todos los Productos
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Edad mínima de Iniciativa (días)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Todas las listas de materiales
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Las habitaciones de hotel del tipo {0} no están disponibles en {1}
 DocType: Patient,Default Currency,Divisa / modena predeterminada
 DocType: Expense Claim,From Employee,Desde Empleado
 DocType: Driver,Cellphone Number,Número Celular
-DocType: Project,Monitor Progress,Monitorear el progreso
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
+DocType: Project,Monitor Progress,Monitorear el Progreso
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia
+DocType: Supplier Quotation,Auto Repeat Section,Sección de repetición automática
 DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
 DocType: Program Enrollment,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atributo no válido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} debe ser presentado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
+DocType: Department Approver,Department Approver,Aprobador de departamento
 DocType: SMS Center,Total Characters,Total Caracteres
 DocType: Employee Advance,Claimed,Reclamado
 DocType: Crop,Row Spacing,Distancia entre Filas
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Margen %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Según las Configuraciones de Compras si el Pedido de Compra es Obligatorio == 'Si', para crear la Factura de Compra el usuario necesita crear el Pedido de Compra primero para el item {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-summary of outward supplies
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
@@ -1483,13 +1482,13 @@
 DocType: Setup Progress Action,Action Name,Nombre de la Acción
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Año de inicio
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Los primero 2 dígitos de GSTIN debe coincidir con un numero de estado {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Fecha inicial del período de facturación
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Error en la planificación de capacidad
 ,Trial Balance for Party,Balance de Terceros
 DocType: Lead,Consultant,Consultor
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +356,Parents Teacher Meeting Attendance,Padres Maestros Asistencia a la reunión
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +356,Parents Teacher Meeting Attendance,Padres Maestros Asistencia a la Reunión
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +483,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de saldos contables
@@ -1501,28 +1500,28 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Los campos se copiarán solo al momento de la creación.
 DocType: Setup Progress Action,Domains,Dominios
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Gerencia
 DocType: Cheque Print Template,Payer Settings,Configuración del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
 DocType: Purchase Invoice,Is Return,Es un retorno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Precaución
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',El día de inicio es mayor que el día final en la tarea &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retorno / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,Lista de precios del país
 DocType: Item,UOMs,UdM
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
 DocType: Purchase Invoice Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Por favor, introduzca el código de artículo para obtener el número de lote"
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
-DocType: Employee Loan,Partially Disbursed,Parcialmente Desembolsado
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Información de la Concesión.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Información de la Concesión.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,No puede reiniciar una Suscripción que no está cancelada.
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
 DocType: Fee Validity,Valid Till,Válida Hasta
-DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Reunión total de padres y maestros
+DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Reunión total de Padres y Maestros
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en el perfil del punto de venta."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mismo artículo no se puede introducir varias veces.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
@@ -1531,15 +1530,15 @@
 DocType: Course,Course Intro,Introducción del Curso
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,Entrada de Stock {0} creada
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila #{0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
-apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,No se permite cambiar el grupo de clientes para el cliente seleccionado.
+apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,No se permite cambiar el Grupo de Clientes para el Cliente seleccionado.
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Actualizando tiempos estimados de llegada.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualizando tiempos estimados de llegada.
 DocType: Program Enrollment Tool,Enrollment Details,Detalles de Inscripción
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Seleccione un Cliente
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
-DocType: Student Report Generation Tool,Assessment Terms,Términos de evaluación
+DocType: Student Report Generation Tool,Assessment Terms,Términos de Evaluación
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Holiday,Holiday,Vacaciones
 DocType: Support Settings,Close Issue After Days,Cerrar Problema Después Días
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Purchase Order,Group same items,Agrupar mismos artículos
 DocType: Purchase Invoice,Disable Rounded Total,Desactivar redondeo
-DocType: Employee Loan Application,Repayment Info,Información de la Devolución
+DocType: Department,Parent Department,Departamento de Padres
+DocType: Loan Application,Repayment Info,Información de la Devolución
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entradas' no pueden estar vacías
 DocType: Maintenance Team Member,Maintenance Role,Rol de Mantenimiento
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de Comprobación
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Año fiscal {0} no encontrado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Año fiscal {0} no encontrado
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Configuración de empleados
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuario de Reserva de Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Investigación
+DocType: Subscription Settings,Subscription Settings,Configuración de suscripción
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Announcement,All Students,Todos los estudiantes
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Crop Cycle,Less than a year,Menos de un año
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Número de Móvil del Estudiante.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 DocType: Crop,Yield UOM,Rendimiento UOM
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago Bruto
 DocType: Item,Is Item from Hub,Es Artículo para Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,DIVIDENDOS PAGADOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,DIVIDENDOS PAGADOS
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro de contabilidad
 DocType: Stock Reconciliation,Difference Amount,Diferencia
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} en Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,Carga inversa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,UTILIDADES RETENIDAS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,UTILIDADES RETENIDAS
 DocType: Purchase Invoice,05-Change in POS,05-Cambio en POS
 DocType: Vehicle Log,Service Detail,Detalle del servicio
 DocType: BOM,Item Description,Descripción del producto
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 ,Student and Guardian Contact Details,Detalles de Contacto de Alumno y Tutor
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Para el proveedor {0} se requiere la Dirección de correo electrónico para enviar correo electrónico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Apertura temporal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Apertura temporal
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Ver Hub
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
 DocType: Patient Appointment,More Info,Más información
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
 DocType: Supplier Scorecard,Scorecard Actions,Acciones de Calificación de Proveedores
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Ejemplo: Maestría en Ciencias de la Computación
 DocType: Purchase Invoice,Rejected Warehouse,Almacén rechazado
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Supplier Quotation Item,Lead Time in days,Plazo de ejecución en días
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Balance de cuentas por pagar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Pago de salario de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Pago de salario de {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Orden de venta {0} no es válida
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripciones para pruebas de laboratorio
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Pequeño
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Apertura de Elemento de Herramienta de Creación de Factura
 DocType: Education Settings,Employee Number,Número de empleado
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Cancelar la factura después del período de gracia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 DocType: Project,% Completed,% Completado
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Prueba de Laboratorio Fecha y Hora
 DocType: Email Digest,Add Quote,Añadir Cita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Egresos indirectos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
 DocType: Agriculture Analysis Criteria,Agriculture,Agricultura
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sincronización de datos maestros
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,BIENES DE CAPITAL
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Configure primero el Código del Artículo
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
+DocType: Subscription Plan,Billing Interval Count,Contador de intervalo de facturación
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 DocType: Antibiotic,Antibiotic,Antibiótico
 ,Team Updates,Actualizaciones equipo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,De proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Formato de Impresión
@@ -1691,7 +1694,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Sólo puede existir una 'regla de envió' con valor 0 o valor en blanco en 'para el valor'
 DocType: Authorization Rule,Transaction,Transacción
 DocType: Patient Appointment,Duration,Duración
-apps/erpnext/erpnext/controllers/status_updater.py +160,"For an item {0}, quantity must be positive number","Para un artículo {0}, la cantidad debe ser número positivo"
+apps/erpnext/erpnext/controllers/status_updater.py +160,"For an item {0}, quantity must be positive number","Para un Artículo {0}, la cantidad debe ser número positivo"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: este centro de costes es una categoría. No se pueden crear asientos contables en las categorías.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +53,Child warehouse exists for this warehouse. You can not delete this warehouse.,No se puede eliminar este almacén. Existe almacén hijo para este almacén.
 DocType: Item,Website Item Groups,Grupos de productos en el sitio web
@@ -1705,8 +1708,8 @@
 DocType: Grading Scale Interval,Grade Code,Código de Grado
 DocType: POS Item Group,POS Item Group,POS Grupo de artículos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,El artículo alternativo no debe ser el mismo que el código del artículo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,El Artículo Alternativo no debe ser el mismo que el Código del Artículo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalización de la Evaluación Provisional
 DocType: Salary Slip,Bank Account No.,Cta. bancaria núm.
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Puesto de Trabajo
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Proveedor de Solicitud de Presupuesto
 DocType: Healthcare Settings,Registration Message,Mensaje de Registro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Dosis de prescripción
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, seleccione la compañía"
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Fechas de Inicio y Fin
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir la lista de materiales {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 DocType: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Project Update,Great/Quickly,Genial / Rápidamente
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Por favor, seleccione lotes para el artículo en lote"
 DocType: Asset,Depreciation Schedules,programas de depreciación
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Las siguientes cuentas se pueden seleccionar en Configuración de GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Las siguientes cuentas se pueden seleccionar en Configuración de GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
 DocType: Payment Request,Transaction Currency,moneda de la transacción
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Desde {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Promedio diario saliente
 DocType: POS Profile,Campaign,Campaña
 DocType: Supplier,Name and Type,Nombre y Tipo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
 DocType: Physician,Contacts and Address,Contactos y Dirección
 DocType: Purchase Invoice,Contact Person,Persona de contacto
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Fecha esperada de inicio' no puede ser mayor que 'Fecha esperada de finalización'
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Elegibilidad y Detalles
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Cambio neto en activos fijos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Desde Fecha y Hora
 DocType: Email Digest,For Company,Para la empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Solicitud de Presupuesto está desactivado para acceder desde el portal. Comprobar la configuración del portal.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de puntuación de tarjeta de calificación del proveedor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importe de compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hubo errores al crear el Programa del Curso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,El primer Aprobador de gastos en la lista se establecerá como el Aprobador de gastos predeterminado.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,Código de paquete
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Aprendiz
 DocType: Purchase Invoice,Company GSTIN,GSTIN de la Compañía
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,No se permiten cantidades negativas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
 DocType: Supplier Scorecard Period,SSC-,SSC -
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo Bancario
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Deje que el aprobador sea obligatorio en la solicitud de licencia
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Regla de impuestos para las transacciones.
@@ -1836,7 +1842,7 @@
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 DocType: Weather,Weather Parameter,Parámetro Meteorológico
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos de pérdidas y ganancias del ejercicio no cerrado
-apps/erpnext/erpnext/public/js/hub/hub_form.js +336,Request a Quote,Solicitar presupuesto
+apps/erpnext/erpnext/public/js/hub/hub_form.js +336,Request a Quote,Solicitar Presupuesto
 DocType: Lab Test Template,Collection Details,Detalles del Cobro
 DocType: POS Profile,Allow Print Before Pay,Permitir imprimir antes de pagar
 DocType: Land Unit,Linked Soil Texture,Textura de Suelo Vinculado
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,El Término de Pago en la fila {0} es posiblemente un duplicado.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agricultura (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Lista de embalaje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Alquiler de Oficina
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuración de pasarela SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configuración de pasarela SMS
 DocType: Disease,Common Name,Nombre Común
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No se ha añadido ninguna dirección
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
 DocType: Vital Signs,Blood Pressure,Presión Sanguínea
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analista
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validar matriculados al Curso para estudiantes en grupo de alumnos
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Item,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Gubernamental
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Gubernamental
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relación de Gastos {0} ya existe para el registro de vehículos
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,nombre del Instituto
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Por favor, ingrese el monto de amortización"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Por favor, ingrese el monto de amortización"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variantes del Producto
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Servicios
 DocType: HR Settings,Email Salary Slip to Employee,Enviar Nómina al Empleado por Correo Electrónico
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Seleccionar Posible Proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Seleccionar Posible Proveedor
 DocType: Sales Invoice,Source,Referencia
 DocType: Customer,"Select, to make the customer searchable with these fields","Seleccione, para que el usuario pueda buscar con estos campos"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar cerrada
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Flujo de efectivo de inversión
 DocType: Program Course,Program Course,Programa de Curso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio de la página web
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
@@ -1924,14 +1930,14 @@
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Formato de impresión de actualización
 DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
 DocType: Purchase Invoice,Select Shipping Address,Seleccione la dirección de envío
-DocType: Timesheet Detail,Expected Hrs,Horas esperadas
+DocType: Timesheet Detail,Expected Hrs,Horas Esperadas
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Detalles de la Membresía
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Ingrese todos los valores de resultados requeridos
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Balance de cuentas por cobrar
-DocType: Employee Loan,Monthly Repayment Amount,Cantidad de pago mensual
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Ingrese todos los Valores de Resultados requeridos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Balance de cuentas por cobrar
+DocType: Loan,Monthly Repayment Amount,Cantidad de pago mensual
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Factura de Apertura
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
 DocType: GST HSN Code,HSN Code,Código HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Importe de contribución
@@ -1939,13 +1945,13 @@
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Datos webhook no verificados
+apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Datos Webhook no Verificados
 DocType: Water Analysis,Container,Envase
 apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiante {0} - {1} aparece múltiples veces en fila {2} y {3}
 DocType: Item Alternative,Two-way,Bidireccional
-DocType: Project,Day to Send,Día para enviar
+DocType: Project,Day to Send,Día para Enviar
 DocType: Healthcare Settings,Manage Sample Collection,Administrar la Colección de Muestras
-DocType: Production Plan,Ignore Existing Ordered Quantity,Ignorar cantidad ordenada existente
+DocType: Production Plan,Ignore Existing Ordered Quantity,Ignorar Cantidad Ordenada Existente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +66,Please set the series to be used.,"Por favor, configure la serie que se utilizará."
 DocType: Patient,Tobacco Past Use,Consumo Pasado de Tabaco
 DocType: Sales Invoice Item,Brand Name,Marca
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},El Usuario {0} ya está asignado al Médico {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Caja
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Posible Proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Posible Proveedor
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Distribución mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La lista de receptores se encuentra vacía. Por favor, cree una lista de receptores"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Atención Médica (beta)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
-DocType: Employee Loan,Repayment Method,Método de Reembolso
+DocType: Loan,Repayment Method,Método de Reembolso
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si se selecciona, la página de inicio será el grupo por defecto del artículo para el sitio web"
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Peticiones para gastos de compañía
@@ -1989,15 +1996,15 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificado Requerido
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Tiempo Desde y Tiempo Hasta de {1} se solapan con {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Inventarios por pagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Invoice,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Seleccionar Compañia
 ,Material Requests for which Supplier Quotations are not created,Solicitudes de Material para los que no hay Presupuestos de Proveedor creados
-DocType: Student Report Generation Tool,Print Section,Imprimir sección
+DocType: Student Report Generation Tool,Print Section,Imprimir Sección
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,El usuario {0} no tiene ningún perfil POS predeterminado. Verifique el valor predeterminado en la fila {1} para este usuario.
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Fila {idx}: {field} es necesario para crear las Facturas de Apertura {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Dirección Principal y Detalle de Contacto
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Seleccione al menos un dominio.
 DocType: Dependent Task,Dependent Task,Tarea dependiente
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Por favor, defina la cuenta de pago de nómina predeterminada en la empresa {0}."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Por favor, defina la cuenta de pago de nómina predeterminada en la empresa {0}."
 DocType: SMS Center,Receiver List,Lista de receptores
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Busca artículo
 DocType: Payment Schedule,Payment Amount,Importe Pagado
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,Escala de calificación
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Ya completado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock en Mano
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock en Mano
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Ítem de Presupuesto
 DocType: Customer,Customer POS Id,id de POS del Cliente
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Ingrese la URL del servidor WooCommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Categorías principales de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Share Balance,To No,A Nro
-DocType: Subscription,Reference Document,Documento de referencia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
 DocType: Accounts Settings,Credit Controller,Controlador de créditos
-DocType: Grant Application,Applicant Type,Tipo de solicitante
+DocType: Loan,Applicant Type,Tipo de solicitante
 DocType: Purchase Invoice,03-Deficiency in services,03-Deficiencia en Servicios
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
 DocType: Healthcare Settings,Default Medical Code Standard,Código Médico Estándar por Defecto
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos humanos
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Recursos humanos
 DocType: Lead,Upper Income,Ingresos superior
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rechazar
 DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
 DocType: Appraisal,For Employee,Por empleados
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Hacer la entrada de desembolso
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Hacer la entrada de desembolso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe ser debito
 DocType: Company,Default Values,Valores predeterminados
 DocType: Membership,INR,INR
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ya existe un cliente con el mismo nombre
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +185,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Esto enviará hojas de salario y creará asientos acumulados. ¿Quieres proceder?
 DocType: Purchase Invoice,Total Net Weight,Peso Neto Total
-DocType: Purchase Order,Order Confirmation No,Confirmación de pedido no
+DocType: Purchase Order,Order Confirmation No,Confirmación de Pedido Nro
 DocType: Purchase Invoice,Eligibility For ITC,Elegibilidad para ITC
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de Clientes
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Change in Accounts Payable,Cambio neto en Cuentas por Pagar
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +48,EcritureLet,EcritureLet
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +209,Credit limit has been crossed for customer {0} ({1}/{2}),Se ha cruzado el límite de crédito para el cliente {0} ({1} / {2})
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +209,Credit limit has been crossed for customer {0} ({1}/{2}),Se ha cruzado el límite de crédito para el Cliente {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
 apps/erpnext/erpnext/config/accounts.py +140,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Precios
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (Sin Impuestos)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Cuenta de Iniciativa
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Disponible
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Disponible
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Obtención
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Campo obligatorio - Programa
 DocType: Special Test Template,Result Component,Componente del Resultado
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamación de Garantía
@@ -2111,14 +2117,14 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Incluir las vacaciones y ausencias únicamente como ausencias
 DocType: Sales Invoice,Packed Items,Productos Empacados
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamación de garantía por numero de serie
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
 DocType: Consultation,Medication,Medicación
-DocType: Production Plan,Include Non Stock Items,Incluir elementos no disponibles
-DocType: Project Update,Challenging/Slow,Difícil / lento
+DocType: Production Plan,Include Non Stock Items,Incluir Elementos no Disponibles
+DocType: Project Update,Challenging/Slow,Difícil / Lento
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Por favor, seleccione el código del producto"
 DocType: Student Sibling,Studying in Same Institute,Estudian en el mismo Instituto
 DocType: Territory,Territory Manager,Gerente de Territorio
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,Configuración de ventas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Confirmar Acción
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Subastas en línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Cumplimiento
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Ver en Carrito
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,GASTOS DE PUBLICIDAD
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,No se pueden crear criterios estándar. Por favor cambie el nombre de los criterios
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,Obtener Plantilla
 DocType: Material Request,Transferred,Transferido
 DocType: Vehicle,Doors,puertas
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Configuración de ERPNext Completa!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Configuración de ERPNext Completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Cobrar la cuota de registro del paciente
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,No se pueden cambiar los Atributos después de la Transacciones de Stock. Haga un nuevo Artículo y transfiera el stock al nuevo Artículo
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,No se pueden cambiar los Atributos después de la Transacciones de Stock. Haga un nuevo Artículo y transfiera el stock al nuevo Artículo
 DocType: Course Assessment Criteria,Weightage,Asignación
 DocType: Purchase Invoice,Tax Breakup,Disolución de Impuestos
 DocType: Packing Slip,PS-,PD-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Purchase Invoice Item,Batch No,Lote Nro.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Avances de empleados
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 DocType: Student Group Instructor,Student Group Instructor,Instructor de Grupo Estudiantil
 DocType: Grant Application,Assessment  Mark (Out of 10),Marca de evaluación (de 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Móvil del Tutor2
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Email Digest,Annual Expenses,Gastos Anuales
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Crear Orden de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Crear Orden de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Solo puede tener Planes con el mismo ciclo de facturación en una Suscripción
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Evaluaciones
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventos de Entrenamiento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
-apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Seguimiento de leads por fuente de leads.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
+apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Seguimiento de Oportunidades por fuente de Opotunidades.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Por favor ingrese
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Por favor ingrese
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Registro de Mantenimiento
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basado en Elemento o Almacén"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: Student Group,Instructors,Instructores
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
-apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestión de compartir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
+apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestión de Compartir
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila #{0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pago
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","El Almacén {0} no esta vinculado a ninguna cuenta, por favor mencione la cuenta en el registro del almacén o seleccione una cuenta de inventario por defecto en la compañía {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gestionar sus Pedidos
 DocType: Work Order Operation,Actual Time and Cost,Tiempo y costo reales
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,Solicitud de Licencia para Estudiante
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Encendido
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
@@ -2257,9 +2265,9 @@
 DocType: Item,Barcodes,Códigos de Barras
 DocType: Hub Category,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento de Activo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,La orden de trabajo {0} debe enviarse
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,La Órden de Trabajo {0} debe enviarse
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nuevo Carrito
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear Lista de Receptores
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturación debe ser igual a la moneda de la compañía predeterminada o la moneda de la cuenta de la parte
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Soil Texture,Loam,Marga
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Fila {0}: Fecha de Vencimiento no puede ser anterior a la Fecha de Contabilización
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Fila {0}: Fecha de Vencimiento no puede ser anterior a la Fecha de Contabilización
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Crear Pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
 ,Sales Invoice Trends,Tendencias de ventas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar Licencias
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Por
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
 DocType: Serial No,Delivery Document No,Documento de entrega No.
@@ -2292,26 +2299,27 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 DocType: Production Plan Material Request,Material Request Date,Fecha de Solicitud de materiales
 DocType: Purchase Order Item,Supplier Quotation Item,Ítem de Presupuesto de Proveedor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,El consumo de material no está configurado en Configuraciones de fabricación.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,El Consumo de Material no está configurado en Configuraciones de Fabricación.
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No se puede sobrefacturar para el artículo {0} en la fila {1} más que {2}. Para permitir la sobrefacturación, configura en Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No se puede sobrefacturar para el Artículo {0} en la fila {1} más que {2}. Para permitir la sobrefacturación, configura en Configuración de Stock"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualizar Respuesta
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +95,Batch ID is mandatory,El ID de lote es obligatorio
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +100,The seller and the buyer cannot be the same,El vendedor y el comprador no pueden ser el mismo
-DocType: Project,Collect Progress,Recoge el progreso
+DocType: Project,Collect Progress,Recoge el Progreso
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccione el Programa Primero
 DocType: Patient Appointment,Patient Age,Edad del Paciente
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Gestión de Proyectos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,El número de serie {0} ya ha sido devuelto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,El Número de Serie {0} ya ha sido devuelto
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
 DocType: Budget,Fiscal Year,Año Fiscal
 DocType: Asset Maintenance Log,Planned,Planificado
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Cuentas por cobrar por defecto que se usarán si no están establecidas en el Paciente para registrar cargos de Consulta.
 DocType: Vehicle Log,Fuel Price,Precio del Combustible
+DocType: Bank Guarantee,Margin Money,Margen de dinero
 DocType: Budget,Budget,Presupuesto
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Establecer Abierto
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Artículo de Activos Fijos no debe ser un artículo de stock.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Seguir
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del Mantenimiento
 ,Amount to Deliver,Cantidad para envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Se ha introducido el mismo elemento varias veces. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Plazo Fecha de inicio no puede ser anterior a la fecha de inicio de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Hubo errores .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,El empleado {0} ya ha solicitado {1} entre {2} y {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Hubo errores .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,El empleado {0} ya ha solicitado {1} entre {2} y {3}:
 DocType: Guardian,Guardian Interests,Intereses del Tutor
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
 DocType: Education Settings,Instructor Records to be created by,Registros del Instructor que serán creados por
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creado
 DocType: GST Account,GST Account,Cuenta GST
@@ -2352,9 +2360,9 @@
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Agregado a favoritos
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No se ha presentado ningún comprobante de sueldo para los criterios seleccionados anteriormente O recibo de sueldo ya enviado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,IMPUESTOS Y ARANCELES
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Agregado a Favoritos
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No se ha presentado ningún comprobante de sueldo para los criterios seleccionados anteriormente O recibo de sueldo ya enviado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,IMPUESTOS Y ARANCELES
 DocType: Projects Settings,Projects Settings,Configuración de Proyectos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pago no pueden ser filtradas por {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árbol de las categorías de producto
 DocType: Production Plan,Total Produced Qty,Cantidad Total Producida
 DocType: Payroll Entry,Get Employee Details,Obtenga Detalles del Empleado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Historial de Compras
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Importe Base (Divisa de la Empresa)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Materias Primas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Materias Primas
 DocType: Payment Reconciliation Payment,Reference Row,Fila de Referencia
 DocType: Installation Note,Installation Time,Tiempo de Instalación
 DocType: Sales Invoice,Accounting Details,Detalles de Contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
 DocType: Patient,O Positive,O Positivo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,INVERSIONES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Asignaciones
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterios de Aceptación
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,No hay reembolsos disponibles para Journal Entry
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 DocType: BOM,Show In Website,Mostrar en el sitio web
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostrar la Cantidad en la Página Web
-DocType: Employee Loan Application,Total Payable Amount,Monto Total a Pagar
+DocType: Loan Application,Total Payable Amount,Monto Total a Pagar
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 DocType: Item Reorder,Check in (group),Registro (grupo)
 DocType: Soil Texture,Silt,Limo
@@ -2397,13 +2406,13 @@
 DocType: Course,Default Grading Scale,Escala de Calificación por defecto
 DocType: Appraisal,For Employee Name,Por nombre de empleado
 DocType: Holiday List,Clear Table,Borrar tabla
-DocType: Woocommerce Settings,Tax Account,Cuenta de impuestos
+DocType: Woocommerce Settings,Tax Account,Cuenta de Impuestos
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +119,Available slots,Espacios de tiempo disponibles
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Hacer el pago
 DocType: Room,Room Name,Nombre de la habitación
 DocType: Prescription Duration,Prescription Duration,Duración de la receta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La licencia no puede aplicarse o cancelarse antes de {0}, ya que el saldo de vacaciones ya se ha arrastrado en el futuro registro de asignación de vacaciones {1}."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La licencia no puede aplicarse o cancelarse antes de {0}, ya que el saldo de vacaciones ya se ha arrastrado en el futuro registro de asignación de vacaciones {1}."
 DocType: Activity Cost,Costing Rate,Costo calculado
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Direcciones de clientes y contactos
 ,Campaign Efficiency,Eficiencia de la Campaña
@@ -2421,13 +2430,13 @@
 DocType: Chapter,Chapter,Capítulo
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,La Cuenta predeterminada se actualizará automáticamente en Factura de POS cuando se seleccione este modo.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
 DocType: Asset,Depreciation Schedule,Programación de la depreciación
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Direcciones y Contactos de Partner de Ventas
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Configure el Centro de costo predeterminado en la empresa {0}.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Configure el Centro de Costo predeterminado en la empresa {0}.
 DocType: Item,Has Batch No,Posee número de lote
 apps/erpnext/erpnext/public/js/utils.js +106,Annual Billing: {0},Facturación anual: {0}
 apps/erpnext/erpnext/config/accounts.py +200,Goods and Services Tax (GST India),Impuesto de Bienes y Servicios (GST India)
@@ -2435,7 +2444,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +227,"Company, From Date and To Date is mandatory","Empresa, Desde la fecha y hasta la fecha es obligatorio"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Obtener desde la Consulta
 DocType: Asset,Purchase Date,Fecha de compra
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,No se pudo generar el secreto
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,No se pudo generar el Secreto
 DocType: Volunteer,Volunteer Type,Tipo de Voluntario
 DocType: Student,Personal Details,Datos personales
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
 DocType: Soil Texture,Soil Type,Tipo de Suelo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nuevo Mensaje
 ,Quotation Trends,Tendencias de Presupuestos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandato GoCardless
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Categoría de Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Número de Vehículo
-DocType: Employee Loan,Loan Amount,Monto del préstamo
+DocType: Loan,Loan Amount,Monto del préstamo
 DocType: Student Report Generation Tool,Add Letterhead,Agregar membrete
 DocType: Program Enrollment,Self-Driving Vehicle,Vehículo auto-manejado
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tarjeta de puntuación de proveedores
@@ -2482,7 +2490,7 @@
 DocType: Projects Settings,Timesheets,Tabla de Tiempos
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
 DocType: Salary Slip,net pay info,información de pago neto
-DocType: Woocommerce Settings,Enable Sync,Habilitar sincronización
+DocType: Woocommerce Settings,Enable Sync,Habilitar Sincronización
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Este valor se actualiza en la Lista de Precios de venta predeterminada.
 DocType: Email Digest,New Expenses,Los nuevos gastos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Amount,Cantidad de PDC / LC
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,Posición
 DocType: Patient,Patient Details,Detalles del Paciente
 DocType: Patient,B Positive,B Positivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico del Paciente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo a No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Deportes
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Lab Test UOM,Test UOM,UOM de la Prueba
 DocType: Student Siblings,Student Siblings,Hermanos del Estudiante
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detalle del plan de suscripción
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unidad(es)
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Por favor, especifique la compañía"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
 DocType: Asset Maintenance Task,Maintenance Task,Tarea de Mantenimiento
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Establezca el límite B2C en la configuración de GST.
@@ -2514,8 +2523,9 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
 ,BOM Search,Buscar listas de materiales (LdM)
-DocType: Project,Total Consumed Material Cost  (via Stock Entry),Costo total del material consumido (a través de la entrada de stock)
-DocType: Hub Settings,Company Registered,Empresa registrada
+DocType: Project,Total Consumed Material Cost  (via Stock Entry),Costo total del Material Consumido (a través de la Entrada de Stock)
+DocType: Hub Settings,Company Registered,Empresa Registrada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Hasta la fecha no puede ser menor a la fecha
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publique ""En existencia"" o ""No disponible"" en el Hub según las existencias disponibles en este Almacén."
 DocType: Vehicle,Fuel Type,Tipo de Combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Las Solicitudes de Materiales siguientes se han planteado de forma automática según el nivel de re-pedido del articulo
 DocType: Email Digest,Pending Sales Orders,Ordenes de venta pendientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
-DocType: Employee,Create User Permission,Crear permiso de usuario
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
+DocType: Employee,Create User Permission,Crear Permiso de Usuario
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 DocType: Healthcare Settings,Remind Before,Recuerde Antes
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
 DocType: Salary Component,Deduction,Deducción
 DocType: Item,Retain Sample,Conservar Muestra
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Fila {0}: Tiempo Desde y Tiempo Hasta es obligatorio.
 DocType: Stock Reconciliation Item,Amount Difference,Diferencia de monto
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Precio del producto añadido para {0} en Lista de Precios {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Precio del producto añadido para {0} en Lista de Precios {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
 DocType: Territory,Classification of Customers by region,Clasificación de clientes por región
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,En Producción
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Balance calculado del estado de cuenta bancario
 DocType: Normal Test Template,Normal Test Template,Plantilla de Prueba Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Cotización
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,No se puede establecer una Solicitud de Cotización (RFQ= recibida sin ninguna Cotización
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Cotización
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,No se puede establecer una Solicitud de Cotización (RFQ= recibida sin ninguna Cotización
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducción Total
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Seleccione una cuenta para imprimir en la moneda de la cuenta
@@ -2552,30 +2563,31 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Esto se basa en transacciones contra este Paciente. Vea la cronología a continuación para más detalles
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Costo actualizado
 DocType: Patient,Date of Birth,Fecha de Nacimiento
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,El producto {0} ya ha sido devuelto
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año fiscal** representa un ejercicio financiero. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / Oportunidad
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuración de la Calificación del Proveedor
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nombre del Plan de Evaluación
-DocType: Work Order Operation,Work Order Operation,Operación de orden de trabajo
+DocType: Work Order Operation,Work Order Operation,Operación de Órden de Trabajo
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocios, agrega todos tus contactos y más como clientes potenciales"
 DocType: Work Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descripción del trabajo
 DocType: Student Applicant,Applied,Aplicado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-Abrir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-Abrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nombre del Tutor2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Descuento de Venta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
+DocType: Department Approver,Approver,Supervisor
 ,SO Qty,Cant. OV
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,El campo Para el accionista no puede estar en blanco
 DocType: Guardian,Work Address,Dirección del trabajo
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
-DocType: Health Insurance,Health Insurance,Seguro de salud
+DocType: Health Insurance,Health Insurance,Seguro de Salud
 DocType: Asset Repair,Manufacturing Manager,Gerente de Producción
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 DocType: Plant Analysis Criteria,Minimum Permissible Value,Valor Mínimo Permitido
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Monto Total asignado (Divisa de la Compañia)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 DocType: BOM,Scrap Material Cost,Costo de Material de Desecho
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
 DocType: Grant Application,Email Notification Sent,Notificación de Correo Electrónico Enviada
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Código de Artículo, Almacén, Cantidad requerida en fila"
-DocType: Pricing Rule,Supplier,Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Código de Artículo, Almacén, Cantidad requerida en fila"
+DocType: Bank Guarantee,Supplier,Proveedor
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Mostrar Detalles de Pago
 DocType: Consultation,Consultation Time,Hora de Consulta
 DocType: C-Form,Quarter,Trimestre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Gastos Varios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Gastos Varios
 DocType: Global Defaults,Default Company,Compañía predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nombre del Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Arriba
-DocType: Employee Loan,Employee Loan Account,Cuenta de Préstamo del Empleado
 DocType: Leave Application,Total Leave Days,Días totales de ausencia
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de Interacciones
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Peso (en kilogramo)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",Los capítulos / nombre del capítulo dejan en blanco y se configuran automáticamente después de guardar el capítulo.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Configura las cuentas GST en la configuración de GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Configura las cuentas GST en la configuración de GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tipo de Negocio
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Costo de Compra de Nueva
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Descripción de la Concesión
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
 DocType: Student Guardian,Others,Otros
+DocType: Subscription,Discounts,Descuentos
 DocType: Payment Entry,Unallocated Amount,Monto sin asignar
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,No se peude encontrar un artículo que concuerde.  Por favor seleccione otro valor para {0}.
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hay más actualizaciones
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Esto cubre todas las tarjetas de puntuación vinculadas a esta configuración
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un Paquete de Productos. Por favor remover el artículo `{0}` y guardar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banca
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,Artículo de servicio
 DocType: Bank Guarantee,Bank Guarantee,Garantía Bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Serie de numeración
 DocType: Bin,Ordered Quantity,Cantidad ordenada
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de Escala de Calificación
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Ganancias del Año
+DocType: Bank Guarantee,Name of Bank,Nombre del banco
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}
 DocType: Fee Schedule,In Process,En Proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de Producto
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Árbol de las cuentas financieras.
-DocType: Cash Flow Mapping,Cash Flow Mapping,Asignación de flujo de caja
+DocType: Bank Guarantee,Reference Document Type,Referencia Tipo de documento
+DocType: Cash Flow Mapping,Cash Flow Mapping,Asignación de Fujo de Caja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} contra la orden de ventas {1}
 DocType: Account,Fixed Asset,Activo Fijo
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventario Serializado
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Correo Electrónico no encontrado en contacto predeterminado
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generar secreto
-DocType: Employee Loan,Account Info,Informacion de cuenta
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generar Secret
+DocType: Loan,Account Info,Informacion de cuenta
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
 DocType: Fees,Include Payment,Incluir Pago
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grupos de alumnos creados.
 DocType: Sales Invoice,Total Billing Amount,Importe total de facturación
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,El programa en la estructura de tarifas y el grupo de estudiantes {0} son diferentes.
 DocType: Fee Schedule,Receivable Account,Cuenta por cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Fila #{0}: Activo {1} ya es {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Fila #{0}: Activo {1} ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Órdenes de venta a pagar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Con el Pago de Impuesto
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICADO PARA PROVEEDOR
 DocType: Land Unit,Is Container,Es Contenedor
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Este será el día 1 del ciclo de cultivo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Purchase Invoice Item,Weight UOM,Unidad de Medida (UdM)
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lista de accionistas disponibles con números de folio
 DocType: Salary Structure Employee,Salary Structure Employee,Estructura Salarial de Empleado
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Mostrar Atributos de Variantes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Mostrar Atributos de Variantes
 DocType: Student,Blood Group,Grupo sanguíneo
 DocType: Course,Course Name,Nombre del curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Equipos de Oficina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Equipos de Oficina
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
 DocType: Supplier Scorecard,Scoring Setup,Configuración de Calificación
@@ -2687,12 +2702,12 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Importe Básico (divisa de la Compañía)
 DocType: Student,Guardians,Tutores
-apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,Confirmación de pago
+apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,Confirmación de Pago
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Los precios no se muestran si la lista de precios no se ha establecido
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Débito Para es requerido
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Las Tablas de Tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Lista de precios para las compras
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantillas de variables de Calificación de Proveedores.
 DocType: Job Offer Term,Offer Term,Términos de la oferta
 DocType: Asset,Quality Manager,Gerente de Calidad
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total no pagado: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operación de Página Web de lista de materiales
 DocType: Supplier Scorecard,Supplier Score,Puntuación del Proveedor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Monto total facturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Monto total facturado
 DocType: Supplier,Warn RFQs,Avisar en Pedidos de Presupuesto (RFQs)
 DocType: BOM,Conversion Rate,Tasa de conversión
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Búsqueda de Producto
 DocType: Assessment Plan,To Time,Hasta hora
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
+DocType: Loan,Total Amount Paid,Cantidad total pagada
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Seleccione la Admisión de Estudiante que es obligatoria para la Solicitud de Estudiante paga
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Seleccione unaLiista de Precios para publicar precios
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Cantidad completada no puede contener más de {1} para la operación {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","El elemento serializado {0} no se puede actualizar mediante Reconciliación de Stock, utilice la Entrada de Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","El elemento serializado {0} no se puede actualizar mediante Reconciliación de Stock, utilice la Entrada de Stock"
 DocType: Training Event Employee,Training Event Employee,Evento de Formación de los trabajadores
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Las muestras máximas - {0} se pueden conservar para el lote {1} y el elemento {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Agregar Intervalos de Tiempo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Training Event,Advance,Avanzar
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,para hacer recurrente de nuevo.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Configuración de pasarela de pago GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganancia/Pérdida en Cambio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Ganancia/Pérdida en Cambio
 DocType: Opportunity,Lost Reason,Razón de la pérdida
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: La Cuenta {1} no pertenece a la Empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: La Cuenta {1} no pertenece a la Empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},No se puede encontrar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nueva Dirección
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,Cantidad real
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Numero de serie {0} no encontrado
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},La suscripción ha sido {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa de Horarios de Cuotas
 DocType: Fee Schedule Program,Student Batch,Lote de Estudiante
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Crear Estudiante
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Comercio Electrónico GSTIN
 DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Resumen de Cambios Bancarios
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
-apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,¿Sugerir categoría?
+apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,¿Sugerir Categoría?
 DocType: Stock Reconciliation Item,Current Amount,Cantidad actual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Edificios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Edificios
 DocType: Fee Schedule,Fee Structure,Estructura de cuotas
 DocType: Timesheet Detail,Costing Amount,Costo acumulado
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Student Admission Program,Application Fee,Cuota de solicitud
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Validar nómina salarial
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el producto {0} es {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del remitente
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Criterios de análisis de agricultura
+DocType: HR Settings,Leave Approval Notification Template,Deja la plantilla de notificación de aprobación
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Presión Arterial (diastólica)
 DocType: SMS Log,Sent To,Enviado a
 DocType: Agriculture Task,Holiday Management,Gestión de Vacaciones
 DocType: Payment Request,Make Sales Invoice,Crear Factura de Venta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Siguiente Fecha de Contacto no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},El Médico {0} no está disponible en {1}
@@ -2801,9 +2815,9 @@
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles del empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Material de consumo
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Material de Consumo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como cerrado/a
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ningún producto con código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ningún producto con código de barras {0}
 DocType: Normal Test Items,Require Result Value,Requerir Valor de Resultado
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2814,23 +2828,23 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +61,Appointment cancelled,Cita cancelada
 DocType: Item,End of Life,Final de vida útil
 apps/erpnext/erpnext/demo/setup/setup_data.py +331,Travel,Viajes
-DocType: Student Report Generation Tool,Include All Assessment Group,Incluir todo el grupo de evaluación
+DocType: Student Report Generation Tool,Include All Assessment Group,Incluir todo el Grupo de Evaluación
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurrente
-DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalles de la plantilla de asignación de flujo de efectivo
+DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalles de la plantilla de asignación de Flujo de Caja
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Gestión de préstamos
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Mostrar Nomina Salarial
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Mostrar Nomina Salarial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transferencia de Material
 DocType: Fees,Send Payment Request,Enviar Ssolicitud de Pago
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 DocType: Water Analysis,Origin,Origen
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Por favor configura recurrente después de guardar
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Por favor configura recurrente después de guardar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Seleccione la cuenta de cambio
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Es la Responsabilidad del Impuesto sobre la Renta
 DocType: Grading Scale Interval,Grade Description,Descripción de Grado
 DocType: Stock Entry,Purchase Receipt No,Recibo de compra No.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,GANANCIAS PERCIBIDAS
 DocType: Sales Invoice, Shipping Bill Number,Número de Factura de Envío
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Trazabilidad
 DocType: Asset Maintenance Log,Actions performed,Acciones realizadas
 DocType: Cash Flow Mapper,Section Leader,Líder de la Sección
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Origen de fondos (Pasivo)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Origen de fondos (Pasivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Empleado
+DocType: Bank Guarantee,Fixed Deposit Number,Número de depósito fijo
 DocType: Asset Repair,Failure Date,Fecha de Falla
 DocType: Sample Collection,Collected Time,Hora de Cobro
 DocType: Company,Sales Monthly History,Historial Mensual de Ventas
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,¿Seguro que quieres cancelar esta cita?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paquete de Precios de la habitación del hotel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Flujo de ventas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Obtener actualizaciones de suscripción
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Cuenta {0} no coincide con la Compañía {1}en Modo de Cuenta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Curso:
@@ -2880,9 +2896,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: POS Profile,Applicable for Users,Aplicable para Usuarios
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,No se crearon órdenes de trabajo
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,No se crearon Órdenes de Trabajo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Nómina del empleado {0} ya creado para este periodo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
 DocType: Purchase Invoice,Credit To,Acreditar en
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Sin Cotización
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Cambio neto en las Cuentas por Cobrar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Compensatorio
 DocType: Job Offer,Accepted,Aceptado
@@ -2912,17 +2928,17 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Resultados de la búsqueda
 DocType: Room,Room Number,Número de habitación
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referencia Inválida {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referencia Inválida {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 DocType: Journal Entry Account,Payroll Entry,Entrada de Nómina
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Ver registros de honorarios
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Ver Registros de Honorarios
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Hacer una Plantilla de Impuestos
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
 DocType: Lab Test Sample,Lab Test Sample,Muestra de Prueba de Laboratorio
-DocType: Item Variant Settings,Allow Rename Attribute Value,Permitir cambiar el nombre del valor del atributo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Asiento Contable Rápido
+DocType: Item Variant Settings,Allow Rename Attribute Value,Permitir Cambiar el Nombre del Valor del Atributo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Asiento Contable Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Restaurant,Invoice Series Prefix,Prefijo de la Serie de Facturas
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,La integración de Google Maps no está habilitada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no se ha enviado
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Fecha de Vencimiento de Membresía
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} debe ser negativo en el documento de devolución
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} debe ser negativo en el documento de devolución
 ,Minutes to First Response for Issues,Minutos hasta la primera respuesta para Problemas
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,El nombre del instituto para el que está configurando este sistema.
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unidad de Medida (UdM)
 DocType: Fiscal Year,Year End Date,Fecha de Finalización de Año
 DocType: Task Depends On,Task Depends On,Tarea depende de
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oportunidad
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oportunidad
 DocType: Operation,Default Workstation,Estación de Trabajo por defecto
 DocType: Notification Control,Expense Claim Approved Message,Mensaje de reembolso de gastos
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdida
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Permiso sin paga no coincide con los registros aprobados de la solicitud de permiso de ausencia
 DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Hacer Factura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Balance Restante
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Código de Barras {0} no es un código {1} válido
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Año final
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cotización / Iniciativa %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Driver,Driver,Conductor
 DocType: Vital Signs,Nutrition Values,Valores Nutricionales
 DocType: Lab Test Template,Is billable,Es facturable
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Fecha de inicio real (a través de hoja de horas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web de ejemplo generado automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Rango de antigüedad 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,El monto total anticipado no puede ser mayor que la cantidad total reclamada
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,El monto total anticipado no puede ser mayor que la cantidad total reclamada
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3034,7 +3051,7 @@
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +68,Select Physician...,Seleccione Médico ...
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +606,Back to Products,Volver a Productos
 DocType: Grant Application,Grant Application Details ,Detalles de Solicitud de Subvención
-DocType: Stock Entry Detail,Original Item,Artículo original
+DocType: Stock Entry Detail,Original Item,Artículo Original
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},Registros de cuotas creados - {0}
 DocType: Asset Category Account,Asset Category Account,Cuenta de categoría de activos
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Seleccionar Valores de Atributo
 DocType: Purchase Invoice,Reason For Issuing document,Motivo de la emisión del documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"Siguiente contacto por, no puede ser el mismo que la  dirección de correo electrónico de la Iniciativa"
 DocType: Tax Rule,Billing City,Ciudad de facturación
@@ -3056,11 +3073,12 @@
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La presión sanguínea normal en reposo en un adulto es aproximadamente 120 mmHg sistólica y 80 mmHg diastólica, abreviada &quot;120/80 mmHg&quot;"
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +119,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life","Establezca la vida útil de los elementos en días, para establecer la caducidad en función de la fecha de fabricación más la vida útil"
 DocType: Journal Entry,Credit Note,Nota de Crédito
-DocType: Projects Settings,Ignore Employee Time Overlap,Ignorar la superposición de tiempo del empleado
+DocType: Projects Settings,Ignore Employee Time Overlap,Ignorar la Superposición de Tiempo del Empleado
 DocType: Warranty Claim,Service Address,Dirección de servicio
 DocType: Asset Maintenance Task,Calibration,Calibración
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} es un feriado de la compañía
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Muebles y Accesorios
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Dejar notificación de estado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Muebles y Accesorios
 DocType: Item,Manufacture,Manufacturar
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Configuración de la Empresa
 ,Lab Test Report,Informe de Prueba de Laboratorio
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,Área de Plantación
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Installation Note Item,Installed Qty,Cantidad Instalada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Esto podría deberse a algunas direcciones de correo electrónico no válidas
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Agregaste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado del Entrenamiento
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Productos por Pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Sucursal principal de la organización.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar una Incidencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Servicios públicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 o más
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila #{0}: Asiento {1} no tiene cuenta {2} o ya compara con otro bono
 DocType: Supplier Scorecard Criteria,Criteria Weight,Peso del Criterio
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Deje la notificación de aprobación
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Nomina basada en el Parte de Horas
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tipo de Cambio de Compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Tipo de Cambio de Compra
 DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipo de pago
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustes de carrito de compras
 DocType: Journal Entry,Accounting Entries,Asientos contables
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la Regla de fijación de precios seleccionada está hecha para &#39;Tarifa&#39;, sobrescribirá la Lista de precios. La tasa de la regla de fijación de precios es la tasa final, por lo que no debe aplicarse ningún descuento adicional. Por lo tanto, en transacciones como Orden de venta, Orden de compra, etc., se obtendrá en el campo &#39;Tarifa&#39;, en lugar del campo &#39;Tarifa de lista de precios&#39;."
+DocType: Journal Entry,Paid Loan,Préstamo pagado
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entrada duplicada. Por favor consulte la regla de autorización {0}
 DocType: Journal Entry Account,Reference Due Date,Fecha de Vencimiento de Referencia
 DocType: Purchase Order,Ref SQ,Ref. SQ
@@ -3133,14 +3152,14 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Nómina de sueldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
-DocType: Patient Service Unit,Parent Service Unit,Unidad de servicio para padres
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
+DocType: Patient Service Unit,Parent Service Unit,Unidad de Servicio para Padres
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Crear Usuario
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor ingrese una dirección de correo electrónico válida
 DocType: Volunteer Skill,Volunteer Skill,Habilidad del Voluntario
-DocType: Bank Reconciliation,Include POS Transactions,Incluir transacciones POS
+DocType: Bank Reconciliation,Include POS Transactions,Incluir Transacciones POS
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +797,Please select an item in the cart,Por favor seleccione un artículo en el carrito
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios Personalizados
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Cuenta de ingresos
 DocType: Payment Request,Amount in customer's currency,Monto en divisa del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Entregar
 DocType: Volunteer,Weekdays,Días de la Semana
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: Restaurant Menu,Restaurant Menu,Menú del Restaurante
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Los Lotes de Estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
 DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Seleccionar la cuenta de inventario por defecto para el inventario perpetuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Seleccionar la cuenta de inventario por defecto para el inventario perpetuo
 DocType: Item Reorder,Material Request Type,Tipo de Requisición
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Enviar Correo Electrónico de Revisión de Subvención
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Capacidad de Habitaciones
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Ya existe un registro para el artículo {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Referencia
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Perderá registros de facturas generadas previamente. ¿Seguro que quieres reiniciar esta suscripción?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Cuota de Inscripción
 DocType: Budget,Cost Center,Centro de costos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Comprobante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje en la orden de compra
 DocType: Tax Rule,Shipping Country,País de envío
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ocultar ID de Impuestos del cliente según Transacciones de venta
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacen sólo puede ser alterado a través de: Entradas de inventario / Nota de entrega / Recibo de compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Director de marketing y ventas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Director de marketing y ventas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Impuesto sobre la renta
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Ir a Membretes
+DocType: Subscription,Cancel At End Of Period,Cancelar al final del período
 DocType: Item Supplier,Item Supplier,Proveedor del Producto
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,No hay Elementos seleccionados para transferencia
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,No hay Elementos seleccionados para transferencia
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
 DocType: Vehicle,Electric,Eléctrico
 DocType: Task,% Progress,% Progreso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Ganancia/Pérdida por enajenación de activos fijos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Ganancia/Pérdida por enajenación de activos fijos
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",En la tabla a continuación solo se seleccionará al Estudiante Solicitante con el estado &quot;Aprobado&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,El número de cuenta para la cuenta {0} no está disponible. <br> Configure su plan de cuentas correctamente.
 DocType: Task,Depends on Tasks,Depende de Tareas
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,No disponible en stock
 DocType: Volunteer,Volunteer Skills,Habilidades del Voluntario
 DocType: Appraisal,HR User,Usuario de recursos humanos
+DocType: Bank Guarantee,Reference Document Name,Nombre del documento de referencia
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
 apps/erpnext/erpnext/hooks.py +142,Issues,Incidencias
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},El estado debe ser uno de {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,FACT-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra grande
+DocType: Loan,Loan Application,Solicitud de préstamo
 DocType: Crop,Scientific Name,Nombre Científico
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Hojas Totales
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Vuelva a seleccionar, si el contacto elegido se edita después de guardar"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Producto destacado en página de inicio
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Todos los grupos de evaluación
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Todos los grupos de evaluación
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Almacén nuevo nombre
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
@@ -3245,20 +3268,21 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +154,Update in progress. It might take a while.,Actualización en progreso. Podría tomar un tiempo.
 DocType: Production Plan Item,Produced Qty,Cantidad Producida
 DocType: Vehicle Log,Fuel Qty,Cantidad de Combustible
-DocType: Stock Entry,Target Warehouse Name,Nombre del almacén de destino
+DocType: Stock Entry,Target Warehouse Name,Nombre del Almacén de Destino
 DocType: Work Order Operation,Planned Start Time,Hora prevista de inicio
 DocType: Course,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +267,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Student Applicant,Application Status,Estado de la Aplicación
 DocType: Sensitivity Test Items,Sensitivity Test Items,Artículos de Prueba de Sensibilidad
-DocType: Project Update,Project Update,Actualización del proyecto
+DocType: Project Update,Project Update,Actualización del Proyecto
 DocType: Fees,Fees,Matrícula
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,El presupuesto {0} se ha cancelado
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Monto total pendiente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Monto total pendiente
 DocType: Sales Partner,Targets,Objetivos
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Registre el número SIREN en el archivo de información de la empresa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Price List,Price List Master,Lista de precios principal
 DocType: GST Account,CESS Account,Cuenta CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos.
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Seleccionar Paciente
 DocType: Price List,Applicable for Countries,Aplicable para los Países
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nombre del Parámetro
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo se pueden presentar solicitudes de permiso con el status ""Aprobado"" y ""Rechazado""."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Nombre de Grupo de Estudiantes es obligatorio en la fila {0}
 DocType: Homepage,Products to be shown on website homepage,Productos que se muestran en la página de inicio de la página web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
@@ -3311,14 +3336,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Factura ya creada para todas las horas de facturación
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nombre de error: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Es el Costo de las Finanzas
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Por favor, configure el cliente predeterminado en la configuración del Restaurante"
 ,Salary Register,Registro de Salario
 DocType: Warehouse,Parent Warehouse,Almacén Padre
-DocType: C-Form Invoice Detail,Net Total,Total Neto
+DocType: Subscription,Net Total,Total Neto
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},La lista de materiales predeterminada no se encontró para el Elemento {0} y el Proyecto {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definir varios tipos de préstamos
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definir varios tipos de préstamos
 DocType: Bin,FCFS Rate,Cambio FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Monto pendiente
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tiempo (en minutos)
@@ -3350,11 +3375,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Cuenta raíz debe ser un grupo
 DocType: Drug Prescription,Drug Prescription,Prescripción de Medicamentos
 DocType: Fees,FEE.,CUOTA.
-DocType: Employee Loan,Repaid/Closed,Reembolsado / Cerrado
+DocType: Loan,Repaid/Closed,Reembolsado / Cerrado
 DocType: Item,Total Projected Qty,Cantidad Total Proyectada
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tasa de valoración no encontrada para el elemento {0}, que se requiere para realizar las entradas de contabilidad para {1} {2}. Si el ítem está realizando transacciones como un ítem de valoración cero en {1}, por favor mencione eso en la {1} tabla de ítem. De lo contrario, cree una transacción de stock entrante para el elemento o mencione la tasa de valoración en el registro de artículo y, a continuación, intente enviar / cancelar esta entrada"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} a través de Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Código del curso
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: POS Settings,Use POS in Offline Mode,Usar POS en Modo sin Conexión
@@ -3363,7 +3387,7 @@
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
 DocType: Salary Detail,Condition and Formula Help,Condición y la Fórmula de Ayuda
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administración de Territorios
-DocType: Patient Service Unit,Patient Service Unit,Unidad de servicio al paciente
+DocType: Patient Service Unit,Patient Service Unit,Unidad de Servicio al Paciente
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
 DocType: Cash Flow Mapper,Section Subtotal,Subtotal de la Sección
@@ -3374,16 +3398,15 @@
 DocType: Purchase Invoice,Deemed Export,Exportación Considerada
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Producción
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
-DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Asiento contable para inventario
 DocType: Lab Test,LabTest Approver,Aprobador de Prueba de Laboratorio
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ya ha evaluado los criterios de evaluación {}.
 DocType: Vehicle Service,Engine Oil,Aceite de Motor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Órdenes de trabajo creadas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Órdenes de Trabajo creadas: {0}
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
-DocType: Employee Loan,Loan Details,Detalles de préstamo
+DocType: Loan,Loan Details,Detalles de préstamo
 DocType: Company,Default Inventory Account,Cuenta de Inventario Predeterminada
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Los números de folio no coinciden
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Cantidad completada debe ser mayor que cero.
@@ -3395,19 +3418,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un enlace a todas las unidades de tierra en las que crece la cosecha
 DocType: Account,Root Type,Tipo de root
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Fila #{0}: No se puede devolver más de {1} para el producto {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Fila #{0}: No se puede devolver más de {1} para el producto {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página
 DocType: BOM,Item UOM,Unidad de medida (UdM) del producto
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
 DocType: Cheque Print Template,Primary Settings,Ajustes Primarios
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar dirección del proveedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Añadir Empleados
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Añadir Empleados
 DocType: Purchase Invoice Item,Quality Inspection,Inspección de Calidad
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Pequeño
 DocType: Company,Standard Template,Plantilla estándar
 DocType: Training Event,Theory,Teoría
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,La cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 DocType: Payment Request,Mute Email,Email Silenciado
@@ -3427,11 +3450,10 @@
 DocType: SMS Log,No of Sent SMS,Número de SMS enviados
 DocType: Antibiotic,Healthcare Administrator,Administrador de Atención Médica
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Establecer un Objetivo
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Serie de numeración
 DocType: Dosage Strength,Dosage Strength,Fuerza de la Dosis
 DocType: Account,Expense Account,Cuenta de costos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterios de evaluación del plan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,La fecha de caducidad es obligatoria para el artículo seleccionado
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar Órdenes de Compra
@@ -3444,18 +3466,18 @@
 DocType: Patient,Personal and Social History,Historia Personal y Social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Usuario {0} creado
 DocType: Fee Schedule,Fee Breakup for each student,Disminución de la Cuota para cada Estudiante
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Cambiar Código
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 DocType: Purchase Invoice,Availed ITC Cess,Cess ITC disponible
 ,Student Monthly Attendance Sheet,Hoja de Asistencia Mensual de Estudiante
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regla de Envío solo aplicable para Ventas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Hasta
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupo de estudiantes o horario del curso es obligatorio
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantener Horas y horas de trabajo de facturación igual en parte de horas
@@ -3475,7 +3497,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lista de sus productos o servicios que usted compra o vende.
 DocType: Water Analysis,Storage Temperature,Temperatura de Almacenamiento
 DocType: Employee Attendance Tool,Unmarked Attendance,La asistencia sin marcar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Herramienta de Inscripción de Estudiante a Programa
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},La fecha de inicio debe ser menor que la fecha de finalización para la tarea {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,El nombre o e-mail es obligatorio
@@ -3488,7 +3510,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} tiene actualmente un {1} Calificación de Proveedor en pie y las solicitudes de ofertas a este proveedor deben ser emitidas con precaución.
 DocType: Chapter,Non Profit Manager,Gerente sin Fines de Lucro
 DocType: BOM,Total Cost(Company Currency),Costo Total (Divisa de la Compañía)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Número de serie {0} creado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Número de serie {0} creado
 DocType: Homepage,Company Description for website homepage,Descripción de la empresa para la página de inicio página web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nombre suplier
@@ -3498,20 +3520,19 @@
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Healthcare Settings,Result Printed,Resultado Impreso
 DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Período de prueba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ver {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Período de prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Project,Total Costing Amount (via Timesheets),Monto Total de Costos (a través de Partes de Horas)
-DocType: Employee Advance,Expense Approver,Supervisor de gastos
+DocType: Department,Expense Approver,Supervisor de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
-DocType: Project,Hourly,Cada hora
+DocType: Project,Hourly,Cada Hora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,No-Grupo a Grupo
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},El lote es obligatorio en la fila {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para fecha y hora
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
 DocType: Accounts Settings,Make Payment via Journal Entry,Hace el pago vía entrada de diario
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Impreso en
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Impreso en
 DocType: Item,Inspection Required before Delivery,Inspección requerida antes de la entrega
 DocType: Item,Inspection Required before Purchase,Inspección requerida antes de la compra
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Actividades Pendientes
@@ -3521,7 +3542,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Cantidad Mínima de Pedido
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Tu Organización
 DocType: Fee Component,Fees Category,Categoría de cuotas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Monto
 DocType: Supplier Scorecard,Notify Employee,Notificar al Empleado
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
@@ -3531,7 +3552,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Nivel de reabastecimiento
 DocType: Company,Chart Of Accounts Template,Plantilla del catálogo de cuentas
 DocType: Attendance,Attendance Date,Fecha de Asistencia
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Precio del producto actualizado para {0} en Lista de Precios {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Precio del producto actualizado para {0} en Lista de Precios {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Una cuenta con nodos hijos no puede convertirse en libro mayor
 DocType: Purchase Invoice Item,Accepted Warehouse,Almacén Aceptado
@@ -3539,10 +3560,11 @@
 DocType: Item,Valuation Method,Método de Valoración
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marcar Medio Día
 DocType: Sales Invoice,Sales Team,Equipo de ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Ingrese el nombre del Beneficiario antes de enviarlo.
 DocType: Program Enrollment Tool,Get Students,Obtener Estudiantes
 DocType: Serial No,Under Warranty,Bajo garantía
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del empleado
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Seleccione Fecha de Finalización para la Reparación Completa
@@ -3561,7 +3583,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reservado para Subcontratación
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Órdenes
-DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
+DocType: Department,Leave Approver,Supervisor de ausencias
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Por favor seleccione un lote
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nombre del grupo de evaluación
@@ -3605,7 +3627,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Artículo rastreado Hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PARA EL RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Cuenta de depreciación acumulada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Este correo electrónico se genera automáticamente
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Program Enrollment,Boarding Student,Estudiante de Embarque
 DocType: Asset,Expected Value After Useful Life,Valor esperado después de la Vida Útil
@@ -3630,29 +3651,28 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registro de asistencia {0} existe en contra de estudiantes {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Depreciación Eliminada debido a la venta de activos
-DocType: Member,Member,Miembro
+DocType: Loan,Member,Miembro
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrar Direcciones
-DocType: Work Order Item,Work Order Item,Artículo de orden de trabajo
+DocType: Work Order Item,Work Order Item,Artículo de Órden de Trabajo
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de Mercado
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Gerente de Agricultura
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Cierre (Deb)
 DocType: Cheque Print Template,Cheque Size,Cheque Tamaño
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
 DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Cuenta {0} no coincide con la Compañia {1}
 DocType: Education Settings,Current Academic Year,Año académico actual
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
 DocType: Asset,Number of Depreciations Booked,Cantidad de Depreciaciones Reservadas
-apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Cantidad total
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Préstamo contra empleado: {0}
+apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Cantidad Total
 DocType: Landed Cost Item,Receipt Document,Recepción de Documento
 DocType: Employee Education,School/University,Escuela / Universidad.
 DocType: Payment Request,Reference Details,Detalles Referencia
@@ -3663,7 +3683,7 @@
 DocType: Asset,Double Declining Balance,Doble Disminución de Saldo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Orden cerrada no se puede cancelar. Abrir para cancelar.
 DocType: Student Guardian,Father,Padre
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 DocType: Attendance,On Leave,De licencia
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener Actualizaciones
@@ -3677,10 +3697,10 @@
 DocType: Lead,Lower Income,Ingreso menor
 DocType: Restaurant Order Entry,Current Order,Orden actual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Ir a Programas
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Fila {0} # Cantidad Asignada {1} no puede ser mayor que la Cantidad no Reclamada {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Fila {0} # Cantidad Asignada {1} no puede ser mayor que la Cantidad no Reclamada {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
@@ -3703,7 +3723,6 @@
 DocType: Payment Terms Template,Payment Terms,Términos de Pago
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Pedidos de producción no pueden ser elevados para:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Ir a Proveedores
@@ -3722,31 +3741,33 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},El presupuesto {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configure la ID de correo electrónico para que el estudiante envíe la solicitud de pago
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Configure la ID de correo electrónico para que el estudiante envíe la solicitud de pago
 DocType: Patient,Medical History,Historial Médico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Cuenta de Sobre-Giros
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Cuenta de Sobre-Giros
 DocType: Patient,Patient ID,ID del Paciente
 DocType: Physician Schedule,Schedule Name,Nombre del Horario
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Crear Nómina Salarial
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Añadir todos los Proveedores
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Añadir todos los Proveedores
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila #{0}: Importe asignado no puede ser mayor que la cantidad pendiente.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Explorar la lista de materiales
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Prestamos en garantía
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Prestamos en garantía
 DocType: Purchase Invoice,Edit Posting Date and Time,Editar fecha y hora de envío
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Por favor establezca Cuentas relacionadas con la depreciación en la Categoría de Activo {0} o Compañía {1}.
 DocType: Lab Test Groups,Normal Range,Rango Normal
 DocType: Academic Term,Academic Year,Año Académico
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Venta Disponible
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Apertura de Capital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Apertura de Capital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restante
 DocType: Appraisal,Appraisal,Evaluación
+DocType: Loan,Loan Account,Cuenta de préstamo
 DocType: Purchase Invoice,GST Details,Detalles de GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Correo electrónico enviado al proveedor {0}
 DocType: Item,Default Sales Unit of Measure,Unidad de Medida de Ventas Predeterminada
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Año Académico:
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},No permitir establecer un elemento alternativo para el artículo {0}
+DocType: Subscription,Past Due Date,Fecha de vencimiento anterior
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},No permitir establecer un elemento alternativo para el Artículo {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La fecha está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante Autorizado
@@ -3758,7 +3779,7 @@
 DocType: Patient Appointment,Patient Appointment,Cita del Paciente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Obtener Proveedores por
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Obtener Proveedores por
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} no encontrado para el Artículo {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Ir a Cursos
 DocType: Accounts Settings,Show Inclusive Tax In Print,Mostrar impuesto inclusivo en impresión
@@ -3766,10 +3787,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensaje Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Una cuenta con nodos hijos no puede ser establecida como libro mayor
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructor en Educación&gt; Configuración educativa
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasa por la cual la lista de precios es convertida como base del cliente.
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa de la empresa)
-DocType: Physician,Physician Schedules,Horarios del médico
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,El monto total anticipado no puede ser mayor que la cantidad total autorizada
+DocType: Physician,Physician Schedules,Horarios del Médico
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,El monto total anticipado no puede ser mayor que la cantidad total autorizada
 DocType: Salary Slip,Hour Rate,Salario por hora
 DocType: Stock Settings,Item Naming By,Ordenar productos por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
@@ -3783,13 +3805,14 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ajustar Eventos a {0}, ya que el Empleado adjunto a las Personas de Venta siguientes no tiene un ID de Usuario{1}."
 DocType: Timesheet,Billing Details,Detalles de facturación
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +163,Source and target warehouse must be different,Almacén de Origen y Destino deben ser diferentes
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +140,Payment Failed. Please check your GoCardless Account for more details,Pago fallido. Verifique su Cuenta GoCardless para más detalles
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +140,Payment Failed. Please check your GoCardless Account for more details,Pago Fallido. Verifique su Cuenta GoCardless para más detalles
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al  {0}
 DocType: BOM,Inspection Required,Inspección Requerida
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Ingrese el número de garantía bancaria antes de enviar.
 DocType: Driving License Category,Class,Clase
 DocType: Sales Order,Fully Billed,Totalmente Facturado
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,La orden de trabajo no puede levantarse contra una plantilla de artículo
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,La Órden de Trabajo no puede levantarse contra una Plantilla de Artículo
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,Regla de Envío solo aplicable para la Compra
 DocType: Vital Signs,BMI,IMC
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo en caja
@@ -3797,7 +3820,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Assessment Plan,Program,Programa
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructor en Educación&gt; Configuración educativa
 DocType: Serial No,Is Cancelled,Cancelado
 DocType: Student Group,Group Based On,Grupo Basado En
 DocType: Journal Entry,Bill Date,Fecha de factura
@@ -3808,11 +3830,12 @@
 DocType: Cheque Print Template,Cheque Height,Altura de Cheque
 DocType: Supplier,Supplier Details,Detalles del proveedor
 DocType: Setup Progress,Setup Progress,Progreso de la Configuración
+DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transferencia Bancaria
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Marcar todas
-,Issued Items Against Work Order,Artículos emitidos contra orden de trabajo
+,Issued Items Against Work Order,Artículos Emitidos contra Orden de Trabajo
 DocType: Vehicle Log,Invoice Ref,Referencia de Factura
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Categoría de Cliente / Cliente
@@ -3823,7 +3846,7 @@
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +338,Balance ({0}),Balance ({0})
 apps/erpnext/erpnext/config/accounts.py +134,Banking and Payments,Banco y Pagos
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,Por favor ingrese la clave de consumidor de API
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,Por favor ingrese la Clave de Consumidor de API
 ,Welcome to ERPNext,Bienvenido a ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Iniciativa a Presupuesto
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +34,Email Reminders will be sent to all parties with email contacts,Recordatorios de correo electrónico se enviarán a todas las partes con contactos de correo electrónico
@@ -3841,12 +3864,11 @@
 DocType: Customs Tariff Number,Tariff Number,Número de tarifa
 DocType: Work Order Item,Available Qty at WIP Warehouse,Cantidad Disponible en Almacén WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proyectado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Mensaje de Presupuesto
-DocType: Employee Loan,Employee Loan Application,Solicitud de Préstamo del empleado
 DocType: Issue,Opening Date,Fecha de apertura
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Por favor guarde al paciente primero
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Por favor guarde al paciente primero
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,La asistencia ha sido marcada con éxito.
 DocType: Program Enrollment,Public Transport,Transporte Público
 DocType: Soil Texture,Silt Composition (%),Composición del Limo (%)
@@ -3864,7 +3886,7 @@
 ,Item Balance (Simple),Balance del Artículo (Simple)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de Desajuste
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Monto de Nota de Debito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Monto de Nota de Debito
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
@@ -3887,6 +3909,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
 DocType: Assessment Plan,Assessment Plan,Plan de Evaluación
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Invertir entrada de diario
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Se crea el Cliente {0}.
 DocType: Stock Settings,Limit Percent,límite de porcentaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualmente no hay stock disponible en ningún almacén
@@ -3894,33 +3917,35 @@
 DocType: Sample Collection,No. of print,Nro de impresión
 DocType: Hotel Room Reservation Item,Hotel Room Reservation Item,Elemento de Reserva de Habitación de Hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
-DocType: Health Insurance,Health Insurance Name,Nombre del seguro de salud
+DocType: Health Insurance,Health Insurance Name,Nombre del Seguro de Salud
 DocType: Assessment Plan,Examiner,Examinador
 DocType: Student,Siblings,Hermanos
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Payment Entry,Payment References,Referencias del Pago
 DocType: C-Form,C-FORM-,Formulario-C
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Número de intervalos para el campo de intervalo, por ejemplo, si el intervalo es &#39;Días&#39; y el recuento del intervalo de facturación es 3, las facturas se generarán cada 3 días"
 DocType: Vehicle,Insurance Details,Detalles de Seguros
 DocType: Account,Payable,Pagadero
 DocType: Share Balance,Share Type,Tipo de Acción
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Deudores ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Beneficio Bruto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Beneficio Bruto %
 DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Cambiar el Perfil de POS
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Informe de evaluación
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Importe Bruto de Compra es obligatorio
-apps/erpnext/erpnext/setup/doctype/company/company.js +95,Company name not same,Nombre de la empresa no es el mismo
+apps/erpnext/erpnext/setup/doctype/company/company.js +95,Company name not same,El nombre de la Empresa no es el mismo
 DocType: Lead,Address Desc,Dirección
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Parte es obligatoria
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {list}
 DocType: Topic,Topic Name,Nombre del tema
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Por favor, configure la plantilla predeterminada para Dejar la notificación de aprobación en la Configuración de Recursos Humanos."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Seleccione un empleado para obtener el adelanto del empleado.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Seleccione un empleado para obtener el adelanto del empleado.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Por favor seleccione una fecha valida
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Seleccione la naturaleza de su negocio.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3935,11 +3960,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +86,Row #{0}: Duplicate entry in References {1} {2},Fila #{0}: Entrada duplicada en Referencias {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +18,As Examiner,Como Examinador
-DocType: Appointment Type,Default Duration,Duración predeterminada
+DocType: Appointment Type,Default Duration,Duración Predeterminada
 DocType: Asset Movement,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de Instalación
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Fila #{0}: Activo {1} no pertenece a la empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Fila #{0}: Activo {1} no pertenece a la empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Factura de Venta {0} creada
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
@@ -3948,23 +3973,24 @@
 DocType: Account,Accumulated Depreciation,Depreciación acumulada
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nombre en uso
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
-DocType: Employee Loan Application,Required by Date,Requerido por Fecha
+DocType: Loan Application,Required by Date,Requerido por Fecha
 DocType: Lead,Lead Owner,Propietario de la iniciativa
 DocType: Production Plan,Sales Orders Detail,Detalle de Órdenes de Venta
 DocType: Bin,Requested Quantity,Cantidad requerida
 DocType: Patient,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Requisición de Materiales Automática
-DocType: Woocommerce Settings,API consumer secret,Secreto de consumidor API
+DocType: Woocommerce Settings,API consumer secret,Clave Secreta de Consumidor API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Cantidad de lotes disponibles desde Almacén
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +50,Idevise,Idevise
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pago Bruto - Deducción total - Pago de Préstamos
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID de Nómina
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Multiples Variantes
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregado
+DocType: Subscription,Trial Period Start Date,Fecha de inicio del período de prueba
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Por favor inicie sesión como otro usuario.
@@ -3985,13 +4011,12 @@
 DocType: Student Guardian,Student Guardian,Tutor del estudiante
 DocType: Member,Member Name,Nombre del Miembro
 DocType: Stock Settings,Use Naming Series,Usar Series de Nomenclatura
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,en la suscripción
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 DocType: Membership,Payment Details,Detalles del Pago
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","La orden de trabajo detenida no se puede cancelar, desactívela primero para cancelarla"
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Coeficiente de la lista de materiales (LdM)
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","La Órden de Trabajo detenida no se puede cancelar, desactívela primero para cancelarla"
 DocType: Asset,Journal Entry for Scrap,Entrada de diario para desguace
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
@@ -4000,16 +4025,17 @@
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados en artículos
 apps/erpnext/erpnext/accounts/general_ledger.py +170,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo"
 DocType: Purchase Invoice,Terms,Términos.
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +10,Select Days,Seleccionar días
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +10,Select Days,Seleccionar Días
 DocType: Academic Term,Term Name,Nombre plazo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +332,Credit ({0}),Crédito ({0})
 DocType: Buying Settings,Purchase Order Required,Orden de compra requerida
-apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Minutero
+apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Temporizador
 ,Item-wise Sales History,Detalle de las Ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
 DocType: Land Unit,Land Unit,Unidad de Tierra
 ,Purchase Analytics,Analítico de compras
 DocType: Sales Invoice Item,Delivery Note Item,Nota de entrega del producto
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Falta la factura actual {0}
 DocType: Asset Maintenance Log,Task,Tarea
 DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
@@ -4021,7 +4047,7 @@
 DocType: Company,Exchange Gain / Loss Account,Cuenta de Ganancias / Pérdidas en Cambio
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empleados y Asistencias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Llene el formulario y guárdelo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Llene el formulario y guárdelo
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro de la comunidad
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Cantidad real en stock
 DocType: Homepage,"URL for ""All Products""",URL de &quot;Todos los productos&quot;
@@ -4035,20 +4061,20 @@
 DocType: Lab Test Template,Standard Selling Rate,Precio de venta estándar
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 DocType: Cash Flow Mapper,Section Name,Nombre de la Sección
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Cantidad a reabastecer
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Cantidad a reabastecer
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertas de empleo actuales
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Desajuste
-DocType: Patient Service Unit,Allow Overlap,Permitir superposición
+DocType: Patient Service Unit,Allow Overlap,Permitir Superposición
 DocType: Timesheet Detail,Operation ID,ID de Operación
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Si se define el ID de usuario 'Login', este sera el predeterminado para todos los documentos de recursos humanos (RRHH)"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,En cola para actualizar el último precio en todas las listas de materiales. Puede tomar algunos minutos.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
 DocType: Water Analysis,Appearance,Apariencia
+DocType: HR Settings,Leave Status Notification Template,Deja la plantilla de notificación de estado
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Promedio Precio de la Lista de Precios de Compra
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Información del Miembro.
@@ -4056,7 +4082,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +58,Asset Maintenance,Mantenimiento de activos
 ,Sales Payment Summary,Resumen de Pago de Ventas
 DocType: Restaurant,Restaurant,Restaurante
-DocType: Woocommerce Settings,API consumer key,Clave de consumidor API
+DocType: Woocommerce Settings,API consumer key,Clave de Consumidor API
 apps/erpnext/erpnext/accounts/party.py +320,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 DocType: Patient,Account Details,Detalles de la Cuenta
@@ -4071,11 +4097,11 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,No permitido. Desactiva la Plantilla de Prueba
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
 DocType: Crop Cycle,Linked Land Unit,Unidad de Tierra Vinculada
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
 DocType: Program Enrollment,School House,Casa Escolar
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
-DocType: Purchase Order,Order Confirmation Date,Fecha de confirmación del pedido
+DocType: Purchase Order,Order Confirmation Date,Fecha de Confirmación del Pedido
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +215,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
@@ -4087,7 +4113,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Ir a Usuarios
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el artículo {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN no válido o Enter NA para No registrado
 DocType: Training Event,Seminar,Seminario
 DocType: Program Enrollment Fee,Program Enrollment Fee,Cuota de Inscripción al Programa
@@ -4103,14 +4129,14 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 DocType: Company,Create Chart Of Accounts Based On,Crear plan de cuentas basado en
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,No se puede desagrupar. Existen Tareas Hijos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Estudiante {0} existe contra la solicitud de estudiante {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajuste de Redondeo (Moneda de la Empresa)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registro de Horas
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Cheque Print Template,Scanned Cheque,Cheque Scaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
@@ -4126,7 +4152,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,El Proyecto {0} ya existe
 DocType: Medical Department,Nursing User,Usuario de Enfermería
 DocType: Plant Analysis,Plant Analysis Criterias,Criterios de Análisis de Plantas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},El número de serie {0} no pertenece al lote {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El período de validez de esta cotización ha finalizado.
 DocType: Expense Claim Account,Expense Claim Account,Cuenta de Gastos
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir Tipos de Cambio Obsoletos
@@ -4134,8 +4161,8 @@
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
 apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,Agregar usuarios
 DocType: POS Item Group,Item Group,Grupo de productos
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Student Group: ,Grupo de estudiantes:
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Seleccionar país
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Student Group: ,Grupo de Estudiantes:
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Seleccionar País
 DocType: Item,Safety Stock,Stock de Seguridad
 DocType: Healthcare Settings,Healthcare Settings,Configuración de Atención Médica
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,El % de avance para una tarea no puede ser más de 100.
@@ -4148,11 +4175,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Hacer Variantes
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 DocType: Project,Total Billed Amount (via Sales Invoices),Importe Total Facturado (a través de Facturas de Ventas)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Monto de Nota de Debito
-DocType: Project Update,Not Updated,No actualizado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Monto de Nota de Debito
+DocType: Project Update,Not Updated,No Actualizado
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Hay inconsistencias entre la tasa, numero de acciones y la cantidad calculada"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Monto total pendiente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Monto total pendiente
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
 DocType: Employee Advance,Advance Account,Cuenta anticipada
 DocType: Job Offer,Job Offer Terms,Términos de Oferta de Trabajo
@@ -4161,7 +4188,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotores
 DocType: Vehicle,Insurance Company,Compañía de seguros
 DocType: Asset Category Account,Fixed Asset Account,Cuenta de activo fijo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Desde nota de entrega
 DocType: Chapter,Members,Miembros
 DocType: Student,Student Email Address,Dirección de correo electrónico del Estudiante
@@ -4184,7 +4211,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Interno
 DocType: Delivery Stop,Address Name,Nombre de la dirección
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Dividiendo {0} unidades de {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Dividiendo {0} unidades de {1}
 DocType: Assessment Code,Assessment Code,Código Evaluación
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
@@ -4192,30 +4219,29 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
 DocType: Bank Reconciliation Detail,Payment Document,Documento de pago
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Error al evaluar la fórmula de criterios
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
+DocType: Subscription,Plans,Planes
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Distribuir materiales
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Se ha producido un error al crear recurrente
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Presupuestos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No se crearon grupos de estudiantes.
 DocType: Purchase Invoice Item,Serial No,Número de serie
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad mensual La devolución no puede ser mayor que monto del préstamo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad mensual La devolución no puede ser mayor que monto del préstamo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Fila #{0}: La fecha de entrega esperada no puede ser anterior a la fecha de la orden de compra
 DocType: Purchase Invoice,Print Language,Lenguaje de impresión
 DocType: Salary Slip,Total Working Hours,Horas de trabajo total
-DocType: Sales Invoice,Customer PO Details,Cliente PO Detalles
-DocType: Subscription,Next Schedule Date,Siguiente Fecha Programada
+DocType: Sales Invoice,Customer PO Details,Detalles de la OC del Cliente
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Cuenta de Apertura Temporal
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,El valor introducido debe ser positivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +446,All Territories,Todos los Territorios
-apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,Agregar tareas múltiples
+apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,Agregar Tareas Múltiples
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +34,Student is already enrolled.,Estudiante ya está inscrito.
 DocType: Fiscal Year,Year Name,Nombre del Año
@@ -4238,16 +4264,16 @@
 DocType: Issue,Opening Time,Hora de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Desde y Hasta la fecha solicitada
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Sin empleados por los criterios mencionados
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
 DocType: Hotel Settings,Default Customer,Cliente predeterminado
 DocType: Assessment Plan,Supervisor Name,Nombre del supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirme si la cita se crea para el mismo día
 DocType: Program Enrollment Course,Program Enrollment Course,Inscripción al Programa Curso
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +165,Make Sample Retention Stock Entry,Hacer la entrada de stock de retención de muestra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +165,Make Sample Retention Stock Entry,Hacer la Entrada de Stock de Retención de Muestra
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y Total
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,Tarjetas de Puntuación
 DocType: Employee,This will restrict user access to other employee records,Esto restringirá el acceso del usuario a otros registros de empleados
@@ -4266,30 +4292,31 @@
 DocType: Journal Entry Account,Employee Advance,Avance del Empleado
 DocType: Payroll Entry,Payroll Frequency,Frecuencia de la Nómina
 DocType: Lab Test Template,Sensitivity,Sensibilidad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Materia prima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Plantas y Maquinarias
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Plantas y Maquinarias
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustes de Resumen Diario de Trabajo
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Ingrese Requerido por Fecha
 DocType: Payment Entry,Internal Transfer,Transferencia interna
 DocType: Asset Maintenance,Maintenance Tasks,Tareas de Mantenimiento
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Es obligatoria la meta de facturacion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Por favor, seleccione fecha de publicación primero"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Por favor, seleccione fecha de publicación primero"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
 DocType: Leave Control Panel,Carry Forward,Trasladar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,El centro de costos con transacciones existentes no se puede convertir a libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días en que las vacaciones / permisos se bloquearan para este departamento.
-DocType: GoCardless Mandate,ERPNext Integrations,ERPSiguiente integraciones
+DocType: GoCardless Mandate,ERPNext Integrations,Integraciones ERPNext
 DocType: Crop Cycle,Detected Disease,Enfermedad Detectada
 ,Produced,Producido
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,La fecha de inicio del reembolso no puede ser anterior a la fecha de desembolso.
 DocType: Item,Item Code for Suppliers,Código del producto para proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Training Event,Trainer Name,Nombre del entrenador
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última Comunicación
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Conciliacion de pagos con facturas
 DocType: Journal Entry,Bank Entry,Registro de Banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
@@ -4303,7 +4330,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} en Medio día Deja en {1}
 DocType: Production Plan,Get Material Request,Obtener Solicitud de materiales
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,GASTOS POSTALES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 ,Item Variant Details,Detalles de la Variante del Artículo
@@ -4314,9 +4341,9 @@
 DocType: Drug Prescription,Hour,Hora
 DocType: Restaurant Order Entry,Last Sales Invoice,Última Factura de Venta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Seleccione Cant. contra el Elemento {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar ausencias en fechas bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar ausencias en fechas bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 DocType: Company,Monthly Sales Target,Objetivo Mensual de Ventas
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
@@ -4324,7 +4351,7 @@
 DocType: Item,Default Material Request Type,El material predeterminado Tipo de solicitud
 DocType: Supplier Scorecard,Evaluation Period,Periodo de Evaluación
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Desconocido
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Orden de trabajo no creada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Órden de Trabajo no creada
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
 DocType: Purchase Invoice,Export Type,Tipo de Exportación
 DocType: Salary Slip Loan,Salary Slip Loan,Préstamo de Nómina
@@ -4340,7 +4367,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Resumen de Facturas de Apertura
 DocType: Education Settings,Education Manager,Gerente de Educación
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Longitud mínima entre cada planta en el campo para un crecimiento óptimo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","El elemento de lote {0} no se puede actualizar mediante la Reconciliación de Stock, en lugar de ello, usar Entrada de Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","El elemento de lote {0} no se puede actualizar mediante la Reconciliación de Stock, en lugar de ello, usar Entrada de Stock"
 DocType: Quality Inspection,Report Date,Fecha del reporte
 DocType: Student,Middle Name,Segundo nombre
 DocType: C-Form,Invoices,Facturas
@@ -4351,7 +4378,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +84,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indica que {1} no proporcionará una cita, pero todos los elementos \ han sido citados. Actualización del estado de cotización RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1184,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Las muestras máximas - {0} ya se han conservado para el lote {1} y el elemento {2} en el lote {3}.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Type in Buying Settings.,Establezca el tipo de proveedor en la configuración de compra.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Type in Buying Settings.,Establezca el Tipo de Proveedor en la Configuración de Compra.
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Actualizar automáticamente el coste de la lista de materiales
 DocType: Lab Test,Test Name,Nombre de la Prueba
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Crear usuarios
@@ -4363,7 +4390,7 @@
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
 DocType: POS Customer Group,Customer Group,Categoría de Cliente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +258,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,Fila # {0}: la operación {1} no se completa para {2} cantidad de productos terminados en la orden de trabajo n.º {3}. Actualice el estado de la operación a través de Registros de tiempo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +258,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,Fila # {0}: la operación {1} no se completa para {2} cantidad de productos terminados en la orden de trabajo n.º {3}. Actualice el estado de la operación a través de Registros de Tiempo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),Nuevo ID de lote (opcional)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: BOM,Website Description,Descripción del Sitio Web
@@ -4371,20 +4398,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Recibo
 ,Sales Register,Registro de ventas
 DocType: Daily Work Summary Group,Send Emails At,Enviar Correos Electrónicos a
 DocType: Quotation,Quotation Lost Reason,Razón de la Pérdida
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Referencia de la transacción nro {0} fechada {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vista de Formulario
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Aprobador de gastos obligatorio en la reclamación de gastos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Agregue usuarios a su organización, que no sean usted mismo."
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,¡Aún no hay clientes!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estado de Flujos de Efectivo
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,No se ha creado ninguna solicitud material
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
@@ -4407,11 +4435,12 @@
 DocType: Vehicle,Chassis No,N° de Chasis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Plan Item,Planned Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Seleccione una Lista de Materiales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Seleccione una Lista de Materiales
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Impuesto Integrado ITC disponible
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
+DocType: Bank Guarantee,Clauses and Conditions,Cláusulas y condiciones
 DocType: Serial No,Creation Document Type,Creación de documento
 DocType: Project Task,View Timesheet,Ver Parte de Horas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La fecha de finalización debe ser mayor que la fecha de inicio
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Ausencias Asignadas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para el presupuesto
@@ -4425,9 +4454,10 @@
 DocType: Patient,Alcohol Current Use,Uso Corriente de Alcohol
 DocType: Student Admission Program,Student Admission Program,Programa de Admisión de Estudiantes
 DocType: Payment Entry,Account Paid To,Cuenta pagado hasta
-DocType: Item Alternative,Alternative Item Name,Nombre alternativo del artículo
+DocType: Subscription Settings,Grace Period,Periodo de gracia
+DocType: Item Alternative,Alternative Item Name,Nombre Alternativo del Artículo
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",No se pudo enviar ningún recibo salarial <br> \ Posibles razones: <br> 1. El pago neto es menor a 0. <br> \ 2. La dirección de correo electrónico de la empresa especificada en el maestro de empleados no es válida. <br>
@@ -4437,7 +4467,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},El presupuesto {0} de la cuenta {1} para {2} {3} es {4} superior por {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Cant. enviada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,y desactivar Deshabilitado en el
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Servicios financieros
 DocType: Student Sibling,Student ID,Identificación del Estudiante
@@ -4449,14 +4478,16 @@
 DocType: Complaint,Complaint,Queja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
 DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Hacer la entrada de pago
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Todos los departamentos
 DocType: Patient,Alcohol Past Use,Uso Pasado de Alcohol
 DocType: Fertilizer Content,Fertilizer Content,Contenido de Fertilizante
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cred
-DocType: Project Update,Problematic/Stuck,Problemático / atascado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cred
+DocType: Project Update,Problematic/Stuck,Problemático / Atascado
 DocType: Tax Rule,Billing State,Región de facturación
 DocType: Share Transfer,Transfer,Transferencia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,La orden de trabajo {0} debe cancelarse antes de cancelar esta orden de venta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,La Órden de Trabajo {0} debe cancelarse antes de cancelar esta Órden de Venta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
@@ -4480,10 +4511,11 @@
 DocType: Cheque Print Template,Message to show,Mensaje a mostrar
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Ventas al por menor
 DocType: Student Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,No se puede encontrar la puntuación a partir de {0}. Usted necesita tener puntuaciones en pie que cubren 0 a 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
+DocType: Subscription,Current Invoice Start Date,Fecha de inicio de la factura actual
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bien se requiere tarjeta de débito o crédito por importe {2}
 DocType: GL Entry,Remarks,Observaciones
@@ -4493,26 +4525,27 @@
 DocType: Task,Parent Task,Tarea Padre
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Hacer una Iniciativa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impresión y Papelería
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Impresión y Papelería
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo de código de barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Enviar mensajes de correo electrónico al proveedor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesado para el período entre {0} y {1}, Deja período de aplicación no puede estar entre este intervalo de fechas."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Enviar mensajes de correo electrónico al proveedor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesado para el período entre {0} y {1}, Deja período de aplicación no puede estar entre este intervalo de fechas."
+DocType: Fiscal Year,Auto Created,Creado automáticamente
 DocType: Chapter Member,Leave Reason,Deja la Razón
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,La factura {0} ya no existe
 DocType: Guardian Interest,Guardian Interest,Interés del Tutor
 DocType: Volunteer,Availability,Disponibilidad
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configurar los valores predeterminados para facturas de POS
 apps/erpnext/erpnext/config/hr.py +182,Training,Formación
-DocType: Project,Time to send,Hora de enviar
+DocType: Project,Time to send,Hora de Enviar
 DocType: Timesheet,Employee Detail,Detalle de los Empleados
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID de correo electrónico del Tutor1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
 DocType: Lab Prescription,Test Code,Código de Prueba
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustes para la página de inicio de la página web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Las solicitudes de Presupuesto (RFQs) no están permitidas para {0} debido a un puntaje de {1}
 DocType: Job Offer,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Arriba
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Monto total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},atributo no válido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Monto total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},atributo no válido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mencionar si la cuenta no  es cuenta estándar a pagar
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Seleccione el grupo de evaluación que no sea &#39;Todos los grupos de evaluación&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Fila {0}: Centro de Costos es necesario para un elemento {1}
@@ -4523,7 +4556,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Análisis de Agua
 DocType: Chapter,Region,Región
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Recargar Análisis Vinculado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
@@ -4539,7 +4572,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Costo del activo desechado
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
 DocType: Vehicle,Policy No,N° de Política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obtener Productos del Paquete de Productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obtener Productos del Paquete de Productos
 DocType: Asset,Straight Line,Línea Recta
 DocType: Project User,Project User,usuario proyecto
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,División
@@ -4575,22 +4608,22 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Camino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
 DocType: Production Plan,Total Planned Qty,Cantidad Total Planificada
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valor de Apertura
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valor de Apertura
 DocType: Salary Detail,Formula,Fórmula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #.
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #.
 DocType: Lab Test Template,Lab Test Template,Plantilla de Prueba de Laboratorio
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Cuenta de Ventas
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Cuenta de Ventas
 DocType: Purchase Invoice Item,Total Weight,Peso Total
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comisiones sobre ventas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Comisiones sobre ventas
 DocType: Job Offer Term,Value / Description,Valor / Descripción
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
 DocType: Tax Rule,Billing Country,País de facturación
 DocType: Purchase Order Item,Expected Delivery Date,Fecha prevista de entrega
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de Orden de Restaurante
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
 DocType: Asset Maintenance Task,Assign To Name,Asignar a Nombre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
-DocType: Hub Settings,Enabled Users,Usuarios habilitados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
+DocType: Hub Settings,Enabled Users,Usuarios Habilitados
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Hacer Solicitud de materiales
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Abrir elemento {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
@@ -4602,24 +4635,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Solicitudes de ausencia.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 DocType: Vehicle,Last Carbon Check,Último control de Carbono
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,GASTOS LEGALES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,GASTOS LEGALES
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Por favor, seleccione la cantidad en la fila"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Hacer Apertura de Ventas y Facturas de Compra
 DocType: Purchase Invoice,Posting Time,Hora de Contabilización
 DocType: Timesheet,% Amount Billed,% importe facturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Cuenta telefonica
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Cuenta telefonica
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ningún producto con numero de serie {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ningún producto con numero de serie {0}
 DocType: Email Digest,Open Notifications,Abrir notificaciones
 DocType: Payment Entry,Difference Amount (Company Currency),Diferencia de Monto (Divisas de la Compañía)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Gastos directos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Gastos directos
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos del nuevo cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Gastos de Viaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Añadir una Suscripción de campo personalizado en el doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
 DocType: Purchase Receipt Item,Sample Quantity,Cantidad de Muestra
+DocType: Bank Guarantee,Name of Beneficiary,Nombre del beneficiario
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizar el costo de la lista de materiales automáticamente a través de las tareas programadas, basado en la última tasa de valoración / tarifa de lista de precios / última tasa de compra de materias primas."
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
@@ -4631,14 +4664,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Período de prueba
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
 DocType: Program Enrollment Tool,New Academic Year,Nuevo Año Académico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Devolución / Nota de Crédito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Devolución / Nota de Crédito
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertar automáticamente Tasa de Lista de Precio si falta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Importe total pagado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Importe total pagado
 DocType: GST Settings,B2C Limit,Límite B2C
 DocType: Work Order Item,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planificación
 DocType: Share Balance,Issued,Emitido
+DocType: Loan,Repayment Start Date,Fecha de inicio de pago
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Actividad del Estudiante
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID de Proveedor
 DocType: Payment Request,Payment Gateway Details,Detalles de Pasarela de Pago
@@ -4651,10 +4685,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes resumidos periódicamente por correo electrónico.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Defina la cuenta predeterminada en Tipo de reclamación de gastos {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Defina la cuenta predeterminada en Tipo de reclamación de gastos {0}.
 DocType: Assessment Result,Student Name,Nombre del estudiante
 DocType: Brand,Item Manager,Administración de artículos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Nómina por Pagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Nómina por Pagar
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Plant Analysis,Collection Datetime,Colección Fecha y hora
 DocType: Work Order,Total Operating Cost,Costo Total de Funcionamiento
@@ -4664,9 +4698,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,El usuario {0} no existe
 DocType: Payment Term,Day(s) after invoice date,Día(s) después de la fecha de la factura
 DocType: Payment Schedule,Payment Schedule,Calendario de Pago
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Entrada de pago ya existe
+DocType: Subscription,Trial Period End Date,Fecha de finalización del período de prueba
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla maestra de nómina salarial
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patología
@@ -4683,9 +4717,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulado Mensual
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Cuenta {0}: la cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
@@ -4694,14 +4728,15 @@
 DocType: Lab Prescription,Test Created,Prueba Creada
 DocType: Healthcare Settings,Custom Signature in Print,Firma Personalizada en la Impresión
 DocType: Account,Temporary,Temporal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Cliente LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Cliente LPO Nro.
 DocType: Program,Courses,Cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secretaria
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si se desactiva, el campo 'En Palabras' no será visible en ninguna transacción."
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Esta acción detendrá la facturación futura. ¿Seguro que quieres cancelar esta suscripción?
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Supplier Scorecard Criteria,Criteria Name,Nombre del Criterio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Por favor seleccione Compañía
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Por favor seleccione Compañía
 DocType: Pricing Rule,Buying,Compras
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Enfermedades y Fertilizantes
 DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
@@ -4710,17 +4745,17 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descuento en
 DocType: Member,Membership Type,Tipo de Membresía
 ,Reqd By Date,Fecha de solicitud
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Acreedores
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Acreedores
 DocType: Assessment Plan,Assessment Name,Nombre de la Evaluación
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Mostrar PDC en Imprimir
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Mostrar Cheque Postdatado en Imprimir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Fila #{0}: El número de serie es obligatorio
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Oferta de Trabajo
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abreviatura del Instituto
 ,Item-wise Price List Rate,Detalle del listado de precios
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Presupuesto de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Presupuesto de Proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' será visible una vez guarde el Presupuesto
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Cantidad ({0}) no puede ser una fracción en la fila {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Cantidad ({0}) no puede ser una fracción en la fila {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
@@ -4738,7 +4773,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Bolsa de valores
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,La asistencia para el empleado {0} ya está marcada para el día de hoy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,La asistencia para el empleado {0} ya está marcada para el día de hoy
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo)
 DocType: Customer,From Lead,Desde Iniciativa
@@ -4749,6 +4784,7 @@
 DocType: Lab Test,Approved Date,Fecha Aprobada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
+DocType: Subscriber,Subscriber Name,Nombre del suscriptor
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Update Tool,Replace,Reemplazar
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No se encuentran productos
@@ -4758,19 +4794,18 @@
 DocType: Request for Quotation Item,Project Name,Nombre de Proyecto
 DocType: Customer,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Seleccione la cuenta de ingresos por intereses en el préstamo para empleados {0}
 DocType: Work Order,Required Items,Artículos Requeridos
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 DocType: Disease,Treatment Task,Tarea de Tratamiento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Impuestos pagados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Impuestos pagados
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Precio medio variable
 DocType: BOM Update Tool,The BOM which will be replaced,La lista de materiales que será sustituida
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equipos Electrónicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Equipos Electrónicos
 DocType: Asset,Maintenance Required,Requiere Mantenimiento
 DocType: Account,Debit,Debe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
@@ -4779,7 +4814,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Saldo pendiente
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: el elemento es obligatorio para los activos fijos de compra / venta
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: el elemento es obligatorio para los activos fijos de compra / venta
 DocType: Asset Maintenance Team,Maintenance Team Name,Nombre del Equipo de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,El Cliente es obligatorio si se selecciona 'Oportunidad De' como Cliente
@@ -4788,20 +4823,18 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipos de reembolsos
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},La tasa de venta del elemento {0} es menor que su {1}. La tarifa de venta debe ser al menos {2}
-DocType: Item,Taxes,Impuestos
+DocType: Subscription,Taxes,Impuestos
 DocType: Purchase Invoice,capital goods,bienes de equipo
 DocType: Purchase Invoice Item,Weight Per Unit,Peso por Unidad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Pagados y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
-DocType: Bank Guarantee,End Date,Fecha final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transacciones de Stock
 DocType: Budget,Budget Accounts,Cuentas de Presupuesto
 DocType: Employee,Internal Work History,Historial de trabajo interno
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Depreciación acumulada Importe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Capital de Riesgo
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variable de la Calificación del Proveedor
-DocType: Employee Loan,Fully Disbursed,Completamente Desembolsado
-DocType: Employee Advance,Due Advance Amount,Importe de adelanto adeudado
+DocType: Employee Advance,Due Advance Amount,Importe de Adelanto Adeudado
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +54,Score cannot be greater than Maximum Score,El puntaje no puede ser mayor que puntaje máximo
@@ -4824,7 +4857,7 @@
 ,Employee Information,Información del empleado
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Crear oferta de venta de un proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Crear oferta de venta de un proveedor
 DocType: Quality Inspection,Incoming,Entrante
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Se crean plantillas de impuestos predeterminadas para ventas y compras.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,El registro de Resultados de la Evaluación {0} ya existe.
@@ -4832,8 +4865,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, ponga el filtro de la Compañía en blanco si el Grupo Por es ' Empresa'."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Fecha de entrada no puede ser fecha futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Fila #{0}: Número de serie {1} no coincide con {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,para generar recurrente
-DocType: Stock Entry,Target Warehouse Address,Dirección del almacén de destino
+DocType: Stock Entry,Target Warehouse Address,Dirección del Almacén de Destino
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Permiso ocacional
 DocType: Agriculture Task,End Day,Día Final
 DocType: Batch,Batch ID,ID de Lote
@@ -4849,7 +4881,7 @@
 DocType: Variant Field,Variant Field,Campo de Variante
 DocType: Sales Order,Delivery Date,Fecha de entrega
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
-DocType: Employee,Health Insurance Provider,Proveedor de seguro de salud
+DocType: Employee,Health Insurance Provider,Proveedor de Seguro de Salud
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
 DocType: Water Analysis,Person Responsible,Persona Responsable
 DocType: Request for Quotation Item,Request for Quotation Item,Ítems de Solicitud de Presupuesto
@@ -4857,52 +4889,51 @@
 DocType: Material Request,% Ordered,% Ordenado
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para los grupos de estudiantes basados en cursos, el curso será validado para cada estudiante de los cursos inscritos en la inscripción al programa."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Trabajo por obra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Precio de compra promedio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Precio de compra promedio
 DocType: Share Balance,From No,Desde Nro
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
 DocType: Employee,History In Company,Historia en la Compañia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nuevo Mensaje de {sender}
 DocType: Customer,Customer Primary Address,Dirección Principal del Cliente
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletines
 DocType: Drug Prescription,Description/Strength,Descripción / Fuerza
-DocType: Share Balance,Is Company,Es la compañia
+DocType: Share Balance,Is Company,Es la Compañia
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,El mismo artículo se ha introducido varias veces
 DocType: Department,Leave Block List,Dejar lista de bloqueo
 DocType: Purchase Invoice,Tax ID,ID de impuesto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
 DocType: Accounts Settings,Accounts Settings,Configuración de cuentas
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Aprobar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","La dirección malformada para {0}, corrige para continuar."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","La dirección malformada para {0}, corrige para continuar."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Número de Cuenta Nueva, se incluirá en el nombre de la cuenta como prefijo"
 DocType: Maintenance Team Member,Team Member,Miembro del Equipo
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,No hay resultados para enviar
 DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas
-DocType: Employee Loan,Rate of Interest (%) / Year,Tasa de interés (%) / Año
+DocType: Loan,Rate of Interest (%) / Year,Tasa de interés (%) / Año
 ,Project Quantity,Cantidad de Proyecto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
 DocType: Opportunity,To Discuss,Para discusión
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesaria en {2} para completar esta transacción.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasa de interés (%) Anual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Cuentas temporales
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Negro
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Cuentas temporales
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Shareholder,Contact List,Lista de Contactos
 DocType: Account,Auditor,Auditor
-DocType: Project,Frequency To Collect Progress,Frecuencia para recoger el progreso
+DocType: Project,Frequency To Collect Progress,Frecuencia para Recoger el Progreso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} artículos producidos
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Aprende Más
 DocType: Cheque Print Template,Distance from top edge,Distancia desde el borde superior
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Lista de precios {0} está desactivada o no existe
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Lista de precios {0} está desactivada o no existe
 DocType: Purchase Invoice,Return,Retornar
 DocType: Pricing Rule,Disable,Desactivar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Forma de pago se requiere para hacer un pago
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Forma de pago se requiere para hacer un pago
 DocType: Project Task,Pending Review,Pendiente de revisar
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Edite en la página completa para obtener más opciones como activos, números de serie, lotes, etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Citas y Consultas
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no está inscrito en el lote {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} no puede ser desechado, debido a que ya es {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cheques Requeridos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cheques Requeridos
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Error al configurar la compañía
@@ -4914,7 +4945,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Componente de Couta
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestión de Flota
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Agregar elementos de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Agregar elementos de
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Cultivos y Tierras
 DocType: Cheque Print Template,Regular,Regular
 DocType: Fertilizer,Density (if liquid),Densidad (si es líquida)
@@ -4933,30 +4964,32 @@
 DocType: Asset Maintenance Log,Has Certificate,Tiene Certificado
 DocType: Project,Customer Details,Datos de Cliente
 DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,Verifique si el activo requiere mantenimiento preventivo o calibración
-apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,La abreviatura de la empresa no puede tener más de 5 caracteres
+apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,La abreviatura de la Empresa no puede tener más de 5 caracteres
 DocType: Employee,Reports to,Enviar Informes a
 ,Unpaid Expense Claim,Reclamación de gastos no pagados
 DocType: Payment Entry,Paid Amount,Cantidad Pagada
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Explorar el Ciclo de Ventas
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Entrada de Retención de Acciones
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Entrada de Retención de Acciones
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del Producto
-,Work Order Stock Report,Informe de stock de orden de trabajo
+,Work Order Stock Report,Informe de stock de Órden de Trabajo
+DocType: Purchase Receipt,Auto Repeat Detail,Detalle de repetición automática
 DocType: Assessment Result Tool,Assessment Result Tool,Herramienta Resultado de la Evaluación
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Como Supervisor
-apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugerir categoría
+apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugerir Categoría
 DocType: BOM Scrap Item,BOM Scrap Item,BOM de Artículo  de Desguace
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Ordenes presentada no se pueden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestión de Calidad
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestión de Calidad
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Elemento {0} ha sido desactivado
 DocType: Project,Total Billable Amount (via Timesheets),Monto Total Facturable (a través de Partes de Horas)
 DocType: Agriculture Task,Previous Business Day,Día Hábil Anterior
-DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una Cantidad Fja por Período
-DocType: Employee,Health Insurance No,Seguro de Salud No
+DocType: Loan,Repay Fixed Amount per Period,Pagar una Cantidad Fja por Período
+DocType: Employee,Health Insurance No,Seguro de Salud Nro
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Monto de Nora de Credito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Monto de Nora de Credito
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Monto imponible total
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
 DocType: Opening Invoice Creation Tool,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance
@@ -4967,15 +5000,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 DocType: Healthcare Settings,Valid number of days,Número válido de días
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centros de costos
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Reiniciar suscripción
 DocType: Land Unit,Linked Plant Analysis,Análisis de Plantas Vinculadas
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasa por la cual la divisa del proveedor es convertida como moneda base de la compañía
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir tasa de valoración cero
+DocType: Bank Guarantee,Receiving,Recepción
 DocType: Training Event Employee,Invited,Invitado
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activas encontradas para el empleado {0} para las fechas indicadas
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ACTIVOS FIJOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ACTIVOS FIJOS
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajuste de ganancia del intercambio / Pérdida
 ,GST Purchase Register,Registro de Compra de TPS
 ,Cash Flow,Flujo de fondos
@@ -4995,10 +5030,11 @@
 DocType: Academic Term,Term Start Date,Plazo Fecha de Inicio
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista de todas las transacciones de acciones
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Cant Oportunidad
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Se deben configurar tanto la fecha de inicio del período de prueba como la fecha de finalización del período de prueba
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tasa Promedio
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibrio extracto bancario según Contabilidad General
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado
+DocType: Subscription Plan Detail,Plan,Plan
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Saldo de Extracto Bancario según Balance General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de Artículo
 DocType: Buying Settings,"If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt","Si está habilitado, los detalles de la última compra de los artículos no se obtendrán de la orden de compra anterior o recibo de compra"
@@ -5027,6 +5063,7 @@
 DocType: Work Order,Warehouses,Almacenes
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activo no se puede transferir
 DocType: Hotel Room Pricing,Hotel Room Pricing,Precios de Habitación de Hotel
+DocType: Subscription,Days Until Due,Días hasta el vencimiento
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Este elemento es una variante de {0} (plantilla).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Adquisitivo
@@ -5035,23 +5072,24 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para el grupo de estudiantes basado en lotes, el lote de estudiantes será validado para cada estudiante de la inscripción al programa."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribución
+DocType: Journal Entry Account,Loan,Préstamo
 DocType: Expense Claim Advance,Expense Claim Advance,Anticipo de Adelanto de Gastos
 DocType: Lab Test,Report Preference,Preferencia de Informe
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Información del Voluntario.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Gerente de proyectos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Gerente de proyectos
 ,Quoted Item Comparison,Comparación de artículos de Cotización
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Se superponen las puntuaciones entre {0} y {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Valor neto de activos como en
 DocType: Crop,Produce,Produce
 DocType: Hotel Settings,Default Taxes and Charges,Impuestos y Cargos por Defecto
 DocType: Account,Receivable,A cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila #{0}: No se permite cambiar de proveedores debido a que la Orden de Compra ya existe
-DocType: Stock Entry,Material Consumption for Manufacture,Consumo de material para fabricación
-DocType: Item Alternative,Alternative Item Code,Código de artículo alternativo
+DocType: Stock Entry,Material Consumption for Manufacture,Consumo de Material para Fabricación
+DocType: Item Alternative,Alternative Item Code,Código de Artículo Alternativo
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Seleccionar artículos para Fabricación
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Seleccionar artículos para Fabricación
 DocType: Delivery Stop,Delivery Stop,Parada de Entrega
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Sincronización de datos Maestros,  puede tomar algún tiempo"
 DocType: Item,Material Issue,Expedición de Material
@@ -5061,15 +5099,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Jabón y detergente
 DocType: BOM,Show Items,Mostrar elementos
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Tiempo Desde no puede ser mayor Tiempo Hasta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,¿Desea notificar a todos los clientes por correo electrónico?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,¿Desea notificar a todos los clientes por correo electrónico?
+DocType: Subscription Plan,Billing Interval,Intervalo de facturación
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Reanudar
-DocType: Hub Settings,Hub Username,Nombre de usuario del concentrador
+DocType: Hub Settings,Hub Username,Nombre de usuario del Hub
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criterios de evaluación del Grupo
 DocType: Healthcare Settings,Patient Name By,Nombre del Paciente Por
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Entrada de diario de acumulación para salarios de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Entrada de Diario de Acumulación para Salarios de {0} a {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
@@ -5083,22 +5121,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
-DocType: Employee Loan,Disbursement Date,Fecha de desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Destinatarios&#39; no especificado
+DocType: Loan,Disbursement Date,Fecha de desembolso
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualizar el último precio en todas las listas de materiales
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Registro Médico
 DocType: Vehicle,Vehicle,Vehículo
 DocType: Purchase Invoice,In Words,En palabras
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Ingrese el nombre del banco o institución de crédito antes de enviarlo.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} debe enviarse
 DocType: POS Profile,Item Groups,Grupos de productos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Sales Order Item,For Production,Por producción
 DocType: Payment Request,payment_url,url_de_pago
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Agregue una Cuenta de Apertura Temporal en el Plan de Cuentas
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Agregue una Cuenta de Apertura Temporal en el Plan de Cuentas
 DocType: Customer,Customer Primary Contact,Contacto Principal del Cliente
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Diario de Cierre de Período
 DocType: Project Task,View Task,Ver Tareas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Inviciativa %
+DocType: Bank Guarantee,Bank Guarantee Type,Tipo de garantía bancaria
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Porción de Factura
 ,Asset Depreciations and Balances,Depreciaciones de Activos y Saldos
@@ -5106,12 +5145,11 @@
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
-DocType: Production Plan,Include Subcontracted Items,Incluir elementos subcontratados
+DocType: Production Plan,Include Subcontracted Items,Incluir Artículos Subcontratados
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Unirse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de la Variante después de transacciones de stock. Deberá crear un nuevo ítem para hacer esto.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
-DocType: Employee Loan,Repay from Salary,Reembolso del Salario
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+DocType: Loan,Repay from Salary,Reembolso del Salario
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
 DocType: Salary Slip,Salary Slip,Nómina salarial
@@ -5135,11 +5173,11 @@
 DocType: Employee Education,Employee Education,Educación del empleado
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Se encontró grupo de artículos duplicado  en la table de grupo de artículos
 DocType: Land Unit,Parent Land Unit,Unidad de Tierra Padre
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
 DocType: Fertilizer,Fertilizer Name,Nombre de Fertilizante
 DocType: Salary Slip,Net Pay,Pago Neto
 DocType: Cash Flow Mapping Accounts,Account,Cuenta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
 DocType: Expense Claim,Vehicle Log,Bitácora del Vehiculo
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presencia de fiebre (temperatura &gt; 38,5 °C o temperatura sostenida &gt; 38 °C / 100,4 °F)"
@@ -5158,7 +5196,7 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +116,Error '{0}' occured. Arguments {1}.,Se produjo el error &#39;{0}&#39;. Argumentos {1}.
 DocType: Bin,Reserved Qty for sub contract,Cantidad reservada para Subcontrato
-DocType: Patient Service Unit,Patinet Service Unit,Unidad de servicio Patinet
+DocType: Patient Service Unit,Patinet Service Unit,Unidad de Servicio al Paciente
 DocType: Sales Invoice,Base Change Amount (Company Currency),Importe de Cambio Base (Divisa de la Empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +95,Save the document first.,Guarde el documento primero.
@@ -5176,28 +5214,27 @@
 DocType: Delivery Stop,Email Sent To,Correo electrónico enviado a
 DocType: Budget,Warn,Advertir
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +108,Are you sure you want to unregister?,¿Estás seguro de que deseas cancelar el registro?
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +926,All items have already been transferred for this Work Order.,Todos los artículos ya han sido transferidos para esta Orden de trabajo.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +926,All items have already been transferred for this Work Order.,Todos los artículos ya han sido transferidos para esta Orden de Trabajo.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: Asset Maintenance,Manufacturing User,Usuario de Producción
 DocType: Purchase Invoice,Raw Materials Supplied,Materias primas suministradas
-DocType: C-Form,Series,Secuencia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},La moneda de la lista de precios {0} debe ser {1} o {2}
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Soil Texture,Ternary Plot,Trama Ternaria
 DocType: Item Group,Item Classification,Clasificación de producto
 DocType: Driver,License Number,Número de Licencia
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Gerente de desarrollo de negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de Visita de Mantenimiento
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Registro de Factura Paciente
 DocType: Crop,Period,Período
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Balance general
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Empleado {0} en excedencia {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Empleado {0} en excedencia {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver Iniciativas
 DocType: Program Enrollment Tool,New Program,Nuevo Programa
 DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 DocType: Salary Detail,Salary Detail,Detalle de Sueldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultas
@@ -5205,15 +5242,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la Orden de trabajo {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Hoja de tiempo para la fabricación.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variant después de la transacción de stock. Deberá crear un nuevo ítem para hacer esto.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandato de SEPA GoCardless
 DocType: Physician,Charges,Cargos
-DocType: Production Plan,Get Items For Work Order,Obtener artículos para la orden de trabajo
+DocType: Production Plan,Get Items For Work Order,Obtener artículos para la Órden de Trabajo
 DocType: Salary Detail,Default Amount,Importe por defecto
 DocType: Lab Test Template,Descriptive,Descriptivo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,El almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,El almacén no se encuentra en el sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Establezca una meta de ventas que le gustaría alcanzar para su empresa.
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
@@ -5241,11 +5279,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Error al crear el sitio web
 DocType: Soil Analysis,Mg/K,Mg/K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Entrada de Inventario de Retención ya creada o Cantidad de muestra no proporcionada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Entrada de Inventario de Retención ya creada o Cantidad de muestra no proporcionada
 DocType: Program,Program Abbreviation,Abreviatura del Programa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Warranty Claim,Resolved By,Resuelto por
-DocType: Bank Guarantee,Start Date,Fecha de inicio
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las ausencias para un período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques y Depósitos liquidados de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
@@ -5260,11 +5297,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
 DocType: Purchase Invoice,04-Correction in Invoice,04-Corrección en la Factura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Orden de trabajo ya creada para todos los artículos con lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Órden de Trabajo ya creada para todos los artículos con lista de materiales
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Informe de Detalles de Variaciones
 DocType: Setup Progress Action,Setup Progress Action,Acción de Progreso de Configuración
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Lista de Precios de Compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Lista de Precios de Compra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Cancelar suscripción
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Seleccione Estado de Mantenimiento como Completado o elimine Fecha de Finalización
 DocType: Supplier,Default Payment Terms Template,Plantilla de Términos de Pago Predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Moneda de la transacción debe ser la misma que la moneda de la pasarela de pago
@@ -5275,7 +5313,6 @@
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acción si se acumula presupuesto mensual excedido
-DocType: Subscription,Submit on creation,Validar al Crear
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Moneda para {0} debe ser {1}
 DocType: Asset,Disposal Date,Fecha de eliminación
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Los correos electrónicos serán enviados a todos los empleados activos de la empresa a la hora determinada, si no tienen vacaciones. Resumen de las respuestas será enviado a la medianoche."
@@ -5293,6 +5330,7 @@
 DocType: Batch,Parent Batch,Lote padre
 DocType: Cheque Print Template,Cheque Print Template,Plantilla de impresión de cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Centros de costos
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Número de días posteriores a la fecha de la factura antes de cancelar la suscripción o marcar la suscripción como no pagada
 DocType: Lab Test Template,Sample Collection,Coleccion de Muestra
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
 DocType: Price List,Price List Name,Nombre de la lista de precios
@@ -5301,7 +5339,7 @@
 DocType: Account,Income,Ingresos
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 DocType: Supplier Scorecard Scoring Criteria,Score,Puntuación
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Año Fiscal {0} no existe
@@ -5321,12 +5359,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Perfiles de punto de venta (POS)
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} debe ser un valor entre 0 y 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,La siguiente Fecha de Depreciación no puede ser anterior Fecha Disponible para usar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prestamos sin garantía
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Máximo las horas de trabajo contra la parte de horas
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Monto total pagado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Monto total pagado
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados
 DocType: Hub Settings,Company and Seller Profile,Perfil de la Empresa y del Vendedor
@@ -5340,10 +5378,9 @@
 DocType: Item,Variant Based On,Variante basada en
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Sus Proveedores
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Por Favor Corrija la
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 DocType: Request for Quotation Item,Supplier Part No,Parte de Proveedor Nro
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anónimo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Recibido de
 DocType: Lead,Converted,Convertido
@@ -5357,6 +5394,7 @@
 DocType: Asset,Assets,Bienes
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
+DocType: Subscription,Current Invoice End Date,Fecha de finalización de la factura actual
 DocType: Payment Term,Due Date Based On,Fecha de Vencimiento basada en
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Defina el grupo de clientes y el territorio predeterminados en la configuración de ventas.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} no existe
@@ -5364,10 +5402,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,No se seleccionaron reembolsos para Journal Entry
 DocType: Payment Reconciliation,From Invoice Date,Desde Fecha de la Factura
+DocType: Loan,Disbursed,Desembolsado
 DocType: Healthcare Settings,Laboratory Settings,Configuración del Laboratorio
-DocType: Patient Appointment,Service Unit,Unidad de servicio
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Establecer con éxito el proveedor
+DocType: Patient Appointment,Service Unit,Unidad de Servicio
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Proveedor establecido con éxito
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Leave Encashment,Dejar el Encargo
 apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,¿A qué se dedica?
 DocType: Crop,Byproducts,Subproductos
@@ -5377,12 +5417,12 @@
 DocType: Share Balance,No of Shares,Nro de Acciones
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Seleccione Estado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: School House,House Name,Nombre de la casa
 DocType: Fee Schedule,Total Amount per Student,Cantidad total por Estudiante
 DocType: Purchase Taxes and Charges,Account Head,Encabezado de cuenta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Eléctrico
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Añadir el resto de su organización como a sus usuarios. También puede agregar o invitar a los clientes a su portal con la adición de ellos desde Contactos
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
 DocType: Grant Application,Requested Amount,Monto Requerido
@@ -5392,7 +5432,7 @@
 DocType: Crop Cycle,Detected Diseases,Enfermedades Detectadas
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 DocType: Asset Maintenance Task,Last Completion Date,Última Fecha de Finalización
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
@@ -5400,9 +5440,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Configuración de GoCardless
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,La fecha de comienzo del seguro debe ser menos que la fecha de fin del seguro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Inventarios
 DocType: Restaurant,Active Menu,Menú Activo
 DocType: Target Detail,Target Qty,Cantidad estimada
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Contra préstamo: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Ajustes del Pedido
 DocType: Student Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
@@ -5411,9 +5452,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Nómina de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
 DocType: Vehicle Log,Odometer,Cuentakilómetros
 DocType: Production Plan Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM no contiene ningún artículo de stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM no contiene ningún artículo de stock
 DocType: Chapter,Chapter Head,Jefe de Capítulo
 DocType: Payment Term,Month(s) after the end of the invoice month,Mes(es) después del final del mes de la factura
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Actividad del proyecto / tarea.
@@ -5421,11 +5462,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,La hora del resultado de laboratorio no puede ser antes de la hora de la prueba
 DocType: POS Profile,Allow user to edit Discount,Permitir que el usuario edite el Descuento
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Obtener clientes de
-DocType: Purchase Invoice Item,Include Exploded Items,Incluir elementos estallados
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Obtener clientes de
+DocType: Purchase Invoice Item,Include Exploded Items,Incluir Elementos Estallados
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
 DocType: Shipping Rule,Restrict to Countries,Restringir a los Países
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} a través de Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de facturación
 DocType: Project,Total Sales Amount (via Sales Order),Importe de Ventas Total (a través de Ordenes de Venta)
@@ -5442,6 +5484,7 @@
 DocType: Soil Texture,Sandy Clay,Arcilla Arenosa
 DocType: Grant Application,Assessment  Manager,Gerente de evaluación
 DocType: Payment Entry,Allocate Payment Amount,Distribuir el Importe de Pago
+DocType: Subscription Plan,Subscription Plan,Plan de suscripción
 DocType: Employee External Work History,Salary,Salario.
 DocType: Serial No,Delivery Document Type,Tipo de documento de entrega
 DocType: Sales Order,Partly Delivered,Parcialmente entregado
@@ -5467,9 +5510,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Rango de antigüedad 2
 DocType: SG Creation Tool Course,Max Strength,Fuerza Máx
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalación de Presets
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},No se ha seleccionado ninguna Nota de Entrega para el Cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},No se ha seleccionado ninguna Nota de Entrega para el Cliente {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Lista de materiales (LdM) reemplazada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Seleccionar Elementos según la Fecha de Entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Seleccionar Elementos según la Fecha de Entrega
 DocType: Grant Application,Has any past Grant Record,Tiene algún registro de subvención anterior
 ,Sales Analytics,Análisis de ventas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponible {0}
@@ -5487,7 +5530,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva de Habitación de Hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Servicio al Cliente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Servicio al Cliente
 DocType: BOM,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ofrecer al candidato un empleo.
@@ -5503,7 +5546,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Estudiantes han sido inscritos
 DocType: Fees,Student Details,Detalles del Estudiante
 DocType: Purchase Invoice Item,Stock Qty,Cantidad de existencias
-DocType: Employee Loan,Repayment Period in Months,Plazo de devolución en Meses
+DocType: Loan,Repayment Period in Months,Plazo de devolución en Meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No es un ID válido?
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
@@ -5511,8 +5554,8 @@
 DocType: Sales Order,Printing Details,Detalles de impresión
 DocType: Task,Closing Date,Fecha de cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad Producida
-DocType: Timesheet,Work Detail,Detalle de trabajo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingeniero
+DocType: Timesheet,Work Detail,Detalle de Trabajo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingeniero
 DocType: Journal Entry,Total Amount Currency,Monto total de divisas
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
@@ -5546,7 +5589,7 @@
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-DocType: Projects Settings,Ignore User Time Overlap,Ignorar superposición de tiempo del usuario
+DocType: Projects Settings,Ignore User Time Overlap,Ignorar Superposición de Tiempo del Usuario
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +113,Clearance Date updated,Fecha de Liquidación actualizada
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +146,Split Batch,Lote dividido
 DocType: Stock Settings,Batch Identification,Identificación de Lote
@@ -5557,26 +5600,25 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Información de Tipo de Domante
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error Fórmula o Condición: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Cantidad facturada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Cantidad facturada
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Los pesos de los criterios deben sumar hasta el 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Asistencia
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Artículos en stock
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Creando {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen y destino de depósito no puede ser el mismo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
 ,Item Prices,Precios de los productos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
-DocType: Woocommerce Settings,Endpoint,Punto final
+DocType: Woocommerce Settings,Endpoint,Punto Final
 DocType: Period Closing Voucher,Period Closing Voucher,Cierre de período
 DocType: Consultation,Review Details,Detalles de la Revisión
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +185,The shareholder does not belong to this company,El accionista no pertenece a esta empresa
 DocType: Dosage Form,Dosage Form,Forma de dosificación
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Configuracion de las listas de precios
 DocType: Task,Review Date,Fecha de revisión
-DocType: BOM,Allow Alternative Item,Permitir elemento alternativo
+DocType: BOM,Allow Alternative Item,Permitir Elemento Alternativo
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Series para la Entrada de Depreciación de Activos (Entrada de Diario)
 DocType: Membership,Member Since,Miembro Desde
 DocType: Purchase Invoice,Advance Payments,Pagos adelantados
@@ -5587,14 +5629,14 @@
 DocType: Shipping Rule,Fixed,Fijo
 DocType: Vehicle Service,Clutch Plate,Placa de embrague
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
-DocType: Journal Entry,Subscription,Suscripción
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Suscripción
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creación de Cuotas Pendientes
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Período de Notificación
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Período de Notificación
 DocType: Asset Category,Asset Category Name,Nombre de la Categoría de Activos
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nombre nuevo encargado de ventas
@@ -5607,7 +5649,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deje sin marcar si no desea considerar el lote mientras hace grupos basados en curso.
 DocType: Asset,Frequency of Depreciation (Months),Frecuencia de Depreciación (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Cuenta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
@@ -5615,14 +5657,14 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
 DocType: Hub Settings,Company Logo,Logo de la Compañía
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 DocType: Healthcare Settings,Patient Registration,Registro del Paciente
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Fecha de Depreciación
-,Work Orders in Progress,Órdenes de trabajo en progreso
+,Work Orders in Progress,Órdenes de Trabajo en progreso
 DocType: Issue,Support Team,Equipo de soporte
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Caducidad (en días)
 DocType: Appraisal,Total Score (Out of 5),Puntaje Total (de 5)
@@ -5636,7 +5678,7 @@
 DocType: Lab Test Groups,Lab Test Groups,Grupos de Pruebas de Laboratorio
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: GST Settings,GST Summary,Resumen de GST
-apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,Habilite la cuenta entrante predeterminada antes de crear el Grupo de resumen de trabajo diario
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,Habilite la cuenta entrante predeterminada antes de crear el Grupo de Resumen de Trabajo Diario
 DocType: Assessment Result,Total Score,Puntaje Total
 DocType: Journal Entry,Debit Note,Nota de débito
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,Por favor ingrese API Consumer Secret
@@ -5649,11 +5691,10 @@
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Almacén predeterminado de productos terminados
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Seleccione Paciente
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedores
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedores
 DocType: Hotel Room Package,Amenities,Comodidades
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Presupuesto y Centro de Costo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,No se permiten múltiple métodos de pago predeterminados
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para el/la
 ,Appointment Analytics,Análisis de Citas
 DocType: Vehicle Service,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
@@ -5661,14 +5702,15 @@
 DocType: Healthcare Settings,Consultations in valid days,Consultas en días válidos
 DocType: Assessment Plan Criteria,Maximum Score,Puntuación Máxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
-DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,Cuentas de mapeo de flujo de caja
+DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,Cuentas de mapeo de Flujo de Caja
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,No. de rol de grupo
 DocType: Batch,Manufacturing Date,Fecha de Fabricación
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Error en la Creación de Cuotas
-DocType: Opening Invoice Creation Tool,Create Missing Party,Crear una fiesta perdida
+DocType: Opening Invoice Creation Tool,Create Missing Party,Crear una Parte Perdida
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deje en blanco si hace grupos de estudiantes por año
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Las aplicaciones que usen la clave actual no podrán acceder, ¿está seguro?"
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Las Aplicaciones que usen la clave actual no podrán acceder, ¿está seguro?"
+DocType: Subscription Settings,Prorate,Prorratear
 DocType: Purchase Invoice,Total Advance,Total anticipo
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Cambiar Código de Plantilla
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La fecha final de duración no puede ser anterior a la fecha de inicio Plazo. Por favor, corrija las fechas y vuelve a intentarlo."
@@ -5679,8 +5721,9 @@
 DocType: Opportunity Item,Basic Rate,Precio Base
 DocType: GL Entry,Credit Amount,Importe acreditado
 DocType: Cheque Print Template,Signatory Position,Posición Signatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Establecer como perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Establecer como perdido
 DocType: Timesheet,Total Billable Hours,Total de Horas Facturables
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Número de días que el suscriptor debe pagar las facturas generadas por esta suscripción
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota de Recibo de Pago
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Esto se basa en transacciones con este cliente. Ver cronología más abajo para los detalles
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a la cantidad de entrada de pago {2}
@@ -5694,17 +5737,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,Clientes en Cola
 DocType: Driver,Issuing Date,Fecha de Emisión
 DocType: Student,Nationality,Nacionalidad
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +109,Submit this Work Order for further processing.,Presente esta orden de trabajo para su posterior procesamiento.
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +109,Submit this Work Order for further processing.,Presente esta Órden de Trabajo para su posterior procesamiento.
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Company,Company Info,Información de la compañía
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Seleccionar o añadir nuevo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
 DocType: Assessment Result,Summary,Resumen
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Marcar Asistencia
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Cuenta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio de Año
 DocType: Attendance,Employee Name,Nombre de empleado
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Elemento de Entrada de Pedido de Restaurante
@@ -5716,26 +5759,26 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Monto de la Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Presupuesto de Proveedor {0} creado
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Beneficios de empleados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Work Order,Manufactured Qty,Cantidad Producida
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Las acciones no existen con el {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Factura Creada
 DocType: Asset,Out of Order,Fuera de Servicio
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
-DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorar la superposición de tiempo de la estación de trabajo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de feriados para Empleado {0} o de su empresa {1}"
+DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorar la Superposición de Tiempo de la Estación de Trabajo
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de feriados para Empleado {0} o de su empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Seleccionar Números de Lote
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
-DocType: Patient Service Unit,Medical Administrator,Administrador médico
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+DocType: Patient Service Unit,Medical Administrator,Administrador Médico
 DocType: Assessment Plan,Schedule,Programa
 DocType: Account,Parent Account,Cuenta principal
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +295,Available,Disponible
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
-DocType: Stock Entry,Source Warehouse Address,Dirección del almacén de origen
+DocType: Stock Entry,Source Warehouse Address,Dirección del Almacén de Origen
 DocType: GL Entry,Voucher Type,Tipo de Comprobante
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1717,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Student Applicant,Approved,Aprobado
@@ -5743,15 +5786,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +267,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Hub Settings,Last Sync On,Última Sincronización Activada
 DocType: Guardian,Guardian,Tutor
-DocType: Item Alternative,Item Alternative,Artículo alternativo
-DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,Crear cliente o proveedor faltante.
+DocType: Item Alternative,Item Alternative,Artículo Alternativo
+DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,Crear Cliente o Proveedor faltante.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Academic Term,Education,Educación
 apps/erpnext/erpnext/public/js/pos/pos.html +89,Del,Elim
 DocType: Selling Settings,Campaign Naming By,Nombrar campañas por
 DocType: Employee,Current Address Is,La Dirección Actual es
 apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,Objetivo mensual de ventas (
-DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,Horario de unidad de servicio médico
+DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,Horario de Unidad de Servicio Médico
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificado
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 DocType: Sales Invoice,Customer GSTIN,GSTIN del Cliente
@@ -5759,15 +5802,16 @@
 DocType: Asset Repair,Repair Status,Estado de Reparación
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Asientos en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Camtidad Disponible Desde el Almacén
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 DocType: POS Profile,Account for Change Amount,Cuenta para Monto de Cambio
 DocType: Purchase Invoice,input service,servicio de entrada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Miembro del Equipo de Mantenimiento
 DocType: Agriculture Analysis Criteria,Soil Analysis,Análisis de Suelo
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Código del curso:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
 DocType: Employee,Current Address,Dirección Actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
@@ -5777,7 +5821,7 @@
 DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Sales Invoice Item,Discount and Margin,Descuento y Margen
 DocType: Lab Test,Prescription,Prescripción
-DocType: Project,Second Email,Segundo correo electrónico
+DocType: Project,Second Email,Segundo Correo Electrónico
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +111,Not Available,No disponible
 DocType: Pricing Rule,Min Qty,Cantidad mínima
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,Deshabilitar Plantilla
@@ -5792,7 +5836,7 @@
 DocType: BOM,Scrap Items,Items de Desecho
 DocType: Work Order,Actual Start Date,Fecha de inicio real
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados para esta orden de venta
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Work Orders.,Generar solicitudes de material (MRP) y órdenes de trabajo.
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Work Orders.,Generar Solicitudes de Material (MRP) y Órdenes de Trabajo.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +62,Set default mode of payment,Establecer el modo de pago predeterminado
 DocType: Grant Application,Withdrawn,Retirado
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
@@ -5815,20 +5859,20 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admisiones para {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nombre de la Variable
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
 DocType: Asset,Asset Category,Categoría de Activos
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,El salario neto no puede ser negativo
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del Producto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiales de Proveedor
 DocType: Soil Texture,Loamy Sand,Arena Arcillosa
 DocType: Production Plan,Material Request Planning,Planificación de Solicitud de Material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Factura con impuestos especiales
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Umbral {0}% aparece más de una vez
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
 DocType: Employee Attendance Tool,Marked Attendance,Asistencia Marcada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Pasivo Circulante
-apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,El temporizador excedió las horas dadas.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Pasivo Circulante
+apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,El Temporizador excedió las horas dadas.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Patient,A Positive,A Positivo
 DocType: Program,Program Name,Nombre del programa
@@ -5838,9 +5882,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La cantidad real es obligatoria
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Equipo de mantenimiento de activos
-DocType: Employee Loan,Loan Type,Tipo de préstamo
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ha sido enviado con éxito
+DocType: Loan,Loan Type,Tipo de préstamo
 DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Tarjetas de credito
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 DocType: Sales Invoice Item,Drop Ship,Envío Triangulado
@@ -5872,7 +5917,7 @@
 DocType: Item,Units of Measure,Unidades de medida
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos
 DocType: Sales Invoice,Customer's Purchase Order Date,Fecha de pedido de compra del cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital de inventario
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital de inventario
 DocType: Shopping Cart Settings,Show Public Attachments,Mostrar adjuntos públicos
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Restaurant Reservation,Reservation Time,Tiempo de Reserva
@@ -5887,7 +5932,7 @@
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Fila# {0}: Requerido por fecha no puede ser anterior a Fecha de Transacción
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Productos Destacados
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
@@ -5897,20 +5942,20 @@
 DocType: Driver,Expiry Date,Fecha de caducidad
 DocType: Healthcare Settings,Employee name and designation in print,Nombre y designación del empleado en la impresión
 ,accounts-browser,cuentas en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Por favor, seleccione primero la categoría"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Listado de todos los proyectos.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir exceso de facturación o exceso de pedidos, actualizar ""Asignación"" en el archivo Configuración o en el artículo."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Medio Día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Medio Día)
 DocType: Payment Term,Credit Days,Días de Crédito
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Seleccione paciente para obtener pruebas de laboratorio
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Seleccione Paciente para obtener Pruebas de Laboratorio
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Hacer Lote de Estudiantes
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Días de iniciativa
 DocType: Cash Flow Mapping,Is Income Tax Expense,Es el Gasto de Impuesto a la Renta
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila #{0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila #{0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Marque esto si el estudiante está residiendo en el albergue del Instituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Por favor, introduzca las Ordenes de Venta en la tabla anterior"
 ,Stock Summary,Resumen de Existencia
@@ -5921,10 +5966,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: BOM Operation,Operating Cost(Company Currency),Costo de funcionamiento (Divisa de la Compañia)
-DocType: Employee Loan Application,Rate of Interest,Tasa de interés
+DocType: Loan Application,Rate of Interest,Tasa de interés
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: Item,Shelf Life In Days,Vida útil en Días
 DocType: GL Entry,Is Opening,De apertura
+DocType: Department,Expense Approvers,Aprobadores de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
 DocType: Journal Entry,Subscription Section,Sección de Suscripción
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Cuenta {0} no existe
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index a9ffe77..f59325a 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Tühista Külastage {0} enne tühistades selle Garantiinõudest
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Hindamisaruanded
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Tellimise üksikasjad
 DocType: Supplier Scorecard,Notify Supplier,Teavita tarnija
 DocType: Item,Customer Items,Kliendi Esemed
 DocType: Project,Costing and Billing,Kuluarvestus ja arvete
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} ei saa olla pearaamatu
 DocType: Item,Publish Item to hub.erpnext.com,Ikoonidega Avalda et hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Email teated
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,hindamine
 DocType: Item,Default Unit of Measure,Vaikemõõtühik
 DocType: SMS Center,All Sales Partner Contact,Kõik Sales Partner Kontakt
-DocType: Employee,Leave Approvers,Jäta approvers
+DocType: Department,Leave Approvers,Jäta approvers
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Uuringud
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Kontrollige saadavust
 DocType: Job Applicant,Job Applicant,Tööotsija
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,See põhineb tehingute vastu tarnija. Vaata ajakava allpool lähemalt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juriidiline
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tegelik tüüpimaks ei kanta Punkt määr rida {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juriidiline
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tegelik tüüpimaks ei kanta Punkt määr rida {0}
 DocType: Bank Guarantee,Customer,Klienditeenindus
 DocType: Purchase Receipt Item,Required By,Nõutud
 DocType: Delivery Note,Return Against Delivery Note,Tagasi Against Saateleht
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (või rühmad), mille vastu raamatupidamiskanded tehakse ja tasakaalu säilimine."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Töötlemiseks ei ole esitatud palgajälgi.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Töötlemiseks ei ole esitatud palgajälgi.
 DocType: Manufacturing Settings,Default 10 mins,Vaikimisi 10 minutit
 DocType: Leave Type,Leave Type Name,Jäta Tüüp Nimi
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näita avatud
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Tähtis on võtta see meede juba eespool nimetatud korduvaks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Seeria edukalt uuendatud
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Minu tellimused
 DocType: Pricing Rule,Apply On,Kandke
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Kõik Tarnija Kontakt
 DocType: Support Settings,Support Settings,Toetus seaded
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Jäta ostusoov
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
 ,Batch Item Expiry Status,Partii Punkt lõppemine staatus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Pangaveksel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Pangaveksel
 DocType: Membership,membership validaty section,liikme valideeriv osa
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
 DocType: Consultation,Consultation,Konsulteerimine
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materjal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Veebisaidi tegemine
 DocType: Opening Invoice Creation Tool Item,Quantity,Kvantiteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Kontode tabeli saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Laenudega (kohustused)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Kontode tabeli saa olla tühi.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Laenudega (kohustused)
 DocType: Employee Education,Year of Passing,Aasta Passing
 DocType: Item,Country of Origin,Päritoluriik
 DocType: Soil Texture,Soil Texture Criteria,Mullastruktuurikriteeriumid
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Peamised kontaktandmed
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Avatud küsimused
 DocType: Production Plan Item,Production Plan Item,Tootmise kava toode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Kasutaja {0} on juba määratud töötaja {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Kasutaja {0} on juba määratud töötaja {1}
 DocType: Lab Test Groups,Add new line,Lisage uus rida
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Tervishoid
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Makseviivitus (päevad)
@@ -89,7 +85,7 @@
 ,Delay Days,Viivituspäevad
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Arve
+DocType: Subscription Invoice,Invoice,Arve
 DocType: Purchase Invoice Item,Item Weight Details,Artikli kaal detailid
 DocType: Asset Maintenance Log,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Lühend
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0} {1} {2} ei ühti {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kokku kuluarvestus summa
 DocType: Delivery Note,Vehicle No,Sõiduk ei
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Palun valige hinnakiri
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Töö käib
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Palun valige kuupäev
 DocType: Daily Work Summary Group,Holiday List,Holiday nimekiri
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Raamatupidaja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Raamatupidaja
 DocType: Hub Settings,Selling Price List,Müügi hinnakiri
 DocType: Patient,Tobacco Current Use,Tubaka praegune kasutamine
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Müügihind
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Müügihind
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefon ei
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Esialgne e-posti teatis saadeti
 ,Sales Partners Commission,Müük Partnerid Komisjon
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Väärtus amortisatsioonijärgne
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,seotud
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Osavõtjate kuupäev ei saa olla väiksem kui töötaja ühinemistähtaja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Osavõtjate kuupäev ei saa olla väiksem kui töötaja ühinemistähtaja
 DocType: Grading Scale,Grading Scale Name,Hindamisskaala Nimi
-DocType: Subscription,Repeat on Day,Korrake päeval
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,See on root ja seda ei saa muuta.
 DocType: Sales Invoice,Company Address,ettevõtte aadress
 DocType: BOM,Operations,Operations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ei saa seada loa alusel Allahindlus {0}
+DocType: Subscription,Subscription Start Date,Tellimuse alguskuupäev
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Kinnita csv faili kahte veergu, üks vana nime ja üks uus nimi"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} mitte mingil aktiivne eelarveaastal.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viide: {0}, Kood: {1} ja kliendi: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Katseperioodi lõppkuupäev ei saa olla enne katseperioodi alguskuupäeva
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avamine tööd.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM-i ei ole määratud rühma {1} jaoks alltöövõtukoha jaoks {0}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama firma on kantud rohkem kui üks kord
 DocType: Patient,Married,Abielus
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei ole lubatud {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Võta esemed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Võta esemed
 DocType: Price List,Price Not UOM Dependant,Hind ei sõltu UOMist
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Toote {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Piduri õli
 DocType: Tax Rule,Tax Type,Maksu- Type
 ,Completed Work Orders,Lõppenud töökorraldused
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,maksustatav summa
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,maksustatav summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
 DocType: BOM,Item Image (if not slideshow),Punkt Image (kui mitte slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Hinda / 60) * Tegelik tööaeg
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rida # {0}: võrdlusdokumendi tüüp peab olema kulukuse või ajakirja sisestamise üks
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Vali Bom
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rida # {0}: võrdlusdokumendi tüüp peab olema kulukuse või ajakirja sisestamise üks
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Vali Bom
 DocType: SMS Log,SMS Log,SMS Logi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kulud Tarnitakse Esemed
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Töötajale ettemaksu haldamine
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Kohaletoimetamise teatis
 DocType: Journal Entry,Opening Entry,Avamine Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto maksta ainult
-DocType: Employee Loan,Repay Over Number of Periods,Tagastama Üle perioodide arv
+DocType: Loan,Repay Over Number of Periods,Tagastama Üle perioodide arv
 DocType: Stock Entry,Additional Costs,Lisakulud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto olemasolevate tehing ei ole ümber rühm.
 DocType: Lead,Product Enquiry,Toode Luure
 DocType: Education Settings,Validate Batch for Students in Student Group,Kinnita Partii üliõpilastele Student Group
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ei puhkuse rekord leitud töötaja {0} ja {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ei puhkuse rekord leitud töötaja {0} ja {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Palun sisestage firma esimene
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Palun valige Company esimene
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Palun valige Company esimene
 DocType: Employee Education,Under Graduate,Under koolilõpetaja
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Palun määrake vaikimisi malli, kui jätate oleku märguande menüüsse HR-seaded."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,töötaja Loan
 DocType: Fee Schedule,Send Payment Request Email,Saada maksetellingu e-posti aadress
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Kinnisvara
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Edukalt registreerimata.
 DocType: Assessment Result,Grade,hinne
 DocType: Restaurant Table,No of Seats,Istekohtade arv
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Dünaamilise teema lisamiseks kasutage jinja silte, näiteks <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Toimetab tarnija
 DocType: Asset Maintenance Task,Asset Maintenance Task,Varade hooldamise ülesanne
 DocType: SMS Center,All Contact,Kõik Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Aastapalka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Aastapalka
 DocType: Daily Work Summary,Daily Work Summary,Igapäevase töö kokkuvõte
 DocType: Period Closing Voucher,Closing Fiscal Year,Sulgemine Fiscal Year
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} on külmutatud
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock kulud
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock kulud
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Vali Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Palun sisesta Eelistatud Kontakt E-post
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Palun sisesta Eelistatud Kontakt E-post
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuuta
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Peamine aadress
 DocType: Production Plan,Material Request Detail,Materjali taotlus Detailid
 DocType: Selling Settings,Default Quotation Validity Days,Vaikimisi väärtpaberite kehtivuspäevad
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Seaded HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Muuda summa
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Juhtimiskategooriad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Palun sisesta saatekuupäev
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee kulum Entry
+DocType: HR Settings,Leave Settings,Jäta Seaded
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Hankelepingu liik
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Tee Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Rahvusringhääling
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS-i seadistamise režiim (veebi- / võrguühenduseta)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Keelab ajakirjade loomise töörühmituste vastu. Tegevusi ei jälgita töökorralduse alusel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Hukkamine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Hukkamine
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Andmed teostatud.
 DocType: Asset Maintenance Log,Maintenance Status,Hooldus staatus
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Liikmelisuse andmed
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tarnija on kohustatud vastu tasulised konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artiklid ja hinnad
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Kursuse maht: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Siit kuupäev peaks jääma eelarveaastal. Eeldades From Date = {0}
 DocType: Drug Prescription,Interval,Intervall
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Eelistus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Eelistus
 DocType: Grant Application,Individual,Individuaalne
 DocType: Academic Term,Academics User,akadeemikud Kasutaja
 DocType: Cheque Print Template,Amount In Figure,Summa joonis
-DocType: Employee Loan Application,Loan Info,laenu Info
+DocType: Loan Application,Loan Info,laenu Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan hooldus külastused.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tarnijate tulemuskaardi periood
 DocType: Share Transfer,Share Transfer,Jaga ülekanne
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Eseme mall
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokeemia
 DocType: Job Offer,Select Terms and Conditions,Vali Tingimused
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,välja väärtus
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,välja väärtus
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce seaded
 DocType: Production Plan,Sales Orders,Müügitellimuste
 DocType: Purchase Taxes and Charges,Valuation,Väärtustamine
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Vaikimisi Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televiisor
 DocType: Work Order Operation,Updated via 'Time Log',Uuendatud kaudu &quot;Aeg Logi &#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Valige klient või tarnija.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Company,Enable Perpetual Inventory,Luba Perpetual Inventory
+DocType: Bank Guarantee,Charges Incurred,Tasud on tulenenud
 DocType: Company,Default Payroll Payable Account,Vaikimisi palgaarvestuse tasulised konto
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Uuenda e Group
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Kohandatud tulemus
 DocType: Delivery Stop,Contact Name,kontaktisiku nimi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Muidugi Hindamiskriteeriumid
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Maksu ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Maksu ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Õpilase ID:
 DocType: POS Customer Group,POS Customer Group,POS Kliendi Group
 DocType: Land Unit,Land Unit describing various land assets,"Maaüksus, mis kirjeldab erinevaid maa varasid"
@@ -374,9 +371,8 @@
 ,Open Work Orders,Avatud töökorraldused
 DocType: Payment Term,Credit Months,Krediitkaardid
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Netopalk ei tohi olla väiksem kui 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Kui soovite lõpetada korduva veateate märguannete saatmise süsteemist, oleme tellimuse väljal Puudutatud"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Lehed aastas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Lehed aastas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Palun vaadake &quot;Kas Advance&quot; vastu Konto {1}, kui see on ette sisenemist."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
 DocType: Email Digest,Profit & Loss,Kasumiaruanne
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Palun seadke õpilased üliõpilastele
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Sissekanded
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Sissekanded
 DocType: Crop,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
 DocType: Stock Entry,Sales Invoice No,Müügiarve pole
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Loomistööriist kursus
 DocType: Lead,Do Not Contact,Ära võta ühendust
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Inimesed, kes õpetavad oma organisatsiooni"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Tarkvara arendaja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Tarkvara arendaja
 DocType: Item,Minimum Order Qty,Tellimuse Miinimum Kogus
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Course Scheduling Tool,Course Start Date,Kursuse alguskuupäev
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Avaldab Hub
 DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Ostu üksikasjad
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Hinne
 DocType: Email Digest,New Quotations,uus tsitaadid
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Kirjad palgatõend, et töötaja põhineb eelistatud e valitud Employee"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Esimene Jäta Approver nimekirjas on vaikimisi Jäta Approver
 DocType: Tax Rule,Shipping County,kohaletoimetamine County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Õpi
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Õpi
 DocType: Asset,Next Depreciation Date,Järgmine kulum kuupäev
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiivsus töötaja kohta
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Tasumata tšekke ja hoiused selge
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ei saa olla negatiivne artiklijärgse {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ei saa olla negatiivne artiklijärgse {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Vale parool
 DocType: Item,Variant Of,Variant Of
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Palun määrake hotelli hinnatase ()
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Arve Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Toimetaja märkus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Toimetaja märkus
 DocType: Consultation,Encounter Impression,Encounter impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Müüdava vara
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hinda kus Klient Valuuta teisendatakse kliendi baasvaluuta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursuse planeerimine Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Kiireloomuline] Viga% s% s% s jaoks
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
 DocType: Land Unit,LInked Analysis,Lineeritud analüüs
 DocType: Item Tax,Tax Rate,Maksumäär
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Taotluste esitamise periood ei tohi olla üle kahe jaotamise kirje
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Taotluste esitamise periood ei tohi olla üle kahe jaotamise kirje
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on juba eraldatud Töötaja {1} ajaks {2} et {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partii nr peaks olema sama mis {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Vastatud
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Loo Üliõpilasgrupid
 DocType: Volunteer,Weekends,Nädalavahetustel
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kreeditarve summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kreeditarve summa
 DocType: Setup Progress Action,Action Document,Tegevusdokument
 DocType: Chapter Member,Website URL,Koduleht
 ,Finished Goods,Valmistoodang
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lisa tooteid
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Punkt kvaliteedi kontroll Parameeter
+DocType: Leave Application,Leave Approver Name,Jäta Approver nimi
 DocType: Depreciation Schedule,Schedule Date,Ajakava kuupäev
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Kasum, mahaarvamised ja muud palk komponendid"
 DocType: Packed Item,Packed Item,Pakitud toode
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Hinnapäring
 DocType: Healthcare Settings,Require Lab Test Approval,Nõuda laborikatse heakskiitmist
 DocType: Salary Slip Timesheet,Working Hours,Töötunnid
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Kokku tasumata
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Kokku tasumata
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
 DocType: Dosage Strength,Strength,Tugevus
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Loo uus klient
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Tarbekaubad Cost
 DocType: Purchase Receipt,Vehicle Date,Sõidukite kuupäev
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Põhjus kaotada
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Põhjus kaotada
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Uuenda konto numbrit
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Kaabli omanik ei saa olla sama Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Eraldatud summa ei ole suurem kui korrigeerimata summa
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Kokku Laenu tagasimaksmine
 DocType: Account,Cost of Goods Sold,Müüdud kaupade maksumus
-DocType: Subscription,Yearly,Iga-aastane
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Palun sisestage Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Palun sisestage Cost Center
 DocType: Drug Prescription,Dosage,Annus
 DocType: Journal Entry Account,Sales Order,Müügitellimuse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Keskm. Müügikurss
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Keskm. Müügikurss
 DocType: Assessment Plan,Examiner Name,Kontrollija nimi
 DocType: Lab Test Template,No Result,No Tulemus
 DocType: Purchase Invoice Item,Quantity and Rate,Kogus ja hind
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Palun sisesta ettevõtte nimi esimene
 DocType: Purchase Invoice,Supplier Name,Tarnija nimi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Loe ERPNext Käsitsi
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Näita kõigi osakonna liikmete lehti kalendris
 DocType: Purchase Invoice,01-Sales Return,01-Müügitulu
 DocType: Account,Is Group,On Group
 DocType: Email Digest,Pending Purchase Orders,Kuni Ostutellimuste
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Kohustuslik väli - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ei ole seotud {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Kohanda sissejuhatavat teksti, mis läheb osana, et e-posti. Iga tehing on eraldi sissejuhatavat teksti."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Määrake vaikimisi makstakse kontole ettevõtte {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Määrake vaikimisi makstakse kontole ettevõtte {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Tehing ei ole lubatud peatatud töökorralduse kohta {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserveeritud müük
 DocType: Packing Slip,From Package No.,Siit Package No.
 DocType: Item Attribute,To Range,Vahemik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Väärtpaberitesse ja hoiustesse
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ei saa muuta hindamismeetod, kuna seal on tehingute vastu mõned kirjed, mis ei ole ta enda hindamismeetodi"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Väärtpaberitesse ja hoiustesse
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ei saa muuta hindamismeetod, kuna seal on tehingute vastu mõned kirjed, mis ei ole ta enda hindamismeetodi"
 DocType: Student Report Generation Tool,Attended by Parents,Osales vanematelt
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kokku lehed eraldatud on kohustuslik
 DocType: Patient,AB Positive,AB positiivne
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Osavõtjate rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palk Component töögraafik põhineb palgal.
 DocType: Sales Order Item,Used for Production Plan,Kasutatakse tootmise kava
-DocType: Employee Loan,Total Payment,Kokku tasumine
+DocType: Loan,Total Payment,Kokku tasumine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Tühistama tehingut lõpetatud töökorralduse jaoks.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Aeg toimingute vahel (in minutit)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} katkeb nii toimingut ei saa lõpule
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Aitab Parts ehitada
 DocType: POS Profile User,POS Profile User,POS profiili kasutaja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Otsene tulu
+DocType: Subscription Invoice,Subscription Invoice,Märkimisarve
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Otsene tulu
 DocType: Patient Appointment,Date TIme,Kuupäev Kellaaeg
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Haldusspetsialist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Haldusspetsialist
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Ettevõtte ja maksude asutamine
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Palun valige Course
 DocType: Codification Table,Codification Table,Kooditabel
 DocType: Timesheet Detail,Hrs,tundi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Palun valige Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Palun valige Company
 DocType: Stock Entry Detail,Difference Account,Erinevus konto
 DocType: Purchase Invoice,Supplier GSTIN,Pakkuja GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Rahavoogude kaardistamise mall
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
 DocType: Journal Entry,Difference (Dr - Cr),Erinevus (Dr - Cr)
+DocType: Bank Guarantee,Providing,Pakkumine
 DocType: Account,Profit and Loss,Kasum ja kahjum
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Pole lubatud, seadistage Lab Test Mall vastavalt vajadusele"
 DocType: Patient,Risk Factors,Riskifaktorid
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
 DocType: Healthcare Settings,Appointment Confirmation,Ametisseasja kinnitamine
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ei saa kustutada Serial No {0}, sest seda kasutatakse laos tehingute"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ei saa kustutada Serial No {0}, sest seda kasutatakse laos tehingute"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Sulgemine (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Tere
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Liiguta punkti
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Kasutaja {1} jaoks on juba vaikimisi määranud pos profiil {0}, muidu vaikimisi keelatud"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financial / eelarveaastal.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kogunenud väärtused
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territoorium vajab POS-profiili
 DocType: Supplier,Prevent RFQs,Ennetada RFQsid
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Tee Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Palkade slip esitatakse ajavahemikuks {0} kuni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Palkade slip esitatakse ajavahemikuks {0} kuni {1}
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
 DocType: C-Form Invoice Detail,Grand Total,Üldtulemus
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Shipping Bill Date
 DocType: Production Plan,Production Plan,Tootmisplaan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Arve koostamise tööriista avamine
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Müügitulu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Müügitulu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Märkus: Kokku eraldatakse lehed {0} ei tohiks olla väiksem kui juba heaks lehed {1} perioodiks
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Määrake tehingute arv järjekorranumbriga
 ,Total Stock Summary,Kokku Stock kokkuvõte
 DocType: Announcement,Posted By,postitas
 DocType: Item,Delivered by Supplier (Drop Ship),Andis Tarnija (Drop Laev)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Määrake Company
 DocType: Share Balance,Share Balance,Jaga Balanssi
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Training Result Employee,Training Result Employee,Koolitus Tulemus Employee
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
-DocType: Repayment Schedule,Principal Amount,põhisumma
-DocType: Employee Loan Application,Total Payable Interest,Kokku intressikulusid
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,põhisumma
+DocType: Loan Application,Total Payable Interest,Kokku intressikulusid
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Kokku tasumata: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Müügiarve Töögraafik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Viitenumber &amp; Reference kuupäev on vajalik {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
 DocType: Restaurant Reservation,Restaurant Reservation,Restorani broneering
 DocType: Land Unit,Land Unit Name,Maaüksuse nimi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Ettepanek kirjutamine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Pakkimine
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Teatage klientidele e-posti teel
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Teatage klientidele e-posti teel
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Teine Sales Person {0} on olemas sama Töötaja id
 DocType: Employee Advance,Claimed Amount,Nõutud summa
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway konto ei ole loodud, siis looge see käsitsi."
 DocType: Supplier Scorecard,Per Year,Aastas
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Selles programmis osalemise lubamine vastavalt DOB-ile puudub
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
 DocType: Sales Invoice,Sales Taxes and Charges,Müük maksud ja tasud
 DocType: Employee,Organization Profile,Organisatsiooni andmed
 DocType: Vital Signs,Height (In Meter),Kõrgus (mõõdikus)
 DocType: Student,Sibling Details,Kaas detailid
 DocType: Vehicle Service,Vehicle Service,Sõidukite Service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Käivitab automaatselt tagasisidet taotluse põhineb tingimused.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Käivitab automaatselt tagasisidet taotluse põhineb tingimused.
 DocType: Employee,Reason for Resignation,Lahkumise põhjuseks
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Mall tulemuste hindamisel.
 DocType: Sales Invoice,Credit Note Issued,Kreeditarvet Väljastatud
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Hoolduskava
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Siis Hinnakujundusreeglid on välja filtreeritud põhineb kliendi, kliendi nimel, Territory, Tarnija, Tarnija tüüp, kampaania, Sales Partner jms"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Net muutus Varude
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Töötaja Laenu juhtimine
 DocType: Employee,Passport Number,Passi number
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Seos Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Juhataja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Juhataja
 DocType: Payment Entry,Payment From / To,Makse edasi / tagasi
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Palun määrake konto Warehouse&#39;i {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Material Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Teekonda ei leitud
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Avamine (Dr)
+DocType: Loan,Applicant,Taotleja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Foorumi timestamp tuleb pärast {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Korduvate dokumentide tegemine
 ,GST Itemised Purchase Register,GST Üksikasjalikud Ostu Registreeri
 DocType: Course Scheduling Tool,Reschedule,Korrigeeritakse uuesti
-DocType: Employee Loan,Total Interest Payable,Kokku intressivõlg
+DocType: Loan,Total Interest Payable,Kokku intressivõlg
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Maandus Cost maksud ja tasud
 DocType: Work Order Operation,Actual Start Time,Tegelik Start Time
 DocType: BOM Operation,Operation Time,Operation aeg
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,lõpp
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,alus
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,alus
 DocType: Timesheet,Total Billed Hours,Kokku Maksustatakse Tundi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Kirjutage Off summa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Kirjutage Off summa
 DocType: Leave Block List Allow,Allow User,Laske Kasutaja
 DocType: Journal Entry,Bill No,Bill pole
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / kulude aruandes varade realiseerimine
 DocType: Vehicle Log,Service Details,Service detailid
-DocType: Subscription,Quarterly,Kord kvartalis
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Rühmitatud
 DocType: Selling Settings,Delivery Note Required,Toimetaja märkus Vajalikud
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ajaandmik
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush tooraine põhineb
 DocType: Sales Invoice,Port Code,Sadama kood
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reservi laoruum
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reservi laoruum
 DocType: Lead,Lead is an Organization,Plii on organisatsioon
 DocType: Guardian Interest,Interest,huvi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Müügieelne
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Kontod
 DocType: Vehicle,Odometer Value (Last),Odomeetri näit (Viimane)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Pakkujate tulemuskaardi kriteeriumide mallid.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Makse Entry juba loodud
 DocType: Request for Quotation,Get Suppliers,Hankige tarnijaid
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Eelvaade palgatõend
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Eelvaade palgatõend
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Te saate uuendada ainult siis, kui teie liikmelisus lõpeb 30 päeva jooksul"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Valige ainult siis, kui olete seadistanud rahavoogude kaardistaja dokumendid"
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Supplier Scorecard,Per Week,Nädalas
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Kokku üliõpilane
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Ficier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Krediitkaart Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Ettevõte ja kontod
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,väärtuse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,väärtuse
 DocType: Asset Settings,Depreciation Options,Amortisatsiooni Valikud
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Kehtetu postitamise aeg
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Kehtetu postitamise aeg
 DocType: Lead,Campaign Name,Kampaania nimi
 DocType: Hotel Room,Capacity,Võimsus
 DocType: Selling Settings,Close Opportunity After Days,Sule Opportunity Pärast päevi
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kliendi ostutellimuse pole
 DocType: Budget,Budget Against,Eelarve vastu
 DocType: Employee,Cell Number,Mobiilinumber
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Antud kriteeriumide järgi töötaja pole. Kontrollige, kas palgafondid pole veel loodud."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Antud kriteeriumide järgi töötaja pole. Kontrollige, kas palgafondid pole veel loodud."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Material Taotlused Loodud
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kaotsi läinud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in &quot;Against päevikusissekanne veerus
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valige tabel
 DocType: BOM,Website Specifications,Koduleht erisused
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} on kehtetu e-posti aadress &quot;Saajad&quot;
 DocType: Special Test Items,Particulars,Üksikasjad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Asset,Maintenance,Hooldus
+DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Punkt omadus Value
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Palun uuendage oma projekti olekut
 DocType: Item,Maximum sample quantity that can be retained,"Maksimaalne proovikogus, mida on võimalik säilitada"
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Vaikimisi seaded Ostukorv
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Lisage ajapilusid
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset lammutatakse kaudu päevikusissekanne {0}
-DocType: Employee Loan,Interest Income Account,Intressitulu konto
+DocType: Loan,Interest Income Account,Intressitulu konto
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Vaadake saadetud saadetud kviitungi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnoloogia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Büroo ülalpidamiskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Büroo ülalpidamiskulud
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Minema
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Seadistamine e-posti konto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Palun sisestage Punkt esimene
 DocType: Asset Repair,Downtime,Seisakuisus
 DocType: Account,Liability,Vastutus
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akadeemiline termin:
 DocType: Salary Detail,Do not include in total,Ärge lisage kokku
 DocType: Company,Default Cost of Goods Sold Account,Vaikimisi müüdud toodangu kulu konto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Proovi kogus {0} ei saa olla suurem kui saadud kogus {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Hinnakiri ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Request for Quotation Supplier,Send Email,Saada E-
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 DocType: Item,Max Sample Quantity,Max Proovi Kogus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Ei Luba
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Ei Luba
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Tsiteerimine soovitud
 DocType: Vital Signs,Heart Rate / Pulse,Südame löögisageduse / impulsi
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Esemed kõrgema weightage kuvatakse kõrgem
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab Testid ja elutähtsad märgid
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank leppimise Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ükski töötaja leitud
-DocType: Subscription,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Student Group on juba uuendatud.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Student Group on juba uuendatud.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projekti uuendamine.
 DocType: SMS Center,All Customer Contact,Kõik Kliendi Kontakt
 DocType: Land Unit,Tree Details,Tree detailid
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Kõik Punkt Groups
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
 DocType: Work Order,Item To Manufacture,Punkt toota
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} olek on {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Kui valite valitud aadressi pärast salvestamist, vali uuesti"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 DocType: Item,Hub Publishing Details,Hubi avaldamise üksikasjad
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Avamine&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Avamine&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avatud teha
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
 DocType: Lab Test Template,Result Format,Tulemusvorming
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,kaks korda kuus
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Väetise sisu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Teadus- ja arendustegevus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Teadus- ja arendustegevus
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Summa Bill
 DocType: Company,Registration Details,Registreerimine Üksikasjad
 DocType: Timesheet,Total Billed Amount,Arve kogusumma
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Möödaviides krediidilimiidi kontrollimine müügikorralduses
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Tulemuslikkuse hindamise.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Lubamine &quot;kasutamine Ostukorv&quot;, kui Ostukorv on lubatud ja seal peaks olema vähemalt üks maksueeskiri ostukorv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Makse Entry {0} on seotud vastu Tellimus {1}, kontrollida, kas see tuleb tõmmata nagu eelnevalt antud arve."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Makse Entry {0} on seotud vastu Tellimus {1}, kontrollida, kas see tuleb tõmmata nagu eelnevalt antud arve."
 DocType: Sales Invoice Item,Stock Details,Stock Üksikasjad
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti väärtus
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-Sale
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimaalne istekoht
 DocType: Item Attribute,Item Attribute Values,Punkt atribuudi väärtusi
 DocType: Examination Result,Examination Result,uurimistulemus
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Ostutšekk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Ostutšekk
 ,Received Items To Be Billed,Saadud objekte arve
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valuuta vahetuskursi kapten.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Viide DOCTYPE peab olema üks {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Bom {0} peab olema aktiivne
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Ülekandmiseks pole ühtegi eset
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Bom {0} peab olema aktiivne
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Ülekandmiseks pole ühtegi eset
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Sulgemine (avamine + kokku)
 DocType: Journal Entry,Depreciation Entry,Põhivara Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Palun valige dokumendi tüüp esimene
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Tühista Material Külastusi {0} enne tühistades selle Hooldus Külasta
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Hind või soodustus
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ei kuulu Punkt {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial No {0} ei kuulu Punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nõutav Kogus
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Lemmikud
 DocType: Hub Settings,Custom Data,Kohandatud andmed
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Meditsiinikood standard
 DocType: Soil Texture,Clay Composition (%),Savi koostis (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Palun salvestage enne ülesande määramist.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Bilansilise väärtuse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Bilansilise väärtuse
 DocType: Lab Test,Lab Technician,Laboritehnik
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Müük Hinnakiri
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Müük Hinnakiri
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Kui see on märgitud, luuakse klient, kaardistatud patsiendile. Selle kliendi vastu luuakse patsiendiraamatud. Saate ka patsiendi loomiseks valida olemasoleva kliendi."
 DocType: Bank Reconciliation,Account Currency,Konto Valuuta
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Palume mainida ümardada konto Company
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Fee Structure,Components,komponendid
 DocType: Item Barcode,Item Barcode,Punkt Triipkood
 DocType: Woocommerce Settings,Endpoints,Lõppjooned
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","genereeritakse. Kui see on hilinenud, peate käsitsi muutma selle välja väljal &quot;Korda kuupäeval&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
 DocType: Share Transfer,From Folio No,Alates Folio-st
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit kirjet ei saa siduda koos {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Kättesaadav kuupäev
 DocType: Guardian,Guardian Name,Guardian Nimi
 DocType: Cheque Print Template,Has Print Format,Kas Print Format
-DocType: Employee Loan,Sanctioned,sanktsioneeritud
+DocType: Loan,Sanctioned,sanktsioneeritud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Palun täpsustage Serial No Punkt {1}
 DocType: Crop Cycle,Crop Cycle,Põllukultuuride tsükkel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
 DocType: Student Admission,Publish on website,Avaldab kodulehel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
+DocType: Subscription,Cancelation Date,Tühistamise kuupäev
 DocType: Purchase Invoice Item,Purchase Order Item,Ostu Telli toode
 DocType: Agriculture Task,Agriculture Task,Põllumajandusülesanne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Kaudne tulu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Kaudne tulu
 DocType: Student Attendance Tool,Student Attendance Tool,Student osavõtt Tool
 DocType: Restaurant Menu,Price List (Auto created),Hinnakiri (loodud automaatselt)
 DocType: Cheque Print Template,Date Settings,kuupäeva seaded
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,meeter
 DocType: Workstation,Electricity Cost,Elektri hind
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab test datetime ei saa olla enne kogumise kuupäeva
+DocType: Subscription Plan,Cost,Kulud
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ärge saatke Töötaja Sünnipäev meeldetuletused
 DocType: Expense Claim,Total Advance Amount,Eelmakse kokku
 DocType: Delivery Stop,Estimated Arrival,Eeldatav saabumine
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
 DocType: Timesheet Detail,Bill,arve
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Valge
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Valge
 DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus ole saadaval {4} laos {1} postitama aeg kanne ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Märkeruutade loendist saate valida ainult ühe võimaluse.
 DocType: Purchase Invoice,Get Advances Paid,Saa makstud ettemaksed
 DocType: Item,Automatically Create New Batch,Automaatselt Loo uus partii
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} kuni {1} (rida {2}) määramine
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Tee
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} kuni {1} (rida {2}) määramine
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Tee
 DocType: Student Admission,Admission Start Date,Sissepääs Start Date
 DocType: Journal Entry,Total Amount in Words,Kokku summa sõnadega
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Uus töötaja
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
 DocType: Repayment Schedule,Balance Loan Amount,Tasakaal Laenusumma
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Ajakava kursus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Stock Options
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Enne ostutellimuse viimaste ostude andmete hankimist keelake
 DocType: Journal Entry Account,Expense Claim,Kuluhüvitussüsteeme
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Kas te tõesti soovite taastada seda lammutatakse vara?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakkesedel toode
 DocType: Purchase Invoice,Cash/Bank Account,Raha / Bank Account
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Palun täpsusta {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variant loomine on järjestatud.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Töö kokkuvõte {0} jaoks
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Oskus tabelis on kohustuslik
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Nimekirjas olev esimene tühistamisloendaja määratakse vaikimisi tühistamisloa taotlejaks.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Plan,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ei tohi olla negatiivne
 DocType: Training Event,Self-Study,Iseseisev õppimine
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Palgad
 DocType: Asset Maintenance,Maintenance Manager Name,Hooldusjuhi nimi
 DocType: Agriculture Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Palun täpsustage kehtiv Row ID reas {0} tabelis {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Palun täpsustage kehtiv Row ID reas {0} tabelis {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Muutuja ei leitud
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Palun vali väljad numpadist muutmiseks
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Põhivara postitust ei saa luua, kui luuakse väärtpaberikonto."
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvaliteedijärelevalve malli nimi
 DocType: Project,First Email,Esimene e-post
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveeritud Warehouse Sales Order / valmistoodang Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Müügi summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Müügi summa
 DocType: Repayment Schedule,Interest Amount,Intressisummat
 DocType: Serial No,Creation Document No,Loomise dokument nr
 DocType: Share Transfer,Issue,Probleem
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 ,Projected Quantity as Source,Planeeritav kogus nagu Allikas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Toimetaja Trip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Toimetaja Trip
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Ülekande tüüp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Müügikulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Müügikulud
 DocType: Consultation,Diagnosis,Diagnoosimine
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard ostmine
 DocType: GL Entry,Against,Vastu
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postiindeks
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} on {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Vali laenude intressitulu konto {0}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Making Stock kanded
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
 DocType: Item,Default Supplier,Vaikimisi Tarnija
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üle Tootmise toetus protsent
-DocType: Employee Loan,Repayment Schedule,maksegraafikut
+DocType: Loan,Repayment Schedule,maksegraafikut
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kohaletoimetamine Reegel seisukord
 DocType: Holiday List,Get Weekly Off Dates,Võta Weekly Off kuupäevad
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date saa olla väiksem kui alguskuupäev
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskmine vanus
 DocType: Education Settings,Attendance Freeze Date,Osavõtjate Freeze kuupäev
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Nimekiri paar oma tarnijatele. Nad võivad olla organisatsioonid ja üksikisikud.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Kuva kõik tooted
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Kuva kõik tooted
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimaalne Lead Vanus (päeva)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Kõik BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotellitüübid {0} ei ole saadaval {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,Tööalasest
 DocType: Driver,Cellphone Number,Mobiiltelefoni number
 DocType: Project,Monitor Progress,Jälgida progressi
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
 DocType: Journal Entry,Make Difference Entry,Tee Difference Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto kordustage sektsioon
 DocType: Upload Attendance,Attendance From Date,Osavõtt From kuupäev
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,Vedu
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Vale Oskus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} tuleb esitada
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
+DocType: Department Approver,Department Approver,Osakonna kinnitaja
 DocType: SMS Center,Total Characters,Kokku Lõbu
 DocType: Employee Advance,Claimed,Taotletud
 DocType: Crop,Row Spacing,Ristliikumine
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Makse leppimise Arve
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Panus%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Nagu iga ostmine Seaded kui ostutellimuse sobiv == &quot;JAH&quot;, siis luua ostuarve, kasutaja vaja luua ostutellimuse esmalt toode {0}"
+,HSN-wise-summary of outward supplies,HSN-i arukas kokkuvõte välistarnetest
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Ettevõte registreerimisnumbrid oma viide. Maksu- numbrid jms
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Tegevus nimega
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Aasta
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Esimese 2 numbrit GSTIN peaks sobima riik number {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Arve makseperioodi alguskuupäev
 DocType: Salary Slip,Leave Without Pay,Palgata puhkust
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Capacity Planning viga
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Valdkonnad kopeeritakse ainult loomise ajal.
 DocType: Setup Progress Action,Domains,Domeenid
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Tegelik alguskuupäev"" ei saa olla suurem kui ""Tegelik lõpukuupäev"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Juhtimine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Juhtimine
 DocType: Cheque Print Template,Payer Settings,maksja seaded
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on &quot;SM&quot;, ning objekti kood on &quot;T-särk&quot;, kirje kood variant on &quot;T-särk SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
 DocType: Purchase Invoice,Is Return,Kas Tagasi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Ettevaatust
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Alguspäev on suurem kui lõppkuupäev ülesandes &quot;{0}&quot;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Tagasi / võlateate
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Tagasi / võlateate
 DocType: Price List Country,Price List Country,Hinnakiri Riik
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kood ei saa muuta Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kood ei saa muuta Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Palun sisesta Kood saada Partii number
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
-DocType: Employee Loan,Partially Disbursed,osaliselt Väljastatud
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Toetusteave
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Toetusteave
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tarnija andmebaasis.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Te ei saa tellimust uuesti katkestada.
 DocType: Account,Balance Sheet,Eelarve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
 DocType: Fee Validity,Valid Till,Kehtiv kuni
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Vanemate kogu õpetajate kohtumine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: lükata Kogus ei kanta Ostutagastus
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Valitud Kliendi kliendirühma vahetamine ei ole lubatud.
 ,Purchase Order Items To Be Billed,Ostutellimuse punkte arve
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Hinnangulise saabumisaja ajakohastamine
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Hinnangulise saabumisaja ajakohastamine
 DocType: Program Enrollment Tool,Enrollment Details,Registreerumise üksikasjad
 DocType: Purchase Invoice Item,Net Rate,Efektiivne intressimäär
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Valige klient
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Jooksva eelarveaasta
 DocType: Purchase Order,Group same items,Group sama kauba
 DocType: Purchase Invoice,Disable Rounded Total,Keela Ümardatud kokku
-DocType: Employee Loan Application,Repayment Info,tagasimaksmine Info
+DocType: Department,Parent Department,Vanemosakond
+DocType: Loan Application,Repayment Info,tagasimaksmine Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Kanded&quot; ei saa olla tühi
 DocType: Maintenance Team Member,Maintenance Role,Hooldusroll
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicate rida {0} on sama {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicate rida {0} on sama {1}
 ,Trial Balance,Proovibilanss
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Seadistamine Töötajad
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelli broneeringu kasutaja
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Palun valige eesliide esimene
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Teadustöö
+DocType: Subscription Settings,Subscription Settings,Tellimuse seaded
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Teadustöö
 DocType: Maintenance Visit Purpose,Work Done,Töö
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Palun täpsustage vähemalt üks atribuut atribuudid tabelis
 DocType: Announcement,All Students,Kõik õpilased
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 DocType: Crop Cycle,Less than a year,Vähem kui aasta
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobiilne No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Ülejäänud maailm
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 DocType: Crop,Yield UOM,Saagikus UOM
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
 DocType: Item,Is Item from Hub,Kas üksus on hubist
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rida {0}: Activity Type on kohustuslik.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,"Dividende,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,"Dividende,"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Raamatupidamine Ledger
 DocType: Stock Reconciliation,Difference Amount,Erinevus summa
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} lahkus {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Jaotamata tulem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Jaotamata tulem
 DocType: Purchase Invoice,05-Change in POS,05-vahetus postis
 DocType: Vehicle Log,Service Detail,Teenuse Detail
 DocType: BOM,Item Description,Toote kirjeldus
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Opportunity toode
 ,Student and Guardian Contact Details,Student ja Guardian Kontakt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Rida {0}: tarnija {0} e-posti aadress on vajalik saata e-posti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ajutine avamine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Ajutine avamine
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Kuva keskus
 ,Employee Leave Balance,Töötaja Jäta Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance Konto {0} peab alati olema {1}
 DocType: Patient Appointment,More Info,Rohkem infot
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
 DocType: Supplier Scorecard,Scorecard Actions,Tulemuskaardi toimingud
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Näide: Masters in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Tagasilükatud Warehouse
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,kuni
 DocType: Supplier Quotation Item,Lead Time in days,Ooteaeg päevades
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Tasumata arved kokkuvõte
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Palga alates {0} kuni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Palga alates {0} kuni {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab katsestavad retseptid
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Väike
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Väike
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Arve koostamise tööriista avamise üksus
 DocType: Education Settings,Employee Number,Töötaja number
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Tühista arve pärast graafikuperioodi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
 DocType: Project,% Completed,% Valminud
 ,Invoiced Amount (Exculsive Tax),Arve kogusumma (Exculsive Maksu-)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoorse testimise kuupäev
 DocType: Email Digest,Add Quote,Lisa Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tegur vajalik UOM: {0} punktis: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Kaudsed kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Kaudsed kulud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Kogus on kohustuslikuks
 DocType: Agriculture Analysis Criteria,Agriculture,Põllumajandus
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master andmed
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital seadmed
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capital seadmed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Palun määra kõigepealt tootekood
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
+DocType: Subscription Plan,Billing Interval Count,Arveldusvahemiku arv
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
 DocType: Antibiotic,Antibiotic,Antibiootikum
 ,Team Updates,Team uuendused
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Tarnija
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setting Konto tüüp aitab valides selle konto tehingud.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Loo Print Format
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS Artikliklasside
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatiivne kirje ei tohi olla sama kui üksuse kood
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - ajutise hindamise lõpuleviimine
 DocType: Salary Slip,Bank Account No.,Bank Account No.
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Hinnapäring Tarnija
 DocType: Healthcare Settings,Registration Message,Registreerimissõnum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Riistvara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Riistvara
 DocType: Prescription Dosage,Prescription Dosage,Retseptiravim
 DocType: Attendance,HR Manager,personalijuht
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Palun valige Company
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Algus- ja lõppkuupäev
 ,Delivered Items To Be Billed,Tarnitakse punkte arve
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Avatud Bom {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Ladu ei saa muuta Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Ladu ei saa muuta Serial No.
 DocType: Authorization Rule,Average Discount,Keskmine Soodus
 DocType: Project Update,Great/Quickly,Suurepärane / kiire
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Palun valige partiide Jaotatud kirje
 DocType: Asset,Depreciation Schedules,Kulumi
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST seadetes saab valida järgmised kontod:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST seadetes saab valida järgmised kontod:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
 DocType: Payment Request,Transaction Currency,tehing Valuuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Siit {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Keskm Daily Väljuv
 DocType: POS Profile,Campaign,Kampaania
 DocType: Supplier,Name and Type,Nimi ja tüüp
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Nõustumisstaatus tuleb &quot;Kinnitatud&quot; või &quot;Tõrjutud&quot;
 DocType: Physician,Contacts and Address,Kontaktid ja aadress
 DocType: Purchase Invoice,Contact Person,Kontaktisik
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Oodatud Start Date&quot; ei saa olla suurem kui &quot;Oodatud End Date&quot;
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Abikõlblikkus ja üksikasjad
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Net Change põhivarade
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Siit Date
 DocType: Email Digest,For Company,Sest Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Side log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Hinnapäring on blokeeritud, et ligipääs portaali, rohkem kontrolli portaali seaded."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tarnijate skoorikaardi skooride muutuja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ostmine summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Ostmine summa
 DocType: Sales Invoice,Shipping Address Name,Kohaletoimetamine Aadress Nimi
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssiplaani loomine tekitas vigu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Nimekirja esimene kulude kinnitaja määratakse vaikimisi kulude kinnitajana.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ei saa olla üle 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Detail,Depends on Leave Without Pay,Oleneb palgata puhkust
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,pakendikood
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Praktikant
 DocType: Purchase Invoice,Company GSTIN,firma GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatiivne Kogus ei ole lubatud
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatiivne Kogus ei ole lubatud
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Maksu- detail tabelis tõmmatud kirje kapten string ja hoitakse selles valdkonnas. Kasutatakse maksud ja tasud
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Töötaja ei saa aru ise.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Töötaja ei saa aru ise.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, kanded on lubatud piiratud kasutajatele."
 DocType: Email Digest,Bank Balance,Bank Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Jäta taotleja heakskiit kohustuslikuks
 DocType: Job Opening,"Job profile, qualifications required etc.","Ametijuhendite, nõutav kvalifikatsioon jms"
 DocType: Journal Entry Account,Account Balance,Kontojääk
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Maksu- reegli tehingud.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Makse tähtaeg reas {0} on tõenäoliselt duplikaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Põllumajandus (beetaversioon)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakkesedel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office rent
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS gateway seaded
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakkesedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office rent
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup SMS gateway seaded
 DocType: Disease,Common Name,Üldnimetus
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import ebaõnnestus!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No aadress lisatakse veel.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation töötunni
 DocType: Vital Signs,Blood Pressure,Vererõhk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analüütik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analüütik
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Müük Üksikasjad
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Kinnita registreerunud tudengitele Student Group
 DocType: Notification Control,Expense Claim Rejected,Kulu väide lükati tagasi
 DocType: Item,Item Attribute,Punkt Oskus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Valitsus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Valitsus
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kuluhüvitussüsteeme {0} on juba olemas Sõiduki Logi
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Instituudi Nimi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Palun sisesta tagasimaksmise summa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Palun sisesta tagasimaksmise summa
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Punkt variandid
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Teenused
 DocType: HR Settings,Email Salary Slip to Employee,E palgatõend töötajate
 DocType: Cost Center,Parent Cost Center,Parent Cost Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Vali Võimalik Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Vali Võimalik Tarnija
 DocType: Sales Invoice,Source,Allikas
 DocType: Customer,"Select, to make the customer searchable with these fields","Valige, et klient saaks neid välju otsida"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näita suletud
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakkesedel (s) tühistati
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Rahavood investeerimistegevusest
 DocType: Program Course,Program Course,programmi käigus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude
 DocType: Homepage,Company Tagline for website homepage,Ettevõte motoga veebilehel kodulehekülg
 DocType: Item Group,Item Group Name,Punkt Group Nimi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Võtnud
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Membrership üksikasjad
 DocType: Leave Block List,Block Holidays on important days.,Block pühadel oluliste päeva.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Palun sisestage kõik vajalikud tulemused tulemus (ed)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Arved kokkuvõte
-DocType: Employee Loan,Monthly Repayment Amount,Igakuine tagasimakse
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Arved kokkuvõte
+DocType: Loan,Monthly Repayment Amount,Igakuine tagasimakse
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Arvelduste avamine
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Palun määra Kasutaja ID väli töötaja rekord seada töötaja roll
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Palun määra Kasutaja ID väli töötaja rekord seada töötaja roll
 DocType: UOM,UOM Name,UOM nimi
 DocType: GST HSN Code,HSN Code,HSN kood
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Panus summa
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Kasutaja {0} on juba määratud arstile {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,võimalik Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,võimalik Tarnija
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Kuu Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Vastuvõtja nimekiri on tühi. Palun luua vastuvõtja loetelu
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Tervishoid (beetaversioon)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,"Ole tooteid, mida pakkida"
 DocType: Shipping Rule Condition,From Value,Väärtuse
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
-DocType: Employee Loan,Repayment Method,tagasimaksmine meetod
+DocType: Loan,Repayment Method,tagasimaksmine meetod
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Märkimise korral Kodulehekülg on vaikimisi Punkt Group kodulehel
 DocType: Quality Inspection Reading,Reading 4,Lugemine 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Nõuded firma kulul.
@@ -1989,14 +1996,14 @@
 DocType: Asset Maintenance Task,Certificate Required,Nõutav sertifikaat
 DocType: Company,Default Holiday List,Vaikimisi Holiday nimekiri
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rida {0}: From ajal ja aeg {1} kattub {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Kohustused
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Kohustused
 DocType: Purchase Invoice,Supplier Warehouse,Tarnija Warehouse
 DocType: Opportunity,Contact Mobile No,Võta Mobiilne pole
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Vali ettevõte
 ,Material Requests for which Supplier Quotations are not created,"Materjal taotlused, mis Tarnija tsitaadid ei ole loodud"
 DocType: Student Report Generation Tool,Print Section,Prindi sektsioon
 DocType: Student Group,Set 0 for no limit,Määra 0 piiranguid pole
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päev (ad), millal te taotlete puhkuse puhkepäevadel. Sa ei pea taotlema puhkust."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päev (ad), millal te taotlete puhkuse puhkepäevadel. Sa ei pea taotlema puhkust."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Rida {idx}: {field} on vajalik arvete avamise {invoice_type} loomiseks
 DocType: Customer,Primary Address and Contact Detail,Peamine aadress ja kontaktandmed
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
@@ -2007,10 +2014,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Valige vähemalt üks domeen.
 DocType: Dependent Task,Dependent Task,Sõltub Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Otsi toode
 DocType: Payment Schedule,Payment Amount,Makse summa
@@ -2020,7 +2027,7 @@
 DocType: Assessment Plan,Grading Scale,hindamisskaala
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,juba lõpetatud
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import edukas!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
@@ -2031,17 +2038,16 @@
 DocType: Quotation Item,Quotation Item,Tsitaat toode
 DocType: Customer,Customer POS Id,Kliendi POS Id
 DocType: Account,Account Name,Kasutaja nimi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Siit kuupäev ei saa olla suurem kui kuupäev
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial nr {0} kogust {1} ei saa olla vaid murdosa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Siit kuupäev ei saa olla suurem kui kuupäev
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial nr {0} kogust {1} ei saa olla vaid murdosa
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Palun sisestage Woocommerce Serveri URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tarnija Type kapten.
 DocType: Purchase Order Item,Supplier Part Number,Tarnija osa number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Ümberarvestuskursi ei saa olla 0 või 1
 DocType: Share Balance,To No,Ei
-DocType: Subscription,Reference Document,ViitedokumenDI
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} on tühistatud või peatatud
 DocType: Accounts Settings,Credit Controller,Krediidi Controller
-DocType: Grant Application,Applicant Type,Taotleja tüüp
+DocType: Loan,Applicant Type,Taotleja tüüp
 DocType: Purchase Invoice,03-Deficiency in services,03 - teenuste puudujääk
 DocType: Delivery Note,Vehicle Dispatch Date,Sõidukite Dispatch Date
 DocType: Healthcare Settings,Default Medical Code Standard,Vaikimisi meditsiinikood standard
@@ -2052,13 +2058,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Maksustatakse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Kogus
 DocType: Party Account,Party Account,Partei konto
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Inimressursid
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Inimressursid
 DocType: Lead,Upper Income,Ülemine tulu
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,tagasi lükkama
 DocType: Journal Entry Account,Debit in Company Currency,Deebetkaart Company Valuuta
 DocType: BOM Item,BOM Item,Bom toode
 DocType: Appraisal,For Employee,Töötajate
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tee väljamakse Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Tee väljamakse Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance vastu Tarnija tuleb debiteerida
 DocType: Company,Default Values,Vaikeväärtused
 DocType: Membership,INR,INR
@@ -2087,10 +2093,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Kokku (maksudeta)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Krahv
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} peab olema suurem kui 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Varu saadaval
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Varu saadaval
 DocType: Manufacturing Settings,Capacity Planning For (Days),Maht planeerimist (päevad)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,hankimine
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ükski esemed on mingeid muutusi kogus või väärtus.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ükski esemed on mingeid muutusi kogus või väärtus.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Kohustuslik väli - Program
 DocType: Special Test Template,Result Component,Tulemuskomponent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantiinõudest
@@ -2110,7 +2116,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Kaasa pühade jooksul lehed nagu lehed
 DocType: Sales Invoice,Packed Items,Pakitud Esemed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantiinõudest vastu Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Kokku&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Kokku&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Luba Ostukorv
 DocType: Employee,Permanent Address,püsiaadress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2128,10 +2134,10 @@
 DocType: Selling Settings,Selling Settings,Müük Seaded
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Kinnita toimingut
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Oksjonid
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,täitmine
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Vaata Ostukorv
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Turundus kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Ei suuda luua standardseid kriteeriume. Palun nimetage kriteeriumid ümber
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
@@ -2153,9 +2159,9 @@
 DocType: Upload Attendance,Get Template,Võta Mall
 DocType: Material Request,Transferred,üle
 DocType: Vehicle,Doors,Uksed
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Koguge tasu patsiendi registreerimiseks
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ei saa muuta atribuute pärast aktsiatehingut. Tehke uus üksus ja kandke uus toode uuele postile
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ei saa muuta atribuute pärast aktsiatehingut. Tehke uus üksus ja kandke uus toode uuele postile
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Maksu- väljasõit
 DocType: Packing Slip,PS-,PS
@@ -2191,11 +2197,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Leppimine JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Purchase Invoice Item,Batch No,Partii ei
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Töötaja ettemaksed
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
 DocType: Student Group Instructor,Student Group Instructor,Student Group juhendaja
 DocType: Grant Application,Assessment  Mark (Out of 10),Hindamismärk (10-st)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
@@ -2204,15 +2211,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Email Digest,Annual Expenses,Aastane kulu
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Eraldatud summa
 DocType: Sales Team,Contribution to Net Total,Panus Net kokku
 DocType: Sales Invoice Item,Customer's Item Code,Kliendi Kood
 DocType: Stock Reconciliation,Stock Reconciliation,Stock leppimise
 DocType: Territory,Territory Name,Territoorium nimi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,"Tellimusel on võimalik vaid Planeeringuid, millel on sama arveldustsükkel"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Taotleja tööd.
 DocType: Purchase Order Item,Warehouse and Reference,Lao- ja seletused
 DocType: Supplier,Statutory info and other general information about your Supplier,Kohustuslik info ja muud üldist infot oma Tarnija
@@ -2221,10 +2229,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,hindamisest
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Koolitusüritused
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Juhtivate allikate jälgimine.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Tingimuseks laevandus reegel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Palun sisesta
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Palun sisesta
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Hoolduslogi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Netokaal selle paketi. (arvutatakse automaatselt summana netokaal punkte)
@@ -2232,11 +2240,11 @@
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: Student Group,Instructors,Instruktorid
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Bom {0} tuleb esitada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Bom {0} tuleb esitada
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Jagamise juhtimine
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Makse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Makse
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",Ladu {0} ei ole seotud ühegi konto palume mainida konto lattu rekord või määrata vaikimisi laoseisu konto ettevõtte {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Manage oma korraldusi
 DocType: Work Order Operation,Actual Time and Cost,Tegelik aeg ja maksumus
@@ -2246,7 +2254,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Jäta ostusoov
 DocType: Item,Will also apply for variants,Kehtib ka variandid
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,edasi
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle esemed müümise ajal.
@@ -2256,7 +2264,7 @@
 DocType: Item,Barcodes,Vöötkoodid
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Te olete sisenenud eksemplaris teemad. Palun paranda ja proovige uuesti.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset liikumine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Töökorraldus {0} tuleb esitada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,uus ostukorvi
@@ -2274,13 +2282,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Arveldusvaluuta peab olema võrdne kas ettevõtte vaikimisi valuuta või partei konto valuutaga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Näitab, et pakend on osa sellest sünnitust (Ainult eelnõu)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rida {0}: tähtaeg ei saa olla enne postitamise kuupäeva
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rida {0}: tähtaeg ei saa olla enne postitamise kuupäeva
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Tee makse Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kogus Punkt {0} peab olema väiksem kui {1}
 ,Sales Invoice Trends,Müügiarve Trends
 DocType: Leave Application,Apply / Approve Leaves,Rakenda / Kiita Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Eest
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Võib viidata rida ainult siis, kui tasu tüüp on &quot;On eelmise rea summa&quot; või &quot;Eelmine Row kokku&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Võib viidata rida ainult siis, kui tasu tüüp on &quot;On eelmise rea summa&quot; või &quot;Eelmine Row kokku&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Toimetaja Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Puu rahalist kuluallikad.
 DocType: Serial No,Delivery Document No,Toimetaja dokument nr
@@ -2294,7 +2301,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materjalitarbimine ei ole seadistatud seadistustes.
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Elemendile {0} ei saa realt {1} rohkem kui {2} üle märkida. Ülekarvete lubamiseks määrake varude seadistused
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Elemendile {0} ei saa realt {1} rohkem kui {2} üle märkida. Ülekarvete lubamiseks määrake varude seadistused
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uuenda vastust
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
@@ -2305,12 +2312,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Valige kõigepealt programm
 DocType: Patient Appointment,Patient Age,Patsiendi vanus
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Projektide juhtimisel
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Seerianumber {0} on juba tagastatud
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Seerianumber {0} on juba tagastatud
 DocType: Supplier,Supplier of Goods or Services.,Pakkuja kaupu või teenuseid.
 DocType: Budget,Fiscal Year,Eelarveaasta
 DocType: Asset Maintenance Log,Planned,Planeeritud
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Vaikimisi saadaolevad kontod, mida kasutatakse juhul, kui patsient ei soovi broneerida konsultatsioonitasusid."
 DocType: Vehicle Log,Fuel Price,kütuse hind
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Eelarve
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Määrake Ava
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
@@ -2324,16 +2332,16 @@
 DocType: Lead,Follow Up,Jälgige üles
 DocType: Item,Is Sales Item,Kas Sales toode
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punkt Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Punkt {0} ei ole setup Serial nr. Saate Punkt master
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Punkt {0} ei ole setup Serial nr. Saate Punkt master
 DocType: Maintenance Visit,Maintenance Time,Hooldus aeg
 ,Amount to Deliver,Summa pakkuda
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Sama asi on sisestatud mitu korda. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Start Date ei saa olla varasem kui alguskuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Vigu.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Töötaja {0} on juba {1} jaoks taotlenud {2} ja {3} vahel:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Vigu.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Töötaja {0} on juba {1} jaoks taotlenud {2} ja {3} vahel:
 DocType: Guardian,Guardian Interests,Guardian huvid
 DocType: Naming Series,Current Value,Praegune väärtus
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
 DocType: Education Settings,Instructor Records to be created by,"Juhendaja salvestised, mida peab looma"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} loodud
 DocType: GST Account,GST Account,GST konto
@@ -2352,8 +2360,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Lemmikutele lisatud
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Palkade libisemist ei leitud enam esitatud kriteeriumidele vastavaks esitamiseks või juba esitatud palgalehelt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Lõivud ja maksud
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Palkade libisemist ei leitud enam esitatud kriteeriumidele vastavaks esitamiseks või juba esitatud palgalehelt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Lõivud ja maksud
 DocType: Projects Settings,Projects Settings,Projektide seaded
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Palun sisestage Viitekuupäev
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} makse kanded ei saa filtreeritud {1}
@@ -2363,27 +2371,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of Punkt grupid.
 DocType: Production Plan,Total Produced Qty,Kogutoodang
 DocType: Payroll Entry,Get Employee Details,Hankige töötaja üksikasjad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kas ei viita rea number on suurem või võrdne praeguse rea number selle Charge tüübist
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kas ei viita rea number on suurem või võrdne praeguse rea number selle Charge tüübist
 DocType: Asset,Sold,müüdud
 ,Item-wise Purchase History,Punkt tark ost ajalugu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
 DocType: Account,Frozen,Külmunud
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baasosa (firma Valuuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Toored materjalid
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Toored materjalid
 DocType: Payment Reconciliation Payment,Reference Row,viide Row
 DocType: Installation Note,Installation Time,Paigaldamine aeg
 DocType: Sales Invoice,Accounting Details,Raamatupidamine Üksikasjad
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Kustuta kõik tehingud selle firma
 DocType: Patient,O Positive,O Positiivne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investeeringud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Vastuvõetavuse kriteeriumid
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Ajakirjanikele tagasimakseid pole saadaval
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
 DocType: BOM,Show In Website,Show Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Näita Kogus Website
-DocType: Employee Loan Application,Total Payable Amount,Kokku tasumisele
+DocType: Loan Application,Total Payable Amount,Kokku tasumisele
 DocType: Task,Expected Time (in hours),Oodatud aeg (tundides)
 DocType: Item Reorder,Check in (group),Check in (rühm)
 DocType: Soil Texture,Silt,Silt
@@ -2402,7 +2411,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Tee makse
 DocType: Room,Room Name,Toa nimi
 DocType: Prescription Duration,Prescription Duration,Retsepti kestus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa kohaldada / tühistatud enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa kohaldada / tühistatud enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
 DocType: Activity Cost,Costing Rate,Ületaksid
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kliendi aadressid ja kontaktid
 ,Campaign Efficiency,kampaania Efficiency
@@ -2420,11 +2429,11 @@
 DocType: Chapter,Chapter,Peatükk
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Paar
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Vaikekonto uuendatakse automaatselt POS-arvel, kui see režiim on valitud."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Vali Bom ja Kogus Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Vali Bom ja Kogus Production
 DocType: Asset,Depreciation Schedule,amortiseerumise kava
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Müük Partner aadressid ja kontaktandmed
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Pool päeva kuupäev peab olema vahemikus From kuupäev ja To Date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Pool päeva kuupäev peab olema vahemikus From kuupäev ja To Date
 DocType: Maintenance Schedule Detail,Actual Date,Tegelik kuupäev
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Palun määrake vaikeosakute keskus ettevõttes {0}.
 DocType: Item,Has Batch No,Kas Partii ei
@@ -2442,7 +2451,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet)
 DocType: Soil Texture,Soil Type,Mullatüüp
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Uus sõnum
 ,Quotation Trends,Tsitaat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardlessi volitus
@@ -2462,7 +2470,7 @@
 DocType: Hub Category,Hub Category,Rummu kategooria
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Sõidukite arv
-DocType: Employee Loan,Loan Amount,Laenusumma
+DocType: Loan,Loan Amount,Laenusumma
 DocType: Student Report Generation Tool,Add Letterhead,Lisa kirjapea
 DocType: Program Enrollment,Self-Driving Vehicle,Isesõitva Sõiduki
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tarnija tulemuskaardi alaline
@@ -2490,9 +2498,9 @@
 DocType: Cash Flow Mapper,Position,Positsioon
 DocType: Patient,Patient Details,Patsiendi üksikasjad
 DocType: Patient,B Positive,B Positiivne
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 DocType: Patient Medical Record,Patient Medical Record,Patsiendi meditsiiniline aruanne
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Spordi-
@@ -2500,8 +2508,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kokku Tegelik
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Student Õed
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonementplaani detailne teave
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Ühik
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Palun täpsustage Company
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Palun täpsustage Company
 ,Customer Acquisition and Loyalty,Klientide võitmiseks ja lojaalsus
 DocType: Asset Maintenance Task,Maintenance Task,Hooldusülesanne
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Palun määra B2C piirang GST-i seadetes.
@@ -2515,6 +2524,7 @@
 ,BOM Search,Bom Otsing
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Kokku tarbitud materjalikulud (varude sisestamise kaudu)
 DocType: Hub Settings,Company Registered,Registreeritud ettevõte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Kuupäev ei saa olla väiksem kui kuupäevast
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Kirjastage laos &quot;Laos&quot; või &quot;Laos&quot;, mis asub jaotuses, tuginedes laos saadaval olevale laos."
 DocType: Vehicle,Fuel Type,kütuse tüüp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Palun täpsustage valuuta Company
@@ -2522,17 +2532,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pärast Material taotlused on tõstatatud automaatselt vastavalt objekti ümber korraldada tasemel
 DocType: Email Digest,Pending Sales Orders,Kuni müügitellimuste
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 DocType: Employee,Create User Permission,Loo kasutaja luba
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
 DocType: Healthcare Settings,Remind Before,Tuleta meelde enne
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Ümberarvutustegur on vaja järjest {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
 DocType: Salary Component,Deduction,Kinnipeetav
 DocType: Item,Retain Sample,Jätke proov
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rida {0}: From ajal ja aeg on kohustuslik.
 DocType: Stock Reconciliation Item,Amount Difference,summa vahe
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Palun sisestage Töötaja Id selle müügi isik
 DocType: Territory,Classification of Customers by region,Klientide liigitamine piirkonniti
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Tootmises
@@ -2542,8 +2553,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Arvutatud Bank avaldus tasakaalu
 DocType: Normal Test Template,Normal Test Template,Tavaline testmall
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,puudega kasutaja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Tsitaat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Saadud RFQ-d ei saa määrata tsiteerimata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Tsitaat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Saadud RFQ-d ei saa määrata tsiteerimata
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Konto valuuta printimiseks valige konto
@@ -2551,7 +2562,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,See põhineb tehingutel selle patsiendi vastu. Täpsema teabe saamiseks vt allpool toodud ajakava
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kulude Uuendatud
 DocType: Patient,Date of Birth,Sünniaeg
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Punkt {0} on juba tagasi
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tarnija tulemuskaardi seadistamine
@@ -2562,14 +2573,15 @@
 DocType: Work Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Töö kirjeldus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Töö kirjeldus
 DocType: Student Applicant,Applied,rakendatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re avatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re avatud
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kogus ühe Stock UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Nimi
 DocType: Purchase Invoice,02-Post Sale Discount,02-müügi allahindlus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Erimärkide välja &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ja &quot;/&quot; ei tohi nimetades seeria"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Jälgi müügikampaaniad. Jälgi Leads, tsitaadid, Sales Order etc Kampaaniad hinnata investeeringult saadavat tulu."
+DocType: Department Approver,Approver,Heakskiitja
 ,SO Qty,SO Kogus
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Valdkonnale Aktsionär ei saa olla tühi
 DocType: Guardian,Work Address,tööaadress
@@ -2583,21 +2595,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Eraldati kokku (firma Valuuta)
 DocType: Purchase Order Item,To be delivered to customer,Et toimetatakse kliendile
 DocType: BOM,Scrap Material Cost,Vanametalli materjali kulu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial No {0} ei kuulu ühtegi Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial No {0} ei kuulu ühtegi Warehouse
 DocType: Grant Application,Email Notification Sent,E-kirja saatmine saadetud
 DocType: Purchase Invoice,In Words (Company Currency),Sõnades (firma Valuuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Rida on nõutav tootekood, ladu, kogus"
-DocType: Pricing Rule,Supplier,Tarnija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Rida on nõutav tootekood, ladu, kogus"
+DocType: Bank Guarantee,Supplier,Tarnija
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Näita makse üksikasju
 DocType: Consultation,Consultation Time,Konsultatsiooniaeg
 DocType: C-Form,Quarter,Kvartal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Muud kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Muud kulud
 DocType: Global Defaults,Default Company,Vaikimisi Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Kulu või Difference konto on kohustuslik Punkt {0}, kuna see mõjutab üldist laos väärtus"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Panga nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Töötaja Laenu konto
 DocType: Leave Application,Total Leave Days,Kokku puhkusepäevade
 DocType: Email Digest,Note: Email will not be sent to disabled users,Märkus: Email ei saadeta puuetega inimestele
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Arv koostoime
@@ -2612,7 +2623,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Kaal (kilogrammides)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",peatükid / chapter_name jätta tühjaks automaatselt pärast peatükki salvestamist.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Palun seadistage GST kontod GST-i seadetes
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Palun seadistage GST kontod GST-i seadetes
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Äri tüüp
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Palun valige eraldatud summa, arve liik ja arve number atleast üks rida"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kulud New Ost
@@ -2621,12 +2632,13 @@
 DocType: Grant Application,Grant Description,Toetuse kirjeldus
 DocType: Purchase Invoice Item,Rate (Company Currency),Hinda (firma Valuuta)
 DocType: Student Guardian,Others,Teised
+DocType: Subscription,Discounts,Allahindlused
 DocType: Payment Entry,Unallocated Amount,Jaotamata summa
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Kas te ei leia sobivat Punkt. Palun valige mõni muu väärtus {0}.
 DocType: POS Profile,Taxes and Charges,Maksud ja tasud
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Toode või teenus, mida osta, müüa või hoida laos."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Enam uuendused
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ei saa valida tasuta tüübiks &quot;On eelmise rea summa&quot; või &quot;On eelmise rea kokku&quot; esimese rea
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ei saa valida tasuta tüübiks &quot;On eelmise rea summa&quot; või &quot;On eelmise rea kokku&quot; esimese rea
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,See hõlmab kõiki selle seadistusega seotud tulemuste kaarte
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapse toode ei tohiks olla Toote Bundle. Palun eemalda kirje `{0}` ja säästa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Pangandus
@@ -2634,45 +2646,48 @@
 DocType: Vehicle Service,Service Item,Teenuse toode
 DocType: Bank Guarantee,Bank Guarantee,Panga garantii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Palun kliki &quot;Loo Ajakava&quot; saada ajakava
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
 DocType: Bin,Ordered Quantity,Tellitud Kogus
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",nt &quot;Ehita vahendid ehitajad&quot;
 DocType: Grading Scale,Grading Scale Intervals,Hindamisskaala Intervallid
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Aasta kasum
+DocType: Bank Guarantee,Name of Bank,Panga nimi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Raamatupidamine kirjet {2} saab teha ainult valuuta: {3}
 DocType: Fee Schedule,In Process,Teoksil olev
 DocType: Authorization Rule,Itemwise Discount,Itemwise Soodus
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Puude ja finantsaruanded.
+DocType: Bank Guarantee,Reference Document Type,Viide Dokumendi liik
 DocType: Cash Flow Mapping,Cash Flow Mapping,Rahavoogude kaardistamine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} vastu Sales Order {1}
 DocType: Account,Fixed Asset,Põhivarade
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,SERIALIZED Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post ei leitud vaikekontaktis
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Loo saladus
-DocType: Employee Loan,Account Info,Konto andmed
+DocType: Loan,Account Info,Konto andmed
 DocType: Activity Type,Default Billing Rate,Vaikimisi Arved Rate
 DocType: Fees,Include Payment,Lisada makse
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Üliõpilasgrupid loodud.
 DocType: Sales Invoice,Total Billing Amount,Arve summa
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Tasulise struktuuri ja õpilaste rühma programm {0} on erinevad.
 DocType: Fee Schedule,Receivable Account,Nõue konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Sales Order maksmine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,tegevdirektor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,tegevdirektor
 DocType: Purchase Invoice,With Payment of Tax,Maksu tasumisega
 DocType: Expense Claim Detail,Expense Claim Detail,Kuluhüvitussüsteeme Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Kolmekordselt TARNIJA
 DocType: Land Unit,Is Container,On konteiner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,See on põllukultuuride tsükli 1. päev
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Palun valige õige konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Palun valige õige konto
 DocType: Purchase Invoice Item,Weight UOM,Kaal UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Folio numbritega ostetud aktsionäride nimekiri
 DocType: Salary Structure Employee,Salary Structure Employee,Palgastruktuur Employee
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Näita variandi atribuute
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Näita variandi atribuute
 DocType: Student,Blood Group,Veregrupp
 DocType: Course,Course Name,Kursuse nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Kasutajad, kes saab kinnitada konkreetse töötaja puhkuse rakendused"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Büroo seadmed
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Büroo seadmed
 DocType: Purchase Invoice Item,Qty,Kogus
 DocType: Fiscal Year,Companies,Ettevõtted
 DocType: Supplier Scorecard,Scoring Setup,Hindamise seadistamine
@@ -2691,7 +2706,7 @@
 DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Kanne on vajalik
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Ostu hinnakiri
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Pakkujate tulemuskaardi muutujate mallid.
 DocType: Job Offer Term,Offer Term,Tähtajaline
 DocType: Asset,Quality Manager,Kvaliteedi juht
@@ -2703,13 +2718,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Kokku Palgata: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom Koduleht operatsiooni
 DocType: Supplier Scorecard,Supplier Score,Tarnija skoor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Kokku arve Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Kokku arve Amt
 DocType: Supplier,Warn RFQs,Hoiata RFQs
 DocType: BOM,Conversion Rate,tulosmuuntokertoimella
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Tooteotsing
 DocType: Assessment Plan,To Time,Et aeg
 DocType: Authorization Rule,Approving Role (above authorized value),Kinnitamine roll (üle lubatud väärtuse)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Krediidi konto peab olema tasulised konto
+DocType: Loan,Total Amount Paid,Kogusumma tasutud
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Palun valige Student Admission, mis on tasuline üliõpilaspidaja kohustuslik"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Hinnakirja avaldamiseks valige hinnakiri
@@ -2719,18 +2735,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnakiri {0} on keelatud
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rida {0}: Teostatud Kogus ei saa olla rohkem kui {1} tööks {2}
 DocType: Manufacturing Settings,Allow Overtime,Laske Ületunnitöö
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Seeriatootmiseks Oksjoni {0} ei saa uuendada, kasutades Stock vastavuse kontrollimiseks kasutada Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Seeriatootmiseks Oksjoni {0} ei saa uuendada, kasutades Stock vastavuse kontrollimiseks kasutada Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Koolitus Sündmus Employee
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Suurimad proovid - {0} saab säilitada partii {1} ja üksuse {2} jaoks.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Lisage ajapilusid
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} seerianumbrid vajalik Eseme {1}. Sa andsid {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} seerianumbrid vajalik Eseme {1}. Sa andsid {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Praegune Hindamine Rate
 DocType: Training Event,Advance,Ettemaks
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,uuesti kordamiseks.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless maksejuhtseadistused
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange kasum / kahjum
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange kasum / kahjum
 DocType: Opportunity,Lost Reason,Kaotatud Reason
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rida # {0}: konto {1} ei kuulu ettevõttele {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rida # {0}: konto {1} ei kuulu ettevõttele {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType&#39;i leidmine nurjus {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
@@ -2749,7 +2764,6 @@
 DocType: Bin,Actual Quantity,Tegelik Kogus
 DocType: Shipping Rule,example: Next Day Shipping,Näiteks: Järgmine päev kohaletoimetamine
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ei leitud
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Tellimus on olnud {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Tasu ajakava programm
 DocType: Fee Schedule Program,Student Batch,Student Partii
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tee Student
@@ -2764,14 +2778,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-kaubandus GSTIN
 DocType: Sales Order,Not Delivered,Ei ole esitanud
 ,Bank Clearance Summary,Bank Kliirens kokkuvõte
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
 DocType: Appraisal Goal,Appraisal Goal,Hinnang Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Soovita Kategooria?
 DocType: Stock Reconciliation Item,Current Amount,Praegune summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ehitised
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ehitised
 DocType: Fee Schedule,Fee Structure,Fee struktuur
 DocType: Timesheet Detail,Costing Amount,Mis maksavad summa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Student Admission Program,Application Fee,Application Fee
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Esita palgatõend
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm allahindlust Punkt {0} on {1}%
@@ -2779,12 +2792,13 @@
 DocType: Sales Partner,Address & Contacts,Aadress ja Kontakt
 DocType: SMS Log,Sender Name,Saatja nimi
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Põllumajandusanalüüsi kriteeriumid
+DocType: HR Settings,Leave Approval Notification Template,Jäta kinnituse teatise mall
 DocType: POS Profile,[Select],[Vali]
 DocType: Vital Signs,Blood Pressure (diastolic),Vererõhk (diastoolne)
 DocType: SMS Log,Sent To,Saadetud
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Tee müügiarve
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,tarkvara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,tarkvara
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
 DocType: Company,For Reference Only.,Üksnes võrdluseks.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Arst {0} pole saadaval {1}
@@ -2802,7 +2816,7 @@
 DocType: Employee,New Workplace,New Töökoht
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materiaalne tarbimine
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Pane suletud
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No Punkt Triipkood {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No Punkt Triipkood {0}
 DocType: Normal Test Items,Require Result Value,Nõuda tulemuse väärtust
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2817,19 +2831,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivne või vaikimisi Palgastruktuur leitud töötaja {0} jaoks antud kuupäeva
 DocType: Leave Block List,Allow Users,Luba kasutajatel
 DocType: Purchase Order,Customer Mobile No,Kliendi Mobiilne pole
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Korduvad
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Rahavoogude kaardistamise malli üksikasjad
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Laenujuhtimine
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jälgi eraldi tulude ja kulude toote vertikaalsed või jagunemise.
 DocType: Rename Tool,Rename Tool,Nimeta Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Värskenda Cost
 DocType: Item Reorder,Item Reorder,Punkt Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Näita palgatõend
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Näita palgatõend
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Materjal
 DocType: Fees,Send Payment Request,Saada makse taotlus
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
 DocType: Water Analysis,Origin,Päritolu
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Palun määra korduvate pärast salvestamist
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Vali muutus summa kontole
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
@@ -2844,14 +2858,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Kas tulumaksukohustus
 DocType: Grading Scale Interval,Grade Description,Hinne kirjeldus
 DocType: Stock Entry,Purchase Receipt No,Ostutšekk pole
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Käsiraha
 DocType: Sales Invoice, Shipping Bill Number,Shipping Bill Number
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Jälgitavus
 DocType: Asset Maintenance Log,Actions performed,Sooritatud toimingud
 DocType: Cash Flow Mapper,Section Leader,Sektsiooni juht
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Vahendite allika (Kohustused)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Vahendite allika (Kohustused)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kogus järjest {0} ({1}) peab olema sama, mida toodetakse kogus {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Töötaja
+DocType: Bank Guarantee,Fixed Deposit Number,Fikseeritud hoiuse number
 DocType: Asset Repair,Failure Date,Ebaõnnestumise kuupäev
 DocType: Sample Collection,Collected Time,Kogutud aeg
 DocType: Company,Sales Monthly History,Müügi kuu ajalugu
@@ -2868,10 +2883,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,"Kas olete kindel, et soovite selle koosoleku tühistada?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotelli toa hinna pakett
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,müügivõimaluste
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nõutav
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Liitumiste värskenduste hankimine
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Kontole {0} ei ühti Firma {1} režiimis Ülekanderublade: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursus:
@@ -2881,7 +2897,7 @@
 DocType: Notification Control,Expense Claim Approved,Kuluhüvitussüsteeme Kinnitatud
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Tööpakkumised pole loodud
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Palgatõend töötaja {0} on juba loodud selleks perioodiks
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kulud ostetud esemed
 DocType: Selling Settings,Sales Order Required,Sales Order Nõutav
 DocType: Purchase Invoice,Credit To,Krediidi
@@ -2899,7 +2915,7 @@
 DocType: Request for Quotation Supplier,No Quote,Tsitaat ei ole
 DocType: Warranty Claim,Raised By,Tõstatatud
 DocType: Payment Gateway Account,Payment Account,Maksekonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Palun täpsustage Company edasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Palun täpsustage Company edasi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Net muutus Arved
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Tasandusintress Off
 DocType: Job Offer,Accepted,Lubatud
@@ -2911,7 +2927,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Palun veendu, et sa tõesti tahad kustutada kõik tehingud selle firma. Teie kapten andmed jäävad, nagu see on. Seda toimingut ei saa tagasi võtta."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Otsingu tulemused
 DocType: Room,Room Number,Toa number
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Vale viite {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Vale viite {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Kohaletoimetamine Reegel Label
 DocType: Journal Entry Account,Payroll Entry,Palgaarvestuse sissekanne
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Vaadake tasusid Records
@@ -2921,7 +2937,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Lab Test Sample,Lab Test Sample,Lab prooviproov
 DocType: Item Variant Settings,Allow Rename Attribute Value,Luba ümbernimetamise atribuudi väärtus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick päevikusissekanne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
 DocType: Restaurant,Invoice Series Prefix,Arve seeria prefiks
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
@@ -2929,8 +2945,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Mapsi integreerimine pole lubatud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ei ole esitatud
+DocType: Subscription,Trialling,Triallimine
 DocType: Member,Membership Expiry Date,Liikmestaatuse lõppkuupäev
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} peab olema negatiivne vastutasuks dokumendi
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} peab olema negatiivne vastutasuks dokumendi
 ,Minutes to First Response for Issues,Protokoll First Response küsimustes
 DocType: Purchase Invoice,Terms and Conditions1,Tingimused ja tingimuste kohta1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
@@ -2949,7 +2966,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Mõõtühik
 DocType: Fiscal Year,Year End Date,Aasta lõpp kuupäev
 DocType: Task Depends On,Task Depends On,Task sõltub
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Võimalus
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Võimalus
 DocType: Operation,Default Workstation,Vaikimisi Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kuluhüvitussüsteeme Kinnitatud Message
 DocType: Payment Entry,Deductions or Loss,Mahaarvamisi või kaotus
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Palgata puhkust ei ühti heaks Jäta ostusoov arvestust
 DocType: Campaign,Campaign-.####,Kampaania -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Järgmised sammud
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Tee arve
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Järelejäänud saldo
@@ -2996,7 +3013,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Vöötkood {0} ei ole kehtiv {1} kood
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Aasta
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Plii%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
 DocType: Driver,Driver,Juht
 DocType: Vital Signs,Nutrition Values,Toitumisväärtused
 DocType: Lab Test Template,Is billable,On tasuline
@@ -3007,7 +3024,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Tegelik Start Date (via Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,See on näide veebisaidi automaatselt genereeritud alates ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Vananemine Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Ettemakse kogusumma ei tohi olla suurem kui deklareeritud kogu summa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Ettemakse kogusumma ei tohi olla suurem kui deklareeritud kogu summa
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3042,7 +3059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Vali Atribuudi väärtused
 DocType: Purchase Invoice,Reason For Issuing document,Motivatsioon Dokumendi väljastamiseks
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Järgmine kontakteeruda ei saa olla sama Lead e-posti aadress
 DocType: Tax Rule,Billing City,Arved City
@@ -3059,7 +3076,8 @@
 DocType: Warranty Claim,Service Address,Teenindus Aadress
 DocType: Asset Maintenance Task,Calibration,Kalibreerimine
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} on ettevõtte puhkus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mööbel ja lambid
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Jäta olekutest teavitamine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mööbel ja lambid
 DocType: Item,Manufacture,Tootmine
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab katsearuanne
@@ -3075,7 +3093,6 @@
 DocType: Crop,Planting Area,Istutusala
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kokku (tk)
 DocType: Installation Note Item,Installed Qty,Paigaldatud Kogus
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Selle põhjuseks võib olla mõni kehtetu e-posti aadress
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Sa lisasid
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,koolitus Tulemus
@@ -3085,16 +3102,17 @@
 DocType: Products Settings,Products per Page,Tooteid lehel
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisatsiooni haru meister.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,või
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility kulud
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rida # {0}: päevikusissekanne {1} ei ole arvesse {2} või juba võrreldakse teise kviitungi
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteeriumide kaal
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Jäta heakskiidu teatis
 DocType: Buying Settings,Default Buying Price List,Vaikimisi ostmine hinnakiri
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Palgatõend põhjal Töögraafik
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ostuhind
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Ostuhind
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Vaikeväärtuste nagu firma, valuuta, jooksval majandusaastal jms"
 DocType: Payment Entry,Payment Type,Makse tüüp
@@ -3116,6 +3134,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ostukorv Seaded
 DocType: Journal Entry,Accounting Entries,Raamatupidamise kanded
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Kui valitud on Hinnakujunduse reegel, määratakse hinnakiri ümber. Hinnakujundus Reeglite määr on lõplik määr, seega ei tohiks rakendada täiendavat allahindlust. Seega sellistes tehingutes nagu Müügitellimus, Ostutellimus jne, lisatakse see väljale &quot;Hindamine&quot;, mitte &quot;Hinnakirja määr&quot;."
+DocType: Journal Entry,Paid Loan,Tasuline laen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Topeltkirje. Palun kontrollige Luba Reegel {0}
 DocType: Journal Entry Account,Reference Due Date,Võrdluskuupäev
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3132,7 +3151,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
 ,To Produce,Toota
 apps/erpnext/erpnext/config/hr.py +93,Payroll,palgafond
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Juba rida {0} on {1}. Lisada {2} Punkti kiirus, rida {3} peab olema ka"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Juba rida {0} on {1}. Lisada {2} Punkti kiirus, rida {3} peab olema ka"
 DocType: Patient Service Unit,Parent Service Unit,Vanemate teenindusüksus
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Tee User
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifitseerimine pakett sünnitust (trüki)
@@ -3150,7 +3169,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Tulukonto
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Tarne
 DocType: Volunteer,Weekdays,Nädalapäevad
 DocType: Stock Reconciliation Item,Current Qty,Praegune Kogus
 DocType: Restaurant Menu,Restaurant Menu,Restoranimenüü
@@ -3158,7 +3177,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Määra vaikimisi laoseisu konto jooksva inventuuri
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Määra vaikimisi laoseisu konto jooksva inventuuri
 DocType: Item Reorder,Material Request Type,Materjal Hankelepingu liik
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Saatke graafikujuliste meilide saatmine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage on täis, ei päästa"
@@ -3166,10 +3185,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Toa maht
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Kirje {0} jaoks on juba olemas kirje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,"Kaotad varem koostatud arvete andmed. Kas olete kindel, et soovite selle tellimuse uuesti käivitada?"
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registreerimistasu
 DocType: Budget,Cost Center,Cost Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ostutellimuse Message
 DocType: Tax Rule,Shipping Country,Kohaletoimetamine Riik
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Peida Kliendi Maksu Id müügitehingute
@@ -3178,20 +3198,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Hinnakujundus Reegel on tehtud üle kirjutada Hinnakiri / defineerida allahindlus protsent, mis põhineb mõned kriteeriumid."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Ladu saab muuta ainult läbi Stock Entry / saateleht / ostutšekk
 DocType: Employee Education,Class / Percentage,Klass / protsent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Head of Marketing ja müük
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Head of Marketing ja müük
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Tulumaksuseaduse
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Mine kleebiste juurde
+DocType: Subscription,Cancel At End Of Period,Lõpetage perioodi lõpus
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Ülekandmiseks valitud üksused pole valitud
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Ülekandmiseks valitud üksused pole valitud
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Kõik aadressid.
 DocType: Company,Stock Settings,Stock Seaded
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
 DocType: Vehicle,Electric,elektriline
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Kasum / kahjum on varade realiseerimine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Kasum / kahjum on varade realiseerimine
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.","Allolevas tabelis valitakse ainult üliõpilane, kellel on staatus &quot;Kinnitatud&quot;."
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Konto number {0} pole saadaval. <br> Palun seadke oma arveldusaruanne õigesti.
 DocType: Task,Depends on Tasks,Oleneb Ülesanded
@@ -3206,6 +3227,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ei ole laos
 DocType: Volunteer,Volunteer Skills,Vabatahtlik oskused
 DocType: Appraisal,HR User,HR Kasutaja
+DocType: Bank Guarantee,Reference Document Name,Viide dokumendi nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
 apps/erpnext/erpnext/hooks.py +142,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status peab olema üks {0}
@@ -3219,7 +3241,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Väga suur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Väga suur
+DocType: Loan,Loan Application,Laenu taotlemine
 DocType: Crop,Scientific Name,Teaduslik nimi
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Kokku Lehed
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Kui valitud kontakti pärast salvestamist redigeeritakse, vali uuesti"
@@ -3228,13 +3251,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Tšekk arv
 ,Sales Browser,Müük Browser
 DocType: Journal Entry,Total Credit,Kokku Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Kohalik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Laenud ja ettemaksed (vara)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Võlgnikud
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Suur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Suur
 DocType: Homepage Featured Product,Homepage Featured Product,Kodulehekülg Valitud toode
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Kõik hindamine Groups
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Kõik hindamine Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uus Warehouse Nimi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Kokku {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territoorium
@@ -3255,9 +3278,10 @@
 DocType: Fees,Fees,Tasud
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Täpsustada Vahetuskurss vahetada üks valuuta teise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Tsitaat {0} on tühistatud
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Tasumata kogusumma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Tasumata kogusumma
 DocType: Sales Partner,Targets,Eesmärgid
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Palun registreerige ettevõtte infofailis SIREN number
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 DocType: Price List,Price List Master,Hinnakiri Master
 DocType: GST Account,CESS Account,CESS konto
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
@@ -3266,6 +3290,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Valige patsient
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameetri nimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; ja &quot;Tõrjutud&quot; saab esitada
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Group Nimi on kohustuslik järjest {0}
 DocType: Homepage,Products to be shown on website homepage,Tooted näidatavad veebilehel kodulehekülg
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,See on just klientide rühma ja seda ei saa muuta.
@@ -3298,14 +3323,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Arve on juba loodud kõikide arveldusajal
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nimi viga: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Kas rahakulu
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Osalemine töötajate {0} on juba märgitud
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Osalemine töötajate {0} on juba märgitud
 DocType: Packing Slip,If more than one package of the same type (for print),Kui rohkem kui üks pakett on sama tüüpi (trüki)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Tehke vaikeseaded restoranis seaded
 ,Salary Register,palk Registreeri
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
-DocType: C-Form Invoice Detail,Net Total,Net kokku
+DocType: Subscription,Net Total,Net kokku
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Vaikimisi Bom ei leitud Oksjoni {0} ja Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Määrake erinevate Laenuliigid
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Määrake erinevate Laenuliigid
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Tasumata summa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aeg (min)
@@ -3337,11 +3362,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Juur tuleb arvesse rühm
 DocType: Drug Prescription,Drug Prescription,Ravimite retseptiravim
 DocType: Fees,FEE.,Tasu.
-DocType: Employee Loan,Repaid/Closed,Tagastatud / Suletud
+DocType: Loan,Repaid/Closed,Tagastatud / Suletud
 DocType: Item,Total Projected Qty,Kokku prognoositakse Kogus
 DocType: Monthly Distribution,Distribution Name,Distribution nimi
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kirje {0} jaoks ei leitud hindamismäär, mis on vajalik {1} {2} arvestuskande tegemiseks. Kui üksus tegeleb väärtusega {1} nullväärtusega, siis märkige see {1} üksuse tabelisse. Muul juhul looge objektiga saabuv varude tehing või märkige väärtuse määr kirje kirjele ja proovige seejärel selle kirje esitamist / tühistamist"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 DocType: Course,Course Code,Kursuse kood
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
 DocType: POS Settings,Use POS in Offline Mode,Kasutage POS-i võrguühendusrežiimis
@@ -3361,16 +3385,15 @@
 DocType: Purchase Invoice,Deemed Export,Kaalutud eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer tootmine
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Soodus protsent võib rakendada kas vastu Hinnakiri või kõigi hinnakiri.
-DocType: Subscription,Half-yearly,Poolaasta-
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Lab Test,LabTest Approver,LabTest heakskiitja
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Olete juba hinnanud hindamise kriteeriumid {}.
 DocType: Vehicle Service,Engine Oil,mootoriõli
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Loodud töökorraldused: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Loodud töökorraldused: {0}
 DocType: Sales Invoice,Sales Team1,Müük Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
-DocType: Employee Loan,Loan Details,laenu detailid
+DocType: Loan,Loan Details,laenu detailid
 DocType: Company,Default Inventory Account,Vaikimisi Inventory konto
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numbrid ei sobi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
@@ -3382,19 +3405,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Link kõikidele maaühikutele, kus kasvab kultuur"
 DocType: Account,Root Type,Juur Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Ei saa tagastada rohkem kui {1} jaoks Punkt {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Ei saa tagastada rohkem kui {1} jaoks Punkt {2}
 DocType: Item Group,Show this slideshow at the top of the page,Näita seda slideshow ülaosas lehele
 DocType: BOM,Item UOM,Punkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Maksusumma Pärast Allahindluse summa (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target lattu on kohustuslik rida {0}
 DocType: Cheque Print Template,Primary Settings,esmane seaded
 DocType: Purchase Invoice,Select Supplier Address,Vali Tarnija Aadress
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Lisa Töötajad
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Lisa Töötajad
 DocType: Purchase Invoice Item,Quality Inspection,Kvaliteedi kontroll
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Mikroskoopilises
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Mikroskoopilises
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teooria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} on külmutatud
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juriidilise isiku / tütarettevõtte eraldi kontoplaani kuuluv organisatsioon.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3414,11 +3437,10 @@
 DocType: SMS Log,No of Sent SMS,No saadetud SMS
 DocType: Antibiotic,Healthcare Administrator,Tervishoiu administraator
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Määra sihtmärk
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
 DocType: Dosage Strength,Dosage Strength,Annuse tugevus
 DocType: Account,Expense Account,Ärikohtumisteks
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Tarkvara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Värv
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Värv
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Hindamise kava kriteeriumid
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Valitud objekti kehtivusaeg on kohustuslik
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vältida ostutellimusi
@@ -3431,18 +3453,18 @@
 DocType: Patient,Personal and Social History,Isiklik ja sotsiaalne ajalugu
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Kasutaja {0} loodud
 DocType: Fee Schedule,Fee Breakup for each student,Tasu lõhe iga õpilase kohta
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vali Kuu jaotamine ebaühtlaselt jaotada eesmärkide üle kuu.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Muuda koodi
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diisel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Hinnakiri Valuuta ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Student Kuu osavõtt Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Müügi reegel kehtib ainult Müügi kohta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti alguskuupäev
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Kuni
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Kuni
 DocType: Rename Tool,Rename Log,Nimeta Logi
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Student Group või Kursuse ajakava on kohustuslik
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Säilitada Arved ja tööaja samad Töögraafik
@@ -3462,7 +3484,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Lisage oma tooteid või teenuseid, mida ostate või müüte."
 DocType: Water Analysis,Storage Temperature,Säilitustemperatuur
 DocType: Employee Attendance Tool,Unmarked Attendance,Märkimata osavõtt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Teadur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Teadur
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programm Registreerimine Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Alguskuupäev peaks olema väiksem kui ülesande {0} lõppkuupäev
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nimi või e on kohustuslik
@@ -3475,7 +3497,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija RFQ peaks olema ettevaatlik.
 DocType: Chapter,Non Profit Manager,Mittetulundusjuht
 DocType: BOM,Total Cost(Company Currency),Kogumaksumus (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} loodud
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} loodud
 DocType: Homepage,Company Description for website homepage,Firma kirjeldus veebisaidi avalehel
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For mugavuse klientidele, neid koode saab kasutada print formaadid nagu arved ja Saatekirjad"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Nimi
@@ -3485,11 +3507,10 @@
 DocType: Employee,You can enter any date manually,Saate sisestada mis tahes kuupäeva käsitsi
 DocType: Healthcare Settings,Result Printed,Tulemus trükitud
 DocType: Asset Category Account,Depreciation Expense Account,Amortisatsioonikulu konto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Katseaeg
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Kuva {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Katseaeg
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Ainult tipud on lubatud tehingut
 DocType: Project,Total Costing Amount (via Timesheets),Kogukulude summa (ajaveebide kaudu)
-DocType: Employee Advance,Expense Approver,Kulu Approver
+DocType: Department,Expense Approver,Kulu Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
 DocType: Project,Hourly,Tunnis
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group Group
@@ -3498,7 +3519,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Et Date
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logid säilitamiseks sms tarneseisust
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee makse kaudu päevikusissekanne
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,trükitud
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,trükitud
 DocType: Item,Inspection Required before Delivery,Ülevaatus Vajalik enne sünnitust
 DocType: Item,Inspection Required before Purchase,Ülevaatus Vajalik enne ostu
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kuni Tegevused
@@ -3508,7 +3529,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Tellimuse miinimumkogus
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,teie organisatsiooni
 DocType: Fee Component,Fees Category,Tasud Kategooria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Teata töötajatest
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sisesta nimi kampaania kui allikas uurimine on kampaania
@@ -3518,7 +3539,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Reorder Level
 DocType: Company,Chart Of Accounts Template,Kontoplaani Mall
 DocType: Attendance,Attendance Date,Osavõtt kuupäev
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palk väljasõit põhineb teenimine ja mahaarvamine.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto tütartippu ei saa ümber arvestusraamatust
 DocType: Purchase Invoice Item,Accepted Warehouse,Aktsepteeritud Warehouse
@@ -3526,10 +3547,11 @@
 DocType: Item,Valuation Method,Hindamismeetod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Pool päeva
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicate kirje
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate kirje
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Enne esitamist sisestage Saaja nimi.
 DocType: Program Enrollment Tool,Get Students,saada Õpilased
 DocType: Serial No,Under Warranty,Garantii alla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Sõnades on nähtav, kui salvestate Sales Order."
 ,Employee Birthday,Töötaja Sünnipäev
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Palun valige lõpuleviimise lõpetamise kuupäev
@@ -3548,7 +3570,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reserveeritud allhankelepingute tegemiseks
 DocType: Payment Reconciliation Invoice,Invoice Number,Arve number
 DocType: Shopping Cart Settings,Orders,Tellimused
-DocType: Employee Leave Approver,Leave Approver,Jäta Approver
+DocType: Department,Leave Approver,Jäta Approver
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Palun valige partii
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Hinnang Grupi nimi
@@ -3592,7 +3614,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL vastuvõtvate
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,See meil on automaatselt genereeritud
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
 DocType: Program Enrollment,Boarding Student,boarding Student
 DocType: Asset,Expected Value After Useful Life,Oodatud väärtus pärast Kasulik Elu
@@ -3617,21 +3638,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Publikurekordiks {0} on olemas vastu Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Viide # {0} dateeritud {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Põhivara Langes tõttu varade realiseerimisel
-DocType: Member,Member,Liige
+DocType: Loan,Member,Liige
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage aadressid
 DocType: Work Order Item,Work Order Item,Töökorralduse punkt
 DocType: Pricing Rule,Item Code,Asja kood
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
 DocType: Journal Entry,User Remark,Kasutaja Märkus
 DocType: Lead,Market Segment,Turusegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Põllumajanduse juht
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
 DocType: Supplier Scorecard Period,Variables,Muutujad
 DocType: Employee Internal Work History,Employee Internal Work History,Töötaja Internal tööandjad
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Sulgemine (Dr)
 DocType: Cheque Print Template,Cheque Size,Tšekk Suurus
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} ei laos
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} ei laos
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Maksu- malli müügitehinguid.
 DocType: Sales Invoice,Write Off Outstanding Amount,Kirjutage Off tasumata summa
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} ei ühti Company {1}
@@ -3639,7 +3660,6 @@
 DocType: Stock Settings,Default Stock UOM,Vaikimisi Stock UOM
 DocType: Asset,Number of Depreciations Booked,Arv Amortisatsiooniaruanne Broneeritud
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Kogusumma kokku
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Vastu Töötaja Loan: {0}
 DocType: Landed Cost Item,Receipt Document,laekumine Dokumendi
 DocType: Employee Education,School/University,Kool / Ülikool
 DocType: Payment Request,Reference Details,Viide Üksikasjad
@@ -3650,7 +3670,7 @@
 DocType: Asset,Double Declining Balance,Double Degressiivne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Suletud tellimust ei ole võimalik tühistada. Avanema tühistada.
 DocType: Student Guardian,Father,isa
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
 DocType: Bank Reconciliation,Bank Reconciliation,Bank leppimise
 DocType: Attendance,On Leave,puhkusel
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
@@ -3664,10 +3684,10 @@
 DocType: Lead,Lower Income,Madalama sissetulekuga
 DocType: Restaurant Order Entry,Current Order,Praegune tellimus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Allika ja eesmärgi lattu ei saa olla sama rida {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Avage programmid
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rida {0} # eraldatud summa {1} ei tohi olla suurem kui taotletud summa {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rida {0} # eraldatud summa {1} ei tohi olla suurem kui taotletud summa {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;From Date&quot; tuleb pärast &quot;To Date&quot;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
@@ -3690,7 +3710,6 @@
 DocType: Payment Terms Template,Payment Terms,Maksetingimused
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostu maksud ja tasud
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Mine pakkujatele
@@ -3709,30 +3728,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Tsitaat {0} ei tüübiga {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Hoolduskava toode
 DocType: Sales Order,%  Delivered,% Tarnitakse
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Palun määrake Makseaadi saatmiseks õpilase e-posti aadress
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Palun määrake Makseaadi saatmiseks õpilase e-posti aadress
 DocType: Patient,Medical History,Meditsiiniline ajalugu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank arvelduskrediidi kontot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank arvelduskrediidi kontot
 DocType: Patient,Patient ID,Patsiendi ID
 DocType: Physician Schedule,Schedule Name,Ajakava nimi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Tee palgatõend
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Lisa kõik pakkujad
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Lisa kõik pakkujad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Eraldatud summa ei saa olla suurem kui tasumata summa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Sirvi Bom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Tagatud laenud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Tagatud laenud
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Postitamise kuupäev ja kellaaeg
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Palun määra kulum seotud arvepidamise Põhivarakategoori {0} või ettevõtte {1}
 DocType: Lab Test Groups,Normal Range,Normaalne vahemik
 DocType: Academic Term,Academic Year,Õppeaasta
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Saadaval müügil
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Algsaldo Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Algsaldo Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ülejäänud
 DocType: Appraisal,Appraisal,Hinnang
+DocType: Loan,Loan Account,Laenukonto
 DocType: Purchase Invoice,GST Details,GST üksikasjad
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E saadetakse tarnija {0}
 DocType: Item,Default Sales Unit of Measure,Vaikimüügi mõõtühik
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Õppeaasta:
+DocType: Subscription,Past Due Date,Möödunud tähtaeg
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Mitte lubada elemendi {0} jaoks alternatiivset elementi
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Kuupäev korratakse
@@ -3745,7 +3766,7 @@
 DocType: Patient Appointment,Patient Appointment,Patsiendi määramine
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Kinnitamine roll ei saa olla sama rolli õigusriigi kohaldatakse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Lahku sellest Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Hankige tarnijaid
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Hankige tarnijaid
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ei leitud üksusele {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Mine kursustele
 DocType: Accounts Settings,Show Inclusive Tax In Print,Näita ka kaasnevat maksu printimisel
@@ -3753,10 +3774,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sõnum saadetud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto tütartippu ei saa seada pearaamatu
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadke õpetaja nime sisestamine haridusse&gt; Hariduseseaded
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Hinda kus Hinnakiri valuuta konverteeritakse kliendi baasvaluuta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Netosumma (firma Valuuta)
 DocType: Physician,Physician Schedules,Arsti ajakavad
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Ettemakse kogusumma ei tohi olla suurem kui sanktsioonide kogusumma
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Ettemakse kogusumma ei tohi olla suurem kui sanktsioonide kogusumma
 DocType: Salary Slip,Hour Rate,Tund Rate
 DocType: Stock Settings,Item Naming By,Punkt nimetamine By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Teine periood sulgemine Entry {0} on tehtud pärast {1}
@@ -3774,6 +3796,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ei ole lubatud uuendada laos tehingute vanem kui {0}
 DocType: BOM,Inspection Required,Ülevaatus Nõutav
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Enne esitamist sisestage pangagarantii number.
 DocType: Driving License Category,Class,Klass
 DocType: Sales Order,Fully Billed,Täielikult Maksustatakse
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Töönimekirja ei saa postitamise malli vastu tõsta
@@ -3784,7 +3807,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Brutokaal pakendis. Tavaliselt netokaal + pakkematerjali kaal. (trüki)
 DocType: Assessment Plan,Program,programm
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Kasutajad seda rolli on lubatud kehtestada külmutatud kontode ja luua / muuta raamatupidamiskirjeteks vastu külmutatud kontode
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadke õpetaja nime sisestamine haridusse&gt; Hariduseseaded
 DocType: Serial No,Is Cancelled,Kas Tühistatud
 DocType: Student Group,Group Based On,Grupp põhineb
 DocType: Journal Entry,Bill Date,Bill kuupäev
@@ -3795,9 +3817,10 @@
 DocType: Cheque Print Template,Cheque Height,Tšekk Kõrgus
 DocType: Supplier,Supplier Details,Tarnija Üksikasjad
 DocType: Setup Progress,Setup Progress,Seadistamine Progress
+DocType: Expense Claim,Approval Status,Kinnitamine Staatus
 DocType: Hub Settings,Publish Items to Hub,Avalda tooteid Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Siit peab olema väiksem kui väärtus järjest {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Raha telegraafiülekanne
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Raha telegraafiülekanne
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Vaata kõiki
 ,Issued Items Against Work Order,Väljastatud töökoha vastu suunatud esemed
 DocType: Vehicle Log,Invoice Ref,arve Ref
@@ -3828,12 +3851,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tariifne arv
 DocType: Work Order Item,Available Qty at WIP Warehouse,Saadaval Kogus on WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Kavandatav
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} ei kuulu Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} ei kuulu Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Märkus: Süsteem ei kontrolli üle-tarne ja üle-broneerimiseks Punkt {0}, kuna maht või kogus on 0"
 DocType: Notification Control,Quotation Message,Tsitaat Message
-DocType: Employee Loan,Employee Loan Application,Töötaja Laenutaotlus
 DocType: Issue,Opening Date,Avamise kuupäev
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Palun salvestage patsient kõigepealt
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Palun salvestage patsient kõigepealt
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Osavõtt on märgitud edukalt.
 DocType: Program Enrollment,Public Transport,Ühistransport
 DocType: Soil Texture,Silt Composition (%),Silt koostis (%)
@@ -3851,7 +3873,7 @@
 ,Item Balance (Simple),Kirje Balanss (lihtne)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Arveid tõstatatud Tarnijatele.
 DocType: POS Profile,Write Off Account,Kirjutage Off konto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Võlateate Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Võlateate Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Soodus summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tagasi Against ostuarve
 DocType: Item,Warranty Period (in days),Garantii Periood (päeva)
@@ -3874,6 +3896,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Tarnitakse Kogus
 DocType: Assessment Plan,Assessment Plan,hindamise kava
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Pöördteadaande kande number
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klient {0} on loodud.
 DocType: Stock Settings,Limit Percent,Limit protsent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Praegu pole ühtegi ladu saadaval
@@ -3887,14 +3910,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,maksmise
 DocType: C-Form,C-FORM-,C-Form
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Intervalli intervallide arv, nt kui intervall on &quot;Päevad&quot; ja arveldusvahemik on 3, koostatakse arve iga kolme päeva tagant"
 DocType: Vehicle,Insurance Details,Kindlustus detailid
 DocType: Account,Payable,Maksmisele kuuluv
 DocType: Share Balance,Share Type,Jaga tüüp
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Palun sisesta tagasimakseperioodid
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Palun sisesta tagasimakseperioodid
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Nõuded ({0})
 DocType: Pricing Rule,Margin,varu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uutele klientidele
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brutokasum%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brutokasum%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Muuda POS-profiili
 DocType: Bank Reconciliation Detail,Clearance Date,Kliirens kuupäev
@@ -3904,10 +3928,11 @@
 DocType: Lead,Address Desc,Aadress otsimiseks
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partei on kohustuslik
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Leiti järgmised rea duplikaadi tähtajad teistes ridades: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Leiti järgmised rea duplikaadi tähtajad teistes ridades: {list}
 DocType: Topic,Topic Name,Teema nimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Palun seadistage HR-seadetes lehe kinnitamise teatise vaikemall.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Atleast üks müümine või ostmine tuleb valida
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Valige töötaja, et saada töötaja ette."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Valige töötaja, et saada töötaja ette."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Valige kehtiv kuupäev
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Vali laadi oma äri.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3926,7 +3951,7 @@
 DocType: Asset Movement,Source Warehouse,Allikas Warehouse
 DocType: Installation Note,Installation Date,Paigaldamise kuupäev
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Jaga Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Müügiarve {0} loodud
 DocType: Employee,Confirmation Date,Kinnitus kuupäev
 DocType: C-Form,Total Invoiced Amount,Kokku Arve kogusumma
@@ -3935,7 +3960,7 @@
 DocType: Account,Accumulated Depreciation,akumuleeritud kulum
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Alaline nimi
 DocType: Stock Entry,Customer or Supplier Details,Klienditeenindus ja tarnijate andmed
-DocType: Employee Loan Application,Required by Date,Vajalik kuupäev
+DocType: Loan Application,Required by Date,Vajalik kuupäev
 DocType: Lead,Lead Owner,Plii Omanik
 DocType: Production Plan,Sales Orders Detail,Müügitellimuste üksikasjad
 DocType: Bin,Requested Quantity,taotletud Kogus
@@ -3948,10 +3973,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - kokku mahaarvamine - laenu tagasimakse
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Praegune BOM ja Uus BOM saa olla samad
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Palgatõend ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Mitmed variandid
 DocType: Sales Invoice,Against Income Account,Sissetuleku konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Tarnitakse
+DocType: Subscription,Trial Period Start Date,Katseperioodi alguskuupäev
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Palun logige sisse teise kasutajana.
@@ -3972,12 +3998,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Liikme nimi
 DocType: Stock Settings,Use Naming Series,Kasutage nimeserverit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
 DocType: POS Profile,Update Stock,Värskenda Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,tellimusel
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 DocType: Membership,Payment Details,Makse andmed
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Bom Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Peatatud töökorraldust ei saa tühistada. Lõpeta see esmalt tühistamiseks
 DocType: Asset,Journal Entry for Scrap,Päevikusissekanne Vanametalli
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Palun tõmmake esemed Saateleht
@@ -3997,6 +4022,7 @@
 DocType: Land Unit,Land Unit,Maaüksus
 ,Purchase Analytics,Ostu Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Toimetaja märkus toode
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Praegune arve {0} puudub
 DocType: Asset Maintenance Log,Task,Ülesanne
 DocType: Purchase Taxes and Charges,Reference Row #,Viide Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partii number on kohustuslik Punkt {0}
@@ -4008,7 +4034,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange kasum / kahjum konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Töötaja ja osavõtt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Eesmärk peab olema üks {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Täitke vorm ja salvestage see
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Täitke vorm ja salvestage see
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Suhtlus Foorum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Tegelik Kogus laos
 DocType: Homepage,"URL for ""All Products""",URL &quot;Kõik tooted&quot;
@@ -4022,7 +4048,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard müügi hind
 DocType: Account,Rate at which this tax is applied,Hinda kus see maks kohaldub
 DocType: Cash Flow Mapper,Section Name,Sektsiooni nimi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Reorder Kogus
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Reorder Kogus
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Praegune noorele
 DocType: Company,Stock Adjustment Account,Stock korrigeerimine konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Maha kirjutama
@@ -4033,9 +4059,9 @@
 DocType: Task,depends_on,oleneb
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kõigi materjalide nimekirja värskendamise järjekorras. See võib võtta paar minutit.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uue konto. Märkus: Palun ärge kontosid luua klientide ja hankijate
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Riik tark default Aadress Templates
 DocType: Water Analysis,Appearance,Välimus
+DocType: HR Settings,Leave Status Notification Template,Jäta oleku teavitusmall
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Keskm. Hinnakirja hinna ostmine
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Liikmeinfo
@@ -4058,7 +4084,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ei ole lubatud. Testige malli välja
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Protsentuaalne jaotus peaks olema suurem kui 100%
 DocType: Crop Cycle,Linked Land Unit,Seotud maaüksus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
@@ -4074,7 +4100,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Mine kasutajatele
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei ole kehtiv Partii number jaoks Punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Kehtetu GSTIN või Sisesta NA registreerimata
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm osavõtumaks
@@ -4090,14 +4116,14 @@
 DocType: Hub Settings,Publish Availability,Avalda saadavust
 DocType: Company,Create Chart Of Accounts Based On,Loo kontoplaani põhineb
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ei saa teisendada selle mitterühma. Lasteülesanded on olemas.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} on olemas peale õpilase taotleja {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ümardamise korrigeerimine (ettevõtte valuuta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Töögraafik
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partii:
 DocType: Volunteer,Afternoon,Pärastlõunal
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
 DocType: Cheque Print Template,Scanned Cheque,skaneeritud Tšekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Saada automaatne kirju Kontaktid esitamine tehinguid.
@@ -4113,7 +4139,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} on juba olemas
 DocType: Medical Department,Nursing User,Õendusabi kasutaja
 DocType: Plant Analysis,Plant Analysis Criterias,Taime analüüsi kriteeriumid
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Vastutus
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Seerianumber {0} ei kuulu Partii {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Vastutus
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Selle pakkumise kehtivusaeg on lõppenud.
 DocType: Expense Claim Account,Expense Claim Account,Kuluhüvitussüsteeme konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lubage vahetuskursi halvenemine
@@ -4135,11 +4162,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Tee variandid
 DocType: Item,Default BOM,Vaikimisi Bom
 DocType: Project,Total Billed Amount (via Sales Invoices),Kogu tasuline summa (arvete kaudu)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Võlateate Summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Võlateate Summa
 DocType: Project Update,Not Updated,Ei ole uuendatud
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Maksumäära, aktsiate arvu ja arvutatud summa vahel on vastuolud"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Kokku Tasumata Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Kokku Tasumata Amt
 DocType: Journal Entry,Printing Settings,Printing Settings
 DocType: Employee Advance,Advance Account,Ettemaksekonto
 DocType: Job Offer,Job Offer Terms,Tööpakkumise tingimused
@@ -4148,7 +4175,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Autod
 DocType: Vehicle,Insurance Company,Kindlustusselts
 DocType: Asset Category Account,Fixed Asset Account,Põhivarade konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,muutuja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,muutuja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Siit Saateleht
 DocType: Chapter,Members,Liikmed
 DocType: Student,Student Email Address,Student e-posti aadress
@@ -4171,7 +4198,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,aadress Nimi
 DocType: Stock Entry,From BOM,Siit Bom
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{0} {1} jagamine
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{0} {1} jagamine
 DocType: Assessment Code,Assessment Code,Hinnang kood
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Põhiline
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock tehingud enne {0} on külmutatud
@@ -4179,25 +4206,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
 DocType: Bank Reconciliation Detail,Payment Document,maksedokumendi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Viga kriteeriumide valemi hindamisel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
+DocType: Subscription,Plans,Plaanid
 DocType: Salary Slip,Salary Structure,Palgastruktuur
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Lennukompanii
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Väljaanne Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Korrapärase loomise ajal tekkis viga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Väljaanne Material
 DocType: Material Request Item,For Warehouse,Sest Warehouse
 DocType: Employee,Offer Date,Pakkuda kuupäev
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tsitaadid
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ei Üliõpilasgrupid loodud.
 DocType: Purchase Invoice Item,Serial No,Seerianumber
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Igakuine tagasimakse ei saa olla suurem kui Laenusumma
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Igakuine tagasimakse ei saa olla suurem kui Laenusumma
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Palun sisestage Maintaince Detailid esimene
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rida # {0}: oodatud kohaletoimetamise kuupäev ei saa olla enne ostutellimuse kuupäeva
 DocType: Purchase Invoice,Print Language,Prindi keel
 DocType: Salary Slip,Total Working Hours,Töötundide
 DocType: Sales Invoice,Customer PO Details,Kliendi PO üksikasjad
-DocType: Subscription,Next Schedule Date,Järgmise ajakava kuupäev
 DocType: Stock Entry,Including items for sub assemblies,Sealhulgas esemed sub komplektid
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Ajutine avamise konto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Sisesta väärtus peab olema positiivne
@@ -4225,11 +4251,11 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nendest kriteeriumidest töötajaid pole
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
 DocType: Hotel Settings,Default Customer,Vaikimisi klient
 DocType: Assessment Plan,Supervisor Name,Juhendaja nimi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ärge kinnitage, kas kohtumine on loodud samal päeval"
@@ -4253,16 +4279,16 @@
 DocType: Journal Entry Account,Employee Advance,Töötaja ettemaks
 DocType: Payroll Entry,Payroll Frequency,palgafond Frequency
 DocType: Lab Test Template,Sensitivity,Tundlikkus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Toormaterjal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Toormaterjal
 DocType: Leave Application,Follow via Email,Järgige e-posti teel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Taimed ja masinad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Taimed ja masinad
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Maksusumma Pärast Allahindluse summa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Igapäevase töö kokkuvõte seaded
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Palun sisesta Reqd kuupäeva järgi
 DocType: Payment Entry,Internal Transfer,Siseülekandevormi
 DocType: Asset Maintenance,Maintenance Tasks,Hooldusülesanded
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Kas eesmärk Kogus või Sihtsummaks on kohustuslik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
 DocType: Leave Control Panel,Carry Forward,Kanda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center olemasolevate tehingut ei saa ümber arvestusraamatust
@@ -4270,13 +4296,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Tuvastatud haigus
 ,Produced,Produtseeritud
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tagasimakse alguskuupäev ei saa olla enne väljamakse kuupäeva.
 DocType: Item,Item Code for Suppliers,Kood tarnijatele
 DocType: Issue,Raised By (Email),Tõstatatud (E)
 DocType: Training Event,Trainer Name,treener Nimi
 DocType: Mode of Payment,General,Üldine
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,viimase Side
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial nr Nõutav SERIALIZED Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial nr Nõutav SERIALIZED Punkt {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Maksed arvetega
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Suhtes kohaldatava (määramine)
@@ -4290,7 +4317,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Võimalda / blokeeri valuutades.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} poolepäeval Peatud {1}
 DocType: Production Plan,Get Material Request,Saada Materjal taotlus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Postikulude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Postikulude
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kokku (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Meelelahutus ja vaba aeg
 ,Item Variant Details,Üksuse variandi üksikasjad
@@ -4301,9 +4328,9 @@
 DocType: Drug Prescription,Hour,Tund
 DocType: Restaurant Order Entry,Last Sales Invoice,Viimane müügiarve
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Palun vali kogus elemendi {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No ei ole Warehouse. Ladu peab ette Stock Entry või ostutšekk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No ei ole Warehouse. Ladu peab ette Stock Entry või ostutšekk
 DocType: Lead,Lead Type,Plii Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Teil ei ole kiita lehed Block kuupäevad
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Teil ei ole kiita lehed Block kuupäevad
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Kõik need teemad on juba arve
 DocType: Company,Monthly Sales Target,Kuu müügi sihtmärk
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Saab heaks kiidetud {0}
@@ -4311,7 +4338,7 @@
 DocType: Item,Default Material Request Type,Vaikimisi Materjal Soovi Tüüp
 DocType: Supplier Scorecard,Evaluation Period,Hindamise periood
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,tundmatu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Töökorraldus pole loodud
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Töökorraldus pole loodud
 DocType: Shipping Rule,Shipping Rule Conditions,Kohaletoimetamine Reegli
 DocType: Purchase Invoice,Export Type,Ekspordi tüüp
 DocType: Salary Slip Loan,Salary Slip Loan,Palk Slip Laen
@@ -4327,7 +4354,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Kokkuvõte avamise arvete kohta
 DocType: Education Settings,Education Manager,Haridusjuht
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimaalne pikkus iga taime vahel optimaalse kasvu jaoks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Jaotatud Oksjoni {0} ei saa uuendada, kasutades Stock leppimise asemel kasutada Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Jaotatud Oksjoni {0} ei saa uuendada, kasutades Stock leppimise asemel kasutada Stock Entry"
 DocType: Quality Inspection,Report Date,Aruande kuupäev
 DocType: Student,Middle Name,Keskmine nimi
 DocType: C-Form,Invoices,Arved
@@ -4358,20 +4385,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,kviitung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,kviitung
 ,Sales Register,Müügiregister
 DocType: Daily Work Summary Group,Send Emails At,Saada e-kirju
 DocType: Quotation,Quotation Lost Reason,Tsitaat Lost Reason
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei ole midagi muuta.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vormi vaade
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Kulude kinnitamise kohustuslik kulude hüvitamise nõue
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Lisage oma organisatsiooni kasutajaid, välja arvatud teie ise."
 DocType: Customer Group,Customer Group Name,Kliendi Group Nimi
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nr Kliendid veel!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavoogude aruanne
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Ükski materiaalne taotlus pole loodud
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,litsents
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
@@ -4394,11 +4422,12 @@
 DocType: Vehicle,Chassis No,Tehasetähis
 DocType: Payment Request,Initiated,Algatatud
 DocType: Production Plan Item,Planned Start Date,Kavandatav alguskuupäev
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Valige BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Valige BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Kasutab ITC integreeritud maksu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
+DocType: Bank Guarantee,Clauses and Conditions,Tingimused ja tingimused
 DocType: Serial No,Creation Document Type,Loomise Dokumendi liik
 DocType: Project Task,View Timesheet,Kuva ajaveht
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Lõppkuupäev peab olema suurem kui alguskuupäev
 DocType: Leave Type,Is Encash,Kas kasseerima
 DocType: Leave Allocation,New Leaves Allocated,Uus Lehed Eraldatud
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
@@ -4412,9 +4441,10 @@
 DocType: Patient,Alcohol Current Use,Alkoholi praegune kasutamine
 DocType: Student Admission Program,Student Admission Program,Tudengite vastuvõtu programm
 DocType: Payment Entry,Account Paid To,Konto Paide
+DocType: Subscription Settings,Grace Period,Armuaeg
 DocType: Item Alternative,Alternative Item Name,Alternatiivse nimetuse nimi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Palkade libisemist ei õnnestunud esitada <br> \ Võimalikud põhjused: <br> \ 1. Netopalk on väiksem kui 0. <br> \ 2. Töövõtte kapteni määratud ettevõtte e-posti aadress ei kehti. <br>
@@ -4424,7 +4454,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} eelarve konto {1} vastu {2} {3} on {4}. See ületa {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Kogus
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ja unchcked keelatud
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finantsteenused
 DocType: Student Sibling,Student ID,Õpilase ID
@@ -4436,14 +4465,16 @@
 DocType: Complaint,Complaint,Kaebus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
 DocType: Leave Allocation,Unused leaves,Kasutamata lehed
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Tee tagasimakse kirje
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Kõik osakonnad
 DocType: Patient,Alcohol Past Use,Alkoholi varasem kasutamine
 DocType: Fertilizer Content,Fertilizer Content,Väetise sisu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Kr
 DocType: Project Update,Problematic/Stuck,Probleemne / kinni jäänud
 DocType: Tax Rule,Billing State,Arved riik
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Enne müügikorralduse tühistamist tuleb töökorraldus {0} tühistada
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
@@ -4467,10 +4498,11 @@
 DocType: Cheque Print Template,Message to show,Sõnum näidata
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Jaekaubandus
 DocType: Student Attendance,Absent,Puuduv
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Toote Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Punkti ei leitud alates {0}. Sul peab olema alaline hinde, mis katab 0-100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Vale viite {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Ostu maksud ja tasud Mall
+DocType: Subscription,Current Invoice Start Date,Praegune arve alguskuupäev
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: kas deebet- või krediitkaardi summa on vajalik {2}
 DocType: GL Entry,Remarks,Märkused
@@ -4480,11 +4512,13 @@
 DocType: Task,Parent Task,Vanemate ülesanne
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Tee Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Prindi ja Stationery
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Prindi ja Stationery
 DocType: Stock Settings,Show Barcode Field,Näita vöötkoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Saada Tarnija kirjad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Palk juba töödeldud ajavahemikus {0} ja {1} Jäta taotlemise tähtaeg ei või olla vahel selles ajavahemikus.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Saada Tarnija kirjad
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Palk juba töödeldud ajavahemikus {0} ja {1} Jäta taotlemise tähtaeg ei või olla vahel selles ajavahemikus.
+DocType: Fiscal Year,Auto Created,Automaatne loomine
 DocType: Chapter Member,Leave Reason,Jätke põhjus
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Arve {0} enam ei eksisteeri
 DocType: Guardian Interest,Guardian Interest,Guardian Intress
 DocType: Volunteer,Availability,Kättesaadavus
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS-arvete vaikeväärtuste seadistamine
@@ -4492,13 +4526,12 @@
 DocType: Project,Time to send,Aeg saata
 DocType: Timesheet,Employee Detail,töötaja Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Saatke ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
 DocType: Lab Prescription,Test Code,Testi kood
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Seaded veebisaidi avalehel
 DocType: Job Offer,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Ülal
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Kogusumma {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Vale atribuut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Kogusumma {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Vale atribuut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Mainida, kui mittestandardsete makstakse konto"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Palun valige hindamise rühm kui &quot;Kõik Hindamine Grupid&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rida {0}: üksuse {1} jaoks on vaja kulude keskmist
@@ -4509,7 +4542,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vee analüüs
 DocType: Chapter,Region,Piirkond
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Valikuline. See seadistus filtreerida erinevate tehingute.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
 DocType: Holiday List,Weekly Off,Weekly Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Laadi uuesti seotud analüüs
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",Sest näiteks 2012. 2012-13
@@ -4525,7 +4558,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kulud Käibelt kõrvaldatud Asset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
 DocType: Vehicle,Policy No,poliitika pole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Võta Kirjed Toote Bundle
 DocType: Asset,Straight Line,Sirgjoon
 DocType: Project User,Project User,projekti Kasutaja
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,lõhe
@@ -4561,21 +4594,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Tee
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Ei saa teisendada Cost Center pearaamatu, sest see on tütartippu"
 DocType: Production Plan,Total Planned Qty,Kokku planeeritud kogus
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Seis
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Seis
 DocType: Salary Detail,Formula,valem
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Müügikonto
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Müügikonto
 DocType: Purchase Invoice Item,Total Weight,Kogukaal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Müügiprovisjon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Müügiprovisjon
 DocType: Job Offer Term,Value / Description,Väärtus / Kirjeldus
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
 DocType: Tax Rule,Billing Country,Arved Riik
 DocType: Purchase Order Item,Expected Delivery Date,Oodatud Toimetaja kuupäev
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorani korralduse sissekanne
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
 DocType: Asset Maintenance Task,Assign To Name,Määra nimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Esinduskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Esinduskulud
 DocType: Hub Settings,Enabled Users,Lubatud kasutajad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Tee Materjal taotlus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Avatud Punkt {0}
@@ -4588,24 +4621,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Puhkuseavalduste.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
 DocType: Vehicle,Last Carbon Check,Viimati Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Kohtukulude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Kohtukulude
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Palun valige kogus real
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Müügi- ja ostuarve avamine
 DocType: Purchase Invoice,Posting Time,Foorumi aeg
 DocType: Timesheet,% Amount Billed,% Arve summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoni kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefoni kulud
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Märgi see, kui soovid sundida kasutajal valida rida enne salvestamist. Ei toimu vaikimisi, kui te vaadata seda."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Punkt Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Punkt Serial No {0}
 DocType: Email Digest,Open Notifications,Avatud teated
 DocType: Payment Entry,Difference Amount (Company Currency),Erinevus summa (firma Valuuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Otsesed kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Otsesed kulud
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uus klient tulud
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Sõidukulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Sõidukulud
 DocType: Maintenance Visit,Breakdown,Lagunema
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lisage kohandatud väljal liitumine doctypes {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
 DocType: Purchase Receipt Item,Sample Quantity,Proovi kogus
+DocType: Bank Guarantee,Name of Beneficiary,Abisaaja nimi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Värskendage BOM-i automaatselt Scheduleri kaudu, tuginedes kõige värskemale hindamismäärale / hinnakirja hinnale / toorainete viimasele ostuhinnale."
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
@@ -4617,14 +4650,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Karistusest
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,palk komponendid
 DocType: Program Enrollment Tool,New Academic Year,Uus õppeaasta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Tagasi / kreeditarve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Tagasi / kreeditarve
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto sisestada Hinnakiri määra, kui puuduvad"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Kokku Paide summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Kokku Paide summa
 DocType: GST Settings,B2C Limit,B2C piirang
 DocType: Work Order Item,Transferred Qty,Kantud Kogus
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikumine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planeerimine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planeerimine
 DocType: Share Balance,Issued,Emiteeritud
+DocType: Loan,Repayment Start Date,Tagasimaksmise alguskuupäev
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Üliõpilaste aktiivsus
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Tarnija Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detailid
@@ -4637,10 +4671,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tüüp lehed nagu juhuslik, haige vms"
 DocType: Email Digest,Send regular summary reports via Email.,Saada regulaarselt koondaruanded e-posti teel.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Palun määra vaikimisi konto kulu Nõude tüüp {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Palun määra vaikimisi konto kulu Nõude tüüp {0}
 DocType: Assessment Result,Student Name,Õpilase nimi
 DocType: Brand,Item Manager,Punkt Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,palgafond on tasulised
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,palgafond on tasulised
 DocType: Buying Settings,Default Supplier Type,Vaikimisi Tarnija Type
 DocType: Plant Analysis,Collection Datetime,Kogumiskuupäev
 DocType: Work Order,Total Operating Cost,Tegevuse kogukuludest
@@ -4650,9 +4684,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Kasutaja {0} ei ole olemas
 DocType: Payment Term,Day(s) after invoice date,Päev (d) pärast arve kuupäeva
 DocType: Payment Schedule,Payment Schedule,Maksegraafik
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Lühend
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Makse Entry juba olemas
+DocType: Subscription,Trial Period End Date,Katseperioodi lõppkuupäev
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized kuna {0} ületab piirid
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Palk malli kapten.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patoloogia
@@ -4669,9 +4703,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Lubatud muuta külmutatud laos
 ,Territory Target Variance Item Group-Wise,Territoorium Target Dispersioon Punkt Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Kõik kliendigruppide
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Kõik kliendigruppide
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kogunenud Kuu
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinnakiri Rate (firma Valuuta)
@@ -4680,14 +4714,15 @@
 DocType: Lab Prescription,Test Created,Test loodud
 DocType: Healthcare Settings,Custom Signature in Print,Kohandatud allkiri printimisel
 DocType: Account,Temporary,Ajutine
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kliendi LPO nr
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kliendi LPO nr
 DocType: Program,Courses,Kursused
 DocType: Monthly Distribution Percentage,Percentage Allocation,Protsentuaalne jaotus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretär
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretär
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Kui keelata, &quot;sõnadega&quot; väli ei ole nähtav ühtegi tehingut"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"See toiming lõpetab edaspidise arveldamise. Kas olete kindel, et soovite selle tellimuse tühistada?"
 DocType: Serial No,Distinct unit of an Item,Eraldi üksuse objekti
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriteeriumide nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Määrake Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Määrake Company
 DocType: Pricing Rule,Buying,Ostmine
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Haigused ja väetised
 DocType: HR Settings,Employee Records to be created by,Töötajate arvestuse loodud
@@ -4696,17 +4731,17 @@
 DocType: POS Profile,Apply Discount On,Kanna soodustust
 DocType: Member,Membership Type,Liikmelisuse tüüp
 ,Reqd By Date,Reqd By Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Võlausaldajad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Võlausaldajad
 DocType: Assessment Plan,Assessment Name,Hinnang Nimi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Kuva PDC prindis
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Kuva PDC prindis
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial No on kohustuslik
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Punkt Wise Maksu- Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Tööpakkumine
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Instituut lühend
 ,Item-wise Price List Rate,Punkt tark Hinnakiri Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kogus ({0}) ei saa olla vaid murdosa reas {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kogus ({0}) ei saa olla vaid murdosa reas {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
@@ -4724,7 +4759,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Kokku Dispersioon
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Kui on lubatud, siis süsteem postitada raamatupidamiskirjeteks inventuuri automaatselt."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Maakleritasu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Osalemine töötajate {0} on juba märgistatud sellel päeval
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Osalemine töötajate {0} on juba märgistatud sellel päeval
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",protokoll Uuendatud kaudu &quot;Aeg Logi &#39;
 DocType: Customer,From Lead,Plii
@@ -4735,6 +4770,7 @@
 DocType: Lab Test,Approved Date,Heakskiidetud kuupäev
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
+DocType: Subscriber,Subscriber Name,Abonendi nimi
 DocType: Serial No,Out of Warranty,Out of Garantii
 DocType: BOM Update Tool,Replace,Vahetage
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Tooteid ei leidu.
@@ -4744,19 +4780,18 @@
 DocType: Request for Quotation Item,Project Name,Projekti nimi
 DocType: Customer,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kuluna
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Vali intressitulu konto töötaja laenus {0}
 DocType: Work Order,Required Items,VAJAMINEVA
 DocType: Stock Ledger Entry,Stock Value Difference,Stock väärtuse erinevused
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Inimressurss
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Makse leppimise maksmine
 DocType: Disease,Treatment Task,Ravi ülesanne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,TULUMAKSUVARA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,TULUMAKSUVARA
 DocType: BOM Item,BOM No,Bom pole
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Päevikusissekanne {0} ei ole kontot {1} või juba sobivust teiste voucher
 DocType: Item,Moving Average,Libisev keskmine
 DocType: BOM Update Tool,The BOM which will be replaced,BOM mis asendatakse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektroonikaseadmete
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektroonikaseadmete
 DocType: Asset,Maintenance Required,Nõutav hooldus
 DocType: Account,Debit,Deebet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Lehed tuleb eraldada kordselt 0,5"
@@ -4765,7 +4800,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Tasumata Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Määra eesmärgid Punkt Group tark selle müügi isik.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Varud vanem kui [Päeva]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rida # {0}: vara on kohustuslik põhivara ost / müük
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rida # {0}: vara on kohustuslik põhivara ost / müük
 DocType: Asset Maintenance Team,Maintenance Team Name,Hooldus meeskonna nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Kui kaks või enam Hinnakujundus reeglid on vastavalt eespool nimetatud tingimustele, Priority rakendatakse. Prioriteet on number vahemikus 0 kuni 20, kui default väärtus on null (tühi). Suurem arv tähendab, et see on ülimuslik kui on mitu Hinnakujundus reeglite samadel tingimustel."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Klient on kohustuslik, kui klient on valitud võimalusest"
@@ -4774,19 +4809,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laske järgmised kasutajad kinnitada Jäta taotlused blokeerida päeva.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tüübid kulude langus.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Müük määr eset {0} on madalam tema {1}. Müük kiirus olema atleast {2}
-DocType: Item,Taxes,Maksud
+DocType: Subscription,Taxes,Maksud
 DocType: Purchase Invoice,capital goods,kapitalikaubad
 DocType: Purchase Invoice Item,Weight Per Unit,Kaal ühiku kohta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Paide ja ei ole esitanud
 DocType: Project,Default Cost Center,Vaikimisi Cost Center
-DocType: Bank Guarantee,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock tehingud
 DocType: Budget,Budget Accounts,Eelarve Accounts
 DocType: Employee,Internal Work History,Sisemine tööandjad
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumuleeritud kulum summa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Tarnija tulemuskaardi muutuja
-DocType: Employee Loan,Fully Disbursed,täielikult välja
 DocType: Employee Advance,Due Advance Amount,Nõuetekohane ettemakse
 DocType: Maintenance Visit,Customer Feedback,Kliendi tagasiside
 DocType: Account,Expense,Kulu
@@ -4810,7 +4843,7 @@
 ,Employee Information,Töötaja Information
 DocType: Stock Entry Detail,Additional Cost,Lisakulu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Tee Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Tee Tarnija Tsitaat
 DocType: Quality Inspection,Incoming,Saabuva
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Müügile ja ostule pääseb alla maksumallid.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Hindamise tulemuste register {0} on juba olemas.
@@ -4818,7 +4851,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Määrake Company filtreerida tühjaks, kui rühm Autor on &quot;Firma&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Postitamise kuupäev ei saa olla tulevikus
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} ei ühti {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,korduvate andmete genereerimiseks
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Aadress
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Lõpupäev
@@ -4843,11 +4875,10 @@
 DocType: Material Request,% Ordered,% Tellitud
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursuse aluseks Student Group, muidugi on kinnitatud iga tudeng õpib Kursused programmi Registreerimine."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Tükitöö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Keskm. Ostmine Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Keskm. Ostmine Rate
 DocType: Share Balance,From No,Alates nr
 DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
 DocType: Employee,History In Company,Ajalugu Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Uus saatja {sender}
 DocType: Customer,Customer Primary Address,Kliendi peamine aadress
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Infolehed
 DocType: Drug Prescription,Description/Strength,Kirjeldus / tugevus
@@ -4856,22 +4887,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Sama toode on kantud mitu korda
 DocType: Department,Leave Block List,Jäta Block loetelu
 DocType: Purchase Invoice,Tax ID,Maksu- ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Punkt {0} ei ole setup Serial nr. Kolonn peab olema tühi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Punkt {0} ei ole setup Serial nr. Kolonn peab olema tühi
 DocType: Accounts Settings,Accounts Settings,Kontod Seaded
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,kinnitama
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted aadress {0}, siis määrata jätkata."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted aadress {0}, siis määrata jätkata."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Uue konto number, lisatakse see konto nime eesliide"
 DocType: Maintenance Team Member,Team Member,Meeskonna liige
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Ei esitata tulemust
 DocType: Customer,Sales Partner and Commission,Müük Partner ja komisjoni
-DocType: Employee Loan,Rate of Interest (%) / Year,Intressimäär (%) / Aasta
+DocType: Loan,Rate of Interest (%) / Year,Intressimäär (%) / Aasta
 ,Project Quantity,projekti Kogus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;"
 DocType: Opportunity,To Discuss,Arutama
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ühikut {1} vaja {2} tehingu lõpuleviimiseks.
 DocType: Loan Type,Rate of Interest (%) Yearly,Intressimäär (%) Aastane
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Ajutise konto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Black
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Ajutise konto
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Explosion toode
 DocType: Shareholder,Contact List,Kontaktide nimekiri
 DocType: Account,Auditor,Audiitor
@@ -4879,16 +4910,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} tooted on valmistatud
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Lisateave
 DocType: Cheque Print Template,Distance from top edge,Kaugus ülemine serv
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Hinnakiri {0} on keelatud või ei ole olemas
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Hinnakiri {0} on keelatud või ei ole olemas
 DocType: Purchase Invoice,Return,Tagasipöördumine
 DocType: Pricing Rule,Disable,Keela
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Maksmise viis on kohustatud makse
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Maksmise viis on kohustatud makse
 DocType: Project Task,Pending Review,Kuni Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Muutke täislehelt rohkem võimalusi, nagu vara, seerianumbrid, partiid jne"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Ametikohad ja konsultatsioonid
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei kaasati Partii {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei saa lammutada, sest see on juba {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Nõutavad kontrollid
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Nõutavad kontrollid
 DocType: Task,Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark leidu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Ettevõtte seadistamine ebaõnnestus
@@ -4900,7 +4931,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Lisa esemed
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Lisa esemed
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Taimed ja maad
 DocType: Cheque Print Template,Regular,regulaarne
 DocType: Fertilizer,Density (if liquid),Tihedus (kui vedelik)
@@ -4925,24 +4956,26 @@
 DocType: Payment Entry,Paid Amount,Paide summa
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Tutvuge müügitsükliga
 DocType: Assessment Plan,Supervisor,juhendaja
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Hoidlate sissekanne
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Hoidlate sissekanne
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
 ,Work Order Stock Report,Töökorralduse aruanne
+DocType: Purchase Receipt,Auto Repeat Detail,Automaatne korduv detail
 DocType: Assessment Result Tool,Assessment Result Tool,Hinnang Tulemus Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Juhendajana
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Soovita kategooria
 DocType: BOM Scrap Item,BOM Scrap Item,Bom Vanametalli toode
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kvaliteedijuhtimine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kvaliteedijuhtimine
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} on keelatud
 DocType: Project,Total Billable Amount (via Timesheets),Kogu tasuline kogus (ajaveebide kaudu)
 DocType: Agriculture Task,Previous Business Day,Eelmine tööpäev
-DocType: Employee Loan,Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood
+DocType: Loan,Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood
 DocType: Employee,Health Insurance No,Ravikindlustuse nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Palun sisestage koguse Punkt {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreeditarve Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreeditarve Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Kogu maksustatav summa
 DocType: Employee External Work History,Employee External Work History,Töötaja Väline tööandjad
 DocType: Opening Invoice Creation Tool,Purchase,Ostu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance Kogus
@@ -4953,15 +4986,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ja {1}
 DocType: Healthcare Settings,Valid number of days,Kehtiv päevade arv
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kulukeskuste
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Taaskäivitage liitumine
 DocType: Land Unit,Linked Plant Analysis,Seotud taimeanalüüs
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hinda kus tarnija valuuta konverteeritakse ettevõtte baasvaluuta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: ajastus on vastuolus rea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Luba Zero Hindamine Rate
+DocType: Bank Guarantee,Receiving,Vastuvõtmine
 DocType: Training Event Employee,Invited,Kutsutud
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Mitu aktiivset palk Struktuurid leiti töötaja {0} jaoks antud kuupäeva
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway kontosid.
 DocType: Employee,Employment Type,Tööhõive tüüp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Põhivara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Põhivara
 DocType: Payment Entry,Set Exchange Gain / Loss,Määra Exchange kasum / kahjum
 ,GST Purchase Register,GST Ostu Registreeri
 ,Cash Flow,Rahavoog
@@ -4981,9 +5016,10 @@
 DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Kõigi aktsiate tehingute nimekiri
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Krahv
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Saadame teile {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Tuleb määrata nii katseperioodi alguskuupäev kui ka katseperioodi lõppkuupäev
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Keskmine määr
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksete kogusumma maksegraafikus peab olema võrdne Suur / Ümardatud Kokku
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksete kogusumma maksegraafikus peab olema võrdne Suur / Ümardatud Kokku
+DocType: Subscription Plan Detail,Plan,Plaan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
 DocType: Job Applicant,Applicant Name,Taotleja nimi
 DocType: Authorization Rule,Customer / Item Name,Klienditeenindus / Nimetus
@@ -5013,6 +5049,7 @@
 DocType: Work Order,Warehouses,Laod
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} vara ei saa üle
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotelli toa hinnakujundus
+DocType: Subscription,Days Until Due,Päevad Kuni Nõue
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,See toode on variant {0} (Template).
 DocType: Workstation,per hour,tunnis
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ostmine
@@ -5021,13 +5058,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Ravimipartii põhineb Student Group, Student Partii on kinnitatud igale õpilasele programmist Registreerimine."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ladu ei saa kustutada, kuna laožurnaal kirjet selle lattu."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribution
+DocType: Journal Entry Account,Loan,Laen
 DocType: Expense Claim Advance,Expense Claim Advance,Kulude nõude ettemakse
 DocType: Lab Test,Report Preference,Aruande eelistus
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Vabatahtlike teave.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektijuht
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektijuht
 ,Quoted Item Comparison,Tsiteeritud Punkt võrdlus
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Kattuvus punktides {0} ja {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max allahindlust lubatud kirje: {0} on {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Puhasväärtuse nii edasi
 DocType: Crop,Produce,Toota
@@ -5037,7 +5075,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materjalitarbimine valmistamiseks
 DocType: Item Alternative,Alternative Item Code,Alternatiivne tootekood
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Roll, mis on lubatud esitada tehinguid, mis ületavad laenu piirmäärade."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Vali Pane Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Vali Pane Tootmine
 DocType: Delivery Stop,Delivery Stop,Kättetoimetamise peatamine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
 DocType: Item,Material Issue,Materjal Issue
@@ -5047,15 +5085,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Seep ja Detergent
 DocType: BOM,Show Items,Näita Esemed
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Time ei saa olla suurem kui ajalt.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Kas soovite teavitada kõiki kliente e-posti teel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Kas soovite teavitada kõiki kliente e-posti teel?
+DocType: Subscription Plan,Billing Interval,Arveldusperiood
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Jätka
 DocType: Hub Settings,Hub Username,Hubi kasutajanimi
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hindamiskriteeriumid Group
 DocType: Healthcare Settings,Patient Name By,Patsiendi nimi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal sissekanne palkade eest alates {0} kuni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal sissekanne palkade eest alates {0} kuni {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
 DocType: Warehouse,Warehouse Name,Ladu nimi
 DocType: Naming Series,Select Transaction,Vali Tehing
@@ -5069,22 +5107,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Siin saate säilitada pikkus, kaal, allergia, meditsiini muresid etc"
 DocType: Leave Block List,Applies to Company,Kehtib Company
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
-DocType: Employee Loan,Disbursement Date,Väljamakse kuupäev
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Saajaid&quot; pole täpsustatud
+DocType: Loan,Disbursement Date,Väljamakse kuupäev
 DocType: BOM Update Tool,Update latest price in all BOMs,Värskendage viimaseid hindu kõigis kaitsemeetmetes
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Meditsiiniline kirje
 DocType: Vehicle,Vehicle,sõiduk
 DocType: Purchase Invoice,In Words,Sõnades
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Enne esitamist sisestage panga või krediidiasutuse nimi.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} tuleb esitada
 DocType: POS Profile,Item Groups,Punkt Groups
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Täna on {0} &#39;s sünnipäeva!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Täna on {0} &#39;s sünnipäeva!
 DocType: Sales Order Item,For Production,Tootmiseks
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Palun lisage ajutine avamise konto arveldusarvele
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Palun lisage ajutine avamise konto arveldusarvele
 DocType: Customer,Customer Primary Contact,Kliendi esmane kontakt
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Perioodi lõpetamise ajakiri
 DocType: Project Task,View Task,Vaata Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plii%
+DocType: Bank Guarantee,Bank Guarantee Type,Pangagarantii tüüp
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Arve osa
 ,Asset Depreciations and Balances,Asset Amortisatsiooniaruanne ja Kaalud
@@ -5095,9 +5134,8 @@
 DocType: Production Plan,Include Subcontracted Items,Kaasa alltöövõtuga seotud üksused
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,liituma
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Variandi omadusi pole võimalik vahetada pärast aktsiate üleviimist. Selle tegemiseks peate tegema uue punkti.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
-DocType: Employee Loan,Repay from Salary,Tagastama alates Palk
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+DocType: Loan,Repay from Salary,Tagastama alates Palk
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
 DocType: Salary Slip,Salary Slip,Palgatõend
@@ -5121,11 +5159,11 @@
 DocType: Employee Education,Employee Education,Töötajate haridus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate kirje rühm leidis elemendi rühma tabelis
 DocType: Land Unit,Parent Land Unit,Vanemate maaüksus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Fertilizer,Fertilizer Name,Väetise nimi
 DocType: Salary Slip,Net Pay,Netopalk
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} on juba saanud
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial No {0} on juba saanud
 ,Requested Items To Be Transferred,Taotletud üleantavate
 DocType: Expense Claim,Vehicle Log,Sõidukite Logi
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Palaviku olemasolu (temp&gt; 38,5 ° C / 101,3 ° F või püsiv temp&gt; 38 ° C / 100,4 ° F)"
@@ -5166,24 +5204,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
 DocType: Asset Maintenance,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Invoice,Raw Materials Supplied,Tarnitud tooraine
-DocType: C-Form,Series,Sari
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Hinnakirja {0} vääring peab olema {1} või {2}
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
 DocType: Driver,License Number,Litsentsi number
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Hooldus Külasta Purpose
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Arve Patsiendi registreerimine
 DocType: Crop,Period,Periood
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,General Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Töötaja {0} puhkusel {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Töötaja {0} puhkusel {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vaata Leads
 DocType: Program Enrollment Tool,New Program,New Program
 DocType: Item Attribute Value,Attribute Value,Omadus Value
 ,Itemwise Recommended Reorder Level,Itemwise Soovitatav Reorder Level
 DocType: Salary Detail,Salary Detail,palk Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Palun valige {0} Esimene
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Palun valige {0} Esimene
 DocType: Appointment Type,Physician,Arst
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultatsioonid
@@ -5191,15 +5228,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ei tohi olla suurem kui kavandatud kogus ({2}) töökorralduses {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Aeg Sheet valmistamiseks.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,osakokkuvõte
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Variandi omadusi pole võimalik vahetada pärast aktsiatehingut. Selle tegemiseks peate tegema uue punkti.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA volitus
 DocType: Physician,Charges,Süüdistused
 DocType: Production Plan,Get Items For Work Order,Hankige tooteid töökorralduseks
 DocType: Salary Detail,Default Amount,Vaikimisi summa
 DocType: Lab Test Template,Descriptive,Kirjeldav
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Ladu ei leitud süsteemis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Ladu ei leitud süsteemis
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Selle kuu kokkuvõte
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Määrake müügieesmärk, mida soovite oma ettevõtte jaoks saavutada."
 ,Project wise Stock Tracking,Projekti tark Stock Tracking
@@ -5227,11 +5265,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Veebisaidi loomine ebaõnnestus
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry on juba loodud või Proovi Kogus pole esitatud
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry on juba loodud või Proovi Kogus pole esitatud
 DocType: Program,Program Abbreviation,programm lühend
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti
 DocType: Warranty Claim,Resolved By,Lahendatud
-DocType: Bank Guarantee,Start Date,Alguskuupäev
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Eraldada lehed perioodiks.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tšekid ja hoiused valesti puhastatud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0} Te ei saa määrata ise vanemakonto
@@ -5246,11 +5283,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Tööaeg
 DocType: Project,Expected Start Date,Oodatud Start Date
 DocType: Purchase Invoice,04-Correction in Invoice,04-korrigeerimine arvel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Töökorraldus on juba loodud kõigi BOM-iga üksustega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Töökorraldus on juba loodud kõigi BOM-iga üksustega
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variandi üksikasjade aruanne
 DocType: Setup Progress Action,Setup Progress Action,Seadista edu toiming
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Ostute hinnakiri
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Ostute hinnakiri
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Eemalda kirje, kui makse ei kohaldata selle objekti"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Tellimuse tühistamine
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Palun valige Hooldus olek lõpule viidud või eemaldage lõpuleviimise kuupäev
 DocType: Supplier,Default Payment Terms Template,Makseviiside vaikimisi mall
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Tehingu vääring peab olema sama Payment Gateway valuuta
@@ -5261,7 +5299,6 @@
 DocType: Employee,Educational Qualification,Haridustsensus
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Action, kui kogunenud Kuu eelarve ületatud"
-DocType: Subscription,Submit on creation,Esitada kohta loomine
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
 DocType: Asset,Disposal Date,müügikuupäevaga
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Kirjad saadetakse kõigile aktiivsetele Ettevõtte töötajad on teatud tunnil, kui neil ei ole puhkus. Vastuste kokkuvõte saadetakse keskööl."
@@ -5279,6 +5316,7 @@
 DocType: Batch,Parent Batch,Vanem Partii
 DocType: Cheque Print Template,Cheque Print Template,Tšekk Prindi Mall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Graafik kulukeskuste
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Enne tellimuse tühistamist või tellimuse märkimist tasumata on mitu päeva pärast arve kuupäeva möödumist
 DocType: Lab Test Template,Sample Collection,Proovide kogu
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
 DocType: Price List,Price List Name,Hinnakiri nimi
@@ -5287,7 +5325,7 @@
 DocType: Account,Income,Sissetulek
 DocType: Industry Type,Industry Type,Tööstuse Tüüp
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Midagi läks valesti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Hoiatus: Jäta taotlus sisaldab järgmist plokki kuupäev
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Hoiatus: Jäta taotlus sisaldab järgmist plokki kuupäev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Müügiarve {0} on juba esitatud
 DocType: Supplier Scorecard Scoring Criteria,Score,tulemus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Eelarveaastal {0} ei ole olemas
@@ -5307,12 +5345,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale profiili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} peaks olema väärtus vahemikus 0 kuni 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Järgmine amortisatsiooni kuupäev ei saa olla enne kasutatavat kuupäeva
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Tagatiseta laenud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Tagatiseta laenud
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max tööaeg vastu Töögraafik
 DocType: Maintenance Schedule Detail,Scheduled Date,Tähtajad
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Kokku Paide Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Kokku Paide Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Teated enam kui 160 tähemärki jagatakse mitu sõnumit
 DocType: Purchase Receipt Item,Received and Accepted,Saanud ja heaks kiitnud
 DocType: Hub Settings,Company and Seller Profile,Ettevõtte ja müüja profiil
@@ -5326,10 +5364,9 @@
 DocType: Item,Variant Based On,Põhinev variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Sinu Tarnijad
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Palun parandage
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
 DocType: Request for Quotation Item,Supplier Part No,Tarnija osa pole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonüümne
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Saadud
 DocType: Lead,Converted,Converted
@@ -5343,6 +5380,7 @@
 DocType: Asset,Assets,Varad
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
+DocType: Subscription,Current Invoice End Date,Praegune arve lõppkuupäev
 DocType: Payment Term,Due Date Based On,Tähtpäev põhineb
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Palun määrake müügi seadete kaudu vaikimisi kliendirühm ja -territoorium
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ei eksisteeri
@@ -5350,7 +5388,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Eseme: {0} ei eksisteeri süsteemis
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Teil ei ole seada Külmutatud väärtus
 DocType: Payment Reconciliation,Get Unreconciled Entries,Võta unreconciled kanded
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Ajakirjanikele ei valitud tagasimakseid
 DocType: Payment Reconciliation,From Invoice Date,Siit Arve kuupäev
+DocType: Loan,Disbursed,Välja makstud
 DocType: Healthcare Settings,Laboratory Settings,Laboratoorsed sätted
 DocType: Patient Appointment,Service Unit,Teenindusüksus
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Tarnija on edukalt määranud
@@ -5363,12 +5403,12 @@
 DocType: Share Balance,No of Shares,Aktsiate arv
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Valige olek
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: School House,House Name,House Nimi
 DocType: Fee Schedule,Total Amount per Student,Summa üliõpilase kohta
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektriline
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektriline
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisa oma ülejäänud organisatsiooni kasutajatele. Võite lisada ka kutsuda kliente oma portaalis lisades neid Kontaktid
 DocType: Stock Entry,Total Value Difference (Out - In),Kokku Väärtus Difference (Out - In)
 DocType: Grant Application,Requested Amount,Taotletav summa
@@ -5378,7 +5418,7 @@
 DocType: Crop Cycle,Detected Diseases,Tuvastatud haigused
 DocType: Stock Entry,Default Source Warehouse,Vaikimisi Allikas Warehouse
 DocType: Item,Customer Code,Kliendi kood
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
 DocType: Asset Maintenance Task,Last Completion Date,Viimase täitmise kuupäev
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
@@ -5386,9 +5426,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless seaded
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Stock Assets
 DocType: Restaurant,Active Menu,Aktiivne menüü
 DocType: Target Detail,Target Qty,Target Kogus
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Laenu vastu: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Minu tellimused seaded
 DocType: Student Attendance,Present,Oleviku
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Toimetaja märkus {0} ei tohi esitada
@@ -5397,9 +5438,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
 DocType: Vehicle Log,Odometer,odomeetri
 DocType: Production Plan Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Bom ei sisalda laoartikkel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Bom ei sisalda laoartikkel
 DocType: Chapter,Chapter Head,Peatükk Head
 DocType: Payment Term,Month(s) after the end of the invoice month,Kuu (kuud) pärast arve kuu lõppu
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projekti tegevus / ülesanne.
@@ -5407,11 +5448,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Loo palgalehed
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab tulemuse kuupäeva ei saa olla enne katse kuupäeva määramist
 DocType: POS Profile,Allow user to edit Discount,Luba kasutajal muuta soodustust
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Hankige kliente
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Hankige kliente
 DocType: Purchase Invoice Item,Include Exploded Items,Kaasa lõhutud esemed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
 DocType: Shipping Rule,Restrict to Countries,Riigid piirduvad
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Arved Tundi
 DocType: Project,Total Sales Amount (via Sales Order),Müügi kogusumma (müügitellimuse kaudu)
@@ -5428,6 +5470,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Hindamisjuht
 DocType: Payment Entry,Allocate Payment Amount,Eraldada Makse summa
+DocType: Subscription Plan,Subscription Plan,Liitumisplaan
 DocType: Employee External Work History,Salary,Palk
 DocType: Serial No,Delivery Document Type,Toimetaja Dokumendi liik
 DocType: Sales Order,Partly Delivered,Osaliselt Tarnitakse
@@ -5452,9 +5495,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Vananemine Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Eelseadistuste installimine
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Kliendi jaoks pole valitud tarne märkust {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Kliendi jaoks pole valitud tarne märkust {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Bom asendatakse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,"Valige üksused, mis põhinevad kohaletoimetamise kuupäeval"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,"Valige üksused, mis põhinevad kohaletoimetamise kuupäeval"
 DocType: Grant Application,Has any past Grant Record,Kas on minevikus Grant Record
 ,Sales Analytics,Müük Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Saadaval {0}
@@ -5472,7 +5515,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tarnitud tooraine kulu
 DocType: Selling Settings,Settings for Selling Module,Seaded Müük Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelli toa reserveerimine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kasutajatugi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kasutajatugi
 DocType: BOM,Thumbnail,Pisipilt
 DocType: Item Customer Detail,Item Customer Detail,Punkt Kliendi Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Pakkuda kandidaat tööd.
@@ -5488,7 +5531,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Õpilased on registreeritud
 DocType: Fees,Student Details,Õpilase üksikasjad
 DocType: Purchase Invoice Item,Stock Qty,stock Kogus
-DocType: Employee Loan,Repayment Period in Months,Tagastamise tähtaeg kuudes
+DocType: Loan,Repayment Period in Months,Tagastamise tähtaeg kuudes
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Viga: Ei kehtivat id?
 DocType: Naming Series,Update Series Number,Värskenda seerianumbri
 DocType: Account,Equity,Omakapital
@@ -5497,7 +5540,7 @@
 DocType: Task,Closing Date,Lõpptähtaeg
 DocType: Sales Order Item,Produced Quantity,Toodetud kogus
 DocType: Timesheet,Work Detail,Töö detailid
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Insener
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Insener
 DocType: Journal Entry,Total Amount Currency,Kokku Summa Valuuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Otsi Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kood nõutav Row No {0}
@@ -5542,13 +5585,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Anduri tüübi andmed.
 DocType: Request for Quotation,Supplier Detail,tarnija Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Viga valemis või seisund: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Arve kogusumma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Arve kogusumma
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteeriumide kaalud peavad sisaldama kuni 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Osavõtt
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,stock Kirjed
 DocType: BOM,Materials,Materjalid
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Kui ei kontrollita, nimekirja tuleb lisada iga osakond, kus tuleb rakendada."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} loomine
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Allikas ja Target Warehouse ei saa olla sama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Postitamise kuupäev ja postitad aega on kohustuslik
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Maksu- malli osta tehinguid.
@@ -5572,14 +5614,14 @@
 DocType: Shipping Rule,Fixed,Fikseeritud
 DocType: Vehicle Service,Clutch Plate,Siduriketas
 DocType: Company,Round Off Account,Ümardada konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Halduskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Halduskulud
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Konsulteeriv
 DocType: Customer Group,Parent Customer Group,Parent Kliendi Group
-DocType: Journal Entry,Subscription,Tellimine
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Tellimine
 DocType: Purchase Invoice,Contact Email,Kontakt E-
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Tasu loomine ootel
 DocType: Appraisal Goal,Score Earned,Skoor Teenitud
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Etteteatamistähtaeg
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Etteteatamistähtaeg
 DocType: Asset Category,Asset Category Name,Põhivarakategoori Nimi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,See on root territooriumil ja seda ei saa muuta.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Uus Sales Person Nimi
@@ -5592,7 +5634,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Jäta märkimata, kui sa ei taha kaaluda partii tehes muidugi rühmi."
 DocType: Asset,Frequency of Depreciation (Months),Sagedus kulum (kuud)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Konto kreeditsaldoga
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Konto kreeditsaldoga
 DocType: Landed Cost Item,Landed Cost Item,Maandus kuluartikkel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Näita null väärtused
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kogus punkti saadi pärast tootmise / pakkimise etteantud tooraine kogused
@@ -5600,7 +5642,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
 DocType: Hub Settings,Company Logo,Ettevõtte logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
 DocType: Healthcare Settings,Patient Registration,Patsiendi registreerimine
@@ -5634,11 +5676,10 @@
 DocType: Journal Entry,Total Debit,Kokku Deebet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Vaikimisi valmistoodangu ladu
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Palun vali patsient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,Lisavõimalused
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Eelarve ja Kulukeskus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mitu vaiketüüpi ei ole lubatud
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Selle eest
 ,Appointment Analytics,Kohtumise analüüs
 DocType: Vehicle Service,Half Yearly,Pooleaastane
 DocType: Lead,Blog Subscriber,Blogi Subscriber
@@ -5654,6 +5695,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Jäta tühjaks, kui teete õpilast rühmade aastas"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Kui see on märgitud, kokku ei. tööpäevade hulka puhkusereisid ja see vähendab väärtust Palk päevas"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Praeguse võtmega rakendused ei pääse juurde, kas olete kindel?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Kokku Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Malli koodi muutmine
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term lõppkuupäev ei saa olla varasem tähtaeg Start Date. Palun paranda kuupäev ja proovi uuesti.
@@ -5664,8 +5706,9 @@
 DocType: Opportunity Item,Basic Rate,Põhimäär
 DocType: GL Entry,Credit Amount,Krediidi summa
 DocType: Cheque Print Template,Signatory Position,allakirjutanu seisukoht
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Määra Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Määra Lost
 DocType: Timesheet,Total Billable Hours,Kokku tasustatavat tundi
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Päevade arv, mille jooksul tellija peab selle tellimuse kaudu koostatud arveid maksma"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksekviitung Märkus
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,See põhineb tehingute vastu Klient. Vaata ajakava allpool lähemalt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rida {0}: Eraldatud summa {1} peab olema väiksem või võrdne maksmine Entry summa {2}
@@ -5684,12 +5727,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Võta Viimati ostmise korral
 DocType: Company,Company Info,Firma Info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Valige või lisage uus klient
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Application of Funds (vara)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,See põhineb käimist selle töötaja
 DocType: Assessment Result,Summary,Kokkuvõte
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Marki külastajate arv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Deebetsaldoga konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Deebetsaldoga konto
 DocType: Fiscal Year,Year Start Date,Aasta alguskuupäev
 DocType: Attendance,Employee Name,Töötaja nimi
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorani tellimisseade
@@ -5701,7 +5744,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ostusummast
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Töövõtjate hüvitised
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Töövõtjate hüvitised
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Work Order,Manufactured Qty,Toodetud Kogus
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Aktsiaid ei ole olemas {0}
@@ -5709,12 +5752,12 @@
 DocType: Asset,Out of Order,Korrast ära
 DocType: Purchase Receipt Item,Accepted Quantity,Aktsepteeritud Kogus
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignoreeri tööjaama kattumist
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} pole olemas
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Valige partiinumbritele
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Arveid tõstetakse klientidele.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
 DocType: Patient Service Unit,Medical Administrator,Meditsiiniline administraator
 DocType: Assessment Plan,Schedule,Graafik
 DocType: Account,Parent Account,Parent konto
@@ -5744,15 +5787,16 @@
 DocType: Asset Repair,Repair Status,Remondi olek
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Palun valige Töötaja Record esimene.
 DocType: POS Profile,Account for Change Amount,Konto muutuste summa
 DocType: Purchase Invoice,input service,sisendteenus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Pidu / konto ei ühti {1} / {2} on {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Hooldus meeskonna liige
 DocType: Agriculture Analysis Criteria,Soil Analysis,Mullanalüüs
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kursuse kood:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Palun sisestage ärikohtumisteks
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Palun sisestage ärikohtumisteks
 DocType: Account,Stock,Varu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
 DocType: Employee,Current Address,Praegune aadress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Kui objekt on variant teise elemendi siis kirjeldus, pilt, hind, maksud jne seatakse malli, kui ei ole märgitud"
 DocType: Serial No,Purchase / Manufacture Details,Ostu / Tootmine Detailid
@@ -5800,19 +5844,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Kordadega {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Hooajalisus jaoks eelarveid, eesmärgid jms"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Muutuja Nimi
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
 DocType: Asset,Asset Category,Põhivarakategoori
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Netopalk ei tohi olla negatiivne
 DocType: Purchase Order,Advance Paid,Advance Paide
 DocType: Item,Item Tax,Punkt Maksu-
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materjal Tarnija
 DocType: Soil Texture,Loamy Sand,Loamy Liiv
 DocType: Production Plan,Material Request Planning,Materjalitaotluse planeerimine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Aktsiisi Arve
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Lävepakk {0}% esineb enam kui ühel
 DocType: Expense Claim,Employees Email Id,Töötajad Post Id
 DocType: Employee Attendance Tool,Marked Attendance,Märkimisväärne osavõtt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Lühiajalised kohustused
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Lühiajalised kohustused
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Taimer ületas antud tundide arvu.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Saada mass SMS oma kontaktid
 DocType: Patient,A Positive,Positiivne
@@ -5823,9 +5867,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija ostutellimused peaksid olema ettevaatlikud.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Varahalduse meeskond
-DocType: Employee Loan,Loan Type,laenu liik
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} on edukalt edastatud
+DocType: Loan,Loan Type,laenu liik
 DocType: Scheduling Tool,Scheduling Tool,Ajastus Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Krediitkaart
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Krediitkaart
 DocType: BOM,Item to be manufactured or repacked,Punkt tuleb toota või ümber
 DocType: Employee Education,Major/Optional Subjects,Major / Valik
 DocType: Sales Invoice Item,Drop Ship,Drop Laev
@@ -5857,7 +5902,7 @@
 DocType: Item,Units of Measure,Mõõtühikud
 DocType: Manufacturing Settings,Allow Production on Holidays,Laske Production Holidays
 DocType: Sales Invoice,Customer's Purchase Order Date,Kliendi ostutellimuse kuupäev
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Aktsiakapitali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Aktsiakapitali
 DocType: Shopping Cart Settings,Show Public Attachments,Näita avalikud failid
 DocType: Packing Slip,Package Weight Details,Pakendi kaal Üksikasjad
 DocType: Restaurant Reservation,Reservation Time,Reserveerimise aeg
@@ -5872,7 +5917,7 @@
 DocType: Purchase Order,To Receive and Bill,Saada ja Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rida # {0}: Reqd kuupäeva järgi ei saa olla enne Tehingu kuupäeva
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Soovitatavad tooted
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Projekteerija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Projekteerija
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Tingimused Mall
 DocType: Serial No,Delivery Details,Toimetaja detailid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Cost Center on vaja järjest {0} maksude tabel tüüp {1}
@@ -5882,20 +5927,20 @@
 DocType: Driver,Expiry Date,Aegumisaja
 DocType: Healthcare Settings,Employee name and designation in print,Töötaja nimi ja nimetus prinditud kujul
 ,accounts-browser,kontode brauser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Palun valige kategooria esimene
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Palun valige kategooria esimene
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekti kapten.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Et võimaldada üle-arvete või üle-tellimine, uuendada &quot;toetus&quot; Stock seaded või toode."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pool päeva)
 DocType: Payment Term,Credit Days,Krediidi päeva
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Palun valige laboratsete testide saamiseks patsient
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tee Student Partii
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Võta Kirjed Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Ooteaeg päeva
 DocType: Cash Flow Mapping,Is Income Tax Expense,Kas tulumaksukulu
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Märgi see, kui õpilane on elukoht instituudi Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
 ,Stock Summary,Stock kokkuvõte
@@ -5906,10 +5951,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref kuupäev
 DocType: Employee,Reason for Leaving,Põhjus lahkumiseks
 DocType: BOM Operation,Operating Cost(Company Currency),Ekspluatatsioonikulud (firma Valuuta)
-DocType: Employee Loan Application,Rate of Interest,Intressimäärast
+DocType: Loan Application,Rate of Interest,Intressimäärast
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktsioneeritud summa
 DocType: Item,Shelf Life In Days,Riiulipäev päevades
 DocType: GL Entry,Is Opening,Kas avamine
+DocType: Department,Expense Approvers,Kulude heakskiitmine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
 DocType: Journal Entry,Subscription Section,Tellimishind
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} ei ole olemas
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 1639e1f..a2f8cdf 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,لغو مواد مشاهده {0} قبل از لغو این ادعا گارانتی
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,گزارش های ارزیابی
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,محصولات مصرفی
-DocType: Purchase Receipt,Subscription Detail,جزئیات اشتراک
 DocType: Supplier Scorecard,Notify Supplier,اطلاع رسانی کننده
 DocType: Item,Customer Items,آیتم های مشتری
 DocType: Project,Costing and Billing,هزینه یابی و حسابداری
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب مرجع {1} می تواند یک دفتر نمی
 DocType: Item,Publish Item to hub.erpnext.com,مورد انتشار hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ایمیل اخبار
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ارزیابی
 DocType: Item,Default Unit of Measure,واحد اندازه گیری پیش فرض
 DocType: SMS Center,All Sales Partner Contact,اطلاعات تماس تمام شرکای فروش
-DocType: Employee,Leave Approvers,ترک Approvers
+DocType: Department,Leave Approvers,ترک Approvers
 DocType: Sales Partner,Dealer,دلال
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,تحقیقات
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,بررسی در دسترس بودن
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,این است که در معاملات در برابر این کننده است. مشاهده جدول زمانی زیر برای جزئیات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,حقوقی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},مالیات واقعی نوع می تواند در میزان مورد در ردیف شامل نمی شود {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,حقوقی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},مالیات واقعی نوع می تواند در میزان مورد در ردیف شامل نمی شود {0}
 DocType: Bank Guarantee,Customer,مشتری
 DocType: Purchase Receipt Item,Required By,مورد نیاز
 DocType: Delivery Note,Return Against Delivery Note,بازگشت علیه تحویل توجه داشته باشید
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سر (یا گروه) که در برابر مطالب حسابداری ساخته شده است و توازن حفظ می شوند.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,هیچ پردازش حقوق و دستمزد ارائه نشده است.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,هیچ پردازش حقوق و دستمزد ارائه نشده است.
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,نشان می دهد باز
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ضروری است که امروز این اقدام را برای تکرار در بالا ذکر کنیم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,سری به روز رسانی با موفقیت
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,وارسی
 DocType: Pricing Rule,Apply On,درخواست در
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,همه با منبع تماس با
 DocType: Support Settings,Support Settings,تنظیمات پشتیبانی
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,دسته ای مورد وضعیت انقضاء
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,حواله بانکی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,حواله بانکی
 DocType: Membership,membership validaty section,عضویت معتبر بخش
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 DocType: Consultation,Consultation,مشاوره
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ماده
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ساخت وب سایت
 DocType: Opening Invoice Creation Tool Item,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),وام (بدهی)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
 DocType: Item,Country of Origin,کشور مبدا
 DocType: Soil Texture,Soil Texture Criteria,معیارهای بافت خاک
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,اطلاعات تماس اولیه
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,مسائل باز
 DocType: Production Plan Item,Production Plan Item,تولید مورد طرح
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
 DocType: Lab Test Groups,Add new line,اضافه کردن خط جدید
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,بهداشت و درمان
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),تاخیر در پرداخت (روز)
@@ -89,7 +85,7 @@
 ,Delay Days,روزهای تأخیر
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,فاکتور
+DocType: Subscription Invoice,Invoice,فاکتور
 DocType: Purchase Invoice Item,Item Weight Details,مورد وزن جزئیات
 DocType: Asset Maintenance Log,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ردیف # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ردیف # {0}:
 DocType: Timesheet,Total Costing Amount,مبلغ کل هزینه یابی
 DocType: Delivery Note,Vehicle No,خودرو بدون
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,لطفا لیست قیمت را انتخاب کنید
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,کار در حال انجام
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,لطفا تاریخ را انتخاب کنید
 DocType: Daily Work Summary Group,Holiday List,فهرست تعطیلات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,حسابدار
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,حسابدار
 DocType: Hub Settings,Selling Price List,لیست قیمت فروش
 DocType: Patient,Tobacco Current Use,مصرف فعلی توتون و تنباکو
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,قیمت فروش
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,قیمت فروش
 DocType: Cost Center,Stock User,سهام کاربر
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,تلفن
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},جدید {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,هشدار ایمیل اولیه ارسال شد
 ,Sales Partners Commission,کمیسیون همکاران فروش
 DocType: Soil Texture,Sandy Clay Loam,خاک رس شن و ماسه
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ارزش پس از استهلاک
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,مربوط
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,تاریخ حضور و غیاب نمی تواند کمتر از تاریخ پیوستن کارکنان
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,تاریخ حضور و غیاب نمی تواند کمتر از تاریخ پیوستن کارکنان
 DocType: Grading Scale,Grading Scale Name,درجه بندی نام مقیاس
-DocType: Subscription,Repeat on Day,تکرار در روز
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,این یک حساب ریشه است و نمی تواند ویرایش شود.
 DocType: Sales Invoice,Company Address,آدرس شرکت
 DocType: BOM,Operations,عملیات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},آیا می توانم مجوز بر اساس تخفیف برای تنظیم نشده {0}
+DocType: Subscription,Subscription Start Date,تاریخ شروع اشتراک
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ضمیمه. CSV فایل با دو ستون، یکی برای نام قدیمی و یکی برای نام جدید
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} در هر سال مالی فعال.
 DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و مادر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",مرجع: {0}، کد مورد: {1} و ضوابط: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,تاریخ پایان دوره آزمایشی نمی تواند قبل از دوره آزمایشی تاریخ شروع شود
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,کیلوگرم
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,باز کردن برای یک کار.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM برای قرارداد قراردادن {0} در ردیف {1} مشخص نشده است
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Patient,Married,متاهل
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},برای مجاز نیست {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,گرفتن اقلام از
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,گرفتن اقلام از
 DocType: Price List,Price Not UOM Dependant,قیمت وابسته به UOM نیست
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,روغن ترمز
 DocType: Tax Rule,Tax Type,نوع مالیات
 ,Completed Work Orders,سفارشات کاری کامل شده است
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,مبلغ مشمول مالیات
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,مبلغ مشمول مالیات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: BOM,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ردیف # {0}: نوع سند مرجع باید یکی از ادعای هزینه یا ورود مجله باشد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,انتخاب BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ردیف # {0}: نوع سند مرجع باید یکی از ادعای هزینه یا ورود مجله باشد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,انتخاب BOM
 DocType: SMS Log,SMS Log,SMS ورود
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,مقدار پیش پرداخت شده به کارمند را مدیریت کنید
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,اعلان تحویل
 DocType: Journal Entry,Opening Entry,ورود افتتاح
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب پرداخت تنها
-DocType: Employee Loan,Repay Over Number of Periods,بازپرداخت تعداد بیش از دوره های
+DocType: Loan,Repay Over Number of Periods,بازپرداخت تعداد بیش از دوره های
 DocType: Stock Entry,Additional Costs,هزینه های اضافی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
 DocType: Lead,Product Enquiry,پرس و جو محصولات
 DocType: Education Settings,Validate Batch for Students in Student Group,اعتبارسنجی دسته ای برای دانش آموزان در گروه های دانشجویی
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},هیچ سابقه مرخصی پیدا شده برای کارکنان {0} برای {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},هیچ سابقه مرخصی پیدا شده برای کارکنان {0} برای {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,لطفا ابتدا وارد شرکت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
 DocType: Employee Education,Under Graduate,مقطع
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,لطفا قالب پیش فرض برای اعلام وضعیت وضعیت ترک در تنظیمات HR تعیین کنید.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,هدف در
 DocType: BOM,Total Cost,هزینه کل
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,کارمند وام
 DocType: Fee Schedule,Send Payment Request Email,ارسال درخواست پرداخت درخواست
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,عقار
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,موفق به ثبت نام نشده است
 DocType: Assessment Result,Grade,مقطع تحصیلی
 DocType: Restaurant Table,No of Seats,بدون صندلی
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","برای اضافه کردن موضوع پویا، از برچسب جینجا مانند <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: Asset Maintenance Task,Asset Maintenance Task,وظیفه تعمیر و نگهداری دارایی
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,حقوق سالانه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,حقوق سالانه
 DocType: Daily Work Summary,Daily Work Summary,خلاصه کار روزانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} فریز شده است
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,هزینه سهام
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,هزینه سهام
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,انتخاب هدف انبار
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,لطفا وارد ترجیحی ایمیل تماس
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,لطفا وارد ترجیحی ایمیل تماس
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,کنترا ورود
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,آدرس اولیه
 DocType: Production Plan,Material Request Detail,جزئیات درخواست مواد
 DocType: Selling Settings,Default Quotation Validity Days,روز معتبر نقل قول
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: Sales Invoice,Change Amount,تغییر مقدار
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,دسته بندی مجوز رانندگی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,لطفا تاریخ تحویل را وارد کنید
 DocType: Depreciation Schedule,Make Depreciation Entry,ورود استهلاک
+DocType: HR Settings,Leave Settings,تنظیمات را ترک کنید
 DocType: Appraisal Template Goal,KRA,ناحیه جنوبی
 DocType: Lead,Request Type,درخواست نوع
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,کارمند
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,رادیو و تلویزیون
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),حالت راه اندازی POS (آنلاین / آفلاین)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,ایجاد گزارشهای زمان در برابر سفارشات کاری غیر فعال می شود. عملیات نباید در برابر سفارش کار انجام شود
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,اعدام
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,اعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,جزئیات عملیات انجام شده است.
 DocType: Asset Maintenance Log,Maintenance Status,وضعیت نگهداری
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,جزئیات عضویت
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: عرضه کننده به حساب پرداختنی مورد نیاز است {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,اقلام و قیمت گذاری
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},کل ساعت: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
 DocType: Drug Prescription,Interval,فاصله
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ترجیح
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ترجیح
 DocType: Grant Application,Individual,فردی
 DocType: Academic Term,Academics User,کاربر آکادمیک
 DocType: Cheque Print Template,Amount In Figure,مقدار در شکل
-DocType: Employee Loan Application,Loan Info,وام اطلاعات
+DocType: Loan Application,Loan Info,وام اطلاعات
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,برنامه ریزی برای بازدیدکننده داشته است نگهداری.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,دوره کارت امتیازی تامین کننده
 DocType: Share Transfer,Share Transfer,انتقال به اشتراک بگذارید
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,الگو مورد
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,بیوشیمی
 DocType: Job Offer,Select Terms and Conditions,انتخاب شرایط و ضوابط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ارزش از
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ارزش از
 DocType: Woocommerce Settings,Woocommerce Settings,تنظیمات Woocommerce
 DocType: Production Plan,Sales Orders,سفارشات فروش
 DocType: Purchase Taxes and Charges,Valuation,ارزیابی
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,منطقه پیش فرض
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,تلویزیون
 DocType: Work Order Operation,Updated via 'Time Log',به روز شده از طریق &#39;زمان ورود &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,مشتری یا تامین کننده را انتخاب کنید.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,مجله کد
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
 DocType: Company,Enable Perpetual Inventory,فعال کردن موجودی دائمی
+DocType: Bank Guarantee,Charges Incurred,اتهامات ناشی شده است
 DocType: Company,Default Payroll Payable Account,به طور پیش فرض حقوق و دستمزد پرداختنی حساب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,به روز رسانی ایمیل گروه
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,نتیجه سفارشی
 DocType: Delivery Stop,Contact Name,تماس با نام
 DocType: Course Assessment Criteria,Course Assessment Criteria,معیارهای ارزیابی دوره
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,شناسه مالیات:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,شناسه مالیات:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,شناسه دانشجویی:
 DocType: POS Customer Group,POS Customer Group,POS و ضوابط گروه
 DocType: Land Unit,Land Unit describing various land assets,واحد زمین توضیح دارایی های مختلف زمین
@@ -374,9 +371,8 @@
 ,Open Work Orders,دستور کار باز است
 DocType: Payment Term,Credit Months,ماه های اعتباری
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,پرداخت خالص نمی تواند کمتر از 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",برای جلوگیری از ارسال اعلان های خطای تکراری از سیستم، فیلد Disabled را در اشتراک ثبت نام کرده ایم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,برگ در سال
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,برگ در سال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
 DocType: Email Digest,Profit & Loss,سود و زیان
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,لطفا دانشجویان را در گروه های دانشجویی قرار دهید
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,مطالب بانک
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,مطالب بانک
 DocType: Crop,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,دوره دانشجویی گروه ابزار ایجاد
 DocType: Lead,Do Not Contact,آیا تماس با نه
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,افرادی که در سازمان شما آموزش
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,نرم افزار توسعه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,نرم افزار توسعه
 DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Course Scheduling Tool,Course Start Date,البته تاریخ شروع
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,انتشار در توپی
 DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,جزئیات خرید
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,حداکثر درجه
 DocType: Email Digest,New Quotations,نقل قول جدید
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,لغزش ایمیل حقوق و دستمزد به کارکنان را بر اساس ایمیل مورد نظر در انتخاب کارمند
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 DocType: Tax Rule,Shipping County,حمل و نقل شهرستان
-apps/erpnext/erpnext/config/desktop.py +167,Learn,فرا گرفتن
+apps/erpnext/erpnext/config/desktop.py +159,Learn,فرا گرفتن
 DocType: Asset,Next Depreciation Date,بعدی تاریخ استهلاک
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,چک برجسته و سپرده برای روشن
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
 DocType: Driver,Fleet Manager,ناوگان مدیر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},ردیف # {0}: {1} نمی تواند برای قلم منفی {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},ردیف # {0}: {1} نمی تواند برای قلم منفی {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},لطفا قیمت اتاق هتل را برای {} تنظیم کنید
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Opening Invoice Creation Tool,Invoice Type,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,رسید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,رسید
 DocType: Consultation,Encounter Impression,معمای مواجهه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,هزینه دارایی فروخته شده
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
 DocType: Course Scheduling Tool,Course Scheduling Tool,البته برنامه ریزی ابزار
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[فوری] خطا هنگام ایجاد٪ s برای٪ s تکرار می شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
 DocType: Land Unit,LInked Analysis,تحلیل لاینک
 DocType: Item Tax,Tax Rate,نرخ مالیات
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,دوره درخواست نمی تواند در دو رکورد تخصیص باشد
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,دوره درخواست نمی تواند در دو رکورد تخصیص باشد
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,٪ دریافتی
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ایجاد گروه دانشجویی
 DocType: Volunteer,Weekends,آخر هفته ها
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,اعتباری میزان
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,اعتباری میزان
 DocType: Setup Progress Action,Action Document,سند عملی
 DocType: Chapter Member,Website URL,آدرس وب سایت
 ,Finished Goods,محصولات تمام شده
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext نسخه ی نمایشی
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,اضافه کردن محصولات
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,پارامتر بازرسی کیفیت مورد
+DocType: Leave Application,Leave Approver Name,ترک نام تصویب
 DocType: Depreciation Schedule,Schedule Date,برنامه زمانبندی عضویت
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",درآمد، کسر و دیگر اجزای حقوق
 DocType: Packed Item,Packed Item,مورد بسته بندی شده
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
 DocType: Healthcare Settings,Require Lab Test Approval,تصویب آزمایشی آزمایش مورد نیاز است
 DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,مجموع برجسته
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,مجموع برجسته
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
 DocType: Dosage Strength,Strength,استحکام
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ایجاد یک مشتری جدید
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,هزینه مصرفی
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
 DocType: Student Log,Medical,پزشکی
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,دلیل برای از دست دادن
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,دلیل برای از دست دادن
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,شماره حساب را به روز کنید
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,مالک سرب نمی تواند همان سرب
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,تک
 DocType: Salary Slip,Total Loan Repayment,مجموع بازپرداخت وام
 DocType: Account,Cost of Goods Sold,هزینه کالاهای فروخته شده
-DocType: Subscription,Yearly,سالیانه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا وارد مرکز هزینه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,لطفا وارد مرکز هزینه
 DocType: Drug Prescription,Dosage,مصرف
 DocType: Journal Entry Account,Sales Order,سفارش فروش
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,میانگین نرخ فروش
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,میانگین نرخ فروش
 DocType: Assessment Plan,Examiner Name,نام امتحان
 DocType: Lab Test Template,No Result,هیچ نتیجه
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,لطفا ابتدا نام شرکت وارد
 DocType: Purchase Invoice,Supplier Name,نام منبع
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,خواندن کتابچه راهنمای کاربر ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,نمایش برگ همه اعضای گروه در تقویم
 DocType: Purchase Invoice,01-Sales Return,01 فروش بازگشت
 DocType: Account,Is Group,گروه
 DocType: Email Digest,Pending Purchase Orders,در انتظار سفارشات خرید
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,فیلد اجباری - سال تحصیلی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} با {2} {3} ارتباط ندارد
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,سفارشی کردن متن مقدماتی است که می رود به عنوان یک بخشی از آن ایمیل. هر معامله دارای یک متن مقدماتی جداگانه.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},لطفا پیش فرض حساب های قابل پرداخت تعیین شده برای شرکت {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},لطفا پیش فرض حساب های قابل پرداخت تعیین شده برای شرکت {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},معامله در برابر کار متوقف نمی شود {0}
 DocType: Setup Progress Action,Min Doc Count,شمارش معکوس
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,محفوظ برای فروش
 DocType: Packing Slip,From Package No.,از شماره بسته بندی
 DocType: Item Attribute,To Range,به محدوده
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",می توانید از روش ارزشگذاری را تغییر دهید، به عنوان معاملات در برابر برخی از موارد که آن را ندارد وجود دارد روش ارزشگذاری خود است
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,اوراق بهادار و سپرده ها
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",می توانید از روش ارزشگذاری را تغییر دهید، به عنوان معاملات در برابر برخی از موارد که آن را ندارد وجود دارد روش ارزشگذاری خود است
 DocType: Student Report Generation Tool,Attended by Parents,حضور والدین
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Patient,AB Positive,مثبت AB
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ثبت حضور و غیاب.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,کامپوننت حقوق و دستمزد حقوق و دستمزد بر اساس برنامه زمانی برای.
 DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
-DocType: Employee Loan,Total Payment,مبلغ کل قابل پرداخت
+DocType: Loan,Total Payment,مبلغ کل قابل پرداخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,معامله برای سفارش کار کامل لغو نمی شود.
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} لغو می شود پس از عمل نمی تواند تکمیل شود
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,قطعات اندازه کافی برای ساخت
 DocType: POS Profile User,POS Profile User,کاربر پروفایل POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,درآمد مستقیم
+DocType: Subscription Invoice,Subscription Invoice,اشتراک فاکتور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,درآمد مستقیم
 DocType: Patient Appointment,Date TIme,زمان قرار
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,افسر اداری
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,افسر اداری
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ایجاد شرکت و مالیات
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,لطفا دوره را انتخاب کنید
 DocType: Codification Table,Codification Table,جدول کدگذاری
 DocType: Timesheet Detail,Hrs,ساعت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,لطفا انتخاب کنید شرکت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Stock Entry Detail,Difference Account,حساب تفاوت
 DocType: Purchase Invoice,Supplier GSTIN,کننده GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,الگو گردش مالی نقدی
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
+DocType: Bank Guarantee,Providing,فراهم آوردن
 DocType: Account,Profit and Loss,حساب سود و زیان
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",مجاز نیست، قالب آزمایش آزمایشی را طبق الزامات پیکربندی کنید
 DocType: Patient,Risk Factors,عوامل خطر
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 DocType: Healthcare Settings,Appointment Confirmation,تایید انتصاب
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),بسته شدن (کروم)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,سلام
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,انتقال مورد
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",در حال حاضر پیش فرض در پروفایل پروفایل {0} برای کاربر {1} تنظیم شده است، به طور پیش فرض غیر فعال شده است
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ارزش انباشته
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,قلمرو مورد نیاز در مشخصات POS است
 DocType: Supplier,Prevent RFQs,جلوگیری از RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,را سفارش فروش
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},لغزش حقوق برای دوره ای از {0} تا {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},لغزش حقوق برای دوره ای از {0} تا {1}
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,تاریخ ارسال بیل
 DocType: Production Plan,Production Plan,برنامه تولید
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,افتتاح حساب ایجاد ابزار
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,برگشت فروش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,برگشت فروش
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,توجه: مجموع برگ اختصاص داده {0} نباید کمتر از برگ حال حاضر مورد تایید {1} برای دوره
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,مقدار در معاملات را بر اساس سریال بدون ورودی تنظیم کنید
 ,Total Stock Summary,خلاصه سهام مجموع
 DocType: Announcement,Posted By,ارسال شده توسط
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,لطفا مجموعه ای از شرکت
 DocType: Share Balance,Share Balance,تعادل سهم
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Training Result Employee,Training Result Employee,کارمند آموزش نتیجه
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
-DocType: Repayment Schedule,Principal Amount,مقدار اصلی
-DocType: Employee Loan Application,Total Payable Interest,مجموع بهره قابل پرداخت
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,مقدار اصلی
+DocType: Loan Application,Total Payable Interest,مجموع بهره قابل پرداخت
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},مجموع برجسته: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاکتور فروش برنامه زمانی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
 DocType: Restaurant Reservation,Restaurant Reservation,رزرو رستوران
 DocType: Land Unit,Land Unit Name,نام واحد زمین
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,نوشتن طرح های پیشنهادی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,نوشتن طرح های پیشنهادی
 DocType: Payment Entry Deduction,Payment Entry Deduction,پرداخت کسر ورود
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,بسته شدن
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,اطلاع از مشتریان از طریق ایمیل
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,اطلاع از مشتریان از طریق ایمیل
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,یک نفر دیگر فروش {0} با شناسه کارمند همان وجود دارد
 DocType: Employee Advance,Claimed Amount,مقدار ادعا شده
 apps/erpnext/erpnext/config/education.py +180,Masters,کارشناسی ارشد
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",پرداخت حساب دروازه ایجاد نمی کند، لطفا یک دستی ایجاد کنید.
 DocType: Supplier Scorecard,Per Year,در سال
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,برای پذیرش در این برنامه به عنوان DOB واجد شرایط نیست
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 DocType: Sales Invoice,Sales Taxes and Charges,مالیات فروش و هزینه ها
 DocType: Employee,Organization Profile,نمایش سازمان
 DocType: Vital Signs,Height (In Meter),ارتفاع (در متر)
 DocType: Student,Sibling Details,جزییات خواهر و برادر
 DocType: Vehicle Service,Vehicle Service,خدمات خودرو
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,به صورت خودکار درخواست بازخورد بر اساس شرایط باعث.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,به صورت خودکار درخواست بازخورد بر اساس شرایط باعث.
 DocType: Employee,Reason for Resignation,دلیل استعفای
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,الگو برای ارزیابی عملکرد.
 DocType: Sales Invoice,Credit Note Issued,اعتباری صادر شده
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,برنامه نگهداری و تعمیرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",مشاهده قوانین سپس قیمت گذاری بر اساس مشتری، مشتری گروه، منطقه، تامین کننده، تامین کننده نوع، کمپین، فروش شریک و غیره فیلتر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,تغییر خالص در پرسشنامه
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,کارمند مدیریت وام
 DocType: Employee,Passport Number,شماره پاسپورت
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ارتباط با Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدیر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,مدیر
 DocType: Payment Entry,Payment From / To,پرداخت از / به
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},لطفا حساب را در Warehouse تنظیم کنید {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,انتقال مواد
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,مسیر برای پیدا نشد
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),افتتاح (دکتر)
+DocType: Loan,Applicant,درخواست کننده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},مجوز های ارسال و زمان باید بعد {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,برای ایجاد اسناد تکراری
 ,GST Itemised Purchase Register,GST جزء به جزء خرید ثبت نام
 DocType: Course Scheduling Tool,Reschedule,مجدد برنامه
-DocType: Employee Loan,Total Interest Payable,منافع کل قابل پرداخت
+DocType: Loan,Total Interest Payable,منافع کل قابل پرداخت
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,مالیات هزینه فرود آمد و اتهامات
 DocType: Work Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: BOM Operation,Operation Time,زمان عمل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,پایان
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,پایه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,پایه
 DocType: Timesheet,Total Billed Hours,جمع ساعت در صورتحساب یا لیست
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,ارسال فعال مقدار
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,ارسال فعال مقدار
 DocType: Leave Block List Allow,Allow User,اجازه می دهد کاربر
 DocType: Journal Entry,Bill No,شماره صورتحساب
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب کاهش / افزایش در دفع دارایی
 DocType: Vehicle Log,Service Details,جزئیات خدمات
-DocType: Subscription,Quarterly,فصلنامه
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,گروه بندی شده
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ورقه ثبت ساعات کار
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush مواد اولیه بر اساس
 DocType: Sales Invoice,Port Code,کد پورت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,انبار رزرو
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,انبار رزرو
 DocType: Lead,Lead is an Organization,سرب یک سازمان است
 DocType: Guardian Interest,Interest,علاقه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پیش فروش
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,حساب ها
 DocType: Vehicle,Odometer Value (Last),ارزش کیلومترشمار (آخرین)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,قالب بندی معیارهای کارت امتیازی تامین کننده.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,بازار یابی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,بازار یابی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
 DocType: Request for Quotation,Get Suppliers,تهیه کنندگان
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,پیش نمایش لغزش حقوق
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,پیش نمایش لغزش حقوق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,شما فقط می توانید تمدید کنید اگر عضویت شما در 30 روز منقضی شود
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,فقط اگر شما اسناد Flow Mapper را تنظیم کرده اید، انتخاب کنید
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Supplier Scorecard,Per Week,در هفته
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,دانش آموز مجموعا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Ficier Des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,ورود کارت اعتباری
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,شرکت و حساب
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,با ارزش
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,با ارزش
 DocType: Asset Settings,Depreciation Options,گزینه های تخفیف
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,زمان ارسال نامعتبر
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,زمان ارسال نامعتبر
 DocType: Lead,Campaign Name,نام کمپین
 DocType: Hotel Room,Capacity,ظرفیت
 DocType: Selling Settings,Close Opportunity After Days,نزدیک فرصت پس از چند روز
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,مشتری سفارش خرید بدون
 DocType: Budget,Budget Against,بودجه علیه
 DocType: Employee,Cell Number,شماره همراه
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,برای معیارهای داده شده هیچ کارمند وجود ندارد چک کنید که حقوق و دستمزد قبلا ایجاد نشده است.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,برای معیارهای داده شده هیچ کارمند وجود ندارد چک کنید که حقوق و دستمزد قبلا ایجاد نشده است.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,درخواست مواد تولید خودکار
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"شما نمی توانید سند هزینه جاری را  در ستون""علیه مجله "" وارد کنید"
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,لطفا یک جدول را انتخاب کنید
 DocType: BOM,Website Specifications,مشخصات وب سایت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} یک آدرس ایمیل نا معتبردر «گیرندگان» است
 DocType: Special Test Items,Particulars,جزئيات
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قوانین هزینه های متعدد را با معیارهای همان وجود دارد، لطفا حل و فصل درگیری با اختصاص اولویت است. قوانین قیمت: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Asset,Maintenance,نگهداری
+DocType: Subscriber,Subscriber,مشترک
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,لطفا وضعیت پروژه خود را به روز کنید
 DocType: Item,Maximum sample quantity that can be retained,حداکثر تعداد نمونه که می تواند حفظ شود
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,تنظیمات پیش فرض برای سبد خرید
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,اضافه کردن Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},دارایی اوراق از طریق ورود مجله {0}
-DocType: Employee Loan,Interest Income Account,حساب درآمد حاصل از بهره
+DocType: Loan,Interest Income Account,حساب درآمد حاصل از بهره
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,مرور دعوت نامه ارسال شده است
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,بیوتکنولوژی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,هزینه نگهداری و تعمیرات دفتر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,هزینه نگهداری و تعمیرات دفتر
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,برو به
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,راه اندازی حساب ایمیل
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Asset Repair,Downtime,خرابی
 DocType: Account,Liability,مسئوليت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,شرایط تحصیلی:
 DocType: Salary Detail,Do not include in total,در مجموع شامل نمی شود
 DocType: Company,Default Cost of Goods Sold Account,به طور پیش فرض هزینه از حساب کالاهای فروخته شده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},مقدار نمونه {0} نمیتواند بیش از مقدار دریافتی باشد {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,لیست قیمت انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Request for Quotation Supplier,Send Email,ارسال ایمیل
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 DocType: Item,Max Sample Quantity,حداکثر تعداد نمونه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,بدون اجازه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,بدون اجازه
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,درخواست نقل قول
 DocType: Vital Signs,Heart Rate / Pulse,ضربان قلب / پالس
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,آزمایشات آزمایشگاهی و علائم حیاتی
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,بدون کارمند یافت
-DocType: Subscription,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,به روز رسانی پروژه.
 DocType: SMS Center,All Customer Contact,همه مشتری تماس
 DocType: Land Unit,Tree Details,جزییات درخت
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,همه گروه مورد
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Work Order,Item To Manufacture,آیتم را ساخت
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} وضعیت {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",در صورتی که آدرس انتخاب شده پس از ذخیره ویرایش، مجددا انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 DocType: Item,Hub Publishing Details,جزئیات انتشار هاب
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;افتتاح&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;افتتاح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
 DocType: Lab Test Template,Result Format,فرمت نتیجه
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,مجلهای که دوماه یکبار منتشر میشود
 DocType: Vehicle Service,Brake Pad,لنت ترمز
 DocType: Fertilizer,Fertilizer Contents,محتویات کود
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,تحقیق و توسعه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,تحقیق و توسعه
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,مقدار به بیل
 DocType: Company,Registration Details,جزییات ثبت نام
 DocType: Timesheet,Total Billed Amount,مبلغ کل صورتحساب
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,برای جلوگیری از محدودیت اعتبار در سفارش فروش
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,ارزیابی عملکرد.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",فعال کردن «استفاده برای سبد خرید، به عنوان سبد خرید فعال باشد و باید حداقل یک قانون مالیاتی برای سبد خرید وجود داشته باشد
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ورود پرداخت {0} است که در برابر سفارش {1}، بررسی کنید که آن را باید به عنوان پیش در این فاکتور کشیده مرتبط است.
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ورود پرداخت {0} است که در برابر سفارش {1}، بررسی کنید که آن را باید به عنوان پیش در این فاکتور کشیده مرتبط است.
 DocType: Sales Invoice Item,Stock Details,جزئیات سهام
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ارزش پروژه
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,نقطه از فروش
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,حداقل صندلی
 DocType: Item Attribute,Item Attribute Values,مقادیر ویژگی مورد
 DocType: Examination Result,Examination Result,نتیجه آزمون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,رسید خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},مرجع DOCTYPE باید یکی از شود {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Work Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} باید فعال باشد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,هیچ موردی برای انتقال وجود ندارد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} باید فعال باشد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,هیچ موردی برای انتقال وجود ندارد
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),بسته شدن (باز کردن + مجموع)
 DocType: Journal Entry,Depreciation Entry,ورود استهلاک
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
 DocType: Crop Cycle,ISO 8016 standard,ایزو 8016 استاندارد
 DocType: Pricing Rule,Rate or Discount,نرخ یا تخفیف
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مورد نیاز تعداد
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,مورد علاقه های شما
 DocType: Hub Settings,Custom Data,داده های سفارشی
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,کد استاندارد پزشکی
 DocType: Soil Texture,Clay Composition (%),ترکیب خشت (٪)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,لطفا قبل از اختصاص دادن کار ذخیره کنید.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ارزش موجودی
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ارزش موجودی
 DocType: Lab Test,Lab Technician,تکنیسین آزمایشگاه
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,فهرست قیمت فروش
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",در صورت چک، یک مشتری ایجاد خواهد شد، به بیمار نقشه گذاری می شود. صورتحساب بیمار علیه این مشتری ایجاد خواهد شد. شما همچنین می توانید مشتریان موجود را هنگام ایجاد بیمار انتخاب کنید.
 DocType: Bank Reconciliation,Account Currency,حساب ارزی
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,لطفا در شرکت گرد حساب فعال ذکر
 DocType: Purchase Receipt,Range,محدوده
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
 DocType: Item Barcode,Item Barcode,بارکد مورد
 DocType: Woocommerce Settings,Endpoints,نقطه پایانی
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",تولید می شود اگر به تأخیر افتاده است، شما باید به صورت دستی قسمت &quot;تکرار در روز ماه&quot; را تغییر دهید
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
 DocType: Share Transfer,From Folio No,از Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,فاکتور خرید پیشرفته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,تاریخ موجود بودن برای استفاده
 DocType: Guardian,Guardian Name,نام و نام خانوادگی سرپرست
 DocType: Cheque Print Template,Has Print Format,است چاپ فرمت
-DocType: Employee Loan,Sanctioned,تحریم
+DocType: Loan,Sanctioned,تحریم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,این مورد الزامی است. شاید مقدار تبدیل ارز برایش ایجاد نشده است
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
 DocType: Crop Cycle,Crop Cycle,چرخه محصول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",برای آیتم های &#39;محصولات بسته نرم افزاری، انبار، سریال و بدون دسته بدون خواهد شد از&#39; بسته بندی فهرست جدول در نظر گرفته. اگر انبار و دسته ای بدون برای همه آیتم ها بسته بندی مورد هر &#39;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",برای آیتم های &#39;محصولات بسته نرم افزاری، انبار، سریال و بدون دسته بدون خواهد شد از&#39; بسته بندی فهرست جدول در نظر گرفته. اگر انبار و دسته ای بدون برای همه آیتم ها بسته بندی مورد هر &#39;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
 DocType: Student Admission,Publish on website,انتشار در وب سایت
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,تاریخ عرضه فاکتور نمی تواند بیشتر از ارسال تاریخ
+DocType: Subscription,Cancelation Date,تاریخ لغو
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
 DocType: Agriculture Task,Agriculture Task,وظیفه کشاورزی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,درآمد غیر مستقیم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,درآمد غیر مستقیم
 DocType: Student Attendance Tool,Student Attendance Tool,ابزار حضور دانش آموز
 DocType: Restaurant Menu,Price List (Auto created),لیست قیمت (خودکار ایجاد شده)
 DocType: Cheque Print Template,Date Settings,تنظیمات تاریخ
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,متر
 DocType: Workstation,Electricity Cost,هزینه برق
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,datetime آزمایشی آزمایش قبل از تاریخ date collection نمی تواند باشد
+DocType: Subscription Plan,Cost,هزینه
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
 DocType: Expense Claim,Total Advance Amount,مجموع پیشامد
 DocType: Delivery Stop,Estimated Arrival,زمان تقریبی رسیدن به مقصد
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
 DocType: Timesheet Detail,Bill,لایحه
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,سفید
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,سفید
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,شما فقط می توانید حداکثر یک گزینه را از لیست کادرهای انتخاب انتخاب کنید.
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
 DocType: Item,Automatically Create New Batch,به طور خودکار ایجاد دسته جدید
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),اختصاص دادن {0} به {1} (ردیف {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,ساخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),اختصاص دادن {0} به {1} (ردیف {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,ساخت
 DocType: Student Admission,Admission Start Date,پذیرش تاریخ شروع
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,کارمند جدید
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
 DocType: Repayment Schedule,Balance Loan Amount,تعادل وام مبلغ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,دوره برنامه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,گزینه های سهام
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,گزینه های سهام
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,غیرفعال گرفتن آخرین اطلاعات خرید در سفارش خرید
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
 DocType: Purchase Invoice,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},لطفا مشخص {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,ایجاد واژگان در صف قرار دارد.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},خلاصه کار برای {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,جدول ویژگی الزامی است
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,اولین تایید کننده خروج در لیست خواهد شد به عنوان پیش فرض خروج امتحان تنظیم شده است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Plan,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} نمی تواند منفی باشد
 DocType: Training Event,Self-Study,خودخوان
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,مزد
 DocType: Asset Maintenance,Maintenance Manager Name,نام مدیر تعمیر و نگهداری
 DocType: Agriculture Task,Urgent,فوری
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},لطفا یک ID ردیف معتبر برای ردیف {0} در جدول مشخص {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},لطفا یک ID ردیف معتبر برای ردیف {0} در جدول مشخص {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,قادر به پیدا کردن متغیر نیست
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,لطفا یک فیلد برای ویرایش از numpad انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,نمی توان یک مورد دارایی ثابت به عنوان Stock Ledger ایجاد کرد.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,نام بازخورد کیفیت نام
 DocType: Project,First Email,اولین ایمیل
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,فروش مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,فروش مقدار
 DocType: Repayment Schedule,Interest Amount,مقدار بهره
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Share Transfer,Issue,موضوع
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 ,Projected Quantity as Source,تعداد بینی به عنوان منبع
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,سفر تحویل
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,سفر تحویل
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,نوع انتقال
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,هزینه فروش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,هزینه فروش
 DocType: Consultation,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,شریک اجرای
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,کد پستی
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},سفارش فروش {0} است {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},حساب سود را در وام انتخاب کنید {0}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
 DocType: Item,Default Supplier,به طور پیش فرض تامین کننده
 DocType: Manufacturing Settings,Over Production Allowance Percentage,بر تولید درصد کمک هزینه
-DocType: Employee Loan,Repayment Schedule,برنامه بازپرداخت
+DocType: Loan,Repayment Schedule,برنامه بازپرداخت
 DocType: Shipping Rule Condition,Shipping Rule Condition,حمل و نقل قانون وضعیت
 DocType: Holiday List,Get Weekly Off Dates,دریافت هفتگی فعال تاریخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,تاریخ پایان نمی تواند کمتر از تاریخ شروع
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
 DocType: Education Settings,Attendance Freeze Date,حضور و غیاب یخ تاریخ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,همه محصولات
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,همه محصولات
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),حداقل سن منجر (روز)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,همه BOM ها
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},اتاق هتل نوع {0} در {1} در دسترس نیست
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,از کارمند
 DocType: Driver,Cellphone Number,شماره تلفن همراه
 DocType: Project,Monitor Progress,مانیتور پیشرفت
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
+DocType: Supplier Quotation,Auto Repeat Section,بخش تکرار خودکار
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
 DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
 DocType: Program Enrollment,Transportation,حمل و نقل
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ویژگی معتبر نیست
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} باید قطعی شود
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
+DocType: Department Approver,Department Approver,تأیید کننده گروه
 DocType: SMS Center,Total Characters,مجموع شخصیت
 DocType: Employee Advance,Claimed,ادعا شده
 DocType: Crop,Row Spacing,فاصله ردیف
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,پرداخت آشتی فاکتور
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,سهم٪
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",همانطور که در تنظیمات از خرید اگر سفارش خرید مورد نیاز == &quot;YES&quot;، پس از آن برای ایجاد خرید فاکتور، کاربر نیاز به ایجاد سفارش خرید برای اولین بار در مورد {0}
+,HSN-wise-summary of outward supplies,HSN-wise خلاصه ای از منابع خارجی
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,شماره ثبت شرکت برای رجوع کنید. شماره مالیاتی و غیره
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,نام عمل
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,سال شروع
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},نخست 2 رقم از GSTIN باید با تعداد دولت مطابقت {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,تاریخ دوره صورتحساب فعلی شروع
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ظرفیت خطا برنامه ریزی
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,زمینه ها تنها در زمان ایجاد ایجاد می شوند.
 DocType: Setup Progress Action,Domains,دامنه
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,اداره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,اداره
 DocType: Cheque Print Template,Payer Settings,تنظیمات پرداخت کننده
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
 DocType: Purchase Invoice,Is Return,آیا بازگشت
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,احتیاط
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',روز شروع است بیشتر از پایان روز در کار {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,بازگشت / دبیت توجه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,بازگشت / دبیت توجه
 DocType: Price List Country,Price List Country,لیست قیمت کشور
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,کد مورد می تواند برای شماره سریال نمی تواند تغییر
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,کد مورد می تواند برای شماره سریال نمی تواند تغییر
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM عامل تبدیل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,لطفا کد کالا وارد کنید برای دریافت شماره بچ
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
-DocType: Employee Loan,Partially Disbursed,نیمه پرداخت شده
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,دادن اطلاعات
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,دادن اطلاعات
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پایگاه داده تامین کننده.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,شما نمی توانید اشتراک را لغو کنید.
 DocType: Account,Balance Sheet,ترازنامه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
 DocType: Fee Validity,Valid Till,تاخیر معتبر
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,مجموع تدریس معلم والدین
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,تغییر گروه مشتری برای مشتری انتخاب شده مجاز نیست.
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,به روز رسانی زمان ورود برآورد شده
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,به روز رسانی زمان ورود برآورد شده
 DocType: Program Enrollment Tool,Enrollment Details,جزئیات ثبت نام
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,لطفا یک مشتری را انتخاب کنید
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Purchase Order,Group same items,گروه اقلام مشابه
 DocType: Purchase Invoice,Disable Rounded Total,غیر فعال کردن گرد مجموع
-DocType: Employee Loan Application,Repayment Info,اطلاعات بازپرداخت
+DocType: Department,Parent Department,والدین
+DocType: Loan Application,Repayment Info,اطلاعات بازپرداخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
 DocType: Maintenance Team Member,Maintenance Role,نقش تعمیر و نگهداری
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,سال مالی {0} یافت نشد
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,سال مالی {0} یافت نشد
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,راه اندازی کارکنان
 DocType: Sales Order,SO-,بنابراین-
 DocType: Hotel Room Reservation,Hotel Reservation User,کاربر رزرو هتل
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,پژوهش
+DocType: Subscription Settings,Subscription Settings,تنظیمات اشتراک
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,پژوهش
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Announcement,All Students,همه ی دانش آموزان
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Crop Cycle,Less than a year,کمتر از یک سال
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,شماره دانشجویی موبایل
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 DocType: Crop,Yield UOM,عملکرد UOM
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
 DocType: Item,Is Item from Hub,مورد از مرکز است
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ردیف {0}: نوع فعالیت الزامی است.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,سود سهام پرداخت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,سود سهام پرداخت
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,حسابداری لجر
 DocType: Stock Reconciliation,Difference Amount,مقدار تفاوت
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},دکتر {0} در ترک {1}
 DocType: Purchase Invoice,Reverse Charge,هزینه با مقصد تماس
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,سود انباشته
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,سود انباشته
 DocType: Purchase Invoice,05-Change in POS,05-تغییر در POS
 DocType: Vehicle Log,Service Detail,جزئیات خدمات
 DocType: BOM,Item Description,مورد توضیحات
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,مورد فرصت
 ,Student and Guardian Contact Details,دانشجویی و نگهبان اطلاعات تماس
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ردیف {0}: عرضه کننده {0} آدرس ایمیل مورد نیاز برای ارسال ایمیل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,افتتاح موقت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,افتتاح موقت
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,مراکز نمایش
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 DocType: Patient Appointment,More Info,اطلاعات بیشتر
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},نرخ ارزش گذاری مورد نیاز برای مورد در ردیف {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},نرخ ارزش گذاری مورد نیاز برای مورد در ردیف {0}
 DocType: Supplier Scorecard,Scorecard Actions,اقدامات کارت امتیازی
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,به عنوان مثال: کارشناسی ارشد در رشته علوم کامپیوتر
 DocType: Purchase Invoice,Rejected Warehouse,انبار را رد کرد
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,به
 DocType: Supplier Quotation Item,Lead Time in days,سرب زمان در روز
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},پرداخت حقوق و دستمزد از {0} به {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},پرداخت حقوق و دستمزد از {0} به {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,آزمایشات آزمایشی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,کوچک
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,کوچک
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,آیتم ابزار ایجاد فاکتور افتتاح شد
 DocType: Education Settings,Employee Number,شماره کارمند
+DocType: Subscription Settings,Cancel Invoice After Grace Period,لغو صورتحساب بعد از تمدید دوره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
 DocType: Project,% Completed,٪ تکمیل شده
 ,Invoiced Amount (Exculsive Tax),مقدار صورتحساب (Exculsive مالیات)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,آزمایشی آزمایشگاه Datetime
 DocType: Email Digest,Add Quote,افزودن پیشنهاد قیمت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,هزینه های غیر مستقیم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 DocType: Agriculture Analysis Criteria,Agriculture,کشاورزی
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,همگام سازی داده های کارشناسی ارشد
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,تجهیزات سرمایه
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,لطفا ابتدا کد مورد را تنظیم کنید
 DocType: Item,ITEM-,آیتم
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
+DocType: Subscription Plan,Billing Interval Count,تعداد واسطهای صورتحساب
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 DocType: Antibiotic,Antibiotic,آنتی بیوتیک
 ,Team Updates,به روز رسانی تیم
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,درست چاپ فرمت
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS مورد گروه
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,مورد جایگزین نباید همانند کد آیتم باشد
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-نهایی شدن ارزیابی موقت
 DocType: Salary Slip,Bank Account No.,شماره حساب بانکی
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,ایستگاه های کاری
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,درخواست برای عرضه دیگر
 DocType: Healthcare Settings,Registration Message,پیام ثبت نام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,سخت افزار
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,سخت افزار
 DocType: Prescription Dosage,Prescription Dosage,نسخه تجویزی
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,لطفا یک شرکت را انتخاب کنید
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,تاریخ شروع و پایان
 ,Delivered Items To Be Billed,آیتم ها تحویل داده شده به صورتحساب می شود
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},گسترش BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
 DocType: Project Update,Great/Quickly,بزرگ / سریع
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,لطفا دسته مورد برای بسته بندی های کوچک را انتخاب کنید
 DocType: Asset,Depreciation Schedules,برنامه استهلاک
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,حسابهای زیر ممکن است در تنظیمات GST انتخاب شوند:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,حسابهای زیر ممکن است در تنظیمات GST انتخاب شوند:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
 DocType: Payment Request,Transaction Currency,واحد ارز تراکنش
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},از {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,اوسط روزانه خروجی
 DocType: POS Profile,Campaign,کمپین
 DocType: Supplier,Name and Type,نام و نوع
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
 DocType: Physician,Contacts and Address,مخاطبین و آدرس
 DocType: Purchase Invoice,Contact Person,شخص تماس
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,واجد شرایط بودن و جزئیات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,از تاریخ ساعت
 DocType: Email Digest,For Company,برای شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ورود به سیستم ارتباطات.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",درخواست برای نقل قول به دسترسی از پورتال غیر فعال است، برای اطلاعات بیشتر تنظیمات پورتال چک.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,متغیر رتبه بندی کارت امتیازی تامین کننده
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,مقدار خرید
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,مقدار خرید
 DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,اشتباهاتی در ایجاد برنامه درس وجود داشت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,اولین تأیید کننده هزینه در لیست خواهد بود به عنوان پیش فرض هزینه گذار تنظیم شده است.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,کد بسته بندی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,شاگرد
 DocType: Purchase Invoice,Company GSTIN,شرکت GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,تعداد منفی مجاز نیست
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,تعداد منفی مجاز نیست
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",مالیات جدول جزئیات ذهن از آیتم های کارشناسی ارشد به عنوان یک رشته و ذخیره شده در این زمینه. مورد استفاده برای مالیات و هزینه
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب منجمد است، ورودی ها را به کاربران محدود شده مجاز می باشد.
 DocType: Email Digest,Bank Balance,بانک تعادل
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,خروج از تأیید کننده در مورد درخواست اجباری
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، شرایط مورد نیاز و غیره
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,مدت زمان پرداخت در سطر {0} احتمالا یک تکراری است.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),کشاورزی (بتا)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,بسته بندی لغزش
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,اجاره دفتر
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,اجاره دفتر
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
 DocType: Disease,Common Name,نام متداول
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
 DocType: Vital Signs,Blood Pressure,فشار خون
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,روانکاو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,روانکاو
 DocType: Item,Inventory,فهرست
 DocType: Item,Sales Details,جزییات فروش
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,اعتبارسنجی ثبت نام دوره برای دانش آموزان در گروه های دانشجویی
 DocType: Notification Control,Expense Claim Rejected,ادعای هزینه رد
 DocType: Item,Item Attribute,صفت مورد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,دولت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,دولت
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,هزینه ادعای {0} در حال حاضر برای ورود خودرو وجود دارد
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,نام موسسه
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,لطفا مقدار بازپرداخت وارد کنید
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,لطفا مقدار بازپرداخت وارد کنید
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,انواع آیتم
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,خدمات
 DocType: HR Settings,Email Salary Slip to Employee,ایمیل لغزش حقوق و دستمزد به کارکنان
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,انتخاب کننده ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,انتخاب کننده ممکن
 DocType: Sales Invoice,Source,منبع
 DocType: Customer,"Select, to make the customer searchable with these fields",انتخاب کنید تا مشتری را با این فیلدها جستجو کنید
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,نمایش بسته
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری
 DocType: Program Course,Program Course,دوره برنامه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 DocType: Homepage,Company Tagline for website homepage,شرکت شعار برای صفحه اصلی وب سایت
 DocType: Item Group,Item Group Name,مورد نام گروه
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,گرفته
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,جزئیات ماهیت
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),لطفا تمام مقادیر مورد نیاز را وارد کنید
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
-DocType: Employee Loan,Monthly Repayment Amount,میزان بازپرداخت ماهانه
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
+DocType: Loan,Monthly Repayment Amount,میزان بازپرداخت ماهانه
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,افتتاح حساب ها
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
 DocType: UOM,UOM Name,نام UOM
 DocType: GST HSN Code,HSN Code,کد HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,مقدار سهم
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},{0} کاربر قبلا به پزشک متصل است {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,جعبه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,کننده ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,کننده ممکن
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,توزیع ماهانه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),بهداشت و درمان (بتا)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
-DocType: Employee Loan,Repayment Method,روش بازپرداخت
+DocType: Loan,Repayment Method,روش بازپرداخت
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",اگر علامت زده شود، صفحه اصلی خواهد بود که گروه پیش فرض گزینه برای وب سایت
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ادعای هزینه شرکت.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,گواهی مورد نیاز است
 DocType: Company,Default Holiday List,پیش فرض لیست تعطیلات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ردیف {0}: از زمان و به زمان از {1} با هم تداخل دارند {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,بدهی سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,بدهی سهام
 DocType: Purchase Invoice,Supplier Warehouse,انبار عرضه کننده کالا
 DocType: Opportunity,Contact Mobile No,تماس با موبایل بدون
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,انتخاب شرکت
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,بخش چاپ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,کاربر {0} هیچ پروفایل پیش فرض POS ندارد. برای این کاربر پیش فرض در ردیف {1} را بررسی کنید.
 DocType: Student Group,Set 0 for no limit,تنظیم 0 برای هیچ محدودیتی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,ردیف {idx}: {field} برای ایجاد فاکتور افتتاح {invoice_type} لازم است
 DocType: Customer,Primary Address and Contact Detail,آدرس اصلی و جزئیات تماس
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ارسال مجدد ایمیل پرداخت
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,لطفا حداقل یک دامنه را انتخاب کنید
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: SMS Center,Receiver List,فهرست گیرنده
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,جستجو مورد
 DocType: Payment Schedule,Payment Amount,مبلغ پرداختی
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,مقیاس درجه بندی
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,قبلا کامل شده
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,سهام در دست
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,سهام در دست
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,واردات موفق!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,مورد نقل قول
 DocType: Customer,Customer POS Id,ضوابط POS ها
 DocType: Account,Account Name,نام حساب
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,لطفا URL سرور Woocommerce را وارد کنید
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
 DocType: Share Balance,To No,به نه
-DocType: Subscription,Reference Document,سند مرجع
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} لغو و یا متوقف شده است
 DocType: Accounts Settings,Credit Controller,کنترل اعتبار
-DocType: Grant Application,Applicant Type,نوع متقاضی
+DocType: Loan,Applicant Type,نوع متقاضی
 DocType: Purchase Invoice,03-Deficiency in services,03-کمبود خدمات
 DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
 DocType: Healthcare Settings,Default Medical Code Standard,استاندارد استاندارد پزشکی
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ صورتحساب شد
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,منابع انسانی
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,منابع انسانی
 DocType: Lead,Upper Income,درآمد بالاتر
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,رد کردن
 DocType: Journal Entry Account,Debit in Company Currency,بدهی شرکت در ارز
 DocType: BOM Item,BOM Item,مورد BOM
 DocType: Appraisal,For Employee,برای کارمند
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,را پرداخت ورودی
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,را پرداخت ورودی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
 DocType: Company,Default Values,مقادیر پیش فرض
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),مجموع (بدون مالیات)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,تعداد سرب
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} باید بزرگتر از 0 باشد
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,سهام موجود
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,سهام موجود
 DocType: Manufacturing Settings,Capacity Planning For (Days),برنامه ریزی ظرفیت برای (روز)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,تهیه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,فیلد اجباری - برنامه
 DocType: Special Test Template,Result Component,نتیجه کامپوننت
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ادعای گارانتی
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,شامل تعطیلات در برگ برگ
 DocType: Sales Invoice,Packed Items,آیتم ها بسته بندی شده
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ادعای ضمانت نامه در مقابل شماره سریال
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;جمع&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;جمع&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,فعال سبد خرید
 DocType: Employee,Permanent Address,آدرس دائمی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,تأیید اقدام
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,مزایده آنلاین
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,انجام
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,نمایش سبد خرید
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,هزینه های بازاریابی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,نمی توان معیارهای استاندارد را ایجاد کرد. لطفا معیارها را تغییر دهید
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Material Request,Transferred,منتقل شده
 DocType: Vehicle,Doors,درب
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,جمع آوری هزینه ثبت نام بیمار
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,نمی توان ویژگی ها را بعد از معامله سهام تغییر داد. یک مورد جدید ایجاد کنید و سهام را به بخش جدید منتقل کنید
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,نمی توان ویژگی ها را بعد از معامله سهام تغییر داد. یک مورد جدید ایجاد کنید و سهام را به بخش جدید منتقل کنید
 DocType: Course Assessment Criteria,Weightage,بین وزنها
 DocType: Purchase Invoice,Tax Breakup,فروپاشی مالیات
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,آشتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Purchase Invoice Item,Batch No,دسته بدون
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,پیشرفت کارمند
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 DocType: Student Group Instructor,Student Group Instructor,مربی دانشجویی گروه
 DocType: Grant Application,Assessment  Mark (Out of 10),ارزیابی علامت (از 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبایل بدون
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,اصلی
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Email Digest,Annual Expenses,هزینه سالانه
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
 DocType: Sales Team,Contribution to Net Total,کمک به شبکه ها
 DocType: Sales Invoice Item,Customer's Item Code,کد مورد مشتری
 DocType: Stock Reconciliation,Stock Reconciliation,سهام آشتی
 DocType: Territory,Territory Name,نام منطقه
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,فقط می توانید برنامه هایی با یک چرخه صدور صورت حساب در یک اشتراک داشته باشید
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,متقاضی برای یک کار.
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ارزیابی
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,رویدادهای آموزشی
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,پیگیری بر اساس منبع سرب
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,لطفا وارد
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,لطفا وارد
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,ثبت نگهداری
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,لطفا فیلتر بر اساس مورد یا انبار مجموعه
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص از اقلام محاسبه)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,برای ارائه و بیل
 DocType: Student Group,Instructors,آموزش
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} باید ارائه شود
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,مدیریت اشتراک
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,پرداخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,پرداخت
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",انبار {0} است به هر حساب در ارتباط نیست، لطفا ذکر حساب در رکورد انبار و یا مجموعه ای حساب موجودی به طور پیش فرض در شرکت {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,مدیریت سفارشات خود را
 DocType: Work Order Operation,Actual Time and Cost,زمان و هزینه های واقعی
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,دانشجو مرخصی کاربرد
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,بر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,آیتم های همراه  در زمان فروش.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,بارکد
 DocType: Hub Category,Hub Node,مرکز گره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری شده اید   لطفا تصحیح و دوباره سعی کنید.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,وابسته
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,وابسته
 DocType: Asset Movement,Asset Movement,جنبش دارایی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,سفارش کار {0} باید ارائه شود
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,سبد خرید
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,پول صورتحساب باید برابر با پول یا حساب بانکی شرکت پیش فرض باشد
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
 DocType: Soil Texture,Loam,لام
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,ردیف {0}: تاریخ تحویل قبل از تاریخ ارسال نمی تواند باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,ردیف {0}: تاریخ تحویل قبل از تاریخ ارسال نمی تواند باشد
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ورود را پرداخت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
 ,Sales Invoice Trends,فروش روند فاکتور
 DocType: Leave Application,Apply / Approve Leaves,درخواست / برگ تصویب
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,برای
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',می توانید ردیف مراجعه تنها در صورتی که نوع اتهام است &#39;در مقدار قبلی ردیف &quot;یا&quot; قبل ردیف ها&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',می توانید ردیف مراجعه تنها در صورتی که نوع اتهام است &#39;در مقدار قبلی ردیف &quot;یا&quot; قبل ردیف ها&#39;
 DocType: Sales Order Item,Delivery Warehouse,انبار تحویل
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,درخت مراکز هزینه مالی.
 DocType: Serial No,Delivery Document No,تحویل اسناد بدون
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,مصرف مواد در تنظیمات تولید تنظیم نشده است.
 DocType: Student,Student Mobile Number,دانشجو شماره موبایل
 DocType: Item,Has Variants,دارای انواع
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{Item} {{0}} در ردیف {1} بیش از {2} نمیتواند برای اجازه دادن به بیش از صدور صورت حساب، لطفا در تنظیمات سهام تنظیم کنید
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{Item} {{0}} در ردیف {1} بیش از {2} نمیتواند برای اجازه دادن به بیش از صدور صورت حساب، لطفا در تنظیمات سهام تنظیم کنید
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,به روز رسانی پاسخ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,ابتدا برنامه را انتخاب کنید
 DocType: Patient Appointment,Patient Age,سن بیمار
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,مدیریت پروژه
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,سریال هیچ {0} قبلا دریافت نشده است
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,سریال هیچ {0} قبلا دریافت نشده است
 DocType: Supplier,Supplier of Goods or Services.,تامین کننده کالا یا خدمات.
 DocType: Budget,Fiscal Year,سال مالی
 DocType: Asset Maintenance Log,Planned,برنامه ریزی شده
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,حساب های دریافتی قابل پیش بینی که باید در بیمار برای هزینه های مشاوره در نظر گرفته شوند استفاده می شود.
 DocType: Vehicle Log,Fuel Price,قیمت سوخت
+DocType: Bank Guarantee,Margin Money,پول حاشیه
 DocType: Budget,Budget,بودجه
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,تنظیم باز کنید
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,پیگیری
 DocType: Item,Is Sales Item,آیا آیتم فروش است
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
 DocType: Maintenance Visit,Maintenance Time,زمان نگهداری
 ,Amount to Deliver,مقدار برای ارائه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},یک مورد چند بار وارد شده است {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ شروع ترم نمی تواند زودتر از تاریخ سال شروع سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,خطاهایی وجود دارد.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,کارکنان {0} قبلا برای {1} بین {2} و {3} درخواست شده است:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,خطاهایی وجود دارد.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,کارکنان {0} قبلا برای {1} بین {2} و {3} درخواست شده است:
 DocType: Guardian,Guardian Interests,نگهبان علاقه مندی ها
 DocType: Naming Series,Current Value,ارزش فعلی
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
 DocType: Education Settings,Instructor Records to be created by,اسناد مدرس توسط توسط
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ایجاد شد
 DocType: GST Account,GST Account,حساب GST
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,اضافه شده به موارد دلخواه
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,هیچ لغزش حقوق و دستمزد برای ارائه معیارهای انتخاب شده یا معافیت حقوق و دستمزد در حال حاضر ارائه نشده است
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,وظایف و مالیات
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,هیچ لغزش حقوق و دستمزد برای ارائه معیارهای انتخاب شده یا معافیت حقوق و دستمزد در حال حاضر ارائه نشده است
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,وظایف و مالیات
 DocType: Projects Settings,Projects Settings,تنظیمات پروژه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا تاریخ مرجع وارد
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} نوشته های پرداخت نمی تواند فیلتر {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,درخت گروه مورد.
 DocType: Production Plan,Total Produced Qty,مجموع تولید شده
 DocType: Payroll Entry,Get Employee Details,دریافت جزئیات کارمند
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
 DocType: Asset,Sold,فروخته شده
 ,Item-wise Purchase History,تاریخچه خرید مورد عاقلانه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 DocType: Sales Invoice Payment,Base Amount (Company Currency),مقدار پایه (شرکت ارز)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,مواد خام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,مواد خام
 DocType: Payment Reconciliation Payment,Reference Row,مرجع ردیف
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
 DocType: Sales Invoice,Accounting Details,جزئیات حسابداری
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,حذف تمام معاملات این شرکت
 DocType: Patient,O Positive,مثبت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,سرمایه گذاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیص
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ملاک پذیرش
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,لطفا درخواست مواد در جدول فوق را وارد کنید
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,هیچ مجوزی برای ورود مجله وجود ندارد
 DocType: Item Attribute,Attribute Name,نام مشخصه
 DocType: BOM,Show In Website,نمایش در وب سایت
 DocType: Shopping Cart Settings,Show Quantity in Website,نمایش تعداد در وب سایت
-DocType: Employee Loan Application,Total Payable Amount,مجموع مبلغ قابل پرداخت
+DocType: Loan Application,Total Payable Amount,مجموع مبلغ قابل پرداخت
 DocType: Task,Expected Time (in hours),زمان مورد انتظار (در ساعت)
 DocType: Item Reorder,Check in (group),بررسی در (گروه)
 DocType: Soil Texture,Silt,سیل
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,پرداخت
 DocType: Room,Room Name,اسم اتاق
 DocType: Prescription Duration,Prescription Duration,مدت زمان تجویز
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترک نمی تواند اعمال شود / قبل از {0} لغو، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترک نمی تواند اعمال شود / قبل از {0} لغو، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
 DocType: Activity Cost,Costing Rate,هزینه یابی نرخ
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,آدرس و اطلاعات تماس و ضوابط
 ,Campaign Efficiency,بهره وری کمپین
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,فصل
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,جفت
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,در صورت انتخاب این حالت، حساب پیش فرض به طور خودکار در صورتحساب اعتباری به روز می شود.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
 DocType: Asset,Depreciation Schedule,برنامه استهلاک
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,آدرس فروش شریک و اطلاعات تماس
 DocType: Bank Reconciliation Detail,Against Account,به حساب
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,نیم تاریخ روز باید بین از تاریخ و به روز می شود
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,نیم تاریخ روز باید بین از تاریخ و به روز می شود
 DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,لطفا مرکز هزینه پیش فرض را در شرکت {0} تنظیم کنید.
 DocType: Item,Has Batch No,دارای دسته ای بدون
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),واقعی پایان تاریخ (از طریق زمان ورق)
 DocType: Soil Texture,Soil Type,نوع خاک
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,پیام جدید
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
 DocType: GoCardless Mandate,GoCardless Mandate,مجوز GoCardless
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,رده هاب
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
-DocType: Employee Loan,Loan Amount,مبلغ وام
+DocType: Loan,Loan Amount,مبلغ وام
 DocType: Student Report Generation Tool,Add Letterhead,بطری را اضافه کنید
 DocType: Program Enrollment,Self-Driving Vehicle,خودرو بدون راننده
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,کارت امتیازی کارت اعتباری
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,موقعیت
 DocType: Patient,Patient Details,جزئیات بیمار
 DocType: Patient,B Positive,B مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
 DocType: Patient Medical Record,Patient Medical Record,پرونده پزشکی بیمار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ورزشی
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,مجموع واقعی
 DocType: Lab Test UOM,Test UOM,آزمون UOM
 DocType: Student Siblings,Student Siblings,خواهر و برادر دانشجو
+DocType: Subscription Plan Detail,Subscription Plan Detail,جزئیات طرح اشتراک
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,واحد
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,لطفا شرکت مشخص
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,لطفا شرکت مشخص
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Asset Maintenance Task,Maintenance Task,وظیفه تعمیر و نگهداری
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,لطفا B2C Limit را در تنظیمات GST تنظیم کنید.
@@ -2516,6 +2525,7 @@
 ,BOM Search,BOM جستجو
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),مجموع هزینه مصرف مواد (از طریق ورودی سهام)
 DocType: Hub Settings,Company Registered,شرکت ثبت شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,به تاریخ نمی تواند کمتر از تاریخ باشد
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",&quot;انبار&quot; یا &quot;موجود در انبار&quot; را در هاب منتشر کنید براساس موجودی موجود در این انبار.
 DocType: Vehicle,Fuel Type,نوع سوخت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,لطفا ارز در شرکت مشخص
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},تعادل سهام در دسته {0} تبدیل خواهد شد منفی {1} برای مورد {2} در انبار {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
 DocType: Email Digest,Pending Sales Orders,در انتظار سفارشات فروش
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
 DocType: Employee,Create User Permission,ایجاد مجوز کاربر
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 DocType: Healthcare Settings,Remind Before,قبل از یادآوری
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
 DocType: Salary Component,Deduction,کسر
 DocType: Item,Retain Sample,ذخیره نمونه
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
 DocType: Stock Reconciliation Item,Amount Difference,تفاوت در مقدار
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
 DocType: Territory,Classification of Customers by region,طبقه بندی مشتریان بر اساس منطقه
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,در تولید
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه تعادل بیانیه بانک
 DocType: Normal Test Template,Normal Test Template,الگو آزمون عادی
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,کاربر غیر فعال
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,نقل قول
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,نمی توان RFQ دریافتی را بدون نقل قول تنظیم کرد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,نقل قول
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,نمی توان RFQ دریافتی را بدون نقل قول تنظیم کرد
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کسر مجموع
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,یک حساب کاربری برای چاپ در حساب حساب را انتخاب کنید
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,این بر مبنای معاملات در برابر این بیمار است. برای جزئیات بیشتر به جدول زمانی زیر مراجعه کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,هزینه به روز رسانی
 DocType: Patient,Date of Birth,تاریخ تولد
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,تنظیم کارت امتیازی تامین کننده
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,شرح شغل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,شرح شغل
 DocType: Student Applicant,Applied,کاربردی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,باز کردن مجدد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,باز کردن مجدد
 DocType: Sales Invoice Item,Qty as per Stock UOM,تعداد در هر بورس UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,نام Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02 فروش تخفیف
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
+DocType: Department Approver,Approver,تصویب
 ,SO Qty,SO تعداد
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,میدان به سهامدار نمی تواند خالی باشد
 DocType: Guardian,Work Address,آدرس محل کار
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),مجموع مقدار اختصاص داده شده (شرکت ارز)
 DocType: Purchase Order Item,To be delivered to customer,به مشتری تحویل
 DocType: BOM,Scrap Material Cost,هزینه ضایعات مواد
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
 DocType: Grant Application,Email Notification Sent,اخطار ایمیل ارسال شد
 DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",کد کالا، انبار، مقدار در سطر مورد نیاز است
-DocType: Pricing Rule,Supplier,تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",کد کالا، انبار، مقدار در سطر مورد نیاز است
+DocType: Bank Guarantee,Supplier,تامین کننده
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,نمایش جزئیات پرداخت
 DocType: Consultation,Consultation Time,زمان مشاوره
 DocType: C-Form,Quarter,ربع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,هزینه های متفرقه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,هزینه های متفرقه
 DocType: Global Defaults,Default Company,به طور پیش فرض شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
 DocType: Payment Request,PR,روابط عمومی
 DocType: Cheque Print Template,Bank Name,نام بانک
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-بالا
-DocType: Employee Loan,Employee Loan Account,کارمند حساب وام
 DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
 DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,تعداد تعامل
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),وزن (در کیلوگرم)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",فصل / chapter_name پس از صرفه جویی در فصل، به صورت خودکار خالی می شود.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,لطفا حسابهای GST را در تنظیمات GST تنظیم کنید
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,لطفا حسابهای GST را در تنظیمات GST تنظیم کنید
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,نوع کسب و کار
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,هزینه خرید جدید
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,توضیحات گرانت
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
 DocType: Student Guardian,Others,دیگران
+DocType: Subscription,Discounts,تخفیف
 DocType: Payment Entry,Unallocated Amount,مقدار تخصیص نیافته
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.
 DocType: POS Profile,Taxes and Charges,مالیات و هزینه
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",یک محصول یا یک سرویس است که خریداری شده، به فروش می رسد و یا نگه داشته در انبار.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,هیچ به روز رسانی بیشتر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,این شامل همه کارتهای امتیاز داده شده در این مجموعه می شود
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,مورد کودک باید یک بسته نرم افزاری محصولات. لطفا آیتم های حذف `{0}` و صرفه جویی در
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,بانکداری
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,مورد خدمات
 DocType: Bank Guarantee,Bank Guarantee,تضمین بانکی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
 DocType: Bin,Ordered Quantity,تعداد دستور داد
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
 DocType: Grading Scale,Grading Scale Intervals,بازه مقیاس درجه بندی
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,سود سال
+DocType: Bank Guarantee,Name of Bank,نام بانک
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ثبت حسابداری برای {2} تنها می تواند در ارز ساخته شده است: {3}
 DocType: Fee Schedule,In Process,در حال انجام
 DocType: Authorization Rule,Itemwise Discount,Itemwise تخفیف
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,درخت از حساب های مالی.
+DocType: Bank Guarantee,Reference Document Type,مرجع نوع سند
 DocType: Cash Flow Mapping,Cash Flow Mapping,نمودار جریان نقدی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
 DocType: Account,Fixed Asset,دارائی های ثابت
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,پرسشنامه سریال
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ایمیل در ارتباط پیش فرض یافت نشد
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ایجاد راز
-DocType: Employee Loan,Account Info,اطلاعات حساب
+DocType: Loan,Account Info,اطلاعات حساب
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
 DocType: Fees,Include Payment,شامل پرداخت
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} دانشجویان ایجاد شده است.
 DocType: Sales Invoice,Total Billing Amount,کل مقدار حسابداری
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,برنامه در ساختار هزینه و گروه دانشجویی {0} متفاوت است.
 DocType: Fee Schedule,Receivable Account,حساب دریافتنی
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
 DocType: Quotation Item,Stock Balance,تعادل سهام
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,سفارش فروش به پرداخت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,مدیر عامل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,مدیر عامل
 DocType: Purchase Invoice,With Payment of Tax,با پرداخت مالیات
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,سه نسخه عرضه کننده
 DocType: Land Unit,Is Container,کانتینر است
 DocType: Crop Cycle,This will be day 1 of the crop cycle,این روز اول از چرخه محصول خواهد بود
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Purchase Invoice Item,Weight UOM,وزن UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,لیست سهامداران موجود با شماره های برگه
 DocType: Salary Structure Employee,Salary Structure Employee,کارمند ساختار حقوق و دستمزد
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,نمایش خصیصه های متغیر
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,نمایش خصیصه های متغیر
 DocType: Student,Blood Group,گروه خونی
 DocType: Course,Course Name,نام دوره
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,کاربرانی که می توانند برنامه های مرخصی یک کارمند خاص را تایید
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,تجهیزات اداری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,تجهیزات اداری
 DocType: Purchase Invoice Item,Qty,تعداد
 DocType: Fiscal Year,Companies,شرکت های
 DocType: Supplier Scorecard,Scoring Setup,تنظیم مقدماتی
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,مجموع ارزش ورودی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,بدهکاری به مورد نیاز است
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,خرید لیست قیمت
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,الگوهای متغیرهای کارت امتیازی تامین کننده.
 DocType: Job Offer Term,Offer Term,مدت پیشنهاد
 DocType: Asset,Quality Manager,مدیر کیفیت
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},مجموع پرداخت نشده: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM وب سایت عملیات
 DocType: Supplier Scorecard,Supplier Score,امتیازات فروشنده
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,مجموع صورتحساب AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,مجموع صورتحساب AMT
 DocType: Supplier,Warn RFQs,اخطار RFQs
 DocType: BOM,Conversion Rate,نرخ تبدیل
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,جستجو در محصولات
 DocType: Assessment Plan,To Time,به زمان
 DocType: Authorization Rule,Approving Role (above authorized value),تصویب نقش (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
+DocType: Loan,Total Amount Paid,کل مبلغ پرداخت شده
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,لطفا پذیرش دانشجویی را انتخاب کنید که برای متقاضی دانشجویی پرداخت شده است
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,لطفا لیست قیمت را برای انتشار قیمت گذاری انتخاب کنید
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ردیف {0}: پایان تعداد نمی تواند بیش از {1} برای عملیات {2}
 DocType: Manufacturing Settings,Allow Overtime,اجازه اضافه کاری
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",مورد سریال {0} نمی تواند با استفاده سهام آشتی، لطفا با استفاده از بورس ورود به روز می شود
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",مورد سریال {0} نمی تواند با استفاده سهام آشتی، لطفا با استفاده از بورس ورود به روز می شود
 DocType: Training Event Employee,Training Event Employee,رویداد آموزش کارکنان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,حداکثر نمونه - {0} را می توان برای Batch {1} و Item {2} حفظ کرد.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,اضافه کردن اسلات زمان
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شماره سریال مورد نیاز برای مورد {1}. شما فراهم کرده اید {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,نرخ گذاری کنونی
 DocType: Training Event,Advance,پیشرفت
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,برای تکرار دوباره
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,تنظیمات دروازه پرداخت GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,تبادل کاهش / افزایش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,تبادل کاهش / افزایش
 DocType: Opportunity,Lost Reason,از دست داده دلیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},ردیف # {0}: حساب {1} متعلق به شرکت {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},ردیف # {0}: حساب {1} متعلق به شرکت {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Unable to find DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,تعداد واقعی
 DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,سریال بدون {0} یافت نشد
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},اشتراک {0}
 DocType: Fee Schedule Program,Fee Schedule Program,برنامه برنامه ریزی هزینه
 DocType: Fee Schedule Program,Student Batch,دسته ای دانشجویی
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,دانشجویی
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,تجارت الکترونیک GSTIN
 DocType: Sales Order,Not Delivered,تحویل داده است
 ,Bank Clearance Summary,بانک ترخیص کالا از خلاصه
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
 DocType: Appraisal Goal,Appraisal Goal,ارزیابی هدف
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,پیشنهاد رده
 DocType: Stock Reconciliation Item,Current Amount,مقدار کنونی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ساختمان
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ساختمان
 DocType: Fee Schedule,Fee Structure,ساختار هزینه
 DocType: Timesheet Detail,Costing Amount,هزینه مبلغ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
 DocType: Student Admission Program,Application Fee,هزینه درخواست
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ثبت کردن لغزش حقوق
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,تخفیف Maxiumm برای مورد {0} است {1}٪
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
 DocType: SMS Log,Sender Name,نام فرستنده
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,معیارهای تجزیه و تحلیل کشاورزی
+DocType: HR Settings,Leave Approval Notification Template,قالب اخطار تایید را ترک کنید
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Vital Signs,Blood Pressure (diastolic),فشار خون (دیاستولیک)
 DocType: SMS Log,Sent To,فرستادن به
 DocType: Agriculture Task,Holiday Management,مدیریت تعطیلات
 DocType: Payment Request,Make Sales Invoice,ایجاد فاکتور فروش
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,نرم افزارها
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,نرم افزارها
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
 DocType: Company,For Reference Only.,برای مرجع تنها.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},پزشک {0} در {1} در دسترس نیست
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,جدید محل کار
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,مصرف مواد
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,تنظیم به عنوان بسته
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},آیتم با بارکد بدون {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},آیتم با بارکد بدون {0}
 DocType: Normal Test Items,Require Result Value,نیاز به ارزش نتیجه
 DocType: Item,Show a slideshow at the top of the page,نمایش تصاویر به صورت خودکار در بالای صفحه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOM ها
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
 DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,در محدوده زمانی معین
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,جریان نقدی نقشه برداری جزئیات قالب
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,مدیریت وام
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,پیگیری درآمد و هزینه جداگانه برای محصول و یا عمودی بخش.
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,لغزش نمایش حقوق
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,لغزش نمایش حقوق
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,مواد انتقال
 DocType: Fees,Send Payment Request,ارسال درخواست پرداخت
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 DocType: Water Analysis,Origin,اصل و نسب
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,آیا مسئولیت مالیات بر درآمد است؟
 DocType: Grading Scale Interval,Grade Description,درجه باشرکت
 DocType: Stock Entry,Purchase Receipt No,رسید خرید بدون
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیعانه
-DocType: Sales Invoice, Shipping Bill Number,شماره بلیت حمل و نقل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,بیعانه
+DocType: Sales Invoice, Shipping Bill Number,شماره بارنامه حمل و نقل
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,قابلیت ردیابی
 DocType: Asset Maintenance Log,Actions performed,اقدامات انجام شده
 DocType: Cash Flow Mapper,Section Leader,رهبر بخش
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),منابع درآمد (بدهی)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),منابع درآمد (بدهی)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,کارمند
+DocType: Bank Guarantee,Fixed Deposit Number,شماره واریز ثابت
 DocType: Asset Repair,Failure Date,تاریخ خرابی
 DocType: Sample Collection,Collected Time,زمان جمع آوری شده
 DocType: Company,Sales Monthly History,تاریخچه فروش ماهانه
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,آیا مطمئن هستید که می خواهید این انتصاب را لغو کنید؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,بسته بندی قیمت اتاق هتل
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط لوله فروش
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,دریافت به روز رسانی اشتراک
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},حساب {0} با شرکت {1} در حالت حساب مطابقت ندارد: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,دوره:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,بدون سفارش کار ایجاد شده است
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این دوره بوجود
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,دارویی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,دارویی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
 DocType: Purchase Invoice,Credit To,اعتبار به
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,بدون نقل قول
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Gateway Account,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,جبرانی فعال
 DocType: Job Offer,Accepted,پذیرفته
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,نتایج جستجو
 DocType: Room,Room Number,شماره اتاق
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 DocType: Journal Entry Account,Payroll Entry,ورودی حقوق و دستمزد
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,مشاهده سوابق هزینه
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Lab Test Sample,Lab Test Sample,آزمایش آزمایشی نمونه
 DocType: Item Variant Settings,Allow Rename Attribute Value,اجازه ارزش نام متغیر را تغییر دهید
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
 DocType: Restaurant,Invoice Series Prefix,پیشوند سری فاکتور
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,ادغام Google Maps فعال نیست
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ثبت نشده است
+DocType: Subscription,Trialling,آزمایشی
 DocType: Member,Membership Expiry Date,عضویت در تاریخ انقضا
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} باید در سند بازگشت منفی باشد
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} باید در سند بازگشت منفی باشد
 ,Minutes to First Response for Issues,دقیقه به اولین پاسخ برای مسائل
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,واحد اندازه گیری
 DocType: Fiscal Year,Year End Date,سال پایان تاریخ
 DocType: Task Depends On,Task Depends On,کار بستگی به
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,فرصت
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,فرصت
 DocType: Operation,Default Workstation,به طور پیش فرض ایستگاه کاری
 DocType: Notification Control,Expense Claim Approved Message,پیام ادعای هزینه تایید
 DocType: Payment Entry,Deductions or Loss,کسر یا از دست دادن
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,مرخصی بدون حقوق با تایید سوابق مرخصی کاربرد مطابقت ندارد
 DocType: Campaign,Campaign-.####,کمپین - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
 DocType: Membership,USD,دلار آمریکا
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,را فاکتور
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,موجودی باقی مانده
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,بارکد {0} یک کد معتبر {1} نیست
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,پایان سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot و / سرب٪
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Driver,Driver,راننده
 DocType: Vital Signs,Nutrition Values,ارزش تغذیه ای
 DocType: Lab Test Template,Is billable,قابل پرداخت است
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),واقعی تاریخ شروع (از طریق زمان ورق)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,محدوده سالمندی 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,مقدار کل پیش پرداخت نمی تواند بیشتر از مقدار ادعا شده باشد
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,مقدار کل پیش پرداخت نمی تواند بیشتر از مقدار ادعا شده باشد
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,مقدار مشخصه را انتخاب کنید
 DocType: Purchase Invoice,Reason For Issuing document,دلیل برای صدور سند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,بعد تماس با نمی تواند همان آدرس ایمیل سرب
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,خدمات آدرس
 DocType: Asset Maintenance Task,Calibration,کالیبراسیون
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} تعطیلات شرکت است
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,مبلمان و لامپ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,اخطار وضعیت را ترک کنید
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,مبلمان و لامپ
 DocType: Item,Manufacture,ساخت
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,شرکت راه اندازی
 ,Lab Test Report,آزمایش آزمایشی گزارش
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,منطقه کاشت
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
 DocType: Installation Note Item,Installed Qty,نصب تعداد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,این ممکن است به دلیل برخی از نامعتبر آدرس ایمیل در
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,شما اضافه کردید
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,نتیجه آموزش
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,محصولات در هر صفحه
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,شاخه سازمان کارشناسی ارشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,گزارش یک مشکل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,هزینه آب و برق
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,هزینه آب و برق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-بالاتر از
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ردیف # {0}: مجله ورودی {1} می کند حساب کاربری ندارید {2} یا در حال حاضر همسان در برابر کوپن دیگر
 DocType: Supplier Scorecard Criteria,Criteria Weight,معیارهای وزن
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,اخطار تصویب را ترک کنید
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
 DocType: Payroll Entry,Salary Slip Based on Timesheet,لغزش حقوق و دستمزد بر اساس برنامه زمانی
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,نرخ خرید
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,نرخ خرید
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 DocType: Payment Entry,Payment Type,نوع پرداخت
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,تنظیمات سبد خرید
 DocType: Journal Entry,Accounting Entries,ثبت های حسابداری
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",اگر قانون قیمت گذاری انتخاب شده برای «نرخ» ساخته شده باشد، لیست قیمت را لغو خواهد کرد. نرخ حق الزحمه نرخ نهایی است، بنابراین هیچ تخفیف اضافی باید اعمال شود. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، در فیلد «نرخ» جای خواهد گرفت، نه «قیمت نرخ قیمت».
+DocType: Journal Entry,Paid Loan,وام پرداخت شده
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},تکراری ورودی. لطفا بررسی کنید مجوز قانون {0}
 DocType: Journal Entry Account,Reference Due Date,تاریخ تحویل مرجع
 DocType: Purchase Order,Ref SQ,SQ کد عکس
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 apps/erpnext/erpnext/config/hr.py +93,Payroll,لیست حقوق
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
 DocType: Patient Service Unit,Parent Service Unit,واحد خدمات والدین
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,را کاربر
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,حساب درآمد
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,تحویل
 DocType: Volunteer,Weekdays,روزهای کاری
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: Restaurant Menu,Restaurant Menu,منوی رستوران
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,تنظیم حساب موجودی به طور پیش فرض برای موجودی دائمی
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,تنظیم حساب موجودی به طور پیش فرض برای موجودی دائمی
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ارسال ایمیل به گرانت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",LocalStorage را کامل است، نجات نداد
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,ظرفیت اتاق
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},قبلا ثبت برای آیتم {0} وجود دارد
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,کد عکس
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,شما سوابق فاکتورهای قبلا تولید را از دست خواهید داد. آیا مطمئن هستید که می خواهید این اشتراک را مجددا راه اندازی کنید؟
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,هزینه ثبت نام
 DocType: Budget,Cost Center,مرکز هزینه زا
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,کوپن #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,کوپن #
 DocType: Notification Control,Purchase Order Message,خرید سفارش پیام
 DocType: Tax Rule,Shipping Country,حمل و نقل کشور
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,مخفی کردن شناسه مالیاتی مشتری از معاملات فروش
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق بورس ورودی تغییر / تحویل توجه / رسید خرید
 DocType: Employee Education,Class / Percentage,کلاس / درصد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,رئیس بازاریابی و فروش
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,رئیس بازاریابی و فروش
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,مالیات بر عایدات
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,برو به نامه ها
+DocType: Subscription,Cancel At End Of Period,لغو در پایان دوره
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,هیچ مورد برای انتقال انتخاب نشده است
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,هیچ مورد برای انتقال انتخاب نشده است
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
 DocType: Vehicle,Electric,برقی
 DocType: Task,% Progress,٪ پیش رفتن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,کاهش / افزایش در دفع دارایی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,کاهش / افزایش در دفع دارایی
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",فقط متقاضی دانشجویی با وضعیت &quot;تأیید&quot; در جدول زیر انتخاب می شود.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,شماره حساب برای حساب {0} در دسترس نیست <br> لطفا نمودار خود را به درستی تنظیم کنید.
 DocType: Task,Depends on Tasks,بستگی به وظایف
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,در انبار
 DocType: Volunteer,Volunteer Skills,مهارتهای داوطلبانه
 DocType: Appraisal,HR User,HR کاربر
+DocType: Bank Guarantee,Reference Document Name,نام اسناد مرجع
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیات و هزینه کسر
 apps/erpnext/erpnext/hooks.py +142,Issues,مسائل مربوط به
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید یکی از است {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,خیلی بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,خیلی بزرگ
+DocType: Loan,Loan Application,درخواست وام
 DocType: Crop,Scientific Name,نام علمی
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,مجموع برگ
 DocType: Customer,"Reselect, if the chosen contact is edited after save",اگر مخاطب انتخاب شده پس از ذخیره ویرایش، دوباره انتخاب کنید
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,شماره چک
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,محلی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),وام و پیشرفت (دارایی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,بدهکاران
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,بزرگ
 DocType: Homepage Featured Product,Homepage Featured Product,صفحه خانگی محصول ویژه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,همه گروه ارزیابی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,همه گروه ارزیابی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,جدید نام انبار
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),مجموع {0} ({1})
 DocType: C-Form Invoice Detail,Territory,منطقه
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,هزینه
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,مشخص نرخ ارز برای تبدیل یک ارز به ارز را به یکی دیگر
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,نقل قول {0} لغو
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,مجموع مقدار برجسته
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,مجموع مقدار برجسته
 DocType: Sales Partner,Targets,اهداف
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,لطفا شماره SIREN را در پرونده اطلاعات شرکت ثبت کنید
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 DocType: Price List,Price List Master,لیست قیمت مستر
 DocType: GST Account,CESS Account,حساب CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,بیمار را انتخاب کنید
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,نام پارامتر
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,تنها برنامه های کاربردی با وضعیت ترک &#39;تایید&#39; و &#39;رد&#39; را می توان ارسال
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
 DocType: Homepage,Products to be shown on website homepage,محصولات به صفحه اصلی وب سایت نشان داده می شود
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,فاکتور برای هر ساعت صدور صورت حساب آماده شده است
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error نام: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,هزینه مالی است
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,لطفا تنظیمات پیشفرض را در تنظیمات رستوران تنظیم کنید
 ,Salary Register,حقوق و دستمزد ثبت نام
 DocType: Warehouse,Parent Warehouse,انبار پدر و مادر
-DocType: C-Form Invoice Detail,Net Total,مجموع خالص
+DocType: Subscription,Net Total,مجموع خالص
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},به طور پیش فرض BOM برای موردی یافت نشد {0} و پروژه {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,تعریف انواع مختلف وام
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,تعریف انواع مختلف وام
 DocType: Bin,FCFS Rate,FCFS نرخ
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,مقدار برجسته
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),زمان (در دقیقه)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,حساب کاربری ریشه باید یک گروه باشد
 DocType: Drug Prescription,Drug Prescription,تجویز دارو
 DocType: Fees,FEE.,هزینه.
-DocType: Employee Loan,Repaid/Closed,بازپرداخت / بسته
+DocType: Loan,Repaid/Closed,بازپرداخت / بسته
 DocType: Item,Total Projected Qty,کل پیش بینی تعداد
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",نرخ ارزیابی برای Item {0} یافت نشد، که لازم است برای انجام امور حسابداری برای {1} {2} باشد. اگر آیتم به عنوان یک مقدار ارزش گذاری صفر در {1} انجام می شود، لطفا ذکر کنید که در جدول {1} Item. در غیر این صورت، لطفا یک معامله مبادلهی ورودی برای این مورد ایجاد کنید یا میزان ارزیابی را در رکورد موردی ذکر کنید، سپس سعی کنید این ورودی را لغو / لغو کنید
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 DocType: Course,Course Code,کد درس
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 DocType: POS Settings,Use POS in Offline Mode,از POS در حالت آفلاین استفاده کنید
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,صادرات معقول
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,درصد تخفیف می تواند یا علیه یک لیست قیمت و یا برای همه لیست قیمت اعمال می شود.
-DocType: Subscription,Half-yearly,نیمه سال
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Lab Test,LabTest Approver,تأییدکننده LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,شما در حال حاضر برای معیارهای ارزیابی ارزیابی {}.
 DocType: Vehicle Service,Engine Oil,روغن موتور
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},دستور کار ایجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},دستور کار ایجاد شده: {0}
 DocType: Sales Invoice,Sales Team1,Team1 فروش
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
-DocType: Employee Loan,Loan Details,وام جزییات
+DocType: Loan,Loan Details,وام جزییات
 DocType: Company,Default Inventory Account,حساب پرسشنامه به طور پیش فرض
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,اعداد برگه مطابق نیست
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,لینک به تمام واحد های زمین که در آن محصول در حال رشد است
 DocType: Account,Root Type,نوع ریشه
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ردیف # {0}: نمی تواند بیشتر از بازگشت {1} برای مورد {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ردیف # {0}: نمی تواند بیشتر از بازگشت {1} برای مورد {2}
 DocType: Item Group,Show this slideshow at the top of the page,نمایش تصاویر به صورت خودکار در این بازگشت به بالای صفحه
 DocType: BOM,Item UOM,مورد UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
 DocType: Cheque Print Template,Primary Settings,تنظیمات اولیه
 DocType: Purchase Invoice,Select Supplier Address,کنید] را انتخاب کنید
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,اضافه کردن کارمندان
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,اضافه کردن کارمندان
 DocType: Purchase Invoice Item,Quality Inspection,بازرسی کیفیت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,بسیار کوچک
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,بسیار کوچک
 DocType: Company,Standard Template,قالب استاندارد
 DocType: Training Event,Theory,تئوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,حساب {0} فریز شده است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,تعداد SMS های ارسال شده
 DocType: Antibiotic,Healthcare Administrator,مدیر بهداشت و درمان
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,یک هدف را تنظیم کنید
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
 DocType: Dosage Strength,Dosage Strength,قدرت تحمل
 DocType: Account,Expense Account,حساب هزینه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,نرمافزار
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,رنگ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,رنگ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معیارهای ارزیابی طرح
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,تاریخ انقضا برای آیتم انتخابی اجباری است
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,جلوگیری از سفارشات خرید
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,تاریخچه شخصی و اجتماعی
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,کاربر {0} ایجاد شد
 DocType: Fee Schedule,Fee Breakup for each student,هزینه فوروارد برای هر دانش آموز
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,تغییر کد
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
 DocType: Purchase Invoice,Availed ITC Cess,ITC به سرقت رفته است
 ,Student Monthly Attendance Sheet,دانشجو جدول حضور ماهانه
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,قانون حمل و نقل فقط برای فروش قابل اجرا است
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,پروژه تاریخ شروع
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,تا
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,تا
 DocType: Rename Tool,Rename Log,تغییر نام ورود
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,گروه دانش آموز و یا برنامه های آموزشی الزامی است
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,حفظ ساعت حسابداری و ساعات کار در همان برنامه زمانی
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,لیست محصولات یا خدمات خود را که خریداری یا فروش می کنید.
 DocType: Water Analysis,Storage Temperature,دمای ذخیره سازی
 DocType: Employee Attendance Tool,Unmarked Attendance,حضور و غیاب بینام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,پژوهشگر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,پژوهشگر
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,برنامه ثبت نام دانشجو ابزار
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},تاریخ شروع باید کمتر از تاریخ پایان کار باشد {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,نام و نام خانوادگی پست الکترونیک و یا اجباری است
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} در حال حاضر {1} کارت امتیازی ارائه شده دارد و RFQ ها برای این تامین کننده باید با احتیاط صادر شوند.
 DocType: Chapter,Non Profit Manager,مدیر غیر انتفاعی
 DocType: BOM,Total Cost(Company Currency),برآورد هزینه (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,سریال بدون {0} ایجاد
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,سریال بدون {0} ایجاد
 DocType: Homepage,Company Description for website homepage,شرکت برای صفحه اصلی وب سایت
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",برای راحتی مشتریان، این کدها می توان در فرمت چاپ مانند فاکتورها و تحویل یادداشت استفاده می شود
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,نام Suplier
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,شما می توانید هر روز دستی وارد کنید
 DocType: Healthcare Settings,Result Printed,نتیجه چاپ شده
 DocType: Asset Category Account,Depreciation Expense Account,حساب استهلاک هزینه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,دوره وابسته به التزام
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},نمایش {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,دوره وابسته به التزام
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Project,Total Costing Amount (via Timesheets),مقدار کل هزینه (از طریق Timesheets)
-DocType: Employee Advance,Expense Approver,تصویب هزینه
+DocType: Department,Expense Approver,تصویب هزینه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
 DocType: Project,Hourly,ساعتی
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,غیر گروه به گروه
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,به تاریخ ساعت
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
 DocType: Accounts Settings,Make Payment via Journal Entry,پرداخت از طریق ورود مجله
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,چاپ شده در
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,چاپ شده در
 DocType: Item,Inspection Required before Delivery,بازرسی مورد نیاز قبل از تحویل
 DocType: Item,Inspection Required before Purchase,بازرسی مورد نیاز قبل از خرید
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,فعالیت در انتظار
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,حداقل مقدار سفارش
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,سازمان شما
 DocType: Fee Component,Fees Category,هزینه های رده
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,اعلام کارمند
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,ترتیب مجدد سطح
 DocType: Company,Chart Of Accounts Template,نمودار حساب الگو
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},مورد قیمت به روز شده برای {0} در لیست قیمت {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},مورد قیمت به روز شده برای {0} در لیست قیمت {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
 DocType: Purchase Invoice Item,Accepted Warehouse,انبار پذیرفته شده
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,روش های ارزش گذاری
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,روز علامت نیم
 DocType: Sales Invoice,Sales Team,تیم فروش
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ورود تکراری
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ورود تکراری
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,قبل از ارسال نام کاربری مزرعه را وارد کنید
 DocType: Program Enrollment Tool,Get Students,دریافت دانش آموزان
 DocType: Serial No,Under Warranty,تحت گارانتی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[خطا]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[خطا]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش فروش را نجات دهد.
 ,Employee Birthday,کارمند تولد
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,لطفا تاریخ تکمیل برای تعمیرات کامل را انتخاب کنید
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,برای قراردادن قرارداد ممنوع است
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
 DocType: Shopping Cart Settings,Orders,سفارشات
-DocType: Employee Leave Approver,Leave Approver,ترک تصویب
+DocType: Department,Leave Approver,ترک تصویب
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,لطفا یک دسته را انتخاب کنید
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,نام گروه ارزیابی
@@ -3593,7 +3615,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,مورد پیگیری توپی
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,نسخه اصل گیرنده
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,این ایمیل بصورت خودکار ساخته شده است
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
 DocType: Program Enrollment,Boarding Student,دانشجویی شبانه روزی
 DocType: Asset,Expected Value After Useful Life,مقدار مورد انتظار پس از زندگی مفید
@@ -3618,21 +3639,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},رکورد حضور {0} در برابر دانشجو وجود دارد {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,استهلاک حذف شده به دلیل دفع از دارایی
-DocType: Member,Member,عضو
+DocType: Loan,Member,عضو
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,مدیریت آدرس
 DocType: Work Order Item,Work Order Item,مورد سفارش کار
 DocType: Pricing Rule,Item Code,کد مورد
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
 DocType: Agriculture Analysis Criteria,Agriculture Manager,مدیر کشاورزی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
 DocType: Supplier Scorecard Period,Variables,متغیرها
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),بسته شدن (دکتر)
 DocType: Cheque Print Template,Cheque Size,حجم چک
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,سریال بدون {0} در سهام
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,سریال بدون {0} در سهام
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,قالب های مالیاتی برای فروش معاملات.
 DocType: Sales Invoice,Write Off Outstanding Amount,ارسال فعال برجسته مقدار
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},حساب {0} با شرکت مطابقت ندارد {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,به طور پیش فرض بورس UOM
 DocType: Asset,Number of Depreciations Booked,تعداد Depreciations رزرو
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,تعداد کل
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},علیه کارمند وام: {0}
 DocType: Landed Cost Item,Receipt Document,سند دریافت
 DocType: Employee Education,School/University,مدرسه / دانشگاه
 DocType: Payment Request,Reference Details,اطلاعات مرجع
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,دو موجودی نزولی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,سفارش بسته نمی تواند لغو شود. باز کردن به لغو.
 DocType: Student Guardian,Father,پدر
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""به روز رسانی انبار می تواند برای فروش دارایی ثابت شود چک"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""به روز رسانی انبار می تواند برای فروش دارایی ثابت شود چک"
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 DocType: Attendance,On Leave,در مرخصی
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,دریافت به روز رسانی
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,درآمد پایین
 DocType: Restaurant Order Entry,Current Order,سفارش فعلی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,به برنامه ها بروید
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ردیف {0} # مقدار اختصاص داده شده {1} نمیتواند بیشتر از مقدار درخواست نشده باشد {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ردیف {0} # مقدار اختصاص داده شده {1} نمیتواند بیشتر از مقدار درخواست نشده باشد {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,شرایط پرداخت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,دقیقه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 DocType: Chapter,Meetup Embed HTML,دیدار با HTML Embed
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,به تامین کنندگان بروید
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,لطفا برای شناسایی ایمیل برای دانشجو برای ارسال درخواست پرداخت تنظیم کنید
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,لطفا برای شناسایی ایمیل برای دانشجو برای ارسال درخواست پرداخت تنظیم کنید
 DocType: Patient,Medical History,تاریخچه پزشکی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,بانک حساب چک بی محل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,بانک حساب چک بی محل
 DocType: Patient,Patient ID,شناسه بیمار
 DocType: Physician Schedule,Schedule Name,نام برنامه
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,را لغزش حقوق
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,اضافه کردن همه تامین کنندگان
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,اضافه کردن همه تامین کنندگان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ردیف # {0}: مقدار اختصاص داده شده نمی تواند بیشتر از مقدار برجسته.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,مرور BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,وام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,وام
 DocType: Purchase Invoice,Edit Posting Date and Time,ویرایش های ارسال و ویرایش تاریخ و زمان
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا حساب مربوط استهلاک در دارایی رده {0} یا شرکت {1}
 DocType: Lab Test Groups,Normal Range,محدوده طبیعی
 DocType: Academic Term,Academic Year,سال تحصیلی
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,فروش موجود
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,باقی مانده
 DocType: Appraisal,Appraisal,ارزیابی
+DocType: Loan,Loan Account,حساب وام
 DocType: Purchase Invoice,GST Details,اطلاعات GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ایمیل ارسال شده به منبع {0}
 DocType: Item,Default Sales Unit of Measure,واحد پیش فروش واحد اندازه گیری
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,سال تحصیلی:
+DocType: Subscription,Past Due Date,تاریخ تحویل گذشته
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},اجازه نمیدهد که آیتم جایگزین برای آیتم {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ تکرار شده است
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,قرار ملاقات بیمار
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,تصویب نقش نمی تواند همان نقش حکومت قابل اجرا است به
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,لغو اشتراک از این ایمیل خلاصه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,دریافت کنندگان توسط
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,دریافت کنندگان توسط
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} برای مورد {1} یافت نشد
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,به دوره ها بروید
 DocType: Accounts Settings,Show Inclusive Tax In Print,نشان دادن مالیات فراگیر در چاپ
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیام های ارسال شده
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,حساب کاربری با گره فرزند می تواند به عنوان دفتر تنظیم شود
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,سرعت که در آن لیست قیمت ارز به ارز پایه مشتری تبدیل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
 DocType: Physician,Physician Schedules,برنامه پزشکان
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,مبلغ پیشنهادی کل نمیتواند بیشتر از مجموع مبلغ مجاز باشد
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,مبلغ پیشنهادی کل نمیتواند بیشتر از مجموع مبلغ مجاز باشد
 DocType: Salary Slip,Hour Rate,یک ساعت یک نرخ
 DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه به روز رسانی معاملات سهام مسن تر از {0}
 DocType: BOM,Inspection Required,مورد نیاز بازرسی
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,شماره تضمین بانکی قبل از ارسال را وارد کنید.
 DocType: Driving License Category,Class,کلاس
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,سفارش کار نمیتواند در برابر یک قالب مورد مطرح شود
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Assessment Plan,Program,برنامه
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 DocType: Serial No,Is Cancelled,آیا لغو
 DocType: Student Group,Group Based On,بر اساس گروه
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
@@ -3796,9 +3818,10 @@
 DocType: Cheque Print Template,Cheque Height,قد چک
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
 DocType: Setup Progress,Setup Progress,پیشرفت راه اندازی
+DocType: Expense Claim,Approval Status,وضعیت تایید
 DocType: Hub Settings,Publish Items to Hub,انتشار مطلبی برای توپی
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},از مقدار باید کمتر از ارزش در ردیف شود {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,انتقال سیم
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,بررسی همه
 ,Issued Items Against Work Order,مقررات صادر شده علیه سفارش کار
 DocType: Vehicle Log,Invoice Ref,فاکتور کد عکس
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,شماره تعرفه
 DocType: Work Order Item,Available Qty at WIP Warehouse,موجود در انبار تعداد WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,بینی
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
 DocType: Notification Control,Quotation Message,نقل قول پیام
-DocType: Employee Loan,Employee Loan Application,کارمند وام نرم افزار
 DocType: Issue,Opening Date,افتتاح عضویت
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,لطفا ابتدا بیمار را ذخیره کنید
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,لطفا ابتدا بیمار را ذخیره کنید
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,حضور و غیاب با موفقیت برگزار شده است.
 DocType: Program Enrollment,Public Transport,حمل و نقل عمومی
 DocType: Soil Texture,Silt Composition (%),ترکیب سیلت (٪)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),مورد بالانس (ساده)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,لوایح مطرح شده توسط تولید کنندگان.
 DocType: POS Profile,Write Off Account,ارسال فعال حساب
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,بدهی توجه داشته باشید مبلغ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,بدهی توجه داشته باشید مبلغ
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت از فاکتورخرید
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
@@ -3875,6 +3897,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,تاریخ سفارش فروش
 DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
 DocType: Assessment Plan,Assessment Plan,طرح ارزیابی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ورودی مجله معکوس
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,مشتری {0} ایجاد شده است
 DocType: Stock Settings,Limit Percent,درصد محدود
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,در حال حاضر هیچ کالایی در انبار وجود ندارد
@@ -3888,14 +3911,15 @@
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Payment Entry,Payment References,منابع پرداخت
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",تعداد فواصل برای فیلد بازه، مثلا اگر فاصله ای است &quot;روز&quot; و شمارش مبلغ پرداخت 3 است، هر 3 روز فاکتور تولید می شود
 DocType: Vehicle,Insurance Details,جزئیات بیمه
 DocType: Account,Payable,قابل پرداخت
 DocType: Share Balance,Share Type,نوع توزیع
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),بدهکاران ({0})
 DocType: Pricing Rule,Margin,حاشیه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,مشتریان جدید
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,سود ناخالص٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,سود ناخالص٪
 DocType: Appraisal Goal,Weightage (%),بین وزنها (٪)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,تغییر مشخصات POS
 DocType: Bank Reconciliation Detail,Clearance Date,ترخیص کالا از تاریخ
@@ -3905,10 +3929,11 @@
 DocType: Lead,Address Desc,نشانی محصول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,حزب الزامی است
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},ردیفهایی با تاریخ تکراری در سطرهای دیگر یافت شد: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},ردیفهایی با تاریخ تکراری در سطرهای دیگر یافت شد: {list}
 DocType: Topic,Topic Name,نام موضوع
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,لطفا قالب پیش فرض برای اعلان تأیید خروج در تنظیمات HR تنظیم کنید.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,حداقل یکی از خرید و یا فروش باید انتخاب شود
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,یک کارمند را برای پیشبرد کارمند انتخاب کنید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,یک کارمند را برای پیشبرد کارمند انتخاب کنید
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,لطفا یک تاریخ معتبر را انتخاب کنید
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,ماهیت کسب و کار خود را انتخاب کنید.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,به اشتراک گذاشتن لجر
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,فاکتور فروش {0} ایجاد شد
 DocType: Employee,Confirmation Date,تایید عضویت
 DocType: C-Form,Total Invoiced Amount,کل مقدار صورتحساب
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,استهلاک انباشته
 DocType: Supplier Scorecard Scoring Standing,Standing Name,نام مستعار
 DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
-DocType: Employee Loan Application,Required by Date,مورد نیاز تاریخ
+DocType: Loan Application,Required by Date,مورد نیاز تاریخ
 DocType: Lead,Lead Owner,مالک راهبر
 DocType: Production Plan,Sales Orders Detail,جزئیات سفارش سفارشات فروش
 DocType: Bin,Requested Quantity,تعداد درخواست
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,دستمزد ناخالص - کسر مجموع - بازپرداخت وام
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM BOM کنونی و جدید را نمی توان همان
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,حقوق و دستمزد ID لغزش
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,گزینه های چندگانه
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویل داده شد
+DocType: Subscription,Trial Period Start Date,تاریخ شروع محاکمه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,لطفا به عنوان کاربر دیگری وارد شوید
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,دانشجو نگهبان
 DocType: Member,Member Name,نام عضو
 DocType: Stock Settings,Use Naming Series,استفاده از نامگذاری سری
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
 DocType: POS Profile,Update Stock,به روز رسانی سهام
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,در اشتراک
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 DocType: Membership,Payment Details,جزئیات پرداخت
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM نرخ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",کار متوقف کار را نمی توان لغو کرد، برای لغو آن ابتدا آن را متوقف کنید
 DocType: Asset,Journal Entry for Scrap,ورودی مجله برای ضایعات
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,واحد زمین
 ,Purchase Analytics,تجزیه و تحلیل ترافیک خرید
 DocType: Sales Invoice Item,Delivery Note Item,تحویل توجه داشته باشید مورد
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,فاکتور فعلی {0} گم شده است
 DocType: Asset Maintenance Log,Task,وظیفه
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع ردیف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},تعداد دسته برای مورد الزامی است {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,تبادل به دست آوردن / از دست دادن حساب
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,کارمند و حضور و غیاب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},هدف باید یکی از است {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,انجمن
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,تعداد واقعی در سهام
 DocType: Homepage,"URL for ""All Products""",URL برای &quot;همه محصولات&quot;
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,نرخ فروش استاندارد
 DocType: Account,Rate at which this tax is applied,سرعت که در آن این مالیات اعمال می شود
 DocType: Cash Flow Mapper,Section Name,نام بخش
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,ترتیب مجدد تعداد
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,ترتیب مجدد تعداد
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرصت های شغلی فعلی
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,کسر کردن
@@ -4034,9 +4060,9 @@
 DocType: Task,depends_on,بستگی دارد به
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,برای به روز رسانی آخرین قیمت در تمام بیل مواد. ممکن است چند دقیقه طول بکشد.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,کشور به طور پیش فرض عاقلانه آدرس قالب
 DocType: Water Analysis,Appearance,ظاهر
+DocType: HR Settings,Leave Status Notification Template,حالت اخطار وضعیت را ترک کنید
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,میانگین نرخ خرید خرید قیمت
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,اطلاعات اعضا
@@ -4059,7 +4085,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,غیر مجاز. لطفا قالب تست را غیر فعال کنید
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
 DocType: Crop Cycle,Linked Land Unit,واحد زمین مرتبط
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 DocType: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,برو به کاربران
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN نامعتبر یا NA را وارد کنید برای ثبت نام نشده
 DocType: Training Event,Seminar,سمینار
 DocType: Program Enrollment Fee,Program Enrollment Fee,برنامه ثبت نام هزینه
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 DocType: Company,Create Chart Of Accounts Based On,درست نمودار حساب بر اساس
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,نمی توان آن را به غیر گروه تبدیل کرد. وظایف کودک وجود دارد.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
 ,Stock Ageing,سهام سالمندی
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},دانشجو {0} در برابر دانشجوی متقاضی وجود داشته باشد {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),تنظیم گرد کردن (ارزش شرکت)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,برنامه زمانی
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,دسته:
 DocType: Volunteer,Afternoon,بعد از ظهر
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Cheque Print Template,Scanned Cheque,اسکن چک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,پروژه {0} در حال حاضر وجود دارد
 DocType: Medical Department,Nursing User,پرستار کاربر
 DocType: Plant Analysis,Plant Analysis Criterias,معیارهای تجزیه و تحلیل کارخانه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,مسئولیت
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},شماره سریال {0} به دسته {1} تعلق ندارد
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,مسئولیت
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,دوره اعتبار این نقلقول به پایان رسیده است.
 DocType: Expense Claim Account,Expense Claim Account,حساب ادعای هزینه
 DocType: Accounts Settings,Allow Stale Exchange Rates,نرخ ارز ثابت
@@ -4136,11 +4163,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,گزینه ها را انتخاب کنید
 DocType: Item,Default BOM,به طور پیش فرض BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),مجموع مبلغ پرداخت شده (از طریق صورتحساب فروش)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,دبیت توجه مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,دبیت توجه مقدار
 DocType: Project Update,Not Updated,بروزرسانی نشده
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",ناسازگاری بین نرخ، بدون سهام و مقدار محاسبه شده وجود دارد
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,مجموع برجسته AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,مجموع برجسته AMT
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
 DocType: Employee Advance,Advance Account,حساب پیشرو
 DocType: Job Offer,Job Offer Terms,شرایط پیشنهاد شغلی
@@ -4149,7 +4176,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,خودرو
 DocType: Vehicle,Insurance Company,شرکت بیمه
 DocType: Asset Category Account,Fixed Asset Account,حساب دارایی ثابت
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,متغیر
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,متغیر
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Chapter,Members,اعضا
 DocType: Student,Student Email Address,دانشجو آدرس ایمیل
@@ -4172,7 +4199,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,انترن
 DocType: Delivery Stop,Address Name,نام آدرس
 DocType: Stock Entry,From BOM,از BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},تقسیم {0} واحد {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},تقسیم {0} واحد {1}
 DocType: Assessment Code,Assessment Code,کد ارزیابی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
@@ -4180,25 +4207,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 DocType: Bank Reconciliation Detail,Payment Document,سند پرداخت
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,خطا در ارزیابی فرمول معیار
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
+DocType: Subscription,Plans,برنامه ها
 DocType: Salary Slip,Salary Structure,ساختار حقوق و دستمزد
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,مواد شماره
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,هنگام ایجاد دوره تکراری خطایی رخ داد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,نقل قول
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,بدون تشکل های دانشجویی ایجاد شده است.
 DocType: Purchase Invoice Item,Serial No,شماره سریال
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میزان بازپرداخت ماهانه نمی تواند بیشتر از وام مبلغ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,میزان بازپرداخت ماهانه نمی تواند بیشتر از وام مبلغ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,ردیف # {0}: تاریخ تحویل احتمالی قبل از تاریخ سفارش خرید نمی تواند باشد
 DocType: Purchase Invoice,Print Language,چاپ زبان
 DocType: Salary Slip,Total Working Hours,کل ساعات کار
 DocType: Sales Invoice,Customer PO Details,اطلاعات مشتری PO
-DocType: Subscription,Next Schedule Date,تاریخ برنامه بعدی
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,افتتاح حساب موقت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
@@ -4226,11 +4252,11 @@
 DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,از و به تاریخ های الزامی
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,هیچ کارمند برای معیارهای ذکر شده
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
 DocType: Hotel Settings,Default Customer,مشتری پیش فرض
 DocType: Assessment Plan,Supervisor Name,نام استاد راهنما
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,تأیید نکرده اید که قرار ملاقات برای همان روز ایجاد شده باشد
@@ -4254,16 +4280,16 @@
 DocType: Journal Entry Account,Employee Advance,پیشرفت کارمند
 DocType: Payroll Entry,Payroll Frequency,فرکانس حقوق و دستمزد
 DocType: Lab Test Template,Sensitivity,حساسیت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,مواد اولیه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,مواد اولیه
 DocType: Leave Application,Follow via Email,از طریق ایمیل دنبال کنید
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,گیاهان و ماشین آلات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,گیاهان و ماشین آلات
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,تنظیمات خلاصه کار روزانه
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,لطفا Reqd را با تاریخ وارد کنید
 DocType: Payment Entry,Internal Transfer,انتقال داخلی
 DocType: Asset Maintenance,Maintenance Tasks,وظایف تعمیر و نگهداری
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,در هر دو صورت تعداد مورد نظر و یا مقدار هدف الزامی است
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
 DocType: Leave Control Panel,Carry Forward,حمل به جلو
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مرکز هزینه با معاملات موجود را نمی توان تبدیل به لجر
@@ -4271,13 +4297,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ادغام ERPNext
 DocType: Crop Cycle,Detected Disease,بیماری تشخیص داده شده
 ,Produced,ساخته
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,تاریخ شروع بازپرداخت نمی تواند قبل از تاریخ پرداخت باشد.
 DocType: Item,Item Code for Suppliers,کد مورد برای تولید کنندگان
 DocType: Issue,Raised By (Email),مطرح شده توسط (ایمیل)
 DocType: Training Event,Trainer Name,نام مربی
 DocType: Mode of Payment,General,عمومی
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ارتباطات آخرین
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,پرداخت بازی با فاکتورها
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
@@ -4291,7 +4318,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},دکتر {0} در نیم روز روزه بگیرید {1}
 DocType: Production Plan,Get Material Request,دریافت درخواست مواد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,هزینه پستی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,هزینه پستی
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 ,Item Variant Details,مورد Variant جزئیات
@@ -4302,9 +4329,9 @@
 DocType: Drug Prescription,Hour,ساعت
 DocType: Restaurant Order Entry,Last Sales Invoice,آخرین اسکناس فروش
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},لطفا مقدار در مورد item {0} را انتخاب کنید
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
 DocType: Company,Monthly Sales Target,هدف فروش ماهانه
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
@@ -4312,7 +4339,7 @@
 DocType: Item,Default Material Request Type,به طور پیش فرض نوع درخواست پاسخ به
 DocType: Supplier Scorecard,Evaluation Period,دوره ارزیابی
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,ناشناخته
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,سفارش کار ایجاد نشده است
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,سفارش کار ایجاد نشده است
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
 DocType: Purchase Invoice,Export Type,نوع صادرات
 DocType: Salary Slip Loan,Salary Slip Loan,وام وام لغزش
@@ -4328,7 +4355,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,خلاصه بازخوانی صورتحساب
 DocType: Education Settings,Education Manager,مدیر آموزش
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,حداقل طول بین هر گیاه در این زمینه برای رشد مطلوب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",مورد بسته بندی های کوچک {0} نمی تواند با استفاده سهام آشتی به روز می شود، به جای استفاده از سهام ورودی
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",مورد بسته بندی های کوچک {0} نمی تواند با استفاده سهام آشتی به روز می شود، به جای استفاده از سهام ورودی
 DocType: Quality Inspection,Report Date,گزارش تخلف
 DocType: Student,Middle Name,نام پدر
 DocType: C-Form,Invoices,فاکتورها
@@ -4359,20 +4386,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,اعلام وصول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,اعلام وصول
 ,Sales Register,ثبت فروش
 DocType: Daily Work Summary Group,Send Emails At,ارسال ایمیل در
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,فرم مشاهده
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,تأیید کننده هزینه مورد نیاز در هزینه ادعا
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",کاربران را به سازمان خود اضافه کنید، به غیر از خودتان.
 DocType: Customer Group,Customer Group Name,نام گروه مشتری
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,بدون مشتریان هنوز!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,صورت جریان وجوه نقد
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,درخواست مادری ایجاد نشد
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,مجوز
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
@@ -4395,11 +4423,12 @@
 DocType: Vehicle,Chassis No,شاسی
 DocType: Payment Request,Initiated,آغاز
 DocType: Production Plan Item,Planned Start Date,برنامه ریزی تاریخ شروع
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,لطفا یک BOM را انتخاب کنید
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,لطفا یک BOM را انتخاب کنید
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC یکپارچه مالیاتی به دست آورد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
+DocType: Bank Guarantee,Clauses and Conditions,مقررات و شرایط
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
 DocType: Project Task,View Timesheet,نمایش جدول زمانی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,تاریخ پایان باید از تاریخ شروع باشد
 DocType: Leave Type,Is Encash,آیا Encash
 DocType: Leave Allocation,New Leaves Allocated,برگ جدید اختصاص داده شده
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
@@ -4413,9 +4442,10 @@
 DocType: Patient,Alcohol Current Use,مصرف الکل فعلی
 DocType: Student Admission Program,Student Admission Program,برنامه پذیرش دانشجویی
 DocType: Payment Entry,Account Paid To,حساب پرداخت به
+DocType: Subscription Settings,Grace Period,مهلت
 DocType: Item Alternative,Alternative Item Name,نام جایگزین
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",نمیتوان هیچ لغزش حقوق را ارائه کرد <br> \ دلایل ممکن: <br> \ 1. پرداخت خالص کمتر از 0 است. <br> \ 2. آدرس ایمیل شرکت مشخص شده در کارمند کارمند معتبر نیست. <br>
@@ -4425,7 +4455,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} بودجه برای حساب {1} در برابر {2} {3} است {4}. آن خواهد شد توسط بیش از {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,از تعداد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,و غیرفعال شده غیر فعال در
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,سری الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,خدمات مالی
 DocType: Student Sibling,Student ID,ID دانش آموز
@@ -4437,14 +4466,16 @@
 DocType: Complaint,Complaint,شکایت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,وارد حساب بازپرداخت شوید
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,همه گروه ها
 DocType: Patient,Alcohol Past Use,مصرف الکل گذشته
 DocType: Fertilizer Content,Fertilizer Content,محتوای کود
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,کروم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,کروم
 DocType: Project Update,Problematic/Stuck,مشکلی / گیر کرده
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
 DocType: Share Transfer,Transfer,انتقال
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,سفارش کار {0} باید قبل از لغو این سفارش فروش لغو شود
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
@@ -4468,10 +4499,11 @@
 DocType: Cheque Print Template,Message to show,پیام را نشان می دهد
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,خرده فروشی
 DocType: Student Attendance,Absent,غایب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,بسته نرم افزاری محصولات
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,نمیتوان نتیجه را با {0} پیدا کرد. شما باید امتیازات ایستاده را پوشش دهید 0 تا 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
+DocType: Subscription,Current Invoice Start Date,تاریخ شروع فاکتور
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: یا بدهی یا مقدار اعتبار مورد نیاز است برای {2}
 DocType: GL Entry,Remarks,سخنان
@@ -4481,11 +4513,13 @@
 DocType: Task,Parent Task,وظیفه والدین
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,را سرب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,چاپ و لوازم التحریر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,چاپ و لوازم التحریر
 DocType: Stock Settings,Show Barcode Field,نمایش بارکد درست
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ارسال ایمیل کننده
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",حقوق و دستمزد در حال حاضر برای دوره بین {0} و {1}، ترک دوره نرم افزار نمی تواند بین این محدوده تاریخ پردازش شده است.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ارسال ایمیل کننده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",حقوق و دستمزد در حال حاضر برای دوره بین {0} و {1}، ترک دوره نرم افزار نمی تواند بین این محدوده تاریخ پردازش شده است.
+DocType: Fiscal Year,Auto Created,خودکار ایجاد شده است
 DocType: Chapter Member,Leave Reason,دلیل را ترک کنید
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,فاکتور {0} دیگر وجود ندارد
 DocType: Guardian Interest,Guardian Interest,نگهبان علاقه
 DocType: Volunteer,Availability,دسترسی
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,تنظیمات پیش فرض برای حسابهای POS
@@ -4493,14 +4527,13 @@
 DocType: Project,Time to send,زمان ارسال
 DocType: Timesheet,Employee Detail,جزئیات کارمند
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID ایمیل
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,روز تاریخ بعدی و تکرار در روز ماه باید برابر باشد
 DocType: Lab Prescription,Test Code,کد تست
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,تنظیمات برای صفحه اصلی وب سایت
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ها برای {0} مجاز نیستند چرا که یک کارت امتیازی از {1}
 DocType: Job Offer,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,در بالا
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},مجموع مقدار {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},مجموع مقدار {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ذکر است اگر غیر استاندارد حساب های قابل پرداخت
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',لطفا گروه ارزیابی غیر از &#39;همه گروه ارزیابی &quot;را انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ردیف {0}: مرکز هزینه برای یک مورد مورد نیاز است {1}
@@ -4511,7 +4544,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,تجزیه و تحلیل آب
 DocType: Chapter,Region,منطقه
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,تجزیه و تحلیل مرتبط با بارگیری مجدد
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
@@ -4527,7 +4560,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,هزینه دارایی اوراق
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
 DocType: Vehicle,Policy No,سیاست هیچ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 DocType: Asset,Straight Line,خط مستقیم
 DocType: Project User,Project User,پروژه کاربر
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,شکاف
@@ -4563,21 +4596,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,مسیر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,می تواند مرکز هزینه به دفتر تبدیل کند آن را به عنوان گره فرزند
 DocType: Production Plan,Total Planned Qty,تعداد کل برنامه ریزی شده
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ارزش باز
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ارزش باز
 DocType: Salary Detail,Formula,فرمول
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,سریال #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سریال #
 DocType: Lab Test Template,Lab Test Template,آزمایش آزمایشی
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,حساب فروش
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,حساب فروش
 DocType: Purchase Invoice Item,Total Weight,وزن مجموع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,کمیسیون فروش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,کمیسیون فروش
 DocType: Job Offer Term,Value / Description,ارزش / توضیحات
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 DocType: Purchase Order Item,Expected Delivery Date,انتظار می رود تاریخ تحویل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ورود به رستوران
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
 DocType: Asset Maintenance Task,Assign To Name,اختصاص به نام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,هزینه سرگرمی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,هزینه سرگرمی
 DocType: Hub Settings,Enabled Users,کاربران فعال شده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,را درخواست پاسخ به مواد
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},مورد باز {0}
@@ -4590,24 +4623,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,برنامه های کاربردی برای مرخصی.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
 DocType: Vehicle,Last Carbon Check,آخرین چک کربن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,هزینه های قانونی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,هزینه های قانونی
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,لطفا مقدار را در ردیف را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,افتتاح حساب های خرید و فروش
 DocType: Purchase Invoice,Posting Time,مجوز های ارسال و زمان
 DocType: Timesheet,% Amount Billed,٪ مبلغ صورتحساب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,هزینه تلفن
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,هزینه تلفن
 DocType: Sales Partner,Logo,آرم
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,بررسی این اگر شما می خواهید به زور کاربر برای انتخاب یک سری قبل از ذخیره. خواهد شد وجود ندارد به طور پیش فرض اگر شما این تیک بزنید.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
 DocType: Email Digest,Open Notifications,گسترش اطلاعیه
 DocType: Payment Entry,Difference Amount (Company Currency),تفاوت در مقدار (شرکت ارز)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,هزینه های مستقیم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,هزینه های مستقیم
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,هزینه های سفر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},اشتراک فیلد سفارشی را در doctype {0} اضافه کنید
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
 DocType: Purchase Receipt Item,Sample Quantity,تعداد نمونه
+DocType: Bank Guarantee,Name of Beneficiary,نام كاربر
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",به روز رسانی BOM هزینه به طور خودکار از طریق زمانبند، بر اساس آخرین ارزش نرخ نرخ / نرخ قیمت / آخرین نرخ خرید مواد خام.
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
@@ -4619,14 +4652,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,عفو مشروط
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,قطعات حقوق و دستمزد
 DocType: Program Enrollment Tool,New Academic Year,سال تحصیلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,بازگشت / اعتباری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,بازگشت / اعتباری
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,کل مقدار پرداخت
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,کل مقدار پرداخت
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,انتقال تعداد
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ناوبری
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,برنامه ریزی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,برنامه ریزی
 DocType: Share Balance,Issued,صادر
+DocType: Loan,Repayment Start Date,تاریخ شروع بازپرداخت
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,فعالیت دانشجویی
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,تامین کننده کد
 DocType: Payment Request,Payment Gateway Details,پرداخت جزئیات دروازه
@@ -4639,10 +4673,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع برگ مانند گاه به گاه، بیمار و غیره
 DocType: Email Digest,Send regular summary reports via Email.,ارسال گزارش خلاصه به طور منظم از طریق ایمیل.
 DocType: Payment Entry,PE-,پلی اتیلن-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
 DocType: Assessment Result,Student Name,نام دانش آموز
 DocType: Brand,Item Manager,مدیریت آیتم ها
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,حقوق و دستمزد پرداختنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,حقوق و دستمزد پرداختنی
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
 DocType: Plant Analysis,Collection Datetime,مجموعه زمان تاریخ
 DocType: Work Order,Total Operating Cost,مجموع هزینه های عملیاتی
@@ -4652,9 +4686,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,کاربر {0} وجود ندارد
 DocType: Payment Term,Day(s) after invoice date,روز (ها) پس از تاریخ فاکتور
 DocType: Payment Schedule,Payment Schedule,برنامه زمانی پرداخت
-DocType: Subscription,SUB-,زیر-
 DocType: Item Attribute Value,Abbreviation,مخفف
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ورود پرداخت در حال حاضر وجود دارد
+DocType: Subscription,Trial Period End Date,تاریخ پایان دوره آزمایشی
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized نه از {0} بیش از محدودیت
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,کارشناسی ارشد قالب حقوق و دستمزد.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,آسيب شناسي
@@ -4671,9 +4705,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,همه گروه های مشتری
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,همه گروه های مشتری
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,انباشته ماهانه
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید سوابق تبادل ارز برای {1} به {2} ایجاد نشده است.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید سوابق تبادل ارز برای {1} به {2} ایجاد نشده است.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,قالب مالیات اجباری است.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
@@ -4682,14 +4716,15 @@
 DocType: Lab Prescription,Test Created,تست ایجاد شده
 DocType: Healthcare Settings,Custom Signature in Print,امضا سفارشی در چاپ
 DocType: Account,Temporary,موقت
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,مشتری LPO شماره
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,مشتری LPO شماره
 DocType: Program,Courses,دوره های آموزشی
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,دبیر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,دبیر
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",اگر غیر فعال کردن، »به عبارت&quot; درست نخواهد بود در هر معامله قابل مشاهده
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,این اقدام حسابداری آینده را متوقف خواهد کرد. آیا مطمئن هستید که میخواهید این اشتراک را لغو کنید؟
 DocType: Serial No,Distinct unit of an Item,واحد مجزا از یک آیتم
 DocType: Supplier Scorecard Criteria,Criteria Name,معیار نام
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,لطفا مجموعه شرکت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,لطفا مجموعه شرکت
 DocType: Pricing Rule,Buying,خرید
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,بیماری ها و کود
 DocType: HR Settings,Employee Records to be created by,سوابق کارمند به ایجاد شود
@@ -4698,17 +4733,17 @@
 DocType: POS Profile,Apply Discount On,درخواست تخفیف
 DocType: Member,Membership Type,نوع عضویت
 ,Reqd By Date,Reqd بر اساس تاریخ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,طلبکاران
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,طلبکاران
 DocType: Assessment Plan,Assessment Name,نام ارزیابی
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,نمایش PDC در چاپ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,نمایش PDC در چاپ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ردیف # {0}: سریال نه اجباری است
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات حکیم مالیات
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,پیشنهاد کار
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,مخفف موسسه
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},تعداد ({0}) نمی تواند یک کسر در ردیف {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},تعداد ({0}) نمی تواند یک کسر در ردیف {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
@@ -4726,7 +4761,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,واریانس ها
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",اگر فعال باشد، سیستم مطالب حسابداری برای موجودی ارسال به صورت خودکار.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,حق العمل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,حضور و غیاب برای کارکنان {0} در حال حاضر برای این روز را گرامی می
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,حضور و غیاب برای کارکنان {0} در حال حاضر برای این روز را گرامی می
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",در دقیقه به روز رسانی از طریق &#39;زمان ورود &quot;
 DocType: Customer,From Lead,از سرب
@@ -4737,6 +4772,7 @@
 DocType: Lab Test,Approved Date,تاریخ تأیید
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
+DocType: Subscriber,Subscriber Name,نام مشترک
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Update Tool,Replace,جایگزین کردن
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,هیچ محصولی وجود ندارد پیدا شده است.
@@ -4746,19 +4782,18 @@
 DocType: Request for Quotation Item,Project Name,نام پروژه
 DocType: Customer,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},حساب درآمد سود را در وام کارمند انتخاب کنید {0}
 DocType: Work Order,Required Items,اقلام مورد نیاز
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,منابع انسانی
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,آشتی پرداخت
 DocType: Disease,Treatment Task,وظیفه درمان
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,دارایی های مالیاتی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,دارایی های مالیاتی
 DocType: BOM Item,BOM No,BOM بدون
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Update Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,تجهیزات الکترونیکی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,تجهیزات الکترونیکی
 DocType: Asset,Maintenance Required,تعمیر و نگهداری مورد نیاز است
 DocType: Account,Debit,بدهی
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
@@ -4767,7 +4802,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,برجسته AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مجموعه اهداف مورد گروه عاقلانه برای این فرد از فروش.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],سهام یخ قدیمی تر از [روز]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ردیف # {0}: دارایی برای دارائی های ثابت خرید / فروش اجباری است
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ردیف # {0}: دارایی برای دارائی های ثابت خرید / فروش اجباری است
 DocType: Asset Maintenance Team,Maintenance Team Name,نام تیم تعمیر و نگهداری
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",اگر دو یا چند قوانین قیمت گذاری هستند در بر داشت بر اساس شرایط فوق، اولویت اعمال می شود. اولویت یک عدد بین 0 تا 20 است در حالی که مقدار پیش فرض صفر (خالی) است. تعداد بالاتر به معنی آن خواهد ارجحیت دارد اگر قوانین قیمت گذاری های متعدد را با شرایط مشابه وجود دارد.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,اگر &quot;فرصت از&quot; به عنوان مشتری انتخاب شود، مشتری اجباری است
@@ -4776,19 +4811,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,اجازه می دهد کاربران زیر به تصویب برنامه های کاربردی را برای روز مسدود کند.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,انواع ادعای هزینه.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},نرخ برای آیتم فروش {0} کمتر از است {1} آن است. نرخ فروش باید حداقل {2}
-DocType: Item,Taxes,عوارض
+DocType: Subscription,Taxes,عوارض
 DocType: Purchase Invoice,capital goods,کالاهای سرمایه ای
 DocType: Purchase Invoice Item,Weight Per Unit,وزن در واحد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,پرداخت و تحویل داده نشده است
 DocType: Project,Default Cost Center,مرکز هزینه به طور پیش فرض
-DocType: Bank Guarantee,End Date,تاریخ پایان
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,معاملات سهام
 DocType: Budget,Budget Accounts,حساب بودجه
 DocType: Employee,Internal Work History,تاریخچه کار داخلی
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,انباشته مبلغ استهلاک
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,متغیر کارت امتیازی تامین کننده
-DocType: Employee Loan,Fully Disbursed,به طور کامل پرداخت شده
 DocType: Employee Advance,Due Advance Amount,مبلغ پیش پرداخت
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
@@ -4812,7 +4845,7 @@
 ,Employee Information,اطلاعات کارمند
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,قالب های پیش فرض مالی برای فروش و خرید ایجاد می شوند.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,ارزیابی نتیجه نتیجه {0} در حال حاضر وجود دارد.
@@ -4820,7 +4853,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا مجموعه شرکت فیلتر خالی اگر گروه توسط است شرکت &#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,مجوز های ارسال و تاریخ نمی تواند تاریخ آینده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,برای تولید دوره تکراری
 DocType: Stock Entry,Target Warehouse Address,آدرس انبار هدف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,مرخصی گاه به گاه
 DocType: Agriculture Task,End Day,روز پایان
@@ -4845,11 +4877,10 @@
 DocType: Material Request,% Ordered,مرتب٪
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",برای دوره بر اساس گروه دانشجویی، دوره خواهد شد برای هر دانشجو از دوره های ثبت نام شده در برنامه ثبت نام تایید شده است.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,کار از روی مقاطعه
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,اوسط نرخ خرید
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,اوسط نرخ خرید
 DocType: Share Balance,From No,از شماره
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},پیام جدید از {sender}
 DocType: Customer,Customer Primary Address,آدرس اصلی مشتری
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامه
 DocType: Drug Prescription,Description/Strength,توضیحات / قدرت
@@ -4858,22 +4889,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,آیتم همان وارد شده است چندین بار
 DocType: Department,Leave Block List,ترک فهرست بلوک
 DocType: Purchase Invoice,Tax ID,ID مالیات
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
 DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,تایید
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",آدرس ضمیمه شده برای {0}، لطفا برای ادامه ادامه دهید
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",آدرس ضمیمه شده برای {0}، لطفا برای ادامه ادامه دهید
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",تعداد حساب جدید، آن را در نام حساب به عنوان پیشوند گنجانده خواهد شد
 DocType: Maintenance Team Member,Team Member,عضو تیم
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,هیچ نتیجهای برای ارسال وجود ندارد
 DocType: Customer,Sales Partner and Commission,شریک فروش و کمیسیون
-DocType: Employee Loan,Rate of Interest (%) / Year,نرخ بهره (٪) / سال
+DocType: Loan,Rate of Interest (%) / Year,نرخ بهره (٪) / سال
 ,Project Quantity,تعداد پروژه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر
 DocType: Opportunity,To Discuss,به بحث در مورد
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} برای تکمیل این معامله.
 DocType: Loan Type,Rate of Interest (%) Yearly,نرخ بهره (٪) سالانه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,حساب موقت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,سیاه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,حساب موقت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,سیاه
 DocType: BOM Explosion Item,BOM Explosion Item,BOM مورد انفجار
 DocType: Shareholder,Contact List,لیست مخاطبین
 DocType: Account,Auditor,ممیز
@@ -4881,16 +4912,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} کالاهای تولید شده
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,بیشتر بدانید
 DocType: Cheque Print Template,Distance from top edge,فاصله از لبه بالا
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,لیست قیمت {0} غیر فعال است و یا وجود ندارد
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,لیست قیمت {0} غیر فعال است و یا وجود ندارد
 DocType: Purchase Invoice,Return,برگشت
 DocType: Pricing Rule,Disable,از کار انداختن
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,نحوه پرداخت مورد نیاز است را به پرداخت
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,نحوه پرداخت مورد نیاز است را به پرداخت
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",ویرایش در صفحه کامل برای گزینه های بیشتر مانند دارایی، شماره سریال، دسته و غیره
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,انتصاب و مشاوره
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} در دسته ای ثبت نام نشده {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",دارایی {0} نمی تواند اوراق شود، آن است که در حال حاضر {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,چک مورد نیاز
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,چک مورد نیاز
 DocType: Task,Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,علامت گذاری به عنوان غایب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,شرکت راه اندازی نشد
@@ -4902,7 +4933,7 @@
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,مدیریت ناوگان
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,اضافه کردن آیتم از
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,اضافه کردن آیتم از
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,گیاهان و زمین
 DocType: Cheque Print Template,Regular,منظم
 DocType: Fertilizer,Density (if liquid),تراکم (در صورت مایع)
@@ -4927,24 +4958,26 @@
 DocType: Payment Entry,Paid Amount,مبلغ پرداخت
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,کاوش چرخه فروش
 DocType: Assessment Plan,Supervisor,سرپرست
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,ورودی نگهداری سهام
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,ورودی نگهداری سهام
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 ,Work Order Stock Report,سفارش کار سفارش سفارش
+DocType: Purchase Receipt,Auto Repeat Detail,جزئیات تکراری خودکار
 DocType: Assessment Result Tool,Assessment Result Tool,ابزار ارزیابی نتیجه
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,به عنوان سرپرست
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,پیشنهاد رده
 DocType: BOM Scrap Item,BOM Scrap Item,BOM مورد ضایعات
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,مدیریت کیفیت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,مدیریت کیفیت
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,مورد {0} غیرفعال شده است
 DocType: Project,Total Billable Amount (via Timesheets),مجموع مبلغ قابل پرداخت (از طریق Timesheets)
 DocType: Agriculture Task,Previous Business Day,روز کاری قبلی
-DocType: Employee Loan,Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره
+DocType: Loan,Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره
 DocType: Employee,Health Insurance No,شماره بیمه درمانی
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,اعتباری مبلغ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,اعتباری مبلغ
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,مقدار کل مالیاتی
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Opening Invoice Creation Tool,Purchase,خرید
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,تعداد موجودی
@@ -4955,15 +4988,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} برای {1}
 DocType: Healthcare Settings,Valid number of days,تعداد روزهای معتبر
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,مراکز هزینه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,راه اندازی مجدد اشتراک
 DocType: Land Unit,Linked Plant Analysis,مرتبط با تجزیه و تحلیل گیاه
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,سرعت که در آن عرضه کننده کالا در ارز به ارز پایه شرکت تبدیل
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ردیف # {0}: درگیری های تنظیم وقت با ردیف {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه رای دادن به ارزش گذاری صفر
+DocType: Bank Guarantee,Receiving,دریافت
 DocType: Training Event Employee,Invited,دعوت کرد
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,چند ساختار حقوق و دستمزد فعال برای کارکنان {0} برای تاریخ داده شده پیدا شده
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,راه اندازی حساب های دروازه.
 DocType: Employee,Employment Type,نوع استخدام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,دارایی های ثابت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,دارایی های ثابت
 DocType: Payment Entry,Set Exchange Gain / Loss,تنظیم اوراق بهادار کاهش / افزایش
 ,GST Purchase Register,GST خرید ثبت نام
 ,Cash Flow,جریان وجوه نقد
@@ -4983,9 +5018,10 @@
 DocType: Academic Term,Term Start Date,مدت تاریخ شروع
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,فهرست همه تراکنشهای اشتراکی
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,تعداد روبروی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,هر دو تاریخچه تاریخچه دادگاه و تاریخ پایان تاریخ پرونده باید تعیین شود
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,میانگین امتیازات
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,مجموع مبلغ پرداختی در برنامه پرداخت باید برابر با مقدار Grand / Rounded باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,مجموع مبلغ پرداختی در برنامه پرداخت باید برابر با مقدار Grand / Rounded باشد
+DocType: Subscription Plan Detail,Plan,طرح
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,تعادل بیانیه بانک به عنوان در هر لجر عمومی
 DocType: Job Applicant,Applicant Name,نام متقاضی
 DocType: Authorization Rule,Customer / Item Name,مشتری / نام آیتم
@@ -5015,6 +5051,7 @@
 DocType: Work Order,Warehouses,ساختمان و ذخیره سازی
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} دارایی نمی تواند منتقل شود
 DocType: Hotel Room Pricing,Hotel Room Pricing,قیمت اتاق هتل
+DocType: Subscription,Days Until Due,روز تا زمان تحقق
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,این مورد یک نوع از {0} (الگو) است.
 DocType: Workstation,per hour,در ساعت
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,خرید
@@ -5023,13 +5060,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",برای دسته ای بر اساس گروه دانشجو، دسته ای دانشجو خواهد شد برای هر دانش آموز از ثبت نام برنامه تایید شده است.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,توزیع
+DocType: Journal Entry Account,Loan,وام
 DocType: Expense Claim Advance,Expense Claim Advance,پیش پرداخت هزینه
 DocType: Lab Test,Report Preference,اولویت گزارش
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,اطلاعات داوطلب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,مدیر پروژه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,مدیر پروژه
 ,Quoted Item Comparison,مورد نقل مقایسه
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},همپوشانی در نمره بین {0} و {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,اعزام
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,ارزش خالص دارایی ها به عنوان بر روی
 DocType: Crop,Produce,تولید کردن
@@ -5039,7 +5077,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,مصرف مواد برای ساخت
 DocType: Item Alternative,Alternative Item Code,کد مورد دیگر
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,انتخاب موارد برای ساخت
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,انتخاب موارد برای ساخت
 DocType: Delivery Stop,Delivery Stop,توقف تحویل
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
 DocType: Item,Material Issue,شماره مواد
@@ -5049,15 +5087,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
 DocType: BOM,Show Items,نمایش آیتم ها
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,از زمان نمی تواند بیشتر از به زمان.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,آیا می خواهید تمام ایمیل ها را به مشتریان اطلاع دهید؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,آیا می خواهید تمام ایمیل ها را به مشتریان اطلاع دهید؟
+DocType: Subscription Plan,Billing Interval,فاصله گفتگو
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ادامه
 DocType: Hub Settings,Hub Username,نام کاربری هاب
 DocType: Salary Detail,Component,مولفه
 DocType: Assessment Criteria,Assessment Criteria Group,معیارهای ارزیابی گروه
 DocType: Healthcare Settings,Patient Name By,نام بیمار توسط
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},ورود مجله Accruable برای حقوق از {0} به {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},ورود مجله Accruable برای حقوق از {0} به {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
 DocType: Warehouse,Warehouse Name,نام انبار
 DocType: Naming Series,Select Transaction,انتخاب معامله
@@ -5071,22 +5109,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
 DocType: Leave Block List,Applies to Company,امر به شرکت
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
-DocType: Employee Loan,Disbursement Date,تاریخ پرداخت
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;گیرندگان&quot; مشخص نشده اند
+DocType: Loan,Disbursement Date,تاریخ پرداخت
 DocType: BOM Update Tool,Update latest price in all BOMs,به روز رسانی آخرین قیمت در تمام BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,پرونده پزشکی
 DocType: Vehicle,Vehicle,وسیله نقلیه
 DocType: Purchase Invoice,In Words,به عبارت
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,قبل از ارسال، نام بانک یا موسسه وام را وارد کنید.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} باید ارسال شود
 DocType: POS Profile,Item Groups,گروه مورد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,امروز {0} تولد است!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,امروز {0} تولد است!
 DocType: Sales Order Item,For Production,برای تولید
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,لطفا یک حساب باز کردن موقت در نمودار حساب اضافه کنید
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,لطفا یک حساب باز کردن موقت در نمودار حساب اضافه کنید
 DocType: Customer,Customer Primary Contact,تماس اولیه مشتری
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,دوره تعطیل مجله
 DocType: Project Task,View Task,مشخصات کار
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /٪ سرب
+DocType: Bank Guarantee,Bank Guarantee Type,نوع تضمین بانکی
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,بخش فاکتور
 ,Asset Depreciations and Balances,Depreciations دارایی و تعادل
@@ -5097,9 +5136,8 @@
 DocType: Production Plan,Include Subcontracted Items,شامل موارد زیر قرارداد
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,پس از تبدیل سهام می توانید خواص Variant را تغییر دهید. برای انجام این کار باید یک مورد جدید ایجاد کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
-DocType: Employee Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+DocType: Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},درخواست پرداخت در مقابل {0} {1} برای مقدار {2}
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
@@ -5123,11 +5161,11 @@
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,گروه مورد تکراری در جدول گروه مورد
 DocType: Land Unit,Parent Land Unit,واحد زمین والدین
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
 DocType: Fertilizer,Fertilizer Name,نام کود
 DocType: Salary Slip,Net Pay,پرداخت خالص
 DocType: Cash Flow Mapping Accounts,Account,حساب
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
 ,Requested Items To Be Transferred,آیتم ها درخواست می شود منتقل
 DocType: Expense Claim,Vehicle Log,ورود خودرو
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود تب (دماي 38.5 درجه سانتی گراد / 101.3 درجه فارنهایت یا دمای پایدار&gt; 38 درجه سانتی گراد / 100.4 درجه فارنهایت)
@@ -5168,24 +5206,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
 DocType: Asset Maintenance,Manufacturing User,ساخت کاربری
 DocType: Purchase Invoice,Raw Materials Supplied,مواد اولیه عرضه شده
-DocType: C-Form,Series,سلسله
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},ارزش لیست قیمت {0} باید {1} یا {2} باشد
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Soil Texture,Ternary Plot,قطعه سه بعدی
 DocType: Item Group,Item Classification,طبقه بندی مورد
 DocType: Driver,License Number,شماره پروانه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,مدیر توسعه تجاری
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,مدیر توسعه تجاری
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,هدف نگهداری سایت
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ثبت نام بیمار صورتحساب
 DocType: Crop,Period,دوره
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,لجر عمومی
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},کارمند {0} در مرخصی در {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},کارمند {0} در مرخصی در {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,مشخصات آگهی
 DocType: Program Enrollment Tool,New Program,برنامه جدید
 DocType: Item Attribute Value,Attribute Value,موجودیت مقدار
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 DocType: Salary Detail,Salary Detail,جزئیات حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 DocType: Appointment Type,Physician,پزشک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشاوره
@@ -5193,15 +5230,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) نمیتواند بیشتر از مقدار برنامه ریزی ({2}) در سفارش کاری باشد {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورق زمان برای تولید.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,جمع جزء
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,پس از معاملات بورس نمی تواند خواص Variant را تغییر دهد. برای انجام این کار باید یک مورد جدید ایجاد کنید.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless مجوز SEPA
 DocType: Physician,Charges,اتهامات
 DocType: Production Plan,Get Items For Work Order,دریافت اقلام برای سفارش کار
 DocType: Salary Detail,Default Amount,مقدار پیش فرض
 DocType: Lab Test Template,Descriptive,توصیفی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,انبار در سیستم یافت نشد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,انبار در سیستم یافت نشد
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,خلاصه این ماه
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,یک هدف فروش که میخواهید برای شرکتتان به دست آورید، تنظیم کنید.
 ,Project wise Stock Tracking,پروژه پیگیری سهام عاقلانه
@@ -5229,11 +5267,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,وب سایت ایجاد نشد
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,مقدار ضمانت موجود ایجاد شده یا مقدار نمونه ارائه نشده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,مقدار ضمانت موجود ایجاد شده یا مقدار نمونه ارائه نشده است
 DocType: Program,Program Abbreviation,مخفف برنامه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
 DocType: Warranty Claim,Resolved By,حل
-DocType: Bank Guarantee,Start Date,تاریخ شروع
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,اختصاص برگ برای یک دوره.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چک و واریز وجه به اشتباه پاک
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
@@ -5248,11 +5285,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعت
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
 DocType: Purchase Invoice,04-Correction in Invoice,04 اصلاح در صورتحساب
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,سفارش کار برای همه موارد با BOM ایجاد شده است
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,سفارش کار برای همه موارد با BOM ایجاد شده است
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,گزارش جزئیات متغیر
 DocType: Setup Progress Action,Setup Progress Action,راه اندازی پیشرفت اقدام
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,لیست قیمت خرید
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,لیست قیمت خرید
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,لغو عضویت
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,لطفا وضعیت تعمیر و نگهداری را به عنوان تکمیل کنید یا تاریخ تکمیل را حذف کنید
 DocType: Supplier,Default Payment Terms Template,قالب پرداخت پیش فرض
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,واحد ارز تراکنش باید با واحد ارز درگاه پرداخت یکسان باشد
@@ -5263,7 +5301,6 @@
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,اکشن اگر انباشته بودجه ماهانه بیش از حد
-DocType: Subscription,Submit on creation,ارسال در ایجاد
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},ارز برای {0} باید {1}
 DocType: Asset,Disposal Date,تاریخ دفع
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ایمیل خواهد شد به تمام کارمندان فعال این شرکت در ساعت داده ارسال می شود، اگر آنها تعطیلات ندارد. خلاصه ای از پاسخ های خواهد شد در نیمه شب فرستاده شده است.
@@ -5281,6 +5318,7 @@
 DocType: Batch,Parent Batch,دسته ای پدر و مادر
 DocType: Cheque Print Template,Cheque Print Template,چک الگو چاپ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,نمودار مراکز هزینه
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,تعداد روزهای پس از تاریخ فاکتور قبل از لغو اشتراک یا علامتگذاری اشتراک به عنوان بدون پرداخت هزینه سپری شده است
 DocType: Lab Test Template,Sample Collection,مجموعه نمونه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
 DocType: Price List,Price List Name,لیست قیمت نام
@@ -5289,7 +5327,7 @@
 DocType: Account,Income,درامد
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,مشکلی!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
 DocType: Supplier Scorecard Scoring Criteria,Score,نمره
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,سال مالی {0} وجود ندارد
@@ -5309,12 +5347,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} باید یک مقدار بین 0 تا 100 باشد
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,تاریخ انقضا بعدی نمیتواند قبل از تاریخ موجود بودن برای استفاده باشد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,نا امن وام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,نا امن وام
 DocType: Cost Center,Cost Center Name,هزینه نام مرکز
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,حداکثر ساعات کار در برابر برنامه زمانی
 DocType: Maintenance Schedule Detail,Scheduled Date,تاریخ برنامه ریزی شده
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,مجموع پرداخت AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,مجموع پرداخت AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,پیام های بزرگتر از 160 کاراکتر خواهد شد را به چندین پیام را تقسیم
 DocType: Purchase Receipt Item,Received and Accepted,دریافت و پذیرفته
 DocType: Hub Settings,Company and Seller Profile,مشخصات شرکت و فروشنده
@@ -5328,10 +5366,9 @@
 DocType: Item,Variant Based On,بر اساس نوع
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,تامین کنندگان شما
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,لطفا اصلاح کنید
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 DocType: Request for Quotation Item,Supplier Part No,کننده قسمت بدون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,ناشناس
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,دریافت شده از
 DocType: Lead,Converted,مبدل
@@ -5345,6 +5382,7 @@
 DocType: Asset,Assets,دارایی های
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
+DocType: Subscription,Current Invoice End Date,تاریخ پایان اعتبار فاکتور
 DocType: Payment Term,Due Date Based On,تاریخ بر اساس تاریخ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,لطفا گروه مشتری و قلمرو پیش فرض را در تنظیمات فروش تنظیم کنید
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} وجود ندارد
@@ -5352,7 +5390,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,هیچ مجوزی برای ورود مجله انتخاب نشده است
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
+DocType: Loan,Disbursed,پرداخت شده
 DocType: Healthcare Settings,Laboratory Settings,تنظیمات آزمایشگاهی
 DocType: Patient Appointment,Service Unit,واحد خدمات
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,تامین کننده موفقیت آمیز است
@@ -5365,12 +5405,12 @@
 DocType: Share Balance,No of Shares,بدون سهام
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,وضعیت را انتخاب کنید
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: School House,House Name,نام خانه
 DocType: Fee Schedule,Total Amount per Student,مجموع مبلغ در هر دانش آموز
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,برق
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,اضافه کردن بقیه سازمان خود را به عنوان کاربران خود را. شما همچنین می توانید دعوت مشتریان به پورتال خود را اضافه کنید با اضافه کردن آنها از اطلاعات تماس
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
 DocType: Grant Application,Requested Amount,مقدار درخواست شده
@@ -5380,7 +5420,7 @@
 DocType: Crop Cycle,Detected Diseases,بیماری های شناسایی شده
 DocType: Stock Entry,Default Source Warehouse,به طور پیش فرض منبع انبار
 DocType: Item,Customer Code,کد مشتری
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 DocType: Asset Maintenance Task,Last Completion Date,آخرین تاریخ تکمیل
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
@@ -5388,9 +5428,10 @@
 DocType: GoCardless Settings,GoCardless Settings,تنظیمات GoCardless
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دارایی های سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,دارایی های سهام
 DocType: Restaurant,Active Menu,منوی فعال
 DocType: Target Detail,Target Qty,هدف تعداد
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},علیه وام: {0}
 DocType: Shopping Cart Settings,Checkout Settings,تنظیمات پرداخت
 DocType: Student Attendance,Present,حاضر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,تحویل توجه داشته باشید {0} باید ارائه شود
@@ -5399,9 +5440,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
 DocType: Vehicle Log,Odometer,کیلومتر شمار
 DocType: Production Plan Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
 DocType: Chapter,Chapter Head,فصل سر
 DocType: Payment Term,Month(s) after the end of the invoice month,ماه (ها) بعد از پایان ماه فاکتور
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,فعالیت پروژه / وظیفه.
@@ -5409,11 +5450,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تولید حقوق و دستمزد ورقه
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,datetime date نت نمی تواند قبل از datetime test باشد
 DocType: POS Profile,Allow user to edit Discount,اجازه کاربر به ویرایش تخفیف
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,مشتریان را از
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,مشتریان را از
 DocType: Purchase Invoice Item,Include Exploded Items,شامل موارد انفجار
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",خرید باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
 DocType: Shipping Rule,Restrict to Countries,محدود به کشورهای
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعت صدور صورت حساب
 DocType: Project,Total Sales Amount (via Sales Order),کل مبلغ فروش (از طریق سفارش خرید)
@@ -5430,6 +5472,7 @@
 DocType: Soil Texture,Sandy Clay,خاک رس شنی
 DocType: Grant Application,Assessment  Manager,مدیر ارزیابی
 DocType: Payment Entry,Allocate Payment Amount,اختصاص مبلغ پرداخت
+DocType: Subscription Plan,Subscription Plan,طرح اشتراک
 DocType: Employee External Work History,Salary,حقوق
 DocType: Serial No,Delivery Document Type,تحویل نوع سند
 DocType: Sales Order,Partly Delivered,تا حدودی تحویل
@@ -5454,9 +5497,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,محدوده سالمندی 2
 DocType: SG Creation Tool Course,Max Strength,حداکثر قدرت
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,نصب ایستگاه از پیش تنظیم
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},هیچ ضمانت تحویل برای مشتری {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},هیچ ضمانت تحویل برای مشتری {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM جایگزین
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,اقلام را براساس تاریخ تحویل انتخاب کنید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,اقلام را براساس تاریخ تحویل انتخاب کنید
 DocType: Grant Application,Has any past Grant Record,هر رکورد قبلی Grant داشته است
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},در دسترس {0}
@@ -5474,7 +5517,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,هزینه مواد اولیه عرضه شده
 DocType: Selling Settings,Settings for Selling Module,تنظیمات برای فروش ماژول
 DocType: Hotel Room Reservation,Hotel Room Reservation,اتاق رزرو هتل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,خدمات مشتریان
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,خدمات مشتریان
 DocType: BOM,Thumbnail,بند انگشتی
 DocType: Item Customer Detail,Item Customer Detail,مورد جزئیات و ضوابط
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,پیشنهاد نامزد یک کار.
@@ -5490,7 +5533,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} دانش آموزان ثبت نام کرده اند
 DocType: Fees,Student Details,جزئیات دانشجو
 DocType: Purchase Invoice Item,Stock Qty,موجودی تعداد
-DocType: Employee Loan,Repayment Period in Months,دوره بازپرداخت در ماه
+DocType: Loan,Repayment Period in Months,دوره بازپرداخت در ماه
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,خطا: نه یک شناسه معتبر است؟
 DocType: Naming Series,Update Series Number,به روز رسانی سری شماره
 DocType: Account,Equity,انصاف
@@ -5499,7 +5542,7 @@
 DocType: Task,Closing Date,اختتامیه عضویت
 DocType: Sales Order Item,Produced Quantity,مقدار زیاد تولید
 DocType: Timesheet,Work Detail,جزئیات کار
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,مهندس
 DocType: Journal Entry,Total Amount Currency,مبلغ کل ارز
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,مجامع جستجو فرعی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
@@ -5544,13 +5587,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,اطلاعات نوع اهدا کننده.
 DocType: Request for Quotation,Supplier Detail,جزئیات کننده
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},اشکال در فرمول یا شرایط: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,مقدار صورتحساب
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,مقدار صورتحساب
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,وزنهای معیار باید تا 100٪
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,حضور
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,انبار قلم
 DocType: BOM,Materials,مصالح
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",اگر بررسی نیست، لیست خواهد باید به هر بخش که در آن به کار گرفته شوند اضافه شده است.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},ایجاد {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,مبدا و مقصد انبار نمی تواند همان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,قالب های مالیاتی برای خرید معاملات.
@@ -5574,14 +5616,14 @@
 DocType: Shipping Rule,Fixed,درست شد
 DocType: Vehicle Service,Clutch Plate,صفحه کلاچ
 DocType: Company,Round Off Account,دور کردن حساب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,هزینه های اداری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,هزینه های اداری
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,مشاور
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
-DocType: Journal Entry,Subscription,اشتراک
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,اشتراک
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ایجاد هزینه در انتظار است
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,مقررات دوره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,مقررات دوره
 DocType: Asset Category,Asset Category Name,دارایی رده نام
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,این یک سرزمین ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نام شخص جدید فروش
@@ -5594,7 +5636,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,باقی بماند اگر شما نمی خواهید به در نظر گرفتن دسته ای در حالی که ساخت گروه های دوره بر اساس.
 DocType: Asset,Frequency of Depreciation (Months),فرکانس استهلاک (ماه)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,حساب اعتباری
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
@@ -5602,7 +5644,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
 DocType: Hub Settings,Company Logo,آرم شرکت
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 DocType: Healthcare Settings,Patient Registration,ثبت نام بیمار
@@ -5636,11 +5678,10 @@
 DocType: Journal Entry,Total Debit,دبیت مجموع
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,به طور پیش فرض به پایان رسید کالا انبار
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,لطفا بیمار را انتخاب کنید
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروشنده
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,فروشنده
 DocType: Hotel Room Package,Amenities,امکانات
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,بودجه و هزینه مرکز
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,حالت پیش پرداخت چندگانه مجاز نیست
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,برای
 ,Appointment Analytics,انتصاب انتصاب
 DocType: Vehicle Service,Half Yearly,نیمی سالانه
 DocType: Lead,Blog Subscriber,وبلاگ مشترک
@@ -5656,6 +5697,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,خالی بگذارید اگر شما را به گروه دانش آموز در سال
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",اگر علامت زده شود، هیچ مجموع. از روز کاری شامل تعطیلات، و این خواهد شد که ارزش حقوق پستها در طول روز کاهش
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",برنامه های کاربردی با استفاده از کلید فعلی قادر به دسترسی نخواهند بود، آیا مطمئن هستید؟
+DocType: Subscription Settings,Prorate,پروانه
 DocType: Purchase Invoice,Total Advance,جستجوی پیشرفته مجموع
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,تغییر قالب کد
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,تاریخ مدت پایان نباید قبل از تاریخ شروع ترم باشد. لطفا تاریخ های صحیح و دوباره امتحان کنید.
@@ -5666,8 +5708,9 @@
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 DocType: Cheque Print Template,Signatory Position,مکان امضاء
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,تنظیم به عنوان از دست رفته
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,تنظیم به عنوان از دست رفته
 DocType: Timesheet,Total Billable Hours,مجموع ساعت قابل پرداخت
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,تعداد روزهایی که مشترکین باید فاکتورهای تولید شده توسط این اشتراک را پرداخت کنند
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,دریافت پرداخت توجه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,این است که در معاملات در برابر این مشتری است. مشاهده جدول زمانی زیر برای جزئیات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از باشد یا برابر است با مقدار ورودی پرداخت {2}
@@ -5686,12 +5729,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,این است که در حضور این کارمند بر اساس
 DocType: Assessment Result,Summary,خلاصه
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,علامتگذاری حضور
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,حساب بانکی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,سفارش اقامت در رستوران
@@ -5703,7 +5746,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ خرید
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,مزایای کارکنان
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,مزایای کارکنان
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Work Order,Manufactured Qty,تولید تعداد
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},سهام با {0} وجود ندارد
@@ -5711,12 +5754,12 @@
 DocType: Asset,Out of Order,خارج از سفارش
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 DocType: Projects Settings,Ignore Workstation Time Overlap,همپوشانی زمان کار ایستگاه را نادیده بگیر
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,تعداد دسته را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 DocType: Patient Service Unit,Medical Administrator,مدیر پزشکی
 DocType: Assessment Plan,Schedule,برنامه
 DocType: Account,Parent Account,پدر و مادر حساب
@@ -5746,15 +5789,16 @@
 DocType: Asset Repair,Repair Status,وضعیت تعمیر
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 DocType: POS Profile,Account for Change Amount,حساب کاربری برای تغییر مقدار
 DocType: Purchase Invoice,input service,خدمات ورودی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,عضو تیم تعمیر و نگهداری
 DocType: Agriculture Analysis Criteria,Soil Analysis,تجزیه و تحلیل خاک
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,کد درس:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,لطفا هزینه حساب وارد کنید
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
 DocType: Employee,Current Address,آدرس فعلی
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
@@ -5802,19 +5846,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},پذیرش برای {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 DocType: Supplier Scorecard Scoring Variable,Variable Name,نام متغیر
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
 DocType: Asset,Asset Category,دارایی رده
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,پرداخت خالص نمی تونه منفی
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,مواد به کننده
 DocType: Soil Texture,Loamy Sand,شن و ماسه Loamy
 DocType: Production Plan,Material Request Planning,برنامه ریزی درخواست مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,فاکتور مالیات کالاهای داخلی
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ بیش از یک بار به نظر می رسد
 DocType: Expense Claim,Employees Email Id,کارکنان پست الکترونیکی شناسه
 DocType: Employee Attendance Tool,Marked Attendance,حضور و غیاب مشخص شده
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,بدهی های جاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,بدهی های جاری
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,تایمر بیش از ساعت داده شده است.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ارسال اس ام اس انبوه به مخاطبین خود
 DocType: Patient,A Positive,آ مثبت
@@ -5825,9 +5869,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,تعداد واقعی الزامی است
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} در حال حاضر یک کارت امتیازی ارائه کننده {1} دارد و سفارشات خرید به این فروشنده باید با احتیاط صادر شود.
 DocType: Asset Maintenance Team,Asset Maintenance Team,تیم پشتیبانی دارایی
-DocType: Employee Loan,Loan Type,نوع وام
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} با موفقیت ارسال شد
+DocType: Loan,Loan Type,نوع وام
 DocType: Scheduling Tool,Scheduling Tool,ابزار برنامه ریزی
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,کارت اعتباری
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا repacked
 DocType: Employee Education,Major/Optional Subjects,عمده / موضوع اختیاری
 DocType: Sales Invoice Item,Drop Ship,قطره کشتی
@@ -5859,7 +5904,7 @@
 DocType: Item,Units of Measure,واحدهای اندازه گیری
 DocType: Manufacturing Settings,Allow Production on Holidays,اجازه تولید در تعطیلات
 DocType: Sales Invoice,Customer's Purchase Order Date,مشتری سفارش خرید عضویت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,سرمایه سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,سرمایه سهام
 DocType: Shopping Cart Settings,Show Public Attachments,نمایش فایل های پیوست عمومی
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
 DocType: Restaurant Reservation,Reservation Time,زمان رزرو
@@ -5874,7 +5919,7 @@
 DocType: Purchase Order,To Receive and Bill,برای دریافت و بیل
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,ردیف # {0}: Reqd توسط تاریخ نمی تواند قبل از تاریخ تراکنش باشد
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,محصولات ویژه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,طراح
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
@@ -5884,20 +5929,20 @@
 DocType: Driver,Expiry Date,تاریخ انقضا
 DocType: Healthcare Settings,Employee name and designation in print,نام و نام کارمند در چاپ
 ,accounts-browser,حساب مرورگر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +13,Project master.,کارشناسی ارشد پروژه.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",اجازه می دهد تا بیش از صدور صورت حساب و یا بیش از سفارش، به روز رسانی &quot;کمک هزینه&quot; در بورس تنظیمات و یا آیتم.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(نیم روز)
 DocType: Payment Term,Credit Days,روز اعتباری
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,لطفا بیمار را برای آزمایش آزمایشات انتخاب کنید
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,را دسته ای دانشجویی
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,سرب زمان روز
 DocType: Cash Flow Mapping,Is Income Tax Expense,آیا هزینه مالیات بر درآمد است؟
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,این بررسی در صورتی که دانشجو است ساکن در خوابگاه مؤسسه است.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
 ,Stock Summary,خلاصه سهام
@@ -5908,10 +5953,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,کد عکس تاریخ
 DocType: Employee,Reason for Leaving,دلیلی برای ترک
 DocType: BOM Operation,Operating Cost(Company Currency),هزینه های عملیاتی (شرکت ارز)
-DocType: Employee Loan Application,Rate of Interest,نرخ بهره
+DocType: Loan Application,Rate of Interest,نرخ بهره
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: Item,Shelf Life In Days,عمر مفید در روز
 DocType: GL Entry,Is Opening,باز
+DocType: Department,Expense Approvers,تأیید کننده هزینه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
 DocType: Journal Entry,Subscription Section,بخش اشتراک
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,حساب {0} وجود ندارد
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 2d4c726..82ec376 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Peru materiaalikäynti {0} ennen takuuanomuksen perumista
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Arviointikertomukset
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Kuluttajatuotteet
-DocType: Purchase Receipt,Subscription Detail,Tilauksen yksityiskohdat
 DocType: Supplier Scorecard,Notify Supplier,Ilmoita toimittajalle
 DocType: Item,Customer Items,Asiakkaan nimikkeet
 DocType: Project,Costing and Billing,Kustannuslaskenta ja laskutus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
 DocType: Item,Publish Item to hub.erpnext.com,Julkaise Tuote on hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,sähköposti-ilmoitukset
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,arviointi
 DocType: Item,Default Unit of Measure,Oletusyksikkö
 DocType: SMS Center,All Sales Partner Contact,kaikki myyntikumppanin yhteystiedot
-DocType: Employee,Leave Approvers,Poissaolojen hyväksyjät
+DocType: Department,Leave Approvers,Poissaolojen hyväksyjät
 DocType: Sales Partner,Dealer,jakaja
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,tutkimukset
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Tarkista saatavuus
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Toimittajaan liittyvät tapahtumat.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Oikeudellinen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Oikeudellinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
 DocType: Bank Guarantee,Customer,Asiakas
 DocType: Purchase Receipt Item,Required By,pyytäjä
 DocType: Delivery Note,Return Against Delivery Note,palautus kohdistettuna lähetteeseen
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Yhtään vahvistettua palkkatositetta ei ole.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Yhtään vahvistettua palkkatositetta ei ole.
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,Vapaatyypin nimi
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näytä auki
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,On välttämätöntä toteuttaa tämä toiminta itsestään edellä mainittujen toistuvasti
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Sarja päivitetty onnistuneesti
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Tarkista
 DocType: Pricing Rule,Apply On,käytä
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
 DocType: Support Settings,Support Settings,Tukiasetukset
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Erä Item Käyt tila
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,pankki sekki
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,pankki sekki
 DocType: Membership,membership validaty section,jäsenyys validaty-osio
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 DocType: Consultation,Consultation,kuuleminen
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaali
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Sivuston luominen
 DocType: Opening Invoice Creation Tool Item,Quantity,Määrä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),lainat (vastattavat)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,valmistumisvuosi
 DocType: Item,Country of Origin,Alkuperämaa
 DocType: Soil Texture,Soil Texture Criteria,Maaperän laatuvaatimukset
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Ensisijaiset yhteystiedot
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Avoimet kysymykset
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Käyttäjä {0} on jo asetettu työsuhteeseen organisaatiossa {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Käyttäjä {0} on jo asetettu työsuhteeseen organisaatiossa {1}
 DocType: Lab Test Groups,Add new line,Lisää uusi rivi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,terveydenhuolto
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
@@ -89,7 +85,7 @@
 ,Delay Days,Viivepäivät
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,lasku
+DocType: Subscription Invoice,Invoice,lasku
 DocType: Purchase Invoice Item,Item Weight Details,Kohde Painon tiedot
 DocType: Asset Maintenance Log,Periodicity,Jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),Pisteet (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Rivi # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Rivi # {0}:
 DocType: Timesheet,Total Costing Amount,Yhteensä Kustannuslaskenta Määrä
 DocType: Delivery Note,Vehicle No,Ajoneuvon nro
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Ole hyvä ja valitse hinnasto
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Työnalla
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Valitse päivämäärä
 DocType: Daily Work Summary Group,Holiday List,lomaluettelo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Kirjanpitäjä
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Kirjanpitäjä
 DocType: Hub Settings,Selling Price List,Myynnin hinnasto
 DocType: Patient,Tobacco Current Use,Tupakan nykyinen käyttö
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Myynnin määrä
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Myynnin määrä
 DocType: Cost Center,Stock User,Varaston peruskäyttäjä
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Puhelinnumero
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Uusi {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Ensimmäinen sähköpostiviesti lähetetty
 ,Sales Partners Commission,myyntikumppanit provisio
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Arvonalennuksen jälkeinen arvo
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Asiaan liittyvää
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Läsnäolo päivämäärä ei voi olla pienempi kuin työntekijän tuloaan päivämäärä
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Läsnäolo päivämäärä ei voi olla pienempi kuin työntekijän tuloaan päivämäärä
 DocType: Grading Scale,Grading Scale Name,Arvosteluasteikko Name
-DocType: Subscription,Repeat on Day,Toista päivällä
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tämä on kantatili eikä sitä voi muokata
 DocType: Sales Invoice,Company Address,yritys osoite
 DocType: BOM,Operations,Toiminnot
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},oikeutusta ei voi asettaa alennuksen perusteella {0}
+DocType: Subscription,Subscription Start Date,Tilauksen alkamispäivä
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedosto, jossa on vain kaksi saraketta: vanha ja uusi nimi"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ei missään aktiivista verovuonna.
 DocType: Packed Item,Parent Detail docname,Pääselostuksen docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viite: {0}, kohta Koodi: {1} ja Asiakas: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Koeajan päättymispäivä Ei voi olla ennen koeajan alkamispäivää
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avaaminen ja työn.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM: tä ei ole määritetty alihankintakohteeseen {0} rivillä {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Patient,Married,Naimisissa
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei saa {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Hae nimikkeet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Hae nimikkeet
 DocType: Price List,Price Not UOM Dependant,Hinta ei ole UOM riippuvainen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Verotyyppi
 ,Completed Work Orders,Valmistuneet työmääräykset
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,veron perusteena
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,veron perusteena
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: BOM,Item Image (if not slideshow),tuotekuva (jos diaesitys ei käytössä)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tuntihinta / 60) * todellinen käytetty aika
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rivi # {0}: Viiteasiakirjatyypin on oltava yksi kulukorvauksesta tai päiväkirjakirjauksesta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Valitse BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rivi # {0}: Viiteasiakirjatyypin on oltava yksi kulukorvauksesta tai päiväkirjakirjauksesta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Valitse BOM
 DocType: SMS Log,SMS Log,Tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Hallitse työntekijälle annettu ennakkomäärä
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Toimitusilmoitus
 DocType: Journal Entry,Opening Entry,Avauskirjaus
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tilin Pay Only
-DocType: Employee Loan,Repay Over Number of Periods,Repay Yli Kausien määrä
+DocType: Loan,Repay Over Number of Periods,Repay Yli Kausien määrä
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
 DocType: Lead,Product Enquiry,Tavara kysely
 DocType: Education Settings,Validate Batch for Students in Student Group,Vahvista Erä opiskelijoille Student Group
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ei jätä kirjaa löytynyt työntekijä {0} ja {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ei jätä kirjaa löytynyt työntekijä {0} ja {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Anna yritys ensin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Ole hyvä ja valitse Company ensin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,Ylioppilas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Aseta oletusmalli Leave Status Notification -asetukseksi HR-asetuksissa.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Tavoitteeseen
 DocType: BOM,Total Cost,Kokonaiskustannukset
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,työntekijän Loan
 DocType: Fee Schedule,Send Payment Request Email,Lähetä maksuehdotus sähköpostitse
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Nimikettä {0} ei löydy tai se on vanhentunut
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Kiinteistöt
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Kirjaamaton rekisteröinti.
 DocType: Assessment Result,Grade,Arvosana
 DocType: Restaurant Table,No of Seats,Istumapaikkoja
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Voit lisätä dynaamisen aiheen käyttämällä jinja-tunnisteita <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: Asset Maintenance Task,Asset Maintenance Task,Omaisuudenhoitotoiminta
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,vuosipalkka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,vuosipalkka
 DocType: Daily Work Summary,Daily Work Summary,Päivittäinen työ Yhteenveto
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} on jäädytetty
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,varaston kulut
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,varaston kulut
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Valitse Target Varasto
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Anna Preferred Sähköpostiosoite
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Anna Preferred Sähköpostiosoite
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,ensisijainen osoite
 DocType: Production Plan,Material Request Detail,Materiaalipyynnön yksityiskohdat
 DocType: Selling Settings,Default Quotation Validity Days,Oletushakemusten voimassaoloajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,Tekstiviesti keskus
 DocType: Sales Invoice,Change Amount,muutos Määrä
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Ajokorttikategoriat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Anna toimituspäivä
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee Poistot Entry
+DocType: HR Settings,Leave Settings,Jätä asetukset
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,pyydä tyyppi
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Tee työntekijä
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,julkaisu
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS (online / offline) asetustila
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Poistaa aikaleikkeiden luomisen työjärjestysluetteloon. Toimintoja ei saa seurata työjärjestystä vastaan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,suoritus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,suoritus
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Asset Maintenance Log,Maintenance Status,"huolto, tila"
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Jäsenyystiedot
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Toimittaja tarvitaan vastaan maksullisia huomioon {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Nimikkeet ja hinnoittelu
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Yhteensä tuntia: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Alkaen päivä tulee olla tilikaudella. Olettaen että alkaen päivä = {0}
 DocType: Drug Prescription,Interval,intervalli
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,etusija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,etusija
 DocType: Grant Application,Individual,yksilöllinen
 DocType: Academic Term,Academics User,Academics Käyttäjä
 DocType: Cheque Print Template,Amount In Figure,Määrä Kuvassa
-DocType: Employee Loan Application,Loan Info,laina Info
+DocType: Loan Application,Loan Info,laina Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Suunnittele huoltokäyntejä
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Toimittajan arviointijakso
 DocType: Share Transfer,Share Transfer,Osakekohtainen siirto
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Item Template
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemia
 DocType: Job Offer,Select Terms and Conditions,Valitse ehdot ja säännöt
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out Arvo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out Arvo
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-asetukset
 DocType: Production Plan,Sales Orders,Myyntitilaukset
 DocType: Purchase Taxes and Charges,Valuation,Arvo
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,oletus alue
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisio
 DocType: Work Order Operation,Updated via 'Time Log',Päivitetty 'aikaloki' kautta
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Ennakon määrä ei voi olla suurempi kuin {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Valitse asiakas tai toimittaja.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Ennakon määrä ei voi olla suurempi kuin {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Sarjalistaus tähän tapahtumaan
 DocType: Company,Enable Perpetual Inventory,Ota investointikertymämenetelmän
+DocType: Bank Guarantee,Charges Incurred,Aiheutuneet kulut
 DocType: Company,Default Payroll Payable Account,Oletus Payroll Maksettava Account
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Päivitys Sähköpostiryhmä
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Mukautettu tulos
 DocType: Delivery Stop,Contact Name,"yhteystiedot, nimi"
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kurssin arviointiperusteet
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Verotunnus:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Verotunnus:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Opiskelijanumero:
 DocType: POS Customer Group,POS Customer Group,POS Asiakas Group
 DocType: Land Unit,Land Unit describing various land assets,"Maanomainen yksikkö, joka kuvaa eri maaomaisuutta"
@@ -374,9 +371,8 @@
 ,Open Work Orders,Avoimet työjärjestykset
 DocType: Payment Term,Credit Months,Luottoajat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Nettopalkka ei voi olla pienempi kuin 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Jos haluat lopettaa toistuvien virheilmoitusten lähettämisen järjestelmästä, olemme valinneet tilauksen Ei käytössä -kentän"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Vapaat vuodessa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Vapaat vuodessa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
 DocType: Email Digest,Profit & Loss,Voitonmenetys
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Aseta opiskelijat opiskelijaryhmissä
 DocType: Item Website Specification,Item Website Specification,Kohteen verkkosivustoasetukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,vapaa kielletty
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank merkinnät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,vapaa kielletty
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank merkinnät
 DocType: Crop,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Varaston täsmäytys nimike
 DocType: Stock Entry,Sales Invoice No,"Myyntilasku, nro"
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,älä ota yhteyttä
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,Toimittajan tyyppi
 DocType: Course Scheduling Tool,Course Start Date,Kurssin aloituspäivä
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Julkaista Hub
 DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,Alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Nimike {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Hankintapyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Nimike {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Hankintapyyntö
 DocType: Bank Reconciliation,Update Clearance Date,Päivitä tilityspäivä
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Oston lisätiedot
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Uudet tarjoukset
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Sähköpostit palkkakuitin työntekijöiden perustuu ensisijainen sähköposti valittu Työntekijän
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Luettelon ensimmäinen hyväksyjä asetetaan oletukseksi.
 DocType: Tax Rule,Shipping County,Toimitus lääni
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Käyttö-opastus
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Käyttö-opastus
 DocType: Asset,Next Depreciation Date,Seuraava poistopäivämäärä
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,Tilien asetukset
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Erinomainen Sekkejä ja Talletukset tyhjentää
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 DocType: Driver,Fleet Manager,Välineiden ylläpitäjä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Rivi # {0}: {1} ei voi olla negatiivinen erä {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Rivi # {0}: {1} ei voi olla negatiivinen erä {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Väärä salasana
 DocType: Item,Variant Of,Muunnelma kohteesta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Aseta hotellihuoneen hinta {}
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Opening Invoice Creation Tool,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,lähete
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Verojen perusmääritykset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kustannukset Myyty Asset
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tietenkin ajoitustyökalun
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Kiireellinen] Virhe luodessasi toistuvaa% s: ta% s: lle
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,Veroaste
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Sovellusjakso ei voi olla kahden jakotiedon välissä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Sovellusjakso ei voi olla kahden jakotiedon välissä
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostolasku {0} on jo vahvistettu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Saapunut
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Luo Student Groups
 DocType: Volunteer,Weekends,Viikonloppuisin
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Hyvityslaskun summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Hyvityslaskun summa
 DocType: Setup Progress Action,Action Document,Toiminta-asiakirja
 DocType: Chapter Member,Website URL,verkkosivujen URL
 ,Finished Goods,Valmiit tavarat
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lisää nimikkeitä
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,tuotteen laatutarkistus parametrit
+DocType: Leave Application,Leave Approver Name,Poissaolon hyväksyjän nimi
 DocType: Depreciation Schedule,Schedule Date,"Aikataulu, päivä"
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Tulos, Vähennykset ja muut Palkka komponentit"
 DocType: Packed Item,Packed Item,Pakattu tuote
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Tarjouspyyntö
 DocType: Healthcare Settings,Require Lab Test Approval,Vaaditaan Lab Test Approval
 DocType: Salary Slip Timesheet,Working Hours,Työaika
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Yhteensä erinomainen
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Yhteensä erinomainen
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
 DocType: Dosage Strength,Strength,Vahvuus
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Luo uusi asiakas
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
 DocType: Student Log,Medical,Lääketieteellinen
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Häviön syy
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Häviön syy
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Päivitä tilinumero
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Liidin vastuullinen ei voi olla sama kuin itse liidi
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Jaettava määrä ei voi ylittää oikaisematon määrä
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Yksittäinen
 DocType: Salary Slip,Total Loan Repayment,Yhteensä Lainan takaisinmaksu
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
-DocType: Subscription,Yearly,Vuosi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Syötä kustannuspaikka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Syötä kustannuspaikka
 DocType: Drug Prescription,Dosage,annostus
 DocType: Journal Entry Account,Sales Order,Myyntitilaus
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Myynnin keskihinta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Myynnin keskihinta
 DocType: Assessment Plan,Examiner Name,Tutkijan Name
 DocType: Lab Test Template,No Result,Ei tulosta
 DocType: Purchase Invoice Item,Quantity and Rate,Määrä ja hinta
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Anna yrityksen nimi ensin
 DocType: Purchase Invoice,Supplier Name,Toimittaja
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lue ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Näytä lehdet kaikista osaston jäsenistä kalenterista
 DocType: Purchase Invoice,01-Sales Return,01-myynnin palautus
 DocType: Account,Is Group,on ryhmä
 DocType: Email Digest,Pending Purchase Orders,Odottaa Ostotilaukset
@@ -600,14 +595,14 @@
 DocType: Account,Old Parent,Vanha Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Pakollinen kenttä - Lukuvuosi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ei ole liitetty {2} {3}
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"muokkaa johdantotekstiä joka lähetetään sähköpostin osana, joka tapahtumalla on oma johdantoteksi"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Aseta oletus maksettava osuus yhtiön {0}
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Muokkaa johdantotekstiä, joka lähetetään sähköpostin osana. Jokaisella tapahtumalla on oma johdantotekstinsä."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Aseta oletus maksettava osuus yhtiön {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Tapahtuma ei ole sallittu pysäytettyä työjärjestystä vastaan {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
@@ -626,12 +621,12 @@
 DocType: Item,Show in Website (Variant),Näytä Web-sivuston (Variant)
 DocType: Employee,Health Concerns,"terveys, huolenaiheet"
 DocType: Payroll Entry,Select Payroll Period,Valitse Payroll Aika
-DocType: Purchase Invoice,Unpaid,Palkaton
+DocType: Purchase Invoice,Unpaid,Maksamatta
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Varattu myytävänä
 DocType: Packing Slip,From Package No.,pakkauksesta
 DocType: Item Attribute,To Range,Vaihtuakseen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Arvopaperit ja talletukset
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Voi muuttaa arvonmäärittämismenetelmää koska on olemassa tapahtumia vastaan joitakin kohtia, joita ei ole se oma arviointimenetelmää"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Arvopaperit ja talletukset
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Voi muuttaa arvonmäärittämismenetelmää koska on olemassa tapahtumia vastaan joitakin kohtia, joita ei ole se oma arviointimenetelmää"
 DocType: Student Report Generation Tool,Attended by Parents,Osallistuvat vanhemmat
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hyväksyttävien vapaiden kokonaismäärä on pakollinen
 DocType: Patient,AB Positive,AB Positiivinen
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,osallistumis tietue
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Tuntilomakkeeseen perustuva palkan osuus.
 DocType: Sales Order Item,Used for Production Plan,Käytetään tuotannon suunnittelussa
-DocType: Employee Loan,Total Payment,Koko maksu
+DocType: Loan,Total Payment,Koko maksu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Ei voi peruuttaa suoritettua tapahtumaa.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Toimintojen välinen aika (minuuteissa)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} on peruutettu, joten toimintoa ei voida suorittaa"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tarpeeksi osat rakentaa
 DocType: POS Profile User,POS Profile User,POS-profiilin käyttäjä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,suorat tulot
+DocType: Subscription Invoice,Subscription Invoice,Tilauslaskutus
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,suorat tulot
 DocType: Patient Appointment,Date TIme,Treffiaika
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,hallintovirkailija
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Yrityksen perustaminen ja verotus
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Valitse kurssi
 DocType: Codification Table,Codification Table,Kodifiointitaulukko
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Ole hyvä ja valitse Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry Detail,Difference Account,Erotuksen tili
 DocType: Purchase Invoice,Supplier GSTIN,Toimittaja GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Kassavirran kartoitusmalli
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
+DocType: Bank Guarantee,Providing,tarjoamalla
 DocType: Account,Profit and Loss,Tuloslaskelma
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ei sallita, määritä Lab Test Template tarvittaessa"
 DocType: Patient,Risk Factors,Riskitekijät
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
 DocType: Healthcare Settings,Appointment Confirmation,Nimitysvakuutus
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Sarjanumeroa {0} ei voida poistaa, koska sitä on käytetty varastotapahtumissa"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Sarjanumeroa {0} ei voida poistaa, koska sitä on käytetty varastotapahtumissa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),sulku (cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hei
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Move Kohde
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Jo oletusasetus pos profiilissa {0} käyttäjälle {1}, ystävällisesti poistettu oletus"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Tili- / Kirjanpitokausi
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kertyneet Arvot
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",Sarjanumeroita ei voi yhdistää
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",Sarjanumeroita ei voi yhdistää
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Alue on pakollinen POS-profiilissa
 DocType: Supplier,Prevent RFQs,Estä RFQ: t
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,tee myyntitilaus
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},"Palkkalipeä, joka toimitetaan ajanjaksolta {0} - {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},"Palkkalipeä, joka toimitetaan ajanjaksolta {0} - {1}"
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,Liidin tunnus
 DocType: C-Form Invoice Detail,Grand Total,Kokonaissumma
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Shipping Bill päivä
 DocType: Production Plan,Production Plan,Tuotantosuunnitelma
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Avaustilien luomistyökalu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Myynti Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Myynti Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Huomautus: Total varattu lehdet {0} ei saa olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,"Aseta määrä operaatioihin, jotka perustuvat sarjamuotoiseen tuloon"
 ,Total Stock Summary,Yhteensä Stock Yhteenveto
 DocType: Announcement,Posted By,Lähettänyt
 DocType: Item,Delivered by Supplier (Drop Ship),Toimittaja lähettää asiakkaalle (ns. suoratoimitus)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Tarjouksen kohde
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Nimikkeen {0} oletusyksikköä ei voida muuttaa koska nykyisellä yksiköllä on tehty tapahtumia. Luo uusi nimike käyttääksesi uutta oletusyksikköä.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Nimikkeen {0} oletusyksikköä ei voida muuttaa koska nykyisellä yksiköllä on tehty tapahtumia. Luo uusi nimike käyttääksesi uutta oletusyksikköä.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Aseta Yhtiö
 DocType: Share Balance,Share Balance,Osuuden saldo
 DocType: Purchase Order Item,Billed Amt,"Laskutettu, pankkipääte"
 DocType: Training Result Employee,Training Result Employee,Harjoitustulos Työntekijä
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
-DocType: Repayment Schedule,Principal Amount,Lainapääoma
-DocType: Employee Loan Application,Total Payable Interest,Yhteensä Maksettava korko
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Lainapääoma
+DocType: Loan Application,Total Payable Interest,Yhteensä Maksettava korko
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Yhteensä erinomainen: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Tuntilomake
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
 DocType: Restaurant Reservation,Restaurant Reservation,Ravintolavaraus
 DocType: Land Unit,Land Unit Name,Maayksikön nimi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Ehdotus Kirjoittaminen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Käärimistä
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Ilmoita asiakkaille sähköpostilla
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Ilmoita asiakkaille sähköpostilla
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Toinen myyjä {0} on jo olemassa samalla tunnuksella
 DocType: Employee Advance,Claimed Amount,Vahvistettu määrä
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway Tili ei ole luotu, luo yksi käsin."
 DocType: Supplier Scorecard,Per Year,Vuodessa
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ei saa osallistua tähän ohjelmaan kuin DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
 DocType: Sales Invoice,Sales Taxes and Charges,Myynnin verot ja maksut
 DocType: Employee,Organization Profile,Organisaatio Profile
 DocType: Vital Signs,Height (In Meter),Korkeus (mittarissa)
 DocType: Student,Sibling Details,Sisarus tiedot
 DocType: Vehicle Service,Vehicle Service,ajoneuvo Service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automaattisesti laukaisee palaute pyyntö perustuu olosuhteissa.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automaattisesti laukaisee palaute pyyntö perustuu olosuhteissa.
 DocType: Employee,Reason for Resignation,Eroamisen syy
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Mallipohja kehityskeskusteluihin
 DocType: Sales Invoice,Credit Note Issued,Hyvityslasku Annettu
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,huoltoaikataulu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Nettomuutos Inventory
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Työntekijän Loan Management
 DocType: Employee,Passport Number,Passin numero
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Suhde Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Hallinta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Hallinta
 DocType: Payment Entry,Payment From / To,Maksaminen / To
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Aseta tili Warehouse {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Varastosiirto
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Ei löytynyt polkua
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Perustaminen (€)
+DocType: Loan,Applicant,hakija
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Tositteen aikaleima pitää olla {0} jälkeen
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Tee toistuvia asiakirjoja
 ,GST Itemised Purchase Register,GST Eritelty Osto Register
 DocType: Course Scheduling Tool,Reschedule,uudelleenjärjestelystä
-DocType: Employee Loan,Total Interest Payable,Koko Korkokulut
+DocType: Loan,Total Interest Payable,Koko Korkokulut
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Kohdistuneet kustannukset verot ja maksut
 DocType: Work Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Suorittaa loppuun
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,pohja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,pohja
 DocType: Timesheet,Total Billed Hours,Yhteensä laskutusasteesta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Poiston arvo
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Poiston arvo
 DocType: Leave Block List Allow,Allow User,Salli Käyttäjä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Omaisuuden hävittämisen voitto/tappiotili
 DocType: Vehicle Log,Service Details,palvelu Lisätiedot
-DocType: Subscription,Quarterly,3 kk
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,ryhmitelty
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tuntilista
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raaka-aineet Perustuvat
 DocType: Sales Invoice,Port Code,Satamakoodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Varausvarasto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Varausvarasto
 DocType: Lead,Lead is an Organization,Lyijy on järjestö
 DocType: Guardian Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Talous
 DocType: Vehicle,Odometer Value (Last),Matkamittarin lukema (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Toimittajan tuloskortin kriteereiden mallit.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Markkinointi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Markkinointi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Maksu käyttö on jo luotu
 DocType: Request for Quotation,Get Suppliers,Hanki toimittajat
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Palkka Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Palkka Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,Arvoon sisältyvät kustannukset
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Voit uusia vain, jos jäsenyytesi päättyy 30 päivän kuluessa"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Valitse vain, jos sinulla on asetettu Cash Flow Mapper -asiakirjoja"
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Supplier Scorecard,Per Week,Viikossa
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Yhteensä opiskelija
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Nimikettä {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Yritys ja tilit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,in Arvo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,in Arvo
 DocType: Asset Settings,Depreciation Options,Poistot
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Virheellinen lähetysaika
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Virheellinen lähetysaika
 DocType: Lead,Campaign Name,Kampanjan nimi
 DocType: Hotel Room,Capacity,kapasiteetti
 DocType: Selling Settings,Close Opportunity After Days,Close tilaisuuden päivää
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,solunumero
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Ei ole työntekijää annettuihin kriteereihin. Tarkista, että palkkapeltoja ei ole vielä luotu."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Ei ole työntekijää annettuihin kriteereihin. Tarkista, että palkkapeltoja ei ole vielä luotu."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automaattinen hankintapyyntö luotu
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hävitty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valitse taulukko
 DocType: BOM,Website Specifications,Verkkosivuston tiedot
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients','Vastaanottajat' luettelossa on virheellinen sähköpostiosoite {0}
 DocType: Special Test Items,Particulars,tarkemmat tiedot
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
 DocType: Warranty Claim,CI-,Cl
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Asset,Maintenance,huolto
+DocType: Subscriber,Subscriber,Tilaaja
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Päivitä projektin tila
 DocType: Item,Maximum sample quantity that can be retained,"Suurin näytteen määrä, joka voidaan säilyttää"
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ostoskorin oletusasetukset
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Lisää Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset romutetaan kautta Päiväkirjakirjaus {0}
-DocType: Employee Loan,Interest Income Account,Korkotuotot Account
+DocType: Loan,Interest Income Account,Korkotuotot Account
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Tarkista kutsu lähetetty
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotekniikka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Toimitilan huollon kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Toimitilan huollon kustannukset
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Mene
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Määrittäminen Sähköpostitilin
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Anna Kohta ensin
 DocType: Asset Repair,Downtime,seisokkeja
 DocType: Account,Liability,vastattavat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Hyväksyttävän määrä ei voi olla suurempi kuin korvauksen määrä rivillä {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Hyväksyttävän määrä ei voi olla suurempi kuin korvauksen määrä rivillä {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akateeminen termi:
 DocType: Salary Detail,Do not include in total,Älä sisällytä kokonaan
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Näytteen määrä {0} ei voi olla suurempi kuin vastaanotettu määrä {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Hinnasto ei valittu
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,Perhetausta
 DocType: Request for Quotation Supplier,Send Email,Lähetä sähköposti
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
 DocType: Item,Max Sample Quantity,Max näytteen määrä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Ei oikeuksia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Ei oikeuksia
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Pyydetty pyyntö
 DocType: Vital Signs,Heart Rate / Pulse,Syke / pulssi
 DocType: Company,Default Bank Account,oletus pankkitili
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab testit ja elinvoimaiset merkit
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Yhtään työntekijää ei löytynyt
-DocType: Subscription,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projektin päivitys.
 DocType: SMS Center,All Customer Contact,kaikki asiakkaan yhteystiedot
 DocType: Land Unit,Tree Details,Tree Tietoja
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Kaikki nimikeryhmät
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
 DocType: Work Order,Item To Manufacture,tuote valmistukseen
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} tila on {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vahvista valinta uudelleen, jos valittua osoitetta muokataan tallennuksen jälkeen"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 DocType: Item,Hub Publishing Details,Hub-julkaisutiedot
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Avattu'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Avattu'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avaa tehtävä
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Lab Test Template,Result Format,Tulosmuoto
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Kahdesti kuussa
 DocType: Vehicle Service,Brake Pad,Jarrupala
 DocType: Fertilizer,Fertilizer Contents,Lannoitteen sisältö
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Tutkimus ja kehitys
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Laskutettava
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
 DocType: Timesheet,Total Billed Amount,Laskutettu yhteensä
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Ohita luottorajan tarkistus myyntitilauksessa
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Arviointikertomusta.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","""Käytä ostoskorille"" otettu käyttöön: Ostoskoritoiminto on käytössä ja ostoskorille tulisi olla ainakin yksi määritelty veroasetus."
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksu Entry {0} on liitetty vastaan Order {1}, tarkistaa, jos se tulee vetää kuin etukäteen tässä laskussa."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksu Entry {0} on liitetty vastaan Order {1}, tarkistaa, jos se tulee vetää kuin etukäteen tässä laskussa."
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-Sale
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimi istuma
 DocType: Item Attribute,Item Attribute Values,"tuotetuntomerkki, arvot"
 DocType: Examination Result,Examination Result,tutkimustuloksen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Saapuminen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Saapuminen
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Viitetyypin tulee olla yksi seuraavista: {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Work Order,Plan material for sub-assemblies,Suunnittele materiaalit alituotantoon
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} tulee olla aktiivinen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Ei siirrettävissä olevia kohteita
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Ei siirrettävissä olevia kohteita
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Sulkeminen (avaaminen + yhteensä)
 DocType: Journal Entry,Depreciation Entry,Poistot Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Peru materiaalikäynti {0} ennen huoltokäynnin perumista
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 -standardi
 DocType: Pricing Rule,Rate or Discount,Hinta tai alennus
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sarjanumero {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Sarjanumero {0} ei kuulu tuotteelle {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,vaadittu yksikkömäärä
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,suosikit
 DocType: Hub Settings,Custom Data,Mukautetut tiedot
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Savi koostumus (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Tallenna ennen tehtävän antamista.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Taseen arvo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Taseen arvo
 DocType: Lab Test,Lab Technician,Laboratorio teknikko
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Myyntihinnasto
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Myyntihinnasto
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jos valitaan, luodaan asiakas, joka on kartoitettu Potilashenkilöön. Potilaslaskut luodaan tätä asiakasta vastaan. Voit myös valita olemassa olevan asiakkaan potilaan luomisen aikana."
 DocType: Bank Reconciliation,Account Currency,Tilin valuutta
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Merkitse yrityksen pyöristys tili
 DocType: Purchase Receipt,Range,Alue
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Työntekijä {0} ei ole aktiivinen tai sitä ei ole olemassa
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Työntekijä {0} ei ole aktiivinen tai sitä ei ole olemassa
 DocType: Fee Structure,Components,komponentit
 DocType: Item Barcode,Item Barcode,tuote viivakoodi
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","luodaan. Jos viivästyy, sinun on muutettava manuaalisesti tämän kentän &quot;Toista kuukausi-päivä&quot; -kenttään"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
 DocType: Share Transfer,From Folio No,Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"Ostolasku, edistynyt"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
@@ -1284,22 +1276,23 @@
 DocType: Asset,Available-for-use Date,Käytettävissä oleva päivämäärä
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,On Print Format
-DocType: Employee Loan,Sanctioned,seuraamuksia
+DocType: Loan,Sanctioned,seuraamuksia
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Tuotepaketti nimikkeillä varasto, sarjanumero ja eränumero haetaan samasta lähetetaulukosta. Mikäli varasto ja eränumero on sama kaikille lähetenimikkeille tai tuotepaketin nimikkeille (arvoja voidaan ylläpitää nimikkeen päätaulukossa), arvot kopioidaan lähetetaulukkoon."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Tuotepaketti nimikkeillä varasto, sarjanumero ja eränumero haetaan samasta lähetetaulukosta. Mikäli varasto ja eränumero on sama kaikille lähetenimikkeille tai tuotepaketin nimikkeille (arvoja voidaan ylläpitää nimikkeen päätaulukossa), arvot kopioidaan lähetetaulukkoon."
 DocType: Student Admission,Publish on website,Julkaise verkkosivusto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
+DocType: Subscription,Cancelation Date,Peruutuksen päivämäärä
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 DocType: Agriculture Task,Agriculture Task,Maatalous Tehtävä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,välilliset tulot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,välilliset tulot
 DocType: Student Attendance Tool,Student Attendance Tool,Student Läsnäolo Tool
 DocType: Restaurant Menu,Price List (Auto created),Hinnasto (luotu automaattisesti)
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Vaihtelu
 ,Company Name,Yrityksen nimi
-DocType: SMS Center,Total Message(s),viestit yhteensä
+DocType: SMS Center,Total Message(s),Viestejä yhteensä
 DocType: Share Balance,Purchased,Osti
 DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,Nimeä attribuutin arvo uudestaan nimikkeen ominaisuutena.
 DocType: Purchase Invoice,Additional Discount Percentage,Lisäalennusprosentti
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,metri
 DocType: Workstation,Electricity Cost,sähkön kustannukset
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab-testaus datetime ei voi olla ennen keräys datetime
+DocType: Subscription Plan,Cost,Kustannus
 DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työntekijälle syntymäpäivämuistutuksia
 DocType: Expense Claim,Total Advance Amount,Ennakkomaksu yhteensä
 DocType: Delivery Stop,Estimated Arrival,arvioitu saapumisaika
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Tuo kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
 DocType: Timesheet Detail,Bill,Laskuttaa
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Valkoinen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Valkoinen
 DocType: SMS Center,All Lead (Open),Kaikki Liidit (Avoimet)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei saatavilla {4} varasto {1} klo lähettämistä tullessa ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Voit valita enintään yhden vaihtoehdon valintaruutujen luettelosta.
-DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
+DocType: Purchase Invoice,Get Advances Paid,Hae ennakkomaksut
 DocType: Item,Automatically Create New Batch,Automaattisesti Luo uusi erä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Määritä {0} arvoon {1} (rivi {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Määritä {0} arvoon {1} (rivi {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Tehdä
 DocType: Student Admission,Admission Start Date,Pääsymaksu aloituspäivä
 DocType: Journal Entry,Total Amount in Words,Yhteensä sanoina
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Uusi työntekijä
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lainamäärä
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Aikataulu kurssi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,"varasto, vaihtoehdot"
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Poista käytöstä ostotilauksen viimeiset ostotiedot
 DocType: Journal Entry Account,Expense Claim,Kulukorvaus
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,"Pakkauslappu, tuote"
 DocType: Purchase Invoice,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Määritä {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,Toimitus vastaanottajalle
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Vaihtoehtojen luominen on jonossa.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Työyhteenveto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Taito pöytä on pakollinen
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Ensimmäinen luvan myöntäjä luettelossa asetetaan oletuslupahakemukseksi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Plan,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ei voi olla negatiivinen
 DocType: Training Event,Self-Study,Itsenäinen opiskelu
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Palkat
 DocType: Asset Maintenance,Maintenance Manager Name,Huoltopäällikön nimi
 DocType: Agriculture Task,Urgent,Kiireellinen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Muuttujaa ei voitu löytää:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Valitse kentästä muokkaus numerosta
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Ei voi olla kiinteä omaisuuserä, koska Stock Ledger on luotu."
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Laadun tarkastusmallin nimi
 DocType: Project,First Email,Ensimmäinen sähköposti
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Myynnin arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Myynnin arvomäärä
 DocType: Repayment Schedule,Interest Amount,Korko Arvo
 DocType: Serial No,Creation Document No,Dokumentin luonti nro
 DocType: Share Transfer,Issue,Tukipyyntö
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 ,Projected Quantity as Source,Ennustettu Määrä lähdemuodossa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Toimitusmatkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Toimitusmatkan
 DocType: Student,A-,A -
 DocType: Share Transfer,Transfer Type,Siirtymätyyppi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Myynnin kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Myynnin kustannukset
 DocType: Consultation,Diagnosis,Diagnoosi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Perusosto
 DocType: GL Entry,Against,kohdistus
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postinumero
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Myyntitilaus {0} on {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Valitse korkotulojen tili lainaan {0}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Varastotapahtumien tekeminen
 DocType: Packing Slip,Net Weight UOM,Nettopainon yksikkö
 DocType: Item,Default Supplier,oletus toimittaja
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ylituotantoprosentti
-DocType: Employee Loan,Repayment Schedule,maksuaikataulusta
+DocType: Loan,Repayment Schedule,maksuaikataulusta
 DocType: Shipping Rule Condition,Shipping Rule Condition,Toimitustavan ehdot
 DocType: Holiday List,Get Weekly Off Dates,hae viikottaiset poissa päivät
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä
 DocType: Education Settings,Attendance Freeze Date,Läsnäolo Freeze Date
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Luettele joitain toimittajiasi. Ne voivat olla organisaatioita tai yksilöitä.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Näytä kaikki tuotteet
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Näytä kaikki tuotteet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Pienin Lyijy ikä (päivää)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,kaikki BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotelli {0} ei ole saatavilla {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,työntekijästä
 DocType: Driver,Cellphone Number,puhelinnumero
 DocType: Project,Monitor Progress,Seurata edistymistä
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Varoitus: Järjestelmä ei tarkista liikalaskutusta koska tuotteen {0} määrä kohdassa {1} on nolla
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Varoitus: Järjestelmä ei tarkista liikalaskutusta koska tuotteen {0} määrä kohdassa {1} on nolla
 DocType: Journal Entry,Make Difference Entry,tee erokirjaus
+DocType: Supplier Quotation,Auto Repeat Section,Automaattinen toisto jakso
 DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,kuljetus
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Virheellinen Taito
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} pitää olla vahvistettu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
+DocType: Department Approver,Department Approver,Osastopäällikkö
 DocType: SMS Center,Total Characters,Henkilöt yhteensä
 DocType: Employee Advance,Claimed,väitti
 DocType: Crop,Row Spacing,Riviväli
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksun täsmäytys laskuun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,panostus %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Kuten kohti ostaminen asetukset jos Ostotilauksessa Pakollinen == KYLLÄ, sitten luoda Ostolasku, käyttäjän täytyy luoda ostotilaus ensin kohteen {0}"
+,HSN-wise-summary of outward supplies,HSN-viisas tiivistelmä ulkoisista tarvikkeista
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Esim. yrityksen rekisterinumero, veronumero, yms."
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostoskorin toimitustapa
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Toiminnon nimi
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Year
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Ensimmäiset 2 numeroa GSTIN tulee vastata valtion numero {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,aloituspäivä nykyiselle laskutuskaudelle
 DocType: Salary Slip,Leave Without Pay,Palkaton vapaa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,kapasiteetin suunnittelu virhe
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Kentät kopioidaan vain luomisajankohtana.
 DocType: Setup Progress Action,Domains,Verkkotunnukset
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tulee olla päättymispäivää aiempi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,hallinto
 DocType: Cheque Print Template,Payer Settings,Maksajan Asetukset
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
 DocType: Purchase Invoice,Is Return,on palautus
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,varovaisuus
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Aloituspäivä on suurempi kuin loppupäivä tehtävässä &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Tuotto / veloitusilmoituksen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Tuotto / veloitusilmoituksen
 DocType: Price List Country,Price List Country,Hinnasto Maa
 DocType: Item,UOMs,Mittayksiköt
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,sarjanumeron tuotekoodia ei voi vaihtaa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,sarjanumeron tuotekoodia ei voi vaihtaa
 DocType: Purchase Invoice Item,UOM Conversion Factor,Mittayksikön muuntokerroin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Syötä tuotenumero saada eränumero
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
-DocType: Employee Loan,Partially Disbursed,osittain maksettu
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Tukea tiedot.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Tukea tiedot.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Et voi uudelleenkäynnistää tilausta, jota ei peruuteta."
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Nimikkeen kustannuspaikka nimikekoodilla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Nimikkeen kustannuspaikka nimikekoodilla
 DocType: Fee Validity,Valid Till,Voimassa
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Yhteensä vanhempien opettajien kokous
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Asiakasryhmän muuttaminen valitulle asiakkaalle ei ole sallittua.
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Arvioitu saapumisaikoja päivitetään.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Arvioitu saapumisaikoja päivitetään.
 DocType: Program Enrollment Tool,Enrollment Details,Ilmoittautumistiedot
 DocType: Purchase Invoice Item,Net Rate,nettohinta
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Valitse asiakas
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Purchase Order,Group same items,Ryhmä sama kohdetta
 DocType: Purchase Invoice,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
-DocType: Employee Loan Application,Repayment Info,takaisinmaksu Info
+DocType: Department,Parent Department,Vanhempi osasto
+DocType: Loan Application,Repayment Info,takaisinmaksu Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
 DocType: Maintenance Team Member,Maintenance Role,Huolto Rooli
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,Alustava tase
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Työntekijätietojen perustaminen
 DocType: Sales Order,SO-,NIIN-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellin varaus käyttäjä
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Student,O-,O -
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Tutkimus
+DocType: Subscription Settings,Subscription Settings,Tilausasetukset
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,Työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Announcement,All Students,kaikki opiskelijat
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
 DocType: Crop Cycle,Less than a year,Alle vuosi
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Muu maailma
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Muu maailma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
 DocType: Crop,Yield UOM,Tuotto UOM
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
 DocType: Item,Is Item from Hub,Onko kohta Hubista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,maksetut osingot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,maksetut osingot
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Kirjanpito Ledger
 DocType: Stock Reconciliation,Difference Amount,eron arvomäärä
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} lähdössä {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Kertyneet voittovarat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Kertyneet voittovarat
 DocType: Purchase Invoice,05-Change in POS,05-POS-muutos
 DocType: Vehicle Log,Service Detail,palvelu Detail
 DocType: BOM,Item Description,tuotteen kuvaus
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,mahdollinen tuote
 ,Student and Guardian Contact Details,Opiskelija ja Guardian Yhteystiedot
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Rivi {0}: For toimittaja {0} Sähköpostiosoite on lähetettävä sähköpostitse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tilapäinen avaus
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Tilapäinen avaus
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,View Hub
 ,Employee Leave Balance,Työntekijän käytettävissä olevat vapaat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Tilin tase {0} on oltava {1}
 DocType: Patient Appointment,More Info,Lisätietoja
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Arvostustaso vaaditaan tuotteelle rivillä {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Arvostustaso vaaditaan tuotteelle rivillä {0}
 DocType: Supplier Scorecard,Scorecard Actions,Tuloskorttitoimet
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Esimerkki: Masters Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Hylätty varasto
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,henkilölle
 DocType: Supplier Quotation Item,Lead Time in days,"virtausaika, päivinä"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,maksettava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Nimikkeen {3} kokonaismäärä {0} ei voi ylittää hankintapyynnön {1} tarvemäärää {2}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Pieni
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Pieni
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Laskujen luomisen työkalun avaaminen
 DocType: Education Settings,Employee Number,työntekijän numero
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Peruuta lasku Grace-ajan jälkeen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 DocType: Project,% Completed,% Valmis
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoriotestaus Datetime
 DocType: Email Digest,Add Quote,Lisää Lainaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Mittayksikön muuntokerroin vaaditaan yksikölle {0} tuotteessa: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Välilliset kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Välilliset kustannukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rivillä {0}: Yksikkömäärä vaaditaan
 DocType: Agriculture Analysis Criteria,Agriculture,Maatalous
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Lähete {0} ei ole vahvistettu
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,käyttöomaisuuspääoma
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Aseta alkiotunnus ensin
 DocType: Item,ITEM-,kuvallisissa osaluetteloissa
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Myyntitiimin yhteensä lasketun prosenttiosuuden pitää olla 100
+DocType: Subscription Plan,Billing Interval Count,Laskutusväli
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 DocType: Antibiotic,Antibiotic,Antibiootti
 ,Team Updates,Team päivitykset
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),Kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Luo Print Format
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS Kohta Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Vaihtoehtoinen kohde ei saa olla sama kuin kohteen koodi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,Toimitus tavoitteet
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Väliaikaisen arvioinnin viimeistely
 DocType: Salary Slip,Bank Account No.,Pankkitilin nro
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Työasema
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,tarjouspyynnön toimittaja
 DocType: Healthcare Settings,Registration Message,Ilmoitusviesti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,kova tavara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,kova tavara
 DocType: Prescription Dosage,Prescription Dosage,Reseptilääkitys
 DocType: Attendance,HR Manager,HR ylläpitäjä
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Valitse Yritys
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Alkamis- ja päättymisajankohta
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Sarjanumerolle ei voi muuttaa varastoa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Sarjanumerolle ei voi muuttaa varastoa
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
 DocType: Project Update,Great/Quickly,Suuri / Nopeasti
 DocType: Purchase Invoice Item,UOM,Yksikkö
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Valitse erissä satseittain erä
 DocType: Asset,Depreciation Schedules,Poistot aikataulut
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Seuraavat tilit voidaan valita GST-asetuksissa:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Seuraavat tilit voidaan valita GST-asetuksissa:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 DocType: Payment Request,Transaction Currency,valuuttakoodi
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Keneltä {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Lähtevä
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Nimi ja tyyppi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',hyväksynnän tila on 'hyväksytty' tai 'hylätty'
 DocType: Physician,Contacts and Address,Yhteystiedot ja osoite
 DocType: Purchase Invoice,Contact Person,Yhteyshenkilö
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Toivottu aloituspäivä' ei voi olla suurempi kuin 'toivottu päättymispäivä'
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Kelpoisuus ja tiedot
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Alkaen aikajana
 DocType: Email Digest,For Company,Yritykselle
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Viestintäloki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Tarjouspyyntö on lopetettu pääsy portaalin enemmän tarkistaa portaalin asetuksia.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Toimittajan tuloskortin pisteytysmuuttuja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Oston määrä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Oston määrä
 DocType: Sales Invoice,Shipping Address Name,Toimitusosoitteen nimi
 DocType: Material Request,Terms and Conditions Content,Ehdot ja säännöt sisältö
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssin aikataulua luotiin virheitä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Luettelon ensimmäinen kustannusmääritin asetetaan oletusluvuksi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,Pakkaus Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,opettelu
 DocType: Purchase Invoice,Company GSTIN,Yritys GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatiivinen määrä ei ole sallittu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatiivinen määrä ei ole sallittu
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Verotaulukkotiedot, jotka merkataan ja tallennetään tähän kenttään noudetaan tuote työkalusta, jota käytetään veroihin ja maksuihin"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitilin tase
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Jätä hyväksyntä pakolliseksi jätä sovellus
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,Tilin tase
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Verosääntöön liiketoimia.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Varastosta on pakollinen rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Maksuehto rivillä {0} on mahdollisesti kaksoiskappale.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Maatalous (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakkauslappu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Toimisto Vuokra
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakkauslappu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Toimisto Vuokra
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
 DocType: Disease,Common Name,Yleinen nimi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,Työaseman työaika
 DocType: Vital Signs,Blood Pressure,Verenpaine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analyytikko
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analyytikko
 DocType: Item,Inventory,inventaario
 DocType: Item,Sales Details,Myynnin lisätiedot
 DocType: Quality Inspection,QI-,Qi
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Vahvista Rekisteröidyt kurssi opiskelijoille Student Group
 DocType: Notification Control,Expense Claim Rejected,Kulukorvaus hylätty
 DocType: Item,Item Attribute,tuotetuntomerkki
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,hallinto
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Matkakorvauslomakkeet {0} on jo olemassa Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute Name
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Anna lyhennyksen määrä
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Anna lyhennyksen määrä
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Tuotemallit ja -variaatiot
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Palvelut
 DocType: HR Settings,Email Salary Slip to Employee,Sähköposti palkkakuitin työntekijöiden
 DocType: Cost Center,Parent Cost Center,Pääkustannuspaikka
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Valitse Mahdollinen toimittaja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Valitse Mahdollinen toimittaja
 DocType: Sales Invoice,Source,Lähde
 DocType: Customer,"Select, to make the customer searchable with these fields","Valitse, jotta asiakas voi hakea näitä kenttiä"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näytäsuljetut
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Investointien rahavirta
 DocType: Program Course,Program Course,Ohjelma kurssi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,rahdin ja huolinnan maksut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Homepage,Company Tagline for website homepage,Verkkosivuston etusivulle sijoitettava yrityksen iskulause
 DocType: Item Group,Item Group Name,tuoteryhmän nimi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Otettu
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Jäsenyyden tiedot
 DocType: Leave Block List,Block Holidays on important days.,älä salli lomia tärkeinä päivinä
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Syötä kaikki tarvittava tulosarvo (t)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,saatava tilien yhteenveto
-DocType: Employee Loan,Monthly Repayment Amount,Kuukauden lyhennyksen määrä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,saatava tilien yhteenveto
+DocType: Loan,Monthly Repayment Amount,Kuukauden lyhennyksen määrä
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Avauslaskut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,Mittayksikön nimi
 DocType: GST HSN Code,HSN Code,HSN koodi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,panostuksen arvomäärä
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Käyttäjä {0} on jo osoitettu lääkärille {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,pl
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mahdollinen toimittaja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mahdollinen toimittaja
+DocType: Journal Entry,JV-RET-,JV-jälkikä-
 DocType: Budget,Monthly Distribution,toimitus kuukaudessa
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"vastaanottajalista on tyhjä, tee vastaanottajalista"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Terveydenhuolto (beta)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
-DocType: Employee Loan,Repayment Method,lyhennystapa
+DocType: Loan,Repayment Method,lyhennystapa
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jos valittu, kotisivun tulee oletuksena Item ryhmän verkkosivuilla"
 DocType: Quality Inspection Reading,Reading 4,Lukema 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Yrityksen maksettaviksi vaaditut kulut
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Vaadittu todistus
 DocType: Company,Default Holiday List,oletus lomaluettelo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rivi {0}: From Time ja To aika {1} on päällekkäinen {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,varasto vastattavat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,varasto vastattavat
 DocType: Purchase Invoice,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Valitse Yritys
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,Tulosta osio
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Käyttäjälle {0} ei ole oletusarvoista POS-profiilia. Tarkista tämän käyttäjän oletusarvo rivillä {1}.
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Rivin {idx}: {field} on luotava Opening {invoice_type} Laskut
 DocType: Customer,Primary Address and Contact Detail,Ensisijainen osoite ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Valitse vähintään yksi verkkotunnus.
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Oletusyksikön muuntokerroin pitää olla 1 rivillä {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
 DocType: SMS Center,Receiver List,Vastaanotin List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,haku Tuote
 DocType: Payment Schedule,Payment Amount,maksun arvomäärä
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,Arvosteluasteikko
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,jo valmiiksi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock kädessä
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock kädessä
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,tuonti onnistunut!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Tarjouksen tuote
 DocType: Customer,Customer POS Id,Asiakas POS Id
 DocType: Account,Account Name,Tilin nimi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Alkaen päivä ei voi olla suurempi kuin päättymispäivä
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Sarjanumero {0} yksikkömäärä {1} ei voi olla murto-osa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Alkaen päivä ei voi olla suurempi kuin päättymispäivä
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Sarjanumero {0} yksikkömäärä {1} ei voi olla murto-osa
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Anna Woocommerce-palvelimen URL-osoite
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,Toimittajan nimikekoodi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,muuntokerroin ei voi olla 0 tai 1
 DocType: Share Balance,To No,Ei
-DocType: Subscription,Reference Document,vertailuasiakirja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} on peruutettu tai pysäytetty
 DocType: Accounts Settings,Credit Controller,kredit valvoja
-DocType: Grant Application,Applicant Type,Hakijan tyyppi
+DocType: Loan,Applicant Type,Hakijan tyyppi
 DocType: Purchase Invoice,03-Deficiency in services,03-Palvelujen puute
 DocType: Delivery Note,Vehicle Dispatch Date,Ajoneuvon toimituspäivä
 DocType: Healthcare Settings,Default Medical Code Standard,Oletus Medical Code Standard
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% laskutettu
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,Osapuolitili
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Henkilöstöresurssit
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Henkilöstöresurssit
 DocType: Lead,Upper Income,Ylemmät tulot
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Hylätä
 DocType: Journal Entry Account,Debit in Company Currency,Debit in Company Valuutta
 DocType: BOM Item,BOM Item,Osaluettelonimike
 DocType: Appraisal,For Employee,Työntekijän
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tee maksaminen Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Tee maksaminen Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
 DocType: Company,Default Values,oletus arvot
 DocType: Membership,INR,INR
@@ -2070,7 +2076,7 @@
 DocType: Customer,Default Price List,oletus hinnasto
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +322,Asset Movement record {0} created,Asset Movement record {0} luotu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Saman nimen omaava asiakas on jo olemassa
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Samanniminen asiakas on jo olemassa
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +185,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tämä lähettää palkkapäiväsijoitukset ja luo suoritepäiväkirja-merkinnän. Haluatko edetä?
 DocType: Purchase Invoice,Total Net Weight,Nettopaino yhteensä
 DocType: Purchase Order,Order Confirmation No,Tilausvahvistus nro
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Yhteensä (ilman veroa)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,lyijy Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Varastossa saatavilla
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Varastossa saatavilla
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Hankinnat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Pakollinen kenttä - Ohjelma
 DocType: Special Test Template,Result Component,Tuloskomponentti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Takuuanomus
@@ -2111,11 +2117,11 @@
 DocType: Leave Type,Include holidays within leaves as leaves,sisältää vapaapäiviän poistumiset poistumisina
 DocType: Sales Invoice,Packed Items,Pakatut tuotteet
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Takuuanomus sarjanumerolle
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Yhteensä'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Yhteensä'
 DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
 DocType: Employee,Permanent Address,Pysyvä osoite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Maksettu ennakko vastaan {0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
+						than Grand Total {2}",Ennakkomaksu tapahtumassa {0} {1} \ ei voi olla suurempi kuin Loppusumma {2}
 DocType: Consultation,Medication,Lääkitys
 DocType: Production Plan,Include Non Stock Items,Sisällytä ei-kantatiedot
 DocType: Project Update,Challenging/Slow,Haastava / Slow
@@ -2124,15 +2130,15 @@
 DocType: Territory,Territory Manager,Aluepäällikkö
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
 DocType: GST Settings,GST Accounts,GST-tilit
-DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
+DocType: Payment Entry,Paid Amount (Company Currency),Maksettu summa (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennus
 DocType: Selling Settings,Selling Settings,Myynnin asetukset
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Vahvista toimi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Auctions
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Aseta määrä, arvostustaso tai molemmat"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Aseta määrä, arvostustaso tai molemmat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,täyttymys
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,View Cart
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markkinointikustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Markkinointikustannukset
 ,Item Shortage Report,Tuotevajausraportti
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Vakiokriteereitä ei voi luoda. Nimeä kriteerit uudelleen
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Material Request,Transferred,siirretty
 DocType: Vehicle,Doors,ovet
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Asennus valmis!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Asennus valmis!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kerää maksut potilaan rekisteröinnille
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ominaisuuksia ei voi muuttaa varastotoiminnan jälkeen. Tee uusi esine ja siirrä varastosi uuteen kohtaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ominaisuuksia ei voi muuttaa varastotoiminnan jälkeen. Tee uusi esine ja siirrä varastosi uuteen kohtaan
 DocType: Course Assessment Criteria,Weightage,Painoarvo
 DocType: Purchase Invoice,Tax Breakup,vero Breakup
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Purchase Invoice Item,Batch No,Eränumero
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Työntekijöiden edut
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
 DocType: Student Group Instructor,Student Group Instructor,Opiskelijaryhmän Ohjaaja
 DocType: Grant Application,Assessment  Mark (Out of 10),Arviointimerkki (kymmenestä)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ei
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,Aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Email Digest,Annual Expenses,Vuosittaiset kustannukset
 DocType: Item,Variants,Mallit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,Lähetä kenelle
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,Asiakkaan nimikekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,Varaston täsmäytys
 DocType: Territory,Territory Name,Alueen nimi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Keskeneräisten varasto vaaditaan ennen vahvistusta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,"Sinulla voi olla vain tilauksia, joilla on sama laskutusjakso tilauksessa"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,työn hakija.
 DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite
 DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Kehityskeskustelut
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Koulutustilaisuudet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Ratajohdot johdon lähteellä.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Toimitustavan ehdot
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Käy sisään
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Käy sisään
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Huoltokirja
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"Pakkauksen nettopaino, summa lasketaan automaattisesti tuotteiden nettopainoista"
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,Lähetä ja laskuta
 DocType: Student Group,Instructors,Ohjaajina
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Osaluettelo {0} pitää olla vahvistettu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Osaluettelo {0} pitää olla vahvistettu
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Jaa hallinta
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Maksu
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Varasto {0} ei liity mihinkään tilin, mainitse tilin varastoon kirjaa tai asettaa oletus inventaario huomioon yrityksen {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Hallitse tilauksia
 DocType: Work Order Operation,Actual Time and Cost,todellinen aika ja hinta
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Jätä Application
 DocType: Item,Will also apply for variants,Sovelletaan myös tuotemalleissa
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Päällä
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Kootut nimikkeet myyntihetkellä
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,viivakoodit
 DocType: Hub Category,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Olet syöttänyt kohteen joka on jo olemassa. Korjaa ja yritä uudelleen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,kolleega
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Työjärjestys {0} on toimitettava
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,uusi koriin
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Laskutusvaluutan on vastattava joko yrityksen oletusvaluuttaa tai osapuolten tilin valuuttaa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 DocType: Soil Texture,Loam,savimaata
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rivi {0}: eräpäivä ei voi olla ennen lähettämispäivää
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rivi {0}: eräpäivä ei voi olla ennen lähettämispäivää
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,tee maksukirjaus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
 ,Sales Invoice Trends,Myyntilaskujen kehitys
 DocType: Leave Application,Apply / Approve Leaves,käytä / hyväksy poistumiset
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Varten
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
 DocType: Serial No,Delivery Document No,Toimitus Document No
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Aineenkulutusta ei ole asetettu Valmistusasetuksissa.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ei voida ylikirjoittaa rivikohta {0} {1} yli {2}. Jotta voit laskuttaa ylimääräisen hinnan, aseta Tukosasetukset"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ei voida ylikirjoittaa rivikohta {0} {1} yli {2}. Jotta voit laskuttaa ylimääräisen hinnan, aseta Tukosasetukset"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Päivitä vastaus
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Valitse ensin ohjelma
 DocType: Patient Appointment,Patient Age,Potilaan ikä
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Toimitusjohtaja Projektit
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Sarjanumero {0} on jo palautettu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Sarjanumero {0} on jo palautettu
 DocType: Supplier,Supplier of Goods or Services.,Tavara- tai palvelutoimittaja
 DocType: Budget,Fiscal Year,Tilikausi
 DocType: Asset Maintenance Log,Planned,suunnitellut
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Vahinkovakuutustilejä käytetään, jos niitä ei ole asetettu potilaan kirjanpitoon."
 DocType: Vehicle Log,Fuel Price,polttoaineen hinta
+DocType: Bank Guarantee,Margin Money,Marginaalinen raha
 DocType: Budget,Budget,budjetti
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Aseta Avaa
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Seuranta
 DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Nimikkeelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Nimikkeelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
 ,Amount to Deliver,toimitettava arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Sama kohde on syötetty useita kertoja. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term alkamispäivä ei voi olla aikaisempi kuin vuosi alkamispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Oli virheitä
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Työntekijä {0} on jo hakenut {1} välillä {2} ja {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Oli virheitä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Työntekijä {0} on jo hakenut {1} välillä {2} ja {3}:
 DocType: Guardian,Guardian Interests,Guardian Harrastukset
 DocType: Naming Series,Current Value,Nykyinen arvo
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
 DocType: Education Settings,Instructor Records to be created by,Ohjaajan rekisterit luodaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,tehnyt {0}
 DocType: GST Account,GST Account,GST-tili
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Eräpäivä voi olla ennen tositepäivää
 DocType: Website Item Group,Website Item Group,Tuoteryhmän verkkosivu
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Lisätty suosikkeihin
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Mitään palkkalippua, jonka todettiin jättävän edellä mainittujen kriteerien tai palkkasumman perusteella"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,tullit ja verot
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Mitään palkkalippua, jonka todettiin jättävän edellä mainittujen kriteerien tai palkkasumman perusteella"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,tullit ja verot
 DocType: Projects Settings,Projects Settings,Projektit-asetukset
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Anna Viiteajankohta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,tuoteryhmien puu
 DocType: Production Plan,Total Produced Qty,Kokonaistuotanto
 DocType: Payroll Entry,Get Employee Details,Hanki työntekijän tiedot
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 DocType: Asset,Sold,Myyty
 ,Item-wise Purchase History,Nimikkeen ostohistoria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Määrä (Company valuutta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Raakamateriaalit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Raakamateriaalit
 DocType: Payment Reconciliation Payment,Reference Row,Viite Row
 DocType: Installation Note,Installation Time,asennus aika
 DocType: Sales Invoice,Accounting Details,Kirjanpito Lisätiedot
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,poista kaikki tapahtumat tältä yritykseltä
 DocType: Patient,O Positive,O Positiivinen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,sijoitukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,sijoitukset
 DocType: Issue,Resolution Details,Ratkaisun lisätiedot
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,määrärahat
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,hyväksymiskriteerit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Syötä hankintapyynnöt yllä olevaan taulukkoon
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Journal Entry ei ole käytettävissä takaisinmaksua
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 DocType: BOM,Show In Website,näytä verkkosivustossa
 DocType: Shopping Cart Settings,Show Quantity in Website,Näytä Määrä Website
-DocType: Employee Loan Application,Total Payable Amount,Yhteensä Maksettava määrä
+DocType: Loan Application,Total Payable Amount,Yhteensä Maksettava määrä
 DocType: Task,Expected Time (in hours),odotettu aika (tunteina)
 DocType: Item Reorder,Check in (group),Check in (ryhmä)
 DocType: Soil Texture,Silt,liete
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Maksaa
 DocType: Room,Room Name,huoneen nimi
 DocType: Prescription Duration,Prescription Duration,Reseptikesto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää / peruuttaa ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää / peruuttaa ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Asiakkaan osoitteet ja yhteystiedot
 ,Campaign Efficiency,Kampanjan tehokkuus
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,luku
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pari
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Oletus tili päivitetään automaattisesti POS-laskuun, kun tämä tila on valittu."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
 DocType: Asset,Depreciation Schedule,Poistot aikataulu
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,-myyjään osoitteista ja yhteystiedoista
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date pitäisi olla välillä Päivästä ja Päivään
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date pitäisi olla välillä Päivästä ja Päivään
 DocType: Maintenance Schedule Detail,Actual Date,todellinen päivä
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Aseta oletuskustannuspaikka {0} yrityksessä.
 DocType: Item,Has Batch No,on erä nro
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
 DocType: Soil Texture,Soil Type,Maaperätyyppi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Uusi viesti
 ,Quotation Trends,Tarjousten kehitys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Hub-luokka
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvon rekisterinumero
-DocType: Employee Loan,Loan Amount,Lainan määrä
+DocType: Loan,Loan Amount,Lainan määrä
 DocType: Student Report Generation Tool,Add Letterhead,Lisää kirjelomake
 DocType: Program Enrollment,Self-Driving Vehicle,Itsestään kulkevaa ajoneuvoa
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Toimittajan sijoitus
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,asento
 DocType: Patient,Patient Details,Potilastiedot
 DocType: Patient,B Positive,B Positiivinen
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
 DocType: Leave Block List Allow,Leave Block List Allow,Salli
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 DocType: Patient Medical Record,Patient Medical Record,Potilaan lääketieteellinen tietue
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,urheilu
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kiinteä summa yhteensä
 DocType: Lab Test UOM,Test UOM,Testaa UOM
 DocType: Student Siblings,Student Siblings,Student Sisarukset
+DocType: Subscription Plan Detail,Subscription Plan Detail,Tilausohjelman yksityiskohtaisuus
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Yksikkö
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Ilmoitathan Company
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Ilmoitathan Company
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Asset Maintenance Task,Maintenance Task,Huolto Tehtävä
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Aseta B2C-raja GST-asetuksissa.
@@ -2516,6 +2525,7 @@
 ,BOM Search,BOM-haku
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Kulutettu kokonaiskustannus (osakemäärällä)
 DocType: Hub Settings,Company Registered,Rekisteröity yritys
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Päivämäärä ei voi olla pienempi kuin Päivämäärä
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Julkaise &quot;Varastossa&quot; tai &quot;Ei varastossa&quot; Hubissa tämän varaston varastosta.
 DocType: Vehicle,Fuel Type,Polttoaine
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Määritä yrityksen valuutta
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat hankintapyynnöt luotu tilauspisteen mukaisesti
 DocType: Email Digest,Pending Sales Orders,Odottaa Myyntitilaukset
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 DocType: Employee,Create User Permission,Luo käyttöoikeus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
 DocType: Healthcare Settings,Remind Before,Muistuta ennen
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Mittayksikön muuntokerroin vaaditaan rivillä {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
 DocType: Salary Component,Deduction,vähennys
 DocType: Item,Retain Sample,Säilytä näyte
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
 DocType: Stock Reconciliation Item,Amount Difference,määrä ero
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Nimikkeen '{0}' hinta lisätty hinnastolle '{1}'
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Nimikkeen '{0}' hinta lisätty hinnastolle '{1}'
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Syötä työntekijätunnu tälle myyjälle
 DocType: Territory,Classification of Customers by region,asiakkaiden luokittelu alueittain
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Tuotannossa
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Laskettu tilin saldo
 DocType: Normal Test Template,Normal Test Template,Normaali testausmalli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,käyttäjä poistettu käytöstä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Tarjous
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Vastaanotettua pyyntöä ei voi määrittää Ei lainkaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Tarjous
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Vastaanotettua pyyntöä ei voi määrittää Ei lainkaan
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Vähennys yhteensä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Valitse tili, jonka haluat tulostaa tilin valuuttana"
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tämä perustuu potilaaseen kohdistuviin liiketoimiin. Katso lisätietoja alla olevasta aikataulusta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,kustannukset päivitetty
 DocType: Patient,Date of Birth,Syntymäpäivä
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Nimike {0} on palautettu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Nimike {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** sisältää kaikki sen kuluessa kirjatut kirjanpito- ym. taloudenhallinnan tapahtumat
 DocType: Opportunity,Customer / Lead Address,Asiakkaan / Liidin osoite
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Toimittajan tuloskortin asetukset
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,työn kuvaus
 DocType: Student Applicant,Applied,soveltava
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Avaa uudelleen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Avaa uudelleen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Yksikkömäärä / varastoyksikkö
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Sale alennus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
+DocType: Department Approver,Approver,Hyväksyjä
 ,SO Qty,Myyntitilaukset yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Kentän osakkeenomistaja ei voi olla tyhjä
 DocType: Guardian,Work Address,Työosoite
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Yhteensä jaettava määrä (Company valuutta)
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 DocType: BOM,Scrap Material Cost,Romu ainekustannukset
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
 DocType: Grant Application,Email Notification Sent,Sähköpostiviesti lähetetty
 DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Rivikohtainen koodi, varasto, määrä vaaditaan"
-DocType: Pricing Rule,Supplier,Toimittaja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Rivikohtainen koodi, varasto, määrä vaaditaan"
+DocType: Bank Guarantee,Supplier,Toimittaja
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Näytä maksutiedot
 DocType: Consultation,Consultation Time,Kuuleminen
 DocType: C-Form,Quarter,3 kk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Sekalaiset kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Sekalaiset kustannukset
 DocType: Global Defaults,Default Company,oletus yritys
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kustannus- / erotuksen tili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,pankin nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-yllä
-DocType: Employee Loan,Employee Loan Account,Työntekijän lainatilin
 DocType: Leave Application,Total Leave Days,"Poistumisten yhteismäärä, päivät"
 DocType: Email Digest,Note: Email will not be sent to disabled users,huom: sähköpostia ei lähetetä käytöstä poistetuille käyttäjille
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Lukumäärä Vuorovaikutus
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Paino (kilogrammoina)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",luvut / luku_nimi jättää tyhjäksi automaattisesti asetetun luvun tallentamisen jälkeen.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Aseta GST-tilit GST-asetuksissa
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Aseta GST-tilit GST-asetuksissa
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Liiketoiminnan tyyppi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kustannukset New Purchase
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Avustuksen kuvaus
 DocType: Purchase Invoice Item,Rate (Company Currency),hinta (yrityksen valuutassa)
 DocType: Student Guardian,Others,Muut
+DocType: Subscription,Discounts,alennukset
 DocType: Payment Entry,Unallocated Amount,Kohdistamattomat Määrä
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nimikettä ei löydy. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,Verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ei enää päivityksiä
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Tämä kattaa kaikki tämän asetusten sidotut tuloskartat
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Tuotepaketti ei voi sisältää nimikettä joka on tuotepaketti. Poista nimike `{0}` ja tallenna.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Pankkitoiminta
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,palvelu Tuote
 DocType: Bank Guarantee,Bank Guarantee,Pankkitakaus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numeerinen sarja osallistumiselle Setup&gt; Numerosarjan kautta
 DocType: Bin,Ordered Quantity,tilattu määrä
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Grading Scale,Grading Scale Intervals,Arvosteluasteikko intervallit
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Tulos vuodelle
+DocType: Bank Guarantee,Name of Bank,Pankin nimi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry {2} voidaan tehdä valuutta: {3}
 DocType: Fee Schedule,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tree of tilinpäätös.
+DocType: Bank Guarantee,Reference Document Type,Viite Asiakirjan tyyppi
 DocType: Cash Flow Mapping,Cash Flow Mapping,Kassavirran kartoitus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,Pitkaikaiset vastaavat
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Sarjanumeroitu varastonhallinta
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Sähköpostiä ei löydy oletusyhteydellä
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Luo salaisuus
-DocType: Employee Loan,Account Info,Tilitiedot
+DocType: Loan,Account Info,Tilitiedot
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
 DocType: Fees,Include Payment,Sisällytä maksu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Opiskelija ryhmät luotu.
 DocType: Sales Invoice,Total Billing Amount,Lasku yhteensä
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Palkkarakenteen ja opiskelijaryhmän ohjelma {0} eroavat toisistaan.
 DocType: Fee Schedule,Receivable Account,Saatava tili
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
 DocType: Quotation Item,Stock Balance,Varastotase
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Myyntitilauksesta maksuun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,toimitusjohtaja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,toimitusjohtaja
 DocType: Purchase Invoice,With Payment of Tax,Veronmaksu
 DocType: Expense Claim Detail,Expense Claim Detail,Kulukorvauksen lisätiedot
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Kolminkertaisesti TOIMITTAJA
 DocType: Land Unit,Is Container,Onko kontti
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Tämä on viljelykierron 1. päivä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Valitse oikea tili
 DocType: Purchase Invoice Item,Weight UOM,Painoyksikkö
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,"Luettelo osakkeenomistajista, joilla on folionumerot"
 DocType: Salary Structure Employee,Salary Structure Employee,Palkka rakenne Työntekijän
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Näytä varianttimääritteet
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Näytä varianttimääritteet
 DocType: Student,Blood Group,Veriryhmä
 DocType: Course,Course Name,Kurssin nimi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Seuraavat käyttäjät voivat hyväksyä organisaation loma-anomukset
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Toimisto välineistö
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Toimisto välineistö
 DocType: Purchase Invoice Item,Qty,Yksikkömäärä
 DocType: Fiscal Year,Companies,Yritykset
 DocType: Supplier Scorecard,Scoring Setup,Pisteytysasetukset
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,"Kokonaisarvo, saapuva"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Veloituksen tarvitaan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tuntilomakkeet auttavat seuraamaan aikaa, kustannuksia ja laskutusta tiimisi toiminnasta."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Ostohinta List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Toimittajan tuloskortin muuttujien mallipohjat.
 DocType: Job Offer Term,Offer Term,Tarjouksen voimassaolo
 DocType: Asset,Quality Manager,Laadunhallinnan ylläpitäjä
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Maksamattomat yhteensä: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM-sivuston Käyttö
 DocType: Supplier Scorecard,Supplier Score,Toimittajan pisteytys
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,"Kokonaislaskutus, pankkipääte"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,"Kokonaislaskutus, pankkipääte"
 DocType: Supplier,Warn RFQs,Varoittaa pyyntöjä
 DocType: BOM,Conversion Rate,Muuntokurssi
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Tuotehaku
 DocType: Assessment Plan,To Time,Aikaan
 DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
+DocType: Loan,Total Amount Paid,Maksettu kokonaismäärä
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Valitse opiskelijavaihto, joka on pakollinen opiskelijalle"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2}:n osa tai päinvastoin
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Valitse hinnasto julkaistaksesi hinnoittelun
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnasto {0} on poistettu käytöstä
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rivi {0}: Valmis Määrä voi olla enintään {1} toimimaan {2}
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Sarja-nimikettä {0} ei voi päivittää varaston täsmäytyksellä, tee varastotapahtuma"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Sarja-nimikettä {0} ei voi päivittää varaston täsmäytyksellä, tee varastotapahtuma"
 DocType: Training Event Employee,Training Event Employee,Koulutustapahtuma Työntekijä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Suurin näytteitä - {0} voidaan säilyttää erää {1} ja kohtaan {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Lisää aikavälejä
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuotteelle {1}. Olet antanut {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuotteelle {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nykyinen arvostus
 DocType: Training Event,Advance,edetä
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,toistuvan uudelleen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless-maksuyhteysasetukset
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange voitto / tappio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange voitto / tappio
 DocType: Opportunity,Lost Reason,Häviämissyy
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rivi # {0}: tili {1} ei kuulu yritykseen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rivi # {0}: tili {1} ei kuulu yritykseen {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ei löytynyt
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,Näytteen koko
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,kiinteä yksikkömäärä
 DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sarjanumeroa {0} ei löydy
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Tilaus on {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Maksun aikatauluohjelma
 DocType: Fee Schedule Program,Student Batch,Student Erä
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tee Student
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Sähköinen kaupankäynti GSTIN
 DocType: Sales Order,Not Delivered,toimittamatta
 ,Bank Clearance Summary,pankin tilitysyhteenveto
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
 DocType: Appraisal Goal,Appraisal Goal,arvioinnin tavoite
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Ehdota luokkaa?
 DocType: Stock Reconciliation Item,Current Amount,nykyinen Määrä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Rakennukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Rakennukset
 DocType: Fee Schedule,Fee Structure,Palkkiojärjestelmä
 DocType: Timesheet Detail,Costing Amount,"kustannuslaskenta, arvomäärä"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Student Admission Program,Application Fee,Hakemusmaksu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Vahvista palkkatosite
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm alennus Tuote {0} on {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
 DocType: SMS Log,Sender Name,Lähettäjän nimi
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Maatalousanalyysikriteerit
+DocType: HR Settings,Leave Approval Notification Template,Jätä hyväksyntäilmoituslomake
 DocType: POS Profile,[Select],[valitse]
 DocType: Vital Signs,Blood Pressure (diastolic),Verenpaine (diastolinen)
 DocType: SMS Log,Sent To,Lähetetty kenelle
 DocType: Agriculture Task,Holiday Management,Lomahallinta
 DocType: Payment Request,Make Sales Invoice,tee myyntilasku
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Ohjelmistot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Ohjelmistot
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
 DocType: Company,For Reference Only.,vain viitteeksi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lääkäri {0} ei ole käytettävissä {1}
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,Uusi Työpaikka
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Ainehankinta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Aseta suljetuksi
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ei löydy tuotetta viivakoodilla {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ei löydy tuotetta viivakoodilla {0}
 DocType: Normal Test Items,Require Result Value,Vaaditaan tulosarvoa
 DocType: Item,Show a slideshow at the top of the page,Näytä diaesitys sivun yläreunassa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMs
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Matkapuhelin
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Toistuva
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Kassavirtakaavion mallipohjan tiedot
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Lainanhallinta
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,seuraa tavaran erillisiä tuloja ja kuluja  toimialoittain tai osastoittain
 DocType: Rename Tool,Rename Tool,Nimeä työkalu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Päivitä kustannukset
 DocType: Item Reorder,Item Reorder,Tuotteen täydennystilaus
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Näytä Palkka Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Varastosiirto
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Näytä Palkka Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Varastosiirto
 DocType: Fees,Send Payment Request,Lähetä maksupyyntö
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 DocType: Water Analysis,Origin,alkuperä
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Valitse muutoksen suuruuden tili
 DocType: Purchase Invoice,Price List Currency,"Hinnasto, valuutta"
 DocType: Naming Series,User must always select,Käyttäjän tulee aina valita
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Onko tuloverovelvollisuus
 DocType: Grading Scale Interval,Grade Description,Grade Kuvaus
 DocType: Stock Entry,Purchase Receipt No,Saapumistositteen nro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,aikaisintaan raha
 DocType: Sales Invoice, Shipping Bill Number,Toimituslaskunumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,jäljitettävyys
 DocType: Asset Maintenance Log,Actions performed,Tehtävät suoritettiin
 DocType: Cash Flow Mapper,Section Leader,Ryhmänjohtaja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Rahoituksen lähde (vieras pääoma)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Rahoituksen lähde (vieras pääoma)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Työntekijä
+DocType: Bank Guarantee,Fixed Deposit Number,Kiinteä talletusnumero
 DocType: Asset Repair,Failure Date,Vianmäärityspäivämäärä
 DocType: Sample Collection,Collected Time,Kerätty aika
 DocType: Company,Sales Monthly History,Myynti Kuukausittainen historia
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Haluatko varmasti peruuttaa nimityksen?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellihuoneen hinnoittelupaketti
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Rename Tool,File to Rename,Uudelleen nimettävä tiedosto
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Hae tilauksen päivitykset
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Tilin {0} ei vastaa yhtiön {1} -tilassa Account: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,kurssi:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,Kulukorvaus hyväksytty
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Ei luotu työjärjestys
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,Myyntitilaus vaaditaan
 DocType: Purchase Invoice,Credit To,kredittiin
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Ei lainkaan
 DocType: Warranty Claim,Raised By,Pyynnön tekijä
 DocType: Payment Gateway Account,Payment Account,Maksutili
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,korvaava on pois
 DocType: Job Offer,Accepted,hyväksytyt
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Hakutulokset
 DocType: Room,Room Number,Huoneen numero
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Toimitustapa otsikko
 DocType: Journal Entry Account,Payroll Entry,Palkkasumma
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Katso maksutiedot
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test -näyte
 DocType: Item Variant Settings,Allow Rename Attribute Value,Salli Rename attribuutin arvo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Nopea Päiväkirjakirjaus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"hintaa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Restaurant,Invoice Series Prefix,Laskujen sarjan etuliite
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Mapsin integraatio ei ole käytössä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ei ole vahvistettu
+DocType: Subscription,Trialling,testaamista
 DocType: Member,Membership Expiry Date,Jäsenyyden päättymispäivä
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} on oltava negatiivinen saatavat dokumentissa
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} on oltava negatiivinen saatavat dokumentissa
 ,Minutes to First Response for Issues,Vastausaikaraportti (ongelmat)
 DocType: Purchase Invoice,Terms and Conditions1,Ehdot ja säännöt 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Nimi Instituutin jolle olet luomassa tätä järjestelmää.
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Yksikkö
 DocType: Fiscal Year,Year End Date,Vuoden viimeinen päivä
 DocType: Task Depends On,Task Depends On,Tehtävä riippuu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Myyntimahdollisuus
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Myyntimahdollisuus
 DocType: Operation,Default Workstation,oletus työpiste
 DocType: Notification Control,Expense Claim Approved Message,Viesti kulukorvauksen hyväksymisestä
 DocType: Payment Entry,Deductions or Loss,Vähennykset tai Loss
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Jätä Ilman Pay ei vastaa hyväksyttyä Leave Application kirjaa
 DocType: Campaign,Campaign-.####,kampanja -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,tee Lasku
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Jäljelläoleva saldo
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Viivakoodi {0} ei ole kelvollinen {1} koodi
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,end Year
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lyijy%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Driver,Driver,kuljettaja
 DocType: Vital Signs,Nutrition Values,Ravitsemusarvot
 DocType: Lab Test Template,Is billable,On laskutettava
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Todellinen aloituspäivä (via kellokortti)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Tämä on ERPNext-järjestelmän automaattisesti luoma verkkosivu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,vanhentumisen skaala 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Ennakkomaksu ei voi olla suurempi kuin vaadittu kokonaismäärä
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Ennakkomaksu ei voi olla suurempi kuin vaadittu kokonaismäärä
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Valitse attribuuttiarvot
 DocType: Purchase Invoice,Reason For Issuing document,Asiakirjan myöntämisen syy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Varastotapahtumaa {0} ei ole vahvistettu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Varastotapahtumaa {0} ei ole vahvistettu
 DocType: Payment Reconciliation,Bank / Cash Account,Pankki-tai Kassatili
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Seuraava Ota By voi olla sama kuin Lead Sähköpostiosoite
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,Palveluosoite
 DocType: Asset Maintenance Task,Calibration,kalibrointi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} on yritysloma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Huonekaluja ja kalusteet
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Jätä statusilmoitus
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Huonekaluja ja kalusteet
 DocType: Item,Manufacture,Valmistus
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,Istutusalue
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Tämä voi johtua siitä, että joitain virheellisiä sähköpostiosoitteita on"
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Lisäsit
 DocType: Purchase Taxes and Charges,Parenttype,Päätyyppi
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Harjoitustulos
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Tuotteet per sivu
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisaation sivutoimialamalline
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ilmoita ongelma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Hyödykekulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ja yli
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteerit Paino
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Jätä hyväksyntäilmoitus
 DocType: Buying Settings,Default Buying Price List,Ostohinnasto (oletus)
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Palkka tuntilomakkeen mukaan
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ostaminen
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Ostaminen
 DocType: Notification Control,Sales Order Message,"Myyntitilaus, viesti"
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Aseta oletusarvot kuten yritys, valuutta, kuluvan tilikausi jne"
 DocType: Payment Entry,Payment Type,Maksun tyyppi
@@ -3116,14 +3134,15 @@
 DocType: POS Profile,Print Format for Online,Tulosta formaatti verkossa
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ostoskoritoiminnon asetukset
 DocType: Journal Entry,Accounting Entries,"kirjanpito, kirjaukset"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jos valittu hinnoittelusääntö on tehty &quot;Hinta&quot;, se korvaa hinnaston. Hinnoittelu Sääntömäärä on lopullinen kurssi, joten ylimääräistä alennusta ei pitäisi soveltaa. Niinpä tapahtumissa, kuten myyntitoimeksiannossa, ostotilauksellakin jne., Se noudetaan &quot;Rate&quot; -kenttään eikä &quot;Price List Rate&quot; -kenttään."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jos hinnoittelusääntöön on valittu ""Hinta"", se korvaa muut hinnastot. Hinnoittelusäännön määrä on lopullinen kurssi, joten ylimääräistä alennusta ei enää sovelleta. Niinpä tapahtumissa esim. myynti- ja ostotilauksissa, se noudetaan ""Rate""-kenttään eikä ""Price List Rate""-kenttään."
+DocType: Journal Entry,Paid Loan,Maksettu laina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"monista kirjaus, tarkista oikeutussäännöt {0}"
 DocType: Journal Entry Account,Reference Due Date,Viivästyspäivämäärä
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,Kuitti asiakirja on esitettävä
 DocType: Purchase Invoice Item,Received Qty,Saapunut yksikkömäärä
 DocType: Stock Entry Detail,Serial No / Batch,Sarjanumero / erä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,Ei makseta ja ei toimiteta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,Ei maksettu eikä toimitettu
 DocType: Product Bundle,Parent Item,Pääkohde
 DocType: Account,Account Type,Tilin tyyppi
 DocType: Delivery Note,DN-RET-,DN-jälkikä-
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,Tuotantoon
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Palkanmaksu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
 DocType: Patient Service Unit,Parent Service Unit,Vanhempien huoltoyksikkö
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Tee Käyttäjän
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,tulotili
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Toimitus
 DocType: Volunteer,Weekdays,Arkisin
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: Restaurant Menu,Restaurant Menu,Ravintola Valikko
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Aseta oletus varaston osuus investointikertymämenetelmän
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Aseta oletus varaston osuus investointikertymämenetelmän
 DocType: Item Reorder,Material Request Type,Hankintapyynnön tyyppi
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Lähetä rahastoarvio sähköposti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStoragen on täynnä, ei tallentanut"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Huoneen kapasiteetti
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Tietue {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Viite
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Menetät aiemmin luotujen laskujen tiedot. Haluatko varmasti aloittaa tämän tilauksen uudelleen?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Rekisteröintimaksu
 DocType: Budget,Cost Center,Kustannuspaikka
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Tosite #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Tosite #
 DocType: Notification Control,Purchase Order Message,Ostotilaus Message
 DocType: Tax Rule,Shipping Country,Toimitusmaa
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Piilota Asiakkaan Tax Id myyntitapahtumia
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla
 DocType: Employee Education,Class / Percentage,Luokka / prosentti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,markkinoinnin ja myynnin pää
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,markkinoinnin ja myynnin pää
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,tulovero
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seuraa vihjeitä toimialan mukaan
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Siirry kirjelomakkeisiin
+DocType: Subscription,Cancel At End Of Period,Peruuta lopussa
 DocType: Item Supplier,Item Supplier,tuote toimittaja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Siirrettäviä kohteita ei ole valittu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Siirrettäviä kohteita ei ole valittu
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
 DocType: Vehicle,Electric,Sähköinen
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Voitto / tappio Omaisuudenhoitoalan Hävittäminen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Voitto / tappio Omaisuudenhoitoalan Hävittäminen
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Alla olevassa taulukossa valitaan vain &quot;Approved&quot; -tilassa oleva opiskelijahakija.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Tilille {0} ei ole tiliä. <br> Aseta tilikarttasi oikein.
 DocType: Task,Depends on Tasks,Riippuu Tehtävät
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Not in Stock
 DocType: Volunteer,Volunteer Skills,Vapaaehtoistyöntekijät
 DocType: Appraisal,HR User,HR käyttäjä
+DocType: Bank Guarantee,Reference Document Name,Viiteasiakirjan nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted,Netto ilman veroja ja kuluja
 apps/erpnext/erpnext/hooks.py +142,Issues,Tukipyynnöt
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tilan tulee olla yksi {0}:sta
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,erittäin suuri
+DocType: Loan,Loan Application,Lainahakemus
 DocType: Crop,Scientific Name,Tieteellinen nimi
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Yhteensä lehdet
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Vahvista uudelleen, jos valittua konetta muokataan tallentamisen jälkeen"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,takaus/shekki numero
 ,Sales Browser,Myyntiselain
 DocType: Journal Entry,Total Credit,Kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Varoitus:  Varastotapahtumalle {2} on jo olemassa toinen {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Varoitus:  Varastotapahtumalle {2} on jo olemassa toinen {0} # {1}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Suuri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Suuri
 DocType: Homepage Featured Product,Homepage Featured Product,Kotisivu Erityistuotteet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Kaikki Assessment Groups
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Kaikki Assessment Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uusi varasto Name
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Yhteensä {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Alue
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,Maksut
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Tarjous {0} on peruttu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,odottava arvomäärä yhteensä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,odottava arvomäärä yhteensä
 DocType: Sales Partner,Targets,Tavoitteet
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Rekisteröi SIREN-numero yritystiedostossa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 DocType: Price List,Price List Master,Hinnasto valvonta
 DocType: GST Account,CESS Account,CESS-tili
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Valitse potilas
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametrin nimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vain Jätä Sovellukset tilassa &#39;Hyväksytty&#39; ja &#39;Hylätty &quot;voi jättää
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Opiskelija Ryhmän nimi on pakollinen rivin {0}
 DocType: Homepage,Products to be shown on website homepage,Verkkosivuston etusivulla näytettävät tuotteet
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Tämä on perusasiakasryhmä joka ei ole muokattavissa.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Laskutus on jo luotu kaikille laskutustunteille
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nimivirhe: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Onko rahoituskustannus
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
 DocType: Packing Slip,If more than one package of the same type (for print),mikäli useampi saman tyypin pakkaus (tulostus)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Aseta oletusasiakas ravintolaasetuksissa
 ,Salary Register,Palkka Register
 DocType: Warehouse,Parent Warehouse,Päävarasto
-DocType: C-Form Invoice Detail,Net Total,netto yhteensä
+DocType: Subscription,Net Total,netto yhteensä
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Oletuksena BOM ei löytynyt Tuote {0} ja Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Määritä eri laina tyypit
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Määritä eri laina tyypit
 DocType: Bin,FCFS Rate,FCFS taso
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,odottava arvomäärä
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aika (min)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root on ryhmä
 DocType: Drug Prescription,Drug Prescription,Lääkehoito
 DocType: Fees,FEE.,MAKSU.
-DocType: Employee Loan,Repaid/Closed,Palautettava / Suljettu
+DocType: Loan,Repaid/Closed,Palautettava / Suljettu
 DocType: Item,Total Projected Qty,Arvioitu kokonaismäärä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Arviointikurssia ei ole löytynyt {0}, joka on velvollinen tekemään kirjanpitoarvot {1} {2}. Jos kohde käsitellään {1}: n nollaarvostuskorkoineen, mainitse {1} kohtaan taulukossa. Muussa tapauksessa luo saapuva osakekauppa kohteen kohtaan tai mainitse arvonmäärityskorvaus Item-tietueessa ja yritä sitten lähettää tai peruuttaa tämä merkintä"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Course koodi
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Tuotteelle {0} laatutarkistus
 DocType: POS Settings,Use POS in Offline Mode,Käytä POS Offline-tilassa
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,Katsottu vienti
 DocType: Stock Entry,Material Transfer for Manufacture,Varastosiirto tuotantoon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
-DocType: Subscription,Half-yearly,6 kk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Kirjanpidon varastotapahtuma
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Olet jo arvioitu arviointikriteerit {}.
 DocType: Vehicle Service,Engine Oil,Moottoriöljy
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Luodut työmääräykset: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Luodut työmääräykset: {0}
 DocType: Sales Invoice,Sales Team1,Myyntitiimi 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,Asiakkaan osoite
-DocType: Employee Loan,Loan Details,Loan tiedot
+DocType: Loan,Loan Details,Loan tiedot
 DocType: Company,Default Inventory Account,Oletus Inventory Tili
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio-numerot eivät täsmää
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Linkki kaikkiin maayksiköihin, joissa viljely kasvaa"
 DocType: Account,Root Type,kantatyyppi
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
 DocType: Item Group,Show this slideshow at the top of the page,Näytä tämä diaesitys sivun yläreunassa
 DocType: BOM,Item UOM,tuote UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Veron arvomäärä alennusten jälkeen (yrityksen valuutta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Kohdevarasto on pakollinen rivillä {0}
 DocType: Cheque Print Template,Primary Settings,Perusasetukset
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittajan osoite
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Lisää Työntekijät
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Lisää Työntekijät
 DocType: Purchase Invoice Item,Quality Inspection,Laatutarkistus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,erittäin pieni
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,erittäin pieni
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa minimi hankintaerän
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa minimi hankintaerän
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 DocType: Payment Request,Mute Email,Mute Sähköposti
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,Lähetetyn SMS-viestin numero
 DocType: Antibiotic,Healthcare Administrator,Terveydenhuollon hallinto
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Aseta kohde
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numerointi sarja osallistumiselle Setup&gt; Numerosarjan kautta
 DocType: Dosage Strength,Dosage Strength,Annostusvoima
 DocType: Account,Expense Account,Kustannustili
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Ohjelmisto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,väritä
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Viimeinen voimassaolopäivä on pakollinen valitulle kohteelle
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Estää ostotilaukset
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,Henkilökohtainen ja sosiaalinen historia
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Käyttäjä {0} luotiin
 DocType: Fee Schedule,Fee Breakup for each student,Palkkioerot kunkin opiskelijan osalta
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Vaihda koodi
 DocType: Purchase Invoice Item,Valuation Rate,Arvostustaso
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel-
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
 DocType: Purchase Invoice,Availed ITC Cess,Käytti ITC Cessia
 ,Student Monthly Attendance Sheet,Student Kuukauden Läsnäolo Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Myyntiin sovellettava toimitussääntö
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Asti
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Asti
 DocType: Rename Tool,Rename Log,Nimeä Loki
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Opiskelijaryhmän tai kurssin aikataulu on pakollinen
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pidä laskutus- ja työskentelytunnit samoina tuntilomakkeella.
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Luetteloi tuotteet tai palvelut, joita ostetaan tai myydään."
 DocType: Water Analysis,Storage Temperature,Säilytyslämpötila
 DocType: Employee Attendance Tool,Unmarked Attendance,Merkitsemätön Läsnäolo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Tutkija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Tutkija
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ohjelma Ilmoittautuminen Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Aloituspäivä olisi pienempi kuin tehtävä {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nimi tai Sähköposti on pakollinen
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajatietokortin seisominen, ja tämän toimittajan pyynnöstä tulisi antaa varovaisuus."
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Kokonaiskustannukset (Company valuutta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Sarjanumeron on luonut {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Sarjanumeron on luonut {0}
 DocType: Homepage,Company Description for website homepage,Verkkosivuston etusivulle sijoitettava yrityksen kuvaus
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Healthcare Settings,Result Printed,Tulos tulostettu
 DocType: Asset Category Account,Depreciation Expense Account,Poistokustannusten tili
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Koeaika
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Näytä {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Koeaika
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Project,Total Costing Amount (via Timesheets),Kokonaiskustannusmäärä (aikataulujen mukaan)
-DocType: Employee Advance,Expense Approver,Kulukorvausten hyväksyjä
+DocType: Department,Expense Approver,Kulukorvausten hyväksyjä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
 DocType: Project,Hourly,tunti-
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-ryhmän Group
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aikajana
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee Maksu Päiväkirjakirjaus
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,painettu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,painettu
 DocType: Item,Inspection Required before Delivery,Tarkastus Pakollinen ennen Delivery
 DocType: Item,Inspection Required before Purchase,Tarkastus Pakollinen ennen Purchase
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Odottaa Aktiviteetit
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,vähimmäistilausmäärä
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Organisaation
 DocType: Fee Component,Fees Category,Maksut Luokka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Syötä lievittää päivämäärä.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,pankkipääte
 DocType: Supplier Scorecard,Notify Employee,Ilmoita työntekijälle
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Täydennystilaustaso
 DocType: Company,Chart Of Accounts Template,Tilikartta Template
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palkkaerittelyn kohdistetut ansiot ja vähennykset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
 DocType: Purchase Invoice Item,Accepted Warehouse,hyväksytyt varasto
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,Arvomenetelmä
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Myyntitiimi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,monista kirjaus
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,monista kirjaus
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Anna edunsaajan nimi ennen lähettämistä.
 DocType: Program Enrollment Tool,Get Students,Hanki Opiskelijat
 DocType: Serial No,Under Warranty,Takuu voimassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[virhe]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"sanat näkyvät, kun tallennat myyntitilauksen"
 ,Employee Birthday,Työntekijän syntymäpäivä
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Valitse Valmis-korjauksen päättymispäivä
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Varattu alihankintaan
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
 DocType: Shopping Cart Settings,Orders,Tilaukset
-DocType: Employee Leave Approver,Leave Approver,Poissaolojen hyväksyjä
+DocType: Department,Leave Approver,Poissaolojen hyväksyjä
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Valitse erä
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
@@ -3593,7 +3615,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub seurata kohdetta
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneiden poistojen tili
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tämä sähköposti on automaattinen
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
 DocType: Program Enrollment,Boarding Student,lennolle Student
 DocType: Asset,Expected Value After Useful Life,Odotusarvo jälkeen käyttöiän
@@ -3618,21 +3639,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Läsnäolo Record {0} on olemassa vastaan Opiskelija {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Poistot Putosi johtuu omaisuuden myynnistä
-DocType: Member,Member,Jäsen
+DocType: Loan,Member,Jäsen
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Hallitse Osoitteet
 DocType: Work Order Item,Work Order Item,Työjärjestys
 DocType: Pricing Rule,Item Code,Nimikekoodi
 DocType: Serial No,Warranty / AMC Details,Takuun / ylläpidon lisätiedot
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
 DocType: Journal Entry,User Remark,Käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Maatalouspäällikkö
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin puuttuva summa {0}
 DocType: Supplier Scorecard Period,Variables,muuttujat
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),sulku (dr)
 DocType: Cheque Print Template,Cheque Size,Shekki Koko
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Sarjanumero {0} ei varastossa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Veromallipohja myyntitapahtumiin
 DocType: Sales Invoice,Write Off Outstanding Amount,Poiston odottava arvomäärä
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Tilin {0} ei vastaa yhtiön {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,Oletusvarastoyksikkö
 DocType: Asset,Number of Depreciations Booked,Kirjattujen poistojen lukumäärä
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Määrä yhteensä
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Vastaan työntekijä lainan: {0}
 DocType: Landed Cost Item,Receipt Document,kuitti Document
 DocType: Employee Education,School/University,Koulu/Yliopisto
 DocType: Payment Request,Reference Details,Viite Tietoja
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Suljettu järjestys ei voi peruuttaa. Unclose peruuttaa.
 DocType: Student Guardian,Father,Isä
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Päivitä varasto' ei voida valita käyttöomaisuuden myynteihin
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Päivitä varasto' ei voida valita käyttöomaisuuden myynteihin
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 DocType: Attendance,On Leave,lomalla
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Liity sähköpostilistalle
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,matala tulo
 DocType: Restaurant Order Entry,Current Order,Nykyinen tilaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Lähde- ja kohdevarasto eivät voi olla samat rivillä {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erotuksen tili tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erotuksen tili tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Siirry kohtaan Ohjelmat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rivi {0} # Sallittu määrä {1} ei voi olla suurempi kuin lunastamaton summa {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rivi {0} # Sallittu määrä {1} ei voi olla suurempi kuin lunastamaton summa {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,Maksuehdot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuutti
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 DocType: Purchase Invoice,Purchase Taxes and Charges,Oston verot ja maksut
 DocType: Chapter,Meetup Embed HTML,Meetup Upota HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Siirry toimittajiin
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Aseta opiskelijalle sähköpostiosoite lähettämään maksupyyntö
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Aseta opiskelijalle sähköpostiosoite lähettämään maksupyyntö
 DocType: Patient,Medical History,Lääketieteellinen historia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,pankin tilinylitystili
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,pankin tilinylitystili
 DocType: Patient,Patient ID,Potilaan tunnus
 DocType: Physician Schedule,Schedule Name,Aikataulun nimi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Tee palkkalaskelma
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Lisää kaikki toimittajat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Lisää kaikki toimittajat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rivi # {0}: osuutensa ei voi olla suurempi kuin lainamäärä.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,selaa BOM:a
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Taatut lainat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Taatut lainat
 DocType: Purchase Invoice,Edit Posting Date and Time,Muokkaa tositteen päiväystä
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Aseta poistot liittyvät tilien instrumenttikohtaisilla {0} tai Company {1}
 DocType: Lab Test Groups,Normal Range,Normaali alue
 DocType: Academic Term,Academic Year,Lukuvuosi
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Saatavana myyntiin
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Avaa oman pääoman tase
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Avaa oman pääoman tase
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,jäljellä oleva
 DocType: Appraisal,Appraisal,Arvioinnit
+DocType: Loan,Loan Account,Laina-tili
 DocType: Purchase Invoice,GST Details,GST-tiedot
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Sähköposti lähetetään toimittaja {0}
 DocType: Item,Default Sales Unit of Measure,Oletusmyyntiyksikkö
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Lukuvuosi:
+DocType: Subscription,Past Due Date,Erääntymispäivä
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Älä anna asettaa vaihtoehtoista kohdetta {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Päivä toistetaan
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,Potilaan nimittäminen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,hyväksyvä rooli ei voi olla sama kuin käytetyssä säännössä oleva
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Peru tämän sähköpostilistan tilaus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Hanki Toimittajat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Hanki Toimittajat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ei löydy kohdasta {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Siirry kursseihin
 DocType: Accounts Settings,Show Inclusive Tax In Print,Näytä Inclusive Tax In Print
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Viesti lähetetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Huomioon lapsen solmuja ei voida asettaa Ledger
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Aseta Instructor Naming System in Education&gt; Koulutusasetukset
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"taso, jolla hinnasto valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto (yrityksen valuutassa)
 DocType: Physician,Physician Schedules,Lääkärin aikataulut
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Ennakkomaksun kokonaismäärä ei voi olla suurempi kuin kokonainen seuraamusmäärä
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Ennakkomaksun kokonaismäärä ei voi olla suurempi kuin kokonainen seuraamusmäärä
 DocType: Salary Slip,Hour Rate,tuntitaso
 DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ei ole sallittua päivittää yli {0} vanhoja varastotapahtumia
 DocType: BOM,Inspection Required,tarkistus vaaditaan
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Anna pankkitakuun numero ennen lähettämistä.
 DocType: Driving License Category,Class,luokka
 DocType: Sales Order,Fully Billed,täysin laskutettu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Työtilaa ei voi nostaa esinettä kohti
@@ -3785,20 +3808,20 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Assessment Plan,Program,Ohjelmoida
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Roolin omaavat käyttäjät voivat jäädyttää tilejä, sekä luoda ja muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Aseta Instructor Naming System in Education&gt; Koulutusasetukset
 DocType: Serial No,Is Cancelled,on peruutettu
 DocType: Student Group,Group Based On,Ryhmät pohjautuvat
 DocType: Journal Entry,Bill Date,Bill Date
 DocType: Healthcare Settings,Laboratory SMS Alerts,Laboratorion SMS-ilmoitukset
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Palvelu Tuote, tyyppi, taajuus ja kustannuksella määrä tarvitaan"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Vaikka korkeimmalla prioriteetilla olisi useita hinnoittelusääntöjä, seuraavia sisäisiä prioriteettejä noudatetaan:"
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kasvien analyysikriteerit
 DocType: Cheque Print Template,Cheque Height,Shekki Korkeus
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
 DocType: Setup Progress,Setup Progress,Asennuksen edistyminen
+DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Sähköinen tilisiirto
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Sähköinen tilisiirto
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Tarkista kaikki
 ,Issued Items Against Work Order,Työtilauksen vastaiset erät
 DocType: Vehicle Log,Invoice Ref,lasku Ref
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,tariffi numero
 DocType: Work Order Item,Available Qty at WIP Warehouse,Available Kpl WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Ennuste
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Sarjanumero {0} ei kuulu varastoon {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Sarjanumero {0} ei kuulu varastoon {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,Tarjouksen viesti
-DocType: Employee Loan,Employee Loan Application,Työntekijän lainahakemuksen
 DocType: Issue,Opening Date,Opening Date
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Tallenna potilas ensin
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Tallenna potilas ensin
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
 DocType: Program Enrollment,Public Transport,Julkinen liikenne
 DocType: Soil Texture,Silt Composition (%),Silt-kokoonpano (%)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),Item Balance (yksinkertainen)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Laskut esille Toimittajat.
 DocType: POS Profile,Write Off Account,Poistotili
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Veloitusilmoituksen Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Veloitusilmoituksen Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),Takuuaika (päivinä)
@@ -3875,6 +3897,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,"Myyntitilaus, päivä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
 DocType: Assessment Plan,Assessment Plan,arviointi Plan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Asiakas {0} luodaan.
 DocType: Stock Settings,Limit Percent,raja Prosenttia
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Tällä hetkellä ei varastossa,"
@@ -3888,14 +3911,15 @@
 DocType: Journal Entry,Stock Entry,Varastotapahtuma
 DocType: Payment Entry,Payment References,Maksu viitteet
 DocType: C-Form,C-FORM-,C-muodostumisesta
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Intervallialueiden lukumäärä esim. Jos aikaväli on &quot;Päivät&quot; ja laskutusväli on 3, laskut synnytetään 3 päivän välein"
 DocType: Vehicle,Insurance Details,vakuutus Lisätiedot
 DocType: Account,Payable,Maksettava
 DocType: Share Balance,Share Type,Osaketyyppi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Anna takaisinmaksuajat
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Anna takaisinmaksuajat
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Velalliset ({0})
 DocType: Pricing Rule,Margin,Marginaali
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,bruttovoitto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,bruttovoitto %
 DocType: Appraisal Goal,Weightage (%),Painoarvo (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Muuta POS-profiilia
 DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
@@ -3905,10 +3929,11 @@
 DocType: Lead,Address Desc,osoitetiedot
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Osapuoli on pakollinen
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},"Rivit, joilla oli kahta päivämäärää toisissa riveissä, löytyivät: {list}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},"Rivit, joilla oli kahta päivämäärää toisissa riveissä, löytyivät: {list}"
 DocType: Topic,Topic Name,Aihe Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Määritä oletusmalli hylkäämisilmoitukselle HR-asetuksissa.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Ainakin osto tai myynti on pakko valita
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Valitse työntekijä, jotta työntekijä etenee."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Valitse työntekijä, jotta työntekijä etenee."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Valitse voimassa oleva päivämäärä
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Valitse liiketoiminnan luonteesta.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,Varastosta
 DocType: Installation Note,Installation Date,asennuspäivä
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Osakekirja
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Myynti lasku {0} luotiin
 DocType: Employee,Confirmation Date,Työsopimuksen vahvistamispäivä
 DocType: C-Form,Total Invoiced Amount,Kokonaislaskutus arvomäärä
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,Kertyneet poistot
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Pysyvä nimi
 DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
-DocType: Employee Loan Application,Required by Date,Vaaditaan Date
+DocType: Loan Application,Required by Date,Vaaditaan Date
 DocType: Lead,Lead Owner,Liidin vastuullinen
 DocType: Production Plan,Sales Orders Detail,Myyntitilaukset
 DocType: Bin,Requested Quantity,pyydetty määrä
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Yhteensä vähentäminen - Lainan takaisinmaksu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Palkka Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Useita vaihtoehtoja
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% toimitettu
+DocType: Subscription,Trial Period Start Date,Trial Period Start Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Nimikkeen {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritetty nimikkeelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Ole hyvä ja kirjaudu sisään toisena käyttäjänä.
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Jäsen nimi
 DocType: Stock Settings,Use Naming Series,Käytä nimipalvelusarjaa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
 DocType: POS Profile,Update Stock,Päivitä varasto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,liittymässä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erilaiset mittayksiköt voivat johtaa virheellisiin (kokonais) painoarvoihin. Varmista, että joka kohdassa käytetään samaa mittayksikköä."
 DocType: Membership,Payment Details,Maksutiedot
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM taso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Pysäytettyä työjärjestystä ei voi peruuttaa, keskeyttää se ensin peruuttamalla"
 DocType: Asset,Journal Entry for Scrap,Journal Entry for Romu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Siirrä tuotteita lähetteeltä
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,Maayksikkö
 ,Purchase Analytics,Hankinta-analytiikka
 DocType: Sales Invoice Item,Delivery Note Item,lähetteen tuote
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nykyinen lasku {0} puuttuu
 DocType: Asset Maintenance Log,Task,Tehtävä
 DocType: Purchase Taxes and Charges,Reference Row #,Viite Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Eränumero on pakollinen tuotteelle {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,valuutanvaihtojen voitto/tappiotili
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Työntekijät ja läsnäolo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Tapahtuman on oltava jokin {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Täytä muoto ja tallenna se
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Täytä muoto ja tallenna se
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Varsinainen kpl varastossa
 DocType: Homepage,"URL for ""All Products""","""Kaikki tuotteet"" - sivun WWW-osoite"
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Perusmyyntihinta
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 DocType: Cash Flow Mapper,Section Name,Osaston nimi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Täydennystilauksen yksikkömäärä
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Avoimet työpaikat
 DocType: Company,Stock Adjustment Account,Varastonsäätötili
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Poisto
@@ -4034,9 +4060,9 @@
 DocType: Task,depends_on,riippuu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Joudut päivittämään viimeisimmän hinnan kaikkiin Bill of Materials -asiakirjoihin. Voi kestää muutaman minuutin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,"maa työkalu, oletus osoite, mallipohja"
 DocType: Water Analysis,Appearance,Ulkomuoto
+DocType: HR Settings,Leave Status Notification Template,Jätä statusilmoitusmalli
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Keskim. Hintaluokan hinta
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Jäsenen tiedot.
@@ -4059,7 +4085,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ei sallittu. Poista kokeilumalli käytöstä
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
 DocType: Crop Cycle,Linked Land Unit,Linkitetty maayksikkö
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Valitse tositepäivä ennen osapuolta
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Valitse tositepäivä ennen osapuolta
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ylläpitosopimus ei ole voimassa
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Siirry Käyttäjiin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Huom: jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Huom: jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Virheellinen GSTIN tai Enter NA Rekisteröimätön
 DocType: Training Event,Seminar,seminaari
 DocType: Program Enrollment Fee,Program Enrollment Fee,Ohjelma Ilmoittautuminen Fee
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 DocType: Company,Create Chart Of Accounts Based On,Luo tilikartta perustuu
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Muuntaminen ei ole mahdollista ryhmälle. Lapsi tehtävät ovat olemassa.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Syntymäpäivä ei voi olla tämän päivän jälkeen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Syntymäpäivä ei voi olla tämän päivän jälkeen
 ,Stock Ageing,Varaston vanheneminen
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Opiskelija {0} on olemassa vastaan opiskelijahakijaksi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pyöristyskorjaus (yrityksen valuutta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tuntilomake
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,erä:
 DocType: Volunteer,Afternoon,Iltapäivällä
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Aseta avoimeksi
 DocType: Cheque Print Template,Scanned Cheque,Skannattu Shekki
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Lähetä sähköposti yhteyshenkilöille kun tapahtuma vahvistetaan.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Hanke {0} on jo olemassa
 DocType: Medical Department,Nursing User,Hoitotyöntekijä
 DocType: Plant Analysis,Plant Analysis Criterias,Kasvien analyysikriteerit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Vastuut
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Sarjanumero {0} ei kuulu erään {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Vastuut
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tämän noteerauksen voimassaoloaika on päättynyt.
 DocType: Expense Claim Account,Expense Claim Account,Matkakorvauslomakkeet Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Salli vanhentuneet kurssit
@@ -4136,11 +4163,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Tee muutokset
 DocType: Item,Default BOM,oletus BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Laskutettu kokonaissumma (myyntilaskut)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Veloitusilmoituksen Määrä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Veloitusilmoituksen Määrä
 DocType: Project Update,Not Updated,Ei päivitetty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Ristiriitojen välillä on ristiriita, osakkeiden lukumäärä ja laskettu määrä"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Kirjoita yrityksen nimi uudelleen vahvistukseksi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Journal Entry,Printing Settings,Tulostusasetukset
 DocType: Employee Advance,Advance Account,Ennakkomaksu
 DocType: Job Offer,Job Offer Terms,Työtarjouksen ehdot
@@ -4149,7 +4176,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Vakuutusyhtiö
 DocType: Asset Category Account,Fixed Asset Account,Kiinteä tasetilille
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Muuttuja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Muuttuja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,lähetteestä
 DocType: Chapter,Members,Jäsenet
 DocType: Student,Student Email Address,Student Sähköpostiosoite
@@ -4172,7 +4199,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,harjoitella
 DocType: Delivery Stop,Address Name,Osoite Nimi
 DocType: Stock Entry,From BOM,Osaluettelolta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Jakamalla {0} yksikköä {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Jakamalla {0} yksikköä {1}
 DocType: Assessment Code,Assessment Code,arviointi koodi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
@@ -4180,25 +4207,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
 DocType: Bank Reconciliation Detail,Payment Document,Maksu asiakirja
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Virhe arvosteluperusteiden kaavasta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
+DocType: Subscription,Plans,suunnitelmat
 DocType: Salary Slip,Salary Structure,Palkkarakenne
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Varasto-otto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Virhe aiheutui toistuvan luomisen aikana
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Varasto-otto
 DocType: Material Request Item,For Warehouse,Varastoon
 DocType: Employee,Offer Date,Työsopimusehdotuksen päivämäärä
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ei opiskelijaryhmille luotu.
 DocType: Purchase Invoice Item,Serial No,Sarjanumero
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Kuukauden lyhennyksen määrä ei voi olla suurempi kuin Lainamäärä
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Kuukauden lyhennyksen määrä ei voi olla suurempi kuin Lainamäärä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Syötä ylläpidon lisätiedot ensin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rivi # {0}: Odotettu toimituspäivä ei voi olla ennen ostotilauspäivää
 DocType: Purchase Invoice,Print Language,käytettävä tulosteiden kieli
 DocType: Salary Slip,Total Working Hours,Kokonaistyöaika
 DocType: Sales Invoice,Customer PO Details,Asiakas PO: n tiedot
-DocType: Subscription,Next Schedule Date,Seuraava aikataulu
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tilapäinen avaustili
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Anna-arvon on oltava positiivinen
@@ -4226,11 +4252,11 @@
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variaation '{0}' oletusyksikkö pitää olla sama kuin mallilla '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variaation '{0}' oletusyksikkö pitää olla sama kuin mallilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Laskenta perustuen
 DocType: Delivery Note Item,From Warehouse,Varastosta
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ei työntekijöitä mainituilla kriteereillä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
 DocType: Hotel Settings,Default Customer,Oletusasiakas
 DocType: Assessment Plan,Supervisor Name,ohjaaja Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Älä vahvista, onko tapaaminen luotu samalle päivälle"
@@ -4254,16 +4280,16 @@
 DocType: Journal Entry Account,Employee Advance,Työntekijän ennakko
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequency
 DocType: Lab Test Template,Sensitivity,Herkkyys
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Raaka-aine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Raaka-aine
 DocType: Leave Application,Follow via Email,Seuraa sähköpostitse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Laitteet ja koneisto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Laitteet ja koneisto
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Veron arvomäärä alennuksen jälkeen
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Päivittäinen työ Yhteenveto Asetukset
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Anna Reqd päivämäärän mukaan
 DocType: Payment Entry,Internal Transfer,sisäinen siirto
 DocType: Asset Maintenance,Maintenance Tasks,Huoltotoimet
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Valitse ensin tositepäivä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Valitse ensin tositepäivä
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
 DocType: Leave Control Panel,Carry Forward,siirrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa tilikirjaksi
@@ -4271,13 +4297,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext-integraatiot
 DocType: Crop Cycle,Detected Disease,Havaittu tauti
 ,Produced,Valmistettu
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Takaisinmaksun alkamispäivä ei voi olla ennen erääntymispäivää.
 DocType: Item,Item Code for Suppliers,Toimittajan nimikekoodi
 DocType: Issue,Raised By (Email),Pyynnön tekijä (sähköposti)
 DocType: Training Event,Trainer Name,Trainer Name
 DocType: Mode of Payment,General,pää
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Viimeisin yhteydenotto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Sarjanumero edelyttää sarjoitettua tuotetta {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Sarjanumero edelyttää sarjoitettua tuotetta {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Maksut Laskut
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
@@ -4291,7 +4318,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} puolen päivän lomalla {1}
 DocType: Production Plan,Get Material Request,Hae hankintapyyntö
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Postituskulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Postituskulut
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (summa)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 ,Item Variant Details,Tuote varianttien tiedot
@@ -4302,9 +4329,9 @@
 DocType: Drug Prescription,Hour,tunti
 DocType: Restaurant Order Entry,Last Sales Invoice,Viimeinen ostolasku
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Valitse Qty {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 DocType: Company,Monthly Sales Target,Kuukausittainen myyntiketju
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Hyväksynnän voi tehdä {0}
@@ -4312,7 +4339,7 @@
 DocType: Item,Default Material Request Type,Oletus hankintapyynnön tyyppi
 DocType: Supplier Scorecard,Evaluation Period,Arviointijakso
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Tuntematon
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Työjärjestystä ei luotu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Työjärjestystä ei luotu
 DocType: Shipping Rule,Shipping Rule Conditions,Toimitustavan ehdot
 DocType: Purchase Invoice,Export Type,Vientityyppi
 DocType: Salary Slip Loan,Salary Slip Loan,Palkkavelkakirjalaina
@@ -4328,7 +4355,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Avauslaskujen yhteenveto
 DocType: Education Settings,Education Manager,Koulutuspäällikkö
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Pienin pituus jokaisen kasvin välillä optimaalisen kasvun suhteen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Erä-nimikettä {0} ei voi päivittää varaston täsmäytyksellä, tee varastotapahtuma"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Erä-nimikettä {0} ei voi päivittää varaston täsmäytyksellä, tee varastotapahtuma"
 DocType: Quality Inspection,Report Date,raporttipäivä
 DocType: Student,Middle Name,Toinen nimi
 DocType: C-Form,Invoices,laskut
@@ -4359,20 +4386,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
 DocType: Serial No,AMC Expiry Date,Ylläpidon umpeutumispäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,kuitti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,kuitti
 ,Sales Register,Myyntirekisteri
 DocType: Daily Work Summary Group,Send Emails At,Lähetä sähköposteja
 DocType: Quotation,Quotation Lost Reason,"Tarjous hävitty, syy"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei muokattavaa.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Lomakenäkymä
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Kulujen hyväksyntä pakollisena kulukorvauksessa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",Lisää käyttäjiä muuhun organisaatioon kuin itse.
 DocType: Customer Group,Customer Group Name,Asiakasryhmän nimi
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Ei Asiakkaat vielä!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavirtalaskelma
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Materiaalihakua ei ole luotu
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisenssi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
@@ -4395,11 +4423,12 @@
 DocType: Vehicle,Chassis No,Alusta ei
 DocType: Payment Request,Initiated,Aloitettu
 DocType: Production Plan Item,Planned Start Date,Suunniteltu aloituspäivä
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Valitse BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Valitse BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Käytti ITC: n integroitua veroa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
+DocType: Bank Guarantee,Clauses and Conditions,Säännöt ja ehdot
 DocType: Serial No,Creation Document Type,Dokumenttityypin luonti
 DocType: Project Task,View Timesheet,Näytä aikakirja
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Loppupäivän on oltava alkamispäivä
 DocType: Leave Type,Is Encash,on perintä
 DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
@@ -4412,10 +4441,11 @@
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,kaupallinen
 DocType: Patient,Alcohol Current Use,Alkoholi nykyinen käyttö
 DocType: Student Admission Program,Student Admission Program,Opiskelijavalintaohjelma
-DocType: Payment Entry,Account Paid To,Tilin Palkallinen
+DocType: Payment Entry,Account Paid To,"Tili, jonne maksettu"
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Vaihtoehtoinen nimike
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Pääkohde {0} ei saa olla varasto tuote
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Ei voitu lähettää palkkapäivärahaa <br> \ Mahdollisia syitä: <br> \ 1. Nettopalkka on alle 0. <br> \ 2. Työntekijöiden päällikölle määritetty yrityksen sähköpostiosoite ei ole kelvollinen. <br>
@@ -4425,7 +4455,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} talousarvion tili {1} vastaan {2} {3} on {4}. Se ylitä {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ulkona yksikkömäärä
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ja unchcked Poissa käytöstä
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Talouspalvelu
 DocType: Student Sibling,Student ID,opiskelijanumero
@@ -4437,14 +4466,16 @@
 DocType: Complaint,Complaint,Valitus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Tee takaisinmaksu
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Kaikki osastot
 DocType: Patient,Alcohol Past Use,Alkoholin aiempi käyttö
 DocType: Fertilizer Content,Fertilizer Content,Lannoitteen sisältö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Ongelmalliset / Stuck
 DocType: Tax Rule,Billing State,Laskutus valtion
 DocType: Share Transfer,Transfer,siirto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Työjärjestys {0} on peruutettava ennen myyntitilauksen peruuttamista
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
@@ -4465,27 +4496,30 @@
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
 DocType: Stock Entry,Delivery Note No,lähetteen numero
-DocType: Cheque Print Template,Message to show,Viesti näyttää
+DocType: Cheque Print Template,Message to show,Näytettävä viesti
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Vähittäiskauppa
 DocType: Student Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Tuotepaketti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Tuotepaketti
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Pistettä ei löydy {0} alkaen. Sinun on oltava pysyviä pisteitä, jotka kattavat 0-100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Ostoverot ja maksupohjat
+DocType: Subscription,Current Invoice Start Date,Nykyinen lasku alkamispäivä
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Joko debit- tai credit- summa tarvitaan {2}
 DocType: GL Entry,Remarks,Huomautukset
 DocType: Hotel Room Amenity,Hotel Room Amenity,Hotellin huoneen mukavuudet
-DocType: Payment Entry,Account Paid From,Tilin maksettu
+DocType: Payment Entry,Account Paid From,"Tili, josta maksettu"
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-aineen tuotekoodi
 DocType: Task,Parent Task,Vanhempien tehtävä
 DocType: Journal Entry,Write Off Based On,Poisto perustuu
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Luo liidi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tulosta ja Paperi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Tulosta ja Paperi
 DocType: Stock Settings,Show Barcode Field,Näytä Viivakoodi-kenttä
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Lähetä toimittaja Sähköpostit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Palkka jo käsitellä välisenä aikana {0} ja {1}, Jätä hakuaika voi olla välillä tällä aikavälillä."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Palkka jo käsitellä välisenä aikana {0} ja {1}, Jätä hakuaika voi olla välillä tällä aikavälillä."
+DocType: Fiscal Year,Auto Created,Auto luotu
 DocType: Chapter Member,Leave Reason,Jätä syy
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Lasku {0} ei ole enää olemassa
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Volunteer,Availability,Saatavuus
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS laskujen oletusarvot
@@ -4493,14 +4527,13 @@
 DocType: Project,Time to send,Aika lähettää
 DocType: Timesheet,Employee Detail,työntekijän Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 -sähköpostitunnus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
 DocType: Lab Prescription,Test Code,Testikoodi
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Verkkosivun kotisivun asetukset
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},"Tarjouspyynnöt eivät ole sallittuja {0}, koska tuloskortin arvo on {1}"
 DocType: Job Offer,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Yläpuolella
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Kokonaismäärä {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Kokonaismäärä {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mainitse jos standardista maksetaan tilille
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Valitse arvioinnin muu ryhmä kuin &quot;Kaikki arviointi Ryhmien
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rivi {0}: Kustannuspaikka tarvitaan kohteen {1}
@@ -4511,7 +4544,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Veden analyysi
 DocType: Chapter,Region,Alue
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,Viikottain pois
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Lataa linkitetty analyysi
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","esim 2012, 2012-13"
@@ -4527,7 +4560,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kustannukset Scrapped Asset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kustannuspaikka on pakollinen nimikkeellä {2}
 DocType: Vehicle,Policy No,Policy Ei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Hae nimikkeet tuotepaketista
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Hae nimikkeet tuotepaketista
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Projektikäyttäjä
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Jakaa
@@ -4563,21 +4596,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,polku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
 DocType: Production Plan,Total Planned Qty,Suunniteltu kokonaismäärä
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Opening Arvo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Opening Arvo
 DocType: Salary Detail,Formula,Kaava
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Sarja #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Sarja #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Myynti tili
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Myynti tili
 DocType: Purchase Invoice Item,Total Weight,Kokonaispaino
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,provisio myynti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,provisio myynti
 DocType: Job Offer Term,Value / Description,Arvo / Kuvaus
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
 DocType: Tax Rule,Billing Country,Laskutusmaa
 DocType: Purchase Order Item,Expected Delivery Date,odotettu toimituspäivä
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ravintola Tilaus Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
 DocType: Asset Maintenance Task,Assign To Name,Määritä nimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Edustuskustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Edustuskustannukset
 DocType: Hub Settings,Enabled Users,Käytössä olevat käyttäjät
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Luo hankintapyyntö
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Open Kohta {0}
@@ -4590,24 +4623,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,poistumishakemukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 DocType: Vehicle,Last Carbon Check,Viimeksi Carbon Tarkista
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridiset kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Juridiset kustannukset
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Valitse määrä rivillä
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Tee myynti- ja ostolaskujen avaaminen
 DocType: Purchase Invoice,Posting Time,Tositeaika
 DocType: Timesheet,% Amount Billed,% laskutettu arvomäärä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Puhelinkulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Puhelinkulut
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"täppää mikäli haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta, täpästä ei synny oletusta"
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ei Kohta Serial Ei {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ei Kohta Serial Ei {0}
 DocType: Email Digest,Open Notifications,Avaa Ilmoitukset
 DocType: Payment Entry,Difference Amount (Company Currency),Ero Summa (Company valuutta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Suorat kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Suorat kustannukset
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,matkakulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lisää mukautettu kenttä-tilaus dokktityyppiin {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Purchase Receipt Item,Sample Quantity,Näytteen määrä
+DocType: Bank Guarantee,Name of Beneficiary,Edunsaajan nimi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Päivitys BOM maksaa automaattisesti Scheduler-ohjelman avulla, joka perustuu viimeisimpään arvostusnopeuteen / hinnastonopeuteen / raaka-aineiden viimeiseen ostohintaan."
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Tili {0}: emotili {1} ei kuulu yritykselle: {2}
@@ -4619,14 +4652,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Koeaika
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Palkanosat
 DocType: Program Enrollment Tool,New Academic Year,Uusi Lukuvuosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Tuotto / hyvityslasku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Tuotto / hyvityslasku
 DocType: Stock Settings,Auto insert Price List rate if missing,"Lisää automaattisesti hinnastoon, jos puuttuu"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,maksettu arvomäärä yhteensä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Maksettu yhteensä
 DocType: GST Settings,B2C Limit,B2C-raja
 DocType: Work Order Item,Transferred Qty,siirretty yksikkömäärä
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikkuminen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Suunnittelu
 DocType: Share Balance,Issued,liitetty
+DocType: Loan,Repayment Start Date,Takaisinmaksun alkamispäivä
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Student Activity
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,toimittaja tunnus
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Tietoja
@@ -4639,10 +4673,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Vapaatyypit, kuten vapaa-aika, sairastuminen, jne."
 DocType: Email Digest,Send regular summary reports via Email.,Lähetä yhteenvetoraportteja säännöllisesti sähköpostitse
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
 DocType: Assessment Result,Student Name,Opiskelijan nimi
 DocType: Brand,Item Manager,Nimikkeiden ylläpitäjä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll Maksettava
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll Maksettava
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 DocType: Plant Analysis,Collection Datetime,Kokoelma datetime
 DocType: Work Order,Total Operating Cost,käyttökustannukset yhteensä
@@ -4652,9 +4686,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Käyttäjä {0} ei ole olemassa
 DocType: Payment Term,Day(s) after invoice date,Päivä (t) laskun päivämäärän jälkeen
 DocType: Payment Schedule,Payment Schedule,Maksuaikataulu
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Lyhenne
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Maksu Entry jo olemassa
+DocType: Subscription,Trial Period End Date,Trial Period End Date
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,palkka mallipohja valvonta
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologia
@@ -4671,9 +4705,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"Aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,kaikki asiakasryhmät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kertyneet Kuukauden
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinta (yrityksen valuutassa)
@@ -4682,14 +4716,15 @@
 DocType: Lab Prescription,Test Created,Testi luotiin
 DocType: Healthcare Settings,Custom Signature in Print,Mukautettu allekirjoitus tulostuksessa
 DocType: Account,Temporary,Väliaikainen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Asiakas LPO nro
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Asiakas LPO nro
 DocType: Program,Courses,Kurssit
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosenttiosuus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sihteeri
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jos poistaa käytöstä, &quot;In Sanat&quot; kentässä ei näy missään kauppa"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Tämä toimenpide estää tulevan laskutuksen. Haluatko varmasti peruuttaa tämän tilauksen?
 DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriteerien nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Aseta Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Aseta Company
 DocType: Pricing Rule,Buying,Osto
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Taudit ja lannoitteet
 DocType: HR Settings,Employee Records to be created by,työntekijä tietue on tehtävä
@@ -4698,17 +4733,17 @@
 DocType: POS Profile,Apply Discount On,Levitä alennus
 DocType: Member,Membership Type,Jäsenyystyyppi
 ,Reqd By Date,Reqd Päivämäärä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,luotonantajat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,luotonantajat
 DocType: Assessment Plan,Assessment Name,arviointi Name
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Näytä PDC Printissa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Näytä PDC Printissa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, verotiedot"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Työtarjous
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute lyhenne
 ,Item-wise Price List Rate,Tuotekohtainen hinta hinnastossa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Toimituskykytiedustelu
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Määrä ({0}) ei voi olla osa rivillä {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Määrä ({0}) ei voi olla osa rivillä {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Viivakoodi {0} on jo käytössä tuotteella {1}
@@ -4726,7 +4761,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,vaihtelu yhteensä
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Mikäli käytössä, järjestelmä tekee varastokirjanpidon tilikirjaukset automaattisesti."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,välityspalkkio
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Läsnäolo työntekijöiden {0} on jo merkitty tätä päivää
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Läsnäolo työntekijöiden {0} on jo merkitty tätä päivää
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","""aikaloki"" päivitys minuuteissa"
 DocType: Customer,From Lead,Liidistä
@@ -4737,6 +4772,7 @@
 DocType: Lab Test,Approved Date,Hyväksytty päivämäärä
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
+DocType: Subscriber,Subscriber Name,Tilaajan nimi
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Update Tool,Replace,Vaihda
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ei löytynyt tuotteita.
@@ -4746,19 +4782,18 @@
 DocType: Request for Quotation Item,Project Name,Projektin nimi
 DocType: Customer,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
 DocType: Journal Entry Account,If Income or Expense,Mikäli tulot tai kustannukset
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Valitse korkotulotili työntekijälainaan {0}
 DocType: Work Order,Required Items,Tarvittavat kohteet
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,henkilöstöresurssi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksun täsmäytys toiseen maksuun
 DocType: Disease,Treatment Task,Hoitotyö
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,"Vero, vastaavat"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,"Vero, vastaavat"
 DocType: BOM Item,BOM No,BOM nro
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Update Tool,The BOM which will be replaced,Korvattava osaluettelo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Sähköinen Kalusto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Sähköinen Kalusto
 DocType: Asset,Maintenance Required,Huoltoa tarvitaan
 DocType: Account,Debit,debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Vapaat tulee kohdentaa luvun 0.5 kerrannaisina
@@ -4767,28 +4802,26 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,"odottaa, pankkipääte"
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,"Tuoteryhmä työkalu, aseta tavoitteet tälle myyjälle"
 DocType: Stock Settings,Freeze Stocks Older Than [Days],jäädytä yli [päivää] vanhat varastot
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rivi # {0}: Asset on pakollinen käyttöomaisuushankintoihin osto / myynti
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rivi # {0}: Asset on pakollinen käyttöomaisuushankintoihin osto / myynti
 DocType: Asset Maintenance Team,Maintenance Team Name,Huoltotiimin nimi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","yllämainituilla ehdoilla löytyy kaksi tai useampia hinnoittelusääntöjä ja prioriteettia tarvitaan, prioriteettinumero luku 0-20:n välillä, oletusarvona se on nolla (tyhjä), mitä korkeampi luku sitä suurempi prioriteetti"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jos yllämainituilla ehdoilla löytyy useita hinnoittelusääntöjä, tarvitaan priorisointia. Prioriteetti on luku 0-20:n välillä, oletusarvona se on nolla (tyhjä). Mitä korkeampi luku, sitä suurempi prioriteetti eli painoarvo."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Asiakas on pakollinen, jos Asiakas valitsee tilaisuuden"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tilikautta: {0} ei ole olemassa
 DocType: Currency Exchange,To Currency,Valuuttakursseihin
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,salli seuraavien käyttäjien hyväksyä poistumissovelluksen estopäivät
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Kulukorvauksen tyypit
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Myynnin hinnan kohteen {0} on pienempi kuin sen {1}. Myynnin määrä tulisi olla vähintään {2}
-DocType: Item,Taxes,Verot
+DocType: Subscription,Taxes,Verot
 DocType: Purchase Invoice,capital goods,tuotantohyödykkeet
 DocType: Purchase Invoice Item,Weight Per Unit,Paino per yksikkö
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Maksettu ja ei toimitettu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,"Maksettu, mutta ei toimitettu"
 DocType: Project,Default Cost Center,Oletus kustannuspaikka
-DocType: Bank Guarantee,End Date,päättymispäivä
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Varastotapahtumat
 DocType: Budget,Budget Accounts,talousarviokirjanpito
 DocType: Employee,Internal Work History,sisäinen työhistoria
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kertyneiden poistojen summa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Toimittajan tuloskortin muuttuja
-DocType: Employee Loan,Fully Disbursed,maksettu täysin
 DocType: Employee Advance,Due Advance Amount,Ennakkomaksu
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,Kustannus
@@ -4812,7 +4845,7 @@
 ,Employee Information,Työntekijöiden tiedot
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Tee toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Tee toimituskykytiedustelu
 DocType: Quality Inspection,Incoming,saapuva
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Myynnin ja ostoksen oletusmaksumalleja luodaan.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Arviointi Tulosrekisteri {0} on jo olemassa.
@@ -4820,7 +4853,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Aseta Yritysfiltteri tyhjäksi jos Ryhmittelyperuste on &#39;yritys&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Kirjoittamisen päivämäärä ei voi olla tulevaisuudessa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,toistuvan
 DocType: Stock Entry,Target Warehouse Address,Kohdevaraston osoite
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,tavallinen poistuminen
 DocType: Agriculture Task,End Day,Lopeta päivä
@@ -4845,11 +4877,10 @@
 DocType: Material Request,% Ordered,% järjestetty
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurssille pohjainen opiskelija Groupin Kurssi validoitu jokaiselle oppilaalle päässä kirjoilla Kurssit Program Ilmoittautuminen.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Urakkatyö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Oston keskihinta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Oston keskihinta
 DocType: Share Balance,From No,Nro
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Uusi viesti {lähettäjältä}
 DocType: Customer,Customer Primary Address,Asiakas ensisijainen osoite
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Uutiskirjeet
 DocType: Drug Prescription,Description/Strength,Kuvaus / vahvuus
@@ -4858,22 +4889,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Sama viesti on tullut useita kertoja
 DocType: Department,Leave Block List,Estoluettelo
 DocType: Purchase Invoice,Tax ID,Tax ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"tuotteella {0} ei ole määritettyä sarjanumeroa, sarake on tyhjä"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,"tuotteella {0} ei ole määritettyä sarjanumeroa, sarake on tyhjä"
 DocType: Accounts Settings,Accounts Settings,tilien asetukset
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Hyväksyä
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Virheellinen muoto {0}, korjaa se jatkaaksesi."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Virheellinen muoto {0}, korjaa se jatkaaksesi."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Uuden tilin numero, se sisällytetään tilin nimen etuliitteenä"
 DocType: Maintenance Team Member,Team Member,Tiimin jäsen
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Ei tulosta
 DocType: Customer,Sales Partner and Commission,Myynti Partner ja komission
-DocType: Employee Loan,Rate of Interest (%) / Year,Korkokanta (%) / vuosi
+DocType: Loan,Rate of Interest (%) / Year,Korkokanta (%) / vuosi
 ,Project Quantity,Project Määrä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;"
 DocType: Opportunity,To Discuss,Keskusteluun
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} tapahtuman suorittamiseen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Korkokanta (%) Vuotuinen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Väliaikaiset tilit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,musta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Väliaikaiset tilit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM-tuotesisältö
 DocType: Shareholder,Contact List,Yhteystietoluettelo
 DocType: Account,Auditor,Tilintarkastaja
@@ -4881,16 +4912,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} nimikettä valmistettu
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Lisätietoja
 DocType: Cheque Print Template,Distance from top edge,Etäisyys yläreunasta
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Hinnasto {0} on poistettu käytöstä tai sitä ei ole
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Hinnasto {0} on poistettu käytöstä tai sitä ei ole
 DocType: Purchase Invoice,Return,paluu
 DocType: Pricing Rule,Disable,poista käytöstä
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Tila maksu on suoritettava maksu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Tila maksu on suoritettava maksu
 DocType: Project Task,Pending Review,Odottaa näkymä
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Muokkaa koko sivulta lisää vaihtoehtoja, kuten varat, sarjanumerot, erät jne."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Nimitykset ja neuvottelut
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ei ilmoittautunut Erä {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei voida romuttaa, koska se on jo {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Tarkastukset ovat pakollisia
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Tarkastukset ovat pakollisia
 DocType: Task,Total Expense Claim (via Expense Claim),Kulukorvaus yhteensä (kulukorvauksesta)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Yrityksen perustamiseen epäonnistui
@@ -4902,7 +4933,7 @@
 DocType: Homepage,Tag Line,Tagirivi
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Kaluston hallinta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Lisää kohteita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Lisää kohteita
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Kasvit ja maisemat
 DocType: Cheque Print Template,Regular,säännöllinen
 DocType: Fertilizer,Density (if liquid),Tiheys (jos nestemäinen)
@@ -4923,28 +4954,30 @@
 DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,"Tarkista, onko Asset vaatii ehkäisevää ylläpitoa tai kalibrointia"
 apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,Yrityksen lyhennelmä voi olla enintään 5 merkkiä
 DocType: Employee,Reports to,raportoi
-,Unpaid Expense Claim,Palkaton Matkakorvauslomakkeet
-DocType: Payment Entry,Paid Amount,Maksettu arvomäärä
+,Unpaid Expense Claim,Maksamattomat kulukorvaukset
+DocType: Payment Entry,Paid Amount,Maksettu summa
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Tutustu myyntitykliin
 DocType: Assessment Plan,Supervisor,Valvoja
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,Pakattavien nimikkeiden saatavuus
 DocType: Item Variant,Item Variant,tuotemalli
 ,Work Order Stock Report,Työjärjestyksen raportti
+DocType: Purchase Receipt,Auto Repeat Detail,Automaattisen toiston yksityiskohdat
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tulos Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Ohjaajana
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Ehdota luokkaa
 DocType: BOM Scrap Item,BOM Scrap Item,BOM romu Kohta
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Vahvistettuja tilauksia ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Määrähallinta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Määrähallinta
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 DocType: Project,Total Billable Amount (via Timesheets),Laskutettava summa yhteensä (kautta aikajaksoja)
 DocType: Agriculture Task,Previous Business Day,Edellinen työpäivä
-DocType: Employee Loan,Repay Fixed Amount per Period,Repay kiinteä määrä Period
+DocType: Loan,Repay Fixed Amount per Period,Repay kiinteä määrä Period
 DocType: Employee,Health Insurance No,Sairausvakuutus nro
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä tuotteelle {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Hyvityslaskun Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Hyvityslaskun Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Verotettava kokonaismäärä
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
 DocType: Opening Invoice Creation Tool,Purchase,Osto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,taseyksikkömäärä
@@ -4955,15 +4988,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} on {1}
 DocType: Healthcare Settings,Valid number of days,Voimassa oleva päivien määrä
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,kustannuspaikat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Käynnistä tilaus uudelleen
 DocType: Land Unit,Linked Plant Analysis,Linkitetty kasvien analyysi
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"taso, jolla toimittajan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rivi # {0}: ajoitukset ristiriidassa rivin {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Salli nollahinta
+DocType: Bank Guarantee,Receiving,vastaanottaminen
 DocType: Training Event Employee,Invited,Kutsuttu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Useita aktiivisia Palkka Structures löytynyt työntekijä {0} varten kyseisenä päivänä
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway tilejä.
 DocType: Employee,Employment Type,Työsopimustyypit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Kiinteät varat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Kiinteät varat
 DocType: Payment Entry,Set Exchange Gain / Loss,Aseta Exchange voitto / tappio
 ,GST Purchase Register,GST Osto Register
 ,Cash Flow,Kassavirta
@@ -4983,9 +5018,10 @@
 DocType: Academic Term,Term Start Date,Term aloituspäivä
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Luettelo kaikista osakekaupoista
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Ohessa {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Molempien kokeilujaksojen alkamispäivä ja koeajan päättymispäivä on asetettava
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Keskimääräinen hinta
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksun kokonaissumman summan on vastattava suurta / pyöristettyä summaa
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksun kokonaissumman summan on vastattava suurta / pyöristettyä summaa
+DocType: Subscription Plan Detail,Plan,Suunnitelma
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
 DocType: Job Applicant,Applicant Name,hakijan nimi
 DocType: Authorization Rule,Customer / Item Name,Asiakas / Nimikkeen nimi
@@ -5021,6 +5057,7 @@
 DocType: Work Order,Warehouses,Varastot
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} hyödykkeen ei voida siirtää
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotellin huonehinta
+DocType: Subscription,Days Until Due,Days Until Due
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Tämä kohta on muunnelma {0} (malli).
 DocType: Workstation,per hour,Tunnissa
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Ostot
@@ -5029,13 +5066,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Sillä eräpohjaisia opiskelijat sekä opiskelijakunta Erä validoidaan jokaiselle oppilaalle Ohjelmasta Ilmoittautuminen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, koska varastokirjanpidossa on siihen liittyviä kirjauksia."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,toimitus
+DocType: Journal Entry Account,Loan,Lainata
 DocType: Expense Claim Advance,Expense Claim Advance,Kulujen ennakkovaatimus
 DocType: Lab Test,Report Preference,Ilmoita suosikeista
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Vapaaehtoiset tiedot.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektihallinta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektihallinta
 ,Quoted Item Comparison,Noteeratut Kohta Vertailu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Päällekkäisyys pisteiden välillä {0} ja {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Substanssi kuin
 DocType: Crop,Produce,Tuottaa
@@ -5045,7 +5083,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Valmistusmateriaalien kulutus
 DocType: Item Alternative,Alternative Item Code,Vaihtoehtoinen koodi
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Valitse tuotteet Valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Valitse tuotteet Valmistus
 DocType: Delivery Stop,Delivery Stop,Toimitus pysähtyy
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
 DocType: Item,Material Issue,materiaali aihe
@@ -5055,15 +5093,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Saippua & pesuaine
 DocType: BOM,Show Items,Näytä kohteet
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,From Time ei voi olla suurempi kuin ajoin.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Haluatko ilmoittaa kaikille asiakkaille sähköpostilla?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Haluatko ilmoittaa kaikille asiakkaille sähköpostilla?
+DocType: Subscription Plan,Billing Interval,Laskutusväli
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Jatkaa
 DocType: Hub Settings,Hub Username,Hub-käyttäjätunnus
 DocType: Salary Detail,Component,komponentti
 DocType: Assessment Criteria,Assessment Criteria Group,Arviointikriteerit Group
 DocType: Healthcare Settings,Patient Name By,Potilaan nimi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Tuloslaskelulomake palkkoihin {0} - {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Tuloslaskelulomake palkkoihin {0} - {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
 DocType: Warehouse,Warehouse Name,Varaston nimi
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
@@ -5077,22 +5115,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
 DocType: Leave Block List,Applies to Company,koskee yritystä
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Ei voi perua. Vahvistettu varastotapahtuma {0} on olemassa.
-DocType: Employee Loan,Disbursement Date,maksupäivä
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Vastaanottajat&#39; ei ole määritelty
+DocType: Loan,Disbursement Date,maksupäivä
 DocType: BOM Update Tool,Update latest price in all BOMs,Päivitä viimeisin hinta kaikkiin ostomakeihin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Sairauskertomus
 DocType: Vehicle,Vehicle,ajoneuvo
 DocType: Purchase Invoice,In Words,sanat
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Anna pankin tai lainanottajan nimi ennen lähettämistä.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} on toimitettava
 DocType: POS Profile,Item Groups,Kohta Ryhmät
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Tänään on {0}:n syntymäpäivä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Tänään on {0}:n syntymäpäivä
 DocType: Sales Order Item,For Production,tuotantoon
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Lisää tilapäinen tilitietojen tilapäinen avaaminen
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Lisää tilapäinen tilitietojen tilapäinen avaaminen
 DocType: Customer,Customer Primary Contact,Asiakaslähtöinen yhteyshenkilö
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Aikakauslehti
 DocType: Project Task,View Task,Näytä tehtävä
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lyijy%
+DocType: Bank Guarantee,Bank Guarantee Type,Pankkitakaustapa
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Laskuosuus
 ,Asset Depreciations and Balances,Asset Poistot ja taseet
@@ -5103,9 +5142,8 @@
 DocType: Production Plan,Include Subcontracted Items,Sisällytä alihankintana tehtävät kohteet
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Liittyä seuraan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Vajaa määrä
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Vaihtoehtoisia ominaisuuksia ei voi vaihtaa varastotoimituksen jälkeen. Sinun täytyy tehdä uusi esine tehdä tämä.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
-DocType: Employee Loan,Repay from Salary,Maksaa maasta Palkka
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+DocType: Loan,Repay from Salary,Maksaa maasta Palkka
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
 DocType: Salary Slip,Salary Slip,Palkkalaskelma
@@ -5129,11 +5167,11 @@
 DocType: Employee Education,Employee Education,työntekijä koulutus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Monista kohde ryhmä löysi erään ryhmätaulukkoon
 DocType: Land Unit,Parent Land Unit,Vanhempainmaan yksikkö
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Fertilizer,Fertilizer Name,Lannoitteen nimi
 DocType: Salary Slip,Net Pay,Nettomaksu
 DocType: Cash Flow Mapping Accounts,Account,tili
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Sarjanumero {0} on jo saapunut
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Sarjanumero {0} on jo saapunut
 ,Requested Items To Be Transferred,siirrettävät pyydetyt tuotteet
 DocType: Expense Claim,Vehicle Log,ajoneuvo Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Kuumeen esiintyminen (lämpötila&gt; 38,5 ° C / 101,3 ° F tai jatkuva lämpötila&gt; 38 ° C / 100,4 ° F)"
@@ -5174,24 +5212,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
 DocType: Asset Maintenance,Manufacturing User,Valmistus peruskäyttäjä
 DocType: Purchase Invoice,Raw Materials Supplied,Raaka-aineet toimitettu
-DocType: C-Form,Series,Numerosarja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Hinnaston valuutan {0} on oltava {1} tai {2}
 DocType: Appraisal,Appraisal Template,Arvioinnin mallipohjat
 DocType: Soil Texture,Ternary Plot,Ternäärinen tontti
 DocType: Item Group,Item Classification,tuote luokittelu
 DocType: Driver,License Number,Rekisteri numero
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Liiketoiminnan kehityspäällikkö
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Liiketoiminnan kehityspäällikkö
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Huoltokäynnin tarkoitus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Laskun potilaan rekisteröinti
 DocType: Crop,Period,Aikajakso
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Päätilikirja
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Työntekijän {0} virkavapaalla {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Työntekijän {0} virkavapaalla {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Näytä vihjeet
 DocType: Program Enrollment Tool,New Program,uusi ohjelma
 DocType: Item Attribute Value,Attribute Value,"tuntomerkki, arvo"
 ,Itemwise Recommended Reorder Level,Tuotekohtainen suositeltu täydennystilaustaso
 DocType: Salary Detail,Salary Detail,Palkka Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 DocType: Appointment Type,Physician,Lääkäri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Erä {0} tuotteesta {1} on vanhentunut.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,kuulemiset
@@ -5199,15 +5236,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ei voi olla suurempi kuin suunniteltu määrä ({2}) Työjärjestyksessä {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Valmistuksen tuntilista
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Välisumma
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Vaihtoehtoisia ominaisuuksia ei voi muuttaa varastotoiminnan jälkeen. Sinun täytyy tehdä uusi esine tehdä tämä.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA-toimeksianto
 DocType: Physician,Charges,maksut
 DocType: Production Plan,Get Items For Work Order,Hae kohteet työjärjestykseen
 DocType: Salary Detail,Default Amount,oletus arvomäärä
 DocType: Lab Test Template,Descriptive,kuvaileva
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Varastoa ei löydy järjestelmästä
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Varastoa ei löydy järjestelmästä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tämän kuun yhteenveto
 DocType: Quality Inspection Reading,Quality Inspection Reading,Laarutarkistuksen luku
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Aseta myyntitavoite, jonka haluat saavuttaa yrityksellesi."
 ,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
@@ -5235,11 +5273,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Sivuston luominen epäonnistui
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mittayksikön muunnon lisätiedot
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Jäljellä oleva säilytysvarastokirjaus tai näytemäärää ei ole toimitettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Jäljellä oleva säilytysvarastokirjaus tai näytemäärää ei ole toimitettu
 DocType: Program,Program Abbreviation,Ohjelma lyhenne
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Warranty Claim,Resolved By,Ratkaisija
-DocType: Bank Guarantee,Start Date,aloituspäivä
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,kohdistaa poistumisen kaudelle
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sekkejä ja Talletukset virheellisesti selvitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
@@ -5254,11 +5291,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,tuntia
 DocType: Project,Expected Start Date,odotettu aloituspäivä
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korjaus laskussa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,"Työjärjestys on luotu kaikille kohteille, joissa on BOM"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,"Työjärjestys on luotu kaikille kohteille, joissa on BOM"
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Vaihtotiedotiedot Raportti
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress -toiminto
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Ostohinta
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Ostohinta
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Peruuta tilaus
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Valitse Huolto-tila Valmis tai poista Valmistumispäivä
 DocType: Supplier,Default Payment Terms Template,Oletusmaksutavaramalli
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Maksuvälineenä on oltava sama kuin Payment Gateway valuutta
@@ -5269,7 +5307,6 @@
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,Käyttökustannukset
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Toiminta jos kuukausikulutus budjetti ylitetty
-DocType: Subscription,Submit on creation,Vahvista luonnin yhteydessä
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuutta {0} on {1}
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Sähköpostit lähetetään kaikille aktiivinen Yrityksen työntekijät on tietyn tunnin, jos heillä ei ole loma. Yhteenveto vastauksista lähetetään keskiyöllä."
@@ -5287,6 +5324,7 @@
 DocType: Batch,Parent Batch,Parent Erä
 DocType: Cheque Print Template,Cheque Print Template,Shekki Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kustannuspaikkakaavio
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Laskun päivämäärän jälkeisten päivien määrä on kulunut umpeen ennen tilauksen tai merkitsemisen tilauksen peruuttamista
 DocType: Lab Test Template,Sample Collection,Näytteenottokokoelma
 ,Requested Items To Be Ordered,Tilauksessa olevat nimiketarpeet
 DocType: Price List,Price List Name,Hinnaston nimi
@@ -5295,7 +5333,7 @@
 DocType: Account,Income,tulo
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Jokin meni pieleen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Varoitus: Hakemus vapaasta sisältää päiviä joita ei ole sallittu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Varoitus: Hakemus vapaasta sisältää päiviä joita ei ole sallittu
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Myyntilasku {0} on jo vahvistettu
 DocType: Supplier Scorecard Scoring Criteria,Score,Pisteet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Verovuoden {0} ei ole olemassa
@@ -5309,19 +5347,19 @@
 apps/erpnext/erpnext/config/hr.py +238,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 DocType: Shipping Rule,Shipping Rule Type,Lähetyssäännötyyppi
 apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,Siirry huoneisiin
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ole hyvä ja kirjoita viesti ennen lähettämistä.
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,DUPLICATE TOIMITTAJILLE
 DocType: Email Digest,Pending Quotations,Odottaa Lainaukset
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} pitäisi olla arvo välillä 0 ja 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Seuraava poistoaika ei voi olla ennen Käytettävissä olevaa päivämäärää
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Vakuudettomat lainat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Tuntilomakkeella hyväksyttyjen työtuntien enimmäismäärä
 DocType: Maintenance Schedule Detail,Scheduled Date,"Aikataulutettu, päivä"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,maksettu yhteensä
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Viestit yli 160 merkkiä jaetaan useita viestejä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Maksettu yhteensä
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Yli 160 merkkiä pitkät viestit jaetaan useaksi viestiksi.
 DocType: Purchase Receipt Item,Received and Accepted,Saanut ja hyväksynyt
 DocType: Hub Settings,Company and Seller Profile,Yritys- ja Myyjäprofiili
 ,GST Itemised Sales Register,GST Eritelty Sales Register
@@ -5334,10 +5372,9 @@
 DocType: Item,Variant Based On,Variant perustuvat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Nimetyn painoarvon tulee yhteensä olla 100%. Nyt se on {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,omat toimittajat
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Korjaa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,anonyymi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Saadut
 DocType: Lead,Converted,muunnettu
@@ -5351,6 +5388,7 @@
 DocType: Asset,Assets,varat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
+DocType: Subscription,Current Invoice End Date,Nykyinen lasku päättyy
 DocType: Payment Term,Due Date Based On,Eräpäivä perustuu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Aseta oletusryhmä ja alue Myynnin asetuksiin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ei ole olemassa
@@ -5358,7 +5396,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Journal entries ei ole palautettu takaisin
 DocType: Payment Reconciliation,From Invoice Date,Alkaen Laskun päiväys
+DocType: Loan,Disbursed,maksettu
 DocType: Healthcare Settings,Laboratory Settings,Laboratorioasetukset
 DocType: Patient Appointment,Service Unit,Huoltoyksikkö
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Toimittaja onnistui
@@ -5371,12 +5411,12 @@
 DocType: Share Balance,No of Shares,Osuuksien määrä
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Valitse Tila
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"Hinnoittelusääntö, ohjeet"
 DocType: School House,House Name,Talon nimi
 DocType: Fee Schedule,Total Amount per Student,Opiskelijan kokonaismäärä
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,sähköinen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,sähköinen
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisää loput organisaatiosi käyttäjille. Voit myös lisätä kutsua Asiakkaat portaaliin lisäämällä ne Yhteydet
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
 DocType: Grant Application,Requested Amount,Pyydetty määrä
@@ -5386,7 +5426,7 @@
 DocType: Crop Cycle,Detected Diseases,Havaitut taudit
 DocType: Stock Entry,Default Source Warehouse,Varastosta (oletus)
 DocType: Item,Customer Code,Asiakkaan yrityskoodi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 DocType: Asset Maintenance Task,Last Completion Date,Viimeinen päättymispäivä
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
@@ -5394,9 +5434,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"Varasto, vastaavat"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,"Varasto, vastaavat"
 DocType: Restaurant,Active Menu,Aktiivinen valikko
 DocType: Target Detail,Target Qty,Tavoite yksikkömäärä
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Lainaan: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Kassalle Asetukset
 DocType: Student Attendance,Present,Nykyinen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Lähete {0} ei saa olla vahvistettu
@@ -5405,9 +5446,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Vehicle Log,Odometer,Matkamittari
 DocType: Production Plan Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Nimike {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Nimike {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
 DocType: Chapter,Chapter Head,Luvun pää
 DocType: Payment Term,Month(s) after the end of the invoice month,Kuukausi (t) laskutuskuukauden päättymisen jälkeen
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Tehtävä
@@ -5415,11 +5456,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tuota palkkalaskelmat
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab-tuloksen datetime ei voi olla ennen datetime -testausta
 DocType: POS Profile,Allow user to edit Discount,Salli käyttäjän muokata alennusta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Hanki asiakkaita
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Hanki asiakkaita
 DocType: Purchase Invoice Item,Include Exploded Items,Sisällytä räjähtämättömiä kohteita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
 DocType: Shipping Rule,Restrict to Countries,Rajoita maihin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
 DocType: Sales Invoice Timesheet,Billing Hours,Laskutus tuntia
 DocType: Project,Total Sales Amount (via Sales Order),Myyntimäärän kokonaismäärä (myyntitilauksen mukaan)
@@ -5436,6 +5478,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Arviointipäällikkö
 DocType: Payment Entry,Allocate Payment Amount,Varaa maksusumma
+DocType: Subscription Plan,Subscription Plan,Tilausohjelma
 DocType: Employee External Work History,Salary,Palkka
 DocType: Serial No,Delivery Document Type,Toimitus Dokumenttityyppi
 DocType: Sales Order,Partly Delivered,Osittain toimitettu
@@ -5460,9 +5503,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,vanhentumisen skaala 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Esiasetusten asennus
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Ei toimitustiedostoa valittu asiakkaalle {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Ei toimitustiedostoa valittu asiakkaalle {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM korvattu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Valitse kohteet toimituspäivän perusteella
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Valitse kohteet toimituspäivän perusteella
 DocType: Grant Application,Has any past Grant Record,Onko jokin mennyt Grant Record
 ,Sales Analytics,Myyntianalytiikka
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Käytettävissä {0}
@@ -5480,7 +5523,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,Myyntimoduulin asetukset
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellihuoneen varaaminen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Asiakaspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Asiakaspalvelu
 DocType: BOM,Thumbnail,Pikkukuva
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tarjoa ehdokkaalle töitä.
@@ -5496,7 +5539,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Opiskelijat on ilmoittautunut
 DocType: Fees,Student Details,Opiskelijan tiedot
 DocType: Purchase Invoice Item,Stock Qty,Stock kpl
-DocType: Employee Loan,Repayment Period in Months,Takaisinmaksuaika kuukausina
+DocType: Loan,Repayment Period in Months,Takaisinmaksuaika kuukausina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 DocType: Naming Series,Update Series Number,Päivitä sarjanumerot
 DocType: Account,Equity,oma pääoma
@@ -5505,7 +5548,7 @@
 DocType: Task,Closing Date,sulkupäivä
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
 DocType: Timesheet,Work Detail,Työn yksityiskohdat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,insinööri
 DocType: Journal Entry,Total Amount Currency,Yhteensä Määrä Valuutta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
@@ -5550,13 +5593,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Luovutustyypin tiedot.
 DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Virhe kaavassa tai tila: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,laskutettu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,laskutettu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteerien painojen on oltava jopa 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,osallistuminen
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,varastosta löytyvät
 DocType: BOM,Materials,Materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source ja Target Varasto voi olla sama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Ostotapahtumien veromallipohja.
@@ -5578,16 +5620,16 @@
 DocType: Restaurant Reservation,Waitlisted,Jonossa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Currency can not be changed after making entries using some other currency,Valuuttaa ei voi muuttaa sen jälkeen kun kirjauksia on jo tehty jossain toisessa valuutassa.
 DocType: Shipping Rule,Fixed,kiinteä
-DocType: Vehicle Service,Clutch Plate,kytkin Plate
+DocType: Vehicle Service,Clutch Plate,Kytkinlevy
 DocType: Company,Round Off Account,pyöristys tili
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Hallinnolliset kustannukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Hallinnolliset kustannukset
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,konsultointi
 DocType: Customer Group,Parent Customer Group,Pääasiakasryhmä
-DocType: Journal Entry,Subscription,tilaus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,tilaus
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Maksun luominen vireillä
 DocType: Appraisal Goal,Score Earned,Ansaitut pisteet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Irtisanomisaika
 DocType: Asset Category,Asset Category Name,Asset Luokan nimi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Tämä on kanta-alue eikä sitä voi muokata
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person Name
@@ -5600,7 +5642,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Jätä valitsematta jos et halua pohtia erän samalla tietenkin toimiviin ryhmiin.
 DocType: Asset,Frequency of Depreciation (Months),Taajuus Poistot (kuukautta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Luottotili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"Kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
@@ -5608,7 +5650,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,Myyntitilauksen kohdistus / nimike
 DocType: Hub Settings,Company Logo,Yrityksen logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 DocType: Healthcare Settings,Patient Registration,Potilaan rekisteröinti
@@ -5642,11 +5684,10 @@
 DocType: Journal Entry,Total Debit,Debet yhteensä
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Valmiiden tavaroiden oletusvarasto
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Valitse potilas
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Myyjä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Myyjä
 DocType: Hotel Room Package,Amenities,palveluihin
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Talousarvio ja kustannuspaikka
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Useita oletusmaksutapoja ei sallita
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,varten
 ,Appointment Analytics,Nimitys Analytics
 DocType: Vehicle Service,Half Yearly,6 kk
 DocType: Lead,Blog Subscriber,Blogin tilaaja
@@ -5662,6 +5703,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Jätä tyhjäksi jos teet opiskelijoiden ryhmää vuodessa
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Nykyisen avaimen käyttämät sovellukset eivät voi käyttää, oletko varma?"
+DocType: Subscription Settings,Prorate,ositussopimuksen
 DocType: Purchase Invoice,Total Advance,"Yhteensä, ennakko"
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Muuta mallikoodia
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term Päättymispäivä ei voi olla aikaisempi kuin Term aloituspäivä. Korjaa päivämäärät ja yritä uudelleen.
@@ -5672,8 +5714,9 @@
 DocType: Opportunity Item,Basic Rate,perushinta
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,Allekirjoittaja Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Aseta kadonneeksi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Aseta kadonneeksi
 DocType: Timesheet,Total Billable Hours,Yhteensä laskutettavat tunnit
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Kuukausien määrä, jolloin tilaajan on maksettava tilauksen luomat laskut"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksukuitin Huomautus
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tämä perustuu asiakasta koskeviin tapahtumiin. Katso lisätietoja ao. aikajanalta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rivi {0}: Myönnetyn {1} on oltava pienempi tai yhtä suuri kuin Payment Entry määrään {2}
@@ -5692,12 +5735,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,käytä viimeisimmän edellisen oston hintoja
 DocType: Company,Company Info,yrityksen tiedot
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Valitse tai lisätä uuden asiakkaan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tämä perustuu työntekijän läsnäoloihin
 DocType: Assessment Result,Summary,Yhteenveto
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Merkitse osallistuminen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Luottotililtä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Luottotililtä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ravintola Tilaus Entry Item
@@ -5709,7 +5752,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Osto Määrä
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,työntekijä etuudet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Work Order,Manufactured Qty,valmistettu yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Osuuksia ei ole {0}
@@ -5717,12 +5760,12 @@
 DocType: Asset,Out of Order,Epäkunnossa
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ohita työaseman ajan päällekkäisyys
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Valitse eränumerot
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Kulukorvauksen {1} rivillä {0}: määrä ei voi olla suurempi kuin jäljellä oleva määrä ({2}).
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Kulukorvauksen {1} rivillä {0}: määrä ei voi olla suurempi kuin jäljellä oleva määrä ({2}).
 DocType: Patient Service Unit,Medical Administrator,Lääketieteellinen päällikkö
 DocType: Assessment Plan,Schedule,Aikataulu
 DocType: Account,Parent Account,Päätili
@@ -5752,15 +5795,16 @@
 DocType: Asset Repair,Repair Status,Korjaustila
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Valitse työntekijä tietue ensin
 DocType: POS Profile,Account for Change Amount,Vaihtotilin summa
 DocType: Purchase Invoice,input service,syöttöpalvelu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Huoltoryhmän jäsen
 DocType: Agriculture Analysis Criteria,Soil Analysis,Maaperän analyysi
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kurssikoodi:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Syötä kustannustili
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Syötä kustannustili
 DocType: Account,Stock,Varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,Oston/valmistuksen lisätiedot
@@ -5808,19 +5852,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Teatterikatsojamääriin {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Muuttujan nimi
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Nimike {0} on mallipohja, valitse yksi sen variaatioista"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Nimike {0} on mallipohja, valitse yksi sen variaatioista"
 DocType: Asset,Asset Category,Asset Luokka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettomaksu ei voi olla negatiivinen
 DocType: Purchase Order,Advance Paid,Ennakkoon maksettu
 DocType: Item,Item Tax,Tuotteen vero
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiaali toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiaali toimittajalle
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Materiaalin pyynnön suunnittelu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Valmistevero Lasku
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Kynnys {0}% esiintyy useammin kuin kerran
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostiosoite
 DocType: Employee Attendance Tool,Marked Attendance,Merkitty Läsnäolo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,lyhytaikaiset vastattavat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,lyhytaikaiset vastattavat
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Ajastin ylitti annettujen tuntien määrä.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Lähetä massatekstiviesti yhteystiedoillesi
 DocType: Patient,A Positive,Positiivinen
@@ -5831,9 +5875,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajan tuloskortin seisominen, ja tämän toimittajan antamat ostotilaukset tulisi antaa varoen."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Omaisuudenhoitoyhtiö
-DocType: Employee Loan,Loan Type,laina Tyyppi
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} on lähetetty onnistuneesti
+DocType: Loan,Loan Type,laina Tyyppi
 DocType: Scheduling Tool,Scheduling Tool,Ajoitustyökalun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
 DocType: Sales Invoice Item,Drop Ship,Suoratoimitus
@@ -5865,7 +5910,7 @@
 DocType: Item,Units of Measure,Mittayksiköt
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Invoice,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,osakepääoma
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,osakepääoma
 DocType: Shopping Cart Settings,Show Public Attachments,Näytä Julkiset Liitteet
 DocType: Packing Slip,Package Weight Details,"Pakkauspaino, lisätiedot"
 DocType: Restaurant Reservation,Reservation Time,Varausaika
@@ -5880,7 +5925,7 @@
 DocType: Purchase Order,To Receive and Bill,Saavuta ja laskuta
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rivi # {0}: Reqd by Date ei voi olla ennen tapahtumapäivää
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Esittelyssä olevat tuotteet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,suunnittelija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kustannuspaikka tarvitsee rivin {0} verokannan {1}
@@ -5890,20 +5935,20 @@
 DocType: Driver,Expiry Date,vanhenemis päivä
 DocType: Healthcare Settings,Employee name and designation in print,Työntekijän nimi ja nimike painettuna
 ,accounts-browser,tilit-selain
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Ole hyvä ja valitse Luokka ensin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +13,Project master.,projekti valvonta
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Sallia yli-laskutus tai over-tilaus, päivitä &quot;avustus&quot; varastossa Settings tai Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(1/2 päivä)
 DocType: Payment Term,Credit Days,kredit päivää
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Valitse Potilas saadaksesi Lab Testit
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tee Student Erä
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Hae nimikkeet osaluettelolta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Hae nimikkeet osaluettelolta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,"virtausaika, päivää"
 DocType: Cash Flow Mapping,Is Income Tax Expense,Onko tuloveroa
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rivi # {0}: julkaisupäivä on oltava sama kuin ostopäivästä {1} asset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rivi # {0}: julkaisupäivä on oltava sama kuin ostopäivästä {1} asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Valitse tämä jos opiskelija oleskelee instituutin Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
 ,Stock Summary,Stock Yhteenveto
@@ -5914,10 +5959,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Viite Päivämäärä
 DocType: Employee,Reason for Leaving,Poistumisen syy
 DocType: BOM Operation,Operating Cost(Company Currency),Käyttökustannukset (Company valuutta)
-DocType: Employee Loan Application,Rate of Interest,Kiinnostuksen taso
+DocType: Loan Application,Rate of Interest,Kiinnostuksen taso
 DocType: Expense Claim Detail,Sanctioned Amount,Hyväksyttävä määrä
 DocType: Item,Shelf Life In Days,Säilyvyys päivinä
 DocType: GL Entry,Is Opening,on avaus
+DocType: Department,Expense Approvers,Kulujen hyväksyjät
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
 DocType: Journal Entry,Subscription Section,Tilausjakso
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,tiliä {0} ei löydy
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 54299fb..f4320ad 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler la Visite Matérielle {0} avant d'annuler cette Réclamation de Garantie
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Rapports d&#39;évaluation
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produits de Consommation
-DocType: Purchase Receipt,Subscription Detail,Détail de l'Abonnement
 DocType: Supplier Scorecard,Notify Supplier,Notifier Fournisseur
 DocType: Item,Customer Items,Articles du clients
 DocType: Project,Costing and Billing,Coûts et Facturation
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
 DocType: Item,Publish Item to hub.erpnext.com,Publier un Artice sur hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifications par Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Évaluation
 DocType: Item,Default Unit of Measure,Unité de Mesure par Défaut
 DocType: SMS Center,All Sales Partner Contact,Tous les Contacts de Partenaires Commerciaux
-DocType: Employee,Leave Approvers,Approbateurs de Congés
+DocType: Department,Leave Approvers,Approbateurs de Congés
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Enquêtes
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Voir les Disponibilités
 DocType: Job Applicant,Job Applicant,Demandeur d'Emploi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Basé sur les transactions avec ce fournisseur. Voir la chronologie ci-dessous pour plus de détails
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juridique
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Le type de taxe réel ne peut pas être inclus dans le prix de l'Article à la ligne {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juridique
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Le type de taxe réel ne peut pas être inclus dans le prix de l'Article à la ligne {0}
 DocType: Bank Guarantee,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requis Par
 DocType: Delivery Note,Return Against Delivery Note,Retour contre Bon de Livraison
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Compte Bancaire ne peut pas être nommé {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Titres (ou groupes) sur lequel les entrées comptables sont faites et les soldes sont maintenus.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Solde pour {0} ne peut pas être inférieur à zéro ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Il n'y a aucune Fiche de Paie à traiter.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Il n'y a aucune Fiche de Paie à traiter.
 DocType: Manufacturing Settings,Default 10 mins,10 minutes Par Défaut
 DocType: Leave Type,Leave Type Name,Nom du Type de Congé
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afficher ouverte
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Il est nécessaire de faire cette action aujourd'hui pour les documents récurrents mentionnés ci-dessus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Mise à jour des Séries Réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Règlement
 DocType: Pricing Rule,Apply On,Appliquer Sur
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Tous les Contacts Fournisseurs
 DocType: Support Settings,Support Settings,Réglages du Support
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Date de Fin Attendue ne peut pas être antérieure à Date de Début Attendue
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ligne #{0} : Le Prix doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nouvelle Demande de Congés
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ligne #{0} : Le Prix doit être le même que {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Statut d'Expiration d'Article du Lot
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Traite Bancaire
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Traite Bancaire
 DocType: Membership,membership validaty section,section validaty d&#39;adhésion
 DocType: Mode of Payment Account,Mode of Payment Account,Compte du Mode de Paiement
 DocType: Consultation,Consultation,Consultation
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Matériel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Faire un site web
 DocType: Opening Invoice Creation Tool Item,Quantity,Quantité
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Le tableau de comptes ne peut être vide.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Prêts (Passif)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Le tableau de comptes ne peut être vide.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Prêts (Passif)
 DocType: Employee Education,Year of Passing,Année de Passage
 DocType: Item,Country of Origin,Pays d'Origine
 DocType: Soil Texture,Soil Texture Criteria,Critères de texture du sol
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Détails du contact principal
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Ouvrir les Questions
 DocType: Production Plan Item,Production Plan Item,Article du Plan de Production
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'Employé {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'Employé {1}
 DocType: Lab Test Groups,Add new line,Ajouter une nouvelle ligne
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Soins de Santé
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard de paiement (jours)
@@ -89,7 +85,7 @@
 ,Delay Days,Jours de retard
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Facture
+DocType: Subscription Invoice,Invoice,Facture
 DocType: Purchase Invoice Item,Item Weight Details,Détails du poids de l&#39;article
 DocType: Asset Maintenance Log,Periodicity,Périodicité
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Exercice Fiscal {0} est nécessaire
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abré
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ligne {0} : {1} {2} ne correspond pas à {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ligne # {0} :
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ligne # {0} :
 DocType: Timesheet,Total Costing Amount,Montant Total des Coûts
 DocType: Delivery Note,Vehicle No,N° du Véhicule
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Veuillez sélectionner une Liste de Prix
@@ -108,17 +104,16 @@
 DocType: Work Order Operation,Work In Progress,Travaux En Cours
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Veuillez sélectionner une date
 DocType: Daily Work Summary Group,Holiday List,Liste de Vacances
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Comptable
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Comptable
 DocType: Hub Settings,Selling Price List,Liste de prix de vente
 DocType: Patient,Tobacco Current Use,Consommation actuelle de tabac
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prix de vente
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Prix de vente
 DocType: Cost Center,Stock User,Chargé des Stocks
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,N° de Téléphone
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nouveau(elle) {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notification initiale par e-mail envoyée
 ,Sales Partners Commission,Commission des Partenaires de Vente
-DocType: Soil Texture,Sandy Clay Loam,terreau de sol argileux
+DocType: Soil Texture,Sandy Clay Loam,Limon argilo-sableux
 DocType: Purchase Invoice,Rounding Adjustment,Arrondi
 apps/erpnext/erpnext/setup/doctype/company/company.py +46,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Créneaux Horaires du Médecin
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Valeur Après Amortissement
 DocType: Student,O+,O+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,En Relation
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Date de présence ne peut pas être antérieure à la date d'embauche de l'employé
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Date de présence ne peut pas être antérieure à la date d'embauche de l'employé
 DocType: Grading Scale,Grading Scale Name,Nom de l'Échelle de Notation
-DocType: Subscription,Repeat on Day,Répéter Chaque
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Il s'agit d'un compte racine qui ne peut être modifié.
 DocType: Sales Invoice,Company Address,Adresse de la Société
 DocType: BOM,Operations,Opérations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossible de définir l'autorisation sur la base des Prix Réduits pour {0}
+DocType: Subscription,Subscription Start Date,Date de début de l&#39;abonnement
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attacher un fichier .csv avec deux colonnes, une pour l'ancien nom et une pour le nouveau nom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} dans aucun Exercice actif.
 DocType: Packed Item,Parent Detail docname,Nom de Document du Détail Parent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Référence: {0}, Code de l&#39;article: {1} et Client: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Date de fin de la période d&#39;essai Ne peut être antérieure à la période d&#39;évaluation
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un Emploi.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},La nomenclature n&#39;est pas spécifiée pour l&#39;article de sous-traitance {0} sur la ligne {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La même Société a été entrée plus d'une fois
 DocType: Patient,Married,Marié
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non autorisé pour {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtenir les articles de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Obtenir les articles de
 DocType: Price List,Price Not UOM Dependant,Prix non dépendent d' UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Liquide de Frein
 DocType: Tax Rule,Tax Type,Type de Taxe
 ,Completed Work Orders,Ordres de travail terminés
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Montant Taxable
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Montant Taxable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}
 DocType: BOM,Item Image (if not slideshow),Image de l'Article (si ce n'est diaporama)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif Horaire / 60) * Temps Réel d’Opération
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ligne {0}: Le Type de Document de Référence doit être soit une Note de Frais soit une Écriture de Journal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Sélectionner LDM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ligne {0}: Le Type de Document de Référence doit être soit une Note de Frais soit une Écriture de Journal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Sélectionner LDM
 DocType: SMS Log,SMS Log,Journal des SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des Articles Livrés
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gérer le montant anticipé donné à l&#39;employé
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Notification de livraison
 DocType: Journal Entry,Opening Entry,Écriture d'Ouverture
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Compte Bénéficiaire Seulement
-DocType: Employee Loan,Repay Over Number of Periods,Rembourser Sur le Nombre de Périodes
+DocType: Loan,Repay Over Number of Periods,Rembourser Sur le Nombre de Périodes
 DocType: Stock Entry,Additional Costs,Frais Supplémentaires
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
 DocType: Lead,Product Enquiry,Demande d'Information Produit
 DocType: Education Settings,Validate Batch for Students in Student Group,Valider le Lot pour les Étudiants en Groupe Étudiant
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Aucun congé trouvé pour l’employé {0} pour {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Aucun congé trouvé pour l’employé {0} pour {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Veuillez d’abord entrer une Société
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Veuillez d’abord sélectionner une Société
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Veuillez d’abord sélectionner une Société
 DocType: Employee Education,Under Graduate,Non Diplômé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Veuillez définir le modèle par défaut pour la notification d&#39;état de congé dans les paramètres HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Cible Sur
 DocType: BOM,Total Cost,Coût Total
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Prêt Employé
 DocType: Fee Schedule,Send Payment Request Email,Envoyer un Email de Demande de Paiement
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Immobilier
@@ -221,31 +217,28 @@
 DocType: Purchase Invoice Item,Is Fixed Asset,Est Immobilisation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +313,"Available qty is {0}, you need {1}","Qté disponible est {0}, vous avez besoin de {1}"
 DocType: Expense Claim Detail,Claim Amount,Montant Réclamé
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +679,Work Order has been {0},Le bon de travail a été {0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +679,Work Order has been {0},L'ordre de travail a été {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,Groupe de clients en double trouvé dans le tableau des groupes de clients
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Fournisseur / Type de Fournisseur
 DocType: Naming Series,Prefix,Préfixe
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,Lieu de l'Événement
-DocType: Asset Settings,Asset Settings,Paramètres de l&#39;actif
+DocType: Asset Settings,Asset Settings,Paramètres des actifs
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,Consommable
 DocType: Student,B-,B-
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Désinscription réussie.
 DocType: Assessment Result,Grade,Note
 DocType: Restaurant Table,No of Seats,Nombre de Sièges
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Pour ajouter un sujet dynamique, utilisez des tags jinja comme <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Livré par le Fournisseur
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tâche de Maintenance des Actifs
 DocType: SMS Center,All Contact,Tout Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salaire Annuel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salaire Annuel
 DocType: Daily Work Summary,Daily Work Summary,Récapitulatif Quotidien de Travail
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'Exercice
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} est gelée
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Charges de Stock
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Charges de Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Sélectionner l'Entrepôt Cible
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Veuillez entrer l’Email de Contact Préférré
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Veuillez entrer l’Email de Contact Préférré
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contre-passation
 DocType: Journal Entry Account,Credit in Company Currency,Crédit dans la Devise de la Société
@@ -266,39 +259,41 @@
 DocType: Customer,Primary Address,Adresse principale
 DocType: Production Plan,Material Request Detail,Détail de la demande de matériel
 DocType: Selling Settings,Default Quotation Validity Days,Validité des jours de validité
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Réglages pour le Module RH
 DocType: SMS Center,SMS Center,Centre des SMS
 DocType: Sales Invoice,Change Amount,Changer le Montant
-DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,Définir la valeur de facture pour B2C. B2CL et B2CS calculés sur la base de cette valeur de facture.
+DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,Défini la valeur de la facture pour B2C. B2CL et B2CS sont calculés sur la base de la valeur de cette facture.
 DocType: BOM Update Tool,New BOM,Nouvelle LDM
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,Afficher uniquement les points de vente
 DocType: Driver,Driving License Categories,Catégories de permis de conduire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Entrez la Date de Livraison
 DocType: Depreciation Schedule,Make Depreciation Entry,Créer une Écriture d'Amortissement
+DocType: HR Settings,Leave Settings,Laissez les paramètres
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Type de Demande
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Créer un Employé
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radio/Télévision
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Mode de configuration de POS (en ligne / hors ligne)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Désactive la création de journaux de temps par rapport aux ordres de travail. Les opérations ne doivent pas être suivies par ordre de travail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Exécution
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Exécution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Détails des opérations effectuées.
 DocType: Asset Maintenance Log,Maintenance Status,Statut d'Entretien
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Détails de l&#39;adhésion
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1} : Un Fournisseur est requis pour le Compte Créditeur {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articles et Prix
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Nombre total d'heures : {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},La Date Initiale doit être dans l'Exercice Fiscal. En supposant Date Initiale = {0}
 DocType: Drug Prescription,Interval,Intervalle
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Préférence
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Préférence
 DocType: Grant Application,Individual,Individuel
 DocType: Academic Term,Academics User,Utilisateur académique
 DocType: Cheque Print Template,Amount In Figure,Montant En Chiffre
-DocType: Employee Loan Application,Loan Info,Infos sur le Prêt
+DocType: Loan Application,Loan Info,Infos sur le Prêt
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan pour les visites de maintenance.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Période de la Fiche d'Évaluation Fournisseur
-DocType: Share Transfer,Share Transfer,Transfert de partage
+DocType: Share Transfer,Share Transfer,Transfert d'actions
 DocType: POS Profile,Customer Groups,Groupes de Clients
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,États Financiers
 DocType: Guardian,Students,Étudiants
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Modèle d&#39;article
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochimie
 DocType: Job Offer,Select Terms and Conditions,Sélectionner les Termes et Conditions
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Valeur Sortante
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Valeur Sortante
 DocType: Woocommerce Settings,Woocommerce Settings,Paramètres Woocommerce
 DocType: Production Plan,Sales Orders,Commandes Clients
 DocType: Purchase Taxes and Charges,Valuation,Valorisation
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Région par Défaut
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Télévision
 DocType: Work Order Operation,Updated via 'Time Log',Mis à jour via 'Journal du Temps'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Sélectionnez le client ou le fournisseur.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette Transaction
 DocType: Company,Enable Perpetual Inventory,Autoriser l'Inventaire Perpétuel
+DocType: Bank Guarantee,Charges Incurred,Accusations portées
 DocType: Company,Default Payroll Payable Account,Compte de Paie par Défaut
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Metter à jour le Groupe d'Email
 DocType: Sales Invoice,Is Opening Entry,Est Écriture Ouverte
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Résultat Personnalisé
 DocType: Delivery Stop,Contact Name,Nom du Contact
 DocType: Course Assessment Criteria,Course Assessment Criteria,Critères d'Évaluation du Cours
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Numéro d&#39;identification fiscale
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Numéro d'identification fiscale:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Carte d&#39;étudiant:
 DocType: POS Customer Group,POS Customer Group,Groupe Clients PDV
 DocType: Land Unit,Land Unit describing various land assets,Parcelle décrivant divers biens fonciers
@@ -374,9 +371,8 @@
 ,Open Work Orders,Ordres de travail ouverts
 DocType: Payment Term,Credit Months,Mois de crédit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Salaire Net ne peut pas être inférieur à 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Pour arrêter d&#39;envoyer des notifications d&#39;erreurs répétitives du système, nous avons coché la case Disabled dans l&#39;abonnement"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,La Date de Relève doit être postérieure à la Date d’Embauche
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Congés par Année
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,La Date de Relève doit être postérieure à la Date d’Embauche
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Congés par Année
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0} : Veuillez vérifier 'Est Avance' sur le compte {1} si c'est une avance.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},L'entrepôt {0} n'appartient pas à la société {1}
 DocType: Email Digest,Profit & Loss,Profits & Pertes
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Veuillez configurer les Étudiants sous des groupes d'Étudiants
 DocType: Item Website Specification,Item Website Specification,Spécification de l'Article sur le Site Web
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Laisser Verrouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Écritures Bancaires
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Laisser Verrouillé
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Écritures Bancaires
 DocType: Crop,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de Réconciliation du Stock
 DocType: Stock Entry,Sales Invoice No,N° de la Facture de Vente
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Cours sur l'Outil de Création de Groupe d'Étudiants
 DocType: Lead,Do Not Contact,Ne Pas Contacter
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Personnes qui enseignent dans votre organisation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Developeur Logiciel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Developeur Logiciel
 DocType: Item,Minimum Order Qty,Qté de Commande Minimum
 DocType: Pricing Rule,Supplier Type,Type de Fournisseur
 DocType: Course Scheduling Tool,Course Start Date,Date de Début du Cours
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publier dans le Hub
 DocType: Student Admission,Student Admission,Admission des Étudiants
 ,Terretory,Territoire
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Demande de Matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Demande de Matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à Jour la Date de Compensation
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Détails de l'Achat
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Note Maximale
 DocType: Email Digest,New Quotations,Nouveaux Devis
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envoi des fiches de paie à l'employé par Email en fonction de l'email sélectionné dans la fiche Employé
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier Approbateur de Congé dans la liste sera défini comme Approbateur par défaut
 DocType: Tax Rule,Shipping County,Comté de Livraison
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Apprendre
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Apprendre
 DocType: Asset,Next Depreciation Date,Date de l’Amortissement Suivant
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coût de l'Activité par Employé
 DocType: Accounts Settings,Settings for Accounts,Réglages pour les Comptes
@@ -452,14 +447,14 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Chèques et Dépôts en suspens à compenser
 DocType: Item,Synced With Hub,Synchronisé avec le Hub
 DocType: Driver,Fleet Manager,Gestionnaire de Flotte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Mauvais Mot De Passe
 DocType: Item,Variant Of,Variante De
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Qté Terminée ne peut pas être supérieure à ""Quantité de Fabrication"""
 DocType: Period Closing Voucher,Closing Account Head,Responsable du Compte Clôturé
 DocType: Employee,External Work History,Historique de Travail Externe
 apps/erpnext/erpnext/projects/doctype/task/task.py +111,Circular Reference Error,Erreur de Référence Circulaire
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,Carte de rapport d&#39;étudiant
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,Carte d'étudiant
 DocType: Appointment Type,Is Inpatient,Est hospitalisé
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nom du Tuteur 1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En Toutes Lettres (Exportation) Sera visible une fois que vous enregistrerez le Bon de Livraison.
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Veuillez régler le tarif de la chambre d&#39;hôtel sur {}
 DocType: Journal Entry,Multi Currency,Multi-Devise
 DocType: Opening Invoice Creation Tool,Invoice Type,Type de Facture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Bon de Livraison
 DocType: Consultation,Encounter Impression,Impression de la Visite
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuration des Impôts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Coût des Immobilisations Vendus
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Intitulé de poste (e.g.  Directeur Général, Directeur...)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taux auquel la Devise Client est convertie en devise client de base
 DocType: Course Scheduling Tool,Course Scheduling Tool,Outil de Planification des Cours
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Erreur lors de la création de %s récurrents pour %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
 DocType: Land Unit,LInked Analysis,Analyse reliée
 DocType: Item Tax,Tax Rate,Taux d'Imposition
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,La période d&#39;application ne peut pas être sur deux enregistrements d&#39;allocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,La période de demande ne peut pas être sur deux périodes d'allocations
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour l’Employé {1} pour la période {2} à {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Ligne # {0} : Le N° de Lot doit être le même que {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Reçu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Créer des Groupes d'Étudiants
 DocType: Volunteer,Weekends,Fins de semaine
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Montant de la Note de Crédit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Montant de la Note de Crédit
 DocType: Setup Progress Action,Action Document,Document d'Action
 DocType: Chapter Member,Website URL,URL de site web
 ,Finished Goods,Produits Finis
@@ -529,10 +523,11 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} n'est pas inscrit dans le Cours {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nom d&#39;étudiant:
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},N° de Série {0} ne fait pas partie du Bon de Livraison {1}
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Il semble y avoir un problème avec la configuration GoCardless du serveur. Ne vous inquiétez pas, en cas d&#39;échec, le montant sera remboursé sur votre compte."
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Il semble y avoir un problème avec la configuration de GoCardless sur le serveur. Ne vous inquiétez pas, en cas d'échec, le montant sera remboursé sur votre compte."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demo ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ajouter des Articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d'Inspection de Qualité de l'Article
+DocType: Leave Application,Leave Approver Name,Nom de l'Approbateur de Congés
 DocType: Depreciation Schedule,Schedule Date,Date du Calendrier
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Revenus, Retenues, et autres composantes Salariales"
 DocType: Packed Item,Packed Item,Article Emballé
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Appel d'Offre
 DocType: Healthcare Settings,Require Lab Test Approval,Nécessite l'Approbation du Test de Laboratoire
 DocType: Salary Slip Timesheet,Working Hours,Heures de Travail
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total en suspens
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total en suspens
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
 DocType: Dosage Strength,Strength,Force
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Créer un nouveau Client
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Coût de Consommable
 DocType: Purchase Receipt,Vehicle Date,Date du Véhicule
 DocType: Student Log,Medical,Médical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Raison de perdre
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Raison de perdre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Mettre à jour le numéro
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Le Responsable du Prospect ne peut pas être identique au Prospect
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Le montant alloué ne peut pas être plus grand que le montant non ajusté
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Unique
 DocType: Salary Slip,Total Loan Repayment,Total de Remboursement du Prêt
 DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
-DocType: Subscription,Yearly,Annuel
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Veuillez entrer un Centre de Coûts
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Veuillez entrer un Centre de Coûts
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Journal Entry Account,Sales Order,Commande Client
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Moy. Taux de vente
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Moy. Taux de vente
 DocType: Assessment Plan,Examiner Name,Nom de l'Examinateur
 DocType: Lab Test Template,No Result,Aucun Résultat
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
@@ -585,7 +579,8 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Veuillez d’abord entrer le nom de l'entreprise
 DocType: Purchase Invoice,Supplier Name,Nom du Fournisseur
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lire le manuel d’ERPNext
-DocType: Purchase Invoice,01-Sales Return,01-Ventes Retour
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Afficher les feuilles de tous les membres du département dans le calendrier
+DocType: Purchase Invoice,01-Sales Return,01-Avoir
 DocType: Account,Is Group,Est un Groupe
 DocType: Email Digest,Pending Purchase Orders,Bons de Commande en Attente
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Régler Automatiquement les Nos de Série basés sur FIFO
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Champ Obligatoire - Année Académique
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} n&#39;est pas associé à {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui fera partie de cet Email. Chaque transaction a une introduction séparée.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Veuillez définir le compte créditeur par défaut pour la société {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},La transaction n&#39;est pas autorisée sur l&#39;ordre de travail arrêté {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Veuillez définir le compte créditeur par défaut pour la société {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},La transaction n'est pas autorisée pour l'ordre de travail arrêté {0}
 DocType: Setup Progress Action,Min Doc Count,Compte de Document Minimum
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
 DocType: SMS Log,Sent On,Envoyé le
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
 DocType: HR Settings,Employee record is created using selected field. ,Le dossier de l'employé est créé en utilisant le champ sélectionné.
 DocType: Sales Order,Not Applicable,Non Applicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Données de Base des Vacances
@@ -619,7 +614,7 @@
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si cochée, le montant de la taxe sera considéré comme déjà inclus dans le Taux d'Impression / Prix d'Impression"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +46,PieceRef,PieceRef
 DocType: Request for Quotation,Message for Supplier,Message pour le Fournisseur
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,Ordre de travail
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,Ordre de Travail
 DocType: Driver,DRIVER-.#####,CHAUFFEUR-.#####
 DocType: Sales Invoice,Total Qty,Qté Totale
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,ID Email du Tuteur2
@@ -630,9 +625,9 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Réservé à la Vente
 DocType: Packing Slip,From Package No.,Du N° de Colis
 DocType: Item Attribute,To Range,Au Rang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et Dépôts
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossible de modifier la méthode de valorisation, car il existe des transactions sur certains articles ne possèdant pas leur propre méthode de valorisation"
-DocType: Student Report Generation Tool,Attended by Parents,Assisté par les parents
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Titres et Dépôts
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossible de modifier la méthode de valorisation, car il existe des transactions sur certains articles ne possèdant pas leur propre méthode de valorisation"
+DocType: Student Report Generation Tool,Attended by Parents,Les parents ont participé
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total des Congés attribués est obligatoire
 DocType: Patient,AB Positive,AB Positif
 DocType: Job Opening,Description of a Job Opening,Description d'une Nouvelle Offre d’Emploi
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre des présences.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Composante Salariale pour la rémunération basée sur la feuille de temps
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour Plan de Production
-DocType: Employee Loan,Total Payment,Paiement Total
+DocType: Loan,Total Payment,Paiement Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Impossible d&#39;annuler la transaction pour l&#39;ordre de travail terminé.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} est annulé, donc l'action ne peut pas être complétée"
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Listez quelques-uns de vos clients. Ils peuvent être des entreprise ou des individus.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pièces Suffisantes pour Construire
 DocType: POS Profile User,POS Profile User,Utilisateur du profil PDV
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Revenu Direct
+DocType: Subscription Invoice,Subscription Invoice,Facture d&#39;abonnement
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Revenu Direct
 DocType: Patient Appointment,Date TIme,Date Heure
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Agent Administratif
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Agent Administratif
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Création d&#39;entreprise et taxes
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Veuillez sélectionner un Cours
 DocType: Codification Table,Codification Table,Tableau de Codifications
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Veuillez sélectionner une Société
 DocType: Stock Entry Detail,Difference Account,Compte d’Écart
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN du Fournisseur
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer une tâche si tâche dépendante {0} n'est pas fermée.
@@ -689,11 +685,12 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Modèle de cartographie des flux de trésorerie
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
 DocType: Journal Entry,Difference (Dr - Cr),Écart (Dr - Cr )
+DocType: Bank Guarantee,Providing,Fournir
 DocType: Account,Profit and Loss,Pertes et Profits
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Non autorisé, configurez le modèle de test de laboratoire au besoin"
 DocType: Patient,Risk Factors,Facteurs de Risque
 DocType: Patient,Occupational Hazards and Environmental Factors,Dangers Professionnels et Facteurs Environnementaux
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +279,Stock Entries already created for Work Order ,Entrées de stock déjà créées pour l&#39;ordre de travail
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +279,Stock Entries already created for Work Order ,Ecritures de stock déjà créées pour l'ordre de travail
 DocType: Vital Signs,Respiratory rate,Fréquence Respiratoire
 apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,Gestion de la Sous-traitance
 DocType: Vital Signs,Body Temperature,Température Corporelle
@@ -703,7 +700,7 @@
 DocType: Supplier Scorecard,Weighting Function,Fonction de Pondération
 DocType: Physician,OP Consulting Charge,Honoraires de Consulations Externe
 apps/erpnext/erpnext/utilities/user_progress.py +28,Setup your ,Configurez votre
-DocType: Student Report Generation Tool,Show Marks,Afficher les marques
+DocType: Student Report Generation Tool,Show Marks,Afficher les notes
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la devise de la Liste de prix est convertie en devise société de base
 apps/erpnext/erpnext/setup/doctype/company/company.py +70,Account {0} does not belong to company: {1},Le compte {0} n'appartient pas à la société : {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +52,Abbreviation already used for another company,Abréviation déjà utilisée pour une autre société
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,N° de Facture du Fournisseur
 DocType: Territory,For reference,Pour référence
 DocType: Healthcare Settings,Appointment Confirmation,Confirmation de Rendez-Vous
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossible de supprimer les N° de série {0}, s'ils sont dans les mouvements de stock"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossible de supprimer les N° de série {0}, s'ils sont dans les mouvements de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Fermeture (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Bonjour
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Déplacer l'Article
@@ -738,18 +735,18 @@
 DocType: Pricing Rule,Sales Partner,Partenaire Commercial
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Toutes les Fiches d'Évaluation Fournisseurs.
 DocType: Buying Settings,Purchase Receipt Required,Reçu d’Achat Requis
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Target warehouse in row {0} must be same as Work Order,L&#39;entrepôt cible dans la ligne {0} doit être identique à l&#39;ordre de travail
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Target warehouse in row {0} must be same as Work Order,L'entrepôt cible dans la ligne {0} doit être identique à l'entrepôt de l'ordre de travail
 apps/erpnext/erpnext/stock/doctype/item/item.py +155,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +34,Please select Company and Party Type first,Veuillez d’abord sélectionner une Société et le Type de Tiers
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Déjà défini par défaut dans le profil pos {0} pour l&#39;utilisateur {1}, aimablement désactivé par défaut"
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Déjà défini par défaut dans le profil pdv {0} pour l'utilisateur {1}, veuillez désactiver la valeur par défaut"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Exercice comptable / financier
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valeurs Accumulées
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Désolé, les N° de Série ne peut pas être fusionnés"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Désolé, les N° de Série ne peut pas être fusionnés"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Le Territoire est Requis dans le Profil PDV
 DocType: Supplier,Prevent RFQs,Interdire les Appels d'Offres
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Créer une Commande Client
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salaire soumis pour la période du {0} au {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Fiche de paie soumise pour la période du {0} au {1}
 DocType: Project Task,Project Task,Tâche du Projet
 ,Lead Id,Id du Prospect
 DocType: C-Form Invoice Detail,Grand Total,Total TTC
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Date de facturation
 DocType: Production Plan,Production Plan,Plan de production
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Ouverture de l&#39;outil de création de facture
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Retour de Ventes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Remarque : Le total des congés alloués {0} ne doit pas être inférieur aux congés déjà approuvés {1} pour la période
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Définir la quantité dans les transactions en fonction de l&#39;entrée série sans entrée
 ,Total Stock Summary,Récapitulatif de l'Inventaire Total
 DocType: Announcement,Posted By,Posté par
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Expédition Directe)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu Intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Ouverture (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Veuillez définir la Société
-DocType: Share Balance,Share Balance,Partager le solde
+DocType: Share Balance,Share Balance,Balance des actions
 DocType: Purchase Order Item,Billed Amt,Mnt Facturé
 DocType: Training Result Employee,Training Result Employee,Résultat de la Formation – Employé
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stock sont faites.
-DocType: Repayment Schedule,Principal Amount,Montant Principal
-DocType: Employee Loan Application,Total Payable Interest,Total des Intérêts Créditeurs
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Montant Principal
+DocType: Loan Application,Total Payable Interest,Total des Intérêts Créditeurs
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total en Attente: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Feuille de Temps de la Facture de Vente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N° et Date de Référence sont nécessaires pour {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
 DocType: Restaurant Reservation,Restaurant Reservation,Réservation de restaurant
 DocType: Land Unit,Land Unit Name,Nom de la parcelle
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Rédaction de Propositions
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Rédaction de Propositions
 DocType: Payment Entry Deduction,Payment Entry Deduction,Déduction d’Écriture de Paiement
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Emballer
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Avertir les clients par courrier électronique
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Avertir les clients par courrier électronique
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Commercial {0} existe avec le même ID d'Employé
 DocType: Employee Advance,Claimed Amount,Montant réclamé
 apps/erpnext/erpnext/config/education.py +180,Masters,Données de Base
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Le Compte Passerelle de Paiement n’existe pas, veuillez en créer un manuellement."
 DocType: Supplier Scorecard,Per Year,Par An
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Non admissible à l'admission dans ce programme d'après sa date de naissance
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Groupe de produits&gt; Marque
 DocType: Sales Invoice,Sales Taxes and Charges,Taxes et Frais de Vente
 DocType: Employee,Organization Profile,Profil de l'Organisation
 DocType: Vital Signs,Height (In Meter),Hauteur (en Mètres)
 DocType: Student,Sibling Details,Détails Frères et Sœurs
 DocType: Vehicle Service,Vehicle Service,Entretien du Véhicule
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Déclencher automatiquement la demande de retour d'expérience en fonction des conditions.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Déclencher automatiquement la demande de retour d'expérience en fonction des conditions.
 DocType: Employee,Reason for Resignation,Raison de la Démission
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Modèle pour l'évaluation de la performance.
 DocType: Sales Invoice,Credit Note Issued,Note de Crédit Émise
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Échéancier d'Entretien
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Les Règles de Tarification sont ensuite filtrées en fonction des Clients, des Groupes de Clients, des Régions, des Fournisseurs, des Groupes de Fournisseurs, des Campagnes, des Partenaires Commerciaux, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Variation Nette des Stocks
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Gestion des Prêts des Employés
 DocType: Employee,Passport Number,Numéro de Passeport
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relation avec Tuteur2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Directeur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Directeur
 DocType: Payment Entry,Payment From / To,Paiement De / À
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Veuillez définir un compte dans l&#39;entrepôt {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Transfert de Matériel
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Impossible de trouver un chemin pour
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Ouverture (Dr)
+DocType: Loan,Applicant,Demandeur
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Horodatage de Publication doit être après {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Pour faire des documents récurrents
 ,GST Itemised Purchase Register,Registre d'Achat Détaillé GST
 DocType: Course Scheduling Tool,Reschedule,Reporter
-DocType: Employee Loan,Total Interest Payable,Total des Intérêts à Payer
+DocType: Loan,Total Interest Payable,Total des Intérêts à Payer
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et Frais du Coût au Débarquement
 DocType: Work Order Operation,Actual Start Time,Heure de Début Réelle
 DocType: BOM Operation,Operation Time,Heure de l'Opération
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Terminer
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Base
 DocType: Timesheet,Total Billed Hours,Total des Heures Facturées
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Montant de la Reprise
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Montant de la Reprise
 DocType: Leave Block List Allow,Allow User,Autoriser l'Utilisateur
 DocType: Journal Entry,Bill No,Numéro de Facture
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de Cessions des Immobilisations
 DocType: Vehicle Log,Service Details,Détails du Service
-DocType: Subscription,Quarterly,Trimestriel
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Groupé
 DocType: Selling Settings,Delivery Note Required,Bon de Livraison Requis
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Feuille de Temps
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Enregistrer les Matières Premières sur la Base de
 DocType: Sales Invoice,Port Code,Code du port
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Entrepôt de réserve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Entrepôt de réserve
 DocType: Lead,Lead is an Organization,Le prospect est une organisation
 DocType: Guardian Interest,Interest,Intérêt
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valeur Compteur Kilométrique (Dernier)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modèles de Critères de  Fiche d'Évaluation Fournisseur.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,L’Écriture de Paiement est déjà créée
 DocType: Request for Quotation,Get Suppliers,Obtenir des Fournisseurs
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Actuel
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Ligne #{0} : L’Actif {1} n’est pas lié à l'Article {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Aperçu Fiche de Salaire
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Ligne #{0} : L’Actif {1} n’est pas lié à l'Article {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Aperçu Fiche de Salaire
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
 DocType: Account,Expenses Included In Valuation,Charges Incluses dans la Valorisation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Vous ne pouvez renouveler que si votre abonnement expire dans les 30 jours
@@ -940,8 +936,8 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Ne sélectionnez que si vous avez configuré les documents Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Supplier Scorecard,Per Week,Par Semaine
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,L'article a des variantes.
-apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Étudiants total
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total Étudiant
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur du Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +239,Company {0} does not exist,Société {0} n'existe pas
@@ -961,15 +957,15 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Écriture de Carte de Crédit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Société et Comptes
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,En Valeur
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,En Valeur
 DocType: Asset Settings,Depreciation Options,Options d&#39;amortissement
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Heure de publication non valide
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Heure de publication non valide
 DocType: Lead,Campaign Name,Nom de la Campagne
 DocType: Hotel Room,Capacity,Capacité
 DocType: Selling Settings,Close Opportunity After Days,Fermer Opportunité Après Jours
 ,Reserved,Réservé
 DocType: Driver,License Details,Détails de la licence
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +85,The field From Shareholder cannot be blank,Le champ De l&#39;actionnaire ne peut pas être vide
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +85,The field From Shareholder cannot be blank,Le champ 'De l'actionnaire' ne peut pas être vide
 DocType: Purchase Order,Supply Raw Materials,Fournir les Matières Premières
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actifs Actuels
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +133,{0} is not a stock Item,{0} n'est pas un Article de stock
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Numéro bon de commande du client
 DocType: Budget,Budget Against,Budget Pour
 DocType: Employee,Cell Number,Numéro de Téléphone
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Il n&#39;y a pas d&#39;employé pour les critères donnés. Vérifiez que les bordereaux de salaire n&#39;ont pas déjà été créés.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Il n&#39;y a pas d&#39;employé pour les critères donnés. Vérifiez que les bordereaux de salaire n&#39;ont pas déjà été créés.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Demandes de Matériel Générées Automatiquement
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer le bon actuel dans la colonne 'Pour l'Écriture de Journal'
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Veuillez sélectionner une table
 DocType: BOM,Website Specifications,Spécifications du Site Web
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} est une adresse e-mail invalide dans 'Destinataires'
 DocType: Special Test Items,Particulars,Particularités
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} : Du {0} de type {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0} : Du {0} de type {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ligne {0} : Le Facteur de Conversion est obligatoire
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Plusieurs Règles de Prix existent avec les mêmes critères, veuillez résoudre les conflits en attribuant des priorités. Règles de Prix : {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Désactivation ou annulation de la LDM impossible car elle est liée avec d'autres LDMs
 DocType: Asset,Maintenance,Entretien
+DocType: Subscriber,Subscriber,Abonné
 DocType: Item Attribute Value,Item Attribute Value,Valeur de l'Attribut de l'Article
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Veuillez mettre à jour votre statut de projet
 DocType: Item,Maximum sample quantity that can be retained,Quantité maximale d&#39;échantillon pouvant être conservée
@@ -1066,26 +1062,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Paramètres par défaut pour le Panier d'Achat
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Ajouter des Créneaux
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Actif mis au rebut via Écriture de Journal {0}
-DocType: Employee Loan,Interest Income Account,Compte d'Intérêts Créditeurs
+DocType: Loan,Interest Income Account,Compte d'Intérêts Créditeurs
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Examiner l&#39;invitation envoyée
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Charges d'Entretien de Bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Charges d'Entretien de Bureau
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Aller à
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuration du Compte Email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Veuillez d’abord entrer l'Article
 DocType: Asset Repair,Downtime,Temps d&#39;arrêt
 DocType: Account,Liability,Passif
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Terme académique
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Période scolaire:
 DocType: Salary Detail,Do not include in total,Ne pas inclure au total
 DocType: Company,Default Cost of Goods Sold Account,Compte de Coûts des Marchandises Vendues par Défaut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},La quantité d&#39;échantillon {0} ne peut pas dépasser la quantité reçue {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Liste des Prix non sélectionnée
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Liste des Prix non sélectionnée
 DocType: Employee,Family Background,Antécédents Familiaux
 DocType: Request for Quotation Supplier,Send Email,Envoyer un Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
 DocType: Item,Max Sample Quantity,Quantité maximum d&#39;échantillon
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Aucune Autorisation
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Aucune Autorisation
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Devis demandé
 DocType: Vital Signs,Heart Rate / Pulse,Fréquence Cardiaque / Pouls
 DocType: Company,Default Bank Account,Compte Bancaire par Défaut
@@ -1096,11 +1092,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Articles avec poids supérieur seront affichés en haut
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Tests de laboratoire et signes vitaux
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail de la Réconciliation Bancaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Ligne #{0} : L’Article {1} doit être soumis
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Ligne #{0} : L’Article {1} doit être soumis
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Aucun employé trouvé
-DocType: Subscription,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si sous-traité à un fournisseur
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Le Groupe d'Étudiants est déjà mis à jour.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Le Groupe d'Étudiants est déjà mis à jour.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Mise à jour du projet
 DocType: SMS Center,All Customer Contact,Tout Contact Client
 DocType: Land Unit,Tree Details,Détails de l’Arbre
@@ -1112,7 +1107,7 @@
 DocType: Item,Website Warehouse,Entrepôt du Site Seb
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant Minimum de Facturation
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1} : Le Centre de Coûts {2} ne fait pas partie de la Société {3}
-apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),Téléchargez votre tête de lettre (Gardez-le web comme 900px par 100px)
+apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),Téléchargez votre en-tête de lettre (Compatible web en 900px par 100px)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} : Compte {2} ne peut pas être un Groupe
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
@@ -1131,13 +1126,13 @@
 DocType: HR Settings,Retirement Age,Âge de la Retraite
 DocType: Bin,Moving Average Rate,Taux Mobile Moyen
 DocType: Production Plan,Select Items,Sélectionner les Articles
-DocType: Share Transfer,To Shareholder,Pour l&#39;actionnaire
+DocType: Share Transfer,To Shareholder,A l'actionnaire
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} pour la Facture {1} du {2}
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Institution,Configurer l'Institution
 DocType: Program Enrollment,Vehicle/Bus Number,Numéro de Véhicule/Bus
 apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,Horaire du Cours
 DocType: Request for Quotation Supplier,Quote Status,Statut du Devis
-DocType: GoCardless Settings,Webhooks Secret,Webhooks Secret
+DocType: GoCardless Settings,Webhooks Secret,Secret Webhooks
 DocType: Maintenance Visit,Completion Status,État d'Achèvement
 DocType: Daily Work Summary Group,Select Users,Sélectionner les utilisateurs
 DocType: Hotel Room Pricing Item,Hotel Room Pricing Item,Objet de prix de chambre d&#39;hôtel
@@ -1150,7 +1145,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importer Participation
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Tous les Groupes d'Articles
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
 DocType: Work Order,Item To Manufacture,Article à Fabriquer
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},Le Statut de {0} {1} est {2}
@@ -1161,10 +1155,10 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qté Projetée
 DocType: Sales Invoice,Payment Due Date,Date d'Échéance de Paiement
 DocType: Drug Prescription,Interval UOM,UDM d'Intervalle
-DocType: Customer,"Reselect, if the chosen address is edited after save","Resélectionner, si l&#39;adresse choisie est éditée après sauvegarde"
+DocType: Customer,"Reselect, if the chosen address is edited after save","Re-sélectionner, si l'adresse choisie est éditée après l'enregistrement"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
 DocType: Item,Hub Publishing Details,Détails Publiés sur le Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Ouverture'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Ouverture'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ouvrir To Do
 DocType: Notification Control,Delivery Note Message,Message du Bon de Livraison
 DocType: Lab Test Template,Result Format,Format du Résultat
@@ -1174,7 +1168,7 @@
 DocType: Payroll Entry,Bimonthly,Bimensuel
 DocType: Vehicle Service,Brake Pad,Plaquettes de Frein
 DocType: Fertilizer,Fertilizer Contents,Contenu de l&#39;engrais
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Recherche & Développement
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Recherche & Développement
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Montant à Facturer
 DocType: Company,Registration Details,Informations Légales
 DocType: Timesheet,Total Billed Amount,Montant Total Facturé
@@ -1188,7 +1182,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Contrôle de limite de crédit de contournement à la commande client
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Évaluation des Performances.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Activation de 'Utiliser pour Panier', comme le Panier est activé et qu'il devrait y avoir au moins une Règle de Taxes pour le Panier"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","L’Écriture de Paiement {0} est liée à la Commande {1}, vérifiez si elle doit être récupérée comme une avance dans cette facture."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","L’Écriture de Paiement {0} est liée à la Commande {1}, vérifiez si elle doit être récupérée comme une avance dans cette facture."
 DocType: Sales Invoice Item,Stock Details,Détails du Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du Projet
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-de-Vente
@@ -1214,7 +1208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +108,Setup your Institute in ERPNext,Configurez votre institut dans ERPNext
 DocType: Agriculture Analysis Criteria,Plant Analysis,Analyse des plantes
 DocType: Job Applicant,Hold,Tenir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +128,Alternate Item,Autre article
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +128,Alternate Item,Article alternatif
 DocType: Project Update,Progress Details,Détails du progrès
 DocType: Employee,Date of Joining,Date d'Embauche
 DocType: Naming Series,Update Series,Mettre à Jour les Séries
@@ -1222,7 +1216,7 @@
 DocType: Restaurant Table,Minimum Seating,Sièges Minimum
 DocType: Item Attribute,Item Attribute Values,Valeurs de l'Attribut de l'Article
 DocType: Examination Result,Examination Result,Résultat d'Examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Reçu d’Achat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Reçu d’Achat
 ,Received Items To Be Billed,Articles Reçus à Facturer
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Données de base des Taux de Change
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Doctype de la Référence doit être parmi {0}
@@ -1230,15 +1224,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau Horaires dans les {0} prochains jours pour l'Opération {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan de matériaux pour les sous-ensembles
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires Commerciaux et Régions
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,LDM {0} doit être active
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Aucun article disponible pour le transfert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,LDM {0} doit être active
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Aucun article disponible pour le transfert
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Fermeture (ouverture + total)
 DocType: Journal Entry,Depreciation Entry,Ecriture d’Amortissement
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Veuillez d’abord sélectionner le type de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les Visites Matérielles {0} avant d'annuler cette Visite de Maintenance
 DocType: Crop Cycle,ISO 8016 standard,Norme ISO 8016
-DocType: Pricing Rule,Rate or Discount,Taux ou rabais
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},N° de Série {0} n'appartient pas à l'Article {1}
+DocType: Pricing Rule,Rate or Discount,Prix unitaire ou réduction
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},N° de Série {0} n'appartient pas à l'Article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qté Requise
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoris
 DocType: Hub Settings,Custom Data,Données personnalisées
@@ -1250,9 +1244,9 @@
 DocType: Medical Code,Medical Code Standard,Standard du code médical
 DocType: Soil Texture,Clay Composition (%),Composition d&#39;argile (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Veuillez sauvegarder avant d&#39;assigner une tâche.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valeur du Solde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valeur du Solde
 DocType: Lab Test,Lab Technician,Technicien de laboratoire
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de Prix de Vente
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Liste de Prix de Vente
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Si cochée, un client sera créé et lié au patient. Les factures de patients seront créées sur ce client. Vous pouvez également sélectionner un Client existant tout en créant un Patient."
 DocType: Bank Reconciliation,Account Currency,Compte Devise
@@ -1260,16 +1254,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Veuillez indiquer le Compte d’Arrondi de la Société
 DocType: Purchase Receipt,Range,Plage
 DocType: Supplier,Default Payable Accounts,Comptes Créditeur par Défaut
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Fee Structure,Components,Composants
 DocType: Item Barcode,Item Barcode,Code barre article
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","à générer. Si vous êtes retardé, vous devrez modifier manuellement le champ &quot;Répéter le jour du mois&quot; de ceci"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
 DocType: Share Transfer,From Folio No,De Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avance sur Facture d’Achat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}
@@ -1283,7 +1275,7 @@
 DocType: Employee,Exit Interview Details,Entretient de Départ
 DocType: Item,Is Purchase Item,Est Article d'Achat
 DocType: Journal Entry Account,Purchase Invoice,Facture d’Achat
-DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,Autoriser la consommation de plusieurs articles par rapport à une commande de travail
+DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,Autoriser la consommation de plusieurs articles par rapport à un ordre de travail
 DocType: Stock Ledger Entry,Voucher Detail No,Détail de la Référence N°
 apps/erpnext/erpnext/accounts/page/pos/pos.js +789,New Sales Invoice,Nouvelle Facture de Vente
 DocType: Stock Entry,Total Outgoing Value,Valeur Sortante Totale
@@ -1301,19 +1293,20 @@
 DocType: Salary Slip,Total in words,Total En Toutes Lettres
 DocType: Material Request Item,Lead Time Date,Date du Délai
 ,Employee Advance Summary,Récapitulatif des avancements
-DocType: Asset,Available-for-use Date,Disponible pour l&#39;utilisation Date
+DocType: Asset,Available-for-use Date,Date de mise en service
 DocType: Guardian,Guardian Name,Nom du Tuteur
 DocType: Cheque Print Template,Has Print Format,A un Format d'Impression
-DocType: Employee Loan,Sanctioned,Sanctionné
+DocType: Loan,Sanctioned,Sanctionné
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être que le Taux de Change n'est pas créé pour
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Ligne # {0} : Veuillez Indiquer le N° de série pour l'article {1}
 DocType: Crop Cycle,Crop Cycle,Cycle de récolte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles ""Ensembles de Produits"", l’Entrepôt, le N° de Série et le N° de Lot proviendront de la table ""Liste de Colisage"". Si l’Entrepôt et le N° de Lot sont les mêmes pour tous les produits colisés d’un même article 'Produit Groupé', ces valeurs peuvent être entrées dans la table principale de l’article et elles seront copiées dans la table ""Liste de Colisage""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles ""Ensembles de Produits"", l’Entrepôt, le N° de Série et le N° de Lot proviendront de la table ""Liste de Colisage"". Si l’Entrepôt et le N° de Lot sont les mêmes pour tous les produits colisés d’un même article 'Produit Groupé', ces valeurs peuvent être entrées dans la table principale de l’article et elles seront copiées dans la table ""Liste de Colisage""."
 DocType: Student Admission,Publish on website,Publier sur le site web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la Facture du Fournisseur ne peut pas être postérieure à Date de Publication
+DocType: Subscription,Cancelation Date,Date d&#39;annulation
 DocType: Purchase Invoice Item,Purchase Order Item,Article du Bon de Commande
 DocType: Agriculture Task,Agriculture Task,Tâche d&#39;agriculture
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Revenu Indirect
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Revenu Indirect
 DocType: Student Attendance Tool,Student Attendance Tool,Outil de Présence des Étudiants
 DocType: Restaurant Menu,Price List (Auto created),Liste de prix (créée automatiquement)
 DocType: Cheque Print Template,Date Settings,Paramètres de Date
@@ -1321,7 +1314,7 @@
 ,Company Name,Nom de la Société
 DocType: SMS Center,Total Message(s),Total des Messages
 DocType: Share Balance,Purchased,Acheté
-DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,Renommez la valeur de l&#39;attribut dans l&#39;attribut de l&#39;élément.
+DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,Renommez la valeur de l'attribut dans l'attribut de l'article.
 DocType: Purchase Invoice,Additional Discount Percentage,Pourcentage de réduction supplémentaire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide
 DocType: Agriculture Analysis Criteria,Soil Texture,Texture du sol
@@ -1339,6 +1332,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Mètre
 DocType: Workstation,Electricity Cost,Coût de l'Électricité
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Le test de laboratoire datetime ne peut pas être effectué avant la date de collecte
+DocType: Subscription Plan,Cost,Coût
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer de rappel pour le Jour d'Anniversaire des Employés
 DocType: Expense Claim,Total Advance Amount,Montant total de l&#39;avance
 DocType: Delivery Stop,Estimated Arrival,Arrivée estimée
@@ -1350,14 +1344,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Charger votre en-tête et logo. (vous pouvez les modifier ultérieurement).
 DocType: Timesheet Detail,Bill,Facture
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanc
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Blanc
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0} : Qté non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l’écriture ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Vous pouvez sélectionner au maximum une option dans la liste des cases à cocher.
 DocType: Purchase Invoice,Get Advances Paid,Obtenir Acomptes Payés
 DocType: Item,Automatically Create New Batch,Créer un Nouveau Lot Automatiquement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Affectation de {0} à {1} (ligne {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Faire
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Affectation de {0} à {1} (ligne {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Faire
 DocType: Student Admission,Admission Start Date,Date de Début de l'Admission
 DocType: Journal Entry,Total Amount in Words,Montant Total En Toutes Lettres
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nouvel employé
@@ -1373,7 +1367,7 @@
 DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
 DocType: Repayment Schedule,Balance Loan Amount,Solde du Montant du Prêt
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Cours Calendrier
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Options du Stock
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Options du Stock
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Désactiver la récupération des derniers détails d&#39;achat dans la commande d&#39;achat
 DocType: Journal Entry Account,Expense Claim,Note de Frais
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Voulez-vous vraiment restaurer cet actif mis au rebut ?
@@ -1392,15 +1386,16 @@
 DocType: Packing Slip Item,Packing Slip Item,Article Emballé
 DocType: Purchase Invoice,Cash/Bank Account,Compte Caisse/Banque
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Veuillez spécifier un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Les articles avec aucune modification de quantité ou de valeur ont étés retirés.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Les articles avec aucune modification de quantité ou de valeur ont étés retirés.
 DocType: Delivery Note,Delivery To,Livraison à
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,La création de variantes a été placée en file d&#39;attente.
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Résumé des travaux pour {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Table d'Attribut est obligatoire
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Résumé de travail de {0}
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Le premier approbateur de congé de la liste sera défini comme Approbateur de congé par défaut.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Table d'Attribut est obligatoire
 DocType: Production Plan,Get Sales Orders,Obtenir les Commandes Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ne peut pas être négatif
 DocType: Training Event,Self-Study,Autoformation
-apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +27,Soil compositions do not add up to 100,Les compositions de sol ne totalisent pas 100
+apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +27,Soil compositions do not add up to 100,Le total des compositions du sol n'est pas égal à 100
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +567,Discount,Remise
 DocType: Membership,Membership,Adhésion
 DocType: Asset,Total Number of Depreciations,Nombre Total d’Amortissements
@@ -1408,7 +1403,7 @@
 DocType: Workstation,Wages,Salaires
 DocType: Asset Maintenance,Maintenance Manager Name,Nom du responsable de la maintenance
 DocType: Agriculture Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Veuillez spécifier un N° de Ligne valide pour la ligne {0} de la table {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Veuillez spécifier un N° de Ligne valide pour la ligne {0} de la table {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Impossible de trouver une variable:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Veuillez sélectionner un champ à modifier sur le pavé numérique
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Ne peut pas être un article immobilisé car un Journal de Stock a été créé.
@@ -1420,7 +1415,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nom du modèle d&#39;inspection de la qualité
 DocType: Project,First Email,Premier Email
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt Réservé aux Commandes Clients / Entrepôt de Produits Finis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Montant de Vente
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Montant de Vente
 DocType: Repayment Schedule,Interest Amount,Montant d'Intérêts
 DocType: Serial No,Creation Document No,N° du Document de Création
 DocType: Share Transfer,Issue,Question
@@ -1434,10 +1429,10 @@
 DocType: Tax Rule,Shipping State,État de livraison
 ,Projected Quantity as Source,Quantité Projetée comme Source
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Livraison
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Livraison
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Type de transfert
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Frais de Vente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Frais de Vente
 DocType: Consultation,Diagnosis,Diagnostique
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Achat Standard
 DocType: GL Entry,Against,Contre
@@ -1446,12 +1441,13 @@
 DocType: Sales Partner,Implementation Partner,Partenaire d'Implémentation
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Code Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Commande Client {0} est {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Sélectionnez le compte de revenus d&#39;intérêts dans le prêt {0}
 DocType: Opportunity,Contact Info,Information du Contact
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Faire des Écritures de Stock
 DocType: Packing Slip,Net Weight UOM,UDM Poids Net
 DocType: Item,Default Supplier,Fournisseur par Défaut
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Pourcentage d'Allocation en cas de Surproduction
-DocType: Employee Loan,Repayment Schedule,Échéancier de Remboursement
+DocType: Loan,Repayment Schedule,Échéancier de Remboursement
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condition de la Règle de Livraison
 DocType: Holiday List,Get Weekly Off Dates,Obtenir les Dates de Congés
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,La date de Fin ne peut pas être antérieure à la Date de Début
@@ -1465,7 +1461,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Âge Moyen
 DocType: Education Settings,Attendance Freeze Date,Date du Gel des Présences
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Listez quelques-uns de vos fournisseurs. Ils peuvent être des entreprises ou des individus.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Voir Tous Les Produits
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Voir Tous Les Produits
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Âge Minimum du Prospect (Jours)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Toutes les LDM
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Les chambres d&#39;hôtel de type {0} sont indisponibles le {1}
@@ -1473,14 +1469,16 @@
 DocType: Expense Claim,From Employee,De l'Employé
 DocType: Driver,Cellphone Number,Numéro de téléphone portable
 DocType: Project,Monitor Progress,Surveiller les progrès
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation car le montant pour l'Article {0} dans {1} est nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation car le montant pour l'Article {0} dans {1} est nul
 DocType: Journal Entry,Make Difference Entry,Créer l'Écriture par Différence
+DocType: Supplier Quotation,Auto Repeat Section,Section de répétition automatique
 DocType: Upload Attendance,Attendance From Date,Présence Depuis
 DocType: Appraisal Template Goal,Key Performance Area,Domaine Essentiel de Performance
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Attribut Invalide
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} doit être soumis
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
+DocType: Department Approver,Department Approver,Approbateur de département
 DocType: SMS Center,Total Characters,Nombre de Caractères
 DocType: Employee Advance,Claimed,Réclamé
 DocType: Crop,Row Spacing,Écartement des rangs
@@ -1490,6 +1488,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Facture de Réconciliation des Paiements
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Contribution %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","D'après les Paramètres d'Achat, si Bon de Commande Requis == 'OUI', alors l'utilisateur doit d'abord créer un Bon de Commande pour l'article {0} pour pouvoir créer une Facture d'Achat"
+,HSN-wise-summary of outward supplies,HSN-sage-résumé des fournitures à l&#39;étranger
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numéro d'immatriculation de la Société pour votre référence. Numéros de taxes, etc."
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Règles de Livraison du Panier
@@ -1503,7 +1502,7 @@
 DocType: Setup Progress Action,Action Name,Nom de l'Action
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Année de Début
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Les 2 premiers chiffres du GSTIN doivent correspondre au numéro de l'État {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Date de début de la période de facturation en cours
 DocType: Salary Slip,Leave Without Pay,Congé Sans Solde
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Erreur de Planification de Capacité
@@ -1521,28 +1520,28 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Les champs seront copiés uniquement au moment de la création.
 DocType: Setup Progress Action,Domains,Domaines
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Date de Début Réelle"" ne peut être postérieure à ""Date de Fin Réelle"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Gestion
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Gestion
 DocType: Cheque Print Template,Payer Settings,Paramètres du Payeur
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la Variante de l'Article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire Net (en lettres) sera visible une fois que vous aurez enregistré la Fiche de Paie.
 DocType: Purchase Invoice,Is Return,Est un Retour
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Mise en Garde
-apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Le jour de début est supérieur au jour de fin de la tâche &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retour / Note de Débit
+apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',La date de début est supérieure à la date de fin dans la tâche '{0}'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retour / Note de Débit
 DocType: Price List Country,Price List Country,Pays de la Liste des Prix
 DocType: Item,UOMs,UDMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code de l'Article ne peut pas être modifié pour le Numéro de Série
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Code de l'Article ne peut pas être modifié pour le Numéro de Série
 DocType: Purchase Invoice Item,UOM Conversion Factor,Facteur de Conversion de l'UDM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Veuillez entrer le Code d'Article pour obtenir le Numéro de Lot
 DocType: Stock Settings,Default Item Group,Groupe d'Éléments par Défaut
-DocType: Employee Loan,Partially Disbursed,Partiellement Décaissé
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Accorder des informations.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Accorder des informations.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de données fournisseurs.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Vous ne pouvez pas redémarrer un abonnement qui n&#39;est pas annulé.
 DocType: Account,Balance Sheet,Bilan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
 DocType: Fee Validity,Valid Till,Valable Jusqu'au
-DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Réunion des enseignants Total Parents
+DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Total des réunions parents/professeur
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Le même article ne peut pas être entré plusieurs fois.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être créés dans les groupes, mais les écritures ne peuvent être faites que sur les comptes individuels"
@@ -1553,7 +1552,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ligne #{0} : Qté Rejetée ne peut pas être entrée dans le Retour d’Achat
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Le changement de groupe de clients pour le client sélectionné n&#39;est pas autorisé.
 ,Purchase Order Items To Be Billed,Articles à Facturer du Bon de Commande
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Mise à jour des heures d&#39;arrivée estimées.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Mise à jour des heures d&#39;arrivée estimées.
 DocType: Program Enrollment Tool,Enrollment Details,Détails d&#39;inscription
 DocType: Purchase Invoice Item,Net Rate,Taux Net
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Veuillez sélectionner un Client
@@ -1572,18 +1571,20 @@
 DocType: Global Defaults,Current Fiscal Year,Exercice en Cours
 DocType: Purchase Order,Group same items,Groupe les éléments identiques
 DocType: Purchase Invoice,Disable Rounded Total,Désactiver le Total Arrondi
-DocType: Employee Loan Application,Repayment Info,Infos de Remboursement
+DocType: Department,Parent Department,Département Parent
+DocType: Loan Application,Repayment Info,Infos de Remboursement
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entrées' ne peuvent pas être vides
 DocType: Maintenance Team Member,Maintenance Role,Rôle de maintenance
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Ligne {0} en double avec le même {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Ligne {0} en double avec le même {1}
 ,Trial Balance,Balance Générale
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Exercice Fiscal {0} introuvable
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Exercice Fiscal {0} introuvable
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Configuration des Employés
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilisateur de réservation d&#39;hôtel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Veuillez d’abord sélectionner un préfixe
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Recherche
+DocType: Subscription Settings,Subscription Settings,Paramètres d&#39;abonnement
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux Effectués
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Veuillez spécifier au moins un attribut dans la table Attributs
 DocType: Announcement,All Students,Tous les Etudiants
@@ -1594,20 +1595,20 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
 DocType: Crop Cycle,Less than a year,Moins d&#39;un an
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,N° de Mobile de l'Étudiant
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Reste du Monde
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Reste du Monde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'Article {0} ne peut être en Lot
 DocType: Crop,Yield UOM,UOM de rendement
 ,Budget Variance Report,Rapport d’Écarts de Budget
 DocType: Salary Slip,Gross Pay,Salaire Brut
 DocType: Item,Is Item from Hub,Est un article sur le Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ligne {0} : Le Type d'Activité est obligatoire.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendes Payés
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendes Payés
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livre des Comptes
 DocType: Stock Reconciliation,Difference Amount,Écart de Montant
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} en congé le {1}
 DocType: Purchase Invoice,Reverse Charge,Autoliquidation
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Bénéfices Non Répartis
-DocType: Purchase Invoice,05-Change in POS,05-Changement de POS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Bénéfices Non Répartis
+DocType: Purchase Invoice,05-Change in POS,05-Changement dans le PDV
 DocType: Vehicle Log,Service Detail,Détails du Service
 DocType: BOM,Item Description,Description de l'Article
 DocType: Student Sibling,Student Sibling,Frère et Sœur de l'Étudiant
@@ -1621,12 +1622,12 @@
 DocType: Opportunity Item,Opportunity Item,Article de l'Opportunité
 ,Student and Guardian Contact Details,Détails des Contacts Étudiant et Tuteur
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Ligne {0} : Pour le fournisseur {0} une Adresse Email est nécessaire pour envoyer des email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ouverture Temporaire
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Ouverture Temporaire
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Afficher le Hub
 ,Employee Leave Balance,Solde des Congés de l'Employé
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Patient Appointment,More Info,Plus d&#39;infos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Taux de Valorisation requis pour l’Article de la ligne {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Taux de Valorisation requis pour l’Article de la ligne {0}
 DocType: Supplier Scorecard,Scorecard Actions,Actions de la Fiche d'Évaluation
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Exemple: Master en Sciences Informatiques
 DocType: Purchase Invoice,Rejected Warehouse,Entrepôt Rejeté
@@ -1636,7 +1637,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,à
 DocType: Supplier Quotation Item,Lead Time in days,Délai en Jours
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Résumé des Comptes Créditeurs
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Paiement du salaire de {0} à {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Paiement du salaire de {0} à {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Vous n'êtes pas autorisé à modifier le compte gelé {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtenir les Factures Impayées
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Commande Client {0} invalide
@@ -1645,9 +1646,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescriptions de test de laboratoire
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité totale d’Émission / Transfert {0} dans la Demande de Matériel {1} \ ne peut pas être supérieure à la quantité demandée {2} pour l’Article {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Petit
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Ouverture d&#39;un outil de création de facture
 DocType: Education Settings,Employee Number,Numéro d'Employé
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Annuler la facture après la période de grâce
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},N° de dossier déjà utilisé. Essayez depuis N° de dossier {0}
 DocType: Project,% Completed,% Complété
 ,Invoiced Amount (Exculsive Tax),Montant Facturé (Hors Taxes)
@@ -1661,7 +1663,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Test de laboratoire Datetime
 DocType: Email Digest,Add Quote,Ajouter une Citation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion UDM requis pour l'UDM : {0} dans l'Article : {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Charges Indirectes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Charges Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ligne {0} : Qté obligatoire
 DocType: Agriculture Analysis Criteria,Agriculture,Agriculture
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Données de Base
@@ -1691,16 +1693,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre écriture de débit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capitaux Immobilisés
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capitaux Immobilisés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Veuillez définir le Code d'Article en premier
 DocType: Item,ITEM-,ARTICLE-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Pourcentage total attribué à l'équipe commerciale devrait être de 100
+DocType: Subscription Plan,Billing Interval Count,Nombre d&#39;intervalles de facturation
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 DocType: Antibiotic,Antibiotic,Antibiotique
 ,Team Updates,Mises à Jour de l’Équipe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Pour Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Pour Fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Définir le Type de Compte aide à sélectionner ce Compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total TTC (Devise de la Société)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Créer Format d'Impression
@@ -1726,7 +1729,7 @@
 DocType: POS Item Group,POS Item Group,Groupe d'Articles PDV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Compte Rendu par Email :
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,L&#39;article alternatif ne doit pas être le même que le code article
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution Cible
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalisation de l&#39;évaluation provisoire
 DocType: Salary Slip,Bank Account No.,N° de Compte Bancaire
@@ -1742,7 +1745,7 @@
 DocType: BOM Operation,Workstation,Bureau
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fournisseur de l'Appel d'Offre
 DocType: Healthcare Settings,Registration Message,Message d'Inscription
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Matériel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Matériel
 DocType: Prescription Dosage,Prescription Dosage,Dosage de la prescription
 DocType: Attendance,HR Manager,Responsable RH
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Veuillez sélectionner une Société
@@ -1773,7 +1776,7 @@
 DocType: Project,Start and End Dates,Dates de Début et de Fin
 ,Delivered Items To Be Billed,Articles Livrés à Facturer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Ouvrir LDM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,L'entrepôt ne peut être modifié pour le N° de Série
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,L'entrepôt ne peut être modifié pour le N° de Série
 DocType: Authorization Rule,Average Discount,Remise Moyenne
 DocType: Project Update,Great/Quickly,Super / rapidement
 DocType: Purchase Invoice Item,UOM,UDM
@@ -1782,8 +1785,8 @@
 DocType: Employee,EMP/,EMP/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Veuillez sélectionner les lots pour les articles en lots
 DocType: Asset,Depreciation Schedules,Calendriers d'Amortissement
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Les comptes suivants peuvent être sélectionnés dans les paramètres de TPS:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,La période de la demande ne peut pas être hors de la période d'allocation de congé
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Les comptes suivants peuvent être sélectionnés dans les paramètres de TPS:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,La période de la demande ne peut pas être hors de la période d'allocation de congé
 DocType: Activity Cost,Projects,Projets
 DocType: Payment Request,Transaction Currency,Devise de la Transaction
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Du {0} | {1} {2}
@@ -1794,6 +1797,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Moy Quotidienne Sortante
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Nom et Type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Le Statut d'Approbation doit être 'Approuvé' ou 'Rejeté'
 DocType: Physician,Contacts and Address,Contacts et Adresse
 DocType: Purchase Invoice,Contact Person,Personne à Contacter
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Date de Début Prévue' ne peut pas être postérieure à 'Date de Fin Prévue'
@@ -1807,19 +1811,20 @@
 DocType: Student Admission,Eligibility and Details,Admissibilité et Détails
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Variation Nette des Actifs Immobilisés
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir du (Date et Heure)
 DocType: Email Digest,For Company,Pour la Société
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Journal des communications.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","L’accès au portail est désactivé pour les Appels d’Offres. Pour plus d’informations, vérifiez les réglages du portail."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de la Fiche d'Évaluation Fournisseur
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montant d'Achat
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Montant d'Achat
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adresse de Livraison
 DocType: Material Request,Terms and Conditions Content,Contenu des Termes et Conditions
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Des erreurs se sont produites lors de la création du programme
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Le premier approbateur de dépenses de la liste sera défini comme approbateur de dépenses par défaut.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ne peut pas être supérieure à 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenu
 DocType: Salary Detail,Depends on Leave Without Pay,Dépend de Congé Non Payé
@@ -1840,14 +1845,15 @@
 DocType: Package Code,Package Code,Code du Paquet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Apprenti
 DocType: Purchase Invoice,Company GSTIN,GSTIN de la Société
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Quantité Négative n'est pas autorisée
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantité Négative n'est pas autorisée
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",La table de détails de taxe est récupérée depuis les données de base de l'article comme une chaîne de caractères et stockée dans ce champ. Elle est utilisée pour les Taxes et Frais.
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,L'employé ne peut pas rendre de compte à lui-même.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,L'employé ne peut pas rendre de compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé, les écritures ne sont autorisés que pour un nombre restreint d'utilisateurs."
 DocType: Email Digest,Bank Balance,Solde Bancaire
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Laisser l&#39;approbateur obligatoire dans une demande de congé
 DocType: Job Opening,"Job profile, qualifications required etc.",Profil de l’Emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du Compte
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Règle de Taxation pour les transactions.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Entrepôt source est obligatoire à la ligne {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Le délai de paiement à la ligne {0} est probablement un doublon.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agriculture (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Bordereau de Colis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Loyer du Bureau
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuration de la passerelle SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Bordereau de Colis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Loyer du Bureau
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configuration de la passerelle SMS
 DocType: Disease,Common Name,Nom commun
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Échec de l'Importation !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Aucune adresse ajoutée.
 DocType: Workstation Working Hour,Workstation Working Hour,Heures de Travail au Bureau
 DocType: Vital Signs,Blood Pressure,Pression Artérielle
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analyste
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analyste
 DocType: Item,Inventory,Inventaire
 DocType: Item,Sales Details,Détails Ventes
 DocType: Quality Inspection,QI-,QI-
@@ -1893,17 +1899,17 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Valider le Cours Inscrit pour les Étudiants en Groupe Étudiant
 DocType: Notification Control,Expense Claim Rejected,Note de Frais Rejetée
 DocType: Item,Item Attribute,Attribut de l'Article
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Gouvernement
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Gouvernement
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Note de Frais {0} existe déjà pour l'Indémnité Kilométrique
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Nom de l&#39;Institut
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Veuillez entrer le Montant de remboursement
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Veuillez entrer le Montant de remboursement
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variantes de l'Article
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,Envoyer la Fiche de Paie à l'Employé par Mail
 DocType: Cost Center,Parent Cost Center,Centre de Coûts Parent
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Sélectionner le Fournisseur Possible
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Sélectionner le Fournisseur Possible
 DocType: Sales Invoice,Source,Source
-DocType: Customer,"Select, to make the customer searchable with these fields","Sélectionnez, pour rendre le client consultable avec ces champs"
+DocType: Customer,"Select, to make the customer searchable with these fields","Sélectionnez, pour rendre le client recherchable avec ces champs"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un Congé Sans Solde
 apps/erpnext/erpnext/stock/doctype/item/item.py +261,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Bordereau(x) de Colis annulé(s)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Flux de Trésorerie des Investissements
 DocType: Program Course,Program Course,Cours du Programme
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Frais de Fret et d'Expédition
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Frais de Fret et d'Expédition
 DocType: Homepage,Company Tagline for website homepage,Slogan de la Société pour la page d'accueil du site web
 DocType: Item Group,Item Group Name,Nom du Groupe d'Article
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris
@@ -1935,7 +1941,7 @@
 DocType: Landed Cost Voucher,Additional Charges,Frais Supplémentaires
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de la Remise Supplémentaire (Devise de la Société)
 DocType: Supplier Scorecard,Supplier Scorecard,Fiche d'Évaluation des Fournisseurs
-DocType: Plant Analysis,Result Datetime,Résultat Datetime
+DocType: Plant Analysis,Result Datetime,Date et heure du résultat
 ,Support Hour Distribution,Répartition des Heures de Support
 DocType: Maintenance Visit,Maintenance Visit,Visite d'Entretien
 DocType: Student,Leaving Certificate Number,Numéro de Certificat
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Détails de Memebership
 DocType: Leave Block List,Block Holidays on important days.,Bloquer les Vacances sur les jours importants.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Veuillez entrer toutes les valeurs de résultat requises
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Résumé des Comptes Débiteurs
-DocType: Employee Loan,Monthly Repayment Amount,Montant du Remboursement Mensuel
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Résumé des Comptes Débiteurs
+DocType: Loan,Monthly Repayment Amount,Montant du Remboursement Mensuel
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Ouverture des factures
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Veuillez définir le champ ID de l'Utilisateur dans un dossier Employé pour définir le Rôle de l’Employés
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Veuillez définir le champ ID de l'Utilisateur dans un dossier Employé pour définir le Rôle de l’Employés
 DocType: UOM,UOM Name,Nom UDM
 DocType: GST HSN Code,HSN Code,Code HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Montant de la Contribution
@@ -1959,10 +1965,10 @@
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Cet outil vous permet de mettre à jour ou de corriger la quantité et l'évaluation de stock dans le système. Il est généralement utilisé pour synchroniser les valeurs du système et ce qui existe réellement dans vos entrepôts.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En Toutes Lettres. Sera visible une fois que vous enregistrez le Bon de Livraison.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Données Webhook non vérifiées
+apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Données de Webhook non vérifiées
 DocType: Water Analysis,Container,Récipient
 apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Étudiant {0} - {1} apparaît Plusieurs fois dans la ligne {2} & {3}
-DocType: Item Alternative,Two-way,Deux voies
+DocType: Item Alternative,Two-way,A double-sens
 DocType: Project,Day to Send,Jour pour envoyer
 DocType: Healthcare Settings,Manage Sample Collection,Gestion des collections d'échantillons
 DocType: Production Plan,Ignore Existing Ordered Quantity,Ignorer la quantité commandée existante
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L'Utilisateur {0} est déjà affecté au Médecin {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Boîte
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Fournisseur Potentiel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Fournisseur Potentiel
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Répartition Mensuelle
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,La Liste de Destinataires est vide. Veuillez créer une Liste de Destinataires
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Santé (bêta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Pas d’Articles à emballer
 DocType: Shipping Rule Condition,From Value,De la Valeur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Quantité de Fabrication est obligatoire
-DocType: Employee Loan,Repayment Method,Méthode de Remboursement
+DocType: Loan,Repayment Method,Méthode de Remboursement
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si cochée, la page d'Accueil pour le site sera le Groupe d'Article par défaut"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Notes de frais de la société
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificat requis
 DocType: Company,Default Holiday List,Liste de Vacances par Défaut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Passif du Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Passif du Stock
 DocType: Purchase Invoice,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,N° de Portable du Contact
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Sélectionnez une entreprise
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Section impression
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,L&#39;utilisateur {0} n&#39;a aucun profil POS par défaut. Vérifiez par défaut à la ligne {1} pour cet utilisateur.
 DocType: Student Group,Set 0 for no limit,Définir à 0 pour aucune limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le(s) jour(s) pour le(s)quel(s) vous demandez un congé sont des jour(s) férié(s). Vous n’avez pas besoin d’effectuer de demande.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le(s) jour(s) pour le(s)quel(s) vous demandez un congé sont des jour(s) férié(s). Vous n’avez pas besoin d’effectuer de demande.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} est requis pour créer les factures {invoice_type} d&#39;ouverture
 DocType: Customer,Primary Address and Contact Detail,Adresse principale et coordonnées
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Email de Paiement
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Veuillez sélectionner au moins un domaine.
 DocType: Dependent Task,Dependent Task,Tâche Dépendante
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez de planifer des opérations X jours à l'avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter les Rappels d'Anniversaire
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
 DocType: SMS Center,Receiver List,Liste de Destinataires
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Rechercher Article
 DocType: Payment Schedule,Payment Amount,Montant du paiement
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,Échelle de Notation
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Déjà terminé
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock Existant
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock Existant
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importation Réussie !
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Demande de Paiement existe déjà {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût des Marchandises Vendues
@@ -2052,18 +2059,17 @@
 DocType: Quotation Item,Quotation Item,Article du Devis
 DocType: Customer,Customer POS Id,ID PDV du Client
 DocType: Account,Account Name,Nom du Compte
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,La Date Initiale ne peut pas être postérieure à la Date Finale
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,N° de série {0} quantité {1} ne peut pas être une fraction
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,La Date Initiale ne peut pas être postérieure à la Date Finale
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,N° de série {0} quantité {1} ne peut pas être une fraction
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Veuillez entrer l&#39;URL de Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Type de Fournisseur principal
 DocType: Purchase Order Item,Supplier Part Number,Numéro de Pièce du Fournisseur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
-DocType: Share Balance,To No,Pour Non
-DocType: Subscription,Reference Document,Document de Référence
+DocType: Share Balance,To No,Au N.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Controlleur du Crédit
-DocType: Grant Application,Applicant Type,Type de demandeur
-DocType: Purchase Invoice,03-Deficiency in services,03-Déficience dans les services
+DocType: Loan,Applicant Type,Type de demandeur
+DocType: Purchase Invoice,03-Deficiency in services,03-Carence dans les services
 DocType: Delivery Note,Vehicle Dispatch Date,Date d'Envoi du Véhicule
 DocType: Healthcare Settings,Default Medical Code Standard,Code Médical Standard par Défaut
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturé
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qté Réservées
 DocType: Party Account,Party Account,Compte de Tiers
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ressources Humaines
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ressources Humaines
 DocType: Lead,Upper Income,Revenu Élevé
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rejeter
 DocType: Journal Entry Account,Debit in Company Currency,Débit en Devise Société
 DocType: BOM Item,BOM Item,Article LDM
 DocType: Appraisal,For Employee,Employé
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Faire une Écriture de Décaissement
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Faire une Écriture de Décaissement
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ligne {0} : L’Avance du Fournisseur doit être un débit
 DocType: Company,Default Values,Valeurs Par Défaut
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (hors taxes)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de Prospects
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock disponible
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock disponible
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de Capacité Pendant (Jours)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvisionnement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Aucun des Articles n’a de changement en quantité ou en valeur.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Aucun des Articles n’a de changement en quantité ou en valeur.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Champ Obligatoire - Programme
 DocType: Special Test Template,Result Component,Composante de Résultat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Réclamation de Garantie
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Inclure les vacances dans les congés en tant que congés
 DocType: Sales Invoice,Packed Items,Articles Emballés
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Réclamation de Garantie pour le N° de Série.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Total'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Total'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activer Panier
 DocType: Employee,Permanent Address,Adresse Permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,Réglages de Vente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Confirmer l'Action
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Enchères en Ligne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Veuillez spécifier la Quantité, le Taux de Valorisation ou les deux"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Veuillez spécifier la Quantité, le Taux de Valorisation ou les deux"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Accomplissement
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Voir Panier
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Frais de Marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Frais de Marketing
 ,Item Shortage Report,Rapport de Rupture de Stock d'Article
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Impossible de créer des critères standard. Veuillez renommer les critères
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,Obtenir Modèle
 DocType: Material Request,Transferred,Transféré
 DocType: Vehicle,Doors,Portes
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Installation d'ERPNext Terminée!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Installation d'ERPNext Terminée!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Collecter les honoraires pour l'inscription des patients
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Impossible de modifier les attributs suite à des mouvements d'inventaire. Faites un nouvel article et transférez la quantité en main au nouvel article
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Impossible de modifier les attributs suite à des mouvements d'inventaire. Faites un nouvel article et transférez la quantité en main au nouvel article
 DocType: Course Assessment Criteria,Weightage,Poids
 DocType: Purchase Invoice,Tax Breakup,Répartition des Taxes
 DocType: Packing Slip,PS-,PS-
@@ -2212,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exportez le rapport et imprimez-le à l'aide d'un tableur.
 DocType: Purchase Invoice Item,Batch No,N° du Lot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Avances des employés
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs Commandes Clients pour un Bon de Commande d'un Client
 DocType: Student Group Instructor,Student Group Instructor,Instructeur de Groupe d'Étudiant
 DocType: Grant Application,Assessment  Mark (Out of 10),Note d&#39;évaluation (sur 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,N° du Mobile du Tuteur 1
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Employés HTML
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Le champ Opportunité De est obligatoire
 DocType: Email Digest,Annual Expenses,Charges Annuelles
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Faire un Bon de Commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Faire un Bon de Commande
 DocType: SMS Center,Send To,Envoyer À
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés pour les Congés de Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés pour les Congés de Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
 DocType: Sales Team,Contribution to Net Total,Contribution au Total Net
 DocType: Sales Invoice Item,Customer's Item Code,Code de l'Article du Client
 DocType: Stock Reconciliation,Stock Reconciliation,Réconciliation du Stock
 DocType: Territory,Territory Name,Nom de la Région
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,L'entrepôt des Travaux en Cours est nécessaire avant de Soumettre
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Vous ne pouvez avoir que des plans ayant le même cycle de facturation dans un abonnement
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidat à un Emploi.
 DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et Référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
@@ -2242,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,L'Écriture de Journal {0} n'a pas d'entrée non associée {1}
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Évaluation
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Événements de formation
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupliquer N° de Série pour l'Article {0}
-apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Suivre les pistes par source de plomb.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Dupliquer N° de Série pour l'Article {0}
+apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Suivre les prospects par sources
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une Règle de Livraison
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Veuillez entrer
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Veuillez entrer
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Journal de maintenance
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Veuillez définir un filtre basé sur l'Article ou l'Entrepôt
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (Calculé automatiquement comme la somme du poids net des articles)
@@ -2253,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,À Livrer et Facturer
 DocType: Student Group,Instructors,Instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Montant du Crédit dans la Devise du Compte
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,LDM {0} doit être soumise
-apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestion des partages
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,LDM {0} doit être soumise
+apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestion des actions
 DocType: Authorization Control,Authorization Control,Contrôle d'Autorisation
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ligne #{0} : Entrepôt de Rejet est obligatoire pour l’Article rejeté {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Paiement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Paiement
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","L'Entrepôt {0} n'est lié à aucun compte, veuillez mentionner ce compte dans la fiche de l'Entrepôt ou définir un compte d'Entrepôt par défaut dans la Société {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gérer vos commandes
 DocType: Work Order Operation,Actual Time and Cost,Temps et Coût Réels
@@ -2267,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,Demande de Congé d'Étudiant
 DocType: Item,Will also apply for variants,S'appliquera également pour les variantes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Sur
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Grouper les articles au moment de la vente.
@@ -2277,9 +2285,9 @@
 DocType: Item,Barcodes,Codes-barres
 DocType: Hub Category,Hub Node,Noeud du Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré un doublon. Veuillez rectifier et essayer à nouveau.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associé
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associé
 DocType: Asset Movement,Asset Movement,Mouvement d'Actif
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Le bon de travail {0} doit être soumis
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,L'ordre de travail {0} doit être soumis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nouveau Panier
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'article {0} n'est pas un Article avec un numéro de serie
 DocType: SMS Center,Create Receiver List,Créer une Liste de Réception
@@ -2295,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,La devise de facturation doit être égale à la devise de la société par défaut ou à la devise du compte du partenaire
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le paquet est une partie de cette livraison (Brouillons Seulement)
 DocType: Soil Texture,Loam,Terreau
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Ligne {0}: la date d&#39;échéance ne peut pas être antérieure à la date d&#39;envoi
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Ligne {0}: la date d&#39;échéance ne peut pas être antérieure à la date d&#39;envoi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Faire une Écriture de Paiement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
 ,Sales Invoice Trends,Tendances des Factures de Vente
 DocType: Leave Application,Apply / Approve Leaves,Appliquer / Approuver les Congés
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pour
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Peut se référer à ligne seulement si le type de charge est 'Montant de la ligne précedente' ou 'Total des lignes précedente'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Peut se référer à ligne seulement si le type de charge est 'Montant de la ligne précedente' ou 'Total des lignes précedente'
 DocType: Sales Order Item,Delivery Warehouse,Entrepôt de Livraison
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Arbre des Centres de Coûts financiers.
 DocType: Serial No,Delivery Document No,Numéro de Document de Livraison
@@ -2315,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,La consommation de matériau n&#39;est pas définie dans Paramètres de fabrication.
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossible de surfacturer pour l&#39;article {0} de la ligne {1} plus de {2}. Pour autoriser la surfacturation, veuillez définir les paramètres de stock."
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossible de surfacturer pour l&#39;article {0} de la ligne {1} plus de {2}. Pour autoriser la surfacturation, veuillez définir les paramètres de stock."
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Mettre à jour la Réponse
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Répartition Mensuelle
@@ -2326,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Sélectionnez d&#39;abord le programme
 DocType: Patient Appointment,Patient Age,Âge du patient
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Gestion de Projets
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Le numéro de série {0} a déjà été renvoyé
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Le numéro de série {0} a déjà été renvoyé
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de Biens ou Services.
 DocType: Budget,Fiscal Year,Exercice Fiscal
 DocType: Asset Maintenance Log,Planned,Prévu
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Comptes débiteurs par défaut à utiliser si non définis dans la fiche Patient pour enregistrer les honoraires de consultation.
 DocType: Vehicle Log,Fuel Price,Prix du Carburant
+DocType: Bank Guarantee,Margin Money,Marge d&#39;argent
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Définir comme ouvert
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
@@ -2345,16 +2353,16 @@
 DocType: Lead,Follow Up,Suivre
 DocType: Item,Is Sales Item,Est un Article à Vendre
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arborescence de Groupe d'Article
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'article {0} n'est pas configuré pour les Numéros de Série. Vérifiez la fiche de l'Article
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,L'article {0} n'est pas configuré pour les Numéros de Série. Vérifiez la fiche de l'Article
 DocType: Maintenance Visit,Maintenance Time,Temps d'Entretien
 ,Amount to Deliver,Nombre à Livrer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Le même objet a été saisi à plusieurs reprises. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Début de Terme ne peut pas être antérieure à la Date de Début de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Il y a eu des erreurs.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,L&#39;employé {0} a déjà postulé pour {1} entre {2} et {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Il y a eu des erreurs.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,L&#39;employé {0} a déjà postulé pour {1} entre {2} et {3}:
 DocType: Guardian,Guardian Interests,Part du Tuteur
 DocType: Naming Series,Current Value,Valeur actuelle
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice
 DocType: Education Settings,Instructor Records to be created by,Les Enregistrements de l'Instructeur seront créés par
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} créé
 DocType: GST Account,GST Account,Compte de TPS
@@ -2374,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Ajouté aux favoris
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Aucun bulletin de salaire ne peut être soumis pour les critères sélectionnés ci-dessus OU le bulletin de salaire déjà soumis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Droits de Douane et Taxes
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Aucun bulletin de salaire ne peut être soumis pour les critères sélectionnés ci-dessus OU le bulletin de salaire déjà soumis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Droits de Douane et Taxes
 DocType: Projects Settings,Projects Settings,Paramètres de projets
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Veuillez entrer la date de Référence
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} écritures de paiement ne peuvent pas être filtrées par {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arbre de Groupes d’Articles .
 DocType: Production Plan,Total Produced Qty,Quantité totale produite
 DocType: Payroll Entry,Get Employee Details,Obtenir les détails de l&#39;employé
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Impossible de se référer au numéro de la ligne supérieure ou égale au numéro de la ligne courante pour ce type de Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Impossible de se référer au numéro de la ligne supérieure ou égale au numéro de la ligne courante pour ce type de Charge
 DocType: Asset,Sold,Vendu
 ,Item-wise Purchase History,Historique d'Achats par Article
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Veuillez cliquer sur ‘Générer Calendrier’ pour récupérer le N° Série ajouté à l'article {0}
 DocType: Account,Frozen,Gelé
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de Base (Devise de la Société)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Matières premières
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Matières premières
 DocType: Payment Reconciliation Payment,Reference Row,Ligne de Référence
 DocType: Installation Note,Installation Time,Temps d'Installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Supprimer toutes les Transactions pour cette Société
 DocType: Patient,O Positive,O Positif
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investissements
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investissements
 DocType: Issue,Resolution Details,Détails de la Résolution
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Allocations
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critères d'Acceptation
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Veuillez entrer les Demandes de Matériel dans le tableau ci-dessus
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Aucun remboursement disponible pour la saisie de journal
 DocType: Item Attribute,Attribute Name,Nom de l'Attribut
 DocType: BOM,Show In Website,Afficher dans le Site Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Afficher la Quantité sur le Site
-DocType: Employee Loan Application,Total Payable Amount,Montant Total Créditeur
+DocType: Loan Application,Total Payable Amount,Montant Total Créditeur
 DocType: Task,Expected Time (in hours),Durée Prévue (en heures)
 DocType: Item Reorder,Check in (group),Enregistrement (groupe)
 DocType: Soil Texture,Silt,Limon
@@ -2418,13 +2427,13 @@
 DocType: Course,Default Grading Scale,Échelle de Notation par Défault
 DocType: Appraisal,For Employee Name,Nom de l'Employé
 DocType: Holiday List,Clear Table,Effacer le tableau
-DocType: Woocommerce Settings,Tax Account,Compte d&#39;impôt
+DocType: Woocommerce Settings,Tax Account,Compte de taxes
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +119,Available slots,Créneaux Disponibles
 DocType: C-Form Invoice Detail,Invoice No,No de Facture
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Faire un Paiement
 DocType: Room,Room Name,Nom de la Chambre
 DocType: Prescription Duration,Prescription Duration,Durée de la prescription
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être demandé / annulé avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être demandé / annulé avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
 DocType: Activity Cost,Costing Rate,Taux des Coûts
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adresses et Contacts des Clients
 ,Campaign Efficiency,Efficacité des Campagnes
@@ -2438,15 +2447,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montant Total de Facturation (via Feuille de Temps)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Revenus de Clients Récurrents
-DocType: Soil Texture,Silty Clay Loam,Silo Clay Loam
+DocType: Soil Texture,Silty Clay Loam,Limon argileux fin
 DocType: Chapter,Chapter,Chapitre
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Paire
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Le compte par défaut sera automatiquement mis à jour dans la facture de point de vente lorsque ce mode est sélectionné.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
 DocType: Asset,Depreciation Schedule,Calendrier d'Amortissement
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresses et Contacts des Partenaires de Vente
 DocType: Bank Reconciliation Detail,Against Account,Pour le Compte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,La Date de Demi-Journée doit être entre la Date de Début et la Date de Fin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,La Date de Demi-Journée doit être entre la Date de Début et la Date de Fin
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Veuillez définir le Centre de coûts par défaut dans la société {0}.
 DocType: Item,Has Batch No,A un Numéro de Lot
@@ -2464,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps)
 DocType: Soil Texture,Soil Type,Le type de sol
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nouveau Message
 ,Quotation Trends,Tendances des Devis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Le Groupe d'Articles n'est pas mentionné dans la fiche de l'article pour l'article {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandat GoCardless
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,Catégorie du Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numéro de Véhicule
-DocType: Employee Loan,Loan Amount,Montant du Prêt
+DocType: Loan,Loan Amount,Montant du Prêt
 DocType: Student Report Generation Tool,Add Letterhead,Ajouter un en-tête
 DocType: Program Enrollment,Self-Driving Vehicle,Véhicule Autonome
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Classement de la Fiche d'Évaluation Fournisseur
@@ -2492,7 +2500,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Le Total des feuilles attribuées {0} ne peut pas être inférieur aux feuilles déjà approuvées {1} pour la période
 DocType: Journal Entry,Accounts Receivable,Comptes Débiteurs
 ,Supplier-Wise Sales Analytics,Analyse des Ventes par Fournisseur
-DocType: Purchase Invoice,Availed ITC Central Tax,Taxe centrale ITC supprimée
+DocType: Purchase Invoice,Availed ITC Central Tax,Taxe centrale ITC utilisée
 DocType: Salary Structure,Select employees for current Salary Structure,Sélectionner les Employés pour la Grille de Salaire actuelle
 DocType: Sales Invoice,Company Address Name,Nom de l'Adresse de la Société
 DocType: Work Order,Use Multi-Level BOM,Utiliser LDM à Plusieurs Niveaux
@@ -2512,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,Position
 DocType: Patient,Patient Details,Détails du patient
 DocType: Patient,B Positive,B Positif
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 DocType: Patient Medical Record,Patient Medical Record,Registre médical du patient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groupe vers Non-Groupe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportif
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Réel
 DocType: Lab Test UOM,Test UOM,UDM de Test
 DocType: Student Siblings,Student Siblings,Frères et Sœurs de l'Étudiants
+DocType: Subscription Plan Detail,Subscription Plan Detail,Détail du plan d&#39;abonnement
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unité
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Veuillez spécifier la Société
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Veuillez spécifier la Société
 ,Customer Acquisition and Loyalty,Acquisition et Fidélisation des Clients
 DocType: Asset Maintenance Task,Maintenance Task,Tâche de maintenance
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Veuillez définir la limite B2C dans les paramètres GST.
@@ -2535,8 +2544,9 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
 ,BOM Search,Recherche LDM
-DocType: Project,Total Consumed Material Cost  (via Stock Entry),Coût total du matériel consommé (via la saisie des stocks)
+DocType: Project,Total Consumed Material Cost  (via Stock Entry),Coût total du matériel consommé (via écriture de stock)
 DocType: Hub Settings,Company Registered,Société enregistrée
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,"À ce jour, ne peut être inférieur à la date de début"
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publier ""En Stock"" ou ""Pas en Stock"" sur le Hub sur la base du stock disponible dans cet entrepôt."
 DocType: Vehicle,Fuel Type,Type de Carburant
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Veuillez spécifier la devise de la Société
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Solde du stock dans le Lot {0} deviendra négatif {1} pour l'Article {2} à l'Entrepôt {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Les Demandes de Matériel suivantes ont été créées automatiquement sur la base du niveau de réapprovisionnement de l’Article
 DocType: Email Digest,Pending Sales Orders,Commandes Client en Attente
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
 DocType: Employee,Create User Permission,Créer une autorisation utilisateur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Groupe de produits&gt; Marque
 DocType: Healthcare Settings,Remind Before,Rappeler Avant
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Facteur de conversion de l'UDM est obligatoire dans la ligne {0}
 DocType: Production Plan Item,material_request_item,article_demande_de_materiel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
 DocType: Salary Component,Deduction,Déduction
 DocType: Item,Retain Sample,Conserver l&#39;échantillon
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ligne {0} : Heure de Début et Heure de Fin obligatoires.
 DocType: Stock Reconciliation Item,Amount Difference,Différence de Montant
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Veuillez entrer l’ID Employé de ce commercial
 DocType: Territory,Classification of Customers by region,Classification des Clients par région
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,En production
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Solde Calculé du Relevé Bancaire
 DocType: Normal Test Template,Normal Test Template,Modèle de Test Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Utilisateur Désactivé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Devis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Impossible de lier une Réponse à Appel d'Offres reçue à Aucun Devis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Devis
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Impossible de lier une Réponse à Appel d'Offres reçue à Aucun Devis
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Déduction Totale
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Sélectionnez un compte à imprimer dans la devise du compte
@@ -2573,27 +2584,28 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ceci est basé sur les transactions de ce patient. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Coût Mise à Jour
 DocType: Patient,Date of Birth,Date de Naissance
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,L'article {0} a déjà été retourné
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,L'article {0} a déjà été retourné
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Exercice** représente un Exercice Financier. Toutes les écritures comptables et autres transactions majeures sont suivis en **Exercice**.
 DocType: Opportunity,Customer / Lead Address,Adresse du Client / Prospect
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuration de la Fiche d'Évaluation Fournisseur
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nom du Plan d'Évaluation
-DocType: Work Order Operation,Work Order Operation,Opération de commande de travail
+DocType: Work Order Operation,Work Order Operation,Opération d'ordre de travail
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
 DocType: Work Order Operation,Actual Operation Time,Temps d'Exploitation Réel
 DocType: Authorization Rule,Applicable To (User),Applicable À (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Description de l'Emploi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Description de l'Emploi
 DocType: Student Applicant,Applied,Appliqué
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Ré-ouvrir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Ré-ouvrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qté par UDM du Stock
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nom du Tuteur 2
-DocType: Purchase Invoice,02-Post Sale Discount,Remise de vente 02-Post
+DocType: Purchase Invoice,02-Post Sale Discount,02-Remise
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Les caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" ne sont pas autorisés dans le nommage des séries"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une Trace des Campagnes de Vente. Garder une trace des Prospects, Devis, Commandes Client etc. depuis les Campagnes pour mesurer le Retour sur Investissement."
+DocType: Department Approver,Approver,Approbateur
 ,SO Qty,SO Qté
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Le champ Destinataire ne peut pas être vide
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Le champ 'A l'actionnaire' ne peut pas être vide
 DocType: Guardian,Work Address,Adresse du Bureau
 DocType: Appraisal,Calculate Total Score,Calculer le Résultat Total
 DocType: Health Insurance,Health Insurance,Assurance santé
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montant Total Alloué (Devise Société)
 DocType: Purchase Order Item,To be delivered to customer,À livrer à la clientèle
 DocType: BOM,Scrap Material Cost,Coût de Mise au Rebut des Matériaux
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,N° de Série {0} ne fait partie de aucun Entrepôt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,N° de Série {0} ne fait partie de aucun Entrepôt
 DocType: Grant Application,Email Notification Sent,Notification par e-mail envoyée
 DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise Société)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Le code d&#39;article, l&#39;entrepôt, la quantité sont requis sur la rangée"
-DocType: Pricing Rule,Supplier,Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Le code d&#39;article, l&#39;entrepôt, la quantité sont requis sur la rangée"
+DocType: Bank Guarantee,Supplier,Fournisseur
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Afficher les détails du paiement
 DocType: Consultation,Consultation Time,Durée de Consultation
 DocType: C-Form,Quarter,Trimestre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Charges Diverses
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Charges Diverses
 DocType: Global Defaults,Default Company,Société par Défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Compte de Charge et d'Écarts est obligatoire pour objet {0} car il impacte la valeur globale des actions
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nom de la Banque
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Au-dessus
-DocType: Employee Loan,Employee Loan Account,Compte de Prêt d'un Employé
 DocType: Leave Application,Total Leave Days,Total des Jours de Congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque : Email ne sera pas envoyé aux utilisateurs désactivés
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d'Interactions
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Poids (En Kilogramme)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chapitres / nom_chapitre laisser vide automatiquement défini après l'enregistrement du chapitre.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Veuillez définir les comptes de TPS dans les paramètres de la TPS
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Veuillez définir les comptes de TPS dans les paramètres de la TPS
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Type de commerce
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Veuillez sélectionner le Montant Alloué, le Type de Facture et le Numéro de Facture dans au moins une ligne"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Coût du Nouvel Achat
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,Description de la subvention
 DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Devise Société)
 DocType: Student Guardian,Others,Autres
+DocType: Subscription,Discounts,Réductions
 DocType: Payment Entry,Unallocated Amount,Montant Non Alloué
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. Veuillez sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Taxes et Frais
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un Produit ou un Service qui est acheté, vendu ou conservé en stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Pas de mise à jour supplémentaire
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Impossible de sélectionner le type de charge comme étant «Le Montant de la Ligne Précédente» ou «Montant Total de la Ligne Précédente» pour la première ligne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Impossible de sélectionner le type de charge comme étant «Le Montant de la Ligne Précédente» ou «Montant Total de la Ligne Précédente» pour la première ligne
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Cela couvre toutes les fiches d'Évaluation liées à cette Configuration
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Le sous-article ne doit pas être un ensemble de produit. S'il vous plaît retirer l'article `{0}` et sauver
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banque
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,Poste de Service
 DocType: Bank Guarantee,Bank Guarantee,Garantie Bancaire
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Veuillez cliquer sur ‘Générer Calendrier’ pour obtenir le calendrier
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numéros pour la présence via Setup&gt; Série de numéros
 DocType: Bin,Ordered Quantity,Quantité Commandée
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","e.g. ""Construire des outils pour les constructeurs"""
 DocType: Grading Scale,Grading Scale Intervals,Intervalles de l'Échelle de Notation
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Bénéfice pour l&#39;année
+DocType: Bank Guarantee,Name of Bank,Nom de la banque
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} : L’Écriture Comptable pour {2} peut seulement être faite en devise: {3}
 DocType: Fee Schedule,In Process,En Cours
 DocType: Authorization Rule,Itemwise Discount,Remise par Article
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Arbre des comptes financiers.
+DocType: Bank Guarantee,Reference Document Type,Référence Type de document
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cartographie des flux de trésorerie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} pour la Commande Client {1}
 DocType: Account,Fixed Asset,Actif Immobilisé
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventaire Sérialisé
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email non trouvé dans le contact par défaut
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Générer un secret
-DocType: Employee Loan,Account Info,Information du Compte
+DocType: Loan,Account Info,Information du Compte
 DocType: Activity Type,Default Billing Rate,Prix de Facturation par Défaut
 DocType: Fees,Include Payment,Inclure le Paiement
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Groupes d'Étudiants créés.
 DocType: Sales Invoice,Total Billing Amount,Montant Total de Facturation
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Le programme dans la structure des frais et le groupe d&#39;étudiants {0} sont différents.
 DocType: Fee Schedule,Receivable Account,Compte Débiteur
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde du Stock
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,De la Commande Client au Paiement
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,PDG
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,PDG
 DocType: Purchase Invoice,With Payment of Tax,Avec Paiement de Taxe
 DocType: Expense Claim Detail,Expense Claim Detail,Détail de la Note de Frais
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICAT POUR LE FOURNISSEUR
 DocType: Land Unit,Is Container,Est le conteneur
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ce sera le jour 1 du cycle de la culture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Veuillez sélectionner un compte correct
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Veuillez sélectionner un compte correct
 DocType: Purchase Invoice Item,Weight UOM,UDM de Poids
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Liste des actionnaires disponibles avec numéros de folio
 DocType: Salary Structure Employee,Salary Structure Employee,Grille des Salaires des Employés
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Afficher les attributs de variante
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Afficher les attributs de variante
 DocType: Student,Blood Group,Groupe Sanguin
 DocType: Course,Course Name,Nom du Cours
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes de congé d'un employé en particulier
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Équipements de Bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Équipements de Bureau
 DocType: Purchase Invoice Item,Qty,Qté
 DocType: Fiscal Year,Companies,Sociétés
 DocType: Supplier Scorecard,Scoring Setup,Paramétrage de la Notation
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,Valeur Entrante Totale
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Compte de Débit Requis
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste des Prix d'Achat
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Liste des Prix d'Achat
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modèles des Variables de  Fiche d'Évaluation Fournisseur.
 DocType: Job Offer Term,Offer Term,Terme de la Proposition
 DocType: Asset,Quality Manager,Responsable Qualité
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total des Impayés : {0}
 DocType: BOM Website Operation,BOM Website Operation,Opération de LDM du Site Internet
 DocType: Supplier Scorecard,Supplier Score,Note du Fournisseur
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Mnt Total Facturé
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Mnt Total Facturé
 DocType: Supplier,Warn RFQs,Avertir lors des Appels d'Offres
 DocType: BOM,Conversion Rate,Taux de Conversion
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Recherche de Produit
 DocType: Assessment Plan,To Time,Horaire de Fin
 DocType: Authorization Rule,Approving Role (above authorized value),Rôle Approbateur (valeurs autorisées ci-dessus)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Le compte À Créditer doit être un compte Créditeur
+DocType: Loan,Total Amount Paid,Montant total payé
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Veuillez sélectionner obligatoirement une Admission d'Étudiant pour la candidature étudiante payée
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Répétition LDM : {0} ne peut pas être parent ou enfant de {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Veuillez sélectionner une liste de prix pour publier les prix
@@ -2741,19 +2757,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La Liste de Prix {0} est désactivée
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ligne {0} : Qté Complétée ne peut pas être supérieure à {1} pour l’opération {2}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser les Heures Supplémentaires
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L'Article Sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, veuillez utiliser l'entrée de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L'Article Sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, veuillez utiliser l'entrée de stock"
 DocType: Training Event Employee,Training Event Employee,Évènement de Formation – Employé
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximum d&#39;échantillons - {0} peut être conservé pour le lot {1} et l&#39;article {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Ajouter des Créneaux
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous en avez fourni {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous en avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taux de Valorisation Actuel
 DocType: Training Event,Advance,Avance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pour que le document soit à nouveau un document récurrent.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Paramètres de la passerelle de paiement GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Profits / Pertes sur Change
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Profits / Pertes sur Change
 DocType: Opportunity,Lost Reason,Raison de la Perte
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Ligne # {0}: le compte {1} n&#39;appartient pas à la société {2}
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Impossible de trouver DocType {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Ligne # {0}: le compte {1} n&#39;appartient pas à la société {2}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Impossible de trouver le DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nouvelle Adresse
 DocType: Quality Inspection,Sample Size,Taille de l'Échantillon
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Veuillez entrer le Document de Réception
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,Quantité Réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple : Livraison le Jour Suivant
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,N° de Série {0} introuvable
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},L&#39;abonnement a été {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programme de planification des honoraires
 DocType: Fee Schedule Program,Student Batch,Lot d'Étudiants
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Créer un Étudiant
@@ -2786,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,GSTIN E-commerce
 DocType: Sales Order,Not Delivered,Non Livré
 ,Bank Clearance Summary,Bilan des Compensations Bancaires
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
 DocType: Appraisal Goal,Appraisal Goal,Objectif d'Estimation
-apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Suggérer une catégorie?
+apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Suggérer une catégorie ?
 DocType: Stock Reconciliation Item,Current Amount,Montant Actuel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Bâtiments
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Bâtiments
 DocType: Fee Schedule,Fee Structure,Structure d'Honoraires
 DocType: Timesheet Detail,Costing Amount,Montant des Coûts
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Student Admission Program,Application Fee,Frais de Dossier
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Soumettre la Fiche de Paie
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1} %
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
 DocType: SMS Log,Sender Name,Nom de l'Expéditeur
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Critères d&#39;analyse de l&#39;agriculture
+DocType: HR Settings,Leave Approval Notification Template,Modèle de notification d&#39;approbation
 DocType: POS Profile,[Select],[Choisir]
 DocType: Vital Signs,Blood Pressure (diastolic),Pression Artérielle (Diastolique)
 DocType: SMS Log,Sent To,Envoyé À
 DocType: Agriculture Task,Holiday Management,Gestion des vacances
 DocType: Payment Request,Make Sales Invoice,Faire des Factures de Vente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
 DocType: Company,For Reference Only.,Pour Référence Seulement.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Le médecin {0} n'est pas disponible le {1}
@@ -2824,7 +2838,7 @@
 DocType: Employee,New Workplace,Nouveau Lieu de Travail
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Consommation matérielle
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Définir comme Fermé
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Aucun Article avec le Code Barre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Aucun Article avec le Code Barre {0}
 DocType: Normal Test Items,Require Result Value,Nécessite la Valeur du Résultat
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Listes de Matériaux
@@ -2839,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Aucune Structure de Salaire active ou par défaut trouvée pour employé {0} pour les dates données
 DocType: Leave Block List,Allow Users,Autoriser les Utilisateurs
 DocType: Purchase Order,Customer Mobile No,N° de Portable du Client
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Récurrent
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Détails du modèle de mappage de flux de trésorerie
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Gestion des prêts
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Suivre séparément les Produits et Charges pour les gammes de produits.
 DocType: Rename Tool,Rename Tool,Outil de Renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Mettre à jour le Coût
 DocType: Item Reorder,Item Reorder,Réorganiser les Articles
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Afficher la Fiche de Salaire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfert de Matériel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Afficher la Fiche de Salaire
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfert de Matériel
 DocType: Fees,Send Payment Request,Envoyer une Demande de Paiement
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spécifier les opérations, le coût d'exploitation et donner un N° d'Opération unique à vos opérations."
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Sélectionner le compte de change
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,La dette d&#39;impôt sur le revenu
 DocType: Grading Scale Interval,Grade Description,Description de la Note
 DocType: Stock Entry,Purchase Receipt No,N° du Reçu d'Achat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Arrhes
 DocType: Sales Invoice, Shipping Bill Number,Numéro de facture d&#39;expédition
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traçabilité
 DocType: Asset Maintenance Log,Actions performed,Actions réalisées
 DocType: Cash Flow Mapper,Section Leader,Chef de section
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Source des Fonds (Passif)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Source des Fonds (Passif)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantité à la ligne {0} ({1}) doit être égale a la quantité fabriquée {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Employé
+DocType: Bank Guarantee,Fixed Deposit Number,Numéro de dépôt fixe
 DocType: Asset Repair,Failure Date,Date d&#39;échec
 DocType: Sample Collection,Collected Time,Heure de Collecte
 DocType: Company,Sales Monthly History,Historique des Ventes Mensuel
@@ -2890,20 +2905,21 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Êtes-vous sûr de vouloir annuler ce rendez-vous?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Forfait de prix de chambre d&#39;hôtel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline de Ventes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Veuillez définir le compte par défaut dans la Composante Salariale {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Veuillez définir le compte par défaut dans la Composante Salariale {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requis Pour
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Veuillez sélectionnez une LDM pour l’Article à la Ligne {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Récupérer les mises à jour des abonnements
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Le Compte {0} ne correspond pas à la Société {1} dans le Mode de Compte : {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},La LDM {0} spécifiée n'existe pas pour l'Article {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Cours:
-DocType: Soil Texture,Sandy Loam,terreau arigileux
+DocType: Soil Texture,Sandy Loam,Limon sableux
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,L'Échéancier d'Entretien {0} doit être annulé avant d'annuler cette Commande Client
 DocType: POS Profile,Applicable for Users,Applicable aux Utilisateurs
 DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Aucun ordre de travail créé
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Fiche de Paie de l'employé {0} déjà créée pour cette période
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutique
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutique
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des Articles Achetés
 DocType: Selling Settings,Sales Order Required,Commande Client Requise
 DocType: Purchase Invoice,Credit To,À Créditer
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,Aucun Devis
 DocType: Warranty Claim,Raised By,Créé par
 DocType: Payment Gateway Account,Payment Account,Compte de Paiement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Variation Nette des Comptes Débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Congé Compensatoire
 DocType: Job Offer,Accepted,Accepté
@@ -2933,17 +2949,17 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Veuillez vous assurer que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base resteront intactes. Cette action ne peut être annulée.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Résultats de la Recherche
 DocType: Room,Room Number,Numéro de la Chambre
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Référence invalide {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Référence invalide {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Étiquette de la Règle de Livraison
 DocType: Journal Entry Account,Payroll Entry,Entrée de la paie
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Voir les dossiers de frais
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Voir les honoraires
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Créer un modèle d&#39;imposition
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
 DocType: Lab Test Sample,Lab Test Sample,Échantillon de test de laboratoire
-DocType: Item Variant Settings,Allow Rename Attribute Value,Autoriser la modification de la valeur de l&#39;attribut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Écriture Rapide dans le Journal
+DocType: Item Variant Settings,Allow Rename Attribute Value,Autoriser le renommage de la valeur de l'attribut
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Écriture Rapide dans le Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si la LDM est mentionnée pour un article
 DocType: Restaurant,Invoice Series Prefix,Préfixe de la Série de Factures
 DocType: Employee,Previous Work Experience,Expérience de Travail Antérieure
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Veuillez entrer la Qté Planifiée pour l'Article {0} à la ligne {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,L&#39;intégration de Google Maps n&#39;est pas activée
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} n'a pas été soumis
+DocType: Subscription,Trialling,Essai
 DocType: Member,Membership Expiry Date,Date d&#39;expiration de l&#39;adhésion
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} doit être négatif dans le document de retour
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} doit être négatif dans le document de retour
 ,Minutes to First Response for Issues,Minutes avant la Première Réponse aux Questions
 DocType: Purchase Invoice,Terms and Conditions1,Termes et Conditions
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Le nom de l'institut pour lequel vous configurez ce système.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unité de Mesure
 DocType: Fiscal Year,Year End Date,Date de Fin de l'Exercice
 DocType: Task Depends On,Task Depends On,Tâche Dépend De
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Opportunité
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Opportunité
 DocType: Operation,Default Workstation,Station de Travail par Défaut
 DocType: Notification Control,Expense Claim Approved Message,Message d'une Note de Frais Approuvée
 DocType: Payment Entry,Deductions or Loss,Déductions ou Perte
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Congé sans solde ne correspond pas aux Feuilles de Demandes de Congé Approuvées
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines Étapes
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Faire une Facture
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Solde restant
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Le code à barres {0} n&#39;est pas un code {1} valide
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Année de Fin
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Devis / Prospects %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
 DocType: Driver,Driver,Chauffeur
 DocType: Vital Signs,Nutrition Values,Valeurs Nutritionnelles
 DocType: Lab Test Template,Is billable,Est facturable
@@ -3029,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Date de Début Réelle (via la feuille de temps)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ceci est un exemple de site généré automatiquement à partir d’ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Balance Agée 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Le montant total de l&#39;avance ne peut être supérieur au montant total réclamé
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Le montant total de l&#39;avance ne peut être supérieur au montant total réclamé
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3079,12 +3096,12 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantité Reçue
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},Archive d'Honoraires Créée - {0}
 DocType: Asset Category Account,Asset Category Account,Compte de Catégorie d'Actif
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Table de paiement): Le montant doit être positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Row #{0} (Payment Table): Amount must be positive,Ligne #{0} (Table de paiement): Le montant doit être positif
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteNum,CompteNum
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Impossible de produire plus d'Article {0} que la quantité {1} du Bon de Commande
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Sélectionner les valeurs d&#39;attribut
-DocType: Purchase Invoice,Reason For Issuing document,Raison de l&#39;émission du document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Écriture de Stock {0} n'est pas soumise
+DocType: Purchase Invoice,Reason For Issuing document,Motif de l'émission du document
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Écriture de Stock {0} n'est pas soumise
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancaire / de Caisse
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Prochain Contact Par ne peut être identique à l’Adresse Email du Prospect
 DocType: Tax Rule,Billing City,Ville de Facturation
@@ -3095,13 +3112,14 @@
 apps/erpnext/erpnext/config/accounts.py +330,"e.g. Bank, Cash, Credit Card","e.g. Cash, Banque, Carte de crédit"
 DocType: Lead Source,Source Name,Nom de la Source
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La tension artérielle normale chez un adulte est d&#39;environ 120 mmHg systolique et 80 mmHg diastolique, abrégé &quot;120/80 mmHg&quot;"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +119,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life","Définissez la durée de conservation des éléments en jours, pour définir l&#39;expiration en fonction de la date de fabrication et de la vie autonome"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +119,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life","Définissez la durée de conservation des articles en jours, pour définir l'expiration en fonction de la date de fabrication et de la vie de l'article"
 DocType: Journal Entry,Credit Note,Note de Crédit
 DocType: Projects Settings,Ignore Employee Time Overlap,Ignorer le chevauchement de temps des employés
 DocType: Warranty Claim,Service Address,Adresse du Service
 DocType: Asset Maintenance Task,Calibration,Étalonnage
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} est un jour férié en entreprise
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Meubles et Accessoires
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} est un jour férié pour la société
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Quitter la notification d&#39;état
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Meubles et Accessoires
 DocType: Item,Manufacture,Fabrication
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Configurer la Société
 ,Lab Test Report,Rapport de test de laboratoire
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,Zone de plantation
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
 DocType: Installation Note Item,Installed Qty,Qté Installée
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Cela pourrait être dû à certaines adresses de messagerie invalides dans le
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Vous avez ajouté
 DocType: Purchase Taxes and Charges,Parenttype,Type Parent
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Résultat de la Formation
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,Produits par page
 DocType: Stock Ledger Entry,Outgoing Rate,Taux Sortant
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisation principale des branches.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ou
 DocType: Sales Order,Billing Status,Statut de la Facturation
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Signaler un Problème
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Frais de Services d'Utilité Publique
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Frais de Services d'Utilité Publique
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Dessus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ligne #{0} : L’Écriture de Journal {1} n'a pas le compte {2} ou est déjà réconciliée avec une autre référence
 DocType: Supplier Scorecard Criteria,Criteria Weight,Pondération du Critère
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Quitter la notification d&#39;approbation
 DocType: Buying Settings,Default Buying Price List,Liste des Prix d'Achat par Défaut
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Fiche de Paie basée sur la Feuille de Temps
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Prix d'achat
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Prix d'achat
 DocType: Notification Control,Sales Order Message,Message de la Commande Client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Définir les Valeurs par Défaut comme : Societé, Devise, Exercice Actuel, etc..."
 DocType: Payment Entry,Payment Type,Type de Paiement
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Paramètres du Panier
 DocType: Journal Entry,Accounting Entries,Écritures Comptables
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la règle de tarification sélectionnée est définie pour «Taux», elle écrase la liste de prix. Le taux de la règle de tarification est le taux final, donc aucune autre réduction ne doit être appliquée. Par conséquent, dans les transactions telles que la commande client, la commande d&#39;achat, etc., elle sera récupérée dans le champ &quot;Taux&quot;, plutôt que dans le champ &quot;Tarif liste de prix&quot;."
+DocType: Journal Entry,Paid Loan,Prêt payé
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Écriture en double. Merci de vérifier la Règle d’Autorisation {0}
 DocType: Journal Entry Account,Reference Due Date,Date d&#39;échéance de référence
 DocType: Purchase Order,Ref SQ,Réf SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',L'Échéancier d'Entretien n'est pas créé pour tous les articles. Veuillez clicker sur 'Créer un Échéancier'
 ,To Produce,À Produire
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Paie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'Article, les lignes {3} doivent également être incluses"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'Article, les lignes {3} doivent également être incluses"
 DocType: Patient Service Unit,Parent Service Unit,Unité de service parentale
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Créer un Utilisateur
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l'emballage pour la livraison (pour l'impression)
@@ -3192,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Compte de Produits
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Livraison
 DocType: Volunteer,Weekdays,Jours de la semaine
 DocType: Stock Reconciliation Item,Current Qty,Qté Actuelle
 DocType: Restaurant Menu,Restaurant Menu,Le menu du restaurant
@@ -3200,18 +3219,19 @@
 DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
 DocType: Payment Entry,Total Allocated Amount,Montant Total Alloué
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel
 DocType: Item Reorder,Material Request Type,Type de Demande de Matériel
-apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Envoyer un avis de demande de subvention
+apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Envoyer un email d'examen de la demande de subvention
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Le Stockage Local est plein, sauvegarde impossible"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row {0}: UOM Conversion Factor is mandatory,Ligne {0} : Facteur de Conversion LDM est obligatoire
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Capacité de la Salle
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},L&#39;enregistrement existe déjà pour l&#39;élément {0}
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},L'enregistrement existe déjà pour l'article {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Réf
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Vous perdrez des enregistrements de factures précédemment générées. Êtes-vous sûr de vouloir redémarrer cet abonnement?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Frais d'Inscription
 DocType: Budget,Cost Center,Centre de Coûts
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Référence #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Référence #
 DocType: Notification Control,Purchase Order Message,Message du Bon de Commande
 DocType: Tax Rule,Shipping Country,Pays de Livraison
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Cacher le N° de TVA du Client des Transactions de Vente
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La Règle de Tarification est faite pour remplacer la Liste de Prix / définir le pourcentage de remise, sur la base de certains critères."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,L'entrepôt ne peut être modifié que via Écriture de Stock / Bon de Livraison / Reçu d'Achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Responsable du Marketing et des Ventes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Responsable du Marketing et des Ventes
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Impôt sur le Revenu
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Suivre les Prospects par Type d'Industrie
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Aller aux papiers à en-tête
+DocType: Subscription,Cancel At End Of Period,Annuler à la fin de la période
 DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Aucun élément sélectionné pour le transfert
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Aucun élément sélectionné pour le transfert
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les Adresses.
 DocType: Company,Stock Settings,Réglages de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La combinaison est possible seulement si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, Type de Racine, Société"
 DocType: Vehicle,Electric,Électrique
 DocType: Task,% Progress,% de Progression
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Gain/Perte sur Cessions des Immobilisations
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Gain/Perte sur Cessions des Immobilisations
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Seul le candidat étudiant avec le statut «Approuvé» sera sélectionné dans le tableau ci-dessous.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Le numéro de compte du compte {0} n'est pas disponible. <br> Veuillez configurer votre plan de comptes correctement.
 DocType: Task,Depends on Tasks,Dépend des Tâches
@@ -3248,10 +3269,11 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,En Rupture de Stock
 DocType: Volunteer,Volunteer Skills,Compétences bénévoles
 DocType: Appraisal,HR User,Chargé RH
+DocType: Bank Guarantee,Reference Document Name,Nom du document de référence
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et Frais Déductibles
 apps/erpnext/erpnext/hooks.py +142,Issues,Questions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Le statut doit être l'un des {0}
-apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +64,Reminder to update GSTIN Sent,Rappel pour mettre à jour GSTIN Sent
+apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +64,Reminder to update GSTIN Sent,Rappel pour mettre à jour GSTIN envoyé
 DocType: Sales Invoice,Debit To,Débit Pour
 DocType: Restaurant Menu Item,Restaurant Menu Item,Élément de menu du restaurant
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les échantillons.
@@ -3261,22 +3283,23 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de Facturation
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
+DocType: Loan,Loan Application,Demande de prêt
 DocType: Crop,Scientific Name,Nom scientifique
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Total des Congés
-DocType: Customer,"Reselect, if the chosen contact is edited after save","Resélectionner, si le contact choisi est édité après sauvegarde"
+DocType: Customer,"Reselect, if the chosen contact is edited after save","Re-sélectionner, si le contact choisi est édité après l'enregistrement"
 DocType: Consultation,In print,Sur impression
 ,Profit and Loss Statement,Compte de Résultat
 DocType: Bank Reconciliation Detail,Cheque Number,Numéro de Chèque
 ,Sales Browser,Navigateur des Ventes
 DocType: Journal Entry,Total Credit,Total Crédit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Attention : Un autre {0} {1} # existe pour l'écriture de stock {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Attention : Un autre {0} {1} # existe pour l'écriture de stock {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et Avances (Actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Grand
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Grand
 DocType: Homepage Featured Product,Homepage Featured Product,Produit Présenté sur la Page d'Accueil
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Tous les Groupes d'Évaluation
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Tous les Groupes d'Évaluation
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nouveau Nom d'Entrepôt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Région
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,Honoraires
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifier le Taux de Change pour convertir une monnaie en une autre
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Devis {0} est annulée
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Encours Total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Encours Total
 DocType: Sales Partner,Targets,Cibles
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Veuillez enregistrer le numéro SIREN dans le fichier d&#39;information de l&#39;entreprise
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Price List,Price List Master,Données de Base des Listes de Prix
 DocType: GST Account,CESS Account,Compte CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les Transactions de Vente peuvent être assignées à plusieurs **Commerciaux** pour configurer et surveiller les objectifs.
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Sélectionnez le Patient
 DocType: Price List,Applicable for Countries,Applicable pour les Pays
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nom du Paramètre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seules les Demandes de Congés avec le statut 'Appouvée' ou 'Rejetée' peuvent être soumises
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Nom du Groupe d'Étudiant est obligatoire dans la ligne {0}
 DocType: Homepage,Products to be shown on website homepage,Produits destinés à être affichés sur la page d’accueil du site web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,C’est un groupe de clients racine qui ne peut être modifié.
@@ -3352,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Facture déjà créée pour toutes les heures de facturation
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Erreur de Nom: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Le coût financier
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,La présence de l'employé {0} est déjà marquée
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,La présence de l'employé {0} est déjà marquée
 DocType: Packing Slip,If more than one package of the same type (for print),Si plus d'un paquet du même type (pour l'impression)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Veuillez définir le client par défaut dans les paramètres du restaurant
 ,Salary Register,Registre du Salaire
 DocType: Warehouse,Parent Warehouse,Entrepôt Parent
-DocType: C-Form Invoice Detail,Net Total,Total Net
+DocType: Subscription,Net Total,Total Net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},La LDM par défaut n'a pas été trouvée pour l'Article {0} et le Projet {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Définir différents types de prêts
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Définir différents types de prêts
 DocType: Bin,FCFS Rate,Montant PAPS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Montant dû
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en min)
@@ -3373,7 +3398,7 @@
 DocType: Account,Round Off,Arrondi
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +263,Quantity must be positive,La quantité doit être positive
 DocType: Material Request Plan Item,Requested Qty,Qté Demandée
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +96,The fields From Shareholder and To Shareholder cannot be blank,Les champs De l&#39;actionnaire et de l&#39;actionnaire ne peuvent pas être vides
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +96,The fields From Shareholder and To Shareholder cannot be blank,Les champs 'De l'actionnaire' et 'A l'actionnaire' ne peuvent pas être vides
 DocType: Tax Rule,Use for Shopping Cart,Utiliser pour le Panier
 apps/erpnext/erpnext/controllers/item_variant.py +101,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},La Valeur {0} pour l'Attribut {1} n'existe pas dans la liste des Valeurs d'Attribut d’Article valides pour l’Article {2}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +79,Select Serial Numbers,Sélectionnez les Numéros de Série
@@ -3391,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Le Compte Racine doit être un groupe
 DocType: Drug Prescription,Drug Prescription,Prescription Médicale
 DocType: Fees,FEE.,HONORAIRES.
-DocType: Employee Loan,Repaid/Closed,Remboursé / Fermé
+DocType: Loan,Repaid/Closed,Remboursé / Fermé
 DocType: Item,Total Projected Qty,Qté Totale Prévue
 DocType: Monthly Distribution,Distribution Name,Nom de Distribution
-apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Le taux de valorisation n&#39;a pas été trouvé pour l&#39;élément {0}, qui est requis pour faire des écritures comptables pour {1} {2}. Si l&#39;article traite comme un élément de taux de valorisation nulle dans le {1}, mentionnez-le dans la {1} table d&#39;éléments. Sinon, créez une transaction de stock entrant pour l&#39;élément ou mentionnez le taux d&#39;évaluation dans l&#39;enregistrement de l&#39;élément, puis essayez de soumettre / annuler cette entrée"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir la série de dénomination pour {0} via Configuration&gt; Paramètres&gt; Naming Series
+apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Le taux de valorisation n'a pas été trouvé pour l'article {0}, qui est requis pour faire des écritures comptables pour {1} {2}. Si l'article est traité avec un taux de valorisation nul dans le {1}, mentionnez-le dans la table d'articles {1}. Sinon, créez une écriture de stock entrante pour l'article ou mentionnez le taux de valorisation dans les données de l'article, puis essayez de soumettre / annuler cette entrée"
 DocType: Course,Course Code,Code de Cours
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspection de la Qualité requise pour l'Article {0}
 DocType: POS Settings,Use POS in Offline Mode,Utiliser PDV en Mode Hors-Ligne
@@ -3415,16 +3439,15 @@
 DocType: Purchase Invoice,Deemed Export,Export Estimé
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de Matériel pour la Fabrication
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Pourcentage de Réduction peut être appliqué pour une liste de prix en particulier ou pour toutes les listes de prix.
-DocType: Subscription,Half-yearly,Semestriel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Écriture Comptable pour Stock
 DocType: Lab Test,LabTest Approver,Approbateur de test de laboratoire
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Vous avez déjà évalué les critères d&#39;évaluation {}.
 DocType: Vehicle Service,Engine Oil,Huile Moteur
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Ordres de travail créés: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Ordres de travail créés: {0}
 DocType: Sales Invoice,Sales Team1,Équipe des Ventes 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Article {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du Client
-DocType: Employee Loan,Loan Details,Détails du Prêt
+DocType: Loan,Loan Details,Détails du Prêt
 DocType: Company,Default Inventory Account,Compte d'Inventaire par Défaut
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Les numéros de folio ne correspondent pas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ligne {0} : Qté Complétée doit être supérieure à zéro.
@@ -3433,22 +3456,22 @@
 DocType: Antibiotic,Antibiotic Name,Nom de l'Antibiotique
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer une Remise Supplémentaire Sur
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,Sélectionner le Type...
-DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un lien vers toutes les parcelles dans lesquelles la culture se développe
+DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Lien vers toutes les parcelles dans lesquelles se trouve la culture
 DocType: Account,Root Type,Type de Racine
 DocType: Item,FIFO,"FIFO (Premier entré, Premier sorti)"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ligne # {0} : Vous ne pouvez pas retourner plus de {1} pour l’Article {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ligne # {0} : Vous ne pouvez pas retourner plus de {1} pour l’Article {2}
 DocType: Item Group,Show this slideshow at the top of the page,Afficher ce diaporama en haut de la page
 DocType: BOM,Item UOM,UDM de l'Article
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la Taxe Après Remise (Devise Société)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},L’Entrepôt cible est obligatoire pour la ligne {0}
 DocType: Cheque Print Template,Primary Settings,Réglages Principaux
 DocType: Purchase Invoice,Select Supplier Address,Sélectionner l'Adresse du Fournisseur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Ajouter des Employés
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Ajouter des Employés
 DocType: Purchase Invoice Item,Quality Inspection,Inspection de la Qualité
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Très Petit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Très Petit
 DocType: Company,Standard Template,Modèle Standard
 DocType: Training Event,Theory,Théorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité Juridique / Filiale avec un Plan de Comptes différent appartenant à l'Organisation.
 DocType: Payment Request,Mute Email,Email Silencieux
@@ -3468,11 +3491,10 @@
 DocType: SMS Log,No of Sent SMS,Nb de SMS Envoyés
 DocType: Antibiotic,Healthcare Administrator,Administrateur de Santé
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Définissez une cible
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numéros pour la présence via Setup&gt; Série de numéros
 DocType: Dosage Strength,Dosage Strength,Force du Dosage
 DocType: Account,Expense Account,Compte de Charge
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Logiciel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Couleur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Couleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Critères du Plan d'Évaluation
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,La date d&#39;expiration est obligatoire pour l&#39;article sélectionné
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Interdire les Bons de Commande d'Achat
@@ -3485,18 +3507,18 @@
 DocType: Patient,Personal and Social History,Antécédents Personnels et Sociaux
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utilisateur {0} créé
 DocType: Fee Schedule,Fee Breakup for each student,Répartition des Honoraires pour chaque élève
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionner une Répartition Mensuelle afin de repartir uniformément les objectifs sur le mois.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Modifier le Code
 DocType: Purchase Invoice Item,Valuation Rate,Taux de Valorisation
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Devise de la Liste de Prix non sélectionnée
-DocType: Purchase Invoice,Availed ITC Cess,Cess ITC Cess
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Devise de la Liste de Prix non sélectionnée
+DocType: Purchase Invoice,Availed ITC Cess,ITC Cess utilisé
 ,Student Monthly Attendance Sheet,Feuille de Présence Mensuelle des Étudiants
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Règle d&#39;expédition applicable uniquement pour la vente
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de Début du Projet
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Jusqu'à
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Journal des Renommages
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Le Ggroupe d'Étudiants ou le Calendrier des Cours est obligatoire
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Maintenir les Heures Facturables et les Heures de Travail sur la même Feuille de Temps
@@ -3516,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listez les produits ou services que vous achetez ou vendez.
 DocType: Water Analysis,Storage Temperature,Température de stockage
 DocType: Employee Attendance Tool,Unmarked Attendance,Participation Non Marquée
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Chercheur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Chercheur
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Outil d'Inscription au Programme Éudiant
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},La date de début doit être inférieure à la date de fin de la tâche {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nom ou Email est obligatoire
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} est actuellement associée avec une fiche d'évaluation fournisseur {1}. Les appels d'offres pour ce fournisseur doivent être édités avec précaution.
 DocType: Chapter,Non Profit Manager,Gestionnaire à but non lucratif
 DocType: BOM,Total Cost(Company Currency),Coût Total (Devise Société)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,N° de Série {0} créé
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,N° de Série {0} créé
 DocType: Homepage,Company Description for website homepage,Description de la Société pour la page d'accueil du site web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d'impression comme les Factures et les Bons de Livraison"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nom du Fournisseur
@@ -3539,11 +3561,10 @@
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
 DocType: Healthcare Settings,Result Printed,Résultat Imprimé
 DocType: Asset Category Account,Depreciation Expense Account,Compte de Dotations aux Amortissement
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Période d’Essai
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Voir {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Période d’Essai
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisés dans une transaction
 DocType: Project,Total Costing Amount (via Timesheets),Montant total des coûts (via les feuilles de temps)
-DocType: Employee Advance,Expense Approver,Approbateur de Notes de Frais
+DocType: Department,Expense Approver,Approbateur de Notes de Frais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ligne {0} : L’Avance du Client doit être un crédit
 DocType: Project,Hourly,Horaire
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Groupe à Groupe
@@ -3552,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,À la Date
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Journaux pour maintenir le statut de livraison des sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Effectuer un Paiement par une Écriture de Journal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Imprimé sur
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Imprimé sur
 DocType: Item,Inspection Required before Delivery,Inspection Requise avant Livraison
 DocType: Item,Inspection Required before Purchase,Inspection Requise avant Achat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activités en Attente
@@ -3562,7 +3583,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantité minimum d&#39;achat
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Votre Organisation
 DocType: Fee Component,Fees Category,Catégorie d'Honoraires
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Veuillez entrer la date de relève.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Veuillez entrer la date de relève.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Nb
 DocType: Supplier Scorecard,Notify Employee,Notifier l'Employé
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l'enquête est une campagne
@@ -3572,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Niveau de Réapprovisionnement
 DocType: Company,Chart Of Accounts Template,Modèle de Plan Comptable
 DocType: Attendance,Attendance Date,Date de Présence
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Détails du Salaire basés sur les Revenus et les Prélèvements.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
 DocType: Purchase Invoice Item,Accepted Warehouse,Entrepôt Accepté
@@ -3580,10 +3601,11 @@
 DocType: Item,Valuation Method,Méthode de Valorisation
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marquer Demi-Journée
 DocType: Sales Invoice,Sales Team,Équipe des Ventes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Écriture en double
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Écriture en double
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Entrez le nom du bénéficiaire avant de le soumettre.
 DocType: Program Enrollment Tool,Get Students,Obtenir les Étudiants
 DocType: Serial No,Under Warranty,Sous Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Erreur]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez la Commande Client
 ,Employee Birthday,Anniversaire de l'Employé
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Veuillez sélectionner la date d&#39;achèvement pour la réparation terminée
@@ -3602,7 +3624,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Réservé à la sous-traitance
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de Facture
 DocType: Shopping Cart Settings,Orders,Commandes
-DocType: Employee Leave Approver,Leave Approver,Approbateur de Congés
+DocType: Department,Leave Approver,Approbateur de Congés
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Veuillez sélectionner un lot
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nom du Groupe d'Évaluation
@@ -3620,12 +3642,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en groupe
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortissement
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +102,The number of shares and the share numbers are inconsistent,Le nombre d&#39;actions et le nombre d&#39;actions sont incohérents
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +102,The number of shares and the share numbers are inconsistent,Le nombre d'actions dans les transactions est incohérent avec le nombre total d'actions
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Outil de Gestion des Présences des Employés
 DocType: Guardian Student,Guardian Student,Tuteur de l'Étudiant
 DocType: Supplier,Credit Limit,Limite de crédit
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,Taux moyen de la liste de prix de vente
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,Prix moyen de la liste de prix de vente
 DocType: Salary Component,Salary Component,Composante Salariale
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Écritures de Paiement {0} ne sont pas liées
 DocType: GL Entry,Voucher No,N° de Référence
@@ -3646,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Objet suivi par Hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL POUR LE DESTINATAIRE
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'Amortissement Cumulé
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ce courrier électronique est autogénéré
 DocType: Stock Settings,Freeze Stock Entries,Geler les Entrées de Stocks
 DocType: Program Enrollment,Boarding Student,Enregistrement Étudiant
 DocType: Asset,Expected Value After Useful Life,Valeur Attendue Après Utilisation Complète
@@ -3671,21 +3692,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registre des présences {0} existe pour l'Étudiant {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Référence #{0} datée du {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortissement Eliminé en raison de cessions d'actifs
-DocType: Member,Member,Membre
+DocType: Loan,Member,Membre
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gérer les Adresses
-DocType: Work Order Item,Work Order Item,Poste de commande
+DocType: Work Order Item,Work Order Item,Article d'ordre de travail
 DocType: Pricing Rule,Item Code,Code de l'Article
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
 DocType: Journal Entry,User Remark,Remarque de l'Utilisateur
 DocType: Lead,Market Segment,Part de Marché
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Directeur de l&#39;agriculture
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents Professionnels Interne de l'Employé
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Fermeture (Dr)
 DocType: Cheque Print Template,Cheque Size,Taille du Chèque
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,N° de Série {0} n'est pas en stock
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,N° de Série {0} n'est pas en stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modèle de taxe pour les opérations de vente.
 DocType: Sales Invoice,Write Off Outstanding Amount,Encours de Reprise
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Le Compte {0} ne correspond pas à la Société {1}
@@ -3693,18 +3714,17 @@
 DocType: Stock Settings,Default Stock UOM,UDM par Défaut des Articles
 DocType: Asset,Number of Depreciations Booked,Nombre d’Amortissements Comptabilisés
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Quantité totale
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Pour le Prêt Employé : {0}
 DocType: Landed Cost Item,Receipt Document,Reçu
 DocType: Employee Education,School/University,École/Université
 DocType: Payment Request,Reference Details,Détails de la Référence
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qté Disponible à l'Entrepôt
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montant Facturé
-DocType: Share Transfer,(including),(comprenant)
+DocType: Share Transfer,(including),(compris)
 DocType: Asset,Double Declining Balance,Double Solde Dégressif
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Les commandes fermées ne peuvent être annulées. Réouvrir pour annuler.
 DocType: Student Guardian,Father,Père
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés
 DocType: Bank Reconciliation,Bank Reconciliation,Réconciliation Bancaire
 DocType: Attendance,On Leave,En Congé
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
@@ -3718,10 +3738,10 @@
 DocType: Lead,Lower Income,Revenu bas
 DocType: Restaurant Order Entry,Current Order,Ordre Actuel
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},L'entrepôt source et destination ne peuvent être similaire dans la ligne {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Aller aux Programmes
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La ligne {0} # Montant alloué {1} ne peut pas être supérieure au montant non réclamé {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La ligne {0} # Montant alloué {1} ne peut pas être supérieure au montant non réclamé {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',La ‘Date de Début’ doit être antérieure à la ‘Date de Fin’
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
@@ -3744,7 +3764,6 @@
 DocType: Payment Terms Template,Payment Terms,Termes de paiement
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Les Ordres de Production ne peuvent pas être créés pour:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minute
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et Frais d’Achats
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Aller aux Fournisseurs
@@ -3763,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Le devis {0} n'est pas du type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article de Calendrier d'Entretien
 DocType: Sales Order,%  Delivered,% Livré
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configurez l'ID de courrier électronique pour que l'Élève envoie la Demande de Paiement
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Configurez l'ID de courrier électronique pour que l'Élève envoie la Demande de Paiement
 DocType: Patient,Medical History,Antécédents médicaux
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Compte de Découvert Bancaire
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Compte de Découvert Bancaire
 DocType: Patient,Patient ID,Identification du patient
 DocType: Physician Schedule,Schedule Name,Nom du calendrier
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Créer une Fiche de Paie
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Ajouter tous les Fournisseurs
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Ajouter tous les Fournisseurs
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ligne # {0}: montant attribué ne peut pas être supérieur au montant en souffrance.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Parcourir la LDM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Prêts Garantis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Prêts Garantis
 DocType: Purchase Invoice,Edit Posting Date and Time,Modifier la Date et l'Heure de la Publication
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Veuillez définir le Compte relatif aux Amortissements dans la Catégorie d’Actifs {0} ou la Société {1}
 DocType: Lab Test Groups,Normal Range,Plage normale
 DocType: Academic Term,Academic Year,Année Académique
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Vente disponible
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Ouverture de la Balance des Capitaux Propres
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Ouverture de la Balance des Capitaux Propres
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restant
 DocType: Appraisal,Appraisal,Estimation
+DocType: Loan,Loan Account,Compte de prêt
 DocType: Purchase Invoice,GST Details,Détails de la GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email envoyé au fournisseur {0}
 DocType: Item,Default Sales Unit of Measure,Unité de Mesure par défaut à la Vente
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Année académique:
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Année scolaire:
+DocType: Subscription,Past Due Date,Date d&#39;échéance passée
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ne permet pas de définir un autre élément pour l&#39;élément {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La Date est répétée
@@ -3799,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,Rendez-vous patient
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Le Rôle Approbateur ne peut pas être identique au rôle dont la règle est Applicable
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Se Désinscire de ce Compte Rendu par Email
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Obtenir des Fournisseurs
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Obtenir des Fournisseurs
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} introuvable pour l&#39;élément {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Aller aux Cours
 DocType: Accounts Settings,Show Inclusive Tax In Print,Afficher la taxe inclusive en impression
@@ -3807,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Message Envoyé
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Les comptes avec des nœuds enfants ne peuvent pas être défini comme grand livre
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage de l&#39;instructeur dans Education&gt; Paramètres de l&#39;éducation
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taux auquel la devise de la Liste de prix est convertie en devise du client de base
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant Net (Devise Société)
 DocType: Physician,Physician Schedules,Horaires du médecin
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Le montant total de l'avance ne peut être supérieur au montant total approuvé
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Le montant total de l'avance ne peut être supérieur au montant total approuvé
 DocType: Salary Slip,Hour Rate,Tarif Horaire
 DocType: Stock Settings,Item Naming By,Nomenclature d'Article Par
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Une autre Entrée de Clôture de Période {0} a été faite après {1}
@@ -3828,9 +3850,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions du stock antérieures à {0}
 DocType: BOM,Inspection Required,Inspection obligatoire
 DocType: Purchase Invoice Item,PR Detail,Détail PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Entrez le numéro de garantie bancaire avant de le soumettre.
 DocType: Driving License Category,Class,Classe
 DocType: Sales Order,Fully Billed,Entièrement Facturé
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,L&#39;ordre de travail ne peut pas être déclenché par rapport à un modèle d&#39;élément
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Un ordre de travail ne peut pas être créé pour un modèle d'article
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,Règle d&#39;expédition applicable uniquement pour l&#39;achat
 DocType: Vital Signs,BMI,IMC
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Liquidités
@@ -3838,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d'emballage. (Pour l'impression)
 DocType: Assessment Plan,Program,Programme
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à définir les comptes gelés et à créer / modifier des écritures comptables sur des comptes gelés
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage de l&#39;instructeur dans Education&gt; Paramètres de l&#39;éducation
 DocType: Serial No,Is Cancelled,Est Annulée
 DocType: Student Group,Group Based On,Groupe basé sur
 DocType: Journal Entry,Bill Date,Date de la Facture
@@ -3849,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,Hauteur du Chèque
 DocType: Supplier,Supplier Details,Détails du Fournisseur
 DocType: Setup Progress,Setup Progress,Progression de l'Installation
+DocType: Expense Claim,Approval Status,Statut d'Approbation
 DocType: Hub Settings,Publish Items to Hub,Publier les articles sur le Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},De la Valeur doit être inférieure à la valeur de la ligne {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Virement
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Virement
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Cochez tout
 ,Issued Items Against Work Order,Objets émis contre l&#39;ordre de travail
 DocType: Vehicle Log,Invoice Ref,Facture Ref
@@ -3882,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarif
 DocType: Work Order Item,Available Qty at WIP Warehouse,Qté disponible à l'Entrepôt de Travaux en Cours
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projeté
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},N° de Série {0} ne fait pas partie de l’Entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},N° de Série {0} ne fait pas partie de l’Entrepôt {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifiera pas les sur-livraisons et les sur-réservations pour l’Article {0} car la quantité ou le montant est égal à 0
 DocType: Notification Control,Quotation Message,Message du Devis
-DocType: Employee Loan,Employee Loan Application,Demande de Prêt d'un Employé
 DocType: Issue,Opening Date,Date d'Ouverture
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,S&#39;il vous plaît sauver le patient d&#39;abord
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,S&#39;il vous plaît sauver le patient d&#39;abord
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,La présence a été marquée avec succès.
 DocType: Program Enrollment,Public Transport,Transports Publics
 DocType: Soil Texture,Silt Composition (%),Composition de limon (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Solde de l&#39;objet (simple)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Factures émises par des Fournisseurs.
 DocType: POS Profile,Write Off Account,Compte de Reprise
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Mnt de la Note de Débit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Mnt de la Note de Débit
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Remise
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre Facture d’Achat
 DocType: Item,Warranty Period (in days),Période de Garantie (en jours)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Date de la Commande Client
 DocType: Sales Invoice Item,Delivered Qty,Qté Livrée
 DocType: Assessment Plan,Assessment Plan,Plan d'Évaluation
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Le client {0} est créé.
 DocType: Stock Settings,Limit Percent,Pourcentage Limite
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Actuellement, aucun stock disponible dans aucun entrepôt"
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Écriture de Stock
 DocType: Payment Entry,Payment References,Références de Paiement
 DocType: C-Form,C-FORM-,FORMULAIRE-C-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Nombre d&#39;intervalles pour le champ d&#39;intervalle, par exemple si Intervalle est &quot;Jours&quot; et si le décompte d&#39;intervalle de facturation est 3, les factures seront générées tous les 3 jours"
 DocType: Vehicle,Insurance Details,Détails Assurance
 DocType: Account,Payable,Créditeur
 DocType: Share Balance,Share Type,Type de partage
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Veuillez entrer les Périodes de Remboursement
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Veuillez entrer les Périodes de Remboursement
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Débiteurs ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nouveaux Clients
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bénéfice Brut %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bénéfice Brut %
 DocType: Appraisal Goal,Weightage (%),Poids (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Modifier le profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Date de Compensation
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Le Tiers est obligatoire
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Des lignes avec des dates d&#39;échéance en double dans les autres lignes ont été trouvées: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Des lignes avec des dates d&#39;échéance en double dans les autres lignes ont été trouvées: {list}
 DocType: Topic,Topic Name,Nom du Sujet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Veuillez définir le modèle par défaut pour Autoriser la notification d&#39;approbation dans les paramètres HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Au moins Vente ou Achat doit être sélectionné
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Sélectionnez un employé pour faire avancer l&#39;employé.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Sélectionnez un employé pour obtenir l'avance employé.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,S&#39;il vous plaît sélectionnez une date valide
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Sélectionner la nature de votre entreprise.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Entrepôt Source
 DocType: Installation Note,Installation Date,Date d'Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Registre des actions
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Ligne #{0} : L’Actif {1} n’appartient pas à la société {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Ligne #{0} : L’Actif {1} n’appartient pas à la société {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Facture de Vente {0} créée
 DocType: Employee,Confirmation Date,Date de Confirmation
 DocType: C-Form,Total Invoiced Amount,Montant Total Facturé
@@ -3989,9 +4014,9 @@
 DocType: Account,Accumulated Depreciation,Amortissement Cumulé
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nom du Classement
 DocType: Stock Entry,Customer or Supplier Details,Détails du Client ou du Fournisseur
-DocType: Employee Loan Application,Required by Date,Requis à cette Date
+DocType: Loan Application,Required by Date,Requis à cette Date
 DocType: Lead,Lead Owner,Responsable du Prospect
-DocType: Production Plan,Sales Orders Detail,Détail des commandes
+DocType: Production Plan,Sales Orders Detail,Détail des bons de commandes client
 DocType: Bin,Requested Quantity,Quantité Demandée
 DocType: Patient,Marital Status,État Civil
 DocType: Stock Settings,Auto Material Request,Demande de Matériel Automatique
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Salaire Brut - Déductions Totales - Remboursement de Prêt
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,La LDM actuelle et la nouvelle LDM ne peuvent être pareilles
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID Fiche de Paie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,La Date de Départ à la Retraite doit être supérieure à Date d'Embauche
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,La Date de Départ à la Retraite doit être supérieure à Date d'Embauche
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variantes multiples
 DocType: Sales Invoice,Against Income Account,Pour le Compte de Produits
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livré
+DocType: Subscription,Trial Period Start Date,Date de début de la période d&#39;essai
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage de Répartition Mensuelle
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Veuillez vous connecter en tant qu&#39;un autre utilisateur.
@@ -4017,7 +4043,7 @@
 DocType: Cheque Print Template,Starting position from top edge,Position initiale depuis bord haut
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +33,Same supplier has been entered multiple times,Le même fournisseur a été saisi plusieurs fois
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bénéfice/Perte Brut
-,Warehouse wise Item Balance Age and Value,Stocker sage article équilibre âge et valeur
+,Warehouse wise Item Balance Age and Value,Balance des articles par entrepôt
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article Fourni du Bon de Commande
 apps/erpnext/erpnext/public/js/setup_wizard.js +94,Company Name cannot be Company,Nom de la Société ne peut pas être Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,En-Têtes pour les modèles d'impression.
@@ -4026,13 +4052,12 @@
 DocType: Student Guardian,Student Guardian,Tuteur d'Étudiant
 DocType: Member,Member Name,Nom de membre
 DocType: Stock Settings,Use Naming Series,Utiliser la série de noms
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
 DocType: POS Profile,Update Stock,Mettre à Jour le Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dans l&#39;abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différentes UDM pour les articles conduira à un Poids Net (Total) incorrect . Assurez-vous que le Poids Net de chaque article a la même unité de mesure .
 DocType: Membership,Payment Details,Détails de paiement
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux LDM
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Ordre de travail arrêté ne peut être annulé, Détruire le premier à annuler"
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Taux LDM
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Un ordre de travail arrêté ne peut être annulé, Re-démarrez le pour pouvoir l'annuler"
 DocType: Asset,Journal Entry for Scrap,Écriture de Journal pour la Mise au Rebut
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Veuillez récupérer les articles des Bons de Livraison
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Les Écritures de Journal {0} ne sont pas liées
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Parcelle
 ,Purchase Analytics,Analyses des Achats
 DocType: Sales Invoice Item,Delivery Note Item,Bon de Livraison article
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,La facture actuelle {0} est manquante
 DocType: Asset Maintenance Log,Task,Tâche
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de Référence #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour l'Article {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Compte de Profits / Pertes sur Change
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Employé et Participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},L'Objet doit être parmi {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Remplissez et enregistrez le formulaire
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Remplissez et enregistrez le formulaire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum de la Communauté
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Qté réelle en stock
 DocType: Homepage,"URL for ""All Products""","URL pour ""Tous les Produits"""
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Prix de Vente Standard
 DocType: Account,Rate at which this tax is applied,Taux auquel cette taxe est appliquée
 DocType: Cash Flow Mapper,Section Name,Nom de la section
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Qté de Réapprovisionnement
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Qté de Réapprovisionnement
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offres d'Emploi Actuelles
 DocType: Company,Stock Adjustment Account,Compte d'Ajustement du Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Reprise
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,Dépend de
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Mise à jour des prix les plus récents dans toutes les Listes de Matériaux en file d'attente. Cela peut prendre quelques minutes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du Nouveau Compte. Note: Veuillez ne pas créer de comptes Clients et Fournisseurs
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles d'Adresse par défaut en fonction du pays
 DocType: Water Analysis,Appearance,Apparence
+DocType: HR Settings,Leave Status Notification Template,Modèle de notification de statut de congé
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Moyenne de la liste de prix d'achat
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur livre au Client
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informations sur le membre
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Pas permis. Veuillez désactiver le modèle de test
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage d'Allocation doit être égale à 100 %
 DocType: Crop Cycle,Linked Land Unit,Parcelle liée
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner le Tiers
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner le Tiers
 DocType: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Aller aux Utilisateurs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Le Montant Payé + Montant Repris ne peut pas être supérieur au Total Général
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un Numéro de Lot valide pour l’Article {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Remarque : Le solde de congé est insuffisant pour le Type de Congé {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Remarque : Le solde de congé est insuffisant pour le Type de Congé {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN invalide ou Entrez NA si vous n'êtes pas Enregistré
 DocType: Training Event,Seminar,Séminaire
 DocType: Program Enrollment Fee,Program Enrollment Fee,Frais d'Inscription au Programme
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Publier la Disponibilité
 DocType: Company,Create Chart Of Accounts Based On,Créer un Plan Comptable Basé Sur
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Impossible de le convertir en non-groupe. Des tâches enfants existent.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Date de Naissance ne peut être après la Date du Jour.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Date de Naissance ne peut être après la Date du Jour.
 ,Stock Ageing,Viellissement du Stock
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Étudiant {0} existe pour la candidature d'un étudiant {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Arrondi (Devise Société)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Feuille de Temps
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lot:
 DocType: Volunteer,Afternoon,Après-midi
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' est désactivé(e)
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' est désactivé(e)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvert
 DocType: Cheque Print Template,Scanned Cheque,Chèque Numérisé
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des emails automatiques aux Contacts sur les Transactions soumises.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Le projet {0} existe déjà
 DocType: Medical Department,Nursing User,Utilisateur Infirmier
 DocType: Plant Analysis,Plant Analysis Criterias,Critères d&#39;analyse des plantes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilités
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Le numéro de série {0} n&#39;appartient pas au lot {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilités
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,La période de validité de ce devis a pris fin.
 DocType: Expense Claim Account,Expense Claim Account,Compte de Note de Frais
 DocType: Accounts Settings,Allow Stale Exchange Rates,Autoriser les Taux de Change Existants
@@ -4176,7 +4203,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,Ajouter des Utilisateurs
 DocType: POS Item Group,Item Group,Groupe d'Article
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Student Group: ,Groupe d&#39;étudiants:
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Choisissez le pays
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Choisissez un pays
 DocType: Item,Safety Stock,Stock de Sécurité
 DocType: Healthcare Settings,Healthcare Settings,Paramètres de Santé
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,% de Progression pour une tâche ne peut pas être supérieur à 100.
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Faire des variantes
 DocType: Item,Default BOM,LDM par Défaut
 DocType: Project,Total Billed Amount (via Sales Invoices),Montant total facturé (via les factures de vente)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Montant de la Note de Débit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Montant de la Note de Débit
 DocType: Project Update,Not Updated,Pas à jour
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Il existe des incohérences entre le taux, le nombre d&#39;actions et le montant calculé"
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Il existe des incohérences entre le prix unitaire, le nombre d'actions et le montant calculé"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Veuillez saisir à nouveau le nom de la société pour confirmer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Encours Total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Encours Total
 DocType: Journal Entry,Printing Settings,Réglages d'Impression
 DocType: Employee Advance,Advance Account,Compte d&#39;avances
 DocType: Job Offer,Job Offer Terms,Conditions d&#39;offre d&#39;emploi
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobile
 DocType: Vehicle,Insurance Company,Compagnie d'Assurance
 DocType: Asset Category Account,Fixed Asset Account,Compte d'Actif Immobilisé
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Du Bon de Livraison
 DocType: Chapter,Members,Membres
 DocType: Student,Student Email Address,Adresse Email de l'Étudiant
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Interne
 DocType: Delivery Stop,Address Name,Nom de l'Adresse
 DocType: Stock Entry,From BOM,De LDM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Division de {0} unités de {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Division de {0} unités de {1}
 DocType: Assessment Code,Assessment Code,Code de l'Évaluation
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,de Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Les transactions du stock avant {0} sont gelées
@@ -4233,27 +4260,26 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,N° de Référence obligatoire si vous avez entré une date
 DocType: Bank Reconciliation Detail,Payment Document,Document de Paiement
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Erreur lors de l'évaluation de la formule du critère
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,La Date d'Embauche doit être après à la Date de Naissance
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,La Date d'Embauche doit être après à la Date de Naissance
+DocType: Subscription,Plans,Des plans
 DocType: Salary Slip,Salary Structure,Grille des Salaires
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Compagnie Aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Problème Matériel
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Une erreur s'est produite lors de la création de la récurrence
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Problème Matériel
 DocType: Material Request Item,For Warehouse,Pour l’Entrepôt
 DocType: Employee,Offer Date,Date de la Proposition
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Devis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Aucun Groupe d'Étudiants créé.
 DocType: Purchase Invoice Item,Serial No,N° de Série
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Montant du Remboursement Mensuel ne peut pas être supérieur au Montant du Prêt
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Montant du Remboursement Mensuel ne peut pas être supérieur au Montant du Prêt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Veuillez d’abord entrer les Détails de Maintenance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Ligne {0}: la date de livraison prévue ne peut pas être avant la date de commande
 DocType: Purchase Invoice,Print Language,Langue d’Impression
 DocType: Salary Slip,Total Working Hours,Total des Heures Travaillées
 DocType: Sales Invoice,Customer PO Details,Détails du bon de commande client
-DocType: Subscription,Next Schedule Date,Prochaine Date Programmée
 DocType: Stock Entry,Including items for sub assemblies,Incluant les articles pour des sous-ensembles
-DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Compte d&#39;ouverture temporaire
+DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Compte temporaire d'ouverture
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,La valeur entrée doit être positive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +446,All Territories,Tous les Territoires
 apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,Ajouter plusieurs tâches
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,Horaire d'Ouverture
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Les date Du et Au sont requises
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Bourses de Valeurs Mobilières et de Marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Delivery Note Item,From Warehouse,De l'Entrepôt
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Aucun employé pour les critères mentionnés
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
 DocType: Hotel Settings,Default Customer,Client par Défaut
 DocType: Assessment Plan,Supervisor Name,Nom du Superviseur
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne confirmez pas si le rendez-vous est créé pour le même jour
@@ -4291,7 +4317,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +165,Make Sample Retention Stock Entry,Faire une entrée de stock de rétention d&#39;échantillon
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,Fiches d'Évaluation
-DocType: Employee,This will restrict user access to other employee records,Cela limitera l&#39;accès des utilisateurs aux autres enregistrements d&#39;employés
+DocType: Employee,This will restrict user access to other employee records,Cela limitera l'accès des utilisateurs aux données des autres employés
 DocType: Tax Rule,Shipping City,Ville de Livraison
 DocType: Notification Control,Customize the Notification,Personnaliser la Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Cash Flow from Operations,Flux de Trésorerie provenant des Opérations
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,Avances des employés
 DocType: Payroll Entry,Payroll Frequency,Fréquence de la Paie
 DocType: Lab Test Template,Sensitivity,Sensibilité
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Matières Premières
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Matières Premières
 DocType: Leave Application,Follow via Email,Suivre par E-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Usines et Machines
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Usines et Machines
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Montant de la Taxe après Remise
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Paramètres du Récapitulatif Quotidien
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Veuillez entrer Reqd par date
 DocType: Payment Entry,Internal Transfer,Transfert Interne
 DocType: Asset Maintenance,Maintenance Tasks,Tâches de maintenance
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Soit la qté cible soit le montant cible est obligatoire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
 DocType: Leave Control Panel,Carry Forward,Reporter
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en grand livre
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Intégrations ERPNext
 DocType: Crop Cycle,Detected Disease,Maladie détectée
 ,Produced,Produit
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,La date de début du remboursement ne peut pas être antérieure à la date du déboursement.
 DocType: Item,Item Code for Suppliers,Code de l'Article pour les Fournisseurs
 DocType: Issue,Raised By (Email),Créé par (Email)
 DocType: Training Event,Trainer Name,Nom du Formateur
 DocType: Mode of Payment,General,Général
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Dernière Communication
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},N° de Séries Requis pour Article Sérialisé {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},N° de Séries Requis pour Article Sérialisé {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Rapprocher les Paiements avec les Factures
 DocType: Journal Entry,Bank Entry,Écriture Bancaire
 DocType: Authorization Rule,Applicable To (Designation),Applicable À (Désignation)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Activer / Désactiver les devises
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} sur une demi-journée de congé le {1}
 DocType: Production Plan,Get Material Request,Obtenir la Demande de Matériel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Frais Postaux
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Frais Postaux
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Mnt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Divertissement et Loisir
 ,Item Variant Details,Détails de la variante de l&#39;article
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Heure
 DocType: Restaurant Order Entry,Last Sales Invoice,Dernière Facture de Vente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Veuillez sélectionner Qté par rapport à l&#39;élément {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Les Nouveaux N° de Série ne peuvent avoir d'entrepot. L'Entrepôt doit être établi par Écriture de Stock ou Reçus d'Achat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Les Nouveaux N° de Série ne peuvent avoir d'entrepot. L'Entrepôt doit être établi par Écriture de Stock ou Reçus d'Achat
 DocType: Lead,Lead Type,Type de Prospect
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Vous n'êtes pas autorisé à approuver les congés sur les Dates Bloquées
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Vous n'êtes pas autorisé à approuver les congés sur les Dates Bloquées
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 DocType: Company,Monthly Sales Target,Objectif de Vente Mensuel
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
@@ -4365,10 +4392,10 @@
 DocType: Item,Default Material Request Type,Type de Requête de Matériaux par Défaut
 DocType: Supplier Scorecard,Evaluation Period,Période d'Évaluation
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Inconnu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Ordre de travail non créé
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Ordre de travail non créé
 DocType: Shipping Rule,Shipping Rule Conditions,Conditions de la Règle de Livraison
 DocType: Purchase Invoice,Export Type,Type d'Exportation
-DocType: Salary Slip Loan,Salary Slip Loan,Salaire Slip Loan
+DocType: Salary Slip Loan,Salary Slip Loan,Avance sur salaire
 DocType: BOM Update Tool,The new BOM after replacement,La nouvelle LDM après remplacement
 ,Point of Sale,Point de Vente
 DocType: Payment Entry,Received Amount,Montant Reçu
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Ouverture des factures Résumé
 DocType: Education Settings,Education Manager,Gestionnaire de l&#39;éducation
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,La longueur minimale entre chaque plante sur le terrain pour une croissance optimale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","L'article de Lot {0} ne peut pas être mis à jour à l'aide de la réconciliation des stocks, à la place, utilisez l'Entrée de Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","L'article de Lot {0} ne peut pas être mis à jour à l'aide de la réconciliation des stocks, à la place, utilisez l'Entrée de Stock"
 DocType: Quality Inspection,Report Date,Date du Rapport
 DocType: Student,Middle Name,Deuxième Nom
 DocType: C-Form,Invoices,Factures
@@ -4404,7 +4431,7 @@
 DocType: Stock Entry,Update Rate and Availability,Mettre à Jour le Prix et la Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou à livrer en plus de la quantité commandée. Par exemple : Si vous avez commandé 100 unités et que votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: POS Customer Group,Customer Group,Groupe de Clients
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +258,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,Ligne # {0}: l&#39;opération {1} n&#39;est pas terminée pour {2} quantité de produits finis dans le bon de commande {3}. Veuillez mettre à jour l&#39;état de l&#39;opération via les journaux de temps
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +258,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,Ligne #{0}: l'opération {1} n'est pas terminée pour la quantité {2} de produits finis dans le bon de commande # {3}. Veuillez mettre à jour l'état de l'opération via les feuilles de temps.
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
 DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Reçu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Reçu
 ,Sales Register,Registre des Ventes
 DocType: Daily Work Summary Group,Send Emails At,Envoyer Emails À
 DocType: Quotation,Quotation Lost Reason,Raison de la Perte du Devis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Référence de la transaction n° {0} datée du {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vue de Formulaire
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Approbation des dépenses obligatoire dans les demandes de remboursement
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Résumé du mois et des activités en suspens
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Ajoutez des utilisateurs, autres que vous-même, à votre organisation."
 DocType: Customer Group,Customer Group Name,Nom du Groupe Client
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Pas encore de Clients!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,États des Flux de Trésorerie
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Aucune demande de matériel créée
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Veuillez sélectionnez Report si vous souhaitez également inclure le solde des congés de l'exercice précédent à cet exercice
@@ -4444,15 +4472,16 @@
 DocType: Student,Guardian Details,Détails du Tuteur
 DocType: C-Form,C-Form,Formulaire-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Valider la Présence de plusieurs employés
-DocType: Agriculture Task,Start Day,Commence jour
+DocType: Agriculture Task,Start Day,Date de début
 DocType: Vehicle,Chassis No,N ° de Châssis
 DocType: Payment Request,Initiated,Initié
 DocType: Production Plan Item,Planned Start Date,Date de Début Prévue
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Veuillez sélectionner une LDM
-DocType: Purchase Invoice,Availed ITC Integrated Tax,Avoir intégré l&#39;impôt intégré de l&#39;ITC
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Veuillez sélectionner une LDM
+DocType: Purchase Invoice,Availed ITC Integrated Tax,Taxe intégrée de l'ITC utilisée
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
+DocType: Bank Guarantee,Clauses and Conditions,Clauses et conditions
 DocType: Serial No,Creation Document Type,Type de Document de Création
 DocType: Project Task,View Timesheet,Afficher la feuille de temps
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La date de fin doit être supérieure à la date de début
 DocType: Leave Type,Is Encash,Est Encaissement
 DocType: Leave Allocation,New Leaves Allocated,Nouvelle Allocation de Congés
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Les données par projet ne sont pas disponibles pour un devis
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,Consommation Actuelle d'Alcool
 DocType: Student Admission Program,Student Admission Program,Programme d&#39;admission des étudiants
 DocType: Payment Entry,Account Paid To,Compte Payé Au
+DocType: Subscription Settings,Grace Period,Période de grâce
 DocType: Item Alternative,Alternative Item Name,Nom de l&#39;article alternatif
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,L'Article Parent {0} ne doit pas être un Élément de Stock
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Impossible de soumettre un bordereau de salaire <br> \ Raisons possibles: <br> \ 1. Le salaire net est inférieur à 0. <br> \ 2. L'adresse e-mail de l'entreprise spécifiée dans la fiche employé n'est pas valide. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} le Budget du Compte {1} pour {2} {3} est de {4}. Il dépassera de {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Ligne {0} # Le compte doit être de type ‘Actif Immobilisé'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qté Sortante
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,et désactivé dans le
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Services Financiers
 DocType: Student Sibling,Student ID,Carte d'Étudiant
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,Plainte
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Rendre l&#39;entrée de remboursement
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Tous les départements
 DocType: Patient,Alcohol Past Use,Consommation Passée d'Alcool
 DocType: Fertilizer Content,Fertilizer Content,Contenu d&#39;engrais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problématique / coincé
 DocType: Tax Rule,Billing State,État de la Facturation
 DocType: Share Transfer,Transfer,Transférer
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Le bon de travail {0} doit être annulé avant d&#39;annuler cette commande client
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,L'ordre de travail {0} doit être annulé avant d'annuler cette commande client
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
 DocType: Authorization Rule,Applicable To (Employee),Applicable À (Employé)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,La Date d’Échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incrément pour l'Attribut {0} ne peut pas être 0
@@ -4507,7 +4538,7 @@
 DocType: Naming Series,Setup Series,Configuration des Séries
 DocType: Payment Reconciliation,To Invoice Date,Date de Facture Finale
 DocType: Shareholder,Contact HTML,HTML du Contact
-apps/erpnext/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py +19,Registration fee can not be Zero,Les frais d&#39;inscription ne peuvent pas être zéro
+apps/erpnext/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py +19,Registration fee can not be Zero,Les frais d'inscription ne peuvent pas être égal à zéro
 DocType: Disease,Treatment Period,Période de traitement
 apps/erpnext/erpnext/education/api.py +338,Result already Submitted,Résultat déjà soumis
 apps/erpnext/erpnext/controllers/buying_controller.py +170,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,L&#39;entrepôt réservé est obligatoire pour l&#39;article {0} dans les matières premières fournies
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,Message à afficher
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Vente de Détail
 DocType: Student Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Ensemble de Produits
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Ensemble de Produits
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Impossible de trouver un score démarrant à {0}. Vous devez avoir des scores couvrant 0 à 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ligne {0} : Référence {1} non valide
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modèle de Taxe et Frais d'Achat
+DocType: Subscription,Current Invoice Start Date,Date de début de la facture actuelle
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1} : Un montant est requis au débit ou au crédit pour {2}
 DocType: GL Entry,Remarks,Remarques
@@ -4534,37 +4566,38 @@
 DocType: Task,Parent Task,Tâche Parente
 DocType: Journal Entry,Write Off Based On,Reprise Basée Sur
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Faire un Prospect
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impression et Papeterie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Impression et Papeterie
 DocType: Stock Settings,Show Barcode Field,Afficher Champ Code Barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Envoyer des Emails au Fournisseur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaire déjà traité pour la période entre {0} et {1}, La période de demande de congé ne peut pas être entre cette plage de dates."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Envoyer des Emails au Fournisseur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaire déjà traité pour la période entre {0} et {1}, La période de demande de congé ne peut pas être entre cette plage de dates."
+DocType: Fiscal Year,Auto Created,Créé automatiquement
 DocType: Chapter Member,Leave Reason,Laissez la raison
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,La facture {0} n&#39;existe plus
 DocType: Guardian Interest,Guardian Interest,Part du Tuteur
 DocType: Volunteer,Availability,Disponibilité
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configurer les valeurs par défaut pour les factures de point de vente
 apps/erpnext/erpnext/config/hr.py +182,Training,Formation
-DocType: Project,Time to send,Temps d&#39;envoyer
+DocType: Project,Time to send,Heure d'envoi
 DocType: Timesheet,Employee Detail,Détail Employé
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email du Tuteur1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Le jour de la Date Suivante et le Jour de Répétition du Mois doivent être égal
 DocType: Lab Prescription,Test Code,Code de Test
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Réglages pour la page d'accueil du site
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Les Appels d'Offres ne sont pas autorisés pour {0} en raison d'une note de {1} sur la fiche d'évaluation
 DocType: Job Offer,Awaiting Response,Attente de Réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Au-dessus
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Montant Total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Attribut invalide {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Montant Total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Attribut invalide {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Veuillez mentionner s'il s'agit d'un compte créditeur non standard
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Sélectionnez un groupe d'évaluation autre que «Tous les Groupes d'Évaluation»
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ligne {0}: le Centre de Coûts est requis pour un article {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,EcritureDate
-apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,Ceci est basé sur les transactions contre ce médecin.
+apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,Ceci est basé sur les transactions pour ce médecin
 DocType: Training Event Employee,Optional,Optionnel
 DocType: Salary Slip,Earning & Deduction,Revenus et Déduction
 DocType: Agriculture Analysis Criteria,Water Analysis,Analyse de l&#39;eau
 DocType: Chapter,Region,Région
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes transactions.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Taux de Valorisation Négatif n'est pas autorisé
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Taux de Valorisation Négatif n'est pas autorisé
 DocType: Holiday List,Weekly Off,Jours de Congé Hebdomadaire
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Recharger l&#39;analyse liée
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par exemple: 2012, 2012-13"
@@ -4580,7 +4613,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Coût des Immobilisations Mises au Rebut
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}
 DocType: Vehicle,Policy No,Politique N°
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
 DocType: Asset,Straight Line,Linéaire
 DocType: Project User,Project User,Utilisateur du Projet
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Fractionner
@@ -4616,51 +4649,51 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Chemin
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Conversion impossible du Centre de Coûts en livre car il possède des nœuds enfants
 DocType: Production Plan,Total Planned Qty,Quantité totale prévue
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valeur d'Ouverture
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valeur d'Ouverture
 DocType: Salary Detail,Formula,Formule
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Série #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Série #
 DocType: Lab Test Template,Lab Test Template,Modèle de test de laboratoire
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Compte de vente
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Compte de vente
 DocType: Purchase Invoice Item,Total Weight,Poids total
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commission sur les Ventes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Commission sur les Ventes
 DocType: Job Offer Term,Value / Description,Valeur / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
 DocType: Tax Rule,Billing Country,Pays de Facturation
 DocType: Purchase Order Item,Expected Delivery Date,Date de Livraison Prévue
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrée de commande de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débit et Crédit non égaux pour {0} # {1}. La différence est de {2}.
 DocType: Asset Maintenance Task,Assign To Name,Attribuer au nom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Charges de Représentation
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Charges de Représentation
 DocType: Hub Settings,Enabled Users,Utilisateurs activés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Faire une Demande de Matériel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Ouvrir l'Article {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Facture de Vente {0} doit être annulée avant l'annulation de cette Commande Client
 DocType: Consultation,Age,Âge
 DocType: Sales Invoice Timesheet,Billing Amount,Montant de Facturation
-DocType: Cash Flow Mapping,Select Maximum Of 1,Sélectionnez Maximum de 1
+DocType: Cash Flow Mapping,Select Maximum Of 1,Sélectionnez un maximum de 1
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée invalide pour l'élément {0}. Quantité doit être supérieur à 0.
 DocType: Company,Default Employee Advance Account,Compte d&#39;avances pour employés par défaut
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Demandes de congé.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 DocType: Vehicle,Last Carbon Check,Dernière Vérification Carbone
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Frais Juridiques
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Frais Juridiques
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Veuillez sélectionner la quantité sur la ligne
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Faire l&#39;ouverture des ventes et des factures d&#39;achat
 DocType: Purchase Invoice,Posting Time,Heure de Publication
 DocType: Timesheet,% Amount Billed,% Montant Facturé
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Frais Téléphoniques
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Frais Téléphoniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Aucun Article avec le N° de Série {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Aucun Article avec le N° de Série {0}
 DocType: Email Digest,Open Notifications,Ouvrir les Notifications
 DocType: Payment Entry,Difference Amount (Company Currency),Écart de Montant (Devise de la Société)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Charges Directes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Charges Directes
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveaux Revenus de Clientèle
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Frais de Déplacement
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Frais de Déplacement
 DocType: Maintenance Visit,Breakdown,Panne
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Ajouter un champ personnalisé Abonnement dans le doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
 DocType: Purchase Receipt Item,Sample Quantity,Quantité d&#39;échantillon
+DocType: Bank Guarantee,Name of Beneficiary,Le nom du bénéficiaire
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Mettre à jour le coût de la LDM automatiquement via le Planificateur, en fonction du dernier taux de valorisation / tarif de la liste de prix / dernier prix d'achat des matières premières."
 DocType: Bank Reconciliation Detail,Cheque Date,Date du Chèque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: Le Compte parent {1} n'appartient pas à l'entreprise: {2}
@@ -4672,14 +4705,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Essai
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Composantes Salariales
 DocType: Program Enrollment Tool,New Academic Year,Nouvelle Année Académique
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retour / Note de Crédit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retour / Note de Crédit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux de la Liste de Prix si manquante
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Montant Total Payé
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Montant Total Payé
 DocType: GST Settings,B2C Limit,Limite B2C
 DocType: Work Order Item,Transferred Qty,Quantité Transférée
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Naviguer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planification
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planification
 DocType: Share Balance,Issued,Publié
+DocType: Loan,Repayment Start Date,Date de début du remboursement
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Activité Étudiante
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID du Fournisseur
 DocType: Payment Request,Payment Gateway Details,Détails de la Passerelle de Paiement
@@ -4692,10 +4726,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type de congé comme courant, maladie, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer régulièrement des rapports de synthèse par Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Veuillez définir le compte par défaut dans le Type de Note de Frais {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Veuillez définir le compte par défaut dans le Type de Note de Frais {0}
 DocType: Assessment Result,Student Name,Nom de l'Étudiant
 DocType: Brand,Item Manager,Gestionnaire d'Article
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Paie à Payer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Paie à Payer
 DocType: Buying Settings,Default Supplier Type,Type de Fournisseur par Défaut
 DocType: Plant Analysis,Collection Datetime,Collection Datetime
 DocType: Work Order,Total Operating Cost,Coût d'Exploitation Total
@@ -4705,9 +4739,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilisateur {0} n'existe pas
 DocType: Payment Term,Day(s) after invoice date,Jour (s) après la date de la facture
 DocType: Payment Schedule,Payment Schedule,Calendrier de paiement
-DocType: Subscription,SUB-,SOUS-
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,L’Écriture de Paiement existe déjà
+DocType: Subscription,Trial Period End Date,Date de fin de la période d&#39;évaluation
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorisé car {0} dépasse les limites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Base du modèle de salaire.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Pathologie
@@ -4724,9 +4758,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis de Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle Autorisé à modifier un stock gelé
 ,Territory Target Variance Item Group-Wise,Variance de l’Objectif par Région et par Groupe d’Article
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Tous les Groupes Client
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Tous les Groupes Client
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Cumul Mensuel
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Un Modèle de Taxe est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la Liste de Prix (Devise Société)
@@ -4735,14 +4769,15 @@
 DocType: Lab Prescription,Test Created,Test Créé
 DocType: Healthcare Settings,Custom Signature in Print,Signature personnalisée dans l&#39;impression
 DocType: Account,Temporary,Temporaire
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Numéro d&#39;ordre client
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Numéro d&#39;ordre client
 DocType: Program,Courses,Cours
 DocType: Monthly Distribution Percentage,Percentage Allocation,Allocation en Pourcentage
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secrétaire
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secrétaire
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si coché, le champ 'En Lettre' ne sera visible dans aucune transaction"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Cette action arrêtera la facturation future. Êtes-vous sûr de vouloir annuler cet abonnement?
 DocType: Serial No,Distinct unit of an Item,Unité distincte d'un Article
 DocType: Supplier Scorecard Criteria,Criteria Name,Nom du Critère
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Veuillez sélectionner une Société
 DocType: Pricing Rule,Buying,Achat
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Maladies et engrais
 DocType: HR Settings,Employee Records to be created by,Dossiers de l'Employés ont été créées par
@@ -4751,17 +4786,17 @@
 DocType: POS Profile,Apply Discount On,Appliquer Réduction Sur
 DocType: Member,Membership Type,Type d&#39;adhésion
 ,Reqd By Date,Requis par Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Créditeurs
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Créditeurs
 DocType: Assessment Plan,Assessment Name,Nom de l'Évaluation
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Afficher PDC dans Imprimer
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Afficher les chèques post-datés dans l'impression
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ligne # {0} : N° de série est obligatoire
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Détail des Taxes par Article
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Offre d&#39;emploi
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abréviation de l'Institut
 ,Item-wise Price List Rate,Taux de la Liste des Prix par Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Devis Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Devis Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le Devis.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},La quantité ({0}) ne peut pas être une fraction dans la ligne {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},La quantité ({0}) ne peut pas être une fraction dans la ligne {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
@@ -4779,7 +4814,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variance Totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si activé, le système publiera automatiquement les écritures comptables pour l'inventaire."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Courtage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,La présence de l'employé {0} est déjà marquée pour cette journée
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,La présence de l'employé {0} est déjà marquée pour cette journée
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",en Minutes Mises à Jour via le 'Journal des Temps'
 DocType: Customer,From Lead,Du Prospect
@@ -4790,6 +4825,7 @@
 DocType: Lab Test,Approved Date,Date Approuvée
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
+DocType: Subscriber,Subscriber Name,Nom de l&#39;abonné
 DocType: Serial No,Out of Warranty,Hors Garantie
 DocType: BOM Update Tool,Replace,Remplacer
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Aucun Produit trouvé.
@@ -4799,19 +4835,18 @@
 DocType: Request for Quotation Item,Project Name,Nom du Projet
 DocType: Customer,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
 DocType: Journal Entry Account,If Income or Expense,Si Produits ou Charges
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Sélectionnez le compte de revenu d&#39;intérêts dans le prêt-emploi {0}
 DocType: Work Order,Required Items,Articles Requis
 DocType: Stock Ledger Entry,Stock Value Difference,Différence de Valeur du Sock
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Ressource Humaine
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Paiement de Réconciliation des Paiements
 DocType: Disease,Treatment Task,Tâche de traitement
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Actifs d'Impôts
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Actifs d'Impôts
 DocType: BOM Item,BOM No,N° LDM
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,L’Écriture de Journal {0} n'a pas le compte {1} ou est déjà réconciliée avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne Mobile
 DocType: BOM Update Tool,The BOM which will be replaced,La LDM qui sera remplacée
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equipements Électroniques
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Equipements Électroniques
 DocType: Asset,Maintenance Required,Maintenance requise
 DocType: Account,Debit,Débit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Les Congés doivent être alloués par multiples de 0,5"
@@ -4820,7 +4855,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Montant en suspens
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Définir des objectifs par Groupe d'Articles pour ce Commercial
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Geler les Articles plus Anciens que [Jours]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ligne #{0} : L’Actif est obligatoire pour les achats / ventes d’actifs immobilisés
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ligne #{0} : L’Actif est obligatoire pour les achats / ventes d’actifs immobilisés
 DocType: Asset Maintenance Team,Maintenance Team Name,Nom de l&#39;équipe de maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si deux Règles de Prix ou plus sont trouvées sur la base des conditions ci-dessus, une Priorité est appliquée. La Priorité est un nombre compris entre 0 et 20 avec une valeur par défaut de zéro (vide). Les nombres les plus élévés sont prioritaires s'il y a plusieurs Règles de Prix avec mêmes conditions."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Le client est obligatoire si l&#39;option &quot;Opportunité de&quot; est sélectionnée en tant que client
@@ -4829,19 +4864,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivant à approuver les demandes de congés durant les jours bloqués.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Types de Notes de Frais.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le prix de vente pour l'élément {0} est inférieur à son {1}. Le prix de vente devrait être au moins {2}
-DocType: Item,Taxes,Taxes
+DocType: Subscription,Taxes,Taxes
 DocType: Purchase Invoice,capital goods,biens d&#39;équipement
 DocType: Purchase Invoice Item,Weight Per Unit,Poids par unité
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Payé et Non Livré
 DocType: Project,Default Cost Center,Centre de Coûts par Défaut
-DocType: Bank Guarantee,End Date,Date de Fin
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions du Stock
 DocType: Budget,Budget Accounts,Comptes de Budgets
 DocType: Employee,Internal Work History,Historique de Travail Interne
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Montant d'Amortissement Cumulé
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Capital Risque
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Capital Investissement
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variable de la Fiche d'Évaluation Fournisseur
-DocType: Employee Loan,Fully Disbursed,Entièrement Remboursé
 DocType: Employee Advance,Due Advance Amount,Montant anticipé dû
 DocType: Maintenance Visit,Customer Feedback,Retour d'Expérience Client
 DocType: Account,Expense,Charges
@@ -4859,13 +4892,13 @@
 DocType: Assessment Group,Parent Assessment Group,Groupe d’Évaluation Parent
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Emplois
 ,Sales Order Trends,Tendances des Commandes Client
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,The 'From Package No.' field must neither be empty nor it's value less than 1.,Le 'No de Paquet .' Le champ ne doit pas être vide ni sa valeur être inférieure à 1.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,The 'From Package No.' field must neither be empty nor it's value less than 1.,Le champ 'N° de Paquet' ne doit pas être vide ni sa valeur être inférieure à 1.
 DocType: Employee,Held On,Tenu le
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +36,Production Item,Article de Production
 ,Employee Information,Renseignements sur l'Employé
 DocType: Stock Entry Detail,Additional Cost,Frais Supplémentaire
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Créer un Devis Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Créer un Devis Fournisseur
 DocType: Quality Inspection,Incoming,Entrant
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Les modèles de taxe par défaut pour les ventes et les achats sont créés.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Le Résultat d'Évaluation {0} existe déjà.
@@ -4873,7 +4906,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Veuillez laisser le filtre de la Société vide si Group By est 'Société'
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,La Date de Publication ne peut pas être une date future
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0} : N° de série {1} ne correspond pas à {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pour générer le document récurrent
 DocType: Stock Entry,Target Warehouse Address,Adresse de l&#39;entrepôt cible
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Congé Occasionnel
 DocType: Agriculture Task,End Day,Jour de fin
@@ -4898,11 +4930,10 @@
 DocType: Material Request,% Ordered,% Commandé
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pour un groupe étudiant basé sur un cours, le cours sera validé pour chaque élève inscrit aux cours du programme."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Travail à la Pièce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Moy. Taux d'achat
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Share Balance,From No,De Non
 DocType: Task,Actual Time (in Hours),Temps Réel (en Heures)
 DocType: Employee,History In Company,Ancienneté dans la Société
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nouveau message de {expéditeur}
 DocType: Customer,Customer Primary Address,Adresse principale du client
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Drug Prescription,Description/Strength,Description / Force
@@ -4911,22 +4942,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Le même article a été saisi plusieurs fois
 DocType: Department,Leave Block List,Liste de Blocage des Congés
 DocType: Purchase Invoice,Tax ID,Numéro d'Identification Fiscale
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'article {0} n'est pas configuré pour un Numéros de Série. La colonne doit être vide
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,L'article {0} n'est pas configuré pour un Numéros de Série. La colonne doit être vide
 DocType: Accounts Settings,Accounts Settings,Paramètres des Comptes
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Approuver
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Adresse malformatée pour {0}, veuillez corriger pour continuer."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Adresse malformatée pour {0}, veuillez corriger pour continuer."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Numéro du nouveau compte, il sera inclus dans le nom du compte en tant que préfixe"
 DocType: Maintenance Team Member,Team Member,Membre de l&#39;équipe
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Aucun résultat à soumettre
 DocType: Customer,Sales Partner and Commission,Partenaire Commercial et Commission
-DocType: Employee Loan,Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année
+DocType: Loan,Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année
 ,Project Quantity,Quantité de Projet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
 DocType: Opportunity,To Discuss,À Discuter
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaires dans {2} pour compléter cette transaction.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taux d'Intérêt (%) Annuel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Comptes Temporaires
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Noir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Comptes Temporaires
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article Eclaté LDM
 DocType: Shareholder,Contact List,Liste de contacts
 DocType: Account,Auditor,Auditeur
@@ -4934,16 +4965,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} articles produits
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Apprendre Plus
 DocType: Cheque Print Template,Distance from top edge,Distance du bord supérieur
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Liste des Prix {0} est désactivée ou n'existe pas
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Liste des Prix {0} est désactivée ou n'existe pas
 DocType: Purchase Invoice,Return,Retour
 DocType: Pricing Rule,Disable,Désactiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Mode de paiement est requis pour effectuer un paiement
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Mode de paiement est requis pour effectuer un paiement
 DocType: Project Task,Pending Review,Revue en Attente
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Modifier en pleine page pour plus d&#39;options comme les actifs, les numéros de série, les lots, etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Rendez-Vous et Consultations
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} n'est pas inscrit dans le Lot {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","L'actif {0} ne peut pas être mis au rebut, car il est déjà {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Chèques requis
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Chèques requis
 DocType: Task,Total Expense Claim (via Expense Claim),Total des Notes de Frais (via Note de Frais)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marquer Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Échec de la configuration de la société
@@ -4955,7 +4986,7 @@
 DocType: Homepage,Tag Line,Ligne de Tag
 DocType: Fee Component,Fee Component,Composant d'Honoraires
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestion de Flotte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Ajouter des articles de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Ajouter des articles de
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Cultures et terres
 DocType: Cheque Print Template,Regular,Ordinaire
 DocType: Fertilizer,Density (if liquid),Densité (si liquide)
@@ -4980,24 +5011,26 @@
 DocType: Payment Entry,Paid Amount,Montant Payé
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Explorez le Cycle de Vente
 DocType: Assessment Plan,Supervisor,Superviseur
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Entrée de Stock de rétention
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Entrée de Stock de rétention
 ,Available Stock for Packing Items,Stock Disponible pour les Articles d'Emballage
 DocType: Item Variant,Item Variant,Variante de l'Article
-,Work Order Stock Report,Rapport de stock de commande
+,Work Order Stock Report,Rapport de stock d'ordre de travail
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Outil de Résultat d'Évaluation
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,En tant que superviseur
-apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Proposer une catégorie
+apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Suggérer une catégorie
 DocType: BOM Scrap Item,BOM Scrap Item,Article Mis au Rebut LDM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestion de la Qualité
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestion de la Qualité
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,L'article {0} a été désactivé
 DocType: Project,Total Billable Amount (via Timesheets),Montant total facturable (via les feuilles de temps)
 DocType: Agriculture Task,Previous Business Day,Jour ouvrable précédent
-DocType: Employee Loan,Repay Fixed Amount per Period,Rembourser un Montant Fixe par Période
+DocType: Loan,Repay Fixed Amount per Period,Rembourser un Montant Fixe par Période
 DocType: Employee,Health Insurance No,Assurance-maladie Non
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Veuillez entrer une quantité pour l'article {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Mnt de la Note de Crédit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Mnt de la Note de Crédit
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Montant total imposable
 DocType: Employee External Work History,Employee External Work History,Antécédents Professionnels de l'Employé
 DocType: Opening Invoice Creation Tool,Purchase,Achat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Solde de la Qté
@@ -5008,15 +5041,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pour {1}
 DocType: Healthcare Settings,Valid number of days,Nombre de Jours Ouvrés
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centres de Coûts
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Redémarrer l&#39;abonnement
 DocType: Land Unit,Linked Plant Analysis,Analyse des plantes liées
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la devise du fournisseur est convertie en devise société de base
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ligne #{0}: Minutage en conflit avec la ligne {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Autoriser un Taux de Valorisation Égal à Zéro
+DocType: Bank Guarantee,Receiving,Réception
 DocType: Training Event Employee,Invited,Invité
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Plusieurs Grilles de Salaires Actives trouvées pour l'employé {0} pour les dates données
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Configuration des Comptes passerelle.
 DocType: Employee,Employment Type,Type d'Emploi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Actifs Immobilisés
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Actifs Immobilisés
 DocType: Payment Entry,Set Exchange Gain / Loss,Définir le change Gain / Perte
 ,GST Purchase Register,Registre d'Achat GST
 ,Cash Flow,Flux de Trésorerie
@@ -5036,9 +5071,10 @@
 DocType: Academic Term,Term Start Date,Date de Début du Terme
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Liste de toutes les transactions sur actions
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Compte d'Opportunités
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Veuillez trouver ci-joint {0} # {1}
-apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Taux moyen
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,La date de début de la période d&#39;essai et la date de fin de la période d&#39;essai doivent être définies
+apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prix moyen
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
 DocType: Job Applicant,Applicant Name,Nom du Candidat
 DocType: Authorization Rule,Customer / Item Name,Nom du Client / de l'Article
@@ -5069,6 +5105,7 @@
 DocType: Work Order,Warehouses,Entrepôts
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actif ne peut pas être transféré
 DocType: Hotel Room Pricing,Hotel Room Pricing,Prix de la chambre d&#39;hôtel
+DocType: Subscription,Days Until Due,Jours jusqu&#39;à échéance
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Cet article est une Variante de {0} (Modèle).
 DocType: Workstation,per hour,par heure
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Achat
@@ -5077,13 +5114,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Pour un groupe étudiant basé sur un lot, le lot étudiant sera validé pour chaque élève inscrit au programme."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'entrepôt ne peut pas être supprimé car une écriture existe dans le Livre d'Inventaire pour cet entrepôt.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribution
+DocType: Journal Entry Account,Loan,Prêt
 DocType: Expense Claim Advance,Expense Claim Advance,Demande de remboursement anticipé
 DocType: Lab Test,Report Preference,Préférence de Rapport
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informations sur le bénévolat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Chef de Projet
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Chef de Projet
 ,Quoted Item Comparison,Comparaison d'Article Soumis
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Chevauchement dans la notation entre {0} et {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Envoi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Réduction max autorisée pour l'article : {0} est de {1} %
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Valeur Nette des Actifs au
 DocType: Crop,Produce,Produire
@@ -5091,9 +5129,9 @@
 DocType: Account,Receivable,Créance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ligne #{0} : Changement de Fournisseur non autorisé car un Bon de Commande existe déjà
 DocType: Stock Entry,Material Consumption for Manufacture,Consommation de matériaux pour la fabrication
-DocType: Item Alternative,Alternative Item Code,Code d&#39;article alternatif
+DocType: Item Alternative,Alternative Item Code,Code de l'article alternatif
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
 DocType: Delivery Stop,Delivery Stop,Arrêt de Livraison
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
 DocType: Item,Material Issue,Sortie de Matériel
@@ -5103,15 +5141,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Savons & Détergents
 DocType: BOM,Show Items,Afficher les Articles
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,L’Horaire Initial ne peut pas être postérieur à l’Horaire Final
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Voulez-vous informer tous les clients par courriel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Voulez-vous informer tous les clients par courriel?
+DocType: Subscription Plan,Billing Interval,Intervalle de facturation
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Cinéma & Vidéo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,CV
 DocType: Hub Settings,Hub Username,Hub Username
 DocType: Salary Detail,Component,Composant
 DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
 DocType: Healthcare Settings,Patient Name By,Nom du patient par
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Accumulation de journal pour les salaires de {0} à {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Ecritures de journal de provisions pour les salaires de {0} à {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
@@ -5125,22 +5163,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez conserver la hauteur, le poids, les allergies, les préoccupations médicales etc."
 DocType: Leave Block List,Applies to Company,S'applique à la Société
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'Écriture de Stock soumise {0} existe
-DocType: Employee Loan,Disbursement Date,Date de Décaissement
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,«Destinataires» non spécifiés
+DocType: Loan,Disbursement Date,Date de Décaissement
 DocType: BOM Update Tool,Update latest price in all BOMs,Mettre à jour le prix le plus récent dans toutes les LDMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Dossier médical
 DocType: Vehicle,Vehicle,Véhicule
 DocType: Purchase Invoice,In Words,En Toutes Lettres
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Entrez le nom de la banque ou de l&#39;institution prêteuse avant de le soumettre.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} doit être soumis
 DocType: POS Profile,Item Groups,Groupes d&#39;articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Aujourd'hui c'est l’anniversaire de {0} !
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Aujourd'hui c'est l’anniversaire de {0} !
 DocType: Sales Order Item,For Production,Pour la Production
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Veuillez ajouter un compte d&#39;ouverture temporaire dans le plan comptable
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Veuillez ajouter un compte d&#39;ouverture temporaire dans le plan comptable
 DocType: Customer,Customer Primary Contact,Contact principal du client
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Période Clôture Journal
 DocType: Project Task,View Task,Voir Tâche
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Prospect %
+DocType: Bank Guarantee,Bank Guarantee Type,Type de garantie bancaire
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Portion de facture
 ,Asset Depreciations and Balances,Amortissements et Soldes d'Actif
@@ -5151,9 +5190,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inclure les articles sous-traités
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Joindre
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Qté de Pénurie
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Impossible de modifier les propriétés de la variante suite à des mouvements d'inventaire. Vous devrez créer un nouvel objet pour le faire.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
-DocType: Employee Loan,Repay from Salary,Rembourser avec le Salaire
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
+DocType: Loan,Repay from Salary,Rembourser avec le Salaire
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Demande de Paiement pour {0} {1} pour le montant {2}
 DocType: Salary Slip,Salary Slip,Fiche de Paie
@@ -5177,11 +5215,11 @@
 DocType: Employee Education,Employee Education,Formation de l'Employé
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Groupe d’articles en double trouvé dans la table des groupes d'articles
 DocType: Land Unit,Parent Land Unit,Parcelle parente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
 DocType: Fertilizer,Fertilizer Name,Nom de l&#39;engrais
 DocType: Salary Slip,Net Pay,Salaire Net
 DocType: Cash Flow Mapping Accounts,Account,Compte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,N° de Série {0} a déjà été reçu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,N° de Série {0} a déjà été reçu
 ,Requested Items To Be Transferred,Articles Demandés à Transférer
 DocType: Expense Claim,Vehicle Log,Journal du Véhicule
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Présence de fièvre (temp&gt; 38.5 ° C / 101.3 ° F ou température soutenue&gt; 38 ° C / 100.4 ° F)
@@ -5213,49 +5251,49 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,Les jours de crédit ne peuvent pas être un nombre négatif
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Montant de la Dernière Commande
 DocType: Cash Flow Mapper,e.g Adjustments for:,par exemple des ajustements pour:
-apps/erpnext/erpnext/stock/doctype/item/item.py +275," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} Conserver l&#39;échantillon est basé sur le lot, s&#39;il vous plaît vérifier A Lot non pour conserver l&#39;échantillon de l&#39;article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +275," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","La conservation d'un échantillon de {0} dépend du lot. Veuillez sélectionner ""A un Numéro de Lot"" pour conserver un échantillon de l'article"
 DocType: Task,Is Milestone,Est un Jalon
 DocType: Delivery Stop,Email Sent To,Email Envoyé À
 DocType: Budget,Warn,Avertir
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +108,Are you sure you want to unregister?,Êtes-vous sûr de vouloir vous désinscrire?
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +926,All items have already been transferred for this Work Order.,Tous les articles ont déjà été transférés pour ce bon de travail.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +926,All items have already been transferred for this Work Order.,Tous les articles ont déjà été transférés pour cet ordre de travail.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
 DocType: Asset Maintenance,Manufacturing User,Chargé de Fabrication
 DocType: Purchase Invoice,Raw Materials Supplied,Matières Premières Fournies
-DocType: C-Form,Series,Séries
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},La devise de la liste de prix {0} doit être {1} ou {2}
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Soil Texture,Ternary Plot,Tracé ternaire
 DocType: Item Group,Item Classification,Classification de l'Article
 DocType: Driver,License Number,Numéro de licence
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Directeur Commercial
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Directeur Commercial
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Objectif de la Visite d'Entretien
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Enregistrement de la Facture du Patient
 DocType: Crop,Period,Période
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Grand Livre
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employé {0} en Congé le {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employé {0} en Congé le {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Voir Prospects
 DocType: Program Enrollment Tool,New Program,Nouveau Programme
 DocType: Item Attribute Value,Attribute Value,Valeur de l'Attribut
 ,Itemwise Recommended Reorder Level,Renouvellement Recommandé par Article
 DocType: Salary Detail,Salary Detail,Détails du Salaire
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Veuillez d’abord sélectionner {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Veuillez d’abord sélectionner {0}
 DocType: Appointment Type,Physician,Médecin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Lot {0} de l'Article {1} a expiré.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultations
 DocType: Sales Invoice,Commission,Commission
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne peut pas être supérieur à la quantité planifiée ({2}) dans le bon de travail {3}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne peut pas être supérieur à la quantité planifiée ({2}) dans l'ordre de travail {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Feuille de Temps pour la Fabrication.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sous-Total
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Impossible de modifier les propriétés de variante après la transaction de stock. Vous devrez créer un nouvel objet pour le faire.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandat
 DocType: Physician,Charges,Charges
 DocType: Production Plan,Get Items For Work Order,Obtenir des articles pour la commande de travail
 DocType: Salary Detail,Default Amount,Montant par Défaut
 DocType: Lab Test Template,Descriptive,Descriptif
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,L'entrepôt n'a pas été trouvé dans le système
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,L'entrepôt n'a pas été trouvé dans le système
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Résumé Mensuel
 DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du Contrôle de Qualité
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Geler les stocks datant de plus` doit être inférieur à %d jours.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Geler les stocks datant de plus` doit être inférieur à %d jours.
 DocType: Tax Rule,Purchase Tax Template,Modèle de Taxes pour les Achats
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Définissez l'objectif de ventes que vous souhaitez atteindre pour votre entreprise.
 ,Project wise Stock Tracking,Suivi des Stocks par Projet
@@ -5283,11 +5321,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Échec de la création du site Web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détails de Conversion de l'UDM
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Saisie de stock de rétention déjà créée ou quantité d&#39;échantillon non fournie
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Saisie de stock de rétention déjà créée ou quantité d&#39;échantillon non fournie
 DocType: Program,Program Abbreviation,Abréviation du Programme
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article
 DocType: Warranty Claim,Resolved By,Résolu Par
-DocType: Bank Guarantee,Start Date,Date de Début
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Allouer des congés pour une période.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chèques et Dépôts incorrectement compensés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
@@ -5302,11 +5339,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Heures
 DocType: Project,Expected Start Date,Date de Début Prévue
 DocType: Purchase Invoice,04-Correction in Invoice,04-Correction dans la facture
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Ordre de travail déjà créé pour tous les articles avec nomenclature
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Ordre de travail déjà créé pour tous les articles avec une LDM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Rapport détaillé des variantes
 DocType: Setup Progress Action,Setup Progress Action,Action de Progression de l'Installation
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Liste de prix d&#39;achat
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Liste de prix d&#39;achat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Retirer l'article si les charges ne lui sont pas applicables
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Annuler l&#39;abonnement
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Veuillez sélectionner le statut de maintenance comme terminé ou supprimer la date de fin
 DocType: Supplier,Default Payment Terms Template,Modèle de termes de paiement par défaut
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,La devise de la Transaction doit être la même que la devise de la Passerelle de Paiement
@@ -5317,7 +5355,6 @@
 DocType: Employee,Educational Qualification,Qualification pour l'Éducation
 DocType: Workstation,Operating Costs,Coûts d'Exploitation
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le Budget Mensuel Cumulé est Dépassé
-DocType: Subscription,Submit on creation,Soumettre à la Création
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Devise pour {0} doit être {1}
 DocType: Asset,Disposal Date,Date d’Élimination
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Les Emails seront envoyés à tous les Employés Actifs de la société à l'heure donnée, s'ils ne sont pas en vacances. Le résumé des réponses sera envoyé à minuit."
@@ -5335,6 +5372,7 @@
 DocType: Batch,Parent Batch,Lot Parent
 DocType: Cheque Print Template,Cheque Print Template,Modèles d'Impression de Chèques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Tableau des Centres de Coûts
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Nombre de jours après que la date de la facture s&#39;est écoulée avant d&#39;annuler l&#39;abonnement ou de marquer l&#39;abonnement comme impayé
 DocType: Lab Test Template,Sample Collection,Collecte d'Échantillons
 ,Requested Items To Be Ordered,Articles Demandés à Commander
 DocType: Price List,Price List Name,Nom de la Liste de Prix
@@ -5343,13 +5381,13 @@
 DocType: Account,Income,Revenus
 DocType: Industry Type,Industry Type,Secteur d'Activité
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Quelque chose a mal tourné !
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Attention : la demande de congé contient les dates bloquées suivantes
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Attention : la demande de congé contient les dates bloquées suivantes
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,La Facture Vente {0} a déjà été transmise
 DocType: Supplier Scorecard Scoring Criteria,Score,Score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Exercice Fiscal {0} n'existe pas
 DocType: Asset Maintenance Log,Completion Date,Date d'Achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
-DocType: Agriculture Analysis Criteria,Agriculture User,Utilisateur Agricole
+DocType: Agriculture Analysis Criteria,Agriculture User,Agriculteur
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,La date de validité ne peut pas être avant la date de transaction
 apps/erpnext/erpnext/stock/stock_ledger.py +381,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unités de {1} nécessaires dans {2} sur {3} {4} pour {5} pour compléter cette transaction.
 DocType: Fee Schedule,Student Category,Catégorie Étudiant
@@ -5363,17 +5401,17 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Profil de Point-De-Vente
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} devrait être une valeur comprise entre 0 et 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,La prochaine date d&#39;amortissement ne peut être antérieure à la date de disponibilité.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prêts Non Garantis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Prêts Non Garantis
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Heures de Travail Max pour une Feuille de Temps
 DocType: Maintenance Schedule Detail,Scheduled Date,Date Prévue
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Mnt Total Payé
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Mnt Total Payé
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Message de plus de 160 caractères sera découpé en plusieurs messages
 DocType: Purchase Receipt Item,Received and Accepted,Reçus et Acceptés
 DocType: Hub Settings,Company and Seller Profile,Profil de l&#39;entreprise et du vendeur
 ,GST Itemised Sales Register,Registre de Vente Détaillé GST
-DocType: Soil Texture,Silt Loam,Limon de limon
+DocType: Soil Texture,Silt Loam,Limon fin
 ,Serial No Service Contract Expiry,Expiration du Contrat de Service du N° de Série
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Vous ne pouvez pas créditer et débiter le même compte simultanément
 DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Le pouls d'un adulte est compris entre 50 et 80 battements par minute.
@@ -5382,10 +5420,9 @@
 DocType: Item,Variant Based On,Variante Basée Sur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Le total des pondérations attribuées devrait être de 100 %. Il est {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vos Fournisseurs
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Veuillez corriger le
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
 DocType: Request for Quotation Item,Supplier Part No,N° de Pièce du Fournisseur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonyme
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Reçu De
 DocType: Lead,Converted,Converti
@@ -5399,6 +5436,7 @@
 DocType: Asset,Assets,Actifs
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
+DocType: Subscription,Current Invoice End Date,Date de fin de la facture actuelle
 DocType: Payment Term,Due Date Based On,Date d&#39;échéance basée sur
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Configurez le groupe de clients et le territoire par défaut dans les paramètres de vente
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} n'existe pas
@@ -5406,10 +5444,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Article : {0} n'existe pas dans le système
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à définir des valeurs gelées
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenir les Écritures non Réconcilliées
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Aucun remboursement sélectionné pour l&#39;entrée au journal
 DocType: Payment Reconciliation,From Invoice Date,De la Date de la Facture
+DocType: Loan,Disbursed,Décaissé
 DocType: Healthcare Settings,Laboratory Settings,Paramètres de laboratoire
-DocType: Patient Appointment,Service Unit,Unité de service
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Définir avec succès le fournisseur
+DocType: Patient Appointment,Service Unit,Service
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Fournisseur défini avec succès
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Leave Encashment,Congés Accumulés à Encaisser
 apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,Qu'est-ce que ça fait ?
 DocType: Crop,Byproducts,"Sous-produits, dérivé"
@@ -5419,12 +5459,12 @@
 DocType: Share Balance,No of Shares,Nombre d&#39;actions
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Sélectionnez le Statut
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La présence ne peut pas être marquée pour les dates à venir
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,La présence ne peut pas être marquée pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Aide pour les Règles de Tarification
 DocType: School House,House Name,Nom de la Maison
 DocType: Fee Schedule,Total Amount per Student,Montant total par étudiant
 DocType: Purchase Taxes and Charges,Account Head,Compte Principal
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Électrique
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Électrique
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ajouter le reste de votre organisation en tant qu'utilisateurs. Vous pouvez aussi inviter des Clients sur votre portail en les ajoutant depuis les Contacts
 DocType: Stock Entry,Total Value Difference (Out - In),Différence Valeur Totale (Sor - En)
 DocType: Grant Application,Requested Amount,Quantité exigée
@@ -5434,7 +5474,7 @@
 DocType: Crop Cycle,Detected Diseases,Maladies détectées
 DocType: Stock Entry,Default Source Warehouse,Entrepôt Source par Défaut
 DocType: Item,Customer Code,Code Client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
 DocType: Asset Maintenance Task,Last Completion Date,Dernière date d&#39;achèvement
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours Depuis la Dernière Commande
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
@@ -5442,9 +5482,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Paramètres GoCardless
 DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de Début d'Assurance devrait être antérieure à la Date de Fin d'Assurance
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actifs du Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Actifs du Stock
 DocType: Restaurant,Active Menu,Menu Actif
 DocType: Target Detail,Target Qty,Qté Cible
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Contre prêt: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Réglages Règlement
 DocType: Student Attendance,Present,Présent
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Bon de Livraison {0} ne doit pas être soumis
@@ -5453,21 +5494,22 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Fiche de Paie de l'employé {0} déjà créée pour la feuille de temps {1}
 DocType: Vehicle Log,Odometer,Odomètre
 DocType: Production Plan Item,Ordered Qty,Qté Commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Article {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Gelé Jusqu'au
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,LDM ne contient aucun article en stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,LDM ne contient aucun article en stock
 DocType: Chapter,Chapter Head,Chef de chapitre
 DocType: Payment Term,Month(s) after the end of the invoice month,Mois (s) après la fin du mois de la facture
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Activité du projet / tâche.
 DocType: Vehicle Log,Refuelling Details,Détails de Ravitaillement
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Générer les Fiches de Paie
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Le résultat de laboratoire datetime ne peut pas être avant de tester datetime
-DocType: POS Profile,Allow user to edit Discount,Autoriser l&#39;utilisateur à modifier
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Obtenez des clients de
+DocType: POS Profile,Allow user to edit Discount,Autoriser l'utilisateur à modifier la remise
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Obtenez des clients de
 DocType: Purchase Invoice Item,Include Exploded Items,Inclure les éléments éclatés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifié, si Applicable Pour {0} est sélectionné"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 DocType: Shipping Rule,Restrict to Countries,Restreindre aux pays
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir la série de dénomination pour {0} via Configuration&gt; Paramètres&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montant de la Reprise (Devise Société)
 DocType: Sales Invoice Timesheet,Billing Hours,Heures Facturées
 DocType: Project,Total Sales Amount (via Sales Order),Montant total des ventes (via la commande client)
@@ -5475,15 +5517,16 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +514,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Choisissez des articles pour les ajouter ici
 DocType: Fees,Program Enrollment,Inscription au Programme
-DocType: Share Transfer,To Folio No,Pour Folio Non
+DocType: Share Transfer,To Folio No,Au N. de Folio
 DocType: Landed Cost Voucher,Landed Cost Voucher,Référence de Coût au Débarquement
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Veuillez définir {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 DocType: Employee,Health Details,Détails de Santé
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis"
-DocType: Soil Texture,Sandy Clay,Sol argileux
+DocType: Soil Texture,Sandy Clay,Argile sableuse
 DocType: Grant Application,Assessment  Manager,Gestionnaire d&#39;évaluation
 DocType: Payment Entry,Allocate Payment Amount,Allouer le Montant du Paiement
+DocType: Subscription Plan,Subscription Plan,Plan d&#39;abonnement
 DocType: Employee External Work History,Salary,Salaire
 DocType: Serial No,Delivery Document Type,Type de Document de Livraison
 DocType: Sales Order,Partly Delivered,Livré en Partie
@@ -5508,9 +5551,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Balance Agée 2
 DocType: SG Creation Tool Course,Max Strength,Force Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installation de presets
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Aucun bon de livraison sélectionné pour le client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Aucun bon de livraison sélectionné pour le client {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,LDM Remplacée
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Sélectionnez les articles en fonction de la Date de Livraison
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Sélectionnez les articles en fonction de la Date de Livraison
 DocType: Grant Application,Has any past Grant Record,A un record de subvention passé
 ,Sales Analytics,Analyse des Ventes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponible {0}
@@ -5528,7 +5571,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coût des Matières Premières Fournies
 DocType: Selling Settings,Settings for Selling Module,Réglages pour le Module Vente
 DocType: Hotel Room Reservation,Hotel Room Reservation,Réservation de chambre d&#39;hôtel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Service Client
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Service Client
 DocType: BOM,Thumbnail,Vignette
 DocType: Item Customer Detail,Item Customer Detail,Détail de l'Article Client
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Proposer un Emploi au candidat
@@ -5541,10 +5584,10 @@
 apps/erpnext/erpnext/config/accounts.py +288,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
 DocType: Maintenance Visit,MV,MV
 DocType: Restaurant,Default Tax Template,Modèle de Taxes par Défaut
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Les étudiants ont été inscrits
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} étudiants ont été inscrits
 DocType: Fees,Student Details,Détails de l'Étudiant
 DocType: Purchase Invoice Item,Stock Qty,Qté en Stock
-DocType: Employee Loan,Repayment Period in Months,Période de Remboursement en Mois
+DocType: Loan,Repayment Period in Months,Période de Remboursement en Mois
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erreur : Pas un identifiant valide ?
 DocType: Naming Series,Update Series Number,Mettre à Jour la Série
 DocType: Account,Equity,Capitaux Propres
@@ -5552,8 +5595,8 @@
 DocType: Sales Order,Printing Details,Détails d'Impression
 DocType: Task,Closing Date,Date de Clôture
 DocType: Sales Order Item,Produced Quantity,Quantité Produite
-DocType: Timesheet,Work Detail,Détail du travail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingénieur
+DocType: Timesheet,Work Detail,Détail du Travail
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingénieur
 DocType: Journal Entry,Total Amount Currency,Montant Total en Devise
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Rechercher les Sous-Ensembles
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Code de l'Article est requis à la Ligne No {0}
@@ -5571,7 +5614,7 @@
 DocType: SMS Center,All Employee (Active),Tous les Employés (Actifs)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Voir Maintenant
 DocType: BOM,Raw Material Cost,Coût de Matière Première
-DocType: Woocommerce Settings,Woocommerce Server URL,Woocommerce Serveur URL
+DocType: Woocommerce Settings,Woocommerce Server URL,URL du Serveur Woocommerce
 DocType: Item Reorder,Re-Order Level,Niveau de Réapprovisionnement
 apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Diagramme de Gantt
 DocType: Crop Cycle,Cycle Type,Type de cycle
@@ -5598,13 +5641,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informations sur le type de donneur.
 DocType: Request for Quotation,Supplier Detail,Détails du Fournisseur
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Erreur dans la formule ou dans la condition : {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Montant Facturé
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Montant Facturé
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Le total des pondérations des critères doit être égal à 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Présence
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Articles de Stock
 DocType: BOM,Materials,Matériels
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si décochée, la liste devra être ajoutée à chaque département où elle doit être appliquée."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Création de {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Entrepôt Source et Destination ne peuvent pas être le même
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,La Date et l’heure de comptabilisation sont obligatoires
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modèle de taxe pour les opérations d’achat.
@@ -5617,7 +5659,7 @@
 DocType: Dosage Form,Dosage Form,Formulaire de Dosage
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Données de Base des Listes de Prix
 DocType: Task,Review Date,Date de Revue
-DocType: BOM,Allow Alternative Item,Autoriser l&#39;élément alternatif
+DocType: BOM,Allow Alternative Item,Autoriser un article alternatif
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Série pour la Dépréciation d'Actifs (Entrée de Journal)
 DocType: Membership,Member Since,Membre depuis
 DocType: Purchase Invoice,Advance Payments,Paiements Anticipés
@@ -5628,14 +5670,14 @@
 DocType: Shipping Rule,Fixed,Fixé
 DocType: Vehicle Service,Clutch Plate,Plaque d'Embrayage
 DocType: Company,Round Off Account,Compte d’Arrondi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Charges Administratives
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Charges Administratives
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consultant
 DocType: Customer Group,Parent Customer Group,Groupe Client Parent
-DocType: Journal Entry,Subscription,Abonnement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Email du Contact
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Création d'honoraires en attente
 DocType: Appraisal Goal,Score Earned,Score Gagné
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Période de Préavis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Période de Préavis
 DocType: Asset Category,Asset Category Name,Nom de Catégorie d'Actif
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Il s’agit d’une région racine qui ne peut être modifiée.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nouveau Nom de Commercial
@@ -5648,7 +5690,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laisser désactivé si vous ne souhaitez pas considérer les lots en faisant des groupes basés sur les cours.
 DocType: Asset,Frequency of Depreciation (Months),Fréquence des Amortissements (Mois)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Compte Créditeur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Compte Créditeur
 DocType: Landed Cost Item,Landed Cost Item,Coût de l'Article au Débarquement
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
@@ -5656,7 +5698,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte Débiteur / Créditeur
 DocType: Delivery Note Item,Against Sales Order Item,Pour l'Article de la Commande Client
 DocType: Hub Settings,Company Logo,Logo d&#39;entreprise
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
 DocType: Item,Default Warehouse,Entrepôt par Défaut
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué pour le Compte de Groupe {0}
 DocType: Healthcare Settings,Patient Registration,Inscription du patient
@@ -5690,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,Total Débit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Entrepôt de Produits Finis par Défaut
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Veuillez sélectionner Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendeur
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendeur
 DocType: Hotel Room Package,Amenities,Équipements
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Centre de Budget et Coûts
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,De multiples modes de paiement par défaut ne sont pas autorisés
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pour le
 ,Appointment Analytics,Analyse des Rendez-Vous
 DocType: Vehicle Service,Half Yearly,Semestriel
 DocType: Lead,Blog Subscriber,Abonné au Blog
@@ -5709,7 +5750,8 @@
 DocType: Opening Invoice Creation Tool,Create Missing Party,Créer une partie manquante
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laisser vide si vous faites des groupes d'étudiants par année
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si cochée, Le nombre total de Jours Ouvrés comprendra les vacances, ce qui réduira la valeur du Salaire Par Jour"
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Les applications utilisant la clé actuelle ne pourront pas accéder, êtes-vous sûr?"
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Les applications utilisant la clé actuelle ne pourront plus y accéder, êtes-vous sûr?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Total Avance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Modifier le Code du Modèle
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être antérieure à la Date de Début de Terme. Veuillez corriger les dates et essayer à nouveau.
@@ -5720,14 +5762,15 @@
 DocType: Opportunity Item,Basic Rate,Taux de Base
 DocType: GL Entry,Credit Amount,Montant du Crédit
 DocType: Cheque Print Template,Signatory Position,Position Signataire
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Définir comme Perdu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Définir comme Perdu
 DocType: Timesheet,Total Billable Hours,Total des Heures Facturables
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Nombre de jours pendant lesquels l&#39;abonné doit payer les factures générées par cet abonnement
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Bon de Réception du Paiement
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Basé sur les transactions avec ce client. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Ligne {0} : Le montant alloué {1} doit être inférieur ou égal au montant du Paiement {2}
 DocType: Program Enrollment Tool,New Academic Term,Nouveau terme académique
 ,Course wise Assessment Report,Rapport d'Évaluation par Cours
-DocType: Purchase Invoice,Availed ITC State/UT Tax,État de taxe ITC / UT épuisé
+DocType: Purchase Invoice,Availed ITC State/UT Tax,Taxes ITC / UT utilisées
 DocType: Tax Rule,Tax Rule,Règle de Taxation
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Maintenir le Même Taux Durant le Cycle de Vente
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifier les journaux de temps en dehors des Heures de Travail du Bureau.
@@ -5735,17 +5778,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,Clients dans la File d'Attente
 DocType: Driver,Issuing Date,Date d&#39;émission
 DocType: Student,Nationality,Nationalité
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +109,Submit this Work Order for further processing.,Soumettez ce bon de travail pour un traitement ultérieur.
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +109,Submit this Work Order for further processing.,Soumettre cet ordre de travail pour continuer son traitement.
 ,Items To Be Requested,Articles À Demander
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir le Dernier Tarif d'Achat
 DocType: Company,Company Info,Informations sur la Société
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Sélectionner ou ajoutez nouveau client
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Emplois des Ressources (Actifs)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Basé sur la présence de cet Employé
 DocType: Assessment Result,Summary,Résumé
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Noter la Présence
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Compte de Débit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Compte de Débit
 DocType: Fiscal Year,Year Start Date,Date de Début de l'Exercice
 DocType: Attendance,Employee Name,Nom de l'Employé
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Poste de commande de restaurant
@@ -5757,20 +5800,20 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montant de l'Achat
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Devis Fournisseur {0} créé
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,L'Année de Fin ne peut pas être avant l'Année de Début
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Avantages de l'Employé
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Avantages de l'Employé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},La quantité emballée doit être égale à la quantité pour l'Article {0} à la ligne {1}
 DocType: Work Order,Manufactured Qty,Qté Fabriquée
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Les partages n&#39;existent pas avec le {0}
+apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Les actions n'existent pas pour {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Facture Créée
 DocType: Asset,Out of Order,Hors service
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité Acceptée
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorer le chevauchement de temps de poste de travail
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0} : {1} n’existe pas
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Sélectionnez les Numéros de Lot
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises pour des Clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du Projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ligne N° {0}: Le montant ne peut être supérieur au Montant en Attente pour la Note de Frais {1}. Le Montant en Attente est de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ligne N° {0}: Le montant ne peut être supérieur au Montant en Attente pour la Note de Frais {1}. Le Montant en Attente est de {2}
 DocType: Patient Service Unit,Medical Administrator,Administrateur médical
 DocType: Assessment Plan,Schedule,Calendrier
 DocType: Account,Parent Account,Compte Parent
@@ -5800,15 +5843,16 @@
 DocType: Asset Repair,Repair Status,État de réparation
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qté Disponible Depuis l'Entrepôt
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Veuillez d’abord sélectionner le Dossier de l'Employé.
 DocType: POS Profile,Account for Change Amount,Compte pour le Rendu de Monnaie
 DocType: Purchase Invoice,input service,service d&#39;entrée
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ligne {0} : Tiers / Compte ne correspond pas à {1} / {2} en {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Membre de l&#39;équipe de maintenance
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analyse du sol
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Code du Cours:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Veuillez entrer un Compte de Charges
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Veuillez entrer un Compte de Charges
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
 DocType: Employee,Current Address,Adresse Actuelle
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article est une variante d'un autre article, alors la description, l'image, le prix, les taxes etc seront fixés à partir du modèle sauf si spécifiés explicitement"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
@@ -5856,20 +5900,20 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions pour {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nom de la Variable
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","L'article {0} est un modèle, veuillez sélectionner l'une de ses variantes"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","L'article {0} est un modèle, veuillez sélectionner l'une de ses variantes"
 DocType: Asset,Asset Category,Catégorie d'Actif
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salaire Net ne peut pas être négatif
 DocType: Purchase Order,Advance Paid,Avance Payée
 DocType: Item,Item Tax,Taxe sur l'Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Du Matériel au Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Du Matériel au Fournisseur
 DocType: Soil Texture,Loamy Sand,Sable limoneux
 DocType: Production Plan,Material Request Planning,Planification des demandes de matériel
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Facture d'Accise
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Le seuil {0}% apparaît plus d'une fois
 DocType: Expense Claim,Employees Email Id,Identifiants Email des employés
 DocType: Employee Attendance Tool,Marked Attendance,Présence Validée
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Dettes Actuelles
-apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,La minuterie a dépassé les heures données.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Dettes Actuelles
+apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,La minuterie a dépassé les heures configurées.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
 DocType: Patient,A Positive,A Positif
 DocType: Program,Program Name,Nom du Programme
@@ -5879,9 +5923,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qté Réelle est obligatoire
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Équipe de Maintenance des Actifs
-DocType: Employee Loan,Loan Type,Type de Prêt
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} a bien été envoyé
+DocType: Loan,Loan Type,Type de Prêt
 DocType: Scheduling Tool,Scheduling Tool,Outil de Planification
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Carte de Crédit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Carte de Crédit
 DocType: BOM,Item to be manufactured or repacked,Article à manufacturer ou à réemballer
 DocType: Employee Education,Major/Optional Subjects,Sujets Principaux / En Option
 DocType: Sales Invoice Item,Drop Ship,Expédition Directe
@@ -5913,7 +5958,7 @@
 DocType: Item,Units of Measure,Unités de Mesure
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la Fabrication pendant les Vacances
 DocType: Sales Invoice,Customer's Purchase Order Date,Date du Bon de Commande du Client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Afficher les Pièces Jointes Publiques
 DocType: Packing Slip,Package Weight Details,Détails du Poids du Paquet
 DocType: Restaurant Reservation,Reservation Time,Heure de réservation
@@ -5928,7 +5973,7 @@
 DocType: Purchase Order,To Receive and Bill,À Recevoir et Facturer
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,La ligne # {0}: Reqd par date ne peut pas être antérieure à la date de la transaction
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produits Présentés
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Modèle des Termes et Conditions
 DocType: Serial No,Delivery Details,Détails de la Livraison
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Le Centre de Coûts est requis à la ligne {0} dans le tableau des Taxes pour le type {1}
@@ -5938,20 +5983,20 @@
 DocType: Driver,Expiry Date,Date d'expiration
 DocType: Healthcare Settings,Employee name and designation in print,Nom et désignation de l'employé sur l'imprimé
 ,accounts-browser,navigateur-de-comptes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Veuillez d’abord sélectionner une Catégorie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Veuillez d’abord sélectionner une Catégorie
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Données de Base du Projet.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pour permettre la sur-facturation ou la sur-commande, mettez à jour ""Indulgence"" dans les Paramètres de Stock ou dans l’Article."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne plus afficher le symbole (tel que $, €...) à côté des montants."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Demi-Journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Demi-Journée)
 DocType: Payment Term,Credit Days,Jours de Crédit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Veuillez sélectionner Patient pour obtenir des tests de laboratoire
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Créer un Lot d'Étudiant
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Est un Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obtenir les Articles depuis LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obtenir les Articles depuis LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Jours de Délai
 DocType: Cash Flow Mapping,Is Income Tax Expense,Est-ce que l&#39;impôt sur le revenu est
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Vérifiez si l'Étudiant réside à la Résidence de l'Institut.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Veuillez entrer des Commandes Clients dans le tableau ci-dessus
 ,Stock Summary,Résumé du Stock
@@ -5962,10 +6007,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Date de Réf.
 DocType: Employee,Reason for Leaving,Raison du Départ
 DocType: BOM Operation,Operating Cost(Company Currency),Coût d'Exploitation (Devise Société)
-DocType: Employee Loan Application,Rate of Interest,Taux d'Intérêt
+DocType: Loan Application,Rate of Interest,Taux d'Intérêt
 DocType: Expense Claim Detail,Sanctioned Amount,Montant Approuvé
 DocType: Item,Shelf Life In Days,Durée de conservation en jours
 DocType: GL Entry,Is Opening,Écriture d'Ouverture
+DocType: Department,Expense Approvers,Approbateurs de dépenses
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}
 DocType: Journal Entry,Subscription Section,Section Abonnement
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Compte {0} n'existe pas
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 789e554..9ddabf8 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,સામગ્રી મુલાકાત લો {0} આ વોરંટી દાવો રદ રદ
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,આકારણી અહેવાલો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,કન્ઝ્યુમર પ્રોડક્ટ્સ
-DocType: Purchase Receipt,Subscription Detail,સબ્સ્ક્રિપ્શન વિગતવાર
 DocType: Supplier Scorecard,Notify Supplier,પુરવઠોકર્તાને સૂચિત કરો
 DocType: Item,Customer Items,ગ્રાહક વસ્તુઓ
 DocType: Project,Costing and Billing,પડતર અને બિલિંગ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} ખાતાવહી ન હોઈ શકે
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com વસ્તુ પ્રકાશિત
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ઈમેઈલ સૂચનો
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,મૂલ્યાંકન
 DocType: Item,Default Unit of Measure,માપવા એકમ મૂળભૂત
 DocType: SMS Center,All Sales Partner Contact,બધા વેચાણ ભાગીદાર સંપર્ક
-DocType: Employee,Leave Approvers,સાક્ષી છોડો
+DocType: Department,Leave Approvers,સાક્ષી છોડો
 DocType: Sales Partner,Dealer,વિક્રેતા
 DocType: Work Order,WO-,ડબલ્યુઓ-
 DocType: Consultation,Investigations,તપાસ
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ઉપલબ્ધતા તપાસો
 DocType: Job Applicant,Job Applicant,જોબ અરજદાર
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,આ પુરવઠોકર્તા સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,કાનૂની
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},વાસ્તવિક પ્રકાર કર પંક્તિ માં આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,કાનૂની
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},વાસ્તવિક પ્રકાર કર પંક્તિ માં આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો {0}
 DocType: Bank Guarantee,Customer,ગ્રાહક
 DocType: Purchase Receipt Item,Required By,દ્વારા જરૂરી
 DocType: Delivery Note,Return Against Delivery Note,ડ લવર નોંધ સામે પાછા ફરો
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ચેતવણી (અથવા જૂથો) જે સામે હિસાબી પ્રવેશ કરવામાં આવે છે અને બેલેન્સ જાળવવામાં આવે છે.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,પ્રક્રિયામાં કોઈ સબમિટ કરેલ પગાર સ્લિપ નથી.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,પ્રક્રિયામાં કોઈ સબમિટ કરેલ પગાર સ્લિપ નથી.
 DocType: Manufacturing Settings,Default 10 mins,10 મિનિટ મૂળભૂત
 DocType: Leave Type,Leave Type Name,પ્રકાર છોડો નામ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ઓપન બતાવો
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ઉપરોક્ત રિકરિંગ માટે આજે આ ક્રિયા કરવી જરૂરી છે
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ચેકઆઉટ
 DocType: Pricing Rule,Apply On,પર લાગુ પડે છે
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,બધા પુરવઠોકર્તા સંપર્ક
 DocType: Support Settings,Support Settings,આધાર સેટિંગ્સ
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,ન્યૂ છોડો અરજી
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,બેચ વસ્તુ સમાપ્તિ સ્થિતિ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,બેંક ડ્રાફ્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Membership,membership validaty section,સભ્યપદ માન્યતા વિભાગ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
 DocType: Consultation,Consultation,પરામર્શ
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,સામગ્રી
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,વેબસાઇટ બનાવી
 DocType: Opening Invoice Creation Tool Item,Quantity,જથ્થો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
 DocType: Employee Education,Year of Passing,પસાર વર્ષ
 DocType: Item,Country of Origin,તે મૂળનો દેશ
 DocType: Soil Texture,Soil Texture Criteria,માટી સંરચના માપદંડ
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,પ્રાથમિક સંપર્ક વિગતો
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ઓપન મુદ્દાઓ
 DocType: Production Plan Item,Production Plan Item,ઉત્પાદન યોજના વસ્તુ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},વપરાશકર્તા {0} પહેલાથી જ કર્મચારી સોંપેલ છે {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},વપરાશકર્તા {0} પહેલાથી જ કર્મચારી સોંપેલ છે {1}
 DocType: Lab Test Groups,Add new line,નવી લાઇન ઉમેરો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
@@ -89,7 +85,7 @@
 ,Delay Days,વિલંબ દિવસો
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ભરતિયું
+DocType: Subscription Invoice,Invoice,ભરતિયું
 DocType: Purchase Invoice Item,Item Weight Details,આઇટમ વજન વિગતો
 DocType: Asset Maintenance Log,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,સંક્ષિપ્ત
 DocType: Appraisal Goal,Score (0-5),સ્કોર (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},રો {0}: {1} {2} સાથે મેળ ખાતું નથી {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ROW # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ROW # {0}:
 DocType: Timesheet,Total Costing Amount,કુલ પડતર રકમ
 DocType: Delivery Note,Vehicle No,વાહન કોઈ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,ભાવ યાદી પસંદ કરો
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,પ્રગતિમાં કામ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,કૃપા કરીને તારીખ પસંદ
 DocType: Daily Work Summary Group,Holiday List,રજા યાદી
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,એકાઉન્ટન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,એકાઉન્ટન્ટ
 DocType: Hub Settings,Selling Price List,વેચાણ કિંમત યાદી
 DocType: Patient,Tobacco Current Use,તમાકુ વર્તમાન ઉપયોગ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,વેચાણ દર
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,વેચાણ દર
 DocType: Cost Center,Stock User,સ્ટોક વપરાશકર્તા
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,ફોન કોઈ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},ન્યૂ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,પ્રારંભિક ઇમેઇલ સૂચન મોકલ્યું
 ,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
 DocType: Soil Texture,Sandy Clay Loam,રેતાળ ક્લે લોમ
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ભાવ અવમૂલ્યન પછી
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,સંબંધિત
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,એટેન્ડન્સ તારીખ કર્મચારીની જોડાયા તારીખ કરતાં ઓછી હોઇ શકે નહીં
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,એટેન્ડન્સ તારીખ કર્મચારીની જોડાયા તારીખ કરતાં ઓછી હોઇ શકે નહીં
 DocType: Grading Scale,Grading Scale Name,ગ્રેડીંગ સ્કેલ નામ
-DocType: Subscription,Repeat on Day,દિવસ પર પુનરાવર્તન કરો
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,આ રુટ ખાતુ અને સંપાદિત કરી શકતા નથી.
 DocType: Sales Invoice,Company Address,કંપનીનું સરનામું
 DocType: BOM,Operations,ઓપરેશન્સ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},માટે ડિસ્કાઉન્ટ આધારે અધિકૃતિ સેટ કરી શકાતો નથી {0}
+DocType: Subscription,Subscription Start Date,ઉમેદવારી પ્રારંભ તારીખ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","બે કૉલમ, જૂના નામ માટે એક અને નવા નામ માટે એક સાથે CSV ફાઈલ જોડો"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} કોઈપણ સક્રિય નાણાકીય વર્ષમાં નથી.
 DocType: Packed Item,Parent Detail docname,પિતૃ વિગતવાર docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","સંદર્ભ: {0}, આઇટમ કોડ: {1} અને ગ્રાહક: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ ટ્રાયલ પીરિયડ પ્રારંભ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,કિલો ગ્રામ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,નોકરી માટે ખોલીને.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{1} પંક્તિ {1} પર ઉપ કોન્ટેક્ટિંગ આઇટમ માટે સ્પષ્ટ નથી BOM
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,સેમ કંપની એક કરતા વધુ વખત દાખલ થયેલ
 DocType: Patient,Married,પરણિત
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},માટે પરવાનગી નથી {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,વસ્તુઓ મેળવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,વસ્તુઓ મેળવો
 DocType: Price List,Price Not UOM Dependant,ભાવ અમોમ આધારિત નથી
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,બ્રેક ઓઈલ
 DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
 ,Completed Work Orders,પૂર્ણ કાર્ય ઓર્ડર્સ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,કરપાત્ર રકમ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,કરપાત્ર રકમ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: BOM,Item Image (if not slideshow),આઇટમ છબી (જોક્સ ન હોય તો)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(કલાક દર / 60) * વાસ્તવિક કામગીરી સમય
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,પંક્તિ # {0}: સંદર્ભ દસ્તાવેજ પ્રકારનો ખર્ચ દાવો અથવા જર્નલ એન્ટ્રી હોવો આવશ્યક છે
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,પંક્તિ # {0}: સંદર્ભ દસ્તાવેજ પ્રકારનો ખર્ચ દાવો અથવા જર્નલ એન્ટ્રી હોવો આવશ્યક છે
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM પસંદ કરો
 DocType: SMS Log,SMS Log,એસએમએસ લોગ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,વિતરિત વસ્તુઓ કિંમત
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,કર્મચારીને આપેલા અગાઉની રકમનું સંચાલન કરો
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ડ લવર નોટિફિકેશન
 DocType: Journal Entry,Opening Entry,ખુલી એન્ટ્રી
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,એકાઉન્ટ પે માત્ર
-DocType: Employee Loan,Repay Over Number of Periods,ચુકવણી બોલ કાળ સંખ્યા
+DocType: Loan,Repay Over Number of Periods,ચુકવણી બોલ કાળ સંખ્યા
 DocType: Stock Entry,Additional Costs,વધારાના ખર્ચ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે એકાઉન્ટ જૂથ રૂપાંતરિત કરી શકતા નથી.
 DocType: Lead,Product Enquiry,ઉત્પાદન ઇન્કવાયરી
 DocType: Education Settings,Validate Batch for Students in Student Group,વિદ્યાર્થી જૂથમાં વિદ્યાર્થીઓ માટે બેચ માન્ય
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},કોઈ રજા રેકોર્ડ કર્મચારી મળી {0} માટે {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},કોઈ રજા રેકોર્ડ કર્મચારી મળી {0} માટે {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,પ્રથમ કંપની દાખલ કરો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,પ્રથમ કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,પ્રથમ કંપની પસંદ કરો
 DocType: Employee Education,Under Graduate,ગ્રેજ્યુએટ હેઠળ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,એચઆર સેટિંગ્સમાં સ્થિતિ સૂચન છોડો માટે ડિફૉલ્ટ નમૂનો સેટ કરો.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,લક્ષ્યાંક પર
 DocType: BOM,Total Cost,કુલ ખર્ચ
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,કર્મચારીનું લોન
 DocType: Fee Schedule,Send Payment Request Email,ચુકવણી વિનંતી ઇમેઇલ મોકલો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} વસ્તુ સિસ્ટમમાં અસ્તિત્વમાં નથી અથવા નિવૃત્ત થઈ ગયેલ છે
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,રિયલ એસ્ટેટ
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,સફળતાપૂર્વક નોંધણી વગર.
 DocType: Assessment Result,Grade,ગ્રેડ
 DocType: Restaurant Table,No of Seats,બેઠકોની સંખ્યા
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ગતિશીલ વિષય ઉમેરવા માટે, જિનજા ટૅગ્સનો ઉપયોગ કરો <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
 DocType: Asset Maintenance Task,Asset Maintenance Task,એસેટ મેન્ટેનન્સ ટાસ્ક
 DocType: SMS Center,All Contact,તમામ સંપર્ક
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,વાર્ષિક પગાર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,વાર્ષિક પગાર
 DocType: Daily Work Summary,Daily Work Summary,દૈનિક કામ સારાંશ
 DocType: Period Closing Voucher,Closing Fiscal Year,ફિસ્કલ વર્ષ બંધ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} સ્થિર છે
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,સ્ટોક ખર્ચ
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,સ્ટોક ખર્ચ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,પસંદ લક્ષ્યાંક વેરહાઉસ
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,કૃપા કરીને દાખલ મનપસંદ સંપર્ક ઇમેઇલ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,કૃપા કરીને દાખલ મનપસંદ સંપર્ક ઇમેઇલ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAxNum
 DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
 DocType: Journal Entry Account,Credit in Company Currency,કંપની કરન્સી ક્રેડિટ
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,પ્રાથમિક સરનામું
 DocType: Production Plan,Material Request Detail,વપરાયેલો વિનંતી વિગત
 DocType: Selling Settings,Default Quotation Validity Days,ડિફોલ્ટ ક્વોટેશન વેલિડિટી ડેઝ
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: Sales Invoice,Change Amount,જથ્થો બદલી
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,ડ્રાઇવિંગ લાઈસન્સ શ્રેણીઓ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ડિલિવરી તારીખ દાખલ કરો
 DocType: Depreciation Schedule,Make Depreciation Entry,અવમૂલ્યન પ્રવેશ કરો
+DocType: HR Settings,Leave Settings,સેટિંગ્સ છોડો
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,વિનંતી પ્રકાર
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,કર્મચારીનું બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,પ્રસારણ
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS ની સેટઅપ મોડ (ઑનલાઇન / ઑફલાઇન)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,કાર્ય ઓર્ડર્સ સામે સમયના લૉગ્સ બનાવવાની અક્ષમ કરે છે. ઓપરેશન્સ વર્ક ઓર્ડર સામે ટ્રૅક રાખવામાં આવશે નહીં
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,એક્ઝેક્યુશન
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,એક્ઝેક્યુશન
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,કામગીરી વિગતો બહાર કરવામાં આવે છે.
 DocType: Asset Maintenance Log,Maintenance Status,જાળવણી સ્થિતિ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,સભ્યપદ વિગતો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: પુરવઠોકર્તા ચૂકવવાપાત્ર એકાઉન્ટ સામે જરૂરી છે {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,વસ્તુઓ અને પ્રાઇસીંગ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},કુલ સમય: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},તારીખ થી નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. તારીખ થી એમ ધારી રહ્યા છીએ = {0}
 DocType: Drug Prescription,Interval,અંતરાલ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,પસંદગી
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,પસંદગી
 DocType: Grant Application,Individual,વ્યક્તિગત
 DocType: Academic Term,Academics User,શિક્ષણવિંદો વપરાશકર્તા
 DocType: Cheque Print Template,Amount In Figure,રકમ આકૃતિ
-DocType: Employee Loan Application,Loan Info,લોન માહિતી
+DocType: Loan Application,Loan Info,લોન માહિતી
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,જાળવણી મુલાકાત માટે યોજના.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,સપ્લાયર સ્કોરકાર્ડ પીરિયડ
 DocType: Share Transfer,Share Transfer,શેર ટ્રાન્સફર
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,વસ્તુ નમૂનો
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,બાયોકેમિસ્ટ્રી
 DocType: Job Offer,Select Terms and Conditions,પસંદ કરો નિયમો અને શરતો
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,મૂલ્ય
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,મૂલ્ય
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce સેટિંગ્સ
 DocType: Production Plan,Sales Orders,વેચાણ ઓર્ડર
 DocType: Purchase Taxes and Charges,Valuation,મૂલ્યાંકન
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,મૂળભૂત પ્રદેશ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,દૂરદર્શન
 DocType: Work Order Operation,Updated via 'Time Log',&#39;સમય લોગ&#39; મારફતે સુધારાશે
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ગ્રાહક અથવા સપ્લાયર પસંદ કરો.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,જર્નલકોડ
 DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
 DocType: Company,Enable Perpetual Inventory,પર્પેચ્યુઅલ ઈન્વેન્ટરી સક્ષમ
+DocType: Bank Guarantee,Charges Incurred,સમાયોજિત ખર્ચ
 DocType: Company,Default Payroll Payable Account,ડિફૉલ્ટ પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
 DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,કસ્ટમ પરિણામ
 DocType: Delivery Stop,Contact Name,સંપર્ક નામ
 DocType: Course Assessment Criteria,Course Assessment Criteria,કોર્સ આકારણી માપદંડ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,કરવેરા ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,કરવેરા ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,વિદ્યાર્થી ID:
 DocType: POS Customer Group,POS Customer Group,POS ગ્રાહક જૂથ
 DocType: Land Unit,Land Unit describing various land assets,વિવિધ જમીનની અસ્કયામતો વર્ણવતા જમીન એકમ
@@ -374,9 +371,8 @@
 ,Open Work Orders,ઓપન વર્ક ઓર્ડર્સ
 DocType: Payment Term,Credit Months,ક્રેડિટ મહિના
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,નેટ પે 0 કરતાં ઓછી ન હોઈ શકે
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","સિસ્ટમમાંથી પુનરાવર્તિત ભૂલ સૂચનાઓ મોકલવાનું બંધ કરવા માટે, અમે સબ્સ્ક્રિપ્શનમાં નિષ્ક્રિય કરેલ ફીલ્ડને ચકાસાયેલ છે"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,દર વર્ષે પાંદડાં
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,દર વર્ષે પાંદડાં
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે &#39;અગાઉથી છે&#39; {1} આ એક અગાઉથી પ્રવેશ હોય તો.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
 DocType: Email Digest,Profit & Loss,નફો અને નુકસાન
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,વિદ્યાર્થી જૂથો હેઠળ વિદ્યાર્થી સુયોજિત કરો
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,બેન્ક પ્રવેશો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,બેન્ક પ્રવેશો
 DocType: Crop,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
 DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,વિદ્યાર્થી જૂથ બનાવવાનું સાધન
 DocType: Lead,Do Not Contact,સંપર્ક કરો
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,જે લોકો તમારી સંસ્થા ખાતે શીખવે
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,સોફ્ટવેર ડેવલોપર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,સોફ્ટવેર ડેવલોપર
 DocType: Item,Minimum Order Qty,ન્યુનત્તમ ઓર્ડર Qty
 DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
 DocType: Course Scheduling Tool,Course Start Date,કોર્સ શરૂ તારીખ
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,ખરીદી વિગતો
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,મેક્સ ગ્રેડ
 DocType: Email Digest,New Quotations,ન્યૂ સુવાકયો
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,કર્મચારી માટે ઇમેઇલ્સ પગાર સ્લિપ કર્મચારી પસંદગી મનપસંદ ઇમેઇલ પર આધારિત
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
 DocType: Tax Rule,Shipping County,શીપીંગ કાઉન્ટી
-apps/erpnext/erpnext/config/desktop.py +167,Learn,જાણો
+apps/erpnext/erpnext/config/desktop.py +159,Learn,જાણો
 DocType: Asset,Next Depreciation Date,આગળ અવમૂલ્યન તારીખ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ઉત્કૃષ્ટ Cheques અને સાફ ડિપોઝિટ
 DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
 DocType: Driver,Fleet Manager,ફ્લીટ વ્યવસ્થાપક
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},રો # {0}: {1} આઇટમ માટે નકારાત્મક ન હોઈ શકે {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},રો # {0}: {1} આઇટમ માટે નકારાત્મક ન હોઈ શકે {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,ખોટો પાસવર્ડ
 DocType: Item,Variant Of,ચલ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{} પર હોટેલ રૂમ રેટ સેટ કરો
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Opening Invoice Creation Tool,Invoice Type,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ડિલીવરી નોંધ
 DocType: Consultation,Encounter Impression,એન્કાઉન્ટર ઇમ્પ્રેશન
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,વેચાઈ એસેટ કિંમત
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
 DocType: Course Scheduling Tool,Course Scheduling Tool,કોર્સ સુનિશ્ચિત સાધન
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[જરૂરી] આવર્તક %s બનાવતી વખતે  %s માટે ત્રુટિ
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
 DocType: Land Unit,LInked Analysis,લિન્ક્ડ એનાલિસિસ
 DocType: Item Tax,Tax Rate,ટેક્સ રેટ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,એપ્લિકેશન સમયગાળો બે ફાળવણી રેકોર્ડ્સમાં ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,એપ્લિકેશન સમયગાળો બે ફાળવણી રેકોર્ડ્સમાં ન હોઈ શકે
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% પ્રાપ્ત
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,વિદ્યાર્થી જૂથો બનાવો
 DocType: Volunteer,Weekends,વિકેન્ડ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ક્રેડિટ નોટ રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ક્રેડિટ નોટ રકમ
 DocType: Setup Progress Action,Action Document,ક્રિયા દસ્તાવેજ
 DocType: Chapter Member,Website URL,વેબસાઇટ URL
 ,Finished Goods,ફિનિશ્ડ ગૂડ્સ
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ડેમો
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,વસ્તુઓ ઉમેરો
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,વસ્તુ ગુણવત્તા નિરીક્ષણ પરિમાણ
+DocType: Leave Application,Leave Approver Name,તાજનો છોડો નામ
 DocType: Depreciation Schedule,Schedule Date,સૂચિ તારીખ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","કમાણી, કપાત અને અન્ય પગાર ઘટકો"
 DocType: Packed Item,Packed Item,ભરેલા વસ્તુ
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
 DocType: Healthcare Settings,Require Lab Test Approval,લેબ ટેસ્ટ મંજૂરીની આવશ્યકતા છે
 DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,કુલ ઉત્કૃષ્ટ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,કુલ ઉત્કૃષ્ટ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
 DocType: Dosage Strength,Strength,સ્ટ્રેન્થ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,નવી ગ્રાહક બનાવવા
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,ઉપભોજ્ય કિંમત
 DocType: Purchase Receipt,Vehicle Date,વાહન તારીખ
 DocType: Student Log,Medical,મેડિકલ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ગુમાવી માટે કારણ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ગુમાવી માટે કારણ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,એકાઉન્ટ નંબર અપડેટ કરો
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,અગ્ર માલિક લીડ તરીકે જ ન હોઈ શકે
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,એક
 DocType: Salary Slip,Total Loan Repayment,કુલ લોન ચુકવણી
 DocType: Account,Cost of Goods Sold,માલની કિંમત વેચાઈ
-DocType: Subscription,Yearly,વાર્ષિક
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
 DocType: Drug Prescription,Dosage,ડોઝ
 DocType: Journal Entry Account,Sales Order,વેચાણ ઓર્ડર
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,સરેરાશ. વેચાણ દર
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,સરેરાશ. વેચાણ દર
 DocType: Assessment Plan,Examiner Name,એક્ઝામિનર નામ
 DocType: Lab Test Template,No Result,કોઈ પરિણામ
 DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,પ્રથમ કંપની નામ દાખલ કરો
 DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,આ ERPNext માર્ગદર્શિકા વાંચવા
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,કૅલેન્ડરમાં બધા ડિપાર્ટમેન્ટના સભ્યોની પાંદડીઓ બતાવો
 DocType: Purchase Invoice,01-Sales Return,01- સેલ્સ રિટર્ન
 DocType: Account,Is Group,Is ગ્રુપ
 DocType: Email Digest,Pending Purchase Orders,ખરીદી ઓર્ડર બાકી
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,ફરજિયાત ફીલ્ડ - શૈક્ષણિક વર્ષ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} સાથે સંકળાયેલ નથી
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,કે ઇમેઇલ એક ભાગ તરીકે જાય છે કે પ્રારંભિક લખાણ કસ્ટમાઇઝ કરો. દરેક વ્યવહાર અલગ પ્રારંભિક લખાણ છે.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},કંપની માટે મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},કંપની માટે મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},સ્ટોપ વર્ક ઓર્ડર {0} સામે વ્યવહારોની મંજૂરી નથી
 DocType: Setup Progress Action,Min Doc Count,મીન ડોક ગણક
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,બધા ઉત્પાદન પ્રક્રિયા માટે વૈશ્વિક સુયોજનો.
 DocType: Accounts Settings,Accounts Frozen Upto,ફ્રોઝન સુધી એકાઉન્ટ્સ
 DocType: SMS Log,Sent On,પર મોકલવામાં
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,વેચાણ માટે આરક્ષિત
 DocType: Packing Slip,From Package No.,પેકેજ નંબર પ્રતિ
 DocType: Item Attribute,To Range,શ્રેણી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","મૂલ્યાંકન પદ્ધતિ બદલી શકતા નથી, કારણ કે ત્યાં અમુક વસ્તુઓ સામે વ્યવહારો કે જે તે નથી પોતાના મૂલ્યાંકન પદ્ધતિ છે"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","મૂલ્યાંકન પદ્ધતિ બદલી શકતા નથી, કારણ કે ત્યાં અમુક વસ્તુઓ સામે વ્યવહારો કે જે તે નથી પોતાના મૂલ્યાંકન પદ્ધતિ છે"
 DocType: Student Report Generation Tool,Attended by Parents,માતાપિતા દ્વારા હાજરી
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
 DocType: Patient,AB Positive,એબી હકારાત્મક
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,હાજરીનો વિક્રમ છે.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet આધારિત પેરોલ માટે પગાર પુન.
 DocType: Sales Order Item,Used for Production Plan,ઉત્પાદન યોજના માટે વપરાય છે
-DocType: Employee Loan,Total Payment,કુલ ચુકવણી
+DocType: Loan,Total Payment,કુલ ચુકવણી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,પૂર્ણ કાર્ય ઓર્ડર માટે ટ્રાન્ઝેક્શન રદ કરી શકાતું નથી.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(મિનિટ) ઓપરેશન્સ વચ્ચે સમય
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} રદ થઇ ગઇ છે કે જેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,તમારા ગ્રાહકો થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,પૂરતી ભાગો બિલ્ડ કરવા માટે
 DocType: POS Profile User,POS Profile User,POS પ્રોફાઇલ વપરાશકર્તા
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,સીધી આવક
+DocType: Subscription Invoice,Subscription Invoice,સબ્સ્ક્રિપ્શન ભરતિયું
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,સીધી આવક
 DocType: Patient Appointment,Date TIme,તારીખ સમય
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,વહીવટી અધિકારીશ્રી
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,વહીવટી અધિકારીશ્રી
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,કંપની અને ટેક્સની સ્થાપના
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,કૃપા કરીને અભ્યાસક્રમનો પસંદ
 DocType: Codification Table,Codification Table,કોડીકરણ કોષ્ટક
 DocType: Timesheet Detail,Hrs,કલાકે
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,કંપની પસંદ કરો
 DocType: Stock Entry Detail,Difference Account,તફાવત એકાઉન્ટ
 DocType: Purchase Invoice,Supplier GSTIN,પુરવઠોકર્તા GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,કેશ ફ્લો મેપિંગ ઢાંચો
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
+DocType: Bank Guarantee,Providing,પૂરી પાડવી
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","પરવાનગી નથી, લેબ ટેસ્ટ નમૂનાને આવશ્યક રૂપે ગોઠવો"
 DocType: Patient,Risk Factors,જોખમ પરિબળો
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
 DocType: Territory,For reference,સંદર્ભ માટે
 DocType: Healthcare Settings,Appointment Confirmation,નિમણૂંક પુષ્ટિ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","કાઢી શકતા નથી સીરીયલ કોઈ {0}, તે સ્ટોક વ્યવહારો તરીકે ઉપયોગ થાય છે"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","કાઢી શકતા નથી સીરીયલ કોઈ {0}, તે સ્ટોક વ્યવહારો તરીકે ઉપયોગ થાય છે"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),બંધ (સીઆર)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,હેલો
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ખસેડો વસ્તુ
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","વપરાશકર્તા {1} માટે પહેલેથી જ મૂળ પ્રોફાઇલ {0} માં સુયોજિત છે, કૃપા કરીને ડિફોલ્ટ રૂપે અક્ષમ કરેલું છે"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,સંચિત મૂલ્યો
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS પ્રોફાઇલમાં ટેરિટરી આવશ્યક છે
 DocType: Supplier,Prevent RFQs,RFQs અટકાવો
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,વેચાણ ઓર્ડર બનાવો
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} થી {1} સુધીના સમયગાળા માટે પગાર કાપલી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} થી {1} સુધીના સમયગાળા માટે પગાર કાપલી
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,શિપિંગ બિલ તારીખ
 DocType: Production Plan,Production Plan,ઉત્પાદન યોજના
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ઇન્વોઇસ બનાવટ ટૂલ ખુલે છે
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,વેચાણ પરત
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,નોંધ: કુલ ફાળવેલ પાંદડા {0} પહેલાથી મંજૂર પાંદડા કરતાં ઓછી ન હોવી જોઈએ {1} સમયગાળા માટે
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,સીરીઅલ ઇનપુટ પર આધારિત વ્યવહારોમાં જથ્થો સેટ કરો
 ,Total Stock Summary,કુલ સ્ટોક સારાંશ
 DocType: Announcement,Posted By,દ્વારા પોસ્ટ કરવામાં આવ્યું
 DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,કંપની સેટ કરો
 DocType: Share Balance,Share Balance,શેર બેલેન્સ
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
 DocType: Training Result Employee,Training Result Employee,તાલીમ પરિણામ કર્મચારીનું
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"સ્ટોક પ્રવેશો કરવામાં આવે છે, જે સામે લોજિકલ વેરહાઉસ."
-DocType: Repayment Schedule,Principal Amount,મુખ્ય રકમ
-DocType: Employee Loan Application,Total Payable Interest,કુલ ચૂકવવાપાત્ર વ્યાજ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,મુખ્ય રકમ
+DocType: Loan Application,Total Payable Interest,કુલ ચૂકવવાપાત્ર વ્યાજ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},કુલ ઉત્કૃષ્ટ: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,વેચાણ ભરતિયું Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
 DocType: Restaurant Reservation,Restaurant Reservation,રેસ્ટોરન્ટ રિઝર્વેશન
 DocType: Land Unit,Land Unit Name,જમીન એકમ નામ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,દરખાસ્ત લેખન
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,દરખાસ્ત લેખન
 DocType: Payment Entry Deduction,Payment Entry Deduction,ચુકવણી એન્ટ્રી કપાત
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,રેપિંગ અપ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ઇમેઇલ દ્વારા ગ્રાહકોને સૂચિત કરો
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ઇમેઇલ દ્વારા ગ્રાહકોને સૂચિત કરો
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,અન્ય વેચાણ વ્યક્તિ {0} એ જ કર્મચારીનું ID સાથે અસ્તિત્વમાં
 DocType: Employee Advance,Claimed Amount,દાવાની રકમ
 apps/erpnext/erpnext/config/education.py +180,Masters,સ્નાતકોત્તર
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","પેમેન્ટ ગેટવે ખાતું નથી, એક જાતે બનાવવા કૃપા કરીને."
 DocType: Supplier Scorecard,Per Year,પ્રતિ વર્ષ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB મુજબ આ પ્રોગ્રામમાં પ્રવેશ માટે પાત્ર નથી
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Sales Invoice,Sales Taxes and Charges,વેચાણ કર અને ખર્ચ
 DocType: Employee,Organization Profile,સંસ્થા પ્રોફાઇલ
 DocType: Vital Signs,Height (In Meter),ઊંચાઈ (મીટરમાં)
 DocType: Student,Sibling Details,બહેન વિગતો
 DocType: Vehicle Service,Vehicle Service,વાહન સેવા
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,આપમેળે પ્રતિક્રિયા શરતો પર આધારિત વિનંતી ચાલુ.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,આપમેળે પ્રતિક્રિયા શરતો પર આધારિત વિનંતી ચાલુ.
 DocType: Employee,Reason for Resignation,રાજીનામાની કારણ
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,કામગીરી appraisals માટે નમૂનો.
 DocType: Sales Invoice,Credit Note Issued,ક્રેડિટ નોટ જારી
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,જાળવણી સૂચિ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","પછી કિંમતના નિયમોમાં વગેરે ગ્રાહક, ગ્રાહક જૂથ, પ્રદેશ, સપ્લાયર, પુરવઠોકર્તા પ્રકાર, ઝુંબેશ, વેચાણ ભાગીદાર પર આધારિત બહાર ફિલ્ટર કરવામાં આવે છે"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ઇન્વેન્ટરીમાં કુલ ફેરફાર
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,કર્મચારીનું લોન મેનેજમેન્ટ
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 સાથે સંબંધ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,વ્યવસ્થાપક
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,વ્યવસ્થાપક
 DocType: Payment Entry,Payment From / To,ચુકવણી / to
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},વેરહાઉસમાં એકાઉન્ટ સેટ કરો {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,માલ પરિવહન
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,માટે પાથ શોધી શકાઈ નથી
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ખુલી (DR)
+DocType: Loan,Applicant,અરજદાર
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},પોસ્ટ ટાઇમસ્ટેમ્પ પછી જ હોવી જોઈએ {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,રિકરિંગ દસ્તાવેજો બનાવવા માટે
 ,GST Itemised Purchase Register,જીએસટી આઇટમાઇઝ્ડ ખરીદી રજિસ્ટર
 DocType: Course Scheduling Tool,Reschedule,ફરીથી સુનિશ્ચિત કરો
-DocType: Employee Loan,Total Interest Payable,ચૂકવવાપાત્ર કુલ વ્યાજ
+DocType: Loan,Total Interest Payable,ચૂકવવાપાત્ર કુલ વ્યાજ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ઉતારેલ માલની કિંમત કર અને ખર્ચ
 DocType: Work Order Operation,Actual Start Time,વાસ્તવિક પ્રારંભ સમય
 DocType: BOM Operation,Operation Time,ઓપરેશન સમય
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,સમાપ્ત
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,પાયો
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,પાયો
 DocType: Timesheet,Total Billed Hours,કુલ ગણાવી કલાક
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,રકમ માંડવાળ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,રકમ માંડવાળ
 DocType: Leave Block List Allow,Allow User,વપરાશકર્તા માટે પરવાનગી આપે છે
 DocType: Journal Entry,Bill No,બિલ કોઈ
 DocType: Company,Gain/Loss Account on Asset Disposal,એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ
 DocType: Vehicle Log,Service Details,સેવા વિગતો
-DocType: Subscription,Quarterly,ત્રિમાસિક
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,ઇક્રાફ્ટલિબ
 DocType: Lab Test Template,Grouped,ગ્રુપ કરેલું
 DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,સમય પત્રક
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush કાચો માલ પર આધારિત
 DocType: Sales Invoice,Port Code,પોર્ટ કોડ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,રિઝર્વ વેરહાઉસ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,રિઝર્વ વેરહાઉસ
 DocType: Lead,Lead is an Organization,લીડ એક સંસ્થા છે
 DocType: Guardian Interest,Interest,વ્યાજ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,પૂર્વ વેચાણ
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,એકાઉન્ટ્સ
 DocType: Vehicle,Odometer Value (Last),ઑડોમીટર ભાવ (છેલ્લું)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,સપ્લાયર સ્કોરકાર્ડ માપદંડના નમૂનાઓ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,માર્કેટિંગ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,માર્કેટિંગ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
 DocType: Request for Quotation,Get Suppliers,સપ્લાયર્સ મેળવો
 DocType: Purchase Receipt Item Supplied,Current Stock,વર્તમાન સ્ટોક
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,જો તમારી સદસ્યતા 30 દિવસની અંદર સમાપ્ત થઈ જાય તો તમે માત્ર રિન્યુ કરી શકો છો
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,માત્ર જો તમે સેટઅપ કેશ ફ્લો મેપર દસ્તાવેજો છે તે પસંદ કરો
 DocType: Email Digest,Next email will be sent on:,આગામી ઇમેઇલ પર મોકલવામાં આવશે:
 DocType: Supplier Scorecard,Per Week,સપ્તાહ દીઠ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,વસ્તુ ચલો છે.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,કુલ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],ફિચિયર ડેસ ઇક્ચિટર્સ કૉમ્પેટબલ્સ [એફઇસી]
 DocType: Journal Entry,Credit Card Entry,ક્રેડિટ કાર્ડ એન્ટ્રી
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,કંપની અને એકાઉન્ટ્સ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,ભાવ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,ભાવ
 DocType: Asset Settings,Depreciation Options,અવમૂલ્યન વિકલ્પો
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,અમાન્ય પોસ્ટિંગ ટાઇમ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,અમાન્ય પોસ્ટિંગ ટાઇમ
 DocType: Lead,Campaign Name,ઝુંબેશ નામ
 DocType: Hotel Room,Capacity,ક્ષમતા
 DocType: Selling Settings,Close Opportunity After Days,બંધ તકો દિવસો પછી
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ગ્રાહક ખરીદી ઓર્ડર કોઈ
 DocType: Budget,Budget Against,બજેટ સામે
 DocType: Employee,Cell Number,સેલ સંખ્યા
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,આપેલ માપદંડ માટે કોઈ કર્મચારી નથી. તપાસ કરો કે પગાર સ્લિપ પહેલેથી જ બનાવવામાં આવી નથી.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,આપેલ માપદંડ માટે કોઈ કર્મચારી નથી. તપાસ કરો કે પગાર સ્લિપ પહેલેથી જ બનાવવામાં આવી નથી.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,લોસ્ટ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ &#39;જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,કોષ્ટક પસંદ કરો
 DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;પ્રાપ્તકર્તાઓ&#39; માં અયોગ્ય ઇમેઇલ સરનામું છે
 DocType: Special Test Items,Particulars,વિગત
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમો જ માપદંડ સાથે અસ્તિત્વ ધરાવે છે, અગ્રતા સોંપણી દ્વારા તકરાર ઉકેલવા કરો. ભાવ નિયમો: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
 DocType: Asset,Maintenance,જાળવણી
+DocType: Subscriber,Subscriber,ઉપભોક્તા
 DocType: Item Attribute Value,Item Attribute Value,વસ્તુ કિંમત એટ્રીબ્યુટ
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,કૃપા કરીને તમારી પ્રોજેક્ટ સ્થિતિ અપડેટ કરો
 DocType: Item,Maximum sample quantity that can be retained,મહત્તમ નમૂના જથ્થો કે જે જાળવી શકાય
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,શોપિંગ કાર્ટ માટે મૂળભૂત સુયોજનો
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,ટાઇમસ્લોટ્સ ઉમેરો
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},એસેટ જર્નલ પ્રવેશ મારફતે ભાંગી પડયો {0}
-DocType: Employee Loan,Interest Income Account,વ્યાજની આવક એકાઉન્ટ
+DocType: Loan,Interest Income Account,વ્યાજની આવક એકાઉન્ટ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,સમીક્ષા આમંત્રણ મોકલાયું
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,બાયોટેકનોલોજી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ઓફિસ જાળવણી ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ઓફિસ જાળવણી ખર્ચ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,પર જાઓ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ઇમેઇલ એકાઉન્ટ સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
 DocType: Asset Repair,Downtime,ડાઉનટાઇમ
 DocType: Account,Liability,જવાબદારી
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,શૈક્ષણિક શબ્દ:
 DocType: Salary Detail,Do not include in total,કુલમાં શામેલ કરશો નહીં
 DocType: Company,Default Cost of Goods Sold Account,ચીજવસ્તુઓનું વેચાણ એકાઉન્ટ મૂળભૂત કિંમત
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},નમૂના જથ્થો {0} પ્રાપ્ત જથ્થા કરતા વધુ હોઈ શકતી નથી {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,ભાવ યાદી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Request for Quotation Supplier,Send Email,ઇમેઇલ મોકલો
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
 DocType: Item,Max Sample Quantity,મહત્તમ નમૂના જથ્થો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,પરવાનગી નથી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,પરવાનગી નથી
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,ભાવની વિનંતી કરી
 DocType: Vital Signs,Heart Rate / Pulse,હાર્ટ રેટ / પલ્સ
 DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,ઉચ્ચ ભારાંક સાથે વસ્તુઓ વધારે બતાવવામાં આવશે
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,લેબ ટેસ્ટ અને મહત્વપૂર્ણ ચિહ્નો
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,બેન્ક રિકંસીલેશન વિગતવાર
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,કોઈ કર્મચારી મળી
-DocType: Subscription,Stopped,બંધ
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,પ્રોજેક્ટ અપડેટ
 DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
 DocType: Land Unit,Tree Details,વૃક્ષ વિગતો
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,બધા આઇટમ જૂથો
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
 DocType: Work Order,Item To Manufacture,વસ્તુ ઉત્પાદન
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,કમ્પલેલિબ
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} સ્થિતિ {2} છે
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","રીસલેક્ટ કરો, જો સાચવેલા સરનામાંને સેવ કર્યા પછી સંપાદિત કરવામાં આવે છે"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 DocType: Item,Hub Publishing Details,હબ પબ્લિશિંગ વિગતો
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','શરૂઆત'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','શરૂઆત'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
 DocType: Lab Test Template,Result Format,પરિણામ ફોર્મેટ
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,દ્વિમાસિક
 DocType: Vehicle Service,Brake Pad,બ્રેક પેડ
 DocType: Fertilizer,Fertilizer Contents,ખાતર સામગ્રીઓ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,બિલ રકમ
 DocType: Company,Registration Details,નોંધણી વિગતો
 DocType: Timesheet,Total Billed Amount,કુલ ગણાવી રકમ
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,સેલ્સ ઓર્ડર પર ક્રેડિટ સીમા ચેકને બાયપાસ કરો
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,કામગીરી મૂલ્યાંકન.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","સક્રિય, &#39;શોપિંગ કાર્ટ માટે ઉપયોગ&#39; શોપિંગ કાર્ટ તરીકે સક્રિય છે અને શોપિંગ કાર્ટ માટે ઓછામાં ઓછી એક કર નિયમ ત્યાં પ્રયત્ન કરીશું"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ચુકવણી એન્ટ્રી {0} ઓર્ડર {1}, ચેક, તો તે આ બિલ અગાઉથી તરીકે ખેંચાય જોઇએ સામે કડી થયેલ છે."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ચુકવણી એન્ટ્રી {0} ઓર્ડર {1}, ચેક, તો તે આ બિલ અગાઉથી તરીકે ખેંચાય જોઇએ સામે કડી થયેલ છે."
 DocType: Sales Invoice Item,Stock Details,સ્ટોક વિગતો
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,પ્રોજેક્ટ ભાવ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,પોઇન્ટ ઓફ સેલ
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,ન્યુનત્તમ બેઠક
 DocType: Item Attribute,Item Attribute Values,વસ્તુ એટ્રીબ્યુટ મૂલ્યો
 DocType: Examination Result,Examination Result,પરીક્ષા પરિણામ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ખરીદી રસીદ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ખરીદી રસીદ
 ,Received Items To Be Billed,પ્રાપ્ત વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,ચલણ વિનિમય દર માસ્ટર.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},સંદર્ભ Doctype એક હોવો જ જોઈએ {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
 DocType: Work Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ટ્રાન્સફર માટે કોઈ આઇટમ્સ ઉપલબ્ધ નથી
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ટ્રાન્સફર માટે કોઈ આઇટમ્સ ઉપલબ્ધ નથી
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),સમાપન (ખુલીને + કુલ)
 DocType: Journal Entry,Depreciation Entry,અવમૂલ્યન એન્ટ્રી
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
 DocType: Crop Cycle,ISO 8016 standard,આઇએસઓ 8016 સ્ટાન્ડર્ડ
 DocType: Pricing Rule,Rate or Discount,દર અથવા ડિસ્કાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,જરૂરી Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,મનપસંદ
 DocType: Hub Settings,Custom Data,કસ્ટમ ડેટા
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,મેડિકલ કોડ સ્ટાન્ડર્ડ
 DocType: Soil Texture,Clay Composition (%),ક્લે રચના (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,કાર્ય સોંપવા પહેલાં કૃપા કરીને સાચવો.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,બેલેન્સ ભાવ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,બેલેન્સ ભાવ
 DocType: Lab Test,Lab Technician,લેબ ટેકનિશિયન
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,સેલ્સ ભાવ યાદી
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,સેલ્સ ભાવ યાદી
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","જો ચકાસાયેલું હોય, તો ગ્રાહક બનાવશે, દર્દીને મેપ કરેલું. આ ગ્રાહક સામે પેશન્ટ ઇનવૉઇસેસ બનાવવામાં આવશે પેશન્ટ બનાવતી વખતે તમે હાલના ગ્રાહકોને પણ પસંદ કરી શકો છો"
 DocType: Bank Reconciliation,Account Currency,એકાઉન્ટ કરન્સી
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,કંપની રાઉન્ડ બંધ એકાઉન્ટ ઉલ્લેખ કરો
 DocType: Purchase Receipt,Range,રેંજ
 DocType: Supplier,Default Payable Accounts,મૂળભૂત ચૂકવવાપાત્ર હિસાબ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
 DocType: Item Barcode,Item Barcode,વસ્તુ બારકોડ
 DocType: Woocommerce Settings,Endpoints,એન્ડપોઇન્ટ્સ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","પેદા કરવા માટે જો વિલંબિત હોય, તો તમારે જાતે &quot;મહિનોના પુનરાવર્તન&quot; ની આ ફીલ્ડને બદલવા પડશે"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
 DocType: Share Transfer,From Folio No,ફોલિયો ના તરફથી
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,ઉપયોગ-માટે-ઉપયોગ તારીખ
 DocType: Guardian,Guardian Name,ગાર્ડિયન નામ
 DocType: Cheque Print Template,Has Print Format,પ્રિન્ટ ફોર્મેટ છે
-DocType: Employee Loan,Sanctioned,મંજૂર
+DocType: Loan,Sanctioned,મંજૂર
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ માટે બનાવવામાં નથી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
 DocType: Crop Cycle,Crop Cycle,પાક ચક્ર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ઉત્પાદન બંડલ&#39; વસ્તુઓ, વેરહાઉસ, સીરીયલ કોઈ અને બેચ માટે કોઈ &#39;પેકિંગ યાદી&#39; ટેબલ પરથી ગણવામાં આવશે. વેરહાઉસ અને બેચ કોઈ કોઈ &#39;ઉત્પાદન બંડલ&#39; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ઉત્પાદન બંડલ&#39; વસ્તુઓ, વેરહાઉસ, સીરીયલ કોઈ અને બેચ માટે કોઈ &#39;પેકિંગ યાદી&#39; ટેબલ પરથી ગણવામાં આવશે. વેરહાઉસ અને બેચ કોઈ કોઈ &#39;ઉત્પાદન બંડલ&#39; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
 DocType: Student Admission,Publish on website,વેબસાઇટ પર પ્રકાશિત
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,પુરવઠોકર્તા ભરતિયું તારીખ પોસ્ટ તારીખ કરતાં વધારે ન હોઈ શકે
+DocType: Subscription,Cancelation Date,રદ કરવાની તારીખ
 DocType: Purchase Invoice Item,Purchase Order Item,ઓર્ડર વસ્તુ ખરીદી
 DocType: Agriculture Task,Agriculture Task,કૃષિ કાર્ય
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,પરોક્ષ આવક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,પરોક્ષ આવક
 DocType: Student Attendance Tool,Student Attendance Tool,વિદ્યાર્થી એટેન્ડન્સ સાધન
 DocType: Restaurant Menu,Price List (Auto created),ભાવ સૂચિ (સ્વતઃ બનાવેલ)
 DocType: Cheque Print Template,Date Settings,તારીખ સેટિંગ્સ
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,મીટર
 DocType: Workstation,Electricity Cost,વીજળી ખર્ચ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,લેબ પરીક્ષણ ડેટાટાઇમ સંગ્રહ સમયનો સમય પહેલાં ન હોઈ શકે
+DocType: Subscription Plan,Cost,કિંમત
 DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
 DocType: Expense Claim,Total Advance Amount,કુલ એડવાન્સ રકમ
 DocType: Delivery Stop,Estimated Arrival,અંદાજિત આગમન
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
 DocType: Timesheet Detail,Bill,બિલ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,વ્હાઇટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,વ્હાઇટ
 DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,તમે ચેકબોક્સની સૂચિમાંથી માત્ર એક જ વિકલ્પ પસંદ કરી શકો છો.
 DocType: Purchase Invoice,Get Advances Paid,એડવાન્સિસ ચૂકવેલ મેળવો
 DocType: Item,Automatically Create New Batch,ન્યૂ બેચ આપમેળે બનાવો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} ને {1} (પંક્તિ {2}) સોંપવી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} ને {1} (પંક્તિ {2}) સોંપવી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,બનાવો
 DocType: Student Admission,Admission Start Date,પ્રવેશ પ્રારંભ તારીખ
 DocType: Journal Entry,Total Amount in Words,શબ્દો કુલ રકમ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,નવો કર્મચારી
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
 DocType: Repayment Schedule,Balance Loan Amount,બેલેન્સ લોન રકમ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,સૂચિ કોર્સ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,સ્ટોક ઓપ્શન્સ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,સ્ટોક ઓપ્શન્સ
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,ખરીદી ઑર્ડરમાં છેલ્લી ખરીદારી વિગતોનું આનયન કરવું અક્ષમ કરો
 DocType: Journal Entry Account,Expense Claim,ખર્ચ દાવો
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,પેકિંગ કાપલી વસ્તુ
 DocType: Purchase Invoice,Cash/Bank Account,કેશ / બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ઉલ્લેખ કરો એક {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,વેરિયન્ટ બનાવટ કતારમાં છે
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} માટેનું કાર્ય સારાંશ
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,સૂચિમાં પ્રથમ ડ્રો એપોવરવર ડિફૉલ્ટ રીવૉવર તરીકે સેટ કરવામાં આવશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Plan,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
 DocType: Training Event,Self-Study,સ્વ-અભ્યાસ
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,વેતન
 DocType: Asset Maintenance,Maintenance Manager Name,જાળવણી વ્યવસ્થાપક નામ
 DocType: Agriculture Task,Urgent,અર્જન્ટ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},ટેબલ પંક્તિ {0} માટે માન્ય રો ને સ્પષ્ટ કરો {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},ટેબલ પંક્તિ {0} માટે માન્ય રો ને સ્પષ્ટ કરો {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ચલ શોધવામાં અસમર્થ:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,નમપૅડમાંથી સંપાદિત કરવા માટે કૃપા કરીને ફીલ્ડ પસંદ કરો
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,સ્ટોક લેડરનું નિર્માણ થયેલું હોવાથી નિશ્ચિત એસેટ આઇટ્યુ હોઈ શકાતી નથી.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,જાત નિરીક્ષણ નમૂના નામ
 DocType: Project,First Email,પ્રથમ ઇમેઇલ
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,સેલ્સ ઓર્ડર / ફિનિશ્ડ ગૂડ્સ વેરહાઉસ માં અનામત વેરહાઉસ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,વેચાણ રકમ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,વેચાણ રકમ
 DocType: Repayment Schedule,Interest Amount,વ્યાજ રકમ
 DocType: Serial No,Creation Document No,બનાવટ દસ્તાવેજ કોઈ
 DocType: Share Transfer,Issue,મુદ્દો
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,શીપીંગ રાજ્ય
 ,Projected Quantity as Source,સોર્સ તરીકે પ્રોજેક્ટ જથ્થો
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ડિલિવરી ટ્રીપ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ડિલિવરી ટ્રીપ
 DocType: Student,A-,એ
 DocType: Share Transfer,Transfer Type,ટ્રાન્સફર ટાઇપ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,સેલ્સ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,સેલ્સ ખર્ચ
 DocType: Consultation,Diagnosis,નિદાન
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
 DocType: GL Entry,Against,સામે
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,પિન કોડ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},લોનમાં વ્યાજની આવકનું એકાઉન્ટ પસંદ કરો {0}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
 DocType: Packing Slip,Net Weight UOM,નેટ વજન UOM
 DocType: Item,Default Supplier,મૂળભૂત પુરવઠોકર્તા
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ઉત્પાદન ભથ્થું ટકાવારી પર
-DocType: Employee Loan,Repayment Schedule,ચુકવણી શેડ્યૂલ
+DocType: Loan,Repayment Schedule,ચુકવણી શેડ્યૂલ
 DocType: Shipping Rule Condition,Shipping Rule Condition,શીપીંગ નિયમ કન્ડિશન
 DocType: Holiday List,Get Weekly Off Dates,અઠવાડિક બંધ તારીખો મેળવો
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,સમાપ્તિ તારીખ પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,સરેરાશ ઉંમર
 DocType: Education Settings,Attendance Freeze Date,એટેન્ડન્સ ફ્રીઝ તારીખ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,તમારા સપ્લાયર્સ થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,બધા ઉત્પાદનો જોવા
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,બધા ઉત્પાદનો જોવા
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),ન્યુનત્તમ લીડ યુગ (દિવસો)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,બધા BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},હોટેલના રૂમ {0} {1} પર અનુપલબ્ધ છે
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,કર્મચારી
 DocType: Driver,Cellphone Number,સેલ ફોન નંબર
 DocType: Project,Monitor Progress,મોનિટર પ્રગતિ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
 DocType: Journal Entry,Make Difference Entry,તફાવત પ્રવેશ કરો
+DocType: Supplier Quotation,Auto Repeat Section,ઓટો પુનરાવર્તન વિભાગ
 DocType: Upload Attendance,Attendance From Date,તારીખ થી એટેન્ડન્સ
 DocType: Appraisal Template Goal,Key Performance Area,કી બોનસ વિસ્તાર
 DocType: Program Enrollment,Transportation,ટ્રાન્સપોર્ટેશન
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
+DocType: Department Approver,Department Approver,ડિપાર્ટમેન્ટ એપ્રોવર
 DocType: SMS Center,Total Characters,કુલ અક્ષરો
 DocType: Employee Advance,Claimed,દાવો કર્યો
 DocType: Crop,Row Spacing,પંક્તિ અંતર
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ચુકવણી રિકંસીલેશન ભરતિયું
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,યોગદાન%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ખરીદી સેટિંગ્સ મુજબ જો ખરીદી ઓર્ડર જરૂરી == &#39;હા&#39; હોય, તો પછી ખરીદી ઇન્વોઇસ બનાવવા માટે, વપરાશકર્તા આઇટમ માટે પ્રથમ ખરીદી હુકમ બનાવવાની જરૂર {0}"
+,HSN-wise-summary of outward supplies,બાહ્ય પુરવઠાનો એચએસએન-મુજબનો સારાંશ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,તમારા સંદર્ભ માટે કંપની નોંધણી નંબરો. ટેક્સ નંબરો વગેરે
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,ક્રિયા નામ
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,પ્રારંભ વર્ષ
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN પ્રથમ 2 અંકો રાજ્ય નંબર સાથે મેળ ખાતી હોવી જોઈએ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,પી.ડી.સી. / એલ.સી.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,પી.ડી.સી. / એલ.સી.
 DocType: Purchase Invoice,Start date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા તારીખ શરૂ
 DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,બનાવટના સમયે જ ક્ષેત્રોની નકલ કરવામાં આવશે.
 DocType: Setup Progress Action,Domains,ડોમેન્સ
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','વાસ્તવિક શરૂઆત તારીખ' ’વાસ્તવિક અંતિમ તારીખ’ કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,મેનેજમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,મેનેજમેન્ટ
 DocType: Cheque Print Template,Payer Settings,ચુકવણીકાર સેટિંગ્સ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","આ ચલ વસ્તુ કોડ ઉમેરાવું કરવામાં આવશે. તમારા સંક્ષેપ &quot;શૌન&quot; છે, અને ઉદાહરણ તરીકે, જો આઇટમ કોડ &quot;ટી શર્ટ&quot;, &quot;ટી-શર્ટ શૌન&quot; હશે ચલ આઇટમ કોડ છે"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
 DocType: Purchase Invoice,Is Return,વળતર છે
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,સાવધાન
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',શરૂઆતનો દિવસ કાર્ય દિવસ &#39;{0}&#39; કરતાં વધારે છે
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
 DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} વસ્તુ માટે માન્ય સીરીયલ અમે {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,વસ્તુ કોડ સીરીયલ નંબર માટે બદલી શકાતું નથી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,વસ્તુ કોડ સીરીયલ નંબર માટે બદલી શકાતું નથી
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM રૂપાંતર ફેક્ટર
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,બેચ નંબર મેળવવા માટે વસ્તુ કોડ દાખલ કરો
 DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
-DocType: Employee Loan,Partially Disbursed,આંશિક વિતરિત
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,માહિતી આપો
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,માહિતી આપો
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,તમે સબ્સ્ક્રિપ્શન ફરીથી શરૂ કરી શકતા નથી કે જે રદ કરવામાં આવી નથી.
 DocType: Account,Balance Sheet,સરવૈયા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
 DocType: Fee Validity,Valid Till,સુધી માન્ય
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,કુલ માતાપિતા શિક્ષક મીટિંગ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ROW # {0}: Qty ખરીદી રીટર્ન દાખલ કરી શકાતા નથી નકારેલું
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,પસંદ કરેલ ગ્રાહક માટે કસ્ટમર ગ્રુપ બદલવાની મંજૂરી નથી.
 ,Purchase Order Items To Be Billed,ખરીદી ક્રમમાં વસ્તુઓ બિલ કરવા
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,અનુમાનિત આગમન સમયે અપડેટ કરવું
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,અનુમાનિત આગમન સમયે અપડેટ કરવું
 DocType: Program Enrollment Tool,Enrollment Details,નોંધણી વિગતો
 DocType: Purchase Invoice Item,Net Rate,નેટ દર
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ગ્રાહકને પસંદ કરો
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,ચાલુ નાણાકીય વર્ષ
 DocType: Purchase Order,Group same items,જૂથ જ વસ્તુઓ
 DocType: Purchase Invoice,Disable Rounded Total,ગોળાકાર કુલ અક્ષમ કરો
-DocType: Employee Loan Application,Repayment Info,ચુકવણી માહિતી
+DocType: Department,Parent Department,પિતૃ વિભાગ
+DocType: Loan Application,Repayment Info,ચુકવણી માહિતી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;એન્ટ્રીઝ&#39; ખાલી ન હોઈ શકે
 DocType: Maintenance Team Member,Maintenance Role,જાળવણી ભૂમિકા
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
 ,Trial Balance,ટ્રાયલ બેલેન્સ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,હોટેલ રિઝર્વેશન યુઝર
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Student,O-,ઓ-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,સંશોધન
+DocType: Subscription Settings,Subscription Settings,સબ્સ્ક્રિપ્શન સેટિંગ્સ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,સંશોધન
 DocType: Maintenance Visit Purpose,Work Done,કામ કર્યું
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
 DocType: Announcement,All Students,બધા વિદ્યાર્થીઓ
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
 DocType: Crop Cycle,Less than a year,એક વર્ષ કરતાં ઓછા
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,વિદ્યાર્થી મોબાઇલ નંબર
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,બાકીનું વિશ્વ
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
 DocType: Crop,Yield UOM,યોગ UOM
 ,Budget Variance Report,બજેટ ફેરફાર રિપોર્ટ
 DocType: Salary Slip,Gross Pay,કુલ પે
 DocType: Item,Is Item from Hub,હબથી આઇટમ છે
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,રો {0}: પ્રવૃત્તિ પ્રકાર ફરજિયાત છે.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,હિસાબી ખાતાવહી
 DocType: Stock Reconciliation,Difference Amount,તફાવત રકમ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{1} પર છોડો {1}
 DocType: Purchase Invoice,Reverse Charge,રિવર્સ ચાર્જ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,રાખેલી કમાણી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,રાખેલી કમાણી
 DocType: Purchase Invoice,05-Change in POS,05-POS માં બદલો
 DocType: Vehicle Log,Service Detail,સેવા વિગતવાર
 DocType: BOM,Item Description,વસ્તુ વર્ણન
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,તક વસ્તુ
 ,Student and Guardian Contact Details,વિદ્યાર્થી અને વાલી સંપર્ક વિગતો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,"રો {0}: સપ્લાયર માટે {0} ઇમેઇલ સરનામું, ઇમેઇલ મોકલવા માટે જરૂરી છે"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,કામચલાઉ ખુલી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,કામચલાઉ ખુલી
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,હબ જુઓ
 ,Employee Leave Balance,કર્મચારી રજા બેલેન્સ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
 DocType: Patient Appointment,More Info,વધુ માહિતી
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},મૂલ્યાંકન દર પંક્તિ માં વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},મૂલ્યાંકન દર પંક્તિ માં વસ્તુ માટે જરૂરી {0}
 DocType: Supplier Scorecard,Scorecard Actions,સ્કોરકાર્ડ ક્રિયાઓ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ઉદાહરણ: કોમ્પ્યુટર સાયન્સમાં માસ્ટર્સ
 DocType: Purchase Invoice,Rejected Warehouse,નકારેલું વેરહાઉસ
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,માટે
 DocType: Supplier Quotation Item,Lead Time in days,દિવસોમાં લીડ સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,એકાઉન્ટ્સ ચૂકવવાપાત્ર સારાંશ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},માટે {0} થી પગાર ચુકવણી {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},માટે {0} થી પગાર ચુકવણી {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
 DocType: Journal Entry,Get Outstanding Invoices,બાકી ઇન્વૉઇસેસ મેળવો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,લેબ ટેસ્ટ પ્રિસ્ક્રિપ્શન્સ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,નાના
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,નાના
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ઇન્વોઇસ બનાવટ સાધન આઇટમ ખુલે છે
 DocType: Education Settings,Employee Number,કર્મચારીનું સંખ્યા
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ગ્રેસ પીરિયડ પછી ઇનવોઇસ રદ કરો
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},કેસ ના (ઓ) પહેલેથી જ વપરાશમાં છે. કેસ કોઈ થી પ્રયાસ {0}
 DocType: Project,% Completed,% પૂર્ણ
 ,Invoiced Amount (Exculsive Tax),ભરતિયું રકમ (Exculsive ટેક્સ)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,લેબોરેટરી પરીક્ષણ ડેટટાઇમ
 DocType: Email Digest,Add Quote,ભાવ ઉમેરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM માટે જરૂરી UOM coversion પરિબળ: {0} વસ્તુ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,પરોક્ષ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,પરોક્ષ ખર્ચ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
 DocType: Agriculture Analysis Criteria,Agriculture,કૃષિ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,સમન્વય માસ્ટર ડેટા
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,કેપિટલ સાધનો
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,કેપિટલ સાધનો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,આઇટમ કોડને પહેલા સેટ કરો
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
+DocType: Subscription Plan,Billing Interval Count,બિલિંગ અંતરાલ ગણક
 DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
 DocType: Antibiotic,Antibiotic,એન્ટીબાયોટિક
 ,Team Updates,ટીમ સુધારાઓ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,સપ્લાયર માટે
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,સપ્લાયર માટે
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,એકાઉન્ટ પ્રકાર સેટિંગ વ્યવહારો આ એકાઉન્ટ પસંદ કરે છે.
 DocType: Purchase Invoice,Grand Total (Company Currency),કુલ સરવાળો (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,પ્રિન્ટ ફોર્મેટ બનાવો
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ડાયજેસ્ટ ઇમેઇલ:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,વૈકલ્પિક આઇટમ આઇટમ કોડ તરીકે જ ન હોવો જોઈએ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Sales Partner,Target Distribution,લક્ષ્ય વિતરણની
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,કામચલાઉ આકારણીના 06-અંતિમ રૂપ
 DocType: Salary Slip,Bank Account No.,બેન્ક એકાઉન્ટ નંબર
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,વર્કસ્ટેશન
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,અવતરણ પુરવઠોકર્તા માટે વિનંતી
 DocType: Healthcare Settings,Registration Message,નોંધણી સંદેશ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,હાર્ડવેર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,હાર્ડવેર
 DocType: Prescription Dosage,Prescription Dosage,પ્રિસ્ક્રિપ્શન ડોઝ
 DocType: Attendance,HR Manager,એચઆર મેનેજર
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,કંપની પસંદ કરો
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,શરૂ કરો અને તારીખો અંત
 ,Delivered Items To Be Billed,વિતરિત વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ઓપન BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,વેરહાઉસ સીરીયલ નંબર માટે બદલી શકાતું નથી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,વેરહાઉસ સીરીયલ નંબર માટે બદલી શકાતું નથી
 DocType: Authorization Rule,Average Discount,સરેરાશ ડિસ્કાઉન્ટ
 DocType: Project Update,Great/Quickly,ગ્રેટ / ઝડપથી
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,પયાર્વરણીય /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,બેચ આઇટમ માટે બૅચેસ પસંદ કરો
 DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યુલ
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,નીચેના એકાઉન્ટ્સ જીએસટી સેટિંગ્સમાં પસંદ કરી શકાય છે:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,નીચેના એકાઉન્ટ્સ જીએસટી સેટિંગ્સમાં પસંદ કરી શકાય છે:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
 DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
 DocType: Payment Request,Transaction Currency,ટ્રાન્ઝેક્શન કરન્સી
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},પ્રતિ {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,સરેરાશ દૈનિક આઉટગોઇંગ
 DocType: POS Profile,Campaign,ઝુંબેશ
 DocType: Supplier,Name and Type,નામ અને પ્રકાર
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
 DocType: Physician,Contacts and Address,સંપર્કો અને સરનામું
 DocType: Purchase Invoice,Contact Person,સંપર્ક વ્યક્તિ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','અપેક્ષિત શરૂઆત તારીખ' કરતાં 'અપેક્ષિત અંતિમ તારીખ' વધારે ન હોઈ શકે
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,લાયકાત અને વિગતો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
 DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},મહત્તમ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,તારીખ સમય પ્રતિ
 DocType: Email Digest,For Company,કંપની માટે
 apps/erpnext/erpnext/config/support.py +17,Communication log.,કોમ્યુનિકેશન લોગ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",અવતરણ માટે વિનંતી વધુ ચેક પોર્ટલ સેટિંગ્સ માટે પોર્ટલ ઍક્સેસ અક્ષમ છે.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,સપ્લાયર સ્કોરકાર્ડ સ્કોરિંગ વેરિયેબલ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ખરીદી રકમ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,ખરીદી રકમ
 DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
 DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,કોર્સ શેડ્યૂલ બનાવતી ભૂલો હતી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,સૂચિમાં પ્રથમ ખર્ચના આધારે ડિફોલ્ટ ખર્ચ ઉપકારક તરીકે સેટ કરવામાં આવશે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,પેકેજ કોડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,એપ્રેન્ટિસ
 DocType: Purchase Invoice,Company GSTIN,કંપની GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,નકારાત્મક જથ્થો મંજૂરી નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,નકારાત્મક જથ્થો મંજૂરી નથી
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",સ્ટ્રિંગ તરીકે વસ્તુ માસ્ટર પાસેથી મેળવ્યાં અને આ ક્ષેત્રમાં સંગ્રહિત કર વિગતવાર કોષ્ટક. કર અને ખર્ચ માટે વપરાય છે
 DocType: Supplier Scorecard Period,SSC-,એસએસસી-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","એકાઉન્ટ સ્થિર છે, તો પ્રવેશો પ્રતિબંધિત વપરાશકર્તાઓ માટે માન્ય છે."
 DocType: Email Digest,Bank Balance,બેંક બેલેન્સ
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,અરજી છોડો માં મંજૂર છોડી દો
 DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, યોગ્યતાઓ જરૂરી વગેરે"
 DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,{0} પંક્તિની પેમેન્ટ ટર્મ સંભવતઃ ડુપ્લિકેટ છે.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),કૃષિ (બીટા)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,પેકિંગ કાપલી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ઓફિસ ભાડે
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ઓફિસ ભાડે
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
 DocType: Disease,Common Name,સામાન્ય નામ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,આયાત નિષ્ફળ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,કોઈ સરનામું હજુ સુધી ઉમેર્યું.
 DocType: Workstation Working Hour,Workstation Working Hour,વર્કસ્ટેશન કામ કલાક
 DocType: Vital Signs,Blood Pressure,લોહિનુ દબાણ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,એનાલિસ્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,એનાલિસ્ટ
 DocType: Item,Inventory,ઈન્વેન્ટરી
 DocType: Item,Sales Details,સેલ્સ વિગતો
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,વિદ્યાર્થી જૂથમાં વિદ્યાર્થીઓ પ્રવેશ કોર્સ માન્ય
 DocType: Notification Control,Expense Claim Rejected,ખર્ચ દાવો નકારી
 DocType: Item,Item Attribute,વસ્તુ એટ્રીબ્યુટ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,સરકાર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,સરકાર
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ખર્ચ દાવો {0} પહેલાથી જ વાહન પ્રવેશ અસ્તિત્વમાં
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,સંસ્થાનું નામ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ચુકવણી રકમ દાખલ કરો
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ચુકવણી રકમ દાખલ કરો
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,વસ્તુ ચલો
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,સેવાઓ
 DocType: HR Settings,Email Salary Slip to Employee,કર્મચારીનું ઇમેઇલ પગાર કાપલી
 DocType: Cost Center,Parent Cost Center,પિતૃ ખર્ચ કેન્દ્રને
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,શક્ય પુરવઠોકર્તા પસંદ કરો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,શક્ય પુરવઠોકર્તા પસંદ કરો
 DocType: Sales Invoice,Source,સોર્સ
 DocType: Customer,"Select, to make the customer searchable with these fields","આ ક્ષેત્રો સાથે ગ્રાહકને શોધવા યોગ્ય બનાવવા માટે, પસંદ કરો"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,બતાવો બંધ
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,રોકાણ કેશ ફ્લો
 DocType: Program Course,Program Course,કાર્યક્રમ કોર્સ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત
 DocType: Homepage,Company Tagline for website homepage,વેબસાઇટ હોમપેજ માટે કંપની ટૅગલાઇન
 DocType: Item Group,Item Group Name,વસ્તુ ગ્રુપ નામ
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,લેવામાં
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,મેમ્બરશિપ વિગતો
 DocType: Leave Block List,Block Holidays on important days.,મહત્વપૂર્ણ દિવસ પર બ્લોક રજાઓ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),કૃપા કરીને બધા જરૂરી પરિણામ મૂલ્ય (ઓ) ઇનપુટ કરો
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,એકાઉન્ટ્સ પ્રાપ્ત સારાંશ
-DocType: Employee Loan,Monthly Repayment Amount,માસિક ચુકવણી રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,એકાઉન્ટ્સ પ્રાપ્ત સારાંશ
+DocType: Loan,Monthly Repayment Amount,માસિક ચુકવણી રકમ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ખુલ્લા ઇનવૉઇસેસ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,કર્મચારીનું ભૂમિકા સુયોજિત કરવા માટે એક કર્મચારી રેકોર્ડ વપરાશકર્તા ID ક્ષેત્ર સુયોજિત કરો
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,કર્મચારીનું ભૂમિકા સુયોજિત કરવા માટે એક કર્મચારી રેકોર્ડ વપરાશકર્તા ID ક્ષેત્ર સુયોજિત કરો
 DocType: UOM,UOM Name,UOM નામ
 DocType: GST HSN Code,HSN Code,HSN કોડ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,ફાળાની રકમ
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},વપરાશકર્તા {0} પહેલેથી ફિઝિશિયનને સોંપેલ છે {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,બોક્સ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,શક્ય પુરવઠોકર્તા
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,શક્ય પુરવઠોકર્તા
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,માસિક વિતરણ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,રીસીવર સૂચિ ખાલી છે. રીસીવર યાદી બનાવવા કરો
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),હેલ્થકેર (બીટા)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
 DocType: Shipping Rule Condition,From Value,ભાવ પ્રતિ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
-DocType: Employee Loan,Repayment Method,ચુકવણી પદ્ધતિ
+DocType: Loan,Repayment Method,ચુકવણી પદ્ધતિ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","જો ચકાસાયેલ છે, મુખ્ય પૃષ્ઠ પાનું વેબસાઇટ માટે મૂળભૂત વસ્તુ ગ્રુપ હશે"
 DocType: Quality Inspection Reading,Reading 4,4 વાંચન
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,કંપની ખર્ચ માટે દાવા.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,પ્રમાણપત્ર આવશ્યક છે
 DocType: Company,Default Holiday List,રજા યાદી મૂળભૂત
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},રો {0}: પ્રતિ સમય અને સમય {1} સાથે ઓવરલેપિંગ છે {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,સ્ટોક જવાબદારીઓ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,સ્ટોક જવાબદારીઓ
 DocType: Purchase Invoice,Supplier Warehouse,પુરવઠોકર્તા વેરહાઉસ
 DocType: Opportunity,Contact Mobile No,સંપર્ક મોબાઈલ નં
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,કંપની પસંદ કરો
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,પ્રિન્ટ વિભાગ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,વપરાશકર્તા {0} પાસે કોઇપણ મૂળભૂત POS પ્રોફાઇલ નથી. આ વપરાશકર્તા માટે રો {1} પર ડિફોલ્ટ તપાસો
 DocType: Student Group,Set 0 for no limit,કોઈ મર્યાદા માટે 0 સેટ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,રો {idx}: {ક્ષેત્ર} પ્રારંભિક {invoice_type} ઇનવૉઇસેસ બનાવવા માટે જરૂરી છે
 DocType: Customer,Primary Address and Contact Detail,પ્રાથમિક સરનામું અને સંપર્ક વિગતવાર
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,કૃપા કરીને ઓછામાં ઓછી એક ડોમેન પસંદ કરો.
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,અગાઉથી X દિવસ માટે કામગીરી આયોજન કરવાનો પ્રયાસ કરો.
 DocType: HR Settings,Stop Birthday Reminders,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: SMS Center,Receiver List,રીસીવર યાદી
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,શોધ વસ્તુ
 DocType: Payment Schedule,Payment Amount,ચુકવણી રકમ
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,ગ્રેડીંગ સ્કેલ
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,પહેલેથી જ પૂર્ણ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,સ્ટોક હેન્ડ માં
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,સ્ટોક હેન્ડ માં
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,આયાત સફળ!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,બહાર પાડેલી વસ્તુઓ કિંમત
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,અવતરણ વસ્તુ
 DocType: Customer,Customer POS Id,ગ્રાહક POS Id
 DocType: Account,Account Name,ખાતાનું નામ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,તારીખ તારીખ કરતાં વધારે ન હોઈ શકે થી
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,સીરીયલ કોઈ {0} જથ્થો {1} એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,તારીખ તારીખ કરતાં વધારે ન હોઈ શકે થી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,સીરીયલ કોઈ {0} જથ્થો {1} એક અપૂર્ણાંક ન હોઈ શકે
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Woocommerce સર્વર URL દાખલ કરો
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,પુરવઠોકર્તા પ્રકાર માસ્ટર.
 DocType: Purchase Order Item,Supplier Part Number,પુરવઠોકર્તા ભાગ સંખ્યા
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,રૂપાંતરણ દર 0 અથવા 1 હોઇ શકે છે નથી કરી શકો છો
 DocType: Share Balance,To No,ના
-DocType: Subscription,Reference Document,સંદર્ભ દસ્તાવેજ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} રદ અથવા બંધ છે
 DocType: Accounts Settings,Credit Controller,ક્રેડિટ કંટ્રોલર
-DocType: Grant Application,Applicant Type,અરજદારનો પ્રકાર
+DocType: Loan,Applicant Type,અરજદારનો પ્રકાર
 DocType: Purchase Invoice,03-Deficiency in services,03-સેવાઓમાં ઉણપ
 DocType: Delivery Note,Vehicle Dispatch Date,વાહન રવાનગી તારીખ
 DocType: Healthcare Settings,Default Medical Code Standard,ડિફોલ્ટ મેડિકલ કોડ સ્ટાન્ડર્ડ
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ગણાવી
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,સુરક્ષિત Qty
 DocType: Party Account,Party Account,પક્ષ એકાઉન્ટ
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,માનવ સંસાધન
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,માનવ સંસાધન
 DocType: Lead,Upper Income,ઉચ્ચ આવક
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,નકારો
 DocType: Journal Entry Account,Debit in Company Currency,કંપની કરન્સી ડેબિટ
 DocType: BOM Item,BOM Item,BOM વસ્તુ
 DocType: Appraisal,For Employee,કર્મચારી માટે
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,વહેંચણી એન્ટ્રી બનાવો
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,વહેંચણી એન્ટ્રી બનાવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
 DocType: Company,Default Values,મૂળભૂત મૂલ્યો
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),કુલ (કર વગર)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,લીડ કાઉન્ટ
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ઉપલબ્ધ સ્ટોક
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,ઉપલબ્ધ સ્ટોક
 DocType: Manufacturing Settings,Capacity Planning For (Days),(દિવસ) માટે ક્ષમતા આયોજન
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,પ્રાપ્તિ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ફરજિયાત ફીલ્ડ - પ્રોગ્રામ
 DocType: Special Test Template,Result Component,પરિણામ ઘટક
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,વોરંટી દાવાની
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,પાંદડા તરીકે નહીં અંદર રજાઓ સમાવેશ થાય છે
 DocType: Sales Invoice,Packed Items,પેક વસ્તુઓ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,સીરીયલ નંબર સામે વોરંટી દાવાની
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;કુલ&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;કુલ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,શોપિંગ કાર્ટ સક્ષમ
 DocType: Employee,Permanent Address,કાયમી સરનામું
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ક્રિયાની પુષ્ટિ કરો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ઓનલાઇન હરાજી
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,થો અથવા મૂલ્યાંકન દર અથવા બંને ક્યાં સ્પષ્ટ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,પરિપૂર્ણતા
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,કાર્ટ માં જુઓ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,માર્કેટિંગ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,પ્રમાણભૂત માપદંડ બનાવી શકતા નથી કૃપા કરીને માપદંડનું નામ બદલો
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,નમૂના મેળવવા
 DocType: Material Request,Transferred,પર સ્થાનાંતરિત કરવામાં આવી
 DocType: Vehicle,Doors,દરવાજા
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,પેશન્ટ નોંધણી માટે ફી એકત્રિત કરો
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,સ્ટોક વ્યવહાર પછી લક્ષણો બદલી શકતા નથી. નવી આઇટમ બનાવો અને નવા આઇટમને શેર ટ્રાન્સફર કરો
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,સ્ટોક વ્યવહાર પછી લક્ષણો બદલી શકતા નથી. નવી આઇટમ બનાવો અને નવા આઇટમને શેર ટ્રાન્સફર કરો
 DocType: Course Assessment Criteria,Weightage,ભારાંકન
 DocType: Purchase Invoice,Tax Breakup,ટેક્સ બ્રેકઅપ
 DocType: Packing Slip,PS-,PS-
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,રિકંસીલેશન JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ઘણા બધા કૉલમ. અહેવાલમાં નિકાસ અને એક સ્પ્રેડશીટ એપ્લિકેશન ઉપયોગ છાપો.
 DocType: Purchase Invoice Item,Batch No,બેચ કોઈ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,કર્મચારી એડવાન્સિસ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,એક ગ્રાહક ખરીદી ઓર્ડર સામે બહુવિધ વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
 DocType: Student Group Instructor,Student Group Instructor,વિદ્યાર્થીઓની જૂથ પ્રશિક્ષક
 DocType: Grant Application,Assessment  Mark (Out of 10),આકારણી માર્ક (10 માંથી)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 મોબાઇલ કોઈ
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,મુખ્ય
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,મુખ્ય
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ક્ષેત્રમાં પ્રતિ તક ફરજિયાત છે
 DocType: Email Digest,Annual Expenses,વાર્ષિક ખર્ચ
 DocType: Item,Variants,ચલો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
 DocType: Sales Team,Contribution to Net Total,નેટ કુલ ફાળો
 DocType: Sales Invoice Item,Customer's Item Code,ગ્રાહક વસ્તુ કોડ
 DocType: Stock Reconciliation,Stock Reconciliation,સ્ટોક રિકંસીલેશન
 DocType: Territory,Territory Name,પ્રદેશ નામ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,તમે સબ્સ્ક્રિપ્શનમાં જ બિલિંગ ચક્ર સાથે માત્ર યોજનાઓ ધરાવી શકો છો
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,નોકરી માટે અરજી.
 DocType: Purchase Order Item,Warehouse and Reference,વેરહાઉસ અને સંદર્ભ
 DocType: Supplier,Statutory info and other general information about your Supplier,તમારા સપ્લાયર વિશે વૈધાિનક માહિતી અને અન્ય સામાન્ય માહિતી
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,appraisals
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,તાલીમ કાર્યક્રમો
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,લીડ સોર્સ દ્વારા ટ્રેક લીડ
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,એક શિપિંગ નિયમ માટે એક શરત
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,દાખલ કરો
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,દાખલ કરો
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,જાળવણી લૉગ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),આ પેકેજની નેટ વજન. (વસ્તુઓ નેટ વજન રકમ તરીકે આપોઆપ ગણતરી)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,વિતરિત અને બિલ
 DocType: Student Group,Instructors,પ્રશિક્ષકો
 DocType: GL Entry,Credit Amount in Account Currency,એકાઉન્ટ કરન્સી ક્રેડિટ રકમ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,શેર મેનેજમેન્ટ
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ચુકવણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ચુકવણી
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","વેરહાઉસ {0} કોઈપણ એકાઉન્ટ સાથે સંકળાયેલ નથી, તો કૃપા કરીને કંપનીમાં વેરહાઉસ રેકોર્ડમાં એકાઉન્ટ અથવા સેટ મૂળભૂત યાદી એકાઉન્ટ ઉલ્લેખ {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,તમારા ઓર્ડર મેનેજ
 DocType: Work Order Operation,Actual Time and Cost,વાસ્તવિક સમય અને ખર્ચ
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,વિદ્યાર્થી છોડો અરજી
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,પર
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,બારકોડ્સ
 DocType: Hub Category,Hub Node,હબ નોડ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,તમે નકલી વસ્તુઓ દાખલ કર્યો છે. સુધારવું અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,એસોસિયેટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,એસોસિયેટ
 DocType: Asset Movement,Asset Movement,એસેટ ચળવળ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,વર્ક ઓર્ડર {0} સબમિટ હોવો આવશ્યક છે
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,ન્યૂ કાર્ટ
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,બિલિંગ ચલણ કાં તો ડિફોલ્ટ કંપનીના ચલણ અથવા પક્ષ એકાઉન્ટ ચલણની સમાન હોવા જોઈએ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
 DocType: Soil Texture,Loam,લોમ
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,રો {0}: તારીખ પોસ્ટ તારીખ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,રો {0}: તારીખ પોસ્ટ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ચુકવણી પ્રવેશ કરો
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},વસ્તુ માટે જથ્થો {0} કરતાં ઓછી હોવી જોઈએ {1}
 ,Sales Invoice Trends,સેલ્સ ભરતિયું પ્રવાહો
 DocType: Leave Application,Apply / Approve Leaves,પાંદડા મંજૂર / લાગુ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,માટે
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',અથવા &#39;અગાઉના પંક્તિ કુલ&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; ચાર્જ પ્રકાર છે તો જ પંક્તિ નો સંદર્ભ લો કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',અથવા &#39;અગાઉના પંક્તિ કુલ&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; ચાર્જ પ્રકાર છે તો જ પંક્તિ નો સંદર્ભ લો કરી શકો છો
 DocType: Sales Order Item,Delivery Warehouse,ડ લવર વેરહાઉસ
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,નાણાકીય ખર્ચ કેન્દ્રો વૃક્ષ.
 DocType: Serial No,Delivery Document No,ડ લવર દસ્તાવેજ કોઈ
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,સામગ્રી વપરાશ ઉત્પાદન સેટિંગ્સમાં સેટ નથી
 DocType: Student,Student Mobile Number,વિદ્યાર્થી મોબાઇલ નંબર
 DocType: Item,Has Variants,ચલો છે
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} કરતાં વધુ [{1}} પંક્તિમાં આઇટમ {0} માટે વધુપડતું નથી. ઓવર-બિલિંગને મંજૂરી આપવા માટે, કૃપા કરીને સ્ટોક સેટિંગ્સમાં સેટ કરો"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} કરતાં વધુ [{1}} પંક્તિમાં આઇટમ {0} માટે વધુપડતું નથી. ઓવર-બિલિંગને મંજૂરી આપવા માટે, કૃપા કરીને સ્ટોક સેટિંગ્સમાં સેટ કરો"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,પ્રતિભાવ અપડેટ કરો
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,પ્રથમ પ્રોગ્રામ પસંદ કરો
 DocType: Patient Appointment,Patient Age,પેશન્ટ એજ
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,પ્રોજેક્ટ વ્યવસ્થા
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,સીરીઅલ નંબર {0} પહેલેથી જ પાછો ફર્યો છે
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,સીરીઅલ નંબર {0} પહેલેથી જ પાછો ફર્યો છે
 DocType: Supplier,Supplier of Goods or Services.,સામાન કે સેવાઓ સપ્લાયર.
 DocType: Budget,Fiscal Year,નાણાકીય વર્ષ
 DocType: Asset Maintenance Log,Planned,આયોજિત
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,પેશન્ટમાં કન્સલ્ટેશન ચાર્જીસ બુક કરવા માટે જો સેટ ન હોય તો તેનો ઉપયોગ કરવા માટેની ડિફોલ્ટ પ્રાપ્ય હિસાબ
 DocType: Vehicle Log,Fuel Price,ફ્યુઅલ પ્રાઈસ
+DocType: Bank Guarantee,Margin Money,માર્જિન મની
 DocType: Budget,Budget,બજેટ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ઓપન સેટ કરો
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,ઉપર અનુસરો
 DocType: Item,Is Sales Item,સેલ્સ વસ્તુ છે
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,વસ્તુ ગ્રુપ વૃક્ષ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. વસ્તુ માસ્ટર તપાસો
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. વસ્તુ માસ્ટર તપાસો
 DocType: Maintenance Visit,Maintenance Time,જાળવણી સમય
 ,Amount to Deliver,જથ્થો પહોંચાડવા માટે
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},એક જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ પ્રારંભ તારીખ કરતાં શૈક્ષણિક વર્ષ શરૂ તારીખ શબ્દ સાથે કડી થયેલ છે અગાઉ ન હોઈ શકે (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,ભૂલો આવી હતી.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,{2} અને {3} વચ્ચે {1} માટે કર્મચારી {0} પહેલેથી જ લાગુ છે:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,ભૂલો આવી હતી.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,{2} અને {3} વચ્ચે {1} માટે કર્મચારી {0} પહેલેથી જ લાગુ છે:
 DocType: Guardian,Guardian Interests,ગાર્ડિયન રૂચિ
 DocType: Naming Series,Current Value,વર્તમાન કિંમત
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
 DocType: Education Settings,Instructor Records to be created by,દ્વારા બનાવવામાં આવશે પ્રશિક્ષક રેકોર્ડ્સ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} બનાવવામાં
 DocType: GST Account,GST Account,જીએસટી એકાઉન્ટ
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
 DocType: Website Item Group,Website Item Group,વેબસાઇટ વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,મનપસંદમાં ઉમેરાયું
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ઉપરોક્ત પસંદ કરેલ માપદંડો અથવા પહેલેથી સબમિટ કરેલી પગાર સ્લિપ માટે કોઈ પગાર કાપલી મળી નથી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,કર અને વેરામાંથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ઉપરોક્ત પસંદ કરેલ માપદંડો અથવા પહેલેથી સબમિટ કરેલી પગાર સ્લિપ માટે કોઈ પગાર કાપલી મળી નથી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,કર અને વેરામાંથી
 DocType: Projects Settings,Projects Settings,પ્રોજેક્ટ્સ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ચુકવણી પ્રવેશો દ્વારા ફિલ્ટર કરી શકતા નથી {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,વસ્તુ જૂથો વૃક્ષ.
 DocType: Production Plan,Total Produced Qty,કુલ ઉત્પાદન જથ્થો
 DocType: Payroll Entry,Get Employee Details,કર્મચારીનું વિગતો મેળવો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
 DocType: Asset,Sold,વેચાઈ
 ,Item-wise Purchase History,વસ્તુ મુજબના ખરીદ ઈતિહાસ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
 DocType: Account,Frozen,ફ્રોઝન
 DocType: Sales Invoice Payment,Base Amount (Company Currency),મૂળ રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,કાચો માલ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,કાચો માલ
 DocType: Payment Reconciliation Payment,Reference Row,સંદર્ભ રો
 DocType: Installation Note,Installation Time,સ્થાપન સમયે
 DocType: Sales Invoice,Accounting Details,હિસાબી વિગતો
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,આ કંપની માટે તમામ વ્યવહારો કાઢી નાખો
 DocType: Patient,O Positive,ઓ હકારાત્મક
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,રોકાણો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,રોકાણો
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ફાળવણી
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,સ્વીકૃતિ માપદંડ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ઉપરના કોષ્ટકમાં સામગ્રી અરજીઓ દાખલ કરો
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,જર્નલ એન્ટ્રી માટે કોઈ ચુકવણી ઉપલબ્ધ નથી
 DocType: Item Attribute,Attribute Name,નામ લક્ષણ
 DocType: BOM,Show In Website,વેબસાઇટ બતાવો
 DocType: Shopping Cart Settings,Show Quantity in Website,વેબસાઇટ જથ્થો બતાવો
-DocType: Employee Loan Application,Total Payable Amount,કુલ ચૂકવવાપાત્ર રકમ
+DocType: Loan Application,Total Payable Amount,કુલ ચૂકવવાપાત્ર રકમ
 DocType: Task,Expected Time (in hours),(કલાકોમાં) અપેક્ષિત સમય
 DocType: Item Reorder,Check in (group),માં તપાસો (જૂથ)
 DocType: Soil Texture,Silt,સિલ્ટ
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ચુકવણી બનાવો
 DocType: Room,Room Name,રૂમ નામ
 DocType: Prescription Duration,Prescription Duration,પ્રિસ્ક્રિપ્શન અવધિ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે, પહેલાં {0} રદ / લાગુ કરી શકાય નહીં છોડો {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે, પહેલાં {0} રદ / લાગુ કરી શકાય નહીં છોડો {1}"
 DocType: Activity Cost,Costing Rate,પડતર દર
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ગ્રાહક સરનામાં અને સંપર્કો
 ,Campaign Efficiency,ઝુંબેશ કાર્યક્ષમતા
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,પ્રકરણ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,જોડી
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,જ્યારે આ મોડ પસંદ કરવામાં આવે ત્યારે ડિફૉલ્ટ એકાઉન્ટ આપમેળે POS ઇન્વોઇસમાં અપડેટ થશે.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
 DocType: Asset,Depreciation Schedule,અવમૂલ્યન સૂચિ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,વેચાણ ભાગીદાર સરનામાં અને સંપર્કો
 DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,અડધા દિવસ તારીખ તારીખ થી અને તારીખ વચ્ચે પ્રયત્ન કરીશું
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,અડધા દિવસ તારીખ તારીખ થી અને તારીખ વચ્ચે પ્રયત્ન કરીશું
 DocType: Maintenance Schedule Detail,Actual Date,વાસ્તવિક તારીખ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} કંપનીમાં ડિફૉલ્ટ કિંમત સેન્ટર સેટ કરો.
 DocType: Item,Has Batch No,બેચ કોઈ છે
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે)
 DocType: Soil Texture,Soil Type,જમીન પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,નવો સંદેશ
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,હબ કેટેગરી
 DocType: Purchase Invoice,SEZ,સેઝ
 DocType: Purchase Receipt,Vehicle Number,વાહન સંખ્યા
-DocType: Employee Loan,Loan Amount,લોન રકમ
+DocType: Loan,Loan Amount,લોન રકમ
 DocType: Student Report Generation Tool,Add Letterhead,લેટરહેડ ઉમેરો
 DocType: Program Enrollment,Self-Driving Vehicle,સેલ્ફ ડ્રાઈવીંગ વાહન
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,પુરવઠોકર્તા સ્કોરકાર્ડ સ્ટેન્ડિંગ
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,પોઝિશન
 DocType: Patient,Patient Details,પેશન્ટ વિગતો
 DocType: Patient,B Positive,બી હકારાત્મક
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 DocType: Patient Medical Record,Patient Medical Record,પેશન્ટ મેડિકલ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,રમતો
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,વાસ્તવિક કુલ
 DocType: Lab Test UOM,Test UOM,ટેસ્ટ યુઓએમ
 DocType: Student Siblings,Student Siblings,વિદ્યાર્થી બહેન
+DocType: Subscription Plan Detail,Subscription Plan Detail,સબ્સ્ક્રિપ્શન પ્લાન વિગતવાર
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,એકમ
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,કંપની સ્પષ્ટ કરો
 ,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
 DocType: Asset Maintenance Task,Maintenance Task,જાળવણી કાર્ય
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,કૃપા કરીને GST સેટિંગ્સમાં B2C મર્યાદા સેટ કરો
@@ -2516,6 +2525,7 @@
 ,BOM Search,બોમ શોધ
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),કુલ કન્ઝ્યુમડ મટિરિયલ કોસ્ટ (સ્ટોક એન્ટ્રી દ્વારા)
 DocType: Hub Settings,Company Registered,કંપની રજિસ્ટર્ડ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,તારીખ પ્રતિ તારીખ કરતાં ઓછી ન હોઈ શકે
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",આ વેરહાઉસમાં ઉપલબ્ધ સ્ટોક પર આધારિત &quot;સ્ટોકમાં&quot; અથવા &quot;સ્ટોકમાં નથી&quot; પ્રકાશિત કરો.
 DocType: Vehicle,Fuel Type,ફ્યુઅલ પ્રકાર
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,કંપની ચલણ સ્પષ્ટ કરો
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},બેચ સ્ટોક બેલેન્સ {0} બનશે નકારાત્મક {1} વેરહાઉસ ખાતે વસ્તુ {2} માટે {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,સામગ્રી અરજીઓ નીચેની આઇટમ ફરીથી ક્રમમાં સ્તર પર આધારિત આપોઆપ ઊભા કરવામાં આવ્યા છે
 DocType: Email Digest,Pending Sales Orders,વેચાણ ઓર્ડર બાકી
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
 DocType: Employee,Create User Permission,વપરાશકર્તા પરવાનગી બનાવો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Healthcare Settings,Remind Before,પહેલાં યાદ કરાવો
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM રૂપાંતર પરિબળ પંક્તિ જરૂરી છે {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Salary Component,Deduction,કપાત
 DocType: Item,Retain Sample,નમૂના જાળવો
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
 DocType: Stock Reconciliation Item,Amount Difference,રકમ તફાવત
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,આ વેચાણ વ્યક્તિ કર્મચારી ID દાખલ કરો
 DocType: Territory,Classification of Customers by region,પ્રદેશ દ્વારા ગ્રાહકો વર્ગીકરણ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ઉત્પાદનમાં
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ગણતરી બેન્ક નિવેદન બેલેન્સ
 DocType: Normal Test Template,Normal Test Template,સામાન્ય ટેસ્ટ ઢાંચો
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,અપંગ વપરાશકર્તા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,અવતરણ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,કોઈ ક્વોટ માટે પ્રાપ્ત કરેલ આરએફક્યુને સેટ કરી શકતા નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,અવતરણ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,કોઈ ક્વોટ માટે પ્રાપ્ત કરેલ આરએફક્યુને સેટ કરી શકતા નથી
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,કુલ કપાત
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,એકાઉન્ટ ચલણમાં છાપવા માટે એક એકાઉન્ટ પસંદ કરો
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,આ પેશન્ટ સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચેની ટાઇમલાઇન જુઓ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,કિંમત સુધારાશે
 DocType: Patient,Date of Birth,જ્ન્મતારીખ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,વસ્તુ {0} પહેલાથી જ પરત કરવામાં આવી છે
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,વસ્તુ {0} પહેલાથી જ પરત કરવામાં આવી છે
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ફિસ્કલ વર્ષ ** એક નાણાકીય વર્ષ રજૂ કરે છે. બધા હિસાબી પ્રવેશો અને અન્ય મોટા પાયાના વ્યવહારો ** ** ફિસ્કલ યર સામે ટ્રેક છે.
 DocType: Opportunity,Customer / Lead Address,ગ્રાહક / લીડ સરનામું
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,સપ્લાયર સ્કોરકાર્ડ સેટઅપ
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,જોબ વર્ણન
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,જોબ વર્ણન
 DocType: Student Applicant,Applied,એપ્લાઇડ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,ફરીથી ખોલો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,ફરીથી ખોલો
 DocType: Sales Invoice Item,Qty as per Stock UOM,સ્ટોક Qty UOM મુજબ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 નામ
 DocType: Purchase Invoice,02-Post Sale Discount,02-પોસ્ટ વેચાણ ડિસ્કાઉન્ટ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","સિવાય ખાસ અક્ષરો &quot;-&quot; &quot;.&quot; &quot;#&quot;, અને &quot;/&quot; શ્રેણી નામકરણ મંજૂરી નથી"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","વેચાણ ઝુંબેશ ટ્રેક રાખો. દોરી જાય છે, સુવાકયો ટ્રૅક રાખો, વેચાણ ઓર્ડર વગેરે અભિયાન રોકાણ પર વળતર જાણવા માટે."
+DocType: Department Approver,Approver,તાજનો
 ,SO Qty,તેથી Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,શેરહોલ્ડરને ફીલ્ડ ખાલી કરી શકાતી નથી
 DocType: Guardian,Work Address,કાર્યાલયનું સરનામું
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),કુલ ફાળવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Order Item,To be delivered to customer,ગ્રાહક પર વિતરિત કરવામાં
 DocType: BOM,Scrap Material Cost,સ્ક્રેપ સામગ્રી ખર્ચ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,સીરીયલ કોઈ {0} કોઈપણ વેરહાઉસ સંબંધ નથી
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,સીરીયલ કોઈ {0} કોઈપણ વેરહાઉસ સંબંધ નથી
 DocType: Grant Application,Email Notification Sent,ઇમેઇલ સૂચન મોકલ્યું
 DocType: Purchase Invoice,In Words (Company Currency),શબ્દો માં (કંપની ચલણ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","આઇટમ કોડ, વેરહાઉસ, જથ્થો પંક્તિ પર જરૂરી છે"
-DocType: Pricing Rule,Supplier,પુરવઠોકર્તા
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","આઇટમ કોડ, વેરહાઉસ, જથ્થો પંક્તિ પર જરૂરી છે"
+DocType: Bank Guarantee,Supplier,પુરવઠોકર્તા
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ચુકવણી વિગતો બતાવો
 DocType: Consultation,Consultation Time,કન્સલ્ટેશન ટાઇમ
 DocType: C-Form,Quarter,ક્વાર્ટર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
 DocType: Global Defaults,Default Company,મૂળભૂત કંપની
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,બેન્ક નામ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-ઉપર
-DocType: Employee Loan,Employee Loan Account,કર્મચારીનું લોન એકાઉન્ટ
 DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
 DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ઇન્ટરેક્શન સંખ્યા
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),વજન (કિલોગ્રામમાં)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",પ્રકરણ બચત કર્યા પછી પ્રકરણો / પ્રકરણ_એનમે આપમેળે સેટ કરો.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,કૃપા કરીને GST સેટિંગ્સમાં GST એકાઉન્ટ્સ સેટ કરો
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,કૃપા કરીને GST સેટિંગ્સમાં GST એકાઉન્ટ્સ સેટ કરો
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,વ્યવસાય નો પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,નવી ખરીદી કિંમત
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,ગ્રાન્ટ વર્ણન
 DocType: Purchase Invoice Item,Rate (Company Currency),દર (કંપની ચલણ)
 DocType: Student Guardian,Others,અન્ય
+DocType: Subscription,Discounts,ડિસ્કાઉન્ટ
 DocType: Payment Entry,Unallocated Amount,ફાળવેલ રકમ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,બંધબેસતા વસ્તુ શોધી શકાતો નથી. માટે {0} કેટલીક અન્ય કિંમત પસંદ કરો.
 DocType: POS Profile,Taxes and Charges,કર અને ખર્ચ
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ઉત્પાદન અથવા ખરીદી વેચી અથવા સ્ટોક રાખવામાં આવે છે કે એક સેવા.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,કોઈ વધુ અપડેટ્સ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,પ્રથમ પંક્તિ માટે &#39;અગાઉના પંક્તિ કુલ પર&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; તરીકે ચાર્જ પ્રકાર પસંદ કરો અથવા નથી કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,પ્રથમ પંક્તિ માટે &#39;અગાઉના પંક્તિ કુલ પર&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; તરીકે ચાર્જ પ્રકાર પસંદ કરો અથવા નથી કરી શકો છો
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,આમાં આ સેટઅપ સાથે જોડાયેલા તમામ સ્કોરકાર્ડ્સ આવરી લે છે
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,બાળ વસ્તુ એક ઉત્પાદન બંડલ ન હોવી જોઈએ. આઇટમ દૂર `{0} &#39;અને સેવ કરો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,બેન્કિંગ
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,સેવા વસ્તુ
 DocType: Bank Guarantee,Bank Guarantee,બેંક ગેરંટી
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
 DocType: Bin,Ordered Quantity,આદેશ આપ્યો જથ્થો
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
 DocType: Grading Scale,Grading Scale Intervals,ગ્રેડીંગ સ્કેલ અંતરાલો
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,વર્ષ માટેનો નફો
+DocType: Bank Guarantee,Name of Bank,બેન્કનું નામ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {3}
 DocType: Fee Schedule,In Process,પ્રક્રિયામાં
 DocType: Authorization Rule,Itemwise Discount,મુદ્દાવાર ડિસ્કાઉન્ટ
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,નાણાકીય હિસાબ વૃક્ષ.
+DocType: Bank Guarantee,Reference Document Type,સંદર્ભ દસ્તાવેજ પ્રકારની
 DocType: Cash Flow Mapping,Cash Flow Mapping,કેશ ફ્લો મેપિંગ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} વેચાણ ઓર્ડર સામે {1}
 DocType: Account,Fixed Asset,સ્થિર એસેટ
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,શ્રેણીબદ્ધ ઈન્વેન્ટરી
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ઇમેઇલ ડિફોલ્ટ સંપર્કમાં નથી મળ્યો
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,સિક્રેટ જનરેટ કરો
-DocType: Employee Loan,Account Info,એકાઉન્ટ માહિતી
+DocType: Loan,Account Info,એકાઉન્ટ માહિતી
 DocType: Activity Type,Default Billing Rate,મૂળભૂત બિલિંગ રેટ
 DocType: Fees,Include Payment,ચુકવણી શામેલ કરો
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} વિદ્યાર્થીઓના જૂથો બનાવી.
 DocType: Sales Invoice,Total Billing Amount,કુલ બિલિંગ રકમ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ફી સ્ટ્રક્ચર અને સ્ટુડન્ટ ગ્રૂપ {0} માં પ્રોગ્રામ અલગ છે.
 DocType: Fee Schedule,Receivable Account,પ્રાપ્ત એકાઉન્ટ
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
 DocType: Quotation Item,Stock Balance,સ્ટોક બેલેન્સ
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,સીઇઓ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,સીઇઓ
 DocType: Purchase Invoice,With Payment of Tax,ટેક્સ પેમેન્ટ સાથે
 DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,સપ્લાયર માટે ત્રણ નકલમાં
 DocType: Land Unit,Is Container,કન્ટેઈનર છે
 DocType: Crop Cycle,This will be day 1 of the crop cycle,આ પાક ચક્રનો દિવસ 1 હશે
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
 DocType: Purchase Invoice Item,Weight UOM,વજન UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ફોલિયો નંબરો ધરાવતા ઉપલબ્ધ શેરધારકોની સૂચિ
 DocType: Salary Structure Employee,Salary Structure Employee,પગાર માળખું કર્મચારીનું
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,વેરિએન્ટ વિશેષતાઓ બતાવો
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,વેરિએન્ટ વિશેષતાઓ બતાવો
 DocType: Student,Blood Group,બ્લડ ગ્રુપ
 DocType: Course,Course Name,અભ્યાસક્રમનું નામ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ચોક્કસ કર્મચારી રજા કાર્યક્રમો મંજૂર કરી શકો છો વપરાશકર્તાઓ કે જેઓ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ઓફિસ સાધનો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ઓફિસ સાધનો
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,કંપનીઓ
 DocType: Supplier Scorecard,Scoring Setup,સ્કોરિંગ સેટઅપ
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ખરીદી ભાવ યાદી
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,સપ્લાયર સ્કોરકાર્ડ ચલોના નમૂનાઓ.
 DocType: Job Offer Term,Offer Term,ઓફર ગાળાના
 DocType: Asset,Quality Manager,ગુણવત્તા મેનેજર
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},કુલ અવેતન: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM વેબસાઇટ કામગીરીમાં
 DocType: Supplier Scorecard,Supplier Score,સપ્લાયર સ્કોર
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,કુલ ભરતિયું એએમટી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,કુલ ભરતિયું એએમટી
 DocType: Supplier,Warn RFQs,RFQs ચેતવો
 DocType: BOM,Conversion Rate,રૂપાંતરણ દર
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ઉત્પાદન શોધ
 DocType: Assessment Plan,To Time,સમય
 DocType: Authorization Rule,Approving Role (above authorized value),(અધિકૃત કિંમત ઉપર) ભૂમિકા એપ્રૂવિંગ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
+DocType: Loan,Total Amount Paid,ચુકવેલ કુલ રકમ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,કૃપા કરીને વિદ્યાર્થી પ્રવેશ પસંદ કરો જે પેઇડ વિદ્યાર્થી અરજદાર માટે ફરજિયાત છે
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,કિંમત પ્રકાશન પ્રકાશિત કરવા માટે એક ભાવ સૂચિ પસંદ કરો
@@ -2720,16 +2736,15 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},રો {0}: પૂર્ણ Qty કરતાં વધુ હોઈ શકે છે {1} કામગીરી માટે {2}
 DocType: Manufacturing Settings,Allow Overtime,અતિકાલિક માટે પરવાનગી આપે છે
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",શ્રેણીબદ્ધ આઇટમ {0} સ્ટોક એન્ટ્રી સ્ટોક રિકંસીલેશન મદદથી ઉપયોગ કરો અપડેટ કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",શ્રેણીબદ્ધ આઇટમ {0} સ્ટોક એન્ટ્રી સ્ટોક રિકંસીલેશન મદદથી ઉપયોગ કરો અપડેટ કરી શકાતી નથી
 DocType: Training Event Employee,Training Event Employee,તાલીમ ઘટના કર્મચારીનું
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,મહત્તમ નમૂનાઓ - {0} બેચ {1} અને આઇટમ {2} માટે જાળવી શકાય છે.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,સમયનો સ્લોટ ઉમેરો
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} વસ્તુ માટે જરૂરી સીરીયલ નંબર {1}. તમે પ્રદાન કરે છે {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} વસ્તુ માટે જરૂરી સીરીયલ નંબર {1}. તમે પ્રદાન કરે છે {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,વર્તમાન મૂલ્યાંકન દર
 DocType: Training Event,Advance,એડવાન્સ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ફરીથી રિકરિંગ કરવા માટે
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ચુકવણી ગેટવે સેટિંગ્સ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,એક્સચેન્જ મેળવી / નુકશાન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,એક્સચેન્જ મેળવી / નુકશાન
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ડૉકટાઇપ {0} શોધવામાં અસમર્થ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,નવું સરનામું
@@ -2749,7 +2764,6 @@
 DocType: Bin,Actual Quantity,ખરેખર જ થો
 DocType: Shipping Rule,example: Next Day Shipping,ઉદાહરણ: આગામી દિવસે શિપિંગ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},ઉમેદવારી {0} રહી છે
 DocType: Fee Schedule Program,Fee Schedule Program,ફી શેડ્યૂલ પ્રોગ્રામ
 DocType: Fee Schedule Program,Student Batch,વિદ્યાર્થી બેચ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,વિદ્યાર્થી બનાવો
@@ -2764,14 +2778,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ઇ-વાણિજ્ય જીએસટીઆઈએન
 DocType: Sales Order,Not Delivered,બચાવી શક્યા
 ,Bank Clearance Summary,બેન્ક ક્લિયરન્સ સારાંશ
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
 DocType: Appraisal Goal,Appraisal Goal,મૂલ્યાંકન ગોલ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,વર્ગ સૂચવે છે?
 DocType: Stock Reconciliation Item,Current Amount,વર્તમાન જથ્થો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,મકાન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,મકાન
 DocType: Fee Schedule,Fee Structure,ફી માળખું
 DocType: Timesheet Detail,Costing Amount,પડતર રકમ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 DocType: Student Admission Program,Application Fee,અરજી ફી
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,પગાર સ્લિપ રજુ
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,વસ્તુ {0} છે {1}% માટે Maxiumm ડિસ્કાઉન્ટ
@@ -2779,12 +2792,13 @@
 DocType: Sales Partner,Address & Contacts,સરના સંપર્કો
 DocType: SMS Log,Sender Name,પ્રેષકનું નામ
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,કૃષિ વિશ્લેષણ માપદંડ
+DocType: HR Settings,Leave Approval Notification Template,મંજૂરી સૂચન ઢાંચો છોડો
 DocType: POS Profile,[Select],[પસંદ કરો]
 DocType: Vital Signs,Blood Pressure (diastolic),બ્લડ પ્રેશર (ડાયાસ્ટોલિક)
 DocType: SMS Log,Sent To,મોકલવામાં
 DocType: Agriculture Task,Holiday Management,હોલીડે મેનેજમેન્ટ
 DocType: Payment Request,Make Sales Invoice,સેલ્સ ભરતિયું બનાવો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,સોફ્ટવેર્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,સોફ્ટવેર્સ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
 DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},ફિઝિશિયન {0} {1} પર ઉપલબ્ધ નથી
@@ -2802,7 +2816,7 @@
 DocType: Employee,New Workplace,ન્યૂ નોકરીના સ્થળે
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,સામગ્રી વપરાશ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,બંધ કરો
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},બારકોડ કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},બારકોડ કોઈ વસ્તુ {0}
 DocType: Normal Test Items,Require Result Value,પરિણામ મૂલ્યની જરૂર છે
 DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2817,19 +2831,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
 DocType: Leave Block List,Allow Users,વપરાશકર્તાઓ માટે પરવાનગી આપે છે
 DocType: Purchase Order,Customer Mobile No,ગ્રાહક મોબાઇલ કોઈ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,રીકરીંગ
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,કેશ ફ્લો મેપિંગ ઢાંચો વિગતો
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,લોન મેનેજમેન્ટ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,અલગ ઇન્કમ ટ્રૅક અને ઉત્પાદન ક્ષેત્રોમાં અથવા વિભાગો માટે ખર્ચ.
 DocType: Rename Tool,Rename Tool,સાધન નામ બદલો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,સુધારો કિંમત
 DocType: Item Reorder,Item Reorder,વસ્તુ પુનઃક્રમાંકિત કરો
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,પગાર બતાવો કાપલી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,પગાર બતાવો કાપલી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ટ્રાન્સફર સામગ્રી
 DocType: Fees,Send Payment Request,ચુકવણી વિનંતી મોકલો
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
 DocType: Water Analysis,Origin,મૂળ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
@@ -2844,14 +2858,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,આવકવેરાના જવાબદારી છે
 DocType: Grading Scale Interval,Grade Description,ગ્રેડ વર્ણન
 DocType: Stock Entry,Purchase Receipt No,ખરીદી રસીદ કોઈ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,બાનું
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,બાનું
 DocType: Sales Invoice, Shipping Bill Number,શીપીંગ બિલ નંબર
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
 DocType: Asset Maintenance Log,Actions performed,ક્રિયાઓ કરેલા
 DocType: Cash Flow Mapper,Section Leader,સેક્શન લીડર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ફંડ ઓફ સોર્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ફંડ ઓફ સોર્સ (જવાબદારીઓ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},પંક્તિ માં જથ્થો {0} ({1}) ઉત્પાદન જથ્થો તરીકે જ હોવી જોઈએ {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,કર્મચારીનું
+DocType: Bank Guarantee,Fixed Deposit Number,ફિક્સ્ડ ડિપોઝિટ નંબર
 DocType: Asset Repair,Failure Date,નિષ્ફળતા તારીખ
 DocType: Sample Collection,Collected Time,એકત્રિત સમય
 DocType: Company,Sales Monthly History,સેલ્સ માસિક ઇતિહાસ
@@ -2868,10 +2883,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,શું તમે ખરેખર આ નિમણૂક રદ કરવા માગો છો?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,હોટેલ રૂમ પ્રાઇસીંગ પેકેજ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,સેલ્સ પાઇપલાઇન
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,જરૂરી પર
 DocType: Rename Tool,File to Rename,નામ ફાઇલ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,ઉમેદવારી સુધારાઓ મેળવો
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},એકાઉન્ટ {0} {1} એકાઉન્ટ મોડ માં કંપનીની મેચ થતો નથી: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,અભ્યાસક્રમ:
@@ -2881,7 +2897,7 @@
 DocType: Notification Control,Expense Claim Approved,ખર્ચ દાવો મંજૂર
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,કોઈ વર્ક ઓર્ડર્સ બનાવ્યાં નથી
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ સમયગાળા માટે બનાવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ફાર્માસ્યુટિકલ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ફાર્માસ્યુટિકલ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ખરીદી વસ્તુઓ કિંમત
 DocType: Selling Settings,Sales Order Required,વેચાણ ઓર્ડર જરૂરી
 DocType: Purchase Invoice,Credit To,માટે ક્રેડિટ
@@ -2899,7 +2915,7 @@
 DocType: Request for Quotation Supplier,No Quote,કોઈ ક્વોટ નથી
 DocType: Warranty Claim,Raised By,દ્વારા ઊભા
 DocType: Payment Gateway Account,Payment Account,ચુકવણી એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,વળતર બંધ
 DocType: Job Offer,Accepted,સ્વીકારાયું
@@ -2911,7 +2927,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,શોધ પરિણામો
 DocType: Room,Room Number,રૂમ સંખ્યા
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,શીપીંગ નિયમ લેબલ
 DocType: Journal Entry Account,Payroll Entry,પેરોલ એન્ટ્રી
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ફી રેકોર્ડ્સ જુઓ
@@ -2921,7 +2937,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 DocType: Lab Test Sample,Lab Test Sample,લેબ ટેસ્ટ નમૂના
 DocType: Item Variant Settings,Allow Rename Attribute Value,નામ બદલો લક્ષણ મૂલ્યને મંજૂરી આપો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
 DocType: Restaurant,Invoice Series Prefix,ઇન્વોઇસ સિરીઝ ઉપસર્ગ
 DocType: Employee,Previous Work Experience,પહેલાંના કામ અનુભવ
@@ -2929,8 +2945,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps સંકલન સક્ષમ નથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
+DocType: Subscription,Trialling,ટ્રાયલિંગ
 DocType: Member,Membership Expiry Date,સભ્યપદ સમાપ્તિ તારીખ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} વળતર દસ્તાવેજમાં નકારાત્મક હોવા જ જોઈએ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} વળતર દસ્તાવેજમાં નકારાત્મક હોવા જ જોઈએ
 ,Minutes to First Response for Issues,મુદ્દાઓ માટે પ્રથમ પ્રતિભાવ મિનિટ
 DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
@@ -2949,7 +2966,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,માપવા એકમ
 DocType: Fiscal Year,Year End Date,વર્ષ અંતે તારીખ
 DocType: Task Depends On,Task Depends On,કાર્ય પર આધાર રાખે છે
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,તક
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,તક
 DocType: Operation,Default Workstation,મૂળભૂત વર્કસ્ટેશન
 DocType: Notification Control,Expense Claim Approved Message,ખર્ચ દાવો મંજૂર સંદેશ
 DocType: Payment Entry,Deductions or Loss,કપાત અથવા નુકસાન
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,પગાર વિના છોડો મંજૂર છોડો અરજી રેકોર્ડ સાથે મેળ ખાતું નથી
 DocType: Campaign,Campaign-.####,અભિયાન -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,આગળ કરવાનાં પગલાંઓ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
 DocType: Membership,USD,અમેરીકન ડોલર્સ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ઇન્વોઇસ બનાવો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,બાકી રહેલી બેલેન્સ
@@ -2996,7 +3013,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,બારકોડ {0} એ માન્ય {1} કોડ નથી
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,સમાપ્તિ વર્ષ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / લીડ%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 DocType: Driver,Driver,ડ્રાઈવર
 DocType: Vital Signs,Nutrition Values,પોષણ મૂલ્યો
 DocType: Lab Test Template,Is billable,બિલયોગ્ય છે
@@ -3007,7 +3024,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),વાસ્તવિક પ્રારંભ તારીખ (સમયનો શીટ મારફતે)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,આ એક ઉદાહરણ વેબસાઇટ ERPNext માંથી ઓટો પેદા થાય છે
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,એઇજીંગનો રેન્જ 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,કુલ અકાઉંટ રકમ કુલ દાવો કરેલી રકમ કરતાં વધુ હોઈ શકતી નથી
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,કુલ અકાઉંટ રકમ કુલ દાવો કરેલી રકમ કરતાં વધુ હોઈ શકતી નથી
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3042,7 +3059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,એટ્રીબ્યુટ મૂલ્યો પસંદ કરો
 DocType: Purchase Invoice,Reason For Issuing document,દસ્તાવેજને અદા કરવાનું કારણ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
 DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,આગામી સંપર્ક આગેવાની ઇમેઇલ સરનામું તરીકે જ ન હોઈ શકે
 DocType: Tax Rule,Billing City,બિલિંગ સિટી
@@ -3059,7 +3076,8 @@
 DocType: Warranty Claim,Service Address,સેવા સરનામું
 DocType: Asset Maintenance Task,Calibration,માપાંકન
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} કંપનીની રજા છે
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures અને ફિક્સર
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,સ્થિતિ સૂચન છોડો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures અને ફિક્સર
 DocType: Item,Manufacture,ઉત્પાદન
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,સેટઅપ કંપની
 ,Lab Test Report,લેબ ટેસ્ટ રિપોર્ટ
@@ -3075,7 +3093,6 @@
 DocType: Crop,Planting Area,રોપણી ક્ષેત્ર
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),કુલ (Qty)
 DocType: Installation Note Item,Installed Qty,ઇન્સ્ટોલ Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,આમાં કેટલાક અમાન્ય ઇમેઇલ સરનામાંઓ હોઈ શકે છે
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,તમે ઉમેર્યું
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,તાલીમ પરિણામ
@@ -3085,16 +3102,17 @@
 DocType: Products Settings,Products per Page,પૃષ્ઠ દીઠ પ્રોડક્ટ્સ
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,સંસ્થા શાખા માસ્ટર.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,અથવા
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,અથવા
 DocType: Sales Order,Billing Status,બિલિંગ સ્થિતિ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,સમસ્યાની જાણ કરો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ઉપયોગિતા ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ઉપયોગિતા ખર્ચ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ઉપર
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,રો # {0}: જર્નલ પ્રવેશ {1} એકાઉન્ટ નથી {2} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
 DocType: Supplier Scorecard Criteria,Criteria Weight,માપદંડ વજન
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,મંજૂરી સૂચના છોડો
 DocType: Buying Settings,Default Buying Price List,ડિફૉલ્ટ ખરીદી ભાવ યાદી
 DocType: Payroll Entry,Salary Slip Based on Timesheet,પગાર કાપલી Timesheet પર આધારિત
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ખરીદ દર
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,ખરીદ દર
 DocType: Notification Control,Sales Order Message,વેચાણ ઓર્ડર સંદેશ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","વગેરે કંપની, કરન્સી, ચાલુ નાણાકીય વર્ષના, જેવા સેટ મૂળભૂત મૂલ્યો"
 DocType: Payment Entry,Payment Type,ચુકવણી પ્રકાર
@@ -3116,6 +3134,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,શોપિંગ કાર્ટ સેટિંગ્સ
 DocType: Journal Entry,Accounting Entries,હિસાબી પ્રવેશો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","જો પસંદ કરેલ પ્રાઇસીંગ નિયમ &#39;દર&#39; માટે કરવામાં આવે છે, તો તે કિંમત યાદી પર ફરીથી લખશે. પ્રાઇસીંગ નિયમ દર અંતિમ દર છે, તેથી આગળ કોઈ ડિસ્કાઉન્ટ લાગુ ન કરવો જોઈએ. તેથી, સેલ્સ ઓર્ડર, ખરીદી ઓર્ડર વગેરે જેવી વ્યવહારોમાં, &#39;ભાવ યાદી રેટ&#39; ક્ષેત્રની જગ્યાએ &#39;દર&#39; ક્ષેત્રમાં મેળવવામાં આવશે."
+DocType: Journal Entry,Paid Loan,પેઇડ લોન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},એન્ટ્રી ડુપ્લિકેટ. કૃપા કરીને તપાસો અધિકૃતતા નિયમ {0}
 DocType: Journal Entry Account,Reference Due Date,સંદર્ભની તારીખ
 DocType: Purchase Order,Ref SQ,સંદર્ભ SQ
@@ -3132,7 +3151,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 ,To Produce,પેદા કરવા માટે
 apps/erpnext/erpnext/config/hr.py +93,Payroll,પગારપત્રક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
 DocType: Patient Service Unit,Parent Service Unit,પિતૃ સેવા એકમ
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,બનાવો વપરાશકર્તા
 DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
@@ -3150,7 +3169,7 @@
 DocType: Shareholder,SH-,એસ.એચ-
 DocType: Account,Income Account,આવક એકાઉન્ટ
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ડ લવર
 DocType: Volunteer,Weekdays,અઠવાડિયાના દિવસો
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
 DocType: Restaurant Menu,Restaurant Menu,રેસ્ટોરન્ટ મેનૂ
@@ -3158,7 +3177,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,શાશ્વત યાદી માટે ડિફોલ્ટ યાદી એકાઉન્ટ સેટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,શાશ્વત યાદી માટે ડિફોલ્ટ યાદી એકાઉન્ટ સેટ
 DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ગ્રાન્ટ સમીક્ષા ઇમેઇલ મોકલો
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage સંપૂર્ણ છે, સાચવી નહોતી"
@@ -3166,10 +3185,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,રૂમ ક્ષમતા
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},પહેલેથી જ આઇટમ {0} માટે રેકોર્ડ અસ્તિત્વમાં છે
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,સંદર્ભ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,તમે અગાઉ બનાવેલ ઇન્વૉઇસેસના રેકોર્ડ ગુમાવશો. શું તમે ખરેખર આ સબ્સ્ક્રિપ્શન ફરીથી શરૂ કરવા માંગો છો?
 DocType: Lab Test,LP-,એલપી-
 DocType: Healthcare Settings,Registration Fee,નોંધણી ફી
 DocType: Budget,Cost Center,ખર્ચ કેન્દ્રને
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,વાઉચર #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,વાઉચર #
 DocType: Notification Control,Purchase Order Message,ઓર્ડર સંદેશ ખરીદી
 DocType: Tax Rule,Shipping Country,શીપીંગ દેશ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,સેલ્સ વહેવારો ગ્રાહકનો ટેક્સ ID છુપાવો
@@ -3178,20 +3198,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","પ્રાઇસીંગ નિયમ કેટલાક માપદંડ પર આધારિત, / ભાવ યાદી પર ફરીથી લખી ડિસ્કાઉન્ટ ટકાવારી વ્યાખ્યાયિત કરવા માટે કરવામાં આવે છે."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,વેરહાઉસ માત્ર સ્ટોક એન્ટ્રી મારફતે બદલી શકાય છે / ડિલિવરી નોંધ / ખરીદી રસીદ
 DocType: Employee Education,Class / Percentage,વર્ગ / ટકાવારી
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,આય કર
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,લેટરહેડ્સ પર જાઓ
+DocType: Subscription,Cancel At End Of Period,પીરિયડ અંતે અંતે રદ કરો
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ટ્રાન્સફર માટે કોઈ આઈટમ્સ પસંદ નથી
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ટ્રાન્સફર માટે કોઈ આઈટમ્સ પસંદ નથી
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,બધા સંબોધે છે.
 DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
 DocType: Vehicle,Electric,ઇલેક્ટ્રીક
 DocType: Task,% Progress,% પ્રગતિ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,લાભ / એસેટ નિકાલ પર નુકશાન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,લાભ / એસેટ નિકાલ પર નુકશાન
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",ફક્ત &quot;મંજૂર કરેલ&quot; સ્થિતિવાળા વિદ્યાર્થી અરજદાર નીચે ટેબલમાં પસંદ કરવામાં આવશે.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,એકાઉન્ટ {0} માટે એકાઉન્ટ નંબર ઉપલબ્ધ નથી. <br> કૃપા કરીને તમારા ચાર્ટ્સ એકાઉન્ટ્સને યોગ્ય રીતે સેટ કરો.
 DocType: Task,Depends on Tasks,કાર્યો પર આધાર રાખે છે
@@ -3206,6 +3227,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,સ્ટોક નથી
 DocType: Volunteer,Volunteer Skills,સ્વયંસેવક કૌશલ્ય
 DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
+DocType: Bank Guarantee,Reference Document Name,સંદર્ભ દસ્તાવેજનું નામ
 DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
 apps/erpnext/erpnext/hooks.py +142,Issues,મુદ્દાઓ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},સ્થિતિ એક હોવો જ જોઈએ {0}
@@ -3219,7 +3241,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,બહુ્ મોટુ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,બહુ્ મોટુ
+DocType: Loan,Loan Application,લોન અરજી
 DocType: Crop,Scientific Name,વૈજ્ઞાનિક નામ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,કુલ પાંદડા
 DocType: Customer,"Reselect, if the chosen contact is edited after save","કાઢી નાંખો, પસંદ કરેલ સંપર્કો સેવ કર્યા પછી સંપાદિત થાય છે"
@@ -3228,13 +3251,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ચેક સંખ્યા
 ,Sales Browser,સેલ્સ બ્રાઉઝર
 DocType: Journal Entry,Total Credit,કુલ ક્રેડિટ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,સ્થાનિક
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),લોન અને એડવાન્સિસ (અસ્ક્યામત)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ડેટર્સ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,મોટા
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,મોટા
 DocType: Homepage Featured Product,Homepage Featured Product,મુખપૃષ્ઠ ફીચર્ડ ઉત્પાદન
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,બધા આકારણી જૂથો
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,બધા આકારણી જૂથો
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,નવી વેરહાઉસ નામ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),કુલ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,પ્રદેશ
@@ -3255,9 +3278,10 @@
 DocType: Fees,Fees,ફી
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,વિનિમય દર અન્ય એક ચલણ કન્વર્ટ કરવા માટે સ્પષ્ટ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,અવતરણ {0} રદ કરવામાં આવે છે
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,કુલ બાકી રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,કુલ બાકી રકમ
 DocType: Sales Partner,Targets,લક્ષ્યાંક
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,કૃપા કરીને કંપનીની માહિતી ફાઇલમાં SIREN નંબર રજીસ્ટર કરો
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,હ્યુમન રિસોર્સ&gt; એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
 DocType: Price List,Price List Master,ભાવ યાદી માસ્ટર
 DocType: GST Account,CESS Account,CESS એકાઉન્ટ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
@@ -3266,6 +3290,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,પેશન્ટ પસંદ કરો
 DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,પેરામીટર નામ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,માત્ર છોડો સ્થિતિ સાથે કાર્યક્રમો &#39;માન્ય&#39; અને &#39;નકારી કાઢ્યો સબમિટ કરી શકો છો
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},વિદ્યાર્થી જૂથ નામ પંક્તિ માં ફરજિયાત છે {0}
 DocType: Homepage,Products to be shown on website homepage,પ્રોડક્ટ્સ વેબસાઇટ હોમપેજ પર બતાવવામાં આવશે
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,આ રુટ ગ્રાહક જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -3298,14 +3323,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,ભરતિયું પહેલેથી જ બધા બિલિંગ કલાક માટે બનાવેલ છે
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},નામ ભૂલ: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,નાણા ખર્ચ છે
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
 DocType: Packing Slip,If more than one package of the same type (for print),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,કૃપા કરીને રેસ્ટોરેન્ટ સેટિંગ્સમાં ડિફોલ્ટ ગ્રાહક સેટ કરો
 ,Salary Register,પગાર રજિસ્ટર
 DocType: Warehouse,Parent Warehouse,પિતૃ વેરહાઉસ
-DocType: C-Form Invoice Detail,Net Total,નેટ કુલ
+DocType: Subscription,Net Total,નેટ કુલ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},ડિફૉલ્ટ BOM આઇટમ માટે મળી નથી {0} અને પ્રોજેક્ટ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,વિવિધ લોન પ્રકારના વ્યાખ્યાયિત કરે છે
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,વિવિધ લોન પ્રકારના વ્યાખ્યાયિત કરે છે
 DocType: Bin,FCFS Rate,FCFS દર
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,બાકી રકમ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),સમય (મિનિટ)
@@ -3337,11 +3362,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,રુટ ખાતું એક જૂથ હોવા જ જોઈએ
 DocType: Drug Prescription,Drug Prescription,ડ્રગ પ્રિસ્ક્રિપ્શન
 DocType: Fees,FEE.,ફી.
-DocType: Employee Loan,Repaid/Closed,પાછી / બંધ
+DocType: Loan,Repaid/Closed,પાછી / બંધ
 DocType: Item,Total Projected Qty,કુલ અંદાજ Qty
 DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","આઇટમ {0} માટે મૂલ્યાંકનનો દર, જે {1} {2} માટે એકાઉન્ટિંગ એન્ટ્રીઓ કરવા માટે જરૂરી છે જો આઇટમ {1} માં શૂન્ય વેલ્યુએશન રેટ આઇટમ તરીકે ટ્રાન્ઝેક્શન કરી રહી છે, તો કૃપા કરીને {1} આઇટમ ટેબલમાં ઉલ્લેખ કરો. નહિંતર, આઇટમ માટે ઇનકમિંગ સ્ટોક ટ્રાન્ઝેક્શન બનાવો અથવા આઇટમ રેકોર્ડમાં વેલ્યુએશન રેટનો ઉલ્લેખ કરો, અને પછી આ એન્ટ્રી સબમિટ / રદ કરવાનો પ્રયાસ કરો"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
 DocType: Course,Course Code,કોર્સ કોડ
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
 DocType: POS Settings,Use POS in Offline Mode,ઑફલાઇન મોડમાં POS નો ઉપયોગ કરો
@@ -3361,16 +3385,15 @@
 DocType: Purchase Invoice,Deemed Export,ડીમ્ડ એક્સપોર્ટ
 DocType: Stock Entry,Material Transfer for Manufacture,ઉત્પાદન માટે માલ પરિવહન
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
-DocType: Subscription,Half-yearly,અર્ધ-વાર્ષિક
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Lab Test,LabTest Approver,લેબસ્ટસ્ટ એપોવરવર
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,જો તમે પહેલાથી જ આકારણી માપદંડ માટે આકારણી છે {}.
 DocType: Vehicle Service,Engine Oil,એન્જિન તેલ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},વર્ક ઓર્ડર્સ બનાવ્યાં: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},વર્ક ઓર્ડર્સ બનાવ્યાં: {0}
 DocType: Sales Invoice,Sales Team1,સેલ્સ team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
-DocType: Employee Loan,Loan Details,લોન વિગતો
+DocType: Loan,Loan Details,લોન વિગતો
 DocType: Company,Default Inventory Account,ડિફૉલ્ટ ઈન્વેન્ટરી એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ફોલિયો નંબરો મેળ ખાતા નથી
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
@@ -3382,19 +3405,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ક્રોપ વધતી જતી તમામ જમીન એકમોની લિંક
 DocType: Account,Root Type,Root લખવું
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
 DocType: Item Group,Show this slideshow at the top of the page,પાનાંની ટોચ પર આ સ્લાઇડશો બતાવો
 DocType: BOM,Item UOM,વસ્તુ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ડિસ્કાઉન્ટ રકમ બાદ ટેક્સની રકમ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},લક્ષ્યાંક વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
 DocType: Cheque Print Template,Primary Settings,પ્રાથમિક સેટિંગ્સ
 DocType: Purchase Invoice,Select Supplier Address,પુરવઠોકર્તા સરનામું પસંદ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,કર્મચારીઓની ઉમેરો
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,કર્મચારીઓની ઉમેરો
 DocType: Purchase Invoice Item,Quality Inspection,ગુણવત્તા નિરીક્ષણ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,વિશેષ નાના
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,વિશેષ નાના
 DocType: Company,Standard Template,સ્ટાન્ડર્ડ ટેમ્પલેટ
 DocType: Training Event,Theory,થિયરી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
@@ -3414,11 +3437,10 @@
 DocType: SMS Log,No of Sent SMS,એસએમએસ કોઈ
 DocType: Antibiotic,Healthcare Administrator,હેલ્થકેર સંચાલક
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,લક્ષ્યાંક સેટ કરો
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
 DocType: Dosage Strength,Dosage Strength,ડોઝ સ્ટ્રેન્થ
 DocType: Account,Expense Account,ખર્ચ એકાઉન્ટ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,સોફ્ટવેર
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,કલર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,કલર
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,આકારણી યોજના માપદંડ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,પસંદ કરેલ આઇટમ માટે સમાપ્તિ તારીખ ફરજિયાત છે
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ખરીદી ઓર્ડર્સ અટકાવો
@@ -3431,18 +3453,18 @@
 DocType: Patient,Personal and Social History,વ્યક્તિગત અને સામાજિક ઇતિહાસ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,વપરાશકર્તા {0} બનાવી
 DocType: Fee Schedule,Fee Breakup for each student,દરેક વિદ્યાર્થી માટે ફી બ્રેકઅપ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,અસમાન મહિના સમગ્ર લક્ષ્યો વિતરિત કરવા માટે માસિક વિતરણ પસંદ કરો.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,કોડ બદલો
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ડીઝલ
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
 DocType: Purchase Invoice,Availed ITC Cess,ફાયર્ડ આઇટીસી સેસ
 ,Student Monthly Attendance Sheet,વિદ્યાર્થી માસિક હાજરી શીટ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,શીપીંગ નિયમ ફક્ત વેચાણ માટે લાગુ પડે છે
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,પ્રોજેક્ટ પ્રારંભ તારીખ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,સુધી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,સુધી
 DocType: Rename Tool,Rename Log,લોગ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,વિદ્યાર્થી ગ્રૂપ અથવા કોર્સ સૂચિ ફરજિયાત છે
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,બિલિંગ કલાક અને કામના કલાકો Timesheet પર જ જાળવી
@@ -3462,7 +3484,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,તમે ખરીદો અથવા વેચો છો તે તમારા ઉત્પાદનો અથવા સેવાઓની સૂચિ બનાવો.
 DocType: Water Analysis,Storage Temperature,સંગ્રહ તાપમાન
 DocType: Employee Attendance Tool,Unmarked Attendance,જેનું એટેન્ડન્સ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,સંશોધક
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,સંશોધક
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,કાર્યક્રમ પ્રવેશ સાધન વિદ્યાર્થી
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},પ્રારંભ તારીખ કાર્ય {0} માટે અંતિમ તારીખથી ઓછી હોવી જોઈએ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,નામ અથવા ઇમેઇલ ફરજિયાત છે
@@ -3474,7 +3496,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,પ્રીસેટ્સ ઇન્સ્ટોલ કરવામાં નિષ્ફળ
 DocType: Chapter,Non Profit Manager,નૉન-પ્રોફિટ મેનેજર
 DocType: BOM,Total Cost(Company Currency),કુલ ખર્ચ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} બનાવવામાં સીરીયલ કોઈ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} બનાવવામાં સીરીયલ કોઈ
 DocType: Homepage,Company Description for website homepage,વેબસાઇટ હોમપેજ માટે કંપની વર્ણન
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ગ્રાહકોની સુવિધા માટે, આ કોડ ઇન્વૉઇસેસ અને ડ લવર નોંધો જેવા પ્રિન્ટ બંધારણો ઉપયોગ કરી શકાય છે"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier નામ
@@ -3484,11 +3506,10 @@
 DocType: Employee,You can enter any date manually,તમે જાતે કોઈપણ તારીખ દાખલ કરી શકો છો
 DocType: Healthcare Settings,Result Printed,મુદ્રિત પરિણામ
 DocType: Asset Category Account,Depreciation Expense Account,અવમૂલ્યન ખર્ચ એકાઉન્ટ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,અજમાયશી સમય
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} જુઓ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,અજમાયશી સમય
 DocType: Customer Group,Only leaf nodes are allowed in transaction,માત્ર પર્ણ ગાંઠો વ્યવહાર માન્ય છે
 DocType: Project,Total Costing Amount (via Timesheets),કુલ ખર્ચની રકમ (ટાઇમ્સશીટ્સ દ્વારા)
-DocType: Employee Advance,Expense Approver,ખર્ચ તાજનો
+DocType: Department,Expense Approver,ખર્ચ તાજનો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
 DocType: Project,Hourly,અવરલી
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,બિન-ગ્રુપ ગ્રુપ
@@ -3497,7 +3518,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,તારીખ સમય માટે
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
 DocType: Accounts Settings,Make Payment via Journal Entry,જર્નલ પ્રવેશ મારફતે ચુકવણી બનાવો
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,મુદ્રિત પર
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,મુદ્રિત પર
 DocType: Item,Inspection Required before Delivery,નિરીક્ષણ ડ લવર પહેલાં જરૂરી
 DocType: Item,Inspection Required before Purchase,નિરીક્ષણ ખરીદી પહેલાં જરૂરી
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,બાકી પ્રવૃત્તિઓ
@@ -3507,7 +3528,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,ન્યુનત્તમ ઓર્ડર જથ્થો
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,તમારી સંસ્થા
 DocType: Fee Component,Fees Category,ફી વર્ગ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,એએમટી
 DocType: Supplier Scorecard,Notify Employee,કર્મચારીને સૂચિત કરો
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"તપાસ સ્ત્રોત અભિયાન છે, તો ઝુંબેશ નામ દાખલ કરો"
@@ -3517,7 +3538,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,પુનઃક્રમાંકિત કરો સ્તર
 DocType: Company,Chart Of Accounts Template,એકાઉન્ટ્સ ઢાંચો ચાર્ટ
 DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},વસ્તુ ભાવ {0} માં ભાવ યાદી માટે સુધારાશે {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},વસ્તુ ભાવ {0} માં ભાવ યાદી માટે સુધારાશે {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,આવક અને કપાત પર આધારિત પગાર ભાંગ્યા.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી રૂપાંતરિત કરી શકતા નથી
 DocType: Purchase Invoice Item,Accepted Warehouse,સ્વીકારાયું વેરહાઉસ
@@ -3525,10 +3546,11 @@
 DocType: Item,Valuation Method,મૂલ્યાંકન પદ્ધતિ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,માર્ક અડધા દિવસ
 DocType: Sales Invoice,Sales Team,સેલ્સ ટીમ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,નકલી નોંધણી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,નકલી નોંધણી
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,સબમિટ કરવા પહેલાં લાભાર્થીનું નામ દાખલ કરો.
 DocType: Program Enrollment Tool,Get Students,વિદ્યાર્થીઓ મેળવો
 DocType: Serial No,Under Warranty,વોરંટી હેઠળ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ભૂલ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ભૂલ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,તમે વેચાણ ઓર્ડર સેવ વાર શબ્દો દૃશ્યમાન થશે.
 ,Employee Birthday,કર્મચારીનું જન્મદિવસ
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,પૂર્ણ સમારકામ માટે સમાપ્તિ તારીખ પસંદ કરો
@@ -3547,7 +3569,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,પેટા કરાર માટે આરક્ષિત
 DocType: Payment Reconciliation Invoice,Invoice Number,બીલ નંબર
 DocType: Shopping Cart Settings,Orders,ઓર્ડર્સ
-DocType: Employee Leave Approver,Leave Approver,તાજનો છોડો
+DocType: Department,Leave Approver,તાજનો છોડો
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,કૃપા કરીને એક બેચ પસંદ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,જર્નલ
 DocType: Assessment Group,Assessment Group Name,આકારણી ગ્રુપ નામ
@@ -3591,7 +3613,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,હબ ટ્રેક કરેલ વસ્તુ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT માટે મૂળ
 DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,આ ઇમેઇલ સ્વતઃ નિર્માણ થયેલ છે
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
 DocType: Program Enrollment,Boarding Student,બોર્ડિંગ વિદ્યાર્થી
 DocType: Asset,Expected Value After Useful Life,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી
@@ -3616,21 +3637,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},હાજરીનો વિક્રમ {0} વિદ્યાર્થી સામે અસ્તિત્વમાં {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},સંદર્ભ # {0} ના રોજ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,અવમૂલ્યન અસ્કયામતો ના નિકાલ કારણે નાબૂદ
-DocType: Member,Member,સભ્ય
+DocType: Loan,Member,સભ્ય
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,સરનામાંઓ મેનેજ કરો
 DocType: Work Order Item,Work Order Item,વર્ક ઓર્ડર આઇટમ
 DocType: Pricing Rule,Item Code,વસ્તુ કોડ
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,કૃષિ વ્યવસ્થાપક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
 DocType: Supplier Scorecard Period,Variables,ચલો
 DocType: Employee Internal Work History,Employee Internal Work History,કર્મચારીનું આંતરિક કામ ઇતિહાસ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),બંધ (DR)
 DocType: Cheque Print Template,Cheque Size,ચેક માપ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,નથી સ્ટોક સીરીયલ કોઈ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,નથી સ્ટોક સીરીયલ કોઈ {0}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,વ્યવહારો વેચાણ માટે કરવેરા નમૂનો.
 DocType: Sales Invoice,Write Off Outstanding Amount,બાકી રકમ માંડવાળ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},"એકાઉન્ટ {0} કંપની સાથે મેળ ખાતો નથી, {1}"
@@ -3638,7 +3659,6 @@
 DocType: Stock Settings,Default Stock UOM,મૂળભૂત સ્ટોક UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations સંખ્યા નક્કી
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,કુલ જથ્થો
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},કર્મચારી લોન સામે: {0}
 DocType: Landed Cost Item,Receipt Document,રસીદ દસ્તાવેજ
 DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
 DocType: Payment Request,Reference Details,સંદર્ભ વિગતો
@@ -3649,7 +3669,7 @@
 DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,બંધ કરવા માટે રદ ન કરી શકાય છે. રદ કરવા Unclose.
 DocType: Student Guardian,Father,પિતા
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'અદ્યતન સ્ટોક' સ્થિર સંપત્તિ વેચાણ માટે ચેક કરી શકાતું નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'અદ્યતન સ્ટોક' સ્થિર સંપત્તિ વેચાણ માટે ચેક કરી શકાતું નથી
 DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
 DocType: Attendance,On Leave,રજા પર
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,સુધારાઓ મેળવો
@@ -3663,10 +3683,10 @@
 DocType: Lead,Lower Income,ઓછી આવક
 DocType: Restaurant Order Entry,Current Order,વર્તમાન ઓર્ડર
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},સોર્સ અને ટાર્ગેટ વેરહાઉસ પંક્તિ માટે જ ન હોઈ શકે {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,પ્રોગ્રામ્સ પર જાઓ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},રો {0} # ફાળવેલ રકમ {1} દાવો ન કરેલા રકમ કરતાં વધુ હોઈ શકતી નથી {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},રો {0} # ફાળવેલ રકમ {1} દાવો ન કરેલા રકમ કરતાં વધુ હોઈ શકતી નથી {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','તારીખ થી' પછી જ ’તારીખ સુધી’ હોવી જોઈએ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
@@ -3689,7 +3709,6 @@
 DocType: Payment Terms Template,Payment Terms,ચુકવણી શરતો
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,મિનિટ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,હ્યુમન રિસોર્સ&gt; એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,સપ્લાયર્સ પર જાઓ
@@ -3708,30 +3727,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},અવતરણ {0} નથી પ્રકાર {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,જાળવણી સુનિશ્ચિત વસ્તુ
 DocType: Sales Order,%  Delivered,% વિતરિત
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,વિદ્યાર્થી માટે ચુકવણી વિનંતી મોકલવા માટે કૃપા કરીને ઇમેઇલ આઈડી સેટ કરો
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,વિદ્યાર્થી માટે ચુકવણી વિનંતી મોકલવા માટે કૃપા કરીને ઇમેઇલ આઈડી સેટ કરો
 DocType: Patient,Medical History,તબીબી ઇતિહાસ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,બેન્ક ઓવરડ્રાફટ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,બેન્ક ઓવરડ્રાફટ એકાઉન્ટ
 DocType: Patient,Patient ID,પેશન્ટ ID
 DocType: Physician Schedule,Schedule Name,સૂચિ નામ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,પગાર કાપલી બનાવો
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,બધા સપ્લાયર્સ ઉમેરો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,બધા સપ્લાયર્સ ઉમેરો
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,રો # {0}: ફાળવેલ રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,બ્રાઉઝ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,સુરક્ષીત લોન્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,સુરક્ષીત લોન્સ
 DocType: Purchase Invoice,Edit Posting Date and Time,પોસ્ટ તારીખ અને સમયને સંપાદિત
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},એસેટ વર્ગ {0} અથવા કંપની અવમૂલ્યન સંબંધિત એકાઉન્ટ્સ સુયોજિત કરો {1}
 DocType: Lab Test Groups,Normal Range,સામાન્ય રેંજ
 DocType: Academic Term,Academic Year,શૈક્ષણીક વર્ષ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,ઉપલબ્ધ વેચાણ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,એન
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,બાકી
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
+DocType: Loan,Loan Account,લોન એકાઉન્ટ
 DocType: Purchase Invoice,GST Details,જીએસટી વિગતો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},સપ્લાયર મોકલવામાં ઇમેઇલ {0}
 DocType: Item,Default Sales Unit of Measure,મેઝરનું ડિફોલ્ટ સેલ્સ યુનિટ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,શૈક્ષણીક વર્ષ:
+DocType: Subscription,Past Due Date,પાછલા બાકીની તારીખ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},આઇટમ {0} માટે વૈકલ્પિક આઇટમ સેટ કરવાની મંજૂરી આપશો નહીં
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
@@ -3744,7 +3765,7 @@
 DocType: Patient Appointment,Patient Appointment,પેશન્ટ નિમણૂંક
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ભૂમિકા એપ્રૂવિંગ નિયમ લાગુ પડે છે ભૂમિકા તરીકે જ ન હોઈ શકે
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,આ ઇમેઇલ ડાયજેસ્ટ માંથી અનસબ્સ્ક્રાઇબ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,દ્વારા સપ્લાયરો મેળવો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,દ્વારા સપ્લાયરો મેળવો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} આઇટમ {1} માટે મળ્યું નથી
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,અભ્યાસક્રમો પર જાઓ
 DocType: Accounts Settings,Show Inclusive Tax In Print,પ્રિન્ટમાં વ્યાપક ટેક્સ દર્શાવો
@@ -3752,10 +3773,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,સંદેશ મોકલ્યો
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી તરીકે સેટ કરી શકાય છે
 DocType: C-Form,II,બીજા
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,શિક્ષણ&gt; શૈક્ષણિક સેટિંગ્સમાં પ્રશિક્ષક નેમિંગ સિસ્ટમ સેટ કરો
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,દર ભાવ યાદી ચલણ ગ્રાહક આધાર ચલણ ફેરવાય છે
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ચોખ્ખી રકમ (કંપની ચલણ)
 DocType: Physician,Physician Schedules,ફિઝિશિયન ઓર્ડર
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,કુલ એડવાન્સ રકમ કુલ મંજૂર કરેલી રકમ કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,કુલ એડવાન્સ રકમ કુલ મંજૂર કરેલી રકમ કરતા વધારે ન હોઈ શકે
 DocType: Salary Slip,Hour Rate,કલાક દર
 DocType: Stock Settings,Item Naming By,આઇટમ દ્વારા નામકરણ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},અન્ય પીરિયડ બંધ એન્ટ્રી {0} પછી કરવામાં આવી છે {1}
@@ -3773,6 +3795,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
 DocType: BOM,Inspection Required,નિરીક્ષણ જરૂરી
 DocType: Purchase Invoice Item,PR Detail,PR વિગતવાર
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,સબમિટ કર્યા પહેલાં બેંક ગેરંટી નંબર દાખલ કરો.
 DocType: Driving License Category,Class,વર્ગ
 DocType: Sales Order,Fully Billed,સંપૂર્ણપણે ગણાવી
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,આઇટમ ટેમ્પર સામે વર્ક ઓર્ડર ઉઠાવવામાં નહીં આવે
@@ -3783,7 +3806,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),પેકેજ ગ્રોસ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (પ્રિન્ટ માટે)
 DocType: Assessment Plan,Program,કાર્યક્રમ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,આ ભૂમિકા સાથેના વપરાશકર્તાઓ સ્થિર એકાઉન્ટ્સ સામે હિસાબી પ્રવેશો સ્થિર એકાઉન્ટ્સ સેટ અને બનાવવા / સુધારવા માટે માન્ય છે
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,શિક્ષણ&gt; શૈક્ષણિક સેટિંગ્સમાં પ્રશિક્ષક નેમિંગ સિસ્ટમ સેટ કરો
 DocType: Serial No,Is Cancelled,રદ છે
 DocType: Student Group,Group Based On,જૂથ પર આધારિત
 DocType: Journal Entry,Bill Date,બિલ તારીખ
@@ -3794,9 +3816,10 @@
 DocType: Cheque Print Template,Cheque Height,ચેક ઊંચાઈ
 DocType: Supplier,Supplier Details,પુરવઠોકર્તા વિગતો
 DocType: Setup Progress,Setup Progress,સેટઅપ પ્રગતિ
+DocType: Expense Claim,Approval Status,મંજૂરી સ્થિતિ
 DocType: Hub Settings,Publish Items to Hub,હબ વસ્તુઓ પ્રકાશિત
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},કિંમત પંક્તિ માં કિંમત કરતાં ઓછી હોવી જોઈએ થી {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,વાયર ટ્રાન્સફર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,વાયર ટ્રાન્સફર
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,બધા તપાસો
 ,Issued Items Against Work Order,વર્ક ઓર્ડર સામે ઇશ્યૂ કરેલા આઈટમ્સ
 DocType: Vehicle Log,Invoice Ref,ભરતિયું સંદર્ભ
@@ -3827,12 +3850,11 @@
 DocType: Customs Tariff Number,Tariff Number,જકાત સંખ્યા
 DocType: Work Order Item,Available Qty at WIP Warehouse,ડબલ્યુઆઇપી વેરહાઉસ પર ઉપલબ્ધ Qty
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,અંદાજિત
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},સીરીયલ કોઈ {0} વેરહાઉસ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},સીરીયલ કોઈ {0} વેરહાઉસ ને અનુલક્ષતું નથી {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"નોંધ: {0} જથ્થો કે રકમ 0 છે, કારણ કે ડિલિવરી ઉપર અને ઉપર બુકિંગ વસ્તુ માટે સિસ્ટમ તપાસ કરશે નહીં"
 DocType: Notification Control,Quotation Message,અવતરણ સંદેશ
-DocType: Employee Loan,Employee Loan Application,કર્મચારીનું લોન અરજી
 DocType: Issue,Opening Date,શરૂઆતના તારીખ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,પહેલા દર્દીને બચાવો
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,પહેલા દર્દીને બચાવો
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,એટેન્ડન્સ સફળતાપૂર્વક ચિહ્નિત કરવામાં આવી છે.
 DocType: Program Enrollment,Public Transport,જાહેર પરિવહન
 DocType: Soil Texture,Silt Composition (%),સિલ્ટ રચના (%)
@@ -3850,7 +3872,7 @@
 ,Item Balance (Simple),વસ્તુ બેલેન્સ (સરળ)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,સપ્લાયર્સ દ્વારા ઉઠાવવામાં બીલો.
 DocType: POS Profile,Write Off Account,એકાઉન્ટ માંડવાળ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ડેબિટ નોટ એએમટી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ડેબિટ નોટ એએમટી
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ડિસ્કાઉન્ટ રકમ
 DocType: Purchase Invoice,Return Against Purchase Invoice,સામે ખરીદી ભરતિયું પાછા ફરો
 DocType: Item,Warranty Period (in days),(દિવસોમાં) વોરંટી સમયગાળા
@@ -3873,6 +3895,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
 DocType: Sales Invoice Item,Delivered Qty,વિતરિત Qty
 DocType: Assessment Plan,Assessment Plan,આકારણી યોજના
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,રિવર્સ જર્નલ એન્ટ્રી
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ગ્રાહક {0} બનાવવામાં આવેલ છે
 DocType: Stock Settings,Limit Percent,મર્યાદા ટકા
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,હાલમાં કોઈ વેરહાઉસમાં કોઈ સ્ટોક ઉપલબ્ધ નથી
@@ -3886,14 +3909,15 @@
 DocType: Journal Entry,Stock Entry,સ્ટોક એન્ટ્રી
 DocType: Payment Entry,Payment References,ચુકવણી સંદર્ભો
 DocType: C-Form,C-FORM-,સી ફોર્મ-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","અંતરાલ ક્ષેત્ર માટે અંતરાલોની સંખ્યા, દા.ત. જો અંતરાલ &#39;દિવસો&#39; અને બિલિંગ અંતરાલની સંખ્યા 3 છે, તો દર 3 દિવસમાં ઇન્વૉઇસેસ જનરેટ કરવામાં આવશે."
 DocType: Vehicle,Insurance Details,વીમા વિગતો
 DocType: Account,Payable,ચૂકવવાપાત્ર
 DocType: Share Balance,Share Type,શેર પ્રકાર
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ડેટર્સ ({0})
 DocType: Pricing Rule,Margin,માર્જિન
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,નવા ગ્રાહકો
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,કુલ નફો %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,કુલ નફો %
 DocType: Appraisal Goal,Weightage (%),ભારાંકન (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS પ્રોફાઇલ બદલો
 DocType: Bank Reconciliation Detail,Clearance Date,ક્લિયરન્સ તારીખ
@@ -3903,10 +3927,11 @@
 DocType: Lead,Address Desc,DESC સરનામું
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,પાર્ટી ફરજિયાત છે
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},અન્ય પંક્તિઓમાં ડુપ્લિકેટ ડિપોઝિટવાળી પંક્તિઓ મળ્યા: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},અન્ય પંક્તિઓમાં ડુપ્લિકેટ ડિપોઝિટવાળી પંક્તિઓ મળ્યા: {list}
 DocType: Topic,Topic Name,વિષય નામ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,એચઆર સેટિંગ્સમાં મંજૂરી મંજૂરીને છોડો માટે ડિફૉલ્ટ નમૂનો સેટ કરો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,વેચાણ અથવા ખરીદી ઓછામાં ઓછા એક પસંદ કરેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,કર્મચારીને આગળ વધારવા માટે એક કર્મચારીને પસંદ કરો
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,કર્મચારીને આગળ વધારવા માટે એક કર્મચારીને પસંદ કરો
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,કૃપા કરી કોઈ માન્ય તારીખ પસંદ કરો
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,તમારા વેપાર સ્વભાવ પસંદ કરો.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3925,7 +3950,7 @@
 DocType: Asset Movement,Source Warehouse,સોર્સ વેરહાઉસ
 DocType: Installation Note,Installation Date,સ્થાપન તારીખ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,લેજર શેર કરો
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,સેલ્સ ઇન્વોઇસ {0} બનાવી
 DocType: Employee,Confirmation Date,સમર્થન તારીખ
 DocType: C-Form,Total Invoiced Amount,કુલ ભરતિયું રકમ
@@ -3934,7 +3959,7 @@
 DocType: Account,Accumulated Depreciation,સંચિત અવમૂલ્યન
 DocType: Supplier Scorecard Scoring Standing,Standing Name,સ્ટેન્ડીંગ નામ
 DocType: Stock Entry,Customer or Supplier Details,ગ્રાહક અથવા સપ્લાયર વિગતો
-DocType: Employee Loan Application,Required by Date,તારીખ દ્વારા જરૂરી
+DocType: Loan Application,Required by Date,તારીખ દ્વારા જરૂરી
 DocType: Lead,Lead Owner,અગ્ર માલિક
 DocType: Production Plan,Sales Orders Detail,સેલ્સ ઓર્ડર્સ વિગતવાર
 DocType: Bin,Requested Quantity,વિનંતી જથ્થો
@@ -3947,10 +3972,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,કુલ પે - કુલ કપાત - લોન પરત ચૂકવણી
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,વર્તમાન BOM અને નવા BOM જ ન હોઈ શકે
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,પગાર કાપલી ID ને
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,મલ્ટીપલ વેરિયન્ટ્સ
 DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% વિતરિત
+DocType: Subscription,Trial Period Start Date,ટ્રાયલ પીરિયડ પ્રારંભ તારીખ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,કૃપા કરીને અન્ય વપરાશકર્તા તરીકે લૉગિન કરો.
@@ -3971,12 +3997,11 @@
 DocType: Student Guardian,Student Guardian,વિદ્યાર્થી ગાર્ડિયન
 DocType: Member,Member Name,સભ્યનું નામ
 DocType: Stock Settings,Use Naming Series,નેમિંગ સિરીઝનો ઉપયોગ કરો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
 DocType: POS Profile,Update Stock,સુધારા સ્ટોક
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,સબ્સ્ક્રિપ્શનમાં
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,વસ્તુઓ માટે વિવિધ UOM ખોટી (કુલ) નેટ વજન કિંમત તરફ દોરી જશે. દરેક વસ્તુ ચોખ્ખી વજન જ UOM છે કે તેની ખાતરી કરો.
 DocType: Membership,Payment Details,ચુકવણી વિગતો
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM દર
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM દર
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ કાર્ય ઓર્ડર રદ કરી શકાતો નથી, તેને રદ કરવા માટે પ્રથમ રદ કરો"
 DocType: Asset,Journal Entry for Scrap,સ્ક્રેપ માટે જર્નલ પ્રવેશ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ડ લવર નોંધ વસ્તુઓ ખેંચી કરો
@@ -3996,6 +4021,7 @@
 DocType: Land Unit,Land Unit,જમીન એકમ
 ,Purchase Analytics,ખરીદી ઍનલિટિક્સ
 DocType: Sales Invoice Item,Delivery Note Item,ડ લવર નોંધ વસ્તુ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,વર્તમાન ઇન્વૉઇસ {0} ખૂટે છે
 DocType: Asset Maintenance Log,Task,ટાસ્ક
 DocType: Purchase Taxes and Charges,Reference Row #,સંદર્ભ ROW #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},બેચ નંબર વસ્તુ માટે ફરજિયાત છે {0}
@@ -4007,7 +4033,7 @@
 DocType: Company,Exchange Gain / Loss Account,એક્સચેન્જ મેળવી / નુકશાન એકાઉન્ટ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,કર્મચારીનું અને હાજરી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},હેતુ એક જ હોવી જોઈએ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,આ ફોર્મ ભરો અને તેને સંગ્રહો
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,આ ફોર્મ ભરો અને તેને સંગ્રહો
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,સમુદાય ફોરમ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,સ્ટોક વાસ્તવિક Qty
 DocType: Homepage,"URL for ""All Products""",માટે &quot;બધા ઉત્પાદનો&quot; URL ને
@@ -4021,7 +4047,7 @@
 DocType: Lab Test Template,Standard Selling Rate,સ્ટાન્ડર્ડ વેચાણ દર
 DocType: Account,Rate at which this tax is applied,"આ કર લાગુ પડે છે, જે અંતે દર"
 DocType: Cash Flow Mapper,Section Name,વિભાગનું નામ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
 DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,માંડવાળ
@@ -4032,9 +4058,9 @@
 DocType: Task,depends_on,પર આધાર રાખે છે
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,સામગ્રીના તમામ બિલમાં નવીનતમ ભાવને અપડેટ કરવા માટે કતારબદ્ધ. તેમાં થોડો સમય લાગી શકે છે.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા એકાઉન્ટ ના નામ. નોંધ: ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,દેશ મુજબની મૂળભૂત સરનામું નમૂનાઓ
 DocType: Water Analysis,Appearance,દેખાવ
+DocType: HR Settings,Leave Status Notification Template,સ્થિતિ સૂચન ઢાંચો છોડો
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,સરેરાશ કિંમત સૂચિ દર ખરીદી
 DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,સભ્ય માહિતી
@@ -4057,7 +4083,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,પરવાનગી નથી. કૃપા કરીને પરીક્ષણ નમૂનાને અક્ષમ કરો
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ટકાવારી ફાળવણી 100% સમાન હોવું જોઈએ
 DocType: Crop Cycle,Linked Land Unit,લિંક કરેલ જમીન એકમ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
@@ -4073,7 +4099,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,વપરાશકર્તાઓ પર જાઓ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} વસ્તુ માટે માન્ય બેચ નંબર નથી {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,અમાન્ય GSTIN અથવા બિનનોંધાયેલ માટે NA દાખલ
 DocType: Training Event,Seminar,સેમિનાર
 DocType: Program Enrollment Fee,Program Enrollment Fee,કાર્યક્રમ પ્રવેશ ફી
@@ -4089,14 +4115,14 @@
 DocType: Hub Settings,Publish Availability,ઉપલબ્ધતા પ્રકાશિત
 DocType: Company,Create Chart Of Accounts Based On,ખાતાઓ પર આધારિત ચાર્ટ બનાવો
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,તેને બિન-જૂથમાં રૂપાંતરિત કરી શકાતું નથી. બાળ કાર્યો અસ્તિત્વ ધરાવે છે
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
 ,Stock Ageing,સ્ટોક એઇજીંગનો
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},વિદ્યાર્થી {0} વિદ્યાર્થી અરજદાર સામે અસ્તિત્વમાં {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),રાઉન્ડિંગ એડજસ્ટમેન્ટ (કંપની કરન્સી)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,સમય પત્રક
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,બેચ:
 DocType: Volunteer,Afternoon,બપોર પછી
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
 DocType: Cheque Print Template,Scanned Cheque,સ્કેન ચેક
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,સબમિટ વ્યવહારો પર સંપર્કો આપોઆપ ઇમેઇલ્સ મોકલો.
@@ -4112,7 +4138,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,પ્રોજેક્ટ {0} પહેલાંથી અસ્તિત્વમાં છે
 DocType: Medical Department,Nursing User,નર્સિંગ વપરાશકર્તા
 DocType: Plant Analysis,Plant Analysis Criterias,પ્લાન્ટ એનાલિસિસ માપદંડો
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,જવાબદારીઓ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},સીરિયલ કોઈ {0} બેચની નથી {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,જવાબદારીઓ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,આ અવતરણની માન્યતા અવધિ સમાપ્ત થઈ ગઈ છે.
 DocType: Expense Claim Account,Expense Claim Account,ખર્ચ દાવો એકાઉન્ટ
 DocType: Accounts Settings,Allow Stale Exchange Rates,સ્ટેલ એક્સચેન્જ દરોને મંજૂરી આપો
@@ -4134,11 +4161,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ચલો બનાવો
 DocType: Item,Default BOM,મૂળભૂત BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),કુલ બિલની રકમ (સેલ્સ ઇન્વૉઇસેસ દ્વારા)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ડેબિટ નોટ રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ડેબિટ નોટ રકમ
 DocType: Project Update,Not Updated,અપડેટ નથી
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","દર, શેરોની સંખ્યા અને ગણતરીની રકમ વચ્ચેની અસાતત્યતા છે"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,કુલ બાકી એએમટી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,કુલ બાકી એએમટી
 DocType: Journal Entry,Printing Settings,પ્રિન્ટિંગ સેટિંગ્સ
 DocType: Employee Advance,Advance Account,એડવાન્સ એકાઉન્ટ
 DocType: Job Offer,Job Offer Terms,જોબ ઓફર શરતો
@@ -4147,7 +4174,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ઓટોમોટિવ
 DocType: Vehicle,Insurance Company,વીમા કંપની
 DocType: Asset Category Account,Fixed Asset Account,સ્થિર એસેટ એકાઉન્ટ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,વેરિયેબલ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,વેરિયેબલ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ડ લવર નોંધ
 DocType: Chapter,Members,સભ્યો
 DocType: Student,Student Email Address,વિદ્યાર્થી ઇમેઇલ સરનામું
@@ -4170,7 +4197,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,ઇન્ટર્ન
 DocType: Delivery Stop,Address Name,એડ્રેસ નામ
 DocType: Stock Entry,From BOM,BOM થી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} ના ભાગલા {0} એકમો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} ના ભાગલા {0} એકમો
 DocType: Assessment Code,Assessment Code,આકારણી કોડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,મૂળભૂત
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} સ્થિર થાય તે પહેલા સ્ટોક વ્યવહારો
@@ -4178,25 +4205,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
 DocType: Bank Reconciliation Detail,Payment Document,ચુકવણી દસ્તાવેજ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,માપદંડ સૂત્રનું મૂલ્યાંકન કરવામાં ભૂલ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,જોડાયા જન્મ તારીખ તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,જોડાયા જન્મ તારીખ તારીખ કરતાં મોટી હોવી જ જોઈએ
+DocType: Subscription,Plans,યોજનાઓ
 DocType: Salary Slip,Salary Structure,પગાર માળખું
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,એરલાઇન
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ઇશ્યૂ સામગ્રી
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,રિકરિંગ બનાવતી વખતે એક ભૂલ આવી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ઇશ્યૂ સામગ્રી
 DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
 DocType: Employee,Offer Date,ઓફર તારીખ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,સુવાકયો
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,કોઈ વિદ્યાર્થી જૂથો બનાવી છે.
 DocType: Purchase Invoice Item,Serial No,સીરીયલ કોઈ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,માસિક ચુકવણી રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,માસિક ચુકવણી રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,પંક્તિ # {0}: અપેક્ષિત ડિલિવરી તારીખ ખરીદી ઑર્ડર તારીખ પહેલાં ન હોઈ શકે
 DocType: Purchase Invoice,Print Language,પ્રિંટ ભાષા
 DocType: Salary Slip,Total Working Hours,કુલ કામ કલાક
 DocType: Sales Invoice,Customer PO Details,ગ્રાહક પી.ઓ.
-DocType: Subscription,Next Schedule Date,આગામી સૂચિ તારીખ
 DocType: Stock Entry,Including items for sub assemblies,પેટા વિધાનસભાઓ માટે વસ્તુઓ સહિત
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,કામચલાઉ ખુલવાનો એકાઉન્ટ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
@@ -4224,11 +4250,11 @@
 DocType: Issue,Opening Time,ઉદઘાટન સમય
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,પ્રતિ અને જરૂરી તારીખો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,સિક્યોરિટીઝ એન્ડ કોમોડિટી એક્સચેન્જો
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ઉલ્લેખિત માપદંડ માટે કોઈ કર્મચારી નથી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
 DocType: Hotel Settings,Default Customer,ડિફૉલ્ટ ગ્રાહક
 DocType: Assessment Plan,Supervisor Name,સુપરવાઇઝર નામ
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ખાતરી કરો કે એ જ દિવસે નિમણૂક બનાવવામાં આવી નથી
@@ -4252,16 +4278,16 @@
 DocType: Journal Entry Account,Employee Advance,કર્મચારી એડવાન્સ
 DocType: Payroll Entry,Payroll Frequency,પગારપત્રક આવર્તન
 DocType: Lab Test Template,Sensitivity,સંવેદનશીલતા
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,કાચો માલ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,કાચો માલ
 DocType: Leave Application,Follow via Email,ઈમેઈલ મારફતે અનુસરો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,છોડ અને મશીનરી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,છોડ અને મશીનરી
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ડિસ્કાઉન્ટ રકમ બાદ કર જથ્થો
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,દૈનિક કામ સારાંશ સેટિંગ્સ
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,તારીખ દ્વારા Reqd દાખલ કરો
 DocType: Payment Entry,Internal Transfer,આંતરિક ટ્રાન્સફર
 DocType: Asset Maintenance,Maintenance Tasks,જાળવણી કાર્યો
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
 DocType: Leave Control Panel,Carry Forward,આગળ લઈ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને ખાતાવહી રૂપાંતરિત કરી શકતા નથી
@@ -4269,13 +4295,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext એકીકરણ
 DocType: Crop Cycle,Detected Disease,શોધાયેલ રોગ
 ,Produced,ઉત્પાદન
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ડિપોઝમેન્ટ તારીખ પહેલાં ચુકવણી પ્રારંભ તારીખ ન હોઈ શકે.
 DocType: Item,Item Code for Suppliers,સપ્લાયરો માટે વસ્તુ કોડ
 DocType: Issue,Raised By (Email),દ્વારા ઊભા (ઇમેઇલ)
 DocType: Training Event,Trainer Name,ટ્રેનર નામ
 DocType: Mode of Payment,General,જનરલ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,છેલ્લે કોમ્યુનિકેશન
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},શ્રેણીબદ્ધ વસ્તુ માટે સીરીયલ અમે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},શ્રેણીબદ્ધ વસ્તુ માટે સીરીયલ અમે જરૂરી {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
 DocType: Journal Entry,Bank Entry,બેન્ક એન્ટ્રી
 DocType: Authorization Rule,Applicable To (Designation),લાગુ કરો (હોદ્દો)
@@ -4289,7 +4316,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ અક્ષમ કરો કરન્સી સક્રિય કરો.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},ડૉ {0} અર્ધદિવસની રજા પર {1}
 DocType: Production Plan,Get Material Request,સામગ્રી વિનંતી વિચાર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ટપાલ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ટપાલ ખર્ચ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),કુલ (એએમટી)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,મનોરંજન &amp; ફુરસદની પ્રવૃત્તિઓ
 ,Item Variant Details,આઇટમ વેરિએન્ટ વિગતો
@@ -4300,9 +4327,9 @@
 DocType: Drug Prescription,Hour,કલાક
 DocType: Restaurant Order Entry,Last Sales Invoice,છેલ્લું વેચાણ ભરતિયું
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},આઇટમ {0} સામે જથ્થો પસંદ કરો
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ન્યૂ સીરીયલ કોઈ વેરહાઉસ કરી શકે છે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સુયોજિત થયેલ હોવું જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ન્યૂ સીરીયલ કોઈ વેરહાઉસ કરી શકે છે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સુયોજિત થયેલ હોવું જ જોઈએ
 DocType: Lead,Lead Type,લીડ પ્રકાર
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,આ તમામ વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
 DocType: Company,Monthly Sales Target,માસિક વેચાણ લક્ષ્યાંક
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},દ્વારા મંજૂર કરી શકાય {0}
@@ -4310,7 +4337,7 @@
 DocType: Item,Default Material Request Type,મૂળભૂત સામગ્રી વિનંતી પ્રકાર
 DocType: Supplier Scorecard,Evaluation Period,મૂલ્યાંકન અવધિ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,અજ્ઞાત
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,કાર્ય ઓર્ડર બનાવ્યું નથી
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,કાર્ય ઓર્ડર બનાવ્યું નથી
 DocType: Shipping Rule,Shipping Rule Conditions,શીપીંગ નિયમ શરતો
 DocType: Purchase Invoice,Export Type,નિકાસ પ્રકાર
 DocType: Salary Slip Loan,Salary Slip Loan,પગાર કાપલી લોન
@@ -4326,7 +4353,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ઇનવોઇસિસ સારાંશ ખુલે છે
 DocType: Education Settings,Education Manager,શિક્ષણ વ્યવસ્થાપક
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,શ્રેષ્ઠ વૃદ્ધિ માટે ક્ષેત્રના દરેક પ્લાન્ટ વચ્ચેની લઘુતમ લંબાઈ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","બેચ આઇટમ {0} સ્ટોક રિકંસીલેશન મદદથી અપડેટ કરી શકાતી નથી, તેના બદલે સ્ટોક એન્ટ્રી ઉપયોગ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","બેચ આઇટમ {0} સ્ટોક રિકંસીલેશન મદદથી અપડેટ કરી શકાતી નથી, તેના બદલે સ્ટોક એન્ટ્રી ઉપયોગ"
 DocType: Quality Inspection,Report Date,રિપોર્ટ તારીખ
 DocType: Student,Middle Name,પિતાનું નામ
 DocType: C-Form,Invoices,ઇનવૉઇસેસ
@@ -4357,20 +4384,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,રસીદ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,રસીદ
 ,Sales Register,સેલ્સ રજિસ્ટર
 DocType: Daily Work Summary Group,Send Emails At,ઇમેઇલ્સ મોકલો ખાતે
 DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ફેરફાર કરવા માટે કંઈ નથી.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ફોર્મ જુઓ
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ખર્ચ દાવા માં ખર્ચાળ ફરજિયાત ખર્ચ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","તમારા સંગઠન માટે, તમારી જાતે કરતાં અન્ય વપરાશકર્તાઓને ઉમેરો"
 DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,હજુ સુધી કોઈ ગ્રાહકો!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,કોઈ સામગ્રી વિનંતી બનાવવામાં નથી
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,લાઈસન્સ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"તમે પણ અગાઉના નાણાકીય વર્ષમાં બેલેન્સ ચાલુ નાણાકીય વર્ષના નહીં સામેલ કરવા માંગો છો, તો આગળ લઈ પસંદ કરો"
@@ -4393,11 +4421,12 @@
 DocType: Vehicle,Chassis No,ચેસીસ કોઈ
 DocType: Payment Request,Initiated,શરૂ
 DocType: Production Plan Item,Planned Start Date,આયોજિત પ્રારંભ તારીખ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,કૃપા કરીને એક BOM પસંદ કરો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,કૃપા કરીને એક BOM પસંદ કરો
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ફાયર્ડ આઇટીસી ઇન્ટીગ્રેટેડ ટેક્સ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
+DocType: Bank Guarantee,Clauses and Conditions,કલમો અને શરતો
 DocType: Serial No,Creation Document Type,બનાવટ દસ્તાવેજ પ્રકારની
 DocType: Project Task,View Timesheet,ટાઇમ્સશીટ જુઓ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,અંતિમ તારીખ પ્રારંભ તારીખથી વધુ હોવી જોઈએ
 DocType: Leave Type,Is Encash,વેચીને રોકડાં નાણાં કરવાં છે
 DocType: Leave Allocation,New Leaves Allocated,નવા પાંદડા સોંપાયેલ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
@@ -4411,9 +4440,10 @@
 DocType: Patient,Alcohol Current Use,દારૂ વર્તમાન ઉપયોગ
 DocType: Student Admission Program,Student Admission Program,વિદ્યાર્થી પ્રવેશ કાર્યક્રમ
 DocType: Payment Entry,Account Paid To,એકાઉન્ટ ચૂકવેલ
+DocType: Subscription Settings,Grace Period,ગ્રેસ સમયગાળો
 DocType: Item Alternative,Alternative Item Name,વૈકલ્પિક વસ્તુનું નામ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,પિતૃ વસ્તુ {0} સ્ટોક વસ્તુ ન હોવું જોઈએ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",કોઈપણ પગાર સ્લિપ સબમિટ કરી શકાઈ નથી <br> શક્ય કારણો: <br> 1. નેટ પગાર 0 કરતા ઓછો છે. <br> \ 2. કર્મચારી માસ્ટરમાં નિર્દિષ્ટ કંપની ઇમેઇલ સરનામું માન્ય નથી. <br>
@@ -4423,7 +4453,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} એકાઉન્ટ માટે બજેટ {1} સામે {2} {3} છે {4}. તે દ્વારા કરતાં વધી જશે {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty આઉટ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,અને અનચેક
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,સિરીઝ ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
 DocType: Student Sibling,Student ID,વિદ્યાર્થી ID
@@ -4435,14 +4464,16 @@
 DocType: Complaint,Complaint,ફરિયાદ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ચુકવણી એન્ટ્રી કરો
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,બધા વિભાગો
 DocType: Patient,Alcohol Past Use,મદ્યાર્ક ભૂતકાળનો ઉપયોગ
 DocType: Fertilizer Content,Fertilizer Content,ખાતર સામગ્રી
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,લાખોમાં
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,લાખોમાં
 DocType: Project Update,Problematic/Stuck,સમસ્યાવાળા / અટકી
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
 DocType: Share Transfer,Transfer,ટ્રાન્સફર
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,આ સેલ્સ ઑર્ડર રદ કરવા પહેલાં વર્ક ઓર્ડર {0} રદ કરવો જોઈએ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
@@ -4466,10 +4497,11 @@
 DocType: Cheque Print Template,Message to show,સંદેશ બતાવવા માટે
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,છૂટક
 DocType: Student Attendance,Absent,ગેરહાજર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,ઉત્પાદન બંડલ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,ઉત્પાદન બંડલ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} થી શરૂ થતાં સ્કોર શોધવા માટે અસમર્થ. તમારે 0 થી 100 સુધીના સ્કોર્સ ધરાવતી સ્કોર્સ હોવી જરૂરી છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,કર અને ખર્ચ ઢાંચો ખરીદી
+DocType: Subscription,Current Invoice Start Date,વર્તમાન ઇન્વોઇસ પ્રારંભ તારીખ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ક્યાં ડેબિટ કે ક્રેડિટ રકમ માટે જરૂરી છે {2}
 DocType: GL Entry,Remarks,રીમાર્કસ
@@ -4479,11 +4511,13 @@
 DocType: Task,Parent Task,માતાપિતા કાર્ય
 DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,લીડ બનાવો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
 DocType: Stock Settings,Show Barcode Field,બતાવો બારકોડ ક્ષેત્ર
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","પગાર પહેલેથી જ વચ્ચે {0} અને {1}, એપ્લિકેશન સમયગાળા છોડો આ તારીખ શ્રેણી વચ્ચે ન હોઈ શકે સમયગાળા માટે પ્રક્રિયા."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","પગાર પહેલેથી જ વચ્ચે {0} અને {1}, એપ્લિકેશન સમયગાળા છોડો આ તારીખ શ્રેણી વચ્ચે ન હોઈ શકે સમયગાળા માટે પ્રક્રિયા."
+DocType: Fiscal Year,Auto Created,ઓટો બનાવ્યું
 DocType: Chapter Member,Leave Reason,કારણ છોડો
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ઇન્વોઇસ {0} હવે અસ્તિત્વમાં નથી
 DocType: Guardian Interest,Guardian Interest,ગાર્ડિયન વ્યાજ
 DocType: Volunteer,Availability,ઉપલબ્ધતા
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ઇનવૉઇસેસ માટે ડિફોલ્ટ મૂલ્યો સેટ કરો
@@ -4491,14 +4525,13 @@
 DocType: Project,Time to send,મોકલવાનો સમય
 DocType: Timesheet,Employee Detail,કર્મચારીનું વિગતવાર
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ઇમેઇલ આઈડી
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,આગામી તારીખ ડે અને મહિનાનો દિવસ પર પુનરાવર્તન સમાન હોવા જ જોઈએ
 DocType: Lab Prescription,Test Code,ટેસ્ટ કોડ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,વેબસાઇટ હોમપેજ માટે સેટિંગ્સ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} માટે RFQs ને મંજૂરી નથી
 DocType: Job Offer,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ઉપર
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},કુલ રકમ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},કુલ રકમ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ઉલ્લેખ જો નોન-સ્ટાન્ડર્ડ ચૂકવવાપાત્ર એકાઉન્ટ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',કૃપા કરીને આકારણી &#39;તમામ એસેસમેન્ટ જૂથો&#39; કરતાં અન્ય જૂથ પસંદ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},રો {0}: આઇટમ {1} માટે કોસ્ટ સેન્ટર જરૂરી છે
@@ -4509,7 +4542,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,પાણીનું વિશ્લેષણ
 DocType: Chapter,Region,પ્રદેશ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
 DocType: Holiday List,Weekly Off,અઠવાડિક બંધ
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,લિંક વિશ્લેષણ ફરીથી લોડ કરો
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","દા.ત. 2012, 2012-13 માટે"
@@ -4525,7 +4558,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,રદ એસેટ કિંમત
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
 DocType: Vehicle,Policy No,નીતિ કોઈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
 DocType: Asset,Straight Line,સીધી રેખા
 DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,સ્પ્લિટ
@@ -4561,21 +4594,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,પાથ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"તે બાળક ગાંઠો છે, કારણ કે ખાતાવહી ખર્ચ કેન્દ્ર કન્વર્ટ કરી શકતા નથી"
 DocType: Production Plan,Total Planned Qty,કુલ યોજનાવાળી જથ્થો
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ખુલી ભાવ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ખુલી ભાવ
 DocType: Salary Detail,Formula,ફોર્મ્યુલા
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,સીરીયલ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,સીરીયલ #
 DocType: Lab Test Template,Lab Test Template,લેબ ટેસ્ટ ઢાંચો
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,સેલ્સ એકાઉન્ટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,સેલ્સ એકાઉન્ટ
 DocType: Purchase Invoice Item,Total Weight,કૂલ વજન
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,સેલ્સ પર કમિશન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,સેલ્સ પર કમિશન
 DocType: Job Offer Term,Value / Description,ભાવ / વર્ણન
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 DocType: Purchase Order Item,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
 DocType: Restaurant Order Entry,Restaurant Order Entry,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
 DocType: Asset Maintenance Task,Assign To Name,નામ માટે સોંપો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,મનોરંજન ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,મનોરંજન ખર્ચ
 DocType: Hub Settings,Enabled Users,સક્ષમ વપરાશકર્તાઓ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,સામગ્રી વિનંતી કરવા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ખોલો વસ્તુ {0}
@@ -4588,24 +4621,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,રજા માટે કાર્યક્રમો.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,હાલની વ્યવહાર સાથે એકાઉન્ટ કાઢી શકાતી નથી
 DocType: Vehicle,Last Carbon Check,છેલ્લા કાર્બન ચેક
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,કાનૂની ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,કાનૂની ખર્ચ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,કૃપા કરીને પંક્તિ પર જથ્થો પસંદ
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,ઓપનિંગ સેલ્સ અને ખરીદી ઇનવૉઇસેસ બનાવો
 DocType: Purchase Invoice,Posting Time,પોસ્ટિંગ સમય
 DocType: Timesheet,% Amount Billed,% રકમ ગણાવી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ટેલિફોન ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ટેલિફોન ખર્ચ
 DocType: Sales Partner,Logo,લોગો
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"તમે બચત પહેલાં શ્રેણી પસંદ કરો વપરાશકર્તા પર દબાણ કરવા માંગો છો, તો આ તપાસો. તમે આ તપાસો જો કોઈ મૂળભૂત હશે."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
 DocType: Email Digest,Open Notifications,ઓપન સૂચનાઓ
 DocType: Payment Entry,Difference Amount (Company Currency),તફાવત રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,પ્રત્યક્ષ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,પ્રત્યક્ષ ખર્ચ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,નવા ગ્રાહક આવક
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,પ્રવાસ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,પ્રવાસ ખર્ચ
 DocType: Maintenance Visit,Breakdown,વિરામ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} માં વૈવિધ્યપૂર્ણ ક્ષેત્ર ઉમેદવારી ઉમેરો
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
 DocType: Purchase Receipt Item,Sample Quantity,નમૂના જથ્થો
+DocType: Bank Guarantee,Name of Beneficiary,લાભાર્થીનું નામ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","તાજેતરની મૂલ્યાંકન દર / ભાવ યાદી દર / કાચા માલની છેલ્લી ખરીદી દરના આધારે, શેડ્યૂલર દ્વારા આપમેળે બીઓએમની કિંમતને અપડેટ કરો."
 DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
@@ -4617,14 +4650,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,પ્રોબેશન
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,પગાર ઘટકો
 DocType: Program Enrollment Tool,New Academic Year,નવા શૈક્ષણિક વર્ષ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,કુલ ભરપાઈ રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,કુલ ભરપાઈ રકમ
 DocType: GST Settings,B2C Limit,B2C મર્યાદા
 DocType: Work Order Item,Transferred Qty,પરિવહન Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,શોધખોળ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,આયોજન
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,આયોજન
 DocType: Share Balance,Issued,જારી
+DocType: Loan,Repayment Start Date,ચુકવણી પ્રારંભ તારીખ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,વિદ્યાર્થી પ્રવૃત્તિ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,પુરવઠોકર્તા આઈડી
 DocType: Payment Request,Payment Gateway Details,પેમેન્ટ ગેટવે વિગતો
@@ -4637,10 +4671,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","કેઝ્યુઅલ જેવા પાંદડા પ્રકાર, માંદા વગેરે"
 DocType: Email Digest,Send regular summary reports via Email.,ઈમેઈલ મારફતે નિયમિત સારાંશ અહેવાલ મોકલો.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 DocType: Assessment Result,Student Name,વિદ્યાર્થી નામ
 DocType: Brand,Item Manager,વસ્તુ વ્યવસ્થાપક
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,પગારપત્રક ચૂકવવાપાત્ર
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,પગારપત્રક ચૂકવવાપાત્ર
 DocType: Buying Settings,Default Supplier Type,મૂળભૂત પુરવઠોકર્તા પ્રકાર
 DocType: Plant Analysis,Collection Datetime,કલેક્શન ડેટટાઇમ
 DocType: Work Order,Total Operating Cost,કુલ સંચાલન ખર્ચ
@@ -4650,9 +4684,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,વપરાશકર્તા {0} અસ્તિત્વમાં નથી
 DocType: Payment Term,Day(s) after invoice date,ભરતિયાની તારીખ પછી દિવસ (ઓ)
 DocType: Payment Schedule,Payment Schedule,ચુકવણી સૂચિ
-DocType: Subscription,SUB-,સબ-
 DocType: Item Attribute Value,Abbreviation,સંક્ષેપનો
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ચુકવણી એન્ટ્રી પહેલેથી હાજર જ છે
+DocType: Subscription,Trial Period End Date,ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} મર્યાદા કરતાં વધી જાય છે, કારણ કે authroized નથી"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,પગાર નમૂનો માસ્ટર.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,પેથોલોજી
@@ -4669,9 +4703,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
 ,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,બધા ગ્રાહક જૂથો
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,બધા ગ્રાહક જૂથો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,સંચિત માસિક
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ટેક્સ ઢાંચો ફરજિયાત છે.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} અસ્તિત્વમાં નથી
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ભાવ યાદી દર (કંપની ચલણ)
@@ -4680,14 +4714,15 @@
 DocType: Lab Prescription,Test Created,પરીક્ષણ બનાવનાર
 DocType: Healthcare Settings,Custom Signature in Print,પ્રિન્ટમાં કસ્ટમ હસ્તાક્ષર
 DocType: Account,Temporary,કામચલાઉ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,કસ્ટમર એલપીઓ નંબર
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,કસ્ટમર એલપીઓ નંબર
 DocType: Program,Courses,અભ્યાસક્રમો
 DocType: Monthly Distribution Percentage,Percentage Allocation,ટકાવારી ફાળવણી
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,સચિવ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,સચિવ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","અક્ષમ કરો છો, તો આ ક્ષેત્ર શબ્દો માં &#39;કોઈપણ વ્યવહાર દૃશ્યમાન હશે નહિં"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,આ ક્રિયા ભવિષ્યના બિલિંગને બંધ કરશે શું તમે ખરેખર આ સબ્સ્ક્રિપ્શન રદ કરવા માંગો છો?
 DocType: Serial No,Distinct unit of an Item,આઇટમ અલગ એકમ
 DocType: Supplier Scorecard Criteria,Criteria Name,માપદંડનું નામ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,સેટ કરો કંપની
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,સેટ કરો કંપની
 DocType: Pricing Rule,Buying,ખરીદી
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,રોગો અને ફર્ટિલાઇઝર્સ
 DocType: HR Settings,Employee Records to be created by,કર્મચારીનું રેકોર્ડ્સ દ્વારા બનાવી શકાય
@@ -4696,17 +4731,17 @@
 DocType: POS Profile,Apply Discount On,લાગુ ડિસ્કાઉન્ટ પર
 DocType: Member,Membership Type,સભ્યપદ પ્રકાર
 ,Reqd By Date,Reqd તારીખ દ્વારા
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ક્રેડિટર્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ક્રેડિટર્સ
 DocType: Assessment Plan,Assessment Name,આકારણી નામ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,પ્રિન્ટમાં PDC દર્શાવો
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,પ્રિન્ટમાં PDC દર્શાવો
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ROW # {0}: સીરીયલ કોઈ ફરજિયાત છે
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,નોકરી ની તક
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,સંસ્થા સંક્ષેપનો
 ,Item-wise Price List Rate,વસ્તુ મુજબના ભાવ યાદી દર
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},જથ્થા ({0}) પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},જથ્થા ({0}) પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {1}
 DocType: Consultation,C-,સી-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
@@ -4724,7 +4759,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,કુલ ફેરફાર
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","જો સક્રિય હોય તો, સિસ્ટમ આપોઆપ યાદી માટે એકાઉન્ટિંગ પ્રવેશો પોસ્ટ થશે."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,બ્રોકરેજ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,કર્મચારી {0} માટે હાજરી પહેલેથી જ આ દિવસ માટે ચિહ્નિત થયેલ છે
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,કર્મચારી {0} માટે હાજરી પહેલેથી જ આ દિવસ માટે ચિહ્નિત થયેલ છે
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",મિનિટ &#39;સમય લોગ&#39; મારફતે સુધારાશે
 DocType: Customer,From Lead,લીડ પ્રતિ
@@ -4735,6 +4770,7 @@
 DocType: Lab Test,Approved Date,મંજૂર તારીખ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
+DocType: Subscriber,Subscriber Name,ઉપભોક્તાનું નામ
 DocType: Serial No,Out of Warranty,વોરંટી બહાર
 DocType: BOM Update Tool,Replace,બદલો
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,કોઈ ઉત્પાદનો મળી.
@@ -4744,19 +4780,18 @@
 DocType: Request for Quotation Item,Project Name,પ્રોજેક્ટ નામ
 DocType: Customer,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
 DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},કર્મચારી લોનમાં વ્યાજની આવકનું એકાઉન્ટ પસંદ કરો {0}
 DocType: Work Order,Required Items,જરૂરી વસ્તુઓ
 DocType: Stock Ledger Entry,Stock Value Difference,સ્ટોક વેલ્યુ તફાવત
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,માનવ સંસાધન
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ચુકવણી રિકંસીલેશન ચુકવણી
 DocType: Disease,Treatment Task,સારવાર કાર્ય
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ટેક્સ અસ્કયામતો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ટેક્સ અસ્કયામતો
 DocType: BOM Item,BOM No,BOM કોઈ
 DocType: Instructor,INS/,આઈએનએસ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,જર્નલ પ્રવેશ {0} {1} અથવા પહેલેથી જ અન્ય વાઉચર સામે મેળ ખાતી એકાઉન્ટ નથી
 DocType: Item,Moving Average,ખસેડવું સરેરાશ
 DocType: BOM Update Tool,The BOM which will be replaced,બદલાયેલ હશે જે બોમ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ઇલેક્ટ્રોનિક સાધનો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ઇલેક્ટ્રોનિક સાધનો
 DocType: Asset,Maintenance Required,જાળવણી આવશ્યક છે
 DocType: Account,Debit,ડેબિટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,પાંદડા 0.5 ના ગુણાંકમાં ફાળવવામાં હોવું જ જોઈએ
@@ -4765,7 +4800,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ઉત્કૃષ્ટ એએમટી
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,સેટ લક્ષ્યો વસ્તુ ગ્રુપ મુજબની આ વેચાણ વ્યક્તિ માટે.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ફ્રીઝ સ્ટોક્સ કરતાં જૂની [ટ્રેડીંગ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,રો # {0}: એસેટ સ્થિર એસેટ ખરીદી / વેચાણ માટે ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,રો # {0}: એસેટ સ્થિર એસેટ ખરીદી / વેચાણ માટે ફરજિયાત છે
 DocType: Asset Maintenance Team,Maintenance Team Name,જાળવણી ટીમનું નામ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","બે અથવા વધુ કિંમતના નિયમોમાં ઉપર શરતો પર આધારિત જોવા મળે છે, પ્રાધાન્યતા લાગુ પડે છે. મૂળભૂત કિંમત શૂન્ય (ખાલી) છે, જ્યારે પ્રાધાન્યતા 20 0 વચ્ચે એક નંબર છે. ઉચ્ચ નંબર સમાન શરતો સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, જો તે અગ્રતા લે છે એનો અર્થ એ થાય."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ગ્રાહક ફરજિયાત છે જો ગ્રાહક તરીકે &#39;તક&#39; થી પસંદ થયેલ હોય
@@ -4774,19 +4809,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,નીચેના ઉપયોગકર્તાઓને બ્લૉક દિવસો માટે છોડી દો કાર્યક્રમો મંજૂર કરવા માટે પરવાનગી આપે છે.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ખર્ચ દાવા પ્રકાર.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},તેના {1} આઇટમ માટે દર વેચાણ {0} કરતાં ઓછું છે. વેચાણ દર હોવા જોઈએ ઓછામાં ઓછા {2}
-DocType: Item,Taxes,કર
+DocType: Subscription,Taxes,કર
 DocType: Purchase Invoice,capital goods,કેપિટલ ગુડ્સ
 DocType: Purchase Invoice Item,Weight Per Unit,એકમ દીઠ વજન
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ચૂકવેલ અને વિતરિત નથી
 DocType: Project,Default Cost Center,મૂળભૂત ખર્ચ કેન્દ્રને
-DocType: Bank Guarantee,End Date,સમાપ્તિ તારીખ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,સ્ટોક વ્યવહારો
 DocType: Budget,Budget Accounts,બજેટ એકાઉન્ટ્સ
 DocType: Employee,Internal Work History,આંતરિક કામ ઇતિહાસ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,સંચિત અવમૂલ્યન રકમ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,પ્રાઇવેટ ઇક્વિટી
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,સપ્લાયર સ્કોરકાર્ડ વેરિયેબલ
-DocType: Employee Loan,Fully Disbursed,સંપૂર્ણપણે તેમાં વિતરિત
 DocType: Employee Advance,Due Advance Amount,કારણે એડવાન્સ રકમ
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Account,Expense,ખર્ચ
@@ -4810,7 +4843,7 @@
 ,Employee Information,કર્મચારીનું માહિતી
 DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
 DocType: Quality Inspection,Incoming,ઇનકમિંગ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,વેચાણ અને ખરીદી માટે ડિફોલ્ટ કર ટેમ્પ્લેટ બનાવવામાં આવે છે.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,મૂલ્યાંકન પરિણામ રેકોર્ડ {0} પહેલાથી અસ્તિત્વમાં છે.
@@ -4818,7 +4851,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',કૃપા કરીને કંપની ખાલી ફિલ્ટર સેટ જો ગ્રુપ દ્વારા &#39;કંપની&#39; છે
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,પોસ્ટ તારીખ ભવિષ્યના તારીખ ન હોઈ શકે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,રિકરિંગ બનાવવા માટે
 DocType: Stock Entry,Target Warehouse Address,ટાર્ગેટ વેરહાઉસ સરનામું
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,પરચુરણ રજા
 DocType: Agriculture Task,End Day,સમાપ્તિ દિવસ
@@ -4843,11 +4875,10 @@
 DocType: Material Request,% Ordered,% આદેશ આપ્યો
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","કોર્સ આધારિત વિદ્યાર્થી જૂથ માટે, કોર્સ કાર્યક્રમ નોંધણી પ્રવેશ અભ્યાસક્રમો થી દરેક વિદ્યાર્થી માટે માન્ય કરવામાં આવશે."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,છૂટક કામ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,સરેરાશ. ખરીદી દર
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,સરેરાશ. ખરીદી દર
 DocType: Share Balance,From No,ના ના
 DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
 DocType: Employee,History In Company,કંપની ઇતિહાસ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{મોકલનાર} તરફથી નવો સંદેશ
 DocType: Customer,Customer Primary Address,ગ્રાહક પ્રાથમિક સરનામું
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ન્યૂઝલેટર્સ
 DocType: Drug Prescription,Description/Strength,વર્ણન / સ્ટ્રેન્થ
@@ -4856,22 +4887,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,એક જ આઇટમ્સનો અનેકવાર દાખલ કરવામાં આવી
 DocType: Department,Leave Block List,બ્લોક યાદી છોડો
 DocType: Purchase Invoice,Tax ID,કરવેરા ID ને
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
 DocType: Accounts Settings,Accounts Settings,સેટિંગ્સ એકાઉન્ટ્સ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,મંજૂર
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} માટે દૂષિત સરનામું, ચાલુ રાખવા માટે ઠીક કરો."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} માટે દૂષિત સરનામું, ચાલુ રાખવા માટે ઠીક કરો."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","નવા એકાઉન્ટની સંખ્યા, તેને ઉપસર્ગ તરીકે એકાઉન્ટ નામમાં શામેલ કરવામાં આવશે"
 DocType: Maintenance Team Member,Team Member,ટુકડી નો સભ્ય
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,સબમિટ કરવાના કોઈ પરિણામો નથી
 DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
-DocType: Employee Loan,Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર
+DocType: Loan,Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર
 ,Project Quantity,પ્રોજેક્ટ જથ્થો
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે"
 DocType: Opportunity,To Discuss,ચર્ચા કરવા માટે
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
 DocType: Loan Type,Rate of Interest (%) Yearly,વ્યાજ દર (%) વાર્ષિક
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,કામચલાઉ ખાતાઓને
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,બ્લેક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,કામચલાઉ ખાતાઓને
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,બ્લેક
 DocType: BOM Explosion Item,BOM Explosion Item,BOM વિસ્ફોટ વસ્તુ
 DocType: Shareholder,Contact List,સંપર્ક સૂચિ
 DocType: Account,Auditor,ઓડિટર
@@ -4879,16 +4910,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} બનતી વસ્તુઓ
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,વધુ શીખો
 DocType: Cheque Print Template,Distance from top edge,ટોચ ધાર અંતર
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,ભાવ યાદી {0} અક્ષમ કરેલી છે અથવા અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,ભાવ યાદી {0} અક્ષમ કરેલી છે અથવા અસ્તિત્વમાં નથી
 DocType: Purchase Invoice,Return,રીટર્ન
 DocType: Pricing Rule,Disable,અક્ષમ કરો
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
 DocType: Project Task,Pending Review,બાકી સમીક્ષા
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","અસ્કયામતો, સીરીઅલ નંબર, બૅચેસ જેવા વધુ વિકલ્પો માટે સંપૂર્ણ પૃષ્ઠમાં સંપાદિત કરો."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,નિમણૂંકો અને સલાહ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} બેચ પ્રવેશ નથી {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","એસેટ {0}, રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ચકાસે આવશ્યક છે
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ચકાસે આવશ્યક છે
 DocType: Task,Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,માર્ક ગેરહાજર
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,સેટઅપ કંપનીમાં નિષ્ફળ
@@ -4900,7 +4931,7 @@
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ફ્લીટ મેનેજમેન્ટ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,વસ્તુઓ ઉમેરો
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,પાક અને જમીન
 DocType: Cheque Print Template,Regular,નિયમિત
 DocType: Fertilizer,Density (if liquid),ઘનતા (પ્રવાહી જો)
@@ -4925,24 +4956,26 @@
 DocType: Payment Entry,Paid Amount,ચૂકવેલ રકમ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,સેલ્સ સાયકલ અન્વેષણ કરો
 DocType: Assessment Plan,Supervisor,સુપરવાઇઝર
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,રીટેન્શન સ્ટોક એન્ટ્રી
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,રીટેન્શન સ્ટોક એન્ટ્રી
 ,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
 DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
 ,Work Order Stock Report,વર્ક ઓર્ડર સ્ટોક રિપોર્ટ
+DocType: Purchase Receipt,Auto Repeat Detail,ઓટો પુનરાવર્તન વિગતવાર
 DocType: Assessment Result Tool,Assessment Result Tool,આકારણી પરિણામ સાધન
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,સુપરવાઇઝર તરીકે
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,કેટેગરી સૂચવો
 DocType: BOM Scrap Item,BOM Scrap Item,BOM સ્ક્રેપ વસ્તુ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,ક્વોલિટી મેનેજમેન્ટ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,ક્વોલિટી મેનેજમેન્ટ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
 DocType: Project,Total Billable Amount (via Timesheets),કુલ બિલવાળી રકમ (ટાઇમ્સશીટ્સ દ્વારા)
 DocType: Agriculture Task,Previous Business Day,પાછલા વ્યવસાય દિવસ
-DocType: Employee Loan,Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ
+DocType: Loan,Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ
 DocType: Employee,Health Insurance No,આરોગ્ય વીમા નં
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ક્રેડિટ નોટ એએમટી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ક્રેડિટ નોટ એએમટી
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,કુલ કરપાત્ર રકમ
 DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
 DocType: Opening Invoice Creation Tool,Purchase,ખરીદી
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,બેલેન્સ Qty
@@ -4953,15 +4986,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} માટે {1}
 DocType: Healthcare Settings,Valid number of days,દિવસોની માન્ય સંખ્યા
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,કિંમત કેન્દ્રો
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,સબ્સ્ક્રિપ્શન પુનઃપ્રારંભ કરો
 DocType: Land Unit,Linked Plant Analysis,લિંક પ્લાન્ટ એનાલિસિસ
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,જે સપ્લાયર ચલણ પર દર કંપનીના આધાર ચલણ ફેરવાય છે
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ROW # {0}: પંક્તિ સાથે સમય તકરાર {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ઝીરો મૂલ્યાંકન દર મંજૂરી આપો
+DocType: Bank Guarantee,Receiving,પ્રાપ્ત
 DocType: Training Event Employee,Invited,આમંત્રિત
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,મલ્ટીપલ સક્રિય પગાર માળખાં આપવામાં તારીખો માટે કર્મચારી {0} મળી
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,સેટઅપ ગેટવે હિસ્સો ધરાવે છે.
 DocType: Employee,Employment Type,રોજગાર પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
 DocType: Payment Entry,Set Exchange Gain / Loss,સેટ એક્સચેન્જ મેળવી / નુકશાન
 ,GST Purchase Register,જીએસટી ખરીદી રજિસ્ટર
 ,Cash Flow,રોકડ પ્રવાહ
@@ -4981,9 +5016,10 @@
 DocType: Academic Term,Term Start Date,ટર્મ પ્રારંભ તારીખ
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,બધા શેર લેવડ્સની સૂચિ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,સામે કાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,બંને ટ્રાયલ પીરિયડ પ્રારંભ તારીખ અને ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ સેટ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,સરેરાશ દર
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,પેમેન્ટ સુનિશ્ચિતમાં કુલ ચૂકવણીની રકમ ગ્રાન્ડ / ગોળાકાર કુલની સમકક્ષ હોવી જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,પેમેન્ટ સુનિશ્ચિતમાં કુલ ચૂકવણીની રકમ ગ્રાન્ડ / ગોળાકાર કુલની સમકક્ષ હોવી જોઈએ
+DocType: Subscription Plan Detail,Plan,યોજના
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,સામાન્ય ખાતાવહી મુજબ બેન્ક નિવેદન બેલેન્સ
 DocType: Job Applicant,Applicant Name,અરજદારનું નામ
 DocType: Authorization Rule,Customer / Item Name,ગ્રાહક / વસ્તુ નામ
@@ -5013,6 +5049,7 @@
 DocType: Work Order,Warehouses,વખારો
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} એસેટ ટ્રાન્સફર કરી શકતા નથી
 DocType: Hotel Room Pricing,Hotel Room Pricing,હોટેલ રૂમ પ્રાઇસીંગ
+DocType: Subscription,Days Until Due,ત્યાં સુધી દિવસો
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,આ આઇટમની {0} (ટેમ્પલેટ) ના એક પ્રકાર છે.
 DocType: Workstation,per hour,કલાક દીઠ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ખરીદી
@@ -5021,13 +5058,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","બેચ આધારિત વિદ્યાર્થી જૂથ માટે, વિદ્યાર્થી બેચ કાર્યક્રમ નોંધણીમાંથી દરેક વિદ્યાર્થી માટે માન્ય કરવામાં આવશે."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,વિતરણ
+DocType: Journal Entry Account,Loan,લોન
 DocType: Expense Claim Advance,Expense Claim Advance,ખર્ચ દાવો એડવાન્સ
 DocType: Lab Test,Report Preference,રિપોર્ટ પસંદગી
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,સ્વયંસેવક માહિતી
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,પ્રોજેક્ટ મેનેજર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,પ્રોજેક્ટ મેનેજર
 ,Quoted Item Comparison,નોંધાયેલા વસ્તુ સરખામણી
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} અને {1} વચ્ચે સ્કોરિંગમાં ઓવરલેપ કરો
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,રવાનગી
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,રવાનગી
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,આઇટમ માટે મંજૂરી મેક્સ ડિસ્કાઉન્ટ: {0} {1}% છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,નેટ એસેટ વેલ્યુ તરીકે
 DocType: Crop,Produce,ઉત્પાદન
@@ -5037,7 +5075,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ઉત્પાદન માટે વપરાયેલી સામગ્રી
 DocType: Item Alternative,Alternative Item Code,વૈકલ્પિક વસ્તુ કોડ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
 DocType: Delivery Stop,Delivery Stop,ડિલિવરી સ્ટોપ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
 DocType: Item,Material Issue,મહત્વનો મુદ્દો
@@ -5047,15 +5085,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,સાબુ સફાઈકારક
 DocType: BOM,Show Items,બતાવો વસ્તુઓ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,સમય સમય કરતાં વધારે ન હોઈ શકે.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,શું તમે બધા ગ્રાહકોને ઇમેઇલ દ્વારા સૂચિત કરવા માંગો છો?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,શું તમે બધા ગ્રાહકોને ઇમેઇલ દ્વારા સૂચિત કરવા માંગો છો?
+DocType: Subscription Plan,Billing Interval,બિલિંગ અંતરાલ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,મોશન પિક્ચર અને વિડિઓ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,આદેશ આપ્યો
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ફરી શરુ કરવું
 DocType: Hub Settings,Hub Username,હબ વપરાશકર્તાનામ
 DocType: Salary Detail,Component,પુન
 DocType: Assessment Criteria,Assessment Criteria Group,આકારણી માપદંડ ગ્રુપ
 DocType: Healthcare Settings,Patient Name By,પેશન્ટ નામ દ્વારા
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} થી {1} સુધી પગાર માટે સંચય જર્નલ એન્ટ્રી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} થી {1} સુધી પગાર માટે સંચય જર્નલ એન્ટ્રી
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
@@ -5069,22 +5107,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","અહીં તમે વગેરે ઊંચાઇ, વજન, એલર્જી, તબીબી બાબતો જાળવી શકે છે"
 DocType: Leave Block List,Applies to Company,કંપની માટે લાગુ પડે છે
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
-DocType: Employee Loan,Disbursement Date,વહેંચણી તારીખ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;પ્રાપ્તકર્તાઓ&#39; ઉલ્લેખિત નથી
+DocType: Loan,Disbursement Date,વહેંચણી તારીખ
 DocType: BOM Update Tool,Update latest price in all BOMs,તમામ BOM માં નવીનતમ કિંમત અપડેટ કરો
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,તબીબી રેકોર્ડ
 DocType: Vehicle,Vehicle,વાહન
 DocType: Purchase Invoice,In Words,શબ્દો માં
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,સબમિટ પહેલાં બેંક અથવા ધિરાણ સંસ્થાના નામ દાખલ કરો.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} સબમિટ હોવી જ જોઈએ
 DocType: POS Profile,Item Groups,વસ્તુ જૂથો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
 DocType: Sales Order Item,For Production,ઉત્પાદન માટે
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,કૃપા કરીને ચાર્ટ ઑફ એકાઉન્ટ્સમાં કામચલાઉ ખુલવાનો એકાઉન્ટ ઉમેરો
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,કૃપા કરીને ચાર્ટ ઑફ એકાઉન્ટ્સમાં કામચલાઉ ખુલવાનો એકાઉન્ટ ઉમેરો
 DocType: Customer,Customer Primary Contact,ગ્રાહક પ્રાથમિક સંપર્ક
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,પીરિયડ ક્લોઝિંગ જર્નલ
 DocType: Project Task,View Task,જુઓ ટાસ્ક
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,એસ.ટી. / લીડ%
+DocType: Bank Guarantee,Bank Guarantee Type,બેંક ગેરંટી પ્રકાર
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ઇન્વોઇસ ભાગ
 ,Asset Depreciations and Balances,એસેટ Depreciations અને બેલેન્સ
@@ -5095,9 +5134,8 @@
 DocType: Production Plan,Include Subcontracted Items,Subcontracted આઈટમ્સ શામેલ કરો
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,જોડાઓ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,સ્ટોક ટ્રાન્સ્ક્શન પછી વેરિઅન્ટ પ્રોપર્ટીઝ બદલી શકતા નથી. તમારે આ કરવા માટે એક નવી આઇટમ બનાવવી પડશે.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
-DocType: Employee Loan,Repay from Salary,પગારની ચુકવણી
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+DocType: Loan,Repay from Salary,પગારની ચુકવણી
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
 DocType: Salary Slip,Salary Slip,પગાર કાપલી
@@ -5121,11 +5159,11 @@
 DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,નકલી વસ્તુ જૂથ આઇટમ જૂથ ટેબલ મળી
 DocType: Land Unit,Parent Land Unit,પિતૃ જમીન એકમ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
 DocType: Fertilizer,Fertilizer Name,ખાતરનું નામ
 DocType: Salary Slip,Net Pay,નેટ પે
 DocType: Cash Flow Mapping Accounts,Account,એકાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,સીરીયલ કોઈ {0} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,સીરીયલ કોઈ {0} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
 ,Requested Items To Be Transferred,વિનંતી વસ્તુઓ ટ્રાન્સફર કરી
 DocType: Expense Claim,Vehicle Log,વાહન પ્રવેશ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),તાવની હાજરી (temp&gt; 38.5 ° સે / 101.3 ° ફે અથવા સતત તૈનાત&gt; 38 ° સે / 100.4 ° ફૅ)
@@ -5166,24 +5204,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
 DocType: Asset Maintenance,Manufacturing User,ઉત્પાદન વપરાશકર્તા
 DocType: Purchase Invoice,Raw Materials Supplied,કાચો માલ પાડેલ
-DocType: C-Form,Series,સિરીઝ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},કિંમત સૂચિ {0} ની કરન્સી {1} અથવા {2} હોવી જોઈએ
 DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
 DocType: Soil Texture,Ternary Plot,ટર્નરી પ્લોટ
 DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
 DocType: Driver,License Number,લાઇસેંસ નંબર
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,બિઝનેસ ડેવલપમેન્ટ મેનેજર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,બિઝનેસ ડેવલપમેન્ટ મેનેજર
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,જાળવણી મુલાકાત લો હેતુ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ઇન્વોઇસ પેશન્ટ નોંધણી
 DocType: Crop,Period,પીરિયડ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,સામાન્ય ખાતાવહી
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},કર્મચારીનું {0} પર રજા પર {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},કર્મચારીનું {0} પર રજા પર {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,જુઓ તરફ દોરી જાય છે
 DocType: Program Enrollment Tool,New Program,નવા કાર્યક્રમ
 DocType: Item Attribute Value,Attribute Value,લક્ષણની કિંમત
 ,Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
 DocType: Salary Detail,Salary Detail,પગાર વિગતવાર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,પ્રથમ {0} પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,પ્રથમ {0} પસંદ કરો
 DocType: Appointment Type,Physician,ફિઝિશિયન
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,પરામર્શ
@@ -5191,15 +5228,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) વર્ક ઓર્ડર {3} માં આયોજિત જથ્થા ({2}) કરતા વધુ ન હોઈ શકે
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ઉત્પાદન માટે સમય શીટ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,પેટાસરવાળો
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,સ્ટોક ટ્રાન્ઝેક્શન પછી વેરિઅન્ટ પ્રોપર્ટીઝ બદલી શકતા નથી. તમારે આ કરવા માટે એક નવી આઇટમ બનાવવી પડશે.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA આદેશ
 DocType: Physician,Charges,ચાર્જિસ
 DocType: Production Plan,Get Items For Work Order,વર્ક ઓર્ડર માટે આઇટમ્સ મેળવો
 DocType: Salary Detail,Default Amount,મૂળભૂત રકમ
 DocType: Lab Test Template,Descriptive,વર્ણનાત્મક
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,આ મહિનો સારાંશ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ગુણવત્તા નિરીક્ષણ વાંચન
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`કરતા જૂનો સ્થિર સ્ટોક'  %d દિવસ કરતાં ઓછો હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`કરતા જૂનો સ્થિર સ્ટોક'  %d દિવસ કરતાં ઓછો હોવો જોઈએ
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,તમે તમારી કંપની માટે સેલ્સ ધ્યેય સેટ કરવા માંગો છો
 ,Project wise Stock Tracking,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
@@ -5227,11 +5265,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,વેબસાઇટ બનાવવામાં નિષ્ફળ
 DocType: Soil Analysis,Mg/K,એમજી / કે
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,રીટેન્શન સ્ટોક એન્ટ્રી પહેલેથી જ બનાવવામાં આવેલ છે અથવા નમૂનાની રકમ આપેલ નથી
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,રીટેન્શન સ્ટોક એન્ટ્રી પહેલેથી જ બનાવવામાં આવેલ છે અથવા નમૂનાની રકમ આપેલ નથી
 DocType: Program,Program Abbreviation,કાર્યક્રમ સંક્ષેપનો
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
 DocType: Warranty Claim,Resolved By,દ્વારા ઉકેલાઈ
-DocType: Bank Guarantee,Start Date,પ્રારંભ તારીખ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,સમયગાળા માટે પાંદડા ફાળવો.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques અને થાપણો ખોટી રીતે સાફ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,એકાઉન્ટ {0}: તમે પિતૃ એકાઉન્ટ તરીકે પોતાને સોંપી શકો છો
@@ -5246,11 +5283,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,કલાક
 DocType: Project,Expected Start Date,અપેક્ષિત પ્રારંભ તારીખ
 DocType: Purchase Invoice,04-Correction in Invoice,04 - ઇન્વૉઇસમાં સુધારો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,બૉમ સાથેની બધી આઇટમ્સ માટે વર્ક ઓર્ડર પહેલાથી જ બનાવ્યું છે
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,બૉમ સાથેની બધી આઇટમ્સ માટે વર્ક ઓર્ડર પહેલાથી જ બનાવ્યું છે
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,વિવિધ વિગતો અહેવાલ
 DocType: Setup Progress Action,Setup Progress Action,સેટઅપ પ્રગતિ ક્રિયા
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ભાવ યાદી ખરીદી
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ભાવ યાદી ખરીદી
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ખર્ચ કે આઇટમ પર લાગુ નથી તો આઇટમ દૂર
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,સબ્સ્ક્રિપ્શન રદ કરો
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,મહેરબાની કરીને મેન્ટેનન્સ સ્થિતિ પસંદ કરો અથવા સમાપ્તિ તારીખને દૂર કરો
 DocType: Supplier,Default Payment Terms Template,ડિફોલ્ટ ચુકવણી શરતો ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ટ્રાન્ઝેક્શન ચલણ પેમેન્ટ ગેટવે ચલણ તરીકે જ હોવી જોઈએ
@@ -5261,7 +5299,6 @@
 DocType: Employee,Educational Qualification,શૈક્ષણિક લાયકાત
 DocType: Workstation,Operating Costs,ઓપરેટિંગ ખર્ચ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ક્રિયા જો સંચિત માસિક બજેટ વટાવી
-DocType: Subscription,Submit on creation,સબમિટ બનાવટ પર
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
 DocType: Asset,Disposal Date,નિકાલ તારીખ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ઇમેઇલ્સ આપવામાં કલાક કંપની બધી સક્રિય કર્મચારીઓની મોકલવામાં આવશે, જો તેઓ રજા નથી. પ્રતિસાદ સારાંશ મધ્યરાત્રિએ મોકલવામાં આવશે."
@@ -5279,6 +5316,7 @@
 DocType: Batch,Parent Batch,પિતૃ બેચ
 DocType: Cheque Print Template,Cheque Print Template,ચેક પ્રિન્ટ ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,સબ્સ્ક્રિપ્શનને રદ કરવા અથવા સબસ્ક્રીપ્ટ તરીકે અવેતન તરીકે ચિહ્નિત કરવા પહેલા ભરતિયાની તારીખ પૂર્ણ થઈ તે પછીના દિવસોની સંખ્યા
 DocType: Lab Test Template,Sample Collection,નમૂનાનો સંગ્રહ
 ,Requested Items To Be Ordered,વિનંતી વસ્તુઓ ઓર્ડર કરી
 DocType: Price List,Price List Name,ભાવ યાદી નામ
@@ -5287,7 +5325,7 @@
 DocType: Account,Income,આવક
 DocType: Industry Type,Industry Type,ઉદ્યોગ પ્રકાર
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,કંઈક ખોટું થયું!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,ભરતિયું {0} પહેલાથી જ સબમિટ કરવામાં આવી છે સેલ્સ
 DocType: Supplier Scorecard Scoring Criteria,Score,કુલ સ્કોર
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ફિસ્કલ વર્ષ {0} અસ્તિત્વમાં નથી
@@ -5307,12 +5345,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 અને 100 ની વચ્ચેનું મૂલ્ય હોવું જોઈએ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,આગળ અવમૂલ્યન તારીખ ઉપલબ્ધ તારીખ માટે ઉપલબ્ધ ન હોઈ શકે
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,અસુરક્ષીત લોન્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,અસુરક્ષીત લોન્સ
 DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
 DocType: Student,B+,બી +
 DocType: HR Settings,Max working hours against Timesheet,મેક્સ Timesheet સામે કામના કલાકો
 DocType: Maintenance Schedule Detail,Scheduled Date,અનુસૂચિત તારીખ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,કુલ ભરપાઈ એએમટી
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,કુલ ભરપાઈ એએમટી
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 અક્ષરો કરતાં વધારે સંદેશાઓ બહુવિધ સંદેશાઓ વિભાજિત કરવામાં આવશે
 DocType: Purchase Receipt Item,Received and Accepted,પ્રાપ્ત થઈ છે અને સ્વીકારાયું
 DocType: Hub Settings,Company and Seller Profile,કંપની અને વિક્રેતા પ્રોફાઇલ
@@ -5326,10 +5364,9 @@
 DocType: Item,Variant Based On,વેરિએન્ટ પર આધારિત
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,તમારા સપ્લાયર્સ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,કૃપા કરીને સુધારો
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
 DocType: Request for Quotation Item,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,અનામિક
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,પ્રતિ પ્રાપ્ત
 DocType: Lead,Converted,રૂપાંતરિત
@@ -5343,6 +5380,7 @@
 DocType: Asset,Assets,અસ્કયામતો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
+DocType: Subscription,Current Invoice End Date,વર્તમાન ઇન્વોઇસ સમાપ્તિ તારીખ
 DocType: Payment Term,Due Date Based On,નિયત તારીખ આધારિત
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,વેચાણ સેટિંગ્સમાં ડિફૉલ્ટ ગ્રાહક જૂથ અને પ્રદેશને સેટ કરો
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} અસ્તિત્વમાં નથી
@@ -5350,7 +5388,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,વસ્તુ: {0} સિસ્ટમ અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,જર્નલ એન્ટ્રી માટે કોઈ ચુકવણી પસંદ નથી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
+DocType: Loan,Disbursed,વિતરણ
 DocType: Healthcare Settings,Laboratory Settings,લેબોરેટરી સેટિંગ્સ
 DocType: Patient Appointment,Service Unit,સેવા એકમ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,સપ્લાયર સફળતાપૂર્વક સેટ કરો
@@ -5363,12 +5403,12 @@
 DocType: Share Balance,No of Shares,શેરની સંખ્યા
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે ’સિરિયલ નંબર’ 'હા' કરી ન શકાય
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,સ્થિતિ પસંદ કરો
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
 DocType: Pricing Rule,Pricing Rule Help,પ્રાઇસીંગ નિયમ મદદ
 DocType: School House,House Name,હાઉસ નામ
 DocType: Fee Schedule,Total Amount per Student,વિદ્યાર્થી દીઠ કુલ રકમ
 DocType: Purchase Taxes and Charges,Account Head,એકાઉન્ટ હેડ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ઇલેક્ટ્રિકલ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ઇલેક્ટ્રિકલ
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,તમારી સંસ્થા બાકીના તમારા વપરાશકર્તાઓ તરીકે ઉમેરો. તમે પણ તેમને સંપર્કો માંથી ઉમેરીને તમારી પોર્ટલ ગ્રાહકો આમંત્રિત ઉમેરી શકો છો
 DocType: Stock Entry,Total Value Difference (Out - In),કુલ મૂલ્ય તફાવત (બહાર - માં)
 DocType: Grant Application,Requested Amount,વિનંતી કરેલી રકમ
@@ -5378,7 +5418,7 @@
 DocType: Crop Cycle,Detected Diseases,શોધાયેલ રોગો
 DocType: Stock Entry,Default Source Warehouse,મૂળભૂત સોર્સ વેરહાઉસ
 DocType: Item,Customer Code,ગ્રાહક કોડ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 DocType: Asset Maintenance Task,Last Completion Date,છેલ્લું સમાપ્તિ તારીખ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
@@ -5386,9 +5426,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless સેટિંગ્સ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,સ્ટોક અસ્કયામતો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,સ્ટોક અસ્કયામતો
 DocType: Restaurant,Active Menu,સક્રિય મેનુ
 DocType: Target Detail,Target Qty,લક્ષ્યાંક Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},લોન સામે: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ચેકઆઉટ સેટિંગ્સ
 DocType: Student Attendance,Present,હાજર
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ડ લવર નોંધ {0} રજૂ ન હોવા જોઈએ
@@ -5397,9 +5438,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
 DocType: Vehicle Log,Odometer,ઑડોમીટર
 DocType: Production Plan Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
 DocType: Chapter,Chapter Head,પ્રકરણ હેડ
 DocType: Payment Term,Month(s) after the end of the invoice month,ઇનવોઇસ મહિનાના અંત પછી મહિનો (ઓ)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
@@ -5407,11 +5448,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,પગાર સ્લિપ બનાવો
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,લેબ પરિણામ ડેટાટાઇમ ડેટટાઇમ પરીક્ષણ પહેલા ન હોઈ શકે
 DocType: POS Profile,Allow user to edit Discount,વપરાશકર્તા ડિસ્કાઉન્ટને સંપાદિત કરવાની મંજૂરી આપો
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,થી ગ્રાહકો મેળવો
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,થી ગ્રાહકો મેળવો
 DocType: Purchase Invoice Item,Include Exploded Items,વિસ્ફોટ થયેલ આઇટમ્સ શામેલ કરો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","માટે લાગુ તરીકે પસંદ કરેલ છે તે ખરીદી, ચકાસાયેલ જ હોવું જોઈએ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ડિસ્કાઉન્ટ કરતાં ઓછી 100 હોવી જ જોઈએ
 DocType: Shipping Rule,Restrict to Countries,દેશો માટે પ્રતિબંધિત
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
 DocType: Sales Invoice Timesheet,Billing Hours,બિલિંગ કલાક
 DocType: Project,Total Sales Amount (via Sales Order),કુલ સેલ્સ રકમ (સેલ્સ ઓર્ડર દ્વારા)
@@ -5428,6 +5470,7 @@
 DocType: Soil Texture,Sandy Clay,રેતાળ માટી
 DocType: Grant Application,Assessment  Manager,આકારણી વ્યવસ્થાપક
 DocType: Payment Entry,Allocate Payment Amount,સોંપણી ચુકવણી રકમ
+DocType: Subscription Plan,Subscription Plan,સબ્સ્ક્રિપ્શન પ્લાન
 DocType: Employee External Work History,Salary,પગાર
 DocType: Serial No,Delivery Document Type,ડ લવર દસ્તાવેજ પ્રકારની
 DocType: Sales Order,Partly Delivered,આંશિક વિતરિત
@@ -5452,9 +5495,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,એઇજીંગનો રેન્જ 2
 DocType: SG Creation Tool Course,Max Strength,મેક્સ શક્તિ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,પ્રીસેટ્સનો ઇન્સ્ટોલ કરી રહ્યાં છે
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ગ્રાહક માટે કોઈ ડિલિવરી નોટ પસંદ નથી {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ગ્રાહક માટે કોઈ ડિલિવરી નોટ પસંદ નથી {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM બદલાઈ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ડિલિવરી તારીખના આધારે આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ડિલિવરી તારીખના આધારે આઇટમ્સ પસંદ કરો
 DocType: Grant Application,Has any past Grant Record,ભૂતકાળ ગ્રાન્ટ રેકોર્ડ છે
 ,Sales Analytics,વેચાણ ઍનલિટિક્સ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ઉપલબ્ધ {0}
@@ -5472,7 +5515,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,કાચો માલ પાડેલ કિંમત
 DocType: Selling Settings,Settings for Selling Module,મોડ્યુલ વેચાણ માટે સેટિંગ્સ
 DocType: Hotel Room Reservation,Hotel Room Reservation,હોટેલ રૂમ આરક્ષણ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ગ્રાહક સેવા
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ગ્રાહક સેવા
 DocType: BOM,Thumbnail,થંબનેલ
 DocType: Item Customer Detail,Item Customer Detail,વસ્તુ ગ્રાહક વિગતવાર
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ઓફર ઉમેદવાર જોબ.
@@ -5488,7 +5531,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} વિદ્યાર્થીઓની નોંધણી કરવામાં આવી છે
 DocType: Fees,Student Details,વિદ્યાર્થીની વિગતો
 DocType: Purchase Invoice Item,Stock Qty,સ્ટોક Qty
-DocType: Employee Loan,Repayment Period in Months,મહિના ચુકવણી સમય
+DocType: Loan,Repayment Period in Months,મહિના ચુકવણી સમય
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ભૂલ: માન્ય ID ને?
 DocType: Naming Series,Update Series Number,સુધારા સિરીઝ સંખ્યા
 DocType: Account,Equity,ઈક્વિટી
@@ -5497,7 +5540,7 @@
 DocType: Task,Closing Date,છેલ્લી તારીખ
 DocType: Sales Order Item,Produced Quantity,ઉત્પાદન જથ્થો
 DocType: Timesheet,Work Detail,કાર્ય વિગતવાર
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ઇજનેર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ઇજનેર
 DocType: Journal Entry,Total Amount Currency,કુલ રકમ કરન્સી
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,શોધ પેટા એસેમ્બલીઝ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
@@ -5542,13 +5585,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,દાતા પ્રકાર માહિતી
 DocType: Request for Quotation,Supplier Detail,પુરવઠોકર્તા વિગતવાર
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},સૂત્ર અથવા શરત ભૂલ: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ભરતિયું રકમ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ભરતિયું રકમ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,માપદંડ વજન 100% જેટલું ઉમેરવું જોઈએ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,એટેન્ડન્સ
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,સ્ટોક વસ્તુઓ
 DocType: BOM,Materials,સામગ્રી
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ચકાસાયેલ જો નહિં, તો આ યાદીમાં તે લાગુ પાડી શકાય છે, જ્યાં દરેક વિભાગ ઉમેરવામાં આવશે હશે."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} બનાવી રહ્યા છે
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,સ્ત્રોત અને લક્ષ્ય વેરહાઉસ જ ન હોઈ શકે
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,તારીખ પોસ્ટ અને સમય પોસ્ટ ફરજિયાત છે
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,વ્યવહારો ખરીદી માટે કરવેરા નમૂનો.
@@ -5572,14 +5614,14 @@
 DocType: Shipping Rule,Fixed,સ્થિર
 DocType: Vehicle Service,Clutch Plate,ક્લચ પ્લેટ
 DocType: Company,Round Off Account,એકાઉન્ટ બંધ રાઉન્ડ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,વહીવટી ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,વહીવટી ખર્ચ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,કન્સલ્ટિંગ
 DocType: Customer Group,Parent Customer Group,પિતૃ ગ્રાહક જૂથ
-DocType: Journal Entry,Subscription,ઉમેદવારી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,ઉમેદવારી
 DocType: Purchase Invoice,Contact Email,સંપર્ક ઇમેઇલ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ફી સર્જન બાકી
 DocType: Appraisal Goal,Score Earned,કુલ સ્કોર કમાવેલી
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,સૂચના સમયગાળા
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,સૂચના સમયગાળા
 DocType: Asset Category,Asset Category Name,એસેટ વર્ગ નામ
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,આ રુટ પ્રદેશ છે અને સંપાદિત કરી શકાતી નથી.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ન્યૂ વેચાણ વ્યક્તિ નામ
@@ -5592,7 +5634,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,ઇક્વિરિટેનમ
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"અનચેક છોડી દો, તો તમે બેચ ધ્યાનમાં જ્યારે અભ્યાસક્રમ આધારિત જૂથો બનાવવા નથી માંગતા."
 DocType: Asset,Frequency of Depreciation (Months),અવમૂલ્યન આવર્તન (મહિના)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ક્રેડિટ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ક્રેડિટ એકાઉન્ટ
 DocType: Landed Cost Item,Landed Cost Item,ઉતારેલ માલની કિંમત વસ્તુ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,શૂન્ય કિંમતો બતાવો
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,આઇટમ જથ્થો કાચા માલના આપવામાં જથ્થામાં થી repacking / ઉત્પાદન પછી પ્રાપ્ત
@@ -5600,7 +5642,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
 DocType: Hub Settings,Company Logo,કંપની લોગો
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
 DocType: Healthcare Settings,Patient Registration,પેશન્ટ નોંધણી
@@ -5634,11 +5676,10 @@
 DocType: Journal Entry,Total Debit,કુલ ડેબિટ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,મૂળભૂત ફિનિશ્ડ ગૂડ્સ વેરહાઉસ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,કૃપા કરીને પેશન્ટ પસંદ કરો
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,વેચાણ વ્યક્તિ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,વેચાણ વ્યક્તિ
 DocType: Hotel Room Package,Amenities,સવલતો
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ચુકવણીના બહુવિધ ડિફોલ્ટ મોડને મંજૂરી નથી
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,માટે
 ,Appointment Analytics,નિમણૂંક ઍનલિટિક્સ
 DocType: Vehicle Service,Half Yearly,અર્ધ વાર્ષિક
 DocType: Lead,Blog Subscriber,બ્લોગ ઉપભોક્તા
@@ -5654,6 +5695,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"ખાલી છોડો છો, તો તમે દર વર્ષે વિદ્યાર્થીઓ ગ્રુપ બનાવી"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ચકાસાયેલ હોય, તો કુલ નં. દિવસની રજાઓ સમાવેશ થાય છે, અને આ પગાર પ્રતિ દિવસ ની કિંમત ઘટાડશે"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","વર્તમાન કીનો ઉપયોગ કરીને એપ્લિકેશન્સ ઍક્સેસ કરવામાં સમર્થ હશે નહીં, શું તમે ખરેખર છો?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,કુલ એડવાન્સ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ઢાંચો કોડ બદલો
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ ગાળાના પ્રારંભ તારીખ પહેલાં ન હોઈ શકે. તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
@@ -5664,8 +5706,9 @@
 DocType: Opportunity Item,Basic Rate,મૂળ દર
 DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
 DocType: Cheque Print Template,Signatory Position,સહી પોઝિશન
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,લોસ્ટ તરીકે સેટ કરો
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,લોસ્ટ તરીકે સેટ કરો
 DocType: Timesheet,Total Billable Hours,કુલ બિલયોગ્ય કલાકો
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,દિવસોની સંખ્યા કે જે સબ્સ્ક્રાઇબરે આ સબ્સ્ક્રિપ્શન દ્વારા પેદા કરેલ ઇન્વૉઇસેસ ચૂકવવું પડશે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ચુકવણી રસીદ નોંધ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,આ ગ્રાહક સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},રો {0}: સોંપાયેલ રકમ {1} કરતાં ઓછી હોઈ શકે છે અથવા ચુકવણી એન્ટ્રી રકમ બરાબર જ જોઈએ {2}
@@ -5684,12 +5727,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,આ કર્મચારીનું હાજરી પર આધારિત છે
 DocType: Assessment Result,Summary,સારાંશ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,માર્ક એટેન્ડન્સ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ઉધાર ખાતું
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ઉધાર ખાતું
 DocType: Fiscal Year,Year Start Date,વર્ષે શરૂ તારીખ
 DocType: Attendance,Employee Name,કર્મચારીનું નામ
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી આઇટમ
@@ -5701,7 +5744,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ખરીદી જથ્થો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
 DocType: Work Order,Manufactured Qty,ઉત્પાદન Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},શેર {0} સાથે અસ્તિત્વમાં નથી
@@ -5709,12 +5752,12 @@
 DocType: Asset,Out of Order,હુકમ બહાર
 DocType: Purchase Receipt Item,Accepted Quantity,સ્વીકારાયું જથ્થો
 DocType: Projects Settings,Ignore Workstation Time Overlap,વર્કસ્ટેશન સમય ઓવરલેપ અવગણો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,બેચ નંબર્સ પસંદ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
 DocType: Patient Service Unit,Medical Administrator,તબીબી સંચાલક
 DocType: Assessment Plan,Schedule,સૂચિ
 DocType: Account,Parent Account,પિતૃ એકાઉન્ટ
@@ -5744,15 +5787,16 @@
 DocType: Asset Repair,Repair Status,સમારકામ સ્થિતિ
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
 DocType: POS Profile,Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ
 DocType: Purchase Invoice,input service,ઇનપુટ સેવા
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},રો {0}: પાર્ટી / એકાઉન્ટ સાથે મેળ ખાતું નથી {1} / {2} માં {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,જાળવણી ટીમ સભ્ય
 DocType: Agriculture Analysis Criteria,Soil Analysis,જમીનનું વિશ્લેષણ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,કોર્સ કોડ:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
 DocType: Account,Stock,સ્ટોક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Employee,Current Address,અત્યારનું સરનામુ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","સ્પષ્ટ સિવાય વસ્તુ પછી વર્ણન, છબી, ભાવો, કર નમૂનો સુયોજિત કરવામાં આવશે, વગેરે અન્ય વસ્તુ જ એક પ્રકાર છે, તો"
 DocType: Serial No,Purchase / Manufacture Details,ખરીદી / ઉત્પાદન વિગતો
@@ -5800,19 +5844,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},માટે પ્રવેશ {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,વેરિયેબલ નામ
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
 DocType: Asset,Asset Category,એસેટ વર્ગ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,નેટ પગાર નકારાત્મક ન હોઈ શકે
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,સપ્લાયર સામગ્રી
 DocType: Soil Texture,Loamy Sand,લોમી સેન્ડ
 DocType: Production Plan,Material Request Planning,સામગ્રી વિનંતી આયોજન
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,એક્સાઇઝ ભરતિયું
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,થ્રેશોલ્ડ {0}% કરતાં વધુ એક વખત દેખાય છે
 DocType: Expense Claim,Employees Email Id,કર્મચારીઓ ઇમેઇલ આઈડી
 DocType: Employee Attendance Tool,Marked Attendance,માર્કડ એટેન્ડન્સ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,વર્તમાન જવાબદારીઓ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,વર્તમાન જવાબદારીઓ
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,ટાઈમરે આપેલ કલાકને ઓળંગ્યું
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,સામૂહિક એસએમએસ તમારા સંપર્કો મોકલો
 DocType: Patient,A Positive,હકારાત્મક
@@ -5822,9 +5866,10 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +158,No Reference,કોઈ સંદર્ભ નથી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,વાસ્તવિક Qty ફરજિયાત છે
 DocType: Asset Maintenance Team,Asset Maintenance Team,અસેટ મેન્ટેનન્સ ટીમ
-DocType: Employee Loan,Loan Type,લોન પ્રકાર
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} સફળતાપૂર્વક સબમિટ કરવામાં આવી છે
+DocType: Loan,Loan Type,લોન પ્રકાર
 DocType: Scheduling Tool,Scheduling Tool,સુનિશ્ચિત સાધન
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ક્રેડીટ કાર્ડ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ક્રેડીટ કાર્ડ
 DocType: BOM,Item to be manufactured or repacked,વસ્તુ ઉત્પાદન અથવા repacked શકાય
 DocType: Employee Education,Major/Optional Subjects,મુખ્ય / વૈકલ્પિક વિષયો
 DocType: Sales Invoice Item,Drop Ship,ડ્રોપ શિપ
@@ -5856,7 +5901,7 @@
 DocType: Item,Units of Measure,માપવા એકમો
 DocType: Manufacturing Settings,Allow Production on Holidays,રજાઓ પર ઉત્પાદન માટે પરવાનગી આપે છે
 DocType: Sales Invoice,Customer's Purchase Order Date,ગ્રાહક ખરીદી ઓર્ડર તારીખ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,કેપિટલ સ્ટોક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,કેપિટલ સ્ટોક
 DocType: Shopping Cart Settings,Show Public Attachments,જાહેર જોડાણો બતાવો
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
 DocType: Restaurant Reservation,Reservation Time,આરક્ષણ સમય
@@ -5871,7 +5916,7 @@
 DocType: Purchase Order,To Receive and Bill,પ્રાપ્ત અને બિલ
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,રો # {0}: તારીખ દ્વારા રેકર્ડ વ્યવહાર તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ફીચર્ડ પ્રોડક્ટ્સ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ડીઝાઈનર
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ડીઝાઈનર
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,નિયમો અને શરતો ઢાંચો
 DocType: Serial No,Delivery Details,ડ લવર વિગતો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
@@ -5881,20 +5926,20 @@
 DocType: Driver,Expiry Date,અંતિમ તારીખ
 DocType: Healthcare Settings,Employee name and designation in print,પ્રિન્ટમાં કર્મચારી નામ અને હોદ્દો
 ,accounts-browser,એકાઉન્ટ્સ બ્રાઉઝર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
 apps/erpnext/erpnext/config/projects.py +13,Project master.,પ્રોજેક્ટ માસ્ટર.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ઓવર બિલિંગ અથવા વધારે ક્રમ પરવાનગી આપવા માટે, &quot;ભથ્થું&quot; અપડેટ સ્ટોક સેટિંગ્સ અથવા વસ્તુ છે."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,કરન્સી વગેરે $ જેવી કોઇ પ્રતીક આગામી બતાવશો નહીં.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(અડધા દિવસ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(અડધા દિવસ)
 DocType: Payment Term,Credit Days,ક્રેડિટ દિવસો
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,લેબ ટેસ્ટ મેળવવા માટે પેશન્ટ પસંદ કરો
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,સમય દિવસમાં લીડ
 DocType: Cash Flow Mapping,Is Income Tax Expense,આવકવેરા ખર્ચ છે
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,આ તપાસો જો વિદ્યાર્થી સંસ્થાના છાત્રાલય ખાતે રહેતા છે.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
 ,Stock Summary,સ્ટોક સારાંશ
@@ -5905,10 +5950,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,સંદર્ભ તારીખ
 DocType: Employee,Reason for Leaving,છોડીને માટે કારણ
 DocType: BOM Operation,Operating Cost(Company Currency),સંચાલન ખર્ચ (કંપની ચલણ)
-DocType: Employee Loan Application,Rate of Interest,વ્યાજ દર
+DocType: Loan Application,Rate of Interest,વ્યાજ દર
 DocType: Expense Claim Detail,Sanctioned Amount,મંજુર રકમ
 DocType: Item,Shelf Life In Days,દિવસો માં શેલ્ફ લાઇફ
 DocType: GL Entry,Is Opening,ખોલ્યા છે
+DocType: Department,Expense Approvers,ખર્ચ Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
 DocType: Journal Entry,Subscription Section,સબ્સ્ક્રિપ્શન વિભાગ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 208f9a5..0a7ab0d 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -7,11 +7,10 @@
 DocType: Project,Costing and Billing,תמחיר וחיובים
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,חשבון {0}: הורה חשבון {1} לא יכול להיות פנקס
 DocType: Item,Publish Item to hub.erpnext.com,פרסם פריט לhub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,"הודעות דוא""ל"
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,הַעֲרָכָה
 DocType: Item,Default Unit of Measure,ברירת מחדל של יחידת מדידה
 DocType: SMS Center,All Sales Partner Contact,כל מכירות הפרטנר לתקשר
-DocType: Employee,Leave Approvers,השאר מאשרים
+DocType: Department,Leave Approvers,השאר מאשרים
 DocType: Sales Partner,Dealer,סוחר
 DocType: Employee,Rented,הושכר
 DocType: Purchase Order,PO-,PO-
@@ -21,8 +20,8 @@
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,זה מבוסס על עסקאות מול הספק הזה. ראה את ציר הזמן מתחת לפרטים
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,משפטי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},מס סוג בפועל לא ניתן כלול במחיר הפריט בשורת {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,משפטי
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},מס סוג בפועל לא ניתן כלול במחיר הפריט בשורת {0}
 DocType: Bank Guarantee,Customer,לקוחות
 DocType: Purchase Receipt Item,Required By,הנדרש על ידי
 DocType: Delivery Note,Return Against Delivery Note,חזור נגד תעודת משלוח
@@ -42,38 +41,36 @@
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
 DocType: SMS Center,All Supplier Contact,כל לתקשר עם הספק
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,החדש Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,המחאה בנקאית
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,המחאה בנקאית
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,גרסאות הצג
 DocType: Academic Term,Academic Term,מונח אקדמי
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,חוֹמֶר
 DocType: Opening Invoice Creation Tool Item,Quantity,כמות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),הלוואות (התחייבויות)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
 apps/erpnext/erpnext/templates/includes/product_page.js +25,In Stock,במלאי
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,בריאות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,חשבונית
+DocType: Subscription Invoice,Invoice,חשבונית
 DocType: Asset Maintenance Log,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,ביטחון
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,# השורה {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,אנא בחר מחירון
 DocType: Work Order Operation,Work In Progress,עבודה בתהליך
 DocType: Daily Work Summary Group,Holiday List,רשימת החג
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,חשב
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,חשב
 DocType: Cost Center,Stock User,משתמש המניה
 DocType: Company,Phone No,מס 'טלפון
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},חדש {0}: # {1}
 ,Sales Partners Commission,ועדת שותפי מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +46,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
 DocType: Payment Request,Payment Request,בקשת תשלום
@@ -93,7 +90,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,אותו החברה נכנסה יותר מפעם אחת
 DocType: Patient,Married,נשוי
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},חל איסור על {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,קבל פריטים מ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,קבל פריטים מ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
@@ -128,7 +125,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,חשבון עם עסקה הקיימת לא ניתן להמיר לקבוצה.
 DocType: Lead,Product Enquiry,חקירה מוצר
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,אנא ראשון להיכנס החברה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,אנא בחר החברה ראשונה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,אנא בחר החברה ראשונה
 DocType: Employee Education,Under Graduate,תחת בוגר
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
@@ -145,10 +142,10 @@
 DocType: Student,B-,B-
 DocType: Sales Invoice Item,Delivered By Supplier,נמסר על ידי ספק
 DocType: SMS Center,All Contact,כל הקשר
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,משכורת שנתית
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} הוא קפוא
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,הוצאות המניה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,הוצאות המניה
 DocType: Journal Entry,Contra Entry,קונטרה כניסה
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
 DocType: Delivery Note,Installation Status,מצב התקנה
@@ -158,7 +155,7 @@
 DocType: Products Settings,Show Products as a List,הצג מוצרים כרשימה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +574,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 apps/erpnext/erpnext/utilities/user_progress.py +190,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: Sales Invoice,Change Amount,שנת הסכום
@@ -168,7 +165,7 @@
 DocType: Lead,Request Type,סוג הבקשה
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,הפוך שכיר
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,שידור
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ביצוע
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ביצוע
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,פרטים של הפעולות שביצעו.
 DocType: Asset Maintenance Log,Maintenance Status,מצב תחזוקה
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,פריטים ותמחור
@@ -184,7 +181,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},תאריך התקנה לא יכול להיות לפני מועד אספקה לפריט {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),הנחה על מחיר מחירון שיעור (%)
 DocType: Job Offer,Select Terms and Conditions,תנאים והגבלות בחרו
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ערך מתוך
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ערך מתוך
 DocType: Production Plan,Sales Orders,הזמנות ומכירות
 DocType: Purchase Taxes and Charges,Valuation,הערכת שווי
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +394,Set as Default,קבע כברירת מחדל
@@ -199,7 +196,7 @@
 DocType: Selling Settings,Default Territory,טריטורית ברירת מחדל
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,טלוויזיה
 DocType: Work Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
 DocType: Naming Series,Series List for this Transaction,רשימת סדרות לעסקה זו
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 DocType: Customer Group,Mention if non-standard receivable account applicable,להזכיר אם ישים חשבון חייבים שאינם סטנדרטי
@@ -220,30 +217,30 @@
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,אין תיאור נתון
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,בקש לרכישה.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,זה מבוסס על פחי הזמנים נוצרו נגד הפרויקט הזה
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,עלים בכל שנה
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,עלים בכל שנה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
 apps/erpnext/erpnext/utilities/user_progress.py +147,Litre,לִיטר
 DocType: Task,Total Costing Amount (via Time Sheet),סה&quot;כ תמחיר הסכום (באמצעות גיליון זמן)
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,פוסט בנק
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,פוסט בנק
 DocType: Crop,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
 DocType: Material Request Item,Min Order Qty,להזמין כמות מינימום
 DocType: Lead,Do Not Contact,אל תצור קשר
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,אנשים המלמדים בארגון שלך
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,מפתח תוכנה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,מפתח תוכנה
 DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Course Scheduling Tool,Course Start Date,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +448,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
@@ -262,9 +259,8 @@
 DocType: Student Group Student,Student Group Student,סטודנט הקבוצה
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,אחרון
 DocType: Email Digest,New Quotations,ציטוטים חדשים
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 DocType: Tax Rule,Shipping County,מחוז משלוח
-apps/erpnext/erpnext/config/desktop.py +167,Learn,לִלמוֹד
+apps/erpnext/erpnext/config/desktop.py +159,Learn,לִלמוֹד
 DocType: Asset,Next Depreciation Date,תאריך הפחת הבא
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,עלות פעילות לעובדים
 DocType: Accounts Settings,Settings for Accounts,הגדרות עבור חשבונות
@@ -287,7 +283,7 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
 DocType: Opening Invoice Creation Tool,Invoice Type,סוג חשבונית
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,תעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,עלות נמכר נכס
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
@@ -306,7 +302,7 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
@@ -326,6 +322,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},מספר סידורי {0} אינו שייך לתעודת משלוח {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,הוסף פריטים
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,פריט איכות פיקוח פרמטר
+DocType: Leave Application,Leave Approver Name,השאר שם מאשר
 DocType: Depreciation Schedule,Schedule Date,תאריך לוח זמנים
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","רווח, פרשות רכיבי שכר אחרים"
 DocType: Packed Item,Packed Item,פריט ארוז
@@ -346,17 +343,16 @@
 DocType: Workstation,Consumable Cost,עלות מתכלה
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
 DocType: Student Log,Medical,רפואי
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,סיבה לאיבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,סיבה לאיבוד
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,הסכום שהוקצה לא יכול מעל לסכום ללא התאמות
 DocType: Announcement,Receiver,מַקְלֵט
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Lab Test Template,Single,אחת
 DocType: Account,Cost of Goods Sold,עלות מכר
-DocType: Subscription,Yearly,שנתי
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,נא להזין מרכז עלות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,נא להזין מרכז עלות
 DocType: Journal Entry Account,Sales Order,להזמין מכירות
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ממוצע. שיעור מכירה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,ממוצע. שיעור מכירה
 DocType: Assessment Plan,Examiner Name,שם הבודק
 DocType: Purchase Invoice Item,Quantity and Rate,כמות ושיעור
 DocType: Delivery Note,% Installed,% מותקן
@@ -376,7 +372,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
@@ -392,7 +388,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,שמורות למכירה
 DocType: Packing Slip,From Package No.,ממס החבילה
 DocType: Item Attribute,To Range,לטווח
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ניירות ערך ופיקדונות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,ניירות ערך ופיקדונות
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,סה&quot;כ עלים שהוקצו הוא חובה
 DocType: Job Opening,Description of a Job Opening,תיאור של פתיחת איוב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Pending activities for today,פעילויות ממתינים להיום
@@ -405,10 +401,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +33,The selected BOMs are not for the same item,בומס שנבחר אינו תמורת אותו הפריט
 DocType: Pricing Rule,Valid Upto,Upto חוקי
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,הכנסה ישירה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,הכנסה ישירה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,קצין מנהלי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,אנא בחר חברה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,קצין מנהלי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,אנא בחר חברה
 DocType: Stock Entry Detail,Difference Account,חשבון הבדל
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
@@ -440,7 +436,7 @@
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Payment Entry Reference,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),סגירה (Cr)
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,פריט העבר
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
@@ -459,7 +455,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +34,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ערכים מצטברים
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,הפוך להזמין מכירות
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
@@ -476,7 +472,7 @@
 DocType: Job Applicant,Resume Attachment,מצורף קורות חיים
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,חזור מכירות
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,חזור מכירות
 DocType: Announcement,Posted By,פורסם על ידי
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -485,13 +481,13 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,גליון חשבונית מכירות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,כתיבת הצעה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,כתיבת הצעה
 DocType: Payment Entry Deduction,Payment Entry Deduction,ניכוי קליט הוצאות
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,אדם אחר מכירות {0} קיים עם אותו זיהוי העובד
 apps/erpnext/erpnext/config/education.py +180,Masters,תואר שני
@@ -516,7 +512,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","חוקים ואז תמחור מסוננים החוצה על בסיס לקוחות, קבוצת לקוחות, טריטוריה, ספק, סוג של ספק, המבצע, שותף מכירות וכו '"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,מנהל
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,מנהל
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'מבוסס על-Based On' ו-'מקובץ על ידי-Group By' אינם יכולים להיות זהים.
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
 DocType: Installation Note,IN-,In-
@@ -547,11 +543,10 @@
 DocType: Work Order Operation,Actual Start Time,בפועל זמן התחלה
 DocType: BOM Operation,Operation Time,מבצע זמן
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,סִיוּם
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,לכתוב את הסכום
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,לכתוב את הסכום
 DocType: Leave Block List Allow,Allow User,לאפשר למשתמש
 DocType: Journal Entry,Bill No,ביל לא
 DocType: Company,Gain/Loss Account on Asset Disposal,חשבון רווח / הפסד בעת מימוש נכסים
-DocType: Subscription,Quarterly,הרבעונים
 DocType: Selling Settings,Delivery Note Required,תעודת משלוח חובה
 DocType: BOM Item,Basic Rate (Company Currency),שיעור בסיסי (חברת מטבע)
 DocType: Student Attendance,Student Attendance,נוכחות תלמידים
@@ -560,14 +555,14 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,קדם מכירות
 DocType: Instructor Log,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,שיווק
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,שיווק
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,כניסת תשלום כבר נוצר
 DocType: Purchase Receipt Item Supplied,Current Stock,מלאי נוכחי
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,חשבון {0} הוזן מספר פעמים
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/accounts/doctype/account/account.py +239,Company {0} does not exist,החברה {0} לא קיים
@@ -580,7 +575,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,התעופה והחלל
 DocType: Journal Entry,Credit Card Entry,כניסת כרטיס אשראי
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,החברה וחשבונות
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,ערך
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,ערך
 DocType: Lead,Campaign Name,שם מסע פרסום
 ,Reserved,שמורות
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
@@ -603,7 +598,7 @@
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,הצהרת משכורת חודשית.
 DocType: BOM,Website Specifications,מפרט אתר
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: החל מ- {0} מסוג {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: החל מ- {0} מסוג {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
 DocType: Student,A+,A +
@@ -640,25 +635,24 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,הגדרות ברירת מחדל עבור עגלת קניות
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},נכסים לגרוטאות באמצעות תנועת יומן {0}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ביוטכנולוגיה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,הוצאות משרד תחזוקה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,הוצאות משרד תחזוקה
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,אנא ראשון להיכנס פריט
 DocType: Account,Liability,אחריות
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
 DocType: Company,Default Cost of Goods Sold Account,עלות ברירת מחדל של חשבון מכר
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,מחיר המחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Request for Quotation Supplier,Send Email,שלח אי-מייל
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,אין אישור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +59,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את &quot;מלאי עדכון &#39;, כי פריטים אינם מועברים באמצעות {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,אף עובדים מצא
-DocType: Subscription,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
 DocType: SMS Center,All Customer Contact,כל קשרי הלקוחות
 DocType: Land Unit,Tree Details,עץ פרטים
@@ -687,7 +681,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,בכל קבוצות הפריט
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Work Order,Item To Manufacture,פריט לייצור
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} המצב הוא {2}
 DocType: Shopping Cart Settings,Enable Checkout,אפשר Checkout
@@ -695,12 +688,12 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;פתיחה&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Item Variant Attribute,Item Variant Attribute,תכונה Variant פריט
 ,Purchase Receipt Trends,מגמות קבלת רכישה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,מחקר ופיתוח
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,מחקר ופיתוח
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,הסכום להצעת החוק
 DocType: Company,Registration Details,פרטי רישום
 DocType: Item Reorder,Re-Order Qty,Re-להזמין כמות
@@ -709,7 +702,7 @@
 DocType: SMS Log,Requested Numbers,מספרים מבוקשים
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,הערכת ביצועים.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","&#39;השתמש עבור סל קניות&#39; האפשור, כמו סל הקניות מופעל ולא צריך להיות לפחות כלל מס אחד עבור סל קניות"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","קליטת הוצאות {0} מקושרת נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כפי מראש בחשבונית זו."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","קליטת הוצאות {0} מקושרת נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כפי מראש בחשבונית זו."
 DocType: Sales Invoice Item,Stock Details,פרטי מלאי
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,פרויקט ערך
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,נקודת מכירה
@@ -731,34 +724,34 @@
 DocType: Supplier Quotation,Is Subcontracted,האם קבלן
 DocType: Item Attribute,Item Attribute Values,ערכי תכונה פריט
 DocType: Examination Result,Examination Result,תוצאת בחינה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,קבלת רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,שער חליפין של מטבע שני.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},הפניה Doctype חייב להיות אחד {0}
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
 DocType: Work Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,שותפי מכירות טריטוריה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} חייב להיות פעיל
 DocType: Journal Entry,Depreciation Entry,כניסת פחת
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,חובה כמות
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ערך איזון
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,מחיר מחירון מכירות
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ערך איזון
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,מחיר מחירון מכירות
 DocType: Bank Reconciliation,Account Currency,מטבע חשבון
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,נא לציין לעגל חשבון בחברה
 DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 DocType: Item Barcode,Item Barcode,ברקוד פריט
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
 apps/erpnext/erpnext/config/accounts.py +246,Define budget for a financial year.,גדר תקציב עבור שנת כספים.
@@ -781,11 +774,11 @@
 DocType: Cheque Print Template,Has Print Format,יש פורמט להדפסה
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,הוא חובה. אולי שיא המרה לא נוצר ל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","לפריטים &#39;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","לפריטים &#39;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
 DocType: Student Admission,Publish on website,פרסם באתר
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,תאריך חשבונית ספק לא יכול להיות גדול מ תאריך פרסום
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,הכנסות עקיפות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,הכנסות עקיפות
 DocType: Cheque Print Template,Date Settings,הגדרות תאריך
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,שונות
 ,Company Name,שם חברה
@@ -805,11 +798,11 @@
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,הועבר
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,לבן
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,לבן
 DocType: SMS Center,All Lead (Open),כל הלידים (פתוח)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),שורה {0}: כמות אינה זמינה עבור {4} במחסן {1} בכל שעת הפרסום של כניסה ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,הפוך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,הפוך
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,סל הקניות שלי
@@ -819,7 +812,7 @@
 DocType: Program Enrollment Tool Student,Student Batch Name,שם תצווה סטודנטים
 DocType: Holiday List,Holiday List Name,שם רשימת החג
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,קורס לו&quot;ז
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,אופציות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +402,Qty for {0},כמות עבור {0}
@@ -831,23 +824,23 @@
 DocType: Company,Default Terms,תנאי ברירת מחדל
 DocType: Packing Slip Item,Packing Slip Item,פריט Slip אריזה
 DocType: Purchase Invoice,Cash/Bank Account,מזומנים / חשבון בנק
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Plan,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} אינו יכול להיות שלילי
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +567,Discount,דיסקונט
 DocType: Asset,Total Number of Depreciations,מספר כולל של פחת
 DocType: Workstation,Wages,שכר
 DocType: Agriculture Task,Urgent,דחוף
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},נא לציין מספר שורה תקפה לשורה {0} בטבלת {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},נא לציין מספר שורה תקפה לשורה {0} בטבלת {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,עבור לשולחן העבודה ולהתחיל להשתמש ERPNext
 DocType: Item,Manufacturer,יצרן
 DocType: Landed Cost Item,Purchase Receipt Item,פריט קבלת רכישה
 DocType: Purchase Receipt,PREC-RET-,PreC-RET-
 DocType: POS Profile,Sales Invoice Payment,תשלום חשבוניות מכירות
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,מחסן שמורות במכירות להזמין / סיום מוצרי מחסן
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,סכום מכירה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,סכום מכירה
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Share Transfer,Issue,נושא
 DocType: Asset,Scrapped,לגרוטאות
@@ -859,7 +852,7 @@
 DocType: Tax Rule,Shipping State,מדינת משלוח
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 DocType: Student,A-,א-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,הוצאות מכירה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,הוצאות מכירה
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
@@ -878,10 +871,10 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +27,To {0} | {1} {2},כדי {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,הצג את כל המוצרים
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,הצג את כל המוצרים
 DocType: Patient,Default Currency,מטבע ברירת מחדל
 DocType: Expense Claim,From Employee,מעובדים
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
 DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
@@ -915,7 +908,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,שום דבר לא לבקש
 DocType: Setup Progress Action,Domains,תחומים
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ניהול
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,ניהול
 DocType: Cheque Print Template,Payer Settings,גדרות משלמות
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","זה יצורף לקוד הפריט של הגרסה. לדוגמא, אם הקיצור שלך הוא ""SM"", ואת קוד הפריט הוא ""T-shirt"", קוד הפריט של הגרסה יהיה ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,חבילת נקי (במילים) תהיה גלויה ברגע שאתה לשמור את תלוש המשכורת.
@@ -923,12 +916,12 @@
 DocType: Price List Country,Price List Country,מחיר מחירון מדינה
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,קוד פריט לא ניתן לשנות למס 'סידורי
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,קוד פריט לא ניתן לשנות למס 'סידורי
 DocType: Purchase Invoice Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 DocType: Lead,Lead,לידים
@@ -948,14 +941,14 @@
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Purchase Invoice,Disable Rounded Total,"להשבית מעוגל סה""כ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,הרשומות' לא יכולות להיות ריקות'
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,הגדרת עובדים
 DocType: Sales Order,SO-,כך-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,אנא בחר תחילה קידומת
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,מחקר
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,מחקר
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Announcement,All Students,כל הסטודנטים
@@ -963,15 +956,15 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,שורת {0}: סוג פעילות חובה.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,דיבידנדים ששולם
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,דיבידנדים ששולם
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,החשבונאות לדג&#39;ר
 DocType: Stock Reconciliation,Difference Amount,סכום הבדל
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,עודפים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,עודפים
 DocType: BOM,Item Description,תיאור פריט
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +18,Payment Mode,שיטת תשלום
 DocType: Purchase Invoice,Supplied Items,פריטים שסופקו
@@ -979,11 +972,11 @@
 DocType: Work Order,Qty To Manufacture,כמות לייצור
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,לשמור על אותו קצב לאורך כל מחזור הרכישה
 DocType: Opportunity Item,Opportunity Item,פריט הזדמנות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,פתיחה זמנית
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,פתיחה זמנית
 ,Employee Leave Balance,עובד חופשת מאזן
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
 DocType: Patient Appointment,More Info,מידע נוסף
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},דרג הערכה הנדרשים פריט בשורת {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},דרג הערכה הנדרשים פריט בשורת {0}
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,דוגמה: שני במדעי המחשב
 DocType: Purchase Invoice,Rejected Warehouse,מחסן שנדחו
 DocType: GL Entry,Against Voucher,נגד שובר
@@ -997,7 +990,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,קטן
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,קטן
 DocType: Education Settings,Employee Number,מספר עובדים
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 DocType: Project,% Completed,% הושלם
@@ -1010,7 +1003,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Contract,חוזה
 DocType: Email Digest,Add Quote,להוסיף ציטוט
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,הוצאות עקיפות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 DocType: Agriculture Analysis Criteria,Agriculture,חקלאות
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1028,13 +1021,13 @@
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ציוד הון
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
 DocType: Item,ITEM-,פריט-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,יצירת תבנית הדפסה
@@ -1051,7 +1044,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +148,{0} items in progress,{0} פריטי התקדמות
 DocType: Workstation,Workstation Name,שם תחנת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
 DocType: Salary Slip,Bank Account No.,מס 'חשבון הבנק
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
@@ -1060,7 +1053,7 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,חישוב מסים וחיובים
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,בקשה להצעת מחיר הספק
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,חומרה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,חומרה
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,אנא בחר חברה
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Privilege Leave,זכות Leave
@@ -1082,14 +1075,14 @@
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},הסכום של נקודות לכל המטרות צריך להיות 100. זה {0}
 DocType: Project,Start and End Dates,תאריכי התחלה וסיום
 ,Delivered Items To Be Billed,פריטים נמסרו לחיוב
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,מחסן לא ניתן לשנות למס 'סידורי
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,מחסן לא ניתן לשנות למס 'סידורי
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
 DocType: Purchase Invoice Item,UOM,יחידת מידה
 DocType: Rename Tool,Utilities,Utilities
 DocType: POS Profile,Accounting,חשבונאות
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,לוחות זמנים פחת
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
 DocType: Activity Cost,Projects,פרויקטים
 DocType: Payment Request,Transaction Currency,מטבע עסקה
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},מ {0} | {1} {2}
@@ -1099,6 +1092,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,ממוצע יומי יוצא
 DocType: POS Profile,Campaign,קמפיין
 DocType: Supplier,Name and Type,שם וסוג
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"סטטוס אישור חייב להיות ""מאושר"" או ""נדחה"""
 DocType: Purchase Invoice,Contact Person,איש קשר
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'תאריך ההתחלה צפויה ""לא יכול להיות יותר מאשר' תאריך סיום צפוי  'גדול יותר"
 DocType: Course Scheduling Tool,Course End Date,תאריך סיום קורס
@@ -1108,17 +1102,17 @@
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,מDatetime
 DocType: Email Digest,For Company,לחברה
 apps/erpnext/erpnext/config/support.py +17,Communication log.,יומן תקשורת.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ&#39;ק יותר."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,סכום קנייה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,סכום קנייה
 DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,לא יכול להיות גדול מ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1134,10 +1128,10 @@
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,הגדרות הדפסה עודכנו מודפסות בהתאמה
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Apprentice
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,כמות שלילית אינה מותרת
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,כמות שלילית אינה מותרת
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",שולחן פירוט מס לכת מהפריט שני כמחרוזת ומאוחסן בתחום זה. משמש למסים וחיובים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","אם החשבון הוא קפוא, ערכים מותרים למשתמשים מוגבלים."
 DocType: Email Digest,Bank Balance,עובר ושב
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
@@ -1154,13 +1148,13 @@
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Asset Movement,Stock Manager,ניהול מלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Slip אריזה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,השכרת משרד
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Slip אריזה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,השכרת משרד
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,יבוא נכשל!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,אנליסט
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,אנליסט
 DocType: Item,Inventory,מלאי
 DocType: Item,Sales Details,פרטי מכירות
 DocType: Quality Inspection,QI-,QI-
@@ -1168,7 +1162,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,בכמות
 DocType: Notification Control,Expense Claim Rejected,תביעה נדחתה חשבון
 DocType: Item,Item Attribute,תכונה פריט
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ממשלה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ממשלה
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,שם המוסד
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,גרסאות פריט
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,שירותים
@@ -1186,7 +1180,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,תזרים מזומנים מהשקעות
 DocType: Program Course,Program Course,קורס תכנית
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,הוצאות הובלה והשילוח
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Homepage,Company Tagline for website homepage,חברת שורת תגים עבור בית של אתר
 DocType: Item Group,Item Group Name,שם קבוצת פריט
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי
@@ -1202,8 +1196,8 @@
 DocType: Landed Cost Voucher,Landed Cost Help,עזרה עלות נחתה
 DocType: Purchase Invoice,Select Shipping Address,כתובת משלוח בחר
 DocType: Leave Block List,Block Holidays on important days.,חגים בלוק בימים חשובים.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,חשבונות חייבים סיכום
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,חשבונות חייבים סיכום
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
 DocType: UOM,UOM Name,שם של אוני 'מישגן
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,סכום תרומה
 DocType: Purchase Invoice,Shipping Address,כתובת למשלוח
@@ -1240,18 +1234,18 @@
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,תביעות לחשבון חברה.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},# שורה {0}: תאריך עמילות {1} לא יכול להיות לפני תאריך המחאה {2}
 DocType: Company,Default Holiday List,ימי חופש ברירת מחדל
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,התחייבויות מניות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,התחייבויות מניות
 DocType: Purchase Invoice,Supplier Warehouse,מחסן ספק
 DocType: Opportunity,Contact Mobile No,לתקשר נייד לא
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
 DocType: Student Group,Set 0 for no limit,גדר 0 עבור שום מגבלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,שלח שוב דוא&quot;ל תשלום
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,הפוך הצעת מחיר
 apps/erpnext/erpnext/config/education.py +230,Other Reports,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
@@ -1268,12 +1262,11 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +68,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
 DocType: Account,Account Name,שם חשבון
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,לא {0} כמות סידורי {1} לא יכולה להיות חלק
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,לא {0} כמות סידורי {1} לא יכולה להיות חלק
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
-DocType: Subscription,Reference Document,מסמך ההפניה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
 DocType: Accounts Settings,Credit Controller,בקר אשראי
 DocType: Delivery Note,Vehicle Dispatch Date,תאריך שיגור רכב
@@ -1283,7 +1276,7 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% שחויבו
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,שמורות כמות
 DocType: Party Account,Party Account,חשבון המפלגה
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,משאבי אנוש
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,משאבי אנוש
 DocType: Lead,Upper Income,עליון הכנסה
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,לִדחוֹת
 DocType: Journal Entry Account,Debit in Company Currency,חיוב בחברת מטבע
@@ -1307,7 +1300,7 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} חייב להיות גדול מ 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,רֶכֶשׁ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,הפעיל אחריות
 ,Lead Details,פרטי לידים
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
@@ -1318,7 +1311,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,כולל חגים בתוך עלים כעלים
 DocType: Sales Invoice,Packed Items,פריטים ארוזים
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,הפעיל אחריות נגד מס 'סידורי
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;סה&quot;כ&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;סה&quot;כ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,אפשר סל קניות
 DocType: Employee,Permanent Address,כתובת קבועה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -1330,9 +1323,9 @@
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,הַגשָׁמָה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,הוצאות שיווק
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
@@ -1346,7 +1339,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
@@ -1373,7 +1366,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Purchase Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ראשי
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
@@ -1381,9 +1374,9 @@
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
 DocType: Sales Team,Contribution to Net Total,"תרומה לנטו סה""כ"
 DocType: Sales Invoice Item,Customer's Item Code,קוד הפריט של הלקוח
@@ -1395,16 +1388,16 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,מידע סטטוטורי ומידע כללי אחר על הספק שלך
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ערכות
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,תנאי עבור כלל משלוח
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,אנא להגדיר מסנן מבוסס על פריט או מחסן
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),משקל נטו של חבילה זו. (מחושב באופן אוטומטי כסכום של משקל נטו של פריטים)
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,תשלום
 DocType: Work Order Operation,Actual Time and Cost,זמן ועלות בפועל
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +56,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
 DocType: Course,Course Abbreviation,קיצור קורס
@@ -1417,7 +1410,7 @@
 DocType: Quality Inspection Reading,Reading 10,קריאת 10
 DocType: Hub Category,Hub Node,רכזת צומת
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,חבר
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,חבר
 DocType: Asset Movement,Asset Movement,תנועת נכסים
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
 DocType: SMS Center,Create Receiver List,צור מקלט רשימה
@@ -1433,8 +1426,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
 ,Sales Invoice Trends,מגמות חשבונית מכירות
 DocType: Leave Application,Apply / Approve Leaves,החל / אישור עלים
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,בשביל ש
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"יכול להתייחס שורה רק אם סוג תשלום הוא 'בסכום הקודם שורה' או 'שורה סה""כ קודמת """
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"יכול להתייחס שורה רק אם סוג תשלום הוא 'בסכום הקודם שורה' או 'שורה סה""כ קודמת """
 DocType: Sales Order Item,Delivery Warehouse,מחסן אספקה
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
 DocType: Serial No,Delivery Document No,משלוח מסמך לא
@@ -1460,12 +1452,12 @@
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,במילים יהיו גלוי ברגע שאתה לשמור את חשבונית המכירות.
 DocType: Item,Is Sales Item,האם פריט מכירות
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,פריט עץ הקבוצה
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,פריט {0} הוא לא התקנה למס סידורי. בדוק אדון פריט
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,פריט {0} הוא לא התקנה למס סידורי. בדוק אדון פריט
 DocType: Maintenance Visit,Maintenance Time,תחזוקת זמן
 ,Amount to Deliver,הסכום לאספקת
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,היו שגיאות.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,היו שגיאות.
 DocType: Naming Series,Current Value,ערך נוכחי
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
 ,Serial No Status,סטטוס מספר סידורי
@@ -1480,14 +1472,14 @@
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,חובות ומסים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,חובות ומסים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,נא להזין את תאריך הפניה
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,שולחן לפריט שיוצג באתר אינטרנט
 DocType: Purchase Order Item Supplied,Supplied Qty,כמות שסופק
 DocType: Purchase Order Item,Material Request Item,פריט בקשת חומר
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,עץ של קבוצות פריט.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
 DocType: Asset,Sold,נמכר
 ,Item-wise Purchase History,היסטוריה רכישת פריט-חכם
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
@@ -1497,7 +1489,7 @@
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,השקעות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,הקצבות
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,קריטריונים לקבלה
@@ -1515,7 +1507,7 @@
 DocType: Holiday List,Clear Table,לוח ברור
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
 DocType: Room,Room Name,שם חדר
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","השאר לא ניתן ליישם / בוטל לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","השאר לא ניתן ליישם / בוטל לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
 DocType: Activity Cost,Costing Rate,דרג תמחיר
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר
 DocType: Discussion,Discussion,דִיוּן
@@ -1556,14 +1548,14 @@
 DocType: Projects Settings,Timesheets,גליונות
 DocType: HR Settings,HR Settings,הגדרות HR
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"סה""כ בפועל"
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,יחידה
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,נא לציין את החברה
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,נא לציין את החברה
 ,Customer Acquisition and Loyalty,לקוחות רכישה ונאמנות
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,מחסן שבו אתה שומר מלאי של פריטים דחו
 DocType: POS Profile,Price List,מחיר מחירון
@@ -1575,13 +1567,13 @@
 DocType: Workstation,Wages per hour,שכר לשעה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},איזון המניה בתצווה {0} יהפוך שלילי {1} לפריט {2} במחסן {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,בעקבות בקשות חומר הועלה באופן אוטומטי המבוסס על הרמה מחדש כדי של הפריט
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
 DocType: Salary Component,Deduction,ניכוי
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
 DocType: Territory,Classification of Customers by region,סיווג של לקוחות מאזור לאזור
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +65,Difference Amount must be zero,סכום ההבדל חייב להיות אפס
@@ -1589,24 +1581,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +61,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,מאזן חשבון בנק מחושב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,משתמשים נכים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,הצעת מחיר
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,הצעת מחיר
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,סך ניכוי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,עלות עדכון
 DocType: Patient,Date of Birth,תאריך לידה
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,פריט {0} הוחזר כבר
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת לידים
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Work Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,תיאור התפקיד
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,תיאור התפקיד
 DocType: Student Applicant,Applied,אפלייד
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-פתוח
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-פתוח
 DocType: Sales Invoice Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
+DocType: Department Approver,Approver,מאשר
 ,SO Qty,SO כמות
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Asset Repair,Manufacturing Manager,ייצור מנהל
@@ -1614,11 +1607,11 @@
 apps/erpnext/erpnext/hooks.py +109,Shipments,משלוחים
 DocType: Payment Entry,Total Allocated Amount (Company Currency),הסכום כולל שהוקצה (חברת מטבע)
 DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
 DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע)
-DocType: Pricing Rule,Supplier,ספק
+DocType: Bank Guarantee,Supplier,ספק
 DocType: C-Form,Quarter,רבעון
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,הוצאות שונות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,הוצאות שונות
 DocType: Global Defaults,Default Company,חברת ברירת מחדל
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
 DocType: Cheque Print Template,Bank Name,שם בנק
@@ -1639,7 +1632,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.
 DocType: POS Profile,Taxes and Charges,מסים והיטלים ש
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","מוצר או שירות שנקנה, נמכר או מוחזק במלאי."
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"לא ניתן לבחור סוג תשלום כ'בסכום שורה הקודם ""או"" בסך הכל שורה הקודם 'לשורה הראשונה"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"לא ניתן לבחור סוג תשלום כ'בסכום שורה הקודם ""או"" בסך הכל שורה הקודם 'לשורה הראשונה"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,פריט ילד לא צריך להיות Bundle מוצר. אנא הסר פריט `{0}` ולשמור
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,בנקאות
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
@@ -1648,23 +1641,24 @@
 DocType: Fee Schedule,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,עץ חשבונות כספיים.
+DocType: Bank Guarantee,Reference Document Type,התייחסות סוג המסמך
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 DocType: Account,Fixed Asset,רכוש קבוע
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,מלאי בהמשכים
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 DocType: Sales Invoice,Total Billing Amount,סכום חיוב סה&quot;כ
 DocType: Fee Schedule,Receivable Account,חשבון חייבים
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
 DocType: Quotation Item,Stock Balance,יתרת מלאי
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,להזמין מכירות לתשלום
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,מנכ&quot;ל
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,מנכ&quot;ל
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,אנא בחר חשבון נכון
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,אנא בחר חשבון נכון
 DocType: Purchase Invoice Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Student,Blood Group,קבוצת דם
 DocType: Course,Course Name,שם קורס
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,משתמשים שיכולים לאשר בקשות החופשה של עובד ספציפי
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ציוד משרדי
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ציוד משרדי
 DocType: Purchase Invoice Item,Qty,כמות
 DocType: Fiscal Year,Companies,חברות
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,אלקטרוניקה
@@ -1675,14 +1669,14 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
 DocType: Stock Entry,Total Incoming Value,"ערך הנכנס סה""כ"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,חיוב נדרש
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,מחיר מחירון רכישה
 DocType: Job Offer Term,Offer Term,טווח הצעה
 DocType: Asset,Quality Manager,מנהל איכות
 DocType: Job Applicant,Job Opening,פתיחת עבודה
 DocType: Payment Reconciliation,Payment Reconciliation,פיוס תשלום
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +51,Technology,טכנולוגיה
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,"סה""כ חשבונית Amt"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,"סה""כ חשבונית Amt"
 DocType: Assessment Plan,To Time,לעת
 DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
@@ -1691,9 +1685,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
 DocType: Manufacturing Settings,Allow Overtime,לאפשר שעות נוספות
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} מספרים סידוריים הנדרשים לפריט {1}. שסיפקת {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} מספרים סידוריים הנדרשים לפריט {1}. שסיפקת {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,דרג הערכה נוכחי
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange רווח / הפסד
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange רווח / הפסד
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,כתובת חדשה
 DocType: Quality Inspection,Sample Size,גודל מדגם
@@ -1713,9 +1707,9 @@
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,החל עכשיו
 DocType: Sales Order,Not Delivered,לא נמסר
 ,Bank Clearance Summary,סיכום עמילות בנק
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
 DocType: Appraisal Goal,Appraisal Goal,מטרת הערכה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,בניינים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,בניינים
 DocType: Fee Schedule,Fee Structure,מבנה עמלות
 DocType: Timesheet Detail,Costing Amount,סכום תמחיר
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,שלח שכר Slip
@@ -1726,7 +1720,7 @@
 DocType: POS Profile,[Select],[בחר]
 DocType: SMS Log,Sent To,נשלח ל
 DocType: Payment Request,Make Sales Invoice,הפוך מכירות חשבונית
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,תוכנות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,תוכנות
 DocType: Company,For Reference Only.,לעיון בלבד.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +61,Invalid {0}: {1},לא חוקי {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
@@ -1737,7 +1731,7 @@
 DocType: Employee,Employment Details,פרטי תעסוקה
 DocType: Employee,New Workplace,חדש במקום העבודה
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,קבע כסגור
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},אין פריט ברקוד {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},אין פריט ברקוד {0}
 DocType: Item,Show a slideshow at the top of the page,הצג מצגת בחלק העליון של הדף
 apps/erpnext/erpnext/stock/doctype/item/item.py +162,Stores,חנויות
 DocType: Project Type,Projects Manager,מנהל פרויקטים
@@ -1748,15 +1742,14 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
 DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,חוזר
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,עקוב אחר הכנסות והוצאות נפרדות לאנכי מוצר או חטיבות.
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,מסמך זה חורג מהמגבלה על ידי {0} {1} עבור פריט {4}. האם אתה גורם אחר {3} נגד אותו {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1767,9 +1760,9 @@
 DocType: Quality Inspection,Verified By,מאומת על ידי
 apps/erpnext/erpnext/setup/doctype/company/company.py +78,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","לא ניתן לשנות את ברירת המחדל של המטבע של החברה, כי יש עסקות קיימות. עסקות יש לבטל לשנות את מטבע ברירת המחדל."
 DocType: Stock Entry,Purchase Receipt No,קבלת רכישה לא
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,דְמֵי קְדִימָה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,דְמֵי קְדִימָה
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,עקיב
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),מקור הכספים (התחייבויות)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),מקור הכספים (התחייבויות)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,עובד
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
@@ -1785,7 +1778,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,תלוש משכורת של עובד {0} נוצר כבר בתקופה זו
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,תרופות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,תרופות
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,עלות של פריטים שנרכשו
 DocType: Selling Settings,Sales Order Required,סדר הנדרש מכירות
 DocType: Purchase Invoice,Credit To,אשראי ל
@@ -1800,7 +1793,7 @@
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Gateway Account,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Off המפצה
 DocType: Job Offer,Accepted,קיבלתי
@@ -1808,11 +1801,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,תוצאות חיפוש
 DocType: Room,Room Number,מספר חדר
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,מהיר יומן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
@@ -1833,7 +1826,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,יְחִידַת מִידָה
 DocType: Fiscal Year,Year End Date,תאריך סיום שנה
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,הזדמנות
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,הזדמנות
 DocType: Operation,Default Workstation,Workstation ברירת המחדל
 DocType: Notification Control,Expense Claim Approved Message,הודעת תביעת הוצאות שאושרה
 DocType: Payment Entry,Deductions or Loss,ניכויים או הפסד
@@ -1859,9 +1852,9 @@
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,הפוך חשבונית
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
@@ -1894,14 +1887,14 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},רשומות דמי נוצר - {0}
 DocType: Asset Category Account,Asset Category Account,חשבון קטגורית נכסים
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
 apps/erpnext/erpnext/config/accounts.py +330,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
 DocType: Journal Entry,Credit Note,כְּתַב זְכוּיוֹת
 DocType: Warranty Claim,Service Address,כתובת שירות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ריהוט ואבזרים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,ריהוט ואבזרים
 DocType: Item,Manufacture,ייצור
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,אנא משלוח הערה ראשון
 DocType: Student Applicant,Application Date,תאריך הבקשה
@@ -1918,10 +1911,10 @@
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,אדון סניף ארגון.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,דווח על בעיה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,הוצאות שירות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,הוצאות שירות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-מעל
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,# השורה {0}: תנועת היומן {1} אין חשבון {2} או כבר מתאים נגד בשובר אחר
 DocType: Buying Settings,Default Buying Price List,מחיר מחירון קניית ברירת מחדל
@@ -1953,7 +1946,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 apps/erpnext/erpnext/config/hr.py +93,Payroll,גִלְיוֹן שָׂכָר
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
 DocType: Packing Slip,Identification of the package for the delivery (for print),זיהוי של החבילה למשלוח (להדפסה)
 DocType: Bin,Reserved Quantity,כמות שמורות
 DocType: Landed Cost Voucher,Purchase Receipt Items,פריטים קבלת רכישה
@@ -1962,7 +1955,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,תבנית לנכים אסור להיות תבנית ברירת המחדל
 DocType: Account,Income Account,חשבון הכנסות
 DocType: Payment Request,Amount in customer's currency,הסכום במטבע של הלקוח
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
 DocType: Payment Entry,Total Allocated Amount,סכום כולל שהוקצה
@@ -1970,7 +1963,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row {0}: UOM Conversion Factor is mandatory,שורת {0}: יחידת מידת המרת פקטור הוא חובה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,"נ""צ"
 DocType: Budget,Cost Center,מרכז עלות
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,# שובר
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,# שובר
 DocType: Notification Control,Purchase Order Message,הזמנת רכש Message
 DocType: Tax Rule,Shipping Country,מדינה משלוח
 DocType: Upload Attendance,Upload HTML,ההעלאה HTML
@@ -1978,16 +1971,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,מחסן ניתן לשנות רק באמצעות צילומים כניסה / תעודת משלוח / קבלת רכישה
 DocType: Employee Education,Class / Percentage,כיתה / אחוז
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ראש אגף השיווק ומכירות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ראש אגף השיווק ומכירות
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,מס הכנסה
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,רווח / הפסד בעת מימוש נכסים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,רווח / הפסד בעת מימוש נכסים
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,שם מרכז העלות חדש
@@ -2004,16 +1997,16 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} מושבתת
 DocType: Supplier,Billing Currency,מטבע חיוב
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,גדול במיוחד
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,גדול במיוחד
 ,Profit and Loss Statement,דוח רווח והפסד
 DocType: Bank Reconciliation Detail,Cheque Number,מספר המחאה
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,מקומי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),הלוואות ומקדמות (נכסים)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,חייבים
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,גדול
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,גדול
 DocType: Homepage Featured Product,Homepage Featured Product,מוצרי דף בית מומלצים
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,שם מחסן חדש
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),סה&quot;כ {0} ({1})
@@ -2027,7 +2020,7 @@
 DocType: Fees,Fees,אגרות
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ציין שער חליפין להמיר מטבע אחד לעוד
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ציטוט {0} יבוטל
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,סכום חוב סך הכל
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,סכום חוב סך הכל
 DocType: Sales Partner,Targets,יעדים
 DocType: Price List,Price List Master,מחיר מחירון Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
@@ -2058,10 +2051,10 @@
 1. Address and Contact of your Company.","תנאים והגבלות רגילים שניתן להוסיף למכירות ורכישות. דוגמאות: 1. זכאותה של ההצעה. 1. תנאי תשלום (מראש, באשראי, מראש חלק וכו '). 1. מהו נוסף (או שישולם על ידי הלקוח). אזהרה / שימוש 1. בטיחות. 1. אחריות אם בכלל. 1. החזרות מדיניות. 1. תנאי משלוח, אם קיימים. 1. דרכים להתמודדות עם סכסוכים, שיפוי, אחריות, וכו 'כתובת 1. ולתקשר של החברה שלך."
 DocType: Attendance,Leave Type,סוג החופשה
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"חשבון הוצאות / הבדל ({0}) חייב להיות חשבון ""רווח והפסד"""
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
 DocType: Packing Slip,If more than one package of the same type (for print),אם חבילה אחד או יותר מאותו הסוג (להדפסה)
 DocType: Warehouse,Parent Warehouse,מחסן הורה
-DocType: C-Form Invoice Detail,Net Total,"סה""כ נקי"
+DocType: Subscription,Net Total,"סה""כ נקי"
 DocType: Bin,FCFS Rate,FCFS שערי
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,כמות יוצאת דופן
 DocType: Project Task,Working,עבודה
@@ -2096,7 +2089,6 @@
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,אחוז הנחה יכול להיות מיושם גם נגד מחיר מחירון או לכל רשימת המחיר.
-DocType: Subscription,Half-yearly,חצי שנתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,פריט {0} אינו קיים
@@ -2105,7 +2097,7 @@
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
 DocType: Account,Root Type,סוג השורש
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},# השורה {0}: לא יכול לחזור יותר מ {1} לפריט {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},# השורה {0}: לא יכול לחזור יותר מ {1} לפריט {2}
 DocType: Item Group,Show this slideshow at the top of the page,הצג מצגת זו בחלק העליון של הדף
 DocType: BOM,Item UOM,פריט של אוני 'מישגן
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),סכום מס לאחר סכום דיסקונט (חברת מטבע)
@@ -2113,8 +2105,8 @@
 DocType: Cheque Print Template,Primary Settings,הגדרות ראשיות
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: Purchase Invoice Item,Quality Inspection,איכות פיקוח
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,קטן במיוחד
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 DocType: Payment Request,Mute Email,דוא&quot;ל השתקה
@@ -2130,16 +2122,16 @@
 DocType: SMS Log,No of Sent SMS,לא של SMS שנשלח
 DocType: Account,Expense Account,חשבון הוצאות
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,תוכנה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,צבע
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,צבע
 DocType: Patient Appointment,Scheduled,מתוכנן
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,בקשה לציטוט.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,מטבע מחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,מטבע מחירון לא נבחר
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,תאריך התחלת פרויקט
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,עד
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,עד
 DocType: Rename Tool,Rename Log,שינוי שם התחבר
 DocType: Maintenance Visit Purpose,Against Document No,נגד מסמך לא
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ניהול שותפי מכירות.
@@ -2149,21 +2141,21 @@
 DocType: C-Form,C-Form No,C-טופס לא
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,נוכחות לא מסומנת
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,חוקר
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,חוקר
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,סטודנט כלי הרשמה לתכנית
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,שם או דוא&quot;ל הוא חובה
 DocType: Purchase Order Item,Returned Qty,כמות חזר
 DocType: Student,Exit,יציאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +156,Root Type is mandatory,סוג השורש הוא חובה
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,מספר סידורי {0} נוצר
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,מספר סידורי {0} נוצר
 DocType: Homepage,Company Description for website homepage,תיאור החברה עבור הבית של האתר
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","לנוחות לקוחות, ניתן להשתמש בקודים אלה בפורמטי הדפסה כמו הערות חשבוניות ומשלוח"
 DocType: Sales Invoice,Time Sheet List,רשימת גיליון זמן
 DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
 DocType: Asset Category Account,Depreciation Expense Account,חשבון הוצאות פחת
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,תקופת ניסיון
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,תקופת ניסיון
 DocType: Customer Group,Only leaf nodes are allowed in transaction,רק צמתים עלה מותר בעסקה
-DocType: Employee Advance,Expense Approver,מאשר חשבון
+DocType: Department,Expense Approver,מאשר חשבון
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,שורת {0}: מראש נגד הלקוח חייב להיות אשראי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ללא מקבוצה לקבוצה
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
@@ -2171,14 +2163,14 @@
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,פעילויות ממתינות ל
 DocType: Fee Component,Fees Category,קטגורית אגרות
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,נא להזין את הקלת מועד.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,נא להזין את הקלת מועד.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,בחר שנת כספים
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},מחיר הפריט עודכן עבור {0} ב מחירון {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},מחיר הפריט עודכן עבור {0} ב מחירון {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
 DocType: Purchase Invoice Item,Accepted Warehouse,מחסן מקובל
@@ -2186,10 +2178,10 @@
 DocType: Item,Valuation Method,שיטת הערכת שווי
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,יום חצי מארק
 DocType: Sales Invoice,Sales Team,צוות מכירות
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,כניסה כפולה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,כניסה כפולה
 DocType: Program Enrollment Tool,Get Students,קבל סטודנטים
 DocType: Serial No,Under Warranty,במסגרת אחריות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[שגיאה]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
 apps/erpnext/erpnext/controllers/status_updater.py +213,Limit Crossed,הגבל Crossed
@@ -2201,7 +2193,7 @@
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
 DocType: Shopping Cart Settings,Orders,הזמנות
-DocType: Employee Leave Approver,Leave Approver,השאר מאשר
+DocType: Department,Leave Approver,השאר מאשר
 DocType: Manufacturing Settings,Material Transferred for Manufacture,חומר הועבר לייצור
 DocType: Landed Cost Item,Receipt Document Type,סוג מסמך קבלה
 DocType: Target Detail,Target Detail,פרט היעד
@@ -2252,11 +2244,11 @@
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),"סגירה (ד""ר)"
 DocType: Cheque Print Template,Cheque Size,גודל מחאה
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
 DocType: Sales Invoice,Write Off Outstanding Amount,לכתוב את הסכום מצטיין
 DocType: Stock Settings,Default Stock UOM,ברירת מחדל יחידת מידה
@@ -2269,7 +2261,7 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,סכום חיוב
 DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,כדי סגור לא ניתן לבטל. חוסר קרבה לבטל.
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#39; לא ניתן לבדוק למכירת נכס קבועה
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#39; לא ניתן לבדוק למכירת נכס קבועה
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,קבל עדכונים
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +166,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
@@ -2278,7 +2270,7 @@
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
 DocType: Lead,Lower Income,הכנסה נמוכה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
@@ -2305,13 +2297,13 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,בנק משייך יתר חשבון
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,בנק משייך יתר חשבון
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,הפוך שכר Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,העיון BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,הלוואות מובטחות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,הלוואות מובטחות
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},אנא להגדיר חשבונות הקשורים פחת קטגוריה Asset {0} או החברה {1}
 DocType: Academic Term,Academic Year,שנה אקדמית
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,הון עצמי יתרה פתיחה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,הון עצמי יתרה פתיחה
 DocType: Lead,CRM,CRM
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,נוֹתָר
 DocType: Appraisal,Appraisal,הערכה
@@ -2353,9 +2345,10 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Cheque Print Template,Cheque Height,גובה המחאה
 DocType: Supplier,Supplier Details,פרטי ספק
+DocType: Expense Claim,Approval Status,סטטוס אישור
 DocType: Hub Settings,Publish Items to Hub,לפרסם פריטים לHub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},מהערך חייב להיות פחות משווי בשורת {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,העברה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,סמן הכל
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,קבוצת לקוחות / לקוחות
@@ -2371,7 +2364,7 @@
 DocType: Purchase Order Item Supplied,Stock UOM,המניה של אוני 'מישגן
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,צפוי
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ועל-הזמנה לפריט {0} ככמות או כמות היא 0
 DocType: Notification Control,Quotation Message,הודעת ציטוט
 DocType: Issue,Opening Date,תאריך פתיחה
@@ -2411,7 +2404,7 @@
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),חייבים ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,לקוחות חדשים
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% רווח גולמי
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,% רווח גולמי
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,תאריך אישור
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
@@ -2424,7 +2417,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
 DocType: Asset Movement,Source Warehouse,מחסן מקור
 DocType: Installation Note,Installation Date,התקנת תאריך
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
 DocType: Employee,Confirmation Date,תאריך אישור
 DocType: C-Form,Total Invoiced Amount,"סכום חשבונית סה""כ"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +50,Min Qty can not be greater than Max Qty,דקות כמות לא יכולה להיות גדולה יותר מכמות מקס
@@ -2437,7 +2430,7 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,כמות אצווה זמינה ממחסן
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM הנוכחי והחדש BOM אינו יכולים להיות זהים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% נמסר
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
@@ -2451,11 +2444,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +94,Company Name cannot be Company,שם חברה לא יכול להיות חברה
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ראשי מכתב לתבניות הדפסה.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,כותרות לתבניות הדפסה למשל פרופורמה חשבונית.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
 DocType: POS Profile,Update Stock,בורסת עדכון
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 DocType: Membership,Payment Details,פרטי תשלום
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM שערי
 DocType: Asset,Journal Entry for Scrap,תנועת יומן עבור גרוטאות
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
@@ -2478,7 +2471,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange רווח / והפסד
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,עובד ונוכחות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},למטרה צריך להיות אחד {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,מלא את הטופס ולשמור אותו
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,מלא את הטופס ולשמור אותו
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,פורום הקהילה
 DocType: Leave Application,Leave Balance Before Application,השאר מאזן לפני היישום
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +46,Send SMS,שלח SMS
@@ -2488,7 +2481,7 @@
 DocType: Hotel Room Amenity,Billable,לחיוב
 DocType: Lab Test Template,Standard Selling Rate,מכירה אחידה דרג
 DocType: Account,Rate at which this tax is applied,קצב שבו מס זה מיושם
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,סדר מחדש כמות
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,סדר מחדש כמות
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,משרות נוכחיות
 DocType: Company,Stock Adjustment Account,חשבון התאמת מלאי
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,לכתוב את
@@ -2520,7 +2513,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,הרשמה לתכנית דמים
 DocType: Item,Supplier Items,פריטים ספק
 DocType: Opportunity,Opportunity Type,סוג ההזדמנות
@@ -2530,10 +2523,10 @@
 DocType: Cheque Print Template,Cheque Width,רוחב המחאה
 DocType: Fee Schedule,Fee Schedule,בתוספת דמי
 DocType: Hub Settings,Publish Availability,פרסם זמינים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,התיישנות מלאי
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,לוח זמנים
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Cheque Print Template,Scanned Cheque,המחאה סרוקה
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
@@ -2542,7 +2535,7 @@
 DocType: Warranty Claim,Item and Warranty Details,פרטי פריט ואחריות
 DocType: Sales Team,Contribution (%),תרומה (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +102,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,אחריות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,אחריות
 DocType: Expense Claim Account,Expense Claim Account,חשבון תביעת הוצאות
 DocType: Sales Person,Sales Person Name,שם איש מכירות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,נא להזין atleast חשבונית 1 בטבלה
@@ -2557,7 +2550,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
 DocType: Item,Default BOM,BOM ברירת המחדל
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,"סה""כ מצטיין Amt"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,"סה""כ מצטיין Amt"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,רכב
@@ -2576,11 +2569,11 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 DocType: Bank Reconciliation Detail,Payment Document,מסמך תשלום
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מתאריך לידה
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מתאריך לידה
 DocType: Salary Slip,Salary Structure,שכר מבנה
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ציטוטים
@@ -2606,7 +2599,7 @@
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Assessment Plan,Supervisor Name,המפקח שם
@@ -2619,13 +2612,13 @@
 DocType: Journal Entry,Print Heading,כותרת הדפסה
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,"סה""כ לא יכול להיות אפס"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,מספר הימים מההזמנה האחרונה 'חייב להיות גדול או שווה לאפס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,חומר גלם
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,חומר גלם
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,צמחי Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,צמחי Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
 DocType: Payment Entry,Internal Transfer,העברה פנימית
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,כך או כמות היעד או סכום היעד היא חובה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
 DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,מרכז עלות בעסקות קיימות לא ניתן להמיר לדג'ר
@@ -2634,8 +2627,8 @@
 DocType: Item,Item Code for Suppliers,קוד פריט לספקים
 DocType: Issue,Raised By (Email),"הועלה על ידי (דוא""ל)"
 DocType: Mode of Payment,General,כללי
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"לא ניתן לנכות כאשר לקטגוריה 'הערכה' או 'הערכה וסה""כ'"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"לא ניתן לנכות כאשר לקטגוריה 'הערכה' או 'הערכה וסה""כ'"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
 DocType: Journal Entry,Bank Entry,בנק כניסה
 DocType: Authorization Rule,Applicable To (Designation),כדי ישים (ייעוד)
@@ -2643,16 +2636,16 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,קבוצה על ידי
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 DocType: Production Plan,Get Material Request,קבל בקשת חומר
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,הוצאות דואר
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,הוצאות דואר
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),"סה""כ (AMT)"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,"הווה סה""כ"
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,דוחות חשבונאות
 DocType: Drug Prescription,Hour,שעה
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},יכול להיות מאושר על ידי {0}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,לא ידוע
@@ -2716,10 +2709,10 @@
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Tax Rule,Billing State,מדינת חיוב
 DocType: Share Transfer,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
@@ -2734,7 +2727,7 @@
 DocType: Cheque Print Template,Message to show,הודעה להראות
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Retail
 DocType: Student Attendance,Absent,נעדר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle מוצר
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Timesheet,TS-,TS-
@@ -2743,17 +2736,16 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,קוד פריט חומר הגלם
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
 DocType: Stock Settings,Show Barcode Field,הצג ברקוד שדה
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
 DocType: Timesheet,Employee Detail,פרט לעובדים
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,הגדרות עבור הבית של האתר
 DocType: Job Offer,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,מעל
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 DocType: Chapter,Region,אזור
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","לדוגמה: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
@@ -2766,7 +2758,7 @@
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,לא נמצא רשומה
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,עלות לגרוטאות נכסים
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 DocType: Asset,Straight Line,קו ישר
 DocType: Project User,Project User,משתמש פרויקט
 DocType: GL Entry,Is Advance,האם Advance
@@ -2786,35 +2778,35 @@
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ציין תנאים לחישוב סכום משלוח
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,תפקיד רשאי לקבוע קפואים חשבונות ורשומים קפואים עריכה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,לא ניתן להמיר מרכז עלות לחשבונות שכן יש צמתים ילד
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ערך פתיחה
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,סידורי #
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,עמלה על מכירות
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ערך פתיחה
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,סידורי #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,עמלה על מכירות
 DocType: Job Offer Term,Value / Description,ערך / תיאור
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 DocType: Tax Rule,Billing Country,ארץ חיוב
 DocType: Purchase Order Item,Expected Delivery Date,תאריך אספקה צפוי
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,הוצאות בידור
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,הוצאות בידור
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Consultation,Age,גיל
 DocType: Sales Invoice Timesheet,Billing Amount,סכום חיוב
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,כמות לא חוקית שצוינה עבור פריט {0}. כמות צריכה להיות גדולה מ -0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,בקשות לחופשה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,הוצאות משפטיות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,הוצאות משפטיות
 DocType: Purchase Invoice,Posting Time,זמן פרסום
 DocType: Timesheet,% Amount Billed,% סכום החיוב
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,הוצאות טלפון
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,הוצאות טלפון
 DocType: Sales Partner,Logo,לוגו
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,לבדוק את זה אם אתה רוצה להכריח את המשתמש לבחור סדרה לפני השמירה. לא יהיה ברירת מחדל אם תבדקו את זה.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
 DocType: Email Digest,Open Notifications,הודעות פתוחות
 DocType: Payment Entry,Difference Amount (Company Currency),סכום פרש (חברת מטבע)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,הוצאות ישירות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,הוצאות ישירות
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,הכנסות מלקוחות חדשות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,הוצאות נסיעה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +106,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
@@ -2825,10 +2817,10 @@
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,מרכיבי שכר
 DocType: Program Enrollment Tool,New Academic Year,חדש שנה אקדמית
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,"סכום ששולם סה""כ"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,"סכום ששולם סה""כ"
 DocType: Work Order Item,Transferred Qty,כמות שהועברה
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ניווט
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,תכנון
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,תכנון
 DocType: Share Balance,Issued,הפיק
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ספק זיהוי
 DocType: Payment Request,Payment Gateway Details,פרטי תשלום Gateway
@@ -2840,7 +2832,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","סוג של עלים כמו מזדמן, חולה וכו '"
 DocType: Email Digest,Send regular summary reports via Email.,"שלח דוחות סיכום קבועים באמצעות דוא""ל."
 DocType: Payment Entry,PE-,פ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},אנא להגדיר חשבון ברירת מחדל סוג תביעת הוצאות {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},אנא להגדיר חשבון ברירת מחדל סוג תביעת הוצאות {0}
 DocType: Assessment Result,Student Name,שם תלמיד
 DocType: Brand,Item Manager,מנהל פריט
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
@@ -2862,9 +2854,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,בכל קבוצות הלקוחות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,בכל קבוצות הלקוחות
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,מצטבר חודשי
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,תבנית מס היא חובה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
@@ -2872,19 +2864,19 @@
 DocType: Account,Temporary,זמני
 DocType: Program,Courses,קורסים
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,מזכיר
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,מזכיר
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","אם להשבית, &#39;במילים&#39; שדה לא יהיה גלוי בכל עסקה"
 DocType: Serial No,Distinct unit of an Item,יחידה נפרדת של פריט
 DocType: Pricing Rule,Buying,קנייה
 DocType: HR Settings,Employee Records to be created by,רשומות עובדים שנוצרו על ידי
 DocType: POS Profile,Apply Discount On,החל דיסקונט ב
 ,Reqd By Date,Reqd לפי תאריך
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,נושים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,נושים
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,# השורה {0}: מספר סידורי הוא חובה
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,פריט Detail המס וייז
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,קיצור המכון
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
@@ -2918,13 +2910,13 @@
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,משאבי אנוש
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,תשלום פיוס תשלום
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,נכסי מסים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,נכסי מסים
 DocType: BOM Item,BOM No,BOM לא
 DocType: Instructor,INS/,אח&quot;י /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Update Tool,The BOM which will be replaced,BOM אשר יוחלף
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ציוד אלקטרוני
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ציוד אלקטרוני
 DocType: Account,Debit,חיוב
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
 DocType: Work Order,Operation Cost,עלות מבצע
@@ -2932,16 +2924,15 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amt מצטיין
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,קבוצה חכמה פריט יעדים שנקבעו לאיש מכירות זה.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],מניות הקפאת Older Than [ימים]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,# השורה {0}: לנכסי לקוחות חובה לרכוש נכס קבוע / מכירה
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,# השורה {0}: לנכסי לקוחות חובה לרכוש נכס קבוע / מכירה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","אם שניים או יותר כללי תמחור נמצאים בהתבסס על התנאים לעיל, עדיפות מיושם. עדיפות היא מספר בין 0 ל 20, וערך ברירת מחדל הוא אפס (ריק). מספר גבוה יותר פירושו הם הקובעים אם יש כללי תמחור מרובים עם אותם תנאים."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,שנת כספים: {0} אינו קיים
 DocType: Currency Exchange,To Currency,למטבע
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,לאפשר למשתמשים הבאים לאשר בקשות לצאת לימי גוש.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,סוגים של תביעת הוצאות.
-DocType: Item,Taxes,מסים
+DocType: Subscription,Taxes,מסים
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,שילם ולא נמסר
 DocType: Project,Default Cost Center,מרכז עלות ברירת מחדל
-DocType: Bank Guarantee,End Date,תאריך סיום
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,והתאמות מלאות
 DocType: Budget,Budget Accounts,חשבונות תקציב
 DocType: Employee,Internal Work History,היסטוריה עבודה פנימית
@@ -2959,7 +2950,7 @@
 ,Employee Information,מידע לעובדים
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
@@ -2978,21 +2969,21 @@
 DocType: Purchase Order,To Bill,להצעת החוק
 DocType: Material Request,% Ordered,% מסודר
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ממוצע. שיעור קנייה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ידיעונים
 DocType: Stock Ledger Entry,Stock Ledger Entry,מניית דג'ר כניסה
 DocType: Department,Leave Block List,השאר בלוק רשימה
 DocType: Purchase Invoice,Tax ID,זיהוי מס
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,פריט {0} הוא לא התקנה למס סידורי. טור חייב להיות ריק
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,פריט {0} הוא לא התקנה למס סידורי. טור חייב להיות ריק
 DocType: Accounts Settings,Accounts Settings,חשבונות הגדרות
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,לְאַשֵׁר
 DocType: Customer,Sales Partner and Commission,פרטנר מכירות והוועדה
 DocType: Opportunity,To Discuss,כדי לדון ב
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} יחידות של {1} צורך {2} כדי להשלים את העסקה הזו.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,חשבונות זמניים
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,שחור
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,חשבונות זמניים
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,שחור
 DocType: BOM Explosion Item,BOM Explosion Item,פריט פיצוץ BOM
 DocType: Account,Auditor,מבקר
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} פריטים המיוצרים
@@ -3006,7 +2997,7 @@
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +585,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,הוספת פריטים מ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,הוספת פריטים מ
 DocType: Cheque Print Template,Regular,רגיל
 DocType: Purchase Order Item,Last Purchase Rate,שער רכישה אחרונה
 DocType: Account,Asset,נכס
@@ -3024,7 +3015,7 @@
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,ניהול איכות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,ניהול איכות
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,פריט {0} הושבה
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
@@ -3037,7 +3028,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},# השורה {0}: קונפליקטים תזמונים עם שורת {1}
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,חשבונות Gateway התקנה.
 DocType: Employee,Employment Type,סוג התעסוקה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,רכוש קבוע
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,רכוש קבוע
 DocType: Payment Entry,Set Exchange Gain / Loss,הגדר Exchange רווח / הפסד
 ,Cash Flow,תזרים מזומנים
 DocType: Item Group,Default Expense Account,חשבון הוצאות ברירת המחדל
@@ -3049,7 +3040,6 @@
 DocType: Account,Stock Adjustment,התאמת מלאי
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
 DocType: Work Order,Planned Operating Cost,עלות הפעלה מתוכננת
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,מאזן חשבון בנק בהתאם לכללי לדג&#39;ר
 DocType: Job Applicant,Applicant Name,שם מבקש
 DocType: Authorization Rule,Customer / Item Name,לקוחות / שם פריט
@@ -3076,9 +3066,9 @@
 DocType: Announcement,Announcement,הַכרָזָה
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,הפצה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,מנהל פרויקט
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,מנהל פרויקט
 ,Quoted Item Comparison,פריט מצוטט השוואה
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,שדר
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,שווי הנכסי נקי כמו על
 DocType: Hotel Settings,Default Taxes and Charges,מסים והיטלים שברירת מחדל
@@ -3106,7 +3096,7 @@
 DocType: Leave Block List,Applies to Company,חל על חברה
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
 DocType: Purchase Invoice,In Words,במילים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
 DocType: Sales Order Item,For Production,להפקה
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,צפה במשימה
@@ -3118,7 +3108,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 DocType: Pricing Rule,Margin Rate or Amount,שיעור או סכום שולי
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'עד תאריך' נדרש
@@ -3131,10 +3121,10 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
 DocType: Salary Slip,Net Pay,חבילת נקי
 DocType: Cash Flow Mapping Accounts,Account,חשבון
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
 ,Requested Items To Be Transferred,פריטים מבוקשים שיועברו
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1352,Delete permanently?,למחוק לצמיתות?
@@ -3158,10 +3148,9 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","כל דברים אחרים, מאמץ ראוי לציון שצריכה ללכת ברשומות."
 DocType: Asset Maintenance,Manufacturing User,משתמש ייצור
 DocType: Purchase Invoice,Raw Materials Supplied,חומרי גלם הסופק
-DocType: C-Form,Series,סדרה
 DocType: Appraisal,Appraisal Template,הערכת תבנית
 DocType: Item Group,Item Classification,סיווג פריט
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,מנהל פיתוח עסקי
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,מנהל פיתוח עסקי
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,מטרת התחזוקה בקר
 DocType: Crop,Period,תקופה
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,בכלל לדג'ר
@@ -3170,16 +3159,16 @@
 DocType: Item Attribute Value,Attribute Value,תכונה ערך
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 DocType: Salary Detail,Salary Detail,פרטי שכר
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,אנא בחר {0} ראשון
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,אנא בחר {0} ראשון
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
 DocType: Sales Invoice,Commission,הוועדה
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,זמן גיליון לייצור.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,סיכום ביניים
 DocType: Salary Detail,Default Amount,סכום ברירת מחדל
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,מחסן לא נמצא במערכת
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,מחסן לא נמצא במערכת
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,סיכום של החודש
 DocType: Quality Inspection Reading,Quality Inspection Reading,איכות פיקוח קריאה
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
 DocType: Tax Rule,Purchase Tax Template,מס רכישת תבנית
 ,Project wise Stock Tracking,מעקב מלאי חכם פרויקט
 DocType: Stock Entry Detail,Actual Qty (at source/target),כמות בפועל (במקור / יעד)
@@ -3201,7 +3190,6 @@
 DocType: Program,Program Abbreviation,קיצור התוכנית
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
 DocType: Warranty Claim,Resolved By,נפתר על ידי
-DocType: Bank Guarantee,Start Date,תאריך ההתחלה
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,להקצות עלים לתקופה.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,המחאות ופיקדונות פינו באופן שגוי
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,חשבון {0}: לא ניתן להקצות את עצמו כחשבון אב
@@ -3219,7 +3207,6 @@
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,פעולה אם שנצבר חודשי תקציב חריג
-DocType: Subscription,Submit on creation,שלח על יצירה
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
 DocType: Asset,Disposal Date,תאריך סילוק
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
@@ -3239,7 +3226,7 @@
 DocType: Account,Income,הכנסה
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,משהו השתבש!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,שנת הכספים {0} לא קיים
 DocType: Asset Maintenance Log,Completion Date,תאריך סיום
@@ -3249,11 +3236,11 @@
 apps/erpnext/erpnext/config/hr.py +238,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,נא להזין את ההודעה לפני השליחה
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,"הלוואות בחו""ל"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,"הלוואות בחו""ל"
 DocType: Cost Center,Cost Center Name,שם מרכז עלות
 DocType: Student,B+,B +
 DocType: Maintenance Schedule Detail,Scheduled Date,תאריך מתוכנן
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,"Amt שילם סה""כ"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,"Amt שילם סה""כ"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,הודעות יותר מ -160 תווים יפוצלו למספר הודעות
 DocType: Purchase Receipt Item,Received and Accepted,קיבלתי ואשר
 ,Serial No Service Contract Expiry,שירות סידורי חוזה תפוגה
@@ -3284,21 +3271,21 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +84,To Warehouse,למחסן
 ,Average Commission Rate,שערי העמלה הממוצעת
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,חשמל
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,נכסים במלאי
 DocType: Target Detail,Target Qty,יעד כמות
 DocType: Shopping Cart Settings,Checkout Settings,הגדרות Checkout
 DocType: Student Attendance,Present,הווה
@@ -3307,9 +3294,9 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
 DocType: Production Plan Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,צור תלושי שכר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","קנייה יש לבדוק, אם לישים שנבחרה הוא {0}"
@@ -3351,7 +3338,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,שם חשבון חדש
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,עלות חומרי גלם הסופק
 DocType: Selling Settings,Settings for Selling Module,הגדרות עבור מכירת מודול
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,שירות לקוחות
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,שירות לקוחות
 DocType: BOM,Thumbnail,תמונה ממוזערת
 DocType: Item Customer Detail,Item Customer Detail,פרט לקוחות פריט
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,מועמד הצעת עבודה.
@@ -3367,7 +3354,7 @@
 DocType: Sales Order,Printing Details,הדפסת פרטים
 DocType: Task,Closing Date,תאריך סגירה
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,מהנדס
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,מהנדס
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,הרכבות תת חיפוש
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
@@ -3399,7 +3386,7 @@
 DocType: Request for Quotation Supplier,Download PDF,הורד PDF
 DocType: Work Order,Planned End Date,תאריך סיום מתוכנן
 DocType: Request for Quotation,Supplier Detail,פרטי ספק
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,סכום חשבונית
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,סכום חשבונית
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,נוכחות
 DocType: BOM,Materials,חומרים
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","אם לא בדק, הרשימה תצטרך להוסיף לכל מחלקה שבה יש ליישם."
@@ -3416,12 +3403,12 @@
 apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} וזאת במדרגות של {3} עבור פריט {4}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,הוצאות הנהלה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,הוצאות הנהלה
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ייעוץ
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,תקופת הודעה
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,תקופת הודעה
 DocType: Asset Category,Asset Category Name,שם קטגוריה נכסים
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,זהו שטח שורש ולא ניתן לערוך.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ניו איש מכירות שם
@@ -3429,13 +3416,13 @@
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
 DocType: Bin,Reserved Qty for Production,שמורות כמות עבור הפקה
 DocType: Asset,Frequency of Depreciation (Months),תדירות הפחת (חודשים)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,חשבון אשראי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,נא להזין מרכז עלות הורה
@@ -3454,7 +3441,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,לא פג תוקף
 DocType: Journal Entry,Total Debit,"חיוב סה""כ"
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,מחסן מוצרים מוגמר ברירת מחדל
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,איש מכירות
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,איש מכירות
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,תקציב מרכז עלות
 DocType: Vehicle Service,Half Yearly,חצי שנתי
 DocType: Lead,Blog Subscriber,Subscriber בלוג
@@ -3464,7 +3451,7 @@
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,קבע כאבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,קבע כאבוד
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,הערה קבלת תשלום
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,זה מבוסס על עסקאות מול לקוח זה. ראה את ציר הזמן מתחת לפרטים
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},שורת {0}: סכום שהוקצה {1} חייב להיות קטן או שווה לסכום קליט הוצאות {2}
@@ -3478,7 +3465,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,בחר או הוסף לקוח חדש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,זה מבוסס על הנוכחות של העובד
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,חשבון חיוב
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Purchase Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
@@ -3487,15 +3474,15 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,להפסיק ממשתמשים לבצע יישומי חופשה בימים שלאחר מכן.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,סכום הרכישה
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,הצעת מחיר הספק {0} נוצר
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,הטבות לעובדים
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,הטבות לעובדים
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Work Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 DocType: Assessment Plan,Schedule,לוח זמנים
 DocType: Account,Parent Account,חשבון הורה
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +295,Available,זמין
@@ -3512,10 +3499,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},שורה {0}: מסיבה / חשבון אינו תואם עם {1} / {2} {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,נא להזין את חשבון הוצאות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,מלאי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
 DocType: Employee,Current Address,כתובת נוכחית
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","אם פריט הנו נגזר של פריט נוסף לאחר מכן תיאור, תמונה, תמחור, וכו 'ייקבעו מסים מהתבנית אלא אם צוין במפורש"
 DocType: Serial No,Purchase / Manufacture Details,רכישה / פרטי ייצור
@@ -3546,22 +3534,22 @@
 DocType: POS Profile,POS Profile,פרופיל קופה
 apps/erpnext/erpnext/hooks.py +151,Admission,הוֹדָאָה
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
 DocType: Asset,Asset Category,קטגורית נכסים
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,שכר נטו לא יכול להיות שלילי
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,חומר לספקים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,בלו חשבונית
 DocType: Expense Claim,Employees Email Id,"דוא""ל עובדי זיהוי"
 DocType: Employee Attendance Tool,Marked Attendance,נוכחות בולטת
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,התחייבויות שוטפות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,התחייבויות שוטפות
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,שלח SMS המוני לאנשי הקשר שלך
 DocType: Program,Program Name,שם התכנית
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,שקול מס או תשלום עבור
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,הכמות בפועל היא חובה
 DocType: Scheduling Tool,Scheduling Tool,כלי תזמון
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,כרטיס אשראי
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,כרטיס אשראי
 DocType: BOM,Item to be manufactured or repacked,פריט שמיוצר או ארזה
 DocType: Employee Education,Major/Optional Subjects,נושאים עיקריים / אופציונליים
 DocType: Sales Invoice Item,Drop Ship,זרוק משלוח
@@ -3584,14 +3572,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,Root cannot be edited.,לא ניתן לערוך את השורש.
 DocType: Manufacturing Settings,Allow Production on Holidays,לאפשר ייצור בחגים
 DocType: Sales Invoice,Customer's Purchase Order Date,תאריך הזמנת הרכש של הלקוח
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,מלאי הון
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,מלאי הון
 DocType: Packing Slip,Package Weight Details,חבילת משקל פרטים
 DocType: Payment Gateway Account,Payment Gateway Account,חשבון תשלום Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,לאחר השלמת התשלום להפנות המשתמש לדף הנבחר.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,אנא בחר קובץ CSV
 DocType: Purchase Order,To Receive and Bill,כדי לקבל וביל
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,מוצרים מומלצים
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,מעצב
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
@@ -3599,16 +3587,16 @@
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Driver,Expiry Date,תַאֲרִיך תְפוּגָה
 ,accounts-browser,חשבונות-דפדפן
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,אנא בחר תחילה קטגוריה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +13,Project master.,אדון פרויקט.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","כדי לאפשר יתר החיוב או יתר ההזמנה, לעדכן &quot;קצבה&quot; במלאי הגדרות או הפריט."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(חצי יום)
 DocType: Payment Term,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,להוביל ימי זמן
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
 ,Stock Summary,סיכום במלאי
 apps/erpnext/erpnext/config/assets.py +54,Transfer an asset from one warehouse to another,להעביר נכס ממחסן אחד למשנהו
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 8df63cd..a1995fa 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,सामग्री भेंट {0} इस वारंटी का दावा रद्द करने से पहले रद्द
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,आकलन रिपोर्ट
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
-DocType: Purchase Receipt,Subscription Detail,सदस्यता विवरण
 DocType: Supplier Scorecard,Notify Supplier,सप्लायर को सूचित करें
 DocType: Item,Customer Items,ग्राहक आइटम
 DocType: Project,Costing and Billing,लागत और बिलिंग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,खाते {0}: माता पिता के खाते {1} एक खाता नहीं हो सकता
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करने के लिए आइटम प्रकाशित
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ईमेल सूचनाएं
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,मूल्यांकन
 DocType: Item,Default Unit of Measure,माप की मूलभूत इकाई
 DocType: SMS Center,All Sales Partner Contact,सभी बिक्री साथी संपर्क
-DocType: Employee,Leave Approvers,अनुमोदकों छोड़ दो
+DocType: Department,Leave Approvers,अनुमोदकों छोड़ दो
 DocType: Sales Partner,Dealer,व्यापारी
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,जांच
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,उपलब्धता जाँचें
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,यह इस प्रदायक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,कानूनी
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार टैक्स पंक्ति में आइटम की दर में शामिल नहीं किया जा सकता {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,कानूनी
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार टैक्स पंक्ति में आइटम की दर में शामिल नहीं किया जा सकता {0}
 DocType: Bank Guarantee,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,द्वारा आवश्यक
 DocType: Delivery Note,Return Against Delivery Note,डिलिवरी नोट के खिलाफ लौटें
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुखों (या समूह) के खिलाफ जो लेखांकन प्रविष्टियों बना रहे हैं और संतुलन बनाए रखा है।
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,प्रक्रिया के लिए कोई जमा वेतन नहीं है
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,प्रक्रिया के लिए कोई जमा वेतन नहीं है
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुले शो
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,उपरोक्त आवर्ती आवर्ती के लिए आज ही इस कार्रवाई को करना आवश्यक है
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,चेक आउट
 DocType: Pricing Rule,Apply On,पर लागू होते हैं
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,सभी आपूर्तिकर्ता संपर्क
 DocType: Support Settings,Support Settings,समर्थन सेटिंग
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,बैच मद समाप्ति की स्थिति
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,बैंक ड्राफ्ट
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,बैंक ड्राफ्ट
 DocType: Membership,membership validaty section,सदस्यता वैधता अनुभाग
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 DocType: Consultation,Consultation,परामर्श
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,सामग्री
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,वेबसाइट बनाना
 DocType: Opening Invoice Creation Tool Item,Quantity,मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ऋण (देनदारियों)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
 DocType: Item,Country of Origin,उद्गम देश
 DocType: Soil Texture,Soil Texture Criteria,मिट्टी बनावट मानदंड
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,प्राथमिक संपर्क विवरण
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,खुले मामले
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
 DocType: Lab Test Groups,Add new line,नई लाइन जोड़ें
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भुगतान में देरी (दिन)
@@ -89,7 +85,7 @@
 ,Delay Days,विलंब दिवस
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,बीजक
+DocType: Subscription Invoice,Invoice,बीजक
 DocType: Purchase Invoice Item,Item Weight Details,आइटम वजन विवरण
 DocType: Asset Maintenance Log,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,पंक्ति # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,पंक्ति # {0}:
 DocType: Timesheet,Total Costing Amount,कुल लागत राशि
 DocType: Delivery Note,Vehicle No,वाहन नहीं
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,मूल्य सूची का चयन करें
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,कृपया तिथि का चयन
 DocType: Daily Work Summary Group,Holiday List,अवकाश सूची
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,मुनीम
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,मुनीम
 DocType: Hub Settings,Selling Price List,मूल्य सूची बेचना
 DocType: Patient,Tobacco Current Use,तंबाकू वर्तमान उपयोग
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,बिक्री दर
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,बिक्री दर
 DocType: Cost Center,Stock User,शेयर उपयोगकर्ता
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए मिलीग्राम +) / कश्मीर
 DocType: Company,Phone No,कोई फोन
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},नई {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,प्रारंभिक ईमेल अधिसूचना प्रेषित
 ,Sales Partners Commission,बिक्री पार्टनर्स आयोग
 DocType: Soil Texture,Sandy Clay Loam,सैंडी मिट्टी लोम
@@ -126,19 +121,21 @@
 DocType: Asset,Value After Depreciation,मूल्य ह्रास के बाद
 DocType: Student,O+,ओ +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,सम्बंधित
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,उपस्थिति तारीख कर्मचारी के शामिल होने की तारीख से कम नहीं किया जा सकता है
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,उपस्थिति तारीख कर्मचारी के शामिल होने की तारीख से कम नहीं किया जा सकता है
 DocType: Grading Scale,Grading Scale Name,ग्रेडिंग पैमाने नाम
-DocType: Subscription,Repeat on Day,दिन पर दोहराएं
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,इस रुट खाता है और संपादित नहीं किया जा सकता है .
 DocType: Sales Invoice,Company Address,कंपनी का पता
 DocType: BOM,Operations,संचालन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},के लिए छूट के आधार पर प्राधिकरण सेट नहीं कर सकता {0}
+DocType: Subscription,Subscription Start Date,सदस्यता प्रारंभ दिनांक
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दो कॉलम, पुराने नाम के लिए एक और नए नाम के लिए एक साथ .csv फ़ाइल संलग्न करें"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} किसी भी सक्रिय वित्त वर्ष में नहीं है।
 DocType: Packed Item,Parent Detail docname,माता - पिता विस्तार docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, मद कोड: {1} और ग्राहक: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,परीक्षण अवधि समाप्ति तिथि परीक्षण अवधि प्रारंभ तिथि से पहले नहीं हो सकती है
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,एक नौकरी के लिए खोलना.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},बीओएम पंक्ति पर उप-कंट्रैक्टिंग आइटम {0} के लिए निर्दिष्ट नहीं है {1}
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} परिणाम प्रस्तुत किया गया
 DocType: Item Attribute,Increment,वेतन वृद्धि
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +74,Timespan,समय अवधि
@@ -147,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Patient,Married,विवाहित
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},अनुमति नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,से आइटम प्राप्त
 DocType: Price List,Price Not UOM Dependant,कीमत नहीं यूओएम निर्भर
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
@@ -178,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
 ,Completed Work Orders,पूर्ण कार्य आदेश
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,कर योग्य राशि
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,कर योग्य राशि
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: BOM,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खर्च दावे या जर्नल प्रविष्टि में से एक होना चाहिए
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,बीओएम का चयन
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खर्च दावे या जर्नल प्रविष्टि में से एक होना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,बीओएम का चयन
 DocType: SMS Log,SMS Log,एसएमएस प्रवेश
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित मदों की लागत
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,कर्मचारी को दिए गए अग्रिम राशि का प्रबंधन करें
@@ -199,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,वितरण सूचना
 DocType: Journal Entry,Opening Entry,एंट्री खुलने
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,खाते का भुगतान केवल
-DocType: Employee Loan,Repay Over Number of Periods,चुकाने से अधिक अवधि की संख्या
+DocType: Loan,Repay Over Number of Periods,चुकाने से अधिक अवधि की संख्या
 DocType: Stock Entry,Additional Costs,अतिरिक्त लागत
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
 DocType: Education Settings,Validate Batch for Students in Student Group,छात्र समूह में छात्रों के लिए बैच का प्रमाणन करें
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},कोई छुट्टी रिकॉर्ड कर्मचारी के लिए पाया {0} के लिए {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},कोई छुट्टी रिकॉर्ड कर्मचारी के लिए पाया {0} के लिए {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,पहली कंपनी दाखिल करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,पहले कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,पहले कंपनी का चयन करें
 DocType: Employee Education,Under Graduate,पूर्व - स्नातक
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,कृपया एचआर सेटिंग्स में अवकाश स्थिति अधिसूचना के लिए डिफ़ॉल्ट टेम्पलेट सेट करें।
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,योजनापूर्ण
 DocType: BOM,Total Cost,कुल लागत
 DocType: Soil Analysis,Ca/K,सीए / कश्मीर
-DocType: Journal Entry Account,Employee Loan,कर्मचारी ऋण
 DocType: Fee Schedule,Send Payment Request Email,भुगतान अनुरोध ईमेल भेजें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,रियल एस्टेट
@@ -231,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,सफलतापूर्वक अपंजीकृत किया गया।
 DocType: Assessment Result,Grade,ग्रेड
 DocType: Restaurant Table,No of Seats,सीटों की संख्या
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","गतिशील विषय जोड़ने के लिए, जैसे जीनजा टैग का उपयोग करें <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: Asset Maintenance Task,Asset Maintenance Task,एसेट रखरखाव कार्य
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,वार्षिक वेतन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,वार्षिक वेतन
 DocType: Daily Work Summary,Daily Work Summary,दैनिक काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} स्थगित कर दिया है
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,शेयर व्यय
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,शेयर व्यय
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,लक्ष्य वेअरहाउस चुनें
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,कृपया पसंदीदा संपर्क ईमेल
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,कृपया पसंदीदा संपर्क ईमेल
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
@@ -265,7 +259,7 @@
 DocType: Customer,Primary Address,प्राथमिक पता
 DocType: Production Plan,Material Request Detail,सामग्री अनुरोध विस्तार
 DocType: Selling Settings,Default Quotation Validity Days,डिफ़ॉल्ट कोटेशन वैधता दिन
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,राशि परिवर्तन
@@ -275,26 +269,28 @@
 DocType: Driver,Driving License Categories,ड्राइविंग लाइसेंस श्रेणियाँ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,कृपया डिलिवरी दिनांक दर्ज करें
 DocType: Depreciation Schedule,Make Depreciation Entry,मूल्यह्रास प्रवेश कर
+DocType: HR Settings,Leave Settings,सेटिंग्स छोड़ो
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,अनुरोध प्रकार
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,कर्मचारी
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),पीओएस (ऑनलाइन / ऑफ़लाइन) का सेटअप मोड
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,कार्य आदेशों के विरुद्ध समय लॉग्स के निर्माण को अक्षम करता है। कार्य आदेश के खिलाफ संचालन को ट्रैक नहीं किया जाएगा
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,निष्पादन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,निष्पादन
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
 DocType: Asset Maintenance Log,Maintenance Status,रखरखाव स्थिति
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,सदस्यता विवरण
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: प्रदायक देय खाते के खिलाफ आवश्यक है {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,आइटम और मूल्य निर्धारण
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},कुल घंटे: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए. दिनांक से मान लिया जाये = {0}
 DocType: Drug Prescription,Interval,मध्यान्तर
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,पसंद
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,पसंद
 DocType: Grant Application,Individual,व्यक्ति
 DocType: Academic Term,Academics User,शिक्षाविदों उपयोगकर्ता
 DocType: Cheque Print Template,Amount In Figure,राशि चित्रा में
-DocType: Employee Loan Application,Loan Info,ऋण जानकारी
+DocType: Loan Application,Loan Info,ऋण जानकारी
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,रखरखाव के दौरे के लिए योजना.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,आपूर्तिकर्ता स्कोरकार्ड अवधि
 DocType: Share Transfer,Share Transfer,शेयर स्थानांतरण
@@ -310,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,मद टेम्पलेट
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,जीव रसायन
 DocType: Job Offer,Select Terms and Conditions,का चयन नियम और शर्तें
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,आउट मान
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,आउट मान
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce सेटिंग्स
 DocType: Production Plan,Sales Orders,बिक्री के आदेश
 DocType: Purchase Taxes and Charges,Valuation,मूल्याकंन
@@ -333,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Default टेरिटरी
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,दूरदर्शन
 DocType: Work Order Operation,Updated via 'Time Log','टाइम प्रवेश' के माध्यम से अद्यतन
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ग्राहक या आपूर्तिकर्ता का चयन करें।
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
 DocType: Company,Enable Perpetual Inventory,सतत सूची सक्षम करें
+DocType: Bank Guarantee,Charges Incurred,शुल्क लिया गया
 DocType: Company,Default Payroll Payable Account,डिफ़ॉल्ट पेरोल देय खाता
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,अपडेट ईमेल समूह
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
@@ -360,7 +358,7 @@
 DocType: Lab Test,Custom Result,कस्टम परिणाम
 DocType: Delivery Stop,Contact Name,संपर्क का नाम
 DocType: Course Assessment Criteria,Course Assessment Criteria,पाठ्यक्रम मूल्यांकन मानदंड
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,टैक्स आईडी:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,टैक्स आईडी:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,छात्र आईडी:
 DocType: POS Customer Group,POS Customer Group,पीओएस ग्राहक समूह
 DocType: Land Unit,Land Unit describing various land assets,विभिन्न भूमि परिसंपत्तियों का वर्णन करने वाला भूमि इकाई
@@ -373,9 +371,8 @@
 ,Open Work Orders,ओपन वर्क ऑर्डर
 DocType: Payment Term,Credit Months,क्रेडिट महीने
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,नेट पे 0 से कम नहीं हो सकता है
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","सिस्टम से दोहराव त्रुटि सूचनाएं भेजने को रोकने के लिए, हमने सदस्यता में निष्क्रिय फ़ील्ड की जांच की है"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,प्रति वर्ष पत्तियां
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,प्रति वर्ष पत्तियां
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
 DocType: Email Digest,Profit & Loss,लाभ हानि
@@ -383,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,छात्रों के समूह के तहत छात्र सेट करें
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,बैंक प्रविष्टियां
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,बैंक प्रविष्टियां
 DocType: Crop,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
@@ -393,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,छात्र समूह निर्माण उपकरण कोर्स
 DocType: Lead,Do Not Contact,संपर्क नहीं है
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,जो लोग अपने संगठन में पढ़ाने
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,सॉफ्टवेयर डेवलपर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,सॉफ्टवेयर डेवलपर
 DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्रा
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Course Scheduling Tool,Course Start Date,कोर्स प्रारंभ तिथि
@@ -402,8 +399,8 @@
 DocType: Item,Publish in Hub,हब में प्रकाशित
 DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 ,GSTR-2,GSTR -2
 DocType: Item,Purchase Details,खरीद विवरण
@@ -439,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,मैक्स ग्रेड
 DocType: Email Digest,New Quotations,नई कोटेशन
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,कर्मचारी को ईमेल वेतन पर्ची कर्मचारी में से चयनित पसंदीदा ईमेल के आधार पर
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 DocType: Tax Rule,Shipping County,शिपिंग काउंटी
-apps/erpnext/erpnext/config/desktop.py +167,Learn,सीखना
+apps/erpnext/erpnext/config/desktop.py +159,Learn,सीखना
 DocType: Asset,Next Depreciation Date,अगली तिथि मूल्यह्रास
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
@@ -451,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,बकाया चेक्स और स्पष्ट करने जमाओं
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
 DocType: Driver,Fleet Manager,नौसेना प्रबंधक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},पंक्ति # {0}: {1} आइटम के लिए नकारात्मक नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},पंक्ति # {0}: {1} आइटम के लिए नकारात्मक नहीं हो सकता {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
@@ -473,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},कृपया होटल कक्ष दर {} पर सेट करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Opening Invoice Creation Tool,Invoice Type,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,बिलटी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,बिलटी
 DocType: Consultation,Encounter Impression,मुठभेड़ इंप्रेशन
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,बिक संपत्ति की लागत
@@ -500,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Course Scheduling Tool,Course Scheduling Tool,पाठ्यक्रम निर्धारण उपकरण
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[त्वरित]% s को% s के लिए आवर्ती% बनाते समय त्रुटि हुई
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
 DocType: Land Unit,LInked Analysis,लिंक्ड विश्लेषण
 DocType: Item Tax,Tax Rate,कर की दर
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,एप्लिकेशन की अवधि दो आवंटन रिकॉर्डों में नहीं हो सकती
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,एप्लिकेशन की अवधि दो आवंटन रिकॉर्डों में नहीं हो सकती
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
@@ -518,7 +513,7 @@
 DocType: Purchase Order,% Received,% प्राप्त
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,छात्र गुटों बनाएं
 DocType: Volunteer,Weekends,सप्ताहांत
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,क्रेडिट नोट राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,क्रेडिट नोट राशि
 DocType: Setup Progress Action,Action Document,कार्यवाही दस्तावेज़
 DocType: Chapter Member,Website URL,वेबसाइट यूआरएल
 ,Finished Goods,निर्मित माल
@@ -532,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,सामगंरियां जोड़ें
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आइटम गुणवत्ता निरीक्षण पैरामीटर
+DocType: Leave Application,Leave Approver Name,अनुमोदनकर्ता छोड़ दो नाम
 DocType: Depreciation Schedule,Schedule Date,नियत तिथि
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","आय, कटौती और अन्य घटकों को वेतन"
 DocType: Packed Item,Packed Item,डिलिवरी नोट पैकिंग आइटम
@@ -548,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
 DocType: Healthcare Settings,Require Lab Test Approval,लैब टेस्ट अनुमोदन की आवश्यकता है
 DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,कुल बकाया
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,कुल बकाया
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
 DocType: Dosage Strength,Strength,शक्ति
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,एक नए ग्राहक बनाने
@@ -561,7 +557,7 @@
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 DocType: Student Log,Medical,चिकित्सा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,खोने के लिए कारण
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,खोने के लिए कारण
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,खाता नंबर अपडेट करें
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,लीड मालिक लीड के रूप में ही नहीं किया जा सकता
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
@@ -571,11 +567,10 @@
 DocType: Lab Test Template,Single,एक
 DocType: Salary Slip,Total Loan Repayment,कुल ऋण चुकौती
 DocType: Account,Cost of Goods Sold,बेच माल की लागत
-DocType: Subscription,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,लागत केंद्र दर्ज करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,लागत केंद्र दर्ज करें
 DocType: Drug Prescription,Dosage,मात्रा बनाने की विधि
 DocType: Journal Entry Account,Sales Order,बिक्री आदेश
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,औसत। बिक्री दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,औसत। बिक्री दर
 DocType: Assessment Plan,Examiner Name,परीक्षक नाम
 DocType: Lab Test Template,No Result,कोई परिणाम नही
 DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
@@ -584,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,पहले कंपनी का नाम दर्ज करें
 DocType: Purchase Invoice,Supplier Name,प्रदायक नाम
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मैनुअल पढ़ें
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,कैलेंडर में सभी विभाग के सदस्यों की पत्तियां दिखाएं
 DocType: Purchase Invoice,01-Sales Return,01-बिक्री वापसी
 DocType: Account,Is Group,समूह के
 DocType: Email Digest,Pending Purchase Orders,खरीद आदेश लंबित
@@ -600,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,अनिवार्य क्षेत्र - शैक्षणिक वर्ष
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} से संबद्ध नहीं है
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ईमेल के साथ जाने वाले परिचयात्मक विषयवस्तु को अनुकूलित करें। प्रत्येक आदानप्रदान एक अलग परिचयात्मक विषयवस्तु है.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},कृपया कंपनी के लिए डिफ़ॉल्ट भुगतान योग्य खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},कृपया कंपनी के लिए डिफ़ॉल्ट भुगतान योग्य खाता सेट करें {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},रोका गया कार्य आदेश के साथ लेनदेन की अनुमति नहीं है {0}
 DocType: Setup Progress Action,Min Doc Count,न्यूनतम डॉक्टर गणना
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
@@ -629,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,बिक्री के लिए आरक्षित
 DocType: Packing Slip,From Package No.,पैकेज सं से
 DocType: Item Attribute,To Range,सीमा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","वैल्यूएशन पद्धति को बदल नहीं सकते हैं, क्योंकि कुछ वस्तुओं के लेनदेन के साथ ही इसमें अपनी वैल्यूएशन विधि नहीं होती है"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,प्रतिभूति और जमाओं
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","वैल्यूएशन पद्धति को बदल नहीं सकते हैं, क्योंकि कुछ वस्तुओं के लेनदेन के साथ ही इसमें अपनी वैल्यूएशन विधि नहीं होती है"
 DocType: Student Report Generation Tool,Attended by Parents,माता-पिता ने भाग लिया
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Patient,AB Positive,एबी सकारात्मक
@@ -639,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिति रिकॉर्ड.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित पेरोल के लिए वेतन घटक।
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
-DocType: Employee Loan,Total Payment,कुल भुगतान
+DocType: Loan,Total Payment,कुल भुगतान
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,पूर्ण कार्य आदेश के लिए लेनदेन को रद्द नहीं किया जा सकता
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} रद्द कर दिया गया है, इसलिए कार्रवाई पूरी नहीं की जा सकती"
@@ -655,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बहुत हो गया भागों का निर्माण करने के लिए
 DocType: POS Profile User,POS Profile User,पीओएस प्रोफ़ाइल उपयोगकर्ता
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,प्रत्यक्ष आय
+DocType: Subscription Invoice,Subscription Invoice,सदस्यता चालान
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,प्रत्यक्ष आय
 DocType: Patient Appointment,Date TIme,दिनांक समय
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,प्रशासनिक अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,प्रशासनिक अधिकारी
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,कंपनी और करों की स्थापना
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स चुनें
 DocType: Codification Table,Codification Table,संहिताकरण तालिका
 DocType: Timesheet Detail,Hrs,बजे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,कंपनी का चयन करें
 DocType: Stock Entry Detail,Difference Account,अंतर खाता
 DocType: Purchase Invoice,Supplier GSTIN,आपूर्तिकर्ता जीएसटीआईएन
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
@@ -688,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,कैश फ्लो मैपिंग टेम्पलेट
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
+DocType: Bank Guarantee,Providing,प्रदान करना
 DocType: Account,Profit and Loss,लाभ और हानि
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","अनुमति नहीं है, लैग टेस्ट टेम्पलेट को आवश्यकतानुसार कॉन्फ़िगर करें"
 DocType: Patient,Risk Factors,जोखिम के कारण
@@ -719,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
 DocType: Healthcare Settings,Appointment Confirmation,अपॅइंटमेंट की पुष्टि
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),समापन (सीआर)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,नमस्ते
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,हटो मद
@@ -744,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","उपयोगकर्ता {1} के लिए पहले से ही pos प्रोफ़ाइल {0} में डिफ़ॉल्ट सेट किया गया है, कृपया डिफ़ॉल्ट रूप से अक्षम डिफ़ॉल्ट"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,संचित मान
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,पीओएस प्रोफ़ाइल में क्षेत्र की आवश्यकता है
 DocType: Supplier,Prevent RFQs,आरएफक्यू को रोकें
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,बनाओ बिक्री आदेश
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} से {1} की अवधि के लिए जमा की गयी पर्ची
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} से {1} की अवधि के लिए जमा की गयी पर्ची
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
@@ -769,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,नौवहन बिल तारीख
 DocType: Production Plan,Production Plan,उत्पादन योजना
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,चालान चालान उपकरण खोलना
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,बिक्री लौटें
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,नोट: कुल आवंटित पत्ते {0} पहले ही मंजूरी दे दी पत्तियों से कम नहीं होना चाहिए {1} अवधि के लिए
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,सीरियल नो इनपुट के आधार पर लेनदेन में मात्रा निर्धारित करें
 ,Total Stock Summary,कुल स्टॉक सारांश
 DocType: Announcement,Posted By,द्वारा प्रकाशित किया गया था
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
@@ -781,15 +780,15 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कृपया कंपनी सेट करें
 DocType: Share Balance,Share Balance,शेयर बैलेंस
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Training Result Employee,Training Result Employee,प्रशिक्षण के परिणाम कर्मचारी
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
-DocType: Repayment Schedule,Principal Amount,मुख्य राशि
-DocType: Employee Loan Application,Total Payable Interest,कुल देय ब्याज
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,मुख्य राशि
+DocType: Loan Application,Total Payable Interest,कुल देय ब्याज
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},कुल उत्कृष्ट: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,बिक्री चालान Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
@@ -798,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
 DocType: Restaurant Reservation,Restaurant Reservation,रेस्तरां आरक्षण
 DocType: Land Unit,Land Unit Name,भूमि इकाई का नाम
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भुगतान एंट्री कटौती
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,समेट रहा हु
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ईमेल के जरिए ग्राहक को सूचित करें
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ईमेल के जरिए ग्राहक को सूचित करें
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,एक और बिक्री व्यक्ति {0} एक ही कर्मचारी आईडी के साथ मौजूद है
 DocType: Employee Advance,Claimed Amount,दावा राशि
 apps/erpnext/erpnext/config/education.py +180,Masters,स्नातकोत्तर
@@ -819,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","भुगतान गेटवे खाता नहीं बनाया है, एक मैन्युअल का सृजन करें।"
 DocType: Supplier Scorecard,Per Year,प्रति वर्ष
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,डीओबी के अनुसार इस कार्यक्रम में प्रवेश के लिए पात्र नहीं हैं
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Sales Invoice,Sales Taxes and Charges,बिक्री कर और शुल्क
 DocType: Employee,Organization Profile,संगठन प्रोफाइल
 DocType: Vital Signs,Height (In Meter),ऊंचाई (मीटर में)
 DocType: Student,Sibling Details,सहोदर विवरण
 DocType: Vehicle Service,Vehicle Service,वाहन सेवा
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,स्वचालित रूप से प्रतिक्रिया शर्तों के आधार पर अनुरोध चलाता है।
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,स्वचालित रूप से प्रतिक्रिया शर्तों के आधार पर अनुरोध चलाता है।
 DocType: Employee,Reason for Resignation,इस्तीफे का कारण
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,प्रदर्शन मूल्यांकन के लिए खाका .
 DocType: Sales Invoice,Credit Note Issued,क्रेडिट नोट जारी
@@ -840,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,रखरखाव अनुसूची
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","तो मूल्य निर्धारण नियमों ग्राहकों के आधार पर बाहर छान रहे हैं, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक प्रकार, अभियान, बिक्री साथी आदि"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,सूची में शुद्ध परिवर्तन
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,कर्मचारी ऋण प्रबंधन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 के साथ संबंध
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,मैनेजर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,मैनेजर
 DocType: Payment Entry,Payment From / To,भुगतान से / करने के लिए
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},कृपया वेअरहाउस में खाता सेट करें {0}
@@ -885,23 +882,23 @@
 DocType: Item,Material Transfer,सामग्री स्थानांतरण
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,के लिए पथ नहीं मिल सका
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),उद्घाटन ( डॉ. )
+DocType: Loan,Applicant,आवेदक
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग टाइमस्टैम्प के बाद होना चाहिए {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,पुनरावर्ती दस्तावेज़ बनाने के लिए
 ,GST Itemised Purchase Register,जीएसटी मदरहित खरीद रजिस्टर
 DocType: Course Scheduling Tool,Reschedule,पुनः शेड्यूल करें
-DocType: Employee Loan,Total Interest Payable,देय कुल ब्याज
+DocType: Loan,Total Interest Payable,देय कुल ब्याज
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरा लागत करों और शुल्कों
 DocType: Work Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: BOM Operation,Operation Time,संचालन समय
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,समाप्त
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,आधार
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,आधार
 DocType: Timesheet,Total Billed Hours,कुल बिल घंटे
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,बंद राशि लिखें
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,बंद राशि लिखें
 DocType: Leave Block List Allow,Allow User,उपयोगकर्ता की अनुमति
 DocType: Journal Entry,Bill No,विधेयक नहीं
 DocType: Company,Gain/Loss Account on Asset Disposal,एसेट निपटान पर लाभ / हानि खाता
 DocType: Vehicle Log,Service Details,सेवा विवरण
-DocType: Subscription,Quarterly,त्रैमासिक
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,समूहीकृत
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
@@ -912,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,समय पत्र
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush आधारित कच्चे माल पर
 DocType: Sales Invoice,Port Code,पोर्ट कोड
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,रिजर्व वेयरहाउस
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,रिजर्व वेयरहाउस
 DocType: Lead,Lead is an Organization,लीड एक संगठन है
 DocType: Guardian Interest,Interest,ब्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,बेचने से पहले
@@ -924,12 +921,12 @@
 DocType: Account,Accounts,लेखा
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,आपूर्तिकर्ता स्कोरकार्ड मानदंड के टेम्पलेट्स
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,विपणन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,विपणन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
 DocType: Request for Quotation,Get Suppliers,आपूर्तिकर्ता प्राप्त करें
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,यदि केवल 30 दिनों के भीतर आपकी सदस्यता समाप्त होने पर आप केवल नवीनीकृत कर सकते हैं
@@ -939,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,केवल तभी चुनें यदि आपके पास कैश फ्लो मैपर दस्तावेज सेटअप है
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Supplier Scorecard,Per Week,प्रति सप्ताह
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,कुल छात्र
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
@@ -960,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],फिचर्स डेस ऐक्रिटेशंस कॉप्टीबल्स [एफईसी]
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड एंट्री
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,कंपनी एवं लेखा
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,मूल्य में
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,मूल्य में
 DocType: Asset Settings,Depreciation Options,मूल्यह्रास विकल्प
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,अमान्य पोस्टिंग टाइम
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,अमान्य पोस्टिंग टाइम
 DocType: Lead,Campaign Name,अभियान का नाम
 DocType: Hotel Room,Capacity,क्षमता
 DocType: Selling Settings,Close Opportunity After Days,बंद के मौके दिनों के बाद
@@ -987,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक की खरीद आदेश नहीं
 DocType: Budget,Budget Against,बजट के खिलाफ
 DocType: Employee,Cell Number,सेल नंबर
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिए गए मानदंडों के लिए कोई कर्मचारी नहीं है जाँच करें कि वेतन स्लिप्स पहले से ही नहीं बनाया गया है।
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिए गए मानदंडों के लिए कोई कर्मचारी नहीं है जाँच करें कि वेतन स्लिप्स पहले से ही नहीं बनाया गया है।
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
@@ -999,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक तालिका चुनें
 DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ता&#39; में एक अमान्य ईमेल पता है
 DocType: Special Test Items,Particulars,विवरण
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा संघर्ष का समाधान करें। मूल्य नियम: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM निष्क्रिय या रद्द नहीं कर सकते क्योंकि यह अन्य BOMs के साथ जुड़ा हुवा है
 DocType: Asset,Maintenance,रखरखाव
+DocType: Subscriber,Subscriber,ग्राहक
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,कृपया अपनी परियोजना स्थिति अपडेट करें
 DocType: Item,Maximum sample quantity that can be retained,अधिकतम नमूना मात्रा जिसे बनाए रखा जा सकता है
@@ -1064,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,शॉपिंग कार्ट के लिए डिफ़ॉल्ट सेटिंग्स
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,टाइम्सस्लॉट जोड़ें
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},एसेट जर्नल प्रविष्टि के माध्यम से खत्म कर दिया {0}
-DocType: Employee Loan,Interest Income Account,ब्याज आय खाता
+DocType: Loan,Interest Income Account,ब्याज आय खाता
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,समीक्षा आमंत्रित भेजा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,जैव प्रौद्योगिकी
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,कार्यालय रखरखाव का खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,कार्यालय रखरखाव का खर्च
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,के लिए जाओ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ईमेल खाते को स्थापित
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Asset Repair,Downtime,स्र्कना
 DocType: Account,Liability,दायित्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,शैक्षणिक अवधि:
 DocType: Salary Detail,Do not include in total,कुल में शामिल न करें
 DocType: Company,Default Cost of Goods Sold Account,माल बेच खाते की डिफ़ॉल्ट लागत
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},नमूना मात्रा {0} प्राप्त मात्रा से अधिक नहीं हो सकती {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,मूल्य सूची चयनित नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Request for Quotation Supplier,Send Email,ईमेल भेजें
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 DocType: Item,Max Sample Quantity,अधिकतम नमूना मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,अनुमति नहीं है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,अनुमति नहीं है
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,उद्धरण अनुरोध
 DocType: Vital Signs,Heart Rate / Pulse,हार्ट रेट / पल्स
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
@@ -1094,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,उच्च वेटेज के साथ आइटम उच्च दिखाया जाएगा
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,लैब टेस्ट और महत्वपूर्ण लक्षण
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बैंक सुलह विस्तार
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,नहीं मिला कर्मचारी
-DocType: Subscription,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,परियोजना अपडेट
 DocType: SMS Center,All Customer Contact,सभी ग्राहक संपर्क
 DocType: Land Unit,Tree Details,ट्री विवरण
@@ -1148,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,सभी आइटम समूहों
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Work Order,Item To Manufacture,आइटम करने के लिए निर्माण
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} स्थिति {2} है
@@ -1162,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","अचयनित करें, अगर सहेजे जाने के बाद चुना हुआ पता संपादित किया गया है"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 DocType: Item,Hub Publishing Details,हब प्रकाशन विवरण
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;उद्घाटन&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;उद्घाटन&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
 DocType: Lab Test Template,Result Format,परिणाम प्रारूप
@@ -1172,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,द्विमासिक
 DocType: Vehicle Service,Brake Pad,ब्रेक पैड
 DocType: Fertilizer,Fertilizer Contents,उर्वरक सामग्री
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,अनुसंधान एवं विकास
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,अनुसंधान एवं विकास
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,बिल राशि
 DocType: Company,Registration Details,पंजीकरण के विवरण
 DocType: Timesheet,Total Billed Amount,कुल बिल राशि
@@ -1186,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,बिक्री आदेश पर क्रेडिट सीमा जांच बाईपास
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,प्रदर्शन मूल्यांकन.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम करने से, &#39;शॉपिंग कार्ट के लिए उपयोग करें&#39; खरीदारी की टोकरी के रूप में सक्षम है और शॉपिंग कार्ट के लिए कम से कम एक कर नियम होना चाहिए"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भुगतान एंट्री {0} {1} आदेश, जाँच करता है, तो यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए खिलाफ जुड़ा हुआ है।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भुगतान एंट्री {0} {1} आदेश, जाँच करता है, तो यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए खिलाफ जुड़ा हुआ है।"
 DocType: Sales Invoice Item,Stock Details,स्टॉक विवरण
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,परियोजना मूल्य
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,बिक्री केन्द्र
@@ -1220,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,न्यूनतम बैठने
 DocType: Item Attribute,Item Attribute Values,आइटम विशेषता मान
 DocType: Examination Result,Examination Result,परीक्षा परिणाम
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,रसीद खरीद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},संदर्भ Doctype से एक होना चाहिए {0}
@@ -1228,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Work Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,स्थानांतरण के लिए कोई आइटम उपलब्ध नहीं है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,स्थानांतरण के लिए कोई आइटम उपलब्ध नहीं है
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),समापन (उद्घाटन + कुल)
 DocType: Journal Entry,Depreciation Entry,मूल्यह्रास एंट्री
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
 DocType: Crop Cycle,ISO 8016 standard,आईएसओ 8016 मानक
 DocType: Pricing Rule,Rate or Discount,दर या डिस्काउंट
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक मात्रा
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,पसंदीदा
 DocType: Hub Settings,Custom Data,कस्टम डेटा
@@ -1248,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,मेडिकल कोड मानक
 DocType: Soil Texture,Clay Composition (%),क्ले संरचना (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,कार्य सौंपने से पहले कृपया सहेजें
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,शेष मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,शेष मूल्य
 DocType: Lab Test,Lab Technician,प्रयोगशाला तकनीशियन
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,बिक्री मूल्य सूची
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,बिक्री मूल्य सूची
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","यदि चेक किया गया, तो एक ग्राहक बनाया जाएगा, रोगी को मैप किया जाएगा। इस ग्राहक के खिलाफ रोगी चालान बनाया जाएगा। आप पेशेंट बनाते समय मौजूदा ग्राहक का चयन भी कर सकते हैं"
 DocType: Bank Reconciliation,Account Currency,खाता मुद्रा
@@ -1258,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,कंपनी में गोल ऑफ़ खाते का उल्लेख करें
 DocType: Purchase Receipt,Range,रेंज
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
 DocType: Item Barcode,Item Barcode,आइटम बारकोड
 DocType: Woocommerce Settings,Endpoints,endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","उत्पन्न होना। यदि देरी हो गई है, तो आपको मैन्युअल रूप से इस &quot;महीने के दोहराना&quot; फ़ील्ड को मैन्युअल रूप से बदलना होगा"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
 DocType: Share Transfer,From Folio No,फ़ोलियो नं। से
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: {1} क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
@@ -1302,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,उपलब्ध-उपयोग की तिथि
 DocType: Guardian,Guardian Name,अभिभावक का नाम
 DocType: Cheque Print Template,Has Print Format,प्रिंट स्वरूप है
-DocType: Employee Loan,Sanctioned,स्वीकृत
+DocType: Loan,Sanctioned,स्वीकृत
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,अनिवार्य है। हो सकता है कि मुद्रा विनिमय रिकार्ड नहीं बनाई गई है
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
 DocType: Crop Cycle,Crop Cycle,फसल चक्र
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;उत्पाद बंडल&#39; आइटम, गोदाम, सीरियल कोई और बैच के लिए नहीं &#39;पैकिंग सूची&#39; मेज से विचार किया जाएगा। गोदाम और बैच कोई &#39;किसी भी उत्पाद बंडल&#39; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;उत्पाद बंडल&#39; आइटम, गोदाम, सीरियल कोई और बैच के लिए नहीं &#39;पैकिंग सूची&#39; मेज से विचार किया जाएगा। गोदाम और बैच कोई &#39;किसी भी उत्पाद बंडल&#39; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
 DocType: Student Admission,Publish on website,वेबसाइट पर प्रकाशित करें
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,आपूर्तिकर्ता चालान दिनांक पोस्ट दिनांक से बड़ा नहीं हो सकता है
+DocType: Subscription,Cancelation Date,रद्द करने की तारीख
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
 DocType: Agriculture Task,Agriculture Task,कृषि कार्य
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,अप्रत्यक्ष आय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,अप्रत्यक्ष आय
 DocType: Student Attendance Tool,Student Attendance Tool,छात्र उपस्थिति उपकरण
 DocType: Restaurant Menu,Price List (Auto created),मूल्य सूची (ऑटो बनाया)
 DocType: Cheque Print Template,Date Settings,दिनांक सेटिंग
@@ -1337,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,मीटर
 DocType: Workstation,Electricity Cost,बिजली की लागत
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,लैब परीक्षण datetime संग्रह तिथि समय से पहले नहीं हो सकता
+DocType: Subscription Plan,Cost,लागत
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
 DocType: Expense Claim,Total Advance Amount,कुल अग्रिम राशि
 DocType: Delivery Stop,Estimated Arrival,अनुमानित आगमन
@@ -1348,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
 DocType: Timesheet Detail,Bill,बिल
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,सफेद
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,सफेद
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,आप केवल चेक बॉक्स की सूची में अधिकतम एक विकल्प चुन सकते हैं।
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
 DocType: Item,Automatically Create New Batch,स्वचालित रूप से नया बैच बनाएं
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} को {1} को सौंपना (पंक्ति {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,मेक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} को {1} को सौंपना (पंक्ति {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,मेक
 DocType: Student Admission,Admission Start Date,प्रवेश प्रारंभ तिथि
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,नए कर्मचारी
@@ -1371,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
 DocType: Repayment Schedule,Balance Loan Amount,शेष ऋण की राशि
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,अनुसूची कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,पूँजी विकल्प
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,पूँजी विकल्प
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,खरीद आदेश में आखिरी खरीद विवरण लाए जाने से अक्षम करें
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
@@ -1390,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,पैकिंग स्लिप आइटम
 DocType: Purchase Invoice,Cash/Bank Account,नकद / बैंक खाता
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},कृपया बताएं कि एक {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,संस्करण निर्माण कतारबद्ध किया गया है।
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} के लिए कार्य सारांश
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,गुण तालिका अनिवार्य है
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,सूची में पहला अवकाश अनुमान डिफ़ॉल्ट छुट्टी अनुमानक के रूप में सेट किया जाएगा।
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Plan,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
 DocType: Training Event,Self-Study,स्वयं अध्ययन
@@ -1406,7 +1402,7 @@
 DocType: Workstation,Wages,वेतन
 DocType: Asset Maintenance,Maintenance Manager Name,रखरखाव प्रबंधक नाम
 DocType: Agriculture Task,Urgent,अत्यावश्यक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},तालिका में पंक्ति {0} के लिए एक वैध पंक्ति आईडी निर्दिष्ट करें {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},तालिका में पंक्ति {0} के लिए एक वैध पंक्ति आईडी निर्दिष्ट करें {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,वेरिएबल खोजने में असमर्थ:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,नमपैड से संपादित करने के लिए कृपया कोई फ़ील्ड चुनें
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,स्टॉक लेजर बनने के रूप में एक निश्चित संपत्ति आइटम नहीं हो सकता।
@@ -1418,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,गुणवत्ता निरीक्षण टेम्पलेट नाम
 DocType: Project,First Email,पहला ईमेल
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,बिक्री आदेश / तैयार माल गोदाम में सुरक्षित गोदाम
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,बेच राशि
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,बेच राशि
 DocType: Repayment Schedule,Interest Amount,ब्याज राशि
 DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
 DocType: Share Transfer,Issue,मुद्दा
@@ -1432,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 ,Projected Quantity as Source,स्रोत के रूप में पेश मात्रा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,डिलिवरी ट्रिप
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,डिलिवरी ट्रिप
 DocType: Student,A-,ए-
 DocType: Share Transfer,Transfer Type,स्थानांतरण प्रकार
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,बिक्री व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,बिक्री व्यय
 DocType: Consultation,Diagnosis,निदान
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
@@ -1444,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,पिन कोड
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ऋण में ब्याज आय खाता चुनें {0}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,डिफ़ॉल्ट प्रदायक
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता प्रतिशत से अधिक
-DocType: Employee Loan,Repayment Schedule,पुनः भुगतान कार्यक्रम
+DocType: Loan,Repayment Schedule,पुनः भुगतान कार्यक्रम
 DocType: Shipping Rule Condition,Shipping Rule Condition,नौवहन नियम हालत
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक ऑफ तिथियां
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ति तिथि आरंभ तिथि से कम नहीं हो सकता
@@ -1463,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,औसत आयु
 DocType: Education Settings,Attendance Freeze Date,उपस्थिति फ्रीज तिथि
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,सभी उत्पादों को देखने
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,सभी उत्पादों को देखने
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),न्यूनतम लीड आयु (दिन)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,सभी BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},होटल कमरे प्रकार {0} पर अनुपलब्ध हैं {1}
@@ -1471,14 +1468,16 @@
 DocType: Expense Claim,From Employee,कर्मचारी से
 DocType: Driver,Cellphone Number,सेलफोन नंबर
 DocType: Project,Monitor Progress,प्रगति की निगरानी करें
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
 DocType: Journal Entry,Make Difference Entry,अंतर एंट्री
+DocType: Supplier Quotation,Auto Repeat Section,ऑटो दोहराना अनुभाग
 DocType: Upload Attendance,Attendance From Date,दिनांक से उपस्थिति
 DocType: Appraisal Template Goal,Key Performance Area,परफ़ॉर्मेंस क्षेत्र
 DocType: Program Enrollment,Transportation,परिवहन
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,अमान्य विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},मात्रा से कम या बराबर होना चाहिए {0}
+DocType: Department Approver,Department Approver,विभाग के दृष्टिकोण
 DocType: SMS Center,Total Characters,कुल वर्ण
 DocType: Employee Advance,Claimed,दावा किया
 DocType: Crop,Row Spacing,पंक्ति रिक्ति
@@ -1488,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भुगतान सुलह चालान
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,अंशदान%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ख़रीद सेटिंग के अनुसार यदि खरीद आदेश की आवश्यकता है == &#39;हां&#39;, फिर खरीद चालान बनाने के लिए, उपयोगकर्ता को आइटम के लिए पहले खरीद आदेश बनाने की आवश्यकता है {0}"
+,HSN-wise-summary of outward supplies,बाह्य आपूर्ति के एचएसएन-वार-सारांश
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,कंपनी अपने संदर्भ के लिए पंजीकरण संख्या. टैक्स आदि संख्या
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
@@ -1501,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,क्रिया का नाम
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,साल की शुरुआत
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},जीएसटीआईएन के पहले 2 अंक राज्य संख्या {0} के साथ मिलना चाहिए
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,पीडीसी / साख पत्र
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,पीडीसी / साख पत्र
 DocType: Purchase Invoice,Start date of current invoice's period,वर्तमान चालान की अवधि के आरंभ तिथि
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,क्षमता योजना में त्रुटि
@@ -1519,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,खेतों के निर्माण के समय ही पर प्रतिलिपि किया जाएगा
 DocType: Setup Progress Action,Domains,डोमेन
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,प्रबंधन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,प्रबंधन
 DocType: Cheque Print Template,Payer Settings,भुगतानकर्ता सेटिंग
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,एक बार जब आप को वेतन पर्ची सहेजे शुद्ध वेतन (शब्दों) में दिखाई जाएगी।
 DocType: Purchase Invoice,Is Return,वापसी है
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,सावधान
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',कार्य दिवस &#39;{0}&#39; में अंतिम दिन से अधिक है
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,वापसी / डेबिट नोट
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,वापसी / डेबिट नोट
 DocType: Price List Country,Price List Country,मूल्य सूची देश
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},आइटम के लिए {0} वैध धारावाहिक नग {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,मद कोड सीरियल नंबर के लिए बदला नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,मद कोड सीरियल नंबर के लिए बदला नहीं जा सकता
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,बैच नंबर पाने के लिए मद कोड दर्ज करें
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
-DocType: Employee Loan,Partially Disbursed,आंशिक रूप से वितरित
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,अनुदान जानकारी
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,अनुदान जानकारी
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,प्रदायक डेटाबेस.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,आप एक सदस्यता को पुनरारंभ नहीं कर सकते जो रद्द नहीं किया गया है।
 DocType: Account,Balance Sheet,बैलेंस शीट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
 DocType: Fee Validity,Valid Till,तक मान्य है
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,कुल माता-पिता शिक्षक बैठक
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
@@ -1551,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,चयनित ग्राहक के लिए ग्राहक समूह को बदलने की अनुमति नहीं है।
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,अनुमानित आगमन के समय को अपडेट कर रहा है।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,अनुमानित आगमन के समय को अपडेट कर रहा है।
 DocType: Program Enrollment Tool,Enrollment Details,नामांकन विवरण
 DocType: Purchase Invoice Item,Net Rate,असल दर
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,कृपया एक ग्राहक का चयन करें
@@ -1570,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Purchase Order,Group same items,समूह एक ही आइटम
 DocType: Purchase Invoice,Disable Rounded Total,गोल कुल अक्षम
-DocType: Employee Loan Application,Repayment Info,चुकौती जानकारी
+DocType: Department,Parent Department,अभिभावक विभाग
+DocType: Loan Application,Repayment Info,चुकौती जानकारी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
 DocType: Maintenance Team Member,Maintenance Role,रखरखाव भूमिका
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,कर्मचारी की स्थापना
 DocType: Sales Order,SO-,इसलिए-
 DocType: Hotel Room Reservation,Hotel Reservation User,होटल आरक्षण उपयोगकर्ता
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,पहले उपसर्ग का चयन करें
 DocType: Student,O-,हे
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,अनुसंधान
+DocType: Subscription Settings,Subscription Settings,सदस्यता सेटिंग्स
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,अनुसंधान
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Announcement,All Students,सभी छात्र
@@ -1592,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Crop Cycle,Less than a year,एक साल से कम
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,छात्र मोबाइल नंबर
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 DocType: Crop,Yield UOM,यील्ड यूओएम
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
 DocType: Item,Is Item from Hub,हब से मद है
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,पंक्ति {0}: गतिविधि प्रकार अनिवार्य है।
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,सूद अदा किया
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,सूद अदा किया
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,लेखा बही
 DocType: Stock Reconciliation,Difference Amount,अंतर राशि
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},डॉ {0} पर छुट्टी पर {1}
 DocType: Purchase Invoice,Reverse Charge,उल्टा आरोप
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,प्रतिधारित कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,प्रतिधारित कमाई
 DocType: Purchase Invoice,05-Change in POS,05-पीओएस में परिवर्तन
 DocType: Vehicle Log,Service Detail,सेवा विस्तार
 DocType: BOM,Item Description,आइटम विवरण
@@ -1619,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,अवसर आइटम
 ,Student and Guardian Contact Details,छात्र और गार्जियन संपर्क विवरण
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,पंक्ति {0}: आपूर्तिकर्ता {0} के ईमेल पते को ईमेल भेजने के लिए आवश्यक है
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,अस्थाई उद्घाटन
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,अस्थाई उद्घाटन
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,देखें हब
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 DocType: Patient Appointment,More Info,अधिक जानकारी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},मूल्यांकन दर पंक्ति में आइटम के लिए आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},मूल्यांकन दर पंक्ति में आइटम के लिए आवश्यक {0}
 DocType: Supplier Scorecard,Scorecard Actions,स्कोरकार्ड क्रियाएँ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,उदाहरण: कंप्यूटर विज्ञान में परास्नातक
 DocType: Purchase Invoice,Rejected Warehouse,अस्वीकृत वेअरहाउस
@@ -1634,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,को
 DocType: Supplier Quotation Item,Lead Time in days,दिनों में लीड समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,लेखा देय सारांश
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} से वेतन के भुगतान {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} से वेतन के भुगतान {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
@@ -1643,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लैब टेस्ट प्रिस्क्रिप्शन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,छोटा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,छोटा
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,चालान निर्माण उपकरण आइटम खोलना
 DocType: Education Settings,Employee Number,कर्मचारियों की संख्या
+DocType: Subscription Settings,Cancel Invoice After Grace Period,अनुग्रह अवधि के बाद चालान रद्द करें
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
 DocType: Project,% Completed,% पूर्ण
 ,Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
@@ -1659,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,प्रयोगशाला परीक्षण Datetime
 DocType: Email Digest,Add Quote,उद्धरण जोड़ें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,अप्रत्यक्ष व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 DocType: Agriculture Analysis Criteria,Agriculture,कृषि
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,सिंक मास्टर डाटा
@@ -1689,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,राजधानी उपकरणों
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,कृपया आइटम कोड पहले सेट करें
 DocType: Item,ITEM-,"आइटम,"
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
+DocType: Subscription Plan,Billing Interval Count,बिलिंग अंतराल गणना
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 DocType: Antibiotic,Antibiotic,एंटीबायोटिक दवाओं
 ,Team Updates,टीम अपडेट
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,प्रिंट प्रारूप बनाएं
@@ -1724,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,पीओएस मद समूह
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,वैकल्पिक आइटम आइटम कोड के समान नहीं होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 अस्थायी मूल्यांकन का अंतिम रूप देना
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
@@ -1740,7 +1744,7 @@
 DocType: BOM Operation,Workstation,वर्कस्टेशन
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,कोटेशन प्रदायक के लिए अनुरोध
 DocType: Healthcare Settings,Registration Message,पंजीकरण संदेश
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,हार्डवेयर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,हार्डवेयर
 DocType: Prescription Dosage,Prescription Dosage,प्रिस्क्रिप्शन डोज़
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,एक कंपनी का चयन करें
@@ -1771,7 +1775,7 @@
 DocType: Project,Start and End Dates,आरंभ और अंत तारीखें
 ,Delivered Items To Be Billed,बिल के लिए दिया आइटम
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ओपन बीओएम {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
 DocType: Authorization Rule,Average Discount,औसत छूट
 DocType: Project Update,Great/Quickly,ग्रेट / जल्दी
 DocType: Purchase Invoice Item,UOM,यू ओ एम
@@ -1780,8 +1784,8 @@
 DocType: Employee,EMP/,ईएमपी /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,बैच किए गए आइटम के लिए बैच चुनें
 DocType: Asset,Depreciation Schedules,मूल्यह्रास कार्यक्रम
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,निम्नलिखित खातों को जीएसटी सेटिंग में चुना जा सकता है:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,निम्नलिखित खातों को जीएसटी सेटिंग में चुना जा सकता है:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
 DocType: Payment Request,Transaction Currency,कारोबारी मुद्रा
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},से {0} | {1} {2}
@@ -1792,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,औसत दैनिक निवर्तमान
 DocType: POS Profile,Campaign,अभियान
 DocType: Supplier,Name and Type,नाम और प्रकार
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',स्वीकृति स्थिति 'स्वीकृत' या ' अस्वीकृत ' होना चाहिए
 DocType: Physician,Contacts and Address,संपर्क और पता
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ति
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' उम्मीद प्रारंभ दिनांक ' 'की आशा की समाप्ति तिथि' से बड़ा नहीं हो सकता
@@ -1805,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,पात्रता और विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संचार लॉग इन करें.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",उद्धरण के लिए अनुरोध अधिक चेक पोर्टल सेटिंग्स के लिए पोर्टल से उपयोग करने में अक्षम है।
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,आपूर्तिकर्ता स्कोरकार्ड स्कोरिंग चर
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,राशि ख़रीदना
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,राशि ख़रीदना
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पता नाम
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स की अनुसूची बनाने में त्रुटियां थीं
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,सूची में पहला व्यय अनुमान डिफ़ॉल्ट व्यय अनुमान के रूप में सेट किया जाएगा।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1838,15 +1844,16 @@
 DocType: Package Code,Package Code,पैकेज कोड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,शिक्षु
 DocType: Purchase Invoice,Company GSTIN,कंपनी जीएसटीआईएन
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","एक स्ट्रिंग के रूप में आइटम गुरु से दिलवाया है और इस क्षेत्र में संग्रहित कर विस्तार मेज।
  करों और शुल्कों के लिए प्रयुक्त"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाता जमे हुए है , तो प्रविष्टियों प्रतिबंधित उपयोगकर्ताओं की अनुमति है."
 DocType: Email Digest,Bank Balance,बैंक में जमा राशि
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,छोड़ने आवेदन में स्वीकार्य अनिवार्य छोड़ दें
 DocType: Job Opening,"Job profile, qualifications required etc.","आवश्यक काम प्रोफ़ाइल , योग्यता आदि"
 DocType: Journal Entry Account,Account Balance,खाते की शेष राशि
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
@@ -1874,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,{0} पंक्ति में भुगतान अवधि संभवतः एक डुप्लिकेट है
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),कृषि (बीटा)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,पर्ची पैकिंग
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,कार्यालय का किराया
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय का किराया
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
 DocType: Disease,Common Name,साधारण नाम
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,आयात विफल!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
 DocType: Vital Signs,Blood Pressure,रक्त चाप
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,विश्लेषक
 DocType: Item,Inventory,इनवेंटरी
 DocType: Item,Sales Details,बिक्री विवरण
 DocType: Quality Inspection,QI-,QI-
@@ -1892,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,विद्यार्थी समूह में छात्रों के लिए नामांकित पाठ्यक्रम मान्य करें
 DocType: Notification Control,Expense Claim Rejected,व्यय दावे का खंडन किया
 DocType: Item,Item Attribute,आइटम गुण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,सरकार
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,व्यय दावा {0} पहले से ही मौजूद है के लिए वाहन लॉग
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,संस्थान का नाम
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,भुगतान राशि दर्ज करें
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,भुगतान राशि दर्ज करें
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,आइटम वेरिएंट
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,सेवाएं
 DocType: HR Settings,Email Salary Slip to Employee,कर्मचारी को ईमेल वेतन पर्ची
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,संभावित आपूर्तिकर्ता का चयन
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,संभावित आपूर्तिकर्ता का चयन
 DocType: Sales Invoice,Source,स्रोत
 DocType: Customer,"Select, to make the customer searchable with these fields",इन क्षेत्रों के साथ ग्राहक खोज करने योग्य बनाने के लिए चुनें
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,दिखाएँ बंद
@@ -1917,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,निवेश से कैश फ्लो
 DocType: Program Course,Program Course,कार्यक्रम पाठ्यक्रम
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 DocType: Homepage,Company Tagline for website homepage,वेबसाइट मुखपृष्ठ के लिए कंपनी टैगलाइन
 DocType: Item Group,Item Group Name,आइटम समूह का नाम
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,में ले ली
@@ -1947,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,मेम्बरशिप विवरण
 DocType: Leave Block List,Block Holidays on important days.,महत्वपूर्ण दिन पर ब्लॉक छुट्टियाँ।
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),कृपया सभी अपेक्षित परिणाम मान इनपुट करें
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,लेखा प्राप्य सारांश
-DocType: Employee Loan,Monthly Repayment Amount,मासिक भुगतान राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,लेखा प्राप्य सारांश
+DocType: Loan,Monthly Repayment Amount,मासिक भुगतान राशि
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,खोलने चालान
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
 DocType: UOM,UOM Name,UOM नाम
 DocType: GST HSN Code,HSN Code,एचएसएन कोड
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,योगदान राशि
@@ -1972,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},उपयोगकर्ता {0} पहले से ही चिकित्सक को सौंपा गया है {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,डिब्बा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,संभव प्रदायक
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,संभव प्रदायक
+DocType: Journal Entry,JV-RET-,जेवी-RET-
 DocType: Budget,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),हेल्थकेयर (बीटा)
@@ -1999,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
-DocType: Employee Loan,Repayment Method,चुकौती विधि
+DocType: Loan,Repayment Method,चुकौती विधि
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","अगर जाँच की, होम पेज वेबसाइट के लिए डिफ़ॉल्ट मद समूह हो जाएगा"
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,कंपनी के खर्च के लिए दावा.
@@ -2008,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,प्रमाणपत्र आवश्यक है
 DocType: Company,Default Holiday List,छुट्टियों की सूची चूक
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},पंक्ति {0}: से समय और के समय {1} के साथ अतिव्यापी है {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,शेयर देयताएं
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,शेयर देयताएं
 DocType: Purchase Invoice,Supplier Warehouse,प्रदायक वेअरहाउस
 DocType: Opportunity,Contact Mobile No,मोबाइल संपर्क नहीं
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,कंपनी का चयन करें
@@ -2016,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,प्रिंट अनुभाग
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,उपयोगकर्ता {0} में कोई भी डिफ़ॉल्ट पीओएस प्रोफ़ाइल नहीं है इस उपयोगकर्ता के लिए पंक्ति {1} पर डिफ़ॉल्ट जांचें
 DocType: Student Group,Set 0 for no limit,कोई सीमा के लिए 0 सेट
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,पंक्ति {idx}: {field} को खोलने {invoice_type} चालान बनाने के लिए आवश्यक है
 DocType: Customer,Primary Address and Contact Detail,प्राथमिक पता और संपर्क विस्तार
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भुगतान ईमेल पुन: भेजें
@@ -2027,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,कृपया कम से कम एक डोमेन का चयन करें।
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: SMS Center,Receiver List,रिसीवर सूची
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,खोजें मद
 DocType: Payment Schedule,Payment Amount,भुगतान राशि
@@ -2040,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,ग्रेडिंग पैमाने
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,पहले से पूरा है
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,हाथ में स्टॉक
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,हाथ में स्टॉक
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,सफल आयात !
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
@@ -2051,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
 DocType: Customer,Customer POS Id,ग्राहक पीओएस आईडी
 DocType: Account,Account Name,खाते का नाम
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,धारावाहिक नहीं {0} मात्रा {1} एक अंश नहीं हो सकता
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,धारावाहिक नहीं {0} मात्रा {1} एक अंश नहीं हो सकता
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,कृपया Woocommerce सर्वर URL दर्ज करें
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
 DocType: Share Balance,To No,नहीं करने के लिए
-DocType: Subscription,Reference Document,संदर्भ दस्तावेज़
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} रद्द या बंद कर दिया है
 DocType: Accounts Settings,Credit Controller,क्रेडिट नियंत्रक
-DocType: Grant Application,Applicant Type,आवेदक प्रकार
+DocType: Loan,Applicant Type,आवेदक प्रकार
 DocType: Purchase Invoice,03-Deficiency in services,03-सेवाओं में कमी
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन डिस्पैच तिथि
 DocType: Healthcare Settings,Default Medical Code Standard,डिफ़ॉल्ट मेडिकल कोड मानक
@@ -2072,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानवीय संसाधन
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,मानवीय संसाधन
 DocType: Lead,Upper Income,ऊपरी आय
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,अस्वीकार
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी मुद्रा में डेबिट
 DocType: BOM Item,BOM Item,बीओएम आइटम
 DocType: Appraisal,For Employee,कर्मचारी के लिए
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,संवितरण एंट्री बनाओ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,संवितरण एंट्री बनाओ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
 DocType: Company,Default Values,डिफ़ॉल्ट मान
 DocType: Membership,INR,INR
@@ -2107,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),कुल (कर के बिना)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड गणना
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 से अधिक होना चाहिए
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,स्टॉक उपलब्ध
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,स्टॉक उपलब्ध
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिन) के लिए क्षमता योजना
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,खरीद
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,अनिवार्य क्षेत्र - कार्यक्रम
 DocType: Special Test Template,Result Component,परिणाम घटक
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,वारंटी का दावा
@@ -2130,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,पत्तियों के रूप में पत्तियों के भीतर छुट्टियों शामिल करें
 DocType: Sales Invoice,Packed Items,पैक्ड आइटम
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,सीरियल नंबर के खिलाफ वारंटी का दावा
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;कुल&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;कुल&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,शॉपिंग कार्ट सक्षम करें
 DocType: Employee,Permanent Address,स्थायी पता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2148,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,कार्रवाई की पुष्टि करें
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,पूर्ति
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,कार्ट में देखें
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,विपणन व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,मानक मानदंड नहीं बना सकते कृपया मापदंड का नाम बदलें
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
@@ -2173,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Material Request,Transferred,का तबादला
 DocType: Vehicle,Doors,दरवाजे के
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,रोगी पंजीकरण के लिए शुल्क लीजिए
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,स्टॉक लेनदेन के बाद विशेषताएँ नहीं बदल सकते एक नया आइटम बनाएं और नए आइटम में स्टॉक का स्थानांतरण करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,स्टॉक लेनदेन के बाद विशेषताएँ नहीं बदल सकते एक नया आइटम बनाएं और नए आइटम में स्टॉक का स्थानांतरण करें
 DocType: Course Assessment Criteria,Weightage,महत्व
 DocType: Purchase Invoice,Tax Breakup,कर टूटना
 DocType: Packing Slip,PS-,PS-
@@ -2211,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,सुलह JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Purchase Invoice Item,Batch No,कोई बैच
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,कर्मचारी अग्रिम
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 DocType: Student Group Instructor,Student Group Instructor,छात्र समूह के प्रशिक्षक
 DocType: Grant Application,Assessment  Mark (Out of 10),आकलन चिह्न (10 में से)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
@@ -2224,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Email Digest,Annual Expenses,सालाना खर्च
 DocType: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
 DocType: Sales Team,Contribution to Net Total,नेट कुल के लिए अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आइटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,स्टॉक सुलह
 DocType: Territory,Territory Name,टेरिटरी नाम
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,आप केवल सदस्यता में एक ही बिलिंग चक्र के साथ योजना बना सकते हैं
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,एक नौकरी के लिए आवेदक.
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
@@ -2241,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,मूल्यांकन
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,प्रशिक्षण कार्यक्रम
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,लीड स्रोत द्वारा ट्रैक लीड्स
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,कृपया दर्ज करें
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,कृपया दर्ज करें
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,रखरखाव लॉग
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,कृपया मद या गोदाम के आधार पर फ़िल्टर सेट
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),इस पैकेज के शुद्ध वजन. (वस्तुओं का शुद्ध वजन की राशि के रूप में स्वतः गणना)
@@ -2252,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,उद्धार और बिल के लिए
 DocType: Student Group,Instructors,अनुदेशकों
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,शेयर प्रबंधन
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,भुगतान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,भुगतान
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","गोदाम {0} किसी भी खाते से जुड़ा नहीं है, कृपया गोदाम रिकॉर्ड में खाते का उल्लेख करें या कंपनी {1} में डिफ़ॉल्ट इन्वेंट्री अकाउंट सेट करें।"
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,अपने आदेश की व्यवस्था करें
 DocType: Work Order Operation,Actual Time and Cost,वास्तविक समय और लागत
@@ -2266,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,छात्र लीव आवेदन
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,पर
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
@@ -2276,7 +2285,7 @@
 DocType: Item,Barcodes,बारकोड
 DocType: Hub Category,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,सहयोगी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,सहयोगी
 DocType: Asset Movement,Asset Movement,एसेट आंदोलन
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,कार्य क्रम {0} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,नई गाड़ी
@@ -2294,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट कंपनी की मुद्रा या पक्ष खाता मुद्रा के बराबर होनी चाहिए
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 DocType: Soil Texture,Loam,चिकनी बलुई मिट्टी
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,पंक्ति {0}: तिथि पोस्ट करने से पहले तिथि नहीं हो सकती
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,पंक्ति {0}: तिथि पोस्ट करने से पहले तिथि नहीं हो सकती
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,भुगतान प्रवेश कर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
 ,Sales Invoice Trends,बिक्री चालान रुझान
 DocType: Leave Application,Apply / Approve Leaves,पत्तों को स्वीकृत / लागू करें
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,के लिए
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',प्रभारी प्रकार या ' पिछली पंक्ति कुल ' पिछली पंक्ति राशि पर ' तभी पंक्ति का उल्लेख कर सकते
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',प्रभारी प्रकार या ' पिछली पंक्ति कुल ' पिछली पंक्ति राशि पर ' तभी पंक्ति का उल्लेख कर सकते
 DocType: Sales Order Item,Delivery Warehouse,वितरण गोदाम
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,वित्तीय लागत केन्द्रों के पेड़।
 DocType: Serial No,Delivery Document No,डिलिवरी दस्तावेज़
@@ -2314,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,मैन्युफैक्चरिंग सेटिंग्स में सामग्री की खपत नहीं है
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} से अधिक पंक्ति {1} में आइटम {0} के लिए अधिकतम नहीं लगाया जा सकता। अधिक-बिलिंग की अनुमति के लिए, कृपया स्टॉक सेटिंग में सेट करें"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} से अधिक पंक्ति {1} में आइटम {0} के लिए अधिकतम नहीं लगाया जा सकता। अधिक-बिलिंग की अनुमति के लिए, कृपया स्टॉक सेटिंग में सेट करें"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,रिस्पांस अपडेट करें
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
@@ -2325,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,पहले प्रोग्राम का चयन करें
 DocType: Patient Appointment,Patient Age,रोगी आयु
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,परियोजनाओं के प्रबंधन
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,सीरियल नंबर {0} पहले ही वापस कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,सीरियल नंबर {0} पहले ही वापस कर दिया गया है
 DocType: Supplier,Supplier of Goods or Services.,वस्तुओं या सेवाओं के आपूर्तिकर्ता है।
 DocType: Budget,Fiscal Year,वित्तीय वर्ष
 DocType: Asset Maintenance Log,Planned,नियोजित
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,परामर्श शुल्क बुक करने के लिए रोगी में सेट न किए जाने पर डिफ़ॉल्ट प्राप्य खाते का उपयोग किया जाना चाहिए।
 DocType: Vehicle Log,Fuel Price,ईंधन मूल्य
+DocType: Bank Guarantee,Margin Money,मार्जिन मनी
 DocType: Budget,Budget,बजट
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,खोलें सेट करें
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
@@ -2344,16 +2353,16 @@
 DocType: Lead,Follow Up,जाँच करना
 DocType: Item,Is Sales Item,बिक्री आइटम है
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आइटम समूह ट्री
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग चेक आइटम गुरु के लिए सेटअप नहीं है
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग चेक आइटम गुरु के लिए सेटअप नहीं है
 DocType: Maintenance Visit,Maintenance Time,अनुरक्षण काल
 ,Amount to Deliver,राशि वितरित करने के लिए
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},एक ही बार कई बार दर्ज किया गया है। {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,टर्म प्रारंभ तिथि से शैक्षणिक वर्ष की वर्ष प्रारंभ तिथि जो करने के लिए शब्द जुड़ा हुआ है पहले नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,त्रुटियां थीं .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,कर्मचारी {0} पहले से {2} और {3} के बीच {1} के लिए आवेदन कर चुका है:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,त्रुटियां थीं .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,कर्मचारी {0} पहले से {2} और {3} के बीच {1} के लिए आवेदन कर चुका है:
 DocType: Guardian,Guardian Interests,गार्जियन रूचियाँ
 DocType: Naming Series,Current Value,वर्तमान मान
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
 DocType: Education Settings,Instructor Records to be created by,प्रशिक्षक रिकॉर्ड्स द्वारा बनाया जाएगा
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} बनाया
 DocType: GST Account,GST Account,जीएसटी खाता
@@ -2373,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,पसंदीदा में जोड़ा गया
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,उपरोक्त चयनित मानदंडों के लिए कोई वेतन पर्ची जमा नहीं हुई है या पहले ही सबमिट की गई वेतन पर्ची
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,शुल्कों और करों
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,उपरोक्त चयनित मानदंडों के लिए कोई वेतन पर्ची जमा नहीं हुई है या पहले ही सबमिट की गई वेतन पर्ची
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,शुल्कों और करों
 DocType: Projects Settings,Projects Settings,परियोजनाएं सेटिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तिथि दर्ज करें
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} भुगतान प्रविष्टियों द्वारा फिल्टर नहीं किया जा सकता है {1}
@@ -2384,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,आइटम समूहों के पेड़ .
 DocType: Production Plan,Total Produced Qty,कुल उत्पादन मात्रा
 DocType: Payroll Entry,Get Employee Details,कर्मचारी विवरण प्राप्त करें
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
 DocType: Asset,Sold,बिक गया
 ,Item-wise Purchase History,आइटम के लिहाज से खरीदारी इतिहास
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 DocType: Sales Invoice Payment,Base Amount (Company Currency),आधार राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,कच्चा माल
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,कच्चा माल
 DocType: Payment Reconciliation Payment,Reference Row,संदर्भ पंक्ति
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
 DocType: Sales Invoice,Accounting Details,लेखा विवरण
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,इस कंपनी के लिए सभी लेन-देन को हटाएं
 DocType: Patient,O Positive,हे सकारात्मक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,निवेश
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,आवंटन
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,स्वीकृति मापदंड
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,उपरोक्त तालिका में सामग्री अनुरोध दर्ज करें
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,जर्नल एंट्री के लिए कोई भुगतान उपलब्ध नहीं है
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 DocType: BOM,Show In Website,वेबसाइट में दिखाएँ
 DocType: Shopping Cart Settings,Show Quantity in Website,वेबसाइट में मात्रा दिखाएँ
-DocType: Employee Loan Application,Total Payable Amount,कुल देय राशि
+DocType: Loan Application,Total Payable Amount,कुल देय राशि
 DocType: Task,Expected Time (in hours),(घंटे में) संभावित समय
 DocType: Item Reorder,Check in (group),जांच में (समूह)
 DocType: Soil Texture,Silt,गाद
@@ -2423,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,भुगतान करो
 DocType: Room,Room Name,कमरे का नाम
 DocType: Prescription Duration,Prescription Duration,प्रिस्क्रिप्शन अवधि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है, के रूप में पहले {0} रद्द / लागू नहीं किया जा सकते हैं छोड़ दो {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है, के रूप में पहले {0} रद्द / लागू नहीं किया जा सकते हैं छोड़ दो {1}"
 DocType: Activity Cost,Costing Rate,लागत दर
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ग्राहक के पते और संपर्क
 ,Campaign Efficiency,अभियान दक्षता
@@ -2441,11 +2451,11 @@
 DocType: Chapter,Chapter,अध्याय
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,जोड़ा
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,जब यह मोड चुना जाता है तो डिफ़ॉल्ट खाता स्वचालित रूप से पीओएस इनवॉइस में अपडेट हो जाएगा।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
 DocType: Asset,Depreciation Schedule,मूल्यह्रास अनुसूची
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,बिक्री साथी पते और संपर्क
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,आधा दिन की तारीख की तिथि से और आज तक के बीच होना चाहिए
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,आधा दिन की तारीख की तिथि से और आज तक के बीच होना चाहिए
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,कृपया {0} कंपनी में डिफ़ॉल्ट मूल्य केंद्र सेट करें
 DocType: Item,Has Batch No,बैच है नहीं
@@ -2463,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से)
 DocType: Soil Texture,Soil Type,मिट्टी के प्रकार
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,नया संदेश
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2483,7 +2492,7 @@
 DocType: Hub Category,Hub Category,हब श्रेणी
 DocType: Purchase Invoice,SEZ,सेज
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
-DocType: Employee Loan,Loan Amount,उधार की राशि
+DocType: Loan,Loan Amount,उधार की राशि
 DocType: Student Report Generation Tool,Add Letterhead,लेटरहेड जोड़ें
 DocType: Program Enrollment,Self-Driving Vehicle,स्व-ड्राइविंग वाहन
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,आपूर्तिकर्ता स्कोरकार्ड स्थायी
@@ -2511,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,पद
 DocType: Patient,Patient Details,रोगी विवरण
 DocType: Patient,B Positive,बी सकारात्मक
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 DocType: Patient Medical Record,Patient Medical Record,रोगी चिकित्सा रिकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,खेल
@@ -2521,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,वास्तविक कुल
 DocType: Lab Test UOM,Test UOM,परीक्षण यूओएम
 DocType: Student Siblings,Student Siblings,विद्यार्थी भाई बहन
+DocType: Subscription Plan Detail,Subscription Plan Detail,सदस्यता योजना विवरण
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,इकाई
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,कंपनी निर्दिष्ट करें
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,कंपनी निर्दिष्ट करें
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Asset Maintenance Task,Maintenance Task,रखरखाव कार्य
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,कृपया जीएसटी सेटिंग्स में बी 2 सी सीमा निर्धारित करें।
@@ -2536,6 +2546,7 @@
 ,BOM Search,सामग्री बीजक खोज
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),कुल उपभोजित सामग्री लागत (स्टॉक प्रविष्टि के माध्यम से)
 DocType: Hub Settings,Company Registered,कंपनी पंजीकृत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,तिथि से तिथि से कम नहीं हो सकता है
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",इस गोदाम में उपलब्ध स्टॉक के आधार पर &quot;स्टॉक में&quot; या &quot;स्टॉक में नहीं&quot; प्रकाशित करें।
 DocType: Vehicle,Fuel Type,ईंधन का प्रकार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
@@ -2543,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बैच में स्टॉक संतुलन {0} बन जाएगा नकारात्मक {1} गोदाम में आइटम {2} के लिए {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
 DocType: Email Digest,Pending Sales Orders,विक्रय आदेश लंबित
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 DocType: Employee,Create User Permission,उपयोगकर्ता अनुमति बनाएं
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Healthcare Settings,Remind Before,इससे पहले याद दिलाना
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
 DocType: Salary Component,Deduction,कटौती
 DocType: Item,Retain Sample,नमूना रखें
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
 DocType: Stock Reconciliation Item,Amount Difference,राशि अंतर
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
 DocType: Territory,Classification of Customers by region,क्षेत्र द्वारा ग्राहकों का वर्गीकरण
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,उत्पादन में
@@ -2563,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,परिकलित बैंक बैलेंस
 DocType: Normal Test Template,Normal Test Template,सामान्य टेस्ट टेम्पलेट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,विकलांग उपयोगकर्ता
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,उद्धरण
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,कोई उद्धरण नहीं प्राप्त करने के लिए प्राप्त आरएफक्यू को सेट नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,उद्धरण
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,कोई उद्धरण नहीं प्राप्त करने के लिए प्राप्त आरएफक्यू को सेट नहीं किया जा सकता
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,कुल कटौती
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,खाता मुद्रा में प्रिंट करने के लिए एक खाता चुनें
@@ -2572,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,यह इस रोगी के विरुद्ध लेनदेन पर आधारित है। विवरण के लिए नीचे दी गई समयरेखा देखें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,मूल्य अपडेट
 DocType: Patient,Date of Birth,जन्म तिथि
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,आपूर्तिकर्ता स्कोरकार्ड सेटअप
@@ -2583,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,नौकरी का विवरण
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,नौकरी का विवरण
 DocType: Student Applicant,Applied,आवेदन किया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,पुनः खुला
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,पुनः खुला
 DocType: Sales Invoice Item,Qty as per Stock UOM,मात्रा स्टॉक UOM के अनुसार
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 नाम
 DocType: Purchase Invoice,02-Post Sale Discount,02-पोस्ट बिक्री डिस्काउंट
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए।"
+DocType: Department Approver,Approver,सरकारी गवाह
 ,SO Qty,अतः मात्रा
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,शेयरधारक को फ़ील्ड रिक्त नहीं हो सकता
 DocType: Guardian,Work Address,कार्यालय का पता
@@ -2604,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),कुल आवंटित राशि (कंपनी मुद्रा)
 DocType: Purchase Order Item,To be delivered to customer,ग्राहक के लिए दिया जाना
 DocType: BOM,Scrap Material Cost,स्क्रैप सामग्री लागत
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
 DocType: Grant Application,Email Notification Sent,ईमेल अधिसूचना प्रेषित
 DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","आइटम कोड, गोदाम, मात्रा पंक्ति पर आवश्यक हैं"
-DocType: Pricing Rule,Supplier,प्रदायक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","आइटम कोड, गोदाम, मात्रा पंक्ति पर आवश्यक हैं"
+DocType: Bank Guarantee,Supplier,प्रदायक
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,भुगतान विवरण दिखाएं
 DocType: Consultation,Consultation Time,परामर्श समय
 DocType: C-Form,Quarter,तिमाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,विविध व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,विविध व्यय
 DocType: Global Defaults,Default Company,Default कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
 DocType: Payment Request,PR,पीआर
 DocType: Cheque Print Template,Bank Name,बैंक का नाम
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,ऊपर
-DocType: Employee Loan,Employee Loan Account,कर्मचारी ऋण खाता
 DocType: Leave Application,Total Leave Days,कुल छोड़ दो दिन
 DocType: Email Digest,Note: Email will not be sent to disabled users,नोट: ईमेल अक्षम उपयोगकर्ताओं के लिए नहीं भेजा जाएगा
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,इंटरैक्शन की संख्या
@@ -2633,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्राम में)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",अध्याय / अध्याय_नाम अध्याय को बचाने के बाद स्वत: सेट को रिक्त छोड़ देता है
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,कृपया जीएसटी सेटिंग्स जीएसटी सेटिंग्स में सेट करें
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,कृपया जीएसटी सेटिंग्स जीएसटी सेटिंग्स में सेट करें
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,व्यापार का प्रकार
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,नई खरीद की लागत
@@ -2642,12 +2654,13 @@
 DocType: Grant Application,Grant Description,अनुदान विवरण
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
 DocType: Student Guardian,Others,दूसरों
+DocType: Subscription,Discounts,छूट
 DocType: Payment Entry,Unallocated Amount,unallocated राशि
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।
 DocType: POS Profile,Taxes and Charges,करों और प्रभार
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पाद या, खरीदा या बेचा स्टॉक में रखा जाता है कि एक सेवा।"
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,कोई और अधिक अद्यतन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,यह इस सेटअप से जुड़ी सभी स्कोरकार्डों को शामिल करता है
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,बाल मद एक उत्पाद बंडल नहीं होना चाहिए। आइटम को हटा दें `` {0} और बचाने के लिए कृपया
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,बैंकिंग
@@ -2655,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,सेवा आइटम
 DocType: Bank Guarantee,Bank Guarantee,बैंक गारंटी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए नंबरिंग श्रृंखला सेट करें
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Grading Scale,Grading Scale Intervals,ग्रेडिंग पैमाने अंतराल
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,इस साल का मुनाफा
+DocType: Bank Guarantee,Name of Bank,बैंक का नाम
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} के लिए लेखा प्रविष्टि केवल मुद्रा में किया जा सकता है: {3}
 DocType: Fee Schedule,In Process,इस प्रक्रिया में
 DocType: Authorization Rule,Itemwise Discount,Itemwise डिस्काउंट
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,वित्तीय खातों के पेड़।
+DocType: Bank Guarantee,Reference Document Type,संदर्भ दस्तावेज़ प्रकार
 DocType: Cash Flow Mapping,Cash Flow Mapping,कैश फ्लो मैपिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ईमेल डिफ़ॉल्ट संपर्क में नहीं मिला
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,गुप्त उत्पन्न करें
-DocType: Employee Loan,Account Info,खाता जानकारी
+DocType: Loan,Account Info,खाता जानकारी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
 DocType: Fees,Include Payment,भुगतान शामिल करें
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} छात्र समूह बनाया गया
 DocType: Sales Invoice,Total Billing Amount,कुल बिलिंग राशि
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,शुल्क संरचना और छात्र समूह {0} में कार्यक्रम अलग-अलग हैं
 DocType: Fee Schedule,Receivable Account,प्राप्य खाता
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
 DocType: Quotation Item,Stock Balance,बाकी स्टाक
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,सी ई ओ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,सी ई ओ
 DocType: Purchase Invoice,With Payment of Tax,कर के भुगतान के साथ
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,आपूर्तिकर्ता के लिए ट्रिपलकाट
 DocType: Land Unit,Is Container,कंटेनर है
 DocType: Crop Cycle,This will be day 1 of the crop cycle,यह फसल चक्र का दिन 1 होगा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,सही खाते का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,सही खाते का चयन करें
 DocType: Purchase Invoice Item,Weight UOM,वजन UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,फोलिओ नंबर वाले उपलब्ध शेयरधारकों की सूची
 DocType: Salary Structure Employee,Salary Structure Employee,वेतन ढांचे कर्मचारी
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,विविध गुण दिखाएं
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,विविध गुण दिखाएं
 DocType: Student,Blood Group,रक्त वर्ग
 DocType: Course,Course Name,कोर्स का नाम
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,एक विशिष्ट कर्मचारी की छुट्टी आवेदनों को स्वीकृत कर सकते हैं जो प्रयोक्ता
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,कार्यालय उपकरण
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,कार्यालय उपकरण
 DocType: Purchase Invoice Item,Qty,मात्रा
 DocType: Fiscal Year,Companies,कंपनियां
 DocType: Supplier Scorecard,Scoring Setup,स्कोरिंग सेटअप
@@ -2712,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,कुल आवक मूल्य
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,डेबिट करने के लिए आवश्यक है
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,खरीद मूल्य सूची
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,आपूर्तिकर्ता स्कोरकार्ड चर के टेम्पलेट्स
 DocType: Job Offer Term,Offer Term,ऑफर टर्म
 DocType: Asset,Quality Manager,गुणवत्ता प्रबंधक
@@ -2724,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},कुल अवैतनिक: {0}
 DocType: BOM Website Operation,BOM Website Operation,बीओएम वेबसाइट ऑपरेशन
 DocType: Supplier Scorecard,Supplier Score,आपूर्तिकर्ता स्कोर
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,कुल चालान किए गए राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,कुल चालान किए गए राशि
 DocType: Supplier,Warn RFQs,आरएफक्यू को चेतावनी दें
 DocType: BOM,Conversion Rate,रूपांतरण दर
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,उत्पाद खोज
 DocType: Assessment Plan,To Time,समय के लिए
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य से ऊपर) भूमिका का अनुमोदन
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
+DocType: Loan,Total Amount Paid,भुगतान की गई कुल राशि
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"कृपया छात्र प्रवेश का चयन करें, जो सशुल्क छात्र आवेदक के लिए अनिवार्य है"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,मूल्य प्रकाशित करने के लिए कृपया एक मूल्य सूची चुनें
@@ -2740,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},पंक्ति {0}: पूर्ण मात्रा से अधिक नहीं हो सकता है {1} ऑपरेशन के लिए {2}
 DocType: Manufacturing Settings,Allow Overtime,ओवरटाइम की अनुमति दें
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","सीरियल किए गए आइटम {0} को शेयर सुलह का उपयोग करके अपडेट नहीं किया जा सकता है, कृपया स्टॉक प्रविष्टि का उपयोग करें"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","सीरियल किए गए आइटम {0} को शेयर सुलह का उपयोग करके अपडेट नहीं किया जा सकता है, कृपया स्टॉक प्रविष्टि का उपयोग करें"
 DocType: Training Event Employee,Training Event Employee,प्रशिक्षण घटना कर्मचारी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,अधिकतम नमूनों - {0} को बैच {1} और वस्तु {2} के लिए रखा जा सकता है।
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,समय स्लॉट जोड़ें
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} मद के लिए आवश्यक सीरियल नंबर {1}। आपके द्वारा दी गई {2}।
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Training Event,Advance,अग्रिम
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,दोबारा आवर्ती बनाने के लिए
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Gocardless भुगतान गेटवे सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,मुद्रा लाभ / हानि
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,मुद्रा लाभ / हानि
 DocType: Opportunity,Lost Reason,खोया कारण
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},पंक्ति # {0}: खाता {1} कंपनी के नहीं है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},पंक्ति # {0}: खाता {1} कंपनी के नहीं है {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},डॉकटाइप खोज में असमर्थ {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
@@ -2770,7 +2786,6 @@
 DocType: Bin,Actual Quantity,वास्तविक मात्रा
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},सदस्यता {0} हो गई है
 DocType: Fee Schedule Program,Fee Schedule Program,शुल्क अनुसूची कार्यक्रम
 DocType: Fee Schedule Program,Student Batch,छात्र बैच
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,छात्र
@@ -2785,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ई-कॉमर्स जीएसटीआईएन
 DocType: Sales Order,Not Delivered,नहीं वितरित
 ,Bank Clearance Summary,बैंक क्लीयरेंस सारांश
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,श्रेणी का सुझाव?
 DocType: Stock Reconciliation Item,Current Amount,वर्तमान राशि
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,बिल्डिंग
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,बिल्डिंग
 DocType: Fee Schedule,Fee Structure,शुल्क संरचना
 DocType: Timesheet Detail,Costing Amount,लागत राशि
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
 DocType: Student Admission Program,Application Fee,आवेदन शुल्क
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,वेतनपर्ची सबमिट करें
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,आइटम के लिए Maxiumm छूट {0} {1} % है
@@ -2800,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
 DocType: SMS Log,Sender Name,प्रेषक का नाम
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,कृषि विश्लेषण मानदंड
+DocType: HR Settings,Leave Approval Notification Template,स्वीकृति अधिसूचना टेम्पलेट छोड़ दें
 DocType: POS Profile,[Select],[ चुनें ]
 DocType: Vital Signs,Blood Pressure (diastolic),रक्तचाप (डायस्टोलिक)
 DocType: SMS Log,Sent To,भेजा
 DocType: Agriculture Task,Holiday Management,छुट्टी प्रबंधन
 DocType: Payment Request,Make Sales Invoice,बिक्री चालान बनाएं
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,सॉफ्टवेयर
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,सॉफ्टवेयर
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},चिकित्सक {0} {1} पर उपलब्ध नहीं है
@@ -2823,7 +2838,7 @@
 DocType: Employee,New Workplace,नए कार्यस्थल
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,सामग्री खपत
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,बंद के रूप में सेट करें
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},बारकोड के साथ कोई आइटम {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},बारकोड के साथ कोई आइटम {0}
 DocType: Normal Test Items,Require Result Value,परिणाम मान की आवश्यकता है
 DocType: Item,Show a slideshow at the top of the page,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2838,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,आवर्ती
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,कैश फ्लो मानचित्रण खाका विवरण
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ऋण प्रबंधन
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,अलग आय को ट्रैक और उत्पाद कार्यक्षेत्र या डिवीजनों के लिए खर्च।
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,वेतन पर्ची दिखाएँ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,वेतन पर्ची दिखाएँ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,हस्तांतरण सामग्री
 DocType: Fees,Send Payment Request,भुगतान अनुरोध भेजें
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 DocType: Water Analysis,Origin,मूल
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
@@ -2865,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,आयकर दायित्व है
 DocType: Grading Scale Interval,Grade Description,ग्रेड विवरण
 DocType: Stock Entry,Purchase Receipt No,रसीद खरीद नहीं
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाना राशि
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,बयाना राशि
 DocType: Sales Invoice, Shipping Bill Number,शिपिंग बिल संख्या
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,पता लगाने की क्षमता
 DocType: Asset Maintenance Log,Actions performed,क्रियाएं निष्पादित हुईं
 DocType: Cash Flow Mapper,Section Leader,अनुभाग लीडर
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),धन के स्रोत (देनदारियों)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),धन के स्रोत (देनदारियों)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,कर्मचारी
+DocType: Bank Guarantee,Fixed Deposit Number,सावधि जमा संख्या
 DocType: Asset Repair,Failure Date,असफलता तिथि
 DocType: Sample Collection,Collected Time,एकत्रित समय
 DocType: Company,Sales Monthly History,बिक्री मासिक इतिहास
@@ -2889,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,क्या आप वाकई इस नियुक्ति को रद्द करना चाहते हैं?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,होटल रूम प्राइसिंग पैकेज
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,बिक्री पाइपलाइन
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,सदस्यता अपडेट प्राप्त करें
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},खाता {0} कंपनी के साथ मेल नहीं खाता है {1}: विधि का {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,कोर्स:
@@ -2902,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,कोई कार्य आदेश नहीं बनाया गया
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,कर्मचारी के वेतन पर्ची {0} पहले से ही इस अवधि के लिए बनाए गए
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,औषधि
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,औषधि
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरीदी गई वस्तुओं की लागत
 DocType: Selling Settings,Sales Order Required,बिक्री आदेश आवश्यक
 DocType: Purchase Invoice,Credit To,करने के लिए क्रेडिट
@@ -2920,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,कोई उद्धरण नहीं
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Gateway Account,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,प्रतिपूरक बंद
 DocType: Job Offer,Accepted,स्वीकार किया
@@ -2932,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,खोज के परिणाम
 DocType: Room,Room Number,कमरा संख्या
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 DocType: Journal Entry Account,Payroll Entry,पेरोल एंट्री
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,देखें फीस रिकॉर्ड्स
@@ -2942,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Lab Test Sample,Lab Test Sample,लैब टेस्ट नमूना
 DocType: Item Variant Settings,Allow Rename Attribute Value,नाम बदलें विशेषता मान
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Restaurant,Invoice Series Prefix,चालान श्रृंखला उपसर्ग
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
@@ -2950,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google मानचित्र एकीकरण सक्षम नहीं है
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,सदस्यता समाप्ति तिथि
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} वापसी दस्तावेज़ में नकारात्मक होना चाहिए
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} वापसी दस्तावेज़ में नकारात्मक होना चाहिए
 ,Minutes to First Response for Issues,मुद्दे के लिए पहली प्रतिक्रिया मिनट
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
@@ -2970,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,माप की इकाई
 DocType: Fiscal Year,Year End Date,वर्षांत तिथि
 DocType: Task Depends On,Task Depends On,काम पर निर्भर करता है
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,अवसर
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,अवसर
 DocType: Operation,Default Workstation,मूलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,व्यय दावा संदेश स्वीकृत
 DocType: Payment Entry,Deductions or Loss,कटौती या घटाने
@@ -3008,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,बिना वेतन छुट्टी को मंजूरी दे दी लीव आवेदन रिकॉर्ड के साथ मेल नहीं खाता
 DocType: Campaign,Campaign-.####,अभियान . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चालान बनाएं
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,शेष राशि
@@ -3017,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,बारकोड {0} एक मान्य {1} कोड नहीं है
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,अंत वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,कोट / लीड%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Driver,Driver,चालक
 DocType: Vital Signs,Nutrition Values,पोषण मान
 DocType: Lab Test Template,Is billable,बिल योग्य है
@@ -3028,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),वास्तविक प्रारंभ तिथि (समय पत्रक के माध्यम से)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,बूढ़े सीमा 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,कुल अग्रिम राशि कुल दावा राशि से अधिक नहीं हो सकती
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,कुल अग्रिम राशि कुल दावा राशि से अधिक नहीं हो सकती
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3083,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,विशेषता मान चुनें
 DocType: Purchase Invoice,Reason For Issuing document,दस्तावेज़ जारी करने का कारण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,अगले संपर्क के द्वारा सीसा ईमेल एड्रेस के रूप में ही नहीं किया जा सकता
 DocType: Tax Rule,Billing City,बिलिंग शहर
@@ -3100,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,सेवा पता
 DocType: Asset Maintenance Task,Calibration,कैलिब्रेशन
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} कंपनी की छुट्टी है
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures और फिक्सर
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,स्टेटस अधिसूचना छोड़ दें
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures और फिक्सर
 DocType: Item,Manufacture,उत्पादन
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,सेटअप कंपनी
 ,Lab Test Report,लैब टेस्ट रिपोर्ट
@@ -3116,7 +3135,6 @@
 DocType: Crop,Planting Area,रोपण क्षेत्र
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,यह में कुछ अमान्य ईमेल पते के कारण हो सकता है
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,आपने जोड़ा
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,प्रशिक्षण के परिणाम
@@ -3126,16 +3144,17 @@
 DocType: Products Settings,Products per Page,प्रति पृष्ठ उत्पाद
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,संगठन शाखा मास्टर .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,किसी समस्या की रिपोर्ट
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,उपयोगिता व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,उपयोगिता व्यय
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 से ऊपर
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,पंक्ति # {0}: जर्नल प्रविष्टि {1} खाता नहीं है {2} या पहले से ही एक और वाउचर के खिलाफ मिलान
 DocType: Supplier Scorecard Criteria,Criteria Weight,मापदंड वजन
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,स्वीकृति अधिसूचना छोड़ दें
 DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
 DocType: Payroll Entry,Salary Slip Based on Timesheet,वेतन पर्ची के आधार पर Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,खरीदना दर
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,खरीदना दर
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 DocType: Payment Entry,Payment Type,भुगतान के प्रकार
@@ -3157,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,शॉपिंग कार्ट सेटिंग्स
 DocType: Journal Entry,Accounting Entries,लेखांकन प्रवेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","अगर &#39;मूल्य&#39; के लिए चुना गया मूल्य निर्धारण नियम बना हुआ है, तो यह मूल्य सूची को अधिलेखित कर देगा। मूल्य निर्धारण नियम दर अंतिम दर है, इसलिए कोई और छूट लागू नहीं की जानी चाहिए। इसलिए, बिक्री आदेश, खरीद आदेश आदि जैसे लेनदेन में, &#39;मूल्य सूची दर&#39; क्षेत्र की बजाय &#39;दर&#39; फ़ील्ड में प्राप्त किया जाएगा।"
+DocType: Journal Entry,Paid Loan,भुगतान ऋण
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},एंट्री डुप्लिकेट. प्राधिकरण नियम की जांच करें {0}
 DocType: Journal Entry Account,Reference Due Date,संदर्भ नियत दिनांक
 DocType: Purchase Order,Ref SQ,रेफरी वर्ग
@@ -3173,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/config/hr.py +93,Payroll,पेरोल
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
 DocType: Patient Service Unit,Parent Service Unit,जनक सेवा इकाई
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,बनाओ उपयोगकर्ता
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
@@ -3191,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,आय खाता
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,वितरण
 DocType: Volunteer,Weekdays,काम करने के दिन
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: Restaurant Menu,Restaurant Menu,रेस्तरां मेनू
@@ -3199,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,सतत सूची के लिए डिफ़ॉल्ट इन्वेंट्री खाता सेट करें
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,सतत सूची के लिए डिफ़ॉल्ट इन्वेंट्री खाता सेट करें
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,अनुदान भेजें ईमेल भेजें
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage भरा हुआ है, नहीं सहेजा गया"
@@ -3207,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,कमरे की क्षमता
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},आइटम के लिए पहले से ही रिकॉर्ड मौजूद है {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,संदर्भ .......................
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,आप पहले जेनरेट किए गए चालान के रिकॉर्ड खो देंगे। क्या आप वाकई इस सदस्यता को पुनरारंभ करना चाहते हैं?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,पंजीयन शुल्क
 DocType: Budget,Cost Center,लागत केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,वाउचर #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,वाउचर #
 DocType: Notification Control,Purchase Order Message,खरीद आदेश संदेश
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,बिक्री लेन-देन से ग्राहक के कर आईडी छुपाएं
@@ -3219,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस केवल स्टॉक एंट्री / डिलिवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Employee Education,Class / Percentage,/ कक्षा प्रतिशत
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,आयकर
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Letterheads पर जाएं
+DocType: Subscription,Cancel At End Of Period,अवधि के अंत में रद्द करें
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,हस्तांतरण के लिए कोई आइटम नहीं चुना गया
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,हस्तांतरण के लिए कोई आइटम नहीं चुना गया
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
 DocType: Vehicle,Electric,बिजली
 DocType: Task,% Progress,% प्रगति
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,लाभ / आस्ति निपटान पर हानि
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,लाभ / आस्ति निपटान पर हानि
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",केवल &quot;स्वीकृत&quot; स्थिति वाले छात्र आवेदक का चयन नीचे दी गई तालिका में किया जाएगा।
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,खाता {0} के लिए खाता संख्या उपलब्ध नहीं है <br> कृपया अपने चार्ट्स अकाउंट्स को सही ढंग से सेटअप करें
 DocType: Task,Depends on Tasks,कार्य पर निर्भर करता है
@@ -3247,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,स्टॉक में नहीं
 DocType: Volunteer,Volunteer Skills,स्वयंसेवी कौशल
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
+DocType: Bank Guarantee,Reference Document Name,संदर्भ दस्तावेज़ का नाम
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर और शुल्क कटौती
 apps/erpnext/erpnext/hooks.py +142,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},स्थिति का एक होना चाहिए {0}
@@ -3260,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} अयोग्य कर दिया है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,एक्स्ट्रा लार्ज
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,एक्स्ट्रा लार्ज
+DocType: Loan,Loan Application,ऋण का आवेदन
 DocType: Crop,Scientific Name,वैज्ञानिक नाम
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,कुल पत्तियां
 DocType: Customer,"Reselect, if the chosen contact is edited after save","रीसेट करें, अगर सहेजे जाने के बाद चुना गया संपर्क संपादित किया गया है"
@@ -3269,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,चेक संख्या
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,स्थानीय
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,देनदार
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,बड़ा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,बड़ा
 DocType: Homepage Featured Product,Homepage Featured Product,मुखपृष्ठ रुप से प्रदर्शित उत्पाद
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,सभी मूल्यांकन समूह
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,सभी मूल्यांकन समूह
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नए गोदाम नाम
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),कुल {0} ({1})
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
@@ -3296,9 +3320,10 @@
 DocType: Fees,Fees,फीस
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर दूसरे में एक मुद्रा में परिवर्तित करने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,कुल बकाया राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,कुल बकाया राशि
 DocType: Sales Partner,Targets,लक्ष्य
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,कृपया कंपनी की जानकारी फ़ाइल में SIREN नंबर को पंजीकृत करें
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्स में कर्मचारी नामकरण प्रणाली सेट करें
 DocType: Price List,Price List Master,मूल्य सूची मास्टर
 DocType: GST Account,CESS Account,सीईएस खाता
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
@@ -3307,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,रोगी का चयन करें
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,मापदण्ड नाम
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,केवल छोड़ दो की स्थिति के साथ अनुप्रयोग &#39;स्वीकृत&#39; और &#39;अस्वीकृत&#39; प्रस्तुत किया जा सकता
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},छात्र समूह का नाम पंक्ति में अनिवार्य है {0}
 DocType: Homepage,Products to be shown on website homepage,उत्पाद वेबसाइट के होमपेज पर दिखाया जाएगा
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
@@ -3351,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,चालान पहले से ही सभी बिलिंग घंटों के लिए बनाए गए हैं
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},नाम में त्रुटि: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,वित्त लागत है
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,कृपया रेस्तरां सेटिंग में डिफ़ॉल्ट ग्राहक सेट करें
 ,Salary Register,वेतन रजिस्टर
 DocType: Warehouse,Parent Warehouse,जनक गोदाम
-DocType: C-Form Invoice Detail,Net Total,शुद्ध जोड़
+DocType: Subscription,Net Total,शुद्ध जोड़
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},आइटम {0} और प्रोजेक्ट {1} के लिए डिफ़ॉल्ट BOM नहीं मिला
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,विभिन्न प्रकार के ऋण को परिभाषित करें
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,विभिन्न प्रकार के ऋण को परिभाषित करें
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,बकाया राशि
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),समय (मिनट में)
@@ -3390,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,रूट खाते एक समूह होना चाहिए
 DocType: Drug Prescription,Drug Prescription,ड्रग प्रिस्क्रिप्शन
 DocType: Fees,FEE.,शुल्क।
-DocType: Employee Loan,Repaid/Closed,चुकाया / बंद किया गया
+DocType: Loan,Repaid/Closed,चुकाया / बंद किया गया
 DocType: Item,Total Projected Qty,कुल अनुमानित मात्रा
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","आइटम {0} के लिए मूल्यांकन दर नहीं मिली, जिसे {1} {2} के लिए लेखा प्रविष्टियां करने की आवश्यकता है यदि आइटम {1} में शून्य मूल्यांकन दर आइटम के रूप में लेनदेन कर रहे हैं, तो कृपया {1} आइटम तालिका में उल्लेख करें। अन्यथा, कृपया आइटम के लिए आने वाले स्टॉक लेनदेन को बनाएं या मद रिकॉर्ड में मूल्यांकन दर का उल्लेख करें, और फिर इस प्रविष्टि को सबमिट करने / रद्द करने का प्रयास करें"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 DocType: Course,Course Code,पाठ्यक्रम कोड
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: POS Settings,Use POS in Offline Mode,ऑफ़लाइन मोड में पीओएस का उपयोग करें
@@ -3414,16 +3439,15 @@
 DocType: Purchase Invoice,Deemed Export,डीम्ड एक्सपोर्ट
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,डिस्काउंट प्रतिशत एक मूल्य सूची के खिलाफ या सभी मूल्य सूची के लिए या तो लागू किया जा सकता है.
-DocType: Subscription,Half-yearly,आधे साल में एक बार
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Lab Test,LabTest Approver,लैबैस्ट एपीओवर
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,आप मूल्यांकन मानदंड के लिए पहले से ही मूल्यांकन कर चुके हैं {}
 DocType: Vehicle Service,Engine Oil,इंजन तेल
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},निर्मित कार्य आदेश: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},निर्मित कार्य आदेश: {0}
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
-DocType: Employee Loan,Loan Details,ऋण विवरण
+DocType: Loan,Loan Details,ऋण विवरण
 DocType: Company,Default Inventory Account,डिफ़ॉल्ट इन्वेंटरी अकाउंट
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,फ़ोलियो नंबर मिलान नहीं कर रहे हैं
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
@@ -3435,19 +3459,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,सभी भूमि इकाइयों के लिए एक लिंक जिसमें फसल बढ़ रही है
 DocType: Account,Root Type,जड़ के प्रकार
 DocType: Item,FIFO,फीफो
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},पंक्ति # {0}: अधिक से अधिक नहीं लौट सकते हैं {1} आइटम के लिए {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},पंक्ति # {0}: अधिक से अधिक नहीं लौट सकते हैं {1} आइटम के लिए {2}
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठ के शीर्ष पर इस स्लाइड शो दिखाएँ
 DocType: BOM,Item UOM,आइटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
 DocType: Cheque Print Template,Primary Settings,प्राथमिक सेटिंग
 DocType: Purchase Invoice,Select Supplier Address,प्रदायक पते का चयन
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,कर्मचारियों को जोड़ने
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,कर्मचारियों को जोड़ने
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता निरीक्षण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,अतिरिक्त छोटा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,अतिरिक्त छोटा
 DocType: Company,Standard Template,स्टैंडर्ड खाका
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
@@ -3467,11 +3491,10 @@
 DocType: SMS Log,No of Sent SMS,भेजे गए एसएमएस की संख्या
 DocType: Antibiotic,Healthcare Administrator,हेल्थकेयर प्रशासक
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,लक्ष्य रखना
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 DocType: Dosage Strength,Dosage Strength,डोज़ स्ट्रेंथ
 DocType: Account,Expense Account,व्यय लेखा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,सॉफ्टवेयर
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,रंगीन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,रंगीन
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,आकलन योजना मानदंड
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,चयनित वस्तु के लिए समाप्ति तिथि अनिवार्य है
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,खरीद ऑर्डर रोकें
@@ -3484,18 +3507,18 @@
 DocType: Patient,Personal and Social History,व्यक्तिगत और सामाजिक इतिहास
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,उपयोगकर्ता {0} बनाया गया
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक छात्र के लिए फी ब्रेकअप
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,कोड बदलें
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 DocType: Stock Reconciliation,SR/,एसआर /
 DocType: Vehicle,Diesel,डीज़ल
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
 DocType: Purchase Invoice,Availed ITC Cess,लाभ हुआ आईटीसी सेस
 ,Student Monthly Attendance Sheet,छात्र मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,नौवहन नियम केवल बेचना के लिए लागू है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,परियोजना प्रारंभ दिनांक
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,जब तक
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,जब तक
 DocType: Rename Tool,Rename Log,प्रवेश का नाम बदलें
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,छात्र समूह या पाठ्यक्रम अनुसूची अनिवार्य है
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,बिलिंग घंटे और काम के घंटे timesheet पर ही बनाए रखने
@@ -3515,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,अपने उत्पादों या सेवाओं को सूचीबद्ध करें जिन्हें आप खरीद या बेचते हैं।
 DocType: Water Analysis,Storage Temperature,भंडारण तापमान
 DocType: Employee Attendance Tool,Unmarked Attendance,अगोचर उपस्थिति
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,अनुसंधानकर्ता
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,अनुसंधानकर्ता
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,कार्यक्रम नामांकन उपकरण छात्र
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},प्रारंभ तिथि कार्य के लिए समाप्ति तिथि से कम होनी चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,नाम या ईमेल अनिवार्य है
@@ -3525,9 +3548,10 @@
 DocType: Student,Exit,निकास
 apps/erpnext/erpnext/accounts/doctype/account/account.py +156,Root Type is mandatory,रूट प्रकार अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,प्रीसेट स्थापित करने में विफल
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} में वर्तमान में एक {1} प्रदायक स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को आरएफक्यू सावधानी के साथ जारी किया जाना चाहिए।"
 DocType: Chapter,Non Profit Manager,गैर लाभ प्रबंधक
 DocType: BOM,Total Cost(Company Currency),कुल लागत (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,धारावाहिक नहीं {0} बनाया
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,धारावाहिक नहीं {0} बनाया
 DocType: Homepage,Company Description for website homepage,वेबसाइट मुखपृष्ठ के लिए कंपनी विवरण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ग्राहकों की सुविधा के लिए इन कोड प्रिंट स्वरूपों में चालान और वितरण नोट की तरह इस्तेमाल किया जा सकता है
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier नाम
@@ -3537,11 +3561,10 @@
 DocType: Employee,You can enter any date manually,आप किसी भी तारीख को मैन्युअल रूप से दर्ज कर सकते हैं
 DocType: Healthcare Settings,Result Printed,परिणाम मुद्रित
 DocType: Asset Category Account,Depreciation Expense Account,मूल्यह्रास व्यय खाते में
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,परिवीक्षाधीन अवधि
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} देखें
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,परिवीक्षाधीन अवधि
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Project,Total Costing Amount (via Timesheets),कुल लागत (टाइम्सशीट्स के माध्यम से)
-DocType: Employee Advance,Expense Approver,व्यय अनुमोदनकर्ता
+DocType: Department,Expense Approver,व्यय अनुमोदनकर्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 DocType: Project,Hourly,प्रति घंटा
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,गैर-समूह समूह को
@@ -3550,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime करने के लिए
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रविष्टि के माध्यम से भुगतान करने के
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,इस तिथि पर प्रिंट किया गया
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,इस तिथि पर प्रिंट किया गया
 DocType: Item,Inspection Required before Delivery,निरीक्षण प्रसव से पहले आवश्यक
 DocType: Item,Inspection Required before Purchase,निरीक्षण खरीद से पहले आवश्यक
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,गतिविधियों में लंबित
@@ -3560,7 +3583,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,न्यूनतम आदेश मात्रा
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,आपकी संगठन
 DocType: Fee Component,Fees Category,फीस श्रेणी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,तारीख से राहत दर्ज करें.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,राशि
 DocType: Supplier Scorecard,Notify Employee,कर्मचारी को सूचित करें
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
@@ -3570,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Company,Chart Of Accounts Template,लेखा खाका का चार्ट
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},आइटम की {0} में मूल्य सूची के लिए अद्यतन {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},आइटम की {0} में मूल्य सूची के लिए अद्यतन {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Purchase Invoice Item,Accepted Warehouse,स्वीकार किए जाते हैं गोदाम
@@ -3578,10 +3601,11 @@
 DocType: Item,Valuation Method,मूल्यन विधि
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,मार्क आधे दिन
 DocType: Sales Invoice,Sales Team,बिक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,प्रवेश डुप्लिकेट
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,प्रवेश डुप्लिकेट
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,सबमिट करने से पहले लाभार्थी का नाम दर्ज करें।
 DocType: Program Enrollment Tool,Get Students,छात्रों
 DocType: Serial No,Under Warranty,वारंटी के अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[त्रुटि]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[त्रुटि]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,एक बार जब आप विक्रय क्रम सहेजें शब्दों में दिखाई जाएगी।
 ,Employee Birthday,कर्मचारी जन्मदिन
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,कृपया पूर्ण मरम्मत के लिए समापन तिथि चुनें
@@ -3600,7 +3624,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,उप अनुबंध के लिए आरक्षित
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
 DocType: Shopping Cart Settings,Orders,आदेश
-DocType: Employee Leave Approver,Leave Approver,अनुमोदक छोड़ दो
+DocType: Department,Leave Approver,अनुमोदक छोड़ दो
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,कृपया बैच का चयन करें
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,आकलन समूह का नाम
@@ -3644,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,हब ट्रैक किए गए आइटम
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT के लिए मूल
 DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,यह ईमेल स्वतः प्रेरित है
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
 DocType: Program Enrollment,Boarding Student,बोर्डिंग छात्र
 DocType: Asset,Expected Value After Useful Life,उम्मीद मूल्य उपयोगी जीवन के बाद
@@ -3669,21 +3692,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},उपस्थिति रिकॉर्ड {0} छात्र के खिलाफ मौजूद {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,मूल्यह्रास संपत्ति के निपटान की वजह से सफाया
-DocType: Member,Member,सदस्य
+DocType: Loan,Member,सदस्य
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,पतों का प्रबंधन
 DocType: Work Order Item,Work Order Item,कार्य क्रम आइटम
 DocType: Pricing Rule,Item Code,आइटम कोड
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
 DocType: Agriculture Analysis Criteria,Agriculture Manager,कृषि प्रबंधक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
 DocType: Supplier Scorecard Period,Variables,चर
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),समापन (डॉ.)
 DocType: Cheque Print Template,Cheque Size,चैक आकार
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,लेनदेन को बेचने के लिए टैक्स टेम्पलेट .
 DocType: Sales Invoice,Write Off Outstanding Amount,ऑफ बकाया राशि लिखें
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},खाता {0} कंपनी के साथ मेल नहीं खाता {1}
@@ -3691,7 +3714,6 @@
 DocType: Stock Settings,Default Stock UOM,Default स्टॉक UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations की संख्या बुक
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,कुल मात्रा
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},कर्मचारी ऋण के खिलाफ: {0}
 DocType: Landed Cost Item,Receipt Document,रसीद दस्तावेज़
 DocType: Employee Education,School/University,स्कूल / विश्वविद्यालय
 DocType: Payment Request,Reference Details,संदर्भ विवरण
@@ -3702,7 +3724,7 @@
 DocType: Asset,Double Declining Balance,डबल गिरावट का संतुलन
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,बंद आदेश को रद्द नहीं किया जा सकता। रद्द करने के लिए खुल जाना।
 DocType: Student Guardian,Father,पिता
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 DocType: Attendance,On Leave,छुट्टी पर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अपडेट प्राप्त करे
@@ -3716,10 +3738,10 @@
 DocType: Lead,Lower Income,कम आय
 DocType: Restaurant Order Entry,Current Order,अभी का ऑर्डर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,कार्यक्रम पर जाएं
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},पंक्ति {0} # आवंटित राशि {1} लावारिस राशि से अधिक नहीं हो सकती {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},पंक्ति {0} # आवंटित राशि {1} लावारिस राशि से अधिक नहीं हो सकती {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
@@ -3742,7 +3764,6 @@
 DocType: Payment Terms Template,Payment Terms,भुगतान की शर्तें
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,मिनट
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 DocType: Chapter,Meetup Embed HTML,Meetup embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,आपूर्तिकर्ता पर जाएं
@@ -3761,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,छात्र के लिए भुगतान अनुरोध भेजने के लिए कृपया ईमेल आईडी सेट करें
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,छात्र के लिए भुगतान अनुरोध भेजने के लिए कृपया ईमेल आईडी सेट करें
 DocType: Patient,Medical History,चिकित्सा का इतिहास
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
 DocType: Patient,Patient ID,रोगी आईडी
 DocType: Physician Schedule,Schedule Name,अनुसूची नाम
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,वेतन पर्ची बनाओ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,सभी आपूर्तिकर्ता जोड़ें
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,सभी आपूर्तिकर्ता जोड़ें
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ति # {0}: आवंटित राशि बकाया राशि से अधिक नहीं हो सकती।
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ब्राउज़ बीओएम
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,सुरक्षित कर्जे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,सुरक्षित कर्जे
 DocType: Purchase Invoice,Edit Posting Date and Time,पोस्टिंग दिनांक और समय संपादित करें
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},में परिसंपत्ति वर्ग {0} या कंपनी मूल्यह्रास संबंधित खाते सेट करें {1}
 DocType: Lab Test Groups,Normal Range,सामान्य परिसर
 DocType: Academic Term,Academic Year,शैक्षणिक वर्ष
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,उपलब्ध बेचना
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
 DocType: Lead,CRM,सीआरएम
 DocType: Purchase Invoice,N,एन
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,शेष
 DocType: Appraisal,Appraisal,मूल्यांकन
+DocType: Loan,Loan Account,ऋण खाता
 DocType: Purchase Invoice,GST Details,जीएसटी विवरण
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},आपूर्तिकर्ता के लिए भेजा ईमेल {0}
 DocType: Item,Default Sales Unit of Measure,मापन का डिफ़ॉल्ट बिक्री इकाई
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,शैक्षणिक वर्ष:
+DocType: Subscription,Past Due Date,पिछले देय तिथि
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},आइटम {0} के लिए वैकल्पिक आइटम सेट करने की अनुमति नहीं है
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तिथि दोहराया है
@@ -3797,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,रोगी की नियुक्ति
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,रोल का अनुमोदन करने के लिए नियम लागू है भूमिका के रूप में ही नहीं हो सकता
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,इस ईमेल डाइजेस्ट से सदस्यता रद्द
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,द्वारा आपूर्तिकर्ता जाओ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,द्वारा आपूर्तिकर्ता जाओ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} आइटम के लिए नहीं मिला {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,पाठ्यक्रम पर जाएं
 DocType: Accounts Settings,Show Inclusive Tax In Print,प्रिंट में समावेशी कर दिखाएं
@@ -3805,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,भेजे गए संदेश
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,बच्चे नोड्स के साथ खाता बही के रूप में सेट नहीं किया जा सकता
 DocType: C-Form,II,द्वितीय
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली सेट करें
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर जिस पर मूल्य सूची मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
 DocType: Physician,Physician Schedules,चिकित्सक अनुसूचियां
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,कुल अग्रिम राशि कुल स्वीकृत राशि से अधिक नहीं हो सकती
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,कुल अग्रिम राशि कुल स्वीकृत राशि से अधिक नहीं हो सकती
 DocType: Salary Slip,Hour Rate,घंटा दर
 DocType: Stock Settings,Item Naming By,द्वारा नामकरण आइटम
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
@@ -3826,6 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},से शेयर लेनदेन पुराने अद्यतन करने की अनुमति नहीं है {0}
 DocType: BOM,Inspection Required,आवश्यक निरीक्षण
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,जमा करने से पहले बैंक गारंटी संख्या दर्ज करें।
 DocType: Driving License Category,Class,कक्षा
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,मद टेम्पलेट के खिलाफ कार्य आदेश नहीं उठाया जा सकता
@@ -3836,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Assessment Plan,Program,कार्यक्रम
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली को सेटअप करें
 DocType: Serial No,Is Cancelled,क्या Cancelled
 DocType: Student Group,Group Based On,समूह आधार पर
 DocType: Journal Entry,Bill Date,बिल की तारीख
@@ -3847,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,चैक ऊंचाई
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
 DocType: Setup Progress,Setup Progress,सेटअप प्रगति
+DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 DocType: Hub Settings,Publish Items to Hub,हब के लिए आइटम प्रकाशित करें
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},मूल्य से पंक्ति में मान से कम होना चाहिए {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,वायर ट्रांसफर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,सभी की जांच करो
 ,Issued Items Against Work Order,कार्य आदेश के खिलाफ जारी किए गए आइटम
 DocType: Vehicle Log,Invoice Ref,चालान रेफरी
@@ -3880,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,शुल्क सूची संख्या
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP गोदाम में उपलब्ध मात्रा
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,प्रक्षेपित
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
-DocType: Employee Loan,Employee Loan Application,कर्मचारी ऋण आवेदन
 DocType: Issue,Opening Date,तिथि खुलने की
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,कृपया पहले मरीज को बचाएं
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,कृपया पहले मरीज को बचाएं
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,उपस्थिति सफलतापूर्वक अंकित की गई है।
 DocType: Program Enrollment,Public Transport,सार्वजनिक परिवाहन
 DocType: Soil Texture,Silt Composition (%),सिल्ट संरचना (%)
@@ -3903,7 +3927,7 @@
 ,Item Balance (Simple),आइटम शेष (सरल)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,विधेयकों आपूर्तिकर्ता द्वारा उठाए गए.
 DocType: POS Profile,Write Off Account,ऑफ खाता लिखें
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,डेबिट नोट एएमटी
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,डेबिट नोट एएमटी
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
@@ -3926,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,बिक्री आदेश दिनांक
 DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
 DocType: Assessment Plan,Assessment Plan,आकलन योजना
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,रिवर्स जर्नल एंट्री
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} बनाया गया है
 DocType: Stock Settings,Limit Percent,सीमा प्रतिशत
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,वर्तमान में किसी भी गोदाम में कोई स्टॉक उपलब्ध नहीं है
@@ -3939,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Payment Entry,Payment References,भुगतान संदर्भ
 DocType: C-Form,C-FORM-,सी-फार्म
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","अंतराल क्षेत्र के लिए अंतराल की संख्या जैसे कि अंतराल &#39;दिन&#39; है और बिलिंग अंतराल गणना 3 है, चालान हर 3 दिनों में उत्पन्न किए जाएंगे"
 DocType: Vehicle,Insurance Details,बीमा विवरण
 DocType: Account,Payable,देय
 DocType: Share Balance,Share Type,शेयर प्रकार
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,चुकौती अवधि दर्ज करें
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,चुकौती अवधि दर्ज करें
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),देनदार ({0})
 DocType: Pricing Rule,Margin,हाशिया
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नए ग्राहकों
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,सकल लाभ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,सकल लाभ%
 DocType: Appraisal Goal,Weightage (%),वेटेज (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,पीओएस प्रोफ़ाइल बदलें
 DocType: Bank Reconciliation Detail,Clearance Date,क्लीयरेंस तिथि
@@ -3956,10 +3982,11 @@
 DocType: Lead,Address Desc,जानकारी पता करने के लिए
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,पार्टी अनिवार्य है
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},अन्य पंक्तियों में डुप्लिकेट नियत दिनांक वाली पंक्तियाँ मिलीं: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},अन्य पंक्तियों में डुप्लिकेट नियत दिनांक वाली पंक्तियाँ मिलीं: {list}
 DocType: Topic,Topic Name,विषय नाम
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,कृपया एचआर सेटिंग्स में स्वीकृति अधिसूचना अधिसूचना के लिए डिफ़ॉल्ट टेम्पलेट सेट करें।
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,बेचने या खरीदने का कम से कम एक का चयन किया जाना चाहिए
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,कर्मचारी अग्रिम के लिए एक कर्मचारी का चयन करें
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,कर्मचारी अग्रिम के लिए एक कर्मचारी का चयन करें
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,कृपया एक वैध तिथि चुनें
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,आपके व्यवसाय की प्रकृति का चयन करें।
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3978,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,लेजर शेयर करें
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,बिक्री चालान {0} बनाया गया
 DocType: Employee,Confirmation Date,पुष्टिकरण तिथि
 DocType: C-Form,Total Invoiced Amount,कुल चालान राशि
@@ -3987,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,संग्रहित अवमूल्यन
 DocType: Supplier Scorecard Scoring Standing,Standing Name,स्थायी नाम
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
-DocType: Employee Loan Application,Required by Date,दिनांक द्वारा आवश्यक
+DocType: Loan Application,Required by Date,दिनांक द्वारा आवश्यक
 DocType: Lead,Lead Owner,मालिक लीड
 DocType: Production Plan,Sales Orders Detail,बिक्री आदेश विस्तार
 DocType: Bin,Requested Quantity,अनुरोध मात्रा
@@ -4000,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,सकल वेतन - कुल कटौती - ऋण चुकौती
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,वेतन पर्ची आईडी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,एकाधिक विविधताएं
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरित
+DocType: Subscription,Trial Period Start Date,परीक्षण अवधि प्रारंभ तिथि
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,कृपया अन्य उपयोगकर्ता के रूप में लॉगिन करें।
@@ -4024,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,छात्र गार्जियन
 DocType: Member,Member Name,सदस्य का नाम
 DocType: Stock Settings,Use Naming Series,नामकरण श्रृंखला का उपयोग करें
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,सदस्यता में
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 DocType: Membership,Payment Details,भुगतान विवरण
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,बीओएम दर
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","रुक गए कार्य आदेश को रद्द नहीं किया जा सकता, रद्द करने के लिए इसे पहले से हटा दें"
 DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
@@ -4049,6 +4076,7 @@
 DocType: Land Unit,Land Unit,भूमि इकाई
 ,Purchase Analytics,खरीद विश्लेषिकी
 DocType: Sales Invoice Item,Delivery Note Item,डिलिवरी नोट आइटम
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,वर्तमान चालान {0} गुम है
 DocType: Asset Maintenance Log,Task,कार्य
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बैच संख्या आइटम के लिए अनिवार्य है {0}
@@ -4060,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,मुद्रा लाभ / हानि खाता
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी और उपस्थिति
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,सामुदायिक फोरम
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,स्टॉक में वास्तविक मात्रा
 DocType: Homepage,"URL for ""All Products""",के लिए &quot;सभी उत्पाद&quot; यूआरएल
@@ -4074,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,स्टैंडर्ड बिक्री दर
 DocType: Account,Rate at which this tax is applied,दर जिस पर इस कर को लागू किया जाता है
 DocType: Cash Flow Mapper,Section Name,अनुभाग का नाम
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Reorder मात्रा
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Reorder मात्रा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नौकरी के उद्घाटन
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ख़ारिज करना
@@ -4085,9 +4113,9 @@
 DocType: Task,depends_on,निर्भर करता है
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सामग्री के सभी बिल में नवीनतम मूल्य को अद्यतन करने के लिए कतारबद्ध इसमें कुछ मिनट लग सकते हैं
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देश बुद्धिमान डिफ़ॉल्ट पता टेम्पलेट्स
 DocType: Water Analysis,Appearance,दिखावट
+DocType: HR Settings,Leave Status Notification Template,स्थिति अधिसूचना टेम्पलेट छोड़ दें
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,औसत। ख़रीदना मूल्य सूची दर
 DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,सदस्य सूचना
@@ -4110,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,अनुमति नहीं। टेस्ट टेम्प्लेट को अक्षम करें
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
 DocType: Crop Cycle,Linked Land Unit,लिंकेड लैंड यूनिट
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
@@ -4126,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,उपयोगकर्ता पर जाएं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,अमान्य जीएसटीआईएन या अनारिजीस्टर्ड के लिए एनएआर दर्ज करें
 DocType: Training Event,Seminar,सेमिनार
 DocType: Program Enrollment Fee,Program Enrollment Fee,कार्यक्रम नामांकन शुल्क
@@ -4142,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 DocType: Company,Create Chart Of Accounts Based On,खातों पर आधारित का चार्ट बनाएं
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,इसे गैर-समूह में परिवर्तित नहीं किया जा सकता बाल कार्य मौजूद हैं
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
 ,Stock Ageing,स्टॉक बूढ़े
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},छात्र {0} छात्र आवेदक के खिलाफ मौजूद {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),गोलाई समायोजन (कंपनी मुद्रा)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,समय पत्र
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,बैच:
 DocType: Volunteer,Afternoon,दोपहर
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Cheque Print Template,Scanned Cheque,स्कैन किए हुए चैक
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
@@ -4165,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,परियोजना {0} पहले से मौजूद है
 DocType: Medical Department,Nursing User,नर्सिंग उपयोगकर्ता
 DocType: Plant Analysis,Plant Analysis Criterias,संयंत्र विश्लेषण मानदंड
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,जिम्मेदारियों
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},सीरियल नंबर {0} बैच से संबंधित नहीं है {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,जिम्मेदारियों
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,इस उद्धरण की वैधता अवधि समाप्त हो गई है।
 DocType: Expense Claim Account,Expense Claim Account,व्यय दावा अकाउंट
 DocType: Accounts Settings,Allow Stale Exchange Rates,स्टेले एक्सचेंज दरें अनुमति दें
@@ -4187,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,वेरिएंट बनाएं
 DocType: Item,Default BOM,Default बीओएम
 DocType: Project,Total Billed Amount (via Sales Invoices),कुल बिल राशि (बिक्री चालान के माध्यम से)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,डेबिट नोट राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,डेबिट नोट राशि
 DocType: Project Update,Not Updated,अद्यतन नहीं हुआ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","दर, शेयरों की संख्या और गणना की गई राशि के बीच विसंगतियां हैं"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,कुल बकाया राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,कुल बकाया राशि
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
 DocType: Employee Advance,Advance Account,एडवांस अकाउंट
 DocType: Job Offer,Job Offer Terms,नौकरी की पेशकश की शर्तें
@@ -4200,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,मोटर वाहन
 DocType: Vehicle,Insurance Company,बीमा कंपनी
 DocType: Asset Category Account,Fixed Asset Account,फिक्स्ड परिसंपत्ति खाते
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,परिवर्तनशील
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,परिवर्तनशील
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिवरी नोट से
 DocType: Chapter,Members,सदस्य
 DocType: Student,Student Email Address,छात्र ईमेल एड्रेस
@@ -4230,25 +4259,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 DocType: Bank Reconciliation Detail,Payment Document,भुगतान दस्तावेज़
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,मापदंड सूत्र का मूल्यांकन करने में त्रुटि
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
+DocType: Subscription,Plans,योजनाओं
 DocType: Salary Slip,Salary Structure,वेतन संरचना
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,मुद्दा सामग्री
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,पुनरावर्ती बनाने के दौरान एक त्रुटि हुई
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,कोटेशन
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,कोई छात्र गुटों बनाया।
 DocType: Purchase Invoice Item,Serial No,नहीं सीरियल
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक भुगतान राशि ऋण राशि से अधिक नहीं हो सकता
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक भुगतान राशि ऋण राशि से अधिक नहीं हो सकता
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,पंक्ति # {0}: अपेक्षित वितरण तिथि खरीद आदेश तिथि से पहले नहीं हो सकती
 DocType: Purchase Invoice,Print Language,प्रिंट भाषा
 DocType: Salary Slip,Total Working Hours,कुल काम के घंटे
 DocType: Sales Invoice,Customer PO Details,ग्राहक पीओ विवरण
-DocType: Subscription,Next Schedule Date,अगली अनुसूची तिथि
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,अस्थायी खुली खाता
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
@@ -4276,11 +4304,11 @@
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,दिनांक से और
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,निर्दिष्ट मानदंडों के लिए कोई कर्मचारी नहीं
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
 DocType: Hotel Settings,Default Customer,डिफ़ॉल्ट ग्राहक
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक का नाम
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,पुष्टि न करें कि नियुक्ति उसी दिन के लिए बनाई गई है
@@ -4304,16 +4332,16 @@
 DocType: Journal Entry Account,Employee Advance,कर्मचारी अग्रिम
 DocType: Payroll Entry,Payroll Frequency,पेरोल आवृत्ति
 DocType: Lab Test Template,Sensitivity,संवेदनशीलता
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,कच्चे माल
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,कच्चे माल
 DocType: Leave Application,Follow via Email,ईमेल के माध्यम से पालन करें
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,संयंत्रों और मशीनरी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,संयंत्रों और मशीनरी
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दैनिक काम सारांश सेटिंग
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,कृपया तिथि के अनुसार रेक्ड दर्ज करें
 DocType: Payment Entry,Internal Transfer,आंतरिक स्थानांतरण
 DocType: Asset Maintenance,Maintenance Tasks,रखरखाव कार्य
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
 DocType: Leave Control Panel,Carry Forward,आगे ले जाना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,मौजूदा लेनदेन के साथ लागत केंद्र लेज़र परिवर्तित नहीं किया जा सकता है
@@ -4321,13 +4349,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ईआरपीएप्लेस्ट इंटिग्रेशन
 DocType: Crop Cycle,Detected Disease,पता चला रोग
 ,Produced,उत्पादित
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,पुनर्भुगतान प्रारंभ तिथि वितरण तिथि से पहले नहीं हो सकती है।
 DocType: Item,Item Code for Suppliers,आपूर्तिकर्ता के लिए आइटम कोड
 DocType: Issue,Raised By (Email),(ई) द्वारा उठाए गए
 DocType: Training Event,Trainer Name,ट्रेनर का नाम
 DocType: Mode of Payment,General,सामान्य
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,अंतिम संचार
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,चालान के साथ मैच भुगतान
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
@@ -4341,7 +4370,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},आधा दिन पर डॉ {0} पर छोड़ दें {1}
 DocType: Production Plan,Get Material Request,सामग्री अनुरोध प्राप्त
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,पोस्टल व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,पोस्टल व्यय
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राशि)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 ,Item Variant Details,आइटम विविध विवरण
@@ -4352,9 +4381,9 @@
 DocType: Drug Prescription,Hour,घंटा
 DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम बिक्री चालान
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},आइटम के खिलाफ मात्रा का चयन करें {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
 DocType: Company,Monthly Sales Target,मासिक बिक्री लक्ष्य
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} द्वारा अनुमोदित किया जा सकता
@@ -4362,7 +4391,7 @@
 DocType: Item,Default Material Request Type,डिफ़ॉल्ट सामग्री अनुरोध प्रकार
 DocType: Supplier Scorecard,Evaluation Period,मूल्यांकन अवधि
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,अनजान
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,कार्य आदेश नहीं बनाया गया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,कार्य आदेश नहीं बनाया गया
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
 DocType: Purchase Invoice,Export Type,निर्यात प्रकार
 DocType: Salary Slip Loan,Salary Slip Loan,वेतन स्लिप ऋण
@@ -4378,7 +4407,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,खोलने चालान सारांश
 DocType: Education Settings,Education Manager,शिक्षा प्रबंधक
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,इष्टतम विकास के क्षेत्र में प्रत्येक संयंत्र के बीच न्यूनतम लंबाई
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","शेयर किए गए आइटम {0} को शेयर सुलह का उपयोग करके अपडेट नहीं किया जा सकता, बजाय स्टॉक प्रविष्टि का उपयोग करें"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","शेयर किए गए आइटम {0} को शेयर सुलह का उपयोग करके अपडेट नहीं किया जा सकता, बजाय स्टॉक प्रविष्टि का उपयोग करें"
 DocType: Quality Inspection,Report Date,तिथि रिपोर्ट
 DocType: Student,Middle Name,मध्य नाम
 DocType: C-Form,Invoices,चालान
@@ -4409,20 +4438,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,रसीद
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,रसीद
 ,Sales Register,बिक्री रजिस्टर
 DocType: Daily Work Summary Group,Send Emails At,ईमेल भेजें पर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,फॉर्म देखें
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,व्यय दावा में व्यय अनुमान अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","उपयोगकर्ताओं को अपने संगठन के अलावा, स्वयं को छोड़ दें"
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,अभी तक कोई ग्राहक नहीं!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,नकदी प्रवाह विवरण
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,कोई भौतिक अनुरोध नहीं बनाया गया
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,लाइसेंस
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
@@ -4445,11 +4475,12 @@
 DocType: Vehicle,Chassis No,चास्सिस संख्या
 DocType: Payment Request,Initiated,शुरू की
 DocType: Production Plan Item,Planned Start Date,नियोजित प्रारंभ दिनांक
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,कृपया एक BOM चुनें
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,कृपया एक BOM चुनें
 DocType: Purchase Invoice,Availed ITC Integrated Tax,लाभांश आईटीसी एकीकृत कर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
+DocType: Bank Guarantee,Clauses and Conditions,खंड और शर्तें
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
 DocType: Project Task,View Timesheet,टाइम्स पत्र देखें
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,समाप्ति तिथि प्रारंभ तिथि से अधिक होनी चाहिए
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Leave Allocation,New Leaves Allocated,नई आवंटित पत्तियां
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
@@ -4463,9 +4494,10 @@
 DocType: Patient,Alcohol Current Use,शराब वर्तमान उपयोग
 DocType: Student Admission Program,Student Admission Program,छात्र प्रवेश कार्यक्रम
 DocType: Payment Entry,Account Paid To,खाते में भुगतान
+DocType: Subscription Settings,Grace Period,मुहलत
 DocType: Item Alternative,Alternative Item Name,वैकल्पिक आइटम का नाम
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",कोई भी वेतन पर्ची जमा नहीं की जा सकती <br> \ संभावित कारण: <br> \ 1. शुद्ध वेतन 0 से कम है <br> \ 2. कर्मचारी मास्टर में निर्दिष्ट कंपनी ईमेल पता वैध नहीं है। <br>
@@ -4475,7 +4507,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} खाते के लिए बजट {1} के खिलाफ {2} {3} है {4}। यह द्वारा अधिक होगा {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,मात्रा बाहर
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,और अनजाने में अक्षम
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,सीरीज अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 DocType: Student Sibling,Student ID,छात्र आईडी
@@ -4487,14 +4518,16 @@
 DocType: Complaint,Complaint,शिकायत
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,पुनर्भुगतान प्रवेश करें
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,सभी विभाग
 DocType: Patient,Alcohol Past Use,शराब विगत का प्रयोग करें
 DocType: Fertilizer Content,Fertilizer Content,उर्वरक सामग्री
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,सीआर
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,सीआर
 DocType: Project Update,Problematic/Stuck,समस्याग्रस्त / Stuck
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 DocType: Share Transfer,Transfer,हस्तांतरण
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,इस बिक्री आदेश को रद्द करने से पहले कार्य आदेश {0} रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
@@ -4518,10 +4551,11 @@
 DocType: Cheque Print Template,Message to show,संदेश दिखाने के लिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,खुदरा
 DocType: Student Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,उत्पाद बंडल
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} से शुरू अंक ढूंढने में असमर्थ आपको 0 से 100 तक के स्कोर वाले खड़े होने की जरूरत है
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
+DocType: Subscription,Current Invoice Start Date,वर्तमान चालान प्रारंभ दिनांक
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: या तो डेबिट या क्रेडिट राशि की आवश्यकता है {2}
 DocType: GL Entry,Remarks,टिप्पणियाँ
@@ -4531,11 +4565,13 @@
 DocType: Task,Parent Task,अभिभावक कार्य
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,लीड बनाओ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,प्रिंट और स्टेशनरी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,प्रिंट और स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,शो बारकोड फील्ड
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,प्रदायक ईमेल भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","वेतन पहले ही बीच {0} और {1}, आवेदन की अवधि छोड़ दो इस तिथि सीमा के बीच नहीं हो सकता है अवधि के लिए कार्रवाई की।"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,प्रदायक ईमेल भेजें
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","वेतन पहले ही बीच {0} और {1}, आवेदन की अवधि छोड़ दो इस तिथि सीमा के बीच नहीं हो सकता है अवधि के लिए कार्रवाई की।"
+DocType: Fiscal Year,Auto Created,ऑटो बनाया गया
 DocType: Chapter Member,Leave Reason,कारण छोड़ें
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,चालान {0} अब मौजूद नहीं है
 DocType: Guardian Interest,Guardian Interest,गार्जियन ब्याज
 DocType: Volunteer,Availability,उपलब्धता
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,पीओएस इनवॉइस के लिए डिफ़ॉल्ट मान सेट करें
@@ -4543,14 +4579,13 @@
 DocType: Project,Time to send,भेजने के लिए समय
 DocType: Timesheet,Employee Detail,कर्मचारी विस्तार
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,गार्डियन 1 ईमेल आईडी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,अगली तारीख के दिन और महीने के दिवस पर दोहराएँ बराबर होना चाहिए
 DocType: Lab Prescription,Test Code,टेस्ट कोड
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,वेबसाइट मुखपृष्ठ के लिए सेटिंग
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} के स्कोरकार्ड स्टैंड के कारण आरएफक्यू को {0} के लिए अनुमति नहीं है
 DocType: Job Offer,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ऊपर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},कुल राशि {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},कुल राशि {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
 DocType: Supplier,Mention if non-standard payable account,यदि मानक मानक देय खाता है तो उल्लेख करें
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',कृपया &#39;सभी मूल्यांकन समूह&#39; के अलावा अन्य मूल्यांकन समूह का चयन करें
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},पंक्ति {0}: एक आइटम {1} के लिए लागत केंद्र आवश्यक है
@@ -4561,7 +4596,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,जल विश्लेषण
 DocType: Chapter,Region,प्रदेश
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,लिंक किए गए विश्लेषण को पुनः लोड करें
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","जैसे 2012, 2012-13 के लिए"
@@ -4577,7 +4612,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,खत्म कर दिया संपत्ति की लागत
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आइटम के लिए लागत केंद्र अनिवार्य है {2}
 DocType: Vehicle,Policy No,पॉलिसी संख्या
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 DocType: Asset,Straight Line,सीधी रेखा
 DocType: Project User,Project User,परियोजना उपयोगकर्ता
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,विभाजित करें
@@ -4613,21 +4648,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,पथ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,यह बच्चे नोड्स के रूप में खाता बही के लिए लागत केंद्र बदला नहीं जा सकता
 DocType: Production Plan,Total Planned Qty,कुल नियोजित मात्रा
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,उद्घाटन मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,उद्घाटन मूल्य
 DocType: Salary Detail,Formula,सूत्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,सीरियल #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,सीरियल #
 DocType: Lab Test Template,Lab Test Template,लैब टेस्ट टेम्पलेट
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,विक्रय खाता
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,विक्रय खाता
 DocType: Purchase Invoice Item,Total Weight,कुल वजन
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,बिक्री पर कमीशन
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,बिक्री पर कमीशन
 DocType: Job Offer Term,Value / Description,मूल्य / विवरण
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्तरां आदेश प्रविष्टि
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
 DocType: Asset Maintenance Task,Assign To Name,नाम असाइन करें
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,मनोरंजन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,मनोरंजन खर्च
 DocType: Hub Settings,Enabled Users,सक्षम उपयोगकर्ता
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,सामग्री अनुरोध करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},खुले आइटम {0}
@@ -4640,24 +4675,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,छुट्टी के लिए आवेदन.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
 DocType: Vehicle,Last Carbon Check,अंतिम कार्बन चेक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,विधि व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,विधि व्यय
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,कृपया पंक्ति पर मात्रा का चयन करें
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,खोलने की बिक्री और खरीद चालान करें
 DocType: Purchase Invoice,Posting Time,बार पोस्टिंग
 DocType: Timesheet,% Amount Billed,% बिल की राशि
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,टेलीफोन व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,टेलीफोन व्यय
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,यह जाँच लें कि आप उपयोगकर्ता बचत से पहले एक श्रृंखला का चयन करने के लिए मजबूर करना चाहते हैं. कोई डिफ़ॉल्ट हो सकता है अगर आप इस जाँच करेगा.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
 DocType: Email Digest,Open Notifications,ओपन सूचनाएं
 DocType: Payment Entry,Difference Amount (Company Currency),अंतर राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,प्रत्यक्ष खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,प्रत्यक्ष खर्च
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नया ग्राहक राजस्व
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,यात्रा व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},कार्यक्षेत्र में कस्टम फ़ील्ड सदस्यता जोड़ें {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
 DocType: Purchase Receipt Item,Sample Quantity,नमूना मात्रा
+DocType: Bank Guarantee,Name of Beneficiary,लाभार्थी का नाम
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / मूल्य सूची दर / कच्ची सामग्रियों की अंतिम खरीदारी दर के आधार पर, स्वचालित रूप से समय-समय पर बीओएम लागत को शेड्यूलर के माध्यम से अपडेट करें।"
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
@@ -4669,14 +4704,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,परिवीक्षा
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,वेतन अवयव
 DocType: Program Enrollment Tool,New Academic Year,नए शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,वापसी / क्रेडिट नोट
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,वापसी / क्रेडिट नोट
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,कुल भुगतान की गई राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,कुल भुगतान की गई राशि
 DocType: GST Settings,B2C Limit,बी 2 सी सीमा
 DocType: Work Order Item,Transferred Qty,मात्रा तबादला
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नेविगेट
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,आयोजन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,आयोजन
 DocType: Share Balance,Issued,जारी किया गया
+DocType: Loan,Repayment Start Date,पुनर्भुगतान प्रारंभ दिनांक
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,छात्र गतिविधि
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,आपूर्तिकर्ता आईडी
 DocType: Payment Request,Payment Gateway Details,भुगतान गेटवे विवरण
@@ -4689,10 +4725,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","आकस्मिक, बीमार आदि की तरह पत्तियों के प्रकार"
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल के माध्यम से नियमित रूप से सारांश रिपोर्ट भेजें।
 DocType: Payment Entry,PE-,पीई-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
 DocType: Assessment Result,Student Name,छात्र का नाम
 DocType: Brand,Item Manager,आइटम प्रबंधक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,पेरोल देय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,पेरोल देय
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
 DocType: Plant Analysis,Collection Datetime,संग्रह डेटटाइम
 DocType: Work Order,Total Operating Cost,कुल परिचालन लागत
@@ -4702,9 +4738,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,प्रयोक्ता {0} मौजूद नहीं है
 DocType: Payment Term,Day(s) after invoice date,इनवॉइस तिथि के बाद दिन (एस)
 DocType: Payment Schedule,Payment Schedule,भुगतान अनुसूची
-DocType: Subscription,SUB-,उप
 DocType: Item Attribute Value,Abbreviation,संक्षिप्त
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,भुगतान प्रविष्टि पहले से मौजूद
+DocType: Subscription,Trial Period End Date,परीक्षण अवधि समाप्ति तिथि
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} सीमा से अधिक के बाद से Authroized नहीं
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्पलेट मास्टर .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,विकृति विज्ञान
@@ -4721,9 +4757,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,सभी ग्राहक समूहों
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,सभी ग्राहक समूहों
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,संचित मासिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
@@ -4732,14 +4768,15 @@
 DocType: Lab Prescription,Test Created,टेस्ट बनाया
 DocType: Healthcare Settings,Custom Signature in Print,प्रिंट में कस्टम हस्ताक्षर
 DocType: Account,Temporary,अस्थायी
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ग्राहक एलपीओ नंबर
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ग्राहक एलपीओ नंबर
 DocType: Program,Courses,पाठ्यक्रम
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,सचिव
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","अक्षम करते हैं, क्षेत्र &#39;शब्दों में&#39; किसी भी सौदे में दिखाई नहीं होगा"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,यह क्रिया भविष्य की बिलिंग को रोक देगी। क्या आप वाकई इस सदस्यता को रद्द करना चाहते हैं?
 DocType: Serial No,Distinct unit of an Item,एक आइटम की अलग इकाई
 DocType: Supplier Scorecard Criteria,Criteria Name,मापदंड का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,कृपया कंपनी सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,कृपया कंपनी सेट करें
 DocType: Pricing Rule,Buying,क्रय
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,रोग और उर्वरक
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रिकॉर्ड्स द्वारा पैदा किए जाने की
@@ -4748,17 +4785,17 @@
 DocType: POS Profile,Apply Discount On,डिस्काउंट पर लागू होते हैं
 DocType: Member,Membership Type,सदस्यता वर्ग
 ,Reqd By Date,तिथि reqd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,लेनदारों
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,लेनदारों
 DocType: Assessment Plan,Assessment Name,आकलन नाम
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,प्रिंट में पीडीसी दिखाएं
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,प्रिंट में पीडीसी दिखाएं
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,पंक्ति # {0}: सीरियल नहीं अनिवार्य है
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर विस्तार से
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,नौकरी का प्रस्ताव
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,संस्थान संक्षिप्त
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},मात्रा ({0}) पंक्ति {1} में अंश नहीं हो सकता
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},मात्रा ({0}) पंक्ति {1} में अंश नहीं हो सकता
 DocType: Consultation,C-,सी-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
@@ -4776,7 +4813,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,कुल विचरण
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","यदि सक्रिय है, प्रणाली स्वतः सूची के लिए लेखांकन प्रविष्टियों के बाद होगा."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,दलाली
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,कर्मचारी {0} के लिए उपस्थिति पहले से ही इस दिन के लिए चिह्नित किया गया है
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,कर्मचारी {0} के लिए उपस्थिति पहले से ही इस दिन के लिए चिह्नित किया गया है
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","मिनट में 
  'टाइम प्रवेश' के माध्यम से अद्यतन"
@@ -4788,6 +4825,7 @@
 DocType: Lab Test,Approved Date,स्वीकृत दिनांक
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
+DocType: Subscriber,Subscriber Name,सब्सक्राइबर का नाम
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
 DocType: BOM Update Tool,Replace,बदलें
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,कोई उत्पाद नहीं मिला
@@ -4797,19 +4835,18 @@
 DocType: Request for Quotation Item,Project Name,इस परियोजना का नाम
 DocType: Customer,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},कर्मचारी ऋण में ब्याज आय खाते का चयन करें {0}
 DocType: Work Order,Required Items,आवश्यक आइटम
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भुगतान सुलह भुगतान
 DocType: Disease,Treatment Task,उपचार कार्य
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,कर संपत्ति
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,कर संपत्ति
 DocType: BOM Item,BOM No,नहीं बीओएम
 DocType: Instructor,INS/,आईएनएस /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
 DocType: Item,Moving Average,चलायमान औसत
 DocType: BOM Update Tool,The BOM which will be replaced,बीओएम जो प्रतिस्थापित किया जाएगा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,इलेक्ट्रॉनिक उपकरणों
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,इलेक्ट्रॉनिक उपकरणों
 DocType: Asset,Maintenance Required,रखरखाव की आवश्यकता
 DocType: Account,Debit,नामे
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
@@ -4818,7 +4855,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,बकाया राशि
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,सेट आइटम इस बिक्री व्यक्ति के लिए समूह - वार लक्ष्य.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],रुक स्टॉक से अधिक उम्र [ दिन]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,पंक्ति # {0}: संपत्ति निश्चित संपत्ति खरीद / बिक्री के लिए अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,पंक्ति # {0}: संपत्ति निश्चित संपत्ति खरीद / बिक्री के लिए अनिवार्य है
 DocType: Asset Maintenance Team,Maintenance Team Name,रखरखाव टीम का नाम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दो या दो से अधिक मूल्य निर्धारण नियमों उपरोक्त शर्तों के आधार पर पाए जाते हैं, प्राथमिकता लागू किया जाता है। डिफ़ॉल्ट मान शून्य (रिक्त) है, जबकि प्राथमिकता 0-20 के बीच एक नंबर है। अधिक संख्या में एक ही शर्तों के साथ एकाधिक मूल्य निर्धारण नियम हैं अगर यह पूर्वता ले जाएगा मतलब है।"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ग्राहक अनिवार्य है यदि &#39;अवसर से&#39; का चयन ग्राहक के रूप में होता है
@@ -4826,19 +4863,18 @@
 DocType: Currency Exchange,To Currency,मुद्रा के लिए
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,निम्नलिखित उपयोगकर्ता ब्लॉक दिनों के लिए छोड़ एप्लीकेशन को स्वीकृत करने की अनुमति दें.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,व्यय दावा के प्रकार.
-DocType: Item,Taxes,कर
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},आइटम {0} के लिए बिक्री दर इसके {1} से कम है। बेचना दर कम से कम {2} होना चाहिए
+DocType: Subscription,Taxes,कर
 DocType: Purchase Invoice,capital goods,पूंजीगत वस्तुएं
 DocType: Purchase Invoice Item,Weight Per Unit,वजन प्रति यूनिट
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,भुगतान किया है और वितरित नहीं
 DocType: Project,Default Cost Center,डिफ़ॉल्ट लागत केंद्र
-DocType: Bank Guarantee,End Date,समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेयर लेनदेन
 DocType: Budget,Budget Accounts,बजट लेखा
 DocType: Employee,Internal Work History,आंतरिक कार्य इतिहास
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,संचित मूल्यह्रास राशि
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,आपूर्तिकर्ता स्कोरकार्ड चर
-DocType: Employee Loan,Fully Disbursed,पूरी तरह से वितरित
 DocType: Employee Advance,Due Advance Amount,कारण अग्रिम राशि
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
@@ -4862,7 +4898,7 @@
 ,Employee Information,कर्मचारी जानकारी
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,विक्रय और खरीद के लिए डिफ़ॉल्ट कर टेम्पलेट बनाए गए हैं
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रिकॉर्ड {0} पहले से मौजूद है।
@@ -4870,7 +4906,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',अगर ग्रुप बाय &#39;कंपनी&#39; है तो कंपनी को फिल्टर रिक्त करें
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,पोस्ट दिनांक भविष्य की तारीख नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,आवर्ती बनाने के लिए
 DocType: Stock Entry,Target Warehouse Address,लक्ष्य वेअरहाउस पता
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,आकस्मिक छुट्टी
 DocType: Agriculture Task,End Day,समाप्ति का दिन
@@ -4895,11 +4930,10 @@
 DocType: Material Request,% Ordered,% का आदेश दिया
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित छात्र समूह के लिए, पाठ्यक्रम नामांकन कार्यक्रमों में प्रत्येक छात्र के लिए कार्यक्रम नामांकन में मान्य किया जाएगा।"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ठेका
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,औसत। क्रय दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,औसत। क्रय दर
 DocType: Share Balance,From No,नंबर से
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{प्रेषक} का नया संदेश
 DocType: Customer,Customer Primary Address,ग्राहक प्राथमिक पता
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,समाचारपत्रिकाएँ
 DocType: Drug Prescription,Description/Strength,विवरण / शक्ति
@@ -4908,22 +4942,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,एक ही आइटम कई बार दर्ज किया गया है
 DocType: Department,Leave Block List,ब्लॉक सूची छोड़ दो
 DocType: Purchase Invoice,Tax ID,टैक्स आईडी
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,आइटम {0} सीरियल नग स्तंभ के लिए सेटअप रिक्त होना चाहिए नहीं है
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,आइटम {0} सीरियल नग स्तंभ के लिए सेटअप रिक्त होना चाहिए नहीं है
 DocType: Accounts Settings,Accounts Settings,लेखा सेटिंग्स
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,मंजूर
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} के लिए खराब स्वरूपित पता, कृपया जारी रखने के लिए ठीक करें"
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} के लिए खराब स्वरूपित पता, कृपया जारी रखने के लिए ठीक करें"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","नए खाते की संख्या, यह एक उपसर्ग के रूप में खाते के नाम में शामिल किया जाएगा"
 DocType: Maintenance Team Member,Team Member,टीम के सदस्य
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,प्रस्तुत करने के लिए कोई भी परिणाम नहीं है
 DocType: Customer,Sales Partner and Commission,बिक्री साथी और आयोग
-DocType: Employee Loan,Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर
+DocType: Loan,Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर
 ,Project Quantity,परियोजना मात्रा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है"
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
 DocType: Loan Type,Rate of Interest (%) Yearly,ब्याज दर (%) वार्षिक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,अस्थाई लेखा
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,काली
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,अस्थाई लेखा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Shareholder,Contact List,संपर्क सूची
 DocType: Account,Auditor,आडिटर
@@ -4931,16 +4965,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} उत्पादित वस्तुओं
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,और अधिक जानें
 DocType: Cheque Print Template,Distance from top edge,ऊपरी किनारे से दूरी
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,मूल्य सूची {0} अक्षम है या मौजूद नहीं है
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,मूल्य सूची {0} अक्षम है या मौजूद नहीं है
 DocType: Purchase Invoice,Return,वापसी
 DocType: Pricing Rule,Disable,असमर्थ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,भुगतान की विधि भुगतान करने के लिए आवश्यक है
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,भुगतान की विधि भुगतान करने के लिए आवश्यक है
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","संपत्ति, सीरियल नंबर, बैचों आदि जैसे अधिक विकल्पों के लिए पूर्ण पृष्ठ में संपादित करें।"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,नियुक्तियों और परामर्श
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बैच में नामांकित नहीं है {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","एसेट {0}, खत्म कर दिया नहीं जा सकता क्योंकि यह पहले से ही है {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,चेक आवश्यक है
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,चेक आवश्यक है
 DocType: Task,Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपस्थित
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,सेटअप कंपनी में विफल
@@ -4952,7 +4986,7 @@
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,बेड़े प्रबंधन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,से आइटम जोड़ें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,से आइटम जोड़ें
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,फसल और भूमि
 DocType: Cheque Print Template,Regular,नियमित
 DocType: Fertilizer,Density (if liquid),घनत्व (यदि तरल)
@@ -4977,24 +5011,26 @@
 DocType: Payment Entry,Paid Amount,राशि भुगतान
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,बिक्री चक्र का पता लगाएं
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,प्रतिधारण स्टॉक प्रविष्टि
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,प्रतिधारण स्टॉक प्रविष्टि
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 ,Work Order Stock Report,कार्य आदेश शेयर रिपोर्ट
+DocType: Purchase Receipt,Auto Repeat Detail,ऑटो दोहराना विस्तार से
 DocType: Assessment Result Tool,Assessment Result Tool,आकलन के परिणाम उपकरण
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,पर्यवेक्षक के रूप में
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,श्रेणी का सुझाव दें
 DocType: BOM Scrap Item,BOM Scrap Item,बीओएम स्क्रैप मद
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,गुणवत्ता प्रबंधन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,गुणवत्ता प्रबंधन
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,मद {0} अक्षम किया गया है
 DocType: Project,Total Billable Amount (via Timesheets),कुल बिल योग्य राशि (टाइम्सशीट्स के माध्यम से)
 DocType: Agriculture Task,Previous Business Day,पिछला व्यापार दिवस
-DocType: Employee Loan,Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि
+DocType: Loan,Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि
 DocType: Employee,Health Insurance No,स्वास्थ्य बीमा नंबर
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,क्रेडिट नोट एएमटी
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,क्रेडिट नोट एएमटी
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,कुल कर योग्य राशि
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 DocType: Opening Invoice Creation Tool,Purchase,क्रय
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,शेष मात्रा
@@ -5005,15 +5041,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} के लिए {1}
 DocType: Healthcare Settings,Valid number of days,दिनों की वैध संख्या
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,लागत केन्द्रों
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,सदस्यता पुनरारंभ करें
 DocType: Land Unit,Linked Plant Analysis,लिंक्ड संयंत्र विश्लेषण
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,दर जिस पर आपूर्तिकर्ता मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},पंक्ति # {0}: पंक्ति के साथ स्थिति संघर्षों {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,शून्य मूल्यांकन दर को अनुमति दें
+DocType: Bank Guarantee,Receiving,प्राप्त करना
 DocType: Training Event Employee,Invited,आमंत्रित
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय वेतन का ढांचा दी गई तारीखों के लिए कर्मचारी {0} के लिए मिला
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,सेटअप गेटवे खातों।
 DocType: Employee,Employment Type,रोजगार के प्रकार
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,स्थायी संपत्तियाँ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,स्थायी संपत्तियाँ
 DocType: Payment Entry,Set Exchange Gain / Loss,सेट मुद्रा लाभ / हानि
 ,GST Purchase Register,जीएसटी खरीद रजिस्टर
 ,Cash Flow,नकदी प्रवाह
@@ -5033,9 +5071,10 @@
 DocType: Academic Term,Term Start Date,टर्म प्रारंभ तिथि
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,सभी शेयर लेनदेन की सूची
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ऑप गणना
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,दोनों परीक्षण अवधि प्रारंभ तिथि और परीक्षण अवधि समाप्ति तिथि निर्धारित की जानी चाहिए
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,सामान्य दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,भुगतान शेड्यूल में कुल भुगतान राशि ग्रैंड / गोल की कुल राशि के बराबर होनी चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,भुगतान शेड्यूल में कुल भुगतान राशि ग्रैंड / गोल की कुल राशि के बराबर होनी चाहिए
+DocType: Subscription Plan Detail,Plan,योजना
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,जनरल लेजर के अनुसार बैंक बैलेंस
 DocType: Job Applicant,Applicant Name,आवेदक के नाम
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / मद का नाम
@@ -5065,6 +5104,7 @@
 DocType: Work Order,Warehouses,गोदामों
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} संपत्ति हस्तांतरित नहीं किया जा सकता
 DocType: Hotel Room Pricing,Hotel Room Pricing,होटल रूम प्राइसिंग
+DocType: Subscription,Days Until Due,देय दिनों तक
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,यह आइटम {0} (टेम्पलेट) का एक प्रकार है।
 DocType: Workstation,per hour,प्रति घंटा
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,क्रय
@@ -5073,13 +5113,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","बैच आधारित छात्र समूह के लिए, छात्र बैच को कार्यक्रम नामांकन से प्रत्येक छात्र के लिए मान्य किया जाएगा।"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,वितरण
+DocType: Journal Entry Account,Loan,ऋण
 DocType: Expense Claim Advance,Expense Claim Advance,व्यय का दावा अग्रिम
 DocType: Lab Test,Report Preference,रिपोर्ट प्राथमिकता
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,स्वयंसेवी जानकारी
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,परियोजना प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,परियोजना प्रबंधक
 ,Quoted Item Comparison,उद्धरित मद तुलना
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} और {1} के बीच स्कोरिंग में ओवरलैप
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,प्रेषण
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,शुद्ध परिसंपत्ति मूल्य के रूप में
 DocType: Crop,Produce,उत्पादित करें
@@ -5089,7 +5130,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,निर्माण के लिए सामग्री की खपत
 DocType: Item Alternative,Alternative Item Code,वैकल्पिक आइटम कोड
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
 DocType: Delivery Stop,Delivery Stop,डिलिवरी स्टॉप
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
 DocType: Item,Material Issue,महत्त्वपूर्ण विषय
@@ -5099,15 +5140,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
 DocType: BOM,Show Items,शो आइटम
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,समय समय पर से बड़ा नहीं हो सकता है।
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,क्या आप सभी ग्राहकों को ईमेल द्वारा सूचित करना चाहते हैं?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,क्या आप सभी ग्राहकों को ईमेल द्वारा सूचित करना चाहते हैं?
+DocType: Subscription Plan,Billing Interval,बिलिंग अंतराल
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,बायोडाटा
 DocType: Hub Settings,Hub Username,हब उपयोगकर्ता नाम
 DocType: Salary Detail,Component,अंग
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन मापदंड समूह
 DocType: Healthcare Settings,Patient Name By,रोगी का नाम
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} से {1} के वेतन के लिए प्रत्यावर्ती जर्नल प्रविष्टि
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} से {1} के वेतन के लिए प्रत्यावर्ती जर्नल प्रविष्टि
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
@@ -5121,22 +5162,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
 DocType: Leave Block List,Applies to Company,कंपनी के लिए लागू होता है
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
-DocType: Employee Loan,Disbursement Date,संवितरण की तारीख
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;प्राप्तकर्ता&#39; निर्दिष्ट नहीं है
+DocType: Loan,Disbursement Date,संवितरण की तारीख
 DocType: BOM Update Tool,Update latest price in all BOMs,सभी बीओएम में नवीनतम मूल्य अपडेट करें
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,मेडिकल रिकॉर्ड
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्दों में
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,जमा करने से पहले बैंक या उधार संस्था का नाम दर्ज करें।
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} को प्रस्तुत करना होगा
 DocType: POS Profile,Item Groups,मद समूह
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
 DocType: Sales Order Item,For Production,उत्पादन के लिए
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,कृपया चार्ट्स अकाउंट्स में अस्थायी ओपनिंग अकाउंट जोड़ें
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,कृपया चार्ट्स अकाउंट्स में अस्थायी ओपनिंग अकाउंट जोड़ें
 DocType: Customer,Customer Primary Contact,ग्राहक प्राथमिक संपर्क
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,अवधि समापन जर्नल
 DocType: Project Task,View Task,देखें टास्क
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / लीड%
+DocType: Bank Guarantee,Bank Guarantee Type,बैंक गारंटी प्रकार
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,चालान का हिस्सा
 ,Asset Depreciations and Balances,एसेट depreciations और शेष
@@ -5147,9 +5189,8 @@
 DocType: Production Plan,Include Subcontracted Items,उप-कॉन्ट्रैक्टेड आइटम शामिल करें
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,स्टॉक ट्रांसीक्शन के बाद वैरिएंट प्रॉपर्टी नहीं बदल सकते। आपको ऐसा करने के लिए एक नया आइटम बनाना होगा
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
-DocType: Employee Loan,Repay from Salary,वेतन से बदला
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+DocType: Loan,Repay from Salary,वेतन से बदला
 DocType: Leave Application,LAP/,गोद /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
@@ -5173,11 +5214,11 @@
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,डुप्लिकेट आइटम समूह मद समूह तालिका में पाया
 DocType: Land Unit,Parent Land Unit,अभिभावक भूमि इकाई
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
 DocType: Fertilizer,Fertilizer Name,उर्वरक का नाम
 DocType: Salary Slip,Net Pay,शुद्ध वेतन
 DocType: Cash Flow Mapping Accounts,Account,खाता
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
 ,Requested Items To Be Transferred,हस्तांतरित करने का अनुरोध आइटम
 DocType: Expense Claim,Vehicle Log,वाहन लॉग
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),एक बुखार की उपस्थिति (अस्थायी&gt; 38.5 डिग्री सेल्सियस / 101.3 डिग्री या निरंतर तापमान&gt; 38 डिग्री सेल्सियस / 100.4 डिग्री फेरनहाइट)
@@ -5218,24 +5259,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
 DocType: Asset Maintenance,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चे माल की आपूर्ति
-DocType: C-Form,Series,कई
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},मूल्य सूची {0} की मुद्रा {1} या {2} होनी चाहिए
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Soil Texture,Ternary Plot,टर्नरी प्लॉट
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
 DocType: Driver,License Number,लाइसेंस संख्या
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,व्यापार विकास प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,व्यापार विकास प्रबंधक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,रखरखाव भेंट प्रयोजन
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,चालान रोगी पंजीकरण
 DocType: Crop,Period,अवधि
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,सामान्य खाता
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},कर्मचारी {0} पर छोड़ पर {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},कर्मचारी {0} पर छोड़ पर {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,देखें बिक्रीसूत्र
 DocType: Program Enrollment Tool,New Program,नए कार्यक्रम
 DocType: Item Attribute Value,Attribute Value,मान बताइए
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 DocType: Salary Detail,Salary Detail,वेतन विस्तार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,पहला {0} का चयन करें
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,पहला {0} का चयन करें
 DocType: Appointment Type,Physician,चिकित्सक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,परामर्श
@@ -5243,15 +5283,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) वर्क ऑर्डर में नियोजित मात्रा ({2}) से अधिक नहीं हो सकता है {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,विनिर्माण के लिए समय पत्रक।
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,आधा
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,स्टॉक लेनदेन के बाद वेरिएंट गुणों को बदल नहीं सकते हैं। ऐसा करने के लिए आपको एक नया आइटम बनाना होगा।
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA आदेश
 DocType: Physician,Charges,प्रभार
 DocType: Production Plan,Get Items For Work Order,कार्य आदेश के लिए आइटम प्राप्त करें
 DocType: Salary Detail,Default Amount,चूक की राशि
 DocType: Lab Test Template,Descriptive,वर्णनात्मक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,इस महीने की सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता निरीक्षण पढ़ना
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक पुराने स्टॉक `% d दिनों से कम होना चाहिए .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक पुराने स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,एक बिक्री लक्ष्य निर्धारित करें जिसे आप अपनी कंपनी के लिए प्राप्त करना चाहते हैं
 ,Project wise Stock Tracking,परियोजना वार शेयर ट्रैकिंग
@@ -5279,11 +5320,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,वेबसाइट बनाने में विफल
 DocType: Soil Analysis,Mg/K,मिलीग्राम / कश्मीर
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,प्रतिधारण स्टॉक प्रविष्टि पहले से निर्मित या नमूना मात्रा नहीं प्रदान की गई
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,प्रतिधारण स्टॉक प्रविष्टि पहले से निर्मित या नमूना मात्रा नहीं प्रदान की गई
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षिप्त
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
-DocType: Bank Guarantee,Start Date,प्रारंभ दिनांक
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,एक अवधि के लिए पत्तियों का आवंटन .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक्स और जमाओं को गलत तरीके से मंजूरी दे दी है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
@@ -5298,11 +5338,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,घंटे
 DocType: Project,Expected Start Date,उम्मीद प्रारंभ दिनांक
 DocType: Purchase Invoice,04-Correction in Invoice,04-इनवॉइस में सुधार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,काम ऑर्डर पहले से ही BOM के साथ सभी आइटम के लिए बनाया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,काम ऑर्डर पहले से ही BOM के साथ सभी आइटम के लिए बनाया गया है
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,विविध विवरण रिपोर्ट
 DocType: Setup Progress Action,Setup Progress Action,सेटअप प्रगति कार्रवाई
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ख़रीदना मूल्य सूची
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ख़रीदना मूल्य सूची
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,सदस्यता रद्द
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,कृपया रखरखाव की स्थिति का चयन करें या समापन तिथि निकालें
 DocType: Supplier,Default Payment Terms Template,डिफ़ॉल्ट भुगतान शर्तें टेम्पलेट
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,लेन-देन मुद्रा पेमेंट गेटवे मुद्रा के रूप में ही किया जाना चाहिए
@@ -5313,7 +5354,6 @@
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"कार्रवाई करता है, तो संचित मासिक बजट पार"
-DocType: Subscription,Submit on creation,जमा करें निर्माण पर
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
 DocType: Asset,Disposal Date,निपटान की तिथि
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ईमेल दी घंटे में कंपनी के सभी सक्रिय कर्मचारियों के लिए भेजा जाएगा, अगर वे छुट्टी की जरूरत नहीं है। प्रतिक्रियाओं का सारांश आधी रात को भेजा जाएगा।"
@@ -5331,6 +5371,7 @@
 DocType: Batch,Parent Batch,अभिभावक बैच
 DocType: Cheque Print Template,Cheque Print Template,चैक प्रिंट खाका
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,लागत केंद्र के चार्ट
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,सब्सक्रिप्शन रद्द करने से पहले या बिना भुगतान के सदस्यता को चिह्नित करने से पहले इनवॉइस तिथि समाप्त हो गई है
 DocType: Lab Test Template,Sample Collection,नमूना संग्रह
 ,Requested Items To Be Ordered,आदेश दिया जा करने के लिए अनुरोध आइटम
 DocType: Price List,Price List Name,मूल्य सूची का नाम
@@ -5339,7 +5380,7 @@
 DocType: Account,Income,आय
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,कुछ गलत हो गया!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
 DocType: Supplier Scorecard Scoring Criteria,Score,स्कोर
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,वित्त वर्ष {0} मौजूद नहीं है
@@ -5359,12 +5400,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 और 100 के बीच का मान होना चाहिए
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,अगली मूल्यह्रास की तिथि उपलब्ध-उपयोग की जाने वाली तिथि से पहले नहीं हो सकती
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,असुरक्षित ऋण
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,असुरक्षित ऋण
 DocType: Cost Center,Cost Center Name,लागत केन्द्र का नाम
 DocType: Student,B+,बी +
 DocType: HR Settings,Max working hours against Timesheet,मैक्स Timesheet के खिलाफ काम के घंटे
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तिथि
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,कुल भुगतान राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,कुल भुगतान राशि
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 चरित्र से अधिक संदेश कई mesage में split जाएगा
 DocType: Purchase Receipt Item,Received and Accepted,प्राप्त और स्वीकृत
 DocType: Hub Settings,Company and Seller Profile,कंपनी और विक्रेता प्रोफाइल
@@ -5378,10 +5419,9 @@
 DocType: Item,Variant Based On,प्रकार पर आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,अपने आपूर्तिकर्ताओं
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,कृपया सही करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 DocType: Request for Quotation Item,Supplier Part No,प्रदायक भाग नहीं
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,गुमनाम
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,से प्राप्त
 DocType: Lead,Converted,परिवर्तित
@@ -5395,6 +5435,7 @@
 DocType: Asset,Assets,संपत्ति
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
+DocType: Subscription,Current Invoice End Date,वर्तमान चालान समाप्ति तिथि
 DocType: Payment Term,Due Date Based On,नियत दिनांक के आधार पर
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,कृपया बेचना सेटिंग्स में डिफ़ॉल्ट ग्राहक समूह और क्षेत्र सेट करें
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} मौजूद नहीं है
@@ -5402,7 +5443,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,जर्नल एंट्री के लिए कोई भुगतान नहीं किया गया
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
+DocType: Loan,Disbursed,संवितरित
 DocType: Healthcare Settings,Laboratory Settings,प्रयोगशाला सेटिंग
 DocType: Patient Appointment,Service Unit,सेवा इकाई
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,प्रदायक को सफलतापूर्वक सेट करें
@@ -5415,12 +5458,12 @@
 DocType: Share Balance,No of Shares,शेयरों की संख्या
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,स्थिति का चयन करें
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: School House,House Name,घरेलु नाम
 DocType: Fee Schedule,Total Amount per Student,प्रति छात्र कुल राशि
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,विद्युत
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,विद्युत
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,अपने संगठन के बाकी अपने उपयोगकर्ताओं के रूप में जोड़े। तुम भी उन्हें संपर्क से जोड़कर अपने पोर्टल के लिए ग्राहकों को आमंत्रित जोड़ सकते हैं
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
 DocType: Grant Application,Requested Amount,अनुरोध राशि
@@ -5430,7 +5473,7 @@
 DocType: Crop Cycle,Detected Diseases,पता चला रोग
 DocType: Stock Entry,Default Source Warehouse,डिफ़ॉल्ट स्रोत वेअरहाउस
 DocType: Item,Customer Code,ग्राहक कोड
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 DocType: Asset Maintenance Task,Last Completion Date,अंतिम समापन तिथि
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
@@ -5438,9 +5481,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless सेटिंग्स
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेयर एसेट्स
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,शेयर एसेट्स
 DocType: Restaurant,Active Menu,सक्रिय मेनू
 DocType: Target Detail,Target Qty,लक्ष्य मात्रा
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ऋण के खिलाफ: {0}
 DocType: Shopping Cart Settings,Checkout Settings,चेकआउट सेटिंग
 DocType: Student Attendance,Present,पेश
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
@@ -5449,9 +5493,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Production Plan Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
 DocType: Chapter,Chapter Head,अध्याय हेड
 DocType: Payment Term,Month(s) after the end of the invoice month,चालान महीने के अंत के बाद महीनों (महीनों)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,परियोजना / कार्य कार्य.
@@ -5459,11 +5503,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,लैब परिणाम datetime डेटटाइम परीक्षण करने से पहले नहीं हो सकता
 DocType: POS Profile,Allow user to edit Discount,उपयोगकर्ता डिस्काउंट को संपादित करने की अनुमति दें
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ग्राहकों से प्राप्त करें
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ग्राहकों से प्राप्त करें
 DocType: Purchase Invoice Item,Include Exploded Items,विस्फोट किए गए आइटम शामिल करें
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो खरीदना, जाँच की जानी चाहिए {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
 DocType: Shipping Rule,Restrict to Countries,देश को प्रतिबंधित करें
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप&gt; सेटिंग्स&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग घंटे
 DocType: Project,Total Sales Amount (via Sales Order),कुल बिक्री राशि (बिक्री आदेश के माध्यम से)
@@ -5480,6 +5525,7 @@
 DocType: Soil Texture,Sandy Clay,सैंडी क्ले
 DocType: Grant Application,Assessment  Manager,आकलन प्रबंधक
 DocType: Payment Entry,Allocate Payment Amount,आवंटित राशि भुगतान
+DocType: Subscription Plan,Subscription Plan,सदस्यता योजना
 DocType: Employee External Work History,Salary,वेतन
 DocType: Serial No,Delivery Document Type,डिलिवरी दस्तावेज़ प्रकार
 DocType: Sales Order,Partly Delivered,आंशिक रूप से वितरित
@@ -5505,9 +5551,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,बूढ़े रेंज 2
 DocType: SG Creation Tool Course,Max Strength,मैक्स शक्ति
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,प्रीसेट स्थापित करना
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ग्राहक के लिए कोई डिलिवरी नोट चयनित नहीं है {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ग्राहक के लिए कोई डिलिवरी नोट चयनित नहीं है {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,बीओएम प्रतिस्थापित
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,डिलीवरी तिथि के आधार पर आइटम चुनें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,डिलीवरी तिथि के आधार पर आइटम चुनें
 DocType: Grant Application,Has any past Grant Record,किसी भी पिछले अनुदान रिकॉर्ड है
 ,Sales Analytics,बिक्री विश्लेषिकी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},उपलब्ध {0}
@@ -5525,7 +5571,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चे माल की लागत की आपूर्ति
 DocType: Selling Settings,Settings for Selling Module,मॉड्यूल बेचना के लिए सेटिंग
 DocType: Hotel Room Reservation,Hotel Room Reservation,होटल रूम आरक्षण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ग्राहक सेवा
 DocType: BOM,Thumbnail,थंबनेल
 DocType: Item Customer Detail,Item Customer Detail,आइटम ग्राहक विस्तार
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ऑफर उम्मीदवार एक नौकरी।
@@ -5541,7 +5587,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} छात्रों को नामांकित किया गया है
 DocType: Fees,Student Details,छात्र विवरण
 DocType: Purchase Invoice Item,Stock Qty,स्टॉक मात्रा
-DocType: Employee Loan,Repayment Period in Months,महीने में चुकाने की अवधि
+DocType: Loan,Repayment Period in Months,महीने में चुकाने की अवधि
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
 DocType: Account,Equity,इक्विटी
@@ -5550,7 +5596,7 @@
 DocType: Task,Closing Date,तिथि समापन
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
 DocType: Timesheet,Work Detail,कार्य विस्तार
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,इंजीनियर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,इंजीनियर
 DocType: Journal Entry,Total Amount Currency,कुल राशि मुद्रा
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,खोज उप असेंबलियों
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
@@ -5595,13 +5641,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,दाता प्रकार की जानकारी
 DocType: Request for Quotation,Supplier Detail,प्रदायक विस्तार
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},सूत्र या हालत में त्रुटि: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,चालान राशि
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,चालान राशि
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,मानदंड का भार 100% तक जोड़ना चाहिए
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,उपस्थिति
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,स्टॉक आइटम
 DocType: BOM,Materials,सामग्री
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","अगर जाँच नहीं किया गया है, इस सूची के लिए प्रत्येक विभाग है जहां इसे लागू किया गया है के लिए जोड़ा जा होगा."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} बनाना
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,स्रोत और लक्ष्य गोदाम ही नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,लेनदेन खरीदने के लिए टैक्स टेम्पलेट .
@@ -5625,14 +5670,14 @@
 DocType: Shipping Rule,Fixed,स्थिर
 DocType: Vehicle Service,Clutch Plate,क्लच प्लेट
 DocType: Company,Round Off Account,खाता बंद दौर
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,प्रशासन - व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,प्रशासन - व्यय
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,परामर्श
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
-DocType: Journal Entry,Subscription,अंशदान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,अंशदान
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,शुल्क निर्माण लंबित
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,नोटिस की मुद्दत
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,नोटिस की मुद्दत
 DocType: Asset Category,Asset Category Name,एसेट श्रेणी नाम
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,यह एक जड़ क्षेत्र है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नई बिक्री व्यक्ति का नाम
@@ -5645,7 +5690,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,अनियंत्रित छोड़ें यदि आप पाठ्यक्रम आधारित समूहों को बनाने के दौरान बैच पर विचार नहीं करना चाहते हैं
 DocType: Asset,Frequency of Depreciation (Months),मूल्यह्रास की आवृत्ति (माह)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,क्रेडिट खाता
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
@@ -5653,7 +5698,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
 DocType: Hub Settings,Company Logo,कंपनी का लोगो
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 DocType: Healthcare Settings,Patient Registration,रोगी पंजीकरण
@@ -5687,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,कुल डेबिट
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,डिफ़ॉल्ट तैयार माल गोदाम
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,कृपया रोगी का चयन करें
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,बिक्री व्यक्ति
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,बिक्री व्यक्ति
 DocType: Hotel Room Package,Amenities,आराम
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,बजट और लागत केंद्र
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,भुगतान के कई डिफ़ॉल्ट मोड की अनुमति नहीं है
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,के लिए
 ,Appointment Analytics,नियुक्ति विश्लेषिकी
 DocType: Vehicle Service,Half Yearly,छमाही
 DocType: Lead,Blog Subscriber,ब्लॉग सब्सक्राइबर
@@ -5707,6 +5751,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,अगर आप प्रति वर्ष छात्र समूह बनाते हैं तो रिक्त छोड़ दें
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","वर्तमान कुंजी का उपयोग करने वाले ऐप्स तक पहुंचने में सक्षम नहीं होंगे, क्या आप निश्चित हैं?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,कुल अग्रिम
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,टेम्पलेट कोड बदलें
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,सत्रांत तारीख से अवधि प्रारंभ तिथि पहले नहीं हो सकता है। तारीखों को ठीक करें और फिर कोशिश करें।
@@ -5717,8 +5762,9 @@
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 DocType: Cheque Print Template,Signatory Position,हस्ताक्षरकर्ता स्थान
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,खोया के रूप में सेट करें
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,खोया के रूप में सेट करें
 DocType: Timesheet,Total Billable Hours,कुल बिल घंटे
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,इस सदस्यता द्वारा उत्पन्न चालानों का भुगतान करने वाले दिनों की संख्या
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भुगतान रसीद नोट
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,यह इस ग्राहक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},पंक्ति {0}: आवंटित राशि {1} से कम होना या भुगतान एंट्री राशि के बराबर होती है चाहिए {2}
@@ -5737,12 +5783,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,यह इस कर्मचारी की उपस्थिति पर आधारित है
 DocType: Assessment Result,Summary,सारांश
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,मार्क उपस्थिति
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,डेबिट अकाउंट
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,रेस्तरां आदेश प्रविष्टि आइटम
@@ -5754,7 +5800,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरीद ने का मूलय
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,कर्मचारी लाभ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,कर्मचारी लाभ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Work Order,Manufactured Qty,निर्मित मात्रा
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},शेयर {0} के साथ मौजूद नहीं हैं
@@ -5762,12 +5808,12 @@
 DocType: Asset,Out of Order,खराब
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 DocType: Projects Settings,Ignore Workstation Time Overlap,वर्कस्टेशन समय ओवरलैप को अनदेखा करें
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,बैच नंबर का चयन करें
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 DocType: Patient Service Unit,Medical Administrator,चिकित्सा प्रशासक
 DocType: Assessment Plan,Schedule,अनुसूची
 DocType: Account,Parent Account,खाते के जनक
@@ -5797,15 +5843,16 @@
 DocType: Asset Repair,Repair Status,स्थिति की मरम्मत
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 DocType: POS Profile,Account for Change Amount,राशि परिवर्तन के लिए खाता
 DocType: Purchase Invoice,input service,इनपुट सेवा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,रखरखाव टीम सदस्य
 DocType: Agriculture Analysis Criteria,Soil Analysis,मिट्टी विश्लेषण
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,विषय क्रमांक:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,व्यय खाते में प्रवेश करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
 DocType: Employee,Current Address,वर्तमान पता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
@@ -5853,19 +5900,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},प्रवेश के लिए {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,चर का नाम
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
 DocType: Asset,Asset Category,परिसंपत्ति वर्ग है
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,शुद्ध भुगतान नकारात्मक नहीं हो सकता
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,प्रदायक के लिए सामग्री
 DocType: Soil Texture,Loamy Sand,बलुई रेत
 DocType: Production Plan,Material Request Planning,सामग्री अनुरोध योजना
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,आबकारी चालान
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% से अधिक बार दिखाई देता है
 DocType: Expense Claim,Employees Email Id,ईमेल आईडी कर्मचारी
 DocType: Employee Attendance Tool,Marked Attendance,उल्लेखनीय उपस्थिति
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,वर्तमान देयताएं
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,वर्तमान देयताएं
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,टाइमर दिए गए घंटों से अधिक हो गया
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,अपने संपर्कों के लिए बड़े पैमाने पर एसएमएस भेजें
 DocType: Patient,A Positive,सकारात्मक
@@ -5876,9 +5923,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} वर्तमान में एक {1} सप्लायर स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को खरीद आदेश सावधानी के साथ जारी किए जाने चाहिए।"
 DocType: Asset Maintenance Team,Asset Maintenance Team,संपत्ति रखरखाव टीम
-DocType: Employee Loan,Loan Type,प्रकार के ऋण
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} सफलतापूर्वक सबमिट कर दिया गया है
+DocType: Loan,Loan Type,प्रकार के ऋण
 DocType: Scheduling Tool,Scheduling Tool,शेड्यूलिंग उपकरण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या repacked
 DocType: Employee Education,Major/Optional Subjects,मेजर / वैकल्पिक विषय
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
@@ -5910,7 +5958,7 @@
 DocType: Item,Units of Measure,मापन की इकाई
 DocType: Manufacturing Settings,Allow Production on Holidays,छुट्टियों पर उत्पादन की अनुमति
 DocType: Sales Invoice,Customer's Purchase Order Date,ग्राहक की खरीद आदेश दिनांक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,शेयर पूंजी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,शेयर पूंजी
 DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक अनुलग्नक दिखाएं
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 DocType: Restaurant Reservation,Reservation Time,आरक्षण का समय
@@ -5925,7 +5973,7 @@
 DocType: Purchase Order,To Receive and Bill,प्राप्त करें और बिल के लिए
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,पंक्ति # {0}: तिथि के अनुसार रेक्डीड लेनदेन तिथि से पहले नहीं हो सकता
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,विशेष रुप से प्रदर्शित प्रोडक्टस
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,डिज़ाइनर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
@@ -5935,20 +5983,20 @@
 DocType: Driver,Expiry Date,समाप्ति दिनांक
 DocType: Healthcare Settings,Employee name and designation in print,कर्मचारी नाम और पदनाम प्रिंट में
 ,accounts-browser,खातों ब्राउज़र
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,प्रथम श्रेणी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +13,Project master.,मास्टर परियोजना.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ओवर-बिलिंग या अधिक आदेश देने की अनुमति देने के लिए, &quot;भत्ता&quot; को अद्यतन स्टॉक सेटिंग या आइटम में।"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(आधा दिन)
 DocType: Payment Term,Credit Days,क्रेडिट दिन
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,कृपया लैब टेस्ट प्राप्त करने के लिए रोगी का चयन करें
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,छात्र बैच बनाने
 DocType: Fee Schedule,FRQ.,FRQ।
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,लीड समय दिन
 DocType: Cash Flow Mapping,Is Income Tax Expense,आयकर व्यय है
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,यह जाँच लें कि छात्र संस्थान के छात्रावास में रह रहा है।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 ,Stock Summary,स्टॉक सारांश
@@ -5959,10 +6007,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,रेफरी की तिथि
 DocType: Employee,Reason for Leaving,छोड़ने के लिए कारण
 DocType: BOM Operation,Operating Cost(Company Currency),परिचालन लागत (कंपनी मुद्रा)
-DocType: Employee Loan Application,Rate of Interest,ब्याज की दर
+DocType: Loan Application,Rate of Interest,ब्याज की दर
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: Item,Shelf Life In Days,दिन में शेल्फ लाइफ
 DocType: GL Entry,Is Opening,है खोलने
+DocType: Department,Expense Approvers,खर्च Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: {1} डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
 DocType: Journal Entry,Subscription Section,सदस्यता अनुभाग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,खाते {0} मौजूद नहीं है
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index c074904..731fc6f 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Izvješća o procjeni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Detalji o pretplati
 DocType: Supplier Scorecard,Notify Supplier,Obavijesti dobavljača
 DocType: Item,Customer Items,Korisnički Stavke
 DocType: Project,Costing and Billing,Obračun troškova i naplate
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavi stavka to hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail obavijesti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,procjena
 DocType: Item,Default Unit of Measure,Zadana mjerna jedinica
 DocType: SMS Center,All Sales Partner Contact,Kontakti prodajnog partnera
-DocType: Employee,Leave Approvers,Osobe ovlaštene za odobrenje odsustva
+DocType: Department,Leave Approvers,Osobe ovlaštene za odobrenje odsustva
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,istraživanja
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To se temelji na transakcijama protiv tog dobavljača. Pogledajte vremensku crtu ispod za detalje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Pravni
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Stvarni tipa porez ne može biti uključen u stopu stavka u nizu {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Pravni
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Stvarni tipa porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: Bank Guarantee,Customer,Kupac
 DocType: Purchase Receipt Item,Required By,Potrebna Do
 DocType: Delivery Note,Return Against Delivery Note,Povratak Protiv izdatnice
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Šefovi (ili skupine) od kojih računovodstvenih unosa su i sredstva su održavani.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nema obrađenih Plaćanja.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nema obrađenih Plaćanja.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži otvorena
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Potrebno je danas poduzimati tu akciju za gore navedeno ponavljanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serija je uspješno ažurirana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Provjeri
 DocType: Pricing Rule,Apply On,Nanesite na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Support Settings,Support Settings,Postavke za podršku
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Hrpa Stavka isteka Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Nacrt
 DocType: Membership,membership validaty section,članak za validaciju članstva
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 DocType: Consultation,Consultation,Konzultacija
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materijal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Izrada web mjesta
 DocType: Opening Invoice Creation Tool Item,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Računi stol ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Računi stol ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Godina Prolazeći
 DocType: Item,Country of Origin,Zemlja podrijetla
 DocType: Soil Texture,Soil Texture Criteria,Kriteriji teksture tla
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primarni podaci za kontakt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Otvorena pitanja
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 DocType: Lab Test Groups,Add new line,Dodajte novu liniju
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (dani)
@@ -89,7 +85,7 @@
 ,Delay Days,Dani odgode
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Detalji o težini stavke
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Red # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Red # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Obračun troškova Iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Molim odaberite cjenik
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Radovi u tijeku
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Odaberite datum
 DocType: Daily Work Summary Group,Holiday List,Popis praznika
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Knjigovođa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Knjigovođa
 DocType: Hub Settings,Selling Price List,Cjenik prodaje
 DocType: Patient,Tobacco Current Use,Duhanska struja
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Stopa prodaje
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Stopa prodaje
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Soil Analysis,(Ca+Mg)/K,(+ Ca Mg) / K
 DocType: Company,Phone No,Telefonski broj
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Novi {0}: #{1}
 DocType: Delivery Trip,Initial Email Notification Sent,Poslana obavijest o početnoj e-pošti
 ,Sales Partners Commission,Provizija prodajnih partnera
 DocType: Soil Texture,Sandy Clay Loam,Pješčana Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Vrijednost Nakon Amortizacija
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,povezan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Datum Gledatelji ne može biti manja od ulaska datuma zaposlenika
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Datum Gledatelji ne može biti manja od ulaska datuma zaposlenika
 DocType: Grading Scale,Grading Scale Name,Ljestvici Ime
-DocType: Subscription,Repeat on Day,Ponovite dan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: Sales Invoice,Company Address,adresa tvrtke
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
+DocType: Subscription,Subscription Start Date,Datum početka pretplate
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pričvrstite .csv datoteku s dva stupca, jedan za stari naziv i jedan za novim nazivom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nije u nijednoj fiskalnoj godini.
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, šifra stavke: {1} i klijent: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Datum završetka probnog razdoblja Ne može biti prije datuma početka probnog razdoblja
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nije određen za podugovaranje stavku {0} u redak {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista tvrtka je ušao više od jednom
 DocType: Patient,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dopušteno {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Nabavite stavke iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Nabavite stavke iz
 DocType: Price List,Price Not UOM Dependant,Cijena nije ovisna o UOM-u
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ulje za kočnice
 DocType: Tax Rule,Tax Type,Porezna Tip
 ,Completed Work Orders,Dovršeni radni nalozi
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Iznos oporezivanja
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Iznos oporezivanja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Redak # {0}: Referentni tip dokumenta mora biti jedan od zahtjeva za trošak ili unos dnevnika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Odaberi BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Redak # {0}: Referentni tip dokumenta mora biti jedan od zahtjeva za trošak ili unos dnevnika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Odaberi BOM
 DocType: SMS Log,SMS Log,SMS Prijava
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Upravljajte iznosom unaprijed dane zaposleniku
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Obavijest o isporuci
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun platiti samo
-DocType: Employee Loan,Repay Over Number of Periods,Vrati Preko broj razdoblja
+DocType: Loan,Repay Over Number of Periods,Vrati Preko broj razdoblja
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
 DocType: Lead,Product Enquiry,Upit
 DocType: Education Settings,Validate Batch for Students in Student Group,Validirati seriju za studente u grupi studenata
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ne dopusta rekord pronađeno za zaposlenika {0} od {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ne dopusta rekord pronađeno za zaposlenika {0} od {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Odaberite tvrtka prvi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Odaberite tvrtka prvi
 DocType: Employee Education,Under Graduate,Preddiplomski
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Postavite zadani predložak za Obavijest o statusu ostavite u HR postavkama.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,zaposlenik kredita
 DocType: Fee Schedule,Send Payment Request Email,Pošaljite e-poštu za zahtjev za plaćanjem
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nekretnine
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Uspješno neregistrirano.
 DocType: Assessment Result,Grade,Razred
 DocType: Restaurant Table,No of Seats,Nema sjedala
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Da biste dodali dinamički predmet, upotrijebite oznake jinja poput <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: Asset Maintenance Task,Asset Maintenance Task,Zadatak održavanja imovine
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Godišnja plaća
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Godišnja plaća
 DocType: Daily Work Summary,Daily Work Summary,Dnevni rad Sažetak
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} je zamrznuta
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Troškovi
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Odaberite Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite igraca Kontakt email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Unesite igraca Kontakt email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Stupanje
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Primarna adresa
 DocType: Production Plan,Material Request Detail,Detalji o zahtjevu za materijal
 DocType: Selling Settings,Default Quotation Validity Days,Zadani rokovi valjanosti ponude
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Kategorije voznih dozvola
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Unesite datum isporuke
 DocType: Depreciation Schedule,Make Depreciation Entry,Provjerite Amortizacija unos
+DocType: HR Settings,Leave Settings,Napusti postavke
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Provjerite zaposlenik
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radiodifuzija
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Način postavljanja POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Onemogućuje izradu vremenskih zapisnika o radnim nalozima. Operacije neće biti praćene radnim nalogom
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,izvršenje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
 DocType: Asset Maintenance Log,Maintenance Status,Status održavanja
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Pojedinosti o članstvu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: potreban Dobavljač u odnosu na plativi račun{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ukupno vrijeme: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Prednost
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Prednost
 DocType: Grant Application,Individual,Pojedinac
 DocType: Academic Term,Academics User,Akademski korisnik
 DocType: Cheque Print Template,Amount In Figure,Iznos u slici
-DocType: Employee Loan Application,Loan Info,Informacije o zajmu
+DocType: Loan Application,Loan Info,Informacije o zajmu
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Razdoblje ocjena dobavljača
 DocType: Share Transfer,Share Transfer,Dijeljenje prijenosa
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Predložak stavke
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemija
 DocType: Job Offer,Select Terms and Conditions,Odaberite Uvjeti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Iz vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Iz vrijednost
 DocType: Woocommerce Settings,Woocommerce Settings,Postavke Woocommerce
 DocType: Production Plan,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Zadani teritorij
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizija
 DocType: Work Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Odaberite kupca ili dobavljača.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Enable Perpetual Inventory,Omogući trajnu zalihu
+DocType: Bank Guarantee,Charges Incurred,Naplaćeni troškovi
 DocType: Company,Default Payroll Payable Account,Zadana plaće Plaća račun
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update Email Grupa
 DocType: Sales Invoice,Is Opening Entry,je početni unos
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Prilagođeni rezultat
 DocType: Delivery Stop,Contact Name,Kontakt ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji za procjenu predmeta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ID poreza:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ID poreza:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studentska iskaznica:
 DocType: POS Customer Group,POS Customer Group,POS Korisnička Grupa
 DocType: Land Unit,Land Unit describing various land assets,Zemljišna jedinica koja opisuje različite zemljišne vrijednosti
@@ -374,9 +371,8 @@
 ,Open Work Orders,Otvorite radne narudžbe
 DocType: Payment Term,Credit Months,Mjeseci kredita
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Neto plaća ne može biti manja od 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Da bismo zaustavili slanje ponavljajućih obavijesti o pogreškama iz sustava, u pretplati smo označili polje Onemogućeno"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Ostavlja godišnje
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Ostavlja godišnje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Email Digest,Profit & Loss,Gubitak profita
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Postavite učenike u Studentske grupe
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bankovni tekstova
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bankovni tekstova
 DocType: Crop,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Tečaj Student Grupa alat za izradu
 DocType: Lead,Do Not Contact,Ne kontaktirati
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Ljudi koji uče u svojoj organizaciji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Course Scheduling Tool,Course Start Date,Naravno Datum početka
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Objavi na Hub
 DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 ,GSTR-2,GSTR 2
 DocType: Item,Purchase Details,Detalji nabave
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nove ponude
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mail plaće slip da zaposleniku na temelju preferiranih e-mail koji ste odabrali u zaposlenika
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Tax Rule,Shipping County,dostava županija
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Naučiti
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučiti
 DocType: Asset,Next Depreciation Date,Sljedeći datum Amortizacija
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Cijena po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti za brisanje
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Red # {0}: {1} ne može biti negativna za predmet {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Red # {0}: {1} ne može biti negativna za predmet {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Pogrešna Lozinka
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Molimo postavite Hotel Room Rate na {}
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Otpremnica
 DocType: Consultation,Encounter Impression,Susret susreta
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Troškovi prodane imovinom
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno alat za raspoređivanje
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Hitno] Pogreška pri stvaranju ponavljajućeg% s za% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
 DocType: Land Unit,LInked Analysis,LInked analiza
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Razdoblje primjene ne može se nalaziti na dva zapisa o dodjeli
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Razdoblje primjene ne može se nalaziti na dva zapisa o dodjeli
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Zaprimljeno
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Stvaranje grupe učenika
 DocType: Volunteer,Weekends,Vikendi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Iznos uplate kredita
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Iznos uplate kredita
 DocType: Setup Progress Action,Action Document,Akcijski dokument
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Gotovi proizvodi
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj artikle
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete proizvoda
+DocType: Leave Application,Leave Approver Name,Ime osobe ovlaštene za odobrenje odsustva
 DocType: Depreciation Schedule,Schedule Date,Raspored Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Zarada, odbitaka i drugi plaća komponente"
 DocType: Packed Item,Packed Item,Pakirani proizvod
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Healthcare Settings,Require Lab Test Approval,Potrebno odobrenje laboratorijskog ispitivanja
 DocType: Salary Slip Timesheet,Working Hours,Radnih sati
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Ukupno izvanredno
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Ukupno izvanredno
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 DocType: Dosage Strength,Strength,snaga
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Stvaranje novog kupca
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,potrošni cost
 DocType: Purchase Receipt,Vehicle Date,Datum vozila
 DocType: Student Log,Medical,Liječnički
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Razlog gubitka
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Razlog gubitka
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Ažuriranje broja računa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti ista kao i olova
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od nekorigirani iznosa
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Singl
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
-DocType: Subscription,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Unesite troška
 DocType: Drug Prescription,Dosage,Doziranje
 DocType: Journal Entry Account,Sales Order,Narudžba kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosječna prodajna cijena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Prosječna prodajna cijena
 DocType: Assessment Plan,Examiner Name,Naziv ispitivač
 DocType: Lab Test Template,No Result,Nema rezultata
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext priručnik
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Prikaži lišće svih članova odjela u kalendaru
 DocType: Purchase Invoice,01-Sales Return,01-Povratak prodaje
 DocType: Account,Is Group,Je grupe
 DocType: Email Digest,Pending Purchase Orders,U tijeku narudžbenice
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obavezno polje - akademska godina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nije povezan s {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Prilagodite uvodni tekst koji ide kao dio tog e-maila. Svaka transakcija ima zaseban uvodni tekst.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Postavite zadani dugovni račun za tvrtku {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Postavite zadani dugovni račun za tvrtku {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakcija nije dopuštena protiv zaustavljene radne narudžbe {0}
 DocType: Setup Progress Action,Min Doc Count,Min doktor grofa
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodaju
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Nije moguće promijeniti način vrednovanja jer postoje transakcije protiv nekih stavki koje nemaju vlastitu metodu vrednovanja
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Nije moguće promijeniti način vrednovanja jer postoje transakcije protiv nekih stavki koje nemaju vlastitu metodu vrednovanja
 DocType: Student Report Generation Tool,Attended by Parents,Prisustvovali su roditelji
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Patient,AB Positive,AB Pozitivan
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekord gledanosti
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za timesheet temelju plaće.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
-DocType: Employee Loan,Total Payment,ukupno plaćanja
+DocType: Loan,Total Payment,ukupno plaćanja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nije moguće otkazati transakciju za dovršenu radnu nalog.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} je otkazana pa se radnja ne može dovršiti
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta Dijelovi za izgradnju
 DocType: POS Profile User,POS Profile User,Korisnik POS profila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Izravni dohodak
+DocType: Subscription Invoice,Subscription Invoice,Pretplatnička faktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Izravni dohodak
 DocType: Patient Appointment,Date TIme,Datum vrijeme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Postavljanje tvrtke i poreza
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Odaberite Tečaj
 DocType: Codification Table,Codification Table,Tablica kodifikacije
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Odaberite tvrtke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Odaberite tvrtke
 DocType: Stock Entry Detail,Difference Account,Račun razlike
 DocType: Purchase Invoice,Supplier GSTIN,Dobavljač GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Predložak za mapiranje novčanog toka
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
+DocType: Bank Guarantee,Providing,pružanje
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nije dopušteno, konfigurirajte predložak laboratorija za testiranje prema potrebi"
 DocType: Patient,Risk Factors,Faktori rizika
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 DocType: Healthcare Settings,Appointment Confirmation,Potvrda imenovanja
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Zatvaranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,zdravo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Premještanje stavke
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Već ste postavili zadani položaj u poziciji {0} za korisnika {1}, zadovoljavajući zadane postavke"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akumulirani Vrijednosti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Teritorij je potreban u POS profilu
 DocType: Supplier,Prevent RFQs,Spriječiti rasprave
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Napravi prodajnu narudžbu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Plaća poslana za razdoblje od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Plaća poslana za razdoblje od {0} do {1}
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Datum dostave računa
 DocType: Production Plan,Production Plan,Plan proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvaranje alata za izradu računa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupno dodijeljeni lišće {0} ne bi trebala biti manja od već odobrenih lišća {1} za razdoblje
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Postavite količinu u transakcijama na temelju serijskog unosa
 ,Total Stock Summary,Ukupni zbroj dionica
 DocType: Announcement,Posted By,Objavio
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Postavite tvrtku
 DocType: Share Balance,Share Balance,Dionički saldo
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Training Result Employee,Training Result Employee,Obuku zaposlenika Rezultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Kreirano Skladište za ulazne stavke
-DocType: Repayment Schedule,Principal Amount,iznos glavnice
-DocType: Employee Loan Application,Total Payable Interest,Ukupno obveze prema dobavljačima kamata
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,iznos glavnice
+DocType: Loan Application,Total Payable Interest,Ukupno obveze prema dobavljačima kamata
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Ukupno izvrsno: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
 DocType: Land Unit,Land Unit Name,Naziv zemljišta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Ulaz Odbitak
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Završavati
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Obavijesti korisnike putem e-pošte
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Obavijesti korisnike putem e-pošte
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna prodaja Osoba {0} postoji s istim ID zaposlenika
 DocType: Employee Advance,Claimed Amount,Zahtjev za iznos potraživanja
 apps/erpnext/erpnext/config/education.py +180,Masters,Masteri
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa nije stvorio, ručno stvoriti jedan."
 DocType: Supplier Scorecard,Per Year,Godišnje
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ne ispunjavaju uvjete za prijem u ovaj program po DOB-u
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
 DocType: Vital Signs,Height (In Meter),Visina (u mjeraču)
 DocType: Student,Sibling Details,polubrat Detalji
 DocType: Vehicle Service,Vehicle Service,usluga vozila
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatski aktivira se zahtjev povratne informacije na temelju uvjeta.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatski aktivira se zahtjev povratne informacije na temelju uvjeta.
 DocType: Employee,Reason for Resignation,Razlog za ostavku
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Predložak za ocjene rada .
 DocType: Sales Invoice,Credit Note Issued,Odobrenje kupcu izdano
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Raspored održavanja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Cjenovna pravila filtriraju se na temelju kupca, grupe kupaca, regije, dobavljača, proizvođača, kampanje, prodajnog partnera i sl."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Neto promjena u inventar
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Upravljanje zaposlenicima kredita
 DocType: Employee,Passport Number,Broj putovnice
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Odnos s Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Upravitelj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Upravitelj
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Postavite račun u skladištu {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Transfer robe
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nije moguće pronaći put
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Otvaranje (DR)
+DocType: Loan,Applicant,podnositelj zahtjeva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Vremenska oznaka knjiženja mora biti nakon {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Napraviti ponavljajuće dokumente
 ,GST Itemised Purchase Register,Registar kupnje artikala GST
 DocType: Course Scheduling Tool,Reschedule,napraviti nov raspored
-DocType: Employee Loan,Total Interest Payable,Ukupna kamata
+DocType: Loan,Total Interest Payable,Ukupna kamata
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Porezi i pristojbe zavisnog troška
 DocType: Work Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Završi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Baza
 DocType: Timesheet,Total Billed Hours,Ukupno Naplaćene sati
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Napišite paušalni iznos
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Napišite paušalni iznos
 DocType: Leave Block List Allow,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / Gubitak računa na sredstva Odlaganje
 DocType: Vehicle Log,Service Details,Pojedinosti usluge
-DocType: Subscription,Quarterly,Tromjesečni
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,grupirane
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Vrijeme list
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Jedinice za pranje sirovine na temelju
 DocType: Sales Invoice,Port Code,Portski kod
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervni skladište
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervni skladište
 DocType: Lead,Lead is an Organization,Olovo je organizacija
 DocType: Guardian Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pretprodaja
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (zadnja)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Predlošci kriterija dobavljača bodova.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Ulazak Plaćanje je već stvorio
 DocType: Request for Quotation,Get Suppliers,Nabavite dobavljače
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Pregled Plaća proklizavanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Pregled Plaća proklizavanja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} unesen više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Možete obnoviti pretplatu samo ako vaše članstvo istekne u roku od 30 dana
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Odaberite samo ako imate postavke dokumenata Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Supplier Scorecard,Per Week,Tjedno
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Ukupno učenika
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card Stupanje
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Društvo i računi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,u vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,u vrijednost
 DocType: Asset Settings,Depreciation Options,Opcije amortizacije
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Nevažeće vrijeme knjiženja
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Nevažeće vrijeme knjiženja
 DocType: Lead,Campaign Name,Naziv kampanje
 DocType: Hotel Room,Capacity,Kapacitet
 DocType: Selling Settings,Close Opportunity After Days,Zatvori Prilika Nakon dana
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Budget,Budget Against,proračun protiv
 DocType: Employee,Cell Number,Mobitel Broj
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterije nema zaposlenika. Provjerite da Plaća Slips još nisu stvorena.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterije nema zaposlenika. Provjerite da Plaća Slips još nisu stvorena.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatski zahtjev za materijalom odobren
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Odaberite tablicu
 DocType: BOM,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u &quot;Primatelji&quot;
 DocType: Special Test Items,Particulars,Pojedinosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} od tipa {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Od {0} od tipa {1}
 DocType: Warranty Claim,CI-,Civilno
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Asset,Maintenance,Održavanje
+DocType: Subscriber,Subscriber,Pretplatnik
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Ažurirajte status projekta
 DocType: Item,Maximum sample quantity that can be retained,Maksimalna količina uzorka koja se može zadržati
@@ -1065,26 +1061,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Zadane postavke za Košarica
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Dodaj vremenske brojeve
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Imovine otpisan putem Temeljnica {0}
-DocType: Employee Loan,Interest Income Account,Prihod od kamata računa
+DocType: Loan,Interest Income Account,Prihod od kamata računa
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Pregledajte pozivnicu poslanu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnologija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Troškovi održavanja ureda
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Ići
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Postavljanje račun e-pošte
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Unesite predmeta prvi
 DocType: Asset Repair,Downtime,Prekid rada
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademski naziv:
 DocType: Salary Detail,Do not include in total,Ne uključujte ukupno
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Uzorak {0} ne može biti veći od primljene količine {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-poštu
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 DocType: Item,Max Sample Quantity,Maksimalna količina uzorka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nemate dopuštenje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nemate dopuštenje
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Zatraženo pitanje
 DocType: Vital Signs,Heart Rate / Pulse,Puls / srčane frekvencije
 DocType: Company,Default Bank Account,Zadani bankovni račun
@@ -1095,11 +1091,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab testovi i vitalni znakovi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nisu pronađeni zaposlenici
-DocType: Subscription,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentska grupa je već ažurirana.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentska grupa je već ažurirana.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Ažuriranje projekta.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 DocType: Land Unit,Tree Details,stablo Detalji
@@ -1149,7 +1144,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Sve skupine proizvoda
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
 DocType: Work Order,Item To Manufacture,Proizvod za proizvodnju
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status je {2}
@@ -1163,7 +1157,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",Ponovno odaberite ako je odabrana adresa uređena nakon spremanja
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 DocType: Item,Hub Publishing Details,Pojedinosti objavljivanja središta
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Otvaranje &#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Otvaranje &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvoreni učiniti
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Lab Test Template,Result Format,Format rezultata
@@ -1173,7 +1167,7 @@
 DocType: Payroll Entry,Bimonthly,časopis koji izlazi svaka dva mjeseca
 DocType: Vehicle Service,Brake Pad,Pad kočnice
 DocType: Fertilizer,Fertilizer Contents,Sadržaj gnojiva
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Istraživanje i razvoj
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznositi Billa
 DocType: Company,Registration Details,Registracija Brodu
 DocType: Timesheet,Total Billed Amount,Ukupno naplaćeni iznos
@@ -1187,7 +1181,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Zaobilaženje ograničenja kreditnog ograničenja na prodajnom nalogu
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Ocjenjivanje.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi za košaricu&#39;, kao što Košarica je omogućena i tamo bi trebao biti barem jedan Porezna pravila za Košarica"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ulazak Plaćanje {0} je vezan protiv Reda {1}, provjeriti treba li se izvući kao napredak u tom računu."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ulazak Plaćanje {0} je vezan protiv Reda {1}, provjeriti treba li se izvući kao napredak u tom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Prodajno mjesto
@@ -1221,7 +1215,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimalna sjedala
 DocType: Item Attribute,Item Attribute Values,Stavka vrijednosti atributa
 DocType: Examination Result,Examination Result,Rezultat ispita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Primka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Primka
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referentni DOCTYPE mora biti jedan od {0}
@@ -1229,15 +1223,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nema dostupnih stavki za prijenos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nema dostupnih stavki za prijenos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
 DocType: Journal Entry,Depreciation Entry,Amortizacija Ulaz
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Stopa ili Popust
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Omiljene
 DocType: Hub Settings,Custom Data,Prilagođeni podaci
@@ -1249,9 +1243,9 @@
 DocType: Medical Code,Medical Code Standard,Standard medicinskog koda
 DocType: Soil Texture,Clay Composition (%),Sastava glina (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Spremite prije dodjele zadatka.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Vrijednost bilance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Vrijednost bilance
 DocType: Lab Test,Lab Technician,Laboratorijski tehničar
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Prodajni cjenik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ako je označeno, izradit će se kupac, mapiran pacijentu. Pacijentne fakture će biti stvorene protiv ovog klijenta. Također možete odabrati postojeći Korisnik tijekom izrade pacijenta."
 DocType: Bank Reconciliation,Account Currency,Valuta računa
@@ -1259,16 +1253,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Molimo spomenuti zaokružiti račun u Društvu
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,Komponente
 DocType: Item Barcode,Item Barcode,Barkod proizvoda
 DocType: Woocommerce Settings,Endpoints,Krajnje točke
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","da se generira. Ako je odgođeno, morat ćete ručno promijeniti polje &quot;Ponoviti na dan u mjesecu&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
 DocType: Share Transfer,From Folio No,Iz folije br
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
@@ -1303,16 +1295,17 @@
 DocType: Asset,Available-for-use Date,Datum dostupan za upotrebu
 DocType: Guardian,Guardian Name,Naziv Guardian
 DocType: Cheque Print Template,Has Print Format,Ima format ispisa
-DocType: Employee Loan,Sanctioned,kažnjeni
+DocType: Loan,Sanctioned,kažnjeni
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,Obavezno polje. Moguće je da za njega nije upisan tečaj.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 DocType: Crop Cycle,Crop Cycle,Ciklus usjeva
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &#39;proizvod Bundle&#39; predmeta, skladište, rednim i hrpa Ne smatrat će se iz &quot;Popis pakiranja &#39;stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo &#39;proizvod Bundle&#39; točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u &#39;pakiranje popis&#39; stol."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &#39;proizvod Bundle&#39; predmeta, skladište, rednim i hrpa Ne smatrat će se iz &quot;Popis pakiranja &#39;stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo &#39;proizvod Bundle&#39; točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u &#39;pakiranje popis&#39; stol."
 DocType: Student Admission,Publish on website,Objavi na web stranici
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
+DocType: Subscription,Cancelation Date,Datum otkazivanja
 DocType: Purchase Invoice Item,Purchase Order Item,Stavka narudžbenice
 DocType: Agriculture Task,Agriculture Task,Zadatak poljoprivrede
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Neizravni dohodak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Neizravni dohodak
 DocType: Student Attendance Tool,Student Attendance Tool,Studentski Gledatelja alat
 DocType: Restaurant Menu,Price List (Auto created),Cjenik (automatski izrađen)
 DocType: Cheque Print Template,Date Settings,Datum Postavke
@@ -1338,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Datetime testiranja laboratorija ne može biti prije datetime prikupljanja
+DocType: Subscription Plan,Cost,cijena
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 DocType: Expense Claim,Total Advance Amount,Ukupni iznos predujma
 DocType: Delivery Stop,Estimated Arrival,Očekivani dolazak
@@ -1349,14 +1343,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
 DocType: Timesheet Detail,Bill,Račun
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bijela
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Bijela
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Kol nisu dostupni za {4} u skladištu {1} na objavljivanje vrijeme upisa ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Na popisu potvrdnih okvira možete odabrati najviše jednu opciju.
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 DocType: Item,Automatically Create New Batch,Automatski kreira novu seriju
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Dodjeljivanje {0} do {1} (redak {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Dodjeljivanje {0} do {1} (redak {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Napravi
 DocType: Student Admission,Admission Start Date,Prijem Datum početka
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novi zaposlenik
@@ -1372,7 +1366,7 @@
 DocType: Holiday List,Holiday List Name,Ime popisa praznika
 DocType: Repayment Schedule,Balance Loan Amount,Stanje Iznos kredita
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Raspored nastave
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Burzovnih opcija
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Burzovnih opcija
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Onemogući dohvaćanje zadnjih pojedinosti o kupnji u narudžbenici
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Da li stvarno želite vratiti ovaj otpisan imovine?
@@ -1391,11 +1385,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: Purchase Invoice,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite a {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Izrada inačice je u redu čekanja.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Sažetak rada za {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Osobina stol je obavezno
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvo odobrenje za odsustvo na popisu će biti postavljeno kao zadani odobrenja za otpust.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Plan,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ne može biti negativna
 DocType: Training Event,Self-Study,Samostalno istraživanje
@@ -1407,7 +1402,7 @@
 DocType: Workstation,Wages,Plaće
 DocType: Asset Maintenance,Maintenance Manager Name,Ime upravitelja održavanja
 DocType: Agriculture Task,Urgent,Hitan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Navedite valjanu Row ID za redom {0} u tablici {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Navedite valjanu Row ID za redom {0} u tablici {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nije moguće pronaći varijablu:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Odaberite polje za uređivanje iz numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Ne može biti fiksna stavka imovine jer je Lozinka stanja stvorena.
@@ -1419,7 +1414,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Naziv predloška inspekcije kvalitete
 DocType: Project,First Email,Prva e-pošta
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Share Transfer,Issue,Izazov
@@ -1433,10 +1428,10 @@
 DocType: Tax Rule,Shipping State,Državna dostava
 ,Projected Quantity as Source,Planirana količina kao izvor
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Putovanje isporuke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Putovanje isporuke
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Vrsta prijenosa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Prodajni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Prodajni troškovi
 DocType: Consultation,Diagnosis,Dijagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
@@ -1445,12 +1440,13 @@
 DocType: Sales Partner,Implementation Partner,Provedba partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Prodaja Naručite {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Odaberite račun za dohodak od kamata u zajam {0}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Izrada Stock unose
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Tijekom Postotak proizvodnje doplatku
-DocType: Employee Loan,Repayment Schedule,Otplata Raspored
+DocType: Loan,Repayment Schedule,Otplata Raspored
 DocType: Shipping Rule Condition,Shipping Rule Condition,Dostava Pravilo Stanje
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
@@ -1464,7 +1460,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Education Settings,Attendance Freeze Date,Datum zamrzavanja pohađanja
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Pogledaj sve proizvode
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalna dob (olovo)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Svi Sastavnice
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotel Sobe tipa {0} nisu dostupne na {1}
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Od zaposlenika
 DocType: Driver,Cellphone Number,broj mobitela
 DocType: Project,Monitor Progress,Monitor napredak
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Zona ključnih performansi
 DocType: Program Enrollment,Transportation,promet
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Pogrešna Osobina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
+DocType: Department Approver,Department Approver,Odjel za odobrenje
 DocType: SMS Center,Total Characters,Ukupno Likovi
 DocType: Employee Advance,Claimed,tvrdio
 DocType: Crop,Row Spacing,Spremanje redaka
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Doprinos%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Prema postavkama kupnje ako je potrebna narudžbenica == &#39;DA&#39;, a zatim za izradu računa za kupnju, korisnik mora najprije stvoriti narudžbenicu za stavku {0}"
+,HSN-wise-summary of outward supplies,HSN-mudar sažetak vanjske opskrbe
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Naziv akcije
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Početak godine
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Prve dvije znamenke GSTIN-a trebale bi se podudarati s državnim brojem {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Početak datum tekućeg razdoblja dostavnice
 DocType: Salary Slip,Leave Without Pay,Neplaćeno odsustvo
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapacitet Greška planiranje
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja će biti kopirana samo u trenutku stvaranja.
 DocType: Setup Progress Action,Domains,Domene
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Uprava
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Uprava
 DocType: Cheque Print Template,Payer Settings,Postavke Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Oprez
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Dan početka je veći od završnog dana u zadatku &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Povratak / debitna Napomena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Povratak / debitna Napomena
 DocType: Price List Country,Price List Country,Država cjenika
 DocType: Item,UOMs,J. MJ.
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod proizvoda ne može se mijenjati za serijski broj.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kod proizvoda ne može se mijenjati za serijski broj.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konverzijski faktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Unesite Šifra dobiti broj serije
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Dati informacije.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Dati informacije.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavljač baza podataka.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Ne možete ponovo pokrenuti pretplatu koja nije otkazana.
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Troška za stavku s šifra '
 DocType: Fee Validity,Valid Till,Vrijedi do
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Sastanak učitelja svih roditelja
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Promjena grupe kupaca za odabranog kupca nije dopuštena.
 ,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
 DocType: Program Enrollment Tool,Enrollment Details,Pojedinosti o upisu
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Odaberite klijenta
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Purchase Order,Group same items,Isti predmeti grupe
 DocType: Purchase Invoice,Disable Rounded Total,Ugasiti zaokruženi iznos
-DocType: Employee Loan Application,Repayment Info,Informacije otplate
+DocType: Department,Parent Department,Odjel za roditelje
+DocType: Loan Application,Repayment Info,Informacije otplate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 DocType: Maintenance Team Member,Maintenance Role,Uloga za održavanje
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Postavljanje zaposlenika
 DocType: Sales Order,SO-,TAKO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik hotela rezervacije
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Odaberite prefiks prvi
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,istraživanje
+DocType: Subscription Settings,Subscription Settings,Postavke pretplate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Navedite barem jedan atribut u tablici Svojstva
 DocType: Announcement,All Students,Svi studenti
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Crop Cycle,Less than a year,Manje od godinu dana
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studentski Mobile Ne
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 DocType: Crop,Yield UOM,Prinos UOM
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
 DocType: Item,Is Item from Hub,Je li stavka iz huba
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Red {0}: Tip aktivnost je obavezna.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Plaćeni Dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Plaćeni Dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo knjiga
 DocType: Stock Reconciliation,Difference Amount,Razlika Količina
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} na dopustu na {1}
 DocType: Purchase Invoice,Reverse Charge,Obrnuti naboj
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Zadržana dobit
 DocType: Purchase Invoice,05-Change in POS,05-Promjena u POS-u
 DocType: Vehicle Log,Service Detail,Detalj usluga
 DocType: BOM,Item Description,Opis proizvoda
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Prilika proizvoda
 ,Student and Guardian Contact Details,Studentski i Guardian Kontaktni podaci
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljača {0} email adresa je potrebno za slanje e-pošte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Privremeni Otvaranje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Privremeni Otvaranje
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,View Hub
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 DocType: Patient Appointment,More Info,Više informacija
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
 DocType: Supplier Scorecard,Scorecard Actions,Akcije tablice rezultata
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Primjer: Masters u Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Odbijen galerija
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,za
 DocType: Supplier Quotation Item,Lead Time in days,Olovo Vrijeme u danima
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Obveze Sažetak
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Ispitivanje laboratorijskih ispitivanja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Mali
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Stavka Alata za stvaranje fakture otvaranja
 DocType: Education Settings,Employee Number,Broj zaposlenika
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Otkažite fakturu nakon razdoblja odgode
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,% Kompletirano
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijsko ispitivanje Datetime
 DocType: Email Digest,Add Quote,Dodaj ponudu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Neizravni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 DocType: Agriculture Analysis Criteria,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Najprije postavite šifru stavke
 DocType: Item,ITEM-,ARTIKAL-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
+DocType: Subscription Plan,Billing Interval Count,Brojač intervala naplate
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,tim ažuriranja
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Stvaranje format ispisa
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Točka Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativna stavka ne smije biti jednaka kodu stavke
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalizacija privremene procjene
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Radna stanica
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
 DocType: Healthcare Settings,Registration Message,Poruka o registraciji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardver
 DocType: Prescription Dosage,Prescription Dosage,Doziranje na recept
 DocType: Attendance,HR Manager,HR menadžer
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Odaberite tvrtku
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Datumi početka i završetka
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otvoreno BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Project Update,Great/Quickly,Veliki / Brzo
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Odaberite serije za umetnutu stavku
 DocType: Asset,Depreciation Schedules,amortizacija Raspored
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Sljedeći računi mogu biti odabrani u GST postavkama:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Sljedeći računi mogu biti odabrani u GST postavkama:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Prosječni dnevni izlaz
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Naziv i tip
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Physician,Contacts and Address,Kontakti i adresa
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Podobnost i pojedinosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevnik mailova
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup sa portala, za više postavki provjere portal."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljačka tabela ocjena varijable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos kupnje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Iznos kupnje
 DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo je do pogrešaka prilikom izrade tečaja Raspored
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi Odrednik odobrenja u popisu će biti postavljen kao zadani odobrenje troškova.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ne može biti veće od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
@@ -1839,15 +1844,16 @@
 DocType: Package Code,Package Code,kod paketa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,šegrt
 DocType: Purchase Invoice,Company GSTIN,Tvrtka GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porezna detalj Tablica preuzeta iz točke majstora kao string i pohranjeni u tom području.
  Koristi se za poreze i troškove"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Odustani od odobrenja Obvezni zahtjev za napuštanje
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Porezni Pravilo za transakcije.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Plaćanje u redu {0} vjerojatno je duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Poljoprivreda (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Odreskom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Najam ureda
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke SMS pristupnika
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Odreskom
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Najam ureda
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Postavke SMS pristupnika
 DocType: Disease,Common Name,Uobičajeno ime
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
 DocType: Vital Signs,Blood Pressure,Krvni tlak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validirati upisani tečaj za studente u studentskoj grupi
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Item,Item Attribute,Stavka značajke
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Vlada
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Zatraži {0} već postoji za vozila Prijava
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Naziv Institut
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Unesite iznos otplate
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Unesite iznos otplate
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Stavka Varijante
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Usluge
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Plaća proklizavanja zaposlenog
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Odaberite Mogući Dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Odaberite Mogući Dobavljač
 DocType: Sales Invoice,Source,Izvor
 DocType: Customer,"Select, to make the customer searchable with these fields","Odaberite, kako bi korisnik mogao pretraživati s tim poljima"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Novčani tijek iz investicijskih
 DocType: Program Course,Program Course,Program predmeta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Homepage,Company Tagline for website homepage,Tvrtka Opisna oznaka za web stranici
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Pojedinosti o članstvu
 DocType: Leave Block List,Block Holidays on important days.,Blok Odmor na važnim danima.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Unesite sve potrebne vrijednosti rezultata
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Potraživanja Sažetak
-DocType: Employee Loan,Monthly Repayment Amount,Mjesečni iznos otplate
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Potraživanja Sažetak
+DocType: Loan,Monthly Repayment Amount,Mjesečni iznos otplate
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Otvori računa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
 DocType: UOM,UOM Name,UOM Ime
 DocType: GST HSN Code,HSN Code,HSN kod
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Doprinos iznos
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Korisnik {0} već je dodijeljen liječniku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,kutija
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Mogući Dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Mogući Dobavljač
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mjesečna distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Zdravstvo (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nema proizvoda za pakiranje
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
-DocType: Employee Loan,Repayment Method,Način otplate
+DocType: Loan,Repayment Method,Način otplate
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ako je označeno, početna stranica će biti zadana točka Grupa za web stranicu"
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Potraživanja za tvrtke trošak.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Potvrda je potrebna
 DocType: Company,Default Holiday List,Default odmor List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: S vremena i na vrijeme od {1} je preklapanje s {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Odaberite tvrtku
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Ispiši odjeljak
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Korisnik {0} nema zadani POS profil. Provjerite zadani redak {1} za ovog korisnika.
 DocType: Student Group,Set 0 for no limit,Postavite 0 bez granica
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Redak {idx}: {field} potreban je za izradu faktura otvaranja {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Primarna adresa i kontakt detalja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno slanje plaćanja Email
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Odaberite barem jednu domenu.
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
 DocType: SMS Center,Receiver List,Prijemnik Popis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Traži Stavka
 DocType: Payment Schedule,Payment Amount,Iznos za plaćanje
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,ljestvici
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,već završena
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock u ruci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock u ruci
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
 DocType: Customer,Customer POS Id,ID klijenta POS
 DocType: Account,Account Name,Naziv računa
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Unesite Woocommerce URL poslužitelja
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 DocType: Share Balance,To No,Za br
-DocType: Subscription,Reference Document,Referentni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
-DocType: Grant Application,Applicant Type,Vrsta podnositelja zahtjeva
+DocType: Loan,Applicant Type,Vrsta podnositelja zahtjeva
 DocType: Purchase Invoice,03-Deficiency in services,03 - Nedostatak usluga
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Zadani standard medicinskog koda
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Naplaćeno
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Odbiti
 DocType: Journal Entry Account,Debit in Company Currency,Zaduženja tvrtke valuti
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Provjerite unos isplati
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Provjerite unos isplati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
 DocType: Company,Default Values,Zadane vrijednosti
 DocType: Membership,INR,INR
@@ -2108,10 +2114,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Ukupno (Bez poreza)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Olovni broj
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Dostupno
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Dostupno
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planiranje kapaciteta za (dani)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,nabavka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obvezno polje - Program
 DocType: Special Test Template,Result Component,Rezultat Komponenta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Jamstvo Zatraži
@@ -2131,7 +2137,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Uključi odmor u lišće što lišće
 DocType: Sales Invoice,Packed Items,Pakirani proizvodi
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Jamstvo tužbu protiv Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Ukupno'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Ukupno'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogućite Košarica
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2155,10 @@
 DocType: Selling Settings,Selling Settings,Postavke prodaje
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potvrdite radnju
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Ispunjenje
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Pogledaj u košaricu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Troškovi marketinga
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Nije moguće stvoriti standardne kriterije. Preimenujte kriterije
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
@@ -2174,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Material Request,Transferred,prebačen
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext dovršeno!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext dovršeno!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Prikupiti naknadu za registraciju pacijenata
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nije moguće promijeniti atribute nakon transakcije zaliha. Napravite novu stavku i prenesite dionicu novoj stavci
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nije moguće promijeniti atribute nakon transakcije zaliha. Napravite novu stavku i prenesite dionicu novoj stavci
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Porezna prekid
 DocType: Packing Slip,PS-,P.S-
@@ -2212,11 +2218,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Predujmovi zaposlenika
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupe studenata
 DocType: Grant Application,Assessment  Mark (Out of 10),Ocjena ocjenjivanja (od 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ne
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodijeljeni iznos
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Naziv teritorija
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,U pretplati možete imati samo planove s istim ciklusom naplate
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
@@ -2242,10 +2250,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,procjene
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Događaji treninga
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Prati vodio izvorom olova.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za Pravilo isporuke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Molim uđite
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Molim uđite
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Zapisnik održavanja
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
@@ -2253,11 +2261,11 @@
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
 DocType: Student Group,Instructors,Instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} mora biti podnesen
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Upravljanje dijeljenjem
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Uplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Uplata
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Skladište {0} nije povezano s bilo kojim računom, navedite račun u skladištu ili postavite zadani račun zaliha u tvrtki {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Upravljanje narudžbe
 DocType: Work Order Operation,Actual Time and Cost,Stvarnog vremena i troškova
@@ -2267,7 +2275,7 @@
 DocType: Student Leave Application,Student Leave Application,Studentski Ostavite aplikacija
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
@@ -2277,7 +2285,7 @@
 DocType: Item,Barcodes,Bar kodovi
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,pomoćnik
 DocType: Asset Movement,Asset Movement,imovina pokret
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Mora se poslati radni nalog {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Novi Košarica
@@ -2295,13 +2303,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Valuta naplate mora biti jednaka valutnoj valuti ili valuti stranke računa tvrtke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Soil Texture,Loam,Ilovača
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Redak {0}: Datum dospijeća ne može biti prije objavljivanja datuma
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Redak {0}: Datum dospijeća ne može biti prije objavljivanja datuma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Napravi ulazno plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Lišće
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Drvo centara financijski trošak.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
@@ -2315,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Potrošnja materijala nije postavljena u Postavkama za proizvodnju.
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne može se overbill za stavku {0} u retku {1} više od {2}. Da biste dopustili prekoračenje, postavite Postavke zaliha"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne može se overbill za stavku {0} u retku {1} više od {2}. Da biste dopustili prekoračenje, postavite Postavke zaliha"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ažurirajte odgovor
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
@@ -2326,12 +2333,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprije odaberite program
 DocType: Patient Appointment,Patient Age,Pacijentovo doba
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Upravljanje projektima
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serijski broj {0} već je vraćen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serijski broj {0} već je vraćen
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač dobara ili usluga.
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Asset Maintenance Log,Planned,Planirani
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Primljeni računi s mogućnošću primanja, ako nisu postavljeni u Pacijentu za rezerviranje troškova konzultacija."
 DocType: Vehicle Log,Fuel Price,Cijena goriva
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Budžet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Postavi Otvori
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
@@ -2345,16 +2353,16 @@
 DocType: Lead,Follow Up,Pratiti
 DocType: Item,Is Sales Item,Je proizvod namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupa proizvoda
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Vrijeme održavanja
 ,Amount to Deliver,Iznos za isporuku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Ista stavka je unesena više puta. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam početka ne može biti ranije od godine Datum početka akademske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposlenik {0} već je podnio zahtjev za {1} između {2} i {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Bilo je grešaka .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposlenik {0} već je podnio zahtjev za {1} između {2} i {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
 DocType: Education Settings,Instructor Records to be created by,Instruktorski zapisi moraju biti izrađeni od strane
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} stvorio
 DocType: GST Account,GST Account,GST račun
@@ -2374,8 +2382,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Dodano u favorite
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nije pronađena plaća za podnošenje gore navedenih kriterija ili već dostavljen skraćeni prihod
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Carine i porezi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nije pronađena plaća za podnošenje gore navedenih kriterija ili već dostavljen skraćeni prihod
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Carine i porezi
 DocType: Projects Settings,Projects Settings,Postavke projekata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
@@ -2385,27 +2393,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Stablo grupe proizvoda.
 DocType: Production Plan,Total Produced Qty,Ukupna proizvodna količina
 DocType: Payroll Entry,Get Employee Details,Pronađite pojedinosti zaposlenika
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 DocType: Asset,Sold,prodan
 ,Item-wise Purchase History,Povjest nabave po stavkama
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baza Iznos (Društvo valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Sirovine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Sirovine
 DocType: Payment Reconciliation Payment,Reference Row,Referentni Row
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Izbrišite sve transakcije za ovu Društvo
 DocType: Patient,O Positive,O pozitivno
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investicije
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Nije dostupna otplata za unos dnevnika
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: BOM,Show In Website,Pokaži na web stranici
 DocType: Shopping Cart Settings,Show Quantity in Website,Prikaži Količina u Web
-DocType: Employee Loan Application,Total Payable Amount,Ukupno obveze prema dobavljačima iznos
+DocType: Loan Application,Total Payable Amount,Ukupno obveze prema dobavljačima iznos
 DocType: Task,Expected Time (in hours),Očekivani vrijeme (u satima)
 DocType: Item Reorder,Check in (group),Check in (grupa)
 DocType: Soil Texture,Silt,Mulj
@@ -2424,7 +2433,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Izvršiti plaćanje
 DocType: Room,Room Name,Soba Naziv
 DocType: Prescription Duration,Prescription Duration,Trajanje liječenja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 DocType: Activity Cost,Costing Rate,Obračun troškova stopa
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kupčeve adrese i kontakti
 ,Campaign Efficiency,Učinkovitost kampanje
@@ -2442,11 +2451,11 @@
 DocType: Chapter,Chapter,Poglavlje
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Zadani račun automatski će se ažurirati u POS fakturu kada je ovaj način odabran.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresa prodavača i kontakti
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Poludnevni Datum treba biti između od datuma i datuma
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Poludnevni Datum treba biti između od datuma i datuma
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Postavite Zadani centar troškova u tvrtki {0}.
 DocType: Item,Has Batch No,Je Hrpa Ne
@@ -2464,7 +2473,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica)
 DocType: Soil Texture,Soil Type,Vrsta tla
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nova poruka
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandat za GoCardless
@@ -2484,7 +2492,7 @@
 DocType: Hub Category,Hub Category,Kategorija hubova
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
-DocType: Employee Loan,Loan Amount,Iznos pozajmice
+DocType: Loan,Loan Amount,Iznos pozajmice
 DocType: Student Report Generation Tool,Add Letterhead,Dodaj pismo zaglavlja
 DocType: Program Enrollment,Self-Driving Vehicle,Vozila samostojećih
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Stalna ocjena dobavljača
@@ -2512,9 +2520,9 @@
 DocType: Cash Flow Mapper,Position,Položaj
 DocType: Patient,Patient Details,Detalji pacijenta
 DocType: Patient,B Positive,B Pozitivan
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa ne-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportovi
@@ -2522,8 +2530,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Ukupno Stvarni
 DocType: Lab Test UOM,Test UOM,Ispitaj UOM
 DocType: Student Siblings,Student Siblings,Studentski Braća i sestre
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detalji o planu pretplate
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,jedinica
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Navedite tvrtke
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Asset Maintenance Task,Maintenance Task,Zadatak održavanja
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Postavite ograničenje B2C u GST postavkama.
@@ -2537,6 +2546,7 @@
 ,BOM Search,BOM Pretraživanje
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Ukupni trošak potrošenog materijala (putem stanja na burzi)
 DocType: Hub Settings,Company Registered,Tvrtka registrirana
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Do datuma ne može biti manji od datuma
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Objavite &quot;na zalihi&quot; ili &quot;nije na zalihi&quot; na hubu na temelju dostupnih dionica u ovom skladištu.
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valutu u Društvu
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sljedeći materijal Zahtjevi su automatski podigli na temelju stavke razini ponovno narudžbi
 DocType: Email Digest,Pending Sales Orders,U tijeku su nalozi za prodaju
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
 DocType: Employee,Create User Permission,Izradi User Permission
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Healthcare Settings,Remind Before,Podsjetite prije
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 DocType: Item,Retain Sample,Zadrži uzorak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos razlika
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi
 DocType: Territory,Classification of Customers by region,Klasifikacija korisnika po regiji
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,U proizvodnji
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato banka Izjava stanje
 DocType: Normal Test Template,Normal Test Template,Predložak za normalan test
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogućen korisnika
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Ponuda
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nije moguće postaviti primljeni RFQ na nijedan citat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Ponuda
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nije moguće postaviti primljeni RFQ na nijedan citat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Odaberite račun za ispis u valuti računa
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To se temelji na transakcijama protiv ovog pacijenta. Pojedinosti potražite u nastavku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Trošak Ažurirano
 DocType: Patient,Date of Birth,Datum rođenja
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Proizvod {0} je već vraćen
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Postavljanje tablice dobavljača
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Opis Posla
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Opis Posla
 DocType: Student Applicant,Applied,primijenjen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Ponovno otvorena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Ponovno otvorena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Količina po skladišnom UOM-u
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Ime Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Popust na prodaju
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
+DocType: Department Approver,Approver,Odobritelj
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Polje Dioničar ne može biti prazno
 DocType: Guardian,Work Address,Adresa na poslu
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupno Dodijeljeni iznos (Društvo valuta)
 DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpaci materijalni troškovi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
 DocType: Grant Application,Email Notification Sent,Poslana obavijest e-pošte
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Šifra stavke, skladište, količina potrebna su u retku"
-DocType: Pricing Rule,Supplier,Dobavljač
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Šifra stavke, skladište, količina potrebna su u retku"
+DocType: Bank Guarantee,Supplier,Dobavljač
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Prikaži pojedinosti o plaćanju
 DocType: Consultation,Consultation Time,Vrijeme konzultacije
 DocType: C-Form,Quarter,Četvrtina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Razni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Iznad
-DocType: Employee Loan,Employee Loan Account,Zaposlenik račun kredita
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan nepostojećim korisnicima
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Broj interakcija
@@ -2634,7 +2645,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",poglavlja / naziv poglavlja ostavite prazno automatski postavljeno nakon spremanja poglavlja.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Postavite GST račune u GST postavkama
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Postavite GST račune u GST postavkama
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Vrsta poslovanja
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Trošak kupnje novog
@@ -2643,12 +2654,13 @@
 DocType: Grant Application,Grant Description,Opis potpore
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 DocType: Student Guardian,Others,Ostali
+DocType: Subscription,Discounts,Popusti
 DocType: Payment Entry,Unallocated Amount,Nealocirano Količina
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvod ili usluga koja je kupljena, prodana ili zadržana na lageru."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nema više ažuriranja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,To obuhvaća sve bodove vezane uz ovu postavku
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Uklonite stavku &#39;{0}&#39; i spremanje
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankarstvo
@@ -2656,45 +2668,48 @@
 DocType: Vehicle Service,Service Item,usluga predmeta
 DocType: Bank Guarantee,Bank Guarantee,Jamstvo banke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Grading Scale,Grading Scale Intervals,Ljestvici Intervali
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Dobit za godinu
+DocType: Bank Guarantee,Name of Bank,Naziv banke
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: knjiženje za {2} je moguće izvesti samo u valuti: {3}
 DocType: Fee Schedule,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Drvo financijske račune.
+DocType: Bank Guarantee,Reference Document Type,Referentna Tip dokumenta
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapiranje novčanog toka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} u odnosu na prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serijaliziranom Inventar
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email nije pronađen u zadanom kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generirajte tajnu
-DocType: Employee Loan,Account Info,Informacije računa
+DocType: Loan,Account Info,Informacije računa
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
 DocType: Fees,Include Payment,Uključi plaćanje
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,Stvorena je {0} studentska grupa.
 DocType: Sales Invoice,Total Billing Amount,Ukupno naplate Iznos
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program u strukturi naknada i studentskoj grupi {0} razlikuju se.
 DocType: Fee Schedule,Receivable Account,Potraživanja račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
 DocType: Quotation Item,Stock Balance,Skladišna bilanca
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Prodajnog naloga za plaćanje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Uz plaćanje poreza
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE ZA DOBAVLJAČ
 DocType: Land Unit,Is Container,Je li kontejner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ovo će biti prvi dan ciklusa usjeva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Molimo odaberite ispravnu račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Purchase Invoice Item,Weight UOM,Težina UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Popis dostupnih dioničara s folijskim brojevima
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura plaća zaposlenika
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Prikaži svojstva varijacije
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Prikaži svojstva varijacije
 DocType: Student,Blood Group,Krvna grupa
 DocType: Course,Course Name,Naziv predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti dopust aplikacije neke specifične zaposlenika
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Uredska oprema
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Uredska oprema
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Tvrtke
 DocType: Supplier Scorecard,Scoring Setup,Bodovanje postavki
@@ -2713,7 +2728,7 @@
 DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Zaduženja je potrebno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Kupovni cjenik
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predlošci varijabli s rezultatima dobavljača.
 DocType: Job Offer Term,Offer Term,Ponuda Pojam
 DocType: Asset,Quality Manager,Upravitelj kvalitete
@@ -2725,13 +2740,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Rad
 DocType: Supplier Scorecard,Supplier Score,Ocjena dobavljača
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Ukupno fakturirati Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Ukupno fakturirati Amt
 DocType: Supplier,Warn RFQs,Upozorite RFQ-ove
 DocType: BOM,Conversion Rate,Stopa pretvorbe
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Pretraga proizvoda
 DocType: Assessment Plan,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
+DocType: Loan,Total Amount Paid,Plaćeni ukupni iznos
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Molimo odaberite Studentski ulaz koji je obvezan za plaćenog studenta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Molimo odaberite Cjenik za objavljivanje cijena
@@ -2741,18 +2757,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je ugašen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završen količina ne može biti više od {1} za rad {2}
 DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializiranu stavku {0} ne može se ažurirati pomoću usklađivanja zaliha, molimo koristite Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializiranu stavku {0} ne može se ažurirati pomoću usklađivanja zaliha, molimo koristite Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Trening utrka zaposlenika
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimalni uzorci - {0} mogu se zadržati za šaržu {1} i stavku {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Dodaj vrijeme
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite
 DocType: Training Event,Advance,napredovati
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,za ponavljanje ponavljanja.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Postavke GoCardless gateway plaćanja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Razmjena Dobit / gubitak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Razmjena Dobit / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada tvrtki {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada tvrtki {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nije moguće pronaći DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
@@ -2771,7 +2786,6 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijski broj {0} nije pronađen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Pretplata je {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rasporeda naknada
 DocType: Fee Schedule Program,Student Batch,Student serije
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Provjerite Student
@@ -2786,14 +2800,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Predloži kategoriju?
 DocType: Stock Reconciliation Item,Current Amount,Trenutni iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Građevine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Građevine
 DocType: Fee Schedule,Fee Structure,Struktura naknade
 DocType: Timesheet Detail,Costing Amount,Obračun troškova Iznos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 DocType: Student Admission Program,Application Fee,Naknada Primjena
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Slanje plaće Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Najveći popust za proizvode {0} je {1}%
@@ -2801,12 +2814,13 @@
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Pošiljatelj Ime
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriteriji analize poljoprivrede
+DocType: HR Settings,Leave Approval Notification Template,Ostavite predložak za obavijesti o odobrenju
 DocType: POS Profile,[Select],[Odaberi]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni tlak (dijastolički)
 DocType: SMS Log,Sent To,Poslano Da
 DocType: Agriculture Task,Holiday Management,Upravljanje odmorom
 DocType: Payment Request,Make Sales Invoice,Napravi prodajni račun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Software
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Software
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za samo kao referenca.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Liječnik {0} nije dostupan na {1}
@@ -2824,7 +2838,7 @@
 DocType: Employee,New Workplace,Novo radno mjesto
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Potrošnja materijala
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Postavi kao zatvoreno
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nema proizvoda sa barkodom {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nema proizvoda sa barkodom {0}
 DocType: Normal Test Items,Require Result Value,Zahtijevati vrijednost rezultata
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Sastavnice
@@ -2839,19 +2853,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ne aktivni ili zadani Struktura plaća pronađeno za zaposlenika {0} za navedene datume
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Koji se vraća
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Pojedinosti o predlošku mapiranja novčanog toka
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Upravljanje zajmom
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite poseban prihodi i rashodi za vertikala proizvoda ili podjele.
 DocType: Rename Tool,Rename Tool,Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Prikaži Plaća proklizavanja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Prikaži Plaća proklizavanja
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Prijenos materijala
 DocType: Fees,Send Payment Request,Pošalji zahtjev za plaćanje
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Water Analysis,Origin,Podrijetlo
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Iznos računa Odaberi promjene
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
@@ -2866,14 +2880,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Je li obveza poreza na dobit
 DocType: Grading Scale Interval,Grade Description,Razred Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,kapara
 DocType: Sales Invoice, Shipping Bill Number,Brodski broj za dostavu
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sljedivost
 DocType: Asset Maintenance Log,Actions performed,Radnje izvršene
 DocType: Cash Flow Mapper,Section Leader,Voditelj odsjeka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaposlenik
+DocType: Bank Guarantee,Fixed Deposit Number,Fiksni broj pologa
 DocType: Asset Repair,Failure Date,Datum neuspjeha
 DocType: Sample Collection,Collected Time,Prikupljeno vrijeme
 DocType: Company,Sales Monthly History,Mjesečna povijest prodaje
@@ -2890,10 +2905,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Jeste li sigurni da želite otkazati ovaj termin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotelski paket cijene za sobu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Prodaja cjevovoda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Dohvati ažuriranja pretplate
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Račun {0} ne odgovara tvrtki {1} u načinu računa: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Tečaj:
@@ -2903,7 +2919,7 @@
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nema stvorenih radnih naloga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plaća proklizavanja zaposlenika {0} već stvorena za ovo razdoblje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 DocType: Purchase Invoice,Credit To,Kreditne Da
@@ -2921,7 +2937,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nijedan citat
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Račun za plaćanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Neto promjena u potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,kompenzacijski Off
 DocType: Job Offer,Accepted,Prihvaćeno
@@ -2933,7 +2949,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo provjerite da li stvarno želite izbrisati sve transakcije za ovu tvrtku. Vaši matični podaci će ostati kao što je to. Ova radnja se ne može poništiti.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Rezultati pretraživanja
 DocType: Room,Room Number,Broj sobe
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Pogrešna referentni {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Pogrešna referentni {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 DocType: Journal Entry Account,Payroll Entry,Ulazak plaće
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Prikaz zapisa o naknadama
@@ -2943,7 +2959,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Lab Test Sample,Lab Test Sample,Uzorak laboratorija
 DocType: Item Variant Settings,Allow Rename Attribute Value,Dopusti Preimenuj Vrijednost atributa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Brzo Temeljnica
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
 DocType: Restaurant,Invoice Series Prefix,Prefiks serije fakture
 DocType: Employee,Previous Work Experience,Radnog iskustva
@@ -2951,8 +2967,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integracija Google karata nije omogućena
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nije podnesen
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,Datum isteka članstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} mora biti negativan u povratnom dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} mora biti negativan u povratnom dokumentu
 ,Minutes to First Response for Issues,Minuta do prvog odgovora na pitanja
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
@@ -2971,7 +2988,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Prilika
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Prilika
 DocType: Operation,Default Workstation,Zadana Workstation
 DocType: Notification Control,Expense Claim Approved Message,Rashodi Zahtjev Odobren poruku
 DocType: Payment Entry,Deductions or Loss,Odbitaka ili gubitak
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plaće ne odgovara odobrenog odsustva primjene zapisa
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravi račun
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Preostali saldo
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Barcode {0} nije važeći kôd {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Godina završetka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kvota / olovo%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Driver,Driver,Vozač
 DocType: Vital Signs,Nutrition Values,Nutricionističke vrijednosti
 DocType: Lab Test Template,Is billable,Je naplativo
@@ -3029,7 +3046,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni datum početka (putem vremenska tablica)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Starenje Raspon 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Ukupni iznos predujma ne može biti veći od ukupnog iznosa potraživanja
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Ukupni iznos predujma ne može biti veći od ukupnog iznosa potraživanja
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Odaberite Vrijednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdavanje dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Sljedeća Kontakt Po ne može biti ista kao što je vodeći e-mail adresa
 DocType: Tax Rule,Billing City,Naplata Grad
@@ -3101,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,Usluga Adresa
 DocType: Asset Maintenance Task,Calibration,Kalibriranje
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} je praznik tvrtke
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Namještaja i rasvjete
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Pusti status obavijesti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Namještaja i rasvjete
 DocType: Item,Manufacture,Proizvodnja
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Tvrtka za postavljanje
 ,Lab Test Report,Izvješće testiranja laboratorija
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,Područje sadnje
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,To može biti zbog nekih nevažećih adresa e - pošte u programu
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultat trening
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,Proizvodi po stranici
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,komunalna Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: časopis za ulazak {1} nema računa {2} ili već usklađeni protiv drugog bona
 DocType: Supplier Scorecard Criteria,Criteria Weight,Težina kriterija
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Odustani od obavijesti o odobrenju
 DocType: Buying Settings,Default Buying Price List,Zadani kupovni cjenik
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Plaća proklizavanja temelju timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Stopa kupnje
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Stopa kupnje
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Postavi zadane vrijednosti kao što su tvrtka, valuta, tekuća fiskalna godina, itd."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Košarica Postavke
 DocType: Journal Entry,Accounting Entries,Računovodstvenih unosa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako je odabrano Pravilo o cijenama za &quot;Razina&quot;, ona će prebrisati Cjenik. Cijena cijene je konačna stopa, tako da nema dodatnog popusta. Dakle, u transakcijama kao što su prodajni nalog, narudžbena narudžba i sl., To će biti dohvaćeno u polju &quot;Cijena&quot;, a ne polje &quot;Cjenovna lista&quot;."
+DocType: Journal Entry,Paid Loan,Plaćeni zajam
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Dupli unos. Provjerite pravila za autorizaciju {0}
 DocType: Journal Entry Account,Reference Due Date,Referentni datum dospijeća
 DocType: Purchase Order,Ref SQ,Ref. SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Platni spisak
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
 DocType: Patient Service Unit,Parent Service Unit,Roditeljska jedinica
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Provjerite korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
@@ -3192,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Račun prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Isporuka
 DocType: Volunteer,Weekdays,Radnim danom
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: Restaurant Menu,Restaurant Menu,Izbornik restorana
@@ -3200,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Postavite zadani oglasni prostor za trajni oglasni prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Postavite zadani oglasni prostor za trajni oglasni prostor
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Slanje e-pošte za evaluaciju potpore
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage puna, nije štedjelo"
@@ -3208,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapacitet sobe
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Već postoji zapis za stavku {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Izgubit ćete evidenciju prethodno generiranih faktura. Jeste li sigurni da želite ponovno pokrenuti ovu pretplatu?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Naknada za registraciju
 DocType: Budget,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Sakrij Porezni Kupca od prodajnih transakcija
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Međuskladišnica / Otpremnica / Primka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Voditelj marketinga i prodaje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Porez na dohodak
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Idi na zaglavlje
+DocType: Subscription,Cancel At End Of Period,Odustani na kraju razdoblja
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nema odabranih stavki za prijenos
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nema odabranih stavki za prijenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
 DocType: Vehicle,Electric,električni
 DocType: Task,% Progress,% Napredak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Dobit / gubitak od imovine Odlaganje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Dobit / gubitak od imovine Odlaganje
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",U sljedećoj tablici odabrat će se samo kandidatkinja za studente s statusom &quot;Odobreno&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Broj računa za račun {0} nije dostupan. <br> Pravilno postavite svoj računni prikaz.
 DocType: Task,Depends on Tasks,Ovisi o poslovima
@@ -3248,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ne u skladištu
 DocType: Volunteer,Volunteer Skills,Volonterske vještine
 DocType: Appraisal,HR User,HR Korisnik
+DocType: Bank Guarantee,Reference Document Name,Referentni naziv dokumenta
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
 apps/erpnext/erpnext/hooks.py +142,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
@@ -3261,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra large
+DocType: Loan,Loan Application,Primjena zajma
 DocType: Crop,Scientific Name,Znanstveno ime
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Ukupno Lišće
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Ponovno odaberite, ako je odabrani kontakt uređen nakon spremanja"
@@ -3270,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Broj
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Veliki
 DocType: Homepage Featured Product,Homepage Featured Product,Početna Istaknuti Proizvodi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Sve grupe za procjenu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Sve grupe za procjenu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo ime skladišta
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorij
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,naknade
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Navedite Tečaj pretvoriti jedne valute u drugu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Ponuda {0} je otkazana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Ukupni iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Ukupni iznos
 DocType: Sales Partner,Targets,Ciljevi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Molimo registrirajte SIREN broj u informativnu datoteku tvrtke
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Price List,Price List Master,Cjenik Master
 DocType: GST Account,CESS Account,CESS račun
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Odaberite Pacijent
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Naziv parametra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo one prijave sa statusom &quot;Odobreno&quot; i &quot;Odbijeno&quot; može se podnijeti
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Grupa Ime obvezna je u redu {0}
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na web stranici početnu stranicu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
@@ -3352,14 +3377,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Račun je već izrađen za sva vremena naplate
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},greška Ime: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Je li trošak financiranja
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Postavite zadani klijent u Postavkama restorana
 ,Salary Register,Plaća Registracija
 DocType: Warehouse,Parent Warehouse,Roditelj Skladište
-DocType: C-Form Invoice Detail,Net Total,Osnovica
+DocType: Subscription,Net Total,Osnovica
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Zadani BOM nije pronađen za stavku {0} i projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definirati različite vrste kredita
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Izvanredna Iznos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Vrijeme (u minutama)
@@ -3391,11 +3416,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Korijen računa mora biti grupa
 DocType: Drug Prescription,Drug Prescription,Lijek na recept
 DocType: Fees,FEE.,PRISTOJBA.
-DocType: Employee Loan,Repaid/Closed,Otplaćuje / Zatvoreno
+DocType: Loan,Repaid/Closed,Otplaćuje / Zatvoreno
 DocType: Item,Total Projected Qty,Ukupni predviđeni Kol
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa procjene nije pronađena za stavku {0}, koja je potrebna za knjiženje unosa za {1} {2}. Ako se stavka izvršava kao stavka stope nulte vrijednosti u {1}, navedite to u tablici {1} stavke. U suprotnom, izradite transakciju dolazne burze za stavku ili navedite stopu vrednovanja u zapisu Stavka, a zatim pokušajte poslati / poništiti ovaj unos"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 DocType: Course,Course Code,kod predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: POS Settings,Use POS in Offline Mode,Koristite POS u izvanmrežnom načinu rada
@@ -3415,16 +3439,15 @@
 DocType: Purchase Invoice,Deemed Export,Pretraženo izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
-DocType: Subscription,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Lab Test,LabTest Approver,LabTest odobrenje
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Već ste ocijenili kriterije procjene {}.
 DocType: Vehicle Service,Engine Oil,Motorno ulje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Kreirani radni nalozi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Kreirani radni nalozi: {0}
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-DocType: Employee Loan,Loan Details,zajam Detalji
+DocType: Loan,Loan Details,zajam Detalji
 DocType: Company,Default Inventory Account,Zadani račun oglasnog prostora
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio brojevi se ne podudaraju
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
@@ -3436,19 +3459,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Veza na sve Zemljišne jedinice u kojima raste usjeva
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Red # {0}: Ne može se vratiti više od {1} za točku {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Red # {0}: Ne može se vratiti više od {1} za točku {2}
 DocType: Item Group,Show this slideshow at the top of the page,Prikaži ovaj slideshow na vrhu stranice
 DocType: BOM,Item UOM,Mjerna jedinica proizvoda
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Porezna Iznos Nakon Popust Iznos (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Cheque Print Template,Primary Settings,Primarne postavke
 DocType: Purchase Invoice,Select Supplier Address,Odaberite Dobavljač adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Dodavanje zaposlenika
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Dodavanje zaposlenika
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Dodatni Mali
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Dodatni Mali
 DocType: Company,Standard Template,standardni predložak
 DocType: Training Event,Theory,Teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
 DocType: Payment Request,Mute Email,Mute e
@@ -3468,11 +3491,10 @@
 DocType: SMS Log,No of Sent SMS,Broj poslanih SMS-a
 DocType: Antibiotic,Healthcare Administrator,Administrator zdravstva
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Postavite cilj
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 DocType: Dosage Strength,Dosage Strength,Snaga doziranja
 DocType: Account,Expense Account,Rashodi račun
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,softver
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Boja
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Procjena Kriteriji
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Datum isteka je obavezan za odabranu stavku
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Spriječiti narudžbenice
@@ -3485,18 +3507,18 @@
 DocType: Patient,Personal and Social History,Osobna i društvena povijest
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Korisnik {0} je stvoren
 DocType: Fee Schedule,Fee Breakup for each student,Otkazivanje naknade za svakog studenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Promijeni kod
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Valuta cjenika nije odabrana
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Valuta cjenika nije odabrana
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Studentski mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o isporuci primjenjuje se samo za prodaju
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Do
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Obvezna je grupacija studenata ili raspored predmeta
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavati sati naplate i radno vrijeme isto na timesheet
@@ -3516,7 +3538,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Navedite svoje proizvode ili usluge koje kupujete ili prodaju.
 DocType: Water Analysis,Storage Temperature,Temperatura skladištenja
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačeno posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,istraživač
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program za alat Upis studenata
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Datum početka trebao bi biti manji od datuma završetka zadatka {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ili e-mail je obavezno
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} trenutačno ima stajalište dobavljača rezultata {1}, a zahtjevi za odobrenje dobavljaču trebaju biti izdani s oprezom."
 DocType: Chapter,Non Profit Manager,Neprofitni menadžer
 DocType: BOM,Total Cost(Company Currency),Ukupna cijena (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serijski Ne {0} stvorio
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Homepage,Company Description for website homepage,Opis tvrtke za web stranici
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Naziv suplier
@@ -3539,11 +3561,10 @@
 DocType: Employee,You can enter any date manually,Možete ručno unijeti bilo koji datum
 DocType: Healthcare Settings,Result Printed,Rezultat je tiskan
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija reprezentaciju
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Probni
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Pogledajte {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Probni
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Project,Total Costing Amount (via Timesheets),Ukupni iznos troškova (putem vremenskih brojeva)
-DocType: Employee Advance,Expense Approver,Rashodi Odobritelj
+DocType: Department,Expense Approver,Rashodi Odobritelj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
 DocType: Project,Hourly,na sat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-skupine do skupine
@@ -3552,7 +3573,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Za datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Plaćanje putem Temeljnica
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,tiskana na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,tiskana na
 DocType: Item,Inspection Required before Delivery,Inspekcija potrebno prije isporuke
 DocType: Item,Inspection Required before Purchase,Inspekcija Obavezno prije kupnje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
@@ -3562,7 +3583,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,minimalna količina narudžbe
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,naknade Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Unesite olakšavanja datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,Obavijesti zaposlenika
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
@@ -3572,7 +3593,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Poredaj Razina
 DocType: Company,Chart Of Accounts Template,Kontni predložak
 DocType: Attendance,Attendance Date,Gledatelja Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
@@ -3580,10 +3601,11 @@
 DocType: Item,Valuation Method,Metoda vrednovanja
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Poludnevni
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Unesite ime Korisnika prije slanja.
 DocType: Program Enrollment Tool,Get Students,dobiti studente
 DocType: Serial No,Under Warranty,Pod jamstvom
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Greška]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendan zaposlenika
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Odaberite Datum dovršetka za dovršen popravak
@@ -3602,7 +3624,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervirano za podugovaranje
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 DocType: Shopping Cart Settings,Orders,Narudžbe
-DocType: Employee Leave Approver,Leave Approver,Osoba ovlaštena za odobrenje odsustva
+DocType: Department,Leave Approver,Osoba ovlaštena za odobrenje odsustva
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Odaberite grupu
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Naziv grupe procjena
@@ -3646,7 +3668,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Prikvačena stavka za središte
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,IZVORNI ZA PRIMATELJ
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumulirana amortizacija računa
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ova je e-pošta autogenerirana
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
 DocType: Program Enrollment,Boarding Student,Učenica za ukrcaj
 DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost nakon korisnog vijeka trajanja
@@ -3671,21 +3692,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Gledatelja Zapis {0} ne postoji protiv Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortizacija Ispadanje zbog prodaje imovine
-DocType: Member,Member,Član
+DocType: Loan,Member,Član
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje adrese
 DocType: Work Order Item,Work Order Item,Radni nalog
 DocType: Pricing Rule,Item Code,Šifra proizvoda
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Voditelj poljoprivrede
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
 DocType: Supplier Scorecard Period,Variables,Varijable
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Zatvaranje (DR)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Račun {0} ne podudara se s tvrtkom {1}
@@ -3693,7 +3714,6 @@
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Asset,Number of Depreciations Booked,Broj deprecijaciju Rezervirano
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Ukupni broj
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Od kredita zaposlenika: {0}
 DocType: Landed Cost Item,Receipt Document,Prijem dokumenata
 DocType: Employee Education,School/University,Škola / Sveučilište
 DocType: Payment Request,Reference Details,Referentni Detalji
@@ -3704,7 +3724,7 @@
 DocType: Asset,Double Declining Balance,Dvaput padu Stanje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena redoslijed ne može se otkazati. Otvarati otkazati.
 DocType: Student Guardian,Father,Otac
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Ažuriraj zalihe' ne može se provesti na prodaju osnovnog sredstva
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Ažuriraj zalihe' ne može se provesti na prodaju osnovnog sredstva
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
@@ -3718,10 +3738,10 @@
 DocType: Lead,Lower Income,Niža primanja
 DocType: Restaurant Order Entry,Current Order,Trenutačna narudžba
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Idite na Programs (Programi)
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Dodijeljeni iznos {1} ne može biti veći od neimenovanog iznosa {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Dodijeljeni iznos {1} ne može biti veći od neimenovanog iznosa {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
@@ -3744,7 +3764,6 @@
 DocType: Payment Terms Template,Payment Terms,Uvjeti plaćanja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Imenovanje zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nabavni porezi i terećenja
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Idite na Dobavljače
@@ -3763,30 +3782,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Postavite ID e-pošte za učenika da pošalje zahtjev za plaćanjem
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Postavite ID e-pošte za učenika da pošalje zahtjev za plaćanjem
 DocType: Patient,Medical History,Povijest bolesti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Prekoračenje računa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank Prekoračenje računa
 DocType: Patient,Patient ID,ID pacijenta
 DocType: Physician Schedule,Schedule Name,Raspored imena
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Provjerite plaće slip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Dodaj sve dobavljače
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Dodaj sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Red # {0}: dodijeljeni iznos ne može biti veći od nepodmirenog iznosa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Pretraživanje BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,osigurani krediti
 DocType: Purchase Invoice,Edit Posting Date and Time,Uredi datum knjiženja i vrijeme
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo postavite Amortizacija se odnose računi u imovini Kategorija {0} ili Društvo {1}
 DocType: Lab Test Groups,Normal Range,Normalan raspon
 DocType: Academic Term,Academic Year,Akademska godina
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Dostupna prodaja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Početno stanje kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Početno stanje kapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ostali
 DocType: Appraisal,Appraisal,Procjena
+DocType: Loan,Loan Account,Račun zajma
 DocType: Purchase Invoice,GST Details,Detalji GST-a
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-pošta dostavljati opskrbljivaču {0}
 DocType: Item,Default Sales Unit of Measure,Zadana prodajna jedinica mjere
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademska godina:
+DocType: Subscription,Past Due Date,Prošli rok dospijeća
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ne dopusti postavljanje alternativne stavke za stavku {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
@@ -3799,7 +3820,7 @@
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacijenata
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjaviti s ovog Pošalji Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Nabavite dobavljače po
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Nabavite dobavljače po
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nije pronađen za stavku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Idite na Tečajeve
 DocType: Accounts Settings,Show Inclusive Tax In Print,Pokaži porez na inkluziju u tisku
@@ -3807,10 +3828,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poslana poruka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao knjiga
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite instruktor imenovanja sustava u obrazovanju&gt; Postavke obrazovanja
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
 DocType: Physician,Physician Schedules,Raspored liječnika
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Ukupni iznos predujma ne može biti veći od ukupnog sankcioniranog iznosa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Ukupni iznos predujma ne može biti veći od ukupnog sankcioniranog iznosa
 DocType: Salary Slip,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Proizvod imenovan po
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
@@ -3828,6 +3850,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje skladišnih transakcija starijih od {0}
 DocType: BOM,Inspection Required,Inspekcija Obvezno
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Unesite broj bankarske garancije prije slanja.
 DocType: Driving License Category,Class,klasa
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Radni nalog ne može se podići na predložak stavke
@@ -3838,7 +3861,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite instruktor imenovanja sustava u obrazovanju&gt; Postavke obrazovanja
 DocType: Serial No,Is Cancelled,Je otkazan
 DocType: Student Group,Group Based On,Skupina temeljena na
 DocType: Journal Entry,Bill Date,Bill Datum
@@ -3849,9 +3871,10 @@
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Setup Progress,Setup Progress,Postavi napredak
+DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavi artikle u Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Provjeri sve
 ,Issued Items Against Work Order,Izdane stavke protiv radnog naloga
 DocType: Vehicle Log,Invoice Ref,fakture Ref
@@ -3882,12 +3905,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarifni broj
 DocType: Work Order Item,Available Qty at WIP Warehouse,Dostupni broj u WIP Warehouseu
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Predviđeno
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
-DocType: Employee Loan,Employee Loan Application,Radnik za obradu zahtjeva
 DocType: Issue,Opening Date,Datum otvaranja
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Prvo spasi pacijenta
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Prvo spasi pacijenta
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Sudjelovanje je uspješno označen.
 DocType: Program Enrollment,Public Transport,Javni prijevoz
 DocType: Soil Texture,Silt Composition (%),Sastav kompilacije (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Stavka salda (jednostavna)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debitna bilješka Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debitna bilješka Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Iznos popusta
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Datum narudžbe (kupca)
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 DocType: Assessment Plan,Assessment Plan,plan Procjena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Obrnuti unos dnevnika
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Korisnik {0} je stvoren.
 DocType: Stock Settings,Limit Percent,Ograničenje posto
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema raspoloživih količina u bilo kojem skladištu
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Međuskladišnica
 DocType: Payment Entry,Payment References,Reference plaćanja
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Broj intervala za polje intervala, npr. Ako Interval je &quot;Dani&quot; i broj intervala naplate je 3, fakture će se generirati svaka 3 dana"
 DocType: Vehicle,Insurance Details,Detalji osiguranje
 DocType: Account,Payable,Plativ
 DocType: Share Balance,Share Type,Vrsta dijeljenja
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite razdoblja otplate
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Unesite razdoblja otplate
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Promjena POS profila
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Stranka je obvezna
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Pronađene su retke s duplikatima datuma dospijeća u drugim redcima: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Pronađene su retke s duplikatima datuma dospijeća u drugim redcima: {list}
 DocType: Topic,Topic Name,tema Naziv
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Postavite zadani predložak za Obavijest o odobrenju za ostavljanje u HR postavkama.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Odaberite zaposlenika kako biste dobili zaposlenika unaprijed.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Odaberite zaposlenika kako biste dobili zaposlenika unaprijed.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Odaberite valjani datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Odaberite prirodu Vašeg poslovanja.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dijelite knjigu
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Izrađena je prodajna faktura {0}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,akumulirana amortizacija
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalni naziv
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
-DocType: Employee Loan Application,Required by Date,Potrebna po datumu
+DocType: Loan Application,Required by Date,Potrebna po datumu
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
 DocType: Production Plan,Sales Orders Detail,Detalj narudžbe
 DocType: Bin,Requested Quantity,Tražena količina
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plaća - Ukupni odbitak - otplate kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Plaća proklizavanja ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Višestruke inačice
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
+DocType: Subscription,Trial Period Start Date,Datum početka probnog razdoblja
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Prijavite se kao drugi korisnik.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,Studentski Guardian
 DocType: Member,Member Name,Ime člana
 DocType: Stock Settings,Use Naming Series,Upotrijebite seriju naziva
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,u pretplati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 DocType: Membership,Payment Details,Pojedinosti o plaćanju
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM stopa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zaustavljen radni nalog ne može se otkazati, prvo ga otkazati"
 DocType: Asset,Journal Entry for Scrap,Temeljnica za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Zemljišna jedinica
 ,Purchase Analytics,Analitika nabave
 DocType: Sales Invoice Item,Delivery Note Item,Otpremnica proizvoda
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nedostaje trenutačna faktura {0}
 DocType: Asset Maintenance Log,Task,Zadatak
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Razmjena Dobit / gubitka
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenika i posjećenost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Svrha mora biti jedna od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Ispunite obrazac i spremite ga
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Stvarni kvota na zalihi
 DocType: Homepage,"URL for ""All Products""",URL za &quot;sve proizvode&quot;
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standardni prodajni tečaj
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 DocType: Cash Flow Mapper,Section Name,Naziv odjeljka
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Poredaj Kom
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Poredaj Kom
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni radnih mjesta
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,ovisi o
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,U redu čekanja za ažuriranje najnovije cijene u svim Bill of Materials. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naziv novog računa. Napomena: Molimo vas da ne stvaraju račune za kupce i dobavljače
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Water Analysis,Appearance,Izgled
+DocType: HR Settings,Leave Status Notification Template,Ostavite predložak obavijesti o statusu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Prosječni. Stopa popisa cjenika
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informacije članova.
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nije dopušteno. Onemogućite predložak testa
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
 DocType: Crop Cycle,Linked Land Unit,Povezana zemljišna jedinica
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 DocType: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Idite na korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Nevažeći GSTIN ili Unesi NA za neregistrirano
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program za upis naknada
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Izrada kontnog plana na temelju
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nije ga moguće pretvoriti u ne-grupu. Dječji zadaci postoje.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
 ,Stock Ageing,Starost skladišta
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} postoje protiv studenta podnositelja prijave {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagođavanje zaokruživanja (valuta tvrtke)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,serija:
 DocType: Volunteer,Afternoon,Poslijepodne
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Cheque Print Template,Scanned Cheque,Scanned Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} već postoji
 DocType: Medical Department,Nursing User,Korisnik za njegu
 DocType: Plant Analysis,Plant Analysis Criterias,Criterija analize bilja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serijski broj {0} ne pripada skupini {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok valjanosti ove ponude je završen.
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Zatraži račun
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dopusti stale tečaj
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Napravite inačice
 DocType: Item,Default BOM,Zadani BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Ukupni iznos naplaćenog računa (putem faktura prodaje)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debitni iznos bilješke
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debitni iznos bilješke
 DocType: Project Update,Not Updated,Nije ažuriran
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Postoje nedosljednosti između stope, broja dionica i izračunate iznosa"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Ukupni Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Ukupni Amt
 DocType: Journal Entry,Printing Settings,Ispis Postavke
 DocType: Employee Advance,Advance Account,Advance Account
 DocType: Job Offer,Job Offer Terms,Uvjeti ponude za posao
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobilska industrija
 DocType: Vehicle,Insurance Company,Osiguravajuće društvo
 DocType: Asset Category Account,Fixed Asset Account,Fiksni račun imovinom
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,varijabla
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,varijabla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
 DocType: Chapter,Members,članovi
 DocType: Student,Student Email Address,Studentski e-mail adresa
@@ -4225,7 +4252,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,stažista
 DocType: Delivery Stop,Address Name,adresa Ime
 DocType: Stock Entry,From BOM,Od sastavnice
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Dijeljenje {0} jedinica od {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Dijeljenje {0} jedinica od {1}
 DocType: Assessment Code,Assessment Code,kod procjena
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
@@ -4233,25 +4260,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 DocType: Bank Reconciliation Detail,Payment Document,Dokument plaćanja
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Pogreška u procjeni formule kriterija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+DocType: Subscription,Plans,Planovi
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Materijal Izazova
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Došlo je do pogreške prilikom izrade ponavljajućih
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Materijal Izazova
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nema studentskih grupa stvorena.
 DocType: Purchase Invoice Item,Serial No,Serijski br
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečni iznos otplate ne može biti veća od iznosa kredita
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečni iznos otplate ne može biti veća od iznosa kredita
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Red # {0}: očekivani datum isporuke ne može biti prije datuma narudžbe
 DocType: Purchase Invoice,Print Language,Ispis Language
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Sales Invoice,Customer PO Details,Detalji o kupcima
-DocType: Subscription,Next Schedule Date,Sljedeći raspored datuma
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Privremeni račun otvaranja
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
@@ -4279,11 +4305,11 @@
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nema zaposlenika za navedene kriterije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
 DocType: Hotel Settings,Default Customer,Zadani kupac
 DocType: Assessment Plan,Supervisor Name,Naziv Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nemojte potvrditi je li sastanak izrađen za isti dan
@@ -4307,16 +4333,16 @@
 DocType: Journal Entry Account,Employee Advance,Predujam zaposlenika
 DocType: Payroll Entry,Payroll Frequency,Plaće Frequency
 DocType: Lab Test Template,Sensitivity,Osjetljivost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,sirovine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Biljke i strojevi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Biljke i strojevi
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Postavke rad Sažetak
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Unesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interni premještaj
 DocType: Asset Maintenance,Maintenance Tasks,Zadatci održavanja
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
@@ -4324,13 +4350,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integracije
 DocType: Crop Cycle,Detected Disease,Otkrivena bolest
 ,Produced,Proizvedeno
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Početni datum otplate ne može biti prije datuma isplate.
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
 DocType: Training Event,Trainer Name,Ime trenera
 DocType: Mode of Payment,General,Opći
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posljednja komunikacija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Plaćanja s faktura
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} na Poludnevni dopust na {1}
 DocType: Production Plan,Get Material Request,Dobiti materijala zahtjev
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Poštanski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 ,Item Variant Details,Pojedinosti varijante stavke
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Sat
 DocType: Restaurant Order Entry,Last Sales Invoice,Posljednja prodajna faktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Odaberite Qty od stavke {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 DocType: Company,Monthly Sales Target,Mjesečni cilj prodaje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,Zadana Materijal Vrsta zahtjeva
 DocType: Supplier Scorecard,Evaluation Period,Razdoblje procjene
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nepoznat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Radni nalog nije izrađen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Radni nalog nije izrađen
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: Purchase Invoice,Export Type,Vrsta izvoza
 DocType: Salary Slip Loan,Salary Slip Loan,Zajmoprimac za plaću
@@ -4381,7 +4408,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Sažetak otvaranja faktura
 DocType: Education Settings,Education Manager,Voditelj obrazovanja
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimalna duljina između svake biljke u polju za optimalni rast
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Uređenu stavku {0} ne može se ažurirati pomoću usklađivanja zaliha, umjesto toga upotrijebite stavku burzovne oznake"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Uređenu stavku {0} ne može se ažurirati pomoću usklađivanja zaliha, umjesto toga upotrijebite stavku burzovne oznake"
 DocType: Quality Inspection,Report Date,Prijavi Datum
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Računi
@@ -4411,20 +4438,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Group,Send Emails At,Slanje e-pošte na
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Prikaz obrasca
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Potrošač troškova obvezan u zahtjevu za trošak
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Dodajte korisnike u svoju organizaciju, osim sebe."
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Još nema kupaca!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanom tijeku
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nije stvoren materijalni zahtjev
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
@@ -4447,11 +4475,12 @@
 DocType: Vehicle,Chassis No,šasija Ne
 DocType: Payment Request,Initiated,Pokrenut
 DocType: Production Plan Item,Planned Start Date,Planirani datum početka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Odaberite BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Odaberite BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Availed ITC integrirani porez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
+DocType: Bank Guarantee,Clauses and Conditions,Klauzule i uvjeti
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Project Task,View Timesheet,Pregledajte Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Datum završetka mora biti veći od datuma početka
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
@@ -4465,9 +4494,10 @@
 DocType: Patient,Alcohol Current Use,Tekuća upotreba alkohola
 DocType: Student Admission Program,Student Admission Program,Program upisa studenata
 DocType: Payment Entry,Account Paid To,Račun plaćeni za
+DocType: Subscription Settings,Grace Period,Razdoblje milosti
 DocType: Item Alternative,Alternative Item Name,Alternativni naziv stavke
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nije bilo moguće poslati nijednu plaću <br> \ Mogući razlozi: <br> \ 1. Neto plaćanje je manje od 0. <br> \ 2. Adresa e-pošte tvrtke navedena u upravitelju zaposlenika nije valjana. <br>
@@ -4477,7 +4507,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Proračun za račun {1} od {2} {3} je {4}. To će biti veći od {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Od kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Onemogućeno u
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Financijske usluge
 DocType: Student Sibling,Student ID,studentska iskaznica
@@ -4489,14 +4518,16 @@
 DocType: Complaint,Complaint,prigovor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Učinite uplatu
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Svi odjeli
 DocType: Patient,Alcohol Past Use,Prethodna upotreba alkohola
 DocType: Fertilizer Content,Fertilizer Content,Sadržaj gnojiva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematično / Stuck
 DocType: Tax Rule,Billing State,Državna naplate
 DocType: Share Transfer,Transfer,Prijenos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Radni nalog {0} mora biti otkazan prije otkazivanja ovog prodajnog naloga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
@@ -4520,10 +4551,11 @@
 DocType: Cheque Print Template,Message to show,Poruka za prikaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Maloprodaja
 DocType: Student Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nije moguće pronaći rezultat koji započinje na {0}. Morate imati postignute rezultate koji pokrivaju 0 do 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Predložak nabavnih poreza i terećenja
+DocType: Subscription,Current Invoice Start Date,Datum početka tekuće fakture
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Iznos potraživanja ili dugovanja potreban za {2}
 DocType: GL Entry,Remarks,Primjedbe
@@ -4533,11 +4565,13 @@
 DocType: Task,Parent Task,Roditeljska zadaća
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Napravite Olovo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Ispis i konfekcija
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Ispis i konfekcija
 DocType: Stock Settings,Show Barcode Field,Prikaži Barkod Polje
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Pošalji Supplier e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća se već obrađuju za razdoblje od {0} i {1}, dopusta zahtjev ne može biti između ovom razdoblju."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Pošalji Supplier e-pošte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća se već obrađuju za razdoblje od {0} i {1}, dopusta zahtjev ne može biti između ovom razdoblju."
+DocType: Fiscal Year,Auto Created,Auto Created
 DocType: Chapter Member,Leave Reason,Ostavite razlog
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Račun {0} više ne postoji
 DocType: Guardian Interest,Guardian Interest,Guardian kamata
 DocType: Volunteer,Availability,dostupnost
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Postavljanje zadanih vrijednosti za POS fakture
@@ -4545,14 +4579,13 @@
 DocType: Project,Time to send,Vrijeme je za slanje
 DocType: Timesheet,Employee Detail,Detalj zaposlenika
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID e-pošte
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
 DocType: Lab Prescription,Test Code,Ispitni kod
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice početnu stranicu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Zahtjevi za odobrenje nisu dopušteni za {0} zbog položaja {1}
 DocType: Job Offer,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Iznad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Ukupni iznos {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Ukupni iznos {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Neispravan atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Navedite ako je nestandardni račun koji se plaća
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Odaberite grupu za procjenu osim &quot;Sve grupe za procjenu&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Redak {0}: centar za trošak je potreban za stavku {1}
@@ -4563,7 +4596,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
 DocType: Chapter,Region,Regija
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Ponovno učitaj povezanu analizu
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -4579,7 +4612,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Troškovi otpisan imovinom
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
 DocType: Vehicle,Policy No,politika Nema
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 DocType: Asset,Straight Line,Ravna crta
 DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4615,21 +4648,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Staza
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
 DocType: Production Plan,Total Planned Qty,Ukupni planirani broj
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Otvaranje vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Otvaranje vrijednost
 DocType: Salary Detail,Formula,Formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serijski #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serijski #
 DocType: Lab Test Template,Lab Test Template,Predložak testa laboratorija
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Račun prodaje
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Račun prodaje
 DocType: Purchase Invoice Item,Total Weight,Totalna tezina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodaju
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisija za prodaju
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Naplata Država
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
 DocType: Restaurant Order Entry,Restaurant Order Entry,Unos narudžbe restorana
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
 DocType: Asset Maintenance Task,Assign To Name,Dodijeli ime
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Zabava Troškovi
 DocType: Hub Settings,Enabled Users,Omogućeni korisnici
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Provjerite materijala zahtjev
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Otvoreno Stavka {0}
@@ -4642,24 +4675,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Prijave za odmor.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 DocType: Vehicle,Last Carbon Check,Posljednja Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Pravni troškovi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Molimo odaberite količinu na red
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Izradite otvaranje računa za prodaju i kupnju
 DocType: Purchase Invoice,Posting Time,Vrijeme knjiženja
 DocType: Timesheet,% Amount Billed,% Naplaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
 DocType: Email Digest,Open Notifications,Otvoreno Obavijesti
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Iznos (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Izravni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Izravni troškovi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,putni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajte pretplatu prilagođenog polja u doktorskom tipu {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Purchase Receipt Item,Sample Quantity,Količina uzorka
+DocType: Bank Guarantee,Name of Beneficiary,Naziv Korisnika
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ažuriranje BOM-a automatski se naplaćuje putem Planera, temeljeno na najnovijoj stopi vrednovanja / stopi cjenika / zadnje stope kupnje sirovina."
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
@@ -4671,14 +4704,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Povrat / odobrenje kupcu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Povrat / odobrenje kupcu
 DocType: Stock Settings,Auto insert Price List rate if missing,"Ako ne postoji, automatski ubaciti cjenik"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Ukupno uplaćeni iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: GST Settings,B2C Limit,B2C ograničenje
 DocType: Work Order Item,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Kretanje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,planiranje
 DocType: Share Balance,Issued,Izdano
+DocType: Loan,Repayment Start Date,Početni datum otplate
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Aktivnost studenata
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Dobavljač
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
@@ -4691,10 +4725,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovite sažetak izvješća putem e-maila.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Molimo postavite zadanog računa o troškovima za tužbu tipa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Molimo postavite zadanog računa o troškovima za tužbu tipa {0}
 DocType: Assessment Result,Student Name,Ime studenta
 DocType: Brand,Item Manager,Stavka Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Plaće Plaća
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Plaće Plaća
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Plant Analysis,Collection Datetime,Datum datuma prikupljanja
 DocType: Work Order,Total Operating Cost,Ukupni trošak
@@ -4704,9 +4738,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Korisnik {0} ne postoji
 DocType: Payment Term,Day(s) after invoice date,Dan (a) nakon datuma fakture
 DocType: Payment Schedule,Payment Schedule,Raspored plaćanja
-DocType: Subscription,SUB-,POD-
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Ulaz za plaćanje već postoji
+DocType: Subscription,Trial Period End Date,Datum završetka probnog razdoblja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plaća predložak majstor .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologija
@@ -4723,9 +4757,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ukupna mjesečna
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Stopa cjenika (valuta tvrtke)
@@ -4734,14 +4768,15 @@
 DocType: Lab Prescription,Test Created,Kreirano testiranje
 DocType: Healthcare Settings,Custom Signature in Print,Prilagođeni potpis u tisku
 DocType: Account,Temporary,Privremen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kupac LPO br.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kupac LPO br.
 DocType: Program,Courses,Tečajevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,tajnica
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,tajnica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite &quot;, riječima &#39;polja neće biti vidljiva u bilo koju transakciju"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ta će radnja zaustaviti buduće naplate. Jeste li sigurni da želite otkazati ovu pretplatu?
 DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku
 DocType: Supplier Scorecard Criteria,Criteria Name,Naziv kriterija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Postavite tvrtku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Postavite tvrtku
 DocType: Pricing Rule,Buying,Nabava
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Bolesti i gnojiva
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -4750,17 +4785,17 @@
 DocType: POS Profile,Apply Discount On,Nanesite popusta na
 DocType: Member,Membership Type,Vrsta članstva
 ,Reqd By Date,Reqd Po datumu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Vjerovnici
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Vjerovnici
 DocType: Assessment Plan,Assessment Name,Naziv Procjena
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Prikaži PDC u Ispis
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Prikaži PDC u Ispis
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Red # {0}: Serijski br obvezno
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ponuda za posao
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut naziv
 ,Item-wise Price List Rate,Item-wise cjenik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u retku {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u retku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
@@ -4778,7 +4813,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ukupne varijance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Gledatelja za zaposlenika {0} već označena za ovaj dan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Gledatelja za zaposlenika {0} već označena za ovaj dan
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","U nekoliko minuta 
  Ažurirano putem 'Time Log'"
@@ -4790,6 +4825,7 @@
 DocType: Lab Test,Approved Date,Odobreni datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
+DocType: Subscriber,Subscriber Name,Pretplatničko ime
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Update Tool,Replace,Zamijeniti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nisu pronađeni proizvodi.
@@ -4799,19 +4835,18 @@
 DocType: Request for Quotation Item,Project Name,Naziv projekta
 DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Odaberite račun prihoda od kamata u zajam zaposlenika {0}
 DocType: Work Order,Required Items,potrebne stavke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Ljudski Resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 DocType: Disease,Treatment Task,Zadatak liječenja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,porezna imovina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Update Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektroničke opreme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektroničke opreme
 DocType: Asset,Maintenance Required,Potrebno je održavanje
 DocType: Account,Debit,Zaduženje
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
@@ -4820,7 +4855,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Izvanredna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Red # {0}: Imovina je obvezna za nepokretne imovine kupnju / prodaju
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Red # {0}: Imovina je obvezna za nepokretne imovine kupnju / prodaju
 DocType: Asset Maintenance Team,Maintenance Team Name,Ime tima za održavanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako dva ili više Cijene Pravila nalaze se na temelju gore navedenih uvjeta, Prioritet se primjenjuje. Prioritet je broj između 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost ako ima više Cijene pravila s istim uvjetima."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Korisnik je obavezan ako je &quot;Korisnička prilika&quot; odabrana kao Kupac
@@ -4829,19 +4864,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Vrste Rashodi zahtjevu.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Stopa prodaje za stavku {0} niža je od njegove {1}. Stopa prodaje trebao bi biti najmanje {2}
-DocType: Item,Taxes,Porezi
+DocType: Subscription,Taxes,Porezi
 DocType: Purchase Invoice,capital goods,kapitalna dobra
 DocType: Purchase Invoice Item,Weight Per Unit,Težina po jedinici
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Plaćeni i nije isporučena
 DocType: Project,Default Cost Center,Zadana troškovnih centara
-DocType: Bank Guarantee,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock transakcije
 DocType: Budget,Budget Accounts,Proračun računa
 DocType: Employee,Internal Work History,Unutarnja Povijest Posao
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumulirana amortizacija iznos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variable Scorecard dobavljača
-DocType: Employee Loan,Fully Disbursed,potpuno Isplaćeno
 DocType: Employee Advance,Due Advance Amount,Dospjeli iznos unaprijed
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
@@ -4865,7 +4898,7 @@
 ,Employee Information,Informacije o zaposleniku
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Osnovni su predlošci poreza za prodaju i kupnju.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Zapis ocjena rezultata {0} već postoji.
@@ -4873,7 +4906,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Postavite prazan filtar Tvrtke ako je Skupna pošta &quot;Tvrtka&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Knjiženja Datum ne može biti datum u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za stvaranje ponavljajućih
 DocType: Stock Entry,Target Warehouse Address,Adresa ciljne skladišta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual dopust
 DocType: Agriculture Task,End Day,Dan završetka
@@ -4898,11 +4930,10 @@
 DocType: Material Request,% Ordered,% Naručeno
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Studentsku grupu na tečaju, tečaj će biti validiran za svakog studenta iz upisanih kolegija u upisu na program."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Rad po komadu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosječna nabavna cijena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Prosječna nabavna cijena
 DocType: Share Balance,From No,Od br
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nova poruka od {sender}
 DocType: Customer,Customer Primary Address,Primarna adresa korisnika
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Drug Prescription,Description/Strength,Opis / Snaga
@@ -4911,22 +4942,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Isti predmet je ušao više puta
 DocType: Department,Leave Block List,Popis neodobrenih odsustva
 DocType: Purchase Invoice,Tax ID,OIB
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Postavke računa
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Odobriti
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformirana adresa za {0}, popravite kako biste nastavili."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformirana adresa za {0}, popravite kako biste nastavili."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Broj novog računa, bit će uključen u naziv računa kao prefiks"
 DocType: Maintenance Team Member,Team Member,Član tima
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nema rezultata za slanje
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
-DocType: Employee Loan,Rate of Interest (%) / Year,Kamatna stopa (%) / godina
+DocType: Loan,Rate of Interest (%) / Year,Kamatna stopa (%) / godina
 ,Project Quantity,Projekt Količina
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;"
 DocType: Opportunity,To Discuss,Za Raspravljajte
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinica {1} potrebna u {2} za dovršetak ovu transakciju.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatna stopa (%) godišnje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Crna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Privremeni računi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Crna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Shareholder,Contact List,Popis kontakata
 DocType: Account,Auditor,Revizor
@@ -4934,16 +4965,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} predmeti koji
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Uči više
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornjeg ruba
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cjenik {0} je onemogućen ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cjenik {0} je onemogućen ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Pricing Rule,Disable,Ugasiti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Način plaćanja potrebno je izvršiti uplatu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Način plaćanja potrebno je izvršiti uplatu
 DocType: Project Task,Pending Review,U tijeku pregled
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Uređivanje u cijeloj stranici za više opcija kao što su imovina, serijski brojevi, serije itd."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Imenovanja i konzultacije
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nije upisana u skupinu {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Imovina {0} ne može biti otpisan, kao što je već {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Potrebna je provjera
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Potrebna je provjera
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutni
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Postavljanje tvrtke nije uspjelo
@@ -4955,7 +4986,7 @@
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Mornarički menađer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Dodavanje stavki iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Dodavanje stavki iz
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Usjevi i zemljišta
 DocType: Cheque Print Template,Regular,redovan
 DocType: Fertilizer,Density (if liquid),Gustoća (ako je tekućina)
@@ -4980,24 +5011,26 @@
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Istražite prodajni ciklus
 DocType: Assessment Plan,Supervisor,Nadzornik
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Zadržavanje dionice
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Zadržavanje dionice
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 ,Work Order Stock Report,Izvješće o stanju na radnom mjestu
+DocType: Purchase Receipt,Auto Repeat Detail,Automatski ponavljanje pojedinosti
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kao supervizor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Predloži kategoriju
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpaci predmeta
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Upravljanje kvalitetom
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Upravljanje kvalitetom
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućen
 DocType: Project,Total Billable Amount (via Timesheets),Ukupan iznos koji se naplaćuje (putem vremenskih brojeva)
 DocType: Agriculture Task,Previous Business Day,Prethodni radni dan
-DocType: Employee Loan,Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju
+DocType: Loan,Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju
 DocType: Employee,Health Insurance No,Zdravstveno osiguranje br
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditna bilješka Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditna bilješka Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Ukupni iznos oporezive
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Opening Invoice Creation Tool,Purchase,Nabava
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilanca kol
@@ -5008,15 +5041,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} od {1}
 DocType: Healthcare Settings,Valid number of days,Vrijedi broj dana
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Troška
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Ponovo pokreni pretplatu
 DocType: Land Unit,Linked Plant Analysis,Povezana analiza biljaka
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Red # {0}: vremenu sukobi s redom {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dopusti stopu nulte procjene
+DocType: Bank Guarantee,Receiving,Primanje
 DocType: Training Event Employee,Invited,pozvan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih struktura prihoda nađeni za zaposlenika {0} za navedene datume
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Postava Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dugotrajne imovine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Dugotrajne imovine
 DocType: Payment Entry,Set Exchange Gain / Loss,Postavite Exchange dobici / gubici
 ,GST Purchase Register,Registar kupnje GST-a
 ,Cash Flow,Protok novca
@@ -5036,9 +5071,10 @@
 DocType: Academic Term,Term Start Date,Pojam Datum početka
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Popis svih transakcija dionica
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Count Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},U prilogu {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Moraju biti postavljeni datum početka datuma probnog razdoblja i datum završetka probnog razdoblja
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prosječna stopa
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupni iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupni iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -5068,6 +5104,7 @@
 DocType: Work Order,Warehouses,Skladišta
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovina se ne može se prenijeti
 DocType: Hotel Room Pricing,Hotel Room Pricing,Cijene soba hotela
+DocType: Subscription,Days Until Due,Dani do dospijeća
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ova stavka je varijanta od {0} (Predložak).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
@@ -5076,13 +5113,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Za grupu studenata temeljenih na bazi, studentska će se serijska cjelina validirati za svakog studenta iz prijave za program."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribucija
+DocType: Journal Entry Account,Loan,Zajam
 DocType: Expense Claim Advance,Expense Claim Advance,Predujam za troškove
 DocType: Lab Test,Report Preference,Prednost izvješća
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Dobrovoljne informacije.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Voditelj projekta
 ,Quoted Item Comparison,Citirano predmeta za usporedbu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Preklapanje u bodovanju između {0} i {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Neto imovina kao i na
 DocType: Crop,Produce,proizvoditi
@@ -5092,7 +5130,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Potrošnja materijala za proizvodnju
 DocType: Item Alternative,Alternative Item Code,Kôd alternativne stavke
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Odaberite stavke za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Odaberite stavke za proizvodnju
 DocType: Delivery Stop,Delivery Stop,Dostava zaustavljanja
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
 DocType: Item,Material Issue,Materijal Issue
@@ -5102,15 +5140,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
 DocType: BOM,Show Items,Prikaži stavke
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,S vremena ne može biti veća od na vrijeme.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Želite li obavijestiti sve korisnike putem e-pošte?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Želite li obavijestiti sve korisnike putem e-pošte?
+DocType: Subscription Plan,Billing Interval,Interval naplate
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,rezime
 DocType: Hub Settings,Hub Username,Hub korisničko ime
 DocType: Salary Detail,Component,sastavni dio
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji za ocjenu Grupa
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta po
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Obračunski dnevnik za plaće od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Obračunski dnevnik za plaće od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -5124,22 +5162,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
 DocType: Leave Block List,Applies to Company,Odnosi se na Društvo
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
-DocType: Employee Loan,Disbursement Date,datum isplate
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,Primatelji nisu navedeni
+DocType: Loan,Disbursement Date,datum isplate
 DocType: BOM Update Tool,Update latest price in all BOMs,Ažuriranje najnovije cijene u svim BOM-ovima
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,Vozilo
 DocType: Purchase Invoice,In Words,Riječima
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Unesite naziv banke ili institucije posudbe prije slanja.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} mora biti poslano
 DocType: POS Profile,Item Groups,stavka Grupe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Danas je {0} 'rođendan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Danas je {0} 'rođendan!
 DocType: Sales Order Item,For Production,Za proizvodnju
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Dodajte Privremeni račun otvaranja u računskom planu
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Dodajte Privremeni račun otvaranja u računskom planu
 DocType: Customer,Customer Primary Contact,Primarni kontakt korisnika
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Časopis za zatvaranje razdoblja
 DocType: Project Task,View Task,Pregled zadataka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Vrsta bankarskog jamstva
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Dio dostavnice
 ,Asset Depreciations and Balances,Imovine deprecijacije i sredstva
@@ -5150,9 +5189,8 @@
 DocType: Production Plan,Include Subcontracted Items,Uključi podugovarane predmete
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Pridružiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Nije moguće mijenjati svojstva varijante nakon transakcije zaliha. Morat ćete napraviti novu stavku da to učinite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
-DocType: Employee Loan,Repay from Salary,Vrati iz plaće
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+DocType: Loan,Repay from Salary,Vrati iz plaće
 DocType: Leave Application,LAP/,KRUG/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Zahtjev za isplatu od {0} {1} za iznos {2}
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
@@ -5176,11 +5214,11 @@
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dvostruki stavke skupina nalaze se u tablici stavke grupe
 DocType: Land Unit,Parent Land Unit,Roditeljska jedinica
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
 DocType: Fertilizer,Fertilizer Name,Ime gnojiva
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Cash Flow Mapping Accounts,Account,Račun
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski Ne {0} već je primila
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serijski Ne {0} već je primila
 ,Requested Items To Be Transferred,Traženi proizvodi spremni za transfer
 DocType: Expense Claim,Vehicle Log,vozila Prijava
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Prisutnost povišene temperature (temperatura&gt; 38.5 ° C / 101.3 ° F ili trajanje temperature&gt; 38 ° C / 100.4 ° F)
@@ -5221,24 +5259,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
 DocType: Asset Maintenance,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
-DocType: C-Form,Series,Serija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta cjenika {0} mora biti {1} ili {2}
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Soil Texture,Ternary Plot,Ternarna ploča
 DocType: Item Group,Item Classification,Klasifikacija predmeta
 DocType: Driver,License Number,Broj dozvole
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Voditelj razvoja poslovanja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Voditelj razvoja poslovanja
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Registracija pacijenta računa
 DocType: Crop,Period,Razdoblje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Glavna knjiga
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposlenik {0} na odmor na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zaposlenik {0} na odmor na {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj vodi
 DocType: Program Enrollment Tool,New Program,Novi program
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 DocType: Salary Detail,Salary Detail,Plaća Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Odaberite {0} Prvi
 DocType: Appointment Type,Physician,Liječnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konzultacije
@@ -5246,15 +5283,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u Radnoj nalogu {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Vrijeme list za proizvodnju.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,suma stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Nije moguće mijenjati svojstva varijanti nakon transakcije zaliha. Morat ćete napraviti novu stavku da to učinite.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA mandat
 DocType: Physician,Charges,Naknade
 DocType: Production Plan,Get Items For Work Order,Preuzmite stavke za radni nalog
 DocType: Salary Detail,Default Amount,Zadani iznos
 DocType: Lab Test Template,Descriptive,Opisni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Skladište nije pronađeno u sustavu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sustavu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ovomjesečnom Sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspekcija kvalitete - čitanje
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,` Zamrzni Zalihe starije od ` bi trebao biti manji od % d dana .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` Zamrzni Zalihe starije od ` bi trebao biti manji od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Postavite cilj prodaje koji biste željeli postići svojoj tvrtki.
 ,Project wise Stock Tracking,Projekt mudar Stock Praćenje
@@ -5282,11 +5320,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Izrada web mjesta nije uspjela
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Dionice za zadržavanje koji su već stvoreni ili Uzorak Količina nije predviđen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Dionice za zadržavanje koji su već stvoreni ili Uzorak Količina nije predviđen
 DocType: Program,Program Abbreviation,naziv programa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
 DocType: Warranty Claim,Resolved By,Riješen Do
-DocType: Bank Guarantee,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodijeliti lišće za razdoblje .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depozita pogrešno izbrisani
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
@@ -5301,11 +5338,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
 DocType: Purchase Invoice,04-Correction in Invoice,04-Ispravak u fakturi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Radni nalog već stvoren za sve stavke s BOM-om
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Radni nalog već stvoren za sve stavke s BOM-om
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Izvješće o pojedinostima o varijacijama
 DocType: Setup Progress Action,Setup Progress Action,Postavljanje napretka
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Cjenik kupnje
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Cjenik kupnje
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Uklanjanje stavke ako troškovi se ne odnosi na tu stavku
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Odustani od pretplate
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Odaberite Status održavanja kao Dovršen ili uklonite Datum dovršetka
 DocType: Supplier,Default Payment Terms Template,Predložak predloženih uvjeta plaćanja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute
@@ -5316,7 +5354,6 @@
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Akcija, ako ukupna mjesečna Proračun Prebačen"
-DocType: Subscription,Submit on creation,Pošalji na stvaranje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,Datum Odlaganje
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mail će biti poslan svim aktivnim zaposlenicima Društva u određeni sat, ako oni nemaju odmora. Sažetak odgovora će biti poslan u ponoć."
@@ -5334,6 +5371,7 @@
 DocType: Batch,Parent Batch,Roditeljska šarža
 DocType: Cheque Print Template,Cheque Print Template,Ček Predložak Ispis
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Broj dana nakon datuma fakture protekao je prije otkazivanja pretplate ili označavanja pretplate kao neplaćen
 DocType: Lab Test Template,Sample Collection,Prikupljanje uzoraka
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
 DocType: Price List,Price List Name,Naziv cjenika
@@ -5342,7 +5380,7 @@
 DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nešto je pošlo po krivu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 DocType: Supplier Scorecard Scoring Criteria,Score,Postići
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
@@ -5362,12 +5400,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} mora biti vrijednost između 0 i 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Sljedeći datum amortizacije ne može biti prije datuma dostupnog za upotrebu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max radnog vremena protiv timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Planirano Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Cjelokupni iznos Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Cjelokupni iznos Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera bit će izdjeljena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 DocType: Hub Settings,Company and Seller Profile,Profil tvrtke i prodavatelja
@@ -5381,10 +5419,9 @@
 DocType: Item,Variant Based On,Varijanta na temelju
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ispravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač Dio Ne
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,anoniman
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Primljeno od
 DocType: Lead,Converted,Pretvoreno
@@ -5398,6 +5435,7 @@
 DocType: Asset,Assets,Imovina
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
+DocType: Subscription,Current Invoice End Date,Datum završetka tekuće fakture
 DocType: Payment Term,Due Date Based On,Datum dospijeća na temelju
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Postavite zadanu grupu korisnika i teritorij u Postavkama prodaje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ne postoji
@@ -5405,7 +5443,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nije odabrana otplata za unos dnevnika
 DocType: Payment Reconciliation,From Invoice Date,Iz dostavnice Datum
+DocType: Loan,Disbursed,isplaćeni
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske postavke
 DocType: Patient Appointment,Service Unit,Servisna jedinica
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Uspješno postavite dobavljača
@@ -5418,12 +5458,12 @@
 DocType: Share Balance,No of Shares,Broj dionica
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Odaberite Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: School House,House Name,Ime kuća
 DocType: Fee Schedule,Total Amount per Student,Ukupni iznos po studentu
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Električna
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak svoje organizacije kao svoje korisnike. Također možete dodati pozvati kupce da svoj portal dodajući ih iz Kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
 DocType: Grant Application,Requested Amount,Zahtijevani iznos
@@ -5433,7 +5473,7 @@
 DocType: Crop Cycle,Detected Diseases,Otkrivene bolesti
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 DocType: Asset Maintenance Task,Last Completion Date,Datum posljednjeg dovršetka
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
@@ -5441,9 +5481,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Postavke GoCardless
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,dionicama u vrijednosti
 DocType: Restaurant,Active Menu,Aktivni izbornik
 DocType: Target Detail,Target Qty,Ciljana Kol
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Protiv zajma: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Blagajna Postavke
 DocType: Student Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
@@ -5452,9 +5493,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Production Plan Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
 DocType: Chapter,Chapter Head,Glava poglavlja
 DocType: Payment Term,Month(s) after the end of the invoice month,Mjesec (i) nakon završetka mjeseca fakture
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projekt aktivnost / zadatak.
@@ -5462,11 +5503,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Datetime rezultata laboratorija ne može biti prije testiranja datetime
 DocType: POS Profile,Allow user to edit Discount,Dopusti korisniku uređivanje popusta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Kupujte korisnike
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Kupujte korisnike
 DocType: Purchase Invoice Item,Include Exploded Items,Uključi eksplodirane predmete
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Nabava mora biti provjerena, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
 DocType: Shipping Rule,Restrict to Countries,Ograničite na zemlje
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Radno vrijeme naplate
 DocType: Project,Total Sales Amount (via Sales Order),Ukupni iznos prodaje (putem prodajnog naloga)
@@ -5483,6 +5525,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Voditelj procjene
 DocType: Payment Entry,Allocate Payment Amount,Dodjela iznos otplate
+DocType: Subscription Plan,Subscription Plan,Plan pretplate
 DocType: Employee External Work History,Salary,Plaća
 DocType: Serial No,Delivery Document Type,Dokument isporuke - tip
 DocType: Sales Order,Partly Delivered,Djelomično isporučeno
@@ -5508,9 +5551,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Starenje Raspon 2
 DocType: SG Creation Tool Course,Max Strength,Max snaga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instaliranje unaprijed postavljenih postavki
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nijedna isporuka nije odabrana za kupca {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nijedna isporuka nije odabrana za kupca {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM zamijenjeno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Odaberite stavke na temelju datuma isporuke
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Odaberite stavke na temelju datuma isporuke
 DocType: Grant Application,Has any past Grant Record,Ima li nekih prethodnih Grant Record
 ,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Dostupno {0}
@@ -5528,7 +5571,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modula
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervacija hotela
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Služba za korisnike
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuda kandidata za posao.
@@ -5544,7 +5587,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Učenici su upisani
 DocType: Fees,Student Details,Pojedinosti studenata
 DocType: Purchase Invoice Item,Stock Qty,Kataloški broj
-DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
+DocType: Loan,Repayment Period in Months,Rok otplate u mjesecima
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Pogreška: Nije valjana id?
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
@@ -5553,7 +5596,7 @@
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 DocType: Timesheet,Work Detail,Detalje o radu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,inženjer
 DocType: Journal Entry,Total Amount Currency,Ukupno Valuta Iznos
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupštine
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
@@ -5598,13 +5641,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informacije o donatoru.
 DocType: Request for Quotation,Supplier Detail,Dobavljač Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Dostavljeni iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Dostavljeni iznos
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Ponderi kriterija moraju se dodati do 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Pohađanje
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,zalihi
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Stvaranje {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvorni i ciljni skladišta ne mogu biti isti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
@@ -5628,14 +5670,14 @@
 DocType: Shipping Rule,Fixed,fiksni
 DocType: Vehicle Service,Clutch Plate,držač za tanjur
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
-DocType: Journal Entry,Subscription,Pretplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Pretplata
 DocType: Purchase Invoice,Contact Email,Kontakt email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Kreiranje pristojbe na čekanju
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Otkaznog roka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Otkaznog roka
 DocType: Asset Category,Asset Category Name,Imovina Kategorija Naziv
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ovo je glavni teritorij i ne može se mijenjati.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo ime prodajnog agenta
@@ -5648,7 +5690,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite neoznačeno ako ne želite razmotriti grupu dok stvarate grupe temeljene na tečajima.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost Amortizacija (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Pokaži nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina proizvoda dobivena nakon proizvodnje / pakiranja od navedene količine sirovina
@@ -5656,7 +5698,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
 DocType: Hub Settings,Company Logo,Logo tvrtke
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacijenata
@@ -5690,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,Ukupno zaduženje
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Zadane gotovih proizvoda Skladište
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Odaberite Pacijent
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodajna osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodajna osoba
 DocType: Hotel Room Package,Amenities,Sadržaji
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Proračun i Centar Cijena
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Višestruki zadani način plaćanja nije dopušten
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje Google Analytics
 DocType: Vehicle Service,Half Yearly,Pola godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
@@ -5710,6 +5751,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Ostavite prazno ako grupe studenata godišnje unesete
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikacije pomoću trenutnog ključa neće moći pristupiti, jeste li sigurni?"
+DocType: Subscription Settings,Prorate,Proporcionalno podijeliti
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Promijeni kod predloška
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Datum Pojam završetka ne može biti ranije od datuma Pojam Start. Ispravite datume i pokušajte ponovno.
@@ -5720,8 +5762,9 @@
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 DocType: Cheque Print Template,Signatory Position,potpisnik pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Postavi kao Lost
 DocType: Timesheet,Total Billable Hours,Ukupno naplatnih sati
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Broj dana za koje pretplatnik mora platiti račune koje je generirala ova pretplata
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje Potvrda Napomena
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To se temelji na transakcijama protiv tog kupca. Pogledajte vremensku crtu ispod za detalje
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manja ili jednaka količini unosa Plaćanje {2}
@@ -5740,12 +5783,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o tvrtki
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Odaberite ili dodajte novi kupac
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo tog zaposlenog
 DocType: Assessment Result,Summary,Sažetak
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Označite prisustvo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Duguje račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Duguje račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Stavka unosa narudžbe restorana
@@ -5757,7 +5800,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Iznos narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Work Order,Manufactured Qty,Proizvedena količina
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Dionice ne postoje kod {0}
@@ -5765,12 +5808,12 @@
 DocType: Asset,Out of Order,Izvanredno
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 DocType: Projects Settings,Ignore Workstation Time Overlap,Zanemari vrijeme preklapanja radne stanice
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Odaberite Batch Numbers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 DocType: Patient Service Unit,Medical Administrator,Medicinski administrator
 DocType: Assessment Plan,Schedule,Raspored
 DocType: Account,Parent Account,Nadređeni račun
@@ -5800,15 +5843,16 @@
 DocType: Asset Repair,Repair Status,Status popravka
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
 DocType: POS Profile,Account for Change Amount,Račun za promjene visine
 DocType: Purchase Invoice,input service,ulazna usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Odjel za tim za održavanje
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza tla
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Šifra predmeta:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Detalji nabave/proizvodnje
@@ -5856,19 +5900,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Upisi za {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variable Name
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
 DocType: Asset,Asset Category,Kategorija Imovine
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plaća ne može biti negativna
 DocType: Purchase Order,Advance Paid,Unaprijed plaćeni
 DocType: Item,Item Tax,Porez proizvoda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materijal za dobavljača
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Planiranje zahtjeva za materijal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Trošarine Račun
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Označena posjećenost
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kratkoročne obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kratkoročne obveze
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer je premašio zadani broj sati.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Pošalji grupne SMS poruke svojim kontaktima
 DocType: Patient,A Positive,Pozitivan
@@ -5879,9 +5923,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutačno ima status dobavljača {1}, a narudžbenice za ovog dobavljača trebaju biti izdane s oprezom."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tim za održavanje imovine
-DocType: Employee Loan,Loan Type,Vrsta kredita
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} uspješno je poslan
+DocType: Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,alat za raspoređivanje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Proizvod će biti proizveden ili prepakiran
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5913,7 +5958,7 @@
 DocType: Item,Units of Measure,Mjerne jedinice
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite proizvodnje na odmor
 DocType: Sales Invoice,Customer's Purchase Order Date,Kupca narudžbenice Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapital
 DocType: Shopping Cart Settings,Show Public Attachments,Prikaži javne privitke
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Restaurant Reservation,Reservation Time,Vrijeme rezervacije
@@ -5928,7 +5973,7 @@
 DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Redak # {0}: Reqd by Date ne može biti prije datuma transakcije
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Istaknuti Proizvodi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
@@ -5938,20 +5983,20 @@
 DocType: Driver,Expiry Date,Datum isteka
 DocType: Healthcare Settings,Employee name and designation in print,Ime i oznaka zaposlenika u tisku
 ,accounts-browser,računi-preglednik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Molimo odaberite kategoriju prvi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt majstor.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Da bi se omogućilo pretjerano naplatu ili nad-naručivanje, ažurirati &quot;dodatak&quot; u stock postavkama ili točke."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pola dana)
 DocType: Payment Term,Credit Days,Kreditne Dani
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Odaberite Pacijent da biste dobili laboratorijske testove
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Provjerite Student Hrpa
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Potencijalni kupac - ukupno dana
 DocType: Cash Flow Mapping,Is Income Tax Expense,Je li trošak poreza na dohodak
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Provjerite je li student boravio u Hostelu Instituta.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
 ,Stock Summary,Stock Sažetak
@@ -5962,10 +6007,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: BOM Operation,Operating Cost(Company Currency),Operativni trošak (Društvo valuta)
-DocType: Employee Loan Application,Rate of Interest,Kamatna stopa
+DocType: Loan Application,Rate of Interest,Kamatna stopa
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: Item,Shelf Life In Days,Rok trajanja u danima
 DocType: GL Entry,Is Opening,Je Otvaranje
+DocType: Department,Expense Approvers,Provizori troškova
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
 DocType: Journal Entry,Subscription Section,Odjeljak za pretplatu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Račun {0} ne postoji
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 137d7bf..f85e7fe 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Törölje az anyag szemlét: {0}mielőtt törölné ezt a jótállási igényt
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Értékelő jelentések
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Vásárlói termékek
-DocType: Purchase Receipt,Subscription Detail,Előfizetés részletei
 DocType: Supplier Scorecard,Notify Supplier,Értesítse a szállítót
 DocType: Item,Customer Items,Vevői tételek
 DocType: Project,Costing and Billing,Költség- és számlázás
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,A {0} számla: Szülő számla {1} nem lehet  főkönyvi számla
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel itt: hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Email értesítések
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Értékelés
 DocType: Item,Default Unit of Measure,Alapértelmezett mértékegység
 DocType: SMS Center,All Sales Partner Contact,Összes értékesítő partner kapcsolata
-DocType: Employee,Leave Approvers,Távollét jóváhagyók
+DocType: Department,Leave Approvers,Távollét jóváhagyók
 DocType: Sales Partner,Dealer,Forgalmazó
 DocType: Work Order,WO-,MR
 DocType: Consultation,Investigations,Laboratóriumi vizsgálatok eredményei
@@ -22,7 +20,7 @@
 DocType: Employee,Rented,Bérelt
 DocType: Purchase Order,PO-,BESZMEGR-
 DocType: Vehicle Service,Mileage,Távolság
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +253,Do you really want to scrap this asset?,Tényleg szeretné kiselejtezni ezt az eszközt?
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +253,Do you really want to scrap this asset?,Tényleg szeretné kiselejtezni ezt a Vagyontárgyat?
 DocType: Drug Prescription,Update Schedule,Frissítse az ütemtervet
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Alapértelmezett beszállító kiválasztása
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Árfolyam szükséges ehhez az  árlistához: {0}
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Ellenőrizd az elérhetőséget
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ennek alapja a beszállító ügyleteki. Lásd alábbi idővonalat a részletekért
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Jogi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tényleges adó típust nem lehet hozzárendelni a Tétel értékéhez a {0} sorban
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Jogi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tényleges adó típust nem lehet hozzárendelni a Tétel értékéhez a {0} sorban
 DocType: Bank Guarantee,Customer,Vevő
 DocType: Purchase Receipt Item,Required By,Által előírt
 DocType: Delivery Note,Return Against Delivery Note,Szállítólevél ellenszámlája
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},A bankszámlát nem nevezhetjük mint {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vezetők (vagy csoportok), amely ellen könyvelési tételek készültek és egyenelegeit tartják karban."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),"Fennálló, kintlévő összeg erre: {0} nem lehet kevesebb, mint nulla ({1})"
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nincsenek benyújtott bérpapírok feldolgozásra.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nincsenek benyújtott bérpapírok feldolgozásra.
 DocType: Manufacturing Settings,Default 10 mins,Alapértelmezett 10 perc
 DocType: Leave Type,Leave Type Name,Távollét típus neve
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mutassa nyitva
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Az említett ismétlődő magatartásnak ma is meg kell történnie
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Sorozat sikeresen frissítve
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Kijelentkezés
 DocType: Pricing Rule,Apply On,Alkalmazza ezen
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Összes beszállítói Kapcsolat
 DocType: Support Settings,Support Settings,Támogatás beállítások
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet előbb, mint várható kezdési időpontja"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Árnak eggyeznie kell {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Új távollét igény
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Árnak eggyeznie kell {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Kötegelt tétel Lejárat állapota
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank tervezet
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank tervezet
 DocType: Membership,membership validaty section,tagság érvényesítő rész
 DocType: Mode of Payment Account,Mode of Payment Account,Fizetési számla módja
 DocType: Consultation,Consultation,Konzultáció
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Anyag
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Honlap létrehozás
 DocType: Opening Invoice Creation Tool Item,Quantity,Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Számlák tábla nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Hitelek (kötelezettségek)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Számlák tábla nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Hitelek (kötelezettségek)
 DocType: Employee Education,Year of Passing,Elmúlt Év
 DocType: Item,Country of Origin,Származási ország
 DocType: Soil Texture,Soil Texture Criteria,Talaj textúra kritériumai
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Elsődleges kapcsolattartási adatok
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,"Problémák, Ügyek megnyitása"
 DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve ehhez az Alkalmazotthoz {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve ehhez az Alkalmazotthoz {1}
 DocType: Lab Test Groups,Add new line,Új sor hozzáadása
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Egészségügyi ellátás
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Fizetési késedelem (napok)
@@ -89,7 +85,7 @@
 ,Delay Days,Késleltetési napok
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Számla
+DocType: Subscription Invoice,Invoice,Számla
 DocType: Purchase Invoice Item,Item Weight Details,Tétel súly részletei
 DocType: Asset Maintenance Log,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
@@ -98,24 +94,23 @@
 DocType: Salary Component,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Összes Költség összege
 DocType: Delivery Note,Vehicle No,Jármű sz.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Kérjük, válasszon árjegyzéket"
 DocType: Accounts Settings,Currency Exchange Settings,Valutaváltási beállítások
-apps/erpnext/erpnext/public/js/hub/hub_factory.js +61,Please check your network connection.,Ellenőrizze a hálózati kapcsolatot.
+apps/erpnext/erpnext/public/js/hub/hub_factory.js +61,Please check your network connection.,Ellenőrizze a hálózati kapcsolatát.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Row #{0}: Payment document is required to complete the trasaction,Sor # {0}: Fizetési dokumentum szükséges a teljes trasaction
 DocType: Work Order Operation,Work In Progress,Dolgozunk rajta
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Kérjük, válasszon dátumot"
 DocType: Daily Work Summary Group,Holiday List,Szabadnapok listája
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Könyvelő
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Könyvelő
 DocType: Hub Settings,Selling Price List,Értékesítési ár-lista
 DocType: Patient,Tobacco Current Use,Dohányzás jelenlegi felhasználása
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Értékesítési ár
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Értékesítési ár
 DocType: Cost Center,Stock User,Készlet Felhasználó
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg)/K
 DocType: Company,Phone No,Telefonszám
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Új {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Kezdeti e-mail értesítés elküldve
 ,Sales Partners Commission,Vevő partner jutaléka
 DocType: Soil Texture,Sandy Clay Loam,Homokos agyag termőföld
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Eszközök értékcsökkenés utáni
 DocType: Student,O+,ALK+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Kapcsolódó
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,"Részvétel dátuma nem lehet kisebb, mint a munkavállaló belépési dátuma"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,"Részvétel dátuma nem lehet kisebb, mint a munkavállaló belépési dátuma"
 DocType: Grading Scale,Grading Scale Name,Osztályozás időszak neve
-DocType: Subscription,Repeat on Day,Ismételje meg a napot
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ez egy root fiók és nem lehet szerkeszteni.
 DocType: Sales Invoice,Company Address,Vállalkozás címe
 DocType: BOM,Operations,Műveletek
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nem lehet beállítani engedélyt a kedvezmény alapján erre: {0}
+DocType: Subscription,Subscription Start Date,Előfizetés kezdő időpontja
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Mellékeljen .csv fájlt két oszloppal, egyik a régi névvel, a másik az új névvel"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} egyik aktív pénzügyi évben sem.
 DocType: Packed Item,Parent Detail docname,Fő  docname részletek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, pont kód: {1} és az ügyfél: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,A próbaidőszak végpontja nem lehet a próbaidőszak kezdete előtt
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Megnyitás egy álláshoz.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},ANYAGJ nincs megadva az alvállalkozó {0} tételéhez a(z) {1} sorban
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Patient,Married,Házas
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nem engedélyezett erre {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Tételeket kér le innen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Tételeket kér le innen
 DocType: Price List,Price Not UOM Dependant,Ár nem Mértékegység függő
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Gyártmány {0}
@@ -174,17 +170,17 @@
 apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Készlet jelentések
 DocType: Warehouse,Warehouse Detail,Raktár részletek
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A feltétel végső dátuma nem lehet későbbi, mint a tanév év végi időpontja, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +269,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
+apps/erpnext/erpnext/stock/doctype/item/item.py +269,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez álló-eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
 DocType: Delivery Trip,Departure Time,Indulás ideje
 DocType: Vehicle Service,Brake Oil,Fékolaj
 DocType: Tax Rule,Tax Type,Adónem
 ,Completed Work Orders,Elvégzett munka rendelések
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Adóalap
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Adóalap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nincs engedélye bejegyzés hozzáadására és frissítésére előbb mint: {0}
 DocType: BOM,Item Image (if not slideshow),Tétel Kép (ha nem slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Óra érték / 60) * aktuális üzemidő
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,#{0} sor: A referencia dokumentum típusának a Költség igény vagy Jóváírás bejegyzések egyikének kell lennie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Válasszon Anyagj
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,#{0} sor: A referencia dokumentum típusának a Költség igény vagy Jóváírás bejegyzések egyikének kell lennie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Válasszon Anyagj
 DocType: SMS Log,SMS Log,SMS napló
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételeken
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Munkavállalónak adott előleg összegének kezelése
@@ -200,25 +196,25 @@
 DocType: Delivery Trip,Delivery Notification,Kézbesítési értesítés
 DocType: Journal Entry,Opening Entry,Kezdő könyvelési tétel
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Számla csak fizetésre
-DocType: Employee Loan,Repay Over Number of Periods,Törleszteni megadott számú időszakon belül
+DocType: Loan,Repay Over Number of Periods,Törleszteni megadott számú időszakon belül
 DocType: Stock Entry,Additional Costs,További költségek
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Meglévő tranzakcióval rendelkező számla nem konvertálható csoporttá.
 DocType: Lead,Product Enquiry,Gyártmány igénylés
 DocType: Education Settings,Validate Batch for Students in Student Group,Érvényesítse a köteget a Diák csoportban lévő diák számára
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nem talál távollét bejegyzést erre a munkavállalóra {0} erre {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nem talál távollét bejegyzést erre a munkavállalóra {0} erre {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Kérjük, adja meg először céget"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Kérjük, válasszon Vállalkozást először"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Kérjük, válasszon Vállalkozást először"
 DocType: Employee Education,Under Graduate,Diplomázás alatt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Kérjük, állítsa be az alapértelmezett sablont a kilépési állapot értesítéshez a HR beállításoknál."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Cél ezen
 DocType: BOM,Total Cost,Összköltség
 DocType: Soil Analysis,Ca/K,Ca/K
-DocType: Journal Entry Account,Employee Loan,Alkalmazotti hitel
 DocType: Fee Schedule,Send Payment Request Email,Fizetési kérelem küldése e-mailben
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,"Tétel: {0} ,nem létezik a rendszerben, vagy lejárt"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Ingatlan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Főkönyvi számla kivonata
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,Gyógyszeriparok
-DocType: Purchase Invoice Item,Is Fixed Asset,Ez állóeszköz
+DocType: Purchase Invoice Item,Is Fixed Asset,Ez álló-eszköz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +313,"Available qty is {0}, you need {1}","Elérhető mennyiség: {0}, ennyi az igény: {1}"
 DocType: Expense Claim Detail,Claim Amount,Garanciális igény összege
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +679,Work Order has been {0},A munka megrendelés: {0}
@@ -226,26 +222,23 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Beszállító típus / Beszállító
 DocType: Naming Series,Prefix,Előtag
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,Esemény helye
-DocType: Asset Settings,Asset Settings,Eszköz beállítások
+DocType: Asset Settings,Asset Settings,Vagyonieszköz beállítások
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,Fogyóeszközök
 DocType: Student,B-,B-
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Sikeresen kiregisztrálva.
 DocType: Assessment Result,Grade,Osztály
 DocType: Restaurant Table,No of Seats,Ülőhelyek  száma
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Dinamikus téma hozzáadásához használja a jinja-címkéket <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Beszállító által szállított
-DocType: Asset Maintenance Task,Asset Maintenance Task,Eszköz karbantartási feladat
+DocType: Asset Maintenance Task,Asset Maintenance Task,Vagyontárgy karbantartási feladat
 DocType: SMS Center,All Contact,Összes Kapcsolattartó
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Éves Munkabér
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Éves Munkabér
 DocType: Daily Work Summary,Daily Work Summary,Napi munka összefoglalása
 DocType: Period Closing Voucher,Closing Fiscal Year,Pénzügyi év záró
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} fagyasztott
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Készlet költségek
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Készlet költségek
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Cél Raktár kiválasztása
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Kérjük, adja meg a preferált kapcsolati Email-t"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Kérjük, adja meg a preferált kapcsolati Email-t"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Ellen jegyzés
 DocType: Journal Entry Account,Credit in Company Currency,Követelés a vállalkozás pénznemében
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Elsődleges Cím
 DocType: Production Plan,Material Request Detail,Anyag igény részletei
 DocType: Selling Settings,Default Quotation Validity Days,Alapértelmezett árajánlat érvényességi napok
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Beállítások a HR munkaügy modulhoz
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: Sales Invoice,Change Amount,Váltópénz összeg
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Vezetői engedély kategóriái
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Kérjük, adja meg a szállítási határidőt"
 DocType: Depreciation Schedule,Make Depreciation Entry,ÉCS bejegyzés generálás
+DocType: HR Settings,Leave Settings,Hagyja el a beállításokat
 DocType: Appraisal Template Goal,KRA,TÉSABL
 DocType: Lead,Request Type,Kérés típusa
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Alkalmazot létrehozás
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Műsorszolgáltatás
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS értékesítési kassza beállítási módja  (online / offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Letiltja a naplófájlok létrehozását a munka megrendelésekhez. A műveleteket nem lehet nyomon követni a munkatervben
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Végrehajtás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Végrehajtás
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Részletek az elvégzett műveletekethez.
 DocType: Asset Maintenance Log,Maintenance Status,Karbantartás állapota
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Tagság adatai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Beszállító kötelező a fizetendő számlához {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Tételek és árak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Összesen az órák: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátumtól a pénzügyi éven belül kell legyen. Feltételezve a dátumtól = {0}
 DocType: Drug Prescription,Interval,Intervallum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Előnyben
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Előnyben
 DocType: Grant Application,Individual,Magánszemély
 DocType: Academic Term,Academics User,Akadémiai felhasználó
 DocType: Cheque Print Template,Amount In Figure,Összeg kikalkulálva
-DocType: Employee Loan Application,Loan Info,Hitel információja
+DocType: Loan Application,Loan Info,Hitel információja
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Tervet karbantartási ellenőrzés.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Beszállító eredménymutató-periódusa
 DocType: Share Transfer,Share Transfer,Átruházása megosztása
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Tétel sablon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokémia
 DocType: Job Offer,Select Terms and Conditions,Válasszon Feltételeket
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Értéken kívül
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Értéken kívül
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce beállítások
 DocType: Production Plan,Sales Orders,Vevői rendelés
 DocType: Purchase Taxes and Charges,Valuation,Készletérték
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Alapértelmezett terület
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televízió
 DocType: Work Order Operation,Updated via 'Time Log',Frissítve 'Idő napló' által
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},"Előleg összege nem lehet nagyobb, mint {0} {1}"
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Válassza ki az ügyfelet vagy a szállítót.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},"Előleg összege nem lehet nagyobb, mint {0} {1}"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Company,Enable Perpetual Inventory,Engedélyezze a folyamatos készletet
+DocType: Bank Guarantee,Charges Incurred,Felmerült költségek
 DocType: Company,Default Payroll Payable Account,Alapértelmezett Bér fizetendő számla
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Email csoport frissítés
 DocType: Sales Invoice,Is Opening Entry,Ez kezdő könyvelési tétel
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Egyén eredménye
 DocType: Delivery Stop,Contact Name,Kapcsolattartó neve
 DocType: Course Assessment Criteria,Course Assessment Criteria,Tanfolyam Értékelési kritériumok
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Adóazonosító:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Adóazonosító:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Diákigazolvány ID:
 DocType: POS Customer Group,POS Customer Group,POS Vásárlói csoport
 DocType: Land Unit,Land Unit describing various land assets,"Föld terület, amely leírja a különböző földtulajdonokat"
@@ -374,9 +371,8 @@
 ,Open Work Orders,Munka rendelések nyitása
 DocType: Payment Term,Credit Months,Hitelkeret hónapokban
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,"Nettó fizetés nem lehet kevesebb, mint 0"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Az ismétlődő hibaüzenetek rendszerből való megszakításának megakadályozása érdekében a Kiiktatva mezőt bejelöltük a feliratkozáson
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Távollétek évente
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Távollétek évente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Sor {0}: Kérjük ellenőrizze, hogy 'ez előleg' a  {1} számlához, tényleg egy előleg bejegyzés."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a(z) {1} céghez
 DocType: Email Digest,Profit & Loss,Profit & veszteség
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Kérjük, állíts be a Diákokat a Hallgatói csoportok alatt"
 DocType: Item Website Specification,Item Website Specification,Tétel weboldal adatai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Távollét blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank bejegyzések
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Távollét blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank bejegyzések
 DocType: Crop,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Készlet egyeztetés tétele
 DocType: Stock Entry,Sales Invoice No,Kimenő értékesítési számla száma
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Diák csoport létrehozása Szerszám pálya
 DocType: Lead,Do Not Contact,Ne lépj kapcsolatba
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Emberek, akik tanítanak a válllakozásánál"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Szoftver fejlesztő
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Szoftver fejlesztő
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Course Scheduling Tool,Course Start Date,Tanfolyam kezdő dátuma
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Közzéteszi a Hubon
 DocType: Student Admission,Student Admission,Tanuló Felvételi
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} tétel törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} tétel törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Beszerzés adatai
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max osztályzat
 DocType: Email Digest,New Quotations,Új árajánlat
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mailek bérpapírok az alkalmazottak részére az alkalmazottak preferált e-mail kiválasztása alapján
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első távollét jóváhagyó a listán lesz az alapértelmezett távollét Jóváhagyó
 DocType: Tax Rule,Shipping County,Szállítás megyéje
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Tanulás
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Tanulás
 DocType: Asset,Next Depreciation Date,Következő Értékcsökkenés dátuma
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Alkalmazottankénti Tevékenység költség
 DocType: Accounts Settings,Settings for Accounts,Fiókok beállítása
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Fennálló, kinntlévő negatív csekkek és a Betétek kiegyenlítésre"
 DocType: Item,Synced With Hub,Szinkronizálta Hub-al
 DocType: Driver,Fleet Manager,Flotta kezelő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},#{0}sor: {1} nem lehet negatív a tételre: {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},#{0}sor: {1} nem lehet negatív a tételre: {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Hibás Jelszó
 DocType: Item,Variant Of,Változata
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint 'Gyártandó Menny'"
@@ -474,10 +469,10 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Kérjük, állítsa be a szobaárakat a {}"
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Opening Invoice Creation Tool,Invoice Type,Számla típusa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Szállítólevél
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Szállítólevél
 DocType: Consultation,Encounter Impression,Benyomás a tálálkozóról
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Adók beállítása
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Eladott eszközök költsége
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Eladott vagyontárgyak költsége
 DocType: Volunteer,Morning,Reggel
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetés megadása módosításra került, miután lehívta. Kérjük, hívja le újra."
 DocType: Program Enrollment Tool,New Student Batch,Új diák csoport
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja az ügyfél alapértelmezett pénznemére"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tanfolyam ütemező eszköz
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő eszközre: {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Sürgős] Hiba történt az %s ismétlődő %s létrehozásakor
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő vagyontárgyra: {1}
 DocType: Land Unit,LInked Analysis,Kapcsolt elemzések
 DocType: Item Tax,Tax Rate,Adókulcs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Alkalmazási időszak nem lehet két elosztási rekord között
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Alkalmazási időszak nem lehet két elosztási rekord között
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített a  {1} Alkalmazotthoz a {2} -től {3} -ig időszakra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Köteg számnak egyeznie kell ezzel {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% fogadva
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Készítsen Diákcsoportokat
 DocType: Volunteer,Weekends,Hétvégék
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Követelés értesítő összege
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Követelés értesítő összege
 DocType: Setup Progress Action,Action Document,Műveleti dokumentum
 DocType: Chapter Member,Website URL,Weboldal URL
 ,Finished Goods,Készáru
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tételek hozzáadása
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Tétel minőségi vizsgálatának részletei
+DocType: Leave Application,Leave Approver Name,Távollét jóváhagyó neve
 DocType: Depreciation Schedule,Schedule Date,Menetrend dátuma
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Jövedelem, levonások vagy más fizetési alkotórészek"
 DocType: Packed Item,Packed Item,Csomagolt tétel
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
 DocType: Healthcare Settings,Require Lab Test Approval,Laboratóriumi teszt jóváhagyása szükséges
 DocType: Salary Slip Timesheet,Working Hours,Munkaidő
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Teljes fennálló kintlévő
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Teljes fennálló kintlévő
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.
 DocType: Dosage Strength,Strength,Dózis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Hozzon létre egy új Vevőt
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Fogyóeszköz költség
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
 DocType: Student Log,Medical,Orvosi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Veszteség indoka
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Veszteség indoka
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Számlaszám frissítése
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,"Érdeklődés tulajdonosa nem lehet ugyanaz, mint az érdeklődés"
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,"Elkülönített összeg nem lehet nagyobb, mint a kiigazítás nélküli összege"
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Egyedülálló
 DocType: Salary Slip,Total Loan Repayment,Összesen hitel visszafizetése
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési költsége
-DocType: Subscription,Yearly,Évi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
 DocType: Drug Prescription,Dosage,Adagolás
 DocType: Journal Entry Account,Sales Order,Vevői rendelés
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Átlagos eladási ár
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Átlagos eladási ár
 DocType: Assessment Plan,Examiner Name,Vizsgáztató neve
 DocType: Lab Test Template,No Result,Nincs eredmény
 DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és árérték
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Kérjük adja meg a cégnevet elsőként
 DocType: Purchase Invoice,Supplier Name,Beszállító neve
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Olvassa el a ERPNext kézikönyv
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Az összes tanszék tagjának levelek megjelenítése a naptárban
 DocType: Purchase Invoice,01-Sales Return,01-Értékesítés vissza
 DocType: Account,Is Group,Ez Csoport
 DocType: Email Digest,Pending Purchase Orders,Függő Beszerzési megrendelések
@@ -592,7 +587,7 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze a Beszállítói Számlák számait Egyediségre
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,Elsődleges cím adatok
 DocType: Vehicle Service,Oil Change,Olajcsere
-DocType: Asset Maintenance Log,Asset Maintenance Log,Eszköz karbantartási napló
+DocType: Asset Maintenance Log,Asset Maintenance Log,Vagyontárgy karbantartási napló
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"'Eset számig' nem lehet kevesebb, mint 'Eset számtól'"
 DocType: Chapter,Non Profit,Nonprofit alapítvány
 DocType: Production Plan,Not Started,Nincs elindítva
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Kötelező mező - Tanév
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nincs társítva ezekhez: {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Az email részét képező bevezető bemutatkozó szöveg testreszabása. Minden egyes tranzakció külön bevezető szöveggel rendelkezik.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Kérjük, állítsa be az alapértelmezett fizetendő számla a cég {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Kérjük, állítsa be az alapértelmezett fizetendő számla a cég {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Tranzakció nem engedélyezett a megállított munka megrendeléshez: {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc számláló
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamatra.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve ekkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
 DocType: HR Settings,Employee record is created using selected field. ,Alkalmazott rekord jön létre a kiválasztott mezővel.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Távollét törzsadat.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Lefoglalt eladáshoz
 DocType: Packing Slip,From Package No.,Csomag számból
 DocType: Item Attribute,To Range,Tartományhoz
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nem lehet megváltoztatni az értékelési módszert, mivel vannak tranzakciók olyan tételekhez, amelyeknek nincs saját értékelési módszere"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Értékpapírok és betétek
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nem lehet megváltoztatni az értékelési módszert, mivel vannak tranzakciók olyan tételekhez, amelyeknek nincs saját értékelési módszere"
 DocType: Student Report Generation Tool,Attended by Parents,Résztvevők szülők szerint
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Összes kötelezően kiosztott távollétek
 DocType: Patient,AB Positive,AB Pozitív
@@ -640,8 +635,8 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Részvételi bejegyzés.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Bér összetevők a munkaidő jelenléti ív alapú bérhez.
 DocType: Sales Order Item,Used for Production Plan,Termelési tervhez használja
-DocType: Employee Loan,Total Payment,Teljes fizetés
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nem sikerült megszüntetni a befejezett munkatörvény tranzakcióját.
+DocType: Loan,Total Payment,Teljes fizetés
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nem sikerült megszüntetni a befejezett munka rendelés tranzakcióját.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Műveletek közti idő (percben)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} törlődik, így a művelet nem lehet végrehajtható"
 DocType: Customer,Buyer of Goods and Services.,Vevő az árukra és szolgáltatásokra.
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Elég alkatrészek a megépítéshez
 DocType: POS Profile User,POS Profile User,POS profil felhasználója
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Közvetlen jövedelem
+DocType: Subscription Invoice,Subscription Invoice,Előfizetési számla
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Közvetlen jövedelem
 DocType: Patient Appointment,Date TIme,Dátum Idő
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nem tudja szűrni számla alapján, ha számlánként csoportosított"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Igazgatási tisztviselő
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Igazgatási tisztviselő
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Vállalkozás és adók létrehozása
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Kérjük, válasszon pályát"
 DocType: Codification Table,Codification Table,Kodifikációs táblázat
 DocType: Timesheet Detail,Hrs,Óra
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Kérjük, válasszon Vállalkozást először"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Kérjük, válasszon Vállalkozást először"
 DocType: Stock Entry Detail,Difference Account,Különbség főkönyvi számla
 DocType: Purchase Invoice,Supplier GSTIN,Beszállító GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nem zárható feladat, mivel a hozzá fűződő feladat: {0} nincs lezárva."
@@ -672,7 +668,7 @@
 DocType: Work Order,Additional Operating Cost,További üzemeltetési költség
 DocType: Lab Test Template,Lab Routine,Labor rutin
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,"Kérem, válassza ki a befejezés dátumát a Befejezett eszközgazdálkodási naplóhoz"
+apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,"Kérem, válassza ki a befejezés dátumát a Befejezett Vagyontárgy gazdálkodási naplóhoz"
 apps/erpnext/erpnext/stock/doctype/item/item.py +552,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Pénzforgalom térképezés sablon
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
+DocType: Bank Guarantee,Providing,Gondoskodás
 DocType: Account,Profit and Loss,Eredménykimutatás
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nem engedélyezett, szükség szerint konfigurálja a laboratóriumi tesztsablont"
 DocType: Patient,Risk Factors,Kockázati tényezők
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
 DocType: Healthcare Settings,Appointment Confirmation,Vizit időpont megerősítése
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszámot: {0}, mivel ezt használja a részvény tranzakcióknál"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszámot: {0}, mivel ezt használja a részvény tranzakcióknál"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Záró (Köv)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Helló
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Tétel mozgatása
@@ -729,7 +726,7 @@
 DocType: Production Plan Item,Pending Qty,Függőben lévő db
 DocType: Budget,Ignore,Mellőz
 apps/erpnext/erpnext/accounts/party.py +396,{0} {1} is not active,{0} {1} nem aktív
-DocType: Woocommerce Settings,Freight and Forwarding Account,Freight and Forwarding Account
+DocType: Woocommerce Settings,Freight and Forwarding Account,Szállítás és szállítmányozás számla
 apps/erpnext/erpnext/config/accounts.py +272,Setup cheque dimensions for printing,Csekk méretek telepítése a nyomtatáshoz
 DocType: Salary Slip,Salary Slip Timesheet,Bérpapirok munkaidő jelenléti ívei
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Beszállító raktár kötelező  az alvállalkozók vásárlási nyugtájához
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Már beállította a {0} pozícióprofilban a {1} felhasználó számára az alapértelmezett értéket,  kérem tiltsa le az alapértelmezettet"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Halmozott értékek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Széria sz. nem lehet összevonni,"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Széria sz. nem lehet összevonni,"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Terület szükséges a POS profilban
 DocType: Supplier,Prevent RFQs,Árajánlatkérések megakadályozása
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Vevői rendelés létrehozás
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Bérpapír benyújtva a  {0} -  {1} időszakra
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Bérpapír benyújtva a  {0} -  {1} időszakra
 DocType: Project Task,Project Task,Projekt téma feladat
 ,Lead Id,Érdeklődés ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Szállítás számlázásának dátuma
 DocType: Production Plan,Production Plan,Termelési terv
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Számlát létrehozó eszköz megnyitása
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Értékesítés visszaküldése
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Értékesítés visszaküldése
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Megjegyzés: Az összes kijelölt távollét: {0} nem lehet kevesebb, mint a már jóváhagyott távollétek: {1} erre az időszakra"
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Állítsa be a Qt a Tranzakciók soros bemeneten alapuló tranzakciókhoz
 ,Total Stock Summary,Készlet Összefoglaló
 DocType: Announcement,Posted By,Általa rögzítve
 DocType: Item,Delivered by Supplier (Drop Ship),Beszállító által közvetlenül vevőnek szállított (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Nyitó (Követ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Share Balance,Share Balance,Egyenleg megosztása
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
 DocType: Training Result Employee,Training Result Employee,Képzési munkavállalói eredmény
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Raktárkészlet amelyhez a készlet állomány bejegyzések történnek.
-DocType: Repayment Schedule,Principal Amount,Tőkeösszeg
-DocType: Employee Loan Application,Total Payable Interest,Összesen fizetendő kamat
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Tőkeösszeg
+DocType: Loan Application,Total Payable Interest,Összesen fizetendő kamat
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Összes kinntlevő: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Munkaidő jelenléti ív nyilvántartója
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
 DocType: Restaurant Reservation,Restaurant Reservation,Éttermi foglalás
 DocType: Land Unit,Land Unit Name,Föld terület neve
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Pályázatírás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetés megadásának levonása
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Becsomagol
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Vevők értesítse e-mailen keresztül
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Vevők értesítse e-mailen keresztül
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Értékesítő személy {0} létezik a  azonos alkalmazotti azonosító Id-vel
 DocType: Employee Advance,Claimed Amount,Igényelt összeg
 apps/erpnext/erpnext/config/education.py +180,Masters,Törzsadat adatok
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Fizetési  átjáró számla nem jön létre, akkor hozzon létre egyet manuálisan."
 DocType: Supplier Scorecard,Per Year,Évente
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,A programban való részvételre nem jogosult a DOB szerint
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
 DocType: Sales Invoice,Sales Taxes and Charges,Értékesítési adók és költségek
 DocType: Employee,Organization Profile,Szervezet profilja
 DocType: Vital Signs,Height (In Meter),Magasság (méterben)
 DocType: Student,Sibling Details,Testvér Részletei
 DocType: Vehicle Service,Vehicle Service,Jármű szervíz
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatikusan elindítja a visszajelzéseket kérelem feltételek alapján.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatikusan elindítja a visszajelzéseket kérelem feltételek alapján.
 DocType: Employee,Reason for Resignation,Felmondás indoka
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Sablon a teljesítménymérésre.
 DocType: Sales Invoice,Credit Note Issued,Követelés értesítő kiadva
@@ -834,17 +831,16 @@
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Számla / Naplókönyvelés Részletek
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nem a pénzügyi évben {2}
 DocType: Buying Settings,Settings for Buying Module,Beállítások a modul vásárláshoz
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Vagyoneszköz {0} nem tartozik a(z) {1} céghez
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Vagyontárgy {0} nem tartozik a(z) {1} céghez
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Kérjük, adjon meg Vásárlási nyugtát először"
 DocType: Buying Settings,Supplier Naming By,Beszállító elnevezve által
 DocType: Activity Type,Default Costing Rate,Alapértelmezett költség ár
 DocType: Maintenance Schedule,Maintenance Schedule,Karbantartási ütemterv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Árképzési szabályok szűrésre kerülnek a Vevő, Vevő csoport, Terület, Beszállító,Beszállító típus, kampány, értékesítési partner stb. alapján."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Nettó készletváltozás
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Alkalmazotti hitel kezelés
 DocType: Employee,Passport Number,Útlevél száma
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Összefüggés Helyettesítő2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menedzser
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Menedzser
 DocType: Payment Entry,Payment From / To,Fizetési Honnan / Hova
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Kérjük, állítson be fiókot erre a Raktárra: {0}"
@@ -879,30 +875,30 @@
 DocType: Activity Cost,Projects User,Projekt téma felhasználó
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Consumed,Fogyasztott
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
-DocType: Asset,Asset Owner Company,Eszközt tulajdonló vállalkozás
+DocType: Asset,Asset Owner Company,Vagyontárgy tulajdonló vállalkozás
 DocType: Company,Round Off Cost Center,Költséghely gyűjtő
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Ezt a karbantartás látogatást: {0} törölni kell mielőtt lemondaná ezt a Vevői rendelést
 DocType: Asset Maintenance Log,AML-,AML-
 DocType: Item,Material Transfer,Anyag átvitel
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nem találtam útvonalat erre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Nyitó (ÉCS.)
+DocType: Loan,Applicant,Pályázó
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kiküldetés időbélyegének ezutánina kell lennie {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Ismétlődő dokumentumok létrehozása
 ,GST Itemised Purchase Register,GST tételes beszerzés regisztráció
 DocType: Course Scheduling Tool,Reschedule,Átütemezés
-DocType: Employee Loan,Total Interest Payable,Összes fizetendő kamat
+DocType: Loan,Total Interest Payable,Összes fizetendő kamat
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
 DocType: Work Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Befejez
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Alapértelmezett
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Alapértelmezett
 DocType: Timesheet,Total Billed Hours,Összes számlázott Órák
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Leírt összeg
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Leírt összeg
 DocType: Leave Block List Allow,Allow User,Felhasználó engedélyezése
 DocType: Journal Entry,Bill No,Számlaszám
-DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla az Eszköz eltávolításán
+DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla a Vagyontárgy eltávolításán
 DocType: Vehicle Log,Service Details,Sszolgáltatás adatai
-DocType: Subscription,Quarterly,Negyedévenként
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Csoportosított
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Jelenléti ív
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Visszatartandó nyersanyagok ez alapján
 DocType: Sales Invoice,Port Code,Kikötői kód
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Raktár a lefoglalásokhoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Raktár a lefoglalásokhoz
 DocType: Lead,Lead is an Organization,Az érdeklődő egy szervezet
 DocType: Guardian Interest,Interest,Érdek
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Értékesítés előtt
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Főkönyvi számlák
 DocType: Vehicle,Odometer Value (Last),Kilométer-számláló érték (utolsó)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,A beszállító eredménymutató-kritériumainak sablonjai.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Fizetés megadása már létrehozott
 DocType: Request for Quotation,Get Suppliers,Szerezd meg a beszállítókat
 DocType: Purchase Receipt Item Supplied,Current Stock,Jelenlegi raktárkészlet
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Vagyontárgy nem kapcsolódik ehhez a tételhez {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Bérpapír előnézet
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Vagyontárgy nem kapcsolódik ehhez a tételhez {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Bérpapír előnézet
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A {0} számlát már többször bevitték
 DocType: Account,Expenses Included In Valuation,Készletértékelésbe belevitt költségek
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Csak akkor tudja megújítani, ha tagsága lejár 30 napon belül"
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Csak akkor válassza ki, ha beállította a Pénzforgalom térképező dokumentumokat"
 DocType: Email Digest,Next email will be sent on:,A következő emailt ekkor küldjük:
 DocType: Supplier Scorecard,Per Week,Hetente
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Teljes hallgató
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Tétel {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Könyvelési tétel fájlok [FEC]
 DocType: Journal Entry,Credit Card Entry,Hitelkártya bejegyzés
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Vállakozás és fiókok
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Az Értékben
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Az Értékben
 DocType: Asset Settings,Depreciation Options,Értékcsökkenési lehetőségek
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Érvénytelen kiküldési idő
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Érvénytelen kiküldési idő
 DocType: Lead,Campaign Name,Kampány neve
 DocType: Hotel Room,Capacity,Kapacitás
 DocType: Selling Settings,Close Opportunity After Days,Ügyek bezárása ennyi eltelt nap után
@@ -971,7 +967,7 @@
 DocType: Driver,License Details,Licenc részletei
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +85,The field From Shareholder cannot be blank,A Részvényes tulajdonosi mező nem lehet üres
 DocType: Purchase Order,Supply Raw Materials,Nyersanyagok beszállítása
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi tárgyi eszközök
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +133,{0} is not a stock Item,{0} nem Készletezhető tétel
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Kérjük, ossza meg visszajelzését a képzéshez az ""Oktatás visszajelzése"", majd az ""Új"" kattintva"
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Vevői beszerzési megrendelésnek száma
 DocType: Budget,Budget Against,Költségvetés ellenszámla
 DocType: Employee,Cell Number,Mobilszám
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Az adott kritériumra nincs alkalmazott. Ellenőrizze, hogy a Bérlapok még nincsenek-e létrehozva."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Az adott kritériumra nincs alkalmazott. Ellenőrizze, hogy a Bérlapok még nincsenek-e létrehozva."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Anyagigénylés létrehozott
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tudja bevinni a jelenlegi utalványt az ""Ismételt Naplókönyvelés"" oszlopba"
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Kérem, válasszon egy táblát"
 DocType: BOM,Website Specifications,Weboldal részletek
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} egy érvénytelen e-mail cím a 'Címzettek' közt
 DocType: Special Test Items,Particulars,Adatok
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Feladó {0} a {1} típusból
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Feladó {0} a {1} típusból
 DocType: Warranty Claim,CI-,GI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumokkal, kérjük megoldani konfliktust az elsőbbségek kiadásával. Ár Szabályok: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni az Anyagjegyzéket mivel kapcsolódik más Darabjegyzékekhez
 DocType: Asset,Maintenance,Karbantartás
+DocType: Subscriber,Subscriber,Előfizető
 DocType: Item Attribute Value,Item Attribute Value,Tétel Jellemző értéke
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Kérjük, frissítse a projekt téma állapotát"
 DocType: Item,Maximum sample quantity that can be retained,Maximum tárolható mintamennyiség
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alapértelmezett beállítások a Kosárhoz
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Adja hozzá az időszakaszokat
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Vagyonieszköz kiselejtezett a {0} Naplókönyvelés keresztül
-DocType: Employee Loan,Interest Income Account,Kamatbevétel főkönyvi számla
+DocType: Loan,Interest Income Account,Kamatbevétel főkönyvi számla
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Elküldött  meghívó megtekintése
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnológia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Irodai karbantartási költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Irodai karbantartási költségek
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Menjen
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-mail fiók beállítása
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Kérjük, adja meg először a tételt"
 DocType: Asset Repair,Downtime,Állásidő
 DocType: Account,Liability,Kötelezettség
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}."
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akadémiai szemeszter:
 DocType: Salary Detail,Do not include in total,Ne szerepeljen a végösszegben
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},"A minta {0} mennyisége nem lehet több, mint a kapott  {1} mennyiség"
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Árlista nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Request for Quotation Supplier,Send Email,E-mail küldése
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
 DocType: Item,Max Sample Quantity,Max minta mennyisége
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nincs jogosultság
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nincs jogosultság
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Ajánlatkérés igényelve
 DocType: Vital Signs,Heart Rate / Pulse,Pulzusszám / pulzus
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Magasabb súlyozású tételek előrébb jelennek meg
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratóriumi tesztek  és életjelek
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank egyeztetés részletek
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Vagyontárgyat kell benyújtani
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Vagyontárgyat kell benyújtani
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Egyetlen Alkalmazottat sem talált
-DocType: Subscription,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba kiadva egy beszállítóhoz
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Diák csoport már frissítve.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Diák csoport már frissítve.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projekt téma frissítés.
 DocType: SMS Center,All Customer Contact,Összes vevői Kapcsolattartó
 DocType: Land Unit,Tree Details,fa Részletek
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,KÉSZLBEJ-
 DocType: Upload Attendance,Import Attendance,Jelenlét Import
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Összes tétel csoport
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikusan ír üzenetet a benyújtott  tranzakciókra.
 DocType: Work Order,Item To Manufacture,Tétel gyártáshoz
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} állapota {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Újra válassza ki, ha a kiválasztott cím szerkesztésre került a mentés után"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
 DocType: Item,Hub Publishing Details,Hub közzétételének részletei
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Nyitás"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Nyitás"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Teendő megnyitása
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
 DocType: Lab Test Template,Result Format,Eredmény formátum
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Kéthavonta
 DocType: Vehicle Service,Brake Pad,Fékbetét
 DocType: Fertilizer,Fertilizer Contents,Műtrágya összetétele
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Kutatás és fejlesztés
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Kutatás és fejlesztés
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Számlázandó összeget
 DocType: Company,Registration Details,Regisztrációs adatok
 DocType: Timesheet,Total Billed Amount,Összesen kiszámlázott összeg
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Hitelkeretellenőrzés áthidalás a vevői rendelésnél
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Teljesítményértékelési rendszer.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","A 'Kosár használata' engedélyezése, mint kosár bekapcsolása, mely mellett ott kell lennie legalább egy adó szabálynak a Kosárra vonatkozólag"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetés megadása {0} kapcsolódik ehhez a Rendeléshez {1}, jelülje be, ha ezen a számlán előlegként kerül lehívásra."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetés megadása {0} kapcsolódik ehhez a Rendeléshez {1}, jelülje be, ha ezen a számlán előlegként kerül lehívásra."
 DocType: Sales Invoice Item,Stock Details,Készlet Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt téma érték
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Értékesítés-hely-kassza
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimum ülések száma
 DocType: Item Attribute,Item Attribute Values,Tétel Jellemző értékekben
 DocType: Examination Result,Examination Result,Vizsgálati eredmény
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Beszerzési megrendelés nyugta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Beszerzési megrendelés nyugta
 ,Received Items To Be Billed,Számlázandó Beérkezett tételek
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Pénznem árfolyam törzsadat arányszám.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referencia Doctype közül kell {0}
@@ -1210,17 +1204,17 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Időkeret a következő {0} napokra erre a műveletre: {1}
 DocType: Work Order,Plan material for sub-assemblies,Terv anyag a részegységekre
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vevő partnerek és Területek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nem áll rendelkezésre tétel az átadásra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nem áll rendelkezésre tétel az átadásra
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Záró (nyitó + összes)
 DocType: Journal Entry,Depreciation Entry,ÉCS bejegyzés
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát először"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Törölje az anyag szemlét: {0}mielőtt törölné ezt a karbantartási látogatást
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 szabvány
 DocType: Pricing Rule,Rate or Discount,Árérték vagy kedvezmény
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Széria sz {0} nem tartozik ehhez a tételhez {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Széria sz {0} nem tartozik ehhez a tételhez {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Érdekes
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Kedvencek
 DocType: Hub Settings,Custom Data,Egyéni adatok
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügyletekkel nem konvertálható főkönyvi tétellé.
 DocType: Bank Reconciliation,Total Amount,Összesen
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Orvosi kódex standard
 DocType: Soil Texture,Clay Composition (%),Agyag összetétel (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Kérjük, mentsen a feladat hozzárendelése előtt."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Mérleg Érték
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Mérleg Érték
 DocType: Lab Test,Lab Technician,Laboratóriumi technikus
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Értékesítési árlista
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ha be van jelölve, létrejön egy ügyfél, amely a Betegre van leképezve. Beteg számlákat hoz létre erre az Ügyfélre. Kiválaszthatja a meglévő ügyfelet is, amikor létrehozza a betegeket."
 DocType: Bank Reconciliation,Account Currency,A fiók pénzneme
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Kérjük említse meg a Gyűjtőt számlát a Vállalkozáson bellül
 DocType: Purchase Receipt,Range,Tartomány
 DocType: Supplier,Default Payable Accounts,Alapértelmezett kifizetendő számlák
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
 DocType: Fee Structure,Components,Alkatrészek
 DocType: Item Barcode,Item Barcode,Elem vonalkódja
-DocType: Woocommerce Settings,Endpoints,végpontok
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Tétel változatok {0} frissített
+DocType: Woocommerce Settings,Endpoints,Végpontok
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy kategóriát ebben a tételben: {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Tétel változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","generálni kell. Ha késlelteti, akkor manuálisan meg kell változtatni az ""ismétlés napja"" mezőt"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
 DocType: Share Transfer,From Folio No,Folio sz
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Beszállítói előleg számla
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},{0} sor: jóváírást bejegyzés nem kapcsolódik ehhez {1}
@@ -1259,7 +1251,7 @@
 DocType: Work Order Operation,Operation completed for how many finished goods?,"Művelet befejeződött, hány késztermékkel?"
 DocType: Payment Terms Template,Payment Terms Template,Fizetési feltételek sablonja
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,A márka
-DocType: Manufacturing Settings,Allow Multiple Material Consumption,Több anyagfelhasználás engedélyezése
+DocType: Manufacturing Settings,Allow Multiple Material Consumption,Többféle anyagfelhasználás engedélyezése
 DocType: Employee,Exit Interview Details,Interjú részleteiből kilépés
 DocType: Item,Is Purchase Item,Ez beszerzendő tétel
 DocType: Journal Entry Account,Purchase Invoice,Beszállítói számla
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Felhasználhatóság dátuma
 DocType: Guardian,Guardian Name,Helyettesítő neve
 DocType: Cheque Print Template,Has Print Format,Rendelkezik nyomtatási formátummal
-DocType: Employee Loan,Sanctioned,Szankcionált
+DocType: Loan,Sanctioned,Szankcionált
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán nincs létrehozva Pénzváltó rekord ehhez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Sor # {0}: Kérjük adjon meg Szériaszámot erre a Tételre: {1}
 DocType: Crop Cycle,Crop Cycle,Termés ciklusa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'Termék köteg' tételeknek, raktárnak, Széria számnak és Köteg számnak fogják tekinteni a 'Csomagolási lista' táblázatból. Ha a Raktár és a Köteg szám egyezik az összes 'Tétel csomag' tételre, ezek az értékek bekerülnek a fő tétel táblába, értékek átmásolásra kerülnek a 'Csomagolási lista' táblázatba."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","'Termék köteg' tételeknek, raktárnak, Széria számnak és Köteg számnak fogják tekinteni a 'Csomagolási lista' táblázatból. Ha a Raktár és a Köteg szám egyezik az összes 'Tétel csomag' tételre, ezek az értékek bekerülnek a fő tétel táblába, értékek átmásolásra kerülnek a 'Csomagolási lista' táblázatba."
 DocType: Student Admission,Publish on website,Közzéteszi honlapján
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,"Beszállítói Számla dátuma nem lehet nagyobb, mint Beküldés dátuma"
+DocType: Subscription,Cancelation Date,Lemondási dátum
 DocType: Purchase Invoice Item,Purchase Order Item,Beszerzési megrendelés tétel
 DocType: Agriculture Task,Agriculture Task,Mezőgazdaság feladat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Közvetett jövedelem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Közvetett jövedelem
 DocType: Student Attendance Tool,Student Attendance Tool,Tanuló nyilvántartó eszköz
 DocType: Restaurant Menu,Price List (Auto created),Árlista (automatikusan  létrehozva)
 DocType: Cheque Print Template,Date Settings,Dátum beállítások
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Méter
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,A laboratóriumi tesztidő  dátuma nem lehet a gyűjtési adatidő dátuma előtti
+DocType: Subscription Plan,Cost,Költség
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön alkalmazotti születésnap emlékeztetőt
 DocType: Expense Claim,Total Advance Amount,Összes előleg összege
 DocType: Delivery Stop,Estimated Arrival,Várható érkezés
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Kérjük töltse fel levele fejlécét és logo-ját. (Ezeket később szerkesztheti).
 DocType: Timesheet Detail,Bill,Számla
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Fehér
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Fehér
 DocType: SMS Center,All Lead (Open),Összes Érdeklődés (Nyitott)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Sor {0}: Mennyiség nem áll rendelkezésre {4} raktárban {1} a kiküldetés idején a bejegyzést ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Legfeljebb egy lehetőséget jelölhet ki a jelölőnégyzetek listájából.
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
 DocType: Item,Automatically Create New Batch,Automatikus Új köteg létrehozás
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} hozzárendelése ehhez: {1} (row {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Létrehoz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} hozzárendelése ehhez: {1} (row {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Létrehoz
 DocType: Student Admission,Admission Start Date,Felvételi kezdési dátum
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Új munkavállaló
@@ -1353,10 +1347,10 @@
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
 DocType: Repayment Schedule,Balance Loan Amount,Hitel összeg mérlege
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Menetrend pálya
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Készlet lehetőségek
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Készlet lehetőségek
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Letiltja az utolsó vásárlási adatok lekérését a vevői megbízásban
 DocType: Journal Entry Account,Expense Claim,Költség igény
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Tényleg szeretné visszaállítani ezt a kiselejtezett eszközt?
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Tényleg szeretné visszaállítani ezt a kiselejtezett Vagyontárgyat?
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +402,Qty for {0},Mennyiség ehhez: {0}
 DocType: Leave Application,Leave Application,Távollét alkalmazás
 DocType: Patient,Patient Relation,Beteg kapcsolata
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
 DocType: Purchase Invoice,Cash/Bank Account,Készpénz / Bankszámla
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Kérjük adjon meg egy {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás címzett
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,A változat létrehozása sorba állítva.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Munkaösszegzés ehhez: {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Jellemzők tábla kötelező
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,A listában az első Hitelengedélyező lesz az alapértelmezett Hobozengedély.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Jellemzők tábla kötelező
 DocType: Production Plan,Get Sales Orders,Vevő rendelések lekérése
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nem lehet negatív
 DocType: Training Event,Self-Study,Önálló tanulás
@@ -1388,10 +1383,10 @@
 DocType: Workstation,Wages,Munkabér
 DocType: Asset Maintenance,Maintenance Manager Name,Karbantartási vezető neve
 DocType: Agriculture Task,Urgent,Sürgős
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Kérjük adjon meg egy érvényes Sor ID azonosítót ehhez a sorhoz {0}, ebben a  táblázatban {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Kérjük adjon meg egy érvényes Sor ID azonosítót ehhez a sorhoz {0}, ebben a  táblázatban {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nem sikerült megtalálni a változót:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Kérjük, válasszon ki egy mezőt a számjegyből történő szerkesztéshez"
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nem lehet állandó eszköz tétel, mivel a készletlista létrehozásra kerül."
+apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nem lehet álló eszköz tétel, mivel a készletlista létrehozásra kerül."
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ugrás az asztalra és kezdje el használni az ERPNext rendszert
 DocType: Item,Manufacturer,Gyártó
 DocType: Landed Cost Item,Purchase Receipt Item,Beszerzési megrendelés nyugta tétel
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Minőségi ellenőrzési sablonjának neve
 DocType: Project,First Email,Első e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Raktár a lefoglalásokhoz a Vevői rendelésben / készáru raktárban
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Értékesítési összeg
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Értékesítési összeg
 DocType: Repayment Schedule,Interest Amount,Kamatösszeg
 DocType: Serial No,Creation Document No,Létrehozott Dokumentum sz.
 DocType: Share Transfer,Issue,Probléma
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Szállítási állam
 ,Projected Quantity as Source,"Tervezett mennyiségét , mint forrás"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Tételt kell hozzá adni a 'Tételek beszerzése a Beszerzési bevételezések' gomb használatával
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Szállítási út
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Szállítási út
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Átviteli típus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Értékesítési költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Értékesítési költségek
 DocType: Consultation,Diagnosis,Diagnózis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Alapértelmezett beszerzési
 DocType: GL Entry,Against,Ellen
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Irányítószám
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Válassza ki a kamatjövedelem számlát {0}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Készlet bejegyzés létrehozás
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
 DocType: Item,Default Supplier,Alapértelmezett beszállító
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Túltermelés engedélyezés százaléka
-DocType: Employee Loan,Repayment Schedule,Törlesztés ütemezése
+DocType: Loan,Repayment Schedule,Törlesztés ütemezése
 DocType: Shipping Rule Condition,Shipping Rule Condition,Szállítás szabály feltételei
 DocType: Holiday List,Get Weekly Off Dates,Heti távollétek lekérdezése
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint az elkezdés dátuma"
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Átlagéletkor
 DocType: Education Settings,Attendance Freeze Date,Jelenlét zárolás dátuma
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány beszállítót. Ők lehetnek szervezetek vagy magánszemélyek.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Az összes termék megtekintése
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Az összes termék megtekintése
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Érdeklődés minimum kora (napok)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,minden anyagjegyzéket
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0} típusú szállodai szobák nem állnak rendelkezésre ekkor: {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,Alkalmazottól
 DocType: Driver,Cellphone Number,Mobiltelefon szám
 DocType: Project,Monitor Progress,Folyamatok nyomonkövetése
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Figyelmeztetés: A rendszer nem ellenőrzi a túlszámlázást, hiszen a {0} tételre itt {1} az összeg nulla"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Figyelmeztetés: A rendszer nem ellenőrzi a túlszámlázást, hiszen a {0} tételre itt {1} az összeg nulla"
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
+DocType: Supplier Quotation,Auto Repeat Section,Automatikus ismétlés szakasz
 DocType: Upload Attendance,Attendance From Date,Részvétel kezdő dátum
 DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület
 DocType: Program Enrollment,Transportation,Szállítás
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Érvénytelen Jellemző
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} be kell nyújtani
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Mennyiségnek kisebb vagy egyenlő legyen mint {0}
+DocType: Department Approver,Department Approver,Tanszék-jóváhagyó
 DocType: SMS Center,Total Characters,Összes karakterek
 DocType: Employee Advance,Claimed,Igényelt
 DocType: Crop,Row Spacing,Sor elosztás
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fizetés főkönyvi egyeztető Számla
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Hozzájárulás%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","A vevői beállítások szerint ha Megrendelés szükséges == 'IGEN', akkor vásárlást igazoló számla létrehozására, a felhasználónak először létre kell hoznia Vevői megrendelést erre a tételre: {0}"
+,HSN-wise-summary of outward supplies,HSN-bővebb összefoglaló a külső felszerelésekről
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,A Válallkozás regisztrációs számai. Pl.: adószám; stb.
 DocType: Sales Partner,Distributor,Forgalmazó
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Bevásárló kosár Szállítási szabály
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Művelet neve
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Kezdő év
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN első 2 számjegyének egyeznie kell az állam számával: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Kezdési időpont az aktuális számla időszakra
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli távollét
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapacitás tervezés hiba
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,A mezők csak a létrehozás idején lesznek átmásolva.
 DocType: Setup Progress Action,Domains,Domének
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Tényleges kezdési dátum' nem lehet nagyobb, mint a 'Tényleges záró dátum'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Vezetés
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Vezetés
 DocType: Cheque Print Template,Payer Settings,Fizetői beállítások
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
 DocType: Purchase Invoice,Is Return,Ez visszáru
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Vigyázat
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',"A kezdő nap nagyobb, mint a végső nap a: {0} feladatnál"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Vissza / terhelési értesítés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Vissza / terhelési értesítés
 DocType: Price List Country,Price List Country,Árlista Országa
 DocType: Item,UOMs,Mértékegységek
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Tételkódot nem lehet lecserélni Széria számmá
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Tételkódot nem lehet lecserélni Széria számmá
 DocType: Purchase Invoice Item,UOM Conversion Factor,ME konverziós tényező
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Kérjük, adja meg a tételkódot, hogy megkapja a köteg számot"
 DocType: Stock Settings,Default Item Group,Alapértelmezett tételcsoport
-DocType: Employee Loan,Partially Disbursed,Részben folyosított
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Támogatás információi.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Támogatás információi.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Beszállító adatbázisa.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Nem indíthatja el az Előfizetést, amelyet nem törölt."
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
 DocType: Fee Validity,Valid Till,Eddig érvényes
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Összes Szülő a szülői értekezleten
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Az Ügyfélcsoport megváltoztatása a kiválasztott Ügyfél számára nem engedélyezett.
 ,Purchase Order Items To Be Billed,Számlázandó Beszerzési rendelés tételei
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Becsült érkezési idők frissítése.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Becsült érkezési idők frissítése.
 DocType: Program Enrollment Tool,Enrollment Details,Beiratkozások részletei
 DocType: Purchase Invoice Item,Net Rate,Nettó árérték
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,"Kérjük, válasszon ki egy vevőt"
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Purchase Order,Group same items,Csoport azonos elemei
 DocType: Purchase Invoice,Disable Rounded Total,Kerekített összesen elrejtése
-DocType: Employee Loan Application,Repayment Info,Törlesztési Info
+DocType: Department,Parent Department,Szülői osztály
+DocType: Loan Application,Repayment Info,Törlesztési Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 DocType: Maintenance Team Member,Maintenance Role,Karbantartási szerep
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},{0} ismétlődő sor azonos ezzel: {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},{0} ismétlődő sor azonos ezzel: {1}
 ,Trial Balance,Főkönyvi kivonat egyenleg
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Pénzügyi év {0} nem található
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Pénzügyi év {0} nem található
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Alkalmazottak beállítása
 DocType: Sales Order,SO-,VR-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel foglalás felhasználó
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Kérjük, válasszon prefix először"
 DocType: Student,O-,ALK-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Kutatás
+DocType: Subscription Settings,Subscription Settings,Előfizetési beállítások
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Kutatás
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Kérjük adjon meg legalább egy Jellemzőt a Jellemzők táblázatban
 DocType: Announcement,All Students,Összes diák
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
 DocType: Crop Cycle,Less than a year,"Kevesebb, mint egy év"
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Tanuló Mobil sz.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
 DocType: Crop,Yield UOM,Hozam ME
 ,Budget Variance Report,Költségvetés variáció jelentés
 DocType: Salary Slip,Gross Pay,Bruttó bér
 DocType: Item,Is Item from Hub,Ez a tétel a Hub-ból
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Sor {0}: tevékenység típusa kötelező.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Fizetett osztalék
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Fizetett osztalék
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Számviteli Főkönyvi kivonat
 DocType: Stock Reconciliation,Difference Amount,Eltérés összege
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} távolléten van a következő időpontban: {1}
 DocType: Purchase Invoice,Reverse Charge,Fordított adózás
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Eredménytartalék
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Eredménytartalék
 DocType: Purchase Invoice,05-Change in POS,05-Változás a POS pénztárban
 DocType: Vehicle Log,Service Detail,Szolgáltatás részletei
 DocType: BOM,Item Description,Az anyag leírása
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
 ,Student and Guardian Contact Details,Diák- és Helyettesítő Elérhetőségek
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,{0} sor: A beszállító {0} e-mail címe szükséges e-mail küldéshez
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ideiglenes nyitó
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Ideiglenes nyitó
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Hub megtekintése
 ,Employee Leave Balance,Alkalmazott távollét egyenleg
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Mérlegek a {0} számlákhoz legyenek mindig {1}
 DocType: Patient Appointment,More Info,További információk
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Készletérték ár szükséges a tételhez ebben a sorban: {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Készletérték ár szükséges a tételhez ebben a sorban: {0}
 DocType: Supplier Scorecard,Scorecard Actions,Mutatószám műveletek
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Példa: Számítógépes ismeretek törzsadat
 DocType: Purchase Invoice,Rejected Warehouse,Elutasított raktár
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,részére
 DocType: Supplier Quotation Item,Lead Time in days,Érdeklődés ideje napokban
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,A beszállítók felé fizetendő kötelezettségeink összefoglalása
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Bér kifizetése ettől {0} eddig {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Bér kifizetése ettől {0} eddig {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlát {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fennálló negatív kintlévő számlák lekérdezése
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratóriumi teszt rendelvények
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","A teljes Probléma / Átvitt mennyiség {0} ebben az Anyaga igénylésben: {1} \ nem lehet nagyobb, mint az igényelt mennyiség: {2} erre a tételre: {3}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Kis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Kis
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Számlát létrehozó eszköz tételének megnyitása
 DocType: Education Settings,Employee Number,Alkalmazott száma
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Lemondja a számlát a türelmi idő után
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Eset szám(ok) már használatban vannak. Próbálja ettől az esetszámtól: {0}
 DocType: Project,% Completed,% kész
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Adó nélkül)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratóriumi tesztelés dátuma
 DocType: Email Digest,Add Quote,Idézet hozzáadása
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},ME átváltási tényező szükséges erre a mértékegységre: {0} ebben a tételben: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Közvetett költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Sor {0}: Menny. kötelező
 DocType: Agriculture Analysis Criteria,Agriculture,Mezőgazdaság
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Törzsadatok szinkronizálása
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0} -hoz, csak jóváírási számlákat lehet kapcsolni a másik ellen terheléshez"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Alap Felszereltség
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Alap Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,"Kérjük, először állítsa be a tételkódot"
 DocType: Item,ITEM-,TÉTEL-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Az értékesítési csoport teljes lefoglalt százaléka  100 kell legyen
+DocType: Subscription Plan,Billing Interval Count,Számlázási időtartam
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,Csoport frissítések
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Beszállítónak
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Beszállítónak
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Számla típus beállítása segít kiválasztani ezt a számlát a tranzakcióban.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Nyomtatási formátum létrehozása
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS tétel csoport
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,"Az alternatív elem nem lehet ugyanaz, mint az elem kódja"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
 DocType: Sales Partner,Target Distribution,Cél felosztás
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Ideiglenes értékelés véglegesítése
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Munkaállomás
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beszállítói Árajánlatkérés
 DocType: Healthcare Settings,Registration Message,Regisztrációs üzenet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardver
 DocType: Prescription Dosage,Prescription Dosage,Vényköteles adagolás
 DocType: Attendance,HR Manager,HR menedzser
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Kérjük, válasszon egy vállalkozást"
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Kezdetének és befejezésének időpontjai
 ,Delivered Items To Be Billed,Számlázandó kiszállított tétel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Anyagj.: {0} megnyitása
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
 DocType: Project Update,Great/Quickly,Nagy/Gyorsan
 DocType: Purchase Invoice Item,UOM,ME
@@ -1762,18 +1765,19 @@
 DocType: Employee,EMP/,ALK /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Kérjük, válasszon köteget a kötegelt tételhez"
 DocType: Asset,Depreciation Schedules,Értékcsökkentési ütemezések
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,A következő fiókok kiválaszthatók a GST beállításokban:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,A következő fiókok kiválaszthatók a GST beállításokban:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre
 DocType: Activity Cost,Projects,Projekt témák
 DocType: Payment Request,Transaction Currency,Tranzakció pénzneme
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Feladó: {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +341,Removed from Favourites,Eltávolítva a Kedvencekből
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +341,Removed from Favourites,Eltávolítva a kedvencekből
 DocType: Work Order Operation,Operation Description,Művelet Leírása
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nem lehet megváltoztatni a pénzügyi év kezdő és vég dátumát, miután a pénzügyi év mentésre került."
 DocType: Quotation,Shopping Cart,Bevásárló kosár
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Átlag napi kimenő
 DocType: POS Profile,Campaign,Kampány
 DocType: Supplier,Name and Type,Neve és típusa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Elfogadás állapotának ""Jóváhagyott"" vagy ""Elutasított"" kell lennie"
 DocType: Physician,Contacts and Address,Kapcsolatok és címek
 DocType: Purchase Invoice,Contact Person,Kapcsolattartó személy
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Várható kezdés időpontja"" nem lehet nagyobb, mint a ""Várható befejezés időpontja"""
@@ -1785,21 +1789,22 @@
 DocType: Item,Maintain Stock,Készlet karbantartás
 DocType: Employee,Prefered Email,Preferált e-mail
 DocType: Student Admission,Eligibility and Details,Jogosultság és részletek
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Nettó állóeszköz változás
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Nettó álló-eszköz változás
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe veszi valamennyi titulushoz"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dátumtól
 DocType: Email Digest,For Company,A Vállakozásnak
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikációs napló.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ajánlatkérés le van tiltva a portálon keresztüli hozzáférésre, továbbiakhoz ellenőrizze a portál beállításokat."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Beszállító mutatószámok pontozási változója
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Beszerzési mennyiség
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Beszerzési mennyiség
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím neve
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hiba történt a kurzus ütemezés során
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,A listában szereplő első kiadási jóváhagyó az alapértelmezett költség-jóváhagyó.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,"nem lehet nagyobb, mint 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulajdon
 DocType: Salary Detail,Depends on Leave Without Pay,Fizetés nélküli távolléttől függ
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,Csomag kód
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Gyakornok
 DocType: Purchase Invoice,Company GSTIN,Vállalkozás GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Adó részletek táblázatot betölti a törzsadat tételtből szóláncként, és ebben a mezőben tárolja. Adókhoz és illetékekhez használja"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Alkalmazott nem jelent magának.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Alkalmazott nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések engedélyezettek korlátozott felhasználóknak."
 DocType: Email Digest,Bank Balance,Bank mérleg
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Engedélyezze a jóváhagyónak a szabadságra vonatkozó kérelmet
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Adó szabály a tranzakciókra.
@@ -1848,22 +1854,22 @@
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Hulladék anyagköltség (Vállaklozás pénzneme)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +66,Sub Assemblies,Részegységek
-DocType: Asset,Asset Name,Vagyonieszköz neve
+DocType: Asset,Asset Name,Vagyontárgy neve
 DocType: Project,Task Weight,Feladat súlyozás
 DocType: Shipping Rule Condition,To Value,Értékeléshez
 DocType: Asset Movement,Stock Manager,Készlet menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Forrás raktára kötelező ebben a sorban {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,A(z) {0} sorban szereplő fizetési feltétel valószínűleg másodpéldány.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Mezőgazdaság (béta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Csomagjegy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Iroda bérlés
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS átjáró telepítése
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Iroda bérlés
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,SMS átjáró telepítése
 DocType: Disease,Common Name,Gyakori név
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nem lett még cím hozzá adva.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
 DocType: Vital Signs,Blood Pressure,Vérnyomás
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Elemző
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Elemző
 DocType: Item,Inventory,Leltár
 DocType: Item,Sales Details,Értékesítés részletei
 DocType: Quality Inspection,QI-,MINVIZS-
@@ -1873,20 +1879,20 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Érvényesítse letárolt pálya diákok számára Csoport
 DocType: Notification Control,Expense Claim Rejected,Költség igény elutasítva
 DocType: Item,Item Attribute,Tétel Jellemző
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Kormány
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Kormány
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Költség igény {0} már létezik a Gépjármű naplóra
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Intézmény neve
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Kérjük, adja meg törlesztés összegét"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Kérjük, adja meg törlesztés összegét"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Tétel változatok
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Szervíz szolgáltatások
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Bérpapír nyomtatvány az alkalmazottnak
 DocType: Cost Center,Parent Cost Center,Fő költséghely
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Válasszon lehetséges beszállítót
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Válasszon lehetséges beszállítót
 DocType: Sales Invoice,Source,Forrás
 DocType: Customer,"Select, to make the customer searchable with these fields","Válassza a lehetőséget, hogy a vevőt kereshesse ezekkel a mezőkkel"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mutassa zárva
 DocType: Leave Type,Is Leave Without Pay,Ez fizetés nélküli szabadság
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
+apps/erpnext/erpnext/stock/doctype/item/item.py +261,Asset Category is mandatory for Fixed Asset item,Vagyontárgy Kategória kötelező befektetett eszközök tételeire
 DocType: Fee Validity,Fee Validity,Díj érvényessége
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,Nem talált bejegyzést a fizetési táblázatban
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},Ez {0} ütközik ezzel {1} ehhez {2} {3}
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Pénzforgalom befektetésből
 DocType: Program Course,Program Course,Program pálya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Árufuvarozási és szállítmányozási költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Árufuvarozási és szállítmányozási költségek
 DocType: Homepage,Company Tagline for website homepage,Válallkozás jelmondata az internetes honlapon
 DocType: Item Group,Item Group Name,Anyagcsoport neve
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lefoglalva
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Tagság részletei
 DocType: Leave Block List,Block Holidays on important days.,Zárolt Ünnepek a fontos napokon.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),"Kérjük, adja meg az összes szükséges eredményértéket"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Vevőtartozás bevétel Összefoglalója
-DocType: Employee Loan,Monthly Repayment Amount,Havi törlesztés összege
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Vevőtartozás bevétel Összefoglalója
+DocType: Loan,Monthly Repayment Amount,Havi törlesztés összege
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Számlák megnyitása
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa be a Felhasználói azonosító ID mezőt az alkalmazotti bejegyzésen az Alkalmazott beosztásának beállításához"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa be a Felhasználói azonosító ID mezőt az alkalmazotti bejegyzésen az Alkalmazott beosztásának beállításához"
 DocType: UOM,UOM Name,Mértékegység neve
 DocType: GST HSN Code,HSN Code,HSN kód
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Támogatás mértéke
@@ -1939,7 +1945,7 @@
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ez az eszköz segít frissíteni vagy kijavítani a mennyiséget és a raktári tétel értékelést a rendszerben. Ez tipikusan a rendszer szinkronizációjához használja és mi létezik  valóban a raktárakban.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"A szavakkal mező lesz látható, miután mentette a szállítólevelet."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Ellenőrzött Webhook adatok
+apps/erpnext/erpnext/erpnext_integrations/connectors/woocommerce_connection.py +21,Unverified Webhook Data,Ellenőrizetlen Webhook adatok
 DocType: Water Analysis,Container,Tartály
 apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Tanuló {0} - {1} többször is megjelenik ezekben a sorokban {2} & {3}
 DocType: Item Alternative,Two-way,Kétirányú
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},A(z) {0} felhasználó már hozzárendelve a(z) orvoshoz: {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Doboz
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Lehetséges Beszállító
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Lehetséges Beszállító
+DocType: Journal Entry,JV-RET-,JV-lének
 DocType: Budget,Monthly Distribution,Havi Felbontás
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Vevő lista üres. Kérjük, hozzon létre Receiver listája"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Egészségügy (béta)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nincsenek tételek csomagoláshoz
 DocType: Shipping Rule Condition,From Value,Értéktől
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
-DocType: Employee Loan,Repayment Method,Törlesztési mód
+DocType: Loan,Repayment Method,Törlesztési mód
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ha be van jelölve, a Kezdőlap lesz az alapértelmezett tétel csoport a honlapján"
 DocType: Quality Inspection Reading,Reading 4,Olvasás 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Garanciális igény a vállalkozás költségén.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Tanusítvány szükséges
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},{0} sor: Időtől és időre {1} átfedésben van {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Készlet források (kötelezettségek)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Készlet források (kötelezettségek)
 DocType: Purchase Invoice,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Vállalkozás kiválasztása
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,Nyomtatási szakasz
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,A(z) {0} felhasználónak nincs alapértelmezett POS profilja. Ellenőrizze ehhez a felhasználóhoz az alapértelmezett értéket a {1} sorban.
 DocType: Student Group,Set 0 for no limit,Állítsa 0 = nincs korlátozás
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok), amelyre benyújtotta a távollétét azok ünnepnapok. Nem kell igényelni a távollétet."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok), amelyre benyújtotta a távollétét azok ünnepnapok. Nem kell igényelni a távollétet."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,{idx} sor: {field} szükséges a nyitó {invoice_type} számlák létrehozásához
 DocType: Customer,Primary Address and Contact Detail,Elsődleges cím és kapcsolatfelvétel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra a Fizetési E-mailt
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,"Kérjük, válasszon legalább egy domaint."
 DocType: Dependent Task,Dependent Task,Függő feladat
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},"Távollét típusa {0}, nem lehet hosszabb, mint {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},"Távollét típusa {0}, nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbáljon tervezni tevékenységet  X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
 DocType: SMS Center,Receiver List,Vevő lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Tétel keresése
 DocType: Payment Schedule,Payment Amount,Kifizetés összege
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,Osztályozás időszak
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Már elkészült
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Raktárról
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Raktárról
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import sikeres!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Kifizetési kérelem már létezik: {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Problémás tételek költsége
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
 DocType: Customer,Customer POS Id,Vevő POS azon
 DocType: Account,Account Name,Számla név
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"Dátumtól nem lehet nagyobb, mint dátumig"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Szériaszám: {0} és mennyiség: {1} nem lehet törtrész
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Adja meg a Woocommerce kiszolgáló URL-jét
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,"Dátumtól nem lehet nagyobb, mint dátumig"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Szériaszám: {0} és mennyiség: {1} nem lehet törtrész
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Kérjük, adja meg a Woocommerce kiszolgáló URL-jét"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Beszállító típus törzsadat.
 DocType: Purchase Order Item,Supplier Part Number,Beszállítói alkatrész szám
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Váltási arány nem lehet 0 vagy 1
 DocType: Share Balance,To No,Nem
-DocType: Subscription,Reference Document,referenciadokumentum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
 DocType: Accounts Settings,Credit Controller,Követelés felügyelője
-DocType: Grant Application,Applicant Type,Kérelmezői típus
+DocType: Loan,Applicant Type,Kérelmezői típus
 DocType: Purchase Invoice,03-Deficiency in services,03-Szolgáltatások hiányosságai
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
 DocType: Healthcare Settings,Default Medical Code Standard,Alapértelmezett orvosi kódex szabvány
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% számlázott
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Lefoglalt mennyiség
 DocType: Party Account,Party Account,Ügyfél számlája
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Emberi erőforrások HR
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Emberi erőforrások HR
 DocType: Lead,Upper Income,Magasabb jövedelem
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Elutasít
 DocType: Journal Entry Account,Debit in Company Currency,Tartozik a vállalat pénznemében
 DocType: BOM Item,BOM Item,Anyagjegyzék tétel
 DocType: Appraisal,For Employee,Alkalmazottnak
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Folyósítási bejegyzés létrehozása
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Folyósítási bejegyzés létrehozása
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Sor {0}: Beszálító előlegénak terhelésnek kell lennie
 DocType: Company,Default Values,Alapértelmezett értékek
 DocType: Membership,INR,INR
@@ -2068,12 +2074,12 @@
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ennek alapja a naplók ehhez a járműhöz. Lásd az alábbi idővonalat a részletehez
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árlista
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +322,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +322,Asset Movement record {0} created,Vagyontárgy mozgás bejegyzés {0} létrehozva
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Már létezik egy azonos nevű vásárló
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +185,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ez Bérpapírt küld és létrehoz egy aktuális naplóbejegyzést. Akarod folytatni?
 DocType: Purchase Invoice,Total Net Weight,Teljes nettó súly
-DocType: Purchase Order,Order Confirmation No,Megrendelés megerősítő száma
+DocType: Purchase Order,Order Confirmation No,Megrendelés visszaigazolás száma
 DocType: Purchase Invoice,Eligibility For ITC,Jogosultság az ITC használatára
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Vevőkövetelés egyenleg
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Összesen (adó nélkül/nettó)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Érdeklődés számláló
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0} nagyobbnak kell lennie, mint 0"
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Raktáron lévő
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Raktáron lévő
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés enyi időre (napok)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beszerzés
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,"Egyik tételnek sem változott mennyisége, illetve értéke."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,"Egyik tételnek sem változott mennyisége, illetve értéke."
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Kötelező mező - Program
 DocType: Special Test Template,Result Component,Eredmény összetevő
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Jótállási igény
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távolléteket
 DocType: Sales Invoice,Packed Items,Csomag tételei
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancia igény ehhez a Széria számhoz
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Összesen'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Összesen'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,15 +2135,15 @@
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,A művelet megerősítése
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online aukciók
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg vagy a mennyiséget vagy Készletérték árat, vagy mindkettőt"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg vagy a mennyiséget vagy Készletérték árat, vagy mindkettőt"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Teljesítés
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Megtekintés a kosárban
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Tétel Hiány jelentés
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,"Nem hozhatók létre szabványos kritériumok. Kérjük, nevezze át a kritériumokat"
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyag igénylést használják ennek a Készlet bejegyzésnek a létrehozásához
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új Vagyontárgy eszközhöz
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Külön tanfolyam mindegyik köteg csoportja alapján
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Egy darab a tételből.
 DocType: Fee Category,Fee Category,Díj kategória
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,Sablonok lekérdezése
 DocType: Material Request,Transferred,Átvitt
 DocType: Vehicle,Doors,Ajtók
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext telepítése befejeződött!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext telepítése befejeződött!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Beteg regisztrációjához gyújtött díjak
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,"Az attribútumok nem módosíthatók a készletesítés után. Készítsen egy új tételt, és hozzon át készletet az új tételre"
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,"Az attribútumok nem módosíthatók a készletesítés után. Készítsen egy új tételt, és hozzon át készletet az új tételre"
 DocType: Course Assessment Criteria,Weightage,Súlyozás
 DocType: Purchase Invoice,Tax Breakup,Adó megszakítás
 DocType: Packing Slip,PS-,CSOMJ-
@@ -2193,11 +2199,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Összeegyeztetni JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Purchase Invoice Item,Batch No,Kötegszám
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Munkavállalói előlegek
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Többszöri Vevő rendelések engedélyezése egy Beszerzési megrendelés ellen
 DocType: Student Group Instructor,Student Group Instructor,Diák csoport oktató
 DocType: Grant Application,Assessment  Mark (Out of 10),Értékelés jelölés (10-ből)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Helyettesítő2 Mobil szám
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Változat
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sorozat számozás előtag beállítása a  tranzakciókhoz
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
@@ -2206,15 +2213,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség tőle mező kitöltése kötelező
 DocType: Email Digest,Annual Expenses,Éves költségek
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Beszerzési rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Beszerzési rendelés létrehozás
 DocType: SMS Center,Send To,Küldés Címzettnek
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nincs elég távollét egyenlege ehhez a távollét típushoz {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nincs elég távollét egyenlege ehhez a távollét típushoz {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
 DocType: Sales Team,Contribution to Net Total,Hozzájárulás a netto összeghez
 DocType: Sales Invoice Item,Customer's Item Code,Vevői tétel cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
 DocType: Territory,Territory Name,Terület neve
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,"Munkavégzés raktárra van szükség, beküldés előtt"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,"Csak olyan előfizetési számlázási ciklusú terveket vehet igénybe, amelyeknek előfizetői számlázási ciklusa van"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kérelmező erre a munkahelyre.
 DocType: Purchase Order Item,Warehouse and Reference,Raktár és Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Törvényes info és más általános információk a Beszállítóról
@@ -2223,10 +2231,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik egyeztetett {1} bejegyzéssel
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Értékeléséből
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Képzési események
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Ismétlődő sorozatszám lett beírva ehhez a tételhez: {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Ismétlődő sorozatszám lett beírva ehhez a tételhez: {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Érdeklődések nyomon követése az érdeklődés forrásból.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Egy Szállítási szabály feltételei
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Kérlek lépj be
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Kérlek lépj be
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Karbantartás napló
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Kérjük, adja meg a szűrési feltételt a tétel vagy  Raktár alapján"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),A nettó súlya ennek a csomagnak. (Automatikusan kiszámítja a tételek nettó súlyainak összegéből)
@@ -2234,11 +2242,11 @@
 DocType: Sales Order,To Deliver and Bill,Szállítani és számlázni
 DocType: Student Group,Instructors,Oktatók
 DocType: GL Entry,Credit Amount in Account Currency,Követelés összege a számla pénznemében
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Management megosztása
 DocType: Authorization Control,Authorization Control,Hitelesítés vezérlés
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasított Raktár kötelező az elutasított elemhez: {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Fizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Fizetés
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Raktár {0} nem kapcsolódik semmilyen számlához, kérem tüntesse fel a számlát a raktár rekordban vagy az alapértelmezett leltár számláját állítsa be a vállalkozásnak: {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Megrendelései kezelése
 DocType: Work Order Operation,Actual Time and Cost,Tényleges idő és költség
@@ -2247,8 +2255,8 @@
 DocType: Course,Course Abbreviation,Tanfolyam rövidítés
 DocType: Student Leave Application,Student Leave Application,Diák távollét alkalmazás
 DocType: Item,Will also apply for variants,Változatokra is alkalmazni fogja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Vagyontárgy nem törölhető, mivel ez már {0}"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Tovább
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Csomag tételek az eladás idején.
@@ -2258,8 +2266,8 @@
 DocType: Item,Barcodes,Vonalkódok
 DocType: Hub Category,Hub Node,Hub csomópont
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ismétlődő tételeket adott meg. Kérjük orvosolja, és próbálja újra."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Társult
-DocType: Asset Movement,Asset Movement,Vagyoneszköz mozgás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Társult
+DocType: Asset Movement,Asset Movement,Vagyontárgy mozgás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,A {0} munka megrendelést be kell nyújtani
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,új Kosár
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Tétel: {0} nem sorbarendezett tétel
@@ -2276,24 +2284,23 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,A számlázási pénznemnek meg kell egyeznie az alapértelmezett vállalkozás pénzneméval vagy a másik fél pénznemével
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállításnak (Csak tervezet)"
 DocType: Soil Texture,Loam,Termőtalaj
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,{0} sor: Az esedékesség dátuma nem lehet a dátum közzététele előtti
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,{0} sor: Az esedékesség dátuma nem lehet a dátum közzététele előtti
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Befizetés rögzítés létrehozás
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
 ,Sales Invoice Trends,Kimenő értékesítési számlák alakulása
 DocType: Leave Application,Apply / Approve Leaves,Távollétekre Jelentkezés / Jóváhagyás
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Ennek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Csak akkor hivatkozhat sorra, ha a terhelés  típus ""Előző sor összege"" vagy ""Előző sor Összesen"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Csak akkor hivatkozhat sorra, ha a terhelés  típus ""Előző sor összege"" vagy ""Előző sor Összesen"""
 DocType: Sales Order Item,Delivery Warehouse,Szállítási raktár
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Pénzügyi költséghely fája.
 DocType: Serial No,Delivery Document No,Szállítási Dokumentum Sz.
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Kérjük, állítsa be a 'Nyereség / veszteség számla az Eszköz eltávolításához', ehhez a Vállalathoz: {0}"
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Kérjük, állítsa be a 'Nyereség / veszteség számlát a Vagyontárgy eltávolításához', ehhez a Vállalathoz: {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Tételek beszerzése a Beszerzési bevételezésekkel
 DocType: Serial No,Creation Date,Létrehozás dátuma
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Tétel {0} többször is előfordul ebben az árjegyzékben {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Selling must be checked, if Applicable For is selected as {0}","Értékesítőt ellenőrizni kell, amennyiben az alkalmazható, úgy van kiválaszta mint {0}"
 DocType: Production Plan Material Request,Material Request Date,Anyaga igénylés dátuma
 DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tételre
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Az Anyagfogyasztás nincs beállítva a Gyártási beállításokban.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Anyagfogyasztás nincs beállítva a Gyártási beállításokban.
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Rrendelkezik változatokkal
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Frissítse a válaszadást
@@ -2306,15 +2313,16 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Először válasszon programot
 DocType: Patient Appointment,Patient Age,A beteg kora
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Projektek irányítása
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,A (z) {0} soros szám már vissza lett küldve
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,A (z) {0} soros szám már vissza lett küldve
 DocType: Supplier,Supplier of Goods or Services.,Az áruk vagy szolgáltatások beszállítója.
 DocType: Budget,Fiscal Year,Pénzügyi év
 DocType: Asset Maintenance Log,Planned,Tervezett
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Alapértelmezett bevételi számlák akkor használatosak, ha a Páciens nem jogosult a Konzultációs díjak könyvelésére."
 DocType: Vehicle Log,Fuel Price,Üzemanyag ár
+DocType: Bank Guarantee,Margin Money,Margin Pénz
 DocType: Budget,Budget,Költségkeret
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Állítsa be a nyitást
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,"Befektetett Álló eszközöknek, nem készletezhető elemeknek kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,"Befektetett álló-eszközöknek, nem készletezhető elemeknek kell lennie."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet ehhez rendelni: {0}, mivel ez nem egy bevétel vagy kiadás főkönyvi számla"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 DocType: Student Admission,Application Form Route,Jelentkezési mód
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Követés
 DocType: Item,Is Sales Item,Ez eladható tétel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Tétel: {0}, nincs telepítve Széria sz.. Ellenőrizze a tétel törzsadatot"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Tétel: {0}, nincs telepítve Széria sz.. Ellenőrizze a tétel törzsadatot"
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Szállítandó összeg
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Ugyanaz a tétel többször szerepel. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A kifejezés kezdő dátuma nem lehet korábbi, mint az előző évben kezdő tanév dátuma, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Hibák voltak.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,A (z) {0} alkalmazott már {2} és {3} között kérte a következőket {1}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Hibák voltak.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,A (z) {0} alkalmazott már {2} és {3} között kérte a következőket {1}:
 DocType: Guardian,Guardian Interests,Helyettesítő kamat
 DocType: Naming Series,Current Value,Jelenlegi érték
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
 DocType: Education Settings,Instructor Records to be created by,Az oktatói rekordokat készítette a
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} létrehozva
 DocType: GST Account,GST Account,GST számla fiók
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal tétel Csoport
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Hozzáadva a Kedvencekhez
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"A fenti kritériumok alapján nincs benyújtandó bérpapír, VAGY a bérpapírt már benyújtották"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Vámok és adók
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"A fenti kritériumok alapján nincs benyújtandó bérpapír, VAGY a bérpapírt már benyújtották"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Vámok és adók
 DocType: Projects Settings,Projects Settings,Projektek beállításai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni ezzel: {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Elem Csoportok fája.
 DocType: Production Plan,Total Produced Qty,Összesen termelt mennyiség
 DocType: Payroll Entry,Get Employee Details,Munkavállalói adatok lekérése
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni nagyobb vagy egyenlő sor számra, mint az aktuális sor szám erre a terehelés típusra"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni nagyobb vagy egyenlő sor számra, mint az aktuális sor szám erre a terehelés típusra"
 DocType: Asset,Sold,Eladott
 ,Item-wise Purchase History,Tételenkénti Beszerzési előzmények
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a 'Ütemterv létrehozás', hogy hozzáfűzze a Széria számot ehhez a tételhez: {0}"
 DocType: Account,Frozen,Zárolt
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Alapösszeg (Vállalat pénzneme)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Nyersanyagok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Nyersanyagok
 DocType: Payment Reconciliation Payment,Reference Row,Referencia sor
 DocType: Installation Note,Installation Time,Telepítési idő
 DocType: Sales Invoice,Accounting Details,Számviteli Részletek
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Törölje az ehhez a vállalathoz tartozó összes tranzakciót
 DocType: Patient,O Positive,O Pozitív
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Befektetések
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,A kiosztandó
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Elfogadási kritérium
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Kérjük, adja meg az anyag igényeket a fenti táblázatban"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,A naplóbejegyzéshez nincs visszafizetés
 DocType: Item Attribute,Attribute Name,Tulajdonság neve
 DocType: BOM,Show In Website,Jelenjen meg a weboldalon
 DocType: Shopping Cart Settings,Show Quantity in Website,Mutassa a mennyiséget a honlapon
-DocType: Employee Loan Application,Total Payable Amount,Összesen fizetendő összeg
+DocType: Loan Application,Total Payable Amount,Összesen fizetendő összeg
 DocType: Task,Expected Time (in hours),Várható idő (óra)
 DocType: Item Reorder,Check in (group),Bejelentkezés (csoport)
 DocType: Soil Texture,Silt,Iszap
@@ -2397,13 +2406,13 @@
 DocType: Course,Default Grading Scale,Alapértelmezett értékelési skála
 DocType: Appraisal,For Employee Name,Alkalmazott neve
 DocType: Holiday List,Clear Table,Tábla törlése
-DocType: Woocommerce Settings,Tax Account,Adószámla
+DocType: Woocommerce Settings,Tax Account,Adó számla
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +119,Available slots,Elérhető időszakok
 DocType: C-Form Invoice Detail,Invoice No,Számlát sz.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Befizetés létrehozás
 DocType: Room,Room Name,szoba neve
 DocType: Prescription Duration,Prescription Duration,Vényköteles időtartam
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollét nem alkalmazható / törölhető előbb mint: {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kioszts rekordhoz {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollét nem alkalmazható / törölhető előbb mint: {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kioszts rekordhoz {1}"
 DocType: Activity Cost,Costing Rate,Költségszámítás árérték
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Vevő címek és kapcsolatok
 ,Campaign Efficiency,Kampány hatékonyság
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,Fejezet
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pár
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Az alapértelmezett fiók automatikusan frissül a POS kassza számlán, ha ezt az üzemmódot választja."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
 DocType: Asset,Depreciation Schedule,Értékcsökkentési leírás ütemezése
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Vevő Partner címek és Kapcsolatok
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Félnapos időpontja között kell lennie Dátum és a mai napig
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Félnapos időpontja között kell lennie Dátum és a mai napig
 DocType: Maintenance Schedule Detail,Actual Date,Jelenlegi dátum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Állítsa be az Alapértelmezett költségkeretet {0} vállalatnál.
 DocType: Item,Has Batch No,Kötegszámmal rendelkezik
@@ -2438,12 +2447,11 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,Nem sikerült titkot generálni
 DocType: Volunteer,Volunteer Type,Önkéntes típusa
 DocType: Student,Personal Details,Személyes adatai
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa be a 'Eszköz értékcsökkenés Költséghely' ehhez a Vállalkozáshoz: {0}"
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa be a 'Vagyontárgy értékcsökkenés költséghely' adatait, ehhez a Vállalkozáshoz: {0}"
 ,Maintenance Schedules,Karbantartási ütemezések
 DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint)
 DocType: Soil Texture,Soil Type,Talaj típus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Új üzenet
 ,Quotation Trends,Árajánlatok alakulása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Tétel Csoport nem említett a tétel törzsadatban erre a tételre: {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless megbízás
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Hub kategória
 DocType: Purchase Invoice,SEZ,áruszállítás
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
-DocType: Employee Loan,Loan Amount,Hitelösszeg
+DocType: Loan,Loan Amount,Hitelösszeg
 DocType: Student Report Generation Tool,Add Letterhead,Fejléc hozzáadás
 DocType: Program Enrollment,Self-Driving Vehicle,Önvezető jármű
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Beszállító mutatószámláló állása
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,Pozíció
 DocType: Patient,Patient Details,A beteg adatai
 DocType: Patient,B Positive,B Pozitív
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, a tétel egy tárgyi eszköz. Használjon külön sort több menny."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, mivel a tétel egy álló-eszköz. Használjon külön sort több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
 DocType: Patient Medical Record,Patient Medical Record,Beteg orvosi kartonja
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Csoport Csoporton kívülire
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportok
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Összes Aktuális
 DocType: Lab Test UOM,Test UOM,Teszt ME
 DocType: Student Siblings,Student Siblings,Tanuló Testvérek
+DocType: Subscription Plan Detail,Subscription Plan Detail,Előfizetési terv részletei
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Egység
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Kérjük adja meg a vállalkozás nevét
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Kérjük adja meg a vállalkozás nevét
 ,Customer Acquisition and Loyalty,Vevőszerzés és hűség
 DocType: Asset Maintenance Task,Maintenance Task,Karbantartási feladat
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,"Kérjük, állítsa be a B2C limitet a GST beállításaiban."
@@ -2515,7 +2524,8 @@
 DocType: Issue,Support,Támogatás
 ,BOM Search,Anyagjegyzék Keresés
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Összesített anyagköltség (raktári bejegyzés  útján)
-DocType: Hub Settings,Company Registered,Regisztrált cég
+DocType: Hub Settings,Company Registered,Vállalkozás regisztrálásra került
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,"A dátum nem lehet kevesebb, mint a dátumtól"
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Közzététel a ""készletben"" vagy a ""Nincs  készleten"" a hubon a raktáron rendelkezésre álló készlet alapján."
 DocType: Vehicle,Fuel Type,Üzemanyag típusa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Kérjük, adja meg a vállalkozás pénznemét"
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Készlet egyenleg ebben a kötegben: {0} negatívvá válik {1} erre a tételre: {2} ebben a raktárunkban: {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Következő Anyag igénylések merültek fel  automatikusan a Tétel újra-rendelés szinje alpján
 DocType: Email Digest,Pending Sales Orders,Függő Vevői rendelések
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
 DocType: Employee,Create User Permission,Felhasználói jogosultság létrehozása
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
 DocType: Healthcare Settings,Remind Before,Emlékeztessen azelőtt
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ME átváltási arányra is szükség van ebben a sorban {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
 DocType: Salary Component,Deduction,Levonás
 DocType: Item,Retain Sample,Minta megőrzés
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,{0} sor: Időtől és időre kötelező.
 DocType: Stock Reconciliation Item,Amount Difference,Összeg különbség
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Kérjük, adja meg Alkalmazotti azonosító ID, ehhez az értékesítőhöz"
 DocType: Territory,Classification of Customers by region,Vevői csoportosítás régiónként
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Termelésben
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Számított Bankkivonat egyenleg
 DocType: Normal Test Template,Normal Test Template,Normál teszt sablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Árajánlat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,"Nem állítható be beérkezettnek az Árajánlatkérés , nincs Árajánlat"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Árajánlat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,"Nem állítható be beérkezettnek az Árajánlatkérés , nincs Árajánlat"
 DocType: Quotation,QTN-,AJ-
 DocType: Salary Slip,Total Deduction,Összesen levonva
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Válasszon ki egy számla fiókot a számla pénznemére történő nyomtatáshoz
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ez a betegekkel szembeni tranzakciókra épül. Lásd az alábbi idővonalat a részletekért
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Költség Frissítve
 DocType: Patient,Date of Birth,Születési idő
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,"Tétel: {0}, már visszahozták"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,"Tétel: {0}, már visszahozták"
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** jelképezi a Költségvetési évet. Minden könyvelési tétel, és más jelentős tranzakciók rögzítése ebben ** Pénzügyi Év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Érdeklődő címe
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Beszállító mutatószám beállítása
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Munkaleírás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Munkaleírás
 DocType: Student Applicant,Applied,Alkalmazott
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Nyissa meg újra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Nyissa meg újra
 DocType: Sales Invoice Item,Qty as per Stock UOM,Mennyiség a Készlet mértékegysége alapján
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Helyettesítő2 neve
 DocType: Purchase Invoice,02-Post Sale Discount,02-Értékesítés utáni kedvezmény
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek ezek kivételével ""-"", ""#"", ""."" és a ""/"", nem engedélyezettek a Sorszámozási csoportokban"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányokat. Kövesse nyomon az érdeklődőket, árajánlatokat, vevői rendeléseket, stb. a kampányokból a  beruházás megtérülésének felméréséhez."
+DocType: Department Approver,Approver,Jóváhagyó
 ,SO Qty,VR Mennyisége
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,A részévnyes tulajdonoshoz tartozó mező nem lehet üres
 DocType: Guardian,Work Address,Munkahelyi cím
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Lefoglalt teljes összeg (Válalakozás pénznemében)
 DocType: Purchase Order Item,To be delivered to customer,Vevőhöz kell szállítani
 DocType: BOM,Scrap Material Cost,Hulladék anyagköltség
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Széria sz.: {0} nem tartozik semmilyen Raktárhoz
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Széria sz.: {0} nem tartozik semmilyen Raktárhoz
 DocType: Grant Application,Email Notification Sent,E-mail értesítés kiküldve
 DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Tétel kód, raktár, mennyiség szükséges a sorban"
-DocType: Pricing Rule,Supplier,Beszállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Tétel kód, raktár, mennyiség szükséges a sorban"
+DocType: Bank Guarantee,Supplier,Beszállító
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Fizetési adatok megjelenítése
 DocType: Consultation,Consultation Time,Konzultációs idő
 DocType: C-Form,Quarter,Negyed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Egyéb ráfordítások
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Egyéb ráfordítások
 DocType: Global Defaults,Default Company,Alapértelmezett cég
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Költség vagy Különbség számla kötelező tétel erre: {0} , kifejtett hatása van a teljes raktári állomány értékére"
 DocType: Payment Request,PR,FIZKER
 DocType: Cheque Print Template,Bank Name,Bank neve
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Felett
-DocType: Employee Loan,Employee Loan Account,Alkalmazotti Hitelszámla
 DocType: Leave Application,Total Leave Days,Összes távollét napok
 DocType: Email Digest,Note: Email will not be sent to disabled users,Megjegyzés: E-mail nem lesz elküldve a letiltott felhasználóknak
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Költsönhatás mennyisége
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Súly (kilogrammban)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",fejezetek/fejezet_neve hagyja üresen automatikusan a fejezet mentése után.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,"Kérjük, állítsa be a GST-számla fiókokat a GST-beállításokban"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,"Kérjük, állítsa be a GST-számla fiókokat a GST-beállításokban"
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Vállalkozás típusa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típust és számlaszámot legalább egy sorban"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Új beszerzés költsége
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Adomány leírása
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
 DocType: Student Guardian,Others,Egyéb
+DocType: Subscription,Discounts,kedvezmények
 DocType: Payment Entry,Unallocated Amount,A le nem foglalt összeg
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik értéket erre {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nincs több frissítés
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nem lehet kiválasztani az első sorra az 'Előző sor összegére' vagy 'Előző sor Összesen' terhelés típust
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nem lehet kiválasztani az első sorra az 'Előző sor összegére' vagy 'Előző sor Összesen' terhelés típust
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ez magában foglalja az e telepítéshez kapcsolódó összes eredménymutatót
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Al tétel nem lehet egy termék csomag. Kérjük, távolítsa el tételt: `{0}' és mentse"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banki ügyletek
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,Szolgáltatás tétel
 DocType: Bank Guarantee,Bank Guarantee,Bankgarancia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a 'Ütemterv létrehozás', hogy ütemezzen"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Grading Scale,Grading Scale Intervals,Osztályozás időszak periódusai
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Az év nyeresége
+DocType: Bank Guarantee,Name of Bank,A bank neve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: számviteli könyvelés {2} csak ebben a pénznemben végezhető: {3}
 DocType: Fee Schedule,In Process,A feldolgozásban
 DocType: Authorization Rule,Itemwise Discount,Tételenkénti Kedvezmény
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Pénzügyi számlák fája.
+DocType: Bank Guarantee,Reference Document Type,Referencia Dokumentum típus
 DocType: Cash Flow Mapping,Cash Flow Mapping,Pénzforgalom térképezés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} a {1} Vevői rendeléshez
-DocType: Account,Fixed Asset,Az állóeszköz-
+DocType: Account,Fixed Asset,Álló-eszköz
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Széria számozott készlet
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail nem található az alapértelmezett  kapcsolatban
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generáljon titkot
-DocType: Employee Loan,Account Info,Számlainformáció
+DocType: Loan,Account Info,Számlainformáció
 DocType: Activity Type,Default Billing Rate,Alapértelmezett számlázási ár
 DocType: Fees,Include Payment,Fizetés beillesztése
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Tanuló csoportok létrehozva.
 DocType: Sales Invoice,Total Billing Amount,Összesen Számlázott összeg
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Díjstruktúra és a hallgatói csoport {0} programja eltérő.
 DocType: Fee Schedule,Receivable Account,Bevételek számla
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Sor # {0}:  {1}  Vagyontárgy már {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Sor # {0}:  {1}  Vagyontárgy már {2}
 DocType: Quotation Item,Stock Balance,Készlet egyenleg
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Vevői rendelés a Fizetéshez
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Vezérigazgató(CEO)
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Vezérigazgató(CEO)
 DocType: Purchase Invoice,With Payment of Tax,Adófizetéssel
 DocType: Expense Claim Detail,Expense Claim Detail,Költség igény részlete
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,HÁRMASÁVAL BESZÁLLÍTÓNAK
 DocType: Land Unit,Is Container,Ez konténer
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ez lesz a termésciklus első napja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
 DocType: Purchase Invoice Item,Weight UOM,Súly mértékegysége
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Az elérhető fóliaszámú részvényes tulajdonosok listája
 DocType: Salary Structure Employee,Salary Structure Employee,Alkalmazotti Bérrendszer
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Változat tulajdonságaniak megjelenítése
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Változat tulajdonságaniak megjelenítése
 DocType: Student,Blood Group,Vércsoport
 DocType: Course,Course Name,Tantárgy neve
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyezhetik egy bizonyos Alkalmazott távollét kérelmét"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Irodai berendezések
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Irodai berendezések
 DocType: Purchase Invoice Item,Qty,Menny.
 DocType: Fiscal Year,Companies,Vállalkozások
 DocType: Supplier Scorecard,Scoring Setup,Pontszám beállítások
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,Beérkező össz Érték
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Tartozás megterhelése szükséges
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csoportjának."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Beszerzési árlista
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Beszerzési árlista
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,A beszállító eredménymutató-változóinak sablonjai.
 DocType: Job Offer Term,Offer Term,Ajánlat feltételei
 DocType: Asset,Quality Manager,Minőségbiztosítási vezető
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Összesen Kifizetetlen: {0}
 DocType: BOM Website Operation,BOM Website Operation,Anyagjegyzék honlap művelet
 DocType: Supplier Scorecard,Supplier Score,Beszállító pontszáma
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Teljes kiszámlázott össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Teljes kiszámlázott össz
 DocType: Supplier,Warn RFQs,Figyelmeztetés az Árajánlatokra
 DocType: BOM,Conversion Rate,Konverziós arány
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Termék tétel keresés
 DocType: Assessment Plan,To Time,Ideig
 DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó beosztása (a fenti engedélyezett érték)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Követelés főkönyvi számlának Fizetendő számlának kell lennie
+DocType: Loan,Total Amount Paid,Összesen fizetett összeg
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Kérem, válassza ki a hallgatói felvételt, amely kötelező a befizetett hallgatói jelentkező számára"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},ANYGJZ rekurzív: {0} nem lehet a szülő vagy a gyermeke ennek: {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Kérjük, válasszon ki egy árlistát az árak közzétételéhez"
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Árlista {0} letiltva
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Sor {0}: Befejezett Menny nem lehet több, mint {1} működésre {2}"
 DocType: Manufacturing Settings,Allow Overtime,Túlóra engedélyezése
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Sorszámozott tétel {0} nem lehet frissíteni a Készlet egyesztetéssel, kérem használja a Készlet bejegyzést"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Sorszámozott tétel {0} nem lehet frissíteni a Készlet egyesztetéssel, kérem használja a Készlet bejegyzést"
 DocType: Training Event Employee,Training Event Employee,Képzési munkavállalói esemény
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximum minták - {0} megtartható az {1} köteghez és a {2} tételhez.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Adjon hozzá időszakaszt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges ehhez a Tételhez: {1}. Ezt adta meg: {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges ehhez a Tételhez: {1}. Ezt adta meg: {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Készletérték ár
 DocType: Training Event,Advance,Előleg
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ismételten ismételten.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless fizetési átjáró beállítása
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Árfolyamnyereség / veszteség
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Árfolyamnyereség / veszteség
 DocType: Opportunity,Lost Reason,Elvesztés oka
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},#{0} sor: A {1} számla fiók nem tartozik a  {2} vállalathoz
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},#{0} sor: A {1} számla fiók nem tartozik a  {2} vállalathoz
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nem sikerült megtalálni ezt: DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Új cím
 DocType: Quality Inspection,Sample Size,Minta mérete
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,Tényleges Mennyiség
 DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Széria sz. {0} nem található
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Az előfizetés már {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Díj időzítő program
 DocType: Fee Schedule Program,Student Batch,Tanuló köteg
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tanuló létrehozás
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-kereskedelem GSTIN
 DocType: Sales Order,Not Delivered,Nem szállított
 ,Bank Clearance Summary,Bank Végső összesítő
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Létre hoz és kezel napi, heti és havi e-mail összefoglalót."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Létre hoz és kezel napi, heti és havi e-mail összefoglalót."
 DocType: Appraisal Goal,Appraisal Goal,Teljesítmény értékelés célja
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Javasolod a kategóriát?
 DocType: Stock Reconciliation Item,Current Amount,Jelenlegi összege
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Készítések
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Készítések
 DocType: Fee Schedule,Fee Structure,Díjfelépítés
 DocType: Timesheet Detail,Costing Amount,Költségszámítás Összeg
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
 DocType: Student Admission Program,Application Fee,Jelentkezési díj
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Bérpapír küldés
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maximum kedvezmény erre a tételre: {0} ennyi: {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Mezőgazdasági elemzési kritérium
+DocType: HR Settings,Leave Approval Notification Template,Hagyja jóvá a jóváhagyási értesítési sablont
 DocType: POS Profile,[Select],[Válasszon]
 DocType: Vital Signs,Blood Pressure (diastolic),Vérnyomás (diasztolik)
 DocType: SMS Log,Sent To,Elküldve
 DocType: Agriculture Task,Holiday Management,Távollétek kezelése
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla létrehozás
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Szoftverek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Szoftverek
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},A {0} orvos nem érhető el ezen {1}
@@ -2801,9 +2815,9 @@
 DocType: Journal Entry,Reference Number,Referencia szám
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Anyagfogyasztás
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Anyag szükséglet
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Lezárttá állít
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nincs tétel ezzel a Vonalkóddal {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nincs tétel ezzel a Vonalkóddal {0}
 DocType: Normal Test Items,Require Result Value,Eredmény értékeire van szükség
 DocType: Item,Show a slideshow at the top of the page,Mutass egy diavetítést  a lap tetején
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Anyagjegyzékek
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,"Nem talált aktív vagy alapértelmezett bérrendszert erre az Alkalmazottra: {0}, a megadott dátumra"
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vevő mobil tel. szám
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ismétlődő
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Pénzforgalom térképezés sablon részletei
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Hitelkezelés
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Kövesse nyomon külön a bevételeket és ráfordításokat a termék tetőpontokkal vagy felosztásokkal.
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Tétel újrarendelés
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Bérkarton megjelenítése
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Anyag Átvitel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Bérkarton megjelenítése
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Anyag Átvitel
 DocType: Fees,Send Payment Request,Fizetési kérelem küldése
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a műveletet, a működési költségeket, és adjon meg egy egyedi műveletet a műveletekhez."
 DocType: Water Analysis,Origin,Származás
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3}  ugyanazon {2} helyett?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,A jövedelemadó kötelezettség
 DocType: Grading Scale Interval,Grade Description,Osztály Leírás
 DocType: Stock Entry,Purchase Receipt No,Beszerzési megrendelés nyugta sz.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Foglaló pénz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Foglaló pénz
 DocType: Sales Invoice, Shipping Bill Number,Szállítási számla száma
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,A nyomon követhetőség
 DocType: Asset Maintenance Log,Actions performed,Végrehajtott  műveletek
 DocType: Cash Flow Mapper,Section Leader,Szekció vezető
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Pénzeszközök forrását (kötelezettségek)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Pénzeszközök forrását (kötelezettségek)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiségnek ebben a sorban {0} ({1}) meg kell egyeznie a gyártott mennyiséggel {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Alkalmazott
+DocType: Bank Guarantee,Fixed Deposit Number,Fix betétszám
 DocType: Asset Repair,Failure Date,Hibás dátum
 DocType: Sample Collection,Collected Time,Gyűjtési idő
 DocType: Company,Sales Monthly History,Értékesítések havi története
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Biztosan törölni szeretné ezt a  találkozót?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Szállodai szoba árazási csomag
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Értékesítési folyamat
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Rename Tool,File to Rename,Átnevezendő fájl
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Előfizetési frissítések lekérése
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Számla {0} nem egyezik ezzel a vállalkozással {1} ebben a módban: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Meghatározott ANYAGJEGYZ {0} nem létezik erre a tételre {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Tanfolyam:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,Költség igény jóváhagyva
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nincs létrehozva munka megrendelés
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Bérpapír az Alkalmazotthoz: {0} már létezik erre az időszakra
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Gyógyszeripari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Bszerzett tételek költsége
 DocType: Selling Settings,Sales Order Required,Vevői rendelés szükséges
 DocType: Purchase Invoice,Credit To,Követelés ide
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nincs árajánlat
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Gateway Account,Payment Account,Fizetési számla
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Nettó Vevői számla tartozások változása
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompenzációs Ki
 DocType: Job Offer,Accepted,Elfogadva
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadati megmaradnak. Ez a művelet nem vonható vissza."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Keresési eredmények
 DocType: Room,Room Number,Szoba szám
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Érvénytelen hivatkozás {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Érvénytelen hivatkozás {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Szállítási szabály címkéi
 DocType: Journal Entry Account,Payroll Entry,Bérszámfejtési bejegyzés
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Díjakra vonatkozó bejegyzések megtekintése
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
 DocType: Lab Test Sample,Lab Test Sample,Labor teszt minta
 DocType: Item Variant Settings,Allow Rename Attribute Value,Engedélyezze az attribútum érték átnevezését
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Gyors Naplókönyvelés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni az árat, ha az említett ANYGJZ összefügg már egy tétellel"
 DocType: Restaurant,Invoice Series Prefix,Számla sorozatok előtagja
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adjon meg Tervezett Mennyiséget erre a tételre: {0} , ebben a sorban {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,A Google Térképek integrációja nem engedélyezett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nem nyújtják be
+DocType: Subscription,Trialling,kísérleti
 DocType: Member,Membership Expiry Date,Tagság lejárati idő
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} negatívnak kell lennie a válasz dokumentumban
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} negatívnak kell lennie a válasz dokumentumban
 ,Minutes to First Response for Issues,Eltelt percek a Probléma első lereagálásig
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Az intézmény neve amelyre ezt a rendszert beállítja.
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat ettől függ:
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Lehetőség
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Lehetőség
 DocType: Operation,Default Workstation,Alapértelmezett Munkaállomás
 DocType: Notification Control,Expense Claim Approved Message,Költség jóváhagyott igény indoklása
 DocType: Payment Entry,Deductions or Loss,Levonások vagy veszteségek
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Fizetés nélküli távollét nem egyezik meg a jóváhagyott távolléti igény bejegyzésekkel
 DocType: Campaign,Campaign-.####,Kampány -.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Kérjük szállítsa be a tételeket a lehető legjobb árakon
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Kérjük szállítsa be a tételeket a lehető legjobb árakon
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Számla készítése
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Fennmaradó egyenleg
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,{0}vonalkód nem érvényes {1} kód
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Befejező év
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Áraj / Lehet %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
 DocType: Driver,Driver,Sofőr
 DocType: Vital Signs,Nutrition Values,Táplálkozási értékek
 DocType: Lab Test Template,Is billable,Számlázható
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Tényleges kezdési dátum (Idő nyilvántartó szerint)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Ez egy példa honlap, amit automatikusan generált az ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Öregedés tartomány 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,A teljes előleg összege nem haladhatja meg a teljes igényelt összegét
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,A teljes előleg összege nem haladhatja meg a teljes igényelt összegét
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3037,13 +3054,13 @@
 DocType: Stock Entry Detail,Original Item,Eredeti tétel
 DocType: Purchase Receipt Item,Recd Quantity,Szüks Mennyiség
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},Díj rekordok létrehozva - {0}
-DocType: Asset Category Account,Asset Category Account,Vagyoneszköz kategória főkönyvi számla
+DocType: Asset Category Account,Asset Category Account,Vagyontárgy kategória főkönyvi számla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Row #{0} (Payment Table): Amount must be positive,# {0} (Fizetési táblázat) sor: Az összegnek pozitívnak kell lennie
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteNum,CompteNum
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet több mint ennyit {0} gyártani a tételből, mint amennyi a Vevői rendelési mennyiség {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Válassza ki a jellemzők értékeit
 DocType: Purchase Invoice,Reason For Issuing document,Dokumentum kiadásának oka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,"Készlet bejegyzés: {0} nem nyújtják be,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,"Készlet bejegyzés: {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Készpénz számla
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"Következő kapcsolat evvel nem lehet ugyanaz, mint az érdeklődő e-mail címe"
 DocType: Tax Rule,Billing City,Számlázási Város
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,Szerviz címe
 DocType: Asset Maintenance Task,Calibration,Kalibráció
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,A(z) {0} vállallati ünnepi időszak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Bútorok és világítótestek
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Hagyjon állapotjelentés
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Bútorok és világítótestek
 DocType: Item,Manufacture,Gyártás
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Vállalkozás beállítása
 ,Lab Test Report,Labor tesztjelentés
@@ -3076,8 +3094,7 @@
 DocType: Crop,Planting Area,Ültetési terület
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen(db)
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ez az érvénytelen e-mail címek miatt lehet
-apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ön hozzátette
+apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ön hozzáadta:
 DocType: Purchase Taxes and Charges,Parenttype,Főágtípus
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Képzés eredménye
 DocType: Purchase Invoice,Is Paid,Ez ki van fizetve
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Termékek oldalanként
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő árérték
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Vállalkozás ágazat törzsadat.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Probléma jelentése
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Közműben
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Közműben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 felett
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"Sor # {0}: Naplókönyvelés {1} nem rendelkezik  {2} számlával, vagy már összeegyeztetett egy másik utalvánnyal"
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kritérium Súlyozás
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Hagyja jóvá a jóváhagyási értesítést
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzék
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Bérpapirok a munkaidő jelenléti ív alapján
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Beszerzési  árérték
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Beszerzési  árérték
 DocType: Notification Control,Sales Order Message,Vevői rendelés üzenet
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a vállalkozás, pénznem, folyó pénzügyi év, stb. beállítása."
 DocType: Payment Entry,Payment Type,Fizetési mód
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Bevásárló kosár Beállítások
 DocType: Journal Entry,Accounting Entries,Könyvelési tételek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ha az ""Árérték"" -re vonatkozó Árszabályozást  választja, az felülírja az Árlistát. Az árszabályozás a végső árérték, tehát további engedmény nem alkalmazható. Ezért olyan tranzakciókban, mint az Vevői rendelés, a Beszerzési megbízás stb., akkor a ""Árérték"" mezőben fogják megkapni, az ""Árlista árrérték"" mező helyett."
+DocType: Journal Entry,Paid Loan,Fizetett kölcsön
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Ismétlődő bejegyzés. Kérjük, ellenőrizze ezt az engedélyezési szabályt: {0}"
 DocType: Journal Entry Account,Reference Due Date,Hivatkozási határidő
 DocType: Purchase Order,Ref SQ,Hiv. BR
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem lett létrehozva  összes tételre. Kérjük, kattintson erre: ""Ütemezést létrehozás"""
 ,To Produce,Termelni
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bérszámfejtés
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",A {1} -nek a {0} sorbában. A Tétel értékébe a {2} beillesztéséhez a {3} sorokat is hozzá kell adni
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",A {1} -nek a {0} sorbában. A Tétel értékébe a {2} beillesztéséhez a {3} sorokat is hozzá kell adni
 DocType: Patient Service Unit,Parent Service Unit,Fő szervezeti egység
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Felhasználó létrehozás
 DocType: Packing Slip,Identification of the package for the delivery (for print),Csomag azonosítása a szállításhoz (nyomtatáshoz)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Jövedelem számla
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valutájában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Szállítás
 DocType: Volunteer,Weekdays,Hétköznapok
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi mennyiség
 DocType: Restaurant Menu,Restaurant Menu,Éttermi menü
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
 DocType: Payment Entry,Total Allocated Amount,Lefoglalt teljes összeg
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Alapértelmezett készlet számla beállítása a folyamatos készlethez
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Alapértelmezett készlet számla beállítása a folyamatos készlethez
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Küldjön támogatás áttekintő e-mailt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","HelyiRaktár tele van, nem mentettem"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Szoba kapacitás
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Már létezik rekord a(z) {0} tételre
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Hiv.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Elveszti a korábban generált számlák nyilvántartását. Biztosan újra szeretné kezdeni ezt az előfizetést?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Regisztrációs díj
 DocType: Budget,Cost Center,Költséghely
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Utalvány #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Utalvány #
 DocType: Notification Control,Purchase Order Message,Beszerzési megrendelés üzenet
 DocType: Tax Rule,Shipping Country,Szállítás Országa
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ügyfél adóazonosító elrejtése az Értékesítési tranzakciókból
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Árképzési szabály azért készül, hogy az felülírja az árjegyzéket / kedvezmény százalékos meghatározását, néhány feltétel alapján."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Raktárat csak a Készlet bejegyzéssel / Szállítólevéllel / Beszerzési nyugtán keresztül lehet megváltoztatni
 DocType: Employee Education,Class / Percentage,Osztály / Százalékos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Marketing és Értékesítés vezetője
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Marketing és Értékesítés vezetője
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Jövedelemadó
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Ipari típusonkénti Érdeklődés nyomonkövetése.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Menjen a Fejlécekhez
+DocType: Subscription,Cancel At End Of Period,Mégse a periódus végén
 DocType: Item Supplier,Item Supplier,Tétel Beszállító
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nincs átcsoportosításra váró tétel
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nincs átcsoportosításra váró tétel
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Összes cím.
 DocType: Company,Stock Settings,Készlet beállítások
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
 DocType: Vehicle,Electric,Elektromos
 DocType: Task,% Progress,% Haladás
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Nyereség / veszteség Eszköz eltávolításán
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Nyereség / veszteség Vagyontárgy eltávolításán
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Az alábbi táblázatban csak a &quot;Jóváhagyott&quot; állapotú hallgatói pályázó kerül kiválasztásra.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"A (z) {0} fiókhoz tartozó fiókszám nem érhető el. <br> Kérjük, helyesen állítsa be a számlatörténetét."
 DocType: Task,Depends on Tasks,Függ a Feladatoktól
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nincs készleten
 DocType: Volunteer,Volunteer Skills,Önkéntes készségei
 DocType: Appraisal,HR User,HR Felhasználó
+DocType: Bank Guarantee,Reference Document Name,Referencia dokumentum neve
 DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
 apps/erpnext/erpnext/hooks.py +142,Issues,Problémák
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Állapotnak az egyike kell llennie ennek {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 DocType: Sales Invoice,SINV-RET-,ÉSZLA-ELLEN-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Nagy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Nagy
+DocType: Loan,Loan Application,Hiteligénylés
 DocType: Crop,Scientific Name,Tudományos név
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Összes távollétek
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Újra válassza ki, ha a kiválasztott névjegyet a mentés után módosítja"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Csekk száma
 ,Sales Browser,Értékesítési böngésző
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik a  {2} készlet bejegyzéssel szemben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik a  {2} készlet bejegyzéssel szemben
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Helyi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Tárgyi eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Követelések
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Nagy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Nagy
 DocType: Homepage Featured Product,Homepage Featured Product,Kezdőlap Ajánlott termék
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Az Értékelési Groups
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Az Értékelési Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Új raktár neve
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Összesen {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Terület
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,Díjak
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja meg az átváltási árfolyamot egy pénznem másikra váltásához
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,{0} ajánlat törölve
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Teljes fennálló kintlévő összeg
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Teljes fennálló kintlévő összeg
 DocType: Sales Partner,Targets,Célok
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Kérjük, regisztrálja a SIREN számot a céginformációs fájlban"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 DocType: Price List,Price List Master,Árlista törzsadat
 DocType: GST Account,CESS Account,CESS számla
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakció címkézhető több ** Értékesítő személy** felé, így beállíthat és követhet célokat."
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Válasszon Beteget
 DocType: Price List,Applicable for Countries,Alkalmazandó ezekhez az Országokhoz
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Paraméter neve
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Csak ""Jóváhagyott"" és ""Elutasított"" állapottal rendelkező távollét igényeket lehet benyújtani"
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Diák csoport neve kötelező sorban {0}
 DocType: Homepage,Products to be shown on website homepage,Termékek feltüntetett internetes honlapon
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Ez egy alap vevőkör csoport, és nem lehet szerkeszteni."
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Összes számlázási órához már létrehozta a számlát
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Név hiba: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Ez pénzügyi költség
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,A {0} alkalmazott már megjelölt a részvételin
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,A {0} alkalmazott már megjelölt a részvételin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomag azonos típusból (nyomtatáshoz)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Állítsa be az alapértelmezett fogyasztót az étterem beállításai között
 ,Salary Register,Bér regisztráció
 DocType: Warehouse,Parent Warehouse,Fő Raktár
-DocType: C-Form Invoice Detail,Net Total,Nettó összesen
+DocType: Subscription,Net Total,Nettó összesen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Az alapértelmezett anyagjegyz BOM nem található erre a tételre: {0} és Projektre: {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Határozza meg a különböző hiteltípusokat
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Határozza meg a különböző hiteltípusokat
 DocType: Bin,FCFS Rate,Érkezési sorrend szerinti kiszolgálás FCFS ár
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Fennálló kinntlévő negatív összeg
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Idő (percekben)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
 DocType: Drug Prescription,Drug Prescription,Gyógyszerkönyv
 DocType: Fees,FEE.,DÍJ.
-DocType: Employee Loan,Repaid/Closed,Visszafizetett/Lezárt
+DocType: Loan,Repaid/Closed,Visszafizetett/Lezárt
 DocType: Item,Total Projected Qty,Teljes kivetített db
 DocType: Monthly Distribution,Distribution Name,Felbontás neve
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","A {0} tételhez nem található készletérték ár, amely a {1} {2} számviteli bejegyzések elvégzéséhez szükséges. Ha a nulla készletérték árral szerepel a tétel  az {1} -ben, kérjük, említse meg az {1} tétel táblázatában. Ellenkező esetben kérjük, hozzon létre egy bejövő állományi tranzakciót a tételre vagy a készletérték árra a Tétel rekordban, majd próbálja meg elküldeni / törölni ezt a bejegyzést"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 DocType: Course,Course Code,Tantárgy kódja
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Minőség-ellenőrzés szükséges erre a tételre {0}
 DocType: POS Settings,Use POS in Offline Mode,POS kassza funkció használata Offline módban
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,Megfontolt export
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átvitel gyártásához
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kedvezmény százalékot lehet alkalmazni vagy árlistában vagy az összes árlistában.
-DocType: Subscription,Half-yearly,Fél-évente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Könyvelési tétel a Készlethez
 DocType: Lab Test,LabTest Approver,LaborTeszt jóváhagyó
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Már értékelte ezekkel az értékelési kritériumokkal: {}.
 DocType: Vehicle Service,Engine Oil,Motorolaj
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Létrehozott munka rendelések : {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Létrehozott munka rendelések : {0}
 DocType: Sales Invoice,Sales Team1,Értékesítő csoport1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,"Tétel: {0}, nem létezik"
 DocType: Sales Invoice,Customer Address,Vevő címe
-DocType: Employee Loan,Loan Details,Hitel részletei
+DocType: Loan,Loan Details,Hitel részletei
 DocType: Company,Default Inventory Account,Alapértelmezett készlet számla
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio számok nem egyeznek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Egy link az összes föld területre, ahol a termés növekszik"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO (EBEK)
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Sor # {0}: Nem lehet vissza több mint {1} jogcím {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Sor # {0}: Nem lehet vissza több mint {1} jogcím {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mutassa ezt a diavetatést a lap tetején
 DocType: BOM,Item UOM,Tétel mennyiségi egysége
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege a kedvezmény összege után (Vállalkozás pénzneme)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Cél raktár kötelező ebben a sorban {0}
 DocType: Cheque Print Template,Primary Settings,Elsődleges beállítások
 DocType: Purchase Invoice,Select Supplier Address,Válasszon Beszállító címet
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Alkalmazottak hozzáadása
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Alkalmazottak hozzáadása
 DocType: Purchase Invoice Item,Quality Inspection,Minőségvizsgálat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra kicsi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra kicsi
 DocType: Company,Standard Template,Alapértelmezett sablon
 DocType: Training Event,Theory,Elmélet
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A {0} számla zárolt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi alany / leányvállalat a Szervezethez tartozó külön számlatükörrel
 DocType: Payment Request,Mute Email,E-mail elnémítás
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,Elküldött SMS száma
 DocType: Antibiotic,Healthcare Administrator,Egészségügyi adminisztrátor
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Állítson be egy célt
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
 DocType: Dosage Strength,Dosage Strength,Adagolási állomány
 DocType: Account,Expense Account,Költség számla
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Szoftver
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Szín
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Szín
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Értékelési Terv kritériumai
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,A lejárat dátuma kötelező a kiválasztott tételhez
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vásárlási megrendelések megakadályozása
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,Személyes és társadalmi történelem
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,A(z) {0} felhasználó létrehozva
 DocType: Fee Schedule,Fee Breakup for each student,Részvételi díj  szüneteltetés minden hallgató számára
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előleg ({0}) erre a rendelésre {1} nem lehet nagyobb, mint a végösszeg ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előleg ({0}) erre a rendelésre {1} nem lehet nagyobb, mint a végösszeg ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki a havi elosztást a célok egyenlőtlen elosztásához a hónapban .
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Kód módosítása
 DocType: Purchase Invoice Item,Valuation Rate,Készletérték ár
 DocType: Stock Reconciliation,SR/,KÉSZLEGY /
 DocType: Vehicle,Diesel,Dízel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
 DocType: Purchase Invoice,Availed ITC Cess,Hasznosított ITC Cess
 ,Student Monthly Attendance Sheet,Tanuló havi jelenléti ív
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Csak az értékesítésre vonatkozó szállítási szabály
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt téma kezdési dátuma
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Eddig
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Eddig
 DocType: Rename Tool,Rename Log,Átnevezési napló
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Diák csoport vagy Kurzus  menetrend kötelező
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,A Számlázoztt órák és a Munkaórák ugyanolyan kezelése a munkaidő jelenléti íven
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Sorolja fel a vásárolt vagy eladott termékeit vagy szolgáltatásait.
 DocType: Water Analysis,Storage Temperature,Tárolási hőmérséklet
 DocType: Employee Attendance Tool,Unmarked Attendance,Jelöletlen Nézőszám
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Kutató
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Kutató
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Beiratkozási eszköz tanuló
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},"A kezdő dátumnak kevesebbnek kell lennie, mint {0} feladat befejezésének"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Név vagy e-mail kötelező
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","A(z) {0} jelenleg egy {1} Szállítói eredménymutatón áll, ezért az árajánlatot ennek a szállaítóank  óvatossan kell kiadni."
 DocType: Chapter,Non Profit Manager,Nonprofit alapítvány vezető
 DocType: BOM,Total Cost(Company Currency),Összköltség (Vállalkozás pénzneme)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} széria sz. létrehozva
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} széria sz. létrehozva
 DocType: Homepage,Company Description for website homepage,Vállalkozás leírása az internetes honlapon
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A vevők kényelméért, ezek a kódok használhatók a nyomtatási formátumokhoz, mint számlákon és a szállítóleveleken"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Beszállító neve
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,Manuálisan megadhat bármilyen dátumot
 DocType: Healthcare Settings,Result Printed,Eredmény Nyomtatott
 DocType: Asset Category Account,Depreciation Expense Account,Értékcsökkentési ráfordítás számla
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Próbaidő períódus
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Megtekintés {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Próbaidő períódus
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak levélcsomópontok engedélyezettek a tranzakcióban
 DocType: Project,Total Costing Amount (via Timesheets),Összköltség összege (időnyilvántartó alapján)
-DocType: Employee Advance,Expense Approver,Költség Jóváhagyó
+DocType: Department,Expense Approver,Költség Jóváhagyó
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
 DocType: Project,Hourly,Óránkénti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Csoport nélküliek csoportokba
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Végső dátumig
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Napló az sms küldési állapot figyelésére
 DocType: Accounts Settings,Make Payment via Journal Entry,Naplókönyvelésen keresztüli befizetés létrehozás
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Nyomtatott ekkor
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Nyomtatott ekkor
 DocType: Item,Inspection Required before Delivery,Vizsgálat szükséges a szállítás előtt
 DocType: Item,Inspection Required before Purchase,Vizsgálat szükséges a vásárlás előtt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Függő Tevékenységek
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimális rendelési mennyiség
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,A szervezete
 DocType: Fee Component,Fees Category,Díjak Kategóriája
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Összeg
 DocType: Supplier Scorecard,Notify Employee,Értesítse az alkalmazottakat
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg a kampányt nevét, ha az árajánlat kérés forrása kampány"
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Újra rendelési szint
 DocType: Company,Chart Of Accounts Template,Számlatükör sablonok
 DocType: Attendance,Attendance Date,Részvétel dátuma
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés megszakítás a kereset és levonás alapján.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Al csomópontokkal rendelkező számlát nem lehet átalakítani főkönyvi számlává
 DocType: Purchase Invoice Item,Accepted Warehouse,Elfogadott raktárkészlet
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,Készletérték számítása
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Félnaposra jelöl
 DocType: Sales Invoice,Sales Team,Értékesítő csoport
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Ismétlődő bejegyzés
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Ismétlődő bejegyzés
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Adja meg a kedvezményezett nevét az elküldés előtt.
 DocType: Program Enrollment Tool,Get Students,Diákok lekérdezése
 DocType: Serial No,Under Warranty,Garanciaidőn belül
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Hiba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Hiba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavakkal mező lesz látható, miután mentette a Vevői rendelést."
 ,Employee Birthday,Alkalmazott születésnapja
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,"Kérjük, válassza ki abefejezés dátumát a Befejezett javításhoz"
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Lefoglalt alvállalkozóknak
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
 DocType: Shopping Cart Settings,Orders,Rendelések
-DocType: Employee Leave Approver,Leave Approver,Távollét jóváhagyó
+DocType: Department,Leave Approver,Távollét jóváhagyó
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Kérjük, válasszon egy köteget"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Értékelési csoport neve
@@ -3590,10 +3612,9 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollétet nem lehet kiosztani előbb mint {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kiosztás rekordhoz {1}"
 apps/erpnext/erpnext/accounts/party.py +317,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
 apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,Tanuló kérelmező
-DocType: Hub Tracked Item,Hub Tracked Item,Hub Láncos tétel
+DocType: Hub Tracked Item,Hub Tracked Item,Hub követett tétel
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,EREDETI A KEDVEZMÉNYEZETTNEK
 DocType: Asset Category Account,Accumulated Depreciation Account,Halmozott értékcsökkenés számla
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ez az e-mail automatikusan generált
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
 DocType: Program Enrollment,Boarding Student,Étkezés tanuló
 DocType: Asset,Expected Value After Useful Life,Várható érték a  hasznos élettartam után
@@ -3613,26 +3634,26 @@
 DocType: Delivery Note,Track this Delivery Note against any Project,Kövesse nyomon ezt a szállítólevelet bármely Projekt témával
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +35,Net Cash from Investing,Származó nettó készpénz a Befektetésekből
 DocType: Work Order,Work-in-Progress Warehouse,Munkavégzés raktára
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Vagyoneszköz {0} be kell nyújtani
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Vagyontárgy {0} be kell nyújtani
 DocType: Fee Schedule Program,Total Students,Összes diák
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Részvételi rekord {0} létezik erre a Tanulóra {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Hivatkozás # {0} dátuma {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Értékcsökkentési leírás az eszköz eltávolítása miatt
-DocType: Member,Member,Tag
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Értékcsökkentési leírás a vagyontárgy eltávolítása miatt
+DocType: Loan,Member,Tag
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Címek kezelése
 DocType: Work Order Item,Work Order Item,Munka Rendelés tétele
 DocType: Pricing Rule,Item Code,Tételkód
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Mezőgazdasági igazgató
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
 DocType: Supplier Scorecard Period,Variables,Változók
 DocType: Employee Internal Work History,Employee Internal Work History,Alkalmazott cégen belüli mozgása
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Záró (ÉCS)
 DocType: Cheque Print Template,Cheque Size,Csekk Méret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Szériaszám: {0} nincs készleten
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Szériaszám: {0} nincs készleten
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Adó sablon az eladási ügyletekere.
 DocType: Sales Invoice,Write Off Outstanding Amount,Írja le a fennálló kintlévő negatív összeget
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Számla {0} nem egyezik ezzel a vállalkozással: {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,Alapértelmezett raktár mértékegység
 DocType: Asset,Number of Depreciations Booked,Lekönyvelt amortizációk száma
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Összes mennyiség
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Dolgozó fizetésével szemben: {0}
 DocType: Landed Cost Item,Receipt Document,Nyugta dokumentum
 DocType: Employee Education,School/University,Iskola / Egyetem
 DocType: Payment Request,Reference Details,Hivatkozó Részletek
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,Progresszív leírási modell egyenleg
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Lezárt rendelést nem lehet törölni. Nyissa fel megszüntetéshez.
 DocType: Student Guardian,Father,Apa
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Készlet frisítés' nem ellenőrizhető tárgyi eszköz értékesítésre
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Készlet frisítés' nem ellenőrizhető tárgyi eszköz értékesítésre
 DocType: Bank Reconciliation,Bank Reconciliation,Bank egyeztetés
 DocType: Attendance,On Leave,Távolléten
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Változások lekérdezése
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,Alacsonyabb jövedelmű
 DocType: Restaurant Order Entry,Current Order,Jelenlegi Megrendelés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Forrás és cél raktárban nem lehet azonos sorban {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség számlának Eszköz / Kötelezettség típusú számlának kell lennie, mivel ez a Készlet egyeztetés egy kezdő könyvelési tétel"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség számlának Vagyontárgy/Kötelezettség típusú számlának kell lennie, mivel ez a Készlet egyeztetés egy Nyitó könyvelési tétel"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Menjen a Programokhoz
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"{0} sor # A lekötött összeg {1} nem lehet nagyobb, mint a nem követelt összeg {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"{0} sor # A lekötött összeg {1} nem lehet nagyobb, mint a nem követelt összeg {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Beszerzési megrendelés száma szükséges ehhez az elemhez {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" értéknek későbbinek kell lennie a ""Dátumig"" értéknél"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,Fizetési feltételek
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Perc
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Beszerzési megrendelés Adók és díjak
 DocType: Chapter,Meetup Embed HTML,Találkozó HTML beágyazása
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Menjen a Beszállítókhoz
@@ -3710,31 +3729,33 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Árajánlat {0} nem ilyen típusú {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó ütemező tétel
 DocType: Sales Order,%  Delivered,% kiszállítva
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Kérjük, állítsa be az e-mail azonosítót a hallgatónak a fizetési igény kérelem elküldéséhez"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Kérjük, állítsa be az e-mail azonosítót a hallgatónak a fizetési igény kérelem elküldéséhez"
 DocType: Patient,Medical History,Kórtörténet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Folyószámlahitel főkönyvi számla
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Folyószámlahitel főkönyvi számla
 DocType: Patient,Patient ID,Betegazonosító
 DocType: Physician Schedule,Schedule Name,Ütemezési név
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Bérpapír létrehozás
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Összes beszállító hozzáadása
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Összes beszállító hozzáadása
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"# {0} sor: elkülönített összeg nem lehet nagyobb, mint fennálló összeg."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Keressen anyagjegyzéket
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Záloghitel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Záloghitel
 DocType: Purchase Invoice,Edit Posting Date and Time,Rögzítési dátum és idő szerkesztése
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Kérjük, állítsa be Értékcsökkenéssel kapcsolatos számlákat ebben a Vagyoniszköz  Kategóriában {0} vagy vállalkozásban {1}"
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Kérjük, állítsa be Értékcsökkenéssel kapcsolatos számlákat ebben a Vagyoni-eszköz  kategóriában {0} vagy vállalkozásban {1}"
 DocType: Lab Test Groups,Normal Range,Normál tartomány
 DocType: Academic Term,Academic Year,Akadémiai tanév
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Elérhető értékesítés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saját tőke nyitó egyenlege
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Saját tőke nyitó egyenlege
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Fennmaradó
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
+DocType: Loan,Loan Account,Hitelszámla
 DocType: Purchase Invoice,GST Details,GST részletei
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mailt elküldve a beszállítóhoz {0}
 DocType: Item,Default Sales Unit of Measure,Alapértelmezett értékesítési egység
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akadémiai tanév:
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nem engedélyezhető az {0} tételre az alternatív tétel beállítása
+DocType: Subscription,Past Due Date,Lejárt esedékesség
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nem engedélyezhető az {0} tételre az alternatív tétel változat beállítása
 DocType: Opportunity,OPTY-,LEHET-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Hitelesített aláírás
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,A betegek vizit látogatása
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Jóváhagyó beosztás nem lehet ugyanaz, mint a beosztás melyre a szabály alkalmazandó"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Leiratkozni erről az üsszefoglaló e-mail -ről
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Szerezd meg beszállítóit
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Szerezd meg beszállítóit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nem található az {1} tételhez
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Menjen a Tanfolyamokra
 DocType: Accounts Settings,Show Inclusive Tax In Print,Adóval együtt megjelenítése a nyomtatáson
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Üzenet elküldve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Al csomópontokkal rendelkező számlát nem lehet beállítani főkönyvi számlává
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Arány, amelyen az Árlista pénznemét átalakítja az Ügyfél alapértelmezett pénznemére"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság pénznemében)
 DocType: Physician,Physician Schedules,Orvos ütemezése
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,"A teljes előleg összege nem lehet nagyobb, mint a teljes szankcionált összege"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,"A teljes előleg összege nem lehet nagyobb, mint a teljes szankcionált összege"
 DocType: Salary Slip,Hour Rate,Óra árértéke
 DocType: Stock Settings,Item Naming By,Tétel elnevezés típusa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb Időszak záró bejegyzés {0} létre lett hozva ez után: {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nem engedélyezett a készlet tranzakciók frissítése, mely régebbi, mint {0}"
 DocType: BOM,Inspection Required,Minőség-ellenőrzés szükséges
 DocType: Purchase Invoice Item,PR Detail,FIZKER részlete
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Adja meg a Bankgarancia számot az elküldés előtt.
 DocType: Driving License Category,Class,Osztály
 DocType: Sales Order,Fully Billed,Teljesen számlázott
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,A munka megrendelést nem lehet felvenni a tétel sablonjával szemben
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A csomag bruttó tömege. Általában a nettó tömeg + csomagolóanyag súlya. (nyomtatáshoz)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a Beosztással engedélyt kapnak, hogy zároljanak számlákat és létrehozzanek / módosítsanak könyvelési tételeket a zárolt számlákon"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 DocType: Serial No,Is Cancelled,Ez törölve
 DocType: Student Group,Group Based On,Ezen alapuló csoport
 DocType: Journal Entry,Bill Date,Számla kelte
@@ -3796,9 +3818,10 @@
 DocType: Cheque Print Template,Cheque Height,Csekk magasság
 DocType: Supplier,Supplier Details,Beszállítói adatok
 DocType: Setup Progress,Setup Progress,Telepítés előrehaladása
+DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzéteszi a tételeket a Hubon
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"Űrlap értéke kisebb legyen, mint az érték ebben a sorban {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Banki átutalás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Összes ellenőrzése
 ,Issued Items Against Work Order,Kiadott tételek a munka megrendeléshez
 DocType: Vehicle Log,Invoice Ref,Számla hiv.
@@ -3811,7 +3834,7 @@
 DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy látszódjon a weboldalon"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +338,Balance ({0}),Mérleg ({0})
 apps/erpnext/erpnext/config/accounts.py +134,Banking and Payments,Banki ügyletek és Kifizetések
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,Adja meg az API fogyasztó kulcsot
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,Adja meg az API fogyasztói kulcsot
 ,Welcome to ERPNext,Üdvözöl az ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Érdeklődést Lehetőséggé
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +34,Email Reminders will be sent to all parties with email contacts,Az e-mailes emlékeztetőket az e-mail címekkel rendelkező összes félnek elküldjük
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,Vámtarifaszám
 DocType: Work Order Item,Available Qty at WIP Warehouse,Elérhető Mennyiség a WIP raktárban
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Tervezett
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Széria sz.: {0} nem tartozik ehhez a Raktárhoz {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Széria sz.: {0} nem tartozik ehhez a Raktárhoz {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi a túlteljesítést és túl-könyvelést erre a tételre {0}, mivel a mennyiség vagy összeg az:  0"
 DocType: Notification Control,Quotation Message,Árajánlat üzenet
-DocType: Employee Loan,Employee Loan Application,Alkalmazotti hitelkérelem
 DocType: Issue,Opening Date,Nyitás dátuma
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,"Kérjük, először mentse el a pácienst"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,"Kérjük, először mentse el a pácienst"
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Részvétel jelölése sikeres.
 DocType: Program Enrollment,Public Transport,Tömegközlekedés
 DocType: Soil Texture,Silt Composition (%),Iszap összetétel (%)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),Tétel egyenleg (egyszerű)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Beszállítók által benyújtott számlák
 DocType: POS Profile,Write Off Account,Leíró számla
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Terhelési értesítő össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Terhelési értesítő össz
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Beszerzési számla ellenszámlája
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
@@ -3871,10 +3893,11 @@
 DocType: Soil Analysis Criteria,Soil Analysis Criteria,Talajelemzési kritérium
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2037,Please select customer,"Kérjük, válasszon vevőt"
 DocType: C-Form,I,én
-DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
+DocType: Company,Asset Depreciation Cost Center,Vagyontárgy Értékcsökkenés Költséghely
 DocType: Production Plan Sales Order,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
 DocType: Assessment Plan,Assessment Plan,Értékelés terv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Fordított naplóbejegyzés
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,A(z)  {0} vevő létrehozva.
 DocType: Stock Settings,Limit Percent,Határérték százalék
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Jelenleg nincs raktárkészlet egyik raktárban sem
@@ -3888,27 +3911,29 @@
 DocType: Journal Entry,Stock Entry,Készlet bejegyzés
 DocType: Payment Entry,Payment References,Fizetési hivatkozások
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Az intervallummező intervallumainak száma, pl. Ha az intervallum &quot;Napok&quot; és a számlázási intervallum értéke 3, a számlák 3 naponként generálódnak"
 DocType: Vehicle,Insurance Details,Biztosítási részletek
 DocType: Account,Payable,Kifizetendő
 DocType: Share Balance,Share Type,Típus megosztása
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszakokat"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszakokat"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Követelések ({0})
 DocType: Pricing Rule,Margin,Árkülönbözet
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új Vevők
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttó nyereség %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruttó nyereség %
 DocType: Appraisal Goal,Weightage (%),Súlyozás (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS profil megváltoztatása
 DocType: Bank Reconciliation Detail,Clearance Date,Végső dátum
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Értékelő jelentés
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
-apps/erpnext/erpnext/setup/doctype/company/company.js +95,Company name not same,A cégnév nem azonos
+apps/erpnext/erpnext/setup/doctype/company/company.js +95,Company name not same,A vállalkozás neve nem azonos
 DocType: Lead,Address Desc,Cím leírása
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Ügyfél kötelező
 DocType: Journal Entry,JV-,KT-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Más sorokban duplikált határidőket tartalmazó sorok találhatóak: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Más sorokban duplikált határidőket tartalmazó sorok találhatóak: {list}
 DocType: Topic,Topic Name,Téma neve
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Kérjük, állítsa be az alapértelmezett sablont a jóváhagyási értesítéshez a HR beállításoknál."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Legalább az Értékesítést vagy Beszerzést választani kell
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Válassza ki a munkavállalót, hogy megkapja a munkavállaló előleget."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Válassza ki a munkavállalót, hogy megkapja a munkavállaló előleget."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,"Kérjük, válasszon egy érvényes dátumot"
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Válassza ki a vállalkozása fajtáját.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledger megosztása
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},#{0}sor: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},#{0}sor: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,A {0} kimenő értékesítési számla létrehozva
 DocType: Employee,Confirmation Date,Visszaigazolás dátuma
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,Halmozott értékcsökkenés
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Állandó név
 DocType: Stock Entry,Customer or Supplier Details,Vevő vagy Beszállító részletei
-DocType: Employee Loan Application,Required by Date,Kötelező dátumonként
+DocType: Loan Application,Required by Date,Kötelező dátumonként
 DocType: Lead,Lead Owner,Érdeklődés tulajdonosa
 DocType: Production Plan,Sales Orders Detail,Vevői rendelések részletei
 DocType: Bin,Requested Quantity,kért mennyiség
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttó bér - Összes levonás - Hitel visszafizetése
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Jelenlegi anyagjegyzék és az ÚJ anyagjegyzés nem lehet ugyanaz
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Bérpapír ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Több változat
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% szállítva
+DocType: Subscription,Trial Period Start Date,Próbaidő kezdési dátuma
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Tétel {0}: Rendelet Mennyisége: {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (Tételnél meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi Felbontás százaléka
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,"Kérjük, lépjen be mint másik felhasználó."
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,Diák felügyelő
 DocType: Member,Member Name,Tag neve
 DocType: Stock Settings,Use Naming Series,Használjon sorszámozási csoportokat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
 DocType: POS Profile,Update Stock,Készlet frissítése
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,az előfizetésben
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegység a tételekhez, helytelen (Összes) Nettó súly értékhez vezet. Győződjön meg arról, hogy az egyes tételek nettó tömege ugyanabban a mértékegységben van."
 DocType: Membership,Payment Details,Fizetési részletek
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Anyagjegyzék Díjszabási ár
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Anyagjegyzék Díjszabási ár
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","A Megszakított Munka Rendelést nem lehet törölni,  először folytassa a megszüntetéshez"
 DocType: Asset,Journal Entry for Scrap,Naplóbejegyzés selejtezéshez
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Kérjük, vegye kia a tételeket a szállítólevélből"
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,Föld terület
 ,Purchase Analytics,Beszerzés analitika
 DocType: Sales Invoice Item,Delivery Note Item,Szállítólevél tétel
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,A jelenlegi {0} számla hiányzik
 DocType: Asset Maintenance Log,Task,Feladat
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia sor #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Köteg szám kötelező erre a tételre: {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,Árfolyamnyereség / veszteség számla
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Alkalmazott és nyilvántartás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Ezen célok közül kell választani: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Tényleges Mennyiség a raktáron
 DocType: Homepage,"URL for ""All Products""","AZ ""Összes termék"" URL elérési útja"
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Alapértelmezett értékesítési ár
 DocType: Account,Rate at which this tax is applied,"Arány, amelyen ezt az adót alkalmazzák"
 DocType: Cash Flow Mapper,Section Name,Szekció neve
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Újra rendelendő mennyiség
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Újra rendelendő mennyiség
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Jelenlegi munkalehetőségek
 DocType: Company,Stock Adjustment Account,Készlet igazítás számla
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Leíró
@@ -4034,14 +4060,14 @@
 DocType: Task,depends_on,attól függ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Sorbaállítva a legfrissebb ár frissítéséhez minden anyagjegyzékben. Néhány percig eltarthat.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Új fiók  neve. Megjegyzés: Kérjük, ne hozzon létre Vevő és Beszállítói fiókokat."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
 DocType: Water Analysis,Appearance,Megjelenítés
+DocType: HR Settings,Leave Status Notification Template,Hagyja el az állapotjelentési sablont
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Átl. beszezési árlista érték
 DocType: Sales Order Item,Supplier delivers to Customer,Beszállító szállít a Vevőnek
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Tag információi.
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) elfogyott
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +58,Asset Maintenance,Eszköz karbantartás
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +58,Asset Maintenance,Vagyontárgy karbantartás
 ,Sales Payment Summary,Értékesítési bevétel összefoglaló
 DocType: Restaurant,Restaurant,Étterem
 DocType: Woocommerce Settings,API consumer key,API fogyasztói kulcs
@@ -4059,11 +4085,11 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nem engedélyezett. Tiltsa le a tesztsablont
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%-al
 DocType: Crop Cycle,Linked Land Unit,Kapcsolt föld terület
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
 DocType: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
-DocType: Purchase Order,Order Confirmation Date,Megrendelés megerősítési dátuma
+DocType: Purchase Order,Order Confirmation Date,Megrendelés visszaigazolás  dátuma
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +215,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
 DocType: Company,Default Cash Account,Alapértelmezett készpénzforgalmi számla
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Menjen a felhasználókhoz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,"Fizetett összeg + Leírható összeg nem lehet nagyobb, mint a Teljes összeg"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Köteg szám ehhez a tételhez {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég távollét egyenlege erre a távollét típusra {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég távollét egyenlege erre a távollét típusra {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Érvénytelen GSTIN vagy írja be NA a nem regisztrálthoz
 DocType: Training Event,Seminar,Szeminárium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Beiratkozási díj
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,Közzététel Elérhetőség
 DocType: Company,Create Chart Of Accounts Based On,Készítsen számlatükröt ez alapján
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nem konvertálható nem csoportba. Al feladatok léteznek.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Születési idő nem lehet nagyobb a mai napnál.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Születési idő nem lehet nagyobb a mai napnál.
 ,Stock Ageing,Készlet öregedés
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Tanuló {0} létezik erre a hallgatói kérelmezésre {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Kerekítési korrekció (vállalkozás pénzneme)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Jelenléti ív
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Köteg:
 DocType: Volunteer,Afternoon,Délután
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' letiltott
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' letiltott
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Megnyitottá állít
 DocType: Cheque Print Template,Scanned Cheque,Beolvasott Csekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldjön automatikus e-maileket a Kapcsolatoknak a benyújtott tranzakciókkal.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,A {0} projekt már létezik
 DocType: Medical Department,Nursing User,Ápoló felhasználó
 DocType: Plant Analysis,Plant Analysis Criterias,Növényelemzési kritériumok
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Felelősségek
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},A {0} sorozatszám nem tartozik a {1} tételhez
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Felelősségek
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ennek az árajánlatnak az érvényességi ideje lejárt.
 DocType: Expense Claim Account,Expense Claim Account,Költség követelés számla
 DocType: Accounts Settings,Allow Stale Exchange Rates,Engedélyezze az átmeneti árfolyam értékeket
@@ -4123,7 +4150,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,Felhasználók hozzáadása
 DocType: POS Item Group,Item Group,Anyagcsoport
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Student Group: ,Diák csoport:
-apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Válassz országot
+apps/erpnext/erpnext/public/js/hub/hub_listing.js +388,Select Country,Válasszon országot
 DocType: Item,Safety Stock,Biztonsági készlet
 DocType: Healthcare Settings,Healthcare Settings,Egészségügyi beállítások
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Előrehaladás % , egy feladatnak nem lehet nagyobb, mint 100."
@@ -4132,15 +4159,15 @@
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadva (a vállalkozás pénznemében)
 apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
 DocType: Sales Order,Partly Billed,Részben számlázott
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Tétel: {0}, álló-eszköz tételnek kell lennie"
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Változatok létrehozása
 DocType: Item,Default BOM,Alapértelmezett anyagjegyzék BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Összesen számlázott összeg (értékesítési számlák alapján)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Terhelési értesítő összege
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Terhelési értesítő összege
 DocType: Project Update,Not Updated,Nincs frissítve
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Vannak ellentmondások az arány, a részvények száma és a kiszámított összeg között"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Kérjük ismítelje meg a cég nevét, a jóváhagyáshoz."
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Teljes fennálló kintlévő össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Teljes fennálló kintlévő össz
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
 DocType: Employee Advance,Advance Account,Előleg számla
 DocType: Job Offer,Job Offer Terms,Állás ajánlat feltételei
@@ -4148,8 +4175,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},"Összes Tartozásnak egyeznie kell az összes Követeléssel. A különbség az, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Autóipar
 DocType: Vehicle,Insurance Company,Biztosítótársaság
-DocType: Asset Category Account,Fixed Asset Account,Állóeszköz-számlafiók
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Változó
+DocType: Asset Category Account,Fixed Asset Account,Álló-eszköz főkönyvi számla
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Változó
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Szállítólevélből
 DocType: Chapter,Members,Tagok
 DocType: Student,Student Email Address,Tanuló email címe
@@ -4172,7 +4199,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Belső
 DocType: Delivery Stop,Address Name,Cím Neve
 DocType: Stock Entry,From BOM,Anyagjegyzékből
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},A(z) {0} szétosztása ezekre az egységekre {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},A(z) {0} szétosztása ezekre az egységekre {1}
 DocType: Assessment Code,Assessment Code,Értékelés kód
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Készlet tranzakciók  {0}  előtt befagyasztották
@@ -4180,25 +4207,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátumot"
 DocType: Bank Reconciliation Detail,Payment Document,Fizetési dokumentum
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Hiba a kritérium-formula kiértékelésében
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,A csatlakozás dátumának nagyobbnak kell lennie a születési dátumnál
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,A csatlakozás dátumának nagyobbnak kell lennie a születési dátumnál
+DocType: Subscription,Plans,tervek
 DocType: Salary Slip,Salary Structure,Bérrendszer
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Légitársaság
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Problémás Anyag
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Hiba történt az  ismétlődő létrehozásakor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Problémás Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátuma
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Árajánlatok
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Diákcsoportokat nem hozott létre.
 DocType: Purchase Invoice Item,Serial No,Széria sz.
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint a hitel összege"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint a hitel összege"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Kérjük, adja meg a fenntartás Részleteket először"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,# {0} sor: Az elvárt kiszállítási dátum nem lehet a Beszerzési megrendelés dátuma előtt
 DocType: Purchase Invoice,Print Language,Nyomtatási nyelv
 DocType: Salary Slip,Total Working Hours,Teljes munkaidő
 DocType: Sales Invoice,Customer PO Details,Vevő VEVMEGR részletei
-DocType: Subscription,Next Schedule Date,Következő ütemterv dátuma
 DocType: Stock Entry,Including items for sub assemblies,Tartalmazza a részegységek tételeit
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Ideiglenes nyitó számla
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
@@ -4226,16 +4252,16 @@
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Ettől és eddig időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Értékpapírok & árutőzsdék
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
 DocType: Shipping Rule,Calculate Based On,Számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Az említett kritériumok alapján nincsenek alkalmazottak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
 DocType: Hotel Settings,Default Customer,Alapértelmezett vevő
 DocType: Assessment Plan,Supervisor Name,Felügyelő neve
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne erősítse meg, hogy ugyanazon a napra már van találkozója"
 DocType: Program Enrollment Course,Program Enrollment Course,Program Jelentkezés kurzus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +165,Make Sample Retention Stock Entry,Készítsen mintavételi készlet bejegyzést
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +165,Make Sample Retention Stock Entry,Készítsen mintavétel visszatartás készlet bejegyzést
 DocType: Purchase Taxes and Charges,Valuation and Total,Készletérték és Teljes érték
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,Mutatószámok-
 DocType: Employee,This will restrict user access to other employee records,Ez korlátozza a felhasználói hozzáférést más alkalmazotti rekordokhoz
@@ -4254,16 +4280,16 @@
 DocType: Journal Entry Account,Employee Advance,Alkalmazotti előleg
 DocType: Payroll Entry,Payroll Frequency,Bérszámfejtés gyakoriság
 DocType: Lab Test Template,Sensitivity,Érzékenység
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Nyersanyag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Géppark és gépek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Géppark és gépek
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege a kedvezmény összege után
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Napi munka összefoglalási beállítások
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,"Kérjük, adja meg az igénylés dátumát"
 DocType: Payment Entry,Internal Transfer,belső Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Karbantartási feladatok
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy előirányzott Menny. vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Nyitás dátumának előbb kel llennie mint a  zárás dátuma
 DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Költséghely meglévő tranzakciókkal nem lehet átalakítani főkönyvi számlává
@@ -4271,13 +4297,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integrációk
 DocType: Crop Cycle,Detected Disease,Kimutatott kórokozó
 ,Produced,Gyártott
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,A visszafizetés kezdő dátuma nem lehet a kifizetési dátum előtt.
 DocType: Item,Item Code for Suppliers,Tétel kód a Beszállítóhoz
 DocType: Issue,Raised By (Email),Felvetette (e-mail)
 DocType: Training Event,Trainer Name,Képző neve
 DocType: Mode of Payment,General,Általános
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Utolsó kommunikáció
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Széria számok szükségesek a sorbarendezett  tételhez: {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Széria számok szükségesek a sorbarendezett  tételhez: {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Kifizetések és számlák főkönyvi egyeztetése
 DocType: Journal Entry,Bank Entry,Bank adatbevitel
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (Titulus)
@@ -4291,7 +4318,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Pénznemek engedélyezése / tiltása
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} a félnapi távolléten van ekkor {1}
 DocType: Production Plan,Get Material Request,Anyag igénylés lekérése
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Postai költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Postai költségek
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (Menny)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 ,Item Variant Details,Tétel változat részletei
@@ -4302,9 +4329,9 @@
 DocType: Drug Prescription,Hour,Óra
 DocType: Restaurant Order Entry,Last Sales Invoice,Utolsó értékesítési számla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},"Kérjük, válassza ki a mennyiséget az {0} tételhez"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új széria számnak nem lehet Raktára. Raktárat be kell állítani a Készlet bejegyzéssel vagy Beszerzési nyugtával
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új széria számnak nem lehet Raktára. Raktárat be kell állítani a Készlet bejegyzéssel vagy Beszerzési nyugtával
 DocType: Lead,Lead Type,Érdeklődés típusa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Nincs engedélye jóváhagyni az távolléteket a blokkolt dátumokon
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Nincs engedélye jóváhagyni az távolléteket a blokkolt dátumokon
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Mindezen tételek már kiszámlázottak
 DocType: Company,Monthly Sales Target,Havi eladási cél
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Jóváhagyhatja: {0}
@@ -4312,7 +4339,7 @@
 DocType: Item,Default Material Request Type,Alapértelmezett anyagigény típus
 DocType: Supplier Scorecard,Evaluation Period,Értékelési időszak
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Ismeretlen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Munkamegrendelést nem hoztuk létre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Munkamegrendelést nem hoztuk létre
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás szabály feltételei
 DocType: Purchase Invoice,Export Type,Export típusa
 DocType: Salary Slip Loan,Salary Slip Loan,Bérpapír kölcsön
@@ -4328,7 +4355,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Számlák összefoglalásának megnyitása
 DocType: Education Settings,Education Manager,Oktatási vezető
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimális távolság az egyes növények között az optimális növekedés érdekében
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Köteg Tételt: {0} nem lehet frissíteni a Készlet főkönyvi egyeztetés alkalmazásával, inkább a Készlet bejegyzést használja"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Köteg Tételt: {0} nem lehet frissíteni a Készlet főkönyvi egyeztetés alkalmazásával, inkább a Készlet bejegyzést használja"
 DocType: Quality Inspection,Report Date,Jelentés dátuma
 DocType: Student,Middle Name,Középső név
 DocType: C-Form,Invoices,Számlák
@@ -4359,20 +4386,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Nyugta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Nyugta
 ,Sales Register,Értékesítési Regisztráció
 DocType: Daily Work Summary Group,Send Emails At,Küldj e-maileket ide
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkesztenivaló.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Űrlap nézet
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Költségvetési jóváhagyó kötelezõ a költségigénylésben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,"Összefoglaló erre a hónapra, és folyamatban lévő tevékenységek"
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Felhasználók hozzáadása a szervezetéhez, kivéve saját magát."
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Még nem Vevők!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pénzforgalmi kimutatás
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nincs létrehozva anyag igény kérés
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenc
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válassza ki az átvitelt, ha Ön is szeretné az előző pénzügyi év mérlege ágait erre a költségvetési évre áthozni"
@@ -4395,11 +4423,12 @@
 DocType: Vehicle,Chassis No,Alvázszám
 DocType: Payment Request,Initiated,Kezdeményezett
 DocType: Production Plan Item,Planned Start Date,Tervezett kezdési dátum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,"Kérjük, válasszon ki egy ANYAGJ-et"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,"Kérjük, válasszon ki egy ANYAGJ-et"
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Az ITC integrált adót vette igénybe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
+DocType: Bank Guarantee,Clauses and Conditions,Kondíciók és feltételek
 DocType: Serial No,Creation Document Type,Létrehozott Dokumentum típus
 DocType: Project Task,View Timesheet,Munkaidő nyilvántartó jelenléti ív megtekintése
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,A befejezési dátumnak nagyobbnak kell lennie az elkezdés dátumánál
 DocType: Leave Type,Is Encash,Ez behajtható
 DocType: Leave Allocation,New Leaves Allocated,Új távollét lefoglalás
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt téma szerinti adatok nem állnak rendelkezésre az árajánlathoz
@@ -4413,9 +4442,10 @@
 DocType: Patient,Alcohol Current Use,Jelenlegi alkoholfogyasztás
 DocType: Student Admission Program,Student Admission Program,Tanulói felvételi program
 DocType: Payment Entry,Account Paid To,Számla kifizetve ennek:
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternatív tétel név
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Fő tétel {0} nem lehet Készletezett tétel
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Nem sikerült benyújtania fizetési csúszást <br> \ Lehetséges okok: <br> \ 1. A nettó fizetés kevesebb, mint 0. <br> \ 2. A vállalati mesterben megadott e-mail cím nem érvényes. <br>"
@@ -4423,9 +4453,8 @@
 DocType: Expense Claim,More Details,Részletek
 DocType: Supplier Quotation,Supplier Address,Beszállító címe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},"{0} költségvetés ehhez a főkönyvi számlához {1}, ez ellen {2} {3} ami {4}. Ez meg fogja haladni ennyivel {5}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fióknak 'Állóeszköz' típusúnak kell lennie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fióknak 'Álló-eszköz' típusúnak kell lennie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Mennyiségen kívül
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,és kijelöletlenül  letiltva ebben
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Sorozat kötelező
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 DocType: Student Sibling,Student ID,Diákigazolvány ID
@@ -4437,14 +4466,16 @@
 DocType: Complaint,Complaint,Panasz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
 DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Visszafizetési bejegyzés
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Minden részleg
 DocType: Patient,Alcohol Past Use,Korábbi alkoholfogyasztás
 DocType: Fertilizer Content,Fertilizer Content,Műtrágya tartalma
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Kr
 DocType: Project Update,Problematic/Stuck,Problémás/beragadt
 DocType: Tax Rule,Billing State,Számlázási Állam
 DocType: Share Transfer,Transfer,Átutalás
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,A  {0} munka rendelést meg kell szüntetni a vevői rendelés visszavonása előtt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Alkalmazott)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Határidő dátum kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
@@ -4468,10 +4499,11 @@
 DocType: Cheque Print Template,Message to show,Üzenet mutatni
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Kiskereskedelem
 DocType: Student Attendance,Absent,Távollévő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Gyártmány csomag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Gyártmány csomag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nem sikerült megtalálni a (z) {0} ponttól kezdődő pontszámot.  0-100-ig terjedő álló pontszámokat kell megadnia
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},{0} sor: Érvénytelen hivatkozás {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Beszerzési megrendelés adók és illetékek sablon
+DocType: Subscription,Current Invoice Start Date,Aktuális számla kezdési dátuma
 DocType: Timesheet,TS-,IDONY-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},"{0} {1}: Vagy nekünk tartozás, vagy tőlünk követelési összeg szükséges ehhez {2}"
 DocType: GL Entry,Remarks,Megjegyzések
@@ -4481,11 +4513,13 @@
 DocType: Task,Parent Task,Fő feladat
 DocType: Journal Entry,Write Off Based On,Leírja ez alapján
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Érdeklődés készítés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Nyomtatás és papíráruk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Nyomtatás és papíráruk
 DocType: Stock Settings,Show Barcode Field,Vonalkód mező mutatása
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Beszállítói e-mailek küldése
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott a {0} és {1} közti időszakra, Távollét alkalmazásának időszaka nem eshet ezek közözti időszakok közé."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Beszállítói e-mailek küldése
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott a {0} és {1} közti időszakra, Távollét alkalmazásának időszaka nem eshet ezek közözti időszakok közé."
+DocType: Fiscal Year,Auto Created,Automatikus létrehozás
 DocType: Chapter Member,Leave Reason,Távvollét oka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,A (z) {0} számla már nem létezik
 DocType: Guardian Interest,Guardian Interest,Helyettesítő kamat
 DocType: Volunteer,Availability,Elérhetőség
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS értékesítési kassza számlák alapértelmezett értékeinek beállítása
@@ -4493,25 +4527,24 @@
 DocType: Project,Time to send,Idő az elküldéshez
 DocType: Timesheet,Employee Detail,Alkalmazott részlet
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Helyettesítő1 e-mail azonosító
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Következő Dátumnak és az ismétlés napjának egyezőnek kell lennie
 DocType: Lab Prescription,Test Code,Tesztkód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Beállítások az internetes honlaphoz
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},"Árajánlat nem engedélyezett erre: {0}, a mutatószám állás amiatt: {1}"
 DocType: Job Offer,Awaiting Response,Várakozás válaszra
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Fent
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Teljes összeg {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Teljes összeg {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Megemlít, ha nem szabványos fizetendő számla"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Kérjük, válasszon értékelés csoprotot ami más mint  'Az összes Értékelési csoportok'"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},{0} sor: Költséghely szükséges egy tételre: {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,EcritureDate
-apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,Ez az orvos ellen folytatott tranzakciókra épül.
+apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,Ez az orvossal kapcsolatos tranzakciókra épül.
 DocType: Training Event Employee,Optional,Választható
 DocType: Salary Slip,Earning & Deduction,Jövedelem és levonás
 DocType: Agriculture Analysis Criteria,Water Analysis,Vízelemzés
 DocType: Chapter,Region,Régió
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,"Választható. Ezt a beállítást kell használni, a különböző tranzakciók szűréséhez."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatív készletérték ár nem megengedett
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatív készletérték ár nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Csatolt elemzés újratöltése
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pl.: 2012, 2012-13"
@@ -4524,10 +4557,10 @@
 DocType: Sales Invoice,Product Bundle Help,Gyártmány csomag Súgója
 ,Monthly Attendance Sheet,Havi jelenléti ív
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,Nem található bejegyzés
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Selejtezett eszközök költsége
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Selejtezett vagyoni-eszközök költsége
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költséghely kötelező ehhez a tételhez {2}
 DocType: Vehicle,Policy No,Irányelv sz.:
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Elemek beszerzése a termék csomagokból
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Elemek beszerzése a termék csomagokból
 DocType: Asset,Straight Line,Egyenes
 DocType: Project User,Project User,Projekt téma felhasználó
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Osztott
@@ -4563,21 +4596,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Útvonal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Nem lehet átalakítani költséghelyet főkönyvi számlán hiszen vannak al csomópontjai
 DocType: Production Plan,Total Planned Qty,Teljes tervezett mennyiség
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Nyitó érték
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Nyitó érték
 DocType: Salary Detail,Formula,Képlet
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Szériasz #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Szériasz #
 DocType: Lab Test Template,Lab Test Template,Labor teszt sablon
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Értékesítési számla
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Értékesítési számla
 DocType: Purchase Invoice Item,Total Weight,Össz súly
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Értékesítések jutalékai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Értékesítések jutalékai
 DocType: Job Offer Term,Value / Description,Érték / Leírás
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","#{0} sor: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","#{0} sor: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási Ország
 DocType: Purchase Order Item,Expected Delivery Date,Várható szállítás dátuma
 DocType: Restaurant Order Entry,Restaurant Order Entry,Étterem rendelési bejegyzés
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Tartozik és követel nem egyenlő a {0} # {1}. Ennyi a különbség {2}.
 DocType: Asset Maintenance Task,Assign To Name,Névhez rendelés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Reprezentációs költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Reprezentációs költségek
 DocType: Hub Settings,Enabled Users,Engedélyezett felhasználók
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Anyag igénylés létrehozás
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Tétel {0} megnyitása
@@ -4590,24 +4623,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Távollétre jelentkezés.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Meglévő tranzakcióval rendelkező számla nem törölhető.
 DocType: Vehicle,Last Carbon Check,Utolsó másolat megtekintés
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Jogi költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Jogi költségek
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Kérjük, válasszon mennyiséget a soron"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Nyitó értékesítési és beszerzési számlák készítése
 DocType: Purchase Invoice,Posting Time,Rögzítés ideje
 DocType: Timesheet,% Amount Billed,% mennyiség számlázva
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon költségek
 DocType: Sales Partner,Logo,Logó
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Jelölje be, ha azt akarja, hogy a felhasználó válassza ki a sorozatokat mentés előtt. Nem lesz alapértelmezett, ha bejelöli."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nincs tétel ezzel a Széris számmal {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nincs tétel ezzel a Széris számmal {0}
 DocType: Email Digest,Open Notifications,Értesítések megnyitása
 DocType: Payment Entry,Difference Amount (Company Currency),Eltérés összege (Válalat pénzneme)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Közvetlen költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Közvetlen költségek
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vevő árbevétel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Utazási költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Egyéni mező-feliratkozás hozzáadása erre a doctype-ra:  {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
 DocType: Purchase Receipt Item,Sample Quantity,Minta mennyisége
+DocType: Bank Guarantee,Name of Beneficiary,Kedvezményezett neve
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Az ANYAGJ frissítése automatikusan az ütemezőn keresztül történik, a legfrissebb készletérték ár / árlisták ára /  a nyersanyagok utolsó beszerzési ára alapján."
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
@@ -4619,14 +4652,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Próbaidő
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Bér összetevők
 DocType: Program Enrollment Tool,New Academic Year,Új Tanév
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Vissza / Követelés értesítő
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Vissza / Követelés értesítő
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto Árlista érték beillesztés, ha hiányzik"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Teljes fizetett összeg
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Teljes fizetett összeg
 DocType: GST Settings,B2C Limit,B2C határérték
 DocType: Work Order Item,Transferred Qty,Átvitt Mennyiség
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigálás
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Tervezés
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Tervezés
 DocType: Share Balance,Issued,Kiadott Probléma
+DocType: Loan,Repayment Start Date,Visszafizetési kezdőnap
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Tanulói tevékenység
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Beszállító Id
 DocType: Payment Request,Payment Gateway Details,Fizetési átjáró  részletei
@@ -4639,10 +4673,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Távollétek típusa, mint alkalmi, beteg stb."
 DocType: Email Digest,Send regular summary reports via Email.,Küldje el a rendszeres összefoglaló jelentéseket e-mailben.
 DocType: Payment Entry,PE-,FIZBEV-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Kérjük, állítsa be az alapértelmezett főkönyvi számlát a Költség Követelés típusban: {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Kérjük, állítsa be az alapértelmezett főkönyvi számlát a Költség Követelés típusban: {0}"
 DocType: Assessment Result,Student Name,Tanuló neve
 DocType: Brand,Item Manager,Tétel kezelő
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Bérszámfejtés fizetendő
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Bérszámfejtés fizetendő
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
 DocType: Plant Analysis,Collection Datetime,Gyűjtés záró dátuma
 DocType: Work Order,Total Operating Cost,Teljes működési költség
@@ -4652,9 +4686,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,A(z) {0} felhasználó nem létezik
 DocType: Payment Term,Day(s) after invoice date,Nap(ok) a számla dátumát követően
 DocType: Payment Schedule,Payment Schedule,Fizetési ütemeés
-DocType: Subscription,SUB-,ALATTI-
 DocType: Item Attribute Value,Abbreviation,Rövidítés
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Fizetés megadása már létezik
+DocType: Subscription,Trial Period End Date,Trial Period End Date
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem engedélyezett hiszen {0} meghaladja határértékek
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Fizetés sablon törzsadat.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patológia
@@ -4671,9 +4705,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Árajánlatok az Érdeklődőknek vagy Vevőknek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Beosztás engedélyezi a zárolt készlet szerkesztését
 ,Territory Target Variance Item Group-Wise,"Terület Cél Variáció, tételcsoportonként"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Összes vevői csoport
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Összes vevői csoport
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Halmozott Havi
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva ettől {1} eddig {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva ettől {1} eddig {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista árértékek (Vállalat pénznemében)
@@ -4682,14 +4716,15 @@
 DocType: Lab Prescription,Test Created,Teszt létrehozva
 DocType: Healthcare Settings,Custom Signature in Print,Egyén aláírása a nyomtatásban
 DocType: Account,Temporary,Ideiglenes
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Vevő LPO száma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Vevő LPO száma
 DocType: Program,Courses,Tanfolyamok
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Titkár
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Titkár
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ha kikapcsolja, a ""Szavakkal"" mező nem fog látszódni egyik tranzakcióban sem"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ez a művelet leállítja a jövőbeni számlázást. Biztosan törölni szeretné ezt az előfizetést?
 DocType: Serial No,Distinct unit of an Item,Különálló egység egy tételhez
 DocType: Supplier Scorecard Criteria,Criteria Name,Kritérium neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,"Kérjük, állítsa be a Vállalkozást"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Pricing Rule,Buying,Beszerzés
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Kórokozók és trágyák
 DocType: HR Settings,Employee Records to be created by,Alkalmazott bejegyzést létrehozó
@@ -4698,17 +4733,17 @@
 DocType: POS Profile,Apply Discount On,Alkalmazzon kedvezmény ezen
 DocType: Member,Membership Type,Tagság típusa
 ,Reqd By Date,Igénylt. Dátum szerint
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Hitelezők
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Hitelezők
 DocType: Assessment Plan,Assessment Name,Értékelés Neve
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC megjelenítése a nyomtatásban
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC megjelenítése a nyomtatásban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Sor # {0}: Sorszám kötelező
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Tételenkénti adó részletek
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Állás ajánlat
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Intézmény rövidítése
 ,Item-wise Price List Rate,Tételenkénti Árlista árjegyzéke
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavakkal mező lesz látható, miután mentette az Árajánlatot."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Mennyiség ({0}) nem lehet egy töredék ebben a sorban {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Mennyiség ({0}) nem lehet egy töredék ebben a sorban {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,CSAT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
@@ -4721,12 +4756,12 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező a Visszaadáshoz
 DocType: Purchase Order,To Receive,Beérkeztetés
 apps/erpnext/erpnext/utilities/user_progress.py +252,user@example.com,felhasznalo@pelda.com
-DocType: Asset,Asset Owner,Eszköz tulajdonos
+DocType: Asset,Asset Owner,Vagyontárgy tulajdonos
 DocType: Employee,Personal Email,Személyes emailcím
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Összes variáció
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ha engedélyezve van, a rendszer automatikusan kiküldi a könyvelési tételeket a leltárhoz."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Ügynöki jutalék
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Jelenléte az alkalmazottnak {0} már jelölt erre a napra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Jelenléte az alkalmazottnak {0} már jelölt erre a napra
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",percben Frissítve az 'Idő napló'-n keresztül
 DocType: Customer,From Lead,Érdeklődésből
@@ -4737,6 +4772,7 @@
 DocType: Lab Test,Approved Date,Jóváhagyás dátuma
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Alapértelmezett értékesítési
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Legalább egy Raktár kötelező
+DocType: Subscriber,Subscriber Name,Előfizető neve
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Update Tool,Replace,Csere
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nem talált termékeket.
@@ -4746,19 +4782,18 @@
 DocType: Request for Quotation Item,Project Name,Projekt téma neve
 DocType: Customer,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
 DocType: Journal Entry Account,If Income or Expense,Ha bevétel vagy kiadás
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Válassza ki a kamatjövedelem számlát az alkalmazotti kölcsönben: {0}
 DocType: Work Order,Required Items,Kötelező elemek
 DocType: Stock Ledger Entry,Stock Value Difference,Készlet értékkülönbözet
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Emberi Erőforrás HR
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetés főkönyvi egyeztetés Fizetés
 DocType: Disease,Treatment Task,Kezelési feladat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Adó eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Adó tárgyi eszközökhöz
 DocType: BOM Item,BOM No,Anyagjegyzék száma
 DocType: Instructor,INS/,OKT/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nincs főkönyvi számlája {1} vagy már párosított másik utalvánnyal
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Update Tool,The BOM which will be replaced,"Az anyagjegyzék, ami mindenhol lecserélésre kerül"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektronikus berendezések
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektronikus berendezések
 DocType: Asset,Maintenance Required,Karbantartás szükséges
 DocType: Account,Debit,Tartozás
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Távolléteket foglalni kell a 0,5 többszöröseként"
@@ -4767,7 +4802,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Fennálló kinntlévő negatív össz
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Csoportonkénti Cél tétel beállítás ehhez az Értékesítő személyhez.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Ennél régebbi készletek zárolása [Napok]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Sor # {0}: Vagyontárgy kötelező állóeszköz vétel / eladás
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Sor # {0}: Vagyontárgy kötelező álló-eszköz vétel / eladás
 DocType: Asset Maintenance Team,Maintenance Team Name,Karbantartási csoport neve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ha két vagy több árképzési szabály található a fenti feltételek alapján, Prioritást alkalmazzák. Prioritás egy 0-20 közötti szám, míg az alapértelmezett értéke nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget élvez, ha több árképzési szabály azonos feltételekkel rendelkezik."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"A Vevő kötelezõ, ha Vevőként került kijelölésre a 'Lehetőség űrlap'"
@@ -4776,19 +4811,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Engedélyezze a következő felhasználók Távollét alkalmazás jóváhagyását a blokkolt napokra.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Garanciális ügyek költség típusa.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"Eladási ár ehhez a tételhez {0} alacsonyabb, mint a {1}. Eladási árnak legalább ennyienk kell lennie {2}"
-DocType: Item,Taxes,Adók
+DocType: Subscription,Taxes,Adók
 DocType: Purchase Invoice,capital goods,tőkejavak
 DocType: Purchase Invoice Item,Weight Per Unit,Egységenkénti súly
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Fizetett és nincs leszállítva
 DocType: Project,Default Cost Center,Alapértelmezett költséghely
-DocType: Bank Guarantee,End Date,Befejezés dátuma
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Készlet tranzakciók
 DocType: Budget,Budget Accounts,Költségvetési számlák
 DocType: Employee,Internal Work History,Belső munka története
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Halmozott értékcsökkenés összege
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Személyes saját tőke
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Beszállító mutatószám változó
-DocType: Employee Loan,Fully Disbursed,Teljes egészében folyosításra került
 DocType: Employee Advance,Due Advance Amount,Előleg összeg határideje
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
@@ -4812,7 +4845,7 @@
 ,Employee Information,Alkalmazott adatok
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Beszállítói ajánlat létrehozás
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Beszállítói ajánlat létrehozás
 DocType: Quality Inspection,Incoming,Bejövő
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Az értékesítés és a vásárlás alapértelmezett adómintáit létre hozták.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Értékelés eredménye rekord {0} már létezik.
@@ -4820,7 +4853,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Kérjük, állítsa Vállakozás szűrését üresre, ha a csoportosítás beállítása 'Vállalkozás'"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Könyvelési dátum nem lehet jövőbeni időpontban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,az ismétlődő generáláshoz
 DocType: Stock Entry,Target Warehouse Address,Cél raktár címe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Alkalmi távollét
 DocType: Agriculture Task,End Day,Befejezés napja
@@ -4845,11 +4877,10 @@
 DocType: Material Request,% Ordered,% Rendezve
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Tanfolyam alapú Tanuló csoport, a Tanfolyamon érvényesítésre kerül minden hallgató aki beiratkozott a tanfolyamra a Program beiratkozáskor."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Darabszámra fizetett munka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Átlagos vásárlási  érték
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Átlagos vásárlási  érték
 DocType: Share Balance,From No,Ettől
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Új üzenet ettől: {sender}
 DocType: Customer,Customer Primary Address,Vevő elsődleges címe
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Hírlevelek
 DocType: Drug Prescription,Description/Strength,Leírás / Állomány
@@ -4858,22 +4889,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Ugyanazt a tételt már többször rögzítették
 DocType: Department,Leave Block List,Távollét blokk lista
 DocType: Purchase Invoice,Tax ID,Adóazonosító
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"Tétel: {0}, nincs telepítve Széria sz. Oszlopot hagyja üressen"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,"Tétel: {0}, nincs telepítve Széria sz. Oszlopot hagyja üressen"
 DocType: Accounts Settings,Accounts Settings,Könyvelés beállításai
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Jóváhagy
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Hibás formátumú cím  {0}, kérjük javítsa a folytatáshoz."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Hibás formátumú cím  {0}, kérjük javítsa a folytatáshoz."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Az új számla száma, a számla nevében előtagként fog szerepelni"
 DocType: Maintenance Team Member,Team Member,Csoport tagja
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nem érkezik eredmény
 DocType: Customer,Sales Partner and Commission,Vevő Partner és a Jutalék
-DocType: Employee Loan,Rate of Interest (%) / Year,Kamatláb (%) / év
+DocType: Loan,Rate of Interest (%) / Year,Kamatláb (%) / év
 ,Project Quantity,Project Mennyiség
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'"
 DocType: Opportunity,To Discuss,Megvitatni
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} darab ebből: {1} szükséges ebben: {2} a tranzakció befejezéséhez.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatláb (%) Éves
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Ideiglenes számlák
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Fekete
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Ideiglenes számlák
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,ANYGJZ Robbantott tétel
 DocType: Shareholder,Contact List,Névjegyzék
 DocType: Account,Auditor,Könyvvizsgáló
@@ -4881,20 +4912,20 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} előállított tétel(ek)
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Tudj meg többet
 DocType: Cheque Print Template,Distance from top edge,Távolság felső széle
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Árlista {0} letiltott vagy nem létezik
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Árlista {0} letiltott vagy nem létezik
 DocType: Purchase Invoice,Return,Visszatérés
 DocType: Pricing Rule,Disable,Tiltva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Fizetési módra van szükség a fizetéshez
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Fizetési módra van szükség a fizetéshez
 DocType: Project Task,Pending Review,Ellenőrzésre vár
-apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Szerkesztés teljes oldalon a további lehetőségekhez, például eszközökhöz, sorozatokhoz, kötegekhez stb."
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Szerkesztés teljes oldalon a további lehetőségekhez, például Vagyontárgyi-eszközökhöz, sorozatokhoz, kötegekhez stb."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Vizit időpontok és konzultációk
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nem vontunk be ebbe a kötegbe {2}
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Vagyoneszköz {0} nem selejtezhető, mivel már {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Csekkek szükségesek
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Vagyontárgy {0} nem selejtezhető, mivel már {1}"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Csekkek szükségesek
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Hiányzónak jelöl
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Sikertelen a vállalkozás telepítése
-DocType: Asset Repair,Asset Repair,Eszköz javítás
+DocType: Asset Repair,Asset Repair,Vagyontárgy javítás
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +143,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: Anyagjegyzés BOM pénzneme #{1}  egyeznie kell a kiválasztott pénznemhez {2}
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
 DocType: Patient,Additional information regarding the patient,További információk a beteggel kapcsolatban
@@ -4902,7 +4933,7 @@
 DocType: Homepage,Tag Line,Jelmondat sor
 DocType: Fee Component,Fee Component,Díj komponens
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flotta kezelés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Tételek hozzáadása innen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Tételek hozzáadása innen
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Termések és föld területek
 DocType: Cheque Print Template,Regular,Szabályos
 DocType: Fertilizer,Density (if liquid),Sűrűség (ha folyékony)
@@ -4925,26 +4956,28 @@
 DocType: Employee,Reports to,Jelentések
 ,Unpaid Expense Claim,Kifizetetlen költség követelés
 DocType: Payment Entry,Paid Amount,Fizetett összeg
-apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Export értékasítési ciklust
+apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Értékesítés felfedezése
 DocType: Assessment Plan,Supervisor,Felügyelő
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Megőrzési készlet bejegyzés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Megőrzési készlet bejegyzés
 ,Available Stock for Packing Items,Elérhető készlet a tételek csomagolásához
 DocType: Item Variant,Item Variant,Tétel variáns
 ,Work Order Stock Report,Munkamegrendelés raktári jelentés
+DocType: Purchase Receipt,Auto Repeat Detail,Automatikus ismétlési részlet
 DocType: Assessment Result Tool,Assessment Result Tool,Értékelési eredmény eszköz
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Mint felügyelő
-apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Javasolja a kategóriát
+apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Javasoljon kategóriát
 DocType: BOM Scrap Item,BOM Scrap Item,Anyagjegyzék Fémhulladék tétel
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már Nekünk tartozik, akkor nem szabad beállítani ""Ennek egyenlege"", mint ""Tőlünk követel"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Minőségbiztosítás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Minőségbiztosítás
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
 DocType: Project,Total Billable Amount (via Timesheets),Összesen számlázható összeg (Jelenléti ív alapján)
 DocType: Agriculture Task,Previous Business Day,Előző munkanap
-DocType: Employee Loan,Repay Fixed Amount per Period,Fix összeg visszafizetése időszakonként
+DocType: Loan,Repay Fixed Amount per Period,Fix összeg visszafizetése időszakonként
 DocType: Employee,Health Insurance No,Egészségbiztosítás száma
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget erre a tételre: {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Követelés értesítő össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Követelés értesítő össz
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Összesen adóköteles összeg
 DocType: Employee External Work History,Employee External Work History,Alkalmazott korábbi munkahelyei
 DocType: Opening Invoice Creation Tool,Purchase,Beszerzés
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Mérleg mennyiség
@@ -4955,15 +4988,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} a {1} -hez
 DocType: Healthcare Settings,Valid number of days,Érvényes napok száma
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Költséghelyek
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Indítsa újra az előfizetést
 DocType: Land Unit,Linked Plant Analysis,Kapcsolt növényelemzés
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Arány, amelyen a Beszállító pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings konfliktusok sora {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Engedélyezi a nulla készletérték árat
+DocType: Bank Guarantee,Receiving,fogadása
 DocType: Training Event Employee,Invited,Meghívott
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Több aktív fizetési struktúrát talált ehhez az alkalmazotthoz: {0} az adott dátumokra
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Fizetési átjáró számlák telepítése.
 DocType: Employee,Employment Type,Alkalmazott típusa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Befektetett Álló eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Befektetett álló-eszközök
 DocType: Payment Entry,Set Exchange Gain / Loss,Árfolyamnyereség / veszteség beállítása
 ,GST Purchase Register,GST beszerzés regisztráció
 ,Cash Flow,Pénzforgalom
@@ -4983,9 +5018,10 @@
 DocType: Academic Term,Term Start Date,Feltétel kezdési dátum
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Az összes megosztott tranzakciók listája
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Lehet. számláló
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Kérjük tekintse meg mellékelve {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Mindkét próbálkozási periódus kezdési időpontját és a próbaidőszak végső dátumát meg kell adni
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Átlagérték
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,A kifizetési ütemezés teljes összegének meg kell egyeznie a Teljes / kerekített összeggel
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,A kifizetési ütemezés teljes összegének meg kell egyeznie a Teljes / kerekített összeggel
+DocType: Subscription Plan Detail,Plan,Terv
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankkivonat mérleg a főkönyvi kivonat szerint
 DocType: Job Applicant,Applicant Name,Kérelmező neve
 DocType: Authorization Rule,Customer / Item Name,Vevő / Tétel Név
@@ -5015,6 +5051,7 @@
 DocType: Work Order,Warehouses,Raktárak
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tárgyi eszköz nem vihető át
 DocType: Hotel Room Pricing,Hotel Room Pricing,Szálloda szobaárazás
+DocType: Subscription,Days Until Due,Napokig
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ez a Tétel egy változata ennek: {0} (sablon).
 DocType: Workstation,per hour,óránként
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Beszerzés
@@ -5023,23 +5060,24 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Köteg alapú Tanuló csoport, a Tanuló köteg érvényesítésre kerül minden hallgató a program regisztrációból."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktárat nem lehet törölni mivel a készletek főkönyvi bejegyzése létezik erre a raktárra.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Képviselet
+DocType: Journal Entry Account,Loan,Hitel
 DocType: Expense Claim Advance,Expense Claim Advance,Költség igény előleg
 DocType: Lab Test,Report Preference,Jelentés preferencia
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Önkéntes információi.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projekt téma menedzser
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projekt téma menedzser
 ,Quoted Item Comparison,Ajánlott tétel összehasonlítás
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Átfedés a {0} és {1} pontszámok között
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Feladás
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Feladás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Eszközérték ezen
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Vagyontárgyi-eszközérték ezen
 DocType: Crop,Produce,Gyárt
 DocType: Hotel Settings,Default Taxes and Charges,Alapértelmezett adók és illetékek
 DocType: Account,Receivable,Bevételek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Sor # {0}: nem szabad megváltoztatni a beszállítót, mivel már van rá Beszerzési  Megrendelés"
-DocType: Stock Entry,Material Consumption for Manufacture,Anyagszükséglet az előállításhoz
+DocType: Stock Entry,Material Consumption for Manufacture,Anyag szükséglet az előállításhoz
 DocType: Item Alternative,Alternative Item Code,Alternatív tétel kód
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Beosztást, amely lehetővé tette, hogy nyújtson be tranzakciókat, amelyek meghaladják a követelés határértékeket."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
 DocType: Delivery Stop,Delivery Stop,Szállítás leállítás
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
@@ -5049,15 +5087,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Szappan & Mosószer
 DocType: BOM,Show Items,Tételek megjelenítése
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Idő-től nem lehet nagyobb, mint idő-ig."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Szeretné értesíteni az összes ügyfelet e-mailben?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Szeretné értesíteni az összes ügyfelet e-mailben?
+DocType: Subscription Plan,Billing Interval,Számlázási idő
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Folytatás
-DocType: Hub Settings,Hub Username,Hub felhasználó neve
+DocType: Hub Settings,Hub Username,Hub felhasználónév
 DocType: Salary Detail,Component,Összetevő
 DocType: Assessment Criteria,Assessment Criteria Group,Értékelési kritériumok Group
 DocType: Healthcare Settings,Patient Name By,A beteg neve
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Betéti naplóbejegyzés a {0} - {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Betéti naplóbejegyzés a {0} - {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Nyitó halmozott ÉCS kisebbnek vagy egyenlőnek kell lennie ezzel: {0}
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
@@ -5071,25 +5109,26 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tarthatja karban a magasságot, súlyt, allergiát, egészségügyi problémákat stb"
 DocType: Leave Block List,Applies to Company,Vállaltra vonatkozik
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet lemondani, mert Készlet bejegyzés: {0} létezik"
-DocType: Employee Loan,Disbursement Date,Folyósítás napja
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,A 'címzettek' nincsenek megadva
+DocType: Loan,Disbursement Date,Folyósítás napja
 DocType: BOM Update Tool,Update latest price in all BOMs,Frissítse a legfrissebb árakat az összes ANYAGJ-ben
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Orvosi karton
 DocType: Vehicle,Vehicle,Jármű
 DocType: Purchase Invoice,In Words,Szavakkal
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Adja meg a bank vagy hitelintézet nevét az elküldés előtt.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} be kell nyújtani
 DocType: POS Profile,Item Groups,Tétel Csoportok
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Ma van {0} születésnapja!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Ma van {0} születésnapja!
 DocType: Sales Order Item,For Production,Termeléshez
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Adjon ideiglenes megnyitó számlát a számlatükörhöz
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Adjon ideiglenes megnyitó számlát a számlatükörhöz
 DocType: Customer,Customer Primary Contact,Vevő elsődleges kapcsolattartója
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Period Closing Journal
 DocType: Project Task,View Task,Feladatok megtekintése
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,LEHET / Érdeklődés %
+DocType: Bank Guarantee,Bank Guarantee Type,Bankgarancia típusa
 DocType: Material Request,MREQ-,ANYIG-
 DocType: Payment Schedule,Invoice Portion,Számla része
-,Asset Depreciations and Balances,Vagyoneszköz Értékcsökkenés és egyenlegek
+,Asset Depreciations and Balances,Vagyontárgy Értékcsökkenés és egyenlegek
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +370,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment ebből: {2} ebbe: {3}
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Címzettek Hozzáadása/Eltávolítása
@@ -5097,9 +5136,8 @@
 DocType: Production Plan,Include Subcontracted Items,Alvállalkozói tételek beillesztése
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Csatlakozik
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Hiány Mennyisége
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,A változat tulajdonságok nem módosíthatók a készletezés után. Ehhez új tételt kell készíteni.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
-DocType: Employee Loan,Repay from Salary,Bérből törleszteni
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+DocType: Loan,Repay from Salary,Bérből törleszteni
 DocType: Leave Application,LAP/,TAVOLL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Fizetési igény ehhez {0} {1} ezzel az összeggel {2}
 DocType: Salary Slip,Salary Slip,Bérpapír
@@ -5123,11 +5161,11 @@
 DocType: Employee Education,Employee Education,Alkalmazott képzése
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Ismétlődő elem csoport található a csoport táblázatában
 DocType: Land Unit,Parent Land Unit,Fő föld terület
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
 DocType: Fertilizer,Fertilizer Name,Műtrágya neve
 DocType: Salary Slip,Net Pay,Nettó fizetés
 DocType: Cash Flow Mapping Accounts,Account,Számla
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Széria sz. {0} már beérkezett
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Széria sz. {0} már beérkezett
 ,Requested Items To Be Transferred,Kérte az átvinni kívánt elemeket
 DocType: Expense Claim,Vehicle Log,Jármű napló
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Láz előfordulása (hőm.&gt; 38,5 ° C / 101,3 ° F vagy fenntartott hőmérséklet&gt; 38 ° C / 100,4 ° F)"
@@ -5168,40 +5206,40 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bármely egyéb megjegyzések, említésre méltó erőfeszítés, aminek a nyilvántartásba kell kerülnie."
 DocType: Asset Maintenance,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Invoice,Raw Materials Supplied,Alapanyagok leszállítottak
-DocType: C-Form,Series,Sorozat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Az árlista pénzneme {0} legyen {1} vagy {2}
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Soil Texture,Ternary Plot,Három komponensű telek
 DocType: Item Group,Item Classification,Tétel osztályozás
 DocType: Driver,License Number,Licenc azonosító szám
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Betegbeteg számla regisztráció
 DocType: Crop,Period,Időszak
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Főkönyvi számla
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Alkalmazott {0} távvolléten ekkor {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Alkalmazott {0} távvolléten ekkor {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Érdeklődések megtekintése
 DocType: Program Enrollment Tool,New Program,Új program
 DocType: Item Attribute Value,Attribute Value,Jellemzők értéke
 ,Itemwise Recommended Reorder Level,Tételenkénti Ajánlott újrarendelési szint
 DocType: Salary Detail,Salary Detail,Bér részletei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Kérjük, válassza ki a {0} először"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Kérjük, válassza ki a {0} először"
 DocType: Appointment Type,Physician,Orvos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Köteg {0} ebből a tételből: {1} lejárt.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konzultációk
 DocType: Sales Invoice,Commission,Jutalék
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nem lehet nagyobb a tervezett mennyiségnél ({2}) a Munka Rendelésnél {3}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nem lehet nagyobb a ({2}) tervezett mennyiségnél  a {3} Munka Rendelésnél
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Idő nyilvántartó a gyártáshoz.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Részösszeg
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,A Variant tulajdonságok nem módosíthatók a készletesítés után. Ehhez új tételt kell készíteni.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA utalási megbízás
 DocType: Physician,Charges,Díjak
 DocType: Production Plan,Get Items For Work Order,Szerezd meg a tételeket a munka megrendeléshez
 DocType: Salary Detail,Default Amount,Alapértelmezett Összeg
 DocType: Lab Test Template,Descriptive,Leíró
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Raktár nem található a rendszerben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Raktár nem található a rendszerben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Összefoglaló erről a hónapról
 DocType: Quality Inspection Reading,Quality Inspection Reading,Minőség-ellenőrzés olvasás
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
 DocType: Tax Rule,Purchase Tax Template,Beszerzési megrendelés Forgalmi adót sablon
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Olyan értékesítési célt állítson be, amelyet vállalni szeretne."
 ,Project wise Stock Tracking,Projekt téma szerinti raktárkészlet követése
@@ -5229,11 +5267,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Sikertelen webhely létrehozás
 DocType: Soil Analysis,Mg/K,Mg/K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Már létrehozott a megőrzési készletbejegyzés vagy a minta mennyisége nincs megadva
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Már létrehozott a megőrzési készletbejegyzés vagy a minta mennyisége nincs megadva
 DocType: Program,Program Abbreviation,Program rövidítése
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtán a tételek szerint
 DocType: Warranty Claim,Resolved By,Megoldotta
-DocType: Bank Guarantee,Start Date,Kezdés dátuma
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Felosztja a távolléteket időszakra.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Csekkek és betétek helytelenül elszámoltak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,A {0} számla: Nem rendelheti saját szülő számlájának
@@ -5248,11 +5285,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Órák
 DocType: Project,Expected Start Date,Várható indulás dátuma
 DocType: Purchase Invoice,04-Correction in Invoice,04- Korrekció a számlán
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,"Munka rendelést már létrehozota az összes  olyan tételhez, amelyet az ANYAGJ tartalmazza"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,"Munka rendelést már létrehozota az összes  olyan tételhez, amelyet az ANYAGJ tartalmazza"
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Jelentés a változat részleteiről
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress művelet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Beszerzési árlista
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Beszerzési árlista
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Vegye ki az elemet, ha terheket nem adott elemre alkalmazandó"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Feliratkozás visszavonása
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,"Kérjük, válassza a Karbantartási állapotot befejezettként vagy távolítsa el a befejezés dátumát"
 DocType: Supplier,Default Payment Terms Template,Alapértelmezett fizetési feltételek sablonja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,A művelet pénznemének meg kell egyeznie a Fizetési átjáró pénznemével
@@ -5263,7 +5301,6 @@
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,Üzemeltetési költségek
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Művelet, ha a felhalmozott havi költségkeret túlépett"
-DocType: Subscription,Submit on creation,Küldje el a létrehozásnál
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Árfolyam ehhez: {0} ennek kell lennie: {1}
 DocType: Asset,Disposal Date,Eltávolítás időpontja
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailt fog küldeni a vállalkozás összes aktív alkalmazottja részére az adott órában, ha nincsenek szabadságon. A válaszok összefoglalását éjfélkor küldi."
@@ -5281,6 +5318,7 @@
 DocType: Batch,Parent Batch,Fő Köteg
 DocType: Cheque Print Template,Cheque Print Template,Csekk nyomtatás Sablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Költséghelyek listája
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"A számlázási dátum után eltelt napok száma eltelik, mielőtt lemondana az előfizetésről vagy az előfizetés meg nem fizetéséről"
 DocType: Lab Test Template,Sample Collection,Mintagyűjtés
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
 DocType: Price List,Price List Name,Árlista neve
@@ -5289,7 +5327,7 @@
 DocType: Account,Income,Jövedelem
 DocType: Industry Type,Industry Type,Iparág
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Valami hiba történt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Figyelmeztetés: Távolét ealkalmazás a következő blokkoló dátumokat tartalmazza
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Figyelmeztetés: Távolét ealkalmazás a következő blokkoló dátumokat tartalmazza
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,A {0} kimenő értékesítési számla már elküldve
 DocType: Supplier Scorecard Scoring Criteria,Score,Pontszám
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Pénzügyi év {0} nem létezik
@@ -5309,12 +5347,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Értékesítési hely profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,A {0} érték 0 és 100 közé esik
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,A következő értékcsökkenési időpont nem lehet a rendelkezésre álló felhasználási dátum előtti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Fedezetlen hitelek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költséghely neve
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max munkaidő a munkaidő jelenléti ívhez
 DocType: Maintenance Schedule Detail,Scheduled Date,Ütemezett dátum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Teljes fizetett össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Teljes fizetett össz
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakternél nagyobb üzenetek több üzenetre lesznek bontva
 DocType: Purchase Receipt Item,Received and Accepted,Beérkezett és befogadott
 DocType: Hub Settings,Company and Seller Profile,Cég és értékesítő profilja
@@ -5328,10 +5366,9 @@
 DocType: Item,Variant Based On,Változat ez alapján
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Ön Beszállítói
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Kérjük, javítsa ki"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
 DocType: Request for Quotation Item,Supplier Part No,Beszállítói alkatrész sz
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Névtelen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Feladó
 DocType: Lead,Converted,Átalakított
@@ -5342,9 +5379,10 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,"{0} sor: Óra értéknek nagyobbnak kell lennie, mint nulla."
 apps/erpnext/erpnext/stock/doctype/item/item.py +195,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
-DocType: Asset,Assets,Eszközök
+DocType: Asset,Assets,Tárgyi eszközök
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezeket a tételeket több csoportba a weboldalon.
+DocType: Subscription,Current Invoice End Date,Aktuális számla vége
 DocType: Payment Term,Due Date Based On,Határidő dátuma ez alapján
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Állítsa be az alapértelmezett ügyfélcsoportot és területet az Értékesítési beállítások menüpontban
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} nem létezik
@@ -5352,7 +5390,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Tétel: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nincs engedélye a zárolt értékek beállítására
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nem egyeztetett bejegyzések lekérdezése
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,A naplóbejegyzéshez nincs visszafizetés
 DocType: Payment Reconciliation,From Invoice Date,Számla dátumától
+DocType: Loan,Disbursed,folyósított
 DocType: Healthcare Settings,Laboratory Settings,Laboratóriumi beállítások
 DocType: Patient Appointment,Service Unit,Szervíz egység
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Beszállító sikeres beállítása
@@ -5365,12 +5405,12 @@
 DocType: Share Balance,No of Shares,Részvények száma
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Válasszon státuszt
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: School House,House Name,Ház név
 DocType: Fee Schedule,Total Amount per Student,Diákonkénti teljes összeg
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektromos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektromos
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adjuk hozzá a többi a szervezet, mint a felhasználók számára. Azt is hozzá meghívni ügyfelek a portál hozzáadásával őket Kapcsolatok"
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Ki - Be)
 DocType: Grant Application,Requested Amount,Igényelt összeg
@@ -5380,7 +5420,7 @@
 DocType: Crop Cycle,Detected Diseases,Észlelt kórokozók
 DocType: Stock Entry,Default Source Warehouse,Alapértelmezett forrás raktár
 DocType: Item,Customer Code,Vevő kódja
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Születésnapi emlékeztető {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 DocType: Asset Maintenance Task,Last Completion Date,Utolsó befejezés dátuma
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Utolsó rendeléstől eltel napok
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
@@ -5388,9 +5428,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless beállításai
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Készletezett eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Készletezett tárgyi eszközök
 DocType: Restaurant,Active Menu,Aktív menü
 DocType: Target Detail,Target Qty,Cél menny.
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Hitel ellenében: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Kijelentkezés beállítások
 DocType: Student Attendance,Present,Jelen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,A {0} Szállítólevelet nem kell benyújtani
@@ -5399,9 +5440,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},A bérpapír az Alkalmazotthoz: {0} már létrehozott erre a jelenléti ívre: {1}
 DocType: Vehicle Log,Odometer,Kilométer-számláló
 DocType: Production Plan Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Tétel {0} letiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Tétel {0} letiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
 DocType: Chapter,Chapter Head,Fejezet fejléc
 DocType: Payment Term,Month(s) after the end of the invoice month,Hónap(ok) a számlázási hónap végét követően
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projekt téma feladatok / tevékenységek.
@@ -5409,11 +5450,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Bérpapír generálása
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,A labor eredményének dátuma nem lehet a  tesztelési dátum előtti
 DocType: POS Profile,Allow user to edit Discount,Engedélyezze a felhasználónak a kedvezmény módosítását
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Vevők lekérése innen
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Vevők lekérése innen
 DocType: Purchase Invoice Item,Include Exploded Items,Tartalmazza a robbantott elemeket
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Vásárlást ellenőrizni kell, amennyiben alkalmazható erre a kiválasztottra: {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Kedvezménynek kisebbnek kell lennie, mint 100"
 DocType: Shipping Rule,Restrict to Countries,Korlátozás országokra
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
 DocType: Sales Invoice Timesheet,Billing Hours,Számlázási Óra(k)
 DocType: Project,Total Sales Amount (via Sales Order),Értékesítési összérték (értékesítési rendelés szerint)
@@ -5430,6 +5472,7 @@
 DocType: Soil Texture,Sandy Clay,Homokos agyag
 DocType: Grant Application,Assessment  Manager,Értékelési vezető
 DocType: Payment Entry,Allocate Payment Amount,Osztja fizetés összege
+DocType: Subscription Plan,Subscription Plan,Előfizetési terv
 DocType: Employee External Work History,Salary,Bér
 DocType: Serial No,Delivery Document Type,Szállítási Document típusa
 DocType: Sales Order,Partly Delivered,Részben szállítva
@@ -5454,9 +5497,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Öregedés tartomány 2
 DocType: SG Creation Tool Course,Max Strength,Max állomány
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Telepítés beállításai
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nincs kézbesítési értesítés ehhez az Ügyfélhez {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nincs kézbesítési értesítés ehhez az Ügyfélhez {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Anyagjegyzék helyettesítve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Válasszon elemeket a szállítási dátum alapján
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Válasszon elemeket a szállítási dátum alapján
 DocType: Grant Application,Has any past Grant Record,Van bármilyen korábbi Támogatási rekord
 ,Sales Analytics,Értékesítési elemzés
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Elérhető {0}
@@ -5468,13 +5511,13 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Készlet bejegyzés részletei
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Napi emlékeztetők
 DocType: Products Settings,Home Page is Products,Kezdőlap a Termékek
-,Asset Depreciation Ledger,Vagyoneszköz Értékcsökkenés Főkönyvi kivonat
+,Asset Depreciation Ledger,Vagyontárgy Értékcsökkenés Főkönyvi kivonat
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +91,Tax Rule Conflicts with {0},Adó szabály ütközik ezzel {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New számla név
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
 DocType: Selling Settings,Settings for Selling Module,Beállítások az Értékesítés modulhoz
 DocType: Hotel Room Reservation,Hotel Room Reservation,Szállodai szoba foglalás
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Ügyfélszolgálat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Ügyfélszolgálat
 DocType: BOM,Thumbnail,Miniatűr
 DocType: Item Customer Detail,Item Customer Detail,Tétel vevőjének részletei
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Jelentkezőnek munkát ajánl
@@ -5490,7 +5533,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} A hallgatók beiratkoztak
 DocType: Fees,Student Details,Diák részletei
 DocType: Purchase Invoice Item,Stock Qty,Készlet menny.
-DocType: Employee Loan,Repayment Period in Months,Törlesztési időszak hónapokban
+DocType: Loan,Repayment Period in Months,Törlesztési időszak hónapokban
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hiba: Érvénytelen id azonosító?
 DocType: Naming Series,Update Series Number,Széria szám frissítése
 DocType: Account,Equity,Saját tőke
@@ -5499,7 +5542,7 @@
 DocType: Task,Closing Date,Benyújtási határidő
 DocType: Sales Order Item,Produced Quantity,Gyártott mennyiség
 DocType: Timesheet,Work Detail,Munka részletei
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Mérnök
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Mérnök
 DocType: Journal Entry,Total Amount Currency,Teljes összeg pénznemben
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Részegységek keresése
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Tételkód szükség ebbe a sorba {0}
@@ -5517,7 +5560,7 @@
 DocType: SMS Center,All Employee (Active),Összes alkalmazott (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Megtekintés most
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
-DocType: Woocommerce Settings,Woocommerce Server URL,Woocommerce kiszolgáló URL-je
+DocType: Woocommerce Settings,Woocommerce Server URL,Woocommerce kiszolgálói URL
 DocType: Item Reorder,Re-Order Level,Újra-rendelési szint
 apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Gantt diagram
 DocType: Crop Cycle,Cycle Type,Ciklus típus
@@ -5544,19 +5587,18 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Adományozó típusának információi.
 DocType: Request for Quotation,Supplier Detail,Beszállító adatai
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Hiba az űrlapban vagy feltételben: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Számlázott összeg
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Számlázott összeg
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,A kritériumok súlyai egészen 100%-ig
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Részvétel
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Raktári tételek
 DocType: BOM,Materials,Anyagok
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} létrehozása
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Forrás és Cél Raktár nem lehet azonos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Adó sablon a beszerzési tranzakciókra.
 ,Item Prices,Tétel árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"A szavakkal mező lesz látható, miután mentette a Beszerzési megrendelést."
-DocType: Woocommerce Settings,Endpoint,Endpoint
+DocType: Woocommerce Settings,Endpoint,Végpont
 DocType: Period Closing Voucher,Period Closing Voucher,Utalvány lejárati Időszaka
 DocType: Consultation,Review Details,Részletek megtekintése
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +185,The shareholder does not belong to this company,A részvényes nem tartozik ehhez a társasághoz
@@ -5564,7 +5606,7 @@
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Árlista törzsadat.
 DocType: Task,Review Date,Vélemény dátuma
 DocType: BOM,Allow Alternative Item,Alternatív tétel engedélyezése
-DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Értékcsökkenési tételsorozat (Naplóbejegyzés)
+DocType: Company,Series for Asset Depreciation Entry (Journal Entry),Vagyontárgy értékcsökkenési tételsorozat (Naplóbejegyzés)
 DocType: Membership,Member Since,Tag ekkortól
 DocType: Purchase Invoice,Advance Payments,Előleg kifizetések
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
@@ -5574,15 +5616,15 @@
 DocType: Shipping Rule,Fixed,Rögzített
 DocType: Vehicle Service,Clutch Plate,Tengelykapcsoló lemez
 DocType: Company,Round Off Account,Gyüjtő számla
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Igazgatási költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Igazgatási költségek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Tanácsadó
 DocType: Customer Group,Parent Customer Group,Fő Vevő csoport
-DocType: Journal Entry,Subscription,Előfizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Előfizetés
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Díj létrehozása függőben van
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Felmondási idő
-DocType: Asset Category,Asset Category Name,Vagyoneszköz Kategória neve
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Felmondási idő
+DocType: Asset Category,Asset Category Name,Vagyontárgy Kategória neve
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"Ez egy forrás terület, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Új értékesítési személy neve
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
@@ -5594,7 +5636,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Hagyja bejelöletlenül, ha nem szeretné, kötegelni miközben kurzus alapú csoportokat hoz létre."
 DocType: Asset,Frequency of Depreciation (Months),Az értékcsökkenés elszámolásának gyakorisága (hónapok)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Követelésszámla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Követelésszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mutassa a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség amit ebből a tételből kapott a  gyártás / visszacsomagolás után, a megadott alapanyagok mennyiségének felhasználásával."
@@ -5602,7 +5644,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Bevételek / Fizetendő számla
 DocType: Delivery Note Item,Against Sales Order Item,Vevői rendelési tétel ellen
 DocType: Hub Settings,Company Logo,Vállalati logó
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet hozzárendelni ehhez a Csoport számlához {0}
 DocType: Healthcare Settings,Patient Registration,Beteg regisztráció
@@ -5626,7 +5668,7 @@
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,"Kérjük, engedélyezze az alapértelmezett bejövő fiókot a Napi munkák összefoglaló csoport létrehozása előtt"
 DocType: Assessment Result,Total Score,Összesített pontszám
 DocType: Journal Entry,Debit Note,Tartozás értesítő
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,"Kérjük, adja meg az API Consumer Secret"
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,"Kérjük, adja meg az API fogyasztói titkosítót"
 DocType: Stock Entry,As per Stock UOM,Készlet mértékegysége szerint
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nem járt le
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +49,ValidDate,ÉrvényesDátum
@@ -5636,11 +5678,10 @@
 DocType: Journal Entry,Total Debit,Tartozás összesen
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Alapértelmezett készáru raktár
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,"Kérem, válassza a Beteg"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Értékesítő
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Értékesítő
 DocType: Hotel Room Package,Amenities,Felszerelések
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Költségvetés és költséghely
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Több alapértelmezett fizetési mód nem engedélyezett
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,a
 ,Appointment Analytics,Vizit időpontok elemzései
 DocType: Vehicle Service,Half Yearly,Félévente
 DocType: Lead,Blog Subscriber,Blog Követők
@@ -5655,7 +5696,8 @@
 DocType: Opening Invoice Creation Tool,Create Missing Party,Hiányzó fél létrehozása
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Hagyja üresen, ha diák csoportokat évente hozza létre"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja az ünnepeket, és ez csökkenti a napi bér összegét"
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Az aktuális kulcsot használó alkalmazások nem fognak hozzáférni, biztos benne?"
+apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Az aktuális kulcsot használó alkalmazások nem fognak hozzáférni, biztos ebben?"
+DocType: Subscription Settings,Prorate,megosztási
 DocType: Purchase Invoice,Total Advance,Összes előleg
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Sablon kód módosítása
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"A kifejezés végső dátuma nem lehet korábbi, mint a kifejezés kezdete. Kérjük javítsa ki a dátumot, és próbálja újra."
@@ -5666,8 +5708,9 @@
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,Követelés összege
 DocType: Cheque Print Template,Signatory Position,Az aláíró pozíció
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Elveszetté állít
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Elveszetté állít
 DocType: Timesheet,Total Billable Hours,Összesen számlázható órák
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Az előfizetők által fizetett számlák napjainak száma
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Fizetési átvételi Megjegyzés
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ennek alapja az ezzel a Vevővel történt tranzakciók. Lásd alábbi idővonalat a részletekért
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},"Sor {0}: Lekötött összeg {1} kisebbnek kell lennie, vagy egyenlő fizetés Entry összeg {2}"
@@ -5686,12 +5729,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Utolsó Beszerzési ár lekérése
 DocType: Company,Company Info,Vállakozás adatai
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Vagyon tárgyak alkalmazás (vagyoni eszközök)
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Vagyon tárgyak alkalmazás (tárgyi eszközök)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ez az Alkalmazott jelenlétén alapszik
 DocType: Assessment Result,Summary,Összefoglalás
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Megjelölés a részvételre
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Tartozás Számla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Tartozás Számla
 DocType: Fiscal Year,Year Start Date,Év kezdő dátuma
 DocType: Attendance,Employee Name,Alkalmazott neve
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Éttermi rendelési bejegyzés tétele
@@ -5703,7 +5746,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Beszerzés összege
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Beszállító árajánlata :{0} létrehozva
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Alkalmazotti juttatások
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Alkalmazotti juttatások
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiségeknek egyezniük kell a  {1} sorban lévő {0} tétel mennyiségével
 DocType: Work Order,Manufactured Qty,Gyártott menny.
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},A részvények nem léteznek a {0}
@@ -5711,12 +5754,12 @@
 DocType: Asset,Out of Order,Üzemen kívül
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 DocType: Projects Settings,Ignore Workstation Time Overlap,Munkaállomás időátfedésének figyelmen kívül hagyása
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Ünnepet erre az Alkalmazottra: {0} vagy Vállalkozásra: {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Ünnepet erre az Alkalmazottra: {0} vagy Vállalkozásra: {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Válasszon köteg számokat
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vevők számlái
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt téma azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Sor {0}: Az összeg nem lehet nagyobb, mint a függőben lévő összege ezzel a költségtérítéssel szemben:  {1}. Függőben lévő összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Sor {0}: Az összeg nem lehet nagyobb, mint a függőben lévő összege ezzel a költségtérítéssel szemben:  {1}. Függőben lévő összeg: {2}"
 DocType: Patient Service Unit,Medical Administrator,Orvosi ügyintéző
 DocType: Assessment Plan,Schedule,Ütemezés
 DocType: Account,Parent Account,Fő számla
@@ -5746,15 +5789,16 @@
 DocType: Asset Repair,Repair Status,Javítási állapota
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Könyvelési naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a behozatali raktárban
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Kérjük, válassza ki először az Alkalmazotti bejegyzést."
 DocType: POS Profile,Account for Change Amount,Átváltási összeg számlája
 DocType: Purchase Invoice,input service,bemeneti szolgáltatás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Ügyfél / fiók nem egyezik {1} / {2} a {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Karbantartó csoporttag
 DocType: Agriculture Analysis Criteria,Soil Analysis,Talajelemzés
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Tanfolyam kód:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Kérjük, adja meg a Költség számlát"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Kérjük, adja meg a Költség számlát"
 DocType: Account,Stock,Készlet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha a tétel egy másik tétel egy változata akkor a leírás, kép, árképzés, adók stb. a sablonból lesz kiállítva, hacsak nincs külön meghatározva"
 DocType: Serial No,Purchase / Manufacture Details,Beszerzés / gyártás Részletek
@@ -5786,7 +5830,7 @@
 DocType: Project,Gross Margin %,Bruttó árkülönbözet %
 DocType: BOM,With Operations,Műveletek is
 apps/erpnext/erpnext/accounts/party.py +259,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
-DocType: Asset,Is Existing Asset,Ez meglévő eszköz
+DocType: Asset,Is Existing Asset,Ez meglévő vagonyi-eszköz
 DocType: Salary Detail,Statistical Component,Statisztikai összetevő
 DocType: Warranty Claim,If different than customer address,"Ha más, mint a vevő címe"
 DocType: Purchase Invoice,Without Payment of Tax,Adófizetés nélkül
@@ -5794,7 +5838,7 @@
 apps/erpnext/erpnext/config/stock.py +145,Fulfilment,Teljesülés
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Előző sor összegén
 DocType: Item,Has Expiry Date,Érvényességi idővel rendelkezik
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +282,Transfer Asset,Eszköz átvitel
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +282,Transfer Asset,Vagyontárgy átvitel
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Esemény neve
 DocType: Physician,Phone (Office),Telefon (iroda)
@@ -5802,19 +5846,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Felvételi: {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezéséhez, célok stb"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Változó név
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Tétel:  {0}, egy sablon, kérjük, válasszon variánst"
-DocType: Asset,Asset Category,Vagyoneszköz kategória
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Tétel:  {0}, egy sablon, kérjük, válasszon variánst"
+DocType: Asset,Asset Category,Vagyontárgy kategória
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettó fizetés nem lehet negatív
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Tétel adójának típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Anyag beszállítóhoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Anyag beszállítóhoz
 DocType: Soil Texture,Loamy Sand,Agyagos homok
 DocType: Production Plan,Material Request Planning,Anyagigénylés tervezés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Jövedéki számla
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Küszöb {0}% egynél többször jelenik meg
 DocType: Expense Claim,Employees Email Id,Alkalmazottak email id azonosító
 DocType: Employee Attendance Tool,Marked Attendance,jelzett Nézőszám
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Rövid lejáratú kötelezettségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Rövid lejáratú kötelezettségek
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Az időzítő túllépte a megadott órát.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Küldjön tömeges SMS-t a kapcsolatainak
 DocType: Patient,A Positive,Egy pozitív
@@ -5824,10 +5868,11 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +158,No Reference,Nincs hivatkozás
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség ami kötelező
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","A(z) {0} jelenleg {1} Szállítói mutatószámmal rendelkezik, ezért a vevői rendeléseket ennek a szállítónak óvatosan kell kiadni."
-DocType: Asset Maintenance Team,Asset Maintenance Team,Eszközkarbantartó csoport
-DocType: Employee Loan,Loan Type,Hitel típus
+DocType: Asset Maintenance Team,Asset Maintenance Team,Vagyontárgy karbantartó csoport
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} sikeresen elküldték
+DocType: Loan,Loan Type,Hitel típus
 DocType: Scheduling Tool,Scheduling Tool,Ütemező eszköz
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Hitelkártya
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Hitelkártya
 DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
 DocType: Sales Invoice Item,Drop Ship,Drop Ship /Vevőtől eladóhoz/
@@ -5859,7 +5904,7 @@
 DocType: Item,Units of Measure,Mértékegységek
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése az ünnepnapokon
 DocType: Sales Invoice,Customer's Purchase Order Date,Vevő beszerzési megrendelésének dátuma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Alap tőke
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Alap tőke
 DocType: Shopping Cart Settings,Show Public Attachments,Itt találhatóak a nyilvános mellékletek
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 DocType: Restaurant Reservation,Reservation Time,Foglalási idő
@@ -5874,7 +5919,7 @@
 DocType: Purchase Order,To Receive and Bill,Beérkeztetés és Számlázás
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,# {0} sor: A dátum nem lehet a tranzakció dátuma előtt
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Kiemelt termékek
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Tervező
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Költséghely szükséges ebben a sorban {0} az adók táblázatának ezen típusához {1}
@@ -5884,34 +5929,35 @@
 DocType: Driver,Expiry Date,Lejárat dátuma
 DocType: Healthcare Settings,Employee name and designation in print,Alkalmazott neve és megnevezése nyomtatásban
 ,accounts-browser,beszámoló-böngésző
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Kérjük, válasszon Kategóriát először"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Kérjük, válasszon Kategóriát először"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projek témák törzsadat.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Túl számlázás vagy túlrendelés engedélyezéséhez, frissítse az ""Engedélyezés"" a Készlet beállításoknál vagy a tételnél"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem jelezzen szimbólumokat, mint $ stb. a pénznemek mellett."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Fél Nap)
 DocType: Payment Term,Credit Days,Hitelezés napokban
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Kérem, válassza a Patient-ot, hogy megkapja a Lab Test-et"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tanuló köteg létrehozás
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Ez átvitt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Elemek lekérése Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Elemek lekérése Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Érdeklődés ideje napokban
 DocType: Cash Flow Mapping,Is Income Tax Expense,A jövedelemadó költség
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Jelölje be ezt, ha a diák lakóhelye az intézet diákszállása."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Kérjük, adja meg a vevői rendeléseket, a fenti táblázatban"
 ,Stock Summary,Készlet Összefoglaló
-apps/erpnext/erpnext/config/assets.py +54,Transfer an asset from one warehouse to another,Egy eszköz átvitele az egyik raktárból a másikba
+apps/erpnext/erpnext/config/assets.py +54,Transfer an asset from one warehouse to another,Egy vagyontárgy átvitele az egyik raktárból a másikba
 DocType: Vehicle,Petrol,Benzin
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Anyagjegyzék
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Sor {0}: Ügyfél típusa szükséges a Bevételi / Fizetendő számlákhoz:  {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Hiv. dátuma
 DocType: Employee,Reason for Leaving,Kilépés indoka
 DocType: BOM Operation,Operating Cost(Company Currency),Üzemeltetési költség (Vállaklozás pénzneme)
-DocType: Employee Loan Application,Rate of Interest,Kamatláb
+DocType: Loan Application,Rate of Interest,Kamatláb
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: Item,Shelf Life In Days,Az eltarthatóság napokban
 DocType: GL Entry,Is Opening,Ez nyitás
+DocType: Department,Expense Approvers,Költségvetési jóváhagyók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
 DocType: Journal Entry,Subscription Section,Előfizetési szakasz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,A {0} számla nem létezik
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 5255487..4b0dd24 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Laporan Penilaian
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produk Pelanggan
-DocType: Purchase Receipt,Subscription Detail,Detail Langganan
 DocType: Supplier Scorecard,Notify Supplier,Beritahu Pemasok
 DocType: Item,Customer Items,Produk Pelanggan
 DocType: Project,Costing and Billing,Biaya dan Penagihan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
 DocType: Item,Publish Item to hub.erpnext.com,Publikasikan Item untuk hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifikasi Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Evaluasi
 DocType: Item,Default Unit of Measure,Standar Satuan Ukur
 DocType: SMS Center,All Sales Partner Contact,Semua Kontak Mitra Penjualan
-DocType: Employee,Leave Approvers,Approval Cuti
+DocType: Department,Leave Approvers,Approval Cuti
 DocType: Sales Partner,Dealer,Dealer (Pelaku)
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Investigasi
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Cek ketersediaan
 DocType: Job Applicant,Job Applicant,Pemohon Kerja
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Hal ini didasarkan pada transaksi terhadap Pemasok ini. Lihat timeline di bawah untuk rincian
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Hukum
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Jenis pajak aktual tidak dapat dimasukkan dalam tarif di baris {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Hukum
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Jenis pajak aktual tidak dapat dimasukkan dalam tarif di baris {0}
 DocType: Bank Guarantee,Customer,Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan Oleh
 DocType: Delivery Note,Return Against Delivery Note,Retur Terhadap Nota Pengiriman
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Rekening bank tidak dapat namakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kelompok) terhadap yang Entri Akuntansi dibuat dan saldo dipertahankan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Tidak ada slip Saldo yang diajukan untuk diproses.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Tidak ada slip Saldo yang diajukan untuk diproses.
 DocType: Manufacturing Settings,Default 10 mins,Standar 10 menit
 DocType: Leave Type,Leave Type Name,Nama Tipe Cuti
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tampilkan terbuka
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Hal ini diperlukan untuk mengambil tindakan ini hari ini sendiri untuk berulang di atas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Nomor Seri Berhasil Diperbarui
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Periksa
 DocType: Pricing Rule,Apply On,Terapkan Pada
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Kontak semua Supplier
 DocType: Support Settings,Support Settings,Pengaturan dukungan
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Aplikasi Cuti Baru
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Status Kadaluarsa Persediaan Batch
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Draft
 DocType: Membership,membership validaty section,bagian keanggotaan validitas
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Akun Pembayaran Rekening
 DocType: Consultation,Consultation,Konsultasi
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Bahan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Membuat website
 DocType: Opening Invoice Creation Tool Item,Quantity,Kuantitas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabel account tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Kredit (Kewajiban)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Tabel account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Berjalan
 DocType: Item,Country of Origin,Negara Asal
 DocType: Soil Texture,Soil Texture Criteria,Kriteria Tekstur Tanah
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Rincian Kontak Utama
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,terbuka Isu
 DocType: Production Plan Item,Production Plan Item,Rencana Produksi Stok Barang
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
 DocType: Lab Test Groups,Add new line,Tambahkan baris baru
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Kesehatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Keterlambatan pembayaran (Hari)
@@ -89,7 +85,7 @@
 ,Delay Days,Tunda hari
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktur
+DocType: Subscription Invoice,Invoice,Faktur
 DocType: Purchase Invoice Item,Item Weight Details,Rincian Berat Item
 DocType: Asset Maintenance Log,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Total Biaya
 DocType: Delivery Note,Vehicle No,Nomor Kendaraan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Silakan pilih Daftar Harga
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Pekerjaan dalam proses
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Silakan pilih tanggal
 DocType: Daily Work Summary Group,Holiday List,Daftar Hari Libur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Akuntan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Akuntan
 DocType: Hub Settings,Selling Price List,Daftar Harga Jual
 DocType: Patient,Tobacco Current Use,Penggunaan Saat Ini Tembakau
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Tingkat penjualan
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Tingkat penjualan
 DocType: Cost Center,Stock User,Pengguna Persediaan
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
 DocType: Company,Phone No,No Telepon yang
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Baru {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Pemberitahuan email awal terkirim
 ,Sales Partners Commission,Komisi Mitra Penjualan
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Nilai Setelah Penyusutan
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,terkait
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,tanggal kehadiran tidak bisa kurang dari tanggal bergabung karyawan
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,tanggal kehadiran tidak bisa kurang dari tanggal bergabung karyawan
 DocType: Grading Scale,Grading Scale Name,Skala Grading Nama
-DocType: Subscription,Repeat on Day,Ulangi pada hari
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ini adalah account root dan tidak dapat diedit.
 DocType: Sales Invoice,Company Address,Alamat perusahaan
 DocType: BOM,Operations,Operasi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak dapat mengatur otorisasi atas dasar Diskon untuk {0}
+DocType: Subscription,Subscription Start Date,Tanggal Mulai Berlangganan
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Melampirkan file .csv dengan dua kolom, satu untuk nama lama dan satu untuk nama baru"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} tidak dalam Tahun Anggaran aktif.
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Tanggal Akhir Periode Uji Coba Tidak boleh sebelum Tanggal Mulai Periode Uji Coba
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Lowongan untuk Pekerjaan.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM belum ditentukan untuk subkontrak barang {0} pada baris {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Perusahaan yang sama dimasukkan lebih dari sekali
 DocType: Patient,Married,Menikah
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak diizinkan untuk {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Mendapatkan Stok Barang-Stok Barang dari
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Mendapatkan Stok Barang-Stok Barang dari
 DocType: Price List,Price Not UOM Dependant,Harga UOM Tidak Tergantung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Persediaan tidak dapat diperbarui terhadap Nota Pengiriman {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Minyak Rem
 DocType: Tax Rule,Tax Type,Jenis pajak
 ,Completed Work Orders,Perintah Kerja Selesai
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Jumlah Kena Pajak
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Jumlah Kena Pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak diizinkan menambah atau memperbarui entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Gambar Stok Barang (jika tidak slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif per Jam / 60) * Masa Beroperasi Sebenarnya
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Referensi harus menjadi salah satu Klaim Biaya atau Entri Jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Pilih BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Referensi harus menjadi salah satu Klaim Biaya atau Entri Jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Biaya Produk Terkirim
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Mengelola jumlah uang muka yang diberikan kepada Karyawan
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Pemberitahuan pengiriman
 DocType: Journal Entry,Opening Entry,Entri Pembukaan
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akun Pembayaran Saja
-DocType: Employee Loan,Repay Over Number of Periods,Membayar Lebih dari Jumlah Periode
+DocType: Loan,Repay Over Number of Periods,Membayar Lebih dari Jumlah Periode
 DocType: Stock Entry,Additional Costs,Biaya-biaya tambahan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Lead,Product Enquiry,Produk Enquiry
 DocType: Education Settings,Validate Batch for Students in Student Group,Validasi Batch untuk Siswa di Kelompok Pelajar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Tidak ada cuti record yang ditemukan untuk karyawan {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Tidak ada cuti record yang ditemukan untuk karyawan {0} untuk {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Silahkan masukkan perusahaan terlebih dahulu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Silakan pilih Perusahaan terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Silakan pilih Perusahaan terlebih dahulu
 DocType: Employee Education,Under Graduate,Sarjana
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Silakan mengatur template default untuk Pemberitahuan Status Cuti di Pengaturan HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Pinjaman karyawan
 DocType: Fee Schedule,Send Payment Request Email,Kirim Permintaan Pembayaran Email
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Berhasil tidak terdaftar
 DocType: Assessment Result,Grade,Kelas
 DocType: Restaurant Table,No of Seats,Tidak ada tempat duduk
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Untuk menambahkan subjek dinamis, gunakan tag jinja seperti <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Terkirim Oleh Supplier
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tugas Pemeliharaan Aset
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Pekerjaan sehari-hari
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} dibekukan
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Beban Persediaan
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Beban Persediaan
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Pilih Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Silahkan masukkan Kontak Email Utama
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Silahkan masukkan Kontak Email Utama
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entri
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,alamat utama
 DocType: Production Plan,Material Request Detail,Detail Permintaan Material
 DocType: Selling Settings,Default Quotation Validity Days,Hari Validasi Kutipan Default
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,perubahan Jumlah
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Kategori Lisensi Mengemudi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Harap masukkan Tanggal Pengiriman
 DocType: Depreciation Schedule,Make Depreciation Entry,Membuat Penyusutan Masuk
+DocType: HR Settings,Leave Settings,Tinggalkan Pengaturan
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Permintaan Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,membuat Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modus setup POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Menonaktifkan pembuatan log waktu terhadap Perintah Kerja. Operasi tidak akan dilacak terhadap Perintah Kerja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Eksekusi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Eksekusi
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Rincian operasi yang dilakukan.
 DocType: Asset Maintenance Log,Maintenance Status,Status pemeliharaan
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Rincian Keanggotaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pemasok diperlukan untuk akun Hutang {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Item dan Harga
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Jumlah jam: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
 DocType: Drug Prescription,Interval,Selang
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Pilihan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Pilihan
 DocType: Grant Application,Individual,Individu
 DocType: Academic Term,Academics User,Pengguna Akademis
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Gambar
-DocType: Employee Loan Application,Loan Info,Info kredit
+DocType: Loan Application,Loan Info,Info kredit
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rencana kunjungan pemeliharaan.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Periode Scorecard Supplier
 DocType: Share Transfer,Share Transfer,Bagikan Transfer
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Item Template
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokimia
 DocType: Job Offer,Select Terms and Conditions,Pilih Syarat dan Ketentuan
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out Nilai
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out Nilai
 DocType: Woocommerce Settings,Woocommerce Settings,Pengaturan Woocommerce
 DocType: Production Plan,Sales Orders,Order Penjualan
 DocType: Purchase Taxes and Charges,Valuation,Valuation
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Wilayah Standar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisi
 DocType: Work Order Operation,Updated via 'Time Log',Diperbarui melalui 'Log Waktu'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Pilih pelanggan atau pemasok.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,Jurnalistik
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Company,Enable Perpetual Inventory,Aktifkan Inventaris Abadi
+DocType: Bank Guarantee,Charges Incurred,Biaya yang Ditimbulkan
 DocType: Company,Default Payroll Payable Account,Default Payroll Hutang Akun
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Perbarui Email Kelompok
 DocType: Sales Invoice,Is Opening Entry,Entri Pembuka?
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Hasil Kustom
 DocType: Delivery Stop,Contact Name,Nama Kontak
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian saja
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Id pajak:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Id pajak:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Identitas Siswa:
 DocType: POS Customer Group,POS Customer Group,POS Pelanggan Grup
 DocType: Land Unit,Land Unit describing various land assets,Unit Tanah yang menggambarkan berbagai aset pertanahan
@@ -374,9 +371,8 @@
 ,Open Work Orders,Buka Perintah Kerja
 DocType: Payment Term,Credit Months,Bulan kredit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay bersih yang belum bisa kurang dari 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Untuk berhenti mengirim pemberitahuan kesalahan berulang dari sistem, kami telah memeriksa kolom Nonaktif dalam langganan"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,cuti per Tahun
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,cuti per Tahun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 DocType: Email Digest,Profit & Loss,Rugi laba
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Tolong atur Siswa di Kelompok Siswa
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Entri Bank
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Cuti Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Entri Bank
 DocType: Crop,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Barang Rekonsiliasi Persediaan
 DocType: Stock Entry,Sales Invoice No,Nomor Faktur Penjualan
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Grup Pelajar Penciptaan Alat
 DocType: Lead,Do Not Contact,Jangan Hubungi
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Orang-orang yang mengajar di organisasi Anda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Course Scheduling Tool,Course Start Date,Tentu saja Tanggal Mulai
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Publikasikan di Hub
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Tanggal Kliring
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Rincian pembelian
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Kutipan Baru
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Surel slip gaji ke karyawan berdasarkan surel utama yang dipilih dalam Karyawan
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti terlebih dahulu dalam daftar akan ditetapkan sebagai default Cuti Approver
 DocType: Tax Rule,Shipping County,Pengiriman County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Belajar
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Berikutnya Penyusutan Tanggal
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Biaya Aktivitas Per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Penghapusan Cek dan Deposito yang Jatuh Tempo
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
 DocType: Driver,Fleet Manager,armada Manajer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak bisa menjadi negatif untuk item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak bisa menjadi negatif untuk item {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Kata Sandi Salah
 DocType: Item,Variant Of,Varian Of
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Harap atur Tarif Kamar Hotel di {}
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Opening Invoice Creation Tool,Invoice Type,Tipe Faktur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Nota Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Nota Pengiriman
 DocType: Consultation,Encounter Impression,Tayangan Pertemuan
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Persiapan Pajak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Biaya Asset Terjual
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Mata Uang Pelanggan dikonversi ke mata uang dasar pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tentu saja Penjadwalan Perangkat
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Penting] Kesalahan saat membuat perulangan %s untuk %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
 DocType: Land Unit,LInked Analysis,Analisis LInked
 DocType: Item Tax,Tax Rate,Tarif Pajak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Periode aplikasi tidak dapat melewati dua catatan alokasi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Periode aplikasi tidak dapat melewati dua catatan alokasi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan bagi Karyawan {1} untuk periode {2} ke {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Buat Grup Mahasiswa
 DocType: Volunteer,Weekends,Akhir pekan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Jumlah Catatan Kredit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Jumlah Catatan Kredit
 DocType: Setup Progress Action,Action Document,Dokumen tindakan
 DocType: Chapter Member,Website URL,URL situs
 ,Finished Goods,Stok Barang Jadi
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tambahkan Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Stok Barang Kualitas Parameter Inspeksi
+DocType: Leave Application,Leave Approver Name,Nama Approver Cuti
 DocType: Depreciation Schedule,Schedule Date,Jadwal Tanggal
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Laba, Pengurangan dan komponen Gaji lainnya"
 DocType: Packed Item,Packed Item,Stok Barang Kemasan
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan Quotation
 DocType: Healthcare Settings,Require Lab Test Approval,Memerlukan Lab Test Approval
 DocType: Salary Slip Timesheet,Working Hours,Jam Kerja
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total Posisi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total Posisi
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
 DocType: Dosage Strength,Strength,Kekuatan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Buat Pelanggan baru
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Biaya Consumable
 DocType: Purchase Receipt,Vehicle Date,Tanggal Kendaraan
 DocType: Student Log,Medical,Medis
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Alasan Kehilangan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Alasan Kehilangan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Perbarui Nomor Akun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Pemilik Prospek tidak bisa sama dengan Prospek
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,jumlah yang dialokasikan tidak bisa lebih besar dari jumlah yang disesuaikan
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Tunggal
 DocType: Salary Slip,Total Loan Repayment,Total Pembayaran Pinjaman
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
-DocType: Subscription,Yearly,Tahunan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
 DocType: Drug Prescription,Dosage,Dosis
 DocType: Journal Entry Account,Sales Order,Order Penjualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Harga Jual Rata-rata
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Harga Jual Rata-rata
 DocType: Assessment Plan,Examiner Name,Nama pemeriksa
 DocType: Lab Test Template,No Result,Tidak ada hasil
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantitas dan Harga
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Silahkan masukkan nama perusahaan terlebih dahulu
 DocType: Purchase Invoice,Supplier Name,Nama Supplier
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Pedoman ERPNEXT
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Tampilkan Daun Dari Semua Anggota Departemen Dalam Kalender
 DocType: Purchase Invoice,01-Sales Return,01-Sales Return
 DocType: Account,Is Group,Apakah Group?
 DocType: Email Digest,Pending Purchase Orders,Pending Pembelian Pesanan
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Bidang Wajib - Tahun Akademik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sesuaikan teks pengantar yang menjadi bagian dari surel itu. Setiap transaksi memiliki teks pengantar yang terpisah.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Harap atur akun hutang default untuk perusahaan {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Harap atur akun hutang default untuk perusahaan {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transaksi tidak diizinkan melawan Stop Work Order {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Hari Libur.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dicadangkan untuk dijual
 DocType: Packing Slip,From Package No.,Dari Package No
 DocType: Item Attribute,To Range,Berkisar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek Saham dan Deposit
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak dapat mengubah metode valuasi, karena ada transaksi terhadap beberapa item yang tidak memiliki metode penilaian sendiri"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Efek Saham dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak dapat mengubah metode valuasi, karena ada transaksi terhadap beberapa item yang tidak memiliki metode penilaian sendiri"
 DocType: Student Report Generation Tool,Attended by Parents,Diikuti oleh Orangtua
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah cuti wajib dialokasikan
 DocType: Patient,AB Positive,AB Positif
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Laporan Absensi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan absen.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
-DocType: Employee Loan,Total Payment,Total pembayaran
+DocType: Loan,Total Payment,Total pembayaran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Tidak dapat membatalkan transaksi untuk Perintah Kerja Selesai.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu diantara Operasi (di menit)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan sehingga tindakan tidak dapat diselesaikan
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan anda. Bisa organisasi atau individu.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bagian yang cukup untuk Membangun
 DocType: POS Profile User,POS Profile User,Profil Pengguna POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
+DocType: Subscription Invoice,Subscription Invoice,Berlangganan Faktur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Pendapatan Langsung
 DocType: Patient Appointment,Date TIme,Tanggal Waktu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Petugas Administrasi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Petugas Administrasi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Menyiapkan perusahaan dan pajak
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Silakan pilih Kursus
 DocType: Codification Table,Codification Table,Tabel Kodifikasi
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Silakan pilih Perusahaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry Detail,Difference Account,Perbedaan Akun
 DocType: Purchase Invoice,Supplier GSTIN,Pemasok GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Template Pemetaan Arus Kas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
+DocType: Bank Guarantee,Providing,Menyediakan
 DocType: Account,Profit and Loss,Laba Rugi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Tidak diizinkan, konfigurasikan Lab Test Template sesuai kebutuhan"
 DocType: Patient,Risk Factors,Faktor risiko
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
 DocType: Healthcare Settings,Appointment Confirmation,Konfirmasi perjanjian
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus No. Seri {0}, karena digunakan dalam transaksi persediaan"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus No. Seri {0}, karena digunakan dalam transaksi persediaan"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Penutup (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Halo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Pindahkan Barang
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Sudah menetapkan default pada profil pos {0} untuk pengguna {1}, dengan baik dinonaktifkan secara default"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai akumulasi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Maaf, Nomor Seri tidak dapat digabungkan"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Maaf, Nomor Seri tidak dapat digabungkan"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Wilayah Diperlukan di Profil POS
 DocType: Supplier,Prevent RFQs,Mencegah RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Membuat Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Slip Gaji dikirim untuk periode dari {0} sampai {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Slip Gaji dikirim untuk periode dari {0} sampai {1}
 DocType: Project Task,Project Task,Tugas Proyek
 ,Lead Id,Id Prospek
 DocType: C-Form Invoice Detail,Grand Total,Nilai Jumlah Total
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Tanggal Tagihan Pengiriman
 DocType: Production Plan,Production Plan,Rencana produksi
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Membuka Invoice Creation Tool
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Retur Penjualan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Catatan: Jumlah daun dialokasikan {0} tidak boleh kurang dari daun yang telah disetujui {1} untuk periode
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Tentukan Qty dalam Transaksi berdasarkan Serial No Input
 ,Total Stock Summary,Ringkasan Persediaan Total
 DocType: Announcement,Posted By,Dikirim oleh
 DocType: Item,Delivered by Supplier (Drop Ship),Dikirim oleh Supplier (Drop Shipment)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Penawaran Kepada
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Harap atur Perusahaan
 DocType: Share Balance,Share Balance,Saldo Saham
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
 DocType: Training Result Employee,Training Result Employee,Pelatihan Hasil Karyawan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Suatu Gudang maya dimana entri persediaan dibuat.
-DocType: Repayment Schedule,Principal Amount,Jumlah pokok
-DocType: Employee Loan Application,Total Payable Interest,Total Utang Bunga
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Jumlah pokok
+DocType: Loan Application,Total Payable Interest,Total Utang Bunga
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total Posisi: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Penjualan Faktur Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
 DocType: Restaurant Reservation,Restaurant Reservation,Reservasi Restoran
 DocType: Land Unit,Land Unit Name,Nama unit tanah
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Penulisan Proposal
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Membungkus
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Beritahu Pelanggan via Email
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Beritahu Pelanggan via Email
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Sales Person lain {0} ada dengan id Karyawan yang sama
 DocType: Employee Advance,Claimed Amount,Jumlah klaim
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Gateway Akun pembayaran tidak dibuat, silakan membuat satu secara manual."
 DocType: Supplier Scorecard,Per Year,Per tahun
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Tidak memenuhi syarat untuk masuk dalam program ini sesuai DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Kelompok Barang&gt; Merek
 DocType: Sales Invoice,Sales Taxes and Charges,Pajak Penjualan dan Biaya
 DocType: Employee,Organization Profile,Profil Organisasi
 DocType: Vital Signs,Height (In Meter),Tinggi (In Meter)
 DocType: Student,Sibling Details,Detail saudara
 DocType: Vehicle Service,Vehicle Service,Layanan kendaraan
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Secara otomatis memicu permintaan umpan balik berdasarkan kondisi.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Secara otomatis memicu permintaan umpan balik berdasarkan kondisi.
 DocType: Employee,Reason for Resignation,Alasan pengunduran diri
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Template untuk penilaian kinerja.
 DocType: Sales Invoice,Credit Note Issued,Kredit Catatan Ditempatkan
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Jadwal Pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Kemudian Aturan Harga disaring berdasarkan Pelanggan, Kelompok Pelanggan, Wilayah, Pemasok, Jenis Pemasok, Kampanye, Mitra Penjualan, dll."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Perubahan Nilai bersih dalam Persediaan
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Manajemen Kredit Karyawan
 DocType: Employee,Passport Number,Nomor Paspor
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Hubungan dengan Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manajer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manajer
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Untuk
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Harap setel akun di Gudang {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Transfer Barang
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Tidak dapat menemukan jalan untuk
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Pembukaan (Dr)
+DocType: Loan,Applicant,Pemohon
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp harus setelah {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Membuat dokumen berulang
 ,GST Itemised Purchase Register,Daftar Pembelian Item GST
 DocType: Course Scheduling Tool,Reschedule,Penjadwalan ulang
-DocType: Employee Loan,Total Interest Payable,Total Utang Bunga
+DocType: Loan,Total Interest Payable,Total Utang Bunga
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Biaya Pajak dan Landing Cost
 DocType: Work Order Operation,Actual Start Time,Waktu Mulai Aktual
 DocType: BOM Operation,Operation Time,Waktu Operasi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Selesai
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Dasar
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Dasar
 DocType: Timesheet,Total Billed Hours,Total Jam Ditagih
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Jumlah Nilai Write Off
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Jumlah Nilai Write Off
 DocType: Leave Block List Allow,Allow User,Izinkan Pengguna
 DocType: Journal Entry,Bill No,Nomor Tagihan
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Account pada Asset Disposal
 DocType: Vehicle Log,Service Details,Rincian layanan
-DocType: Subscription,Quarterly,Triwulan
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Nota Pengiriman Diperlukan
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Lembar waktu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Baku Berbasis Pada
 DocType: Sales Invoice,Port Code,Kode port
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Gudang Cadangan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Gudang Cadangan
 DocType: Lead,Lead is an Organization,Lead adalah sebuah Organisasi
 DocType: Guardian Interest,Interest,Bunga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pra penjualan
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Akun / Rekening
 DocType: Vehicle,Odometer Value (Last),Odometer Nilai (terakhir)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Template dari kriteria scorecard pemasok.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Entri pembayaran sudah dibuat
 DocType: Request for Quotation,Get Suppliers,Dapatkan Pemasok
 DocType: Purchase Receipt Item Supplied,Current Stock,Persediaan saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Slip Gaji Preview
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Slip Gaji Preview
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Anda hanya bisa memperpanjang jika keanggotaan Anda akan berakhir dalam 30 hari
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Pilih saja apakah Anda sudah menyiapkan dokumen Flow Flow Mapper
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Supplier Scorecard,Per Week,Per minggu
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumlah Siswa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai Persediaan
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Entri Kartu Kredit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Perusahaan dan Account
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Nilai
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Nilai
 DocType: Asset Settings,Depreciation Options,Opsi Penyusutan
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Waktu posting tidak valid
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Waktu posting tidak valid
 DocType: Lead,Campaign Name,Nama Promosi Kampanye
 DocType: Hotel Room,Capacity,Kapasitas
 DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Setelah Days
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Nomor Order Pembelian Pelanggan
 DocType: Budget,Budget Against,anggaran Terhadap
 DocType: Employee,Cell Number,Nomor HP
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tidak ada karyawan untuk kriteria yang diberikan. Periksa bahwa Slip Gaji belum pernah dibuat.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tidak ada karyawan untuk kriteria yang diberikan. Periksa bahwa Slip Gaji belum pernah dibuat.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Pembuatan Form Permintaan Material Otomatis
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kalah
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Terhadap Entri Jurnal'
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Silahkan pilih sebuah tabel
 DocType: BOM,Website Specifications,Website Spesifikasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat email yang tidak valid di &#39;Penerima&#39;
 DocType: Special Test Items,Particulars,Particulars
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
 DocType: Warranty Claim,CI-,cipher
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Asset,Maintenance,Pemeliharaan
+DocType: Subscriber,Subscriber,Subscriber
 DocType: Item Attribute Value,Item Attribute Value,Nilai Item Atribut
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Harap Perbarui Status Proyek Anda
 DocType: Item,Maximum sample quantity that can be retained,Jumlah sampel maksimal yang bisa dipertahankan
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Pengaturan default untuk Belanja
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Tambahkan Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Aset membatalkan via Journal Entri {0}
-DocType: Employee Loan,Interest Income Account,Akun Pendapatan Bunga
+DocType: Loan,Interest Income Account,Akun Pendapatan Bunga
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Tinjau Undangan Dikirim
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Beban Pemeliharaan Kantor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Beban Pemeliharaan Kantor
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Pergi ke
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Mengatur Akun Email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Entrikan Stok Barang terlebih dahulu
 DocType: Asset Repair,Downtime,Downtime
 DocType: Account,Liability,Kewajiban
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Istilah Akademik:
 DocType: Salary Detail,Do not include in total,Jangan termasuk secara total
 DocType: Company,Default Cost of Goods Sold Account,Standar Harga Pokok Penjualan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Kuantitas sampel {0} tidak boleh lebih dari jumlah yang diterima {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Daftar Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Kirim Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
 DocType: Item,Max Sample Quantity,Jumlah Kuantitas Maks
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Tidak ada Izin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Tidak ada Izin
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Permintaan Kutipan
 DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
 DocType: Company,Default Bank Account,Standar Rekening Bank
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Tes Laboratorium dan Tanda Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
-DocType: Subscription,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke pemasok
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Kelompok Siswa sudah diperbarui.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kelompok Siswa sudah diperbarui.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Pembaruan Proyek.
 DocType: SMS Center,All Customer Contact,Semua Kontak Pelanggan
 DocType: Land Unit,Tree Details,Detail pohon
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Impor Absensi
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Semua Grup Stok Barang/Item
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 DocType: Work Order,Item To Manufacture,Stok Barang Untuk Produksi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status adalah {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Pilih ulang, jika alamat yang dipilih diedit setelah simpan"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 DocType: Item,Hub Publishing Details,Rincian Hub Publishing
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Awal'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Awal'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka yang Harus Dilakukan
 DocType: Notification Control,Delivery Note Message,Pesan Nota Pengiriman
 DocType: Lab Test Template,Result Format,Format Hasil
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Dua bulan sekali
 DocType: Vehicle Service,Brake Pad,Bantalan Rem
 DocType: Fertilizer,Fertilizer Contents,Isi pupuk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Penelitian & Pengembangan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Penelitian & Pengembangan
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Nilai Tertagih
 DocType: Company,Registration Details,Detail Pendaftaran
 DocType: Timesheet,Total Billed Amount,Jumlah Total Ditagih
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Bataskan cek batas kredit pada Sales Order
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Penilaian kinerja.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mengaktifkan &#39;Gunakan untuk Keranjang Belanja&#39;, sebagai Keranjang Belanja diaktifkan dan harus ada setidaknya satu Rule Pajak untuk Belanja"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Masuk pembayaran {0} terkait terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Masuk pembayaran {0} terkait terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
 DocType: Sales Invoice Item,Stock Details,Rincian Persediaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,POS
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Tempat Duduk Minimal
 DocType: Item Attribute,Item Attribute Values,Item Nilai Atribut
 DocType: Examination Result,Examination Result,Hasil pemeriksaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Nota Penerimaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Nota Penerimaan
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Master Nilai Mata Uang
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referensi DOCTYPE harus menjadi salah satu {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Work Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} harus aktif
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Tidak ada item yang tersedia untuk transfer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} harus aktif
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Tidak ada item yang tersedia untuk transfer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Penutupan (Pembukaan + Total)
 DocType: Journal Entry,Depreciation Entry,penyusutan Masuk
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Silakan pilih jenis dokumen terlebih dahulu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
 DocType: Crop Cycle,ISO 8016 standard,Standar ISO 8016
 DocType: Pricing Rule,Rate or Discount,Tarif atau Diskon
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Stok Barang {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Stok Barang {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qty Diperlukan
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favorit
 DocType: Hub Settings,Custom Data,Data Khusus
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Standar Kode Medis
 DocType: Soil Texture,Clay Composition (%),Komposisi Tanah Liar (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Harap simpan sebelum menugaskan tugas.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Nilai Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Nilai Saldo
 DocType: Lab Test,Lab Technician,Teknisi laboratorium
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Daftar Harga Jual
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jika dicek, pelanggan akan dibuat, dipetakan ke Patient. Faktur pasien akan dibuat terhadap Nasabah ini. Anda juga bisa memilih Customer yang ada saat membuat Patient."
 DocType: Bank Reconciliation,Account Currency,Mata Uang Akun
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Sebutkan Round Off Akun/ Akun Pembulatan di Perusahaan
 DocType: Purchase Receipt,Range,Jarak
 DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Fee Structure,Components,komponen
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Woocommerce Settings,Endpoints,Titik akhir
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Varian Barang {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Varian Barang {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","untuk dihasilkan. Jika tertunda, Anda harus mengubah secara manual bidang ""Ulangi pada Hari di Bulan"" ini"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
 DocType: Share Transfer,From Folio No,Dari Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Uang Muka Faktur Pembelian
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Tanggal yang tersedia untuk penggunaan
 DocType: Guardian,Guardian Name,Nama wali
 DocType: Cheque Print Template,Has Print Format,Memiliki Print Format
-DocType: Employee Loan,Sanctioned,sanksi
+DocType: Loan,Sanctioned,sanksi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,wajib diisi. Mungkin Kurs Mata Uang belum dibuat untuk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
 DocType: Crop Cycle,Crop Cycle,Siklus Tanaman
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk barang-barang 'Bundel Produk', Gudang, Nomor Serial dan Nomor Batch akan diperhitungkan dari tabel 'Packing List'. Bila Gudang dan Nomor Batch sama untuk semua barang-barang kemasan dari segala barang 'Bundel Produk', maka nilai tersebut dapat dimasukkan dalam tabel Barang utama, nilai tersebut akan disalin ke tabel 'Packing List'."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk barang-barang 'Bundel Produk', Gudang, Nomor Serial dan Nomor Batch akan diperhitungkan dari tabel 'Packing List'. Bila Gudang dan Nomor Batch sama untuk semua barang-barang kemasan dari segala barang 'Bundel Produk', maka nilai tersebut dapat dimasukkan dalam tabel Barang utama, nilai tersebut akan disalin ke tabel 'Packing List'."
 DocType: Student Admission,Publish on website,Mempublikasikan di website
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
+DocType: Subscription,Cancelation Date,Tanggal Pembatalan
 DocType: Purchase Invoice Item,Purchase Order Item,Stok Barang Order Pembelian
 DocType: Agriculture Task,Agriculture Task,Tugas Pertanian
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Pendapatan Tidak Langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Pendapatan Tidak Langsung
 DocType: Student Attendance Tool,Student Attendance Tool,Alat Kehadiran Siswa
 DocType: Restaurant Menu,Price List (Auto created),Daftar Harga (Auto dibuat)
 DocType: Cheque Print Template,Date Settings,Pengaturan Tanggal
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,Biaya Listrik
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab testing datetime tidak bisa sebelum koleksi datetime
+DocType: Subscription Plan,Cost,Biaya
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Pengingat Ulang Tahun
 DocType: Expense Claim,Total Advance Amount,Jumlah Uang Muka Total
 DocType: Delivery Stop,Estimated Arrival,perkiraan kedatangan
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Unggah kop surat dan logo. (Anda dapat mengubahnya nanti).
 DocType: Timesheet Detail,Bill,Tagihan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Putih
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Putih
 DocType: SMS Center,All Lead (Open),Semua Prospek (Terbuka)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} di gudang {1} pada postingan kali entri ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Anda hanya bisa memilih maksimal satu pilihan dari daftar kotak centang.
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
 DocType: Item,Automatically Create New Batch,Buat Batch Baru secara otomatis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Menugaskan {0} ke {1} (baris {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Membuat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Menugaskan {0} ke {1} (baris {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Membuat
 DocType: Student Admission,Admission Start Date,Pendaftaran Mulai Tanggal
 DocType: Journal Entry,Total Amount in Words,Jumlah Total dalam Kata
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Karyawan baru
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Daftar Nama Hari Libur
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Jumlah Pinjaman
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Jadwal Kursus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opsi Persediaan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opsi Persediaan
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Nonaktifkan Mengambil Rincian Pembelian Terakhir di Pesanan Pembelian
 DocType: Journal Entry Account,Expense Claim,Biaya Klaim
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Apakah Anda benar-benar ingin mengembalikan aset dibuang ini?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip Stok Barang
 DocType: Purchase Invoice,Cash/Bank Account,Rekening Kas / Bank
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tentukan {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Pembuatan varian telah antri.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Ringkasan Kerja untuk {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Tabel atribut wajib
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,The Leave Approver pertama dalam daftar akan ditetapkan sebagai Default Leave Approver.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Plan,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} tidak dapat negatif
 DocType: Training Event,Self-Study,Belajar sendiri
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Upah
 DocType: Asset Maintenance,Maintenance Manager Name,Nama Manajer Pemeliharaan
 DocType: Agriculture Task,Urgent,Mendesak
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Tentukan Row ID berlaku untuk baris {0} dalam tabel {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Tentukan Row ID berlaku untuk baris {0} dalam tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Tidak dapat menemukan variabel:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Harap pilih bidang yang akan diedit dari numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Tidak dapat menjadi item aset tetap karena Stock Ledger dibuat.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nama Template Inspeksi Kualitas
 DocType: Project,First Email,Email Pertama
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Stok Barang Jadi Gudang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Nilai Penjualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Nilai Penjualan
 DocType: Repayment Schedule,Interest Amount,Jumlah bunga
 DocType: Serial No,Creation Document No,Nomor Dokumen
 DocType: Share Transfer,Issue,Masalah / Isu
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Negara Pengirim
 ,Projected Quantity as Source,Proyeksi Jumlah sebagai Sumber
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Perjalanan pengiriman
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Perjalanan pengiriman
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Jenis transfer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Beban Penjualan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Beban Penjualan
 DocType: Consultation,Diagnosis,Diagnosa
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standar Pembelian
 DocType: GL Entry,Against,Terhadap
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Mitra Implementasi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Kode Pos
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} adalah {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Pilih akun pendapatan bunga dalam pinjaman {0}
 DocType: Opportunity,Contact Info,Informasi Kontak
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Membuat Entri Persediaan
 DocType: Packing Slip,Net Weight UOM,Uom Berat Bersih
 DocType: Item,Default Supplier,Supplier Standar
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Selama Penyisihan Produksi Persentase
-DocType: Employee Loan,Repayment Schedule,Jadwal pembayaran
+DocType: Loan,Repayment Schedule,Jadwal pembayaran
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kondisi / Aturan Pengiriman
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Tanggal Libur Mingguan
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tanggal Berakhir tidak boleh lebih awal dari Tanggal Mulai
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
 DocType: Education Settings,Attendance Freeze Date,Tanggal Pembekuan Kehadiran
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa Supplier Anda. Mereka bisa menjadi organisasi atau individu.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Lihat Semua Produk
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum Umur Prospek (Hari)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,semua BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Kamar Hotel tipe {0} tidak tersedia pada {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,Dari Karyawan
 DocType: Driver,Cellphone Number,Nomor ponsel
 DocType: Project,Monitor Progress,Pantau Kemajuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
 DocType: Journal Entry,Make Difference Entry,Buat Entri Perbedaan
+DocType: Supplier Quotation,Auto Repeat Section,Bagian Ulangi Otomatis
 DocType: Upload Attendance,Attendance From Date,Absensi Kehadiran dari Tanggal
 DocType: Appraisal Template Goal,Key Performance Area,Area Kinerja Kunci
 DocType: Program Enrollment,Transportation,Transportasi
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atribut yang tidak valid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} harus dikirim
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
+DocType: Department Approver,Department Approver,Persetujuan Departemen
 DocType: SMS Center,Total Characters,Jumlah Karakter
 DocType: Employee Advance,Claimed,Diklaim
 DocType: Crop,Row Spacing,Row Spacing
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rekonsiliasi Faktur Pembayaran
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Kontribusi%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Sesuai dengan Setelan Pembelian jika Pesanan Pembelian Diperlukan == &#39;YA&#39;, maka untuk membuat Purchase Invoice, pengguna harus membuat Purchase Order terlebih dahulu untuk item {0}"
+,HSN-wise-summary of outward supplies,HSN-bijaksana-ringkasan persediaan luar
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nomor registrasi perusahaan untuk referensi Anda. Nomor pajak dll
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Aturan Pengiriman Belanja Shoping Cart
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Nama Aksi
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Mulai Tahun
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},2 digit pertama GSTIN harus sesuai dengan nomor Negara {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Tanggal faktur periode saat ini mulai
 DocType: Salary Slip,Leave Without Pay,Cuti Tanpa Bayar
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fields akan disalin hanya pada saat penciptaan.
 DocType: Setup Progress Action,Domains,Domain
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak bisa lebih besar dari 'Tanggal Selesai Sebenarnya'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Manajemen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Manajemen
 DocType: Cheque Print Template,Payer Settings,Pengaturan Wajib
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Retur Barang
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Peringatan
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Hari mulai lebih besar dari hari akhir tugas &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Nota Retur / Debit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Nota Retur / Debit
 DocType: Price List Country,Price List Country,Negara Daftar Harga
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
 DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor Konversi UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Masukkan Item Code untuk mendapatkan Nomor Batch
 DocType: Stock Settings,Default Item Group,Standar Item Grup
-DocType: Employee Loan,Partially Disbursed,sebagian Dicairkan
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Berikan informasi.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Berikan informasi.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database Supplier.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Anda tidak dapat memulai ulang Langganan yang tidak dibatalkan.
 DocType: Account,Balance Sheet,Neraca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
 DocType: Fee Validity,Valid Till,Berlaku sampai
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Pertemuan Guru Orang Tua Total
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Baris # {0}: Jumlah yang ditolak tidak dapat dimasukkan dalam Retur Pembelian
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Mengubah Grup Pelanggan untuk Pelanggan yang dipilih tidak diizinkan.
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Memperbarui perkiraan waktu kedatangan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Memperbarui perkiraan waktu kedatangan.
 DocType: Program Enrollment Tool,Enrollment Details,Rincian pendaftaran
 DocType: Purchase Invoice Item,Net Rate,Nilai Bersih / Net
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Silahkan pilih pelanggan
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Purchase Order,Group same items,Kelompok item yang sama
 DocType: Purchase Invoice,Disable Rounded Total,Nonaktifkan Pembulatan Jumlah
-DocType: Employee Loan Application,Repayment Info,Info pembayaran
+DocType: Department,Parent Department,Departemen Orang Tua
+DocType: Loan Application,Repayment Info,Info pembayaran
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entries' tidak boleh kosong
 DocType: Maintenance Team Member,Maintenance Role,Peran Pemeliharaan
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Persiapan Karyawan
 DocType: Sales Order,SO-,BEGITU-
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Reservasi Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Silakan pilih awalan terlebih dahulu
 DocType: Student,O-,HAI-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Penelitian
+DocType: Subscription Settings,Subscription Settings,Pengaturan Langganan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Penelitian
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Silakan tentukan setidaknya satu atribut dalam tabel Atribut
 DocType: Announcement,All Students,Semua murid
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
 DocType: Crop Cycle,Less than a year,Kurang dari setahun
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Mahasiswa Nomor Ponsel
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Rest of The World
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Rest of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 DocType: Crop,Yield UOM,Hasil UOM
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Nilai Gross Bayar
 DocType: Item,Is Item from Hub,Adalah Item dari Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Kegiatan adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividen Dibagi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividen Dibagi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Buku Besar Akuntansi
 DocType: Stock Reconciliation,Difference Amount,Jumlah Perbedaan
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} di Tinggalkan pada {1}
 DocType: Purchase Invoice,Reverse Charge,Biaya terbalik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Laba Ditahan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Laba Ditahan
 DocType: Purchase Invoice,05-Change in POS,05-Ubah POS
 DocType: Vehicle Log,Service Detail,layanan Detil
 DocType: BOM,Item Description,Deskripsi Barang
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Peluang Stok Barang
 ,Student and Guardian Contact Details,Mahasiswa dan Wali Detail Kontak
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Baris {0}: Untuk pemasok {0} Alamat Email diperlukan untuk mengirim email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Akun Pembukaan Sementara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Akun Pembukaan Sementara
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Lihat Hub
 ,Employee Leave Balance,Nilai Cuti Karyawan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 DocType: Patient Appointment,More Info,Info Selengkapnya
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
 DocType: Supplier Scorecard,Scorecard Actions,Tindakan Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Contoh: Magister Ilmu Komputer
 DocType: Purchase Invoice,Rejected Warehouse,Gudang Reject
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,untuk
 DocType: Supplier Quotation Item,Lead Time in days,Masa Tenggang dalam hari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Ringkasan Buku Besar Hutang
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Pembayaran gaji dari {0} ke {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Pembayaran gaji dari {0} ke {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Faktur Berjalan
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Resep Uji Lab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Kecil
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Membuka Item Alat Pembuatan Faktur
 DocType: Education Settings,Employee Number,Jumlah Karyawan
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Batalkan Faktur Setelah Masa Tenggang
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
 DocType: Project,% Completed,Selesai %
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Uji Laboratorium Datetime
 DocType: Email Digest,Add Quote,Tambahkan Kutipan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Biaya tidak langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 DocType: Agriculture Analysis Criteria,Agriculture,Pertanian
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Perlengkapan Modal
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Perlengkapan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Harap set Kode Item terlebih dahulu
 DocType: Item,ITEM-,BARANG-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
+DocType: Subscription Plan,Billing Interval Count,Jumlah Interval Penagihan
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,Pembaruan Tim
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Untuk Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Untuk Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Mengatur Tipe Akun membantu dalam memilih Akun ini dalam transaksi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Jumlah Nilai Total (Mata Uang Perusahaan)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Buat Print Format
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS Barang Grup
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Surel Ringkasan:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Barang alternatif tidak boleh sama dengan kode barang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalisasi penilaian sementara
 DocType: Salary Slip,Bank Account No.,No Rekening Bank
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Permintaan Quotation Pemasok
 DocType: Healthcare Settings,Registration Message,Pesan Pendaftaran
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Perangkat keras
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Perangkat keras
 DocType: Prescription Dosage,Prescription Dosage,Dosis Resep
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Silakan pilih sebuah Perusahaan
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Mulai dan Akhir Tanggal
 ,Delivered Items To Be Billed,Produk Terkirim untuk Ditagih
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Terbuka BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
 DocType: Project Update,Great/Quickly,Hebat / Cepat
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Silakan pilih batch untuk item batched
 DocType: Asset,Depreciation Schedules,Jadwal penyusutan
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Akun berikut mungkin dipilih di Setelan GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Akun berikut mungkin dipilih di Setelan GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 DocType: Payment Request,Transaction Currency,Mata uang transaksi
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Rata-rata Harian Outgoing
 DocType: POS Profile,Campaign,Promosi
 DocType: Supplier,Name and Type,Nama dan Jenis
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
 DocType: Physician,Contacts and Address,Kontak dan Alamat
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Jadwal Tanggal Mulai' tidak dapat lebih besar dari 'Jadwal Tanggal Selesai'"
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Kelayakan dan Detail
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Permintaan Quotation dinonaktifkan untuk akses dari portal, untuk pengaturan Portal cek lagi."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabel Scorecard Supplier Variabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Jumlah Pembelian
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Jumlah Pembelian
 DocType: Sales Invoice,Shipping Address Name,Alamat Pengiriman
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ada kesalahan dalam membuat Jadwal Kursus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Barang {0} bukan merupakan Barang persediaan
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Expense Approver pertama dalam daftar akan ditetapkan sebagai Approver Approver default.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Barang {0} bukan merupakan Barang persediaan
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Detail,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1820,15 +1825,16 @@
 DocType: Package Code,Package Code,Kode paket
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Magang
 DocType: Purchase Invoice,Company GSTIN,Perusahaan GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Rinci tabel pajak diambil dari master Stok Barang sebagai string dan disimpan dalam bidang ini.
  Digunakan untuk Pajak dan Biaya"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Tinggalkan Persetujuan Wajib Di Tinggalkan Aplikasi
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Akun Rekening
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Aturan pajak untuk transaksi.
@@ -1856,15 +1862,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Syarat Pembayaran di baris {0} mungkin merupakan duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Pertanian (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Slip Packing
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Sewa Kantor
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Slip Packing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Sewa Kantor
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 DocType: Disease,Common Name,Nama yang umum
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Impor Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Belum ditambahkan alamat
 DocType: Workstation Working Hour,Workstation Working Hour,Jam Kerja Workstation
 DocType: Vital Signs,Blood Pressure,Tekanan darah
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analis
 DocType: Item,Inventory,Inventarisasi
 DocType: Item,Sales Details,Detail Penjualan
 DocType: Quality Inspection,QI-,QI-
@@ -1874,15 +1880,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validasi Kursus Terdaftar untuk Siswa di Kelompok Pelajar
 DocType: Notification Control,Expense Claim Rejected,Beban Klaim Ditolak
 DocType: Item,Item Attribute,Item Atribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,pemerintahan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,pemerintahan
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Beban Klaim {0} sudah ada untuk Kendaraan Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,nama institusi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Masukkan pembayaran Jumlah
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Masukkan pembayaran Jumlah
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Item Varian
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Jasa
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Gaji ke Karyawan
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Pilih Kemungkinan Pemasok
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Pilih Kemungkinan Pemasok
 DocType: Sales Invoice,Source,Sumber
 DocType: Customer,"Select, to make the customer searchable with these fields","Pilih, untuk membuat pelanggan dapat ditelusuri dengan bidang ini"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Tampilkan ditutup
@@ -1899,7 +1905,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Arus Kas dari Investasi
 DocType: Program Course,Program Course,Kursus Program
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Homepage,Company Tagline for website homepage,Perusahaan Tagline untuk homepage website
 DocType: Item Group,Item Group Name,Nama Item Grup
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
@@ -1929,10 +1935,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Rincian Memebership
 DocType: Leave Block List,Block Holidays on important days.,Blok Hari Libur pada hari-hari penting.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Harap masukan semua Nilai Hasil yang dibutuhkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Ringkasan Buku Piutang
-DocType: Employee Loan,Monthly Repayment Amount,Bulanan Pembayaran Jumlah
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Ringkasan Buku Piutang
+DocType: Loan,Monthly Repayment Amount,Bulanan Pembayaran Jumlah
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Membuka Faktur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
 DocType: UOM,UOM Name,Nama UOM
 DocType: GST HSN Code,HSN Code,Kode HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Jumlah kontribusi
@@ -1954,7 +1960,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Pengguna {0} sudah ditugaskan ke Dokter {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kotak
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mungkin Pemasok
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mungkin Pemasok
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Distribusi bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List kosong. Silakan membuat Receiver List
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Kesehatan (beta)
@@ -1981,7 +1988,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Tidak ada item untuk dikemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
-DocType: Employee Loan,Repayment Method,Metode pembayaran
+DocType: Loan,Repayment Method,Metode pembayaran
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jika diperiksa, Home page akan menjadi default Barang Group untuk website"
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Klaim untuk biaya perusahaan.
@@ -1990,7 +1997,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifikat yang dibutuhkan
 DocType: Company,Default Holiday List,Standar Daftar Hari Libur
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Waktu dan Untuk Waktu {1} adalah tumpang tindih dengan {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Hutang Persediaan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Hutang Persediaan
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Supplier
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Pilih Perusahaan
@@ -1998,7 +2005,7 @@
 DocType: Student Report Generation Tool,Print Section,Bagian Cetak
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Pengguna {0} tidak memiliki Profil POS default. Cek Default di Baris {1} untuk Pengguna ini.
 DocType: Student Group,Set 0 for no limit,Set 0 untuk tidak ada batas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Baris {idx}: {field} diperlukan untuk membuat Pembukaan {invoice_type} Faktur
 DocType: Customer,Primary Address and Contact Detail,Alamat Utama dan Detail Kontak
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Kirim ulang Email Pembayaran
@@ -2009,10 +2016,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Pilih setidaknya satu domain.
 DocType: Dependent Task,Dependent Task,Tugas Dependent
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
 DocType: SMS Center,Receiver List,Daftar Penerima
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Cari Barang
 DocType: Payment Schedule,Payment Amount,Jumlah pembayaran
@@ -2022,7 +2029,7 @@
 DocType: Assessment Plan,Grading Scale,Skala penilaian
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Sudah lengkap
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Persediaan Di Tangan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Persediaan Di Tangan
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Impor Sukses!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
@@ -2033,17 +2040,16 @@
 DocType: Quotation Item,Quotation Item,Produk/Barang Penawaran
 DocType: Customer,Customer POS Id,Id POS Pelanggan
 DocType: Account,Account Name,Nama Akun
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial ada {0} kuantitas {1} tak bisa menjadi pecahan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial ada {0} kuantitas {1} tak bisa menjadi pecahan
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Silakan masukkan URL Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Supplier Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Supplier Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
 DocType: Share Balance,To No,Ke no
-DocType: Subscription,Reference Document,Dokumen referensi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kredit Kontroller
-DocType: Grant Application,Applicant Type,Jenis Pemohon
+DocType: Loan,Applicant Type,Jenis Pemohon
 DocType: Purchase Invoice,03-Deficiency in services,03-Kekurangan layanan
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dikirim Tanggal
 DocType: Healthcare Settings,Default Medical Code Standard,Standar Kode Standar Medis
@@ -2054,13 +2060,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Ditagih
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Daya Manusia
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Sumber Daya Manusia
 DocType: Lead,Upper Income,Penghasilan Atas
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Menolak
 DocType: Journal Entry Account,Debit in Company Currency,Debit di Mata Uang Perusahaan
 DocType: BOM Item,BOM Item,Komponen BOM
 DocType: Appraisal,For Employee,Untuk Karyawan
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Membuat Pencairan Masuk
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Membuat Pencairan Masuk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Supplier harus mendebet
 DocType: Company,Default Values,Nilai Default
 DocType: Membership,INR,INR
@@ -2089,10 +2095,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (Tanpa Pajak)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Jumlah Prospek
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} harus lebih besar dari 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stok Tersedia
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stok Tersedia
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perencanaan Kapasitas Untuk (Hari)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Pembelian
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Bidang wajib - Program
 DocType: Special Test Template,Result Component,Komponen Hasil
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garansi Klaim
@@ -2112,7 +2118,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Sertakan libur dalam cuti cuti
 DocType: Sales Invoice,Packed Items,Produk Kemasan
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garansi Klaim terhadap Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktifkan Keranjang Belanja
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2130,10 +2136,10 @@
 DocType: Selling Settings,Selling Settings,Pengaturan Penjualan
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Konfirmasi Tindakan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Lelang Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Pemenuhan
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Lihat Troli
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Beban Pemasaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Tidak dapat membuat kriteria standar. Mohon ganti nama kriteria
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
@@ -2155,9 +2161,9 @@
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Material Request,Transferred,Ditransfer
 DocType: Vehicle,Doors,pintu
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kumpulkan Biaya untuk Registrasi Pasien
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Tidak dapat mengubah Atribut setelah transaksi saham. Buat Item baru dan transfer saham ke Item baru
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Tidak dapat mengubah Atribut setelah transaksi saham. Buat Item baru dan transfer saham ke Item baru
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Rincian pajak
 DocType: Packing Slip,PS-,PS
@@ -2193,11 +2199,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,No. Batch
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Uang muka karyawan
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan beberapa Order Penjualan terhadap Order Pembelian dari Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Instruktur Kelompok Mahasiswa
 DocType: Grant Application,Assessment  Mark (Out of 10),Tanda Penilaian (Dari 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Ponsel Tidak
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
@@ -2206,15 +2213,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari Bidang Usaha Wajib Diisi
 DocType: Email Digest,Annual Expenses,Beban tahunan
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang dialokasikan
 DocType: Sales Team,Contribution to Net Total,Kontribusi terhadap Net Jumlah
 DocType: Sales Invoice Item,Customer's Item Code,Kode Barang Pelanggan
 DocType: Stock Reconciliation,Stock Reconciliation,Rekonsiliasi Persediaan
 DocType: Territory,Territory Name,Nama Wilayah
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Anda hanya dapat memiliki Paket dengan siklus penagihan yang sama dalam Langganan
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon untuk Lowongan Pekerjaan
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Referensi
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutory dan informasi umum lainnya tentang Supplier Anda
@@ -2223,10 +2231,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Catatan Jurnal {0} tidak memiliki {1} catatan yang belum dicocokan.
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Penilaian
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Acara Pelatihan
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Lacak Memimpin oleh Sumber Utama.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,masukkan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,masukkan
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Log Pemeliharaan
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih package ini. (Dihitung secara otomatis sebagai jumlah berat bersih item)
@@ -2234,11 +2242,11 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Dikirim dan Ditagih
 DocType: Student Group,Instructors,instruktur
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} harus dikirimkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} harus dikirimkan
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Manajemen saham
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Stok Barang {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pembayaran
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Gudang {0} tidak ditautkan ke akun apa pun, sebutkan akun di catatan gudang atau tetapkan akun persediaan baku di perusahaan {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Mengelola pesanan Anda
 DocType: Work Order Operation,Actual Time and Cost,Waktu dan Biaya Aktual
@@ -2248,7 +2256,7 @@
 DocType: Student Leave Application,Student Leave Application,Mahasiswa Cuti Aplikasi
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Nyala
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel item pada saat penjualan.
@@ -2258,7 +2266,7 @@
 DocType: Item,Barcodes,Barcode
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukan item duplikat. Harap perbaiki dan coba lagi.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Rekan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Rekan
 DocType: Asset Movement,Asset Movement,Gerakan aset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Perintah Kerja {0} harus diserahkan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Cart baru
@@ -2276,13 +2284,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Mata uang penagihan harus sama dengan mata uang perusahaan atau mata uang akun tertagih
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 DocType: Soil Texture,Loam,Lempung
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Baris {0}: Tanggal Jatuh Tempo tidak boleh sebelum tanggal posting
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Baris {0}: Tanggal Jatuh Tempo tidak boleh sebelum tanggal posting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Buat Entri Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
 ,Sales Invoice Trends,Trend Faktur Penjualan
 DocType: Leave Application,Apply / Approve Leaves,Mohon / Approve Cuti
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Untuk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
 DocType: Sales Order Item,Delivery Warehouse,Gudang Pengiriman
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Pohon Pusat Biaya keuangan.
 DocType: Serial No,Delivery Document No,Nomor Dokumen Pengiriman
@@ -2296,7 +2303,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Konsumsi Material tidak diatur dalam Pengaturan Manufaktur.
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Tidak dapat membebani Item {0} pada baris {1} lebih dari {2}. Untuk mengizinkan over-billing, silahkan atur di Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Tidak dapat membebani Item {0} pada baris {1} lebih dari {2}. Untuk mengizinkan over-billing, silahkan atur di Stock Settings"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Perbarui Tanggapan
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
@@ -2307,12 +2314,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Pilih programnya dulu
 DocType: Patient Appointment,Patient Age,Usia pasien
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Pengelolaan Proyek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} telah dikembalikan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} telah dikembalikan
 DocType: Supplier,Supplier of Goods or Services.,Supplier Stok Barang atau Jasa.
 DocType: Budget,Fiscal Year,Tahun Fiskal
 DocType: Asset Maintenance Log,Planned,Berencana
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Rekening piutang bawaan yang akan digunakan jika tidak diatur oleh Pasien untuk memesan biaya Konsultasi.
 DocType: Vehicle Log,Fuel Price,Harga BBM
+DocType: Bank Guarantee,Margin Money,Uang Marjin
 DocType: Budget,Budget,Anggaran belanja
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Setel Buka
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus barang non-persediaan.
@@ -2326,16 +2334,16 @@
 DocType: Lead,Follow Up,Mengikuti
 DocType: Item,Is Sales Item,Barang Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tree Item Grup
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Nomor Seri. Periksa Induk Barang
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Nomor Seri. Periksa Induk Barang
 DocType: Maintenance Visit,Maintenance Time,Waktu Pemeliharaan
 ,Amount to Deliver,Jumlah untuk Dikirim
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Item yang sama telah beberapa kali dimasukkan. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Mulai tidak dapat lebih awal dari Tahun Tanggal Mulai Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Ada kesalahan.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Karyawan {0} telah mengajukan permohonan untuk {1} antara {2} dan {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Ada kesalahan.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Karyawan {0} telah mengajukan permohonan untuk {1} antara {2} dan {3}:
 DocType: Guardian,Guardian Interests,wali Minat
 DocType: Naming Series,Current Value,Nilai saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
 DocType: Education Settings,Instructor Records to be created by,Catatan Instruktur yang akan dibuat oleh
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dibuat
 DocType: GST Account,GST Account,Akun GST
@@ -2355,8 +2363,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Ditambahkan ke Favorit
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tidak ada slip gaji yang ditemukan untuk memenuhi kriteria yang dipilih di atas ATAU slip gaji yang telah diajukan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tarif dan Pajak
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tidak ada slip gaji yang ditemukan untuk memenuhi kriteria yang dipilih di atas ATAU slip gaji yang telah diajukan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Tarif dan Pajak
 DocType: Projects Settings,Projects Settings,Pengaturan Proyek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Harap masukkan tanggal Referensi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri pembayaran tidak dapat disaring oleh {1}
@@ -2366,27 +2374,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree Item Grup.
 DocType: Production Plan,Total Produced Qty,Total Diproduksi Qty
 DocType: Payroll Entry,Get Employee Details,Dapatkan Rincian Karyawan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
 DocType: Asset,Sold,Terjual
 ,Item-wise Purchase History,Laporan Riwayat Pembelian berdasarkan Stok Barang/Item
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Dasar Penilaian (Mata Uang Perusahaan)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Bahan baku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Bahan baku
 DocType: Payment Reconciliation Payment,Reference Row,referensi Row
 DocType: Installation Note,Installation Time,Waktu Installasi
 DocType: Sales Invoice,Accounting Details,Rincian Akuntansi
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Hapus semua Transaksi untuk Perusahaan ini
 DocType: Patient,O Positive,O Positif
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investasi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Alokasi
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Tidak ada pembayaran yang tersedia untuk Entri Jurnal
 DocType: Item Attribute,Attribute Name,Nama Atribut
 DocType: BOM,Show In Website,Tampilkan Di Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Tampilkan Kuantitas Website
-DocType: Employee Loan Application,Total Payable Amount,Jumlah Total Hutang
+DocType: Loan Application,Total Payable Amount,Jumlah Total Hutang
 DocType: Task,Expected Time (in hours),Waktu yang diharapkan (dalam jam)
 DocType: Item Reorder,Check in (group),Check in (kelompok)
 DocType: Soil Texture,Silt,Lanau
@@ -2405,7 +2414,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Melakukan pembayaran
 DocType: Room,Room Name,Nama ruangan
 DocType: Prescription Duration,Prescription Duration,Durasi Resep
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Tingkat Biaya
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Alamat dan Kontak Pelanggan
 ,Campaign Efficiency,Efisiensi Promosi
@@ -2423,11 +2432,11 @@
 DocType: Chapter,Chapter,Bab
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pasangan
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Akun default akan diperbarui secara otomatis di Faktur POS saat mode ini dipilih.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
 DocType: Asset,Depreciation Schedule,Jadwal penyusutan
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Alamat Mitra Penjualan Dan Kontak
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Tanggal Setengah Hari harus di antara Tanggal Mulai dan Tanggal Akhir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Tanggal Setengah Hari harus di antara Tanggal Mulai dan Tanggal Akhir
 DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Harap atur Default Cost Center di {0} perusahaan.
 DocType: Item,Has Batch No,Bernomor Batch
@@ -2445,7 +2454,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Tanggal Akhir Aktual (dari Lembar Waktu)
 DocType: Soil Texture,Soil Type,Jenis tanah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Pesan baru
 ,Quotation Trends,Trend Penawaran
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandat GoCardless
@@ -2465,7 +2473,7 @@
 DocType: Hub Category,Hub Category,Kategori Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nomor Kendaraan
-DocType: Employee Loan,Loan Amount,Jumlah pinjaman
+DocType: Loan,Loan Amount,Jumlah pinjaman
 DocType: Student Report Generation Tool,Add Letterhead,Tambahkan kop surat
 DocType: Program Enrollment,Self-Driving Vehicle,Kendaraan Mengemudi Sendiri
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Berdiri
@@ -2493,9 +2501,9 @@
 DocType: Cash Flow Mapper,Position,Posisi
 DocType: Patient,Patient Details,Rincian pasien
 DocType: Patient,B Positive,B Positif
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
 DocType: Patient Medical Record,Patient Medical Record,Catatan Medis Pasien
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Kelompok Non-kelompok
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Olahraga
@@ -2503,8 +2511,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Aktual
 DocType: Lab Test UOM,Test UOM,Uji UOM
 DocType: Student Siblings,Student Siblings,Saudara mahasiswa
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detail Paket Langganan
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Satuan
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Silakan tentukan Perusahaan
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi dan Loyalitas Pelanggan
 DocType: Asset Maintenance Task,Maintenance Task,Tugas pemeliharaan
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Harap atur Batas B2C di Setelan GST.
@@ -2518,6 +2527,7 @@
 ,BOM Search,Pencarian BOM
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Total Biaya Bahan yang Dikonsumsi (melalui Entri Stok)
 DocType: Hub Settings,Company Registered,Perusahaan Terdaftar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,To Date tidak boleh kurang dari From Date
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publish &quot;In Stock&quot; atau &quot;Not in Stock&quot; di Hub berdasarkan stok yang ada di gudang ini.
 DocType: Vehicle,Fuel Type,Jenis bahan bakar
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
@@ -2525,17 +2535,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Persediaan di Batch {0} akan menjadi negatif {1} untuk Barang {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Berikut Permintaan Bahan telah dibesarkan secara otomatis berdasarkan tingkat re-order Item
 DocType: Email Digest,Pending Sales Orders,Pending Order Penjualan
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
 DocType: Employee,Create User Permission,Buat Izin Pengguna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Kelompok Barang&gt; Merek
 DocType: Healthcare Settings,Remind Before,Ingatkan sebelumnya
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
 DocType: Salary Component,Deduction,Deduksi
 DocType: Item,Retain Sample,Simpan sampel
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Waktu dan To Waktu adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbedaan
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan Sales Person ini
 DocType: Territory,Classification of Customers by region,Klasifikasi Pelanggan menurut wilayah
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Dalam produksi
@@ -2545,8 +2556,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dihitung keseimbangan Laporan Bank
 DocType: Normal Test Template,Normal Test Template,Template Uji Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Pengguna Non-aktif
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Penawaran
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Tidak dapat mengatur RFQ yang diterima ke No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Penawaran
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Tidak dapat mengatur RFQ yang diterima ke No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Deduksi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Pilih akun yang akan dicetak dalam mata uang akun
@@ -2554,7 +2565,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hal ini didasarkan pada transaksi melawan Pasien ini. Lihat garis waktu di bawah untuk rinciannya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Biaya Diperbarui
 DocType: Patient,Date of Birth,Tanggal Lahir
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Item {0} telah dikembalikan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Alamat Pelanggan / Prospek
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Penyiapan Scorecard Pemasok
@@ -2565,14 +2576,15 @@
 DocType: Work Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Pengurangan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Deskripsi Bidang Kerja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Deskripsi Bidang Kerja
 DocType: Student Applicant,Applied,Terapan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-terbuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-terbuka
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kuantitas sesuai UOM Persediaan
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nama Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Diskon Pasca Penjualan 02-Post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pantau Kampanye Penjualan. Pantau Prospek, Penawaran, Perintah Penjualan dll dari Kampanye untuk mengukur Return on Investment."
+DocType: Department Approver,Approver,Approver
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Bidang Ke Pemegang Saham tidak boleh kosong
 DocType: Guardian,Work Address,kerja Alamat
@@ -2586,21 +2598,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total Dialokasikan Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Order Item,To be delivered to customer,Akan dikirimkan ke pelanggan
 DocType: BOM,Scrap Material Cost,Scrap Material Biaya
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
 DocType: Grant Application,Email Notification Sent,Notifikasi Email Terkirim
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kode Barang, gudang, jumlah diminta pada baris"
-DocType: Pricing Rule,Supplier,Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kode Barang, gudang, jumlah diminta pada baris"
+DocType: Bank Guarantee,Supplier,Supplier
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Tampilkan Rincian Pembayaran
 DocType: Consultation,Consultation Time,Waktu Konsultasi
 DocType: C-Form,Quarter,Seperempat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Beban lain-lain
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Akun Beban atau Selisih adalah wajib untuk Barang {0} karena berdampak pada keseluruhan nilai persediaan
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Di Atas
-DocType: Employee Loan,Employee Loan Account,Rekening Pinjaman karyawan
 DocType: Leave Application,Total Leave Days,Jumlah Cuti Hari
 DocType: Email Digest,Note: Email will not be sent to disabled users,Catatan: Surel tidak akan dikirim ke pengguna non-aktif
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Jumlah Interaksi
@@ -2615,7 +2626,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Berat (dalam Kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",bab / chapter_name kosongkan secara otomatis setelah bab save.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Harap setel akun GST di GST Settings
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Harap setel akun GST di GST Settings
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Jenis bisnis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Biaya Pembelian New
@@ -2624,12 +2635,13 @@
 DocType: Grant Application,Grant Description,Deskripsi Hibah
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
 DocType: Student Guardian,Others,Lainnya
+DocType: Subscription,Discounts,Diskon
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak terisi
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Pajak dan Biaya
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produk atau Jasa yang dibeli, dijual atau disimpan dalam persediaan."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Tidak ada perbaruan lagi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris terlebih dahulu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ini mencakup semua scorecard yang terkait dengan Setup ini
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barang Turunan tidak boleh berupa sebuah Bundel Produk. Silahkan hapus barang `{0}` dan simpan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Perbankan
@@ -2637,45 +2649,48 @@
 DocType: Vehicle Service,Service Item,layanan Barang
 DocType: Bank Guarantee,Bank Guarantee,Bank Garansi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan mengatur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Bin,Ordered Quantity,Qty Terpesan/Terorder
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Grading Scale,Grading Scale Intervals,Grading Scale Interval
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,keuntungan untuk tahun ini
+DocType: Bank Guarantee,Name of Bank,Nama Bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entri Akuntansi untuk {2} hanya dapat dilakukan dalam bentuk mata uang: {3}
 DocType: Fee Schedule,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Diskon berdasarkan Item/Stok
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Pohon rekening keuangan.
+DocType: Bank Guarantee,Reference Document Type,Tipe Dokumen Referensi
 DocType: Cash Flow Mapping,Cash Flow Mapping,Pemetaan Arus Kas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} terhadap Order Penjualan {1}
 DocType: Account,Fixed Asset,Asset Tetap
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Persediaan memiliki serial
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email tidak ditemukan dalam kontak default
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Hasilkan Rahasia
-DocType: Employee Loan,Account Info,Info akun
+DocType: Loan,Account Info,Info akun
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
 DocType: Fees,Include Payment,Sertakan Pembayaran
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Kelompok Siswa dibuat.
 DocType: Sales Invoice,Total Billing Amount,Jumlah Total Tagihan
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program di Struktur Biaya dan Kelompok Pelajar {0} berbeda.
 DocType: Fee Schedule,Receivable Account,Akun Piutang
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Saldo Persediaan
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Nota Penjualan untuk Pembayaran
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Dengan pembayaran pajak
 DocType: Expense Claim Detail,Expense Claim Detail,Detail Klaim Biaya
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE UNTUK PEMASOK
 DocType: Land Unit,Is Container,Adalah kontainer
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ini akan menjadi hari 1 dari siklus panen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Silakan pilih akun yang benar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Silakan pilih akun yang benar
 DocType: Purchase Invoice Item,Weight UOM,Berat UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Daftar Pemegang Saham yang tersedia dengan nomor folio
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji Karyawan
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Tampilkan Variant Attributes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Tampilkan Variant Attributes
 DocType: Student,Blood Group,Golongan Darah
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang dapat menyetujui aplikasi cuti karyawan tertentu yang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Peralatan Kantor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Peralatan Kantor
 DocType: Purchase Invoice Item,Qty,Kuantitas
 DocType: Fiscal Year,Companies,Perusahaan
 DocType: Supplier Scorecard,Scoring Setup,Setup Scoring
@@ -2694,7 +2709,7 @@
 DocType: Stock Entry,Total Incoming Value,Total nilai masuk
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Pembelian Daftar Harga
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Template dari variabel scorecard pemasok.
 DocType: Job Offer Term,Offer Term,Penawaran Term
 DocType: Asset,Quality Manager,Manajer Mutu
@@ -2706,13 +2721,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total Tunggakan: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operasi Situs
 DocType: Supplier Scorecard,Supplier Score,Skor Pemasok
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Jumlah Nilai Tagihan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Jumlah Nilai Tagihan
 DocType: Supplier,Warn RFQs,Peringatkan untuk RFQs
 DocType: BOM,Conversion Rate,Tingkat konversi
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cari produk
 DocType: Assessment Plan,To Time,Untuk Waktu
 DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
+DocType: Loan,Total Amount Paid,Jumlah Total yang Dibayar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Silakan pilih Student Admission yang wajib diisi pemohon uang pelajar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Silakan pilih Daftar Harga untuk menerbitkan harga
@@ -2722,18 +2738,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Selesai Qty tidak bisa lebih dari {1} untuk operasi {2}
 DocType: Manufacturing Settings,Allow Overtime,Izinkan Lembur
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Barang {0} tidak dapat diperbarui menggunakan Rekonsiliasi Persediaan, gunakan Entri Persediaan"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Barang {0} tidak dapat diperbarui menggunakan Rekonsiliasi Persediaan, gunakan Entri Persediaan"
 DocType: Training Event Employee,Training Event Employee,Acara Pelatihan Karyawan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Sampel Maksimum - {0} dapat disimpan untuk Batch {1} dan Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Tambahkan Slot Waktu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Nomer Seri diperlukan untuk Item {1}. Anda menyediakan {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Nomer Seri diperlukan untuk Item {1}. Anda menyediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nilai Tingkat Penilaian Saat ini
 DocType: Training Event,Advance,Muka
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,untuk membuat berulang lagi.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Pengaturan gateway pembayaran GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Efek Gain / Loss
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Efek Gain / Loss
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akun {1} bukan milik perusahaan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akun {1} bukan milik perusahaan {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Tidak dapat menemukan DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
@@ -2752,7 +2767,6 @@
 DocType: Bin,Actual Quantity,Kuantitas Aktual
 DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} tidak ditemukan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Langganan telah {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program Jadwal Biaya
 DocType: Fee Schedule Program,Student Batch,Mahasiswa Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,membuat Siswa
@@ -2767,14 +2781,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Tidak Terkirim
 ,Bank Clearance Summary,Ringkasan Kliring Bank
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Buat dan kelola surel ringkasan harian, mingguan dan bulanan."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Buat dan kelola surel ringkasan harian, mingguan dan bulanan."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Pencapaian
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Sarankan Kategori?
 DocType: Stock Reconciliation Item,Current Amount,Jumlah saat ini
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Bangunan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Bangunan
 DocType: Fee Schedule,Fee Structure,Struktur biaya
 DocType: Timesheet Detail,Costing Amount,Nilai Jumlah Biaya
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Student Admission Program,Application Fee,Biaya aplikasi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Kirim Slip Gaji
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Diskon Maxiumm untuk Item {0} adalah {1}%
@@ -2782,12 +2795,13 @@
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
 DocType: SMS Log,Sender Name,Nama Pengirim
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriteria Analisis Pertanian
+DocType: HR Settings,Leave Approval Notification Template,Tinggalkan Template Pemberitahuan Persetujuan
 DocType: POS Profile,[Select],[Pilih]
 DocType: Vital Signs,Blood Pressure (diastolic),Tekanan Darah (diastolik)
 DocType: SMS Log,Sent To,Dikirim Ke
 DocType: Agriculture Task,Holiday Management,Manajemen liburan
 DocType: Payment Request,Make Sales Invoice,Buat Faktur Penjualan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,software
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,software
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
 DocType: Company,For Reference Only.,Untuk referensi saja.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Dokter {0} tidak tersedia di {1}
@@ -2805,7 +2819,7 @@
 DocType: Employee,New Workplace,Tempat Kerja Baru
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Bahan konsumsi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Tetapkan untuk ditutup
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ada Stok Barang dengan Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ada Stok Barang dengan Barcode {0}
 DocType: Normal Test Items,Require Result Value,Mengharuskan Nilai Hasil
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMS
@@ -2820,19 +2834,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Nomor Seluler Pelanggan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Pengulangan
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detail Rincian Pemetaan Arus Kas
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Manajemen Pinjaman
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Melacak Penghasilan terpisah dan Beban untuk vertikal produk atau divisi.
 DocType: Rename Tool,Rename Tool,Alat Perubahan Nama
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Perbarui Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Slip acara Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Slip acara Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Material/Stok Barang
 DocType: Fees,Send Payment Request,Kirim Permintaan Pembayaran
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 DocType: Water Analysis,Origin,Asal
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Pilih akun berubah jumlah
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
@@ -2847,14 +2861,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Apakah Kewajiban Pajak Penghasilan
 DocType: Grading Scale Interval,Grade Description,kelas Keterangan
 DocType: Stock Entry,Purchase Receipt No,No Nota Penerimaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Uang Earnest
 DocType: Sales Invoice, Shipping Bill Number,Nomor Tagihan Pengiriman
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Lacak
 DocType: Asset Maintenance Log,Actions performed,Tindakan dilakukan
 DocType: Cash Flow Mapper,Section Leader,Pemimpin Seksi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantitas di baris {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Karyawan
+DocType: Bank Guarantee,Fixed Deposit Number,Fixed Deposit Number
 DocType: Asset Repair,Failure Date,Tanggal Kegagalan
 DocType: Sample Collection,Collected Time,Waktu yang Dikumpulkan
 DocType: Company,Sales Monthly History,Riwayat Bulanan Penjualan
@@ -2871,10 +2886,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Yakin ingin membatalkan janji temu ini?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket Harga Kamar Hotel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline penjualan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan pada
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Ambil Pembaruan Berlangganan
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akun {0} tidak sesuai Perusahaan {1} dalam Mode Akun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursus:
@@ -2884,7 +2900,7 @@
 DocType: Notification Control,Expense Claim Approved,Klaim Biaya Disetujui
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Tidak ada Perintah Kerja yang dibuat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip Gaji karyawan {0} sudah dibuat untuk periode ini
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Selling Settings,Sales Order Required,Nota Penjualan Diperlukan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
@@ -2902,7 +2918,7 @@
 DocType: Request for Quotation Supplier,No Quote,Tidak ada kutipan
 DocType: Warranty Claim,Raised By,Diangkat Oleh
 DocType: Payment Gateway Account,Payment Account,Akun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Perubahan bersih Piutang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompensasi Off
 DocType: Job Offer,Accepted,Diterima
@@ -2914,7 +2930,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Hasil Pencarian
 DocType: Room,Room Number,Nomor kamar
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referensi yang tidak valid {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referensi yang tidak valid {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 DocType: Journal Entry Account,Payroll Entry,Entri Penggajian
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Lihat Catatan Biaya
@@ -2924,7 +2940,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Tidak bisa memperbarui persediaan, faktur berisi barang titipan."
 DocType: Lab Test Sample,Lab Test Sample,Sampel Uji Lab
 DocType: Item Variant Settings,Allow Rename Attribute Value,Izinkan Ganti Nama Nilai Atribut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Jurnal Entry Cepat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Jurnal Entry Cepat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
 DocType: Restaurant,Invoice Series Prefix,Awalan Seri Faktur
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
@@ -2932,8 +2948,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrasi Google Maps tidak diaktifkan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} belum dikirim
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Tanggal Kedaluwarsa Keanggotaan
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} harus negatif dalam dokumen retur
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} harus negatif dalam dokumen retur
 ,Minutes to First Response for Issues,Menit ke Response Pertama untuk Masalah
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
@@ -2952,7 +2969,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Satuan Ukur
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Peluang
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Peluang
 DocType: Operation,Default Workstation,Standar Workstation
 DocType: Notification Control,Expense Claim Approved Message,Beban Klaim Disetujui Pesan
 DocType: Payment Entry,Deductions or Loss,Pemotongan atau Rugi
@@ -2990,7 +3007,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Tinggalkan Tanpa Bayar tidak sesuai dengan catatan Cuti Aplikasi disetujui
 DocType: Campaign,Campaign-.####,Promosi-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Membuat Invoice
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Saldo yang tersisa
@@ -2999,7 +3016,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Kode batang {0} bukan kode {1} yang valid
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Penawaran/Prospek %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Driver,Driver,Sopir
 DocType: Vital Signs,Nutrition Values,Nilai gizi
 DocType: Lab Test Template,Is billable,Apakah bisa ditagih
@@ -3010,7 +3027,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Aktual Mulai Tanggal (via Waktu Lembar)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Rentang Ageing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Jumlah uang muka total tidak boleh lebih besar dari jumlah total yang diklaim
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Jumlah uang muka total tidak boleh lebih besar dari jumlah total yang diklaim
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3065,7 +3082,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Pilih Nilai Atribut
 DocType: Purchase Invoice,Reason For Issuing document,Alasan untuk menerbitkan dokumen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Entri Persediaan {0} tidak terkirim
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Entri Persediaan {0} tidak terkirim
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Dikontak Oleh berikut tidak bisa sama dengan Alamat Email Prospek
 DocType: Tax Rule,Billing City,Kota Penagihan
@@ -3082,7 +3099,8 @@
 DocType: Warranty Claim,Service Address,Alamat Layanan
 DocType: Asset Maintenance Task,Calibration,Kalibrasi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} adalah hari libur perusahaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mebel dan perlengkapan
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Tinggalkan Pemberitahuan Status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mebel dan perlengkapan
 DocType: Item,Manufacture,Pembuatan
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Penyiapan Perusahaan
 ,Lab Test Report,Laporan Uji Lab
@@ -3098,7 +3116,6 @@
 DocType: Crop,Planting Area,Luas Tanam
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ini bisa jadi karena beberapa Alamat Email yang salah di
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Anda menambahkan
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,pelatihan Hasil
@@ -3108,16 +3125,17 @@
 DocType: Products Settings,Products per Page,Produk per Halaman
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Cabang master organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Beban utilitas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ke atas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entri {1} tidak memiliki akun {2} atau sudah cocok dengan voucher lain
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Berat
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Tinggalkan Pemberitahuan Persetujuan
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Daftar Absen
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tingkat pembelian
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Tingkat pembelian
 DocType: Notification Control,Sales Order Message,Pesan Nota Penjualan
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
@@ -3139,6 +3157,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Pengaturan Keranjang Belanja
 DocType: Journal Entry,Accounting Entries,Entri Akuntansi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika dipilih Pricing Rule dibuat untuk &#39;Rate&#39;, maka akan menimpa Daftar Harga. Tarif tarif adalah tingkat akhir, sehingga tidak ada diskon lebih lanjut yang harus diterapkan. Oleh karena itu, dalam transaksi seperti Order Penjualan, Pesanan Pembelian dll, akan diambil di bidang &#39;Rate&#39;, bukan bidang &#39;Price List Rate&#39;."
+DocType: Journal Entry,Paid Loan,Pinjaman Berbayar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Gandakan entri. Silakan periksa Peraturan Otorisasi {0}
 DocType: Journal Entry Account,Reference Due Date,Tanggal Jatuh Tempo Referensi
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3155,7 +3174,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
 ,To Produce,Untuk Menghasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Daftar gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
 DocType: Patient Service Unit,Parent Service Unit,Unit Layanan Orang Tua
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,membuat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasi paket untuk pengiriman (untuk mencetak)
@@ -3173,7 +3192,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Akun Penghasilan
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Pengiriman
 DocType: Volunteer,Weekdays,Hari kerja
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: Restaurant Menu,Restaurant Menu,Menu Restoran
@@ -3181,7 +3200,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Tetapkan akun inventaris default untuk persediaan perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Tetapkan akun inventaris default untuk persediaan perpetual
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Kirim Email Peninjauan Hibah
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
@@ -3189,10 +3208,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapasitas Kamar
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Sudah ada catatan untuk item {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Anda akan kehilangan rekaman faktur yang dibuat sebelumnya. Anda yakin ingin memulai ulang langganan ini?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Biaya pendaftaran
 DocType: Budget,Cost Center,Biaya Pusat
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Pesan Purchase Order
 DocType: Tax Rule,Shipping Country,Pengiriman Negara
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Menyembunyikan Id Pajak Nasabah Transaksi Penjualan
@@ -3201,20 +3221,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule harga dibuat untuk menimpa Daftar Harga / mendefinisikan persentase diskon, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya dapat diubah melalui Entri Persediaan / Nota Pengiriman / Nota Pembelian
 DocType: Employee Education,Class / Percentage,Kelas / Persentase
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Pajak Penghasilan
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Lacak Prospek menurut Jenis Industri.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Pergi ke kop surat
+DocType: Subscription,Cancel At End Of Period,Batalkan Pada Akhir Periode
 DocType: Item Supplier,Item Supplier,Item Supplier
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Tidak ada item yang dipilih untuk transfer
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Tidak ada item yang dipilih untuk transfer
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan Persediaan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
 DocType: Vehicle,Electric,listrik
 DocType: Task,% Progress,% Selesai
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Laba / Rugi Asset Disposal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Laba / Rugi Asset Disposal
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Hanya Pelamar Pelajar dengan status &quot;Disetujui&quot; yang akan dipilih dalam tabel di bawah ini.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Nomor akun untuk akun {0} tidak tersedia. <br> Harap atur bagan akun Anda dengan benar.
 DocType: Task,Depends on Tasks,Tergantung pada Tugas
@@ -3229,6 +3250,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Tidak tersedia
 DocType: Volunteer,Volunteer Skills,Keterampilan Relawan
 DocType: Appraisal,HR User,HR Pengguna
+DocType: Bank Guarantee,Reference Document Name,Nama Dokumen Referensi
 DocType: Purchase Invoice,Taxes and Charges Deducted,Pajak dan Biaya Dikurangi
 apps/erpnext/erpnext/hooks.py +142,Issues,Isu
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status harus menjadi salah satu {0}
@@ -3242,7 +3264,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} dinonaktifkan
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Ekstra Besar
+DocType: Loan,Loan Application,Permohonan pinjaman
 DocType: Crop,Scientific Name,Nama ilmiah
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Jumlah Daun
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Pilih ulang, jika kontak yang dipilih akan diedit setelah menyimpan"
@@ -3251,13 +3274,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Nomor Cek
 ,Sales Browser,Browser Penjualan
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: Ada {0} # {1} lain terhadap entri persediaan {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: Ada {0} # {1} lain terhadap entri persediaan {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Besar
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produk Pilihan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Semua Grup Assessment
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Semua Grup Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Gudang baru Nama
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
@@ -3278,9 +3301,10 @@
 DocType: Fees,Fees,biaya
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tentukan Nilai Tukar untuk mengkonversi satu mata uang ke yang lain
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Quotation {0} dibatalkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Jumlah Total Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Jumlah Total Outstanding
 DocType: Sales Partner,Targets,Target
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Silakan daftar nomor SIREN di file informasi perusahaan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan mengatur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Price List,Price List Master,Daftar Harga Guru
 DocType: GST Account,CESS Account,Akun CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
@@ -3289,6 +3313,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pilih pasien
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nama parameter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Aplikasi status &#39;Disetujui&#39; dan &#39;Ditolak&#39; dapat disampaikan
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Mahasiswa Nama Group adalah wajib berturut-turut {0}
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan ditampilkan pada homepage website
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ini adalah kelompok pelanggan paling dasar dan tidak dapat diedit.
@@ -3321,14 +3346,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktur sudah dibuat untuk semua jam penagihan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nama error: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Apakah Biaya Keuangan?
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih dari satu paket dari jenis yang sama (untuk mencetak)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Harap tetapkan pelanggan default di Pengaturan Restoran
 ,Salary Register,Register Gaji
 DocType: Warehouse,Parent Warehouse,Gudang tua
-DocType: C-Form Invoice Detail,Net Total,Jumlah Bersih
+DocType: Subscription,Net Total,Jumlah Bersih
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default BOM tidak ditemukan untuk Item {0} dan Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Mendefinisikan berbagai jenis pinjaman
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Mendefinisikan berbagai jenis pinjaman
 DocType: Bin,FCFS Rate,FCFS Tingkat
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Jumlah belum terbayar
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Waktu (dalam menit)
@@ -3360,11 +3385,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Akar Rekening harus kelompok
 DocType: Drug Prescription,Drug Prescription,Resep obat
 DocType: Fees,FEE.,BIAYA.
-DocType: Employee Loan,Repaid/Closed,Dilunasi / Ditutup
+DocType: Loan,Repaid/Closed,Dilunasi / Ditutup
 DocType: Item,Total Projected Qty,Total Proyeksi Jumlah
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Angka penilaian tidak ditemukan untuk Item {0}, yang diperlukan untuk melakukan entri akuntansi untuk {1} {2}. Jika item tersebut bertransaksi sebagai item angka penilaian nol di {1}, mohon sebutkan di tabel Item {1}. Jika tidak, buat transaksi saham masuk untuk item tersebut atau beri nilai valuasi dalam catatan Item, lalu coba kirimkan / batalkan entri ini."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tetapkan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Course,Course Code,Kode Course
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspeksi Mutu diperlukan untuk Item {0}
 DocType: POS Settings,Use POS in Offline Mode,Gunakan POS dalam Mode Offline
@@ -3384,16 +3408,15 @@
 DocType: Purchase Invoice,Deemed Export,Dianggap ekspor
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Produksi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Persentase Diskon dapat diterapkan baik terhadap Daftar Harga atau untuk semua List Price.
-DocType: Subscription,Half-yearly,Setengah tahun sekali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Entri Akuntansi untuk Persediaan
 DocType: Lab Test,LabTest Approver,Pendekatan LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Anda telah memberikan penilaian terhadap kriteria penilaian {}.
 DocType: Vehicle Service,Engine Oil,Oli mesin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Pesanan Pekerjaan Dibuat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Pesanan Pekerjaan Dibuat: {0}
 DocType: Sales Invoice,Sales Team1,Penjualan team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
-DocType: Employee Loan,Loan Details,Detail pinjaman
+DocType: Loan,Loan Details,Detail pinjaman
 DocType: Company,Default Inventory Account,Akun Inventaris Default
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Nomor folio tidak sesuai
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
@@ -3405,19 +3428,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tautan ke semua Unit Tanah tempat Tanaman tumbuh
 DocType: Account,Root Type,Akar Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Baris # {0}: Tidak dapat mengembalikan lebih dari {1} untuk Barang {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Baris # {0}: Tidak dapat mengembalikan lebih dari {1} untuk Barang {2}
 DocType: Item Group,Show this slideshow at the top of the page,Tampilkan slide ini di bagian atas halaman
 DocType: BOM,Item UOM,Stok Barang UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Jumlah pajak Setelah Diskon Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
 DocType: Cheque Print Template,Primary Settings,Pengaturan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Tambahkan Karyawan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Tambahkan Karyawan
 DocType: Purchase Invoice Item,Quality Inspection,Inspeksi Mutu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Ekstra Kecil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Ekstra Kecil
 DocType: Company,Standard Template,Template standar
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
 DocType: Payment Request,Mute Email,Diamkan Surel
@@ -3437,11 +3460,10 @@
 DocType: SMS Log,No of Sent SMS,Tidak ada dari Sent SMS
 DocType: Antibiotic,Healthcare Administrator,Administrator Kesehatan
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Tetapkan Target
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan mengatur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Dosage Strength,Dosage Strength,Kekuatan Dosis
 DocType: Account,Expense Account,Beban Akun
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Perangkat lunak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Warna
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Rencana Penilaian
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Tanggal kedaluwarsa wajib untuk item yang dipilih
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Cegah Pesanan Pembelian
@@ -3454,18 +3476,18 @@
 DocType: Patient,Personal and Social History,Sejarah Pribadi dan Sosial
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Pengguna {0} dibuat
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup untuk setiap siswa
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Ubah Kode
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,disel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 DocType: Purchase Invoice,Availed ITC Cess,Dilengkapi ITC Cess
 ,Student Monthly Attendance Sheet,Mahasiswa Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Aturan pengiriman hanya berlaku untuk penjualan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Tanggal Project Mulai
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Sampai
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Sampai
 DocType: Rename Tool,Rename Log,Log Riwayat Ganti Nama
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Student Group atau Jadwal Kursus adalah wajib
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Samakan Jam Penagihan dan Jam Kerja di Daftar Absen
@@ -3485,7 +3507,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Cantumkan produk atau layanan yang Anda beli atau jual.
 DocType: Water Analysis,Storage Temperature,Suhu Penyimpanan
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran non-absen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Peneliti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Peneliti
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Pendaftaran Alat Mahasiswa
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Tanggal mulai harus kurang dari tanggal akhir untuk tugas {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nama atau Email adalah wajib
@@ -3498,7 +3520,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} saat ini memiliki {1} posisi Supplier Scorecard, dan RFQs ke pemasok ini harus dikeluarkan dengan hati-hati."
 DocType: Chapter,Non Profit Manager,Manajer Non Profit
 DocType: BOM,Total Cost(Company Currency),Total Biaya (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial ada {0} dibuat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial ada {0} dibuat
 DocType: Homepage,Company Description for website homepage,Deskripsi Perusahaan untuk homepage website
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan pelanggan, kode ini dapat digunakan dalam format cetak seperti Faktur dan Nota Pengiriman"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama suplier
@@ -3508,11 +3530,10 @@
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
 DocType: Healthcare Settings,Result Printed,Hasil cetak
 DocType: Asset Category Account,Depreciation Expense Account,Akun Beban Penyusutan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Masa percobaan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Lihat {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Masa percobaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node cuti yang diperbolehkan dalam transaksi
 DocType: Project,Total Costing Amount (via Timesheets),Total Costing Amount (melalui Timesheets)
-DocType: Employee Advance,Expense Approver,Approver Klaim Biaya
+DocType: Department,Expense Approver,Approver Klaim Biaya
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Baris {0}: Uang muka dari Pelanggan harus kredit
 DocType: Project,Hourly,Per jam
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group untuk Grup
@@ -3521,7 +3542,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Lakukan Pembayaran via Journal Entri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Printed On
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Inspeksi Diperlukan sebelum Pengiriman
 DocType: Item,Inspection Required before Purchase,Inspeksi Diperlukan sebelum Pembelian
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kegiatan Tertunda
@@ -3531,7 +3552,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Jumlah Pesanan Minimum
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Organisasi Anda
 DocType: Fee Component,Fees Category,biaya Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Silahkan masukkan menghilangkan date.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Beritahu Karyawan
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrikan nama kampanye jika sumber penyelidikan adalah kampanye
@@ -3541,7 +3562,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Tingkat Re-Order
 DocType: Company,Chart Of Accounts Template,Grafik Of Account Template
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Harga Barang diperbarui untuk {0} di Daftar Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Harga Barang diperbarui untuk {0} di Daftar Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Barang Diterima
@@ -3549,10 +3570,11 @@
 DocType: Item,Valuation Method,Metode Perhitungan
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Tim Penjualan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Entri Ganda/Duplikat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entri Ganda/Duplikat
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Masukkan nama Beneficiary sebelum mengirim.
 DocType: Program Enrollment Tool,Get Students,Dapatkan Siswa
 DocType: Serial No,Under Warranty,Masih Garansi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Kesalahan]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Kesalahan]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Sales Order.
 ,Employee Birthday,Ulang Tahun Karyawan
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Silakan pilih Tanggal Penyelesaian untuk Perbaikan Selesai
@@ -3571,7 +3593,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Dicadangkan untuk sub kontrak
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
 DocType: Shopping Cart Settings,Orders,Order
-DocType: Employee Leave Approver,Leave Approver,Approver Cuti
+DocType: Department,Leave Approver,Approver Cuti
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Silakan pilih satu batch
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nama penilaian Grup
@@ -3615,7 +3637,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Item yang Dilacak Hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL UNTUK RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Email ini otomatis terkirim
 DocType: Stock Settings,Freeze Stock Entries,Bekukan Entri Persediaan
 DocType: Program Enrollment,Boarding Student,Siswa Asrama
 DocType: Asset,Expected Value After Useful Life,Nilai diharapkan Setelah Hidup Berguna
@@ -3640,21 +3661,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Kehadiran Rekam {0} ada terhadap Mahasiswa {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Penyusutan Dieliminasi karena pelepasan aset
-DocType: Member,Member,Anggota
+DocType: Loan,Member,Anggota
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Pengelolaan Alamat
 DocType: Work Order Item,Work Order Item,Item Pesanan Kerja
 DocType: Pricing Rule,Item Code,Kode Item
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Manajer Pertanian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
 DocType: Supplier Scorecard Period,Variables,Variabel
 DocType: Employee Internal Work History,Employee Internal Work History,Riwayat Kerja Karyawan Internal
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Cek Ukuran
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,No. Seri {0} tidak tersedia
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,No. Seri {0} tidak tersedia
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template Pajak transaksi penjualan
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Jumlah Outstanding
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Akun {0} tidak sesuai Perusahaan {1}
@@ -3662,7 +3683,6 @@
 DocType: Stock Settings,Default Stock UOM,UOM Persediaan Standar
 DocType: Asset,Number of Depreciations Booked,Jumlah Penyusutan Dipesan
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Jumlah Qty
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Terhadap Pinjaman Karyawan: {0}
 DocType: Landed Cost Item,Receipt Document,Dokumen penerimaan
 DocType: Employee Education,School/University,Sekolah / Universitas
 DocType: Payment Request,Reference Details,Detail referensi
@@ -3673,7 +3693,7 @@
 DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Agar tertutup tidak dapat dibatalkan. Unclose untuk membatalkan.
 DocType: Student Guardian,Father,Ayah
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Pembaruan Persediaan’ tidak dapat ditandai untuk penjualan aset tetap
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Pembaruan Persediaan’ tidak dapat ditandai untuk penjualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 DocType: Attendance,On Leave,Sedang cuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Perbaruan
@@ -3687,10 +3707,10 @@
 DocType: Lead,Lower Income,Penghasilan rendah
 DocType: Restaurant Order Entry,Current Order,Pesanan saat ini
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Sumber dan target gudang tidak bisa sama untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akun Perbedaan harus jenis rekening Aset / Kewajiban, karena Rekonsiliasi Persediaan adalah Entri Pembukaan"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akun Perbedaan harus jenis rekening Aset / Kewajiban, karena Rekonsiliasi Persediaan adalah Entri Pembukaan"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Buka Program
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah alokasi {1} tidak boleh lebih besar dari jumlah yang tidak diklaim {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah alokasi {1} tidak boleh lebih besar dari jumlah yang tidak diklaim {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
@@ -3713,7 +3733,6 @@
 DocType: Payment Terms Template,Payment Terms,Syarat pembayaran
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Menit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan mengatur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Pergi ke Pemasok
@@ -3732,30 +3751,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Penawaran {0} bukan jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Stok Barang
 DocType: Sales Order,%  Delivered,% Terkirim
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Harap atur ID Email untuk Siswa untuk mengirim Permintaan Pembayaran
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Harap atur ID Email untuk Siswa untuk mengirim Permintaan Pembayaran
 DocType: Patient,Medical History,Riwayat kesehatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Akun Overdraft Bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Akun Overdraft Bank
 DocType: Patient,Patient ID,ID pasien
 DocType: Physician Schedule,Schedule Name,Nama Jadwal
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Membuat Slip Gaji
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Tambahkan Semua Pemasok
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Tambahkan Semua Pemasok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Baris # {0}: Alokasi Jumlah tidak boleh lebih besar dari jumlah yang terutang.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Telusuri BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Pinjaman Aman
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Pinjaman Aman
 DocType: Purchase Invoice,Edit Posting Date and Time,Mengedit Posting Tanggal dan Waktu
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Silahkan mengatur Penyusutan Akun terkait Aset Kategori {0} atau Perusahaan {1}
 DocType: Lab Test Groups,Normal Range,Jarak normal
 DocType: Academic Term,Academic Year,Tahun akademik
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Jual Beli
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo Pembukaan Ekuitas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Saldo Pembukaan Ekuitas
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,sisa
 DocType: Appraisal,Appraisal,Penilaian
+DocType: Loan,Loan Account,Rekening Pinjaman
 DocType: Purchase Invoice,GST Details,Rincian GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email dikirim ke pemasok {0}
 DocType: Item,Default Sales Unit of Measure,Unit Penjualan Default Ukur
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Tahun akademik:
+DocType: Subscription,Past Due Date,Tanggal Jatuh Tempo
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Tidak memungkinkan untuk mengatur item alternatif untuk item {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tanggal diulang
@@ -3768,7 +3789,7 @@
 DocType: Patient Appointment,Patient Appointment,Penunjukan Pasien
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Menyetujui Peran tidak bisa sama dengan peran aturan yang Berlaku Untuk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Berhenti berlangganan dari Email Ringkasan ini
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Dapatkan Pemasok Dengan
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Dapatkan Pemasok Dengan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} tidak ditemukan untuk Barang {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Pergi ke kursus
 DocType: Accounts Settings,Show Inclusive Tax In Print,Menunjukkan Pajak Inklusif Dalam Cetak
@@ -3776,10 +3797,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Pesan Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Akun dengan sub-akun tidak dapat digunakan sebagai akun buku besar
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Pengajar di Pendidikan&gt; Pengaturan Pendidikan
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar pelanggan
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 DocType: Physician,Physician Schedules,Jadwal Dokter
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Jumlah uang muka tidak boleh lebih besar dari jumlah sanksi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Jumlah uang muka tidak boleh lebih besar dari jumlah sanksi
 DocType: Salary Slip,Hour Rate,Nilai per Jam
 DocType: Stock Settings,Item Naming By,Item Penamaan Dengan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
@@ -3797,6 +3819,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak diizinkan memperbarui transaksi persediaan lebih lama dari {0}
 DocType: BOM,Inspection Required,Inspeksi Diperlukan
 DocType: Purchase Invoice Item,PR Detail,PR Detil
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Masukkan Nomor Jaminan Bank sebelum mengirim.
 DocType: Driving License Category,Class,Kelas
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Work Order tidak dapat dimunculkan dengan Template Item
@@ -3807,7 +3830,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Pengajar di Pendidikan&gt; Pengaturan Pendidikan
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
 DocType: Student Group,Group Based On,Grup Berdasarkan
 DocType: Journal Entry,Bill Date,Tanggal Penagihan
@@ -3818,9 +3840,10 @@
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Rincian Supplier
 DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Expense Claim,Approval Status,Approval Status
 DocType: Hub Settings,Publish Items to Hub,Publikasikan Produk untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dari nilai harus kurang dari nilai dalam baris {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transfer Kliring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transfer Kliring
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Periksa Semua
 ,Issued Items Against Work Order,Item yang Diterbitkan Melawan Perintah Kerja
 DocType: Vehicle Log,Invoice Ref,faktur Ref
@@ -3851,12 +3874,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarif Nomor
 DocType: Work Order Item,Available Qty at WIP Warehouse,Tersedia Qty di WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proyeksi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
 DocType: Notification Control,Quotation Message,Pesan Penawaran
-DocType: Employee Loan,Employee Loan Application,Karyawan Aplikasi Kredit
 DocType: Issue,Opening Date,Tanggal Pembukaan
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Tolong simpan pasien dulu
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Tolong simpan pasien dulu
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
 DocType: Program Enrollment,Public Transport,Transportasi umum
 DocType: Soil Texture,Silt Composition (%),Komposisi Silt (%)
@@ -3874,7 +3896,7 @@
 ,Item Balance (Simple),Item Balance (Sederhana)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tagihan diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Akun Write Off
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Catatan Debet Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Catatan Debet Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Terhadap Faktur Pembelian
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
@@ -3897,6 +3919,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Tanggal Nota Penjualan
 DocType: Sales Invoice Item,Delivered Qty,Qty Terkirim
 DocType: Assessment Plan,Assessment Plan,Rencana penilaian
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Masuk Balik Jurnal
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat
 DocType: Stock Settings,Limit Percent,batas Persen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Saat ini tidak ada persediaan di gudang manapun
@@ -3910,14 +3933,15 @@
 DocType: Journal Entry,Stock Entry,Entri Persediaan
 DocType: Payment Entry,Payment References,Referensi pembayaran
 DocType: C-Form,C-FORM-,C-bentuk-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Jumlah interval untuk bidang interval misalnya jika Interval adalah &#39;Hari&#39; dan Billing Interval Count adalah 3, faktur akan dihasilkan setiap 3 hari"
 DocType: Vehicle,Insurance Details,Detail asuransi
 DocType: Account,Payable,Hutang
 DocType: Share Balance,Share Type,Jenis saham
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Masukkan Periode Pembayaran
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Masukkan Periode Pembayaran
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitur ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan baru
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Laba Kotor%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Laba Kotor%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Ubah Profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Izin Tanggal
@@ -3927,10 +3951,11 @@
 DocType: Lead,Address Desc,Deskripsi Alamat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partai adalah wajib
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Baris dengan tanggal jatuh tempo duplikat pada baris lainnya ditemukan: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Baris dengan tanggal jatuh tempo duplikat pada baris lainnya ditemukan: {list}
 DocType: Topic,Topic Name,topik Nama
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Silakan mengatur template default untuk Meninggalkan Pemberitahuan Persetujuan di Pengaturan HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Pilih karyawan untuk mendapatkan uang muka karyawan.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Pilih karyawan untuk mendapatkan uang muka karyawan.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Silakan pilih tanggal yang valid
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Pilih jenis bisnis anda.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3949,7 +3974,7 @@
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Berbagi Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Faktur Penjualan {0} dibuat
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
 DocType: C-Form,Total Invoiced Amount,Jumlah Total Tagihan
@@ -3958,7 +3983,7 @@
 DocType: Account,Accumulated Depreciation,Akumulasi penyusutan
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nama berdiri
 DocType: Stock Entry,Customer or Supplier Details,Rincian Pelanggan atau Pemasok
-DocType: Employee Loan Application,Required by Date,Dibutuhkan oleh Tanggal
+DocType: Loan Application,Required by Date,Dibutuhkan oleh Tanggal
 DocType: Lead,Lead Owner,Pemilik Prospek
 DocType: Production Plan,Sales Orders Detail,Detail Pesanan Penjualan
 DocType: Bin,Requested Quantity,diminta Kuantitas
@@ -3971,10 +3996,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Jumlah Pengurangan - Pelunasan Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Slip Gaji ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Beberapa varian
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Terkirim
+DocType: Subscription,Trial Period Start Date,Tanggal Mulai Periode Percobaan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Silahkan login sebagai pengguna lain.
@@ -3995,12 +4021,11 @@
 DocType: Student Guardian,Student Guardian,Wali murid
 DocType: Member,Member Name,Nama anggota
 DocType: Stock Settings,Use Naming Series,Gunakan Seri Penamaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Persediaan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dalam berlangganan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda akan menyebabkan kesalahan Berat Bersih (Total). Pastikan Berat Bersih untuk setiap barang memakai UOM yang sama.
 DocType: Membership,Payment Details,Rincian Pembayaran
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Tingkat BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Tingkat BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Pesanan Kerja yang Berhenti tidak dapat dibatalkan, Hapus terlebih dahulu untuk membatalkan"
 DocType: Asset,Journal Entry for Scrap,Jurnal masuk untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
@@ -4020,6 +4045,7 @@
 DocType: Land Unit,Land Unit,Unit tanah
 ,Purchase Analytics,Pembelian Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Pengiriman Stok Barang Note
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Faktur saat ini {0} tidak ada
 DocType: Asset Maintenance Log,Task,Tugas
 DocType: Purchase Taxes and Charges,Reference Row #,Referensi Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor kumpulan adalah wajib untuk Barang {0}
@@ -4031,7 +4057,7 @@
 DocType: Company,Exchange Gain / Loss Account,Efek Gain / Loss Akun
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Karyawan dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Isi formulir dan menyimpannya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Isi formulir dan menyimpannya
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Komunitas
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Jumlah persediaan aktual
 DocType: Homepage,"URL for ""All Products""",URL untuk &quot;Semua Produk&quot;
@@ -4045,7 +4071,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard Jual Tingkat
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
 DocType: Cash Flow Mapper,Section Name,nama bagian
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Susun ulang Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Susun ulang Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Job Openings saat
 DocType: Company,Stock Adjustment Account,Penyesuaian Akun Persediaan
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Mencoret
@@ -4056,9 +4082,9 @@
 DocType: Task,depends_on,tergantung pada
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,"Diantrikan untuk memperbaharui harga terakhir di ""Bill of Material"". Akan memakan waktu beberapa menit."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat akun untuk Pelanggan dan Pemasok
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
 DocType: Water Analysis,Appearance,Penampilan
+DocType: HR Settings,Leave Status Notification Template,Tinggalkan Template Pemberitahuan Status
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Rata-rata Tarif Daftar Harga Beli
 DocType: Sales Order Item,Supplier delivers to Customer,Pemasok mengirim ke Pelanggan
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informasi anggota
@@ -4081,7 +4107,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Tidak diperbolehkan. Nonaktifkan Template Uji
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
 DocType: Crop Cycle,Linked Land Unit,Linked Land Unit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 DocType: Program Enrollment,School House,Asrama Sekolah
 DocType: Serial No,Out of AMC,Dari AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
@@ -4097,7 +4123,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Buka Pengguna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk Stok Barang {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN tidak valid atau Enter NA untuk tidak terdaftar
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Pendaftaran Biaya
@@ -4113,14 +4139,14 @@
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat Bagan Of Account Berbasis Pada
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Tidak dapat mengubahnya menjadi non-grup. Tugas Anak ada.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Usia Persediaan
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Mahasiswa {0} ada terhadap pemohon mahasiswa {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Penyesuaian Pembulatan (Mata Uang Perusahaan)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Sore
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Cheque Print Template,Scanned Cheque,Cek Terpindai
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak untuk Pengiriman transaksi.
@@ -4136,7 +4162,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Project {0} sudah ada
 DocType: Medical Department,Nursing User,Pengguna perawatan
 DocType: Plant Analysis,Plant Analysis Criterias,Kriteria Analisis Tanaman
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Tanggung Jawab
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} bukan milik Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Tanggung Jawab
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Masa berlaku dari kutipan ini telah berakhir.
 DocType: Expense Claim Account,Expense Claim Account,Akun Beban Klaim
 DocType: Accounts Settings,Allow Stale Exchange Rates,Biarkan nilai tukar basi
@@ -4158,11 +4185,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Buatlah Varian
 DocType: Item,Default BOM,BOM Standar
 DocType: Project,Total Billed Amount (via Sales Invoices),Total Jumlah Bills (via Faktur Penjualan)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Jumlah Catatan Debet
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Jumlah Catatan Debet
 DocType: Project Update,Not Updated,Tidak diperbarui
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Ada ketidakkonsistenan antara tingkat, tidak ada saham dan jumlah yang dihitung"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Jumlah Posisi Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
 DocType: Employee Advance,Advance Account,Uang muka
 DocType: Job Offer,Job Offer Terms,Persyaratan Penawaran Pekerjaan
@@ -4171,7 +4198,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Otomotif
 DocType: Vehicle,Insurance Company,Perusahaan asuransi
 DocType: Asset Category Account,Fixed Asset Account,Akun Aset Tetap
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Delivery Note
 DocType: Chapter,Members,Anggota
 DocType: Student,Student Email Address,Alamat Email Siswa
@@ -4194,7 +4221,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Menginternir
 DocType: Delivery Stop,Address Name,Nama alamat
 DocType: Stock Entry,From BOM,Dari BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Memisahkan {0} unit dari {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Memisahkan {0} unit dari {1}
 DocType: Assessment Code,Assessment Code,Kode penilaian
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi persediaan sebelum {0} dibekukan
@@ -4202,25 +4229,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
 DocType: Bank Reconciliation Detail,Payment Document,Dokumen pembayaran
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Kesalahan dalam mengevaluasi rumus kriteria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
+DocType: Subscription,Plans,Rencana
 DocType: Salary Slip,Salary Structure,Struktur Gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Isu Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Terjadi kesalahan saat membuat berulang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Isu Material
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Penawaran
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Tidak Grup Pelajar dibuat.
 DocType: Purchase Invoice Item,Serial No,Serial ada
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Bulanan Pembayaran Jumlah tidak dapat lebih besar dari Jumlah Pinjaman
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Bulanan Pembayaran Jumlah tidak dapat lebih besar dari Jumlah Pinjaman
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail terlebih dahulu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Baris # {0}: Tanggal Pengiriman yang Diharapkan tidak boleh sebelum Tanggal Pemesanan Pembelian
 DocType: Purchase Invoice,Print Language,cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Sales Invoice,Customer PO Details,Rincian PO Pelanggan
-DocType: Subscription,Next Schedule Date,Jadwal Jadwal Berikutnya
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Rekening Pembukaan Sementara
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Masukkan nilai harus positif
@@ -4248,11 +4274,11 @@
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Tidak ada karyawan untuk kriteria tersebut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
 DocType: Hotel Settings,Default Customer,Pelanggan default
 DocType: Assessment Plan,Supervisor Name,Nama pengawas
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengkonfirmasi jika janji dibuat untuk hari yang sama
@@ -4276,16 +4302,16 @@
 DocType: Journal Entry Account,Employee Advance,Uang muka karyawan
 DocType: Payroll Entry,Payroll Frequency,Payroll Frekuensi
 DocType: Lab Test Template,Sensitivity,Kepekaan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Bahan Baku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Tanaman dan Mesin
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Tanaman dan Mesin
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Pengaturan Kerja Ringkasan Harian
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Masukkan Reqd menurut Tanggal
 DocType: Payment Entry,Internal Transfer,internal transfer
 DocType: Asset Maintenance,Maintenance Tasks,Tugas pemeliharaan
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entah sasaran qty atau jumlah target adalah wajib
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Tanggal Pembukaan harus sebelum Tanggal Penutupan
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke buku
@@ -4293,13 +4319,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrasi
 DocType: Crop Cycle,Detected Disease,Penyakit Terdeteksi
 ,Produced,Diproduksi
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tanggal Mulai Pembayaran tidak boleh sebelum Tanggal Pencairan.
 DocType: Item,Item Code for Suppliers,Item Code untuk Supplier
 DocType: Issue,Raised By (Email),Dimunculkan Oleh (Email)
 DocType: Training Event,Trainer Name,Nama pelatih
 DocType: Mode of Payment,General,Umum
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi terakhir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nomor Seri Diperlukan untuk Barang Bernomor Seri {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nomor Seri Diperlukan untuk Barang Bernomor Seri {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
 DocType: Journal Entry,Bank Entry,Entri Bank
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
@@ -4313,7 +4340,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} pada Setengah Hari di hari {1}
 DocType: Production Plan,Get Material Request,Dapatkan Material Permintaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Beban pos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Beban pos
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 ,Item Variant Details,Rincian Item Variant
@@ -4324,9 +4351,9 @@
 DocType: Drug Prescription,Hour,Jam
 DocType: Restaurant Order Entry,Last Sales Invoice,Faktur penjualan terakhir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Silakan pilih Qty terhadap item {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No. Seri baru tidak dapat memiliki Gudang. Gudang harus diatur oleh Entri Persediaan atau Nota Pembelian
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No. Seri baru tidak dapat memiliki Gudang. Gudang harus diatur oleh Entri Persediaan atau Nota Pembelian
 DocType: Lead,Lead Type,Jenis Prospek
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui cuti di Blok Tanggal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui cuti di Blok Tanggal
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Semua Stok Barang-Stok Barang tersebut telah ditagih
 DocType: Company,Monthly Sales Target,Target Penjualan Bulanan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
@@ -4334,7 +4361,7 @@
 DocType: Item,Default Material Request Type,Default Bahan Jenis Permintaan
 DocType: Supplier Scorecard,Evaluation Period,Periode Evaluasi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,tidak diketahui
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Perintah Kerja tidak dibuat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Perintah Kerja tidak dibuat
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: Purchase Invoice,Export Type,Jenis ekspor
 DocType: Salary Slip Loan,Salary Slip Loan,Pinjaman Saldo Gaji
@@ -4350,7 +4377,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Membuka Faktur Ringkasan
 DocType: Education Settings,Education Manager,Manajer Pendidikan
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Panjang minimum antara masing-masing pabrik di lapangan untuk pertumbuhan optimum
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kumpulan Barang {0} tidak dapat diperbarui menggunakan Rekonsiliasi Persediaan, gunakan Entri Persediaan"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kumpulan Barang {0} tidak dapat diperbarui menggunakan Rekonsiliasi Persediaan, gunakan Entri Persediaan"
 DocType: Quality Inspection,Report Date,Tanggal Laporan
 DocType: Student,Middle Name,Nama tengah
 DocType: C-Form,Invoices,Faktur
@@ -4381,20 +4408,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Penerimaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Penerimaan
 ,Sales Register,Daftar Penjualan
 DocType: Daily Work Summary Group,Send Emails At,Kirim Email pada
 DocType: Quotation,Quotation Lost Reason,Alasan Kalah Penawaran
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Tampilan formulir
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Expense Approver Mandatory In Expense Claim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Tambahkan pengguna ke organisasi Anda, selain dirimu sendiri."
 DocType: Customer Group,Customer Group Name,Nama Kelompok Pelanggan
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Belum ada pelanggan
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Laporan arus kas
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Tidak ada permintaan material yang dibuat
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisensi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
@@ -4417,11 +4445,12 @@
 DocType: Vehicle,Chassis No,Nomor Rangka
 DocType: Payment Request,Initiated,Diprakarsai
 DocType: Production Plan Item,Planned Start Date,Direncanakan Tanggal Mulai
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Silahkan pilih BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Silahkan pilih BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Mengakses Pajak Terpadu ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
+DocType: Bank Guarantee,Clauses and Conditions,Klausul dan Ketentuan
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
 DocType: Project Task,View Timesheet,Lihat Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tanggal akhir harus lebih besar dari tanggal mulai
 DocType: Leave Type,Is Encash,Apakah menjual
 DocType: Leave Allocation,New Leaves Allocated,cuti baru Dialokasikan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
@@ -4435,9 +4464,10 @@
 DocType: Patient,Alcohol Current Use,Penggunaan Alkohol saat ini
 DocType: Student Admission Program,Student Admission Program,Program Penerimaan Mahasiswa
 DocType: Payment Entry,Account Paid To,Akun Dibayar Kepada
+DocType: Subscription Settings,Grace Period,Masa tenggang
 DocType: Item Alternative,Alternative Item Name,Nama Item Alternatif
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak boleh merupakan Barang Persediaan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Tidak bisa mengirimkan Slip Gaji <br> \ Kemungkinan alasan: <br> \ 1. Pembayaran bersih kurang dari 0. <br> \ 2. Alamat Email Perusahaan yang ditentukan dalam master pegawai tidak sah. <br>
@@ -4447,7 +4477,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Anggaran untuk Akun {1} terhadap {2} {3} adalah {4}. Ini akan berlebih sebanyak {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dan Unchcked Disabled in
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Jasa Keuangan
 DocType: Student Sibling,Student ID,Identitas Siswa
@@ -4459,14 +4488,16 @@
 DocType: Complaint,Complaint,Keluhan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Gudang diperlukan untuk Barang Persediaan{0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Buat Entri Pembayaran
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Semua Departemen
 DocType: Patient,Alcohol Past Use,Penggunaan Alkohol yang Telah Lalu
 DocType: Fertilizer Content,Fertilizer Content,Isi pupuk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Bermasalah / Terjebak
 DocType: Tax Rule,Billing State,Negara penagihan
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Perintah Kerja {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
@@ -4490,10 +4521,11 @@
 DocType: Cheque Print Template,Message to show,Pesan untuk menunjukkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Eceran
 DocType: Student Attendance,Absent,Absen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundel Produk
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Tidak dapat menemukan skor mulai dari {0}. Anda harus memiliki nilai berdiri yang mencakup 0 sampai 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
+DocType: Subscription,Current Invoice Start Date,Tanggal Mulai Faktur Saat Ini
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Salah satu dari jumlah debit atau kredit diperlukan untuk {2}
 DocType: GL Entry,Remarks,Keterangan
@@ -4503,11 +4535,13 @@
 DocType: Task,Parent Task,Tugas orang tua
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Membuat Prospek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Cetak dan Alat Tulis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Tampilkan Barcode Lapangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Kirim Email Pemasok
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk periode antara {0} dan {1}, Tinggalkan periode aplikasi tidak dapat antara rentang tanggal ini."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Kirim Email Pemasok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk periode antara {0} dan {1}, Tinggalkan periode aplikasi tidak dapat antara rentang tanggal ini."
+DocType: Fiscal Year,Auto Created,Dibuat Otomatis
 DocType: Chapter Member,Leave Reason,Tinggalkan Alasan
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktur {0} tidak ada lagi
 DocType: Guardian Interest,Guardian Interest,wali Tujuan
 DocType: Volunteer,Availability,Tersedianya
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Tetapkan nilai default untuk Faktur POS
@@ -4515,14 +4549,13 @@
 DocType: Project,Time to send,Saatnya mengirim
 DocType: Timesheet,Employee Detail,Detil karyawan
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
 DocType: Lab Prescription,Test Code,Kode uji
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Pengaturan untuk homepage website
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ tidak diizinkan untuk {0} karena kartu skor berdiri dari {1}
 DocType: Job Offer,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Di atas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Jumlah Total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Jumlah Total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},atribut tidak valid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Sebutkan jika akun hutang non-standar
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Harap pilih kelompok penilaian selain &#39;Semua Kelompok Penilaian&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Baris {0}: Pusat biaya diperlukan untuk item {1}
@@ -4533,7 +4566,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisis air
 DocType: Chapter,Region,Wilayah
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
 DocType: Holiday List,Weekly Off,Weekly Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reload Linked Analysis
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk misalnya 2012, 2012-13"
@@ -4549,7 +4582,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Biaya Asset dibatalkan
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Pusat Biaya"" adalah wajib untuk Item {2}"
 DocType: Vehicle,Policy No,Kebijakan Tidak ada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,proyek Pengguna
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Membagi
@@ -4585,21 +4618,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Jalan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Pusat Biaya untuk buku karena memiliki node anak
 DocType: Production Plan,Total Planned Qty,Total Rencana Qty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Nilai pembukaan
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Nilai pembukaan
 DocType: Salary Detail,Formula,Rumus
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Akun penjualan
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Akun penjualan
 DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisi Penjualan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisi Penjualan
 DocType: Job Offer Term,Value / Description,Nilai / Keterangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
 DocType: Tax Rule,Billing Country,Negara Penagihan
 DocType: Purchase Order Item,Expected Delivery Date,Diharapkan Pengiriman Tanggal
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entri Pemesanan Restoran
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
 DocType: Asset Maintenance Task,Assign To Name,Berikan nama
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Beban Hiburan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Beban Hiburan
 DocType: Hub Settings,Enabled Users,Pengguna yang Diaktifkan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Membuat Material Permintaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Terbuka Barang {0}
@@ -4612,24 +4645,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aplikasi untuk cuti.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 DocType: Vehicle,Last Carbon Check,Terakhir Carbon Periksa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Beban Legal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Beban Legal
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Silakan pilih kuantitas pada baris
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Lakukan Pembukaan Faktur Penjualan dan Pembelian
 DocType: Purchase Invoice,Posting Time,Posting Waktu
 DocType: Timesheet,% Amount Billed,% Jumlah Ditagih
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Beban Telepon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Beban Telepon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Periksa ini jika Anda ingin untuk memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Tidak ada Stok Barang dengan Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Tidak ada Stok Barang dengan Serial No {0}
 DocType: Email Digest,Open Notifications,Terbuka Pemberitahuan
 DocType: Payment Entry,Difference Amount (Company Currency),Perbedaan Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Beban Langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Beban Langsung
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Pendapatan Pelanggan Baru
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Biaya Perjalanan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tambahkan bidang kustom Langganan di doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
 DocType: Purchase Receipt Item,Sample Quantity,Jumlah sampel
+DocType: Bank Guarantee,Name of Beneficiary,Nama Penerima Manfaat
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Perbarui biaya BOM secara otomatis melalui Penjadwalan, berdasarkan hitungan penilaian / daftar harga / hitungan pembelian bahan baku terakhir."
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
@@ -4641,14 +4674,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Percobaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,Baru Tahun Akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Nota Retur / Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Nota Retur / Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Jumlah Total Dibayar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Jumlah Total Dibayar
 DocType: GST Settings,B2C Limit,Batas B2C
 DocType: Work Order Item,Transferred Qty,Ditransfer Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Menjelajahi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Perencanaan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Perencanaan
 DocType: Share Balance,Issued,Diterbitkan
+DocType: Loan,Repayment Start Date,Tanggal Mulai Pembayaran Kembali
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Kegiatan Siswa
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Pembayaran Detail Gateway
@@ -4661,10 +4695,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis cuti seperti kasual, dll sakit"
 DocType: Email Digest,Send regular summary reports via Email.,Mengirim laporan ringkasan berkala melalui Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Silakan set account default di Beban Klaim Jenis {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Silakan set account default di Beban Klaim Jenis {0}
 DocType: Assessment Result,Student Name,Nama siswa
 DocType: Brand,Item Manager,Item Manajer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll Hutang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll Hutang
 DocType: Buying Settings,Default Supplier Type,Standar Supplier Type
 DocType: Plant Analysis,Collection Datetime,Koleksi Datetime
 DocType: Work Order,Total Operating Cost,Total Biaya Operasional
@@ -4674,9 +4708,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Pengguna {0} tidak ada
 DocType: Payment Term,Day(s) after invoice date,Hari setelah tanggal faktur
 DocType: Payment Schedule,Payment Schedule,Jadwal pembayaran
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Masuk pembayaran sudah ada
+DocType: Subscription,Trial Period End Date,Tanggal Akhir Periode Uji Coba
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Template master gaji.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologi
@@ -4693,9 +4727,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Penawaran terhadap Prospek atau Pelanggan
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran diizinkan mengedit persediaan dibekukan
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Stok Barang Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Semua Kelompok Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Semua Kelompok Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulasi Bulanan
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data Kurs Mata Uang tidak dibuat untuk {1} sampai {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data Kurs Mata Uang tidak dibuat untuk {1} sampai {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
@@ -4704,14 +4738,15 @@
 DocType: Lab Prescription,Test Created,Uji coba
 DocType: Healthcare Settings,Custom Signature in Print,Tanda Tangan Khusus di Cetak
 DocType: Account,Temporary,Sementara
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Nomor Pokok Pelanggan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Nomor Pokok Pelanggan
 DocType: Program,Courses,Kursus
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretaris
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika menonaktifkan, &#39;Dalam Kata-kata&#39; bidang tidak akan terlihat di setiap transaksi"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Tindakan ini akan menghentikan penagihan di masa mendatang. Anda yakin ingin membatalkan langganan ini?
 DocType: Serial No,Distinct unit of an Item,Unit berbeda Item
 DocType: Supplier Scorecard Criteria,Criteria Name,Nama kriteria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Harap set Perusahaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Harap set Perusahaan
 DocType: Pricing Rule,Buying,Pembelian
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Penyakit &amp; Pupuk
 DocType: HR Settings,Employee Records to be created by,Rekaman Karyawan yang akan dibuat oleh
@@ -4720,17 +4755,17 @@
 DocType: POS Profile,Apply Discount On,Terapkan Diskon Pada
 DocType: Member,Membership Type,jenis keanggotaan
 ,Reqd By Date,Reqd By Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditor
 DocType: Assessment Plan,Assessment Name,penilaian Nama
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Tampilkan PDC di Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Tampilkan PDC di Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial ada adalah wajib
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stok Barang Wise Detil Pajak
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Tawaran pekerjaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Singkatan Institute
 ,Item-wise Price List Rate,Stok Barang-bijaksana Daftar Harga Tingkat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kuantitas ({0}) tidak boleh menjadi pecahan dalam baris {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kuantitas ({0}) tidak boleh menjadi pecahan dalam baris {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Produk {1}
@@ -4748,7 +4783,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan posting entri akuntansi untuk persediaan otomatis."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Memperantarai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Kehadiran bagi karyawan {0} sudah ditandai untuk hari ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Kehadiran bagi karyawan {0} sudah ditandai untuk hari ini
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",di Menit Diperbarui melalui 'Log Waktu'
 DocType: Customer,From Lead,Dari Prospek
@@ -4759,6 +4794,7 @@
 DocType: Lab Test,Approved Date,Tanggal yang Disetujui
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
+DocType: Subscriber,Subscriber Name,Nama Subscriber
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Update Tool,Replace,Mengganti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Tidak ditemukan produk.
@@ -4768,19 +4804,18 @@
 DocType: Request for Quotation Item,Project Name,Nama Proyek
 DocType: Customer,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Pilih akun pendapatan bunga dalam pinjaman karyawan {0}
 DocType: Work Order,Required Items,Produk yang dibutuhkan
 DocType: Stock Ledger Entry,Stock Value Difference,Perbedaan Nilai Persediaan
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Sumber Daya Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rekonsiliasi Pembayaran Pembayaran
 DocType: Disease,Treatment Task,Tugas Pengobatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Aset pajak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Aset pajak
 DocType: BOM Item,BOM No,No. BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,BOM yang akan diganti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Peralatan elektronik
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Peralatan elektronik
 DocType: Asset,Maintenance Required,Pemeliharaan Diperlukan
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"cuti harus dialokasikan dalam kelipatan 0,5"
@@ -4789,7 +4824,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Posisi Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Target Set Stok Barang Group-bijaksana untuk Sales Person ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bekukan Persediaan Lebih Lama Dari [Hari]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib untuk aktiva tetap pembelian / penjualan
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib untuk aktiva tetap pembelian / penjualan
 DocType: Asset Maintenance Team,Maintenance Team Name,Nama Tim Pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Aturan Harga yang ditemukan berdasarkan kondisi di atas, Prioritas diterapkan. Prioritas adalah angka antara 0 sampai 20, sementara nilai default adalah nol (kosong). Jumlah yang lebih tinggi berarti akan diutamakan jika ada beberapa Aturan Harga dengan kondisi yang sama."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Pelanggan diwajibkan jika &#39;Opportunity From&#39; dipilih sebagai Customer
@@ -4798,19 +4833,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Izinkan pengguna ini untuk menyetujui aplikasi izin cuti untuk hari yang terpilih(blocked).
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Jenis Beban Klaim.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tingkat penjualan untuk item {0} lebih rendah dari {1} nya. Tingkat penjualan harus atleast {2}
-DocType: Item,Taxes,PPN
+DocType: Subscription,Taxes,PPN
 DocType: Purchase Invoice,capital goods,barang modal
 DocType: Purchase Invoice Item,Weight Per Unit,Berat Per Unit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Dibayar dan Tidak Terkirim
 DocType: Project,Default Cost Center,Standar Biaya Pusat
-DocType: Bank Guarantee,End Date,Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksi Persediaan
 DocType: Budget,Budget Accounts,Akun anggaran
 DocType: Employee,Internal Work History,Sejarah Kerja internal
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumulasi Penyusutan Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Supplier Scorecard Variabel
-DocType: Employee Loan,Fully Disbursed,sepenuhnya Dicairkan
 DocType: Employee Advance,Due Advance Amount,Jumlah Uang Muka Sebelumnya
 DocType: Maintenance Visit,Customer Feedback,Umpan balik Pelanggan
 DocType: Account,Expense,Biaya
@@ -4834,7 +4867,7 @@
 ,Employee Information,Informasi Karyawan
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Template pajak default untuk penjualan dan pembelian telah dibuat.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Catatan Hasil Penilaian {0} sudah ada.
@@ -4842,7 +4875,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Harap tentukan filter Perusahaan jika Group By &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Tanggal tidak bisa tanggal di masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,untuk menghasilkan berulang
 DocType: Stock Entry,Target Warehouse Address,Target Gudang Alamat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Santai Cuti
 DocType: Agriculture Task,End Day,Hari Akhir
@@ -4867,11 +4899,10 @@
 DocType: Material Request,% Ordered,% Tersusun
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kelompok Siswa Berbasis Kursus, Kursus akan divalidasi untuk setiap Siswa dari Program Pendaftaran Pendaftaran Program yang terdaftar."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Harga Beli Rata-rata
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Harga Beli Rata-rata
 DocType: Share Balance,From No,Dari No
 DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Pesan baru dari {sender}
 DocType: Customer,Customer Primary Address,Alamat utama pelanggan
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Surat edaran
 DocType: Drug Prescription,Description/Strength,Deskripsi / Kekuatan
@@ -4880,22 +4911,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,item yang sama telah dimasukkan beberapa kali
 DocType: Department,Leave Block List,Cuti Block List
 DocType: Purchase Invoice,Tax ID,Id pajak
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak diatur untuk Nomor Seri. Kolom harus kosong
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak diatur untuk Nomor Seri. Kolom harus kosong
 DocType: Accounts Settings,Accounts Settings,Pengaturan Akun
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Menyetujui
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Alamat berformat salah untuk {0}, tolong perbaiki untuk melanjutkan."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Alamat berformat salah untuk {0}, tolong perbaiki untuk melanjutkan."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Jumlah Akun baru, akan disertakan dalam nama akun sebagai awalan"
 DocType: Maintenance Team Member,Team Member,Anggota tim
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Tidak ada hasil untuk disampaikan
 DocType: Customer,Sales Partner and Commission,Penjualan Mitra dan Komisi
-DocType: Employee Loan,Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun
+DocType: Loan,Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun
 ,Project Quantity,proyek Kuantitas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;"
 DocType: Opportunity,To Discuss,Untuk Diskusikan
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} untuk menyelesaikan transaksi ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tingkat bunga (%) Tahunan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Akun sementara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Hitam
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Akun sementara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,Rincian Barang BOM
 DocType: Shareholder,Contact List,Daftar kontak
 DocType: Account,Auditor,Akuntan
@@ -4903,16 +4934,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} item diproduksi
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Belajarlah lagi
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Daftar Harga {0} dinonaktifkan atau tidak ada
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Daftar Harga {0} dinonaktifkan atau tidak ada
 DocType: Purchase Invoice,Return,Retur
 DocType: Pricing Rule,Disable,Nonaktifkan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Cara pembayaran yang diperlukan untuk melakukan pembayaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Cara pembayaran yang diperlukan untuk melakukan pembayaran
 DocType: Project Task,Pending Review,Pending Ulasan
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Edit di halaman penuh untuk lebih banyak pilihan seperti aset, serial nos, batch dll."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Janji dan Konsultasi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak terdaftar dalam Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aset {0} tidak dapat dihapus, karena sudah {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cek Diperlukan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cek Diperlukan
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Gagal menata perusahaan
@@ -4924,7 +4955,7 @@
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Manajemen armada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Menambahkan item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Menambahkan item dari
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Tanaman &amp; lahan
 DocType: Cheque Print Template,Regular,Reguler
 DocType: Fertilizer,Density (if liquid),Densitas (jika cair)
@@ -4949,24 +4980,26 @@
 DocType: Payment Entry,Paid Amount,Dibayar Jumlah
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Jelajahi Siklus Penjualan
 DocType: Assessment Plan,Supervisor,Pengawas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Entri saham retensi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Entri saham retensi
 ,Available Stock for Packing Items,Tersedia untuk Barang Paket
 DocType: Item Variant,Item Variant,Item Variant
 ,Work Order Stock Report,Laporan Stock Pesanan Kerja
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Alat Hasil penilaian
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Sebagai pengawas
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sarankan Kategori
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Barang
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Manajemen Mutu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Manajemen Mutu
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} telah dinonaktifkan
 DocType: Project,Total Billable Amount (via Timesheets),Total Jumlah yang Dapat Ditagih (via Timesheets)
 DocType: Agriculture Task,Previous Business Day,Hari Bisnis Sebelumnya
-DocType: Employee Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
+DocType: Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
 DocType: Employee,Health Insurance No,Asuransi Kesehatan No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Catatan Kredit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Catatan Kredit Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Jumlah Jumlah Kena Pajak
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
 DocType: Opening Invoice Creation Tool,Purchase,Pembelian
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Jumlah Saldo
@@ -4977,15 +5010,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 DocType: Healthcare Settings,Valid number of days,Jumlah hari yang valid
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Pusat biaya
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Mulai Ulang Langganan
 DocType: Land Unit,Linked Plant Analysis,Analisis Tanaman Tertanam
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tingkat di mana mata uang Supplier dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik Timing dengan baris {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Biarkan Zero Valuation Rate
+DocType: Bank Guarantee,Receiving,Menerima
 DocType: Training Event Employee,Invited,diundang
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Beberapa Struktur Gaji aktif yang ditemukan untuk karyawan {0} untuk tanggal tertentu
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Rekening Gateway setup.
 DocType: Employee,Employment Type,Jenis Pekerjaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Aktiva Tetap
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Aktiva Tetap
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Efek Gain / Loss
 ,GST Purchase Register,Daftar Pembelian GST
 ,Cash Flow,Arus kas
@@ -5005,9 +5040,10 @@
 DocType: Academic Term,Term Start Date,Jangka Mulai Tanggal
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Daftar semua transaksi saham
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Tanggal Awal Periode Uji Coba dan Tanggal Akhir Periode Uji Coba harus ditetapkan
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Harga rata-rata
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Pembayaran Total dalam Jadwal Pembayaran harus sama dengan Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Pembayaran Total dalam Jadwal Pembayaran harus sama dengan Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Rencana
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Saldo Laporan Bank sesuai Buku Besar
 DocType: Job Applicant,Applicant Name,Nama Pemohon
 DocType: Authorization Rule,Customer / Item Name,Nama Pelanggan / Barang
@@ -5037,6 +5073,7 @@
 DocType: Work Order,Warehouses,Gudang
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak dapat ditransfer
 DocType: Hotel Room Pricing,Hotel Room Pricing,Harga kamar hotel
+DocType: Subscription,Days Until Due,Hari Sampai Karena
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Item ini adalah Variant dari {0} (Template).
 DocType: Workstation,per hour,per jam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,pembelian
@@ -5045,13 +5082,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Untuk Kelompok Siswa berbasis Batch, Student Batch akan divalidasi untuk setiap Siswa dari Program Enrollment."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus karena ada entri buku persediaan untuk gudang ini.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribusi
+DocType: Journal Entry Account,Loan,Pinjaman
 DocType: Expense Claim Advance,Expense Claim Advance,Klaim Biaya Klaim
 DocType: Lab Test,Report Preference,Preferensi Laporan
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informasi sukarela
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Manager Project
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Manager Project
 ,Quoted Item Comparison,Perbandingan Produk/Barang yang ditawarkan
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Tumpang tindih dalam penilaian antara {0} dan {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Pengiriman
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Nilai Aktiva Bersih seperti pada
 DocType: Crop,Produce,Menghasilkan
@@ -5061,7 +5099,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Konsumsi Bahan untuk Industri
 DocType: Item Alternative,Alternative Item Code,Kode Barang Alternatif
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Pilih Produk untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Pilih Produk untuk Industri
 DocType: Delivery Stop,Delivery Stop,Berhenti pengiriman
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
 DocType: Item,Material Issue,Keluar Barang
@@ -5071,15 +5109,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
 DocType: BOM,Show Items,Tampilkan Produk
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari waktu tidak dapat lebih besar dari Untuk Waktu.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Apakah Anda ingin memberi tahu semua pelanggan melalui email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Apakah Anda ingin memberi tahu semua pelanggan melalui email?
+DocType: Subscription Plan,Billing Interval,Interval Penagihan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Lanjut
 DocType: Hub Settings,Hub Username,Nama Pengguna Hub
 DocType: Salary Detail,Component,Komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria penilaian Grup
 DocType: Healthcare Settings,Patient Name By,Nama Pasien Oleh
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Entri Jurnal Akrual untuk gaji dari {0} ke {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Entri Jurnal Akrual untuk gaji dari {0} ke {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -5093,22 +5131,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini Anda dapat mempertahankan tinggi, berat, alergi, masalah medis dll"
 DocType: Leave Block List,Applies to Company,Berlaku untuk Perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Entri Persediaan {0} terkirim
-DocType: Employee Loan,Disbursement Date,pencairan Tanggal
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,'Penerima' belum ditentukan
+DocType: Loan,Disbursement Date,pencairan Tanggal
 DocType: BOM Update Tool,Update latest price in all BOMs,Perbarui harga terbaru di semua BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Rekam medis
 DocType: Vehicle,Vehicle,Kendaraan
 DocType: Purchase Invoice,In Words,Dalam Kata
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Masukkan nama bank atau lembaga peminjaman sebelum mengajukan.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} harus diserahkan
 DocType: POS Profile,Item Groups,Grup Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
 DocType: Sales Order Item,For Production,Untuk Produksi
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Harap tambahkan akun Pembukaan Sementara di Bagan Akun
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Harap tambahkan akun Pembukaan Sementara di Bagan Akun
 DocType: Customer,Customer Primary Contact,Kontak utama pelanggan
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Jurnal Penutupan Periode
 DocType: Project Task,View Task,Lihat Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Peluang/Prospek %
+DocType: Bank Guarantee,Bank Guarantee Type,Jenis Garansi Bank
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Bagian faktur
 ,Asset Depreciations and Balances,Penyusutan aset dan Saldo
@@ -5119,9 +5158,8 @@
 DocType: Production Plan,Include Subcontracted Items,Sertakan Subkontrak Items
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Bergabung
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Tidak dapat mengubah sifat Variant setelah stock transction. Anda harus membuat Item baru untuk melakukan ini.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
-DocType: Employee Loan,Repay from Salary,Membayar dari Gaji
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+DocType: Loan,Repay from Salary,Membayar dari Gaji
 DocType: Leave Application,LAP/,PUTARAN/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Meminta pembayaran terhadap {0} {1} untuk jumlah {2}
 DocType: Salary Slip,Salary Slip,Slip Gaji
@@ -5145,11 +5183,11 @@
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Kelompok barang duplikat yang ditemukan dalam tabel grup item
 DocType: Land Unit,Parent Land Unit,Unit Induk Tanah
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Fertilizer,Fertilizer Name,Nama pupuk
 DocType: Salary Slip,Net Pay,Nilai Bersih Terbayar
 DocType: Cash Flow Mapping Accounts,Account,Akun
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial ada {0} telah diterima
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial ada {0} telah diterima
 ,Requested Items To Be Transferred,Permintaan Produk Akan Ditransfer
 DocType: Expense Claim,Vehicle Log,kendaraan Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Adanya demam (suhu&gt; 38,5 ° C / 101,3 ° F atau suhu bertahan&gt; 38 ° C / 100,4 ° F)"
@@ -5190,24 +5228,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
 DocType: Asset Maintenance,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan Baku Disupply
-DocType: C-Form,Series,Seri
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Mata uang dari daftar harga {0} harus {1} atau {2}
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Klasifikasi Stok Barang
 DocType: Driver,License Number,Nomor lisensi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Pemeliharaan Visit Tujuan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Pendaftaran Faktur Pasien
 DocType: Crop,Period,periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,General Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Karyawan {0} pada Cuti pada {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Karyawan {0} pada Cuti pada {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Prospek
 DocType: Program Enrollment Tool,New Program,Program baru
 DocType: Item Attribute Value,Attribute Value,Nilai Atribut
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 DocType: Salary Detail,Salary Detail,Detil gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Silahkan pilih {0} terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Silahkan pilih {0} terlebih dahulu
 DocType: Appointment Type,Physician,Dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Kumpulan {0} Barang {1} telah berakhir.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultasi
@@ -5215,15 +5252,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) tidak boleh lebih besar dari kuantitas yang direncanakan ({2}) dalam Perintah Kerja {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Waktu Lembar untuk manufaktur.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Tidak dapat mengubah properti Varian setelah transaksi saham. Anda harus membuat Item baru untuk melakukan ini.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandate
 DocType: Physician,Charges,Biaya
 DocType: Production Plan,Get Items For Work Order,Dapatkan Item Untuk Perintah Kerja
 DocType: Salary Detail,Default Amount,Jumlah Standar
 DocType: Lab Test Template,Descriptive,Deskriptif
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ringkasan ini Bulan ini
 DocType: Quality Inspection Reading,Quality Inspection Reading,Nilai Inspeksi Mutu
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Bekukan Persediaan Lebih Lama Dari' harus lebih kecil dari %d hari.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Bekukan Persediaan Lebih Lama Dari' harus lebih kecil dari %d hari.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Tetapkan sasaran penjualan yang ingin Anda capai untuk perusahaan Anda.
 ,Project wise Stock Tracking,Pelacakan Persediaan menurut Proyek
@@ -5251,11 +5289,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Gagal membuat situs web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Entry Stok Retensi sudah dibuat atau Jumlah Sampel tidak disediakan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Entry Stok Retensi sudah dibuat atau Jumlah Sampel tidak disediakan
 DocType: Program,Program Abbreviation,Singkatan Program
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Ongkos dalam Nota Pembelian diperbarui terhadap setiap barang
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
-DocType: Bank Guarantee,Start Date,Tanggal Mulai
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak benar dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
@@ -5270,11 +5307,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Jam
 DocType: Project,Expected Start Date,Diharapkan Tanggal Mulai
 DocType: Purchase Invoice,04-Correction in Invoice,04-Koreksi dalam Faktur
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Work Order sudah dibuat untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Work Order sudah dibuat untuk semua item dengan BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Laporan Detail Variant
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Daftar harga beli
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Daftar harga beli
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Batalkan Langganan
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Harap pilih Status Pemeliharaan sebagai Selesai atau hapus Tanggal Penyelesaian
 DocType: Supplier,Default Payment Terms Template,Template Persyaratan Pembayaran Default
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
@@ -5285,7 +5323,6 @@
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Akumulasi Anggaran Bulanan Melebihi
-DocType: Subscription,Submit on creation,Kirim pada penciptaan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
 DocType: Asset,Disposal Date,pembuangan Tanggal
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email akan dikirim ke semua Karyawan Aktif perusahaan pada jam tertentu, jika mereka tidak memiliki liburan. Ringkasan tanggapan akan dikirim pada tengah malam."
@@ -5303,6 +5340,7 @@
 DocType: Batch,Parent Batch,Induk induk
 DocType: Cheque Print Template,Cheque Print Template,Template Print Cek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Bagan Pusat Biaya
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Jumlah hari setelah tanggal faktur telah berlalu sebelum membatalkan langganan atau menandai langganan sebagai tidak dibayar
 DocType: Lab Test Template,Sample Collection,Koleksi Sampel
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
 DocType: Price List,Price List Name,Daftar Harga Nama
@@ -5311,7 +5349,7 @@
 DocType: Account,Income,Penghasilan
 DocType: Industry Type,Industry Type,Jenis Produksi
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ada yang salah!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Peringatan: Cuti aplikasi berisi tanggal blok berikut
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Peringatan: Cuti aplikasi berisi tanggal blok berikut
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah terkirim
 DocType: Supplier Scorecard Scoring Criteria,Score,Skor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Tahun fiskal {0} tidak ada
@@ -5331,12 +5369,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Profil Point of Sale
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} harus bernilai antara 0 dan 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Tanggal Penyusutan Berikutnya tidak boleh sebelum Tanggal Tersedia untuk Penggunaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pinjaman tanpa Jaminan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Pinjaman tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max jam bekerja melawan Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Dijadwalkan Tanggal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total nilai Bayar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total nilai Bayar
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Pesan lebih dari 160 karakter akan dipecah menjadi beberapa pesan
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
 DocType: Hub Settings,Company and Seller Profile,Profil Perusahaan dan Penjual
@@ -5350,10 +5388,9 @@
 DocType: Item,Variant Based On,Varian Berbasis Pada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Pemasok Anda
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Perbaiki
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pemasok Bagian Tidak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Diterima dari
 DocType: Lead,Converted,Dikonversi
@@ -5367,6 +5404,7 @@
 DocType: Asset,Assets,Aktiva
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Stok Barang ini dalam beberapa kelompok di website.
+DocType: Subscription,Current Invoice End Date,Tanggal Akhir Faktur Saat Ini
 DocType: Payment Term,Due Date Based On,Tanggal Jatuh Tempo Berdasarkan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Harap atur grup pelanggan dan wilayah default di Setelan Penjualan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} tidak ada
@@ -5374,7 +5412,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Anda tidak diizinkan menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Tidak ada pembayaran yang dipilih untuk Entri Jurnal
 DocType: Payment Reconciliation,From Invoice Date,Dari Tanggal Faktur
+DocType: Loan,Disbursed,Dicairkan
 DocType: Healthcare Settings,Laboratory Settings,Pengaturan Laboratorium
 DocType: Patient Appointment,Service Unit,Unit Layanan
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Berhasil Set Supplier
@@ -5387,12 +5427,12 @@
 DocType: Share Balance,No of Shares,Tidak ada saham
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Bernomor Seri' tidak dapat ‘Ya’ untuk barang non-persediaan
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Pilih Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Fee Schedule,Total Amount per Student,Jumlah Total per Siswa
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Listrik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Listrik
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tambahkan sisa organisasi Anda sebagai pengguna Anda. Anda juga dapat menambahkan mengundang Pelanggan portal Anda dengan menambahkan mereka dari Kontak
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
 DocType: Grant Application,Requested Amount,Jumlah yang diminta
@@ -5402,7 +5442,7 @@
 DocType: Crop Cycle,Detected Diseases,Penyakit Terdeteksi
 DocType: Stock Entry,Default Source Warehouse,Standar Gudang Sumber
 DocType: Item,Customer Code,Kode Pelanggan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Birthday Reminder untuk {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Birthday Reminder untuk {0}
 DocType: Asset Maintenance Task,Last Completion Date,Tanggal penyelesaian terakhir
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah Hari Semenjak Order Terakhir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
@@ -5410,9 +5450,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Pengaturan GoCardless
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Asset Persediaan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Asset Persediaan
 DocType: Restaurant,Active Menu,Menu Aktif
 DocType: Target Detail,Target Qty,Qty Target
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Terhadap Pinjaman: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Pengaturan Checkout
 DocType: Student Attendance,Present,ada
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh Terkirim
@@ -5421,9 +5462,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM tidak berisi barang persediaan apapun
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM tidak berisi barang persediaan apapun
 DocType: Chapter,Chapter Head,Kepala Bab
 DocType: Payment Term,Month(s) after the end of the invoice month,Bulan setelah akhir bulan faktur
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Kegiatan proyek / tugas.
@@ -5431,11 +5472,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Buat Slip Gaji
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Hasil lab datetime tidak bisa sebelum pengujian datetime
 DocType: POS Profile,Allow user to edit Discount,Izinkan pengguna mengedit Diskon
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Dapatkan pelanggan dari
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Dapatkan pelanggan dari
 DocType: Purchase Invoice Item,Include Exploded Items,Sertakan barang yang meledak
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
 DocType: Shipping Rule,Restrict to Countries,Batasi ke Negara
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tetapkan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Jumlah Nilai Write Off (mata uang perusahaan)
 DocType: Sales Invoice Timesheet,Billing Hours,Jam penagihan
 DocType: Project,Total Sales Amount (via Sales Order),Total Jumlah Penjualan (via Sales Order)
@@ -5452,6 +5494,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Manajer Penilaian
 DocType: Payment Entry,Allocate Payment Amount,Alokasikan Jumlah Pembayaran
+DocType: Subscription Plan,Subscription Plan,Paket Langganan
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Tipe Nota Pengiriman
 DocType: Sales Order,Partly Delivered,Terkirim Sebagian
@@ -5477,9 +5520,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Rentang Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Menginstal preset
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Tidak ada Catatan Pengiriman yang dipilih untuk Pelanggan {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Tidak ada Catatan Pengiriman yang dipilih untuk Pelanggan {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM diganti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Pilih Item berdasarkan Tanggal Pengiriman
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Pilih Item berdasarkan Tanggal Pengiriman
 DocType: Grant Application,Has any past Grant Record,Memiliki Record Grant masa lalu
 ,Sales Analytics,Analitika Penjualan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Tersedia {0}
@@ -5497,7 +5540,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Biaya Bahan Baku Disediakan
 DocType: Selling Settings,Settings for Selling Module,Pengaturan untuk Jual Modul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reservasi Kamar Hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Layanan Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Layanan Pelanggan
 DocType: BOM,Thumbnail,Kuku ibu jari
 DocType: Item Customer Detail,Item Customer Detail,Rincian Barang Pelanggan
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tawarkan Lowongan Kerja kepada Calon
@@ -5513,7 +5556,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Siswa telah terdaftar
 DocType: Fees,Student Details,Rincian siswa
 DocType: Purchase Invoice Item,Stock Qty,Jumlah Persediaan
-DocType: Employee Loan,Repayment Period in Months,Periode pembayaran di Bulan
+DocType: Loan,Repayment Period in Months,Periode pembayaran di Bulan
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Kesalahan: Tidak id valid?
 DocType: Naming Series,Update Series Number,Perbarui Nomor Seri
 DocType: Account,Equity,Modal
@@ -5522,7 +5565,7 @@
 DocType: Task,Closing Date,Tanggal Penutupan
 DocType: Sales Order Item,Produced Quantity,Jumlah Diproduksi
 DocType: Timesheet,Work Detail,Detail Pekerjaan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Insinyur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Insinyur
 DocType: Journal Entry,Total Amount Currency,Jumlah Total Mata Uang
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cari Barang Sub Assembly
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
@@ -5567,13 +5610,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informasi Jenis Donor.
 DocType: Request for Quotation,Supplier Detail,pemasok Detil
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Kesalahan dalam rumus atau kondisi: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Nilai Tertagih Faktur
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Nilai Tertagih Faktur
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria bobot harus menambahkan hingga 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Absensi
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Barang Persediaan
 DocType: BOM,Materials,Material/Barang
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak diperiksa, daftar harus ditambahkan ke setiap departemen di mana itu harus diterapkan."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Membuat {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan Target Gudang tidak bisa sama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
@@ -5597,14 +5639,14 @@
 DocType: Shipping Rule,Fixed,Tetap
 DocType: Vehicle Service,Clutch Plate,clutch Plat
 DocType: Company,Round Off Account,Akun Pembulatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Beban Administrasi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Beban Administrasi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Kelompok Pelanggan
-DocType: Journal Entry,Subscription,Berlangganan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Berlangganan
 DocType: Purchase Invoice,Contact Email,Email Kontak
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Penciptaan Biaya Tertunda
 DocType: Appraisal Goal,Score Earned,Skor Earned
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Masa Pemberitahuan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Masa Pemberitahuan
 DocType: Asset Category,Asset Category Name,Aset Kategori Nama
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak dapat diedit.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama baru Sales Person
@@ -5617,7 +5659,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tidak dicentang jika Anda tidak ingin mempertimbangkan batch sambil membuat kelompok berbasis kursus.
 DocType: Asset,Frequency of Depreciation (Months),Frekuensi Penyusutan (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Akun kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Jenis Barang Biaya Landing
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah Kuantitas Produk yang dihasilkan dari proses manufakturing / repacking dari jumlah kuantitas bahan baku yang disediakan
@@ -5625,7 +5667,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Barang di Order Penjualan
 DocType: Hub Settings,Company Logo,Logo perusahaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 DocType: Healthcare Settings,Patient Registration,Pendaftaran Pasien
@@ -5659,11 +5701,10 @@
 DocType: Journal Entry,Total Debit,Jumlah Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Gudang bawaan Selesai Stok Barang
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Silakan pilih Pasien
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,Fasilitas
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Anggaran dan Pusat Biaya
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Beberapa modus pembayaran default tidak diperbolehkan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Untuk
 ,Appointment Analytics,Penunjukan Analytics
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Pelanggan Blog
@@ -5679,6 +5720,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Biarkan kosong jika Anda membuat kelompok siswa per tahun
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika dicentang, total ada. dari Hari Kerja akan mencakup libur, dan ini akan mengurangi nilai Gaji Per Hari"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikasi yang menggunakan kunci saat ini tidak dapat diakses, apakah Anda yakin?"
+DocType: Subscription Settings,Prorate,Prorata
 DocType: Purchase Invoice,Total Advance,Jumlah Uang Muka
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Ubah Kode Template
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Jangka Tanggal Akhir tidak dapat lebih awal dari tanggal Term Start. Perbaiki tanggal dan coba lagi.
@@ -5689,8 +5731,9 @@
 DocType: Opportunity Item,Basic Rate,Tarif Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 DocType: Cheque Print Template,Signatory Position,Posisi penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Set as Hilang/Kalah
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Set as Hilang/Kalah
 DocType: Timesheet,Total Billable Hours,Total Jam Ditagih
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Jumlah hari di mana pelanggan harus membayar faktur yang dihasilkan oleh langganan ini
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Catatan
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Hal ini didasarkan pada transaksi terhadap pelanggan ini. Lihat timeline di bawah untuk rincian
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Dialokasikan jumlah {1} harus kurang dari atau sama dengan jumlah entri Pembayaran {2}
@@ -5709,12 +5752,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Company,Company Info,Info Perusahaan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Pilih atau menambahkan pelanggan baru
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hal ini didasarkan pada kehadiran Karyawan ini
 DocType: Assessment Result,Summary,Ringkasan
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Kehadiran
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Akun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Akun Debit
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item Item Pemesanan Restoran
@@ -5726,7 +5769,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Manfaat Karyawan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Manfaat Karyawan
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Work Order,Manufactured Qty,Qty Diproduksi
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Saham tidak ada dengan {0}
@@ -5734,12 +5777,12 @@
 DocType: Asset,Out of Order,Habis
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
 DocType: Projects Settings,Ignore Workstation Time Overlap,Abaikan Waktu Workstation Tumpang Tindih
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Pilih Batch Numbers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan diajukan ke Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 DocType: Patient Service Unit,Medical Administrator,Administrator Medis
 DocType: Assessment Plan,Schedule,Jadwal
 DocType: Account,Parent Account,Rekening Induk
@@ -5769,15 +5812,16 @@
 DocType: Asset Repair,Repair Status,Status perbaikan
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Silakan pilih Rekam Karyawan terlebih dahulu.
 DocType: POS Profile,Account for Change Amount,Akun untuk Perubahan Jumlah
 DocType: Purchase Invoice,input service,masukan layanan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Anggota Tim Pemeliharaan
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analisis tanah
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kode Kursus:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Masukan Entrikan Beban Akun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Masukan Entrikan Beban Akun
 DocType: Account,Stock,Persediaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Produksi
@@ -5825,19 +5869,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Penerimaan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nama variabel
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
 DocType: Asset,Asset Category,Aset Kategori
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Gaji bersih yang belum dapat negatif
 DocType: Purchase Order,Advance Paid,Pembayaran Dimuka (Advance)
 DocType: Item,Item Tax,Pajak Stok Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Bahan untuk Supplier
 DocType: Soil Texture,Loamy Sand,Pasir Loamy
 DocType: Production Plan,Material Request Planning,Perencanaan Permintaan Material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Cukai Faktur
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% muncul lebih dari sekali
 DocType: Expense Claim,Employees Email Id,ID Email Karyawan
 DocType: Employee Attendance Tool,Marked Attendance,Absensi Terdaftar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Piutang Lancar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Piutang Lancar
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer melebihi jam yang ditentukan.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Kirim SMS massal ke kontak Anda
 DocType: Patient,A Positive,Positif
@@ -5848,9 +5892,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qty Aktual wajib diisi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} saat ini memiliki posisi Scorecard Pemasok {1}, Pesanan Pembelian untuk pemasok ini harus dikeluarkan dengan hati-hati."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tim Pemeliharaan Aset
-DocType: Employee Loan,Loan Type,Jenis pinjaman
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} telah berhasil dikirim
+DocType: Loan,Loan Type,Jenis pinjaman
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadwalan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kartu Kredit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kartu Kredit
 DocType: BOM,Item to be manufactured or repacked,Item yang akan diproduksi atau dikemas ulang
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
 DocType: Sales Invoice Item,Drop Ship,Pengiriman Drop Ship
@@ -5882,7 +5927,7 @@
 DocType: Item,Units of Measure,Satuan ukur
 DocType: Manufacturing Settings,Allow Production on Holidays,Izinkan Produksi di hari libur
 DocType: Sales Invoice,Customer's Purchase Order Date,Tanggal Order Pembelian Pelanggan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Modal / Saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Modal / Saham
 DocType: Shopping Cart Settings,Show Public Attachments,Tampilkan Lampiran Umum
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
 DocType: Restaurant Reservation,Reservation Time,Waktu Reservasi
@@ -5897,7 +5942,7 @@
 DocType: Purchase Order,To Receive and Bill,Untuk Diterima dan Ditagih
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Baris # {0}: Reqd by Date tidak boleh sebelum Tanggal Transaksi
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produk Pilihan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Perancang
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
@@ -5907,20 +5952,20 @@
 DocType: Driver,Expiry Date,Tanggal Berakhir
 DocType: Healthcare Settings,Employee name and designation in print,Nama karyawan dan sebutan di cetak
 ,accounts-browser,account-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Silahkan pilih Kategori terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Silahkan pilih Kategori terlebih dahulu
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Proyek
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Untuk memungkinkan penagihan lebih atau pemesanan lebih, perbarui ""Penyisihan"" di Pengaturan Persediaan atau Barang."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Setengah Hari)
 DocType: Payment Term,Credit Days,Hari Kredit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Silakan pilih Pasien untuk mendapatkan Tes Laboratorium
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Membuat Batch Mahasiswa
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Dapatkan item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Hari Masa Tenggang
 DocType: Cash Flow Mapping,Is Income Tax Expense,Merupakan Beban Pajak Penghasilan
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Periksa ini jika Siswa berada di Institute&#39;s Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
 ,Stock Summary,Ringkasan Persediaan
@@ -5931,10 +5976,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Tanggal
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: BOM Operation,Operating Cost(Company Currency),Biaya operasi (Perusahaan Mata Uang)
-DocType: Employee Loan Application,Rate of Interest,Tingkat Tujuan
+DocType: Loan Application,Rate of Interest,Tingkat Tujuan
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: Item,Shelf Life In Days,Shelf Life In Days
 DocType: GL Entry,Is Opening,Apakah Membuka
+DocType: Department,Expense Approvers,Aplaus Beban
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
 DocType: Journal Entry,Subscription Section,Bagian Langganan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Akun {0} tidak ada
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 2cd622f..19d0dcf 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hætta Efni Visit {0} áður hætta þessu ábyrgð kröfu
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Matsskýrslur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Áskriftarupplýsingar
 DocType: Supplier Scorecard,Notify Supplier,Tilkynna birgir
 DocType: Item,Customer Items,Atriði viðskiptavina
 DocType: Project,Costing and Billing,Kosta og innheimtu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Reikningur {0}: Foreldri reikningur {1} getur ekki verið höfuðbók
 DocType: Item,Publish Item to hub.erpnext.com,Birta Item til hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Tilkynningar í tölvupósti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,mat
 DocType: Item,Default Unit of Measure,Default Mælieiningin
 DocType: SMS Center,All Sales Partner Contact,Allt Sales Partner samband við
-DocType: Employee,Leave Approvers,Skildu Approvers
+DocType: Department,Leave Approvers,Skildu Approvers
 DocType: Sales Partner,Dealer,söluaðila
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Rannsóknir
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Athuga framboð
 DocType: Job Applicant,Job Applicant,Atvinna umsækjanda
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Þetta er byggt á viðskiptum móti þessum Birgir. Sjá tímalínu hér fyrir nánari upplýsingar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Raunveruleg gerð skattur getur ekki verið með í Liður hlutfall í röð {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Raunveruleg gerð skattur getur ekki verið með í Liður hlutfall í röð {0}
 DocType: Bank Guarantee,Customer,viðskiptavinur
 DocType: Purchase Receipt Item,Required By,krafist er í
 DocType: Delivery Note,Return Against Delivery Note,Aftur gegn afhendingu Note
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},bankareikningur getur ekki verið nefnt sem {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Höfuð (eða hópar) gegn sem bókhaldsfærslum eru gerðar og jafnvægi er viðhaldið.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Framúrskarandi fyrir {0} má ekki vera minna en núll ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Það eru engar framlagðar launakröfur til að vinna úr.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Það eru engar framlagðar launakröfur til að vinna úr.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mínútur
 DocType: Leave Type,Leave Type Name,Skildu Tegund Nafn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,sýna opinn
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Nauðsynlegt er að taka þessa aðgerð í dag sjálft fyrir ofangreindum endurteknum
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Series Uppfært Tókst
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Athuga
 DocType: Pricing Rule,Apply On,gilda um
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Allt Birgir samband við
 DocType: Support Settings,Support Settings,Stuðningur Stillingar
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Væntanlegur Lokadagur má ekki vera minna en búist Start Date
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Gefa skal vera það sama og {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Ný Leave Umsókn
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Gefa skal vera það sama og {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Hópur Item Fyrning Staða
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Draft
 DocType: Membership,membership validaty section,aðildarvottorðsþáttur
 DocType: Mode of Payment Account,Mode of Payment Account,Mode greiðslureikning
 DocType: Consultation,Consultation,Samráð
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,efni
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Gerð vefsíða
 DocType: Opening Invoice Creation Tool Item,Quantity,magn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Reikninga borð getur ekki verið autt.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Lán (skulda)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Reikninga borð getur ekki verið autt.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Lán (skulda)
 DocType: Employee Education,Year of Passing,Ár Passing
 DocType: Item,Country of Origin,Upprunaland
 DocType: Soil Texture,Soil Texture Criteria,Jarðvegur Texture Criteria
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Aðal upplýsingar um tengilið
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Opið Issues
 DocType: Production Plan Item,Production Plan Item,Framleiðsla Plan Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},User {0} er þegar úthlutað til starfsmanns {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},User {0} er þegar úthlutað til starfsmanns {1}
 DocType: Lab Test Groups,Add new line,Bæta við nýjum línu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Heilbrigðisþjónusta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Töf á greiðslu (dagar)
@@ -89,7 +85,7 @@
 ,Delay Days,Frestur daga
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,reikningur
+DocType: Subscription Invoice,Invoice,reikningur
 DocType: Purchase Invoice Item,Item Weight Details,Vara þyngd upplýsingar
 DocType: Asset Maintenance Log,Periodicity,tíðni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Reikningsár {0} er krafist
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,skammst
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} passar ekki við {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Alls Kosta Upphæð
 DocType: Delivery Note,Vehicle No,ökutæki Nei
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Vinsamlegast veldu verðskrá
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Verk í vinnslu
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Vinsamlegast veldu dagsetningu
 DocType: Daily Work Summary Group,Holiday List,Holiday List
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,endurskoðandi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,endurskoðandi
 DocType: Hub Settings,Selling Price List,Selja verðskrá
 DocType: Patient,Tobacco Current Use,Núverandi notkun tóbaks
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Sala hlutfall
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Sala hlutfall
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Sími nei
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Upphafleg póstskilaboð send
 ,Sales Partners Commission,Velta Partners Commission
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Gildi Eftir Afskriftir
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Tengdar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Mæting dagsetning má ekki vera minna en inngöngu dagsetningu starfsmanns
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Mæting dagsetning má ekki vera minna en inngöngu dagsetningu starfsmanns
 DocType: Grading Scale,Grading Scale Name,Flokkun Scale Name
-DocType: Subscription,Repeat on Day,Endurtaka á dag
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Þetta er rót reikningur og ekki hægt að breyta.
 DocType: Sales Invoice,Company Address,Nafn fyrirtækis
 DocType: BOM,Operations,aðgerðir
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Get ekki stillt leyfi á grundvelli afsláttur fyrir {0}
+DocType: Subscription,Subscription Start Date,Upphafsdagsetning
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Hengja .csv skrá með tveimur dálka, einn fyrir gamla nafn og einn fyrir nýju nafni"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ekki í hvaða virka Fiscal Year.
 DocType: Packed Item,Parent Detail docname,Parent Detail DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tilvísun: {0}, Liður: {1} og Viðskiptavinur: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Prófunartímabil Lokadagur getur ekki verið fyrir upphafsdag Prófunartímabils
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opnun fyrir Job.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM er ekki tilgreint fyrir undirverktaka atriði {0} í röð {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama fyrirtæki er slegið oftar en einu sinni
 DocType: Patient,Married,giftur
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ekki leyft {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Fá atriði úr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Fá atriði úr
 DocType: Price List,Price Not UOM Dependant,Verð ekki UOM háð
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Vara {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Tax Type
 ,Completed Work Orders,Lokið vinnutilboð
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Skattskyld fjárhæð
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Skattskyld fjárhæð
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Þú hefur ekki heimild til að bæta við eða endurnýja færslum áður {0}
 DocType: BOM,Item Image (if not slideshow),Liður Image (ef ekki myndasýning)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Raunveruleg Rekstur Time
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Tilvísun Document Type verður að vera einn af kostnaðarkröfu eða dagbókarfærslu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Veldu BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Tilvísun Document Type verður að vera einn af kostnaðarkröfu eða dagbókarfærslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Veldu BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnaður við afhent Items
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Stjórna fyrirframupphæð sem gefinn er til starfsmanns
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Afhending Tilkynning
 DocType: Journal Entry,Opening Entry,opnun Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Reikningur Pay Aðeins
-DocType: Employee Loan,Repay Over Number of Periods,Endurgreiða yfir fjölda tímum
+DocType: Loan,Repay Over Number of Periods,Endurgreiða yfir fjölda tímum
 DocType: Stock Entry,Additional Costs,viðbótarkostnað
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Reikningur með núverandi viðskipti er ekki hægt að breyta í hópinn.
 DocType: Lead,Product Enquiry,vara Fyrirspurnir
 DocType: Education Settings,Validate Batch for Students in Student Group,Staðfestu hópur fyrir nemendur í nemendahópi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ekkert leyfi fannst fyrir starfsmann {0} fyrir {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ekkert leyfi fannst fyrir starfsmann {0} fyrir {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vinsamlegast sláðu fyrirtæki fyrst
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Vinsamlegast veldu Company fyrst
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Vinsamlegast veldu Company fyrst
 DocType: Employee Education,Under Graduate,undir Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Vinsamlegast stilltu sjálfgefið sniðmát fyrir skilatilkynningar um leyfi í HR-stillingum.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Heildar kostnaður
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,starfsmaður Lán
 DocType: Fee Schedule,Send Payment Request Email,Sendu inn beiðni um greiðslubeiðni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Liður {0} er ekki til í kerfinu eða er útrunnið
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Fasteign
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Árangurslaust óskráð.
 DocType: Assessment Result,Grade,bekk
 DocType: Restaurant Table,No of Seats,Nei sæti
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Til að bæta við hreyfimyndum skaltu nota jinja tags eins og <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Samþykkt með Birgir
 DocType: Asset Maintenance Task,Asset Maintenance Task,Viðhaldsverkefni eigna
 DocType: SMS Center,All Contact,Allt samband við
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,árslaunum
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,árslaunum
 DocType: Daily Work Summary,Daily Work Summary,Daily Work Yfirlit
 DocType: Period Closing Voucher,Closing Fiscal Year,Lokun fjárhagsársins
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} er frosinn
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,lager Útgjöld
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,lager Útgjöld
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Veldu Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vinsamlegast sláðu Valinn netfangi
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Vinsamlegast sláðu Valinn netfangi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit í félaginu Gjaldmiðill
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Aðal heimilisfang
 DocType: Production Plan,Material Request Detail,Efnisbeiðni Detail
 DocType: Selling Settings,Default Quotation Validity Days,Sjálfgefið útboðsdagur
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Stillingar fyrir HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Breyta Upphæð
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Ökuskírteini Flokkar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Vinsamlegast sláðu inn afhendingardagsetningu
 DocType: Depreciation Schedule,Make Depreciation Entry,Gera Afskriftir færslu
+DocType: HR Settings,Leave Settings,Skildu Stillingar
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Beiðni Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,gera starfsmanni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Uppsetningarhamur POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Slökkva á stofnun tímaskrár gegn vinnuskilaboðum. Rekstur skal ekki rekja til vinnuskilaboða
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,framkvæmd
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,framkvæmd
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Upplýsingar um starfsemi fram.
 DocType: Asset Maintenance Log,Maintenance Status,viðhald Staða
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Upplýsingar um aðild
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Birgir þörf er á móti ber að greiða reikninginn {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Atriði og Verðlagning
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total hours: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Frá Dagsetning ætti að vera innan fjárhagsársins. Að því gefnu Frá Dagsetning = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Forgangur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Forgangur
 DocType: Grant Application,Individual,einstök
 DocType: Academic Term,Academics User,fræðimenn User
 DocType: Cheque Print Template,Amount In Figure,Upphæð Á mynd
-DocType: Employee Loan Application,Loan Info,lán Info
+DocType: Loan Application,Loan Info,lán Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Áætlun um heimsóknir viðhald.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Birgir Tímabil
 DocType: Share Transfer,Share Transfer,Hlutaflutningur
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Liður sniðmát
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Lífefnafræði
 DocType: Job Offer,Select Terms and Conditions,Valið Skilmálar og skilyrði
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,út Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,út Value
 DocType: Woocommerce Settings,Woocommerce Settings,Váskiptastillingar
 DocType: Production Plan,Sales Orders,velta Pantanir
 DocType: Purchase Taxes and Charges,Valuation,verðmat
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Sjálfgefið Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Sjónvarp
 DocType: Work Order Operation,Updated via 'Time Log',Uppfært með &#39;Time Innskráning &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Fyrirfram upphæð getur ekki verið meiri en {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Veldu viðskiptavininn eða birgirinn.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Fyrirfram upphæð getur ekki verið meiri en {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Series List fyrir þessa færslu
 DocType: Company,Enable Perpetual Inventory,Virkja ævarandi birgða
+DocType: Bank Guarantee,Charges Incurred,Gjöld felld
 DocType: Company,Default Payroll Payable Account,Default Launaskrá Greiðist Reikningur
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Uppfæra Email Group
 DocType: Sales Invoice,Is Opening Entry,Er Opnun færslu
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Sérsniðin árangur
 DocType: Delivery Stop,Contact Name,Nafn tengiliðar
 DocType: Course Assessment Criteria,Course Assessment Criteria,Námsmat Viðmið
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Skattur:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Skattur:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Námsmaður:
 DocType: POS Customer Group,POS Customer Group,POS viðskiptavinar Group
 DocType: Land Unit,Land Unit describing various land assets,Landseining sem lýsir ýmsum eignum landsins
@@ -374,9 +371,8 @@
 ,Open Work Orders,Opna vinnu pantanir
 DocType: Payment Term,Credit Months,Lánshæfismat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Borga má ekki vera minna en 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Til að hætta að senda endurteknar villuboð frá kerfinu höfum við valið fatlaða reit í áskriftinni
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Leaves á ári
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Leaves á ári
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vinsamlegast athugaðu &#39;Er Advance&#39; gegn reikninginn {1} ef þetta er fyrirfram færslu.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Warehouse {0} ekki tilheyra félaginu {1}
 DocType: Email Digest,Profit & Loss,Hagnaður &amp; Tap
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Vinsamlegast settu upp nemendur undir nemendahópum
 DocType: Item Website Specification,Item Website Specification,Liður Website Specification
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Entries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Skildu Bannaður
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Entries
 DocType: Crop,Annual,Árleg
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sættir Item
 DocType: Stock Entry,Sales Invoice No,Reiknings No.
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ekki samband
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Fólk sem kenna í fyrirtæki þínu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Forritari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Forritari
 DocType: Item,Minimum Order Qty,Lágmark Order Magn
 DocType: Pricing Rule,Supplier Type,birgir Type
 DocType: Course Scheduling Tool,Course Start Date,Auðvitað Start Date
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Birta á Hub
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,efni Beiðni
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,kaup Upplýsingar
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Hámarksstig
 DocType: Email Digest,New Quotations,ný Tilvitnun
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Póst laun miði að starfsmaður byggðar á völdum tölvupósti völdum í Launþegi
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Fyrsti Leyfi samþykkjari á listanum verður sett sem sjálfgefið Leave samþykkjari
 DocType: Tax Rule,Shipping County,Sendingar County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Frekari
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Frekari
 DocType: Asset,Next Depreciation Date,Næsta Afskriftir Dagsetning
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Virkni Kostnaður á hvern starfsmann
 DocType: Accounts Settings,Settings for Accounts,Stillingar fyrir reikninga
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Framúrskarandi Tékkar og Innlán til að hreinsa
 DocType: Item,Synced With Hub,Samstillt Með Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} getur ekki verið neikvæð fyrir atriðið {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} getur ekki verið neikvæð fyrir atriðið {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Rangt lykilorð
 DocType: Item,Variant Of,afbrigði af
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Lokið Magn má ekki vera meiri en &#39;Magn í Manufacture&#39;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Vinsamlegast settu herbergi fyrir herbergi á {}
 DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
 DocType: Opening Invoice Creation Tool,Invoice Type,Reikningar Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Afhendingarseðilinn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Afhendingarseðilinn
 DocType: Consultation,Encounter Impression,Fundur birtingar
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Setja upp Skattar
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kostnaðarverð seldrar Eignastýring
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Gengi sem viðskiptavinir Gjaldmiðill er breytt til grunngj.miðil viðskiptavinarins
 DocType: Course Scheduling Tool,Course Scheduling Tool,Auðvitað Tímasetningar Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Villa við að búa til endurtekin% s fyrir% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
 DocType: Land Unit,LInked Analysis,Linkað greining
 DocType: Item Tax,Tax Rate,skatthlutfall
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Umsóknarfrestur getur ekki verið yfir tveimur úthlutunarskrám
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Umsóknarfrestur getur ekki verið yfir tveimur úthlutunarskrám
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} þegar úthlutað fyrir starfsmann {1} fyrir tímabilið {2} til {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur Nei verður að vera það sama og {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,% móttekin
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Búa Student Hópar
 DocType: Volunteer,Weekends,Helgar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Lánshæð upphæð
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Lánshæð upphæð
 DocType: Setup Progress Action,Action Document,Aðgerð skjal
 DocType: Chapter Member,Website URL,vefslóð
 ,Finished Goods,fullunnum
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Bæta Hlutir
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+DocType: Leave Application,Leave Approver Name,Skildu samþykkjari Nafn
 DocType: Depreciation Schedule,Schedule Date,Dagskrá Dags
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Hagnaður, Frádráttur og annar hluti Laun"
 DocType: Packed Item,Packed Item,pakkað Item
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Beiðni um tilvitnun
 DocType: Healthcare Settings,Require Lab Test Approval,Krefjast samþykkis Lab Test
 DocType: Salary Slip Timesheet,Working Hours,Vinnutími
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Samtals framúrskarandi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Samtals framúrskarandi
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.
 DocType: Dosage Strength,Strength,Styrkur
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Búa til nýja viðskiptavini
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,einnota Kostnaður
 DocType: Purchase Receipt,Vehicle Date,ökutæki Dagsetning
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Ástæðan fyrir að tapa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Ástæðan fyrir að tapa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Uppfæra reikningsnúmer
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Lead Eigandi getur ekki verið sama og Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Úthlutað magn getur ekki hærri en óleiðréttum upphæð
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Alls Loan Endurgreiðsla
 DocType: Account,Cost of Goods Sold,Kostnaður af seldum vörum
-DocType: Subscription,Yearly,Árlega
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
 DocType: Drug Prescription,Dosage,Skammtar
 DocType: Journal Entry Account,Sales Order,Sölupöntun
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. sölugengi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. sölugengi
 DocType: Assessment Plan,Examiner Name,prófdómari Name
 DocType: Lab Test Template,No Result,engin Niðurstaða
 DocType: Purchase Invoice Item,Quantity and Rate,Magn og Rate
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vinsamlegast sláðu inn nafn fyrirtækis fyrst
 DocType: Purchase Invoice,Supplier Name,Nafn birgja
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lestu ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Sýna blöð allra deildarmanna í dagatalinu
 DocType: Purchase Invoice,01-Sales Return,01-Velta aftur
 DocType: Account,Is Group,er hópur
 DocType: Email Digest,Pending Purchase Orders,Bíður Purchase Pantanir
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Skyldanlegt námskeið - námsár
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} tengist ekki {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sérsníða inngangs texta sem fer eins og a hluti af þeim tölvupósti. Hver viðskipti er sérstakt inngangs texta.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Vinsamlegast settu sjálfgefinn greiðslureikning fyrir fyrirtækið {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Vinsamlegast settu sjálfgefinn greiðslureikning fyrir fyrirtækið {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Viðskipti ekki leyfð gegn hætt Work Order {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global stillingar fyrir alla framleiðsluaðferðum.
 DocType: Accounts Settings,Accounts Frozen Upto,Reikninga Frozen uppí
 DocType: SMS Log,Sent On,sendi á
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
 DocType: HR Settings,Employee record is created using selected field. ,Starfsmaður færsla er búin til með völdu sviði.
 DocType: Sales Order,Not Applicable,Á ekki við
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday skipstjóri.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Frátekið til sölu
 DocType: Packing Slip,From Package No.,Frá pakkinn nr
 DocType: Item Attribute,To Range,til Hóflegt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verðbréfa
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ekki er hægt að breyta matunaraðferð, þar sem viðskipti eiga sér stað gegn sumum hlutum sem ekki hafa eigin matunaraðferð"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Verðbréfa
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ekki er hægt að breyta matunaraðferð, þar sem viðskipti eiga sér stað gegn sumum hlutum sem ekki hafa eigin matunaraðferð"
 DocType: Student Report Generation Tool,Attended by Parents,Sóttu foreldra
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Samtals lauf úthlutað er nauðsynlegur
 DocType: Patient,AB Positive,AB Jákvæð
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aðsókn met.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Laun Component fyrir timesheet byggt launaskrá.
 DocType: Sales Order Item,Used for Production Plan,Notað fyrir framleiðslu áætlun
-DocType: Employee Loan,Total Payment,Samtals greiðsla
+DocType: Loan,Total Payment,Samtals greiðsla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Ekki er hægt að hætta við viðskipti fyrir lokaðan vinnuskilríki.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tími milli rekstrar (í mín)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} er lokað þannig að aðgerðin er ekki hægt að ljúka
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nóg Varahlutir til að byggja
 DocType: POS Profile User,POS Profile User,POS prófíl notandi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,bein Tekjur
+DocType: Subscription Invoice,Subscription Invoice,Áskriftargjald
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,bein Tekjur
 DocType: Patient Appointment,Date TIme,Dagsetning Tími
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Getur ekki síað byggð á reikning, ef flokkaðar eftir reikningi"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Uppsetning fyrirtækja og skatta
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vinsamlegast veldu Námskeið
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Vinsamlegast veldu Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Vinsamlegast veldu Company
 DocType: Stock Entry Detail,Difference Account,munurinn Reikningur
 DocType: Purchase Invoice,Supplier GSTIN,Birgir GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Get ekki loka verkefni eins háð verkefni hennar {0} er ekki lokað.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Sniðmát fyrir sjóðstreymi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
 DocType: Journal Entry,Difference (Dr - Cr),Munur (Dr - Cr)
+DocType: Bank Guarantee,Providing,Veita
 DocType: Account,Profit and Loss,Hagnaður og tap
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ekki heimilt, stilla Lab Test Template eftir þörfum"
 DocType: Patient,Risk Factors,Áhættuþættir
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Birgir Reikningur nr
 DocType: Territory,For reference,til viðmiðunar
 DocType: Healthcare Settings,Appointment Confirmation,Ráðstefna staðfestingar
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ekki hægt að eyða Serial Nei {0}, eins og það er notað í lager viðskiptum"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ekki hægt að eyða Serial Nei {0}, eins og það er notað í lager viðskiptum"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Lokun (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Halló
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,færa Item
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Setja sjálfgefið sjálfgefið í pósti prófíl {0} fyrir notanda {1}, vinsamlega slökkt á sjálfgefið"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financial / bókhald ári.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uppsafnaður Gildi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Því miður, Serial Nos ekki hægt sameinuð"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Því miður, Serial Nos ekki hægt sameinuð"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Svæði er nauðsynlegt í POS prófíl
 DocType: Supplier,Prevent RFQs,Hindra RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Gera Velta Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Launasala lögð fyrir tímabil frá {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Launasala lögð fyrir tímabil frá {0} til {1}
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Færsla reikningsdagur
 DocType: Production Plan,Production Plan,Framleiðsluáætlun
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Opna reikningsskilatól
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,velta Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,velta Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Ath: Samtals úthlutað leyfi {0} ætti ekki að vera minna en þegar hafa verið samþykktar leyfi {1} fyrir tímabilið
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Setja magn í viðskiptum sem byggjast á raðnúmeri inntak
 ,Total Stock Summary,Samtals yfirlit yfir lager
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Samþykkt með Birgir (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vinsamlegast settu fyrirtækið
 DocType: Share Balance,Share Balance,Hlutabréfaviðskipti
 DocType: Purchase Order Item,Billed Amt,billed Amt
 DocType: Training Result Employee,Training Result Employee,Þjálfun Niðurstaða Starfsmaður
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A rökrétt Warehouse gegn sem stock færslur eru gerðar.
-DocType: Repayment Schedule,Principal Amount,höfuðstóll
-DocType: Employee Loan Application,Total Payable Interest,Alls Greiðist Vextir
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,höfuðstóll
+DocType: Loan Application,Total Payable Interest,Alls Greiðist Vextir
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Samtals framúrskarandi: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Velta Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Tilvísunarnúmer &amp; Frestdagur er nauðsynlegt fyrir {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
 DocType: Restaurant Reservation,Restaurant Reservation,Veitingahús pöntun
 DocType: Land Unit,Land Unit Name,Landseiningarheiti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Tillaga Ritun
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Tillaga Ritun
 DocType: Payment Entry Deduction,Payment Entry Deduction,Greiðsla Entry Frádráttur
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Klára
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Tilkynna viðskiptavinum með tölvupósti
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Tilkynna viðskiptavinum með tölvupósti
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Annar velta manneskja {0} staðar með sama Starfsmannafélag id
 DocType: Employee Advance,Claimed Amount,Krafist upphæð
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",Greiðsla Gateway Reikningur ekki búin skaltu búa til einn höndunum.
 DocType: Supplier Scorecard,Per Year,Hvert ár
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ekki hæfur til að taka þátt í þessu forriti samkvæmt DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Sales Invoice,Sales Taxes and Charges,Velta Skattar og gjöld
 DocType: Employee,Organization Profile,Organization Profile
 DocType: Vital Signs,Height (In Meter),Hæð (í metra)
 DocType: Student,Sibling Details,systkini Upplýsingar
 DocType: Vehicle Service,Vehicle Service,Vehicle Service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Sjálfkrafa kallar á viðbrögð beiðnin byggist á aðstæðum.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Sjálfkrafa kallar á viðbrögð beiðnin byggist á aðstæðum.
 DocType: Employee,Reason for Resignation,Ástæðan fyrir úrsögn
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Sniðmát fyrir úttektum árangur.
 DocType: Sales Invoice,Credit Note Issued,Credit Note Útgefið
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,viðhald Dagskrá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Þá Verðlagning Reglur eru síuð út byggðar á viðskiptavininn, viðskiptavini Group, Territory, Birgir, Birgir Tegund, Campaign, Sales Partner o.fl."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Net Breyting á Skrá
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Starfsmaður Lán Stjórnun
 DocType: Employee,Passport Number,Vegabréfs númer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Tengsl Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,framkvæmdastjóri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,framkvæmdastjóri
 DocType: Payment Entry,Payment From / To,Greiðsla Frá / Til
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vinsamlegast settu inn reikning í vörugeymslu {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,efni Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Gat ekki fundið slóð fyrir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening (Dr)
+DocType: Loan,Applicant,Umsækjandi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Staða timestamp verður að vera eftir {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Til að gera endurteknar skjöl
 ,GST Itemised Purchase Register,GST greidd kaupaskrá
 DocType: Course Scheduling Tool,Reschedule,Skipuleggja
-DocType: Employee Loan,Total Interest Payable,Samtals vaxtagjöld
+DocType: Loan,Total Interest Payable,Samtals vaxtagjöld
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landað Kostnaður Skattar og gjöld
 DocType: Work Order Operation,Actual Start Time,Raunveruleg Start Time
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Ljúka
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Base
 DocType: Timesheet,Total Billed Hours,Samtals Greidd Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Skrifaðu Off Upphæð
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Skrifaðu Off Upphæð
 DocType: Leave Block List Allow,Allow User,að leyfa notanda
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Hagnaður / tap reikning á Asset förgun
 DocType: Vehicle Log,Service Details,Upplýsingar um þjónustu
-DocType: Subscription,Quarterly,ársfjórðungslega
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Flokkað
 DocType: Selling Settings,Delivery Note Required,Afhending Note Áskilið
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tímatafla
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials miðað við
 DocType: Sales Invoice,Port Code,Höfnarkóði
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Vörugeymsla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Vörugeymsla
 DocType: Lead,Lead is an Organization,Lead er stofnun
 DocType: Guardian Interest,Interest,vextir
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forsala
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Reikningar
 DocType: Vehicle,Odometer Value (Last),Kílómetramæli Value (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Sniðmát af forsendukortum.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,markaðssetning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,markaðssetning
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Greiðsla Entry er þegar búið
 DocType: Request for Quotation,Get Suppliers,Fáðu birgja
 DocType: Purchase Receipt Item Supplied,Current Stock,Núverandi Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} er ekki tengd við lið {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Laun Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} er ekki tengd við lið {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Laun Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
 DocType: Account,Expenses Included In Valuation,Kostnaður í Verðmat
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Þú getur aðeins endurnýjað ef aðild þín rennur út innan 30 daga
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Veldu aðeins ef þú hefur sett upp Cash Flow Mapper skjöl
 DocType: Email Digest,Next email will be sent on:,Næst verður send í tölvupósti á:
 DocType: Supplier Scorecard,Per Week,Á viku
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Liður hefur afbrigði.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Samtals nemandi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Liður {0} fannst ekki
 DocType: Bin,Stock Value,Stock Value
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Fyrirtæki og reikningar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Virði
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Virði
 DocType: Asset Settings,Depreciation Options,Afskriftir Valkostir
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ógildur póstur
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ógildur póstur
 DocType: Lead,Campaign Name,Heiti herferðar
 DocType: Hotel Room,Capacity,Stærð
 DocType: Selling Settings,Close Opportunity After Days,Loka Tækifæri Eftir daga
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Purchase Order No viðskiptavinar
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,Cell Number
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Það er engin starfsmaður fyrir tiltekin skilyrði. Athugaðu að launagreiðslur hafi ekki þegar verið búnar til.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Það er engin starfsmaður fyrir tiltekin skilyrði. Athugaðu að launagreiðslur hafi ekki þegar verið búnar til.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Efni Beiðnir Myndað
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Þú getur ekki slá núverandi skírteini í &quot;Against dagbókarfærslu &#39;dálki
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vinsamlegast veldu töflu
 DocType: BOM,Website Specifications,Vefsíða Upplýsingar
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er ógilt netfang í &#39;viðtakendum&#39;
 DocType: Special Test Items,Particulars,Upplýsingar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Frá {0} tegund {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Frá {0} tegund {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: viðskipta Factor er nauðsynlegur
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Margar verð Reglur hendi með sömu forsendum, vinsamlegast leysa deiluna með því að úthluta forgang. Verð Reglur: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ekki er hægt að slökkva eða hætta BOM eins og það er tengt við önnur BOMs
 DocType: Asset,Maintenance,viðhald
+DocType: Subscriber,Subscriber,Áskrifandi
 DocType: Item Attribute Value,Item Attribute Value,Liður Attribute gildi
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Vinsamlegast uppfærðu verkefnastöðu þína
 DocType: Item,Maximum sample quantity that can be retained,Hámarks sýni magn sem hægt er að halda
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Sjálfgefnar stillingar fyrir Shopping Cart
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Bæta við tímasetningum
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Eignastýring rifið um dagbókarfærslu {0}
-DocType: Employee Loan,Interest Income Account,Vaxtatekjur Reikningur
+DocType: Loan,Interest Income Account,Vaxtatekjur Reikningur
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Skoðaðu boðin sent
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,líftækni
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Skrifstofa viðhald kostnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Skrifstofa viðhald kostnaður
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Fara til
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Setja upp Email Account
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Vinsamlegast sláðu inn Item fyrst
 DocType: Asset Repair,Downtime,Niður í miðbæ
 DocType: Account,Liability,Ábyrgð
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Fræðigrein:
 DocType: Salary Detail,Do not include in total,Ekki innifalið alls
 DocType: Company,Default Cost of Goods Sold Account,Default Kostnaðarverð seldra vara reikning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Sýni magn {0} getur ekki verið meira en móttekin magn {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Verðskrá ekki valið
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Verðskrá ekki valið
 DocType: Employee,Family Background,Family Background
 DocType: Request for Quotation Supplier,Send Email,Senda tölvupóst
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
 DocType: Item,Max Sample Quantity,Hámarksfjöldi sýnis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,engin heimild
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,engin heimild
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Tilvitnun
 DocType: Vital Signs,Heart Rate / Pulse,Hjartsláttur / púls
 DocType: Company,Default Bank Account,Sjálfgefið Bank Account
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Verk með hærri weightage verður sýnt meiri
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab prófanir og lífskjör
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Sættir Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Enginn starfsmaður fannst
-DocType: Subscription,Stopped,Tappi
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Nemendahópur er þegar uppfærð.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Nemendahópur er þegar uppfærð.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Verkefnisuppfærsla.
 DocType: SMS Center,All Customer Contact,Allt Viðskiptavinur samband við
 DocType: Land Unit,Tree Details,Tree Upplýsingar
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,innflutningur Aðsókn
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Allir Item Hópar
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Sjálfkrafa semja skilaboð á framlagningu viðskiptum.
 DocType: Work Order,Item To Manufacture,Atriði til að framleiða
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} staðan er {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Veldu aftur, ef valið heimilisfang er breytt eftir að vista"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
 DocType: Item,Hub Publishing Details,Hub Publishing Upplýsingar
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Opening&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open Til Gera
 DocType: Notification Control,Delivery Note Message,Afhending Note Message
 DocType: Lab Test Template,Result Format,Niðurstaða snið
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,bimonthly
 DocType: Vehicle Service,Brake Pad,Bremsuklossi
 DocType: Fertilizer,Fertilizer Contents,Innihald áburðar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Rannsóknir og þróun
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Rannsóknir og þróun
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Upphæð Bill
 DocType: Company,Registration Details,Skráning Details
 DocType: Timesheet,Total Billed Amount,Alls Billed Upphæð
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Umframgreiðsla fyrir lánshæfiseinkunn í söluskilningi
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Mat á frammistöðu.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Virkjun &#39;Nota fyrir Shopping Cart&#39;, eins og Shopping Cart er virkt og það ætti að vera að minnsta kosti einn Tax Rule fyrir Shopping Cart"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Greiðsla Entry {0} er tengd við Order {1}, athuga hvort það ætti að vera dreginn sem fyrirfram í þessum reikningi."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Greiðsla Entry {0} er tengd við Order {1}, athuga hvort það ætti að vera dreginn sem fyrirfram í þessum reikningi."
 DocType: Sales Invoice Item,Stock Details,Stock Nánar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Sölustaður
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Lágmarksstofa
 DocType: Item Attribute,Item Attribute Values,Liður eigindi gildi
 DocType: Examination Result,Examination Result,skoðun Niðurstaða
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Kvittun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Kvittun
 ,Received Items To Be Billed,Móttekin Items verður innheimt
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Gengi meistara.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Tilvísun DOCTYPE verður að vera einn af {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} verður að vera virkt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Engar atriði í boði til að flytja
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} verður að vera virkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Engar atriði í boði til að flytja
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Lokun (Opnun + Samtals)
 DocType: Journal Entry,Depreciation Entry,Afskriftir Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Vinsamlegast veldu tegund skjals fyrst
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hætta Efni Heimsóknir {0} áður hætta þessu Viðhald Farðu
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 staðall
 DocType: Pricing Rule,Rate or Discount,Verð eða afsláttur
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nei {0} ekki tilheyra lið {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial Nei {0} ekki tilheyra lið {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Required Magn
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Eftirlæti
 DocType: Hub Settings,Custom Data,Sérsniðin gögn
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Læknisfræðileg staðal
 DocType: Soil Texture,Clay Composition (%),Leir Samsetning (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Vinsamlegast vista áður en verkefni er úthlutað.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balance Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balance Value
 DocType: Lab Test,Lab Technician,Lab Tæknimaður
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Velta Verðskrá
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Velta Verðskrá
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ef athugað verður viðskiptavinur búinn til, kortlagður við sjúklinginn. Sjúkratryggingar verða búnar til gegn þessum viðskiptavini. Þú getur einnig valið núverandi viðskiptavin þegar þú býrð til sjúklinga."
 DocType: Bank Reconciliation,Account Currency,Reikningur Gjaldmiðill
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Vinsamlegast nefna umferð á reikning í félaginu
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Sjálfgefin greiðast reikningar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
 DocType: Fee Structure,Components,Hluti
 DocType: Item Barcode,Item Barcode,Liður Strikamerki
 DocType: Woocommerce Settings,Endpoints,Endapunktar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
 DocType: Quality Inspection Reading,Reading 6,lestur 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",til að mynda. Ef seinkað verður þú að breyta handvirkt &quot;Repeat on Day of Month&quot; reitinn hér að neðan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
 DocType: Share Transfer,From Folio No,Frá Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kaupa Reikningar Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit færslu er ekki hægt að tengja með {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Dagsetning í boði fyrir notkun
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,Hefur prenta sniði
-DocType: Employee Loan,Sanctioned,bundnar
+DocType: Loan,Sanctioned,bundnar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin að
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vinsamlegast tilgreinið Serial Nei fyrir lið {1}
 DocType: Crop Cycle,Crop Cycle,Ræktunarhringur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Fyrir &quot;vara búnt &#39;atriði, Lager, Serial Nei og Batch No verður að teljast úr&#39; Pökkun lista &#39;töflunni. Ef Warehouse og Batch No eru sömu fyrir alla pökkun atriði fyrir hvaða &quot;vara búnt &#39;lið, sem gildin má færa í helstu atriði borðið, gildi verða afrituð á&#39; Pökkun lista &#39;borð."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Fyrir &quot;vara búnt &#39;atriði, Lager, Serial Nei og Batch No verður að teljast úr&#39; Pökkun lista &#39;töflunni. Ef Warehouse og Batch No eru sömu fyrir alla pökkun atriði fyrir hvaða &quot;vara búnt &#39;lið, sem gildin má færa í helstu atriði borðið, gildi verða afrituð á&#39; Pökkun lista &#39;borð."
 DocType: Student Admission,Publish on website,Birta á vefsíðu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Birgir Invoice Dagsetning má ekki vera meiri en Staða Dagsetning
+DocType: Subscription,Cancelation Date,Hætta við dagsetningu
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Item
 DocType: Agriculture Task,Agriculture Task,Landbúnaður Verkefni
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Óbein Tekjur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Óbein Tekjur
 DocType: Student Attendance Tool,Student Attendance Tool,Student Aðsókn Tool
 DocType: Restaurant Menu,Price List (Auto created),Verðskrá (Sjálfvirk stofnaður)
 DocType: Cheque Print Template,Date Settings,Dagsetning Stillingar
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,rafmagn Kostnaður
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab prófunartímabil getur ekki verið fyrir dagsetningu söfnunartíma
+DocType: Subscription Plan,Cost,Kostnaður
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ekki senda starfsmaður afmælisáminningar
 DocType: Expense Claim,Total Advance Amount,Samtals framvirði
 DocType: Delivery Stop,Estimated Arrival,Áætlaður komudagur
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Hlaða bréf höfuðið og merki. (Þú getur breytt þeim síðar).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,White
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,White
 DocType: SMS Center,All Lead (Open),Allt Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Magn er ekki í boði fyrir {4} í vöruhús {1} á að senda sinn færslunnar ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Þú getur aðeins valið hámark einn valkosta af listanum yfir kassa.
 DocType: Purchase Invoice,Get Advances Paid,Fá Framfarir Greiddur
 DocType: Item,Automatically Create New Batch,Búðu til nýjan hóp sjálfkrafa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Úthluta {0} til {1} (röð {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,gera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Úthluta {0} til {1} (röð {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,gera
 DocType: Student Admission,Admission Start Date,Aðgangseyrir Start Date
 DocType: Journal Entry,Total Amount in Words,Heildarfjárhæð orðum
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Ný starfsmaður
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Holiday List Nafn
 DocType: Repayment Schedule,Balance Loan Amount,Balance lánsfjárhæð
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Dagskrá Námskeið
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Kaupréttir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Kaupréttir
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Gera óvinnufæran að sækja síðustu kaupupplýsingar í innkaupapöntun
 DocType: Journal Entry Account,Expense Claim,Expense Krafa
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Viltu virkilega að endurheimta rifið eign?
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pökkun Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tilgreindu {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
 DocType: Delivery Note,Delivery To,Afhending Til
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variant sköpun hefur verið í biðstöðu.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Vinna Yfirlit fyrir {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Fyrsta leyfi samþykkis í listanum verður stillt sem sjálfgefið leyfi fyrir leyfi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
 DocType: Production Plan,Get Sales Orders,Fá sölu skipunum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} er ekki hægt að neikvæð
 DocType: Training Event,Self-Study,Sjálfsnám
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,laun
 DocType: Asset Maintenance,Maintenance Manager Name,Nafn viðhaldsstjórans
 DocType: Agriculture Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Vinsamlegast tilgreindu gilt Row skírteini fyrir röð {0} í töflunni {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Vinsamlegast tilgreindu gilt Row skírteini fyrir röð {0} í töflunni {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ekki tókst að finna breytu:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Vinsamlegast veldu reit til að breyta úr numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Ekki er hægt að vera fast eignalýsing þar sem birgir er búið til.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Gæði Skoðun sniðmát Nafn
 DocType: Project,First Email,Fyrsta tölvupóstur
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Frátekin Warehouse í Velta Order / Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,selja Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,selja Upphæð
 DocType: Repayment Schedule,Interest Amount,vextir Upphæð
 DocType: Serial No,Creation Document No,Creation Skjal nr
 DocType: Share Transfer,Issue,Mál
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Sendingar State
 ,Projected Quantity as Source,Áætlaðar Magn eins Source
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Atriði verður að bæta með því að nota &quot;fá atriði úr greiðslukvittanir &#39;hnappinn
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Afhendingartími
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Afhendingartími
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Flutningsgerð
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,sölukostnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,sölukostnaður
 DocType: Consultation,Diagnosis,Greining
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Buying
 DocType: GL Entry,Against,gegn
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,framkvæmd Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Póstnúmer
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Velta Order {0} er {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Veldu vaxtatekjur reikning í láni {0}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Gerð lager færslur
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
 DocType: Item,Default Supplier,Sjálfgefið Birgir
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Yfir Production losunarheimilda Hlutfall
-DocType: Employee Loan,Repayment Schedule,endurgreiðsla Dagskrá
+DocType: Loan,Repayment Schedule,endurgreiðsla Dagskrá
 DocType: Shipping Rule Condition,Shipping Rule Condition,Sendingar Regla Ástand
 DocType: Holiday List,Get Weekly Off Dates,Fáðu vikulega Off Dagsetningar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Lokadagur má ekki vera minna en Start Date
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Meðalaldur
 DocType: Education Settings,Attendance Freeze Date,Viðburður Frystingardagur
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Listi nokkrar af birgja þína. Þeir gætu verið stofnanir eða einstaklingar.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Sjá allar vörur
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Sjá allar vörur
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lágmarksstigleiki (dagar)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Allir BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hótel Herbergi af tegund {0} eru ekki tiltækar á {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,frá starfsmanni
 DocType: Driver,Cellphone Number,gemsa númer
 DocType: Project,Monitor Progress,Skjár framfarir
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Viðvörun: Kerfi mun ekki stöðva overbilling síðan upphæð fyrir lið {0} í {1} er núll
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Viðvörun: Kerfi mun ekki stöðva overbilling síðan upphæð fyrir lið {0} í {1} er núll
 DocType: Journal Entry,Make Difference Entry,Gera Mismunur færslu
+DocType: Supplier Quotation,Auto Repeat Section,Sjálfvirk endurtekin þáttur
 DocType: Upload Attendance,Attendance From Date,Aðsókn Frá Dagsetning
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,samgöngur
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ógilt Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} Leggja skal fram
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
+DocType: Department Approver,Department Approver,Department Approver
 DocType: SMS Center,Total Characters,Samtals Stafir
 DocType: Employee Advance,Claimed,Krafist
 DocType: Crop,Row Spacing,Row Spacing
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Greiðsla Sættir Invoice
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,framlag%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Eins og á kaupstillingum ef kaupin eru krafist == &#39;YES&#39; og síðan til að búa til innheimtufé, þarf notandi að búa til kauppöntun fyrst fyrir atriði {0}"
+,HSN-wise-summary of outward supplies,HSN-vitur-samantekt á ytri birgðum
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Fyrirtæki skráningarnúmer til viðmiðunar. Tax tölur o.fl.
 DocType: Sales Partner,Distributor,dreifingaraðili
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Aðgerð heiti
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Ár
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Fyrstu 2 stafirnir í GSTIN ættu að passa við ríkisnúmer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Upphafsdagur tímabils núverandi reikningi er
 DocType: Salary Slip,Leave Without Pay,Leyfi án launa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Getu Planning Villa
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fields verður afritað aðeins á upphafinu.
 DocType: Setup Progress Action,Domains,lén
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Raunbyrjunardagsetning &#39;má ekki vera meiri en&#39; Raunveruleg lokadagur&quot;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Stjórn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Stjórn
 DocType: Cheque Print Template,Payer Settings,greiðandi Stillingar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er &quot;SM&quot;, og hluturinn kóða er &quot;T-bolur&quot;, hluturinn kóðann um afbrigði verður &quot;T-bolur-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
 DocType: Purchase Invoice,Is Return,er aftur
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Varúð
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Upphafsdagur er meiri en lokadagur í verkefni &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / skuldfærslu Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / skuldfærslu Note
 DocType: Price List Country,Price List Country,Verðskrá Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code er ekki hægt að breyta fyrir Raðnúmer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Item Code er ekki hægt að breyta fyrir Raðnúmer
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM viðskipta Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vinsamlegast sláðu Item Code til að fá lotunúmer
 DocType: Stock Settings,Default Item Group,Sjálfgefið Item Group
-DocType: Employee Loan,Partially Disbursed,hluta ráðstafað
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Veita upplýsingar.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Veita upplýsingar.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Birgir gagnagrunni.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Þú getur ekki endurræst áskrift sem ekki er lokað.
 DocType: Account,Balance Sheet,Efnahagsreikningur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
 DocType: Fee Validity,Valid Till,Gildir til
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Samtals foreldrar kennarasamkoma
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Hafnað Magn er ekki hægt að færa í Purchase aftur
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Breyting viðskiptavinahóps fyrir valda viðskiptavini er ekki leyfilegt.
 ,Purchase Order Items To Be Billed,Purchase Order Items verður innheimt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Uppfærir áætlaða komutíma.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Uppfærir áætlaða komutíma.
 DocType: Program Enrollment Tool,Enrollment Details,Upplýsingar um innritun
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vinsamlegast veldu viðskiptavin
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Yfirstandandi reikningsári
 DocType: Purchase Order,Group same items,Group sömu atriði
 DocType: Purchase Invoice,Disable Rounded Total,Slökkva á Ávalur Samtals
-DocType: Employee Loan Application,Repayment Info,endurgreiðsla Upplýsingar
+DocType: Department,Parent Department,Foreldradeild
+DocType: Loan Application,Repayment Info,endurgreiðsla Upplýsingar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Færslur&#39; má ekki vera autt
 DocType: Maintenance Team Member,Maintenance Role,Viðhald Hlutverk
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Afrit róður {0} með sama {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Afrit róður {0} með sama {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Setja upp Starfsmenn
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Rannsókn
+DocType: Subscription Settings,Subscription Settings,Áskriftarstillingar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Rannsókn
 DocType: Maintenance Visit Purpose,Work Done,vinnu
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Vinsamlegast tilgreindu að minnsta kosti einn eiginleiki í þeim einkennum töflunni
 DocType: Announcement,All Students,Allir nemendur
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
 DocType: Crop Cycle,Less than a year,Minna en ár
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
 DocType: Crop,Yield UOM,Afrakstur UOM
 ,Budget Variance Report,Budget Dreifni Report
 DocType: Salary Slip,Gross Pay,Gross Pay
 DocType: Item,Is Item from Hub,Er hlutur frá miðstöð
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Activity Type er nauðsynlegur.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,arður Greiddur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,arður Greiddur
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,bókhald Ledger
 DocType: Stock Reconciliation,Difference Amount,munurinn Upphæð
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} á leyfi á {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Óráðstafað eigið fé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Óráðstafað eigið fé
 DocType: Purchase Invoice,05-Change in POS,05-Breyting á POS
 DocType: Vehicle Log,Service Detail,þjónusta Detail
 DocType: BOM,Item Description,Lýsing á hlut
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,tækifæri Item
 ,Student and Guardian Contact Details,Student og Guardian Tengiliðir Upplýsingar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Fyrir birgja {0} Netfang þarf að senda tölvupóst
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,tímabundin Opening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,tímabundin Opening
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Skoða miðstöð
 ,Employee Leave Balance,Starfsmaður Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Stöðunni á reikningnum {0} verður alltaf að vera {1}
 DocType: Patient Appointment,More Info,Meiri upplýsingar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Verðmat Gefa þarf fyrir lið í röð {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Verðmat Gefa þarf fyrir lið í röð {0}
 DocType: Supplier Scorecard,Scorecard Actions,Stigatafla
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Dæmi: Masters í tölvunarfræði
 DocType: Purchase Invoice,Rejected Warehouse,hafnað Warehouse
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,að
 DocType: Supplier Quotation Item,Lead Time in days,Lead Time í dögum
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Viðskiptaskuldir Yfirlit
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Greiðsla launum frá {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Greiðsla launum frá {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ekki heimild til að breyta frosinn reikning {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fá útistandandi reikninga
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Heildarkostnaður Issue / Transfer magn {0} í efni Beiðni {1} \ má ekki vera meiri en óskað magn {2} fyrir lið {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Lítil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Lítil
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Opnun Reikningur Verkfæri Tól
 DocType: Education Settings,Employee Number,starfsmaður Number
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Hætta við innheimtu eftir náðartíma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case Nei (s) þegar í notkun. Prófaðu frá máli nr {0}
 DocType: Project,% Completed,% Lokið
 ,Invoiced Amount (Exculsive Tax),Upphæð á reikningi (Exculsive Tax)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratory Testing Datetime
 DocType: Email Digest,Add Quote,Bæta Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion þáttur sem þarf til UOM: {0} í lið: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,óbeinum kostnaði
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,óbeinum kostnaði
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Magn er nauðsynlegur
 DocType: Agriculture Analysis Criteria,Agriculture,Landbúnaður
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Fyrir {0}, aðeins kredit reikninga er hægt að tengja við aðra gjaldfærslu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital útbúnaður
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capital útbúnaður
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Vinsamlegast settu vörulistann fyrst
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
+DocType: Subscription Plan,Billing Interval Count,Greiðslumiðlunartala
 DocType: Sales Invoice Item,Edit Description,Breyta Lýsing
 DocType: Antibiotic,Antibiotic,Sýklalyf
 ,Team Updates,Team uppfærslur
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,fyrir Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,fyrir Birgir
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Uppsetning reiknings Tegund hjálpar í því að velja þennan reikning í viðskiptum.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Gjaldmiðill)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Búa prenta sniði
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Sendu Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Annað atriði má ekki vera eins og hlutkóði
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
 DocType: Sales Partner,Target Distribution,Target Dreifing
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Lokagjöf á Bráðabirgðamati
 DocType: Salary Slip,Bank Account No.,Bankareikningur nr
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beiðni um Tilvitnun Birgir
 DocType: Healthcare Settings,Registration Message,Skráningarnúmer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Vélbúnaður
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Vélbúnaður
 DocType: Prescription Dosage,Prescription Dosage,Ávísun Skammtar
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vinsamlegast veldu Company
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Upphafs- og lokadagsetningar
 ,Delivered Items To Be Billed,Afhent Items verður innheimt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse er ekki hægt að breyta fyrir Raðnúmer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse er ekki hægt að breyta fyrir Raðnúmer
 DocType: Authorization Rule,Average Discount,Meðal Afsláttur
 DocType: Project Update,Great/Quickly,Great / Fljótt
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Vinsamlegast veldu lotur í lotuðum hlutum
 DocType: Asset,Depreciation Schedules,afskriftir Skrár
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Eftirfarandi reikningar gætu verið valin í GST stillingum:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Eftirfarandi reikningar gætu verið valin í GST stillingum:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil
 DocType: Activity Cost,Projects,verkefni
 DocType: Payment Request,Transaction Currency,Færsla Gjaldmiðill
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Frá {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: POS Profile,Campaign,herferð
 DocType: Supplier,Name and Type,Nafn og tegund
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Samþykki Staða verður &quot;Samþykkt&quot; eða &quot;Hafnað &#39;
 DocType: Physician,Contacts and Address,Tengiliðir og heimilisfang
 DocType: Purchase Invoice,Contact Person,Tengiliður
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bjóst Start Date &#39;má ekki vera meiri en&#39; Bjóst Lokadagur &#39;
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Hæfi og upplýsingar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Net Breyting á fast eign
 DocType: Leave Control Panel,Leave blank if considered for all designations,Skildu eftir autt ef það er talið fyrir alla heita
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,frá DATETIME
 DocType: Email Digest,For Company,Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Samskipti þig.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Beiðni um tilvitnun er óvirk til að fá aðgang frá vefsíðunni, fyrir meira Check vefgáttinni stillingar."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Birgir Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kaup Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Kaup Upphæð
 DocType: Sales Invoice,Shipping Address Name,Sendingar Address Nafn
 DocType: Material Request,Terms and Conditions Content,Skilmálar og skilyrði Content
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Það voru villur að búa til námskeiði
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Fyrsta kostnaðarákvörðunin á listanum verður stillt sem sjálfgefið kostnaðarákvörðun.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,getur ekki verið meiri en 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
 DocType: Maintenance Visit,Unscheduled,unscheduled
 DocType: Employee,Owned,eigu
 DocType: Salary Detail,Depends on Leave Without Pay,Fer um leyfi án launa
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,pakki Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,lærlingur
 DocType: Purchase Invoice,Company GSTIN,Fyrirtæki GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Neikvætt Magn er ekki leyfð
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Neikvætt Magn er ekki leyfð
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Tax smáatriði borð sóttu meistara lið sem streng og geyma á þessu sviði. Notað fyrir skatta og gjöld
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ef reikningur er frosinn, eru færslur leyft að afmörkuðum notendum."
 DocType: Email Digest,Bank Balance,Bank Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Leyfi samþykki skylt í leyfi umsókn
 DocType: Job Opening,"Job profile, qualifications required etc.","Job uppsetningu, hæfi sem krafist o.fl."
 DocType: Journal Entry Account,Account Balance,Staða reiknings
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Tax Regla fyrir viðskiptum.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Source vöruhús er nauðsynlegur fyrir röð {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Greiðslutími í röð {0} er hugsanlega afrit.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Landbúnaður (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,pökkun Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,skrifstofa leigu
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,pökkun Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,skrifstofa leigu
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
 DocType: Disease,Common Name,Algengt nafn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Innflutningur mistókst!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ekkert heimilisfang bætt við enn.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation vinnustund
 DocType: Vital Signs,Blood Pressure,Blóðþrýstingur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analyst
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analyst
 DocType: Item,Inventory,Skrá
 DocType: Item,Sales Details,velta Upplýsingar
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Staðfestu skráð námskeið fyrir nemendur í nemendahópi
 DocType: Notification Control,Expense Claim Rejected,Expense Krafa Hafnað
 DocType: Item,Item Attribute,Liður Attribute
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ríkisstjórn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ríkisstjórn
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostnað Krafa {0} er þegar til fyrir Vehicle Innskráning
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute Name
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Vinsamlegast sláðu endurgreiðslu Upphæð
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Vinsamlegast sláðu endurgreiðslu Upphæð
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Item Afbrigði
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Þjónusta
 DocType: HR Settings,Email Salary Slip to Employee,Sendu Laun Slip til starfsmanns
 DocType: Cost Center,Parent Cost Center,Parent Kostnaður Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Veldu Möguleg Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Veldu Möguleg Birgir
 DocType: Sales Invoice,Source,Source
 DocType: Customer,"Select, to make the customer searchable with these fields","Veldu, til að gera viðskiptavininum kleift að leita að þessum reitum"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Sýna lokaðar
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pökkun Slip (s) Hætt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Cash Flow frá Fjárfesting
 DocType: Program Course,Program Course,program Námskeið
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Frakt og Áframsending Gjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Frakt og Áframsending Gjöld
 DocType: Homepage,Company Tagline for website homepage,Fyrirtæki Yfirskrift fyrir vefsvæðið heimasíðuna
 DocType: Item Group,Item Group Name,Item Group Name
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Uppljómun Upplýsingar
 DocType: Leave Block List,Block Holidays on important days.,Block Holidays á mikilvægum dögum.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Vinsamlegast settu inn allar nauðsynlegar niðurstöður gildi (s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Viðskiptakröfur Yfirlit
-DocType: Employee Loan,Monthly Repayment Amount,Mánaðarlega endurgreiðslu Upphæð
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Viðskiptakröfur Yfirlit
+DocType: Loan,Monthly Repayment Amount,Mánaðarlega endurgreiðslu Upphæð
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Opnun Reikningar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Vinsamlegast settu User ID reit í Starfsmannafélag met að setja Starfsmannafélag hlutverki
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Vinsamlegast settu User ID reit í Starfsmannafélag met að setja Starfsmannafélag hlutverki
 DocType: UOM,UOM Name,UOM Name
 DocType: GST HSN Code,HSN Code,HSN kóða
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,framlag Upphæð
@@ -1953,7 +1959,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Notandi {0} er þegar úthlutað lækni {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Möguleg Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Möguleg Birgir
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mánaðarleg dreifing
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List er tóm. Vinsamlegast búa Receiver Listi
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Heilbrigðisþjónusta (beta)
@@ -1980,7 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Engir hlutir í pakka
 DocType: Shipping Rule Condition,From Value,frá Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
-DocType: Employee Loan,Repayment Method,endurgreiðsla Aðferð
+DocType: Loan,Repayment Method,endurgreiðsla Aðferð
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Ef valið þá Heimasíða verður sjálfgefið Item Group fyrir vefsvæðið
 DocType: Quality Inspection Reading,Reading 4,lestur 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Kröfur fyrir VÍS.
@@ -1989,7 +1996,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Vottorð sem krafist er
 DocType: Company,Default Holiday List,Sjálfgefin Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Frá tíma og tíma af {1} er skörun við {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,lager Skuldir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,lager Skuldir
 DocType: Purchase Invoice,Supplier Warehouse,birgir Warehouse
 DocType: Opportunity,Contact Mobile No,Viltu samband við Mobile Nei
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Veldu fyrirtæki
@@ -1997,7 +2004,7 @@
 DocType: Student Report Generation Tool,Print Section,Prenta kafla
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Notandi {0} hefur engin sjálfgefin POS prófíl. Kannaðu sjálfgefið í röð {1} fyrir þennan notanda.
 DocType: Student Group,Set 0 for no limit,Setja 0. engin takmörk
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Daginn (s) sem þú ert að sækja um leyfi eru frí. Þú þarft ekki að sækja um leyfi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Daginn (s) sem þú ert að sækja um leyfi eru frí. Þú þarft ekki að sækja um leyfi.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} er nauðsynlegt til að búa til upphaf {invoice_type} reikninga
 DocType: Customer,Primary Address and Contact Detail,Aðal heimilisfang og tengiliðaval
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Endursenda Greiðsla tölvupóst
@@ -2008,10 +2015,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vinsamlegast veldu að minnsta kosti eitt lén.
 DocType: Dependent Task,Dependent Task,Dependent Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prófaðu að skipuleggja starfsemi fyrir X daga fyrirvara.
 DocType: HR Settings,Stop Birthday Reminders,Stop afmælisáminningar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
 DocType: SMS Center,Receiver List,Receiver List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,leit Item
 DocType: Payment Schedule,Payment Amount,Greiðslu upphæð
@@ -2021,7 +2028,7 @@
 DocType: Assessment Plan,Grading Scale,flokkun Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,þegar lokið
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager í hendi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Lager í hendi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Innflutningur Árangursrík!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Greiðsla Beiðni þegar til staðar {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnaður af úthlutuðum Items
@@ -2032,17 +2039,16 @@
 DocType: Quotation Item,Quotation Item,Tilvitnun Item
 DocType: Customer,Customer POS Id,Viðskiptavinur POS-auðkenni
 DocType: Account,Account Name,Nafn reiknings
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Frá Dagsetning má ekki vera meiri en hingað til
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial Nei {0} magn {1} getur ekki verið brot
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Frá Dagsetning má ekki vera meiri en hingað til
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial Nei {0} magn {1} getur ekki verið brot
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Vinsamlegast sláðu inn slóðina á Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Birgir Type húsbóndi.
 DocType: Purchase Order Item,Supplier Part Number,Birgir Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Viðskiptahlutfall er ekki hægt að 0 eða 1
 DocType: Share Balance,To No,Til nr
-DocType: Subscription,Reference Document,Tilvísun Document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} er aflýst eða henni hætt
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Umsækjandi Tegund
+DocType: Loan,Applicant Type,Umsækjandi Tegund
 DocType: Purchase Invoice,03-Deficiency in services,03-Skortur á þjónustu
 DocType: Delivery Note,Vehicle Dispatch Date,Ökutæki Sending Dagsetning
 DocType: Healthcare Settings,Default Medical Code Standard,Sjálfgefin Læknisfræðileg staðal
@@ -2053,13 +2059,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,frátekið Magn
 DocType: Party Account,Party Account,Party Reikningur
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Mannauður
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Mannauður
 DocType: Lead,Upper Income,efri Tekjur
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,hafna
 DocType: Journal Entry Account,Debit in Company Currency,Debet í félaginu Gjaldmiðill
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,fyrir starfsmann
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gera útborgun færslu
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Gera útborgun færslu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance gegn Birgir skal gjaldfæra
 DocType: Company,Default Values,sjálfgefnar
 DocType: Membership,INR,INR
@@ -2088,10 +2094,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Samtals (án skatta)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Leiða Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} verður að vera hærri en 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Tilboð í boði
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Tilboð í boði
 DocType: Manufacturing Settings,Capacity Planning For (Days),Getu áætlanagerð fyrir (dagar)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Öflun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ekkert af þeim atriðum hafa allar breytingar á magni eða verðmæti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ekkert af þeim atriðum hafa allar breytingar á magni eða verðmæti.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Lögboðið reit - Program
 DocType: Special Test Template,Result Component,Niðurstaða hluti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ábyrgð kröfu
@@ -2111,7 +2117,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Fela frí í laufum sem fer
 DocType: Sales Invoice,Packed Items,pakkað Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Ábyrgð kröfu gegn Raðnúmer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Virkja Shopping Cart
 DocType: Employee,Permanent Address,Heimilisfang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2129,10 +2135,10 @@
 DocType: Selling Settings,Selling Settings,selja Stillingar
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Staðfestu aðgerð
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Uppboð
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Vinsamlegast tilgreindu annaðhvort magni eða Verðmat Meta eða bæði
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Vinsamlegast tilgreindu annaðhvort magni eða Verðmat Meta eða bæði
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,fylling
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Skoða í körfu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,markaðskostnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,markaðskostnaður
 ,Item Shortage Report,Liður Skortur Report
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Ekki er hægt að búa til staðlaðar forsendur. Vinsamlegast breyttu viðmiðunum
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
@@ -2154,9 +2160,9 @@
 DocType: Upload Attendance,Get Template,fá sniðmát
 DocType: Material Request,Transferred,Flutt
 DocType: Vehicle,Doors,hurðir
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Safna gjöld fyrir skráningu sjúklinga
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Get ekki breytt eiginleiki eftir viðskipti með hlutabréf. Búðu til nýtt hlut og flytja birgðir til nýju hlutarins
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Get ekki breytt eiginleiki eftir viðskipti með hlutabréf. Búðu til nýtt hlut og flytja birgðir til nýju hlutarins
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,Tax Breakup
 DocType: Packing Slip,PS-,PS
@@ -2192,11 +2198,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,sættir JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Of margir dálkar. Flytja skýrslu og prenta það með töflureikni.
 DocType: Purchase Invoice Item,Batch No,hópur Nei
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Framfarir starfsmanna
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leyfa mörgum sölu skipunum gegn Purchase Order viðskiptavinar
 DocType: Student Group Instructor,Student Group Instructor,Nemandi hópur kennari
 DocType: Grant Application,Assessment  Mark (Out of 10),Námsmat (af 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Setja forskeyti fyrir númerakerfi röð á viðskiptum þínum
 DocType: Employee Attendance Tool,Employees HTML,starfsmenn HTML
@@ -2205,15 +2212,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Tækifæri Frá sviði er nauðsynlegur
 DocType: Email Digest,Annual Expenses,Árleg útgjöld
 DocType: Item,Variants,afbrigði
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Gera Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Gera Purchase Order
 DocType: SMS Center,Send To,Senda til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Payment Reconciliation Payment,Allocated amount,úthlutað magn
 DocType: Sales Team,Contribution to Net Total,Framlag til Nettó
 DocType: Sales Invoice Item,Customer's Item Code,Liður viðskiptavinar Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Sættir
 DocType: Territory,Territory Name,Territory Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Work-í-gangi Warehouse er krafist áður Senda
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Þú getur aðeins haft áætlanir með sömu innheimtuferli í áskrift
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Umsækjandi um starf.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Tilvísun
 DocType: Supplier,Statutory info and other general information about your Supplier,Lögbundin upplýsingar og aðrar almennar upplýsingar um birgir
@@ -2222,10 +2230,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Gegn Journal Entry {0} hjartarskinn ekki hafa allir ósamþykkt {1} færslu
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,úttektir
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Þjálfun viðburðir
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Afrit Serial Nei slegið í lið {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Afrit Serial Nei slegið í lið {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Fylgjast með leiðsögn með leiðsögn.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Skilyrði fyrir Shipping reglu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,vinsamlegast sláðu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,vinsamlegast sláðu
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Viðhaldsskrá
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Vinsamlegast settu síuna miðað Item eða Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettóþyngd þessum pakka. (Reiknaðar sjálfkrafa sem summa nettó þyngd atriði)
@@ -2233,11 +2241,11 @@
 DocType: Sales Order,To Deliver and Bill,Að skila og Bill
 DocType: Student Group,Instructors,leiðbeinendur
 DocType: GL Entry,Credit Amount in Account Currency,Credit Upphæð í Account Gjaldmiðill
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} Leggja skal fram
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} Leggja skal fram
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Hlutastýring
 DocType: Authorization Control,Authorization Control,Heimildin Control
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Hafnað Warehouse er nauðsynlegur móti hafnað Item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,greiðsla
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,greiðsla
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Vörugeymsla {0} er ekki tengt neinum reikningi, vinsamlegast tilgreinið reikninginn í vörugeymslunni eða settu sjálfgefið birgðareikning í félaginu {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Stjórna pantanir
 DocType: Work Order Operation,Actual Time and Cost,Raunveruleg tíma og kostnað
@@ -2247,7 +2255,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Leave Umsókn
 DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Á
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Knippi atriði á sölu.
@@ -2257,7 +2265,7 @@
 DocType: Item,Barcodes,Strikamerki
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Þú hefur slegið afrit atriði. Vinsamlegast lagfæra og reyndu aftur.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Félagi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Félagi
 DocType: Asset Movement,Asset Movement,Asset Hreyfing
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Vinnuskilyrði {0} verður að senda inn
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,nýtt körfu
@@ -2275,13 +2283,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Innheimtargjald verður að vera jafnt gjaldmiðli gjaldmiðils eða félagsreiknings gjaldmiðils
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Gefur til kynna að pakki er hluti af þessari fæðingu (Only Draft)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Row {0}: Gjalddagi má ekki vera fyrir útgáfudegi
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Row {0}: Gjalddagi má ekki vera fyrir útgáfudegi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Greiða færslu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Magn í lið {0} verður að vera minna en {1}
 ,Sales Invoice Trends,Sölureikningi Trends
 DocType: Leave Application,Apply / Approve Leaves,Beita / Samþykkja Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,fyrir
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Getur átt röð ef gjaldið er af gerðinni &#39;On Fyrri Row Upphæð&#39; eða &#39;Fyrri Row Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Getur átt röð ef gjaldið er af gerðinni &#39;On Fyrri Row Upphæð&#39; eða &#39;Fyrri Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Afhending Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tré fjárhagslegum stoðsviða.
 DocType: Serial No,Delivery Document No,Afhending Skjal nr
@@ -2295,7 +2302,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Efni neysla er ekki stillt í framleiðslustillingum.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Ekki er hægt að yfirfæra fyrir lið {0} í röð {1} meira en {2}. Til að leyfa ofgreiðslu skaltu setja í lagerstillingar
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Ekki er hægt að yfirfæra fyrir lið {0} í röð {1} meira en {2}. Til að leyfa ofgreiðslu skaltu setja í lagerstillingar
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uppfæra svar
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
@@ -2306,12 +2313,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Veldu forritið fyrst
 DocType: Patient Appointment,Patient Age,Sjúklingur Aldur
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Annast verkefni
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Raðnúmer {0} hefur þegar verið skilað
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Raðnúmer {0} hefur þegar verið skilað
 DocType: Supplier,Supplier of Goods or Services.,Seljandi vöru eða þjónustu.
 DocType: Budget,Fiscal Year,Fiscal Year
 DocType: Asset Maintenance Log,Planned,Planað
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Sjálfgefnar reikningar sem notaðar eru til notkunar ef ekki er sett í sjúkling til að bóka samráðskostnað.
 DocType: Vehicle Log,Fuel Price,eldsneyti verð
+DocType: Bank Guarantee,Margin Money,Framlegð peninga
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Setja opinn
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
@@ -2325,16 +2333,16 @@
 DocType: Lead,Follow Up,Fylgja eftir
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Liður Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Liður {0} er ekki skipulag fyrir Serial Nos. Athuga Item meistara
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Liður {0} er ekki skipulag fyrir Serial Nos. Athuga Item meistara
 DocType: Maintenance Visit,Maintenance Time,viðhald Time
 ,Amount to Deliver,Nema Bera
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Sama hlutur hefur verið færður inn mörgum sinnum. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Start Date getur ekki verið fyrr en árið upphafsdagur skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Það voru villur.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Starfsmaður {0} hefur þegar sótt um {1} á milli {2} og {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Það voru villur.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Starfsmaður {0} hefur þegar sótt um {1} á milli {2} og {3}:
 DocType: Guardian,Guardian Interests,Guardian Áhugasvið
 DocType: Naming Series,Current Value,Núverandi Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
 DocType: Education Settings,Instructor Records to be created by,Kennariaskrár til að búa til af
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} búin
 DocType: GST Account,GST Account,GST reikning
@@ -2353,8 +2361,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
 DocType: Website Item Group,Website Item Group,Vefsíða Item Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Bætt við í uppáhald
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Engin launaspjald fannst fyrir framangreindar valin skilyrði
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skyldur og skattar
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Engin launaspjald fannst fyrir framangreindar valin skilyrði
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Skyldur og skattar
 DocType: Projects Settings,Projects Settings,Verkefni Stillingar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} greiðsla færslur er ekki hægt að sía eftir {1}
@@ -2364,27 +2372,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tré Item hópa.
 DocType: Production Plan,Total Produced Qty,Heildarframleiðsla
 DocType: Payroll Entry,Get Employee Details,Fáðu starfsmannaupplýsingar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Getur ekki átt línunúmeri meiri en eða jafnt og núverandi röð númer fyrir þessa Charge tegund
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Getur ekki átt línunúmeri meiri en eða jafnt og núverandi röð númer fyrir þessa Charge tegund
 DocType: Asset,Sold,selt
 ,Item-wise Purchase History,Item-vitur Purchase History
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; að ná Serial Nei bætt við fyrir lið {0}
 DocType: Account,Frozen,Frozen
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Magn (Company Gjaldmiðill)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Hráefni
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Hráefni
 DocType: Payment Reconciliation Payment,Reference Row,Tilvísun Row
 DocType: Installation Note,Installation Time,uppsetning Time
 DocType: Sales Invoice,Accounting Details,Bókhalds Upplýsingar
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eyða öllum viðskiptum fyrir þetta fyrirtæki
 DocType: Patient,O Positive,O Jákvæð
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Fjárfestingar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Fjárfestingar
 DocType: Issue,Resolution Details,upplausn Upplýsingar
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,úthlutanir
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,samþykktarviðmiðanir
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vinsamlegast sláðu Efni Beiðnir í töflunni hér að ofan
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Engar endurgreiðslur eru tiltækar fyrir Journal Entry
 DocType: Item Attribute,Attribute Name,eigindi nafn
 DocType: BOM,Show In Website,Sýna í Vefsíða
 DocType: Shopping Cart Settings,Show Quantity in Website,Sýna Magn í vefsvæðis
-DocType: Employee Loan Application,Total Payable Amount,Alls Greiðist Upphæð
+DocType: Loan Application,Total Payable Amount,Alls Greiðist Upphæð
 DocType: Task,Expected Time (in hours),Væntanlegur Time (í klst)
 DocType: Item Reorder,Check in (group),Innritun (hópur)
 DocType: Soil Texture,Silt,Silt
@@ -2403,7 +2412,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Greiða
 DocType: Room,Room Name,Room Name
 DocType: Prescription Duration,Prescription Duration,Ávísunartími
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Skildu ekki hægt að beita / aflýst áður {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Skildu ekki hægt að beita / aflýst áður {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
 DocType: Activity Cost,Costing Rate,kosta Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Viðskiptavinur heimilisföngum og Tengiliðir
 ,Campaign Efficiency,Virkni herferðar
@@ -2421,11 +2430,11 @@
 DocType: Chapter,Chapter,Kafli
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,pair
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Sjálfgefin reikningur verður sjálfkrafa uppfærð í POS Reikningur þegar þessi stilling er valin.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
 DocType: Asset,Depreciation Schedule,Afskriftir Stundaskrá
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Söluaðilar samstarfsaðilar og tengiliðir
 DocType: Bank Reconciliation Detail,Against Account,Against reikninginn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date ætti að vera á milli Frá Dagsetning og hingað
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date ætti að vera á milli Frá Dagsetning og hingað
 DocType: Maintenance Schedule Detail,Actual Date,Raunveruleg Dagsetning
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Vinsamlega stilltu sjálfgefna kostnaðarmiðstöðina í {0} fyrirtæki.
 DocType: Item,Has Batch No,Hefur Batch No
@@ -2443,7 +2452,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet)
 DocType: Soil Texture,Soil Type,Jarðvegsgerð
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Ný skilaboð
 ,Quotation Trends,Tilvitnun Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless umboð
@@ -2463,7 +2471,7 @@
 DocType: Hub Category,Hub Category,Hub Flokkur
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,ökutæki Number
-DocType: Employee Loan,Loan Amount,lánsfjárhæð
+DocType: Loan,Loan Amount,lánsfjárhæð
 DocType: Student Report Generation Tool,Add Letterhead,Bættu við bréfinu
 DocType: Program Enrollment,Self-Driving Vehicle,Sjálfknúin ökutæki
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Birgir Stuðningskort Standandi
@@ -2491,9 +2499,9 @@
 DocType: Cash Flow Mapper,Position,Staða
 DocType: Patient,Patient Details,Sjúklingur Upplýsingar
 DocType: Patient,B Positive,B Jákvæð
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
 DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
 DocType: Patient Medical Record,Patient Medical Record,Sjúkratryggingaskrá
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Íþróttir
@@ -2501,8 +2509,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,alls Raunveruleg
 DocType: Lab Test UOM,Test UOM,Prófaðu UOM
 DocType: Student Siblings,Student Siblings,Student Systkini
+DocType: Subscription Plan Detail,Subscription Plan Detail,Áskriftaráætlun smáatriði
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unit
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Vinsamlegast tilgreinið Company
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Vinsamlegast tilgreinið Company
 ,Customer Acquisition and Loyalty,Viðskiptavinur Kaup og Hollusta
 DocType: Asset Maintenance Task,Maintenance Task,Viðhaldsviðskipti
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Vinsamlegast stilltu B2C takmörk í GST stillingum.
@@ -2516,6 +2525,7 @@
 ,BOM Search,BOM leit
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Heildarkostnaður neyslukostnaðar (í gegnum vöruskipti)
 DocType: Hub Settings,Company Registered,Fyrirtæki skráð
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Til dagsetning má ekki vera minna en Frá Dagsetning
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Birta &quot;Í lager&quot; eða &quot;Ekki í lager&quot; á Hub byggt á lager sem er í boði á þessu vörugeymslu.
 DocType: Vehicle,Fuel Type,eldsneytistegund
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vinsamlegast tilgreinið gjaldmiðil í félaginu
@@ -2523,17 +2533,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock jafnvægi í Batch {0} verður neikvætt {1} fyrir lið {2} í Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Eftirfarandi efni beiðnir hafa verið hækkaðir sjálfvirkt miðað aftur röð stigi atriðisins
 DocType: Email Digest,Pending Sales Orders,Bíður sölu skipunum
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
 DocType: Employee,Create User Permission,Búðu til notendaleyfi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Healthcare Settings,Remind Before,Minna á áður
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM viðskipta þáttur er krafist í röð {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
 DocType: Salary Component,Deduction,frádráttur
 DocType: Item,Retain Sample,Halda sýni
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Frá Time og til tími er nauðsynlegur.
 DocType: Stock Reconciliation Item,Amount Difference,upphæð Mismunur
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vinsamlegast sláðu Starfsmaður Id þessarar velta manneskja
 DocType: Territory,Classification of Customers by region,Flokkun viðskiptavina eftir svæðum
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Í framleiðslu
@@ -2543,8 +2554,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Útreiknuð Bank Yfirlýsing jafnvægi
 DocType: Normal Test Template,Normal Test Template,Venjulegt próf sniðmát
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,fatlaður notandi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Tilvitnun
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Ekki er hægt að stilla móttekið RFQ til neins vitna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Tilvitnun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Ekki er hægt að stilla móttekið RFQ til neins vitna
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Samtals Frádráttur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Veldu reikning til að prenta í reiknings gjaldmiðli
@@ -2552,7 +2563,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Þetta byggist á viðskiptum gegn þessum sjúklingum. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,kostnaður Uppfært
 DocType: Patient,Date of Birth,Fæðingardagur
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** táknar fjárhagsári. Öll bókhald færslur og aðrar helstu viðskipti eru raktar gegn ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Viðskiptavinur / Lead Address
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Birgir Scorecard Skipulag
@@ -2563,14 +2574,15 @@
 DocType: Work Order Operation,Actual Operation Time,Raunveruleg Operation Time
 DocType: Authorization Rule,Applicable To (User),Gildir til (User)
 DocType: Purchase Taxes and Charges,Deduct,draga
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Starfslýsing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Starfslýsing
 DocType: Student Applicant,Applied,Applied
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-opinn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-opinn
 DocType: Sales Invoice Item,Qty as per Stock UOM,Magn eins og á lager UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Sala Afsláttur
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sérstafir nema &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ekki leyfð í nafngiftir röð"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Halda utan um sölu herferðir. Haldið utan um leiðir, tilvitnanir, Sales Order etc frá herferðir til að meta arðsemi fjárfestingarinnar."
+DocType: Department Approver,Approver,samþykkjari
 ,SO Qty,SO Magn
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Reitinn til hluthafa má ekki vera auður
 DocType: Guardian,Work Address,vinna Address
@@ -2584,21 +2596,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total úthlutað magn (Company Gjaldmiðill)
 DocType: Purchase Order Item,To be delivered to customer,Til að vera frelsari til viðskiptavina
 DocType: BOM,Scrap Material Cost,Rusl efniskostnaði
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial Nei {0} er ekki tilheyra neinum Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial Nei {0} er ekki tilheyra neinum Warehouse
 DocType: Grant Application,Email Notification Sent,Email tilkynning send
 DocType: Purchase Invoice,In Words (Company Currency),Í orðum (Company Gjaldmiðill)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Vörunúmer, vörugeymsla, magn er krafist í röð"
-DocType: Pricing Rule,Supplier,birgir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Vörunúmer, vörugeymsla, magn er krafist í röð"
+DocType: Bank Guarantee,Supplier,birgir
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Sýna greiðsluupplýsingar
 DocType: Consultation,Consultation Time,Samráðstími
 DocType: C-Form,Quarter,Quarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Ýmis Útgjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Ýmis Útgjöld
 DocType: Global Defaults,Default Company,Sjálfgefið Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnað eða Mismunur reikningur er nauðsynlegur fyrir lið {0} eins og það hefur áhrif á heildina birgðir gildi
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nafn banka
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Starfsmaður Lán Reikningur
 DocType: Leave Application,Total Leave Days,Samtals leyfisdaga
 DocType: Email Digest,Note: Email will not be sent to disabled users,Ath: Email verður ekki send til fatlaðra notenda
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Fjöldi samskipta
@@ -2613,7 +2624,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Þyngd (í kílógramm)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kaflar / kafli_nafn slepptu sjálfkrafa eftir að þú hefur vistað kafla.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Vinsamlegast settu GST reikninga í GST stillingum
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Vinsamlegast settu GST reikninga í GST stillingum
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tegund viðskipta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vinsamlegast veldu úthlutað magn, tegundir innheimtuseðla og reikningsnúmerið í atleast einni röð"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kostnaður við nýja kaup
@@ -2622,12 +2633,13 @@
 DocType: Grant Application,Grant Description,Grant Lýsing
 DocType: Purchase Invoice Item,Rate (Company Currency),Hlutfall (Company Gjaldmiðill)
 DocType: Student Guardian,Others,aðrir
+DocType: Subscription,Discounts,Afslættir
 DocType: Payment Entry,Unallocated Amount,óráðstafað Upphæð
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Get ekki fundið samsvörun hlut. Vinsamlegast veldu einhverja aðra verðmæti fyrir {0}.
 DocType: POS Profile,Taxes and Charges,Skattar og gjöld
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A vöru eða þjónustu sem er keypt, selt eða haldið á lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ekki fleiri uppfærslur
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Get ekki valið gjald tegund sem &quot;On Fyrri Row Upphæð &#39;eða&#39; Á fyrri röðinni Samtals &#39;fyrir fyrstu röðinni
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Get ekki valið gjald tegund sem &quot;On Fyrri Row Upphæð &#39;eða&#39; Á fyrri röðinni Samtals &#39;fyrir fyrstu röðinni
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Þetta nær yfir öll stigatöflur sem tengjast þessu skipulagi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barnið Item ætti ekki að vera Product Knippi. Fjarlægðu hlut `{0}` og vista
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2635,45 +2647,48 @@
 DocType: Vehicle Service,Service Item,þjónusta Item
 DocType: Bank Guarantee,Bank Guarantee,Bankábyrgð
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; til að fá áætlun
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
 DocType: Bin,Ordered Quantity,Raðaður Magn
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",td &quot;Byggja verkfæri fyrir smiðirnir&quot;
 DocType: Grading Scale,Grading Scale Intervals,Flokkun deilingargildi
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Hagnaður ársins
+DocType: Bank Guarantee,Name of Bank,Nafn bankans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bókhald Entry fyrir {2} Aðeins er hægt að gera í gjaldmiðli: {3}
 DocType: Fee Schedule,In Process,Í ferli
 DocType: Authorization Rule,Itemwise Discount,Itemwise Afsláttur
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tré ársreikning.
+DocType: Bank Guarantee,Reference Document Type,Tilvísun skjal tegund
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cash Flow Kortlagning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} gegn Velta Order {1}
 DocType: Account,Fixed Asset,fast Asset
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,serialized Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Tölvupóstur fannst ekki í vanrækslu sambandi
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Búa til leyndarmál
-DocType: Employee Loan,Account Info,Reikningur Upplýsingar
+DocType: Loan,Account Info,Reikningur Upplýsingar
 DocType: Activity Type,Default Billing Rate,Sjálfgefið Billing Rate
 DocType: Fees,Include Payment,Hafa greiðslu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Nemendahópar búin til.
 DocType: Sales Invoice,Total Billing Amount,Alls innheimtu upphæð
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Forrit í gjaldskrárbyggingu og nemendahópnum {0} eru mismunandi.
 DocType: Fee Schedule,Receivable Account,viðskiptakröfur Reikningur
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Velta Order til greiðslu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,forstjóri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,forstjóri
 DocType: Purchase Invoice,With Payment of Tax,Með greiðslu skatta
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Krafa Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE FOR SUPPLIER
 DocType: Land Unit,Is Container,Er ílát
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Þetta verður dagur 1 í ræktunarferlinu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Vinsamlegast veldu réttan reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Vinsamlegast veldu réttan reikning
 DocType: Purchase Invoice Item,Weight UOM,þyngd UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Listi yfir tiltæka hluthafa með folíumnúmerum
 DocType: Salary Structure Employee,Salary Structure Employee,Laun Uppbygging Starfsmaður
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Sýna Variant Eiginleikar
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Sýna Variant Eiginleikar
 DocType: Student,Blood Group,Blóðflokkur
 DocType: Course,Course Name,Auðvitað Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Notendur sem getur samþykkt yfirgefa forrit tiltekins starfsmanns
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Skrifstofa útbúnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Skrifstofa útbúnaður
 DocType: Purchase Invoice Item,Qty,Magn
 DocType: Fiscal Year,Companies,Stofnanir
 DocType: Supplier Scorecard,Scoring Setup,Skora uppsetning
@@ -2692,7 +2707,7 @@
 DocType: Stock Entry,Total Incoming Value,Alls Komandi Value
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Skuldfærslu Til er krafist
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Kaupverðið List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sniðmát af birgðatölumörkum.
 DocType: Job Offer Term,Offer Term,Tilboð Term
 DocType: Asset,Quality Manager,gæðastjóri
@@ -2704,13 +2719,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Samtals Ógreitt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 DocType: Supplier Scorecard,Supplier Score,Birgiratriði
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Alls reikningsfærð Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Alls reikningsfærð Amt
 DocType: Supplier,Warn RFQs,Varða RFQs
 DocType: BOM,Conversion Rate,Viðskiptahlutfallsbil
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Vöruleit
 DocType: Assessment Plan,To Time,til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Samþykkir hlutverk (að ofan er leyft gildi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Inneign á reikninginn verður að vera Greiðist reikning
+DocType: Loan,Total Amount Paid,Heildarfjárhæð greitt
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Vinsamlegast veljið Student Entrance sem er skylt fyrir greiddan nemanda
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM endurkvæmni: {0} er ekki hægt að foreldri eða barn {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vinsamlegast veldu verðlista til að birta verðlagningu
@@ -2720,18 +2736,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Verðlisti {0} er óvirk
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Lokið Magn má ekki vera meira en {1} fyrir aðgerð {2}
 DocType: Manufacturing Settings,Allow Overtime,leyfa yfirvinnu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} er ekki hægt að uppfæra með Stock Sátt, vinsamlegast notaðu Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} er ekki hægt að uppfæra með Stock Sátt, vinsamlegast notaðu Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Þjálfun Event Starfsmaður
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Hámarksýni - {0} er hægt að halda í lotu {1} og lið {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Bæta við tímaslóðum
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Numbers krafist fyrir lið {1}. Þú hefur veitt {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Numbers krafist fyrir lið {1}. Þú hefur veitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Núverandi Verðmat Rate
 DocType: Training Event,Advance,Advance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,til að endurreisa aftur.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless greiðslu gátt stillingar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Gengishagnaður / tap
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Gengishagnaður / tap
 DocType: Opportunity,Lost Reason,Lost Ástæða
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Reikningur {1} tilheyrir ekki fyrirtæki {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Reikningur {1} tilheyrir ekki fyrirtæki {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Gat ekki fundið DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ný Address
 DocType: Quality Inspection,Sample Size,Prufustærð
@@ -2750,7 +2765,6 @@
 DocType: Bin,Actual Quantity,Raunveruleg Magn
 DocType: Shipping Rule,example: Next Day Shipping,dæmi: Næsti dagur Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Nei {0} fannst ekki
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Áskriftin hefur verið {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Gjaldskrá áætlun
 DocType: Fee Schedule Program,Student Batch,Student Hópur
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,gera Student
@@ -2765,14 +2779,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-verslun GSTIN
 DocType: Sales Order,Not Delivered,ekki Skilað
 ,Bank Clearance Summary,Bank Úthreinsun Yfirlit
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Búa til og stjórna daglega, vikulega og mánaðarlega email meltir."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Búa til og stjórna daglega, vikulega og mánaðarlega email meltir."
 DocType: Appraisal Goal,Appraisal Goal,Úttekt Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Tillaga Flokkur?
 DocType: Stock Reconciliation Item,Current Amount,Núverandi Upphæð
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Byggingar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Byggingar
 DocType: Fee Schedule,Fee Structure,Gjald Uppbygging
 DocType: Timesheet Detail,Costing Amount,kosta Upphæð
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 DocType: Student Admission Program,Application Fee,Umsókn Fee
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Senda Laun Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm afsláttur fyrir Liður {0} er {1}%
@@ -2780,12 +2793,13 @@
 DocType: Sales Partner,Address & Contacts,Heimilisfang og Tengiliðir
 DocType: SMS Log,Sender Name,Sendandi Nafn
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Landbúnaður Greining Criteria
+DocType: HR Settings,Leave Approval Notification Template,Skildu eftir skilmálaskilmálum
 DocType: POS Profile,[Select],[Veldu]
 DocType: Vital Signs,Blood Pressure (diastolic),Blóðþrýstingur (diastolic)
 DocType: SMS Log,Sent To,send til
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Gera sölureikning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,hugbúnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,hugbúnaður
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
 DocType: Company,For Reference Only.,Til viðmiðunar aðeins.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Læknir {0} ekki fáanleg á {1}
@@ -2803,7 +2817,7 @@
 DocType: Employee,New Workplace,ný Vinnustaðurinn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Efni neysla
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Setja sem Lokað
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ekkert atriði með Strikamerki {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ekkert atriði með Strikamerki {0}
 DocType: Normal Test Items,Require Result Value,Krefjast niðurstöður gildi
 DocType: Item,Show a slideshow at the top of the page,Sýnið skyggnusýningu efst á síðunni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2818,19 +2832,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Engin virk eða vanræksla Laun Uppbygging finna fyrir starfsmann {0} fyrir gefnar dagsetningar
 DocType: Leave Block List,Allow Users,leyfa notendum
 DocType: Purchase Order,Customer Mobile No,Viðskiptavinur Mobile Nei
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Fastir
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Upplýsingar um sjóðstreymi fyrir sjóðstreymi
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Lánastjórnun
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track sérstakt Vaxtatekjur og vaxtagjöld fyrir Þrep vöru eða deildum.
 DocType: Rename Tool,Rename Tool,endurnefna Tól
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Uppfæra Kostnaður
 DocType: Item Reorder,Item Reorder,Liður Uppröðun
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Sýna Laun Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Efni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Sýna Laun Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Efni
 DocType: Fees,Send Payment Request,Senda greiðslubók
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tilgreina rekstur, rekstrarkostnaði og gefa einstakt notkun eigi að rekstri þínum."
 DocType: Water Analysis,Origin,Uppruni
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Veldu breyting upphæð reiknings
 DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
 DocType: Naming Series,User must always select,Notandi verður alltaf að velja
@@ -2845,14 +2859,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Er tekjuskattsskuldbinding
 DocType: Grading Scale Interval,Grade Description,gráðu Lýsing
 DocType: Stock Entry,Purchase Receipt No,Kvittun Nei
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Earnest Money
 DocType: Sales Invoice, Shipping Bill Number,Shipping Bill Number
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,rekjanleiki
 DocType: Asset Maintenance Log,Actions performed,Aðgerðir gerðar
 DocType: Cash Flow Mapper,Section Leader,Kafli Leader
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Uppruni Funds (Skuldir)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Uppruni Funds (Skuldir)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Magn í röð {0} ({1}) verður að vera það sama og framleiddar magn {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Starfsmaður
+DocType: Bank Guarantee,Fixed Deposit Number,Fast innborgunarnúmer
 DocType: Asset Repair,Failure Date,Bilunardagur
 DocType: Sample Collection,Collected Time,Safnað tíma
 DocType: Company,Sales Monthly History,Sala mánaðarlega sögu
@@ -2869,10 +2884,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Ertu viss um að þú viljir hætta við þessa stefnumót?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Herbergi Verðlagning Pakki
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,velta Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Rename Tool,File to Rename,Skrá til Endurnefna
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Fáðu áskriftaruppfærslur
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Reikningur {0} passar ekki við fyrirtæki {1} í reikningsaðferð: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Tilgreint BOM {0} er ekki til fyrir lið {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Námskeið:
@@ -2882,7 +2898,7 @@
 DocType: Notification Control,Expense Claim Approved,Expense Krafa Samþykkt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Engar vinnuskipanir búin til
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Laun Slip starfsmanns {0} þegar búin á þessu tímabili
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnaður vegna aðkeyptrar atriði
 DocType: Selling Settings,Sales Order Required,Velta Order Required
 DocType: Purchase Invoice,Credit To,Credit Til
@@ -2900,7 +2916,7 @@
 DocType: Request for Quotation Supplier,No Quote,Engin tilvitnun
 DocType: Warranty Claim,Raised By,hækkaðir um
 DocType: Payment Gateway Account,Payment Account,greiðsla Reikningur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Net Breyta viðskiptakrafna
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,jöfnunaraðgerðir Off
 DocType: Job Offer,Accepted,Samþykkt
@@ -2912,7 +2928,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vinsamlegast vertu viss um að þú viljir virkilega að eyða öllum viðskiptum fyrir þetta fyrirtæki. stofngögn haldast eins og það er. Þessi aðgerð er ekki hægt að afturkalla.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,leitarniðurstöður
 DocType: Room,Room Number,Room Number
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ógild vísun {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ógild vísun {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Sendingar Regla Label
 DocType: Journal Entry Account,Payroll Entry,Launaskrá
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Skoða gjaldskrár
@@ -2922,7 +2938,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Dæmi
 DocType: Item Variant Settings,Allow Rename Attribute Value,Leyfa Endurnefna Eiginleikar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
 DocType: Restaurant,Invoice Series Prefix,Reiknivél Reiknivél
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
@@ -2930,8 +2946,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vinsamlegast sláðu Planned Magn fyrir lið {0} á röð {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Samþætting Google korta er ekki virk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ekki lögð
+DocType: Subscription,Trialling,Skrímsli
 DocType: Member,Membership Expiry Date,Félagsdagur
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} verður að vera neikvætt í staðinn skjal
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} verður að vera neikvætt í staðinn skjal
 ,Minutes to First Response for Issues,Mínútur til First Response fyrir málefni
 DocType: Purchase Invoice,Terms and Conditions1,Skilmálar og Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,The nafn af the Institute sem þú ert að setja upp þetta kerfi.
@@ -2950,7 +2967,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Mælieining
 DocType: Fiscal Year,Year End Date,Ár Lokadagur
 DocType: Task Depends On,Task Depends On,Verkefni veltur á
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,tækifæri
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,tækifæri
 DocType: Operation,Default Workstation,Sjálfgefið Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kostnað Krafa Samþykkt skilaboð
 DocType: Payment Entry,Deductions or Loss,Frádráttur eða tap
@@ -2988,7 +3005,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Leyfi án launa passar ekki við viðurkenndar Leave Umsókn færslur
 DocType: Campaign,Campaign-.####,Herferð -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næstu skref
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gerðu innheimtu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Eftirstöðvar
@@ -2997,7 +3014,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Strikamerki {0} er ekki gilt {1} kóða
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,árslok
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
 DocType: Driver,Driver,Ökumaður
 DocType: Vital Signs,Nutrition Values,Næringargildi
 DocType: Lab Test Template,Is billable,Er gjaldfært
@@ -3008,7 +3025,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Raunbyrjunardagsetning (með Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Þetta er dæmi website sjálfvirkt mynda frá ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Samtals fyrirfram upphæð getur ekki verið hærri en heildarfjölda krafna
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Samtals fyrirfram upphæð getur ekki verið hærri en heildarfjölda krafna
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3043,7 +3060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Geta ekki framleitt meira ítarefni {0} en Sales Order Magn {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Veldu Eiginleikar
 DocType: Purchase Invoice,Reason For Issuing document,Ástæða fyrir útgáfu skjals
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Næsta Samband með getur ekki verið sama og Lead netfanginu
 DocType: Tax Rule,Billing City,Innheimta City
@@ -3060,7 +3077,8 @@
 DocType: Warranty Claim,Service Address,þjónusta Address
 DocType: Asset Maintenance Task,Calibration,Kvörðun
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} er félagsfrí
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Húsgögnum og innréttingum
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Leyfi Tilkynning um leyfi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Húsgögnum og innréttingum
 DocType: Item,Manufacture,Framleiðsla
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Uppsetningarfyrirtæki
 ,Lab Test Report,Lab Test Report
@@ -3076,7 +3094,6 @@
 DocType: Crop,Planting Area,Gróðursetningarsvæði
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Alls (Magn)
 DocType: Installation Note Item,Installed Qty,uppsett Magn
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Þetta gæti verið vegna nokkurra ógilda netfanga í
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Þú bætti við
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Þjálfun Niðurstaða
@@ -3086,16 +3103,17 @@
 DocType: Products Settings,Products per Page,Vörur á síðu
 DocType: Stock Ledger Entry,Outgoing Rate,Outgoing Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Stofnun útibú húsbóndi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,eða
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,eða
 DocType: Sales Order,Billing Status,Innheimta Staða
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Tilkynna um vandamál
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,gagnsemi Útgjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,gagnsemi Útgjöld
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} hefur ekki reikning {2} eða þegar samsvarandi gegn öðrum skírteini
 DocType: Supplier Scorecard Criteria,Criteria Weight,Viðmiðunarþyngd
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Skildu eftir samþykki tilkynningu
 DocType: Buying Settings,Default Buying Price List,Sjálfgefið Buying Verðskrá
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Laun Slip Byggt á tímaskráningar
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kaupgengi
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Kaupgengi
 DocType: Notification Control,Sales Order Message,Velta Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Default gildi eins Company, Gjaldmiðill, yfirstandandi reikningsári, o.fl."
 DocType: Payment Entry,Payment Type,greiðsla Type
@@ -3117,6 +3135,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Shopping Cart Stillingar
 DocType: Journal Entry,Accounting Entries,Bókhalds Færslur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ef valin verðlagning er gerð fyrir &#39;Rate&#39; mun hún skrifa yfir Verðskrá. Verðlagning Regluhlutfall er endanlegt hlutfall, þannig að ekki skal nota frekari afslátt. Þess vegna, í viðskiptum eins og söluskilningi, innkaupapöntun o.þ.h., verður það sótt í &#39;Rate&#39; reitinn, frekar en &#39;Verðskrárhlutfall&#39; reitinn."
+DocType: Journal Entry,Paid Loan,Greiddur lán
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Afrit Entry. Vinsamlegast athugaðu Heimild Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Tilvísunardagsetning
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3133,7 +3152,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Viðhald Dagskrá er ekki mynda að öllum þeim atriðum. Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
 ,To Produce,Að framleiða
 apps/erpnext/erpnext/config/hr.py +93,Payroll,launaskrá
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Fyrir röð {0} í {1}. Til eru {2} í lið gengi, raðir {3} skal einnig"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Fyrir röð {0} í {1}. Til eru {2} í lið gengi, raðir {3} skal einnig"
 DocType: Patient Service Unit,Parent Service Unit,Foreldraþjónustudeild
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,gera notanda
 DocType: Packing Slip,Identification of the package for the delivery (for print),Auðkenning pakka fyrir afhendingu (fyrir prentun)
@@ -3151,7 +3170,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,tekjur Reikningur
 DocType: Payment Request,Amount in customer's currency,Upphæð í mynt viðskiptavinarins
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Afhending
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Afhending
 DocType: Volunteer,Weekdays,Virka daga
 DocType: Stock Reconciliation Item,Current Qty,Núverandi Magn
 DocType: Restaurant Menu,Restaurant Menu,Veitingahús Valmynd
@@ -3159,7 +3178,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Stilltu sjálfgefinn birgðareikning fyrir varanlegan birgða
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Stilltu sjálfgefinn birgðareikning fyrir varanlegan birgða
 DocType: Item Reorder,Material Request Type,Efni Beiðni Type
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Senda Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage er fullt, ekki spara"
@@ -3167,10 +3186,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Herbergi getu
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Nú þegar er skrá fyrir hlutinn {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Þú munt missa skrár af áður búin reikningum. Ertu viss um að þú viljir endurræsa þessa áskrift?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Skráningargjald
 DocType: Budget,Cost Center,kostnaður Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,skírteini #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,skírteini #
 DocType: Notification Control,Purchase Order Message,Purchase Order skilaboð
 DocType: Tax Rule,Shipping Country,Sendingar Country
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Fela Tax Auðkenni viðskiptavinar frá sölu viðskiptum
@@ -3179,20 +3199,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Verðlagning Regla er gert til að skrifa verðskrá / define afsláttur hlutfall, byggt á einhverjum forsendum."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse er einungis hægt að breyta í gegnum Kauphöll Entry / Afhending Note / Kvittun
 DocType: Employee Education,Class / Percentage,Flokkur / Hlutfall
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Forstöðumaður markaðssetning og sala
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Forstöðumaður markaðssetning og sala
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Tekjuskattur
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Vísbendingar um Industry tegund.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Farðu í Letterheads
+DocType: Subscription,Cancel At End Of Period,Hætta við lok tímabils
 DocType: Item Supplier,Item Supplier,Liður Birgir
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Engar atriði valdir til flutnings
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Engar atriði valdir til flutnings
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Öllum vistföngum.
 DocType: Company,Stock Settings,lager Stillingar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samruni er aðeins mögulegt ef eftirfarandi eiginleikar eru sömu í báðum skrám. Er Group, Root Tegund, Company"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Hagnaður / tap Asset förgun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Hagnaður / tap Asset förgun
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Aðeins umsækjandi með staðalinn &quot;Samþykkt&quot; verður valinn í töflunni hér að neðan.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Reikningsnúmer fyrir reikning {0} er ekki tiltækt. <br> Vinsamlegast settu upp reikningsskýrsluna þína rétt.
 DocType: Task,Depends on Tasks,Fer á Verkefni
@@ -3207,6 +3228,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ekki til á lager
 DocType: Volunteer,Volunteer Skills,Sjálfboðaliða
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Tilvísun skjal nafn
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skattar og gjöld Frá
 apps/erpnext/erpnext/hooks.py +142,Issues,Vandamál
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Staða verður að vera einn af {0}
@@ -3220,7 +3242,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} er óvirk
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Auka stór
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Auka stór
+DocType: Loan,Loan Application,Lán umsókn
 DocType: Crop,Scientific Name,Vísindalegt nafn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Samtals Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Veldu aftur, ef valinn tengiliður er breytt eftir að vista"
@@ -3229,13 +3252,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ávísun Number
 ,Sales Browser,velta Browser
 DocType: Journal Entry,Total Credit,alls Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Viðvörun: Annar {0} # {1} er til gegn hlutabréfum færslu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Viðvörun: Annar {0} # {1} er til gegn hlutabréfum færslu {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Útlán og kröfur (inneign)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skuldunautar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,stór
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,stór
 DocType: Homepage Featured Product,Homepage Featured Product,Heimasíðan Valin Vara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Allir Námsmat Hópar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Allir Námsmat Hópar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nýtt Warehouse Name
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Alls {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territory
@@ -3256,9 +3279,10 @@
 DocType: Fees,Fees,Gjöld
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tilgreina Exchange Rate að breyta einum gjaldmiðli í annan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Tilvitnun {0} er hætt
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Heildarstöðu útistandandi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Heildarstöðu útistandandi
 DocType: Sales Partner,Targets,markmið
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Vinsamlegast skráðu SIREN númerið í upplýsingaskránni
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Price List,Price List Master,Verðskrá Master
 DocType: GST Account,CESS Account,CESS reikning
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Öll sala Viðskipti má tagged móti mörgum ** sölufólk ** þannig að þú getur sett og fylgjast markmið.
@@ -3267,6 +3291,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Veldu sjúkling
 DocType: Price List,Applicable for Countries,Gildir fyrir löndum
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameter Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Aðeins Skildu Umsóknir með stöðu &quot;Samþykkt&quot; og &quot;Hafnað &#39;er hægt að skila
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Group Name er skylda í röð {0}
 DocType: Homepage,Products to be shown on website homepage,Vörur birtist á heimasíðu heimasíðuna
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Þetta er rót viðskiptavinur hóp og ekki hægt að breyta.
@@ -3299,14 +3324,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Reikningur er þegar búinn til fyrir alla reikningstíma
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nafn villa: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Er fjármagnskostnaður
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Mæting fyrir starfsmann {0} er þegar merkt
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Mæting fyrir starfsmann {0} er þegar merkt
 DocType: Packing Slip,If more than one package of the same type (for print),Ef fleiri en einn pakka af sömu gerð (fyrir prentun)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vinsamlegast stilltu sjálfgefinn viðskiptavin í veitingastaðnum
 ,Salary Register,laun Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
-DocType: C-Form Invoice Detail,Net Total,Net Total
+DocType: Subscription,Net Total,Net Total
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Sjálfgefið BOM fannst ekki fyrir lið {0} og verkefni {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Skilgreina ýmsar tegundir lána
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Skilgreina ýmsar tegundir lána
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,útistandandi fjárhæð
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tími (í mín)
@@ -3338,11 +3363,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Rót Reikningur verður að vera hópur
 DocType: Drug Prescription,Drug Prescription,Lyfseðilsskyld lyf
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Launað / Lokað
+DocType: Loan,Repaid/Closed,Launað / Lokað
 DocType: Item,Total Projected Qty,Alls spáð Magn
 DocType: Monthly Distribution,Distribution Name,Dreifing Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verðmatshlutfall fannst ekki fyrir lið {0}, sem þarf til að gera bókhaldslegar færslur fyrir {1} {2}. Ef hluturinn er í viðskiptum sem núllmatshlutfall í {1} skaltu nefna það í {1} hlutatöflunni. Annars skaltu vinsamlegast stofna viðskipti í viðskiptum fyrir vöruna eða nefna verðmat í hlutaskránni og reyndu síðan að senda inn / aftaka þessa færslu"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Course,Course Code,Auðvitað Code
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Quality Inspection krafist fyrir lið {0}
 DocType: POS Settings,Use POS in Offline Mode,Notaðu POS í ótengdu ham
@@ -3362,16 +3386,15 @@
 DocType: Purchase Invoice,Deemed Export,Álitinn útflutningur
 DocType: Stock Entry,Material Transfer for Manufacture,Efni Transfer fyrir Framleiðsla
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Afsláttur Hlutfall hægt að beita annaðhvort á móti verðskrá eða fyrir alla verðlista.
-DocType: Subscription,Half-yearly,Hálfsárs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Bókhalds Færsla fyrir Lager
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Þú hefur nú þegar metið mat á viðmiðunum {}.
 DocType: Vehicle Service,Engine Oil,Vélarolía
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Vinna Pantanir Búið til: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Vinna Pantanir Búið til: {0}
 DocType: Sales Invoice,Sales Team1,velta TEAM1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Liður {0} er ekki til
 DocType: Sales Invoice,Customer Address,viðskiptavinur Address
-DocType: Employee Loan,Loan Details,lán Nánar
+DocType: Loan,Loan Details,lán Nánar
 DocType: Company,Default Inventory Account,Sjálfgefin birgðareikningur
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio númerin passa ekki saman
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
@@ -3383,19 +3406,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tengill til allra landsdeilda þar sem skógurinn er að vaxa
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Get ekki skila meira en {1} fyrir lið {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Get ekki skila meira en {1} fyrir lið {2}
 DocType: Item Group,Show this slideshow at the top of the page,Sýna þessa myndasýningu efst á síðunni
 DocType: BOM,Item UOM,Liður UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skatthlutfall Eftir Afsláttur Upphæð (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target vöruhús er nauðsynlegur fyrir röð {0}
 DocType: Cheque Print Template,Primary Settings,Primary Stillingar
 DocType: Purchase Invoice,Select Supplier Address,Veldu Birgir Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Bæta Starfsmenn
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Bæta Starfsmenn
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theory
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Reikningur {0} er frosinn
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Lögaðili / Dótturfélag með sérstakri Mynd af reikninga tilheyra stofnuninni.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3415,11 +3438,10 @@
 DocType: SMS Log,No of Sent SMS,Ekkert af Sendir SMS
 DocType: Antibiotic,Healthcare Administrator,Heilbrigðisstarfsmaður
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Stilltu mark
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
 DocType: Dosage Strength,Dosage Strength,Skammtastyrkur
 DocType: Account,Expense Account,Expense Reikningur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,hugbúnaður
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Colour
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Colour
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Mat Plan Viðmið
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Upphafsdagur er nauðsynlegur fyrir valið atriði
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Hindra innkaupapantanir
@@ -3432,18 +3454,18 @@
 DocType: Patient,Personal and Social History,Persónuleg og félagsleg saga
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Notandi {0} búinn til
 DocType: Fee Schedule,Fee Breakup for each student,Gjaldskrá fyrir hverja nemanda
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Veldu Hlaupa dreifingu til ójafnt dreifa skotmörk yfir mánuði.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Breyta kóða
 DocType: Purchase Invoice Item,Valuation Rate,verðmat Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
 DocType: Purchase Invoice,Availed ITC Cess,Notaði ITC Cess
 ,Student Monthly Attendance Sheet,Student Monthly Aðsókn Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Sendingarregla gildir aðeins um sölu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Date
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,þangað
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,þangað
 DocType: Rename Tool,Rename Log,endurnefna Innskráning
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Nemandi hópur eða námskeiði er skylt
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Halda Innheimtustillingar Hours og vinnutími sama á tímaskráningar
@@ -3463,7 +3485,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Skráðu vörur þínar eða þjónustu sem þú kaupir eða selur.
 DocType: Water Analysis,Storage Temperature,Geymslu hiti
 DocType: Employee Attendance Tool,Unmarked Attendance,ómerkt Aðsókn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Rannsóknarmaður
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Rannsóknarmaður
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Innritun Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Upphafsdagur ætti að vera minni en lokadagur fyrir verkefni {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nafn eða netfang er nauðsynlegur
@@ -3476,7 +3498,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og RFQs til þessa birgja skal gefa út með varúð.
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial Nei {0} búin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial Nei {0} búin
 DocType: Homepage,Company Description for website homepage,Fyrirtæki Lýsing á heimasíðu heimasíðuna
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Fyrir þægindi viðskiptavina, þessi númer er hægt að nota á prenti sniðum eins reikninga og sending minnismiða"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
@@ -3486,11 +3508,10 @@
 DocType: Employee,You can enter any date manually,Þú getur slegið inn hvaða dagsetningu handvirkt
 DocType: Healthcare Settings,Result Printed,Niðurstaða prentuð
 DocType: Asset Category Account,Depreciation Expense Account,Afskriftir kostnað reiknings
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,reynslutíma
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Skoða {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,reynslutíma
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Aðeins blaða hnútar mega í viðskiptum
 DocType: Project,Total Costing Amount (via Timesheets),Samtals kostnaðarverð (með tímariti)
-DocType: Employee Advance,Expense Approver,Expense samþykkjari
+DocType: Department,Expense Approver,Expense samþykkjari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
 DocType: Project,Hourly,Klukkutíma
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group til Group
@@ -3499,7 +3520,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,til DATETIME
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs fyrir að viðhalda SMS-sendingar stöðu
 DocType: Accounts Settings,Make Payment via Journal Entry,Greiða í gegnum dagbókarfærslu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Prentað á
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Prentað á
 DocType: Item,Inspection Required before Delivery,Skoðun Áskilið fyrir fæðingu
 DocType: Item,Inspection Required before Purchase,Skoðun Áskilið áður en kaupin
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,bið Starfsemi
@@ -3509,7 +3530,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,lágmarks magn pöntunar
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Stofnunin þín
 DocType: Fee Component,Fees Category,Gjald Flokkur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Tilkynna starfsmann
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sláðu inn heiti herferðarinnar ef uppspretta rannsókn er herferð
@@ -3519,7 +3540,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Uppröðun Level
 DocType: Company,Chart Of Accounts Template,Mynd af reikningum sniðmáti
 DocType: Attendance,Attendance Date,Aðsókn Dagsetning
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Laun Breakup byggt á launin og frádráttur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Reikningur með hnúta barn er ekki hægt að breyta í höfuðbók
 DocType: Purchase Invoice Item,Accepted Warehouse,Samþykkt vöruhús
@@ -3527,10 +3548,11 @@
 DocType: Item,Valuation Method,Verðmatsaðferð
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,velta Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,afrit færslu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,afrit færslu
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Sláðu inn heiti styrkþega áður en þú sendir inn.
 DocType: Program Enrollment Tool,Get Students,fá Nemendur
 DocType: Serial No,Under Warranty,undir ábyrgð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Villa]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Villa]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Í orðum verður sýnileg þegar þú hefur vistað Velta Order.
 ,Employee Birthday,starfsmaður Afmæli
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Vinsamlegast veldu Lokadagsetning fyrir lokið viðgerð
@@ -3549,7 +3571,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Fyrirvara fyrir undirverktaka
 DocType: Payment Reconciliation Invoice,Invoice Number,Reikningsnúmer
 DocType: Shopping Cart Settings,Orders,pantanir
-DocType: Employee Leave Approver,Leave Approver,Skildu samþykkjari
+DocType: Department,Leave Approver,Skildu samþykkjari
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vinsamlegast veldu lotu
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Mat Group Name
@@ -3593,7 +3615,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Upprunalega fyrir viðtakanda
 DocType: Asset Category Account,Accumulated Depreciation Account,Uppsöfnuðum afskriftum Reikningur
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Þessi tölvupóstur er autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Frysta lager Entries
 DocType: Program Enrollment,Boarding Student,Stúdentsprófessor
 DocType: Asset,Expected Value After Useful Life,Væntanlegur Value Eftir gagnlegur líf
@@ -3618,21 +3639,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Aðsókn Record {0} hendi á móti Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Tilvísun # {0} dagsett {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Afskriftir Féll út vegna ráðstöfunar eigna
-DocType: Member,Member,Meðlimur
+DocType: Loan,Member,Meðlimur
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,stjórna Heimilisföng
 DocType: Work Order Item,Work Order Item,Vinna pöntunarhlut
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Serial No,Warranty / AMC Details,Ábyrgð í / AMC Nánar
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
 DocType: Journal Entry,User Remark,Notandi Athugasemd
 DocType: Lead,Market Segment,Market Segment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landbúnaðarstjóri
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Starfsmaður Innri Vinna Saga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Lokun (Dr)
 DocType: Cheque Print Template,Cheque Size,ávísun Size
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial Nei {0} ekki til á lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial Nei {0} ekki til á lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Tax sniðmát til að selja viðskiptum.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skrifaðu Off Útistandandi fjárhæð
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Reikningur {0} passar ekki við fyrirtæki {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,Sjálfgefið Stock UOM
 DocType: Asset,Number of Depreciations Booked,Fjöldi Afskriftir Bókað
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Magn Samtals
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Sem starfsmaður láni: {0}
 DocType: Landed Cost Item,Receipt Document,kvittun Document
 DocType: Employee Education,School/University,Skóli / University
 DocType: Payment Request,Reference Details,Tilvísun Upplýsingar
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,Tvöfaldur Minnkandi Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Lokað þess geta ekki verið lokað. Unclose að hætta.
 DocType: Student Guardian,Father,faðir
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Uppfæra Stock&#39; Ekki er hægt að athuga fasta sölu eigna
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Uppfæra Stock&#39; Ekki er hægt að athuga fasta sölu eigna
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Sættir
 DocType: Attendance,On Leave,Í leyfi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,neðri Tekjur
 DocType: Restaurant Order Entry,Current Order,Núverandi röð
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Uppspretta og miða vöruhús getur ekki verið það sama fyrir röð {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Fara í forrit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rú {0} # Úthlutað magn {1} getur ekki verið hærra en óunnið magn {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rú {0} # Úthlutað magn {1} getur ekki verið hærra en óunnið magn {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Frá Dagsetning &#39;verður að vera eftir&#39; Til Dagsetning &#39;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,Greiðsluskilmála
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minute
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Purchase Invoice,Purchase Taxes and Charges,Purchase skatta og gjöld
 DocType: Chapter,Meetup Embed HTML,Meetup Fella HTML inn
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Fara til birgja
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Tilvitnun {0} ekki af tegund {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Viðhald Dagskrá Item
 DocType: Sales Order,%  Delivered,% Skilað
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Vinsamlegast stilltu netfangið fyrir nemandann til að senda greiðslubeiðni
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Vinsamlegast stilltu netfangið fyrir nemandann til að senda greiðslubeiðni
 DocType: Patient,Medical History,Sjúkrasaga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Heimildarlás Account
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank Heimildarlás Account
 DocType: Patient,Patient ID,Patient ID
 DocType: Physician Schedule,Schedule Name,Stundaskrá Nafn
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Gera Laun Slip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Bæta við öllum birgjum
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Bæta við öllum birgjum
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Úthlutað Magn má ekki vera hærra en útistandandi upphæð.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Fletta BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Veðlán
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Veðlán
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Staða Dagsetning og tími
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vinsamlegast settu Fyrningar tengjast Accounts í eignaflokki {0} eða félaginu {1}
 DocType: Lab Test Groups,Normal Range,Venjulegt svið
 DocType: Academic Term,Academic Year,skólaárinu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Laus selja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opnun Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Opnun Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,eftir
 DocType: Appraisal,Appraisal,Úttekt
+DocType: Loan,Loan Account,Lánreikningur
 DocType: Purchase Invoice,GST Details,GST upplýsingar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Tölvupóstur sendur á birgi {0}
 DocType: Item,Default Sales Unit of Measure,Sjálfgefin sölustuðull
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Námsár:
+DocType: Subscription,Past Due Date,Fyrri gjalddaga
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ekki leyfa að setja aðra hluti fyrir hlutinn {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dagsetning er endurtekin
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,Sjúklingaráð
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Samþykkir hlutverki getur ekki verið sama og hlutverk reglan er við að
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Segja upp áskrift að þessum tölvupósti Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Fáðu birgja eftir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Fáðu birgja eftir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} fannst ekki fyrir lið {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Fara í námskeið
 DocType: Accounts Settings,Show Inclusive Tax In Print,Sýna innifalið skatt í prenti
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,skilaboð send
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Reikningur með hnúta barn er ekki hægt að setja eins og höfuðbók
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntun
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Gengi sem Verðskrá mynt er breytt í grunngj.miðil viðskiptavinarins
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Magn (Company Gjaldmiðill)
 DocType: Physician,Physician Schedules,Læknaráætlanir
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Heildarfjöldi fyrirframgreiðslna má ekki vera hærri en heildarfjárhæðir
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Heildarfjöldi fyrirframgreiðslna má ekki vera hærri en heildarfjárhæðir
 DocType: Salary Slip,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Liður Nöfn By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Annar Tímabil Lokar Entry {0} hefur verið gert eftir {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ekki leyft að uppfæra lager viðskipti eldri en {0}
 DocType: BOM,Inspection Required,skoðun Required
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Sláðu inn bankareikningsnúmerið áður en þú sendir það inn.
 DocType: Driving License Category,Class,Flokkur
 DocType: Sales Order,Fully Billed,Alveg Billed
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Vinna Order er ekki hægt að hækka gegn hlutasniðmát
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Framlegð þyngd pakkans. Venjulega nettóþyngd + umbúðir þyngd. (Til prentunar)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Notendur með þetta hlutverk er leyft að setja á frysta reikninga og búa til / breyta bókhaldsfærslum gegn frysta reikninga
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntun
 DocType: Serial No,Is Cancelled,er Hætt
 DocType: Student Group,Group Based On,Hópur byggt á
 DocType: Journal Entry,Bill Date,Bill Dagsetning
@@ -3796,9 +3818,10 @@
 DocType: Cheque Print Template,Cheque Height,ávísun Hæð
 DocType: Supplier,Supplier Details,birgir Upplýsingar
 DocType: Setup Progress,Setup Progress,Uppsetning framfarir
+DocType: Expense Claim,Approval Status,Staða samþykkis
 DocType: Hub Settings,Publish Items to Hub,Birta Hlutir til Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Frá gildi verður að vera minna en að verðmæti í röð {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,millifærsla
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,millifærsla
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Athugaðu alla
 ,Issued Items Against Work Order,Útgefið atriði gegn vinnuskilningi
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
@@ -3829,12 +3852,11 @@
 DocType: Customs Tariff Number,Tariff Number,gjaldskrá Number
 DocType: Work Order Item,Available Qty at WIP Warehouse,Laus magn á WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Áætlaðar
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial Nei {0} ekki tilheyra Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial Nei {0} ekki tilheyra Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Ath: Kerfi mun ekki stöðva yfir fæðingu og yfir-bókun fyrir lið {0} sem magn eða upphæð er 0
 DocType: Notification Control,Quotation Message,Tilvitnun Message
-DocType: Employee Loan,Employee Loan Application,Starfsmaður lánsumsókn
 DocType: Issue,Opening Date,opnun Date
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Vinsamlegast vista sjúklinginn fyrst
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Vinsamlegast vista sjúklinginn fyrst
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Aðsókn hefur verið merkt með góðum árangri.
 DocType: Program Enrollment,Public Transport,Almenningssamgöngur
 DocType: Soil Texture,Silt Composition (%),Silt Samsetning (%)
@@ -3852,7 +3874,7 @@
 ,Item Balance (Simple),Varajöfnuður (Einföld)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Víxlar hækkaðir um birgja.
 DocType: POS Profile,Write Off Account,Skrifaðu Off reikning
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Greiðslubréf Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Greiðslubréf Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,afsláttur Upphæð
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against kaupa Reikningar
 DocType: Item,Warranty Period (in days),Ábyrgðartímabilið (í dögum)
@@ -3875,6 +3897,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Velta Order Dagsetning
 DocType: Sales Invoice Item,Delivered Qty,Skilað Magn
 DocType: Assessment Plan,Assessment Plan,mat Plan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Viðskiptavinur {0} er búinn til.
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Eins og er ekki birgðir í boði á hvaða vöruhúsi
@@ -3888,14 +3911,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,Greiðsla Tilvísanir
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Fjöldi millibils fyrir bilið, td ef bilið er &#39;dagar&#39; og innheimtugildi er 3, reikningar verða búnar til á 3 daga fresti"
 DocType: Vehicle,Insurance Details,Tryggingar Upplýsingar
 DocType: Account,Payable,greiðist
 DocType: Share Balance,Share Type,Deila Tegund
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Skuldarar ({0})
 DocType: Pricing Rule,Margin,spássía
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ný Viðskiptavinir
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Framlegð%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Framlegð%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Breyta POS Profile
 DocType: Bank Reconciliation Detail,Clearance Date,úthreinsun Dagsetning
@@ -3905,10 +3929,11 @@
 DocType: Lead,Address Desc,Heimilisfang karbósýklískan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party er nauðsynlegur
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Röð með tvíhliða gjalddaga í öðrum röðum fundust: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Röð með tvíhliða gjalddaga í öðrum röðum fundust: {list}
 DocType: Topic,Topic Name,Topic Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Vinsamlegast stilltu sjálfgefið sniðmát fyrir leyfi um leyfi fyrir leyfi í HR-stillingum.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Atleast einn af selja eða kaupa verður að vera valinn
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Veldu starfsmann til að fá starfsmanninn fyrirfram.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Veldu starfsmann til að fá starfsmanninn fyrirfram.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vinsamlegast veldu gild dagsetningu
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Veldu eðli rekstrar þíns.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3927,7 +3952,7 @@
 DocType: Asset Movement,Source Warehouse,Source Warehouse
 DocType: Installation Note,Installation Date,uppsetning Dagsetning
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Sölureikningur {0} búinn til
 DocType: Employee,Confirmation Date,staðfesting Dagsetning
 DocType: C-Form,Total Invoiced Amount,Alls Upphæð á reikningi
@@ -3936,7 +3961,7 @@
 DocType: Account,Accumulated Depreciation,uppsöfnuðum afskriftum
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stöðugt nafn
 DocType: Stock Entry,Customer or Supplier Details,Viðskiptavina eða Birgir Upplýsingar
-DocType: Employee Loan Application,Required by Date,Krafist af Dagsetning
+DocType: Loan Application,Required by Date,Krafist af Dagsetning
 DocType: Lead,Lead Owner,Lead Eigandi
 DocType: Production Plan,Sales Orders Detail,Sölufyrirtæki
 DocType: Bin,Requested Quantity,Umbeðin Magn
@@ -3949,10 +3974,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total Frádráttur - Lán Endurgreiðsla
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Núverandi BOM og New BOM getur ekki verið það sama
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Laun Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Margfeldi afbrigði
 DocType: Sales Invoice,Against Income Account,Against þáttatekjum
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Skilað
+DocType: Subscription,Trial Period Start Date,Upphafsdagur prófunartímabils
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Vinsamlegast skráðu þig inn sem annar notandi.
@@ -3973,12 +3999,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Nafn Nafn
 DocType: Stock Settings,Use Naming Series,Notaðu nafngiftaröð
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
 DocType: POS Profile,Update Stock,Uppfæra Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,í áskriftinni
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Mismunandi UOM að atriðum mun leiða til rangrar (alls) nettóþyngd gildi. Gakktu úr skugga um að nettóþyngd hvern hlut er í sama UOM.
 DocType: Membership,Payment Details,Greiðsluupplýsingar
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Stöðvuð vinnuskilyrði er ekki hægt að hætta við. Stöðva það fyrst til að hætta við
 DocType: Asset,Journal Entry for Scrap,Journal Entry fyrir rusl
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vinsamlegast draga atriði úr afhendingarseðlinum
@@ -3998,6 +4023,7 @@
 DocType: Land Unit,Land Unit,Landseining
 ,Purchase Analytics,kaup Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Afhending Note Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Núverandi reikningur {0} vantar
 DocType: Asset Maintenance Log,Task,verkefni
 DocType: Purchase Taxes and Charges,Reference Row #,Tilvísun Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Lotunúmer er nauðsynlegur fyrir lið {0}
@@ -4009,7 +4035,7 @@
 DocType: Company,Exchange Gain / Loss Account,Gengishagnaður / Rekstrarreikningur
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Starfsmaður og Mæting
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Tilgangurinn verður að vera einn af {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Fylltu út formið og vista hana
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Fylltu út formið og vista hana
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Raunverulegur fjöldi á lager
 DocType: Homepage,"URL for ""All Products""",URL fyrir &quot;Allar vörur&quot;
@@ -4023,7 +4049,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard sölugengi
 DocType: Account,Rate at which this tax is applied,Gengi sem þessi skattur er beitt
 DocType: Cash Flow Mapper,Section Name,Section Name
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Uppröðun Magn
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Uppröðun Magn
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Núverandi Op Atvinna
 DocType: Company,Stock Adjustment Account,Stock jöfnunarreikning
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskrifa
@@ -4034,9 +4060,9 @@
 DocType: Task,depends_on,veltur á
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Í biðstöðu fyrir að uppfæra nýjustu verð í öllum efnisskránni. Það getur tekið nokkrar mínútur.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nafn nýja reikninginn. Ath: Vinsamlegast bý ekki reikninga fyrir viðskiptavini og birgja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land vitur sjálfgefið veffang Sniðmát
 DocType: Water Analysis,Appearance,Útlit
+DocType: HR Settings,Leave Status Notification Template,Leyfi Tilkynning Sniðmát
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Meðaltal Kaupverðskrárgengi
 DocType: Sales Order Item,Supplier delivers to Customer,Birgir skilar til viðskiptavinar
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Upplýsingar um aðild.
@@ -4059,7 +4085,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ekki leyfilegt. Vinsamlega slökkva á prófunarsniðinu
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Hlutfall Úthlutun skal vera jafnt og 100%
 DocType: Crop Cycle,Linked Land Unit,Tengd landseining
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
@@ -4075,7 +4101,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Fara til notenda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Greiddur upphæð + afskrifa Upphæð má ekki vera meiri en Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ekki gild Batch Símanúmer fyrir lið {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Athugið: Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Athugið: Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ógild GSTIN eða Sláðu inn NA fyrir óskráð
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innritunargjöld
@@ -4091,14 +4117,14 @@
 DocType: Hub Settings,Publish Availability,birta Availability
 DocType: Company,Create Chart Of Accounts Based On,Búa graf af reikningum miðað við
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ekki er hægt að umbreyta því til annarra hópa. Barnatriði eru til.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} hendi gegn kæranda nemandi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rounding Adjustment (Company Gjaldmiðill)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tímatafla
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Hópur:
 DocType: Volunteer,Afternoon,Að morgni
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setja sem Open
 DocType: Cheque Print Template,Scanned Cheque,skönnuð ávísun
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Senda sjálfvirkar tölvupóst til Tengiliði á Sendi viðskiptum.
@@ -4114,7 +4140,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Verkefni {0} er þegar til
 DocType: Medical Department,Nursing User,Hjúkrunarnotandi
 DocType: Plant Analysis,Plant Analysis Criterias,Greiningarkerfi plantna
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ábyrgð
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Raðnúmer {0} tilheyrir ekki batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ábyrgð
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gildistími þessa tilvitnunar er lokið.
 DocType: Expense Claim Account,Expense Claim Account,Expense Krafa Reikningur
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leyfa óbreyttu gengi
@@ -4136,11 +4163,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Gerðu afbrigði
 DocType: Item,Default BOM,Sjálfgefið BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Samtals innheimt upphæð (með sölutölum)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Gengisskuldbinding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Gengisskuldbinding
 DocType: Project Update,Not Updated,Ekki uppfært
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Það eru ósamræmi á milli gengisins, hlutafjár og fjárhæð sem reiknað er út"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Vinsamlega munið gerð nafn fyrirtækis til að staðfesta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Alls Framúrskarandi Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Alls Framúrskarandi Amt
 DocType: Journal Entry,Printing Settings,prentun Stillingar
 DocType: Employee Advance,Advance Account,Forgangsreikningur
 DocType: Job Offer,Job Offer Terms,Atvinnutilboðsskilmálar
@@ -4149,7 +4176,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Tryggingafélag
 DocType: Asset Category Account,Fixed Asset Account,Fast Asset Reikningur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Frá Delivery Note
 DocType: Chapter,Members,Meðlimir
 DocType: Student,Student Email Address,Student Netfang
@@ -4172,7 +4199,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,netfang Nafn
 DocType: Stock Entry,From BOM,frá BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Splitting {0} einingar af {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Splitting {0} einingar af {1}
 DocType: Assessment Code,Assessment Code,mat Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Basic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lager viðskipti fyrir {0} eru frystar
@@ -4180,25 +4207,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Tilvísunarnúmer er nauðsynlegt ef þú færð viðmiðunardagur
 DocType: Bank Reconciliation Detail,Payment Document,greiðsla Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Villa við að meta viðmiðunarformúluna
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Dagsetning Tengja verður að vera meiri en Fæðingardagur
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Dagsetning Tengja verður að vera meiri en Fæðingardagur
+DocType: Subscription,Plans,Áætlanir
 DocType: Salary Slip,Salary Structure,laun Uppbygging
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Issue Efni
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Villa kom upp við endurkomu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Issue Efni
 DocType: Material Request Item,For Warehouse,fyrir Warehouse
 DocType: Employee,Offer Date,Tilboð Dagsetning
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilvitnun
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Engar Student Groups búin.
 DocType: Purchase Invoice Item,Serial No,Raðnúmer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mánaðarlega endurgreiðslu Upphæð má ekki vera meiri en lánsfjárhæð
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mánaðarlega endurgreiðslu Upphæð má ekki vera meiri en lánsfjárhæð
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Vinsamlegast sláðu Maintaince Nánar fyrst
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Væntanlegur Afhendingardagur getur ekki verið fyrir Purchase Order Date
 DocType: Purchase Invoice,Print Language,Print Tungumál
 DocType: Salary Slip,Total Working Hours,Samtals Vinnutíminn
 DocType: Sales Invoice,Customer PO Details,Upplýsingar viðskiptavina
-DocType: Subscription,Next Schedule Date,Næsta Dagsetning Dagsetning
 DocType: Stock Entry,Including items for sub assemblies,Þ.mt atriði fyrir undir þingum
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tímabundin opnunareikningur
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Sláðu gildi verður að vera jákvæð
@@ -4226,11 +4252,11 @@
 DocType: Issue,Opening Time,opnun Time
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Frá og Til dagsetningar krafist
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Verðbréf &amp; hrávöru ungmennaskipti
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Engar starfsmenn fyrir nefndar viðmiðanir
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
 DocType: Hotel Settings,Default Customer,Sjálfgefið viðskiptavinur
 DocType: Assessment Plan,Supervisor Name,Umsjón Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ekki staðfestu ef skipun er búin til fyrir sama dag
@@ -4254,16 +4280,16 @@
 DocType: Journal Entry Account,Employee Advance,Starfsmaður
 DocType: Payroll Entry,Payroll Frequency,launaskrá Tíðni
 DocType: Lab Test Template,Sensitivity,Viðkvæmni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Hrátt efni
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Hrátt efni
 DocType: Leave Application,Follow via Email,Fylgdu með tölvupósti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Plöntur og Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Plöntur og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skatthlutfall Eftir Afsláttur Upphæð
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglegar Stillingar Vinna Yfirlit
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Vinsamlegast sláðu inn Reqd eftir dagsetningu
 DocType: Payment Entry,Internal Transfer,innri Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Viðhaldsverkefni
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Opnun Date ætti að vera áður lokadegi
 DocType: Leave Control Panel,Carry Forward,Haltu áfram
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnaður Center við núverandi viðskipti er ekki hægt að breyta í höfuðbók
@@ -4271,13 +4297,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Sameiningar
 DocType: Crop Cycle,Detected Disease,Uppgötvað sjúkdómur
 ,Produced,framleidd
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Endurgreiðsla upphafsdagur má ekki vera fyrir gjalddaga.
 DocType: Item,Item Code for Suppliers,Item Code fyrir birgja
 DocType: Issue,Raised By (Email),Vakti By (Email)
 DocType: Training Event,Trainer Name,þjálfari Name
 DocType: Mode of Payment,General,almennt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Síðasta samskipti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Verðmat og heildar&#39;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Áskilið fyrir serialized lið {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Verðmat og heildar&#39;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Áskilið fyrir serialized lið {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Passa Greiðslur með Reikningar
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gildir til (Tilnefning)
@@ -4291,7 +4318,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Virkja / slökkva á gjaldmiðla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} á hálftíma Leyfi á {1}
 DocType: Production Plan,Get Material Request,Fá Material Beiðni
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,pósti Útgjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,pósti Útgjöld
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Alls (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Skemmtun &amp; Leisure
 ,Item Variant Details,Varahlutir Upplýsingar
@@ -4302,9 +4329,9 @@
 DocType: Drug Prescription,Hour,klukkustund
 DocType: Restaurant Order Entry,Last Sales Invoice,Síðasta sala Reikningur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Vinsamlegast veldu Magn á hlut {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Nei getur ekki hafa Warehouse. Warehouse verður að setja af lager Entry eða kvittun
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Nei getur ekki hafa Warehouse. Warehouse verður að setja af lager Entry eða kvittun
 DocType: Lead,Lead Type,Lead Tegund
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Þú hefur ekki heimild til að samþykkja lauf á Block Dagsetningar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Þú hefur ekki heimild til að samþykkja lauf á Block Dagsetningar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Öll þessi atriði hafa þegar verið reikningsfærð
 DocType: Company,Monthly Sales Target,Mánaðarlegt sölumarkmið
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Getur verið samþykkt af {0}
@@ -4312,7 +4339,7 @@
 DocType: Item,Default Material Request Type,Default Efni Beiðni Type
 DocType: Supplier Scorecard,Evaluation Period,Matartímabil
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,óþekkt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Vinna Order ekki búið til
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Vinna Order ekki búið til
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping regla Skilyrði
 DocType: Purchase Invoice,Export Type,Útflutningsgerð
 DocType: Salary Slip Loan,Salary Slip Loan,Launasala
@@ -4328,7 +4355,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Opna reikningsyfirlit
 DocType: Education Settings,Education Manager,Menntun Framkvæmdastjóri
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Lágmarkslengdin milli hvers plöntu á vettvangi fyrir bestu vöxt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Ekki er hægt að uppfæra batched Item {0} með því að nota Stock Sátt, heldur nota Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Ekki er hægt að uppfæra batched Item {0} með því að nota Stock Sátt, heldur nota Stock Entry"
 DocType: Quality Inspection,Report Date,skýrsla Dagsetning
 DocType: Student,Middle Name,Millinafn
 DocType: C-Form,Invoices,reikningar
@@ -4359,20 +4386,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,kvittun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,kvittun
 ,Sales Register,velta Nýskráning
 DocType: Daily Work Summary Group,Send Emails At,Senda póst At
 DocType: Quotation,Quotation Lost Reason,Tilvitnun Lost Ástæða
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Það er ekkert að breyta.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Eyðublað
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Kostnaðarsamþykki Skylda á kostnaðarkröfu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Bættu notendum við fyrirtækið þitt, annað en sjálfan þig."
 DocType: Customer Group,Customer Group Name,Viðskiptavinar Group Name
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Engar viðskiptavinir ennþá!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Sjóðstreymi
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Engin efnisbeiðni búin til
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,License
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vinsamlegast veldu Yfirfæranlegt ef þú vilt líka að fela jafnvægi fyrra reikningsári er fer að þessu fjárhagsári
@@ -4395,11 +4423,12 @@
 DocType: Vehicle,Chassis No,undirvagn Ekkert
 DocType: Payment Request,Initiated,hafin
 DocType: Production Plan Item,Planned Start Date,Áætlaðir Start Date
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vinsamlegast veldu BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vinsamlegast veldu BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Notaður ITC samlaga skatt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
+DocType: Bank Guarantee,Clauses and Conditions,Skilmálar og skilyrði
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Project Task,View Timesheet,Skoða tímasetningu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Lokadagur verður að vera meiri en upphafsdagur
 DocType: Leave Type,Is Encash,er Encash
 DocType: Leave Allocation,New Leaves Allocated,Ný Leaves Úthlutað
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-vitur gögn eru ekki í boði fyrir Tilvitnun
@@ -4413,9 +4442,10 @@
 DocType: Patient,Alcohol Current Use,Notkun áfengisneyslu
 DocType: Student Admission Program,Student Admission Program,Námsmenntun
 DocType: Payment Entry,Account Paid To,Reikningur Greiddur Til
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Annað heiti vöru
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} mátt ekki vera Stock Item
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Gat ekki sent neinar launagreiðslur <br> \ Mögulegar ástæður: <br> \ 1. Hrein laun er minna en 0. <br> \ 2. Fyrirtæki netfang sem tilgreint er í starfsmanni meistara er ógilt. <br>
@@ -4425,7 +4455,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Fjárhagsáætlun fyrir reikning {1} gegn {2} {3} er {4}. Það mun fara yfir um {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Reikningur verður að vera af gerðinni &#39;Fast Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,út Magn
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked fatlaður í
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Student ID
@@ -4437,14 +4466,16 @@
 DocType: Complaint,Complaint,Kvörtun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
 DocType: Leave Allocation,Unused leaves,ónotuð leyfi
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gerðu endurgreiðslu færslu
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Allar deildir
 DocType: Patient,Alcohol Past Use,Áfengisnotkun áfengis
 DocType: Fertilizer Content,Fertilizer Content,Áburður innihaldsefni
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,cr
 DocType: Project Update,Problematic/Stuck,Vandamál / fastur
 DocType: Tax Rule,Billing State,Innheimta State
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Vinnuskilyrðin {0} verður að vera aflýst áður en þú hættir þessari sölupöntun
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
 DocType: Authorization Rule,Applicable To (Employee),Gildir til (starfsmaður)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Skiladagur er nauðsynlegur
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
@@ -4468,10 +4499,11 @@
 DocType: Cheque Print Template,Message to show,Skilaboð til að sýna
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Smásala
 DocType: Student Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,vara Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,vara Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Ekki er hægt að finna stig sem byrjar á {0}. Þú þarft að standa frammistöðu sem nær yfir 0 til 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Ógild vísun {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Purchase skatta og gjöld sniðmáti
+DocType: Subscription,Current Invoice Start Date,Núverandi upphafsreikningur reiknings
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Annaðhvort debet- eða kredit upphæð er nauðsynlegt fyrir {2}
 DocType: GL Entry,Remarks,athugasemdir
@@ -4481,11 +4513,13 @@
 DocType: Task,Parent Task,Foreldraverkefni
 DocType: Journal Entry,Write Off Based On,Skrifaðu Off byggt á
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,gera Blý
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Prenta og Ritföng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Prenta og Ritföng
 DocType: Stock Settings,Show Barcode Field,Sýna Strikamerki Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Senda Birgir póst
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Laun þegar unnin fyrir tímabilið milli {0} og {1}, Skildu umsókn tímabil getur ekki verið á milli þessu tímabili."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Senda Birgir póst
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Laun þegar unnin fyrir tímabilið milli {0} og {1}, Skildu umsókn tímabil getur ekki verið á milli þessu tímabili."
+DocType: Fiscal Year,Auto Created,Sjálfvirkt búið til
 DocType: Chapter Member,Leave Reason,Skildu ástæðu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Reikningur {0} er ekki lengur til
 DocType: Guardian Interest,Guardian Interest,Guardian Vextir
 DocType: Volunteer,Availability,Framboð
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Uppsetningar sjálfgefin gildi fyrir POS-reikninga
@@ -4493,14 +4527,13 @@
 DocType: Project,Time to send,Tími til að senda
 DocType: Timesheet,Employee Detail,starfsmaður Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Forráðamaður1 Netfang
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Dagur næsta degi og endurtaka á Dagur mánaðar verður að vera jöfn
 DocType: Lab Prescription,Test Code,Prófunarregla
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Stillingar fyrir heimasíðu heimasíðuna
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs eru ekki leyfð fyrir {0} vegna þess að stigatafla sem stendur fyrir {1}
 DocType: Job Offer,Awaiting Response,bíður svars
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,hér að framan
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Samtals upphæð {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Samtals upphæð {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Tilgreindu ef ekki staðlað greiðslureikningur
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vinsamlegast veldu matshópinn annað en &#39;Öll matshópa&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rú {0}: Kostnaðurarmiðstöð er krafist fyrir hlut {1}
@@ -4511,7 +4544,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vatnsgreining
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Valfrjálst. Þessi stilling verður notuð til að sía í ýmsum viðskiptum.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Neikvætt Verðmat Rate er ekki leyfð
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Neikvætt Verðmat Rate er ekki leyfð
 DocType: Holiday List,Weekly Off,Vikuleg Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Endurhlaða tengd greining
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Fyrir td 2012, 2012-13"
@@ -4527,7 +4560,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kostnaður við rifið Eignastýring
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnaður Center er nauðsynlegur fyrir lið {2}
 DocType: Vehicle,Policy No,stefna Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Fá atriði úr Vara Knippi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Fá atriði úr Vara Knippi
 DocType: Asset,Straight Line,Bein lína
 DocType: Project User,Project User,Project User
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Skipta
@@ -4563,21 +4596,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Leið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Ekki hægt að umbreyta Kostnaður Center til aðalbók eins og það hefur barnið hnúta
 DocType: Production Plan,Total Planned Qty,Samtals áætlað magn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,opnun Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,opnun Value
 DocType: Salary Detail,Formula,Formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Sniðmát
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Sölureikningur
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Sölureikningur
 DocType: Purchase Invoice Item,Total Weight,Heildarþyngd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Þóknun á sölu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Þóknun á sölu
 DocType: Job Offer Term,Value / Description,Gildi / Lýsing
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
 DocType: Tax Rule,Billing Country,Innheimta Country
 DocType: Purchase Order Item,Expected Delivery Date,Áætlaðan fæðingardag
 DocType: Restaurant Order Entry,Restaurant Order Entry,Veitingahús Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Greiðslu- ekki jafnir fyrir {0} # {1}. Munurinn er {2}.
 DocType: Asset Maintenance Task,Assign To Name,Úthluta til nafns
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,risnu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,risnu
 DocType: Hub Settings,Enabled Users,Virkir notendur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Gera Material Beiðni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Open Item {0}
@@ -4590,24 +4623,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Umsókn um leyfi.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Reikningur með núverandi viðskipti getur ekki eytt
 DocType: Vehicle,Last Carbon Check,Síðasta Carbon Athuga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,málskostnaðar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,málskostnaðar
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vinsamlegast veljið magn í röð
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Gerðu opnun sölu- og innkaupakostna
 DocType: Purchase Invoice,Posting Time,staða Time
 DocType: Timesheet,% Amount Billed,% Magn Billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Sími Útgjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Sími Útgjöld
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Hakaðu við þetta ef þú vilt að þvinga notendur til að velja röð áður en þú vistar. Það verður ekkert sjálfgefið ef þú athuga þetta.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ekkert atriði með Serial nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ekkert atriði með Serial nr {0}
 DocType: Email Digest,Open Notifications,Opið Tilkynningar
 DocType: Payment Entry,Difference Amount (Company Currency),Munurinn Magn (Company Gjaldmiðill)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,bein Útgjöld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,bein Útgjöld
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ný Tekjur Viðskiptavinur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Ferðakostnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Ferðakostnaður
 DocType: Maintenance Visit,Breakdown,Brotna niður
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Bæta við sérsniðnum reitinn Áskrift í letriðinu {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
 DocType: Purchase Receipt Item,Sample Quantity,Dæmi Magn
+DocType: Bank Guarantee,Name of Beneficiary,Nafn bótaþega
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppfæra BOM kostnað sjálfkrafa með áætlun, byggt á nýjustu verðlagsgengi / verðskrárgengi / síðasta kaupgengi hráefna."
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Reikningur {0}: Foreldri reikningur {1} ekki tilheyra fyrirtæki: {2}
@@ -4619,14 +4652,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,reynslulausn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,laun Hluti
 DocType: Program Enrollment Tool,New Academic Year,Nýtt skólaár
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innskotið Verðlisti hlutfall ef vantar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Samtals greitt upphæð
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Samtals greitt upphæð
 DocType: GST Settings,B2C Limit,B2C takmörk
 DocType: Work Order Item,Transferred Qty,flutt Magn
 apps/erpnext/erpnext/config/learn.py +11,Navigating,siglingar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,áætlanagerð
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,áætlanagerð
 DocType: Share Balance,Issued,Útgefið
+DocType: Loan,Repayment Start Date,Endurgreiðsla upphafsdagur
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Námsmat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,birgir Id
 DocType: Payment Request,Payment Gateway Details,Greiðsla Gateway Upplýsingar
@@ -4639,10 +4673,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Gerð af laufum eins frjálslegur, veikur osfrv"
 DocType: Email Digest,Send regular summary reports via Email.,Senda reglulegar skýrslur yfirlit með tölvupósti.
 DocType: Payment Entry,PE-,hagvexti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Vinsamlegast settu sjálfgefin reikningur í kostnað kröfutegund {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Vinsamlegast settu sjálfgefin reikningur í kostnað kröfutegund {0}
 DocType: Assessment Result,Student Name,Student Name
 DocType: Brand,Item Manager,Item Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,launaskrá Greiðist
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,launaskrá Greiðist
 DocType: Buying Settings,Default Supplier Type,Sjálfgefið Birgir Type
 DocType: Plant Analysis,Collection Datetime,Safn Datetime
 DocType: Work Order,Total Operating Cost,Samtals rekstrarkostnaður
@@ -4652,9 +4686,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,User {0} er ekki til
 DocType: Payment Term,Day(s) after invoice date,Dagur / dagar eftir reikningsdag
 DocType: Payment Schedule,Payment Schedule,Greiðsluáætlun
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,skammstöfun
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Greiðsla Entry er þegar til
+DocType: Subscription,Trial Period End Date,Prófunartímabil Lokadagur
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ekki authroized síðan {0} umfram mörk
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Laun sniðmát húsbóndi.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Sjúkdómar
@@ -4671,9 +4705,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes að leiðir eða viðskiptavini.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Hlutverk Leyft að breyta fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Target Dreifni Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Allir hópar viðskiptavina
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Allir hópar viðskiptavina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Uppsafnaður Monthly
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Reikningur {0}: Foreldri reikningur {1} er ekki til
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Verðlisti Rate (Company Gjaldmiðill)
@@ -4682,14 +4716,15 @@
 DocType: Lab Prescription,Test Created,Próf búin til
 DocType: Healthcare Settings,Custom Signature in Print,Sérsniðin undirskrift í prenti
 DocType: Account,Temporary,tímabundin
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Viðskiptavinur LPO nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Viðskiptavinur LPO nr.
 DocType: Program,Courses,námskeið
 DocType: Monthly Distribution Percentage,Percentage Allocation,hlutfall Úthlutun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,ritari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,ritari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Ef öryrkjar &#39;í orðum&#39; sviði mun ekki vera sýnilegur í öllum viðskiptum
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Þessi aðgerð mun stöðva framtíð innheimtu. Ertu viss um að þú viljir hætta við þessa áskrift?
 DocType: Serial No,Distinct unit of an Item,Greinilegur eining hlut
 DocType: Supplier Scorecard Criteria,Criteria Name,Viðmiðunarheiti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Vinsamlegast settu fyrirtækið
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Vinsamlegast settu fyrirtækið
 DocType: Pricing Rule,Buying,Kaup
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Sjúkdómar og áburður
 DocType: HR Settings,Employee Records to be created by,Starfskjör Records að vera búin með
@@ -4698,17 +4733,17 @@
 DocType: POS Profile,Apply Discount On,Gilda afsláttur á
 DocType: Member,Membership Type,Aðildargerð
 ,Reqd By Date,Reqd By Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,lánardrottnar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,lánardrottnar
 DocType: Assessment Plan,Assessment Name,mat Name
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Sýna PDC í prenti
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Sýna PDC í prenti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial Nei er nauðsynlegur
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liður Wise Tax Nánar
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Atvinnutilboð
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute Skammstöfun
 ,Item-wise Price List Rate,Item-vitur Verðskrá Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,birgir Tilvitnun
 DocType: Quotation,In Words will be visible once you save the Quotation.,Í orðum verður sýnileg þegar þú hefur vistað tilvitnun.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Magn ({0}) getur ekki verið brot í röð {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Magn ({0}) getur ekki verið brot í röð {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,viðhorfin
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
@@ -4726,7 +4761,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,alls Dreifni
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ef þetta er virkt, mun kerfið birta bókhald færslur fyrir birgðum sjálfkrafa."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Miðlari
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Mæting fyrir starfsmann {0} er þegar merkt fyrir þennan dag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Mæting fyrir starfsmann {0} er þegar merkt fyrir þennan dag
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",Fundargerðir Uppfært gegnum &#39;Time Innskráning &quot;
 DocType: Customer,From Lead,frá Lead
@@ -4737,6 +4772,7 @@
 DocType: Lab Test,Approved Date,Samþykkt dagsetning
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast einn vöruhús er nauðsynlegur
+DocType: Subscriber,Subscriber Name,Nafn notanda
 DocType: Serial No,Out of Warranty,Út ábyrgðar
 DocType: BOM Update Tool,Replace,Skipta
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Engar vörur fundust.
@@ -4746,19 +4782,18 @@
 DocType: Request for Quotation Item,Project Name,nafn verkefnis
 DocType: Customer,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
 DocType: Journal Entry Account,If Income or Expense,Ef tekjur eða gjöld
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Veldu vaxtatekjur reikning í laun starfsmanna {0}
 DocType: Work Order,Required Items,Nauðsynleg Items
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Mismunur
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Mannauðs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Greiðsla Sættir Greiðsla
 DocType: Disease,Treatment Task,Meðferðarlisti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,skattinneign
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,skattinneign
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} hefur ekki reikning {1} eða þegar samsvarandi á móti öðrum skírteini
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,The BOM sem verður skipt út
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,rafræn útbúnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,rafræn útbúnaður
 DocType: Asset,Maintenance Required,Viðhald nauðsynlegt
 DocType: Account,Debit,debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Leaves verður úthlutað margfeldi af 0,5"
@@ -4767,7 +4802,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Framúrskarandi Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Setja markmið Item Group-vitur fyrir þetta velta manneskja.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frysta Stocks eldri en [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er nauðsynlegur fyrir fast eign kaup / sölu
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er nauðsynlegur fyrir fast eign kaup / sölu
 DocType: Asset Maintenance Team,Maintenance Team Name,Viðhald Team Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ef tveir eða fleiri Verðlagning Reglur finnast miðað við ofangreindar aðstæður, Forgangur er beitt. Forgangur er fjöldi milli 0 til 20 en Sjálfgefið gildi er núll (auður). Hærri tala þýðir að það mun hafa forgang ef það eru margar Verðlagning Reglur með sömu skilyrðum."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Viðskiptavinur er skyltur ef &quot;Tækifæri frá&quot; er valinn sem viðskiptavinur
@@ -4776,19 +4811,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Leyfa eftirfarandi notendum að samþykkja yfirgefa Umsóknir um blokk daga.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tegundir kostnað kröfu.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salahlutfall fyrir atriði {0} er lægra en {1} þess. Sala ætti að vera að minnsta kosti {2}
-DocType: Item,Taxes,Skattar
+DocType: Subscription,Taxes,Skattar
 DocType: Purchase Invoice,capital goods,fjármagnsvörur
 DocType: Purchase Invoice Item,Weight Per Unit,Þyngd á hverja einingu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Greitt og ekki afhent
 DocType: Project,Default Cost Center,Sjálfgefið Kostnaður Center
-DocType: Bank Guarantee,End Date,Lokadagur
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,lager Viðskipti
 DocType: Budget,Budget Accounts,Budget reikningar
 DocType: Employee,Internal Work History,Innri Vinna Saga
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Uppsöfnuðum afskriftum Upphæð
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Birgir Vottorð Variable
-DocType: Employee Loan,Fully Disbursed,Alveg afgreiddi
 DocType: Employee Advance,Due Advance Amount,Fyrirframgreiðslugjald
 DocType: Maintenance Visit,Customer Feedback,viðskiptavinur Feedback
 DocType: Account,Expense,Expense
@@ -4812,14 +4845,13 @@
 ,Employee Information,starfsmaður Upplýsingar
 DocType: Stock Entry Detail,Additional Cost,aukakostnaðar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",Getur ekki síað byggð á skírteini nr ef flokkaðar eftir skírteini
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Gera Birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Gera Birgir Tilvitnun
 DocType: Quality Inspection,Incoming,Komandi
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Sjálfgefin skatta sniðmát fyrir sölu og kaup eru búnar til.
 DocType: BOM,Materials Required (Exploded),Efni sem þarf (Sprakk)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vinsamlegast stilltu Fyrirtæki sía eyða ef Group By er &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Staða Dagsetning má ekki vera liðinn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} passar ekki við {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,til að búa til endurtekin
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Heimilisfang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Kjóll Leave
 DocType: Agriculture Task,End Day,Lokadagur
@@ -4844,11 +4876,10 @@
 DocType: Material Request,% Ordered,% Pantaði
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Fyrir námsmiðaðan nemendahóp verður námskeiðið valið fyrir alla nemenda frá skráðum námskeiðum í námskrá.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ákvæðisvinnu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. kaupgengi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. kaupgengi
 DocType: Share Balance,From No,Frá nr
 DocType: Task,Actual Time (in Hours),Tíminn (í klst)
 DocType: Employee,History In Company,Saga In Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Ný skilaboð frá {sendanda}
 DocType: Customer,Customer Primary Address,Aðalnafn viðskiptavinar
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Fréttabréf
 DocType: Drug Prescription,Description/Strength,Lýsing / styrkur
@@ -4857,22 +4888,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Sama atriði hefur verið gert mörgum sinnum
 DocType: Department,Leave Block List,Skildu Block List
 DocType: Purchase Invoice,Tax ID,Tax ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Liður {0} er ekki skipulag fyrir Serial Nos. Column verður auður
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Liður {0} er ekki skipulag fyrir Serial Nos. Column verður auður
 DocType: Accounts Settings,Accounts Settings,reikninga Stillingar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,samþykkja
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted heimilisfang fyrir {0}, vinsamlegast lagaðu til að halda áfram."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted heimilisfang fyrir {0}, vinsamlegast lagaðu til að halda áfram."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Fjöldi nýrra reikninga, það verður innifalið í reikningsnafninu sem forskeyti"
 DocType: Maintenance Team Member,Team Member,Liðsfélagi
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Engar niðurstöður til að senda inn
 DocType: Customer,Sales Partner and Commission,Velta Partner og framkvæmdastjórnarinnar
-DocType: Employee Loan,Rate of Interest (%) / Year,Vextir (%) / Ár
+DocType: Loan,Rate of Interest (%) / Year,Vextir (%) / Ár
 ,Project Quantity,Project Magn
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
 DocType: Opportunity,To Discuss,Að ræða
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} einingar {1} þörf {2} að ljúka þessari færslu.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Árleg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,tímabundin reikningar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Black
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,tímabundin reikningar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Sprenging Item
 DocType: Shareholder,Contact List,Tengiliðir
 DocType: Account,Auditor,endurskoðandi
@@ -4880,16 +4911,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} atriði framleitt
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Læra meira
 DocType: Cheque Print Template,Distance from top edge,Fjarlægð frá efstu brún
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Verðlisti {0} er óvirk eða er ekki til
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Verðlisti {0} er óvirk eða er ekki til
 DocType: Purchase Invoice,Return,Return
 DocType: Pricing Rule,Disable,Slökkva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Háttur af greiðslu er krafist til að greiða
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Háttur af greiðslu er krafist til að greiða
 DocType: Project Task,Pending Review,Bíður Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Breyta í fullri síðu fyrir fleiri valkosti eins og eignir, raðnúmer, lotur osfrv."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Tilnefningar og samráð
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ekki skráður í lotuna {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Eignastýring {0} er ekki hægt að rífa, eins og það er nú þegar {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Athuganir krafist
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Athuganir krafist
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfu)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Mistókst að setja upp fyrirtæki
@@ -4901,7 +4932,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Lo Stjórn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Bæta atriði úr
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Bæta atriði úr
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Korn og lönd
 DocType: Cheque Print Template,Regular,Venjulegur
 DocType: Fertilizer,Density (if liquid),Density (ef vökvi)
@@ -4926,24 +4957,26 @@
 DocType: Payment Entry,Paid Amount,greiddur Upphæð
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Kynntu söluferli
 DocType: Assessment Plan,Supervisor,Umsjón
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Varðveisla birgða
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Varðveisla birgða
 ,Available Stock for Packing Items,Laus Stock fyrir pökkun atriði
 DocType: Item Variant,Item Variant,Liður Variant
 ,Work Order Stock Report,Vinnu Order Stock Report
+DocType: Purchase Receipt,Auto Repeat Detail,Sjálfvirk endurtaka smáatriði
 DocType: Assessment Result Tool,Assessment Result Tool,Mat Niðurstaða Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Sem umsjónarmaður
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Tillaga Flokkur
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Viðskiptajöfnuður þegar í Debit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Credit &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gæðastjórnun
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gæðastjórnun
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
 DocType: Project,Total Billable Amount (via Timesheets),Samtals reikningshæft magn (með tímariti)
 DocType: Agriculture Task,Previous Business Day,Fyrri viðskiptadagur
-DocType: Employee Loan,Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil
+DocType: Loan,Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil
 DocType: Employee,Health Insurance No,Sjúkratrygging nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vinsamlegast sláðu inn magn fyrir lið {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Lánshæfiseinkunn Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Lánshæfiseinkunn Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Heildarskattskyld fjárhæð
 DocType: Employee External Work History,Employee External Work History,Starfsmaður Ytri Vinna Saga
 DocType: Opening Invoice Creation Tool,Purchase,kaup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance Magn
@@ -4954,15 +4987,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} fyrir {1}
 DocType: Healthcare Settings,Valid number of days,Gildir fjöldi daga
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,stoðsviða
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Endurræsa áskrift
 DocType: Land Unit,Linked Plant Analysis,Tengd planta greining
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Gengi sem birgis mynt er breytt í grunngj.miðil félagsins
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tímasetning átök með röð {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leyfa núgildandi verðmæti
+DocType: Bank Guarantee,Receiving,Fá
 DocType: Training Event Employee,Invited,boðið
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Margar virk launakerfum fundust fyrir starfsmann {0} fyrir gefnar dagsetningar
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Skipulag Gateway reikninga.
 DocType: Employee,Employment Type,Atvinna Type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fastafjármunir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Fastafjármunir
 DocType: Payment Entry,Set Exchange Gain / Loss,Setja gengishagnaður / tap
 ,GST Purchase Register,GST Purchase Register
 ,Cash Flow,Peningaflæði
@@ -4982,9 +5017,10 @@
 DocType: Academic Term,Term Start Date,Term Start Date
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Listi yfir alla hlutafjáreignir
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Meðfylgjandi {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Bæði upphafstímabil og prófunartímabil verður að vera stillt
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Meðaltal
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samtals greiðslugjald í greiðsluáætlun verður að vera jafnt við Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samtals greiðslugjald í greiðsluáætlun verður að vera jafnt við Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Áætlun
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankayfirlit jafnvægi eins og á General Ledger
 DocType: Job Applicant,Applicant Name,umsækjandi Nafn
 DocType: Authorization Rule,Customer / Item Name,Viðskiptavinur / Item Name
@@ -5014,6 +5050,7 @@
 DocType: Work Order,Warehouses,Vöruhús
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eign er ekki hægt að flytja
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hótel herbergi Verðlagning
+DocType: Subscription,Days Until Due,Dagar til dags
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Þetta atriði er afbrigði af {0} (sniðmát).
 DocType: Workstation,per hour,á klukkustund
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Innkaupastjóri
@@ -5022,13 +5059,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Fyrir hópur sem byggist á hópnum, verður námsmatið valið fyrir alla nemendum frá námsbrautinni."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ekki hægt að eyða eins birgðir höfuðbók færsla er til fyrir þetta vöruhús.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Dreifing
+DocType: Journal Entry Account,Loan,Lán
 DocType: Expense Claim Advance,Expense Claim Advance,Kostnaðarkröfur Advance
 DocType: Lab Test,Report Preference,Tilkynna ummæli
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Sjálfboðaliðarupplýsingar.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Verkefnastjóri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Verkefnastjóri
 ,Quoted Item Comparison,Vitnað Item Samanburður
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Skarast í skora á milli {0} og {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Sending
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Sending
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max afsláttur leyfð lið: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Innra virði og á
 DocType: Crop,Produce,Framleiða
@@ -5038,7 +5076,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Efni neysla til framleiðslu
 DocType: Item Alternative,Alternative Item Code,Önnur vöruliður
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Hlutverk sem er leyft að leggja viðskiptum sem fara lánamörk sett.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Veldu Hlutir til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Veldu Hlutir til Manufacture
 DocType: Delivery Stop,Delivery Stop,Afhending Stöðva
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
 DocType: Item,Material Issue,efni Issue
@@ -5048,15 +5086,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sápa &amp; Þvottaefni
 DocType: BOM,Show Items,Sýna Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Frá tími getur ekki verið meiri en tíma.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Viltu tilkynna öllum viðskiptavinum með tölvupósti?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Viltu tilkynna öllum viðskiptavinum með tölvupósti?
+DocType: Subscription Plan,Billing Interval,Innheimtuinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Halda áfram
 DocType: Hub Settings,Hub Username,Hub notendanafn
 DocType: Salary Detail,Component,Component
 DocType: Assessment Criteria,Assessment Criteria Group,Námsmat Viðmið Group
 DocType: Healthcare Settings,Patient Name By,Nafn sjúklinga eftir
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Ársreikningur Innsláttur launa frá {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Ársreikningur Innsláttur launa frá {0} til {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Veldu Transaction
@@ -5070,22 +5108,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hér er hægt að halda hæð, þyngd, ofnæmi, læknis áhyggjum etc"
 DocType: Leave Block List,Applies to Company,Gildir til félagsins
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Ekki er hægt að hætta við vegna þess að lögð Stock Entry {0} hendi
-DocType: Employee Loan,Disbursement Date,útgreiðsludagur
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Viðtakendur&quot; ekki tilgreind
+DocType: Loan,Disbursement Date,útgreiðsludagur
 DocType: BOM Update Tool,Update latest price in all BOMs,Uppfæra nýjustu verð í öllum BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Læknisskýrsla
 DocType: Vehicle,Vehicle,ökutæki
 DocType: Purchase Invoice,In Words,í orðum
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Sláðu inn nafn bankans eða útlánafyrirtækis áður en þú sendir það.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} verður að senda inn
 DocType: POS Profile,Item Groups,Item Hópar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Í dag er {0} &#39;s afmæli!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Í dag er {0} &#39;s afmæli!
 DocType: Sales Order Item,For Production,fyrir framleiðslu
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Vinsamlegast bættu við tímabundna opnunareikning í reikningsskýringu
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Vinsamlegast bættu við tímabundna opnunareikning í reikningsskýringu
 DocType: Customer,Customer Primary Contact,Tengiliður viðskiptavina
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Tímabil Lokadagur
 DocType: Project Task,View Task,view Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Upp / Leið%
+DocType: Bank Guarantee,Bank Guarantee Type,Bankareikningsgerð
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Reikningshluti
 ,Asset Depreciations and Balances,Eignastýring Afskriftir og jafnvægi
@@ -5096,9 +5135,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inniheldur undirverktaka
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Join
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,skortur Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Ekki er hægt að breyta Variant eiginleika eftir birgðir umskipti. Þú verður að búa til nýtt atriði til að gera þetta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
-DocType: Employee Loan,Repay from Salary,Endurgreiða frá Laun
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+DocType: Loan,Repay from Salary,Endurgreiða frá Laun
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
 DocType: Salary Slip,Salary Slip,laun Slip
@@ -5122,11 +5160,11 @@
 DocType: Employee Education,Employee Education,starfsmaður Menntun
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Afrit atriði hópur í lið töflunni
 DocType: Land Unit,Parent Land Unit,Móðurhlutdeild
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
 DocType: Fertilizer,Fertilizer Name,Áburður Nafn
 DocType: Salary Slip,Net Pay,Net Borga
 DocType: Cash Flow Mapping Accounts,Account,Reikningur
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Nei {0} hefur þegar borist
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial Nei {0} hefur þegar borist
 ,Requested Items To Be Transferred,Umbeðin Items til að flytja
 DocType: Expense Claim,Vehicle Log,ökutæki Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Hiti í kjölfarið (hitastig&gt; 38,5 ° C / viðvarandi hitastig&gt; 38 ° C / 100,4 ° F)"
@@ -5167,24 +5205,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
 DocType: Asset Maintenance,Manufacturing User,framleiðsla User
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Staðar
-DocType: C-Form,Series,Series
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Gjaldmiðill verðlista {0} verður að vera {1} eða {2}
 DocType: Appraisal,Appraisal Template,Úttekt Snið
 DocType: Soil Texture,Ternary Plot,Ternary plot
 DocType: Item Group,Item Classification,Liður Flokkun
 DocType: Driver,License Number,Leyfisnúmer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Viðhald Visit Tilgangur
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Innheimtu sjúklingur skráning
 DocType: Crop,Period,tímabil
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,General Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Starfsmaður {0} á skilið á {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Starfsmaður {0} á skilið á {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Skoða Vísbendingar
 DocType: Program Enrollment Tool,New Program,ný Program
 DocType: Item Attribute Value,Attribute Value,eigindi gildi
 ,Itemwise Recommended Reorder Level,Itemwise Mælt Uppröðun Level
 DocType: Salary Detail,Salary Detail,laun Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Vinsamlegast veldu {0} fyrst
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Vinsamlegast veldu {0} fyrst
 DocType: Appointment Type,Physician,Læknir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Hópur {0} af Liður {1} hefur runnið út.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Samráð
@@ -5192,15 +5229,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) getur ekki verið meiri en áætlað magn ({2}) í vinnuskilyrðingu {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tími Sheet fyrir framleiðslu.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Samtals
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ekki er hægt að breyta Variant eignum eftir viðskipti með hlutabréf. Þú verður að búa til nýtt atriði til að gera þetta.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA umboð
 DocType: Physician,Charges,Gjöld
 DocType: Production Plan,Get Items For Work Order,Fáðu atriði fyrir vinnuskilyrði
 DocType: Salary Detail,Default Amount,Sjálfgefið Upphæð
 DocType: Lab Test Template,Descriptive,Lýsandi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Warehouse fannst ekki í kerfinu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse fannst ekki í kerfinu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Samantekt þessa mánaðar
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
 DocType: Tax Rule,Purchase Tax Template,Kaup Tax sniðmáti
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Settu velta markmið sem þú vilt ná fyrir fyrirtækið þitt.
 ,Project wise Stock Tracking,Project vitur Stock mælingar
@@ -5228,11 +5266,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Mistókst að búa til vefsíðu
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM viðskipta Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Varðveislubréf þegar búið er til eða sýnishorn Magn ekki til staðar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Varðveislubréf þegar búið er til eða sýnishorn Magn ekki til staðar
 DocType: Program,Program Abbreviation,program Skammstöfun
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Gjöld eru uppfærðar á kvittun við hvert atriði
 DocType: Warranty Claim,Resolved By,leyst með
-DocType: Bank Guarantee,Start Date,Upphafsdagur
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Úthluta lauf um tíma.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tékkar og Innlán rangt hreinsaðar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Reikningur {0}: Þú getur ekki framselt sig sem foreldri reikning
@@ -5247,11 +5284,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,klukkustundir
 DocType: Project,Expected Start Date,Væntanlegur Start Date
 DocType: Purchase Invoice,04-Correction in Invoice,04-leiðrétting á reikningi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Vinna Order þegar búið til fyrir alla hluti með BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Vinna Order þegar búið til fyrir alla hluti með BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Details Report
 DocType: Setup Progress Action,Setup Progress Action,Uppsetning Framfarir
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kaupverðskrá
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kaupverðskrá
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Fjarlægja hlut ef gjöld eru ekki við þann lið
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Hætta við áskrift
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Vinsamlegast veldu Viðhaldsstaða sem lokið eða fjarlægðu Lokadagsetning
 DocType: Supplier,Default Payment Terms Template,Sjálfgefin greiðsluskilmálar sniðmát
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaction gjaldmiðli skal vera það sama og Greiðsla Gateway gjaldmiðil
@@ -5262,7 +5300,6 @@
 DocType: Employee,Educational Qualification,námsgráðu
 DocType: Workstation,Operating Costs,því að rekstrarkostnaðurinn
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aðgerð ef Uppsafnaður mánuðinn Budget meiri en
-DocType: Subscription,Submit on creation,Senda á sköpun
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
 DocType: Asset,Disposal Date,förgun Dagsetning
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Póstur verður sendur á öllum virkum Starfsmenn félagsins á tilteknu klukkustund, ef þeir hafa ekki frí. Samantekt á svörum verður sent á miðnætti."
@@ -5280,6 +5317,7 @@
 DocType: Batch,Parent Batch,Foreldri hópur
 DocType: Cheque Print Template,Cheque Print Template,Ávísun Prenta Snið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Mynd af stoðsviða
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Fjöldi daga eftir að reikningsdagur er liðinn áður en áskrift er felld niður eða áskriftarmerki ógreiddur
 DocType: Lab Test Template,Sample Collection,Sýnishorn
 ,Requested Items To Be Ordered,Umbeðin Items til að panta
 DocType: Price List,Price List Name,Verðskrá Name
@@ -5288,7 +5326,7 @@
 DocType: Account,Income,tekjur
 DocType: Industry Type,Industry Type,Iðnaður Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Eitthvað fór úrskeiðis!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Viðvörun: Leyfi umsókn inniheldur eftirfarandi block dagsetningar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Viðvörun: Leyfi umsókn inniheldur eftirfarandi block dagsetningar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Velta Invoice {0} hefur þegar verið lögð
 DocType: Supplier Scorecard Scoring Criteria,Score,Mark
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Reikningsár {0} er ekki til
@@ -5308,12 +5346,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-af-sölu Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ætti að vera gildi á milli 0 og 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Næsta Afskriftir Dagsetning má ekki vera fyrir dagsetningu sem hægt er að nota
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ótryggð Lán
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Ótryggð Lán
 DocType: Cost Center,Cost Center Name,Kostnaður Center Name
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max vinnutíma gegn Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,áætlunarferðir Dagsetning
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Alls Greiddur Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Alls Greiddur Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Skilaboð meiri en 160 stafir verður skipt í marga skilaboð
 DocType: Purchase Receipt Item,Received and Accepted,Móttekið og samþykkt
 DocType: Hub Settings,Company and Seller Profile,Fyrirtæki og seljanda
@@ -5327,10 +5365,9 @@
 DocType: Item,Variant Based On,Variant miðað við
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Birgjar þín
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vinsamlegast lagaðu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
 DocType: Request for Quotation Item,Supplier Part No,Birgir Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Nafnlaus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,fékk frá
 DocType: Lead,Converted,converted
@@ -5344,6 +5381,7 @@
 DocType: Asset,Assets,Eignir
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,tölva
 DocType: Item,List this Item in multiple groups on the website.,Listi þetta atriði í mörgum hópum á vefnum.
+DocType: Subscription,Current Invoice End Date,Núverandi reikningsskiladagur
 DocType: Payment Term,Due Date Based On,Gjalddagi Byggt á
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Vinsamlegast stilltu sjálfgefinn viðskiptavinahóp og landsvæði í Sölustillingar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} er ekki til
@@ -5351,7 +5389,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} er ekki til í kerfinu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Þú hefur ekki heimild til að setja Frozen gildi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Fá Unreconciled færslur
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Engar endurgreiðslur valdar fyrir Journal Entry
 DocType: Payment Reconciliation,From Invoice Date,Frá dagsetningu reiknings
+DocType: Loan,Disbursed,Útborgað
 DocType: Healthcare Settings,Laboratory Settings,Laboratory Settings
 DocType: Patient Appointment,Service Unit,Þjónustudeild
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Settu Birgðasali vel
@@ -5364,12 +5404,12 @@
 DocType: Share Balance,No of Shares,Fjöldi hlutabréfa
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Veldu stöðu
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
 DocType: Pricing Rule,Pricing Rule Help,Verðlagning Regla Hjálp
 DocType: School House,House Name,House Name
 DocType: Fee Schedule,Total Amount per Student,Samtals upphæð á nemanda
 DocType: Purchase Taxes and Charges,Account Head,Head Reikningur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Electrical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Electrical
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Bætið restinni af fyrirtækinu þínu sem notendur. Þú getur einnig bætt við boðið viðskiptavinum sínum að vefsíðunni þinni með því að bæta þeim við úr Tengiliðum
 DocType: Stock Entry,Total Value Difference (Out - In),Heildarverðmæti Mismunur (Out - In)
 DocType: Grant Application,Requested Amount,Óskað eftir upphæð
@@ -5379,7 +5419,7 @@
 DocType: Crop Cycle,Detected Diseases,Uppgötvaðir sjúkdómar
 DocType: Stock Entry,Default Source Warehouse,Sjálfgefið Source Warehouse
 DocType: Item,Customer Code,viðskiptavinur Code
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
 DocType: Asset Maintenance Task,Last Completion Date,Síðasti lokadagur
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar frá síðustu Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
@@ -5387,9 +5427,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Stillingar
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,lager Eignir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,lager Eignir
 DocType: Restaurant,Active Menu,Virkur valmynd
 DocType: Target Detail,Target Qty,Target Magn
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Gegn láni: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Stillingar
 DocType: Student Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Afhending Note {0} Ekki má leggja
@@ -5398,9 +5439,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
 DocType: Vehicle Log,Odometer,kílómetramæli
 DocType: Production Plan Item,Ordered Qty,Raðaður Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Liður {0} er óvirk
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen uppí
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
 DocType: Chapter,Chapter Head,Kafli höfuð
 DocType: Payment Term,Month(s) after the end of the invoice month,Mánuður (s) eftir lok reiknings mánaðar
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Project virkni / verkefni.
@@ -5408,11 +5449,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Búa Laun laumar
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab niðurstaða datetime getur ekki verið fyrir prófunartíma
 DocType: POS Profile,Allow user to edit Discount,Leyfa notanda að breyta afslátt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Fáðu viðskiptavini frá
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Fáðu viðskiptavini frá
 DocType: Purchase Invoice Item,Include Exploded Items,Inniheldur sprauta hluti
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Kaup verður að vera merkt, ef við á er valið sem {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Afsláttur verður að vera minna en 100
 DocType: Shipping Rule,Restrict to Countries,Takmarka við lönd
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skrifaðu Off Upphæð (Company Gjaldmiðill)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 DocType: Project,Total Sales Amount (via Sales Order),Samtals sölugjald (með sölupöntun)
@@ -5429,6 +5471,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Matsstjóri
 DocType: Payment Entry,Allocate Payment Amount,Úthluta Greiðsla Upphæð
+DocType: Subscription Plan,Subscription Plan,Áskriftaráætlun
 DocType: Employee External Work History,Salary,Laun
 DocType: Serial No,Delivery Document Type,Afhending Document Type
 DocType: Sales Order,Partly Delivered,hluta Skilað
@@ -5453,9 +5496,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Uppsetning forstillingar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Engin afhendingartilkynning valin fyrir viðskiptavini {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Engin afhendingartilkynning valin fyrir viðskiptavini {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM stað
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Veldu Atriði byggt á Afhendingardagur
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Veldu Atriði byggt á Afhendingardagur
 DocType: Grant Application,Has any past Grant Record,Hefur einhverjar fyrri styrkleikaskrár
 ,Sales Analytics,velta Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Laus {0}
@@ -5473,7 +5516,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Staðar Kostnaður
 DocType: Selling Settings,Settings for Selling Module,Stillingar fyrir Selja Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hótel herbergi fyrirvara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Þjónustuver
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Þjónustuver
 DocType: BOM,Thumbnail,Smámynd
 DocType: Item Customer Detail,Item Customer Detail,Liður Viðskiptavinur Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilboð frambjóðandi a Job.
@@ -5489,7 +5532,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Nemendur hafa verið skráðir
 DocType: Fees,Student Details,Nánari upplýsingar
 DocType: Purchase Invoice Item,Stock Qty,Fjöldi hluta
-DocType: Employee Loan,Repayment Period in Months,Lánstími í mánuði
+DocType: Loan,Repayment Period in Months,Lánstími í mánuði
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Villa: Ekki gild id?
 DocType: Naming Series,Update Series Number,Uppfæra Series Number
 DocType: Account,Equity,Eigið fé
@@ -5498,7 +5541,7 @@
 DocType: Task,Closing Date,lokadegi
 DocType: Sales Order Item,Produced Quantity,framleidd Magn
 DocType: Timesheet,Work Detail,Vinna smáatriði
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,verkfræðingur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,verkfræðingur
 DocType: Journal Entry,Total Amount Currency,Heildarfjárhæð Gjaldmiðill
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Leit Sub þing
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Item Code þörf á Row nr {0}
@@ -5543,13 +5586,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Upplýsingar um gjafa Upplýsingar.
 DocType: Request for Quotation,Supplier Detail,birgir Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Villa í formúlu eða ástandi: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Upphæð á reikningi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Upphæð á reikningi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Viðmiðunarþyngd verður að bæta allt að 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Aðsókn
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,lager vörur
 DocType: BOM,Materials,efni
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",Ef ekki hakað listi verður að vera bætt við hvorri deild þar sem það þarf að vera beitt.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Búa til {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Uppruni og Target Warehouse getur ekki verið það sama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Staða dagsetningu og staða tími er nauðsynlegur
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Tax sniðmát fyrir að kaupa viðskiptum.
@@ -5573,14 +5615,14 @@
 DocType: Shipping Rule,Fixed,Fastur
 DocType: Vehicle Service,Clutch Plate,Clutch Plate
 DocType: Company,Round Off Account,Umferð Off reikning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,rekstrarkostnaður
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,rekstrarkostnaður
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ráðgjöf
 DocType: Customer Group,Parent Customer Group,Parent Group Viðskiptavinur
-DocType: Journal Entry,Subscription,Áskrift
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Áskrift
 DocType: Purchase Invoice,Contact Email,Netfang tengiliðar
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Gjöld vegna verðtryggingar
 DocType: Appraisal Goal,Score Earned,skora aflað
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,uppsagnarfrestur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,uppsagnarfrestur
 DocType: Asset Category,Asset Category Name,Asset Flokkur Nafn
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Þetta er rót landsvæði og ekki hægt að breyta.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nýtt Sales Person Name
@@ -5593,7 +5635,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Leyfi óskráð ef þú vilt ekki íhuga hópur meðan þú setur námskeið.
 DocType: Asset,Frequency of Depreciation (Months),Tíðni Afskriftir (mánuðir)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Credit Reikningur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Credit Reikningur
 DocType: Landed Cost Item,Landed Cost Item,Landað kostnaðarliðurinn
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Sýna núll gildi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Magn lið sem fæst eftir framleiðslu / endurpökkunarinnar úr gefin magni af hráefni
@@ -5601,7 +5643,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Viðskiptakröfur Account
 DocType: Delivery Note Item,Against Sales Order Item,Gegn Sales Order Item
 DocType: Hub Settings,Company Logo,Fyrirtæki Logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
 DocType: Item,Default Warehouse,Sjálfgefið Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Fjárhagsáætlun er ekki hægt að úthlutað gegn Group reikninginn {0}
 DocType: Healthcare Settings,Patient Registration,Sjúklingur skráning
@@ -5635,11 +5677,10 @@
 DocType: Journal Entry,Total Debit,alls skuldfærsla
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Sjálfgefin fullunnum Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Vinsamlegast veldu Sjúklingur
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sölufulltrúa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sölufulltrúa
 DocType: Hotel Room Package,Amenities,Aðstaða
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Fjárhagsáætlun og kostnaður Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Margfeldi sjálfgefið greiðslumáti er ekki leyfilegt
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,fyrir
 ,Appointment Analytics,Ráðstefna Analytics
 DocType: Vehicle Service,Half Yearly,Half Árlega
 DocType: Lead,Blog Subscriber,Blog Notandanúmer
@@ -5655,6 +5696,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Skildu eftir ef þú gerir nemendur hópa á ári
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ef hakað Total nr. vinnudaga mun fela frí, og þetta mun draga úr gildi af launum fyrir dag"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Forrit sem nota núverandi lykil vilja ekki geta nálgast, ertu viss?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,alls Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Breyta Sniðmát
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið fyrr en Term Start Date. Vinsamlega leiðréttu dagsetningar og reyndu aftur.
@@ -5665,8 +5707,9 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Upphæð
 DocType: Cheque Print Template,Signatory Position,Undirritaður Staða
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Setja sem Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Setja sem Lost
 DocType: Timesheet,Total Billable Hours,Samtals vinnustunda
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Fjöldi daga sem áskrifandi þarf að greiða reikninga sem myndast með þessari áskrift
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Greiðslukvittun Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Þetta er byggt á viðskiptum móti þessum viðskiptavinar. Sjá tímalínu hér fyrir nánari upplýsingar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Reiknaðar upphæð {1} verður að vera minna en eða jafngildir Greiðsla Entry upphæð {2}
@@ -5685,12 +5728,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Fá Síðasta kaupgengi
 DocType: Company,Company Info,Upplýsingar um fyrirtæki
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Umsókn um Funds (eignum)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Þetta er byggt á mætingu þessa starfsmanns
 DocType: Assessment Result,Summary,Yfirlit
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Aðsókn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,skuldfærslureikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,skuldfærslureikning
 DocType: Fiscal Year,Year Start Date,Ár Start Date
 DocType: Attendance,Employee Name,starfsmaður Name
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Veitingahús Order Entry Item
@@ -5702,7 +5745,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kaup Upphæð
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,starfskjör
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,starfskjör
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakkað magn verður að vera jafnt magn fyrir lið {0} í röð {1}
 DocType: Work Order,Manufactured Qty,Framleiðandi Magn
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Hlutarnir eru ekki til með {0}
@@ -5710,12 +5753,12 @@
 DocType: Asset,Out of Order,Bilað
 DocType: Purchase Receipt Item,Accepted Quantity,Samþykkt Magn
 DocType: Projects Settings,Ignore Workstation Time Overlap,Hunsa vinnustöðartímann
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Vinsamlegast setja sjálfgefið Holiday lista fyrir Starfsmaður {0} eða fyrirtækis {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Vinsamlegast setja sjálfgefið Holiday lista fyrir Starfsmaður {0} eða fyrirtækis {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} er ekki til
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Veldu hópnúmer
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Víxlar vakti til viðskiptavina.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
 DocType: Patient Service Unit,Medical Administrator,Læknisfræðingur
 DocType: Assessment Plan,Schedule,Dagskrá
 DocType: Account,Parent Account,Parent Reikningur
@@ -5745,15 +5788,16 @@
 DocType: Asset Repair,Repair Status,Viðgerðarstaða
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Bókhald dagbók færslur.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Laus Magn á frá vöruhúsi
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Vinsamlegast veldu Starfsmaður Taka fyrst.
 DocType: POS Profile,Account for Change Amount,Reikningur fyrir Change Upphæð
 DocType: Purchase Invoice,input service,inntakstími
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account passar ekki við {1} / {2} í {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Viðhaldsliðsmaður
 DocType: Agriculture Analysis Criteria,Soil Analysis,Jarðgreining
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Námskeiðskóði:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
 DocType: Employee,Current Address,Núverandi heimilisfang
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ef hluturinn er afbrigði af annað lið þá lýsingu, mynd, verðlagningu, skatta osfrv sett verður úr sniðmátinu nema skýrt tilgreint"
 DocType: Serial No,Purchase / Manufacture Details,Kaup / Framleiðsla Upplýsingar
@@ -5801,19 +5845,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Innlagnir fyrir {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Árstíðum til að setja fjárveitingar, markmið o.fl."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Breytilegt nafn
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",Liður {0} er sniðmát skaltu velja einn af afbrigði hennar
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",Liður {0} er sniðmát skaltu velja einn af afbrigði hennar
 DocType: Asset,Asset Category,Asset Flokkur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net borga ekki vera neikvæð
 DocType: Purchase Order,Advance Paid,Advance Greiddur
 DocType: Item,Item Tax,Liður Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Efni til Birgir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Efni til Birgir
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Efni beiðni um skipulagningu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,vörugjöld Invoice
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% virðist oftar en einu sinni
 DocType: Expense Claim,Employees Email Id,Starfsmenn Netfang Id
 DocType: Employee Attendance Tool,Marked Attendance,Marked Aðsókn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,núverandi Skuldir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,núverandi Skuldir
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Niðurteljari fór yfir tiltekin klukkustund.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Senda massa SMS til þinn snerting
 DocType: Patient,A Positive,A Jákvæð
@@ -5824,9 +5868,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Raunveruleg Magn er nauðsynlegur
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og kauptilboð til þessa birgis skulu gefin út með varúð.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Eignastýringarteymi
-DocType: Employee Loan,Loan Type,lán Type
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} hefur verið sent inn með góðum árangri
+DocType: Loan,Loan Type,lán Type
 DocType: Scheduling Tool,Scheduling Tool,Tímasetningar Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Liður í að framleiða eða repacked
 DocType: Employee Education,Major/Optional Subjects,Major / valgreinum
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5858,7 +5903,7 @@
 DocType: Item,Units of Measure,Mælieiningar
 DocType: Manufacturing Settings,Allow Production on Holidays,Leyfa Framleiðsla á helgidögum
 DocType: Sales Invoice,Customer's Purchase Order Date,Viðskiptavinar Purchase Order Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Sýna opinberar viðhengi
 DocType: Packing Slip,Package Weight Details,Pakki Þyngd Upplýsingar
 DocType: Restaurant Reservation,Reservation Time,Afgreiðslutími
@@ -5873,7 +5918,7 @@
 DocType: Purchase Order,To Receive and Bill,Að taka við og Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd eftir dagsetningu má ekki vera fyrir viðskiptadag
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Valin Vörur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,hönnuður
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,hönnuður
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Skilmálar og skilyrði Snið
 DocType: Serial No,Delivery Details,Afhending Upplýsingar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostnaður Center er krafist í röð {0} skatta borð fyrir tegund {1}
@@ -5883,20 +5928,20 @@
 DocType: Driver,Expiry Date,Fyrningardagsetning
 DocType: Healthcare Settings,Employee name and designation in print,Starfsmaður nafn og tilnefningu í prenti
 ,accounts-browser,reikningar-vafra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vinsamlegast veldu Flokkur fyrst
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vinsamlegast veldu Flokkur fyrst
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project húsbóndi.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Til að leyfa yfir innheimtu eða yfir-röðun, uppfæra &quot;vasapeninga&quot; í lager Stillingar eða hlutinn."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ekki sýna tákn eins og $ etc hliðina gjaldmiðlum.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Hálfur dagur)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Hálfur dagur)
 DocType: Payment Term,Credit Days,Credit Days
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Vinsamlegast veldu Sjúklingur til að fá Lab Tests
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Gera Student Hópur
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er bera fram
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Fá atriði úr BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Fá atriði úr BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lead Time Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er tekjuskattur kostnaður
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kannaðu þetta ef nemandi er búsettur í gistihúsinu.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vinsamlegast sláðu sölu skipunum í töflunni hér að ofan
 ,Stock Summary,Stock Yfirlit
@@ -5907,10 +5952,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dagsetning
 DocType: Employee,Reason for Leaving,Ástæða til að fara
 DocType: BOM Operation,Operating Cost(Company Currency),Rekstrarkostnaður (Company Gjaldmiðill)
-DocType: Employee Loan Application,Rate of Interest,Vöxtum
+DocType: Loan Application,Rate of Interest,Vöxtum
 DocType: Expense Claim Detail,Sanctioned Amount,bundnar Upphæð
 DocType: Item,Shelf Life In Days,Geymsluþol á dögum
 DocType: GL Entry,Is Opening,er Opnun
+DocType: Department,Expense Approvers,Kostnaðarsamþykktir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: gjaldfærslu ekki hægt að tengja með {1}
 DocType: Journal Entry,Subscription Section,Áskriftarspurning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Reikningur {0} er ekki til
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index c0753ac..795097a 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Rapporti di valutazione
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Prodotti di consumo
-DocType: Purchase Receipt,Subscription Detail,Dettaglio dell&#39;abbonamento
 DocType: Supplier Scorecard,Notify Supplier,Notificare il fornitore
 DocType: Item,Customer Items,Articoli clienti
 DocType: Project,Costing and Billing,Costi e Fatturazione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
 DocType: Item,Publish Item to hub.erpnext.com,Pubblicare Item a hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifiche e-mail
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Valorizzazione
 DocType: Item,Default Unit of Measure,Unità di Misura Predefinita
 DocType: SMS Center,All Sales Partner Contact,Tutte i contatti Partner vendite
-DocType: Employee,Leave Approvers,Responsabili ferie
+DocType: Department,Leave Approvers,Responsabili ferie
 DocType: Sales Partner,Dealer,Rivenditore
 DocType: Work Order,WO-,wo-
 DocType: Consultation,Investigations,indagini
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Verificare la disponibilità
 DocType: Job Applicant,Job Applicant,Candidati
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni relative a questo fornitore. Vedere cronologia sotto per i dettagli
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,legale
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Il tipo di imposta / tassa non può essere inclusa nella tariffa della riga {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,legale
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Il tipo di imposta / tassa non può essere inclusa nella tariffa della riga {0}
 DocType: Bank Guarantee,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Richiesto da
 DocType: Delivery Note,Return Against Delivery Note,Di ritorno contro Consegna Nota
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Il Conto bancario non si può chiamare {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Soci (o società) per le quali le scritture contabili sono fatte e i saldi vengono mantenuti.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),In sospeso per {0} non può essere inferiore a zero ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Non ci sono pagamenti salariati da elaborare.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Non ci sono pagamenti salariati da elaborare.
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra aperta
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,È necessario prendere questa azione oggi stessa per quanto sopra riportato
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serie Aggiornato con successo
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Check-out
 DocType: Pricing Rule,Apply On,applicare On
@@ -56,13 +53,12 @@
 DocType: SMS Center,All Supplier Contact,Tutti i Contatti Fornitori
 DocType: Support Settings,Support Settings,Impostazioni di supporto
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Item scadenza di stato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Assegno Bancario
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Assegno Bancario
 DocType: Membership,membership validaty section,sezione validaty di appartenenza
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
-DocType: Consultation,Consultation,Consultazione
+DocType: Consultation,Consultation,Consulto
 DocType: Accounts Settings,Show Payment Schedule in Print,Mostra programma pagamenti in stampa
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,Vendite e restituzioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra Varianti
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Fare un sito web
 DocType: Opening Invoice Creation Tool Item,Quantity,Quantità
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La tabella dei conti non può essere vuota.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Prestiti (passività )
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,La tabella dei conti non può essere vuota.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Prestiti (passività )
 DocType: Employee Education,Year of Passing,Anni dal superamento
 DocType: Item,Country of Origin,Paese d&#39;origine
 DocType: Soil Texture,Soil Texture Criteria,Criteri di consistenza del suolo
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Dettagli del contatto principale
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Problemi Aperti
 DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
 DocType: Lab Test Groups,Add new line,Aggiungi nuova riga
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Assistenza Sanitaria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ritardo nel pagamento (Giorni)
@@ -89,7 +85,7 @@
 ,Delay Days,Giorni di ritardo
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Fattura
+DocType: Subscription Invoice,Invoice,Fattura
 DocType: Purchase Invoice Item,Item Weight Details,Dettagli peso articolo
 DocType: Asset Maintenance Log,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Importo totale Costing
 DocType: Delivery Note,Vehicle No,Veicolo No
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Seleziona Listino Prezzi
@@ -108,38 +104,38 @@
 DocType: Work Order Operation,Work In Progress,Lavori in corso
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Seleziona la data
 DocType: Daily Work Summary Group,Holiday List,Elenco vacanza
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Ragioniere
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Ragioniere
 DocType: Hub Settings,Selling Price List,Listino prezzi di vendita
 DocType: Patient,Tobacco Current Use,Uso corrente di tabacco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Tasso di vendita
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Tasso di vendita
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,N. di telefono
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nuova {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notifica email iniziale inviata
 ,Sales Partners Commission,Vendite Partners Commissione
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
 DocType: Purchase Invoice,Rounding Adjustment,Regolazione arrotondamento
 apps/erpnext/erpnext/setup/doctype/company/company.py +46,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
-DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Slot di orario di programmazione medico
+DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Slot orario del medico
 DocType: Payment Request,Payment Request,Richiesta di Pagamento
 DocType: Asset,Value After Depreciation,Valore Dopo ammortamenti
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Correlata
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Data la frequenza non può essere inferiore a quella di unirsi del dipendente
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Data la frequenza non può essere inferiore a quella di unirsi del dipendente
 DocType: Grading Scale,Grading Scale Name,Grading Scale Nome
-DocType: Subscription,Repeat on Day,Ripetere il giorno
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Questo è un account di root e non può essere modificato .
 DocType: Sales Invoice,Company Address,indirizzo aziendale
 DocType: BOM,Operations,Operazioni
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossibile impostare autorizzazione sulla base di Sconto per {0}
+DocType: Subscription,Subscription Start Date,Data di inizio dell&#39;iscrizione
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Allega file .csv con due colonne, una per il vecchio nome e uno per il nuovo nome"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} non presente in alcun Anno Fiscale attivo.
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Riferimento: {0}, codice dell&#39;articolo: {1} e cliente: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Data di fine del periodo di prova Non può essere precedente alla Data di inizio del periodo di prova
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura di un lavoro.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},La distinta componenti non viene specificata per l&#39;articolo conto terzi {0} alla riga {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},La Distinta Base non è stata specificata per l'articolo conto terzi {0} alla riga {1}
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Risultato inviato
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +74,Timespan,Arco di tempo
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La stessa azienda viene inserito più di una volta
 DocType: Patient,Married,Sposato
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non consentito per {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Ottenere elementi dal
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Ottenere elementi dal
 DocType: Price List,Price Not UOM Dependant,Prezzo non dipendente da UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prodotto {0}
@@ -160,7 +156,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondi Pensione
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
 DocType: Crop,Perennial,Perenne
-DocType: Consultation,Consultation Date,Data di consultazione
+DocType: Consultation,Consultation Date,Data del consulto
 DocType: Accounts Settings,Use Custom Cash Flow Format,Usa il formato del flusso di cassa personalizzato
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Distribuzione mensile ** aiuta a distribuire il Budget / Target nei mesi, nel caso di di business stagionali."
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,olio freno
 DocType: Tax Rule,Tax Type,Tipo fiscale
 ,Completed Work Orders,Ordini di lavoro completati
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Imponibile
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Imponibile
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: BOM,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riga # {0}: Il tipo di documento di riferimento deve essere uno dei requisiti di spesa o voce del giornale
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Seleziona la Distinta Materiali
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riga # {0}: Il tipo di documento di riferimento deve essere uno dei requisiti di spesa o voce del giornale
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Seleziona la Distinta Materiali
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo di oggetti consegnati
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gestisci l&#39;importo anticipato dato al Dipendente
@@ -200,19 +196,18 @@
 DocType: Delivery Trip,Delivery Notification,Notifica di consegna
 DocType: Journal Entry,Opening Entry,Apertura Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Solo conto pay
-DocType: Employee Loan,Repay Over Number of Periods,Rimborsare corso Numero di periodi
+DocType: Loan,Repay Over Number of Periods,Rimborsare corso Numero di periodi
 DocType: Stock Entry,Additional Costs,Costi aggiuntivi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Account con transazioni registrate non può essere convertito a gruppo.
 DocType: Lead,Product Enquiry,Richiesta di informazioni sui prodotti
 DocType: Education Settings,Validate Batch for Students in Student Group,Convalida il gruppo per gli studenti del gruppo studente
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nessun record congedo trovato per dipendente {0} per {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nessun record congedo trovato per dipendente {0} per {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Inserisci prima azienda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Seleziona prima azienda
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Seleziona prima azienda
 DocType: Employee Education,Under Graduate,Laureando
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,prestito dipendenti
 DocType: Fee Schedule,Send Payment Request Email,Invia la richiesta di pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Immobiliare
@@ -232,20 +227,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Registrazione cancellata con successo.
 DocType: Assessment Result,Grade,Grado
 DocType: Restaurant Table,No of Seats,No delle sedute
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Per aggiungere argomento dinamico, utilizzare i tag jinja come <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Consegnato dal Fornitore
 DocType: Asset Maintenance Task,Asset Maintenance Task,Attività di manutenzione degli asset
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Stipendio Annuo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Stipendio Annuo
 DocType: Daily Work Summary,Daily Work Summary,Riepilogo lavori giornaliero
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} è bloccato
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Spese di stoccaggio
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Spese di stoccaggio
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Seleziona il Magazzino di Destinazione
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Inserisci il contatto preferito Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Inserisci il contatto preferito Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
@@ -266,7 +258,7 @@
 DocType: Customer,Primary Address,indirizzo primario
 DocType: Production Plan,Material Request Detail,Dettaglio richiesta materiale
 DocType: Selling Settings,Default Quotation Validity Days,Giorni di validità delle quotazioni predefinite
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,quantità di modifica
@@ -282,7 +274,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,emittente
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Imposta modalità del POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Disabilita la creazione di registrazioni temporali contro gli ordini di lavoro. Le operazioni non devono essere tracciate contro l&#39;ordine di lavoro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,esecuzione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Asset Maintenance Log,Maintenance Status,Stato di manutenzione
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Dettagli iscrizione
@@ -291,11 +283,11 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ore totali: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
 DocType: Drug Prescription,Interval,Intervallo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferenza
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferenza
 DocType: Grant Application,Individual,Individuale
 DocType: Academic Term,Academics User,Utenti accademici
 DocType: Cheque Print Template,Amount In Figure,Importo Nella figura
-DocType: Employee Loan Application,Loan Info,Info prestito
+DocType: Loan Application,Loan Info,Info prestito
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Piano per le visite di manutenzione.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Periodo del punteggio fornitore
 DocType: Share Transfer,Share Transfer,Condividi trasferimento
@@ -311,7 +303,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Modello di oggetto
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochimica
 DocType: Job Offer,Select Terms and Conditions,Selezionare i Termini e Condizioni
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Valore out
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Valore out
 DocType: Woocommerce Settings,Woocommerce Settings,Impostazioni Woocommerce
 DocType: Production Plan,Sales Orders,Ordini di vendita
 DocType: Purchase Taxes and Charges,Valuation,Valorizzazione
@@ -334,7 +326,7 @@
 DocType: Selling Settings,Default Territory,Territorio Predefinito
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,televisione
 DocType: Work Order Operation,Updated via 'Time Log',Aggiornato con 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Company,Enable Perpetual Inventory,Abilita inventario perpetuo
@@ -361,7 +353,7 @@
 DocType: Lab Test,Custom Result,Risultato personalizzato
 DocType: Delivery Stop,Contact Name,Nome Contatto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criteri di valutazione del corso
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ID fiscale:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ID fiscale:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,ID studente:
 DocType: POS Customer Group,POS Customer Group,POS Gruppi clienti
 DocType: Land Unit,Land Unit describing various land assets,Unità di terra che descrive vari beni terreni
@@ -374,9 +366,8 @@
 ,Open Work Orders,Apri ordini di lavoro
 DocType: Payment Term,Credit Months,Mesi di credito
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Retribuzione netta non può essere inferiore a 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Per interrompere l&#39;invio di notifiche di errore ripetitive dal sistema, abbiamo verificato il campo Disabled nel sottoscrizione"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Ferie per Anno
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Ferie per Anno
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Deposito {0} non appartiene alla società {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
@@ -384,9 +375,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Impostare gli studenti in gruppi di studenti
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Registrazioni bancarie
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Registrazioni bancarie
 DocType: Crop,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura di Vendita n.
@@ -394,7 +385,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Corso di Gruppo Student strumento di creazione
 DocType: Lead,Do Not Contact,Non Contattaci
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Le persone che insegnano presso la propria organizzazione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Course Scheduling Tool,Course Start Date,Data inizio corso
@@ -403,8 +394,8 @@
 DocType: Item,Publish in Hub,Pubblicare in Hub
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,"Acquisto, i dati"
@@ -440,9 +431,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grado
 DocType: Email Digest,New Quotations,Nuovi Preventivi
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Messaggi di posta elettronica stipendio slittamento al dipendente sulla base di posta preferito selezionato a dipendenti
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
 DocType: Tax Rule,Shipping County,Distretto di  Spedizione
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Guide
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Guide
 DocType: Asset,Next Depreciation Date,Data ammortamento successivo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
@@ -452,7 +442,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
 DocType: Item,Synced With Hub,Sincronizzati con Hub
 DocType: Driver,Fleet Manager,Responsabile flotta aziendale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} non può essere negativo per la voce {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} non può essere negativo per la voce {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Password Errata
 DocType: Item,Variant Of,Variante di
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
@@ -474,7 +464,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Si prega di impostare la tariffa della camera dell&#39;hotel su {}
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Tipo Fattura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Documento Di Trasporto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Documento Di Trasporto
 DocType: Consultation,Encounter Impression,Incontro impressione
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Costo del bene venduto
@@ -501,11 +491,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasso con cui la valuta Cliente viene convertita in valuta di base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Corso strumento Pianificazione
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgente] Errore durante la creazione di% s ricorrenti per% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
 DocType: Land Unit,LInked Analysis,Analisi di LInked
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Il periodo di applicazione non può essere su due record di allocazione
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Il periodo di applicazione non può essere su due record di allocazione
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} già allocato il dipendente {1} per il periodo {2} a {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
@@ -519,7 +508,7 @@
 DocType: Purchase Order,% Received,% Ricevuto
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creazione di gruppi di studenti
 DocType: Volunteer,Weekends,Fine settimana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Importo della nota di credito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Importo della nota di credito
 DocType: Setup Progress Action,Action Document,Documento d&#39;azione
 DocType: Chapter Member,Website URL,URL del sito web
 ,Finished Goods,Beni finiti
@@ -533,6 +522,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Aggiungi articoli
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Voce di controllo di qualità dei parametri
+DocType: Leave Application,Leave Approver Name,Nome responsabile ferie
 DocType: Depreciation Schedule,Schedule Date,Programma Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Guadagni, deduzioni e altri componenti di stipendio"
 DocType: Packed Item,Packed Item,Articoli imballato
@@ -549,7 +539,7 @@
 DocType: Request for Quotation,Request for Quotation,Richiesta di offerta
 DocType: Healthcare Settings,Require Lab Test Approval,Richiede l&#39;approvazione di un test di laboratorio
 DocType: Salary Slip Timesheet,Working Hours,Orari di lavoro
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Assolutamente stupendo
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Assolutamente stupendo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
 DocType: Dosage Strength,Strength,Forza
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Creare un nuovo cliente
@@ -562,7 +552,7 @@
 DocType: Workstation,Consumable Cost,Costo consumabili
 DocType: Purchase Receipt,Vehicle Date,Data Veicolo
 DocType: Student Log,Medical,Medico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Motivo per Perdere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Motivo per Perdere
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Aggiorna il numero di conto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Il proprietario del Lead non può essere il Lead stesso
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,importo concesso non può maggiore del valore non aggiustato
@@ -572,11 +562,10 @@
 DocType: Lab Test Template,Single,Singolo
 DocType: Salary Slip,Total Loan Repayment,Totale Rimborso prestito
 DocType: Account,Cost of Goods Sold,Costo del venduto
-DocType: Subscription,Yearly,Annuale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Inserisci Centro di costo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Inserisci Centro di costo
 DocType: Drug Prescription,Dosage,Dosaggio
 DocType: Journal Entry Account,Sales Order,Ordine di vendita
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Tasso di vendita
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Tasso di vendita
 DocType: Assessment Plan,Examiner Name,Nome Examiner
 DocType: Lab Test Template,No Result,Nessun risultato
 DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
@@ -601,13 +590,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Campo obbligatorio - Anno Accademico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} non è associato a {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizza testo di introduzione che andrà nell'email. Ogni transazione ha un introduzione distinta.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Imposta il conto pagabile in default per la società {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Imposta il conto pagabile in default per la società {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transazione non consentita contro interrotta Ordine di lavorazione {0}
 DocType: Setup Progress Action,Min Doc Count,Min di Doc Doc
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
@@ -630,8 +619,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Riservato per la vendita
 DocType: Packing Slip,From Package No.,Da Pacchetto N.
 DocType: Item Attribute,To Range,Per Intervallo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossibile modificare il metodo di valorizzazione, in quanto vi sono transazioni contro alcuni elementi che non hanno il proprio metodo di valorizzazione"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,I titoli e depositi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossibile modificare il metodo di valorizzazione, in quanto vi sono transazioni contro alcuni elementi che non hanno il proprio metodo di valorizzazione"
 DocType: Student Report Generation Tool,Attended by Parents,Assistito dai genitori
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Patient,AB Positive,AB Positivo
@@ -640,7 +629,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Archivio Presenze
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Stipendio per il libro paga base scheda attività.
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
-DocType: Employee Loan,Total Payment,Pagamento totale
+DocType: Loan,Total Payment,Pagamento totale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Impossibile annullare la transazione per l&#39;ordine di lavoro completato.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} viene annullato in modo che l&#39;azione non possa essere completata
@@ -656,15 +645,15 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parti abbastanza per costruire
 DocType: POS Profile User,POS Profile User,Profilo utente POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,reddito diretta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,reddito diretta
 DocType: Patient Appointment,Date TIme,Appuntamento
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,responsabile amministrativo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,responsabile amministrativo
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Impostare società e tasse
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Seleziona Corso
 DocType: Codification Table,Codification Table,Tabella di codificazione
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Selezionare prego
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Selezionare prego
 DocType: Stock Entry Detail,Difference Account,account differenza
 DocType: Purchase Invoice,Supplier GSTIN,Fornitore GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere l'attività; esistono attività dipendenti {0} non completate.
@@ -720,7 +709,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Fattura Fornitore N.
 DocType: Territory,For reference,Per riferimento
 DocType: Healthcare Settings,Appointment Confirmation,Conferma dell&#39;appuntamento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Chiusura (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ciao
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Sposta elemento
@@ -745,11 +734,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Già impostato come predefinito nel profilo pos {0} per l&#39;utente {1}, disabilitato per impostazione predefinita"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valori accumulati
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Il territorio è richiesto nel profilo POS
 DocType: Supplier,Prevent RFQs,Impedire l&#39;RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Crea Ordine di vendita
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salary Slip presentato per il periodo da {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Salary Slip presentato per il periodo da {0} a {1}
 DocType: Project Task,Project Task,Attività Progetto
 ,Lead Id,Id del Lead
 DocType: C-Form Invoice Detail,Grand Total,Somma totale
@@ -770,7 +759,7 @@
 DocType: Sales Invoice,Shipping Bill Date,Data fattura di spedizione
 DocType: Production Plan,Production Plan,Piano di produzione
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Strumento di creazione fattura di apertura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Ritorno di vendite
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Totale foglie assegnati {0} non deve essere inferiore a foglie già approvati {1} per il periodo
 ,Total Stock Summary,Sommario totale delle azioni
 DocType: Announcement,Posted By,Pubblicato da
@@ -782,15 +771,15 @@
 DocType: Quotation,Quotation To,Preventivo a
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,L'Importo assegnato non può essere negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Imposti la Società
 DocType: Share Balance,Share Balance,Condividi saldo
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Training Result Employee,Training Result Employee,Employee Training Risultato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Magazzino logico utilizzato per l'entrata giacenza.
-DocType: Repayment Schedule,Principal Amount,Quota capitale
-DocType: Employee Loan Application,Total Payable Interest,Totale interessi passivi
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Quota capitale
+DocType: Loan Application,Total Payable Interest,Totale interessi passivi
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totale in sospeso: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Timesheet Fattura di Vendita
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
@@ -799,10 +788,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
 DocType: Restaurant Reservation,Restaurant Reservation,Prenotazione Ristorante
 DocType: Land Unit,Land Unit Name,Nome unità di terra
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Scrivere proposta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Deduzione di Pagamento
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Avvolgendo
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Invia ai clienti tramite e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Invia ai clienti tramite e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un&#39;altra Sales Person {0} esiste con lo stesso ID Employee
 DocType: Employee Advance,Claimed Amount,Importo richiesto
 apps/erpnext/erpnext/config/education.py +180,Masters,Principali
@@ -820,13 +809,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway account non ha creato, per favore creare uno manualmente."
 DocType: Supplier Scorecard,Per Year,Per anno
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Non è ammissibile per l&#39;ammissione in questo programma come per DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marca
 DocType: Sales Invoice,Sales Taxes and Charges,Tasse di vendita e oneri
 DocType: Employee,Organization Profile,Profilo dell'organizzazione
 DocType: Vital Signs,Height (In Meter),Altezza (in metro)
 DocType: Student,Sibling Details,Dettagli sibling
 DocType: Vehicle Service,Vehicle Service,Servizio di veicoli
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,fa scattare automaticamente la richiesta di feedback in base alle condizioni.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,fa scattare automaticamente la richiesta di feedback in base alle condizioni.
 DocType: Employee,Reason for Resignation,Motivo della Dimissioni
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Modello per la valutazione delle prestazioni .
 DocType: Sales Invoice,Credit Note Issued,Nota di Credito Emessa
@@ -841,10 +829,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Programma di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Quindi le Regole dei prezzi vengono filtrate in base a cliente, Gruppo Cliente, Territorio, Fornitore, Tipo Fornitore, Campagna, Partner di vendita ecc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Variazione netta Inventario
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Prestito gestione del personale
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Rapporto con Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager
 DocType: Payment Entry,Payment From / To,Pagamento da / a
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Il Nuovo limite di credito è inferiore all'attuale importo dovuto dal cliente. Il limite di credito deve essere almeno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Imposta l&#39;account in Magazzino {0}
@@ -890,19 +877,18 @@
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Per eseguire documenti ricorrenti
 ,GST Itemised Purchase Register,Registro Acquisti Itemized GST
 DocType: Course Scheduling Tool,Reschedule,Riprogrammare
-DocType: Employee Loan,Total Interest Payable,Totale interessi passivi
+DocType: Loan,Total Interest Payable,Totale interessi passivi
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Tasse Landed Cost e oneri
 DocType: Work Order Operation,Actual Start Time,Ora di inizio effettiva
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Finire
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Base
 DocType: Timesheet,Total Billed Hours,Totale Ore Fatturate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Importo Svalutazione
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Importo Svalutazione
 DocType: Leave Block List Allow,Allow User,Consentire Utente
 DocType: Journal Entry,Bill No,Fattura N.
 DocType: Company,Gain/Loss Account on Asset Disposal,Conto profitti / perdite su Asset in smaltimento
 DocType: Vehicle Log,Service Details,Dettagli del servizio
-DocType: Subscription,Quarterly,Trimestralmente
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,raggruppate
 DocType: Selling Settings,Delivery Note Required,Documento di Trasporto Richiesto
@@ -913,7 +899,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Scheda attività
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materie prime calcolate in base a
 DocType: Sales Invoice,Port Code,Port Code
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Riserva magazzino
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Riserva magazzino
 DocType: Lead,Lead is an Organization,Lead è un&#39;organizzazione
 DocType: Guardian Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre vendita
@@ -925,12 +911,12 @@
 DocType: Account,Accounts,Contabilità
 DocType: Vehicle,Odometer Value (Last),Valore del contachilometri (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelli di criteri di scorecard fornitori.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Il Pagamento è già stato creato
 DocType: Request for Quotation,Get Suppliers,Ottenere Fornitori
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Anteprima foglio paga
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Anteprima foglio paga
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valorizzazione
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Puoi rinnovare solo se la tua iscrizione scade entro 30 giorni
@@ -940,7 +926,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Seleziona solo se hai impostato i documenti del Flow Flow Mapper
 DocType: Email Digest,Next email will be sent on:,La prossima Email verrà inviata il:
 DocType: Supplier Scorecard,Per Week,A settimana
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Studente totale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
@@ -961,9 +947,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Entry Carta di Credito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Azienda e Contabilità
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,in Valore
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,in Valore
 DocType: Asset Settings,Depreciation Options,Opzioni di ammortamento
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Tempo di pubblicazione non valido
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Tempo di pubblicazione non valido
 DocType: Lead,Campaign Name,Nome Campagna
 DocType: Hotel Room,Capacity,Capacità
 DocType: Selling Settings,Close Opportunity After Days,Chiudi Opportunità dopo giorni
@@ -988,7 +974,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Budget,Budget Against,budget contro
 DocType: Employee,Cell Number,Numero di Telefono
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Non ci sono dipendenti per i criteri indicati. Verifica che gli Scivoli salariali non siano già stati creati.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Non ci sono dipendenti per i criteri indicati. Verifica che gli Scivoli salariali non siano già stati creati.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Richieste Materiale Auto generata
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile inserire il buono nella colonna 'Against Journal Entry'
@@ -1000,14 +986,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l&#39;articolo {2}. Hai fornito {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleziona una tabella
 DocType: BOM,Website Specifications,Website Specifiche
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} è un indirizzo email non valido in &#39;Destinatari&#39;
 DocType: Special Test Items,Particulars,particolari
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare la Distinta Base in quanto è collegata con altre
 DocType: Asset,Maintenance,Manutenzione
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Si prega di aggiornare lo stato del progetto
@@ -1065,26 +1050,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Impostazioni predefinite per Carrello
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Aggiungi Timelots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset demolito tramite diario {0}
-DocType: Employee Loan,Interest Income Account,Conto Interessi attivi
+DocType: Loan,Interest Income Account,Conto Interessi attivi
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Rivedi l&#39;invito inviato
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotecnologia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Spese di manutenzione dell'ufficio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Spese di manutenzione dell'ufficio
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Vai a
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Impostazione di account e-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Inserisci articolo prima
 DocType: Asset Repair,Downtime,I tempi di inattività
 DocType: Account,Liability,responsabilità
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Termine accademico:
 DocType: Salary Detail,Do not include in total,Non includere in totale
 DocType: Company,Default Cost of Goods Sold Account,Costo predefinito di Account merci vendute
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},La quantità di esempio {0} non può essere superiore alla quantità ricevuta {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Listino Prezzi non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Request for Quotation Supplier,Send Email,Invia Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 DocType: Item,Max Sample Quantity,Quantità di campione massima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nessuna autorizzazione
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nessuna autorizzazione
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Quotazione richiesta
 DocType: Vital Signs,Heart Rate / Pulse,Frequenza cardiaca / impulso
 DocType: Company,Default Bank Account,Conto Banca Predefinito
@@ -1095,11 +1080,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Test di laboratorio e segni vitali
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nessun dipendente trovato
-DocType: Subscription,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Il gruppo studente è già aggiornato.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Il gruppo studente è già aggiornato.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Aggiornamento del progetto.
 DocType: SMS Center,All Customer Contact,Tutti Contatti Clienti
 DocType: Land Unit,Tree Details,Dettagli Albero
@@ -1149,7 +1133,6 @@
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Importa presenze
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Tutti i Gruppi
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 DocType: Work Order,Item To Manufacture,Articolo da produrre
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} stato è {2}
@@ -1163,7 +1146,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Riseleziona, se l&#39;indirizzo scelto viene modificato dopo il salvataggio"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 DocType: Item,Hub Publishing Details,Dettagli di pubblicazione Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Apertura'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Apertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Aperto per fare
 DocType: Notification Control,Delivery Note Message,Messaggio del Documento di Trasporto
 DocType: Lab Test Template,Result Format,Formato risultato
@@ -1173,13 +1156,13 @@
 DocType: Payroll Entry,Bimonthly,ogni due mesi
 DocType: Vehicle Service,Brake Pad,Pastiglie freno
 DocType: Fertilizer,Fertilizer Contents,Contenuto di fertilizzante
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Ricerca & Sviluppo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Ricerca & Sviluppo
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di Registrazione
 DocType: Timesheet,Total Billed Amount,Totale Importo Fatturato
 DocType: Item Reorder,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +94,BOM #{0}: Raw material cannot be same as main Item,BOM # {0}: La materia prima non può essere uguale a quella principale
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +94,BOM #{0}: Raw material cannot be same as main Item,Distinta Base # {0}: La materia prima non può essere uguale a quella principale
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
 DocType: Sales Team,Incentives,Incentivi
 DocType: SMS Log,Requested Numbers,Numeri richiesti
@@ -1187,7 +1170,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Ignorare il controllo del limite di credito in ordine cliente
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Valutazione delle prestazioni.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","L&#39;attivazione di &#39;utilizzare per il Carrello&#39;, come Carrello è abilitato e ci dovrebbe essere almeno una regola imposta per Carrello"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Il Pagamento {0} è legato all'ordine {1}, controllare se deve essere considerato come anticipo in questa fattura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Il Pagamento {0} è legato all'ordine {1}, controllare se deve essere considerato come anticipo in questa fattura."
 DocType: Sales Invoice Item,Stock Details,Dettagli Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punto vendita
@@ -1221,7 +1204,7 @@
 DocType: Restaurant Table,Minimum Seating,Minima sede
 DocType: Item Attribute,Item Attribute Values,Valori Attributi Articolo
 DocType: Examination Result,Examination Result,L&#39;esame dei risultati
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Ricevuta di Acquisto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Ricevuta di Acquisto
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Riferimento Doctype deve essere uno dei {0}
@@ -1229,15 +1212,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
 DocType: Work Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} deve essere attivo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nessun articolo disponibile per il trasferimento
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Distinta Base {0} deve essere attiva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nessun articolo disponibile per il trasferimento
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Chiusura (apertura + totale)
 DocType: Journal Entry,Depreciation Entry,Ammortamenti Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annulla Visite Materiale {0} prima di annullare questa visita di manutenzione
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Tasso o Sconto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantità richiesta
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Preferiti
 DocType: Hub Settings,Custom Data,Dati personalizzati
@@ -1249,9 +1232,9 @@
 DocType: Medical Code,Medical Code Standard,Codice medico standard
 DocType: Soil Texture,Clay Composition (%),Composizione di argilla (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Si prega di salvare prima di assegnare attività.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valore Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valore Saldo
 DocType: Lab Test,Lab Technician,Tecnico di laboratorio
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista Prezzo di vendita
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Se selezionato, verrà creato un cliente, associato a Paziente. Le fatture pazienti verranno create contro questo Cliente. È inoltre possibile selezionare il cliente esistente durante la creazione di paziente."
 DocType: Bank Reconciliation,Account Currency,Valuta del saldo
@@ -1259,16 +1242,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Si prega di citare Arrotondamento account in azienda
 DocType: Purchase Receipt,Range,Intervallo
 DocType: Supplier,Default Payable Accounts,Contabilità Fornitori Predefinita
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Fee Structure,Components,componenti
 DocType: Item Barcode,Item Barcode,Barcode articolo
 DocType: Woocommerce Settings,Endpoints,endpoint
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","da generare. Se è ritardato, dovrai cambiare manualmente il campo &quot;Ripeti in Giorno del mese&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
 DocType: Share Transfer,From Folio No,Dal Folio n
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Anticipo Fattura di Acquisto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
@@ -1303,16 +1284,16 @@
 DocType: Asset,Available-for-use Date,Data disponibile per l&#39;uso
 DocType: Guardian,Guardian Name,Nome della guardia
 DocType: Cheque Print Template,Has Print Format,Ha Formato di stampa
-DocType: Employee Loan,Sanctioned,sanzionato
+DocType: Loan,Sanctioned,sanzionato
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,Obbligatorio. Forse non è stato definito il vambio di valuta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
 DocType: Student Admission,Publish on website,Pubblicare sul sito web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,La data Fattura Fornitore non può essere superiore della Data Registrazione
 DocType: Purchase Invoice Item,Purchase Order Item,Articolo dell'Ordine di Acquisto
 DocType: Agriculture Task,Agriculture Task,Attività agricola
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Proventi indiretti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Proventi indiretti
 DocType: Student Attendance Tool,Student Attendance Tool,Strumento Presenze
 DocType: Restaurant Menu,Price List (Auto created),Listino prezzi (creato automaticamente)
 DocType: Cheque Print Template,Date Settings,Impostazioni della data
@@ -1349,14 +1330,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
 DocType: Timesheet Detail,Bill,Conto
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bianco
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti i Lead (Aperti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: Qtà non disponibile per {4} in magazzino {1} al momento della pubblicazione della voce ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,È possibile selezionare solo un massimo di un&#39;opzione dall&#39;elenco di caselle di controllo.
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
 DocType: Item,Automatically Create New Batch,Crea automaticamente un nuovo batch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Assegnazione di {0} a {1} (riga {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Fare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Assegnazione di {0} a {1} (riga {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Fare
 DocType: Student Admission,Admission Start Date,L&#39;ammissione Data di inizio
 DocType: Journal Entry,Total Amount in Words,Importo Totale in lettere
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nuovo impiegato
@@ -1372,7 +1353,7 @@
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
 DocType: Repayment Schedule,Balance Loan Amount,Importo del prestito di bilancio
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Programma del corso
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Stock Options
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Disabilitare il recupero degli ultimi dettagli di acquisto in ordine d&#39;acquisto
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
@@ -1391,11 +1372,11 @@
 DocType: Packing Slip Item,Packing Slip Item,Distinta di imballaggio articolo
 DocType: Purchase Invoice,Cash/Bank Account,Conto Cassa/Banca
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Si prega di specificare un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,La creazione di varianti è stata accodata.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Riepilogo del lavoro per {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Plan,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} non può essere negativo
 DocType: Training Event,Self-Study,Autodidatta
@@ -1407,7 +1388,7 @@
 DocType: Workstation,Wages,Salari
 DocType: Asset Maintenance,Maintenance Manager Name,Nome del responsabile della manutenzione
 DocType: Agriculture Task,Urgent,Urgente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Si prega di specificare un ID Row valido per riga {0} nella tabella {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Si prega di specificare un ID Row valido per riga {0} nella tabella {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Impossibile trovare la variabile:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Seleziona un campo da modificare da numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Non può essere un elemento fisso quando viene creato il libro mastro.
@@ -1419,7 +1400,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nome del modello di ispezione di qualità
 DocType: Project,First Email,Prima email
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Importo di vendita
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Importo di vendita
 DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Share Transfer,Issue,Problema
@@ -1433,10 +1414,10 @@
 DocType: Tax Rule,Shipping State,Stato Spedizione
 ,Projected Quantity as Source,Proiezione Quantità come sorgente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Viaggio di consegna
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Viaggio di consegna
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo di trasferimento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Spese di vendita
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Spese di vendita
 DocType: Consultation,Diagnosis,Diagnosi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Listino d'Acquisto
 DocType: GL Entry,Against,Previsione
@@ -1450,7 +1431,7 @@
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
 DocType: Item,Default Supplier,Fornitore Predefinito
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nel corso di produzione Allowance Percentuale
-DocType: Employee Loan,Repayment Schedule,Piano di rimborso
+DocType: Loan,Repayment Schedule,Piano di rimborso
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condizioni Tipo di Spedizione
 DocType: Holiday List,Get Weekly Off Dates,Ottieni cadenze settimanali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
@@ -1464,15 +1445,15 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: Education Settings,Attendance Freeze Date,Data di congelamento della frequenza
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere società o persone fisiche
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visualizza tutti i prodotti
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Visualizza tutti i prodotti
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Età di piombo minima (giorni)
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,tutte le Distinte Materiali
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Tutte le Distinte Base
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Le camere dell&#39;hotel di tipo {0} non sono disponibili in {1}
 DocType: Patient,Default Currency,Valuta Predefinita
 DocType: Expense Claim,From Employee,Da Dipendente
 DocType: Driver,Cellphone Number,numero di cellulare
 DocType: Project,Monitor Progress,Monitorare i progressi
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
 DocType: Journal Entry,Make Difference Entry,Aggiungi Differenza
 DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data
 DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni
@@ -1483,7 +1464,7 @@
 DocType: SMS Center,Total Characters,Totale Personaggi
 DocType: Employee Advance,Claimed,Ha sostenuto
 DocType: Crop,Row Spacing,Row Spacing
-apps/erpnext/erpnext/controllers/buying_controller.py +165,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +165,Please select BOM in BOM field for Item {0},Seleziona Distinta Base nel campo Distinta Base per la voce {0}
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,Non c&#39;è alcuna variante di articolo per l&#39;articolo selezionato
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detagli Fattura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagamento Riconciliazione fattura
@@ -1502,7 +1483,7 @@
 DocType: Setup Progress Action,Action Name,Nome azione
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Inizio Anno
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Le prime 2 cifre di GSTIN dovrebbero corrispondere al numero di stato {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Data finale del periodo di fatturazione corrente Avviare
 DocType: Salary Slip,Leave Without Pay,Lascia senza stipendio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Capacity Planning Errore
@@ -1520,26 +1501,25 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,I campi verranno copiati solo al momento della creazione.
 DocType: Setup Progress Action,Domains,Domini
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Amministrazione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Amministrazione
 DocType: Cheque Print Template,Payer Settings,Impostazioni Pagatore
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Paga Netta (in lettere) sarà visibile una volta che si salva la busta paga.
 DocType: Purchase Invoice,Is Return,È Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Attenzione
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Il giorno iniziale è maggiore del giorno finale nell&#39;&#39;attività &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Reso / Nota di Debito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Reso / Nota di Debito
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
 DocType: Item,UOMs,Unità di Misure
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
 DocType: Purchase Invoice Item,UOM Conversion Factor,Fattore di conversione Unità di Misura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Inserisci Codice Articolo per ottenere il numero di lotto
 DocType: Stock Settings,Default Item Group,Gruppo Articoli Predefinito
-DocType: Employee Loan,Partially Disbursed,parzialmente erogato
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Concedere informazioni
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Concedere informazioni
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database dei fornitori.
 DocType: Account,Balance Sheet,Bilancio Patrimoniale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
 DocType: Fee Validity,Valid Till,Valido fino a
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Riunione degli insegnanti di genitori totali
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
@@ -1552,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Non è consentito modificare il gruppo di clienti per il cliente selezionato.
 ,Purchase Order Items To Be Billed,Articoli dell'Ordine di Acquisto da fatturare
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aggiornamento dei tempi di arrivo stimati.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aggiornamento dei tempi di arrivo stimati.
 DocType: Program Enrollment Tool,Enrollment Details,Dettagli iscrizione
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Seleziona un cliente
@@ -1571,18 +1551,18 @@
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Purchase Order,Group same items,stessi articoli di gruppo
 DocType: Purchase Invoice,Disable Rounded Total,Disabilita Arrotondamento su Totale
-DocType: Employee Loan Application,Repayment Info,Info rimborso
+DocType: Loan Application,Repayment Info,Info rimborso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'le voci' non possono essere vuote
 DocType: Maintenance Team Member,Maintenance Role,Ruolo di manutenzione
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Anno fiscale {0} non trovato
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Anno fiscale {0} non trovato
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Impostazione dipendenti
-DocType: Sales Order,SO-,COSÌ-
+DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Utente prenotazione hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Si prega di selezionare il prefisso prima
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ricerca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ricerca
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Specifica almeno un attributo nella tabella Attributi
 DocType: Announcement,All Students,Tutti gli studenti
@@ -1593,19 +1573,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Esiste un gruppo di articoli con lo stesso nome, si prega di cambiare il nome dell'articolo o di rinominare il gruppo di articoli"
 DocType: Crop Cycle,Less than a year,Meno di un anno
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,No. studente in mobilità
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
 DocType: Crop,Yield UOM,Resa UOM
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
 DocType: Item,Is Item from Hub,È elemento da Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Riga {0}: Tipo Attività è obbligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendo liquidato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendo liquidato
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro Mastro Contabile
 DocType: Stock Reconciliation,Difference Amount,Differenza Importo
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} on Lasciare {1}
 DocType: Purchase Invoice,Reverse Charge,Carica inversa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Utili Trattenuti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Utili Trattenuti
 DocType: Purchase Invoice,05-Change in POS,05-Cambia nel POS
 DocType: Vehicle Log,Service Detail,Particolare di servizio
 DocType: BOM,Item Description,Descrizione Articolo
@@ -1620,12 +1600,12 @@
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 ,Student and Guardian Contact Details,Student and Guardian Contatti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} l'Indirizzo e-mail è richiesto per inviare l'e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Apertura temporanea
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Apertura temporanea
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Visualizza Hub
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Il Saldo del Conto {0} deve essere sempre {1}
 DocType: Patient Appointment,More Info,Ulteriori Informazioni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Tasso di valorizzazione richiesto per la voce sulla riga {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Tasso di valorizzazione richiesto per la voce sulla riga {0}
 DocType: Supplier Scorecard,Scorecard Actions,Azioni Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Esempio: Master in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Magazzino Rifiutato
@@ -1635,7 +1615,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Supplier Quotation Item,Lead Time in days,Tempo di Consegna in giorni
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Conti pagabili Sommario
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Il pagamento dello stipendio da {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Il pagamento dello stipendio da {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Sales Order {0} non è valido
@@ -1644,7 +1624,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrizioni di laboratorio
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Piccolo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Piccolo
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Apertura dello strumento per la creazione di fatture
 DocType: Education Settings,Employee Number,Numero Dipendente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
@@ -1660,7 +1640,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Test di laboratorio datetime
 DocType: Email Digest,Add Quote,Aggiungi Citazione
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Fattore di conversione Unità di Misura è obbligatorio per Unità di Misura: {0} alla voce: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,spese indirette
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 DocType: Agriculture Analysis Criteria,Agriculture,agricoltura
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1671,7 +1651,7 @@
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
 apps/erpnext/erpnext/stock/doctype/item/item.py +202,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 DocType: Student Applicant,AP,AP
-DocType: Purchase Invoice Item,BOM,BOM
+DocType: Purchase Invoice Item,BOM,Distinta Base
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
 DocType: Vehicle,Fuel UOM,Fuel UOM
@@ -1690,8 +1670,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi delle attività dovrebbe essere 1. Modificare i pesi di tutte le attività del progetto di conseguenza
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Attrezzature Capital
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Impostare prima il codice dell&#39;articolo
 DocType: Item,ITEM-,ARTICOLO-
@@ -1699,7 +1679,7 @@
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 DocType: Antibiotic,Antibiotic,Antibiotico
 ,Team Updates,squadra Aggiornamenti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,per Fornitore
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Impostazione Tipo di account aiuta nella scelta questo account nelle transazioni.
 DocType: Purchase Invoice,Grand Total (Company Currency),Somma totale (valuta Azienda)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Creare Formato di stampa
@@ -1725,7 +1705,7 @@
 DocType: POS Item Group,POS Item Group,POS Gruppo Articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,L&#39;articolo alternativo non deve essere uguale al codice articolo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene all'Articolo {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalizzazione della valutazione provvisoria
 DocType: Salary Slip,Bank Account No.,Conto Bancario N.
@@ -1741,7 +1721,7 @@
 DocType: BOM Operation,Workstation,Stazione di lavoro
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fornitore della richiesta di offerta
 DocType: Healthcare Settings,Registration Message,Messaggio di registrazione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Dosaggio prescrizione
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Seleziona una società
@@ -1772,7 +1752,7 @@
 DocType: Project,Start and End Dates,Date di inizio e fine
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Apri la Distinta Base {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
 DocType: Authorization Rule,Average Discount,Sconto Medio
 DocType: Project Update,Great/Quickly,Grande / Rapidamente
 DocType: Purchase Invoice Item,UOM,Unità di misura
@@ -1781,8 +1761,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Si prega di selezionare i batch per l&#39;articolo in scatola
 DocType: Asset,Depreciation Schedules,piani di ammortamento
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Gli account seguenti potrebbero essere selezionati nelle impostazioni GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Gli account seguenti potrebbero essere selezionati nelle impostazioni GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
 DocType: Payment Request,Transaction Currency,transazioni valutarie
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Da {0} | {1} {2}
@@ -1793,6 +1773,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Media giornaliera in uscita
 DocType: POS Profile,Campaign,Campagna
 DocType: Supplier,Name and Type,Nome e Tipo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Stato approvazione deve essere ' Approvato ' o ' Rifiutato '
 DocType: Physician,Contacts and Address,Contatti e indirizzo
 DocType: Purchase Invoice,Contact Person,Persona di Riferimento
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data prevista di inizio' non può essere maggiore di 'Data di fine prevista'
@@ -1806,19 +1787,19 @@
 DocType: Student Admission,Eligibility and Details,Eligibilità e dettagli
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicazione
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Richiesta di offerta disabilitata per l'accesso dal portale, verificare le configurazioni del portale"
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabile di punteggio dei punteggi dei fornitori
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importo Acquisto
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Importo Acquisto
 DocType: Sales Invoice,Shipping Address Name,Destinazione
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Si sono verificati degli errori durante la creazione del programma del corso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,non può essere superiore a 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Detail,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
@@ -1839,12 +1820,12 @@
 DocType: Package Code,Package Code,Codice Confezione
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,apprendista
 DocType: Purchase Invoice,Company GSTIN,Azienda GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Quantità negative non è consentito
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantità negative non è consentito
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Dettaglio Tax tavolo prelevato dalla voce principale come una stringa e memorizzati in questo campo.
  Utilizzato per imposte e oneri"
 DocType: Supplier Scorecard Period,SSC-,SSC
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
@@ -1875,15 +1856,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Il Magazzino di provenienza è obbligatorio per il rigo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Il termine di pagamento nella riga {0} è probabilmente un duplicato.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agricoltura (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Documento di trasporto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Affitto Ufficio
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configura impostazioni gateway SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Documento di trasporto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Affitto Ufficio
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configura impostazioni gateway SMS
 DocType: Disease,Common Name,Nome comune
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importazione non riuscita!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Ore di lavoro Workstation
 DocType: Vital Signs,Blood Pressure,Pressione sanguigna
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,analista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,analista
 DocType: Item,Inventory,Inventario
 DocType: Item,Sales Details,Dettagli di vendita
 DocType: Quality Inspection,QI-,Qi-
@@ -1893,15 +1874,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validate il Corso iscritto agli studenti del gruppo studente
 DocType: Notification Control,Expense Claim Rejected,Rimborso Spese Rifiutato
 DocType: Item,Item Attribute,Attributo Articolo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Governo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Governo
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rimborso spese {0} esiste già per il registro di veicoli
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Nome Istituto
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Si prega di inserire l&#39;importo di rimborso
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Si prega di inserire l&#39;importo di rimborso
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Varianti Voce
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Servizi
 DocType: HR Settings,Email Salary Slip to Employee,E-mail busta paga per i dipendenti
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Selezionare il Fornitore Possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Selezionare il Fornitore Possibile
 DocType: Sales Invoice,Source,Fonte
 DocType: Customer,"Select, to make the customer searchable with these fields","Seleziona, per rendere il cliente ricercabile con questi campi"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra chiusa
@@ -1918,7 +1899,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Cash Flow da investimenti
 DocType: Program Course,Program Course,programma del Corso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding e spese
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Homepage,Company Tagline for website homepage,Società Sottotitolo per home page del sito
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso
@@ -1948,10 +1929,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Dettagli di estensione
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Si prega di inserire tutti i valori dei risultati richiesti
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Contabilità Sommario Crediti
-DocType: Employee Loan,Monthly Repayment Amount,Ammontare Rimborso Mensile
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Contabilità Sommario Crediti
+DocType: Loan,Monthly Repayment Amount,Ammontare Rimborso Mensile
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Apertura fatture
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
 DocType: UOM,UOM Name,Nome Unità di Misura
 DocType: GST HSN Code,HSN Code,Codice HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Contributo Importo
@@ -1970,10 +1951,10 @@
 DocType: Patient,Tobacco Past Use,Uso passato del tabacco
 DocType: Sales Invoice Item,Brand Name,Nome Marchio
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L&#39;utente {0} è già assegnato a Physician {1}
+apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},L'utente {0} è già assegnato al medico {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Scatola
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Fornitore Possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Fornitore Possibile
 DocType: Budget,Monthly Distribution,Distribuzione Mensile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista Receiver è vuoto . Si prega di creare List Ricevitore
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sanità (beta)
@@ -2000,7 +1981,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Non ci sono elementi per il confezionamento
 DocType: Shipping Rule Condition,From Value,Da Valore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
-DocType: Employee Loan,Repayment Method,Metodo di rimborso
+DocType: Loan,Repayment Method,Metodo di rimborso
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se selezionato, la pagina iniziale sarà il gruppo di default dell&#39;oggetto per il sito web"
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Reclami per spese dell'azienda.
@@ -2009,7 +1990,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificato richiesto
 DocType: Company,Default Holiday List,Lista vacanze predefinita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Riga {0}: From Time To Time e di {1} si sovrappone {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Passività in Giacenza
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Invoice,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Seleziona Azienda
@@ -2017,7 +1998,7 @@
 DocType: Student Report Generation Tool,Print Section,Sezione di stampa
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,L&#39;utente {0} non ha alcun profilo POS predefinito. Controlla predefinito alla riga {1} per questo utente.
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le giornate per cui si stanno segnando le ferie sono già di vacanze. Non è necessario chiedere un permesso.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le giornate per cui si stanno segnando le ferie sono già di vacanze. Non è necessario chiedere un permesso.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Riga {idx}: {field} è richiesto per creare le fatture di apertura {fattoice_type}
 DocType: Customer,Primary Address and Contact Detail,Indirizzo primario e dettagli di contatto
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Invia di nuovo pagamento Email
@@ -2028,10 +2009,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Si prega di selezionare almeno un dominio.
 DocType: Dependent Task,Dependent Task,Attività dipendente
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
 DocType: SMS Center,Receiver List,Lista Ricevitore
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Cerca Articolo
 DocType: Payment Schedule,Payment Amount,Pagamento Importo
@@ -2041,7 +2022,7 @@
 DocType: Assessment Plan,Grading Scale,Scala di classificazione
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stata inserita più volte nella tabella di conversione
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Già completato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock in mano
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock in mano
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importazione Corretta!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Richiesta di Pagamento già esistente {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
@@ -2052,17 +2033,16 @@
 DocType: Quotation Item,Quotation Item,Articolo del Preventivo
 DocType: Customer,Customer POS Id,ID del cliente POS
 DocType: Account,Account Name,Nome account
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Inserisci l&#39;URL del server Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di articolo del fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 DocType: Share Balance,To No,A No
-DocType: Subscription,Reference Document,Documento di riferimento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
 DocType: Accounts Settings,Credit Controller,Controllare Credito
-DocType: Grant Application,Applicant Type,Tipo di candidato
+DocType: Loan,Applicant Type,Tipo di candidato
 DocType: Purchase Invoice,03-Deficiency in services,03-Carenza nei servizi
 DocType: Delivery Note,Vehicle Dispatch Date,Data Spedizione Veicolo
 DocType: Healthcare Settings,Default Medical Code Standard,Standard di codice medico di default
@@ -2073,13 +2053,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fatturato
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account del Partner
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Risorse Umane
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Risorse Umane
 DocType: Lead,Upper Income,Reddito superiore
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rifiutare
 DocType: Journal Entry Account,Debit in Company Currency,Debito in Società Valuta
 DocType: BOM Item,BOM Item,BOM Articolo
 DocType: Appraisal,For Employee,Per Dipendente
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Crea una scrittura per l'esborso
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Crea una scrittura per l'esborso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: L'anticipo verso Fornitore deve essere un debito
 DocType: Company,Default Values,Valori Predefiniti
 DocType: Membership,INR,INR
@@ -2108,10 +2088,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totale (senza tasse)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conto di piombo
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve essere maggiore di 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Disponibile a magazzino
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Disponibile a magazzino
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvvigionamento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Campo obbligatorio - Programma
 DocType: Special Test Template,Result Component,Componente risultato
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Richiesta di Garanzia
@@ -2131,7 +2111,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Includere le vacanze entro i fogli come foglie
 DocType: Sales Invoice,Packed Items,Articoli imballati
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Richiesta Garanzia per N. Serie
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Totale&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Totale&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Abilita Carrello
 DocType: Employee,Permanent Address,Indirizzo permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2149,10 +2129,10 @@
 DocType: Selling Settings,Selling Settings,Impostazioni Vendite
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Conferma azione
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Aste online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Compimento
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Vedi Carrello
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Spese di Marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Impossibile creare criteri standard. Si prega di rinominare i criteri
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
@@ -2174,9 +2154,9 @@
 DocType: Upload Attendance,Get Template,Ottieni Modulo
 DocType: Material Request,Transferred,trasferito
 DocType: Vehicle,Doors,Porte
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Installazione ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Installazione ERPNext completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Raccogliere la tariffa per la registrazione del paziente
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Impossibile modificare gli Attributi dopo il trasferimento di magazzino. Crea un nuovo Articolo e trasferisci le scorte al nuovo Articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Impossibile modificare gli Attributi dopo il trasferimento di magazzino. Crea un nuovo Articolo e trasferisci le scorte al nuovo Articolo
 DocType: Course Assessment Criteria,Weightage,Pesa
 DocType: Purchase Invoice,Tax Breakup,Elenco imposte
 DocType: Packing Slip,PS-,PS-
@@ -2216,18 +2196,18 @@
 DocType: Student Group Instructor,Student Group Instructor,Istruttore del gruppo di studenti
 DocType: Grant Application,Assessment  Mark (Out of 10),Segno di valutazione (su 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,principale
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +458,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +458,Default BOM ({0}) must be active for this item or its template,Distinta Base default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia non incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Email Digest,Annual Expenses,Spese annuali
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Importo Assegnato
 DocType: Sales Team,Contribution to Net Total,Contributo sul totale netto
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
@@ -2242,10 +2222,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Perizie
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventi formativi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Monitora lead per lead source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per un Tipo di Spedizione
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Prego entra
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Prego entra
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Registro di manutenzione
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Il peso netto di questo package (calcolato automaticamente come somma dei pesi netti).
@@ -2253,11 +2233,11 @@
 DocType: Sales Order,To Deliver and Bill,Da Consegnare e Fatturare
 DocType: Student Group,Instructors,Istruttori
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} deve essere confermata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} deve essere confermata
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestione delle azioni
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pagamento
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Il magazzino {0} non è collegato a nessun account, si prega di citare l&#39;account nel record magazzino o impostare l&#39;account di inventario predefinito nella società {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gestisci i tuoi ordini
 DocType: Work Order Operation,Actual Time and Cost,Tempo reale e costi
@@ -2267,7 +2247,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},l&#39;orario di lavoro totale non deve essere maggiore di ore di lavoro max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
@@ -2277,7 +2257,7 @@
 DocType: Item,Barcodes,Codici a barre
 DocType: Hub Category,Hub Node,Nodo hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito degli elementi duplicati . Si prega di correggere e riprovare .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associate
 DocType: Asset Movement,Asset Movement,Movimento Asset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,L&#39;ordine di lavoro {0} deve essere inviato
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nuovo carrello
@@ -2295,13 +2275,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,La valuta di fatturazione deve essere uguale alla valuta della società predefinita o alla valuta dell&#39;account del partito
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 DocType: Soil Texture,Loam,terra grassa
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Riga {0}: la data di scadenza non può essere precedente alla data di pubblicazione
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Riga {0}: la data di scadenza non può essere precedente alla data di pubblicazione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Effettua Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
 ,Sales Invoice Trends,Andamento Fatture di vendita
 DocType: Leave Application,Apply / Approve Leaves,Applicare / Approva Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Per
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Può riferirsi fila solo se il tipo di carica è 'On Fila Indietro Importo ' o ' Indietro totale riga '
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Può riferirsi fila solo se il tipo di carica è 'On Fila Indietro Importo ' o ' Indietro totale riga '
 DocType: Sales Order Item,Delivery Warehouse,Deposito di consegna
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Albero dei centri di costo finanziario.
 DocType: Serial No,Delivery Document No,Documento Consegna N.
@@ -2315,7 +2294,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Il consumo di materiale non è impostato nelle impostazioni di produzione.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossibile eseguire lo overbill per l&#39;articolo {0} nella riga {1} più di {2}. Per consentire la fatturazione eccessiva, si prega di impostare in Impostazioni di magazzino"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossibile eseguire lo overbill per l&#39;articolo {0} nella riga {1} più di {2}. Per consentire la fatturazione eccessiva, si prega di impostare in Impostazioni di magazzino"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aggiorna risposta
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
@@ -2326,11 +2305,11 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Selezionare prima il programma
 DocType: Patient Appointment,Patient Age,Età del paziente
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Gestione progetti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Il numero di serie {0} è già stato restituito
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Il numero di serie {0} è già stato restituito
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 DocType: Budget,Fiscal Year,Anno Fiscale
 DocType: Asset Maintenance Log,Planned,previsto
-DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Se non è impostato nel paziente per prenotare le spese di consultazione, è necessario utilizzare i conti di crediti di default."
+DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Se non è impostato nel paziente per prenotare le spese del consulto, è necessario utilizzare i conti di crediti di default."
 DocType: Vehicle Log,Fuel Price,Prezzo Carburante
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Imposta aperta
@@ -2345,16 +2324,16 @@
 DocType: Lead,Follow Up,Seguito
 DocType: Item,Is Sales Item,È Voce vendite
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppo Articoli
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
 DocType: Maintenance Visit,Maintenance Time,Tempo di Manutenzione
 ,Amount to Deliver,Importo da consegnare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Lo stesso oggetto è stato inserito più volte. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia di inizio non può essere anteriore alla data di inizio anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Ci sono stati degli errori.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Il Dipendente {0} ha già fatto domanda per {1} tra {2} e {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Ci sono stati degli errori.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Il Dipendente {0} ha già fatto domanda per {1} tra {2} e {3}:
 DocType: Guardian,Guardian Interests,Custodi Interessi
 DocType: Naming Series,Current Value,Valore Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
 DocType: Education Settings,Instructor Records to be created by,Istruttore Record da creare da
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creato
 DocType: GST Account,GST Account,Account GST
@@ -2374,8 +2353,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Aggiunto ai preferiti
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nessun documento retributivo scoperto da presentare per i criteri sopra menzionati OPPURE lo stipendio già presentato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Dazi e tasse
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nessun documento retributivo scoperto da presentare per i criteri sopra menzionati OPPURE lo stipendio già presentato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Dazi e tasse
 DocType: Projects Settings,Projects Settings,Impostazioni dei progetti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Inserisci Data di riferimento
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} I Pagamenti non possono essere filtrati per {1}
@@ -2385,19 +2364,19 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Albero di gruppi di articoli .
 DocType: Production Plan,Total Produced Qty,Quantità totale prodotta
 DocType: Payroll Entry,Get Employee Details,Ottieni i dettagli dei dipendenti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
 DocType: Asset,Sold,Venduto
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
 DocType: Account,Frozen,Congelato
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Importo base (in valuta principale)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Materiali grezzi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Materiali grezzi
 DocType: Payment Reconciliation Payment,Reference Row,Riferimento Row
 DocType: Installation Note,Installation Time,Tempo di installazione
 DocType: Sales Invoice,Accounting Details,Dettagli contabile
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eliminare tutte le Operazioni per questa Azienda
 DocType: Patient,O Positive,O positivo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investimenti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Accantonamenti
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterio  di accettazione
@@ -2405,7 +2384,7 @@
 DocType: Item Attribute,Attribute Name,Nome Attributo
 DocType: BOM,Show In Website,Mostra Nel Sito Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostra Quantità in Sito
-DocType: Employee Loan Application,Total Payable Amount,Totale passività
+DocType: Loan Application,Total Payable Amount,Totale passività
 DocType: Task,Expected Time (in hours),Tempo previsto (in ore)
 DocType: Item Reorder,Check in (group),Il check-in (gruppo)
 DocType: Soil Texture,Silt,Limo
@@ -2424,7 +2403,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Effettua un  Pagamento
 DocType: Room,Room Name,Nome della stanza
 DocType: Prescription Duration,Prescription Duration,Durata della prescrizione
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 DocType: Activity Cost,Costing Rate,Costing Tasso
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Indirizzi e Contatti Cliente
 ,Campaign Efficiency,Efficienza della campagna
@@ -2442,11 +2421,11 @@
 DocType: Chapter,Chapter,Capitolo
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Coppia
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,L&#39;account predefinito verrà automaticamente aggiornato in Fattura POS quando questa modalità è selezionata.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
 DocType: Asset,Depreciation Schedule,piano di ammortamento
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Indirizzi e Contatti del Partner Vendite
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,La data di mezza giornata deve essere compresa da Data a Data
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,La data di mezza giornata deve essere compresa da Data a Data
 DocType: Maintenance Schedule Detail,Actual Date,Data effettiva
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Impostare il centro di costo predefinito in {0} società.
 DocType: Item,Has Batch No,Ha lotto n.
@@ -2454,7 +2433,7 @@
 apps/erpnext/erpnext/config/accounts.py +200,Goods and Services Tax (GST India),Tasse sui beni e servizi (GST India)
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +227,"Company, From Date and To Date is mandatory","Società, da Data e fino ad oggi è obbligatoria"
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Ottenga dalla consultazione
+apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Ottenuto dal consulto
 DocType: Asset,Purchase Date,Data di acquisto
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,Impossibile generare Secret
 DocType: Volunteer,Volunteer Type,Tipo di volontariato
@@ -2464,7 +2443,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet)
 DocType: Soil Texture,Soil Type,Tipo di terreno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nuovo messaggio
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2484,7 +2462,7 @@
 DocType: Hub Category,Hub Category,Categoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
-DocType: Employee Loan,Loan Amount,Ammontare del prestito
+DocType: Loan,Loan Amount,Ammontare del prestito
 DocType: Student Report Generation Tool,Add Letterhead,Aggiungi carta intestata
 DocType: Program Enrollment,Self-Driving Vehicle,Autovettura
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Scorecard fornitore permanente
@@ -2512,9 +2490,9 @@
 DocType: Cash Flow Mapper,Position,Posizione
 DocType: Patient,Patient Details,Dettagli del paziente
 DocType: Patient,B Positive,B Positivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 DocType: Patient Medical Record,Patient Medical Record,Registro medico paziente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppo di Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportivo
@@ -2523,7 +2501,7 @@
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Student Siblings
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unità
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Si prega di specificare Azienda
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Si prega di specificare Azienda
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
 DocType: Asset Maintenance Task,Maintenance Task,Compito di manutenzione
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Imposta il limite B2C nelle impostazioni GST.
@@ -2534,7 +2512,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
 apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Post Vendita
-,BOM Search,BOM Ricerca
+,BOM Search,Ricerca Distinta Base
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Costo totale del materiale consumato (tramite stock)
 DocType: Hub Settings,Company Registered,Azienda registrata
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Pubblica &quot;in magazzino&quot; o &quot;non in magazzino&quot; su Hub sulla base di magazzino disponibile in questo magazzino.
@@ -2544,17 +2522,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
 DocType: Email Digest,Pending Sales Orders,In attesa di ordini di vendita
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
 DocType: Employee,Create User Permission,Crea autorizzazione utente
 DocType: Healthcare Settings,Remind Before,Ricorda prima
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore di conversione Unità di Misurà è obbligatoria sulla riga {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
 DocType: Salary Component,Deduction,Deduzioni
 DocType: Item,Retain Sample,Conservare il campione
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Riga {0}: From Time To Time ed è obbligatoria.
 DocType: Stock Reconciliation Item,Amount Difference,importo Differenza
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Prezzo Articolo aggiunto per {0} in Listino Prezzi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Prezzo Articolo aggiunto per {0} in Listino Prezzi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Inserisci ID dipendente di questa persona di vendite
 DocType: Territory,Classification of Customers by region,Classificazione dei Clienti per regione
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,In produzione
@@ -2564,8 +2542,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calcolato equilibrio estratto conto
 DocType: Normal Test Template,Normal Test Template,Modello di prova normale
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utente disabilitato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Preventivo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Impossibile impostare un RFQ ricevuto su No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Preventivo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Impossibile impostare un RFQ ricevuto su No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deduzione totale
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Seleziona un account per stampare nella valuta dell&#39;account
@@ -2573,7 +2551,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Questo è basato sulle transazioni contro questo paziente. Per dettagli vedere la sequenza temporale qui sotto
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Costo Aggiornato
 DocType: Patient,Date of Birth,Data Compleanno
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,L'articolo {0} è già stato restituito
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Lead
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Impostazione Scorecard Fornitore
@@ -2584,14 +2562,15 @@
 DocType: Work Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descrizione Del Lavoro
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descrizione Del Lavoro
 DocType: Student Applicant,Applied,Applicato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Riaprire
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Riaprire
 DocType: Sales Invoice Item,Qty as per Stock UOM,Quantità come da UOM Archivio
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nome Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Sconto di vendita 02-Post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenere traccia delle campagne di vendita, dei Leads, Preventivi, Ordini di Vendita ecc per determinare il ritorno sull'investimento."
+DocType: Department Approver,Approver,Responsabile / Approvatore
 ,SO Qty,SO Quantità
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Il campo per l&#39;azionista non può essere vuoto
 DocType: Guardian,Work Address,Indirizzo di lavoro
@@ -2605,21 +2584,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totale importo assegnato (Valuta della Società)
 DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
 DocType: BOM,Scrap Material Cost,Costo rottami Materiale
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
 DocType: Grant Application,Email Notification Sent,Email di notifica inviata
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Codice articolo, magazzino, quantità richiesta in fila"
-DocType: Pricing Rule,Supplier,Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Codice articolo, magazzino, quantità richiesta in fila"
+DocType: Bank Guarantee,Supplier,Fornitore
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Mostra i dettagli del pagamento
-DocType: Consultation,Consultation Time,Tempo di consultazione
+DocType: Consultation,Consultation Time,Orario del consulto
 DocType: C-Form,Quarter,Trimestrale
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Spese Varie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,La spesa o il conto differenziato sono obbligatori per l'articolo {0} in quanto hanno un impatto sul valore complessivo del magazzino
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nome Banca
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Sopra
-DocType: Employee Loan,Employee Loan Account,Impiegato account di prestito
 DocType: Leave Application,Total Leave Days,Totale Lascia Giorni
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: E-mail non sarà inviata agli utenti disabilitati
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numero di interazione
@@ -2634,7 +2612,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Peso (in chilogrammo)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",capitoli / chapter_name lascia vuoto automaticamente impostato dopo aver salvato il capitolo.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Si prega di impostare account GST in Impostazioni GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Si prega di impostare account GST in Impostazioni GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tipo di affare
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Costo del nuovo acquisto
@@ -2648,7 +2626,7 @@
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in magazzino."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nessun altro aggiornamento
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ciò copre tutte le scorecard legate a questo programma di installazione
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,L'elemento figlio non dovrebbe essere un pacchetto di prodotti. Si prega di rimuovere l'elemento `{0}` e salvare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,bancario
@@ -2664,37 +2642,38 @@
 DocType: Fee Schedule,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Albero dei conti finanziari.
+DocType: Bank Guarantee,Reference Document Type,Riferimento Tipo di documento
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mappatura del flusso di cassa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} per ordine di vendita {1}
 DocType: Account,Fixed Asset,Asset fisso
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized Inventario
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email non trovata nel contatto predefinito
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genera segreto
-DocType: Employee Loan,Account Info,Informazioni sull&#39;account
+DocType: Loan,Account Info,Informazioni sull&#39;account
 DocType: Activity Type,Default Billing Rate,Tariffa predefinita
 DocType: Fees,Include Payment,Includi il pagamento
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Gruppo Studenti creato.
 DocType: Sales Invoice,Total Billing Amount,Importo Totale di Fatturazione
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Il programma nella struttura tariffaria e nel gruppo di studenti {0} sono diversi.
 DocType: Fee Schedule,Receivable Account,Conto Crediti
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
 DocType: Quotation Item,Stock Balance,Saldo Delle Scorte
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Ordine di vendita a pagamento
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Amministratore delegato
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Amministratore delegato
 DocType: Purchase Invoice,With Payment of Tax,Con pagamento di imposta
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATO PER IL FORNITORE
 DocType: Land Unit,Is Container,È contenitore
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Questo sarà il giorno 1 del ciclo colturale
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Seleziona account corretto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Seleziona account corretto
 DocType: Purchase Invoice Item,Weight UOM,Peso UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Elenco di azionisti disponibili con numeri di folio
 DocType: Salary Structure Employee,Salary Structure Employee,Stipendio Struttura dei dipendenti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Mostra attributi Variant
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Mostra attributi Variant
 DocType: Student,Blood Group,Gruppo Discendenza
 DocType: Course,Course Name,Nome del corso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utenti che possono approvare le domande di permesso di un dipendente specifico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Apparecchiature per ufficio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Apparecchiature per ufficio
 DocType: Purchase Invoice Item,Qty,Qtà
 DocType: Fiscal Year,Companies,Aziende
 DocType: Supplier Scorecard,Scoring Setup,Impostazione del punteggio
@@ -2713,7 +2692,7 @@
 DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debito A è richiesto
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Acquisto Listino Prezzi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelli delle variabili dei scorecard fornitori.
 DocType: Job Offer Term,Offer Term,Termine Offerta
 DocType: Asset,Quality Manager,Responsabile Qualità
@@ -2725,7 +2704,7 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Totale non pagato: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Pagina web
 DocType: Supplier Scorecard,Supplier Score,Punteggio del fornitore
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Importo Totale Fatturato
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Importo Totale Fatturato
 DocType: Supplier,Warn RFQs,Avvisa RFQ
 DocType: BOM,Conversion Rate,Tasso di conversione
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Ricerca prodotto
@@ -2741,18 +2720,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prezzo di listino {0} è disattivato
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riga {0}: Quantità completato non può essere superiore a {1} per il funzionamento {2}
 DocType: Manufacturing Settings,Allow Overtime,Consenti Overtime
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L&#39;elemento serializzato {0} non può essere aggiornato utilizzando la riconciliazione di riserva, utilizzare l&#39;opzione Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L&#39;elemento serializzato {0} non può essere aggiornato utilizzando la riconciliazione di riserva, utilizzare l&#39;opzione Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Employee Training Event
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Gli esempi massimi - {0} possono essere conservati per Batch {1} e Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Aggiungi slot di tempo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Corrente Tasso di Valorizzazione
 DocType: Training Event,Advance,Avanzare
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,per fare di nuovo ricorrenti.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Impostazioni del gateway di pagamento GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Guadagno Exchange / Perdita
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Guadagno Exchange / Perdita
 DocType: Opportunity,Lost Reason,Motivo della perdita
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Riga n. {0}: l&#39;account {1} non appartiene all&#39;azienda {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Riga n. {0}: l&#39;account {1} non appartiene all&#39;azienda {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Impossibile trovare DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
@@ -2771,7 +2749,6 @@
 DocType: Bin,Actual Quantity,Quantità reale
 DocType: Shipping Rule,example: Next Day Shipping,esempio: Spedizione il Giorno Successivo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} non trovato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},L&#39;abbonamento è stato {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programma di programmazione delle tasse
 DocType: Fee Schedule Program,Student Batch,Batch Student
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Crea Studente
@@ -2786,14 +2763,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Non Consegnati
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
 DocType: Appraisal Goal,Appraisal Goal,Obiettivo di Valutazione
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Suggerisci una categoria?
 DocType: Stock Reconciliation Item,Current Amount,Importo attuale
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,edifici
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,edifici
 DocType: Fee Schedule,Fee Structure,Fee Struttura
 DocType: Timesheet Detail,Costing Amount,Costing Importo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Student Admission Program,Application Fee,Tassa d&#39;iscrizione
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Presenta Busta Paga
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Sconto Max per la voce {0} {1} %
@@ -2806,7 +2782,7 @@
 DocType: SMS Log,Sent To,Inviato A
 DocType: Agriculture Task,Holiday Management,Gestione Ferie
 DocType: Payment Request,Make Sales Invoice,Crea Fattura di vendita
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,software
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,software
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
 DocType: Company,For Reference Only.,Per riferimento soltanto.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Medico {0} non disponibile in {1}
@@ -2824,10 +2800,10 @@
 DocType: Employee,New Workplace,Nuovo posto di lavoro
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Consumo di materiale
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Imposta come Chiuso
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nessun articolo con codice a barre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nessun articolo con codice a barre {0}
 DocType: Normal Test Items,Require Result Value,Richiedi valore di risultato
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Distinte Materiali
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Distinte Base
 apps/erpnext/erpnext/stock/doctype/item/item.py +162,Stores,negozi
 DocType: Project Type,Projects Manager,Responsabile Progetti
 DocType: Serial No,Delivery Time,Tempo Consegna
@@ -2839,19 +2815,18 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nessuna struttura attiva o stipendio predefinito trovato per dipendente {0} per le date indicate
 DocType: Leave Block List,Allow Users,Consentire Utenti
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periodico
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Dettagli del modello di mappatura del flusso di cassa
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Traccia reddito separata e spesa per verticali di prodotto o divisioni.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aggiorna il Costo
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Visualizza foglio paga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Material Transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Visualizza foglio paga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Material Transfer
 DocType: Fees,Send Payment Request,Invia richiesta di pagamento
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,conto importo Selezionare cambiamento
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
@@ -2866,12 +2841,12 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,È responsabilità di imposta sul reddito
 DocType: Grading Scale Interval,Grade Description,Grade Descrizione
 DocType: Stock Entry,Purchase Receipt No,Ricevuta di Acquisto N.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Caparra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Caparra
 DocType: Sales Invoice, Shipping Bill Number,Numero di fattura di spedizione
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,tracciabilità
 DocType: Asset Maintenance Log,Actions performed,Azioni eseguite
 DocType: Cash Flow Mapper,Section Leader,Capo sezione
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Dipendente
 DocType: Asset Repair,Failure Date,Data di fallimento
@@ -2890,10 +2865,10 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Sei sicuro di voler annullare questo appuntamento?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pacchetto prezzi camera d&#39;albergo
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline di vendita
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Rename Tool,File to Rename,File da rinominare
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleziona la Distinta Base per l'Articolo nella riga {0}
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},L&#39;account {0} non corrisponde con la società {1} in modalità di account: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Corso:
@@ -2903,7 +2878,7 @@
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nessun ordine di lavoro creato
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Foglio paga del dipendente {0} già creato per questo periodo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Selling Settings,Sales Order Required,Ordine di Vendita richiesto
 DocType: Purchase Invoice,Credit To,Credito a
@@ -2921,19 +2896,19 @@
 DocType: Request for Quotation Supplier,No Quote,Nessuna cifra
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Gateway Account,Payment Account,Conto di Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Si prega di specificare Società di procedere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Variazione netta dei crediti
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,compensativa Off
 DocType: Job Offer,Accepted,Accettato
 DocType: Grant Application,Organization,Organizzazione
-DocType: BOM Update Tool,BOM Update Tool,Strumento di aggiornamento BOM
+DocType: BOM Update Tool,BOM Update Tool,Strumento di aggiornamento Distinta Base
 DocType: SG Creation Tool Course,Student Group Name,Nome gruppo Student
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Mostra vista esplosa
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creazione di tariffe
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com&#39;è. Questa azione non può essere annullata.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,risultati di ricerca
 DocType: Room,Room Number,Numero di Camera
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Riferimento non valido {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Riferimento non valido {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Tipo di Spedizione
 DocType: Journal Entry Account,Payroll Entry,Ingresso del libro paga
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Visualizza i record delle commissioni
@@ -2941,10 +2916,10 @@
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
-DocType: Lab Test Sample,Lab Test Sample,Campione di prova del laboratorio
+DocType: Lab Test Sample,Lab Test Sample,Campione di prova da laboratorio
 DocType: Item Variant Settings,Allow Rename Attribute Value,Consenti Rinomina valore attributo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Breve diario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Breve diario
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la Distinta Base è già assegnata a un articolo
 DocType: Restaurant,Invoice Series Prefix,Prefisso della serie di fatture
 DocType: Employee,Previous Work Experience,Precedente Esperienza Lavoro
 DocType: Stock Entry,For Quantity,Per Quantità
@@ -2952,13 +2927,13 @@
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,L&#39;integrazione con Google Maps non è abilitata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} non è confermato
 DocType: Member,Membership Expiry Date,Data di scadenza dell&#39;appartenenza
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} deve essere negativo nel documento di reso
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} deve essere negativo nel documento di reso
 ,Minutes to First Response for Issues,Minuti per la prima risposta al Problema
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Il nome dell&#39;istituto per il quale si sta impostando questo sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Ultimo prezzo aggiornato in tutte le BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Ultimo prezzo aggiornato in tutte le Distinte Base
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Denominazione Serie (per studenti candidati)
@@ -2971,7 +2946,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unità di Misura
 DocType: Fiscal Year,Year End Date,Data di fine anno
 DocType: Task Depends On,Task Depends On,L'attività dipende da
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Opportunità
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Opportunità
 DocType: Operation,Default Workstation,Workstation predefinita
 DocType: Notification Control,Expense Claim Approved Message,Messaggio Rimborso Spese Approvato
 DocType: Payment Entry,Deductions or Loss,"Trattenute, Deduzioni o Perdite"
@@ -3009,7 +2984,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Lascia senza pagare non corrisponde con i record Leave Application approvati
 DocType: Campaign,Campaign-.####,Campagna . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
 DocType: Membership,USD,Dollaro statunitense
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Crea Fattura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Equilibrio restante
@@ -3018,7 +2993,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Il codice a barre {0} non è un codice {1} valido
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,fine Anno
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Driver,Driver,autista
 DocType: Vital Signs,Nutrition Values,Valori nutrizionali
 DocType: Lab Test Template,Is billable,È fatturabile
@@ -3029,7 +3004,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Data di inizio effettiva (da Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Gamma invecchiamento 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,L&#39;importo totale anticipato non può essere superiore all&#39;importo totale richiesto
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,L&#39;importo totale anticipato non può essere superiore all&#39;importo totale richiesto
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Seleziona i valori degli attributi
 DocType: Purchase Invoice,Reason For Issuing document,Motivo per il rilascio del documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Movimento di magazzino {0} non confermato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Movimento di magazzino {0} non confermato
 DocType: Payment Reconciliation,Bank / Cash Account,Conto Banca / Cassa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Successivo Contatto Con non può coincidere con l'email del Lead
 DocType: Tax Rule,Billing City,Città di fatturazione
@@ -3101,10 +3076,10 @@
 DocType: Warranty Claim,Service Address,Service Indirizzo
 DocType: Asset Maintenance Task,Calibration,Calibrazione
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} è una vacanza aziendale
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mobili e Infissi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mobili e Infissi
 DocType: Item,Manufacture,Produzione
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Configura società
-,Lab Test Report,Lab Test Report
+,Lab Test Report,Report dei test di laboratorio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Si prega di compilare prima il DDT
 DocType: Student Applicant,Application Date,Data di applicazione
 DocType: Salary Detail,Amount based on formula,Importo basato sul formula
@@ -3117,7 +3092,6 @@
 DocType: Crop,Planting Area,Area di impianto
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Installation Note Item,Installed Qty,Qtà installata
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ciò potrebbe essere dovuto a alcuni indirizzi email non validi nel
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Hai aggiunto
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Formazione Risultato
@@ -3127,16 +3101,16 @@
 DocType: Products Settings,Products per Page,Prodotti per pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Ramo Organizzazione master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un Problema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Spese di utenza
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Spese di utenza
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Sopra
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteri Peso
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Stipendio slip Sulla base di Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tasso di acquisto
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Tasso di acquisto
 DocType: Notification Control,Sales Order Message,Sales Order Messaggio
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Impostare i valori predefiniti , come Società , valuta , corrente anno fiscale , ecc"
 DocType: Payment Entry,Payment Type,Tipo di pagamento
@@ -3174,7 +3148,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
 ,To Produce,per produrre
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Libro paga
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
 DocType: Patient Service Unit,Parent Service Unit,Unità di servizio genitore
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Crea Utente
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificazione del pacchetto per la consegna (per la stampa)
@@ -3192,7 +3166,7 @@
 DocType: Shareholder,SH-,SH
 DocType: Account,Income Account,Conto Proventi
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Consegna
 DocType: Volunteer,Weekdays,Nei giorni feriali
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: Restaurant Menu,Restaurant Menu,Ristorante Menu
@@ -3200,7 +3174,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Area Responsabilità Chiave
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Imposta l&#39;account di inventario predefinito per l&#39;inventario perpetuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Imposta l&#39;account di inventario predefinito per l&#39;inventario perpetuo
 DocType: Item Reorder,Material Request Type,Tipo di richiesta materiale
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Invia e-mail di revisione di Grant
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage è pieno, non ha salvato"
@@ -3211,7 +3185,7 @@
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Commissione di iscrizione
 DocType: Budget,Cost Center,Centro di Costo
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ordine di acquisto Message
 DocType: Tax Rule,Shipping Country,Spedizione Nazione
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Nascondere P. IVA / Cod. Fiscale dei clienti dai documenti di vendita
@@ -3220,20 +3194,20 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazzino può essere modificato solo tramite Inserimento Giacenza / Bolla (DDT) / Ricevuta d'acquisto
 DocType: Employee Education,Class / Percentage,Classe / Percentuale
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Responsabile Marketing e Vendite
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Responsabile Marketing e Vendite
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Tassazione Proventi
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Monitora i Leads per settore.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Vai a carta intestata
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nessun elemento selezionato per il trasferimento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nessun elemento selezionato per il trasferimento
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se le seguenti proprietà sono le stesse in entrambi i record. E' un Gruppo, Tipo Radice, Azienda"
 DocType: Vehicle,Electric,Elettrico
 DocType: Task,% Progress,% Avanzamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Profitti/Perdite su Asset in smaltimento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Profitti/Perdite su Asset in smaltimento
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Solo il candidato studente con lo stato &quot;Approvato&quot; sarà selezionato nella tabella sottostante.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Il numero di conto per l'account {0} non è disponibile. <br> Si prega di impostare correttamente il piano dei conti.
 DocType: Task,Depends on Tasks,Dipende Compiti
@@ -3261,7 +3235,7 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} è disabilitato
 DocType: Supplier,Billing Currency,Fatturazione valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
 DocType: Crop,Scientific Name,Nome scientifico
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Foglie totali
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Riseleziona, se il contatto scelto viene modificato dopo il salvataggio"
@@ -3270,13 +3244,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Numero Assegno
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage prodotto in vetrina
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Tutti i gruppi di valutazione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Tutti i gruppi di valutazione
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nuovo nome Magazzino
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Totale {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
@@ -3292,12 +3266,12 @@
 DocType: Payment Entry Reference,Allocated,Assegnati
 apps/erpnext/erpnext/config/accounts.py +267,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
 DocType: Student Applicant,Application Status,Stato dell&#39;applicazione
-DocType: Sensitivity Test Items,Sensitivity Test Items,Elementi di prova di sensibilità
+DocType: Sensitivity Test Items,Sensitivity Test Items,Test di sensibilità
 DocType: Project Update,Project Update,Aggiornamento del progetto
 DocType: Fees,Fees,tasse
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificare Tasso di cambio per convertire una valuta in un'altra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Preventivo {0} è annullato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Totale Importo Dovuto
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Totale Importo Dovuto
 DocType: Sales Partner,Targets,Obiettivi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Si prega di registrare il numero SIREN nel file delle informazioni aziendali
 DocType: Price List,Price List Master,Listino Principale
@@ -3308,6 +3282,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selezionare Paziente
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nome del parametro
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Solo Lasciare applicazioni con lo stato &#39;approvato&#39; e &#39;rifiutato&#39; possono essere presentate
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Nome gruppo è obbligatoria in riga {0}
 DocType: Homepage,Products to be shown on website homepage,I prodotti che devono figurare home page del sito
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
@@ -3352,14 +3327,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Fattura già creata per tutte le ore di fatturazione
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nome errore: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,È il costo finanziario
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
 DocType: Packing Slip,If more than one package of the same type (for print),Se più di un pacchetto dello stesso tipo (per la stampa)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Impostare il cliente predefinito in Impostazioni ristorante
 ,Salary Register,stipendio Register
 DocType: Warehouse,Parent Warehouse,Magazzino Parent
-DocType: C-Form Invoice Detail,Net Total,Totale Netto
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},La BOM di default non è stata trovata per l&#39;oggetto {0} e il progetto {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definire i vari tipi di prestito
+DocType: Subscription,Net Total,Totale Netto
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},La Distinta Base di default non è stata trovata per l'oggetto {0} e il progetto {1}
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definire i vari tipi di prestito
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Importo Dovuto
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (in minuti)
@@ -3391,11 +3366,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Account root deve essere un gruppo
 DocType: Drug Prescription,Drug Prescription,Prescrizione di farmaci
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Rimborsato / Chiuso
+DocType: Loan,Repaid/Closed,Rimborsato / Chiuso
 DocType: Item,Total Projected Qty,Totale intermedio Quantità proiettata
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tasso di valutazione non trovato per l&#39;elemento {0}, che è necessario per le voci di contabilità per {1} {2}. Se l&#39;elemento sta trattando come elemento di tasso di valutazione zero nel {1}, si prega di menzionarlo nella tabella {1} Item. Altrimenti, crea un&#39;operazione di transazione in arrivo per la voce di valutazione di voce o di menzione nell&#39;annotazione dell&#39;articolo e prova quindi a inviare / annullare questa voce"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 DocType: Course,Course Code,Codice del corso
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilizza POS in modalità Offline
@@ -3411,20 +3385,19 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +498,Please select Apply Discount On,Si prega di selezionare Applica sconto su
 DocType: Stock Settings,Sample Retention Warehouse,Magazzino di conservazione dei campioni
 DocType: Company,Default Receivable Account,Account Crediti Predefinito
-DocType: Physician Schedule,Physician Schedule,Schedule del medico
+DocType: Physician Schedule,Physician Schedule,Orario del medico
 DocType: Purchase Invoice,Deemed Export,Deemed Export
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferimento materiali  per Produzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Percentuale di sconto può essere applicato sia contro un listino prezzi o per tutti Listino.
-DocType: Subscription,Half-yearly,Semestrale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Hai già valutato i criteri di valutazione {}.
 DocType: Vehicle Service,Engine Oil,Olio motore
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Ordini di lavoro creati: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Ordini di lavoro creati: {0}
 DocType: Sales Invoice,Sales Team1,Vendite Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
-DocType: Employee Loan,Loan Details,prestito Dettagli
+DocType: Loan,Loan Details,prestito Dettagli
 DocType: Company,Default Inventory Account,Account di inventario predefinito
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,I numeri del folio non corrispondono
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
@@ -3436,19 +3409,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un link a tutte le unità di terra in cui cresce il raccolto
 DocType: Account,Root Type,Root Tipo
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mostra questo slideshow in cima alla pagina
 DocType: BOM,Item UOM,Articolo UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valore Tasse Dopo Sconto dell'Importo(Valuta Società)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Il Magazzino di Destinazione per il rigo {0}
 DocType: Cheque Print Template,Primary Settings,Impostazioni primarie
 DocType: Purchase Invoice,Select Supplier Address,Selezionare l'indirizzo del Fornitore
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Aggiungere dipendenti
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Aggiungere dipendenti
 DocType: Purchase Invoice Item,Quality Inspection,Controllo Qualità
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Template Standard
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
 DocType: Payment Request,Mute Email,Email muta
@@ -3468,11 +3441,10 @@
 DocType: SMS Log,No of Sent SMS,Num. di SMS Inviati
 DocType: Antibiotic,Healthcare Administrator,Amministratore sanitario
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Imposta un target
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup&gt; Numerazione serie
 DocType: Dosage Strength,Dosage Strength,Forza di dosaggio
 DocType: Account,Expense Account,Conto uscite
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Colore
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Colore
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteri di valutazione del Piano
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,La data di scadenza è obbligatoria per l&#39;articolo selezionato
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Impedire gli ordini di acquisto
@@ -3485,18 +3457,18 @@
 DocType: Patient,Personal and Social History,Storia personale e sociale
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,L&#39;utente {0} creato
 DocType: Fee Schedule,Fee Breakup for each student,Scomposizione per ogni studente
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L'Anticipo totale ({0}) relativo all'ordine {1} non può essere superiore al totale complessivo ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L'Anticipo totale ({0}) relativo all'ordine {1} non può essere superiore al totale complessivo ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Cambiare il codice
 DocType: Purchase Invoice Item,Valuation Rate,Tasso di Valorizzazione
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Listino Prezzi Valuta non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 DocType: Purchase Invoice,Availed ITC Cess,Disponibile ITC Cess
 ,Student Monthly Attendance Sheet,Presenze mensile Scheda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regola di spedizione applicabile solo per la vendita
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Fino a
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Il gruppo studente o il corso è obbligatorio
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Ore fatturate e Ore lavorate allienate allo stesso Valore
@@ -3516,7 +3488,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Elenca i tuoi prodotti o servizi acquistati o venduti.
 DocType: Water Analysis,Storage Temperature,Temperatura di conservazione
 DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione non contrassegnata
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ricercatore
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ricercatore
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Strumento di Iscrizione per studenti
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},La data di inizio dovrebbe essere inferiore alla data di fine per l&#39;attività {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome o e-mail è obbligatorio
@@ -3529,7 +3501,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} è attualmente in possesso di un {1} Scorecard del fornitore, e le richieste di autorizzazione a questo fornitore dovrebbero essere rilasciate con cautela."
 DocType: Chapter,Non Profit Manager,Manager non profit
 DocType: BOM,Total Cost(Company Currency),Costo totale (Società di valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} creato
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} creato
 DocType: Homepage,Company Description for website homepage,Descrizione della società per home page del sito
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e Documenti di Trasporto"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
@@ -3539,11 +3511,10 @@
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
 DocType: Healthcare Settings,Result Printed,Risultato Stampato
 DocType: Asset Category Account,Depreciation Expense Account,Ammortamento spese account
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Periodo Di Prova
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visualizza {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Periodo Di Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Project,Total Costing Amount (via Timesheets),Total Costing Amount (via Timesheets)
-DocType: Employee Advance,Expense Approver,Responsabile Spese
+DocType: Department,Expense Approver,Responsabile Spese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
 DocType: Project,Hourly,ogni ora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-gruppo a gruppo
@@ -3552,7 +3523,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Per Data Ora
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Registrazione Contabile
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Stampato su
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Stampato su
 DocType: Item,Inspection Required before Delivery,Ispezione richiesta prima della consegna
 DocType: Item,Inspection Required before Purchase,Ispezione Richiesto prima di Acquisto
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Attività in sospeso
@@ -3562,7 +3533,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantità di ordine minimo
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,La tua organizzazione
 DocType: Fee Component,Fees Category,tasse Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Inserisci la data alleviare .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Notifica dipendente
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
@@ -3572,7 +3543,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Riordina Level
 DocType: Company,Chart Of Accounts Template,Modello del Piano dei Conti
 DocType: Attendance,Attendance Date,Data Presenza
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Prezzo Articolo aggiornato per {0} nel Listino {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Prezzo Articolo aggiornato per {0} nel Listino {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Account con nodi figlio non può essere convertito in libro mastro
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazzino accettazione
@@ -3580,10 +3551,10 @@
 DocType: Item,Valuation Method,Metodo di Valorizzazione
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Segna come Mezza giornata
 DocType: Sales Invoice,Sales Team,Team di vendita
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,ottenere gli studenti
 DocType: Serial No,Under Warranty,In Garanzia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Errore]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Errore]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In parole saranno visibili una volta che si salva l&#39;ordine di vendita.
 ,Employee Birthday,Compleanno Dipendente
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Selezionare la data di completamento per la riparazione completata
@@ -3602,7 +3573,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Riservato per il subappalto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero Fattura
 DocType: Shopping Cart Settings,Orders,Ordini
-DocType: Employee Leave Approver,Leave Approver,Responsabile Ferie
+DocType: Department,Leave Approver,Responsabile Ferie
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Seleziona un batch
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nome gruppo di valutazione
@@ -3646,7 +3617,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINALE PER IL RECIPIENTE
 DocType: Asset Category Account,Accumulated Depreciation Account,Conto per il fondo ammortamento
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Questa email è autogenerata
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
 DocType: Program Enrollment,Boarding Student,Studente di imbarco
 DocType: Asset,Expected Value After Useful Life,Valore atteso After Life utile
@@ -3671,21 +3641,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Record di presenze {0} esiste contro Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Gli ammortamenti Eliminato causa della cessione di attività
-DocType: Member,Member,Membro
+DocType: Loan,Member,Membro
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gestire indirizzi
 DocType: Work Order Item,Work Order Item,Articolo dell&#39;ordine di lavoro
 DocType: Pricing Rule,Item Code,Codice Articolo
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
 DocType: Journal Entry,User Remark,Osservazioni dell'utente
 DocType: Lead,Market Segment,Segmento di Mercato
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Responsabile Agricoltura
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},L'Importo versato non può essere maggiore del totale importo dovuto negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},L'Importo versato non può essere maggiore del totale importo dovuto negativo {0}
 DocType: Supplier Scorecard Period,Variables,variabili
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Chiusura (Dr)
 DocType: Cheque Print Template,Cheque Size,Dimensione Assegno
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} non in magazzino
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} non in magazzino
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modelli fiscali per le transazioni di vendita.
 DocType: Sales Invoice,Write Off Outstanding Amount,Importo di svalutazione in sospeso
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},L&#39;account {0} non corrisponde con l&#39;azienda {1}
@@ -3693,7 +3663,6 @@
 DocType: Stock Settings,Default Stock UOM,UdM predefinita per Giacenza
 DocType: Asset,Number of Depreciations Booked,Numero di ammortamenti Prenotato
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qtà totale
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Contro prestito dipendenti: {0}
 DocType: Landed Cost Item,Receipt Document,Documento di Ricevuta
 DocType: Employee Education,School/University,Scuola / Università
 DocType: Payment Request,Reference Details,Riferimento Dettagli
@@ -3704,7 +3673,7 @@
 DocType: Asset,Double Declining Balance,Doppia valori residui
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ordine chiuso non può essere cancellato. Unclose per annullare.
 DocType: Student Guardian,Father,Padre
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
 DocType: Bank Reconciliation,Bank Reconciliation,Riconciliazione Banca
 DocType: Attendance,On Leave,In ferie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
@@ -3718,10 +3687,10 @@
 DocType: Lead,Lower Income,Reddito più basso
 DocType: Restaurant Order Entry,Current Order,Ordine attuale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Magazzino di origine e di destinazione non possono essere uguali per rigo {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Vai a Programmi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riga {0} # L&#39;importo assegnato {1} non può essere maggiore dell&#39;importo non reclamato {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riga {0} # L&#39;importo assegnato {1} non può essere maggiore dell&#39;importo non reclamato {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
@@ -3744,7 +3713,6 @@
 DocType: Payment Terms Template,Payment Terms,Termini di pagamento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
 DocType: Chapter,Meetup Embed HTML,Meetup Incorpora HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Vai a Fornitori
@@ -3763,22 +3731,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Voce del Programma di manutenzione
 DocType: Sales Order,%  Delivered,%  Consegnato
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Impostare l&#39;ID di posta elettronica per lo studente per inviare la richiesta di pagamento
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Impostare l&#39;ID di posta elettronica per lo studente per inviare la richiesta di pagamento
 DocType: Patient,Medical History,Storia medica
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Conto di scoperto bancario
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Conto di scoperto bancario
 DocType: Patient,Patient ID,ID paziente
 DocType: Physician Schedule,Schedule Name,Nome Schedule
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Crea Busta paga
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Aggiungi tutti i fornitori
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Aggiungi tutti i fornitori
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Riga # {0}: L'Importo assegnato non può essere superiore all'importo dovuto.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Sfoglia BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Prestiti garantiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Sfoglia Distinta Base
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Prestiti garantiti
 DocType: Purchase Invoice,Edit Posting Date and Time,Modifica data e ora di registrazione
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Si prega di impostare gli account relativi ammortamenti nel settore Asset Categoria {0} o {1} società
 DocType: Lab Test Groups,Normal Range,Intervallo normale
 DocType: Academic Term,Academic Year,Anno accademico
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Vendita disponibile
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Apertura Balance Equità
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Apertura Balance Equità
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Disponibile
@@ -3799,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,Appuntamento paziente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approvazione ruolo non può essere lo stesso ruolo la regola è applicabile ad
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Disiscriviti da questo Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Ottenere fornitori di
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Ottenere fornitori di
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} non trovato per l&#39;articolo {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Vai ai corsi
 DocType: Accounts Settings,Show Inclusive Tax In Print,Mostra imposta inclusiva nella stampa
@@ -3810,7 +3778,7 @@
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasso al quale Listino valuta viene convertita in valuta di base del cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
 DocType: Physician,Physician Schedules,Orari del medico
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,L&#39;importo totale anticipato non può essere maggiore dell&#39;importo sanzionato totale
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,L&#39;importo totale anticipato non può essere maggiore dell&#39;importo sanzionato totale
 DocType: Salary Slip,Hour Rate,Rapporto Orario
 DocType: Stock Settings,Item Naming By,Creare il Nome Articolo da
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
@@ -3838,7 +3806,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Assessment Plan,Program,Programma
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione&gt; Impostazioni istruzione
 DocType: Serial No,Is Cancelled,È Annullato
 DocType: Student Group,Group Based On,Gruppo basato
 DocType: Journal Entry,Bill Date,Data Fattura
@@ -3849,9 +3816,10 @@
 DocType: Cheque Print Template,Cheque Height,Altezza Assegno
 DocType: Supplier,Supplier Details,Dettagli del Fornitore
 DocType: Setup Progress,Setup Progress,Avanzamento configurazione
+DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Bonifico bancario
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Seleziona tutto
 ,Issued Items Against Work Order,Articoli emessi contro l&#39;ordine di lavoro
 DocType: Vehicle Log,Invoice Ref,fattura Rif
@@ -3882,12 +3850,11 @@
 DocType: Customs Tariff Number,Tariff Number,Numero tariffario
 DocType: Work Order Item,Available Qty at WIP Warehouse,Quantità disponibile presso WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,proiettata
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
-DocType: Employee Loan,Employee Loan Application,Impiegato Loan Application
 DocType: Issue,Opening Date,Data di apertura
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Si prega di salvare prima il paziente
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Si prega di salvare prima il paziente
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
 DocType: Program Enrollment,Public Transport,Trasporto pubblico
 DocType: Soil Texture,Silt Composition (%),Composizione di silt (%)
@@ -3905,7 +3872,7 @@
 ,Item Balance (Simple),Saldo oggetto (semplice)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture emesse dai fornitori.
 DocType: POS Profile,Write Off Account,Conto per Svalutazioni
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debito Nota Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debito Nota Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
@@ -3944,11 +3911,11 @@
 DocType: Vehicle,Insurance Details,Dettagli Assicurazione
 DocType: Account,Payable,Pagabile
 DocType: Share Balance,Share Type,Condividi tipo
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Si prega di inserire periodi di rimborso
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Si prega di inserire periodi di rimborso
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Margine
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuovi clienti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Utile lordo %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Utile lordo %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Cambia profilo POS
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidazione
@@ -3958,10 +3925,10 @@
 DocType: Lead,Address Desc,Desc. indirizzo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Il Partner è obbligatorio
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Sono state trovate righe con date di scadenza duplicate in altre righe: {lista}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Sono state trovate righe con date di scadenza duplicate in altre righe: {lista}
 DocType: Topic,Topic Name,Nome argomento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,", Almeno una delle vendere o acquistare deve essere selezionata"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Seleziona un dipendente per far avanzare il dipendente.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Seleziona un dipendente per far avanzare il dipendente.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Si prega di selezionare una data valida
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Selezionare la natura della vostra attività.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +3947,7 @@
 DocType: Asset Movement,Source Warehouse,Magazzino di provenienza
 DocType: Installation Note,Installation Date,Data di installazione
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Condividi libro mastro
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,La fattura di vendita {0} è stata creata
 DocType: Employee,Confirmation Date,conferma Data
 DocType: C-Form,Total Invoiced Amount,Importo Totale Fatturato
@@ -3989,7 +3956,7 @@
 DocType: Account,Accumulated Depreciation,Fondo di ammortamento
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nome permanente
 DocType: Stock Entry,Customer or Supplier Details,Dettagli Cliente o Fornitore
-DocType: Employee Loan Application,Required by Date,Richiesto per data
+DocType: Loan Application,Required by Date,Richiesto per data
 DocType: Lead,Lead Owner,Responsabile Lead
 DocType: Production Plan,Sales Orders Detail,Dettaglio ordini di vendita
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
@@ -4002,7 +3969,7 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Deduzione totale - Rimborso prestito
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Stipendio slittamento ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,La Data di pensionamento deve essere successiva alla Data Assunzione
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,La Data di pensionamento deve essere successiva alla Data Assunzione
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Varianti multiple
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Consegnato
@@ -4026,13 +3993,12 @@
 DocType: Student Guardian,Student Guardian,Student Guardiano
 DocType: Member,Member Name,Nome del membro
 DocType: Stock Settings,Use Naming Series,Utilizzare le serie di denominazione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,nell&#39;abbonamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Una diversa Unità di Misura degli articoli darà come risultato un Peso Netto (Totale) non corretto.
 Assicurarsi che il peso netto di ogni articolo sia nella stessa Unità di Misura."
 DocType: Membership,Payment Details,Dettagli del pagamento
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Tasso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","L&#39;ordine di lavoro interrotto non può essere annullato, fermalo prima per annullare"
 DocType: Asset,Journal Entry for Scrap,Diario di rottami
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
@@ -4063,7 +4029,7 @@
 DocType: Company,Exchange Gain / Loss Account,Guadagno Exchange / Conto Economico
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Dipendenti e presenze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Scopo deve essere uno dei {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Compila il modulo e salva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Compila il modulo e salva
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Quantità disponibile
 DocType: Homepage,"URL for ""All Products""",URL per &quot;tutti i prodotti&quot;
@@ -4077,7 +4043,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Prezzo di Vendita Standard
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
 DocType: Cash Flow Mapper,Section Name,Nome della sezione
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Riordina Quantità
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Riordina Quantità
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offerte di lavoro
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Svalutazione
@@ -4088,7 +4054,6 @@
 DocType: Task,depends_on,dipende da
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In coda per aggiornare il prezzo più recente in tutte le fatture dei materiali. Può richiedere alcuni minuti.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo conto. Nota: Si prega di non creare account per Clienti e Fornitori
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo clienti&gt; Territorio
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
 DocType: Water Analysis,Appearance,Aspetto
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Comprare il listino prezzi
@@ -4104,7 +4069,7 @@
 DocType: Patient,Account Details,Dettagli Account
 DocType: Crop,Materials Required,Materiali richiesti
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +76,No students Found,Nessun studenti hanno trovato
-DocType: Medical Department,Medical Department,Dipartimento di Medicina
+DocType: Medical Department,Medical Department,Dipartimento medico
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Criteri di valutazione del punteggio fornitore
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fattura Data Pubblicazione
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vendere
@@ -4113,7 +4078,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Non consentito. Si prega di disabilitare il modello di test
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
 DocType: Crop Cycle,Linked Land Unit,Unità di terra collegata
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Si prega di selezionare la data di registrazione prima di selezionare il Partner
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Si prega di selezionare la data di registrazione prima di selezionare il Partner
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
@@ -4129,7 +4094,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Vai agli Utenti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Importo pagato + Importo svalutazione non può essere superiore a Totale generale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} non è un numero di lotto valido per la voce {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN non valido o Invio NA per non registrato
 DocType: Training Event,Seminar,Seminario
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma Tassa di iscrizione
@@ -4145,14 +4110,14 @@
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 DocType: Company,Create Chart Of Accounts Based On,Crea il Piano dei Conti in base a
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Non è possibile convertire in non gruppo. Esistono attività dipendenti.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
 ,Stock Ageing,Invecchiamento Archivio
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Studente {0} esiste contro richiedente studente {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Adattamento arrotondamento (Valuta Società)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Scheda attività
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Pomeriggio
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
 DocType: Cheque Print Template,Scanned Cheque,Assegno scansionato
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica ai contatti alla conferma.
@@ -4168,7 +4133,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Il progetto {0} esiste già
 DocType: Medical Department,Nursing User,Nursing User
 DocType: Plant Analysis,Plant Analysis Criterias,Criteri di analisi delle piante
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilità
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilità
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Il periodo di validità di questa quotazione è terminato.
 DocType: Expense Claim Account,Expense Claim Account,Conto spese rivendicazione
 DocType: Accounts Settings,Allow Stale Exchange Rates,Consenti tariffe scadenti
@@ -4188,13 +4153,13 @@
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Crea varianti
-DocType: Item,Default BOM,Distinta Materiali Predefinita
+DocType: Item,Default BOM,Distinta Base Predefinita
 DocType: Project,Total Billed Amount (via Sales Invoices),Importo fatturato totale (tramite fatture di vendita)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debito importo nota
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debito importo nota
 DocType: Project Update,Not Updated,Non aggiornato
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Ci sono incongruenze tra il tasso, no delle azioni e l&#39;importo calcolato"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Totale Outstanding Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
 DocType: Employee Advance,Advance Account,Conto anticipato
 DocType: Job Offer,Job Offer Terms,Termini dell&#39;offerta di lavoro
@@ -4203,7 +4168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Compagnia assicurativa
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabile
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabile
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Documento di Trasporto
 DocType: Chapter,Members,Utenti
 DocType: Student,Student Email Address,Student Indirizzo e-mail
@@ -4225,8 +4190,8 @@
 DocType: Purchase Invoice Item,Rate,Prezzo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Stagista
 DocType: Delivery Stop,Address Name,indirizzo Nome
-DocType: Stock Entry,From BOM,Da Distinta Materiali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Dividere {0} unità di {1}
+DocType: Stock Entry,From BOM,Da Distinta Base
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Dividere {0} unità di {1}
 DocType: Assessment Code,Assessment Code,Codice Assessment
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
@@ -4234,25 +4199,23 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
 DocType: Bank Reconciliation Detail,Payment Document,Documento di Pagamento
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Errore durante la valutazione della formula dei criteri
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Slip,Salary Structure,Struttura salariale
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Fornire Materiale
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Si è verificato un errore durante la creazione di ricorrenti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,Data dell'offerta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Preventivi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Non sono stati creati Gruppi Studenti
 DocType: Purchase Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Riga # {0}: la Data di Consegna Confermata non può essere precedente all'Ordine di Acquisto
 DocType: Purchase Invoice,Print Language,Lingua di Stampa
 DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
 DocType: Sales Invoice,Customer PO Details,Dettagli ordine cliente
-DocType: Subscription,Next Schedule Date,Data di pianificazione successiva
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Conto di apertura temporaneo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Inserire il valore deve essere positivo
@@ -4280,11 +4243,11 @@
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Data Inizio e Fine sono obbligatorie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal Deposito
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nessun dipendente per i criteri indicati
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
 DocType: Hotel Settings,Default Customer,Cliente predefinito
 DocType: Assessment Plan,Supervisor Name,Nome supervisore
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Non confermare se l&#39;appuntamento è stato creato per lo stesso giorno
@@ -4307,17 +4270,17 @@
 DocType: Plant Analysis Criteria,Maximum Permissible Value,Massimo valore consentito
 DocType: Journal Entry Account,Employee Advance,Employee Advance
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequenza
-DocType: Lab Test Template,Sensitivity,sensibilità
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Materia prima
+DocType: Lab Test Template,Sensitivity,Sensibilità
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Impianti e Macchinari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Impianti e Macchinari
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Valore Tasse Dopo Sconto dell'Importo
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Impostazioni riepilogo giornaliero lavori
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Si prega di inserire la data di consegna richiesta
 DocType: Payment Entry,Internal Transfer,Trasferimento interno
 DocType: Asset Maintenance,Maintenance Tasks,Attività di manutenzione
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sia qty destinazione o importo obiettivo è obbligatoria
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Seleziona Data Pubblicazione primo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Seleziona Data Pubblicazione primo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
 DocType: Leave Control Panel,Carry Forward,Portare Avanti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro di costo con le transazioni esistenti non può essere convertito in contabilità
@@ -4330,8 +4293,8 @@
 DocType: Training Event,Trainer Name,Nome Trainer
 DocType: Mode of Payment,General,Generale
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicazione
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Partita pagamenti con fatture
 DocType: Journal Entry,Bank Entry,Registrazione bancaria
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
@@ -4345,7 +4308,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Abilitare / disabilitare valute.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} su Half day Leave on {1}
 DocType: Production Plan,Get Material Request,Get Materiale Richiesta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,spese postali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,spese postali
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 ,Item Variant Details,Dettagli della variante dell&#39;articolo
@@ -4356,9 +4319,9 @@
 DocType: Drug Prescription,Hour,Ora
 DocType: Restaurant Order Entry,Last Sales Invoice,Fattura di ultima vendita
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Seleziona Qtà rispetto all&#39;articolo {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Un nuovo Serial No non può avere un magazzino. Il magazzino deve essere impostato  nell'entrata giacenza o su ricevuta d'acquisto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Un nuovo Serial No non può avere un magazzino. Il magazzino deve essere impostato  nell'entrata giacenza o su ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Lead
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 DocType: Company,Monthly Sales Target,Target di vendita mensile
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
@@ -4366,11 +4329,11 @@
 DocType: Item,Default Material Request Type,Predefinito Materiale Tipo di richiesta
 DocType: Supplier Scorecard,Evaluation Period,Periodo di valutazione
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Sconosciuto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Ordine di lavoro non creato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Ordine di lavoro non creato
 DocType: Shipping Rule,Shipping Rule Conditions,Condizioni Tipo di Spedizione
 DocType: Purchase Invoice,Export Type,Tipo di esportazione
 DocType: Salary Slip Loan,Salary Slip Loan,Salario Slip Loan
-DocType: BOM Update Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
+DocType: BOM Update Tool,The new BOM after replacement,La nuova Distinta Base dopo la sostituzione
 ,Point of Sale,Punto di vendita
 DocType: Payment Entry,Received Amount,importo ricevuto
 DocType: Patient,Widow,Vedova
@@ -4382,7 +4345,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Riepilogo delle fatture di apertura
 DocType: Education Settings,Education Manager,Responsabile della formazione
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,La lunghezza minima tra ogni pianta nel campo per una crescita ottimale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","L&#39;elemento bloccato {0} non può essere aggiornato utilizzando Riconciliazione stock, invece utilizzare l&#39;opzione Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","L&#39;elemento bloccato {0} non può essere aggiornato utilizzando Riconciliazione stock, invece utilizzare l&#39;opzione Stock Entry"
 DocType: Quality Inspection,Report Date,Data Report
 DocType: Student,Middle Name,Secondo nome
 DocType: C-Form,Invoices,Fatture
@@ -4413,7 +4376,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","l' indirizzo e-mail deve essere univoco, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Ricevuta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Ricevuta
 ,Sales Register,Registro Vendite
 DocType: Daily Work Summary Group,Send Emails At,Invia e-mail in
 DocType: Quotation,Quotation Lost Reason,Motivo per la mancata vendita
@@ -4426,7 +4389,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nessun Cliente ancora!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rendiconto finanziario
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nessuna richiesta materiale creata
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenza
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
@@ -4449,11 +4412,10 @@
 DocType: Vehicle,Chassis No,Telaio No
 DocType: Payment Request,Initiated,Iniziato
 DocType: Production Plan Item,Planned Start Date,Data di inizio prevista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Seleziona una BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Seleziona una Distinta Base
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Tassa integrata ITC disponibile
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
 DocType: Project Task,View Timesheet,Visualizza scheda attività
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La data di fine deve essere maggiore della data di inizio
 DocType: Leave Type,Is Encash,È incassare
 DocType: Leave Allocation,New Leaves Allocated,Nuove ferie allocate
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
@@ -4469,7 +4431,7 @@
 DocType: Payment Entry,Account Paid To,Risorsa di deposito
 DocType: Item Alternative,Alternative Item Name,Nome oggetto alternativo
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Non ho potuto inviare alcun Slip Salario <br> \ Possibili ragioni: <br> \ 1. La retribuzione netta è inferiore a 0. <br> \ 2. Indirizzo email dell'azienda specificato nel master dipendente non è valido. <br>
@@ -4479,7 +4441,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l'account {1} contro {2} {3} è {4}. Si supererà di {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo 'Bene Strumentale'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Quantità
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,e disattivato disabilitato nel
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Servizi finanziari
 DocType: Student Sibling,Student ID,Student ID
@@ -4493,12 +4454,12 @@
 DocType: Leave Allocation,Unused leaves,Ferie non godute
 DocType: Patient,Alcohol Past Use,Utilizzo passato di alcool
 DocType: Fertilizer Content,Fertilizer Content,Contenuto di fertilizzanti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematico / Bloccato
 DocType: Tax Rule,Billing State,Stato di fatturazione
 DocType: Share Transfer,Transfer,Trasferimento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,L&#39;ordine di lavoro {0} deve essere annullato prima di annullare questo ordine cliente
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
@@ -4522,7 +4483,7 @@
 DocType: Cheque Print Template,Message to show,Messaggio da mostrare
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Vendita al dettaglio
 DocType: Student Attendance,Absent,Assente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Impossibile trovare il punteggio a partire da {0}. È necessario avere punteggi in piedi che coprono 0 a 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelli di Imposte e Spese di Acquisto
@@ -4535,10 +4496,10 @@
 DocType: Task,Parent Task,Attività del genitore
 DocType: Journal Entry,Write Off Based On,Svalutazione Basata Su
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Crea un Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Di stampa e di cancelleria
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Di stampa e di cancelleria
 DocType: Stock Settings,Show Barcode Field,Mostra campo del codice a barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Inviare e-mail del fornitore
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Stipendio già elaborato per il periodo compreso tra {0} e {1}, Lascia periodo di applicazione non può essere tra questo intervallo di date."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Inviare e-mail del fornitore
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Stipendio già elaborato per il periodo compreso tra {0} e {1}, Lascia periodo di applicazione non può essere tra questo intervallo di date."
 DocType: Chapter Member,Leave Reason,Lascia ragione
 DocType: Guardian Interest,Guardian Interest,Guardiano interesse
 DocType: Volunteer,Availability,Disponibilità
@@ -4547,14 +4508,13 @@
 DocType: Project,Time to send,Tempo di inviare
 DocType: Timesheet,Employee Detail,Dettaglio dei dipendenti
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Email ID Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
 DocType: Lab Prescription,Test Code,Codice di prova
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Impostazioni per homepage del sito
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Le richieste di autorizzazione non sono consentite per {0} a causa di una posizione di scorecard di {1}
 DocType: Job Offer,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Sopra
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Importo totale {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},attributo non valido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Importo totale {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},attributo non valido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Si ricorda se un conto non pagabile
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Seleziona il gruppo di valutazione diverso da &#39;Tutti i gruppi di valutazione&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Riga {0}: è necessario un centro di costo per un elemento {1}
@@ -4565,7 +4525,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisi dell&#39;acqua
 DocType: Chapter,Region,Regione
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Non è consentito un tasso di valorizzazione negativo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Non è consentito un tasso di valorizzazione negativo
 DocType: Holiday List,Weekly Off,Settimanale Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Ricarica l&#39;analisi collegata
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per es. 2012, 2012-13"
@@ -4581,7 +4541,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Costo di Asset Demolita
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
 DocType: Vehicle,Policy No,Politica No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 DocType: Asset,Straight Line,Retta
 DocType: Project User,Project User,progetto utente
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Diviso
@@ -4617,21 +4577,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Sentiero
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
 DocType: Production Plan,Total Planned Qty,Qtà totale pianificata
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valore di apertura
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valore di apertura
 DocType: Salary Detail,Formula,Formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Modello di prova del laboratorio
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Conto vendita
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Conto vendita
 DocType: Purchase Invoice Item,Total Weight,Peso totale
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commissione sulle vendite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Commissione sulle vendite
 DocType: Job Offer Term,Value / Description,Valore / Descrizione
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
 DocType: Tax Rule,Billing Country,Nazione di fatturazione
 DocType: Purchase Order Item,Expected Delivery Date,Data di Consegna Confermata
 DocType: Restaurant Order Entry,Restaurant Order Entry,Inserimento ordine del ristorante
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
 DocType: Asset Maintenance Task,Assign To Name,Assegna al nome
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Spese di rappresentanza
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Spese di rappresentanza
 DocType: Hub Settings,Enabled Users,Utenti abilitati
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Crea una Richiesta di Materiali
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Apri elemento {0}
@@ -4644,23 +4604,22 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Richieste di Ferie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
 DocType: Vehicle,Last Carbon Check,Ultima verifica carbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Spese legali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Spese legali
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Seleziona la quantità in fila
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Fai aprire le vendite e le fatture di acquisto
 DocType: Purchase Invoice,Posting Time,Ora di Registrazione
 DocType: Timesheet,% Amount Billed,% Importo Fatturato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Spese telefoniche
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Spese telefoniche
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Seleziona se vuoi forzare l'utente a selezionare una serie prima di salvare, non ci sarà un valore di default."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
 DocType: Email Digest,Open Notifications,Aperte Notifiche
 DocType: Payment Entry,Difference Amount (Company Currency),Differenza Importo (Società di valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,spese dirette
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,spese dirette
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Spese di viaggio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Aggiungi abbonamento sul campo personalizzato nel doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Purchase Receipt Item,Sample Quantity,Quantità del campione
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","L&#39;aggiornamento dei costi BOM avviene automaticamente via Scheduler, in base all&#39;ultimo tasso di valutazione / prezzo di listino / ultimo tasso di acquisto di materie prime."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
@@ -4673,13 +4632,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,prova
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componenti stipendio
 DocType: Program Enrollment Tool,New Academic Year,Nuovo anno accademico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Ritorno / nota di credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Ritorno / nota di credito
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Importo totale pagato
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Importo totale pagato
 DocType: GST Settings,B2C Limit,Limite B2C
 DocType: Work Order Item,Transferred Qty,Quantità trasferito
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigazione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Pianificazione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Pianificazione
 DocType: Share Balance,Issued,Emesso
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Attività studentesca
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Fornitore
@@ -4693,10 +4652,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo di foglie come casuale, malati ecc"
 DocType: Email Digest,Send regular summary reports via Email.,Invia relazioni di sintesi periodiche via Email.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Si prega di impostare account predefinito nel tipo di spesa rivendicazione {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Si prega di impostare account predefinito nel tipo di spesa rivendicazione {0}
 DocType: Assessment Result,Student Name,Nome dello studente
 DocType: Brand,Item Manager,Responsabile Articoli
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll da pagare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll da pagare
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
 DocType: Plant Analysis,Collection Datetime,Collezione Datetime
 DocType: Work Order,Total Operating Cost,Totale costi di esercizio
@@ -4706,7 +4665,6 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utente {0} non esiste
 DocType: Payment Term,Day(s) after invoice date,Giorno (i) dopo la data della fattura
 DocType: Payment Schedule,Payment Schedule,Programma di pagamento
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abbreviazione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Il Pagamento esiste già
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
@@ -4725,9 +4683,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Preventivo a Leads o a Clienti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Tutti i gruppi di clienti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accantonamento Mensile
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
@@ -4736,14 +4694,14 @@
 DocType: Lab Prescription,Test Created,Test creati
 DocType: Healthcare Settings,Custom Signature in Print,Firma personalizzata in stampa
 DocType: Account,Temporary,Temporaneo
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Numero LPO cliente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Numero LPO cliente
 DocType: Program,Courses,corsi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,segretario
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,segretario
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se disable, &#39;In Words&#39; campo non saranno visibili in qualsiasi transazione"
 DocType: Serial No,Distinct unit of an Item,Un'unità distinta di un elemento
 DocType: Supplier Scorecard Criteria,Criteria Name,Criteri Nome
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Imposti la Società
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Imposti la Società
 DocType: Pricing Rule,Buying,Acquisti
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Malattie e fertilizzanti
 DocType: HR Settings,Employee Records to be created by,Informazioni del dipendenti da creare a cura di
@@ -4752,17 +4710,17 @@
 DocType: POS Profile,Apply Discount On,Applicare sconto su
 DocType: Member,Membership Type,Tipo di abbonamento
 ,Reqd By Date,Data di Consegna
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Creditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Creditori
 DocType: Assessment Plan,Assessment Name,Nome valutazione
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Mostra PDC in stampa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Mostra PDC in stampa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Fila # {0}: N. di serie è obbligatoria
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Voce Wise fiscale Dettaglio
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Offerta di lavoro
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abbreviazione Institute
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Parole"" sarà visibile una volta che si salva il Preventivo."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},La quantità ({0}) non può essere una frazione nella riga {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},La quantità ({0}) non può essere una frazione nella riga {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,la tentata
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
@@ -4780,7 +4738,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Varianza totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se abilitato, il sistema pubblicherà le scritture contabili per l&#39;inventario automatico."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,mediazione
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Assistenza per dipendente {0} è già contrassegnata per questo giorno
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Assistenza per dipendente {0} è già contrassegnata per questo giorno
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",Aggiornato da pochi minuti tramite 'Time Log'
 DocType: Customer,From Lead,Da Contatto
@@ -4800,19 +4758,18 @@
 DocType: Request for Quotation Item,Project Name,Nome del progetto
 DocType: Customer,Mention if non-standard receivable account,Menzione se conto credito non standard
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Selezionare il conto interessi attivi nel prestito per dipendenti {0}
 DocType: Work Order,Required Items,Articoli richiesti
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Risorsa Umana
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento Riconciliazione di pagamento
 DocType: Disease,Treatment Task,Task di trattamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Attività fiscali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Attività fiscali
 DocType: BOM Item,BOM No,BOM n.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,La Scrittura Contabile {0} non ha conto {1} o già confrontato con un altro buono
 DocType: Item,Moving Average,Media Mobile
-DocType: BOM Update Tool,The BOM which will be replaced,La distinta base che sarà sostituita
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Apparecchiature elettroniche
+DocType: BOM Update Tool,The BOM which will be replaced,La Distinta Base che sarà sostituita
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Apparecchiature elettroniche
 DocType: Asset,Maintenance Required,Manutenzione necessaria
 DocType: Account,Debit,Dare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Le ferie devono essere assegnati in multipli di 0,5"
@@ -4821,7 +4778,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Importo Dovuto
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fissare obiettivi Item Group-saggio per questo venditore.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelare Stocks Older Than [ giorni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: L'indicazione dell'Asset è obbligatorio per acquisto/vendita di Beni Strumentali
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: L'indicazione dell'Asset è obbligatorio per acquisto/vendita di Beni Strumentali
 DocType: Asset Maintenance Team,Maintenance Team Name,Nome del team di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se due o più regole sui prezzi sono trovate delle condizioni di cui sopra, viene applicata la priorità. La priorità è un numero compreso tra 0 a 20, mentre il valore di default è pari a zero (vuoto). Numero maggiore significa che avrà la precedenza se ci sono più regole sui prezzi con le stesse condizioni."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Il cliente è obbligatorio se &#39;Opportunità da&#39; è selezionato come Cliente
@@ -4830,19 +4787,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Consentire i seguenti utenti per approvare le richieste per i giorni di blocco.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipi di Nota Spese.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Il tasso di vendita per l&#39;elemento {0} è inferiore a quello {1}. Il tasso di vendita dovrebbe essere almeno {2}
-DocType: Item,Taxes,Tasse
+DocType: Subscription,Taxes,Tasse
 DocType: Purchase Invoice,capital goods,beni strumentali
 DocType: Purchase Invoice Item,Weight Per Unit,Peso per unità
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Pagato e Non Consegnato
 DocType: Project,Default Cost Center,Centro di costo predefinito
-DocType: Bank Guarantee,End Date,Data di Fine
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Documenti di magazzino
 DocType: Budget,Budget Accounts,contabilità di bilancio
 DocType: Employee,Internal Work History,Storia di lavoro interni
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Importo fondo ammortamento
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variabile della Scorecard fornitore
-DocType: Employee Loan,Fully Disbursed,interamente versato
 DocType: Employee Advance,Due Advance Amount,Importo anticipato dovuto
 DocType: Maintenance Visit,Customer Feedback,Opinione Cliente
 DocType: Account,Expense,Spesa
@@ -4866,7 +4821,7 @@
 ,Employee Information,Informazioni Dipendente
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Crea un Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Crea un Preventivo Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Vengono creati modelli di imposta predefiniti per vendite e acquisti.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Record Record di risultato {0} esiste già.
@@ -4874,7 +4829,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Impostare il filtro aziendale vuoto se Group By è &#39;Azienda&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,La Data di Registrazione non può essere una data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,per generare il ricorrente
 DocType: Stock Entry,Target Warehouse Address,Indirizzo del magazzino di destinazione
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Fine giornata
@@ -4899,11 +4853,10 @@
 DocType: Material Request,% Ordered,% Ordinato
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per il corso del corso, il Corso sarà convalidato per ogni Studente dai corsi iscritti in iscrizione al programma."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,lavoro a cottimo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Buying Rate
 DocType: Share Balance,From No,Dal n
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia aziendale
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nuovo messaggio da {sender}
 DocType: Customer,Customer Primary Address,Indirizzo primario del cliente
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Drug Prescription,Description/Strength,Descrizione / Forza
@@ -4912,22 +4865,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Lo stesso articolo è stato inserito più volte
 DocType: Department,Leave Block List,Lascia il blocco lista
 DocType: Purchase Invoice,Tax ID,P. IVA / Cod. Fis.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
 DocType: Accounts Settings,Accounts Settings,Impostazioni Conti
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Approvare
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Indirizzo malformattato per {0}, correggere per continuare."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Indirizzo malformattato per {0}, correggere per continuare."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Numero del nuovo account, sarà incluso nel nome dell&#39;account come prefisso"
 DocType: Maintenance Team Member,Team Member,Membro della squadra
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nessun risultato da presentare
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
-DocType: Employee Loan,Rate of Interest (%) / Year,Tasso di interesse (%) / anno
+DocType: Loan,Rate of Interest (%) / Year,Tasso di interesse (%) / anno
 ,Project Quantity,Progetto Quantità
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;"
 DocType: Opportunity,To Discuss,Da Discutere
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unità di {1} necessarie in {2} per completare la transazione.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasso di interesse (%) Performance
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Conti provvisori
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Nero
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Conti provvisori
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Articolo Esploso
 DocType: Shareholder,Contact List,Lista dei contatti
 DocType: Account,Auditor,Uditore
@@ -4935,16 +4888,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} articoli prodotti
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Per saperne di più
 DocType: Cheque Print Template,Distance from top edge,Distanza dal bordo superiore
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Listino {0} è disattivato o non esiste
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Listino {0} è disattivato o non esiste
 DocType: Purchase Invoice,Return,Ritorno
 DocType: Pricing Rule,Disable,Disattiva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Modalità di pagamento è richiesto di effettuare un pagamento
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Modalità di pagamento è richiesto di effettuare un pagamento
 DocType: Project Task,Pending Review,In attesa recensione
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Modifica in pagina intera per ulteriori opzioni come risorse, numero di serie, lotti ecc."
-apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Appuntamenti e consultazioni
+apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Appuntamenti e consulti
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} non è iscritto nel gruppo {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} non può essere gettata, come è già {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Controlli richiesti
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Controlli richiesti
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Contrassegna come Assente
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Impossibile impostare la società
@@ -4956,7 +4909,7 @@
 DocType: Homepage,Tag Line,Tag Linea
 DocType: Fee Component,Fee Component,Fee Componente
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestione della flotta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Aggiungi articoli da
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Aggiungi articoli da
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Colture e terre
 DocType: Cheque Print Template,Regular,Regolare
 DocType: Fertilizer,Density (if liquid),Densità (se liquido)
@@ -4981,24 +4934,24 @@
 DocType: Payment Entry,Paid Amount,Importo pagato
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Esplora Ciclo di vendita
 DocType: Assessment Plan,Supervisor,Supervisore
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention stock entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention stock entry
 ,Available Stock for Packing Items,Stock Disponibile per Imballaggio Prodotti
 DocType: Item Variant,Item Variant,Elemento Variant
 ,Work Order Stock Report,Rapporto di stock ordine di lavoro
 DocType: Assessment Result Tool,Assessment Result Tool,Strumento di valutazione dei risultati
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Come supervisore
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Suggerisci una categoria
-DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Articolo
+DocType: BOM Scrap Item,BOM Scrap Item,Articolo Scarto per Distinta Base
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestione della qualità
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestione della qualità
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,L'articolo {0} è stato disabilitato
 DocType: Project,Total Billable Amount (via Timesheets),Importo totale fatturabile (tramite Timesheets)
 DocType: Agriculture Task,Previous Business Day,Giorno lavorativo precedente
-DocType: Employee Loan,Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo
+DocType: Loan,Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo
 DocType: Employee,Health Insurance No,Assicurazione sanitaria n
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota di credito Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota di credito Amt
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
 DocType: Opening Invoice Creation Tool,Purchase,Acquisto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Saldo Quantità
@@ -5017,7 +4970,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Molteplici strutture salariali attivi trovati per dipendente {0} per le date indicate
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Conti Gateway Setup.
 DocType: Employee,Employment Type,Tipo Dipendente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,immobilizzazioni
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,immobilizzazioni
 DocType: Payment Entry,Set Exchange Gain / Loss,Guadagno impostato Exchange / Perdita
 ,GST Purchase Register,Registro degli acquisti GST
 ,Cash Flow,Flusso di cassa
@@ -5037,9 +4990,8 @@
 DocType: Academic Term,Term Start Date,Term Data di inizio
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Elenco di tutte le transazioni condivise
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},In allegato {0} # {1}
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tasso medio
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;importo totale del pagamento nel programma di pagamento deve essere uguale al totale totale / arrotondato
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;importo totale del pagamento nel programma di pagamento deve essere uguale al totale totale / arrotondato
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Estratto conto banca come da Contabilità Generale
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome Articolo
@@ -5060,7 +5012,7 @@
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
 DocType: Guardian,Guardian Of ,guardian of
 DocType: Grading Scale Interval,Threshold,Soglia
-DocType: BOM Update Tool,Current BOM,Distinta Materiali Corrente
+DocType: BOM Update Tool,Current BOM,Distinta Base attuale
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),Saldo (Dr - Cr)
 apps/erpnext/erpnext/public/js/utils.js +55,Add Serial No,Aggiungi Numero di Serie
 DocType: Work Order Item,Available Qty at Source Warehouse,Qtà disponibile presso Source Warehouse
@@ -5080,10 +5032,10 @@
 DocType: Expense Claim Advance,Expense Claim Advance,Addebito reclamo spese
 DocType: Lab Test,Report Preference,Preferenze di rapporto
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Volontariato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Articolo Citato Confronto
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Sovrapposizione nel punteggio tra {0} e {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Spedizione
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,valore patrimoniale netto su
 DocType: Crop,Produce,Produrre
@@ -5093,7 +5045,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Consumo di materiale per la fabbricazione
 DocType: Item Alternative,Alternative Item Code,Codice articolo alternativo
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
 DocType: Delivery Stop,Delivery Stop,Fermata di consegna
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
 DocType: Item,Material Issue,Fornitura materiale
@@ -5103,15 +5055,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergente
 DocType: BOM,Show Items,Mostra elementi
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Da tempo non può essere superiore al tempo.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vuoi avvisare tutti i clienti via email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vuoi avvisare tutti i clienti via email?
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Curriculum vitae
 DocType: Hub Settings,Hub Username,Nome utente hub
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criteri di valutazione del Gruppo
 DocType: Healthcare Settings,Patient Name By,Nome del paziente
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Voce di registrazione accresciuta per gli stipendi da {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Voce di registrazione accresciuta per gli stipendi da {0} a {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
 DocType: Warehouse,Warehouse Name,Nome Deposito
 DocType: Naming Series,Select Transaction,Selezionare Transaction
@@ -5125,18 +5076,17 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Qui è possibile mantenere l'altezza, il peso, le allergie, le preoccupazioni mediche ecc"
 DocType: Leave Block List,Applies to Company,Applica ad Azienda
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste un movimento di magazzino {0}
-DocType: Employee Loan,Disbursement Date,L&#39;erogazione Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Destinatari&#39; non specificati
+DocType: Loan,Disbursement Date,L&#39;erogazione Data
 DocType: BOM Update Tool,Update latest price in all BOMs,Aggiorna l&#39;ultimo prezzo in tutte le BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Cartella medica
 DocType: Vehicle,Vehicle,Veicolo
 DocType: Purchase Invoice,In Words,In Parole
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} deve essere inviato
 DocType: POS Profile,Item Groups,Gruppi Articoli
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
 DocType: Sales Order Item,For Production,Per la produzione
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Aggiungi un account di apertura temporanea nel piano dei conti
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Aggiungi un account di apertura temporanea nel piano dei conti
 DocType: Customer,Customer Primary Contact,Contatto principale cliente
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Period Closing di chiusura
 DocType: Project Task,View Task,Visualizza Attività
@@ -5151,9 +5101,8 @@
 DocType: Production Plan,Include Subcontracted Items,Includi elementi in conto lavoro
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Aderire
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Non è possibile modificare le proprietà delle Varianti dopo la trascrizione del magazzino. Dovrai creare un nuovo Articolo per farlo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
-DocType: Employee Loan,Repay from Salary,Rimborsare da Retribuzione
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+DocType: Loan,Repay from Salary,Rimborsare da Retribuzione
 DocType: Leave Application,LAP/,GIRO/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Richiesta di Pagamento contro {0} {1} per quantità {2}
 DocType: Salary Slip,Salary Slip,Busta paga
@@ -5177,11 +5126,11 @@
 DocType: Employee Education,Employee Education,Istruzione Dipendente
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,gruppo di articoli duplicato trovato nella tabella gruppo articoli
 DocType: Land Unit,Parent Land Unit,Unità territoriale genitore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Fertilizer,Fertilizer Name,Nome del fertilizzante
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Cash Flow Mapping Accounts,Account,Account
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
 ,Requested Items To Be Transferred,Voci si chiede il trasferimento
 DocType: Expense Claim,Vehicle Log,Vehicle Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presenza di febbre (temp&gt; 38,5 ° C / 101,3 ° F o temp. Durata&gt; 38 ° C / 100,4 ° F)"
@@ -5222,27 +5171,26 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
 DocType: Asset Maintenance,Manufacturing User,Utente Produzione
 DocType: Purchase Invoice,Raw Materials Supplied,Materie prime fornite
-DocType: C-Form,Series,serie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta dell&#39;elenco dei prezzi {0} deve essere {1} o {2}
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Soil Texture,Ternary Plot,Trama Ternaria
 DocType: Item Group,Item Classification,Classificazione Articolo
 DocType: Driver,License Number,Numero di licenza
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scopo visita manutenzione
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Registrazione pazienti fattura
 DocType: Crop,Period,periodo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Contabilità Generale
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} in aspettativa per {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} in aspettativa per {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Visualizza i Leads
 DocType: Program Enrollment Tool,New Program,Nuovo programma
 DocType: Item Attribute Value,Attribute Value,Valore Attributo
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 DocType: Salary Detail,Salary Detail,stipendio Dettaglio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Si prega di selezionare {0} prima
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Si prega di selezionare {0} prima
 DocType: Appointment Type,Physician,Medico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,consultazioni
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consulti
 DocType: Sales Invoice,Commission,Commissione
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) non può essere maggiore della quantità pianificata ({2}) in ordine di lavoro {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Scheda attività per la produzione.
@@ -5252,10 +5200,10 @@
 DocType: Production Plan,Get Items For Work Order,Ottieni articoli per ordine di lavoro
 DocType: Salary Detail,Default Amount,Importo Predefinito
 DocType: Lab Test Template,Descriptive,Descrittivo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Magazzino non trovato nel sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazzino non trovato nel sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Sommario di questo mese
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lettura Controllo Qualità
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Imposta un obiettivo di vendita che desideri conseguire per la tua azienda.
 ,Project wise Stock Tracking,Progetto saggio Archivio monitoraggio
@@ -5283,11 +5231,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Impossibile creare il sito Web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Dettaglio di conversione Unità di Misura
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Memorizzazione stock già creata o Quantità campione non fornita
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Memorizzazione stock già creata o Quantità campione non fornita
 DocType: Program,Program Abbreviation,Abbreviazione programma
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
-DocType: Bank Guarantee,Start Date,Data di inizio
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Allocare le foglie per un periodo .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Assegni e depositi cancellati in modo non corretto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
@@ -5302,10 +5249,10 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ore
 DocType: Project,Expected Start Date,Data di inizio prevista
 DocType: Purchase Invoice,04-Correction in Invoice,04-Correzione nella fattura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Ordine di lavorazione già creato per tutti gli articoli con BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Ordine di lavorazione già creato per tutti gli articoli con BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Rapporto dettagli varianti
 DocType: Setup Progress Action,Setup Progress Action,Azione di progettazione di installazione
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Comprare il listino prezzi
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Comprare il listino prezzi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Rimuovere articolo se le spese non è applicabile a tale elemento
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Selezionare Stato di manutenzione come completato o rimuovere Data di completamento
 DocType: Supplier,Default Payment Terms Template,Modello di termini di pagamento predefinito
@@ -5317,7 +5264,6 @@
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione da effettuarsi se si eccede il budget mensile
-DocType: Subscription,Submit on creation,Conferma su creazione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta per {0} deve essere {1}
 DocType: Asset,Disposal Date,Smaltimento Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Messaggi di posta elettronica verranno inviati a tutti i dipendenti attivi della società nell&#39;ora dato, se non hanno le vacanze. Sintesi delle risposte verrà inviata a mezzanotte."
@@ -5343,7 +5289,7 @@
 DocType: Account,Income,Proventi
 DocType: Industry Type,Industry Type,Tipo Industria
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Qualcosa è andato storto!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,La fattura di vendita {0} è già stata presentata
 DocType: Supplier Scorecard Scoring Criteria,Score,Punto
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Anno fiscale {0} non esiste
@@ -5363,12 +5309,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} dovrebbe essere un valore compreso tra 0 e 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,La successiva Data di Ammortamento non può essere precedente alla Data disponibile per l&#39;uso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Prestiti non garantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ore di lavoro contro Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Data prevista
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Totale versato Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Totale versato Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messaggio maggiore di 160 caratteri verrà divisa in mesage multipla
 DocType: Purchase Receipt Item,Received and Accepted,Ricevuti e accettati
 DocType: Hub Settings,Company and Seller Profile,Profilo dell&#39;azienda e del venditore
@@ -5382,10 +5328,9 @@
 DocType: Item,Variant Based On,Variante calcolate in base a
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100% . E ' {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,I Vostri Fornitori
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Correggi
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
 DocType: Request for Quotation Item,Supplier Part No,Articolo Fornitore No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonimo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Ricevuto da
 DocType: Lead,Converted,Convertito
@@ -5419,12 +5364,12 @@
 DocType: Share Balance,No of Shares,No di azioni
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Seleziona Stato
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: School House,House Name,Nome della casa
 DocType: Fee Schedule,Total Amount per Student,Importo totale per studente
 DocType: Purchase Taxes and Charges,Account Head,Riferimento del conto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,elettrico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,elettrico
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Aggiungere il resto della vostra organizzazione come gli utenti. È inoltre possibile aggiungere invitare i clienti a proprio portale con l&#39;aggiunta di loro di contatti
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
 DocType: Grant Application,Requested Amount,Importo richiesto
@@ -5434,7 +5379,7 @@
 DocType: Crop Cycle,Detected Diseases,Malattie rilevate
 DocType: Stock Entry,Default Source Warehouse,Magazzino di provenienza predefinito
 DocType: Item,Customer Code,Codice Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Promemoria Compleanno per {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Promemoria Compleanno per {0}
 DocType: Asset Maintenance Task,Last Completion Date,Ultima data di completamento
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
@@ -5442,7 +5387,7 @@
 DocType: GoCardless Settings,GoCardless Settings,Impostazioni GoCardless
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Assicurazione Data di inizio deve essere inferiore a Assicurazione Data Fine
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Attivo Immagini
 DocType: Restaurant,Active Menu,Menu attivo
 DocType: Target Detail,Target Qty,Obiettivo Qtà
 DocType: Shopping Cart Settings,Checkout Settings,Impostazioni Acquista
@@ -5453,9 +5398,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
 DocType: Vehicle Log,Odometer,Odometro
 DocType: Production Plan Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Articolo {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Articolo {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Distinta Base non contiene alcun articolo a magazzino
 DocType: Chapter,Chapter Head,Capo capitolo
 DocType: Payment Term,Month(s) after the end of the invoice month,Mese / i dopo la fine del mese della fattura
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Attività / Attività del progetto.
@@ -5463,7 +5408,7 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generare buste paga
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Risultato di laboratorio datetime non può essere prima del test di datetime
 DocType: POS Profile,Allow user to edit Discount,Consenti all&#39;utente di modificare lo sconto
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Ottieni clienti da
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Ottieni clienti da
 DocType: Purchase Invoice Item,Include Exploded Items,Includi elementi esplosi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se ""applicabile per"" bisogna selezionarlo come {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
@@ -5471,7 +5416,7 @@
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Importo Svalutazione (Valuta società)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore di fatturazione
 DocType: Project,Total Sales Amount (via Sales Order),Importo totale vendite (tramite ordine cliente)
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +572,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +572,Default BOM for {0} not found,Distinta Base predefinita per {0} non trovato
 apps/erpnext/erpnext/stock/doctype/item/item.py +514,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tocca gli elementi da aggiungere qui
 DocType: Fees,Program Enrollment,programma Iscrizione
@@ -5504,13 +5449,13 @@
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Esempio:. ABCD. ##### Se è impostato 'serie' ma il Numero di Serie non è specificato nelle transazioni, verrà creato il numero di serie automatico in base a questa serie. Se si vuole sempre specificare il Numero di Serie per questo articolo. Lasciare vuoto."
 DocType: Upload Attendance,Upload Attendance,Carica presenze
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +616,BOM and Manufacturing Quantity are required,BOM e Quantità  Produzione richiesti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +616,BOM and Manufacturing Quantity are required,Distinta Base e Quantità Produzione richieste
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Gamma Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Forza Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installare i preset
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM sostituita
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Selezionare gli elementi in base alla Data di Consegna
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Selezionare gli elementi in base alla Data di Consegna
 DocType: Grant Application,Has any past Grant Record,Ha un record di sovvenzione passato
 ,Sales Analytics,Analisi dei dati di vendita
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponibile {0}
@@ -5528,7 +5473,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo Fornitura Materie Prime
 DocType: Selling Settings,Settings for Selling Module,Impostazioni per il Modulo Vendite
 DocType: Hotel Room Reservation,Hotel Room Reservation,Prenotazione camera d&#39;albergo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Servizio clienti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Servizio clienti
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Dettaglio articolo cliente
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offerta candidato un lavoro.
@@ -5544,7 +5489,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Gli studenti sono stati arruolati
 DocType: Fees,Student Details,Dettagli dello studente
 DocType: Purchase Invoice Item,Stock Qty,Quantità di magazzino
-DocType: Employee Loan,Repayment Period in Months,Il rimborso Periodo in mese
+DocType: Loan,Repayment Period in Months,Il rimborso Periodo in mese
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Errore: Non è un documento di identità valido?
 DocType: Naming Series,Update Series Number,Aggiornamento Numero di Serie
 DocType: Account,Equity,equità
@@ -5553,7 +5498,7 @@
 DocType: Task,Closing Date,Data Chiusura
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
 DocType: Timesheet,Work Detail,Dettaglio del lavoro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingegnere
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingegnere
 DocType: Journal Entry,Total Amount Currency,Importo Totale Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cerca Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
@@ -5598,13 +5543,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informazioni sul tipo di donatore.
 DocType: Request for Quotation,Supplier Detail,Dettaglio del Fornitore
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Importo Fatturato
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Importo Fatturato
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,I pesi dei criteri devono aggiungere fino al 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Presenze
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Articoli di magazzino
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se non controllati, la lista dovrà essere aggiunto a ciascun Dipartimento dove deve essere applicato."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Creazione di {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Magazzino di Origine e di Destinazione non possono essere uguali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Data e ora di registrazione sono obbligatori
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelli fiscali per le transazioni di acquisto.
@@ -5628,14 +5572,14 @@
 DocType: Shipping Rule,Fixed,Fisso
 DocType: Vehicle Service,Clutch Plate,Frizione
 DocType: Company,Round Off Account,Arrotondamento Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Spese Amministrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Spese Amministrative
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
-DocType: Journal Entry,Subscription,Sottoscrizione
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Sottoscrizione
 DocType: Purchase Invoice,Contact Email,Email Contatto
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Fee Creation In attesa
 DocType: Appraisal Goal,Score Earned,Punteggio Guadagnato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Periodo Di Preavviso
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Periodo Di Preavviso
 DocType: Asset Category,Asset Category Name,Asset Nome Categoria
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nome nuova persona vendite
@@ -5648,7 +5592,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lasciate non selezionate se non si desidera considerare il gruppo durante la creazione di gruppi basati sul corso.
 DocType: Asset,Frequency of Depreciation (Months),Frequenza di ammortamento (Mesi)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Conto di credito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostra valori zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
@@ -5656,7 +5600,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Contabilità Clienti /Fornitori
 DocType: Delivery Note Item,Against Sales Order Item,Dall'Articolo dell'Ordine di Vendita
 DocType: Hub Settings,Company Logo,Logo della compagnia
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 DocType: Healthcare Settings,Patient Registration,Registrazione del paziente
@@ -5690,16 +5634,15 @@
 DocType: Journal Entry,Total Debit,Debito totale
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Deposito beni ultimati
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Si prega di selezionare Paziente
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Addetto alle vendite
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Addetto alle vendite
 DocType: Hotel Room Package,Amenities,Servizi
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Bilancio e Centro di costo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Non è consentito il modo di pagamento multiplo predefinito
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per il
-,Appointment Analytics,Appuntamento Analytics
+,Appointment Analytics,Statistiche Appuntamento
 DocType: Vehicle Service,Half Yearly,Semestrale
 DocType: Lead,Blog Subscriber,Abbonati Blog
 DocType: Guardian,Alternate Number,Numero alternativo
-DocType: Healthcare Settings,Consultations in valid days,Consultazioni in giorni validi
+DocType: Healthcare Settings,Consultations in valid days,Consulti nei giorni validi
 DocType: Assessment Plan Criteria,Maximum Score,punteggio massimo
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Creare regole per limitare le transazioni in base ai valori .
 DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,Conti di mappatura del flusso di cassa
@@ -5714,13 +5657,13 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Modifica del codice modello
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Il Data Terminologia fine non può essere anteriore alla data di inizio Term. Si prega di correggere le date e riprovare.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
-,BOM Stock Report,BOM Stock Report
+,BOM Stock Report,Report Giacenza Distinta Base
 DocType: Stock Reconciliation Item,Quantity Difference,Quantità Differenza
 DocType: Employee Advance,EA-,EA-
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 DocType: Cheque Print Template,Signatory Position,Posizione firmatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Imposta come persa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Imposta come persa
 DocType: Timesheet,Total Billable Hours,Totale Ore Fatturabili
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota Ricevuta di pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Questo si basa su operazioni contro questo cliente. Vedere cronologia sotto per i dettagli
@@ -5731,7 +5674,7 @@
 DocType: Tax Rule,Tax Rule,Regola fiscale
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenere lo stesso prezzo per tutto il ciclo di vendita
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Pianificare i registri di tempo al di fuori dell&#39;orario di lavoro Workstation.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +115,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} non dispone di un programma medico. Aggiungilo nel master del medico
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +115,Dr {0} does not have a Physician Schedule. Add it in Physician master,Dr {0} non dispone di un programma medico. Aggiungilo nella scheda del medico
 apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,I clienti in coda
 DocType: Driver,Issuing Date,Data di rilascio
 DocType: Student,Nationality,Nazionalità
@@ -5740,12 +5683,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Company,Company Info,Info Azienda
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Selezionare o aggiungere nuovo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Questo si basa sulla presenza di questo dipendente
 DocType: Assessment Result,Summary,Sommario
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Segna la presenza
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Conto di addebito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Conto di addebito
 DocType: Fiscal Year,Year Start Date,Data di inizio anno
 DocType: Attendance,Employee Name,Nome Dipendente
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ristorante Articolo di ordinazione voce
@@ -5757,7 +5700,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ammontare dell&#39;acquisto
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Benefici per i dipendenti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Benefici per i dipendenti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},La quantità imballata deve essere uguale per l'articolo {0} sulla riga {1}
 DocType: Work Order,Manufactured Qty,Q.tà Prodotte
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Le condivisioni non esistono con {0}
@@ -5765,12 +5708,12 @@
 DocType: Asset,Out of Order,Guasto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignora sovrapposizione tempo workstation
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o {1} società
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o {1} società
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Selezionare i numeri di batch
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fatture sollevate dai Clienti.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 DocType: Patient Service Unit,Medical Administrator,Amministratore medico
 DocType: Assessment Plan,Schedule,Pianificare
 DocType: Account,Parent Account,Account genitore
@@ -5792,7 +5735,7 @@
 DocType: Selling Settings,Campaign Naming By,Creare il nome Campagna da
 DocType: Employee,Current Address Is,Indirizzo attuale è
 apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,Target di vendita mensile (
-DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,Programma dell&#39;unità di servizio medico
+DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,Orario dell'unità di servizio medico
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificata
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
 DocType: Sales Invoice,Customer GSTIN,Cliente GSTIN
@@ -5800,15 +5743,16 @@
 DocType: Asset Repair,Repair Status,Stato di riparazione
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
 DocType: POS Profile,Account for Change Amount,Conto per quantità di modifica
 DocType: Purchase Invoice,input service,servizio di input
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: Partner / Account non corrisponde con {1} / {2} {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Membro del team di manutenzione
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analisi del suolo
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Codice del corso:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Inserisci il Conto uscite
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Magazzino
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
@@ -5856,19 +5800,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Ammissioni per {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nome variabile
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
 DocType: Asset,Asset Category,Asset Categoria
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Retribuzione netta non può essere negativa
 DocType: Purchase Order,Advance Paid,Anticipo versato
 DocType: Item,Item Tax,Tasse dell'Articolo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiale al Fornitore
 DocType: Soil Texture,Loamy Sand,Sabbia argillosa
 DocType: Production Plan,Material Request Planning,Pianificazione richiesta materiale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Accise Fattura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Soglia {0}% appare più di una volta
 DocType: Expense Claim,Employees Email Id,Email Dipendenti
 DocType: Employee Attendance Tool,Marked Attendance,Marca Presenza
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passività correnti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Passività correnti
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Il timer ha superato le ore indicate.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Invia SMS di massa ai tuoi contatti
 DocType: Patient,A Positive,Un positivo
@@ -5879,9 +5823,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La q.tà reale è obbligatoria
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ha attualmente una posizione di valutazione del fornitore {1} e gli ordini di acquisto a questo fornitore dovrebbero essere rilasciati con cautela.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
-DocType: Employee Loan,Loan Type,Tipo di prestito
+DocType: Loan,Loan Type,Tipo di prestito
 DocType: Scheduling Tool,Scheduling Tool,Strumento di pianificazione
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,carta di credito
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,carta di credito
 DocType: BOM,Item to be manufactured or repacked,Voce da fabbricati o nuovamente imballati
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5913,7 +5857,7 @@
 DocType: Item,Units of Measure,Unità di misura
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
 DocType: Sales Invoice,Customer's Purchase Order Date,Data ordine acquisto Cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capitale Sociale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capitale Sociale
 DocType: Shopping Cart Settings,Show Public Attachments,Mostra gli allegati pubblici
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
 DocType: Restaurant Reservation,Reservation Time,Tempo di prenotazione
@@ -5928,7 +5872,7 @@
 DocType: Purchase Order,To Receive and Bill,Per ricevere e Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Riga n. {0}: La data di consegna richiesta non può essere precedente alla data della transazione
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,prodotti sponsorizzati
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
@@ -5938,20 +5882,20 @@
 DocType: Driver,Expiry Date,Data Scadenza
 DocType: Healthcare Settings,Employee name and designation in print,Nome e designazione del dipendente in stampa
 ,accounts-browser,schema contabile
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Si prega di selezionare Categoria prima
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Progetto Master.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per consentire un eccesso di fatturazione o sopra-ordinazione, aggiornare &quot;Allowance&quot; in Impostazioni archivio o la voce."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Mezza giornata)
 DocType: Payment Term,Credit Days,Giorni Credito
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Selezionare Patient per ottenere i test di laboratorio
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Crea un Insieme di Studenti
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Giorni per la Consegna
 DocType: Cash Flow Mapping,Is Income Tax Expense,È l&#39;esenzione dall&#39;imposta sul reddito
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controllare questo se lo studente è residente presso l&#39;Ostello dell&#39;Istituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
 ,Stock Summary,Sintesi della
@@ -5962,7 +5906,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Data Rif
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: BOM Operation,Operating Cost(Company Currency),Costi di funzionamento (Società di valuta)
-DocType: Employee Loan Application,Rate of Interest,Tasso di interesse
+DocType: Loan Application,Rate of Interest,Tasso di interesse
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: Item,Shelf Life In Days,Shelf Life In Days
 DocType: GL Entry,Is Opening,Sta aprendo
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 9c441fc..3fd11e5 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,この保証請求をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,アセスメントレポート
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,消費者製品
-DocType: Purchase Receipt,Subscription Detail,サブスクリプションの詳細
 DocType: Supplier Scorecard,Notify Supplier,サプライヤーに通知する
 DocType: Item,Customer Items,顧客アイテム
 DocType: Project,Costing and Billing,原価計算と請求
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,アカウント{0}:親勘定{1}は元帳にすることができません
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.comにアイテムを発行
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,メール通知
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,評価
 DocType: Item,Default Unit of Measure,デフォルト数量単位
 DocType: SMS Center,All Sales Partner Contact,全ての販売パートナー連絡先
-DocType: Employee,Leave Approvers,休暇承認者
+DocType: Department,Leave Approvers,休暇承認者
 DocType: Sales Partner,Dealer,ディーラー
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,調査
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,空室をチェック
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,これは、このサプライヤーに対する取引に基づいています。詳細については、以下のタイムラインを参照してください。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,法務
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,法務
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
 DocType: Bank Guarantee,Customer,顧客
 DocType: Purchase Receipt Item,Required By,要求元
 DocType: Delivery Note,Return Against Delivery Note,納品書に対する返品
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},銀行口座は {0} のように名前を付けることはできません
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会計エントリに対する科目(またはグループ)が作成され、残高が維持されます
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,処理対象として提出された給与明細がありません。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,処理対象として提出された給与明細がありません。
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,オープンを表示
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,上記の繰り返しのために、今日この行動を取ることが必要です
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,シリーズを正常に更新しました
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,チェックアウト
 DocType: Pricing Rule,Apply On,適用
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,全てのサプライヤー連絡先
 DocType: Support Settings,Support Settings,サポートの設定
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:単価は {1}と同じである必要があります:{2}({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:単価は {1}と同じである必要があります:{2}({3} / {4})
 ,Batch Item Expiry Status,バッチアイテム有効期限ステータス
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,銀行為替手形
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,銀行為替手形
 DocType: Membership,membership validaty section,メンバーシップの有効性セクション
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 DocType: Consultation,Consultation,相談
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ウェブサイト作成
 DocType: Opening Invoice Creation Tool Item,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ローン(負債)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ローン(負債)
 DocType: Employee Education,Year of Passing,経過年
 DocType: Item,Country of Origin,原産国
 DocType: Soil Texture,Soil Texture Criteria,土性基準
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,優先連絡先の詳細
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,課題を開く
 DocType: Production Plan Item,Production Plan Item,生産計画アイテム
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
 DocType: Lab Test Groups,Add new line,新しい行を追加
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,健康管理
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),支払遅延(日数)
@@ -89,7 +85,7 @@
 ,Delay Days,遅延日数
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号:{0}は既に販売請求書:{1}で参照されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,請求
+DocType: Subscription Invoice,Invoice,請求
 DocType: Purchase Invoice Item,Item Weight Details,アイテムの重量の詳細
 DocType: Asset Maintenance Log,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会計年度{0}が必要です
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア(0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2} は {3}と一致しません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,行 {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,行 {0}:
 DocType: Timesheet,Total Costing Amount,総原価計算量
 DocType: Delivery Note,Vehicle No,車両番号
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,価格表を選択してください
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,進行中の作業
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,日付を選択してください
 DocType: Daily Work Summary Group,Holiday List,休日のリスト
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,会計士
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,会計士
 DocType: Hub Settings,Selling Price List,販売価格リスト
 DocType: Patient,Tobacco Current Use,たばこの現在の使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,販売価格
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,販売価格
 DocType: Cost Center,Stock User,在庫ユーザー
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg)/ K
 DocType: Company,Phone No,電話番号
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},新しい{0}:#{1}
 DocType: Delivery Trip,Initial Email Notification Sent,送信された最初の電子メール通知
 ,Sales Partners Commission,販売パートナー手数料
 DocType: Soil Texture,Sandy Clay Loam,砂質粘土壌土
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,減価償却後の値
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,関連しました
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,出席日は従業員の入社日付より小さくすることはできません
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,出席日は従業員の入社日付より小さくすることはできません
 DocType: Grading Scale,Grading Scale Name,グレーディングスケール名
-DocType: Subscription,Repeat on Day,日に繰り返す
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ルートアカウントなので編集することができません
 DocType: Sales Invoice,Company Address,会社住所
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0}の割引に基づく承認を設定することはできません
+DocType: Subscription,Subscription Start Date,購読開始日
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",古い名前、新しい名前の計2列となっている.csvファイルを添付してください
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}ではない任意のアクティブ年度インチ
 DocType: Packed Item,Parent Detail docname,親詳細文書名
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参照:{0}・アイテムコード:{1}・顧客:{2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,試用期間終了日試用期間開始日前にすることはできません。
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,欠員
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},下請アイテム{0}の行{1}でBOMが指定されていません
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Patient,Married,結婚してる
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} は許可されていません
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,アイテム取得元
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,アイテム取得元
 DocType: Price List,Price Not UOM Dependant,単位に依存しない価格
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ブレーキオイル
 DocType: Tax Rule,Tax Type,税タイプ
 ,Completed Work Orders,完了した作業オーダー
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,課税額
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,課税額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: BOM,Item Image (if not slideshow),アイテム画像(スライドショーされていない場合)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(時間単価 ÷ 60)× 実際の作業時間
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行番号{0}:参照伝票タイプは経費請求または仕訳入力のいずれかでなければなりません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM選択
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行番号{0}:参照伝票タイプは経費請求または仕訳入力のいずれかでなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM選択
 DocType: SMS Log,SMS Log,SMSログ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,従業員に与えられた前払い金の管理
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,配達のお知らせ
 DocType: Journal Entry,Opening Entry,エントリーを開く
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,支払専用アカウント
-DocType: Employee Loan,Repay Over Number of Periods,期間数を超える返済
+DocType: Loan,Repay Over Number of Periods,期間数を超える返済
 DocType: Stock Entry,Additional Costs,追加費用
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
 DocType: Lead,Product Enquiry,製品のお問い合わせ
 DocType: Education Settings,Validate Batch for Students in Student Group,生徒グループ内の生徒のバッチを検証する
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},従業員が見つかりませ休暇レコードはありません{0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},従業員が見つかりませ休暇レコードはありません{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,最初の「会社」を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,会社を選択してください
 DocType: Employee Education,Under Graduate,在学生
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,HR設定でステータス通知を残すためのデフォルトテンプレートを設定してください。
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標
 DocType: BOM,Total Cost,費用合計
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,従業員のローン
 DocType: Fee Schedule,Send Payment Request Email,支払依頼メールを送信
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,不動産
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,正常に登録解除されました。
 DocType: Assessment Result,Grade,グレード
 DocType: Restaurant Table,No of Seats,席数
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",動的な件名を追加するには、jinjaタグを使用します。 <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーにより配送済
 DocType: Asset Maintenance Task,Asset Maintenance Task,資産管理タスク
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,年俸
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,年俸
 DocType: Daily Work Summary,Daily Work Summary,日次業務概要
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} は凍結されています
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,在庫経費
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,在庫経費
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ターゲット倉庫の選択
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,優先連絡先メールアドレスを入力してください。
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,優先連絡先メールアドレスを入力してください。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,逆仕訳
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,プライマリアドレス
 DocType: Production Plan,Material Request Detail,品目依頼の詳細
 DocType: Selling Settings,Default Quotation Validity Days,デフォルト見積り有効日数
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: Sales Invoice,Change Amount,変化量
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,運転免許のカテゴリ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,納期を入力してください
 DocType: Depreciation Schedule,Make Depreciation Entry,減価償却のエントリを作成します
+DocType: HR Settings,Leave Settings,設定を終了
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,要求タイプ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,従業員作成
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,放送
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS(オンライン/オフライン)の設定モード
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,作業オーダーに対する時間ログの作成を無効にします。作業命令は作業命令に対して追跡してはならない
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,実行
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,実行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,作業遂行の詳細
 DocType: Asset Maintenance Log,Maintenance Status,保守ステータス
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,メンバーシップの詳細
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}:サプライヤーは、買掛金勘定に対して必要とされている{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,アイテムと価格
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},合計時間:{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は当会計年度内にする必要があります。(もしかして:開始日= {0})
 DocType: Drug Prescription,Interval,間隔
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,嗜好
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,嗜好
 DocType: Grant Application,Individual,個人
 DocType: Academic Term,Academics User,教育機関ユーザー
 DocType: Cheque Print Template,Amount In Figure,図では量
-DocType: Employee Loan Application,Loan Info,ローン情報
+DocType: Loan Application,Loan Info,ローン情報
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,保守訪問計画
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,サプライヤのスコアカード期間
 DocType: Share Transfer,Share Transfer,株式移転
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,アイテムテンプレート
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,生化学
 DocType: Job Offer,Select Terms and Conditions,規約を選択
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,タイムアウト値
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,タイムアウト値
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerceの設定
 DocType: Production Plan,Sales Orders,受注
 DocType: Purchase Taxes and Charges,Valuation,評価
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,デフォルト地域
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,TV
 DocType: Work Order Operation,Updated via 'Time Log',「時間ログ」から更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,顧客またはサプライヤーを選択します。
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
 DocType: Company,Enable Perpetual Inventory,永久在庫を有効にする
+DocType: Bank Guarantee,Charges Incurred,発生した費用
 DocType: Company,Default Payroll Payable Account,デフォルトの給与買掛金
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,メールグループ更新
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,カスタム結果
 DocType: Delivery Stop,Contact Name,担当者名
 DocType: Course Assessment Criteria,Course Assessment Criteria,コースの評価基準
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,納税者番号:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,納税者番号:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,学生証:
 DocType: POS Customer Group,POS Customer Group,POSの顧客グループ
 DocType: Land Unit,Land Unit describing various land assets,様々な土地資産を記述する土地単位
@@ -374,9 +371,8 @@
 ,Open Work Orders,作業オーダーを開く
 DocType: Payment Term,Credit Months,信用月間
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,ネットペイは0未満にすることはできません
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",システムからの繰り返しのエラー通知の送信を停止するには、サブスクリプションのDisabledフィールドをチェックしています
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,年次休暇
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,年次休暇
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}:前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
 DocType: Email Digest,Profit & Loss,利益損失
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),総原価計算量(勤務表による)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,生徒グループ下に生徒を設定してください
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,銀行エントリー
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,銀行エントリー
 DocType: Crop,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,生徒グループ作成ツールコース
 DocType: Lead,Do Not Contact,コンタクト禁止
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,あなたの組織で教える人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,ソフトウェア開発者
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,ソフトウェア開発者
 DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Course Scheduling Tool,Course Start Date,コース開始日
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,ハブに公開
 DocType: Student Admission,Student Admission,生徒入学
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,仕入詳細
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,最大級
 DocType: Email Digest,New Quotations,新しい請求書
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,従業員に選択された好適な電子メールに基づいて、従業員への電子メールの給与スリップ
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 DocType: Tax Rule,Shipping County,配送郡
-apps/erpnext/erpnext/config/desktop.py +167,Learn,学ぶ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,学ぶ
 DocType: Asset,Next Depreciation Date,次の減価償却日
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,従業員一人あたりの活動費用
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,明らかに優れた小切手および預金
 DocType: Item,Synced With Hub,ハブと同期
 DocType: Driver,Fleet Manager,フリートマネージャ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},行番号{0}:{1}項目{2}について陰性であることができません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},行番号{0}:{1}項目{2}について陰性であることができません
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{}にホテルの客室料金を設定してください
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Opening Invoice Creation Tool,Invoice Type,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,納品書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,納品書
 DocType: Consultation,Encounter Impression,出会いの印象
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,販売資産の取得原価
@@ -502,11 +497,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書(例:最高経営責任者(CEO)、取締役など)。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,顧客通貨が顧客の基本通貨に換算されるレート
 DocType: Course Scheduling Tool,Course Scheduling Tool,コーススケジュールツール
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:購入請求書は、既存の資産に対して行うことはできません。{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[緊急]%sの定期的な%sを作成中にエラーが発生しました
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:購入請求書は、既存の資産に対して行うことはできません。{1}
 DocType: Land Unit,LInked Analysis,リンキング分析
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,適用期間は2つの割り当てレコードにまたがることはできません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,適用期間は2つの割り当てレコードにまたがることはできません
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} は従業員 {1} の期間 {2} から {3} へ既に割り当てられています
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},行#{0}:バッチ番号は {1} {2}と同じである必要があります
@@ -520,7 +514,7 @@
 DocType: Purchase Order,% Received,%受領
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,生徒グループを作成
 DocType: Volunteer,Weekends,週末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,クレジットメモ金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,クレジットメモ金額
 DocType: Setup Progress Action,Action Document,アクション文書
 DocType: Chapter Member,Website URL,ウェブサイトのURL
 ,Finished Goods,完成品
@@ -534,6 +528,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNextデモ
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,アイテム追加
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,アイテム品質検査パラメータ
+DocType: Leave Application,Leave Approver Name,休暇承認者名
 DocType: Depreciation Schedule,Schedule Date,期日
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",収益・控除・その他の給与コンポーネント
 DocType: Packed Item,Packed Item,梱包済アイテム
@@ -550,7 +545,7 @@
 DocType: Request for Quotation,Request for Quotation,見積依頼
 DocType: Healthcare Settings,Require Lab Test Approval,ラボテスト承認が必要
 DocType: Salary Slip Timesheet,Working Hours,労働時間
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,残高の総額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,残高の総額
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始/現在の連続番号を変更します。
 DocType: Dosage Strength,Strength,力
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,新しい顧客を作成します。
@@ -563,7 +558,7 @@
 DocType: Workstation,Consumable Cost,消耗品費
 DocType: Purchase Receipt,Vehicle Date,車両日付
 DocType: Student Log,Medical,検診
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,失敗の原因
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,失敗の原因
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,アカウント番号の更新
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,リード所有者は、リードと同じにすることはできません
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,配分される金額未調整の量よりも多くすることはできません
@@ -573,11 +568,10 @@
 DocType: Lab Test Template,Single,シングル
 DocType: Salary Slip,Total Loan Repayment,合計ローンの返済
 DocType: Account,Cost of Goods Sold,売上原価
-DocType: Subscription,Yearly,毎年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,「コストセンター」を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,「コストセンター」を入力してください
 DocType: Drug Prescription,Dosage,投薬量
 DocType: Journal Entry Account,Sales Order,受注
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均販売レート
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,平均販売レート
 DocType: Assessment Plan,Examiner Name,審査官の名前
 DocType: Lab Test Template,No Result,結果がありません
 DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
@@ -586,6 +580,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,最初の「会社」名を入力してください
 DocType: Purchase Invoice,Supplier Name,サプライヤー名
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNextマニュアルをご覧ください
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,カレンダーのすべての部署メンバーの葉を表示する
 DocType: Purchase Invoice,01-Sales Return,01-セールスリターン
 DocType: Account,Is Group,グループ
 DocType: Email Digest,Pending Purchase Orders,保留中の注文書
@@ -602,13 +597,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,必須項目 - 学年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1}は{2} {3}に関連付けられていません
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,メールの一部となる入門テキストをカスタマイズします。各取引にははそれぞれ入門テキストがあります
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},{0}社のデフォルト支払い可能口座を設定してください
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},{0}社のデフォルト支払い可能口座を設定してください
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},停止した作業指示書に対してトランザクションを許可していません{0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
@@ -631,8 +626,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,販売のために予約済み
 DocType: Packing Slip,From Package No.,参照元梱包番号
 DocType: Item Attribute,To Range,範囲対象
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",独自の評価方法を持たない一部のアイテムで取引があるため、評価方法を変更することができません
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,有価証券および預金
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",独自の評価方法を持たない一部のアイテムで取引があるため、評価方法を変更することができません
 DocType: Student Report Generation Tool,Attended by Parents,親が参加しました
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Patient,AB Positive,ABポジティブ
@@ -641,7 +636,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,出勤レコード
 DocType: Salary Structure,Salary Component for timesheet based payroll.,給与計算に基づくタイムシートの給与コンポーネント。
 DocType: Sales Order Item,Used for Production Plan,生産計画に使用
-DocType: Employee Loan,Total Payment,お支払い総額
+DocType: Loan,Total Payment,お支払い総額
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,完了した作業オーダーのトランザクションを取り消すことはできません。
 DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間(分単位)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1}が取り消されたため、アクションが完了できません
@@ -657,15 +652,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,制作するのに十分なパーツ
 DocType: POS Profile User,POS Profile User,POSプロファイルユーザー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接利益
+DocType: Subscription Invoice,Subscription Invoice,購読請求書
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,直接利益
 DocType: Patient Appointment,Date TIme,日時
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,管理担当者
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,管理担当者
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,会社と税金の設定
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,コースを選択してください
 DocType: Codification Table,Codification Table,コード化表
 DocType: Timesheet Detail,Hrs,時間
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,会社を選択してください
 DocType: Stock Entry Detail,Difference Account,差損益
 DocType: Purchase Invoice,Supplier GSTIN,サプライヤーGSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
@@ -690,6 +686,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,キャッシュフローマッピングテンプレート
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,シリアル番号の項目は分数にはできません
 DocType: Journal Entry,Difference (Dr - Cr),差額(借方 - 貸方)
+DocType: Bank Guarantee,Providing,提供
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",許可されていない、必要に応じてLabテストテンプレートを設定する
 DocType: Patient,Risk Factors,危険因子
@@ -721,7 +718,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
 DocType: Healthcare Settings,Appointment Confirmation,予約の確認
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",在庫取引で使用されているため、シリアル番号{0}を削除することはできません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",在庫取引で使用されているため、シリアル番号{0}を削除することはできません
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),(貸方)を閉じる
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,こんにちは
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,アイテムを移動
@@ -746,11 +743,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",ユーザー {1} のPOSプロファイル {0} はデフォルト設定により無効になっています
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積値
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POSプロファイルには地域が必要です
 DocType: Supplier,Prevent RFQs,見積停止
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,受注を作成
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0}から{1}までの期間給与スリップ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0}から{1}までの期間給与スリップ
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
@@ -771,8 +768,9 @@
 DocType: Sales Invoice,Shipping Bill Date,出荷請求日
 DocType: Production Plan,Production Plan,生産計画
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,インボイス作成ツールを開く
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,販売返品
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,販売返品
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注:総割り当てられた葉を{0}の期間のためにすでに承認された葉{1}を下回ってはいけません
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,シリアルナンバーに基づいて取引で数量を設定する
 ,Total Stock Summary,総株式サマリー
 DocType: Announcement,Posted By,投稿者
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤーより配送済(ドロップシッピング)
@@ -783,15 +781,15 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),開く(貸方)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,割当額をマイナスにすることはできません
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,会社を設定してください
 DocType: Share Balance,Share Balance,株式残高
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Training Result Employee,Training Result Employee,研修結果従業員
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
-DocType: Repayment Schedule,Principal Amount,元本金額
-DocType: Employee Loan Application,Total Payable Interest,総支払利息
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,元本金額
+DocType: Loan Application,Total Payable Interest,総支払利息
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},総残高:{0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,納品書タイムシート
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
@@ -800,10 +798,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",休暇・経費請求・給与の管理用に従業員レコードを作成
 DocType: Restaurant Reservation,Restaurant Reservation,レストラン予約
 DocType: Land Unit,Land Unit Name,土地ユニット名
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,提案の作成
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,提案の作成
 DocType: Payment Entry Deduction,Payment Entry Deduction,支払エントリ控除
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,仕上げ中
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,メールで顧客に通知する
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,メールで顧客に通知する
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,他の営業担当者 {0} が同じ従業員IDとして存在します
 DocType: Employee Advance,Claimed Amount,請求額
 apps/erpnext/erpnext/config/education.py +180,Masters,マスター
@@ -821,13 +819,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",ペイメントゲートウェイアカウントが作成されていないため、手動で作成してください。
 DocType: Supplier Scorecard,Per Year,年毎
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOBごとにこのプログラムの入学資格はない
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Sales Invoice,Sales Taxes and Charges,販売租税公課
 DocType: Employee,Organization Profile,組織プロファイル
 DocType: Vital Signs,Height (In Meter),高さ(メートル)
 DocType: Student,Sibling Details,兄弟詳細
 DocType: Vehicle Service,Vehicle Service,車両診断サービス
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自動的に条件に基づいて、フィードバック依頼がトリガーされます。
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,自動的に条件に基づいて、フィードバック依頼がトリガーされます。
 DocType: Employee,Reason for Resignation,退職理由
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,業績評価用テンプレート
 DocType: Sales Invoice,Credit Note Issued,クレジットノート発行
@@ -842,10 +839,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,保守スケジュール
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",価格設定ルールは、顧客、顧客グループ、地域、サプライヤー、サプライヤータイプ、キャンペーン、販売パートナーなどに基づいて抽出されます
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,在庫の純変更
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,従業員のローン管理
 DocType: Employee,Passport Number,パスポート番号
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2との関係
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,マネージャー
 DocType: Payment Entry,Payment From / To,/からへの支払い
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は顧客の現在の残高よりも少なくなっています。与信限度は少なくとも {0} である必要があります
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},倉庫{0}にアカウントを設定してください
@@ -887,23 +883,23 @@
 DocType: Item,Material Transfer,資材移送
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,のパスを見つけることができませんでした
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),開く(借方)
+DocType: Loan,Applicant,応募者
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},投稿のタイムスタンプは、{0}の後でなければなりません
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,定期的に伝票を作成する
 ,GST Itemised Purchase Register,GSTアイテム購入登録
 DocType: Course Scheduling Tool,Reschedule,再スケジュール
-DocType: Employee Loan,Total Interest Payable,買掛金利息合計
+DocType: Loan,Total Interest Payable,買掛金利息合計
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,陸揚費用租税公課
 DocType: Work Order Operation,Actual Start Time,実際の開始時間
 DocType: BOM Operation,Operation Time,作業時間
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,仕上げ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,ベース
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,ベース
 DocType: Timesheet,Total Billed Hours,請求された総時間
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,償却額
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,償却額
 DocType: Leave Block List Allow,Allow User,ユーザを許可
 DocType: Journal Entry,Bill No,請求番号
 DocType: Company,Gain/Loss Account on Asset Disposal,資産売却益/損失勘定
 DocType: Vehicle Log,Service Details,サービス詳細
-DocType: Subscription,Quarterly,4半期ごと
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,グループ化済
 DocType: Selling Settings,Delivery Note Required,納品書必須
@@ -914,7 +910,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,勤務表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,原材料のバックフラッシュ基準
 DocType: Sales Invoice,Port Code,ポートコード
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,予備倉庫
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,予備倉庫
 DocType: Lead,Lead is an Organization,リードは組織です
 DocType: Guardian Interest,Interest,関心
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,事前販売
@@ -926,12 +922,12 @@
 DocType: Account,Accounts,アカウント
 DocType: Vehicle,Odometer Value (Last),走行距離計値(最終)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,サプライヤスコアカード基準のテンプレート。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,マーケティング
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,マーケティング
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,支払エントリがすでに作成されています
 DocType: Request for Quotation,Get Suppliers,サプライヤーを取得
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:{1}資産はアイテムにリンクされていません{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,給与明細プレビュー
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:{1}資産はアイテムにリンクされていません{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,給与明細プレビュー
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,アカウント {0} が複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,30日以内に会員の有効期限が切れる場合にのみ更新することができます
@@ -941,7 +937,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,キャッシュフローマッパー文書を設定している場合のみ選択してください
 DocType: Email Digest,Next email will be sent on:,次のメール送信先:
 DocType: Supplier Scorecard,Per Week,週毎
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,総生徒数
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
@@ -962,9 +958,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,クレジットカードエントリ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,会社およびアカウント
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,値内
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,値内
 DocType: Asset Settings,Depreciation Options,減価償却オプション
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,転記時間が無効です
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,転記時間が無効です
 DocType: Lead,Campaign Name,キャンペーン名
 DocType: Hotel Room,Capacity,容量
 DocType: Selling Settings,Close Opportunity After Days,日後に閉じるの機会
@@ -989,7 +985,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,顧客の発注番号
 DocType: Budget,Budget Against,予算に対する
 DocType: Employee,Cell Number,携帯電話の番号
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,与えられた基準の従業員はいません。給与明細がまだ作成されていないことを確認します。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,与えられた基準の従業員はいません。給与明細がまだ作成されていないことを確認します。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,自動資材要求生成済
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
@@ -1001,15 +997,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,テーブルを選択してください
 DocType: BOM,Website Specifications,ウェブサイトの仕様
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}は「受信者」のメールアドレスが無効です
 DocType: Special Test Items,Particulars,詳細
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}:タイプ{1}の{0}から
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}:タイプ{1}の{0}から
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,行{0}:換算係数が必須です
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",複数の価格ルールが同じ基準で存在するため、優先順位を割り当てることによって競合を解決してください。価格ルール:{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Asset,Maintenance,保守
+DocType: Subscriber,Subscriber,加入者
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,プロジェクトステータスを更新してください
 DocType: Item,Maximum sample quantity that can be retained,最大保管可能サンプル数
@@ -1073,26 +1069,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ショッピングカートのデフォルト設定
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,タイムスロットを追加する
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},仕訳 {0} を経由したスクラップ資産
-DocType: Employee Loan,Interest Income Account,受取利息のアカウント
+DocType: Loan,Interest Income Account,受取利息のアカウント
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,送信した招待状のレビュー
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,バイオテクノロジー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,事務所維持費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,事務所維持費
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,移動
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,メールアカウント設定
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,最初のアイテムを入力してください
 DocType: Asset Repair,Downtime,ダウンタイム
 DocType: Account,Liability,負債
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,学期:
 DocType: Salary Detail,Do not include in total,合計に含めないでください
 DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルト費用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},サンプル数{0}は受信数量{1}を超えることはできません
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,価格表が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Request for Quotation Supplier,Send Email,メールを送信
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},注意:不正な添付ファイル{0}
 DocType: Item,Max Sample Quantity,最大サンプル数
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,権限がありませんん
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,権限がありませんん
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,見積依頼
 DocType: Vital Signs,Heart Rate / Pulse,心拍数/パルス
 DocType: Company,Default Bank Account,デフォルト銀行口座
@@ -1103,11 +1099,10 @@
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ラボテストとバイタルサイン
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,行#{0}:アセット{1}提出しなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,行#{0}:アセット{1}提出しなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,従業員が見つかりません
-DocType: Subscription,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,生徒グループはすでに更新されています。
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,生徒グループはすでに更新されています。
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,プロジェクトアップデート。
 DocType: SMS Center,All Customer Contact,全ての顧客連絡先
 DocType: Land Unit,Tree Details,ツリー詳細
@@ -1157,7 +1152,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,出勤インポート
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,全てのアイテムグループ
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Work Order,Item To Manufacture,製造するアイテム
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} 状態は {2} です
@@ -1171,7 +1165,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",選択したアドレスが保存後に編集された場合は、再選択します。
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 DocType: Item,Hub Publishing Details,ハブ公開の詳細
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',「オープニング」
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',「オープニング」
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,やることリストを開く
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
 DocType: Lab Test Template,Result Format,結果フォーマット
@@ -1181,7 +1175,7 @@
 DocType: Payroll Entry,Bimonthly,隔月
 DocType: Vehicle Service,Brake Pad,ブレーキパッド
 DocType: Fertilizer,Fertilizer Contents,肥料の内容
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,研究開発
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,研究開発
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,支払額
 DocType: Company,Registration Details,登録の詳細
 DocType: Timesheet,Total Billed Amount,合計請求金額
@@ -1195,7 +1189,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,受注時に与信限度確認をバイパスする
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,業績評価
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",「ショッピングカートを使用」を有効にするには、ショッピングカートが有効でありかつショッピングカートに最低1つの税ルールが指定されていなければなりません
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",支払エントリー {0} は注文 {1} にリンクされています。請求書内で前受金として引用する場合にはチェックしてください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",支払エントリー {0} は注文 {1} にリンクされています。請求書内で前受金として引用する場合にはチェックしてください。
 DocType: Sales Invoice Item,Stock Details,在庫詳細
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,プロジェクトの価値
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,POS
@@ -1229,7 +1223,7 @@
 DocType: Restaurant Table,Minimum Seating,最小座席
 DocType: Item Attribute,Item Attribute Values,アイテムの属性値
 DocType: Examination Result,Examination Result,テスト結果
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,領収書
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,為替レートマスター
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},参照文書タイプは {0} のいずれかでなければなりません
@@ -1237,15 +1231,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Work Order,Plan material for sub-assemblies,部分組立品資材計画
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,部品表{0}はアクティブでなければなりません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,転送可能なアイテムがありません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,転送可能なアイテムがありません
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),終了(オープニング+合計)
 DocType: Journal Entry,Depreciation Entry,減価償却エントリ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,この保守訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016規格
 DocType: Pricing Rule,Rate or Discount,レートまたは割引
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
 DocType: Purchase Receipt Item Supplied,Required Qty,必要な数量
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,お気に入り
 DocType: Hub Settings,Custom Data,カスタムデータ
@@ -1257,9 +1251,9 @@
 DocType: Medical Code,Medical Code Standard,医療コード標準
 DocType: Soil Texture,Clay Composition (%),粘土組成(%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,タスクを割り当てる前に保存してください。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,価格のバランス
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,価格のバランス
 DocType: Lab Test,Lab Technician,検査技師
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,販売価格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,販売価格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",チェックした場合、顧客が作成され、患者にマッピングされます。該当顧客に対して請求書が作成されます。患者作成中に既存の顧客を選択することもできます。
 DocType: Bank Reconciliation,Account Currency,アカウント通貨
@@ -1267,16 +1261,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,会社の丸め誤差アカウントを指定してください
 DocType: Purchase Receipt,Range,幅
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
 DocType: Item Barcode,Item Barcode,アイテムのバーコード
 DocType: Woocommerce Settings,Endpoints,エンドポイント
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",生成される。遅れている場合は、この日の &quot;Repeat on Day of Month&quot;フィールドを手動で変更する必要があります
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
 DocType: Share Transfer,From Folio No,フォリオから
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}:貸方エントリは{1}とリンクすることができません
@@ -1311,16 +1303,17 @@
 DocType: Asset,Available-for-use Date,利用可能日
 DocType: Guardian,Guardian Name,保護者名
 DocType: Cheque Print Template,Has Print Format,印刷形式あり
-DocType: Employee Loan,Sanctioned,認可済
+DocType: Loan,Sanctioned,認可済
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,必須です。為替レコードが作成されない可能性があります
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},行 {0}:アイテム{1}のシリアル番号を指定してください
 DocType: Crop Cycle,Crop Cycle,作物サイクル
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
 DocType: Student Admission,Publish on website,ウェブサイト上で公開
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,サプライヤの請求書の日付は、転記日を超えることはできません
+DocType: Subscription,Cancelation Date,キャンセル日
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
 DocType: Agriculture Task,Agriculture Task,農業タスク
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,間接収入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,間接収入
 DocType: Student Attendance Tool,Student Attendance Tool,生徒出席ツール
 DocType: Restaurant Menu,Price List (Auto created),価格表(自動作成)
 DocType: Cheque Print Template,Date Settings,日付設定
@@ -1346,6 +1339,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,メートル
 DocType: Workstation,Electricity Cost,電気代
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ラボテストdatetimeはコレクションdatetimeの前にはありません
+DocType: Subscription Plan,Cost,コスト
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
 DocType: Expense Claim,Total Advance Amount,合計アドバンス額
 DocType: Delivery Stop,Estimated Arrival,推定到着
@@ -1357,14 +1351,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします(後で編集可能です)
 DocType: Timesheet Detail,Bill,支払
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ホワイト
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,ホワイト
 DocType: SMS Center,All Lead (Open),全リード(オープン)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:({2} {3})エントリの時間を掲示で{1}倉庫内の{4}の数量は利用できません
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,チェックボックスのリストから選択できるオプションは1つのみです。
 DocType: Purchase Invoice,Get Advances Paid,立替金を取得
 DocType: Item,Automatically Create New Batch,新しいバッチを自動的に作成
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0}を{1}に割り当てる(行{2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,作成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0}を{1}に割り当てる(行{2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,作成
 DocType: Student Admission,Admission Start Date,入場開始日
 DocType: Journal Entry,Total Amount in Words,合計の文字表記
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新しい社員
@@ -1382,7 +1376,7 @@
 DocType: Holiday List,Holiday List Name,休日リストの名前
 DocType: Repayment Schedule,Balance Loan Amount,残高貸付額
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,スケジュールコース
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ストックオプション
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ストックオプション
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,購買発注の前回の購買詳細の取得を無効にする
 DocType: Journal Entry Account,Expense Claim,経費請求
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか?
@@ -1401,11 +1395,12 @@
 DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
 DocType: Purchase Invoice,Cash/Bank Account,現金/銀行口座
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},{0}を指定してください
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,バリエーション作成がキューに入れられました。
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}の作業要約
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,属性表は必須です
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,リストの最初の承認承認者は、既定の承認承認者として設定されます。
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,属性表は必須です
 DocType: Production Plan,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0}はマイナスにできません
 DocType: Training Event,Self-Study,独学
@@ -1417,7 +1412,7 @@
 DocType: Workstation,Wages,賃金
 DocType: Asset Maintenance,Maintenance Manager Name,保守マネージャ名
 DocType: Agriculture Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},テーブル{1}内の行{0}の有効な行IDを指定してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},テーブル{1}内の行{0}の有効な行IDを指定してください
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,変数を見つけることができません:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,編集するフィールドを数字で選択してください
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,ストック元帳が登録されると固定資産項目にすることはできません。
@@ -1429,7 +1424,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,品質検査テンプレート名
 DocType: Project,First Email,最初のメール
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,受注の予約倉庫/完成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,販売額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,販売額
 DocType: Repayment Schedule,Interest Amount,利息額
 DocType: Serial No,Creation Document No,作成ドキュメントNo
 DocType: Share Transfer,Issue,課題
@@ -1443,10 +1438,10 @@
 DocType: Tax Rule,Shipping State,出荷状態
 ,Projected Quantity as Source,ソースとして投影数量
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,配達旅行
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,配達旅行
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,転送タイプ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,販売費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,販売費
 DocType: Consultation,Diagnosis,診断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
@@ -1455,12 +1450,13 @@
 DocType: Sales Partner,Implementation Partner,導入パートナー
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,郵便番号
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},受注{0}は{1}です
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ローン{0}の利息収入勘定を選択
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
 DocType: Item,Default Supplier,デフォルトサプライヤー
 DocType: Manufacturing Settings,Over Production Allowance Percentage,製造割当率超過
-DocType: Employee Loan,Repayment Schedule,返済スケジュール
+DocType: Loan,Repayment Schedule,返済スケジュール
 DocType: Shipping Rule Condition,Shipping Rule Condition,出荷ルール条件
 DocType: Holiday List,Get Weekly Off Dates,週の休日を取得する
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,終了日は開始日より前にすることはできません
@@ -1474,7 +1470,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
 DocType: Education Settings,Attendance Freeze Date,出席凍結日
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,すべての製品を表示
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,すべての製品を表示
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最小リード年齢(日)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,すべてのBOM
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0}タイプのホテルルームは{1}で利用できません
@@ -1482,14 +1478,16 @@
 DocType: Expense Claim,From Employee,社員から
 DocType: Driver,Cellphone Number,携帯番号
 DocType: Project,Monitor Progress,モニターの進捗状況
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告:{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告:{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
 DocType: Journal Entry,Make Difference Entry,差違エントリを作成
+DocType: Supplier Quotation,Auto Repeat Section,オートリピートセクション
 DocType: Upload Attendance,Attendance From Date,出勤開始日
 DocType: Appraisal Template Goal,Key Performance Area,重要実行分野
 DocType: Program Enrollment,Transportation,輸送
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,無効な属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1}は提出しなければなりません
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},数量は以下でなければなりません{0}
+DocType: Department Approver,Department Approver,部門承認者
 DocType: SMS Center,Total Characters,文字数合計
 DocType: Employee Advance,Claimed,請求された
 DocType: Crop,Row Spacing,行間隔
@@ -1499,6 +1497,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,支払照合 請求
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,貢献%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",各購買設定で「発注が必要」が有効の場合、請求書を作成するには、先にアイテム {0} の発注を作成する必要があります
+,HSN-wise-summary of outward supplies,HSNによる外部供給の要約
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,参照用の会社登録番号(例:税番号など)
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
@@ -1512,7 +1511,7 @@
 DocType: Setup Progress Action,Action Name,アクション名
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTINの最初の2桁は州番号{0}と一致する必要があります
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,請求期限の開始日
 DocType: Salary Slip,Leave Without Pay,無給休暇
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,キャパシティプランニングのエラー
@@ -1530,26 +1529,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,フィールドは作成時にのみコピーされます。
 DocType: Setup Progress Action,Domains,ドメイン
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,マネジメント
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,マネジメント
 DocType: Cheque Print Template,Payer Settings,支払人の設定
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
 DocType: Purchase Invoice,Is Return,返品
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,警告
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',タスク &#39;{0}&#39;の開始日が終了日よりも大きい
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,リターン/デビットノート
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,リターン/デビットノート
 DocType: Price List Country,Price List Country,価格表内の国
 DocType: Item,UOMs,数量単位
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,アイテムコードはシリアル番号に付け替えることができません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,アイテムコードはシリアル番号に付け替えることができません
 DocType: Purchase Invoice Item,UOM Conversion Factor,数量単位の変換係数
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,バッチ番号を取得するために、商品コードを入力してください
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
-DocType: Employee Loan,Partially Disbursed,部分的に支払わ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,助成金情報
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,助成金情報
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,サプライヤーデータベース
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,キャンセルされていないサブスクリプションを再起動することはできません。
 DocType: Account,Balance Sheet,貸借対照表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
 DocType: Fee Validity,Valid Till,有効期限
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,トータルペアレント教師ミーティング
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",支払モードが設定されていません。アカウントが支払モードやPOSプロファイルに設定されているかどうか、確認してください。
@@ -1562,7 +1561,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,行#{0}:拒否数量は「購買返品」に入力することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,選択した顧客の顧客グループの変更は許可されていません。
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,到着予定時刻の更新
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,到着予定時刻の更新
 DocType: Program Enrollment Tool,Enrollment Details,登録の詳細
 DocType: Purchase Invoice Item,Net Rate,正味単価
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,顧客を選択してください
@@ -1581,18 +1580,20 @@
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Purchase Order,Group same items,グループ同じアイテム
 DocType: Purchase Invoice,Disable Rounded Total,合計の四捨五入を無効にする
-DocType: Employee Loan Application,Repayment Info,返済情報
+DocType: Department,Parent Department,親部
+DocType: Loan Application,Repayment Info,返済情報
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,「エントリ」は空にできません
 DocType: Maintenance Team Member,Maintenance Role,保守役割
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},行{0}は{1}と重複しています
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,年度は、{0}が見つかりません
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,年度は、{0}が見つかりません
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,従業員設定
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,ホテル予約ユーザー
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,接頭辞を選択してください
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,リサーチ
+DocType: Subscription Settings,Subscription Settings,サブスクリプション設定
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,リサーチ
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Announcement,All Students,全生徒
@@ -1603,19 +1604,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Crop Cycle,Less than a year,1年未満
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,生徒携帯番号
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 DocType: Crop,Yield UOM,収量単位
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
 DocType: Item,Is Item from Hub,ハブからのアイテム
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}:活動タイプは必須です。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,配当金支払額
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,配当金支払額
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,会計元帳
 DocType: Stock Reconciliation,Difference Amount,差額
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{1}に出発したDr {0}
 DocType: Purchase Invoice,Reverse Charge,逆の電荷
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,内部留保
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,内部留保
 DocType: Purchase Invoice,05-Change in POS,05  -  POSの変更
 DocType: Vehicle Log,Service Detail,サービス詳細
 DocType: BOM,Item Description,アイテム説明
@@ -1630,12 +1631,12 @@
 DocType: Opportunity Item,Opportunity Item,機会アイテム
 ,Student and Guardian Contact Details,生徒・保護者連絡先の詳細
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,行{0}:サプライヤーのために{0}メールアドレスは、電子メールを送信するために必要とされます
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,仮勘定期首
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,仮勘定期首
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ハブを表示
 ,Employee Leave Balance,従業員の残休暇数
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 DocType: Patient Appointment,More Info,詳細情報
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},行{0}のアイテムには評価レートが必要です
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},行{0}のアイテムには評価レートが必要です
 DocType: Supplier Scorecard,Scorecard Actions,スコアカードのアクション
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,例:コンピュータサイエンスの修士
 DocType: Purchase Invoice,Rejected Warehouse,拒否された倉庫
@@ -1645,7 +1646,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,to
 DocType: Supplier Quotation Item,Lead Time in days,リードタイム日数
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,買掛金の概要
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{1}の{0}から給与の支払い
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{1}の{0}から給与の支払い
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,受注{0}は有効ではありません
@@ -1654,9 +1655,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ラボテストの処方箋
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",資材要求 {1} の総発行/転送量 {0} は アイテム {3} 用の要求数量 {2} を超えることはできません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,S
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,S
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,請求書作成ツール項目を開く
 DocType: Education Settings,Employee Number,従業員番号
+DocType: Subscription Settings,Cancel Invoice After Grace Period,猶予期間終了後の請求書の取り消し
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
 DocType: Project,% Completed,% 完了
 ,Invoiced Amount (Exculsive Tax),請求額(外税)
@@ -1670,7 +1672,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ラボラトリーテスト日時
 DocType: Email Digest,Add Quote,引用を追加
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,間接経費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,間接経費
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,行{0}:数量は必須です
 DocType: Agriculture Analysis Criteria,Agriculture,農業
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,マスタデータ同期
@@ -1700,16 +1702,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,納品書{0}は提出されていません
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,最初に商品コードを設定してください
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
+DocType: Subscription Plan,Billing Interval Count,請求間隔のカウント
 DocType: Sales Invoice Item,Edit Description,説明編集
 DocType: Antibiotic,Antibiotic,抗生物質
 ,Team Updates,チーム更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計(会社通貨)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,印刷形式を作成します。
@@ -1735,7 +1738,7 @@
 DocType: POS Item Group,POS Item Group,POSアイテムのグループ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,代替品目は品目コードと同じであってはなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06  - 暫定評価の最終決定
 DocType: Salary Slip,Bank Account No.,銀行口座番号
@@ -1751,7 +1754,7 @@
 DocType: BOM Operation,Workstation,作業所
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,見積サプライヤー依頼
 DocType: Healthcare Settings,Registration Message,登録メッセージ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ハードウェア
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ハードウェア
 DocType: Prescription Dosage,Prescription Dosage,処方用量
 DocType: Attendance,HR Manager,人事マネージャー
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,会社を選択してください
@@ -1782,7 +1785,7 @@
 DocType: Project,Start and End Dates,開始・終了日
 ,Delivered Items To Be Billed,未入金の納品済アイテム
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},BOM {0} を開く
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
 DocType: Authorization Rule,Average Discount,平均割引
 DocType: Project Update,Great/Quickly,素晴らしい/すばやく
 DocType: Purchase Invoice Item,UOM,単位
@@ -1791,8 +1794,8 @@
 DocType: Employee,EMP/,EMP/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,バッチ品目のロットを選択してください
 DocType: Asset,Depreciation Schedules,減価償却スケジュール
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,以下のアカウントは、GST設定で選択することができます:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,申請期間は休暇割当期間外にすることはできません
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,以下のアカウントは、GST設定で選択することができます:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申請期間は休暇割当期間外にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
 DocType: Payment Request,Transaction Currency,取引通貨
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},{0}から | {1} {2}
@@ -1803,6 +1806,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,平均支出
 DocType: POS Profile,Campaign,キャンペーン
 DocType: Supplier,Name and Type,名前とタイプ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',承認ステータスは「承認」または「拒否」でなければなりません
 DocType: Physician,Contacts and Address,連絡先と住所
 DocType: Purchase Invoice,Contact Person,担当者
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',「開始予定日」は、「終了予定日」より後にすることはできません
@@ -1816,19 +1820,20 @@
 DocType: Student Admission,Eligibility and Details,資格と詳細
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,固定資産の純変動
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},最大:{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,開始日時
 DocType: Email Digest,For Company,会社用
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信ログ。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",見積依頼がポータルからアクセスできないため、ポータル設定を確認してください。
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,サプライヤスコアカードスコアリング変数
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,購入金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,購入金額
 DocType: Sales Invoice,Shipping Address Name,配送先住所
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,コーススケジュールを作成中にエラーが発生しました
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,リストの最初のExpense Approverが、デフォルトExpense Approverとして設定されます。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100を超えることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
@@ -1849,15 +1854,16 @@
 DocType: Package Code,Package Code,パッケージコード
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,見習
 DocType: Purchase Invoice,Company GSTIN,会社GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,マイナスの数量は許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,マイナスの数量は許可されていません
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","文字列としてアイテムマスタから取得され、このフィールドに格納されている税詳細テーブル。
 租税公課のために使用されます"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",会計が凍結されている場合、エントリは限られたユーザーに許可されています。
 DocType: Email Digest,Bank Balance,銀行残高
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,休暇申請時に承認者を必須のままにする
 DocType: Job Opening,"Job profile, qualifications required etc.",必要な業務内容、資格など
 DocType: Journal Entry Account,Account Balance,口座残高
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,取引のための税ルール
@@ -1885,15 +1891,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,行{0}の支払い期間は重複している可能性があります。
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),農業(ベータ版)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,梱包伝票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,事務所賃料
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMSゲートウェイの設定
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,梱包伝票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,事務所賃料
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,SMSゲートウェイの設定
 DocType: Disease,Common Name,一般名
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,インポートが失敗しました!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
 DocType: Vital Signs,Blood Pressure,血圧
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,アナリスト
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,アナリスト
 DocType: Item,Inventory,在庫
 DocType: Item,Sales Details,販売明細
 DocType: Quality Inspection,QI-,QI-
@@ -1903,15 +1909,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,生徒グループ内の生徒の入学コースを検証する
 DocType: Notification Control,Expense Claim Rejected,経費請求が拒否
 DocType: Item,Item Attribute,アイテム属性
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,政府
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,経費請求{0}はすでに自動車ログインのために存在します
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,研究所の名前
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,返済金額を入力してください。
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,返済金額を入力してください。
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,アイテムバリエーション
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,サービス
 DocType: HR Settings,Email Salary Slip to Employee,従業員への給与明細メールを送信する
 DocType: Cost Center,Parent Cost Center,親コストセンター
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,可能性のあるサプライヤーを選択
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,可能性のあるサプライヤーを選択
 DocType: Sales Invoice,Source,ソース
 DocType: Customer,"Select, to make the customer searchable with these fields",選択すると、顧客はこれらのフィールドで検索可能になります
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,クローズ済を表示
@@ -1928,7 +1934,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,梱包伝票(S)をキャンセル
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,投資活動によるキャッシュフロー
 DocType: Program Course,Program Course,教育課程コース
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,運送・転送料金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,運送・転送料金
 DocType: Homepage,Company Tagline for website homepage,ウェブサイトのホームページのための会社キャッチフレーズ
 DocType: Item Group,Item Group Name,アイテムグループ名
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,売上高
@@ -1958,10 +1964,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,会員詳細
 DocType: Leave Block List,Block Holidays on important days.,年次休暇(記念日休暇)
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),必要なすべての結果値を入力してください
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,売掛金概要
-DocType: Employee Loan,Monthly Repayment Amount,毎月返済額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,売掛金概要
+DocType: Loan,Monthly Repayment Amount,毎月返済額
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,請求書を開く
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
 DocType: UOM,UOM Name,数量単位名
 DocType: GST HSN Code,HSN Code,HSNコード
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,貢献額
@@ -1984,7 +1990,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ユーザー{0}は既に医師{1}に割り当てられています
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,可能性のあるサプライヤー
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,可能性のあるサプライヤー
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,月次配分
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),ヘルスケア(ベータ版)
@@ -2011,7 +2018,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,製造数量は必須です
-DocType: Employee Loan,Repayment Method,返済方法
+DocType: Loan,Repayment Method,返済方法
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",チェックした場合、Webサイトの「ホーム」ページはデフォルトのアイテムグループとなります
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,会社経費の請求
@@ -2020,7 +2027,7 @@
 DocType: Asset Maintenance Task,Certificate Required,証明書が必要です
 DocType: Company,Default Holiday List,デフォルト休暇リスト
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}:の時間との時間から{1}と重なっている{2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,在庫負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,在庫負債
 DocType: Purchase Invoice,Supplier Warehouse,サプライヤー倉庫
 DocType: Opportunity,Contact Mobile No,連絡先携帯番号
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,会社を選択
@@ -2028,7 +2035,7 @@
 DocType: Student Report Generation Tool,Print Section,印刷セクション
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ユーザー{0}にはデフォルトのPOSプロファイルがありません。行{1}でこのユーザーのデフォルトを確認してください。
 DocType: Student Group,Set 0 for no limit,制限なしの場合は0を設定します
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日(複数可)は祝日です。あなたは休暇を申請する必要はありません。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日(複数可)は祝日です。あなたは休暇を申請する必要はありません。
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,行{idx}:開始{invoice_type}請求書を作成するには{field}が必要です
 DocType: Customer,Primary Address and Contact Detail,プライマリアドレスと連絡先の詳細
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,支払メールを再送信
@@ -2039,10 +2046,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,少なくとも1つのドメインを選択してください。
 DocType: Dependent Task,Dependent Task,依存タスク
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: SMS Center,Receiver List,受領者リスト
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,アイテム検索
 DocType: Payment Schedule,Payment Amount,支払金額
@@ -2052,7 +2059,7 @@
 DocType: Assessment Plan,Grading Scale,評価尺度
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,完了済
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,手持ちの在庫
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,手持ちの在庫
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,インポート成功!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},支払依頼がすでに存在しています {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
@@ -2063,17 +2070,16 @@
 DocType: Quotation Item,Quotation Item,見積項目
 DocType: Customer,Customer POS Id,顧客のPOS ID
 DocType: Account,Account Name,アカウント名
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,シリアル番号 {0}は量{1}の割合にすることはできません
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,シリアル番号 {0}は量{1}の割合にすることはできません
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Woocommerce ServerのURLを入力してください
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
 DocType: Share Balance,To No,〜へ
-DocType: Subscription,Reference Document,参照文書
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1}はキャンセルまたは停止しています
 DocType: Accounts Settings,Credit Controller,与信管理
-DocType: Grant Application,Applicant Type,出願者タイプ
+DocType: Loan,Applicant Type,出願者タイプ
 DocType: Purchase Invoice,03-Deficiency in services,03  - サービスの不足
 DocType: Delivery Note,Vehicle Dispatch Date,配車日
 DocType: Healthcare Settings,Default Medical Code Standard,デフォルトの医療コード標準
@@ -2084,13 +2090,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}%支払済
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,人事
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,人事
 DocType: Lead,Upper Income,高収益
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒否
 DocType: Journal Entry Account,Debit in Company Currency,会社通貨での借方
 DocType: BOM Item,BOM Item,部品表アイテム
 DocType: Appraisal,For Employee,従業員用
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,支出項目作成
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,支出項目作成
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}:サプライヤーに対して事前に引き落としされなければなりません
 DocType: Company,Default Values,デフォルト値
 DocType: Membership,INR,INR
@@ -2119,10 +2125,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),合計(税なし)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,リードカウント
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} は0より大きくなければなりません
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,在庫有ります
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,在庫有ります
 DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング(日数)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,調達
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,必須項目 - 教育課程
 DocType: Special Test Template,Result Component,結果コンポーネント
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保証請求
@@ -2142,7 +2148,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,休暇内に休日を休暇として含む
 DocType: Sales Invoice,Packed Items,梱包済アイテム
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,シリアル番号に対する保証請求
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',「合計」
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',「合計」
 DocType: Shopping Cart Settings,Enable Shopping Cart,ショッピングカートを有効にする
 DocType: Employee,Permanent Address,本籍地
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2160,10 +2166,10 @@
 DocType: Selling Settings,Selling Settings,販売設定
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,アクションを確認
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,オンラインオークション
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,フルフィルメント
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,カート内を表示
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,マーケティング費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,標準条件を作成できません。条件の名前を変更してください
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
@@ -2185,9 +2191,9 @@
 DocType: Upload Attendance,Get Template,テンプレートを取得
 DocType: Material Request,Transferred,転送された
 DocType: Vehicle,Doors,ドア
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNextのセットアップが完了!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNextのセットアップが完了!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,患者登録料を徴収する
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,株式取引後に属性を変更することはできません。新しいアイテムを作成し、新しいアイテムに在庫を転送する
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,株式取引後に属性を変更することはできません。新しいアイテムを作成し、新しいアイテムに在庫を転送する
 DocType: Course Assessment Criteria,Weightage,重み付け
 DocType: Purchase Invoice,Tax Breakup,税金分割
 DocType: Packing Slip,PS-,PS-
@@ -2224,11 +2230,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,照合 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Purchase Invoice Item,Batch No,バッチ番号
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,従業員の進歩
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 DocType: Student Group Instructor,Student Group Instructor,生徒グループ講師
 DocType: Grant Application,Assessment  Mark (Out of 10),評価段階(10段階)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,保護者2 携帯番号
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,メイン
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員HTML
@@ -2237,15 +2244,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Email Digest,Annual Expenses,年間費用
 DocType: Item,Variants,バリエーション
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
 DocType: Sales Team,Contribution to Net Total,合計額への貢献
 DocType: Sales Invoice Item,Customer's Item Code,顧客のアイテムコード
 DocType: Stock Reconciliation,Stock Reconciliation,在庫棚卸
 DocType: Territory,Territory Name,地域名
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,サブスクリプションには同じ請求期間を持つプランしか含めることができません
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求職者
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
@@ -2254,10 +2262,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,査定
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,研修イベント
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,リードソースによるリードの追跡
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,入力してください
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,入力してください
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,保守ログ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,アイテムまたは倉庫に基づくフィルタを設定してください
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),この梱包の正味重量。 (自動にアイテムの正味重量の合計が計算されます。)
@@ -2265,11 +2273,11 @@
 DocType: Sales Order,To Deliver and Bill,配送・請求する
 DocType: Student Group,Instructors,講師
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,共有管理
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:倉庫拒否は却下されたアイテムに対して必須である{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,支払
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,支払
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",倉庫 {0} はどのアカウントにもリンクされていないため、倉庫レコードに記載するか、会社 {1} のデフォルト在庫アカウントを設定してください。
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,発注管理
 DocType: Work Order Operation,Actual Time and Cost,実際の時間とコスト
@@ -2279,7 +2287,7 @@
 DocType: Student Leave Application,Student Leave Application,生徒休業申請
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,オン
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,販売時に商品をまとめる
@@ -2289,7 +2297,7 @@
 DocType: Item,Barcodes,バーコード
 DocType: Hub Category,Hub Node,ハブノード
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,同僚
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,同僚
 DocType: Asset Movement,Asset Movement,資産移動
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,作業指示書{0}を提出する必要があります
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,新しいカート
@@ -2307,13 +2315,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,請求先通貨は、デフォルトの会社の通貨または勘定通貨のいずれかと同じでなければなりません
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します(「下書き」のみ)
 DocType: Soil Texture,Loam,壌土
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,行{0}:期日は転記前にすることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,行{0}:期日は転記前にすることはできません
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,支払いエントリを作成
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
 ,Sales Invoice Trends,請求の傾向
 DocType: Leave Application,Apply / Approve Leaves,休暇を承認/適用
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ための
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',料金タイプが「前行の額」か「前行の合計」である場合にのみ、行を参照することができます
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',料金タイプが「前行の額」か「前行の合計」である場合にのみ、行を参照することができます
 DocType: Sales Order Item,Delivery Warehouse,配送倉庫
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,金融原価センタのツリー。
 DocType: Serial No,Delivery Document No,納品文書番号
@@ -2327,7 +2334,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,品目消費は製造設定では設定されていません。
 DocType: Student,Student Mobile Number,生徒携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",行{1}のアイテム{0}を{2}以上にオーバレイすることはできません。超過請求を許可するには、在庫設定で設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",行{1}のアイテム{0}を{2}以上にオーバレイすることはできません。超過請求を許可するには、在庫設定で設定してください
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,レスポンスの更新
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},項目を選択済みです {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
@@ -2338,12 +2345,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,最初にプログラムを選択する
 DocType: Patient Appointment,Patient Age,患者年齢
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,プロジェクト管理
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,シリアル番号{0}は既に返されています
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,シリアル番号{0}は既に返されています
 DocType: Supplier,Supplier of Goods or Services.,物品やサービスのサプライヤー
 DocType: Budget,Fiscal Year,会計年度
 DocType: Asset Maintenance Log,Planned,予定
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,コンサルテーション料金を予約するために患者に設定されていない場合に使用されるデフォルトの債権アカウント。
 DocType: Vehicle Log,Fuel Price,燃料価格
+DocType: Bank Guarantee,Margin Money,マージンマネー
 DocType: Budget,Budget,予算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,セットオープン
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
@@ -2357,16 +2365,16 @@
 DocType: Lead,Follow Up,ファローアップ
 DocType: Item,Is Sales Item,販売アイテム
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,アイテムグループツリー
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
 DocType: Maintenance Visit,Maintenance Time,保守時間
 ,Amount to Deliver,配送額
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},同じ項目が複数回入力されました。 {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間開始日は、用語がリンクされている年度の年度開始日より前にすることはできません(アカデミック・イヤー{})。日付を訂正して、もう一度お試しください。
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,エラーが発生しました。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,従業員{0}は{2}から{3}の間で既に{1}を申請しています:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,エラーが発生しました。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,従業員{0}は{2}から{3}の間で既に{1}を申請しています:
 DocType: Guardian,Guardian Interests,保護者の関心
 DocType: Naming Series,Current Value,現在の値
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
 DocType: Education Settings,Instructor Records to be created by,講師レコード作成元
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 作成
 DocType: GST Account,GST Account,GSTアカウント
@@ -2385,8 +2393,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,お気に入りに追加
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,上記の選択された基準のために提出することができなかった給与伝票または既に提出された給与伝票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,関税と税金
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,上記の選択された基準のために提出することができなかった給与伝票または既に提出された給与伝票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,関税と税金
 DocType: Projects Settings,Projects Settings,プロジェクト設定
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,基準日を入力してください
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
@@ -2396,27 +2404,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,アイテムグループのツリー
 DocType: Production Plan,Total Produced Qty,総生産数量
 DocType: Payroll Entry,Get Employee Details,従業員詳細を取得
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
 DocType: Asset,Sold,販売:
 ,Item-wise Purchase History,アイテムごとの仕入履歴
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基準額(会社通貨)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,原材料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,原材料
 DocType: Payment Reconciliation Payment,Reference Row,参照行
 DocType: Installation Note,Installation Time,設置時間
 DocType: Sales Invoice,Accounting Details,会計詳細
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,この会社の全ての取引を削除
 DocType: Patient,O Positive,Oポジティブ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,投資
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,割当
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,合否基準
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,上記の表に資材要求を入力してください
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,仕訳入力に返金はありません
 DocType: Item Attribute,Attribute Name,属性名
 DocType: BOM,Show In Website,ウェブサイトで表示
 DocType: Shopping Cart Settings,Show Quantity in Website,数量をウェブサイトで表示
-DocType: Employee Loan Application,Total Payable Amount,総支払金額
+DocType: Loan Application,Total Payable Amount,総支払金額
 DocType: Task,Expected Time (in hours),予定時間(時)
 DocType: Item Reorder,Check in (group),(グループ)で確認してください
 DocType: Soil Texture,Silt,シルト
@@ -2435,7 +2444,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,支払作成
 DocType: Room,Room Name,教室名
 DocType: Prescription Duration,Prescription Duration,処方期間
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",残休暇が先の日付の休暇割当レコード{1}に持ち越されているため、{0}以前の休暇を適用/キャンセルすることができません。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",残休暇が先の日付の休暇割当レコード{1}に持ち越されているため、{0}以前の休暇を適用/キャンセルすることができません。
 DocType: Activity Cost,Costing Rate,原価計算単価
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,顧客の住所と連絡先
 ,Campaign Efficiency,キャンペーンの効率
@@ -2453,11 +2462,11 @@
 DocType: Chapter,Chapter,章
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,組
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,このモードが選択されると、POS請求書でデフォルトアカウントが自動的に更新されます。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,生産のためのBOMと数量を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,生産のためのBOMと数量を選択
 DocType: Asset,Depreciation Schedule,減価償却スケジュール
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,セールスパートナーのアドレスと連絡先
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,半日日付は開始日と終了日の間でなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,半日日付は開始日と終了日の間でなければなりません
 DocType: Maintenance Schedule Detail,Actual Date,実際の日付
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0}会社のデフォルト原価センタを設定してください。
 DocType: Item,Has Batch No,バッチ番号あり
@@ -2475,7 +2484,6 @@
 DocType: Task,Actual End Date (via Time Sheet),実際の終了日(勤務表による)
 DocType: Soil Texture,Soil Type,土壌タイプ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,新しいメッセージ
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2495,7 +2503,7 @@
 DocType: Hub Category,Hub Category,ハブカテゴリ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,車両番号
-DocType: Employee Loan,Loan Amount,融資額
+DocType: Loan,Loan Amount,融資額
 DocType: Student Report Generation Tool,Add Letterhead,レターヘッド追加
 DocType: Program Enrollment,Self-Driving Vehicle,自動運転車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,サプライヤスコアカード
@@ -2523,9 +2531,9 @@
 DocType: Cash Flow Mapper,Position,ポジション
 DocType: Patient,Patient Details,患者の詳細
 DocType: Patient,B Positive,Bポジティブ
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:固定資産である場合、数量は1でなければなりません。数量を複数とするためには個別の行を使用してください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:固定資産である場合、数量は1でなければなりません。数量を複数とするためには個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 DocType: Patient Medical Record,Patient Medical Record,患者の医療記録
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,グループから非グループ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,スポーツ
@@ -2533,8 +2541,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,実費計
 DocType: Lab Test UOM,Test UOM,テスト単位
 DocType: Student Siblings,Student Siblings,学生兄弟
+DocType: Subscription Plan Detail,Subscription Plan Detail,サブスクリプションプランの詳細
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,単位
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,会社を指定してください
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,会社を指定してください
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Asset Maintenance Task,Maintenance Task,保守タスク
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,GST設定でB2C制限を設定してください。
@@ -2548,6 +2557,7 @@
 ,BOM Search,部品表(BOM)検索
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),総消費材料費(入庫による)
 DocType: Hub Settings,Company Registered,会社登録
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,To DateはFrom Dateより短くできません
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",この倉庫で在庫があることに基づいて、ハブの「在庫あり」または「在庫なし」を発行してください。
 DocType: Vehicle,Fuel Type,燃料タイプ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,会社に通貨を指定してください
@@ -2555,17 +2565,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下の資材要求は、アイテムの再注文レベルに基づいて自動的に提出されています
 DocType: Email Digest,Pending Sales Orders,保留中の受注
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 DocType: Employee,Create User Permission,ユーザー権限の作成
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Healthcare Settings,Remind Before,前に思い出させる
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:参照文書タイプは、受注・納品書・仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:参照文書タイプは、受注・納品書・仕訳のいずれかでなければなりません
 DocType: Salary Component,Deduction,控除
 DocType: Item,Retain Sample,保管サンプル
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}:時間との時間からは必須です。
 DocType: Stock Reconciliation Item,Amount Difference,量差
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
 DocType: Territory,Classification of Customers by region,地域別の顧客の分類
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,生産中
@@ -2575,8 +2586,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算された銀行報告書の残高
 DocType: Normal Test Template,Normal Test Template,標準テストテンプレート
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,無効なユーザー
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,見積
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,受信RFQをいいえ引用符に設定できません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,見積
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,受信RFQをいいえ引用符に設定できません
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,控除合計
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,口座通貨で印刷する口座を選択してください
@@ -2584,7 +2595,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,これは、この患者に対する取引に基づいています。詳細は以下のタイムラインを参照してください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,費用更新
 DocType: Patient,Date of Birth,生年月日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,アイテム{0}はすでに返品されています
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客/リード住所
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,サプライヤスコアカードの設定
@@ -2595,14 +2606,15 @@
 DocType: Work Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),(ユーザー)に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,仕事内容
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,仕事内容
 DocType: Student Applicant,Applied,適用済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,再オープン
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,再オープン
 DocType: Sales Invoice Item,Qty as per Stock UOM,在庫単位ごとの数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,保護者2 名前
 DocType: Purchase Invoice,02-Post Sale Discount,02-ポストセール割引
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",セールスキャンペーンを追跡します。投資収益率を測定するために、キャンペーンから受注、見積、リードなどを追跡します。
+DocType: Department Approver,Approver,承認者
 ,SO Qty,受注数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,To Shareholderフィールドは空欄にすることはできません。
 DocType: Guardian,Work Address,勤務先
@@ -2616,21 +2628,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),総配分される金額(会社通貨)
 DocType: Purchase Order Item,To be delivered to customer,顧客に配信します
 DocType: BOM,Scrap Material Cost,スクラップ材料費
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,シリアル番号{0}はどこの倉庫にも属していません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,シリアル番号{0}はどこの倉庫にも属していません
 DocType: Grant Application,Email Notification Sent,送信済メール通知
 DocType: Purchase Invoice,In Words (Company Currency),文字表記(会社通貨)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",商品コード、倉庫、数量は行に必要です
-DocType: Pricing Rule,Supplier,サプライヤー
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",商品コード、倉庫、数量は行に必要です
+DocType: Bank Guarantee,Supplier,サプライヤー
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,支払詳細を表示
 DocType: Consultation,Consultation Time,相談時間
 DocType: C-Form,Quarter,四半期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,雑費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,雑費
 DocType: Global Defaults,Default Company,デフォルトの会社
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,銀行名
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,以上
-DocType: Employee Loan,Employee Loan Account,従業員のローンアカウント
 DocType: Leave Application,Total Leave Days,総休暇日数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意:ユーザーを無効にするとメールは送信されなくなります
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,インタラクション数
@@ -2645,7 +2656,7 @@
 DocType: Vital Signs,Weight (In Kilogram),重量(kg)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chapters / chapter_nameは、章を保存した後に自動的に空白のままになります。
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST設定でGSTアカウントを設定してください
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST設定でGSTアカウントを設定してください
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,業種
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,新規購入のコスト
@@ -2654,12 +2665,13 @@
 DocType: Grant Application,Grant Description,助成金説明
 DocType: Purchase Invoice Item,Rate (Company Currency),レート(報告通貨)
 DocType: Student Guardian,Others,その他
+DocType: Subscription,Discounts,割引
 DocType: Payment Entry,Unallocated Amount,未割り当て額
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。
 DocType: POS Profile,Taxes and Charges,租税公課
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",製品またはサービスは、購入・販売あるいは在庫です。
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,これ以上のアップデートはありません
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,これは、このセットアップに関連するすべてのスコアカードをカバーします
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子アイテムは、製品バンドルであってはなりません。項目を削除 `{0} &#39;と保存してください
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,銀行業務
@@ -2667,45 +2679,48 @@
 DocType: Vehicle Service,Service Item,サービスアイテム
 DocType: Bank Guarantee,Bank Guarantee,バンクギャランティー
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 DocType: Bin,Ordered Quantity,注文数
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Grading Scale,Grading Scale Intervals,グレーディングスケール間隔
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,今年の利益
+DocType: Bank Guarantee,Name of Bank,銀行の名前
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}:{3}:{2}だけ通貨で行うことができるための会計エントリを
 DocType: Fee Schedule,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,金融機関口座ツリー
+DocType: Bank Guarantee,Reference Document Type,参照文書タイプ
 DocType: Cash Flow Mapping,Cash Flow Mapping,キャッシュフローマッピング
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},受注{1}に対する{0}
 DocType: Account,Fixed Asset,固定資産
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,シリアル番号を付与した目録
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,デフォルトの連絡先に電子メールが見つかりません
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,秘密を生成する
-DocType: Employee Loan,Account Info,アカウント情報
+DocType: Loan,Account Info,アカウント情報
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
 DocType: Fees,Include Payment,支払を含む
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} 生徒グループが作成されました。
 DocType: Sales Invoice,Total Billing Amount,総請求額
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,料金体系と生徒グループ{0}の教育課程が異なっています。
 DocType: Fee Schedule,Receivable Account,売掛金勘定
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},行#{0}:アセット{1} {2}既にあります
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},行#{0}:アセット{1} {2}既にあります
 DocType: Quotation Item,Stock Balance,在庫残高
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,受注からの支払
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,最高経営責任者(CEO)
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,最高経営責任者(CEO)
 DocType: Purchase Invoice,With Payment of Tax,税納付あり
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,サプライヤのためにTRIPLICATE
 DocType: Land Unit,Is Container,コンテナ
 DocType: Crop Cycle,This will be day 1 of the crop cycle,これは作物サイクルの1日目になります
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,正しいアカウントを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,正しいアカウントを選択してください
 DocType: Purchase Invoice Item,Weight UOM,重量単位
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,フォリオ番号を持つ利用可能な株主のリスト
 DocType: Salary Structure Employee,Salary Structure Employee,給与構造の従業員
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,バリエーション属性を表示
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,バリエーション属性を表示
 DocType: Student,Blood Group,血液型
 DocType: Course,Course Name,コース名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,特定の従業員の休暇申請を承認することができるユーザー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,OA機器
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,OA機器
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企業
 DocType: Supplier Scorecard,Scoring Setup,スコア設定
@@ -2724,7 +2739,7 @@
 DocType: Stock Entry,Total Incoming Value,収入価値合計
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,デビットへが必要とされます
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わの活動のための時間・コスト・費用を追跡するのに使用します
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,仕入価格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,サプライヤスコアカード変数のテンプレート。
 DocType: Job Offer Term,Offer Term,雇用契約条件
 DocType: Asset,Quality Manager,品質管理者
@@ -2736,13 +2751,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},総未払い:{0}
 DocType: BOM Website Operation,BOM Website Operation,BOMウェブサイト運用
 DocType: Supplier Scorecard,Supplier Score,サプライヤの得点
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,請求額合計
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,請求額合計
 DocType: Supplier,Warn RFQs,見積依頼を警告する
 DocType: BOM,Conversion Rate,変換速度
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,商品検索
 DocType: Assessment Plan,To Time,終了時間
 DocType: Authorization Rule,Approving Role (above authorized value),役割を承認(許可値以上)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
+DocType: Loan,Total Amount Paid,合計金額
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,有料の生徒出願に必須となる生徒の入学を選択してください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},部品表再帰:{0} {2}の親または子にすることはできません
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,価格を公開するには価格表を選択してください
@@ -2752,18 +2768,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,価格表{0}は無効になっています
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}:完了数量は{2}操作{1}を超えることはできません
 DocType: Manufacturing Settings,Allow Overtime,残業を許可
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",在庫棚卸を使用してシリアル番号が付与されたアイテム {0} を更新することはできません。在庫エントリーを使用してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",在庫棚卸を使用してシリアル番号が付与されたアイテム {0} を更新することはできません。在庫エントリーを使用してください
 DocType: Training Event Employee,Training Event Employee,研修イベント従業員
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,最大サンプル - {0} はバッチ {1} とアイテム {2} に保管可能です。
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,タイムスロットを追加する
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
 DocType: Stock Reconciliation Item,Current Valuation Rate,現在の評価額
 DocType: Training Event,Advance,前進
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再発するために。
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless支払いゲートウェイの設定
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,取引利益/損失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,取引利益/損失
 DocType: Opportunity,Lost Reason,失われた理由
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},行番号{0}:アカウント{1}は会社{2}に属していません
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},行番号{0}:アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0}を見つけることができません
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新しい住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
@@ -2782,7 +2797,6 @@
 DocType: Bin,Actual Quantity,実際の数量
 DocType: Shipping Rule,example: Next Day Shipping,例:翌日発送
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,シリアル番号 {0} は見つかりません
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},サブスクリプションは{0}でした
 DocType: Fee Schedule Program,Fee Schedule Program,料金表プログラム
 DocType: Fee Schedule Program,Student Batch,生徒バッチ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,生徒を作成
@@ -2797,14 +2811,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,電子商取引GSTIN
 DocType: Sales Order,Not Delivered,未納品
 ,Bank Clearance Summary,銀行決済の概要
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",日次・週次・月次のメールダイジェストを作成・管理
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",日次・週次・月次のメールダイジェストを作成・管理
 DocType: Appraisal Goal,Appraisal Goal,査定目標
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,カテゴリを提案する?
 DocType: Stock Reconciliation Item,Current Amount,電流量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,建物
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,建物
 DocType: Fee Schedule,Fee Structure,料金体系
 DocType: Timesheet Detail,Costing Amount,原価計算額
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Student Admission Program,Application Fee,出願料
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,給与伝票を提出
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,アイテム{0}の最大割引は {1}%です
@@ -2812,12 +2825,13 @@
 DocType: Sales Partner,Address & Contacts,住所・連絡先
 DocType: SMS Log,Sender Name,送信者名
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,農業分析基準
+DocType: HR Settings,Leave Approval Notification Template,承認通知テンプレートを残す
 DocType: POS Profile,[Select],[選択]
 DocType: Vital Signs,Blood Pressure (diastolic),血圧(下)
 DocType: SMS Log,Sent To,送信先
 DocType: Agriculture Task,Holiday Management,休暇管理
 DocType: Payment Request,Make Sales Invoice,納品書を作成
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,ソフトウェア
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,ソフトウェア
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
 DocType: Company,For Reference Only.,参考用
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},医者{0}は{1}で利用できません
@@ -2835,7 +2849,7 @@
 DocType: Employee,New Workplace,新しい職場
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,材料消費
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,クローズに設定
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},バーコード{0}のアイテムはありません
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},バーコード{0}のアイテムはありません
 DocType: Normal Test Items,Require Result Value,結果値が必要
 DocType: Item,Show a slideshow at the top of the page,ページの上部にスライドショーを表示
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,部品表
@@ -2850,19 +2864,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
 DocType: Leave Block List,Allow Users,ユーザーを許可
 DocType: Purchase Order,Customer Mobile No,顧客携帯電話番号
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,繰り返し
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,キャッシュフローマッピングテンプレートの詳細
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ローン管理
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,製品の業種や部門ごとに個別の収益と費用を追跡します
 DocType: Rename Tool,Rename Tool,ツール名称変更
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,給与明細を表示
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,資材配送
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,給与明細を表示
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,資材配送
 DocType: Fees,Send Payment Request,支払依頼を送る
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 DocType: Water Analysis,Origin,原点
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,保存した後、繰り返し設定をしてください
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
@@ -2878,14 +2892,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,所得税の責任
 DocType: Grading Scale Interval,Grade Description,等級説明
 DocType: Stock Entry,Purchase Receipt No,領収書番号
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,手付金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,手付金
 DocType: Sales Invoice, Shipping Bill Number,送料請求番号
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,トレーサビリティ
 DocType: Asset Maintenance Log,Actions performed,実行されたアクション
 DocType: Cash Flow Mapper,Section Leader,セクションリーダー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),資金源泉(負債)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),資金源泉(負債)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}({1})で製造量{2}と同じでなければなりません
 DocType: Supplier Scorecard Scoring Standing,Employee,従業員
+DocType: Bank Guarantee,Fixed Deposit Number,固定入金番号
 DocType: Asset Repair,Failure Date,失敗日
 DocType: Sample Collection,Collected Time,収集時間
 DocType: Company,Sales Monthly History,販売月間の履歴
@@ -2902,10 +2917,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,この予約をキャンセルしてもよろしいですか?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ホテルルーム価格パッケージ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,セールスパイプライン
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Rename Tool,File to Rename,名前を変更するファイル
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},行 {0} 内のアイテムの部品表(BOM)を選択してください
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,購読の更新を取得する
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},アカウント {0} はアカウントのモード {2} では会社 {1} と適合しません
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,コース:
@@ -2915,7 +2931,7 @@
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,作業オーダーが作成されていません
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,従業員の給与スリップ{0}はすでにこの期間のために作成します
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,医薬品
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,医薬品
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,仕入アイテムの費用
 DocType: Selling Settings,Sales Order Required,受注必須
 DocType: Purchase Invoice,Credit To,貸方へ
@@ -2933,7 +2949,7 @@
 DocType: Request for Quotation Supplier,No Quote,いいえ
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Gateway Account,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,続行する会社を指定してください
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,売掛金の純変更
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,代償オフ
 DocType: Job Offer,Accepted,承認済
@@ -2945,7 +2961,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,検索結果
 DocType: Room,Room Number,教室番号
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},無効な参照 {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},無効な参照 {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 DocType: Journal Entry Account,Payroll Entry,給与計算エントリ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,料金の記録を見る
@@ -2955,7 +2971,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",請求書がドロップシッピングアイテムを含むため、在庫を更新できませんでした。
 DocType: Lab Test Sample,Lab Test Sample,ラボテストサンプル
 DocType: Item Variant Settings,Allow Rename Attribute Value,属性値の名前変更を許可する
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,クイック仕訳エントリー
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,クイック仕訳エントリー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Restaurant,Invoice Series Prefix,請求書シリーズ接頭辞
 DocType: Employee,Previous Work Experience,前職歴
@@ -2963,8 +2979,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Googleマップの統合が有効になっていません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}は提出されていません
+DocType: Subscription,Trialling,トライアル
 DocType: Member,Membership Expiry Date,会員有効期限
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0}の戻り文書では負でなければなりません
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0}の戻り文書では負でなければなりません
 ,Minutes to First Response for Issues,課題への初回レスポンス時間
 DocType: Purchase Invoice,Terms and Conditions1,規約1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
@@ -2983,7 +3000,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,数量単位
 DocType: Fiscal Year,Year End Date,年終日
 DocType: Task Depends On,Task Depends On,依存するタスク
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,機会
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,機会
 DocType: Operation,Default Workstation,デフォルト作業所
 DocType: Notification Control,Expense Claim Approved Message,経費請求を承認メッセージ
 DocType: Payment Entry,Deductions or Loss,控除または損失
@@ -3021,7 +3038,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,承認された休暇申請の記録と一致しない無給休暇
 DocType: Campaign,Campaign-.####,キャンペーン。####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
 DocType: Membership,USD,米ドル
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,請求書を作成
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,保たれているバランス
@@ -3030,7 +3047,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,バーコード{0}は有効な{1}コードではありません
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,終了年
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,見積もり/リード%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Driver,Driver,ドライバ
 DocType: Vital Signs,Nutrition Values,栄養価
 DocType: Lab Test Template,Is billable,請求可能
@@ -3041,7 +3058,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),実際の開始日(勤務表による)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,エイジングレンジ1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,総引き出し額は、請求された金額の合計よりも大きくすることはできません
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,総引き出し額は、請求された金額の合計よりも大きくすることはできません
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3103,7 +3120,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,属性値選択
 DocType: Purchase Invoice,Reason For Issuing document,文書を発行する理由
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,次の接触によっては、リードメールアドレスと同じにすることはできません
 DocType: Tax Rule,Billing City,請求先の市
@@ -3120,7 +3137,8 @@
 DocType: Warranty Claim,Service Address,所在地
 DocType: Asset Maintenance Task,Calibration,キャリブレーション
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0}は会社の休日です
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,家具や備品
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ステータス通知を残す
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,家具や備品
 DocType: Item,Manufacture,製造
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,セットアップ会社
 ,Lab Test Report,ラボテストレポート
@@ -3136,7 +3154,6 @@
 DocType: Crop,Planting Area,植栽エリア
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計(量)
 DocType: Installation Note Item,Installed Qty,設置済数量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,一部の無効なメールアドレスが原因である可能性があります
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,あなたが追加
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,研修結果
@@ -3146,16 +3163,17 @@
 DocType: Products Settings,Products per Page,ページあたりの製品
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,組織支部マスター。
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,課題をレポート
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,水道光熱費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,水道光熱費
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行#{0}:仕訳は、{1}アカウント{2}を持っているか、すでに別のバウチャーに対して一致しません
 DocType: Supplier Scorecard Criteria,Criteria Weight,基準重量
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,承認通知を残す
 DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
 DocType: Payroll Entry,Salary Slip Based on Timesheet,タイムシートに基づく給与明細
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,購入率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,購入率
 DocType: Notification Control,Sales Order Message,受注メッセージ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
 DocType: Payment Entry,Payment Type,支払タイプ
@@ -3177,6 +3195,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ショッピングカート設定
 DocType: Journal Entry,Accounting Entries,会計エントリー
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",選択された価格設定ルールが &#39;レート&#39;に対して行われた場合、価格リストが上書きされます。価格設定ルールレートは最終レートなので、これ以上の割引は適用されません。したがって、受注、購買発注などの取引では、[価格リスト]フィールドではなく[レート]フィールドで取得されます。
+DocType: Journal Entry,Paid Loan,有料ローン
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},エントリーが重複しています。認証ルール{0}を確認してください
 DocType: Journal Entry Account,Reference Due Date,参照期限
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3193,7 +3212,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',保守スケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 apps/erpnext/erpnext/config/hr.py +93,Payroll,給与
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
 DocType: Patient Service Unit,Parent Service Unit,親サービスユニット
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ユーザー作成
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票(印刷用)
@@ -3211,7 +3230,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,収益勘定
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,配送
 DocType: Volunteer,Weekdays,平日
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: Restaurant Menu,Restaurant Menu,レストランメニュー
@@ -3219,7 +3238,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",生徒のバッチは生徒の出席・評価・料金を追跡するのに使用します
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,永続在庫のデフォルト在庫アカウントの設定
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,永続在庫のデフォルト在庫アカウントの設定
 DocType: Item Reorder,Material Request Type,資材要求タイプ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,助成金レビューメールを送る
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",localStorageの容量不足のため保存されませんでした
@@ -3227,10 +3246,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,教室収容可能数
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},アイテム{0}のレコードがすでに存在します
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,参照
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,以前に生成された請求書のレコードは失われます。この定期購入を再開してもよろしいですか?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,登録料
 DocType: Budget,Cost Center,コストセンター
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,伝票番号
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,伝票番号
 DocType: Notification Control,Purchase Order Message,発注メッセージ
 DocType: Tax Rule,Shipping Country,出荷先の国
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,販売取引内での顧客の税IDを非表示
@@ -3239,20 +3259,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
 DocType: Employee Education,Class / Percentage,クラス/パーセンテージ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,マーケティングおよび販売部長
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,マーケティングおよび販売部長
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,所得税
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,業種によってリードを追跡
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,レターヘッドに移動
+DocType: Subscription,Cancel At End Of Period,期間の終了時にキャンセルする
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,転送するアイテムが選択されていません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,転送するアイテムが選択されていません
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
 DocType: Vehicle,Electric,電気の
 DocType: Task,% Progress,% 進捗
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,資産処分益/損失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,資産処分益/損失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",以下の表では、「承認済み」のステータスを持つ学生申請者のみが選択されます。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,アカウント{0}のアカウント番号は利用できません。 <br>あなたの勘定科目表を正しく設定してください。
 DocType: Task,Depends on Tasks,タスクに依存
@@ -3267,6 +3288,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,在庫にありません
 DocType: Volunteer,Volunteer Skills,ボランティアスキル
 DocType: Appraisal,HR User,人事ユーザー
+DocType: Bank Guarantee,Reference Document Name,参照文書名
 DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
 apps/erpnext/erpnext/hooks.py +142,Issues,課題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ステータスは{0}のどれかでなければなりません
@@ -3280,7 +3302,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} は無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,XL
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,XL
+DocType: Loan,Loan Application,ローン申し込み
 DocType: Crop,Scientific Name,学名
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,総葉
 DocType: Customer,"Reselect, if the chosen contact is edited after save",選択した連絡先が保存後に編集された場合は、再選択
@@ -3289,13 +3312,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,小切手番号
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告:別の{0}#{1}が在庫エントリ{2}に対して存在します
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},警告:別の{0}#{1}が在庫エントリ{2}に対して存在します
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,現地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ローンと貸付金(資産)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務者
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,L
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,L
 DocType: Homepage Featured Product,Homepage Featured Product,ホームページ人気商品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,すべての評価グループ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,すべての評価グループ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),合計{0}({1})
 DocType: C-Form Invoice Detail,Territory,地域
@@ -3316,9 +3339,10 @@
 DocType: Fees,Fees,料金
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,見積{0}はキャンセルされました
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,残高合計
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,残高合計
 DocType: Sales Partner,Targets,ターゲット
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,SIREN番号を会社情報ファイルに登録してください
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 DocType: Price List,Price List Master,価格表マスター
 DocType: GST Account,CESS Account,CESSアカウント
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
@@ -3327,6 +3351,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,患者の選択
 DocType: Price List,Applicable for Countries,国に適用
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,パラメータ名
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,「承認済み」と「拒否」に提出することができる状態でアプリケーションをのみを残します
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},行 {0} には生徒グループ名が必須です
 DocType: Homepage,Products to be shown on website homepage,ウェブサイトのホームページに表示される製品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ルート(大元の)顧客グループなので編集できません
@@ -3370,14 +3395,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,すべての請求時間に作成された請求書
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名前エラー:{0}
 DocType: Cash Flow Mapping,Is Finance Cost,財務コスト
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
 DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合(印刷用)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,レストランの設定でデフォルトの顧客を設定してください
 ,Salary Register,給与登録
 DocType: Warehouse,Parent Warehouse,親倉庫
-DocType: C-Form Invoice Detail,Net Total,差引計
+DocType: Subscription,Net Total,差引計
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},アイテム{0}およびプロジェクト{1}にデフォルトBOMが見つかりません
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,様々なローンのタイプを定義します
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,様々なローンのタイプを定義します
 DocType: Bin,FCFS Rate,FCFSレート
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,残高
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(分単位)
@@ -3409,11 +3434,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,ルートアカウントはグループである必要があります
 DocType: Drug Prescription,Drug Prescription,薬物処方
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,返済/クローズ
+DocType: Loan,Repaid/Closed,返済/クローズ
 DocType: Item,Total Projected Qty,全投影数量
 DocType: Monthly Distribution,Distribution Name,配布名
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",{1} {2}の会計処理を行うために必要なアイテム{0}の評価レートが見つかりません。アイテムが{1}のゼロ評価レートアイテムとして取引されている場合は、{1}アイテムテーブルにそのアイテムを記載してください。それ以外の場合は、明細レコードに到着した在庫トランザクションまたは評価レートを登録してから、このエントリの登録/取消を試みてください
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 DocType: Course,Course Code,コースコード
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: POS Settings,Use POS in Offline Mode,オフラインモードでPOSを使用
@@ -3433,16 +3457,15 @@
 DocType: Purchase Invoice,Deemed Export,みなし輸出
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,割引率は、価格表に対して、またはすべての価格リストのいずれかを適用することができます。
-DocType: Subscription,Half-yearly,半年ごと
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Lab Test,LabTest Approver,LabTest承認者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,評価基準{}は評価済です。
 DocType: Vehicle Service,Engine Oil,エンジンオイル
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},作成された作業オーダー:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},作成された作業オーダー:{0}
 DocType: Sales Invoice,Sales Team1,販売チーム1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
-DocType: Employee Loan,Loan Details,ローン詳細
+DocType: Loan,Loan Details,ローン詳細
 DocType: Company,Default Inventory Account,デフォルトの在庫アカウント
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio番号が一致しません
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}:完了数量はゼロより大きくなければなりません。
@@ -3454,19 +3477,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,作物が成長しているすべての土地単位へのリンク
 DocType: Account,Root Type,ルートタイプ
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:アイテム {2} では {1} 以上を返すことはできません
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:アイテム {2} では {1} 以上を返すことはできません
 DocType: Item Group,Show this slideshow at the top of the page,ページの上部にこのスライドショーを表示
 DocType: BOM,Item UOM,アイテム数量単位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引後税額(会社通貨)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
 DocType: Cheque Print Template,Primary Settings,優先設定
 DocType: Purchase Invoice,Select Supplier Address,サプライヤー住所を選択
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,従業員追加
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,従業員追加
 DocType: Purchase Invoice Item,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,XS
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,XS
 DocType: Company,Standard Template,標準テンプレート
 DocType: Training Event,Theory,学理
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,警告:資材要求数が最小注文数を下回っています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,警告:資材要求数が最小注文数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人/子会社
 DocType: Payment Request,Mute Email,メールをミュートする
@@ -3486,11 +3509,10 @@
 DocType: SMS Log,No of Sent SMS,送信されたSMSの数
 DocType: Antibiotic,Healthcare Administrator,ヘルスケア管理者
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ターゲットを設定
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 DocType: Dosage Strength,Dosage Strength,服用強度
 DocType: Account,Expense Account,経費科目
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ソフトウェア
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,カラー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,カラー
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,評価計画基準
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,有効期限は選択したアイテムに必須です
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,注文停止
@@ -3503,18 +3525,18 @@
 DocType: Patient,Personal and Social History,個人と社会の歴史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ユーザー{0}が作成されました
 DocType: Fee Schedule,Fee Breakup for each student,生徒ごとの違約金
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前({0}){1}({2})総合計よりも大きくすることはできません。
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前({0}){1}({2})総合計よりも大きくすることはできません。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,コード変更
 DocType: Purchase Invoice Item,Valuation Rate,評価額
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,ディーゼル
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,価格表の通貨が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,価格表の通貨が選択されていません
 DocType: Purchase Invoice,Availed ITC Cess,入手可能なITC Cess
 ,Student Monthly Attendance Sheet,生徒月次出席シート
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,配送ルールは販売にのみ適用されます
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,プロジェクト開始日
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,まで
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,まで
 DocType: Rename Tool,Rename Log,ログ名称変更
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,生徒グループまたはコーススケジュールが必須です
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,タイムシート上の就業時間と労働時間を管理
@@ -3534,7 +3556,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,購入または販売している商品やサービスをリストします。
 DocType: Water Analysis,Storage Temperature,保管温度
 DocType: Employee Attendance Tool,Unmarked Attendance,無印出席
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,リサーチャー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,リサーチャー
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,教育課程登録ツール生徒
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},タスク{0}の開始日は終了日より短くなければなりません
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,名前またはメールアドレスが必須です
@@ -3547,7 +3569,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}には現在、サプライヤースコアカード {1} が指定されており、このサプライヤーへの見積依頼は慎重に行なう必要があります。
 DocType: Chapter,Non Profit Manager,非営利のマネージャー
 DocType: BOM,Total Cost(Company Currency),総コスト(会社通貨)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,シリアル番号 {0}を作成しました
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,シリアル番号 {0}を作成しました
 DocType: Homepage,Company Description for website homepage,ウェブサイトのホームページのための会社説明
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",これらのコードは、顧客の便宜のために、請求書および納品書等の印刷形式で使用することができます
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,サプライヤー名
@@ -3557,11 +3579,10 @@
 DocType: Employee,You can enter any date manually,手動で日付を入力することができます
 DocType: Healthcare Settings,Result Printed,結果印刷
 DocType: Asset Category Account,Depreciation Expense Account,減価償却費アカウント
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,試用期間
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ビュー{0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,試用期間
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Project,Total Costing Amount (via Timesheets),合計原価計算(タイムシートから)
-DocType: Employee Advance,Expense Approver,経費承認者
+DocType: Department,Expense Approver,経費承認者
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}:お客様に対する事前クレジットでなければなりません
 DocType: Project,Hourly,毎時
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,グループに非グループ
@@ -3570,7 +3591,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,終了日時
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
 DocType: Accounts Settings,Make Payment via Journal Entry,仕訳を経由して支払いを行います
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,上に印刷
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,上に印刷
 DocType: Item,Inspection Required before Delivery,配達前に必要な検査
 DocType: Item,Inspection Required before Purchase,購入する前に必要な検査
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,保留中の活動
@@ -3580,7 +3601,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,最小注文数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,あなたの組織
 DocType: Fee Component,Fees Category,料金カテゴリー
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,退職日を入力してください。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,量/額
 DocType: Supplier Scorecard,Notify Employee,従業員に通知する
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
@@ -3590,7 +3611,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,再注文レベル
 DocType: Company,Chart Of Accounts Template,アカウントテンプレートのチャート
 DocType: Attendance,Attendance Date,出勤日
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},アイテムの価格は価格表{1}で{0}の更新します
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},アイテムの価格は価格表{1}で{0}の更新します
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
 DocType: Purchase Invoice Item,Accepted Warehouse,承認済み倉庫
@@ -3598,10 +3619,11 @@
 DocType: Item,Valuation Method,評価方法
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,マーク半日
 DocType: Sales Invoice,Sales Team,営業チーム
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,エントリーを複製
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,エントリーを複製
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,提出する前に受益者の名前を入力してください。
 DocType: Program Enrollment Tool,Get Students,生徒を取得
 DocType: Serial No,Under Warranty,保証期間中
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[エラー]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[エラー]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
 ,Employee Birthday,従業員の誕生日
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,完了修理の完了日を選択してください
@@ -3620,7 +3642,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,サブ契約のために予約されています
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
 DocType: Shopping Cart Settings,Orders,注文
-DocType: Employee Leave Approver,Leave Approver,休暇承認者
+DocType: Department,Leave Approver,休暇承認者
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,バッチを選択してください
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,評価グループ名
@@ -3664,7 +3686,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,ハブ追跡項目
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,受取人のためのオリジナル
 DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,このメールは自動的に生成されています
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
 DocType: Program Enrollment,Boarding Student,寄宿生
 DocType: Asset,Expected Value After Useful Life,残存価額
@@ -3689,21 +3710,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},生徒 {1} には出席レコード {0} が存在します
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},参照#{0} 日付{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,減価償却による資産の処分に敗退
-DocType: Member,Member,メンバー
+DocType: Loan,Member,メンバー
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,住所管理
 DocType: Work Order Item,Work Order Item,作業指示アイテム
 DocType: Pricing Rule,Item Code,アイテムコード
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
 DocType: Agriculture Analysis Criteria,Agriculture Manager,農業管理者
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
 DocType: Supplier Scorecard Period,Variables,変数
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),(借方)を閉じる
 DocType: Cheque Print Template,Cheque Size,小切手サイズ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,販売取引用の税のテンプレート
 DocType: Sales Invoice,Write Off Outstanding Amount,未償却残額
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},アカウント {0} は会社 {1} と適合しません
@@ -3711,7 +3732,6 @@
 DocType: Stock Settings,Default Stock UOM,デフォルト在庫数量単位
 DocType: Asset,Number of Depreciations Booked,予約された減価償却の数
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,総数
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},従業員ローンに対して:{0}
 DocType: Landed Cost Item,Receipt Document,領収書のドキュメント
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,参照詳細
@@ -3722,7 +3742,7 @@
 DocType: Asset,Double Declining Balance,ダブル定率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,完了した注文はキャンセルすることはできません。キャンセルするには完了を解除してください
 DocType: Student Guardian,Father,お父さん
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 DocType: Attendance,On Leave,休暇中
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,アップデートを入手
@@ -3736,10 +3756,10 @@
 DocType: Lead,Lower Income,低収益
 DocType: Restaurant Order Entry,Current Order,現在の注文
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},出庫元/入庫先を同じ行{0}に入れることはできません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産/負債タイプのアカウントである必要があります
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産/負債タイプのアカウントである必要があります
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,教育課程に移動
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#割り当てられた金額{1}は請求されていない金額{2}より大きくすることはできません
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#割り当てられた金額{1}は請求されていない金額{2}より大きくすることはできません
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},出願 {1} にリンクされているため生徒 {0} のステータスを変更することはできません
@@ -3762,7 +3782,6 @@
 DocType: Payment Terms Template,Payment Terms,支払い条件
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 DocType: Chapter,Meetup Embed HTML,Meetup HTMLを埋め込む
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,サプライヤーに移動
@@ -3781,30 +3800,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,保守スケジュールアイテム
 DocType: Sales Order,%  Delivered,%納品済
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,支払依頼を送信する生徒のメールIDを設定してください
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,支払依頼を送信する生徒のメールIDを設定してください
 DocType: Patient,Medical History,病歴
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,銀行当座貸越口座
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,銀行当座貸越口座
 DocType: Patient,Patient ID,患者ID
 DocType: Physician Schedule,Schedule Name,スケジュール名
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,給与伝票を作成
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,すべてのサプライヤーを追加
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,すべてのサプライヤーを追加
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行番号{0}:割り当て金額は未払い金額より大きくすることはできません。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,部品表(BOM)を表示
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,担保ローン
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,担保ローン
 DocType: Purchase Invoice,Edit Posting Date and Time,編集転記日付と時刻
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},資産カテゴリー{0}または当社との減価償却に関連するアカウントを設定してください。{1}
 DocType: Lab Test Groups,Normal Range,正常範囲
 DocType: Academic Term,Academic Year,学年
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,販売可能
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,開始残高 資本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,開始残高 資本
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,残り
 DocType: Appraisal,Appraisal,査定
+DocType: Loan,Loan Account,ローン口座
 DocType: Purchase Invoice,GST Details,GSTの詳細
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},サプライヤに送信されたメール{0}
 DocType: Item,Default Sales Unit of Measure,既定の販売数量単位
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,学年:
+DocType: Subscription,Past Due Date,過去の期日
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},アイテム{0}の代替アイテムを設定できません
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日付が繰り返されます
@@ -3817,7 +3838,7 @@
 DocType: Patient Appointment,Patient Appointment,患者予約
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,承認役割は、ルール適用対象役割と同じにすることはできません
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,このメールダイジェストから解除
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,サプライヤーを取得
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,サプライヤーを取得
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},アイテム{1}に{0}が見つかりません
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,コースに移動
 DocType: Accounts Settings,Show Inclusive Tax In Print,印刷時に税込で表示
@@ -3825,10 +3846,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,送信されたメッセージ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,子ノードを持つアカウントは元帳に設定することはできません
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,インストラクターの教育におけるネーミングシステムの設定&gt;教育の設定
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,価格表の通貨が顧客の基本通貨に換算されるレート
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額(会社通貨)
 DocType: Physician,Physician Schedules,医師のスケジュール
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,総引き渡し額は、総額を超えてはならない
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,総引き渡し額は、総額を超えてはならない
 DocType: Salary Slip,Hour Rate,時給
 DocType: Stock Settings,Item Naming By,アイテム命名
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
@@ -3846,6 +3868,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
 DocType: BOM,Inspection Required,要検査
 DocType: Purchase Invoice Item,PR Detail,PR詳細
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,提出する前に銀行保証番号を入力してください。
 DocType: Driving License Category,Class,クラス
 DocType: Sales Order,Fully Billed,全て記帳済
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,アイテムテンプレートに対して作業命令を発行することはできません
@@ -3856,7 +3879,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量+梱包材重量です (印刷用)
 DocType: Assessment Plan,Program,教育課程
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,インストラクターの教育におけるネーミングシステムの設定&gt;教育の設定
 DocType: Serial No,Is Cancelled,キャンセル済
 DocType: Student Group,Group Based On,グループベース
 DocType: Journal Entry,Bill Date,ビル日
@@ -3867,9 +3889,10 @@
 DocType: Cheque Print Template,Cheque Height,小切手の高さ
 DocType: Supplier,Supplier Details,サプライヤー詳細
 DocType: Setup Progress,Setup Progress,セットアップの進捗状況
+DocType: Expense Claim,Approval Status,承認ステータス
 DocType: Hub Settings,Publish Items to Hub,ハブにアイテムを公開
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}の値以下の値でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,電信振込
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,電信振込
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,すべてチェック
 ,Issued Items Against Work Order,作業命令に対する発行アイテム
 DocType: Vehicle Log,Invoice Ref,請求書の参考文献
@@ -3900,12 +3923,11 @@
 DocType: Customs Tariff Number,Tariff Number,関税番号
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP倉庫で利用可能な数量
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,予想
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注:アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
 DocType: Notification Control,Quotation Message,見積メッセージ
-DocType: Employee Loan,Employee Loan Application,従業員の融資申し込み
 DocType: Issue,Opening Date,日付を開く
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,最初に患者を救ってください
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,最初に患者を救ってください
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,出席が正常にマークされています。
 DocType: Program Enrollment,Public Transport,公共交通機関
 DocType: Soil Texture,Silt Composition (%),シルト組成(%)
@@ -3923,7 +3945,7 @@
 ,Item Balance (Simple),商品残高(簡易)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,サプライヤーからの請求
 DocType: POS Profile,Write Off Account,償却勘定
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,デビットノートアム
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,デビットノートアム
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間(日数)
@@ -3946,6 +3968,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,受注日
 DocType: Sales Invoice Item,Delivered Qty,納品済数量
 DocType: Assessment Plan,Assessment Plan,評価計画
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,逆仕訳入力
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,顧客 {0} が作成されました。
 DocType: Stock Settings,Limit Percent,リミットパーセント
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,現在どの倉庫にも在庫がありません
@@ -3959,14 +3982,15 @@
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Payment Entry,Payment References,支払参照
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",期間フィールドの間隔の数。たとえば、間隔が「日」で、請求間隔数が3の場合、3日ごとに請求書が生成されます
 DocType: Vehicle,Insurance Details,保険の詳細
 DocType: Account,Payable,買掛
 DocType: Share Balance,Share Type,共有タイプ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,返済期間を入力してください。
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,返済期間を入力してください。
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),債務者({0})
 DocType: Pricing Rule,Margin,マージン
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新規顧客
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,粗利益%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,粗利益%
 DocType: Appraisal Goal,Weightage (%),重み付け(%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POSプロファイルの変更
 DocType: Bank Reconciliation Detail,Clearance Date,決済日
@@ -3976,10 +4000,11 @@
 DocType: Lead,Address Desc,住所種別
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,当事者は必須です
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},他の行に期限が重複している行が見つかりました:{list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},他の行に期限が重複している行が見つかりました:{list}
 DocType: Topic,Topic Name,トピック名
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,HR設定で承認通知を残すためのデフォルトテンプレートを設定してください。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,従業員を選択して従業員の進級を取得します。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,従業員を選択して従業員の進級を取得します。
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,有効な日付を選択してください
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,あなたのビジネスの性質を選択します。
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3998,7 +4023,7 @@
 DocType: Asset Movement,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,株主
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},行#{0}:アセット{1}の会社に属していない{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},行#{0}:アセット{1}の会社に属していない{2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,販売請求書{0}が作成されました
 DocType: Employee,Confirmation Date,確定日
 DocType: C-Form,Total Invoiced Amount,請求額合計
@@ -4007,7 +4032,7 @@
 DocType: Account,Accumulated Depreciation,減価償却累計額
 DocType: Supplier Scorecard Scoring Standing,Standing Name,順位名
 DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
-DocType: Employee Loan Application,Required by Date,日によって必要とされます
+DocType: Loan Application,Required by Date,日によって必要とされます
 DocType: Lead,Lead Owner,リード所有者
 DocType: Production Plan,Sales Orders Detail,受注詳細
 DocType: Bin,Requested Quantity,要求数量
@@ -4020,10 +4045,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,グロスペイ - 合計控除 - ローン返済
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,給与明細ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,複数のバリエーション
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}%配送済
+DocType: Subscription,Trial Period Start Date,試用期間開始日
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}:発注数量{1}は最小注文数量{2}(アイテム内で定義)より小さくすることはできません
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,別のユーザーとしてログインしてください。
@@ -4044,12 +4070,11 @@
 DocType: Student Guardian,Student Guardian,生徒保護者
 DocType: Member,Member Name,メンバー名
 DocType: Stock Settings,Use Naming Series,命名シリーズを使用する
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,購読内
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、(合計)正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 DocType: Membership,Payment Details,支払詳細
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,部品表通貨レート
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止した作業指示を取り消すことはできません。取り消すには最初に取り消してください
 DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,納品書からアイテムを抽出してください
@@ -4069,6 +4094,7 @@
 DocType: Land Unit,Land Unit,土地単位
 ,Purchase Analytics,仕入分析
 DocType: Sales Invoice Item,Delivery Note Item,納品書アイテム
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,現在の請求書{0}がありません
 DocType: Asset Maintenance Log,Task,タスク
 DocType: Purchase Taxes and Charges,Reference Row #,参照行#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},項目{0}にバッチ番号が必須です
@@ -4080,7 +4106,7 @@
 DocType: Company,Exchange Gain / Loss Account,取引利益/損失のアカウント
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,従業員および出勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,フォームに入力して保存します
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,フォームに入力して保存します
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,コミュニティフォーラム
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,在庫実数
 DocType: Homepage,"URL for ""All Products""",「全製品」のURL
@@ -4094,7 +4120,7 @@
 DocType: Lab Test Template,Standard Selling Rate,標準販売レート
 DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
 DocType: Cash Flow Mapper,Section Name,セクション名
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,再注文数量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,再注文数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,現在の求人
 DocType: Company,Stock Adjustment Account,在庫調整勘定
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,償却
@@ -4105,9 +4131,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,すべての部品表で最新の価格を更新するために待機します。数分かかることがあります。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注:顧客やサプライヤーのためにアカウントを作成しないでください
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国ごとのデフォルトのアドレステンプレート
 DocType: Water Analysis,Appearance,外観
+DocType: HR Settings,Leave Status Notification Template,状態通知テンプレートを残す
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均価格リストレートを購入する
 DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーから顧客に配送
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,会員情報
@@ -4130,7 +4156,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,許可されていません。テストテンプレートを無効にしてください
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
 DocType: Crop Cycle,Linked Land Unit,連結陸上ユニット
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,当事者を選択する前に転記日付を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,当事者を選択する前に転記日付を選択してください
 DocType: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
@@ -4146,7 +4172,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ユーザーに移動
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,支払額+償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},注:休暇タイプ{0}のための休暇残高が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},注:休暇タイプ{0}のための休暇残高が足りません
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,登録されていないGSTINが無効またはNAを入力してください
 DocType: Training Event,Seminar,セミナー
 DocType: Program Enrollment Fee,Program Enrollment Fee,教育課程登録料
@@ -4162,14 +4188,14 @@
 DocType: Hub Settings,Publish Availability,公開可用性
 DocType: Company,Create Chart Of Accounts Based On,アカウントベースでのグラフを作成
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,それを非グループに変換することはできません。子タスクが存在します。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
 ,Stock Ageing,在庫エイジング
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},生徒 {0} は出願 {1} に存在します
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),丸め調整(会社通貨)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,タイムシート
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,バッチ:
 DocType: Volunteer,Afternoon,午後
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Cheque Print Template,Scanned Cheque,スキャンした小切手
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
@@ -4185,7 +4211,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,プロジェクト{0}は既に存在します
 DocType: Medical Department,Nursing User,看護ユーザー
 DocType: Plant Analysis,Plant Analysis Criterias,植物分析の基準
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,責任
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},シリアル番号{0}はバッチ{1}に属していません
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,責任
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,この見積りの有効期間は終了しました。
 DocType: Expense Claim Account,Expense Claim Account,経費請求アカウント
 DocType: Accounts Settings,Allow Stale Exchange Rates,失効した為替レートを許可する
@@ -4207,11 +4234,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,バリエーション作成
 DocType: Item,Default BOM,デフォルト部品表
 DocType: Project,Total Billed Amount (via Sales Invoices),総請求金額(請求書による)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,デビットノート金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,デビットノート金額
 DocType: Project Update,Not Updated,更新されていない
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",レート、株式数、計算された金額には矛盾があります
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,確認のため会社名を再入力してください
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,残高合計
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,残高合計
 DocType: Journal Entry,Printing Settings,印刷設定
 DocType: Employee Advance,Advance Account,アドバンスアカウント
 DocType: Job Offer,Job Offer Terms,求人の条件
@@ -4220,7 +4247,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,自動車
 DocType: Vehicle,Insurance Company,保険会社
 DocType: Asset Category Account,Fixed Asset Account,固定資産勘定
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,変数
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,変数
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,納品書から
 DocType: Chapter,Members,メンバー
 DocType: Student,Student Email Address,生徒メールアドレス
@@ -4243,7 +4270,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,インターン
 DocType: Delivery Stop,Address Name,アドレス名称
 DocType: Stock Entry,From BOM,参照元部品表
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1}の{0}単位を分割する
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1}の{0}単位を分割する
 DocType: Assessment Code,Assessment Code,評価コード
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
@@ -4251,25 +4278,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 DocType: Bank Reconciliation Detail,Payment Document,支払ドキュメント
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,条件式を評価する際のエラー
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
+DocType: Subscription,Plans,予定
 DocType: Salary Slip,Salary Structure,給与体系
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,資材課題
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,定期的に作成中にエラーが発生しました
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,見積
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。ネットワークに接続するまで、リロードすることができません。
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,生徒グループは作成されていません
 DocType: Purchase Invoice Item,Serial No,シリアル番号
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,月返済額は融資額を超えることはできません
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,月返済額は融資額を超えることはできません
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,メンテナンス詳細を入力してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行番号{0}:予定納期は発注日より前になることはできません
 DocType: Purchase Invoice,Print Language,プリント言語
 DocType: Salary Slip,Total Working Hours,総労働時間
 DocType: Sales Invoice,Customer PO Details,顧客POの詳細
-DocType: Subscription,Next Schedule Date,次のスケジュール日
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,一時的口座開設
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,入力値は正でなければなりません
@@ -4297,11 +4323,11 @@
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,期間日付が必要です
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,指定された基準の従業員はいません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,製造する部品表(BOM)を持つアイテムはありません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,製造する部品表(BOM)を持つアイテムはありません
 DocType: Hotel Settings,Default Customer,デフォルト顧客
 DocType: Assessment Plan,Supervisor Name,スーパーバイザー名
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,予定が同じ日に作成されているかどうかを確認しない
@@ -4325,16 +4351,16 @@
 DocType: Journal Entry Account,Employee Advance,従業員前払金
 DocType: Payroll Entry,Payroll Frequency,給与頻度
 DocType: Lab Test Template,Sensitivity,感度
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,原材料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,原材料
 DocType: Leave Application,Follow via Email,メール経由でフォロー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,植物および用機械
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,植物および用機械
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,日次業務概要設定
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Reqd by Dateを入力してください
 DocType: Payment Entry,Internal Transfer,内部転送
 DocType: Asset Maintenance,Maintenance Tasks,保守作業
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ターゲット数量や目標量のどちらかが必須です
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,最初の転記日付を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,最初の転記日付を選択してください
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,開始日は終了日より前でなければなりません
 DocType: Leave Control Panel,Carry Forward,繰り越す
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,既存の取引があるコストセンターは、元帳に変換することはできません
@@ -4342,13 +4368,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNextの統合
 DocType: Crop Cycle,Detected Disease,検出された病気
 ,Produced,生産
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,払い戻しの開始日は、支払い日より前にすることはできません。
 DocType: Item,Item Code for Suppliers,サプライヤーのためのアイテムコード
 DocType: Issue,Raised By (Email),提起元メールアドレス
 DocType: Training Event,Trainer Name,研修講師の名前
 DocType: Mode of Payment,General,一般
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後のコミュニケーション
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,請求書と一致支払い
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),(肩書)に適用
@@ -4362,7 +4389,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,通貨の有効/無効を切り替え
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0}は半日に{1}に出発します
 DocType: Production Plan,Get Material Request,資材要求取得
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,郵便経費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,郵便経費
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計(数)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,エンターテインメント&レジャー
 ,Item Variant Details,アイテムバリエーション詳細
@@ -4373,9 +4400,9 @@
 DocType: Drug Prescription,Hour,時
 DocType: Restaurant Order Entry,Last Sales Invoice,最新請求書
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},アイテム{0}に対して数量を選択してください
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,これら全アイテムはすでに請求済みです
 DocType: Company,Monthly Sales Target,月次販売目標
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}によって承認することができます
@@ -4383,7 +4410,7 @@
 DocType: Item,Default Material Request Type,デフォルトの資材要求タイプ
 DocType: Supplier Scorecard,Evaluation Period,評価期間
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知の
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,作業オーダーが作成されていない
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,作業オーダーが作成されていない
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
 DocType: Purchase Invoice,Export Type,輸出タイプ
 DocType: Salary Slip Loan,Salary Slip Loan,給与スリップローン
@@ -4399,7 +4426,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,請求書の請求の概要
 DocType: Education Settings,Education Manager,教育マネージャー
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,最適な成長のために、各植物間の最小長さ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",バッチアイテム{0} は在庫棚卸を使用して更新することはできません。在庫アイテムを使用してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",バッチアイテム{0} は在庫棚卸を使用して更新することはできません。在庫アイテムを使用してください
 DocType: Quality Inspection,Report Date,レポート日
 DocType: Student,Middle Name,ミドルネーム
 DocType: C-Form,Invoices,請求
@@ -4430,20 +4457,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",メールアドレスは一意である必要があり、すでに {0} が存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,領収書
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,領収書
 ,Sales Register,販売登録
 DocType: Daily Work Summary Group,Send Emails At,で電子メールを送ります
 DocType: Quotation,Quotation Lost Reason,失注理由
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},取引参照番号 {0} の日付は {1} とされています
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,フォームビュー
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,経費請求者に必須の経費承認者
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,今月と保留中の活動の概要
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",自分以外の組織にユーザーを追加します。
 DocType: Customer Group,Customer Group Name,顧客グループ名
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,まだ顧客がありません!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,キャッシュフロー計算書
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,重要なリクエストは作成されません
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,運転免許
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
@@ -4466,11 +4494,12 @@
 DocType: Vehicle,Chassis No,シャーシ番号
 DocType: Payment Request,Initiated,開始
 DocType: Production Plan Item,Planned Start Date,計画開始日
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,BOMを選択してください
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,BOMを選択してください
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC統合税を徴収
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
+DocType: Bank Guarantee,Clauses and Conditions,条項および条項
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
 DocType: Project Task,View Timesheet,タイムシートを表示
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,終了日は開始日より長くする必要があります
 DocType: Leave Type,Is Encash,現金化済
 DocType: Leave Allocation,New Leaves Allocated,新しい有給休暇
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
@@ -4484,9 +4513,10 @@
 DocType: Patient,Alcohol Current Use,現在のアルコール摂取
 DocType: Student Admission Program,Student Admission Program,生徒入学教育課程
 DocType: Payment Entry,Account Paid To,支払先口座
+DocType: Subscription Settings,Grace Period,猶予期間
 DocType: Item Alternative,Alternative Item Name,代替アイテム名
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",給与伝票を提出できませんでした<br> \考えられる理由: <br> \ 1.純支払額は0未満です。 <br> \ 2.従業員マスタで指定された会社の電子メールアドレスは無効です。 <br>
@@ -4496,7 +4526,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}アカウントの予算{1} {2} {3}に対しては{4}です。これは、{5}によって超えてしまいます
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',行{0}#のアカウントタイプでなければなりません &quot;固定資産&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,出量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,アンカーされていない
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,シリーズは必須です
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,金融サービス
 DocType: Student Sibling,Student ID,生徒ID
@@ -4508,14 +4537,16 @@
 DocType: Complaint,Complaint,苦情
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,払い戻しの入力をする
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,すべての部署
 DocType: Patient,Alcohol Past Use,アルコール摂取歴
 DocType: Fertilizer Content,Fertilizer Content,肥料の内容
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,貸方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,貸方
 DocType: Project Update,Problematic/Stuck,問題/スタック
 DocType: Tax Rule,Billing State,請求状況
 DocType: Share Transfer,Transfer,移転
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に作業指示書{0}をキャンセルする必要があります
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(部分組立品を含む)展開した部品表を取得する
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(部分組立品を含む)展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),(従業員)に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
@@ -4539,10 +4570,11 @@
 DocType: Cheque Print Template,Message to show,表示するメッセージ
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,小売
 DocType: Student Attendance,Absent,欠勤
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,製品付属品
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0}から始まるスコアを見つけることができません。あなたは、0〜100までの既定のスコアを持つ必要があります
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}:無効参照{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
+DocType: Subscription,Current Invoice Start Date,現在の請求書の開始日
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}:デビットカードまたはクレジットのどちらかが、{2}のために必要とされます
 DocType: GL Entry,Remarks,備考
@@ -4552,11 +4584,13 @@
 DocType: Task,Parent Task,親タスク
 DocType: Journal Entry,Write Off Based On,償却基準
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,リード作成
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,印刷と文房具
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,印刷と文房具
 DocType: Stock Settings,Show Barcode Field,バーコードフィールド表示
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,サプライヤーメールを送信
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",給与が{0}から{1}の間で既に処理されているため、休暇申請期間をこの範囲に指定することはできません。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,サプライヤーメールを送信
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",給与が{0}から{1}の間で既に処理されているため、休暇申請期間をこの範囲に指定することはできません。
+DocType: Fiscal Year,Auto Created,自動作成
 DocType: Chapter Member,Leave Reason,欠勤理由
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,請求書{0}は存在しません
 DocType: Guardian Interest,Guardian Interest,保護者の関心
 DocType: Volunteer,Availability,可用性
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS請求書の初期値の設定
@@ -4564,14 +4598,13 @@
 DocType: Project,Time to send,送信時間
 DocType: Timesheet,Employee Detail,従業員詳細
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,保護者1 メールID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,次の日と月次繰り返しの日は同じでなければなりません
 DocType: Lab Prescription,Test Code,テストコード
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ウェブサイトのホームページの設定
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},スコアカードが{1}のためRFQは{0}には許可されていません
 DocType: Job Offer,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,上記
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},合計金額{0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},無効な属性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},合計金額{0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},無効な属性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,標準でない支払い可能な口座
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',「すべての評価グループ」以外の評価グループを選択してください
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}:アイテム{1}にコストセンターが必要です
@@ -4582,7 +4615,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,水質分析
 DocType: Chapter,Region,地域
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,(任意)この設定は、様々な取引をフィルタリングするために使用されます。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,リロードリンク解析
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","例:2012, 2012-13"
@@ -4598,7 +4631,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,スクラップ資産原価
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:項目{2}には「コストセンター」が必須です
 DocType: Vehicle,Policy No,ポリシー番号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,付属品からアイテムを取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,付属品からアイテムを取得
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,プロジェクトユーザー
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,分割
@@ -4634,21 +4667,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,パス
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,子ノードがあるため、コストセンターを元帳に変換することはできません
 DocType: Production Plan,Total Planned Qty,計画総数
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,始値
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,始値
 DocType: Salary Detail,Formula,式
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,シリアル番号
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,シリアル番号
 DocType: Lab Test Template,Lab Test Template,ラボテストテンプレート
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,セールスアカウント
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,セールスアカウント
 DocType: Purchase Invoice Item,Total Weight,総重量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,販売手数料
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,販売手数料
 DocType: Job Offer Term,Value / Description,値/説明
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:資産{1}は{2}であるため提出することができません
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:資産{1}は{2}であるため提出することができません
 DocType: Tax Rule,Billing Country,請求先の国
 DocType: Purchase Order Item,Expected Delivery Date,配送予定日
 DocType: Restaurant Order Entry,Restaurant Order Entry,レストランオーダーエントリー
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
 DocType: Asset Maintenance Task,Assign To Name,名前に割当
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,交際費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,交際費
 DocType: Hub Settings,Enabled Users,有効ユーザー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,資材要求を作成
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},アイテム {0} を開く
@@ -4661,24 +4694,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,休暇申請
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
 DocType: Vehicle,Last Carbon Check,最後のカーボンチェック
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,訴訟費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,訴訟費用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,行数量を選択してください
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,請求書作成
 DocType: Purchase Invoice,Posting Time,投稿時間
 DocType: Timesheet,% Amount Billed,%請求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,電話代
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,電話代
 DocType: Sales Partner,Logo,ロゴ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
 DocType: Email Digest,Open Notifications,お知らせを開く
 DocType: Payment Entry,Difference Amount (Company Currency),差額(会社通貨)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,直接経費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,直接経費
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新規顧客の収益
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,旅費交通費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},文書タイプ {0} にカスタムフィールド登録を追加する
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,アカウント:{0} で通貨:{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,アカウント:{0} で通貨:{1}を選択することはできません
 DocType: Purchase Receipt Item,Sample Quantity,サンプル数量
+DocType: Bank Guarantee,Name of Beneficiary,受益者の氏名
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",最新の評価レート/価格リストレート/原材料の最終購入レートに基づいて、スケジューラを使用してBOM原価を自動的に更新します。
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}:親アカウント{1}は会社{2}に属していません
@@ -4690,14 +4723,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,試用
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,給与コンポーネント
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,リターン/クレジットノート
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,リターン/クレジットノート
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,支出額合計
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,支出額合計
 DocType: GST Settings,B2C Limit,B2C制限
 DocType: Work Order Item,Transferred Qty,移転数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ナビゲート
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,計画
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,計画
 DocType: Share Balance,Issued,課題
+DocType: Loan,Repayment Start Date,返済開始日
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,生徒活動
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,サプライヤーID
 DocType: Payment Request,Payment Gateway Details,ペイメントゲートウェイ詳細
@@ -4710,10 +4744,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",休暇の種類(欠勤・病欠など)
 DocType: Email Digest,Send regular summary reports via Email.,メール経由で定期的な要約レポートを送信
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
 DocType: Assessment Result,Student Name,生徒名
 DocType: Brand,Item Manager,アイテムマネージャ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,給与支払ってください
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,給与支払ってください
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
 DocType: Plant Analysis,Collection Datetime,コレクション日時
 DocType: Work Order,Total Operating Cost,営業費合計
@@ -4723,9 +4757,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ユーザー{0}は存在しません
 DocType: Payment Term,Day(s) after invoice date,請求書日付後の日
 DocType: Payment Schedule,Payment Schedule,支払いスケジュール
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,略語
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,支払項目が既に存在しています
+DocType: Subscription,Trial Period End Date,試用期間終了日
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0}の限界を超えているので認証されません
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,給与テンプレートマスター
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,病理学
@@ -4742,9 +4776,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違(アイテムグループごと)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,全ての顧客グループ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,全ての顧客グループ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,月間累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,税テンプレートは必須です
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,アカウント{0}:親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価(会社通貨)
@@ -4753,14 +4787,15 @@
 DocType: Lab Prescription,Test Created,作成されたテスト
 DocType: Healthcare Settings,Custom Signature in Print,印刷時のカスタム署名
 DocType: Account,Temporary,仮勘定
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,顧客LPO番号
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,顧客LPO番号
 DocType: Program,Courses,コース
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",無効にした場合、「文字表記」フィールドはどの取引にも表示されません
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,この操作により、将来請求が停止されます。この定期購入をキャンセルしてもよろしいですか?
 DocType: Serial No,Distinct unit of an Item,アイテムの明確な単位
 DocType: Supplier Scorecard Criteria,Criteria Name,基準名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,会社を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,会社を設定してください
 DocType: Pricing Rule,Buying,購入
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,病気・肥料
 DocType: HR Settings,Employee Records to be created by,従業員レコード作成元
@@ -4769,17 +4804,17 @@
 DocType: POS Profile,Apply Discount On,割引の適用
 DocType: Member,Membership Type,会員タイプ
 ,Reqd By Date,要求済日付
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,債権者
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,債権者
 DocType: Assessment Plan,Assessment Name,評価名
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,印刷でPDCを表示する
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,印刷でPDCを表示する
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,行#{0}:シリアル番号は必須です
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,求人
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,研究所の略
 ,Item-wise Price List Rate,アイテムごとの価格表単価
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},数量({0})は行{1}の小数部にはできません
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量({0})は行{1}の小数部にはできません
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
@@ -4797,7 +4832,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,派生の合計
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",有効にすると、システムは自動的に在庫の会計エントリーを投稿します
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,証券仲介
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,従業員の出席は、{0}はすでにこの日のためにマークされています
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,従業員の出席は、{0}はすでにこの日のためにマークされています
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",「時間ログ」からアップデートされた分数
 DocType: Customer,From Lead,リードから
@@ -4808,6 +4843,7 @@
 DocType: Lab Test,Approved Date,承認日
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
+DocType: Subscriber,Subscriber Name,加入者名
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Update Tool,Replace,置き換え
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,製品が見つかりませんでした。
@@ -4817,19 +4853,18 @@
 DocType: Request for Quotation Item,Project Name,プロジェクト名
 DocType: Customer,Mention if non-standard receivable account,非標準の売掛金の場合に記載
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},従業員ローン{0}の利息収入勘定を選択
 DocType: Work Order,Required Items,必要なもの
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,人材
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,支払照合 支払
 DocType: Disease,Treatment Task,治療タスク
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,税金資産
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,税金資産
 DocType: BOM Item,BOM No,部品表番号
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
 DocType: Item,Moving Average,移動平均
 DocType: BOM Update Tool,The BOM which will be replaced,交換される部品表
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,電子機器
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,電子機器
 DocType: Asset,Maintenance Required,要保守
 DocType: Account,Debit,借方
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
@@ -4838,7 +4873,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,未払額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,この営業担当者にアイテムグループごとの目標を設定する
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[日]より古い在庫を凍結
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:資産は、固定資産の購入/販売のために必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:資産は、固定資産の購入/販売のために必須です
 DocType: Asset Maintenance Team,Maintenance Team Name,保守チーム名
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
 優先度は0〜20の間の数で、デフォルト値はゼロ(空白)です。同じ条件で複数の価格設定ルールがある場合、大きい数字が優先されることになります。"
@@ -4848,19 +4883,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,次のユーザーが休暇期間申請を承認することを許可
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,経費請求タイプ
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},アイテム{0}の販売率が{1}より低いです。販売価格は少なくともat {2}でなければなりません
-DocType: Item,Taxes,税
+DocType: Subscription,Taxes,税
 DocType: Purchase Invoice,capital goods,資本財
 DocType: Purchase Invoice Item,Weight Per Unit,単位重量
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,支払済かつ未配送
 DocType: Project,Default Cost Center,デフォルトコストセンター
-DocType: Bank Guarantee,End Date,終了日
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,在庫取引
 DocType: Budget,Budget Accounts,予算アカウント
 DocType: Employee,Internal Work History,内部作業履歴
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,減価償却累計金額
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,未公開株式
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,サプライヤスコアカード変数
-DocType: Employee Loan,Fully Disbursed,完全に支払わ
 DocType: Employee Advance,Due Advance Amount,繰越額
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
@@ -4884,7 +4917,7 @@
 ,Employee Information,従業員の情報
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,販売および購買のデフォルト税テンプレートが登録されます。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,評価結果レコード{0}は既に存在します。
@@ -4892,7 +4925,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Group Byが &#39;Company&#39;の場合、Companyフィルターを空白に設定してください
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,転記日付は将来の日付にすることはできません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:シリアル番号 {1} が {2} {3}と一致しません
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,繰返しを生成するための
 DocType: Stock Entry,Target Warehouse Address,ターゲット倉庫の住所
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,臨時休暇
 DocType: Agriculture Task,End Day,終了日
@@ -4917,11 +4949,10 @@
 DocType: Material Request,% Ordered,%注文済
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",生徒グループに基づくコースの場合、そのコースは教育課程登録から登録された全生徒について検証されます。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,出来高制
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均購入レート
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均購入レート
 DocType: Share Balance,From No,〜から
 DocType: Task,Actual Time (in Hours),実際の時間(時)
 DocType: Employee,History In Company,会社での履歴
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{sender} からの新しいメッセージ
 DocType: Customer,Customer Primary Address,顧客のプライマリアドレス
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ニュースレター
 DocType: Drug Prescription,Description/Strength,説明/強さ
@@ -4930,22 +4961,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,同じ項目が複数回入力されています
 DocType: Department,Leave Block List,休暇リスト
 DocType: Purchase Invoice,Tax ID,納税者番号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
 DocType: Accounts Settings,Accounts Settings,アカウント設定
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,承認
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",{0} の書式が正しくありません。修正して続行してください。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",{0} の書式が正しくありません。修正して続行してください。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",新しいアカウント番号は接頭辞としてアカウント名に含まれます
 DocType: Maintenance Team Member,Team Member,チームメンバー
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,提出する結果がありません
 DocType: Customer,Sales Partner and Commission,販売パートナーと手数料
-DocType: Employee Loan,Rate of Interest (%) / Year,利子率(%)/年
+DocType: Loan,Rate of Interest (%) / Year,利子率(%)/年
 ,Project Quantity,プロジェクト数量
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目がゼロになっています。「支払案分基準」を変更する必要があるかもしれません
 DocType: Opportunity,To Discuss,連絡事項
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
 DocType: Loan Type,Rate of Interest (%) Yearly,利子率(%)年間
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,仮勘定
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,黒
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,仮勘定
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Shareholder,Contact List,連絡先リスト
 DocType: Account,Auditor,監査人
@@ -4953,16 +4984,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,生産{0}アイテム
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,もっと詳しく知る
 DocType: Cheque Print Template,Distance from top edge,上端からの距離
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,価格表{0}が無効になっているか、存在しません。
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,価格表{0}が無効になっているか、存在しません。
 DocType: Purchase Invoice,Return,返品
 DocType: Pricing Rule,Disable,無効にする
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,支払方法には支払を作成する必要があります
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,支払方法には支払を作成する必要があります
 DocType: Project Task,Pending Review,レビュー待ち
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",資産・シリアル番号・バッチなどのオプションを全画面で編集
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,予約・診察
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}はバッチ{2}に登録されていません
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",資産{0}は{1}であるため廃棄することはできません
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,必要なチェック
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,必要なチェック
 DocType: Task,Total Expense Claim (via Expense Claim),総経費請求(経費請求経由)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,欠席をマーク
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,会社を設定できませんでした
@@ -4974,7 +5005,7 @@
 DocType: Homepage,Tag Line,キャッチフレーズ
 DocType: Fee Component,Fee Component,手数料コンポーネント
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,フリート管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,アイテム追加元
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,アイテム追加元
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,作物と土地
 DocType: Cheque Print Template,Regular,レギュラー
 DocType: Fertilizer,Density (if liquid),密度(液体の場合)
@@ -4999,24 +5030,26 @@
 DocType: Payment Entry,Paid Amount,支払金額
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,販売サイクルを探る
 DocType: Assessment Plan,Supervisor,スーパーバイザー
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,リテンションストックエントリー
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,リテンションストックエントリー
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 ,Work Order Stock Report,作業命令在庫レポート
+DocType: Purchase Receipt,Auto Repeat Detail,オートリピートの詳細
 DocType: Assessment Result Tool,Assessment Result Tool,評価結果ツール
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,スーパーバイザとして
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,カテゴリを提案する
 DocType: BOM Scrap Item,BOM Scrap Item,BOMスクラップアイテム
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,提出された注文を削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,品質管理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,品質管理
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,アイテム{0}は無効になっています
 DocType: Project,Total Billable Amount (via Timesheets),請求可能総額(タイムシートから)
 DocType: Agriculture Task,Previous Business Day,前営業日
-DocType: Employee Loan,Repay Fixed Amount per Period,期間ごとの固定額を返済
+DocType: Loan,Repay Fixed Amount per Period,期間ごとの固定額を返済
 DocType: Employee,Health Insurance No,健康保険証番号
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,クレジットノートAmt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,クレジットノートAmt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,総課税額
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 DocType: Opening Invoice Creation Tool,Purchase,仕入
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,残高数量
@@ -5027,15 +5060,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for  {1}
 DocType: Healthcare Settings,Valid number of days,有効な日数
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,コストセンター
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,サブスクリプションを再開する
 DocType: Land Unit,Linked Plant Analysis,リンクされたプラント分析
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,サプライヤの通貨が会社の基本通貨に換算されるレート
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行 {0}:行{1}と時間が衝突しています
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ゼロ評価レートを許可する
+DocType: Bank Guarantee,Receiving,受信
 DocType: Training Event Employee,Invited,招待済
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかり、複数のアクティブな給与構造
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,ゲートウェイアカウントを設定
 DocType: Employee,Employment Type,雇用の種類
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定資産
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定資産
 DocType: Payment Entry,Set Exchange Gain / Loss,取引利益/損失を設定します。
 ,GST Purchase Register,GST購入登録
 ,Cash Flow,キャッシュフロー
@@ -5055,9 +5090,10 @@
 DocType: Academic Term,Term Start Date,期初日
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,すべての株式取引のリスト
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,機会数
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},添付{0} を確認してください #{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,試用期間開始日と試用期間終了日の両方を設定する必要があります
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均レート
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支払スケジュールの総支払額は、総額/丸め合計と等しくなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支払スケジュールの総支払額は、総額/丸め合計と等しくなければなりません
+DocType: Subscription Plan Detail,Plan,計画
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,総勘定元帳ごとの銀行取引明細残高
 DocType: Job Applicant,Applicant Name,申請者名
 DocType: Authorization Rule,Customer / Item Name,顧客/アイテム名
@@ -5087,6 +5123,7 @@
 DocType: Work Order,Warehouses,倉庫
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}資産を転送することはできません
 DocType: Hotel Room Pricing,Hotel Room Pricing,ホテルルーム価格
+DocType: Subscription,Days Until Due,期限までの日数
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,このアイテムは {0} のバリエーションです(テンプレート)。
 DocType: Workstation,per hour,毎時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購入
@@ -5095,13 +5132,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",生徒グループに基づくバッチの場合、その生徒バッチは教育課程登録の全生徒に有効となります。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,配布
+DocType: Journal Entry Account,Loan,ローン
 DocType: Expense Claim Advance,Expense Claim Advance,経費請求のアドバンス
 DocType: Lab Test,Report Preference,レポート設定
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ボランティア情報
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,プロジェクトマネージャー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,プロジェクトマネージャー
 ,Quoted Item Comparison,引用符で囲まれた項目の比較
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}から{1}までのスコアが重複しています
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,発送
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引:{0}が{1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,純資産価値などについて
 DocType: Crop,Produce,作物
@@ -5111,7 +5149,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,製造のための材料消費
 DocType: Item Alternative,Alternative Item Code,代替商品コード
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,製造する項目を選択します
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,製造する項目を選択します
 DocType: Delivery Stop,Delivery Stop,配達停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",マスタデータ同期中です。少し時間がかかる場合があります
 DocType: Item,Material Issue,資材課題
@@ -5121,15 +5159,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,石鹸&洗剤
 DocType: BOM,Show Items,アイテムを表示
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,開始時間を終了時間よりも大きくすることはできません。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,すべての顧客に電子メールで通知しますか?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,すべての顧客に電子メールで通知しますか?
+DocType: Subscription Plan,Billing Interval,請求間隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,映画&ビデオ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,履歴書
 DocType: Hub Settings,Hub Username,ハブユーザー名
 DocType: Salary Detail,Component,成分
 DocType: Assessment Criteria,Assessment Criteria Group,評価基準グループ
 DocType: Healthcare Settings,Patient Name By,患者名
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0}から{1}への給与の発生分納登録
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0}から{1}への給与の発生分納登録
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
@@ -5143,22 +5181,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
 DocType: Leave Block List,Applies to Company,会社に適用
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
-DocType: Employee Loan,Disbursement Date,支払い日
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,「受信者」が指定されていません
+DocType: Loan,Disbursement Date,支払い日
 DocType: BOM Update Tool,Update latest price in all BOMs,すべてのBOMで最新の価格を更新
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,医療記録
 DocType: Vehicle,Vehicle,車両
 DocType: Purchase Invoice,In Words,文字表記
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,提出する前に銀行または貸出機関の名前を入力してください。
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0}を提出する必要があります
 DocType: POS Profile,Item Groups,アイテムグループ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,今日は {0} の誕生日です!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,今日は {0} の誕生日です!
 DocType: Sales Order Item,For Production,生産用
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,勘定コード表に一時的口座を追加してください
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,勘定コード表に一時的口座を追加してください
 DocType: Customer,Customer Primary Contact,顧客一次連絡先
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,期間終了ジャーナル
 DocType: Project Task,View Task,タスク表示
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,機会 / リード%
+DocType: Bank Guarantee,Bank Guarantee Type,銀行保証タイプ
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,請求書部分
 ,Asset Depreciations and Balances,資産減価償却と残高
@@ -5169,9 +5208,8 @@
 DocType: Production Plan,Include Subcontracted Items,外注品を含める
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,在庫転記後にバリエーション属性を変更することはできません。これを行うには、新しいアイテムを作成する必要があります。
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
-DocType: Employee Loan,Repay from Salary,給与から返済
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+DocType: Loan,Repay from Salary,給与から返済
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},量 {2} 用の {0} {1}に対する支払依頼
 DocType: Salary Slip,Salary Slip,給料明細
@@ -5195,11 +5233,11 @@
 DocType: Employee Education,Employee Education,従業員教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,項目グループテーブルで見つかった重複するアイテム群
 DocType: Land Unit,Parent Land Unit,親土地単位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
 DocType: Fertilizer,Fertilizer Name,肥料名
 DocType: Salary Slip,Net Pay,給与総計
 DocType: Cash Flow Mapping Accounts,Account,アカウント
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
 ,Requested Items To Be Transferred,移転予定の要求アイテム
 DocType: Expense Claim,Vehicle Log,車両のログ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),発熱(38.5℃/ 101.3°Fまたは38°C / 100.4°Fの持続温度)の存在
@@ -5240,24 +5278,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
 DocType: Asset Maintenance,Manufacturing User,製造ユーザー
 DocType: Purchase Invoice,Raw Materials Supplied,原材料供給
-DocType: C-Form,Series,シリーズ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},価格表{0}の通貨は{1}または{2}でなければなりません
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Soil Texture,Ternary Plot,三元プロット
 DocType: Item Group,Item Classification,アイテム分類
 DocType: Driver,License Number,運転免許番号
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ビジネス開発マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ビジネス開発マネージャー
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,保守訪問目的
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,請求書患者登録
 DocType: Crop,Period,期間
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,総勘定元帳
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},上の休暇に関する従業員{0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},上の休暇に関する従業員{0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,リードを表示
 DocType: Program Enrollment Tool,New Program,新しいプログラム
 DocType: Item Attribute Value,Attribute Value,属性値
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 DocType: Salary Detail,Salary Detail,給与詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,{0}を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,{0}を選択してください
 DocType: Appointment Type,Physician,医師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,相談
@@ -5265,15 +5302,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},作業オーダー{3}で{0}({1})は計画数量({2})を上回ることはできません
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,製造のための勤務表。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,株式取引後にバリアントプロパティを変更することはできません。これを行うには、新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPAマンデート
 DocType: Physician,Charges,料金
 DocType: Production Plan,Get Items For Work Order,作業オーダーのアイテムを取得する
 DocType: Salary Detail,Default Amount,デフォルト額
 DocType: Lab Test Template,Descriptive,記述的
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,システムに倉庫がありません。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,システムに倉庫がありません。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,今月の概要
 DocType: Quality Inspection Reading,Quality Inspection Reading,品質検査報告要素
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,あなたの会社に達成したいセールス目標を設定します。
 ,Project wise Stock Tracking,プロジェクトごとの在庫追跡
@@ -5301,11 +5339,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ウェブサイトの作成に失敗しました
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,すでに登録されている在庫在庫またはサンプル数量が提供されていない
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,すでに登録されている在庫在庫またはサンプル数量が提供されていない
 DocType: Program,Program Abbreviation,教育課程略称
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます
 DocType: Warranty Claim,Resolved By,課題解決者
-DocType: Bank Guarantee,Start Date,開始日
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,期間に休暇を割り当てる。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,小切手及び預金が不正にクリア
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,アカウント{0}:自身を親アカウントに割当することはできません
@@ -5320,11 +5357,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,時間
 DocType: Project,Expected Start Date,開始予定日
 DocType: Purchase Invoice,04-Correction in Invoice,04  - インボイスの修正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOMを持つすべての明細に対してすでに作成された作業オーダー
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOMを持つすべての明細に対してすでに作成された作業オーダー
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,バリエーション詳細レポート
 DocType: Setup Progress Action,Setup Progress Action,セットアップ進捗アクション
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,購入価格リスト
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,購入価格リスト
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,料金がそのアイテムに適用できない場合は、アイテムを削除する
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,サブスクリプションをキャンセルする
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,保守ステータスを完了として選択するか、完了日を削除してください
 DocType: Supplier,Default Payment Terms Template,デフォルトの支払条件テンプレート
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,取引通貨は、ペイメントゲートウェイ通貨と同じでなければなりません
@@ -5335,7 +5373,6 @@
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,累計月予算を超過した場合のアクション
-DocType: Subscription,Submit on creation,作成時に提出
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} {1}でなければならないための通貨
 DocType: Asset,Disposal Date,処分日
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",指定時点での全ての有効な従業員にメールが送信されます(休日が無い場合)。回答の概要は、深夜に送信されます。
@@ -5353,6 +5390,7 @@
 DocType: Batch,Parent Batch,親バッチ
 DocType: Cheque Print Template,Cheque Print Template,小切手印刷テンプレート
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,コストセンターの表
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,購読を取り消す前または購読を未払いとしてマークするまでに請求日が経過した日数
 DocType: Lab Test Template,Sample Collection,サンプル収集
 ,Requested Items To Be Ordered,発注予定の要求アイテム
 DocType: Price List,Price List Name,価格表名称
@@ -5361,7 +5399,7 @@
 DocType: Account,Income,収入
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,問題発生!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,警告:休暇申請に次の期間が含まれています。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,警告:休暇申請に次の期間が含まれています。
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
 DocType: Supplier Scorecard Scoring Criteria,Score,スコア
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,会計年度{0}は存在しません
@@ -5381,12 +5419,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}は0〜100の値でなければなりません
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,次の減価償却日は、使用可能日前にすることはできません。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,無担保ローン
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,無担保ローン
 DocType: Cost Center,Cost Center Name,コストセンター名
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,タイムシートに対する最大労働時間
 DocType: Maintenance Schedule Detail,Scheduled Date,スケジュール日付
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,支出額合計
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,支出額合計
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160文字を超えるメッセージは複数のメッセージに分割されます
 DocType: Purchase Receipt Item,Received and Accepted,受領・承認済
 DocType: Hub Settings,Company and Seller Profile,会社と販売者のプロフィール
@@ -5400,10 +5438,9 @@
 DocType: Item,Variant Based On,バリエーション派生元
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100%でなければなりません。{0}になっています。
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,サプライヤー
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,を修正してください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 DocType: Request for Quotation Item,Supplier Part No,サプライヤー型番
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,匿名
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,受領元
 DocType: Lead,Converted,変換済
@@ -5417,6 +5454,7 @@
 DocType: Asset,Assets,資産
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
+DocType: Subscription,Current Invoice End Date,現在の請求書終了日
 DocType: Payment Term,Due Date Based On,期日ベース
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,販売設定でデフォルトの顧客グループと地域を設定してください
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1}が存在しません
@@ -5424,7 +5462,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,アイテム:{0}はシステムに存在しません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,仕訳入力に返済が選択されていない
 DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
+DocType: Loan,Disbursed,支払われた
 DocType: Healthcare Settings,Laboratory Settings,実験室の設定
 DocType: Patient Appointment,Service Unit,サービスユニット
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,サプライヤを正常に設定
@@ -5437,12 +5477,12 @@
 DocType: Share Balance,No of Shares,株式の数
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,ステータスを選択
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: School House,House Name,建物名
 DocType: Fee Schedule,Total Amount per Student,生徒1人あたりの総額
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,電気
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,電気
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ユーザーとして、組織の残りの部分を追加します。また、連絡先からそれらを追加して、ポータルにお客様を招待追加することができます
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計(出 - 入)
 DocType: Grant Application,Requested Amount,要求数
@@ -5452,7 +5492,7 @@
 DocType: Crop Cycle,Detected Diseases,検出された疾患
 DocType: Stock Entry,Default Source Warehouse,デフォルトの出庫元倉庫
 DocType: Item,Customer Code,顧客コード
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0}のための誕生日リマインダー
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0}のための誕生日リマインダー
 DocType: Asset Maintenance Task,Last Completion Date,最終完了日
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
@@ -5460,9 +5500,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless設定
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,在庫資産
 DocType: Restaurant,Active Menu,アクティブメニュー
 DocType: Target Detail,Target Qty,ターゲット数量
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ローンに対して:{0}
 DocType: Shopping Cart Settings,Checkout Settings,チェックアウト設定
 DocType: Student Attendance,Present,出勤
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
@@ -5471,9 +5512,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},従業員の給与明細 {0} はすで勤務表 {1} 用に作成されています
 DocType: Vehicle Log,Odometer,走行距離計
 DocType: Production Plan Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOMに在庫アイテムが含まれていません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOMに在庫アイテムが含まれていません
 DocType: Chapter,Chapter Head,チャプターヘッド
 DocType: Payment Term,Month(s) after the end of the invoice month,請求書月の終了後の月
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,プロジェクト活動/タスク
@@ -5481,11 +5522,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,給与明細を生成
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ラボ結果のdatetimeはdatetimeをテストする前にはできません
 DocType: POS Profile,Allow user to edit Discount,ユーザーが編集を許可する割引
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,顧客を獲得する
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,顧客を獲得する
 DocType: Purchase Invoice Item,Include Exploded Items,分解された項目を含める
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
 DocType: Shipping Rule,Restrict to Countries,国に制限する
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額(会社通貨)
 DocType: Sales Invoice Timesheet,Billing Hours,請求時間
 DocType: Project,Total Sales Amount (via Sales Order),合計売上金額(受注による)
@@ -5502,6 +5544,7 @@
 DocType: Soil Texture,Sandy Clay,砂質粘土
 DocType: Grant Application,Assessment  Manager,評価マネージャー
 DocType: Payment Entry,Allocate Payment Amount,お支払い金額を割り当て
+DocType: Subscription Plan,Subscription Plan,購読計画
 DocType: Employee External Work History,Salary,給与
 DocType: Serial No,Delivery Document Type,納品文書タイプ
 DocType: Sales Order,Partly Delivered,一部納品済
@@ -5528,9 +5571,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,エイジングレンジ2
 DocType: SG Creation Tool Course,Max Strength,最大強度
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,プリセットのインストール
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},顧客{}の配達メモが選択されていません
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},顧客{}の配達メモが選択されていません
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,部品表交換
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,納期に基づいて商品を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,納期に基づいて商品を選択
 DocType: Grant Application,Has any past Grant Record,助成金レコードあり
 ,Sales Analytics,販売分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},利用可能な{0}
@@ -5548,7 +5591,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原材料供給費用
 DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
 DocType: Hotel Room Reservation,Hotel Room Reservation,ホテルルーム予約
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,顧客サービス
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,顧客サービス
 DocType: BOM,Thumbnail,サムネイル
 DocType: Item Customer Detail,Item Customer Detail,アイテム顧客詳細
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,雇用候補者
@@ -5564,7 +5607,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0}学生は登録されています
 DocType: Fees,Student Details,生徒詳細
 DocType: Purchase Invoice Item,Stock Qty,在庫数
-DocType: Employee Loan,Repayment Period in Months,ヶ月間における償還期間
+DocType: Loan,Repayment Period in Months,ヶ月間における償還期間
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,エラー:有効なIDではない?
 DocType: Naming Series,Update Series Number,シリーズ番号更新
 DocType: Account,Equity,株式
@@ -5573,7 +5616,7 @@
 DocType: Task,Closing Date,締切日
 DocType: Sales Order Item,Produced Quantity,生産数量
 DocType: Timesheet,Work Detail,作業の詳細
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,エンジニア
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,エンジニア
 DocType: Journal Entry,Total Amount Currency,総額通貨
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,組立部品を検索
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
@@ -5618,13 +5661,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ドナータイプの情報。
 DocType: Request for Quotation,Supplier Detail,サプライヤー詳細
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},式または条件でエラーが発生しました:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,請求された額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,請求された額
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,基準の重みは100%まで加算する必要があります
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,出勤
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,在庫アイテム
 DocType: BOM,Materials,資材
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",チェックされていない場合、リストを適用先の各カテゴリーに追加しなくてはなりません
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0}の作成
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ソースとターゲット・ウェアハウスは同じにすることはできません
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,転記日時は必須です
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,購入取引用の税のテンプレート
@@ -5648,14 +5690,14 @@
 DocType: Shipping Rule,Fixed,一定
 DocType: Vehicle Service,Clutch Plate,クラッチプレート
 DocType: Company,Round Off Account,丸め誤差アカウント
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,一般管理費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,一般管理費
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,コンサルティング
 DocType: Customer Group,Parent Customer Group,親顧客グループ
-DocType: Journal Entry,Subscription,購読
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,購読
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,手数料の作成を保留中
 DocType: Appraisal Goal,Score Earned,スコア獲得
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,通知期間
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,通知期間
 DocType: Asset Category,Asset Category Name,資産カテゴリー名
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ルート(大元の)地域なので編集できません
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新しい営業担当者名
@@ -5668,7 +5710,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,コースベースのグループを作る際にバッチを考慮したくない場合は、チェックを外したままにしておきます。
 DocType: Asset,Frequency of Depreciation (Months),減価償却費の周波数(ヶ月)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,貸方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,貸方アカウント
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造/再梱包した後に得られたアイテムの数量
@@ -5676,7 +5718,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金/買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
 DocType: Hub Settings,Company Logo,会社のロゴ
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 DocType: Healthcare Settings,Patient Registration,患者登録
@@ -5710,11 +5752,10 @@
 DocType: Journal Entry,Total Debit,借方合計
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,デフォルト完成品倉庫
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,患者を選択してください
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,営業担当
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,営業担当
 DocType: Hotel Room Package,Amenities,アメニティ
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,予算とコストセンター
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,複数のデフォルトの支払い方法は許可されていません
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,のために
 ,Appointment Analytics,予約分析
 DocType: Vehicle Service,Half Yearly,半年ごと
 DocType: Lead,Blog Subscriber,ブログ購読者
@@ -5730,6 +5771,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,年ごとに生徒グループを作る場合は空欄にしてください
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",現在の鍵を使用しているアプリケーションはアクセスできません。本当ですか?
+DocType: Subscription Settings,Prorate,比喩
 DocType: Purchase Invoice,Total Advance,前払金計
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,テンプレートコードを変更する
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,期間終了日は、期間開始日より前にすることはできません。日付を訂正して、もう一度お試しください。
@@ -5740,8 +5782,9 @@
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 DocType: Cheque Print Template,Signatory Position,署名者の位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,失注として設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,失注として設定
 DocType: Timesheet,Total Billable Hours,合計請求可能な時間
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,購読者がこの購読によって生成された請求書を支払う日数
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,支払領収書の注意
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,これは、この顧客に対する取引に基づいています。詳細については以下のタイムラインを参照してください
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}:割り当て量{1}未満であるか、または支払エントリ量に等しくなければならない{2}
@@ -5760,12 +5803,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,選択・新規顧客追加
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用(資産)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,これは、この従業員の出席に基づいています
 DocType: Assessment Result,Summary,概要
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,出席者に印を付ける
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,借方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,借方アカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,レストランオーダーエントリーアイテム
@@ -5777,7 +5820,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購入金額
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,終了年を開始年より前にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,従業員給付
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,従業員給付
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Work Order,Manufactured Qty,製造数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},共有は{0}には存在しません
@@ -5785,12 +5828,12 @@
 DocType: Asset,Out of Order,故障中
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 DocType: Projects Settings,Ignore Workstation Time Overlap,ワークステーションの時間の重複を無視する
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}:{1}は存在しません
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,バッチ番号選択
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,顧客あて請求
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}:経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}:経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 DocType: Patient Service Unit,Medical Administrator,医療管理者
 DocType: Assessment Plan,Schedule,スケジュール
 DocType: Account,Parent Account,親勘定
@@ -5820,15 +5863,16 @@
 DocType: Asset Repair,Repair Status,修理状況
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫内利用可能数量
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,先に従業員レコードを選択してください
 DocType: POS Profile,Account for Change Amount,変化量のためのアカウント
 DocType: Purchase Invoice,input service,入力サービス
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:当事者/アカウントが {3} {4} の {1} / {2}と一致しません
 DocType: Maintenance Team Member,Maintenance Team Member,保守チームメンバー
 DocType: Agriculture Analysis Criteria,Soil Analysis,土壌分析
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,コースコード:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,経費勘定を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:参照文書タイプは、発注・請求書・仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:参照文書タイプは、発注・請求書・仕訳のいずれかでなければなりません
 DocType: Employee,Current Address,現住所
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入/製造の詳細
@@ -5876,19 +5920,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0}のための入試
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 DocType: Supplier Scorecard Scoring Variable,Variable Name,変数名
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
 DocType: Asset,Asset Category,資産カテゴリー
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,給与をマイナスにすることはできません
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,サプライヤー用資材
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,サプライヤー用資材
 DocType: Soil Texture,Loamy Sand,壌質砂土
 DocType: Production Plan,Material Request Planning,品目依頼計画
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,消費税の請求書
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}%が複数回表示されます
 DocType: Expense Claim,Employees Email Id,従業員メールアドレス
 DocType: Employee Attendance Tool,Marked Attendance,マークされた出席
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,流動負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,流動負債
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,タイマーが所定の時間を超えました。
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,連絡先にまとめてSMSを送信
 DocType: Patient,A Positive,Aポジティブ
@@ -5899,9 +5943,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}には現在、サプライヤスコアカード {1} が指定されており、このサプライヤーへの発注は慎重に行なう必要があります。
 DocType: Asset Maintenance Team,Asset Maintenance Team,資産管理チーム
-DocType: Employee Loan,Loan Type,ローンの種類
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0}は正常に送信されました
+DocType: Loan,Loan Type,ローンの種類
 DocType: Scheduling Tool,Scheduling Tool,スケジューリングツール
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,クレジットカード
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,クレジットカード
 DocType: BOM,Item to be manufactured or repacked,製造または再梱包するアイテム
 DocType: Employee Education,Major/Optional Subjects,大手/オプション科目
 DocType: Sales Invoice Item,Drop Ship,ドロップシッピング
@@ -5933,7 +5978,7 @@
 DocType: Item,Units of Measure,測定の単位
 DocType: Manufacturing Settings,Allow Production on Holidays,休日に製造を許可
 DocType: Sales Invoice,Customer's Purchase Order Date,顧客の発注日
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,株式資本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,株式資本
 DocType: Shopping Cart Settings,Show Public Attachments,公開された添付を表示
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
 DocType: Restaurant Reservation,Reservation Time,予約時間
@@ -5948,7 +5993,7 @@
 DocType: Purchase Order,To Receive and Bill,受領・請求する
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,行番号{0}:取引日付より前の日付は必須です
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,おすすめ商品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,デザイナー
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
@@ -5958,20 +6003,20 @@
 DocType: Driver,Expiry Date,有効期限
 DocType: Healthcare Settings,Employee name and designation in print,従業員の表示名
 ,accounts-browser,アカウントブラウザ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,カテゴリを選択してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +13,Project master.,プロジェクトマスター
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",超過請求または超過発注を許可するには、在庫設定またはアイテムの「引当金」を更新してください
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(半日)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(半日)
 DocType: Payment Term,Credit Days,信用日数
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ラボテストを受けるには患者を選択してください
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,生徒バッチ作成
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,リードタイム日数
 DocType: Cash Flow Mapping,Is Income Tax Expense,法人所得税は費用ですか?
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}:行#{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}:行#{0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,学生が研究所のホステルに住んでいる場合はこれをチェックしてください。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,上記の表に受注を入力してください
 ,Stock Summary,株式の概要
@@ -5982,10 +6027,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,参照日付
 DocType: Employee,Reason for Leaving,退職理由
 DocType: BOM Operation,Operating Cost(Company Currency),営業費用(会社通貨)
-DocType: Employee Loan Application,Rate of Interest,金利
+DocType: Loan Application,Rate of Interest,金利
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: Item,Shelf Life In Days,賞味期限
 DocType: GL Entry,Is Opening,オープン
+DocType: Department,Expense Approvers,費用承認者
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}:借方エントリは{1}とリンクすることができません
 DocType: Journal Entry,Subscription Section,サブスクリプションセクション
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,アカウント{0}は存在しません
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index b39c4e8..be3c776 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,បោះបង់ {0} ទស្សនកិច្ចនៅមុនពេលលុបចោលសំភារៈបណ្តឹងធានានេះ
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,របាយការណ៍វាយតម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,ផលិតផលទំនិញប្រើប្រាស់
-DocType: Purchase Receipt,Subscription Detail,ព័ត៌មានអំពីការធ្វើបរិវិសកម្ម
 DocType: Supplier Scorecard,Notify Supplier,ជូនដំណឹងដល់អ្នកផ្គត់ផ្គង់
 DocType: Item,Customer Items,ធាតុអតិថិជន
 DocType: Project,Costing and Billing,និងវិក័យប័ត្រមានតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,គណនី {0}: គណនីមាតាបិតា {1} មិនអាចជាសៀវភៅមួយ
 DocType: Item,Publish Item to hub.erpnext.com,បោះពុម្ពផ្សាយធាតុទៅ hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ការជូនដំណឹងអ៊ីមែល
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ការវាយតំលៃ
 DocType: Item,Default Unit of Measure,អង្គភាពលំនាំដើមនៃវិធានការ
 DocType: SMS Center,All Sales Partner Contact,ទាំងអស់ដៃគូទំនាក់ទំនងលក់
-DocType: Employee,Leave Approvers,ទុកឱ្យការអនុម័ត
+DocType: Department,Leave Approvers,ទុកឱ្យការអនុម័ត
 DocType: Sales Partner,Dealer,អ្នកចែកបៀ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,ការស៊ើបអង្កេត
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ពិនិត្យភាពអាចរកបាន
 DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងការផ្គត់ផ្គង់នេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,ផ្នែកច្បាប់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},ពន្ធលើប្រភេទពិតប្រាកដមិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុនៅក្នុងជួរដេក {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,ផ្នែកច្បាប់
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},ពន្ធលើប្រភេទពិតប្រាកដមិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុនៅក្នុងជួរដេក {0}
 DocType: Bank Guarantee,Customer,អតិថិជន
 DocType: Purchase Receipt Item,Required By,ដែលបានទាមទារដោយ
 DocType: Delivery Note,Return Against Delivery Note,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការផ្តល់ចំណាំ
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},គណនីធនាគារដែលមិនអាចត្រូវបានដាក់ឈ្មោះថាជា {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ក្បាល (ឬក្រុម) ប្រឆាំងនឹងធាតុគណនេយ្យនិងតុល្យភាពត្រូវបានធ្វើឡើងត្រូវបានរក្សា។
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,មិនមានប្រាក់ខែដែលបានដាក់ស្នើដើម្បីដំណើរការទេ។
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,មិនមានប្រាក់ខែដែលបានដាក់ស្នើដើម្បីដំណើរការទេ។
 DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
 DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,បង្ហាញតែការបើកចំហ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,វាចាំបាច់ណាស់ក្នុងការចាត់វិធានការនេះនៅថ្ងៃនេះដោយខ្លួនឯងសម្រាប់ការបកក្រោយដែលបានរៀបរាប់ខាងលើ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ពិនិត្យមុនពេលចេញ
 DocType: Pricing Rule,Apply On,អនុវត្តនៅលើ
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
 DocType: Support Settings,Support Settings,ការកំណត់ការគាំទ្រ
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាការប្រាក់ត្រូវតែមានដូចគ្នា {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,ចាកចេញកម្មវិធីថ្មី
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាការប្រាក់ត្រូវតែមានដូចគ្នា {1} {2} ({3} / {4})
 ,Batch Item Expiry Status,ធាតុបាច់ស្ថានភាពផុតកំណត់
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,សេចក្តីព្រាងធនាគារ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Membership,membership validaty section,សមាជិកភាពសុពលភាព
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
 DocType: Consultation,Consultation,ការពិគ្រោះយោបល់
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,សម្ភារៈ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,បង្កើតវេបសាយ
 DocType: Opening Invoice Creation Tool Item,Quantity,បរិមាណ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
 DocType: Employee Education,Year of Passing,ឆ្នាំ Pass
 DocType: Item,Country of Origin,ប្រទេសនៃប្រភពដើម
 DocType: Soil Texture,Soil Texture Criteria,លក្ខណៈវិនិច្ឆ័យវាយនភាពដី
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,ព័ត៌មានលម្អិតទំនាក់ទំនងចម្បង
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ការបើកចំហរបញ្ហា
 DocType: Production Plan Item,Production Plan Item,ផលិតកម្មធាតុផែនការ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},{0} អ្នកប្រើត្រូវបានកំណត់រួចទៅបុគ្គលិក {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},{0} អ្នកប្រើត្រូវបានកំណត់រួចទៅបុគ្គលិក {1}
 DocType: Lab Test Groups,Add new line,បន្ថែមបន្ទាត់ថ្មី
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
@@ -89,7 +85,7 @@
 ,Delay Days,ពន្យារពេល
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,វិក័យប័ត្រ
+DocType: Subscription Invoice,Invoice,វិក័យប័ត្រ
 DocType: Purchase Invoice Item,Item Weight Details,ព័ត៌មានលម្អិតទម្ងន់
 DocType: Asset Maintenance Log,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ជួរដេក {0}: {1} {2} មិនផ្គូផ្គងនឹង {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ជួរដេក # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ជួរដេក # {0}:
 DocType: Timesheet,Total Costing Amount,ចំនួនទឹកប្រាក់ផ្សារសរុប
 DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,សូមជ្រើសតារាងតម្លៃ
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,ការងារក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,សូមជ្រើសរើសកាលបរិច្ឆេទ
 DocType: Daily Work Summary Group,Holiday List,បញ្ជីថ្ងៃឈប់សម្រាក
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,គណនេយ្យករ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,គណនេយ្យករ
 DocType: Hub Settings,Selling Price List,លក់បញ្ជីតំលៃ
 DocType: Patient,Tobacco Current Use,ការប្រើប្រាស់ថ្នាំជក់បច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,អត្រាលក់
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,អត្រាលក់
 DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,គ្មានទូរស័ព្ទ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},ថ្មី {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ការជូនដំណឹងអ៊ីម៉ែលដំបូងបានផ្ញើ
 ,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
 DocType: Soil Texture,Sandy Clay Loam,ដីឥដ្ឋដីឥដ្ឋ Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,តម្លៃបន្ទាប់ពីការរំលស់
 DocType: Student,O+,ឱ +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ដែលទាក់ទង
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,កាលបរិច្ឆេទចូលរួមមិនអាចតិចជាងការចូលរួមរបស់បុគ្គលិកនិងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,កាលបរិច្ឆេទចូលរួមមិនអាចតិចជាងការចូលរួមរបស់បុគ្គលិកនិងកាលបរិច្ឆេទ
 DocType: Grading Scale,Grading Scale Name,ធ្វើមាត្រដ្ឋានចំណាត់ឈ្មោះ
-DocType: Subscription,Repeat on Day,ធ្វើម្តងទៀតនៅថ្ងៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,នេះគឺជាគណនី root និងមិនអាចត្រូវបានកែសម្រួល។
 DocType: Sales Invoice,Company Address,អាសយដ្ឋានរបស់ក្រុមហ៊ុន
 DocType: BOM,Operations,ប្រតិបត្ដិការ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},មិនអាចកំណត់ការអនុញ្ញាតនៅលើមូលដ្ឋាននៃការបញ្ចុះតម្លៃសម្រាប់ {0}
+DocType: Subscription,Subscription Start Date,កាលបរិច្ឆេទចាប់ផ្តើមការជាវប្រចាំ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ភ្ជាប់ឯកសារ .csv ដែលមានជួរឈរពីរសម្រាប់ឈ្មោះចាស់និងមួយសម្រាប់ឈ្មោះថ្មី
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} មិននៅក្នុងឆ្នាំសារពើពន្ធសកម្មណាមួយឡើយ។
 DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ឯកសារយោង: {0}, លេខកូដធាតុ: {1} និងអតិថិជន: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,កាលបរិច្ឆេទបញ្ចប់នៃសវនាការមិនអាចនៅមុនថ្ងៃជំនុំជម្រះបានទេ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,គីឡូក្រាម
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,បើកសម្រាប់ការងារ។
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} លទ្ធផលដែលបានបញ្ជូន
@@ -147,7 +143,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុមហ៊ុនដូចគ្នាត្រូវបានបញ្ចូលច្រើនជាងម្ដង
 DocType: Patient,Married,រៀបការជាមួយ
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ទទួលបានធាតុពី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,ទទួលបានធាតុពី
 DocType: Price List,Price Not UOM Dependant,តម្លៃមិនមែន UOM អ្នកអាស្រ័យ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
@@ -178,12 +174,12 @@
 DocType: Vehicle Service,Brake Oil,ប្រេងហ្វ្រាំង
 DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
 ,Completed Work Orders,បានបញ្ចប់ការបញ្ជាទិញការងារ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវជាប់ពន្ធ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវជាប់ពន្ធ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: BOM,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ជួរដេក # {0}: ឯកសារយោងត្រូវតែជាផ្នែកមួយនៃពាក្យបណ្តឹងទាមទារឬធាតុចូល
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,ជ្រើស Bom
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ជួរដេក # {0}: ឯកសារយោងត្រូវតែជាផ្នែកមួយនៃពាក្យបណ្តឹងទាមទារឬធាតុចូល
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,ជ្រើស Bom
 DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,គ្រប់គ្រងចំនួនទឹកប្រាក់ជាមុនដែលត្រូវបានផ្តល់ឱ្យទៅនិយោជិក
@@ -199,19 +195,19 @@
 DocType: Delivery Trip,Delivery Notification,ការជូនដំណឹងការដឹកជញ្ជូន
 DocType: Journal Entry,Opening Entry,ការបើកចូល
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,មានតែគណនីប្រាក់
-DocType: Employee Loan,Repay Over Number of Periods,សងចំនួនជាងនៃរយៈពេល
+DocType: Loan,Repay Over Number of Periods,សងចំនួនជាងនៃរយៈពេល
 DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
 DocType: Education Settings,Validate Batch for Students in Student Group,ធ្វើឱ្យមានសុពលភាពបាច់សម្រាប់សិស្សនិស្សិតនៅក្នុងពូល
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},គ្មានការកត់ត្រាការឈប់សម្រាកបានរកឃើញសម្រាប់បុគ្គលិក {0} {1} សម្រាប់
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},គ្មានការកត់ត្រាការឈប់សម្រាកបានរកឃើញសម្រាប់បុគ្គលិក {0} {1} សម្រាប់
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
 DocType: Employee Education,Under Graduate,នៅក្រោមបញ្ចប់ការសិក្សា
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,សូមកំណត់ពុម្ពលំនាំដើមសម្រាប់ចាកចេញពីការជូនដំណឹងស្ថានភាពនៅក្នុងការកំណត់ធនធានមនុស្ស។
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,គោលដៅនៅលើ
 DocType: BOM,Total Cost,ការចំណាយសរុប
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,ឥណទានបុគ្គលិក
 DocType: Fee Schedule,Send Payment Request Email,ផ្ញើសំណើការទូទាត់តាមអ៊ីម៉ែល
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,អចលនទ្រព្យ
@@ -231,20 +227,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,មិនបានចុះបញ្ជីដោយជោគជ័យ។
 DocType: Assessment Result,Grade,ថ្នាក់ទី
 DocType: Restaurant Table,No of Seats,ចំនួនកៅអី
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ដើម្បីបន្ថែមប្រធានបទថាមវន្តសូមប្រើស្លាក jinja ដូចជា <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
 DocType: Asset Maintenance Task,Asset Maintenance Task,ភារកិច្ចថែរក្សាទ្រព្យសម្បត្តិ
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
 DocType: Daily Work Summary,Daily Work Summary,សង្ខេបការងារប្រចាំថ្ងៃ
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ជាកក
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ការចំណាយភាគហ៊ុន
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,ការចំណាយភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ជ្រើសគោលដៅឃ្លាំង
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,សូមបញ្ចូលអ៊ីម៉ែលទំនាក់ទំនងដែលពេញចិត្ត
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,សូមបញ្ចូលអ៊ីម៉ែលទំនាក់ទំនងដែលពេញចិត្ត
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,ចូល contra
 DocType: Journal Entry Account,Credit in Company Currency,ឥណទានក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
@@ -265,7 +258,7 @@
 DocType: Customer,Primary Address,អាសយដ្ឋានចម្បង
 DocType: Production Plan,Material Request Detail,សម្ភារៈស្នើសុំពត៌មាន
 DocType: Selling Settings,Default Quotation Validity Days,សុពលភាពតំលៃថ្ងៃខែ
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: Sales Invoice,Change Amount,ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
@@ -275,26 +268,28 @@
 DocType: Driver,Driving License Categories,អាជ្ញាប័ណ្ណបើកបរប្រភេទ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,សូមបញ្ចូលកាលបរិច្ឆេទដឹកជញ្ជូន
 DocType: Depreciation Schedule,Make Depreciation Entry,ធ្វើឱ្យធាតុរំលស់
+DocType: HR Settings,Leave Settings,ចាកចេញពីការកំណត់
 DocType: Appraisal Template Goal,KRA,ក្រៈ
 DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ធ្វើឱ្យបុគ្គលិក
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),របៀបតំឡើង POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,បិទដំណើរការបង្កើតកំណត់ហេតុពេលវេលាប្រឆាំងនឹងការបញ្ជាទិញការងារ។ ប្រតិបត្តិការនឹងមិនត្រូវបានតាមដានប្រឆាំងនឹងការងារ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ការប្រតិបត្តិ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ការប្រតិបត្តិ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
 DocType: Asset Maintenance Log,Maintenance Status,ស្ថានភាពថែទាំ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,ពត៌មានលំអិតសមាជិក
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: អ្នកផ្គត់ផ្គង់គឺត្រូវបានទាមទារប្រឆាំងនឹងគណនីទូទាត់ {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ធាតុនិងតម្លៃ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ម៉ោងសរុប: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ពីកាលបរិច្ឆេទគួរជានៅក្នុងឆ្នាំសារពើពន្ធ។ សន្មត់ថាពីកាលបរិច្ឆេទ = {0}
 DocType: Drug Prescription,Interval,ចន្លោះពេល
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ចំណង់ចំណូលចិត្ត
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ចំណង់ចំណូលចិត្ត
 DocType: Grant Application,Individual,បុគគល
 DocType: Academic Term,Academics User,អ្នកប្រើប្រាស់សាស្ត្រាចារ្យ
 DocType: Cheque Print Template,Amount In Figure,ចំនួនទឹកប្រាក់ក្នុងរូបភាព
-DocType: Employee Loan Application,Loan Info,ព័តមានប្រាក់កម្ចី
+DocType: Loan Application,Loan Info,ព័តមានប្រាក់កម្ចី
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,រយៈពេលនៃតារាងពិន្ទុអ្នកផ្គត់ផ្គង់
 DocType: Share Transfer,Share Transfer,ផ្ទេរភាគហ៊ុន
@@ -310,7 +305,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,គំរូធាតុ
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ជីវគីមី
 DocType: Job Offer,Select Terms and Conditions,ជ្រើសលក្ខខណ្ឌ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,តម្លៃចេញ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,តម្លៃចេញ
 DocType: Woocommerce Settings,Woocommerce Settings,ការកំណត់ Woocommerce
 DocType: Production Plan,Sales Orders,ការបញ្ជាទិញការលក់
 DocType: Purchase Taxes and Charges,Valuation,ការវាយតម្លៃ
@@ -333,10 +328,12 @@
 DocType: Selling Settings,Default Territory,ដែនដីលំនាំដើម
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ទូរទស្សន៏
 DocType: Work Order Operation,Updated via 'Time Log',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ជ្រើសរើសអតិថិជនឬអ្នកផ្គត់ផ្គង់។
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,លេខកូដទិនានុប្បវត្តិ
 DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
 DocType: Company,Enable Perpetual Inventory,បើកការសារពើភ័ណ្ឌជាបន្តបន្ទាប់
+DocType: Bank Guarantee,Charges Incurred,ការគិតប្រាក់ត្រូវបានកើតឡើង
 DocType: Company,Default Payroll Payable Account,បើកប្រាក់បៀវត្សត្រូវបង់លំនាំដើមគណនី
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
 DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
@@ -360,7 +357,7 @@
 DocType: Lab Test,Custom Result,លទ្ធផលផ្ទាល់ខ្លួន
 DocType: Delivery Stop,Contact Name,ឈ្មោះទំនាក់ទំនង
 DocType: Course Assessment Criteria,Course Assessment Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃការពិតណាស់
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,លេខពន្ធ:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,លេខពន្ធ:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,លេខសំគាល់សិស្ស:
 DocType: POS Customer Group,POS Customer Group,ក្រុមផ្ទាល់ខ្លួនម៉ាស៊ីនឆូតកាត
 DocType: Land Unit,Land Unit describing various land assets,អង្គភាពដីធ្លីរៀបរាប់អំពីទ្រព្យសម្បត្តិដីធ្លីផ្សេងៗ
@@ -373,9 +370,8 @@
 ,Open Work Orders,បើកការបញ្ជាទិញការងារ
 DocType: Payment Term,Credit Months,ខែឥណទាន
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,ប្រាក់ចំណេញសុទ្ធមិនអាចតិចជាង 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",ដើម្បីបញ្ឈប់ការផ្ញើការជូនដំណឹងកំហុសម្តងហើយម្តងទៀតពីប្រព័ន្ធយើងបានពិនិត្យវាលដែលបានបិទនៅក្នុងការជាវប្រចាំ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,ស្លឹកមួយឆ្នាំ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,ស្លឹកមួយឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ជួរដេក {0}: សូមពិនិត្យមើលតើជាមុនប្រឆាំងគណនី {1} ប្រសិនបើនេះជាធាតុជាមុន។
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Email Digest,Profit & Loss,ប្រាក់ចំណេញនិងការបាត់បង់
@@ -383,9 +379,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,សូមរៀបចំនិស្សិតក្រោមក្រុមនិស្សិត
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ធាតុធនាគារ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ធាតុធនាគារ
 DocType: Crop,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
@@ -393,7 +389,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ឧបករណ៍វគ្គការបង្កើតក្រុមនិស្សិត
 DocType: Lead,Do Not Contact,កុំទំនាក់ទំនង
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,មនុស្សដែលបានបង្រៀននៅក្នុងអង្គការរបស់អ្នក
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
 DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ Qty
 DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Course Scheduling Tool,Course Start Date,វគ្គសិក្សាបានចាប់ផ្តើមកាលបរិច្ឆេទ
@@ -402,8 +398,8 @@
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
@@ -439,9 +435,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ថ្នាក់អតិបរមា
 DocType: Email Digest,New Quotations,សម្រង់សម្តីដែលថ្មី
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ប័ណ្ណប្រាក់ខែបុគ្គលិកដោយផ្អែកអ៊ីម៉ែលទៅកាន់អ៊ីម៉ែលពេញចិត្តលើជ្រើសក្នុងបុគ្គលិក
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
 DocType: Tax Rule,Shipping County,ការដឹកជញ្ជូនខោនធី
-apps/erpnext/erpnext/config/desktop.py +167,Learn,រៀន
+apps/erpnext/erpnext/config/desktop.py +159,Learn,រៀន
 DocType: Asset,Next Depreciation Date,រំលស់បន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
@@ -451,7 +446,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,មូលប្បទានប័ត្រឆ្នើមនិងប្រាក់បញ្ញើដើម្បីជម្រះ
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
 DocType: Driver,Fleet Manager,កម្មវិធីគ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},ជួរដេក # {0}: {1} មិនអាចមានផលអវិជ្ជមានសម្រាប់ធាតុ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},ជួរដេក # {0}: {1} មិនអាចមានផលអវិជ្ជមានសម្រាប់ធាតុ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
@@ -473,7 +468,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},សូមកំណត់តម្លៃបន្ទប់សណ្ឋាគារលើ {}
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Opening Invoice Creation Tool,Invoice Type,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ដឹកជញ្ជូនចំណាំ
 DocType: Consultation,Encounter Impression,ទទួលបានចំណាប់អារម្មណ៍
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,តម្លៃនៃការលក់អចលនទ្រព្យ
@@ -500,11 +495,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Course Scheduling Tool,Course Scheduling Tool,ឧបករណ៍កាលវិភាគវគ្គសិក្សាបាន
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[បន្ទាន់] កំហុសខណៈពេលបង្កើតការកើតឡើងដដែលៗ% s សម្រាប់% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
 DocType: Land Unit,LInked Analysis,វិភាគ LInked
 DocType: Item Tax,Tax Rate,អត្រាអាករ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,អំឡុងពេលដាក់ពាក្យស្នើសុំមិនអាចឆ្លងកាត់កំណត់ត្រាបែងចែកពីរ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,អំឡុងពេលដាក់ពាក្យស្នើសុំមិនអាចឆ្លងកាត់កំណត់ត្រាបែងចែកពីរ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
@@ -518,7 +512,7 @@
 DocType: Purchase Order,% Received,% បានទទួល
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,បង្កើតក្រុមនិស្សិត
 DocType: Volunteer,Weekends,ចុងសប្តាហ៍
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ចំនួនឥណទានចំណាំ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ចំនួនឥណទានចំណាំ
 DocType: Setup Progress Action,Action Document,ឯកសារសកម្មភាព
 DocType: Chapter Member,Website URL,គេហទំព័ររបស់ URL
 ,Finished Goods,ទំនិញបានបញ្ចប់
@@ -532,6 +526,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext សាកល្បង
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,បន្ថែមធាតុ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ធាតុគុណភាពអធិការកិច្ចប៉ារ៉ាម៉ែត្រ
+DocType: Leave Application,Leave Approver Name,ទុកឱ្យឈ្មោះការអនុម័ត
 DocType: Depreciation Schedule,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",រកប្រាក់ចំណូលដោយកាត់ប្រាក់ខែនិងសមាសភាគផ្សេងទៀត
 DocType: Packed Item,Packed Item,ធាតុ packed
@@ -548,7 +543,7 @@
 DocType: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
 DocType: Healthcare Settings,Require Lab Test Approval,តម្រូវឱ្យមានការធ្វើតេស្តសាកល្បង
 DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,ចំនួនឆ្នើមសរុប
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,ចំនួនឆ្នើមសរុប
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
 DocType: Dosage Strength,Strength,កម្លាំង
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,បង្កើតអតិថិជនថ្មី
@@ -561,7 +556,7 @@
 DocType: Workstation,Consumable Cost,ចំណាយក្នុងការប្រើប្រាស់
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
 DocType: Student Log,Medical,ពេទ្យ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,ធ្វើបច្ចុប្បន្នភាពលេខគណនី
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ការនាំមុខម្ចាស់មិនអាចជាដូចគ្នានាំមុខ
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
@@ -571,11 +566,10 @@
 DocType: Lab Test Template,Single,នៅលីវ
 DocType: Salary Slip,Total Loan Repayment,សងប្រាក់កម្ចីសរុប
 DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
-DocType: Subscription,Yearly,រាល់ឆ្នាំ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
 DocType: Drug Prescription,Dosage,កិតើ
 DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
 DocType: Assessment Plan,Examiner Name,ពិនិត្យឈ្មោះ
 DocType: Lab Test Template,No Result,គ្មានលទ្ធផល
 DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
@@ -584,6 +578,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូមអានសៀវភៅដៃ ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,បង្ហាញស្លឹករបស់សមាជិកនាយកដ្ឋានទាំងអស់នៅក្នុងប្រតិទិន
 DocType: Purchase Invoice,01-Sales Return,01- ការលក់ត្រឡប់
 DocType: Account,Is Group,គឺជាក្រុម
 DocType: Email Digest,Pending Purchase Orders,ការរង់ចាំការបញ្ជាទិញទិញ
@@ -600,13 +595,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,វាលដែលចាំបាច់ - ឆ្នាំសិក្សា
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} មិនត្រូវបានភ្ជាប់ជាមួយនឹង {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ប្ដូរតាមបំណងអត្ថបទណែនាំដែលទៅជាផ្នែកមួយនៃអ៊ីម៉ែលមួយ។ ប្រតិបត្តិការគ្នាមានអត្ថបទណែនាំមួយដាច់ដោយឡែក។
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},សូមកំណត់លំនាំដើមសម្រាប់គណនីបង់ក្រុមហ៊ុននេះបាន {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},សូមកំណត់លំនាំដើមសម្រាប់គណនីបង់ក្រុមហ៊ុននេះបាន {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},កិច្ចការមិនត្រូវបានអនុញ្ញាតឱ្យប្រឆាំងនឹងការងារលំដាប់ {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
 DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
 DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
@@ -629,8 +624,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,បានបម្រុងទុកសម្រាប់លក់
 DocType: Packing Slip,From Package No.,ពីលេខកញ្ចប់
 DocType: Item Attribute,To Range,ដើម្បីជួរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",មិនអាចផ្លាស់ប្តូវិធីសាស្រ្តក្នុងការវាយតម្លៃដូចដែលមានប្រតិបត្តិការប្រឆាំងនឹងធាតុមួយចំនួនដែលមិនមានការវាយតម្លៃវាជាវិធីសាស្រ្តរបស់ខ្លួន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",មិនអាចផ្លាស់ប្តូវិធីសាស្រ្តក្នុងការវាយតម្លៃដូចដែលមានប្រតិបត្តិការប្រឆាំងនឹងធាតុមួយចំនួនដែលមិនមានការវាយតម្លៃវាជាវិធីសាស្រ្តរបស់ខ្លួន
 DocType: Student Report Generation Tool,Attended by Parents,ចូលរួមដោយឪពុកម្តាយ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
 DocType: Patient,AB Positive,AB មានលក្ខណៈវិជ្ជមាន
@@ -639,7 +634,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,កំណត់ត្រាចូលរួម។
 DocType: Salary Structure,Salary Component for timesheet based payroll.,សមាសភាគបញ្ជីបើកប្រាក់ខែដែលមានមូលដ្ឋានលើប្រាក់បៀវត្សសម្រាប់ timesheet ។
 DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
-DocType: Employee Loan,Total Payment,ការទូទាត់សរុប
+DocType: Loan,Total Payment,ការទូទាត់សរុប
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,មិនអាចលុបចោលកិច្ចសម្រួលការសម្រាប់ការងារដែលបានបញ្ចប់។
 DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} ត្រូវបានលុបចោលដូច្នេះសកម្មភាពនេះមិនអាចត្រូវបានបញ្ចប់
@@ -655,15 +650,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ផ្នែកគ្រប់គ្រាន់ដើម្បីកសាង
 DocType: POS Profile User,POS Profile User,អ្នកប្រើប្រាស់បណ្តាញ POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
+DocType: Subscription Invoice,Subscription Invoice,វិក្កយបត្រជាវ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
 DocType: Patient Appointment,Date TIme,ពេលណាត់ជួប
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,មន្រ្តីរដ្ឋបាល
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,មន្រ្តីរដ្ឋបាល
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ការបង្កើតក្រុមហ៊ុននិងពន្ធ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,សូមជ្រើសវគ្គសិក្សា
 DocType: Codification Table,Codification Table,តារាងកំណត់កូដកម្ម
 DocType: Timesheet Detail,Hrs,ម៉ោង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
 DocType: Stock Entry Detail,Difference Account,គណនីមានភាពខុសគ្នា
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN ក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
@@ -688,6 +684,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,គំរូផែនទីគំនូសតាងសាច់ប្រាក់
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
 DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
+DocType: Bank Guarantee,Providing,ការផ្តល់
 DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",មិនត្រូវបានអនុញ្ញាតកំណត់រចនាសម្ព័ន្ធគំរូតេស្តមន្ទីរពិសោធន៍តាមតម្រូវការ
 DocType: Patient,Risk Factors,កត្តាហានិភ័យ
@@ -719,7 +716,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
 DocType: Healthcare Settings,Appointment Confirmation,ការបញ្ជាក់អំពីការណាត់ជួប
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","មិនអាចលុបសៀរៀលគ្មាន {0}, ដូចដែលវាត្រូវបានគេប្រើនៅក្នុងប្រតិបត្តិការភាគហ៊ុន"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","មិនអាចលុបសៀរៀលគ្មាន {0}, ដូចដែលវាត្រូវបានគេប្រើនៅក្នុងប្រតិបត្តិការភាគហ៊ុន"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),បិទ (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ជំរាបសួរ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ផ្លាស់ទីធាតុ
@@ -744,11 +741,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",បានកំណត់លំនាំដើមក្នុងទម្រង់ pos {0} សម្រាប់អ្នកប្រើ {1} រួចបិទលំនាំដើមដោយសប្បុរស
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,តម្លៃបង្គរ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,ដែនដីត្រូវបានទាមទារនៅក្នុងពត៌មាន POS
 DocType: Supplier,Prevent RFQs,រារាំង RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},តារាងប្រាក់បៀវត្សរ៍ត្រូវបានដាក់ស្នើសម្រាប់រយៈពេលចាប់ពី {0} ដល់ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},តារាងប្រាក់បៀវត្សរ៍ត្រូវបានដាក់ស្នើសម្រាប់រយៈពេលចាប់ពី {0} ដល់ {1}
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,តំលៃបូកសរុប
@@ -769,8 +766,9 @@
 DocType: Sales Invoice,Shipping Bill Date,ការដឹកជញ្ជូនថ្ងៃខែ
 DocType: Production Plan,Production Plan,ផែនការផលិតកម្ម
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,បើកឧបករណ៍បង្កើតវិក្កយបត្រ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,ត្រឡប់មកវិញការលក់
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ចំណាំ: ស្លឹកដែលបានបម្រុងទុកសរុប {0} មិនគួរត្រូវបានតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,កំណត់ Qty នៅក្នុងប្រតិបត្តិការដែលមានមូលដ្ឋានលើលេខស៊េរី
 ,Total Stock Summary,សង្ខេបហ៊ុនសរុប
 DocType: Announcement,Posted By,Posted by
 DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
@@ -781,15 +779,15 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,សូមកំណត់ក្រុមហ៊ុន
 DocType: Share Balance,Share Balance,ចែករំលែកសមតុល្យ
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
 DocType: Training Result Employee,Training Result Employee,បុគ្គលិកបណ្តុះបណ្តាលទ្ធផល
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,រាល់សកម្មភាពស្តុកតំរូវអោយមានការកំណត់ឃ្លាំងច្បាស់លាស់។
-DocType: Repayment Schedule,Principal Amount,ប្រាក់ដើម
-DocType: Employee Loan Application,Total Payable Interest,ការប្រាក់ត្រូវបង់សរុប
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ប្រាក់ដើម
+DocType: Loan Application,Total Payable Interest,ការប្រាក់ត្រូវបង់សរុប
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ពិន្ទុសរុប: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ការលក់វិក័យប័ត្រ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},សេចក្តីយោង &amp; ទេយោងកាលបរិច្ឆេទត្រូវបានទាមទារសម្រាប់ {0}
@@ -798,10 +796,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
 DocType: Restaurant Reservation,Restaurant Reservation,កក់ភោជនីយដ្ឋាន
 DocType: Land Unit,Land Unit Name,ឈ្មោះអង្គភាពដី
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,ការសរសេរសំណើរ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,ការសរសេរសំណើរ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ការដកហូតចូលការទូទាត់
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,រុំឡើង
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ជូនដំណឹងដល់អតិថិជនតាមរយៈអ៊ីម៉ែល
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ជូនដំណឹងដល់អតិថិជនតាមរយៈអ៊ីម៉ែល
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,បុគ្គលលក់មួយផ្សេងទៀត {0} មានដែលមានលេខសម្គាល់និយោជិតដូចគ្នា
 DocType: Employee Advance,Claimed Amount,ចំនួនទឹកប្រាក់ដែលបានទាមទារ
 apps/erpnext/erpnext/config/education.py +180,Masters,ថ្នាក់អនុបណ្ឌិត
@@ -819,13 +817,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",គណនីទូទាត់មិនត្រូវបានបង្កើតទេសូមបង្កើតមួយដោយដៃ។
 DocType: Supplier Scorecard,Per Year,ក្នុងមួយឆ្នាំ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,មិនមានសិទ្ធិចូលរៀនក្នុងកម្មវិធីនេះតាម DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 DocType: Sales Invoice,Sales Taxes and Charges,ពន្ធលក់និងការចោទប្រកាន់
 DocType: Employee,Organization Profile,ពត៌មានរបស់អង្គការ
 DocType: Vital Signs,Height (In Meter),កម្ពស់ (គិតជាម៉ែត្រ)
 DocType: Student,Sibling Details,សេចក្ដីលម្អិតបងប្អូនបង្កើត
 DocType: Vehicle Service,Vehicle Service,សេវារថយន្ត
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,បង្កការស្នើរសុំមតិផ្អែកលើលក្ខខណ្ឌដោយស្វ័យប្រវត្តិ។
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,បង្កការស្នើរសុំមតិផ្អែកលើលក្ខខណ្ឌដោយស្វ័យប្រវត្តិ។
 DocType: Employee,Reason for Resignation,ហេតុផលសម្រាប់ការលាលែងពីតំណែង
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,ការវាយតម្លៃការងារសម្រាប់ពុម្ព។
 DocType: Sales Invoice,Credit Note Issued,ចេញផ្សាយឥណទានចំណាំ
@@ -840,10 +837,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,កាលវិភាគថែទាំ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,បុគ្គលិកគ្រប់គ្រងឥណទាន
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ទំនាក់ទំនងជាមួយ Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,កម្មវិធីគ្រប់គ្រង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,កម្មវិធីគ្រប់គ្រង
 DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},សូមកំណត់គណនីនៅក្នុងឃ្លាំង {0}
@@ -885,23 +881,23 @@
 DocType: Item,Material Transfer,សម្ភារៈសេវាផ្ទេរប្រាក់
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,មិនអាចរកឃើញផ្លូវសម្រាប់
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ពិធីបើក (លោកបណ្ឌិត)
+DocType: Loan,Applicant,បេក្ខជន
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ត្រាពេលវេលាប្រកាសត្រូវតែមានបន្ទាប់ {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ដើម្បីបង្កើតឯកសារដែលកើតឡើងដដែលៗ
 ,GST Itemised Purchase Register,ជីអេសធីធាតុទិញចុះឈ្មោះ
 DocType: Course Scheduling Tool,Reschedule,កំណត់ពេលវេលាឡើងវិញ
-DocType: Employee Loan,Total Interest Payable,ការប្រាក់ត្រូវបង់សរុប
+DocType: Loan,Total Interest Payable,ការប្រាក់ត្រូវបង់សរុប
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ពន្ធទូកចោទប្រកាន់ចំនាយ
 DocType: Work Order Operation,Actual Start Time,ជាក់ស្តែងពេលវេលាចាប់ផ្ដើម
 DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,បញ្ចប់
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,មូលដ្ឋាន
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,មូលដ្ឋាន
 DocType: Timesheet,Total Billed Hours,ម៉ោងធ្វើការបង់ប្រាក់សរុប
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
 DocType: Leave Block List Allow,Allow User,អនុញ្ញាតឱ្យអ្នកប្រើ
 DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
 DocType: Company,Gain/Loss Account on Asset Disposal,គណនីកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
 DocType: Vehicle Log,Service Details,សេវាលម្អិត
-DocType: Subscription,Quarterly,ប្រចាំត្រីមាស
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,ដាក់ជាក្រុម
 DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
@@ -912,7 +908,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,តារាងពេលវេលា
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
 DocType: Sales Invoice,Port Code,លេខកូដផត
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,ឃ្លាំងបំរុង
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,ឃ្លាំងបំរុង
 DocType: Lead,Lead is an Organization,Lead គឺជាអង្គការមួយ
 DocType: Guardian Interest,Interest,ការប្រាក់
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ការលក់ជាមុន
@@ -924,12 +920,12 @@
 DocType: Account,Accounts,គណនី
 DocType: Vehicle,Odometer Value (Last),តម្លៃ odometer (ចុងក្រោយ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,គំរូនៃលក្ខណៈវិនិច្ឆ័យពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,ទីផ្សារ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,ទីផ្សារ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
 DocType: Request for Quotation,Get Suppliers,ទទួលបានអ្នកផ្គត់ផ្គង់
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,អ្នកអាចបន្តបានលុះត្រាតែសមាជិកភាពរបស់អ្នកផុតកំណត់ក្នុងរយៈពេល 30 ថ្ងៃ
@@ -939,7 +935,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,ជ្រើសរើសតែអ្នកប្រសិនបើអ្នកបានរៀបចំឯកសារ Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
 DocType: Supplier Scorecard,Per Week,ក្នុងមួយសប្តាហ៍
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,សិស្សសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
@@ -960,9 +956,9 @@
 ,Fichier des Ecritures Comptables [FEC],ឯកសារស្តីអំពីការសរសេរឯកសាររបស់អ្នកនិពន្ធ [FEC]
 DocType: Journal Entry,Credit Card Entry,ចូលកាតឥណទាន
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ក្រុមហ៊ុននិងគណនី
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,នៅក្នុងតម្លៃ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,នៅក្នុងតម្លៃ
 DocType: Asset Settings,Depreciation Options,ជម្រើសរំលស់
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,ពេលប្រកាសមិនត្រឹមត្រូវ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,ពេលប្រកាសមិនត្រឹមត្រូវ
 DocType: Lead,Campaign Name,ឈ្មោះយុទ្ធនាការឃោសនា
 DocType: Hotel Room,Capacity,សមត្ថភាព
 DocType: Selling Settings,Close Opportunity After Days,ឱកាសការងារបន្ទាប់ពីថ្ងៃបិទ
@@ -987,7 +983,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ការទិញរបស់អតិថិជនលំដាប់គ្មាន
 DocType: Budget,Budget Against,ថវិកាប្រឆាំងនឹង
 DocType: Employee,Cell Number,លេខទូរស័ព្ទ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,មិនមាននិយោជិតណាសម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានផ្តល់ទេ។ សូមពិនិត្យមើលថាប្រាក់ខែប្រាក់ខែមិនទាន់ត្រូវបានបង្កើតទេ។
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,មិនមាននិយោជិតណាសម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានផ្តល់ទេ។ សូមពិនិត្យមើលថាប្រាក់ខែប្រាក់ខែមិនទាន់ត្រូវបានបង្កើតទេ។
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
@@ -999,15 +995,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,សូមជ្រើសរើសតារាង
 DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង &#39;អ្នកទទួល&#39;
 DocType: Special Test Items,Particulars,ពិសេស
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព។ វិធានតម្លៃ: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
 DocType: Asset,Maintenance,ការថែរក្សា
+DocType: Subscriber,Subscriber,អតិថិជន
 DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពគម្រោងរបស់អ្នក
 DocType: Item,Maximum sample quantity that can be retained,បរិមាណសំណាកអតិបរិមាដែលអាចរក្សាទុកបាន
@@ -1045,26 +1041,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ការកំណត់លំនាំដើមសម្រាប់កន្រ្តកទំនិញ
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,បន្ថែមពេលវេលា
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ទ្រព្យសកម្មបានបោះបង់ចោលការចូលតាមរយៈទិនានុប្បវត្តិ {0}
-DocType: Employee Loan,Interest Income Account,គណនីប្រាក់ចំណូលការប្រាក់
+DocType: Loan,Interest Income Account,គណនីប្រាក់ចំណូលការប្រាក់
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ពិនិត្យមើលការអញ្ជើញដែលបានផ្ញើ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ជីវបច្ចេកវិទ្យា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ទៅ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ការបង្កើតគណនីអ៊ីម៉ែល
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
 DocType: Asset Repair,Downtime,ពេលវេលាឈប់
 DocType: Account,Liability,ការទទួលខុសត្រូវ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,រយៈពេលសិក្សា:
 DocType: Salary Detail,Do not include in total,កុំរួមបញ្ចូលសរុប
 DocType: Company,Default Cost of Goods Sold Account,តម្លៃលំនាំដើមនៃគណនីទំនិញលក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},បរិមាណគំរូ {0} មិនអាចច្រើនជាងបរិមាណដែលទទួលបាននោះទេ {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Request for Quotation Supplier,Send Email,ផ្ញើអ៊ីមែល
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
 DocType: Item,Max Sample Quantity,បរិមាណគំរូអតិបរមា
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,គ្មានសិទ្ធិ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,គ្មានសិទ្ធិ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,សំណូមពរដែលបានស្នើ
 DocType: Vital Signs,Heart Rate / Pulse,អត្រាចង្វាក់បេះដូង / បេះដូង
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
@@ -1075,11 +1071,10 @@
 DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ការធ្វើតេស្តមន្ទីរពិសោធន៍និងសញ្ញាសំខាន់ៗ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,រកមិនឃើញបុគ្គលិក
-DocType: Subscription,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,ធ្វើបច្ចុប្បន្នភាពគម្រោង។
 DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
 DocType: Land Unit,Tree Details,ដើមឈើលំអិត
@@ -1129,7 +1124,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ក្រុមធាតុទាំងអស់
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
 DocType: Work Order,Item To Manufacture,ធាតុដើម្បីផលិត
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} ស្ថានភាពគឺ {2}
@@ -1143,7 +1137,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",ជ្រើសរើសបើអាសយដ្ឋានដែលបានជ្រើសត្រូវបានកែសម្រួលបន្ទាប់ពីរក្សាទុក
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Item,Hub Publishing Details,ពត៌មានលម្អិតការបោះពុម្ព
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;ការបើក&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;ការបើក&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
 DocType: Lab Test Template,Result Format,ទ្រង់ទ្រាយលទ្ធផល
@@ -1153,7 +1147,7 @@
 DocType: Payroll Entry,Bimonthly,bimonthly
 DocType: Vehicle Service,Brake Pad,បន្ទះហ្វ្រាំង
 DocType: Fertilizer,Fertilizer Contents,មាតិកាជី
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ចំនួនទឹកប្រាក់ដែលលោក Bill
 DocType: Company,Registration Details,ពត៌មានលំអិតការចុះឈ្មោះ
 DocType: Timesheet,Total Billed Amount,ចំនួនទឹកប្រាក់ដែលបានបង់ប្រាក់សរុប
@@ -1167,7 +1161,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,ពិនិត្យមើលកំរិតឥណទានតាមលំដាប់លក់
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,វាយតម្លៃការអនុវត្ត។
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",បើក &#39;ប្រើសម្រាប់ការកន្រ្តកទំនិញដូចដែលត្រូវបានអនុញ្ញាតកន្រ្តកទំនិញនិងគួរតែមានច្បាប់ពន្ធយ៉ាងហោចណាស់មួយសម្រាប់ការកន្រ្តកទំនិញ
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ចូលការទូទាត់ {0} ត្រូវបានផ្សារភ្ជាប់នឹងដីកាសម្រេច {1}, ពិនិត្យមើលថាតើវាគួរតែត្រូវបានដកមុននៅក្នុងវិក័យប័ត្រដែលជានេះ។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ចូលការទូទាត់ {0} ត្រូវបានផ្សារភ្ជាប់នឹងដីកាសម្រេច {1}, ពិនិត្យមើលថាតើវាគួរតែត្រូវបានដកមុននៅក្នុងវិក័យប័ត្រដែលជានេះ។"
 DocType: Sales Invoice Item,Stock Details,ភាគហ៊ុនលំអិត
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,តម្លៃគម្រោង
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,ចំណុចនៃការលក់
@@ -1201,7 +1195,7 @@
 DocType: Restaurant Table,Minimum Seating,កន្លែងអង្គុយអប្បបរមា
 DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
 DocType: Examination Result,Examination Result,លទ្ធផលការពិនិត្យសុខភាព
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,បង្កាន់ដៃទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,បង្កាន់ដៃទិញ
 ,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
@@ -1209,15 +1203,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
 DocType: Work Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូលក់និងដែនដី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,មិនមានធាតុសម្រាប់ផ្ទេរ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,មិនមានធាតុសម្រាប់ផ្ទេរ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),ការបិទ (បើក + សរុប)
 DocType: Journal Entry,Depreciation Entry,ចូលរំលស់
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
 DocType: Crop Cycle,ISO 8016 standard,ស្តង់ដារ ISO 8016
 DocType: Pricing Rule,Rate or Discount,អត្រាឬបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,សំណព្វ
 DocType: Hub Settings,Custom Data,ទិន្នន័យផ្ទាល់ខ្លួន
@@ -1229,9 +1223,9 @@
 DocType: Medical Code,Medical Code Standard,ស្តង់ដារវេជ្ជសាស្ត្រ
 DocType: Soil Texture,Clay Composition (%),សមាសធាតុដីឥដ្ឋ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,សូមរក្សាទុកមុននឹងផ្តល់ភារកិច្ច។
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,តម្លៃឱ្យមានតុល្យភាព
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,តម្លៃឱ្យមានតុល្យភាព
 DocType: Lab Test,Lab Technician,អ្នកបច្ចេកទេសខាងមន្ទីរពិសោធន៍
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃការលក់
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,តារាងតម្លៃការលក់
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ប្រសិនបើបានគូសធីក, អតិថិជននឹងត្រូវបានបង្កើត, ធ្វើផែនទីទៅអ្នកជំងឺ។ វិក័យប័ត្រអ្នកជំងឺនឹងត្រូវបានបង្កើតឡើងប្រឆាំងនឹងអតិថិជននេះ។ អ្នកក៏អាចជ្រើសរើសអតិថិជនដែលមានស្រាប់នៅពេលបង្កើតអ្នកជម្ងឺ។"
 DocType: Bank Reconciliation,Account Currency,រូបិយប័ណ្ណគណនី
@@ -1239,16 +1233,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,សូមនិយាយពីគណនីបិទជុំទីក្នុងក្រុមហ៊ុន
 DocType: Purchase Receipt,Range,ជួរ
 DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
 DocType: Item Barcode,Item Barcode,កូដផលិតផលធាតុ
 DocType: Woocommerce Settings,Endpoints,ចំណុចបញ្ចប់
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",ត្រូវបានបង្កើត។ ប្រសិនបើបានពន្យាពេលអ្នកត្រូវផ្លាស់ប្តូរវាល &quot;ធ្វើម្តងទៀតនៅក្នុងខែ&quot; ដោយដៃនេះ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
 DocType: Share Transfer,From Folio No,ពី Folio លេខ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណទានមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
@@ -1283,16 +1275,17 @@
 DocType: Asset,Available-for-use Date,កាលបរិច្ឆេទដែលអាចប្រើប្រាស់បាន
 DocType: Guardian,Guardian Name,ឈ្មោះ Guardian បាន
 DocType: Cheque Print Template,Has Print Format,មានទ្រង់ទ្រាយបោះពុម្ព
-DocType: Employee Loan,Sanctioned,អនុញ្ញាត
+DocType: Loan,Sanctioned,អនុញ្ញាត
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណដែលមិនទាន់បានត្រូវបង្កើតឡើង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
 DocType: Crop Cycle,Crop Cycle,វដ្តដំណាំ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
 DocType: Student Admission,Publish on website,បោះពុម្ពផ្សាយនៅលើគេហទំព័រ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,វិក័យប័ត្រក្រុមហ៊ុនផ្គត់ផ្គង់កាលបរិច្ឆេទមិនអាចច្រើនជាងកាលបរិច្ឆេទប្រកាស
+DocType: Subscription,Cancelation Date,កាលបរិច្ឆេទបោះបង់
 DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
 DocType: Agriculture Task,Agriculture Task,កិច្ចការកសិកម្ម
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ចំណូលប្រយោល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,ចំណូលប្រយោល
 DocType: Student Attendance Tool,Student Attendance Tool,ឧបករណ៍វត្តមានរបស់សិស្ស
 DocType: Restaurant Menu,Price List (Auto created),បញ្ជីតម្លៃ (បង្កើតដោយស្វ័យប្រវត្តិ)
 DocType: Cheque Print Template,Date Settings,ការកំណត់កាលបរិច្ឆេទ
@@ -1318,6 +1311,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,ម៉ែត្រ
 DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,កាលបរិច្ឆេទសាកល្បងរបស់មន្ទីរពិសោធន៍មិនអាចនៅមុនកាលបរិច្ឆេទប្រមូលបានទេ
+DocType: Subscription Plan,Cost,តម្លៃ
 DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
 DocType: Expense Claim,Total Advance Amount,ចំនួនបុរេប្រទានសរុប
 DocType: Delivery Stop,Estimated Arrival,ការមកដល់ប៉ាន់ស្មាន
@@ -1329,14 +1323,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
 DocType: Timesheet Detail,Bill,វិក័យប័ត្រ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,សេត
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,សេត
 DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,អ្នកអាចជ្រើសជម្រើសអតិបរមាមួយពីបញ្ជីប្រអប់ធីក។
 DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
 DocType: Item,Automatically Create New Batch,បង្កើតដោយស្វ័យប្រវត្តិថ្មីបាច់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),ការផ្តល់ {0} ទៅ {1} (ជួរដេក {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),ការផ្តល់ {0} ទៅ {1} (ជួរដេក {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,ធ្វើឱ្យ
 DocType: Student Admission,Admission Start Date,ការទទួលយកដោយការចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,បុគ្គលិកថ្មី
@@ -1352,7 +1346,7 @@
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
 DocType: Repayment Schedule,Balance Loan Amount,តុល្យភាពប្រាក់កម្ចីចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,វគ្គកាលវិភាគ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ជម្រើសភាគហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ជម្រើសភាគហ៊ុន
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,បិទដំណើរការការទិញព័ត៌មានលម្អិតចុងក្រោយក្នុងលំដាប់ទិញ
 DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
@@ -1371,11 +1365,12 @@
 DocType: Packing Slip Item,Packing Slip Item,វេចខ្ចប់ធាតុគ្រូពេទ្យប្រហែលជា
 DocType: Purchase Invoice,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},សូមបញ្ជាក់ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,ការបង្កើតវ៉ារ្យង់ត្រូវបានរៀបជាជួរ។
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},សេចក្តីសង្ខេបការងារសម្រាប់ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ការអនុញ្ញាតអ្នកអនុម័តដំបូងនៅក្នុងបញ្ជីនឹងត្រូវបានកំណត់ជាលំនាំដើមទុកអ្នកអនុម័ត។
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Plan,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
 DocType: Training Event,Self-Study,ស្វ័យសិក្សា
@@ -1387,7 +1382,7 @@
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
 DocType: Asset Maintenance,Maintenance Manager Name,ឈ្មោះអ្នកគ្រប់គ្រងថែទាំ
 DocType: Agriculture Task,Urgent,បន្ទាន់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},សូមបញ្ជាក់លេខសម្គាល់ជួរដេកដែលមានសុពលភាពសម្រាប់ជួរ {0} ក្នុងតារាង {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},សូមបញ្ជាក់លេខសម្គាល់ជួរដេកដែលមានសុពលភាពសម្រាប់ជួរ {0} ក្នុងតារាង {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,មិនអាចស្វែងរកអថេរ:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,សូមជ្រើសវាលដើម្បីកែសម្រួលពីលេខ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,មិនអាចជាទ្រព្យសម្បត្តិអសកម្ម ពីព្រោះមុខទំនិញនេះមានប្រត្តិបត្រការនៅក្នុង Stock Ledger  រួចហើយ។
@@ -1399,7 +1394,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,ឈ្មោះគំរូអធិការកិច្ចគុណភាព
 DocType: Project,First Email,អ៊ីម៉ែលដំបូង
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ចំនួនលក់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ចំនួនលក់
 DocType: Repayment Schedule,Interest Amount,ចំនួនការប្រាក់
 DocType: Serial No,Creation Document No,ការបង្កើតឯកសារគ្មាន
 DocType: Share Transfer,Issue,បញ្ហា
@@ -1413,10 +1408,10 @@
 DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
 ,Projected Quantity as Source,បរិមាណដែលត្រូវទទួលទានបានព្យាករថាជាប្រភព
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ដំណើរដឹកជញ្ជូន
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ដំណើរដឹកជញ្ជូន
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ប្រភេទផ្ទេរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,ចំណាយការលក់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,ចំណាយការលក់
 DocType: Consultation,Diagnosis,ការធ្វើរោគវិនិច្ឆ័យ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ទិញស្ដង់ដារ
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
@@ -1425,12 +1420,13 @@
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,លេខកូដតំបន់
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ជ្រើសរើសគណនីប្រាក់ចំណូលក្នុងការប្រាក់ {0}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
 DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
 DocType: Item,Default Supplier,ហាងទំនិញលំនាំដើម
 DocType: Manufacturing Settings,Over Production Allowance Percentage,លើសពីភាគរយសំវិធានធនផលិតកម្ម
-DocType: Employee Loan,Repayment Schedule,កាលវិភាគសងប្រាក់
+DocType: Loan,Repayment Schedule,កាលវិភាគសងប្រាក់
 DocType: Shipping Rule Condition,Shipping Rule Condition,លក្ខខណ្ឌវិធានការដឹកជញ្ជូន
 DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
@@ -1444,7 +1440,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
 DocType: Education Settings,Attendance Freeze Date,ការចូលរួមកាលបរិច្ឆេទបង្កក
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,រាយមួយចំនួននៃការផ្គត់ផ្គង់របស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,មើលផលិតផលទាំងអស់
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,មើលផលិតផលទាំងអស់
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),អ្នកដឹកនាំការកំរិតអាយុអប្បបរមា (ថ្ងៃ)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,BOMs ទាំងអស់
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},ប្រភេទសណ្ឋាគារប្រភេទ {0} មិនមាននៅលើ {1}
@@ -1452,14 +1448,16 @@
 DocType: Expense Claim,From Employee,ពីបុគ្គលិក
 DocType: Driver,Cellphone Number,លេខទូរស័ព្ទដៃ
 DocType: Project,Monitor Progress,វឌ្ឍនភាពម៉ូនីទ័រ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
 DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
+DocType: Supplier Quotation,Auto Repeat Section,ធ្វើផ្នែកម្តងទៀតដោយស្វ័យប្រវត្តិ
 DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
 DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
 DocType: Program Enrollment,Transportation,ការដឹកជញ្ជូន
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
+DocType: Department Approver,Department Approver,អ្នកអនុម័តមន្ទីរ
 DocType: SMS Center,Total Characters,តួអក្សរសរុប
 DocType: Employee Advance,Claimed,បានទាមទារ
 DocType: Crop,Row Spacing,ជួរដេកគម្លាត
@@ -1469,6 +1467,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការទូទាត់វិក័យប័ត្រផ្សះផ្សានិងយុត្តិធម៌
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,ការចូលរួមចំណែក%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ជាមួយការកំណត់ការទិញប្រសិនបើមានការទិញលំដាប់ទាមទារ == &quot;បាទ&quot; ហើយបន្ទាប់មកសម្រាប់ការបង្កើតការទិញវិក័យប័ត្រ, អ្នកប្រើត្រូវការដើម្បីបង្កើតការបញ្ជាទិញជាលើកដំបូងសម្រាប់ធាតុ {0}"
+,HSN-wise-summary of outward supplies,HSN - សង្ខេបសង្ខេបនៃការផ្គត់ផ្គង់ខាងក្រៅ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,លេខចុះបញ្ជីក្រុមហ៊ុនសម្រាប់ជាឯកសារយោងរបស់អ្នក។ ចំនួនពន្ធល
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
@@ -1482,7 +1481,7 @@
 DocType: Setup Progress Action,Action Name,ឈ្មោះសកម្មភាព
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ការចាប់ផ្តើមឆ្នាំ
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},លេខ 2 ខ្ទង់នៃ GSTIN គួរតែផ្គូផ្គងជាមួយលេខរដ្ឋ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
@@ -1500,26 +1499,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,វាលនឹងត្រូវបានចំលងតែនៅពេលនៃការបង្កើតប៉ុណ្ណោះ។
 DocType: Setup Progress Action,Domains,ដែន
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""កាលបរិច្ឆេទចាប់ផ្តើមជាក់ស្តែង"" មិនអាចធំជាងកាលបរិច្ឆេទបញ្ចប់ """
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ការគ្រប់គ្រង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,ការគ្រប់គ្រង
 DocType: Cheque Print Template,Payer Settings,ការកំណត់អ្នកចេញការចំណាយ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
 DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ប្រយ័ត្ន
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',ថ្ងៃចាប់ផ្ដើមធំជាងថ្ងៃចុងនៅក្នុងភារកិច្ច &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
 DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ក្រមធាតុមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,ក្រមធាតុមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបានលេខបាច់
 DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
-DocType: Employee Loan,Partially Disbursed,ផ្តល់ឱ្រយអតិថិជនដោយផ្នែក
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,ផ្តល់ព័ត៌មាន។
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,ផ្តល់ព័ត៌មាន។
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,អ្នកមិនអាចចាប់ផ្តើមឡើងវិញនូវការជាវដែលមិនត្រូវបានលុបចោលទេ។
 DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
 DocType: Fee Validity,Valid Till,មានសុពលភាពរហូតដល់
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,កិច្ចប្រជុំឪពុកម្ដាយសរុប
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
@@ -1532,7 +1531,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ជួរដេក # {0}: បានច្រានចោលមិនអាច Qty បញ្ចូលនៅក្នុងការទិញត្រឡប់មកវិញ
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ការផ្លាស់ប្តូរក្រុមអតិថិជនសម្រាប់អតិថិជនដែលបានជ្រើសមិនត្រូវបានអនុញ្ញាត។
 ,Purchase Order Items To Be Billed,ការបញ្ជាទិញធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,ធ្វើបច្ចុប្បន្នភាពម៉ោងមកដល់។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ធ្វើបច្ចុប្បន្នភាពម៉ោងមកដល់។
 DocType: Program Enrollment Tool,Enrollment Details,សេចក្ដីលម្អិតនៃការចុះឈ្មោះចូលរៀន
 DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,សូមជ្រើសរើសអតិថិជន
@@ -1551,18 +1550,20 @@
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
 DocType: Purchase Order,Group same items,ធាតុរបស់ក្រុមដូចគ្នា
 DocType: Purchase Invoice,Disable Rounded Total,បិទការសរុបមូល
-DocType: Employee Loan Application,Repayment Info,ព័តសងប្រាក់
+DocType: Department,Parent Department,នាយកដ្ឋានឪពុកម្តាយ
+DocType: Loan Application,Repayment Info,ព័តសងប្រាក់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""ទិន្នន័យ"" មិនអាចទទេ"
 DocType: Maintenance Team Member,Maintenance Role,តួនាទីថែទាំ
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
 ,Trial Balance,អង្គជំនុំតុល្យភាព
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ការរៀបចំបុគ្គលិក
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,អ្នកប្រើប្រាស់កក់សណ្ឋាគារ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ស្រាវជ្រាវ
+DocType: Subscription Settings,Subscription Settings,ការកំណត់ការជាវប្រចាំ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ស្រាវជ្រាវ
 DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
 DocType: Announcement,All Students,និស្សិតទាំងអស់
@@ -1573,19 +1574,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 DocType: Crop Cycle,Less than a year,តិចជាងមួយឆ្នាំ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,លេខទូរស័ព្ទចល័តរបស់សិស្ស
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,នៅសល់នៃពិភពលោក
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
 DocType: Crop,Yield UOM,ទិន្នផល UOM
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
 DocType: Item,Is Item from Hub,គឺជាធាតុពី Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ជួរដេក {0}: ប្រភេទសកម្មភាពគឺជាការចាំបាច់។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ភាគលាភបង់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ភាគលាភបង់ប្រាក់
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,គណនេយ្យសៀវភៅធំ
 DocType: Stock Reconciliation,Difference Amount,ចំនួនទឹកប្រាក់ដែលមានភាពខុសគ្នា
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},បណ្ឌិត {0} បើកទុកនៅ {1}
 DocType: Purchase Invoice,Reverse Charge,បញ្ច្រាសបញ្ច្រាស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
 DocType: Purchase Invoice,05-Change in POS,05- ប្តូរ POS
 DocType: Vehicle Log,Service Detail,សេវាលំអិត
 DocType: BOM,Item Description,ធាតុការពិពណ៌នាសង្ខេប
@@ -1600,12 +1601,12 @@
 DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
 ,Student and Guardian Contact Details,សិស្សនិងអាណាព្យាបាលទំនាក់ទំនងលំអិត
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ជួរដេក {0}: សម្រាប់ផ្គត់ផ្គង់ {0} អាសយដ្ឋានអ៊ីម៉ែលត្រូវបានទាមទារដើម្បីផ្ញើអ៊ីម៉ែល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,មើលមជ្ឈមណ្ឌល
 ,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
 DocType: Patient Appointment,More Info,ពត៌មានបន្ថែម
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុនៅក្នុងជួរដេក {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុនៅក្នុងជួរដេក {0}
 DocType: Supplier Scorecard,Scorecard Actions,សកម្មភាពពិន្ទុ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ឧទាហរណ៍: ថ្នាក់អនុបណ្ឌិតវិទ្យាសាស្រ្តកុំព្យូទ័រ
 DocType: Purchase Invoice,Rejected Warehouse,ឃ្លាំងច្រានចោល
@@ -1615,7 +1616,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ដល់
 DocType: Supplier Quotation Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
@@ -1624,9 +1625,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,វេជ្ជបញ្ជាសាកល្បង
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ខ្នាតតូច
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ខ្នាតតូច
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,បើកធាតុឧបករណ៍បង្កើតវិក័យប័ត្រ
 DocType: Education Settings,Employee Number,ចំនួនបុគ្គលិក
+DocType: Subscription Settings,Cancel Invoice After Grace Period,បោះបង់ចោលវិក្កយបត្របន្ទាប់ពីរយៈពេលព្រះគុណ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ករណីគ្មានការ (s) បានរួចហើយនៅក្នុងការប្រើប្រាស់។ សូមព្យាយាមពីករណីគ្មាន {0}
 DocType: Project,% Completed,% បានបញ្ចប់
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
@@ -1640,7 +1642,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ការធ្វើតេស្តមន្ទីរពិសោធន៍រយៈពេល
 DocType: Email Digest,Add Quote,បន្ថែមសម្រង់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ UOM បានទាមទារសម្រាប់ការ UOM: {0} នៅក្នុងធាតុ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ការចំណាយដោយប្រយោល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,ការចំណាយដោយប្រយោល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ជួរដេក {0}: Qty គឺជាការចាំបាច់
 DocType: Agriculture Analysis Criteria,Agriculture,កសិកម្ម
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យមេ
@@ -1670,16 +1672,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ឧបករណ៍រាជធានី
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ឧបករណ៍រាជធានី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,សូមកំណត់កូដធាតុជាមុនសិន
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
+DocType: Subscription Plan,Billing Interval Count,រាប់ចន្លោះពេលចេញវិក្កយបត្រ
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
 DocType: Antibiotic,Antibiotic,អង់ទីប៊ីយ៉ូទិក
 ,Team Updates,ក្រុមការងារការធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,សម្រាប់ផ្គត់ផ្គង់
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
 DocType: Purchase Invoice,Grand Total (Company Currency),តំលៃបូកសរុប (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,បង្កើតការបោះពុម្ពទ្រង់ទ្រាយ
@@ -1705,7 +1708,7 @@
 DocType: POS Item Group,POS Item Group,គ្រុបធាតុម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ធាតុជំនួសមិនត្រូវដូចគ្នានឹងលេខកូដធាតុទេ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06- ការបញ្ចប់នៃការវាយតម្លៃបណ្តោះអាសន្ន
 DocType: Salary Slip,Bank Account No.,លេខគណនីធនាគារ
@@ -1721,7 +1724,7 @@
 DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,សំណើរសម្រាប់ការផ្គត់ផ្គង់សម្រង់
 DocType: Healthcare Settings,Registration Message,ការចុះឈ្មោះសារ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ផ្នែករឹង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ផ្នែករឹង
 DocType: Prescription Dosage,Prescription Dosage,ឱសថតាមវេជ្ជបញ្ជា
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
@@ -1752,7 +1755,7 @@
 DocType: Project,Start and End Dates,ចាប់ផ្តើមនិងបញ្ចប់កាលបរិច្ឆេទ
 ,Delivered Items To Be Billed,ធាតុដែលបានផ្តល់ជូននឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ការបើកចំហ Bom {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
 DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
 DocType: Project Update,Great/Quickly,ដ៏អស្ចារ្យ / យ៉ាងលឿន
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1761,8 +1764,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,សូមជ្រើសជំនាន់សម្រាប់ធាតុបាច់
 DocType: Asset,Depreciation Schedules,កាលវិភាគរំលស់
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,គណនីខាងក្រោមអាចត្រូវបានជ្រើសរើសនៅក្នុងការកំណត់ GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,គណនីខាងក្រោមអាចត្រូវបានជ្រើសរើសនៅក្នុងការកំណត់ GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
 DocType: Activity Cost,Projects,គម្រោងការ
 DocType: Payment Request,Transaction Currency,រូបិយប័ណ្ណប្រតិបត្តិការ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},ពី {0} | {1} {2}
@@ -1773,6 +1776,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,ជាមធ្យមប្រចាំថ្ងៃចេញ
 DocType: POS Profile,Campaign,យុទ្ធនាការឃោសនា
 DocType: Supplier,Name and Type,ឈ្មោះនិងប្រភេទ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
 DocType: Physician,Contacts and Address,ទំនាក់ទំនងនិងអាសយដ្ឋាន
 DocType: Purchase Invoice,Contact Person,ទំនាក់ទំនង
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
@@ -1786,19 +1790,20 @@
 DocType: Student Admission,Eligibility and Details,សិទ្ធិនិងព័ត៌មានលម្អិត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},អតិបរមា: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ចាប់ពី Datetime
 DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
 apps/erpnext/erpnext/config/support.py +17,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",សំណើរសម្រាប់សម្រង់ត្រូវបានបិទដើម្បីចូលដំណើរការបានពីវិបផតថលសម្រាប់ការកំណត់វិបផតថលពិនិត្យបន្ថែមទៀត។
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ប័ណ្ណពិន្ទុរបស់អ្នកផ្គត់ផ្គង់អង្កេតអថេរ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
 DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
 DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,មានកំហុសក្នុងការបង្កើតកាលវិភាគវគ្គសិក្សា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,អ្នកអនុម័តចំណាយលើកដំបូងនៅក្នុងបញ្ជីនឹងត្រូវបានកំណត់ជាអ្នកអនុម័តចំណាយ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,មិនអាចជាធំជាង 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
@@ -1819,14 +1824,15 @@
 DocType: Package Code,Package Code,កូដកញ្ចប់
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,សិស្ស
 DocType: Purchase Invoice,Company GSTIN,ក្រុមហ៊ុន GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",តារាងពន្ធលើការដែលបានទៅយកពីព័ត៌មានលម្អិតធាតុដែលម្ចាស់ជាខ្សែអក្សរមួយនិងបានរក្សាទុកនៅក្នុងវាលនេះ។ ត្រូវបានប្រើសម្រាប់ការបង់ពន្ធនិងបន្ទុក
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
 DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ទុកអ្នកអនុម័តជាចាំបាច់ក្នុងការចាកចេញពីកម្មវិធី
 DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
 DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
@@ -1854,15 +1860,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,រយៈពេលបង់ប្រាក់នៅជួរដេក {0} អាចមានស្ទួន។
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),កសិកម្ម (បែតា)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ការិយាល័យសំរាប់ជួល
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ការិយាល័យសំរាប់ជួល
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
 DocType: Disease,Common Name,ឈ្មោះទូទៅ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,នាំចូលបានបរាជ័យ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,គ្មានអាសយដ្ឋានបន្ថែមនៅឡើយទេ។
 DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយការងារការងារហួរ
 DocType: Vital Signs,Blood Pressure,សម្ពាធឈាម
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,អ្នកវិភាគ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,អ្នកវិភាគ
 DocType: Item,Inventory,សារពើភ័ណ្ឌ
 DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
 DocType: Quality Inspection,QI-,QI-
@@ -1872,15 +1878,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ធ្វើឱ្យមានសុពលភាពចុះឈ្មោះសិស្សនៅក្នុងវគ្គសិក្សាសម្រាប់ក្រុមសិស្ស
 DocType: Notification Control,Expense Claim Rejected,ពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
 DocType: Item,Item Attribute,គុណលក្ខណៈធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,រដ្ឋាភិបាល
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,រដ្ឋាភិបាល
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ពាក្យបណ្តឹងការចំណាយ {0} រួចហើយសម្រាប់រថយន្តចូល
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ឈ្មោះវិទ្យាស្ថាន
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលការទូទាត់សង
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលការទូទាត់សង
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,វ៉ារ្យ៉ង់ធាតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,ការផ្តល់សេវា
 DocType: HR Settings,Email Salary Slip to Employee,អ៊ីម៉ែលទៅឱ្យបុគ្គលិកគ្រូពេទ្យប្រហែលជាប្រាក់ខែ
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ជ្រើសផ្គត់ផ្គង់អាចធ្វើបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ជ្រើសផ្គត់ផ្គង់អាចធ្វើបាន
 DocType: Sales Invoice,Source,ប្រភព
 DocType: Customer,"Select, to make the customer searchable with these fields","ជ្រើស, ដើម្បីធ្វើឱ្យអតិថិជនអាចស្វែងរកបានជាមួយវាលទាំងនេះ"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,បង្ហាញបានបិទ
@@ -1897,7 +1903,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
 DocType: Program Course,Program Course,វគ្គសិក្សាកម្មវិធី
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
 DocType: Homepage,Company Tagline for website homepage,ក្រុមហ៊ុនឃ្លាអត្ថបទសម្រាប់គេហទំព័រគេហទំព័រ
 DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,គេយក
@@ -1927,10 +1933,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,ព័ត៌មានលំអិតអំពីការចងចាំ
 DocType: Leave Block List,Block Holidays on important days.,ប្រតិទិនឈប់សម្រាកនៅថ្ងៃដ៏សំខាន់ប្លុក។
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),សូមបញ្ចូលតម្លៃលទ្ធផលដែលត្រូវការទាំងអស់
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,គណនីសង្ខេបទទួល
-DocType: Employee Loan,Monthly Repayment Amount,ចំនួនទឹកប្រាក់សងប្រចាំខែ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,គណនីសង្ខេបទទួល
+DocType: Loan,Monthly Repayment Amount,ចំនួនទឹកប្រាក់សងប្រចាំខែ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,បើកវិក្កយបត្រ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
 DocType: UOM,UOM Name,ឈ្មោះ UOM
 DocType: GST HSN Code,HSN Code,កូដ HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,ចំនួនទឹកប្រាក់ចំែណក
@@ -1952,7 +1958,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},អ្នកប្រើ {0} ត្រូវបានកំណត់ទៅគ្រូពេទ្យ {1} រួចហើយ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,ប្រអប់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,ចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),សុខភាព (បែតា)
@@ -1979,7 +1986,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,គ្មានធាតុខ្ចប់
 DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
-DocType: Employee Loan,Repayment Method,វិធីសាស្រ្តការទូទាត់សង
+DocType: Loan,Repayment Method,វិធីសាស្រ្តការទូទាត់សង
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",ប្រសិនបើបានធីកទំព័រដើមនេះនឹងត្រូវបានក្រុមធាតុលំនាំដើមសម្រាប់គេហទំព័រនេះ
 DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
@@ -1988,7 +1995,7 @@
 DocType: Asset Maintenance Task,Certificate Required,វិញ្ញាបនប័ត្រត្រូវបានទាមទារ
 DocType: Company,Default Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកលំនាំដើម
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ជួរដេក {0}: ពីពេលវេលានិងពេលវេលានៃ {1} ត្រូវបានត្រួតស៊ីគ្នាជាមួយ {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,បំណុលភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,បំណុលភាគហ៊ុន
 DocType: Purchase Invoice,Supplier Warehouse,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនងទូរស័ព្ទគ្មាន
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,ជ្រើសរើសក្រុមហ៊ុន
@@ -1996,7 +2003,7 @@
 DocType: Student Report Generation Tool,Print Section,បោះពុម្ពផ្នែក
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,អ្នកប្រើ {0} មិនមានប្រវត្តិរូប POS លំនាំដើមទេ។ ពិនិត្យមើលលំនាំដើមនៅជួរដេក {1} សម្រាប់អ្នកប្រើនេះ។
 DocType: Student Group,Set 0 for no limit,កំណត់ 0 សម្រាប់គ្មានដែនកំណត់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,ជួរដេក {idx}: {វាល} ត្រូវបានទាមទារដើម្បីបង្កើតវិក័យបត្រ {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,អាសយដ្ឋានបឋមសិក្សានិងព័ត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
@@ -2007,10 +2014,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,សូមជ្រើសរើសយ៉ាងហោចណាស់ដែនមួយ។
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
 DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,ស្វែងរកធាតុ
 DocType: Payment Schedule,Payment Amount,ចំនួនទឹកប្រាក់ការទូទាត់
@@ -2020,7 +2027,7 @@
 DocType: Assessment Plan,Grading Scale,ធ្វើមាត្រដ្ឋានពិន្ទុ
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,បានបញ្ចប់រួចទៅហើយ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ភាគហ៊ុននៅក្នុងដៃ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,ភាគហ៊ុននៅក្នុងដៃ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,ការនាំចូលដែលទទួលបានជោគជ័យ!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
@@ -2031,17 +2038,16 @@
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
 DocType: Customer,Customer POS Id,លេខសម្គាល់អតិថិជនម៉ាស៊ីនឆូតកាត
 DocType: Account,Account Name,ឈ្មោះគណនី
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,សៀរៀលគ្មាន {0} {1} បរិមាណមិនអាចធ្វើជាប្រភាគ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,សៀរៀលគ្មាន {0} {1} បរិមាណមិនអាចធ្វើជាប្រភាគ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,សូមបញ្ចូលអាសយដ្ឋានម៉ាស៊ីនបម្រើ Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
 DocType: Share Balance,To No,ទេ
-DocType: Subscription,Reference Document,ឯកសារជាឯកសារយោង
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ត្រូវបានលុបចោលឬបញ្ឈប់
 DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
-DocType: Grant Application,Applicant Type,ប្រភេទបេក្ខជន
+DocType: Loan,Applicant Type,ប្រភេទបេក្ខជន
 DocType: Purchase Invoice,03-Deficiency in services,03 - កង្វះខាតក្នុងសេវា
 DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
 DocType: Healthcare Settings,Default Medical Code Standard,ស្តង់ដារវេជ្ជសាស្ត្រលំនាំដើម
@@ -2052,13 +2058,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% បានបង់ប្រាក់
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,រក្សា Qty
 DocType: Party Account,Party Account,គណនីគណបក្ស
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,ធនធានមនុស្ស
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,ធនធានមនុស្ស
 DocType: Lead,Upper Income,ផ្នែកខាងលើប្រាក់ចំណូល
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ច្រានចោល
 DocType: Journal Entry Account,Debit in Company Currency,ឥណពន្ធក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
 DocType: BOM Item,BOM Item,ធាតុ Bom
 DocType: Appraisal,For Employee,សម្រាប់បុគ្គលិក
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ធ្វើឱ្យការចំណាយធាតុ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ធ្វើឱ្យការចំណាយធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
 DocType: Company,Default Values,តម្លៃលំនាំដើម
 DocType: Membership,INR,INR
@@ -2087,10 +2093,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),សរុប (ដោយគ្មានពន្ធ)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,អ្នកដឹកនាំការរាប់
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ត្រូវតែធំជាង 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,មានភាគហ៊ុន
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,មានភាគហ៊ុន
 DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,លទ្ធកម្ម
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,វាលដែលចាំបាច់ - កម្មវិធី
 DocType: Special Test Template,Result Component,លទ្ធផលសមាសភាគ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,បណ្តឹងធានា
@@ -2110,7 +2116,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងស្លឹកជាស្លឹក
 DocType: Sales Invoice,Packed Items,ធាតុ packed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ពាក្យបណ្តឹងប្រឆាំងនឹងលេខសៀរៀលធានា
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;សរុប&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;សរុប&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,បើកការកន្រ្តកទំនិញ
 DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2128,10 +2134,10 @@
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,អះអាងសកម្មភាព
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ការបំពេញ
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,មើលក្នុងកន្ត្រកទំនិញ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ចំណាយទីផ្សារ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,មិនអាចបង្កើតលក្ខណៈវិនិច្ឆ័យស្តង់ដារបានទេ។ សូមប្តូរឈ្មោះលក្ខណៈវិនិច្ឆ័យ
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
@@ -2153,9 +2159,9 @@
 DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
 DocType: Material Request,Transferred,ផ្ទេរ
 DocType: Vehicle,Doors,ទ្វារ
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ប្រមូលកម្រៃសម្រាប់ការចុះឈ្មោះអ្នកជំងឺ
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,មិនអាចផ្លាស់ប្តូរគុណលក្ខណៈបន្ទាប់ពីការធ្វើប្រតិបត្តិការភាគហ៊ុន។ បង្កើតធាតុថ្មីនិងផ្ទេរភាគហ៊ុនទៅធាតុថ្មី
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,មិនអាចផ្លាស់ប្តូរគុណលក្ខណៈបន្ទាប់ពីការធ្វើប្រតិបត្តិការភាគហ៊ុន។ បង្កើតធាតុថ្មីនិងផ្ទេរភាគហ៊ុនទៅធាតុថ្មី
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,បែកគ្នាពន្ធ
 DocType: Packing Slip,PS-,PS-
@@ -2191,11 +2197,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 DocType: Purchase Invoice Item,Batch No,បាច់គ្មាន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,បុព្វលាភបុគ្គលិក
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
 DocType: Student Group Instructor,Student Group Instructor,ក្រុមនិស្សិតគ្រូបង្រៀន
 DocType: Grant Application,Assessment  Mark (Out of 10),ការវាយតម្លៃសម្គាល់ (ក្នុងចំណោម 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ទូរស័ព្ទដៃគ្មាន
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ដើមចម្បង
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
@@ -2204,15 +2211,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
 DocType: Email Digest,Annual Expenses,ការចំណាយប្រចាំឆ្នាំ
 DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
 DocType: Sales Team,Contribution to Net Total,ការចូលរួមចំណែកក្នុងការសុទ្ធសរុប
 DocType: Sales Invoice Item,Customer's Item Code,ក្រមធាតុរបស់អតិថិជន
 DocType: Stock Reconciliation,Stock Reconciliation,ភាគហ៊ុនការផ្សះផ្សា
 DocType: Territory,Territory Name,ឈ្មោះទឹកដី
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,អ្នកអាចមានផែនការដែលមានវដ្តវិក័យប័ត្រដូចគ្នានៅក្នុងការជាវ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
 DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
 DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
@@ -2221,10 +2229,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,វាយតម្ល្រ
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ព្រឹត្តិការណ៍បណ្តុះបណ្តាល
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},គ្មានបានចូលស្ទួនសៀរៀលសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},គ្មានបានចូលស្ទួនសៀរៀលសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,បទដឹកនាំដោយប្រភពនាំមុខ។
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,សូមបញ្ចូល
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,សូមបញ្ចូល
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,កំណត់ហេតុថែទាំ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាផលបូកនៃទម្ងន់សុទ្ធនៃធាតុ)
@@ -2232,11 +2240,11 @@
 DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
 DocType: Student Group,Instructors,គ្រូបង្វឹក
 DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,ការគ្រប់គ្រងចែករំលែក
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ការទូទាត់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ការទូទាត់
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","ឃ្លាំង {0} គឺមិនត្រូវបានភ្ជាប់ទៅគណនីណាមួយ, សូមនិយាយអំពីគណនីនៅក្នុងកំណត់ត្រាឃ្លាំងឬកំណត់គណនីសារពើភ័ណ្ឌលំនាំដើមនៅក្នុងក្រុមហ៊ុន {1} ។"
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,គ្រប់គ្រងការបញ្ជាទិញរបស់អ្នក
 DocType: Work Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
@@ -2246,7 +2254,7 @@
 DocType: Student Leave Application,Student Leave Application,កម្មវិធីទុកឱ្យសិស្ស
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,នៅថ្ងៃទី
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
@@ -2256,7 +2264,7 @@
 DocType: Item,Barcodes,កូដសញ្ញា
 DocType: Hub Category,Hub Node,ហាប់ថ្នាំង
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,រង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,រង
 DocType: Asset Movement,Asset Movement,ចលនាទ្រព្យសម្បត្តិ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,ត្រូវបំពេញកិច្ចការការងារ {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,រទេះថ្មី
@@ -2274,13 +2282,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើនឹងរូបិយប័ណ្ណឬរូបិយប័ណ្ណគណនីរបស់ភាគីដើម
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
 DocType: Soil Texture,Loam,លាយ
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,ជួរដេក {0}: កាលបរិច្ឆេទផុតកំណត់មិនអាចត្រូវបានមុនពេលប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,ជួរដេក {0}: កាលបរិច្ឆេទផុតកំណត់មិនអាចត្រូវបានមុនពេលប្រកាសកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},បរិមាណដែលត្រូវទទួលទានសម្រាប់ធាតុ {0} ត្រូវតិចជាង {1}
 ,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
 DocType: Leave Application,Apply / Approve Leaves,អនុវត្ត / អនុម័តស្លឹក
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ចំពោះ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
 DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយហិរញ្ញវត្ថុ។
 DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
@@ -2294,7 +2301,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ការប្រើប្រាស់សម្ភារៈមិនត្រូវបានកំណត់នៅក្នុងការកំណត់ផលិតកម្មទេ។
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",មិនអាចវាយតម្លៃធាតុ {0} ក្នុងជួរដេក {1} ច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យចេញវិក័យប័ត្រសូមកំណត់នៅក្នុងការកំណត់ស្តុក
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",មិនអាចវាយតម្លៃធាតុ {0} ក្នុងជួរដេក {1} ច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យចេញវិក័យប័ត្រសូមកំណត់នៅក្នុងការកំណត់ស្តុក
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ធ្វើបច្ចុប្បន្នភាពចម្លើយ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
@@ -2305,12 +2312,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,ជ្រើសកម្មវិធីដំបូង
 DocType: Patient Appointment,Patient Age,អាយុអ្នកជម្ងឺ
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,ការគ្រប់គ្រងគម្រោង
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,លេខសៀរៀលគ្មាន {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,លេខសៀរៀលគ្មាន {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
 DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុនផ្គត់ផ្គង់ទំនិញឬសេវា។
 DocType: Budget,Fiscal Year,ឆ្នាំសារពើពន្ធ
 DocType: Asset Maintenance Log,Planned,គ្រោងទុក
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,គណនីដែលទទួលបានលំនាំដើមត្រូវបានប្រើប្រសិនបើមិនបានកំណត់ក្នុងជម្ងឺដើម្បីកក់ថ្លៃពិគ្រោះយោបល់។
 DocType: Vehicle Log,Fuel Price,តម្លៃប្រេងឥន្ធនៈ
+DocType: Bank Guarantee,Margin Money,ប្រាក់រៀល
 DocType: Budget,Budget,ថវិការ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,កំណត់បើក
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
@@ -2324,16 +2332,16 @@
 DocType: Lead,Follow Up,តាមដាន
 DocType: Item,Is Sales Item,តើមានធាតុលក់
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ធាតុគ្រុបដើមឈើមួយដើម
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ សូមពិនិត្យមើលមេធាតុ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ សូមពិនិត្យមើលមេធាតុ
 DocType: Maintenance Visit,Maintenance Time,ថែទាំម៉ោង
 ,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។ {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,រយៈពេលកាលបរិច្ឆេទចាប់ផ្ដើមមិនអាចមានមុនជាងឆ្នាំចាប់ផ្ដើមកាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,មានកំហុស។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,និយោជិក {0} បានអនុវត្តរួចហើយសម្រាប់ {1} រវាង {2} និង {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,មានកំហុស។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,និយោជិក {0} បានអនុវត្តរួចហើយសម្រាប់ {1} រវាង {2} និង {3}:
 DocType: Guardian,Guardian Interests,ចំណាប់អារម្មណ៍របស់កាសែត The Guardian
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
 DocType: Education Settings,Instructor Records to be created by,កំណត់ត្រាគ្រូបង្រៀនត្រូវបង្កើតដោយ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} បង្កើតឡើង
 DocType: GST Account,GST Account,គណនី GST
@@ -2352,8 +2360,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,បានបន្ថែមទៅសំណព្វ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,មិនមានប្រាក់ខែដែលត្រូវបានរកឃើញដើម្បីដាក់ជូននូវលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសរើសពីខាងលើឬតារាងប្រាក់ខែដែលបានដាក់ជូនរួចហើយ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ភារកិច្ចនិងពន្ធ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,មិនមានប្រាក់ខែដែលត្រូវបានរកឃើញដើម្បីដាក់ជូននូវលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសរើសពីខាងលើឬតារាងប្រាក់ខែដែលបានដាក់ជូនរួចហើយ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 DocType: Projects Settings,Projects Settings,ការកំណត់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ធាតុទូទាត់មិនអាចត្រូវបានត្រងដោយ {1}
@@ -2363,27 +2371,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,មែកធាងនៃក្រុមធាតុ។
 DocType: Production Plan,Total Produced Qty,ចំនួនផលិតសរុប
 DocType: Payroll Entry,Get Employee Details,ទទួលបានព័ត៌មានលំអិតពីនិយោជិក
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
 DocType: Asset,Sold,លក់ចេញ
 ,Item-wise Purchase History,ប្រវត្តិទិញប្រាជ្ញាធាតុ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
 DocType: Account,Frozen,ទឹកកក
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ចំនួនមូលដ្ឋាន (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,វត្ថុធាតុដើម
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,វត្ថុធាតុដើម
 DocType: Payment Reconciliation Payment,Reference Row,សេចក្តីយោងជួរដេក
 DocType: Installation Note,Installation Time,ពេលដំឡើង
 DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
 DocType: Patient,O Positive,O វិជ្ជមាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ការវិនិយោគ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ការវិនិយោគ
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,តុល្យភាព
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,សូមបញ្ចូលសំណើសម្ភារៈនៅក្នុងតារាងខាងលើ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,គ្មានការទូទាត់សងសម្រាប់ធាតុទិនានុប្បវត្តិទេ
 DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
 DocType: BOM,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
 DocType: Shopping Cart Settings,Show Quantity in Website,បង្ហាញបរិមាណនៅលើគេហទំព័រ
-DocType: Employee Loan Application,Total Payable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវបង់សរុប
+DocType: Loan Application,Total Payable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវបង់សរុប
 DocType: Task,Expected Time (in hours),ពេលវេលាដែលគេរំពឹងថា (គិតជាម៉ោង)
 DocType: Item Reorder,Check in (group),សូមពិនិត្យមើលនៅក្នុង (ក្រុម)
 DocType: Soil Texture,Silt,ខ្សាច់
@@ -2402,7 +2411,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ធ្វើការទូទាត់
 DocType: Room,Room Name,ឈ្មោះបន្ទប់
 DocType: Prescription Duration,Prescription Duration,រយៈពេលវេជ្ជបញ្ជា
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានអនុវត្ត / លុបចោលមុនពេល {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានអនុវត្ត / លុបចោលមុនពេល {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
 DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
 ,Campaign Efficiency,ប្រសិទ្ធភាពយុទ្ធនាការ
@@ -2420,11 +2429,11 @@
 DocType: Chapter,Chapter,ជំពូក
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,គូ
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,គណនីលំនាំដើមនឹងត្រូវបានអាប់ដេតដោយស្វ័យប្រវត្តិនៅក្នុងវិក្កយបត្រម៉ាស៊ីន POS នៅពេលដែលបានជ្រើសរើសរបៀបនេះ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
 DocType: Asset,Depreciation Schedule,កាលវិភាគរំលស់
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,អាសយដ្ឋានដៃគូលក់និងទំនាក់ទំនង
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
 DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,សូមកំណត់មជ្ឈមណ្ឌលតម្លៃដើមនៅក្នុងក្រុមហ៊ុន {0} ។
 DocType: Item,Has Batch No,មានបាច់គ្មាន
@@ -2442,7 +2451,6 @@
 DocType: Task,Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
 DocType: Soil Texture,Soil Type,ប្រភេទដី
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,សារថ្មី
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
 DocType: GoCardless Mandate,GoCardless Mandate,អាណត្តិ GoCardless
@@ -2462,7 +2470,7 @@
 DocType: Hub Category,Hub Category,ប្រភេទ Hub
 DocType: Purchase Invoice,SEZ,តំបន់សេដ្ឋកិច្ចពិសេស
 DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
-DocType: Employee Loan,Loan Amount,ចំនួនប្រាក់កម្ចី
+DocType: Loan,Loan Amount,ចំនួនប្រាក់កម្ចី
 DocType: Student Report Generation Tool,Add Letterhead,បញ្ចូលក្បាលអក្សរ
 DocType: Program Enrollment,Self-Driving Vehicle,រថយន្តបើកបរដោយខ្លួនឯង
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,សន្លឹកបៀអ្នកផ្គត់ផ្គង់អចិន្ត្រៃយ៍
@@ -2490,9 +2498,9 @@
 DocType: Cash Flow Mapper,Position,ទីតាំង
 DocType: Patient,Patient Details,ពត៌មានអ្នកជំងឺ
 DocType: Patient,B Positive,B វិជ្ជមាន
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 DocType: Patient Medical Record,Patient Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្តរបស់អ្នកជម្ងឺ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,កីឡា
@@ -2500,8 +2508,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,សរុបជាក់ស្តែង
 DocType: Lab Test UOM,Test UOM,សាកល្បង UOM
 DocType: Student Siblings,Student Siblings,បងប្អូននិស្សិត
+DocType: Subscription Plan Detail,Subscription Plan Detail,ពត៌មានលំអិតគម្រោង
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,ឯកតា
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
 ,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
 DocType: Asset Maintenance Task,Maintenance Task,កិច្ចការតំហែទាំ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,សូមកំណត់ដែនកំណត់ B2C ក្នុងការកំណត់ GST ។
@@ -2515,6 +2524,7 @@
 ,BOM Search,ស្វែងរក Bom
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ចំណាយសម្ភារៈប្រើប្រាស់សរុប (តាមរយៈធាតុចូល)
 DocType: Hub Settings,Company Registered,ក្រុមហ៊ុនបានចុះបញ្ជី
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,ទៅកាលបរិច្ឆេទមិនអាចតិចជាងកាលបរិច្ឆេទ
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",បោះពុម្ព &quot;នៅក្នុងស្តុក&quot; ឬ &quot;មិននៅក្នុងស្តុក&quot; នៅលើ Hub ដោយផ្អែកលើស្តុកដែលមាននៅក្នុងឃ្លាំងនេះ។
 DocType: Vehicle,Fuel Type,ប្រភេទប្រេងឥន្ធនៈ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
@@ -2522,17 +2532,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ភាគហ៊ុននៅក្នុងជំនាន់ទីតុល្យភាព {0} នឹងក្លាយទៅជាអវិជ្ជមាន {1} សម្រាប់ធាតុ {2} នៅឃ្លាំង {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
 DocType: Email Digest,Pending Sales Orders,ការរង់ចាំការបញ្ជាទិញលក់
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
 DocType: Employee,Create User Permission,បង្កើតសិទ្ធិអ្នកប្រើ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 DocType: Healthcare Settings,Remind Before,រំឭកពីមុន
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},កត្តាប្រែចិត្តជឿ UOM គឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Salary Component,Deduction,ការដក
 DocType: Item,Retain Sample,រក្សាទុកគំរូ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
 DocType: Stock Reconciliation Item,Amount Difference,ភាពខុសគ្នាចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
 DocType: Territory,Classification of Customers by region,ចំណាត់ថ្នាក់នៃអតិថិជនដោយតំបន់
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,នៅក្នុងផលិតកម្ម
@@ -2542,8 +2553,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,សេចក្តីថ្លែងការណ៍របស់ធនាគារគណនាតុល្យភាព
 DocType: Normal Test Template,Normal Test Template,គំរូសាកល្បងធម្មតា
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,អ្នកប្រើដែលបានបិទ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,សម្រង់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,មិនអាចកំណត់ RFQ ដែលបានទទួលដើម្បីគ្មានសម្រង់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,សម្រង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,មិនអាចកំណត់ RFQ ដែលបានទទួលដើម្បីគ្មានសម្រង់
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,ជ្រើសគណនីដើម្បីបោះពុម្ពជារូបិយប័ណ្ណគណនី
@@ -2551,7 +2562,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,នេះគឺផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអ្នកជម្ងឺនេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 DocType: Patient,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,ធាតុ {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,ធាតុ {0} ត្រូវបានត្រឡប់មកវិញរួចហើយ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
 DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ការដំឡើងកញ្ចប់ពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -2562,14 +2573,15 @@
 DocType: Work Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,ការពិពណ៌នាការងារ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,ការពិពណ៌នាការងារ
 DocType: Student Applicant,Applied,អនុវត្ត
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,បើកឡើងវិញ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,បើកឡើងវិញ
 DocType: Sales Invoice Item,Qty as per Stock UOM,qty ដូចជាក្នុងមួយហ៊ុន UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ឈ្មោះ Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,ការដាក់លក់បញ្ចុះតំលៃ 02 ដង
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","រក្សាដាននៃការលក់យុទ្ធនាការ។ រក្សាដាននៃការនាំមុខ, សម្រង់សម្តី, ការលក់លំដាប់លពីយុទ្ធនាការដើម្បីវាស់ស្ទង់ត្រឡប់ទៅលើការវិនិយោគ។"
+DocType: Department Approver,Approver,ការអនុម័ត
 ,SO Qty,សូ Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,វាលជូនចំពោះម្ចាស់ហ៊ុនមិនអាចទទេបានទេ
 DocType: Guardian,Work Address,អាសយដ្ឋានការងារ
@@ -2583,21 +2595,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
 DocType: BOM,Scrap Material Cost,តម្លៃសំណល់អេតចាយសម្ភារៈ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,សៀរៀល {0} មិនមានមិនមែនជារបស់ឃ្លាំងណាមួយឡើយ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,សៀរៀល {0} មិនមានមិនមែនជារបស់ឃ្លាំងណាមួយឡើយ
 DocType: Grant Application,Email Notification Sent,ការជូនដំណឹងអ៊ីម៉ែលដែលបានផ្ញើ
 DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",លេខកូដសំភារៈបរិមាណត្រូវបានតម្រូវលើជួរដេក
-DocType: Pricing Rule,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",លេខកូដសំភារៈបរិមាណត្រូវបានតម្រូវលើជួរដេក
+DocType: Bank Guarantee,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,បង្ហាញព័ត៌មានលម្អិតការទូទាត់
 DocType: Consultation,Consultation Time,ពេលវេលាពិគ្រោះ
 DocType: C-Form,Quarter,ត្រីមាស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ការចំណាយនានា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ការចំណាយនានា
 DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
 DocType: Payment Request,PR,ការិយាល័យទទួលជំនួយផ្ទាល់
 DocType: Cheque Print Template,Bank Name,ឈ្មោះធនាគារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-ខាងលើ
-DocType: Employee Loan,Employee Loan Account,គណនីឥណទានបុគ្គលិក
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ចំនួននៃអន្តរកម្ម
@@ -2612,7 +2623,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ទំងន់ (ក្នុងគីឡូក្រាម)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",ជំពូក / ជំពូក_nameទុកទទេដោយស្វ័យប្រវត្តិបន្ទាប់ពីរក្សាទុកជំពូក។
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,សូមកំណត់គណនី GST ក្នុងការកំណត់ GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,សូមកំណត់គណនី GST ក្នុងការកំណត់ GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ប្រភេទអាជីវកម្ម
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,តម្លៃនៃការទិញថ្មី
@@ -2621,12 +2632,13 @@
 DocType: Grant Application,Grant Description,ផ្ដល់ការពិពណ៌នា
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Student Guardian,Others,អ្នកផ្សេងទៀត
+DocType: Subscription,Discounts,ការបញ្ចុះតម្លៃ
 DocType: Payment Entry,Unallocated Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់បែងចែក
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,មិនអាចរកឃើញធាតុផ្គូផ្គងជាមួយ។ សូមជ្រើសតម្លៃមួយចំនួនផ្សេងទៀតសម្រាប់ {0} ។
 DocType: POS Profile,Taxes and Charges,ពន្ធនិងការចោទប្រកាន់
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ផលិតផលឬសេវាកម្មដែលត្រូវបានទិញលក់ឬទុកនៅក្នុងស្តុក។
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,គ្មានការធ្វើឱ្យទាន់សម័យជាច្រើនទៀត
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,នេះគ្របដណ្តប់តារាងពិន្ទុទាំងអស់ដែលត្រូវបានភ្ជាប់ទៅនឹងការរៀបចំនេះ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ធាតុកូនមិនគួរជាផលិតផលកញ្ចប់។ សូមយកធាតុ `{0}` និងរក្សាទុក
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,វិស័យធនាគារ
@@ -2634,45 +2646,48 @@
 DocType: Vehicle Service,Service Item,ធាតុសេវា
 DocType: Bank Guarantee,Bank Guarantee,ការធានាពីធនាគារ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 DocType: Bin,Ordered Quantity,បរិមាណដែលត្រូវបានបញ្ជាឱ្យ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
 DocType: Grading Scale,Grading Scale Intervals,ចន្លោះពេលការដាក់ពិន្ទុធ្វើមាត្រដ្ឋាន
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,ប្រាក់ចំណេញសម្រាប់ឆ្នាំនេះ
+DocType: Bank Guarantee,Name of Bank,ឈ្មោះធនាគារ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ធាតុគណនេយ្យសម្រាប់ {2} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {3}
 DocType: Fee Schedule,In Process,ក្នុងដំណើរការ
 DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះតំលៃ
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,មែកធាងនៃគណនីហិរញ្ញវត្ថុ។
+DocType: Bank Guarantee,Reference Document Type,សេចក្តីយោងប្រភេទឯកសារ
 DocType: Cash Flow Mapping,Cash Flow Mapping,គំនូសតាងលំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} នឹងដីកាសម្រេចលក់ {1}
 DocType: Account,Fixed Asset,ទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,រកមិនឃើញអ៊ីមែលនៅក្នុងទំនាក់ទំនងលំនាំដើម
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,បង្កើតសម្ងាត់
-DocType: Employee Loan,Account Info,ព័តគណនី
+DocType: Loan,Account Info,ព័តគណនី
 DocType: Activity Type,Default Billing Rate,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
 DocType: Fees,Include Payment,រួមបញ្ចូលការទូទាត់
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ក្រុមនិស្សិតបានបង្កើត។
 DocType: Sales Invoice,Total Billing Amount,ចំនួនទឹកប្រាក់សរុបវិក័យប័ត្រ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,កម្មវិធីនៅក្នុងរចនាសម្ព័ន្ធតម្លៃនិងក្រុមនិស្សិត {0} គឺខុសគ្នា។
 DocType: Fee Schedule,Receivable Account,គណនីត្រូវទទួល
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
 DocType: Quotation Item,Stock Balance,តុល្យភាពភាគហ៊ុន
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,នាយកប្រតិបត្តិ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,នាយកប្រតិបត្តិ
 DocType: Purchase Invoice,With Payment of Tax,ជាមួយការទូទាត់ពន្ធ
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ចំនួនបីសម្រាប់ការផ្គត់ផ្គង់
 DocType: Land Unit,Is Container,តើកុងតឺន័រ
 DocType: Crop Cycle,This will be day 1 of the crop cycle,នេះនឹងជាថ្ងៃទី 1 នៃវដ្តដំណាំ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Purchase Invoice Item,Weight UOM,ទំងន់ UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,បញ្ជីឈ្មោះម្ចាស់ហ៊ុនដែលមានលេខទូរស័ព្ទ
 DocType: Salary Structure Employee,Salary Structure Employee,និយោជិតបានប្រាក់ខែរចនាសម្ព័ន្ធ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,បង្ហាញគុណលក្ខណៈវ៉ារ្យង់
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,បង្ហាញគុណលក្ខណៈវ៉ារ្យង់
 DocType: Student,Blood Group,ក្រុមឈាម
 DocType: Course,Course Name,ឈ្មោះវគ្គសិក្សាបាន
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នកប្រើដែលអាចអនុម័តកម្មវិធីដែលបានឈប់សម្រាកជាក់លាក់របស់បុគ្គលិក
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,សម្ភារៈការិយាល័យ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,សម្ភារៈការិយាល័យ
 DocType: Purchase Invoice Item,Qty,qty
 DocType: Fiscal Year,Companies,មានក្រុមហ៊ុន
 DocType: Supplier Scorecard,Scoring Setup,រៀបចំការដាក់ពិន្ទុ
@@ -2691,7 +2706,7 @@
 DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,បញ្ជីតម្លៃទិញ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,គំរូនៃអថេរពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
 DocType: Job Offer Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
 DocType: Asset,Quality Manager,គ្រប់គ្រងគុណភាព
@@ -2703,13 +2718,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},សរុបគ្មានប្រាក់ខែ: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom គេហទំព័រប្រតិបត្តិការ
 DocType: Supplier Scorecard,Supplier Score,ពិន្ទុអ្នកផ្គត់ផ្គង់
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,សរុបវិក័យប័ត្រ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,សរុបវិក័យប័ត្រ AMT
 DocType: Supplier,Warn RFQs,ព្រមាន RFQs
 DocType: BOM,Conversion Rate,អត្រាការប្រែចិត្តជឿ
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ស្វែងរកផលិតផល
 DocType: Assessment Plan,To Time,ទៅពេល
 DocType: Authorization Rule,Approving Role (above authorized value),ការអនុម័តតួនាទី (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
+DocType: Loan,Total Amount Paid,ចំនួនទឹកប្រាក់សរុបបង់
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,សូមជ្រើសរើសការចូលរៀនរបស់និស្សិតដែលចាំបាច់សម្រាប់អ្នកដាក់ពាក្យសុំដែលបានបង់ថ្លៃសិក្សា
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,សូមជ្រើសរើសបញ្ជីតំលៃដើម្បីបោះពុម្ពផ្សាយតម្លៃ
@@ -2719,18 +2735,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ជួរដេក {0}: Qty បញ្ចប់មិនអាចមានច្រើនជាង {1} សម្រាប់ប្រតិបត្តិការ {2}
 DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយប្រើប្រាស់ហ៊ុនផ្សះផ្សា, សូមប្រើការចូលហ៊ុន"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយប្រើប្រាស់ហ៊ុនផ្សះផ្សា, សូមប្រើការចូលហ៊ុន"
 DocType: Training Event Employee,Training Event Employee,បណ្តុះបណ្តាព្រឹត្តិការណ៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,គំរូអតិបរមា - {0} អាចត្រូវបានរក្សាទុកសម្រាប់បំណះ {1} និងធាតុ {2} ។
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,បន្ថែមរន្ធពេលវេលា
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} លេខសៀរៀលដែលបានទាមទារសម្រាប់ធាតុ {1} ។ អ្នកបានផ្ដល់ {2} ។
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} លេខសៀរៀលដែលបានទាមទារសម្រាប់ធាតុ {1} ។ អ្នកបានផ្ដល់ {2} ។
 DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
 DocType: Training Event,Advance,បន្ត
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,សម្រាប់ការធ្វើឡើងវិញជាថ្មីម្តងទៀត។
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,ការកំណត់ការទូទាត់ GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},ជួរដេក # {0}: គណនី {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនទេ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},ជួរដេក # {0}: គណនី {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនទេ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},មិនអាចស្វែងរក Doc Type {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
@@ -2749,7 +2764,6 @@
 DocType: Bin,Actual Quantity,បរិមាណដែលត្រូវទទួលទានពិតប្រាកដ
 DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍: ថ្ងៃបន្ទាប់ការដឹកជញ្ជូន
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},ការជាវត្រូវបាន {0}
 DocType: Fee Schedule Program,Fee Schedule Program,កម្មវិធីកាលវិភាគថ្លៃ
 DocType: Fee Schedule Program,Student Batch,បាច់សិស្ស
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ធ្វើឱ្យសិស្ស
@@ -2764,14 +2778,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ពាណិជ្ជកម្មអេឡិចត្រូនិក GSTIN
 DocType: Sales Order,Not Delivered,មិនបានផ្តល់
 ,Bank Clearance Summary,ធនាគារសង្ខេបបោសសំអាត
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
 DocType: Appraisal Goal,Appraisal Goal,គោលដៅវាយតម្លៃ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,ស្នើប្រភេទ?
 DocType: Stock Reconciliation Item,Current Amount,ចំនួនទឹកប្រាក់បច្ចុប្បន្ន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,អគារ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,អគារ
 DocType: Fee Schedule,Fee Structure,រចនាសម្ព័ន្ធថ្លៃសេវា
 DocType: Timesheet Detail,Costing Amount,ចំនួនទឹកប្រាក់ដែលចំណាយថវិកាអស់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 DocType: Student Admission Program,Application Fee,ថ្លៃសេវាកម្មវិធី
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ការបញ្ចុះតម្លៃ Maxiumm សម្រាប់ធាតុ {0} គឺ {1}%
@@ -2779,12 +2792,13 @@
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន &amp; ទំនាក់ទំនង
 DocType: SMS Log,Sender Name,ឈ្មោះរបស់អ្នកផ្ញើ
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,លក្ខណៈវិនិច្ឆ័យវិភាគកសិកម្ម
+DocType: HR Settings,Leave Approval Notification Template,ចាកចេញពីទំព័រសេចក្តីជូនដំណឹងអនុម័ត
 DocType: POS Profile,[Select],[ជ្រើសរើស]
 DocType: Vital Signs,Blood Pressure (diastolic),សម្ពាធឈាម (Diastolic)
 DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
 DocType: Agriculture Task,Holiday Management,ការគ្រប់គ្រងថ្ងៃឈប់សម្រាក
 DocType: Payment Request,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,កម្មវិធី
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,កម្មវិធី
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
 DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},គ្រូពេទ្យ {0} មិនមាននៅលើ {1}
@@ -2802,7 +2816,7 @@
 DocType: Employee,New Workplace,ញូការងារ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,ការប្រើប្រាស់សម្ភារៈ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ដែលបានកំណត់ជាបិទ
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},គ្មានធាតុជាមួយនឹងលេខកូដ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},គ្មានធាតុជាមួយនឹងលេខកូដ {0}
 DocType: Normal Test Items,Require Result Value,ទាមទារតម្លៃលទ្ធផល
 DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2817,19 +2831,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
 DocType: Leave Block List,Allow Users,អនុញ្ញាតឱ្យអ្នកប្រើ
 DocType: Purchase Order,Customer Mobile No,គ្មានគយចល័ត
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,កើតឡើង
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ពត៌មានលំអិតគំរូផែនទីលំហូរសាច់ប្រាក់
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ការគ្រប់គ្រងប្រាក់កម្ចី
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,តាមដានចំណូលដាច់ដោយឡែកនិងចំសម្រាប់បញ្ឈរផលិតផលឬការបែកបាក់។
 DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: Fees,Send Payment Request,ផ្ញើសំណើទូទាត់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
 DocType: Water Analysis,Origin,ប្រភពដើម
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ឯកសារនេះលើសកំណត់ដោយ {0} {1} សម្រាប់ធាតុ {4} ។ តើអ្នកបង្កើត {3} ផ្សេងទៀតប្រឆាំងនឹង {2} ដូចគ្នាដែរឬទេ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
@@ -2844,14 +2858,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,គឺជាការទទួលខុសត្រូវពន្ធលើប្រាក់ចំណូល
 DocType: Grading Scale Interval,Grade Description,ថ្នាក់ទីបរិយាយ
 DocType: Stock Entry,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ប្រាក់ Earnest បាន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ប្រាក់ Earnest បាន
 DocType: Sales Invoice, Shipping Bill Number,លេខប័ណ្ណដឹកជញ្ជូន
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
 DocType: Asset Maintenance Log,Actions performed,សកម្មភាពបានអនុវត្ត
 DocType: Cash Flow Mapper,Section Leader,ប្រធានផ្នែក
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ប្រភពមូលនិធិ (បំណុល)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ប្រភពមូលនិធិ (បំណុល)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},បរិមាណដែលត្រូវទទួលទានក្នុងមួយជួរដេក {0} ({1}) ត្រូវតែមានដូចគ្នាបរិមាណផលិត {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,បុគ្គលិក
+DocType: Bank Guarantee,Fixed Deposit Number,លេខគណនីបញ្ញើមានកាលកំណត់
 DocType: Asset Repair,Failure Date,កាលបរិច្ឆេទបរាជ័យ
 DocType: Sample Collection,Collected Time,ពេលវេលាប្រមូល
 DocType: Company,Sales Monthly History,ប្រវត្តិការលក់ប្រចាំខែ
@@ -2868,10 +2883,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,តើអ្នកប្រាកដថាអ្នកចង់លុបចោលការណាត់ជួបនេះទេ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,កញ្ចប់តម្លៃបន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,បំពង់បង្ហូរប្រេងការលក់
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
 DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,ទទួលយកការធ្វើបច្ចុប្បន្នភាពការជាវប្រចាំ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},គណនី {0} មិនផ្គូផ្គងនឹងក្រុមហ៊ុន {1} នៅក្នុងរបៀបនៃគណនី: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,វគ្គសិក្សា:
@@ -2881,7 +2897,7 @@
 DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,គ្មានការបញ្ជាទិញការងារដែលបានបង្កើត
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់រយៈពេលនេះ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ឱសថ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ឱសថ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,តម្លៃនៃធាតុដែលបានទិញ
 DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
 DocType: Purchase Invoice,Credit To,ការផ្តល់ឥណទានដល់
@@ -2899,7 +2915,7 @@
 DocType: Request for Quotation Supplier,No Quote,គ្មានសម្រង់
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Gateway Account,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ទូទាត់បិទ
 DocType: Job Offer,Accepted,បានទទួលយក
@@ -2911,7 +2927,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,លទ្ធផលនៃការស្វែងរក
 DocType: Room,Room Number,លេខបន្ទប់
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 DocType: Journal Entry Account,Payroll Entry,ការចូលប្រាក់បៀវត្សរ៍
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,មើលថ្លៃកំណត់ត្រា
@@ -2921,7 +2937,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Lab Test Sample,Lab Test Sample,គំរូតេស្តមន្ទីរពិសោធន៍
 DocType: Item Variant Settings,Allow Rename Attribute Value,អនុញ្ញាតឱ្យប្តូរឈ្មោះគុណលក្ខណៈគុណលក្ខណៈ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
 DocType: Restaurant,Invoice Series Prefix,បុព្វបទស៊េរីវិក្កយបត្រ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
@@ -2929,8 +2945,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,ការរួមបញ្ចូល Google ផែនទីមិនត្រូវបានបើកទេ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,ថ្ងៃផុតកំណត់សមាជិក
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ត្រូវតែអវិជ្ជមាននៅក្នុងឯកសារត្រឡប់មកវិញ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ត្រូវតែអវិជ្ជមាននៅក្នុងឯកសារត្រឡប់មកវិញ
 ,Minutes to First Response for Issues,នាទីដើម្បីឆ្លើយតបដំបូងសម្រាប់បញ្ហា
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
@@ -2949,7 +2966,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,ឯកតារង្វាស់
 DocType: Fiscal Year,Year End Date,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទ
 DocType: Task Depends On,Task Depends On,ភារកិច្ចអាស្រ័យលើ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,ឱកាសការងារ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,ឱកាសការងារ
 DocType: Operation,Default Workstation,ស្ថានីយការងារលំនាំដើម
 DocType: Notification Control,Expense Claim Approved Message,សារពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
 DocType: Payment Entry,Deductions or Loss,ការកាត់ឬការបាត់បង់
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ទុកឱ្យដោយគ្មានប្រាក់ខែមិនផ្គូផ្គងនឹងកំណត់ត្រាកម្មវិធីចាកចេញអនុម័ត
 DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហានបន្ទាប់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
 DocType: Membership,USD,ដុល្លារអាមេរិក
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ធ្វើឱ្យមានការវិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,សមតុល្យនៅសល់
@@ -2996,7 +3013,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,លេខកូដ {0} មិនមែនជាកូដ {1} ត្រឹមត្រូវទេ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ឆ្នាំបញ្ចប់
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot / នាំមុខ%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 DocType: Driver,Driver,កម្មវិធីបញ្ជា
 DocType: Vital Signs,Nutrition Values,តម្លៃអាហារូបត្ថម្ភ
 DocType: Lab Test Template,Is billable,គឺអាចចេញវិក្កយបត្របាន
@@ -3007,7 +3024,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),ពិតប្រាកដចាប់ផ្តើមកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,ជួរ Ageing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាងចំនួនសរុបដែលបានទាមទារ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាងចំនួនសរុបដែលបានទាមទារ
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3042,7 +3059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,ជ្រើសគុណលក្ខណៈគុណលក្ខណៈ
 DocType: Purchase Invoice,Reason For Issuing document,ហេតុផលសម្រាប់ការចេញឯកសារ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,បន្ទាប់ទំនាក់ទំនងដោយមិនអាចជាដូចគ្នានឹងអាសយដ្ឋានអ៊ីមែលនាំមុខ
 DocType: Tax Rule,Billing City,ទីក្រុងវិក័យប័ត្រ
@@ -3059,7 +3076,8 @@
 DocType: Warranty Claim,Service Address,សេវាអាសយដ្ឋាន
 DocType: Asset Maintenance Task,Calibration,ការក្រិតតាមខ្នាត
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} គឺជាថ្ងៃឈប់សម្រាករបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,គ្រឿងសង្ហារឹមនិងព្រឹត្តិការណ៍ប្រកួត
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ចាកចេញពីការជូនដំណឹងស្ថានភាព
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,គ្រឿងសង្ហារឹមនិងព្រឹត្តិការណ៍ប្រកួត
 DocType: Item,Manufacture,ការផលិត
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,របាយការណ៍តេស្តមន្ទីរពិសោធន៍
@@ -3075,7 +3093,6 @@
 DocType: Crop,Planting Area,តំបន់ដាំ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
 DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,នេះអាចដោយសារតែអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវមួយចំនួននៅក្នុង
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,អ្នកបានបន្ថែម
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,លទ្ធផលបណ្តុះបណ្តាល
@@ -3085,16 +3102,17 @@
 DocType: Products Settings,Products per Page,ផលិតផលក្នុងមួយទំព័រ
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ឬ
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ឬ
 DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,រាយការណ៍បញ្ហា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ខាងលើ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ជួរដេក # {0}: Journal Entry {1} មិនមានគណនី {2} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
 DocType: Supplier Scorecard Criteria,Criteria Weight,លក្ខណៈវិនិច្ឆ័យទំងន់
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ទុកសេចក្តីជូនដំណឹង
 DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម &amp; ‧;
 DocType: Payroll Entry,Salary Slip Based on Timesheet,ប័ណ្ណប្រាក់ខែដោយផ្អែកលើ Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,អត្រាការទិញ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,អត្រាការទិញ
 DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
 DocType: Payment Entry,Payment Type,ប្រភេទការទូទាត់
@@ -3116,6 +3134,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ការកំណត់កន្រ្តកទំនិញ
 DocType: Journal Entry,Accounting Entries,ធាតុគណនេយ្យ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",ប្រសិនបើច្បាប់ដែលបានកំណត់តម្លៃត្រូវបានបង្កើតសម្រាប់ &#39;អត្រា&#39; វានឹងសរសេរជាន់លើបញ្ជីតំលៃ។ អត្រាកំណត់តម្លៃគឺជាអត្រាចុងក្រោយដូច្នេះគ្មានការបញ្ចុះតម្លៃបន្ថែមទៀតទេ។ ហេតុដូច្នេះហើយនៅក្នុងប្រតិបត្តិការដូចជាការបញ្ជាទិញការបញ្ជាទិញនិងការបញ្ជាទិញជាដើមវានឹងត្រូវបានយកមកប្រើក្នុង &quot;អត្រា&quot; ជាជាងវាល &quot;បញ្ជីតំលៃ&quot; ។
+DocType: Journal Entry,Paid Loan,ប្រាក់កម្ចីបង់
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ស្ទួនធាតុ។ សូមពិនិត្យមើលវិធានអនុញ្ញាត {0}
 DocType: Journal Entry Account,Reference Due Date,កាលបរិច្ឆេទយោងយោង
 DocType: Purchase Order,Ref SQ,យោង SQ
@@ -3132,7 +3151,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,To Produce,ផលិត
 apps/erpnext/erpnext/config/hr.py +93,Payroll,បើកប្រាក់បៀវត្ស
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",ចំពោះជួរដេកនៅ {0} {1} ។ ដើម្បីរួមបញ្ចូល {2} នៅក្នុងអត្រាធាតុជួរដេក {3} ត្រូវតែត្រូវបានរួមបញ្ចូល
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",ចំពោះជួរដេកនៅ {0} {1} ។ ដើម្បីរួមបញ្ចូល {2} នៅក្នុងអត្រាធាតុជួរដេក {3} ត្រូវតែត្រូវបានរួមបញ្ចូល
 DocType: Patient Service Unit,Parent Service Unit,អង្គភាពសេវាមាតាឬបិតា
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
@@ -3150,7 +3169,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ការដឹកជញ្ជូន
 DocType: Volunteer,Weekdays,ថ្ងៃធ្វើការ
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
 DocType: Restaurant Menu,Restaurant Menu,ម៉ឺនុយភោជនីយដ្ឋាន
@@ -3158,7 +3177,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,កំណត់លំនាំដើមសម្រាប់គណនីសារពើភ័ណ្ឌរហូតសារពើភ័ណ្ឌ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,កំណត់លំនាំដើមសម្រាប់គណនីសារពើភ័ណ្ឌរហូតសារពើភ័ណ្ឌ
 DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,សូមផ្ញើអ៊ីម៉ែលពិនិត្យជំនួយ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","ផ្ទុកទិន្នន័យមូលដ្ឋាននេះគឺជាការពេញលេញ, មិនបានរក្សាទុក"
@@ -3166,10 +3185,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,សមត្ថភាពបន្ទប់
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},មានកំណត់ត្រារួចហើយសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,យោង
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,អ្នកនឹងបាត់បង់កំណត់ត្រាវិក័យប័ត្រដែលបានបង្កើតកាលពីមុន។ តើអ្នកប្រាកដថាអ្នកចង់ចាប់ផ្តើមការភ្ជាប់នេះឡើងវិញទេ?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,ថ្លៃចុះឈ្មោះ
 DocType: Budget,Cost Center,មជ្ឈមណ្ឌលការចំណាយ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,# កាតមានទឹកប្រាក់
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,# កាតមានទឹកប្រាក់
 DocType: Notification Control,Purchase Order Message,ទិញសារលំដាប់
 DocType: Tax Rule,Shipping Country,ការដឹកជញ្ជូនក្នុងប្រទេស
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,លាក់លេខសម្គាល់របស់អតិថិជនពន្ធពីការលក់
@@ -3178,20 +3198,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចផ្លាស់ប្តូរបានតែតាមរយៈហ៊ុនចូល / ដឹកជញ្ជូនចំណាំបង្កាន់ដៃ / ការទិញ
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ពន្ធលើប្រាក់ចំណូល
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ទៅកាន់ក្បាលអក្សរ
+DocType: Subscription,Cancel At End Of Period,បោះបង់នៅចុងបញ្ចប់នៃរយៈពេល
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,គ្មានធាតុដែលត្រូវបានជ្រើសរើសសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,គ្មានធាតុដែលត្រូវបានជ្រើសរើសសម្រាប់ការផ្ទេរ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
 DocType: Vehicle,Electric,អគ្គិសនី
 DocType: Task,% Progress,% វឌ្ឍនភាព
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ការកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ការកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",មានតែអ្នកដាក់ពាក្យសុំសិស្សដែលមានស្ថានភាព &quot;បានអនុម័ត&quot; នឹងត្រូវបានជ្រើសរើសនៅក្នុងតារាងខាងក្រោម។
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,លេខគណនីសម្រាប់គណនី {0} មិនមានទេ។ <br> សូមរៀបចំតារាងគណនីរបស់អ្នកឱ្យបានត្រឹមត្រូវ។
 DocType: Task,Depends on Tasks,អាស្រ័យលើភារកិច្ច
@@ -3206,6 +3227,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,មិនមែននៅក្នុងផ្សារ
 DocType: Volunteer,Volunteer Skills,ជំនាញស្ម័គ្រចិត្ត
 DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
+DocType: Bank Guarantee,Reference Document Name,ឈ្មោះឯកសារយោង
 DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
 apps/erpnext/erpnext/hooks.py +142,Issues,បញ្ហានានា
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ស្ថានភាពត្រូវតែជាផ្នែកមួយនៃ {0}
@@ -3219,7 +3241,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
+DocType: Loan,Loan Application,ពាក្យស្នើសុំឥណទាន
 DocType: Crop,Scientific Name,ឈ្មោះវិទ្យាសាស្រ្ត
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ស្លឹកសរុប
 DocType: Customer,"Reselect, if the chosen contact is edited after save",ជ្រើសរើសបើទំនាក់ទំនងដែលបានជ្រើសត្រូវបានកែសម្រួលបន្ទាប់ពីរក្សាទុក
@@ -3228,13 +3251,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,លេខមូលប្បទានប័ត្រ
 ,Sales Browser,កម្មវិធីរុករកការលក់
 DocType: Journal Entry,Total Credit,ឥណទានសរុប
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: មួយទៀត {0} {1} # មានប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: មួយទៀត {0} {1} # មានប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,ក្នុងតំបន់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាននិងបុរេប្រទាន (ទ្រព្យសម្បត្តិ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់បំណុល
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,ដែលមានទំហំធំ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,ដែលមានទំហំធំ
 DocType: Homepage Featured Product,Homepage Featured Product,ផលិតផលដែលមានលក្ខណៈពិសេសគេហទំព័រ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ក្រុមការវាយតំលៃទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ក្រុមការវាយតំលៃទាំងអស់
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ឈ្មោះឃ្លាំងថ្មី
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),សរុប {0} ({1})
 DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
@@ -3255,9 +3278,10 @@
 DocType: Fees,Fees,ថ្លៃសេវា
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់អត្រាប្តូរប្រាក់ដើម្បីបម្លែងរូបិយប័ណ្ណមួយទៅមួយផ្សេងទៀត
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,សម្រង់ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,ចំនួនសរុប
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,ចំនួនសរុប
 DocType: Sales Partner,Targets,គោលដៅ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,សូមចុះឈ្មោះលេខ SIREN នៅក្នុងឯកសារព័ត៌មានរបស់ក្រុមហ៊ុន
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: GST Account,CESS Account,គណនី CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
@@ -3266,6 +3290,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ជ្រើសរើសអ្នកជម្ងឺ
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ឈ្មោះប៉ារ៉ាម៉ែត្រ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ទុកឱ្យកម្មវិធីដែលមានស្ថានភាពប៉ុណ្ណោះ &#39;ត្រូវបានអនុម័ត &quot;និង&quot; បដិសេធ &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},និស្សិតឈ្មោះក្រុមគឺជាការចាំបាច់ក្នុងជួរ {0}
 DocType: Homepage,Products to be shown on website homepage,ផលិតផលត្រូវបានបង្ហាញនៅលើគេហទំព័រគេហទំព័រ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -3298,14 +3323,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,វិក័យប័ត្របានបង្កើតឡើងសម្រាប់ម៉ោងទូទាត់ទាំងអស់
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},កំហុសឈ្មោះ: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,តើការចំណាយហិរញ្ញវត្ថុ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ការចូលរួមសម្រាប់ការ {0} បុគ្គលិកត្រូវបានសម្គាល់រួចហើយ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ការចូលរួមសម្រាប់ការ {0} បុគ្គលិកត្រូវបានសម្គាល់រួចហើយ
 DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,សូមកំណត់អតិថិជនលំនាំដើមនៅក្នុងការកំណត់ភោជនីយដ្ឋាន
 ,Salary Register,ប្រាក់បៀវត្សចុះឈ្មោះ
 DocType: Warehouse,Parent Warehouse,ឃ្លាំងមាតាបិតា
-DocType: C-Form Invoice Detail,Net Total,សរុប
+DocType: Subscription,Net Total,សរុប
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},រកមិនឃើញលំនាំដើម Bom សម្រាប់ធាតុនិង {0} {1} គម្រោង
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,កំណត់ប្រភេទប្រាក់កម្ចីនានា
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,កំណត់ប្រភេទប្រាក់កម្ចីនានា
 DocType: Bin,FCFS Rate,អត្រា FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ចំនួនទឹកប្រាក់ដ៏ឆ្នើម
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ពេលវេលា (នៅក្នុងនាទី)
@@ -3337,11 +3362,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,គណនី root ត្រូវតែជាក្រុមមួយ
 DocType: Drug Prescription,Drug Prescription,ថ្នាំពេទ្យ
 DocType: Fees,FEE.,តំលៃ។
-DocType: Employee Loan,Repaid/Closed,សង / បិទ
+DocType: Loan,Repaid/Closed,សង / បិទ
 DocType: Item,Total Projected Qty,សរុបរបស់គម្រោង Qty
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",អត្រាវាយតម្លៃមិនត្រូវបានរកឃើញសម្រាប់ធាតុ {0} ដែលត្រូវបានតម្រូវឱ្យធ្វើធាតុគណនេយ្យសម្រាប់ {1} {2} ។ ប្រសិនបើធាតុត្រូវបានធ្វើជាធាតុអត្រាតម្លៃសូន្យនៅក្នុង {1} សូមនិយាយថានៅក្នុងតារាងធាតុ {1} ។ បើមិនដូច្នោះទេសូមបង្កើតការជួញដូរភាគហ៊ុនមកដល់សម្រាប់ធាតុឬនិយាយពីអត្រាវាយតម្លៃនៅក្នុងកំណត់ត្រាធាតុហើយបន្ទាប់មកព្យាយាមផ្ញើ / បោះបង់ធាតុនេះ។
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,ក្រមការពិតណាស់
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
 DocType: POS Settings,Use POS in Offline Mode,ប្រើម៉ាស៊ីនមេនៅក្រៅអ៊ីនធឺណិត
@@ -3361,16 +3385,15 @@
 DocType: Purchase Invoice,Deemed Export,ចាត់ទុកថានាំចេញ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
-DocType: Subscription,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,ប្រត្តិប័ត្រការគណនេយ្យសំរាប់ស្តុក
 DocType: Lab Test,LabTest Approver,អ្នកអនុម័ត LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,អ្នកបានវាយតម្លែរួចទៅហើយសម្រាប់លក្ខណៈវិនិច្ឆ័យវាយតម្លៃនេះ {} ។
 DocType: Vehicle Service,Engine Oil,ប្រេងម៉ាស៊ីន
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},កិច្ចការការងារបានបង្កើត: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},កិច្ចការការងារបានបង្កើត: {0}
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
-DocType: Employee Loan,Loan Details,សេចក្ដីលម្អិតប្រាក់កម្ចី
+DocType: Loan,Loan Details,សេចក្ដីលម្អិតប្រាក់កម្ចី
 DocType: Company,Default Inventory Account,គណនីសារពើភ័ណ្ឌលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,លេខហ្វាល់មិនត្រូវគ្នាទេ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
@@ -3382,19 +3405,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,តំណភ្ជាប់ទៅនឹងដីទាំងអស់ដែលដំណាំកំពុងកើនឡើង
 DocType: Account,Root Type,ប្រភេទជា Root
 DocType: Item,FIFO,FIFO &amp; ‧;
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ជួរដេក # {0}: មិនអាចវិលត្រឡប់មកវិញច្រើនជាង {1} សម្រាប់ធាតុ {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ជួរដេក # {0}: មិនអាចវិលត្រឡប់មកវិញច្រើនជាង {1} សម្រាប់ធាតុ {2}
 DocType: Item Group,Show this slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយនេះនៅកំពូលនៃទំព័រ
 DocType: BOM,Item UOM,ធាតុ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ឃ្លាំងគោលដៅគឺជាការចាំបាច់សម្រាប់ជួរ {0}
 DocType: Cheque Print Template,Primary Settings,ការកំណត់បឋមសិក្សា
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,បន្ថែម បុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,បន្ថែម បុគ្គលិក
 DocType: Purchase Invoice Item,Quality Inspection,ពិនិត្យគុណភាព
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,បន្ថែមទៀតខ្នាតតូច
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,បន្ថែមទៀតខ្នាតតូច
 DocType: Company,Standard Template,ទំព័រគំរូស្ដង់ដារ
 DocType: Training Event,Theory,ទ្រឹស្តី
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
@@ -3414,11 +3437,10 @@
 DocType: SMS Log,No of Sent SMS,គ្មានសារដែលបានផ្ញើ
 DocType: Antibiotic,Healthcare Administrator,អ្នកគ្រប់គ្រងសុខភាព
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,កំណត់គោលដៅ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 DocType: Dosage Strength,Dosage Strength,កម្លាំងរបស់កិតើ
 DocType: Account,Expense Account,ចំណាយតាមគណនី
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,កម្មវិធីសម្រាប់បញ្ចូលកុំព្យូទ័រ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,ពណ៌
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,ពណ៌
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃផែនការ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,កាលបរិច្ឆេទផុតកំណត់គឺចាំបាច់សម្រាប់ធាតុដែលបានជ្រើស
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ទប់ស្កាត់ការបញ្ជាទិញ
@@ -3431,18 +3453,18 @@
 DocType: Patient,Personal and Social History,ប្រវត្តិបុគ្គលនិងសង្គម
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,អ្នកប្រើ {0} បានបង្កើត
 DocType: Fee Schedule,Fee Breakup for each student,ការបែងចែកថ្លៃឈ្នួលសម្រាប់សិស្សម្នាក់ៗ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,ប្តូរលេខកូដ
 DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ម៉ាស៊ូត
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
 DocType: Purchase Invoice,Availed ITC Cess,ផ្តល់ជូនដោយ ITC Cess
 ,Student Monthly Attendance Sheet,សិស្សសន្លឹកអវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ច្បាប់នៃការដឹកជញ្ជូនអាចអនុវត្តបានតែសម្រាប់លក់ប៉ុណ្ណោះ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ការចាប់ផ្តើមគម្រោងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,រហូតមកដល់
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,រហូតមកដល់
 DocType: Rename Tool,Rename Log,ប្តូរឈ្មោះចូល
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,និស្សិតក្រុមឬវគ្គសិក្សាកាលវិភាគគឺជាការចាំបាច់
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,រក្សាបាននូវវិក័យប័ត្រនិងម៉ោងម៉ោងដូចគ្នានៅលើ Timesheet ការងារ
@@ -3462,7 +3484,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,រាយផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។
 DocType: Water Analysis,Storage Temperature,សីតុណ្ហាភាពផ្ទុក
 DocType: Employee Attendance Tool,Unmarked Attendance,វត្តមានចំណាំទុក
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,អ្នកស្រាវជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,អ្នកស្រាវជ្រាវ
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,ឧបករណ៍សិស្សចុះឈ្មោះចូលរៀនកម្មវិធី
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},កាលបរិច្ឆេទចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទបញ្ចប់សម្រាប់កិច្ចការ {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,ឈ្មោះឬអ៊ីម៉ែលចាំបាច់
@@ -3475,7 +3497,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} ពិន្ទុសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការស្នើសុំ RFQs ចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
 DocType: Chapter,Non Profit Manager,កម្មវិធីមិនរកប្រាក់ចំណេញ
 DocType: BOM,Total Cost(Company Currency),តម្លៃសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,សៀរៀលគ្មាន {0} បង្កើតឡើង
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,សៀរៀលគ្មាន {0} បង្កើតឡើង
 DocType: Homepage,Company Description for website homepage,សង្ខេបសម្រាប់គេហទំព័ររបស់ក្រុមហ៊ុនគេហទំព័រ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ឈ្មោះ Suplier
@@ -3485,11 +3507,10 @@
 DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
 DocType: Healthcare Settings,Result Printed,លទ្ធផលបោះពុម្ភ
 DocType: Asset Category Account,Depreciation Expense Account,គណនីរំលស់
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,រយៈពេលសាកល្បង
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},មើល {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,រយៈពេលសាកល្បង
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
 DocType: Project,Total Costing Amount (via Timesheets),ចំនួនទឹកប្រាក់សរុបសរុប (តាមរយៈសន្លឹកកិច្ចការ)
-DocType: Employee Advance,Expense Approver,ការអនុម័តការចំណាយ
+DocType: Department,Expense Approver,ការអនុម័តការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
 DocType: Project,Hourly,រៀងរាល់ម៉ោង
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ដែលមិនមែនជាក្រុមដែលជាក្រុម
@@ -3498,7 +3519,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ដើម្បី Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
 DocType: Accounts Settings,Make Payment via Journal Entry,ធ្វើឱ្យសេវាទូទាត់តាមរយៈ Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,បោះពុម្ពលើ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,បោះពុម្ពលើ
 DocType: Item,Inspection Required before Delivery,ត្រូវការមុនពេលការដឹកជញ្ជូនអធិការកិច្ច
 DocType: Item,Inspection Required before Purchase,ត្រូវការមុនពេលការទិញអធិការកិច្ច
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
@@ -3508,7 +3529,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,បរិមាណលំដាប់អប្បបរមា
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,អង្គការរបស់អ្នក
 DocType: Fee Component,Fees Category,ថ្លៃសេវាប្រភេទ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,ជូនដំណឹងដល់និយោជិក
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
@@ -3518,7 +3539,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,រៀបចំវគ្គ
 DocType: Company,Chart Of Accounts Template,តារាងនៃគណនីទំព័រគំរូ
 DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},ថ្លៃទំនិញឱ្យទាន់សម័យសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},ថ្លៃទំនិញឱ្យទាន់សម័យសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការបែកបាក់គ្នាដោយផ្អែកលើការរកប្រាក់ចំណូលបានប្រាក់ខែនិងការកាត់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
 DocType: Purchase Invoice Item,Accepted Warehouse,ឃ្លាំងទទួលយក
@@ -3526,10 +3547,11 @@
 DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,ប្រារព្ធទិវាពាក់កណ្តាល
 DocType: Sales Invoice,Sales Team,ការលក់ក្រុមការងារ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ធាតុស្ទួន
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ធាតុស្ទួន
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,បញ្ចូលឈ្មោះរបស់អ្នកទទួលផលមុនពេលបញ្ជូន។
 DocType: Program Enrollment Tool,Get Students,ទទួលយកនិស្សិត
 DocType: Serial No,Under Warranty,នៅក្រោមការធានា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[កំហុសក្នុងការ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[កំហុសក្នុងការ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាសណ្តាប់ធ្នាប់ការលក់។
 ,Employee Birthday,បុគ្គលិកខួបកំណើត
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,សូមជ្រើសកាលបរិច្ឆេទបញ្ចប់សម្រាប់ការជួសជុលដែលបានបញ្ចប់
@@ -3548,7 +3570,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,បានបម្រុងទុកសម្រាប់ការចុះកិច្ចសន្យា
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
 DocType: Shopping Cart Settings,Orders,ការបញ្ជាទិញ
-DocType: Employee Leave Approver,Leave Approver,ទុកឱ្យការអនុម័ត
+DocType: Department,Leave Approver,ទុកឱ្យការអនុម័ត
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,សូមជ្រើសបាច់មួយ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,ឈ្មោះការវាយតម្លៃជាក្រុម
@@ -3592,7 +3614,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,បានតាមដានធាតុ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ដើមសម្រាប់អ្នកទទួល
 DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,អ៊ីមែលនេះត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
 DocType: Program Enrollment,Boarding Student,សិស្សប្រឹក្សាភិបាល
 DocType: Asset,Expected Value After Useful Life,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍
@@ -3617,22 +3638,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},ការចូលរួមកំណត់ត្រា {0} មានប្រឆាំងនឹងនិស្សិត {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},សេចក្តីយោង # {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ការធ្លាក់ចុះដោយសារការចោល Eliminated នៃទ្រព្យសកម្ម
-DocType: Member,Member,សមាជិក
+DocType: Loan,Member,សមាជិក
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,គ្រប់គ្រងអាសយដ្ឋាន
 DocType: Work Order Item,Work Order Item,កិច្ចការបញ្ជាទិញ
 DocType: Pricing Rule,Item Code,ក្រមធាតុ
 DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,អ្នកគ្រប់គ្រងកសិកម្ម
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
 DocType: Supplier Scorecard Period,Variables,អថេរ
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),បិទ (លោកបណ្ឌិត)
 DocType: Cheque Print Template,Cheque Size,ទំហំមូលប្បទានប័ត្រ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,គ្មានសៀរៀល {0} មិនត្រូវបាននៅក្នុងស្តុក
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,គ្មានសៀរៀល {0} មិនត្រូវបាននៅក្នុងស្តុក
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ពុម្ពពន្ធលើការលក់ការធ្វើប្រតិបត្តិការ។
 DocType: Sales Invoice,Write Off Outstanding Amount,បិទការសរសេរចំនួនទឹកប្រាក់ដ៏ឆ្នើម
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},គណនី {0} មិនផ្គូផ្គងនឹងក្រុមហ៊ុន {1}
@@ -3640,7 +3661,6 @@
 DocType: Stock Settings,Default Stock UOM,លំនាំដើមហ៊ុន UOM
 DocType: Asset,Number of Depreciations Booked,ចំនួននៃរំលស់បានកក់
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,ចំនួនសរុប
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},ប្រឆាំងនឹងប្រាក់កម្ចីបុគ្គលិក: {0}
 DocType: Landed Cost Item,Receipt Document,ឯកសារបង្កាន់ដៃ
 DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
 DocType: Payment Request,Reference Details,សេចក្តីយោងលំអិត
@@ -3651,7 +3671,7 @@
 DocType: Asset,Double Declining Balance,ការធ្លាក់ចុះទ្វេដងតុល្យភាព
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,គោលបំណងដែលបានបិទមិនអាចត្រូវបានលុបចោល។ unclosed ដើម្បីលុបចោល។
 DocType: Student Guardian,Father,ព្រះបិតា
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Update ស្តុក 'មិនអាចជ្រើសរើសបានចំពោះទ្រព្យអសកម្ម"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Update ស្តុក 'មិនអាចជ្រើសរើសបានចំពោះទ្រព្យអសកម្ម"
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
 DocType: Attendance,On Leave,ឈប់សម្រាក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
@@ -3665,10 +3685,10 @@
 DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
 DocType: Restaurant Order Entry,Current Order,លំដាប់បច្ចុប្បន្ន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},ប្រភពនិងឃ្លាំងគោលដៅមិនអាចមានដូចគ្នាសម្រាប់ជួរដេក {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ចូលទៅកាន់កម្មវិធី
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ជួរដេក {0} # ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក {1} មិនអាចធំជាងចំនួនទឹកប្រាក់ដែលមិនបានទទួល {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ជួរដេក {0} # ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក {1} មិនអាចធំជាងចំនួនទឹកប្រាក់ដែលមិនបានទទួល {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""ពីកាលបរិច្ឆេទ"" ត្រូវតែនៅបន្ទាប់ ""ដល់កាលបរិច្ឆេទ"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
@@ -3691,7 +3711,6 @@
 DocType: Payment Terms Template,Payment Terms,ល័ក្ខខ័ណ្ឌទូទាត់
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,នាទី
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 DocType: Chapter,Meetup Embed HTML,Meetup បញ្ចូល HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ទៅកាន់អ្នកផ្គត់ផ្គង់
@@ -3710,30 +3729,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},សម្រង់ {0} មិនត្រូវបាននៃប្រភេទ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែលសម្រាប់សិស្សដើម្បីផ្ញើសំណើទូទាត់
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែលសម្រាប់សិស្សដើម្បីផ្ញើសំណើទូទាត់
 DocType: Patient,Medical History,ប្រវត្តិពេទ្យ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ធនាគាររូបារូប
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ធនាគាររូបារូប
 DocType: Patient,Patient ID,លេខសម្គាល់អ្នកជំងឺ
 DocType: Physician Schedule,Schedule Name,ដាក់ឈ្មោះឈ្មោះ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,ធ្វើឱ្យប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,បន្ថែមអ្នកផ្គត់ផ្គង់ទាំងអស់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,បន្ថែមអ្នកផ្គត់ផ្គង់ទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ជួរដេក # {0}: ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចច្រើនជាងចំនួនពូកែ។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,រកមើល Bom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
 DocType: Purchase Invoice,Edit Posting Date and Time,កែសម្រួលប្រកាសកាលបរិច្ឆេទនិងពេលវេលា
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},សូមកំណត់ដែលទាក់ទងនឹងការរំលស់ក្នុងគណនីទ្រព្យសកម្មប្រភេទឬ {0} {1} ក្រុមហ៊ុន
 DocType: Lab Test Groups,Normal Range,ជួរធម្មតា
 DocType: Academic Term,Academic Year,ឆ្នាំសិក្សា
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,លក់ដែលអាចប្រើបាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,លេខ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ដែលនៅសល់
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
+DocType: Loan,Loan Account,គណនីប្រាក់កម្ចី
 DocType: Purchase Invoice,GST Details,ព័ត៌មានលម្អិតរបស់ GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},អ៊ីម៉ែលដែលបានផ្ញើទៅឱ្យអ្នកផ្គត់ផ្គង់ {0}
 DocType: Item,Default Sales Unit of Measure,ផ្នែករង្វាស់នៃការលក់ជាលំនាំដើម
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,ឆ្នាំសិក្សា:
+DocType: Subscription,Past Due Date,កាលបរិច្ឆេទហួសកាលកំណត់
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},មិនអនុញ្ញាតឱ្យកំណត់ធាតុជំនួសសម្រាប់ធាតុ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
@@ -3746,7 +3767,7 @@
 DocType: Patient Appointment,Patient Appointment,ការតែងតាំងអ្នកជំងឺ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,អនុម័តតួនាទីមិនអាចជាដូចគ្នាទៅនឹងតួនាទីរបស់ច្បាប់ត្រូវបានអនុវត្ត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,ទទួលបានអ្នកផ្គត់ផ្គង់តាម
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,ទទួលបានអ្នកផ្គត់ផ្គង់តាម
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},រកមិនឃើញ {0} សម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,ចូលទៅកាន់វគ្គសិក្សា
 DocType: Accounts Settings,Show Inclusive Tax In Print,បង្ហាញពន្ធបញ្ចូលគ្នាក្នុងការបោះពុម្ព
@@ -3754,10 +3775,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,សារដែលបានផ្ញើ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,គណនីជាមួយថ្នាំងជាកូនក្មេងដែលមិនអាចត្រូវបានកំណត់ជាសៀវភៅ
 DocType: C-Form,II,ទី II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួនទឹកប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Physician,Physician Schedules,កាលវិភាគគ្រូពេទ្យ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,ចំនួនទឹកប្រាក់សរុបជាមុនមិនអាចច្រើនជាងចំនួនសរុបដែលបានអនុញ្ញាត
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,ចំនួនទឹកប្រាក់សរុបជាមុនមិនអាចច្រើនជាងចំនួនសរុបដែលបានអនុញ្ញាត
 DocType: Salary Slip,Hour Rate,ហួរអត្រា
 DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},មួយទៀតការចូលបិទរយៈពេល {0} ត្រូវបានធ្វើឡើងបន្ទាប់ពី {1}
@@ -3775,6 +3797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការភាគហ៊ុនចាស់ជាង {0}
 DocType: BOM,Inspection Required,អធិការកិច្ចដែលបានទាមទារ
 DocType: Purchase Invoice Item,PR Detail,ពត៌មាននៃការិយាល័យទទួលជំនួយផ្ទាល់
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,សូមបញ្ចូលលេខលិខិតធានាមុននឹងបញ្ជូន។
 DocType: Driving License Category,Class,ថ្នាក់
 DocType: Sales Order,Fully Billed,ផ្សព្វផ្សាយឱ្យបានពេញលេញ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,បញ្ជាទិញការងារមិនអាចត្រូវបានលើកឡើងទល់នឹងគំរូទំនិញ
@@ -3785,7 +3808,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
 DocType: Assessment Plan,Program,កម្មវិធី
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីរបស់ទឹកកកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីជាទឹកកក
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 DocType: Serial No,Is Cancelled,ត្រូវបានលុបចោល
 DocType: Student Group,Group Based On,ដែលមានមូលដ្ឋាននៅលើគ្រុប
 DocType: Student Group,Group Based On,ដែលមានមូលដ្ឋាននៅលើគ្រុប
@@ -3797,9 +3819,10 @@
 DocType: Cheque Print Template,Cheque Height,កម្ពស់មូលប្បទានប័ត្រ
 DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Setup Progress,Setup Progress,រៀបចំវឌ្ឍនភាព
+DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
 DocType: Hub Settings,Publish Items to Hub,បោះពុម្ពផ្សាយធាតុហាប់
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ពីតម្លៃត្រូវតែតិចជាងទៅនឹងតម្លៃនៅក្នុងជួរដេក {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,ការផ្ទេរខ្សែ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,ការផ្ទេរខ្សែ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,សូមពិនិត្យមើលទាំងអស់
 ,Issued Items Against Work Order,មានរបស់របរដែលត្រូវបានចេញអោយធ្វើការប្រឆាំងនឹងការងារ
 DocType: Vehicle Log,Invoice Ref,Ref វិក័យប័ត្រ
@@ -3830,12 +3853,11 @@
 DocType: Customs Tariff Number,Tariff Number,លេខពន្ធ
 DocType: Work Order Item,Available Qty at WIP Warehouse,ដែលអាចប្រើបាននៅក្នុងឃ្លាំង WIP Qty
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ការព្យាករ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ឃ្លាំង {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ឃ្លាំង {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ចំណាំ: ប្រព័ន្ធនឹងមិនបានពិនិត្យមើលលើការចែកចាយនិងការកក់សម្រាប់ធាតុ {0} ជាបរិមាណឬចំនួនទឹកប្រាក់គឺ 0
 DocType: Notification Control,Quotation Message,សារសម្រង់
-DocType: Employee Loan,Employee Loan Application,ពាក្យស្នើសុំកម្ចីរបស់និយោជិក
 DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,សូមសង្គ្រោះអ្នកជំងឺមុន
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,សូមសង្គ្រោះអ្នកជំងឺមុន
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
 DocType: Program Enrollment,Public Transport,ការដឹកជញ្ជូនសាធារណៈ
 DocType: Soil Texture,Silt Composition (%),សមាសភាពអំបិល (%)
@@ -3854,7 +3876,7 @@
 ,Item Balance (Simple),សមតុល្យវត្ថុ (សាមញ្ញ)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,វិក័យប័ត្រដែលបានលើកឡើងដោយអ្នកផ្គត់ផ្គង់។
 DocType: POS Profile,Write Off Account,បិទការសរសេរគណនី
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ឥណពន្ធចំណាំ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ឥណពន្ធចំណាំ AMT
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ចំនួនការបញ្ចុះតំលៃ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
 DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
@@ -3877,6 +3899,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
 DocType: Sales Invoice Item,Delivered Qty,ប្រគល់ Qty
 DocType: Assessment Plan,Assessment Plan,ផែនការការវាយតំលៃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,បញ្ច្រាសធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,អតិថិជន {0} ត្រូវបានបង្កើត។
 DocType: Stock Settings,Limit Percent,ដែនកំណត់ភាគរយ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,បច្ចុប្បន្នពុំមានស្តុកនៅក្នុងឃ្លាំងណាមួយឡើយ
@@ -3890,14 +3913,15 @@
 DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Payment Entry,Payment References,ឯកសារយោងការទូទាត់
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",ចំនួននៃចន្លោះពេលសម្រាប់ចន្លោះពេលឧ។ ចន្លោះពេលជា &#39;ថ្ងៃ&#39; និងចំនួនទឹកប្រាក់ចន្លោះវិក្កយបត្រគឺ 3 វិក័យប័ត្រនឹងត្រូវបានបង្កើតរៀងរាល់ 3 ថ្ងៃម្តង
 DocType: Vehicle,Insurance Details,សេចក្ដីលម្អិតការធានារ៉ាប់រង
 DocType: Account,Payable,បង់
 DocType: Share Balance,Share Type,ចែករំលែកប្រភេទ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),កូនបំណុល ({0})
 DocType: Pricing Rule,Margin,រឹម
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,ប្តូរប្រវត្តិរូប POS
 DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
@@ -3907,10 +3931,11 @@
 DocType: Lead,Address Desc,អាសយដ្ឋាន DESC
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,គណបក្សជាការចាំបាច់
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},ជួរដេកដែលមានកាលបរិច្ឆេទដែលស្ទួនគ្នានៅក្នុងជួរដេកផ្សេងទៀតត្រូវបានរកឃើញ: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},ជួរដេកដែលមានកាលបរិច្ឆេទដែលស្ទួនគ្នានៅក្នុងជួរដេកផ្សេងទៀតត្រូវបានរកឃើញ: {list}
 DocType: Topic,Topic Name,ប្រធានបទឈ្មោះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,សូមកំណត់ពុម្ពលំនាំដើមសម្រាប់ទុកសេចក្តីជូនដំណឹងអនុម័តនៅក្នុងការកំណត់ធនធានមនុស្ស។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ជ្រើសរើសនិយោជិកដើម្បីទទួលបានបុគ្គលិក។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ជ្រើសរើសនិយោជិកដើម្បីទទួលបានបុគ្គលិក។
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,សូមជ្រើសរើសកាលបរិច្ឆេទដែលត្រឹមត្រូវ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,ជ្រើសធម្មជាតិនៃអាជីវកម្មរបស់អ្នក។
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3929,7 +3954,7 @@
 DocType: Asset Movement,Source Warehouse,ឃ្លាំងប្រភព
 DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ចែករំលែក Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,បានបង្កើតវិក័យប័ត្រលក់ {0}
 DocType: Employee,Confirmation Date,ការអះអាងកាលបរិច្ឆេទ
 DocType: C-Form,Total Invoiced Amount,ចំនួន invoiced សរុប
@@ -3938,7 +3963,7 @@
 DocType: Account,Accumulated Depreciation,រំលស់បង្គរ
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ឈ្មោះអចិន្ត្រៃយ៍
 DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
-DocType: Employee Loan Application,Required by Date,ទាមទារដោយកាលបរិច្ឆេទ
+DocType: Loan Application,Required by Date,ទាមទារដោយកាលបរិច្ឆេទ
 DocType: Lead,Lead Owner,ការនាំមុខម្ចាស់
 DocType: Production Plan,Sales Orders Detail,លំអិតការបញ្ជាទិញលក់
 DocType: Bin,Requested Quantity,បរិមាណបានស្នើ
@@ -3951,10 +3976,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ប្រាក់សរុប - ការដកហូតសរុប - សងប្រាក់កម្ចី
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ននិងថ្មី Bom មិនអាចជាដូចគ្នា
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,លេខសម្គាល់ប័ណ្ណប្រាក់ខែ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,វ៉ារ្យ៉ង់ច្រើន
 DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ផ្តល់
+DocType: Subscription,Trial Period Start Date,កាលបរិច្ឆេទចាប់ផ្ដើមសវនាការ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,សូមចូលជាអ្នកប្រើផ្សេង។
@@ -3975,12 +4001,11 @@
 DocType: Student Guardian,Student Guardian,អាណាព្យាបាលរបស់សិស្ស
 DocType: Member,Member Name,ឈ្មោះសមាជិក
 DocType: Stock Settings,Use Naming Series,ប្រើស៊ុមឈ្មោះ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
 DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,នៅក្នុងការជាវ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
 DocType: Membership,Payment Details,សេចក្ដីលម្អិតការបង់ប្រាក់
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,អត្រា Bom
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","បញ្ឈប់ការងារមិនអាចលុបចោលបានទេ, សូមបញ្ឈប់វាសិនមុននឹងលុបចោល"
 DocType: Asset,Journal Entry for Scrap,ទិនានុប្បវត្តិធាតុសម្រាប់សំណល់អេតចាយ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
@@ -4000,6 +4025,7 @@
 DocType: Land Unit,Land Unit,ដីធ្លី
 ,Purchase Analytics,វិភាគទិញ
 DocType: Sales Invoice Item,Delivery Note Item,ធាតុចំណាំដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,បាត់វិក័យប័ត្របច្ចុប្បន្ន {0}
 DocType: Asset Maintenance Log,Task,ភារកិច្ច
 DocType: Purchase Taxes and Charges,Reference Row #,សេចក្តីយោងជួរដេក #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ចំនួនបាច់គឺចាំបាច់សម្រាប់ធាតុ {0}
@@ -4012,7 +4038,7 @@
 DocType: Company,Exchange Gain / Loss Account,គណនីប្តូរប្រាក់ចំណេញ / បាត់បង់
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,បុគ្គលិកនិងវត្តមាន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},គោលបំណងត្រូវតែជាផ្នែកមួយនៃ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,វេទិកាសហគមន៍
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,បរិមាណជាក់ស្តែងនៅក្នុងស្តុក
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,បរិមាណជាក់ស្តែងនៅក្នុងស្តុក
@@ -4027,7 +4053,7 @@
 DocType: Lab Test Template,Standard Selling Rate,អត្រាស្តង់ដាលក់
 DocType: Account,Rate at which this tax is applied,អត្រាដែលពន្ធនេះត្រូវបានអនុវត្ត
 DocType: Cash Flow Mapper,Section Name,ឈ្មោះផ្នែក
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,រៀបចំ Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,រៀបចំ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ការងារបច្ចុប្បន្ន
 DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,បិទការសរសេរ
@@ -4038,9 +4064,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,រង់ចាំសម្រាប់ការធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយនៅក្នុង Bill of Material ។ វាអាចចំណាយពេលពីរបីនាទី។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេសអាស័យដ្ឋានពុម្ពលំនាំដើមរបស់អ្នកមានប្រាជ្ញា
 DocType: Water Analysis,Appearance,រូបរាង
+DocType: HR Settings,Leave Status Notification Template,ចាកចេញពីទំព័រជូនដំណឹងពីស្ថានភាព
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,មធ្យម ការទិញអត្រាតំលៃ
 DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,ព័ត៌មានសមាជិក។
@@ -4063,7 +4089,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,មិនអនុញ្ញាត។ សូមបិទគំរូសាកល្បង
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែកគួរតែស្មើជាភាគរយទៅ 100%
 DocType: Crop Cycle,Linked Land Unit,អង្គភាពដីដែលជាប់ទាក់ទង
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 DocType: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
@@ -4079,7 +4105,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ទៅកាន់អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} គឺមិនមែនជាលេខបាច់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN មិនត្រឹមត្រូវឬបញ្ចូលរដ្ឋសភាសម្រាប់មិនបានចុះឈ្មោះ
 DocType: Training Event,Seminar,សិក្ខាសាលា
 DocType: Program Enrollment Fee,Program Enrollment Fee,ថ្លៃសេវាកម្មវិធីការចុះឈ្មោះ
@@ -4095,14 +4121,14 @@
 DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
 DocType: Company,Create Chart Of Accounts Based On,បង្កើតគំនូសតាងរបស់គណនីមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,មិនអាចបម្លែងវាទៅជាក្រុម។ កិច្ចការកុមារមាន។
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
 ,Stock Ageing,ភាគហ៊ុន Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},សិស្ស {0} មានការប្រឆាំងនឹងអ្នកសុំសិស្ស {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ការកែសម្រួលជុំទី (រូបិយប័ណ្ណក្រុមហ៊ុន)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,តារាងពេលវេលា
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,បាច់:
 DocType: Volunteer,Afternoon,ពេលរសៀល
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
 DocType: Cheque Print Template,Scanned Cheque,មូលប្បទានប័ត្រដែលបានស្កេន
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
@@ -4118,7 +4144,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,គម្រោង {0} មានរួចហើយ
 DocType: Medical Department,Nursing User,អ្នកប្រើថែទាំ
 DocType: Plant Analysis,Plant Analysis Criterias,លក្ខណៈវិនិច្ឆ័យវិភាគរុក្ខជាតិ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ការទទួលខុសត្រូវ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},ស៊េរីលេខ {0} មិនមែនជារបស់ {1} បាច់ទេ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,រយៈពេលសុពលភាពនៃសម្រង់នេះត្រូវបានបញ្ចប់។
 DocType: Expense Claim Account,Expense Claim Account,គណនីបណ្តឹងទាមទារការចំណាយ
 DocType: Accounts Settings,Allow Stale Exchange Rates,អនុញ្ញាតឱ្យមានអត្រាប្តូរប្រាក់ថេរ
@@ -4140,11 +4167,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ធ្វើវ៉ារ្យ៉ង់
 DocType: Item,Default BOM,Bom លំនាំដើម
 DocType: Project,Total Billed Amount (via Sales Invoices),បរិមាណសរុបដែលបានចេញវិក្កយបត្រ (តាមវិក័យប័ត្រលក់)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ចំនួនទឹកប្រាក់ឥណពន្ធចំណាំ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ចំនួនទឹកប្រាក់ឥណពន្ធចំណាំ
 DocType: Project Update,Not Updated,មិនទាន់បានធ្វើបច្ចុប្បន្នភាព
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",មានភាពមិនស៊ីសង្វាក់គ្នារវាងអត្រាគ្មានភាគហ៊ុននិងចំនួនទឹកប្រាក់ដែលបានគណនា
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,សរុបឆ្នើម AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,សរុបឆ្នើម AMT
 DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
 DocType: Employee Advance,Advance Account,គណនីមុន
 DocType: Job Offer,Job Offer Terms,លក្ខខណ្ឌផ្តល់ការងារ
@@ -4153,7 +4180,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,រថយន្ដ
 DocType: Vehicle,Insurance Company,ក្រុមហ៊ុនធានារ៉ាប់រង
 DocType: Asset Category Account,Fixed Asset Account,គណនីទ្រព្យសកម្មថេរ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,អថេរ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,អថេរ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
 DocType: Chapter,Members,សមាជិក
 DocType: Student,Student Email Address,អាសយដ្ឋានអ៊ីមែលរបស់សិស្ស
@@ -4177,7 +4204,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,ហាត់ការ
 DocType: Delivery Stop,Address Name,ឈ្មោះអាសយដ្ឋាន
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},ពុះ {0} ឯកតានៃ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},ពុះ {0} ឯកតានៃ {1}
 DocType: Assessment Code,Assessment Code,ក្រមការវាយតំលៃ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,ជាមូលដ្ឋាន
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ប្រតិបតិ្តការភាគហ៊ុនមុនពេល {0} ត្រូវបានជាប់គាំង
@@ -4185,25 +4212,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
 DocType: Bank Reconciliation Detail,Payment Document,ឯកសារការទូទាត់
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,កំហុសក្នុងការវាយតម្លៃរូបមន្តលក្ខណៈវិនិច្ឆ័យ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
+DocType: Subscription,Plans,ផែនការ
 DocType: Salary Slip,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,សម្ភារៈបញ្ហា
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,កំហុសមួយបានកើតឡើងខណៈពេលបង្កើតការកើតឡើងដដែលៗ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,សម្ភារៈបញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,សម្រង់ពាក្យ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,គ្មានក្រុមនិស្សិតបានបង្កើត។
 DocType: Purchase Invoice Item,Serial No,សៀរៀលគ្មាន
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ចំនួនទឹកប្រាក់ដែលត្រូវសងប្រចាំខែមិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឥណទាន
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,ចំនួនទឹកប្រាក់ដែលត្រូវសងប្រចាំខែមិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឥណទាន
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,ជួរដេក # {0}: កាលបរិច្ឆេទដឹកជញ្ជូនដែលរំពឹងទុកមិនអាចមានមុនកាលបរិច្ឆេទបញ្ជាទិញទេ
 DocType: Purchase Invoice,Print Language,បោះពុម្ពភាសា
 DocType: Salary Slip,Total Working Hours,ម៉ោងធ្វើការសរុប
 DocType: Sales Invoice,Customer PO Details,ពត៌មានលម្អិតអតិថិជន
-DocType: Subscription,Next Schedule Date,កាលបរិច្ឆេទកាលវិភាគបន្ទាប់
 DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,គណនីបើកបណ្តោះអាសន្ន
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
@@ -4232,11 +4258,11 @@
 DocType: Issue,Opening Time,ម៉ោងបើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,គ្មាននិយោជិកដែលមានលក្ខណៈវិនិច្ឆ័យដូចបានរៀបរាប់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
 DocType: Hotel Settings,Default Customer,អតិថិជនលំនាំដើម
 DocType: Assessment Plan,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,កុំបញ្ជាក់ថាតើការណាត់ជួបត្រូវបានបង្កើតសម្រាប់ថ្ងៃតែមួយទេ
@@ -4261,16 +4287,16 @@
 DocType: Journal Entry Account,Employee Advance,បុព្វលាភនិយោជិក
 DocType: Payroll Entry,Payroll Frequency,ភពញឹកញប់បើកប្រាក់បៀវត្ស
 DocType: Lab Test Template,Sensitivity,ភាពប្រែប្រួល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,វត្ថុធាតុដើម
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,វត្ថុធាតុដើម
 DocType: Leave Application,Follow via Email,សូមអនុវត្តតាមរយៈអ៊ីម៉ែល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,រុក្ខជាតិនិងគ្រឿងម៉ាស៊ីន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,រុក្ខជាតិនិងគ្រឿងម៉ាស៊ីន
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ការកំណត់សង្ខេបការងារប្រចាំថ្ងៃ
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,សូមបញ្ចូល Reqd តាមកាលបរិច្ឆេទ
 DocType: Payment Entry,Internal Transfer,សេវាផ្ទេរប្រាក់ផ្ទៃក្នុង
 DocType: Asset Maintenance,Maintenance Tasks,ភារកិច្ចថែទាំ
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
 DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
@@ -4278,14 +4304,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,សមាហរណកម្ម ERPNext
 DocType: Crop Cycle,Detected Disease,ជំងឺដែលរកឃើញ
 ,Produced,រថយន្តនេះផលិត
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ថ្ងៃចាប់ផ្តើមការបង់ប្រាក់មិនអាចនៅមុនកាលបរិច្ឆេទបញ្ចេញ។
 DocType: Item,Item Code for Suppliers,ក្រមធាតុសម្រាប់អ្នកផ្គត់ផ្គង់
 DocType: Issue,Raised By (Email),បានលើកឡើងដោយ (អ៊ីម៉ែល)
 DocType: Training Event,Trainer Name,ឈ្មោះគ្រូបង្គោល
 DocType: Mode of Payment,General,ទូទៅ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ការទំនាក់ទំនងចុងក្រោយ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ការទំនាក់ទំនងចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
@@ -4299,7 +4326,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} នៅថ្ងៃឈប់សម្រាកពាក់កណ្តាលនៅ {1}
 DocType: Production Plan,Get Material Request,ទទួលបានសម្ភារៈសំណើ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ចំណាយប្រៃសណីយ៍
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ចំណាយប្រៃសណីយ៍
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
 ,Item Variant Details,លំអិតធាតុលំអិត
@@ -4310,9 +4337,9 @@
 DocType: Drug Prescription,Hour,ហួរ
 DocType: Restaurant Order Entry,Last Sales Invoice,វិក័យប័ត្រលក់ចុងក្រោយ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},សូមជ្រើស Qty ប្រឆាំងនឹងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
 DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
 DocType: Company,Monthly Sales Target,គោលដៅលក់ប្រចាំខែ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},អាចត្រូវបានអនុម័តដោយ {0}
@@ -4320,7 +4347,7 @@
 DocType: Item,Default Material Request Type,លំនាំដើមសម្ភារៈប្រភេទសំណើ
 DocType: Supplier Scorecard,Evaluation Period,រយៈពេលវាយតម្លៃ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,មិនស្គាល់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,ការងារមិនត្រូវបានបង្កើត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,ការងារមិនត្រូវបានបង្កើត
 DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
 DocType: Purchase Invoice,Export Type,នាំចេញប្រភេទ
 DocType: Salary Slip Loan,Salary Slip Loan,ប្រាក់កម្ចីប្រាក់កម្ចី
@@ -4336,8 +4363,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,បើកវិក័យប័ត្រសង្ខេប
 DocType: Education Settings,Education Manager,អ្នកគ្រប់គ្រងការអប់រំ
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,ប្រវែងអប្បបរមារវាងរោងចក្រនិមួយៗនៅក្នុងទីវាលសម្រាប់ការលូតលាស់ល្អបំផុត
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",ទំនិញជាបាច់ {0} មិនអាច Update បានតាមរយៈប្រតិបត្រការកែស្តុក(Stock Reconcilliation)ទេ សូមប្រើប្រាស់ ប្រតិ្តបត្រការបញ្ចូលស្តុក (Stock Entry) វិញ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",ទំនិញជាបាច់ {0} មិនអាច Update បានតាមរយៈប្រតិបត្រការកែស្តុក(Stock Reconcilliation)ទេ សូមប្រើប្រាស់ ប្រតិ្តបត្រការបញ្ចូលស្តុក (Stock Entry) វិញ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",ទំនិញជាបាច់ {0} មិនអាច Update បានតាមរយៈប្រតិបត្រការកែស្តុក(Stock Reconcilliation)ទេ សូមប្រើប្រាស់ ប្រតិ្តបត្រការបញ្ចូលស្តុក (Stock Entry) វិញ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",ទំនិញជាបាច់ {0} មិនអាច Update បានតាមរយៈប្រតិបត្រការកែស្តុក(Stock Reconcilliation)ទេ សូមប្រើប្រាស់ ប្រតិ្តបត្រការបញ្ចូលស្តុក (Stock Entry) វិញ
 DocType: Quality Inspection,Report Date,របាយការណ៍ស្តីពីកាលបរិច្ឆេទ
 DocType: Student,Middle Name,ជាឈ្មោះកណ្តាល
 DocType: C-Form,Invoices,វិក័យប័ត្រ
@@ -4370,20 +4397,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,វិក័យប័ត្រ
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Daily Work Summary Group,Send Emails At,ផ្ញើអ៊ីម៉ែល
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ទិដ្ឋភាពទម្រង់
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,អ្នកអនុម័តប្រាក់ចំណាយចាំបាច់ក្នុងការទាមទារសំណង
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",បន្ថែមអ្នកប្រើទៅអង្គការរបស់អ្នកក្រៅពីខ្លួនឯង។
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,គ្មានអតិថិជននៅឡើយទេ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,គ្មានការស្នើសុំសម្ភារៈបានបង្កើត
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,អាជ្ញាប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
@@ -4406,11 +4434,12 @@
 DocType: Vehicle,Chassis No,តួគ្មាន
 DocType: Payment Request,Initiated,ផ្តួចផ្តើម
 DocType: Production Plan Item,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,សូមជ្រើសរើសលេខកូដសម្ងាត់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,សូមជ្រើសរើសលេខកូដសម្ងាត់
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ទទួលបានផលប្រយោជន៍ពន្ធ ITC រួមបញ្ចូល
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
+DocType: Bank Guarantee,Clauses and Conditions,លក្ខន្តិកៈនិងលក្ខខណ្ឌ
 DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
 DocType: Project Task,View Timesheet,មើលសន្លឹកពេលវេលា
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,កាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Leave Type,Is Encash,តើការ Encash
 DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
@@ -4424,9 +4453,10 @@
 DocType: Patient,Alcohol Current Use,គ្រឿងស្រវឹងប្រើបច្ចុប្បន្ន
 DocType: Student Admission Program,Student Admission Program,កម្មវិធីចូលរៀនរបស់សិស្ស
 DocType: Payment Entry,Account Paid To,គណនីបង់ទៅ
+DocType: Subscription Settings,Grace Period,រយៈពេលព្រះគុណ
 DocType: Item Alternative,Alternative Item Name,ឈ្មោះធាតុជំនួស
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ធាតុមេ {0} មិនត្រូវធាតុហ៊ុនមួយ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",មិនអាចដាក់ប្រាក់បៀវត្សបានទេ <br> ហេតុផលដែលអាចកើតមាន: <br> 1. ប្រាក់ខែសុទ្ធតិចជាង 0 ។ <br> 2. អាសយដ្ឋានអ៊ីម៉ែលក្រុមហ៊ុនបានបញ្ជាក់នៅក្នុងមេបុគ្គលិកគឺមិនត្រឹមត្រូវ។ <br>
@@ -4436,7 +4466,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ថវិកាសម្រាប់គណនី {1} ទល់នឹង {2} {3} គឺ {4} ។ វានឹងលើសពី {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ចេញ Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,និងមិនបានដោះធីកនៅក្នុង
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,កម្រងឯកសារចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
 DocType: Student Sibling,Student ID,លេខសម្គាល់របស់សិស្ស
@@ -4448,14 +4477,16 @@
 DocType: Complaint,Complaint,បណ្តឹង
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ធ្វើឱ្យការទូទាត់សង
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,នាយកដ្ឋានទាំងអស់
 DocType: Patient,Alcohol Past Use,អាល់កុលប្រើអតីតកាល
 DocType: Fertilizer Content,Fertilizer Content,មាតិកាជី
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,CR
 DocType: Project Update,Problematic/Stuck,បញ្ហា / ជាប់
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
 DocType: Share Transfer,Transfer,សេវាផ្ទេរប្រាក់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ត្រូវលុបចោលការបញ្ជាទិញ {0} មុននឹងលុបចោលការបញ្ជាទិញនេះ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
@@ -4479,10 +4510,11 @@
 DocType: Cheque Print Template,Message to show,សារសម្រាប់បង្ហាញ
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,ការលក់រាយ
 DocType: Student Attendance,Absent,អវត្តមាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,កញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,កញ្ចប់ផលិតផល
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,មិនអាចស្វែងរកពិន្ទុចាប់ផ្តើមនៅ {0} ។ អ្នកត្រូវមានពិន្ទុឈរពី 0 ទៅ 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
+DocType: Subscription,Current Invoice Start Date,កាលបរិច្ឆេទចាប់ផ្តើមវិក្កយបត្របច្ចុប្បន្ន
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ទាំងឥណពន្ធឬចំនួនទឹកប្រាក់ឥណទានត្រូវបានទាមទារសម្រាប់ {2}
 DocType: GL Entry,Remarks,សុន្ទរកថា
@@ -4492,11 +4524,13 @@
 DocType: Task,Parent Task,កិច្ចការមាតាឬបិតា
 DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ធ្វើឱ្យការនាំមុខ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
 DocType: Stock Settings,Show Barcode Field,បង្ហាញវាលលេខកូដ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ប្រាក់បៀវត្សដែលបានដំណើរការរួចទៅហើយសម្រាប់សម័យនេះរវាង {0} និង {1}, ទុកឱ្យរយៈពេលកម្មវិធីមិនអាចមានរវាងជួរកាលបរិច្ឆេទនេះ។"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ប្រាក់បៀវត្សដែលបានដំណើរការរួចទៅហើយសម្រាប់សម័យនេះរវាង {0} និង {1}, ទុកឱ្យរយៈពេលកម្មវិធីមិនអាចមានរវាងជួរកាលបរិច្ឆេទនេះ។"
+DocType: Fiscal Year,Auto Created,បង្កើតដោយស្វ័យប្រវត្តិ
 DocType: Chapter Member,Leave Reason,ទុកហេតុផល
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,វិក័យប័ត្រ {0} លែងមាន
 DocType: Guardian Interest,Guardian Interest,កាសែត The Guardian ការប្រាក់
 DocType: Volunteer,Availability,ភាពទំនេរ
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,ដំឡើងតម្លៃលំនាំដើមសម្រាប់វិក្កយបត្រ POS
@@ -4505,14 +4539,13 @@
 DocType: Timesheet,Employee Detail,បុគ្គលិកលំអិត
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,លេខសម្គាល់អ៊ីមែល Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,លេខសម្គាល់អ៊ីមែល Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ថ្ងៃកាលបរិច្ឆេទក្រោយនិងធ្វើម្តងទៀតនៅថ្ងៃនៃខែត្រូវតែស្មើ
 DocType: Lab Prescription,Test Code,កូដសាកល្បង
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ការកំណត់សម្រាប់គេហទំព័រគេហទំព័រ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុនៃពិន្ទុនៃ {1}
 DocType: Job Offer,Awaiting Response,រង់ចាំការឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ខាងលើ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ចំនួនទឹកប្រាក់សរុប {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ចំនួនទឹកប្រាក់សរុប {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,និយាយពីប្រសិនបើគណនីត្រូវបង់មិនស្តង់ដារ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',សូមជ្រើសក្រុមការវាយតម្លៃផ្សេងទៀតជាង &quot;ក្រុមវាយតម្លៃទាំងអស់ &#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ជួរដេក {0}: មជ្ឈមណ្ឌលចំណាយត្រូវបានទាមទារសម្រាប់ធាតុ {1}
@@ -4523,7 +4556,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ការវិភាគទឹក
 DocType: Chapter,Region,តំបន់
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Holiday List,Weekly Off,បិទប្រចាំសប្តាហ៍
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,ដំណើរការទាញយកឡើងវិញនូវតំណភ្ជាប់
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍ៈឆ្នាំ 2012, 2012-13"
@@ -4539,7 +4572,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,តម្លៃនៃទ្រព្យសម្បត្តិបានបោះបង់ចោល
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
 DocType: Vehicle,Policy No,គោលនយោបាយគ្មាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
 DocType: Asset,Straight Line,បន្ទាត់ត្រង់
 DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,ពុះ
@@ -4579,21 +4612,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,ផ្លូវ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,មិនអាចបម្លែងទៅក្នុងសៀវភៅរបស់មជ្ឈមណ្ឌលដែលជាការចំនាយវាមានថ្នាំងរបស់កុមារ
 DocType: Production Plan,Total Planned Qty,ចំនួនគ្រោងសរុប
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,តម្លៃពិធីបើក
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,តម្លៃពិធីបើក
 DocType: Salary Detail,Formula,រូបមន្ត
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,# សៀរៀល
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,# សៀរៀល
 DocType: Lab Test Template,Lab Test Template,គំរូតេស្តមន្ទីរពិសោធន៍
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,គណនីលក់
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,គណនីលក់
 DocType: Purchase Invoice Item,Total Weight,ទំងន់សរុប
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,គណៈកម្មការលើការលក់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,គណៈកម្មការលើការលក់
 DocType: Job Offer Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 DocType: Purchase Order Item,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ភោជនីយដ្ឋានការបញ្ជាទិញចូល
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
 DocType: Asset Maintenance Task,Assign To Name,កំណត់ឈ្មោះ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ចំណាយកំសាន្ត
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,ចំណាយកំសាន្ត
 DocType: Hub Settings,Enabled Users,បានបើកអ្នកប្រើប្រាស់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ធ្វើឱ្យសម្ភារៈសំណើ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},បើកធាតុ {0}
@@ -4606,24 +4639,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,កម្មវិធីសម្រាប់ការឈប់សម្រាក។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
 DocType: Vehicle,Last Carbon Check,ពិនិត្យកាបូនចុងក្រោយនេះ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ការចំណាយផ្នែកច្បាប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,ការចំណាយផ្នែកច្បាប់
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,សូមជ្រើសរើសបរិមាណនៅលើជួរដេក
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,បើកការលក់និងវិក័យប័ត្រទិញ
 DocType: Purchase Invoice,Posting Time,ម៉ោងប្រកាស
 DocType: Timesheet,% Amount Billed,% ចំនួន billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
 DocType: Sales Partner,Logo,រូបសញ្ញា
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},គ្មានធាតុជាមួយសៀរៀលគ្មាន {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},គ្មានធាតុជាមួយសៀរៀលគ្មាន {0}
 DocType: Email Digest,Open Notifications,ការជូនដំណឹងបើកទូលាយ
 DocType: Payment Entry,Difference Amount (Company Currency),ចំនួនទឹកប្រាក់ផ្សេងគ្នា (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ការចំណាយដោយផ្ទាល់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ការចំណាយដោយផ្ទាល់
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់ចំណូលអតិថិជនថ្មី
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ការចំណាយការធ្វើដំណើរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ការចំណាយការធ្វើដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},បន្ថែមវាលផ្ទាល់ខ្លួនការជាវនៅក្នុង doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 DocType: Purchase Receipt Item,Sample Quantity,បរិមាណគំរូ
+DocType: Bank Guarantee,Name of Beneficiary,ឈ្មោះអ្នកទទួលផល
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",បន្ទាន់សម័យ BOM ចំណាយដោយស្វ័យប្រវត្តិតាមរយៈកម្មវិធីកំណត់ពេលដោយផ្អែកលើអត្រាតំលៃចុងក្រោយ / អត្រាតំលៃបញ្ជី / អត្រាទិញចុងក្រោយនៃវត្ថុធាតុដើម។
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},គណនី {0}: គណនីមាតាបិតា {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {2}
@@ -4635,14 +4668,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,ការសាកល្បង
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,សមាសភាគប្រាក់ខែ
 DocType: Program Enrollment Tool,New Academic Year,ឆ្នាំសិក្សាថ្មី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 DocType: GST Settings,B2C Limit,ដែនកំណត់ B2C
 DocType: Work Order Item,Transferred Qty,ផ្ទេរ Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ការរុករក
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ការធ្វើផែនការ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ការធ្វើផែនការ
 DocType: Share Balance,Issued,ចេញផ្សាយ
+DocType: Loan,Repayment Start Date,ថ្ងៃចាប់ផ្តើមសង
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,សកម្មភាពសិស្ស
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
 DocType: Payment Request,Payment Gateway Details,សេចក្ដីលម្អិតការទូទាត់
@@ -4655,10 +4689,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
 DocType: Email Digest,Send regular summary reports via Email.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
 DocType: Assessment Result,Student Name,ឈ្មោះរបស់និស្សិត
 DocType: Brand,Item Manager,កម្មវិធីគ្រប់គ្រងធាតុ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,បើកប្រាក់បៀវត្សដែលត្រូវបង់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,បើកប្រាក់បៀវត្សដែលត្រូវបង់
 DocType: Buying Settings,Default Supplier Type,ប្រភេទហាងទំនិញលំនាំដើម
 DocType: Plant Analysis,Collection Datetime,ការប្រមូលទិន្នន័យរយៈពេល
 DocType: Work Order,Total Operating Cost,ថ្លៃប្រតិបត្តិការ
@@ -4668,9 +4702,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ប្រើ {0} មិនមាន
 DocType: Payment Term,Day(s) after invoice date,ថ្ងៃ (s) បន្ទាប់ពីកាលវិក័យប័ត្រ
 DocType: Payment Schedule,Payment Schedule,កាលវិភាគទូទាត់
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,អក្សរកាត់
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ចូលការទូទាត់រួចហើយ
+DocType: Subscription,Trial Period End Date,កាលបរិច្ឆេទបញ្ចប់សវនាការ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,មិន authroized តាំងពី {0} លើសពីដែនកំណត់
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ចៅហ្វាយពុម្ពប្រាក់បៀវត្ស។
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,រោគសាស្ត្រ
@@ -4687,9 +4721,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
 DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
 ,Territory Target Variance Item Group-Wise,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,បង្គរប្រចាំខែ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,គណនី {0}: គណនីមាតាបិតា {1} មិនមាន
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -4698,14 +4732,15 @@
 DocType: Lab Prescription,Test Created,បានបង្កើតសាកល្បង
 DocType: Healthcare Settings,Custom Signature in Print,ហត្ថលេខាផ្ទាល់ខ្លួននៅក្នុងការបោះពុម្ព
 DocType: Account,Temporary,ជាបណ្តោះអាសន្ន
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,អតិថិជន LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,អតិថិជន LPO No.
 DocType: Program,Courses,វគ្គសិក្សា
 DocType: Monthly Distribution Percentage,Percentage Allocation,ការបម្រុងទុកជាភាគរយ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,លេខាធិការ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,លេខាធិការ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",ប្រសិនបើបានបិទ &quot;នៅក្នុងពាក្យ&quot; វាលនឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,សកម្មភាពនេះនឹងបញ្ឈប់វិក័យប័ត្រនាពេលអនាគត។ តើអ្នកប្រាកដជាចង់បោះបង់ការជាវនេះមែនទេ?
 DocType: Serial No,Distinct unit of an Item,អង្គភាពផ្សេងគ្នានៃធាតុ
 DocType: Supplier Scorecard Criteria,Criteria Name,ឈ្មោះលក្ខណៈវិនិច្ឆ័យ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,សូមកំណត់ក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,សូមកំណត់ក្រុមហ៊ុន
 DocType: Pricing Rule,Buying,ការទិញ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ជំងឺ &amp; ជី
 DocType: HR Settings,Employee Records to be created by,កំណត់ត្រាបុគ្គលិកដែលនឹងត្រូវបានបង្កើតឡើងដោយ
@@ -4714,18 +4749,18 @@
 DocType: POS Profile,Apply Discount On,អនុវត្តការបញ្ចុះតំលៃនៅលើ
 DocType: Member,Membership Type,ប្រភេទសមាជិកភាព
 ,Reqd By Date,Reqd តាមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ម្ចាស់បំណុល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ម្ចាស់បំណុល
 DocType: Assessment Plan,Assessment Name,ឈ្មោះការវាយតំលៃ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,បង្ហាញ PDC នៅក្នុងការបោះពុម្ព
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,បង្ហាញ PDC នៅក្នុងការបោះពុម្ព
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ជួរដេក # {0}: មិនស៊េរីគឺជាការចាំបាច់
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,ផ្តល់ជូនការងារ
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,អក្សរកាត់វិទ្យាស្ថាន
 ,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
@@ -4743,7 +4778,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,អថេរចំនួនសរុប
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើអនុញ្ញាតប្រព័ន្ធនេះនឹងផ្តល់ការបញ្ចូលគណនីសម្រាប់ការដោយស្វ័យប្រវត្តិ។
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,ឈ្មួញកណ្តាល
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ការចូលរួមសម្រាប់បុគ្គលិក {0} ត្រូវបានសម្គាល់រួចហើយសម្រាប់ថ្ងៃនេះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ការចូលរួមសម្រាប់បុគ្គលិក {0} ត្រូវបានសម្គាល់រួចហើយសម្រាប់ថ្ងៃនេះ
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",បានបន្ទាន់សម័យតាមរយៈការនៅនាទី &quot;ពេលវេលាកំណត់ហេតុ &#39;
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
@@ -4754,6 +4789,7 @@
 DocType: Lab Test,Approved Date,កាលបរិច្ឆេទអនុម័ត
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
+DocType: Subscriber,Subscriber Name,ឈ្មោះអតិថិជន
 DocType: Serial No,Out of Warranty,ចេញពីការធានា
 DocType: BOM Update Tool,Replace,ជំនួស
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,គ្មានផលិតផលដែលបានរកឃើញ។
@@ -4763,19 +4799,18 @@
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
 DocType: Customer,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ជ្រើសរើសគណនីប្រាក់ចំណូលក្នុងប្រាក់កម្ចីបុគ្គលិក {0}
 DocType: Work Order,Required Items,ធាតុដែលបានទាមទារ
 DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,ធនធានមនុស្ស
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការទូទាត់ការផ្សះផ្សាការទូទាត់
 DocType: Disease,Treatment Task,កិច្ចការព្យាបាល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
 DocType: BOM Item,BOM No,Bom គ្មាន
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ធាតុទិនានុប្បវត្តិ {0} មិនមានគណនី {1} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
 DocType: Item,Moving Average,ជាមធ្យមការផ្លាស់ប្តូរ
 DocType: BOM Update Tool,The BOM which will be replaced,Bom ដែលនឹងត្រូវបានជំនួស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ឧបករណ៍អេឡិចត្រូនិ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ឧបករណ៍អេឡិចត្រូនិ
 DocType: Asset,Maintenance Required,ត្រូវការការថែទាំ
 DocType: Account,Debit,ឥណពន្ធ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"ស្លឹកត្រូវតែត្រូវបានបម្រុងទុកនៅក្នុង 0,5 ច្រើន"
@@ -4784,7 +4819,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ឆ្នើម AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធាតុសំណុំក្រុមគោលដៅប្រាជ្ញាសម្រាប់ការនេះការលក់បុគ្គល។
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុនបង្កកចាស់ជាង [ថ្ងៃ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់សម្រាប់ទ្រព្យសកម្មថេរទិញ / លក់
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់សម្រាប់ទ្រព្យសកម្មថេរទិញ / លក់
 DocType: Asset Maintenance Team,Maintenance Team Name,ឈ្មោះក្រុមថែទាំ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើសិនជាវិធានតម្លៃពីរឬច្រើនត្រូវបានរកឃើញដោយផ្អែកលើលក្ខខណ្ឌខាងលើអាទិភាពត្រូវបានអនុវត្ត។ អាទិភាពគឺជាលេខរវាង 0 ទៅ 20 ខណៈពេលតម្លៃលំនាំដើមគឺសូន្យ (ទទេ) ។ ចំនួនខ្ពស់មានន័យថាវានឹងយកអាទិភាពប្រសិនបើមិនមានវិធានតម្លៃច្រើនដែលមានស្ថានភាពដូចគ្នា។
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,អតិថិជនគឺចាំបាច់ប្រសិនបើ &#39;ឱកាសពី&#39; ត្រូវបានជ្រើសរើសជាអតិថិជន
@@ -4794,19 +4829,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ប្រភេទនៃការទាមទារសំណងថ្លៃ។
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},អត្រាសម្រាប់ធាតុលក់ {0} គឺទាបជាង {1} របស់ខ្លួន។ អត្រាលក់គួរមានយ៉ាងហោចណាស់ {2}
-DocType: Item,Taxes,ពន្ធ
+DocType: Subscription,Taxes,ពន្ធ
 DocType: Purchase Invoice,capital goods,ទំនិញមូលធន
 DocType: Purchase Invoice Item,Weight Per Unit,ទម្ងន់ក្នុងមួយឯកតា
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,បង់និងការមិនផ្តល់
 DocType: Project,Default Cost Center,មជ្ឈមណ្ឌលតម្លៃលំនាំដើម
-DocType: Bank Guarantee,End Date,កាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ប្រតិបត្តិការភាគហ៊ុន
 DocType: Budget,Budget Accounts,គណនីថវិកា
 DocType: Employee,Internal Work History,ប្រវត្តិការងារផ្ទៃក្នុង
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,ចំនួនទឹកប្រាក់រំលស់បង្គរ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,សមធម៌ឯកជន
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,អក្សរសម្ងាត់របស់អ្នកផ្គត់ផ្គង់
-DocType: Employee Loan,Fully Disbursed,ផ្តល់ឱ្រយអតិថិជនបានយ៉ាងពេញលេញ
 DocType: Employee Advance,Due Advance Amount,ចំនួនទឹកប្រាក់បុរេប្រទាន
 DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
 DocType: Account,Expense,ការចំណាយ
@@ -4830,7 +4863,7 @@
 ,Employee Information,ព័ត៌មានបុគ្គលិក
 DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មកដល់
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,គំរូពន្ធលំនាំដើមសម្រាប់ការលក់និងការទិញត្រូវបានបង្កើត។
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,កំណត់ត្រាការវាយតំលៃ {0} មានរួចហើយ។
@@ -4838,7 +4871,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',សូមកំណត់ក្រុមហ៊ុនត្រងនៅទទេប្រសិនបើក្រុមតាមគឺ &#39;ក្រុមហ៊ុន&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ការប្រកាសកាលបរិច្ឆេទមិនអាចបរិច្ឆេទនាពេលអនាគត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ជួរដេក # {0}: សៀរៀលគ្មាន {1} មិនផ្គូផ្គងនឹង {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,សម្រាប់ការបង្កើតឡើងវិញ
 DocType: Stock Entry,Target Warehouse Address,អាស័យដ្ឋានឃ្លាំង
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,ចាកចេញធម្មតា
 DocType: Agriculture Task,End Day,បញ្ចប់ថ្ងៃ
@@ -4863,11 +4895,10 @@
 DocType: Material Request,% Ordered,% លំដាប់
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",សម្រាប់សិស្សនិស្សិតដែលមានមូលដ្ឋានលើវគ្គសិក្សាជាក្រុមហើយវគ្គនេះនឹងមានសុពលភាពសម្រាប់គ្រប់សិស្សចុះឈ្មោះចូលរៀនវគ្គសិក្សានេះបានមកពីកម្មវិធីចុះឈ្មោះចូលរៀននៅ។
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ម៉ៅការ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
 DocType: Share Balance,From No,ពីលេខ
 DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
 DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},សារថ្មីពី {អ្នកផ្ញើ}
 DocType: Customer,Customer Primary Address,អាស័យដ្ឋានចម្បងអតិថិជន
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ព្រឹត្តិបត្រ
 DocType: Drug Prescription,Description/Strength,ការពិពណ៌នា / កម្លាំង
@@ -4876,22 +4907,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
 DocType: Department,Leave Block List,ទុកឱ្យបញ្ជីប្លុក
 DocType: Purchase Invoice,Tax ID,លេខសម្គាល់ការប្រមូលពន្ធលើ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ ជួរឈរត្រូវទទេ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ ជួរឈរត្រូវទទេ
 DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,អនុម័ត
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",អាសយដ្ឋានមិនត្រឹមត្រូវសម្រាប់ {0} សូមជួសជុលដើម្បីបន្ត។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",អាសយដ្ឋានមិនត្រឹមត្រូវសម្រាប់ {0} សូមជួសជុលដើម្បីបន្ត។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","ចំនួននៃគណនីថ្មី, វានឹងត្រូវបានរួមបញ្ចូលនៅក្នុងឈ្មោះគណនីជាបុព្វបទមួយ"
 DocType: Maintenance Team Member,Team Member,សមាជិកក្រុម
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,គ្មានលទ្ធផលដើម្បីដាក់ស្នើ
 DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
-DocType: Employee Loan,Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ
+DocType: Loan,Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ
 ,Project Quantity,បរិមាណគម្រោង
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
 DocType: Loan Type,Rate of Interest (%) Yearly,អត្រានៃការប្រាក់ (%) ប្រចាំឆ្នាំ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,គណនីបណ្តោះអាសន្ន
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ពណ៌ខ្មៅ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,គណនីបណ្តោះអាសន្ន
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ពណ៌ខ្មៅ
 DocType: BOM Explosion Item,BOM Explosion Item,ធាតុផ្ទុះ Bom
 DocType: Shareholder,Contact List,បញ្ជីទំនាក់ទំនង
 DocType: Account,Auditor,សវនករ
@@ -4899,16 +4930,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ធាតុផលិត
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ស្វែងយល់បន្ថែម
 DocType: Cheque Print Template,Distance from top edge,ចម្ងាយពីគែមកំពូល
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,បញ្ជីតម្លៃ {0} ត្រូវបានបិទឬមិនមាន
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,បញ្ជីតម្លៃ {0} ត្រូវបានបិទឬមិនមាន
 DocType: Purchase Invoice,Return,ត្រឡប់មកវិញ
 DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","កែសម្រួលនៅក្នុងទំព័រពេញសម្រាប់ជម្រើសច្រើនទៀតដូចជាទ្រព្យសកម្ម, សៀរៀល, បាច់ល។"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ការតែងតាំងនិងការពិគ្រោះយោបល់
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងជំនាន់ទី {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","ទ្រព្យសកម្ម {0} មិនអាចត្រូវបានបោះបង់ចោល, ដូចដែលវាមានរួចទៅ {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ពិនិត្យចាំបាច់
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ពិនិត្យចាំបាច់
 DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,លោក Mark អវត្តមាន
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,បានបរាជ័យក្នុងការបង្កើតក្រុមហ៊ុន
@@ -4920,7 +4951,7 @@
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,គ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,បន្ថែមធាតុពី
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,បន្ថែមធាតុពី
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ដំណាំនិងដី
 DocType: Cheque Print Template,Regular,ទៀងទាត
 DocType: Fertilizer,Density (if liquid),ដង់ស៊ីតេ (ប្រសិនបើរាវ)
@@ -4945,24 +4976,26 @@
 DocType: Payment Entry,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,រកមើលវដ្តនៃការលក់
 DocType: Assessment Plan,Supervisor,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,រក្សាធាតុចូល
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,រក្សាធាតុចូល
 ,Available Stock for Packing Items,បរិមាណទំនិញក្នុងស្តុកដែលអាចវិចខ្ចប់បាន
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
 ,Work Order Stock Report,របាយការណ៍ភាគហ៊ុនបញ្ជាទិញ
+DocType: Purchase Receipt,Auto Repeat Detail,លម្អិតម្តងទៀតដោយស្វ័យប្រវត្តិ
 DocType: Assessment Result Tool,Assessment Result Tool,ការវាយតំលៃលទ្ធផលឧបករណ៍
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,ជាប្រធាន
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,ស្នើប្រភេទ
 DocType: BOM Scrap Item,BOM Scrap Item,ធាតុសំណល់អេតចាយ Bom
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,គ្រប់គ្រងគុណភាព
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,គ្រប់គ្រងគុណភាព
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Project,Total Billable Amount (via Timesheets),បរិមាណសរុបដែលអាចចេញវិក្កយបត្រ (តាមរយៈកម្រងសន្លឹកកិច្ចការ)
 DocType: Agriculture Task,Previous Business Day,ថ្ងៃពាណិជ្ជកម្មមុន
-DocType: Employee Loan,Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល
+DocType: Loan,Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល
 DocType: Employee,Health Insurance No,ធានារ៉ាប់រងសុខភាពលេខ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ឥណទានចំណាំ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ឥណទានចំណាំ AMT
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,បរិមាណពន្ធសរុប
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
 DocType: Opening Invoice Creation Tool,Purchase,ការទិញ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,មានតុល្យភាព Qty
@@ -4973,16 +5006,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} សម្រាប់
 DocType: Healthcare Settings,Valid number of days,ចំនួនត្រឹមត្រូវនៃថ្ងៃ
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,មជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,ចាប់ផ្ដើមការជាវប្រចាំឡើងវិញ
 DocType: Land Unit,Linked Plant Analysis,ការវិភាគរុក្ខជាតិដែលទាក់ទង
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណក្រុមហ៊ុនផ្គត់ផ្គង់ដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ជួរដេក # {0}: ជម្លោះពេលវេលាជាមួយនឹងជួរ {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,អនុញ្ញាតឱ្យអត្រាការវាយតម្លៃសូន្យ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,អនុញ្ញាតឱ្យអត្រាការវាយតម្លៃសូន្យ
+DocType: Bank Guarantee,Receiving,ការទទួល
 DocType: Training Event Employee,Invited,បានអញ្ជើញ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,រចនាសម្ព័ន្ធប្រាក់ខែសកម្មច្រើនបានរកឃើញសម្រាប់ {0} បុគ្គលិកសម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,រៀបចំគណនីច្រកផ្លូវ។
 DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ទ្រព្យសកម្មថេរ
 DocType: Payment Entry,Set Exchange Gain / Loss,កំណត់អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
 ,GST Purchase Register,ជីអេសធីទិញចុះឈ្មោះ
 ,Cash Flow,លំហូរសាច់ប្រាក់
@@ -5003,9 +5038,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,បញ្ជីប្រតិបត្តិការទាំងអស់
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,រាប់ចម្បង
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,រាប់ចម្បង
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},សូមស្វែងរកការភ្ជាប់ {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ដំណាក់កាលនៃការជំនុំជម្រះនិងកាលបរិច្ឆេទបញ្ចប់នៃការជំនុំជម្រះត្រូវបានកំណត់
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,អត្រាមធ្យម
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ចំនួនទឹកប្រាក់ទូទាត់សរុបក្នុងកាលវិភាគទូទាត់ត្រូវតែស្មើគ្នាសរុប / សរុប
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ចំនួនទឹកប្រាក់ទូទាត់សរុបក្នុងកាលវិភាគទូទាត់ត្រូវតែស្មើគ្នាសរុប / សរុប
+DocType: Subscription Plan Detail,Plan,ផែនការ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ធនាគារតុល្យភាពសេចក្តីថ្លែងការណ៍ដូចជាក្នុងសៀវភៅធំ
 DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
 DocType: Authorization Rule,Customer / Item Name,អតិថិជន / ធាតុឈ្មោះ
@@ -5035,6 +5071,7 @@
 DocType: Work Order,Warehouses,ឃ្លាំង
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ទ្រព្យសម្បត្តិមិនអាចត្រូវបានផ្ទេរ
 DocType: Hotel Room Pricing,Hotel Room Pricing,តម្លៃបន្ទប់សណ្ឋាគារ
+DocType: Subscription,Days Until Due,ថ្ងៃរហូតដល់ពេលកំណត់
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ធាតុនេះគឺជាការបំរែបំរួលនៃ {0} (គំរូ) ។
 DocType: Workstation,per hour,ក្នុងមួយម៉ោង
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ការទិញ
@@ -5043,13 +5080,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",សម្រាប់សិស្សនិស្សិតដែលមានមូលដ្ឋាននៅជំនាន់ទីក្រុមជំនាន់សិស្សនឹងត្រូវបានធ្វើឱ្យមានសុពលភាពការគ្រប់សិស្សពីការសម្រាប់កម្មវិធីចុះឈ្មោះនេះ។
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ចែកចាយ
+DocType: Journal Entry Account,Loan,ឥណទាន
 DocType: Expense Claim Advance,Expense Claim Advance,ចំណាយប្រាក់កម្រៃបុរេប្រទាន
 DocType: Lab Test,Report Preference,ចំណាប់អារម្មណ៍របាយការណ៍
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ព័ត៌មានស្ម័គ្រចិត្ត។
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
 ,Quoted Item Comparison,ធាតុដកស្រង់សម្តីប្រៀបធៀប
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},ការស៊ុតបញ្ចូលគ្នារវាង {0} និង {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,បញ្ជូន
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,បញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ការបញ្ចុះតម្លៃអតិបរមាដែលបានអនុញ្ញាតសម្រាប់ធាតុ: {0} គឺ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,តម្លៃទ្រព្យសម្បត្តិសុទ្ធដូចជានៅលើ
 DocType: Crop,Produce,ផលិត
@@ -5059,7 +5097,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ការប្រើប្រាស់សម្ភារៈសម្រាប់ផលិត
 DocType: Item Alternative,Alternative Item Code,កូដធាតុជម្មើសជំនួស
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
 DocType: Delivery Stop,Delivery Stop,ការដឹកជញ្ជូនបញ្ឈប់
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
 DocType: Item,Material Issue,សម្ភារៈបញ្ហា
@@ -5069,15 +5107,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ដុំនិងសាប៊ូម្ស៉ៅ
 DocType: BOM,Show Items,បង្ហាញធាតុ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ចាប់ពីពេលដែលមិនអាចត្រូវបានធំជាងទៅពេលមួយ។
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,តើអ្នកចង់ជូនដំណឹងដល់អតិថិជនទាំងអស់តាមរយៈអ៊ីម៉ែលទេ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,តើអ្នកចង់ជូនដំណឹងដល់អតិថិជនទាំងអស់តាមរយៈអ៊ីម៉ែលទេ?
+DocType: Subscription Plan,Billing Interval,ចន្លោះវិក្កយបត្រ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ប្រវត្តិរូប
 DocType: Hub Settings,Hub Username,ឈ្មោះអ្នកប្រើហាប់
 DocType: Salary Detail,Component,សមាសភាគ
 DocType: Assessment Criteria,Assessment Criteria Group,ការវាយតម្លៃលក្ខណៈវិនិច្ឆ័យជាក្រុម
 DocType: Healthcare Settings,Patient Name By,ឈ្មោះអ្នកជម្ងឺដោយ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},បញ្ចូលធាតុទិនានុប្បវត្តិសម្រាប់ប្រាក់ខែពី {0} ដល់ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},បញ្ចូលធាតុទិនានុប្បវត្តិសម្រាប់ប្រាក់ខែពី {0} ដល់ {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
 DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
 DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
@@ -5091,23 +5129,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
 DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែមានប្រតិ្តប័ត្រស្តុករួចហើយ {0}
-DocType: Employee Loan,Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;អ្នកទទួល&#39; មិនបានបញ្ជាក់
+DocType: Loan,Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន
 DocType: BOM Update Tool,Update latest price in all BOMs,ធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយនៅគ្រប់បណ្តាញ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្ត
 DocType: Vehicle,Vehicle,រថយន្ត
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,បញ្ចូលឈ្មោះធនាគារឬស្ថាប័នផ្តល់ឥណទានមុនពេលបញ្ជូន។
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} ត្រូវតែបញ្ជូន
 DocType: POS Profile,Item Groups,ក្រុមធាតុ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
 DocType: Sales Order Item,For Production,ចំពោះផលិតកម្ម
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,សូមបន្ថែមគណនីបើកបណ្តោះអាសន្នក្នុងតារាងគណនី
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,សូមបន្ថែមគណនីបើកបណ្តោះអាសន្នក្នុងតារាងគណនី
 DocType: Customer,Customer Primary Contact,អតិថិជនចម្បងទំនាក់ទំនង
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,អំឡុងពេលបិទទិនានុប្បវត្តិ
 DocType: Project Task,View Task,មើលការងារ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ចម្បង / នាំមុខ%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ចម្បង / នាំមុខ%
+DocType: Bank Guarantee,Bank Guarantee Type,ប្រភេទលិខិតធានា
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ផ្នែកវិក័យប័ត្រ
 ,Asset Depreciations and Balances,សមតុលយទ្រព្យសកម្មរំលស់និងការ
@@ -5118,9 +5157,8 @@
 DocType: Production Plan,Include Subcontracted Items,រួមបញ្ចូលធាតុដែលបានបន្តកិច្ចសន្យា
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ចូលរួមជាមួយ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,កង្វះខាត Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,មិនអាចផ្លាស់ប្តូរលក្ខណៈសម្បត្តិវ៉ារ្យង់បន្ទាប់ពីការដឹកជញ្ជូនភាគហ៊ុន។ អ្នកនឹងត្រូវបង្កើតធាតុថ្មីដើម្បីធ្វើវា។
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
-DocType: Employee Loan,Repay from Salary,សងពីប្រាក់ខែ
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+DocType: Loan,Repay from Salary,សងពីប្រាក់ខែ
 DocType: Leave Application,LAP/,ភ្លៅ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
 DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
@@ -5144,11 +5182,11 @@
 DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ធាតុស្ទួនក្រុមបានរកឃើញក្នុងតារាងក្រុមធាតុ
 DocType: Land Unit,Parent Land Unit,អង្គភាពដីធ្លីមាតាឬបិតា
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
 DocType: Fertilizer,Fertilizer Name,ឈ្មោះជី
 DocType: Salary Slip,Net Pay,ប្រាក់ចំណេញសុទ្ធ
 DocType: Cash Flow Mapping Accounts,Account,គណនី
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,សៀរៀល {0} គ្មានត្រូវបានទទួលរួចហើយ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,សៀរៀល {0} គ្មានត្រូវបានទទួលរួចហើយ
 ,Requested Items To Be Transferred,ធាតុដែលបានស្នើសុំឱ្យគេបញ្ជូន
 DocType: Expense Claim,Vehicle Log,រថយន្តចូល
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"វត្តមាននៃជំងឺគ្រុនក្តៅ (បណ្ដោះអាសន្ន&gt; 38,5 អង្សាសេ / 101,3 អង្សារឬមានបណ្ដោះអាសន្ន&gt; 38 ° C / 100.4 ° F)"
@@ -5189,24 +5227,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
 DocType: Asset Maintenance,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
 DocType: Purchase Invoice,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
-DocType: C-Form,Series,កម្រងឯកសារ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},រូបិយប័ណ្ណនៃបញ្ជីតម្លៃ {0} ត្រូវតែ {1} ឬ {2}
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
 DocType: Soil Texture,Ternary Plot,អាថ៌កំបាំង
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
 DocType: Driver,License Number,លេខអាជ្ញាប័ណ្ណ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,គោលបំណងថែទាំទស្សនកិច្ច
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ការចុះឈ្មោះអ្នកជំងឺវិក័យប័ត្រ
 DocType: Crop,Period,រយៈពេល
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,ទូទៅសៀវភៅ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},បុគ្គលិក {0} នៅលើស្លឹកនៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},បុគ្គលិក {0} នៅលើស្លឹកនៅលើ {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,មើលតែងតែនាំឱ្យមាន
 DocType: Program Enrollment Tool,New Program,កម្មវិធីថ្មី
 DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
 DocType: Salary Detail,Salary Detail,លំអិតប្រាក់ខែ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,សូមជ្រើស {0} ដំបូង
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,សូមជ្រើស {0} ដំបូង
 DocType: Appointment Type,Physician,គ្រូពេទ្យ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ការពិគ្រោះយោបល់
@@ -5214,15 +5251,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) មិនអាចធំជាងបរិមាណដែលបានគ្រោងទុក ({2}) ក្នុងលំដាប់ការងារ {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ពេលវេលាសម្រាប់ការផលិតសន្លឹក។
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,សរុបរង
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,មិនអាចផ្លាស់ប្តូរលក្ខណសម្បត្តិវ៉ារ្យ៉ង់បន្ទាប់ពីប្រតិបត្តិការភាគហ៊ុន។ អ្នកនឹងត្រូវបង្កើតធាតុថ្មីដើម្បីធ្វើវា។
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,អាណត្តិ SEPC របស់ GoCardless
 DocType: Physician,Charges,ការចោទប្រកាន់
 DocType: Production Plan,Get Items For Work Order,ទទួលបានរបស់របរសម្រាប់ស្នាដៃការងារ
 DocType: Salary Detail,Default Amount,ចំនួនលំនាំដើម
 DocType: Lab Test Template,Descriptive,ពិពណ៌នា
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,សង្ខេបខែនេះ
 DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្អាក់ស្តុកដែលចាស់ជាង` មិនអាចតូចាជាង % d នៃចំនួនថ្ងៃ ។
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្អាក់ស្តុកដែលចាស់ជាង` មិនអាចតូចាជាង % d នៃចំនួនថ្ងៃ ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,កំណត់គោលដៅលក់ដែលអ្នកចង់បានសម្រាប់ក្រុមហ៊ុនរបស់អ្នក។
 ,Project wise Stock Tracking,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
@@ -5250,11 +5288,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,បានបរាជ័យក្នុងការបង្កើតវេបសាយ
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,ធាតុរក្សាការរក្សាទុកដែលបានបង្កើតរួចហើយឬបរិមាណគំរូមិនត្រូវបានផ្តល់
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,ធាតុរក្សាការរក្សាទុកដែលបានបង្កើតរួចហើយឬបរិមាណគំរូមិនត្រូវបានផ្តល់
 DocType: Program,Program Abbreviation,អក្សរកាត់កម្មវិធី
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
 DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
-DocType: Bank Guarantee,Start Date,ថ្ងៃចាប់ផ្តើម
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,បម្រុងទុកស្លឹកសម្រាប់រយៈពេល។
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,មូលប្បទានប័ត្រនិងប្រាក់បញ្ញើបានជម្រះមិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,គណនី {0}: អ្នកមិនអាចកំណត់ដោយខ្លួនវាជាគណនីឪពុកម្តាយ
@@ -5269,11 +5306,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ម៉ោងធ្វើការ
 DocType: Project,Expected Start Date,គេរំពឹងថានឹងចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Purchase Invoice,04-Correction in Invoice,04- ការកែតម្រូវក្នុងវិក្កយបត្រ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,ការងារដែលបានបង្កើតរួចហើយសម្រាប់ធាតុទាំងអស់ជាមួយ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,ការងារដែលបានបង្កើតរួចហើយសម្រាប់ធាតុទាំងអស់ជាមួយ BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,សេចក្ដីលម្អិតអំពីរបាយការណ៍
 DocType: Setup Progress Action,Setup Progress Action,រៀបចំសកម្មភាពវឌ្ឍនភាព
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ការទិញបញ្ជីតំលៃ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ការទិញបញ្ជីតំលៃ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,បោះបង់ការជាវ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,សូមជ្រើសស្ថានភាពតំហែទាំដែលបានបញ្ចប់ឬលុបកាលបរិច្ឆេទបញ្ចប់
 DocType: Supplier,Default Payment Terms Template,គំរូលក្ខខណ្ឌទូទាត់លំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
@@ -5284,7 +5322,6 @@
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
 DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ប្រសិនបើអ្នកបានប្រមូលថវិកាសកម្មភាពលើសពីប្រចាំខែ
-DocType: Subscription,Submit on creation,ដាក់ស្នើលើការបង្កើត
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
 DocType: Asset,Disposal Date,បោះចោលកាលបរិច្ឆេទ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",អ៊ីមែលនឹងត្រូវបានផ្ញើទៅបុគ្គលិកសកម្មអស់ពីក្រុមហ៊ុននេះនៅម៉ោងដែលបានផ្តល់ឱ្យប្រសិនបើពួកគេមិនមានថ្ងៃឈប់សម្រាក។ សេចក្ដីសង្ខេបនៃការឆ្លើយតបនឹងត្រូវបានផ្ញើនៅកណ្តាលអធ្រាត្រ។
@@ -5303,6 +5340,7 @@
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Cheque Print Template,Cheque Print Template,ទំព័រគំរូបោះពុម្ពមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ចំនួនថ្ងៃបន្ទាប់ពីកាលបរិច្ឆេទនៃវិក្ក័យប័ត្របានកន្លងផុតទៅមុនពេលលុបចោលការជាវប្រចាំឬការចុះបញ្ជីជាការបង់ប្រាក់
 DocType: Lab Test Template,Sample Collection,ការប្រមូលគំរូ
 ,Requested Items To Be Ordered,ធាតុដែលបានស្នើដើម្បីឱ្យបានលំដាប់
 DocType: Price List,Price List Name,ឈ្មោះតារាងតម្លៃ
@@ -5311,7 +5349,7 @@
 DocType: Account,Income,ប្រាក់ចំណូល
 DocType: Industry Type,Industry Type,ប្រភេទវិស័យឧស្សាហកម្ម
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,អ្វីមួយដែលខុស!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,ការលក់វិក័យប័ត្រ {0} ត្រូវបានដាក់ស្នើរួចទៅហើយ
 DocType: Supplier Scorecard Scoring Criteria,Score,ពិន្ទុ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ឆ្នាំសារពើពន្ធ {0} មិនមាន
@@ -5331,12 +5369,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} គួរតែជាតម្លៃចន្លោះ 0 និង 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនថ្ងៃដែលអាចប្រើបាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
 DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,ម៉ោងអតិបរមាប្រឆាំងនឹង Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,កាលបរិច្ឆេទដែលបានកំណត់ពេល
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,សរុបបង់ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,សរុបបង់ AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,សារដែលបានធំជាង 160 តួអក្សរដែលនឹងត្រូវចែកចេញជាសារច្រើន
 DocType: Purchase Receipt Item,Received and Accepted,បានទទួលនិងទទួលយក
 DocType: Hub Settings,Company and Seller Profile,ពត៌មានរបស់ក្រុមហ៊ុននិងអ្នកលក់
@@ -5350,10 +5388,9 @@
 DocType: Item,Variant Based On,វ៉ារ្យង់ដែលមានមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 100% ។ វាគឺជា {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,សូមកែ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
 DocType: Request for Quotation Item,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,អនាមិក
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ទទួលបានពី
 DocType: Lead,Converted,ប្រែចិត្តជឿ
@@ -5367,6 +5404,7 @@
 DocType: Asset,Assets,ទ្រព្យសកម្ម
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,កុំព្យូទ័រ
 DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
+DocType: Subscription,Current Invoice End Date,កាលបរិច្ឆេទបញ្ចប់វិក្កយបត្របច្ចុប្បន្ន
 DocType: Payment Term,Due Date Based On,កាលបរិច្ឆេទដោយផ្អែកលើ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,សូមកំណត់ក្រុមអតិថិជនលំនាំដើមនិងដែនដីនៅក្នុងការកំណត់លក់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} មិនមាន
@@ -5374,7 +5412,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,ធាតុ: {0} មិនមាននៅក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,គ្មានការទូទាត់សងដែលត្រូវបានជ្រើសរើសសម្រាប់ធាតុទិនានុប្បវត្តិ
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
+DocType: Loan,Disbursed,ចំណាយ
 DocType: Healthcare Settings,Laboratory Settings,ការកំណត់មន្ទីរពិសោធន៍
 DocType: Patient Appointment,Service Unit,អង្គភាពសេវាកម្ម
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,រៀបចំអ្នកផ្គត់ផ្គង់ដោយជោគជ័យ
@@ -5387,12 +5427,12 @@
 DocType: Share Balance,No of Shares,លេខនៃភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'មានលេខសៀរៀល' មិនអាចជ្រើសរើសបានទេ សំរាប់ផលិតផលដែលមិនរាប់ស្តុក
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,ជ្រើសស្ថានភាព
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
 DocType: School House,House Name,ឈ្មោះផ្ទះ
 DocType: Fee Schedule,Total Amount per Student,ចំនួនសរុបក្នុងមួយសិស្ស
 DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,អគ្គិសនី
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,អគ្គិសនី
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,បន្ថែមនៅសល់នៃអង្គការរបស់អ្នកដែលជាអ្នកប្រើរបស់អ្នក។ អ្នកអាចបន្ថែមទៅក្នុងវិបផតថលអតិថិជនដែលអញ្ជើញរបស់អ្នកដោយបន្ថែមពួកគេពីការទំនាក់ទំនង
 DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
 DocType: Grant Application,Requested Amount,ចំនួនទឹកប្រាក់ដែលបានស្នើ
@@ -5402,7 +5442,7 @@
 DocType: Crop Cycle,Detected Diseases,ជំងឺដែលរកឃើញ
 DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
 DocType: Item,Customer Code,លេខកូដអតិថិជន
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 DocType: Asset Maintenance Task,Last Completion Date,កាលបរិច្ឆេទបញ្ចប់ចុងក្រោយ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
@@ -5410,9 +5450,10 @@
 DocType: GoCardless Settings,GoCardless Settings,ការកំណត់ GoCardless
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
 DocType: Restaurant,Active Menu,ម៉ឺនុយសកម្ម
 DocType: Target Detail,Target Qty,គោលដៅ Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ប្រឆាំងនឹងប្រាក់កម្ចី: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ការកំណត់ Checkout
 DocType: Student Attendance,Present,នាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ការដឹកជញ្ជូនចំណាំ {0} មិនត្រូវបានដាក់ជូន
@@ -5421,9 +5462,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Production Plan Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM មិនមានស្តុកទេ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM មិនមានស្តុកទេ
 DocType: Chapter,Chapter Head,ជំពូកក្បាល
 DocType: Payment Term,Month(s) after the end of the invoice month,ខែ (s) បន្ទាប់ពីបញ្ចប់នៃវិក័យប័ត្រ
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
@@ -5431,11 +5472,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ពេលវេលានៃការធ្វើតេស្តទិនានុប្បវត្តិមិនអាចត្រូវបានសាកល្បងមុនពេលកាលបរិច្ឆេទ
 DocType: POS Profile,Allow user to edit Discount,អនុញ្ញាតឱ្យអ្នកប្រើកែសម្រួលការបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ទទួលបានអតិថិជនពី
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ទទួលបានអតិថិជនពី
 DocType: Purchase Invoice Item,Include Exploded Items,រួមបញ្ចូលធាតុផ្ទុះ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",ទិញត្រូវតែត្រូវបានធីកបើកម្មវិធីសម្រាប់ការត្រូវបានជ្រើសរើសជា {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
 DocType: Shipping Rule,Restrict to Countries,ដាក់កំហិតទៅប្រទេស
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Sales Invoice Timesheet,Billing Hours,ម៉ោងវិក័យប័ត្រ
 DocType: Project,Total Sales Amount (via Sales Order),បរិមាណលក់សរុប (តាមរយៈការបញ្ជាទិញ)
@@ -5454,6 +5496,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,អ្នកវាយតំលៃ
 DocType: Payment Entry,Allocate Payment Amount,បម្រុងទុកចំនួនទឹកប្រាក់ទូទាត់
+DocType: Subscription Plan,Subscription Plan,ផែនការបរិវិសកម្ម
 DocType: Employee External Work History,Salary,ប្រាក់បៀវត្ស
 DocType: Serial No,Delivery Document Type,ដឹកជញ្ជូនប្រភេទឯកសារ
 DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
@@ -5478,9 +5521,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,ជួរ Ageing 2
 DocType: SG Creation Tool Course,Max Strength,កម្លាំងអតិបរមា
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ដំឡើងការកំណត់ជាមុន
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},គ្មានចំណាំចែកចាយដែលត្រូវបានជ្រើសរើសសម្រាប់អតិថិជន {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},គ្មានចំណាំចែកចាយដែលត្រូវបានជ្រើសរើសសម្រាប់អតិថិជន {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Bom បានជំនួស
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ជ្រើសធាតុផ្អែកលើកាលបរិច្ឆេទដឹកជញ្ជូន
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ជ្រើសធាតុផ្អែកលើកាលបរិច្ឆេទដឹកជញ្ជូន
 DocType: Grant Application,Has any past Grant Record,មានឯកសារជំនួយឥតសំណងកន្លងមក
 ,Sales Analytics,វិភាគការលក់
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ដែលអាចប្រើបាន {0}
@@ -5499,7 +5542,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការចំណាយវត្ថុធាតុដើមការី
 DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុលការកំណត់សម្រាប់លក់
 DocType: Hotel Room Reservation,Hotel Room Reservation,កក់បន្ទប់សណ្ឋាគារ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,សេវាបំរើអតិថិជន
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,សេវាបំរើអតិថិជន
 DocType: BOM,Thumbnail,កូនរូបភាព
 DocType: Item Customer Detail,Item Customer Detail,ពត៌មានរបស់អតិថិជនធាតុ
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
@@ -5516,7 +5559,7 @@
 DocType: Fees,Student Details,ព័ត៌មានលំអិតរបស់សិស្ស
 DocType: Purchase Invoice Item,Stock Qty,ហ៊ុន Qty
 DocType: Purchase Invoice Item,Stock Qty,ហ៊ុន Qty
-DocType: Employee Loan,Repayment Period in Months,រយៈពេលសងប្រាក់ក្នុងខែ
+DocType: Loan,Repayment Period in Months,រយៈពេលសងប្រាក់ក្នុងខែ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,កំហុស: មិនមានអត្តសញ្ញាណប័ណ្ណដែលមានសុពលភាព?
 DocType: Naming Series,Update Series Number,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ
 DocType: Account,Equity,សមធម៌
@@ -5525,7 +5568,7 @@
 DocType: Task,Closing Date,ថ្ងៃផុតកំណត់
 DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
 DocType: Timesheet,Work Detail,ព័ត៌មានលម្អិតអំពីការងារ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,វិស្វករ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,វិស្វករ
 DocType: Journal Entry,Total Amount Currency,រូបិយប័ណ្ណចំនួនសរុប
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ស្វែងរកផ្នែកផ្ដុំបញ្ចូលគ្នាជាឯកតា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
@@ -5571,13 +5614,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ម្ចាស់ជំនួយវាយបញ្ចូលព័ត៌មាន។
 DocType: Request for Quotation,Supplier Detail,ក្រុមហ៊ុនផ្គត់ផ្គង់លំអិត
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},កំហុសក្នុងការនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ចំនួន invoiced
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ចំនួន invoiced
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ទម្ងន់លក្ខណៈវិនិច្ឆ័យត្រូវបន្ថែមរហូតដល់ 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,ការចូលរួម
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,ធាតុក្នុងស្តុក
 DocType: BOM,Materials,សមា្ភារៈ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិនបើមិនបានធីកបញ្ជីនេះនឹងត្រូវបានបន្ថែមទៅកាន់ក្រសួងគ្នាដែលជាកន្លែងដែលវាត្រូវបានអនុវត្ត។
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},បង្កើត {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ប្រភពនិងគោលដៅឃ្លាំងមិនអាចត្រូវបានដូចគ្នា
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
@@ -5601,14 +5643,14 @@
 DocType: Shipping Rule,Fixed,ថេរ
 DocType: Vehicle Service,Clutch Plate,សន្លឹកក្ដាប់
 DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,ចំណាយរដ្ឋបាល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,ចំណាយរដ្ឋបាល
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ការប្រឹក្សាយោបល់
 DocType: Customer Group,Parent Customer Group,ឪពុកម្តាយដែលជាក្រុមអតិថិជន
-DocType: Journal Entry,Subscription,ការជាវ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,ការជាវ
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,កម្រៃសេវាការបង្កើតរង់ចាំ
 DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,រយៈពេលជូនដំណឹង
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,រយៈពេលជូនដំណឹង
 DocType: Asset Category,Asset Category Name,ប្រភេទទ្រព្យសកម្មឈ្មោះ
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,នេះគឺជាទឹកដីជា root និងមិនអាចត្រូវបានកែសម្រួល។
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ឈ្មោះថ្មីលក់បុគ្គល
@@ -5622,7 +5664,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
 DocType: Asset,Frequency of Depreciation (Months),ភាពញឹកញាប់នៃការរំលស់ (ខែ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,គណនីឥណទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,គណនីឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,បង្ហាញតម្លៃសូន្យ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
@@ -5630,7 +5672,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
 DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
 DocType: Hub Settings,Company Logo,រូបសញ្ញារបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹងគណនីគ្រុប {0}
 DocType: Healthcare Settings,Patient Registration,ការចុះឈ្មោះអ្នកជំងឺ
@@ -5665,11 +5707,10 @@
 DocType: Journal Entry,Total Debit,ឥណពន្ធសរុប
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ឃ្លាំងទំនិញលំនាំដើមបានបញ្ចប់
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,សូមជ្រើសរើសអ្នកជម្ងឺ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ការលក់បុគ្គល
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,ការលក់បុគ្គល
 DocType: Hotel Room Package,Amenities,គ្រឿងបរិក្ខារ
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,របៀបបង់ប្រាក់លំនាំដើមច្រើនមិនត្រូវបានអនុញ្ញាតទេ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,សម្រាប់
 ,Appointment Analytics,វិភាគណាត់ជួប
 DocType: Vehicle Service,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 DocType: Lead,Blog Subscriber,អតិថិជនកំណត់ហេតុបណ្ដាញ
@@ -5686,6 +5727,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ទុកឱ្យនៅទទេប្រសិនបើអ្នកបានធ្វើឱ្យក្រុមសិស្សក្នុងមួយឆ្នាំ
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ប្រសិនបើបានធីកនោះទេសរុប។ នៃថ្ងៃធ្វើការនឹងរួមបញ្ចូលទាំងថ្ងៃឈប់សម្រាក, ហើយនេះនឹងកាត់បន្ថយតម្លៃនៃប្រាក់ខែក្នុងមួយថ្ងៃនោះ"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",កម្មវិធីដែលប្រើពាក្យគន្លឹះបច្ចុប្បន្ននឹងមិនអាចចូលដំណើរការបានទេតើអ្នកប្រាកដទេ?
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,ជាមុនសរុប
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ប្តូរលេខកូដគំរូ
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចត្រូវបានចាប់ផ្តើមកាលពីជាងរយៈពេលកាលបរិច្ឆេទ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
@@ -5697,8 +5739,9 @@
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
 DocType: Cheque Print Template,Signatory Position,ទីតាំងហត្ថលេខី
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
 DocType: Timesheet,Total Billable Hours,ម៉ោងចេញវិក្កយបត្រសរុប
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,ចំនួនថ្ងៃដែលអតិថិជនត្រូវបង់វិក័យប័ត្រដែលបានបង្កើតដោយការជាវនេះ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ការទូទាត់វិក័យប័ត្រចំណាំ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអតិថិជននេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ជួរដេក {0}: ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក {1} ត្រូវតែតិចជាងឬស្មើទៅនឹងចំនួនចូលទូទាត់ {2}
@@ -5717,12 +5760,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់បុគ្គលិកនេះ
 DocType: Assessment Result,Summary,សង្ខេប
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,គណនីឥណពន្ធវីសា
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,គណនីឥណពន្ធវីសា
 DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ភោជនីយដ្ឋានលំដាប់ធាតុធាតុ
@@ -5734,7 +5777,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ចំនួនទឹកប្រាក់ការទិញ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Work Order,Manufactured Qty,បានផលិត Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},ភាគហ៊ុនមិនមានជាមួយ {0}
@@ -5742,12 +5785,12 @@
 DocType: Asset,Out of Order,ចេញពីលំដាប់
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
 DocType: Projects Settings,Ignore Workstation Time Overlap,មិនអើពើពេលវេលាធ្វើការងារស្ថានីយត្រួតគ្នា
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0} {1} មិនមាន
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ជ្រើសលេខបាច់
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
 DocType: Patient Service Unit,Medical Administrator,អ្នកគ្រប់គ្រងវេជ្ជសាស្ត្រ
 DocType: Assessment Plan,Schedule,កាលវិភាគ
 DocType: Account,Parent Account,គណនីមាតាឬបិតា
@@ -5777,15 +5820,16 @@
 DocType: Asset Repair,Repair Status,ជួសជុលស្ថានភាព
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
 DocType: POS Profile,Account for Change Amount,គណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Purchase Invoice,input service,សេវាកម្មបញ្ចូល
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ជួរដេក {0}: គណបក្ស / គណនីមិនផ្គូផ្គងនឹង {1} / {2} នៅក្នុង {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,ក្រុមការងារថែទាំ
 DocType: Agriculture Analysis Criteria,Soil Analysis,វិភាគដី
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,កូដវគ្គសិក្សា:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
 DocType: Account,Stock,ស្តុក
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
 DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
@@ -5834,19 +5878,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},ការចូលសម្រាប់ {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ឈ្មោះអថេរ
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
 DocType: Asset,Asset Category,ប្រភេទទ្រព្យសកម្ម
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមាន
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
 DocType: Soil Texture,Loamy Sand,ខ្សាច់លាមក
 DocType: Production Plan,Material Request Planning,ផែនការស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ហាក់ដូចជាច្រើនជាងម្ដង
 DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
 DocType: Employee Attendance Tool,Marked Attendance,វត្តមានដែលបានសម្គាល់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,ឧបករណ៍កំណត់ពេលវេលាលើសម៉ោងដែលបានផ្តល់។
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ផ្ញើសារជាអក្សរដ៏ធំមួយដើម្បីទំនាក់ទំនងរបស់អ្នក
 DocType: Patient,A Positive,វិជ្ជមាន
@@ -5857,9 +5901,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} លេខសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការបញ្ជាទិញចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
 DocType: Asset Maintenance Team,Asset Maintenance Team,ក្រុមថែទាំទ្រព្យសម្បត្តិ
-DocType: Employee Loan,Loan Type,ប្រភេទសេវាឥណទាន
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ត្រូវបានដាក់ស្នើដោយជោគជ័យ
+DocType: Loan,Loan Type,ប្រភេទសេវាឥណទាន
 DocType: Scheduling Tool,Scheduling Tool,ឧបករណ៍កាលវិភាគ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,កាតឥណទាន
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,កាតឥណទាន
 DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ repacked
 DocType: Employee Education,Major/Optional Subjects,ដ៏ធំប្រធានបទ / ស្រេចចិត្ត
 DocType: Sales Invoice Item,Drop Ship,ទម្លាក់នាវា
@@ -5891,7 +5936,7 @@
 DocType: Item,Units of Measure,ឯកតារង្វាស់
 DocType: Manufacturing Settings,Allow Production on Holidays,ផលិតកម្មនៅលើថ្ងៃឈប់សម្រាកអនុញ្ញាតឱ្យ
 DocType: Sales Invoice,Customer's Purchase Order Date,របស់អតិថិជនទិញលំដាប់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,រាជធានីហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,រាជធានីហ៊ុន
 DocType: Shopping Cart Settings,Show Public Attachments,បង្ហាញឯកសារភ្ជាប់សាធារណៈ
 DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
 DocType: Restaurant Reservation,Reservation Time,ម៉ោងកក់
@@ -5906,7 +5951,7 @@
 DocType: Purchase Order,To Receive and Bill,ដើម្បីទទួលបាននិង Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,ជួរដេក # {0}: Reqd តាមកាលបរិច្ឆេទមិនអាចនៅមុនថ្ងៃប្រតិបត្តិការទេ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ផលិតផលពិសេស
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,អ្នករចនា
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,អ្នករចនា
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
 DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
@@ -5916,20 +5961,20 @@
 DocType: Driver,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
 DocType: Healthcare Settings,Employee name and designation in print,ឈ្មោះនិយោជិតនិងការចង្អុលបង្ហាញក្នុងការបោះពុម្ព
 ,accounts-browser,គណនីកម្មវិធីរុករក
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ចៅហ្វាយគម្រោង។
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ដើម្បីអនុញ្ញាតឱ្យវិក័យប័ត្រឬលើសលំដាប់ជាង, ធ្វើឱ្យទាន់សម័យ &quot;អនុញ្ញាត&quot; នៅក្នុងការកំណត់ហ៊ុនឬធាតុ។"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំបង្ហាញនិមិត្តរូបដូចជា $ លណាមួយដែលជាប់នឹងរូបិយប័ណ្ណ។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Payment Term,Credit Days,ថ្ងៃឥណទាន
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,សូមជ្រើសរើសអ្នកជំងឺដើម្បីទទួលការធ្វើតេស្តមន្ទីរពិសោធន៍
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
 DocType: Fee Schedule,FRQ.,FRQ ។
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,ទទួលបានធាតុពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lead ពេលថ្ងៃ
 DocType: Cash Flow Mapping,Is Income Tax Expense,គឺជាពន្ធលើប្រាក់ចំណូលពន្ធ
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ធីកប្រអប់នេះបើសិស្សកំពុងរស់នៅនៅឯសណ្ឋាគារវិទ្យាស្ថាននេះ។
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
 ,Stock Summary,សង្ខេបភាគហ៊ុន
@@ -5940,10 +5985,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,យោងកាលបរិច្ឆេទ
 DocType: Employee,Reason for Leaving,ហេតុផលសម្រាប់ការចាកចេញ
 DocType: BOM Operation,Operating Cost(Company Currency),ចំណាយប្រតិបត្តិការ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-DocType: Employee Loan Application,Rate of Interest,អត្រាការប្រាក់
+DocType: Loan Application,Rate of Interest,អត្រាការប្រាក់
 DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
 DocType: Item,Shelf Life In Days,ជីវិតធ្នាប់នៅក្នុងថ្ងៃ
 DocType: GL Entry,Is Opening,តើការបើក
+DocType: Department,Expense Approvers,ឈ្នួលចំណាយ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
 DocType: Journal Entry,Subscription Section,ផ្នែកបរិវិសកម្ម
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,គណនី {0} មិនមាន
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index f5e3bd1..9ca8298 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ಮೆಟೀರಿಯಲ್ ಭೇಟಿ {0} ಈ ಖಾತರಿ ಹಕ್ಕು ರದ್ದು ಮೊದಲು ರದ್ದು
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,ಅಸೆಸ್ಮೆಂಟ್ ವರದಿಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
-DocType: Purchase Receipt,Subscription Detail,ಚಂದಾದಾರಿಕೆ ವಿವರ
 DocType: Supplier Scorecard,Notify Supplier,ಸೂಚಕವನ್ನು ಸೂಚಿಸಿ
 DocType: Item,Customer Items,ಗ್ರಾಹಕ ವಸ್ತುಗಳು
 DocType: Project,Costing and Billing,ಕಾಸ್ಟಿಂಗ್ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಒಂದು ಲೆಡ್ಜರ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com ಗೆ ಐಟಂ ಪ್ರಕಟಿಸಿ
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ಇಮೇಲ್ ಅಧಿಸೂಚನೆಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ಮೌಲ್ಯಮಾಪನ
 DocType: Item,Default Unit of Measure,ಮಾಪನದ ಡೀಫಾಲ್ಟ್ ಘಟಕ
 DocType: SMS Center,All Sales Partner Contact,ಎಲ್ಲಾ ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಸಂಪರ್ಕಿಸಿ
-DocType: Employee,Leave Approvers,Approvers ಬಿಡಿ
+DocType: Department,Leave Approvers,Approvers ಬಿಡಿ
 DocType: Sales Partner,Dealer,ವ್ಯಾಪಾರಿ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,ತನಿಖೆಗಳು
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ಲಭ್ಯವಿದೆಯೇ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ಈ ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,ಕಾನೂನಿನ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},ನಿಜವಾದ ರೀತಿಯ ತೆರಿಗೆ ಸತತವಾಗಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,ಕಾನೂನಿನ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},ನಿಜವಾದ ರೀತಿಯ ತೆರಿಗೆ ಸತತವಾಗಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Bank Guarantee,Customer,ಗಿರಾಕಿ
 DocType: Purchase Receipt Item,Required By,ಅಗತ್ಯವಿರುತ್ತದೆ
 DocType: Delivery Note,Return Against Delivery Note,ಡೆಲಿವರಿ ನೋಟ್ ವಿರುದ್ಧ ಪುನರಾಗಮನ
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ತಲೆ (ಅಥವಾ ಗುಂಪುಗಳು) ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಮತ್ತು ಸಮತೋಲನಗಳ ನಿರ್ವಹಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ.
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ತೆರೆದ ತೋರಿಸಿ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ಮೇಲೆ ತಿಳಿಸಿದ ಪುನರಾವರ್ತಿತಕ್ಕಾಗಿ ಇಂದು ಈ ಕ್ರಿಯೆಯನ್ನು ಸ್ವತಃ ತೆಗೆದುಕೊಳ್ಳುವುದು ಅವಶ್ಯಕ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ಚೆಕ್ಔಟ್
 DocType: Pricing Rule,Apply On,ಅನ್ವಯಿಸುತ್ತದೆ
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
 DocType: Support Settings,Support Settings,ಬೆಂಬಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,ಬ್ಯಾಚ್ ಐಟಂ ಅಂತ್ಯ ಸ್ಥಿತಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Membership,membership validaty section,ಸದಸ್ಯತ್ವ ಮಾನ್ಯತೆ ವಿಭಾಗ
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 DocType: Consultation,Consultation,ಸಮಾಲೋಚನೆ
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ವಸ್ತು
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ವೆಬ್ಸೈಟ್ ಮಾಡುವುದು
 DocType: Opening Invoice Creation Tool Item,Quantity,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
 DocType: Item,Country of Origin,ಮೂಲ ದೇಶ
 DocType: Soil Texture,Soil Texture Criteria,ಮಣ್ಣಿನ ವಿನ್ಯಾಸದ ಮಾನದಂಡ
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,ಪ್ರಾಥಮಿಕ ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ಓಪನ್ ತೊಂದರೆಗಳು
 DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
 DocType: Lab Test Groups,Add new line,ಹೊಸ ಸಾಲನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
@@ -89,7 +85,7 @@
 ,Delay Days,ವಿಳಂಬ ದಿನಗಳು
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ಸರಕುಪಟ್ಟಿ
+DocType: Subscription Invoice,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Purchase Invoice Item,Item Weight Details,ಐಟಂ ತೂಕ ವಿವರಗಳು
 DocType: Asset Maintenance Log,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ರೋ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ರೋ # {0}:
 DocType: Timesheet,Total Costing Amount,ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Daily Work Summary Group,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,ಅಕೌಂಟೆಂಟ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,ಅಕೌಂಟೆಂಟ್
 DocType: Hub Settings,Selling Price List,ಬೆಲೆ ಪಟ್ಟಿ ಮಾರಾಟ
 DocType: Patient,Tobacco Current Use,ತಂಬಾಕು ಪ್ರಸ್ತುತ ಬಳಕೆ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,ದರ ಮಾರಾಟ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,ದರ ಮಾರಾಟ
 DocType: Cost Center,Stock User,ಸ್ಟಾಕ್ ಬಳಕೆದಾರ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,ದೂರವಾಣಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},ಹೊಸ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ಪ್ರಾಥಮಿಕ ಇಮೇಲ್ ಅಧಿಸೂಚನೆ ಕಳುಹಿಸಲಾಗಿದೆ
 ,Sales Partners Commission,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಆಯೋಗ
 DocType: Soil Texture,Sandy Clay Loam,ಸ್ಯಾಂಡಿ ಕ್ಲೇ ಲೋಮ್
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ಸವಕಳಿ ನಂತರ ಮೌಲ್ಯ
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ಸಂಬಂಧಿತ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ ನೌಕರನ ಸೇರುವ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬಾರದು
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ ನೌಕರನ ಸೇರುವ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬಾರದು
 DocType: Grading Scale,Grading Scale Name,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಹೆಸರು
-DocType: Subscription,Repeat on Day,ದಿನ ಪುನರಾವರ್ತಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಖಾತೆಯನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Sales Invoice,Company Address,ಕಂಪೆನಿ ವಿಳಾಸ
 DocType: BOM,Operations,ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ರಿಯಾಯಿತಿ ಆಧಾರದ ಮೇಲೆ ಅಧಿಕಾರ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ {0}
+DocType: Subscription,Subscription Start Date,ಚಂದಾದಾರಿಕೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ಎರಡು ಕಾಲಮ್ಗಳು, ಹಳೆಯ ಹೆಸರು ಒಂದು ಮತ್ತು ಹೆಸರು ಒಂದು CSV ಕಡತ ಲಗತ್ತಿಸಿ"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ಯಾವುದೇ ಸಕ್ರಿಯ ವರ್ಷದಲ್ಲಿ.
 DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವರ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ರೆಫರೆನ್ಸ್: {0}, ಐಟಂ ಕೋಡ್: {1} ಮತ್ತು ಗ್ರಾಹಕ: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ಪ್ರಾಯೋಗಿಕ ಅವಧಿಯ ಅಂತ್ಯ ದಿನಾಂಕ ಟ್ರಯಲ್ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕದ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,ಕೆಜಿ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},ಐಟಂ {0} ಅಡ್ಡಸಾಲು {1} ನಲ್ಲಿ subcontracting ಮಾಡಲು BOM ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Patient,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Price List,Price Not UOM Dependant,ಬೆಲೆ UOM ಅವಲಂಬಿತವಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ಬ್ರೇಕ್ ಆಯಿಲ್
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
 ,Completed Work Orders,ಕೆಲಸ ಆದೇಶಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,ತೆರಿಗೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,ತೆರಿಗೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: BOM,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ಸಾಲು # {0}: ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರವು ಖರ್ಚು ಕ್ಲೈಮ್ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿಗಳಲ್ಲಿ ಒಂದಾಗಿರಬೇಕು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ಸಾಲು # {0}: ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರವು ಖರ್ಚು ಕ್ಲೈಮ್ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿಗಳಲ್ಲಿ ಒಂದಾಗಿರಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
 DocType: SMS Log,SMS Log,ಎಸ್ಎಂಎಸ್ ಲಾಗಿನ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ತಲುಪಿಸುವುದಾಗಿರುತ್ತದೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ಉದ್ಯೋಗಿಗೆ ನೀಡಿದ ಮುಂಗಡ ಮೊತ್ತವನ್ನು ನಿರ್ವಹಿಸಿ
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ವಿತರಣೆ ಅಧಿಸೂಚನೆ
 DocType: Journal Entry,Opening Entry,ಎಂಟ್ರಿ ತೆರೆಯುವ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ಖಾತೆ ಪೇ ಮಾತ್ರ
-DocType: Employee Loan,Repay Over Number of Periods,ಓವರ್ ಸಂಖ್ಯೆ ಅವಧಿಗಳು ಮರುಪಾವತಿ
+DocType: Loan,Repay Over Number of Periods,ಓವರ್ ಸಂಖ್ಯೆ ಅವಧಿಗಳು ಮರುಪಾವತಿ
 DocType: Stock Entry,Additional Costs,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
 DocType: Education Settings,Validate Batch for Students in Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪಿನಲ್ಲಿರುವ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಬ್ಯಾಚ್ ಸ್ಥಿರೀಕರಿಸಿ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ಯಾವುದೇ ರಜೆ ದಾಖಲೆ ನೌಕರ ಕಂಡು {0} ಫಾರ್ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ಯಾವುದೇ ರಜೆ ದಾಖಲೆ ನೌಕರ ಕಂಡು {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee Education,Under Graduate,ಸ್ನಾತಕಪೂರ್ವ ವಿದ್ಯಾರ್ಥಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,HR ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬಿಡುವು ಸ್ಥಿತಿ ಅಧಿಸೂಚನೆಗಾಗಿ ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಅನ್ನು ಹೊಂದಿಸಿ.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
 DocType: BOM,Total Cost,ಒಟ್ಟು ವೆಚ್ಚ
 DocType: Soil Analysis,Ca/K,ಸಿ / ಕೆ
-DocType: Journal Entry Account,Employee Loan,ನೌಕರರ ಸಾಲ
 DocType: Fee Schedule,Send Payment Request Email,ಪಾವತಿ ವಿನಂತಿ ಇಮೇಲ್ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,ಯಶಸ್ವಿಯಾಗಿ ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ.
 DocType: Assessment Result,Grade,ಗ್ರೇಡ್
 DocType: Restaurant Table,No of Seats,ಆಸನಗಳ ಸಂಖ್ಯೆ
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ಕ್ರಿಯಾತ್ಮಕ ವಿಷಯ ಸೇರಿಸಲು, ಜಿಂಜ ಟ್ಯಾಗ್ಗಳನ್ನು ಬಳಸಿ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: Asset Maintenance Task,Asset Maintenance Task,ಆಸ್ತಿ ನಿರ್ವಹಣೆ ಕಾರ್ಯ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Daily Work Summary,Daily Work Summary,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ದಯವಿಟ್ಟು ಇಷ್ಟದ ಸಂಪರ್ಕ ಇಮೇಲ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,ದಯವಿಟ್ಟು ಇಷ್ಟದ ಸಂಪರ್ಕ ಇಮೇಲ್ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Plan,Material Request Detail,ವಸ್ತು ವಿನಂತಿ ವಿವರ
 DocType: Selling Settings,Default Quotation Validity Days,ಡೀಫಾಲ್ಟ್ ಕೊಟೇಶನ್ ವಾಲಿಡಿಟಿ ಡೇಸ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: Sales Invoice,Change Amount,ಪ್ರಮಾಣವನ್ನು ಬದಲಾವಣೆ
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,ಚಾಲಕ ಪರವಾನಗಿ ವರ್ಗಗಳು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ
 DocType: Depreciation Schedule,Make Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ ಮಾಡಿ
+DocType: HR Settings,Leave Settings,ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬಿಡಿ
 DocType: Appraisal Template Goal,KRA,ಕ್ರಾ
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ನೌಕರರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),ಪಿಓಎಸ್ನ ಸೆಟಪ್ ಮೋಡ್ (ಆನ್ಲೈನ್ / ಆಫ್ಲೈನ್)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,ಕಾರ್ಯ ಆರ್ಡರ್ಗಳ ವಿರುದ್ಧ ಸಮಯ ಲಾಗ್ಗಳನ್ನು ರಚಿಸುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. ಕೆಲಸದ ಆದೇಶದ ವಿರುದ್ಧ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
 DocType: Asset Maintenance Log,Maintenance Status,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,ಸದಸ್ಯತ್ವ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ಸರಬರಾಜುದಾರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಅಗತ್ಯವಿದೆ {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ಒಟ್ಟು ಗಂಟೆಗಳ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Drug Prescription,Interval,ಮಧ್ಯಂತರ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ಆದ್ಯತೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ಆದ್ಯತೆ
 DocType: Grant Application,Individual,ಇಂಡಿವಿಜುವಲ್
 DocType: Academic Term,Academics User,ಶೈಕ್ಷಣಿಕ ಬಳಕೆದಾರ
 DocType: Cheque Print Template,Amount In Figure,ಚಿತ್ರದಲ್ಲಿ ಪ್ರಮಾಣ
-DocType: Employee Loan Application,Loan Info,ಸಾಲ ಮಾಹಿತಿ
+DocType: Loan Application,Loan Info,ಸಾಲ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ನಿರ್ವಹಣೆ ಭೇಟಿ ಯೋಜನೆ .
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅವಧಿ
 DocType: Share Transfer,Share Transfer,ಹಂಚಿಕೆ ಹಂಚಿಕೆ
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,ಐಟಂ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ಬಯೋಕೆಮಿಸ್ಟ್ರಿ
 DocType: Job Offer,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ಔಟ್ ಮೌಲ್ಯ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ಔಟ್ ಮೌಲ್ಯ
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Production Plan,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
 DocType: Purchase Taxes and Charges,Valuation,ಬೆಲೆಕಟ್ಟುವಿಕೆ
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,ಡೀಫಾಲ್ಟ್ ಪ್ರದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
 DocType: Work Order Operation,Updated via 'Time Log','ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರರನ್ನು ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,ಜರ್ನಲ್ ಕೋಡ್
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
 DocType: Company,Enable Perpetual Inventory,ಶಾಶ್ವತ ಇನ್ವೆಂಟರಿ ಸಕ್ರಿಯಗೊಳಿಸಿ
+DocType: Bank Guarantee,Charges Incurred,ಶುಲ್ಕಗಳು ಉಂಟಾಗಿದೆ
 DocType: Company,Default Payroll Payable Account,ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,ಕಸ್ಟಮ್ ಫಲಿತಾಂಶ
 DocType: Delivery Stop,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Course Assessment Criteria,Course Assessment Criteria,ಕೋರ್ಸ್ ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ತೆರಿಗೆ ಐಡಿ:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ತೆರಿಗೆ ಐಡಿ:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,ವಿದ್ಯಾರ್ಥಿಯ ಐಡಿ:
 DocType: POS Customer Group,POS Customer Group,ಪಿಓಎಸ್ ಗ್ರಾಹಕ ಗುಂಪಿನ
 DocType: Land Unit,Land Unit describing various land assets,ವಿವಿಧ ಭೂ ಆಸ್ತಿಗಳನ್ನು ವಿವರಿಸುವ ಜಮೀನು ಘಟಕ
@@ -375,9 +372,8 @@
 ,Open Work Orders,ಕೆಲಸದ ಆದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ
 DocType: Payment Term,Credit Months,ಕ್ರೆಡಿಟ್ ತಿಂಗಳುಗಳು
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,ನಿವ್ವಳ ವೇತನ ಸಾಧ್ಯವಿಲ್ಲ ಕಡಿಮೆ 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","ಸಿಸ್ಟಮ್ನಿಂದ ಪುನರಾವರ್ತಿತ ದೋಷ ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಲು, ನಾವು ಚಂದಾದಾರಿಕೆಯಲ್ಲಿ ಅಂಗವಿಕಲ ಕ್ಷೇತ್ರವನ್ನು ಪರಿಶೀಲಿಸಿದ್ದೇವೆ"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Email Digest,Profit & Loss,ಲಾಭ ನಷ್ಟ
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,ದಯವಿಟ್ಟು ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳ ಅಡಿಯಲ್ಲಿ ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
 DocType: Crop,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸೃಷ್ಟಿ ಉಪಕರಣ ಕೋರ್ಸ್
 DocType: Lead,Do Not Contact,ಸಂಪರ್ಕಿಸಿ ಇಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,ನಿಮ್ಮ ಸಂಘಟನೆಯಲ್ಲಿ ಕಲಿಸಲು ಜನರು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
 DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Course Scheduling Tool,Course Start Date,ಕೋರ್ಸ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ಮ್ಯಾಕ್ಸ್ ಗ್ರೇಡ್
 DocType: Email Digest,New Quotations,ಹೊಸ ಉಲ್ಲೇಖಗಳು
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ಮೆಚ್ಚಿನ ಇಮೇಲ್ ನೌಕರರ ಆಯ್ಕೆ ಆಧರಿಸಿ ನೌಕರ ಇಮೇಲ್ಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Tax Rule,Shipping County,ಶಿಪ್ಪಿಂಗ್ ಕೌಂಟಿ
-apps/erpnext/erpnext/config/desktop.py +167,Learn,ಕಲಿಯಿರಿ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ಕಲಿಯಿರಿ
 DocType: Asset,Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ಅತ್ಯುತ್ತಮ ಚೆಕ್ ಮತ್ತು ತೆರವುಗೊಳಿಸಲು ಠೇವಣಿಗಳ
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
 DocType: Driver,Fleet Manager,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},ರೋ # {0}: {1} ಐಟಂ ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},ರೋ # {0}: {1} ಐಟಂ ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},ಹೋಟೆಲ್ ಕೊಠಡಿ ದರವನ್ನು ದಯವಿಟ್ಟು {@} ಹೊಂದಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Opening Invoice Creation Tool,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Consultation,Encounter Impression,ಎನ್ಕೌಂಟರ್ ಇಂಪ್ರೆಷನ್
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,ಮಾರಾಟ ಆಸ್ತಿ ವೆಚ್ಚ
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ಕೋರ್ಸ್ ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[ತುರ್ತು]% s ಗಾಗಿ ಮರುಕಳಿಸುವ% s ಅನ್ನು ರಚಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
 DocType: Land Unit,LInked Analysis,ಲಿಂಕ್ಡ್ ಅನಾಲಿಸಿಸ್
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿ ಎರಡು ಹಂಚಿಕೆ ದಾಖಲೆಗಳಾದ್ಯಂತ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿ ಎರಡು ಹಂಚಿಕೆ ದಾಖಲೆಗಳಾದ್ಯಂತ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಿ
 DocType: Volunteer,Weekends,ವಾರಾಂತ್ಯಗಳು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ಪ್ರಮಾಣ
 DocType: Setup Progress Action,Action Document,ಆಕ್ಷನ್ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Chapter Member,Website URL,ವೆಬ್ಸೈಟ್ URL
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ಡೆಮೊ
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ವಸ್ತುಗಳು ಸೇರಿಸಿ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ಐಟಂ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ನಿಯತಾಂಕಗಳನ್ನು
+DocType: Leave Application,Leave Approver Name,ಅನುಮೋದಕ ಹೆಸರು ಬಿಡಿ
 DocType: Depreciation Schedule,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ಗಳಿಕೆಯನ್ನು, ತೀರ್ಮಾನಗಳನ್ನು ಮತ್ತು ಇತರ ಸಂಬಳ ಘಟಕಗಳನ್ನು"
 DocType: Packed Item,Packed Item,ಪ್ಯಾಕ್ಡ್ ಐಟಂ
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
 DocType: Healthcare Settings,Require Lab Test Approval,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಅನುಮೋದನೆ ಅಗತ್ಯವಿದೆ
 DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
 DocType: Dosage Strength,Strength,ಬಲ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
 DocType: Student Log,Medical,ವೈದ್ಯಕೀಯ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ಸೋತ ಕಾರಣ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ಸೋತ ಕಾರಣ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,ಖಾತೆ ಸಂಖ್ಯೆ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ಲೀಡ್ ಮಾಲೀಕ ಲೀಡ್ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,ಏಕೈಕ
 DocType: Salary Slip,Total Loan Repayment,ಒಟ್ಟು ಸಾಲದ ಮರುಪಾವತಿಯ
 DocType: Account,Cost of Goods Sold,ಮಾರಿದ ವಸ್ತುಗಳ ಬೆಲೆ
-DocType: Subscription,Yearly,ವಾರ್ಷಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
 DocType: Drug Prescription,Dosage,ಡೋಸೇಜ್
 DocType: Journal Entry Account,Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
 DocType: Assessment Plan,Examiner Name,ಎಕ್ಸಾಮಿನರ್ ಹೆಸರು
 DocType: Lab Test Template,No Result,ಫಲಿತಾಂಶವಿಲ್ಲ
 DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,Supplier Name,ಸರಬರಾಜುದಾರ ಹೆಸರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ಮ್ಯಾನುಯಲ್ ಓದಿ
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,ಕ್ಯಾಲೆಂಡರ್ನಲ್ಲಿ ಎಲ್ಲಾ ಇಲಾಖೆಯ ಸದಸ್ಯರ ಎಲೆಗಳನ್ನು ತೋರಿಸಿ
 DocType: Purchase Invoice,01-Sales Return,01-ಸೇಲ್ಸ್ ರಿಟರ್ನ್
 DocType: Account,Is Group,ಗ್ರೂಪ್
 DocType: Email Digest,Pending Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಬಾಕಿ
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,ಕಡ್ಡಾಯ - ಅಕಾಡೆಮಿಕ್ ಇಯರ್
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ಮಾಡಿದರು ಇಮೇಲ್ ಒಂದು ಭಾಗವಾಗಿ ಹೋಗುತ್ತದೆ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಕಸ್ಟಮೈಸ್ . ಪ್ರತಿ ವ್ಯವಹಾರ ಪ್ರತ್ಯೇಕ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಹೊಂದಿದೆ .
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಗೆ ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಗೆ ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},ವರ್ಕ್ ಆರ್ಡರ್ {0} ಅನ್ನು ನಿಲ್ಲಿಸಿದ ನಂತರ ವಹಿವಾಟು ಅನುಮತಿಸುವುದಿಲ್ಲ
 DocType: Setup Progress Action,Min Doc Count,ಕನಿಷ್ಠ ಡಾಕ್ ಕೌಂಟ್
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ಮಾರಾಟ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
 DocType: Packing Slip,From Package No.,ಪ್ಯಾಕೇಜ್ ನಂಬ್ರ
 DocType: Item Attribute,To Range,ಶ್ರೇಣಿಗೆ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಇದು ಹೊಂದಿಲ್ಲ ಕೆಲವು ಐಟಂಗಳನ್ನು ವಿರುದ್ಧ ವ್ಯವಹಾರ ಇರುವುದರಿಂದ ಆದ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಇಲ್ಲಿದೆ"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಇದು ಹೊಂದಿಲ್ಲ ಕೆಲವು ಐಟಂಗಳನ್ನು ವಿರುದ್ಧ ವ್ಯವಹಾರ ಇರುವುದರಿಂದ ಆದ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಇಲ್ಲಿದೆ"
 DocType: Student Report Generation Tool,Attended by Parents,ಪಾಲಕರು ಹಾಜರಿದ್ದರು
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Patient,AB Positive,ಎಬಿ ಧನಾತ್ಮಕ
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ಹಾಜರಾತಿ .
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet ಆಧಾರಿತ ವೇತನದಾರರ ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್.
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
-DocType: Employee Loan,Total Payment,ಒಟ್ಟು ಪಾವತಿ
+DocType: Loan,Total Payment,ಒಟ್ಟು ಪಾವತಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,ಪೂರ್ಣಗೊಂಡ ಕೆಲಸ ಆದೇಶಕ್ಕಾಗಿ ವ್ಯವಹಾರವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} ಕ್ರಮ ಪೂರ್ಣಗೊಳಿಸಲಾಗಲಿಲ್ಲ ಆದ್ದರಿಂದ ರದ್ದುಗೊಂಡಿತು
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ಸಾಕಷ್ಟು ಭಾಗಗಳನ್ನು ನಿರ್ಮಿಸಲು
 DocType: POS Profile User,POS Profile User,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ನೇರ ಆದಾಯ
+DocType: Subscription Invoice,Subscription Invoice,ಚಂದಾದಾರಿಕೆ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,ನೇರ ಆದಾಯ
 DocType: Patient Appointment,Date TIme,ದಿನಾಂಕ ಸಮಯ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ಕಂಪೆನಿ ಮತ್ತು ತೆರಿಗೆಗಳನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 DocType: Codification Table,Codification Table,ಕೋಡಿಫಿಕೇಷನ್ ಟೇಬಲ್
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Stock Entry Detail,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 DocType: Purchase Invoice,Supplier GSTIN,ಸರಬರಾಜುದಾರ GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪಿಂಗ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
+DocType: Bank Guarantee,Providing,ಒದಗಿಸುವುದು
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","ಅನುಮತಿಸಲಾಗಿಲ್ಲ, ಅಗತ್ಯವಿರುವ ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಅನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"
 DocType: Patient,Risk Factors,ರಿಸ್ಕ್ ಫ್ಯಾಕ್ಟರ್ಸ್
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
 DocType: Healthcare Settings,Appointment Confirmation,ನೇಮಕಾತಿ ದೃಢೀಕರಣ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ಹಲೋ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ಐಟಂ ಸರಿಸಿ
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","ಈಗಾಗಲೇ {1} ಬಳಕೆದಾರರಿಗೆ ಪೋಸ್ ಪ್ರೊಫೈಲ್ನಲ್ಲಿ {0} ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಹೊಂದಿಸಿ, ದಯೆಯಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಂಡ ಡೀಫಾಲ್ಟ್"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ಕ್ರೋಢಿಕೃತ ಮೌಲ್ಯಗಳು
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,ಪ್ರದೇಶವು POS ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ಅಗತ್ಯವಿದೆ
 DocType: Supplier,Prevent RFQs,RFQ ಗಳನ್ನು ತಡೆಯಿರಿ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} ನಿಂದ {1} ವರೆಗಿನ ಅವಧಿಯವರೆಗೆ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} ನಿಂದ {1} ವರೆಗಿನ ಅವಧಿಯವರೆಗೆ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,ಶಿಪ್ಪಿಂಗ್ ಬಿಲ್ ದಿನಾಂಕ
 DocType: Production Plan,Production Plan,ಉತ್ಪಾದನಾ ಯೋಜನೆ
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ಸರಕುಪಟ್ಟಿ ಸೃಷ್ಟಿ ಉಪಕರಣವನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ಗಮನಿಸಿ: ಒಟ್ಟು ನಿಯೋಜಿತವಾದ ಎಲೆಗಳನ್ನು {0} ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು ಕಡಿಮೆ ಮಾಡಬಾರದು {1} ಕಾಲ
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,ಸೀರಿಯಲ್ ನೋ ಇನ್ಪುಟ್ ಆಧರಿಸಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ನಲ್ಲಿ ಹೊಂದಿಸಿ
 ,Total Stock Summary,ಒಟ್ಟು ಸ್ಟಾಕ್ ಸಾರಾಂಶ
 DocType: Announcement,Posted By,ಪೋಸ್ಟ್ ಮಾಡಿದವರು
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Training Result Employee,Training Result Employee,ತರಬೇತಿ ಫಲಿತಾಂಶ ನೌಕರರ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
-DocType: Repayment Schedule,Principal Amount,ಪ್ರಮುಖ ಪ್ರಮಾಣವನ್ನು
-DocType: Employee Loan Application,Total Payable Interest,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಬಡ್ಡಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ಪ್ರಮುಖ ಪ್ರಮಾಣವನ್ನು
+DocType: Loan Application,Total Payable Interest,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಬಡ್ಡಿ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ಒಟ್ಟು ಅತ್ಯುತ್ತಮವಾದದ್ದು: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
 DocType: Restaurant Reservation,Restaurant Reservation,ರೆಸ್ಟೋರೆಂಟ್ ಮೀಸಲಾತಿ
 DocType: Land Unit,Land Unit Name,ಭೂಮಿ ಘಟಕ ಹೆಸರು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ಪಾವತಿ ಎಂಟ್ರಿ ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ಅಪ್ ಸುತ್ತುವುದನ್ನು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ಗ್ರಾಹಕರು ಇಮೇಲ್ ಮೂಲಕ ಸೂಚಿಸಿ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ಗ್ರಾಹಕರು ಇಮೇಲ್ ಮೂಲಕ ಸೂಚಿಸಿ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ಮತ್ತೊಂದು ಮಾರಾಟಗಾರನ {0} ಅದೇ ನೌಕರರ ಐಡಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Employee Advance,Claimed Amount,ಹಕ್ಕು ಪಡೆಯಲಾದ ಮೊತ್ತ
 apps/erpnext/erpnext/config/education.py +180,Masters,ಮಾಸ್ಟರ್ಸ್
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಖಾತೆಯನ್ನು ಕೈಯಾರೆ ಒಂದು ರಚಿಸಿ.
 DocType: Supplier Scorecard,Per Year,ವರ್ಷಕ್ಕೆ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB ಪ್ರಕಾರ ಈ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಪ್ರವೇಶ ಪಡೆಯಲು ಅರ್ಹವಾಗಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Sales Invoice,Sales Taxes and Charges,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Employee,Organization Profile,ಸಂಸ್ಥೆ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: Vital Signs,Height (In Meter),ಎತ್ತರ (ಮೀಟರ್)
 DocType: Student,Sibling Details,ಒಡಹುಟ್ಟಿದವರು ವಿವರಗಳು
 DocType: Vehicle Service,Vehicle Service,ವಾಹನ ಸೇವೆ
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಧರಿಸಿ ಪ್ರತಿಕ್ರಿಯೆ ವಿನಂತಿಯನ್ನು ಪ್ರಚೋದಿಸುತ್ತದೆ.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಧರಿಸಿ ಪ್ರತಿಕ್ರಿಯೆ ವಿನಂತಿಯನ್ನು ಪ್ರಚೋದಿಸುತ್ತದೆ.
 DocType: Employee,Reason for Resignation,ರಾಜೀನಾಮೆಗೆ ಕಾರಣ
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,ಪ್ರದರ್ಶನ ಅಂದಾಜಿಸುವಿಕೆಯು ಟೆಂಪ್ಲೇಟ್.
 DocType: Sales Invoice,Credit Note Issued,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ನೀಡಲಾಗಿದೆ
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ನಂತರ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಗ್ರಾಹಕ ಆಧಾರಿತ ಸೋಸುತ್ತವೆ, ಗ್ರಾಹಕ ಗುಂಪಿನ, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರ, ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ, ಪ್ರಚಾರ, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ನೌಕರರ ಸಾಲ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ಸಂಬಂಧ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,ವ್ಯವಸ್ಥಾಪಕ
 DocType: Payment Entry,Payment From / To,ಪಾವತಿ / ಹೋಗು
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ವೇರ್ಹೌಸ್ನಲ್ಲಿ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,ಇದಕ್ಕಾಗಿ ಮಾರ್ಗವನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ತೆರೆಯುತ್ತಿದೆ ( ಡಾ )
+DocType: Loan,Applicant,ಅರ್ಜಿದಾರ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ಪೋಸ್ಟ್ ಸಮಯಮುದ್ರೆಗೆ ನಂತರ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ಮರುಕಳಿಸುವ ದಾಖಲೆಗಳನ್ನು ಮಾಡಲು
 ,GST Itemised Purchase Register,ಜಿಎಸ್ಟಿ Itemized ಖರೀದಿ ನೋಂದಣಿ
 DocType: Course Scheduling Tool,Reschedule,ಮರುಹೊಂದಿಸಿ
-DocType: Employee Loan,Total Interest Payable,ಪಾವತಿಸಲಾಗುವುದು ಒಟ್ಟು ಬಡ್ಡಿ
+DocType: Loan,Total Interest Payable,ಪಾವತಿಸಲಾಗುವುದು ಒಟ್ಟು ಬಡ್ಡಿ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ಇಳಿಯಿತು ವೆಚ್ಚ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Work Order Operation,Actual Start Time,ನಿಜವಾದ ಟೈಮ್
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,ಮುಕ್ತಾಯ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,ಬೇಸ್
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,ಬೇಸ್
 DocType: Timesheet,Total Billed Hours,ಒಟ್ಟು ಖ್ಯಾತವಾದ ಅವರ್ಸ್
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Leave Block List Allow,Allow User,ಬಳಕೆದಾರ ಅನುಮತಿಸಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
 DocType: Company,Gain/Loss Account on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 DocType: Vehicle Log,Service Details,ಸೇವೆಯ ವಿವರಗಳು
 DocType: Vehicle Log,Service Details,ಸೇವೆಯ ವಿವರಗಳು
-DocType: Subscription,Quarterly,ತ್ರೈಮಾಸಿಕ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,ಎಕ್ರಿಚ್ಲಿಬ್
 DocType: Lab Test Template,Grouped,ಗುಂಪು ಮಾಡಲಾಗಿದೆ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ವೇಳಾಚೀಟಿ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ಕಚ್ಚಾ ವಸ್ತುಗಳ ಆಧರಿಸಿದ
 DocType: Sales Invoice,Port Code,ಪೋರ್ಟ್ ಕೋಡ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,ರಿಸರ್ವ್ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,ರಿಸರ್ವ್ ವೇರ್ಹೌಸ್
 DocType: Lead,Lead is an Organization,ಪ್ರಮುಖ ಸಂಸ್ಥೆಯಾಗಿದೆ
 DocType: Guardian Interest,Interest,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
 DocType: Vehicle,Odometer Value (Last),ದೂರಮಾಪಕ ಮೌಲ್ಯ (ಕೊನೆಯ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಮಾನದಂಡದ ಟೆಂಪ್ಲೇಟ್ಗಳು.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 DocType: Request for Quotation,Get Suppliers,ಪೂರೈಕೆದಾರರನ್ನು ಪಡೆಯಿರಿ
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,ನಿಮ್ಮ ಸದಸ್ಯತ್ವ 30 ದಿನಗಳಲ್ಲಿ ಅವಧಿ ಮೀರಿದರೆ ಮಾತ್ರ ನೀವು ನವೀಕರಿಸಬಹುದು
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪರ್ ಡಾಕ್ಯುಮೆಂಟ್ಗಳನ್ನು ನೀವು ಹೊಂದಿದ್ದಲ್ಲಿ ಮಾತ್ರ ಆಯ್ಕೆಮಾಡಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Supplier Scorecard,Per Week,ವಾರಕ್ಕೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ಒಟ್ಟು ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],ಫಿಶಿಯರ್ ಡೆಸ್ ಎಕ್ರಿಕರ್ಸ್ ಕಾಂಪ್ಟೇಬಲ್ಸ್ [ಎಫ್.ಸಿ.ಸಿ]
 DocType: Journal Entry,Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ಕಂಪನಿ ಮತ್ತು ಖಾತೆಗಳು
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,ಮೌಲ್ಯ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,ಮೌಲ್ಯ
 DocType: Asset Settings,Depreciation Options,ಸವಕಳಿ ಆಯ್ಕೆಗಳು
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,ಅಮಾನ್ಯ ಪೋಸ್ಟ್ ಸಮಯ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,ಅಮಾನ್ಯ ಪೋಸ್ಟ್ ಸಮಯ
 DocType: Lead,Campaign Name,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
 DocType: Hotel Room,Capacity,ಸಾಮರ್ಥ್ಯ
 DocType: Selling Settings,Close Opportunity After Days,ದಿನಗಳ ಅವಕಾಶ ಮುಚ್ಚಿ
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ನಂ
 DocType: Budget,Budget Against,ಬಜೆಟ್ ವಿರುದ್ಧ
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ನೀಡಿರುವ ಮಾನದಂಡಕ್ಕೆ ಉದ್ಯೋಗಿ ಇಲ್ಲ. ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಅನ್ನು ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಶೀಲಿಸಿ.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ನೀಡಿರುವ ಮಾನದಂಡಕ್ಕೆ ಉದ್ಯೋಗಿ ಇಲ್ಲ. ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಅನ್ನು ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಶೀಲಿಸಿ.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ದಯವಿಟ್ಟು ಟೇಬಲ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;ಸ್ವೀಕರಿಸುವವರಲ್ಲಿ&#39; ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸವಾಗಿದೆ
 DocType: Special Test Items,Particulars,ವಿವರಗಳು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
 DocType: Student,A+,ಎ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಒಂದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಮಾಡಿ. ಬೆಲೆ ನಿಯಮಗಳು: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Asset,Maintenance,ಸಂರಕ್ಷಣೆ
+DocType: Subscriber,Subscriber,ಚಂದಾದಾರ
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,ದಯವಿಟ್ಟು ನಿಮ್ಮ ಪ್ರಾಜೆಕ್ಟ್ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
 DocType: Item,Maximum sample quantity that can be retained,ಉಳಿಸಬಹುದಾದ ಗರಿಷ್ಟ ಮಾದರಿ ಪ್ರಮಾಣ
@@ -1078,26 +1074,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,ಟೈಮ್ಸ್ಲೋಟ್ಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ಆಸ್ತಿ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಕೈಬಿಟ್ಟಿತು {0}
-DocType: Employee Loan,Interest Income Account,ಬಡ್ಡಿಯ ಖಾತೆ
+DocType: Loan,Interest Income Account,ಬಡ್ಡಿಯ ಖಾತೆ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ಆಹ್ವಾನವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ಬಯೋಟೆಕ್ನಾಲಜಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ಹೋಗಿ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ಇಮೇಲ್ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Asset Repair,Downtime,ಡೌನ್ಟೈಮ್
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,ಶೈಕ್ಷಣಿಕ ಅವಧಿ:
 DocType: Salary Detail,Do not include in total,ಒಟ್ಟಾರೆಯಾಗಿ ಸೇರಿಸಬೇಡಿ
 DocType: Company,Default Cost of Goods Sold Account,ಸರಕುಗಳು ಮಾರಾಟ ಖಾತೆ ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},ಮಾದರಿ ಪ್ರಮಾಣ {0} ಪಡೆದಿರುವ ಪ್ರಮಾಣಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಲು ಸಾಧ್ಯವಿಲ್ಲ {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Request for Quotation Supplier,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 DocType: Item,Max Sample Quantity,ಮ್ಯಾಕ್ಸ್ ಸ್ಯಾಂಪಲ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,ಯಾವುದೇ ಅನುಮತಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,ಉಲ್ಲೇಖ ವಿನಂತಿಸಲಾಗಿದೆ
 DocType: Vital Signs,Heart Rate / Pulse,ಹಾರ್ಟ್ ರೇಟ್ / ಪಲ್ಸ್
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
@@ -1108,12 +1104,11 @@
 DocType: Item,Items with higher weightage will be shown higher,ಹೆಚ್ಚಿನ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಹೊಂದಿರುವ ಐಟಂಗಳು ಹೆಚ್ಚಿನ ತೋರಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ಲ್ಯಾಬ್ ಪರೀಕ್ಷೆಗಳು ಮತ್ತು ಪ್ರಮುಖ ಚಿಹ್ನೆಗಳು
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ಯಾವುದೇ ನೌಕರ
-DocType: Subscription,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,ಪ್ರಾಜೆಕ್ಟ್ ಅಪ್ಡೇಟ್.
 DocType: SMS Center,All Customer Contact,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 DocType: Land Unit,Tree Details,ಟ್ರೀ ವಿವರಗಳು
@@ -1163,7 +1158,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Work Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
@@ -1177,7 +1171,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","ಆಯ್ಕೆ ಮಾಡಿದ ವಿಳಾಸವನ್ನು ಉಳಿಸಿದ ನಂತರ ಸಂಪಾದಿಸಿದ್ದರೆ, ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Item,Hub Publishing Details,ಹಬ್ ಪಬ್ಲಿಷಿಂಗ್ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
 DocType: Lab Test Template,Result Format,ಫಲಿತಾಂಶದ ಸ್ವರೂಪ
@@ -1187,7 +1181,7 @@
 DocType: Payroll Entry,Bimonthly,ಎರಡು ತಿಂಗಳಿಗೊಮ್ಮೆ
 DocType: Vehicle Service,Brake Pad,ಬ್ರೇಕ್ ಪ್ಯಾಡ್
 DocType: Fertilizer,Fertilizer Contents,ರಸಗೊಬ್ಬರ ಪರಿವಿಡಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ಬಿಲ್ ಪ್ರಮಾಣ
 DocType: Company,Registration Details,ನೋಂದಣಿ ವಿವರಗಳು
 DocType: Timesheet,Total Billed Amount,ಒಟ್ಟು ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
@@ -1201,7 +1195,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ನಲ್ಲಿ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಿ ಬೈಪಾಸ್ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,ಸಾಧನೆಯ ಮೌಲ್ಯ ನಿರ್ಣಯ .
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ, &#39;ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಿ&#39; ಮತ್ತು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಕಡೇಪಕ್ಷ ಒಂದು ತೆರಿಗೆ ನಿಯಮ ಇರಬೇಕು"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಪಾವತಿ ಎಂಟ್ರಿ {0} ಆರ್ಡರ್ {1}, ಈ ಸರಕುಪಟ್ಟಿ ಮುಂಚಿತವಾಗಿ ಮಾಹಿತಿ ನಿಲ್ಲಿಸಲು ಏನನ್ನು ಪರೀಕ್ಷಿಸಲು ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಪಾವತಿ ಎಂಟ್ರಿ {0} ಆರ್ಡರ್ {1}, ಈ ಸರಕುಪಟ್ಟಿ ಮುಂಚಿತವಾಗಿ ಮಾಹಿತಿ ನಿಲ್ಲಿಸಲು ಏನನ್ನು ಪರೀಕ್ಷಿಸಲು ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
 DocType: Sales Invoice Item,Stock Details,ಸ್ಟಾಕ್ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ಪ್ರಾಜೆಕ್ಟ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
@@ -1235,7 +1229,7 @@
 DocType: Restaurant Table,Minimum Seating,ಕನಿಷ್ಠ ಆಸನ
 DocType: Item Attribute,Item Attribute Values,ಐಟಂ ಲಕ್ಷಣ ಮೌಲ್ಯಗಳು
 DocType: Examination Result,Examination Result,ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},ರೆಫರೆನ್ಸ್ Doctype ಒಂದು ಇರಬೇಕು {0}
@@ -1243,15 +1237,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Work Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ವರ್ಗಾವಣೆಗೆ ಐಟಂಗಳು ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ವರ್ಗಾವಣೆಗೆ ಐಟಂಗಳು ಲಭ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),ಮುಚ್ಚುವುದು (ಒಟ್ಟು + ತೆರೆಯುವಿಕೆ)
 DocType: Journal Entry,Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
 DocType: Crop Cycle,ISO 8016 standard,ಐಎಸ್ಒ 8016 ಪ್ರಮಾಣಿತ
 DocType: Pricing Rule,Rate or Discount,ದರ ಅಥವಾ ರಿಯಾಯಿತಿ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ಅಗತ್ಯವಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,ಮೆಚ್ಚಿನವುಗಳು
 DocType: Hub Settings,Custom Data,ಕಸ್ಟಮ್ ಡೇಟಾ
@@ -1263,9 +1257,9 @@
 DocType: Medical Code,Medical Code Standard,ವೈದ್ಯಕೀಯ ಕೋಡ್ ಸ್ಟ್ಯಾಂಡರ್ಡ್
 DocType: Soil Texture,Clay Composition (%),ಜೇಡಿಮಣ್ಣಿನ ಸಂಯೋಜನೆ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,ಕಾರ್ಯವನ್ನು ನಿಯೋಜಿಸುವ ಮೊದಲು ದಯವಿಟ್ಟು ಉಳಿಸಿ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
 DocType: Lab Test,Lab Technician,ಪ್ರಯೋಗಾಲಯ ತಂತ್ರಜ್ಞ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ಪರಿಶೀಲಿಸಿದಲ್ಲಿ, ಗ್ರಾಹಕರನ್ನು ರಚಿಸಲಾಗುವುದು, ರೋಗಿಯಲ್ಲಿ ಮ್ಯಾಪ್ ಮಾಡಲಾಗುವುದು. ಈ ಗ್ರಾಹಕರ ವಿರುದ್ಧ ರೋಗಿಯ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ರಚಿಸಲಾಗುವುದು. ರೋಗಿಯನ್ನು ರಚಿಸುವಾಗ ನೀವು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಬಹುದು."
 DocType: Bank Reconciliation,Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ
@@ -1273,16 +1267,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ಖಾತೆ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ
 DocType: Purchase Receipt,Range,ಶ್ರೇಣಿ
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
 DocType: Item Barcode,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
 DocType: Woocommerce Settings,Endpoints,ಅಂತ್ಯಬಿಂದುಗಳು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ಉತ್ಪಾದಿಸಲು. ವಿಳಂಬವಾದರೆ, ನೀವು ಇದನ್ನು &quot;ಪುನರಾವರ್ತನೆ ದಿನದಂದು&quot; ಕ್ಷೇತ್ರವನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
 DocType: Share Transfer,From Folio No,ಫೋಲಿಯೊ ನಂ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
@@ -1317,16 +1309,17 @@
 DocType: Asset,Available-for-use Date,ಲಭ್ಯವಿರುವ ಬಳಕೆ ದಿನಾಂಕ
 DocType: Guardian,Guardian Name,ಪೋಷಕರ ಹೆಸರು
 DocType: Cheque Print Template,Has Print Format,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ಹೊಂದಿದೆ
-DocType: Employee Loan,Sanctioned,ಮಂಜೂರು
+DocType: Loan,Sanctioned,ಮಂಜೂರು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ರಚಿಸಲಾಗಲಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
 DocType: Crop Cycle,Crop Cycle,ಕ್ರಾಪ್ ಸೈಕಲ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂಗಳನ್ನು, ವೇರ್ಹೌಸ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ ಮೇಜಿನಿಂದ ಪರಿಗಣಿಸಲಾಗುವುದು. ವೇರ್ಹೌಸ್ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ ಯಾವುದೇ &#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂ ಎಲ್ಲಾ ಪ್ಯಾಕಿಂಗ್ ವಸ್ತುಗಳನ್ನು ಅದೇ ಇದ್ದರೆ, ಆ ಮೌಲ್ಯಗಳು ಮುಖ್ಯ ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾದ, ಮೌಲ್ಯಗಳನ್ನು ಟೇಬಲ್ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂಗಳನ್ನು, ವೇರ್ಹೌಸ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ ಮೇಜಿನಿಂದ ಪರಿಗಣಿಸಲಾಗುವುದು. ವೇರ್ಹೌಸ್ ಮತ್ತು ಬ್ಯಾಚ್ ಯಾವುದೇ ಯಾವುದೇ &#39;ಉತ್ಪನ್ನ ಕಟ್ಟು&#39; ಐಟಂ ಎಲ್ಲಾ ಪ್ಯಾಕಿಂಗ್ ವಸ್ತುಗಳನ್ನು ಅದೇ ಇದ್ದರೆ, ಆ ಮೌಲ್ಯಗಳು ಮುಖ್ಯ ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾದ, ಮೌಲ್ಯಗಳನ್ನು ಟೇಬಲ್ &#39;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
 DocType: Student Admission,Publish on website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Subscription,Cancelation Date,ರದ್ದು ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
 DocType: Agriculture Task,Agriculture Task,ಕೃಷಿ ಕಾರ್ಯ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
 DocType: Student Attendance Tool,Student Attendance Tool,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
 DocType: Restaurant Menu,Price List (Auto created),ಬೆಲೆ ಪಟ್ಟಿ (ಸ್ವಯಂ ರಚಿಸಲಾಗಿದೆ)
 DocType: Cheque Print Template,Date Settings,ದಿನಾಂಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -1353,6 +1346,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,ಮೀಟರ್
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ಲ್ಯಾಬ್ ಪರೀಕ್ಷೆ ಡಾಟಾಟೈಮ್ ಸಂಗ್ರಹದ ದಿನಾಂಕದ ಮೊದಲು ಇರಬಾರದು
+DocType: Subscription Plan,Cost,ವೆಚ್ಚ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
 DocType: Expense Claim,Total Advance Amount,ಒಟ್ಟು ಅಡ್ವಾನ್ಸ್ ಮೊತ್ತ
 DocType: Delivery Stop,Estimated Arrival,ಅಂದಾಜು ಆಗಮನ
@@ -1364,15 +1358,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
 DocType: Timesheet Detail,Bill,ಬಿಲ್
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ಬಿಳಿ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,ಬಿಳಿ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,ನೀವು ಚೆಕ್ ಪೆಟ್ಟಿಗೆಗಳ ಪಟ್ಟಿಯಿಂದ ಗರಿಷ್ಟ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಮಾತ್ರ ಆಯ್ಕೆ ಮಾಡಬಹುದು.
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
 DocType: Item,Automatically Create New Batch,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಸ ಬ್ಯಾಚ್ ರಚಿಸಿ
 DocType: Item,Automatically Create New Batch,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಸ ಬ್ಯಾಚ್ ರಚಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} ಗೆ {0} ಗೆ ನಿಯೋಜಿಸಲಾಗುತ್ತಿದೆ (ಸಾಲು {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} ಗೆ {0} ಗೆ ನಿಯೋಜಿಸಲಾಗುತ್ತಿದೆ (ಸಾಲು {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,ಮಾಡಿ
 DocType: Student Admission,Admission Start Date,ಪ್ರವೇಶ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,ಹೊಸ ಉದ್ಯೋಗಿ
@@ -1388,7 +1382,7 @@
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Repayment Schedule,Balance Loan Amount,ಬ್ಯಾಲೆನ್ಸ್ ಸಾಲದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ವೇಳಾಪಟ್ಟಿ ಕೋರ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,ಖರೀದಿ ಆದೇಶದಲ್ಲಿ ಕೊನೆಯ ಖರೀದಿ ವಿವರಗಳನ್ನು ಪಡೆಯುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
@@ -1407,11 +1401,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ ಐಟಂ
 DocType: Purchase Invoice,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ದಯವಿಟ್ಟು ಸೂಚಿಸಿ ಒಂದು {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,ವಿಭಿನ್ನ ರಚನೆಯು ಕ್ಯೂವ್ ಮಾಡಲಾಗಿದೆ.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} ಗಾಗಿ ಕೆಲಸದ ಸಾರಾಂಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ಪಟ್ಟಿಯಲ್ಲಿರುವ ಮೊದಲ ಲೀವ್ ಅಪ್ರೋವರ್ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅಪ್ರೋವರ್ ಆಗಿ ಹೊಂದಿಸಲ್ಪಡುತ್ತದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Plan,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Training Event,Self-Study,ಸ್ವ-ಅಧ್ಯಯನ
@@ -1424,7 +1419,7 @@
 DocType: Workstation,Wages,ವೇತನ
 DocType: Asset Maintenance,Maintenance Manager Name,ನಿರ್ವಹಣೆ ವ್ಯವಸ್ಥಾಪಕರ ಹೆಸರು
 DocType: Agriculture Task,Urgent,ತುರ್ತಿನ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},ಕೋಷ್ಟಕದಲ್ಲಿ ಸಾಲು {0} ಮಾನ್ಯವಾದ ಸಾಲು ಐಡಿ ಸೂಚಿಸಿ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},ಕೋಷ್ಟಕದಲ್ಲಿ ಸಾಲು {0} ಮಾನ್ಯವಾದ ಸಾಲು ಐಡಿ ಸೂಚಿಸಿ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ವೇರಿಯಬಲ್ ಕಂಡುಹಿಡಿಯಲು ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,ದಯವಿಟ್ಟು ನಂಪಡ್ನಿಂದ ಸಂಪಾದಿಸಲು ಕ್ಷೇತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ರಚಿಸಿದಂತೆ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಆಗಿರಬಾರದು.
@@ -1436,7 +1431,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,ಗುಣಮಟ್ಟ ಇನ್ಸ್ಪೆಕ್ಷನ್ ಟೆಂಪ್ಲೇಟು ಹೆಸರು
 DocType: Project,First Email,ಮೊದಲ ಇಮೇಲ್
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ಮಾರಾಟದ ಆರ್ಡರ್ / ಗೂಡ್ಸ್ ಮುಕ್ತಾಯಗೊಂಡ ವೇರ್ಹೌಸ್ ರಿಸರ್ವ್ಡ್ ಗೋದಾಮಿನ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
 DocType: Repayment Schedule,Interest Amount,ಬಡ್ಡಿ ಪ್ರಮಾಣ
 DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Share Transfer,Issue,ಸಂಚಿಕೆ
@@ -1450,10 +1445,10 @@
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 ,Projected Quantity as Source,ಮೂಲ ಯೋಜಿತ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ಡೆಲಿವರಿ ಟ್ರಿಪ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ಡೆಲಿವರಿ ಟ್ರಿಪ್
 DocType: Student,A-,ಎ
 DocType: Share Transfer,Transfer Type,ವರ್ಗಾವಣೆ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
 DocType: Consultation,Diagnosis,ರೋಗನಿರ್ಣಯ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
@@ -1462,12 +1457,13 @@
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,ZIP ಕೋಡ್
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ಸಾಲದಲ್ಲಿ ಬಡ್ಡಿ ಆದಾಯದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
 DocType: Item,Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ಪ್ರೊಡಕ್ಷನ್ ಸೇವನೆ ಶೇಕಡಾವಾರು ಓವರ್
-DocType: Employee Loan,Repayment Schedule,ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ
+DocType: Loan,Repayment Schedule,ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ
 DocType: Shipping Rule Condition,Shipping Rule Condition,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಕಂಡಿಶನ್
 DocType: Holiday List,Get Weekly Off Dates,ದಿನಾಂಕ ವೀಕ್ಲಿ ಆಫ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
@@ -1482,7 +1478,7 @@
 DocType: Education Settings,Attendance Freeze Date,ಅಟೆಂಡೆನ್ಸ್ ಫ್ರೀಜ್ ದಿನಾಂಕ
 DocType: Education Settings,Attendance Freeze Date,ಅಟೆಂಡೆನ್ಸ್ ಫ್ರೀಜ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),ಕನಿಷ್ಠ ಲೀಡ್ ವಯಸ್ಸು (ದಿನಗಳು)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),ಕನಿಷ್ಠ ಲೀಡ್ ವಯಸ್ಸು (ದಿನಗಳು)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,ಎಲ್ಲಾ BOMs
@@ -1491,14 +1487,16 @@
 DocType: Expense Claim,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
 DocType: Driver,Cellphone Number,ಸೆಲ್ಫೋನ್ ಸಂಖ್ಯೆ
 DocType: Project,Monitor Progress,ಪ್ರೋಗ್ರೆಸ್ ಮೇಲ್ವಿಚಾರಣೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
 DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ್ರಿ ಮಾಡಿ
+DocType: Supplier Quotation,Auto Repeat Section,ಸ್ವಯಂ ಪುನರಾವರ್ತನೆ ವಿಭಾಗ
 DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate
 DocType: Appraisal Template Goal,Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
 DocType: Program Enrollment,Transportation,ಸಾರಿಗೆ
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ಪ್ರಮಾಣ ಕಡಿಮೆ ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+DocType: Department Approver,Department Approver,ಇಲಾಖೆ ಅನುಮೋದನೆ
 DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು
 DocType: Employee Advance,Claimed,ಹಕ್ಕು ಪಡೆಯಲಾಗಿದೆ
 DocType: Crop,Row Spacing,ಸಾಲು ಸ್ಪೇಸಿಂಗ್
@@ -1508,6 +1506,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ಪಾವತಿ ಸಾಮರಸ್ಯ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,ಕೊಡುಗೆ%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ಆರ್ಡರ್ ಖರೀದಿಸಿ ಅಗತ್ಯವಿದೆ ವೇಳೆ == &#39;ಹೌದು&#39;, ನಂತರ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು, ಬಳಕೆದಾರ ಐಟಂ ಮೊದಲ ಆರ್ಡರ್ ಖರೀದಿಸಿ ರಚಿಸಬೇಕಾಗಿದೆ ಬೈಯಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಪ್ರಕಾರ {0}"
+,HSN-wise-summary of outward supplies,ಬಾಹ್ಯ ಪೂರೈಕೆಗಳ HSN- ಬುದ್ಧಿವಂತ-ಸಾರಾಂಶ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ನಿಮ್ಮ ಉಲ್ಲೇಖ ಕಂಪನಿ ನೋಂದಣಿ ಸಂಖ್ಯೆಗಳು . ತೆರಿಗೆ ಸಂಖ್ಯೆಗಳನ್ನು ಇತ್ಯಾದಿ
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
@@ -1521,7 +1520,7 @@
 DocType: Setup Progress Action,Action Name,ಆಕ್ಷನ್ ಹೆಸರು
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ಪ್ರಾರಂಭ ವರ್ಷ
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN ಮೊದಲ 2 ಅಂಕೆಗಳು ರಾಜ್ಯ ಸಂಖ್ಯೆಯ ಹೊಂದಾಣಿಕೆ ಮಾಡಬೇಕು {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪ್ರಾರಂಭಿಸಿ
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
@@ -1539,26 +1538,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ಸೃಷ್ಟಿ ಸಮಯದಲ್ಲಿ ಮಾತ್ರ ಜಾಗವನ್ನು ನಕಲಿಸಲಾಗುತ್ತದೆ.
 DocType: Setup Progress Action,Domains,ಡೊಮೇನ್ಗಳ
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ಆಡಳಿತ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,ಆಡಳಿತ
 DocType: Cheque Print Template,Payer Settings,ಪಾವತಿಸುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ಎಚ್ಚರಿಕೆ
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',ಪ್ರಾರಂಭದ ದಿನವು ಅಂತ್ಯದ ದಿನಕ್ಕಿಂತಲೂ ಹೆಚ್ಚು &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
 DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},ಐಟಂ {0} ಮಾನ್ಯ ಸರಣಿ ಸೂಲ {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ಐಟಂ ಕೋಡ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,ಐಟಂ ಕೋಡ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಪಡೆಯಲು ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
-DocType: Employee Loan,Partially Disbursed,ಭಾಗಶಃ ಪಾವತಿಸಲಾಗುತ್ತದೆ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,ಮಾಹಿತಿ ನೀಡಿ.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,ಮಾಹಿತಿ ನೀಡಿ.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,ರದ್ದುಪಡಿಸದ ಚಂದಾದಾರಿಕೆಯನ್ನು ನೀವು ಮರುಪ್ರಾರಂಭಿಸಬಾರದು.
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
 DocType: Fee Validity,Valid Till,ಮಾನ್ಯ ಟಿಲ್
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,ಒಟ್ಟು ಪಾಲಕರು ಶಿಕ್ಷಕರ ಸಭೆ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
@@ -1571,7 +1570,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ಆಯ್ಕೆಮಾಡಿದ ಗ್ರಾಹಕರಿಗೆ ಗ್ರಾಹಕ ಗುಂಪನ್ನು ಬದಲಾಯಿಸುವುದು ಅನುಮತಿಸುವುದಿಲ್ಲ.
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ.
 DocType: Program Enrollment Tool,Enrollment Details,ದಾಖಲಾತಿ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
@@ -1592,18 +1591,20 @@
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Purchase Order,Group same items,ಗುಂಪು ಅದೇ ಐಟಂಗಳನ್ನು
 DocType: Purchase Invoice,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-DocType: Employee Loan Application,Repayment Info,ಮರುಪಾವತಿಯ ಮಾಹಿತಿ
+DocType: Department,Parent Department,ಪೋಷಕ ಇಲಾಖೆ
+DocType: Loan Application,Repayment Info,ಮರುಪಾವತಿಯ ಮಾಹಿತಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
 DocType: Maintenance Team Member,Maintenance Role,ನಿರ್ವಹಣೆ ಪಾತ್ರ
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 DocType: Sales Order,SO-,ಆದ್ದರಿಂದ-
 DocType: Hotel Room Reservation,Hotel Reservation User,ಹೋಟೆಲ್ ಮೀಸಲಾತಿ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ರಿಸರ್ಚ್
+DocType: Subscription Settings,Subscription Settings,ಚಂದಾದಾರಿಕೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ರಿಸರ್ಚ್
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Announcement,All Students,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿಗಳು
@@ -1614,19 +1615,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Crop Cycle,Less than a year,ಒಂದು ವರ್ಷಕ್ಕಿಂತ ಕಡಿಮೆ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ನಂ
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 DocType: Crop,Yield UOM,ಯುಒಎಂ ಇಳುವರಿ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
 DocType: Item,Is Item from Hub,ಹಬ್ನಿಂದ ಐಟಂ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ರೋ {0}: ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯವಾಗಿದೆ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ಲೆಕ್ಕಪತ್ರ ಲೆಡ್ಜರ್
 DocType: Stock Reconciliation,Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ಡಾ {0} ಮೇಲೆ ಬಿಟ್ಟು {1}
 DocType: Purchase Invoice,Reverse Charge,ರಿವರ್ಸ್ ಚಾರ್ಜ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
 DocType: Purchase Invoice,05-Change in POS,05-ಪಿಒಎಸ್ನಲ್ಲಿ ಬದಲಾವಣೆ
 DocType: Vehicle Log,Service Detail,ಸೇವೆ ವಿವರ
 DocType: BOM,Item Description,ಐಟಂ ವಿವರಣೆ
@@ -1641,12 +1642,12 @@
 DocType: Opportunity Item,Opportunity Item,ಅವಕಾಶ ಐಟಂ
 ,Student and Guardian Contact Details,ವಿದ್ಯಾರ್ಥಿ ಮತ್ತು ಗಾರ್ಡಿಯನ್ ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ರೋ {0}: ಪೂರೈಕೆದಾರ ಫಾರ್ {0} ಇಮೇಲ್ ವಿಳಾಸ ಇಮೇಲ್ ಕಳುಹಿಸಲು ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ವೀಕ್ಷಿಸಿ ಹಬ್
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 DocType: Patient Appointment,More Info,ಇನ್ನಷ್ಟು ಮಾಹಿತಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},ಸತತವಾಗಿ ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},ಸತತವಾಗಿ ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
 DocType: Supplier Scorecard,Scorecard Actions,ಸ್ಕೋರ್ಕಾರ್ಡ್ ಕ್ರಿಯೆಗಳು
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ಉದಾಹರಣೆ: ಕಂಪ್ಯೂಟರ್ ಸೈನ್ಸ್ ಮಾಸ್ಟರ್ಸ್
 DocType: Purchase Invoice,Rejected Warehouse,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್
@@ -1656,7 +1657,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ಗೆ
 DocType: Supplier Quotation Item,Lead Time in days,ದಿನಗಳಲ್ಲಿ ಪ್ರಮುಖ ಸಮಯ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} ನಿಂದ ಸಂಬಳ ಪಾವತಿಗೆ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} ನಿಂದ ಸಂಬಳ ಪಾವತಿಗೆ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
@@ -1665,9 +1666,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ಗಳು
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ಸಣ್ಣ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ಸಣ್ಣ
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ಇನ್ವಾಯ್ಸ್ ಸೃಷ್ಟಿ ಟೂಲ್ ಐಟಂ ತೆರೆಯಲಾಗುತ್ತಿದೆ
 DocType: Education Settings,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ಗ್ರೇಸ್ ಅವಧಿಯ ನಂತರ ಸರಕುಪಟ್ಟಿ ರದ್ದುಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
 DocType: Project,% Completed,% ಪೂರ್ಣಗೊಂಡಿದೆ
 ,Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
@@ -1681,7 +1683,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ಪ್ರಯೋಗಾಲಯ ಪರೀಕ್ಷೆ ದಿನಾಂಕ
 DocType: Email Digest,Add Quote,ಉದ್ಧರಣ ಸೇರಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 DocType: Agriculture Analysis Criteria,Agriculture,ವ್ಯವಸಾಯ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
@@ -1712,16 +1714,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ಸಲಕರಣಾ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,ದಯವಿಟ್ಟು ಮೊದಲು ಐಟಂ ಕೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
+DocType: Subscription Plan,Billing Interval Count,ಬಿಲ್ಲಿಂಗ್ ಇಂಟರ್ವಲ್ ಕೌಂಟ್
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 DocType: Antibiotic,Antibiotic,ಪ್ರತಿಜೀವಕ
 ,Team Updates,ತಂಡ ಅಪ್ಡೇಟ್ಗಳು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,ಸರಬರಾಜುದಾರನ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ AccountType ವ್ಯವಹಾರಗಳಲ್ಲಿ ಈ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ .
 DocType: Purchase Invoice,Grand Total (Company Currency),ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ರಚಿಸಿ
@@ -1747,7 +1750,7 @@
 DocType: POS Item Group,POS Item Group,ಪಿಓಎಸ್ ಐಟಂ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ಪರ್ಯಾಯ ಐಟಂ ಐಟಂ ಕೋಡ್ನಂತೆ ಇರಬಾರದು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-ತಾತ್ಕಾಲಿಕ ಮೌಲ್ಯಮಾಪನ ಅಂತಿಮಗೊಳಿಸುವಿಕೆ
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
@@ -1764,7 +1767,7 @@
 DocType: BOM Operation,Workstation,ಕಾರ್ಯಸ್ಥಾನ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ಉದ್ಧರಣ ಸರಬರಾಜುದಾರ ವಿನಂತಿ
 DocType: Healthcare Settings,Registration Message,ನೋಂದಣಿ ಸಂದೇಶ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ಹಾರ್ಡ್ವೇರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Prescription Dosage,Prescription Dosage,ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ ಡೋಸೇಜ್
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
@@ -1795,7 +1798,7 @@
 DocType: Project,Start and End Dates,ಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ದಿನಾಂಕ ಎಂಡ್
 ,Delivered Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ವಿತರಿಸಲಾಯಿತು ಐಟಂಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ಓಪನ್ ಬಿಒಎಮ್ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
 DocType: Project Update,Great/Quickly,ಗ್ರೇಟ್ / ತ್ವರಿತವಾಗಿ
 DocType: Purchase Invoice Item,UOM,ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ
@@ -1804,8 +1807,8 @@
 DocType: Employee,EMP/,ಕಂಪನ /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ ಬ್ಯಾಚ್ಗಳು ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿಗಳು
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,ಕೆಳಗಿನ ಖಾತೆಗಳನ್ನು ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಬಹುದು:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,ಕೆಳಗಿನ ಖಾತೆಗಳನ್ನು ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಬಹುದು:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 DocType: Payment Request,Transaction Currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},ಗೆ {0} | {1} {2}
@@ -1816,6 +1819,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,ಆವರೇಜ್ ಡೈಲಿ ಹೊರಹೋಗುವ
 DocType: POS Profile,Campaign,ದಂಡಯಾತ್ರೆ
 DocType: Supplier,Name and Type,ಹೆಸರು ಮತ್ತು ವಿಧ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',ಅನುಮೋದನೆ ಸ್ಥಿತಿ 'ಅಂಗೀಕಾರವಾದ' ಅಥವಾ ' ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Physician,Contacts and Address,ಸಂಪರ್ಕಗಳು ಮತ್ತು ವಿಳಾಸ
 DocType: Purchase Invoice,Contact Person,ಕಾಂಟ್ಯಾಕ್ಟ್ ಪರ್ಸನ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ' ' ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ' ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
@@ -1829,19 +1833,20 @@
 DocType: Student Admission,Eligibility and Details,ಅರ್ಹತೆ ಮತ್ತು ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ಸಂವಹನ ದಾಖಲೆ .
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","ಉದ್ಧರಣ ವಿನಂತಿ ಹೆಚ್ಚು ಚೆಕ್ ಪೋರ್ಟಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು, ಪೋರ್ಟಲ್ ಪ್ರವೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಕೋರಿಂಗ್ ವೇರಿಯಬಲ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
 DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಯನ್ನು ರಚಿಸುವಲ್ಲಿ ದೋಷಗಳಿವೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ಪಟ್ಟಿಯಲ್ಲಿರುವ ಮೊದಲ ಖರ್ಚು ಅಪ್ರೋವರ್ ಅನ್ನು ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಅಪ್ರೋವರ್ ಎಂದು ಹೊಂದಿಸಲಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1862,15 +1867,16 @@
 DocType: Package Code,Package Code,ಪ್ಯಾಕೇಜ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,ಹೊಸಗಸುಬಿ
 DocType: Purchase Invoice,Company GSTIN,ಕಂಪನಿ GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ಸ್ಟ್ರಿಂಗ್ ಐಟಂ ಮಾಸ್ಟರ್ ರಿಂದ ಗಳಿಸಿತು ಮತ್ತು ಈ ಕ್ಷೇತ್ರದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ತೆರಿಗೆ ವಿವರ ಟೇಬಲ್.
  ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಉಪಯೋಗಿಸಿದ"
 DocType: Supplier Scorecard Period,SSC-,ಎಸ್ಎಸ್ಸಿ-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆ ಹೆಪ್ಪುಗಟ್ಟಿರುವ ವೇಳೆ , ನಮೂದುಗಳನ್ನು ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ಅವಕಾಶವಿರುತ್ತದೆ ."
 DocType: Email Digest,Bank Balance,ಬ್ಯಾಂಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ನಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿ ಅನುಮೋದನೆಯನ್ನು ಬಿಡಿ
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು , ಅಗತ್ಯ ವಿದ್ಯಾರ್ಹತೆಗಳು , ಇತ್ಯಾದಿ"
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
@@ -1898,15 +1904,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,ಸಾಲು {0} ನಲ್ಲಿ ಪಾವತಿ ಅವಧಿಯು ಬಹುಶಃ ನಕಲಿಯಾಗಿದೆ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),ವ್ಯವಸಾಯ (ಬೀಟಾ)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 DocType: Disease,Common Name,ಸಾಮಾನ್ಯ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
 DocType: Vital Signs,Blood Pressure,ರಕ್ತದೊತ್ತಡ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,ವಿಶ್ಲೇಷಕ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,ವಿಶ್ಲೇಷಕ
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 DocType: Quality Inspection,QI-,QI-
@@ -1916,15 +1922,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪಿನಲ್ಲಿರುವ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಸೇರಿಕೊಂಡಳು ಕೋರ್ಸ್ ಸ್ಥಿರೀಕರಿಸಿ
 DocType: Notification Control,Expense Claim Rejected,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು
 DocType: Item,Item Attribute,ಐಟಂ ಲಕ್ಷಣ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ಸರ್ಕಾರ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ಸರ್ಕಾರ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ಖರ್ಚು ಹಕ್ಕು {0} ಈಗಾಗಲೇ ವಾಹನ ಲಾಗ್ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಹೆಸರು
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ದಯವಿಟ್ಟು ಮರುಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ದಯವಿಟ್ಟು ಮರುಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,ಸೇವೆಗಳು
 DocType: HR Settings,Email Salary Slip to Employee,ನೌಕರರ ಇಮೇಲ್ ಸಂಬಳ ಸ್ಲಿಪ್
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
 DocType: Sales Invoice,Source,ಮೂಲ
 DocType: Customer,"Select, to make the customer searchable with these fields",ಗ್ರಾಹಕರನ್ನು ಈ ಕ್ಷೇತ್ರಗಳೊಂದಿಗೆ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವಂತೆ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ಮುಚ್ಚಲಾಗಿದೆ ಶೋ
@@ -1941,7 +1947,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
 DocType: Program Course,Program Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋರ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 DocType: Homepage,Company Tagline for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟಕ್ಕೆ ಕಂಪನಿ ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ಟೇಕನ್
@@ -1971,10 +1977,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,ಸದಸ್ಯತ್ವ ವಿವರಗಳು
 DocType: Leave Block List,Block Holidays on important days.,ಪ್ರಮುಖ ದಿನಗಳಲ್ಲಿ ಬ್ಲಾಕ್ ರಜಾದಿನಗಳು.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),ದಯವಿಟ್ಟು ಅಗತ್ಯವಿರುವ ಎಲ್ಲ ಫಲಿತಾಂಶ ಮೌಲ್ಯವನ್ನು ಇನ್ಪುಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
-DocType: Employee Loan,Monthly Repayment Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
+DocType: Loan,Monthly Repayment Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
 DocType: UOM,UOM Name,UOM ಹೆಸರು
 DocType: GST HSN Code,HSN Code,HSN ಕೋಡ್
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,ಕೊಡುಗೆ ಪ್ರಮಾಣ
@@ -1996,7 +2002,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ವೈದ್ಯರಿಗೆ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,ಪೆಟ್ಟಿಗೆ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
+DocType: Journal Entry,JV-RET-,ಜೆವಿ-ಆರ್ಇಟಿ-
 DocType: Budget,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),ಹೆಲ್ತ್ಕೇರ್ (ಬೀಟಾ)
@@ -2024,7 +2031,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
 DocType: Shipping Rule Condition,From Value,FromValue
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-DocType: Employee Loan,Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ
+DocType: Loan,Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ಪರಿಶೀಲಿಸಿದರೆ, ಮುಖಪುಟ ವೆಬ್ಸೈಟ್ ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗ್ರೂಪ್ ಇರುತ್ತದೆ"
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
@@ -2033,7 +2040,7 @@
 DocType: Asset Maintenance Task,Certificate Required,ಪ್ರಮಾಣಪತ್ರ ಅಗತ್ಯವಿದೆ
 DocType: Company,Default Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ರೋ {0}: ಗೆ ಸಮಯ ಮತ್ತು ಸಮಯ {1} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
 DocType: Purchase Invoice,Supplier Warehouse,ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Opportunity,Contact Mobile No,ಸಂಪರ್ಕಿಸಿ ಮೊಬೈಲ್ ನಂ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
@@ -2041,7 +2048,7 @@
 DocType: Student Report Generation Tool,Print Section,ವಿಭಾಗ ಮುದ್ರಿಸು
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ಬಳಕೆದಾರ {0} ಡೀಫಾಲ್ಟ್ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ. ಈ ಬಳಕೆದಾರರಿಗಾಗಿ ಸಾಲು {1} ನಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ.
 DocType: Student Group,Set 0 for no limit,ಯಾವುದೇ ಮಿತಿ ಹೊಂದಿಸಿ 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,ಸಾಲು {idx}: {ಕ್ಷೇತ್ರ} ತೆರೆಯುವ {invoice_type} ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ರಚಿಸಲು ಅಗತ್ಯವಿದೆ
 DocType: Customer,Primary Address and Contact Detail,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
@@ -2052,10 +2059,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,ದಯವಿಟ್ಟು ಕನಿಷ್ಠ ಒಂದು ಡೊಮೇನ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,ಹುಡುಕಾಟ ಐಟಂ
 DocType: Payment Schedule,Payment Amount,ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
@@ -2065,7 +2072,7 @@
 DocType: Assessment Plan,Grading Scale,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ಈಗಾಗಲೇ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ಹ್ಯಾಂಡ್ ರಲ್ಲಿ ಸ್ಟಾಕ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,ಹ್ಯಾಂಡ್ ರಲ್ಲಿ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,ಯಶಸ್ವಿಯಾಗಿ ಆಮದು !
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
@@ -2076,17 +2083,16 @@
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
 DocType: Customer,Customer POS Id,ಗ್ರಾಹಕ ಪಿಓಎಸ್ ಐಡಿ
 DocType: Account,Account Name,ಖಾತೆ ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಪ್ರಮಾಣ {1} ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಪ್ರಮಾಣ {1} ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,ದಯವಿಟ್ಟು Woocommerce ಸರ್ವರ್ URL ಅನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Share Balance,To No,ಇಲ್ಲ
-DocType: Subscription,Reference Document,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 DocType: Accounts Settings,Credit Controller,ಕ್ರೆಡಿಟ್ ನಿಯಂತ್ರಕ
-DocType: Grant Application,Applicant Type,ಅರ್ಜಿದಾರರ ಪ್ರಕಾರ
+DocType: Loan,Applicant Type,ಅರ್ಜಿದಾರರ ಪ್ರಕಾರ
 DocType: Purchase Invoice,03-Deficiency in services,03-ಸೇವೆಗಳಲ್ಲಿ ಕೊರತೆ
 DocType: Delivery Note,Vehicle Dispatch Date,ವಾಹನ ಡಿಸ್ಪ್ಯಾಚ್ ದಿನಾಂಕ
 DocType: Healthcare Settings,Default Medical Code Standard,ಡೀಫಾಲ್ಟ್ ವೈದ್ಯಕೀಯ ಕೋಡ್ ಸ್ಟ್ಯಾಂಡರ್ಡ್
@@ -2097,13 +2103,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Lead,Upper Income,ಮೇಲ್ ವರಮಾನ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ರಿಜೆಕ್ಟ್
 DocType: Journal Entry Account,Debit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಡೆಬಿಟ್
 DocType: BOM Item,BOM Item,BOM ಐಟಂ
 DocType: Appraisal,For Employee,ಉದ್ಯೋಗಿಗಳಿಗಾಗಿ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ವಿತರಣೆ ಎಂಟ್ರಿ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ವಿತರಣೆ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
 DocType: Membership,INR,INR
@@ -2133,10 +2139,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 ಹೆಚ್ಚು ಇರಬೇಕು
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ದಿನಗಳು) ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ಖರೀದಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ಕಡ್ಡಾಯ - ತಂತ್ರಾಂಶದ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ಕಡ್ಡಾಯ - ತಂತ್ರಾಂಶದ
 DocType: Special Test Template,Result Component,ಫಲಿತಾಂಶ ಕಾಂಪೊನೆಂಟ್
@@ -2157,7 +2163,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ಎಲೆಗಳು ಎಲೆಗಳು ಒಳಗೆ ರಜಾ ಸೇರಿಸಿ
 DocType: Sales Invoice,Packed Items,ಪ್ಯಾಕ್ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ಸೀರಿಯಲ್ ನಂ ವಿರುದ್ಧ ಖಾತರಿ ಹಕ್ಕು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ಒಟ್ಟು&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ಒಟ್ಟು&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2175,10 +2181,10 @@
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ಕ್ರಿಯೆ ದೃಢೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ಈಡೇರಿದ
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,ಪ್ರಮಾಣಿತ ಮಾನದಂಡವನ್ನು ರಚಿಸಲಾಗುವುದಿಲ್ಲ. ದಯವಿಟ್ಟು ಮಾನದಂಡವನ್ನು ಮರುಹೆಸರಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
@@ -2201,9 +2207,9 @@
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Material Request,Transferred,ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 DocType: Vehicle,Doors,ಡೋರ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ರೋಗಿಯ ನೋಂದಣಿಗಾಗಿ ಶುಲ್ಕ ಸಂಗ್ರಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ಸ್ಟಾಕ್ ವಹಿವಾಟಿನ ನಂತರ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಹೊಸ ಐಟಂ ಅನ್ನು ರಚಿಸಿ ಮತ್ತು ಹೊಸ ಐಟಂಗೆ ವರ್ಗಾಯಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ಸ್ಟಾಕ್ ವಹಿವಾಟಿನ ನಂತರ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಹೊಸ ಐಟಂ ಅನ್ನು ರಚಿಸಿ ಮತ್ತು ಹೊಸ ಐಟಂಗೆ ವರ್ಗಾಯಿಸಿ
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,ತೆರಿಗೆ ಬ್ರೇಕ್ಅಪ್
 DocType: Packing Slip,PS-,PS-
@@ -2239,12 +2245,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ಸಾಮರಸ್ಯ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Purchase Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ಉದ್ಯೋಗಿ ಅಡ್ವಾನ್ಸಸ್
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 DocType: Grant Application,Assessment  Mark (Out of 10),ಅಸೆಸ್ಮೆಂಟ್ ಮಾರ್ಕ್ (10 ರಲ್ಲಿ)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ಮೊಬೈಲ್ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ಮುಖ್ಯ
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -2253,15 +2260,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Email Digest,Annual Expenses,ವಾರ್ಷಿಕ ವೆಚ್ಚಗಳು
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
 DocType: Sales Team,Contribution to Net Total,ನೆಟ್ ಒಟ್ಟು ಕೊಡುಗೆ
 DocType: Sales Invoice Item,Customer's Item Code,ಗ್ರಾಹಕರ ಐಟಂ ಕೋಡ್
 DocType: Stock Reconciliation,Stock Reconciliation,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ
 DocType: Territory,Territory Name,ಪ್ರದೇಶ ಹೆಸರು
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,ನೀವು ಚಂದಾದಾರಿಕೆಯಲ್ಲಿ ಅದೇ ಬಿಲ್ಲಿಂಗ್ ಚಕ್ರವನ್ನು ಹೊಂದಿರುವ ಯೋಜನೆಗಳನ್ನು ಮಾತ್ರ ಹೊಂದಬಹುದು
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ಕೆಲಸ ಸಂ .
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
@@ -2272,10 +2280,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ರೀತಿಗೆ
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ತರಬೇತಿ ಘಟನೆಗಳು
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,ಲೀಡ್ ಮೂಲದಿಂದ ಟ್ರ್ಯಾಕ್ ಲೀಡ್ಸ್.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ದಯವಿಟ್ಟು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ದಯವಿಟ್ಟು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,ನಿರ್ವಹಣೆ ಲಾಗ್
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಮೇಲೆ ಫಿಲ್ಟರ್ ಸೆಟ್ ಮಾಡಿ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ಈ ಪ್ಯಾಕೇಜ್ ನಿವ್ವಳ ತೂಕ . ( ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲ ಐಟಂಗಳನ್ನು ನಿವ್ವಳ ತೂಕ ಮೊತ್ತ ಎಂದು )
@@ -2283,11 +2291,11 @@
 DocType: Sales Order,To Deliver and Bill,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
 DocType: Student Group,Instructors,ತರಬೇತುದಾರರು
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,ಹಂಚಿಕೆ ನಿರ್ವಹಣೆ
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ಪಾವತಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","ವೇರ್ಹೌಸ್ {0} ಯಾವುದೇ ಖಾತೆಗೆ ಲಿಂಕ್ ಇದೆ, ಕಂಪನಿಯಲ್ಲಿ ಗೋದಾಮಿನ ದಾಖಲೆಯಲ್ಲಿ ಖಾತೆ ಅಥವಾ ಸೆಟ್ ಡೀಫಾಲ್ಟ್ ದಾಸ್ತಾನು ಖಾತೆಯನ್ನು ಸೂಚಿಸಿ {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,ನಿಮ್ಮ ಆದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Work Order Operation,Actual Time and Cost,ನಿಜವಾದ ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
@@ -2297,7 +2305,7 @@
 DocType: Student Leave Application,Student Leave Application,ವಿದ್ಯಾರ್ಥಿ ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ಮೇಲೆ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
@@ -2307,7 +2315,7 @@
 DocType: Item,Barcodes,ಬಾರ್ಕೋಡ್ಗಳು
 DocType: Hub Category,Hub Node,ಹಬ್ ನೋಡ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ಜತೆಗೂಡಿದ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ಜತೆಗೂಡಿದ
 DocType: Asset Movement,Asset Movement,ಆಸ್ತಿ ಮೂವ್ಮೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,ಕೆಲಸದ ಆದೇಶ {0} ಅನ್ನು ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,ಹೊಸ ಕಾರ್ಟ್
@@ -2325,13 +2333,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ ಕಂಪನಿಯ ಕರೆನ್ಸಿಯ ಅಥವಾ ಪಾರ್ಟಿ ಖಾತೆ ಕರೆನ್ಸಿಗೆ ಸಮನಾಗಿರಬೇಕು
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 DocType: Soil Texture,Loam,ಲೊಮ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,ಸಾಲು {0}: ದಿನಾಂಕವನ್ನು ಪೋಸ್ಟ್ ಮಾಡುವ ಮೊದಲು ದಿನಾಂಕ ಕಾರಣವಾಗಿರಬಾರದು
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,ಸಾಲು {0}: ದಿನಾಂಕವನ್ನು ಪೋಸ್ಟ್ ಮಾಡುವ ಮೊದಲು ದಿನಾಂಕ ಕಾರಣವಾಗಿರಬಾರದು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
 ,Sales Invoice Trends,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Leave Application,Apply / Approve Leaves,ಎಲೆಗಳು ಅನುಮೋದಿಸಿ / ಅನ್ವಯಿಸು
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ಫಾರ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ಬ್ಯಾಚ್ ಮಾದರಿ ಅಥವಾ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ' ' ಹಿಂದಿನ ರೋ ಪ್ರಮಾಣ ರಂದು ' ಮಾತ್ರ ಸಾಲು ಉಲ್ಲೇಖಿಸಬಹುದು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ಬ್ಯಾಚ್ ಮಾದರಿ ಅಥವಾ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ' ' ಹಿಂದಿನ ರೋ ಪ್ರಮಾಣ ರಂದು ' ಮಾತ್ರ ಸಾಲು ಉಲ್ಲೇಖಿಸಬಹುದು
 DocType: Sales Order Item,Delivery Warehouse,ಡೆಲಿವರಿ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,ಆರ್ಥಿಕ ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಟ್ರೀ.
 DocType: Serial No,Delivery Document No,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
@@ -2345,7 +2352,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ಉತ್ಪಾದನಾ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ವಸ್ತು ಬಳಕೆ ಇಲ್ಲ.
 DocType: Student,Student Mobile Number,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} ಕ್ಕಿಂತ ಹೆಚ್ಚು {1} ಸಾಲಿನಲ್ಲಿ ಐಟಂ {0} ಗಾಗಿ ಓವರ್ಬಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಧಿಕ ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೊಂದಿಸಿ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} ಕ್ಕಿಂತ ಹೆಚ್ಚು {1} ಸಾಲಿನಲ್ಲಿ ಐಟಂ {0} ಗಾಗಿ ಓವರ್ಬಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಧಿಕ ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೊಂದಿಸಿ"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ಅಪ್ಡೇಟ್ ಪ್ರತಿಕ್ರಿಯೆ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
@@ -2357,12 +2364,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,ಮೊದಲು ಪ್ರೋಗ್ರಾಂ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Patient Appointment,Patient Age,ರೋಗಿಯ ವಯಸ್ಸು
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಅನ್ನು ಈಗಾಗಲೇ ಹಿಂದಿರುಗಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಅನ್ನು ಈಗಾಗಲೇ ಹಿಂದಿರುಗಿಸಲಾಗಿದೆ
 DocType: Supplier,Supplier of Goods or Services.,ಸರಕುಗಳು ಅಥವಾ ಸೇವೆಗಳ ಪೂರೈಕೆದಾರ.
 DocType: Budget,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Asset Maintenance Log,Planned,ಯೋಜಿಸಲಾಗಿದೆ
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,ಕನ್ಸಲ್ಟೇಶನ್ ಆರೋಪಗಳನ್ನು ಬುಕ್ ಮಾಡಲು ರೋಗಿಯಲ್ಲಿ ಹೊಂದಿಸದಿದ್ದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕಾರಾರ್ಹ ಖಾತೆಗಳನ್ನು ಬಳಸಲಾಗುತ್ತದೆ.
 DocType: Vehicle Log,Fuel Price,ಇಂಧನ ಬೆಲೆ
+DocType: Bank Guarantee,Margin Money,ಮಾರ್ಜಿನ್ ಮನಿ
 DocType: Budget,Budget,ಮುಂಗಡಪತ್ರ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ತೆರೆಯಿರಿ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
@@ -2376,16 +2384,16 @@
 DocType: Lead,Follow Up,ಅನುಸರಿಸು
 DocType: Item,Is Sales Item,ಮಾರಾಟದ ಐಟಂ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ಐಟಂ ಗುಂಪು ಟ್ರೀ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಐಟಂ ಮಾಸ್ಟರ್ ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಐಟಂ ಮಾಸ್ಟರ್ ಪರಿಶೀಲಿಸಿ
 DocType: Maintenance Visit,Maintenance Time,ನಿರ್ವಹಣೆ ಟೈಮ್
 ,Amount to Deliver,ಪ್ರಮಾಣವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},ಒಂದೇ ಐಟಂ ಅನ್ನು ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾಗಿದೆ. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಪ್ರಾರಂಭ ವರ್ಷ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,ದೋಷಗಳು ಇದ್ದವು.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,ನೌಕರ {0} {2} ಮತ್ತು {3} ನಡುವಿನ {1} ಗೆ ಈಗಾಗಲೇ ಅರ್ಜಿ ಸಲ್ಲಿಸಿದ್ದಾರೆ:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,ದೋಷಗಳು ಇದ್ದವು.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,ನೌಕರ {0} {2} ಮತ್ತು {3} ನಡುವಿನ {1} ಗೆ ಈಗಾಗಲೇ ಅರ್ಜಿ ಸಲ್ಲಿಸಿದ್ದಾರೆ:
 DocType: Guardian,Guardian Interests,ಗಾರ್ಡಿಯನ್ ಆಸಕ್ತಿಗಳು
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
 DocType: Education Settings,Instructor Records to be created by,ಇನ್ಸ್ಟ್ರಕ್ಟರ್ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: GST Account,GST Account,ಜಿಎಸ್ಟಿ ಖಾತೆ
@@ -2405,8 +2413,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,ಮೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡಗಳಿಗೆ ಅಥವಾ ಸಂಬಳದ ಸ್ಲಿಪ್ಗೆ ಸಲ್ಲಿಸಲು ಯಾವುದೇ ವೇತನ ಸ್ಲಿಪ್ ಕಂಡುಬಂದಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡಗಳಿಗೆ ಅಥವಾ ಸಂಬಳದ ಸ್ಲಿಪ್ಗೆ ಸಲ್ಲಿಸಲು ಯಾವುದೇ ವೇತನ ಸ್ಲಿಪ್ ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 DocType: Projects Settings,Projects Settings,ಯೋಜನೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ {1}
@@ -2416,27 +2424,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ಐಟಂ ಗುಂಪುಗಳು ಟ್ರೀ .
 DocType: Production Plan,Total Produced Qty,ಒಟ್ಟು ಉತ್ಪಾದಿತ ಕ್ಯೂಟಿ
 DocType: Payroll Entry,Get Employee Details,ನೌಕರರ ವಿವರಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Asset,Sold,ಮಾರಾಟ
 ,Item-wise Purchase History,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ಬೇಸ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,ಕಚ್ಚಾ ಪದಾರ್ಥಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,ಕಚ್ಚಾ ಪದಾರ್ಥಗಳು
 DocType: Payment Reconciliation Payment,Reference Row,ರೆಫರೆನ್ಸ್ ರೋ
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
 DocType: Sales Invoice,Accounting Details,ಲೆಕ್ಕಪರಿಶೋಧಕ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ಈ ಕಂಪೆನಿಗೆ ಎಲ್ಲಾ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
 DocType: Patient,O Positive,ಓ ಧನಾತ್ಮಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ಹಂಚಿಕೆಯು
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿಗೆ ಮರುಪಾವತಿ ಇಲ್ಲ
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 DocType: BOM,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
 DocType: Shopping Cart Settings,Show Quantity in Website,ವೆಬ್ಸೈಟ್ ಪ್ರಮಾಣ ತೋರಿಸಿ
-DocType: Employee Loan Application,Total Payable Amount,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಪ್ರಮಾಣ
+DocType: Loan Application,Total Payable Amount,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಪ್ರಮಾಣ
 DocType: Task,Expected Time (in hours),(ಗಂಟೆಗಳಲ್ಲಿ) ನಿರೀಕ್ಷಿತ ಸಮಯ
 DocType: Item Reorder,Check in (group),ಚೆಕ್ (ಗುಂಪು)
 DocType: Soil Texture,Silt,ಸಿಲ್ಟ್
@@ -2455,7 +2464,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ಪಾವತಿ ಮಾಡಿ
 DocType: Room,Room Name,ರೂಮ್ ಹೆಸರು
 DocType: Prescription Duration,Prescription Duration,ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ ಅವಧಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ, ಮೊದಲು {0} ರದ್ದು / ಅನ್ವಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ, ಮೊದಲು {0} ರದ್ದು / ಅನ್ವಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {1}"
 DocType: Activity Cost,Costing Rate,ಕಾಸ್ಟಿಂಗ್ ದರ
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 ,Campaign Efficiency,ಕ್ಯಾಂಪೇನ್ ದಕ್ಷತೆ
@@ -2475,11 +2484,11 @@
 DocType: Chapter,Chapter,ಅಧ್ಯಾಯ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,ಜೋಡಿ
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಇನ್ವಾಯ್ಸ್ನಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedule,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ಮಾರಾಟದ ಸಂಗಾತಿ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಇರಬೇಕು
 DocType: Maintenance Schedule Detail,Actual Date,ನಿಜವಾದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} ಕಂಪೆನಿಯಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕಾಸ್ಟ್ ಸೆಂಟರ್ ಅನ್ನು ಹೊಂದಿಸಿ.
 DocType: Item,Has Batch No,ಬ್ಯಾಚ್ ನಂ ಹೊಂದಿದೆ
@@ -2497,7 +2506,6 @@
 DocType: Task,Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 DocType: Soil Texture,Soil Type,ಮಣ್ಣಿನ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,ಹೊಸ ಸಂದೇಶ
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
 DocType: GoCardless Mandate,GoCardless Mandate,ಗೋಕಾರ್ಡ್ಲೆಸ್ ಮ್ಯಾಂಡೇಟ್
@@ -2517,7 +2525,7 @@
 DocType: Hub Category,Hub Category,ಹಬ್ ವರ್ಗ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
-DocType: Employee Loan,Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ
+DocType: Loan,Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ
 DocType: Student Report Generation Tool,Add Letterhead,ಲೆಟರ್ಹೆಡ್ ಸೇರಿಸಿ
 DocType: Program Enrollment,Self-Driving Vehicle,ಸ್ವಯಂ ಚಾಲಕ ವಾಹನ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಥಾಯಿ
@@ -2546,9 +2554,9 @@
 DocType: Cash Flow Mapper,Position,ಸ್ಥಾನ
 DocType: Patient,Patient Details,ರೋಗಿಯ ವಿವರಗಳು
 DocType: Patient,B Positive,ಬಿ ಧನಾತ್ಮಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 DocType: Patient Medical Record,Patient Medical Record,ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ಕ್ರೀಡೆ
@@ -2556,8 +2564,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
 DocType: Lab Test UOM,Test UOM,ಪರೀಕ್ಷಾ UOM
 DocType: Student Siblings,Student Siblings,ವಿದ್ಯಾರ್ಥಿ ಒಡಹುಟ್ಟಿದವರ
+DocType: Subscription Plan Detail,Subscription Plan Detail,ಚಂದಾದಾರಿಕೆ ಯೋಜನೆ ವಿವರ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,ಘಟಕ
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 ,Customer Acquisition and Loyalty,ಗ್ರಾಹಕ ಸ್ವಾಧೀನ ಮತ್ತು ನಿಷ್ಠೆ
 DocType: Asset Maintenance Task,Maintenance Task,ನಿರ್ವಹಣೆ ಕಾರ್ಯ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,ದಯವಿಟ್ಟು ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ B2C ಮಿತಿಯನ್ನು ಹೊಂದಿಸಿ.
@@ -2572,6 +2581,7 @@
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ಒಟ್ಟು ಸಂಭಾವ್ಯ ವಸ್ತು ವೆಚ್ಚ (ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮೂಲಕ)
 DocType: Hub Settings,Company Registered,ಕಂಪನಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರುವಂತಿಲ್ಲ
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ಈ ಗೋದಾಮಿನ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್ ಆಧಾರದ ಮೇಲೆ &quot;ಸ್ಟಾಕ್ನಲ್ಲಿ&quot; ಅಥವಾ &quot;ನಾಟ್ ಇನ್ ಸ್ಟಾಕ್&quot; ಅನ್ನು ಪ್ರಕಟಿಸಿ.
 DocType: Vehicle,Fuel Type,ಇಂಧನ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
@@ -2579,17 +2589,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ಬ್ಯಾಚ್ ಸ್ಟಾಕ್ ಸಮತೋಲನ {0} ಪರಿಣಮಿಸುತ್ತದೆ ಋಣಾತ್ಮಕ {1} ಕೋಠಿಯಲ್ಲಿ ಐಟಂ {2} ಫಾರ್ {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
 DocType: Email Digest,Pending Sales Orders,ಮಾರಾಟದ ಆದೇಶಗಳನ್ನು ಬಾಕಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 DocType: Employee,Create User Permission,ಬಳಕೆದಾರರ ಅನುಮತಿಯನ್ನು ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Healthcare Settings,Remind Before,ಮೊದಲು ಜ್ಞಾಪಿಸು
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Salary Component,Deduction,ವ್ಯವಕಲನ
 DocType: Item,Retain Sample,ಮಾದರಿ ಉಳಿಸಿಕೊಳ್ಳಿ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
 DocType: Stock Reconciliation Item,Amount Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
 DocType: Territory,Classification of Customers by region,ಪ್ರದೇಶವಾರು ಗ್ರಾಹಕರು ವರ್ಗೀಕರಣ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ಉತ್ಪಾದನೆಯಲ್ಲಿ
@@ -2599,8 +2610,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ಲೆಕ್ಕಹಾಕಿದ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Normal Test Template,Normal Test Template,ಸಾಧಾರಣ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ಉದ್ಧರಣ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,ಯಾವುದೇ ಉಲ್ಲೇಖಕ್ಕೆ ಸ್ವೀಕರಿಸಿದ RFQ ಅನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ಉದ್ಧರಣ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,ಯಾವುದೇ ಉಲ್ಲೇಖಕ್ಕೆ ಸ್ವೀಕರಿಸಿದ RFQ ಅನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,ಖಾತೆ ಕರೆನ್ಸಿಯಲ್ಲಿ ಮುದ್ರಿಸಲು ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
@@ -2608,7 +2619,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ಇದು ಈ ರೋಗಿಯ ವಿರುದ್ಧ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Patient,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸೆಟಪ್
@@ -2619,14 +2630,15 @@
 DocType: Work Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,ಜಾಬ್ ವಿವರಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,ಜಾಬ್ ವಿವರಣೆ
 DocType: Student Applicant,Applied,ಅಪ್ಲೈಡ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,ಮತ್ತೆತೆರೆಯಿರಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,ಮತ್ತೆತೆರೆಯಿರಿ
 DocType: Sales Invoice Item,Qty as per Stock UOM,ಪ್ರಮಾಣ ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 ಹೆಸರು
 DocType: Purchase Invoice,02-Post Sale Discount,02-ಪೋಸ್ಟ್ ಮಾರಾಟದ ರಿಯಾಯಿತಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ.
+DocType: Department Approver,Approver,ಅನಪುಮೋದಕ
 ,SO Qty,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ಷೇರುದಾರರಿಗೆ ಕ್ಷೇತ್ರವು ಖಾಲಿಯಾಗಿರಬಾರದು
 DocType: Guardian,Work Address,ಕೆಲಸದ ವಿಳಾಸ
@@ -2640,21 +2652,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Order Item,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 DocType: BOM,Scrap Material Cost,ಸ್ಕ್ರ್ಯಾಪ್ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
 DocType: Grant Application,Email Notification Sent,ಇಮೇಲ್ ಪ್ರಕಟಣೆ ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","ಐಟಂ ಕೋಡ್, ವೇರ್ಹೌಸ್, ಪ್ರಮಾಣವನ್ನು ಸಾಲುಗಳಲ್ಲಿ ಅಗತ್ಯವಿದೆ"
-DocType: Pricing Rule,Supplier,ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","ಐಟಂ ಕೋಡ್, ವೇರ್ಹೌಸ್, ಪ್ರಮಾಣವನ್ನು ಸಾಲುಗಳಲ್ಲಿ ಅಗತ್ಯವಿದೆ"
+DocType: Bank Guarantee,Supplier,ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ಪಾವತಿ ವಿವರಗಳನ್ನು ತೋರಿಸಿ
 DocType: Consultation,Consultation Time,ಸಮಾಲೋಚನೆ ಸಮಯ
 DocType: C-Form,Quarter,ಕಾಲು ಭಾಗ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
 DocType: Global Defaults,Default Company,ಡೀಫಾಲ್ಟ್ ಕಂಪನಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 DocType: Payment Request,PR,ಉದ್ಯೋಗ ತರಬೇತಿ
 DocType: Cheque Print Template,Bank Name,ಬ್ಯಾಂಕ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,ನೌಕರರ ಸಾಲದ ಖಾತೆ
 DocType: Leave Application,Total Leave Days,ಒಟ್ಟು ರಜೆಯ ದಿನಗಳಲ್ಲಿ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ಗಮನಿಸಿ : ಇಮೇಲ್ ಅಂಗವಿಕಲ ಬಳಕೆದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ಇಂಟರಾಕ್ಷನ್ ಸಂಖ್ಯೆ
@@ -2670,7 +2681,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ತೂಕ (ಕಿಲೋಗ್ರಾಂನಲ್ಲಿ)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",ಅಧ್ಯಾಯಗಳನ್ನು ಉಳಿಸಿದ ನಂತರ ಅಧ್ಯಾಯಗಳು / chapter_name ರಜೆ ಖಾಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ GST ಖಾತೆಗಳನ್ನು ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ GST ಖಾತೆಗಳನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ವ್ಯವಹಾರ ಮಾದರಿ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,ಹೊಸ ಖರೀದಿ ವೆಚ್ಚ
@@ -2679,12 +2690,13 @@
 DocType: Grant Application,Grant Description,ಗ್ರಾಂಟ್ ವಿವರಣೆ
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Student Guardian,Others,ಇತರೆ
+DocType: Subscription,Discounts,ರಿಯಾಯಿತಿಗಳು
 DocType: Payment Entry,Unallocated Amount,ನಿಯೋಜಿಸದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ, ಖರೀದಿಸಿತು ಮಾರಾಟ ಅಥವಾ ಸ್ಟಾಕ್ ಇಟ್ಟುಕೊಂಡು ಒಂದು ಸೇವೆ."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,ಯಾವುದೇ ನವೀಕರಣಗಳನ್ನು
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ಇದು ಈ ಸೆಟಪ್ಗೆ ಸಮಪಟ್ಟ ಎಲ್ಲಾ ಸ್ಕೋರ್ಕಾರ್ಡ್ಗಳನ್ನು ಒಳಗೊಳ್ಳುತ್ತದೆ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ಮಕ್ಕಳ ಐಟಂ ಒಂದು ಉತ್ಪನ್ನ ಬಂಡಲ್ ಮಾಡಬಾರದು. ದಯವಿಟ್ಟು ಐಟಂ ಅನ್ನು ತೆಗೆದುಹಾಕಿ `{0}` ಮತ್ತು ಉಳಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
@@ -2693,21 +2705,24 @@
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Grading Scale,Grading Scale Intervals,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,ವರ್ಷದ ಲಾಭ
+DocType: Bank Guarantee,Name of Bank,ಬ್ಯಾಂಕ್ನ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {3}
 DocType: Fee Schedule,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ಡಿಸ್ಕೌಂಟ್
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,ಆರ್ಥಿಕ ಖಾತೆಗಳ ಮರ.
+DocType: Bank Guarantee,Reference Document Type,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Cash Flow Mapping,Cash Flow Mapping,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ಡೀಫಾಲ್ಟ್ ಸಂಪರ್ಕದಲ್ಲಿ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ಸೀಕ್ರೆಟ್ ರಚಿಸಿ
-DocType: Employee Loan,Account Info,ಖಾತೆಯ ಮಾಹಿತಿ
+DocType: Loan,Account Info,ಖಾತೆಯ ಮಾಹಿತಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
 DocType: Fees,Include Payment,ಪಾವತಿಯನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಲಾಗಿದೆ.
@@ -2715,24 +2730,24 @@
 DocType: Sales Invoice,Total Billing Amount,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ಶುಲ್ಕ ರಚನೆ ಮತ್ತು ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು {0} ನಲ್ಲಿನ ಕಾರ್ಯಕ್ರಮವು ವಿಭಿನ್ನವಾಗಿದೆ.
 DocType: Fee Schedule,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
 DocType: Quotation Item,Stock Balance,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,ಸಿಇಒ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,ಸಿಇಒ
 DocType: Purchase Invoice,With Payment of Tax,ತೆರಿಗೆ ಪಾವತಿ
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ಸರಬರಾಜುದಾರರು ಫಾರ್ triplicate
 DocType: Land Unit,Is Container,ಕಂಟೇನರ್ ಆಗಿದೆ
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ಇದು ದಿನದ ಚಕ್ರದ 1 ದಿನವಾಗಿರುತ್ತದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Purchase Invoice Item,Weight UOM,ತೂಕ UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ಪೋಲಿಯೊ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಲಭ್ಯವಿರುವ ಷೇರುದಾರರ ಪಟ್ಟಿ
 DocType: Salary Structure Employee,Salary Structure Employee,ಸಂಬಳ ರಚನೆ ನೌಕರರ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,ಭಿನ್ನ ಗುಣಲಕ್ಷಣಗಳನ್ನು ತೋರಿಸು
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,ಭಿನ್ನ ಗುಣಲಕ್ಷಣಗಳನ್ನು ತೋರಿಸು
 DocType: Student,Blood Group,ರಕ್ತ ಗುಂಪು
 DocType: Course,Course Name,ಕೋರ್ಸ್ ಹೆಸರು
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ನಿರ್ದಿಷ್ಟ ನೌಕರನ ರಜೆ ಅನ್ವಯಗಳನ್ನು ಒಪ್ಪಿಗೆ ಬಳಕೆದಾರರು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ಕಚೇರಿ ಉಪಕರಣ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ಕಚೇರಿ ಉಪಕರಣ
 DocType: Purchase Invoice Item,Qty,ಪ್ರಮಾಣ
 DocType: Fiscal Year,Companies,ಕಂಪನಿಗಳು
 DocType: Supplier Scorecard,Scoring Setup,ಸ್ಕೋರಿಂಗ್ ಸೆಟಪ್
@@ -2751,7 +2766,7 @@
 DocType: Stock Entry,Total Incoming Value,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅಸ್ಥಿರಗಳ ಟೆಂಪ್ಲೇಟ್ಗಳು.
 DocType: Job Offer Term,Offer Term,ಆಫರ್ ಟರ್ಮ್
 DocType: Asset,Quality Manager,ಗುಣಮಟ್ಟದ ಮ್ಯಾನೇಜರ್
@@ -2763,13 +2778,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
 DocType: BOM Website Operation,BOM Website Operation,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಆಪರೇಷನ್
 DocType: Supplier Scorecard,Supplier Score,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
 DocType: Supplier,Warn RFQs,ಎಚ್ಚರಿಕೆ RFQ ಗಳು
 DocType: BOM,Conversion Rate,ಪರಿವರ್ತನೆ ದರ
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ಉತ್ಪನ್ನ ಹುಡುಕಾಟ
 DocType: Assessment Plan,To Time,ಸಮಯ
 DocType: Authorization Rule,Approving Role (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಪಾತ್ರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
+DocType: Loan,Total Amount Paid,ಒಟ್ಟು ಮೊತ್ತ ಪಾವತಿಸಿದೆ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ಪಾವತಿಸಿದ ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರಿಗೆ ಕಡ್ಡಾಯವಾಗಿ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶವನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,ಬೆಲೆ ಪ್ರಕಟಿಸಲು ದಯವಿಟ್ಟು ಒಂದು ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆಮಾಡಿ
@@ -2779,19 +2795,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1} ಕಾರ್ಯಾಚರಣೆಗೆ {2}
 DocType: Manufacturing Settings,Allow Overtime,ಓವರ್ಟೈಮ್ ಅವಕಾಶ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
 DocType: Training Event Employee,Training Event Employee,ತರಬೇತಿ ಪಂದ್ಯಾವಳಿಯಿಂದ ಉದ್ಯೋಗಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ಗರಿಷ್ಠ ಸ್ಯಾಂಪಲ್ಸ್ - ಬ್ಯಾಚ್ {1} ಮತ್ತು ಐಟಂ {2} ಗಾಗಿ {0} ಅನ್ನು ಉಳಿಸಿಕೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,ಟೈಮ್ ಸ್ಲಾಟ್ಗಳನ್ನು ಸೇರಿಸಿ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ಐಟಂ ಬೇಕಾದ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು {1}. ನೀವು ಒದಗಿಸಿದ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ಪ್ರಸ್ತುತ ಮೌಲ್ಯಮಾಪನ ದರ
 DocType: Training Event,Advance,ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ಮತ್ತೆ ಪುನರಾವರ್ತಿಸಲು.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ಪಾವತಿ ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},ಸಾಲು # {0}: ಖಾತೆ {1} ಕಂಪನಿಗೆ ಸೇರಿಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},ಸಾಲು # {0}: ಖಾತೆ {1} ಕಂಪನಿಗೆ ಸೇರಿಲ್ಲ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ಡಾಕ್ಟೈಪ್ ಅನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
@@ -2810,7 +2825,6 @@
 DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},ಚಂದಾದಾರಿಕೆ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ಶುಲ್ಕ ವೇಳಾಪಟ್ಟಿ ಕಾರ್ಯಕ್ರಮ
 DocType: Fee Schedule Program,Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
@@ -2826,14 +2840,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ಇ-ವಾಣಿಜ್ಯ GSTIN
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
 ,Bank Clearance Summary,ಬ್ಯಾಂಕ್ ಕ್ಲಿಯರೆನ್ಸ್ ಸಾರಾಂಶ
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
 DocType: Appraisal Goal,Appraisal Goal,ಅಪ್ರೇಸಲ್ ಗೋಲ್
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,ವರ್ಗವನ್ನು ಸೂಚಿಸುವುದೇ?
 DocType: Stock Reconciliation Item,Current Amount,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ಕಟ್ಟಡಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ಕಟ್ಟಡಗಳು
 DocType: Fee Schedule,Fee Structure,ಶುಲ್ಕ ರಚನೆ
 DocType: Timesheet Detail,Costing Amount,ವೆಚ್ಚದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
 DocType: Student Admission Program,Application Fee,ಅರ್ಜಿ ಶುಲ್ಕ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ಐಟಂ Maxiumm ರಿಯಾಯಿತಿ {0} {1} % ಆಗಿದೆ
@@ -2841,12 +2854,13 @@
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: SMS Log,Sender Name,ಹೆಸರು
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,ಕೃಷಿ ವಿಶ್ಲೇಷಣೆ ಮಾನದಂಡ
+DocType: HR Settings,Leave Approval Notification Template,ಅನುಮೋದನೆ ಅಧಿಸೂಚನೆ ಟೆಂಪ್ಲೇಟು ಬಿಡಿ
 DocType: POS Profile,[Select],[ ಆರಿಸಿರಿ ]
 DocType: Vital Signs,Blood Pressure (diastolic),ರಕ್ತದೊತ್ತಡ (ಡಯಾಸ್ಟೊಲಿಕ್)
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 DocType: Agriculture Task,Holiday Management,ರಜಾದಿನದ ನಿರ್ವಹಣೆ
 DocType: Payment Request,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,ಸಾಫ್ಟ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,ಸಾಫ್ಟ್
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},ವೈದ್ಯ {0} {1} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
@@ -2864,7 +2878,7 @@
 DocType: Employee,New Workplace,ಹೊಸ ಕೆಲಸದ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,ವಸ್ತು ಸೇವನೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ಮುಚ್ಚಲಾಗಿದೆ ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},ಬಾರ್ಕೋಡ್ ಐಟಂ ಅನ್ನು {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},ಬಾರ್ಕೋಡ್ ಐಟಂ ಅನ್ನು {0}
 DocType: Normal Test Items,Require Result Value,ಫಲಿತಾಂಶ ಮೌಲ್ಯ ಅಗತ್ಯವಿದೆ
 DocType: Item,Show a slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2879,19 +2893,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
 DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ಮರುಕಳಿಸುವ
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪಿಂಗ್ ಟೆಂಪ್ಲೇಟು ವಿವರಗಳು
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ಸಾಲ ನಿರ್ವಹಣೆ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ಪ್ರತ್ಯೇಕ ಆದಾಯ ಟ್ರ್ಯಾಕ್ ಮತ್ತು ಉತ್ಪನ್ನ ಸಂಸ್ಥಾ ಅಥವಾ ವಿಭಾಗಗಳು ಖರ್ಚು.
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: Fees,Send Payment Request,ಪಾವತಿ ವಿನಂತಿ ಕಳುಹಿಸಿ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 DocType: Water Analysis,Origin,ಮೂಲ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
@@ -2906,14 +2920,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ಆದಾಯ ತೆರಿಗೆ ಹೊಣೆಗಾರಿಕೆ
 DocType: Grading Scale Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
 DocType: Stock Entry,Purchase Receipt No,ಖರೀದಿ ರಸೀತಿ ನಂ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
 DocType: Sales Invoice, Shipping Bill Number,ಶಿಪ್ಪಿಂಗ್ ಬಿಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ಪತ್ತೆ ಹಚ್ಚುವಿಕೆ
 DocType: Asset Maintenance Log,Actions performed,ಕ್ರಿಯೆಗಳು ನಡೆಸಿವೆ
 DocType: Cash Flow Mapper,Section Leader,ವಿಭಾಗ ನಾಯಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ಗಳಂತಹವು ( ಹೊಣೆಗಾರಿಕೆಗಳು )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ಗಳಂತಹವು ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ನೌಕರರ
+DocType: Bank Guarantee,Fixed Deposit Number,ಸ್ಥಿರ ಠೇವಣಿ ಸಂಖ್ಯೆ
 DocType: Asset Repair,Failure Date,ವೈಫಲ್ಯ ದಿನಾಂಕ
 DocType: Sample Collection,Collected Time,ಕಲೆಕ್ಟೆಡ್ ಟೈಮ್
 DocType: Company,Sales Monthly History,ಮಾರಾಟದ ಮಾಸಿಕ ಇತಿಹಾಸ
@@ -2930,10 +2945,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,ಈ ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ಹೋಟೆಲ್ ಕೊಠಡಿ ಬೆಲೆ ಪ್ಯಾಕೇಜ್
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,ಚಂದಾದಾರಿಕೆ ಅಪ್ಡೇಟ್ಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ಖಾತೆ {0} {1} ಖಾತೆಯ ಮೋಡ್ನಲ್ಲಿ ಕಂಪೆನಿಯೊಂದಿಗೆ ಹೋಲಿಕೆಯಾಗುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,ಕೋರ್ಸ್:
@@ -2943,7 +2959,7 @@
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,ಯಾವುದೇ ಕೆಲಸದ ಆದೇಶಗಳನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ಅವಧಿಯಲ್ಲಿ ರಚಿಸಿದ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ಔಷಧೀಯ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ಔಷಧೀಯ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ಖರೀದಿಸಿದ ವಸ್ತುಗಳ ವೆಚ್ಚ
 DocType: Selling Settings,Sales Order Required,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
 DocType: Purchase Invoice,Credit To,ಕ್ರೆಡಿಟ್
@@ -2961,7 +2977,7 @@
 DocType: Request for Quotation Supplier,No Quote,ಯಾವುದೇ ಉದ್ಧರಣ
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Gateway Account,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Job Offer,Accepted,Accepted
@@ -2974,7 +2990,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳು
 DocType: Room,Room Number,ಕೋಣೆ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 DocType: Journal Entry Account,Payroll Entry,ವೇತನದಾರರ ನಮೂದು
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ಫೀಸ್ ರೆಕಾರ್ಡ್ಸ್ ವೀಕ್ಷಿಸಿ
@@ -2984,7 +3000,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Lab Test Sample,Lab Test Sample,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಮಾದರಿ
 DocType: Item Variant Settings,Allow Rename Attribute Value,ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ಮರುಹೆಸರಿಸಲು ಅನುಮತಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Restaurant,Invoice Series Prefix,ಸರಕುಪಟ್ಟಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
@@ -2992,8 +3008,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google ನಕ್ಷೆಗಳ ಏಕೀಕರಣವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
+DocType: Subscription,Trialling,ಟ್ರಯಲಿಂಗ್
 DocType: Member,Membership Expiry Date,ಸದಸ್ಯತ್ವ ಮುಕ್ತಾಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ಋಣಾತ್ಮಕ ಇರಬೇಕು
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ಋಣಾತ್ಮಕ ಇರಬೇಕು
 ,Minutes to First Response for Issues,ಇಷ್ಯೂಸ್ ಮೊದಲ ರೆಸ್ಪಾನ್ಸ್ ನಿಮಿಷಗಳ
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
@@ -3012,7 +3029,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,ಅಳತೆಯ ಘಟಕ
 DocType: Fiscal Year,Year End Date,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 DocType: Task Depends On,Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,ಅವಕಾಶ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,ಅವಕಾಶ
 DocType: Operation,Default Workstation,ಡೀಫಾಲ್ಟ್ ವರ್ಕ್ಸ್ಟೇಷನ್
 DocType: Notification Control,Expense Claim Approved Message,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಸಂದೇಶ
 DocType: Payment Entry,Deductions or Loss,ಕಳೆಯುವಿಕೆಗಳು ಅಥವಾ ನಷ್ಟ
@@ -3050,7 +3067,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಜೆ ಅನುಮೋದನೆ ಅಪ್ಲಿಕೇಶನ್ ದಾಖಲೆಗಳು ಹೊಂದುವುದಿಲ್ಲ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
 DocType: Membership,USD,ಯು. ಎಸ್. ಡಿ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ಉಳಿದಿರುವ ಬಾಕಿ
@@ -3060,7 +3077,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ಅಂತ್ಯ ವರ್ಷ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Driver,Driver,ಚಾಲಕ
 DocType: Vital Signs,Nutrition Values,ನ್ಯೂಟ್ರಿಷನ್ ಮೌಲ್ಯಗಳು
 DocType: Lab Test Template,Is billable,ಬಿಲ್ ಮಾಡಲಾಗುವುದು
@@ -3071,7 +3088,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,ಏಜಿಂಗ್ ರೇಂಜ್ 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,ಒಟ್ಟು ಮುಂಗಡ ಮೊತ್ತವು ಒಟ್ಟು ಮೊತ್ತದ ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,ಒಟ್ಟು ಮುಂಗಡ ಮೊತ್ತವು ಒಟ್ಟು ಮೊತ್ತದ ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3126,7 +3143,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Purchase Invoice,Reason For Issuing document,ಡಾಕ್ಯುಮೆಂಟ್ ನೀಡುವ ಕಾರಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,ಮುಂದಿನ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ ಲೀಡ್ ಇಮೇಲ್ ವಿಳಾಸ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
@@ -3143,7 +3160,8 @@
 DocType: Warranty Claim,Service Address,ಸೇವೆ ವಿಳಾಸ
 DocType: Asset Maintenance Task,Calibration,ಮಾಪನಾಂಕ ನಿರ್ಣಯ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ಕಂಪನಿಯ ರಜಾದಿನವಾಗಿದೆ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ಪೀಠೋಪಕರಣಗಳು ಮತ್ತು ನೆಲೆವಸ್ತುಗಳ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ಸ್ಥಿತಿ ಅಧಿಸೂಚನೆಯನ್ನು ಬಿಡಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,ಪೀಠೋಪಕರಣಗಳು ಮತ್ತು ನೆಲೆವಸ್ತುಗಳ
 DocType: Item,Manufacture,ಉತ್ಪಾದನೆ
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,ಸೆಟಪ್ ಕಂಪನಿ
 ,Lab Test Report,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ವರದಿ
@@ -3159,7 +3177,6 @@
 DocType: Crop,Planting Area,ನೆಡುವ ಪ್ರದೇಶ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ಇದು ಕೆಲವು ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸಗಳ ಕಾರಣದಿಂದಾಗಿರಬಹುದು
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,ನೀವು ಸೇರಿಸಿದ್ದೀರಿ
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ತರಬೇತಿ ಫಲಿತಾಂಶ
@@ -3169,16 +3186,17 @@
 DocType: Products Settings,Products per Page,ಪ್ರತಿ ಪುಟಕ್ಕೆ ಉತ್ಪನ್ನಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ಮೇಲೆ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ರೋ # {0}: ಜರ್ನಲ್ ಎಂಟ್ರಿ {1} ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ {2} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
 DocType: Supplier Scorecard Criteria,Criteria Weight,ಮಾನದಂಡ ತೂಕ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ಅನುಮೋದನೆ ಅಧಿಸೂಚನೆ ಬಿಡಿ
 DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
 DocType: Payroll Entry,Salary Slip Based on Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet ಆಧರಿಸಿ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ಖರೀದಿ ದರ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,ಖರೀದಿ ದರ
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 DocType: Payment Entry,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
@@ -3201,6 +3219,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Journal Entry,Accounting Entries,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","&#39;ರೇಟ್&#39; ಗಾಗಿ ಬೆಲೆ ನಿಗದಿಪಡಿಸಿದರೆ ಅದು ಬೆಲೆ ಪಟ್ಟಿ ಅನ್ನು ಬದಲಿಸಿರುತ್ತದೆ. ಬೆಲೆ ದರ ದರವು ಅಂತಿಮ ದರವಾಗಿರುತ್ತದೆ, ಆದ್ದರಿಂದ ಯಾವುದೇ ರಿಯಾಯಿತಿಗಳನ್ನು ಅನ್ವಯಿಸಬಾರದು. ಆದ್ದರಿಂದ, ಸೇಲ್ಸ್ ಆರ್ಡರ್, ಕೊಳ್ಳುವ ಆದೇಶ ಮುಂತಾದ ವಹಿವಾಟುಗಳಲ್ಲಿ &#39;ಬೆಲೆ ಪಟ್ಟಿ ದರ&#39; ಕ್ಷೇತ್ರಕ್ಕಿಂತ ಹೆಚ್ಚಾಗಿ &#39;ದರ&#39; ಕ್ಷೇತ್ರದಲ್ಲಿ ಅದನ್ನು ತರಲಾಗುತ್ತದೆ."
+DocType: Journal Entry,Paid Loan,ಪಾವತಿಸಿದ ಸಾಲ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ಎಂಟ್ರಿ ನಕಲು . ಅಧಿಕಾರ ರೂಲ್ ಪರಿಶೀಲಿಸಿ {0}
 DocType: Journal Entry Account,Reference Due Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ ಕಾರಣ
 DocType: Purchase Order,Ref SQ,ಉಲ್ಲೇಖ SQ
@@ -3217,7 +3236,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ವೇತನದಾರರ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
 DocType: Patient Service Unit,Parent Service Unit,ಪೋಷಕ ಸೇವಾ ಘಟಕ
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
 DocType: Packing Slip,Identification of the package for the delivery (for print),( ಮುದ್ರಣ ) ವಿತರಣಾ ಪ್ಯಾಕೇಜ್ ಗುರುತಿನ
@@ -3236,7 +3255,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ಡೆಲಿವರಿ
 DocType: Volunteer,Weekdays,ವಾರದ ದಿನಗಳು
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: Restaurant Menu,Restaurant Menu,ರೆಸ್ಟೋರೆಂಟ್ ಮೆನು
@@ -3244,7 +3263,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ಹೊಂದಿಸಲಾದ ಪೂರ್ವನಿಯೋಜಿತ ದಾಸ್ತಾನು ಖಾತೆ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ಹೊಂದಿಸಲಾದ ಪೂರ್ವನಿಯೋಜಿತ ದಾಸ್ತಾನು ಖಾತೆ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ಗ್ರಾಂಟ್ ರಿವ್ಯೂ ಇಮೇಲ್ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಿಲ್ಲ"
@@ -3252,10 +3271,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,ಕೊಠಡಿ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},ಐಟಂಗಾಗಿ ಈಗಾಗಲೇ ದಾಖಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,ತೀರ್ಪುಗಾರ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,ನೀವು ಹಿಂದೆ ರಚಿಸಿದ ಇನ್ವಾಯ್ಸ್ಗಳ ದಾಖಲೆಗಳನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ. ಈ ಚಂದಾದಾರಿಕೆಯನ್ನು ಮರುಪ್ರಾರಂಭಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Lab Test,LP-,ಎಲ್ಪಿ-
 DocType: Healthcare Settings,Registration Fee,ನೋಂದಣಿ ಶುಲ್ಕ
 DocType: Budget,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,ಚೀಟಿ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,ಚೀಟಿ #
 DocType: Notification Control,Purchase Order Message,ಖರೀದಿ ಆದೇಶವನ್ನು ಸಂದೇಶವನ್ನು
 DocType: Tax Rule,Shipping Country,ಶಿಪ್ಪಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ನಿಂದ ಗ್ರಾಹಕರ ತೆರಿಗೆ Id ಮರೆಮಾಡಿ
@@ -3264,20 +3284,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ವೇರ್ಹೌಸ್ ಮಾತ್ರ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ಸೂಚನೆ / ರಸೀತಿ ಖರೀದಿ ಮೂಲಕ ಬದಲಾಯಿಸಬಹುದು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ವರಮಾನ ತೆರಿಗೆ
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ಲೆಟರ್ಹೆಡ್ಸ್ಗೆ ಹೋಗಿ
+DocType: Subscription,Cancel At End Of Period,ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ರದ್ದುಮಾಡಿ
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ವರ್ಗಾಯಿಸಲು ಯಾವುದೇ ಐಟಂಗಳು ಆಯ್ಕೆಯಾಗಿಲ್ಲ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ವರ್ಗಾಯಿಸಲು ಯಾವುದೇ ಐಟಂಗಳು ಆಯ್ಕೆಯಾಗಿಲ್ಲ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
 DocType: Vehicle,Electric,ಎಲೆಕ್ಟ್ರಿಕ್
 DocType: Task,% Progress,% ಪ್ರೋಗ್ರೆಸ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",&quot;ಅಪ್ಲೋವ್ಡ್&quot; ಸ್ಥಿತಿ ಹೊಂದಿರುವ ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರು ಮಾತ್ರ ಕೆಳಗಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾಗುವುದು.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,ಖಾತೆಗಾಗಿ ಖಾತೆ ಸಂಖ್ಯೆ {0} ಲಭ್ಯವಿಲ್ಲ. <br> ನಿಮ್ಮ ಚಾರ್ಟ್ ಆಫ್ ಅಕೌಂಟ್ ಅನ್ನು ಸರಿಯಾಗಿ ಹೊಂದಿಸಿ.
 DocType: Task,Depends on Tasks,ಕಾರ್ಯಗಳು ಅವಲಂಬಿಸಿದೆ
@@ -3292,6 +3313,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,ಮಾಡಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್
 DocType: Volunteer,Volunteer Skills,ಸ್ವಯಂಸೇವಕ ಸ್ಕಿಲ್ಸ್
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
+DocType: Bank Guarantee,Reference Document Name,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರು
 DocType: Purchase Invoice,Taxes and Charges Deducted,ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/hooks.py +142,Issues,ತೊಂದರೆಗಳು
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ಸ್ಥಿತಿ ಒಂದು ಇರಬೇಕು {0}
@@ -3305,7 +3327,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
+DocType: Loan,Loan Application,ಸಾಲದ ಅರ್ಜಿ
 DocType: Crop,Scientific Name,ವೈಜ್ಞಾನಿಕ ಹೆಸರು
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ಒಟ್ಟು ಎಲೆಗಳು
 DocType: Customer,"Reselect, if the chosen contact is edited after save",ಆಯ್ಕೆ ಮಾಡಿದ ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಿದ ನಂತರ ಸಂಪಾದಿಸಿದ್ದರೆ ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ
@@ -3314,13 +3337,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ಚೆಕ್ ಸಂಖ್ಯೆ
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,ಸ್ಥಳೀಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ಸಾಲಗಾರರು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,ದೊಡ್ಡ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,ದೊಡ್ಡ
 DocType: Homepage Featured Product,Homepage Featured Product,ಮುಖಪುಟ ಉತ್ಪನ್ನ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ಹೊಸ ವೇರ್ಹೌಸ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
@@ -3341,9 +3364,10 @@
 DocType: Fees,Fees,ಶುಲ್ಕ
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ವಿನಿಮಯ ದರ ಇನ್ನೊಂದು ಒಂದು ಕರೆನ್ಸಿ ಪರಿವರ್ತಿಸಲು ಸೂಚಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
 DocType: Sales Partner,Targets,ಗುರಿ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,ಕಂಪೆನಿ ಮಾಹಿತಿ ಫೈಲ್ನಲ್ಲಿ SIREN ಸಂಖ್ಯೆಯನ್ನು ನೋಂದಾಯಿಸಿ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Price List,Price List Master,ದರ ಪಟ್ಟಿ ಮಾಸ್ಟರ್
 DocType: GST Account,CESS Account,CESS ಖಾತೆ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
@@ -3352,6 +3376,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ರೋಗಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ನಿಯತಾಂಕದ ಹೆಸರು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ಮಾತ್ರ ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ &#39;ಅಂಗೀಕಾರವಾದ&#39; ಮತ್ತು &#39;ತಿರಸ್ಕರಿಸಲಾಗಿದೆ&#39; ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 DocType: Homepage,Products to be shown on website homepage,ಉತ್ಪನ್ನಗಳು ವೆಬ್ಸೈಟ್ ಮುಖಪುಟದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -3397,14 +3422,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,ಎಲ್ಲಾ ಬಿಲ್ಲಿಂಗ್ ಗಂಟೆಗಳಿಗಾಗಿ ಸರಕುಪಟ್ಟಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ಹೆಸರು ದೋಷ: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ಹಣಕಾಸು ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Packing Slip,If more than one package of the same type (for print),ವೇಳೆ ( ಮುದ್ರಣ ) ಅದೇ ರೀತಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಪ್ಯಾಕೇಜ್
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,ದಯವಿಟ್ಟು ರೆಸ್ಟೋರೆಂಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕರನ್ನು ಹೊಂದಿಸಿ
 ,Salary Register,ಸಂಬಳ ನೋಂದಣಿ
 DocType: Warehouse,Parent Warehouse,ಪೋಷಕ ವೇರ್ಹೌಸ್
-DocType: C-Form Invoice Detail,Net Total,ನೆಟ್ ಒಟ್ಟು
+DocType: Subscription,Net Total,ನೆಟ್ ಒಟ್ಟು
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ ಐಟಂ ಕಂಡುಬಂದಿಲ್ಲ {0} ಮತ್ತು ಪ್ರಾಜೆಕ್ಟ್ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,ವಿವಿಧ ಸಾಲ ರೀತಿಯ ವಿವರಿಸಿ
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,ವಿವಿಧ ಸಾಲ ರೀತಿಯ ವಿವರಿಸಿ
 DocType: Bin,FCFS Rate,FCFS ದರ
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ಮಹೋನ್ನತ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ಟೈಮ್ (ನಿಮಿಷಗಳು)
@@ -3436,11 +3461,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
 DocType: Drug Prescription,Drug Prescription,ಡ್ರಗ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್
 DocType: Fees,FEE.,ಶುಲ್ಕ.
-DocType: Employee Loan,Repaid/Closed,ಮರುಪಾವತಿ / ಮುಚ್ಚಲಾಗಿದೆ
+DocType: Loan,Repaid/Closed,ಮರುಪಾವತಿ / ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Item,Total Projected Qty,ಒಟ್ಟು ಯೋಜಿತ ಪ್ರಮಾಣ
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} ಗಾಗಿ ಅಕೌಂಟಿಂಗ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಅಗತ್ಯವಿರುವ ಐಟಂ {0} ಗಾಗಿ ಮೌಲ್ಯಮಾಪನ ದರ ಕಂಡುಬಂದಿಲ್ಲ. ಐಟಂ {1} ನಲ್ಲಿ ಸೊನ್ನೆ ಮೌಲ್ಯಮಾಪನ ದರ ಐಟಂನಂತೆ ವರ್ಗಾವಣೆಯಾಗುತ್ತಿದ್ದರೆ, ದಯವಿಟ್ಟು {1} ಐಟಂ ಟೇಬಲ್ನಲ್ಲಿ ಅದನ್ನು ಉಲ್ಲೇಖಿಸಿ. ಇಲ್ಲದಿದ್ದರೆ, ದಯವಿಟ್ಟು ಐಟಂಗಾಗಿ ಇನ್ಕಮಿಂಗ್ ಸ್ಟಾಕ್ ವಹಿವಾಟನ್ನು ರಚಿಸಿ ಅಥವಾ ಐಟಂ ರೆಕಾರ್ಡ್ನಲ್ಲಿ ಮೌಲ್ಯಾಂಕನ ದರವನ್ನು ಉಲ್ಲೇಖಿಸಿ, ತದನಂತರ ಈ ಪ್ರವೇಶವನ್ನು ಸಲ್ಲಿಸಿ / ರದ್ದುಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 DocType: Course,Course Code,ಕೋರ್ಸ್ ಕೋಡ್
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: POS Settings,Use POS in Offline Mode,ಆಫ್ಲೈನ್ ಮೋಡ್ನಲ್ಲಿ ಪಿಓಎಸ್ ಬಳಸಿ
@@ -3460,16 +3484,15 @@
 DocType: Purchase Invoice,Deemed Export,ಸ್ವಾಮ್ಯದ ರಫ್ತು
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಅಥವಾ ಎಲ್ಲಾ ಬೆಲೆ ಪಟ್ಟಿ ಎರಡೂ ಅನ್ವಯಿಸಬಹುದು.
-DocType: Subscription,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Lab Test,LabTest Approver,ಲ್ಯಾಬ್ಟೆಸ್ಟ್ ಅಪ್ರೋವರ್
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,ನೀವು ಈಗಾಗಲೇ ಮೌಲ್ಯಮಾಪನ ಮಾನದಂಡದ ನಿರ್ಣಯಿಸುವ {}.
 DocType: Vehicle Service,Engine Oil,ಎಂಜಿನ್ ತೈಲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},ಕೆಲಸದ ಆದೇಶಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},ಕೆಲಸದ ಆದೇಶಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ: {0}
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
-DocType: Employee Loan,Loan Details,ಸಾಲ ವಿವರಗಳು
+DocType: Loan,Loan Details,ಸಾಲ ವಿವರಗಳು
 DocType: Company,Default Inventory Account,ಡೀಫಾಲ್ಟ್ ಇನ್ವೆಂಟರಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ಫೋಲಿಯೊ ಸಂಖ್ಯೆಗಳು ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
@@ -3481,19 +3504,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ಬೆಳೆ ಬೆಳೆಯುತ್ತಿರುವ ಎಲ್ಲ ಭೂಮಿ ಘಟಕಗಳಿಗೆ ಲಿಂಕ್
 DocType: Account,Root Type,ರೂಟ್ ಪ್ರಕಾರ
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ರೋ # {0}: ಹೆಚ್ಚು ಮರಳಲು ಸಾಧ್ಯವಿಲ್ಲ {1} ಐಟಂ {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ರೋ # {0}: ಹೆಚ್ಚು ಮರಳಲು ಸಾಧ್ಯವಿಲ್ಲ {1} ಐಟಂ {2}
 DocType: Item Group,Show this slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಈ ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 DocType: BOM,Item UOM,ಐಟಂ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 DocType: Cheque Print Template,Primary Settings,ಪ್ರಾಥಮಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Purchase Invoice,Select Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ ಆಯ್ಕೆ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ನೌಕರರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ನೌಕರರು ಸೇರಿಸಿ
 DocType: Purchase Invoice Item,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
 DocType: Company,Standard Template,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: Training Event,Theory,ಥಿಯರಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
@@ -3513,11 +3536,10 @@
 DocType: SMS Log,No of Sent SMS,ಕಳುಹಿಸಲಾಗಿದೆ ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆ
 DocType: Antibiotic,Healthcare Administrator,ಹೆಲ್ತ್ಕೇರ್ ನಿರ್ವಾಹಕ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ಟಾರ್ಗೆಟ್ ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
 DocType: Dosage Strength,Dosage Strength,ಡೋಸೇಜ್ ಸಾಮರ್ಥ್ಯ
 DocType: Account,Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,ಬಣ್ಣದ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,ಬಣ್ಣದ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ ಮಾನದಂಡ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,ಆಯ್ಕೆಮಾಡಿದ ಐಟಂಗೆ ಮುಕ್ತಾಯ ದಿನಾಂಕ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ತಡೆಯಿರಿ
@@ -3530,18 +3552,18 @@
 DocType: Patient,Personal and Social History,ವೈಯಕ್ತಿಕ ಮತ್ತು ಸಾಮಾಜಿಕ ಇತಿಹಾಸ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ಬಳಕೆದಾರ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Fee Schedule,Fee Breakup for each student,ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಶುಲ್ಕ ವಿಭಜನೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,ಕೋಡ್ ಬದಲಿಸಿ
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
 DocType: Stock Reconciliation,SR/,ಎಸ್ಆರ್ /
 DocType: Vehicle,Diesel,ಡೀಸೆಲ್
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
 DocType: Purchase Invoice,Availed ITC Cess,ಐಟಿಸಿ ಸೆಸ್ ಪಡೆದುಕೊಂಡಿದೆ
 ,Student Monthly Attendance Sheet,ವಿದ್ಯಾರ್ಥಿ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ಶಿಪ್ಪಿಂಗ್ ನಿಯಮವು ಮಾರಾಟಕ್ಕೆ ಮಾತ್ರ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,ರವರೆಗೆ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ರವರೆಗೆ
 DocType: Rename Tool,Rename Log,ಲಾಗ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ವಿದ್ಯಾರ್ಥಿ ಗ್ರೂಪ್ ಅಥವಾ ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ವಿದ್ಯಾರ್ಥಿ ಗ್ರೂಪ್ ಅಥವಾ ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್ ಕಡ್ಡಾಯ
@@ -3562,7 +3584,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ನೀವು ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಮಾಡುವ ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಸೇವೆಗಳನ್ನು ಪಟ್ಟಿ ಮಾಡಿ.
 DocType: Water Analysis,Storage Temperature,ಶೇಖರಣಾ ತಾಪಮಾನ
 DocType: Employee Attendance Tool,Unmarked Attendance,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ಸಂಶೋಧಕ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ಸಂಶೋಧಕ
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ ಉಪಕರಣ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},ಪ್ರಾರಂಭ ದಿನಾಂಕವು ಕಾರ್ಯಕ್ಕಾಗಿ ಅಂತಿಮ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,ಹೆಸರು ಅಥವಾ ಇಮೇಲ್ ಕಡ್ಡಾಯ
@@ -3575,7 +3597,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ RFQ ಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
 DocType: Chapter,Non Profit Manager,ಲಾಭರಹಿತ ಮ್ಯಾನೇಜರ್
 DocType: BOM,Total Cost(Company Currency),ಒಟ್ಟು ವೆಚ್ಚ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ದಾಖಲಿಸಿದವರು
 DocType: Homepage,Company Description for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟಕ್ಕೆ ಕಂಪನಿ ವಿವರಣೆ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ಗ್ರಾಹಕರ ಅನುಕೂಲಕ್ಕಾಗಿ, ಪ್ರಬಂಧ ಸಂಕೇತಗಳು ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು ರೀತಿಯ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಬಳಸಬಹುದು"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ಹೆಸರು
@@ -3585,11 +3607,10 @@
 DocType: Employee,You can enter any date manually,ನೀವು ಕೈಯಾರೆ ಯಾವುದೇ ದಿನಾಂಕ ನಮೂದಿಸಬಹುದು
 DocType: Healthcare Settings,Result Printed,ಫಲಿತಾಂಶ ಮುದ್ರಿಸಲಾಗಿದೆ
 DocType: Asset Category Account,Depreciation Expense Account,ಸವಕಳಿ ಖರ್ಚುವೆಚ್ಚ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} ವೀಕ್ಷಿಸಿ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Project,Total Costing Amount (via Timesheets),ಒಟ್ಟು ವೆಚ್ಚದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ)
-DocType: Employee Advance,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
+DocType: Department,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
 DocType: Project,Hourly,ಗಂಟೆಯ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ಗ್ರೂಪ್ ಅಲ್ಲದ ಗ್ರೂಪ್
@@ -3599,7 +3620,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime ಗೆ
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
 DocType: Accounts Settings,Make Payment via Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಪಾವತಿ ಮಾಡಲು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,ಮುದ್ರಿಸಲಾಗಿತ್ತು
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,ಮುದ್ರಿಸಲಾಗಿತ್ತು
 DocType: Item,Inspection Required before Delivery,ತಪಾಸಣೆ ಅಗತ್ಯ ಡೆಲಿವರಿ ಮೊದಲು
 DocType: Item,Inspection Required before Purchase,ತಪಾಸಣೆ ಅಗತ್ಯ ಖರೀದಿ ಮೊದಲು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
@@ -3609,7 +3630,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,ಕನಿಷ್ಠ ಆರ್ಡರ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,ನಿಮ್ಮ ಸಂಸ್ಥೆ
 DocType: Fee Component,Fees Category,ಶುಲ್ಕ ವರ್ಗ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ಮೊತ್ತ
 DocType: Supplier Scorecard,Notify Employee,ಉದ್ಯೋಗಿಗೆ ಸೂಚಿಸಿ
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
@@ -3619,7 +3640,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Company,Chart Of Accounts Template,ಖಾತೆಗಳನ್ನು ಟೆಂಪ್ಲೇಟು ಚಾರ್ಟ್
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},ಐಟಂ ಬೆಲೆ {0} ಬೆಲೆ ಪಟ್ಟಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},ಐಟಂ ಬೆಲೆ {0} ಬೆಲೆ ಪಟ್ಟಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Accepted Warehouse,ಅಕ್ಸೆಪ್ಟೆಡ್ ವೇರ್ಹೌಸ್
@@ -3627,10 +3648,11 @@
 DocType: Item,Valuation Method,ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,ಮಾರ್ಕ್ ಅರ್ಧ ದಿನ
 DocType: Sales Invoice,Sales Team,ಮಾರಾಟದ ತಂಡ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,ಸಲ್ಲಿಸುವ ಮೊದಲು ಫಲಾನುಭವಿಯ ಹೆಸರನ್ನು ನಮೂದಿಸಿ.
 DocType: Program Enrollment Tool,Get Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಪಡೆಯಿರಿ
 DocType: Serial No,Under Warranty,ವಾರಂಟಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ದೋಷ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ದೋಷ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,ದಯವಿಟ್ಟು ಪೂರ್ಣಗೊಂಡ ದುರಸ್ತಿಗಾಗಿ ಪೂರ್ಣಗೊಂಡ ದಿನಾಂಕವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
@@ -3649,7 +3671,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ಉಪ ಒಪ್ಪಂದಕ್ಕಾಗಿ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
 DocType: Shopping Cart Settings,Orders,ಆರ್ಡರ್ಸ್
-DocType: Employee Leave Approver,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
+DocType: Department,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ದಯವಿಟ್ಟು ತಂಡ ಆಯ್ಕೆ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,ಜರ್ನಲ್ಲಿಬ್
 DocType: Assessment Group,Assessment Group Name,ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು ಹೆಸರು
@@ -3694,7 +3716,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,ಹಬ್ ಟ್ರ್ಯಾಕ್ ಮಾಡಲಾದ ಐಟಂ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ಸ್ವೀಕೃತದಾರರಿಗಾಗಿ ಮೂಲ
 DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ಈ ಇಮೇಲ್ ಸ್ವಯಂಜನಕವಾಗಿದೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Program Enrollment,Boarding Student,ಬೋರ್ಡಿಂಗ್ ವಿದ್ಯಾರ್ಥಿ
 DocType: Asset,Expected Value After Useful Life,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ
@@ -3719,22 +3740,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},ಹಾಜರಾತಿ {0} ವಿದ್ಯಾರ್ಥಿ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ಸವಕಳಿ ಕಾರಣ ಸ್ವತ್ತುಗಳ ವಿಲೇವಾರಿ ಕೊಡದಿರುವ
-DocType: Member,Member,ಸದಸ್ಯರು
+DocType: Loan,Member,ಸದಸ್ಯರು
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Work Order Item,Work Order Item,ಆರ್ಡರ್ ಐಟಂ ಕೆಲಸ
 DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,ಕೃಷಿ ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Supplier Scorecard Period,Variables,ವೇರಿಯೇಬಲ್ಸ್
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Cheque Print Template,Cheque Size,ಚೆಕ್ ಗಾತ್ರ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
 DocType: Sales Invoice,Write Off Outstanding Amount,ಪ್ರಮಾಣ ಅತ್ಯುತ್ತಮ ಆಫ್ ಬರೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},ಖಾತೆ {0} ಕಂಪೆನಿಯೊಂದಿಗೆ ಹೊಂದುವುದಿಲ್ಲ {1}
@@ -3743,7 +3764,6 @@
 DocType: Stock Settings,Default Stock UOM,ಡೀಫಾಲ್ಟ್ ಸ್ಟಾಕ್ UOM
 DocType: Asset,Number of Depreciations Booked,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,ಕ್ಯೂಟಿ ಒಟ್ಟು
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},ನೌಕರರ ಸಾಲ ವಿರುದ್ಧ: {0}
 DocType: Landed Cost Item,Receipt Document,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Employee Education,School/University,ಸ್ಕೂಲ್ / ವಿಶ್ವವಿದ್ಯಾಲಯ
 DocType: Payment Request,Reference Details,ರೆಫರೆನ್ಸ್ ವಿವರಗಳು
@@ -3754,7 +3774,7 @@
 DocType: Asset,Double Declining Balance,ಡಬಲ್ ಕ್ಷೀಣಿಸಿದ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ಮುಚ್ಚಿದ ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ. ರದ್ದು ತೆರೆದಿಡು.
 DocType: Student Guardian,Father,ತಂದೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
 DocType: Attendance,On Leave,ರಜೆಯ ಮೇಲೆ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
@@ -3768,10 +3788,10 @@
 DocType: Lead,Lower Income,ಕಡಿಮೆ ವರಮಾನ
 DocType: Restaurant Order Entry,Current Order,ಪ್ರಸ್ತುತ ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ಪ್ರೋಗ್ರಾಂಗಳಿಗೆ ಹೋಗಿ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ಸಾಲು {0} # ನಿಗದಿಪಡಿಸಿದ ಮೊತ್ತವು {1} ಹಕ್ಕುಸ್ವಾಮ್ಯದ ಮೊತ್ತಕ್ಕಿಂತಲೂ ಹೆಚ್ಚಿಲ್ಲ {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ಸಾಲು {0} # ನಿಗದಿಪಡಿಸಿದ ಮೊತ್ತವು {1} ಹಕ್ಕುಸ್ವಾಮ್ಯದ ಮೊತ್ತಕ್ಕಿಂತಲೂ ಹೆಚ್ಚಿಲ್ಲ {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
@@ -3794,7 +3814,6 @@
 DocType: Payment Terms Template,Payment Terms,ಪಾವತಿ ನಿಯಮಗಳು
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,ಮಿನಿಟ್
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Chapter,Meetup Embed HTML,ಮೀಟ್ಅಪ್ ಎಂಬೆಡ್ HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ಪೂರೈಕೆದಾರರಿಗೆ ಹೋಗಿ
@@ -3814,30 +3833,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,ದಯವಿಟ್ಟು ಪಾವತಿಯ ವಿನಂತಿ ಕಳುಹಿಸಲು ವಿದ್ಯಾರ್ಥಿಯ ಇಮೇಲ್ ID ಅನ್ನು ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,ದಯವಿಟ್ಟು ಪಾವತಿಯ ವಿನಂತಿ ಕಳುಹಿಸಲು ವಿದ್ಯಾರ್ಥಿಯ ಇಮೇಲ್ ID ಅನ್ನು ಹೊಂದಿಸಿ
 DocType: Patient,Medical History,ವೈದ್ಯಕೀಯ ಇತಿಹಾಸ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
 DocType: Patient,Patient ID,ರೋಗಿಯ ID
 DocType: Physician Schedule,Schedule Name,ವೇಳಾಪಟ್ಟಿ ಹೆಸರು
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಮಾಡಿ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ರೋ # {0}: ನಿಗದಿ ಪ್ರಮಾಣ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ಬ್ರೌಸ್ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Purchase Invoice,Edit Posting Date and Time,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಸಮಯವನ್ನು ಸಂಪಾದಿಸಿ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ಆಸ್ತಿ ವರ್ಗ {0} ಅಥವಾ ಕಂಪನಿಯಲ್ಲಿ ಸವಕಳಿ ಸಂಬಂಧಿಸಿದ ಖಾತೆಗಳು ಸೆಟ್ ಮಾಡಿ {1}
 DocType: Lab Test Groups,Normal Range,ಸಾಮಾನ್ಯ ಶ್ರೇಣಿ
 DocType: Academic Term,Academic Year,ಶೈಕ್ಷಣಿಕ ವರ್ಷ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,ಲಭ್ಯವಿರುವ ಮಾರಾಟ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
 DocType: Lead,CRM,ಸಿಆರ್ಎಂ
 DocType: Purchase Invoice,N,ಎನ್
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ಉಳಿದ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
+DocType: Loan,Loan Account,ಸಾಲ ಖಾತೆ
 DocType: Purchase Invoice,GST Details,ಜಿಎಸ್ಟಿ ವಿವರಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ಇಮೇಲ್ ಪೂರೈಕೆದಾರ ಕಳುಹಿಸಲಾಗುವುದು {0}
 DocType: Item,Default Sales Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಮಾರಾಟದ ಘಟಕ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,ಶೈಕ್ಷಣಿಕ ವರ್ಷ:
+DocType: Subscription,Past Due Date,ಹಿಂದಿನ ಕಾರಣ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ಐಟಂ {0} ಗಾಗಿ ಪರ್ಯಾಯ ಐಟಂ ಅನ್ನು ಹೊಂದಿಸಲು ಅನುಮತಿಸುವುದಿಲ್ಲ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
@@ -3850,7 +3871,7 @@
 DocType: Patient Appointment,Patient Appointment,ರೋಗಿಯ ನೇಮಕಾತಿ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ಪಾತ್ರ ನಿಯಮ ಅನ್ವಯವಾಗುತ್ತದೆ ಪಾತ್ರ ಅನುಮೋದನೆ ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ಈ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,ಮೂಲಕ ಪೂರೈಕೆದಾರರನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,ಮೂಲಕ ಪೂರೈಕೆದಾರರನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ಐಟಂ {1} ಗಾಗಿ ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,ಕೋರ್ಸ್ಗಳಿಗೆ ಹೋಗಿ
 DocType: Accounts Settings,Show Inclusive Tax In Print,ಮುದ್ರಣದಲ್ಲಿ ಅಂತರ್ಗತ ತೆರಿಗೆ ತೋರಿಸಿ
@@ -3858,10 +3879,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಎಂದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: C-Form,II,II ನೇ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Physician,Physician Schedules,ಚಿಕಿತ್ಸಕ ವೇಳಾಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,ಒಟ್ಟು ಮುಂಗಡ ಮೊತ್ತವು ಒಟ್ಟು ಮಂಜೂರು ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರುವುದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,ಒಟ್ಟು ಮುಂಗಡ ಮೊತ್ತವು ಒಟ್ಟು ಮಂಜೂರು ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರುವುದಿಲ್ಲ
 DocType: Salary Slip,Hour Rate,ಅವರ್ ದರ
 DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
@@ -3879,6 +3901,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ಹೆಚ್ಚು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಹಳೆಯ ನವೀಕರಿಸಲು ಅವಕಾಶ {0}
 DocType: BOM,Inspection Required,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಅಗತ್ಯವಿದೆ
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,ಸಲ್ಲಿಸುವ ಮೊದಲು ಬ್ಯಾಂಕ್ ಖಾತರಿ ಸಂಖ್ಯೆ ನಮೂದಿಸಿ.
 DocType: Driving License Category,Class,ವರ್ಗ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ಐಟಂ ಟೆಂಪ್ಲೇಟ್ ವಿರುದ್ಧ ವರ್ಕ್ ಆರ್ಡರ್ ಅನ್ನು ಎಬ್ಬಿಸಲಾಗುವುದಿಲ್ಲ
@@ -3889,7 +3912,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Assessment Plan,Program,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Serial No,Is Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
 DocType: Student Group,Group Based On,ಗುಂಪು ಆಧಾರಿತ ರಂದು
 DocType: Student Group,Group Based On,ಗುಂಪು ಆಧಾರಿತ ರಂದು
@@ -3901,9 +3923,10 @@
 DocType: Cheque Print Template,Cheque Height,ಚೆಕ್ ಎತ್ತರ
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
 DocType: Setup Progress,Setup Progress,ಸೆಟಪ್ ಪ್ರೋಗ್ರೆಸ್
+DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 DocType: Hub Settings,Publish Items to Hub,ಹಬ್ ಐಟಂಗಳು ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ಮೌಲ್ಯದಿಂದ ಸತತವಾಗಿ ಮೌಲ್ಯಕ್ಕೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ಎಲ್ಲಾ ಪರಿಶೀಲಿಸಿ
 ,Issued Items Against Work Order,ಕೆಲಸದ ಆದೇಶಕ್ಕೆ ವಿರುದ್ಧವಾಗಿ ನೀಡಿರುವ ಐಟಂಗಳು
 DocType: Vehicle Log,Invoice Ref,ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖ
@@ -3934,12 +3957,11 @@
 DocType: Customs Tariff Number,Tariff Number,ಟ್ಯಾರಿಫ್ ಸಂಖ್ಯೆ
 DocType: Work Order Item,Available Qty at WIP Warehouse,ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ ವಿಪ್ ಕೋಠಿಯಲ್ಲಿ
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ಯೋಜಿತ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
 DocType: Notification Control,Quotation Message,ನುಡಿಮುತ್ತುಗಳು ಸಂದೇಶ
-DocType: Employee Loan,Employee Loan Application,ನೌಕರರ ಸಾಲ ಅಪ್ಲಿಕೇಶನ್
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,ದಯವಿಟ್ಟು ಮೊದಲು ರೋಗಿಯನ್ನು ಉಳಿಸಿ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,ದಯವಿಟ್ಟು ಮೊದಲು ರೋಗಿಯನ್ನು ಉಳಿಸಿ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,ಅಟೆಂಡೆನ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಗುರುತಿಸಲಾಗಿದೆ.
 DocType: Program Enrollment,Public Transport,ಸಾರ್ವಜನಿಕ ಸಾರಿಗೆ
 DocType: Soil Texture,Silt Composition (%),ಸಿಲ್ಟ್ ಸಂಯೋಜನೆ (%)
@@ -3958,7 +3980,7 @@
 ,Item Balance (Simple),ಐಟಂ ಬ್ಯಾಲೆನ್ಸ್ (ಸಿಂಪಲ್)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ಪೂರೈಕೆದಾರರು ಬೆಳೆಸಿದರು ಬಿಲ್ಲುಗಳನ್ನು .
 DocType: POS Profile,Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ಗಮನಿಸಿ ಆಮ್ಟ್ ಡೆಬಿಟ್
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ಗಮನಿಸಿ ಆಮ್ಟ್ ಡೆಬಿಟ್
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
@@ -3981,6 +4003,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Assessment Plan,Assessment Plan,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ರಿವರ್ಸ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ಗ್ರಾಹಕ {0} ರಚಿಸಲಾಗಿದೆ.
 DocType: Stock Settings,Limit Percent,ಮಿತಿ ಪರ್ಸೆಂಟ್
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ಪ್ರಸ್ತುತ ಯಾವುದೇ ವೇರಾಹೌಸ್‌ನಲ್ಲಿ ಸ್ಟಾಕ್ ಲಭ್ಯವಿಲ್ಲ
@@ -3994,14 +4017,15 @@
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Payment Entry,Payment References,ಪಾವತಿ ಉಲ್ಲೇಖಗಳು
 DocType: C-Form,C-FORM-,ಸಿ ಫಾರ್ಮ್-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ಮಧ್ಯಂತರ ಕ್ಷೇತ್ರಕ್ಕೆ ಮಧ್ಯಂತರಗಳ ಸಂಖ್ಯೆ. ಮಧ್ಯಂತರವು &#39;ಡೇಸ್&#39; ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಇಂಟರ್ವಲ್ ಕೌಂಟ್ 3 ಆಗಿದ್ದರೆ, ಇನ್ವಾಯ್ಸ್ಗಳು ಪ್ರತಿ 3 ದಿನಗಳಿಗೊಮ್ಮೆ ಉತ್ಪಾದಿಸಲ್ಪಡುತ್ತವೆ."
 DocType: Vehicle,Insurance Details,ವಿಮೆ ವಿವರಗಳು
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
 DocType: Share Balance,Share Type,ಹಂಚಿಕೊಳ್ಳಿ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ಸಾಲಗಾರರು ({0})
 DocType: Pricing Rule,Margin,ಕರೆ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ಹೊಸ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
 DocType: Appraisal Goal,Weightage (%),Weightage ( % )
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಬದಲಾಯಿಸಿ
 DocType: Bank Reconciliation Detail,Clearance Date,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
@@ -4011,10 +4035,11 @@
 DocType: Lead,Address Desc,DESC ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,ಪಕ್ಷದ ಕಡ್ಡಾಯ
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},ಇತರ ಸಾಲುಗಳಲ್ಲಿ ನಕಲಿ ದಿನಾಂಕಗಳುಳ್ಳ ಸಾಲುಗಳು ಕಂಡುಬಂದಿವೆ: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},ಇತರ ಸಾಲುಗಳಲ್ಲಿ ನಕಲಿ ದಿನಾಂಕಗಳುಳ್ಳ ಸಾಲುಗಳು ಕಂಡುಬಂದಿವೆ: {list}
 DocType: Topic,Topic Name,ವಿಷಯ ಹೆಸರು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಅನುಮೋದನೆ ಪ್ರಕಟಣೆಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಅನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿ ಆಫ್ ಕನಿಷ್ಠ ಒಂದು ಆಯ್ಕೆ ಮಾಡಬೇಕು
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ನೌಕರ ಮುಂಗಡವನ್ನು ಪಡೆಯಲು ಉದ್ಯೋಗಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ನೌಕರ ಮುಂಗಡವನ್ನು ಪಡೆಯಲು ಉದ್ಯೋಗಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ದಿನಾಂಕವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,ನಿಮ್ಮ ವ್ಯಾಪಾರ ಸ್ವರೂಪ ಆಯ್ಕೆಮಾಡಿ.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4033,7 +4058,7 @@
 DocType: Asset Movement,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ಲೆಡ್ಜರ್ ಹಂಚಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,ಮಾರಾಟ ಸರಕುಪಟ್ಟಿ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Employee,Confirmation Date,ದೃಢೀಕರಣ ದಿನಾಂಕ
 DocType: C-Form,Total Invoiced Amount,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
@@ -4042,7 +4067,7 @@
 DocType: Account,Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಹೆಸರು
 DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
-DocType: Employee Loan Application,Required by Date,ದಿನಾಂಕ ಅಗತ್ಯವಾದ
+DocType: Loan Application,Required by Date,ದಿನಾಂಕ ಅಗತ್ಯವಾದ
 DocType: Lead,Lead Owner,ಲೀಡ್ ಮಾಲೀಕ
 DocType: Production Plan,Sales Orders Detail,ಮಾರಾಟದ ಆದೇಶ ವಿವರ
 DocType: Bin,Requested Quantity,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
@@ -4055,10 +4080,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ಒಟ್ಟು ಪೇ - ಒಟ್ಟು ವಿನಾಯಿತಿ - ಸಾಲದ ಮರುಪಾವತಿಯ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,ಪ್ರಸ್ತುತ BOM ಮತ್ತು ಹೊಸ BOM ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ಸಂಬಳ ಸ್ಲಿಪ್ ಐಡಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ಬಹು ರೂಪಾಂತರಗಳು
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
+DocType: Subscription,Trial Period Start Date,ಪ್ರಾಯೋಗಿಕ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,ದಯವಿಟ್ಟು ಇನ್ನೊಂದು ಬಳಕೆದಾರರಂತೆ ಲಾಗಿನ್ ಮಾಡಿ.
@@ -4079,12 +4105,11 @@
 DocType: Student Guardian,Student Guardian,ವಿದ್ಯಾರ್ಥಿ ಗಾರ್ಡಿಯನ್
 DocType: Member,Member Name,ಸದಸ್ಯರ ಹೆಸರು
 DocType: Stock Settings,Use Naming Series,ನಾಮಕರಣ ಸರಣಿ ಬಳಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ಚಂದಾದಾರಿಕೆಯಲ್ಲಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 DocType: Membership,Payment Details,ಪಾವತಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,ಬಿಒಎಮ್ ದರ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿರುವ ಕೆಲಸ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ, ಅನ್ಸ್ಟಪ್ ಅದನ್ನು ಮೊದಲು ರದ್ದುಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
@@ -4104,6 +4129,7 @@
 DocType: Land Unit,Land Unit,ಜಮೀನು ಘಟಕ
 ,Purchase Analytics,ಖರೀದಿ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Sales Invoice Item,Delivery Note Item,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,ಪ್ರಸ್ತುತ ಸರಕುಪಟ್ಟಿ {0} ಕಾಣೆಯಾಗಿದೆ
 DocType: Asset Maintenance Log,Task,ಟಾಸ್ಕ್
 DocType: Purchase Taxes and Charges,Reference Row #,ರೆಫರೆನ್ಸ್ ರೋ #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ {0}
@@ -4116,7 +4142,7 @@
 DocType: Company,Exchange Gain / Loss Account,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ನೌಕರರ ಮತ್ತು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ಸಮುದಾಯ ವೇದಿಕೆ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,ಸ್ಟಾಕ್ ವಾಸ್ತವಿಕ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,ಸ್ಟಾಕ್ ವಾಸ್ತವಿಕ ಪ್ರಮಾಣ
@@ -4131,7 +4157,7 @@
 DocType: Lab Test Template,Standard Selling Rate,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಮಾರಾಟ ದರ
 DocType: Account,Rate at which this tax is applied,ದರ ಈ ತೆರಿಗೆ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ ನಲ್ಲಿ
 DocType: Cash Flow Mapper,Section Name,ವಿಭಾಗ ಹೆಸರು
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ಆಫ್ ಬರೆಯಿರಿ
@@ -4142,9 +4168,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ಎಲ್ಲಾ ಬಿಲ್ ಮೆಟೀರಿಯಲ್ಸ್ನಲ್ಲಿ ಇತ್ತೀಚಿನ ಬೆಲೆಯನ್ನು ನವೀಕರಿಸಲು ಸರದಿಯಿದೆ. ಇದು ಕೆಲವು ನಿಮಿಷಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
 DocType: Water Analysis,Appearance,ಗೋಚರತೆ
+DocType: HR Settings,Leave Status Notification Template,ಸ್ಥಿತಿ ಅಧಿಸೂಚನೆ ಟೆಂಪ್ಲೇಟು ಬಿಡಿ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,ಸರಾಸರಿ. ಬೆಲೆ ಪಟ್ಟಿ ದರವನ್ನು ಖರೀದಿಸುವುದು
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,ಸದಸ್ಯ ಮಾಹಿತಿ.
@@ -4167,7 +4193,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,ಅನುಮತಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
 DocType: Crop Cycle,Linked Land Unit,ಲಿಂಕ್ಡ್ ಲ್ಯಾಂಡ್ ಯುನಿಟ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
@@ -4183,7 +4209,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ಬಳಕೆದಾರರಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,ಅಮಾನ್ಯವಾದ GSTIN ಅಥವಾ ನೋಂದಾಯಿಸದ ಫಾರ್ ಎನ್ಎ ನಮೂದಿಸಿ
 DocType: Training Event,Seminar,ಸೆಮಿನಾರ್
 DocType: Program Enrollment Fee,Program Enrollment Fee,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ ಶುಲ್ಕ
@@ -4199,14 +4225,14 @@
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 DocType: Company,Create Chart Of Accounts Based On,ಖಾತೆಗಳನ್ನು ಆಧರಿಸಿ ಚಾರ್ಟ್ ರಚಿಸಿ
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ಅದನ್ನು ಗುಂಪಿಗೆ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮಕ್ಕಳ ಕಾರ್ಯಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
 ,Stock Ageing,ಸ್ಟಾಕ್ ಏಜಿಂಗ್
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ವಿದ್ಯಾರ್ಥಿ {0} ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ಪೂರ್ಣಾಂಕಗೊಳಿಸುವ ಹೊಂದಾಣಿಕೆ (ಕಂಪೆನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,ವೇಳಾಚೀಟಿ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ಬ್ಯಾಚ್:
 DocType: Volunteer,Afternoon,ಮಧ್ಯಾಹ್ನ
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Cheque Print Template,Scanned Cheque,ಸ್ಕ್ಯಾನ್ ಚೆಕ್
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
@@ -4222,7 +4248,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,ಪ್ರಾಜೆಕ್ಟ್ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Medical Department,Nursing User,ನರ್ಸಿಂಗ್ ಬಳಕೆದಾರ
 DocType: Plant Analysis,Plant Analysis Criterias,ಸಸ್ಯ ಅನಾಲಿಸಿಸ್ ಕ್ರೈಟೀರಿಯಾಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},ಸರಣಿ ಇಲ್ಲ {0} ಬ್ಯಾಚ್ಗೆ ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ಈ ಉದ್ಧರಣದ ಮಾನ್ಯತೆಯ ಅವಧಿಯು ಕೊನೆಗೊಂಡಿದೆ.
 DocType: Expense Claim Account,Expense Claim Account,ಖರ್ಚು ಹಕ್ಕು ಖಾತೆ
 DocType: Accounts Settings,Allow Stale Exchange Rates,ಸ್ಟಾಲ್ ಎಕ್ಸ್ಚೇಂಜ್ ದರಗಳನ್ನು ಅನುಮತಿಸಿ
@@ -4244,11 +4271,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ಮಾರ್ಪಾಟುಗಳನ್ನು ಮಾಡಿ
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಿದ ಮೊತ್ತ (ಸೇಲ್ಸ್ ಇನ್ವಾಯ್ಸ್ ಮೂಲಕ)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ಡೆಬಿಟ್ ಗಮನಿಸಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ಡೆಬಿಟ್ ಗಮನಿಸಿ ಪ್ರಮಾಣ
 DocType: Project Update,Not Updated,ನವೀಕರಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","ದರ, ಷೇರುಗಳ ಸಂಖ್ಯೆ ಮತ್ತು ಲೆಕ್ಕ ಹಾಕಿದ ಮೊತ್ತದ ನಡುವಿನ ಅಸಮಂಜಸತೆಗಳಿವೆ"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Employee Advance,Advance Account,ಅಡ್ವಾನ್ಸ್ ಖಾತೆ
 DocType: Job Offer,Job Offer Terms,ಜಾಬ್ ಆಫರ್ ನಿಯಮಗಳು
@@ -4257,7 +4284,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
 DocType: Vehicle,Insurance Company,ವಿಮಾ ಕಂಪನಿ
 DocType: Asset Category Account,Fixed Asset Account,ಸ್ಥಿರ ಆಸ್ತಿ ಖಾತೆಯನ್ನು
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ವೇರಿಯಬಲ್
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ವೇರಿಯಬಲ್
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Chapter,Members,ಸದಸ್ಯರು
 DocType: Student,Student Email Address,ವಿದ್ಯಾರ್ಥಿ ಇಮೇಲ್ ವಿಳಾಸ
@@ -4281,7 +4308,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,ಆಂತರಿಕ
 DocType: Delivery Stop,Address Name,ವಿಳಾಸ ಹೆಸರು
 DocType: Stock Entry,From BOM,BOM ಗೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} ವಿಭಜಿತ {0} ಘಟಕಗಳು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} ವಿಭಜಿತ {0} ಘಟಕಗಳು
 DocType: Assessment Code,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
@@ -4289,25 +4316,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 DocType: Bank Reconciliation Detail,Payment Document,ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,ಮಾನದಂಡ ಸೂತ್ರವನ್ನು ಮೌಲ್ಯಮಾಪನ ಮಾಡುವಲ್ಲಿ ದೋಷ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+DocType: Subscription,Plans,ಯೋಜನೆಗಳು
 DocType: Salary Slip,Salary Structure,ಸಂಬಳ ರಚನೆ
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ಮರುಕಳಿಸುವಿಕೆಯನ್ನು ರಚಿಸುವಾಗ ದೋಷ ಸಂಭವಿಸಿದೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ಉಲ್ಲೇಖಗಳು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ದಾಖಲಿಸಿದವರು.
 DocType: Purchase Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,ಸಾಲು # {0}: ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕವು ಖರೀದಿ ಆದೇಶ ದಿನಾಂಕಕ್ಕಿಂತ ಮುಂಚಿತವಾಗಿರುವುದಿಲ್ಲ
 DocType: Purchase Invoice,Print Language,ಮುದ್ರಣ ಭಾಷಾ
 DocType: Salary Slip,Total Working Hours,ಒಟ್ಟು ವರ್ಕಿಂಗ್ ಅವರ್ಸ್
 DocType: Sales Invoice,Customer PO Details,ಗ್ರಾಹಕರ PO ವಿವರಗಳು
-DocType: Subscription,Next Schedule Date,ಮುಂದಿನ ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ತಾತ್ಕಾಲಿಕ ತೆರೆಯುವ ಖಾತೆ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
@@ -4336,11 +4362,11 @@
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ಪ್ರಸ್ತಾಪಿತ ಮಾನದಂಡಗಳಿಗೆ ಉದ್ಯೋಗಿಗಳು ಇಲ್ಲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
 DocType: Hotel Settings,Default Customer,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ
 DocType: Assessment Plan,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ಅದೇ ದಿನದಂದು ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರಚಿಸಿದ್ದರೆ ಅದನ್ನು ದೃಢೀಕರಿಸಬೇಡಿ
@@ -4365,16 +4391,16 @@
 DocType: Journal Entry Account,Employee Advance,ಉದ್ಯೋಗಿ ಅಡ್ವಾನ್ಸ್
 DocType: Payroll Entry,Payroll Frequency,ವೇತನದಾರರ ಆವರ್ತನ
 DocType: Lab Test Template,Sensitivity,ಸೂಕ್ಷ್ಮತೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
 DocType: Leave Application,Follow via Email,ಇಮೇಲ್ ಮೂಲಕ ಅನುಸರಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,ಸಸ್ಯಗಳು ಮತ್ತು ಯಂತ್ರೋಪಕರಣಗಳಲ್ಲಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,ಸಸ್ಯಗಳು ಮತ್ತು ಯಂತ್ರೋಪಕರಣಗಳಲ್ಲಿ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,ದಯವಿಟ್ಟು ದಿನಾಂಕದಂದು Reqd ಯನ್ನು ನಮೂದಿಸಿ
 DocType: Payment Entry,Internal Transfer,ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್
 DocType: Asset Maintenance,Maintenance Tasks,ನಿರ್ವಹಣಾ ಕಾರ್ಯಗಳು
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
 DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
@@ -4382,14 +4408,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERP ನೆಕ್ಸ್ಟ್ ಇಂಟಿಗ್ರೇಷನ್ಸ್
 DocType: Crop Cycle,Detected Disease,ಪತ್ತೆಯಾದ ರೋಗ
 ,Produced,ನಿರ್ಮಾಣ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ಮರುಪಾವತಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕವು ವಿತರಣೆ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರುವಂತಿಲ್ಲ.
 DocType: Item,Item Code for Suppliers,ಪೂರೈಕೆದಾರರು ಐಟಂ ಕೋಡ್
 DocType: Issue,Raised By (Email),( ಇಮೇಲ್ ) ಬೆಳೆಸಿದರು
 DocType: Training Event,Trainer Name,ತರಬೇತುದಾರ ಹೆಸರು
 DocType: Mode of Payment,General,ಜನರಲ್
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ಕೊನೆಯ ಸಂವಹನ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ಕೊನೆಯ ಸಂವಹನ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
@@ -4403,7 +4430,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},{1} ನಲ್ಲಿ ಹಾಫ್ ಡೇ ಲೀವ್ನಲ್ಲಿ ಡಾ {0}
 DocType: Production Plan,Get Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆಮ್ಟ್)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 ,Item Variant Details,ಐಟಂ ರೂಪಾಂತರ ವಿವರಗಳು
@@ -4414,9 +4441,9 @@
 DocType: Drug Prescription,Hour,ಗಂಟೆ
 DocType: Restaurant Order Entry,Last Sales Invoice,ಕೊನೆಯ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},ಐಟಂ ವಿರುದ್ಧ ಕ್ಯೂಟಿ ಆಯ್ಕೆ ಮಾಡಿ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 DocType: Company,Monthly Sales Target,ಮಾಸಿಕ ಮಾರಾಟದ ಗುರಿ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ಅನುಮೋದನೆ ಮಾಡಬಹುದು
@@ -4424,7 +4451,7 @@
 DocType: Item,Default Material Request Type,ಡೀಫಾಲ್ಟ್ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪ್ರಕಾರ
 DocType: Supplier Scorecard,Evaluation Period,ಮೌಲ್ಯಮಾಪನ ಅವಧಿ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,ಅಜ್ಞಾತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,ಕೆಲಸದ ಆದೇಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,ಕೆಲಸದ ಆದೇಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: Purchase Invoice,Export Type,ರಫ್ತು ಕೌಟುಂಬಿಕತೆ
 DocType: Salary Slip Loan,Salary Slip Loan,ವೇತನ ಸ್ಲಿಪ್ ಸಾಲ
@@ -4440,8 +4467,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ಇನ್ವಾಯ್ಸ್ ಸಾರಾಂಶವನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ
 DocType: Education Settings,Education Manager,ಶಿಕ್ಷಣ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,ಅತ್ಯುತ್ತಮ ಬೆಳವಣಿಗೆಗಾಗಿ ಪ್ರತಿ ಸಸ್ಯದ ನಡುವಿನ ಕನಿಷ್ಟ ಉದ್ದ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ, ಬದಲಿಗೆ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಬಳಸಲು"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ, ಬದಲಿಗೆ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಬಳಸಲು"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ, ಬದಲಿಗೆ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಬಳಸಲು"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ಬ್ಯಾಚ್ ಮಾಡಿರುವ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ, ಬದಲಿಗೆ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಬಳಸಲು"
 DocType: Quality Inspection,Report Date,ವರದಿಯ ದಿನಾಂಕ
 DocType: Student,Middle Name,ಮಧ್ಯದ ಹೆಸರು
 DocType: C-Form,Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು
@@ -4474,20 +4501,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ರಸೀತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ರಸೀತಿ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Daily Work Summary Group,Send Emails At,ನಲ್ಲಿ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ಫಾರ್ಮ್ ವೀಕ್ಷಿಸಿ
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ಖರ್ಚು ಕ್ಲೈಮ್ನಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿ ಖರ್ಚು ಮಾಡುವಿಕೆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","ನಿಮ್ಮನ್ನು ಹೊರತುಪಡಿಸಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ."
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ಇನ್ನೂ ಯಾವುದೇ ಗ್ರಾಹಕರು!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,ಯಾವುದೇ ವಸ್ತು ವಿನಂತಿಯು ರಚಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ಪರವಾನಗಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
@@ -4510,11 +4538,12 @@
 DocType: Vehicle,Chassis No,ಚಾಸಿಸ್ ಯಾವುದೇ
 DocType: Payment Request,Initiated,ಚಾಲನೆ
 DocType: Production Plan Item,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,ದಯವಿಟ್ಟು BOM ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,ದಯವಿಟ್ಟು BOM ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ಐಟಿಸಿ ಸಮಗ್ರ ತೆರಿಗೆ ಪಡೆದುಕೊಂಡಿದೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
+DocType: Bank Guarantee,Clauses and Conditions,ವಿಧಿಗಳು ಮತ್ತು ಷರತ್ತುಗಳು
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Project Task,View Timesheet,ಟೈಮ್ಸ್ಶೀಟ್ ವೀಕ್ಷಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ಅಂತಿಮ ದಿನಾಂಕವು ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬೇಕು
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Leave Allocation,New Leaves Allocated,ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
@@ -4528,9 +4557,10 @@
 DocType: Patient,Alcohol Current Use,ಆಲ್ಕೋಹಾಲ್ ಪ್ರಸ್ತುತ ಬಳಕೆ
 DocType: Student Admission Program,Student Admission Program,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ ಕಾರ್ಯಕ್ರಮ
 DocType: Payment Entry,Account Paid To,ಖಾತೆಗೆ ಹಣ
+DocType: Subscription Settings,Grace Period,ರಿಯಾಯಿತಿಯ ಅವಧಿ
 DocType: Item Alternative,Alternative Item Name,ಪರ್ಯಾಯ ವಸ್ತು ಹೆಸರು
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ಯಾವುದೇ ಸಂಬಳ ಸ್ಲಿಪ್ ಅನ್ನು ಸಲ್ಲಿಸಲಾಗಲಿಲ್ಲ <br> \ ಸಂಭವನೀಯ ಕಾರಣಗಳು: <br> \ 1. ನಿವ್ವಳ ವೇತನ 0 ಕ್ಕಿಂತ ಕಡಿಮೆ. <br> 2. ಉದ್ಯೋಗಿ ಮಾಸ್ಟರ್ನಲ್ಲಿ ಸೂಚಿಸಲಾದ ಕಂಪನಿ ಇಮೇಲ್ ವಿಳಾಸವು ಮಾನ್ಯವಾಗಿಲ್ಲ. <br>
@@ -4540,7 +4570,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ಖಾತೆಗೆ ಬಜೆಟ್ {1} ವಿರುದ್ಧ {2} {3} ಆಗಿದೆ {4}. ಇದು ಮೂಲಕ ಮೀರುತ್ತದೆ {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ಪ್ರಮಾಣ ಔಟ್
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ಮತ್ತು ಅಶಕ್ತಗೊಂಡಿದೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 DocType: Student Sibling,Student ID,ವಿದ್ಯಾರ್ಥಿ ಗುರುತು
@@ -4552,14 +4581,16 @@
 DocType: Complaint,Complaint,ದೂರು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ಮರುಪಾವತಿ ನಮೂದನ್ನು ಮಾಡಿ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು
 DocType: Patient,Alcohol Past Use,ಆಲ್ಕೊಹಾಲ್ ಪಾಸ್ಟ್ ಯೂಸ್
 DocType: Fertilizer Content,Fertilizer Content,ರಸಗೊಬ್ಬರ ವಿಷಯ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,ಕೋಟಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,ಕೋಟಿ
 DocType: Project Update,Problematic/Stuck,ಸಮಸ್ಯೆ / ನಿಂತಿದೆ
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
 DocType: Share Transfer,Transfer,ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದು ಮಾಡುವ ಮೊದಲು ವರ್ಕ್ ಆರ್ಡರ್ {0} ಅನ್ನು ರದ್ದುಗೊಳಿಸಬೇಕು
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
@@ -4583,10 +4614,11 @@
 DocType: Cheque Print Template,Message to show,ತೋರಿಸಲು ಸಂದೇಶ
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 DocType: Student Attendance,Absent,ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} ನಲ್ಲಿ ಪ್ರಾರಂಭವಾಗುವ ಅಂಕವನ್ನು ಕಂಡುಹಿಡಿಯಲು ಸಾಧ್ಯವಿಲ್ಲ. 0 ರಿಂದ 100 ರವರೆಗೆ ನೀವು ನಿಂತಿರುವ ಸ್ಕೋರ್ಗಳನ್ನು ಹೊಂದಿರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
+DocType: Subscription,Current Invoice Start Date,ಪ್ರಸ್ತುತ ಸರಕುಪಟ್ಟಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ಒಂದೋ ಡೆಬಿಟ್ ಅಥವಾ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣವನ್ನು ಅಗತ್ಯವಿದೆ {2}
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
@@ -4596,11 +4628,13 @@
 DocType: Task,Parent Task,ಪೋಷಕ ಕಾರ್ಯ
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ಲೀಡ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
 DocType: Stock Settings,Show Barcode Field,ಶೋ ಬಾರ್ಕೋಡ್ ಫೀಲ್ಡ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ಸಂಬಳ ಈಗಾಗಲೇ ನಡುವೆ {0} ಮತ್ತು {1}, ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಈ ದಿನಾಂಕ ಶ್ರೇಣಿ ನಡುವೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಸಂಸ್ಕರಿಸಿದ."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ಸಂಬಳ ಈಗಾಗಲೇ ನಡುವೆ {0} ಮತ್ತು {1}, ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಈ ದಿನಾಂಕ ಶ್ರೇಣಿ ನಡುವೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಸಂಸ್ಕರಿಸಿದ."
+DocType: Fiscal Year,Auto Created,ಸ್ವಯಂ ರಚಿಸಲಾಗಿದೆ
 DocType: Chapter Member,Leave Reason,ಕಾರಣ ಬಿಡಿ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ಸರಕುಪಟ್ಟಿ {0} ಇನ್ನು ಮುಂದೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Guardian Interest,Guardian Interest,ಗಾರ್ಡಿಯನ್ ಬಡ್ಡಿ
 DocType: Volunteer,Availability,ಲಭ್ಯತೆ
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ಇನ್ವಾಯ್ಸ್ಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳನ್ನು ಹೊಂದಿಸಿ
@@ -4609,14 +4643,13 @@
 DocType: Timesheet,Employee Detail,ನೌಕರರ ವಿವರ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ಮೇಲ್
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ಮೇಲ್
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ಮುಂದಿನ ದಿನಾಂಕ ದಿನ ಮತ್ತು ತಿಂಗಳ ದಿನದಂದು ಪುನರಾವರ್ತಿಸಿ ಸಮನಾಗಿರಬೇಕು
 DocType: Lab Prescription,Test Code,ಪರೀಕ್ಷಾ ಕೋಡ್
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣದಿಂದ {0} RFQ ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Job Offer,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ಮೇಲೆ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ಒಟ್ಟು ಮೊತ್ತ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ಒಟ್ಟು ಮೊತ್ತ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ಹೇಳಿರಿ ಅಲ್ಲದ ಪ್ರಮಾಣಿತ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ವೇಳೆ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',ದಯವಿಟ್ಟು &#39;ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು&#39; ಬೇರೆ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು ಆಯ್ಕೆ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ಸಾಲು {0}: ಐಟಂಗೆ ಕಾಸ್ಟ್ ಸೆಂಟರ್ ಅಗತ್ಯವಿರುತ್ತದೆ {1}
@@ -4627,7 +4660,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ನೀರಿನ ವಿಶ್ಲೇಷಣೆ
 DocType: Chapter,Region,ಪ್ರದೇಶ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,ಲಿಂಕ್ಡ್ ಅನಾಲಿಸಿಸ್ ಅನ್ನು ಮರುಲೋಡ್ ಮಾಡಿ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಇ ಜಿ ಫಾರ್ 2012 , 2012-13"
@@ -4643,7 +4676,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
 DocType: Vehicle,Policy No,ನೀತಿ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
 DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,ಒಡೆದ
@@ -4683,21 +4716,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,ಪಾಥ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ಆಲ್ಡ್ವಿಚ್ childNodes ಲೆಡ್ಜರ್ ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Plan,Total Planned Qty,ಒಟ್ಟು ಯೋಜನೆ ಕ್ಯೂಟಿ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
 DocType: Salary Detail,Formula,ಸೂತ್ರ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,ಸರಣಿ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,ಸರಣಿ #
 DocType: Lab Test Template,Lab Test Template,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,ಮಾರಾಟದ ಖಾತೆ
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,ಮಾರಾಟದ ಖಾತೆ
 DocType: Purchase Invoice Item,Total Weight,ಒಟ್ಟು ತೂಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
 DocType: Job Offer Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Purchase Order Item,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
 DocType: Asset Maintenance Task,Assign To Name,ಹೆಸರಿಗೆ ನಿಗದಿಪಡಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
 DocType: Hub Settings,Enabled Users,ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಬಳಕೆದಾರರು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಮಾಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ಓಪನ್ ಐಟಂ {0}
@@ -4710,24 +4743,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ರಜೆ ಅಪ್ಲಿಕೇಷನ್ಗಳಿಗೆ .
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Vehicle,Last Carbon Check,ಕೊನೆಯ ಕಾರ್ಬನ್ ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,ದಯವಿಟ್ಟು ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ಆಯ್ಕೆ
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ
 DocType: Purchase Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
 DocType: Timesheet,% Amount Billed,ಖ್ಯಾತವಾದ % ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ಟೆಲಿಫೋನ್ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ಟೆಲಿಫೋನ್ ವೆಚ್ಚಗಳು
 DocType: Sales Partner,Logo,ಲೋಗೋ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ನೀವು ಉಳಿಸುವ ಮೊದಲು ಸರಣಿ ಆರಿಸಲು ಬಳಕೆದಾರರಿಗೆ ಒತ್ತಾಯಿಸಲು ಬಯಸಿದಲ್ಲಿ ಈ ಪರಿಶೀಲಿಸಿ . ನೀವು ಈ ಪರಿಶೀಲಿಸಿ ವೇಳೆ ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇರುತ್ತದೆ .
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
 DocType: Email Digest,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
 DocType: Payment Entry,Difference Amount (Company Currency),ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ಹೊಸ ಗ್ರಾಹಕ ಕಂದಾಯ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ಕಸ್ಟಮ್ ಕ್ಷೇತ್ರ ಸೇರಿಸಿ ಚಂದಾದಾರಿಕೆ ಡಾಕ್ಟೈಪ್ನಲ್ಲಿ {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Receipt Item,Sample Quantity,ಮಾದರಿ ಪ್ರಮಾಣ
+DocType: Bank Guarantee,Name of Beneficiary,ಫಲಾನುಭವಿಯ ಹೆಸರು
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ಕಚ್ಚಾ ವಸ್ತುಗಳ ಇತ್ತೀಚಿನ ಮೌಲ್ಯಮಾಪನ ದರ / ಬೆಲೆ ಪಟ್ಟಿ ದರ / ಕೊನೆಯ ಖರೀದಿಯ ದರವನ್ನು ಆಧರಿಸಿ ವೇಳಾಪಟ್ಟಿ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನವೀಕರಿಸಿ BOM ವೆಚ್ಚ.
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
@@ -4739,14 +4772,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,ಪರೀಕ್ಷಣೆ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ಸಂಬಳ ಘಟಕಗಳು
 DocType: Program Enrollment Tool,New Academic Year,ಹೊಸ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 DocType: GST Settings,B2C Limit,B2C ಮಿತಿ
 DocType: Work Order Item,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ನ್ಯಾವಿಗೇಟ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ಯೋಜನೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ಯೋಜನೆ
 DocType: Share Balance,Issued,ಬಿಡುಗಡೆ
+DocType: Loan,Repayment Start Date,ಮರುಪಾವತಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,ವಿದ್ಯಾರ್ಥಿ ಚಟುವಟಿಕೆ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
 DocType: Payment Request,Payment Gateway Details,ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ವಿವರಗಳು
@@ -4759,10 +4793,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ಪ್ರಾಸಂಗಿಕ , ಅನಾರೋಗ್ಯ , ಇತ್ಯಾದಿ ಎಲೆಗಳ ಪ್ರಕಾರ"
 DocType: Email Digest,Send regular summary reports via Email.,ಇಮೇಲ್ ಮೂಲಕ ಸಾಮಾನ್ಯ ಸಾರಾಂಶ ವರದಿ ಕಳುಹಿಸಿ.
 DocType: Payment Entry,PE-,ಪೆ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 DocType: Assessment Result,Student Name,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು
 DocType: Brand,Item Manager,ಐಟಂ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Plant Analysis,Collection Datetime,ಸಂಗ್ರಹ ದಿನಾಂಕ
 DocType: Work Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
@@ -4772,9 +4806,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ಬಳಕೆದಾರ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Payment Term,Day(s) after invoice date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕದ ನಂತರ ದಿನ (ಗಳು)
 DocType: Payment Schedule,Payment Schedule,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿ
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ಸಂಕ್ಷೇಪಣ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+DocType: Subscription,Trial Period End Date,ಪ್ರಯೋಗ ಅವಧಿ ಅಂತ್ಯ ದಿನಾಂಕ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ ರಿಂದ authroized ಮಾಡಿರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ಸಂಬಳ ಮಾಸ್ಟರ್ ಟೆಂಪ್ಲೆಟ್ .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,ರೋಗಶಾಸ್ತ್ರ
@@ -4791,9 +4825,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -4802,14 +4836,15 @@
 DocType: Lab Prescription,Test Created,ಪರೀಕ್ಷೆ ರಚಿಸಲಾಗಿದೆ
 DocType: Healthcare Settings,Custom Signature in Print,ಮುದ್ರಣದಲ್ಲಿ ಕಸ್ಟಮ್ ಸಹಿ
 DocType: Account,Temporary,ತಾತ್ಕಾಲಿಕ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ಗ್ರಾಹಕ LPO ಸಂಖ್ಯೆ.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ಗ್ರಾಹಕ LPO ಸಂಖ್ಯೆ.
 DocType: Program,Courses,ಶಿಕ್ಷಣ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,ಕಾರ್ಯದರ್ಶಿ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,ಕಾರ್ಯದರ್ಶಿ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಕ್ಷೇತ್ರದಲ್ಲಿ ವರ್ಡ್ಸ್ &#39;ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಗೋಚರಿಸುವುದಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ಈ ಕ್ರಿಯೆಯು ಭವಿಷ್ಯದ ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ನಿಲ್ಲಿಸುತ್ತದೆ. ಈ ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Serial No,Distinct unit of an Item,ಐಟಂ ವಿಶಿಷ್ಟ ಘಟಕವಾಗಿದೆ
 DocType: Supplier Scorecard Criteria,Criteria Name,ಮಾನದಂಡ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,ಕಂಪನಿ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,ಕಂಪನಿ ದಯವಿಟ್ಟು
 DocType: Pricing Rule,Buying,ಖರೀದಿ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ರೋಗಗಳು ಮತ್ತು ರಸಗೊಬ್ಬರಗಳು
 DocType: HR Settings,Employee Records to be created by,ನೌಕರರ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು
@@ -4818,18 +4853,18 @@
 DocType: POS Profile,Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
 DocType: Member,Membership Type,ಸದಸ್ಯತ್ವ ಕೌಟುಂಬಿಕತೆ
 ,Reqd By Date,ಬೇಕಾಗಿದೆ ದಿನಾಂಕ ಮೂಲಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ಸಾಲ
 DocType: Assessment Plan,Assessment Name,ಅಸೆಸ್ಮೆಂಟ್ ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,ಪ್ರಿಂಟ್ನಲ್ಲಿ ತೋರಿಸಿ PDC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,ಪ್ರಿಂಟ್ನಲ್ಲಿ ತೋರಿಸಿ PDC
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ ಕಡ್ಡಾಯ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,ಉದ್ಯೋಗದ ಪ್ರಸ್ತಾಪ
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಸಂಕ್ಷೇಪಣ
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Consultation,C-,ಸಿ-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
@@ -4847,7 +4882,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ , ಗಣಕವು ದಾಸ್ತಾನು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಪೋಸ್ಟ್ ಕಾಣಿಸುತ್ತದೆ ."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ನೌಕರ {0} ಹಾಜರಾತಿ ಈಗಾಗಲೇ ಈ ದಿನ ಗುರುತಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ನೌಕರ {0} ಹಾಜರಾತಿ ಈಗಾಗಲೇ ಈ ದಿನ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","ನಿಮಿಷಗಳಲ್ಲಿ 
  'ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ"
@@ -4859,6 +4894,7 @@
 DocType: Lab Test,Approved Date,ಅನುಮೋದಿತ ದಿನಾಂಕ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
+DocType: Subscriber,Subscriber Name,ಚಂದಾದಾರ ಹೆಸರು
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
 DocType: BOM Update Tool,Replace,ಬದಲಾಯಿಸಿ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ಯಾವುದೇ ಉತ್ಪನ್ನಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
@@ -4868,19 +4904,18 @@
 DocType: Request for Quotation Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 DocType: Customer,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ಉದ್ಯೋಗಿ ಸಾಲದಲ್ಲಿ ಬಡ್ಡಿ ಆದಾಯದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: Work Order,Required Items,ಅಗತ್ಯ ವಸ್ತುಗಳ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ಪಾವತಿ ರಾಜಿ ಪಾವತಿಗೆ
 DocType: Disease,Treatment Task,ಟ್ರೀಟ್ಮೆಂಟ್ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
 DocType: BOM Item,BOM No,ಯಾವುದೇ BOM
 DocType: Instructor,INS/,ಐಎನ್ಎಸ್ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Update Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ಎಲೆಕ್ಟ್ರಾನಿಕ್ ಉಪಕರಣಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ಎಲೆಕ್ಟ್ರಾನಿಕ್ ಉಪಕರಣಗಳು
 DocType: Asset,Maintenance Required,ನಿರ್ವಹಣೆ ಅಗತ್ಯವಿದೆ
 DocType: Account,Debit,ಡೆಬಿಟ್
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
@@ -4889,7 +4924,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ಸೆಟ್ ಗುರಿಗಳನ್ನು ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಈ ಮಾರಾಟ ವ್ಯಕ್ತಿಗೆ .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಖರೀದಿ / ಮಾರಾಟ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಖರೀದಿ / ಮಾರಾಟ ಕಡ್ಡಾಯ
 DocType: Asset Maintenance Team,Maintenance Team Name,ನಿರ್ವಹಣೆ ತಂಡದ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ಎರಡು ಅಥವಾ ಹೆಚ್ಚು ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲೆ ಆಧರಿಸಿ ಕಂಡುಬರದಿದ್ದಲ್ಲಿ, ಆದ್ಯತಾ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ (ಖಾಲಿ) ಹಾಗೆಯೇ ಆದ್ಯತಾ 20 0 ನಡುವೆ ಸಂಖ್ಯೆ. ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ ಅದೇ ಪರಿಸ್ಥಿತಿಗಳು ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಅದು ಪ್ರಾಧಾನ್ಯತೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಅರ್ಥ."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,&#39;ಅವಕಾಶದಿಂದ&#39; ಗ್ರಾಹಕನನ್ನು ಆಯ್ಕೆಮಾಡಿದರೆ ಗ್ರಾಹಕರು ಕಡ್ಡಾಯವಾಗಿರಬೇಕು
@@ -4899,19 +4934,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ಖರ್ಚು ಹಕ್ಕು ವಿಧಗಳು .
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ಅದರ {1} ಐಟಂ ಪ್ರಮಾಣ ಮಾರಾಟ {0} ಕಡಿಮೆಯಿದೆ. ಮಾರಾಟ ದರವನ್ನು ಇರಬೇಕು ಕನಿಷ್ಠ {2}
-DocType: Item,Taxes,ತೆರಿಗೆಗಳು
+DocType: Subscription,Taxes,ತೆರಿಗೆಗಳು
 DocType: Purchase Invoice,capital goods,ಬಂಡವಾಳ ಸರಕುಗಳು
 DocType: Purchase Invoice Item,Weight Per Unit,ತೂಕ ಪ್ರತಿ ಘಟಕ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ಹಣ ಮತ್ತು ವಿತರಣೆ
 DocType: Project,Default Cost Center,ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ ಸೆಂಟರ್
-DocType: Bank Guarantee,End Date,ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್
 DocType: Budget,Budget Accounts,ಬಜೆಟ್ ಖಾತೆಗಳು
 DocType: Employee,Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ವೇರಿಯಬಲ್
-DocType: Employee Loan,Fully Disbursed,ಸಂಪೂರ್ಣವಾಗಿ ಪಾವತಿಸಲಾಗುತ್ತದೆ
 DocType: Employee Advance,Due Advance Amount,ಅಡ್ವಾನ್ಸ್ ಮೊತ್ತ ಕಾರಣ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
@@ -4935,7 +4968,7 @@
 ,Employee Information,ನೌಕರರ ಮಾಹಿತಿ
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿಯ ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ದಾಖಲೆ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.
@@ -4943,7 +4976,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ಕಂಪನಿ ಖಾಲಿ ಫಿಲ್ಟರ್ ಸೆಟ್ ದಯವಿಟ್ಟು ಗುಂಪಿನ ಕಂಪೆನಿ &#39;ಆಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮುಂದಿನ ದಿನಾಂಕದಂದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ಮರುಕಳಿಸುವಿಕೆಯನ್ನು ಸೃಷ್ಟಿಸಲು
 DocType: Stock Entry,Target Warehouse Address,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ವಿಳಾಸ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,ರಜೆ
 DocType: Agriculture Task,End Day,ಅಂತ್ಯ ದಿನ
@@ -4968,11 +5000,10 @@
 DocType: Material Request,% Ordered,% ಆದೇಶ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ಕೋರ್ಸ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಫಾರ್, ಕೋರ್ಸ್ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಸೇರಿಕೊಂಡಳು ಕೋರ್ಸ್ಗಳು ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿ ಪಡಿಸಿ ನಡೆಯಲಿದೆ."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Share Balance,From No,ಇಲ್ಲ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{ಕಳುಹಿಸುವವರ} ನಿಂದ ಹೊಸ ಸಂದೇಶ
 DocType: Customer,Customer Primary Address,ಗ್ರಾಹಕ ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
 DocType: Drug Prescription,Description/Strength,ವಿವರಣೆ / ಸಾಮರ್ಥ್ಯ
@@ -4981,22 +5012,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Department,Leave Block List,ಖಂಡ ಬಿಡಿ
 DocType: Purchase Invoice,Tax ID,ತೆರಿಗೆಯ ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಅಂಕಣ ಖಾಲಿಯಾಗಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಅಂಕಣ ಖಾಲಿಯಾಗಿರಬೇಕು
 DocType: Accounts Settings,Accounts Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖಾತೆಗಳು
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,ಅನುಮೋದಿಸಿ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} ಗಾಗಿ ತಪ್ಪಾಗಿ ರಚಿಸಲಾದ ವಿಳಾಸ, ದಯವಿಟ್ಟು ಮುಂದುವರಿಸಲು ಸರಿಪಡಿಸಿ."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} ಗಾಗಿ ತಪ್ಪಾಗಿ ರಚಿಸಲಾದ ವಿಳಾಸ, ದಯವಿಟ್ಟು ಮುಂದುವರಿಸಲು ಸರಿಪಡಿಸಿ."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","ಹೊಸ ಖಾತೆಯ ಸಂಖ್ಯೆ, ಇದು ಪೂರ್ವಪ್ರತ್ಯಯವಾಗಿ ಖಾತೆ ಹೆಸರಿನಲ್ಲಿ ಸೇರಿಸಲ್ಪಡುತ್ತದೆ"
 DocType: Maintenance Team Member,Team Member,ತಂಡದ ಸದಸ್ಯ
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,ಸಲ್ಲಿಸಲು ಯಾವುದೇ ಫಲಿತಾಂಶವಿಲ್ಲ
 DocType: Customer,Sales Partner and Commission,ಮಾರಾಟದ ಸಂಗಾತಿ ಮತ್ತು ಆಯೋಗದ
-DocType: Employee Loan,Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ
+DocType: Loan,Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ
 ,Project Quantity,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ಘಟಕಗಳು {1} ನಲ್ಲಿ {2} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ.
 DocType: Loan Type,Rate of Interest (%) Yearly,ಬಡ್ಡಿ ದರ (%) ವಾರ್ಷಿಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,ತಾತ್ಕಾಲಿಕ ಖಾತೆಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ಬ್ಲಾಕ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,ತಾತ್ಕಾಲಿಕ ಖಾತೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ಬ್ಲಾಕ್
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ಸ್ಫೋಟ ಐಟಂ
 DocType: Shareholder,Contact List,ಸಂಪರ್ಕ ಪಟ್ಟಿ
 DocType: Account,Auditor,ಆಡಿಟರ್
@@ -5004,16 +5035,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ನಿರ್ಮಾಣ ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ
 DocType: Cheque Print Template,Distance from top edge,ಮೇಲಿನ ತುದಿಯಲ್ಲಿ ದೂರ
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,ದರ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,ದರ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice,Return,ರಿಟರ್ನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","ಸ್ವತ್ತುಗಳು, ಸೀರಿಯಲ್ ನೋಸ್, ಬ್ಯಾಚ್ಗಳು ಮುಂತಾದ ಹೆಚ್ಚಿನ ಆಯ್ಕೆಗಳಿಗಾಗಿ ಪೂರ್ಣ ಪುಟದಲ್ಲಿ ಸಂಪಾದಿಸಿ."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ನೇಮಕಾತಿಗಳು ಮತ್ತು ಸಮಾಲೋಚನೆಗಳು
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ಬ್ಯಾಚ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ {0} ನಿಷ್ಕ್ರಿಯವಾಗಲ್ಪಟ್ಟವು ಸಾಧ್ಯವಿಲ್ಲ {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ಪರೀಕ್ಷಣೆ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ಪರೀಕ್ಷಣೆ ಅಗತ್ಯವಿದೆ
 DocType: Task,Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,ಕಂಪನಿ ಅನ್ನು ಹೊಂದಿಸಲು ವಿಫಲವಾಗಿದೆ
@@ -5025,7 +5056,7 @@
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ಬೆಳೆಗಳು ಮತ್ತು ಭೂಮಿಗಳು
 DocType: Cheque Print Template,Regular,ನಿಯಮಿತ
 DocType: Fertilizer,Density (if liquid),ಸಾಂದ್ರತೆ (ದ್ರವದಿದ್ದರೆ)
@@ -5050,24 +5081,26 @@
 DocType: Payment Entry,Paid Amount,ಮೊತ್ತವನ್ನು
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,ಮಾರಾಟದ ಸೈಕಲ್ ಅನ್ವೇಷಿಸಿ
 DocType: Assessment Plan,Supervisor,ಮೇಲ್ವಿಚಾರಕ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 ,Work Order Stock Report,ವರ್ಕ್ ಆರ್ಡರ್ ಸ್ಟಾಕ್ ರಿಪೋರ್ಟ್
+DocType: Purchase Receipt,Auto Repeat Detail,ಆಟೋ ರಿಪೀಟ್ ವಿವರ
 DocType: Assessment Result Tool,Assessment Result Tool,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ಟೂಲ್
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,ಮೇಲ್ವಿಚಾರಕರಾಗಿ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,ವರ್ಗವನ್ನು ಸೂಚಿಸಿ
 DocType: BOM Scrap Item,BOM Scrap Item,ಬಿಒಎಮ್ ಸ್ಕ್ರ್ಯಾಪ್ ಐಟಂ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Project,Total Billable Amount (via Timesheets),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ)
 DocType: Agriculture Task,Previous Business Day,ಹಿಂದಿನ ವ್ಯವಹಾರ ದಿನ
-DocType: Employee Loan,Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ
+DocType: Loan,Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ
 DocType: Employee,Health Insurance No,ಆರೋಗ್ಯ ವಿಮೆ ಇಲ್ಲ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ಆಮ್ಟ್
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ ಆಮ್ಟ್
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,ಒಟ್ಟು ತೆರಿಗೆ ಮೊತ್ತ
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Opening Invoice Creation Tool,Purchase,ಖರೀದಿ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
@@ -5078,16 +5111,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ಫಾರ್ {1}
 DocType: Healthcare Settings,Valid number of days,ದಿನಗಳಲ್ಲಿ ಮಾನ್ಯ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ವೆಚ್ಚ ಕೇಂದ್ರಗಳು
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,ಚಂದಾದಾರಿಕೆಯನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ
 DocType: Land Unit,Linked Plant Analysis,ಲಿಂಕ್ಡ್ ಪ್ಲಾಂಟ್ ಅನಾಲಿಸಿಸ್
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ಯಾವ ಸರಬರಾಜುದಾರರ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ರೋ # {0}: ಸಾಲು ಸಮಯ ಘರ್ಷಣೆಗಳು {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ಅನುಮತಿಸಿ ಶೂನ್ಯ ಮೌಲ್ಯಾಂಕನ ದರ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ಅನುಮತಿಸಿ ಶೂನ್ಯ ಮೌಲ್ಯಾಂಕನ ದರ
+DocType: Bank Guarantee,Receiving,ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ
 DocType: Training Event Employee,Invited,ಆಹ್ವಾನಿತ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಗಾಗಿ ಬಹು ಸಕ್ರಿಯ ಸಂಬಳ ಸ್ಟ್ರಕ್ಚರ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳನ್ನು.
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
 DocType: Payment Entry,Set Exchange Gain / Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ ಹೊಂದಿಸಿ
 ,GST Purchase Register,ಜಿಎಸ್ಟಿ ಖರೀದಿ ನೋಂದಣಿ
 ,Cash Flow,ಕ್ಯಾಶ್ ಫ್ಲೋ
@@ -5108,9 +5143,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,ಎಲ್ಲಾ ಪಾಲು ವ್ಯವಹಾರಗಳ ಪಟ್ಟಿ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ಎದುರು ಕೌಂಟ್
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ಎದುರು ಕೌಂಟ್
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ಪ್ರಾಯೋಗಿಕ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಪ್ರಯೋಗ ಅವಧಿ ಅಂತ್ಯ ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ಸರಾಸರಿ ದರ
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿಗಳಲ್ಲಿ ಒಟ್ಟು ಪಾವತಿ ಮೊತ್ತವು ಗ್ರ್ಯಾಂಡ್ / ದುಂಡಾದ ಒಟ್ಟು ಮೊತ್ತಕ್ಕೆ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿಗಳಲ್ಲಿ ಒಟ್ಟು ಪಾವತಿ ಮೊತ್ತವು ಗ್ರ್ಯಾಂಡ್ / ದುಂಡಾದ ಒಟ್ಟು ಮೊತ್ತಕ್ಕೆ ಸಮನಾಗಿರಬೇಕು
+DocType: Subscription Plan Detail,Plan,ಯೋಜನೆ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ಜನರಲ್ ಲೆಡ್ಜರ್ ಪ್ರಕಾರ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Job Applicant,Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು
 DocType: Authorization Rule,Customer / Item Name,ಗ್ರಾಹಕ / ಐಟಂ ಹೆಸರು
@@ -5140,6 +5176,7 @@
 DocType: Work Order,Warehouses,ಗೋದಾಮುಗಳು
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ಆಸ್ತಿ ವರ್ಗಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Hotel Room Pricing,Hotel Room Pricing,ಹೋಟೆಲ್ ಕೊಠಡಿ ಬೆಲೆ
+DocType: Subscription,Days Until Due,ರವರೆಗೆ ದಿನಗಳು
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಪ್ರಕಾರವಾಗಿದ್ದು.
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ಖರೀದಿ
@@ -5148,13 +5185,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ಬ್ಯಾಚ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಫಾರ್, ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿ ಪಡಿಸಿ ನಡೆಯಲಿದೆ."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ಹಂಚುವುದು
+DocType: Journal Entry Account,Loan,ಸಾಲ
 DocType: Expense Claim Advance,Expense Claim Advance,ಖರ್ಚು ಹಕ್ಕು ಅಡ್ವಾನ್ಸ್
 DocType: Lab Test,Report Preference,ವರದಿ ಆದ್ಯತೆ
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ಸ್ವಯಂಸೇವಕ ಮಾಹಿತಿ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
 ,Quoted Item Comparison,ಉಲ್ಲೇಖಿಸಿದ ಐಟಂ ಹೋಲಿಕೆ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} ಮತ್ತು {1} ನಡುವಿನ ಅಂಕದಲ್ಲಿ ಅತಿಕ್ರಮಿಸುವಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ರವಾನಿಸು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,ಮೇಲೆ ನಿವ್ವಳ ಆಸ್ತಿ ಮೌಲ್ಯ
 DocType: Crop,Produce,ಉತ್ಪಾದಿಸು
@@ -5164,7 +5202,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ತಯಾರಿಕೆಗಾಗಿ ವಸ್ತು ಬಳಕೆ
 DocType: Item Alternative,Alternative Item Code,ಪರ್ಯಾಯ ಐಟಂ ಕೋಡ್
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Delivery Stop,Delivery Stop,ವಿತರಣೆ ನಿಲ್ಲಿಸಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
 DocType: Item,Material Issue,ಮೆಟೀರಿಯಲ್ ಸಂಚಿಕೆ
@@ -5174,15 +5212,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
 DocType: BOM,Show Items,ಐಟಂಗಳನ್ನು ತೋರಿಸಿ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ಟೈಮ್ ಟೈಮ್ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೆ ಇಮೇಲ್ ಮೂಲಕ ತಿಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೆ ಇಮೇಲ್ ಮೂಲಕ ತಿಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
+DocType: Subscription Plan,Billing Interval,ಬಿಲ್ಲಿಂಗ್ ಇಂಟರ್ವಲ್
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ಪುನರಾರಂಭಿಸು
 DocType: Hub Settings,Hub Username,ಹಬ್ ಬಳಕೆದಾರಹೆಸರು
 DocType: Salary Detail,Component,ಕಾಂಪೊನೆಂಟ್
 DocType: Assessment Criteria,Assessment Criteria Group,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಗ್ರೂಪ್
 DocType: Healthcare Settings,Patient Name By,ರೋಗಿಯ ಹೆಸರು ಇವರಿಂದ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} ರಿಂದ {1} ಗೆ ಸಂಬಳಕ್ಕಾಗಿ ಅಕ್ರುಯಲ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} ರಿಂದ {1} ಗೆ ಸಂಬಳಕ್ಕಾಗಿ ಅಕ್ರುಯಲ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
@@ -5196,23 +5234,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Leave Block List,Applies to Company,ಕಂಪನಿ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
-DocType: Employee Loan,Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ಸ್ವೀಕರಿಸುವವರು&#39; ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
+DocType: Loan,Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ
 DocType: BOM Update Tool,Update latest price in all BOMs,ಎಲ್ಲಾ BOM ಗಳಲ್ಲೂ ಇತ್ತೀಚಿನ ಬೆಲೆ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,ವೈದ್ಯಕೀಯ ವರದಿ
 DocType: Vehicle,Vehicle,ವಾಹನ
 DocType: Purchase Invoice,In Words,ವರ್ಡ್ಸ್
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,ಸಲ್ಲಿಸುವ ಮೊದಲು ಬ್ಯಾಂಕ್ ಅಥವಾ ಸಾಲ ನೀಡುವ ಸಂಸ್ಥೆಯ ಹೆಸರನ್ನು ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} ಸಲ್ಲಿಸಬೇಕು
 DocType: POS Profile,Item Groups,ಐಟಂ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
 DocType: Sales Order Item,For Production,ಉತ್ಪಾದನೆಗೆ
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್ನಲ್ಲಿ ದಯವಿಟ್ಟು ತಾತ್ಕಾಲಿಕ ತೆರೆಯುವ ಖಾತೆಯನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್ನಲ್ಲಿ ದಯವಿಟ್ಟು ತಾತ್ಕಾಲಿಕ ತೆರೆಯುವ ಖಾತೆಯನ್ನು ಸೇರಿಸಿ
 DocType: Customer,Customer Primary Contact,ಗ್ರಾಹಕರ ಪ್ರಾಥಮಿಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,ಅವಧಿ ಮುಚ್ಚುವ ಜರ್ನಲ್
 DocType: Project Task,View Task,ವೀಕ್ಷಿಸಿ ಟಾಸ್ಕ್
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ಎದುರು / ಲೀಡ್%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ಎದುರು / ಲೀಡ್%
+DocType: Bank Guarantee,Bank Guarantee Type,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ ಟೈಪ್
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ಸರಕು ಸರಕು
 ,Asset Depreciations and Balances,ಆಸ್ತಿ Depreciations ಮತ್ತು ಸಮತೋಲನ
@@ -5223,9 +5262,8 @@
 DocType: Production Plan,Include Subcontracted Items,ಉಪಗುತ್ತಿಗೆಗೊಂಡ ವಸ್ತುಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸ್ಕ್ಶನ್ ನಂತರ ರೂಪಾಂತರ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಇದನ್ನು ಮಾಡಲು ನೀವು ಹೊಸ ಐಟಂ ಅನ್ನು ಮಾಡಬೇಕಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
-DocType: Employee Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+DocType: Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
 DocType: Leave Application,LAP/,ಲ್ಯಾಪ್ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
@@ -5249,11 +5287,11 @@
 DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ನಕಲು ಐಟಂ ಗುಂಪು ಐಟಂ ಗುಂಪು ಟೇಬಲ್ ಕಂಡುಬರುವ
 DocType: Land Unit,Parent Land Unit,ಪೋಷಕ ಭೂಮಿ ಘಟಕ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
 DocType: Fertilizer,Fertilizer Name,ರಸಗೊಬ್ಬರ ಹೆಸರು
 DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ವೇತನ
 DocType: Cash Flow Mapping Accounts,Account,ಖಾತೆ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 ,Requested Items To Be Transferred,ಬದಲಾಯಿಸಿಕೊಳ್ಳುವಂತೆ ವಿನಂತಿಸಲಾಗಿದೆ ಐಟಂಗಳು
 DocType: Expense Claim,Vehicle Log,ವಾಹನ ಲಾಗ್
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ಜ್ವರದ ಉಪಸ್ಥಿತಿ (ಟೆಂಪ್&gt; 38.5 ° C / 101.3 ° F ಅಥವಾ ನಿರಂತರ ತಾಪಮಾನವು&gt; 38 ° C / 100.4 ° F)
@@ -5294,24 +5332,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
 DocType: Asset Maintenance,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
-DocType: C-Form,Series,ಸರಣಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},ಬೆಲೆ ಪಟ್ಟಿ {0} {1} ಅಥವಾ {2} ಆಗಿರಬೇಕು
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Soil Texture,Ternary Plot,ತರ್ನರಿ ಪ್ಲಾಟ್
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
 DocType: Driver,License Number,ಪರವಾನಗಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ನಿರ್ವಹಣೆ ಭೇಟಿ ಉದ್ದೇಶ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ಸರಕುಪಟ್ಟಿ ರೋಗಿಯ ನೋಂದಣಿ
 DocType: Crop,Period,ಅವಧಿ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ಬಿಡಿ ಮೇಲೆ ನೌಕರರ {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ಬಿಡಿ ಮೇಲೆ ನೌಕರರ {0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ವೀಕ್ಷಿಸಿ ಕಾರಣವಾಗುತ್ತದೆ
 DocType: Program Enrollment Tool,New Program,ಹೊಸ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Item Attribute Value,Attribute Value,ಮೌಲ್ಯ ಲಕ್ಷಣ
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 DocType: Salary Detail,Salary Detail,ಸಂಬಳ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Appointment Type,Physician,ವೈದ್ಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ಸಮಾಲೋಚನೆಗಳು
@@ -5319,15 +5356,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ಕೆಲಸದ ಆದೇಶದಲ್ಲಿ {2} ಯೋಜಿತ ಪ್ರಮಾಣಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬಾರದು {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ಉತ್ಪಾದನೆ ಟೈಮ್ ಶೀಟ್.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ಉಪಮೊತ್ತ
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರದ ನಂತರ ರೂಪಾಂತರ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಇದನ್ನು ಮಾಡಲು ನೀವು ಹೊಸ ಐಟಂ ಅನ್ನು ಮಾಡಬೇಕಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,ಗೋಕಾರ್ಡರ್ಲೆಸ್ SEPA ಮ್ಯಾಂಡೇಟ್
 DocType: Physician,Charges,ಶುಲ್ಕಗಳು
 DocType: Production Plan,Get Items For Work Order,ಕೆಲಸ ಆದೇಶಕ್ಕಾಗಿ ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Salary Detail,Default Amount,ಡೀಫಾಲ್ಟ್ ಪ್ರಮಾಣ
 DocType: Lab Test Template,Descriptive,ವಿವರಣಾತ್ಮಕ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ ಓದುವಿಕೆ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,ನಿಮ್ಮ ಕಂಪನಿಗೆ ನೀವು ಸಾಧಿಸಲು ಬಯಸುವ ಮಾರಾಟದ ಗುರಿಯನ್ನು ಹೊಂದಿಸಿ.
 ,Project wise Stock Tracking,ಪ್ರಾಜೆಕ್ಟ್ ಬುದ್ಧಿವಂತ ಸ್ಟಾಕ್ ಟ್ರ್ಯಾಕಿಂಗ್
@@ -5355,11 +5393,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ವೆಬ್ಸೈಟ್ ರಚಿಸಲು ವಿಫಲವಾಗಿದೆ
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,ಈಗಾಗಲೇ ರಚಿಸಲಾದ ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಅಥವಾ ಮಾದರಿ ಪ್ರಮಾಣವನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,ಈಗಾಗಲೇ ರಚಿಸಲಾದ ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಅಥವಾ ಮಾದರಿ ಪ್ರಮಾಣವನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ
 DocType: Program,Program Abbreviation,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಸಂಕ್ಷೇಪಣ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
-DocType: Bank Guarantee,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ಕಾಲ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ಚೆಕ್ ಮತ್ತು ಠೇವಣಿಗಳ ತಪ್ಪಾಗಿ ತೆರವುಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -5374,11 +5411,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ಅವರ್ಸ್
 DocType: Project,Expected Start Date,ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Purchase Invoice,04-Correction in Invoice,04-ಇನ್ವಾಯ್ಸ್ನಲ್ಲಿ ತಿದ್ದುಪಡಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,ಬೊಮ್ನೊಂದಿಗೆ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಕೆಲಸದ ಆದೇಶವನ್ನು ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,ಬೊಮ್ನೊಂದಿಗೆ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಕೆಲಸದ ಆದೇಶವನ್ನು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,ಭಿನ್ನ ವಿವರಗಳು ವರದಿ
 DocType: Setup Progress Action,Setup Progress Action,ಸೆಟಪ್ ಪ್ರೋಗ್ರೆಸ್ ಆಕ್ಷನ್
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಮಾಡಿ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,ದಯವಿಟ್ಟು ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದಂತೆ ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಪೂರ್ಣಗೊಂಡ ದಿನಾಂಕವನ್ನು ತೆಗೆದುಹಾಕಿ
 DocType: Supplier,Default Payment Terms Template,ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಕರೆನ್ಸಿ ಅದೇ ಇರಬೇಕು
@@ -5389,7 +5427,6 @@
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ಆಕ್ಷನ್ ಮಾಸಿಕ ಬಜೆಟ್ ಮೀರಿದೆ ತನ್ನತ್ತ
-DocType: Subscription,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
 DocType: Asset,Disposal Date,ವಿಲೇವಾರಿ ದಿನಾಂಕ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ಇಮೇಲ್ಗಳನ್ನು ಅವರು ರಜಾ ಹೊಂದಿಲ್ಲ ವೇಳೆ, ಗಂಟೆ ಕಂಪನಿಯ ಎಲ್ಲಾ ಸಕ್ರಿಯ ನೌಕರರು ಕಳುಹಿಸಲಾಗುವುದು. ಪ್ರತಿಕ್ರಿಯೆಗಳ ಸಾರಾಂಶ ಮಧ್ಯರಾತ್ರಿ ಕಳುಹಿಸಲಾಗುವುದು."
@@ -5408,6 +5445,7 @@
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Cheque Print Template,Cheque Print Template,ಚೆಕ್ ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ಇನ್ವಾಯ್ಸ್ ದಿನಾಂಕದ ನಂತರದ ದಿನಗಳ ಸಂಖ್ಯೆ ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಕ್ಕೂ ಮುಂಚಿತವಾಗಿ ಅಥವಾ ಚಂದಾದಾರಿಕೆಯನ್ನು ಪಾವತಿಸದೇ ಇರುವಂತೆ ಮುಗಿದಿದೆ
 DocType: Lab Test Template,Sample Collection,ಮಾದರಿ ಸಂಗ್ರಹ
 ,Requested Items To Be Ordered,ಆದೇಶ ಕೋರಲಾಗಿದೆ ಐಟಂಗಳು
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
@@ -5416,7 +5454,7 @@
 DocType: Account,Income,ಆದಾಯ
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Supplier Scorecard Scoring Criteria,Score,ಸ್ಕೋರ್
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -5436,12 +5474,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 ಮತ್ತು 100 ರ ನಡುವಿನ ಮೌಲ್ಯವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕವು ಬಳಸಲು ಲಭ್ಯವಾಗುವ ದಿನಾಂಕದ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Cost Center,Cost Center Name,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
 DocType: Student,B+,ಬಿ +
 DocType: HR Settings,Max working hours against Timesheet,ಮ್ಯಾಕ್ಸ್ Timesheet ವಿರುದ್ಧ ಕೆಲಸದ
 DocType: Maintenance Schedule Detail,Scheduled Date,ಪರಿಶಿಷ್ಟ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ಒಟ್ಟು ಪಾವತಿಸಿದ ಆಮ್ಟ್
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ಒಟ್ಟು ಪಾವತಿಸಿದ ಆಮ್ಟ್
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ಪಾತ್ರಗಳು ಹೆಚ್ಚು ಸಂದೇಶಗಳು ಅನೇಕ ಸಂದೇಶಗಳನ್ನು ವಿಭಜಿಸಲಾಗುವುದು
 DocType: Purchase Receipt Item,Received and Accepted,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು Accepted
 DocType: Hub Settings,Company and Seller Profile,ಕಂಪನಿ ಮತ್ತು ಮಾರಾಟಗಾರರ ವಿವರ
@@ -5455,10 +5493,9 @@
 DocType: Item,Variant Based On,ಭಿನ್ನ ಬೇಸ್ಡ್ ರಂದು
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ದಯವಿಟ್ಟು ಸರಿಪಡಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 DocType: Request for Quotation Item,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,ಅನಾಮಧೇಯ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Lead,Converted,ಪರಿವರ್ತಿತ
@@ -5472,6 +5509,7 @@
 DocType: Asset,Assets,ಆಸ್ತಿಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
+DocType: Subscription,Current Invoice End Date,ಪ್ರಸ್ತುತ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Payment Term,Due Date Based On,ಕಾರಣ ದಿನಾಂಕ ಆಧರಿಸಿ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ ಸಮೂಹ ಮತ್ತು ಪ್ರದೇಶವನ್ನು ಸೆಲ್ಲಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -5479,7 +5517,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿಗಾಗಿ ಯಾವುದೇ ಮರುಪಾವತಿಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ
 DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
+DocType: Loan,Disbursed,ವಿತರಿಸಲಾಗಿದೆ
 DocType: Healthcare Settings,Laboratory Settings,ಪ್ರಯೋಗಾಲಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Patient Appointment,Service Unit,ಸೇವಾ ಘಟಕ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,ಯಶಸ್ವಿಯಾಗಿ ಸರಬರಾಜುದಾರನನ್ನು ಹೊಂದಿಸಿ
@@ -5492,12 +5532,12 @@
 DocType: Share Balance,No of Shares,ಷೇರುಗಳ ಸಂಖ್ಯೆ ಇಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,ಸ್ಥಿತಿ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: School House,House Name,ಹೌಸ್ ಹೆಸರು
 DocType: Fee Schedule,Total Amount per Student,ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಒಟ್ಟು ಮೊತ್ತ
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ವಿದ್ಯುತ್ತಿನ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ವಿದ್ಯುತ್ತಿನ
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ನಿಮ್ಮ ಬಳಕೆದಾರರಿಗೆ ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಉಳಿದ ಸೇರಿಸಿ. ನೀವು ಸಂಪರ್ಕಗಳು ಅವುಗಳನ್ನು ಸೇರಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಪೋರ್ಟಲ್ ಗ್ರಾಹಕರಿಗೆ ಆಮಂತ್ರಿಸಲು ಸೇರಿಸಬಹುದು
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
 DocType: Grant Application,Requested Amount,ವಿನಂತಿಸಿದ ಮೊತ್ತ
@@ -5507,7 +5547,7 @@
 DocType: Crop Cycle,Detected Diseases,ಪತ್ತೆಯಾದ ರೋಗಗಳು
 DocType: Stock Entry,Default Source Warehouse,ಡೀಫಾಲ್ಟ್ ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 DocType: Asset Maintenance Task,Last Completion Date,ಕೊನೆಯ ಪೂರ್ಣಗೊಳಿಸುವಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
@@ -5515,9 +5555,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
 DocType: Restaurant,Active Menu,ಸಕ್ರಿಯ ಮೆನು
 DocType: Target Detail,Target Qty,ಟಾರ್ಗೆಟ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ಸಾಲಕ್ಕೆ ವಿರುದ್ಧವಾಗಿ: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ಚೆಕ್ಔಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Student Attendance,Present,ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸಿದ ಮಾಡಬಾರದು
@@ -5526,9 +5567,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
 DocType: Vehicle Log,Odometer,ದೂರಮಾಪಕ
 DocType: Production Plan Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
 DocType: Chapter,Chapter Head,ಅಧ್ಯಾಯ ಹೆಡ್
 DocType: Payment Term,Month(s) after the end of the invoice month,ಸರಕುಪಟ್ಟಿ ತಿಂಗಳ ನಂತರ ತಿಂಗಳ (ರು)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
@@ -5536,11 +5577,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ಲ್ಯಾಬ್ ಫಲಿತಾಂಶದ ಡೆಸ್ಟೈಮ್ ಪರೀಕ್ಷೆ ಡಾಟಾಟೈಮ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Allow user to edit Discount,ಬಳಕೆದಾರರನ್ನು ಡಿಸ್ಕೌಂಟ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ಗ್ರಾಹಕರಿಂದ ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ಗ್ರಾಹಕರಿಂದ ಪಡೆಯಿರಿ
 DocType: Purchase Invoice Item,Include Exploded Items,ಸ್ಫೋಟಗೊಂಡ ವಸ್ತುಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ಖರೀದಿ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
 DocType: Shipping Rule,Restrict to Countries,ದೇಶಗಳಿಗೆ ನಿರ್ಬಂಧಿಸಿ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Sales Invoice Timesheet,Billing Hours,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್
 DocType: Project,Total Sales Amount (via Sales Order),ಒಟ್ಟು ಮಾರಾಟದ ಮೊತ್ತ (ಸೇಲ್ಸ್ ಆರ್ಡರ್ ಮೂಲಕ)
@@ -5559,6 +5601,7 @@
 DocType: Soil Texture,Sandy Clay,ಸ್ಯಾಂಡಿ ಕ್ಲೇ
 DocType: Grant Application,Assessment  Manager,ಅಸೆಸ್ಮೆಂಟ್ ಮ್ಯಾನೇಜರ್
 DocType: Payment Entry,Allocate Payment Amount,ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಿಯೋಜಿಸಿ
+DocType: Subscription Plan,Subscription Plan,ಚಂದಾದಾರಿಕೆ ಯೋಜನೆ
 DocType: Employee External Work History,Salary,ಸಂಬಳ
 DocType: Serial No,Delivery Document Type,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Sales Order,Partly Delivered,ಭಾಗಶಃ ತಲುಪಿಸಲಾಗಿದೆ
@@ -5584,9 +5627,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
 DocType: SG Creation Tool Course,Max Strength,ಮ್ಯಾಕ್ಸ್ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ಪೂರ್ವನಿಗದಿಗಳು ಅನುಸ್ಥಾಪಿಸುವುದು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ಗ್ರಾಹಕರಲ್ಲಿ ಯಾವುದೇ ಡೆಲಿವರಿ ಸೂಚನೆ ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ಗ್ರಾಹಕರಲ್ಲಿ ಯಾವುದೇ ಡೆಲಿವರಿ ಸೂಚನೆ ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Grant Application,Has any past Grant Record,ಯಾವುದೇ ಹಿಂದಿನ ಗ್ರಾಂಟ್ ರೆಕಾರ್ಡ್ ಇದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ಲಭ್ಯವಿರುವ {0}
@@ -5605,7 +5648,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಸರಬರಾಜು ವೆಚ್ಚ
 DocType: Selling Settings,Settings for Selling Module,ಮಾಡ್ಯೂಲ್ ಮಾರಾಟವಾಗುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Hotel Room Reservation,Hotel Room Reservation,ಹೋಟೆಲ್ ಕೊಠಡಿ ಮೀಸಲಾತಿ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
 DocType: BOM,Thumbnail,ಥಂಬ್ನೇಲ್
 DocType: Item Customer Detail,Item Customer Detail,ಗ್ರಾಹಕ ಐಟಂ ವಿವರ
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ಆಫರ್ ಅಭ್ಯರ್ಥಿ ಒಂದು ಜಾಬ್.
@@ -5622,7 +5665,7 @@
 DocType: Fees,Student Details,ವಿದ್ಯಾರ್ಥಿ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ
-DocType: Employee Loan,Repayment Period in Months,ತಿಂಗಳಲ್ಲಿ ಮರುಪಾವತಿಯ ಅವಧಿಯ
+DocType: Loan,Repayment Period in Months,ತಿಂಗಳಲ್ಲಿ ಮರುಪಾವತಿಯ ಅವಧಿಯ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ದೋಷ: ಮಾನ್ಯ ಐಡಿ?
 DocType: Naming Series,Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
 DocType: Account,Equity,ಇಕ್ವಿಟಿ
@@ -5631,7 +5674,7 @@
 DocType: Task,Closing Date,ದಿನಾಂಕ ಕ್ಲೋಸಿಂಗ್
 DocType: Sales Order Item,Produced Quantity,ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ
 DocType: Timesheet,Work Detail,ಕೆಲಸ ವಿವರ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ಇಂಜಿನಿಯರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ಇಂಜಿನಿಯರ್
 DocType: Journal Entry,Total Amount Currency,ಒಟ್ಟು ಪ್ರಮಾಣ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ಹುಡುಕು ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
@@ -5677,13 +5720,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ದಾನಿ ಕೌಟುಂಬಿಕತೆ ಮಾಹಿತಿ.
 DocType: Request for Quotation,Supplier Detail,ಸರಬರಾಜುದಾರ ವಿವರ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ಮಾನದಂಡದ ತೂಕವು 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,ಸ್ಟಾಕ್ ವಸ್ತುಗಳು
 DocType: BOM,Materials,ಮೆಟೀರಿಯಲ್
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ಪರೀಕ್ಷಿಸಿದ್ದು ಅಲ್ಲ, ಪಟ್ಟಿ ಇದು ಅನ್ವಯಿಸಬಹುದು ಅಲ್ಲಿ ಪ್ರತಿ ಇಲಾಖೆಗಳು ಸೇರಿಸಲಾಗುತ್ತದೆ ಹೊಂದಿರುತ್ತದೆ ."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} ರಚಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ಮೂಲ ಮತ್ತು ಗುರಿ ವೇರ್ಹೌಸ್ ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
@@ -5707,14 +5749,14 @@
 DocType: Shipping Rule,Fixed,ಸ್ಥಿರ
 DocType: Vehicle Service,Clutch Plate,ಕ್ಲಚ್ ಪ್ಲೇಟ್
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
-DocType: Journal Entry,Subscription,ಚಂದಾದಾರಿಕೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,ಚಂದಾದಾರಿಕೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ಶುಲ್ಕ ಸೃಷ್ಟಿ ಬಾಕಿ ಉಳಿದಿದೆ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
 DocType: Asset Category,Asset Category Name,ಆಸ್ತಿ ವರ್ಗ ಹೆಸರು
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಪ್ರದೇಶವನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ಹೊಸ ಮಾರಾಟದ ವ್ಯಕ್ತಿ ಹೆಸರು
@@ -5728,7 +5770,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
 DocType: Asset,Frequency of Depreciation (Months),ಸವಕಳಿ ಆವರ್ತನ (ತಿಂಗಳ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
@@ -5736,7 +5778,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
 DocType: Hub Settings,Company Logo,ಕಂಪನಿ ಲೋಗೋ
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Healthcare Settings,Patient Registration,ರೋಗಿಯ ನೋಂದಣಿ
@@ -5771,11 +5813,10 @@
 DocType: Journal Entry,Total Debit,ಒಟ್ಟು ಡೆಬಿಟ್
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ಡೀಫಾಲ್ಟ್ ತಯಾರಾದ ಸರಕುಗಳು ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,ದಯವಿಟ್ಟು ರೋಗಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ಮಾರಾಟಗಾರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,ಮಾರಾಟಗಾರ
 DocType: Hotel Room Package,Amenities,ಸೌಕರ್ಯಗಳು
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ಬಹುಪಾಲು ಡೀಫಾಲ್ಟ್ ಮೋಡ್ ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ಫಾರ್
 ,Appointment Analytics,ನೇಮಕಾತಿ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Vehicle Service,Half Yearly,ಅರ್ಧ ವಾರ್ಷಿಕ
 DocType: Lead,Blog Subscriber,ಬ್ಲಾಗ್ ಚಂದಾದಾರರ
@@ -5792,6 +5833,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ನೀವು ವರ್ಷಕ್ಕೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಗುಂಪುಗಳು ಮಾಡಿದರೆ ಖಾಲಿ ಬಿಡಿ
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ಪರಿಶೀಲಿಸಿದರೆ, ಕೆಲಸ ದಿನಗಳ ಒಟ್ಟು ಯಾವುದೇ ರಜಾದಿನಗಳು ಸೇರಿವೆ , ಮತ್ತು ಈ ಸಂಬಳ ದಿನಕ್ಕೆ ಮೌಲ್ಯವನ್ನು ಕಡಿಮೆಗೊಳಿಸುತ್ತದೆ"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","ಪ್ರಸ್ತುತ ಕೀಲಿಯನ್ನು ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ, ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ?"
+DocType: Subscription Settings,Prorate,ಪ್ರಾರ್ಥಿಸು
 DocType: Purchase Invoice,Total Advance,ಒಟ್ಟು ಅಡ್ವಾನ್ಸ್
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ಟೆಂಪ್ಲೇಟು ಕೋಡ್ ಬದಲಿಸಿ
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
@@ -5803,8 +5845,9 @@
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 DocType: Cheque Print Template,Signatory Position,ಸಹಿ ಪೊಸಿಷನ್
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
 DocType: Timesheet,Total Billable Hours,ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಗಂಟೆಗಳ
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,ಚಂದಾದಾರರು ಈ ಚಂದಾದಾರಿಕೆಯಿಂದ ಉತ್ಪತ್ತಿಯಾದ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ಪಾವತಿಸಬೇಕಾದ ದಿನಗಳ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ಪಾವತಿ ರಸೀತಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ಈ ಗ್ರಾಹಕ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ರೋ {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಪಾವತಿ ಎಂಟ್ರಿ ಪ್ರಮಾಣದ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
@@ -5823,12 +5866,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ಈ ನೌಕರರ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
 DocType: Assessment Result,Summary,ಸಾರಾಂಶ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,ಹಾಜರಾತಿ ಗುರುತಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ ಐಟಂ
@@ -5840,7 +5883,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ಖರೀದಿಯ ಮೊತ್ತ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Work Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},ಷೇರುಗಳು {0}
@@ -5848,12 +5891,12 @@
 DocType: Asset,Out of Order,ಆದೇಶದ ಹೊರಗೆ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 DocType: Projects Settings,Ignore Workstation Time Overlap,ವರ್ಕ್ಟೇಷನ್ ಸಮಯ ಅತಿಕ್ರಮಣವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ಬ್ಯಾಚ್ ಸಂಖ್ಯೆಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 DocType: Patient Service Unit,Medical Administrator,ವೈದ್ಯಕೀಯ ನಿರ್ವಾಹಕ
 DocType: Assessment Plan,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Account,Parent Account,ಪೋಷಕರ ಖಾತೆಯ
@@ -5883,15 +5926,16 @@
 DocType: Asset Repair,Repair Status,ದುರಸ್ತಿ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Account for Change Amount,ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆ
 DocType: Purchase Invoice,input service,ಇನ್ಪುಟ್ ಸೇವೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,ನಿರ್ವಹಣೆ ತಂಡದ ಸದಸ್ಯರು
 DocType: Agriculture Analysis Criteria,Soil Analysis,ಮಣ್ಣಿನ ವಿಶ್ಲೇಷಣೆ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,ಕೋರ್ಸ್ ಕೋಡ್:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
@@ -5940,19 +5984,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},ಪ್ರವೇಶಾತಿಯು {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ವೇರಿಯೇಬಲ್ ಹೆಸರು
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
 DocType: Asset,Asset Category,ಆಸ್ತಿ ವರ್ಗ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,ನಿವ್ವಳ ವೇತನ ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
 DocType: Soil Texture,Loamy Sand,ಲೋಮಿ ಸ್ಯಾಂಡ್
 DocType: Production Plan,Material Request Planning,ವಸ್ತು ವಿನಂತಿ ಯೋಜನೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ಟ್ರೆಶ್ಹೋಲ್ಡ್ {0}% ಹೆಚ್ಚು ಬಾರಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ
 DocType: Expense Claim,Employees Email Id,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
 DocType: Employee Attendance Tool,Marked Attendance,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,ಟೈಮರ್ ನೀಡಿದ ಗಂಟೆಗಳ ಮೀರಿದೆ.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಸಾಮೂಹಿಕ SMS ಕಳುಹಿಸಿ
 DocType: Patient,A Positive,ಧನಾತ್ಮಕ
@@ -5963,9 +6007,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
 DocType: Asset Maintenance Team,Asset Maintenance Team,ಆಸ್ತಿ ನಿರ್ವಹಣೆ ತಂಡ
-DocType: Employee Loan,Loan Type,ಸಾಲದ ಬಗೆಯ
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ
+DocType: Loan,Loan Type,ಸಾಲದ ಬಗೆಯ
 DocType: Scheduling Tool,Scheduling Tool,ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ repacked ಎಂದು ಐಟಂ
 DocType: Employee Education,Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
 DocType: Sales Invoice Item,Drop Ship,ಡ್ರಾಪ್ ಹಡಗು
@@ -5996,7 +6041,7 @@
 DocType: Item,Units of Measure,ಮಾಪನದ ಘಟಕಗಳಿಗೆ
 DocType: Manufacturing Settings,Allow Production on Holidays,ರಜಾ ದಿನಗಳಲ್ಲಿ ಪ್ರೊಡಕ್ಷನ್ ಅವಕಾಶ
 DocType: Sales Invoice,Customer's Purchase Order Date,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ಬಂಡವಾಳ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,ಬಂಡವಾಳ
 DocType: Shopping Cart Settings,Show Public Attachments,ಸಾರ್ವಜನಿಕ ಲಗತ್ತುಗಳು ತೋರಿಸಿ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 DocType: Restaurant Reservation,Reservation Time,ಮೀಸಲಾತಿ ಸಮಯ
@@ -6011,7 +6056,7 @@
 DocType: Purchase Order,To Receive and Bill,ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಬಿಲ್
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,ಸಾಲು # {0}: ದಿನಾಂಕದಂದು Reqd ಟ್ರಾನ್ಸಾಕ್ಷನ್ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ವೈಶಿಷ್ಟ್ಯದ ಉತ್ಪನ್ನಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ಡಿಸೈನರ್
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
@@ -6021,20 +6066,20 @@
 DocType: Driver,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
 DocType: Healthcare Settings,Employee name and designation in print,ನೌಕರರ ಹೆಸರು ಮತ್ತು ಮುದ್ರಣದಲ್ಲಿ ಮುದ್ರೆ
 ,accounts-browser,ಖಾತೆಗಳನ್ನು ಬ್ರೌಸರ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ಮೇಲೆ-ಬಿಲ್ಲಿಂಗ್ ಅಥವಾ ಅತಿ ಆದೇಶ ಅವಕಾಶ, ನವೀಕರಿಸಿ &quot;ಸೇವನೆ&quot; ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಥವಾ ಅಂಶದಲ್ಲಿ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Payment Term,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ಲ್ಯಾಬ್ ಪರೀಕ್ಷೆಗಳನ್ನು ಪಡೆಯಲು ರೋಗಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 DocType: Cash Flow Mapping,Is Income Tax Expense,ಆದಾಯ ತೆರಿಗೆ ಖರ್ಚು
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ವಿದ್ಯಾರ್ಥಿ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ನ ಹಾಸ್ಟೆಲ್ ನಲ್ಲಿ ವಾಸಿಸುವ ಇದೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
 ,Stock Summary,ಸ್ಟಾಕ್ ಸಾರಾಂಶ
@@ -6045,10 +6090,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
 DocType: Employee,Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ
 DocType: BOM Operation,Operating Cost(Company Currency),ವೆಚ್ಚವನ್ನು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-DocType: Employee Loan Application,Rate of Interest,ಬಡ್ಡಿ ದರ
+DocType: Loan Application,Rate of Interest,ಬಡ್ಡಿ ದರ
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: Item,Shelf Life In Days,ದಿನಗಳಲ್ಲಿ ಶೆಲ್ಫ್ ಜೀವನ
 DocType: GL Entry,Is Opening,ಆರಂಭ
+DocType: Department,Expense Approvers,ಖರ್ಚು ವಿಚಾರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 DocType: Journal Entry,Subscription Section,ಚಂದಾದಾರಿಕೆ ವಿಭಾಗ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index dccfbd1..c326387 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,재 방문 {0}이 보증 청구를 취소하기 전에 취소
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,평가 보고서
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,소비자 제품
-DocType: Purchase Receipt,Subscription Detail,구독 세부 정보
 DocType: Supplier Scorecard,Notify Supplier,공급자에게 알린다.
 DocType: Item,Customer Items,고객 항목
 DocType: Project,Costing and Billing,원가 계산 및 결제
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,계정 {0} : 부모 계정은 {1} 원장이 될 수 없습니다
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com에 항목을 게시
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,전자 메일 알림
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,평가
 DocType: Item,Default Unit of Measure,측정의 기본 단위
 DocType: SMS Center,All Sales Partner Contact,모든 판매 파트너 문의
-DocType: Employee,Leave Approvers,승인자를 남겨
+DocType: Department,Leave Approvers,승인자를 남겨
 DocType: Sales Partner,Dealer,상인
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,수사
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,이용 가능 여부 확인
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,이이 공급 업체에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,법률
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},실제의 형태 세금은 행의 항목 요금에 포함 할 수없는 {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,법률
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},실제의 형태 세금은 행의 항목 요금에 포함 할 수없는 {0}
 DocType: Bank Guarantee,Customer,고객
 DocType: Purchase Receipt Item,Required By,에 의해 필요한
 DocType: Delivery Note,Return Against Delivery Note,납품서에 대해 반환
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,머리 (또는 그룹)에있는 회계 항목은 만들어와 균형이 유지된다.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,처리 할 제출 된 급여 전표가 없습니다.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,처리 할 제출 된 급여 전표가 없습니다.
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,오픈보기
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,위에서 언급 한 반복을 위해 오늘이 조치를 취할 필요가 있습니다.
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,시리즈가 업데이트
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,점검
 DocType: Pricing Rule,Apply On,에 적용
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,모든 공급 업체에게 연락 해주기
 DocType: Support Settings,Support Settings,지원 설정
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
 ,Batch Item Expiry Status,일괄 상품 만료 상태
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,은행 어음
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,은행 어음
 DocType: Membership,membership validaty section,회원 확인 섹션
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 DocType: Consultation,Consultation,상의
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,자료
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,웹 사이트 만들기
 DocType: Opening Invoice Creation Tool Item,Quantity,수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),대출 (부채)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
 DocType: Item,Country of Origin,원산지
 DocType: Soil Texture,Soil Texture Criteria,토양 질감 기준
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,기본 연락처 세부 정보
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,알려진 문제
 DocType: Production Plan Item,Production Plan Item,생산 계획 항목
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
 DocType: Lab Test Groups,Add new line,새 줄 추가
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,건강 관리
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),지급 지연 (일)
@@ -89,7 +85,7 @@
 ,Delay Days,지연 일
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,송장
+DocType: Subscription Invoice,Invoice,송장
 DocType: Purchase Invoice Item,Item Weight Details,품목 무게 세부 사항
 DocType: Asset Maintenance Log,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,행 번호 {0} :
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,행 번호 {0} :
 DocType: Timesheet,Total Costing Amount,총 원가 계산 금액
 DocType: Delivery Note,Vehicle No,차량 없음
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,가격리스트를 선택하세요
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,진행중인 작업
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,날짜를 선택하세요
 DocType: Daily Work Summary Group,Holiday List,휴일 목록
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,회계사
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,회계사
 DocType: Hub Settings,Selling Price List,판매 가격리스트
 DocType: Patient,Tobacco Current Use,담배 현재 사용
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,판매율
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,판매율
 DocType: Cost Center,Stock User,재고 사용자
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,전화 번호
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},신규 {0} : # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,보낸 초기 전자 메일 알림
 ,Sales Partners Commission,영업 파트너위원회
 DocType: Soil Texture,Sandy Clay Loam,샌디 클레이 소주
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,감가 상각 후 값
 DocType: Student,O+,O의 +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,관련
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,출석 날짜는 직원의 입사 날짜보다 작을 수 없습니다
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,출석 날짜는 직원의 입사 날짜보다 작을 수 없습니다
 DocType: Grading Scale,Grading Scale Name,등급 스케일 이름
-DocType: Subscription,Repeat on Day,하루에 반복하기
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,이 루트 계정 및 편집 할 수 없습니다.
 DocType: Sales Invoice,Company Address,회사 주소
 DocType: BOM,Operations,운영
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},에 대한 할인의 기준으로 권한을 설정할 수 없습니다 {0}
+DocType: Subscription,Subscription Start Date,구독 시작 날짜
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","두 개의 열, 이전 이름에 대해 하나의 새로운 이름을 하나 .CSV 파일 첨부"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}하지 활성 회계 연도한다.
 DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","참조 : {0}, 상품 코드 : {1} 및 고객 : {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,평가판 기간 종료 날짜는 평가판 기간 이전 일 수 없습니다. 시작 날짜
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,KG
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,작업에 대한 열기.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM은 {1} 행의 외주 품목 {0}에 대해 지정되지 않았습니다.
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Patient,Married,결혼 한
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},허용되지 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,에서 항목을 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,에서 항목을 가져 오기
 DocType: Price List,Price Not UOM Dependant,UOM에 의존하지 않는 가격
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,브레이크 오일
 DocType: Tax Rule,Tax Type,세금의 종류
 ,Completed Work Orders,완료된 작업 주문
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,과세 대상 금액
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,과세 대상 금액
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: BOM,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간  / 60) * 실제 작업 시간
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,행 번호 {0} : 참조 문서 유형은 경비 청구 또는 분개 중 하나 여야합니다.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,선택 BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,행 번호 {0} : 참조 문서 유형은 경비 청구 또는 분개 중 하나 여야합니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,선택 BOM
 DocType: SMS Log,SMS Log,SMS 로그
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,직원에게 제공되는 선금 관리
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,배달 알림
 DocType: Journal Entry,Opening Entry,항목 열기
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,계정 결제 만
-DocType: Employee Loan,Repay Over Number of Periods,기간의 동안 수 상환
+DocType: Loan,Repay Over Number of Periods,기간의 동안 수 상환
 DocType: Stock Entry,Additional Costs,추가 비용
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
 DocType: Lead,Product Enquiry,제품 문의
 DocType: Education Settings,Validate Batch for Students in Student Group,학생 그룹의 학생들을위한 배치 확인
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},직원에 대한 검색 휴가를 기록하지 {0}의 {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},직원에 대한 검색 휴가를 기록하지 {0}의 {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,첫 번째 회사를 입력하십시오
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,처음 회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,처음 회사를 선택하세요
 DocType: Employee Education,Under Graduate,대학원에서
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,HR 설정에서 상태 알림 남기기에 대한 기본 템플릿을 설정하십시오.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,대상에
 DocType: BOM,Total Cost,총 비용
 DocType: Soil Analysis,Ca/K,칼슘 / K
-DocType: Journal Entry Account,Employee Loan,직원 대출
 DocType: Fee Schedule,Send Payment Request Email,지불 요청 이메일 보내기
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,부동산
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,등록이 취소되었습니다.
 DocType: Assessment Result,Grade,학년
 DocType: Restaurant Table,No of Seats,좌석 수
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",동적 제목을 추가하려면 다음과 같은 jinja 태그를 사용하십시오. <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: Asset Maintenance Task,Asset Maintenance Task,자산 관리 작업
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,연봉
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,연봉
 DocType: Daily Work Summary,Daily Work Summary,매일 작업 요약
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} 냉동입니다
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,재고 비용
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,재고 비용
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,대상 창고 선택
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,대상 창고 선택
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,기본 연락 이메일을 입력하세요
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,기본 연락 이메일을 입력하세요
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,콘트라 항목
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,기본 주소
 DocType: Production Plan,Material Request Detail,자재 요청 세부 사항
 DocType: Selling Settings,Default Quotation Validity Days,기본 견적 유효 기간
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: Sales Invoice,Change Amount,변화량
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,운전 면허 카테고리
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,배달 날짜를 입력하십시오.
 DocType: Depreciation Schedule,Make Depreciation Entry,감가 상각 항목 확인
+DocType: HR Settings,Leave Settings,설정에서 나가기
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,요청 유형
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,직원을
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,방송
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS (온라인 / 오프라인) 설정 모드
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,작업 주문에 대한 시간 기록 생성을 비활성화합니다. 작업 지시에 따라 작업을 추적해서는 안됩니다.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,실행
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,실행
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,작업의 세부 사항은 실시.
 DocType: Asset Maintenance Log,Maintenance Status,유지 보수 상태
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,회원 세부 정보
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1} : 공급 업체는 채무 계정에 필요한 {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,품목 및 가격
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},총 시간 : {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},날짜에서 회계 연도 내에 있어야합니다.날짜 가정 = {0}
 DocType: Drug Prescription,Interval,간격
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,우선권
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,우선권
 DocType: Grant Application,Individual,개교회들과 사역들은 생겼다가 사라진다.
 DocType: Academic Term,Academics User,학사 사용자
 DocType: Cheque Print Template,Amount In Figure,그림에서 양
-DocType: Employee Loan Application,Loan Info,대출 정보
+DocType: Loan Application,Loan Info,대출 정보
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,유지 보수 방문을 계획합니다.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,공급 업체 성과 기록표 기간
 DocType: Share Transfer,Share Transfer,공유 전송
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,항목 템플릿
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,생화학
 DocType: Job Offer,Select Terms and Conditions,이용 약관 선택
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,제한 값
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,제한 값
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce 설정
 DocType: Production Plan,Sales Orders,판매 주문
 DocType: Purchase Taxes and Charges,Valuation,평가
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,기본 지역
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,텔레비전
 DocType: Work Order Operation,Updated via 'Time Log','소요시간 로그'를 통해 업데이트 되었습니다.
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,고객 또는 공급 업체를 선택하십시오.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,저널 코드
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
 DocType: Company,Enable Perpetual Inventory,영구 인벤토리 사용
+DocType: Bank Guarantee,Charges Incurred,발생 된 요금
 DocType: Company,Default Payroll Payable Account,기본 급여 지급 계정
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,업데이트 이메일 그룹
 DocType: Sales Invoice,Is Opening Entry,개시 항목
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,맞춤 검색 결과
 DocType: Delivery Stop,Contact Name,담당자 이름
 DocType: Course Assessment Criteria,Course Assessment Criteria,코스 평가 기준
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,세금 아이디:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,세금 아이디:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,학생 아이디:
 DocType: POS Customer Group,POS Customer Group,POS 고객 그룹
 DocType: Land Unit,Land Unit describing various land assets,다양한 토지 자산을 설명하는 토지 단위
@@ -375,9 +372,8 @@
 ,Open Work Orders,작업 주문 열기
 DocType: Payment Term,Credit Months,신용 월
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,인터넷 결제는 0보다 작은 수 없습니다
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",시스템에서 반복적 인 오류 알림을 보내지 않으려면 구독에서 Disabled 필드를 선택했습니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,연간 잎
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,연간 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
 DocType: Email Digest,Profit & Loss,이익 및 손실
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,학생 그룹에 학생을 설치하십시오.
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,은행 입장
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,은행 입장
 DocType: Crop,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,학생 그룹 생성 도구 코스
 DocType: Lead,Do Not Contact,연락하지 말라
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,조직에서 가르치는 사람들
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,소프트웨어 개발자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,소프트웨어 개발자
 DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Course Scheduling Tool,Course Start Date,코스 시작 날짜
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,허브에 게시
 DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,구매 상세 정보
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,최대 학년
 DocType: Email Digest,New Quotations,새로운 인용
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,직원에서 선택한 선호하는 이메일을 기반으로 직원에게 이메일 급여 명세서
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 DocType: Tax Rule,Shipping County,배송 카운티
-apps/erpnext/erpnext/config/desktop.py +167,Learn,배우다
+apps/erpnext/erpnext/config/desktop.py +159,Learn,배우다
 DocType: Asset,Next Depreciation Date,다음 감가 상각 날짜
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,뛰어난 수표 및 취소 예금
 DocType: Item,Synced With Hub,허브와 동기화
 DocType: Driver,Fleet Manager,함대 관리자
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},행 번호 {0} : {1} 항목에 대한 음수가 될 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},행 번호 {0} : {1} 항목에 대한 음수가 될 수 없습니다 {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{}에 호텔 객실 요금을 설정하십시오.
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Opening Invoice Creation Tool,Invoice Type,송장 유형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,상품 수령증
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,상품 수령증
 DocType: Consultation,Encounter Impression,만남의 인상
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,판매 자산의 비용
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,고객 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Course Scheduling Tool,Course Scheduling Tool,코스 일정 도구
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[긴급] 반복되는 % s을 % s에 생성하는 동안 오류가 발생했습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
 DocType: Land Unit,LInked Analysis,LInked 분석
 DocType: Item Tax,Tax Rate,세율
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,신청 기간은 2 개의 배정 기록에 걸쳐있을 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,신청 기간은 2 개의 배정 기록에 걸쳐있을 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% 수신
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,학생 그룹 만들기
 DocType: Volunteer,Weekends,주말
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,대변 메모 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,대변 메모 금액
 DocType: Setup Progress Action,Action Document,액션 문서
 DocType: Chapter Member,Website URL,웹 사이트 URL
 ,Finished Goods,완성품
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext 데모
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,항목 추가
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,상품 품질 검사 매개 변수
+DocType: Leave Application,Leave Approver Name,승인자 이름을 남겨주세요
 DocType: Depreciation Schedule,Schedule Date,일정 날짜
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",소득 공제 및 기타 급여의 구성 요소
 DocType: Packed Item,Packed Item,포장 된 상품
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,견적 요청
 DocType: Healthcare Settings,Require Lab Test Approval,실험실 테스트 승인 필요
 DocType: Salary Slip Timesheet,Working Hours,근무 시간
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,총 우수
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,총 우수
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
 DocType: Dosage Strength,Strength,힘
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,새로운 고객을 만들기
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,소모품 비용
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
 DocType: Student Log,Medical,의료
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,잃는 이유
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,잃는 이유
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,계정 번호 업데이트
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,리드 소유자는 납과 동일 할 수 없습니다
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,할당 된 금액은 조정되지 않은 금액보다 큰 수
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,미혼
 DocType: Salary Slip,Total Loan Repayment,총 대출 상환
 DocType: Account,Cost of Goods Sold,매출원가
-DocType: Subscription,Yearly,매년
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,비용 센터를 입력 해주십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,비용 센터를 입력 해주십시오
 DocType: Drug Prescription,Dosage,복용량
 DocType: Journal Entry Account,Sales Order,판매 주문
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,평균. 판매 비율
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,평균. 판매 비율
 DocType: Assessment Plan,Examiner Name,심사관 이름
 DocType: Lab Test Template,No Result,어떤 결과가 없습니다
 DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,첫 번째 회사 이름을 입력하십시오
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext 설명서를 읽어
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,캘린더의 모든 부서 멤버의 잎 표시
 DocType: Purchase Invoice,01-Sales Return,01- 판매 반품
 DocType: Account,Is Group,IS 그룹
 DocType: Email Digest,Pending Purchase Orders,구매 주문을 보류
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,필수 입력란 - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1}은 (는) {2} {3}과 관련이 없습니다.
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,해당 이메일의 일부로가는 소개 텍스트를 사용자 정의 할 수 있습니다.각 트랜잭션은 별도의 소개 텍스트가 있습니다.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},회사 {0}에 대한 기본 지불 계정을 설정하십시오.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},회사 {0}에 대한 기본 지불 계정을 설정하십시오.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},중지 된 작업 명령 {0}에 대해 트랜잭션이 허용되지 않습니다.
 DocType: Setup Progress Action,Min Doc Count,최소 문서 개수
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,판매 예약
 DocType: Packing Slip,From Package No.,패키지 번호에서
 DocType: Item Attribute,To Range,범위
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",자체 평가 방법이없는 일부 품목에 대한 거래가 있기 때문에 평가 방법을 변경할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,증권 및 예치금
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",자체 평가 방법이없는 일부 품목에 대한 거래가 있기 때문에 평가 방법을 변경할 수 없습니다.
 DocType: Student Report Generation Tool,Attended by Parents,학부모가 참석
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Patient,AB Positive,AB 긍정적
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,출석 기록.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,작업 표 기반의 급여에 대한 급여의 구성 요소.
 DocType: Sales Order Item,Used for Production Plan,생산 계획에 사용
-DocType: Employee Loan,Total Payment,총 결제
+DocType: Loan,Total Payment,총 결제
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,완료된 작업 주문에 대해서는 거래를 취소 할 수 없습니다.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작업 사이의 시간
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1}이 (가) 취소되어 작업을 완료 할 수 없습니다.
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,충분한 부품 작성하기
 DocType: POS Profile User,POS Profile User,POS 프로필 사용자
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,직접 수입
+DocType: Subscription Invoice,Subscription Invoice,구독 송장
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,직접 수입
 DocType: Patient Appointment,Date TIme,날짜 시간
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,관리 책임자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,관리 책임자
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,회사 및 세금 설정
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
 DocType: Codification Table,Codification Table,목록 화표
 DocType: Timesheet Detail,Hrs,시간
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,회사를 선택하세요
 DocType: Stock Entry Detail,Difference Account,차이 계정
 DocType: Purchase Invoice,Supplier GSTIN,공급 업체 GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,현금 흐름 매핑 템플릿
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
+DocType: Bank Guarantee,Providing,제공
 DocType: Account,Profit and Loss,이익과 손실
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","허용되지 않음, 필요시 랩 테스트 템플릿 구성"
 DocType: Patient,Risk Factors,위험 요소
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
 DocType: Healthcare Settings,Appointment Confirmation,약속 확인
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),결산 (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,안녕하세요
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,이동 항목
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",사용자 {1}의 pos 프로필 {0}에 기본값을 이미 설정했습니다. 친절하게 사용 중지 된 기본값입니다.
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,누적 값
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS 프로필에 지역이 필요합니다.
 DocType: Supplier,Prevent RFQs,RFQ 방지
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,확인 판매 주문
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},급여 전표가 {0}에서 {1}까지 기간 동안 제출되었습니다.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},급여 전표가 {0}에서 {1}까지 기간 동안 제출되었습니다.
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,배송 빌 날짜
 DocType: Production Plan,Production Plan,생산 계획
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,개설 송장 생성 도구
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,판매로 돌아 가기
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,참고 : 총 할당 잎 {0} 이미 승인 나뭇잎 이상이어야한다 {1} 기간 동안
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,일련 번호가없는 입력을 기준으로 트랜잭션의 수량 설정
 ,Total Stock Summary,총 주식 요약
 DocType: Announcement,Posted By,에 의해 게시 됨
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,회사를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,회사를 설정하십시오.
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Training Result Employee,Training Result Employee,교육 결과 직원
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
-DocType: Repayment Schedule,Principal Amount,원금
-DocType: Employee Loan Application,Total Payable Interest,총 채무이자
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,원금
+DocType: Loan Application,Total Payable Interest,총 채무이자
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},총 미납금 : {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,판매 송장 표
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
 DocType: Restaurant Reservation,Restaurant Reservation,식당 예약
 DocType: Land Unit,Land Unit Name,지상 유닛 이름
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,제안서 작성
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,제안서 작성
 DocType: Payment Entry Deduction,Payment Entry Deduction,결제 항목 공제
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,마무리
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,이메일을 통해 고객에게 알리십시오.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,이메일을 통해 고객에게 알리십시오.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,또 다른 판매 사람 {0} 같은 직원 ID 존재
 DocType: Employee Advance,Claimed Amount,청구 금액
 apps/erpnext/erpnext/config/education.py +180,Masters,석사
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",지불 게이트웨이 계정이 생성되지 수동으로 하나를 만드십시오.
 DocType: Supplier Scorecard,Per Year,연간
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB에 따라이 프로그램의 입학 자격이 없습니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Sales Invoice,Sales Taxes and Charges,판매 세금 및 요금
 DocType: Employee,Organization Profile,기업 프로필
 DocType: Vital Signs,Height (In Meter),높이 (미터로 표시)
 DocType: Student,Sibling Details,형제의 자세한 사항
 DocType: Vehicle Service,Vehicle Service,차량 서비스
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,자동 상황에 기초하여 상기 피드백 요청 트리거한다.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,자동 상황에 기초하여 상기 피드백 요청 트리거한다.
 DocType: Employee,Reason for Resignation,사임 이유
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,성과 평가를위한 템플릿.
 DocType: Sales Invoice,Credit Note Issued,신용 주 발행
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,유지 보수 일정
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","그런 가격 설정 규칙은 고객에 따라 필터링됩니다, 고객 그룹, 지역, 공급 업체, 공급 업체 유형, 캠페인, 판매 파트너 등"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,재고의 순 변화
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,직원 대출 관리
 DocType: Employee,Passport Number,여권 번호
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2와의 관계
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,관리자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,관리자
 DocType: Payment Entry,Payment From / To,/에서로 지불
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},창고 {0}에 계정을 설정하십시오.
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,재료 이송
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,에 대한 경로를 찾을 수 없습니다.
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),오프닝 (박사)
+DocType: Loan,Applicant,응모자
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},게시 타임 스탬프 이후 여야 {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,반복되는 문서 만들기
 ,GST Itemised Purchase Register,GST 품목별 구매 등록부
 DocType: Course Scheduling Tool,Reschedule,일정 변경
-DocType: Employee Loan,Total Interest Payable,채무 총 관심
+DocType: Loan,Total Interest Payable,채무 총 관심
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,착륙 비용 세금 및 요금
 DocType: Work Order Operation,Actual Start Time,실제 시작 시간
 DocType: BOM Operation,Operation Time,운영 시간
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,끝
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,베이스
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,베이스
 DocType: Timesheet,Total Billed Hours,총 청구 시간
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,금액을 상각
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,금액을 상각
 DocType: Leave Block List Allow,Allow User,사용자에게 허용
 DocType: Journal Entry,Bill No,청구 번호
 DocType: Company,Gain/Loss Account on Asset Disposal,자산 처분 이익 / 손실 계정
 DocType: Vehicle Log,Service Details,서비스 세부 정보
 DocType: Vehicle Log,Service Details,서비스 세부 정보
-DocType: Subscription,Quarterly,분기 별
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,그룹화 된
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,시간 시트
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,백 플러시 원료 기반에
 DocType: Sales Invoice,Port Code,포트 코드
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,창고 보관
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,창고 보관
 DocType: Lead,Lead is an Organization,리드는 조직입니다.
 DocType: Guardian Interest,Interest,관심
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,사전 판매
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,회계
 DocType: Vehicle,Odometer Value (Last),주행 거리계 값 (마지막)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,공급 업체 스코어 카드 기준의 템플릿.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,마케팅
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,마케팅
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,결제 항목이 이미 생성
 DocType: Request for Quotation,Get Suppliers,공급 업체 얻기
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,미리보기 연봉 슬립
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,미리보기 연봉 슬립
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,회원 자격이 30 일 이내에 만료되는 경우에만 갱신 할 수 있습니다.
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,현금 흐름 매퍼 문서를 설정 한 경우에만 선택하십시오.
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Supplier Scorecard,Per Week,한 주에
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,총 학생수
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,신용 카드 입력
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,회사 및 계정
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,값에서
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,값에서
 DocType: Asset Settings,Depreciation Options,감가 상각 옵션
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,잘못된 전기 시간
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,잘못된 전기 시간
 DocType: Lead,Campaign Name,캠페인 이름
 DocType: Hotel Room,Capacity,생산 능력
 DocType: Selling Settings,Close Opportunity After Days,일 후 닫기 기회
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,고객의 구매 주문 번호
 DocType: Budget,Budget Against,예산에 대하여
 DocType: Employee,Cell Number,핸드폰 번호
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,주어진 기준에 맞는 직원이 없습니다. 급여 전표가 아직 작성되지 않았는지 확인하십시오.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,주어진 기준에 맞는 직원이 없습니다. 급여 전표가 아직 작성되지 않았는지 확인하십시오.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,자동 자료 요청 생성
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,표를 선택하십시오.
 DocType: BOM,Website Specifications,웹 사이트 사양
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}은 (는) &#39;수신자&#39;의 이메일 주소가 잘못되었습니다.
 DocType: Special Test Items,Particulars,상세
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",여러 가격 규칙은 동일한 기준으로 존재 우선 순위를 할당하여 충돌을 해결하십시오. 가격 규칙 : {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Asset,Maintenance,유지
+DocType: Subscriber,Subscriber,구독자
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,프로젝트 상태를 업데이트하십시오.
 DocType: Item,Maximum sample quantity that can be retained,보존 할 수있는 최대 샘플 양
@@ -1077,26 +1073,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,쇼핑 카트에 대한 기본 설정
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,타임 슬롯 추가
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},분개를 통해 폐기 자산 {0}
-DocType: Employee Loan,Interest Income Account,이자 소득 계정
+DocType: Loan,Interest Income Account,이자 소득 계정
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,보낸 초대장 검토
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,생명 공학
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,사무실 유지 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,사무실 유지 비용
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,이동
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,이메일 계정 설정
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Asset Repair,Downtime,중단 시간
 DocType: Account,Liability,부채
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,학기 :
 DocType: Salary Detail,Do not include in total,총계에 포함시키지 말라.
 DocType: Company,Default Cost of Goods Sold Account,제품 판매 계정의 기본 비용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},샘플 수량 {0}은 (는) 수신 수량 {1}을 초과 할 수 없습니다.
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,가격 목록을 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Request for Quotation Supplier,Send Email,이메일 보내기
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 DocType: Item,Max Sample Quantity,최대 샘플 수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,아무 권한이 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,아무 권한이 없습니다
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,견적 요청 됨
 DocType: Vital Signs,Heart Rate / Pulse,심박수 / 맥박수
 DocType: Company,Default Bank Account,기본 은행 계좌
@@ -1107,12 +1103,11 @@
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,실험실 검사 및 활력 징후
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,검색된 직원이 없습니다
-DocType: Subscription,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,프로젝트 업데이트.
 DocType: SMS Center,All Customer Contact,모든 고객에게 연락
 DocType: Land Unit,Tree Details,트리 세부 사항
@@ -1162,7 +1157,6 @@
 DocType: Stock Entry,STE-,스테
 DocType: Upload Attendance,Import Attendance,수입 출석
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,모든 상품 그룹
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Work Order,Item To Manufacture,제조 품목에
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} 상태가 {2}이다
@@ -1176,7 +1170,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",저장 후 선택한 주소를 다시 선택한 경우 다시 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 DocType: Item,Hub Publishing Details,허브 출판 세부 정보
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;열기&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;열기&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
 DocType: Lab Test Template,Result Format,결과 형식
@@ -1186,7 +1180,7 @@
 DocType: Payroll Entry,Bimonthly,격월
 DocType: Vehicle Service,Brake Pad,브레이크 패드
 DocType: Fertilizer,Fertilizer Contents,비료 내용
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,연구 개발 (R & D)
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,연구 개발 (R & D)
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,빌 금액
 DocType: Company,Registration Details,등록 세부 사항
 DocType: Timesheet,Total Billed Amount,총 청구 금액
@@ -1200,7 +1194,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,판매 주문시 신용 한도 체크 무시
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,성능 평가.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","사용 쇼핑 카트가 활성화 될 때, &#39;쇼핑 카트에 사용&#39;및 장바구니 적어도 하나의 세금 규칙이 있어야한다"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","결제 항목 {0} 주문이이 송장에 미리으로 당겨 할 필요가있는 경우 {1}, 확인에 연결되어 있습니다."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","결제 항목 {0} 주문이이 송장에 미리으로 당겨 할 필요가있는 경우 {1}, 확인에 연결되어 있습니다."
 DocType: Sales Invoice Item,Stock Details,재고 상세
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,프로젝트 값
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,판매 시점
@@ -1234,7 +1228,7 @@
 DocType: Restaurant Table,Minimum Seating,최소 좌석 수
 DocType: Item Attribute,Item Attribute Values,항목 속성 값
 DocType: Examination Result,Examination Result,시험 결과
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,구입 영수증
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,통화 환율 마스터.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},참고없는 Doctype 중 하나 여야합니다 {0}
@@ -1242,15 +1236,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Work Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,전송 가능한 항목이 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,전송 가능한 항목이 없습니다.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),마감 (개업 + 총)
 DocType: Journal Entry,Depreciation Entry,감가 상각 항목
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 표준
 DocType: Pricing Rule,Rate or Discount,요금 또는 할인
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,필요한 수량
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,즐겨 찾기
 DocType: Hub Settings,Custom Data,맞춤 데이터
@@ -1262,9 +1256,9 @@
 DocType: Medical Code,Medical Code Standard,의료 코드 표준
 DocType: Soil Texture,Clay Composition (%),점토 조성 (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,작업을 할당하기 전에 저장하십시오.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,잔고액
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,잔고액
 DocType: Lab Test,Lab Technician,실험실 기술자
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,판매 가격 목록
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,판매 가격 목록
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",이 옵션을 선택하면 환자가 생성되고 환자에게 매핑됩니다. 환자 청구서는이 고객에 대해 작성됩니다. 환자를 생성하는 동안 기존 고객을 선택할 수도 있습니다.
 DocType: Bank Reconciliation,Account Currency,계정 통화
@@ -1272,16 +1266,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,회사에 라운드 오프 계정을 언급 해주십시오
 DocType: Purchase Receipt,Range,범위
 DocType: Supplier,Default Payable Accounts,기본 미지급금
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
 DocType: Item Barcode,Item Barcode,상품의 바코드
 DocType: Woocommerce Settings,Endpoints,종점
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",생성 될 수 있습니다. 지체 된 경우이 작업의 &quot;반복 월의 반복&quot;필드를 수동으로 변경해야합니다.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
 DocType: Share Transfer,From Folio No,Folio No에서
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
@@ -1316,16 +1308,17 @@
 DocType: Asset,Available-for-use Date,사용 가능 날짜
 DocType: Guardian,Guardian Name,보호자 이름
 DocType: Cheque Print Template,Has Print Format,인쇄 형식
-DocType: Employee Loan,Sanctioned,제재
+DocType: Loan,Sanctioned,제재
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,필수입니다. 환율 레코드가 생성되지 않았습니다.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
 DocType: Crop Cycle,Crop Cycle,자르기주기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;제품 번들&#39;항목, 창고, 일련 번호 및 배치에 대해 아니오 &#39;포장 목록&#39;테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 &#39;제품 번들&#39;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;제품 번들&#39;항목, 창고, 일련 번호 및 배치에 대해 아니오 &#39;포장 목록&#39;테이블에서 고려 될 것이다. 창고 및 배치 없음 어떤 &#39;제품 번들&#39;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
 DocType: Student Admission,Publish on website,웹 사이트에 게시
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,공급 업체 송장 날짜 게시 날짜보다 클 수 없습니다
+DocType: Subscription,Cancelation Date,취소 일
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
 DocType: Agriculture Task,Agriculture Task,농업 작업
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,간접 소득
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,간접 소득
 DocType: Student Attendance Tool,Student Attendance Tool,학생 출석 도구
 DocType: Restaurant Menu,Price List (Auto created),가격표 (자동 생성)
 DocType: Cheque Print Template,Date Settings,날짜 설정
@@ -1352,6 +1345,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,미터
 DocType: Workstation,Electricity Cost,전기 비용
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,랩 테스트 datetime은 콜렉션 datetime 이전 일 수 없습니다.
+DocType: Subscription Plan,Cost,비용
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
 DocType: Expense Claim,Total Advance Amount,총 대출 금액
 DocType: Delivery Stop,Estimated Arrival,예상 도착 시간
@@ -1363,15 +1357,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
 DocType: Timesheet Detail,Bill,계산서
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,화이트
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,화이트
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,확인란 목록에서 최대 하나의 옵션 만 선택할 수 있습니다.
 DocType: Purchase Invoice,Get Advances Paid,선불지급
 DocType: Item,Automatically Create New Batch,새로운 배치 자동 생성
 DocType: Item,Automatically Create New Batch,새로운 배치 자동 생성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0}을 {1} (행 {2})에 할당 중입니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,확인
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0}을 {1} (행 {2})에 할당 중입니다.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,확인
 DocType: Student Admission,Admission Start Date,입장료 시작 날짜
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,신입 사원
@@ -1387,7 +1381,7 @@
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
 DocType: Repayment Schedule,Balance Loan Amount,잔액 대출 금액
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,일정 코스
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,재고 옵션
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,재고 옵션
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,구매 주문에서 마지막 구매 내역을 가져 오지 못하게 설정
 DocType: Journal Entry Account,Expense Claim,비용 청구
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
@@ -1406,11 +1400,12 @@
 DocType: Packing Slip Item,Packing Slip Item,패킹 슬립 상품
 DocType: Purchase Invoice,Cash/Bank Account,현금 / 은행 계좌
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},지정하여 주시기 바랍니다 {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,변형 생성이 대기 중입니다.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}의 작업 요약
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,속성 테이블은 필수입니다
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,목록의 첫 번째 휴가 승인자는 기본 휴가 승인자로 설정됩니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Plan,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} 음수가 될 수 없습니다
 DocType: Training Event,Self-Study,자율 학습
@@ -1423,7 +1418,7 @@
 DocType: Workstation,Wages,임금
 DocType: Asset Maintenance,Maintenance Manager Name,유지 보수 관리자 이름
 DocType: Agriculture Task,Urgent,긴급한
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},테이블의 행 {0}에 대한 올바른 행 ID를 지정하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},테이블의 행 {0}에 대한 올바른 행 ID를 지정하십시오 {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,변수를 찾을 수 없습니다 :
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,숫자판에서 편집 할 입력란을 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,주식 원장이 생성되면 고정 자산 항목이 될 수 없습니다.
@@ -1435,7 +1430,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,품질 검사 템플릿 이름
 DocType: Project,First Email,첫 번째 이메일
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,판매 주문 / 완제품 창고에서 예약 창고
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,판매 금액
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,판매 금액
 DocType: Repayment Schedule,Interest Amount,이자 금액
 DocType: Serial No,Creation Document No,작성 문서 없음
 DocType: Share Transfer,Issue,이슈
@@ -1449,10 +1444,10 @@
 DocType: Tax Rule,Shipping State,배송 상태
 ,Projected Quantity as Source,소스로 예상 수량
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,배달 여행
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,배달 여행
 DocType: Student,A-,에이-
 DocType: Share Transfer,Transfer Type,전송 유형
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,영업 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,영업 비용
 DocType: Consultation,Diagnosis,진단
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
@@ -1461,12 +1456,13 @@
 DocType: Sales Partner,Implementation Partner,구현 파트너
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,우편 번호
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},판매 주문 {0}를 {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},대출 {0}에서이자 소득 계좌를 선택하십시오.
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
 DocType: Item,Default Supplier,기본 공급 업체
 DocType: Manufacturing Settings,Over Production Allowance Percentage,생산 수당 비율 이상
-DocType: Employee Loan,Repayment Schedule,상환 일정
+DocType: Loan,Repayment Schedule,상환 일정
 DocType: Shipping Rule Condition,Shipping Rule Condition,배송 규칙 조건
 DocType: Holiday List,Get Weekly Off Dates,날짜 매주 하차
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,종료 날짜는 시작 날짜보다 작을 수 없습니다
@@ -1481,7 +1477,7 @@
 DocType: Education Settings,Attendance Freeze Date,출석 정지 날짜
 DocType: Education Settings,Attendance Freeze Date,출석 정지 날짜
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,공급 업체의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,모든 제품보기
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,모든 제품보기
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),최소 납기 (일)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),최소 납기 (일)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,모든 BOM을
@@ -1490,14 +1486,16 @@
 DocType: Expense Claim,From Employee,직원에서
 DocType: Driver,Cellphone Number,핸드폰 번호
 DocType: Project,Monitor Progress,진행 상황 모니터링
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
 DocType: Journal Entry,Make Difference Entry,차액 항목을 만듭니다
+DocType: Supplier Quotation,Auto Repeat Section,자동 반복 섹션
 DocType: Upload Attendance,Attendance From Date,날짜부터 출석
 DocType: Appraisal Template Goal,Key Performance Area,핵심 성과 지역
 DocType: Program Enrollment,Transportation,교통비
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,잘못된 속성
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} 제출해야합니다
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
+DocType: Department Approver,Department Approver,부서 승인자
 DocType: SMS Center,Total Characters,전체 문자
 DocType: Employee Advance,Claimed,청구 됨
 DocType: Crop,Row Spacing,행 간격
@@ -1507,6 +1505,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,결제 조정 송장
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,공헌 %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","구매 주문이 필요한 경우 구매 설정에 따라 == &#39;예&#39;, 구매 송장 작성시 사용자가 {0} 항목에 대해 먼저 구매 주문서를 작성해야합니다."
+,HSN-wise-summary of outward supplies,외주 공급에 대한 HSN 방식 요약
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,당신의 참고를위한 회사의 등록 번호.세금 번호 등
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
@@ -1520,7 +1519,7 @@
 DocType: Setup Progress Action,Action Name,작업 이름
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,시작 년도
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN의 처음 2 자리 숫자는 주 번호 {0}과 일치해야합니다.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,현재 송장의 기간의 시작 날짜
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,용량 계획 오류
@@ -1538,26 +1537,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,필드는 생성시에만 복사됩니다.
 DocType: Setup Progress Action,Domains,도메인
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,관리
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,관리
 DocType: Cheque Print Template,Payer Settings,지불 설정
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
 DocType: Purchase Invoice,Is Return,돌아가요
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,주의
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',작업 &#39;{0}&#39;의 시작일이 종료일보다 큽니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,반품 / 직불 참고
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,반품 / 직불 참고
 DocType: Price List Country,Price List Country,가격 목록 나라
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,상품 코드 일련 번호 변경할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,상품 코드 일련 번호 변경할 수 없습니다
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM 변환 계수
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,배치 번호를 얻기 위해 상품 코드를 입력하세요
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
-DocType: Employee Loan,Partially Disbursed,부분적으로 지급
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,정보를 허가하십시오.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,정보를 허가하십시오.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,공급 업체 데이터베이스.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,취소되지 않은 구독은 다시 시작할 수 없습니다.
 DocType: Account,Balance Sheet,대차 대조표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
 DocType: Fee Validity,Valid Till,까지 유효
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,총 학부모 교사 회의
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
@@ -1570,7 +1569,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,선택한 고객에 대한 고객 그룹 변경은 허용되지 않습니다.
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,예상 도착 시간 업데이트.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,예상 도착 시간 업데이트.
 DocType: Program Enrollment Tool,Enrollment Details,등록 세부 정보
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,고객을 선택하십시오.
@@ -1591,18 +1590,20 @@
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Purchase Order,Group same items,그룹 동일한 항목
 DocType: Purchase Invoice,Disable Rounded Total,둥근 전체에게 사용 안 함
-DocType: Employee Loan Application,Repayment Info,상환 정보
+DocType: Department,Parent Department,학부모과
+DocType: Loan Application,Repayment Info,상환 정보
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'항목란'을 채워 주세요.
 DocType: Maintenance Team Member,Maintenance Role,유지 보수 역할
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,직원 설정
 DocType: Sales Order,SO-,그래서-
 DocType: Hotel Room Reservation,Hotel Reservation User,호텔 예약 사용자
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,첫 번째 접두사를 선택하세요
 DocType: Student,O-,영형-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,연구
+DocType: Subscription Settings,Subscription Settings,구독 설정
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,연구
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Announcement,All Students,모든 학생
@@ -1613,19 +1614,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Crop Cycle,Less than a year,1 년 미만
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,학생 휴대 전화 번호
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 DocType: Crop,Yield UOM,수익 UOM
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
 DocType: Item,Is Item from Hub,허브로부터의 아이템인가
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,행 {0} : 활동 유형은 필수입니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,배당금 지급
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,배당금 지급
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,회계 원장
 DocType: Stock Reconciliation,Difference Amount,차이 금액
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{1}에 출발하는 {0} 박사
 DocType: Purchase Invoice,Reverse Charge,역전
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,이익 잉여금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,이익 잉여금
 DocType: Purchase Invoice,05-Change in POS,05 - POS 변경
 DocType: Vehicle Log,Service Detail,서비스 세부 정보
 DocType: BOM,Item Description,항목 설명
@@ -1640,12 +1641,12 @@
 DocType: Opportunity Item,Opportunity Item,기회 상품
 ,Student and Guardian Contact Details,학생 및 보호자 연락처 세부 사항
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,행 {0} : 공급 업체 {0} 이메일 주소는 이메일을 보낼 필요
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,임시 열기
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,임시 열기
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,허브보기
 ,Employee Leave Balance,직원 허가 밸런스
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 DocType: Patient Appointment,More Info,추가 정보
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},행 항목에 필요한 평가 비율 {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},행 항목에 필요한 평가 비율 {0}
 DocType: Supplier Scorecard,Scorecard Actions,스코어 카드 작업
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,예 : 컴퓨터 과학 석사
 DocType: Purchase Invoice,Rejected Warehouse,거부 창고
@@ -1655,7 +1656,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,에
 DocType: Supplier Quotation Item,Lead Time in days,일 리드 타임
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,미지급금 합계
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},에 {0}에서 급여의 지급 {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},에 {0}에서 급여의 지급 {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
@@ -1664,9 +1665,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,실험실 처방전
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,작은
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,작은
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,개설 송장 생성 도구 항목
 DocType: Education Settings,Employee Number,직원 수
+DocType: Subscription Settings,Cancel Invoice After Grace Period,유예 기간 후 인보이스 취소
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
 DocType: Project,% Completed,% 완료
 ,Invoiced Amount (Exculsive Tax),송장에 청구 된 금액 (Exculsive 세금)
@@ -1680,7 +1682,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,실험실 테스트 날짜 시간
 DocType: Email Digest,Add Quote,견적 추가
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,간접 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 DocType: Agriculture Analysis Criteria,Agriculture,농업
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,싱크 마스터 데이터
@@ -1711,16 +1713,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,자본 장비
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,먼저 상품 코드를 설정하십시오.
 DocType: Item,ITEM-,목-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
+DocType: Subscription Plan,Billing Interval Count,청구 간격
 DocType: Sales Invoice Item,Edit Description,편집 설명
 DocType: Antibiotic,Antibiotic,항생 물질
 ,Team Updates,팀 업데이트
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,인쇄 형식 만들기
@@ -1746,7 +1749,7 @@
 DocType: POS Item Group,POS Item Group,POS 항목 그룹
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,대체 품목은 품목 코드와 같을 수 없습니다.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - 임시 평가 마무리
 DocType: Salary Slip,Bank Account No.,은행 계좌 번호
@@ -1763,7 +1766,7 @@
 DocType: BOM Operation,Workstation,워크스테이션
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,견적 공급 업체 요청
 DocType: Healthcare Settings,Registration Message,등록 메시지
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,하드웨어
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,하드웨어
 DocType: Prescription Dosage,Prescription Dosage,처방전 복용량
 DocType: Attendance,HR Manager,HR 관리자
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,회사를 선택하세요
@@ -1794,7 +1797,7 @@
 DocType: Project,Start and End Dates,시작 날짜를 종료
 ,Delivered Items To Be Billed,청구에 전달 항목
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},열기 BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
 DocType: Authorization Rule,Average Discount,평균 할인
 DocType: Project Update,Great/Quickly,좋아요 / 빨리
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1803,8 +1806,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,배치 항목에 대한 배치를 선택하십시오.
 DocType: Asset,Depreciation Schedules,감가 상각 스케줄
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,다음 계정은 GST 설정에서 선택할 수 있습니다.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,다음 계정은 GST 설정에서 선택할 수 있습니다.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
 DocType: Payment Request,Transaction Currency,거래 통화
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},에서 {0} | {1} {2}
@@ -1815,6 +1818,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,평균 일일 보내는
 DocType: POS Profile,Campaign,캠페인
 DocType: Supplier,Name and Type,이름 및 유형
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야
 DocType: Physician,Contacts and Address,연락처 및 주소
 DocType: Purchase Invoice,Contact Person,담당자
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜'는'예상 종료 날짜 ' 이전이어야 합니다.
@@ -1828,19 +1832,20 @@
 DocType: Student Admission,Eligibility and Details,자격 및 세부 정보
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,고정 자산의 순 변화
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,날짜 시간에서
 DocType: Email Digest,For Company,회사
 apps/erpnext/erpnext/config/support.py +17,Communication log.,통신 로그.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","견적 요청은 더 체크 포털 설정을 위해, 포털에서 액세스를 사용할 수 없습니다."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,공급 업체 스코어 카드 채점 변수
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,금액을 구매
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,금액을 구매
 DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,수업 일정을 만드는 중에 오류가 발생했습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,목록의 첫 번째 비용 승인자가 기본 비용 승인자로 설정됩니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100보다 큰 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1861,15 +1866,16 @@
 DocType: Package Code,Package Code,패키지 코드
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,도제
 DocType: Purchase Invoice,Company GSTIN,회사 GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","문자열로 품목 마스터에서 가져온이 분야에 저장 세금 세부 테이블.
  세금 및 요금에 사용"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","계정이 동결 된 경우, 항목은 제한된 사용자에게 허용됩니다."
 DocType: Email Digest,Bank Balance,은행 잔액
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,신청서를 제출할 때 승인자를 필수로 둡니다.
 DocType: Job Opening,"Job profile, qualifications required etc.","필요한 작업 프로필, 자격 등"
 DocType: Journal Entry Account,Account Balance,계정 잔액
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,거래에 대한 세금 규칙.
@@ -1897,15 +1903,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,{0} 행의 지불 기간이 중복되었을 수 있습니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),농업 (베타)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,포장 명세서
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,사무실 임대
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,포장 명세서
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,사무실 임대
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
 DocType: Disease,Common Name,공통 이름
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
 DocType: Vital Signs,Blood Pressure,혈압
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,분석자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,분석자
 DocType: Item,Inventory,재고
 DocType: Item,Sales Details,판매 세부 사항
 DocType: Quality Inspection,QI-,QI-
@@ -1915,15 +1921,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,학생 그룹의 학생들을위한 등록 된 과정 확인
 DocType: Notification Control,Expense Claim Rejected,비용 청구는 거부
 DocType: Item,Item Attribute,항목 속성
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,통치 체제
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,통치 체제
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,경비 청구서 {0} 이미 차량 로그인 존재
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,연구소 이름
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,상환 금액을 입력하세요
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,상환 금액을 입력하세요
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,항목 변형
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Services (서비스)
 DocType: HR Settings,Email Salary Slip to Employee,직원에게 이메일 급여 슬립
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,가능한 공급 업체를 선택
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,가능한 공급 업체를 선택
 DocType: Sales Invoice,Source,소스
 DocType: Customer,"Select, to make the customer searchable with these fields",고객을이 필드로 검색 가능하게하려면 선택하십시오.
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,쇼 폐쇄
@@ -1940,7 +1946,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,포장 명세서 (들) 취소
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,투자의 현금 흐름
 DocType: Program Course,Program Course,프로그램 과정
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 DocType: Homepage,Company Tagline for website homepage,웹 사이트 홈페이지에 대한 회사의 태그 라인
 DocType: Item Group,Item Group Name,항목 그룹 이름
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,촬영
@@ -1970,10 +1976,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,회원 정보
 DocType: Leave Block List,Block Holidays on important days.,중요한 일에 블록 휴일.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),모든 필요한 결과 값을 입력하십시오.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,미수금 요약
-DocType: Employee Loan,Monthly Repayment Amount,월별 상환 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,미수금 요약
+DocType: Loan,Monthly Repayment Amount,월별 상환 금액
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,송장 열기
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
 DocType: UOM,UOM Name,UOM 이름
 DocType: GST HSN Code,HSN Code,HSN 코드
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,기부액
@@ -1995,7 +2001,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},사용자 {0}은 (는) 의사 {1}에게 이미 할당되었습니다.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,상자
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,가능한 공급 업체
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,가능한 공급 업체
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,예산 월간 배분
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),의료 (베타)
@@ -2023,7 +2030,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
-DocType: Employee Loan,Repayment Method,상환 방법
+DocType: Loan,Repayment Method,상환 방법
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",선택하면 홈 페이지는 웹 사이트에 대한 기본 항목 그룹이 될 것입니다
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,회사 경비 주장한다.
@@ -2032,7 +2039,7 @@
 DocType: Asset Maintenance Task,Certificate Required,인증서 필요
 DocType: Company,Default Holiday List,휴일 목록 기본
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},행 {0}의 시간과 시간에서 {1}과 중첩된다 {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,재고 부채
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,재고 부채
 DocType: Purchase Invoice,Supplier Warehouse,공급 업체 창고
 DocType: Opportunity,Contact Mobile No,연락처 모바일 없음
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,회사 선택
@@ -2040,7 +2047,7 @@
 DocType: Student Report Generation Tool,Print Section,단면 인쇄
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,사용자 {0}에게는 기본 POS 프로파일이 없습니다. 이 사용자에 대해 {1} 행의 기본값을 확인하십시오.
 DocType: Student Group,Set 0 for no limit,제한 없음 0 설정
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,행 {idx} : 개설 {invoice_type} 인보이스를 작성하려면 {field}이 (가) 필요합니다.
 DocType: Customer,Primary Address and Contact Detail,기본 주소 및 연락처 세부 정보
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,지불 이메일을 다시 보내
@@ -2051,10 +2058,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,하나 이상의 도메인을 선택하십시오.
 DocType: Dependent Task,Dependent Task,종속 작업
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: SMS Center,Receiver List,수신기 목록
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,검색 항목
 DocType: Payment Schedule,Payment Amount,결제 금액
@@ -2064,7 +2071,7 @@
 DocType: Assessment Plan,Grading Scale,등급 규모
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,이미 완료
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,손에 주식
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,손에 주식
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,성공적인 가져 오기!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
@@ -2075,17 +2082,16 @@
 DocType: Quotation Item,Quotation Item,견적 상품
 DocType: Customer,Customer POS Id,고객 POS ID
 DocType: Account,Account Name,계정 이름
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,일련 번호 {0} 수량 {1} 일부가 될 수 없습니다
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,일련 번호 {0} 수량 {1} 일부가 될 수 없습니다
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Woocommerce Server URL을 입력하십시오.
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
 DocType: Share Balance,To No,~하려면
-DocType: Subscription,Reference Document,참조 문헌
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지되었습니다.
 DocType: Accounts Settings,Credit Controller,신용 컨트롤러
-DocType: Grant Application,Applicant Type,신청자 유형
+DocType: Loan,Applicant Type,신청자 유형
 DocType: Purchase Invoice,03-Deficiency in services,03 - 서비스 부족
 DocType: Delivery Note,Vehicle Dispatch Date,차량 파견 날짜
 DocType: Healthcare Settings,Default Medical Code Standard,기본 의료 코드 표준
@@ -2096,13 +2102,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0} % 청구
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,인적 자원
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,인적 자원
 DocType: Lead,Upper Income,위 소득
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,받지 않다
 DocType: Journal Entry Account,Debit in Company Currency,회사 통화에서 직불
 DocType: BOM Item,BOM Item,BOM 상품
 DocType: Appraisal,For Employee,직원에 대한
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,지급 항목을 만듭니다
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,지급 항목을 만듭니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
 DocType: Company,Default Values,기본값
 DocType: Membership,INR,INR
@@ -2132,10 +2138,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0보다 커야합니다
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,재고 있음
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,재고 있음
 DocType: Manufacturing Settings,Capacity Planning For (Days),(일)에 대한 용량 계획
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,획득
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,필수 입력란 - 프로그램
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,필수 입력란 - 프로그램
 DocType: Special Test Template,Result Component,결과 구성 요소
@@ -2156,7 +2162,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,잎으로 잎에서 휴일을 포함
 DocType: Sales Invoice,Packed Items,포장 항목
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,일련 번호에 대한 보증 청구
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;합계&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;합계&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,장바구니 사용
 DocType: Employee,Permanent Address,영구 주소
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2174,10 +2180,10 @@
 DocType: Selling Settings,Selling Settings,판매 설정
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,액션 확인
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,온라인 경매
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,이행
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,쇼핑 카트에보기
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,마케팅 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,표준 기준을 만들 수 없습니다. 조건의 이름을 변경하십시오.
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
@@ -2200,9 +2206,9 @@
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Material Request,Transferred,이전 됨
 DocType: Vehicle,Doors,문
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext 설치가 완료!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext 설치가 완료!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,환자 등록 수수료 지불
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,주식 거래 후 속성을 변경할 수 없습니다. 새 품목을 만들고 새 품목에 재고를 양도하십시오.
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,주식 거래 후 속성을 변경할 수 없습니다. 새 품목을 만들고 새 품목에 재고를 양도하십시오.
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,세금 분열
 DocType: Packing Slip,PS-,추신-
@@ -2238,12 +2244,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,화해 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Purchase Invoice Item,Batch No,배치 없음
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,직원 진출
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 DocType: Grant Application,Assessment  Mark (Out of 10),평가 표시 (10 점 만점)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 모바일 없음
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,주요 기능
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
@@ -2252,15 +2259,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Email Digest,Annual Expenses,연간 비용
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
 DocType: Sales Team,Contribution to Net Total,인터넷 전체에 기여
 DocType: Sales Invoice Item,Customer's Item Code,고객의 상품 코드
 DocType: Stock Reconciliation,Stock Reconciliation,재고 조정
 DocType: Territory,Territory Name,지역 이름
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,구독에 동일한 결제주기의 계획 만 가질 수 있습니다.
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,작업을 위해 신청자.
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
@@ -2271,10 +2279,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,감정
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,교육 이벤트
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,리드 소스 별 리드 추적
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,들어 오세요
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,들어 오세요
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,유지 관리 로그
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,상품 또는웨어 하우스를 기반으로 필터를 설정하십시오
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),이 패키지의 순 중량. (항목의 순 중량의 합으로 자동으로 계산)
@@ -2282,11 +2290,11 @@
 DocType: Sales Order,To Deliver and Bill,제공 및 법안
 DocType: Student Group,Instructors,강사
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,공유 관리
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,지불
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,지불
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",창고 {0}이 (가) 어떤 계정에도 연결되어 있지 않습니다. 창고 기록에서 계정을 언급하거나 {1} 회사에서 기본 인벤토리 계정을 설정하십시오.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,주문 관리
 DocType: Work Order Operation,Actual Time and Cost,실제 시간과 비용
@@ -2296,7 +2304,7 @@
 DocType: Student Leave Application,Student Leave Application,학생 휴가 신청
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,켜기
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,판매 상품을 동시에 번들.
@@ -2306,7 +2314,7 @@
 DocType: Item,Barcodes,바코드
 DocType: Hub Category,Hub Node,허브 노드
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,준
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,준
 DocType: Asset Movement,Asset Movement,자산 이동
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,작업 명령 {0}을 제출해야합니다.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,새로운 장바구니
@@ -2324,13 +2332,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,결제 통화는 기본 회사의 통화 또는 당좌 계좌 통화와 같아야합니다.
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 DocType: Soil Texture,Loam,옥토
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,행 {0} : 만기일은 게시일 이전 일 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,행 {0} : 만기일은 게시일 이전 일 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,지불 항목을 만듭니다
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
 ,Sales Invoice Trends,견적서 동향
 DocType: Leave Application,Apply / Approve Leaves,잎을 승인 / 적용
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,에 대한
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"충전 타입 또는 '이전 행 전체', '이전 행의 양에'인 경우에만 행을 참조 할 수 있습니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"충전 타입 또는 '이전 행 전체', '이전 행의 양에'인 경우에만 행을 참조 할 수 있습니다"
 DocType: Sales Order Item,Delivery Warehouse,배송 창고
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,금융 코스트 센터의 나무.
 DocType: Serial No,Delivery Document No,납품 문서 없음
@@ -2344,7 +2351,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,자재 소비가 제조 설정에서 설정되지 않았습니다.
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1} 행의 {0} 항목이 {2} 이상으로 과다 보급 될 수 없습니다. 초과 청구를 허용하려면 재고 설정에서 설정하십시오.
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1} 행의 {0} 항목이 {2} 이상으로 과다 보급 될 수 없습니다. 초과 청구를 허용하려면 재고 설정에서 설정하십시오.
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,응답 업데이트
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
@@ -2356,12 +2363,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,먼저 프로그램을 선택하십시오.
 DocType: Patient Appointment,Patient Age,환자 연령
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,프로젝트 관리
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,연속 번호 {0}이 (가) 이미 반환되었습니다.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,연속 번호 {0}이 (가) 이미 반환되었습니다.
 DocType: Supplier,Supplier of Goods or Services.,제품 또는 서비스의 공급.
 DocType: Budget,Fiscal Year,회계 연도
 DocType: Asset Maintenance Log,Planned,계획된
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,상담 요금을 예약하기 위해 환자에게 설정되지 않은 경우 사용할 기본 채권 계정.
 DocType: Vehicle Log,Fuel Price,연료 가격
+DocType: Bank Guarantee,Margin Money,증거금
 DocType: Budget,Budget,예산
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,세트 열기
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
@@ -2375,16 +2383,16 @@
 DocType: Lead,Follow Up,후속 조치
 DocType: Item,Is Sales Item,판매 상품입니다
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,항목 그룹 트리
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} 항목을 직렬 제의 체크 항목 마스터에 대한 설정이 없습니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} 항목을 직렬 제의 체크 항목 마스터에 대한 설정이 없습니다
 DocType: Maintenance Visit,Maintenance Time,유지 시간
 ,Amount to Deliver,금액 제공하는
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},동일한 항목이 여러 번 입력되었습니다. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간의 시작 날짜는 용어가 연결되는 학술 올해의 올해의 시작 날짜보다 이전이 될 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,오류가 발생했습니다.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,직원 {0}이 (가) {1}에 {2}에서 {3} 사이에 이미 신청했습니다 :
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,오류가 발생했습니다.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,직원 {0}이 (가) {1}에 {2}에서 {3} 사이에 이미 신청했습니다 :
 DocType: Guardian,Guardian Interests,가디언 관심
 DocType: Naming Series,Current Value,현재 값
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
 DocType: Education Settings,Instructor Records to be created by,에 의해 생성되는 강사 기록
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 생성
 DocType: GST Account,GST Account,GST 계정
@@ -2404,8 +2412,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,즐겨 찾기에 추가됨
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,위의 선정 기준에 대한 급여 전표가 발견되지 않았거나 이미 제출 된 급여 전표
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,관세 및 세금
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,위의 선정 기준에 대한 급여 전표가 발견되지 않았거나 이미 제출 된 급여 전표
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,관세 및 세금
 DocType: Projects Settings,Projects Settings,프로젝트 설정
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,참고 날짜를 입력 해주세요
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 지급 항목으로 필터링 할 수 없습니다 {1}
@@ -2415,27 +2423,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,항목 그룹의 나무.
 DocType: Production Plan,Total Produced Qty,총 생산 수량
 DocType: Payroll Entry,Get Employee Details,직원 세부 정보 얻기
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
 DocType: Asset,Sold,판매
 ,Item-wise Purchase History,상품 현명한 구입 내역
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 DocType: Sales Invoice Payment,Base Amount (Company Currency),자료의 양 (회사 통화)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,원자재
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,원자재
 DocType: Payment Reconciliation Payment,Reference Row,참고 행
 DocType: Installation Note,Installation Time,설치 시간
 DocType: Sales Invoice,Accounting Details,회계 세부 사항
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,이 회사의 모든 거래를 삭제
 DocType: Patient,O Positive,긍정적 인 O
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,투자
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,할당
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,허용 기준
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,위의 표에 자료 요청을 입력하세요
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,분개에 대해 상환하지 않음
 DocType: Item Attribute,Attribute Name,속성 이름
 DocType: BOM,Show In Website,웹 사이트에 표시
 DocType: Shopping Cart Settings,Show Quantity in Website,웹 사이트에서 수량보기
-DocType: Employee Loan Application,Total Payable Amount,총 채무 금액
+DocType: Loan Application,Total Payable Amount,총 채무 금액
 DocType: Task,Expected Time (in hours),(시간) 예상 시간
 DocType: Item Reorder,Check in (group),(그룹)에서 확인
 DocType: Soil Texture,Silt,미사
@@ -2454,7 +2463,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,결제하기
 DocType: Room,Room Name,객실 이름
 DocType: Prescription Duration,Prescription Duration,처방 기간
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","휴가 밸런스 이미 캐리 전달 미래두고 할당 레코드되었습니다로서, {0} 전에 취소 / 적용될 수 없다 남겨 {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","휴가 밸런스 이미 캐리 전달 미래두고 할당 레코드되었습니다로서, {0} 전에 취소 / 적용될 수 없다 남겨 {1}"
 DocType: Activity Cost,Costing Rate,원가 계산 속도
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,고객 주소 및 연락처
 ,Campaign Efficiency,캠페인 효율성
@@ -2474,11 +2483,11 @@
 DocType: Chapter,Chapter,장
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,페어링
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 POS 송장에서 기본 계정이 자동으로 업데이트됩니다.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
 DocType: Asset,Depreciation Schedule,감가 상각 일정
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,영업 파트너 주소 및 연락처
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,하프 데이 데이트 날짜부터 현재까지 사이에 있어야한다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,하프 데이 데이트 날짜부터 현재까지 사이에 있어야한다
 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} 회사에 기본 코스트 센터를 설정하십시오.
 DocType: Item,Has Batch No,일괄 없음에게 있습니다
@@ -2496,7 +2505,6 @@
 DocType: Task,Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해)
 DocType: Soil Texture,Soil Type,토양 유형
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,새로운 메시지
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2516,7 +2524,7 @@
 DocType: Hub Category,Hub Category,허브 카테고리
 DocType: Purchase Invoice,SEZ,경제 특구
 DocType: Purchase Receipt,Vehicle Number,차량 번호
-DocType: Employee Loan,Loan Amount,대출금
+DocType: Loan,Loan Amount,대출금
 DocType: Student Report Generation Tool,Add Letterhead,레터 헤드 추가
 DocType: Program Enrollment,Self-Driving Vehicle,자가 운전 차량
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,공급 업체 스코어 카드 대기 중
@@ -2545,9 +2553,9 @@
 DocType: Cash Flow Mapper,Position,위치
 DocType: Patient,Patient Details,환자 세부 정보
 DocType: Patient,B Positive,B 양성
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,약어는 비워둘수 없습니다
 DocType: Patient Medical Record,Patient Medical Record,환자의 의료 기록
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,스포츠
@@ -2555,8 +2563,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,실제 총
 DocType: Lab Test UOM,Test UOM,UOM 테스트
 DocType: Student Siblings,Student Siblings,학생 형제 자매
+DocType: Subscription Plan Detail,Subscription Plan Detail,구독 계획 세부 정보
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,단위
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,회사를 지정하십시오
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,회사를 지정하십시오
 ,Customer Acquisition and Loyalty,고객 확보 및 충성도
 DocType: Asset Maintenance Task,Maintenance Task,유지 보수 작업
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,GST 설정에서 B2C 한도를 설정하십시오.
@@ -2571,6 +2580,7 @@
 ,BOM Search,BOM 검색
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),총 소비 된 자재 원가 (재고 입력을 통한)
 DocType: Hub Settings,Company Registered,회사 등록
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,날짜는 날짜보다 작을 수 없습니다.
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",이 창고에서 재고가있는 허브를 기반으로 &quot;재고 있음&quot;또는 &quot;재고 없음&quot;을 게시하십시오.
 DocType: Vehicle,Fuel Type,연료 형태
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,회사에 통화를 지정하십시오
@@ -2578,17 +2588,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},일괄 재고 잔액은 {0}이 될 것이다 부정적인 {1}의 창고에서 상품 {2}에 대한 {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
 DocType: Email Digest,Pending Sales Orders,판매 주문을 보류
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 DocType: Employee,Create User Permission,사용자 권한 생성
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Healthcare Settings,Remind Before,미리 알림
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
 DocType: Salary Component,Deduction,공제
 DocType: Item,Retain Sample,샘플 보유
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
 DocType: Stock Reconciliation Item,Amount Difference,금액 차이
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
 DocType: Territory,Classification of Customers by region,지역별 고객의 분류
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,생산 단계
@@ -2598,8 +2609,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,계산 된 은행 잔고 잔액
 DocType: Normal Test Template,Normal Test Template,일반 테스트 템플릿
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,사용하지 않는 사용자
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,인용
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,수신 RFQ를 견적으로 설정할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,인용
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,수신 RFQ를 견적으로 설정할 수 없습니다.
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,총 공제
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,계좌 통화로 인쇄 할 계좌를 선택하십시오
@@ -2607,7 +2618,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,이것은이 환자와의 거래를 기반으로합니다. 자세한 내용은 아래 타임 라인을 참조하십시오.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,비용 업데이트
 DocType: Patient,Date of Birth,생년월일
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,공급 업체 성과표 설정
@@ -2618,14 +2629,15 @@
 DocType: Work Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,작업 설명
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,작업 설명
 DocType: Student Applicant,Applied,적용된
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,재 오픈
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,재 오픈
 DocType: Sales Invoice Item,Qty as per Stock UOM,수량 재고 UOM 당
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 이름
 DocType: Purchase Invoice,02-Post Sale Discount,02- 포스트 세일 할인
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","판매 캠페인을 추적.리드, 인용문을 추적, 판매 주문 등 캠페인에서 투자 수익을 측정합니다."
+DocType: Department Approver,Approver,승인자
 ,SO Qty,SO 수량
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,To Shareholder 필드는 비워 둘 수 없습니다.
 DocType: Guardian,Work Address,직장 주소
@@ -2639,21 +2651,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),총 할당 된 금액 (회사 통화)
 DocType: Purchase Order Item,To be delivered to customer,고객에게 전달 될
 DocType: BOM,Scrap Material Cost,스크랩 재료 비용
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
 DocType: Grant Application,Email Notification Sent,보낸 전자 메일 알림
 DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","품목 코드, 창고, 수량은 행에 필요합니다."
-DocType: Pricing Rule,Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","품목 코드, 창고, 수량은 행에 필요합니다."
+DocType: Bank Guarantee,Supplier,공급 업체
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,지불 세부 사항 표시
 DocType: Consultation,Consultation Time,상담 시간
 DocType: C-Form,Quarter,지구
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,기타 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,기타 비용
 DocType: Global Defaults,Default Company,기본 회사
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,은행 이름
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-위
-DocType: Employee Loan,Employee Loan Account,직원 대출 계정
 DocType: Leave Application,Total Leave Days,총 허가 일
 DocType: Email Digest,Note: Email will not be sent to disabled users,참고 : 전자 메일을 사용할 사용자에게 전송되지 않습니다
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,상호 작용 수
@@ -2669,7 +2680,7 @@
 DocType: Vital Signs,Weight (In Kilogram),무게 (킬로그램 단위)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chapters / chapter_name은 장을 저장 한 후 공백으로 자동 설정됩니다.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST 설정에서 GST 계정을 설정하십시오.
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST 설정에서 GST 계정을 설정하십시오.
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,사업의 종류
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,새로운 구매 비용
@@ -2678,12 +2689,13 @@
 DocType: Grant Application,Grant Description,교부금 설명
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
 DocType: Student Guardian,Others,기타사항
+DocType: Subscription,Discounts,할인
 DocType: Payment Entry,Unallocated Amount,할당되지 않은 금액
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.
 DocType: POS Profile,Taxes and Charges,세금과 요금
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","제품 또는, 구입 판매 또는 재고 유지 서비스."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,더 이상 업데이트되지
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,여기에는이 설정에 연결된 모든 스코어 카드가 포함됩니다.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,하위 항목은 제품 번들이어야한다. 항목을 제거`{0}`와 저장하세요
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,은행
@@ -2692,21 +2704,24 @@
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설치&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Bin,Ordered Quantity,주문 수량
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Grading Scale,Grading Scale Intervals,등급 스케일 간격
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,1 년 이익
+DocType: Bank Guarantee,Name of Bank,은행 이름
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2}에 대한 회계 항목 만 통화 할 수있다 : {3}
 DocType: Fee Schedule,In Process,처리 중
 DocType: Authorization Rule,Itemwise Discount,Itemwise 할인
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,금융 계정의 나무.
+DocType: Bank Guarantee,Reference Document Type,참조 문서 유형
 DocType: Cash Flow Mapping,Cash Flow Mapping,현금 흐름 매핑
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
 DocType: Account,Fixed Asset,고정 자산
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,직렬화 된 재고
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,기본 연락처에 이메일이 없습니다.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,비밀 생성
-DocType: Employee Loan,Account Info,계정 정보
+DocType: Loan,Account Info,계정 정보
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
 DocType: Fees,Include Payment,지불 포함
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} 학생 그룹이 생성되었습니다.
@@ -2714,24 +2729,24 @@
 DocType: Sales Invoice,Total Billing Amount,총 결제 금액
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,학비 구조 및 학생 그룹 {0}의 프로그램은 다릅니다.
 DocType: Fee Schedule,Receivable Account,채권 계정
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
 DocType: Quotation Item,Stock Balance,재고 대차
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,지불에 판매 주문
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,최고 경영자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,최고 경영자
 DocType: Purchase Invoice,With Payment of Tax,세금 납부와 함께
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,공급 업체를위한 TRIPLICATE
 DocType: Land Unit,Is Container,용기인가?
 DocType: Crop Cycle,This will be day 1 of the crop cycle,이것은 작물주기의 1 일이 될 것입니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,올바른 계정을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,올바른 계정을 선택하세요
 DocType: Purchase Invoice Item,Weight UOM,무게 UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Folio 번호가있는 사용 가능한 주주 목록
 DocType: Salary Structure Employee,Salary Structure Employee,급여 구조의 직원
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,변형 속성 표시
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,변형 속성 표시
 DocType: Student,Blood Group,혈액 그룹
 DocType: Course,Course Name,코스 명
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,특정 직원의 휴가 응용 프로그램을 승인 할 수 있습니다 사용자
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,사무용품
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,사무용품
 DocType: Purchase Invoice Item,Qty,수량
 DocType: Fiscal Year,Companies,회사
 DocType: Supplier Scorecard,Scoring Setup,채점 설정
@@ -2750,7 +2765,7 @@
 DocType: Stock Entry,Total Incoming Value,총 수신 값
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,직불 카드에 대한이 필요합니다
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,구매 가격 목록
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,공급자 스코어 카드 변수의 템플릿.
 DocType: Job Offer Term,Offer Term,행사 기간
 DocType: Asset,Quality Manager,품질 관리자
@@ -2762,13 +2777,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},총 미지급 : {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM 웹 사이트 운영
 DocType: Supplier Scorecard,Supplier Score,공급자 점수
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,총 청구 AMT 사의
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,총 청구 AMT 사의
 DocType: Supplier,Warn RFQs,RFQ 경고
 DocType: BOM,Conversion Rate,전환율
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,제품 검색
 DocType: Assessment Plan,To Time,시간
 DocType: Authorization Rule,Approving Role (above authorized value),(승인 된 값 이상) 역할을 승인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
+DocType: Loan,Total Amount Paid,총 지불 금액
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,유급 학생 지원자에게 의무적 인 학생 입학을 선택하십시오.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,가격을 공개하려면 가격표를 선택하십시오.
@@ -2778,19 +2794,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,가격 목록 {0} 비활성화
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},행 {0} : 완성 된 수량보다 더 많은 수 없습니다 {1} 조작 {2}
 DocType: Manufacturing Settings,Allow Overtime,초과 근무 허용
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",주식 조정을 사용하여 일련 번호가 매겨진 항목 {0}을 (를) 업데이트 할 수 없습니다. 재고 항목을 사용하십시오.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",주식 조정을 사용하여 일련 번호가 매겨진 항목 {0}을 (를) 업데이트 할 수 없습니다. 재고 항목을 사용하십시오.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",주식 조정을 사용하여 일련 번호가 매겨진 항목 {0}을 (를) 업데이트 할 수 없습니다. 재고 항목을 사용하십시오.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",주식 조정을 사용하여 일련 번호가 매겨진 항목 {0}을 (를) 업데이트 할 수 없습니다. 재고 항목을 사용하십시오.
 DocType: Training Event Employee,Training Event Employee,교육 이벤트 직원
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,최대 샘플 - 배치 {1} 및 항목 {2}에 대해 {0}을 보유 할 수 있습니다.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,시간 슬롯 추가
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} 항목에 필요한 일련 번호 {1}. 당신이 제공 한 {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,현재 평가 비율
 DocType: Training Event,Advance,전진
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,다시 되풀이하는 것.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless 지불 게이트웨이 설정
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,교환 이득 / 손실
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,교환 이득 / 손실
 DocType: Opportunity,Lost Reason,분실 된 이유
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},행 # {0} : 계정 {1}이 (가) 회사 {2}에 속해 있지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},행 # {0} : 계정 {1}이 (가) 회사 {2}에 속해 있지 않습니다.
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0}을 (를) 찾을 수 없습니다.
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
@@ -2809,7 +2824,6 @@
 DocType: Bin,Actual Quantity,실제 수량
 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,발견되지 일련 번호 {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},구독이 {0}되었습니다.
 DocType: Fee Schedule Program,Fee Schedule Program,요금표 프로그램
 DocType: Fee Schedule Program,Student Batch,학생 배치
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,학생을
@@ -2823,14 +2837,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,전자 상거래 GSTIN
 DocType: Sales Order,Not Delivered,전달되지 않음
 ,Bank Clearance Summary,은행 정리 요약
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
 DocType: Appraisal Goal,Appraisal Goal,평가목표
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,카테고리 제안?
 DocType: Stock Reconciliation Item,Current Amount,현재 양
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,건물
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,건물
 DocType: Fee Schedule,Fee Structure,요금 구조
 DocType: Timesheet Detail,Costing Amount,원가 계산 금액
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Student Admission Program,Application Fee,신청비
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,급여 슬립 제출
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,항목에 대한 Maxiumm 할인은 {0} {1} %에게 is
@@ -2838,12 +2851,13 @@
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
 DocType: SMS Log,Sender Name,보낸 사람 이름
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,농업 분석 기준
+DocType: HR Settings,Leave Approval Notification Template,승인 알림 템플릿 남기기
 DocType: POS Profile,[Select],[선택]
 DocType: Vital Signs,Blood Pressure (diastolic),혈압 (확장기)
 DocType: SMS Log,Sent To,전송
 DocType: Agriculture Task,Holiday Management,휴일 관리
 DocType: Payment Request,Make Sales Invoice,견적서에게 확인
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,소프트웨어
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,소프트웨어
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},의사 {0}은 (는) {1}에서 사용할 수 없습니다.
@@ -2861,7 +2875,7 @@
 DocType: Employee,New Workplace,새로운 직장
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,물질 소비
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,휴일로 설정
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},바코드 가진 항목이 없습니다 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},바코드 가진 항목이 없습니다 {0}
 DocType: Normal Test Items,Require Result Value,결과 값 필요
 DocType: Item,Show a slideshow at the top of the page,페이지의 상단에 슬라이드 쇼보기
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOM을
@@ -2876,19 +2890,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
 DocType: Leave Block List,Allow Users,사용자에게 허용
 DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,반복
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,현금 흐름 매핑 템플릿 세부 정보
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,대출 관리
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,별도의 소득을 추적하고 제품 수직 또는 부서에 대한 비용.
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,쇼 급여 슬립
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,전송 자료
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,쇼 급여 슬립
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,전송 자료
 DocType: Fees,Send Payment Request,지불 요청 보내기
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 DocType: Water Analysis,Origin,유래
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,저장 한 후 반복 설정하십시오
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
@@ -2903,14 +2917,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,소득세 책임
 DocType: Grading Scale Interval,Grade Description,등급 설명
 DocType: Stock Entry,Purchase Receipt No,구입 영수증 없음
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,계약금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,계약금
 DocType: Sales Invoice, Shipping Bill Number,배송비 번호
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,추적
 DocType: Asset Maintenance Log,Actions performed,수행 된 작업
 DocType: Cash Flow Mapper,Section Leader,섹션 리더
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),자금의 출처 (부채)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),자금의 출처 (부채)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,종업원
+DocType: Bank Guarantee,Fixed Deposit Number,고정 예금 번호
 DocType: Asset Repair,Failure Date,실패 날짜
 DocType: Sample Collection,Collected Time,수집 시간
 DocType: Company,Sales Monthly History,판매 월별 기록
@@ -2927,10 +2942,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,이 약속을 취소 하시겠습니까?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,호텔 객실 가격 패키지
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,판매 파이프 라인
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,구독 업데이트 가져 오기
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},계정 {0}이 (가) 계정 모드에서 회사 {1}과 (과) 일치하지 않습니다 : {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,코스:
@@ -2940,7 +2956,7 @@
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,작업 주문이 생성되지 않았습니다.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,직원의 급여 슬립은 {0} 이미이 기간 동안 생성
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,제약
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,제약
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,구입 한 항목의 비용
 DocType: Selling Settings,Sales Order Required,판매 주문 필수
 DocType: Purchase Invoice,Credit To,신용에
@@ -2958,7 +2974,7 @@
 DocType: Request for Quotation Supplier,No Quote,견적 없음
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Gateway Account,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,채권에 순 변경
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,보상 오프
 DocType: Job Offer,Accepted,허용
@@ -2971,7 +2987,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,검색 결과
 DocType: Room,Room Number,방 번호
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},잘못된 참조 {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},잘못된 참조 {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 DocType: Journal Entry Account,Payroll Entry,급여 항목
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,요금 기록보기
@@ -2981,7 +2997,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Lab Test Sample,Lab Test Sample,실험실 테스트 샘플
 DocType: Item Variant Settings,Allow Rename Attribute Value,특성 값 이름 바꾸기 허용
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,빠른 분개
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
 DocType: Restaurant,Invoice Series Prefix,송장 시리즈 접두사
 DocType: Employee,Previous Work Experience,이전 작업 경험
@@ -2989,8 +3005,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google지도 통합이 사용 설정되지 않았습니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,회원 자격 만료일
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} 반환 문서에 부정적인해야합니다
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} 반환 문서에 부정적인해야합니다
 ,Minutes to First Response for Issues,문제에 대한 첫 번째 응답에 분
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,측정 단위
 DocType: Fiscal Year,Year End Date,연도 종료 날짜
 DocType: Task Depends On,Task Depends On,작업에 따라 다릅니다
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,기회
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,기회
 DocType: Operation,Default Workstation,기본 워크 스테이션
 DocType: Notification Control,Expense Claim Approved Message,경비 청구서 승인 메시지
 DocType: Payment Entry,Deductions or Loss,공제 또는 손실
@@ -3047,7 +3064,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,승인 된 휴가 신청 기록과 일치하지 않습니다 지불하지 않고 남겨주세요
 DocType: Campaign,Campaign-.####,캠페인.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
 DocType: Membership,USD,미화
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,송장 생성
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,잔액
@@ -3056,7 +3073,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,바코드 {0}은 (는) 유효한 {1} 코드가 아닙니다.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,최종 년도
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,따옴표 / 리드 %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Driver,Driver,운전사
 DocType: Vital Signs,Nutrition Values,영양가
 DocType: Lab Test Template,Is billable,청구 가능
@@ -3067,7 +3084,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),실제 시작 날짜 (시간 시트를 통해)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,고령화 범위 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,총 대출 금액은 총 청구 금액보다 클 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,총 대출 금액은 총 청구 금액보다 클 수 없습니다.
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3122,7 +3139,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,속성 값 선택
 DocType: Purchase Invoice,Reason For Issuing document,문서 발행 사유
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,재고 입력 {0} 미작성
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,재고 입력 {0} 미작성
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,다음으로 연락으로는 리드 이메일 주소와 동일 할 수 없습니다
 DocType: Tax Rule,Billing City,결제시
@@ -3139,7 +3156,8 @@
 DocType: Warranty Claim,Service Address,서비스 주소
 DocType: Asset Maintenance Task,Calibration,구경 측정
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0}은 회사 휴일입니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,가구 및 비품
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,상태 알림 남기기
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,가구 및 비품
 DocType: Item,Manufacture,제조
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,설치 회사
 ,Lab Test Report,실험실 테스트 보고서
@@ -3155,7 +3173,6 @@
 DocType: Crop,Planting Area,심기 지역
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Installation Note Item,Installed Qty,설치 수량
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,이는 이메일 주소의 일부 잘못된 이메일 주소 때문일 수 있습니다.
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,당신이 추가했습니다.
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,교육 결과
@@ -3165,16 +3182,17 @@
 DocType: Products Settings,Products per Page,페이지 당 제품 수
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,조직 분기의 마스터.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,문제 신고
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,광열비
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,광열비
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 위
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,행 번호 {0} 저널 항목 {1} 계정이없는이 {2} 또는 이미 다른 쿠폰에 대해 일치
 DocType: Supplier Scorecard Criteria,Criteria Weight,기준 무게
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,승인 통지 남기기
 DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
 DocType: Payroll Entry,Salary Slip Based on Timesheet,표를 바탕으로 급여 슬립
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,구매율
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,구매율
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 DocType: Payment Entry,Payment Type,지불 유형
@@ -3197,6 +3215,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,쇼핑 카트 설정
 DocType: Journal Entry,Accounting Entries,회계 항목
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","&#39;가격&#39;에 대해 가격 결정 규칙을 선택한 경우 가격 목록을 덮어 씁니다. 가격 결정 률은 최종 요금이므로 더 이상의 할인은 적용되지 않습니다. 따라서 판매 주문, 구매 주문 등과 같은 거래에서는 &#39;가격 목록&#39;필드가 아닌 &#39;요율&#39;필드에서 가져옵니다."
+DocType: Journal Entry,Paid Loan,유료 대출
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},중복 입력입니다..권한 부여 규칙을 확인하시기 바랍니다 {0}
 DocType: Journal Entry Account,Reference Due Date,참고 마감일
 DocType: Purchase Order,Ref SQ,참조 SQ
@@ -3213,7 +3232,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 apps/erpnext/erpnext/config/hr.py +93,Payroll,급여
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
 DocType: Patient Service Unit,Parent Service Unit,학부모 서비스 부서
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,사용자 확인
 DocType: Packing Slip,Identification of the package for the delivery (for print),(프린트) 전달을위한 패키지의 식별
@@ -3232,7 +3251,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,수익 계정
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,배달
 DocType: Volunteer,Weekdays,평일
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: Restaurant Menu,Restaurant Menu,식당 메뉴
@@ -3240,7 +3259,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,영구 인벤토리에 대한 기본 재고 계정 설정
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,영구 인벤토리에 대한 기본 재고 계정 설정
 DocType: Item Reorder,Material Request Type,자료 요청 유형
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Grant Review 이메일 보내기
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","로컬 저장이 가득, 저장하지 않은"
@@ -3248,10 +3267,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,객실 용량
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},항목 {0}에 이미 레코드가 있습니다.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,참조
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,이전에 생성 된 송장에 대한 기록을 잃게됩니다. 이 구독을 다시 시작 하시겠습니까?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,등록비
 DocType: Budget,Cost Center,비용 센터
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,상품권 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,상품권 #
 DocType: Notification Control,Purchase Order Message,구매 주문 메시지
 DocType: Tax Rule,Shipping Country,배송 국가
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,판매 거래에서 고객의 세금 아이디를 숨기기
@@ -3260,20 +3280,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고 재고 만 입력 / 배달 주 / 구매 영수증을 통해 변경 될 수 있습니다
 DocType: Employee Education,Class / Percentage,클래스 / 비율
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,마케팅 및 영업 책임자
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,마케팅 및 영업 책임자
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,소득세
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,편지지로 이동
+DocType: Subscription,Cancel At End Of Period,기간 만료시 취소
 DocType: Item Supplier,Item Supplier,부품 공급 업체
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,전송 항목을 선택하지 않았습니다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,전송 항목을 선택하지 않았습니다.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,재고 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
 DocType: Vehicle,Electric,전기 같은
 DocType: Task,% Progress,%의 진행
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,자산 처분 이익 / 손실
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,자산 처분 이익 / 손실
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",아래 표에서 &quot;승인 됨&quot;상태의 학생 지원자 만 선택됩니다.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,계정 {0}의 계정 번호를 사용할 수 없습니다. <br> 차트 계정을 올바르게 설정하십시오.
 DocType: Task,Depends on Tasks,작업에 따라 달라집니다
@@ -3288,6 +3309,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,재고에
 DocType: Volunteer,Volunteer Skills,자원 봉사 기술
 DocType: Appraisal,HR User,HR 사용자
+DocType: Bank Guarantee,Reference Document Name,참조 문서 이름
 DocType: Purchase Invoice,Taxes and Charges Deducted,차감 세금과 요금
 apps/erpnext/erpnext/hooks.py +142,Issues,문제
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},상태 중 하나 여야합니다 {0}
@@ -3301,7 +3323,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,아주 큰
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,아주 큰
+DocType: Loan,Loan Application,대출 지원서
 DocType: Crop,Scientific Name,과학적인 이름
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,전체 잎
 DocType: Customer,"Reselect, if the chosen contact is edited after save",저장 후 선택한 연락처를 다시 선택한 경우 다시 선택하십시오.
@@ -3310,13 +3333,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,수표 번호
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,지역정보 검색
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),대출 및 선수금 (자산)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,외상매출금
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,큰
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,큰
 DocType: Homepage Featured Product,Homepage Featured Product,홈페이지 주요 제품
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,모든 평가 그룹
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,모든 평가 그룹
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,새로운웨어 하우스 이름
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),총 {0} ({1})
 DocType: C-Form Invoice Detail,Territory,국가
@@ -3337,9 +3360,10 @@
 DocType: Fees,Fees,수수료
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,환율이 통화를 다른 통화로 지정
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,견적 {0} 취소
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,총 발행 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,총 발행 금액
 DocType: Sales Partner,Targets,대상
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,회사 정보 파일에 SIREN 번호를 등록하십시오.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 DocType: Price List,Price List Master,가격 목록 마스터
 DocType: GST Account,CESS Account,CESS 계정
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
@@ -3348,6 +3372,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,환자 선택
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,매개 변수 이름
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,만 제출할 수 있습니다 &#39;거부&#39; &#39;승인&#39;상태와 응용 프로그램을 남겨주세요
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},학생 그룹 이름은 행의 필수 {0}
 DocType: Homepage,Products to be shown on website homepage,제품 웹 사이트 홈페이지에 표시하기
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
@@ -3393,14 +3418,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,모든 청구 시간에 대해 이미 생성 된 송장
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},이름 오류 : {0}
 DocType: Cash Flow Mapping,Is Finance Cost,금융 비용인가?
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
 DocType: Packing Slip,If more than one package of the same type (for print),만약 (프린트) 동일한 유형의 하나 이상의 패키지
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,레스토랑 설정에서 기본 고객을 설정하십시오.
 ,Salary Register,연봉 회원 가입
 DocType: Warehouse,Parent Warehouse,부모 창고
-DocType: C-Form Invoice Detail,Net Total,합계액
+DocType: Subscription,Net Total,합계액
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},항목 {0} 및 프로젝트 {1}에 대한 기본 BOM을 찾을 수 없습니다
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,다양한 대출 유형을 정의
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,다양한 대출 유형을 정의
 DocType: Bin,FCFS Rate,FCFS 평가
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,잔액
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(분에) 시간
@@ -3432,11 +3457,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,루트 계정은 그룹이어야합니다
 DocType: Drug Prescription,Drug Prescription,약물 처방전
 DocType: Fees,FEE.,보수.
-DocType: Employee Loan,Repaid/Closed,/ 상환 휴무
+DocType: Loan,Repaid/Closed,/ 상환 휴무
 DocType: Item,Total Projected Qty,총 예상 수량
 DocType: Monthly Distribution,Distribution Name,배포 이름
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",{1} {2}에 대한 계정 항목을 수행해야하는 항목 {0}에 대한 평가율이 없습니다. 항목이 {1}의 0 평가 항목으로 거래중인 경우 {1} 항목 테이블에 언급하십시오. 그렇지 않은 경우 항목에 대한 재고 트랜잭션을 생성하거나 항목 레코드에 평가율을 언급 한 다음이 항목을 제출 / 취소하십시오.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Course,Course Code,코스 코드
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: POS Settings,Use POS in Offline Mode,오프라인 모드에서 POS 사용
@@ -3456,16 +3480,15 @@
 DocType: Purchase Invoice,Deemed Export,간주 수출
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,할인 비율은 가격 목록에 대해 또는 전체 가격 목록에 하나를 적용 할 수 있습니다.
-DocType: Subscription,Half-yearly,반년마다
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Lab Test,LabTest Approver,LabTest 승인자
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,이미 평가 기준 {}을 (를) 평가했습니다.
 DocType: Vehicle Service,Engine Oil,엔진 오일
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},생성 된 작업 순서 : {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},생성 된 작업 순서 : {0}
 DocType: Sales Invoice,Sales Team1,판매 Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
-DocType: Employee Loan,Loan Details,대출 세부 사항
+DocType: Loan,Loan Details,대출 세부 사항
 DocType: Company,Default Inventory Account,기본 재고 계정
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio 번호가 일치하지 않습니다.
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
@@ -3477,19 +3500,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,농작물이 성장하고있는 모든 육상 유닛에 대한 링크
 DocType: Account,Root Type,루트 유형
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},행 번호 {0} : 이상 반환 할 수 없습니다 {1} 항목에 대한 {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},행 번호 {0} : 이상 반환 할 수 없습니다 {1} 항목에 대한 {2}
 DocType: Item Group,Show this slideshow at the top of the page,페이지 상단에이 슬라이드 쇼보기
 DocType: BOM,Item UOM,상품 UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),할인 금액 후 세액 (회사 통화)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
 DocType: Cheque Print Template,Primary Settings,기본 설정
 DocType: Purchase Invoice,Select Supplier Address,선택 공급 업체 주소
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,직원 추가
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,직원 추가
 DocType: Purchase Invoice Item,Quality Inspection,품질 검사
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,매우 작은
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,매우 작은
 DocType: Company,Standard Template,표준 템플릿
 DocType: Training Event,Theory,이론
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
@@ -3509,11 +3532,10 @@
 DocType: SMS Log,No of Sent SMS,보낸 SMS 없음
 DocType: Antibiotic,Healthcare Administrator,의료 관리자
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,목표 설정
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설치&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Dosage Strength,Dosage Strength,투약 강도
 DocType: Account,Expense Account,비용 계정
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,소프트웨어
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,컬러
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,컬러
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,평가 계획 기준
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,유효 기간은 필수 항목입니다.
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,구매 주문 방지
@@ -3526,18 +3548,18 @@
 DocType: Patient,Personal and Social History,개인 및 사회 역사
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,사용자가 {0}이 (가) 생성되었습니다.
 DocType: Fee Schedule,Fee Breakup for each student,각 학생에 대한 비용 해체
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,코드 변경
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,디젤
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,가격리스트 통화 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,가격리스트 통화 선택하지
 DocType: Purchase Invoice,Availed ITC Cess,제공되는 ITC Cess
 ,Student Monthly Attendance Sheet,학생 월별 출석 시트
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,판매에만 적용되는 배송 규칙
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,프로젝트 시작 날짜
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,까지
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,까지
 DocType: Rename Tool,Rename Log,로그인에게 이름 바꾸기
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,학생 그룹 또는 코스 일정은 필수
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,학생 그룹 또는 코스 일정은 필수
@@ -3558,7 +3580,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,구매 또는 판매하는 제품 또는 서비스를 나열하십시오.
 DocType: Water Analysis,Storage Temperature,보관 온도
 DocType: Employee Attendance Tool,Unmarked Attendance,표시되지 않은 출석
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,연구원
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,연구원
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,프로그램 등록 도구 학생
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},시작 날짜가 작업 {0}의 종료 날짜보다 작아야합니다.
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,이름이나 이메일은 필수입니다
@@ -3571,7 +3593,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 기재되어 있으며이 공급 업체에 대한 RFQ는주의해서 발행해야합니다.
 DocType: Chapter,Non Profit Manager,비영리 관리자
 DocType: BOM,Total Cost(Company Currency),총 비용 (기업 통화)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,일련 번호 {0} 생성
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,일련 번호 {0} 생성
 DocType: Homepage,Company Description for website homepage,웹 사이트 홈페이지에 대한 회사 설명
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","고객의 편의를 위해, 이러한 코드는 송장 배송 메모와 같은 인쇄 포맷으로 사용될 수있다"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier 이름
@@ -3581,11 +3603,10 @@
 DocType: Employee,You can enter any date manually,당신은 수동으로 날짜를 입력 할 수 있습니다
 DocType: Healthcare Settings,Result Printed,결과 인쇄 됨
 DocType: Asset Category Account,Depreciation Expense Account,감가 상각 비용 계정
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,수습 기간
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},보기 {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,수습 기간
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Project,Total Costing Amount (via Timesheets),총 원가 계산 금액 (작업 표를 통해)
-DocType: Employee Advance,Expense Approver,지출 승인
+DocType: Department,Expense Approver,지출 승인
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 DocType: Project,Hourly,매시간
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,그룹에 비 그룹
@@ -3595,7 +3616,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,날짜 시간에
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
 DocType: Accounts Settings,Make Payment via Journal Entry,분개를 통해 결제하기
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,인쇄에
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,인쇄에
 DocType: Item,Inspection Required before Delivery,검사 배달 전에 필수
 DocType: Item,Inspection Required before Purchase,검사 구매하기 전에 필수
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,보류 활동
@@ -3605,7 +3626,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,최소 주문 수량
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,조직
 DocType: Fee Component,Fees Category,요금 종류
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,직원에게 알리기
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
@@ -3615,7 +3636,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,재정렬 수준
 DocType: Company,Chart Of Accounts Template,계정 템플릿의 차트
 DocType: Attendance,Attendance Date,출석 날짜
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},상품 가격은 {0}에서 가격 목록 업데이트 {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},상품 가격은 {0}에서 가격 목록 업데이트 {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
 DocType: Purchase Invoice Item,Accepted Warehouse,허용 창고
@@ -3623,10 +3644,11 @@
 DocType: Item,Valuation Method,평가 방법
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,마크 반나절
 DocType: Sales Invoice,Sales Team,판매 팀
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,항목을 중복
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,항목을 중복
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,제출하기 전에 수혜자의 이름을 입력하십시오.
 DocType: Program Enrollment Tool,Get Students,학생들 가져 오기
 DocType: Serial No,Under Warranty,보증에 따른
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[오류]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[오류]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,당신이 판매 주문을 저장하면 단어에서 볼 수 있습니다.
 ,Employee Birthday,직원 생일
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,수리 완료 날짜를 선택하십시오.
@@ -3645,7 +3667,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,하위 계약 용으로 예약 됨
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
 DocType: Shopping Cart Settings,Orders,명령
-DocType: Employee Leave Approver,Leave Approver,승인자를 남겨
+DocType: Department,Leave Approver,승인자를 남겨
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,일괄 처리를 선택하십시오.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,평가 그룹 이름
@@ -3690,7 +3712,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,허브 추적 항목
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,수취인 본래
 DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,이 이메일은 자동 생성되었습니다.
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
 DocType: Program Enrollment,Boarding Student,기숙 학생
 DocType: Asset,Expected Value After Useful Life,내용 연수 후 예상 값
@@ -3715,22 +3736,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},출석 기록은 {0} 학생에 존재 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,감가 상각으로 인한 자산의 처분을 제거하고
-DocType: Member,Member,회원
+DocType: Loan,Member,회원
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,주소를 관리
 DocType: Work Order Item,Work Order Item,작업 주문 항목
 DocType: Pricing Rule,Item Code,상품 코드
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
 DocType: Agriculture Analysis Criteria,Agriculture Manager,농업 관리자
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
 DocType: Supplier Scorecard Period,Variables,변수
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),결산 (박사)
 DocType: Cheque Print Template,Cheque Size,수표 크기
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,일련 번호 {0} 재고가없는
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,일련 번호 {0} 재고가없는
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,거래를 판매에 대한 세금 템플릿.
 DocType: Sales Invoice,Write Off Outstanding Amount,잔액을 떨어져 쓰기
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},계정 {0}이 회사 {1}과 (과) 일치하지 않습니다.
@@ -3739,7 +3760,6 @@
 DocType: Stock Settings,Default Stock UOM,기본 재고 UOM
 DocType: Asset,Number of Depreciations Booked,감가 상각의 수 예약
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,총 수량
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},직원 대출에 대하여 : {0}
 DocType: Landed Cost Item,Receipt Document,영수증 문서
 DocType: Employee Education,School/University,학교 / 대학
 DocType: Payment Request,Reference Details,참조 세부 사항
@@ -3750,7 +3770,7 @@
 DocType: Asset,Double Declining Balance,이중 체감
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,청산 주문이 취소 할 수 없습니다. 취소 열다.
 DocType: Student Guardian,Father,아버지
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 DocType: Attendance,On Leave,휴가로
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,업데이트 받기
@@ -3764,10 +3784,10 @@
 DocType: Lead,Lower Income,낮은 소득
 DocType: Restaurant Order Entry,Current Order,현재 주문
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,프로그램으로 이동
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},행 {0} # 할당 된 금액 {1}은 청구되지 않은 금액 {2}보다 클 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},행 {0} # 할당 된 금액 {1}은 청구되지 않은 금액 {2}보다 클 수 없습니다.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자' 이전이어야 합니다
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
@@ -3790,7 +3810,6 @@
 DocType: Payment Terms Template,Payment Terms,지불 조건
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,분
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 DocType: Chapter,Meetup Embed HTML,Meetup HTML 포함
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,공급 업체로 이동
@@ -3810,30 +3829,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,지불 요청을 보낼 학생의 이메일 ID를 설정하십시오.
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,지불 요청을 보낼 학생의 이메일 ID를 설정하십시오.
 DocType: Patient,Medical History,의료 기록
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,당좌 차월 계정
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,당좌 차월 계정
 DocType: Patient,Patient ID,환자 ID
 DocType: Physician Schedule,Schedule Name,일정 이름
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,급여 슬립을
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,모든 공급 업체 추가
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,모든 공급 업체 추가
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,행 번호 {0} : 할당 된 금액은 미납 금액을 초과 할 수 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,찾아 BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,보안 대출
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,보안 대출
 DocType: Purchase Invoice,Edit Posting Date and Time,편집 게시 날짜 및 시간
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},자산 카테고리 {0} 또는 회사의 감가 상각 관련 계정을 설정하십시오 {1}
 DocType: Lab Test Groups,Normal Range,정상 범위
 DocType: Academic Term,Academic Year,학년
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,판매 가능
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,잔액 지분
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,잔액 지분
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,엔
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,남은
 DocType: Appraisal,Appraisal,펑가
+DocType: Loan,Loan Account,대출 계좌
 DocType: Purchase Invoice,GST Details,GST 세부 정보
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},공급 업체에 보낸 이메일 {0}
 DocType: Item,Default Sales Unit of Measure,기본 판매 단위
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,학년:
+DocType: Subscription,Past Due Date,연체 기한
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},항목 {0}에 대해 대체 항목을 설정할 수 없습니다.
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,날짜는 반복된다
@@ -3846,7 +3867,7 @@
 DocType: Patient Appointment,Patient Appointment,환자 예약
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,역할을 승인하면 규칙이 적용됩니다 역할로 동일 할 수 없습니다
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,이 이메일 다이제스트 수신 거부
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,공급자 제공
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,공급자 제공
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} 항목에 대해 {0}을 (를) 찾을 수 없습니다.
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,코스로 이동
 DocType: Accounts Settings,Show Inclusive Tax In Print,인쇄시 포함 세금 표시
@@ -3854,10 +3875,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,보낸 메시지
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,자식 노드와 계좌 원장은로 설정 될 수 없다
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,가격 목록의 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
 DocType: Physician,Physician Schedules,의사 스케줄
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,총 선불 금액은 총 승인 금액보다 클 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,총 선불 금액은 총 승인 금액보다 클 수 없습니다.
 DocType: Salary Slip,Hour Rate,시간 비율
 DocType: Stock Settings,Item Naming By,상품 이름 지정으로
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
@@ -3875,6 +3897,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},이상 재고 거래는 이전 업데이트 할 수 없습니다 {0}
 DocType: BOM,Inspection Required,검사 필수
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,제출하기 전에 은행 보증 번호를 입력하십시오.
 DocType: Driving License Category,Class,수업
 DocType: Sales Order,Fully Billed,완전 청구
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,항목 템플릿에 대한 작업 지시서를 작성할 수 없습니다.
@@ -3885,7 +3908,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Assessment Plan,Program,프로그램
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 DocType: Serial No,Is Cancelled,취소된다
 DocType: Student Group,Group Based On,그룹 기반
 DocType: Student Group,Group Based On,그룹 기반
@@ -3897,9 +3919,10 @@
 DocType: Cheque Print Template,Cheque Height,수표 높이
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
 DocType: Setup Progress,Setup Progress,설치 진행률
+DocType: Expense Claim,Approval Status,승인 상태
 DocType: Hub Settings,Publish Items to Hub,허브에 항목을 게시
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},값에서 행의 값보다 작아야합니다 {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,송금
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,송금
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,모두 확인
 ,Issued Items Against Work Order,작업 지시서와 관련하여 발급 된 품목
 DocType: Vehicle Log,Invoice Ref,송장 참조
@@ -3930,12 +3953,11 @@
 DocType: Customs Tariff Number,Tariff Number,관세 번호
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP 창고에서 사용 가능한 수량
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,예상
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
 DocType: Notification Control,Quotation Message,견적 메시지
-DocType: Employee Loan,Employee Loan Application,직원 대출 신청
 DocType: Issue,Opening Date,Opening 날짜
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,환자를 먼저 저장하십시오.
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,환자를 먼저 저장하십시오.
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,출석이 성공적으로 표시되었습니다.
 DocType: Program Enrollment,Public Transport,대중 교통
 DocType: Soil Texture,Silt Composition (%),실트 조성 (%)
@@ -3954,7 +3976,7 @@
 ,Item Balance (Simple),상품 잔액 (단순)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,공급 업체에 의해 제기 된 지폐입니다.
 DocType: POS Profile,Write Off Account,감액계정
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,차변 메모 Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,차변 메모 Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
@@ -3977,6 +3999,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,판매 주문 날짜
 DocType: Sales Invoice Item,Delivered Qty,납품 수량
 DocType: Assessment Plan,Assessment Plan,평가 계획
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,역 분개 항목
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,고객 {0}이 (가) 생성되었습니다.
 DocType: Stock Settings,Limit Percent,제한 비율
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,현재 어떤 창고에서도 재고가 없습니다.
@@ -3990,14 +4013,15 @@
 DocType: Journal Entry,Stock Entry,재고 입력
 DocType: Payment Entry,Payment References,지불 참조
 DocType: C-Form,C-FORM-,C-서식 -
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","간격 필드의 간격 수 (예 : 간격이 &#39;일&#39;이고 Billing Interval Count가 3 인 경우, 3 일마다 송장이 생성 됨)"
 DocType: Vehicle,Insurance Details,보험의 자세한 사항
 DocType: Account,Payable,지급
 DocType: Share Balance,Share Type,공유 유형
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,상환 기간을 입력하세요
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,상환 기간을 입력하세요
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),채무자 ({0})
 DocType: Pricing Rule,Margin,마진
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,신규 고객
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,매출 총 이익 %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,매출 총 이익 %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS 프로파일 변경
 DocType: Bank Reconciliation Detail,Clearance Date,통관 날짜
@@ -4007,10 +4031,11 @@
 DocType: Lead,Address Desc,제품 설명에게 주소
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,파티는 필수입니다
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},다른 행에 중복 만기일이있는 행이 발견되었습니다 : {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},다른 행에 중복 만기일이있는 행이 발견되었습니다 : {list}
 DocType: Topic,Topic Name,항목 이름
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,HR 설정에서 승인 알림을 남기기위한 기본 템플릿을 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,판매 또는 구매의이어야 하나를 선택해야합니다
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,직원을 선택하여 직원을 진급시킬 수 있습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,직원을 선택하여 직원을 진급시킬 수 있습니다.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,유효한 날짜를 선택하십시오.
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,비즈니스의 성격을 선택합니다.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4029,7 +4054,7 @@
 DocType: Asset Movement,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,공유 원장
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,판매 송장 {0}이 생성되었습니다.
 DocType: Employee,Confirmation Date,확인 일자
 DocType: C-Form,Total Invoiced Amount,총 송장 금액
@@ -4038,7 +4063,7 @@
 DocType: Account,Accumulated Depreciation,감가 상각 누계액
 DocType: Supplier Scorecard Scoring Standing,Standing Name,서있는 이름
 DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
-DocType: Employee Loan Application,Required by Date,날짜에 필요한
+DocType: Loan Application,Required by Date,날짜에 필요한
 DocType: Lead,Lead Owner,리드 소유자
 DocType: Production Plan,Sales Orders Detail,판매 주문 세부 정보
 DocType: Bin,Requested Quantity,요청한 수량
@@ -4051,10 +4076,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,총 급여 - 총 공제 - 대출 상환
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,현재 BOM 및 새로운 BOM은 동일 할 수 없습니다
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,급여 슬립 ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,여러 변형
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0} % 배달
+DocType: Subscription,Trial Period Start Date,평가판 시작일
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,다른 사용자로 로그인하십시오.
@@ -4075,12 +4101,11 @@
 DocType: Student Guardian,Student Guardian,가디언
 DocType: Member,Member Name,회원 명
 DocType: Stock Settings,Use Naming Series,이름 지정 시리즈 사용
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,구독 정보
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 DocType: Membership,Payment Details,지불 세부 사항
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM 평가
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",작업 지시 중단을 취소 할 수 없습니다. 취소하려면 먼저 취소하십시오.
 DocType: Asset,Journal Entry for Scrap,스크랩에 대한 분개
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
@@ -4100,6 +4125,7 @@
 DocType: Land Unit,Land Unit,지상 유닛
 ,Purchase Analytics,구매 분석
 DocType: Sales Invoice Item,Delivery Note Item,배송 참고 항목
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,현재 송장 {0}이 (가) 없습니다.
 DocType: Asset Maintenance Log,Task,태스크
 DocType: Purchase Taxes and Charges,Reference Row #,참조 행 번호
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},배치 번호는 항목에 대해 필수입니다 {0}
@@ -4112,7 +4138,7 @@
 DocType: Company,Exchange Gain / Loss Account,교환 이득 / 손실 계정
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,직원 및 출석
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,양식을 작성하고 저장
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,양식을 작성하고 저장
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,커뮤니티 포럼
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,재고 실제 수량
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,재고 실제 수량
@@ -4127,7 +4153,7 @@
 DocType: Lab Test Template,Standard Selling Rate,표준 판매 비율
 DocType: Account,Rate at which this tax is applied,요금이 세금이 적용되는
 DocType: Cash Flow Mapper,Section Name,섹션 이름
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,재주문 수량
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,재주문 수량
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,현재 채용
 DocType: Company,Stock Adjustment Account,재고 조정 계정
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,탕치다
@@ -4138,9 +4164,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,모든 BOM에서 최신 가격 업데이트 대기. 몇 분이 소요될 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,국가 현명한 기본 주소 템플릿
 DocType: Water Analysis,Appearance,외관
+DocType: HR Settings,Leave Status Notification Template,상태 알림 템플릿 남기기
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,평균 구매 가격 목록 비율
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,회원 정보.
@@ -4163,7 +4189,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,허용되지 않습니다. 테스트 템플릿을 비활성화하십시오.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
 DocType: Crop Cycle,Linked Land Unit,연결된 지상 유닛
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 DocType: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
@@ -4179,7 +4205,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,사용자 이동
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,등록되지 않은 GSTIN이 잘못되었거나 NA 입력
 DocType: Training Event,Seminar,세미나
 DocType: Program Enrollment Fee,Program Enrollment Fee,프로그램 등록 수수료
@@ -4195,14 +4221,14 @@
 DocType: Hub Settings,Publish Availability,가용성을 게시
 DocType: Company,Create Chart Of Accounts Based On,계정 기반에서의 차트 만들기
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,그룹화되지 않은 그룹으로 변환 할 수 없습니다. 하위 작업이 있습니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,생년월일은 오늘보다 미래일 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,생년월일은 오늘보다 미래일 수 없습니다.
 ,Stock Ageing,재고 고령화
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},학생 {0} 학생 신청자에 존재 {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),반올림 조정 (회사 통화)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,출퇴근 시간 기록 용지
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,일괄:
 DocType: Volunteer,Afternoon,대낮
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Cheque Print Template,Scanned Cheque,스캔 한 수표
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
@@ -4218,7 +4244,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,프로젝트 {0}이 (가) 이미 있습니다.
 DocType: Medical Department,Nursing User,간호 사용자
 DocType: Plant Analysis,Plant Analysis Criterias,식물 분석 기준
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,책임
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},일련 번호 {0}이 배치 {1}에 속해 있지 않습니다.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,책임
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,이 견적의 유효 기간이 종료되었습니다.
 DocType: Expense Claim Account,Expense Claim Account,경비 청구서 계정
 DocType: Accounts Settings,Allow Stale Exchange Rates,부실 환율 허용
@@ -4240,11 +4267,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,변형 만들기
 DocType: Item,Default BOM,기본 BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),총 청구 금액 (판매 송장을 통해)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,차변 메모 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,차변 메모 금액
 DocType: Project Update,Not Updated,업데이트되지 않음
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","비율, 주식 수 및 계산 된 금액간에 불일치가 있습니다."
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,총 발행 AMT 사의
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,총 발행 AMT 사의
 DocType: Journal Entry,Printing Settings,인쇄 설정
 DocType: Employee Advance,Advance Account,사전 계정
 DocType: Job Offer,Job Offer Terms,채용 제안 조건
@@ -4253,7 +4280,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,자동차
 DocType: Vehicle,Insurance Company,보험 회사
 DocType: Asset Category Account,Fixed Asset Account,고정 자산 계정
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,변하기 쉬운
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,변하기 쉬운
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,배달 주에서
 DocType: Chapter,Members,회원
 DocType: Student,Student Email Address,학생 이메일 주소
@@ -4277,7 +4304,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,인턴
 DocType: Delivery Stop,Address Name,주소 명
 DocType: Stock Entry,From BOM,BOM에서
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1}의 {0} 단위 나누기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1}의 {0} 단위 나누기
 DocType: Assessment Code,Assessment Code,평가 코드
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
@@ -4285,25 +4312,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 DocType: Bank Reconciliation Detail,Payment Document,결제 문서
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,기준 수식을 평가하는 중 오류가 발생했습니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
+DocType: Subscription,Plans,계획
 DocType: Salary Slip,Salary Structure,급여 체계
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,문제의 소재
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,되풀이를 만드는 동안 오류가 발생했습니다.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,견적
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,어떤 학생 그룹이 생성되지 않습니다.
 DocType: Purchase Invoice Item,Serial No,일련 번호
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,월별 상환 금액은 대출 금액보다 클 수 없습니다
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,월별 상환 금액은 대출 금액보다 클 수 없습니다
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,행 번호 {0} : 예상 된 배달 날짜는 구매 주문 날짜 이전 일 수 없습니다.
 DocType: Purchase Invoice,Print Language,인쇄 언어
 DocType: Salary Slip,Total Working Hours,총 근로 시간
 DocType: Sales Invoice,Customer PO Details,고객 PO 세부 사항
-DocType: Subscription,Next Schedule Date,다음 일정 날짜
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,임시 개회 계좌
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,입력 값은 양수 여야합니다
@@ -4332,11 +4358,11 @@
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,일자 및 끝
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,언급 된 기준에 해당하는 직원 없음
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
 DocType: Hotel Settings,Default Customer,기본 고객
 DocType: Assessment Plan,Supervisor Name,관리자 이름
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,같은 날 약속이 만들어 졌는지 확인하지 마십시오.
@@ -4361,16 +4387,16 @@
 DocType: Journal Entry Account,Employee Advance,직원 진출
 DocType: Payroll Entry,Payroll Frequency,급여 주파수
 DocType: Lab Test Template,Sensitivity,감광도
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,원료
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,원료
 DocType: Leave Application,Follow via Email,이메일을 통해 수행
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,식물과 기계류
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,식물과 기계류
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,매일 작업 요약 설정
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Reqd by Date를 입력하십시오.
 DocType: Payment Entry,Internal Transfer,내부 전송
 DocType: Asset Maintenance,Maintenance Tasks,유지 관리 작업
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,목표 수량 또는 목표량 하나는 필수입니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
 DocType: Leave Control Panel,Carry Forward,이월하다
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,기존의 트랜잭션 비용 센터 원장으로 변환 할 수 없습니다
@@ -4378,14 +4404,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext 통합
 DocType: Crop Cycle,Detected Disease,발견 된 질병
 ,Produced,생산
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,상환 시작 날짜는 지급 날짜 이전 일 수 없습니다.
 DocType: Item,Item Code for Suppliers,공급 업체에 대한 상품 코드
 DocType: Issue,Raised By (Email),(이메일)에 의해 제기
 DocType: Training Event,Trainer Name,트레이너 이름
 DocType: Mode of Payment,General,일반
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,마지막 커뮤니케이션
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,마지막 커뮤니케이션
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,송장과 일치 결제
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
@@ -4399,7 +4426,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},"박사님, 반나절에 {0}을 (를) {1}에 남겨주세요."
 DocType: Production Plan,Get Material Request,자료 요청을 받으세요
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,우편 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,우편 비용
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 ,Item Variant Details,품목 변형 세부 정보
@@ -4410,9 +4437,9 @@
 DocType: Drug Prescription,Hour,시간
 DocType: Restaurant Order Entry,Last Sales Invoice,마지막 판매 송장
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},항목 {0}에 대해 수량을 선택하십시오.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
 DocType: Company,Monthly Sales Target,월간 판매 목표
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}에 의해 승인 될 수있다
@@ -4420,7 +4447,7 @@
 DocType: Item,Default Material Request Type,기본 자료 요청 유형
 DocType: Supplier Scorecard,Evaluation Period,평가 기간
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,알 수 없는
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,작업 지시가 생성되지 않았습니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,작업 지시가 생성되지 않았습니다.
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
 DocType: Purchase Invoice,Export Type,수출 유형
 DocType: Salary Slip Loan,Salary Slip Loan,샐러리 슬립 론
@@ -4436,8 +4463,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,인보이스 요약 요약
 DocType: Education Settings,Education Manager,교육 관리자
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,최적 성장을위한 현장의 각 식물 사이의 최소 길이
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",재고 조정을 사용하여 일괄 처리 된 품목 {0}을 (를) 업데이트 할 수 없으며 대신 재고 입력을 사용하십시오.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",재고 조정을 사용하여 일괄 처리 된 품목 {0}을 (를) 업데이트 할 수 없으며 대신 재고 입력을 사용하십시오.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",재고 조정을 사용하여 일괄 처리 된 품목 {0}을 (를) 업데이트 할 수 없으며 대신 재고 입력을 사용하십시오.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",재고 조정을 사용하여 일괄 처리 된 품목 {0}을 (를) 업데이트 할 수 없으며 대신 재고 입력을 사용하십시오.
 DocType: Quality Inspection,Report Date,보고서 날짜
 DocType: Student,Middle Name,중간 이름
 DocType: C-Form,Invoices,송장
@@ -4470,20 +4497,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,영수증
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,영수증
 ,Sales Register,판매 등록
 DocType: Daily Work Summary Group,Send Emails At,에 이메일 보내기
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,양식보기
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,경비 청구서에 필수적인 경비 승인자
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",자신 이외의 조직에 사용자를 추가하십시오.
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,아직 고객 없음!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,현금 흐름표
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,중요한 요청이 생성되지 않았습니다.
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,특허
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
@@ -4506,11 +4534,12 @@
 DocType: Vehicle,Chassis No,섀시 없음
 DocType: Payment Request,Initiated,개시
 DocType: Production Plan Item,Planned Start Date,계획 시작 날짜
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,BOM을 선택하십시오.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,BOM을 선택하십시오.
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC 통합 세금 사용 가능
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
+DocType: Bank Guarantee,Clauses and Conditions,조항 및 조건
 DocType: Serial No,Creation Document Type,작성 문서 형식
 DocType: Project Task,View Timesheet,작업 표보기
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,종료일은 시작일보다 커야합니다.
 DocType: Leave Type,Is Encash,현금화는
 DocType: Leave Allocation,New Leaves Allocated,할당 된 새로운 잎
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
@@ -4524,9 +4553,10 @@
 DocType: Patient,Alcohol Current Use,알콜 현재 사용
 DocType: Student Admission Program,Student Admission Program,학생 모집 프로그램
 DocType: Payment Entry,Account Paid To,계정에 유료
+DocType: Subscription Settings,Grace Period,유예 기간
 DocType: Item Alternative,Alternative Item Name,대체 품목 이름
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",급여 전표를 제출할 수 없습니다. <br> \ 가능한 이유 : <br> \ 1. 순 임금이 0 미만입니다. <br> \ 2. 직원 전자 메일에 지정된 회사 이메일 주소가 유효하지 않습니다. <br>
@@ -4536,7 +4566,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},계정에 대한 {0} 예산 {1}에 대한 {2} {3}는 {4}. 그것은에 의해 초과 {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,수량 아웃
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,및 unchcked에서 장애인
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,시리즈는 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,금융 서비스
 DocType: Student Sibling,Student ID,학생 아이디
@@ -4548,14 +4577,16 @@
 DocType: Complaint,Complaint,불평
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,상환 엔트리 만들기
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,모든 부서
 DocType: Patient,Alcohol Past Use,알콜 과거 사용
 DocType: Fertilizer Content,Fertilizer Content,비료 내용
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,CR
 DocType: Project Update,Problematic/Stuck,문제가 있거나 갇혀있다.
 DocType: Tax Rule,Billing State,결제 주
 DocType: Share Transfer,Transfer,이체
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,이 판매 오더를 취소하기 전에 작업 공정 {0}을 취소해야합니다.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
@@ -4579,10 +4610,11 @@
 DocType: Cheque Print Template,Message to show,메시지 표시합니다
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,소매의
 DocType: Student Attendance,Absent,없는
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,번들 제품
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0}부터 시작하는 점수를 찾을 수 없습니다. 0에서 100까지의 평점을 가져야합니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
+DocType: Subscription,Current Invoice Start Date,현재 송장 시작일
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1} : 직불 카드 또는 신용 금액 중 하나가 필요합니다 {2}
 DocType: GL Entry,Remarks,Remarks
@@ -4592,11 +4624,13 @@
 DocType: Task,Parent Task,학부모 과제
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,리드를 확인
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,인쇄 및 문구
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,인쇄 및 문구
 DocType: Stock Settings,Show Barcode Field,쇼 바코드 필드
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,공급 업체 이메일 보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","급여는 이미 {0}과 {1},이 기간 사이가 될 수 없습니다 신청 기간을 남겨 사이의 기간에 대해 처리."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,공급 업체 이메일 보내기
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","급여는 이미 {0}과 {1},이 기간 사이가 될 수 없습니다 신청 기간을 남겨 사이의 기간에 대해 처리."
+DocType: Fiscal Year,Auto Created,자동 생성됨
 DocType: Chapter Member,Leave Reason,이유를 떠나라.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,송장 {0}이 (가) 더 이상 존재하지 않습니다.
 DocType: Guardian Interest,Guardian Interest,가디언 관심
 DocType: Volunteer,Availability,유효성
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS 송장의 기본값 설정
@@ -4605,14 +4639,13 @@
 DocType: Timesheet,Employee Detail,직원 세부 정보
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 이메일 ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 이메일 ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,다음 날짜의 날짜와 동일해야한다 이달의 날에 반복
 DocType: Lab Prescription,Test Code,테스트 코드
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,웹 사이트 홈페이지에 대한 설정
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1}의 스코어 카드로 인해 RFQ가 {0}에 허용되지 않습니다.
 DocType: Job Offer,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,위
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},총 금액 {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},총 금액 {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},잘못된 속성 {0} {1}
 DocType: Supplier,Mention if non-standard payable account,표준이 아닌 지불 계정에 대한 언급
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',&#39;모든 평가 그룹&#39;이외의 평가 그룹을 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},행 {0} : 항목 {1}에 코스트 센터가 필요합니다.
@@ -4623,7 +4656,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,수질 분석
 DocType: Chapter,Region,지방
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,링크 된 분석 다시로드
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예를 들어, 2012 년, 2012-13"
@@ -4639,7 +4672,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,폐기 자산의 비용
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
 DocType: Vehicle,Policy No,정책 없음
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 DocType: Asset,Straight Line,일직선
 DocType: Project User,Project User,프로젝트 사용자
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,스플릿
@@ -4679,21 +4712,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,통로
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,이 자식 노드를 가지고 원장 비용 센터로 변환 할 수 없습니다
 DocType: Production Plan,Total Planned Qty,총 계획 수량
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,영업 가치
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,영업 가치
 DocType: Salary Detail,Formula,공식
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,직렬 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,직렬 #
 DocType: Lab Test Template,Lab Test Template,실험실 테스트 템플릿
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,판매 계정
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,판매 계정
 DocType: Purchase Invoice Item,Total Weight,총 무게
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,판매에 대한 수수료
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,판매에 대한 수수료
 DocType: Job Offer Term,Value / Description,값 / 설명
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 DocType: Purchase Order Item,Expected Delivery Date,예상 배송 날짜
 DocType: Restaurant Order Entry,Restaurant Order Entry,레스토랑 주문 입력
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
 DocType: Asset Maintenance Task,Assign To Name,이름 지정
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,접대비
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,접대비
 DocType: Hub Settings,Enabled Users,활성화 된 사용자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,자료 요청합니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},열기 항목 {0}
@@ -4706,24 +4739,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,휴가 신청.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
 DocType: Vehicle,Last Carbon Check,마지막으로 탄소 확인
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,법률 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,법률 비용
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,행의 수량을 선택하십시오.
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,영업 및 구매 청구서 개설
 DocType: Purchase Invoice,Posting Time,등록시간
 DocType: Timesheet,% Amount Billed,청구 % 금액
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,전화 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,전화 비용
 DocType: Sales Partner,Logo,로고
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,당신은 저장하기 전에 시리즈를 선택하도록 강제하려는 경우이 옵션을 선택합니다.당신이 선택하면 기본이되지 않습니다.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
 DocType: Email Digest,Open Notifications,열기 알림
 DocType: Payment Entry,Difference Amount (Company Currency),차이 금액 (회사 통화)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,직접 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,직접 비용
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,새로운 고객 수익
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,여행 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0}에 사용자 정의 필드 가입을 추가하십시오.
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
 DocType: Purchase Receipt Item,Sample Quantity,샘플 수량
+DocType: Bank Guarantee,Name of Beneficiary,수혜자 성명
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",최신 평가 률 / 가격 목록 비율 / 원자재의 최종 구매 률을 기반으로 Scheduler를 통해 자동으로 BOM 비용을 업데이트합니다.
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
@@ -4735,14 +4768,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,근신
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,급여의 구성 요소
 DocType: Program Enrollment Tool,New Academic Year,새 학년
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,반품 / 신용 참고
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,반품 / 신용 참고
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,총 지불 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,총 지불 금액
 DocType: GST Settings,B2C Limit,B2C 한도
 DocType: Work Order Item,Transferred Qty,수량에게 전송
 apps/erpnext/erpnext/config/learn.py +11,Navigating,탐색
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,계획
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,계획
 DocType: Share Balance,Issued,발행 된
+DocType: Loan,Repayment Start Date,상환 시작일
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,학생 활동
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,공급 업체 아이디
 DocType: Payment Request,Payment Gateway Details,지불 게이트웨이의 자세한 사항
@@ -4755,10 +4789,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","캐주얼, 병 등과 같은 잎의 종류"
 DocType: Email Digest,Send regular summary reports via Email.,이메일을 통해 정기적으로 요약 보고서를 보냅니다.
 DocType: Payment Entry,PE-,체육-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
 DocType: Assessment Result,Student Name,학생 이름
 DocType: Brand,Item Manager,항목 관리자
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,채무 급여
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,채무 급여
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
 DocType: Plant Analysis,Collection Datetime,Collection Datetime
 DocType: Work Order,Total Operating Cost,총 영업 비용
@@ -4768,9 +4802,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,{0} 사용자가 존재하지 않습니다
 DocType: Payment Term,Day(s) after invoice date,인보이스 발행일 이후의 날짜
 DocType: Payment Schedule,Payment Schedule,지불 일정
-DocType: Subscription,SUB-,보결-
 DocType: Item Attribute Value,Abbreviation,약어
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,결제 항목이 이미 존재합니다
+DocType: Subscription,Trial Period End Date,평가판 종료일
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} 한도를 초과 한 authroized Not
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,급여 템플릿 마스터.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,병리학
@@ -4787,9 +4821,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,모든 고객 그룹
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,모든 고객 그룹
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,누적 월별
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
@@ -4798,14 +4832,15 @@
 DocType: Lab Prescription,Test Created,테스트 생성됨
 DocType: Healthcare Settings,Custom Signature in Print,인쇄의 맞춤 서명
 DocType: Account,Temporary,일시적인
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,고객 LPO 번호
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,고객 LPO 번호
 DocType: Program,Courses,행동
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,비서
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,비서
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",사용하지 않으면 필드 &#39;단어에서&#39;트랜잭션에 표시되지 않습니다
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,이 조치로 향후 청구가 중단됩니다. 이 구독을 취소 하시겠습니까?
 DocType: Serial No,Distinct unit of an Item,항목의 고유 단위
 DocType: Supplier Scorecard Criteria,Criteria Name,기준 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,회사를 설정하십시오.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,회사를 설정하십시오.
 DocType: Pricing Rule,Buying,구매
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,질병 및 비료
 DocType: HR Settings,Employee Records to be created by,직원 기록에 의해 생성되는
@@ -4814,18 +4849,18 @@
 DocType: POS Profile,Apply Discount On,할인에 적용
 DocType: Member,Membership Type,회원 유형
 ,Reqd By Date,Reqd 날짜
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,채권자
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,채권자
 DocType: Assessment Plan,Assessment Name,평가의 이름
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,프린트에서 PDC 표시
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,프린트에서 PDC 표시
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,행 번호 {0} : 일련 번호는 필수입니다
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 세부 정보
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,일자리 제공
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,연구소 약어
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 DocType: Consultation,C-,기음-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
@@ -4843,7 +4878,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,총 분산
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","활성화되면, 시스템이 자동으로 재고에 대한 회계 항목을 게시 할 예정입니다."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,중개
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,직원 {0}에 대한 출석은 이미이 일에 대해 표시됩니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,직원 {0}에 대한 출석은 이미이 일에 대해 표시됩니다
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",'소요시간 로그' 분단위 업데이트
 DocType: Customer,From Lead,리드에서
@@ -4854,6 +4889,7 @@
 DocType: Lab Test,Approved Date,승인 날짜
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
+DocType: Subscriber,Subscriber Name,구독자 이름
 DocType: Serial No,Out of Warranty,보증 기간 만료
 DocType: BOM Update Tool,Replace,교체
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,제품을 찾을 수 없습니다.
@@ -4863,19 +4899,18 @@
 DocType: Request for Quotation Item,Project Name,프로젝트 이름
 DocType: Customer,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},직원 대출 {0}에서이자 소득 계좌 선택
 DocType: Work Order,Required Items,필수 항목
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,인적 자원
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,지불 화해 지불
 DocType: Disease,Treatment Task,치료 과제
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,법인세 자산
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,법인세 자산
 DocType: BOM Item,BOM No,BOM 없음
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Update Tool,The BOM which will be replaced,대체됩니다 BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,전자 장비
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,전자 장비
 DocType: Asset,Maintenance Required,유지 보수 필요
 DocType: Account,Debit,직불
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
@@ -4884,7 +4919,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,뛰어난 AMT 사의
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,목표를 설정 항목 그룹 방향이 판매 사람입니다.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],고정 재고 이전보다 [일]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,행 # {0} : 자산은 고정 자산 구매 / 판매를위한 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,행 # {0} : 자산은 고정 자산 구매 / 판매를위한 필수입니다
 DocType: Asset Maintenance Team,Maintenance Team Name,유지 보수 팀 이름
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","둘 이상의 가격 결정 규칙은 상기 조건에 따라 발견되면, 우선 적용된다.기본 값이 0 (공백) 동안 우선 순위는 0-20 사이의 숫자입니다.숫자가 높을수록 동일한 조건으로 여러 가격 규칙이있는 경우는 우선 순위를 의미합니다."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,고객으로부터 &#39;기회&#39;를 선택한 경우 고객이 필수입니다.
@@ -4894,19 +4929,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,비용 청구의 유형.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},항목 {0}의 판매율이 {1}보다 낮습니다. 판매율은 atleast 여야합니다 {2}
-DocType: Item,Taxes,세금
+DocType: Subscription,Taxes,세금
 DocType: Purchase Invoice,capital goods,자본재
 DocType: Purchase Invoice Item,Weight Per Unit,단위 중량
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,유료 및 전달되지 않음
 DocType: Project,Default Cost Center,기본 비용 센터
-DocType: Bank Guarantee,End Date,끝 날짜
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,재고 변동
 DocType: Budget,Budget Accounts,예산 계정
 DocType: Employee,Internal Work History,내부 작업 기록
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,누적 감가 상각 금액
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,사모
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,공급자 스코어 카드 변수
-DocType: Employee Loan,Fully Disbursed,완전 지급
 DocType: Employee Advance,Due Advance Amount,선불 금액
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
@@ -4930,7 +4963,7 @@
 ,Employee Information,직원 정보
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,판매 및 구매에 대한 기본 세금 템플릿이 생성됩니다.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,평가 결과 레코드 {0}이 (가) 이미 있습니다.
@@ -4938,7 +4971,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',그룹화 기준이 &#39;회사&#39;인 경우 회사 필터를 비워 두십시오.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,게시 날짜는 미래의 날짜 수 없습니다
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,되풀이 생성을위한
 DocType: Stock Entry,Target Warehouse Address,대상 창고 주소
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,캐주얼 허가
 DocType: Agriculture Task,End Day,종료일
@@ -4963,11 +4995,10 @@
 DocType: Material Request,% Ordered,% 발주
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","과정 기반 학생 그룹의 경우, 과정은 등록 된 과정의 등록 된 과정에서 모든 학생에 대해 유효성이 검사됩니다."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,일한 분량에 따라 공임을 지급받는 일
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,평균. 구매 비율
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,평균. 구매 비율
 DocType: Share Balance,From No,~부터
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{보낸 사람}의 새 메시지
 DocType: Customer,Customer Primary Address,고객 기본 주소
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,뉴스 레터
 DocType: Drug Prescription,Description/Strength,설명 / 장점
@@ -4976,22 +5007,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,같은 항목을 여러 번 입력 된
 DocType: Department,Leave Block List,차단 목록을 남겨주세요
 DocType: Purchase Invoice,Tax ID,세금 아이디
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} 항목을 직렬 제 칼럼에 대한 설정이 비어 있어야하지
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} 항목을 직렬 제 칼럼에 대한 설정이 비어 있어야하지
 DocType: Accounts Settings,Accounts Settings,계정 설정
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,승인
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",{0}의 형식이 잘못된 주소입니다. 계속 진행하여 문제를 해결하십시오.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",{0}의 형식이 잘못된 주소입니다. 계속 진행하여 문제를 해결하십시오.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",새 계정 번호입니다. 계정 이름에 접두어로 포함됩니다.
 DocType: Maintenance Team Member,Team Member,팀 구성원
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,제출할 결과가 없습니다.
 DocType: Customer,Sales Partner and Commission,판매 파트너 및위원회
-DocType: Employee Loan,Rate of Interest (%) / Year,이자 (%) / 년의 속도
+DocType: Loan,Rate of Interest (%) / Year,이자 (%) / 년의 속도
 ,Project Quantity,프로젝트 수량
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로"
 DocType: Opportunity,To Discuss,토론하기
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} 단위 {1} {2}이 거래를 완료하는 필요.
 DocType: Loan Type,Rate of Interest (%) Yearly,이자의 비율 (%) 연간
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,임시 계정
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,검정
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,임시 계정
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,검정
 DocType: BOM Explosion Item,BOM Explosion Item,BOM 폭발 상품
 DocType: Shareholder,Contact List,연락처 목록
 DocType: Account,Auditor,감사
@@ -4999,16 +5030,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,생산 {0} 항목
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,더 알아보기
 DocType: Cheque Print Template,Distance from top edge,상단으로부터의 거리
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,가격 목록 {0} 비활성화 또는 존재하지 않는
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,가격 목록 {0} 비활성화 또는 존재하지 않는
 DocType: Purchase Invoice,Return,반환
 DocType: Pricing Rule,Disable,사용 안함
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,지불 모드는 지불 할 필요
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,지불 모드는 지불 할 필요
 DocType: Project Task,Pending Review,검토 중
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","전체 페이지에서 자산, 일련 번호, 배치 등의 추가 옵션을 편집하십시오."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,약속 및 협의
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1}은 (는) 배치 {2}에 등록되지 않았습니다.
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","이미 같이 자산 {0}, 폐기 될 수 없다 {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,필요한 수표
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,필요한 수표
 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,마크 결석
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,회사를 설정하지 못했습니다.
@@ -5020,7 +5051,7 @@
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,함대 관리
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,에서 항목 추가
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,에서 항목 추가
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,작물과 땅
 DocType: Cheque Print Template,Regular,정규병
 DocType: Fertilizer,Density (if liquid),밀도 (액체 인 경우)
@@ -5045,24 +5076,26 @@
 DocType: Payment Entry,Paid Amount,지불 금액
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,판매주기 탐색
 DocType: Assessment Plan,Supervisor,감독자
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,보존 재고 항목
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,보존 재고 항목
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 ,Work Order Stock Report,노동 주문 재고 보고서
+DocType: Purchase Receipt,Auto Repeat Detail,자동 반복 세부 정보
 DocType: Assessment Result Tool,Assessment Result Tool,평가 결과 도구
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,관리자로서
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,카테고리 제안
 DocType: BOM Scrap Item,BOM Scrap Item,BOM 스크랩 항목
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,품질 관리
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,품질 관리
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
 DocType: Project,Total Billable Amount (via Timesheets),총 청구 가능 금액 (작업 표를 통해)
 DocType: Agriculture Task,Previous Business Day,이전 영업일
-DocType: Employee Loan,Repay Fixed Amount per Period,기간 당 고정 금액을 상환
+DocType: Loan,Repay Fixed Amount per Period,기간 당 고정 금액을 상환
 DocType: Employee,Health Insurance No,건강 보험
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,크레딧 노트 Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,크레딧 노트 Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,총 과세 금액
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 DocType: Opening Invoice Creation Tool,Purchase,구입
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,잔고 수량
@@ -5073,16 +5106,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}에 대한 {1}
 DocType: Healthcare Settings,Valid number of days,유효한 일수
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,코스트 센터
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,구독 다시 시작
 DocType: Land Unit,Linked Plant Analysis,연결된 플랜트 분석
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,공급 업체의 통화는 회사의 기본 통화로 변환하는 속도에
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},행 번호 {0} : 행과 타이밍 충돌 {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,평점 0 허용
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,평점 0 허용
+DocType: Bank Guarantee,Receiving,전수
 DocType: Training Event Employee,Invited,초대
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대해 발견 된 여러 활성 급여 구조
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,설치 게이트웨이를 차지한다.
 DocType: Employee,Employment Type,고용 유형
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,고정 자산
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,고정 자산
 DocType: Payment Entry,Set Exchange Gain / Loss,교환 게인을 설정 / 손실
 ,GST Purchase Register,GST 구매 등록
 ,Cash Flow,현금 흐름
@@ -5103,9 +5138,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,모든 주식 거래 목록
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},첨부 {0} # {1} 찾기
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,평가판 기간 시작일과 평가판 종료일을 모두 설정해야합니다.
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,평균 속도
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,지불 일정의 총 지불 금액은 대 / 반올림 합계와 같아야합니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,지불 일정의 총 지불 금액은 대 / 반올림 합계와 같아야합니다.
+DocType: Subscription Plan Detail,Plan,계획
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,총계정 원장에 따라 은행 잔고 잔액
 DocType: Job Applicant,Applicant Name,신청자 이름
 DocType: Authorization Rule,Customer / Item Name,고객 / 상품 이름
@@ -5135,6 +5171,7 @@
 DocType: Work Order,Warehouses,창고
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} 자산은 양도 할 수 없습니다
 DocType: Hotel Room Pricing,Hotel Room Pricing,호텔 객실 가격
+DocType: Subscription,Days Until Due,만기까지의 기간
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,이 아이템은 {0}의 변형입니다 (템플릿).
 DocType: Workstation,per hour,시간당
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,구매
@@ -5143,13 +5180,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","배치 기반 학생 그룹의 경우, 학생 배치는 프로그램 등록의 모든 학생에 대해 유효성이 검사됩니다."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,유통
+DocType: Journal Entry Account,Loan,차관
 DocType: Expense Claim Advance,Expense Claim Advance,경비 청구 진행
 DocType: Lab Test,Report Preference,보고서 환경 설정
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,자원 봉사자 정보.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,프로젝트 매니저
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,프로젝트 매니저
 ,Quoted Item Comparison,인용 상품 비교
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}에서 {1} 사이의 득점에서 겹침
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,파견
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,순자산 값에
 DocType: Crop,Produce,생기게 하다
@@ -5159,7 +5197,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,제조를위한 재료 소비량
 DocType: Item Alternative,Alternative Item Code,대체 품목 코드
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,제조 할 항목을 선택합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,제조 할 항목을 선택합니다
 DocType: Delivery Stop,Delivery Stop,배달 중지
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
 DocType: Item,Material Issue,소재 호
@@ -5169,15 +5207,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,비누 및 세제
 DocType: BOM,Show Items,표시 항목
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,때때로보다 클 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,모든 고객에게 이메일로 알려 드리고 싶습니까?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,모든 고객에게 이메일로 알려 드리고 싶습니까?
+DocType: Subscription Plan,Billing Interval,청구 간격
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,영화 및 비디오
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,이력서
 DocType: Hub Settings,Hub Username,허브 사용자 이름
 DocType: Salary Detail,Component,구성 요소
 DocType: Assessment Criteria,Assessment Criteria Group,평가 기준 그룹
 DocType: Healthcare Settings,Patient Name By,환자 이름 작성자
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0}에서 {1}까지의 급여에 대한 발생 분개 항목
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0}에서 {1}까지의 급여에 대한 발생 분개 항목
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
@@ -5191,23 +5229,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
 DocType: Leave Block List,Applies to Company,회사에 적용
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
-DocType: Employee Loan,Disbursement Date,지급 날짜
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;수신자&#39;가 지정되지 않았습니다.
+DocType: Loan,Disbursement Date,지급 날짜
 DocType: BOM Update Tool,Update latest price in all BOMs,모든 BOM의 최신 가격 업데이트
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,의료 기록
 DocType: Vehicle,Vehicle,차량
 DocType: Purchase Invoice,In Words,즉
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,제출하기 전에 은행 또는 대출 기관의 이름을 입력하십시오.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0}을 제출해야합니다.
 DocType: POS Profile,Item Groups,항목 그룹
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
 DocType: Sales Order Item,For Production,생산
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,계정과 목표 테이블에 임시 개설 계좌를 추가하십시오.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,계정과 목표 테이블에 임시 개설 계좌를 추가하십시오.
 DocType: Customer,Customer Primary Contact,고객 기본 연락처
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,기간 마감 일지
 DocType: Project Task,View Task,보기 작업
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead %
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead %
+DocType: Bank Guarantee,Bank Guarantee Type,은행 보증 유형
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,송장 부분
 ,Asset Depreciations and Balances,자산 감가 상각 및 잔액
@@ -5218,9 +5257,8 @@
 DocType: Production Plan,Include Subcontracted Items,외주 품목 포함
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,재고 변경 후 변형 속성을 변경할 수 없습니다. 이 작업을 수행하려면 새 항목을 만들어야합니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
-DocType: Employee Loan,Repay from Salary,급여에서 상환
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+DocType: Loan,Repay from Salary,급여에서 상환
 DocType: Leave Application,LAP/,무릎/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
 DocType: Salary Slip,Salary Slip,급여 전표
@@ -5244,11 +5282,11 @@
 DocType: Employee Education,Employee Education,직원 교육
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,항목 그룹 테이블에서 발견 중복 항목 그룹
 DocType: Land Unit,Parent Land Unit,부모 지상 유닛
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
 DocType: Fertilizer,Fertilizer Name,비료 이름
 DocType: Salary Slip,Net Pay,실질 임금
 DocType: Cash Flow Mapping Accounts,Account,계정
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
 ,Requested Items To Be Transferred,전송할 요청 항목
 DocType: Expense Claim,Vehicle Log,차량 로그인
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),열이있는 경우 (온도가 38.5 ° C / 101.3 ° F 또는 지속 온도가 38 ° C / 100.4 ° F 인 경우)
@@ -5289,24 +5327,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
 DocType: Asset Maintenance,Manufacturing User,제조 사용자
 DocType: Purchase Invoice,Raw Materials Supplied,공급 원료
-DocType: C-Form,Series,시리즈
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},가격 목록 {0}의 통화는 {1} 또는 {2}이어야합니다.
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Soil Texture,Ternary Plot,삼원 계획
 DocType: Item Group,Item Classification,품목 분류
 DocType: Driver,License Number,라이센스 번호
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,비즈니스 개발 매니저
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,비즈니스 개발 매니저
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,유지 보수 방문 목적
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,송장 환자 등록
 DocType: Crop,Period,기간
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,원장
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},에 휴가에 직원 {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},에 휴가에 직원 {0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,보기 오퍼
 DocType: Program Enrollment Tool,New Program,새 프로그램
 DocType: Item Attribute Value,Attribute Value,속성 값
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 DocType: Salary Detail,Salary Detail,급여 세부 정보
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,먼저 {0}를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,먼저 {0}를 선택하세요
 DocType: Appointment Type,Physician,내과 의사
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,상담
@@ -5314,15 +5351,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},작업 공정 {3}에서 {0} ({1})은 계획 수량 ({2})보다 클 수 없습니다.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,제조 시간 시트.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,소계
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,주식 거래 후 Variant 속성을 변경할 수 없습니다. 이 작업을 수행하려면 새 항목을 만들어야합니다.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA 위임장
 DocType: Physician,Charges,요금
 DocType: Production Plan,Get Items For Work Order,작업 지시에 대한 항목 가져 오기
 DocType: Salary Detail,Default Amount,기본 금액
 DocType: Lab Test Template,Descriptive,설명 적
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,시스템에서 찾을 수없는 창고
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,시스템에서 찾을 수없는 창고
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,이 달의 요약
 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,회사에서 달성하고자하는 판매 목표를 설정하십시오.
 ,Project wise Stock Tracking,프로젝트 현명한 재고 추적
@@ -5350,11 +5388,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,웹 사이트를 만들지 못했습니다.
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,보유 재고 항목이 이미 생성되었거나 샘플 수량이 제공되지 않았습니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,보유 재고 항목이 이미 생성되었거나 샘플 수량이 제공되지 않았습니다.
 DocType: Program,Program Abbreviation,프로그램의 약자
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
 DocType: Warranty Claim,Resolved By,에 의해 해결
-DocType: Bank Guarantee,Start Date,시작 날짜
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,기간 동안 잎을 할당합니다.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,수표와 예금 잘못 삭제
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
@@ -5369,11 +5406,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,시간
 DocType: Project,Expected Start Date,예상 시작 날짜
 DocType: Purchase Invoice,04-Correction in Invoice,송장의 04 수정
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM이있는 모든 품목에 대해 이미 생성 된 작업 공정
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM이있는 모든 품목에 대해 이미 생성 된 작업 공정
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,이체 세부 정보 보고서
 DocType: Setup Progress Action,Setup Progress Action,설치 진행 작업
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,구매 가격 목록
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,구매 가격 목록
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,구독 취소
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,유지 보수 상태를 완료로 선택하거나 완료 날짜를 제거하십시오.
 DocType: Supplier,Default Payment Terms Template,기본 지급 조건 템플릿
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,거래 통화는 지불 게이트웨이 통화와 동일해야합니다
@@ -5384,7 +5422,6 @@
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,액션 월별 예산이 초과 축적 된 경우
-DocType: Subscription,Submit on creation,창조에 제출
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
 DocType: Asset,Disposal Date,폐기 날짜
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","그들은 휴일이없는 경우 이메일은, 주어진 시간에 회사의 모든 Active 직원에 전송됩니다. 응답 요약 자정에 전송됩니다."
@@ -5403,6 +5440,7 @@
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Cheque Print Template,Cheque Print Template,수표 인쇄 템플릿
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,코스트 센터의 차트
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,가입을 취소하거나 가입을 미결제로 표시하기까지 인보이스 일자가 경과 한 날 수
 DocType: Lab Test Template,Sample Collection,샘플 수집
 ,Requested Items To Be Ordered,주문 요청 항목
 DocType: Price List,Price List Name,가격리스트 이름
@@ -5411,7 +5449,7 @@
 DocType: Account,Income,수익
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,문제가 발생했습니다!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
 DocType: Supplier Scorecard Scoring Criteria,Score,점수
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,회계 연도 {0} 존재하지 않습니다
@@ -5431,12 +5469,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}은 0과 100 사이의 값이어야합니다.
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,다음 감가 상각 일은 사용 가능일 이전 일 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,무담보 대출
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,무담보 대출
 DocType: Cost Center,Cost Center Name,코스트 센터의 이름
 DocType: Student,B+,B의 +
 DocType: HR Settings,Max working hours against Timesheet,최대 작업 표에 대해 근무 시간
 DocType: Maintenance Schedule Detail,Scheduled Date,예약 된 날짜
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,총 유료 AMT 사의
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,총 유료 AMT 사의
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 자보다 큰 메시지는 여러 개의 메시지로 분할됩니다
 DocType: Purchase Receipt Item,Received and Accepted,접수 및 승인
 DocType: Hub Settings,Company and Seller Profile,회사 및 판매자 프로필
@@ -5450,10 +5488,9 @@
 DocType: Item,Variant Based On,변형 기반에
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,공급 업체
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,다음을 수정하십시오.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 DocType: Request for Quotation Item,Supplier Part No,공급 업체 부품 번호
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,익명
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,에서 수신
 DocType: Lead,Converted,변환
@@ -5467,6 +5504,7 @@
 DocType: Asset,Assets,자산
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
+DocType: Subscription,Current Invoice End Date,현재 인보이스 종료 날짜
 DocType: Payment Term,Due Date Based On,만기일 기준
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,판매 설정에서 기본 고객 그룹 및 지역을 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} 존재하지 않습니다
@@ -5474,7 +5512,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,분개에 대해 상환이 선택되지 않았습니다.
 DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
+DocType: Loan,Disbursed,지불
 DocType: Healthcare Settings,Laboratory Settings,실험실 설정
 DocType: Patient Appointment,Service Unit,서비스 단위
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,공급 업체 설정 성공
@@ -5487,12 +5527,12 @@
 DocType: Share Balance,No of Shares,주식수
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,상태 선택
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: School House,House Name,집 이름
 DocType: Fee Schedule,Total Amount per Student,학생 당 총 금액
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,전기의
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,전기의
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,사용자로 조직의 나머지 부분을 추가합니다. 또한 연락처에서 추가하여 포털에 고객을 초대 추가 할 수 있습니다
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
 DocType: Grant Application,Requested Amount,요청 금액
@@ -5502,7 +5542,7 @@
 DocType: Crop Cycle,Detected Diseases,발견 된 질병
 DocType: Stock Entry,Default Source Warehouse,기본 소스 창고
 DocType: Item,Customer Code,고객 코드
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},생일 알림 {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},생일 알림 {0}
 DocType: Asset Maintenance Task,Last Completion Date,마지막 완료일
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
@@ -5510,9 +5550,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless 설정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,재고 자산
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,재고 자산
 DocType: Restaurant,Active Menu,활성 메뉴
 DocType: Target Detail,Target Qty,목표 수량
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},대출 반대 : {0}
 DocType: Shopping Cart Settings,Checkout Settings,체크 아웃 설정
 DocType: Student Attendance,Present,선물
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,배송 참고 {0} 제출하지 않아야합니다
@@ -5521,9 +5562,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
 DocType: Vehicle Log,Odometer,주행 거리계
 DocType: Production Plan Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
 DocType: Chapter,Chapter Head,챕터 헤드
 DocType: Payment Term,Month(s) after the end of the invoice month,인보이스 월이 끝난 후 월
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,프로젝트 활동 / 작업.
@@ -5531,11 +5572,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,급여 전표 생성
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,실험실 결과 datetime은 datetime을 테스트하기 전에는 사용할 수 없습니다.
 DocType: POS Profile,Allow user to edit Discount,사용자가 할인을 편집 할 수 있도록 허용
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,고객 확보
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,고객 확보
 DocType: Purchase Invoice Item,Include Exploded Items,분해 된 항목 포함
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",해당 법령에가로 선택된 경우 구매 확인해야합니다 {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
 DocType: Shipping Rule,Restrict to Countries,국가 제한
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
 DocType: Sales Invoice Timesheet,Billing Hours,결제 시간
 DocType: Project,Total Sales Amount (via Sales Order),총 판매 금액 (판매 오더를 통한)
@@ -5554,6 +5596,7 @@
 DocType: Soil Texture,Sandy Clay,샌디 클레이
 DocType: Grant Application,Assessment  Manager,평가 관리자
 DocType: Payment Entry,Allocate Payment Amount,결제 금액을 할당
+DocType: Subscription Plan,Subscription Plan,구독 계획
 DocType: Employee External Work History,Salary,급여
 DocType: Serial No,Delivery Document Type,납품 문서 형식
 DocType: Sales Order,Partly Delivered,일부 배달
@@ -5579,9 +5622,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,고령화 범위 2
 DocType: SG Creation Tool Course,Max Strength,최대 강도
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,사전 설정 설치
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},고객 {}에 대해 배달 노트가 선택되지 않았습니다.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},고객 {}에 대해 배달 노트가 선택되지 않았습니다.
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM 교체
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,배달 날짜를 기준으로 품목 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,배달 날짜를 기준으로 품목 선택
 DocType: Grant Application,Has any past Grant Record,과거의 보조금 기록이 있습니까?
 ,Sales Analytics,판매 분석
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},사용 가능한 {0}
@@ -5600,7 +5643,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,원료 공급 비용
 DocType: Selling Settings,Settings for Selling Module,모듈 판매에 대한 설정
 DocType: Hotel Room Reservation,Hotel Room Reservation,호텔 룸 예약
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,고객 서비스
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,고객 서비스
 DocType: BOM,Thumbnail,미리보기
 DocType: Item Customer Detail,Item Customer Detail,항목을 고객의 세부 사항
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,제공 후보 작업.
@@ -5617,7 +5660,7 @@
 DocType: Fees,Student Details,학생 세부 사항
 DocType: Purchase Invoice Item,Stock Qty,재고 수량
 DocType: Purchase Invoice Item,Stock Qty,재고 수량
-DocType: Employee Loan,Repayment Period in Months,개월의 상환 기간
+DocType: Loan,Repayment Period in Months,개월의 상환 기간
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,오류 : 유효한 ID?
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
 DocType: Account,Equity,공평
@@ -5626,7 +5669,7 @@
 DocType: Task,Closing Date,마감일
 DocType: Sales Order Item,Produced Quantity,생산 수량
 DocType: Timesheet,Work Detail,작업 세부 정보
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,기사
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,기사
 DocType: Journal Entry,Total Amount Currency,합계 금액 통화
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,검색 서브 어셈블리
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
@@ -5672,13 +5715,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,기부자 유형 정보.
 DocType: Request for Quotation,Supplier Detail,공급 업체 세부 정보
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},식 또는 조건에서 오류 : {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,송장에 청구 된 금액
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,송장에 청구 된 금액
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,기준 가중치는 최대 100 %
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,출석
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,재고 물품
 DocType: BOM,Materials,도구
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","선택되지 않으면, 목록은인가되는 각 부서가 여기에 첨가되어야 할 것이다."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} 생성 중
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,소스 및 대상웨어 하우스는 동일 할 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,트랜잭션을 구입을위한 세금 템플릿.
@@ -5702,14 +5744,14 @@
 DocType: Shipping Rule,Fixed,결정된
 DocType: Vehicle Service,Clutch Plate,클러치 플레이트
 DocType: Company,Round Off Account,반올림
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,관리비
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,관리비
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,컨설팅
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
-DocType: Journal Entry,Subscription,신청
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,신청
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,수수료 생성 보류 중
 DocType: Appraisal Goal,Score Earned,점수 획득
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,통지 기간
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,통지 기간
 DocType: Asset Category,Asset Category Name,자산 범주 이름
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,이 루트 영토 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,새로운 판매 사람 이름
@@ -5723,7 +5765,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 배치를 고려하지 않으려면 선택하지 마십시오.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 일괄 처리를 고려하지 않으려면 선택하지 않습니다.
 DocType: Asset,Frequency of Depreciation (Months),감가 상각의 주파수 (월)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,신용 계정
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,0 값을보기
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,원료의 부여 수량에서 재 포장 / 제조 후의 아이템의 수량
@@ -5731,7 +5773,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
 DocType: Hub Settings,Company Logo,회사 로고
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 DocType: Healthcare Settings,Patient Registration,환자 등록
@@ -5766,11 +5808,10 @@
 DocType: Journal Entry,Total Debit,총 직불
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,기본 완제품 창고
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,환자를 선택하십시오.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,영업 사원
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,영업 사원
 DocType: Hotel Room Package,Amenities,예의
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,예산 및 비용 센터
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,여러 기본 결제 방법이 허용되지 않습니다.
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,그
 ,Appointment Analytics,약속 분석
 DocType: Vehicle Service,Half Yearly,반년
 DocType: Lead,Blog Subscriber,블로그 구독자
@@ -5787,6 +5828,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,1 년에 학생 그룹을 만들면 비워 둡니다.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","이 옵션을 선택하면 총 없음. 작업 일의 휴일을 포함하며,이 급여 당 일의 가치를 감소시킬 것이다"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",현재 키를 사용하는 앱은 액세스 할 수 없습니다. 확실합니까?
+DocType: Subscription Settings,Prorate,비례 배당
 DocType: Purchase Invoice,Total Advance,전체 사전
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,템플릿 코드 변경
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,계약 기간 종료 날짜는 기간 시작 날짜보다 이전이 될 수 없습니다. 날짜를 수정하고 다시 시도하십시오.
@@ -5798,8 +5840,9 @@
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 DocType: Cheque Print Template,Signatory Position,서명자 위치
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,분실로 설정
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,분실로 설정
 DocType: Timesheet,Total Billable Hours,총 청구 시간
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,구독자가이 구독으로 생성 된 인보이스를 지불해야하는 일 수
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,지불 영수증 참고
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,이이 고객에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},행 {0} : 할당 된 양 {1} 미만 또는 결제 항목의 금액과 동일합니다 {2}
@@ -5818,12 +5861,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,선택하거나 새로운 고객을 추가
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,이이 직원의 출석을 기반으로
 DocType: Assessment Result,Summary,개요
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,출석 표식
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,자동 이체 계좌
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,식당 주문 입력 항목
@@ -5835,7 +5878,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,구매 금액
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,종업원 급여
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,종업원 급여
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Work Order,Manufactured Qty,제조 수량
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},공유가 {0}
@@ -5843,12 +5886,12 @@
 DocType: Asset,Out of Order,고장난
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 DocType: Projects Settings,Ignore Workstation Time Overlap,워크 스테이션 시간 겹침 무시
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,배치 번호 선택
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,고객에게 제기 지폐입니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 DocType: Patient Service Unit,Medical Administrator,의료 관리자
 DocType: Assessment Plan,Schedule,일정
 DocType: Account,Parent Account,부모 계정
@@ -5878,15 +5921,16 @@
 DocType: Asset Repair,Repair Status,수리 상태
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 DocType: POS Profile,Account for Change Amount,변경 금액에 대한 계정
 DocType: Purchase Invoice,input service,입력 서비스
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,유지 보수 팀원
 DocType: Agriculture Analysis Criteria,Soil Analysis,토양 분석
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,코스 코드 :
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,비용 계정을 입력하십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
 DocType: Employee,Current Address,현재 주소
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
@@ -5935,19 +5979,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},대한 입학 {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,변수 이름
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
 DocType: Asset,Asset Category,자산의 종류
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,순 임금은 부정 할 수 없습니다
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,공급 업체에 소재
 DocType: Soil Texture,Loamy Sand,진흙 모래
 DocType: Production Plan,Material Request Planning,자재 요청 계획
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,소비세 송장
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} %가 한 번 이상 나타납니다
 DocType: Expense Claim,Employees Email Id,직원 이드 이메일
 DocType: Employee Attendance Tool,Marked Attendance,표시된 출석
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,유동 부채
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,유동 부채
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,타이머가 주어진 시간을 초과했습니다.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,상대에게 대량 SMS를 보내기
 DocType: Patient,A Positive,긍정적 인
@@ -5958,9 +6002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 있으며이 공급 업체에 대한 구매 주문은 신중하게 발행해야합니다.
 DocType: Asset Maintenance Team,Asset Maintenance Team,자산 관리팀
-DocType: Employee Loan,Loan Type,대출 유형
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0}이 (가) 성공적으로 제출되었습니다.
+DocType: Loan,Loan Type,대출 유형
 DocType: Scheduling Tool,Scheduling Tool,예약 도구
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,신용카드
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,신용카드
 DocType: BOM,Item to be manufactured or repacked,제조 또는 재 포장 할 항목
 DocType: Employee Education,Major/Optional Subjects,주요 / 선택 주제
 DocType: Sales Invoice Item,Drop Ship,드롭 선박
@@ -5992,7 +6037,7 @@
 DocType: Item,Units of Measure,측정 단위
 DocType: Manufacturing Settings,Allow Production on Holidays,휴일에 생산 허용
 DocType: Sales Invoice,Customer's Purchase Order Date,고객의 구매 주문 날짜
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,자본금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,자본금
 DocType: Shopping Cart Settings,Show Public Attachments,공용 첨부 파일 표시
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
 DocType: Restaurant Reservation,Reservation Time,예약 시간
@@ -6007,7 +6052,7 @@
 DocType: Purchase Order,To Receive and Bill,수신 및 법안
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,행 # {0} : 거래일보다 전의 날짜를 사용할 수 없습니다.
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,주요 제품
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,디자이너
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
@@ -6017,20 +6062,20 @@
 DocType: Driver,Expiry Date,유효 기간
 DocType: Healthcare Settings,Employee name and designation in print,직원 이름 및 지명 인쇄
 ,accounts-browser,계정 브라우저
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,첫 번째 범주를 선택하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +13,Project master.,프로젝트 마스터.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",주식 설정 또는 항목에 &quot;수당&quot;을 업데이트 청구 오버 또는 과잉 주문 가능합니다.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(반나절)
 DocType: Payment Term,Credit Days,신용 일
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,실험실 테스트를 받으려면 환자를 선택하십시오.
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,학생 배치 확인
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,시간 일 리드
 DocType: Cash Flow Mapping,Is Income Tax Expense,소득세 비용
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,학생이 연구소의 숙소에 거주하고 있는지 확인하십시오.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
 ,Stock Summary,재고 요약
@@ -6041,10 +6086,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,참조 날짜
 DocType: Employee,Reason for Leaving,떠나는 이유
 DocType: BOM Operation,Operating Cost(Company Currency),운영 비용 (기업 통화)
-DocType: Employee Loan Application,Rate of Interest,관심의 속도
+DocType: Loan Application,Rate of Interest,관심의 속도
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: Item,Shelf Life In Days,유통 기한
 DocType: GL Entry,Is Opening,개시
+DocType: Department,Expense Approvers,비용 승인자
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
 DocType: Journal Entry,Subscription Section,구독 섹션
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,계정 {0}이 (가) 없습니다
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 2a7ac50..55df733 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Betal Material Visit {0} berî betalkirinê ev Îdîaya Warranty
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Raportên Nirxandinê
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Products Serfkaran
-DocType: Purchase Receipt,Subscription Detail,Berfirehtir
 DocType: Supplier Scorecard,Notify Supplier,Notify Supplier
 DocType: Item,Customer Items,Nawy mişterî
 DocType: Project,Costing and Billing,Bi qurûşekî û Billing
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Account {0}: account Parent {1} nikare bibe ledger
 DocType: Item,Publish Item to hub.erpnext.com,Weşana babet bi hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifications Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Nirxandin
 DocType: Item,Default Unit of Measure,Default Unit ji Measure
 DocType: SMS Center,All Sales Partner Contact,Hemû Sales Partner Contact
-DocType: Employee,Leave Approvers,Dev ji Approvers
+DocType: Department,Leave Approvers,Dev ji Approvers
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Lêpirsîn
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Peyda bikin
 DocType: Job Applicant,Job Applicant,Applicant Job
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ev li ser danûstandinên li dijî vê Supplier bingeha. Dîtina cedwela li jêr bo hûragahiyan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Mafî
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},baca type rastî dikarin di rêjeya babetî di row ne bê beşdar kirin {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Mafî
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},baca type rastî dikarin di rêjeya babetî di row ne bê beşdar kirin {0}
 DocType: Bank Guarantee,Customer,Miştirî
 DocType: Purchase Receipt Item,Required By,pêwîst By
 DocType: Delivery Note,Return Against Delivery Note,Vegere li dijî Delivery Note
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},hesabê bankê dikare wekî ne bê bi navê {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Serên (an jî Komên) dijî ku Arşîva Accounting bi made û hevsengiyên parast in.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Outstanding ji bo {0} nikare were kêmî ji sifir ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Li vir pêvajoyên heqê belaş nehatiye şandin.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Li vir pêvajoyên heqê belaş nehatiye şandin.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Dev ji Name Type
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,nîşan vekirî
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Pêdivî ye ku ev çalakiya îro ji bo jorîna jorîn ya jorîn bistînin
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Series Demê serket
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Lêkolîn
 DocType: Pricing Rule,Apply On,Apply ser
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Hemû Supplier Contact
 DocType: Support Settings,Support Settings,Mîhengên piştgiriya
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Hêvîkirin End Date nikare bibe kêmtir ji hêvîkirin Date Start
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0} ye: Pûan bide, divê heman be {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Leave Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0} ye: Pûan bide, divê heman be {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Batch babet Status Expiry
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,pêşnûmeya Bank
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,pêşnûmeya Bank
 DocType: Membership,membership validaty section,endamê endamê beşdariya rastdariyê
 DocType: Mode of Payment Account,Mode of Payment Account,Mode of Account Payment
 DocType: Consultation,Consultation,Şêwir
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Mal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Çêkirina malpera
 DocType: Opening Invoice Creation Tool Item,Quantity,Jimarî
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,table Hesabên nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Deyn (Deynên)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,table Hesabên nikare bibe vala.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Deyn (Deynên)
 DocType: Employee Education,Year of Passing,Sal ji Dr.Kemal
 DocType: Item,Country of Origin,Welatê jêderk
 DocType: Soil Texture,Soil Texture Criteria,Krîza Çermê
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Agahdarî Têkiliyên Serûpel
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Issues vekirî
 DocType: Production Plan Item,Production Plan Item,Production Plan babetî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Bikarhêner {0} ji niha ve ji bo karkirinê rêdan {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Bikarhêner {0} ji niha ve ji bo karkirinê rêdan {1}
 DocType: Lab Test Groups,Add new line,Line line new
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Parastina saxlemîyê
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delay di peredana (Days)
@@ -89,7 +85,7 @@
 ,Delay Days,Dereng Rojan
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Biha
+DocType: Subscription Invoice,Invoice,Biha
 DocType: Purchase Invoice Item,Item Weight Details,Pirtûka giran
 DocType: Asset Maintenance Log,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Sal malî {0} pêwîst e
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,kurte
 DocType: Appraisal Goal,Score (0-5),Score: (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nayê bi hev nagirin {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Temamê meblaxa bi qurûşekî
 DocType: Delivery Note,Vehicle No,Vehicle No
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Ji kerema xwe ve List Price hilbijêre
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Kar berdewam e
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Ji kerema xwe ve date hilbijêre
 DocType: Daily Work Summary Group,Holiday List,Lîsteya Holiday
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Hesabdar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Hesabdar
 DocType: Hub Settings,Selling Price List,Lîsteya bihayê bihayê
 DocType: Patient,Tobacco Current Use,Bikaranîna Pêdivî ye
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Rêjeya firotanê
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Rêjeya firotanê
 DocType: Cost Center,Stock User,Stock Bikarhêner
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Phone No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Şandina Îmêlê Şîfreya Yekem şandin
 ,Sales Partners Commission,Komîsyona Partners Sales
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Nirx Piştî Farhad.
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Related
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,date Beşdariyê nikare bibe kêmtir ji date tevlî karker ya
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,date Beşdariyê nikare bibe kêmtir ji date tevlî karker ya
 DocType: Grading Scale,Grading Scale Name,Qarneya Name Scale
-DocType: Subscription,Repeat on Day,Dibe Dike
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ev hesabê root e û ne jî dikarim di dahatûyê de were.
 DocType: Sales Invoice,Company Address,Company Address
 DocType: BOM,Operations,operasyonên
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Can destûr li ser bingeha Discount bo set ne {0}
+DocType: Subscription,Subscription Start Date,Daxuyaniya destpêkê
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attach .csv file bi du stûnên, yek ji bo ku bi navê kevin û yek jî ji bo navê xwe yê nû"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne jî di tu aktîv sala diravî.
 DocType: Packed Item,Parent Detail docname,docname Detail dê û bav
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","World: Kurdî: {0}, Code babet: {1} û Mişterî: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Dîroka Dozgeriya Dawî Dîroka Berî Dema Dema Dema Dadgehê Dema Destpêk Dîrok Nabe
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vekirina ji bo Job.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM ne ji bo veguhestina pelê {0} li ser row {1}
@@ -147,7 +143,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,"Di heman şirketê de ye ketin, ji carekê zêdetir"
 DocType: Patient,Married,Zewicî
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ji bo destûr ne {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Get tomar ji
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Get tomar ji
 DocType: Price List,Price Not UOM Dependant,Bersaziya UOM Dependent
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
@@ -178,12 +174,12 @@
 DocType: Vehicle Service,Brake Oil,Oil şikand
 DocType: Tax Rule,Tax Type,Type bacê
 ,Completed Work Orders,Birêvebirina Kar
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Şêwaz ber bacê
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Şêwaz ber bacê
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Destûra te tune ku lê zêde bike an update entries berî {0}
 DocType: BOM,Item Image (if not slideshow),Wêne Babetê (eger Mîhrîcana ne)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saet Rate / 60) * Time Actual Operation
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Divê Daxuyaniya Dokumenta Pêdivî ye Yek ji Mirova Claim an Çîroka Çandî be
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Hilbijêre BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Divê Daxuyaniya Dokumenta Pêdivî ye Yek ji Mirova Claim an Çîroka Çandî be
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Hilbijêre BOM
 DocType: SMS Log,SMS Log,SMS bike Têkeve Têkeve
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost ji Nawy Çiyan
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Dema ku ji bo karkerê dayîn pêşîn danîn
@@ -199,19 +195,19 @@
 DocType: Delivery Trip,Delivery Notification,Daxuyaniya Şandin
 DocType: Journal Entry,Opening Entry,Peyam di roja vekirina
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Account Pay Tenê
-DocType: Employee Loan,Repay Over Number of Periods,Bergîdana Hejmara Over ji Maweya
+DocType: Loan,Repay Over Number of Periods,Bergîdana Hejmara Over ji Maweya
 DocType: Stock Entry,Additional Costs,Xercên din
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Account bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
 DocType: Lead,Product Enquiry,Lêpirsînê ya Product
 DocType: Education Settings,Validate Batch for Students in Student Group,Validate Batch bo Xwendekarên li Komeleya Xwendekarên
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No record îzna dîtin ji bo karker {0} ji bo {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},No record îzna dîtin ji bo karker {0} ji bo {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ji kerema xwe ve yekemîn şîrketa binivîse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Ji kerema xwe ve yekem Company hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Ji kerema xwe ve yekem Company hilbijêre
 DocType: Employee Education,Under Graduate,di bin Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Ji kerema xwe ya şîfreyê ji bo HR Şertê ji bo Şerta Dewleta Dewletê veke.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,target ser
 DocType: BOM,Total Cost,Total Cost
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Xebatkarê Loan
 DocType: Fee Schedule,Send Payment Request Email,Request Request Email bişîne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,"Babetê {0} nayê di sîstema tune ne, an jî xelas bûye"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Emlak
@@ -231,21 +227,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Serkeftî nayê qeyd kirin.
 DocType: Assessment Result,Grade,Sinif
 DocType: Restaurant Table,No of Seats,No Seats
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ji bo mijara dînamîkî zêde bike, wekî jinja tagên bikar bînin <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Teslîmî By Supplier
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tebaxê Parastina Binesaziyê
 DocType: SMS Center,All Contact,Hemû Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salary salane
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salary salane
 DocType: Daily Work Summary,Daily Work Summary,Nasname Work rojane
 DocType: Period Closing Voucher,Closing Fiscal Year,Girtina sala diravî
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} frozen e
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Mesref Stock
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Mesref Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Select Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Select Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ji kerema xwe re têkevin Preferred Contact Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Ji kerema xwe re têkevin Preferred Contact Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Peyam kontrayî
 DocType: Journal Entry Account,Credit in Company Currency,Credit li Company Exchange
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Navnîşana sereke
 DocType: Production Plan,Material Request Detail,Pêdivî ye
 DocType: Selling Settings,Default Quotation Validity Days,Rojên Dersa Nermalav
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Mîhengên ji bo Module HR
 DocType: SMS Center,SMS Center,Navenda SMS
 DocType: Sales Invoice,Change Amount,Change Mîqdar
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Kategorî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Ji kerema xwe, Dîroka Deliveryê bike"
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Peyam Farhad.
+DocType: HR Settings,Leave Settings,Settings
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,request type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Make Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modela Setup ya POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Destpêkkirina demên têkoşîna li dijî Birêvebirina Karanîna qedexekirin. Operasyon dê li dijî karûbarê kar bikin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Birêverbirî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Birêverbirî
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details ji operasyonên hatiye lidarxistin.
 DocType: Asset Maintenance Log,Maintenance Status,Rewş Maintenance
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Agahdariya Agahdariyê
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier dijî account cîhde pêwîst e {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Nawy û Pricing
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total saetan: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Ji Date divê di nava sala diravî be. Bihesibînin Ji Date = {0}
 DocType: Drug Prescription,Interval,Navber
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Hezî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Hezî
 DocType: Grant Application,Individual,Şexsî
 DocType: Academic Term,Academics User,akademîsyenên Bikarhêner
 DocType: Cheque Print Template,Amount In Figure,Mîqdar Li Figure
-DocType: Employee Loan Application,Loan Info,deyn Info
+DocType: Loan Application,Loan Info,deyn Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan ji bo serdanên maintenance.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Supplier Scorecard Period
 DocType: Share Transfer,Share Transfer,Transfer Share
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Şablon Şablon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemistry
 DocType: Job Offer,Select Terms and Conditions,Hilbijêre şert û mercan
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Nirx out
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Nirx out
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 DocType: Production Plan,Sales Orders,ordênên Sales
 DocType: Purchase Taxes and Charges,Valuation,Texmînî
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Default Herêma
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televîzyon
 DocType: Work Order Operation,Updated via 'Time Log',Demê via &#39;Time Têkeve&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},mîqdara Advance ne dikarin bibin mezintir {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Hilbijêre yan xerîdarê hilbijêrin.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},mîqdara Advance ne dikarin bibin mezintir {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Lîsteya Series ji bo vê Transaction
 DocType: Company,Enable Perpetual Inventory,Çalak Inventory Eternal
+DocType: Bank Guarantee,Charges Incurred,Tezmînat
 DocType: Company,Default Payroll Payable Account,Default maeş cîhde Account
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Ma Opening Peyam
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Encam
 DocType: Delivery Stop,Contact Name,Contact Name
 DocType: Course Assessment Criteria,Course Assessment Criteria,Şertên Nirxandina Kurs
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Id Id:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Id Id:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Nasnameya nasnameyê:
 DocType: POS Customer Group,POS Customer Group,POS Mişterî Group
 DocType: Land Unit,Land Unit describing various land assets,Yekîneya Land Landê diyar kirine
@@ -374,9 +371,8 @@
 ,Open Work Orders,Orders Open
 DocType: Payment Term,Credit Months,Mehê kredî
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay Net nikare bibe kêmtir ji 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ji bo agahdariya çewtiya şaşkirina şaşkirina şertên şandina dravê rawestînin, me li ser beşdariya seqetkirî hate kontrolkirin"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Dihêle per Sal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Dihêle per Sal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Hêvîye &#39;de venêrî Is Advance&#39; li dijî Account {1} eger ev an entry pêşwext e.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Warehouse {0} nayê ji şîrketa girêdayî ne {1}
 DocType: Email Digest,Profit & Loss,Qezencê &amp; Loss
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Ji kerema xwe xwendekarên Xwendekar ji Komên Xwendekar re saz bikin
 DocType: Item Website Specification,Item Website Specification,Specification babete Website
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Arşîva Bank
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Dev ji astengkirin
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Arşîva Bank
 DocType: Crop,Annual,Yeksalî
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Babetê Stock Lihevkirinê
 DocType: Stock Entry,Sales Invoice No,Sales bi fatûreyên No
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs Komeleya Xwendekarên Tool Creation
 DocType: Lead,Do Not Contact,Serî
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Kesên ku di rêxistina xwe hînî
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Developer
 DocType: Item,Minimum Order Qty,Siparîşa hindiktirîn Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Course Scheduling Tool,Course Start Date,Kurs Date Start
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Weşana Hub
 DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Daxwaza maddî
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Details kirîn
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Quotations New
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip Emails meaş ji bo karker li ser epeyamê yê xwestî di karkirinê yên hilbijartî
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"The yekem Approver Leave di lîsteyê de, wê bê weke default Leave Approver danîn"
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Fêrbûn
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Fêrbûn
 DocType: Asset,Next Depreciation Date,Next Date Farhad.
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activity per Employee
 DocType: Accounts Settings,Settings for Accounts,Mîhengên ji bo Accounts
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques Outstanding û meden ji bo paqijkirina
 DocType: Item,Synced With Hub,Senkronîzekirin Bi Hub
 DocType: Driver,Fleet Manager,Fîloya Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nikare were ji bo em babete neyînî {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nikare were ji bo em babete neyînî {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Şîfreya çewt
 DocType: Item,Variant Of,guhertoya Of
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Qediya Qty ne dikarin bibin mezintir &#39;Qty ji bo Manufacture&#39;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Ji kerema xwe ji odeya otêlê li ser xuyakirinê {}
 DocType: Journal Entry,Multi Currency,Multi Exchange
 DocType: Opening Invoice Creation Tool,Invoice Type,bi fatûreyên Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Delivery Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Delivery Note
 DocType: Consultation,Encounter Impression,Têkoşîna Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Avakirina Baca
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Cost ji Asset Sold
@@ -502,11 +497,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rate li ku Mişterî Exchange ji bo pereyan base mişterî bîya
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Bêguman] Di dema destpêkirina% s ji bo% s de çewtî
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,Rate bacê
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Dema serîlêdanê dikare di raporta her du alavê de ne
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Dema serîlêdanê dikare di raporta her du alavê de ne
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} berê ji bo karkirinê yên bi rêk û {1} ji bo dema {2} ji bo {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No divê eynî wek {1} {2}
@@ -520,7 +514,7 @@
 DocType: Purchase Order,% Received,% pêşwazî
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Create komên xwendekaran
 DocType: Volunteer,Weekends,Weekend
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Credit Têbînî Mîqdar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Credit Têbînî Mîqdar
 DocType: Setup Progress Action,Action Document,Belgeya Çalakiyê
 DocType: Chapter Member,Website URL,URL
 ,Finished Goods,Goods qedand
@@ -534,6 +528,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,lê zêde bike babetî
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Babet Berhemên parametreyê
+DocType: Leave Application,Leave Approver Name,Dev ji Name Approver
 DocType: Depreciation Schedule,Schedule Date,Date de Cedwela
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Earnings, Daşikandinên û pêkhateyên dî Salary"
 DocType: Packed Item,Packed Item,Babetê Packed
@@ -552,7 +547,7 @@
 DocType: Request for Quotation,Request for Quotation,Daxwaza ji bo Quotation
 DocType: Healthcare Settings,Require Lab Test Approval,Pêwîstiya Tîma Tîpa Lêdanê ye
 DocType: Salary Slip Timesheet,Working Hours,dema xebatê
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Tiştek Berbiçav
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Tiştek Berbiçav
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.
 DocType: Dosage Strength,Strength,Qawet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Create a Mişterî ya nû
@@ -565,7 +560,7 @@
 DocType: Workstation,Consumable Cost,Cost bikaranînê
 DocType: Purchase Receipt,Vehicle Date,Date Vehicle
 DocType: Student Log,Medical,Pizişkî
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Sedem ji bo winda
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Sedem ji bo winda
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Hejmarê Hesabê nû bike
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Xwedîyê Lead nikare bibe wek beşa Komedî de
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,butçe dikare ne mezintir mîqdara unadjusted
@@ -575,11 +570,10 @@
 DocType: Lab Test Template,Single,Yekoyek
 DocType: Salary Slip,Total Loan Repayment,Total vegerandinê Loan
 DocType: Account,Cost of Goods Sold,Cost mal Sold
-DocType: Subscription,Yearly,Hit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
 DocType: Drug Prescription,Dosage,Pîvanîk
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Rate firotin
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Rate firotin
 DocType: Assessment Plan,Examiner Name,Navê sehkerê
 DocType: Lab Test Template,No Result,No Result
 DocType: Purchase Invoice Item,Quantity and Rate,Quantity û Rate
@@ -588,6 +582,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ji kerema xwe re navê şîrketa binivîse
 DocType: Purchase Invoice,Supplier Name,Supplier Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Xandinê Manual ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Di Calendar de Hemû Endamên Endamên Hilbijartinan Hilbijêre
 DocType: Purchase Invoice,01-Sales Return,Vegerîna 01-Sep
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,Hîn Orders Purchase
@@ -605,13 +600,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,warê Mandatory - Year (Ekadîmî)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ne girêdayî {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sīroveyan text destpêkê de ku wekî beşek ji ku email diçe. Her Kirarî a text destpêkê de ji hev cuda.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Tikaye default account cîhde danîn ji bo ku şîrketa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Tikaye default account cîhde danîn ji bo ku şîrketa {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Veguhastina qedexekirina Karê Karê Saziyê {0}
 DocType: Setup Progress Action,Min Doc Count,Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,settings Global ji bo hemû pêvajoyên bi aktîvîteyên.
 DocType: Accounts Settings,Accounts Frozen Upto,Hesabên Frozen Upto
 DocType: SMS Log,Sent On,şandin ser
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
 DocType: HR Settings,Employee record is created using selected field. ,record Employee bikaranîna hilbijartî tên afirandin e.
 DocType: Sales Order,Not Applicable,Rêveber
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Holiday.
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserved for sale
 DocType: Packing Slip,From Package No.,Ji No. Package
 DocType: Item Attribute,To Range,to range
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Birûmet û meden
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Can rêbaza nirxandina ku nayê guhertin, çawa ku muamele li dijî hin tomar ku ev ne li wir rêbaza nirxandinê ya xwe ye"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Birûmet û meden
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Can rêbaza nirxandina ku nayê guhertin, çawa ku muamele li dijî hin tomar ku ev ne li wir rêbaza nirxandinê ya xwe ye"
 DocType: Student Report Generation Tool,Attended by Parents,Bi Parêzan ve girêdayî ye
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hemû pelên bi rêk û wêneke e
 DocType: Patient,AB Positive,AB positive
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,record amadebûnê.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Component meaş ji bo payroll li timesheet.
 DocType: Sales Order Item,Used for Production Plan,Tê bikaranîn ji bo Plan Production
-DocType: Employee Loan,Total Payment,Total Payment
+DocType: Loan,Total Payment,Total Payment
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Ji bo Birêvebirina Karûbarê Karûbarê Karûbar qedexe nekin.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time di navbera Operasyonên (li mins)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} betal e da ku di çalakiyê de ne, dikare bi dawî bibe"
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts bes ji bo Build
 DocType: POS Profile User,POS Profile User,POS Profîl User
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Dahata rasterast
+DocType: Subscription Invoice,Subscription Invoice,Alîkariya Barkirina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Dahata rasterast
 DocType: Patient Appointment,Date TIme,Dîroka TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Dikarin li ser Account ne filter bingeha, eger destê Account komkirin"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Berpirsê kargêrî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Berpirsê kargêrî
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kompan û bacê saz bikin
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
 DocType: Codification Table,Codification Table,Table Codification
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Ji kerema xwe ve Company hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Ji kerema xwe ve Company hilbijêre
 DocType: Stock Entry Detail,Difference Account,Account Cudahiya
 DocType: Purchase Invoice,Supplier GSTIN,Supplier GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Can karê nêzîkî wek karekî girêdayî wê {0} e girtî ne ne.
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Şablonên kredî yên mappingê
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
 DocType: Journal Entry,Difference (Dr - Cr),Cudahiya (Dr - Kr)
+DocType: Bank Guarantee,Providing,Pêşkêş dikin
 DocType: Account,Profit and Loss,Qezenc û Loss
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nayê destnîşankirin, wekî pêwîst be"
 DocType: Patient,Risk Factors,Faktorên Raks
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier bi fatûreyên No
 DocType: Territory,For reference,ji bo referansa
 DocType: Healthcare Settings,Appointment Confirmation,Daxuyaniya rûniştinê
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ne dikarin jêbirin Serial No {0}, wekî ku di karbazarên stock bikaranîn"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","ne dikarin jêbirin Serial No {0}, wekî ku di karbazarên stock bikaranîn"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Girtina (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Slav
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Babetê move
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Berî berê yê default {0} ji bo bikarhênerê {1} navekî veguherîn,, navekî nermalav hate qedexekirin"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financial / salê.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nirxên Accumulated
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Mixabin, Serial Nos bi yek bên"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Mixabin, Serial Nos bi yek bên"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory di POS Profile de pêwîst e
 DocType: Supplier,Prevent RFQs,Rakirina RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Make Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salary Slip ji bo demjimêr ji {0} heta {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Salary Slip ji bo demjimêr ji {0} heta {1}
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,ÃƒÆ Bi tevahî
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Bill Date
 DocType: Production Plan,Production Plan,Plana hilberînê
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Di Vebijandina Destûra Rêkeftinê de vekin
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Return Sales
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Return Sales
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nîşe: Hemû pelên bi rêk û {0} ne pêwîst be kêmtir ji pelên jixwe pejirandin {1} ji bo dema
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Li Qanûna Qanûna Saziyê Hilbijêre Li ser Serial No Serial
 ,Total Stock Summary,Stock Nasname Total
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Teslîmî destê Supplier (Drop Ship)
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,butçe ne dikare bibe neyînî
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Xêra xwe li Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Xêra xwe li Company
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,billed Amt
 DocType: Training Result Employee,Training Result Employee,Xebatkarê Training Encam
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse mantiqî li dijî ku entries stock made bi.
-DocType: Repayment Schedule,Principal Amount,Şêwaz sereke
-DocType: Employee Loan Application,Total Payable Interest,Total sûdî
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Şêwaz sereke
+DocType: Loan Application,Total Payable Interest,Total sûdî
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total Outstanding: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales bi fatûreyên timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Çavkanî No &amp; Date: Çavkanî pêwîst e ji bo {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
 DocType: Restaurant Reservation,Restaurant Reservation,Reservation Restaurant
 DocType: Land Unit,Land Unit Name,Navendiya Land Land
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Writing Pêşniyarek
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Writing Pêşniyarek
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment dabirîna Peyam
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Wrapping up
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Bi rêya Peywendîdarên Îmêlê agahdar bikin
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Bi rêya Peywendîdarên Îmêlê agahdar bikin
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Din Person Sales {0} bi heman id karkirinê heye
 DocType: Employee Advance,Claimed Amount,Amûrek qedexekirin
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Account Gateway tên afirandin ne, ji kerema xwe ve yek bi destan biafirîne."
 DocType: Supplier Scorecard,Per Year,Serê sal
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ji bo vê bernameya ku DOB-ê ji bo serîlêdanê qebûl nake
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 DocType: Sales Invoice,Sales Taxes and Charges,Baca firotina û doz li
 DocType: Employee,Organization Profile,rêxistina Profile
 DocType: Vital Signs,Height (In Meter),Bilind (Di Meterê de)
 DocType: Student,Sibling Details,Details Sibling
 DocType: Vehicle Service,Vehicle Service,Xizmeta Vehicle
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Otomatîk request Deng de li ser şert û mercên vêdixin.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Otomatîk request Deng de li ser şert û mercên vêdixin.
 DocType: Employee,Reason for Resignation,Sedem ji bo îstîfakirinê
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Şablon ji bo Şiroveyên performance.
 DocType: Sales Invoice,Credit Note Issued,Credit Têbînî Issued
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Cedwela Maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Rules Hingê Pricing bi filtrata derve li ser bingeha Mişterî, Mişterî Group, Herêma, Supplier, Supplier Type, Kampanya, Sales Partner hwd."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Change Net di Inventory
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Xebatkarê Management Loan
 DocType: Employee,Passport Number,Nimareya pasaportê
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Peywendiya bi Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Rêvebir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Rêvebir
 DocType: Payment Entry,Payment From / To,Payment From / To
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ji kerema xwe li Warehouse hesab bike. {0}
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,Transfer maddî
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Ji bo riya nehate dîtin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening (Dr)
+DocType: Loan,Applicant,Namzêd
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Deaktîv bike û demxeya divê piştî be {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Ji bo dokumentên nû vekin
 ,GST Itemised Purchase Register,Gst bidine Buy Register
 DocType: Course Scheduling Tool,Reschedule,Demanî tarloqkirin
-DocType: Employee Loan,Total Interest Payable,Interest Total cîhde
+DocType: Loan,Total Interest Payable,Interest Total cîhde
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Bac, Cost siwar bûn û doz li"
 DocType: Work Order Operation,Actual Start Time,Time rastî Start
 DocType: BOM Operation,Operation Time,Time Operation
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Qedandin
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Bingeh
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Bingeh
 DocType: Timesheet,Total Billed Hours,Total Hours billed
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Hewe Off Mîqdar
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Hewe Off Mîqdar
 DocType: Leave Block List Allow,Allow User,Destûrê bide Bikarhêner
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Account qezenc / Loss li ser çespandina Asset
 DocType: Vehicle Log,Service Details,Details Service
 DocType: Vehicle Log,Service Details,Details Service
-DocType: Subscription,Quarterly,Bultena
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,Delivery Têbînî pêwîst
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Bîlançoya Time
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush madeyên xav ser
 DocType: Sales Invoice,Port Code,Koda Portê
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Warehouse
 DocType: Lead,Lead is an Organization,Lead rêxistinek e
 DocType: Guardian Interest,Interest,Zem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,bikarhênerên
 DocType: Vehicle,Odometer Value (Last),Nirx Green (dawî)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates of supplier scorecard standard.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Peyam di peredana ji nuha ve tên afirandin
 DocType: Request for Quotation,Get Suppliers,Harmend bibin
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock niha:
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne ji Babetê girêdayî ne {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Bikini Salary
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne ji Babetê girêdayî ne {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Bikini Salary
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Hûn dikarin tenê nûve bikin ku endametiya we di nav 30 rojan de derbas dibe
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Tenê hilbijêre ku hûn dokumentên dirûşmeyên mûçeyê yên damezirandin hilbijêre
 DocType: Email Digest,Next email will be sent on:,email Next dê li ser şand:
 DocType: Supplier Scorecard,Per Week,Per Week
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Em babete Guhertoyên.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Tendurist
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Babetê {0} nehate dîtin
 DocType: Bin,Stock Value,Stock Nirx
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Peyam Credit Card
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company û Hesab
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,di Nirx
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,di Nirx
 DocType: Asset Settings,Depreciation Options,Options Options
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Wexta Posteyê çewt
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Wexta Posteyê çewt
 DocType: Lead,Campaign Name,Navê kampanyayê
 DocType: Hotel Room,Capacity,Kanîn
 DocType: Selling Settings,Close Opportunity After Days,Close Opportunity Piştî Rojan
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Buy Mişterî ya Order No
 DocType: Budget,Budget Against,budceya dijî
 DocType: Employee,Cell Number,Hejmara Cell
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ji bo pîvanên nirxdar tune tune. Vê kontrol bikin ku hejmarên meaşan nehatibû afirandin.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ji bo pîvanên nirxdar tune tune. Vê kontrol bikin ku hejmarên meaşan nehatibû afirandin.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Daxwazên Auto Material Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Windabû
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Tu dikarî bi fîşeke niha li nakeve &#39;li dijî Peyam Journal&#39; column
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Ji kerema xwe sifrê hilbijêrin
 DocType: BOM,Website Specifications,Specifications Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} Navnîşa e-nameyek e ku li &#39;Recipients&#39;
 DocType: Special Test Items,Particulars,Peyvên
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Ji {0} ji type {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Ji {0} ji type {1}
 DocType: Warranty Claim,CI-,çi-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Factor Converter wêneke e
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rules Price Multiple bi pîvanên heman heye, ji kerema xwe ve çareser şer ji aliyê hêzeke pêşanî. Rules Biha: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,ne dikarin neçalak bikî an betal BOM wekî ku bi din dikeye girêdayî
 DocType: Asset,Maintenance,Lênerrînî
+DocType: Subscriber,Subscriber,Hemû
 DocType: Item Attribute Value,Item Attribute Value,Babetê nirxê taybetmendiyê
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Ji kerema xwe ya Rewşa Pergalê ya nû bike
 DocType: Item,Maximum sample quantity that can be retained,Kêmeya nimûne ya ku herî zêde binçavkirin
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,mîhengên standard ji bo Têxe selikê
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Add Timesots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset belav via Peyam Journal {0}
-DocType: Employee Loan,Interest Income Account,Account Dahata Interest
+DocType: Loan,Interest Income Account,Account Dahata Interest
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Daxuyaniya Şandina Dîtinê
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnology
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Mesref Maintenance Office
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Mesref Maintenance Office
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Biçe
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Avakirina Account Email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ji kerema xwe ve yekem babetî bikevin
 DocType: Asset Repair,Downtime,Downtime
 DocType: Account,Liability,Bar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Termê Akademîk:
 DocType: Salary Detail,Do not include in total,Bi tevahî nabe
 DocType: Company,Default Cost of Goods Sold Account,Default Cost ji Account Goods Sold
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Kêmeya nimûne {0} dikare ji hêla mêjûya wergirtiye {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,List Price hilbijartî ne
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,List Price hilbijartî ne
 DocType: Employee,Family Background,Background Family
 DocType: Request for Quotation Supplier,Send Email,Send Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
 DocType: Item,Max Sample Quantity,Hêjeya Berbi Sample
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,No Destûr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,No Destûr
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Gotinê
 DocType: Vital Signs,Heart Rate / Pulse,Dilê Dil / Pulse
 DocType: Company,Default Bank Account,Account Bank Default
@@ -1087,12 +1083,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Nawy bi weightage mezintir dê mezintir li banî tê
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lîsteyên Tebûr û Nîşaneyên Navneteweyî
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Bank Lihevkirinê
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No karker dîtin
-DocType: Subscription,Stopped,rawestandin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Update Update.
 DocType: SMS Center,All Customer Contact,Hemû Mişterî Contact
 DocType: Land Unit,Tree Details,Details dara
@@ -1142,7 +1137,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Hemû Groups babetî
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,"Otomatîk helbestan, peyamek li ser sertewandina muamele."
 DocType: Work Order,Item To Manufacture,Babetê To Manufacture
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status e {2}
@@ -1156,7 +1150,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Hilbijêre, eger navnîşana bijartî piştî tomarkirinê hate guherandin"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
 DocType: Item,Hub Publishing Details,Agahdariyên Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Dergeh&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Dergeh&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Delivery Têbînî Message
 DocType: Lab Test Template,Result Format,Result Format
@@ -1166,7 +1160,7 @@
 DocType: Payroll Entry,Bimonthly,pakêtê de
 DocType: Vehicle Service,Brake Pad,Pad şikand
 DocType: Fertilizer,Fertilizer Contents,Naverokên Fertilizer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Lêkolîn &amp; Development
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Lêkolîn &amp; Development
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Mîqdar ji bo Bill
 DocType: Company,Registration Details,Details Registration
 DocType: Timesheet,Total Billed Amount,Temamê meblaxa billed
@@ -1180,7 +1174,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Sînorkirina kredî ya li firotina bargiraniyê kontrol bikin
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,nirxandina Performance.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ne bitenê &#39;bi kar bîne ji bo Têxe selikê&#39;, wek Têxe selikê pêk tê û divê bi kêmanî yek Rule Bacê ji bo Têxe selikê li wir be"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Peyam di peredana {0} li dijî Order {1}, ka jî, divê wekî pêşda li vê fatoreyê de vekişiyaye ve girêdayî ye."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Peyam di peredana {0} li dijî Order {1}, ka jî, divê wekî pêşda li vê fatoreyê de vekişiyaye ve girêdayî ye."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Nirx
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-ji-Sale
@@ -1214,7 +1208,7 @@
 DocType: Restaurant Table,Minimum Seating,Min kêm rûniştinê
 DocType: Item Attribute,Item Attribute Values,Nirxên Pêşbîr babetî
 DocType: Examination Result,Examination Result,Encam muayene
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Meqbûz kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Meqbûz kirîn
 ,Received Items To Be Billed,Pêşwaziya Nawy ye- Be
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,rêjeya qotîk master.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},"Çavkanî Doctype, divê yek ji yên bê {0}"
@@ -1222,15 +1216,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
 DocType: Work Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} divê çalak be
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Naveroka ku ji bo veguhestinê nîne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} divê çalak be
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Naveroka ku ji bo veguhestinê nîne
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Pevçûn
 DocType: Journal Entry,Depreciation Entry,Peyam Farhad.
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Ji kerema xwe re ji cureyê pelgeyê hilbijêre
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Betal Serdan Material {0} berî betalkirinê ev Maintenance Visit
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Nirxandin û dakêşin
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} nayê to Babetê girêdayî ne {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial No {0} nayê to Babetê girêdayî ne {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,required Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favorites
 DocType: Hub Settings,Custom Data,Daneyên Taybetî
@@ -1242,9 +1236,9 @@
 DocType: Medical Code,Medical Code Standard,Standard Code
 DocType: Soil Texture,Clay Composition (%),Çargoşe (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Ji kerema xwe berî karûbarê xwe biparêze.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Nirx Balance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Nirx Balance
 DocType: Lab Test,Lab Technician,Teknîkî Lab
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lîsteya firotina Price
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lîsteya firotina Price
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Heke kontrol kirin, dê mişterek dê were çêkirin, mapped to nexweş. Li dijî vê miqametê dê dê vexwendin nexweşan. Hûn dikarin di dema dema dermanan de bargêrînerê mêvandar hilbijêre."
 DocType: Bank Reconciliation,Account Currency,account Exchange
@@ -1252,16 +1246,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Ji kerema xwe re qala Round Account Off li Company
 DocType: Purchase Receipt,Range,Dirêjahî
 DocType: Supplier,Default Payable Accounts,Default Accounts cîhde
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
 DocType: Fee Structure,Components,Components
 DocType: Item Barcode,Item Barcode,Barcode
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Babetê Variants {0} ve
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","bên afirandin. Heke derengî, divê hûn bixweber bikin &quot;Guhertina Di Roja meha&quot; de"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
 DocType: Share Transfer,From Folio No,Ji Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Bikirin bi fatûreyên Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: entry Credit ne bi were bi girêdayî a {1}
@@ -1296,16 +1288,17 @@
 DocType: Asset,Available-for-use Date,Dîrok-ji-bikaranîn-Dîrok
 DocType: Guardian,Guardian Name,Navê Guardian
 DocType: Cheque Print Template,Has Print Format,Has Print Format
-DocType: Employee Loan,Sanctioned,belê
+DocType: Loan,Sanctioned,belê
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,bivênevê ye. Dibe ku rekor Exchange ji bo tên afirandin ne
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: kerema xwe diyar bike Serial No bo Babetê {1}
 DocType: Crop Cycle,Crop Cycle,Çop Çap
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Ji bo tomar &#39;Product Bundle&#39;, Warehouse, Serial No û Batch No wê ji ser sifrê &#39;Lîsteya Packing&#39; nirxandin. Ger Warehouse û Batch No bo hemû tomar bo barkirinê bo em babete ti &#39;Bundle Product&#39; eynî ne, wan nirxan dikare li ser sifrê Babetê serekî ketin, nirxên wê bê kopîkirin to &#39;tê de Lîsteya&#39; sifrê."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Ji bo tomar &#39;Product Bundle&#39;, Warehouse, Serial No û Batch No wê ji ser sifrê &#39;Lîsteya Packing&#39; nirxandin. Ger Warehouse û Batch No bo hemû tomar bo barkirinê bo em babete ti &#39;Bundle Product&#39; eynî ne, wan nirxan dikare li ser sifrê Babetê serekî ketin, nirxên wê bê kopîkirin to &#39;tê de Lîsteya&#39; sifrê."
 DocType: Student Admission,Publish on website,Weşana li ser malpera
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Date Supplier bi fatûreyên ne dikarin bibin mezintir Mesaj Date
+DocType: Subscription,Cancelation Date,Dîroka Cancelkirinê
 DocType: Purchase Invoice Item,Purchase Order Item,Bikirin Order babetî
 DocType: Agriculture Task,Agriculture Task,Taskariya Çandiniyê
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dahata nerasterast di
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Dahata nerasterast di
 DocType: Student Attendance Tool,Student Attendance Tool,Amûra Beşdariyê Student
 DocType: Restaurant Menu,Price List (Auto created),Lîsteya bihayê (Auto-created)
 DocType: Cheque Print Template,Date Settings,Settings Date
@@ -1332,6 +1325,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Jimarvan
 DocType: Workstation,Electricity Cost,Cost elektrîkê
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Datetime lab testê ji beriya datetime berdin
+DocType: Subscription Plan,Cost,Nirx
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ma Employee Birthday Reminders bişîne ne
 DocType: Expense Claim,Total Advance Amount,Giştî ya Serkeftinê
 DocType: Delivery Stop,Estimated Arrival,Hilbijartina Bêguman
@@ -1343,15 +1337,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload nameya serokê û logo xwe. (Tu ji wan paşê biguherîne).
 DocType: Timesheet Detail,Bill,Hesab
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Spî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Spî
 DocType: SMS Center,All Lead (Open),Hemû Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty ji bo amade ne {4} li warehouse {1} hate dem bi mesaj û ji entry ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Hûn dikarin tenê ji bila yek ji yek bijareya lîsteya navnîşên kontrola kontrolê hilbijêre.
 DocType: Purchase Invoice,Get Advances Paid,Get pêşketina Paid
 DocType: Item,Automatically Create New Batch,Otomatîk Create Batch New
 DocType: Item,Automatically Create New Batch,Otomatîk Create Batch New
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Navnîşan {0} heta {1} (row {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Kirin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Navnîşan {0} heta {1} (row {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Kirin
 DocType: Student Admission,Admission Start Date,Admission Serî Date
 DocType: Journal Entry,Total Amount in Words,Temamê meblaxa li Words
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Karmendê Nû
@@ -1367,7 +1361,7 @@
 DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Balance Loan Mîqdar
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Kurs de Cedwela
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Vebijêrkên Stock
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Vebijêrkên Stock
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Pirtûka Hilbijartinê Dawîn Kirîna Navîn Di Purchase Order in Disable
 DocType: Journal Entry Account,Expense Claim,mesrefan
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Ma tu bi rastî dixwazî ji bo restorekirina vê hebûnê belav buye?
@@ -1386,11 +1380,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Packing babet Slip
 DocType: Purchase Invoice,Cash/Bank Account,Cash Account / Bank
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ji kerema xwe binivîsin a {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
 DocType: Delivery Note,Delivery To,Delivery To
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Afirandina çêkirina guhertin.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Ji bo {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pêwîstina pêşîn ya pêşîn di lîsteyê dê wekî veberhênana default ya dabeşkirî be.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
 DocType: Production Plan,Get Sales Orders,Get Orders Sales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ne dikare bibe neyînî
 DocType: Training Event,Self-Study,Xweseriya Xweser
@@ -1403,7 +1398,7 @@
 DocType: Workstation,Wages,Yomî
 DocType: Asset Maintenance,Maintenance Manager Name,Navê Mersûmê Navend
 DocType: Agriculture Task,Urgent,Acîl
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Ji kerema xwe re ID Row derbasdar bo row {0} li ser sifrê diyar {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Ji kerema xwe re ID Row derbasdar bo row {0} li ser sifrê diyar {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ne pejirandin bibînin:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Ji kerema xwe qadek hilbijêre ji bo numpadê biguherînin
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Dibe ku sîteya Ledger tête çêkirin nikare belgeyeke erê nabe.
@@ -1415,7 +1410,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Navê Xweseriya Kalîteyê Navê
 DocType: Project,First Email,Yekem E-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Reserved li Sales Order / Qediya Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Şêwaz firotin
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Şêwaz firotin
 DocType: Repayment Schedule,Interest Amount,Şêwaz Interest
 DocType: Serial No,Creation Document No,Creation dokumênt No
 DocType: Share Transfer,Issue,Pirs
@@ -1429,10 +1424,10 @@
 DocType: Tax Rule,Shipping State,Dewletê Shipping
 ,Projected Quantity as Source,Quantity projeya wek Source
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Babetê, divê bikaranîna &#39;Get Nawy ji Purchase Receipts&#39; button bê zêdekirin"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Trip Trip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Trip Trip
 DocType: Student,A-,YEK-
 DocType: Share Transfer,Transfer Type,Tîpa Transfer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Mesref Sales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Mesref Sales
 DocType: Consultation,Diagnosis,Teşhîs
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Buying Standard
 DocType: GL Entry,Against,Dijî
@@ -1441,12 +1436,13 @@
 DocType: Sales Partner,Implementation Partner,Partner Kiryariya
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Kode ya postî
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} e {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Hesabê dahatina hesabê li lênerê {3}
 DocType: Opportunity,Contact Info,Têkilî
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Making Stock Arşîva
 DocType: Packing Slip,Net Weight UOM,Net Loss UOM
 DocType: Item,Default Supplier,Default Supplier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Li ser Production Rêjeya Berdêlên
-DocType: Employee Loan,Repayment Schedule,Cedwela vegerandinê
+DocType: Loan,Repayment Schedule,Cedwela vegerandinê
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping Rule Rewşa
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Kurdî Nexşe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nikare bibe kêmtir ji Serî Date
@@ -1461,7 +1457,7 @@
 DocType: Education Settings,Attendance Freeze Date,Beşdariyê Freeze Date
 DocType: Education Settings,Attendance Freeze Date,Beşdariyê Freeze Date
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,"Lîsteya çend ji wholesale xwe. Ew dikarin bibin rêxistin, yan jî kesên."
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,View All Products
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,View All Products
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Siparîşa hindiktirîn Lead Age (Days)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Siparîşa hindiktirîn Lead Age (Days)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Hemû dikeye
@@ -1470,14 +1466,16 @@
 DocType: Expense Claim,From Employee,ji xebatkara
 DocType: Driver,Cellphone Number,Hejmara Telefonê
 DocType: Project,Monitor Progress,Pêşveçûna Çavdêriyê
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Hişyarî: System wê overbilling ji ber ku mîqdara ji bo babet ne bi {0} li {1} sifir e
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Hişyarî: System wê overbilling ji ber ku mîqdara ji bo babet ne bi {0} li {1} sifir e
 DocType: Journal Entry,Make Difference Entry,Make Peyam Cudahiya
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Alîkarîkirinê ji Date
 DocType: Appraisal Template Goal,Key Performance Area,Area Performance Key
 DocType: Program Enrollment,Transportation,Neqlîye
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Pêşbîr Invalid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} de divê bê şandin
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
+DocType: Department Approver,Department Approver,Dezgeha nêzî
 DocType: SMS Center,Total Characters,Total Characters
 DocType: Employee Advance,Claimed,Qedexekirin
 DocType: Crop,Row Spacing,Row Spacing
@@ -1487,6 +1485,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Payment Lihevkirinê bi fatûreyên
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,% Alîkarên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Li gor Settings Buying eger buy Order gireke == &#39;ERÊ&#39;, piştre ji bo afirandina Buy bi fatûreyên, bikarhêner ji bo afirandina buy Order yekem bo em babete {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-summary of supply supplies of outward
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,hejmara Company referansa li te. hejmara Bacê hwd.
 DocType: Sales Partner,Distributor,Belavkirina
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Têxe selikê Rule Shipping
@@ -1500,7 +1499,7 @@
 DocType: Setup Progress Action,Action Name,Navekî Çalak
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Serî Sal
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},First 2 malikên ji GSTIN divê bi hejmara Dewletê hev {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,date ji dema fatûra niha ve dest bi
 DocType: Salary Slip,Leave Without Pay,Leave Bê Pay
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Error Planning kapasîteya
@@ -1518,26 +1517,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Heya dê di dema demê de çêbirin dê kopî bibin.
 DocType: Setup Progress Action,Domains,Domain ji
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Actual Date Serî&#39; nikare bibe mezintir &#39;Date End Actual&#39;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Serekî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Serekî
 DocType: Cheque Print Template,Payer Settings,Settings Jaaniya
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we &quot;SM&quot;, e û code babete de ye &quot;T-SHIRT&quot;, code babete ji yên ku guhertoya wê bibe &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
 DocType: Purchase Invoice,Is Return,e Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Baldaynî
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Roja destpêkê di roja dawiya di karê &#39;{0}&#39; de mezintir e
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / Debit Têbînî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / Debit Têbînî
 DocType: Price List Country,Price List Country,List Price Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code babete dikarin ji bo No. Serial ne bê guhertin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Code babete dikarin ji bo No. Serial ne bê guhertin
 DocType: Purchase Invoice Item,UOM Conversion Factor,Factor Converter UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Tikaye kodî babet bikeve to get Hejmara Batch
 DocType: Stock Settings,Default Item Group,Default babetî Pula
-DocType: Employee Loan,Partially Disbursed,Qismen dandin de
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Agahdariyê bide
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Agahdariyê bide
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,heye Supplier.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Hûn nikarin endamê peymana ku destûr nabe.
 DocType: Account,Balance Sheet,Bîlançoya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
 DocType: Fee Validity,Valid Till,Till
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Civînek Mamoste Hemû
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
@@ -1550,7 +1549,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Redkirin Qty ne dikarin li Purchase Return ketin were
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Guhertina Xerîdarê ji bo Mişterek bijartî nayê destûr kirin.
 ,Purchase Order Items To Be Billed,Buy Order Nawy ye- Be
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Guherandinên demjimêr bistînin.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Guherandinên demjimêr bistînin.
 DocType: Program Enrollment Tool,Enrollment Details,Agahdarkirina Navnîşan
 DocType: Purchase Invoice Item,Net Rate,Rate net
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Ji kerema xwe mişterek hilbijêrin
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Niha Sal Fiscal
 DocType: Purchase Order,Group same items,Pol tomar heman
 DocType: Purchase Invoice,Disable Rounded Total,Disable Rounded Total
-DocType: Employee Loan Application,Repayment Info,Info vegerandinê
+DocType: Department,Parent Department,Daîreya Parentiyê
+DocType: Loan Application,Repayment Info,Info vegerandinê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Arşîva&#39; ne vala be
 DocType: Maintenance Team Member,Maintenance Role,Roja Parastinê
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Pekana row {0} bi heman {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Pekana row {0} bi heman {1}
 ,Trial Balance,Balance trial
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Avakirina Karmendên
 DocType: Sales Order,SO-,WIHA-
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
 DocType: Student,O-,öó
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Lêkolîn
+DocType: Subscription Settings,Subscription Settings,Sîstema Serastkirinê
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Lêkolîn
 DocType: Maintenance Visit Purpose,Work Done,work Done
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Ji kerema xwe re bi kêmanî yek taybetmendiyê de li ser sifrê, taybetiyên xwe diyar bike"
 DocType: Announcement,All Students,Hemû xwendekarên
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
 DocType: Crop Cycle,Less than a year,Salek kêmtir
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,"Na, xwendekarê Mobile"
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Din ên cîhanê
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Din ên cîhanê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
 DocType: Crop,Yield UOM,UOM
 ,Budget Variance Report,Budceya Report Variance
 DocType: Salary Slip,Gross Pay,Pay Gross
 DocType: Item,Is Item from Hub,Gelek ji Hubê ye
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Type Activity bivênevê ye.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,destkeftineke Paid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,destkeftineke Paid
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Şêwaz Cudahiya
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} Li Hilbijartinê {1}
 DocType: Purchase Invoice,Reverse Charge,Charge Reverse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,"Earnings û çûyîne,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,"Earnings û çûyîne,"
 DocType: Purchase Invoice,05-Change in POS,05-POS di POS
 DocType: Vehicle Log,Service Detail,Detail Service
 DocType: BOM,Item Description,Babetê Description
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Babetê derfet
 ,Student and Guardian Contact Details,Xwendekar û Guardian Contact Details
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Ji bo dabînkerê {0} Email Address pêwîst e ji bo şandina email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Opening demî
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Opening demî
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,View Hub
 ,Employee Leave Balance,Xebatkarê Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balance bo Account {0} tim divê {1}
 DocType: Patient Appointment,More Info,Agahî
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rate Valuation pêwîst ji bo vî babetî di rêza {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Rate Valuation pêwîst ji bo vî babetî di rêza {0}
 DocType: Supplier Scorecard,Scorecard Actions,Actions Card
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Mînak: Masters li Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Warehouse red
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ber
 DocType: Supplier Quotation Item,Lead Time in days,Time Lead di rojên
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Bikarhênerên Nasname cîhde
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Dayina meaş ji {0} ji bo {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Dayina meaş ji {0} ji bo {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},destûr ne ji bo weşînertiya frozen Account {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Outstanding hisab
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Bi giştî dikele, Doza / Transfer {0} li Daxwaza Material {1} \ ne dikarin bibin mezintir dorpêçê de xwestin {2} ji bo babet {3}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Biçûk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Biçûk
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Vebijêrîna Rêveberiya Amûriyê ya Vebijêrk
 DocType: Education Settings,Employee Number,Hejmara karker
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Piştî vegihîştina şandina şîfreya betal bike
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case No (s) jixwe tê bikaranîn. Try ji Case No {0}
 DocType: Project,% Completed,% Qediya
 ,Invoiced Amount (Exculsive Tax),Şêwaz fatore (Exculsive Bacê)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime Testing Testatory
 DocType: Email Digest,Add Quote,lê zêde bike Gotinên baş
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},faktora coversion UOM pêwîst ji bo UOM: {0} li babet: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Mesref nerasterast di
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Mesref nerasterast di
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Qty wêneke e
 DocType: Agriculture Analysis Criteria,Agriculture,Cotyarî
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Syncê Master Data
@@ -1691,16 +1693,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Ji bo {0}, tenê bikarhênerên credit dikare li dijî entry debit din ve girêdayî"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Teçxîzatên hatiye capital
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Teçxîzatên hatiye capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Ji kerema xwe kodê yekem hilbijêre
 DocType: Item,ITEM-,ŞANÎ-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
+DocType: Subscription Plan,Billing Interval Count,Barkirina Navnîşa Navnîşan
 DocType: Sales Invoice Item,Edit Description,biguherîne Description
 DocType: Antibiotic,Antibiotic,Antîbîyotîk
 ,Team Updates,Updates Team
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,ji bo Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Bikin Type Account di bijartina vê Account li muamele dike.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Exchange)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Create Print Format
@@ -1726,7 +1729,7 @@
 DocType: POS Item Group,POS Item Group,POS babetî Pula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Divê şerta alternatîf e ku wekî koda kodê nayê
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
 DocType: Sales Partner,Target Distribution,Belavkariya target
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Çareserkirina Nirxandina Provînalal
 DocType: Salary Slip,Bank Account No.,No. Account Bank
@@ -1743,7 +1746,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Daxwaza ji bo Supplier Quotation
 DocType: Healthcare Settings,Registration Message,Peyama Serkeftinê
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Car
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Car
 DocType: Prescription Dosage,Prescription Dosage,Dosage Dosage
 DocType: Attendance,HR Manager,Manager HR
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ji kerema xwe re Company hilbijêre
@@ -1774,7 +1777,7 @@
 DocType: Project,Start and End Dates,Destpêk û dawiya Kurdî Nexşe
 ,Delivered Items To Be Billed,Nawy teslîmî ye- Be
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse dikarin ji bo No. Serial ne bê guhertin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse dikarin ji bo No. Serial ne bê guhertin
 DocType: Authorization Rule,Average Discount,Average Discount
 DocType: Project Update,Great/Quickly,Mezin / Bi lez
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1783,8 +1786,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Tikaye lekerên bo em babete batched hilbijêre
 DocType: Asset,Depreciation Schedules,Schedules Farhad.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Di hesabên GST de bêne hilbijartin:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Di hesabên GST de bêne hilbijartin:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina
 DocType: Activity Cost,Projects,projeyên
 DocType: Payment Request,Transaction Currency,muameleyan Exchange
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Ji {0} | {1} {2}
@@ -1795,6 +1798,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Afganî
 DocType: POS Profile,Campaign,Bêşvekirin
 DocType: Supplier,Name and Type,Name û Type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Rewş erêkirina divê &#39;status&#39; an jî &#39;Redkirin&#39;
 DocType: Physician,Contacts and Address,Têkilî û Navnîşan
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Hêvîkirin Date Serî&#39; nikare bibe mezintir &#39;ya bende Date End&#39;
@@ -1808,19 +1812,20 @@
 DocType: Student Admission,Eligibility and Details,Nirx û Agahdariyê
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Change Net di Asset Fixed
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Vala bihêlin, eger ji bo hemû deverî nirxandin"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ji DateTime
 DocType: Email Digest,For Company,ji bo Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,log-Ragihandin a.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Daxwaza ji bo Quotation ji bo gihiştina ji portal hate qedexekirin, ji bo zêdetir settings portal check."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Variable Scoring
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Asta kirîn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Asta kirîn
 DocType: Sales Invoice,Shipping Address Name,Shipping Name Address
 DocType: Material Request,Terms and Conditions Content,Şert û mercan Content
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Gelek şaş bûne çêbikin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Serê yekem ya nêzîkî di lîsteyê de dê wek xerca pêşdûreyê ya nêzîkî dakêşin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,dikarin bibin mezintir 100 ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
 DocType: Maintenance Visit,Unscheduled,rayis
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Dimîne li ser Leave Bê Pay
@@ -1841,14 +1846,15 @@
 DocType: Package Code,Package Code,Code package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Şagird
 DocType: Purchase Invoice,Company GSTIN,Company GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Elemanekî negatîvî nayê ne bi destûr
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Elemanekî negatîvî nayê ne bi destûr
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","table detail Bacê biribû, ji master babete wek string û hilanîn di vê qadê de. Tê bikaranîn ji bo wî hûrhûr bike û wan doz li"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Eger account bêhest e, entries bi bikarhênerên sînorkirin destûr."
 DocType: Email Digest,Bank Balance,Balance Bank
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Di Perestgehê de Vegerîna Derfeta Nerazîbûnê Nerazî bibin
 DocType: Job Opening,"Job profile, qualifications required etc.","profile kar, bi dawîanîna pêwîst hwd."
 DocType: Journal Entry Account,Account Balance,Mêzîna Hesabê
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Rule Bacê ji bo muameleyên.
@@ -1875,15 +1881,15 @@
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},warehouse Source bo row wêneke e {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Çandinî (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Packing Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office Rent
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,settings deryek Setup SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Packing Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,settings deryek Setup SMS
 DocType: Disease,Common Name,Navê Navîn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import ser neket!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No address added yet.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Saet Xebatê
 DocType: Vital Signs,Blood Pressure,Pressure Pressure
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analîstê
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analîstê
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Details Sales
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validate jimartin Kurs ji bo Xwendekarên li Komeleya Xwendekarên
 DocType: Notification Control,Expense Claim Rejected,Mesrefan Redkirin
 DocType: Item,Item Attribute,Pêşbîr babetî
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Rêvebir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Rêvebir
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Îdîaya {0} berê ji bo Têkeve Vehicle heye
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Navê Enstîtuya
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Ji kerema xwe ve Mîqdar dayinê, binivîse"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Ji kerema xwe ve Mîqdar dayinê, binivîse"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variants babetî
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Salary ji bo karkirinê
 DocType: Cost Center,Parent Cost Center,Navenda Cost dê û bav
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Select Supplier muhtemel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Select Supplier muhtemel
 DocType: Sales Invoice,Source,Kanî
 DocType: Customer,"Select, to make the customer searchable with these fields","Hilbijêrin, da ku bikarhêneran bi van zeviyên lêgerînê bibînin"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show girtî
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Packing Slip (s) betalkirin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Flow Cash ji Investing
 DocType: Program Course,Program Course,Kurs Program
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Koçberên êşkencebûyî tê û şandinê de doz li
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Koçberên êşkencebûyî tê û şandinê de doz li
 DocType: Homepage,Company Tagline for website homepage,Company Tagline bo homepage malpera
 DocType: Item Group,Item Group Name,Babetê Name Group
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,hatin binçavkirin
@@ -1947,10 +1953,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Agahdariya Memêber
 DocType: Leave Block List,Block Holidays on important days.,Holidays Block li ser rojên girîng e.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Ji kerema xwe hemû hemî hewceyên hilbijêre Result Value (s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Bikarhênerên Nasname teleb
-DocType: Employee Loan,Monthly Repayment Amount,Şêwaz vegerandinê mehane
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Bikarhênerên Nasname teleb
+DocType: Loan,Monthly Repayment Amount,Şêwaz vegerandinê mehane
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Daxuyaniya vekirî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Ji kerema xwe ve warê ID&#39;ya bikarhêner set di qeyda Employee ji bo danîna Employee Role
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Ji kerema xwe ve warê ID&#39;ya bikarhêner set di qeyda Employee ji bo danîna Employee Role
 DocType: UOM,UOM Name,Navê UOM
 DocType: GST HSN Code,HSN Code,Code HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Şêwaz Alîkarên
@@ -1972,7 +1978,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bikarhêner {0} berê ji bo Bijîşk {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Qûtîk
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Supplier gengaz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Supplier gengaz
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Belavkariya mehane
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lîsteya Receiver vala ye. Ji kerema Lîsteya Receiver
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Tenduristiyê (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No babet to pack
 DocType: Shipping Rule Condition,From Value,ji Nirx
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
-DocType: Employee Loan,Repayment Method,Method vegerandinê
+DocType: Loan,Repayment Method,Method vegerandinê
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Eger kontrolkirin, rûpel Home de dê bibe Pol default babet ji bo malpera"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Îdîaya ji bo şîrketa hisabê.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertîfîkaya pêwîst
 DocType: Company,Default Holiday List,Default Lîsteya Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Ji Time û To Time of {1} bi gihîjte {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Deynên Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Deynên Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,Contact Mobile No
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Şirket hilbijêre
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Saziya çapkirinê
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Bikarhêner {0} POS Profîl tune ne. Ji bo vê bikarhênerê li ser Row {1} default check check.
 DocType: Student Group,Set 0 for no limit,Set 0 bo sînorê
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dotira rojê (s) li ser ku hûn bi ji bo xatir hukm û cejnên in. Tu divê ji bo xatir ne.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dotira rojê (s) li ser ku hûn bi ji bo xatir hukm û cejnên in. Tu divê ji bo xatir ne.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} hewce ye ku veguherandina {invoice_type} Dabeş bikin
 DocType: Customer,Primary Address and Contact Detail,Navnîşana Navnîş û Têkiliya Serûpel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ji nûve Payment Email
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Ji kerema xwe herî kêm yek domain hilbijêrin.
 DocType: Dependent Task,Dependent Task,Task girêdayî
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Try plan operasyonên ji bo rojên X di pêş.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday Reminders
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
 DocType: SMS Center,Receiver List,Lîsteya Receiver
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Search babetî
 DocType: Payment Schedule,Payment Amount,Amûrdayê
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,pîvanê de
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,jixwe temam
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock Li Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock Li Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import Successful!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Daxwaza peredana ji berê ve heye {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost ji Nawy Issued
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Babetê quotation
 DocType: Customer,Customer POS Id,Mişterî POS Id
 DocType: Account,Account Name,Navê account
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Ji Date ne dikarin bibin mezintir To Date
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} dorpêçê de {1} ne dikare bibe perçeyeke
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Ji Date ne dikarin bibin mezintir To Date
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} dorpêçê de {1} ne dikare bibe perçeyeke
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Ji kerema xwe kerema xwe ya Woocommerce Server URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Supplier Type master.
 DocType: Purchase Order Item,Supplier Part Number,Supplier Hejmara Part
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,rêjeya Converter nikare bibe 0 an 1
 DocType: Share Balance,To No,To No
-DocType: Subscription,Reference Document,Dokumentê Reference
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ji betalkirin an sekinî
 DocType: Accounts Settings,Credit Controller,Controller Credit
-DocType: Grant Application,Applicant Type,Tîpa daxwaznameyê
+DocType: Loan,Applicant Type,Tîpa daxwaznameyê
 DocType: Purchase Invoice,03-Deficiency in services,03-kêmbûna xizmetê
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Date Dispatch
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Code
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Account Partiya
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Çavkaniyên Mirovî
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Çavkaniyên Mirovî
 DocType: Lead,Upper Income,Dahata Upper
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Refzkirin
 DocType: Journal Entry Account,Debit in Company Currency,Debit li Company Exchange
 DocType: BOM Item,BOM Item,Babetê BOM
 DocType: Appraisal,For Employee,ji bo karkirinê
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Make Disbursement Peyam
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Make Disbursement Peyam
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance dijî Supplier divê kom kirin
 DocType: Company,Default Values,Nirxên Default
 DocType: Membership,INR,DYA
@@ -2109,10 +2115,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} divê mezintir 0 be
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Stock
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Stock
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planning kapasîteya For (Days)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Procurement
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ne yek ji tomar ti guhertinê di dorpêçê de an nirxê.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ne yek ji tomar ti guhertinê di dorpêçê de an nirxê.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,warê Mandatory - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,warê Mandatory - Program
 DocType: Special Test Template,Result Component,Encamê encam
@@ -2133,7 +2139,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Usa jî holidays di nava pelên wek pelên
 DocType: Sales Invoice,Packed Items,Nawy Packed
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Îdîaya Warranty dijî No. Serial
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Hemî&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Hemî&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Çalak Têxe selikê
 DocType: Employee,Permanent Address,daîmî Address
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2151,10 +2157,10 @@
 DocType: Selling Settings,Selling Settings,Firoştina Settings
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Şertê Çalak
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Auctions bike
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Ji kerema xwe, yan Quantity an Rate Valuation an hem diyar bike"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Ji kerema xwe, yan Quantity an Rate Valuation an hem diyar bike"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Bicihanînî
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,View li Têxe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Mesref marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Mesref marketing
 ,Item Shortage Report,Babetê Report pirsgirêka
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Pîvana standard standard nikare. Ji kerema xwe pîvanên nû veguherînin
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
@@ -2177,9 +2183,9 @@
 DocType: Upload Attendance,Get Template,Get Şablon
 DocType: Material Request,Transferred,veguhestin
 DocType: Vehicle,Doors,Doors
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Ji bo Pêwîstiya Nexweşiya Xwe Bikin
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Piştre danûstandinên hilberê veguherînan nabe. Kurteya nû ya nû û veguherandina veguhestina nû ya nû
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Piştre danûstandinên hilberê veguherînan nabe. Kurteya nû ya nû û veguherandina veguhestina nû ya nû
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup Bacê
 DocType: Packing Slip,PS-,PS-
@@ -2215,12 +2221,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Lihevkirin JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Jî gelek stûnên. Versiyon ji raporê û print ew bikaranîna serlêdana spreadsheet.
 DocType: Purchase Invoice Item,Batch No,batch No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Xizmetên Xweser
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Destûrê bide multiple Orders Sales dijî Mişterî ya Purchase Order
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 DocType: Grant Application,Assessment  Mark (Out of 10),Nirxandina Mark (Ji ji 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Ser
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Ser
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix ji bo ku hijmara series li ser danûstandinên xwe
 DocType: Employee Attendance Tool,Employees HTML,karmendên HTML
@@ -2229,15 +2236,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Derfeta ji qadê de bivênevê ye
 DocType: Email Digest,Annual Expenses,Mesref ya salane
 DocType: Item,Variants,Guhertoyên
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Make Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Make Purchase Order
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
 DocType: Payment Reconciliation Payment,Allocated amount,butçe
 DocType: Sales Team,Contribution to Net Total,Alîkarên ji bo Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Mişterî ya Code babetî
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Lihevkirinê
 DocType: Territory,Territory Name,Name axa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Kar-li-Terakî Warehouse berî pêwîst e Submit
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Hûn dikarin tenê bi tevlêbûna şertê bi heman rengê plankirî bi plankirinê heye
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Applicant bo Job.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse û Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,"info ya zagonî û din, agahiyên giştî li ser Supplier te"
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,"Li dijî Journal Peyam di {0} ti {1} entry berdar, ne xwedî"
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Şiroveyên
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Çalakiyên Perwerdehiyê
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Curenivîsên Serial No bo Babetê ketin {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Curenivîsên Serial No bo Babetê ketin {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Track Source by Lead Source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A rewşa ji bo Rule Shipping
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Ji kerema xwe re têkevin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Ji kerema xwe re têkevin
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Log-Maintenance
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Ji kerema xwe ve filter li ser Babetî an Warehouse danîn
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Giraniya net ji vê pakêtê. (Automatically weke dîyardeyeke weight net ji tomar tê hesabkirin)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,To azad û Bill
 DocType: Student Group,Instructors,Instructors
 DocType: GL Entry,Credit Amount in Account Currency,Şêwaz Credit li Account Exchange
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} de divê bê şandin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} de divê bê şandin
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Share Management
 DocType: Authorization Control,Authorization Control,Control Authorization
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Redkirin Warehouse dijî babet red wêneke e {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Diravdanî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Diravdanî
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} ji bo her account girêdayî ne, ji kerema xwe ve behsa account di qeyda warehouse an set account ambaran de default li şîrketa {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Manage fermana xwe
 DocType: Work Order Operation,Actual Time and Cost,Time û Cost rastî
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,Xwendekarên Leave Application
 DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Li
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,"tomar boxçe, li dema sale."
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hûn ketin tomar lînkek kirine. Ji kerema xwe re çak û careke din biceribîne.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Şirîk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Şirîk
 DocType: Asset Movement,Asset Movement,Tevgera Asset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Divê karûbarê karûbar {0} divê were şandin
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Têxe New
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Pêdivî ye ku pêdivî ye ku pêdivî ye ku ew an jî an jî kredî ya şîrketê an diravê hesabê partiyê be
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nîşan dide ku, pakêta beşek ji vê delivery (Tenê bi Pêşnûmeya) e"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Row {0}: Beriya Dîroka Berî beriya paşînkirina posteyê
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Row {0}: Beriya Dîroka Berî beriya paşînkirina posteyê
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Make Peyam Payment
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Dorpêçê de ji bo babet {0} gerek kêmtir be {1}
 ,Sales Invoice Trends,Sales Trends bi fatûreyên
 DocType: Leave Application,Apply / Approve Leaves,Apply / Approve Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Bo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can row têne tenê eger type belaş e &#39;li ser Previous Mîqdar Row&#39; an jî &#39;Previous Row Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can row têne tenê eger type belaş e &#39;li ser Previous Mîqdar Row&#39; an jî &#39;Previous Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Warehouse Delivery
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree of Navendên Cost aborî.
 DocType: Serial No,Delivery Document No,Delivery dokumênt No
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Serdanîna Amûdê di Guhertoya Manufacturing Setup de ne.
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ji hêla {2} di rêza {1} de ji hêla {2} ve tête navnîşan nabe. Ji bo destûrkirina barkirinê, kerema xwe li Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ji hêla {2} di rêza {1} de ji hêla {2} ve tête navnîşan nabe. Ji bo destûrkirina barkirinê, kerema xwe li Stock Settings"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Response Update
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Bernameya yekem hilbijêre
 DocType: Patient Appointment,Patient Age,Mêjûya Nexweş
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,birêvebirina Projeyên
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} nehatiye vegerandin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} nehatiye vegerandin
 DocType: Supplier,Supplier of Goods or Services.,Supplier ji mal an Services.
 DocType: Budget,Fiscal Year,sala diravî ya
 DocType: Asset Maintenance Log,Planned,Planned
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Hesabên standard yên ku ji bo nexweşî ve girêdayî ye ku ji bo nexweşan re bihayê şêwirdariyê bibînin.
 DocType: Vehicle Log,Fuel Price,sotemeniyê Price
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Sermîyan
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Vekirî veke
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
@@ -2352,16 +2360,16 @@
 DocType: Lead,Follow Up,Şopandin
 DocType: Item,Is Sales Item,E babet Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Babetê Pol Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Babetê {0} e setup bo Serial Nos ne. Kontrol bike master babetî
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Babetê {0} e setup bo Serial Nos ne. Kontrol bike master babetî
 DocType: Maintenance Visit,Maintenance Time,Maintenance Time
 ,Amount to Deliver,Mîqdar ji bo azad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Bi heman demê de tiştek gelek caran ketiye. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Serî Term ne dikarin zûtir ji Date Sal Start of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,bûn çewtî hene.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Karmend {0} ji berê ve ji {1} di navbera {2} û {3} de hatiye dayîn.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,bûn çewtî hene.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Karmend {0} ji berê ve ji {1} di navbera {2} û {3} de hatiye dayîn.
 DocType: Guardian,Guardian Interests,Guardian Interests
 DocType: Naming Series,Current Value,Nirx niha:
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
 DocType: Education Settings,Instructor Records to be created by,Danûstandinên Mamosteyan ku ji hêla tên afirandin
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} tên afirandin
 DocType: GST Account,GST Account,Account GST
@@ -2380,8 +2388,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
 DocType: Website Item Group,Website Item Group,Website babetî Pula
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Added to Favorites
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ne pûçek hebê nedîtiye ku ji bo pîvanên jorîn hejmar an jî heqê heqê heqê xwe vekirî pêşkêş kir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Erk û Baca
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ne pûçek hebê nedîtiye ku ji bo pîvanên jorîn hejmar an jî heqê heqê heqê xwe vekirî pêşkêş kir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Erk û Baca
 DocType: Projects Settings,Projects Settings,Projeyên Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ketanên dikare tezmînat ji aliyê ne bê filtrata {1}
@@ -2391,27 +2399,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of Groups Babetê.
 DocType: Production Plan,Total Produced Qty,Qutata Tiştê Hatîn
 DocType: Payroll Entry,Get Employee Details,Agahdariyê binêrin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Can hejmara row mezintir an wekhev ji bo hejmara row niha ji bo vî cureyê Charge kirîza ne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Can hejmara row mezintir an wekhev ji bo hejmara row niha ji bo vî cureyê Charge kirîza ne
 DocType: Asset,Sold,firotin
 ,Item-wise Purchase History,Babetê-şehreza Dîroka Purchase
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to pędivî Serial No bo Babetê added {0}
 DocType: Account,Frozen,Qeşa girtî
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Şêwaz Base (Company Exchange)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Raw Materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Raw Materials
 DocType: Payment Reconciliation Payment,Reference Row,Çavkanî Row
 DocType: Installation Note,Installation Time,installation Time
 DocType: Sales Invoice,Accounting Details,Details Accounting
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Vemirandina hemû Transactions ji bo vê Company
 DocType: Patient,O Positive,O Positive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,învêstîsîaên
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,învêstîsîaên
 DocType: Issue,Resolution Details,Resolution Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,xercî
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Şertên qebûlkirinê
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ji kerema xwe ve Requests Material li ser sifrê li jor binivîse
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Ne vegerandin ji bo Journal Entry
 DocType: Item Attribute,Attribute Name,Pêşbîr Name
 DocType: BOM,Show In Website,Show Li Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Nîşan Quantity li Website
-DocType: Employee Loan Application,Total Payable Amount,Temamê meblaxa cîhde
+DocType: Loan Application,Total Payable Amount,Temamê meblaxa cîhde
 DocType: Task,Expected Time (in hours),Time a bende (di saet)
 DocType: Item Reorder,Check in (group),Check in (koma)
 DocType: Soil Texture,Silt,Silt
@@ -2430,7 +2439,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,azaran
 DocType: Room,Room Name,Navê room
 DocType: Prescription Duration,Prescription Duration,Daxistina Dawîn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave ne dikarin bên bicîhkirin / berî {0} betalkirin, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave ne dikarin bên bicîhkirin / berî {0} betalkirin, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
 DocType: Activity Cost,Costing Rate,yên arzane ku Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Navnîşan Mişterî û Têkilî
 ,Campaign Efficiency,Efficiency kampanya
@@ -2450,11 +2459,11 @@
 DocType: Chapter,Chapter,Beş
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Cot
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Dema ku ev modê hilbijartî dê hesabê default dê bixweberkirina POS-ê bixweber bixweber bike.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Select BOM û Qty bo Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Select BOM û Qty bo Production
 DocType: Asset,Depreciation Schedule,Cedwela Farhad.
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Navnîşan Sales Partner Û Têkilî
 DocType: Bank Reconciliation Detail,Against Account,li dijî Account
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Nîv Date Day divê di navbera From Date û To Date be
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Nîv Date Day divê di navbera From Date û To Date be
 DocType: Maintenance Schedule Detail,Actual Date,Date rastî
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Ji kerema xwe şîrketa navendê ya navendê ya {0} li Navenda Navendê binivîse
 DocType: Item,Has Batch No,Has Batch No
@@ -2472,7 +2481,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet)
 DocType: Soil Texture,Soil Type,Cureyê mîrata
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Peyama Nû
 ,Quotation Trends,Trends quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Babetê Pol di master babete bo em babete behsa ne {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Rêveberiya GoCardless
@@ -2492,7 +2500,7 @@
 DocType: Hub Category,Hub Category,Kategorî
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Hejmara Vehicle
-DocType: Employee Loan,Loan Amount,Şêwaz deyn
+DocType: Loan,Loan Amount,Şêwaz deyn
 DocType: Student Report Generation Tool,Add Letterhead,Add Letterhead
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicle Self-Driving
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard Standing
@@ -2521,9 +2529,9 @@
 DocType: Cash Flow Mapper,Position,Rewş
 DocType: Patient,Patient Details,Agahdariya nexweşan
 DocType: Patient,B Positive,B Positive
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
 DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Kurte nikare bibe vala an space
 DocType: Patient Medical Record,Patient Medical Record,Radyoya Tenduristî
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Pol to non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sports
@@ -2531,8 +2539,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Lab Test UOM,Test UOM,UOM test
 DocType: Student Siblings,Student Siblings,Brayên Student
+DocType: Subscription Plan Detail,Subscription Plan Detail,Plana Pêşniyarê Pêşniyar
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Yekbûn
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Ji kerema xwe ve Company diyar
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Ji kerema xwe ve Company diyar
 ,Customer Acquisition and Loyalty,Mişterî Milk û rêzgirtin ji
 DocType: Asset Maintenance Task,Maintenance Task,Tîmên Parastinê
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Ji kerema xwe ji BSK-BS-ê di GST-ê de saz bike.
@@ -2547,6 +2556,7 @@
 ,BOM Search,BOM Search
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Barkirina Barkirina Tevahiya Giştî (bi rêya Stock Entry)
 DocType: Hub Settings,Company Registered,Kompaniya Qeydkirî
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Dîroka Dîroka Ji Dîroka Berî kêmtir dibe
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Li ser vê barehouse li &quot;Li Stock&quot; an &quot;Heya Ne Stockê&quot; li Hub-ê li ser peyda tête weşandin.
 DocType: Vehicle,Fuel Type,Type mazotê
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ji kerema xwe ve pereyan li Company diyar
@@ -2554,17 +2564,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},balance Stock li Batch {0} dê bibe neyînî {1} ji bo babet {2} li Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Piştî Requests Material hatine automatically li ser asta re-da babete rabûye
 DocType: Email Digest,Pending Sales Orders,Hîn Orders Sales
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
 DocType: Employee,Create User Permission,Destûra bikarhêner hilbijêre
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 DocType: Healthcare Settings,Remind Before,Beriya Remindê
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},faktora UOM Converter li row pêwîst e {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
 DocType: Salary Component,Deduction,Jêkişî
 DocType: Item,Retain Sample,Sample Sample
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Ji Time û To Time de bivênevê ye.
 DocType: Stock Reconciliation Item,Amount Difference,Cudahiya di Mîqdar
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ji kerema xwe ve Employee Id bikevin vî kesî yên firotina
 DocType: Territory,Classification of Customers by region,Dabeşandina yên muşteriyan bi herêma
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Di Hilberînê de
@@ -2574,8 +2585,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Di esasa balance Bank Statement
 DocType: Normal Test Template,Normal Test Template,Şablon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,user seqet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Girtebêje
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nikarî raketek RFQ qebûl nabe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Girtebêje
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nikarî raketek RFQ qebûl nabe
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total dabirîna
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Hesabek hilbijêre ku ji bo kaxeza hesabê çap bike
@@ -2583,7 +2594,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ev li ser nexweşiya li ser veguhestinê ye. Ji bo agahdariyên jêrîn binêrin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,cost Demê
 DocType: Patient,Date of Birth,Rojbûn
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Sal ** temsîl Sal Financial. Re hemû ketanên hisêba û din muamele mezin bi dijî Sal Fiscal ** Molla **.
 DocType: Opportunity,Customer / Lead Address,Mişterî / Lead Address
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Scorecard Setup
@@ -2594,14 +2605,15 @@
 DocType: Work Order Operation,Actual Operation Time,Rastî Time Operation
 DocType: Authorization Rule,Applicable To (User),To de evin: (User)
 DocType: Purchase Taxes and Charges,Deduct,Jinavkişîn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Job Description
 DocType: Student Applicant,Applied,sepandin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-vekirî
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-vekirî
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty wek per Stock UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Navê Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Sale Sale Discount
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Characters taybet ji bilî &quot;-&quot; &quot;.&quot;, &quot;#&quot;, û &quot;/&quot; li Beyazit, series destûr ne"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Track ji kampanyayekê Sales biparêze. track ji Leads, Quotations bimînin, Sales Kom hwd. ji kampanyayekê ji bo texmînkirina Vegera li ser Investment."
+DocType: Department Approver,Approver,Approver
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Zeviya Xwe Ji Alîkarê Alîkarê vala nebe
 DocType: Guardian,Work Address,Navnîşana karê
@@ -2615,21 +2627,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Temamê meblaxa veqetandin (Company Exchange)
 DocType: Purchase Order Item,To be delivered to customer,Ji bo mişterî teslîmî
 DocType: BOM,Scrap Material Cost,Cost xurde Material
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial No {0} nayê bi tu Warehouse girêdayî ne
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial No {0} nayê bi tu Warehouse girêdayî ne
 DocType: Grant Application,Email Notification Sent,Şandina Email Şandin
 DocType: Purchase Invoice,In Words (Company Currency),Li Words (Company Exchange)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kodê kodê, barehouse, hêjayî hewceyê li ser row"
-DocType: Pricing Rule,Supplier,Şandevan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kodê kodê, barehouse, hêjayî hewceyê li ser row"
+DocType: Bank Guarantee,Supplier,Şandevan
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Agahdariyên Tezmînatê nîşan bide
 DocType: Consultation,Consultation Time,Wextê Şêwirmendî
 DocType: C-Form,Quarter,Çarîk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Mesref Hemecore
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Mesref Hemecore
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Expense an account Cudahiya bo Babetê {0} wek ku bandora Buhaya giştî stock wêneke e
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Navê Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Ser
-DocType: Employee Loan,Employee Loan Account,Xebatkarê Account Loan
 DocType: Leave Application,Total Leave Days,Total Rojan Leave
 DocType: Email Digest,Note: Email will not be sent to disabled users,Note: Email dê ji bo bikarhênerên seqet ne bên şandin
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Hejmara Nimite
@@ -2645,7 +2656,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Weight (Kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",Şagirtan / beş_name paşê bixweşîya betaliyê bixweberî xistî vekin.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Ji kerema xwe ji GST Hesabên GST-ê di navnîşan de saz bikin
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Ji kerema xwe ji GST Hesabên GST-ê di navnîşan de saz bikin
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tîpa Business
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ji kerema xwe ve butçe, Type bi fatûreyên û Number bi fatûreyên li Hindîstan û yek row hilbijêre"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Cost ji Buy New
@@ -2654,12 +2665,13 @@
 DocType: Grant Application,Grant Description,Agahdariya Grant
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Exchange)
 DocType: Student Guardian,Others,yên din
+DocType: Subscription,Discounts,Disc Discounts
 DocType: Payment Entry,Unallocated Amount,Şêwaz PV
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Can a Hêmanên nedît. Ji kerema xwe re hin nirxên din, ji bo {0} hilbijêre."
 DocType: POS Profile,Taxes and Charges,Bac û doz li
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A Product an a Xizmeta ku kirîn, firotin an li stock girt."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No updates more
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Can type pere weke &#39;li ser Previous Mîqdar Row&#39; hilbijêre ne an &#39;li ser Previous Row Total&#39; ji bo rêza yekem
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Can type pere weke &#39;li ser Previous Mîqdar Row&#39; hilbijêre ne an &#39;li ser Previous Row Total&#39; ji bo rêza yekem
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ev tevahiya scorecards bi vê Setupê ve girêdayî ye
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Babetê zarok ne pêwîst be gurzek Product. Ji kerema xwe ve babete jê `{0}` û xilas bike
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2668,45 +2680,48 @@
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to get schedule
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 DocType: Bin,Ordered Quantity,Quantity ferman
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",eg &quot;Build Amûrên ji bo hostayan&quot;
 DocType: Grading Scale,Grading Scale Intervals,Navberan pîvanê de
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Ji bo salê
+DocType: Bank Guarantee,Name of Bank,Navê Bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Peyam Accounting ji bo {2} dikarin tenê li pereyan kir: {3}
 DocType: Fee Schedule,In Process,di pêvajoya
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tree of bikarhênerên aborî.
+DocType: Bank Guarantee,Reference Document Type,Dokumenta Belgeyê
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mûçeya krediyê ya krediyê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} dijî Sales Order {1}
 DocType: Account,Fixed Asset,Asset Fixed
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventory weşandin
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail di navnîşa navekî nayê dîtin
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Secret secret
-DocType: Employee Loan,Account Info,Info account
+DocType: Loan,Account Info,Info account
 DocType: Activity Type,Default Billing Rate,Rate Billing Default
 DocType: Fees,Include Payment,Payment
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Student Groups afirandin.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Student Groups afirandin.
 DocType: Sales Invoice,Total Billing Amount,Şêwaz Total Billing
 DocType: Fee Schedule,Receivable Account,Account teleb
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
 DocType: Quotation Item,Stock Balance,Balance Stock
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Firotina ji bo Payment
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Bi Payment Taxê
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Detail Îdîaya
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE BO SUPPLIER
 DocType: Land Unit,Is Container,Container is
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ew ê roja 1 ê ji nişka hilberê
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
 DocType: Purchase Invoice Item,Weight UOM,Loss UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lîsteya parvekirî yên bi bi hejmarên folio re hene
 DocType: Salary Structure Employee,Salary Structure Employee,Xebatkarê Structure meaş
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Hûrgelan nîşan bide
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Hûrgelan nîşan bide
 DocType: Student,Blood Group,xwîn Group
 DocType: Course,Course Name,Navê Kurs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Bikarhêner ku dikarin sepanên îzna a karker taybetî ya erê
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Teçxîzatên hatiye Office
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Teçxîzatên hatiye Office
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,şirketên
 DocType: Supplier Scorecard,Scoring Setup,Scoring Setup
@@ -2725,7 +2740,7 @@
 DocType: Stock Entry,Total Incoming Value,Total Nirx Incoming
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debit To pêwîst e
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Buy List Price
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates of supplier variables variables.
 DocType: Job Offer Term,Offer Term,Term Pêşnîyaza
 DocType: Asset,Quality Manager,Manager Quality
@@ -2737,13 +2752,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total Unpaid: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 DocType: Supplier Scorecard,Supplier Score,Supplier Score
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Total fatore Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Total fatore Amt
 DocType: Supplier,Warn RFQs,RFQ
 DocType: BOM,Conversion Rate,converter
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Search Product
 DocType: Assessment Plan,To Time,to Time
 DocType: Authorization Rule,Approving Role (above authorized value),Erêkirina Role (li jorê nirxa destûr)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,"Credit To account, divê hesabekî fêhmkirin be"
+DocType: Loan,Total Amount Paid,Tiştek Tiştek Paid
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ji kerema xwe bigihîjin Xwendekarê Xwendekarê hilbijêre ku ji bo daxwaznameya xwendekarê drav anî ye
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM kûrahiya: {0} nikare bibe dê û bav an jî zarok ji {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Ji kerema xwe lîsteya bêjeya hilbijêre hilbijêre ku prensîpê belav bikin
@@ -2753,17 +2769,16 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,List Price {0} neçalak e
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Qediya Qty ne dikarin zêdetir ji {1} ji bo operasyona {2}
 DocType: Manufacturing Settings,Allow Overtime,Destûrê bide Heqê
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Babetê weşandin {0} ne dikarin bi bikaranîna Stock Lihevkirinê, ji kerema xwe ve bi kar Stock Peyam ve were"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Babetê weşandin {0} ne dikarin bi bikaranîna Stock Lihevkirinê, ji kerema xwe ve bi kar Stock Peyam ve were"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Babetê weşandin {0} ne dikarin bi bikaranîna Stock Lihevkirinê, ji kerema xwe ve bi kar Stock Peyam ve were"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Babetê weşandin {0} ne dikarin bi bikaranîna Stock Lihevkirinê, ji kerema xwe ve bi kar Stock Peyam ve were"
 DocType: Training Event Employee,Training Event Employee,Training Event Employee
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Nimûneyên herî zêde - {0} dikare ji bo Batch {1} û Peldanka {2} tê parastin.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Add Time Slots
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numbers Serial pêwîst ji bo vî babetî {1}. Hûn hatine {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numbers Serial pêwîst ji bo vî babetî {1}. Hûn hatine {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rate Valuation niha:
 DocType: Training Event,Advance,Pêşveçûn
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ji bo veguhestinê dîsa.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Mîhengên gateway ya GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / Loss
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Gain / Loss
 DocType: Opportunity,Lost Reason,ji dest Sedem
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DucType nikare bibîne {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Address
@@ -2783,7 +2798,6 @@
 DocType: Bin,Actual Quantity,Quantity rastî
 DocType: Shipping Rule,example: Next Day Shipping,nimûne: Shipping Next Day
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nehate dîtin
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Alîkarî {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa Fee Schedule
 DocType: Fee Schedule Program,Student Batch,Batch Student
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Make Student
@@ -2799,14 +2813,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-Bazirganiya GSTIN
 DocType: Sales Order,Not Delivered,Delivered ne
 ,Bank Clearance Summary,Bank Clearance Nasname
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create û rêvebirin û digests email rojane, hefteyî û mehane."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Create û rêvebirin û digests email rojane, hefteyî û mehane."
 DocType: Appraisal Goal,Appraisal Goal,Goal appraisal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Dîtin Suggestion?
 DocType: Stock Reconciliation Item,Current Amount,Şêwaz niha:
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,avahiyên
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,avahiyên
 DocType: Fee Schedule,Fee Structure,Structure Fee
 DocType: Timesheet Detail,Costing Amount,yên arzane ku Mîqdar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: Student Admission Program,Application Fee,Fee application
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Submit Slip Salary
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,discount Maxiumm ji bo babet {0} e {1}%
@@ -2814,12 +2827,13 @@
 DocType: Sales Partner,Address & Contacts,Navnîşana &amp; Têkilî
 DocType: SMS Log,Sender Name,Navê virrêkerî
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Krîza Analyona Çandinî
+DocType: HR Settings,Leave Approval Notification Template,Gotûbêja Peymana Şandina Derkeve
 DocType: POS Profile,[Select],[Neqandin]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressure Pressure (diastolic)
 DocType: SMS Log,Sent To,şandin To
 DocType: Agriculture Task,Holiday Management,Management Management
 DocType: Payment Request,Make Sales Invoice,Make Sales bi fatûreyên
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
 DocType: Company,For Reference Only.,For Reference Only.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Bijîşk {0} ne li ser {1}
@@ -2837,7 +2851,7 @@
 DocType: Employee,New Workplace,New Workplace
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Kişandina materyalê
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Set as girtî ye
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No babet bi Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No babet bi Barcode {0}
 DocType: Normal Test Items,Require Result Value,Pêwîste Result Value
 DocType: Item,Show a slideshow at the top of the page,Nîşan a slideshow li jor li ser vê rûpelê
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,dikeye
@@ -2852,19 +2866,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,No çalak an Salary default Structure dîtin ji bo karker {0} ji bo dîrokan dayîn
 DocType: Leave Block List,Allow Users,Rê bide bikarhênerên
 DocType: Purchase Order,Customer Mobile No,Mişterî Mobile No
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,nûkirin
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Şablonên kredî yên mapping
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Rêveberiya Lînan
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track Dahata cuda de û hisabê bo bixemilînî berhem an jî parçebûyî.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,update Cost
 DocType: Item Reorder,Item Reorder,Babetê DIRTYHERTZ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Slip Show Salary
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Slip Show Salary
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,transfer Material
 DocType: Fees,Send Payment Request,Request Payment Send
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Hên operasyonên, mesrefa xebatê û bide Operation yekane no ji bo operasyonên xwe."
 DocType: Water Analysis,Origin,Reh
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Hilbijêre guhertina account mîqdara
 DocType: Purchase Invoice,Price List Currency,List Price Exchange
 DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
@@ -2879,14 +2893,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Ya Qanûna Bacê ye
 DocType: Grading Scale Interval,Grade Description,Ast Description
 DocType: Stock Entry,Purchase Receipt No,Meqbûz kirînê No
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Money bi xîret
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Money bi xîret
 DocType: Sales Invoice, Shipping Bill Number,Bill Number
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 DocType: Asset Maintenance Log,Actions performed,Çalak kirin
 DocType: Cash Flow Mapper,Section Leader,Rêberê partiyê
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Source of Funds (Deynên)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Source of Funds (Deynên)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Quantity li row {0} ({1}), divê di heman wek quantity çêkirin be {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Karker
+DocType: Bank Guarantee,Fixed Deposit Number,Hejmarê Gelek Deposit
 DocType: Asset Repair,Failure Date,Dîroka Failure
 DocType: Sample Collection,Collected Time,Demjimêr Hatin
 DocType: Company,Sales Monthly History,Dîroka Monthly History
@@ -2903,10 +2918,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Ma hûn bawer dikin ku hûn bixwazin vê serdanê betal bikin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Package packing price Room
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline Sales
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,required ser
 DocType: Rename Tool,File to Rename,File to Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Fetch Subscription Updates
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Account {0} nayê bi Company {1} li Mode of Account hev nagirin: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM diyarkirî {0} nayê ji bo Babetê tune {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kûrs:
@@ -2916,7 +2932,7 @@
 DocType: Notification Control,Expense Claim Approved,Mesrefan Pejirandin
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Naveroka Karkeran nehat afirandin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip meaşê karmendekî {0} berê ve ji bo vê pêvajoyê de tên
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,dermanan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,dermanan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Cost ji Nawy Purchased
 DocType: Selling Settings,Sales Order Required,Sales Order Required
 DocType: Purchase Invoice,Credit To,Credit To
@@ -2934,7 +2950,7 @@
 DocType: Request for Quotation Supplier,No Quote,No Quote
 DocType: Warranty Claim,Raised By,rakir By
 DocType: Payment Gateway Account,Payment Account,Account Payment
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Change Net li hesabê hilgirtinê
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,heger Off
 DocType: Job Offer,Accepted,qebûlkirin
@@ -2947,7 +2963,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Kerema xwe binêre ka tu bi rastî dixwazî jê bibî hemû muamele û ji bo vê şirketê. Daneyên axayê te dê pevê wekî xwe ye. Ev çalakî nayê vegerandin.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Search Results
 DocType: Room,Room Number,Hejmara room
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referansa çewt {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referansa çewt {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping Rule
 DocType: Journal Entry Account,Payroll Entry,Entry Payroll
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Vebijêrkên Fe Fees binêre
@@ -2957,7 +2973,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
 DocType: Lab Test Sample,Lab Test Sample,Sample Lab Lab
 DocType: Item Variant Settings,Allow Rename Attribute Value,Destûrê bide Hilbijartina Attribute Value
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Peyam di Journal Quick
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Peyam di Journal Quick
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
 DocType: Restaurant,Invoice Series Prefix,Prefix Preoice Prefix
 DocType: Employee,Previous Work Experience,Previous serê kurda
@@ -2965,8 +2981,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ji kerema xwe ve Plankirî Qty ji bo babet {0} at row binivîse {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google integrasyonê ne çalak e
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ji pêşkêşkirî ne
+DocType: Subscription,Trialling,Tîma
 DocType: Member,Membership Expiry Date,Endamê Dîroka Dawîbûnê
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} divê di belgeya vegera neyînî be
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} divê di belgeya vegera neyînî be
 ,Minutes to First Response for Issues,Minutes ji bo First Response bo Issues
 DocType: Purchase Invoice,Terms and Conditions1,Termên û Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,The name of peymangeha ji bo ku hûn bi avakirina vê sîstemê.
@@ -2985,7 +3002,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unit ji Measure
 DocType: Fiscal Year,Year End Date,Sal Date End
 DocType: Task Depends On,Task Depends On,Task Dimîne li ser
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Fersend
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Fersend
 DocType: Operation,Default Workstation,Default Workstation
 DocType: Notification Control,Expense Claim Approved Message,Message mesrefan Pejirandin
 DocType: Payment Entry,Deductions or Loss,Daşikandinên an Loss
@@ -3023,7 +3040,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Leave bê pere nayê bi erêkirin records Leave Application hev nagirin
 DocType: Campaign,Campaign-.####,Bêşvekirin-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Steps Next
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Invoice Make
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Balance Balance
@@ -3032,7 +3049,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Sal
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Hevpeymana End Date divê ji Date of bizaveka mezintir be
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Hevpeymana End Date divê ji Date of bizaveka mezintir be
 DocType: Driver,Driver,Ajotvan
 DocType: Vital Signs,Nutrition Values,Nirxên nerazîbûnê
 DocType: Lab Test Template,Is billable,Mecbûr e
@@ -3043,7 +3060,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Rastî Date Serî (via Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ev malperek nimûne auto-generated ji ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Range Ageing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Hêjeya pêşîn hebe ji hêla tevahî heqê heqê mezintirîn mezintirîn
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Hêjeya pêşîn hebe ji hêla tevahî heqê heqê mezintirîn mezintirîn
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3078,7 +3095,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Can babet zêdetir {0} ji Sales Order dorpêçê de hilberandina ne {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Nirxên taybetmendiyê hilbijêrin
 DocType: Purchase Invoice,Reason For Issuing document,Sedema belge belgeyê
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
 DocType: Payment Reconciliation,Bank / Cash Account,Account Bank / Cash
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Next Contact By nikare bibe wek Email Address Lead
 DocType: Tax Rule,Billing City,Billing City
@@ -3095,7 +3112,8 @@
 DocType: Warranty Claim,Service Address,xizmeta Address
 DocType: Asset Maintenance Task,Calibration,Vebijêrk
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} şîrketek şirket e
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Navmal û Fixtures
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Şerta Rewşa Çepê
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Navmal û Fixtures
 DocType: Item,Manufacture,Çêkirin
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Kompaniya Setup
 ,Lab Test Report,Report Report Lab
@@ -3111,7 +3129,6 @@
 DocType: Crop,Planting Area,Area Area
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,sazkirin Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ev dibe ku ji bo hin Navnîşanên Navnîşên Navnîşan yên nederbas be
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Te zêde kir
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Encam Training
@@ -3121,16 +3138,17 @@
 DocType: Products Settings,Products per Page,Products per Page
 DocType: Stock Ledger Entry,Outgoing Rate,Rate nikarbe
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,master şaxê Organization.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,an
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,an
 DocType: Sales Order,Billing Status,Rewş Billing
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Mesref Bikaranîn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Mesref Bikaranîn
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Li jorê
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Peyam {1} nayê Hesabê te nîne {2} an ji niha ve bi rêk û pêk li dijî fîşeke din
 DocType: Supplier Scorecard Criteria,Criteria Weight,Nirxên giran
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Daxuyaniya Şandina Şandê bistînin
 DocType: Buying Settings,Default Buying Price List,Default Lîsteya Buying Price
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip meaş Li ser timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rêjeya Kirînê
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Rêjeya Kirînê
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nirxên Default wek Company, Exchange, niha: Sala diravî, û hwd."
 DocType: Payment Entry,Payment Type,Type Payment
@@ -3153,6 +3171,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Settings Têxe selikê
 DocType: Journal Entry,Accounting Entries,Arşîva Accounting
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Gava ku Rêjeya Nirxandinê hilbijartî ji bo &#39;Rêjeya&#39; ji bo hilbijartin, wê dê lîsteya bihayê bidomîne. Rêjeya rêjeya rêjeya rêjeya dawîn e, ji ber vê yekê bila bêbawer bê bikaranîn. Ji ber vê yekê, di veguherandina mîna Biryara Sermê, Biryara Kirê û Niştimanî, dê di qada &#39;Rêjeya&#39; de, ji bilî &#39;Field List Lîsteya Bêjeya&#39;."
+DocType: Journal Entry,Paid Loan,Lînansê Paid
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Curenivîsên Peyam. Ji kerema xwe Authorization Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Dîroka Referansa Girêdanê
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3169,7 +3188,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Maintenance nehatî ji bo hemû tomar bi giştî ne. Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
 ,To Produce,ji bo hilberîna
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Rêza yomîya
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Ji bo row {0} li {1}. To de {2} di rêjeya Babetê, rêzikan {3} jî, divê di nav de bê"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Ji bo row {0} li {1}. To de {2} di rêjeya Babetê, rêzikan {3} jî, divê di nav de bê"
 DocType: Patient Service Unit,Parent Service Unit,Yekîneya Xizmetiya Mirovan
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Make Bikarhêner
 DocType: Packing Slip,Identification of the package for the delivery (for print),Diyarkirina pakêta ji bo gihandina (ji bo print)
@@ -3188,7 +3207,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Account hatina
 DocType: Payment Request,Amount in customer's currency,Şêwaz li currency mişterî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Şandinî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Şandinî
 DocType: Volunteer,Weekdays,Rojan
 DocType: Stock Reconciliation Item,Current Qty,Qty niha:
 DocType: Restaurant Menu,Restaurant Menu,Menu Menu
@@ -3196,17 +3215,18 @@
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Set account ambaran de default bo ambaran de perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Set account ambaran de default bo ambaran de perpetual
 DocType: Item Reorder,Material Request Type,Maddî request type
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,E-mail bişîne Send Review
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage tije ye, rizgar ne"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Factor Converter wêneke e
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapîteya Room
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Hûn dikarin belgeyên pêşniyarên pêşdankirî yên winda bibin. Ma hûn rast binivîsin ku hûn vê şûnde were veguhestin?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Fee-Registration
 DocType: Budget,Cost Center,Navenda cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,fîşeke #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,fîşeke #
 DocType: Notification Control,Purchase Order Message,Bikirin Order Message
 DocType: Tax Rule,Shipping Country,Shipping Country
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Id Bacê Mişterî ji Transactions Sales
@@ -3215,20 +3235,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule Pricing çêkirin ji bo binivîsî List Price / define rêjeya discount, li ser bingeha hinek pîvanên."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse tenê dikare bi rêya Stock Peyam guherî / Delivery Têbînî / Meqbûz Purchase
 DocType: Employee Education,Class / Percentage,Class / Rêjeya
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Head of Marketing û Nest
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Head of Marketing û Nest
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Bacê hatina
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads by Type Industry.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Biçe Letterheads
+DocType: Subscription,Cancel At End Of Period,Destpêk Ji Destpêka Dawîn
 DocType: Item Supplier,Item Supplier,Supplier babetî
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Naveroka hilbijartinê ji bo veguhastinê tune
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Naveroka hilbijartinê ji bo veguhastinê tune
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Hemû Navnîşan.
 DocType: Company,Stock Settings,Settings Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Yedega tenê mimkun e, eger taybetiyên jêrîn heman in hem records in. E Group, Type Root, Company"
 DocType: Vehicle,Electric,Elatrîkî
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Qezenc / Loss li ser çespandina Asset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Qezenc / Loss li ser çespandina Asset
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Tenê Serdana Xwendekaran bi statuya &quot;pejirandî&quot; ê dê di binê jêrîn de bê hilbijartin.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Hejmarê hesabê {0} hesab nîne. <br> Ji kerema xwe kerema xwe ya kartên xwe rast bikin.
 DocType: Task,Depends on Tasks,Dimîne li ser Peywir
@@ -3243,6 +3264,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ne li Stock
 DocType: Volunteer,Volunteer Skills,Vebijêrkên Dilxwazî
 DocType: Appraisal,HR User,Bikarhêner hr
+DocType: Bank Guarantee,Reference Document Name,Navnîşa Dokumentê
 DocType: Purchase Invoice,Taxes and Charges Deducted,Bac û doz li dabirîn
 apps/erpnext/erpnext/hooks.py +142,Issues,pirsên
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},"Rewş, divê yek ji yên bê {0}"
@@ -3256,7 +3278,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} neçalak e
 DocType: Supplier,Billing Currency,Billing Exchange
 DocType: Sales Invoice,SINV-RET-,SINV-direvin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
+DocType: Loan,Loan Application,Serlêdanê deyn
 DocType: Crop,Scientific Name,Navê zanistî
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Total Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Hilbijêre, eger têkilî bijarte piştî tomarkirinê tête guherandin"
@@ -3265,13 +3288,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Hejmara Cheque
 ,Sales Browser,Browser Sales
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Hişyarî: din {0} # {1} dijî entry stock heye {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Hişyarî: din {0} # {1} dijî entry stock heye {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Herêmî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Deynan û pêşketina (Maldarî)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,deyndarên
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Mezin
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Mezin
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Product Dawiyê
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Hemû Groups Nirxandina
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Hemû Groups Nirxandina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Name Warehouse
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Herêm
@@ -3292,9 +3315,10 @@
 DocType: Fees,Fees,xercên
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Hên Exchange Rate veguhertina yek currency nav din
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Quotation {0} betal e
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Temamê meblaxa Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Temamê meblaxa Outstanding
 DocType: Sales Partner,Targets,armancên
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Ji kerema xwe di nav pelê agahdariya şirketa SIREN de tomar bike
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 DocType: Price List,Price List Master,Price List Master
 DocType: GST Account,CESS Account,Hesabê CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Hemû Transactions Sales dikare li dijî multiple Persons Sales ** ** tagged, da ku tu set û şopandina hedef."
@@ -3303,6 +3327,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Nexşêre hilbijêre
 DocType: Price List,Applicable for Countries,Wergirtinê ji bo welatên
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Navê navnîşê
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Tenê Applications bi statûya Leave &#39;status&#39; û &#39;Redkirin&#39; dikare were şandin
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Xwendekarên Navê babetî Pula li row wêneke e {0}
 DocType: Homepage,Products to be shown on website homepage,Products ji bo li ser malpera Malpera bê nîşandan
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ev komeke mişterî root e û ne jî dikarim di dahatûyê de were.
@@ -3336,14 +3361,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Daxistina ji bo hemû demjimêrên hemî damezrandin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},error Name: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Fînansê Fînansî ye
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Amadebûna ji bo karker {0} jixwe nîşankirin
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Amadebûna ji bo karker {0} jixwe nîşankirin
 DocType: Packing Slip,If more than one package of the same type (for print),Eger zêdetir ji pakêta cureyê eynî (ji bo print)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ji kerema xwe ya mişterî ya li Restaurant Settings
 ,Salary Register,meaş Register
 DocType: Warehouse,Parent Warehouse,Warehouse dê û bav
-DocType: C-Form Invoice Detail,Net Total,Total net
+DocType: Subscription,Net Total,Total net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default BOM ji bo babet dîtin ne {0} û Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Define cureyên cuda yên deyn
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Define cureyên cuda yên deyn
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,mayî
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (li mins)
@@ -3375,11 +3400,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,"Account Root, divê komeke bê"
 DocType: Drug Prescription,Drug Prescription,Drug Prescription
 DocType: Fees,FEE.,XERC.
-DocType: Employee Loan,Repaid/Closed,De bergîdana / Girtî
+DocType: Loan,Repaid/Closed,De bergîdana / Girtî
 DocType: Item,Total Projected Qty,Bi tevahî projeya Qty
 DocType: Monthly Distribution,Distribution Name,Navê Belavkariya
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rêjeya nirxandina naveroka ji bo Item {0}, ku hewce ne ku ji bo {1} {2} navnîşên hesabê çêbikin. Heke ku ew tişt di nav {1} de nirxa nirxa sîvîl veguherîn e, ji kerema xwe li sifrêya 1 {1} binivîse. Wekî din, ji kerema xwe veguhastina veguhestina peyda ya peyda kirina an naveroka valahiyê binirxînin, û paşê hewl bidin ku têketina vê navnîşê / betal bikin"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Code Kurs
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Serperiştiya Quality pêwîst ji bo vî babetî {0}
 DocType: POS Settings,Use POS in Offline Mode,POS di Mode ya Offline bikar bînin
@@ -3399,16 +3423,15 @@
 DocType: Purchase Invoice,Deemed Export,Export Export
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer madî ji bo Manufacture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rêjeya Discount jî yan li dijî List Price an jî ji bo hemû List Price sepandin.
-DocType: Subscription,Half-yearly,Nîvsal carekî pişkinînên didanan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Peyam Accounting bo Stock
 DocType: Lab Test,LabTest Approver,LabTest nêzî
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Tu niha ji bo nirxandina nirxandin {}.
 DocType: Vehicle Service,Engine Oil,Oil engine
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Karên Karkirina Karan afirandin: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Karên Karkirina Karan afirandin: {0}
 DocType: Sales Invoice,Sales Team1,Team1 Sales
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Babetê {0} tune
 DocType: Sales Invoice,Customer Address,Address mişterî
-DocType: Employee Loan,Loan Details,deyn Details
+DocType: Loan,Loan Details,deyn Details
 DocType: Company,Default Inventory Account,Account Inventory Default
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Hejmarên fîloyê ne mêjin
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
@@ -3420,19 +3443,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Zanyariyek ji bo Yekîneyên Yekbûyî yên ku di Cropê de zêde dibe
 DocType: Account,Root Type,Type root
 DocType: Item,FIFO,FIFOScheduler
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nikare zêdetir vegerin {1} ji bo babet {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nikare zêdetir vegerin {1} ji bo babet {2}
 DocType: Item Group,Show this slideshow at the top of the page,Nîşan bide vî slideshow li jor li ser vê rûpelê
 DocType: BOM,Item UOM,Babetê UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Şêwaz Bacê Piştî Mîqdar Discount (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},warehouse Target bo row wêneke e {0}
 DocType: Cheque Print Template,Primary Settings,Settings seretayî ya
 DocType: Purchase Invoice,Select Supplier Address,Address Supplier Hilbijêre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,lê zêde bike Karmendên
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,lê zêde bike Karmendên
 DocType: Purchase Invoice Item,Quality Inspection,Serperiştiya Quality
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Şablon Standard
 DocType: Training Event,Theory,Dîtinî
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Account {0} frozen e
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / destekkirinê bi Chart cuda yên Accounts mensûbê Rêxistina.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3452,11 +3475,10 @@
 DocType: SMS Log,No of Sent SMS,No yên SMS şandin
 DocType: Antibiotic,Healthcare Administrator,Rêveberiya lênerîna tenduristiyê
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Target Target
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 DocType: Dosage Strength,Dosage Strength,Strêza Dosage
 DocType: Account,Expense Account,Account Expense
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Reng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Reng
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Şertên Plan Nirxandina
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Dîroka bidawîbûnê ji bo hilbijartî ya pêdivî ye
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Pêşniyarên kirînê bikujin
@@ -3469,18 +3491,18 @@
 DocType: Patient,Personal and Social History,Dîroka Kesane û Civakî
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bikarhêner {0} hat afirandin
 DocType: Fee Schedule,Fee Breakup for each student,Ji bo her xwendekaran ji bo şermezarkirina xerîb
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Select Belavkariya mehane ya ji bo yeksan belavkirin armancên li seranserî mehan.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Kodê Guherandinê
 DocType: Purchase Invoice Item,Valuation Rate,Rate Valuation
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,List Price Exchange hilbijartî ne
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,List Price Exchange hilbijartî ne
 DocType: Purchase Invoice,Availed ITC Cess,ITC Cess
 ,Student Monthly Attendance Sheet,Xwendekarên mihasebeya Beşdariyê Ayda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Qanûna Rêvebirin tenê tenê ji bo firotina kirînê
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Serî Date
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Ta
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Ta
 DocType: Rename Tool,Rename Log,Rename bike Têkeve Têkeve
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Komeleya Xwendekarên an Cedwela Kurs wêneke e
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Komeleya Xwendekarên an Cedwela Kurs wêneke e
@@ -3501,7 +3523,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Berhemên xwe yan xizmetên ku hûn bikirin an firotanê lîsteya xwe bikin.
 DocType: Water Analysis,Storage Temperature,Temperature
 DocType: Employee Attendance Tool,Unmarked Attendance,"Amadebûna xwe dahênî,"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,lêkolîner
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,lêkolîner
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program hejmartina Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Dîroka destpêkê divê ji dawiya karê {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navê an Email wêneke e
@@ -3514,7 +3536,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} heye ku niha {1} Berhemên Score Scorecard heye, û RFQ ji vê pargîdaniyê re bêne hişyar kirin."
 DocType: Chapter,Non Profit Manager,Rêveberê Neqfetê ne
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} tên afirandin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} tên afirandin
 DocType: Homepage,Company Description for website homepage,Description Company bo homepage malpera
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Ji bo hevgirtinê tê ji mişterî, van kodên dikare di formatên print wek hisab û Delivery Notes bikaranîn"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Navê Suplier
@@ -3524,11 +3546,10 @@
 DocType: Employee,You can enter any date manually,Tu dikarî date bi destê xwe binivîse
 DocType: Healthcare Settings,Result Printed,Result Çapkirin
 DocType: Asset Category Account,Depreciation Expense Account,Account qereçî Expense
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ceribandinê de
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},View {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ceribandinê de
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tenê hucûma pel di mêjera destûr
 DocType: Project,Total Costing Amount (via Timesheets),Giştî Hatina Barkirina (Bi rêya Timesheets)
-DocType: Employee Advance,Expense Approver,Approver Expense
+DocType: Department,Expense Approver,Approver Expense
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
 DocType: Project,Hourly,Seetî
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Pol to Group
@@ -3538,7 +3559,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,to DateTime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Têketin ji bo parastina statûya delivery sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Make Payment via Peyam di Journal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Çap ser
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Çap ser
 DocType: Item,Inspection Required before Delivery,Serperiştiya pêwîst berî Delivery
 DocType: Item,Inspection Required before Purchase,Serperiştiya pêwîst berî Purchase
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Çalakî hîn
@@ -3548,7 +3569,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Hejmarê herî kêmîn
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Rêxistina te
 DocType: Fee Component,Fees Category,xercên Kategorî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Karmendê agahdar bikin
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Navê kampanyaya Enter, eger source lêkolînê ya kampanyaya e"
@@ -3558,7 +3579,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Level DIRTYHERTZ
 DocType: Company,Chart Of Accounts Template,Chart bikarhênerên Şablon
 DocType: Attendance,Attendance Date,Date amadebûnê
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,jihevketina meaşê li ser Earning û vê rêyê.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Account bi hucûma zarok nikare bê guhartina ji bo ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse qebûlkirin
@@ -3566,10 +3587,11 @@
 DocType: Item,Valuation Method,Method Valuation
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Day Mark Half
 DocType: Sales Invoice,Sales Team,Team Sales
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,entry Pekana
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,entry Pekana
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Navê navê Xweseriya Berî berî radest bikin.
 DocType: Program Enrollment Tool,Get Students,Get Xwendekarên
 DocType: Serial No,Under Warranty,di bin Warranty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Şaşî]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Şaşî]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Li Words xuya wê carekê hûn xilas Sales Order.
 ,Employee Birthday,Xebatkarê Birthday
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Ji kerema xwe veguhastina Dîroka Daxuyaniya Dibistanê ya temamî hilbijêr
@@ -3588,7 +3610,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Ji bo peymana dabeşkirî vekirî ye
 DocType: Payment Reconciliation Invoice,Invoice Number,Hejmara fatûreyên
 DocType: Shopping Cart Settings,Orders,ordênên
-DocType: Employee Leave Approver,Leave Approver,Dev ji Approver
+DocType: Department,Leave Approver,Dev ji Approver
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Tikaye hevîrê hilbijêre
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Navê Nirxandina Group
@@ -3633,7 +3655,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL BO SITENDÊR
 DocType: Asset Category Account,Accumulated Depreciation Account,Account Farhad. Accumulated
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ev e-nameya otogenerkirî ye
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Arşîva
 DocType: Program Enrollment,Boarding Student,Xwendekarên înternat
 DocType: Asset,Expected Value After Useful Life,Nirx a bende Piştî Jiyana
@@ -3658,22 +3679,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Amadebûna Record {0} dijî Student heye {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Çavkanî # {0} dîroka {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Farhad. Eliminated ber destê medane hebûnên
-DocType: Member,Member,Endam
+DocType: Loan,Member,Endam
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Navnîşan
 DocType: Work Order Item,Work Order Item,Karê Karê Karê Kar
 DocType: Pricing Rule,Item Code,Code babetî
 DocType: Serial No,Warranty / AMC Details,Mîsoger / Details AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 DocType: Journal Entry,User Remark,Remark Bikarhêner
 DocType: Lead,Market Segment,Segment Market
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Rêveberê Çandiniyê
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
 DocType: Supplier Scorecard Period,Variables,Variables
 DocType: Employee Internal Work History,Employee Internal Work History,Xebatkarê Navxweyî Dîroka Work
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Girtina (Dr)
 DocType: Cheque Print Template,Cheque Size,Size Cheque
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} ne li stock
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} ne li stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,şablonê Bacê ji bo firotina muamele.
 DocType: Sales Invoice,Write Off Outstanding Amount,Hewe Off Outstanding Mîqdar
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Account {0} nayê bi Company hev nagirin {1}
@@ -3682,7 +3703,6 @@
 DocType: Stock Settings,Default Stock UOM,Default Stock UOM
 DocType: Asset,Number of Depreciations Booked,Hejmara Depreciations civanan
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qty Jim
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Dijî Employee Loan: {0}
 DocType: Landed Cost Item,Receipt Document,Dokumentê wergirtina
 DocType: Employee Education,School/University,School / Zanîngeha
 DocType: Payment Request,Reference Details,Details Reference
@@ -3693,7 +3713,7 @@
 DocType: Asset,Double Declining Balance,Double Balance Îro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Ji Tîpa ne dikarin bên îptal kirin. Unclose bo betalkirina.
 DocType: Student Guardian,Father,Bav
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Lihevkirinê
 DocType: Attendance,On Leave,li ser Leave
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
@@ -3707,10 +3727,10 @@
 DocType: Lead,Lower Income,Dahata Lower
 DocType: Restaurant Order Entry,Current Order,Armanca Dawîn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Source û warehouse hedef ne dikarin heman tiştî ji bo row {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Herin bernameyan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Hejmara nirxên vekirî {1} ji bila hejmarê nerazîkirî {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Hejmara nirxên vekirî {1} ji bila hejmarê nerazîkirî {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Ji Date&#39; Divê piştî &#39;To Date&#39; be
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
@@ -3733,7 +3753,6 @@
 DocType: Payment Terms Template,Payment Terms,Şertên Payan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,"Ordênên Productions dikarin ji bo ne, bêne zindî kirin:"
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Deqqe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 DocType: Purchase Invoice,Purchase Taxes and Charges,"Bikirin Bac, û doz li"
 DocType: Chapter,Meetup Embed HTML,Meetup HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Herin Berzê
@@ -3753,30 +3772,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Quotation {0} ne ji type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Maintenance babet Cedwela
 DocType: Sales Order,%  Delivered,% Çiyan
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Ji kerema xwe ji bo Xwendekarên E-nameyê bişînin ku daxwaza Serrêvekirinê bişînin
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Ji kerema xwe ji bo Xwendekarên E-nameyê bişînin ku daxwaza Serrêvekirinê bişînin
 DocType: Patient,Medical History,Dîroka Tenduristiyê
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Account Overdraft Bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Account Overdraft Bank
 DocType: Patient,Patient ID,Nasnameya nûnerê
 DocType: Physician Schedule,Schedule Name,Navnîşa Navîn
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Make Slip Salary
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,All Suppliers
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,All Suppliers
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: butçe ne dikarin bibin mezintir mayî bidin.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Browse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,"Loans temînatê,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,"Loans temînatê,"
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Mesaj Date û Time
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ji kerema xwe ve set Accounts related Farhad li Asset Category {0} an Company {1}
 DocType: Lab Test Groups,Normal Range,Rangeya Normal
 DocType: Academic Term,Academic Year,Sala (Ekadîmî)
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Bazirganiya Bazirganî
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opening Sebra Balance
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Opening Sebra Balance
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Jiberma
 DocType: Appraisal,Appraisal,Qinetbirrînî
+DocType: Loan,Loan Account,Account
 DocType: Purchase Invoice,GST Details,GST Dîtin
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},"Email şandin, da ku dabînkerê {0}"
 DocType: Item,Default Sales Unit of Measure,Yekitiya firotanê ya Çargoşe ya Measure
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Salê Akademîk:
+DocType: Subscription,Past Due Date,Dîroka Past Past
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ne destûrê ji bo tiştek alternatîf hilbijêre {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Date tê dubarekirin
@@ -3789,7 +3810,7 @@
 DocType: Patient Appointment,Patient Appointment,Serdanek Nexweş
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Erêkirina Role ne dikarin heman rola desthilata To evin e
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Vê grûpê Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Bi Dirîkariyê Bişînin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Bi Dirîkariyê Bişînin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ji bo Peldanka {1} nehat dîtin.
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Herin Courses
 DocType: Accounts Settings,Show Inclusive Tax In Print,Di Print Inclusive Tax Print
@@ -3797,10 +3818,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Peyam nehat şandin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Account bi hucûma zarok dikare wek ledger ne bê danîn
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rate li ku currency list Price ji bo pereyan base mişterî bîya
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Şêwaz Net (Company Exchange)
 DocType: Physician,Physician Schedules,Schedules
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Hêjeya pêşniyarê heya hema ji hejmarê vekirî ya bêtir mezintirîn
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Hêjeya pêşniyarê heya hema ji hejmarê vekirî ya bêtir mezintirîn
 DocType: Salary Slip,Hour Rate,Saet Rate
 DocType: Stock Settings,Item Naming By,Babetê Bidin By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},"Din jî dema despêka Girtina {0} hatiye dîtin, piştî {1}"
@@ -3818,6 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},destûra te ya rojanekirina muameleyên borsayê yên kevintir ji {0}
 DocType: BOM,Inspection Required,Serperiştiya Required
 DocType: Purchase Invoice Item,PR Detail,Detail PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Berî şandina submissiontting hejmara Qanûna Garantiyê binivîse.
 DocType: Driving License Category,Class,Sinif
 DocType: Sales Order,Fully Billed,bi temamî billed
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Karûbarê Karê Karê li dijî Şablonê neyê rakirin
@@ -3828,7 +3851,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Giraniya derewîn û ji pakêta. Bi piranî weight net + pakêta weight maddî. (Ji bo print)
 DocType: Assessment Plan,Program,Bername
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Bikarhêner li ser bi vê rola bi destûr ji bo bikarhênerên frozen biafirînin û / ya xeyrandin di entries, hesabgirê dijî bikarhênerên bêhest"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
 DocType: Serial No,Is Cancelled,Ma Hilandin
 DocType: Student Group,Group Based On,Li ser Group
 DocType: Student Group,Group Based On,Li ser Group
@@ -3840,9 +3862,10 @@
 DocType: Cheque Print Template,Cheque Height,Bilindahiya Cheque
 DocType: Supplier,Supplier Details,Details Supplier
 DocType: Setup Progress,Setup Progress,Pêşveçûna Pêşveçûn
+DocType: Expense Claim,Approval Status,Rewş erêkirina
 DocType: Hub Settings,Publish Items to Hub,Weşana Nawy ji bo Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Ji nirxê gerek kêmtir ji bo nirxê di rêza be {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transfer wire
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transfer wire
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Check hemû
 ,Issued Items Against Work Order,Li dijî Armanca Karê Dîroka Belgekirin
 DocType: Vehicle Log,Invoice Ref,bi fatûreyên Ref
@@ -3873,12 +3896,11 @@
 DocType: Customs Tariff Number,Tariff Number,Hejmara tarîfan
 DocType: Work Order Item,Available Qty at WIP Warehouse,License de derbasdar Qty li Warehouse WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,projeya
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} nayê to Warehouse girêdayî ne {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} nayê to Warehouse girêdayî ne {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Têbînî: em System bi wê jî li ser-teslîmkirinê û ser-booking ji bo babet {0} wek dikele, an miqdar 0 e"
 DocType: Notification Control,Quotation Message,quotation Message
-DocType: Employee Loan,Employee Loan Application,Xebatkarê Loan Application
 DocType: Issue,Opening Date,Date vekirinê
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Ji kerema xwe pêşî nexweşê xwe biparêze
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Ji kerema xwe pêşî nexweşê xwe biparêze
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Amadebûna serkeftin nîşankirin.
 DocType: Program Enrollment,Public Transport,giştîya
 DocType: Soil Texture,Silt Composition (%),Teknîkî Silt (%)
@@ -3897,7 +3919,7 @@
 ,Item Balance (Simple),Balance Item (Simple)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatoreyên rakir destê Suppliers.
 DocType: POS Profile,Write Off Account,Hewe Off Account
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debit Nîşe Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debit Nîşe Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Şêwaz discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vegere li dijî Purchase bi fatûreyên
 DocType: Item,Warranty Period (in days),Period Warranty (di rojên)
@@ -3920,6 +3942,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,teslîmî Qty
 DocType: Assessment Plan,Assessment Plan,Plan nirxandina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Navnîşana rojnamevanê veguhestin
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Têkilî {0} hatiye afirandin.
 DocType: Stock Settings,Limit Percent,Sedî Sînora
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Niha tu firotek li her wareyê heye
@@ -3933,14 +3956,15 @@
 DocType: Journal Entry,Stock Entry,Stock Peyam
 DocType: Payment Entry,Payment References,Çavkanî Payment
 DocType: C-Form,C-FORM-,C-teleb dike
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Hejmara navan ji bo qada navendê wekî mînaka ku Interval &#39;Rojan&#39; û Navnîşkirina Navnîşa Navnîşa Navnîşan 3 ye, hejmarên her sê rojan bêne afirandin"
 DocType: Vehicle,Insurance Details,Details sîgorta
 DocType: Account,Payable,Erzan
 DocType: Share Balance,Share Type,Tîpa Share
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Deyndarên ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,muşteriyan New
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Profit% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Profit% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Guhertina POS Profîla
 DocType: Bank Reconciliation Detail,Clearance Date,Date clearance
@@ -3950,10 +3974,11 @@
 DocType: Lead,Address Desc,adres Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partiya wêneke e
 DocType: Journal Entry,JV-,nájv-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rows with duplicate dates in other rows found in: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rows with duplicate dates in other rows found in: {list}
 DocType: Topic,Topic Name,Navê topic
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Ji kerema xwe ya şîfreyê ji bo HR Şerta ji bo şandina dagirkirinê veguherîne.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Li Hindîstan û yek ji Selling an Buying divê bên hilbijartin
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Vebijêrkek karker hilbijêre da ku pêşmerge karmendê.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Vebijêrkek karker hilbijêre da ku pêşmerge karmendê.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Ji kerema xwe Dîrokek rastîn hilbijêre
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,xwezaya business xwe hilbijêrin.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3972,7 +3997,7 @@
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,Date installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Daxwaza firotanê {0} hat afirandin
 DocType: Employee,Confirmation Date,Date piştrastkirinê
 DocType: C-Form,Total Invoiced Amount,Temamê meblaxa fatore
@@ -3981,7 +4006,7 @@
 DocType: Account,Accumulated Depreciation,Farhad. Accumulated
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Navekî Standing
 DocType: Stock Entry,Customer or Supplier Details,Details Mişterî an Supplier
-DocType: Employee Loan Application,Required by Date,Pêwîst ji aliyê Date
+DocType: Loan Application,Required by Date,Pêwîst ji aliyê Date
 DocType: Lead,Lead Owner,Xwedîyê Lead
 DocType: Production Plan,Sales Orders Detail,Guhertoyên Bazirganî
 DocType: Bin,Requested Quantity,Quantity xwestin
@@ -3994,10 +4019,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - dabirîna Total - Loan vegerandinê
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM û niha New BOM ne dikarin heman
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Meaş ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Pirrjimar Pirrjimar
 DocType: Sales Invoice,Against Income Account,Li dijî Account da-
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Çiyan
+DocType: Subscription,Trial Period Start Date,Dema Têkoşînê Destpêk Dîrok
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Ji kerema xwe bikarhênerê din bikar bînin.
@@ -4018,12 +4044,11 @@
 DocType: Student Guardian,Student Guardian,Xwendekarên Guardian
 DocType: Member,Member Name,Navê Navê
 DocType: Stock Settings,Use Naming Series,Sîstema Namingê bikar bînin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
 DocType: POS Profile,Update Stock,update Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,di beşdariyê de
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM cuda ji bo tomar dê ji bo Şaşî (Total) nirxa Loss Net rê. Bawer bî ku Loss Net ji hev babete di UOM heman e.
 DocType: Membership,Payment Details,Agahdarî
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Karta Karûbarê Rawestandin Tête qedexekirin, yekemîn betal bike ku ji bo betal bike"
 DocType: Asset,Journal Entry for Scrap,Peyam di Journal ji bo Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ji kerema xwe tomar ji Delivery Têbînî vekişîne
@@ -4043,6 +4068,7 @@
 DocType: Land Unit,Land Unit,Yekîneya Land
 ,Purchase Analytics,Analytics kirîn
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Têbînî babetî
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Daxuya heyî {0} wenda ye
 DocType: Asset Maintenance Log,Task,Karî
 DocType: Purchase Taxes and Charges,Reference Row #,Çavkanî Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},hejmara Batch ji bo babet wêneke e {0}
@@ -4055,7 +4081,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / Account Loss
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Karker û Beşdariyê
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Armanca divê yek ji yên bê {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Formê tije bikin û wê xilas bike
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Formê tije bikin û wê xilas bike
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forûma Civakî
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,qty Actual li stock
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,qty Actual li stock
@@ -4070,7 +4096,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Rate Selling Standard
 DocType: Account,Rate at which this tax is applied,Rate at ku ev tax sepandin
 DocType: Cash Flow Mapper,Section Name,Navekî Navîn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,DIRTYHERTZ Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,DIRTYHERTZ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Openings Job niha:
 DocType: Company,Stock Adjustment Account,Account Adjustment Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,hewe Off
@@ -4081,9 +4107,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Ji bo hemî bereya Tenduristî ya bihayê nûçeyê nûjen kirin. Ew dikare çend deqeyan bistînin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Name ji Account nû. Not: Ji kerema xwe, hesabên ji bo muşteriyan û Bed biafirîne"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country default şehreza Şablonên Address
 DocType: Water Analysis,Appearance,Xuyabûnî
+DocType: HR Settings,Leave Status Notification Template,Gotûbêja Şopandina Şopandinê
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Lîsteya bihayê bihayê bihêle
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier xelas dike ji bo Mişterî
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Agahdariya Endamê.
@@ -4106,7 +4132,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nayê destûr kirin. Ji kerema xwe Şablon Şablonê test bike
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Kodek rêjeya divê ji% 100 wekhev be
 DocType: Crop Cycle,Linked Land Unit,Yekîneya Girêdana Têkilî
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
 DocType: Program Enrollment,School House,House School
 DocType: Serial No,Out of AMC,Out of AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
@@ -4122,7 +4148,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Herin Bikarhênerên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,pereyan + hewe Off Mîqdar ne dikarin bibin mezintir Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} e a Number Batch derbasdar e ji bo vî babetî bi {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Têbînî: e balance îzna bes ji bo Leave Type tune ne {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Têbînî: e balance îzna bes ji bo Leave Type tune ne {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN çewt an NA Enter bo ne-endam
 DocType: Training Event,Seminar,Semîner
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program hejmartina Fee
@@ -4138,14 +4164,14 @@
 DocType: Hub Settings,Publish Availability,Weşana Availability
 DocType: Company,Create Chart Of Accounts Based On,Create Chart bikarhênerên li ser
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne nikarin ew bi ne-koman veguherînin. Tîmên Zarokan hene.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Xwendekarên {0} dijî serlêder Xwendekarê hene {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pargîdaniya Rounding
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Piştînîvroj
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Set as Open
 DocType: Cheque Print Template,Scanned Cheque,Scanned Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send emails otomatîk ji Têkilî li ser danûstandinên Radestkirina.
@@ -4161,7 +4187,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projeya {0} berê heye
 DocType: Medical Department,Nursing User,Nursing User
 DocType: Plant Analysis,Plant Analysis Criterias,Çareseriya Çandî Criterias
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,berpirsiyariya
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},No Serial No {0} ne girêdayî ye {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,berpirsiyariya
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Dema valahiyê ya vê kursiyê qediya.
 DocType: Expense Claim Account,Expense Claim Account,Account mesrefan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Allow Stale Exchange Rates
@@ -4183,11 +4210,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Variants Make
 DocType: Item,Default BOM,Default BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Amûr Barkirî (Bi rêya Barkirina Bazirganî)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debit Têbînî Mîqdar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debit Têbînî Mîqdar
 DocType: Project Update,Not Updated,Not Updated
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Di navbera rêjeya ne, parvekirin û hejmarê de hejmarek hene"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Ji kerema xwe re-type navê şîrketa ku piştrast
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Total Outstanding Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Total Outstanding Amt
 DocType: Journal Entry,Printing Settings,Settings çapkirinê
 DocType: Employee Advance,Advance Account,Account Account
 DocType: Job Offer,Job Offer Terms,Karên Pêşniyarên Pêşniyariyê
@@ -4196,7 +4223,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Company sîgorta
 DocType: Asset Category Account,Fixed Asset Account,Account Asset Fixed
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Têgûherr
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Têgûherr
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Ji Delivery Note
 DocType: Chapter,Members,Endam
 DocType: Student,Student Email Address,Xwendekarên Email Address
@@ -4220,7 +4247,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Pizişka destpêker
 DocType: Delivery Stop,Address Name,Address Name
 DocType: Stock Entry,From BOM,ji BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Yekîneyên {0} yên {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Yekîneyên {0} yên {1}
 DocType: Assessment Code,Assessment Code,Code nirxandina
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Bingehîn
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,muamele Stock berî {0} sar bi
@@ -4228,25 +4255,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Çavkanî No diyarkirî ye, eger tu ketin Date Reference"
 DocType: Bank Reconciliation Detail,Payment Document,Dokumentê Payment
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Çewtiya nirxandina formula standard
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Date of bizaveka divê mezintir Date jidayikbûnê be
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Date of bizaveka divê mezintir Date jidayikbûnê be
+DocType: Subscription,Plans,Plana
 DocType: Salary Slip,Salary Structure,Structure meaş
 DocType: Account,Bank,Banke
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Şîrketa balafiran
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Doza Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Çewtiyek çêkir dema dema veguhestinê de ye
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Doza Material
 DocType: Material Request Item,For Warehouse,ji bo Warehouse
 DocType: Employee,Offer Date,Pêşkêşiya Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No komên xwendekaran tên afirandin.
 DocType: Purchase Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Şêwaz vegerandinê mehane ne dikarin bibin mezintir Loan Mîqdar
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Şêwaz vegerandinê mehane ne dikarin bibin mezintir Loan Mîqdar
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ji kerema xwe ve yekem Maintaince Details binivîse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Dîroka Dabeşkirina Expired Berî Berê Daxuyaniya Kirîna Dîroka
 DocType: Purchase Invoice,Print Language,Print Ziman
 DocType: Salary Slip,Total Working Hours,Total dema xebatê
 DocType: Sales Invoice,Customer PO Details,Pêkûpêk PO
-DocType: Subscription,Next Schedule Date,Dîroka Schedule ya din
 DocType: Stock Entry,Including items for sub assemblies,Di nav wan de tomar bo sub meclîsên
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Account Account
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Enter nirxa divê erênî be
@@ -4275,11 +4301,11 @@
 DocType: Issue,Opening Time,Time vekirinê
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,From û To dîrokên pêwîst
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Ewlehiya &amp; Borsayên Tirkiyeyê
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ji bo krîterên nirxên ne karmendan tune
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
 DocType: Hotel Settings,Default Customer,Berpirsiyarê Default
 DocType: Assessment Plan,Supervisor Name,Navê Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bawer bikin ku heger wê roja ku ji bo rûniştinê hate çêkirin
@@ -4304,16 +4330,16 @@
 DocType: Journal Entry Account,Employee Advance,Pêşniyarê Pêşmerge
 DocType: Payroll Entry,Payroll Frequency,Frequency payroll
 DocType: Lab Test Template,Sensitivity,Hisê nazik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Raw
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Raw
 DocType: Leave Application,Follow via Email,Follow via Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Santralên û Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Santralên û Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Şêwaz Bacê Piştî Mîqdar Discount
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Settings Nasname Work rojane
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Ji kerema xwe re Reqd bi dahatinê binivîse
 DocType: Payment Entry,Internal Transfer,Transfer navxweyî
 DocType: Asset Maintenance,Maintenance Tasks,Tîmên Parastinê
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,An QTY hedef an miqdar hedef diyarkirî e
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Vekirina Date divê berî Girtina Date be
 DocType: Leave Control Panel,Carry Forward,çêşît Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Navenda Cost bi muamele heyî nikare bê guhartina ji bo ledger
@@ -4321,14 +4347,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integration of ERPNext
 DocType: Crop Cycle,Detected Disease,Nexweşiya Nexweş
 ,Produced,Berhema
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Daxwaza Destpêk Dibe Berî Berî Dabeşandina Dabeşkirinê be.
 DocType: Item,Item Code for Suppliers,Code babete bo Bed
 DocType: Issue,Raised By (Email),Rakir By (Email)
 DocType: Training Event,Trainer Name,Navê Trainer
 DocType: Mode of Payment,General,Giştî
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ragihandina dawî
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ragihandina dawî
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Valuation û Total&#39;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos pêwîst ji bo vî babetî weşandin {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Valuation û Total&#39;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos pêwîst ji bo vî babetî weşandin {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Payments Match bi fatûreyên
 DocType: Journal Entry,Bank Entry,Peyam Bank
 DocType: Authorization Rule,Applicable To (Designation),To de evin: (teklîfê)
@@ -4342,7 +4369,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Çalak / currencies astengkirin.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} Li roja Nîvê Nîvroya Navîn {1}
 DocType: Production Plan,Get Material Request,Get Daxwaza Material
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Mesref postal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Mesref postal
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Music &amp; Leisure
 ,Item Variant Details,Vebijêrk Variant
@@ -4353,9 +4380,9 @@
 DocType: Drug Prescription,Hour,Seet
 DocType: Restaurant Order Entry,Last Sales Invoice,Last Sales Invoice
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Ji kerema xwe Qty li dijî hilbijêre {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"No New Serial ne dikarin Warehouse hene. Warehouse kirin, divê ji aliyê Stock Peyam an Meqbûz Purchase danîn"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"No New Serial ne dikarin Warehouse hene. Warehouse kirin, divê ji aliyê Stock Peyam an Meqbûz Purchase danîn"
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Destûra te tune ku ji bo pejirandina pelên li ser Kurdî Nexşe Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Destûra te tune ku ji bo pejirandina pelên li ser Kurdî Nexşe Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Hemû van tomar niha ji fatore dîtin
 DocType: Company,Monthly Sales Target,Target Target Monthly
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Nikare were pejirandin {0}
@@ -4363,7 +4390,7 @@
 DocType: Item,Default Material Request Type,Default Material request type
 DocType: Supplier Scorecard,Evaluation Period,Dema Nirxandinê
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Nenas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Fermana kar nehatiye afirandin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Fermana kar nehatiye afirandin
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Şertên Rule
 DocType: Purchase Invoice,Export Type,Tîpa Exportê
 DocType: Salary Slip Loan,Salary Slip Loan,Heqfa Slip Loan
@@ -4379,8 +4406,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Vebijêrk Barkirina Vegerînê
 DocType: Education Settings,Education Manager,Rêveberê Perwerdehiyê
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Di navbera her plankirî de li qada kêmayî ya ji bo zêdebûna mezinbûnê
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Babetê Batched {0} ne dikarin bi bikaranîna Stock Lihevkirinê ve bê, li şûna bikaranîna Stock Peyam"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Babetê Batched {0} ne dikarin bi bikaranîna Stock Lihevkirinê ve bê, li şûna bikaranîna Stock Peyam"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Babetê Batched {0} ne dikarin bi bikaranîna Stock Lihevkirinê ve bê, li şûna bikaranîna Stock Peyam"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Babetê Batched {0} ne dikarin bi bikaranîna Stock Lihevkirinê ve bê, li şûna bikaranîna Stock Peyam"
 DocType: Quality Inspection,Report Date,Report Date
 DocType: Student,Middle Name,Navê navbendî
 DocType: C-Form,Invoices,fatûreyên
@@ -4412,20 +4439,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Meqbûz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Meqbûz
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Group,Send Emails At,Send Emails At
 DocType: Quotation,Quotation Lost Reason,Quotation Lost Sedem
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,e ku tu tişt ji bo weşînertiya hene.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Mesrefên Derheqê Bêguman Têkoşîna Derheqê
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Bikaranîna xwe ji rêxistinê xwe, ji bilî xwe zêde bike."
 DocType: Customer Group,Customer Group Name,Navê Mişterî Group
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,No muşteriyan yet!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Daxûyanîya Flow Cash
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Naveroka maddî tune ne
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Îcaze
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ji kerema xwe ve çêşît Forward hilbijêre, eger hûn jî dixwazin ku di nav hevsengiyê sala diravî ya berî bernadin ji bo vê sala diravî ya"
@@ -4448,11 +4476,12 @@
 DocType: Vehicle,Chassis No,Chassis No
 DocType: Payment Request,Initiated,destpêkirin
 DocType: Production Plan Item,Planned Start Date,Plankirin Date Start
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Ji kerema xwe BOM hilbijêre
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Ji kerema xwe BOM hilbijêre
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Girtîgeha Înternetê ya Înternetê
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+DocType: Bank Guarantee,Clauses and Conditions,Şert û Şertên
 DocType: Serial No,Creation Document Type,Creation Corî dokumênt
 DocType: Project Task,View Timesheet,View Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Dîroka dawîn ji roja destpêkê mezintir be
 DocType: Leave Type,Is Encash,e Encash
 DocType: Leave Allocation,New Leaves Allocated,Leaves New veqetandin
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Daneyên Project-aqil e ji bo Quotation ne amade ne
@@ -4466,9 +4495,10 @@
 DocType: Patient,Alcohol Current Use,Bikaranîna Niha Alkol
 DocType: Student Admission Program,Student Admission Program,Bername Bernameya Xwendekarên
 DocType: Payment Entry,Account Paid To,Hesabê To
+DocType: Subscription Settings,Grace Period,Dema Grace
 DocType: Item Alternative,Alternative Item Name,Navekî Navîn
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,"Dê û bav babet {0} ne, divê bibe babeta Stock"
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Dibe ku tu Pûçek Heqê nabe <br> \ Sedemên maqûl <br> \ 1. Paya Net ji 0 salî ye. <br> \ 2. Navnîşa şîrketê Navnîşana şirket di karê masterê de ne diyar e. <br>
@@ -4478,7 +4508,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget bo Account {1} dijî {2} {3} e {4}. Ev dê ji aliyê biqede {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Account divê ji type be &#39;Asset Fixed&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,û Neçalak kirin di nav
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,ID Student
@@ -4490,14 +4519,16 @@
 DocType: Complaint,Complaint,Gilî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
 DocType: Leave Allocation,Unused leaves,pelên Unused
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Bixwîne Endamê Reşbûnê
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,All Departments
 DocType: Patient,Alcohol Past Use,Bikaranîna Pêdivî ya Alkol
 DocType: Fertilizer Content,Fertilizer Content,Naveroka Fertilizer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Kr
 DocType: Project Update,Problematic/Stuck,Pirsgirêk / Stuck
 DocType: Tax Rule,Billing State,Dewletê Billing
 DocType: Share Transfer,Transfer,Derbaskirin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Berî karûbarê vê firotinê ya betal bike ji bo karûbarê karûbar {0} divê betal bike
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
 DocType: Authorization Rule,Applicable To (Employee),To wergirtinê (Xebatkarê)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Date ji ber wêneke e
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
@@ -4521,10 +4552,11 @@
 DocType: Cheque Print Template,Message to show,Message bo nîşan bide
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Yektacirî
 DocType: Student Attendance,Absent,Neamade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle Product
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Ne nikarî hejmara lêgerînê li {0} bibînin. Hûn hewce ne ku ji sedan 0 x 100 dakêşin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Referansa çewt {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,"Bikirin Bac, û doz li Şablon"
+DocType: Subscription,Current Invoice Start Date,Daxuyaniya Destûra Destpêk Destpêk
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: An debit an miqdar krediyê ji bo pêwîst e {2}
 DocType: GL Entry,Remarks,têbînî
@@ -4534,11 +4566,13 @@
 DocType: Task,Parent Task,Task Parêz
 DocType: Journal Entry,Write Off Based On,Hewe Off li ser
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Make Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print û Stationery
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print û Stationery
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Send Emails Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Meaşê niha ve ji bo dema di navbera {0} û {1}, Leave dema serlêdana ne di navbera vê R‧ezkirina dema bê vehûnandin."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Send Emails Supplier
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Meaşê niha ve ji bo dema di navbera {0} û {1}, Leave dema serlêdana ne di navbera vê R‧ezkirina dema bê vehûnandin."
+DocType: Fiscal Year,Auto Created,Auto Created
 DocType: Chapter Member,Leave Reason,Reason
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Invoice {0} no longer exists
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Volunteer,Availability,Berdestbûnî
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Nirxên default default Setup for POS
@@ -4547,14 +4581,13 @@
 DocType: Timesheet,Employee Detail,Detail karker
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID Email
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID Email
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,roj Date Next û Dubare li ser Day of Month wekhev bin
 DocType: Lab Prescription,Test Code,Kodê testê
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Mîhengên ji bo homepage malpera
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ji bo {1} ji bila {0} ji bo karmendek ji
 DocType: Job Offer,Awaiting Response,li benda Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Ser
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Tevahî Amount {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Tevahî Amount {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Qala eger ne-standard account cîhde
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Kerema xwe re koma nirxandina ya din jî ji bilî &#39;Hemû Groups Nirxandina&#39; hilbijêrî
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Navenda kredê pêwîst e ku {1}
@@ -4565,7 +4598,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analysis
 DocType: Chapter,Region,Herêm
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Bixwe. Vê mîhengê wê were bikaranîn ji bo palavtina karê cuda cuda.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Rate Valuation neyînî nayê ne bi destûr
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Rate Valuation neyînî nayê ne bi destûr
 DocType: Holiday List,Weekly Off,Weekly Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Rûpelê nû bike Linked Analysis
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ji bo nimûne, 2012, 2012-13"
@@ -4581,7 +4614,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Cost ji Asset belav
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Navenda Cost ji bo babet wêneke e {2}
 DocType: Vehicle,Policy No,siyaseta No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Get Nawy ji Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Get Nawy ji Bundle Product
 DocType: Asset,Straight Line,Line Straight
 DocType: Project User,Project User,Project Bikarhêner
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Qelişandin
@@ -4620,21 +4653,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Şop
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Can Navenda Cost ji bo ledger bawermendê ne, wek ku hatiye hucûma zarok"
 DocType: Production Plan,Total Planned Qty,Tiştek Plankirî Tiştek
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Nirx vekirinê
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Nirx vekirinê
 DocType: Salary Detail,Formula,Formîl
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Template Test Lab
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Hesabê firotanê
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Hesabê firotanê
 DocType: Purchase Invoice Item,Total Weight,Total Weight
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komîsyona li ser Sales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komîsyona li ser Sales
 DocType: Job Offer Term,Value / Description,Nirx / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Hêvîkirin Date Delivery
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit û Credit ji bo {0} # wekhev ne {1}. Cudahiya e {2}.
 DocType: Asset Maintenance Task,Assign To Name,Navekî Navnîşankirin
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Mesref Entertainment
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Mesref Entertainment
 DocType: Hub Settings,Enabled Users,Bikarhênerên Enabled
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Make Daxwaza Material
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Babetê Open {0}
@@ -4647,24 +4680,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Sepanên ji bo xatir.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Account bi mêjera heyî ne jêbirin
 DocType: Vehicle,Last Carbon Check,Last Check Carbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Mesref Yasayî
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Mesref Yasayî
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Ji kerema xwe ve dorpêçê de li ser rêza hilbijêre
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Daxistina firotin û firotanê vekin vekin
 DocType: Purchase Invoice,Posting Time,deaktîv bike Time
 DocType: Timesheet,% Amount Billed,% Mîqdar billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Mesref Telefon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Mesref Telefon
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"vê kontrol bike, eger hûn dixwazin bi reya ku bikarhêner hilbijêre rêze berî tomarkirinê. Dê tune be default, eger tu vê kontrol bike."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No babet bi Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No babet bi Serial No {0}
 DocType: Email Digest,Open Notifications,Open Notifications
 DocType: Payment Entry,Difference Amount (Company Currency),Cudahiya di Mîqdar (Company Exchange)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Mesref direct
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Mesref direct
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Hatiniyên Mişterî New
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Travel Expenses
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Travel Expenses
 DocType: Maintenance Visit,Breakdown,Qeza
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Vebijêrkek taybetiyê Add Subscription in doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
 DocType: Purchase Receipt Item,Sample Quantity,Hêjeya nimûne
+DocType: Bank Guarantee,Name of Beneficiary,Navevaniya Niştimanî
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM bi otomatîk bi otomotîfê xwe bixweber bike, li ser rêjeya bihayê bihayê / bihayê rêjeya bihayê / rêjeya kirînê ya bihayê rawestî."
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: account Parent {1} ne aîdî ji şîrketa: {2}
@@ -4676,14 +4709,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Dema cerribandinê
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Components meaş
 DocType: Program Enrollment Tool,New Academic Year,New Year (Ekadîmî)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / Credit Têbînî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / Credit Têbînî
 DocType: Stock Settings,Auto insert Price List rate if missing,insert Auto List Price rêjeya eger wenda
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Temamê meblaxa Paid
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Temamê meblaxa Paid
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,veguhestin Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,rêveçûna
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Pîlankirinî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Pîlankirinî
 DocType: Share Balance,Issued,weşand
+DocType: Loan,Repayment Start Date,Repayment Date Start
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Activity Student
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Payment Details Gateway
@@ -4696,10 +4730,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type of pelên mîna casual, nexweş hwd."
 DocType: Email Digest,Send regular summary reports via Email.,Send raporên summary nîzamî bi rêya Email.
 DocType: Payment Entry,PE-,Şerqê
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Ji kerema xwe ve account default set li Type mesrefan {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Ji kerema xwe ve account default set li Type mesrefan {0}
 DocType: Assessment Result,Student Name,Navê Student
 DocType: Brand,Item Manager,Manager babetî
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,payroll cîhde
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,payroll cîhde
 DocType: Buying Settings,Default Supplier Type,Default Type Supplier
 DocType: Plant Analysis,Collection Datetime,Datetime Collection
 DocType: Work Order,Total Operating Cost,Total Cost Operating
@@ -4709,9 +4743,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Bikarhêner {0} tune
 DocType: Payment Term,Day(s) after invoice date,Piştî roja danê dayik
 DocType: Payment Schedule,Payment Schedule,Schedule Payment
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Kinkirî
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Peyam di peredana ji berê ve heye
+DocType: Subscription,Trial Period End Date,Dîroka Doza Têkoşînê
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized ne ji ber ku {0} dibuhure ji sînorên
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,master şablonê meaş.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Pathology
@@ -4728,9 +4762,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes and Leads an muşteriyan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Yorumlar ji bo weşînertiya stock bêhest
 ,Territory Target Variance Item Group-Wise,Axa Target Variance babetî Pula-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Hemû Groups Mişterî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Hemû Groups Mişterî
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accumulated Ayda
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Account {0}: account Parent {1} tune
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Price List Rate (Company Exchange)
@@ -4739,14 +4773,15 @@
 DocType: Lab Prescription,Test Created,Test çêkirin
 DocType: Healthcare Settings,Custom Signature in Print,Çapemeniyê Custom Signature
 DocType: Account,Temporary,Derbasî
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,LPO Jimareya Giştî
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,LPO Jimareya Giştî
 DocType: Program,Courses,kursên
 DocType: Monthly Distribution Percentage,Percentage Allocation,Kodek rêjeya
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekreter
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Heke neçalak bike, &#39;Di Words&#39; qada wê ne di tu mêjera xuya"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ev çalakiyê dê barkirina paşerojê rawestînin. Ma hûn bawer dikin ku hûn ji bo vê endamê betal bikin?
 DocType: Serial No,Distinct unit of an Item,yekîneyên cuda yên vî babetî
 DocType: Supplier Scorecard Criteria,Criteria Name,Nasname
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Xêra xwe Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Xêra xwe Company
 DocType: Pricing Rule,Buying,kirîn
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Derman û Fertilizer
 DocType: HR Settings,Employee Records to be created by,Records karker ji aliyê tên afirandin bê
@@ -4755,18 +4790,18 @@
 DocType: POS Profile,Apply Discount On,Apply li ser navnîshana
 DocType: Member,Membership Type,Tîpa Endamê
 ,Reqd By Date,Query By Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,deyndêr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,deyndêr
 DocType: Assessment Plan,Assessment Name,Navê nirxandina
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC di çapkirinê de nîşan bide
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC di çapkirinê de nîşan bide
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: No Serial wêneke e
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Babetê Detail Wise Bacê
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Pêşniyarê kar
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abbreviation Enstîtuya
 ,Item-wise Price List Rate,List Price Rate babete-şehreza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Li Words xuya dê bibe dema ku tu Quotation xilas bike.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
@@ -4784,7 +4819,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Heke hilbijartî be, di sîstema wê entries hisêba ji bo ambaran de automatically binivîse."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Amadebûna ji bo karker {0} ji niha ve ji bo vê roja nîşankirin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Amadebûna ji bo karker {0} ji niha ve ji bo vê roja nîşankirin
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",li Minutes Demê via &#39;Time Têkeve&#39;
 DocType: Customer,From Lead,ji Lead
@@ -4795,6 +4830,7 @@
 DocType: Lab Test,Approved Date,Dîroka Endamê
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Li Hindîstan û yek warehouse wêneke e
+DocType: Subscriber,Subscriber Name,Navê Nûnerê
 DocType: Serial No,Out of Warranty,Out of Warranty
 DocType: BOM Update Tool,Replace,Diberdaxistin
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No berhemên dîtin.
@@ -4804,19 +4840,18 @@
 DocType: Request for Quotation Item,Project Name,Navê Project
 DocType: Customer,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
 DocType: Journal Entry Account,If Income or Expense,Ger Hatinê an jî Expense
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Hesabê derûnî ya di karmendê karsazê de hilbijêre {0}
 DocType: Work Order,Required Items,Nawy pêwîst
 DocType: Stock Ledger Entry,Stock Value Difference,Cudahiya di Nirx Stock
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,çavkaniyê binirxîne mirovan
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Lihevhatin û dayina tezmînat
 DocType: Disease,Treatment Task,Tediya Tedawî
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Maldarî bacê
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Maldarî bacê
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Peyam di kovara {0} nayê Hesabê te nîne {1} an ji niha ve bi rêk û pêk li dijî din fîşeke
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,The BOM ku wê biguherîn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Teçxîzatên hatiye Electronic
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Teçxîzatên hatiye Electronic
 DocType: Asset,Maintenance Required,Pêdivî ye
 DocType: Account,Debit,Debit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Pelên divê li mamoste ji 0.5 terxan kirin
@@ -4825,7 +4860,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Outstanding Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,armancên Set babetî Pula-şehreza ji bo vê Person Sales.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Rêzefîlma Cîran Cîran Freeze kevintir Than [Rojan]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ji bo sermaye sabît kirîn / sale wêneke e
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ji bo sermaye sabît kirîn / sale wêneke e
 DocType: Asset Maintenance Team,Maintenance Team Name,Tîma Barkirina Navîn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Eger du an jî zêdetir Rules Pricing dîtin li ser şert û mercên li jor li, Priority sepandin. Girîngî hejmareke di navbera 0 to 20 e dema ku nirxa standard zero (vala) e. hejmara Bilind tê wê wateyê ku ew dê sertir eger ne Rules Pricing multiple bi eynî şert û li wir bigirin."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Pêdivî ye ku Heke ji &#39;Opportunity Ji&#39; ve tê hilbijêre
@@ -4835,19 +4870,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Types ji mesrefan.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},rêjeya bo em babete Firotina {0} kêmtir e {1} xwe. rêjeya firotina divê bê Hindîstan û {2}
-DocType: Item,Taxes,bacê
+DocType: Subscription,Taxes,bacê
 DocType: Purchase Invoice,capital goods,tiştên sermayeyê
 DocType: Purchase Invoice Item,Weight Per Unit,Per Unit Weight
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Pere û bidana
 DocType: Project,Default Cost Center,Navenda Cost Default
-DocType: Bank Guarantee,End Date,Date End
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions Stock
 DocType: Budget,Budget Accounts,Accounts budceya
 DocType: Employee,Internal Work History,Dîroka Work navxweyî
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Accumulated Mîqdar Farhad.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Sebra taybet
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Supplier Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,bi temamî dandin de
 DocType: Employee Advance,Due Advance Amount,Ji ber Gava Agahdariyê
 DocType: Maintenance Visit,Customer Feedback,Feedback mişterî
 DocType: Account,Expense,Xercî
@@ -4871,7 +4904,7 @@
 ,Employee Information,Information karker
 DocType: Stock Entry Detail,Additional Cost,Cost Additional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Can filter li ser Voucher No bingeha ne, eger ji aliyê Vienna kom"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Make Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Make Supplier Quotation
 DocType: Quality Inspection,Incoming,Incoming
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Saziyên bacê yên ji bo firotin û kirînê ji nû ve tên afirandin.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Nirxandina encamê {0} jixwe heye.
@@ -4879,7 +4912,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Xêra xwe Company wêr&#39;a vala eger Pol By e &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Deaktîv bike Date nikare bibe dîroka pêşerojê de
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nayê bi hev nagirin {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ji bo hilberandina veguhestinê
 DocType: Stock Entry,Target Warehouse Address,Navnîşana Navnîşana Warehouse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Leave Casual
 DocType: Agriculture Task,End Day,Roja Dawî
@@ -4904,11 +4936,10 @@
 DocType: Material Request,% Ordered,% Ordered
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Ji bo qursa li Komeleya Xwendekarên Kurdistanê, li Kurs dê ji bo her Xwendekarên ji Kursên helîna li Program hejmartina vîze."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Rate kirîn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Rate kirîn
 DocType: Share Balance,From No,Ji Na
 DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
 DocType: Employee,History In Company,Dîroka Li Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Peyama nû ji {sender}
 DocType: Customer,Customer Primary Address,Navnîşana Serûpelê
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,bultenên me
 DocType: Drug Prescription,Description/Strength,Dîrok / Strength
@@ -4917,22 +4948,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,babete heman hatiye nivîsandin çend caran
 DocType: Department,Leave Block List,Dev ji Lîsteya Block
 DocType: Purchase Invoice,Tax ID,ID bacê
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Babetê {0} e setup bo Serial Nos ne. Stûna divê vala be
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Babetê {0} e setup bo Serial Nos ne. Stûna divê vala be
 DocType: Accounts Settings,Accounts Settings,Hesabên Settings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Destûrdan
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Navnîşana Malformatted ji bo {0}, kerema xwe berdewam bike."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Navnîşana Malformatted ji bo {0}, kerema xwe berdewam bike."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Gelek hesabê nû, ew ê nav navê navnîşê wek pêşnivîsa tête"
 DocType: Maintenance Team Member,Team Member,Endamê Team
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Ne encam nabe ku şandin
 DocType: Customer,Sales Partner and Commission,Partner Sales û Komîsyona
-DocType: Employee Loan,Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal
+DocType: Loan,Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal
 ,Project Quantity,Quantity Project
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere"
 DocType: Opportunity,To Discuss,birîn
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} ji bo temamkirina vê de mêjera.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rêjeya faîzên (%) Hit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Accounts demî
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Reş
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Accounts demî
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Reş
 DocType: BOM Explosion Item,BOM Explosion Item,BOM babet teqîn
 DocType: Shareholder,Contact List,Lîsteya Têkilî
 DocType: Account,Auditor,xwîndin
@@ -4940,16 +4971,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} tomar çêkirin
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Bêtir hîn bibin
 DocType: Cheque Print Template,Distance from top edge,Distance ji devê top
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,List Price {0} kêmendam e yan jî tune
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,List Price {0} kêmendam e yan jî tune
 DocType: Purchase Invoice,Return,Vegerr
 DocType: Pricing Rule,Disable,neçalak bike
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Mode dayinê pêwist e ji bo ku tezmînat
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Mode dayinê pêwist e ji bo ku tezmînat
 DocType: Project Task,Pending Review,hîn Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Bi rûpela bêhtir bijartî ji bo malperê, nirxên serial, batches etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Serdan û Şêwirmendan
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ku di Batch jimartin ne {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nikarin belav bibin, wekî ku ji niha ve {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Checks Required
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Checks Required
 DocType: Task,Total Expense Claim (via Expense Claim),Îdîaya Expense Total (via mesrefan)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Ji bo kompaniya sazkirinê neket
@@ -4961,7 +4992,7 @@
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Management ya Korsan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Lê zêde bike tomar ji
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Lê zêde bike tomar ji
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Crops &amp; Lands
 DocType: Cheque Print Template,Regular,Rêzbirêz
 DocType: Fertilizer,Density (if liquid),Density (eger liquid)
@@ -4986,24 +5017,26 @@
 DocType: Payment Entry,Paid Amount,Şêwaz pere
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Dîtina Sales Cycle
 DocType: Assessment Plan,Supervisor,Gûhliser
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Entry Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Entry Stock Entry
 ,Available Stock for Packing Items,Stock ji bo Nawy jî tê de
 DocType: Item Variant,Item Variant,Babetê Variant
 ,Work Order Stock Report,Report Report Stock Order
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Nirxandina Tool Encam
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Wek Supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Dîtin
 DocType: BOM Scrap Item,BOM Scrap Item,BOM babet Scrap
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","balance Account jixwe di Debit, hûn bi destûr ne ji bo danîna wek &#39;Credit&#39; &#39;Balance Must Be&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Management Quality
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Management Quality
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Babetê {0} neçalakirin
 DocType: Project,Total Billable Amount (via Timesheets),Giştî ya Bilind (Bi rêya Timesheets)
 DocType: Agriculture Task,Previous Business Day,Roja Bazirganî
-DocType: Employee Loan,Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period
+DocType: Loan,Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period
 DocType: Employee,Health Insurance No,Sîgorteya tendurustiyê tune
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ji kerema xwe ve dorpêçê de ji bo babet binivîse {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Credit Têbînî Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Credit Têbînî Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Giştî ya Bacgiriyê
 DocType: Employee External Work History,Employee External Work History,Xebatkarê History Kar Derve
 DocType: Opening Invoice Creation Tool,Purchase,Kirrîn
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance Qty
@@ -5014,16 +5047,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ji bo {1}
 DocType: Healthcare Settings,Valid number of days,Hejmara rojan rastîn
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Navendên cost
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Alîkariya Veşêre
 DocType: Land Unit,Linked Plant Analysis,Analysis Plant Link
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Rate li ku dabînkerê ya pereyan ji bo pereyan base şîrketê bîya
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Nakokiyên Timings bi row {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Destûrê bide Rate Valuation Zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Destûrê bide Rate Valuation Zero
+DocType: Bank Guarantee,Receiving,Bistînin
 DocType: Training Event Employee,Invited,vexwendin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Structures Salary çalak ji bo karker {0} ji bo dîrokan dayîn dîtin
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup bikarhênerên Gateway.
 DocType: Employee,Employment Type,Type kar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Maldarî Fixed
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Maldarî Fixed
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Loss
 ,GST Purchase Register,Gst Buy Register
 ,Cash Flow,Flow Cash
@@ -5044,9 +5079,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lîsteya danûstandinên hemî parve bikin
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,View opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,View opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Ji kerema xwe ve bibînin girêdayî {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Dema Dema Dibistana Dema Dîroka Destpêk û Dema Têkoşîna Trialê Divê Dîroka Destpêk Dabeş bikin
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Rêjeya Navîn
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Gava Tiştê Tevî Di nav deynê şertê divê divê tevahî Gund / Gundî be
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Gava Tiştê Tevî Di nav deynê şertê divê divê tevahî Gund / Gundî be
+DocType: Subscription Plan Detail,Plan,Pîlan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,balance Statement Bank wek per General Ledger
 DocType: Job Applicant,Applicant Name,Navê Applicant
 DocType: Authorization Rule,Customer / Item Name,Mişterî / Navê babetî
@@ -5076,6 +5112,7 @@
 DocType: Work Order,Warehouses,wargehan de
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sermaye ne bi dikarin bê veguhestin
 DocType: Hotel Room Pricing,Hotel Room Pricing,Pricing Room Room
+DocType: Subscription,Days Until Due,Rojên Heta Dereng
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ev babet guhertoya ji {0} (Şablon) e.
 DocType: Workstation,per hour,Serî saetê
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,kirînê
@@ -5084,13 +5121,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Ji bo Batch li Komeleya Xwendekarên Kurdistanê, Batch Xwendekar dê bên ji bo her xwendekarek hejmartina Program vîze."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ne jêbirin wek entry stock ledger ji bo vê warehouse heye.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Belavkirinî
+DocType: Journal Entry Account,Loan,Sened
 DocType: Expense Claim Advance,Expense Claim Advance,Serdanek Pêşveçûn
 DocType: Lab Test,Report Preference,Rapora Raporta
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Agahdariya dilxwaz
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Babetê têbinî eyna
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Overlap di navbera {0} û {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max discount destûr bo em babete: {0} {1}% e
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,nirxa Asset Net ku li ser
 DocType: Crop,Produce,Çêkirin
@@ -5100,7 +5138,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Kişandina Materyalê ji bo Hilberînê
 DocType: Item Alternative,Alternative Item Code,Koda Çavdêriya Alternatîf
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rola ku destûr ji bo pêşkêşkirina muamele ku di mideyeka sînorên credit danîn.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Select Nawy ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Select Nawy ji bo Manufacture
 DocType: Delivery Stop,Delivery Stop,Stop Delivery
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
 DocType: Item,Material Issue,Doza maddî
@@ -5110,15 +5148,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabûn &amp; Detergent
 DocType: BOM,Show Items,Show babetî
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Ji Time ne dikarin bibin mezintir To Time.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Ma hûn dixwazin ku hemî mişteriyan bi e-nameyê agahdar bikin?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Ma hûn dixwazin ku hemî mişteriyan bi e-nameyê agahdar bikin?
+DocType: Subscription Plan,Billing Interval,Navendiya Navîn
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Dîsa vekirin
 DocType: Hub Settings,Hub Username,Navê bikarhêner
 DocType: Salary Detail,Component,Perçe
 DocType: Assessment Criteria,Assessment Criteria Group,Şertên Nirxandina Group
 DocType: Healthcare Settings,Patient Name By,Navê Nûnerê
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Entry Journal of Accrual ji bo hejmarên {0} heta {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Entry Journal of Accrual ji bo hejmarên {0} heta {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
 DocType: Warehouse,Warehouse Name,Navê warehouse
 DocType: Naming Series,Select Transaction,Hilbijêre Transaction
@@ -5132,23 +5170,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Li vir tu dikarî height, giranî, alerjî, fikarên tibbî û hwd. Bidomînin"
 DocType: Leave Block List,Applies to Company,Ji bo Company
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
-DocType: Employee Loan,Disbursement Date,Date Disbursement
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Recipients&#39; ne diyar kirin
+DocType: Loan,Disbursement Date,Date Disbursement
 DocType: BOM Update Tool,Update latest price in all BOMs,Buhayê herî dawî ya BOM-ê nûve bikin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Radyoya Tenduristiyê
 DocType: Vehicle,Vehicle,Erebok
 DocType: Purchase Invoice,In Words,li Words
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Navê navnîşa bankê an saziya lînansê binivîse berî şandin.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,Divê {0} bên şandin
 DocType: POS Profile,Item Groups,Groups babetî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Îro {0} &#39;s birthday e!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Îro {0} &#39;s birthday e!
 DocType: Sales Order Item,For Production,ji bo Production
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Ji kerema xwe re li karta Hesabê ya vekirî ya vekirî vekin
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Ji kerema xwe re li karta Hesabê ya vekirî ya vekirî vekin
 DocType: Customer,Customer Primary Contact,Têkilî Serûpelê
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Demjimara Çandî ya Closing
 DocType: Project Task,View Task,View Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp /% Lead
+DocType: Bank Guarantee,Bank Guarantee Type,Cureya Qanûna Bankê
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Vebijandina Daxistinê
 ,Asset Depreciations and Balances,Depreciations Asset û hevsengiyên
@@ -5159,9 +5198,8 @@
 DocType: Production Plan,Include Subcontracted Items,Têkilî Subcontracted Items
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Bihevgirêdan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,kêmbûna Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Hêzên variant piştî piştî veguhestinê veguherînin. Divê hûn nifşek nû çêbikin ku ev bikin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
-DocType: Employee Loan,Repay from Salary,H&#39;eyfê ji Salary
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+DocType: Loan,Repay from Salary,H&#39;eyfê ji Salary
 DocType: Leave Application,LAP/,HIMBÊZ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
 DocType: Salary Slip,Salary Slip,Slip meaş
@@ -5185,11 +5223,11 @@
 DocType: Employee Education,Employee Education,Perwerde karker
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,koma babete hate dîtin li ser sifrê koma babete
 DocType: Land Unit,Parent Land Unit,Unit Unit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
 DocType: Fertilizer,Fertilizer Name,Navekî Fertilizer
 DocType: Salary Slip,Net Pay,Pay net
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} ji niha ve wergirtin
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial No {0} ji niha ve wergirtin
 ,Requested Items To Be Transferred,Nawy xwestin veguhestin
 DocType: Expense Claim,Vehicle Log,Têkeve Vehicle
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Pevçûnek tûşî (temaşe&gt; 38.5 ° C / 101.3 ° F an tempê tête&gt; 38 ° C / 100.4 ° F)
@@ -5230,24 +5268,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
 DocType: Asset Maintenance,Manufacturing User,manufacturing Bikarhêner
 DocType: Purchase Invoice,Raw Materials Supplied,Madeyên xav Supplied
-DocType: C-Form,Series,Doranî
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Pirtûka lîsteya bihayê {0} divê {1} an jî {2}
 DocType: Appraisal,Appraisal Template,appraisal Şablon
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Classification babetî
 DocType: Driver,License Number,Numreya Lîsansa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Purpose Maintenance Visit
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Pêwîstiya Nexweşê
 DocType: Crop,Period,Nixte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Ledger giştî
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Xebatkarê {0} li ser Leave li ser {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Xebatkarê {0} li ser Leave li ser {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,View Leads
 DocType: Program Enrollment Tool,New Program,Program New
 DocType: Item Attribute Value,Attribute Value,nirxê taybetmendiyê
 ,Itemwise Recommended Reorder Level,Itemwise Baştir DIRTYHERTZ Level
 DocType: Salary Detail,Salary Detail,Detail meaş
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
 DocType: Appointment Type,Physician,Bijîşk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} yên babet {1} xelas bûye.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Şêwirdarî
@@ -5255,15 +5292,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ji hêla plana plankirî ({2}) ji hêla Karê Karker {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Bîlançoya Time ji bo febrîkayan.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ji ber veguhastina veberhênanên variant veguherînin nikare guhertin. Divê hûn nifşek nû çêbikin ku ev bikin.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Rêveberiya SEPA GoCardless
 DocType: Physician,Charges,Tezmînatê
 DocType: Production Plan,Get Items For Work Order,Ji bo Armanca Karê Kar
 DocType: Salary Detail,Default Amount,Default Mîqdar
 DocType: Lab Test Template,Descriptive,Descriptive
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Warehouse li sîstema nehat dîtin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse li sîstema nehat dîtin
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Nasname vê mehê da
 DocType: Quality Inspection Reading,Quality Inspection Reading,Reading Berhemên Quality
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
 DocType: Tax Rule,Purchase Tax Template,Bikirin Şablon Bacê
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Armanca ku tu dixwazî ji bo şîrketiya we bigihîne firotina firotanê bike.
 ,Project wise Stock Tracking,Project Tracking Stock zana
@@ -5291,11 +5329,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Failed to malperê
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Converter
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Entry Stock Entry already created or Quantity Sample not provided
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Entry Stock Entry already created or Quantity Sample not provided
 DocType: Program,Program Abbreviation,Abbreviation Program
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Li dijî wan doz bi wergirtina Purchase dijî hev babete ve
 DocType: Warranty Claim,Resolved By,Biryar By
-DocType: Bank Guarantee,Start Date,Destpêk Date
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,"Veqetandin, pelên ji bo demeke."
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques û meden bi şaşî kenîştê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Account {0}: Tu dikarî xwe wek account dê û bav bê peywirdarkirin ne
@@ -5310,11 +5347,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,saetan
 DocType: Project,Expected Start Date,Hêvîkirin Date Start
 DocType: Purchase Invoice,04-Correction in Invoice,04-Guhertina Di vexwendinê de
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Karê Birêvebirê ji bo hemî tiştên ku BOM bi kar tîne hatiye afirandin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Karê Birêvebirê ji bo hemî tiştên ku BOM bi kar tîne hatiye afirandin
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Report Report
 DocType: Setup Progress Action,Setup Progress Action,Çalakiya Pêşveçûnê
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Lîsteya bihayê bihêlin
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Lîsteya bihayê bihêlin
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Jê babete eger doz e ji bo ku em babete ne
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Daxistina Cancel
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Ji kerema xwe ya Rewşa Saziyê ya ku Hin bihatin an hilbijêre an hilbijêre Dîroka hilbijêre
 DocType: Supplier,Default Payment Terms Template,Sermaseya Daxuyaniyê Default
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,currency muameleyan divê eynî wek Payment Gateway pereyan be
@@ -5325,7 +5363,6 @@
 DocType: Employee,Educational Qualification,Qualification perwerdeyî
 DocType: Workstation,Operating Costs,Mesrefên xwe Operating
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action eger Accumulated Ayda Budget derbas
-DocType: Subscription,Submit on creation,Submit li ser çêkirina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
 DocType: Asset,Disposal Date,Date çespandina
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails wê ji bo hemû xebatkarên me Active ji şîrketa saet dayîn şandin, eger ew cejna tune ne. Nasname ji bersivên wê li nîvê şevê şandin."
@@ -5343,6 +5380,7 @@
 DocType: Batch,Parent Batch,Batch dê û bav
 DocType: Cheque Print Template,Cheque Print Template,Cheque Şablon bo çapkirinê
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chart Navendên Cost
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Hejmara rojan piştî roja davêtinê ji ber betalkirina betalkirinê an betalkirina betaleyê bête betal kirin
 DocType: Lab Test Template,Sample Collection,Collection Collection
 ,Requested Items To Be Ordered,Nawy xwestin To fermana Be
 DocType: Price List,Price List Name,List Price Name
@@ -5351,7 +5389,7 @@
 DocType: Account,Income,Hatin
 DocType: Industry Type,Industry Type,Type Industry
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Tiştek xelet çû!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Hişyarî: Ji sepanê dihewîne di dîrokên block van
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Hişyarî: Ji sepanê dihewîne di dîrokên block van
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Sales bi fatûreyên {0} ji niha ve hatine radestkirin
 DocType: Supplier Scorecard Scoring Criteria,Score,Rewşa nixtan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Sal malî {0} tune
@@ -5371,12 +5409,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-ji-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,Divê {0} nirxek di navbera 0 û 100 de
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Piştre Dîroka Bersîviya Berî Berî Berî Berî Bikaranînê Ji bo karûbarê peyda-ne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Loans bê çarerserkirin.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Loans bê çarerserkirin.
 DocType: Cost Center,Cost Center Name,Mesrefa Name Navenda
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max dema xebatê li dijî timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Date scheduled
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total pere Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total pere Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages mezintir 160 characters wê bê nav mesajên piralî qelişîn
 DocType: Purchase Receipt Item,Received and Accepted,"Stand, û pejirandî"
 DocType: Hub Settings,Company and Seller Profile,Profîl û firotanê kiryarê
@@ -5390,10 +5428,9 @@
 DocType: Item,Variant Based On,Li ser varyanta
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Suppliers te
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ji kerema xwe rast bikin
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Bênav
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,pêşwaziya From
 DocType: Lead,Converted,xwe guhert
@@ -5407,6 +5444,7 @@
 DocType: Asset,Assets,Tiştan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Komûter
 DocType: Item,List this Item in multiple groups on the website.,Lîsteya ev babet di koman li ser malpera me.
+DocType: Subscription,Current Invoice End Date,Dîroka Dawiya Dawîn
 DocType: Payment Term,Due Date Based On,Li ser Bingeha Dîroka Girêdanê
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Ji kerema xwe veguhastin û komek xerîdarên li ser Sermaseyên Kirêdar bikî
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} tune
@@ -5414,7 +5452,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Babet: {0} nayê di sîstema tune
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Tu bi destûr ne ji bo danîna nirxa Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Arşîva
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Ne vegerandin ji bo Journal Entry hilbijartin
 DocType: Payment Reconciliation,From Invoice Date,Ji fatûreyên Date
+DocType: Loan,Disbursed,Vexwendin
 DocType: Healthcare Settings,Laboratory Settings,Settings
 DocType: Patient Appointment,Service Unit,Yekîneya Xizmet
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Serkeftî Set Supplier
@@ -5427,12 +5467,12 @@
 DocType: Share Balance,No of Shares,Naveroka ne
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Status hilbijêre
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
 DocType: Pricing Rule,Pricing Rule Help,Rule Pricing Alîkarî
 DocType: School House,House Name,Navê House
 DocType: Fee Schedule,Total Amount per Student,Bi tevahî hejmara xwendekaran
 DocType: Purchase Taxes and Charges,Account Head,Serokê account
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Electrical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Electrical
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Zêde ji yên din rêxistina xwe wek bikarhênerên xwe. Tu dikarî gazî muşteriyan bi portal xwe lê zêde bike by got, wan ji Têkilî"
 DocType: Stock Entry,Total Value Difference (Out - In),Cudahiya di Total Nirx (Out - In)
 DocType: Grant Application,Requested Amount,Daxwaza Amûdê
@@ -5442,7 +5482,7 @@
 DocType: Crop Cycle,Detected Diseases,Nexweşiyên Nexweş
 DocType: Stock Entry,Default Source Warehouse,Default Warehouse Source
 DocType: Item,Customer Code,Code mişterî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Reminder Birthday ji bo {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Reminder Birthday ji bo {0}
 DocType: Asset Maintenance Task,Last Completion Date,Dîroka Dawîn Dawîn
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Rojan de ji sala Last Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
@@ -5450,9 +5490,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Guhertoyên GoCardless
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Maldarî
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Stock Maldarî
 DocType: Restaurant,Active Menu,Menu menu
 DocType: Target Detail,Target Qty,Qty target
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Li Bexdayê: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Settings Checkout
 DocType: Student Attendance,Present,Amade
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Têbînî {0} divê şandin ne bê
@@ -5461,9 +5502,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
 DocType: Vehicle Log,Odometer,Green
 DocType: Production Plan Item,Ordered Qty,emir kir Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Babetê {0} neçalak e
 DocType: Stock Settings,Stock Frozen Upto,Stock Upto Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nade ti stock babete ne
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nade ti stock babete ne
 DocType: Chapter,Chapter Head,Şemiyê
 DocType: Payment Term,Month(s) after the end of the invoice month,Piştî dawiya mehê ya mehê
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,çalakiyên Project / erka.
@@ -5471,11 +5512,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Çêneke Salary Slips
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Di encama datemê de ji ber encamên labehê vebigere pêşî nabe
 DocType: POS Profile,Allow user to edit Discount,Destûrê bikar bîne ku bikarhênerên Discountê biguherînin
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Ji mişterî bibin
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Ji mişterî bibin
 DocType: Purchase Invoice Item,Include Exploded Items,Included Dead Items
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Kirîn, divê werin kontrolkirin, eger Ji bo serlêdanê ya ku weke hilbijartî {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount gerek kêmtir ji 100 be
 DocType: Shipping Rule,Restrict to Countries,Li welatên sînor bikin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Hewe Off Mîqdar (Company Exchange)
 DocType: Sales Invoice Timesheet,Billing Hours,Saet Billing
 DocType: Project,Total Sales Amount (via Sales Order),Giştî ya Firotinê (ji hêla firotina firotanê)
@@ -5494,6 +5536,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Gerînendeya Nirxandinê
 DocType: Payment Entry,Allocate Payment Amount,"Veqetandin, Mîqdar Payment"
+DocType: Subscription Plan,Subscription Plan,Plana Serlêdana
 DocType: Employee External Work History,Salary,Meaş
 DocType: Serial No,Delivery Document Type,Delivery Corî dokumênt
 DocType: Sales Order,Partly Delivered,hinekî Çiyan
@@ -5517,9 +5560,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Hêz
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Pêşniyarên sazkirinê
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Naveroka Hilbijartinê Na ku ji bo Meriv {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Naveroka Hilbijartinê Na ku ji bo Meriv {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM şûna
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Li gor danûstandinên Navnîşê li ser hilbijêre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Li gor danûstandinên Navnîşê li ser hilbijêre
 DocType: Grant Application,Has any past Grant Record,Gelek Grant Record
 ,Sales Analytics,Analytics Sales
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Available {0}
@@ -5538,7 +5581,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost madeyên xav Supplied
 DocType: Selling Settings,Settings for Selling Module,Mîhengên ji bo Firotina Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reservation Room Hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Balkeş bûn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Balkeş bûn
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Babetê Detail Mişterî
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Pêşkêşiya namzetê a Job.
@@ -5555,7 +5598,7 @@
 DocType: Fees,Student Details,Agahdariya Xwendekaran
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
-DocType: Employee Loan,Repayment Period in Months,"Period dayinê, li Meh"
+DocType: Loan,Repayment Period in Months,"Period dayinê, li Meh"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Çewtî: Not a id derbasdar e?
 DocType: Naming Series,Update Series Number,Update Hejmara Series
 DocType: Account,Equity,Sebra min
@@ -5564,7 +5607,7 @@
 DocType: Task,Closing Date,Date girtinê
 DocType: Sales Order Item,Produced Quantity,Quantity produced
 DocType: Timesheet,Work Detail,Pirtûka kar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Hendese
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Hendese
 DocType: Journal Entry,Total Amount Currency,Temamê meblaxa Exchange
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meclîsên Search bînrawe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Code babete pêwîst li Row No {0}
@@ -5610,13 +5653,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Agahiya agahdariyê.
 DocType: Request for Quotation,Supplier Detail,Detail Supplier
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Çewtî di formula an rewşa: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Şêwaz fatore
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Şêwaz fatore
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Divê giravên nirxê 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Amadetî
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Nawy Stock
 DocType: BOM,Materials,materyalên
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Heke ne, di lîsteyê de wê ji bo her Beşa ku wê were sepandin bê zêdekirin."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Creating {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source û Target Warehouse ne dikarin heman
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,date mesaj û dem bi mesaj û wêneke e
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,şablonê Bacê ji bo kirîna muamele.
@@ -5640,14 +5682,14 @@
 DocType: Shipping Rule,Fixed,Tişt
 DocType: Vehicle Service,Clutch Plate,Clutch deşta
 DocType: Company,Round Off Account,Li dora Off Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Mesref îdarî
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Mesref îdarî
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Dê û bav Mişterî Group
-DocType: Journal Entry,Subscription,Abonetî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonetî
 DocType: Purchase Invoice,Contact Email,Contact Email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Pending Creation Pending
 DocType: Appraisal Goal,Score Earned,score Earned
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Notice Period
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Notice Period
 DocType: Asset Category,Asset Category Name,Asset Category Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ev axa root e û ne jî dikarim di dahatûyê de were.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navê New Person Sales
@@ -5661,7 +5703,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
 DocType: Asset,Frequency of Depreciation (Months),Frequency ji Farhad (meh)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Account Credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Account Credit
 DocType: Landed Cost Item,Landed Cost Item,Landed babet Cost
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Nîşan bide nirxên zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mêjera babete bidestxistin piştî manufacturing / repacking ji quantities dayîn ji madeyên xav
@@ -5669,7 +5711,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Teleb / cîhde Account
 DocType: Delivery Note Item,Against Sales Order Item,Li dijî Sales Order babetî
 DocType: Hub Settings,Company Logo,Company Logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budceya dikare li hember Account Pol ne bibin xwediyê rêdan û {0}
 DocType: Healthcare Settings,Patient Registration,Pêdivî ye
@@ -5704,11 +5746,10 @@
 DocType: Journal Entry,Total Debit,Total Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default QediyayîComment Goods Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Ji kerema xwe veşêre hilbijêrin
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Person Sales
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Person Sales
 DocType: Hotel Room Package,Amenities,Amenities
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budceya û Navenda Cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Modeya piralî ya pêdivî ye ku pêdivî ye
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,bo
 ,Appointment Analytics,Analytics
 DocType: Vehicle Service,Half Yearly,nîv Hit
 DocType: Lead,Blog Subscriber,abonetiyê Blog
@@ -5725,6 +5766,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Vala bihêlin eger tu şaşiyekê komên xwendekarên her salê
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Eger kontrolkirin, Total tune. ji Xebatê Rojan wê de betlaneyên xwe, û em ê bi nirxê Salary Per Day kêm"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Vebijêrkên key-ê bikar bînin ku dê nikaribin gihîştin destûr, ma hûn rast bin?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Total Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Koda Kodê biguherîne
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,The Date Term End ne dikarin zûtir ji Date Serî Term be. Ji kerema xwe re li rojên bike û careke din biceribîne.
@@ -5736,8 +5778,9 @@
 DocType: Opportunity Item,Basic Rate,Rate bingehîn
 DocType: GL Entry,Credit Amount,Şêwaz Credit
 DocType: Cheque Print Template,Signatory Position,Asta îmze
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Set as Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Set as Lost
 DocType: Timesheet,Total Billable Hours,Total Hours Billable
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Hejmara rojan ku xwediyê pargîdanî divê bi bargayên vê beşdariyê çêbikin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Payment Meqbûz Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ev li ser danûstandinên li dijî vê Mişterî bingeha. Dîtina cedwela li jêr bo hûragahiyan
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: veqetandin mîqdara {1} gerek kêmtir be an jî li beramberî bi mîqdara Peyam Payment {2}
@@ -5756,12 +5799,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get Last Purchase Rate
 DocType: Company,Company Info,Company Info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Select an jî lê zêde bike mişterî nû
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Sepanê ji Funds (Maldarî)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ev li ser amadebûna vê Xebatkara li
 DocType: Assessment Result,Summary,Berhevkirinî
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Beşdariya Mark
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Account Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Account Debit
 DocType: Fiscal Year,Year Start Date,Sal Serî Date
 DocType: Attendance,Employee Name,Navê xebatkara
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Order Entry Item
@@ -5773,7 +5816,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Asta kirîn
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Qezenca kardarîyê
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Qezenca kardarîyê
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},"dorpêçê de bi timamî, divê dorpêçê de ji bo babet {0} li row pêşya {1}"
 DocType: Work Order,Manufactured Qty,Manufactured Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Piştgirên bi {0}
@@ -5781,12 +5824,12 @@
 DocType: Asset,Out of Order,Xirab
 DocType: Purchase Receipt Item,Accepted Quantity,Quantity qebûlkirin
 DocType: Projects Settings,Ignore Workstation Time Overlap,Vebijêrk Demjimêrk Overlap
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Ji kerema xwe ve set a default Lîsteya Holiday ji bo karkirinê {0} an Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Ji kerema xwe ve set a default Lîsteya Holiday ji bo karkirinê {0} an Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} nizane heye ne
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Numbers Batch Hilbijêre
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Fatûrayên xwe rakir, ji bo muşteriyan."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
 DocType: Patient Service Unit,Medical Administrator,Rêveberê lênerînê
 DocType: Assessment Plan,Schedule,Pîlan
 DocType: Account,Parent Account,Account dê û bav
@@ -5816,15 +5859,16 @@
 DocType: Asset Repair,Repair Status,Rewşa Rewşê
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,entries Accounting Kovara.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Qty li From Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Ji kerema xwe ve yekem Employee Record hilbijêre.
 DocType: POS Profile,Account for Change Amount,Account ji bo Guhertina Mîqdar
 DocType: Purchase Invoice,input service,xizmetê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partiya / Account nayê bi hev nagirin {1} / {2} li {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Endama Tenduristiyê
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analysis
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Koda kursê
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
 DocType: Account,Stock,Embar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
 DocType: Employee,Current Address,niha Address
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ger babete guhertoya yên babete din wê description, wêne, sewqiyata, bac û hwd dê ji şablonê set e, heta ku eşkere û diyar"
 DocType: Serial No,Purchase / Manufacture Details,Buy / Details Manufacture
@@ -5873,19 +5917,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissions ji bo {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Seasonality ji bo avakirin, budceyên, armancên hwd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Navekî Navîn
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Babetê {0} a şablonê ye, ji kerema xwe ve yek ji Guhertoyên xwe hilbijêre"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Babetê {0} a şablonê ye, ji kerema xwe ve yek ji Guhertoyên xwe hilbijêre"
 DocType: Asset,Asset Category,Asset Kategorî
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,pay Net ne dikare bibe neyînî
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Bacê babetî
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Madî ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Madî ji bo Supplier
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Request Request Plans
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,baca bi fatûreyên
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ji carekê zêdetir xuya
 DocType: Expense Claim,Employees Email Id,Karmendên Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Beşdariyê nîşankirin
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Deynên niha:
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Deynên niha:
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer demjimêr dane.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Send SMS girseyî ji bo têkiliyên xwe
 DocType: Patient,A Positive,A Positive
@@ -5896,9 +5940,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rastî Qty wêneke e
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} niha li ser {1} Pargîdanîya Scorecard heye, û Kirêdar kirina vê pargîdaniyê divê bi hişyariyê re bêne belav kirin."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tîmên Parastina Girtîgehê
-DocType: Employee Loan,Loan Type,Type deyn
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} serkeftî hate şandin
+DocType: Loan,Loan Type,Type deyn
 DocType: Scheduling Tool,Scheduling Tool,Amûra scheduling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Li kû çûn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Li kû çûn
 DocType: BOM,Item to be manufactured or repacked,Babete binêre bo çêkirin an repacked
 DocType: Employee Education,Major/Optional Subjects,Major / Subjects Bijarî
 DocType: Sales Invoice Item,Drop Ship,drop ship
@@ -5930,7 +5975,7 @@
 DocType: Item,Units of Measure,Yekîneyên Measure
 DocType: Manufacturing Settings,Allow Production on Holidays,Destûrê bide Production li ser Holidays
 DocType: Sales Invoice,Customer's Purchase Order Date,Mişterî ya Purchase Order Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Nîşan Attachments Public
 DocType: Packing Slip,Package Weight Details,Package Details Loss
 DocType: Restaurant Reservation,Reservation Time,Wextê rezervan
@@ -5945,7 +5990,7 @@
 DocType: Purchase Order,To Receive and Bill,To bistînin û Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd Beriya Dîroka Berî Beriya Transfer Dîroka
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Products Dawiyê
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Şikilda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Şikilda
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şert û mercan Şablon
 DocType: Serial No,Delivery Details,Details Delivery
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Navenda Cost li row pêwîst e {0} Bac sifrê ji bo cureyê {1}
@@ -5955,20 +6000,20 @@
 DocType: Driver,Expiry Date,Date Expiry
 DocType: Healthcare Settings,Employee name and designation in print,Navekî navnîş û navnîşan di çapkirinê de
 ,accounts-browser,bikarhênerên-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Ji kerema xwe ve yekem Kategorî hilbijêre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Ji kerema xwe ve yekem Kategorî hilbijêre
 apps/erpnext/erpnext/config/projects.py +13,Project master.,master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","To rê li ser-billing an li ser-Ręzkirin, update &quot;Berdêlên&quot; li Stock Settings an jî Babetê."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nîşan nede ti sembola wek $ etc next to currencies.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Day Half)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Day Half)
 DocType: Payment Term,Credit Days,Rojan Credit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Ji kerema xwe ji nexweşiya hilbijêrin ku ji bo ceribandinên Labê bibînin
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Batch Student
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Ma çêşît Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Get Nawy ji BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Get Nawy ji BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Rê Time Rojan
 DocType: Cash Flow Mapping,Is Income Tax Expense,Xerca Bacê ye
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"vê kontrol bike, eger ku xwendevan û geştê li Hostel a Enstîtuyê ye."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ji kerema xwe ve Orders Sales li ser sifrê li jor binivîse
 ,Stock Summary,Stock Nasname
@@ -5979,10 +6024,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Date Ref
 DocType: Employee,Reason for Leaving,Sedem ji bo Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Cost Operating (Company Exchange)
-DocType: Employee Loan Application,Rate of Interest,Rêjeya faîzên
+DocType: Loan Application,Rate of Interest,Rêjeya faîzên
 DocType: Expense Claim Detail,Sanctioned Amount,Şêwaz ambargoyê
 DocType: Item,Shelf Life In Days,Di Rojên Jiyan de Shelf
 DocType: GL Entry,Is Opening,e Opening
+DocType: Department,Expense Approvers,Expense Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debît entry dikarin bi ne bê lînkkirî a {1}
 DocType: Journal Entry,Subscription Section,Beşê Beşê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Account {0} tune
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 907d930..b89d9e1 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ຍົກເລີກການວັດສະດຸເຂົ້າ {0} ກ່ອນການຍົກເລີກການຮຽກຮ້ອງຮັບປະກັນນີ້
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,ບົດລາຍງານການປະເມີນຜົນ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,ຜະລິດຕະພັນຜູ້ບໍລິໂພກ
-DocType: Purchase Receipt,Subscription Detail,ລາຍະການຈອງຊື້
 DocType: Supplier Scorecard,Notify Supplier,ແຈ້ງ Supplier
 DocType: Item,Customer Items,ລາຍການລູກຄ້າ
 DocType: Project,Costing and Billing,ການໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ສາມາດແຍກປະເພດເປັນ
 DocType: Item,Publish Item to hub.erpnext.com,ເຜີຍແຜ່ສິນຄ້າທີ່ຈະ hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ການແຈ້ງເຕືອນອີເມວ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ການປະເມີນຜົນ
 DocType: Item,Default Unit of Measure,ມາດຕະຖານ Unit of Measure
 DocType: SMS Center,All Sales Partner Contact,ທັງຫມົດ Sales Partner ຕິດຕໍ່
-DocType: Employee,Leave Approvers,ອອກຈາກການອະນຸມັດ
+DocType: Department,Leave Approvers,ອອກຈາກການອະນຸມັດ
 DocType: Sales Partner,Dealer,ຕົວແທນຈໍາຫນ່າຍ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,ການສືບສວນ
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ກວດເບິ່ງທີ່ມີຢູ່
 DocType: Job Applicant,Job Applicant,ວຽກເຮັດງານທໍາສະຫມັກ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາກັບຜູ້ນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,ທາງດ້ານກົດຫມາຍ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},ພາສີປະເພດທີ່ແທ້ຈິງບໍ່ສາມາດລວມຢູ່ໃນລາຍການຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,ທາງດ້ານກົດຫມາຍ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},ພາສີປະເພດທີ່ແທ້ຈິງບໍ່ສາມາດລວມຢູ່ໃນລາຍການຕິດຕໍ່ກັນ {0}
 DocType: Bank Guarantee,Customer,ລູກຄ້າ
 DocType: Purchase Receipt Item,Required By,ທີ່ກໍານົດໄວ້ໂດຍ
 DocType: Delivery Note,Return Against Delivery Note,ກັບຄືນຕໍ່ການສົ່ງເງິນ
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},ບັນຊີທະນາຄານບໍ່ສາມາດໄດ້ຮັບການຕັ້ງຊື່ເປັນ {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ຫົວຫນ້າ (ຫຼືກຸ່ມ) ການຕໍ່ຕ້ານທີ່ Entries ບັນຊີທີ່ຜະລິດແລະຍອດຖືກຮັກສາໄວ້.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ທີ່ຍັງຄ້າງຄາສໍາລັບ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາສູນ ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ບໍ່ມີສົ່ງເງິນເດືອນຄວາມຜິດພາດພຽງທີ່ຈະປະມວນຜົນ.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ບໍ່ມີສົ່ງເງິນເດືອນຄວາມຜິດພາດພຽງທີ່ຈະປະມວນຜົນ.
 DocType: Manufacturing Settings,Default 10 mins,ມາດຕະຖານ 10 ນາທີ
 DocType: Leave Type,Leave Type Name,ອອກຈາກຊື່ປະເພດ
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ສະແດງໃຫ້ເຫັນການເປີດ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ມັນເປັນສິ່ງຈໍາເປັນທີ່ຈະດໍາເນີນການປະຕິບັດງານໃນມື້ນີ້ສໍາລັບຕົວຢ່າງທີ່ກ່າວມາຂ້າງເທິງ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ກວດເບິ່ງ
 DocType: Pricing Rule,Apply On,ສະຫມັກຕໍາກ່ຽວກັບ
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ທັງຫມົດຂອງຜູ້ຕິດຕໍ່
 DocType: Support Settings,Support Settings,ການຕັ້ງຄ່າສະຫນັບສະຫນູນ
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,ຄາດວ່າສິ້ນສຸດວັນທີ່ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຄາດວ່າຈະເລີ່ມວັນທີ່
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"ຕິດຕໍ່ກັນ, {0}: ອັດຕາຈະຕ້ອງດຽວກັນເປັນ {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,ການນໍາໃຊ້ອອກໃຫມ່
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"ຕິດຕໍ່ກັນ, {0}: ອັດຕາຈະຕ້ອງດຽວກັນເປັນ {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,ຊຸດສິນຄ້າສະຖານະຫມົດອາຍຸ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ຮ່າງຂອງທະນາຄານ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ຮ່າງຂອງທະນາຄານ
 DocType: Membership,membership validaty section,ເຂົ້າສູ່ລະບົບ validaty ສ່ວນ
 DocType: Mode of Payment Account,Mode of Payment Account,ຮູບແບບຂອງບັນຊີຊໍາລະເງິນ
 DocType: Consultation,Consultation,ການປຶກສາຫາລື
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ອຸປະກອນການ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ການເຮັດເວັບໄຊທ໌
 DocType: Opening Invoice Creation Tool Item,Quantity,ປະລິມານ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ເງິນກູ້ຢືມ (ຫນີ້ສິນ)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ເງິນກູ້ຢືມ (ຫນີ້ສິນ)
 DocType: Employee Education,Year of Passing,ປີທີ່ຜ່ານ
 DocType: Item,Country of Origin,ປະເທດກໍາເນີດສິນຄ້າ
 DocType: Soil Texture,Soil Texture Criteria,ຄຸນລັກສະນະຂອງໂຄງສ້າງດິນ
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primary Contact Details
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ເປີດປະເດັນ
 DocType: Production Plan Item,Production Plan Item,ການຜະລິດແຜນ Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ຜູ້ໃຊ້ {0} ແມ່ນກໍາຫນົດໃຫ້ກັບພະນັກງານ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ຜູ້ໃຊ້ {0} ແມ່ນກໍາຫນົດໃຫ້ກັບພະນັກງານ {1}
 DocType: Lab Test Groups,Add new line,ເພີ່ມສາຍໃຫມ່
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ຮັກສາສຸຂະພາບ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ຄວາມຊັກຊ້າໃນການຈ່າຍເງິນ (ວັນ)
@@ -89,7 +85,7 @@
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ໃບເກັບເງິນ
+DocType: Subscription Invoice,Invoice,ໃບເກັບເງິນ
 DocType: Purchase Invoice Item,Item Weight Details,Item Weight Details
 DocType: Asset Maintenance Log,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ປີງົບປະມານ {0} ຈໍາເປັນຕ້ອງມີ
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,abbr
 DocType: Appraisal Goal,Score (0-5),ຄະແນນ (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ຕິດຕໍ່ກັນ {0}: {1} {2} ບໍ່ກົງກັບ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,"ຕິດຕໍ່ກັນ, {0}:"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,"ຕິດຕໍ່ກັນ, {0}:"
 DocType: Timesheet,Total Costing Amount,ຈໍານວນເງິນຕົ້ນທຶນທັງຫມົດ
 DocType: Delivery Note,Vehicle No,ຍານພາຫະນະບໍ່ມີ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,ກະລຸນາເລືອກລາຄາ
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,ກໍາລັງດໍາເນີນການ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,ກະລຸນາເລືອກເອົາວັນທີ
 DocType: Daily Work Summary Group,Holiday List,ຊີວັນພັກ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,ບັນຊີ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,ບັນຊີ
 DocType: Hub Settings,Selling Price List,ລາຄາຂາຍລາຄາ
 DocType: Patient,Tobacco Current Use,Tobacco Current Use
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,ອັດຕາການຂາຍ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,ອັດຕາການຂາຍ
 DocType: Cost Center,Stock User,User Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,ໂທລະສັບທີ່ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},ໃຫມ່ {0} # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ການແຈ້ງເຕືອນເບື້ອງຕົ້ນຖືກສົ່ງມາ
 ,Sales Partners Commission,ຄະນະກໍາມະ Partners ຂາຍ
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ມູນຄ່າຫຼັງຈາກຄ່າເສື່ອມລາຄາ
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ທີ່ກ່ຽວຂ້ອງ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,ວັນຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດຈະຫນ້ອຍກ່ວາວັນເຂົ້າຮ່ວມຂອງພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,ວັນຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດຈະຫນ້ອຍກ່ວາວັນເຂົ້າຮ່ວມຂອງພະນັກງານ
 DocType: Grading Scale,Grading Scale Name,ການຈັດລໍາດັບຊື່ Scale
-DocType: Subscription,Repeat on Day,Repeat on Day
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ນີ້ແມ່ນບັນຊີຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 DocType: Sales Invoice,Company Address,ທີ່ຢູ່ບໍລິສັດ
 DocType: BOM,Operations,ການດໍາເນີນງານ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ບໍ່ສາມາດກໍານົດການອະນຸຍາດບົນພື້ນຖານຂອງການ Discount {0}
+DocType: Subscription,Subscription Start Date,ວັນທີເລີ່ມຕົ້ນສະມາຊິກ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ຄັດຕິດເອກະສານ .csv ມີສອງຖັນ, ຫນຶ່ງສໍາລັບຊື່ເກົ່າແລະຫນຶ່ງສໍາລັບຊື່ໃຫມ່"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ບໍ່ໄດ້ຢູ່ໃນການເຄື່ອນໄຫວປີໃດງົບປະມານ.
 DocType: Packed Item,Parent Detail docname,ພໍ່ແມ່ຂໍ້ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ອ້າງອິງ: {0}, ລະຫັດສິນຄ້າ: {1} ແລະລູກຄ້າ: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ວັນທີສິ້ນສຸດການທົດລອງບໍ່ສາມາດຢູ່ໃນໄລຍະເວລາທົດລອງໄດ້
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,ກິໂລກຣາມ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ການເປີດກວ້າງການວຽກ.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM ບໍ່ໄດ້ລະບຸໄວ້ສໍາລັບລາຍການການຕິດຕໍ່ໃນ {0} ຢູ່ແຖວ {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ບໍລິສັດດຽວກັນແມ່ນເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Patient,Married,ການແຕ່ງງານ
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ໄດ້ຮັບການລາຍການຈາກ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,ໄດ້ຮັບການລາຍການຈາກ
 DocType: Price List,Price Not UOM Dependant,Price Not UOM Dependent
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ນ້ໍາມັນຫ້າມລໍ້
 DocType: Tax Rule,Tax Type,ປະເພດອາກອນ
 ,Completed Work Orders,ຄໍາສັ່ງເຮັດວຽກສໍາເລັດແລ້ວ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,ຈໍານວນພາສີ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,ຈໍານວນພາສີ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
 DocType: BOM,Item Image (if not slideshow),ລາຍການຮູບພາບ (ຖ້າຫາກວ່າບໍ່ໂຊ)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(ຊົ່ວໂມງອັດຕາ / 60) * ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ແຖວ # {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນຫນຶ່ງໃນການຮຽກຮ້ອງຄ່າຫຼືອະນຸທິນ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,ເລືອກ BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,ແຖວ # {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນຫນຶ່ງໃນການຮຽກຮ້ອງຄ່າຫຼືອະນຸທິນ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,ເລືອກ BOM
 DocType: SMS Log,SMS Log,SMS ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ຄ່າໃຊ້ຈ່າຍຂອງການສົ່ງ
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ຈັດການເງິນລ່ວງຫນ້າໃຫ້ແກ່ພະນັກງານ
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ແຈ້ງການຈັດສົ່ງ
 DocType: Journal Entry,Opening Entry,Entry ເປີດ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ບັນຊີຈ່າຍພຽງແຕ່
-DocType: Employee Loan,Repay Over Number of Periods,ຕອບບຸນແທນຄຸນໃນໄລຍະຈໍານວນຂອງໄລຍະເວລາ
+DocType: Loan,Repay Over Number of Periods,ຕອບບຸນແທນຄຸນໃນໄລຍະຈໍານວນຂອງໄລຍະເວລາ
 DocType: Stock Entry,Additional Costs,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,ບັນຊີກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Lead,Product Enquiry,ສອບຖາມຂໍ້ມູນຜະລິດຕະພັນ
 DocType: Education Settings,Validate Batch for Students in Student Group,ກວດສອບຊຸດສໍາລັບນັກສຶກສາໃນກຸ່ມນັກສຶກສາ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ບໍ່ມີການບັນທຶກໃບພົບພະນັກງານ {0} ສໍາລັບ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ບໍ່ມີການບັນທຶກໃບພົບພະນັກງານ {0} ສໍາລັບ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ກະລຸນາໃສ່ບໍລິສັດທໍາອິດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ
 DocType: Employee Education,Under Graduate,ພາຍໃຕ້ການຈົບການສຶກສາ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,ກະລຸນາຕັ້ງຄ່າແມ່ແບບມາດຕະຖານສໍາລັບການປ່ອຍ Notification ສະຖານະໃນ HR Settings.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ເປົ້າຫມາຍກ່ຽວກັບ
 DocType: BOM,Total Cost,ຄ່າໃຊ້ຈ່າຍທັງຫມົດ
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,ເງິນກູ້ພະນັກງານ
 DocType: Fee Schedule,Send Payment Request Email,ສົ່ງອີເມວການຈ່າຍເງິນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,ລາຍການ {0} ບໍ່ຢູ່ໃນລະບົບຫຼືຫມົດອາຍຸແລ້ວ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,ອະສັງຫາລິມະຊັບ
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Unregistered ສົບຜົນສໍາເລັດ.
 DocType: Assessment Result,Grade,Grade
 DocType: Restaurant Table,No of Seats,ບໍ່ມີບ່ອນນັ່ງ
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ການເພີ່ມຫົວຂໍ້ແບບເຄື່ອນໄຫວ, ໃຫ້ໃຊ້ jinja tags ຄື <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset Maintenance Task
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,ເງິນເດືອນປະຈໍາປີ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Daily Work Summary,Daily Work Summary,Summary ວຽກປະຈໍາວັນ
 DocType: Period Closing Voucher,Closing Fiscal Year,ປິດປີງົບປະມານ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ກະລຸນາໃສ່ຕ້ອງການຕິດຕໍ່ອີເມວ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,ກະລຸນາໃສ່ຕ້ອງການຕິດຕໍ່ອີເມວ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,ການປ່ອຍສິນເຊື່ອໃນບໍລິສັດສະກຸນເງິນ
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ທີ່ຢູ່ເບື້ອງຕົ້ນ
 DocType: Production Plan,Material Request Detail,Material Request Detail
 DocType: Selling Settings,Default Quotation Validity Days,ວັນທີ Validity Default Quotation
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,ການປ່ຽນແປງຈໍານວນເງິນ
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,ປະເພດໃບອະນຸຍາດຂັບຂີ່
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ກະລຸນາໃສ່ວັນທີ່ສົ່ງ
 DocType: Depreciation Schedule,Make Depreciation Entry,ເຮັດໃຫ້ການເຂົ້າຄ່າເສື່ອມລາຄາ
+DocType: HR Settings,Leave Settings,ອອກຈາກ Settings
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ຄໍາຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ເຮັດໃຫ້ພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ກະຈາຍສຽງ
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),ໂຫມດການຕັ້ງຄ່າຂອງ POS (ອອນລາຍ / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,ປິດການສ້າງບັນທຶກເວລາຕໍ່ກັບຄໍາສັ່ງການເຮັດວຽກ. ການປະຕິບັດງານບໍ່ຄວນຕິດຕາມການສັ່ງວຽກ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ການປະຕິບັດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ການປະຕິບັດ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ລາຍລະອຽດຂອງການດໍາເນີນງານປະຕິບັດ.
 DocType: Asset Maintenance Log,Maintenance Status,ສະຖານະບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,ລາຍລະອຽດສະມາຊິກ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier ຈໍາເປັນຕ້ອງຕໍ່ບັນຊີ Payable {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ລາຍການແລະລາຄາ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ຊົ່ວໂມງທັງຫມົດ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},ຈາກວັນທີ່ຄວນຈະຢູ່ໃນປີງົບປະມານ. ສົມມຸດວ່າຈາກ Date = {0}
 DocType: Drug Prescription,Interval,ຊ່ວງເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preference
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preference
 DocType: Grant Application,Individual,ບຸກຄົນ
 DocType: Academic Term,Academics User,ນັກວິຊາການຜູ້ໃຊ້
 DocType: Cheque Print Template,Amount In Figure,ຈໍານວນເງິນໃນຮູບ
-DocType: Employee Loan Application,Loan Info,ຂໍ້ມູນການກູ້ຢືມເງິນ
+DocType: Loan Application,Loan Info,ຂໍ້ມູນການກູ້ຢືມເງິນ
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ແຜນການສໍາລັບການໄປຢ້ຽມຢາມບໍາລຸງຮັກສາ.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Supplier Scorecard ໄລຍະເວລາ
 DocType: Share Transfer,Share Transfer,Share Transfer
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Template Item
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemistry
 DocType: Job Offer,Select Terms and Conditions,ເລືອກເງື່ອນໄຂການແລະເງື່ອນໄຂ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ມູນຄ່າອອກ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ມູນຄ່າອອກ
 DocType: Woocommerce Settings,Woocommerce Settings,ການຕັ້ງຄ່າ Woocommerce
 DocType: Production Plan,Sales Orders,ຄໍາສັ່ງການຂາຍ
 DocType: Purchase Taxes and Charges,Valuation,ປະເມີນມູນຄ່າ
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,ມາດຕະຖານອານາເຂດ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ໂທລະທັດ
 DocType: Work Order Operation,Updated via 'Time Log',ການປັບປຸງໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ເລືອກລູກຄ້າຫຼືຜູ້ສະຫນອງ.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,ບັນຊີໄລຍະສໍາລັບການນີ້
 DocType: Company,Enable Perpetual Inventory,ເປີດນໍາໃຊ້ສິນຄ້າຄົງຄັງ Perpetual
+DocType: Bank Guarantee,Charges Incurred,Charges Incurred
 DocType: Company,Default Payroll Payable Account,Default Payroll Account Payable
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Group Email ການປັບປຸງ
 DocType: Sales Invoice,Is Opening Entry,ຄືການເປີດ Entry
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Custom Result
 DocType: Delivery Stop,Contact Name,ຊື່ຕິດຕໍ່
 DocType: Course Assessment Criteria,Course Assessment Criteria,ເງື່ອນໄຂການປະເມີນຜົນຂອງລາຍວິຊາ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ID ພາສີ:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ID ພາສີ:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student ID:
 DocType: POS Customer Group,POS Customer Group,POS ກຸ່ມລູກຄ້າ
 DocType: Land Unit,Land Unit describing various land assets,ຫນ່ວຍງານທີ່ດິນອະທິບາຍຊັບສິນທີ່ດິນຕ່າງໆ
@@ -375,9 +372,8 @@
 ,Open Work Orders,ເປີດຄໍາສັ່ງການເຮັດວຽກ
 DocType: Payment Term,Credit Months,ເດືອນເຄດິດ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,ຈ່າຍສຸດທິບໍ່ສາມາດຈະຫນ້ອຍກ່ວາ 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","ເພື່ອຢຸດການສົ່ງແຈ້ງເຕືອນຄວາມຜິດພາດທີ່ຊ້ໍາຄືນມາຈາກລະບົບ, ພວກເຮົາໄດ້ກວດເບິ່ງເຂດທີ່ຖືກປິດໃນການສະຫມັກ"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,ໃບຕໍ່ປີ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,ໃບຕໍ່ປີ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ຕິດຕໍ່ກັນ {0}: ກະລຸນາກວດສອບຄື Advance &#39;ກັບບັນຊີ {1} ຖ້າຫາກວ່ານີ້ເປັນການເຂົ້າລ່ວງຫນ້າ.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Warehouse {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
 DocType: Email Digest,Profit & Loss,ກໍາໄລແລະຂາດທຶນ
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,ກະລຸນາຕິດຕັ້ງນັກຮຽນພາຍໃຕ້ກຸ່ມນັກຮຽນ
 DocType: Item Website Specification,Item Website Specification,ຂໍ້ມູນຈໍາເພາະລາຍການເວັບໄຊທ໌
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ການອອກສຽງທະນາຄານ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ອອກຈາກສະກັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ການອອກສຽງທະນາຄານ
 DocType: Crop,Annual,ປະຈໍາປີ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Reconciliation Item
 DocType: Stock Entry,Sales Invoice No,ຂາຍໃບເກັບເງິນທີ່ບໍ່ມີ
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ຂອງລາຍວິຊາ Group ນັກສຶກສາເຄື່ອງມືການສ້າງ
 DocType: Lead,Do Not Contact,ບໍ່ໄດ້ຕິດຕໍ່
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,ປະຊາຊົນຜູ້ທີ່ສອນໃນອົງການຈັດຕັ້ງຂອງທ່ານ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,ຊອບແວພັດທະນາ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,ຊອບແວພັດທະນາ
 DocType: Item,Minimum Order Qty,ຈໍານວນການສັ່ງຊື້ຂັ້ນຕ່ໍາ
 DocType: Pricing Rule,Supplier Type,ປະເພດຜູ້ສະຫນອງ
 DocType: Course Scheduling Tool,Course Start Date,ແນ່ນອນວັນທີ່
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,ຂໍອຸປະກອນການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ສູງສຸດທີ່ເຄຍ Grade
 DocType: Email Digest,New Quotations,ຄວາມຫມາຍໃຫມ່
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ຄວາມຜິດພາດພຽງອີເມວເງິນເດືອນໃຫ້ພະນັກງານໂດຍອີງໃສ່ອີເມວທີ່ແນະນໍາການຄັດເລືອກໃນພະນັກງານ
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ການອະນຸມັດອອກຄັ້ງທໍາອິດໃນບັນຊີລາຍການຈະໄດ້ຮັບການກໍານົດເປັນມາດຕະຖານອອກຈາກອະນຸມັດ
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,ຮຽນຮູ້
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ຮຽນຮູ້
 DocType: Asset,Next Depreciation Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ຄ່າໃຊ້ຈ່າຍຂອງກິດຈະກໍາຕໍ່ພະນັກງານ
 DocType: Accounts Settings,Settings for Accounts,ການຕັ້ງຄ່າສໍາລັບການບັນຊີ
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ເຊັກທີ່ຍັງຄ້າງຄາແລະຄ່າມັດຈໍາເພື່ອອະນາໄມ
 DocType: Item,Synced With Hub,ຊິ້ງຂໍ້ມູນກັບ Hub
 DocType: Driver,Fleet Manager,ຜູ້ຈັດການເຮືອ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},ແຖວ # {0}: {1} ບໍ່ສາມາດຈະລົບສໍາລັບລາຍການ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},ແຖວ # {0}: {1} ບໍ່ສາມາດຈະລົບສໍາລັບລາຍການ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,ລະຫັດຜ່ານຜິດ
 DocType: Item,Variant Of,variant ຂອງ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},ກະລຸນາຕັ້ງໂຮງແຮມ Rate on {}
 DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
 DocType: Opening Invoice Creation Tool,Invoice Type,ປະເພດໃບເກັບເງິນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ການສົ່ງເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ການສົ່ງເງິນ
 DocType: Consultation,Encounter Impression,Impression Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ການຕັ້ງຄ່າພາສີອາກອນ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,ຄ່າໃຊ້ຈ່າຍຂອງຊັບສິນຂາຍ
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ອັດຕາທີ່ສະກຸນເງິນຂອງລູກຄ້າຈະຖືກແປງເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ຂອງລາຍວິຊາເຄື່ອງມືການຕັ້ງເວລາ
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Error while creating% s ສໍາລັບ% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,ອັດຕາພາສີ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,ໄລຍະເວລາໃນການໃຊ້ບໍລິການບໍ່ສາມາດຜ່ານສອງບັນທຶກການຈັດສັນ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,ໄລຍະເວລາໃນການໃຊ້ບໍລິການບໍ່ສາມາດຜ່ານສອງບັນທຶກການຈັດສັນ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ຈັດສັນແລ້ວສໍາລັບພະນັກງານ {1} ສໍາລັບໄລຍະເວລາ {2} ກັບ {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"ຕິດຕໍ່ກັນ, {0}: Batch ບໍ່ຕ້ອງເຊັ່ນດຽວກັນກັບ {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ທີ່ໄດ້ຮັບ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ສ້າງກຸ່ມນັກສຶກສາ
 DocType: Volunteer,Weekends,Weekends
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Credit Note ຈໍານວນ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Credit Note ຈໍານວນ
 DocType: Setup Progress Action,Action Document,ເອກະສານປະຕິບັດ
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,ສິນຄ້າສໍາເລັດຮູບ
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ເພີ່ມລາຍການລາຍ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ລາຍການຄຸນນະພາບກວດສອບພາລາມິເຕີ
+DocType: Leave Application,Leave Approver Name,ອອກຈາກຊື່ຜູ້ອະນຸມັດ
 DocType: Depreciation Schedule,Schedule Date,ກໍານົດເວລາວັນທີ່
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ລາຍຮັບຈາກການ, ການຫັກແລະອົງປະກອບເງິນເດືອນອື່ນໆ"
 DocType: Packed Item,Packed Item,ບັນຈຸສິນຄ້າ
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Healthcare Settings,Require Lab Test Approval,ຕ້ອງການການອະນຸມັດທົດລອງທົດລອງ
 DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,ຍອດລວມທັງຫມົດ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,ຍອດລວມທັງຫມົດ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
 DocType: Dosage Strength,Strength,ຄວາມເຂັ້ມແຂງ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,ຄ່າໃຊ້ຈ່າຍຜູ້ບໍລິໂພກ
 DocType: Purchase Receipt,Vehicle Date,ວັນທີ່ສະຫມັກຍານພາຫະນະ
 DocType: Student Log,Medical,ທາງການແພດ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,ປັບປຸງບັນຊີຫມາຍເລກບັນຊີ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ເຈົ້າຂອງເປັນຜູ້ນໍາພາບໍ່ສາມາດຈະດຽວກັນເປັນຜູ້ນໍາ
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,ດຽວ
 DocType: Salary Slip,Total Loan Repayment,ທັງຫມົດຊໍາລະຄືນເງິນກູ້
 DocType: Account,Cost of Goods Sold,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າຂາຍ
-DocType: Subscription,Yearly,ປະຈໍາປີ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Journal Entry Account,Sales Order,ຂາຍສິນຄ້າ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
 DocType: Assessment Plan,Examiner Name,ຊື່ຜູ້ກວດສອບ
 DocType: Lab Test Template,No Result,ບໍ່ມີຜົນການຄົ້ນຫາ
 DocType: Purchase Invoice Item,Quantity and Rate,ປະລິມານແລະອັດຕາການ
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ກະລຸນາໃສ່ຊື່ບໍລິສັດທໍາອິດ
 DocType: Purchase Invoice,Supplier Name,ຊື່ຜູ້ຜະລິດ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ອ່ານຄູ່ມື ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,ສະແດງໃບຂອງສະມາຊິກທັງຫມົດໃນປະຕິທິນ
 DocType: Purchase Invoice,01-Sales Return,01-Sales Return
 DocType: Account,Is Group,ກຸ່ມດັ່ງກ່າວແມ່ນ
 DocType: Email Digest,Pending Purchase Orders,ລໍຖ້າຄໍາສັ່ງຊື້
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,ພາກສະຫນາມບັງຄັບ - ປີທາງວິຊາການ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ບໍ່ກ່ຽວຂ້ອງກັບ {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ປັບຂໍ້ຄວາມແນະນໍາທີ່ດີເປັນສ່ວນຫນຶ່ງຂອງອີເມລ໌ທີ່ເປັນ. ແຕ່ລະຄົນມີຄວາມແນະນໍາທີ່ແຍກຕ່າງຫາກ.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},ກະລຸນາຕັ້ງບັນຊີທີ່ຕ້ອງຈ່າຍໃນຕອນຕົ້ນສໍາລັບການບໍລິສັດ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},ກະລຸນາຕັ້ງບັນຊີທີ່ຕ້ອງຈ່າຍໃນຕອນຕົ້ນສໍາລັບການບໍລິສັດ {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},ການເຮັດທຸລະກໍາບໍ່ໄດ້ຮັບອະນຸຍາດຕໍ່ການຢຸດວຽກເຮັດວຽກ {0}
 DocType: Setup Progress Action,Min Doc Count,ນັບຕ່ໍາສຸດ Doc
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ການຕັ້ງຄ່າທົ່ວໂລກສໍາລັບຂະບວນການຜະລິດທັງຫມົດ.
 DocType: Accounts Settings,Accounts Frozen Upto,ບັນຊີ Frozen ເກີນ
 DocType: SMS Log,Sent On,ສົ່ງກ່ຽວກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: HR Settings,Employee record is created using selected field. ,ການບັນທຶກຂອງພະນັກງານແມ່ນການສ້າງຕັ້ງການນໍາໃຊ້ພາກສະຫນາມການຄັດເລືອກ.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດໃຊ້
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ຕົ້ນສະບັບວັນພັກ.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ສະຫງວນສໍາລັບຂາຍ
 DocType: Packing Slip,From Package No.,ຈາກ Package ສະບັບເລກທີ
 DocType: Item Attribute,To Range,ການຊ່ວງ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ບໍ່ສາມາດມີການປ່ຽນແປງວິທີການປະເມີນມູນຄ່າ, ເນື່ອງຈາກວ່າມີທຸລະກໍາກັບບາງລາຍການທີ່ບໍ່ມີມັນເປັນວິທີການປະເມີນມູນຄ່າຂອງຕົນເອງ"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ບໍ່ສາມາດມີການປ່ຽນແປງວິທີການປະເມີນມູນຄ່າ, ເນື່ອງຈາກວ່າມີທຸລະກໍາກັບບາງລາຍການທີ່ບໍ່ມີມັນເປັນວິທີການປະເມີນມູນຄ່າຂອງຕົນເອງ"
 DocType: Student Report Generation Tool,Attended by Parents,ເຂົ້າຮ່ວມໂດຍພໍ່ແມ່
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ໃບທັງຫມົດການຈັດສັນແມ່ນການບັງຄັບ
 DocType: Patient,AB Positive,AB Positive
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ບັນທຶກການເຂົ້າຮຽນ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ອົງປະກອບເງິນເດືອນສໍາລັບເງິນເດືອນຕາມ timesheet.
 DocType: Sales Order Item,Used for Production Plan,ນໍາໃຊ້ສໍາລັບແຜນການຜະລິດ
-DocType: Employee Loan,Total Payment,ການຊໍາລະເງິນທັງຫມົດ
+DocType: Loan,Total Payment,ການຊໍາລະເງິນທັງຫມົດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,ບໍ່ສາມາດຍົກເລີກການໂອນສໍາລັບຄໍາສັ່ງເຮັດວຽກທີ່ສໍາເລັດໄດ້.
 DocType: Manufacturing Settings,Time Between Operations (in mins),ທີ່ໃຊ້ເວລາລະຫວ່າງການປະຕິບັດ (ໃນນາທີ)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} ຖືກຍົກເລີກນັ້ນການປະຕິບັດທີ່ບໍ່ສາມາດໄດ້ຮັບການສໍາເລັດ
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,ບອກໄດ້ບໍ່ຫຼາຍປານໃດຂອງລູກຄ້າຂອງທ່ານ. ພວກເຂົາເຈົ້າສາມາດຈະມີອົງການຈັດຕັ້ງຫຼືບຸກຄົນ.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
 DocType: POS Profile User,POS Profile User,POS User Profile
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ລາຍໄດ້ໂດຍກົງ
+DocType: Subscription Invoice,Subscription Invoice,ໃບສະຫມັກໃບສະຫມັກ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,ລາຍໄດ້ໂດຍກົງ
 DocType: Patient Appointment,Date TIme,Date TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ບັນຊີ, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມບັນຊີ"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ຫ້ອງການປົກຄອງ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,ຫ້ອງການປົກຄອງ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ການສ້າງຕັ້ງບໍລິສັດແລະພາສີ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
 DocType: Codification Table,Codification Table,ຕາຕະລາງການອ້າງອີງ
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
 DocType: Stock Entry Detail,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN Supplier
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Template Flow Mapping Template
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
 DocType: Journal Entry,Difference (Dr - Cr),ຄວາມແຕກຕ່າງກັນ (Dr - Cr)
+DocType: Bank Guarantee,Providing,ການສະຫນອງ
 DocType: Account,Profit and Loss,ກໍາໄລແລະຂາດທຶນ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",ບໍ່ອະນຸຍາດໃຫ້ກໍານົດຄ່າທົດລອງທົດລອງທົດລອງຕາມຕ້ອງການ
 DocType: Patient,Risk Factors,ປັດໄຈຄວາມສ່ຽງ
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier Invoice No
 DocType: Territory,For reference,ສໍາລັບການກະສານອ້າງອີງ
 DocType: Healthcare Settings,Appointment Confirmation,ການຍືນຍັນການແຕ່ງຕັ້ງ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ບໍ່ສາມາດລົບ Serial No {0}, ຍ້ອນວ່າມັນໄດ້ຖືກນໍາໃຊ້ໃນທຸລະກໍາຫຼັກຊັບ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","ບໍ່ສາມາດລົບ Serial No {0}, ຍ້ອນວ່າມັນໄດ້ຖືກນໍາໃຊ້ໃນທຸລະກໍາຫຼັກຊັບ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),ປິດ (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ສະບາຍດີ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ການເຄື່ອນໄຫວສິນຄ້າ
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","ຕັ້ງຄ່າເລີ່ມຕົ້ນໃນຕໍາແຫນ່ງ pos {0} ສໍາລັບຜູ້ໃຊ້ {1} ແລ້ວ, default default disabled"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ທາງດ້ານການເງິນ / ການບັນຊີປີ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ຄ່າສະສົມ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","ຂໍອະໄພ, Serial Nos ບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","ຂໍອະໄພ, Serial Nos ບໍ່ສາມາດລວມ"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,ອານາເຂດຂອງໄດ້ຖືກກໍານົດໄວ້ໃນຂໍ້ມູນສ່ວນຕົວ POS
 DocType: Supplier,Prevent RFQs,Prevent RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},ໃບສະເຫນີລາຄາທີ່ຖືກສົ່ງສໍາລັບໄລຍະເວລາຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},ໃບສະເຫນີລາຄາທີ່ຖືກສົ່ງສໍາລັບໄລຍະເວລາຈາກ {0} ກັບ {1}
 DocType: Project Task,Project Task,ໂຄງການ Task
 ,Lead Id,Id ນໍາ
 DocType: C-Form Invoice Detail,Grand Total,ລວມທັງຫມົດ
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,ສົ່ງວັນທີໃບບິນ
 DocType: Production Plan,Production Plan,ແຜນການຜະລິດ
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ເປີດເຄື່ອງມືການສ້າງໃບເກັບເງິນ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Return ຂາຍ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ຫມາຍເຫດ: ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ຄວນຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,ຕັ້ງຄ່າ Qty ໃນການປະຕິບັດການໂດຍອີງໃສ່ການນໍາເຂົ້າບໍ່ມີ Serial
 ,Total Stock Summary,ທັງຫມົດສະຫຼຸບ Stock
 DocType: Announcement,Posted By,ຈັດພີມມາໂດຍ
 DocType: Item,Delivered by Supplier (Drop Ship),ນໍາສະເຫນີໂດຍຜູ້ຜະລິດ (Drop ການຂົນສົ່ງ)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,ບັນຊີລາຍ Amt
 DocType: Training Result Employee,Training Result Employee,ພະນັກງານການຝຶກອົບຮົມການຄົ້ນຫາ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse ຢ່າງມີເຫດຜົນການຕໍ່ຕ້ານທີ່ entries ຫຼັກຊັບໄດ້.
-DocType: Repayment Schedule,Principal Amount,ຈໍານວນຜູ້ອໍານວຍການ
-DocType: Employee Loan Application,Total Payable Interest,ທັງຫມົດດອກເບ້ຍຄ້າງຈ່າຍ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ຈໍານວນຜູ້ອໍານວຍການ
+DocType: Loan Application,Total Payable Interest,ທັງຫມົດດອກເບ້ຍຄ້າງຈ່າຍ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ຍອດລວມ: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ຂາຍ Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ກະສານອ້າງອີງບໍ່ມີວັນແລະເວລາກະສານອ້າງອີງຕ້ອງການສໍາລັບ {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
 DocType: Restaurant Reservation,Restaurant Reservation,ຮ້ານອາຫານການຈອງ
 DocType: Land Unit,Land Unit Name,ຊື່ຫນ່ວຍງານທີ່ດິນ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,ຂຽນບົດສະເຫນີ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,ຂຽນບົດສະເຫນີ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ການຫັກ Entry ການຊໍາລະເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ການຫຸ້ມຫໍ່ຂຶ້ນ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ແຈ້ງໃຫ້ລູກຄ້າຜ່ານອີເມວ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ແຈ້ງໃຫ້ລູກຄ້າຜ່ານອີເມວ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ອີກປະການຫນຶ່ງບຸກຄົນ Sales {0} ມີຢູ່ກັບ id ພະນັກງານດຽວກັນ
 DocType: Employee Advance,Claimed Amount,ຈໍານວນການຮ້ອງຂໍ
 apps/erpnext/erpnext/config/education.py +180,Masters,ຕົ້ນສະບັບ
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","ການຊໍາລະເງິນ Gateway ບັນຊີບໍ່ໄດ້ສ້າງ, ກະລຸນາສ້າງດ້ວຍຕົນເອງ."
 DocType: Supplier Scorecard,Per Year,ຕໍ່ປີ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ບໍ່ມີສິດໄດ້ຮັບການເຂົ້າຮຽນຢູ່ໃນໂຄງການນີ້ຕາມ DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Sales Invoice,Sales Taxes and Charges,ພາສີອາກອນການຂາຍແລະຄ່າບໍລິການ
 DocType: Employee,Organization Profile,ຂໍ້ມູນອົງການຈັດຕັ້ງ
 DocType: Vital Signs,Height (In Meter),ຄວາມສູງ (ໃນແມັດ)
 DocType: Student,Sibling Details,ລາຍລະອຽດໃຫ້ແກ່ອ້າຍນ້ອງ
 DocType: Vehicle Service,Vehicle Service,ການບໍລິການຍານພາຫະນະ
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,ຜົນກະທົບຕໍ່ການຮ້ອງຂໍຄວາມຄິດເຫັນໂດຍອີງໃສ່ເງື່ອນໄຂອັດຕະໂນມັດ.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,ຜົນກະທົບຕໍ່ການຮ້ອງຂໍຄວາມຄິດເຫັນໂດຍອີງໃສ່ເງື່ອນໄຂອັດຕະໂນມັດ.
 DocType: Employee,Reason for Resignation,ເຫດຜົນສໍາລັບການລາອອກ
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,ແມ່ແບບສໍາລັບການປະເມີນຜົນການປະຕິບັດ.
 DocType: Sales Invoice,Credit Note Issued,Credit Note ອອກ
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,ຕາຕະລາງການບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ກົດລະບຽບຫຼັງຈາກນັ້ນລາຄາຖືກກັ່ນຕອງອອກໂດຍອີງໃສ່ລູກຄ້າກຸ່ມລູກຄ້າ, ອານາເຂດ, ຜູ້ຜະລິດ, ປະເພດເຄື່ອງໃຊ້, ການໂຄສະນາ, Partner ຂາຍແລະອື່ນໆ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ການປ່ຽນແປງສຸດທິໃນສິນຄ້າຄົງຄັງ
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ການບໍລິຫານເງິນກູ້ພະນັກງານ
 DocType: Employee,Passport Number,ຈໍານວນຫນັງສືຜ່ານແດນ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ຄວາມສໍາພັນກັບ Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ຜູ້ຈັດການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,ຜູ້ຈັດການ
 DocType: Payment Entry,Payment From / To,ການຊໍາລະເງິນຈາກ / ໄປ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ກະລຸນາຕັ້ງບັນຊີໃນ Warehouse {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,ອຸປະກອນການຖ່າຍໂອນ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,ບໍ່ສາມາດຊອກຫາເສັ້ນທາງສໍາລັບການ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ເປີດ (Dr)
+DocType: Loan,Applicant,ຜູ້ສະຫມັກ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ປຊຊກິນເວລາຈະຕ້ອງຫຼັງຈາກ {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ເພື່ອເຮັດໃຫ້ເອກະສານທີ່ເກີດຂຶ້ນເລື້ອຍໆ
 ,GST Itemised Purchase Register,GST ລາຍການລົງທະບຽນຊື້
 DocType: Course Scheduling Tool,Reschedule,ກໍານົດເວລາ
-DocType: Employee Loan,Total Interest Payable,ທີ່ຫນ້າສົນໃຈທັງຫມົດ Payable
+DocType: Loan,Total Interest Payable,ທີ່ຫນ້າສົນໃຈທັງຫມົດ Payable
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ລູກຈ້າງພາສີອາກອນແລະຄ່າໃຊ້ຈ່າຍຄ່າບໍລິການ
 DocType: Work Order Operation,Actual Start Time,ເວລາທີ່ແທ້ຈິງ
 DocType: BOM Operation,Operation Time,ທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,ສໍາເລັດຮູບ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,ຖານ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,ຖານ
 DocType: Timesheet,Total Billed Hours,ທັງຫມົດຊົ່ວໂມງບິນ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,ຂຽນ Off ຈໍານວນ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,ຂຽນ Off ຈໍານວນ
 DocType: Leave Block List Allow,Allow User,ອະນຸຍາດໃຫ້ຜູ້ໃຊ້
 DocType: Journal Entry,Bill No,ບັນຊີລາຍການບໍ່ມີ
 DocType: Company,Gain/Loss Account on Asset Disposal,ບັນຊີກໍາໄຮ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
 DocType: Vehicle Log,Service Details,ລາຍລະອຽດການບໍລິການ
 DocType: Vehicle Log,Service Details,ລາຍລະອຽດການບໍລິການ
-DocType: Subscription,Quarterly,ໄຕມາດ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,ສົ່ງຂໍ້ທີ່ກໍານົດ
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ທີ່ໃຊ້ເວລາ Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,ວັດຖຸດິບ Backflush ຖານກ່ຽວກັບ
 DocType: Sales Invoice,Port Code,Port Code
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,ຄັງເກັບສະຫງວນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,ຄັງເກັບສະຫງວນ
 DocType: Lead,Lead is an Organization,Lead is a Organization
 DocType: Guardian Interest,Interest,ທີ່ຫນ້າສົນໃຈ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,ບັນຊີ
 DocType: Vehicle,Odometer Value (Last),ມູນຄ່າໄມ (ຫຼ້າສຸດ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ແມ່ແບບຂອງເກນສະຫນອງດັດນີຊີ້ວັດ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,ການຕະຫຼາດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,ການຕະຫຼາດ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Entry ການຈ່າຍເງິນແມ່ນສ້າງຮຽບຮ້ອຍແລ້ວ
 DocType: Request for Quotation,Get Suppliers,ຮັບ Suppliers
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock ປັດຈຸບັນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຕິດພັນກັບການ Item {2}"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຕິດພັນກັບການ Item {2}"
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 DocType: Account,Expenses Included In Valuation,ຄ່າໃຊ້ຈ່າຍລວມຢູ່ໃນການປະເມີນຄ່າ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,ທ່ານພຽງແຕ່ສາມາດຕໍ່ອາຍຸຖ້າວ່າສະມາຊິກຂອງທ່ານຫມົດອາຍຸພາຍໃນ 30 ວັນ
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,ພຽງແຕ່ເລືອກຖ້າຫາກທ່ານມີເອກະສານສະຫຼັບ Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,email ຕໍ່ໄປຈະຖືກສົ່ງໄປຕາມ:
 DocType: Supplier Scorecard,Per Week,ຕໍ່ອາທິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,ລາຍການມີ variants.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ນັກຮຽນລວມ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ບໍ່ພົບລາຍການ {0}
 DocType: Bin,Stock Value,ມູນຄ່າຫຼັກຊັບ
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Accounts [FEC]
 DocType: Journal Entry,Credit Card Entry,Entry ບັດເຄດິດ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ບໍລິສັດແລະບັນຊີ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,ໃນມູນຄ່າ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,ໃນມູນຄ່າ
 DocType: Asset Settings,Depreciation Options,ຕົວເລືອກຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,ເວລາໂພດບໍ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,ເວລາໂພດບໍ່ຖືກຕ້ອງ
 DocType: Lead,Campaign Name,ຊື່ການໂຄສະນາ
 DocType: Hotel Room,Capacity,ຄວາມສາມາດ
 DocType: Selling Settings,Close Opportunity After Days,ປິດໂອກາດຫຼັງຈາກວັນ
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ຂອງລູກຄ້າໃບສັ່ງຊື້ບໍ່ມີ
 DocType: Budget,Budget Against,ງົບປະມານຕໍ່
 DocType: Employee,Cell Number,ຫມາຍເລກໂທລະ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ກໍານົດໄວ້. ກວດເບິ່ງວ່າເງິນເດືອນບໍ່ໄດ້ຖືກສ້າງແລ້ວ.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ກໍານົດໄວ້. ກວດເບິ່ງວ່າເງິນເດືອນບໍ່ໄດ້ຖືກສ້າງແລ້ວ.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ການຮ້ອງຂໍການວັດສະດຸ Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ການສູນເສຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,ທ່ານບໍ່ສາມາດເຂົ້າໃບໃນປັດຈຸບັນ &#39;ຕໍ່ອະນຸ&#39; ຖັນ
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ກະລຸນາເລືອກຕາຕະລາງ
 DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ເປັນທີ່ຢູ່ອີເມວທີ່ບໍ່ຖືກຕ້ອງໃນ &#39;ຜູ້ຮັບ&#39;
 DocType: Special Test Items,Particulars,Particulars
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ຈາກ {0} ຂອງປະເພດ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: ຈາກ {0} ຂອງປະເພດ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: ປັດໄຈການແປງເປັນການບັງຄັບ
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ກົດລະບຽບລາຄາທີ່ຫຼາກຫຼາຍທີ່ມີຢູ່ກັບເງື່ອນໄຂດຽວກັນ, ກະລຸນາແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງໂດຍການມອບຫມາຍບູລິມະສິດ. ກົດລະບຽບລາຄາ: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,ບໍ່ສາມາດຍົກເລີກຫລືຍົກເລີກການ BOM ເປັນມັນແມ່ນການເຊື່ອມຕໍ່ກັບແອບເປີ້ນອື່ນໆ
 DocType: Asset,Maintenance,ບໍາລຸງຮັກສາ
+DocType: Subscriber,Subscriber,Subscriber
 DocType: Item Attribute Value,Item Attribute Value,ລາຍການສະແດງທີ່ມູນຄ່າ
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,ກະລຸນາປັບປຸງສະຖານະຂອງໂຄງການຂອງທ່ານ
 DocType: Item,Maximum sample quantity that can be retained,ປະລິມານຕົວຢ່າງສູງສຸດທີ່ສາມາດຮັກສາໄດ້
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການຄ້າໂຄງຮ່າງການ
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Add Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ຊັບສິນຢຸດຜ່ານ Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,ບັນຊີດອກເບ້ຍຮັບ
+DocType: Loan,Interest Income Account,ບັນຊີດອກເບ້ຍຮັບ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ການທົບທວນຄືນການເຊີນສົ່ງ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnology
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ຄ່າໃຊ້ຈ່າຍສໍານັກວຽກບໍາລຸງຮັກສາ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ຄ່າໃຊ້ຈ່າຍສໍານັກວຽກບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ໄປຫາ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ການສ້າງຕັ້ງບັນຊີ Email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,ກະລຸນາໃສ່ລາຍການທໍາອິດ
 DocType: Asset Repair,Downtime,Downtime
 DocType: Account,Liability,ຄວາມຮັບຜິດຊອບ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ທີ່ຖືກເກືອດຫ້າມຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກວ່າການຮຽກຮ້ອງຈໍານວນເງິນໃນແຖວ {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ທີ່ຖືກເກືອດຫ້າມຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກວ່າການຮຽກຮ້ອງຈໍານວນເງິນໃນແຖວ {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,ໄລຍະທາງວິຊາການ:
 DocType: Salary Detail,Do not include in total,ບໍ່ລວມຢູ່ໃນທັງຫມົດ
 DocType: Company,Default Cost of Goods Sold Account,ມາດຕະຖານຄ່າໃຊ້ຈ່າຍຂອງບັນຊີສິນຄ້າຂາຍ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},ປະລິມານຕົວຢ່າງ {0} ບໍ່ສາມາດມີຫຼາຍກ່ວາປະລິມານທີ່ໄດ້ຮັບ {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
 DocType: Employee,Family Background,ຄວາມເປັນມາຂອງຄອບຄົວ
 DocType: Request for Quotation Supplier,Send Email,ການສົ່ງອີເມວ
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
 DocType: Item,Max Sample Quantity,Max Sample Quantity
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,ບໍ່ມີການອະນຸຍາດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,ບໍ່ມີການອະນຸຍາດ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Quote Requested
 DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
 DocType: Company,Default Bank Account,ມາດຕະຖານບັນຊີທະນາຄານ
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,ລາຍການທີ່ມີ weightage ສູງຂຶ້ນຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນສູງກວ່າ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ທົດລອງຫ້ອງທົດລອງແລະອາການທີ່ສໍາຄັນ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ທະນາຄານ Reconciliation ຂໍ້ມູນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ພະນັກງານທີ່ບໍ່ມີພົບເຫັນ
-DocType: Subscription,Stopped,ຢຸດເຊົາການ
 DocType: Item,If subcontracted to a vendor,ຖ້າຫາກວ່າເຫມົາຊ່ວງກັບຜູ້ຂາຍ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,ໂຄງການປັບປຸງ.
 DocType: SMS Center,All Customer Contact,ທັງຫມົດຕິດຕໍ່ລູກຄ້າ
 DocType: Land Unit,Tree Details,ລາຍລະອຽດເປັນໄມ້ຢືນຕົ້ນ
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ປະກອບອັດຕະໂນມັດຂໍ້ຄວາມກ່ຽວກັບການຍື່ນສະເຫນີຂອງກິດຈະກໍາ.
 DocType: Work Order,Item To Manufacture,ລາຍການຜະລິດ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} ສະຖານະພາບເປັນ {2}
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","ແກ້ໄຂ, ຖ້າຫາກວ່າທີ່ຢູ່ທີ່ເລືອກໄດ້ຖືກແກ້ໄຂຫຼັງຈາກທີ່ບັນທຶກ"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
 DocType: Item,Hub Publishing Details,Hub Publishing Details
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;ເປີດ &#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;ເປີດ &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ເປີດການເຮັດ
 DocType: Notification Control,Delivery Note Message,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
 DocType: Lab Test Template,Result Format,Format Result
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,Pad ເບກ
 DocType: Fertilizer,Fertilizer Contents,ເນື້ອຫາປຸ໋ຍ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ການວິໄຈແລະການພັດທະນາ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ການວິໄຈແລະການພັດທະນາ
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ຈໍານວນເງິນທີ່ບັນຊີລາຍການ
 DocType: Company,Registration Details,ລາຍລະອຽດການລົງທະບຽນ
 DocType: Timesheet,Total Billed Amount,ຈໍານວນບິນທັງຫມົດ
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,ກວດສອບການຈໍາກັດການປ່ອຍສິນເຊື່ອໂດຍຜ່ານ Bypass ໃນຄໍາສັ່ງຂາຍ
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,ການປະເມີນຜົນການປະຕິບັດ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ເຮັດໃຫ້ &#39;ການນໍາໃຊ້ສໍາລັບສິນຄ້າ, ເປັນການຄ້າໂຄງຮ່າງການເປີດໃຊ້ວຽກແລະຄວນຈະມີກົດລະບຽບພາສີຢ່າງຫນ້ອຍຫນຶ່ງສໍາລັບການຄ້າໂຄງຮ່າງການ"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entry ການຊໍາລະເງິນ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ {1}, ເບິ່ງວ່າມັນຄວນຈະໄດ້ຮັບການດຶງເປັນລ່ວງຫນ້າໃນໃບເກັບເງິນນີ້."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entry ການຊໍາລະເງິນ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ {1}, ເບິ່ງວ່າມັນຄວນຈະໄດ້ຮັບການດຶງເປັນລ່ວງຫນ້າໃນໃບເກັບເງິນນີ້."
 DocType: Sales Invoice Item,Stock Details,ລາຍລະອຽດ Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ມູນຄ່າໂຄງການ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,ຈຸດຂອງການຂາຍ
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,ບ່ອນນັ່ງນ້ອຍສຸດ
 DocType: Item Attribute,Item Attribute Values,ຄ່າລາຍການຄຸນລັກສະນະ
 DocType: Examination Result,Examination Result,ຜົນການສອບເສັງ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ຮັບຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ຮັບຊື້
 ,Received Items To Be Billed,ລາຍການທີ່ໄດ້ຮັບການໄດ້ຮັບການ billed
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,ອັດຕາແລກປ່ຽນສະກຸນເງິນຕົ້ນສະບັບ.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},ກະສານອ້າງອີງ DOCTYPE ຕ້ອງເປັນຫນຶ່ງໃນ {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
 DocType: Work Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ບໍ່ມີລາຍະການສໍາຫລັບການໂອນ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ບໍ່ມີລາຍະການສໍາຫລັບການໂອນ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),ປິດ (ເປີດ + ລວມ)
 DocType: Journal Entry,Depreciation Entry,Entry ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,ກະລຸນາເລືອກປະເພດເອກະສານທໍາອິດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ຍົກເລີກການໄປຢ້ຽມຢາມວັດສະດຸ {0} ກ່ອນຍົກເລີກການນີ້ບໍາລຸງຮັກສາ Visit
 DocType: Crop Cycle,ISO 8016 standard,ມາດຕະຖານ ISO 8016
 DocType: Pricing Rule,Rate or Discount,ອັດຕາຫລືລາຄາຜ່ອນຜັນ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ທີ່ກໍານົດໄວ້ຈໍານວນ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favorites
 DocType: Hub Settings,Custom Data,Custom Data
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),ສ່ວນປະກອບຂອງດິນເຜົາ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,ກະລຸນາປະຫຍັດກ່ອນທີ່ຈະມອບຫມາຍວຽກ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ມູນຄ່າການດຸ່ນດ່ຽງ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ມູນຄ່າການດຸ່ນດ່ຽງ
 DocType: Lab Test,Lab Technician,Lab Technician
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ບັນຊີລາຄາຂາຍ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,ບັນຊີລາຄາຂາຍ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","ຖ້າຖືກກວດສອບ, ລູກຄ້າຈະໄດ້ຮັບການສ້າງຂຶ້ນ, ທີ່ຖືກສະແດງໃຫ້ກັບຜູ້ເຈັບ. ໃບແຈ້ງຫນີ້ຂອງຜູ້ປ່ວຍຈະຖືກສ້າງຂື້ນຕໍ່ລູກຄ້ານີ້. ທ່ານຍັງສາມາດເລືອກລູກຄ້າທີ່ມີຢູ່ໃນຂະນະທີ່ສ້າງຄົນເຈັບ."
 DocType: Bank Reconciliation,Account Currency,ສະກຸນເງິນບັນຊີ
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,ກະລຸນາຮອບບັນຊີ Off ໃນບໍລິສັດ
 DocType: Purchase Receipt,Range,ລະດັບ
 DocType: Supplier,Default Payable Accounts,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Woocommerce Settings,Endpoints,ຈຸດສິ້ນສຸດ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ຈະໄດ້ຮັບການຜະລິດ. ຖ້າຫາກວ່າມີຄວາມຊັກຊ້າ, ທ່ານຈະຕ້ອງປ່ຽນ &quot;ເລື້ມຄືນໃນວັນຂອງເດືອນ&quot; ດ້ວຍຕົນເອງ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
 DocType: Share Transfer,From Folio No,ຈາກ Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ຊື້ Invoice Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າ Credit ບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,Date for Available-for-use
 DocType: Guardian,Guardian Name,ຊື່ຜູ້ປົກຄອງ
 DocType: Cheque Print Template,Has Print Format,ມີຮູບແບບພິມ
-DocType: Employee Loan,Sanctioned,ທີ່ຖືກເກືອດຫ້າມ
+DocType: Loan,Sanctioned,ທີ່ຖືກເກືອດຫ້າມ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບການ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາລະບຸ Serial No ສໍາລັບລາຍການ {1}"
 DocType: Crop Cycle,Crop Cycle,Cycle crop
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","ສໍາລັບລາຍການ &#39;Bundle ຜະລິດພັນ, ຄັງສິນຄ້າ, ບໍ່ມີ Serial ແລະ Batch ບໍ່ມີຈະໄດ້ຮັບການພິຈາລະນາຈາກ&#39; Packing ຊີ &#39;ຕາຕະລາງ. ຖ້າຫາກວ່າ Warehouse ແລະ Batch ບໍ່ແມ່ນອັນດຽວກັນສໍາລັບລາຍການບັນຈຸທັງຫມົດສໍາລັບຄວາມຮັກ &#39;Bundle ຜະລິດພັນສິນຄ້າ, ຄຸນຄ່າເຫຼົ່ານັ້ນສາມາດໄດ້ຮັບເຂົ້າໄປໃນຕາຕະລາງລາຍການຕົ້ນຕໍ, ຄຸນຄ່າຈະໄດ້ຮັບການຄັດລອກໄປທີ່&#39; Packing ຊີ &#39;ຕາຕະລາງ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","ສໍາລັບລາຍການ &#39;Bundle ຜະລິດພັນ, ຄັງສິນຄ້າ, ບໍ່ມີ Serial ແລະ Batch ບໍ່ມີຈະໄດ້ຮັບການພິຈາລະນາຈາກ&#39; Packing ຊີ &#39;ຕາຕະລາງ. ຖ້າຫາກວ່າ Warehouse ແລະ Batch ບໍ່ແມ່ນອັນດຽວກັນສໍາລັບລາຍການບັນຈຸທັງຫມົດສໍາລັບຄວາມຮັກ &#39;Bundle ຜະລິດພັນສິນຄ້າ, ຄຸນຄ່າເຫຼົ່ານັ້ນສາມາດໄດ້ຮັບເຂົ້າໄປໃນຕາຕະລາງລາຍການຕົ້ນຕໍ, ຄຸນຄ່າຈະໄດ້ຮັບການຄັດລອກໄປທີ່&#39; Packing ຊີ &#39;ຕາຕະລາງ."
 DocType: Student Admission,Publish on website,ເຜີຍແຜ່ກ່ຽວກັບເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,ວັນທີ່ສະຫມັກສະຫນອງ Invoice ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະກາດວັນທີ່
+DocType: Subscription,Cancelation Date,ວັນທີຍົກເລີກ
 DocType: Purchase Invoice Item,Purchase Order Item,ການສັ່ງຊື້ສິນຄ້າ
 DocType: Agriculture Task,Agriculture Task,ການກະສິກໍາ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,ລາຍໄດ້ທາງອ້ອມ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,ລາຍໄດ້ທາງອ້ອມ
 DocType: Student Attendance Tool,Student Attendance Tool,ເຄື່ອງມືນັກສຶກສາເຂົ້າຮ່ວມ
 DocType: Restaurant Menu,Price List (Auto created),ລາຄາລາຄາ (ສ້າງໂດຍອັດຕະໂນມັດ)
 DocType: Cheque Print Template,Date Settings,ການຕັ້ງຄ່າວັນທີ່
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,ຄ່າໃຊ້ຈ່າຍໄຟຟ້າ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ເວລາທົດລອງທົດລອງທົດລອງບໍ່ສາມາດເປັນເວລາທີ່ຈະເກັບກໍາຂໍ້ມູນໄດ້
+DocType: Subscription Plan,Cost,ຄ່າໃຊ້ຈ່າຍ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ບໍ່ໄດ້ສົ່ງພະນັກງານວັນເດືອນປີເກີດເຕືອນ
 DocType: Expense Claim,Total Advance Amount,ຈໍານວນເງິນລ່ວງຫນ້າທັງຫມົດ
 DocType: Delivery Stop,Estimated Arrival,ການຄາດຄະເນການມາເຖິງ
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
 DocType: Timesheet Detail,Bill,ບັນຊີລາຍການ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ສີຂາວ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,ສີຂາວ
 DocType: SMS Center,All Lead (Open),Lead ທັງຫມົດ (ເປີດ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,ທ່ານພຽງແຕ່ສາມາດເລືອກເອົາທາງເລືອກສູງສຸດເທົ່າຫນຶ່ງຈາກບັນຊີຂອງກ່ອງກວດ.
 DocType: Purchase Invoice,Get Advances Paid,ໄດ້ຮັບການຄວາມກ້າວຫນ້າຂອງການຊໍາລະເງິນ
 DocType: Item,Automatically Create New Batch,ສ້າງ Batch ໃຫມ່ອັດຕະໂນມັດ
 DocType: Item,Automatically Create New Batch,ສ້າງ Batch ໃຫມ່ອັດຕະໂນມັດ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),ກໍາຫນົດ {0} ກັບ {1} (ແຖວ {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,ເຮັດໃຫ້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),ກໍາຫນົດ {0} ກັບ {1} (ແຖວ {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,ເຮັດໃຫ້
 DocType: Student Admission,Admission Start Date,ເປີດປະຕູຮັບວັນທີ່
 DocType: Journal Entry,Total Amount in Words,ຈໍານວນທັງຫມົດໃນຄໍາສັບຕ່າງໆ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,ພະນັກງານໃຫມ່
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
 DocType: Repayment Schedule,Balance Loan Amount,ການດຸ່ນດ່ຽງຈໍານວນເງິນກູ້
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ຂອງລາຍວິຊາກໍານົດເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ທາງເລືອກຫຼັກຊັບ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ທາງເລືອກຫຼັກຊັບ
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,ປິດການນໍາໃຊ້ຄໍາສັ່ງຊື້ສຸດທ້າຍໃນຄໍາສັ່ງຊື້
 DocType: Journal Entry Account,Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ການຫຸ້ມຫໍ່ສິນຄ້າ Slip
 DocType: Purchase Invoice,Cash/Bank Account,ເງິນສົດ / ບັນຊີທະນາຄານ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ກະລຸນາລະບຸ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
 DocType: Delivery Note,Delivery To,ການຈັດສົ່ງກັບ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,ການສ້າງຕົວປ່ຽນແປງໄດ້ຖືກຈັດອັນດັບໄວ້.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},ການປະຕິບັດວຽກສໍາລັບ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ຜູ້ອະນຸມັດຄັ້ງທໍາອິດໃນບັນຊີລາຍຊື່ຈະຖືກຕັ້ງເປັນຜູ້ອະນຸຍາດໄວ້ໃນຕອນຕົ້ນ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Plan,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
 DocType: Training Event,Self-Study,ການສຶກສາຂອງຕົນເອງ
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,ຄ່າແຮງງານ
 DocType: Asset Maintenance,Maintenance Manager Name,Maintenance Manager Name
 DocType: Agriculture Task,Urgent,ການອັນຮີບດ່ວນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},ກະລຸນາລະບຸ ID Row ທີ່ຖືກຕ້ອງສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນຕາຕະລາງ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},ກະລຸນາລະບຸ ID Row ທີ່ຖືກຕ້ອງສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນຕາຕະລາງ {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ບໍ່ສາມາດຊອກຫາການປ່ຽນແປງ:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,ກະລຸນາເລືອກພາກສະຫນາມເພື່ອແກ້ໄຂຈາກຈໍານວນເງິນ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,ບໍ່ສາມາດເປັນລາຍການຊັບສິນຄົງທີ່ເປັນ Stock Ledger ຖືກສ້າງຂື້ນ.
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,ຊື່ການກວດກາຄຸນນະພາບການກວດກາ
 DocType: Project,First Email,Email ທໍາອິດ
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse ໄວ້ໃນ Sales Order / Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ຈໍານວນການຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ຈໍານວນການຂາຍ
 DocType: Repayment Schedule,Interest Amount,ຈໍານວນເງິນທີ່ຫນ້າສົນໃຈ
 DocType: Serial No,Creation Document No,ການສ້າງເອກະສານທີ່ບໍ່ມີ
 DocType: Share Transfer,Issue,ບັນຫາ
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,State Shipping
 ,Projected Quantity as Source,ຄາດປະລິມານເປັນແຫລ່ງກໍາເນີດ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມການນໍາໃຊ້ &#39;ຮັບສິນຄ້າຈາກຊື້ຮັບ&#39; ປຸ່ມ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ການເດີນທາງສົ່ງ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ການເດີນທາງສົ່ງ
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Transfer Type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,ຄ່າໃຊ້ຈ່າຍຂາຍ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,ຄ່າໃຊ້ຈ່າຍຂາຍ
 DocType: Consultation,Diagnosis,Diagnosis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ຊື້ມາດຕະຖານ
 DocType: GL Entry,Against,ຕໍ່
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,ລະຫັດໄປສະນີ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ເລືອກບັນຊີລາຍຮັບດອກເບ້ຍໃນການກູ້ຢືມເງິນ {0}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
 DocType: Packing Slip,Net Weight UOM,ສຸດທິ UOM ນ້ໍາຫນັກ
 DocType: Item,Default Supplier,ຜູ້ຜະລິດມາດຕະຖານ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ໃນໄລຍະການຜະລິດເຜື່ອຮ້ອຍ
-DocType: Employee Loan,Repayment Schedule,ຕາຕະລາງການຊໍາລະຫນີ້
+DocType: Loan,Repayment Schedule,ຕາຕະລາງການຊໍາລະຫນີ້
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping ກົດລະບຽບສະພາບ
 DocType: Holiday List,Get Weekly Off Dates,ໄດ້ຮັບປະຈໍາອາທິດ Off ວັນ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ວັນທີ່ສິ້ນສຸດບໍ່ສາມາດຈະຫນ້ອຍກ່ວາການເລີ່ມຕົ້ນວັນທີ່
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,ຜູ້ເຂົ້າຮ່ວມ Freeze ວັນທີ່
 DocType: Education Settings,Attendance Freeze Date,ຜູ້ເຂົ້າຮ່ວມ Freeze ວັນທີ່
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,ບອກໄດ້ບໍ່ຫຼາຍປານໃດຂອງຜູ້ສະຫນອງຂອງທ່ານ. ພວກເຂົາເຈົ້າສາມາດຈະມີອົງການຈັດຕັ້ງຫຼືບຸກຄົນ.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ເບິ່ງສິນຄ້າທັງຫມົດ
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,ເບິ່ງສິນຄ້າທັງຫມົດ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead ຂັ້ນຕ່ໍາອາຍຸ (ວັນ)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead ຂັ້ນຕ່ໍາອາຍຸ (ວັນ)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,ແອບເປີ້ນທັງຫມົດ
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,ຈາກພະນັກງານ
 DocType: Driver,Cellphone Number,ຫມາຍເລກໂທລະສັບມືຖື
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
 DocType: Journal Entry,Make Difference Entry,ເຮັດໃຫ້ການເຂົ້າຄວາມແຕກຕ່າງ
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,ຜູ້ເຂົ້າຮ່ວມຈາກວັນທີ່
 DocType: Appraisal Template Goal,Key Performance Area,ພື້ນທີ່ການປະຕິບັດທີ່ສໍາຄັນ
 DocType: Program Enrollment,Transportation,ການຂົນສົ່ງ
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ຄຸນລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ປະລິມານຈະຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບ {0}
+DocType: Department Approver,Department Approver,ຜູ້ຮັບຮອງພະແນກ
 DocType: SMS Center,Total Characters,ລັກສະນະທັງຫມົດ
 DocType: Employee Advance,Claimed,ອ້າງອິງ
 DocType: Crop,Row Spacing,Row Spacing
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ການຊໍາລະເງິນ Reconciliation Invoice
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,ການປະກອບສ່ວນ%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ໂດຍອີງຕາມການຕັ້ງຄ່າຊື້ຖ້າຫາກວ່າຄໍາສັ່ງຊື້ຕ້ອງການ == &#39;ໃຊ່&#39;, ຫຼັງຈາກນັ້ນສໍາລັບການສ້າງ Purchase ໃບເກັບເງິນ, ຜູ້ໃຊ້ຈໍາເປັນຕ້ອງໄດ້ສ້າງການສັ່ງຊື້ຄັ້ງທໍາອິດສໍາລັບລາຍການ {0}"
+,HSN-wise-summary of outward supplies,HSN ສະຫລາດສະຫຼຸບຂອງການສະຫນອງພາຍນອກ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ຈໍານວນການຈົດທະບຽນບໍລິສັດສໍາລັບການກະສານອ້າງອີງຂອງທ່ານ. ຈໍານວນພາສີແລະອື່ນໆ
 DocType: Sales Partner,Distributor,ຈໍາຫນ່າຍ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ການຄ້າໂຄງຮ່າງກົດລະບຽບ Shipping
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,ປະຕິບັດຊື່
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ປີເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},ຫນ້າທໍາອິດ 2 ຕົວເລກຂອງ GSTIN ຄວນຈະມີຄໍາທີ່ມີຈໍານວນ State {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,ວັນທີເລີ່ມຕົ້ນຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
 DocType: Salary Slip,Leave Without Pay,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ສະຫນາມຈະຖືກຄັດລອກຜ່ານເວລາຂອງການສ້າງ.
 DocType: Setup Progress Action,Domains,Domains
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ທີ່ແທ້ຈິງວັນທີ່ເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ຈິງ End Date &#39;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ການຈັດການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,ການຈັດການ
 DocType: Cheque Print Template,Payer Settings,ການຕັ້ງຄ່າ payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ &quot;SM&quot;, ແລະລະຫັດສິນຄ້າແມ່ນ &quot;ເສື້ອທີເຊີດ&quot;, ລະຫັດສິນຄ້າຂອງ variant ຈະ &quot;ເສື້ອທີເຊີດ, SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
 DocType: Purchase Invoice,Is Return,ແມ່ນກັບຄືນ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ລະມັດລະວັງ
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',ວັນເລີ່ມຕົ້ນແມ່ນຫຼາຍກວ່າມື້ສຸດທ້າຍໃນວຽກ &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
 DocType: Price List Country,Price List Country,ລາຄາປະເທດ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} ພວກເຮົາອະນຸກົມທີ່ຖືກຕ້ອງສໍາລັບລາຍການ {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ລະຫັດສິນຄ້າບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,ລະຫັດສິນຄ້າບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Factor ແປງ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບຈໍານວນ Batch
 DocType: Stock Settings,Default Item Group,ກຸ່ມສິນຄ້າມາດຕະຖານ
-DocType: Employee Loan,Partially Disbursed,ຈ່າຍບາງສ່ວນ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Grant information
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Grant information
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ຖານຂໍ້ມູນຜູ້ສະຫນອງ.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,ທ່ານບໍ່ສາມາດເລີ່ມຕົ້ນລະບົບຈອງໃຫມ່ທີ່ບໍ່ໄດ້ຖືກຍົກເລີກ.
 DocType: Account,Balance Sheet,ງົບດຸນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
 DocType: Fee Validity,Valid Till,ຖືກຕ້ອງ Till
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,ກອງປະຊຸມຜູ້ປົກຄອງທັງຫມົດ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດຈໍານວນບໍ່ສາມາດໄດ້ຮັບເຂົ້າໄປໃນກັບຄືນຊື້"
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ການປ່ຽນກຸ່ມລູກຄ້າສໍາລັບລູກຄ້າທີ່ເລືອກບໍ່ຖືກອະນຸຍາດ.
 ,Purchase Order Items To Be Billed,ລາຍການສັ່ງຊື້ເພື່ອໄດ້ຮັບການ billed
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,ອັບເດດເວລາມາຮອດປະມານ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ອັບເດດເວລາມາຮອດປະມານ.
 DocType: Program Enrollment Tool,Enrollment Details,ລາຍລະອຽດການລົງທະບຽນ
 DocType: Purchase Invoice Item,Net Rate,ອັດຕາສຸດທິ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ກະລຸນາເລືອກລູກຄ້າ
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,ປັດຈຸບັນປີງົບປະມານ
 DocType: Purchase Order,Group same items,ລາຍການດຽວກັນກຸ່ມ
 DocType: Purchase Invoice,Disable Rounded Total,ປິດການໃຊ້ງານມົນທັງຫມົດ
-DocType: Employee Loan Application,Repayment Info,ຂໍ້ມູນການຊໍາລະຫນີ້
+DocType: Department,Parent Department,ພະແນກພໍ່ແມ່
+DocType: Loan Application,Repayment Info,ຂໍ້ມູນການຊໍາລະຫນີ້
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;ການອອກສຽງ&#39; ບໍ່ສາມາດປ່ອຍຫວ່າງ
 DocType: Maintenance Team Member,Maintenance Role,Maintenance Role
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},ຕິດຕໍ່ກັນຊ້ໍາກັນ {0} ກັບດຽວກັນ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},ຕິດຕໍ່ກັນຊ້ໍາກັນ {0} ກັບດຽວກັນ {1}
 ,Trial Balance,trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
 DocType: Sales Order,SO-,ພົນລະ
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ການຄົ້ນຄວ້າ
+DocType: Subscription Settings,Subscription Settings,Settings Subscription Settings
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ການຄົ້ນຄວ້າ
 DocType: Maintenance Visit Purpose,Work Done,ວຽກເຮັດ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,ກະລຸນາລະບຸຢູ່ໃນຢ່າງຫນ້ອຍຫນຶ່ງໃຫ້ເຫດຜົນໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: Announcement,All Students,ນັກສຶກສາທັງຫມົດ
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
 DocType: Crop Cycle,Less than a year,ນ້ອຍກວ່າຫນຶ່ງປີ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ເລກນັກສຶກສາໂທລະສັບມືຖື
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ລາຍການ {0} ບໍ່ສາມາດມີ Batch
 DocType: Crop,Yield UOM,Yield UOM
 ,Budget Variance Report,ງົບປະມານລາຍຕ່າງ
 DocType: Salary Slip,Gross Pay,ຈ່າຍລວມທັງຫມົດ
 DocType: Item,Is Item from Hub,ແມ່ນຈຸດຈາກ Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ຕິດຕໍ່ກັນ {0}: ປະເພດຂອງກິດຈະກໍາແມ່ນບັງຄັບ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ເງິນປັນຜົນການຊໍາລະເງິນ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ເງິນປັນຜົນການຊໍາລະເງິນ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger ການບັນຊີ
 DocType: Stock Reconciliation,Difference Amount,ຈໍານວນທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} on Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,ໄດ້ຢ່າງສິ້ນເຊີງ Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ລາຍຮັບຈາກການເກັບຮັກສາ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ລາຍຮັບຈາກການເກັບຮັກສາ
 DocType: Purchase Invoice,05-Change in POS,05-Change in POS
 DocType: Vehicle Log,Service Detail,ບໍລິການ
 DocType: BOM,Item Description,ລາຍລະອຽດສິນຄ້າ
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,ໂອກາດສິນຄ້າ
 ,Student and Guardian Contact Details,ນັກສຶກສາແລະຂໍ້ມູນຕິດຕໍ່ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ຕິດຕໍ່ກັນ {0}: ສໍາລັບຜູ້ສະຫນອງ {0} ທີ່ຢູ່ອີເມວທີ່ຈໍາເປັນຕ້ອງສົ່ງອີເມວ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ເປີດຊົ່ວຄາວ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,ເປີດຊົ່ວຄາວ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,View Hub
 ,Employee Leave Balance,ພະນັກງານອອກຈາກດຸນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ການດຸ່ນດ່ຽງບັນຊີ {0} ຕ້ອງສະເຫມີໄປຈະ {1}
 DocType: Patient Appointment,More Info,ຂໍ້ມູນເພີ່ມເຕີມ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},ອັດຕາມູນຄ່າທີ່ກໍານົດໄວ້ສໍາລັບລາຍການຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},ອັດຕາມູນຄ່າທີ່ກໍານົດໄວ້ສໍາລັບລາຍການຕິດຕໍ່ກັນ {0}
 DocType: Supplier Scorecard,Scorecard Actions,ການກະທໍາດັດນີຊີ້ວັດ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ຍົກຕົວຢ່າງ: ປະລິນຍາໂທໃນວິທະຍາສາດຄອມພິວເຕີ
 DocType: Purchase Invoice,Rejected Warehouse,ປະຕິເສດ Warehouse
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ການ
 DocType: Supplier Quotation Item,Lead Time in days,ທີ່ໃຊ້ເວລາເປັນຜູ້ນໍາພາໃນວັນເວລາ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Accounts Payable Summary
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},ການຈ່າຍເງິນເດືອນຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},ການຈ່າຍເງິນເດືອນຈາກ {0} ກັບ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ບໍ່ອະນຸຍາດໃຫ້ແກ້ໄຂບັນຊີ frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,ໄດ້ຮັບໃບແຈ້ງຫນີ້ທີ່ຍັງຄ້າງຄາ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab test Test
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ຂະຫນາດນ້ອຍ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ຂະຫນາດນ້ອຍ
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ການເປີດບັນຊີລາຍການເຄື່ອງມືການສ້າງໃບເກັບເງິນ
 DocType: Education Settings,Employee Number,ຈໍານວນພະນັກງານ
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ຍົກເລີກໃບແຈ້ງຫນີ້ພາຍຫຼັງທີ່ໄດ້ຮັບເງີນ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ກໍລະນີທີ່ບໍ່ມີ (s) ມາແລ້ວໃນການນໍາໃຊ້. ພະຍາຍາມຈາກກໍລະນີທີ່ບໍ່ມີ {0}
 DocType: Project,% Completed,% ສໍາເລັດ
 ,Invoiced Amount (Exculsive Tax),ອະນຸຈໍານວນເງິນ (exculsive ພາສີ)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ໄລຍະເວລາທົດລອງຫ້ອງທົດລອງ
 DocType: Email Digest,Add Quote,ຕື່ມການ Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},ປັດໄຈ Coversion UOM ຕ້ອງການສໍາລັບ UOM: {0} ໃນສິນຄ້າ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ຄ່າໃຊ້ຈ່າຍທາງອ້ອມ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,ຄ່າໃຊ້ຈ່າຍທາງອ້ອມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ຕິດຕໍ່ກັນ {0}: ຈໍານວນເປັນການບັງຄັບ
 DocType: Agriculture Analysis Criteria,Agriculture,ການກະສິກໍາ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ &#39;ສະຫມັກຕໍາກ່ຽວກັບ&#39; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,ກະລຸນາຕັ້ງມູນລະຫັດທໍາອິດ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
+DocType: Subscription Plan,Billing Interval Count,ໄລຍະເວລາການເອີ້ນເກັບເງິນ
 DocType: Sales Invoice Item,Edit Description,ແກ້ໄຂລາຍລະອຽດ
 DocType: Antibiotic,Antibiotic,ຢາຕ້ານເຊື້ອ
 ,Team Updates,ການປັບປຸງທີມງານ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,ສໍາລັບຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,ສໍາລັບຜູ້ຜະລິດ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ການສ້າງຕັ້ງປະເພດບັນຊີຊ່ວຍໃນການຄັດເລືອກບັນຊີນີ້ໃນການຄ້າຂາຍ.
 DocType: Purchase Invoice,Grand Total (Company Currency),ລວມທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ສ້າງຮູບແບບພິມ
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,ກຸ່ມສິນຄ້າ POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ອີເມວສໍາຄັນ:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ລາຍການທາງເລືອກຕ້ອງບໍ່ຄືກັບລະຫັດສິນຄ້າ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Sales Partner,Target Distribution,ການແຜ່ກະຈາຍເປົ້າຫມາຍ
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalization of the assessment temporarily
 DocType: Salary Slip,Bank Account No.,ເລກທີ່ບັນຊີທະນາຄານ
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ການຮ້ອງຂໍສໍາລັບການຜະລິດສະເຫນີລາຄາ
 DocType: Healthcare Settings,Registration Message,ຂໍ້ຄວາມລົງທະບຽນ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ອຸປະກອນ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ອຸປະກອນ
 DocType: Prescription Dosage,Prescription Dosage,Prescription Dosage
 DocType: Attendance,HR Manager,Manager HR
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,ເລີ່ມຕົ້ນແລະສິ້ນສຸດວັນທີ່
 ,Delivered Items To Be Billed,ການສົ່ງຈະ billed
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ເປີດ BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse ບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse ບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
 DocType: Authorization Rule,Average Discount,ສ່ວນລົດສະເລ່ຍປະຈໍາ
 DocType: Project Update,Great/Quickly,Great / Quickly
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,ກະລຸນາເລືອກຂະບວນການສໍາລັບລາຍການ batch
 DocType: Asset,Depreciation Schedules,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,ບັນຊີດັ່ງຕໍ່ໄປນີ້ອາດຈະຖືກເລືອກໃນການຕັ້ງຄ່າ GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,ໄລຍະເວລາການນໍາໃຊ້ບໍ່ສາມາດເປັນໄລຍະເວການຈັດສັນອອກຈາກພາຍນອກ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,ບັນຊີດັ່ງຕໍ່ໄປນີ້ອາດຈະຖືກເລືອກໃນການຕັ້ງຄ່າ GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ໄລຍະເວລາການນໍາໃຊ້ບໍ່ສາມາດເປັນໄລຍະເວການຈັດສັນອອກຈາກພາຍນອກ
 DocType: Activity Cost,Projects,ໂຄງການ
 DocType: Payment Request,Transaction Currency,ການສະກຸນເງິນ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},ຈາກ {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,avg ປະຈໍາວັນລາຍຈ່າຍ
 DocType: POS Profile,Campaign,ການໂຄສະນາ
 DocType: Supplier,Name and Type,ຊື່ແລະປະເພດ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',ສະຖານະການອະນຸມັດຕ້ອງໄດ້ຮັບການ &#39;ອະນຸມັດ&#39; ຫລື &#39;ປະຕິເສດ&#39;
 DocType: Physician,Contacts and Address,ຕິດຕໍ່ແລະທີ່ຢູ່
 DocType: Purchase Invoice,Contact Person,ຕິດຕໍ່ບຸກຄົນ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ວັນທີຄາດວ່າເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ວັນທີຄາດວ່າສຸດທ້າຍ &#39;
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,ສິດແລະລາຍລະອຽດ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,ການປ່ຽນແປງສຸດທິໃນຊັບສິນຄົງທີ່
 DocType: Leave Control Panel,Leave blank if considered for all designations,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການອອກແບບທັງຫມົດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ຈາກ DATETIME
 DocType: Email Digest,For Company,ສໍາລັບບໍລິສັດ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ເຂົ້າສູ່ລະບົບການສື່ສານ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","ການຮ້ອງຂໍສໍາລັບວົງຢືມໄດ້ຖືກປິດການເຂົ້າເຖິງຈາກປະຕູ, ສໍາລັບການຫຼາຍການຕັ້ງຄ່າປະຕູການກວດກາ."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ຈໍານວນການຊື້
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,ຈໍານວນການຊື້
 DocType: Sales Invoice,Shipping Address Name,Shipping Address ຊື່
 DocType: Material Request,Terms and Conditions Content,ຂໍ້ກໍານົດແລະເງື່ອນໄຂເນື້ອໃນ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ມີຂໍ້ຜິດພາດໃນການສ້າງຕາຕະລາງເວລາ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍໃນບັນຊີລາຍຊື່ຄັ້ງທໍາອິດຈະຖືກກໍານົດເປັນຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍຕົ້ນຕໍ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,ລະຫັດ Package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,ຝຶກຫັດງານ
 DocType: Purchase Invoice,Company GSTIN,ບໍລິສັດ GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,ຈໍານວນລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,ຈໍານວນລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",ພາສີຕາຕະລາງລາຍລະອຽດ fetched ຈາກຕົ້ນສະບັບລາຍເປັນຊ່ອຍແນ່ແລະເກັບຮັກສາໄວ້ໃນພາກສະຫນາມນີ້. ນໍາໃຊ້ສໍາລັບພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ຖ້າຫາກວ່າບັນຊີແມ່ນ frozen, entries ກໍາລັງອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຈໍາກັດ."
 DocType: Email Digest,Bank Balance,ທະນາຄານ Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ອອກຈາກໃບອະນຸຍາດໃນການອອກຄໍາຮ້ອງສະຫມັກ
 DocType: Job Opening,"Job profile, qualifications required etc.","profile ວຽກເຮັດງານທໍາ, ຄຸນນະວຸດທິທີ່ຕ້ອງການແລະອື່ນໆ"
 DocType: Journal Entry Account,Account Balance,ດຸນບັນຊີ
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ກົດລະບຽບອາກອນສໍາລັບທຸລະກໍາ.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,ໄລຍະເວລາການຊໍາລະເງິນທີ່ແຖວ {0} ແມ່ນເປັນການຊ້ໍາກັນ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),ການກະສິກໍາ (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ບັນຈຸ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ຫ້ອງການໃຫ້ເຊົ່າ
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ບັນຈຸ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ຫ້ອງການໃຫ້ເຊົ່າ
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
 DocType: Disease,Common Name,ຊື່ທົ່ວໄປ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ບໍ່ມີທີ່ຢູ່ເພີ່ມທັນ.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ຊົ່ວໂມງເຮັດວຽກ
 DocType: Vital Signs,Blood Pressure,ຄວາມດັນເລືອດ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,ນັກວິເຄາະ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,ນັກວິເຄາະ
 DocType: Item,Inventory,ສິນຄ້າຄົງຄັງ
 DocType: Item,Sales Details,ລາຍລະອຽດການຂາຍ
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ກວດສອບຈົດທະບຽນລາຍວິຊາສໍາລັບນັກສຶກສາໃນກຸ່ມນັກສຶກສາ
 DocType: Notification Control,Expense Claim Rejected,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍຖືກປະຕິເສດ
 DocType: Item,Item Attribute,ຄຸນລັກສະນະລາຍການ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ລັດຖະບານ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ລັດຖະບານ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0} ມີຢູ່ແລ້ວສໍາລັບການເຂົ້າສູ່ລະບົບຍານພາຫະນະ
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ຊື່ສະຖາບັນ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ກະລຸນາໃສ່ຈໍານວນເງິນຊໍາລະຫນີ້
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ກະລຸນາໃສ່ຈໍານວນເງິນຊໍາລະຫນີ້
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variants ລາຍການ
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,ການບໍລິການ
 DocType: HR Settings,Email Salary Slip to Employee,Email ເງິນເດືອນ Slip ກັບພະນັກງານ
 DocType: Cost Center,Parent Cost Center,ສູນຕົ້ນທຶນຂອງພໍ່ແມ່
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ເລືອກຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ເລືອກຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 DocType: Sales Invoice,Source,ແຫຼ່ງຂໍ້ມູນ
 DocType: Customer,"Select, to make the customer searchable with these fields","ເລືອກ, ເພື່ອເຮັດໃຫ້ລູກຄ້າສາມາດຄົ້ນຫາໄດ້ດ້ວຍທົ່ງນາເຫຼົ່ານີ້"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ສະແດງໃຫ້ເຫັນປິດ
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,ບັນຈຸ (s) ຍົກເລີກ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ກະແສເງິນສົດຈາກການລົງທຶນ
 DocType: Program Course,Program Course,ຫລັກສູດ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ຂົນສົ່ງສິນຄ້າແລະການສົ່ງຕໍ່ຄ່າບໍລິການ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ຂົນສົ່ງສິນຄ້າແລະການສົ່ງຕໍ່ຄ່າບໍລິການ
 DocType: Homepage,Company Tagline for website homepage,ບໍລິສັດສະໂລແກນສໍາລັບການຫນ້າທໍາອິດເວັບໄຊທ໌
 DocType: Item Group,Item Group Name,ລາຍຊື່ກຸ່ມ
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ການປະຕິບັດ
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Details memebership
 DocType: Leave Block List,Block Holidays on important days.,ວັນພັກຕັນກ່ຽວກັບການວັນສໍາຄັນ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),ກະລຸນາປ້ອນຂໍ້ມູນທັງຫມົດທີ່ຕ້ອງການຜົນໄດ້ຮັບ (s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,ບັນຊີລູກຫນີ້ Summary
-DocType: Employee Loan,Monthly Repayment Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,ບັນຊີລູກຫນີ້ Summary
+DocType: Loan,Monthly Repayment Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ເປີດໃບຍືມເງິນ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,ກະລຸນາຕັ້ງພາກສະຫນາມລະຫັດຜູ້ໃຊ້ໃນການບັນທຶກຂອງພະນັກວຽກເພື່ອກໍານົດພາລະບົດບາດພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,ກະລຸນາຕັ້ງພາກສະຫນາມລະຫັດຜູ້ໃຊ້ໃນການບັນທຶກຂອງພະນັກວຽກເພື່ອກໍານົດພາລະບົດບາດພະນັກງານ
 DocType: UOM,UOM Name,ຊື່ UOM
 DocType: GST HSN Code,HSN Code,ລະຫັດ HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,ຈໍານວນການປະກອບສ່ວນ
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ຜູ້ໃຊ້ {0} ຖືກມອບໃຫ້ແພດຫມໍ {1} ແລ້ວ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,ການແຜ່ກະຈາຍປະຈໍາເດືອນ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ຮັບບັນຊີບໍ່ມີ. ກະລຸນາສ້າງບັນຊີຮັບ
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),ສຸຂະພາບ (beta)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ບໍ່ມີສິນຄ້າທີ່ຈະຊອງ
 DocType: Shipping Rule Condition,From Value,ຈາກມູນຄ່າ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ປະລິມານການຜະລິດເປັນການບັງຄັບ
-DocType: Employee Loan,Repayment Method,ວິທີການຊໍາລະ
+DocType: Loan,Repayment Method,ວິທີການຊໍາລະ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ຖ້າຫາກວ່າການກວດກາ, ຫນ້າທໍາອິດຈະເປັນກຸ່ມສິນຄ້າມາດຕະຖານສໍາລັບການເວັບໄຊທ໌"
 DocType: Quality Inspection Reading,Reading 4,ອ່ານ 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ຮຽກຮ້ອງສໍາລັບຄ່າໃຊ້ຈ່າຍຂອງບໍລິສັດ.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,ໃບຢັ້ງຢືນທີ່ຕ້ອງການ
 DocType: Company,Default Holiday List,ມາດຕະຖານບັນຊີ Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະການໃຊ້ເວລາຂອງ {1} ແມ່ນ overlapping ກັບ {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,ຫນີ້ສິນ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,ຫນີ້ສິນ Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,ການຕິດຕໍ່ໂທລະສັບມືຖື
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,ເລືອກບໍລິສັດ
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,Print Section
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ຜູ້ໃຊ້ {0} ບໍ່ມີໂປແກຼມ POS ແບບສະເພາະໃດຫນຶ່ງ. ກວດເບິ່ງຄ່າເລີ່ມຕົ້ນຢູ່ແຖວ {1} ສໍາລັບຜູ້ໃຊ້ນີ້.
 DocType: Student Group,Set 0 for no limit,ກໍານົດ 0 ສໍາລັບທີ່ບໍ່ມີຂອບເຂດຈໍາກັດ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,ແຖວ {idx}: {field} ຕ້ອງຖືກສ້າງຂື້ນໃນການເປີດ {invoice_type} ໃບແຈ້ງຫນີ້
 DocType: Customer,Primary Address and Contact Detail,ທີ່ຢູ່ເບື້ອງຕົ້ນແລະລາຍລະອຽດການຕິດຕໍ່
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,resend ການຊໍາລະເງິນ Email
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,ກະລຸນາເລືອກໂດເມນຢ່າງນ້ອຍຫນຶ່ງ.
 DocType: Dependent Task,Dependent Task,Task ຂຶ້ນ
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ພະຍາຍາມການວາງແຜນການດໍາເນີນງານສໍາລັບມື້ X ໃນການລ່ວງຫນ້າ.
 DocType: HR Settings,Stop Birthday Reminders,ຢຸດວັນເດືອນປີເກີດເຕືອນ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
 DocType: SMS Center,Receiver List,ບັນຊີຮັບ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,ຄົ້ນຫາສິນຄ້າ
 DocType: Payment Schedule,Payment Amount,ຈໍານວນການຊໍາລະເງິນ
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,ຂະຫນາດການຈັດລໍາດັບ
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ສໍາເລັດແລ້ວ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock ໃນມື
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock ໃນມື
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import ສົບຜົນສໍາເລັດ!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ຄໍາຂໍຊໍາລະຢູ່ແລ້ວ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ຄ່າໃຊ້ຈ່າຍຂອງລາຍການອອກ
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,ສະເຫນີລາຄາສິນຄ້າ
 DocType: Customer,Customer POS Id,Id POS Customer
 DocType: Account,Account Name,ຊື່ບັນຊີ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,ຈາກວັນທີບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເຖິງວັນທີ່
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} ປະລິມານ {1} ບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,ຈາກວັນທີບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເຖິງວັນທີ່
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} ປະລິມານ {1} ບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,ກະລຸນາໃສ່ Woocommerce Server URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ປະເພດຜູ້ສະຫນອງຕົ້ນສະບັບ.
 DocType: Purchase Order Item,Supplier Part Number,ຜູ້ຜະລິດຈໍານວນສ່ວນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,ອັດຕາການປ່ຽນໃຈເຫລື້ອມໃສບໍ່ສາມາດຈະເປັນ 0 ຫລື 1
 DocType: Share Balance,To No,To No
-DocType: Subscription,Reference Document,ເອກະສານກະສານອ້າງອີງ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
 DocType: Accounts Settings,Credit Controller,ຄວບຄຸມການປ່ອຍສິນເຊື່ອ
-DocType: Grant Application,Applicant Type,ປະເພດຜູ້ສະຫມັກ
+DocType: Loan,Applicant Type,ປະເພດຜູ້ສະຫມັກ
 DocType: Purchase Invoice,03-Deficiency in services,03 ຂາດການບໍລິການ
 DocType: Delivery Note,Vehicle Dispatch Date,ຍານພາຫະນະວັນຫນັງສືທາງການ
 DocType: Healthcare Settings,Default Medical Code Standard,ແບບມາດຕະຖານຢາມາດຕະຖານ
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% ບິນ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved ຈໍານວນ
 DocType: Party Account,Party Account,ບັນຊີພັກ
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,ຊັບພະຍາກອນມະນຸດ
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,ຊັບພະຍາກອນມະນຸດ
 DocType: Lead,Upper Income,Upper ລາຍໄດ້
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ປະຕິເສດ
 DocType: Journal Entry Account,Debit in Company Currency,Debit ໃນບໍລິສັດສະກຸນເງິນ
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,ສໍາລັບພະນັກງານ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ເຮັດໃຫ້ນໍາເຂົ້າການອອກສຽງ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ເຮັດໃຫ້ນໍາເຂົ້າການອອກສຽງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
 DocType: Company,Default Values,ຄ່າເລີ່ມຕົ້ນ
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ຕ້ອງໄດ້ຫຼາຍກ່ວາ 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Available
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Available
 DocType: Manufacturing Settings,Capacity Planning For (Days),ການວາງແຜນຄວາມອາດສາມາດສໍາລັບການ (ວັນ)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ການຈັດຊື້
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ບໍ່ມີລາຍການທີ່ມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ບໍ່ມີລາຍການທີ່ມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າ.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ພາກສະຫນາມບັງຄັບ - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ພາກສະຫນາມບັງຄັບ - Program
 DocType: Special Test Template,Result Component,ຜົນໄດ້ຮັບ Component
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ປະກອບມີວັນພັກໃນໃບເປັນໃບ
 DocType: Sales Invoice,Packed Items,ການບັນຈຸ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,ການຮັບປະກັນການຮຽກຮ້ອງຕໍ່ສະບັບເລກທີ Serial
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ທັງຫມົດ&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ທັງຫມົດ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ເຮັດໃຫ້ໂຄງຮ່າງການຊື້
 DocType: Employee,Permanent Address,ທີ່ຢູ່ຖາວອນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,ຂາຍ Settings
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ຢືນຢັນການປະຕິບັດ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ການປະມູນອອນໄລນ໌
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ກະລຸນາລະບຸບໍ່ວ່າຈະປະລິມານຫຼືອັດຕາການປະເມີນມູນຄ່າຫຼືທັງສອງຢ່າງ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ກະລຸນາລະບຸບໍ່ວ່າຈະປະລິມານຫຼືອັດຕາການປະເມີນມູນຄ່າຫຼືທັງສອງຢ່າງ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ປະຕິບັດຕາມ
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,ເບິ່ງໃນໂຄງຮ່າງການ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
 ,Item Shortage Report,ບົດລາຍງານການຂາດແຄນສິນຄ້າ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,ບໍ່ສາມາດສ້າງເງື່ອນໄຂມາດຕະຖານ. ກະລຸນາປ່ຽນເກນມາດຕະຖານ
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,ໄດ້ຮັບ Template
 DocType: Material Request,Transferred,ໂອນ
 DocType: Vehicle,Doors,ປະຕູ
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,ເກັບຄ່າທໍານຽມສໍາລັບການຈົດທະບຽນຄົນເຈັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ບໍ່ສາມາດປ່ຽນແປງຄຸນລັກສະນະຫຼັງຈາກການຊື້ຂາຍຫຼັກຊັບ. ສ້າງລາຍການໃຫມ່ແລະໂອນຫຼັກຊັບໄປຍັງສະບັບໃຫມ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ບໍ່ສາມາດປ່ຽນແປງຄຸນລັກສະນະຫຼັງຈາກການຊື້ຂາຍຫຼັກຊັບ. ສ້າງລາຍການໃຫມ່ແລະໂອນຫຼັກຊັບໄປຍັງສະບັບໃຫມ່
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup ພາສີ
 DocType: Packing Slip,PS-,PS-
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,reconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ຄໍລໍາຈໍານວນຫຼາຍເກີນໄປ. ສົ່ງອອກບົດລາຍງານແລະພິມການນໍາໃຊ້ຄໍາຮ້ອງສະຫມັກລາງໄດ້.
 DocType: Purchase Invoice Item,Batch No,ຊຸດບໍ່ມີ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Employees Advances
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ອະນຸຍາດໃຫ້ຂາຍສິນຄ້າຫລາຍຕໍ່ການສັ່ງຊື້ຂອງລູກຄ້າເປັນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 DocType: Grant Application,Assessment  Mark (Out of 10),ເຄື່ອງຫມາຍການປະເມີນ (ອອກຈາກ 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ຕົ້ນຕໍ
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,ຕັ້ງຄໍານໍາຫນ້າສໍາລັບການຈໍານວນໄລຍະກ່ຽວກັບການໂອນຂອງທ່ານ
 DocType: Employee Attendance Tool,Employees HTML,ພະນັກງານ HTML
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ໂອກາດຈາກພາກສະຫນາມເປັນການບັງຄັບ
 DocType: Email Digest,Annual Expenses,ຄ່າໃຊ້ຈ່າຍປະຈໍາປີ
 DocType: Item,Variants,variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
 DocType: SMS Center,Send To,ສົ່ງເຖິງ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ຈໍານວນເງິນທີ່ຈັດສັນ
 DocType: Sales Team,Contribution to Net Total,ການປະກອບສ່ວນສຸດທິທັງຫມົດ
 DocType: Sales Invoice Item,Customer's Item Code,ຂອງລູກຄ້າລະຫັດສິນຄ້າ
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Reconciliation
 DocType: Territory,Territory Name,ຊື່ອານາເຂດ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse ກ່ອນການຍື່ນສະເຫນີການ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,ທ່ານພຽງແຕ່ສາມາດມີ Plans ທີ່ມີວົງຈອນການເອີ້ນເກັບເງິນດຽວກັນໃນການຈອງ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ສະຫມັກສໍາລັບການວຽກເຮັດງານທໍາໄດ້.
 DocType: Purchase Order Item,Warehouse and Reference,ຄັງສິນຄ້າແລະເອກສານອ້າງອິງ
 DocType: Supplier,Statutory info and other general information about your Supplier,ຂໍ້ມູນນິຕິບັນຍັດແລະຂໍ້ມູນທົ່ວໄປອື່ນໆກ່ຽວກັບຜູ້ຜະລິດຂອງທ່ານ
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ຕໍ່ຕ້ານອະນຸ {0} ບໍ່ມີການ unmatched {1} ເຂົ້າ
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ການປະເມີນຜົນ
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ການຝຶກອົບຮົມເຫດການ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ຊ້ໍາບໍ່ມີ Serial ເຂົ້າສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},ຊ້ໍາບໍ່ມີ Serial ເຂົ້າສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,ຕິດຕາມນໍາໂດຍແຫຼ່ງທີ່ມາ.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A ເງື່ອນໄຂສໍາລັບລະບຽບການຈັດສົ່ງສິນຄ້າ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ກະລຸນາໃສ່
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ກະລຸນາໃສ່
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Maintenance Log
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,ກະລຸນາທີ່ກໍານົດໄວ້ການກັ່ນຕອງໂດຍອີງໃສ່ລາຍການຫຼື Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ນ້ໍາສຸດທິຂອງຊຸດນີ້. (ການຄິດໄລ່ອັດຕະໂນມັດເປັນຜົນລວມຂອງນ້ໍາຫນັກສຸດທິຂອງລາຍການ)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,ການສົ່ງແລະບັນຊີລາຍການ
 DocType: Student Group,Instructors,instructors
 DocType: GL Entry,Credit Amount in Account Currency,ການປ່ອຍສິນເຊື່ອໃນສະກຸນເງິນບັນຊີ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Share Management
 DocType: Authorization Control,Authorization Control,ການຄວບຄຸມການອະນຸຍາດ
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ການຊໍາລະເງິນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ການຊໍາລະເງິນ
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດ, ກະລຸນາລະບຸບັນຊີໃນບັນທຶກສາງຫຼືກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນໃນບໍລິສັດ {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,ການຄຸ້ມຄອງຄໍາສັ່ງຂອງທ່ານ
 DocType: Work Order Operation,Actual Time and Cost,ທີ່ໃຊ້ເວລາແລະຄ່າໃຊ້ຈ່າຍຕົວຈິງ
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,ຄໍາຮ້ອງສະຫມັກອອກຈາກນັກສຶກສາ
 DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ກ່ຽວກັບ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ລາຍການມັດທີ່ໃຊ້ເວລາຂອງການຂາຍ.
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ທ່ານໄດ້ເຂົ້າໄປລາຍການລາຍການທີ່ຊ້ໍາ. ກະລຸນາແກ້ໄຂແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ສະມາຄົມ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ສະມາຄົມ
 DocType: Asset Movement,Asset Movement,ການເຄື່ອນໄຫວຊັບສິນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,ຕ້ອງໄດ້ສົ່ງຄໍາສັ່ງເຮັດວຽກ {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,ໂຄງຮ່າງການໃຫມ່
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,ສະກຸນເງິນໃບຢັ້ງຢືນຕ້ອງມີເງີນເທົ່າກັບສະກຸນເງິນຂອງສະກຸນເງິນຂອງບໍລິສັດຫຼືເງິນສະກຸນເງິນຂອງບໍລິສັດ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ຊີ້ໃຫ້ເຫັນວ່າຊຸດແມ່ນສ່ວນຫນຶ່ງຂອງການຈັດສົ່ງ (ພຽງແຕ່ Draft) ນີ້
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,ໄລຍະຫ່າງ {0}: ວັນທີ່ກໍານົດບໍ່ສາມາດເປັນມື້ກ່ອນວັນທີສົ່ງ
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,ໄລຍະຫ່າງ {0}: ວັນທີ່ກໍານົດບໍ່ສາມາດເປັນມື້ກ່ອນວັນທີສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ເຮັດໃຫ້ການເຂົ້າການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ປະລິມານສໍາລັບລາຍການ {0} ຕ້ອງຫນ້ອຍກ່ວາ {1}
 ,Sales Invoice Trends,Sales ແນວໂນ້ມ Invoice
 DocType: Leave Application,Apply / Approve Leaves,ສະຫມັກຕໍາ / ອະນຸມັດໃບ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ສໍາລັບການ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ສາມາດສົ່ງຕິດຕໍ່ກັນພຽງແຕ່ຖ້າຫາກວ່າປະເພດຄ່າໃຊ້ຈ່າຍແມ່ນ &#39;ກ່ຽວກັບຈໍານວນແຖວ Previous&#39; ຫຼື &#39;ກ່ອນຫນ້າ Row ລວມ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ສາມາດສົ່ງຕິດຕໍ່ກັນພຽງແຕ່ຖ້າຫາກວ່າປະເພດຄ່າໃຊ້ຈ່າຍແມ່ນ &#39;ກ່ຽວກັບຈໍານວນແຖວ Previous&#39; ຫຼື &#39;ກ່ອນຫນ້າ Row ລວມ
 DocType: Sales Order Item,Delivery Warehouse,Warehouse ສົ່ງ
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,ເປັນໄມ້ຢືນຕົ້ນຂອງສູນຕົ້ນທຶນທາງດ້ານການເງິນ.
 DocType: Serial No,Delivery Document No,ສົ່ງເອກະສານທີ່ບໍ່ມີ
@@ -2325,7 +2332,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ການບໍລິໂພກວັດຖຸບໍ່ໄດ້ກໍານົດໄວ້ໃນການຜະລິດການຜະລິດ.
 DocType: Student,Student Mobile Number,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
 DocType: Item,Has Variants,ມີ Variants
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ໃນແຖວ {1} ຫຼາຍກວ່າ {2}. ເພື່ອອະນຸຍາດໃຫ້ການອອກໃບຢັ້ງຢືນໃນໄລຍະຍາວ, ກະລຸນາຕັ້ງຄ່າ Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ໃນແຖວ {1} ຫຼາຍກວ່າ {2}. ເພື່ອອະນຸຍາດໃຫ້ການອອກໃບຢັ້ງຢືນໃນໄລຍະຍາວ, ກະລຸນາຕັ້ງຄ່າ Stock Settings"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ການປັບປຸງການຕອບສະຫນອງ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
@@ -2337,12 +2344,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,ເລືອກໂຄງການກ່ອນ
 DocType: Patient Appointment,Patient Age,ອາຍຸຜູ້ປ່ວຍ
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,ການຄຸ້ມຄອງການໂຄງການ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} ໄດ້ຖືກສົ່ງກັບແລ້ວ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} ໄດ້ຖືກສົ່ງກັບແລ້ວ
 DocType: Supplier,Supplier of Goods or Services.,ຜູ້ສະຫນອງສິນຄ້າຫຼືການບໍລິການ.
 DocType: Budget,Fiscal Year,ປີງົບປະມານ
 DocType: Asset Maintenance Log,Planned,ວາງແຜນໄວ້
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,ບັນຊີລູກຫນີ້ທີ່ຖືກຕ້ອງທີ່ຈະຖືກນໍາໃຊ້ຖ້າບໍ່ໄດ້ກໍານົດໄວ້ໃນຄົນເຈັບໃນການຈອງຄ່າບໍລິການປຶກສາ.
 DocType: Vehicle Log,Fuel Price,ລາຄານໍ້າມັນເຊື້ອໄຟ
+DocType: Bank Guarantee,Margin Money,ເງິນປັນຜົນ
 DocType: Budget,Budget,ງົບປະມານ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Set Open
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
@@ -2356,16 +2364,16 @@
 DocType: Lead,Follow Up,ປະຕິບັດຕາມ Up
 DocType: Item,Is Sales Item,ເປັນສິນຄ້າລາຄາ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ລາຍ Group ເປັນໄມ້ຢືນຕົ້ນ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. ກວດສອບການຕົ້ນສະບັບລາຍການ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. ກວດສອບການຕົ້ນສະບັບລາຍການ
 DocType: Maintenance Visit,Maintenance Time,ທີ່ໃຊ້ເວລາບໍາລຸງຮັກສາ
 ,Amount to Deliver,ຈໍານວນການສົ່ງ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},ລາຍະການດຽວກັນໄດ້ຖືກເຂົ້າຫລາຍຄັ້ງ. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະເລີ່ມຕົ້ນບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາປີເລີ່ມວັນທີຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,ມີຄວາມຜິດພາດໄດ້.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,ພະນັກງານ {0} ໄດ້ຖືກນໍາໃຊ້ແລ້ວສໍາລັບ {1} ລະຫວ່າງ {2} ແລະ {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,ມີຄວາມຜິດພາດໄດ້.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,ພະນັກງານ {0} ໄດ້ຖືກນໍາໃຊ້ແລ້ວສໍາລັບ {1} ລະຫວ່າງ {2} ແລະ {3}:
 DocType: Guardian,Guardian Interests,ຄວາມສົນໃຈຜູ້ປົກຄອງ
 DocType: Naming Series,Current Value,ມູນຄ່າປະຈຸບັນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
 DocType: Education Settings,Instructor Records to be created by,ບັນທຶກສອນທີ່ຈະສ້າງຂຶ້ນໂດຍ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ສ້າງ
 DocType: GST Account,GST Account,ບັນຊີ GST
@@ -2384,8 +2392,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
 DocType: Website Item Group,Website Item Group,ກຸ່ມສິນຄ້າເວັບໄຊທ໌
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Added to Favorites
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ບໍ່ມີໃບຮັບເງິນເດືອນທີ່ສົ່ງຫາສໍາລັບເກນມາດຕະຖານທີ່ເລືອກໄວ້ຂ້າງເທິງຫຼືໃບປະກາດລາຄາແລ້ວ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ບໍ່ມີໃບຮັບເງິນເດືອນທີ່ສົ່ງຫາສໍາລັບເກນມາດຕະຖານທີ່ເລືອກໄວ້ຂ້າງເທິງຫຼືໃບປະກາດລາຄາແລ້ວ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
 DocType: Projects Settings,Projects Settings,ໂຄງການຕັ້ງຄ່າ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entries ການຈ່າຍເງິນບໍ່ສາມາດໄດ້ຮັບການກັ່ນຕອງດ້ວຍ {1}
@@ -2395,27 +2403,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ເປັນໄມ້ຢືນຕົ້ນຂອງກຸ່ມສິນຄ້າ.
 DocType: Production Plan,Total Produced Qty,Total Produced Qty
 DocType: Payroll Entry,Get Employee Details,ລາຍລະອຽດກ່ຽວກັບພະນັກງານ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ບໍ່ສາມາດສົ່ງຈໍານວນການຕິດຕໍ່ກັນຫຼາຍກ່ວາຫຼືເທົ່າກັບຈໍານວນການຕິດຕໍ່ກັນໃນປັດຈຸບັນສໍາລັບປະເພດຄ່າໃຊ້ຈ່າຍນີ້
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ບໍ່ສາມາດສົ່ງຈໍານວນການຕິດຕໍ່ກັນຫຼາຍກ່ວາຫຼືເທົ່າກັບຈໍານວນການຕິດຕໍ່ກັນໃນປັດຈຸບັນສໍາລັບປະເພດຄ່າໃຊ້ຈ່າຍນີ້
 DocType: Asset,Sold,ຂາຍ
 ,Item-wise Purchase History,ປະວັດການຊື້ລາຍການທີ່ສະຫລາດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ &#39;ມາດດຶງຂໍ້ມູນ Serial No ເພີ່ມຂຶ້ນສໍາລັບສິນຄ້າ {0}
 DocType: Account,Frozen,Frozen
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ຈໍານວນພື້ນຖານ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,ວັດຖຸດິບ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,ວັດຖຸດິບ
 DocType: Payment Reconciliation Payment,Reference Row,Row ກະສານອ້າງອີງ
 DocType: Installation Note,Installation Time,ທີ່ໃຊ້ເວລາການຕິດຕັ້ງ
 DocType: Sales Invoice,Accounting Details,ລາຍລະອຽດການບັນຊີ
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ລົບລາຍະການທັງຫມົດສໍາລັບການບໍລິສັດນີ້
 DocType: Patient,O Positive,O Positive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ການລົງທຶນ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ການລົງທຶນ
 DocType: Issue,Resolution Details,ລາຍລະອຽດຄວາມລະອຽດ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ການຈັດສັນ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ເງື່ອນໄຂການຍອມຮັບ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ກະລຸນາໃສ່ການຮ້ອງຂໍການວັດສະດຸໃນຕາຕະລາງຂ້າງເທິງ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ບໍ່ມີການຊໍາລະເງິນສໍາລັບວາລະສານເຂົ້າ
 DocType: Item Attribute,Attribute Name,ສະແດງຊື່
 DocType: BOM,Show In Website,ສະແດງໃຫ້ເຫັນໃນເວັບໄຊທ໌
 DocType: Shopping Cart Settings,Show Quantity in Website,ສະແດງໃຫ້ເຫັນຈໍານວນໃນເວັບໄຊທ໌
-DocType: Employee Loan Application,Total Payable Amount,ຈໍານວນເງິນຫນີ້
+DocType: Loan Application,Total Payable Amount,ຈໍານວນເງິນຫນີ້
 DocType: Task,Expected Time (in hours),ທີ່ໃຊ້ເວລາທີ່ຄາດວ່າຈະ (ຊົ່ວໂມງ)
 DocType: Item Reorder,Check in (group),ໃຫ້ກວດເບິ່ງໃນ (ກຸ່ມ)
 DocType: Soil Texture,Silt,Silt
@@ -2434,7 +2443,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Room,Room Name,ຊື່ຫ້ອງ
 DocType: Prescription Duration,Prescription Duration,Prescription Duration
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການນໍາໃຊ້ / ຍົກເລີກກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການນໍາໃຊ້ / ຍົກເລີກກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
 DocType: Activity Cost,Costing Rate,ການໃຊ້ຈ່າຍອັດຕາ
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ທີ່ຢູ່ຂອງລູກຄ້າແລະການຕິດຕໍ່
 ,Campaign Efficiency,ປະສິດທິພາບຂະບວນການ
@@ -2454,11 +2463,11 @@
 DocType: Chapter,Chapter,ຫມວດ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,ຄູ່
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ບັນຊີມາດຕະຖານຈະໄດ້ຮັບການປັບປຸງໂດຍອັດຕະໂນມັດໃນໃບແຈ້ງຫນີ້ POS ເມື່ອເລືອກໂຫມດນີ້.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
 DocType: Asset,Depreciation Schedule,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ທີ່ຢູ່ Partner ຂາຍແລະຕິດຕໍ່
 DocType: Bank Reconciliation Detail,Against Account,ຕໍ່ບັນຊີ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີ່ຄວນຈະມີລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີ່ຄວນຈະມີລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
 DocType: Maintenance Schedule Detail,Actual Date,ວັນທີ່
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,ກະລຸນາຕັ້ງສູນຕົ້ນທຶນຕົ້ນແບບໃນ {0} ບໍລິສັດ.
 DocType: Item,Has Batch No,ມີ Batch No
@@ -2476,7 +2485,6 @@
 DocType: Task,Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 DocType: Soil Texture,Soil Type,ປະເພດດິນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,ຂໍ້ຄວາມໃຫມ່
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2496,7 +2504,7 @@
 DocType: Hub Category,Hub Category,Category Hub
 DocType: Purchase Invoice,SEZ,ຂພສ
 DocType: Purchase Receipt,Vehicle Number,ຈໍານວນຍານພາຫະນະ
-DocType: Employee Loan,Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ
+DocType: Loan,Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ
 DocType: Student Report Generation Tool,Add Letterhead,Add Letterhead
 DocType: Program Enrollment,Self-Driving Vehicle,ຍານພາຫະນະຂອງຕົນເອງຂັບລົດ
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Supplier Scorecard ປະຈໍາ
@@ -2525,9 +2533,9 @@
 DocType: Cash Flow Mapper,Position,ຕໍາແຫນ່ງ
 DocType: Patient,Patient Details,Details of Patient
 DocType: Patient,B Positive,B Positive
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ກິລາ
@@ -2535,8 +2543,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ທັງຫມົດທີ່ເກີດຂຶ້ນຈິງ
 DocType: Lab Test UOM,Test UOM,ທົດສອບ UOM
 DocType: Student Siblings,Student Siblings,ອ້າຍເອື້ອຍນ້ອງນັກສຶກສາ
+DocType: Subscription Plan Detail,Subscription Plan Detail,ລາຍະລະອຽດແຜນການຈອງຊື້
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,ຫນ່ວຍບໍລິການ
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,ກະລຸນາລະບຸບໍລິສັດ
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,ກະລຸນາລະບຸບໍລິສັດ
 ,Customer Acquisition and Loyalty,ຂອງທີ່ໄດ້ມາຂອງລູກຄ້າແລະຄວາມຈົງຮັກພັກ
 DocType: Asset Maintenance Task,Maintenance Task,ວຽກງານບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,ກະລຸນາຕັ້ງຄ່າ B2C Limit ໃນ GST Settings.
@@ -2551,6 +2560,7 @@
 ,BOM Search,ຄົ້ນຫາ BOM
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ມູນຄ່າວັດຖຸດິບທີ່ໃຊ້ທັງຫມົດ (ໂດຍຜ່ານຫຼັກຊັບ)
 DocType: Hub Settings,Company Registered,ບໍລິສັດຈົດທະບຽນ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,ວັນທີ່ບໍ່ສາມາດນ້ອຍກວ່າວັນທີ່
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ຂຽນ &quot;ໃນສະຕັອກ&quot; ຫຼື &quot;ບໍ່ຢູ່ໃນຫຼັກຊັບ&quot; ໃນ Hub ໂດຍອີງໃສ່ຫຼັກຊັບທີ່ມີຢູ່ໃນສາງນີ້.
 DocType: Vehicle,Fuel Type,ປະເພດນ້ໍາມັນ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ກະລຸນາລະບຸສະກຸນເງິນໃນບໍລິສັດ
@@ -2558,17 +2568,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ຄວາມສົມດູນໃນ Batch {0} ຈະກາຍເປັນກະທົບທາງລົບ {1} ສໍາລັບລາຍການ {2} ທີ່ Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ປະຕິບັດຕາມການຮ້ອງຂໍການວັດສະດຸໄດ້ຮັບການຍົກຂຶ້ນມາອັດຕະໂນມັດອີງຕາມລະດັບ Re: ສັ່ງຊື້ສິນຄ້າຂອງ
 DocType: Email Digest,Pending Sales Orders,ລໍຖ້າຄໍາສັ່ງຂາຍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
 DocType: Employee,Create User Permission,ສ້າງການອະນຸຍາດໃຫ້ຜູ້ໃຊ້
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Healthcare Settings,Remind Before,ເຕືອນກ່ອນ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ປັດໄຈທີ່ UOM ສົນທະນາແມ່ນຕ້ອງການໃນການຕິດຕໍ່ກັນ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Salary Component,Deduction,ການຫັກ
 DocType: Item,Retain Sample,ເກັບຕົວຢ່າງ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
 DocType: Stock Reconciliation Item,Amount Difference,ຈໍານວນທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ກະລຸນາໃສ່ລະຫັດພະນັກງານຂອງບຸກຄົນການຂາຍນີ້
 DocType: Territory,Classification of Customers by region,ການຈັດປະເພດຂອງລູກຄ້າຕາມພູມິພາກ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ໃນການຜະລິດ
@@ -2578,8 +2589,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ການຄິດໄລ່ຄວາມດຸ່ນດ່ຽງທະນາຄານ
 DocType: Normal Test Template,Normal Test Template,Normal Test Template
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ຜູ້ໃຊ້ຄົນພິການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ວົງຢືມ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,ບໍ່ສາມາດກໍານົດໄດ້ຮັບ RFQ ກັບ No ອ້າງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ວົງຢືມ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,ບໍ່ສາມາດກໍານົດໄດ້ຮັບ RFQ ກັບ No ອ້າງ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ຫັກຈໍານວນທັງຫມົດ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,ເລືອກບັນຊີເພື່ອພິມໃນສະກຸນເງິນບັນຊີ
@@ -2587,7 +2598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການໂອນເງິນກັບຜູ້ປ່ວຍນີ້. ເບິ່ງຕາຕະລາງຂ້າງລຸ່ມສໍາລັບລາຍລະອຽດ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
 DocType: Patient,Date of Birth,ວັນເດືອນປີເກີດ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,ລາຍການ {0} ໄດ້ຖືກສົ່ງຄືນແລ້ວ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,ລາຍການ {0} ໄດ້ຖືກສົ່ງຄືນແລ້ວ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ປີງົບປະມານ ** ເປັນຕົວແທນເປັນປີການເງິນ. entries ບັນຊີທັງຫມົດແລະເຮັດທຸລະກໍາທີ່ສໍາຄັນອື່ນໆມີການຕິດຕາມຕໍ່ປີງົບປະມານ ** **.
 DocType: Opportunity,Customer / Lead Address,ລູກຄ້າ / ທີ່ຢູ່ນໍາ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Supplier Setup Scorecard
@@ -2598,14 +2609,15 @@
 DocType: Work Order Operation,Actual Operation Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 DocType: Authorization Rule,Applicable To (User),ສາມາດນໍາໃຊ້ໄປ (User)
 DocType: Purchase Taxes and Charges,Deduct,ຫັກ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
 DocType: Student Applicant,Applied,ການນໍາໃຊ້
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re: ເປີດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re: ເປີດ
 DocType: Sales Invoice Item,Qty as per Stock UOM,ຈໍານວນເປັນຕໍ່ Stock UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ຊື່ Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Sale Discount
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ລັກສະນະພິເສດຍົກເວັ້ນ &quot;-&quot; &quot;.&quot;, &quot;#&quot;, ແລະ &quot;/&quot; ບໍ່ອະນຸຍາດໃຫ້ໃນການຕັ້ງຊື່ຊຸດ"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","ຮັກສາຕິດຕາມການໂຄສະນາຂາຍ. ໃຫ້ຕິດຕາມຂອງຜູ້ນໍາ, ຄວາມຫມາຍ, Sales Order etc ຈາກໂຄສະນາການວັດແທກຜົນຕອບແທນຈາກການລົງທຶນ."
+DocType: Department Approver,Approver,ອະນຸມັດ
 ,SO Qty,ດັ່ງນັ້ນຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ພາກສະຫນາມເພື່ອຜູ້ຖືຫຸ້ນບໍ່ສາມາດເປົ່າຫວ່າງໄດ້
 DocType: Guardian,Work Address,ຢູ່ບ່ອນເຮັດວຽກ
@@ -2619,21 +2631,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ທັງຫມົດຈັດສັນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Order Item,To be delivered to customer,ທີ່ຈະສົ່ງໃຫ້ລູກຄ້າ
 DocType: BOM,Scrap Material Cost,Cost Scrap ການວັດສະດຸ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse ໃດ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse ໃດ
 DocType: Grant Application,Email Notification Sent,Email Notification Sent
 DocType: Purchase Invoice,In Words (Company Currency),ໃນຄໍາສັບຕ່າງໆ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","ລະຫັດສິນຄ້າ, ຄັງສິນຄ້າ, ຈໍານວນຈໍາກັດແມ່ນຈໍາເປັນໃນແຖວ"
-DocType: Pricing Rule,Supplier,ຜູ້ຈັດຈໍາຫນ່າຍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","ລະຫັດສິນຄ້າ, ຄັງສິນຄ້າ, ຈໍານວນຈໍາກັດແມ່ນຈໍາເປັນໃນແຖວ"
+DocType: Bank Guarantee,Supplier,ຜູ້ຈັດຈໍາຫນ່າຍ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ສະແດງລາຍະລະອຽດການຊໍາລະເງິນ
 DocType: Consultation,Consultation Time,ເວລາປຶກສາ
 DocType: C-Form,Quarter,ໄຕມາດ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ຄ່າໃຊ້ຈ່າຍອື່ນ ໆ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ຄ່າໃຊ້ຈ່າຍອື່ນ ໆ
 DocType: Global Defaults,Default Company,ບໍລິສັດມາດຕະຖານ
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ຄ່າໃຊ້ຈ່າຍຂອງບັນຊີທີ່ແຕກຕ່າງກັນເປັນການບັງຄັບສໍາລັບລາຍການ {0} ເປັນຜົນກະທົບຕໍ່ມູນຄ່າຫຼັກຊັບໂດຍລວມ
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,ຊື່ທະນາຄານ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,ພະນັກງານບັນຊີເງິນກູ້
 DocType: Leave Application,Total Leave Days,ທັງຫມົດວັນອອກ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ຫມາຍເຫດ: ອີເມວຈະບໍ່ຖືກສົ່ງກັບຜູ້ໃຊ້ຄົນພິການ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ຈໍານວນປະຕິສໍາພັນ
@@ -2649,7 +2660,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ນ້ໍາຫນັກ (ໃນກິໂລກໍາ)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chapters / chapter_name ໄວ້ເປົ່າຫວ່າງໂດຍອັດຕະໂນມັດຕັ້ງຄ່າຫຼັງຈາກທີ່ບັນທຶກພາກ.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,ກະລຸນາຕັ້ງບັນຊີ GST ໃນ GST Settings
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,ກະລຸນາຕັ້ງບັນຊີ GST ໃນ GST Settings
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ປະເພດທຸລະກິດ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ກະລຸນາເລືອກນວນການຈັດສັນ, ປະເພດໃບເກັບເງິນແລະຈໍານວນໃບເກັບເງິນໃນ atleast ຫນຶ່ງຕິດຕໍ່ກັນ"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,ຄ່າໃຊ້ຈ່າຍຂອງການສັ່ງຊື້ໃຫມ່
@@ -2658,12 +2669,13 @@
 DocType: Grant Application,Grant Description,Grant Description
 DocType: Purchase Invoice Item,Rate (Company Currency),ອັດຕາການ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Student Guardian,Others,ຄົນອື່ນ
+DocType: Subscription,Discounts,ລາຄາຜ່ອນຜັນ
 DocType: Payment Entry,Unallocated Amount,ຈໍານວນເງິນບໍ່ໄດ້ປັນສ່ວນ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ບໍ່ສາມາດຊອກຫາສິນຄ້າ. ກະລຸນາເລືອກບາງມູນຄ່າອື່ນໆ {0}.
 DocType: POS Profile,Taxes and Charges,ພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A ຜະລິດຕະພັນຫຼືການບໍລິການທີ່ຊື້, ຂາຍຫຼືເກັບຮັກສາໄວ້ໃນຫຼັກຊັບ."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,ບໍ່ມີຂໍ້ມູນເພີ່ມເຕີມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ບໍ່ສາມາດເລືອກເອົາປະເພດຄ່າໃຊ້ຈ່າຍເປັນຈໍານວນເງິນຕິດຕໍ່ກັນກ່ອນຫນ້ານີ້ &#39;ຫລື&#39; ໃນທີ່ຜ່ານມາຕິດຕໍ່ກັນທັງຫມົດສໍາລັບການຕິດຕໍ່ກັນຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ບໍ່ສາມາດເລືອກເອົາປະເພດຄ່າໃຊ້ຈ່າຍເປັນຈໍານວນເງິນຕິດຕໍ່ກັນກ່ອນຫນ້ານີ້ &#39;ຫລື&#39; ໃນທີ່ຜ່ານມາຕິດຕໍ່ກັນທັງຫມົດສໍາລັບການຕິດຕໍ່ກັນຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ນີ້ກວມເອົາ scorecards ທັງຫມົດ tied ກັບ Setup ນີ້
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item ບໍ່ຄວນຈະເປັນມັດຜະລິດຕະພັນ. ກະລຸນາເອົາລາຍ `{0}` ແລະຊ່ວຍປະຢັດ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ທະນາຄານ
@@ -2672,21 +2684,24 @@
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງການ &#39;ໄດ້ຮັບການກໍານົດເວລາ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 DocType: Bin,Ordered Quantity,ຈໍານວນຄໍາສັ່ງ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ຕົວຢ່າງ: &quot;ການກໍ່ສ້າງເຄື່ອງມືສໍາລັບການສ້າງ&quot;
 DocType: Grading Scale,Grading Scale Intervals,ໄລຍະການຈັດລໍາດັບຂະຫນາດ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,ຜົນກໍາໄລສໍາລັບປີ
+DocType: Bank Guarantee,Name of Bank,ຊື່ທະນາຄານ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry ບັນຊີສໍາລັບ {2} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {3}
 DocType: Fee Schedule,In Process,ໃນຂະບວນການ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ສ່ວນລົດ
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,ເປັນໄມ້ຢືນຕົ້ນຂອງບັນຊີການເງິນ.
+DocType: Bank Guarantee,Reference Document Type,ປະເພດເອກະສານອ້າງອີງ
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cash Flow Mapping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} ຕໍ່ຂາຍສິນຄ້າ {1}
 DocType: Account,Fixed Asset,ຊັບສິນຄົງທີ່
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventory ຕໍ່ເນື່ອງ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ອີເມວບໍ່ພົບໃນຕິດຕໍ່ແບບເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ສ້າງຄວາມລັບ
-DocType: Employee Loan,Account Info,ຂໍ້ມູນບັນຊີ
+DocType: Loan,Account Info,ຂໍ້ມູນບັນຊີ
 DocType: Activity Type,Default Billing Rate,ມາດຕະຖານອັດຕາການເອີ້ນເກັບເງິນ
 DocType: Fees,Include Payment,ລວມເອົາການຊໍາລະເງິນ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
@@ -2694,24 +2709,24 @@
 DocType: Sales Invoice,Total Billing Amount,ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ໂຄງການໃນໂຄງປະກອບຄ່າທໍານຽມແລະກຸ່ມນັກສຶກສາ {0} ແມ່ນແຕກຕ່າງກັນ.
 DocType: Fee Schedule,Receivable Account,Account Receivable
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
 DocType: Quotation Item,Stock Balance,ຍອດ Stock
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ໃບສັ່ງຂາຍການຊໍາລະເງິນ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,ມີການຊໍາລະເງິນຂອງສ່ວຍສາອາກອນ
 DocType: Expense Claim Detail,Expense Claim Detail,ຄ່າໃຊ້ຈ່າຍຂໍ້ມູນການຮ້ອງຂໍ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ສາມສະບັບຄືການ SUPPLIER
 DocType: Land Unit,Is Container,ແມ່ນ Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ນີ້ຈະເປັນມື້ທີ 1 ຂອງວົງຈອນການປູກພືດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
 DocType: Purchase Invoice Item,Weight UOM,ນ້ໍາຫນັກ UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ລາຍຊື່ຜູ້ຖືຫຸ້ນທີ່ມີຈໍານວນຄົນທີ່ມີຢູ່
 DocType: Salary Structure Employee,Salary Structure Employee,ພະນັກງານໂຄງສ້າງເງິນເດືອນ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,ສະແດງຄຸນລັກສະນະຕົວແທນ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,ສະແດງຄຸນລັກສະນະຕົວແທນ
 DocType: Student,Blood Group,Group ເລືອດ
 DocType: Course,Course Name,ຫລັກສູດ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ຜູ້ໃຊ້ທີ່ສາມາດອະນຸມັດຄໍາຮ້ອງສະຫມັກອອກຈາກພະນັກງານສະເພາະຂອງ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ອຸປະກອນຫ້ອງການ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ອຸປະກອນຫ້ອງການ
 DocType: Purchase Invoice Item,Qty,ຈໍານວນ
 DocType: Fiscal Year,Companies,ບໍລິສັດ
 DocType: Supplier Scorecard,Scoring Setup,ຕິດຕັ້ງຄະແນນ
@@ -2730,7 +2745,7 @@
 DocType: Stock Entry,Total Incoming Value,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ລາຄາຊື້
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ລາຄາຊື້
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ແມ່ແບບຂອງຕົວປ່ຽນແປງຈໍາຫນ່າຍດັດນີຊີ້ວັດ.
 DocType: Job Offer Term,Offer Term,ຄໍາສະເຫນີ
 DocType: Asset,Quality Manager,ຜູ້ຈັດການຄຸນະພາບ
@@ -2742,13 +2757,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},ທັງຫມົດບໍ່ທັນໄດ້ຈ່າຍ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ການດໍາເນີນງານເວັບໄຊທ໌
 DocType: Supplier Scorecard,Supplier Score,ຄະແນນ Supplier
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,ທັງຫມົດອອກໃບແຈ້ງຫນີ້ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,ທັງຫມົດອອກໃບແຈ້ງຫນີ້ Amt
 DocType: Supplier,Warn RFQs,ເຕືອນ RFQs
 DocType: BOM,Conversion Rate,ອັດຕາການປ່ຽນແປງ
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ຄົ້ນຫາຜະລິດຕະພັນ
 DocType: Assessment Plan,To Time,ການທີ່ໃຊ້ເວລາ
 DocType: Authorization Rule,Approving Role (above authorized value),ການອະນຸມັດພາລະບົດບາດ (ສູງກວ່າຄ່າອະນຸຍາດ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີເຈົ້າຫນີ້
+DocType: Loan,Total Amount Paid,ຈໍານວນເງິນທີ່ຈ່າຍ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ກະລຸນາເລືອກການເຂົ້າຮຽນຂອງນັກຮຽນເຊິ່ງບັງຄັບໃຫ້ນັກຮຽນທີ່ໄດ້ຮັບຄ່າຈ້າງ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion {0} ບໍ່ສາມາດພໍ່ແມ່ຫລືລູກຂອງ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,ກະລຸນາເລືອກລາຄາລາຄາເພື່ອເຜີຍແຜ່ລາຄາ
@@ -2758,19 +2774,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ລາຄາ {0} ເປັນຄົນພິການ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {1} ສໍາລັບການດໍາເນີນງານ {2}
 DocType: Manufacturing Settings,Allow Overtime,ອະນຸຍາດໃຫ້ເຮັດວຽກລ່ວງເວ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ລາຍການຕໍ່ເນື່ອງ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ກະລຸນາໃຊ້ Stock Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ລາຍການຕໍ່ເນື່ອງ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ກະລຸນາໃຊ້ Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ລາຍການຕໍ່ເນື່ອງ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ກະລຸນາໃຊ້ Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","ລາຍການຕໍ່ເນື່ອງ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ກະລຸນາໃຊ້ Stock Entry"
 DocType: Training Event Employee,Training Event Employee,ການຝຶກອົບຮົມພະນັກງານກິດຈະກໍາ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ຕົວຢ່າງທີ່ສູງສຸດ - {0} ສາມາດເກັບຮັກສາສໍາລັບຊຸດ {1} ແລະລາຍການ {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,ເພີ່ມເຄື່ອງທີ່ໃຊ້ເວລາ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ຈໍານວນ Serial ຕ້ອງການສໍາລັບລາຍການ {1}. ທ່ານໄດ້ສະຫນອງ {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} ຈໍານວນ Serial ຕ້ອງການສໍາລັບລາຍການ {1}. ທ່ານໄດ້ສະຫນອງ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ອັດຕາປະເມີນມູນຄ່າໃນປະຈຸບັນ
 DocType: Training Event,Advance,Advance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,ສໍາລັບການເຮັດ recurring ອີກເທື່ອຫນຶ່ງ.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,ການຕັ້ງຄ່າການຈ່າຍເງິນຜ່ານ GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ແລກປ່ຽນເງິນຕາໄດ້ຮັບ / ການສູນເສຍ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,ແລກປ່ຽນເງິນຕາໄດ້ຮັບ / ການສູນເສຍ
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},ແຖວ # {0}: ບັນຊີ {1} ບໍ່ຂຶ້ນກັບບໍລິສັດ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},ແຖວ # {0}: ບັນຊີ {1} ບໍ່ຂຶ້ນກັບບໍລິສັດ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ບໍ່ສາມາດຊອກຫາ DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ທີ່ຢູ່ໃຫມ່
 DocType: Quality Inspection,Sample Size,ຂະຫນາດຕົວຢ່າງ
@@ -2789,7 +2804,6 @@
 DocType: Bin,Actual Quantity,ຈໍານວນຈິງ
 DocType: Shipping Rule,example: Next Day Shipping,ຍົກຕົວຢ່າງ: Shipping ວັນຖັດໄປ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},ການສະຫມັກແມ່ນ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Program
 DocType: Fee Schedule Program,Student Batch,Batch ນັກສຶກສາ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
@@ -2805,14 +2819,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,ບໍ່ໄດ້ສົ່ງ
 ,Bank Clearance Summary,ທະນາຄານ Summary Clearance
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","ສ້າງແລະຄຸ້ມຄອງປະຈໍາວັນ, ປະຈໍາອາທິດແລະປະຈໍາເດືອນຫົວເລື່ອງອີເມລ໌."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","ສ້າງແລະຄຸ້ມຄອງປະຈໍາວັນ, ປະຈໍາອາທິດແລະປະຈໍາເດືອນຫົວເລື່ອງອີເມລ໌."
 DocType: Appraisal Goal,Appraisal Goal,ການປະເມີນຜົນເປົ້າຫມາຍ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,ແນະນໍາຫມວດຫມູ່?
 DocType: Stock Reconciliation Item,Current Amount,ຈໍານວນເງິນໃນປະຈຸບັນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ອາຄານ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ອາຄານ
 DocType: Fee Schedule,Fee Structure,ຄ່າບໍລິການ
 DocType: Timesheet Detail,Costing Amount,ການໃຊ້ຈ່າຍຈໍານວນເງິນ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: Student Admission Program,Application Fee,ຄໍາຮ້ອງສະຫມັກຄ່າທໍານຽມ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ຍື່ນສະເຫນີການ Slip ເງິນເດືອນ
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ສ່ວນລົດ Maxiumm ສໍາລັບລາຍການ {0} ເປັນ {1}%
@@ -2820,12 +2833,13 @@
 DocType: Sales Partner,Address & Contacts,ທີ່ຢູ່ແລະຕິດຕໍ່ພົວພັນ
 DocType: SMS Log,Sender Name,ຊື່ຜູ້ສົ່ງ
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Agricultural Criteria Criteria
+DocType: HR Settings,Leave Approval Notification Template,ອອກຈາກແບບຟອມການແຈ້ງການອະນຸມັດ
 DocType: POS Profile,[Select],[ເລືອກ]
 DocType: Vital Signs,Blood Pressure (diastolic),ຄວາມດັນເລືອດ (Diastolic)
 DocType: SMS Log,Sent To,ຖືກສົ່ງໄປ
 DocType: Agriculture Task,Holiday Management,ການຄຸ້ມຄອງພັກຜ່ອນ
 DocType: Payment Request,Make Sales Invoice,ເຮັດໃຫ້ຍອດຂາຍ Invoice
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,ຊອບແວ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,ຊອບແວ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
 DocType: Company,For Reference Only.,ສໍາລັບການກະສານອ້າງອີງເທົ່ານັ້ນ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},ທ່ານຫມໍ {0} ບໍ່ມີຢູ່ໃນ {1}
@@ -2843,7 +2857,7 @@
 DocType: Employee,New Workplace,ຖານທີ່ເຮັດວຽກໃຫມ່
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,ການບໍລິໂພກວັດສະດຸ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ກໍານົດເປັນປິດ
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},ບໍ່ມີລາຍການທີ່ມີ Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},ບໍ່ມີລາຍການທີ່ມີ Barcode {0}
 DocType: Normal Test Items,Require Result Value,ຕ້ອງການມູນຄ່າຜົນໄດ້ຮັບ
 DocType: Item,Show a slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ເປັນຢູ່ປາຍສຸດຂອງຫນ້າ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,ແອບເປີ້ນ
@@ -2858,19 +2872,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ບໍ່ມີການເຄື່ອນໄຫວຫຼືເລີ່ມຕົ້ນເງິນເດືອນໂຄງປະກອບການທີ່ພົບເຫັນສໍາລັບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
 DocType: Leave Block List,Allow Users,ອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້
 DocType: Purchase Order,Customer Mobile No,ລູກຄ້າໂທລະສັບມືຖື
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurring
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ລາຍະລະອຽດແບບແຜນແຜນຜັງເງິນສົດ
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ການຄຸ້ມຄອງເງິນກູ້
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ຕິດຕາມລາຍໄດ້ແຍກຕ່າງຫາກແລະຄ່າໃຊ້ຈ່າຍສໍາລັບການຕັ້ງຜະລິດຕະພັນຫຼືພະແນກ.
 DocType: Rename Tool,Rename Tool,ປ່ຽນຊື່ເຄື່ອງມື
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ການປັບປຸງຄ່າໃຊ້ຈ່າຍ
 DocType: Item Reorder,Item Reorder,ລາຍການຮຽງລໍາດັບໃຫມ່
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
 DocType: Fees,Send Payment Request,ສົ່ງຄໍາຮ້ອງຂໍການຊໍາລະເງິນ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ລະບຸການດໍາເນີນງານ, ຄ່າໃຊ້ຈ່າຍປະຕິບັດແລະໃຫ້ການດໍາເນີນງານເປັນເອກະລັກທີ່ບໍ່ມີການປະຕິບັດງານຂອງທ່ານ."
 DocType: Water Analysis,Origin,ຕົ້ນກໍາເນີດ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
@@ -2885,14 +2899,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ແມ່ນຄວາມຮັບຜິດຊອບພາສີລາຍໄດ້
 DocType: Grading Scale Interval,Grade Description,Grade ລາຍລະອຽດ
 DocType: Stock Entry,Purchase Receipt No,ຊື້ໃບບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ເງິນ earnest
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ເງິນ earnest
 DocType: Sales Invoice, Shipping Bill Number,ຈໍານວນການຂົນສົ່ງສິນຄ້າ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ກວດສອບຍ້ອນກັບ
 DocType: Asset Maintenance Log,Actions performed,ການປະຕິບັດກິດຈະກໍາ
 DocType: Cash Flow Mapper,Section Leader,ຫົວຫນ້າພາກສ່ວນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ແຫຼ່ງຂໍ້ມູນຂອງກອງທຶນ (ຫນີ້ສິນ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ແຫຼ່ງຂໍ້ມູນຂອງກອງທຶນ (ຫນີ້ສິນ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ປະລິມານໃນການຕິດຕໍ່ກັນ {0} ({1}) ຈະຕ້ອງດຽວກັນກັບປະລິມານການຜະລິດ {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ພະນັກງານ
+DocType: Bank Guarantee,Fixed Deposit Number,Fixed Deposit Number
 DocType: Asset Repair,Failure Date,ວັນທີ່ລົ້ມເຫລວ
 DocType: Sample Collection,Collected Time,ເກັບເວລາ
 DocType: Company,Sales Monthly History,ປະຫວັດລາຍເດືອນຂາຍ
@@ -2909,10 +2924,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການຍົກເລີກການນັດຫມາຍນີ້ບໍ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Room Pricing Package
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ແຜນການຂາຍ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ຄວາມຕ້ອງການໃນ
 DocType: Rename Tool,File to Rename,ເອກະສານການປ່ຽນຊື່
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ກະລຸນາເລືອກ BOM ສໍາລັບລາຍການໃນແຖວ {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Fetch Subscription Updates
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ບັນຊີ {0} ບໍ່ກົງກັບກັບບໍລິສັດ {1} ໃນ Mode ຈາກບັນຊີ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},ລະບຸ BOM {0} ບໍ່ມີສໍາລັບລາຍການ {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,ຫລັກສູດ:
@@ -2922,7 +2938,7 @@
 DocType: Notification Control,Expense Claim Approved,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍອະນຸມັດ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,ບໍ່ມີການສັ່ງຊື້ເຮັດວຽກ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການໄລຍະເວລານີ້
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ຢາ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ຢາ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າທີ່ຊື້
 DocType: Selling Settings,Sales Order Required,ຕ້ອງການຂາຍສິນຄ້າ
 DocType: Purchase Invoice,Credit To,ການປ່ອຍສິນເຊື່ອເພື່ອ
@@ -2940,7 +2956,7 @@
 DocType: Request for Quotation Supplier,No Quote,No ອ້າງ
 DocType: Warranty Claim,Raised By,ຍົກຂຶ້ນມາໂດຍ
 DocType: Payment Gateway Account,Payment Account,ບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,ການປ່ຽນແປງສຸດທິໃນບັນຊີລູກຫນີ້
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ການຊົດເຊີຍ Off
 DocType: Job Offer,Accepted,ຮັບການຍອມຮັບ
@@ -2953,7 +2969,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,ຜົນການຄົ້ນຫາ
 DocType: Room,Room Number,ຈໍານວນຫ້ອງ
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},ກະສານອ້າງອີງທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},ກະສານອ້າງອີງທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping ກົດລະບຽບ
 DocType: Journal Entry Account,Payroll Entry,Payroll Entry
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,View Fees Records
@@ -2963,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 DocType: Item Variant Settings,Allow Rename Attribute Value,ອະນຸຍາດໃຫ້ປ່ຽນຊື່ຄ່າຄຸນລັກສະນະ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ໄວອະນຸທິນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ໄວອະນຸທິນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
 DocType: Restaurant,Invoice Series Prefix,Invoice Series Prefix
 DocType: Employee,Previous Work Experience,ຕໍາແຫນ່ງທີ່ເຄີຍເຮັດຜ່ານມາ
@@ -2971,8 +2987,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},ກະລຸນາໃສ່ການວາງແຜນຈໍານວນສໍາລັບລາຍການ {0} ທີ່ຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,ການລວມ Google Maps ບໍ່ສາມາດເປີດໃຊ້ໄດ້
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ບໍ່ໄດ້ສົ່ງ
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,ສະມາຊິກເວລາຫມົດອາຍຸ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ຕ້ອງກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ຕ້ອງກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
 ,Minutes to First Response for Issues,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດສໍາລັບບັນຫາ
 DocType: Purchase Invoice,Terms and Conditions1,ຂໍ້ກໍານົດແລະ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
@@ -2991,7 +3008,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,ຫນ່ວຍບໍລິການຂອງມາດຕະການ
 DocType: Fiscal Year,Year End Date,ປີສິ້ນສຸດວັນທີ່
 DocType: Task Depends On,Task Depends On,ວຽກງານຂຶ້ນໃນ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,ໂອກາດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,ໂອກາດ
 DocType: Operation,Default Workstation,Workstation ມາດຕະຖານ
 DocType: Notification Control,Expense Claim Approved Message,Message ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍອະນຸມັດ
 DocType: Payment Entry,Deductions or Loss,ຫັກຄ່າໃຊ້ຈ່າຍຫຼືການສູນເສຍ
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍບໍ່ມີຄໍາວ່າດ້ວຍການອະນຸມັດການບັນທຶກການອອກຈາກຄໍາຮ້ອງສະຫມັກ
 DocType: Campaign,Campaign-.####,ຂະບວນການ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ຂັ້ນຕອນຕໍ່ໄປ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Invoice
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ຍອດຄົງເຫລືອ
@@ -3039,7 +3056,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ປີສຸດທ້າຍ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,ສຸດທ້າຍສັນຍາວັນຕ້ອງໄດ້ຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,ສຸດທ້າຍສັນຍາວັນຕ້ອງໄດ້ຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
 DocType: Driver,Driver,Driver
 DocType: Vital Signs,Nutrition Values,Nutrition Values
 DocType: Lab Test Template,Is billable,ແມ່ນໃບລາຍຈ່າຍ
@@ -3050,7 +3067,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),ຕົວຈິງວັນທີ່ເລີ່ມຕົ້ນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ນີ້ແມ່ນເວັບໄຊທ໌ຕົວຢ່າງອັດຕະໂນມັດສ້າງຈາກ ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Range Ageing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,ຈໍານວນເງິນລ່ວງຫນ້າທັງຫມົດບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຖືກຮຽກຮ້ອງທັງຫມົດ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,ຈໍານວນເງິນລ່ວງຫນ້າທັງຫມົດບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຖືກຮຽກຮ້ອງທັງຫມົດ
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3085,7 +3102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Select Values Attribute
 DocType: Purchase Invoice,Reason For Issuing document,ເຫດຜົນສໍາລັບການອອກເອກະສານ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Payment Reconciliation,Bank / Cash Account,ບັນຊີທະນາຄານ / ເງິນສົດ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,ຖັດໄປໂດຍບໍ່ສາມາດເຊັ່ນດຽວກັນກັບທີ່ຢູ່ອີເມວ Lead
 DocType: Tax Rule,Billing City,City Billing
@@ -3102,7 +3119,8 @@
 DocType: Warranty Claim,Service Address,ທີ່ຢູ່ບໍລິການ
 DocType: Asset Maintenance Task,Calibration,Calibration
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ເປັນວັນພັກຂອງບໍລິສັດ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ເຟີນິເຈີແລະການແຂ່ງຂັນ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ອອກຈາກແຈ້ງການສະຖານະພາບ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,ເຟີນິເຈີແລະການແຂ່ງຂັນ
 DocType: Item,Manufacture,ຜະລິດ
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,ຕິດຕັ້ງບໍລິສັດ
 ,Lab Test Report,Lab Report Test
@@ -3118,7 +3136,6 @@
 DocType: Crop,Planting Area,ການປູກພື້ນທີ່
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ທັງຫມົດ (ຈໍານວນ)
 DocType: Installation Note Item,Installed Qty,ການຕິດຕັ້ງຈໍານວນ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ນີ້ອາດຈະເປັນເພາະວ່າບາງທີ່ຢູ່ອີເມວບໍ່ຖືກຕ້ອງໃນ
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,ທ່ານເພີ່ມ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ຜົນການຝຶກອົບຮົມ
@@ -3128,16 +3145,17 @@
 DocType: Products Settings,Products per Page,ຜະລິດຕະພັນຕໍ່ຫນ້າ
 DocType: Stock Ledger Entry,Outgoing Rate,ອັດຕາລາຍຈ່າຍ
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ຫຼື
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ຫຼື
 DocType: Sales Order,Billing Status,ສະຖານະການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ລາຍງານສະບັບທີ່ເປັນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ຄ່າໃຊ້ຈ່າຍຜົນປະໂຫຍດ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ຄ່າໃຊ້ຈ່າຍຜົນປະໂຫຍດ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ຂ້າງເທິງ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"ຕິດຕໍ່ກັນ, {0}: Journal Entry {1} ບໍ່ມີບັນຊີ {2} ຫລືແລ້ວປຽບທຽບ voucher ອື່ນ"
 DocType: Supplier Scorecard Criteria,Criteria Weight,ມາດຕະຖານນ້ໍາຫນັກ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ອອກແຈ້ງການອະນຸມັດ
 DocType: Buying Settings,Default Buying Price List,ມາດຕະຖານບັນຊີການຊື້ລາຄາ
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip ເງິນເດືອນຈາກ Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ອັດຕາການຊື້
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,ອັດຕາການຊື້
 DocType: Notification Control,Sales Order Message,Message ຂາຍສິນຄ້າ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ກໍານົດມູນຄ່າມາດຕະຖານຄືບໍລິສັດ, ສະກຸນເງິນ, ປັດຈຸບັນປີງົບປະມານ, ແລະອື່ນໆ"
 DocType: Payment Entry,Payment Type,ປະເພດການຊໍາລະເງິນ
@@ -3160,6 +3178,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ການຕັ້ງຄ່າການຄ້າໂຄງຮ່າງ
 DocType: Journal Entry,Accounting Entries,ການອອກສຽງການບັນຊີ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ຖ້າວ່າ Rule ຖືກກໍານົດໄວ້ສໍາລັບ &#39;ອັດຕາ&#39;, ມັນຈະລົບລ້າງລາຄາລາຄາ. ອັດຕາກໍານົດລາຄາແມ່ນອັດຕາສຸດທ້າຍ, ດັ່ງນັ້ນບໍ່ມີການຫຼຸດຜ່ອນຕື່ມອີກ. ດັ່ງນັ້ນ, ໃນການເຮັດທຸລະກໍາເຊັ່ນການສັ່ງຊື້, ຄໍາສັ່ງຊື້, ແລະອື່ນໆ, ມັນຈະຖືກເກັບຢູ່ໃນລະດັບ &#39;ອັດຕາ&#39;, ແທນທີ່ຈະເປັນລາຄາ &quot;ລາຄາລາຍະການ&quot;."
+DocType: Journal Entry,Paid Loan,ເງິນກູ້ຢືມ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ຊ້ໍາເຂົ້າ. ກະລຸນາກວດສອບການອະນຸຍາດກົດລະບຽບ {0}
 DocType: Journal Entry Account,Reference Due Date,Date Due Date
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3176,7 +3195,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
 ,To Produce,ກັບຜະລິດຕະພັນ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນ {1}. ເພື່ອປະກອບມີ {2} ໃນອັດຕາການສິນຄ້າ, ແຖວເກັດທີ່ຢູ່ {3} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນ {1}. ເພື່ອປະກອບມີ {2} ໃນອັດຕາການສິນຄ້າ, ແຖວເກັດທີ່ຢູ່ {3} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
 DocType: Patient Service Unit,Parent Service Unit,ຫນ່ວຍບໍລິການຂອງພໍ່ແມ່
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
 DocType: Packing Slip,Identification of the package for the delivery (for print),ການກໍານົດຂອງຊຸດສໍາລັບການຈັດສົ່ງ (ສໍາລັບການພິມ)
@@ -3195,7 +3214,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ສົ່ງ
 DocType: Volunteer,Weekdays,ວັນອາທິດ
 DocType: Stock Reconciliation Item,Current Qty,ຈໍານວນໃນປັດຈຸບັນ
 DocType: Restaurant Menu,Restaurant Menu,ຮ້ານອາຫານເມນູ
@@ -3203,7 +3222,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນສໍາລັບການສິນຄ້າຄົງຄັງ perpetual
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນສໍາລັບການສິນຄ້າຄົງຄັງ perpetual
 DocType: Item Reorder,Material Request Type,ອຸປະກອນການຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ສົ່ງອີເມວການທົບທວນການຊ່ວຍເຫຼືອ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
@@ -3211,10 +3230,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,ຄວາມອາດສາມາດຫ້ອງ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},ບັນທຶກຢູ່ແລ້ວສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,ທ່ານຈະສູນເສຍບັນທຶກບັນຊີຂອງໃບບິນສ້າງທີ່ຜ່ານມາ. ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການເລີ່ມຕົ້ນການສະຫມັກນີ້ຄືນໃຫມ່ບໍ?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,ຄ່າທໍານຽມການລົງທະບຽນ
 DocType: Budget,Cost Center,ສູນຕົ້ນທຶນ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,ການສັ່ງຊື້ຂໍ້ຄວາມ
 DocType: Tax Rule,Shipping Country,ການຂົນສົ່ງປະເທດ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ເຊື່ອງ Id ພາສີຂອງລູກຄ້າຈາກທຸລະກໍາການຂາຍ
@@ -3223,20 +3243,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ທີ່ຈະຂຽນທັບລາຄາ / ກໍານົດອັດຕາສ່ວນພິເສດ, ອີງໃສ່ເງື່ອນໄຂບາງຢ່າງ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse ພຽງແຕ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍຜ່ານ Stock Entry / ການສົ່ງເງິນ / Receipt ຊື້
 DocType: Employee Education,Class / Percentage,ຫ້ອງຮຽນ / ອັດຕາສ່ວນ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ຫົວຫນ້າການຕະຫຼາດແລະການຂາຍ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ຫົວຫນ້າການຕະຫຼາດແລະການຂາຍ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ອາກອນລາຍໄດ້
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Go to Letterheads
+DocType: Subscription,Cancel At End Of Period,ຍົກເລີກໃນເວລາສິ້ນສຸດໄລຍະເວລາ
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ບໍ່ມີລາຍການທີ່ເລືອກສໍາລັບການໂອນ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ບໍ່ມີລາຍການທີ່ເລືອກສໍາລັບການໂອນ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ທີ່ຢູ່ທັງຫມົດ.
 DocType: Company,Stock Settings,ການຕັ້ງຄ່າ Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ການລວມເປັນໄປໄດ້ພຽງແຕ່ຖ້າຫາກວ່າມີຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ແມ່ນອັນດຽວກັນໃນການບັນທຶກການທັງສອງ. ເປັນກຸ່ມ, ປະເພດຮາກ, ບໍລິສັດ"
 DocType: Vehicle,Electric,ລະບົບໄຟຟ້າ
 DocType: Task,% Progress,% ຄວາມຄືບຫນ້າ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ກໍາໄລ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ກໍາໄລ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",ພຽງແຕ່ຜູ້ສະຫມັກນັກສຶກສາທີ່ມີສະຖານະ &quot;ອະນຸມັດ&quot; ຈະຖືກເລືອກໃນຕາຕະລາງຂ້າງລຸ່ມນີ້.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,ເລກບັນຊີສໍາລັບບັນຊີ {0} ບໍ່ມີ. <br> ກະລຸນາຕິດຕັ້ງຕາຕະລາງບັນຊີຂອງທ່ານຢ່າງຖືກຕ້ອງ.
 DocType: Task,Depends on Tasks,ຂຶ້ນຢູ່ກັບວຽກ
@@ -3251,6 +3272,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,ບໍ່ໄດ້ຢູ່ໃນ Stock
 DocType: Volunteer,Volunteer Skills,ທັກສະອາສາສະຫມັກ
 DocType: Appraisal,HR User,User HR
+DocType: Bank Guarantee,Reference Document Name,ຊື່ເອກະສານອ້າງອີງ
 DocType: Purchase Invoice,Taxes and Charges Deducted,ພາສີອາກອນແລະຄ່າບໍລິການຫັກ
 apps/erpnext/erpnext/hooks.py +142,Issues,ບັນຫາ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ສະຖານະພາບຕ້ອງເປັນຫນຶ່ງໃນ {0}
@@ -3264,7 +3286,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 DocType: Sales Invoice,SINV-RET-,"SINV, RET-"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
+DocType: Loan,Loan Application,Application Loan
 DocType: Crop,Scientific Name,ຊື່ວິທະຍາສາດ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ໃບທັງຫມົດ
 DocType: Customer,"Reselect, if the chosen contact is edited after save","ແກ້ໄຂ, ຖ້າຕິດຕໍ່ເລືອກໄດ້ຖືກດັດແກ້ຫຼັງຈາກບັນທຶກ"
@@ -3273,13 +3296,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ຈໍານວນກະແສລາຍວັນ
 ,Sales Browser,ຂອງຕົວທ່ອງເວັບການຂາຍ
 DocType: Journal Entry,Total Credit,ການປ່ອຍສິນເຊື່ອທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},ການເຕືອນໄພ: ອີກປະການຫນຶ່ງ {0} # {1} ມີຢູ່ຕໍ່ການເຂົ້າຫຸ້ນ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},ການເຕືອນໄພ: ອີກປະການຫນຶ່ງ {0} # {1} ມີຢູ່ຕໍ່ການເຂົ້າຫຸ້ນ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,ທ້ອງຖິ່ນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ເງິນກູ້ຢືມແລະອື່ນ ໆ (ຊັບສິນ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ລູກຫນີ້
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,ຂະຫນາດໃຫຍ່
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,ຂະຫນາດໃຫຍ່
 DocType: Homepage Featured Product,Homepage Featured Product,ຫນ້າທໍາອິດຜະລິດຕະພັນທີ່ແນະນໍາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ທັງຫມົດກຸ່ມການປະເມີນຜົນ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ທັງຫມົດກຸ່ມການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ຊື່ Warehouse ໃຫມ່
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),ທັງຫມົດ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ອານາເຂດຂອງ
@@ -3300,9 +3323,10 @@
 DocType: Fees,Fees,ຄ່າທໍານຽມ
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ລະບຸອັດຕາແລກປ່ຽນການແປງສະກຸນເງິນຫນຶ່ງເຂົ້າໄປໃນອີກ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ສະເຫນີລາຄາ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,ຈໍານວນເງິນທີ່ຍັງຄ້າງຄາທັງຫມົດ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,ຈໍານວນເງິນທີ່ຍັງຄ້າງຄາທັງຫມົດ
 DocType: Sales Partner,Targets,ຄາດຫມາຍຕົ້ນຕໍ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,ກະລຸນາລົງທະບຽນຫມາຍເລກ SIREN ໃນແຟ້ມຂໍ້ມູນຂອງບໍລິສັດ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຂອງພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 DocType: Price List,Price List Master,ລາຄາຕົ້ນສະບັບ
 DocType: GST Account,CESS Account,CESS Account
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ທັງຫມົດຂອງທຸລະກໍາສາມາດຕິດແທຕໍ່ຫລາຍຄົນຂາຍ ** ** ດັ່ງນັ້ນທ່ານສາມາດກໍານົດແລະຕິດຕາມກວດກາເປົ້າຫມາຍ.
@@ -3311,6 +3335,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ເລືອກຄົນເຈັບ
 DocType: Price List,Applicable for Countries,ສາມາດນໍາໃຊ້ສໍາລັບປະເທດ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ຊື່ພາລາມິເຕີ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ແລະ &#39;ປະຕິເສດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},ນັກສຶກສາ Group Name ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 DocType: Homepage,Products to be shown on website homepage,ຜະລິດຕະພັນທີ່ຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນໃນຫນ້າທໍາອິດເວັບໄຊທ໌
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ນີ້ເປັນກຸ່ມລູກຄ້າຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -3344,14 +3369,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,ໃບເກັບເງິນທີ່ສ້າງແລ້ວສໍາລັບຊົ່ວໂມງເອີ້ນເກັບເງິນທັງຫມົດ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ຄວາມຜິດພາດຊື່: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ແມ່ນຄ່າໃຊ້ຈ່າຍດ້ານການເງິນ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວ
 DocType: Packing Slip,If more than one package of the same type (for print),ຖ້າຫາກວ່າຫຼາຍກ່ວາຫນຶ່ງຊຸດຂອງປະເພດດຽວກັນ (ສໍາລັບການພິມ)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,ກະລຸນາຕັ້ງຄ່າລູກຄ້າເລີ່ມຕົ້ນໃນການຕັ້ງຮ້ານອາຫານ
 ,Salary Register,ເງິນເດືອນຫມັກສະມາຊິກ
 DocType: Warehouse,Parent Warehouse,Warehouse ພໍ່ແມ່
-DocType: C-Form Invoice Detail,Net Total,Total net
+DocType: Subscription,Net Total,Total net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default BOM ບໍ່ພົບລາຍການ {0} ແລະໂຄງການ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,ກໍານົດປະເພດການກູ້ຢືມເງິນຕ່າງໆ
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,ກໍານົດປະເພດການກູ້ຢືມເງິນຕ່າງໆ
 DocType: Bin,FCFS Rate,FCFS ອັດຕາ
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ຈໍານວນເງິນທີ່ຍັງຄ້າງຄາ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ທີ່ໃຊ້ເວລາ (ໃນນາທີ)
@@ -3383,11 +3408,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,ບັນຊີຮາກຕ້ອງກຸ່ມ
 DocType: Drug Prescription,Drug Prescription,Drug Prescription
 DocType: Fees,FEE.,ຄ່າທໍານຽມ.
-DocType: Employee Loan,Repaid/Closed,ຊໍາລະຄືນ / ປິດ
+DocType: Loan,Repaid/Closed,ຊໍາລະຄືນ / ປິດ
 DocType: Item,Total Projected Qty,ທັງຫມົດໂຄງການຈໍານວນ
 DocType: Monthly Distribution,Distribution Name,ຊື່ການແຜ່ກະຈາຍ
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ອັດຕາການປະເມີນບໍ່ພົບສໍາລັບລາຍການ {0}, ທີ່ຕ້ອງການເຮັດບັນຊີການບັນຊີສໍາລັບ {1} {2}. ຖ້າລາຍການກໍາລັງດໍາເນີນການເປັນລາຍະການອັດຕາການປະເມີນຄ່າຢູ່ໃນ {1}, ກະລຸນາບອກວ່າຢູ່ໃນຕາຕະລາງ {1} ຕາຕະລາງ. ຖ້າບໍ່ດັ່ງນັ້ນ, ກະລຸນາສ້າງການຊື້ຂາຍຮຸ້ນສໍາລັບລາຍະການຫຼືບອກອັດຕາການປະເມີນໃນບັນທຶກລາຍການ, ແລະຫຼັງຈາກນັ້ນໃຫ້ສົ່ງ / ຍົກເລີກການເຂົ້ານີ້"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,ລະຫັດຂອງລາຍວິຊາ
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},ກວດສອບຄຸນນະພາບທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
 DocType: POS Settings,Use POS in Offline Mode,ໃຊ້ POS ໃນໂຫມດ Offline
@@ -3407,16 +3431,15 @@
 DocType: Purchase Invoice,Deemed Export,Deemed ສົ່ງອອກ
 DocType: Stock Entry,Material Transfer for Manufacture,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ເປີເຊັນສ່ວນລົດສາມາດນໍາໃຊ້ບໍ່ວ່າຈະຕໍ່ລາຄາຫຼືສໍາລັບລາຄາທັງຫມົດ.
-DocType: Subscription,Half-yearly,ເຄິ່ງຫນຶ່ງຂອງການປະຈໍາປີ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
 DocType: Lab Test,LabTest Approver,ຜູ້ຮັບຮອງ LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,ທ່ານໄດ້ປະເມີນແລ້ວສໍາລັບມາດຕະຖານການປະເມີນຜົນ {}.
 DocType: Vehicle Service,Engine Oil,ນ້ໍາມັນເຄື່ອງຈັກ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},ຄໍາສັ່ງເຮັດວຽກກໍ່ສ້າງ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},ຄໍາສັ່ງເຮັດວຽກກໍ່ສ້າງ: {0}
 DocType: Sales Invoice,Sales Team1,Team1 ຂາຍ
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
 DocType: Sales Invoice,Customer Address,ທີ່ຢູ່ຂອງລູກຄ້າ
-DocType: Employee Loan,Loan Details,ລາຍລະອຽດການກູ້ຢືມເງິນ
+DocType: Loan,Loan Details,ລາຍລະອຽດການກູ້ຢືມເງິນ
 DocType: Company,Default Inventory Account,ບັນຊີມາດຕະຖານສິນຄ້າຄົງຄັງ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ຈໍານວນ folio ບໍ່ແມ່ນການຈັບຄູ່
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
@@ -3428,19 +3451,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ການເຊື່ອມໂຍງກັບຫນ່ວຍງານທີ່ດິນທັງຫມົດທີ່ປູກພືດທີ່ເຕີບໃຫຍ່
 DocType: Account,Root Type,ປະເພດຮາກ
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ສາມາດກັບຄືນຫຼາຍກ່ວາ {1} ສໍາລັບລາຍການ {2}"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ສາມາດກັບຄືນຫຼາຍກ່ວາ {1} ສໍາລັບລາຍການ {2}"
 DocType: Item Group,Show this slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ນີ້ຢູ່ສົ້ນເທິງຂອງຫນ້າ
 DocType: BOM,Item UOM,ລາຍການ UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ຄັງສິນຄ້າເປົ້າຫມາຍມີຜົນບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
 DocType: Cheque Print Template,Primary Settings,ການຕັ້ງຄ່າປະຖົມ
 DocType: Purchase Invoice,Select Supplier Address,ເລືອກທີ່ຢູ່ຜູ້ຜະລິດ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ຕື່ມການພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ຕື່ມການພະນັກງານ
 DocType: Purchase Invoice Item,Quality Inspection,ກວດສອບຄຸນະພາບ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
 DocType: Company,Standard Template,ແມ່ແບບມາດຕະຖານ
 DocType: Training Event,Theory,ທິດສະດີ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ນິຕິບຸກຄົນ / ບໍລິສັດຍ່ອຍທີ່ມີໃນຕາຕະລາງທີ່ແຍກຕ່າງຫາກຂອງບັນຊີເປັນອົງການຈັດຕັ້ງ.
 DocType: Payment Request,Mute Email,mute Email
@@ -3460,11 +3483,10 @@
 DocType: SMS Log,No of Sent SMS,ບໍ່ມີຂອງ SMS ສົ່ງ
 DocType: Antibiotic,Healthcare Administrator,ຜູ້ເບິ່ງແລສຸຂະພາບ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ຕັ້ງຄ່າເປົ້າຫມາຍ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 DocType: Dosage Strength,Dosage Strength,Dosage Strength
 DocType: Account,Expense Account,ບັນຊີຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ຊອບແວ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,ສີ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,ສີ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ເງື່ອນໄຂການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,ວັນຫມົດອາຍຸແມ່ນບັງຄັບສໍາລັບລາຍການທີ່ເລືອກ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ປ້ອງກັນບໍ່ໃຫ້ໃບສັ່ງຊື້
@@ -3477,18 +3499,18 @@
 DocType: Patient,Personal and Social History,ປະວັດສາດສ່ວນບຸກຄົນແລະສັງຄົມ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,User {0} ສ້າງແລ້ວ
 DocType: Fee Schedule,Fee Breakup for each student,ຄ່າທໍານຽມສໍາລັບນັກຮຽນແຕ່ລະຄົນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ເລືອກການແຜ່ກະຈາຍລາຍເດືອນກັບ unevenly ແຈກຢາຍເປົ້າຫມາຍໃນທົ່ວເດືອນ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,ປ່ຽນລະຫັດ
 DocType: Purchase Invoice Item,Valuation Rate,ອັດຕາປະເມີນມູນຄ່າ
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
 DocType: Purchase Invoice,Availed ITC Cess,ໄດ້ຮັບສິນຄ້າ ITC Cess
 ,Student Monthly Attendance Sheet,ນັກສຶກສາ Sheet ເຂົ້າຮ່ວມລາຍເດືອນ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ກົດລະບຽບການສົ່ງສິນຄ້າໃຊ້ໄດ້ສໍາລັບການຂາຍ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ວັນທີ່ສະຫມັກໂຄງການເລີ່ມຕົ້ນ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,ຈົນກ່ວາ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ຈົນກ່ວາ
 DocType: Rename Tool,Rename Log,ປ່ຽນຊື່ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Group ນັກສຶກສາຫຼືຕາຕະລາງຂອງລາຍວິຊາແມ່ນບັງຄັບ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Group ນັກສຶກສາຫຼືຕາຕະລາງຂອງລາຍວິຊາແມ່ນບັງຄັບ
@@ -3509,7 +3531,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ລາຍຊື່ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານທີ່ທ່ານຈະຊື້ຫຼືຂາຍ.
 DocType: Water Analysis,Storage Temperature,Storage Temperature
 DocType: Employee Attendance Tool,Unmarked Attendance,ຜູ້ເຂົ້າຮ່ວມບໍ່ມີເຄື່ອງຫມາຍ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ນັກຄົ້ນຄວ້າ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ນັກຄົ້ນຄວ້າ
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,ໂຄງການລົງທະບຽນນັກສຶກສາເຄື່ອງມື
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},ວັນເລີ່ມຕົ້ນຄວນຈະນ້ອຍກວ່າວັນທີສຸດທ້າຍສໍາລັບວຽກ {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,ຊື່ຫລື Email ເປັນການບັງຄັບ
@@ -3522,7 +3544,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard ແລະ RFQs ເພື່ອສະຫນອງນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ.
 DocType: Chapter,Non Profit Manager,Nonprofit Manager
 DocType: BOM,Total Cost(Company Currency),ຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} ສ້າງ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} ສ້າງ
 DocType: Homepage,Company Description for website homepage,ລາຍລະອຽດເກມບໍລິສັດສໍາລັບການຫນ້າທໍາອິດເວັບໄຊທ໌
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ເພື່ອຄວາມສະດວກຂອງລູກຄ້າ, ລະຫັດເຫຼົ່ານີ້ສາມາດຖືກນໍາໃຊ້ໃນຮູບແບບການພິມເຊັ່ນ: ໃບແຈ້ງຫນີ້ແລະການສົ່ງເງິນ"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ຊື່ Suplier
@@ -3532,11 +3554,10 @@
 DocType: Employee,You can enter any date manually,ທ່ານສາມາດເຂົ້າວັນທີ່ໃດ ໆ ດ້ວຍຕົນເອງ
 DocType: Healthcare Settings,Result Printed,Result Printed
 DocType: Asset Category Account,Depreciation Expense Account,ບັນຊີຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ເບິ່ງ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ພຽງແຕ່ໂຫນດໃບອະນຸຍາດໃຫ້ໃນການເຮັດທຸ
 DocType: Project,Total Costing Amount (via Timesheets),ຈໍານວນຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ຜ່ານບັດປະຈໍາຕົວ)
-DocType: Employee Advance,Expense Approver,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍ
+DocType: Department,Expense Approver,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ລູກຄ້າຈະຕ້ອງເປັນການປ່ອຍສິນເຊື່ອ
 DocType: Project,Hourly,ທຸກໆຊົ່ວໂມງ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ທີ່ບໍ່ແມ່ນກຸ່ມ Group
@@ -3546,7 +3567,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ການ DATETIME
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,ຂໍ້ມູນບັນທຶກການຮັກສາສະຖານະພາບການຈັດສົ່ງ sms
 DocType: Accounts Settings,Make Payment via Journal Entry,ເຮັດໃຫ້ການຊໍາລະເງິນໂດຍຜ່ານການອະນຸທິນ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,ພິມກ່ຽວກັບ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,ພິມກ່ຽວກັບ
 DocType: Item,Inspection Required before Delivery,ການກວດກາທີ່ກໍານົດໄວ້ກ່ອນທີ່ຈະຈັດສົ່ງສິນຄ້າ
 DocType: Item,Inspection Required before Purchase,ການກວດກາທີ່ກໍານົດໄວ້ກ່ອນທີ່ຈະຊື້
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ກິດຈະກໍາທີ່ຍັງຄ້າງ
@@ -3556,7 +3577,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,ຈໍານວນສັ່ງຊື້ຂັ້ນຕ່ໍາ
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,ອົງການຈັດຕັ້ງຂອງທ່ານ
 DocType: Fee Component,Fees Category,ຄ່າທໍານຽມປະເພດ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 DocType: Supplier Scorecard,Notify Employee,ແຈ້ງພະນັກງານ
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ກະລຸນາໃສ່ຊື່ຂອງຂະບວນການຖ້າຫາກວ່າແຫລ່ງທີ່ມາຂອງຄໍາຖາມແມ່ນການໂຄສະນາ
@@ -3566,7 +3587,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,ລະດັບລໍາດັບ
 DocType: Company,Chart Of Accounts Template,ຕາຕະລາງຂອງບັນຊີແມ່ແບບ
 DocType: Attendance,Attendance Date,ວັນທີ່ສະຫມັກຜູ້ເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},ລາຍການລາຄາການປັບປຸງສໍາລັບ {0} ໃນລາຄາ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},ລາຍການລາຄາການປັບປຸງສໍາລັບ {0} ໃນລາຄາ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ກະຈັດກະຈາຍເງິນເດືອນໂດຍອີງໃສ່ລາຍໄດ້ແລະການຫັກ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse ຮັບການຍອມຮັບ
@@ -3574,10 +3595,11 @@
 DocType: Item,Valuation Method,ວິທີການປະເມີນມູນຄ່າ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,ເຄື່ອງຫມາຍວັນເຄິ່ງຫນຶ່ງ
 DocType: Sales Invoice,Sales Team,ທີມງານການຂາຍ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ເຂົ້າຊ້ໍາກັນ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ເຂົ້າຊ້ໍາກັນ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,ກະລຸນາໃສ່ຊື່ຂອງ Beneficiary ກ່ອນສົ່ງຄໍາສັ່ງ.
 DocType: Program Enrollment Tool,Get Students,ໄດ້ຮັບນັກສຶກສາ
 DocType: Serial No,Under Warranty,ພາຍໃຕ້ການຮັບປະກັນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ຂາຍ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ຂາຍ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບສັ່ງຂາຍ.
 ,Employee Birthday,ພະນັກງານວັນເດືອນປີເກີດ
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,ກະລຸນາເລືອກວັນສໍາເລັດສໍາລັບການສ້ອມແປງທີ່ສົມບູນ
@@ -3596,7 +3618,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ຈອງສໍາລັບການເຮັດສັນຍາຍ່ອຍ
 DocType: Payment Reconciliation Invoice,Invoice Number,ຈໍານວນໃບເກັບເງິນ
 DocType: Shopping Cart Settings,Orders,ຄໍາສັ່ງ
-DocType: Employee Leave Approver,Leave Approver,ອອກຈາກອະນຸມັດ
+DocType: Department,Leave Approver,ອອກຈາກອະນຸມັດ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ກະລຸນາເລືອກ batch ເປັນ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,ຊື່ການປະເມີນຜົນ Group
@@ -3641,7 +3663,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL ສໍາລັບຜູ້ຮັບບໍລິ
 DocType: Asset Category Account,Accumulated Depreciation Account,ບັນຊີຄ່າເສື່ອມລາຄາສະສົມ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ອີເມວນີ້ຈະຖືກສ້າງຂຶ້ນໂດຍອັດຕະໂນມັດ
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
 DocType: Program Enrollment,Boarding Student,ນັກສຶກສາຄະນະ
 DocType: Asset,Expected Value After Useful Life,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດ
@@ -3666,22 +3687,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},ຜູ້ເຂົ້າຮ່ວມບັນທຶກ {0} ມີຢູ່ກັບນັກສຶກສາ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},ກະສານອ້າງອີງ # {0} ວັນ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ຄ່າເສື່ອມລາຄາຕັດອອກເນື່ອງຈາກການຈໍາຫນ່າຍສິນຊັບ
-DocType: Member,Member,ສະຫມາຊິກ
+DocType: Loan,Member,ສະຫມາຊິກ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ການຄຸ້ມຄອງທີ່ຢູ່
 DocType: Work Order Item,Work Order Item,Work Order Item
 DocType: Pricing Rule,Item Code,ລະຫັດສິນຄ້າ
 DocType: Serial No,Warranty / AMC Details,ການຮັບປະກັນ / ລາຍລະອຽດ AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,ຜູ້ຈັດການກະເສດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
 DocType: Supplier Scorecard Period,Variables,ຕົວແປ
 DocType: Employee Internal Work History,Employee Internal Work History,ພະນັກງານປະຫວັດການເຮັດພາຍໃນປະເທດ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),ປິດ (Dr)
 DocType: Cheque Print Template,Cheque Size,ຂະຫນາດກະແສລາຍວັນ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} ບໍ່ໄດ້ຢູ່ໃນຫຸ້ນ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} ບໍ່ໄດ້ຢູ່ໃນຫຸ້ນ
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ແມ່ແບບພາສີສໍາລັບການຂາຍທຸລະກໍາ.
 DocType: Sales Invoice,Write Off Outstanding Amount,ຂຽນ Off ທີ່ພົ້ນເດັ່ນຈໍານວນ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},ບັນຊີ {0} ບໍ່ກົງກັບກັບບໍລິສັດ {1}
@@ -3690,7 +3711,6 @@
 DocType: Stock Settings,Default Stock UOM,ມາດຕະຖານ Stock UOM
 DocType: Asset,Number of Depreciations Booked,ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qty Total
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},ກັບເງິນກູ້ພະນັກງານ: {0}
 DocType: Landed Cost Item,Receipt Document,ເອກະສານຮັບ
 DocType: Employee Education,School/University,ໂຮງຮຽນ / ວິທະຍາໄລ
 DocType: Payment Request,Reference Details,ລາຍລະອຽດກະສານອ້າງອີງ
@@ -3701,7 +3721,7 @@
 DocType: Asset,Double Declining Balance,ດຸນຫລຸດ Double
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ປິດເພື່ອບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ. unclosed ເພື່ອຍົກເລີກການ.
 DocType: Student Guardian,Father,ພຣະບິດາ
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
 DocType: Bank Reconciliation,Bank Reconciliation,ທະນາຄານສ້າງຄວາມປອງດອງ
 DocType: Attendance,On Leave,ໃບ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ໄດ້ຮັບການປັບປຸງ
@@ -3715,10 +3735,10 @@
 DocType: Lead,Lower Income,ລາຍໄດ້ຕ່ໍາ
 DocType: Restaurant Order Entry,Current Order,Order Order ປັດຈຸບັນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍບໍ່ສາມາດຈະດຽວກັນສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ໄປທີ່ Programs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ແຖວ {0} # ຈໍານວນເງິນທີ່ຈັດສັນ {1} ບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຍັງບໍ່ໄດ້ຮັບການຂໍ {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ແຖວ {0} # ຈໍານວນເງິນທີ່ຈັດສັນ {1} ບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຍັງບໍ່ໄດ້ຮັບການຂໍ {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ຈາກວັນທີ່ສະຫມັກ&#39; ຈະຕ້ອງຫລັງຈາກທີ່ໄປວັນ &#39;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
@@ -3741,7 +3761,6 @@
 DocType: Payment Terms Template,Payment Terms,ເງື່ອນໄຂການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,ນາທີ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 DocType: Purchase Invoice,Purchase Taxes and Charges,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ໄປທີ່ສະຫນອງ
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ສະເຫນີລາຄາ {0} ບໍ່ປະເພດ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ບໍາລຸງຮັກສາຕາຕະລາງລາຍການ
 DocType: Sales Order,%  Delivered,% ສົ່ງ
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,ກະລຸນາຕັ້ງອີເມວອີເມວສໍາລັບນັກຮຽນເພື່ອສົ່ງຄໍາຮ້ອງຂໍການຊໍາລະເງິນ
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,ກະລຸນາຕັ້ງອີເມວອີເມວສໍາລັບນັກຮຽນເພື່ອສົ່ງຄໍາຮ້ອງຂໍການຊໍາລະເງິນ
 DocType: Patient,Medical History,Medical History
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ທະນາຄານບັນຊີເບີກເກີນບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ທະນາຄານບັນຊີເບີກເກີນບັນຊີ
 DocType: Patient,Patient ID,Patient ID
 DocType: Physician Schedule,Schedule Name,ຊື່ຕາຕະລາງ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,ເຮັດໃຫ້ຄວາມຜິດພາດພຽງເງິນເດືອນ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,ຕື່ມການສະຫນອງທັງຫມົດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,ຕື່ມການສະຫນອງທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ແຖວ # {0}: ຈັດສັນຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານທີ່ຍັງຄ້າງຄາ.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Browse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,ກູ້ໄພ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,ກູ້ໄພ
 DocType: Purchase Invoice,Edit Posting Date and Time,ແກ້ໄຂວັນທີ່ປະກາດແລະເວລາ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີທີ່ກ່ຽວຂ້ອງກັບຄ່າເສື່ອມລາຄາໃນສິນຊັບປະເພດ {0} ຫລືບໍລິສັດ {1}
 DocType: Lab Test Groups,Normal Range,Normal Range
 DocType: Academic Term,Academic Year,ປີທາງວິຊາການ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Available Selling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Equity Balance ເປີດ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Equity Balance ເປີດ
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ສ່ວນທີ່ຍັງເຫຼືອ
 DocType: Appraisal,Appraisal,ການປະເມີນຜົນ
+DocType: Loan,Loan Account,ບັນຊີເງິນກູ້
 DocType: Purchase Invoice,GST Details,ລາຍລະອຽດ GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ອີເມລ໌ສົ່ງໃຫ້ຜູ້ຂາຍ {0}
 DocType: Item,Default Sales Unit of Measure,ຫນ່ວຍຍອດຂາຍມາດຕະຖານມາດຕະຖານ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,ປີການສຶກສາ:
+DocType: Subscription,Past Due Date,ວັນທີທີ່ຜ່ານມາ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ບໍ່ອະນຸຍາດໃຫ້ຕັ້ງຄ່າລາຍການທາງເລືອກສໍາລັບລາຍການ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ວັນທີ່ຖືກຊ້ໍາ
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,Appointment ຜູ້ປ່ວຍ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ການອະນຸມັດບົດບາດບໍ່ສາມາດເຊັ່ນດຽວກັນກັບພາລະບົດບາດລະບຽບການກ່ຽວຂ້ອງກັບ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ຍົກເລີກການ Email ນີ້ Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,ໄດ້ຮັບສະຫນອງໂດຍ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,ໄດ້ຮັບສະຫນອງໂດຍ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ບໍ່ພົບສໍາລັບລາຍການ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,ໄປທີ່ສະຫນາມ
 DocType: Accounts Settings,Show Inclusive Tax In Print,ສະແດງພາສີລວມໃນການພິມ
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ຂໍ້ຄວາມທີ່ສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການກໍານົດໄວ້ເປັນຊີແຍກປະເພດ
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ອັດຕາການທີ່ສະເຫນີລາຄາສະກຸນເງິນຈະປ່ຽນເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ຈໍານວນສຸດທິ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Physician,Physician Schedules,Physician Schedules
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,ຈໍານວນເງິນລ່ວງຫນ້າທັງຫມົດບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຖືກລົງໂທດທັງຫມົດ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,ຈໍານວນເງິນລ່ວງຫນ້າທັງຫມົດບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຖືກລົງໂທດທັງຫມົດ
 DocType: Salary Slip,Hour Rate,ອັດຕາຊົ່ວໂມງ
 DocType: Stock Settings,Item Naming By,ລາຍການຕັ້ງຊື່ໂດຍ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ອີກປະການຫນຶ່ງ Entry ໄລຍະເວລາປິດ {0} ໄດ້ຮັບການເຮັດໃຫ້ຫຼັງຈາກ {1}
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ປັບປຸງການເຮັດທຸລະຫຸ້ນອາຍຸຫຼາຍກວ່າ {0}
 DocType: BOM,Inspection Required,ການກວດກາຕ້ອງ
 DocType: Purchase Invoice Item,PR Detail,ຂໍ້ມູນ PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,ໃສ່ຈໍານວນການຮັບປະກັນທະນາຄານກ່ອນສົ່ງ.
 DocType: Driving License Category,Class,Class
 DocType: Sales Order,Fully Billed,ບິນໄດ້ຢ່າງເຕັມສ່ວນ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ຄໍາສັ່ງການເຮັດວຽກບໍ່ສາມາດຍົກຂຶ້ນມາຕໍ່ກັບແບບເອກະສານ
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ນ້ໍາລວມທັງຫມົດຂອງຊຸດການ. ປົກກະຕິແລ້ວນ້ໍາຫນັກສຸດທິ + ຫຸ້ມຫໍ່ນ້ໍາອຸປະກອນການ. (ສໍາລັບການພິມ)
 DocType: Assessment Plan,Program,ໂຄງການ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ຜູ້ໃຊ້ທີ່ມີພາລະບົດບາດນີ້ໄດ້ຖືກອະນຸຍາດໃຫ້ສ້າງຕັ້ງບັນຊີ frozen ແລະສ້າງ / ປັບປຸງແກ້ໄຂການອອກສຽງການບັນຊີກັບບັນຊີ frozen
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 DocType: Serial No,Is Cancelled,ແມ່ນຖືກຍົກເລີກ
 DocType: Student Group,Group Based On,Group Based On
 DocType: Student Group,Group Based On,Group Based On
@@ -3848,9 +3870,10 @@
 DocType: Cheque Print Template,Cheque Height,ກະແສລາຍວັນສູງ
 DocType: Supplier,Supplier Details,ລາຍລະອຽດສະຫນອງ
 DocType: Setup Progress,Setup Progress,setup ຄວາມຄືບຫນ້າ
+DocType: Expense Claim,Approval Status,ສະຖານະການອະນຸມັດ
 DocType: Hub Settings,Publish Items to Hub,ເຜີຍແຜ່ການກັບ Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ຈາກມູນຄ່າຕ້ອງບໍ່ເກີນມູນຄ່າໃນການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,ການໂອນ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,ການໂອນ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ກວດເບິ່ງທັງຫມົດ
 ,Issued Items Against Work Order,ບັນດາລາຍການທີ່ໄດ້ຮັບຈາກວຽກງານ
 DocType: Vehicle Log,Invoice Ref,Ref ໃບເກັບເງິນ
@@ -3881,12 +3904,11 @@
 DocType: Customs Tariff Number,Tariff Number,ຈໍານວນພາສີ
 DocType: Work Order Item,Available Qty at WIP Warehouse,ສາມາດໃຊ້ໄດ້ຈໍານວນທີ່ Warehouse WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ຄາດ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ຫມາຍເຫດ: ລະບົບຈະບໍ່ກວດສອບໃນໄລຍະການຈັດສົ່ງແລະໃນໄລຍະການຈອງສໍາລັບລາຍການ {0} ກັບປະລິມານຫຼືຈໍານວນເງິນທັງຫມົດ 0
 DocType: Notification Control,Quotation Message,ວົງຢືມຂໍ້ຄວາມ
-DocType: Employee Loan,Employee Loan Application,ຄໍາຮ້ອງສະຫມັກເງິນກູ້ພະນັກງານ
 DocType: Issue,Opening Date,ວັນທີ່ສະຫມັກເປີດ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,ກະລຸນາຊ່ວຍຄົນເຈັບກ່ອນ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,ກະລຸນາຊ່ວຍຄົນເຈັບກ່ອນ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,ຜູ້ເຂົ້າຮ່ວມໄດ້ຮັບການຫມາຍຢ່າງສໍາເລັດຜົນ.
 DocType: Program Enrollment,Public Transport,ການຂົນສົ່ງສາທາລະນະ
 DocType: Soil Texture,Silt Composition (%),ອົງປະກອບຂອງແກນ (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),ການດຸ່ນດ່ຽງຂອງສິນຄ້າ (ງ່າຍດາຍ)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໂດຍຜູ້ສະຫນອງ.
 DocType: POS Profile,Write Off Account,ຂຽນ Off ບັນຊີ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ເດບິດຫມາຍເຫດ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ເດບິດຫມາຍເຫດ Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ຈໍານວນສ່ວນລົດ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ກັບຄືນຕໍ່ຊື້ Invoice
 DocType: Item,Warranty Period (in days),ໄລຍະເວລາຮັບປະກັນ (ໃນວັນເວລາ)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
 DocType: Sales Invoice Item,Delivered Qty,ສົ່ງຈໍານວນ
 DocType: Assessment Plan,Assessment Plan,ແຜນການປະເມີນຜົນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ລູກຄ້າ {0} ຖືກສ້າງຂຶ້ນ.
 DocType: Stock Settings,Limit Percent,ເປີເຊັນຂອບເຂດຈໍາກັດ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ໃນປະຈຸບັນບໍ່ມີຫຼັກຊັບໃນຄັງສິນຄ້າໃດໆ
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Entry Stock
 DocType: Payment Entry,Payment References,ເອກະສານການຊໍາລະເງິນ
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ຈໍານວນໄລຍະເວລາສໍາລັບພາກສະຫນາມໄລຍະເວລາເຊັ່ນວ່າໄລຍະເວລາແມ່ນ &#39;ວັນ&#39; ແລະຈໍານວນໄລຍະເວລາໃບບິນແມ່ນ 3, ໃບແຈ້ງຫນີ້ຈະຖືກຜະລິດທຸກໆ 3 ມື້"
 DocType: Vehicle,Insurance Details,ລາຍລະອຽດການປະກັນໄພ
 DocType: Account,Payable,ຈ່າຍ
 DocType: Share Balance,Share Type,ແບ່ງປັນປະເພດ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ລູກຫນີ້ ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ລູກຄ້າໃຫມ່
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ກໍາໄຮ% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ກໍາໄຮ% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,ປ່ຽນ POS Profile
 DocType: Bank Reconciliation Detail,Clearance Date,ວັນເກັບກູ້ລະເບີດ
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,ທີ່ຢູ່ Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,ພັກເປັນການບັງຄັບ
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},ບັນດາແຖວທີ່ມີວັນທີ່ຍ້ອນກັບໃນແຖວອື່ນພົບ: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},ບັນດາແຖວທີ່ມີວັນທີ່ຍ້ອນກັບໃນແຖວອື່ນພົບ: {list}
 DocType: Topic,Topic Name,ຊື່ກະທູ້
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,ກະລຸນາຕັ້ງຄ່າແມ່ແບບມາດຕະຖານໃນການແຈ້ງໃບອະນຸຍາດໃນການຕັ້ງຄ່າ HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,atleast ຫນຶ່ງຂອງການຂາຍຫຼືຊື້ຕ້ອງໄດ້ຮັບການຄັດເລືອກ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ເລືອກເອົາພະນັກງານເພື່ອໃຫ້ພະນັກງານລ່ວງຫນ້າ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ເລືອກເອົາພະນັກງານເພື່ອໃຫ້ພະນັກງານລ່ວງຫນ້າ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,ກະລຸນາເລືອກວັນທີ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,ເລືອກລັກສະນະຂອງທຸລະກິດຂອງທ່ານ.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,ວັນທີ່ສະຫມັກການຕິດຕັ້ງ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,ໃບແຈ້ງຍອດຂາຍສ້າງ {0}
 DocType: Employee,Confirmation Date,ວັນທີ່ສະຫມັກການຢັ້ງຢືນ
 DocType: C-Form,Total Invoiced Amount,ຈໍານວນອະນຸທັງຫມົດ
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,ຄ່າເສື່ອມລາຄາສະສົມ
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ຢືນຊື່
 DocType: Stock Entry,Customer or Supplier Details,ລູກຄ້າຫຼືຜູ້ຜະລິດລາຍລະອຽດ
-DocType: Employee Loan Application,Required by Date,ທີ່ກໍານົດໄວ້ by Date
+DocType: Loan Application,Required by Date,ທີ່ກໍານົດໄວ້ by Date
 DocType: Lead,Lead Owner,ເຈົ້າຂອງເປັນຜູ້ນໍາພາ
 DocType: Production Plan,Sales Orders Detail,ລາຍະລະອຽດການຂາຍຄໍາສັ່ງ
 DocType: Bin,Requested Quantity,ຈໍານວນການຮ້ອງຂໍ
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ຈ່າຍລວມທັງຫມົດ - ການຫັກທັງຫມົດ - ການຊໍາລະຫນີ້
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM ປັດຈຸບັນແລະໃຫມ່ BOM ບໍ່ສາມາດຈະເປັນຄືກັນ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ເງິນເດືອນ ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Multiple Variants
 DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ສົ່ງ
+DocType: Subscription,Trial Period Start Date,ວັນເລີ່ມຕົ້ນການທົດລອງ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ລາຍການ {0}: ຄໍາສັ່ງຈໍານວນ {1} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຈໍານວນຄໍາສັ່ງຂັ້ນຕ່ໍາ {2} (ລະບຸໄວ້ໃນລາຍການ).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ເປີເຊັນຂອງການແຜ່ກະຈາຍປະຈໍາເດືອນ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,ກະລຸນາເຂົ້າສູ່ລະບົບເປັນຜູ້ໃຊ້ອື່ນ.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,ຜູ້ປົກຄອງນັກສຶກສາ
 DocType: Member,Member Name,ຊື່ສະມາຊິກ
 DocType: Stock Settings,Use Naming Series,ໃຊ້ນາມສະກຸນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
 DocType: POS Profile,Update Stock,ຫລັກຊັບ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ໃນການຈອງ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ທີ່ແຕກຕ່າງກັນສໍາລັບລາຍການທີ່ຈະນໍາໄປສູ່ການທີ່ບໍ່ຖືກຕ້ອງ (Total) ຄ່ານ້ໍາຫນັກສຸດທິ. ໃຫ້ແນ່ໃຈວ່ານ້ໍາຫນັກສຸດທິຂອງແຕ່ລະລາຍການແມ່ນຢູ່ໃນ UOM ດຽວກັນ.
 DocType: Membership,Payment Details,ລາຍລະອຽດການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ອັດຕາ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM ອັດຕາ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","ບໍ່ສາມາດຍົກເລີກການຍົກເລີກການສັ່ງວຽກໄດ້, ຍົກເລີກທໍາອິດໃຫ້ຍົກເລີກ"
 DocType: Asset,Journal Entry for Scrap,ວາລະສານການອອກສຽງ Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ກະລຸນາດຶງລາຍການຈາກການສົ່ງເງິນ
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,ຫນ່ວຍງານທີ່ດິນ
 ,Purchase Analytics,ການວິເຄາະການຊື້
 DocType: Sales Invoice Item,Delivery Note Item,ການສົ່ງເງິນສິນຄ້າ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,ໃບເກັບເງິນປັດຈຸບັນ {0} ແມ່ນຫາຍໄປ
 DocType: Asset Maintenance Log,Task,ວຽກງານ
 DocType: Purchase Taxes and Charges,Reference Row #,ກະສານອ້າງອີງ Row ຮຸ່ນ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ຈໍານວນ Batch ເປັນການບັງຄັບສໍາລັບລາຍການ {0}
@@ -4063,7 +4089,7 @@
 DocType: Company,Exchange Gain / Loss Account,ແລກປ່ຽນກໍາໄຮ / ບັນຊີການສູນເສຍ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ພະນັກງານແລະຜູ້ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ຈຸດປະສົງຕ້ອງເປັນຫນຶ່ງໃນ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ຕື່ມຂໍ້ມູນໃສ່ໃນແບບຟອມແລະຊ່ວຍປະຢັດມັນ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ຕື່ມຂໍ້ມູນໃສ່ໃນແບບຟອມແລະຊ່ວຍປະຢັດມັນ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum ຊຸມຊົນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,ຈໍານວນທີ່ແທ້ຈິງໃນຫຸ້ນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,ຈໍານວນທີ່ແທ້ຈິງໃນຫຸ້ນ
@@ -4078,7 +4104,7 @@
 DocType: Lab Test Template,Standard Selling Rate,ມາດຕະຖານອັດຕາການຂາຍ
 DocType: Account,Rate at which this tax is applied,ອັດຕາການທີ່ພາສີນີ້ແມ່ນໄດ້ນໍາໃຊ້
 DocType: Cash Flow Mapper,Section Name,ຊື່ພາກສ່ວນ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,ລໍາດັບຈໍານວນ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,ລໍາດັບຈໍານວນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
 DocType: Company,Stock Adjustment Account,ບັນຊີການປັບ Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ຂຽນ Off
@@ -4089,9 +4115,9 @@
 DocType: Task,depends_on,ຂຶ້ນກັບ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ຄິວສໍາລັບການອັບເດດລາຄາຫລ້າສຸດໃນທຸກບັນຊີລາຍການຂອງວັດສະດຸ. ມັນອາດຈະໃຊ້ເວລາສອງສາມນາທີ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ຊື່ຂອງບັນຊີໃຫມ່. ຫມາຍເຫດ: ກະລຸນາຢ່າສ້າງບັນຊີສໍາລັບລູກຄ້າແລະຜູ້ສະຫນອງ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ປະເທດແມ່ແບບທີ່ຢູ່ໃນຕອນຕົ້ນສະຫລາດ
 DocType: Water Analysis,Appearance,ຮູບລັກສະນະ
+DocType: HR Settings,Leave Status Notification Template,ອອກຈາກແບບຟອມແຈ້ງການສະຖານະພາບ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,ລາຄາເສລີ່ຍ ລາຄາລາຄາການຊື້ລາຄາ
 DocType: Sales Order Item,Supplier delivers to Customer,ຜູ້ຈັດຈໍາຫນ່າຍໃຫ້ກັບລູກຄ້າ
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,ຂໍ້ມູນຂອງສະມາຊິກ.
@@ -4114,7 +4140,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,ບໍ່ອະນຸຍາດ. ກະລຸນາປິດແບບແມ່ແບບການທົດສອບ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ອັດຕາສ່ວນການຈັດສັນຄວນຈະເທົ່າກັບ 100%
 DocType: Crop Cycle,Linked Land Unit,Linked Land Unit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 DocType: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
@@ -4130,7 +4156,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ໄປທີ່ຜູ້ໃຊ້
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ + ຂຽນ Off ຈໍານວນເງິນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ບໍ່ແມ່ນຈໍານວນ Batch ຖືກຕ້ອງສໍາລັບສິນຄ້າ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},ຫມາຍເຫດ: ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},ຫມາຍເຫດ: ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN ບໍ່ຖືກຕ້ອງຫຼືກະລຸນາໃສ່ສະພາແຫ່ງຊາດສໍາລັບບຸກຄົນທົ່ວໄປ
 DocType: Training Event,Seminar,ການສໍາມະນາ
 DocType: Program Enrollment Fee,Program Enrollment Fee,ຄ່າທໍານຽມການລົງທະບຽນໂຄງການ
@@ -4146,14 +4172,14 @@
 DocType: Hub Settings,Publish Availability,ເຜີຍແຜ່ມີຈໍາຫນ່າຍ
 DocType: Company,Create Chart Of Accounts Based On,ສ້າງຕາຕະລາງຂອງການບັນຊີພື້ນຖານກ່ຽວກັບ
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ບໍ່ສາມາດປ່ຽນມັນໄປເປັນກຸ່ມ. ວຽກງານຂອງເດັກຢູ່.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ນັກສຶກສາ {0} ມີຕໍ່ສະຫມັກນັກສຶກສາ {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ການດັດປັບຮອບ (ເງິນສະກຸນຂອງບໍລິສັດ)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,ຕອນບ່າຍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ກໍານົດເປັນທຸກ
 DocType: Cheque Print Template,Scanned Cheque,ສະແກນກະແສລາຍວັນ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ສົ່ງອີເມວອັດຕະໂນມັດທີ່ຈະຕິດຕໍ່ພົວພັນກ່ຽວກັບການໂອນສົ່ງ.
@@ -4169,7 +4195,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,ໂຄງການ {0} ມີຢູ່ແລ້ວ
 DocType: Medical Department,Nursing User,ຜູ້ໃຊ້ພະຍາບານ
 DocType: Plant Analysis,Plant Analysis Criterias,Plant Criterias Criteria
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ຄວາມຮັບຜິດຊອບ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} ບໍ່ແມ່ນຂອງ {B} {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ຄວາມຮັບຜິດຊອບ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ໄລຍະເວລາຕັ້ງແຕ່ວັນທີ່ຂອງວົງຢືມນີ້ໄດ້ສິ້ນສຸດລົງ.
 DocType: Expense Claim Account,Expense Claim Account,ບັນຊີຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ
 DocType: Accounts Settings,Allow Stale Exchange Rates,ອະນຸຍາດໃຫ້ອັດຕາແລກປ່ຽນຂອງ Stale
@@ -4191,11 +4218,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Make Variants
 DocType: Item,Default BOM,ມາດຕະຖານ BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),ຈໍານວນເງິນທີ່ຖືກຊໍາລະທັງຫມົດ (ຜ່ານໃບແຈ້ງຍອດຂາຍ)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ເດບິດຫມາຍເຫດຈໍານວນ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ເດບິດຫມາຍເຫດຈໍານວນ
 DocType: Project Update,Not Updated,ບໍ່ໄດ້ປັບປຸງ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","ມີຄວາມບໍ່ສອດຄ່ອງລະຫວ່າງອັດຕາ, ບໍ່ມີຮຸ້ນແລະຈໍານວນເງິນທີ່ຖືກຄິດໄລ່"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,ກະລຸນາປະເພດຊື່ບໍລິສັດຢືນຢັນ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,ທັງຫມົດ Amt ເດັ່ນ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,ທັງຫມົດ Amt ເດັ່ນ
 DocType: Journal Entry,Printing Settings,ການຕັ້ງຄ່າການພິມ
 DocType: Employee Advance,Advance Account,Advance Account
 DocType: Job Offer,Job Offer Terms,Job Offer Terms
@@ -4204,7 +4231,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ຍານຍົນ
 DocType: Vehicle,Insurance Company,ບໍລິສັດປະກັນໄພ
 DocType: Asset Category Account,Fixed Asset Account,ບັນຊີຊັບສົມບັດຄົງ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ການປ່ຽນແປງ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ການປ່ຽນແປງ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ຈາກການສົ່ງເງິນ
 DocType: Chapter,Members,ສະມາຊິກ
 DocType: Student,Student Email Address,ທີ່ຢູ່ອີເມວຂອງນັກຮຽນ
@@ -4228,7 +4255,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
 DocType: Stock Entry,From BOM,ຈາກ BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},ການແບ່ງ {0} ຫນ່ວຍຂອງ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},ການແບ່ງ {0} ຫນ່ວຍຂອງ {1}
 DocType: Assessment Code,Assessment Code,ລະຫັດການປະເມີນຜົນ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,ພື້ນຖານ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ເຮັດທຸລະກໍາຫຼັກຊັບກ່ອນ {0} ໄດ້ຖືກ frozen
@@ -4236,25 +4263,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ກະສານອ້າງອີງທີ່ບໍ່ມີແມ່ນການບັງຄັບຖ້າຫາກວ່າທ່ານເຂົ້າໄປວັນກະສານອ້າງອີງ
 DocType: Bank Reconciliation Detail,Payment Document,ເອກະສານການຊໍາລະເງິນ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Error ປະເມີນສູດມາດຕະຖານ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,ວັນທີຂອງການເຂົ້າຮ່ວມຈະຕ້ອງຫຼາຍກ່ວາວັນເກີດ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,ວັນທີຂອງການເຂົ້າຮ່ວມຈະຕ້ອງຫຼາຍກ່ວາວັນເກີດ
+DocType: Subscription,Plans,ແຜນການ
 DocType: Salary Slip,Salary Structure,ໂຄງສ້າງເງິນເດືອນ
 DocType: Account,Bank,ທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ສາຍການບິນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ວັດສະດຸບັນຫາ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ຂໍ້ຜິດພາດເກີດຂື້ນໃນຂະນະທີ່ການສ້າງການລວບລວມ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ວັດສະດຸບັນຫາ
 DocType: Material Request Item,For Warehouse,ສໍາລັບການຄັງສິນຄ້າ
 DocType: Employee,Offer Date,ວັນທີ່ສະຫມັກສະເຫນີ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ການຊື້ຂາຍ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ບໍ່ມີກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
 DocType: Purchase Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນເງິນກູ້
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນເງິນກູ້
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,ກະລຸນາໃສ່ລາຍລະອຽດ Maintaince ທໍາອິດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,ແຖວ # {0}: ວັນທີຄາດວ່າສົ່ງບໍ່ສາມາດຈະກ່ອນທີ່ຈະສັ່ງຊື້ວັນທີ່
 DocType: Purchase Invoice,Print Language,ພິມພາສາ
 DocType: Salary Slip,Total Working Hours,ທັງຫມົດຊົ່ວໂມງເຮັດວຽກ
 DocType: Sales Invoice,Customer PO Details,ລາຍລະອຽດຂອງລູກຄ້າ
-DocType: Subscription,Next Schedule Date,Next Schedule Date
 DocType: Stock Entry,Including items for sub assemblies,ລວມທັງລາຍການສໍາລັບການສະພາແຫ່ງຍ່ອຍ
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ບັນຊີເປີດຊົ່ວຄາວ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
@@ -4283,11 +4309,11 @@
 DocType: Issue,Opening Time,ທີ່ໃຊ້ເວລາເປີດ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,ຈາກແລະໄປວັນທີ່ຄຸນຕ້ອງ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,ຫຼັກຊັບແລະການແລກປ່ຽນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ໄດ້ລະບຸໄວ້
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
 DocType: Hotel Settings,Default Customer,Customer Default
 DocType: Assessment Plan,Supervisor Name,ຊື່ Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ຢ່າຢືນຢັນວ່າການນັດຫມາຍຖືກສ້າງຂື້ນໃນມື້ດຽວກັນ
@@ -4312,16 +4338,16 @@
 DocType: Journal Entry Account,Employee Advance,Employee Advance
 DocType: Payroll Entry,Payroll Frequency,Payroll Frequency
 DocType: Lab Test Template,Sensitivity,ຄວາມອ່ອນໄຫວ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,ວັດຖຸດິບ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,ວັດຖຸດິບ
 DocType: Leave Application,Follow via Email,ປະຕິບັດຕາມໂດຍຜ່ານ Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,ພືດແລະເຄື່ອງຈັກ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,ພືດແລະເຄື່ອງຈັກ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ການຕັ້ງຄ່າເຮັດ Summary ປະຈໍາວັນ
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,ກະລຸນາໃສ່ Reqd ຕາມວັນທີ
 DocType: Payment Entry,Internal Transfer,ພາຍໃນການຖ່າຍໂອນ
 DocType: Asset Maintenance,Maintenance Tasks,ວຽກງານບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ທັງຈໍານວນເປົ້າຫມາຍຫຼືຈໍານວນເປົ້າຫມາຍແມ່ນການບັງຄັບ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
 DocType: Leave Control Panel,Carry Forward,ປະຕິບັດໄປຂ້າງຫນ້າ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ
@@ -4329,14 +4355,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,ກວດພົບພະຍາດ
 ,Produced,ການຜະລິດ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ວັນທີເລີ່ມຕົ້ນການຊໍາລະເງິນບໍ່ສາມາດເປັນວັນທີທີ່ໄດ້ຮັບເງິນປັນຜົນ.
 DocType: Item,Item Code for Suppliers,ລະຫັດສິນຄ້າສໍາລັບການສະຫນອງ
 DocType: Issue,Raised By (Email),ຍົກຂຶ້ນມາໂດຍ (Email)
 DocType: Training Event,Trainer Name,ຊື່ Trainer
 DocType: Mode of Payment,General,ໂດຍທົ່ວໄປ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ການສື່ສານທີ່ຜ່ານມາ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ການສື່ສານທີ່ຜ່ານມາ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;ການປະເມີນຄ່າແລະທັງຫມົດ&#39;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos ຕ້ອງການສໍາລັບລາຍການຕໍ່ເນື່ອງ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;ການປະເມີນຄ່າແລະທັງຫມົດ&#39;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos ຕ້ອງການສໍາລັບລາຍການຕໍ່ເນື່ອງ {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ການຊໍາລະເງິນກົງກັບໃບແຈ້ງຫນີ້
 DocType: Journal Entry,Bank Entry,ທະນາຄານເຂົ້າ
 DocType: Authorization Rule,Applicable To (Designation),ສາມາດນໍາໃຊ້ການ (ການອອກແບບ)
@@ -4350,7 +4377,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,ເຮັດໃຫ້ສາມາດ / ປິດການໃຊ້ງານສະກຸນເງິນ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} ໃນເວລາເຄິ່ງວັນພັກສຸດ {1}
 DocType: Production Plan,Get Material Request,ໄດ້ຮັບການວັດສະດຸຂໍ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ຄ່າໃຊ້ຈ່າຍການໄປສະນີ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ຄ່າໃຊ້ຈ່າຍການໄປສະນີ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ທັງຫມົດ (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,ຄວາມບັນເທີງແລະສັນທະນາການ
 ,Item Variant Details,Item Variant Details
@@ -4361,9 +4388,9 @@
 DocType: Drug Prescription,Hour,ຊົ່ວໂມງ
 DocType: Restaurant Order Entry,Last Sales Invoice,ໃບຄໍາສັ່ງຊື້ຂາຍສຸດທ້າຍ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},ກະລຸນາເລືອກ Qty ຕໍ່ກັບລາຍການ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ໃຫມ່ບໍ່ມີ Serial ບໍ່ສາມາດມີ Warehouse. Warehouse ຕ້ອງໄດ້ຮັບການກໍານົດໂດຍ Stock Entry ຫລືຮັບຊື້
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ໃຫມ່ບໍ່ມີ Serial ບໍ່ສາມາດມີ Warehouse. Warehouse ຕ້ອງໄດ້ຮັບການກໍານົດໂດຍ Stock Entry ຫລືຮັບຊື້
 DocType: Lead,Lead Type,ປະເພດນໍາ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ລາຍການທັງຫມົດເຫຼົ່ານີ້ໄດ້ຖືກອະນຸແລ້ວ
 DocType: Company,Monthly Sales Target,ລາຍເດືອນເປົ້າຫມາຍການຂາຍ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},ສາມາດໄດ້ຮັບການອະນຸມັດໂດຍ {0}
@@ -4371,7 +4398,7 @@
 DocType: Item,Default Material Request Type,ມາດຕະຖານການວັດສະດຸປະເພດຂໍ
 DocType: Supplier Scorecard,Evaluation Period,ການປະເມີນຜົນໄລຍະເວລາ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,ບໍ່ຮູ້ຈັກ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,ຄໍາສັ່ງເຮັດວຽກບໍ່ໄດ້ສ້າງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,ຄໍາສັ່ງເຮັດວຽກບໍ່ໄດ້ສ້າງ
 DocType: Shipping Rule,Shipping Rule Conditions,ເງື່ອນໄຂການຂົນສົ່ງ
 DocType: Purchase Invoice,Export Type,ປະເພດການສົ່ງອອກ
 DocType: Salary Slip Loan,Salary Slip Loan,Salary Slip Loan
@@ -4387,8 +4414,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ເປີດບັນຊີເງິນຝາກປະຢັດ
 DocType: Education Settings,Education Manager,ຜູ້ຈັດການດ້ານການສຶກສາ
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,ຄວາມຍາວຂັ້ນຕ່ໍາສຸດລະຫວ່າງແຕ່ລະໂຮງງານໃນພາກສະຫນາມເພື່ອການເຕີບໂຕທີ່ດີທີ່ສຸດ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched ລາຍ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ແທນທີ່ຈະໃຊ້ສະຕັອກ Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched ລາຍ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ແທນທີ່ຈະໃຊ້ສະຕັອກ Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched ລາຍ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ແທນທີ່ຈະໃຊ້ສະຕັອກ Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched ລາຍ {0} ບໍ່ສາມາດໄດ້ຮັບການປັບປຸງການນໍາໃຊ້ Stock ສ້າງຄວາມປອງດອງ, ແທນທີ່ຈະໃຊ້ສະຕັອກ Entry"
 DocType: Quality Inspection,Report Date,ບົດລາຍງານວັນທີ່
 DocType: Student,Middle Name,ຊື່ກາງ
 DocType: C-Form,Invoices,ໃບແຈ້ງການ
@@ -4421,20 +4448,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ຮັບ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ຮັບ
 ,Sales Register,ລົງທະບຽນການຂາຍ
 DocType: Daily Work Summary Group,Send Emails At,ສົ່ງອີເມວໃນ
 DocType: Quotation,Quotation Lost Reason,ວົງຢືມລືມເຫດຜົນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ມີບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂແມ່ນ.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ໃບອະນຸຍາດຄ່າໃຊ້ຈ່າຍໃນການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","ເພີ່ມຜູ້ຊົມໃຊ້ທີ່ຈະອົງການຈັດຕັ້ງຂອງທ່ານ, ນອກຈາກຕົວທ່ານເອງ."
 DocType: Customer Group,Customer Group Name,ຊື່ກຸ່ມລູກຄ້າ
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,No ລູກຄ້າທັນ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,ບໍ່ມີການຮ້ອງຂໍອຸປະກອນການສ້າງ
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ໃບອະນຸຍາດ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ກະລຸນາເລືອກປະຕິບັດຕໍ່ຖ້າຫາກວ່າທ່ານຍັງຕ້ອງການທີ່ຈະປະກອບມີຍອດເຫຼືອເດືອນກ່ອນປີງົບປະມານຂອງໃບປີງົບປະມານນີ້
@@ -4457,11 +4485,12 @@
 DocType: Vehicle,Chassis No,ແຊດຊີ
 DocType: Payment Request,Initiated,ການລິເລີ່ມ
 DocType: Production Plan Item,Planned Start Date,ການວາງແຜນວັນທີ່
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,ກະລຸນາເລືອກ BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,ກະລຸນາເລືອກ BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ໄດ້ຮັບສິນເຊື່ອ ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
+DocType: Bank Guarantee,Clauses and Conditions,ເງື່ອນໄຂແລະເງື່ອນໄຂ
 DocType: Serial No,Creation Document Type,ການສ້າງປະເພດເອກະສານ
 DocType: Project Task,View Timesheet,ເບິ່ງ Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ວັນສິ້ນສຸດຕ້ອງຫຼາຍກວ່າວັນທີເລີ່ມຕົ້ນ
 DocType: Leave Type,Is Encash,ແມ່ນ Encash
 DocType: Leave Allocation,New Leaves Allocated,ໃບໃຫມ່ຈັດສັນ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ຂໍ້ມູນໂຄງການທີ່ສະຫລາດບໍ່ສາມາດໃຊ້ສໍາລັບການສະເຫນີລາຄາ
@@ -4475,9 +4504,10 @@
 DocType: Patient,Alcohol Current Use,Alcohol Current Use
 DocType: Student Admission Program,Student Admission Program,Student Admission Program
 DocType: Payment Entry,Account Paid To,ບັນຊີເງິນໃນການ
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternative Item Name
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ສິນຄ້າພໍ່ແມ່ {0} ບໍ່ຕ້ອງເປັນສິນຄ້າພ້ອມສົ່ງ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ບໍ່ສາມາດຍື່ນສະຫລຸບໃດໆ <br> \ ເຫດຜົນທີ່ເປັນໄປໄດ້: <br> \ 1 ຄ່າໃຊ້ຈ່າຍສຸດທິແມ່ນຫນ້ອຍກວ່າ 0. <br> \ 2 ທີ່ຢູ່ອີເມວຂອງບໍລິສັດທີ່ລະບຸໄວ້ໃນເຈົ້າຂອງພະນັກງານບໍ່ຖືກຕ້ອງ. <br>
@@ -4487,7 +4517,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ງົບປະມານສໍາລັບບັນຊີ {1} ກັບ {2} {3} ເປັນ {4}. ມັນຈະຫຼາຍກວ່າ {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ອອກຈໍານວນ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ແລະ unchcked Disabled ໃນ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series ເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,ການບໍລິການທາງດ້ານການເງິນ
 DocType: Student Sibling,Student ID,ID ນັກສຶກສາ
@@ -4499,14 +4528,16 @@
 DocType: Complaint,Complaint,ຄໍາຮ້ອງທຸກ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ເຮັດໃຫ້ການຊໍາລະເງິນເຂົ້າ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,ທຸກໆພະແນກ
 DocType: Patient,Alcohol Past Use,Alcohol Past Use
 DocType: Fertilizer Content,Fertilizer Content,ເນື້ອຫາປຸ໋ຍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematic / Stuck
 DocType: Tax Rule,Billing State,State Billing
 DocType: Share Transfer,Transfer,ການຖ່າຍໂອນ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ຕ້ອງໄດ້ຍົກເລີກການເຮັດວຽກ {0} ກ່ອນທີ່ຈະຍົກເລີກຄໍາສັ່ງຂາຍນີ້
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
 DocType: Authorization Rule,Applicable To (Employee),ສາມາດນໍາໃຊ້ການ (ພະນັກງານ)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
@@ -4530,10 +4561,11 @@
 DocType: Cheque Print Template,Message to show,ຂໍ້ຄວາມທີ່ຈະສະແດງໃຫ້ເຫັນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,ຂາຍຍ່ອຍ
 DocType: Student Attendance,Absent,ບໍ່
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle ຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle ຜະລິດຕະພັນ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,ບໍ່ສາມາດຊອກຫາຄະແນນເລີ່ມຕົ້ນທີ່ {0}. ທ່ານຕ້ອງການທີ່ຈະມີຄະແນນປະຈໍາຄອບຄຸມ 0 ກັບ 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ຕິດຕໍ່ກັນ {0}: ກະສານອ້າງອີງບໍ່ຖືກຕ້ອງ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ Template
+DocType: Subscription,Current Invoice Start Date,ວັນທີເລີ່ມຕົ້ນໃບແຈ້ງຫນີ້
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ບໍ່ວ່າບັດເດບິດຈໍານວນເປັນສິ່ງຈໍາເປັນສໍາລັບ {2}
 DocType: GL Entry,Remarks,ຂໍ້ສັງເກດ
@@ -4543,11 +4575,13 @@
 DocType: Task,Parent Task,Task Parent
 DocType: Journal Entry,Write Off Based On,ຂຽນ Off ຖານກ່ຽວກັບ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
 DocType: Stock Settings,Show Barcode Field,ສະແດງໃຫ້ເຫັນພາກສະຫນາມ Barcode
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ສົ່ງອີເມວ Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ເງິນເດືອນດໍາເນີນການສໍາລັບການໄລຍະເວລາລະຫວ່າງ {0} ແລະ {1}, ອອກຈາກໄລຍະເວລາຄໍາຮ້ອງສະຫມັກບໍ່ສາມາດຈະຢູ່ລະຫວ່າງລະດັບວັນທີນີ້."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ສົ່ງອີເມວ Supplier
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ເງິນເດືອນດໍາເນີນການສໍາລັບການໄລຍະເວລາລະຫວ່າງ {0} ແລະ {1}, ອອກຈາກໄລຍະເວລາຄໍາຮ້ອງສະຫມັກບໍ່ສາມາດຈະຢູ່ລະຫວ່າງລະດັບວັນທີນີ້."
+DocType: Fiscal Year,Auto Created,ສ້າງໂດຍອັດຕະໂນມັດ
 DocType: Chapter Member,Leave Reason,ອອກຈາກເຫດຜົນ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ໃບແຈ້ງຫນີ້ {0} ບໍ່ມີຢູ່ແລ້ວ
 DocType: Guardian Interest,Guardian Interest,ຜູ້ປົກຄອງທີ່ຫນ້າສົນໃຈ
 DocType: Volunteer,Availability,Availability
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,ຕັ້ງຄ່າຄ່າເລີ່ມຕົ້ນສໍາຫລັບໃບແຈ້ງຫນີ້ POS
@@ -4556,14 +4590,13 @@
 DocType: Timesheet,Employee Detail,ຂໍ້ມູນພະນັກງານ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ລະຫັດອີເມວ Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ລະຫັດອີເມວ Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ມື້ວັນຖັດໄປແລະເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນຈະຕ້ອງເທົ່າທຽມກັນ
 DocType: Lab Prescription,Test Code,Test Code
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ການຕັ້ງຄ່າສໍາລັບຫນ້າທໍາອິດຂອງເວັບໄຊທ໌
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}
 DocType: Job Offer,Awaiting Response,ລັງລໍຖ້າການຕອບໂຕ້
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ຂ້າງເທິງ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ຍອດລວມ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ຍອດລວມ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ກ່າວເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີທີ່ຕ້ອງຈ່າຍ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',ກະລຸນາເລືອກກຸ່ມການປະເມີນຜົນອື່ນທີ່ບໍ່ແມ່ນ &#39;ທັງຫມົດ Assessment Groups&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},ແຖວ {0}: ສູນຕົ້ນທຶນຈໍາເປັນຕ້ອງມີສໍາລັບລາຍການ {1}
@@ -4574,7 +4607,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ການວິເຄາະນ້ໍາ
 DocType: Chapter,Region,ພູມິພາກ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ຖ້າຕ້ອງການ. ການຕັ້ງຄ່ານີ້ຈະໄດ້ຮັບການນໍາໃຊ້ການກັ່ນຕອງໃນການຄ້າຂາຍຕ່າງໆ.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
 DocType: Holiday List,Weekly Off,ອາທິດ Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reload Linked Analysis
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ສໍາລັບຕົວຢ່າງ: 2012, 2012-13"
@@ -4590,7 +4623,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,ຄ່າໃຊ້ຈ່າຍຂອງສິນຊັບທະເລາະວິວາດ
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ສູນຕົ້ນທຶນເປັນການບັງຄັບສໍາລັບລາຍການ {2}
 DocType: Vehicle,Policy No,ນະໂຍບາຍທີ່ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
 DocType: Asset,Straight Line,Line ຊື່
 DocType: Project User,Project User,User ໂຄງການ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4630,21 +4663,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,ເສັ້ນທາງ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ບໍ່ສາມາດແປງສູນຕົ້ນທຶນການບັນຊີຍ້ອນວ່າມັນມີຂໍ້ເດັກ
 DocType: Production Plan,Total Planned Qty,Total Planned Qty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ມູນຄ່າການເປີດ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ມູນຄ່າການເປີດ
 DocType: Salary Detail,Formula,ສູດ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial:
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial:
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,ບັນຊີການຂາຍ
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,ບັນຊີການຂາຍ
 DocType: Purchase Invoice Item,Total Weight,ນ້ໍາຫນັກລວມ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,ຄະນະກໍາມະການຂາຍ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,ຄະນະກໍາມະການຂາຍ
 DocType: Job Offer Term,Value / Description,ມູນຄ່າ / ລາຍລະອຽດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
 DocType: Purchase Order Item,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ບັດເດບິດແລະເຄຣດິດບໍ່ເທົ່າທຽມກັນສໍາລັບ {0} # {1}. ຄວາມແຕກຕ່າງກັນເປັນ {2}.
 DocType: Asset Maintenance Task,Assign To Name,Assign To Name
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ຄ່າໃຊ້ຈ່າຍການບັນເທີງ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,ຄ່າໃຊ້ຈ່າຍການບັນເທີງ
 DocType: Hub Settings,Enabled Users,ຜູ້ໃຊ້ທີ່ຖືກເປີດໃຊ້
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ເຮັດໃຫ້ວັດສະດຸຂໍ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ເປີດ Item {0}
@@ -4657,24 +4690,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ຄໍາຮ້ອງສະຫມັກສໍາລັບໃບ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,ບັນຊີກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດໄດ້ຮັບການລຶບ
 DocType: Vehicle,Last Carbon Check,Check Carbon ຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ຄ່າໃຊ້ຈ່າຍດ້ານກົດຫມາຍ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,ຄ່າໃຊ້ຈ່າຍດ້ານກົດຫມາຍ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,ກະລຸນາເລືອກປະລິມານກ່ຽວກັບການຕິດຕໍ່ກັນ
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,ເຮັດໃຫ້ການເປີດຂາຍແລະຊື້ໃບແຈ້ງຫນີ້
 DocType: Purchase Invoice,Posting Time,ເວລາທີ່ປະກາດ
 DocType: Timesheet,% Amount Billed,% ຈໍານວນເງິນບິນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ຄ່າໃຊ້ຈ່າຍທາງໂທລະສັບ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ຄ່າໃຊ້ຈ່າຍທາງໂທລະສັບ
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ກວດສອບການຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະບັງຄັບໃຫ້ຜູ້ໃຊ້ສາມາດເລືອກໄລຍະກ່ອນທີ່ຈະປະຢັດ. ຈະມີບໍ່ມີມາດຕະຖານຖ້າຫາກວ່າທ່ານກວດສອບນີ້.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},ບໍ່ມີລາຍການທີ່ມີ Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},ບໍ່ມີລາຍການທີ່ມີ Serial No {0}
 DocType: Email Digest,Open Notifications,ເປີດການແຈ້ງເຕືອນ
 DocType: Payment Entry,Difference Amount (Company Currency),ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ຄ່າໃຊ້ຈ່າຍໂດຍກົງ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ຄ່າໃຊ້ຈ່າຍໂດຍກົງ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ລາຍການລູກຄ້າໃຫມ່
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ຄ່າໃຊ້ຈ່າຍເດີນທາງ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ຄ່າໃຊ້ຈ່າຍເດີນທາງ
 DocType: Maintenance Visit,Breakdown,ລາຍລະອຽດ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ເພີ່ມທົ່ງນາທີ່ກໍານົດໄວ້ໃນການລົງທືນໃນ doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
 DocType: Purchase Receipt Item,Sample Quantity,ຕົວຢ່າງຈໍານວນ
+DocType: Bank Guarantee,Name of Beneficiary,ຊື່ຜູ້ຮັບຜົນປະໂຫຍດ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","ຄ່າໃຊ້ຈ່າຍການປັບປຸງອັດຕະໂນມັດ BOM ຜ່ານ Scheduler, ໂດຍອີງໃສ່ບັນຊີລາຍຊື່ອັດຕາມູນຄ່າ / ລາຄາອັດຕາການ / ອັດຕາການຊື້ຫລ້າສຸດທີ່ຜ່ານມາຂອງວັດຖຸດິບ."
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ: {2}
@@ -4686,14 +4719,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,ການທົດລອງ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ອົງປະກອບເງິນເດືອນ
 DocType: Program Enrollment Tool,New Academic Year,ປີທາງວິຊາການໃຫມ່
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,ໃສ່ອັດຕະໂນມັດອັດຕາລາຄາຖ້າຫາກວ່າຫາຍສາບສູນ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ຈໍານວນເງິນທີ່ຊໍາລະທັງຫມົດ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ຈໍານວນເງິນທີ່ຊໍາລະທັງຫມົດ
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,ການຍົກຍ້າຍຈໍານວນ
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ການຄົ້ນຫາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ການວາງແຜນ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ການວາງແຜນ
 DocType: Share Balance,Issued,ອອກ
+DocType: Loan,Repayment Start Date,ວັນທີຊໍາລະເງິນຄືນ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,ກິດຈະກໍານັກສຶກສາ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Supplier
 DocType: Payment Request,Payment Gateway Details,ການຊໍາລະເງິນລະອຽດ Gateway
@@ -4706,10 +4740,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ປະເພດຂອງໃບເຊັ່ນ: ບາດເຈັບແລະ, ການເຈັບປ່ວຍແລະອື່ນໆ"
 DocType: Email Digest,Send regular summary reports via Email.,ສົ່ງບົດລາຍງານສະຫຼຸບສັງລວມເປັນປົກກະຕິໂດຍຜ່ານ Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
 DocType: Assessment Result,Student Name,ນາມສະກຸນ
 DocType: Brand,Item Manager,ການບໍລິຫານ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll Payable
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll Payable
 DocType: Buying Settings,Default Supplier Type,ມາດຕະຖານປະເພດຜະລິດ
 DocType: Plant Analysis,Collection Datetime,Collection Datetime
 DocType: Work Order,Total Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການທັງຫມົດ
@@ -4719,9 +4753,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ຜູ້ໃຊ້ {0} ບໍ່ມີ
 DocType: Payment Term,Day(s) after invoice date,ມື້ (s) ຫຼັງຈາກໃບແຈ້ງຫນີ້
 DocType: Payment Schedule,Payment Schedule,ຕາຕະລາງການຈ່າຍເງິນ
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ຊື່ຫຍໍ້
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Entry ການຊໍາລະເງິນທີ່ມີຢູ່ແລ້ວ
+DocType: Subscription,Trial Period End Date,ວັນສິ້ນສຸດການທົດລອງ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ບໍ່ authroized ນັບຕັ້ງແຕ່ {0} ເກີນຈໍາກັດ
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ແມ່ແບບຕົ້ນສະບັບເງິນເດືອນ.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Pathology
@@ -4738,9 +4772,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ໃຫ້ຄໍາປຶກສາຈະນໍາໄປສູ່ຫຼືລູກຄ້າ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ພາລະບົດບາດອະນຸຍາດໃຫ້ແກ້ໄຂຫຸ້ນ frozen
 ,Territory Target Variance Item Group-Wise,"ອານາເຂດຂອງເປົ້າຫມາຍຕ່າງ Item Group, ສະຫລາດ"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ສະສົມລາຍເດືອນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ແມ່ແບບພາສີເປັນການບັງຄັບ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ມີ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ລາຄາອັດຕາ (ບໍລິສັດສະກຸນເງິນ)
@@ -4749,14 +4783,15 @@
 DocType: Lab Prescription,Test Created,Test Created
 DocType: Healthcare Settings,Custom Signature in Print,ລາຍເຊັນທີ່ກໍານົດໄວ້ໃນແບບພິມ
 DocType: Account,Temporary,ຊົ່ວຄາວ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Customer LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Customer LPO No.
 DocType: Program,Courses,ຫລັກສູດ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ການຈັດສັນອັດຕາສ່ວນ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,ເລຂາທິການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,ເລຂາທິການ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ຖ້າຫາກວ່າປິດການໃຊ້ງານ, ໃນຄໍາສັບຕ່າງໆ &#39;ພາກສະຫນາມຈະບໍ່ສັງເກດເຫັນໃນການໂອນເງີນ"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ການປະຕິບັດນີ້ຈະຢຸດການເອີ້ນເກັບເງິນໃນອະນາຄົດ. ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການຍົກເລີກການສະຫມັກນີ້ບໍ?
 DocType: Serial No,Distinct unit of an Item,ຫນ່ວຍບໍລິການທີ່ແຕກຕ່າງກັນຂອງລາຍການ
 DocType: Supplier Scorecard Criteria,Criteria Name,ມາດຕະຖານຊື່
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,ກະລຸນາຕັ້ງບໍລິສັດ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,ກະລຸນາຕັ້ງບໍລິສັດ
 DocType: Pricing Rule,Buying,ຊື້
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ພະຍາດແລະປຸ໋ຍ
 DocType: HR Settings,Employee Records to be created by,ການບັນທຶກຂອງພະນັກງານຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນໂດຍ
@@ -4765,18 +4800,18 @@
 DocType: POS Profile,Apply Discount On,ສະຫມັກຕໍາ Discount On
 DocType: Member,Membership Type,ປະເພດສະມາຊິກ
 ,Reqd By Date,Reqd ໂດຍວັນທີ່
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ຫນີ້
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ຫນີ້
 DocType: Assessment Plan,Assessment Name,ຊື່ການປະເມີນຜົນ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,ສະແດງ PDC ໃນການພິມ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,ສະແດງ PDC ໃນການພິມ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial ເປັນການບັງຄັບ"
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ລາຍການຂໍ້ມູນພາສີສະຫລາດ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Job Offer
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ສະຖາບັນສະບັບຫຍໍ້
 ,Item-wise Price List Rate,ລາຍການສະຫລາດອັດຕາລາຄາ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quotation,In Words will be visible once you save the Quotation.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຊື້ຂາຍ.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
@@ -4794,7 +4829,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ຕ່າງທັງຫມົດ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ຖ້າຫາກວ່າເປີດການໃຊ້ງານ, ລະບົບຈະສະແດງການອອກສຽງການບັນຊີສໍາລັບສິນຄ້າຄົງຄັງອັດຕະໂນມັດ."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວສໍາລັບມື້ນີ້
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວສໍາລັບມື້ນີ້
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",ໃນນາທີ Updated ໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
 DocType: Customer,From Lead,ຈາກ Lead
@@ -4805,6 +4840,7 @@
 DocType: Lab Test,Approved Date,ວັນທີ່ຖືກອະນຸມັດ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,atleast ຫນຶ່ງ warehouse ເປັນການບັງຄັບ
+DocType: Subscriber,Subscriber Name,ຊື່ຜູ້ສະຫມັກ
 DocType: Serial No,Out of Warranty,ອອກຈາກການຮັບປະກັນ
 DocType: BOM Update Tool,Replace,ທົດແທນ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ບໍ່ມີສິນຄ້າພົບ.
@@ -4814,19 +4850,18 @@
 DocType: Request for Quotation Item,Project Name,ຊື່ໂຄງການ
 DocType: Customer,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
 DocType: Journal Entry Account,If Income or Expense,ຖ້າຫາກລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ເລືອກເອົາບັນຊີລາຍຮັບດອກເບ້ຍໃນເງິນກູ້ຂອງພະນັກງານ {0}
 DocType: Work Order,Required Items,ລາຍການທີ່ກໍານົດໄວ້
 DocType: Stock Ledger Entry,Stock Value Difference,ຄວາມແຕກຕ່າງມູນຄ່າຫຼັກຊັບ
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,ຊັບພະຍາກອນມະນຸດ
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ສ້າງຄວາມປອງດອງການຊໍາລະເງິນ
 DocType: Disease,Treatment Task,ວຽກງານການປິ່ນປົວ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ຊັບສິນອາກອນ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ຊັບສິນອາກອນ
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ວາລະສານ Entry {0} ບໍ່ມີບັນຊີ {1} ຫລືແລ້ວປຽບທຽບບັດອື່ນໆ
 DocType: Item,Moving Average,ການເຄື່ອນຍ້າຍໂດຍສະເລ່ຍ
 DocType: BOM Update Tool,The BOM which will be replaced,The BOM ທີ່ຈະໄດ້ຮັບການທົດແທນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ອຸປະກອນເອເລັກໂຕຣນິກ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ອຸປະກອນເອເລັກໂຕຣນິກ
 DocType: Asset,Maintenance Required,ບໍາລຸງຮັກສາທີ່ຕ້ອງການ
 DocType: Account,Debit,ເດບິດ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ໃບຕ້ອງໄດ້ຮັບການຈັດສັນຫລາຍຂອງ 05
@@ -4835,7 +4870,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ທີ່ຍັງຄ້າງຄາ Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ກໍານົດເປົ້າຫມາຍສິນຄ້າກຸ່ມສະຫລາດນີ້ເປັນສ່ວນຕົວຂາຍ.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze ຫຸ້ນເກີນ [ວັນ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,"ຕິດຕໍ່ກັນ, {0}: ຊັບສິນເປັນການບັງຄັບສໍາລັບຊັບສິນຄົງທີ່ຊື້ / ຂາຍ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,"ຕິດຕໍ່ກັນ, {0}: ຊັບສິນເປັນການບັງຄັບສໍາລັບຊັບສິນຄົງທີ່ຊື້ / ຂາຍ"
 DocType: Asset Maintenance Team,Maintenance Team Name,ຊື່ທີມບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ຖ້າຫາກວ່າທັງສອງຫຼືຫຼາຍກວ່າກົດລະບຽບລາຄາຖືກພົບເຫັນຢູ່ຕາມເງື່ອນໄຂຂ້າງເທິງນີ້, ບູລິມະສິດໄດ້ຖືກນໍາໃຊ້. ບູລິມະສິດເປັນຈໍານວນລະຫວ່າງ 0 ເຖິງ 20 ໃນຂະນະທີ່ຄ່າເລີ່ມຕົ້ນຄືສູນ (ເປົ່າ). ຈໍານວນທີ່ສູງຂຶ້ນຫມາຍຄວາມວ່າມັນຈະໃຊ້ເວລາກ່ອນຖ້າຫາກວ່າມີກົດລະບຽບການຕັ້ງລາຄາດ້ວຍສະພາບດຽວກັນ."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ລູກຄ້າຕ້ອງມີເງື່ອນໄຂຖ້າ &#39;ໂອກາດຈາກ&#39; ຖືກຄັດເລືອກເປັນລູກຄ້າ
@@ -4845,19 +4880,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ປະເພດຂອງຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ອັດຕາການສໍາລັບລາຍການຂາຍ {0} ແມ່ນຕ່ໍາກ່ວາຂອງຕົນ {1}. ອັດຕາການຂາຍຄວນຈະ atleast {2}
-DocType: Item,Taxes,ພາສີອາກອນ
+DocType: Subscription,Taxes,ພາສີອາກອນ
 DocType: Purchase Invoice,capital goods,ສິນຄ້າທຶນ
 DocType: Purchase Invoice Item,Weight Per Unit,ນ້ໍາຫນັກຕໍ່ຫນ່ວຍ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ການຊໍາລະເງິນແລະບໍ່ໄດ້ສົ່ງ
 DocType: Project,Default Cost Center,ສູນຕົ້ນທຶນມາດຕະຖານ
-DocType: Bank Guarantee,End Date,ວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ທຸລະກໍາຫຼັກຊັບ
 DocType: Budget,Budget Accounts,ບັນຊີງົບປະມານ
 DocType: Employee,Internal Work History,ວັດການເຮັດວຽກພາຍໃນ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,ຈໍານວນເງິນຄ່າເສື່ອມລາຄາສະສົມ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,ພາກເອກກະຊົນ
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Supplier Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,ຈ່າຍຢ່າງເຕັມສ່ວນ
 DocType: Employee Advance,Due Advance Amount,ຈໍານວນເງິນລ່ວງຫນ້າລ່ວງຫນ້າ
 DocType: Maintenance Visit,Customer Feedback,ຜົນຕອບຮັບຂອງລູກຄ້າ
 DocType: Account,Expense,ຄ່າໃຊ້ຈ່າຍ
@@ -4881,7 +4914,7 @@
 ,Employee Information,ຂໍ້ມູນພະນັກງານ
 DocType: Stock Entry Detail,Additional Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quality Inspection,Incoming,ເຂົ້າມາ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ແມ່ແບບພາສີມາດຕະຖານສໍາລັບການຂາຍແລະການຊື້ໄດ້ຖືກສ້າງຂຶ້ນ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,ບັນທຶກການປະເມີນຜົນ {0} ມີຢູ່ແລ້ວ.
@@ -4889,7 +4922,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ກະລຸນາຕັ້ງບໍລິສັດກັ່ນຕອງ blank ຖ້າ Group By ແມ່ນ &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,ວັນທີ່ບໍ່ສາມາດເປັນວັນໃນອະນາຄົດ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial {1} ບໍ່ກົງກັບ {2} {3}"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ສໍາລັບການຜະລິດ recurring ໄດ້
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Address
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,ອອກຈາກການບາດເຈັບແລະ
 DocType: Agriculture Task,End Day,End Day
@@ -4914,11 +4946,10 @@
 DocType: Material Request,% Ordered,% ຄໍາສັ່ງ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ສໍາລັບວິຊາທີ່ນັກສຶກສາ Group, ຂອງລາຍວິຊາການຈະໄດ້ຮັບການກວດສອບສໍາລັບທຸກນັກສຶກສາຈາກວິຊາທີ່ລົງທະບຽນໃນໂຄງການການເຂົ້າໂຮງຮຽນ."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ເຫມົາ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,avg. ອັດຕາການຊື້
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,avg. ອັດຕາການຊື້
 DocType: Share Balance,From No,ຈາກ No
 DocType: Task,Actual Time (in Hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ)
 DocType: Employee,History In Company,ປະຫວັດສາດໃນບໍລິສັດ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},ຂໍ້ຄວາມໃຫມ່ຈາກ {sender}
 DocType: Customer,Customer Primary Address,ທີ່ຢູ່ສະຖານທີ່ຂອງລູກຄ້າຫລັກ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ຈົດຫມາຍຂ່າວ
 DocType: Drug Prescription,Description/Strength,ຄໍາອະທິບາຍ / ຄວາມເຂັ້ມແຂງ
@@ -4927,22 +4958,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ລາຍການດຽວກັນໄດ້ຮັບເຂົ້າໄປຫຼາຍຄັ້ງ
 DocType: Department,Leave Block List,ອອກຈາກບັນຊີ Block
 DocType: Purchase Invoice,Tax ID,ID ພາສີ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. Column ຕ້ອງມີຊ່ອງຫວ່າງ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. Column ຕ້ອງມີຊ່ອງຫວ່າງ
 DocType: Accounts Settings,Accounts Settings,ບັນຊີ Settings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,ອະນຸມັດ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","ທີ່ແກ້ໄຂທີ່ບໍ່ດີສໍາລັບ {0}, ກະລຸນາແກ້ໄຂເພື່ອສືບຕໍ່."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","ທີ່ແກ້ໄຂທີ່ບໍ່ດີສໍາລັບ {0}, ກະລຸນາແກ້ໄຂເພື່ອສືບຕໍ່."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","ຈໍານວນບັນຊີໃຫມ່, ມັນຈະຖືກລວມຢູ່ໃນຊື່ບັນຊີເປັນຄໍານໍາຫນ້າ"
 DocType: Maintenance Team Member,Team Member,ທີມງານສະມາຊິກ
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,ບໍ່ມີຜົນການສົ່ງ
 DocType: Customer,Sales Partner and Commission,Partner ຂາຍແລະຄະນະກໍາມະ
-DocType: Employee Loan,Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ
+DocType: Loan,Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ
 ,Project Quantity,ຈໍານວນໂຄງການ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;
 DocType: Opportunity,To Discuss,ເພື່ອປຶກສາຫາລື
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
 DocType: Loan Type,Rate of Interest (%) Yearly,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) ປະຈໍາປີ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,ບັນຊີຊົ່ວຄາວ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ສີດໍາ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,ບັນຊີຊົ່ວຄາວ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ສີດໍາ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ລະເບີດ Item
 DocType: Shareholder,Contact List,ລາຍຊື່ຜູ້ຕິດຕໍ່
 DocType: Account,Auditor,ຜູ້ສອບບັນຊີ
@@ -4950,16 +4981,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ລາຍການຜະລິດ
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ຮຽນຮູ້ເພີ່ມເຕີມ
 DocType: Cheque Print Template,Distance from top edge,ໄລຍະຫ່າງຈາກຂອບດ້ານເທິງ
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,ລາຄາ {0} ເປັນຄົນພິການຫຼືບໍ່ມີ
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,ລາຄາ {0} ເປັນຄົນພິການຫຼືບໍ່ມີ
 DocType: Purchase Invoice,Return,ການກັບຄືນມາ
 DocType: Pricing Rule,Disable,ປິດການທໍາງານ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Project Task,Pending Review,ລໍຖ້າການທົບທວນຄືນ
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","ແກ້ໄຂໃນຫນ້າເຕັມສໍາລັບທາງເລືອກຫຼາຍເຊັ່ນຊັບສິນ, serial nos, lots ແລະອື່ນໆ."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ການແຕ່ງຕັ້ງແລະການປຶກສາຫາລື
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນຊຸດໄດ້ {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",Asset {0} ບໍ່ສາມາດໄດ້ຮັບການທະເລາະວິວາດກັນແລ້ວ {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ເຊັກຕ້ອງການ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ເຊັກຕ້ອງການ
 DocType: Task,Total Expense Claim (via Expense Claim),ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ໂດຍຜ່ານຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ເຄື່ອງຫມາຍຂາດ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,ບໍ່ສາມາດຕິດຕັ້ງບໍລິສັດ
@@ -4971,7 +5002,7 @@
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ການຈັດການ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,ເພີ່ມລາຍການລາຍການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,ເພີ່ມລາຍການລາຍການ
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ພືດແລະດິນ
 DocType: Cheque Print Template,Regular,ເປັນປົກກະຕິ
 DocType: Fertilizer,Density (if liquid),ຄວາມຫນາແຫນ້ນ (ຖ້າເປັນແຫຼວ)
@@ -4996,24 +5027,26 @@
 DocType: Payment Entry,Paid Amount,ຈໍານວນເງິນຊໍາລະເງິນ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,ໂຄງການຂຸດຄົ້ນ Cycle Sales
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,ສິນຄ້າສໍາລັບການບັນຈຸ
 DocType: Item Variant,Item Variant,ລາຍການ Variant
 ,Work Order Stock Report,ລາຍວຽກການສັ່ງຊື້ສິນຄ້າ
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,ເຄື່ອງມືການປະເມີນຜົນ
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,As Supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,ແນະນໍາຫມວດຫມູ່
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນເດບິດ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Credit&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,ການບໍລິຫານຄຸນະພາບ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,ການບໍລິຫານຄຸນະພາບ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
 DocType: Project,Total Billable Amount (via Timesheets),ຈໍານວນເງິນທີ່ສາມາດຈ່າຍເງິນໄດ້ (ຜ່ານບັດປະຈໍາຕົວ)
 DocType: Agriculture Task,Previous Business Day,ວັນທຸລະກິດຜ່ານມາ
-DocType: Employee Loan,Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່
+DocType: Loan,Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່
 DocType: Employee,Health Insurance No,Health Insurance No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,ລວມຈໍານວນເງິນທີ່ຈ່າຍໄດ້
 DocType: Employee External Work History,Employee External Work History,ພະນັກງານປະຫວັດການເຮັດ External
 DocType: Opening Invoice Creation Tool,Purchase,ຊື້
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ການດຸ່ນດ່ຽງຈໍານວນ
@@ -5024,16 +5057,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ສໍາລັບ {1}
 DocType: Healthcare Settings,Valid number of days,ຈໍານວນວັນທີ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ສູນຕົ້ນທຶນ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Restart Subscription
 DocType: Land Unit,Linked Plant Analysis,Linked Plant Analysis
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ອັດຕາການທີ່ຜູ້ສະຫນອງຂອງສະກຸນເງິນຈະປ່ຽນເປັນສະກຸນເງິນຂອງບໍລິສັດ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},"ຕິດຕໍ່ກັນ, {0}: ຂໍ້ຂັດແຍ່ງເວລາທີ່ມີການຕິດຕໍ່ກັນ {1}"
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ອະນຸຍາດໃຫ້ສູນອັດຕາປະເມີນມູນຄ່າ
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ອະນຸຍາດໃຫ້ສູນອັດຕາປະເມີນມູນຄ່າ
+DocType: Bank Guarantee,Receiving,ການຮັບເອົາ
 DocType: Training Event Employee,Invited,ເຊື້ອເຊີນ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ຫຼາຍໂຄງສ້າງເງິນເດືອນກິດຈະກໍາພົບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,ການຕັ້ງຄ່າບັນຊີ Gateway.
 DocType: Employee,Employment Type,ປະເພດວຽກເຮັດງານທໍາ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ຊັບສິນຄົງທີ່
 DocType: Payment Entry,Set Exchange Gain / Loss,ກໍານົດອັດຕາແລກປ່ຽນໄດ້ຮັບ / ການສູນເສຍ
 ,GST Purchase Register,GST ຫມັກສະມາຊິກຊື້
 ,Cash Flow,ກະແສເງິນສົດ
@@ -5054,9 +5089,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,ລາຍະການຂອງການໂອນຫຸ້ນທັງຫມົດ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ນັບ Opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ນັບ Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},ກະລຸນາຊອກຫາທີ່ຕິດຄັດມາ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ວັນທີເລີ່ມຕົ້ນແລະໄລຍະເວລາໄລຍະເວລາການທົດລອງຕ້ອງຖືກກໍານົດໄວ້ທັງສອງໄລຍະເວລາທົດລອງ
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ອັດຕາເສລີ່ຍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ຈໍານວນເງິນຈ່າຍທັງຫມົດໃນຕາຕະລາງການຊໍາລະເງິນຕ້ອງເທົ່າກັບ Grand / Total Rounded
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ຈໍານວນເງິນຈ່າຍທັງຫມົດໃນຕາຕະລາງການຊໍາລະເງິນຕ້ອງເທົ່າກັບ Grand / Total Rounded
+DocType: Subscription Plan Detail,Plan,ແຜນການ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ທະນາຄານການດຸ່ນດ່ຽງງົບເປັນຕໍ່ຊີແຍກປະເພດທົ່ວໄປ
 DocType: Job Applicant,Applicant Name,ຊື່ຜູ້ສະຫມັກ
 DocType: Authorization Rule,Customer / Item Name,ລູກຄ້າ / ສິນຄ້າ
@@ -5086,6 +5122,7 @@
 DocType: Work Order,Warehouses,ຄັງສິນຄ້າ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການໂອນ
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel Room Pricing
+DocType: Subscription,Days Until Due,ມື້ຈົນກ່ວາເນື່ອງຈາກ
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ລາຍການນີ້ເປັນຂໍ້ແຕກຕ່າງຂອງ {0} (Template).
 DocType: Workstation,per hour,ຕໍ່ຊົ່ວໂມງ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ຈັດຊື້
@@ -5094,13 +5131,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ສໍາລັບອີງຊຸດ Group ນັກສຶກສາ, ຊຸດນັກສຶກສາຈະໄດ້ຮັບການກວດສອບສໍາລັບທຸກນັກສຶກສາຈາກໂຄງການລົງທະບຽນ."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນການເຂົ້າຫຸ້ນຊີແຍກປະເພດທີ່ມີຢູ່ສໍາລັບການສາງນີ້.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ການແຜ່ກະຈາຍ
+DocType: Journal Entry Account,Loan,ເງິນກູ້ຢືມ
 DocType: Expense Claim Advance,Expense Claim Advance,ຄ່າໃຊ້ຈ່າຍທີ່ຮ້ອງຂໍລ່ວງຫນ້າ
 DocType: Lab Test,Report Preference,Report Preference
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ຂໍ້ມູນອາສາສະຫມັກ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ຜູ້ຈັດການໂຄງການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ຜູ້ຈັດການໂຄງການ
 ,Quoted Item Comparison,ປຽບທຽບບາຍດີທຸກທ່ານ Item
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},ກັນໃນການໃຫ້ຄະແນນລະຫວ່າງ {0} ແລະ {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ຫນັງສືທາງການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ຫນັງສືທາງການ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ພິເສດນ້ໍາອະນຸຍາດໃຫ້ສໍາລັບລາຍການ: {0} ເປັນ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,ມູນຄ່າຊັບສິນສຸດທິເປັນ
 DocType: Crop,Produce,ຜະລິດ
@@ -5110,7 +5148,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ການນໍາໃຊ້ວັດສະດຸສໍາລັບການຜະລິດ
 DocType: Item Alternative,Alternative Item Code,Alternate Item Code
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ພາລະບົດບາດທີ່ຖືກອະນຸຍາດໃຫ້ສົ່ງການທີ່ເກີນຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອທີ່ກໍານົດໄວ້.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
 DocType: Delivery Stop,Delivery Stop,ການຈັດສົ່ງສິນຄ້າ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
 DocType: Item,Material Issue,ສະບັບອຸປະກອນການ
@@ -5120,15 +5158,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ສະບູ່ແລະຜົງຊັກຟອກ
 DocType: BOM,Show Items,ສະແດງລາຍການ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ຈາກທີ່ໃຊ້ເວລາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ໃຊ້ເວລາ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ທ່ານຕ້ອງການແຈ້ງໃຫ້ລູກຄ້າທຸກຄົນຜ່ານທາງອີເມວບໍ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ທ່ານຕ້ອງການແຈ້ງໃຫ້ລູກຄ້າທຸກຄົນຜ່ານທາງອີເມວບໍ?
+DocType: Subscription Plan,Billing Interval,ໄລຍະເວລາການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture ແລະວິດີໂອ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Resume
 DocType: Hub Settings,Hub Username,Hub Username
 DocType: Salary Detail,Component,ອົງປະກອບ
 DocType: Assessment Criteria,Assessment Criteria Group,Group ເງື່ອນໄຂການປະເມີນຜົນ
 DocType: Healthcare Settings,Patient Name By,Name Patient By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},ບັນຊີລາຍການຂອງ Accrual ສໍາລັບເງິນເດືອນຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},ບັນຊີລາຍການຂອງ Accrual ສໍາລັບເງິນເດືອນຈາກ {0} ກັບ {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
 DocType: Warehouse,Warehouse Name,ຊື່ Warehouse
 DocType: Naming Series,Select Transaction,ເລືອກເຮັດທຸລະກໍາ
@@ -5142,23 +5180,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ໃນທີ່ນີ້ທ່ານສາມາດຮັກສາລະດັບຄວາມສູງ, ນ້ໍາ, ອາການແພ້, ຄວາມກັງວົນດ້ານການປິ່ນປົວແລະອື່ນໆ"
 DocType: Leave Block List,Applies to Company,ໃຊ້ໄດ້ກັບບໍລິສັດ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
-DocType: Employee Loan,Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ຜູ້ຮັບ&#39; ບໍ່ໄດ້ກໍານົດ
+DocType: Loan,Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ
 DocType: BOM Update Tool,Update latest price in all BOMs,ອັບເດດລາຄາຫລ້າສຸດໃນ Boms ທັງຫມົດ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medical Record
 DocType: Vehicle,Vehicle,ຍານພາຫະນະ
 DocType: Purchase Invoice,In Words,ໃນຄໍາສັບຕ່າງໆ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,ກະລຸນາໃສ່ຊື່ຂອງທະນາຄານຫຼືສະຖາບັນການໃຫ້ຍືມກ່ອນສົ່ງ.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} ຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: POS Profile,Item Groups,ກຸ່ມລາຍການ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ໃນມື້ນີ້ແມ່ນ {0} &#39;s ວັນເດືອນປີເກີດ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ໃນມື້ນີ້ແມ່ນ {0} &#39;s ວັນເດືອນປີເກີດ!
 DocType: Sales Order Item,For Production,ສໍາລັບການຜະລິດ
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,ກະລຸນາເພີ່ມບັນຊີເປີດຊົ່ວຄາວໃນຕາຕະລາງບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,ກະລຸນາເພີ່ມບັນຊີເປີດຊົ່ວຄາວໃນຕາຕະລາງບັນຊີ
 DocType: Customer,Customer Primary Contact,Customer Primary Contact
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Period Closing Journal
 DocType: Project Task,View Task,ເບິ່ງ Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,ປະເພດການຮັບປະກັນທະນາຄານ
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ໃບແຈ້ງຫນີ້
 ,Asset Depreciations and Balances,ຄ່າເສື່ອມລາຄາຂອງຊັບສິນແລະຍອດ
@@ -5169,9 +5208,8 @@
 DocType: Production Plan,Include Subcontracted Items,ລວມເອົາລາຍການທີ່ຕິດຕໍ່ພາຍໃຕ້ເງື່ອນໄຂ
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,ບໍ່ສາມາດປ່ຽນແປງຄຸນສົມບັດ Variant ໄດ້ຫຼັງຈາກການຊື້ຫຼັກຊັບ. ທ່ານຈະຕ້ອງສ້າງລາຍການໃຫມ່ເພື່ອເຮັດສິ່ງນີ້.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
-DocType: Employee Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+DocType: Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ຂໍຊໍາລະເງິນກັບ {0} {1} ສໍາລັບຈໍານວນເງິນທີ່ {2}
 DocType: Salary Slip,Salary Slip,Slip ເງິນເດືອນ
@@ -5195,11 +5233,11 @@
 DocType: Employee Education,Employee Education,ການສຶກສາພະນັກງານ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ກຸ່ມລາຍການຊ້ໍາກັນພົບເຫັນຢູ່ໃນຕາຕະລາງກຸ່ມລາຍການ
 DocType: Land Unit,Parent Land Unit,ຫນ່ວຍງານທີ່ດິນພໍ່ແມ່
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
 DocType: Fertilizer,Fertilizer Name,ຊື່ປຸ໋ຍ
 DocType: Salary Slip,Net Pay,ຈ່າຍສຸດທິ
 DocType: Cash Flow Mapping Accounts,Account,ບັນຊີ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} ໄດ້ຮັບແລ້ວ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial No {0} ໄດ້ຮັບແລ້ວ
 ,Requested Items To Be Transferred,ການຮ້ອງຂໍໃຫ້ໄດ້ຮັບການໂອນ
 DocType: Expense Claim,Vehicle Log,ຍານພາຫະນະເຂົ້າສູ່ລະບົບ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ການມີອາການໄຂ້ (ຄວາມຮ້ອນ&gt; 385 ° C / 1013 ° F ຫຼືຄວາມຊ້າ&gt; 38 ° C / 1004 ° F)
@@ -5240,24 +5278,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ."
 DocType: Asset Maintenance,Manufacturing User,ຜູ້ໃຊ້ການຜະລິດ
 DocType: Purchase Invoice,Raw Materials Supplied,ວັດຖຸດິບທີ່ຈໍາຫນ່າຍ
-DocType: C-Form,Series,Series
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},ສະກຸນເງິນຂອງລາຍຊື່ລາຄາ {0} ຕ້ອງເປັນ {1} ຫຼື {2}
 DocType: Appraisal,Appraisal Template,ແມ່ແບບການປະເມີນຜົນ
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,ການຈັດປະເພດສິນຄ້າ
 DocType: Driver,License Number,ຈໍານວນໃບອະນຸຍາດ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ບໍາລຸງຮັກສາ Visit ວັດຖຸປະສົງ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ລົງທະບຽນຜູ້ປ່ວຍໃບແຈ້ງຫນີ້
 DocType: Crop,Period,ໄລຍະເວລາ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,ຊີແຍກປະເພດ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} ໃບ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} ໃບ {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,View Leads
 DocType: Program Enrollment Tool,New Program,ໂຄງການໃຫມ່
 DocType: Item Attribute Value,Attribute Value,ສະແດງມູນຄ່າ
 ,Itemwise Recommended Reorder Level,Itemwise ແນະນໍາຈັດລໍາດັບລະດັບ
 DocType: Salary Detail,Salary Detail,ຂໍ້ມູນເງິນເດືອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
 DocType: Appointment Type,Physician,ແພດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} ຂໍ້ມູນ {1} ໄດ້ຫມົດອາຍຸແລ້ວ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ການປຶກສາຫາລື
@@ -5265,15 +5302,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ບໍ່ສາມາດຈະສູງກວ່າປະລິມານທີ່ວາງໄວ້ ({2}) ໃນຄໍາສັ່ງເຮັດວຽກ {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Sheet ທີ່ໃຊ້ເວລາສໍາລັບການຜະລິດ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ການເພີ່ມເຕີມ
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ບໍ່ສາມາດປ່ຽນແປງຄຸນສົມບັດ Variant ຫຼັງຈາກການຊື້ຂາຍຫຼັກຊັບ. ທ່ານຈະຕ້ອງສ້າງລາຍການໃຫມ່ເພື່ອເຮັດສິ່ງນີ້.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandate
 DocType: Physician,Charges,ຄ່າບໍລິການ
 DocType: Production Plan,Get Items For Work Order,ເອົາລາຍການສໍາລັບຄໍາສັ່ງເຮັດວຽກ
 DocType: Salary Detail,Default Amount,ມາດຕະຖານຈໍານວນ
 DocType: Lab Test Template,Descriptive,Descriptive
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ບໍ່ພົບຄັງສິນຄ້າໃນລະບົບ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ບໍ່ພົບຄັງສິນຄ້າໃນລະບົບ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ຂອງເດືອນນີ້ Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,ມີຄຸນະພາບກວດສອບການອ່ານຫນັງສື
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,ກໍານົດເປົ້າຫມາຍການຂາຍທີ່ທ່ານຢາກຈະບັນລຸສໍາລັບບໍລິສັດຂອງທ່ານ.
 ,Project wise Stock Tracking,ໂຄງການຕິດຕາມສະຫລາດ Stock
@@ -5301,11 +5339,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ບໍ່ສາມາດສ້າງເວັບໄຊທ໌
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ແປງຂໍ້ມູນ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,ການເກັບຮັກສາໄວ້ການເກັບຮັກສາໄວ້ແລ້ວຫຼືບໍ່ມີຈໍານວນຕົວຢ່າງ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,ການເກັບຮັກສາໄວ້ການເກັບຮັກສາໄວ້ແລ້ວຫຼືບໍ່ມີຈໍານວນຕົວຢ່າງ
 DocType: Program,Program Abbreviation,ຊື່ຫຍໍ້ໂຄງການ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ
 DocType: Warranty Claim,Resolved By,ການແກ້ໄຂໂດຍ
-DocType: Bank Guarantee,Start Date,ວັນທີ່ເລີ່ມ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ຈັດສັນໃບສໍາລັບໄລຍະເວລາ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ເຊັກແລະເງິນຝາກການເກັບກູ້ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ບັນຊີ {0}: ທ່ານບໍ່ສາມາດກໍາຫນົດຕົວຂອງມັນເອງເປັນບັນຊີຂອງພໍ່ແມ່
@@ -5320,11 +5357,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ຊົ່ວໂມງ
 DocType: Project,Expected Start Date,ຄາດວ່າຈະເລີ່ມວັນທີ່
 DocType: Purchase Invoice,04-Correction in Invoice,04-Correction in Invoice
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,ວຽກງານການສັ່ງຊື້ແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,ວຽກງານການສັ່ງຊື້ແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Details Report
 DocType: Setup Progress Action,Setup Progress Action,Setup ຄວາມຄືບຫນ້າປະຕິບັດງານ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ຊື້ລາຄາລາຍະການ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ຊື້ລາຄາລາຍະການ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ເອົາລາຍການຖ້າຫາກວ່າຄ່າໃຊ້ຈ່າຍແມ່ນບໍ່ສາມາດໃຊ້ກັບສິນຄ້າທີ່
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,ຍົກເລີກການຈອງ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,ກະລຸນາເລືອກສະຖານະການບໍາລຸງຮັກສາແລ້ວສົມບູນຫຼືລົບວັນຄົບຖ້ວນ
 DocType: Supplier,Default Payment Terms Template,ມາດຕະຖານການຊໍາລະເງິນມາດຕະຖານ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ສະກຸນເງິນລະຕ້ອງໄດ້ຮັບເຊັ່ນດຽວກັນກັບການຊໍາລະເງິນສະກຸນເງິນ Gateway
@@ -5335,7 +5373,6 @@
 DocType: Employee,Educational Qualification,ຄຸນສົມບັດການສຶກສາ
 DocType: Workstation,Operating Costs,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າສະສົມງົບປະມານປະຈໍາເດືອນເກີນ
-DocType: Subscription,Submit on creation,ຍື່ນສະເຫນີກ່ຽວກັບການສ້າງ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
 DocType: Asset,Disposal Date,ວັນທີ່ຈໍາຫນ່າຍ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ອີເມວຈະຖືກສົ່ງໄປຫາພະນັກງານກິດຈະກໍາຂອງບໍລິສັດຢູ່ໃນຊົ່ວໂມງດັ່ງກ່າວ, ຖ້າຫາກວ່າພວກເຂົາເຈົ້າບໍ່ມີວັນພັກ. ສະຫຼຸບສັງລວມຂອງການຕອບສະຫນອງຈະໄດ້ຮັບການສົ່ງໄປຢູ່ໃນເວລາທ່ຽງຄືນ."
@@ -5354,6 +5391,7 @@
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Cheque Print Template,Cheque Print Template,ແມ່ແບບພິມກະແສລາຍວັນ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ຕາຕະລາງຂອງສູນຕົ້ນທຶນ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ຈໍານວນວັນນັບແຕ່ວັນທີ່ໃບແຈ້ງຫນີ້ໄດ້ລ່ວງຫນ້າກ່ອນທີ່ຈະຍົກເລີກການຈອງຫຼືການລົງທະບຽນທີ່ບໍ່ໄດ້ຮັບຄ່າຈ້າງ
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,ການຮ້ອງຂໍການສັ່ງ
 DocType: Price List,Price List Name,ລາຄາຊື່
@@ -5362,7 +5400,7 @@
 DocType: Account,Income,ລາຍໄດ້
 DocType: Industry Type,Industry Type,ປະເພດອຸດສາຫະກໍາ
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ບາງສິ່ງບາງຢ່າງໄດ້ຜິດພາດ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,ການເຕືອນໄພ: ອອກຈາກຄໍາຮ້ອງສະຫມັກປະກອບດ້ວຍຂໍ້ມູນວັນ block ດັ່ງຕໍ່ໄປນີ້
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,ການເຕືອນໄພ: ອອກຈາກຄໍາຮ້ອງສະຫມັກປະກອບດ້ວຍຂໍ້ມູນວັນ block ດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,ຂາຍ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 DocType: Supplier Scorecard Scoring Criteria,Score,ຄະແນນ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ປີງົບປະມານ {0} ບໍ່ມີ
@@ -5382,12 +5420,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,ຈຸດຂອງການຂາຍຂໍ້ມູນ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ຄວນເປັນຄ່າລະຫວ່າງ 0 ແລະ 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,ວັນທີມີຄ່າໃຊ້ຈ່າຍຕໍ່ໄປບໍ່ສາມາດເປັນວັນທີ່ມີຢູ່ສໍາລັບການນໍາໃຊ້
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
 DocType: Cost Center,Cost Center Name,ມີລາຄາຖືກຊື່ Center
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ຊົ່ວໂມງການເຮັດວຽກຕໍ່ Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,ວັນກໍານົດ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ມູນຄ່າລວມ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ມູນຄ່າລວມ Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,ຂໍ້ຄວາມຫຼາຍກ່ວາ 160 ລັກສະນະຈະໄດ້ຮັບການແບ່ງປັນເຂົ້າໄປໃນຂໍ້ຄວາມຫລາຍ
 DocType: Purchase Receipt Item,Received and Accepted,ໄດ້ຮັບແລະຮັບການຍອມຮັບ
 DocType: Hub Settings,Company and Seller Profile,ຊື່ບໍລິສັດແລະຜູ້ຂາຍ
@@ -5401,10 +5439,9 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 100%. ມັນເປັນ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,ຜູ້ສະຫນອງຂອງທ່ານ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ກະລຸນາແກ້ໄຂ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonymous
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ໄດ້ຮັບຈາກ
 DocType: Lead,Converted,ປ່ຽນໃຈເຫລື້ອມໃສ
@@ -5418,6 +5455,7 @@
 DocType: Asset,Assets,ຊັບສິນ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,ຄອມພິວເຕີ
 DocType: Item,List this Item in multiple groups on the website.,ລາຍຊື່ສິນຄ້ານີ້ຢູ່ໃນກຸ່ມຫຼາກຫຼາຍກ່ຽວກັບເວັບໄຊທ໌.
+DocType: Subscription,Current Invoice End Date,ວັນທີໃບແຈ້ງຫນີ້ສຸດທ້າຍ
 DocType: Payment Term,Due Date Based On,Date Due Based On
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,ກະລຸນາຕັ້ງກຸ່ມລູກຄ້າແລະອານາເຂດເດີມໃນການຕັ້ງຄ່າການຂາຍ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ບໍ່ມີ
@@ -5425,7 +5463,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,ສິນຄ້າ: {0} ບໍ່ມີຢູ່ໃນລະບົບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,ໄດ້ຮັບ Unreconciled Entries
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ບໍ່ມີການຈ່າຍຄືນສໍາລັບວາລະສານເຂົ້າ
 DocType: Payment Reconciliation,From Invoice Date,ຈາກ Invoice ວັນທີ່
+DocType: Loan,Disbursed,ເງິນກູ້ຢືມ
 DocType: Healthcare Settings,Laboratory Settings,ການຕັ້ງຄ່າຫ້ອງທົດລອງ
 DocType: Patient Appointment,Service Unit,ຫນ່ວຍບໍລິການ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,ສ້າງຜູ້ຜະລິດສົບຜົນສໍາເລັດ
@@ -5438,12 +5478,12 @@
 DocType: Share Balance,No of Shares,ບໍ່ມີຮຸ້ນ
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,ເລືອກສະຖານະພາບ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
 DocType: Pricing Rule,Pricing Rule Help,ລາຄາກົດລະບຽບຊ່ວຍເຫລືອ
 DocType: School House,House Name,ຊື່ບ້ານ
 DocType: Fee Schedule,Total Amount per Student,ຈໍານວນເງິນທັງຫມົດຕໍ່ນັກສຶກສາ
 DocType: Purchase Taxes and Charges,Account Head,ຫົວຫນ້າບັນຊີ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ໄຟຟ້າ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ໄຟຟ້າ
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ຕື່ມສ່ວນທີ່ເຫຼືອຂອງອົງການຈັດຕັ້ງຂອງທ່ານເປັນຜູ້ຊົມໃຊ້ຂອງທ່ານ. ນອກນັ້ນທ່ານຍັງສາມາດເພີ່ມເຊື້ອເຊີນລູກຄ້າກັບປະຕູຂອງທ່ານໂດຍການເພີ່ມໃຫ້ເຂົາເຈົ້າຈາກການຕິດຕໍ່
 DocType: Stock Entry,Total Value Difference (Out - In),ມູນຄ່າຄວາມແຕກຕ່າງ (Out - ໃນ)
 DocType: Grant Application,Requested Amount,ຈໍານວນທີ່ຕ້ອງການ
@@ -5453,7 +5493,7 @@
 DocType: Crop Cycle,Detected Diseases,ກວດພົບພະຍາດ
 DocType: Stock Entry,Default Source Warehouse,Warehouse Source ມາດຕະຖານ
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
 DocType: Asset Maintenance Task,Last Completion Date,ວັນສິ້ນສຸດແລ້ວ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
@@ -5461,9 +5501,10 @@
 DocType: GoCardless Settings,GoCardless Settings,ການຕັ້ງຄາ GoCardless
 DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ຊັບສິນ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,ຊັບສິນ Stock
 DocType: Restaurant,Active Menu,Active Menu
 DocType: Target Detail,Target Qty,ເປົ້າຫມາຍຈໍານວນ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ກັບເງິນກູ້: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ການຕັ້ງຄ່າການຊໍາລະເງິນ
 DocType: Student Attendance,Present,ປັດຈຸບັນ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ສົ່ງຫມາຍເຫດ {0} ຕ້ອງບໍ່ໄດ້ຮັບການສົ່ງ
@@ -5472,9 +5513,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
 DocType: Vehicle Log,Odometer,ໄມ
 DocType: Production Plan Item,Ordered Qty,ຄໍາສັ່ງຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
 DocType: Chapter,Chapter Head,Chapter Head
 DocType: Payment Term,Month(s) after the end of the invoice month,ເດືອນ (s) ຫຼັງຈາກສິ້ນສຸດເດືອນໃບເກັບເງິນ
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,ກິດຈະກໍາໂຄງການ / ວຽກງານ.
@@ -5482,11 +5523,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ສ້າງເງິນເດືອນ Slips
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ທົດລອງໄລຍະເວລາທົດລອງບໍ່ສາມາດເປັນເວລາທົດລອງວັນທີ
 DocType: POS Profile,Allow user to edit Discount,ອະນຸຍາດໃຫ້ຜູ້ໃຊ້ແກ້ໄຂສ່ວນຫຼຸດ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ຮັບລູກຄ້າຈາກ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ຮັບລູກຄ້າຈາກ
 DocType: Purchase Invoice Item,Include Exploded Items,ລວມເອົາສິ່ງທີ່ເກີດຂື້ນ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","ການຊື້ຕ້ອງໄດ້ຮັບການກວດສອບ, ຖ້າຫາກວ່າສາມາດນໍາໃຊ້ສໍາລັບການໄດ້ຖືກຄັດເລືອກເປັນ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ສ່ວນລົດຕ້ອງຫນ້ອຍກ່ວາ 100
 DocType: Shipping Rule,Restrict to Countries,ຈໍາກັດຕໍ່ປະເທດ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ຂຽນ Off ຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Sales Invoice Timesheet,Billing Hours,ຊົ່ວໂມງໃນການເກັບເງິນ
 DocType: Project,Total Sales Amount (via Sales Order),ຈໍານວນການຂາຍທັງຫມົດ (ໂດຍຜ່ານການສັ່ງຂາຍ)
@@ -5505,6 +5547,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,ຜູ້ຈັດການປະເມີນຜົນ
 DocType: Payment Entry,Allocate Payment Amount,ຈັດສັນຈໍານວນເງິນຊໍາລະເງິນ
+DocType: Subscription Plan,Subscription Plan,ແຜນການຈອງ
 DocType: Employee External Work History,Salary,ເງິນເດືອນ
 DocType: Serial No,Delivery Document Type,ສົ່ງປະເພດເອກະສານ
 DocType: Sales Order,Partly Delivered,ສົ່ງສ່ວນຫນຶ່ງແມ່ນ
@@ -5529,9 +5572,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,ຄວາມສູງສຸດທີ່ເຄຍ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ການຕິດຕັ້ງ presets
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ບໍ່ມີການຈັດສົ່ງຂໍ້ມູນສໍາລັບລູກຄ້າ {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ບໍ່ມີການຈັດສົ່ງຂໍ້ມູນສໍາລັບລູກຄ້າ {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM ທົດແທນ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ເລືອກລາຍການໂດຍອີງໃສ່ວັນທີ່ສົ່ງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ເລືອກລາຍການໂດຍອີງໃສ່ວັນທີ່ສົ່ງ
 DocType: Grant Application,Has any past Grant Record,ມີບັນຊີລາຍການ Grant ໃດຫນຶ່ງຜ່ານມາ
 ,Sales Analytics,ການວິເຄາະການຂາຍ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ມີ {0}
@@ -5550,7 +5593,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ຕົ້ນທຶນວັດຖຸດິບທີ່ຈໍາຫນ່າຍ
 DocType: Selling Settings,Settings for Selling Module,ການຕັ້ງຄ່າສໍາລັບຂາຍ Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotel Reservation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ການບໍລິການລູກຄ້າ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ການບໍລິການລູກຄ້າ
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,ລາຍການຂໍ້ມູນລູກຄ້າ
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ຜູ້ສະຫມັກສະເຫນີວຽກເຮັດງານທໍາ.
@@ -5567,7 +5610,7 @@
 DocType: Fees,Student Details,ລາຍລະອຽດນັກຮຽນ
 DocType: Purchase Invoice Item,Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
 DocType: Purchase Invoice Item,Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
-DocType: Employee Loan,Repayment Period in Months,ໄລຍະເວລາການຊໍາລະຄືນໃນໄລຍະເດືອນ
+DocType: Loan,Repayment Period in Months,ໄລຍະເວລາການຊໍາລະຄືນໃນໄລຍະເດືອນ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ຄວາມຜິດພາດ: ບໍ່ເປັນ id ທີ່ຖືກຕ້ອງ?
 DocType: Naming Series,Update Series Number,ຈໍານວນ Series ປັບປຸງ
 DocType: Account,Equity,ການລົງທຶນ
@@ -5576,7 +5619,7 @@
 DocType: Task,Closing Date,ວັນປິດ
 DocType: Sales Order Item,Produced Quantity,ປະລິມານການຜະລິດ
 DocType: Timesheet,Work Detail,Work Detail
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ວິສະວະກອນ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ວິສະວະກອນ
 DocType: Journal Entry,Total Amount Currency,ຈໍານວນເງິນສະກຸນເງິນ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ປະກອບການຄົ້ນຫາ Sub
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},ລະຫັດສິນຄ້າທີ່ຕ້ອງການຢູ່ໃນແຖວບໍ່ {0}
@@ -5622,13 +5665,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ຂໍ້ມູນປະເພດຜູ້ໃຫ້ທຶນ
 DocType: Request for Quotation,Supplier Detail,ຂໍ້ມູນຈໍາຫນ່າຍ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ຈໍານວນອະນຸ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ຈໍານວນອະນຸ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ນ້ໍາຫນັກມາດຕະຖານຕ້ອງໄດ້ເພີ່ມສູງເຖິງ 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,ຜູ້ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,ສິນຄ້າພ້ອມສົ່ງ
 DocType: BOM,Materials,ອຸປະກອນການ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ຖ້າຫາກວ່າບໍ່ໄດ້ກວດສອບ, ບັນຊີລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມໃນແຕ່ລະພະແນກບ່ອນທີ່ມັນຈະຕ້ອງມີການນໍາໃຊ້."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},ການສ້າງ {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ແຫລ່ງທີ່ມາແລະເປົ້າຫມາຍ Warehouse ບໍ່ສາມາດຈະເປັນຄືກັນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,ປຊຊກິນວັນແລະປຊຊກິນທີ່ໃຊ້ເວລາເປັນການບັງຄັບ
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ແມ່ແບບພາສີສໍາຫລັບການຊື້ເຮັດທຸລະກໍາ.
@@ -5652,14 +5694,14 @@
 DocType: Shipping Rule,Fixed,ແກ້ໄຂ
 DocType: Vehicle Service,Clutch Plate,ເສື້ອ
 DocType: Company,Round Off Account,ຕະຫຼອດໄປ Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,ຄ່າໃຊ້ຈ່າຍການບໍລິຫານ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,ຄ່າໃຊ້ຈ່າຍການບໍລິຫານ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ໃຫ້ຄໍາປຶກສາ
 DocType: Customer Group,Parent Customer Group,ກຸ່ມລູກຄ້າຂອງພໍ່ແມ່
-DocType: Journal Entry,Subscription,Subscription
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Subscription
 DocType: Purchase Invoice,Contact Email,ການຕິດຕໍ່
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ການສ້າງຄ່າທໍານຽມທີ່ຍັງຄ້າງຢູ່
 DocType: Appraisal Goal,Score Earned,ຄະແນນທີ່ໄດ້ຮັບ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,ໄລຍະເວລາຫນັງສືແຈ້ງການ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,ໄລຍະເວລາຫນັງສືແຈ້ງການ
 DocType: Asset Category,Asset Category Name,ຊັບສິນປະເພດຊື່
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ນີ້ແມ່ນອານາເຂດຂອງຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ຊື່ໃຫມ່ຂາຍສ່ວນບຸກຄົນ
@@ -5673,7 +5715,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
 DocType: Asset,Frequency of Depreciation (Months),ຄວາມຖີ່ຂອງການເສື່ອມລາຄາ (ເດືອນ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ການບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ການບັນຊີ
 DocType: Landed Cost Item,Landed Cost Item,ລູກຈ້າງສິນຄ້າຕົ້ນທຶນ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ສະແດງໃຫ້ເຫັນຄຸນຄ່າສູນ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ປະລິມານຂອງສິນຄ້າໄດ້ຮັບຫຼັງຈາກການຜະລິດ / repacking ຈາກປະລິມານຂອງວັດຖຸດິບ
@@ -5681,7 +5723,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Receivable / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,ຕໍ່ສັ່ງຂາຍສິນຄ້າ
 DocType: Hub Settings,Company Logo,Company Logo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ບັນຊີ Group {0}
 DocType: Healthcare Settings,Patient Registration,ການລົງທະບຽນຜູ້ປ່ວຍ
@@ -5716,11 +5758,10 @@
 DocType: Journal Entry,Total Debit,ເດບິດຈໍານວນທັງຫມົດ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ສໍາເລັດຮູບມາດຕະຖານສິນຄ້າ Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Please select Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ຄົນຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,ຄົນຂາຍ
 DocType: Hotel Room Package,Amenities,ສິ່ງອໍານວຍຄວາມສະດວກ
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ງົບປະມານແລະສູນຕົ້ນທຶນ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ຮູບແບບໃນຕອນຕົ້ນຫຼາຍຂອງການຊໍາລະເງິນບໍ່ໄດ້ອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ສໍາລັບ
 ,Appointment Analytics,Appointment Analytics
 DocType: Vehicle Service,Half Yearly,ເຄິ່ງຫນຶ່ງປະຈໍາປີ
 DocType: Lead,Blog Subscriber,ຈອງ Blog
@@ -5737,6 +5778,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ອອກຈາກ blank ຖ້າຫາກວ່າທ່ານເຮັດໃຫ້ກຸ່ມນັກຮຽນຕໍ່ປີ
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ຖ້າຫາກວ່າການກວດກາ, ບໍ່ມີທັງຫມົດ. ຂອງການເຮັດວຽກວັນຈະປະກອບມີວັນພັກ, ແລະນີ້ຈະຊ່ວຍຫຼຸດຜ່ອນມູນຄ່າຂອງເງິນເດືອນຕໍ່ວັນ"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apps ທີ່ໃຊ້ key ປັດຈຸບັນຈະບໍ່ສາມາດເຂົ້າເຖິງໄດ້, ທ່ານແນ່ໃຈບໍ?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Advance ທັງຫມົດ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ປ່ຽນຮູບແບບແມ່ແບບ
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາວັນທີໄລຍະເລີ່ມຕົ້ນ. ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
@@ -5748,8 +5790,9 @@
 DocType: Opportunity Item,Basic Rate,ອັດຕາພື້ນຖານ
 DocType: GL Entry,Credit Amount,ການປ່ອຍສິນເຊື່ອ
 DocType: Cheque Print Template,Signatory Position,ຕໍາແຫນ່ງລົງນາມ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ກໍານົດເປັນການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ກໍານົດເປັນການສູນເສຍ
 DocType: Timesheet,Total Billable Hours,ທັງຫມົດຊົ່ວໂມງເອີ້ນເກັບເງິນ
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,ຈໍານວນວັນທີ່ລູກຄ້າຕ້ອງຈ່າຍໃບແຈ້ງຫນີ້ທີ່ໄດ້ຮັບຈາກການສະຫມັກນີ້
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ການຊໍາລະເງິນການຮັບ Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາຕໍ່ລູກຄ້ານີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ຕິດຕໍ່ກັນ {0}: ຈັດສັນຈໍານວນເງິນ {1} ຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບຈໍານວນເງິນທີ່ Entry ການຊໍາລະເງິນ {2}
@@ -5768,12 +5811,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ຄໍາຮ້ອງສະຫມັກຂອງກອງທຶນ (ຊັບສິນ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງພະນັກງານນີ້
 DocType: Assessment Result,Summary,Summary
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark ຜູ້ເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ບັນຊີເດບິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ບັນຊີເດບິດ
 DocType: Fiscal Year,Year Start Date,ປີເລີ່ມວັນທີ່
 DocType: Attendance,Employee Name,ຊື່ພະນັກງານ
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ລາຍະການສັ່ງຊື້ລາຍະການຮ້ານອາຫານ
@@ -5785,7 +5828,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ການຊື້
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ປະລິມານບັນຈຸຕ້ອງເທົ່າກັບປະລິມານສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 DocType: Work Order,Manufactured Qty,ຜະລິດຕະພັນຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},ຮຸ້ນບໍ່ມີຢູ່ໃນ {0}
@@ -5793,12 +5836,12 @@
 DocType: Asset,Out of Order,ອອກຈາກຄໍາສັ່ງ
 DocType: Purchase Receipt Item,Accepted Quantity,ຈໍານວນທີ່ໄດ້ຮັບການ
 DocType: Projects Settings,Ignore Workstation Time Overlap,ບໍ່ສົນໃຈເວລາເຮັດວຽກຂອງຄອມພິວເຕີ້
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ເລືອກເລກ Batch
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໃຫ້ກັບລູກຄ້າ.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ໂຄງການ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
 DocType: Patient Service Unit,Medical Administrator,ພະນັກງານແພດ
 DocType: Assessment Plan,Schedule,ກໍານົດເວລາ
 DocType: Account,Parent Account,ບັນຊີຂອງພໍ່ແມ່
@@ -5828,15 +5871,16 @@
 DocType: Asset Repair,Repair Status,Repair Status
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,entries ວາລະສານການບັນຊີ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ມີຈໍານວນທີ່ຈາກ Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,ກະລຸນາເລືອກບັນທຶກພະນັກງານຄັ້ງທໍາອິດ.
 DocType: POS Profile,Account for Change Amount,ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Purchase Invoice,input service,input service
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ຕິດຕໍ່ກັນ {0}: ພັກ / ບັນຊີບໍ່ກົງກັບ {1} / {2} ໃນ {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,ທີມງານບໍາລຸງຮັກສາ
 DocType: Agriculture Analysis Criteria,Soil Analysis,ການວິເຄາະດິນ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,ລະຫັດຂອງລາຍວິຊາ:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Employee,Current Address,ທີ່ຢູ່ປະຈຸບັນ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ຖ້າຫາກວ່າລາຍການແມ່ນ variant ຂອງລາຍການອື່ນຫຼັງຈາກນັ້ນອະທິບາຍ, ຮູບພາບ, ລາຄາ, ພາສີອາກອນແລະອື່ນໆຈະໄດ້ຮັບການກໍານົດໄວ້ຈາກແມ່ແບບເວັ້ນເສຍແຕ່ລະບຸຢ່າງຊັດເຈນ"
 DocType: Serial No,Purchase / Manufacture Details,ຊື້ / ລາຍລະອຽດຜະລິດ
@@ -5885,19 +5929,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},ການຮັບສະຫມັກສໍາລັບການ {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","ລະດູການສໍາລັບການສ້າງຕັ້ງງົບປະມານ, ເປົ້າຫມາຍແລະອື່ນໆ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ຊື່ຂອງຕົວປ່ຽນແປງ
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","ລາຍການ {0} ເປັນແມ່ແບບໄດ້, ກະລຸນາເລືອກເອົາຫນຶ່ງຂອງ variants ຂອງຕົນ"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","ລາຍການ {0} ເປັນແມ່ແບບໄດ້, ກະລຸນາເລືອກເອົາຫນຶ່ງຂອງ variants ຂອງຕົນ"
 DocType: Asset,Asset Category,ປະເພດຊັບສິນ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,ຈ່າຍລວມບໍ່ສາມາດກະທົບທາງລົບ
 DocType: Purchase Order,Advance Paid,ລ່ວງຫນ້າການຊໍາລະເງິນ
 DocType: Item,Item Tax,ພາສີລາຍ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,ອຸປະກອນການຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,ອຸປະກອນການຜະລິດ
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,ການວາງແຜນການຮ້ອງຂໍວັດສະດຸ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ປະກົດວ່າຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Expense Claim,Employees Email Id,Id ພະນັກງານ Email
 DocType: Employee Attendance Tool,Marked Attendance,ຜູ້ເຂົ້າຮ່ວມການເຮັດເຄື່ອງຫມາຍ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,ຫນີ້ສິນໃນປະຈຸບັນ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,ຫນີ້ສິນໃນປະຈຸບັນ
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer ເກີນເວລາທີ່ກໍານົດ.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ສົ່ງ SMS ມະຫາຊົນເພື່ອຕິດຕໍ່ພົວພັນຂອງທ່ານ
 DocType: Patient,A Positive,A Positive
@@ -5908,9 +5952,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ຕົວຈິງຈໍານວນເປັນການບັງຄັບ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard, ແລະໃບສັ່ງຊື້ເພື່ອຈໍາຫນ່າຍນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ."
 DocType: Asset Maintenance Team,Asset Maintenance Team,ທີມບໍາລຸງຮັກສາຊັບສິນ
-DocType: Employee Loan,Loan Type,ປະເພດເງິນກູ້
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ໄດ້ຖືກສົ່ງມາຢ່າງສໍາເລັດຜົນ
+DocType: Loan,Loan Type,ປະເພດເງິນກູ້
 DocType: Scheduling Tool,Scheduling Tool,ເຄື່ອງມືການຕັ້ງເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ບັດເຄຣດິດ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ບັດເຄຣດິດ
 DocType: BOM,Item to be manufactured or repacked,ລາຍການທີ່ຈະໄດ້ຮັບຜະລິດຕະພັນຫຼືຫຸ້ມຫໍ່
 DocType: Employee Education,Major/Optional Subjects,ທີ່ສໍາຄັນ / ວິຊາຖ້າຕ້ອງການ
 DocType: Sales Invoice Item,Drop Ship,Drop ການຂົນສົ່ງ
@@ -5942,7 +5987,7 @@
 DocType: Item,Units of Measure,ຫົວຫນ່ວຍວັດແທກ
 DocType: Manufacturing Settings,Allow Production on Holidays,ອະນຸຍາດໃຫ້ຜະລິດໃນວັນຢຸດ
 DocType: Sales Invoice,Customer's Purchase Order Date,ຂອງລູກຄ້າສັ່ງຊື້ວັນທີ່
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ນະຄອນຫຼວງ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,ນະຄອນຫຼວງ Stock
 DocType: Shopping Cart Settings,Show Public Attachments,ສະແດງ Attachments ສາທາລະນະ
 DocType: Packing Slip,Package Weight Details,Package Details ນ້ໍາຫນັກ
 DocType: Restaurant Reservation,Reservation Time,ເວລາ Reservation
@@ -5957,7 +6002,7 @@
 DocType: Purchase Order,To Receive and Bill,ທີ່ຈະໄດ້ຮັບແລະບັນຊີລາຍການ
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd ໂດຍວັນທີ່ບໍ່ສາມາດຢູ່ກ່ອນວັນທີການເຮັດທຸລະກໍາ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ຜະລິດຕະພັນທີ່ແນະນໍາ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ການອອກແບບ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ການອອກແບບ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ Template
 DocType: Serial No,Delivery Details,ລາຍລະອຽດການຈັດສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},ສູນຕົ້ນທຶນທີ່ຕ້ອງການໃນການຕິດຕໍ່ກັນ {0} ໃນພາສີອາກອນຕາຕະລາງສໍາລັບປະເພດ {1}
@@ -5967,20 +6012,20 @@
 DocType: Driver,Expiry Date,ວັນຫມົດອາຍຸ
 DocType: Healthcare Settings,Employee name and designation in print,ຊື່ພະນັກງານແລະການອອກແບບໃນການພິມ
 ,accounts-browser,ບັນຊີຂອງຕົວທ່ອງເວັບ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,ກະລຸນາເລືອກປະເພດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,ກະລຸນາເລືອກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ຕົ້ນສະບັບຂອງໂຄງການ.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ການອະນຸຍາດໃຫ້ໃນໄລຍະການເກັບເງິນຫຼືໄລຍະກໍາລັງສັ່ງ, ການປັບປຸງ &quot;ອະນຸຍາດ&quot; ໃນການຕັ້ງຄ່າຫຼັກຊັບຫຼືຂໍ້ມູນ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ບໍ່ສະແດງໃຫ້ເຫັນສັນຍາລັກເຊັ່ນ: $ etc ໃດຕໍ່ກັບສະກຸນເງິນ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(ຄຶ່ງວັນ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(ຄຶ່ງວັນ)
 DocType: Payment Term,Credit Days,Days ການປ່ອຍສິນເຊື່ອ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ກະລຸນາເລືອກຄົນເຈັບເພື່ອໃຫ້ໄດ້ຮັບການທົດລອງໃນຫ້ອງທົດລອງ
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ນໍາໄປສູ່ການທີ່ໃຊ້ເວລາວັນ
 DocType: Cash Flow Mapping,Is Income Tax Expense,ແມ່ນຄ່າໃຊ້ຈ່າຍພາສີລາຍໄດ້
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ກວດສອບນີ້ຖ້າຫາກວ່ານັກສຶກສາໄດ້ອາໄສຢູ່ໃນ Hostel ສະຖາບັນຂອງ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ກະລຸນາໃສ່ຄໍາສັ່ງຂາຍໃນຕາຕະລາງຂ້າງເທິງ
 ,Stock Summary,Stock Summary
@@ -5991,10 +6036,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ວັນທີ່ສະຫມັກ Ref
 DocType: Employee,Reason for Leaving,ເຫດຜົນສໍາລັບການຊຶ່ງເຮັດໃຫ້
 DocType: BOM Operation,Operating Cost(Company Currency),ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ (ບໍລິສັດສະກຸນເງິນ)
-DocType: Employee Loan Application,Rate of Interest,ອັດຕາການທີ່ຫນ້າສົນໃຈ
+DocType: Loan Application,Rate of Interest,ອັດຕາການທີ່ຫນ້າສົນໃຈ
 DocType: Expense Claim Detail,Sanctioned Amount,ຈໍານວນເງິນທີ່ຖືກເກືອດຫ້າມ
 DocType: Item,Shelf Life In Days,ຊີວິດຊີວິດໃນມື້
 DocType: GL Entry,Is Opening,ເປັນການເປີດກວ້າງການ
+DocType: Department,Expense Approvers,ຄ່າໃຊ້ຈ່າຍຜູ້ໃຊ້
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າເດບິດບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
 DocType: Journal Entry,Subscription Section,Section Subscription
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,ບັນຊີ {0} ບໍ່ມີ
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index f087689..15efa12 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atšaukti medžiaga Apsilankymas {0} prieš panaikinant šį garantinės pretenzijos
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Vertinimo ataskaitos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Vartotojų gaminiai
-DocType: Purchase Receipt,Subscription Detail,Prenumeratos informacija
 DocType: Supplier Scorecard,Notify Supplier,Pranešti tiekėjui
 DocType: Item,Customer Items,klientų daiktai
 DocType: Project,Costing and Billing,Sąnaudų ir atsiskaitymas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Sąskaita {0}: Tėvų sąskaitą {1} negali būti knygos
 DocType: Item,Publish Item to hub.erpnext.com,Paskelbti Prekę hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Siųsti Pranešimai
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,vertinimas
 DocType: Item,Default Unit of Measure,Numatytasis matavimo vienetas
 DocType: SMS Center,All Sales Partner Contact,Visos pardavimo partnerė Susisiekite
-DocType: Employee,Leave Approvers,Palikite Approvers
+DocType: Department,Leave Approvers,Palikite Approvers
 DocType: Sales Partner,Dealer,prekiautojas
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Tyrimai
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Patikrinkite užimtumą
 DocType: Job Applicant,Job Applicant,Darbas Pareiškėjas
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Tai grindžiama sandorių atžvilgiu šis tiekėjas. Žiūrėti grafikas žemiau detales
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,juridinis
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tikrasis tipas mokestis negali būti įtrauktos prekės lygis eilės {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,juridinis
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tikrasis tipas mokestis negali būti įtrauktos prekės lygis eilės {0}
 DocType: Bank Guarantee,Customer,klientas
 DocType: Purchase Receipt Item,Required By,reikalaujama pagal
 DocType: Delivery Note,Return Against Delivery Note,Grįžti Prieš važtaraštyje
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Banko sąskaita negali būti vadinamas {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadovai (ar jų grupės), pagal kurį apskaitos įrašai yra pagaminti ir likučiai išlieka."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Neįvykdyti {0} negali būti mažesnė už nulį ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Apdorojimo atlyginimo užstatas nėra.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Apdorojimo atlyginimo užstatas nėra.
 DocType: Manufacturing Settings,Default 10 mins,Numatytasis 10 min
 DocType: Leave Type,Leave Type Name,Palikite Modelio pavadinimas
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rodyti atvira
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Šiuos veiksmus reikia pačiam patys imtis pirmiau minėtuose pasikartojančiuose veiksmuose
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serija Atnaujinta sėkmingai
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Užsakymas
 DocType: Pricing Rule,Apply On,taikyti ant
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Visi tiekėju Kontaktai Reklama
 DocType: Support Settings,Support Settings,paramos Nustatymai
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Tikimasi Pabaigos data negali būti mažesnė nei planuotos datos
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Eilutės # {0}: dydis turi būti toks pat, kaip {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nauja atostogos taikymas
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Eilutės # {0}: dydis turi būti toks pat, kaip {1} {2} ({3} / {4})"
 ,Batch Item Expiry Status,Serija punktas Galiojimo Būsena
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,bankas projektas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,bankas projektas
 DocType: Membership,membership validaty section,narystės patvirtinantis skyrius
 DocType: Mode of Payment Account,Mode of Payment Account,mokėjimo sąskaitos režimas
 DocType: Consultation,Consultation,Konsultacijos
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,medžiaga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Svetainės kūrimas
 DocType: Opening Invoice Creation Tool Item,Quantity,kiekis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Sąskaitos lentelė gali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Paskolos (įsipareigojimai)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Sąskaitos lentelė gali būti tuščias.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Paskolos (įsipareigojimai)
 DocType: Employee Education,Year of Passing,Metus artimųjų
 DocType: Item,Country of Origin,Kilmės šalis
 DocType: Soil Texture,Soil Texture Criteria,Dirvožemio tekstūros kriterijai
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Pagrindinė kontaktinė informacija
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Atviri klausimai
 DocType: Production Plan Item,Production Plan Item,Gamybos planas punktas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Vartotojas {0} jau priskirtas Darbuotojo {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Vartotojas {0} jau priskirtas Darbuotojo {1}
 DocType: Lab Test Groups,Add new line,Pridėti naują eilutę
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sveikatos apsauga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delsimas mokėjimo (dienomis)
@@ -89,7 +85,7 @@
 ,Delay Days,Vėlavimo dienos
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,faktūra
+DocType: Subscription Invoice,Invoice,faktūra
 DocType: Purchase Invoice Item,Item Weight Details,Prekės svarumo duomenys
 DocType: Asset Maintenance Log,Periodicity,periodiškumas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Finansiniai metai {0} reikalingas
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,abbr
 DocType: Appraisal Goal,Score (0-5),Rezultatas (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Eilutės {0}: {1} {2} nesutampa su {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Eilutės # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Eilutės # {0}:
 DocType: Timesheet,Total Costing Amount,Iš viso Sąnaudų suma
 DocType: Delivery Note,Vehicle No,Automobilio Nėra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Prašome pasirinkti Kainoraštis
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Darbas vyksta
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Prašome pasirinkti datą
 DocType: Daily Work Summary Group,Holiday List,Atostogų sąrašas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,buhalteris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,buhalteris
 DocType: Hub Settings,Selling Price List,Pardavimo kainoraštis
 DocType: Patient,Tobacco Current Use,Tabako vartojimas
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Pardavimo norma
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Pardavimo norma
 DocType: Cost Center,Stock User,akcijų Vartotojas
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonas Nėra
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nauja {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Išsiunčiamas pradinis el. Pašto pranešimas
 ,Sales Partners Commission,Pardavimų Partneriai Komisija
 DocType: Soil Texture,Sandy Clay Loam,Smėlio molio nuosėdos
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Vertė po nusidėvėjimo
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Susijęs
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,"Lankomumas data negali būti mažesnė nei darbuotojo, jungiančia datos"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,"Lankomumas data negali būti mažesnė nei darbuotojo, jungiančia datos"
 DocType: Grading Scale,Grading Scale Name,Vertinimo skalė Vardas
-DocType: Subscription,Repeat on Day,Pakartokite dieną
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tai šaknys sąskaita ir negali būti redaguojami.
 DocType: Sales Invoice,Company Address,Kompanijos adresas
 DocType: BOM,Operations,operacijos
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Negalima nustatyti leidimo pagrindu Nuolaida {0}
+DocType: Subscription,Subscription Start Date,Prenumeratos pradžios data
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Prisegti .csv failą su dviem stulpeliais, po vieną seną pavadinimą ir vieną naują vardą"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} jokiu aktyviu finansinius metus.
 DocType: Packed Item,Parent Detail docname,Tėvų Išsamiau DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Nuoroda: {0}, Prekės kodas: {1} ir klientų: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Bandymo pabaigos data negali būti prieš bandomojo laikotarpio pradžios datą
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kilogramas
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atidarymo dėl darbo.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nėra nurodyta subrangos elementui {0} eilutėje {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pati bendrovė yra įrašytas daugiau nei vieną kartą
 DocType: Patient,Married,Vedęs
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Neleidžiama {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Gauk elementus iš
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Gauk elementus iš
 DocType: Price List,Price Not UOM Dependant,Kaina ne priklausomai nuo UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prekės {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,stabdžių Nafta
 DocType: Tax Rule,Tax Type,mokesčių tipas
 ,Completed Work Orders,Užbaigti darbo užsakymai
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,apmokestinamoji vertė
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,apmokestinamoji vertė
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
 DocType: BOM,Item Image (if not slideshow),Prekė vaizdas (jei ne skaidrių)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Per valandą/ 60) * Tikrasis veikimo laikas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Eilutė # {0}: standartinio dokumento tipas turi būti vienas iš išlaidų reikalavimo arba leidimo įrašo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Pasirinkite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Eilutė # {0}: standartinio dokumento tipas turi būti vienas iš išlaidų reikalavimo arba leidimo įrašo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Pasirinkite BOM
 DocType: SMS Log,SMS Log,SMS Prisijungti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Išlaidos pristatyto objekto
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Tvarkyti darbuotojui skirtą išankstinę sumą
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Pristatymo pranešimas
 DocType: Journal Entry,Opening Entry,atidarymas įrašas
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sąskaita mokate tik
-DocType: Employee Loan,Repay Over Number of Periods,Grąžinti Over periodų skaičius
+DocType: Loan,Repay Over Number of Periods,Grąžinti Over periodų skaičius
 DocType: Stock Entry,Additional Costs,Papildomos išlaidos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Sąskaita su esama sandoris negali būti konvertuojamos į grupę.
 DocType: Lead,Product Enquiry,Prekės Užklausa
 DocType: Education Settings,Validate Batch for Students in Student Group,Patvirtinti Serija studentams Studentų grupės
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ne atostogos rekordas darbuotojo rado {0} už {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ne atostogos rekordas darbuotojo rado {0} už {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Prašome įvesti įmonę pirmas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Prašome pasirinkti Company pirmas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Prašome pasirinkti Company pirmas
 DocType: Employee Education,Under Graduate,pagal diplomas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Prašome nustatyti numatytąjį šabloną pranešimui apie būklės palikimą HR nustatymuose.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Tikslinė Apie
 DocType: BOM,Total Cost,Iš viso išlaidų
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Darbuotojų Paskolos
 DocType: Fee Schedule,Send Payment Request Email,Siųsti mokėjimo užklausą el. Paštu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Prekė {0} sistemoje neegzistuoja arba pasibaigė galiojimas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nekilnojamasis turtas
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Sėkmingai neįregistruota.
 DocType: Assessment Result,Grade,klasė
 DocType: Restaurant Table,No of Seats,Sėdimų vietų skaičius
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Norėdami pridėti dinaminį temą, naudokite jinja žymes kaip <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Paskelbta tiekėjo
 DocType: Asset Maintenance Task,Asset Maintenance Task,Turto išlaikymo užduotis
 DocType: SMS Center,All Contact,visi Susisiekite
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Metinis atlyginimas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Metinis atlyginimas
 DocType: Daily Work Summary,Daily Work Summary,Dienos darbo santrauka
 DocType: Period Closing Voucher,Closing Fiscal Year,Uždarius finansinius metus
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} yra sušaldyti
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Akcijų išlaidos
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Akcijų išlaidos
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Pasirinkite Target sandėlis
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Pasirinkite Target sandėlis
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Prašome įvesti Pageidautina kontaktinį elektroninio pašto adresą
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Prašome įvesti Pageidautina kontaktinį elektroninio pašto adresą
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,contra įrašas
 DocType: Journal Entry Account,Credit in Company Currency,Kredito įmonėje Valiuta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Pirminis adresas
 DocType: Production Plan,Material Request Detail,Medžiagos užklausa išsamiai
 DocType: Selling Settings,Default Quotation Validity Days,Numatytų kuponų galiojimo dienos
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Nustatymai HR modulio
 DocType: SMS Center,SMS Center,SMS centro
 DocType: Sales Invoice,Change Amount,Pakeisti suma
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Vairuotojo pažymėjimo kategorijos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Įveskite pristatymo datą
 DocType: Depreciation Schedule,Make Depreciation Entry,Padaryti nusidėvėjimo įrašą
+DocType: HR Settings,Leave Settings,Palikite nustatymus
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,prašymas tipas
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Padaryti Darbuotojas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,transliavimas
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS nustatymas (internetu / neprisijungus)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Neleidžia kurti laiko žurnalų prieš darbo užsakymus. Operacijos neturi būti stebimos pagal darbo tvarką
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,vykdymas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,vykdymas
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Išsami informacija apie atliktas operacijas.
 DocType: Asset Maintenance Log,Maintenance Status,techninės priežiūros būseną
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Narystės duomenys
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tiekėjas privalo prieš MOKĖTINOS sąskaitą {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Elementus ir kainodara
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Iš viso valandų: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Nuo data turėtų būti per finansinius metus. Darant prielaidą Iš data = {0}
 DocType: Drug Prescription,Interval,Intervalas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Pirmenybė
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Pirmenybė
 DocType: Grant Application,Individual,individualus
 DocType: Academic Term,Academics User,akademikai Vartotojas
 DocType: Cheque Print Template,Amount In Figure,Suma pav
-DocType: Employee Loan Application,Loan Info,paskolos informacija
+DocType: Loan Application,Loan Info,paskolos informacija
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planas techninės priežiūros apsilankymų.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tiekėjo rezultatų kortelės laikotarpis
 DocType: Share Transfer,Share Transfer,Dalintis pervedimu
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Elemento šablonas
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemija
 DocType: Job Offer,Select Terms and Conditions,Pasirinkite Terminai ir sąlygos
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,iš Vertė
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,iš Vertė
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce nustatymai
 DocType: Production Plan,Sales Orders,pardavimų užsakymai
 DocType: Purchase Taxes and Charges,Valuation,įvertinimas
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,numatytasis teritorija
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,televizija
 DocType: Work Order Operation,Updated via 'Time Log',Atnaujinta per &quot;Time Prisijungti&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Avanso suma gali būti ne didesnė kaip {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Pasirinkite klientą ar tiekėją.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Avanso suma gali būti ne didesnė kaip {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,Žurnalo kodas
 DocType: Naming Series,Series List for this Transaction,Serija sąrašas šio sandorio
 DocType: Company,Enable Perpetual Inventory,Įjungti nuolatinio inventorizavimo
+DocType: Bank Guarantee,Charges Incurred,Priskirtos išlaidos
 DocType: Company,Default Payroll Payable Account,Numatytasis darbo užmokesčio mokamas paskyra
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Atnaujinti paštas grupė
 DocType: Sales Invoice,Is Opening Entry,Ar atidarymas įrašą
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Tinkintas rezultatas
 DocType: Delivery Stop,Contact Name,Kontaktinis vardas
 DocType: Course Assessment Criteria,Course Assessment Criteria,Žinoma vertinimo kriterijai
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Mokesčių ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Mokesčių ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studento pažymėjimas:
 DocType: POS Customer Group,POS Customer Group,POS Klientų grupė
 DocType: Land Unit,Land Unit describing various land assets,"Žemės skyrius, kuriame aprašomas įvairias žemės turtas"
@@ -375,9 +372,8 @@
 ,Open Work Orders,Atidaryti darbo užsakymus
 DocType: Payment Term,Credit Months,Kredito mėnesiai
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Neto darbo užmokestis negali būti mažesnis už 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Norėdami sustabdyti pakartotinių klaidų pranešimų siuntimą iš sistemos, prenumeruojame lauką &quot;Išjungta&quot;"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Lapai per metus
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Lapai per metus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Eilutės {0}: Prašome patikrinti &quot;yra iš anksto&quot; prieš paskyra {1}, jei tai yra išankstinis įrašas."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Sandėlių {0} nepriklauso bendrovei {1}
 DocType: Email Digest,Profit & Loss,Pelnas ir nuostoliai
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Nustatykite studentus pagal studentų grupes
 DocType: Item Website Specification,Item Website Specification,Prekė svetainė Specifikacija
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Prekės {0} galiojimas pasibaigė {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Banko įrašai
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Palikite Užblokuoti
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Prekės {0} galiojimas pasibaigė {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Banko įrašai
 DocType: Crop,Annual,metinis
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akcijų Susitaikymas punktas
 DocType: Stock Entry,Sales Invoice No,Pardavimų sąskaita faktūra nėra
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentų grupė kūrimo įrankis kursai
 DocType: Lead,Do Not Contact,Nėra jokio tikslo susisiekti
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Žmonės, kurie mokyti savo organizaciją"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Programinės įrangos kūrėjas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Programinės įrangos kūrėjas
 DocType: Item,Minimum Order Qty,Mažiausias užsakymo Kiekis
 DocType: Pricing Rule,Supplier Type,tiekėjas tipas
 DocType: Course Scheduling Tool,Course Start Date,Žinoma pradžios data
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Skelbia Hub
 DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,medžiaga Prašymas
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,pirkimo informacija
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maksimalus įvertinimas
 DocType: Email Digest,New Quotations,Nauja citatos
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Parašyta darbo užmokestį į darbuotojo remiantis pageidaujamą paštu pasirinkto darbuotojo
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmasis atostogos Tvirtintojas sąraše bus nustatytas kaip numatytasis Palikite jį patvirtinusio
 DocType: Tax Rule,Shipping County,Pristatymas apskritis
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Mokytis
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mokytis
 DocType: Asset,Next Depreciation Date,Kitas Nusidėvėjimas data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Veiklos sąnaudos vienam darbuotojui
 DocType: Accounts Settings,Settings for Accounts,Nustatymai sąskaitų
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neįvykdyti čekiai ir užstatai ir išvalyti
 DocType: Item,Synced With Hub,Sinchronizuojami su Hub
 DocType: Driver,Fleet Manager,laivyno direktorius
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Eilutė # {0}: {1} negali būti neigiamas už prekę {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Eilutė # {0}: {1} negali būti neigiamas už prekę {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Neteisingas slaptažodis
 DocType: Item,Variant Of,variantas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Užbaigtas Kiekis negali būti didesnis nei &quot;Kiekis iki Gamyba&quot;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Prašome nustatyti viešbučio kambario kainą už ()
 DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Sąskaitos faktūros tipas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Važtaraštis
 DocType: Consultation,Encounter Impression,Susiduria su įspūdžiais
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Įsteigti Mokesčiai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kaina Parduota turto
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Norma, pagal kurią Klientas valiuta konvertuojama į kliento bazine valiuta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Žinoma planavimas įrankių
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Skubu] Klaida kuriant pasikartoja %s %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
 DocType: Land Unit,LInked Analysis,Įtraukta analizė
 DocType: Item Tax,Tax Rate,Mokesčio tarifas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Paraiškų teikimo laikotarpis negali būti per du paskirstymo įrašus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Paraiškų teikimo laikotarpis negali būti per du paskirstymo įrašus
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau skirta darbuotojo {1} laikotarpiui {2} į {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Eilutės # {0}: Serijos Nr turi būti toks pat, kaip {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Gavo
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Sukurti studentų grupių
 DocType: Volunteer,Weekends,Savaitgaliai
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredito Pastaba suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredito Pastaba suma
 DocType: Setup Progress Action,Action Document,Veiksmų dokumentas
 DocType: Chapter Member,Website URL,Svetainės URL
 ,Finished Goods,gatavų prekių
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pridėti prekę
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Prekė kokybės inspekcija Parametras
+DocType: Leave Application,Leave Approver Name,Palikite jį patvirtinusio pavadinimas
 DocType: Depreciation Schedule,Schedule Date,Tvarkaraštis data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Darbo užmokestis, atskaitymai ir kito atlyginimo dalys"
 DocType: Packed Item,Packed Item,supakuotas punktas
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Užklausimas
 DocType: Healthcare Settings,Require Lab Test Approval,Reikalauti gero bandymo patvirtinimo
 DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Viso neįvykdyti
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Viso neįvykdyti
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.
 DocType: Dosage Strength,Strength,Jėga
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Sukurti naują klientų
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,vartojimo kaina
 DocType: Purchase Receipt,Vehicle Date,Automobilio data
 DocType: Student Log,Medical,medicinos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,"Priežastis, dėl kurios praranda"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,"Priežastis, dėl kurios praranda"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Atnaujinti sąskaitos numerį
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,"Švinas savininkas gali būti toks pat, kaip pirmaujančios"
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Paskirti suma gali ne didesnis nei originalios suma
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,vienas
 DocType: Salary Slip,Total Loan Repayment,Viso paskolų grąžinimas
 DocType: Account,Cost of Goods Sold,Parduotų prekių kaina
-DocType: Subscription,Yearly,kasmet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Prašome įvesti sąnaudų centro
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Prašome įvesti sąnaudų centro
 DocType: Drug Prescription,Dosage,Dozavimas
 DocType: Journal Entry Account,Sales Order,Pardavimo užsakymas
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. pardavimo kaina
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Vid. pardavimo kaina
 DocType: Assessment Plan,Examiner Name,Eksperto vardas
 DocType: Lab Test Template,No Result,Nėra rezultatas
 DocType: Purchase Invoice Item,Quantity and Rate,Kiekis ir Balsuok
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Prašome įvesti įmonės pavadinimą pirmoji
 DocType: Purchase Invoice,Supplier Name,tiekėjas Vardas
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Skaityti ERPNext vadovas
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Rodyti visų departamento narių lapelius kalendoriuje
 DocType: Purchase Invoice,01-Sales Return,01-Pardavimų grąža
 DocType: Account,Is Group,yra grupė
 DocType: Email Digest,Pending Purchase Orders,Kol Pirkimų užsakymus
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Privalomas laukas - akademiniai metai
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nėra susietas su {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tinkinti įvadinį tekstą, kad eina kaip tos paštu dalį. Kiekvienas sandoris turi atskirą įžanginį tekstą."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Prašome nustatyti numatytąją mokėtiną sąskaitos už bendrovės {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Prašome nustatyti numatytąją mokėtiną sąskaitos už bendrovės {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Sandoris neleidžiamas nuo sustojimo Darbų užsakymas {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global nustatymai visus gamybos procesus.
 DocType: Accounts Settings,Accounts Frozen Upto,Sąskaitos Šaldyti upto
 DocType: SMS Log,Sent On,išsiųstas
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
 DocType: HR Settings,Employee record is created using selected field. ,Darbuotojų įrašas sukurtas naudojant pasirinktą lauką.
 DocType: Sales Order,Not Applicable,Netaikoma
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Atostogų meistras.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Skirta pardavimui
 DocType: Packing Slip,From Package No.,Nuo paketas Nr
 DocType: Item Attribute,To Range,Norėdami Diapazonas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vertybiniai popieriai ir užstatai
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nepavyksta pakeisti vertinimo metodą, nes yra sandoriai prieš kai daiktų kuri neturi tai savo vertinimo metodas"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Vertybiniai popieriai ir užstatai
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nepavyksta pakeisti vertinimo metodą, nes yra sandoriai prieš kai daiktų kuri neturi tai savo vertinimo metodas"
 DocType: Student Report Generation Tool,Attended by Parents,Dalyvauja tėvai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,skiriamos viso lapai yra privalomi
 DocType: Patient,AB Positive,AB teigiamas
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Lankomumas įrašas.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Pajamos komponentas žiniaraštis pagrįstą darbo užmokesčio.
 DocType: Sales Order Item,Used for Production Plan,Naudojamas gamybos planas
-DocType: Employee Loan,Total Payment,bendras Apmokėjimas
+DocType: Loan,Total Payment,bendras Apmokėjimas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Negalima atšaukti sandorio už užbaigtą darbo užsakymą.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laikas tarp operacijų (minutėmis)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} yra atšaukta ir todėl veiksmai negali būti užbaigtas
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Sąrašas keletą savo klientams. Jie gali būti organizacijos ar asmenys.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pakankamai Dalys sukurti
 DocType: POS Profile User,POS Profile User,POS vartotojo profilis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,tiesioginių pajamų
+DocType: Subscription Invoice,Subscription Invoice,Prenumeratos sąskaita faktūra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,tiesioginių pajamų
 DocType: Patient Appointment,Date TIme,Data TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Negali filtruoti pagal sąskaitą, jei sugrupuoti pagal sąskaitą"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,administracijos pareigūnas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,administracijos pareigūnas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Įmonės steigimas ir mokesčiai
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
 DocType: Codification Table,Codification Table,Kodifikavimo lentelė
 DocType: Timesheet Detail,Hrs,h
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Prašome pasirinkti kompaniją
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Prašome pasirinkti kompaniją
 DocType: Stock Entry Detail,Difference Account,skirtumas paskyra
 DocType: Purchase Invoice,Supplier GSTIN,tiekėjas GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ar nėra artimas užduotis, nes jos priklauso nuo užduoties {0} nėra uždarytas."
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Pinigų srautų žemėlapių šablonas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Skirtumas (dr - Cr)
+DocType: Bank Guarantee,Providing,Teikti
 DocType: Account,Profit and Loss,Pelnas ir nuostoliai
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Neleidžiama sukonfigūruoti laboratorijos bandymo šabloną, jei reikia"
 DocType: Patient,Risk Factors,Rizikos veiksniai
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Tiekėjas sąskaitoje Nr
 DocType: Territory,For reference,prašymą priimti prejudicinį sprendimą
 DocType: Healthcare Settings,Appointment Confirmation,Paskyrimo patvirtinimas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Negalite trinti Serijos Nr {0}, kaip ji yra naudojama akcijų sandorių"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Negalite trinti Serijos Nr {0}, kaip ji yra naudojama akcijų sandorių"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Uždarymo (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sveiki
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Perkelti punktas
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Jau nustatytas numatytasis naudotojo {1} pos profilyje {0}, maloniai išjungtas numatytasis"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finansų / apskaitos metus.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,sukauptos vertybės
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Atsiprašome, Eilės Nr negali būti sujungtos"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Atsiprašome, Eilės Nr negali būti sujungtos"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Teritorija reikalinga POS profilyje
 DocType: Supplier,Prevent RFQs,Užkirsti kelią RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Padaryti pardavimo užsakymų
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Atlyginimo užstatas pateiktas laikotarpiui nuo {0} iki {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Atlyginimo užstatas pateiktas laikotarpiui nuo {0} iki {1}
 DocType: Project Task,Project Task,Projektų Užduotis
 ,Lead Id,Švinas ID
 DocType: C-Form Invoice Detail,Grand Total,Bendra suma
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Pristatymo sąskaitos data
 DocType: Production Plan,Production Plan,Gamybos planas
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Sąskaitų faktūrų kūrimo įrankio atidarymas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,pardavimų Grįžti
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Pastaba: Iš viso skiriami lapai {0} turi būti ne mažesnis nei jau patvirtintų lapų {1} laikotarpiui
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,"Nustatykite kiekį sandoriuose, kurie yra pagrįsti serijiniu numeriu"
 ,Total Stock Summary,Viso sandėlyje santrauka
 DocType: Announcement,Posted By,Paskelbtas
 DocType: Item,Delivered by Supplier (Drop Ship),Paskelbta tiekėjo (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Paskirti suma negali būti neigiama
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Prašome nurodyti Bendrovei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Prašome nurodyti Bendrovei
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Apmokestinti Amt
 DocType: Training Result Employee,Training Result Employee,Mokymai Rezultatas Darbuotojų
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiškas Sandėlių nuo kurių akcijų įrašai būtų daromi.
-DocType: Repayment Schedule,Principal Amount,pagrindinę sumą
-DocType: Employee Loan Application,Total Payable Interest,Viso mokėtinos palūkanos
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,pagrindinę sumą
+DocType: Loan Application,Total Payable Interest,Viso mokėtinos palūkanos
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Iš viso neįvykdyti: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pardavimų sąskaita faktūra Lapą
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nuorodos Nr &amp; nuoroda data reikalingas {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
 DocType: Restaurant Reservation,Restaurant Reservation,Restorano rezervavimas
 DocType: Land Unit,Land Unit Name,Žemės vieneto pavadinimas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Pasiūlymas rašymas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Pasiūlymas rašymas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Mokėjimo Įėjimo išskaičiavimas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Įpakavimas
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Pranešti klientams el. Paštu
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Pranešti klientams el. Paštu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Kitas pardavimų asmuo {0} egzistuoja su tuo pačiu Darbuotojo ID
 DocType: Employee Advance,Claimed Amount,Reikalaujama suma
 apps/erpnext/erpnext/config/education.py +180,Masters,Kandidatas
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Mokėjimo šliuzai paskyra nebuvo sukurta, prašome sukurti rankiniu būdu."
 DocType: Supplier Scorecard,Per Year,Per metus
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Negalima dalyvauti šioje programoje pagal DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
 DocType: Sales Invoice,Sales Taxes and Charges,Pardavimų Mokesčiai ir rinkliavos
 DocType: Employee,Organization Profile,organizacijos profilį
 DocType: Vital Signs,Height (In Meter),Aukštis (matuoklyje)
 DocType: Student,Sibling Details,Giminystės detalės
 DocType: Vehicle Service,Vehicle Service,Autoservisų
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatiškai įjungia atsiliepimai prašymas grindžiamas sąlygomis.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatiškai įjungia atsiliepimai prašymas grindžiamas sąlygomis.
 DocType: Employee,Reason for Resignation,"Priežastis, dėl atsistatydinimo"
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Šablonas našumo vertinimus.
 DocType: Sales Invoice,Credit Note Issued,Kredito Pastaba Išduotas
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Priežiūros planas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tada Kainodaros taisyklės yra išfiltruotas remiantis Klientui, klientų grupės, teritorijoje, tiekėjas, Tiekėjas tipas, kampanijos partneris pardavimo ir tt"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Grynasis pokytis Inventorius
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Darbuotojų Paskolos valdymas
 DocType: Employee,Passport Number,Paso numeris
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Ryšys su Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,vadybininkas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,vadybininkas
 DocType: Payment Entry,Payment From / To,Mokėjimo Nuo / Iki
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nustatykite sąskaitą sandėlyje {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,medžiagos pernešimas
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nepavyko rasti kelio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Atidarymas (dr)
+DocType: Loan,Applicant,Pareiškėjas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Siunčiamos laiko žymos turi būti po {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Sukurti pasikartojančius dokumentus
 ,GST Itemised Purchase Register,"Paaiškėjo, kad GST Detalios Pirkimo Registruotis"
 DocType: Course Scheduling Tool,Reschedule,Iš naujo nustatytas
-DocType: Employee Loan,Total Interest Payable,Iš viso palūkanų Mokėtina
+DocType: Loan,Total Interest Payable,Iš viso palūkanų Mokėtina
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Įvežtinė kaina Mokesčiai ir rinkliavos
 DocType: Work Order Operation,Actual Start Time,Tikrasis Pradžios laikas
 DocType: BOM Operation,Operation Time,veikimo laikas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Baigti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Bazė
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Bazė
 DocType: Timesheet,Total Billed Hours,Iš viso Apmokestintos valandos
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Nurašyti suma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Nurašyti suma
 DocType: Leave Block List Allow,Allow User,leidžia vartotojui
 DocType: Journal Entry,Bill No,Billas Nėra
 DocType: Company,Gain/Loss Account on Asset Disposal,Pelnas / nuostolis paskyra nuo turto perdavimo
 DocType: Vehicle Log,Service Details,paslaugų detalės
 DocType: Vehicle Log,Service Details,paslaugų detalės
-DocType: Subscription,Quarterly,kas ketvirtį
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,&quot;EcritureLib&quot;
 DocType: Lab Test Template,Grouped,Grupuojami
 DocType: Selling Settings,Delivery Note Required,Reikalinga Važtaraštis
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,laikas lapas
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Žaliavos remiantis
 DocType: Sales Invoice,Port Code,Uosto kodas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervų sandėlis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervų sandėlis
 DocType: Lead,Lead is an Organization,Švinas yra organizacija
 DocType: Guardian Interest,Interest,palūkanos
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Pardavimai
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,sąskaitos
 DocType: Vehicle,Odometer Value (Last),Odometras Vertė (Paskutinis)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Tiekimo rezultatų vertinimo kriterijų šablonai.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,prekyba
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,prekyba
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Mokėjimo įrašas jau yra sukurta
 DocType: Request for Quotation,Get Suppliers,Gaukite tiekėjus
 DocType: Purchase Receipt Item Supplied,Current Stock,Dabartinis sandėlyje
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},"Eilutės # {0}: Turto {1} nėra susijęs su straipsniais, {2}"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Peržiūrėti darbo užmokestį
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},"Eilutės # {0}: Turto {1} nėra susijęs su straipsniais, {2}"
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Peržiūrėti darbo užmokestį
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Sąskaita {0} buvo įrašytas kelis kartus
 DocType: Account,Expenses Included In Valuation,"Sąnaudų, įtrauktų Vertinimo"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Galite atnaujinti tik jei narystės terminas baigiasi per 30 dienų
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Pasirinkite tik tada, jei turite nustatymus Pinigų srauto kartografavimo dokumentus"
 DocType: Email Digest,Next email will be sent on:,Kitas laiškas bus išsiųstas į:
 DocType: Supplier Scorecard,Per Week,Per savaitę
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Prekė turi variantus.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Viso studento
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Prekė {0} nerastas
 DocType: Bin,Stock Value,vertybinių popierių kaina
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kreditinė kortelė įrašas
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Įmonė ir sąskaitos
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,vertės
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,vertės
 DocType: Asset Settings,Depreciation Options,Nusidėvėjimo galimybės
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Neteisingas skelbimo laikas
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Neteisingas skelbimo laikas
 DocType: Lead,Campaign Name,kampanijos pavadinimas
 DocType: Hotel Room,Capacity,Talpa
 DocType: Selling Settings,Close Opportunity After Days,Uždaryti progą dienų
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kliento Užsakymo Nėra
 DocType: Budget,Budget Against,biudžeto prieš
 DocType: Employee,Cell Number,Telefono numeris
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Nė vienas darbuotojas pagal nurodytus kriterijus nėra. Patikrinkite, ar atlyginimų čekiai dar nebuvo sukurti."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Nė vienas darbuotojas pagal nurodytus kriterijus nėra. Patikrinkite, ar atlyginimų čekiai dar nebuvo sukurti."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Medžiaga Prašymai Sugeneruoti
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,prarastas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Jūs negalite įvesti dabartinį kuponą į &quot;prieš leidinys įrašas&quot; skiltyje
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Pasirinkite lentelę
 DocType: BOM,Website Specifications,Interneto svetainė duomenys
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} yra netinkamas el. Pašto adresas &quot;gavėjams&quot;
 DocType: Special Test Items,Particulars,Duomenys
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nuo {0} tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Nuo {0} tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Eilutės {0}: konversijos faktorius yra privalomas
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Keli Kaina Taisyklės egzistuoja tais pačiais kriterijais, prašome išspręsti konfliktą suteikti pirmenybę. Kaina Taisyklės: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Negalima išjungti arba atšaukti BOM kaip ji yra susijusi su kitais BOMs
 DocType: Asset,Maintenance,priežiūra
+DocType: Subscriber,Subscriber,Abonentas
 DocType: Item Attribute Value,Item Attribute Value,Prekė Pavadinimas Reikšmė
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Atnaujinkite savo projekto būseną
 DocType: Item,Maximum sample quantity that can be retained,"Maksimalus mėginių kiekis, kurį galima išsaugoti"
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Numatytieji nustatymai krepšelį
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Pridėti &quot;Timeslots&quot;
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Turto sunaikintas per žurnalo įrašą {0}
-DocType: Employee Loan,Interest Income Account,Palūkanų pajamų sąskaita
+DocType: Loan,Interest Income Account,Palūkanų pajamų sąskaita
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Išsiųsta pakvietimo peržiūra
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,biotechnologijos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Biuro išlaikymo sąnaudos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Biuro išlaikymo sąnaudos
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Eiti į
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Įsteigti pašto dėžutę
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Prašome įvesti Elementą pirmas
 DocType: Asset Repair,Downtime,Prastovos laikas
 DocType: Account,Liability,atsakomybė
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademinis terminas:
 DocType: Salary Detail,Do not include in total,Neįtraukite iš viso
 DocType: Company,Default Cost of Goods Sold Account,Numatytasis išlaidos parduotų prekių sąskaita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Mėginio kiekis {0} negali būti didesnis nei gautas kiekis {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Kainų sąrašas nepasirinkote
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Kainų sąrašas nepasirinkote
 DocType: Employee,Family Background,šeimos faktai
 DocType: Request for Quotation Supplier,Send Email,Siųsti laišką
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
 DocType: Item,Max Sample Quantity,Maksimalus mėginio kiekis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nėra leidimo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nėra leidimo
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citata prašoma
 DocType: Vital Signs,Heart Rate / Pulse,Širdies ritmas / impulsas
 DocType: Company,Default Bank Account,Numatytasis banko sąskaitos
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,"Daiktai, turintys aukštąjį weightage bus rodomas didesnis"
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab testus ir gyvybinius požymius
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankas Susitaikymas detalės
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nėra darbuotojas nerasta
-DocType: Subscription,Stopped,sustabdyta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projekto atnaujinimas.
 DocType: SMS Center,All Customer Contact,Viskas Klientų Susisiekite
 DocType: Land Unit,Tree Details,medis detalės
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Visi punktas Grupės
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatiškai kurti pranešimą pateikus sandorius.
 DocType: Work Order,Item To Manufacture,Prekė Gamyba
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} statusas {2}
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Iš naujo pažymėkite, jei pasirinktas adresas yra redaguotas po įrašymo"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
 DocType: Item,Hub Publishing Details,Hub Publishing duomenys
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Atidarymas&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Atidarymas&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atidarykite daryti
 DocType: Notification Control,Delivery Note Message,Važtaraštis pranešimas
 DocType: Lab Test Template,Result Format,Rezultato formatas
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,Dviejų mėnesių
 DocType: Vehicle Service,Brake Pad,stabdžių bloknotas
 DocType: Fertilizer,Fertilizer Contents,Trąšų turinys
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Tyrimai ir plėtra
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Tyrimai ir plėtra
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Suma Bill
 DocType: Company,Registration Details,Registracija detalės
 DocType: Timesheet,Total Billed Amount,Iš viso mokesčio suma
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Apskaičiuokite kredito limito patikrinimą Pardavimų užsakyme
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Veiklos vertinimas.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Įjungus &quot;Naudokite krepšelį&quot;, kaip Krepšelis yra įjungtas ir ten turėtų būti bent viena Mokesčių taisyklė krepšelį"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Mokėjimo Įėjimo {0} yra susijęs su ordino {1}, patikrinti, ar jis turi būti traukiamas kaip anksto šioje sąskaitoje faktūroje."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Mokėjimo Įėjimo {0} yra susijęs su ordino {1}, patikrinti, ar jis turi būti traukiamas kaip anksto šioje sąskaitoje faktūroje."
 DocType: Sales Invoice Item,Stock Details,akcijų detalės
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,projekto vertė
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Pardavimo punktas
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimali sėdimoji vietovė
 DocType: Item Attribute,Item Attribute Values,Prekė atributų reikšmes
 DocType: Examination Result,Examination Result,tyrimo rezultatas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,pirkimo kvito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,pirkimo kvito
 ,Received Items To Be Billed,Gauti duomenys turi būti apmokestinama
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valiutos kursas meistras.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Nuoroda Dokumento tipo turi būti vienas iš {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
 DocType: Work Order,Plan material for sub-assemblies,Planas medžiaga mazgams
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} turi būti aktyvus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nepavyko perkelti jokių elementų
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} turi būti aktyvus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nepavyko perkelti jokių elementų
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Uždarymas (atidarymas + viso)
 DocType: Journal Entry,Depreciation Entry,Nusidėvėjimas įrašas
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Prašome pasirinkti dokumento tipą pirmas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atšaukti Medžiaga Apsilankymai {0} prieš atšaukiant šią Priežiūros vizitas
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standartas
 DocType: Pricing Rule,Rate or Discount,Įkainiai arba nuolaidos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijos Nr {0} nepriklauso punkte {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serijos Nr {0} nepriklauso punkte {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Reikalinga Kiekis
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoritai
 DocType: Hub Settings,Custom Data,Tinkinti duomenys
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,Medicinos kodekso standartas
 DocType: Soil Texture,Clay Composition (%),Molio sudėtis (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Prašome išsaugoti prieš priskirdami užduotį.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,balansinė vertė
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,balansinė vertė
 DocType: Lab Test,Lab Technician,Laboratorijos technikas
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pardavimų Kainų sąrašas
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Pardavimų Kainų sąrašas
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jei pažymėsite, klientas bus sukurtas, priskirtas pacientui. Paciento sąskaita bus sukurta prieš šį Klientą. Kuriant pacientą galite pasirinkti esamą klientą."
 DocType: Bank Reconciliation,Account Currency,sąskaita Valiuta
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Paminėkite suapvalinti Narystė Bendrovėje
 DocType: Purchase Receipt,Range,diapazonas
 DocType: Supplier,Default Payable Accounts,Numatytieji mokėtinų sumų
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
 DocType: Fee Structure,Components,komponentai
 DocType: Item Barcode,Item Barcode,Prekės brūkšninis kodas
 DocType: Woocommerce Settings,Endpoints,Galutiniai taškai
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","turi būti sukurta. Jei vėluojama, turėsite rankiniu būdu pakeisti lauko &quot;Kartoti mėnesio dieną&quot; lauką"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
 DocType: Share Transfer,From Folio No,Iš Folio Nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkimo faktūros Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Eilutės {0}: Kredito įrašas negali būti susieta su {1}
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,Galima naudoti data
 DocType: Guardian,Guardian Name,globėjas Vardas
 DocType: Cheque Print Template,Has Print Format,Ar spausdintos
-DocType: Employee Loan,Sanctioned,sankcijos
+DocType: Loan,Sanctioned,sankcijos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,privalomas. Galbūt nebuvo sukurtas Valiutų Keitimo įrašas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Eilutės # {0}: Prašome nurodyti Serijos Nr už prekę {1}
 DocType: Crop Cycle,Crop Cycle,Pasėlių ciklas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Dėl &quot;produktas Bundle reikmenys, sandėlis, Serijos Nr paketais Nėra bus laikomas iš&quot; apyrašas stalo &quot;. Jei Sandėlio ir Serija Ne yra vienoda visoms pakavimo jokių daiktų &quot;produktas Bundle&quot; elemento, tos vertės gali būti įrašoma į pagrindinę punkto lentelėje, vertės bus nukopijuoti į &quot;apyrašas stalo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Dėl &quot;produktas Bundle reikmenys, sandėlis, Serijos Nr paketais Nėra bus laikomas iš&quot; apyrašas stalo &quot;. Jei Sandėlio ir Serija Ne yra vienoda visoms pakavimo jokių daiktų &quot;produktas Bundle&quot; elemento, tos vertės gali būti įrašoma į pagrindinę punkto lentelėje, vertės bus nukopijuoti į &quot;apyrašas stalo."
 DocType: Student Admission,Publish on website,Skelbti tinklapyje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Tiekėjas sąskaitos faktūros išrašymo data negali būti didesnis nei Skelbimo data
+DocType: Subscription,Cancelation Date,Atšaukimo data
 DocType: Purchase Invoice Item,Purchase Order Item,Pirkimui užsakyti Elementą
 DocType: Agriculture Task,Agriculture Task,Žemės ūkio Užduotis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,netiesioginė pajamos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,netiesioginė pajamos
 DocType: Student Attendance Tool,Student Attendance Tool,Studentų dalyvavimas įrankis
 DocType: Restaurant Menu,Price List (Auto created),Kainoraštis (automatiškai sukurta)
 DocType: Cheque Print Template,Date Settings,data Nustatymai
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,matuoklis
 DocType: Workstation,Electricity Cost,elektros kaina
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,&quot;Lab test&quot; datatime negali būti prieš rinkimo datą
+DocType: Subscription Plan,Cost,Kaina
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesiųskite Darbuotojų Gimimo diena Priminimai
 DocType: Expense Claim,Total Advance Amount,Visa avansinė suma
 DocType: Delivery Stop,Estimated Arrival,Numatytas atvykimas
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Įkelti savo laiške galvą ir logotipą. (Galite redaguoti juos vėliau).
 DocType: Timesheet Detail,Bill,sąskaita
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,baltas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,baltas
 DocType: SMS Center,All Lead (Open),Visi švinas (Atviras)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Eilutės {0}: Kiekis neprieinama {4} sandėlyje {1} ne komandiruotės laiką įrašo ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Iš žymos langelių sąrašo galite pasirinkti tik vieną variantą.
 DocType: Purchase Invoice,Get Advances Paid,Gauti avansai Mokama
 DocType: Item,Automatically Create New Batch,Automatiškai Sukurti naują partiją
 DocType: Item,Automatically Create New Batch,Automatiškai Sukurti naują partiją
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Priskirti {0} iki {1} (eilutė {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,padaryti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Priskirti {0} iki {1} (eilutė {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,padaryti
 DocType: Student Admission,Admission Start Date,Priėmimo pradžios data
 DocType: Journal Entry,Total Amount in Words,Iš viso suma žodžiais
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Naujas darbuotojas
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
 DocType: Repayment Schedule,Balance Loan Amount,Balansas Paskolos suma
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Tvarkaraštis Kurso
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Akcijų pasirinkimai
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Akcijų pasirinkimai
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Neleisti gauti paskutinių pirkimo duomenų pirkimo užsakyme
 DocType: Journal Entry Account,Expense Claim,Kompensuojamos Pretenzija
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Ar tikrai norite atstatyti šį metalo laužą turtą?
@@ -1388,10 +1382,11 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakavimo Kuponas punktas
 DocType: Purchase Invoice,Cash/Bank Account,Pinigai / banko sąskaitos
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Nurodykite {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
 DocType: Delivery Note,Delivery To,Pristatyti
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantų kūrimas buvo eilėje.
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pirmasis &quot;Atmetimo patvirtinimas&quot; sąraše bus nustatytas kaip numatytasis &quot;Palikimo patvirtinimas&quot;.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Įgūdis lentelė yra privalomi
 DocType: Production Plan,Get Sales Orders,Gauk Pardavimų Užsakymus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} negali būti neigiamas
 DocType: Training Event,Self-Study,Savarankiškas mokymasis
@@ -1404,7 +1399,7 @@
 DocType: Workstation,Wages,užmokestis
 DocType: Asset Maintenance,Maintenance Manager Name,Techninės priežiūros vadybininko vardas
 DocType: Agriculture Task,Urgent,skubus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Nurodykite tinkamą Row ID eilės {0} lentelėje {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Nurodykite tinkamą Row ID eilės {0} lentelėje {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Neįmanoma rasti kintamojo:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Pasirinkite lauką, kurį norite redaguoti iš numpad"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Negali būti elementas ilgalaikio turto, kaip sukuriamas atsargų vadovas."
@@ -1416,7 +1411,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kokybės patikrinimo šablono pavadinimas
 DocType: Project,First Email,Pirmasis el. Paštas
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Sandėlis pardavimų užsakymų / Finished produkcijos sandėlis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Parduodami suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Parduodami suma
 DocType: Repayment Schedule,Interest Amount,palūkanų suma
 DocType: Serial No,Creation Document No,Kūrimas dokumentas Nr
 DocType: Share Transfer,Issue,emisija
@@ -1430,10 +1425,10 @@
 DocType: Tax Rule,Shipping State,Pristatymas valstybė
 ,Projected Quantity as Source,"Prognozuojama, Kiekis, kaip šaltinį"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Prekė turi būti pridėta naudojant &quot;gauti prekes nuo pirkimo kvitus&quot; mygtuką
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Pristatymo kelionė
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Pristatymo kelionė
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Pervedimo tipas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,pardavimų sąnaudos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,pardavimų sąnaudos
 DocType: Consultation,Diagnosis,Diagnozė
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standartinė Ieško
 DocType: GL Entry,Against,prieš
@@ -1442,12 +1437,13 @@
 DocType: Sales Partner,Implementation Partner,įgyvendinimas partneriu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Pašto kodas
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Pasirinkite palūkanų pajamų sąskaitą paskolai {0}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Padaryti atsargų papildymams
 DocType: Packing Slip,Net Weight UOM,Grynasis svoris UOM
 DocType: Item,Default Supplier,numatytasis Tiekėjas
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Per Gamybos pašalpų procentinė dalis
-DocType: Employee Loan,Repayment Schedule,grąžinimo grafikas
+DocType: Loan,Repayment Schedule,grąžinimo grafikas
 DocType: Shipping Rule Condition,Shipping Rule Condition,Gamykliniai nustatymai taisyklė
 DocType: Holiday List,Get Weekly Off Dates,Gauk Savaitinis Off Datos
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Pabaigos data negali būti mažesnė negu pradžios data
@@ -1462,7 +1458,7 @@
 DocType: Education Settings,Attendance Freeze Date,Lankomumas nuo užšalimo data
 DocType: Education Settings,Attendance Freeze Date,Lankomumas nuo užšalimo data
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Sąrašas keletą savo tiekėjais. Jie gali būti organizacijos ar asmenys.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Peržiūrėti visus produktus
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Peržiūrėti visus produktus
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalus Švinas Amžius (dienomis)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalus Švinas Amžius (dienomis)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Visi BOMs
@@ -1471,14 +1467,16 @@
 DocType: Expense Claim,From Employee,iš darbuotojo
 DocType: Driver,Cellphone Number,Mobiliojo telefono numeris
 DocType: Project,Monitor Progress,Stebėti progresą
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Įspėjimas: sistema netikrins per didelių sąskaitų, nes suma už prekę {0} iš {1} yra lygus nuliui"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Įspėjimas: sistema netikrins per didelių sąskaitų, nes suma už prekę {0} iš {1} yra lygus nuliui"
 DocType: Journal Entry,Make Difference Entry,Padaryti Skirtumas įrašą
+DocType: Supplier Quotation,Auto Repeat Section,Automatinis kartojimo skyrius
 DocType: Upload Attendance,Attendance From Date,Lankomumas Nuo data
 DocType: Appraisal Template Goal,Key Performance Area,Pagrindiniai veiklos sritis
 DocType: Program Enrollment,Transportation,Transportavimas
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Neteisingas Įgūdis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} turi būti pateiktas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Kiekis turi būti mažesnis arba lygus {0}
+DocType: Department Approver,Department Approver,Skyriaus įgaliotinis
 DocType: SMS Center,Total Characters,Iš viso Veikėjai
 DocType: Employee Advance,Claimed,Pateikta pretenzija
 DocType: Crop,Row Spacing,Eilučių tarpas
@@ -1488,6 +1486,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Mokėjimo Susitaikymas Sąskaita
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,indėlis%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Kaip už pirkimo parametrus, jei pirkimas įsakymu Reikalinga == &quot;Taip&quot;, tada sukurti sąskaitą-faktūrą, vartotojo pirmiausia reikia sukurti pirkinių užsakymą už prekę {0}"
+,HSN-wise-summary of outward supplies,&quot;HSN-wise&quot; - išvežamų prekių santrauka
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Įmonės registracijos numeriai jūsų nuoroda. Mokesčių numeriai ir kt
 DocType: Sales Partner,Distributor,skirstytuvas
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Krepšelis Pristatymas taisyklė
@@ -1501,7 +1500,7 @@
 DocType: Setup Progress Action,Action Name,Veiksmo pavadinimas
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,pradžios metus
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Pirmieji 2 skaitmenys GSTIN turi sutapti su Valstybinio numerio {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Pradžios data einamųjų sąskaitos faktūros laikotarpį
 DocType: Salary Slip,Leave Without Pay,Palikite be darbo užmokesčio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Talpa planavimas Klaida
@@ -1520,26 +1519,26 @@
 DocType: Setup Progress Action,Domains,Domenai
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Pradžios data' negali būti didesnė nei 
 'Pabaigos data'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,valdymas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,valdymas
 DocType: Cheque Print Template,Payer Settings,mokėtojo Nustatymai
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra &quot;S.&quot;, o prekės kodas yra T-shirt &quot;, elementas kodas variantas bus&quot; T-shirt-SM &quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
 DocType: Purchase Invoice,Is Return,Ar Grįžti
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Atsargiai
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Pradžios diena yra didesnė nei pabaigos diena užduočiai &quot;{0}&quot;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Prekių grąžinimas / debeto aviza
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Prekių grąžinimas / debeto aviza
 DocType: Price List Country,Price List Country,Kainų sąrašas Šalis
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Prekės kodas negali būti keičiamas Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Prekės kodas negali būti keičiamas Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konversijos faktorius
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Prašome įvesti Prekės kodas gauti SERIJOS NUMERIS
 DocType: Stock Settings,Default Item Group,Numatytasis Elementas Grupė
-DocType: Employee Loan,Partially Disbursed,dalinai Išmokėta
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Informacija apie dotaciją.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Informacija apie dotaciją.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tiekėjas duomenų bazę.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Jūs negalite iš naujo paleisti Prenumeratos, kuri nėra atšaukta."
 DocType: Account,Balance Sheet,Balanso lapas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
 DocType: Fee Validity,Valid Till,Galioja iki
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Viso tėvų mokytojų susitikimas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Eilutės # {0}: Atmesta Kiekis negali būti įrašytas į pirkimo Grįžti
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Kliento grupės keitimas pasirinktam Klientui yra draudžiamas.
 ,Purchase Order Items To Be Billed,Pirkimui užsakyti klausimai turi būti apmokestinama
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Atnaujintas numatomas atvykimo laikas.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Atnaujintas numatomas atvykimo laikas.
 DocType: Program Enrollment Tool,Enrollment Details,Registracijos duomenys
 DocType: Purchase Invoice Item,Net Rate,grynasis Balsuok
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Pasirinkite klientą
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,Einamuosius fiskalinius metus
 DocType: Purchase Order,Group same items,Grupė pačių daiktų
 DocType: Purchase Invoice,Disable Rounded Total,Išjungti Apvalus Iš viso
-DocType: Employee Loan Application,Repayment Info,grąžinimas Informacija
+DocType: Department,Parent Department,Tėvų departamentas
+DocType: Loan Application,Repayment Info,grąžinimas Informacija
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Įrašai&quot; negali būti tuščias
 DocType: Maintenance Team Member,Maintenance Role,Priežiūros vaidmuo
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dubliuoti eilutė {0} su tuo pačiu {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dubliuoti eilutė {0} su tuo pačiu {1}
 ,Trial Balance,bandomasis balansas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Įsteigti Darbuotojai
 DocType: Sales Order,SO-,SO
 DocType: Hotel Room Reservation,Hotel Reservation User,Viešbučių rezervavimo vartotojas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Prašome pasirinkti prefiksą pirmas
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,tyrimas
+DocType: Subscription Settings,Subscription Settings,Prenumeratos nustatymai
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,tyrimas
 DocType: Maintenance Visit Purpose,Work Done,Darbas pabaigtas
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Prašome nurodyti bent vieną atributą Atributų lentelės
 DocType: Announcement,All Students,Visi studentai
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
 DocType: Crop Cycle,Less than a year,Mažiau nei metus
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Studentų Mobilus Ne
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Likęs pasaulis
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Likęs pasaulis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
 DocType: Crop,Yield UOM,Išeiga UOM
 ,Budget Variance Report,Biudžeto Dispersija ataskaita
 DocType: Salary Slip,Gross Pay,Pilna Mokėti
 DocType: Item,Is Item from Hub,Ar prekė iš centro
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Eilutės {0}: veiklos rūšis yra privalomas.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendai
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,apskaitos Ledgeris
 DocType: Stock Reconciliation,Difference Amount,skirtumas suma
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} paliktas {1}
 DocType: Purchase Invoice,Reverse Charge,Atvirkštinio apmokestinimo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Nepaskirstytasis pelnas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Nepaskirstytasis pelnas
 DocType: Purchase Invoice,05-Change in POS,05 pakeitimas POS
 DocType: Vehicle Log,Service Detail,Paslaugų detalės
 DocType: BOM,Item Description,Prekės Aprašymas
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,galimybė punktas
 ,Student and Guardian Contact Details,Studentų ir globėjas Kontaktinė informacija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Eilutės {0}: Dėl tiekėjo {0} el.pašto adresas yra reikalingi siųsti laišką
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,laikinas atidarymas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,laikinas atidarymas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Peržiūrėti centru
 ,Employee Leave Balance,Darbuotojų atostogos balansas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Likutis sąskaitoje {0} visada turi būti {1}
 DocType: Patient Appointment,More Info,Daugiau informacijos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},"Vertinimo tarifas, kurio reikia už prekę iš eilės {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},"Vertinimo tarifas, kurio reikia už prekę iš eilės {0}"
 DocType: Supplier Scorecard,Scorecard Actions,Rezultatų kortelės veiksmai
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Pavyzdys: magistro Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,atmesta sandėlis
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,į
 DocType: Supplier Quotation Item,Lead Time in days,Švinas Laikas dienų
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Mokėtinos sumos Santrauka
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Apmokėjimas algos nuo {0} ir {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Apmokėjimas algos nuo {0} ir {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Neregistruota redaguoti įšaldytą sąskaitą {0}
 DocType: Journal Entry,Get Outstanding Invoices,Gauk neapmokėtų sąskaitų faktūrų
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testo rekvizitai
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Bendras išdavimas / Pervežimas kiekis {0} Krovimas Užsisakyti {1} \ negali būti didesnis nei prašomo kiekio {2} už prekę {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,mažas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,mažas
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Sąskaitų faktūrų kūrimo įrankio atidarymas
 DocType: Education Settings,Employee Number,Darbuotojo numeris
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Atšaukti sąskaitą po lengvatinio laikotarpio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Byloje Nr (-ai) jau naudojamas. Pabandykite iš byloje Nr {0}
 DocType: Project,% Completed,% Baigtas
 ,Invoiced Amount (Exculsive Tax),Sąskaitoje suma (Exculsive Mokesčių)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijos bandymo data laikas
 DocType: Email Digest,Add Quote,Pridėti Citata
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktorius reikalingas UOM: {0} prekės: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,netiesioginės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,netiesioginės išlaidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Eilutės {0}: Kiekis yra privalomi
 DocType: Agriculture Analysis Criteria,Agriculture,Žemdirbystė
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sinchronizavimo Master Data
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Dėl {0} tik kredito sąskaitos gali būti susijęs su kitos debeto įrašą
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,kapitalo įranga
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,kapitalo įranga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Pirmiausia nustatykite elemento kodą
 DocType: Item,ITEM-,item-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
+DocType: Subscription Plan,Billing Interval Count,Atsiskaitymo interviu skaičius
 DocType: Sales Invoice Item,Edit Description,Redaguoti Aprašymas
 DocType: Antibiotic,Antibiotic,Antibiotikas
 ,Team Updates,komanda Atnaujinimai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,tiekėjas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,tiekėjas
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Nustatymas sąskaitos rūšis, padedanti renkantis šį Narystė sandoriuose."
 DocType: Purchase Invoice,Grand Total (Company Currency),Bendra suma (Įmonės valiuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Sukurti Spausdinti formatas
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,POS punktas grupė
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Siųskite Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatyvus elementas negali būti toks pats kaip prekės kodas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
 DocType: Sales Partner,Target Distribution,Tikslinė pasiskirstymas
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Laikinasis vertinimas
 DocType: Salary Slip,Bank Account No.,Banko sąskaitos Nr
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Kompiuterizuotos darbo vietos
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Užklausimas Tiekėjo
 DocType: Healthcare Settings,Registration Message,Registracijos pranešimas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,techninė įranga
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,techninė įranga
 DocType: Prescription Dosage,Prescription Dosage,Receptinis dozavimas
 DocType: Attendance,HR Manager,Žmogiškųjų išteklių vadybininkas
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Prašome pasirinkti įmonę,"
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,Pradžios ir pabaigos datos
 ,Delivered Items To Be Billed,Pristatyto objekto Norėdami būti mokami
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Atviras BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Sandėlių negali būti keičiama Serijos Nr
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Sandėlių negali būti keičiama Serijos Nr
 DocType: Authorization Rule,Average Discount,Vidutinis nuolaida
 DocType: Project Update,Great/Quickly,Puikiai / greitai
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Prašome pasirinkti partijas partijomis prekę
 DocType: Asset,Depreciation Schedules,nusidėvėjimo Tvarkaraščiai
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST nustatymuose gali būti parinktos šios paskyros:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST nustatymuose gali būti parinktos šios paskyros:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis
 DocType: Activity Cost,Projects,projektai
 DocType: Payment Request,Transaction Currency,Operacijos valiuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Iš {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Vid Dienos Siunčiami
 DocType: POS Profile,Campaign,Kampanija
 DocType: Supplier,Name and Type,Pavadinimas ir tipas
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Patvirtinimo būsena turi būti &quot;Patvirtinta&quot; arba &quot;Atmesta&quot;
 DocType: Physician,Contacts and Address,Kontaktai ir adresas
 DocType: Purchase Invoice,Contact Person,kontaktinis asmuo
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Tikėtina pradžios data"" negali būti didesnis nei ""Tikėtina pabaigos data"""
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,Tinkamumas ir detalės
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Palikite tuščią, jei laikomas visų pavadinimų"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,nuo datetime
 DocType: Email Digest,For Company,dėl Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Ryšio žurnalas.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Užklausimas yra išjungtas patekti iš portalo, daugiau patikrinimų portalo nustatymus."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tiekėjo rezultatų lentelės vertinimo kintamasis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ieško suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Ieško suma
 DocType: Sales Invoice,Shipping Address Name,Pristatymas Adresas Pavadinimas
 DocType: Material Request,Terms and Conditions Content,Terminai ir sąlygos turinys
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kuriant tvarkaraštį sukūrėme klaidų
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pirmasis išlaidų patvirtiniklis sąraše bus nustatytas kaip numatytasis išlaidų patvirtinimas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,negali būti didesnis nei 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
 DocType: Maintenance Visit,Unscheduled,Neplanuotai
 DocType: Employee,Owned,priklauso
 DocType: Salary Detail,Depends on Leave Without Pay,Priklauso nuo atostogų be Pay
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,Pakuotės kodas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,mokinys
 DocType: Purchase Invoice,Company GSTIN,Įmonės GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Neigiama Kiekis neleidžiama
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Neigiama Kiekis neleidžiama
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Mokesčių detalė stalo nerealu iš punkto meistras kaip eilutę ir saugomi šioje srityje. Naudojama mokesčių ir rinkliavų
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jei sąskaita yra sušaldyti, įrašai leidžiama ribojamų vartotojams."
 DocType: Email Digest,Bank Balance,banko balansas
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Palikite patvirtinantįjį privaloma palikti paraišką
 DocType: Job Opening,"Job profile, qualifications required etc.","Darbo profilis, reikalingas kvalifikacijos ir tt"
 DocType: Journal Entry Account,Account Balance,Sąskaitos balansas
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Mokesčių taisyklė sandorius.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Šaltinis sandėlis yra privalomas eilės {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Apmokėjimo terminas eilutėje {0} yra galimas dublikatas.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Žemės ūkis (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakavimo lapelis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Biuro nuoma
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakavimo lapelis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Biuro nuoma
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
 DocType: Disease,Common Name,Dažnas vardas
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importas Nepavyko!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nėra adresas pridėta dar.
 DocType: Workstation Working Hour,Workstation Working Hour,Kompiuterizuotos darbo vietos Darbo valandos
 DocType: Vital Signs,Blood Pressure,Kraujo spaudimas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,analitikas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,analitikas
 DocType: Item,Inventory,inventorius
 DocType: Item,Sales Details,pardavimų detalės
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Patvirtinti mokosi kursai studentams Studentų grupės
 DocType: Notification Control,Expense Claim Rejected,Kompensuojamos teiginys atmetamas
 DocType: Item,Item Attribute,Prekė Įgūdis
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,vyriausybė
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,vyriausybė
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,"Kompensuojamos Pretenzija {0} jau egzistuoja, kad transporto priemonė Prisijungti"
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,institutas Vardas
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Prašome įvesti grąžinimo suma
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Prašome įvesti grąžinimo suma
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Prekė Variantai
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Paslaugos
 DocType: HR Settings,Email Salary Slip to Employee,Siųsti darbo užmokestį į darbuotojų
 DocType: Cost Center,Parent Cost Center,Tėvų Kaina centras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Pasirinkite Galima Tiekėjo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Pasirinkite Galima Tiekėjo
 DocType: Sales Invoice,Source,šaltinis
 DocType: Customer,"Select, to make the customer searchable with these fields","Pasirinkite, kad klientas galėtų ieškoti šių laukų"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rodyti uždarytas
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakavimo Kuponas (-ai) atšauktas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Pinigų srautai iš investicinės
 DocType: Program Course,Program Course,programos kursas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Krovinių ir ekspedijavimo Mokesčiai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Krovinių ir ekspedijavimo Mokesčiai
 DocType: Homepage,Company Tagline for website homepage,Įmonės Paantraštė interneto svetainės pagrindiniame puslapyje
 DocType: Item Group,Item Group Name,Prekė Grupės pavadinimas
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Paimta
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Savivaldybės duomenys
 DocType: Leave Block List,Block Holidays on important days.,Blokuoti Šventės svarbiais dienų.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Įveskite visus reikiamus rezultatų vertes (-ius)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Gautinos Santrauka
-DocType: Employee Loan,Monthly Repayment Amount,Mėnesio grąžinimo suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Gautinos Santrauka
+DocType: Loan,Monthly Repayment Amount,Mėnesio grąžinimo suma
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Sąskaitų atidarymas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Prašome nustatyti vartotojo ID lauką darbuotojas įrašo nustatyti Darbuotojų vaidmuo
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Prašome nustatyti vartotojo ID lauką darbuotojas įrašo nustatyti Darbuotojų vaidmuo
 DocType: UOM,UOM Name,UOM Vardas
 DocType: GST HSN Code,HSN Code,HSN kodas
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,įnašo suma
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Naudotojas {0} jau yra priskirtas gydytojui {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Dėžė
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,galimas Tiekėjas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,galimas Tiekėjas
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mėnesio pasiskirstymas
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Imtuvas sąrašas tuščias. Prašome sukurti imtuvas sąrašas
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sveikatos priežiūra (beta)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Neturite prekių pakuotės
 DocType: Shipping Rule Condition,From Value,nuo Vertė
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
-DocType: Employee Loan,Repayment Method,grąžinimas būdas
+DocType: Loan,Repayment Method,grąžinimas būdas
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jei pažymėta, Titulinis puslapis bus numatytasis punktas grupė svetainėje"
 DocType: Quality Inspection Reading,Reading 4,svarstymą 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Ieškiniai dėl įmonės sąskaita.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Reikalingas sertifikatas
 DocType: Company,Default Holiday List,Numatytasis poilsis sąrašas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Eilutės {0}: Nuo laiką ir Laikas {1} iš dalies sutampa su {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Akcijų Įsipareigojimai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Akcijų Įsipareigojimai
 DocType: Purchase Invoice,Supplier Warehouse,tiekėjas tiekiantis sandėlis
 DocType: Opportunity,Contact Mobile No,Kontaktinė Mobilus Nėra
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Pasirinkite įmonę
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,Spausdinti skyriuje
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Vartotojas {0} neturi numatytojo POS profilio. Patikrinkite numatytuosius šio vartotojo {1} eilutėje (1).
 DocType: Student Group,Set 0 for no limit,Nustatykite 0 jokios ribos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dieną (-os), kada prašote atostogų yra šventės. Jums nereikia prašyti atostogų."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dieną (-os), kada prašote atostogų yra šventės. Jums nereikia prašyti atostogų."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,"Rida {idx}: {field} reikalinga, kad būtų sukurtos &quot;Opening {invoice_type}&quot; sąskaitos faktūros"
 DocType: Customer,Primary Address and Contact Detail,Pirminis adresas ir kontaktiniai duomenys
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Persiųsti Mokėjimo paštu
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Pasirinkite bent vieną domeną.
 DocType: Dependent Task,Dependent Task,priklauso nuo darbo
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pabandykite planuoja operacijas X dienų iš anksto.
 DocType: HR Settings,Stop Birthday Reminders,Sustabdyti Gimimo diena Priminimai
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
 DocType: SMS Center,Receiver List,imtuvas sąrašas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Paieška punktas
 DocType: Payment Schedule,Payment Amount,Mokėjimo suma
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,vertinimo skalė
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,jau baigtas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Akcijų In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Akcijų In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importas sėkmingai!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kaina išduotą prekės
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,citata punktas
 DocType: Customer,Customer POS Id,Klientų POS ID
 DocType: Account,Account Name,Paskyros vardas
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Nuo data negali būti didesnis nei data
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serijos Nr {0} kiekis {1} negali būti frakcija
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Nuo data negali būti didesnis nei data
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serijos Nr {0} kiekis {1} negali būti frakcija
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Įveskite Woocommerce serverio URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tiekėjas tipas meistras.
 DocType: Purchase Order Item,Supplier Part Number,Tiekėjas Dalies numeris
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Perskaičiavimo kursas negali būti 0 arba 1
 DocType: Share Balance,To No,Ne
-DocType: Subscription,Reference Document,Informacinis dokumentas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} yra atšauktas arba sustabdytas
 DocType: Accounts Settings,Credit Controller,kredito valdiklis
-DocType: Grant Application,Applicant Type,Pareiškėjo tipas
+DocType: Loan,Applicant Type,Pareiškėjo tipas
 DocType: Purchase Invoice,03-Deficiency in services,03 - paslaugų trūkumas
 DocType: Delivery Note,Vehicle Dispatch Date,Automobilio išsiuntimo data
 DocType: Healthcare Settings,Default Medical Code Standard,Numatytasis medicinos kodekso standartas
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Sąskaitos išrašytos
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,saugomos Kiekis
 DocType: Party Account,Party Account,šalis paskyra
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Žmogiškieji ištekliai
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Žmogiškieji ištekliai
 DocType: Lead,Upper Income,viršutinė pajamos
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,atmesti
 DocType: Journal Entry Account,Debit in Company Currency,Debeto įmonėje Valiuta
 DocType: BOM Item,BOM Item,BOM punktas
 DocType: Appraisal,For Employee,darbuotojo
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Padaryti Išmok ÷ jimo įrašas
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Padaryti Išmok ÷ jimo įrašas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Eilutės {0}: Išankstinis prieš Tiekėjas turi būti nurašyti
 DocType: Company,Default Values,numatytosios vertės
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} turi būti didesnis nei 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Sandėlyje galima
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Sandėlyje galima
 DocType: Manufacturing Settings,Capacity Planning For (Days),Talpa planavimas (dienos)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Viešųjų pirkimų
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nė vienas iš daiktų turite kokių nors kiekio ar vertės pokyčius.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nė vienas iš daiktų turite kokių nors kiekio ar vertės pokyčius.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Privalomas laukas - Programa
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Privalomas laukas - Programa
 DocType: Special Test Template,Result Component,Rezultato komponentas
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Įtraukti atostogas per lapus kaip lapai
 DocType: Sales Invoice,Packed Items,Fasuoti daiktai
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantija pretenzija Serijos Nr
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Iš viso&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Iš viso&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Įjungti Prekių krepšelis
 DocType: Employee,Permanent Address,Nuolatinis adresas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,parduoda Nustatymai
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Patvirtinti veiksmą
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Dabar Aukcionai
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Prašome nurodyti arba kiekis ar Vertinimo norma arba abu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Prašome nurodyti arba kiekis ar Vertinimo norma arba abu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,įvykdymas
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Žiūrėti krepšelį
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,rinkodaros išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,rinkodaros išlaidos
 ,Item Shortage Report,Prekė trūkumas ataskaita
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Negalima sukurti standartinių kriterijų. Pervardykite kriterijus
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,Gauk šabloną
 DocType: Material Request,Transferred,Perduotas
 DocType: Vehicle,Doors,durys
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext sąranka baigta
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext sąranka baigta
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Rinkti paciento registracijos mokestį
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Negalima keisti požymių po atsargų sandorio. Padarykite naują prekę ir perkelkite akcijas į naują prekę
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Negalima keisti požymių po atsargų sandorio. Padarykite naują prekę ir perkelkite akcijas į naują prekę
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,mokesčių Breakup
 DocType: Packing Slip,PS-,PS
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,susitaikymas JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Per daug stulpelių. Eksportuoti ataskaitą ir jį atspausdinti naudojant skaičiuoklės programą.
 DocType: Purchase Invoice Item,Batch No,Serijos Nr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Darbuotojų avansai
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leisti kelis pardavimų užsakymų prieš Kliento Užsakymo
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 DocType: Grant Application,Assessment  Mark (Out of 10),Vertinimo ženklas (iš 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilus Nėra
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,pagrindinis
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,pagrindinis
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variantas
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nustatyti priešdėlis numeracijos seriją apie sandorius savo
 DocType: Employee Attendance Tool,Employees HTML,darbuotojai HTML
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Galimybė Nuo srityje yra privalomas
 DocType: Email Digest,Annual Expenses,metinės išlaidos
 DocType: Item,Variants,variantai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Padaryti pirkinių užsakymą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Padaryti pirkinių užsakymą
 DocType: SMS Center,Send To,siųsti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Payment Reconciliation Payment,Allocated amount,skirtos sumos
 DocType: Sales Team,Contribution to Net Total,Indėlis į grynuosius
 DocType: Sales Invoice Item,Customer's Item Code,Kliento punktas kodas
 DocType: Stock Reconciliation,Stock Reconciliation,akcijų suderinimas
 DocType: Territory,Territory Name,teritorija Vardas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Darbas-in-progress sandėlio reikalingas prieš Pateikti
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Prenumeruojant galite turėti tik planus su tuo pačiu atsiskaitymo ciklu
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidatui į darbą.
 DocType: Purchase Order Item,Warehouse and Reference,Sandėliavimo ir nuoroda
 DocType: Supplier,Statutory info and other general information about your Supplier,Teisės aktų informacijos ir kita bendra informacija apie jūsų tiekėjas
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Prieš leidinyje Įėjimo {0} neturi neprilygstamą {1} įrašą
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,vertinimai
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Mokymo renginiai
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serijos Nr įvestas punkte {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicate Serijos Nr įvestas punkte {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Stebėkite laidų šaltinius.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sąlyga laivybos taisyklės
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Prašome įvesti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Prašome įvesti
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Techninės priežiūros žurnalas
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą remiantis punktą arba sandėlyje
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Grynasis svoris šio paketo. (Skaičiuojama automatiškai suma neto masė daiktų)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,Pristatyti ir Bill
 DocType: Student Group,Instructors,instruktoriai
 DocType: GL Entry,Credit Amount in Account Currency,Kredito sumą sąskaitos valiuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} turi būti pateiktas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} turi būti pateiktas
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Dalinkis valdymu
 DocType: Authorization Control,Authorization Control,autorizacija Valdymo
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Eilutės # {0}: Atmesta Sandėlis yra privalomas prieš atmetė punkte {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,mokėjimas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,mokėjimas
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Sandėlių {0} nėra susijęs su bet kokios sąskaitos, nurodykite Sandėlį įrašo sąskaitą arba nustatyti numatytąją inventoriaus sąskaitą įmonę {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Tvarkykite savo užsakymus
 DocType: Work Order Operation,Actual Time and Cost,Tikrasis Laikas ir kaina
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,Studentų atostogos taikymas
 DocType: Item,Will also apply for variants,Bus taikoma variantų
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,apie
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Rinkinys daiktų metu pardavimas.
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,Brūkšniniai kodai
 DocType: Hub Category,Hub Node,Stebulės mazgas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jūs įvedėte pasikartojančius elementus. Prašome ištaisyti ir bandykite dar kartą.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Bendradarbis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Bendradarbis
 DocType: Asset Movement,Asset Movement,turto judėjimas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Darbų užsakymas {0} turi būti pateiktas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,nauja krepšelį
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,"Atsiskaitymo valiuta turi būti lygi arba numatytojo įmonės valiuta, arba šalies sąskaitos valiuta"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nurodo, kad paketas yra šio pristatymo (tik projekto) dalis"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Eilutė {0}: mokėjimo data negali būti prieš paskelbimo datą
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Eilutė {0}: mokėjimo data negali būti prieš paskelbimo datą
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Padaryti Mokėjimo įrašą
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kiekis už prekę {0} turi būti mažesnis nei {1}
 ,Sales Invoice Trends,Pardavimo sąskaita-faktūra tendencijos
 DocType: Leave Application,Apply / Approve Leaves,Taikyti / Patvirtinti lapai
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Dėl
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Gali kreiptis eilutę tik jei įkrova tipas &quot;Dėl ankstesnės eilės suma&quot; ar &quot;ankstesnės eilės Total&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Gali kreiptis eilutę tik jei įkrova tipas &quot;Dėl ankstesnės eilės suma&quot; ar &quot;ankstesnės eilės Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Pristatymas sandėlis
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Medis finansinių išlaidų centrai.
 DocType: Serial No,Delivery Document No,Pristatymas dokumentas Nr
@@ -2325,7 +2332,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Medžiagos suvartojimas nenustatytas Gamybos nustatymuose.
 DocType: Student,Student Mobile Number,Studentų Mobilusis Telefonas Numeris
 DocType: Item,Has Variants,turi variantams
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Negalima perduoti {0} {1} daugiau nei {2} eilutėje. Jei norite leisti pernumeruoti mokestį, nustatykite Suvestinės nustatymuose"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Negalima perduoti {0} {1} daugiau nei {2} eilutėje. Jei norite leisti pernumeruoti mokestį, nustatykite Suvestinės nustatymuose"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atnaujinti atsakymą
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
@@ -2337,12 +2344,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Pirmiausia pasirinkite programą
 DocType: Patient Appointment,Patient Age,Paciento amžius
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,projektų valdymas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serijos numeris {0} jau buvo grąžintas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serijos numeris {0} jau buvo grąžintas
 DocType: Supplier,Supplier of Goods or Services.,Tiekėjas tiekiantis prekes ar paslaugas.
 DocType: Budget,Fiscal Year,Fiskaliniai metai
 DocType: Asset Maintenance Log,Planned,Planuojama
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Numatytos gautinos sąskaitos, kurios bus naudojamos, jei nenustatytos Pacientui, kad galėtumėte užsisakyti konsultacijų mokesčius."
 DocType: Vehicle Log,Fuel Price,kuro Kaina
+DocType: Bank Guarantee,Margin Money,Maržos pinigai
 DocType: Budget,Budget,biudžetas
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Nustatyti Atidaryti
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
@@ -2356,16 +2364,16 @@
 DocType: Lead,Follow Up,Sekti
 DocType: Item,Is Sales Item,Ar Pardavimų punktas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Prekė Grupė medis
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Prekė {0} nėra setup Serijos Nr. Patikrinkite Elementą meistras
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Prekė {0} nėra setup Serijos Nr. Patikrinkite Elementą meistras
 DocType: Maintenance Visit,Maintenance Time,Priežiūros laikas
 ,Amount to Deliver,Suma pristatyti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Tas pats elementas buvo įvestas keletą kartų. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term pradžios data negali būti vėlesnė nei metų pradžioje data mokslo metams, kuris terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Nebuvo klaidų.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Darbuotojas {0} jau pateikė paraišką {1} nuo {2} iki {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Nebuvo klaidų.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Darbuotojas {0} jau pateikė paraišką {1} nuo {2} iki {3}:
 DocType: Guardian,Guardian Interests,Guardian Pomėgiai
 DocType: Naming Series,Current Value,Dabartinė vertė
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
 DocType: Education Settings,Instructor Records to be created by,"Instruktorių įrašai, kuriuos turi sukurti"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} sukūrė
 DocType: GST Account,GST Account,GST sąskaita
@@ -2384,8 +2392,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
 DocType: Website Item Group,Website Item Group,Interneto svetainė punktas grupė
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Pridėta prie mėgstamiausių
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nė vienas atlyginimų slipas, kuris buvo pateiktas dėl pirmiau nurodytų kriterijų ar jau pateikto atlyginimo užstato"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Muitai ir mokesčiai
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nė vienas atlyginimų slipas, kuris buvo pateiktas dėl pirmiau nurodytų kriterijų ar jau pateikto atlyginimo užstato"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Muitai ir mokesčiai
 DocType: Projects Settings,Projects Settings,Projektų nustatymai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Prašome įvesti Atskaitos data
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} mokėjimo įrašai negali būti filtruojami pagal {1}
@@ -2395,27 +2403,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Medis punktas grupes.
 DocType: Production Plan,Total Produced Qty,Bendras pagamintas kiekis
 DocType: Payroll Entry,Get Employee Details,Gaukite darbuotojų informaciją
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Negali remtis eilutės skaičius didesnis nei arba lygus dabartinės eilutės numeris Šio mokesčio tipą
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Negali remtis eilutės skaičius didesnis nei arba lygus dabartinės eilutės numeris Šio mokesčio tipą
 DocType: Asset,Sold,parduota
 ,Item-wise Purchase History,Prekė išmintingas pirkimas Istorija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Prašome spausti &quot;Generuoti grafiką&quot; parsiųsti Serijos Nr pridėta punkte {0}
 DocType: Account,Frozen,užšalęs
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Bazinė suma (Įmonės valiuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Žaliavos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Žaliavos
 DocType: Payment Reconciliation Payment,Reference Row,nuoroda eilutė
 DocType: Installation Note,Installation Time,montavimo laikas
 DocType: Sales Invoice,Accounting Details,apskaitos informacija
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Ištrinti visus sandorių šiai bendrovei
 DocType: Patient,O Positive,O teigiamas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,investicijos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,investicijos
 DocType: Issue,Resolution Details,geba detalės
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,asignavimai
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,priimtinumo kriterijai
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Prašome įvesti Materialieji prašymus pirmiau pateiktoje lentelėje
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Negalima grąžinti žurnalo įrašo
 DocType: Item Attribute,Attribute Name,atributo pavadinimas
 DocType: BOM,Show In Website,Rodyti svetainė
 DocType: Shopping Cart Settings,Show Quantity in Website,Rodyti Kiekis svetainė
-DocType: Employee Loan Application,Total Payable Amount,Iš viso mokėtina suma
+DocType: Loan Application,Total Payable Amount,Iš viso mokėtina suma
 DocType: Task,Expected Time (in hours),Numatomas laikas (valandomis)
 DocType: Item Reorder,Check in (group),Atvykimas (grupė)
 DocType: Soil Texture,Silt,Silt
@@ -2434,7 +2443,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Sumokėti
 DocType: Room,Room Name,Kambarių Vardas
 DocType: Prescription Duration,Prescription Duration,Recepto trukmė
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti taikomas / atšaukė prieš {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti taikomas / atšaukė prieš {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
 DocType: Activity Cost,Costing Rate,Sąnaudų norma
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Klientų Adresai ir kontaktai
 ,Campaign Efficiency,kampanija efektyvumas
@@ -2454,11 +2463,11 @@
 DocType: Chapter,Chapter,Skyrius
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pora
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Numatytoji paskyra bus automatiškai atnaujinama POS sąskaitoje, kai bus pasirinktas šis režimas."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
 DocType: Asset,Depreciation Schedule,Nusidėvėjimas Tvarkaraštis
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Pardavimų Partnerių Adresai ir kontaktai
 DocType: Bank Reconciliation Detail,Against Account,prieš sąskaita
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Pusė dienos data turi būti tarp Nuo datos ir iki šiol
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Pusė dienos data turi būti tarp Nuo datos ir iki šiol
 DocType: Maintenance Schedule Detail,Actual Date,Tikrasis data
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Nustatykite &quot;Numatytųjų kainų centro&quot; skaičių {0} kompanijoje.
 DocType: Item,Has Batch No,Turi Serijos Nr
@@ -2476,7 +2485,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas)
 DocType: Soil Texture,Soil Type,Dirvožemio tipas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nauja žinutė
 ,Quotation Trends,Kainų tendencijos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Prekė Grupė nepaminėta prekės šeimininkui už prekę {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless įgaliojimas
@@ -2496,7 +2504,7 @@
 DocType: Hub Category,Hub Category,Hub kategorija
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Automobilio numeris
-DocType: Employee Loan,Loan Amount,Paskolos suma
+DocType: Loan,Loan Amount,Paskolos suma
 DocType: Student Report Generation Tool,Add Letterhead,Pridėti burtinę
 DocType: Program Enrollment,Self-Driving Vehicle,Savęs Vairavimas automobiliai
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tiekėjo rezultatų lentelė nuolatinė
@@ -2525,9 +2533,9 @@
 DocType: Cash Flow Mapper,Position,Pozicija
 DocType: Patient,Patient Details,Paciento duomenys
 DocType: Patient,B Positive,B teigiamas
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
 DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
 DocType: Patient Medical Record,Patient Medical Record,Paciento medicinos ataskaita
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupė ne grupės
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sporto
@@ -2535,8 +2543,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Iš viso Tikrasis
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,studentų seserys
+DocType: Subscription Plan Detail,Subscription Plan Detail,Išsami prenumeratos plano informacija
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,vienetas
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Prašome nurodyti Company
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Prašome nurodyti Company
 ,Customer Acquisition and Loyalty,Klientų įsigijimas ir lojalumo
 DocType: Asset Maintenance Task,Maintenance Task,Techninės priežiūros užduotis
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Nustatykite B2C limitus GST nustatymuose.
@@ -2551,6 +2560,7 @@
 ,BOM Search,BOM Paieška
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Iš viso sunaudotų medžiagų kaina (per sandėlius)
 DocType: Hub Settings,Company Registered,Registruota bendrovė
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Iki data negali būti mažesnis nei nuo datos
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Paskelbkite &quot;Sandėliuoju&quot; arba &quot;Nėra sandelyje&quot; centre, priklausomai nuo sandėlyje esančių atsargų."
 DocType: Vehicle,Fuel Type,degalų tipas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Prašome nurodyti valiutą Company
@@ -2558,17 +2568,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Akcijų balansas Serija {0} taps neigiamas {1} už prekę {2} į sandėlį {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Šios medžiagos prašymai buvo iškeltas automatiškai pagal elemento naujo užsakymo lygio
 DocType: Email Digest,Pending Sales Orders,Laukiantieji sprendimo Pardavimo Užsakymai
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
 DocType: Employee,Create User Permission,Sukurti vartotojo leidimą
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
 DocType: Healthcare Settings,Remind Before,Prisiminti anksčiau
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konversijos koeficientas yra reikalaujama iš eilės {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
 DocType: Salary Component,Deduction,Atskaita
 DocType: Item,Retain Sample,Išsaugoti pavyzdį
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Eilutės {0}: Nuo Laikas ir laiko yra privalomas.
 DocType: Stock Reconciliation Item,Amount Difference,suma skirtumas
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Prašome įvesti darbuotojo ID Šio pardavimo asmuo
 DocType: Territory,Classification of Customers by region,Klasifikacija klientams regione
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Gamyboje
@@ -2578,8 +2589,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Apskaičiuota bankas pareiškimas balansas
 DocType: Normal Test Template,Normal Test Template,Normalioji bandymo šablonas
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,neįgaliesiems vartotojas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Pasiūlymas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Negalima nustatyti gauta RFQ jokiai citata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Pasiūlymas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Negalima nustatyti gauta RFQ jokiai citata
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Iš viso išskaičiavimas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Pasirinkite paskyrą, kurią norite spausdinti paskyros valiuta"
@@ -2587,7 +2598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tai pagrįsta operacijomis su šiuo pacientu. Išsamiau žr. Toliau pateiktą laiko juostą
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,kaina Atnaujinta
 DocType: Patient,Date of Birth,Gimimo data
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Prekė {0} jau buvo grąžinta
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Prekė {0} jau buvo grąžinta
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Finansiniai metai ** reiškia finansinius metus. Visi apskaitos įrašai ir kiti pagrindiniai sandoriai yra stebimi nuo ** finansiniams metams **.
 DocType: Opportunity,Customer / Lead Address,Klientas / Švino Adresas
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tiekėjo rezultatų kortelės sąranka
@@ -2598,14 +2609,15 @@
 DocType: Work Order Operation,Actual Operation Time,Tikrasis veikimo laikas
 DocType: Authorization Rule,Applicable To (User),Taikoma (Vartotojas)
 DocType: Purchase Taxes and Charges,Deduct,atskaityti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Darbo aprašymas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Darbo aprašymas
 DocType: Student Applicant,Applied,taikomas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Iš naujo atidarykite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Iš naujo atidarykite
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kiekis pagal vertybinių popierių UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Vardas
 DocType: Purchase Invoice,02-Post Sale Discount,02-pardavimo nuolaida
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialūs simboliai, išskyrus &quot;-&quot;. &quot;,&quot; # &quot;, ir &quot;/&quot; neleidžiama pavadinimų seriją"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekite pardavimo kampanijų. Sekite veda, citatos, pardavimų užsakymų ir tt iš kampanijų įvertinti investicijų grąžą."
+DocType: Department Approver,Approver,Tvirtintojas
 ,SO Qty,SO Kiekis
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Laukas &quot;Akcininkas&quot; negali būti tuščias
 DocType: Guardian,Work Address,Darbovietės adresas
@@ -2619,21 +2631,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Visos skirtos sumos (Įmonės valiuta)
 DocType: Purchase Order Item,To be delivered to customer,Turi būti pristatytas pirkėjui
 DocType: BOM,Scrap Material Cost,Laužas medžiagų sąnaudos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serijos Nr {0} nepriklauso bet Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serijos Nr {0} nepriklauso bet Warehouse
 DocType: Grant Application,Email Notification Sent,Siunčiamas pranešimas el. Paštu
 DocType: Purchase Invoice,In Words (Company Currency),Žodžiais (Įmonės valiuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Prekės kodas, sandėlis, kiekis eilutėje"
-DocType: Pricing Rule,Supplier,tiekėjas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Prekės kodas, sandėlis, kiekis eilutėje"
+DocType: Bank Guarantee,Supplier,tiekėjas
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Rodyti mokėjimo informaciją
 DocType: Consultation,Consultation Time,Konsultacijos laikas
 DocType: C-Form,Quarter,ketvirtis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Įvairūs išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Įvairūs išlaidos
 DocType: Global Defaults,Default Company,numatytasis Įmonės
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kompensuojamos ar Skirtumas sąskaitos yra privalomas punktas {0} kaip ji įtakoja bendra akcijų vertė
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banko pavadinimas
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Darbuotojų Paskolos paskyra
 DocType: Leave Application,Total Leave Days,Iš viso nedarbingumo dienų
 DocType: Email Digest,Note: Email will not be sent to disabled users,Pastaba: elektroninio pašto adresas nebus siunčiami neįgaliems vartotojams
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Taškų sąveika
@@ -2649,7 +2660,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Svoris (kilogramais)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",skyrius / chapter_name palikti tuščią automatiškai nustatyti po išsaugojimo skyriuje.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Nustatykite GST paskyras
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Nustatykite GST paskyras
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Verslo tipas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prašome pasirinkti skirtos sumos, sąskaitos faktūros tipas ir sąskaitos numerį atleast vienoje eilėje"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kaina New pirkimas
@@ -2658,12 +2669,13 @@
 DocType: Grant Application,Grant Description,Pareiškimo aprašas
 DocType: Purchase Invoice Item,Rate (Company Currency),Norma (Įmonės valiuta)
 DocType: Student Guardian,Others,kiti
+DocType: Subscription,Discounts,Nuolaidos
 DocType: Payment Entry,Unallocated Amount,Nepaskirstytas kiekis
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nerandate atitikimo elementą. Prašome pasirinkti kokią nors kitą vertę {0}.
 DocType: POS Profile,Taxes and Charges,Mokesčiai ir rinkliavos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produktas arba paslauga, kuri yra perkama, parduodama arba laikomi sandėlyje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ne daugiau atnaujinimai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Negalima pasirinkti įkrovimo tipas, kaip &quot;Dėl ankstesnės eilės Suma&quot; arba &quot;Dėl ankstesnės eilės Total&quot; už pirmoje eilutėje"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Negalima pasirinkti įkrovimo tipas, kaip &quot;Dėl ankstesnės eilės Suma&quot; arba &quot;Dėl ankstesnės eilės Total&quot; už pirmoje eilutėje"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Tai apima visas rezultatų korteles, susietas su šia sąranka"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Vaikų punktas neturėtų būti Prekės paketas. Prašome pašalinti elementą `{0}` ir sutaupyti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,bankinis
@@ -2672,21 +2684,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Prašome spausti &quot;Generuoti grafiką&quot; gauti tvarkaraštį
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numeriravimo serijas lankytojams per sąranką&gt; numeravimo serija
 DocType: Bin,Ordered Quantity,Užsakytas Kiekis
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",pvz &quot;Build įrankiai statybininkai&quot;
 DocType: Grading Scale,Grading Scale Intervals,Vertinimo skalė intervalai
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Pelnas už metus
+DocType: Bank Guarantee,Name of Bank,Banko pavadinimas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: apskaitos įrašas už {2} galima tik valiuta: {3}
 DocType: Fee Schedule,In Process,Procese
 DocType: Authorization Rule,Itemwise Discount,Itemwise nuolaida
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Medis finansines ataskaitas.
+DocType: Bank Guarantee,Reference Document Type,Atskaitos dokumento tipas
 DocType: Cash Flow Mapping,Cash Flow Mapping,Pinigų srautų žemėlapiai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} pagal Pardavimo Užsakymą {1}
 DocType: Account,Fixed Asset,Ilgalaikio turto
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serijinis Inventorius
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Numatytojo adreso el. Pašto adresas nerastas
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generuoti paslaptį
-DocType: Employee Loan,Account Info,Sąskaitos info
+DocType: Loan,Account Info,Sąskaitos info
 DocType: Activity Type,Default Billing Rate,Numatytasis Atsiskaitymo Balsuok
 DocType: Fees,Include Payment,Įtraukti mokėjimą
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentų grupės sukurtas.
@@ -2694,24 +2709,24 @@
 DocType: Sales Invoice,Total Billing Amount,Iš viso Atsiskaitymo suma
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Mokesčių struktūros ir studentų grupės {0} programos skiriasi.
 DocType: Fee Schedule,Receivable Account,gautinos sąskaitos
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
 DocType: Quotation Item,Stock Balance,akcijų balansas
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,"Pardavimų užsakymų, kad mokėjimo"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Vadovas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Vadovas
 DocType: Purchase Invoice,With Payment of Tax,Mokesčio mokėjimas
 DocType: Expense Claim Detail,Expense Claim Detail,Kompensuojamos Pretenzija detalės
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trimis egzemplioriais tiekėjas
 DocType: Land Unit,Is Container,Yra konteineris
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Tai bus pirmoji derliaus ciklo diena
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
 DocType: Purchase Invoice Item,Weight UOM,Svoris UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Turimų akcininkų sąrašas su folio numeriais
 DocType: Salary Structure Employee,Salary Structure Employee,"Darbo užmokesčio struktūrą, darbuotojų"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Rodyti variantų savybes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Rodyti variantų savybes
 DocType: Student,Blood Group,Kraujo grupė
 DocType: Course,Course Name,Kurso pavadinimas
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Vartotojai, kurie gali patvirtinti konkretaus darbuotojo atostogų prašymus"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Biuro įranga
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Biuro įranga
 DocType: Purchase Invoice Item,Qty,Kiekis
 DocType: Fiscal Year,Companies,įmonės
 DocType: Supplier Scorecard,Scoring Setup,Balų nustatymas
@@ -2730,7 +2745,7 @@
 DocType: Stock Entry,Total Incoming Value,Iš viso Priimamojo Vertė
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debeto reikalingas
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Pirkimo Kainų sąrašas
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tiekimo rezultatų kortelės kintamųjų šablonai.
 DocType: Job Offer Term,Offer Term,Siūlau terminas
 DocType: Asset,Quality Manager,Kokybės vadybininkas
@@ -2742,13 +2757,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Iš viso nesumokėtas: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM svetainė Operacija
 DocType: Supplier Scorecard,Supplier Score,Tiekėjo balas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Viso į sąskaitas įtraukto Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Viso į sąskaitas įtraukto Amt
 DocType: Supplier,Warn RFQs,Perspėti RFQ
 DocType: BOM,Conversion Rate,Perskaičiavimo kursas
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Prekės paieška
 DocType: Assessment Plan,To Time,laiko
 DocType: Authorization Rule,Approving Role (above authorized value),Patvirtinimo vaidmenį (virš įgalioto vertės)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kreditas sąskaitos turi būti mokėtinos sąskaitos
+DocType: Loan,Total Amount Paid,Visa sumokėta suma
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Prašome pasirinkti Studentų priėmimą, kuris yra privalomas mokamam studento pareiškėjui"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursija: {0} negali būti tėvų ar vaikas {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Pasirinkite kainoraštį, kad paskelbtumėte kainodarą"
@@ -2758,19 +2774,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Kainų sąrašas {0} yra išjungtas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Eilutės {0}: baigė Kiekis gali būti ne daugiau kaip {1} darbui {2}
 DocType: Manufacturing Settings,Allow Overtime,Leiskite viršvalandžius
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijinis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, prašome naudoti Inventorinis įrašą"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijinis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, prašome naudoti Inventorinis įrašą"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijinis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, prašome naudoti Inventorinis įrašą"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serijinis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, prašome naudoti Inventorinis įrašą"
 DocType: Training Event Employee,Training Event Employee,Mokymai Renginių Darbuotojų
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimalūs mėginiai - {0} gali būti laikomi paketui {1} ir vienetui {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Pridėti laiko laiko tarpsnius
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial numeriai reikalingi punkte {1}. Jūs sąlyga {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial numeriai reikalingi punkte {1}. Jūs sąlyga {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Dabartinis vertinimas Balsuok
 DocType: Training Event,Advance,Iš anksto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,dar kartą pasikartoti.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,&quot;GoCardless&quot; mokėjimo šliuzo nustatymai
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Valiutų Pelnas / nuostolis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Valiutų Pelnas / nuostolis
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Eilutė # {0}: sąskaita {1} nepriklauso bendrovei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Eilutė # {0}: sąskaita {1} nepriklauso bendrovei {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nepavyko rasti DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Naujas adresas
 DocType: Quality Inspection,Sample Size,imties dydis
@@ -2789,7 +2804,6 @@
 DocType: Bin,Actual Quantity,Tikrasis Kiekis
 DocType: Shipping Rule,example: Next Day Shipping,Pavyzdys: Sekanti diena Pristatymas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijos Nr {0} nerastas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Prenumerata buvo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Mokesčių tvarkaraščio programa
 DocType: Fee Schedule Program,Student Batch,Studentų Serija
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Padaryti Studentas
@@ -2805,14 +2819,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-komercija GSTIN
 DocType: Sales Order,Not Delivered,Nepristatytas
 ,Bank Clearance Summary,Bankas Sąskaitų santrauka
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Kurkite ir tvarkykite savo dienos, savaitės ir mėnesio el suskaldyti."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Kurkite ir tvarkykite savo dienos, savaitės ir mėnesio el suskaldyti."
 DocType: Appraisal Goal,Appraisal Goal,vertinimas tikslas
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Pasiūlyti kategoriją?
 DocType: Stock Reconciliation Item,Current Amount,Dabartinis suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Pastatai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Pastatai
 DocType: Fee Schedule,Fee Structure,mokestis struktūra
 DocType: Timesheet Detail,Costing Amount,Sąnaudų dydis
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 DocType: Student Admission Program,Application Fee,Paraiškos mokestis
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Pateikti darbo užmokestį
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm nuolaida Prekės {0} yra {1}%
@@ -2820,12 +2833,13 @@
 DocType: Sales Partner,Address & Contacts,Adresas ir kontaktai
 DocType: SMS Log,Sender Name,siuntėjas Vardas
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Žemės ūkio analizės kriterijai
+DocType: HR Settings,Leave Approval Notification Template,Palikite patvirtinimo pranešimo šabloną
 DocType: POS Profile,[Select],[Pasirinkti]
 DocType: Vital Signs,Blood Pressure (diastolic),Kraujo spaudimas (diastolinis)
 DocType: SMS Log,Sent To,Siunčiami į
 DocType: Agriculture Task,Holiday Management,Atostogų valdymas
 DocType: Payment Request,Make Sales Invoice,Padaryti pardavimo sąskaita-faktūra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Programinė įranga
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Programinė įranga
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
 DocType: Company,For Reference Only.,Tik nuoroda.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Gydytojas {0} negalimas {1}
@@ -2843,7 +2857,7 @@
 DocType: Employee,New Workplace,nauja Darbo
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Medžiagų sunaudojimas
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nustatyti kaip Uždarymo
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nėra Prekė su Brūkšninis kodas {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nėra Prekė su Brūkšninis kodas {0}
 DocType: Normal Test Items,Require Result Value,Reikalauti rezultato vertės
 DocType: Item,Show a slideshow at the top of the page,Rodyti skaidrių peržiūrą į puslapio viršuje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2858,19 +2872,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nėra aktyvus arba numatytąjį darbo užmokesčio struktūrą ir darbuotojo {0} nerasta pagal nurodytą datą
 DocType: Leave Block List,Allow Users,leisti vartotojams
 DocType: Purchase Order,Customer Mobile No,Klientų Mobilus Nėra
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,pasikartojančios
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Pinigų srautų žemėlapių šablono detalės
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Paskolų valdymas
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sekti atskirą pajamos ir išlaidos už produktų segmentus ar padalinių.
 DocType: Rename Tool,Rename Tool,pervadinti įrankis
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atnaujinti Kaina
 DocType: Item Reorder,Item Reorder,Prekė Pertvarkyti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Rodyti Pajamos Kuponas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,perduoti medžiagą
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Rodyti Pajamos Kuponas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,perduoti medžiagą
 DocType: Fees,Send Payment Request,Siųsti mokėjimo užklausą
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nurodykite operacijas, veiklos sąnaudas ir suteikti unikalią eksploatuoti ne savo operacijas."
 DocType: Water Analysis,Origin,Kilmė
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Pasirinkite Keisti suma sąskaita
 DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
 DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
@@ -2885,14 +2899,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Yra pajamų mokesčio atskaitomybė
 DocType: Grading Scale Interval,Grade Description,Įvertinimas Aprašymas
 DocType: Stock Entry,Purchase Receipt No,Pirkimo kvito Ne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,rimtai Pinigai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,rimtai Pinigai
 DocType: Sales Invoice, Shipping Bill Number,Pristatymo sąskaitos numeris
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,atsekamumas
 DocType: Asset Maintenance Log,Actions performed,Veiksmai atlikti
 DocType: Cash Flow Mapper,Section Leader,Skyriaus vedėjas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Lėšų šaltinis (įsipareigojimai)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Lėšų šaltinis (įsipareigojimai)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kiekis eilės {0} ({1}) turi būti toks pat, kaip gaminamo kiekio {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Darbuotojas
+DocType: Bank Guarantee,Fixed Deposit Number,Fiksuotas indėlio numeris
 DocType: Asset Repair,Failure Date,Gedimo data
 DocType: Sample Collection,Collected Time,Surinktas laikas
 DocType: Company,Sales Monthly History,Pardavimų mėnesio istorija
@@ -2909,10 +2924,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Ar tikrai norite atšaukti šį susitikimą?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Viešbučių kainų nustatymo paketas
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pardavimų vamzdynų
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Reikalinga Apie
 DocType: Rename Tool,File to Rename,Failo pervadinti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Atsisiųskite prenumeratos naujinius
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Sąskaita {0} nesutampa su kompanija {1} iš sąskaitos būdas: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Neapibūdintas BOM {0} neegzistuoja punkte {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursas:
@@ -2922,7 +2938,7 @@
 DocType: Notification Control,Expense Claim Approved,Kompensuojamos Pretenzija Patvirtinta
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nepavyko sukurti užsakymų
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Pajamos Kuponas darbuotojo {0} jau sukurta per šį laikotarpį
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmacijos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmacijos
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kaina įsigytų daiktų
 DocType: Selling Settings,Sales Order Required,Pardavimų užsakymų Reikalinga
 DocType: Purchase Invoice,Credit To,Kreditas
@@ -2940,7 +2956,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nr citatos
 DocType: Warranty Claim,Raised By,Užaugino
 DocType: Payment Gateway Account,Payment Account,Mokėjimo sąskaita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Grynasis pokytis gautinos
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,kompensacinė Išjungtas
 DocType: Job Offer,Accepted,priimtas
@@ -2953,7 +2969,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prašome įsitikinkite, kad jūs tikrai norite ištrinti visus šios bendrovės sandorius. Jūsų pagrindiniai duomenys liks kaip ji yra. Šis veiksmas negali būti atšauktas."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Paieškos rezultatai
 DocType: Room,Room Number,Kambario numeris
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Neteisingas nuoroda {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Neteisingas nuoroda {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Pristatymas taisyklė Etiketė
 DocType: Journal Entry Account,Payroll Entry,Darbo užmokesčio įrašas
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Žiūrėti mokesčius įrašai
@@ -2963,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
 DocType: Lab Test Sample,Lab Test Sample,Laboratorinio bandinio pavyzdys
 DocType: Item Variant Settings,Allow Rename Attribute Value,Leisti pervardyti atributo reikšmę
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Greita leidinys įrašas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Greita leidinys įrašas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
 DocType: Restaurant,Invoice Series Prefix,Sąskaitų serijos prefiksas
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
@@ -2971,8 +2987,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Prašome įvesti planuojama Kiekis už prekę {0} ne eilės {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,&quot;Google&quot; žemėlapių integracija nėra įjungta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nebus pateiktas
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Narystės galiojimo data
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} turi būti neigiama grąžinimo dokumentą
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} turi būti neigiama grąžinimo dokumentą
 ,Minutes to First Response for Issues,Minučių iki Pirmosios atsakas klausimai
 DocType: Purchase Invoice,Terms and Conditions1,Taisyklės ir sąlygų1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
@@ -2991,7 +3008,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Matavimo vienetas
 DocType: Fiscal Year,Year End Date,Dienos iki metų pabaigos
 DocType: Task Depends On,Task Depends On,Užduotis Priklauso nuo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,galimybė
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,galimybė
 DocType: Operation,Default Workstation,numatytasis Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kompensuojamos Pretenzija Patvirtinta pranešimas
 DocType: Payment Entry,Deductions or Loss,Atskaitymai arba nuostolis
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Palikite be darbo užmokesčio nesutampa su patvirtintais prašymo suteikti atostogas įrašų
 DocType: Campaign,Campaign-.####,Kampanija-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Tolesni žingsniai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Padaryti sąskaitą faktūrą
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Esamas likutis
@@ -3039,7 +3056,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,pabaigos metai
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Sutarties pabaigos data turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Sutarties pabaigos data turi būti didesnis nei įstoti data
 DocType: Driver,Driver,Vairuotojas
 DocType: Vital Signs,Nutrition Values,Mitybos vertės
 DocType: Lab Test Template,Is billable,Apmokestinamas
@@ -3050,7 +3067,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Tikrasis pradžios data (per Time lapas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Tai yra pavyzdys, svetainė Automatiškai sugeneruota iš ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Senėjimas klasės 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Bendra išankstinė suma negali būti didesnė už visą reikalaujamą sumą
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Bendra išankstinė suma negali būti didesnė už visą reikalaujamą sumą
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3085,7 +3102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Negali gaminti daugiau Elementą {0} nei pardavimų užsakymų kiekio {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Pasirinkite atributo reikšmes
 DocType: Purchase Invoice,Reason For Issuing document,Paaiškinimas Dokumento išdavimas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Pinigų paskyra
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"Kitas Susisiekti negali būti toks pat, kaip pagrindiniam pašto adresas"
 DocType: Tax Rule,Billing City,atsiskaitymo Miestas
@@ -3102,7 +3119,8 @@
 DocType: Warranty Claim,Service Address,Paslaugų Adresas
 DocType: Asset Maintenance Task,Calibration,Kalibravimas
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} yra įmonės atostogos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Baldai ir Šviestuvai
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Palikite būsenos pranešimą
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Baldai ir Šviestuvai
 DocType: Item,Manufacture,gamyba
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Sąrankos kompanija
 ,Lab Test Report,Lab testo ataskaita
@@ -3118,7 +3136,6 @@
 DocType: Crop,Planting Area,Apželdinimo zona
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Iš viso (Kiekis)
 DocType: Installation Note Item,Installed Qty,įdiegta Kiekis
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Tai gali būti dėl tam tikrų netinkamų el. Pašto adresų
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Pridėjote
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Mokymai rezultatas
@@ -3128,16 +3145,17 @@
 DocType: Products Settings,Products per Page,Produktai puslapyje
 DocType: Stock Ledger Entry,Outgoing Rate,Siunčiami Balsuok
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizacija filialas meistras.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,arba
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,arba
 DocType: Sales Order,Billing Status,atsiskaitymo būsena
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Pranešti apie problemą
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Komunalinė sąnaudos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Komunalinė sąnaudos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virš
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Eilutės # {0}: leidinys Įėjimo {1} neturi paskyros {2} arba jau lyginami su kito kuponą
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterijų svoris
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Palikti patvirtinimo pranešimą
 DocType: Buying Settings,Default Buying Price List,Numatytasis Ieško Kainų sąrašas
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Pajamos Kuponas Remiantis darbo laiko apskaitos žiniaraštis
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Pirkimo norma
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Pirkimo norma
 DocType: Notification Control,Sales Order Message,Pardavimų užsakymų pranešimas
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Numatytosios reikšmės, kaip kompanija, valiuta, einamuosius fiskalinius metus, ir tt"
 DocType: Payment Entry,Payment Type,Mokėjimo tipas
@@ -3160,6 +3178,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Prekių krepšelis Nustatymai
 DocType: Journal Entry,Accounting Entries,apskaitos įrašai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jei pasirinktas &quot;Kainos nustatymas&quot; yra nustatytas kainų taisyklės, jis pakeis kainoraštį. Kainodaros taisyklė yra galutinė norma, taigi daugiau nuolaida neturėtų būti taikoma. Taigi sandoriuose, pvz., &quot;Pardavimų užsakymas&quot;, &quot;Pirkimo užsakymas&quot; ir tt, jis bus įrašytas laukelyje &quot;Vertė&quot;, o ne &quot;Kainų sąrašo norma&quot;."
+DocType: Journal Entry,Paid Loan,Mokama paskola
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Pasikartojantis įrašas. Prašome patikrinti Autorizacija taisyklė {0}
 DocType: Journal Entry Account,Reference Due Date,Atskaitos data
 DocType: Purchase Order,Ref SQ,teisėjas SQ
@@ -3176,7 +3195,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Priežiūra Tvarkaraštis negeneruojama visų daiktų. Prašome spausti &quot;Generuoti grafiką&quot;
 ,To Produce,Gaminti
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Darbo užmokesčio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Dėl eilės {0} iš {1}. Įtraukti {2} prekės norma, eilutės {3} taip pat turi būti įtraukti"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Dėl eilės {0} iš {1}. Įtraukti {2} prekės norma, eilutės {3} taip pat turi būti įtraukti"
 DocType: Patient Service Unit,Parent Service Unit,Tėvų tarnybos skyrius
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Padaryti vartotoją
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikavimas pakuotės už pristatymą (spausdinimui)
@@ -3195,7 +3214,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,pajamų sąskaita
 DocType: Payment Request,Amount in customer's currency,Suma kliento valiuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,pristatymas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,pristatymas
 DocType: Volunteer,Weekdays,Darbo dienomis
 DocType: Stock Reconciliation Item,Current Qty,Dabartinis Kiekis
 DocType: Restaurant Menu,Restaurant Menu,Restorano meniu
@@ -3203,7 +3222,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Nustatykite numatytąjį inventoriaus sąskaitos už amžiną inventoriaus
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Nustatykite numatytąjį inventoriaus sąskaitos už amžiną inventoriaus
 DocType: Item Reorder,Material Request Type,Medžiaga Prašymas tipas
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Siųsti grantų peržiūrą el. Paštu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage &quot;yra pilna, neišsaugojo"
@@ -3211,10 +3230,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kambarių talpa
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Jau įrašas egzistuoja elementui {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,teisėjas
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Jūs prarasite ankstesnių sąskaitų faktūrų įrašus. Ar tikrai norite iš naujo paleisti šį prenumeratą?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registracijos mokestis
 DocType: Budget,Cost Center,kaina centras
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Bon #
 DocType: Notification Control,Purchase Order Message,Pirkimui užsakyti pranešimas
 DocType: Tax Rule,Shipping Country,Pristatymas Šalis
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Slėpti Kliento mokesčių ID iš pardavimo sandorių
@@ -3223,20 +3243,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Kainodaros taisyklė yra pagamintas perrašyti Kainoraštis / define diskonto procentas, remiantis kai kuriais kriterijais."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sandėlių gali būti pakeista tik per vertybinių popierių Entry / Važtaraštis / Pirkimo gavimas
 DocType: Employee Education,Class / Percentage,Klasė / procentas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Vadovas rinkodarai ir pardavimams
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Vadovas rinkodarai ir pardavimams
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Pajamų mokestis
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Įrašo Leads pramonės tipo.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Eikite į &quot;Letterheads&quot;
+DocType: Subscription,Cancel At End Of Period,Atšaukti pabaigos laikotarpį
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Neleidžiama perkelti elementų
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Neleidžiama perkelti elementų
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visi adresai.
 DocType: Company,Stock Settings,Akcijų Nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sujungimas yra galimas tik tada, jei šie savybės yra tos pačios tiek įrašų. Ar grupė, Šaknų tipas, Įmonės"
 DocType: Vehicle,Electric,elektros
 DocType: Task,% Progress,% Progresas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Pelnas / nuostolis turto perdavimo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Pelnas / nuostolis turto perdavimo
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.","Toliau esančioje lentelėje bus parinkta tik kandidatė-studentė, turinti statusą &quot;Patvirtinta&quot;."
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Paskyros numeris sąskaitai {0} nėra. <br> Tinkamai nustatykite savo sąskaitų planą.
 DocType: Task,Depends on Tasks,Priklauso nuo Užduotys
@@ -3251,6 +3272,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nėra sandėlyje
 DocType: Volunteer,Volunteer Skills,Savanorių įgūdžiai
 DocType: Appraisal,HR User,HR Vartotojas
+DocType: Bank Guarantee,Reference Document Name,Pamatinio dokumento pavadinimas
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mokesčiai ir rinkliavos Išskaityta
 apps/erpnext/erpnext/hooks.py +142,Issues,Problemos
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusas turi būti vienas iš {0}
@@ -3264,7 +3286,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} yra išjungtas
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Labai didelis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Labai didelis
+DocType: Loan,Loan Application,Paskolos taikymas
 DocType: Crop,Scientific Name,Mokslinis vardas
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Iš viso lapai
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Iš naujo pasirinkite, jei pasirinktas kontaktas bus redaguojamas po įrašymo"
@@ -3273,13 +3296,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Komunalinės Taškų
 ,Sales Browser,pardavimų naršyklė
 DocType: Journal Entry,Total Credit,Kreditai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Įspėjimas: Kitas {0} # {1} egzistuoja nuo akcijų įrašą {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Įspėjimas: Kitas {0} # {1} egzistuoja nuo akcijų įrašą {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,vietinis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Paskolos ir avansai (turtas)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,skolininkai
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Didelis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Didelis
 DocType: Homepage Featured Product,Homepage Featured Product,Pagrindinis puslapis Teminiai Prekės
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Visi Vertinimo Grupės
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Visi Vertinimo Grupės
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Naujas sandėlys Vardas
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Viso {0} ({1})
 DocType: C-Form Invoice Detail,Territory,teritorija
@@ -3300,9 +3323,10 @@
 DocType: Fees,Fees,Mokesčiai
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nurodykite Valiutų kursai konvertuoti vieną valiutą į kitą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Citata {0} atšaukiamas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Iš viso neapmokėta suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Iš viso neapmokėta suma
 DocType: Sales Partner,Targets,tikslai
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Prašome įregistruoti SIREN numerį bendrovės informacijos byloje
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 DocType: Price List,Price List Master,Kainų sąrašas magistras
 DocType: GST Account,CESS Account,CESS sąskaita
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pardavimo sandoriai gali būti pažymėti prieš kelis ** pardavėjai **, kad būtų galima nustatyti ir stebėti tikslus."
@@ -3311,6 +3335,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pasirinkite pacientą
 DocType: Price List,Applicable for Countries,Taikoma šalių
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametro pavadinimas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,gali būti pateiktas palikti tik programas su statusu &quot;Patvirtinta&quot; ir &quot;Atmesta&quot;
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Studentų grupės pavadinimas yra privalomas eilės {0}
 DocType: Homepage,Products to be shown on website homepage,Produktai turi būti rodomas svetainės puslapyje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Tai yra šaknis klientas grupė ir negali būti pakeisti.
@@ -3344,14 +3369,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Sąskaita faktūra jau sukurta visoms atsiskaitymo valandoms
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Vardas klaida: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Ar yra finansinės išlaidos
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Lankomumas darbuotojo {0} jau yra pažymėtas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Lankomumas darbuotojo {0} jau yra pažymėtas
 DocType: Packing Slip,If more than one package of the same type (for print),Jeigu yra daugiau nei vienas paketas tos pačios rūšies (spausdinimui)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nustatykite numatytąjį klientą Restoranų nustatymuose
 ,Salary Register,Pajamos Registruotis
 DocType: Warehouse,Parent Warehouse,tėvų sandėlis
-DocType: C-Form Invoice Detail,Net Total,grynasis Iš viso
+DocType: Subscription,Net Total,grynasis Iš viso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Numatytąją BOM ne punktą rasti {0} ir projekto {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Apibrėžti įvairių paskolų tipų
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Apibrėžti įvairių paskolų tipų
 DocType: Bin,FCFS Rate,FCFS Balsuok
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,nesumokėtos sumos
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laikas (min)
@@ -3383,11 +3408,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Šaknų sąskaita turi būti grupė
 DocType: Drug Prescription,Drug Prescription,Narkotikų recepcija
 DocType: Fees,FEE.,RINKLIAVA.
-DocType: Employee Loan,Repaid/Closed,Grąžinama / Uždarymo
+DocType: Loan,Repaid/Closed,Grąžinama / Uždarymo
 DocType: Item,Total Projected Qty,Iš viso prognozuojama Kiekis
 DocType: Monthly Distribution,Distribution Name,platinimo Vardas
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Prekės {0} neįvertinta, kuri reikalinga apskaitos įrašams atlikti {1} {2}. Jei objektas sandoriuos kaip nulinis vertinimo koeficiento elementas {1}, prašome paminėti tai {1} elemento lentelėje. Priešingu atveju, sukurkite gautą atsarginį sandorį elementui arba paminėkite vertinimo rodiklį elemento įraše, tada pabandykite pateikti / atšaukti šį įrašą"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; vardų serija
 DocType: Course,Course Code,Dalyko kodas
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kokybės inspekcija privalo už prekę {0}
 DocType: POS Settings,Use POS in Offline Mode,Naudokite POS neprisijungus
@@ -3407,16 +3431,15 @@
 DocType: Purchase Invoice,Deemed Export,Laikomas eksportas
 DocType: Stock Entry,Material Transfer for Manufacture,Medžiagos pernešimas gamybai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Nuolaida procentas gali būti taikomas bet prieš kainoraštis arba visų kainų sąrašas.
-DocType: Subscription,Half-yearly,Kartą per pusmetį
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
 DocType: Lab Test,LabTest Approver,&quot;LabTest&quot; patvirtintojai
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Jūs jau įvertintas vertinimo kriterijus {}.
 DocType: Vehicle Service,Engine Oil,Variklio alyva
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Sukurtas darbo užsakymas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Sukurtas darbo užsakymas: {0}
 DocType: Sales Invoice,Sales Team1,pardavimų team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Prekė {0} neegzistuoja
 DocType: Sales Invoice,Customer Address,Klientų Adresas
-DocType: Employee Loan,Loan Details,paskolos detalės
+DocType: Loan,Loan Details,paskolos detalės
 DocType: Company,Default Inventory Account,Numatytasis Inventorius paskyra
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numeriai nesuderinami
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
@@ -3427,19 +3450,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Nuoroda į visus Žemės vienetus, kuriuose auga augalas"
 DocType: Account,Root Type,Šaknų tipas
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Eilutės # {0}: negali grįžti daugiau nei {1} už prekę {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Eilutės # {0}: negali grįžti daugiau nei {1} už prekę {2}
 DocType: Item Group,Show this slideshow at the top of the page,Parodyti šią demonstraciją prie puslapio viršuje
 DocType: BOM,Item UOM,Prekė UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),"Mokesčių suma, nuolaidos suma (Įmonės valiuta)"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Tikslinė sandėlis yra privalomas eilės {0}
 DocType: Cheque Print Template,Primary Settings,pirminiai nustatymai
 DocType: Purchase Invoice,Select Supplier Address,Pasirinkite Tiekėjas Adresas
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Pridėti Darbuotojai
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Pridėti Darbuotojai
 DocType: Purchase Invoice Item,Quality Inspection,kokybės inspekcija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Papildomas Mažas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Papildomas Mažas
 DocType: Company,Standard Template,standartinį šabloną
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Sąskaita {0} yra sušaldyti
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridinio asmens / Dukterinė įmonė su atskiru Chart sąskaitų, priklausančių organizacijos."
 DocType: Payment Request,Mute Email,Nutildyti paštas
@@ -3459,11 +3482,10 @@
 DocType: SMS Log,No of Sent SMS,Nėra išsiųstų SMS
 DocType: Antibiotic,Healthcare Administrator,Sveikatos priežiūros administratorius
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Nustatykite tikslą
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numerių seriją lankytojams per sąranką&gt; numeravimo serija
 DocType: Dosage Strength,Dosage Strength,Dozės stiprumas
 DocType: Account,Expense Account,Kompensuojamos paskyra
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,programinė įranga
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Spalva
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Spalva
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vertinimo planas kriterijai
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Galiojimo data yra privaloma pasirinktam elementui
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Užkirsti kelią pirkimo užsakymams
@@ -3476,18 +3498,18 @@
 DocType: Patient,Personal and Social History,Asmeninė ir socialinė istorija
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Naudotojas {0} sukūrė
 DocType: Fee Schedule,Fee Breakup for each student,Mokesčio perviršis kiekvienam studentui
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pasirinkite Mėnesio pasiskirstymas į netolygiai paskirstyti tikslus visoje mėnesius.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Keisti kodą
 DocType: Purchase Invoice Item,Valuation Rate,Vertinimo Balsuok
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dyzelinis
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
 DocType: Purchase Invoice,Availed ITC Cess,Pasinaudojo ITC Cess
 ,Student Monthly Attendance Sheet,Studentų Mėnesio Lankomumas lapas
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pristatymo taisyklė taikoma tik Pardavimui
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekto pradžia
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,iki
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,iki
 DocType: Rename Tool,Rename Log,pervadinti Prisijungti
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentų grupė ar užsiėmimų tvarkaraštis yra privalomi
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentų grupė ar užsiėmimų tvarkaraštis yra privalomi
@@ -3508,7 +3530,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Nurodykite savo produktus ar paslaugas, kurias perkate ar parduodate."
 DocType: Water Analysis,Storage Temperature,Laikymo temperatūra
 DocType: Employee Attendance Tool,Unmarked Attendance,priežiūros Lankomumas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,tyrėjas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,tyrėjas
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programos Įrašas įrankis Studentų
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Pradžios data turi būti mažesnė už užduoties pabaigos datą {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Vardas arba el privaloma
@@ -3521,7 +3543,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo RFQ turėtų būti pateikiama atsargiai."
 DocType: Chapter,Non Profit Manager,Ne pelno administratorius
 DocType: BOM,Total Cost(Company Currency),Iš viso išlaidų (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serijos Nr {0} sukūrė
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serijos Nr {0} sukūrė
 DocType: Homepage,Company Description for website homepage,Įmonės aprašymas interneto svetainės pagrindiniame puslapyje
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dėl klientų patogumui, šie kodai gali būti naudojami spausdinimo formatus, pavyzdžiui, sąskaitose ir važtaraščiuose"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Vardas
@@ -3531,11 +3553,10 @@
 DocType: Employee,You can enter any date manually,Galite įvesti bet kokį datą rankiniu būdu
 DocType: Healthcare Settings,Result Printed,Rezultatas spausdintas
 DocType: Asset Category Account,Depreciation Expense Account,Nusidėvėjimo sąnaudos paskyra
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Bandomasis laikotarpis
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Peržiūrėti {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Bandomasis laikotarpis
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tik lapų mazgai leidžiama sandorio
 DocType: Project,Total Costing Amount (via Timesheets),Bendra sąnaudų suma (per laiko lapus)
-DocType: Employee Advance,Expense Approver,Kompensuojamos Tvirtintojas
+DocType: Department,Expense Approver,Kompensuojamos Tvirtintojas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Eilutės {0}: Išankstinis prieš užsakovui turi būti kredito
 DocType: Project,Hourly,Valandą
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Ne grupė į grupę
@@ -3545,7 +3566,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Norėdami datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Rąstai išlaikyti sms būsenos
 DocType: Accounts Settings,Make Payment via Journal Entry,Atlikti mokėjimą per žurnalo įrašą
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Atspausdinta ant
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Atspausdinta ant
 DocType: Item,Inspection Required before Delivery,Patikrinimo Reikalinga prieš Pristatymas
 DocType: Item,Inspection Required before Purchase,Patikrinimo Reikalinga prieš perkant
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kol veiklos
@@ -3555,7 +3576,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalus Užsakymo Kiekis
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Jūsų organizacija
 DocType: Fee Component,Fees Category,Mokesčiai Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Prašome įvesti malšinančių datą.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Prašome įvesti malšinančių datą.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 DocType: Supplier Scorecard,Notify Employee,Pranešti darbuotojui
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Įveskite vardą kampanijos jei šaltinis tyrimo yra akcija
@@ -3565,7 +3586,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Pertvarkyti lygis
 DocType: Company,Chart Of Accounts Template,Sąskaitų planas Šablonas
 DocType: Attendance,Attendance Date,lankomumas data
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Pajamos Griauti remiantis uždirbti ir atskaitą.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Sąskaita su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
 DocType: Purchase Invoice Item,Accepted Warehouse,Priimamos sandėlis
@@ -3573,10 +3594,11 @@
 DocType: Item,Valuation Method,vertinimo metodas
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Pažymėti Pusė dienos
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,pasikartojantis įrašas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,pasikartojantis įrašas
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,"Prieš pateikdami, įveskite gavėjo vardą."
 DocType: Program Enrollment Tool,Get Students,Gauk Studentai
 DocType: Serial No,Under Warranty,pagal Garantija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Klaida]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Klaida]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Žodžiais bus matomas, kai jūs išgelbėti pardavimų užsakymų."
 ,Employee Birthday,Darbuotojų Gimimo diena
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Prašome pasirinkti užbaigto remonto užbaigimo datą
@@ -3595,7 +3617,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervuota subrangovams
 DocType: Payment Reconciliation Invoice,Invoice Number,Sąskaitos numeris
 DocType: Shopping Cart Settings,Orders,Užsakymai
-DocType: Employee Leave Approver,Leave Approver,Palikite jį patvirtinusio
+DocType: Department,Leave Approver,Palikite jį patvirtinusio
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Prašome pasirinkti partiją
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Vertinimas Grupės pavadinimas
@@ -3640,7 +3662,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,&quot;Hub Tracked Item&quot;
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Originalus GAVĖJAS
 DocType: Asset Category Account,Accumulated Depreciation Account,Sukauptas nusidėvėjimas paskyra
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Šis el. Laiškas yra automatiškai sukurtas
 DocType: Stock Settings,Freeze Stock Entries,Freeze Akcijų įrašai
 DocType: Program Enrollment,Boarding Student,internatinė Studentų
 DocType: Asset,Expected Value After Useful Life,Tikimasi Vertė Po naudingo tarnavimo
@@ -3665,22 +3686,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Lankomumas Įrašų {0} egzistuoja nuo Studentų {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Nuoroda # {0} data {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Nusidėvėjimas Pašalintas dėl turto perleidimo
-DocType: Member,Member,Narys
+DocType: Loan,Member,Narys
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,tvarkyti adresai
 DocType: Work Order Item,Work Order Item,Darbo užsakymo elementas
 DocType: Pricing Rule,Item Code,Prekės kodas
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC detalės
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
 DocType: Lead,Market Segment,Rinkos segmentas
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Žemės ūkio vadybininkas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
 DocType: Supplier Scorecard Period,Variables,Kintamieji
 DocType: Employee Internal Work History,Employee Internal Work History,Darbuotojų vidaus darbo Istorija
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Uždarymo (dr)
 DocType: Cheque Print Template,Cheque Size,Komunalinės dydis
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serijos Nr {0} nėra sandėlyje
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serijos Nr {0} nėra sandėlyje
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Mokesčių šablonas pardavimo sandorius.
 DocType: Sales Invoice,Write Off Outstanding Amount,Nurašyti likutinę sumą
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Sąskaita {0} nesutampa su kompanija {1}
@@ -3689,7 +3710,6 @@
 DocType: Stock Settings,Default Stock UOM,Numatytasis sandėlyje UOM
 DocType: Asset,Number of Depreciations Booked,Užsakytas skaičius nuvertinimai
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Kiekis Iš viso
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Prieš darbuotojo Loan: {0}
 DocType: Landed Cost Item,Receipt Document,gavimas Dokumentų
 DocType: Employee Education,School/University,Mokykla / Universitetas
 DocType: Payment Request,Reference Details,nuoroda detalės
@@ -3700,7 +3720,7 @@
 DocType: Asset,Double Declining Balance,Dvivietis mažėjančio balanso
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Uždaras nurodymas negali būti atšauktas. Atskleisti atšaukti.
 DocType: Student Guardian,Father,tėvas
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Atnaujinti sandėlį"" negali būti patikrintas dėl ilgalaikio turto pardavimo."
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Atnaujinti sandėlį"" negali būti patikrintas dėl ilgalaikio turto pardavimo."
 DocType: Bank Reconciliation,Bank Reconciliation,bankas suderinimas
 DocType: Attendance,On Leave,atostogose
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
@@ -3714,10 +3734,10 @@
 DocType: Lead,Lower Income,mažesnes pajamas
 DocType: Restaurant Order Entry,Current Order,Dabartinis užsakymas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Originalo ir vertimo sandėlis negali būti vienodi eilės {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Eikite į &quot;Programos&quot;
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Eilutė {0} # paskirstyta suma {1} negali būti didesnė nei nepageidaujama suma {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Eilutė {0} # paskirstyta suma {1} negali būti didesnė nei nepageidaujama suma {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Nuo data&quot; turi būti po &quot;Iki datos&quot;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
@@ -3740,7 +3760,6 @@
 DocType: Payment Terms Template,Payment Terms,Mokėjimo sąlygos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minutė
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkimo mokesčius bei rinkliavas
 DocType: Chapter,Meetup Embed HTML,&quot;Embedup&quot; HTML įvestis
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Eikite į tiekėjus
@@ -3760,30 +3779,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citata {0} nėra tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Priežiūra Tvarkaraštis punktas
 DocType: Sales Order,%  Delivered,% Pristatyta
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Nustatykite studento elektroninio pašto adresą, kad atsiųstumėte mokėjimo užklausą"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Nustatykite studento elektroninio pašto adresą, kad atsiųstumėte mokėjimo užklausą"
 DocType: Patient,Medical History,Medicinos istorija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bankas Overdraftas paskyra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bankas Overdraftas paskyra
 DocType: Patient,Patient ID,Paciento ID
 DocType: Physician Schedule,Schedule Name,Tvarkaraščio pavadinimas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Padaryti darbo užmokestį
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Pridėti visus tiekėjus
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Pridėti visus tiekėjus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Eilutė # {0}: Paskirstytas suma gali būti ne didesnis nei likutinę sumą.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Žmonės BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,užtikrintos paskolos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,užtikrintos paskolos
 DocType: Purchase Invoice,Edit Posting Date and Time,Redaguoti Siunčiamos data ir laikas
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Prašome nustatyti Nusidėvėjimas susijusias sąskaitas Turto kategorija {0} ar kompanija {1}
 DocType: Lab Test Groups,Normal Range,Normalus diapazonas
 DocType: Academic Term,Academic Year,Mokslo metai
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Galima parduoti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Atidarymas Balansas Akcijų
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Atidarymas Balansas Akcijų
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,likęs
 DocType: Appraisal,Appraisal,įvertinimas
+DocType: Loan,Loan Account,Paskolos sąskaita
 DocType: Purchase Invoice,GST Details,GST duomenys
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Paštas išsiųstas tiekėjo {0}
 DocType: Item,Default Sales Unit of Measure,Numatytasis pardavimų matavimo vienetas
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Mokslo metai:
+DocType: Subscription,Past Due Date,Praėjusi mokėjimo data
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Neleisti nustatyti kito elemento elementui {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data kartojamas
@@ -3796,7 +3817,7 @@
 DocType: Patient Appointment,Patient Appointment,Paciento paskyrimas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Patvirtinimo vaidmuo gali būti ne tas pats kaip vaidmens taisyklė yra taikoma
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Atsisakyti Šis el.pašto Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Gaukite tiekėjų
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Gaukite tiekėjų
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nerasta {1} elementui
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Eikite į kursus
 DocType: Accounts Settings,Show Inclusive Tax In Print,Rodyti inkliuzinį mokestį spausdinant
@@ -3804,10 +3825,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Žinutė išsiųsta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Sąskaita su vaikų mazgų negali būti nustatyti kaip knygoje
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome nustatyti &quot;Instruktorių pavadinimo&quot; sistemą &quot;Education&quot;&gt; &quot;Education Settings&quot;
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Norma, pagal kurią Kainoraštis valiuta konvertuojama į kliento bazine valiuta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Grynasis kiekis (Įmonės valiuta)
 DocType: Physician,Physician Schedules,Gydytojo tvarkaraščiai
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Bendra avanso suma negali būti didesnė už visą sankcionuotą sumą
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Bendra avanso suma negali būti didesnė už visą sankcionuotą sumą
 DocType: Salary Slip,Hour Rate,valandą greičiu
 DocType: Stock Settings,Item Naming By,Prekė Pavadinimų Iki
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Kitas Laikotarpis uždarymas Įėjimas {0} buvo padaryta po {1}
@@ -3825,6 +3847,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti akcijų sandorius senesnis nei {0}
 DocType: BOM,Inspection Required,Patikrinimo Reikalinga
 DocType: Purchase Invoice Item,PR Detail,PR detalės
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Prieš pateikdami įveskite banko garantijos numerį.
 DocType: Driving License Category,Class,Klasė
 DocType: Sales Order,Fully Billed,pilnai Įvardintas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Darbų užsakymas negali būti iškeltas prieš elemento šabloną
@@ -3835,7 +3858,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bendras svoris pakuotės. Paprastai neto masė + pakavimo medžiagos svorio. (Spausdinimo)
 DocType: Assessment Plan,Program,programa
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Vartotojai, turintys šį vaidmenį yra leidžiama nustatyti įšaldytas sąskaitas ir sukurti / pakeisti apskaitos įrašus prieš įšaldytų sąskaitų"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome nustatyti &quot;Instruktorių pavadinimo&quot; sistemą &quot;Education&quot;&gt; &quot;Education Settings&quot;
 DocType: Serial No,Is Cancelled,Ar atšauktas
 DocType: Student Group,Group Based On,Grupė remiantis
 DocType: Student Group,Group Based On,Grupė remiantis
@@ -3847,9 +3869,10 @@
 DocType: Cheque Print Template,Cheque Height,Komunalinės Ūgis
 DocType: Supplier,Supplier Details,Tiekėjo informacija
 DocType: Setup Progress,Setup Progress,&quot;Progress setup&quot;
+DocType: Expense Claim,Approval Status,patvirtinimo būsena
 DocType: Hub Settings,Publish Items to Hub,Publikuoti prekę į Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Nuo vertė turi būti mažesnė nei vertės eilės {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,pavedimu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,pavedimu
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Viską Patikrink
 ,Issued Items Against Work Order,Išleisti daiktai prieš darbo tvarką
 DocType: Vehicle Log,Invoice Ref,Sąskaitos faktūros Nuoroda
@@ -3880,12 +3903,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarifas Taškų
 DocType: Work Order Item,Available Qty at WIP Warehouse,Turimas Kiekis ne WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,prognozuojama
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serijos Nr {0} nepriklauso sandėlis {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serijos Nr {0} nepriklauso sandėlis {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Pastaba: sistema netikrins per pristatymą ir per metu už prekę {0} kaip kiekis ar visa suma yra 0
 DocType: Notification Control,Quotation Message,citata pranešimas
-DocType: Employee Loan,Employee Loan Application,Darbuotojų paraišką paskolai gauti
 DocType: Issue,Opening Date,atidarymo data
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Pirmiausia išsaugokite pacientą
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Pirmiausia išsaugokite pacientą
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Žiūrovų buvo pažymėta sėkmingai.
 DocType: Program Enrollment,Public Transport,Viešasis transportas
 DocType: Soil Texture,Silt Composition (%),Stiklo sudėtis (%)
@@ -3904,7 +3926,7 @@
 ,Item Balance (Simple),Prekės balansas (paprastas)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Vekseliai iškelti tiekėjų.
 DocType: POS Profile,Write Off Account,Nurašyti paskyrą
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debeto aviza Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debeto aviza Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Nuolaida suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Grįžti Against pirkimo faktūros
 DocType: Item,Warranty Period (in days),Garantinis laikotarpis (dienomis)
@@ -3927,6 +3949,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Pardavimų užsakymų data
 DocType: Sales Invoice Item,Delivered Qty,Paskelbta Kiekis
 DocType: Assessment Plan,Assessment Plan,vertinimo planas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Atvirkštinis žurnalo įrašas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klientas {0} sukurtas.
 DocType: Stock Settings,Limit Percent,riba procentais
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Šiuo metu nėra nei viename sandėlyje.
@@ -3940,14 +3963,15 @@
 DocType: Journal Entry,Stock Entry,"atsargų,"
 DocType: Payment Entry,Payment References,Apmokėjimo Nuorodos
 DocType: C-Form,C-FORM-,", C-FORM-"
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Intervalo intervalų skaičius, pvz., Jei intervalas yra &quot;Dienos&quot; ir atsiskaitymo interviu skaičius yra 3, sąskaitos faktūros bus sudaromos kas 3 dienas"
 DocType: Vehicle,Insurance Details,draudimo detalės
 DocType: Account,Payable,mokėtinas
 DocType: Share Balance,Share Type,Bendrinti tipą
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Prašome įvesti grąžinimo terminams
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Prašome įvesti grąžinimo terminams
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Skolininkai ({0})
 DocType: Pricing Rule,Margin,marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nauji klientai
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bendrasis pelnas %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bendrasis pelnas %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Keisti POS profilį
 DocType: Bank Reconciliation Detail,Clearance Date,Sąskaitų data
@@ -3957,10 +3981,11 @@
 DocType: Lead,Address Desc,Adresas desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Šalis yra privalomi
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rastos su dviem egzemplioriais nurodytų datų kitose eilutėse buvo rasta: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rastos su dviem egzemplioriais nurodytų datų kitose eilutėse buvo rasta: {list}
 DocType: Topic,Topic Name,Temos pavadinimas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Prašome nustatyti numatytąjį šabloną, skirtą palikti patvirtinimo pranešimą HR nuostatuose."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,"Atleast vienas, pardavimas arba pirkimas turi būti parenkamas"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Pasirinkite darbuotoją, kad darbuotojas gautų anksčiau."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Pasirinkite darbuotoją, kad darbuotojas gautų anksčiau."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Pasirinkite teisingą datą
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Pasirinkite savo verslo pobūdį.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3979,7 +4004,7 @@
 DocType: Asset Movement,Source Warehouse,šaltinis sandėlis
 DocType: Installation Note,Installation Date,Įrengimas data
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dalinkis &quot;Ledger&quot;
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Sukurta pardavimo sąskaitą {0}
 DocType: Employee,Confirmation Date,Patvirtinimas data
 DocType: C-Form,Total Invoiced Amount,Iš viso Sąskaitoje suma
@@ -3988,7 +4013,7 @@
 DocType: Account,Accumulated Depreciation,sukauptas nusidėvėjimas
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nuolatinis vardas
 DocType: Stock Entry,Customer or Supplier Details,Klientas ar tiekėjas detalės
-DocType: Employee Loan Application,Required by Date,Reikalauja data
+DocType: Loan Application,Required by Date,Reikalauja data
 DocType: Lead,Lead Owner,Švinas autorius
 DocType: Production Plan,Sales Orders Detail,Pardavimų užsakymų detalės
 DocType: Bin,Requested Quantity,prašomam kiekiui
@@ -4001,10 +4026,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pilna darbo užmokestis - Iš viso išskaičiavimas - Paskolų grąžinimas
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Dabartinis BOM ir Naujoji BOM negali būti tas pats
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Pajamos Kuponas ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Keli variantai
 DocType: Sales Invoice,Against Income Account,Prieš pajamų sąskaita
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Pristatyta
+DocType: Subscription,Trial Period Start Date,Tyrimo pradžios data
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Prašau prisijungti kaip kitas vartotojas.
@@ -4025,12 +4051,11 @@
 DocType: Student Guardian,Student Guardian,Studentų globėjas
 DocType: Member,Member Name,Nario vardas
 DocType: Stock Settings,Use Naming Series,Naudokite vardų seriją
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
 DocType: POS Profile,Update Stock,Atnaujinti sandėlyje
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,prenumeruojant
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Įvairūs UOM daiktų bus neteisinga (iš viso) Grynasis svoris vertės. Įsitikinkite, kad grynasis svoris kiekvieno elemento yra toje pačioje UOM."
 DocType: Membership,Payment Details,Mokėjimo detalės
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Balsuok
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Balsuok
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Sustabdyto darbo užsakymas negali būti atšauktas. Išjunkite jį iš pradžių, kad atšauktumėte"
 DocType: Asset,Journal Entry for Scrap,Žurnalo įrašą laužo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Prašome traukti elementus iš važtaraštyje
@@ -4050,6 +4075,7 @@
 DocType: Land Unit,Land Unit,Žemės vienetas
 ,Purchase Analytics,pirkimo Analytics &quot;
 DocType: Sales Invoice Item,Delivery Note Item,Važtaraštis punktas
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Trūksta dabartinės sąskaitos {0}
 DocType: Asset Maintenance Log,Task,užduotis
 DocType: Purchase Taxes and Charges,Reference Row #,Nuoroda eilutė #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijos numeris yra privalomas punktas {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Valiutų Pelnas / nuostolis paskyra
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Darbuotojų ir lankymas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Tikslas turi būti vienas iš {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Užpildykite formą ir išsaugokite jį
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Užpildykite formą ir išsaugokite jį
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Bendruomenė Forumas
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Tikrasis Kiekis sandėlyje
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Tikrasis Kiekis sandėlyje
@@ -4077,7 +4103,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standartinė pardavimo kursą
 DocType: Account,Rate at which this tax is applied,"Norma, kuri yra taikoma ši mokesčių"
 DocType: Cash Flow Mapper,Section Name,Skyriaus pavadinimas
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Pertvarkyti Kiekis
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Pertvarkyti Kiekis
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Dabartinis darbas Angos
 DocType: Company,Stock Adjustment Account,Vertybinių popierių reguliavimas paskyra
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Nusirašinėti
@@ -4088,9 +4114,9 @@
 DocType: Task,depends_on,priklauso nuo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Kviečiame atnaujinti naujausią kainą visame medžiagų sąraše. Tai gali užtrukti kelias minutes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Pavadinimas naują paskyrą. Pastaba: nekurkite sąskaitas klientai ir tiekėjai
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Šalis protinga numatytasis adresas Šablonai
 DocType: Water Analysis,Appearance,Išvaizda
+DocType: HR Settings,Leave Status Notification Template,Palikite būsenos pranešimo šabloną
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Vidur. Pirkimo kainų sąrašo norma
 DocType: Sales Order Item,Supplier delivers to Customer,Tiekėjas pristato Klientui
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Nario informacija.
@@ -4113,7 +4139,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Neleistina. Prašome išjungti testo šabloną
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentas paskirstymas turi būti lygus 100%
 DocType: Crop Cycle,Linked Land Unit,Susijusios žemės vienetas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 DocType: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
@@ -4129,7 +4155,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Eikite į &quot;Vartotojai&quot;
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Mokama suma + nurašyti suma negali būti didesnė nei IŠ VISO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} yra neteisingas SERIJOS NUMERIS už prekę {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Neteisingas GSTIN ar Įveskite NA neregistruotas
 DocType: Training Event,Seminar,seminaras
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programos Dalyvio mokestis
@@ -4145,14 +4171,14 @@
 DocType: Hub Settings,Publish Availability,Paskelbti Prieinamumas
 DocType: Company,Create Chart Of Accounts Based On,Sukurti sąskaitų planą remiantis
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Negalima konvertuoti į ne grupę. Vaikų užduotys egzistuoja.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
 ,Stock Ageing,akcijų senėjimas
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Studentų {0} egzistuoja nuo studento pareiškėjo {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Apvalinimo koregavimas (įmonės valiuta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,darbo laiko apskaitos žiniaraštis
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partija:
 DocType: Volunteer,Afternoon,Popietė
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nustatyti kaip Open
 DocType: Cheque Print Template,Scanned Cheque,Nuskaityti čekis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"Siųsti automatinius laiškus Kontaktai, kaip pateikti sandorių."
@@ -4168,7 +4194,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projektas {0} jau egzistuoja
 DocType: Medical Department,Nursing User,Slaugos naudotojas
 DocType: Plant Analysis,Plant Analysis Criterias,Augalų analizės kriterijai
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,atsakomybė
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serijos numeris {0} nepriklauso paketui {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,atsakomybė
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Pasibaigė šios citatos galiojimo laikotarpis.
 DocType: Expense Claim Account,Expense Claim Account,Kompensuojamos Pretenzija paskyra
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leisti nejudančius valiutų keitimo kursus
@@ -4190,11 +4217,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Padaryti variantus
 DocType: Item,Default BOM,numatytasis BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Visa išleista suma (per pardavimo sąskaitas faktūras)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debeto Pastaba suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debeto Pastaba suma
 DocType: Project Update,Not Updated,Neatnaujinta
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Yra neatitikimų tarp normos, akcijų nėra ir apskaičiuotos sumos"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Prašome iš naujo tipo įmonės pavadinimas patvirtinti
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Visos negrąžintos Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Visos negrąžintos Amt
 DocType: Journal Entry,Printing Settings,Spausdinimo nustatymai
 DocType: Employee Advance,Advance Account,Išankstinė sąskaita
 DocType: Job Offer,Job Offer Terms,Darbo pasiūlymo sąlygos
@@ -4203,7 +4230,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobiliai
 DocType: Vehicle,Insurance Company,Draudimo bendrovė
 DocType: Asset Category Account,Fixed Asset Account,Ilgalaikio turto sąskaita
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,kintamas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,kintamas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nuo važtaraštyje
 DocType: Chapter,Members,Nariai
 DocType: Student,Student Email Address,Studentų elektroninio pašto adresas
@@ -4227,7 +4254,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,internas
 DocType: Delivery Stop,Address Name,adresas pavadinimas
 DocType: Stock Entry,From BOM,nuo BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Suskaidyti {0} vienetų {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Suskaidyti {0} vienetų {1}
 DocType: Assessment Code,Assessment Code,vertinimas kodas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,pagrindinis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akcijų sandoriai iki {0} yra sušaldyti
@@ -4235,25 +4262,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Nuorodos Nr yra privaloma, jei įvedėte Atskaitos data"
 DocType: Bank Reconciliation Detail,Payment Document,mokėjimo dokumentą
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Klaida įvertinant kriterijų formulę
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Stojant data turi būti didesnis nei gimimo data
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Stojant data turi būti didesnis nei gimimo data
+DocType: Subscription,Plans,Planai
 DocType: Salary Slip,Salary Structure,Pajamos struktūra
 DocType: Account,Bank,bankas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aviakompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,klausimas Medžiaga
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Kuriant pakartotinai įvyko klaida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,klausimas Medžiaga
 DocType: Material Request Item,For Warehouse,Sandėliavimo
 DocType: Employee,Offer Date,Siūlau data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,citatos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nėra Studentų grupės sukurta.
 DocType: Purchase Invoice Item,Serial No,Serijos Nr
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mėnesio grąžinimo suma negali būti didesnė nei paskolos suma
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mėnesio grąžinimo suma negali būti didesnė nei paskolos suma
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Prašome įvesti maintaince Details pirmas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Eilutė # {0}: laukiama pristatymo data negali būti prieš Pirkimo užsakymo datą
 DocType: Purchase Invoice,Print Language,Spausdinti kalba
 DocType: Salary Slip,Total Working Hours,Iš viso darbo valandų
 DocType: Sales Invoice,Customer PO Details,Kliento PO duomenys
-DocType: Subscription,Next Schedule Date,Kitas tvarkaraščio data
 DocType: Stock Entry,Including items for sub assemblies,Įskaitant daiktų sub asamblėjose
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Laikina atidarymo sąskaita
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Įveskite vertė turi būti teigiamas
@@ -4282,11 +4308,11 @@
 DocType: Issue,Opening Time,atidarymo laikas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,"Iš ir į datas, reikalingų"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Vertybinių popierių ir prekių biržose
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nė vienas iš minėtų kriterijų darbuotojų nėra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
 DocType: Hotel Settings,Default Customer,Numatytasis klientas
 DocType: Assessment Plan,Supervisor Name,priežiūros Vardas
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nenurodykite, ar paskyrimas sukurtas tą pačią dieną"
@@ -4311,16 +4337,16 @@
 DocType: Journal Entry Account,Employee Advance,Darbuotojo išankstinis mokėjimas
 DocType: Payroll Entry,Payroll Frequency,Darbo užmokesčio Dažnio
 DocType: Lab Test Template,Sensitivity,Jautrumas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,žaliava
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,žaliava
 DocType: Leave Application,Follow via Email,Sekite elektroniniu paštu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Augalai ir išstumti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Augalai ir išstumti
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,"Mokesčių suma, nuolaidos suma"
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dienos darbo santrauka Nustatymai
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Prašome įvesti reqd pagal datą
 DocType: Payment Entry,Internal Transfer,vidaus perkėlimo
 DocType: Asset Maintenance,Maintenance Tasks,Techninės priežiūros užduotys
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bet tikslas Kiekis arba planuojama suma yra privalomi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Atidarymo data turėtų būti prieš uždarant data
 DocType: Leave Control Panel,Carry Forward,Tęsti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kaina centras su esamais sandoriai negali būti konvertuojamos į sąskaitų knygos
@@ -4328,14 +4354,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integracija
 DocType: Crop Cycle,Detected Disease,Aptikta liga
 ,Produced,pagamintas
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Grąžinimo pradžios data negali būti prieš Išlaidų datą.
 DocType: Item,Item Code for Suppliers,Prekės kodas tiekėjams
 DocType: Issue,Raised By (Email),Iškeltas (el)
 DocType: Training Event,Trainer Name,treneris Vardas
 DocType: Mode of Payment,General,bendras
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Paskutinis Bendravimas
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Paskutinis Bendravimas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;vertinimo ir viso&quot;"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Eilės Nr Reikalinga už Serijinis punkte {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;vertinimo ir viso&quot;"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Eilės Nr Reikalinga už Serijinis punkte {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Rungtynių Mokėjimai sąskaitų faktūrų
 DocType: Journal Entry,Bank Entry,bankas įrašas
 DocType: Authorization Rule,Applicable To (Designation),Taikoma (paskyrimas)
@@ -4349,7 +4376,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Įjungti / išjungti valiutas.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} per pusę dienos Išeiti {1}
 DocType: Production Plan,Get Material Request,Gauk Material užklausa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,pašto išlaidas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,pašto išlaidas
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Iš viso (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Pramogos ir poilsis
 ,Item Variant Details,Prekės variantai
@@ -4360,9 +4387,9 @@
 DocType: Drug Prescription,Hour,valanda
 DocType: Restaurant Order Entry,Last Sales Invoice,Paskutinė pardavimo sąskaita faktūra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Pasirinkite kiekį prieš elementą {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nauja Serijos Nr negalite turime sandėlyje. Sandėlių turi nustatyti vertybinių popierių atvykimo arba pirkimo kvito
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nauja Serijos Nr negalite turime sandėlyje. Sandėlių turi nustatyti vertybinių popierių atvykimo arba pirkimo kvito
 DocType: Lead,Lead Type,Švinas tipas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Jūs nesate įgaliotas tvirtinti lapus Block Datos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Jūs nesate įgaliotas tvirtinti lapus Block Datos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Visi šie elementai jau buvo sąskaitoje
 DocType: Company,Monthly Sales Target,Mėnesio pardavimo tikslai
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Gali būti patvirtintas {0}
@@ -4370,7 +4397,7 @@
 DocType: Item,Default Material Request Type,Numatytasis Medžiaga Prašymas tipas
 DocType: Supplier Scorecard,Evaluation Period,Vertinimo laikotarpis
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nežinomas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Darbo užsakymas nerastas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Darbo užsakymas nerastas
 DocType: Shipping Rule,Shipping Rule Conditions,Pristatymas taisyklė sąlygos
 DocType: Purchase Invoice,Export Type,Eksporto tipas
 DocType: Salary Slip Loan,Salary Slip Loan,Atlyginimo paskolos paskola
@@ -4386,8 +4413,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Sąskaitų faktūrų atidarymas santrauka
 DocType: Education Settings,Education Manager,Švietimo vadybininkas
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Mažiausias ilgis tarp kiekvieno augalo lauke optimaliam augimui
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Partijomis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, o ne naudoti Inventorinis įrašą"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Partijomis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, o ne naudoti Inventorinis įrašą"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Partijomis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, o ne naudoti Inventorinis įrašą"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Partijomis {0} Prekė negali būti atnaujintas naudojant Inventorinis susitaikymo, o ne naudoti Inventorinis įrašą"
 DocType: Quality Inspection,Report Date,Ataskaitos data
 DocType: Student,Middle Name,Antras vardas
 DocType: C-Form,Invoices,Sąskaitos
@@ -4420,20 +4447,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,gavimas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,gavimas
 ,Sales Register,pardavimų Registruotis
 DocType: Daily Work Summary Group,Send Emails At,Siųsti laiškus Šiuo
 DocType: Quotation,Quotation Lost Reason,Citata Pamiršote Priežastis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nėra nieko keisti.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formos peržiūra
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Išlaidų patvirtinimo priemonė privaloma išlaidų deklaracijoje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Pridėkite naudotojų prie savo organizacijos, išskyrus save."
 DocType: Customer Group,Customer Group Name,Klientų Grupės pavadinimas
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nėra Klientai dar!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pinigų srautų ataskaita
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nepateiktas jokių svarbių užklausų
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prašome pasirinkti perkelti skirtumą, jei taip pat norite įtraukti praėjusius finansinius metus balanso palieka šią fiskalinių metų"
@@ -4456,11 +4484,12 @@
 DocType: Vehicle,Chassis No,Važiuoklės Nėra
 DocType: Payment Request,Initiated,inicijuotas
 DocType: Production Plan Item,Planned Start Date,Planuojama pradžios data
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Pasirinkite BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Pasirinkite BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Pasinaudojo ITC integruotu mokesčiu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
+DocType: Bank Guarantee,Clauses and Conditions,Taisyklės ir sąlygos
 DocType: Serial No,Creation Document Type,Kūrimas Dokumento tipas
 DocType: Project Task,View Timesheet,Žiūrėti laiko juostą
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Pabaigos data turi būti didesnė už pradžios datą
 DocType: Leave Type,Is Encash,Ar inkasuoti
 DocType: Leave Allocation,New Leaves Allocated,Naujų lapų Paskirti
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektų išmintingas duomenys nėra prieinami Citata
@@ -4474,9 +4503,10 @@
 DocType: Patient,Alcohol Current Use,Alkoholio vartojimas
 DocType: Student Admission Program,Student Admission Program,Studentų priėmimo programa
 DocType: Payment Entry,Account Paid To,Sąskaita Paide
+DocType: Subscription Settings,Grace Period,Lengvatinis laikotarpis
 DocType: Item Alternative,Alternative Item Name,Alternatyvios prekės pavadinimas
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Tėvų {0} Prekė turi būti ne riedmenys
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nepavyko pateikti jokio atlyginimo užmokesčio <br> \ Galimos priežastys: <br> \ 1. Grynasis atlyginimas yra mažesnis nei 0. <br> \ 2. Įmonės darbuotojo kapitono nurodytas įmonės el. Pašto adresas negalioja. <br>
@@ -4486,7 +4516,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} biudžetas paskyra {1} prieš {2} {3} yra {4}. Jis bus viršyti {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Eilutės {0} # sąskaita turi būti tipo &quot;ilgalaikio turto&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,iš Kiekis
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ir nepakeista. Išjungta
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serija yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansinės paslaugos
 DocType: Student Sibling,Student ID,Studento pažymėjimas
@@ -4498,14 +4527,16 @@
 DocType: Complaint,Complaint,Skundas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
 DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Atlikti grąžinimo įmoką
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Visi departamentai
 DocType: Patient,Alcohol Past Use,Alkoholio praeities vartojimas
 DocType: Fertilizer Content,Fertilizer Content,Trąšų turinys
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,kr
 DocType: Project Update,Problematic/Stuck,Problema / pakimba
 DocType: Tax Rule,Billing State,atsiskaitymo valstybė
 DocType: Share Transfer,Transfer,perkėlimas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Darbo užsakymas {0} turi būti atšauktas prieš atšaukiant šį pardavimo užsakymą
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
 DocType: Authorization Rule,Applicable To (Employee),Taikoma (Darbuotojų)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Terminas yra privalomi
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
@@ -4529,10 +4560,11 @@
 DocType: Cheque Print Template,Message to show,Žinutė rodoma
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Mažmeninė
 DocType: Student Attendance,Absent,nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Prekės Rinkinys
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Prekės Rinkinys
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Neįmanoma rasti rezultato, pradedant {0}. Turite turėti stovinčius balus, apimančius nuo 0 iki 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Eilutės {0}: Neteisingas nuoroda {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkimo mokesčius bei rinkliavas šabloną
+DocType: Subscription,Current Invoice Start Date,Dabartinė sąskaitos faktūros pradžios data
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Bet debeto ar kredito suma yra reikalingas {2}
 DocType: GL Entry,Remarks,Pastabos
@@ -4542,11 +4574,13 @@
 DocType: Task,Parent Task,Tėvų užduotis
 DocType: Journal Entry,Write Off Based On,Nurašyti remiantis
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Padaryti Švinas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Spausdinti Kanceliarinės
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Spausdinti Kanceliarinės
 DocType: Stock Settings,Show Barcode Field,Rodyti Brūkšninis kodas laukas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Siųsti Tiekėjo laiškus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Pajamos jau tvarkomi laikotarpį tarp {0} ir {1}, palikite taikymo laikotarpį negali būti tarp šios datos intervalą."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Siųsti Tiekėjo laiškus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Pajamos jau tvarkomi laikotarpį tarp {0} ir {1}, palikite taikymo laikotarpį negali būti tarp šios datos intervalą."
+DocType: Fiscal Year,Auto Created,Sukurta automatiškai
 DocType: Chapter Member,Leave Reason,Palikite Priežastis
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Sąskaita {0} nebėra
 DocType: Guardian Interest,Guardian Interest,globėjas Palūkanos
 DocType: Volunteer,Availability,Prieinamumas
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Nustatykite POS sąskaitų faktūrų numatytasis vertes
@@ -4555,14 +4589,13 @@
 DocType: Timesheet,Employee Detail,Darbuotojų detalės
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-mail ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-mail ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Būsima data diena ir Pakartokite Mėnesio diena turi būti lygi
 DocType: Lab Prescription,Test Code,Bandymo kodas
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nustatymai svetainės puslapyje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},"Paraiškos dėl RFQ dėl {0} neleidžiamos, nes rezultatų rodymas yra {1}"
 DocType: Job Offer,Awaiting Response,Laukiama atsakymo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,virš
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Bendra suma {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Bendra suma {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Paminėkite, jei nestandartinis mokama sąskaita"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Prašome pasirinkti kitą nei &quot;visų vertinimo grupės&quot; įvertinimo grupė
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Eilutė {0}: reikalingas elementas {1}
@@ -4573,7 +4606,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vandens analizė
 DocType: Chapter,Region,regionas
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Neprivaloma. Šis nustatymas bus naudojami filtruoti įvairiais sandoriais.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
 DocType: Holiday List,Weekly Off,Savaitės Išjungtas
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Atnaujinti susietą analizę
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Dėl pvz 2012, 2012-13"
@@ -4589,7 +4622,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Išlaidos metalo laužą turto
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kaina centras yra privalomas punktas {2}
 DocType: Vehicle,Policy No,politikos Nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
 DocType: Asset,Straight Line,Tiesi linija
 DocType: Project User,Project User,Projektų Vartotojas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,skilimas
@@ -4629,21 +4662,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Kelias
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Negali konvertuoti Cost centrą knygoje, nes ji turi vaikų mazgai"
 DocType: Production Plan,Total Planned Qty,Bendras planuojamas kiekis
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,atidarymo kaina
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,atidarymo kaina
 DocType: Salary Detail,Formula,formulė
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serijinis #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serijinis #
 DocType: Lab Test Template,Lab Test Template,Laboratorijos bandymo šablonas
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Pardavimų sąskaita
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Pardavimų sąskaita
 DocType: Purchase Invoice Item,Total Weight,Bendras svoris
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija dėl pardavimo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisija dėl pardavimo
 DocType: Job Offer Term,Value / Description,Vertė / Aprašymas
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
 DocType: Tax Rule,Billing Country,atsiskaitymo Šalis
 DocType: Purchase Order Item,Expected Delivery Date,Numatomas pristatymo datos
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorano užsakymo įrašas
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeto ir kredito nėra vienoda {0} # {1}. Skirtumas yra {2}.
 DocType: Asset Maintenance Task,Assign To Name,Priskirti vardui
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Reprezentacinės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Reprezentacinės išlaidos
 DocType: Hub Settings,Enabled Users,Įgalinti vartotojai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Padaryti Material užklausa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Atviras punktas {0}
@@ -4656,24 +4689,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Paraiškos atostogas.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Sąskaita su esamais sandoris negali būti išbrauktas
 DocType: Vehicle,Last Carbon Check,Paskutinis Anglies Atvykimas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,teisinės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,teisinės išlaidos
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Prašome pasirinkti kiekį ant eilėje
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Atlikti pardavimo ir pirkimo sąskaitas faktūras
 DocType: Purchase Invoice,Posting Time,Siunčiamos laikas
 DocType: Timesheet,% Amount Billed,% Suma Įvardintas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,telefono išlaidas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,telefono išlaidas
 DocType: Sales Partner,Logo,logotipas
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Pažymėkite, jei norite priversti vartotoją prieš taupymo pasirinkti seriją. Nebus nutylėjimą, jei jums patikrinti tai."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nėra Prekė su Serijos Nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nėra Prekė su Serijos Nr {0}
 DocType: Email Digest,Open Notifications,Atviri Pranešimai
 DocType: Payment Entry,Difference Amount (Company Currency),Skirtumas Suma (Įmonės valiuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,tiesioginės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,tiesioginės išlaidos
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Naujas klientas pajamos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Kelionės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Kelionės išlaidos
 DocType: Maintenance Visit,Breakdown,Palaužti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pridėti priskirtą lauko prenumeratą doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
 DocType: Purchase Receipt Item,Sample Quantity,Mėginio kiekis
+DocType: Bank Guarantee,Name of Beneficiary,Gavėjo vardas ir pavardė
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atnaujinti BOM išlaidas automatiškai per planuotoją, remiantis naujausiu žaliavų įvertinimo / kainų sąrašo norma / paskutine pirkimo norma."
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Sąskaita {0}: Tėvų sąskaitą {1} nepriklauso įmonės: {2}
@@ -4685,14 +4718,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,išbandymas
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Atlyginimo komponentai
 DocType: Program Enrollment Tool,New Academic Year,Nauja akademiniai metai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automatinis įterpti Kainų sąrašas norma, jei trūksta"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Iš viso sumokėta suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Iš viso sumokėta suma
 DocType: GST Settings,B2C Limit,B2C riba
 DocType: Work Order Item,Transferred Qty,perkelta Kiekis
 apps/erpnext/erpnext/config/learn.py +11,Navigating,navigacija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,planavimas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,planavimas
 DocType: Share Balance,Issued,išduotas
+DocType: Loan,Repayment Start Date,Grąžinimo pradžios data
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentų aktyvumas
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,tiekėjas ID
 DocType: Payment Request,Payment Gateway Details,Mokėjimo šliuzai detalės
@@ -4705,10 +4739,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipas lapų kaip atsitiktinis, serga ir tt"
 DocType: Email Digest,Send regular summary reports via Email.,Siųsti reguliarius suvestines ataskaitas elektroniniu paštu.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Prašome nustatyti numatytąją sąskaitą išlaidų teiginio tipas {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Prašome nustatyti numatytąją sąskaitą išlaidų teiginio tipas {0}
 DocType: Assessment Result,Student Name,Studento vardas
 DocType: Brand,Item Manager,Prekė direktorius
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Darbo užmokesčio Mokėtina
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Darbo užmokesčio Mokėtina
 DocType: Buying Settings,Default Supplier Type,Numatytasis Tiekėjas tipas
 DocType: Plant Analysis,Collection Datetime,Kolekcija Datetime
 DocType: Work Order,Total Operating Cost,Iš viso eksploatavimo išlaidos
@@ -4718,9 +4752,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Vartotojas {0} neegzistuoja
 DocType: Payment Term,Day(s) after invoice date,Diena (-os) po sąskaitos faktūros datos
 DocType: Payment Schedule,Payment Schedule,Mokėjimo planas
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,santrumpa
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Mokėjimo įrašas jau yra
+DocType: Subscription,Trial Period End Date,Bandymo pabaigos data
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized nuo {0} viršija ribas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Pajamos šablonas meistras.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologija
@@ -4737,9 +4771,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citatos klientų ar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vaidmuo leidžiama redaguoti šaldytą žaliavą
 ,Territory Target Variance Item Group-Wise,Teritorija Tikslinė Dispersija punktas grupė-Išminčius
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Visi klientų grupėms
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Visi klientų grupėms
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,sukauptas Mėnesio
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Sąskaita {0}: Tėvų sąskaitą {1} neegzistuoja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Kainų sąrašas greitis (Įmonės valiuta)
@@ -4748,14 +4782,15 @@
 DocType: Lab Prescription,Test Created,Testas sukurtas
 DocType: Healthcare Settings,Custom Signature in Print,Pasirinktinis parašas spausdinti
 DocType: Account,Temporary,laikinas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kliento LPO Nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kliento LPO Nr.
 DocType: Program,Courses,kursai
 DocType: Monthly Distribution Percentage,Percentage Allocation,procentas paskirstymas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,sekretorius
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,sekretorius
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Jei išjungti &quot;žodžiais&quot; srityje nebus matomas bet koks sandoris
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Šis veiksmas sustabdo atsiskaitymą ateityje. Ar tikrai norite atšaukti šią prenumeratą?
 DocType: Serial No,Distinct unit of an Item,Skirtingai vienetas elementą
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterijos pavadinimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Prašome nurodyti Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Prašome nurodyti Company
 DocType: Pricing Rule,Buying,pirkimas
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Ligos ir trąšos
 DocType: HR Settings,Employee Records to be created by,Darbuotojų Įrašai turi būti sukurtas
@@ -4764,18 +4799,18 @@
 DocType: POS Profile,Apply Discount On,Taikyti nuolaidą
 DocType: Member,Membership Type,Narystės tipas
 ,Reqd By Date,Reqd Pagal datą
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,kreditoriai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,kreditoriai
 DocType: Assessment Plan,Assessment Name,vertinimas Vardas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Rodyti PDC spausdintuvu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Rodyti PDC spausdintuvu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Eilutės # {0}: Serijos Nr privaloma
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Prekė Išminčius Mokesčių detalės
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Darbo pasiūlymas
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,institutas santrumpa
 ,Item-wise Price List Rate,Prekė išmintingas Kainų sąrašas Balsuok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,tiekėjas Citata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,tiekėjas Citata
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Žodžiais bus matomas, kai jūs išgelbėti citatos."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
@@ -4793,7 +4828,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Iš viso Dispersija
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jei įjungta, sistema bus po apskaitos įrašus inventoriaus automatiškai."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,tarpininkavimas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Lankomumas už {0} darbuotojas jau yra pažymėtas šiai dienai
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Lankomumas už {0} darbuotojas jau yra pažymėtas šiai dienai
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",minutėmis Atnaujinta per &quot;Time Prisijungti&quot;
 DocType: Customer,From Lead,nuo švino
@@ -4804,6 +4839,7 @@
 DocType: Lab Test,Approved Date,Patvirtinta data
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast vienas sandėlis yra privalomas
+DocType: Subscriber,Subscriber Name,Prenumeratos pavadinimas
 DocType: Serial No,Out of Warranty,Iš Garantija
 DocType: BOM Update Tool,Replace,pakeisti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nėra prekių nerasta.
@@ -4813,19 +4849,18 @@
 DocType: Request for Quotation Item,Project Name,projekto pavadinimas
 DocType: Customer,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
 DocType: Journal Entry Account,If Income or Expense,Jei pajamos ar sąnaudos
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Pasirinkite palūkanų pajamų sąskaitą darbuotojo paskoloje {0}
 DocType: Work Order,Required Items,Reikalingi daiktai
 DocType: Stock Ledger Entry,Stock Value Difference,Akcijų vertės skirtumas
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Žmogiškieji ištekliai
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Mokėjimo Susitaikymas Mokėjimo
 DocType: Disease,Treatment Task,Gydymo užduotis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,mokesčio turtas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,mokesčio turtas
 DocType: BOM Item,BOM No,BOM Nėra
 DocType: Instructor,INS/,IP /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Žurnalo įrašą {0} neturi paskyros {1} arba jau suderinta su kitų kuponą
 DocType: Item,Moving Average,slenkamasis vidurkis
 DocType: BOM Update Tool,The BOM which will be replaced,BOM kuris bus pakeistas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektroniniai įrengimai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektroniniai įrengimai
 DocType: Asset,Maintenance Required,Reikalinga techninė priežiūra
 DocType: Account,Debit,debetas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Lapai turi būti skiriama kartotinus 0,5"
@@ -4834,7 +4869,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,neįvykdyti Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nustatyti tikslai punktas grupė-protingas šiam Pardavimų asmeniui.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Atsargos senesnis nei [diena]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Eilutės # {0}: turtas yra privalomas ilgalaikio turto pirkimas / pardavimas
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Eilutės # {0}: turtas yra privalomas ilgalaikio turto pirkimas / pardavimas
 DocType: Asset Maintenance Team,Maintenance Team Name,Techninės priežiūros komandos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jei du ar daugiau Kainodaros taisyklės yra rasta remiantis pirmiau minėtų sąlygų, pirmenybė taikoma. Prioritetas yra skaičius nuo 0 iki 20, o numatytoji reikšmė yra nulis (tuščias). Didesnis skaičius reiškia, kad jis bus viršesnės jei yra keli kainodaros taisyklės, kurių pačiomis sąlygomis."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Klientas yra privalomas, jei pasirinkta kaip &quot;Klientas&quot; iš &quot;Galimybės&quot;"
@@ -4844,19 +4879,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipai sąskaita reikalavimą.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pardavimo normą punkto {0} yra mažesnis nei {1}. Pardavimo kursas turėtų būti atleast {2}
-DocType: Item,Taxes,Mokesčiai
+DocType: Subscription,Taxes,Mokesčiai
 DocType: Purchase Invoice,capital goods,kapitalo prekės
 DocType: Purchase Invoice Item,Weight Per Unit,Svoris vienetui
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Mokama ir nepareiškė
 DocType: Project,Default Cost Center,Numatytasis Kaina centras
-DocType: Bank Guarantee,End Date,pabaigos data
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Akcijų sandoriai
 DocType: Budget,Budget Accounts,Biudžetinėse sąskaitose
 DocType: Employee,Internal Work History,Vidaus darbo istoriją
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Sukauptas nusidėvėjimas suma
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity &quot;
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Tiekėjo rezultatų kortelės kintamasis
-DocType: Employee Loan,Fully Disbursed,visiškai išmokėta
 DocType: Employee Advance,Due Advance Amount,Preliminari suma
 DocType: Maintenance Visit,Customer Feedback,Klientų Atsiliepimai
 DocType: Account,Expense,išlaidos
@@ -4880,7 +4913,7 @@
 ,Employee Information,Darbuotojų Informacija
 DocType: Stock Entry Detail,Additional Cost,Papildoma Kaina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Negali filtruoti pagal lakšto, jei grupuojamas kuponą"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Padaryti Tiekėjo Citata
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Padaryti Tiekėjo Citata
 DocType: Quality Inspection,Incoming,įeinantis
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Sukuriami numatyti mokesčių šablonai pardavimui ir pirkimui.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Vertinimo rezultatų įrašas {0} jau egzistuoja.
@@ -4888,7 +4921,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Prašome nustatyti Įmonės filtruoti tuščias, jei Grupuoti pagal tai &quot;kompanija&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Siunčiamos data negali būti ateitis data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Eilutės # {0}: Serijos Nr {1} nesutampa su {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,generuoti pasikartojančius
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Address
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Laisvalaikio atostogos
 DocType: Agriculture Task,End Day,Pabaiga diena
@@ -4913,11 +4945,10 @@
 DocType: Material Request,% Ordered,% Užsakytas
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursą, pagrįstą studentų grupės, kurso bus patvirtintas kiekvienas studentas iš užprogramuoto kursai programoje registraciją."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,vienetinį
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Ieško Balsuok
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Vid. Ieško Balsuok
 DocType: Share Balance,From No,Iš Nr
 DocType: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
 DocType: Employee,History In Company,Istorija Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nauja žinutė iš {siuntėjo}
 DocType: Customer,Customer Primary Address,Pirminis kliento adresas
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Naujienų prenumerata
 DocType: Drug Prescription,Description/Strength,Aprašymas / stiprumas
@@ -4926,22 +4957,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Tas pats daiktas buvo įvesta kelis kartus
 DocType: Department,Leave Block List,Palikite Blokuoti sąrašas
 DocType: Purchase Invoice,Tax ID,Mokesčių ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Prekė {0} nėra setup Serijos Nr. Skiltis turi būti tuščias
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Prekė {0} nėra setup Serijos Nr. Skiltis turi būti tuščias
 DocType: Accounts Settings,Accounts Settings,Sąskaitos Nustatymai
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,patvirtinti
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Iškabodamas adresas {0}, prašome išspręsti, jei norite tęsti."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Iškabodamas adresas {0}, prašome išspręsti, jei norite tęsti."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Naujos sąskaitos numeris, jis bus įtrauktas į sąskaitos pavadinimą kaip prefiksą"
 DocType: Maintenance Team Member,Team Member,Komandos narys
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nėra rezultato pateikti
 DocType: Customer,Sales Partner and Commission,Pardavimų partneris ir Komisija
-DocType: Employee Loan,Rate of Interest (%) / Year,Palūkanų norma (%) / metus
+DocType: Loan,Rate of Interest (%) / Year,Palūkanų norma (%) / metus
 ,Project Quantity,Projektų Kiekis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
 DocType: Opportunity,To Discuss,Diskutuoti
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} vienetai {1} reikia {2} užbaigti šį sandorį.
 DocType: Loan Type,Rate of Interest (%) Yearly,Palūkanų norma (%) Metinės
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Laikinosios sąskaitos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,juodas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Laikinosios sąskaitos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,juodas
 DocType: BOM Explosion Item,BOM Explosion Item,BOM sprogimo punktas
 DocType: Shareholder,Contact List,Kontaktų sarašas
 DocType: Account,Auditor,auditorius
@@ -4949,16 +4980,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} daiktai gaminami
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Sužinoti daugiau
 DocType: Cheque Print Template,Distance from top edge,Atstumas nuo viršutinio krašto
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Kainų sąrašas {0} yra išjungtas arba neegzistuoja
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Kainų sąrašas {0} yra išjungtas arba neegzistuoja
 DocType: Purchase Invoice,Return,sugrįžimas
 DocType: Pricing Rule,Disable,išjungti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,mokėjimo būdas turi atlikti mokėjimą
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,mokėjimo būdas turi atlikti mokėjimą
 DocType: Project Task,Pending Review,kol apžvalga
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Visame puslapyje redaguokite daugiau pasirinkčių, pvz., Turto, serijos numerių, siuntų ir pan."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Paskyrimai ir konsultacijos
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nėra įtraukti į Seriją {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Turto {0} negali būti sunaikintas, nes jis jau yra {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Reikalingi čekiai
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Reikalingi čekiai
 DocType: Task,Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per expense punktą)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Pažymėti Nėra
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Nepavyko nustatyti įmonės
@@ -4970,7 +5001,7 @@
 DocType: Homepage,Tag Line,Gairė linija
 DocType: Fee Component,Fee Component,mokestis komponentas
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,laivyno valdymo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Pridėti elementus iš
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Pridėti elementus iš
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Augalai ir žemės sklypai
 DocType: Cheque Print Template,Regular,reguliarus
 DocType: Fertilizer,Density (if liquid),Tankis (jei skystis)
@@ -4995,24 +5026,26 @@
 DocType: Payment Entry,Paid Amount,sumokėta suma
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Naršyti pardavimo ciklą
 DocType: Assessment Plan,Supervisor,vadovas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Saugojimo atsargos įrašas
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Saugojimo atsargos įrašas
 ,Available Stock for Packing Items,Turimas sandėlyje pakuoti prekės
 DocType: Item Variant,Item Variant,Prekė variantas
 ,Work Order Stock Report,Darbų užsakymų atsargų ataskaita
+DocType: Purchase Receipt,Auto Repeat Detail,Automatinis kartojimo detalės
 DocType: Assessment Result Tool,Assessment Result Tool,Vertinimo rezultatas įrankis
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kaip vadovas
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Pasiūlykite kategoriją
 DocType: BOM Scrap Item,BOM Scrap Item,BOM laužas punktas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Sąskaitos likutis jau debeto, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;Kreditas&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,kokybės valdymas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,kokybės valdymas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Prekė {0} buvo išjungta
 DocType: Project,Total Billable Amount (via Timesheets),Visa apmokestinamoji suma (per laiko lapus)
 DocType: Agriculture Task,Previous Business Day,Ankstesne darbo diena
-DocType: Employee Loan,Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis
+DocType: Loan,Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis
 DocType: Employee,Health Insurance No,Sveikatos draudimas Nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Prašome įvesti kiekį punkte {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredito Pastaba Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredito Pastaba Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Visa apmokestinamoji suma
 DocType: Employee External Work History,Employee External Work History,Darbuotojų Išorinis Darbo istorija
 DocType: Opening Invoice Creation Tool,Purchase,pirkti
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balansas Kiekis
@@ -5023,16 +5056,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} už {1}
 DocType: Healthcare Settings,Valid number of days,Tinkamas dienų skaičius
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,sąnaudų centrams
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Iš naujo prenumeruoti
 DocType: Land Unit,Linked Plant Analysis,Susijusi augalų analizė
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Norma, pagal kurią tiekėjas valiuta yra konvertuojamos į įmonės bazine valiuta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Eilutės # {0}: laikus prieštarauja eilės {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leiskite Zero Vertinimo Balsuok
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Leiskite Zero Vertinimo Balsuok
+DocType: Bank Guarantee,Receiving,Priėmimas
 DocType: Training Event Employee,Invited,kviečiami
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Keli darbuotojo {0} nerasta pagal nurodytą datų aktyvių Atlyginimo struktūros
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Parametrų Gateway sąskaitos.
 DocType: Employee,Employment Type,Užimtumas tipas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Ilgalaikis turtas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Ilgalaikis turtas
 DocType: Payment Entry,Set Exchange Gain / Loss,Nustatyti keitimo pelnas / nuostolis
 ,GST Purchase Register,"Paaiškėjo, kad GST Pirkimo Registruotis"
 ,Cash Flow,Pinigų srautas
@@ -5053,9 +5088,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Visų akcijų sandorių sąrašas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Grafas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Grafas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Pridedamas {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Turi būti nustatyta tiek bandomojo laikotarpio pradžios data, tiek bandomojo laikotarpio pabaigos data"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Vidutinė norma
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Bendra mokėjimo suma mokėjimo grafike turi būti lygi Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Bendra mokėjimo suma mokėjimo grafike turi būti lygi Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Suplanuoti
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banko pažyma likutis vienam General Ledger
 DocType: Job Applicant,Applicant Name,Vardas pareiškėjas
 DocType: Authorization Rule,Customer / Item Name,Klientas / Prekės pavadinimas
@@ -5085,6 +5121,7 @@
 DocType: Work Order,Warehouses,Sandėliai
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} turtas negali būti perduotas
 DocType: Hotel Room Pricing,Hotel Room Pricing,Viešbučių kainų nustatymas
+DocType: Subscription,Days Until Due,Dienos iki pratęsimo
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Šis elementas yra {0} (šablonų) variantas.
 DocType: Workstation,per hour,per valandą
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Pirkimas
@@ -5093,13 +5130,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","UŽ SERIJŲ remiantis studentų grupę, studentas Serija bus patvirtintas kiekvienas studentas iš programos registraciją."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Sandėlių negali būti išbrauktas, nes egzistuoja akcijų knygos įrašas šiame sandėlyje."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,pasiskirstymas
+DocType: Journal Entry Account,Loan,Paskola
 DocType: Expense Claim Advance,Expense Claim Advance,Išankstinio išlaidų reikalavimas
 DocType: Lab Test,Report Preference,Pranešimo nuostatos
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Savanorio informacija.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projekto vadovas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projekto vadovas
 ,Quoted Item Comparison,Cituojamas punktas Palyginimas
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Pervykimas taškų tarp {0} ir {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,išsiuntimas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,išsiuntimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksimali nuolaida leidžiama punktu: {0} yra {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Grynoji turto vertė, nuo"
 DocType: Crop,Produce,Gaminti
@@ -5109,7 +5147,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Medžiagų sunaudojimas gamybai
 DocType: Item Alternative,Alternative Item Code,Alternatyvus elemento kodas
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vaidmenį, kurį leidžiama pateikti sandorius, kurie viršija nustatytus kredito limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Pasirinkite prekę Gamyba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Pasirinkite prekę Gamyba
 DocType: Delivery Stop,Delivery Stop,Pristatymas Stotelė
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
 DocType: Item,Material Issue,medžiaga išdavimas
@@ -5119,15 +5157,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,"Muilas, skalbimo"
 DocType: BOM,Show Items,Rodyti prekių
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nuo laikas negali būti didesnis nei laiko.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Ar norite pranešti visiems klientams elektroniniu paštu?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Ar norite pranešti visiems klientams elektroniniu paštu?
+DocType: Subscription Plan,Billing Interval,Atsiskaitymo intervalas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Filmavimo ir vaizdo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Tęsti
 DocType: Hub Settings,Hub Username,Hub vardas
 DocType: Salary Detail,Component,Komponentas
 DocType: Assessment Criteria,Assessment Criteria Group,Vertinimo kriterijai grupė
 DocType: Healthcare Settings,Patient Name By,Paciento vardas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},&quot;Accrual Journal&quot; įrašas už atlyginimus nuo {0} iki {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},&quot;Accrual Journal&quot; įrašas už atlyginimus nuo {0} iki {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
 DocType: Warehouse,Warehouse Name,Sandėlių Vardas
 DocType: Naming Series,Select Transaction,Pasirinkite Sandorio
@@ -5141,23 +5179,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Čia galite išsaugoti ūgį, svorį, alergijos, medicinos problemas ir tt"
 DocType: Leave Block List,Applies to Company,Taikoma Company
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
-DocType: Employee Loan,Disbursement Date,išmokėjimas data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,"""Gavėjai"" nenurodyti"
+DocType: Loan,Disbursement Date,išmokėjimas data
 DocType: BOM Update Tool,Update latest price in all BOMs,Atnaujinkite naujausią kainą visose BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicininis įrašas
 DocType: Vehicle,Vehicle,transporto priemonė
 DocType: Purchase Invoice,In Words,Žodžiais
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,"Prieš pateikdami, įveskite banko ar skolinančios įstaigos pavadinimą."
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} turi būti pateiktas
 DocType: POS Profile,Item Groups,Prekė Grupės
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Šiandien {0} gimtadienis!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Šiandien {0} gimtadienis!
 DocType: Sales Order Item,For Production,gamybai
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Pridėkite laikinąją atidarymo sąskaitą sąskaitų grafike
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Pridėkite laikinąją atidarymo sąskaitą sąskaitų grafike
 DocType: Customer,Customer Primary Contact,Pirmasis kliento kontaktas
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periodo uždarymo leidinys
 DocType: Project Task,View Task,Peržiūrėti Užduotis
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Švinas%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Švinas%
+DocType: Bank Guarantee,Bank Guarantee Type,Banko garantijos tipas
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Sąskaita faktūra porcija
 ,Asset Depreciations and Balances,Turto Nusidėvėjimas ir likučiai
@@ -5168,9 +5207,8 @@
 DocType: Production Plan,Include Subcontracted Items,Įtraukite subrangos elementus
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,prisijungti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,trūkumo Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Negalima pakeisti variantų savybių po atsargų perkėlimo. Norėdami tai padaryti, turėsite padaryti naują punktą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
-DocType: Employee Loan,Repay from Salary,Grąžinti iš Pajamos
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+DocType: Loan,Repay from Salary,Grąžinti iš Pajamos
 DocType: Leave Application,LAP/,juosmens /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
 DocType: Salary Slip,Salary Slip,Pajamos Kuponas
@@ -5194,11 +5232,11 @@
 DocType: Employee Education,Employee Education,Darbuotojų Švietimas
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dubliuoti punktas grupė rastas daiktas grupės lentelėje
 DocType: Land Unit,Parent Land Unit,Tėvų žemės skyrius
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
 DocType: Fertilizer,Fertilizer Name,Trąšų pavadinimas
 DocType: Salary Slip,Net Pay,Grynasis darbo užmokestis
 DocType: Cash Flow Mapping Accounts,Account,sąskaita
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijos Nr {0} jau gavo
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serijos Nr {0} jau gavo
 ,Requested Items To Be Transferred,Pageidaujami daiktai turi būti perkeltos
 DocType: Expense Claim,Vehicle Log,Automobilio Prisijungti
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Karščiavimas (temperatūra&gt; 38,5 ° C / 101,3 ° F arba išlaikoma temperatūra&gt; 38 ° C / 100,4 ° F)"
@@ -5239,24 +5277,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą."
 DocType: Asset Maintenance,Manufacturing User,gamyba Vartotojas
 DocType: Purchase Invoice,Raw Materials Supplied,Žaliavos Pateikiamas
-DocType: C-Form,Series,serija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Kainų sąrašo {0} valiuta turi būti {1} arba {2}
 DocType: Appraisal,Appraisal Template,vertinimas Šablono
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Prekė klasifikavimas
 DocType: Driver,License Number,Licencijos numeris
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Verslo plėtros vadybininkas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Verslo plėtros vadybininkas
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Priežiūra vizito tikslas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Sąskaitos pacientų registracija
 DocType: Crop,Period,laikotarpis
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Bendra Ledgeris
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Darbuotojų {0} atostogose dėl {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Darbuotojų {0} atostogose dėl {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Peržiūrėti laidai
 DocType: Program Enrollment Tool,New Program,nauja programa
 DocType: Item Attribute Value,Attribute Value,Pavadinimas Reikšmė
 ,Itemwise Recommended Reorder Level,Itemwise Rekomenduojama Pertvarkyti lygis
 DocType: Salary Detail,Salary Detail,Pajamos detalės
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Prašome pasirinkti {0} pirmas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Prašome pasirinkti {0} pirmas
 DocType: Appointment Type,Physician,Gydytojas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Serija {0} punkto {1} yra pasibaigęs.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacijos
@@ -5264,15 +5301,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) negali viršyti numatyto kiekio ({2}) darbo tvarkoje {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Laikas lapas gamybai.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Tarpinė suma
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Negalima keisti Variantų savybių po sandorio su akcijomis. Norėdami tai padaryti, turėsite padaryti naują punktą."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,&quot;GoCardless&quot; SEPA mandatas
 DocType: Physician,Charges,Mokesčiai
 DocType: Production Plan,Get Items For Work Order,Gauti daiktus darbui
 DocType: Salary Detail,Default Amount,numatytasis dydis
 DocType: Lab Test Template,Descriptive,Apibūdinamasis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Sandėlių nerastas sistemos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sandėlių nerastas sistemos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Šio mėnesio suvestinė
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kokybės inspekcija skaitymas
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"""Užšaldyti atsargas senesnes negu` turėtų būti mažesnis nei% d dienų."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Užšaldyti atsargas senesnes negu` turėtų būti mažesnis nei% d dienų."
 DocType: Tax Rule,Purchase Tax Template,Pirkimo Mokesčių šabloną
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Nustatykite pardavimo tikslą, kurį norite pasiekti savo bendrovei."
 ,Project wise Stock Tracking,Projektų protinga sandėlyje sekimo
@@ -5300,11 +5338,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Nepavyko sukurti svetainės
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konversijos detalės
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Sulaikymo atsargų įrašas jau sukurtas arba nepateiktas mėginio kiekis
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Sulaikymo atsargų įrašas jau sukurtas arba nepateiktas mėginio kiekis
 DocType: Program,Program Abbreviation,programos santrumpa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Mokesčiai yra atnaujinama pirkimo kvitą su kiekvieno elemento
 DocType: Warranty Claim,Resolved By,sprendžiami
-DocType: Bank Guarantee,Start Date,Pradžios data
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Skirti lapai laikotarpiui.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekiai ir užstatai neteisingai išvalytas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Sąskaita {0}: Jūs negalite priskirti save kaip patronuojančios sąskaitą
@@ -5319,11 +5356,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,valandos
 DocType: Project,Expected Start Date,"Tikimasi, pradžios data"
 DocType: Purchase Invoice,04-Correction in Invoice,04-taisymas sąskaitoje faktūroje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Darbų užsakymas jau sukurtas visiems elementams su BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Darbų užsakymas jau sukurtas visiems elementams su BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variantas išsamios ataskaitos
 DocType: Setup Progress Action,Setup Progress Action,&quot;Progress&quot; veiksmo nustatymas
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Pirkimo kainoraštis
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Pirkimo kainoraštis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Pašalinti elementą jei mokesčiai nėra taikomi šio elemento
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Atšaukti prenumeratą
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Pasirinkite techninės priežiūros būseną kaip užbaigtą arba pašalinkite užbaigimo datą
 DocType: Supplier,Default Payment Terms Template,Numatytasis mokėjimo sąlygų šablonas
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,"Operacijos valiuta turi būti toks pat, kaip mokėjimo šliuzai valiuta"
@@ -5334,7 +5372,6 @@
 DocType: Employee,Educational Qualification,edukacinė kvalifikacija
 DocType: Workstation,Operating Costs,Veiklos sąnaudos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Veiksmų, jei sukauptos mėnesio biudžetas Viršytas"
-DocType: Subscription,Submit on creation,Pateikti steigti
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valiuta {0} turi būti {1}
 DocType: Asset,Disposal Date,Atliekų data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Laiškai bus siunčiami į visus aktyvius bendrovės darbuotojams už tam tikrą valandą, jei jie neturi atostogų. Atsakymų santrauka bus išsiųstas vidurnaktį."
@@ -5353,6 +5390,7 @@
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Cheque Print Template,Cheque Print Template,Čekis Spausdinti Šablono
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Schema sąnaudų centrams
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Dienų skaičius po sąskaitos faktūros datos pasibaigė prieš atšaukiant prenumeratą arba pažymint prenumeratą kaip neapmokėtą
 DocType: Lab Test Template,Sample Collection,Pavyzdžių rinkinys
 ,Requested Items To Be Ordered,Pageidaujami Daiktai nurodoma padengti
 DocType: Price List,Price List Name,Kainų sąrašas vardas
@@ -5361,7 +5399,7 @@
 DocType: Account,Income,Pajamos
 DocType: Industry Type,Industry Type,pramonė tipas
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Kažkas atsitiko!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Įspėjimas: Palikite paraiškoje yra šie blokas datos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Įspėjimas: Palikite paraiškoje yra šie blokas datos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Pardavimų sąskaita faktūra {0} jau buvo pateikta
 DocType: Supplier Scorecard Scoring Criteria,Score,rezultatas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Finansiniai metai {0} neegzistuoja
@@ -5381,12 +5419,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale profilis
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} turėtų būti vertė nuo 0 iki 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Kitas Nusidėvėjimo data negali būti ankstesnė už Galimos naudojimo datą
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,neužtikrintas paskolas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,neužtikrintas paskolas
 DocType: Cost Center,Cost Center Name,Kainuos centras vardas
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksimalus darbo laikas nuo laiko apskaitos žiniaraštis
 DocType: Maintenance Schedule Detail,Scheduled Date,Numatoma data
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Visų mokamų Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Visų mokamų Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Žinutės didesnis nei 160 simboliai bus padalintas į keletą pranešimų
 DocType: Purchase Receipt Item,Received and Accepted,Gavo ir patvirtino
 DocType: Hub Settings,Company and Seller Profile,Įmonės ir pardavėjo profilis
@@ -5400,10 +5438,9 @@
 DocType: Item,Variant Based On,Variantas remiantis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Jūsų tiekėjai
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prašome ištaisyti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
 DocType: Request for Quotation Item,Supplier Part No,Tiekėjas partijos nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anoniminis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Gautas nuo
 DocType: Lead,Converted,Perskaičiuotas
@@ -5417,6 +5454,7 @@
 DocType: Asset,Assets,Turtas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Kompiuteris
 DocType: Item,List this Item in multiple groups on the website.,Sąrašas šį Elementą keliomis grupėmis svetainėje.
+DocType: Subscription,Current Invoice End Date,Dabartinė sąskaitos faktūros pabaigos data
 DocType: Payment Term,Due Date Based On,Terminas pagrįstas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Nustatykite numatytuosius klientų grupės ir teritorijos nustatymus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} neegzistuoja
@@ -5424,7 +5462,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Punktas: {0} neegzistuoja sistemoje
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Jūs nesate įgaliotas nustatyti Frozen vertę
 DocType: Payment Reconciliation,Get Unreconciled Entries,Gauk Unreconciled įrašai
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nepasirinkta atlyginimo žurnalo įrašui
 DocType: Payment Reconciliation,From Invoice Date,Iš sąskaitos faktūros išrašymo data
+DocType: Loan,Disbursed,Išmokėta
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriniai nustatymai
 DocType: Patient Appointment,Service Unit,Aptarnavimo skyrius
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Sėkmingai nustatykite tiekėją
@@ -5437,12 +5477,12 @@
 DocType: Share Balance,No of Shares,Akcijų skaičius
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Turi serijinį Nr."" negali būti ""Taip"" , daiktui kurio nėra sandelyje."
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Pasirinkite būseną
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
 DocType: Pricing Rule,Pricing Rule Help,Kainodaros taisyklė Pagalba
 DocType: School House,House Name,Namas Vardas
 DocType: Fee Schedule,Total Amount per Student,Bendra suma studentui
 DocType: Purchase Taxes and Charges,Account Head,sąskaita vadovas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,elektros
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,elektros
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridėti jūsų organizacijos pailsėti kaip savo vartotojams. Taip pat galite pridėti kviečiame klientus į jūsų portalą pridedant juos nuo Kontaktai
 DocType: Stock Entry,Total Value Difference (Out - In),Viso vertės skirtumas (iš - į)
 DocType: Grant Application,Requested Amount,Prašoma suma
@@ -5452,7 +5492,7 @@
 DocType: Crop Cycle,Detected Diseases,Aptikta ligų
 DocType: Stock Entry,Default Source Warehouse,Numatytasis Šaltinis sandėlis
 DocType: Item,Customer Code,Kliento kodas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Gimimo diena priminimas {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Gimimo diena priminimas {0}
 DocType: Asset Maintenance Task,Last Completion Date,Paskutinė užbaigimo data
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas nuo paskutinė užsakymo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
@@ -5460,9 +5500,10 @@
 DocType: GoCardless Settings,GoCardless Settings,&quot;GoCardless&quot; nustatymai
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akcijų turtas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Akcijų turtas
 DocType: Restaurant,Active Menu,Aktyvus meniu
 DocType: Target Detail,Target Qty,Tikslinė Kiekis
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Prieš paskolą: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Vykdyti Nustatymai
 DocType: Student Attendance,Present,Pateikti
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Važtaraštis {0} negali būti pateikta
@@ -5471,9 +5512,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
 DocType: Vehicle Log,Odometer,odometras
 DocType: Production Plan Item,Ordered Qty,Užsakytas Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Prekė {0} yra išjungtas
 DocType: Stock Settings,Stock Frozen Upto,Akcijų Šaldyti upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
 DocType: Chapter,Chapter Head,Skyrius vadovas
 DocType: Payment Term,Month(s) after the end of the invoice month,Mėnuo (-os) po sąskaitos faktūros mėnesio pabaigos
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projekto veikla / užduotis.
@@ -5481,11 +5522,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Sukurti apie atlyginimų
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab datetime rezultatas negali būti prieš bandymą datatime
 DocType: POS Profile,Allow user to edit Discount,Leisti naudotojui redaguoti nuolaidą
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Gaukite klientus iš
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Gaukite klientus iš
 DocType: Purchase Invoice Item,Include Exploded Items,Įtraukti sprogus elementus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Ieško turi būti patikrinta, jei taikoma pasirinkta kaip {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Nuolaida turi būti mažesnis nei 100
 DocType: Shipping Rule,Restrict to Countries,Apriboti šalis
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; pavadinimo serija
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Nurašyti suma (Įmonės valiuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Atsiskaitymo laikas
 DocType: Project,Total Sales Amount (via Sales Order),Bendra pardavimo suma (per pardavimo užsakymą)
@@ -5504,6 +5546,7 @@
 DocType: Soil Texture,Sandy Clay,Smėlio molis
 DocType: Grant Application,Assessment  Manager,Vertinimo vadovas
 DocType: Payment Entry,Allocate Payment Amount,Skirti mokėjimo suma
+DocType: Subscription Plan,Subscription Plan,Prenumeratos planas
 DocType: Employee External Work History,Salary,atlyginimas
 DocType: Serial No,Delivery Document Type,Pristatymas Dokumento tipas
 DocType: Sales Order,Partly Delivered,dalinai Paskelbta
@@ -5528,9 +5571,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Senėjimas klasės 2
 DocType: SG Creation Tool Course,Max Strength,Maksimali jėga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Iš anksto įdiegti
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Kliento pasirinkta pristatymo pastaba ()
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Kliento pasirinkta pristatymo pastaba ()
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM pakeisti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Pasirinkite elementus pagal pristatymo datą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Pasirinkite elementus pagal pristatymo datą
 DocType: Grant Application,Has any past Grant Record,Turi bet kokį ankstesnį &quot;Grant Record&quot;
 ,Sales Analytics,pardavimų Analytics &quot;
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Turimas {0}
@@ -5549,7 +5592,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Žaliavos Pateikiamas Kaina
 DocType: Selling Settings,Settings for Selling Module,Nustatymai parduoti modulis
 DocType: Hotel Room Reservation,Hotel Room Reservation,Viešbučių kambario rezervacija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Klientų aptarnavimas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Klientų aptarnavimas
 DocType: BOM,Thumbnail,Miniatiūra
 DocType: Item Customer Detail,Item Customer Detail,Prekė Klientų detalės
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Siūlau kandidatas darbą.
@@ -5566,7 +5609,7 @@
 DocType: Fees,Student Details,Studento duomenys
 DocType: Purchase Invoice Item,Stock Qty,akcijų Kiekis
 DocType: Purchase Invoice Item,Stock Qty,akcijų Kiekis
-DocType: Employee Loan,Repayment Period in Months,Grąžinimo laikotarpis mėnesiais
+DocType: Loan,Repayment Period in Months,Grąžinimo laikotarpis mėnesiais
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Klaida: Negaliojantis tapatybės?
 DocType: Naming Series,Update Series Number,Atnaujinti serijos numeris
 DocType: Account,Equity,teisingumas
@@ -5575,7 +5618,7 @@
 DocType: Task,Closing Date,Pabaigos data
 DocType: Sales Order Item,Produced Quantity,pagamintas kiekis
 DocType: Timesheet,Work Detail,Darbo detalės
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,inžinierius
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,inžinierius
 DocType: Journal Entry,Total Amount Currency,Bendra suma Valiuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Paieška Sub Agregatai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Prekės kodas reikalaujama Row Nr {0}
@@ -5621,13 +5664,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donoro tipo informacija.
 DocType: Request for Quotation,Supplier Detail,tiekėjas detalės
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Klaida formulę ar būklės: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Sąskaitoje suma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Sąskaitoje suma
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterijų svoriai turi sudaryti iki 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,lankomumas
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,atsargos
 DocType: BOM,Materials,medžiagos
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jei nepažymėta, sąrašas turi būti pridedamas prie kiekvieno padalinio, kuriame jis turi būti taikomas."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Kūrimas {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Originalo ir vertimo Sandėlis negali būti tas pats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Siunčiamos datą ir paskelbimo laiką yra privalomas
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Mokesčių šablonas pirkti sandorius.
@@ -5651,14 +5693,14 @@
 DocType: Shipping Rule,Fixed,Fiksuotas
 DocType: Vehicle Service,Clutch Plate,Sankabos diskas
 DocType: Company,Round Off Account,Suapvalinti paskyrą
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,administracinės išlaidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,administracinės išlaidos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,konsultavimas
 DocType: Customer Group,Parent Customer Group,Tėvų Klientų grupė
-DocType: Journal Entry,Subscription,Prenumerata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Prenumerata
 DocType: Purchase Invoice,Contact Email,kontaktinis elektroninio pašto adresas
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Mokesčio kūrimas laukiamas
 DocType: Appraisal Goal,Score Earned,balas uždirbo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,įspėjimo terminas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,įspėjimo terminas
 DocType: Asset Category,Asset Category Name,Turto Kategorijos pavadinimas
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Tai yra šaknis teritorijoje ir negali būti pakeisti.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nauja pardavimų asmuo Vardas
@@ -5672,7 +5714,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
 DocType: Asset,Frequency of Depreciation (Months),Dažnio nusidėvėjimo (mėnesiais)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kreditinė sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kreditinė sąskaita
 DocType: Landed Cost Item,Landed Cost Item,Nusileido Kaina punktas
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Rodyti nulines vertes
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kiekis objekto gauti po gamybos / perpakavimas iš pateiktų žaliavų kiekius
@@ -5680,7 +5722,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Gautinos / mokėtinos sąskaitos
 DocType: Delivery Note Item,Against Sales Order Item,Pagal Pardavimo Užsakymo Objektą
 DocType: Hub Settings,Company Logo,Įmonės logotipas
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
 DocType: Item,Default Warehouse,numatytasis sandėlis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Biudžetas negali būti skiriamas prieš grupės sąskaitoje {0}
 DocType: Healthcare Settings,Patient Registration,Paciento registracija
@@ -5715,11 +5757,10 @@
 DocType: Journal Entry,Total Debit,Iš viso Debeto
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Numatytieji gatavų prekių sandėlis
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Pasirinkite pacientą
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Pardavėjas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Pardavėjas
 DocType: Hotel Room Package,Amenities,Patogumai
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Biudžeto ir išlaidų centras
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Kelis numatytasis mokėjimo būdas neleidžiamas
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,už
 ,Appointment Analytics,Paskyrimų analizė
 DocType: Vehicle Service,Half Yearly,pusmečio
 DocType: Lead,Blog Subscriber,Dienoraštis abonento
@@ -5736,6 +5777,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Palikite tuščią, jei jūs padarote studentų grupes per metus"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jei pažymėta, viso nėra. darbo dienų bus atostogų, o tai sumažins Atlyginimas diena vertę"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Programos, kuriose naudojamas dabartinis raktas, negalėsite pasiekti, ar tikrai esate įsitikinę?"
+DocType: Subscription Settings,Prorate,Proratas
 DocType: Purchase Invoice,Total Advance,Iš viso Išankstinis
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Pakeisti šablono kodą
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Kadencijos pabaigos data negali būti vėlesnė nei kadencijos pradžioje data. Ištaisykite datas ir bandykite dar kartą.
@@ -5747,8 +5789,9 @@
 DocType: Opportunity Item,Basic Rate,bazinis tarifas
 DocType: GL Entry,Credit Amount,kredito suma
 DocType: Cheque Print Template,Signatory Position,signataras pozicijos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Nustatyti kaip Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Nustatyti kaip Lost
 DocType: Timesheet,Total Billable Hours,Iš viso apmokamas valandas
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Dienų, per kurias abonentas turi sumokėti sąskaitas, gautas pagal šią prenumeratą, skaičius"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Mokėjimo kvitą Pastaba
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tai grindžiama sandorių atžvilgiu šis klientas. Žiūrėti grafikas žemiau detales
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Eilutės {0}: Paskirti suma {1} turi būti mažesnis arba lygus Mokėjimo Entry suma {2}
@@ -5767,12 +5810,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Gauk paskutinį pirkinį Balsuok
 DocType: Company,Company Info,Įmonės informacija
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Pasirinkite arba pridėti naujų klientų
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Taikymas lėšos (turtas)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Tai yra, remiantis šio darbuotojo dalyvavimo"
 DocType: Assessment Result,Summary,Santrauka
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Pažymėti lankomumą
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,debeto sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,debeto sąskaita
 DocType: Fiscal Year,Year Start Date,Metų pradžios data
 DocType: Attendance,Employee Name,Darbuotojo vardas
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorano užsakymo įrašas
@@ -5784,7 +5827,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkimo suma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Išmokos darbuotojams
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Išmokos darbuotojams
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Supakuotas kiekis turi vienodas kiekis už prekę {0} iš eilės {1}
 DocType: Work Order,Manufactured Qty,pagaminta Kiekis
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcijos neegzistuoja {0}
@@ -5792,12 +5835,12 @@
 DocType: Asset,Out of Order,Neveikia
 DocType: Purchase Receipt Item,Accepted Quantity,Priimamos Kiekis
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignoruoti darbo vietos laiko dubliavimą
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Prašome nustatyti numatytąjį Atostogų sąrašas Darbuotojo {0} arba Įmonės {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Prašome nustatyti numatytąjį Atostogų sąrašas Darbuotojo {0} arba Įmonės {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} neegzistuoja
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Pasirinkite partijų numeriai
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vekseliai iškelti į klientams.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projektų ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
 DocType: Patient Service Unit,Medical Administrator,Medicinos administratorius
 DocType: Assessment Plan,Schedule,grafikas
 DocType: Account,Parent Account,tėvų paskyra
@@ -5827,15 +5870,16 @@
 DocType: Asset Repair,Repair Status,Taisyklės būklė
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Apskaitos žurnalo įrašai.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Turimas Kiekis ne iš sandėlio
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Prašome pasirinkti Darbuotojų įrašai pirmą kartą.
 DocType: POS Profile,Account for Change Amount,Sąskaita už pokyčio sumą
 DocType: Purchase Invoice,input service,įvesties paslauga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Eilutės {0}: Šalis / Sąskaita nesutampa su {1} / {2} į {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Techninės priežiūros komandos narys
 DocType: Agriculture Analysis Criteria,Soil Analysis,Dirvožemio analizė
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Modulio kodas:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
 DocType: Account,Stock,ištekliai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
 DocType: Employee,Current Address,Dabartinis adresas
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jei elementas yra kito elemento, tada aprašymas, vaizdo, kainodara, mokesčiai ir tt bus nustatytas nuo šablono variantas, nebent aiškiai nurodyta"
 DocType: Serial No,Purchase / Manufacture Details,Pirkimas / Gamyba detalės
@@ -5884,19 +5928,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Priėmimo dėl {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezoniškumas nustatymo biudžetai, tikslai ir tt"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Kintamasis pavadinimas
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Prekė {0} yra šablonas, prašome pasirinkti vieną iš jo variantai"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Prekė {0} yra šablonas, prašome pasirinkti vieną iš jo variantai"
 DocType: Asset,Asset Category,turto Kategorija
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto darbo užmokestis negali būti neigiamas
 DocType: Purchase Order,Advance Paid,sumokėto avanso
 DocType: Item,Item Tax,Prekė Mokesčių
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,"Medžiaga, iš Tiekėjui"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,"Medžiaga, iš Tiekėjui"
 DocType: Soil Texture,Loamy Sand,Gluosnių smėlis
 DocType: Production Plan,Material Request Planning,Medžiagų užklausos planavimas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,akcizo Sąskaita
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% atrodo daugiau nei vieną kartą
 DocType: Expense Claim,Employees Email Id,Darbuotojai elektroninio pašto numeris
 DocType: Employee Attendance Tool,Marked Attendance,Pažymėti Lankomumas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Dabartiniai įsipareigojimai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Dabartiniai įsipareigojimai
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Laikmatis viršijo nurodytas valandas.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Siųsti masės SMS į jūsų kontaktus
 DocType: Patient,A Positive,Teigiamas
@@ -5907,9 +5951,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tikrasis Kiekis yra privalomi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo pirkimo užsakymai turėtų būti išduodami atsargiai."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Turto priežiūros komanda
-DocType: Employee Loan,Loan Type,paskolos tipas
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} buvo sėkmingai pateiktas
+DocType: Loan,Loan Type,paskolos tipas
 DocType: Scheduling Tool,Scheduling Tool,planavimas įrankis
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditinė kortelė
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditinė kortelė
 DocType: BOM,Item to be manufactured or repacked,Prekė turi būti pagaminti arba perpakuoti
 DocType: Employee Education,Major/Optional Subjects,Pagrindinės / Laisvai pasirenkami dalykai
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5940,7 +5985,7 @@
 DocType: Item,Units of Measure,Matavimo vienetai
 DocType: Manufacturing Settings,Allow Production on Holidays,Leiskite gamyba Šventės
 DocType: Sales Invoice,Customer's Purchase Order Date,Kliento Užsakymo data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitalas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitalas
 DocType: Shopping Cart Settings,Show Public Attachments,Rodyti Viešieji Priedai
 DocType: Packing Slip,Package Weight Details,Pakuotės svoris detalės
 DocType: Restaurant Reservation,Reservation Time,Rezervacijos laikas
@@ -5955,7 +6000,7 @@
 DocType: Purchase Order,To Receive and Bill,Gauti ir Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Eilutė # {0}: Reqd pagal datą negali būti prieš Transakcijos datą
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Panašūs produktai
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,dizaineris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,dizaineris
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terminai ir sąlygos Šablono
 DocType: Serial No,Delivery Details,Pristatymo informacija
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kaina centras reikalingas eilės {0} mokesčių lentelė tipo {1}
@@ -5965,20 +6010,20 @@
 DocType: Driver,Expiry Date,Galiojimo data
 DocType: Healthcare Settings,Employee name and designation in print,Darbuotojo vardas ir pavardė spaudoje
 ,accounts-browser,sąskaitos-naršyklė
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Prašome pasirinkti Kategorija pirmas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Prašome pasirinkti Kategorija pirmas
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektų meistras.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Leisti per sąskaitų arba per užsakymą, atnaujinti &quot;pašalpa&quot; sandėlyje nustatymus arba elementą."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nerodyti kaip $ ir tt simbolis šalia valiutomis.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pusė dienos)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pusė dienos)
 DocType: Payment Term,Credit Days,kredito dienų
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Prašome pasirinkti &quot;Pacientas&quot;, kad gautumėte &quot;Lab&quot; testus"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Padaryti Studentų Serija
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Ar perkelti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Gauti prekes iš BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Gauti prekes iš BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Švinas Laikas dienas
 DocType: Cash Flow Mapping,Is Income Tax Expense,Yra pajamų mokesčio sąnaudos
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Pažymėkite, jei tas studentas gyvena institute bendrabutyje."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Prašome įvesti pardavimų užsakymų pirmiau pateiktoje lentelėje
 ,Stock Summary,akcijų santrauka
@@ -5989,10 +6034,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,teisėjas data
 DocType: Employee,Reason for Leaving,Išvykimo priežastis
 DocType: BOM Operation,Operating Cost(Company Currency),Operacinė Kaina (Įmonės valiuta)
-DocType: Employee Loan Application,Rate of Interest,Palūkanų norma
+DocType: Loan Application,Rate of Interest,Palūkanų norma
 DocType: Expense Claim Detail,Sanctioned Amount,sankcijos suma
 DocType: Item,Shelf Life In Days,Tinkamumo laikas dienomis
 DocType: GL Entry,Is Opening,Ar atidarymas
+DocType: Department,Expense Approvers,Išlaidų patvirtinėjai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Eilutės {0}: debeto įrašą negali būti susieta su {1}
 DocType: Journal Entry,Subscription Section,Prenumeratos skyrius
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Sąskaita {0} neegzistuoja
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 27e6570..99da044 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Novērtējuma ziņojumi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Abonēšanas detaļas
 DocType: Supplier Scorecard,Notify Supplier,Paziņot piegādātājam
 DocType: Item,Customer Items,Klientu Items
 DocType: Project,Costing and Billing,Izmaksu un Norēķinu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
 DocType: Item,Publish Item to hub.erpnext.com,Publicēt postenis uz hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-pasta paziņojumi
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,novērtējums
 DocType: Item,Default Unit of Measure,Default Mērvienība
 DocType: SMS Center,All Sales Partner Contact,Visi Sales Partner Kontakti
-DocType: Employee,Leave Approvers,Atstājiet Approvers
+DocType: Department,Leave Approvers,Atstājiet Approvers
 DocType: Sales Partner,Dealer,Tirgotājs
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Izmeklējumi
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Pārbaudīt pieejamību
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Tas ir balstīts uz darījumiem pret šo piegādātāju. Skatīt grafiku zemāk informāciju
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juridisks
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Faktiskais veids nodokli nevar iekļaut vienības likmes kārtas {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juridisks
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Faktiskais veids nodokli nevar iekļaut vienības likmes kārtas {0}
 DocType: Bank Guarantee,Customer,Klients
 DocType: Purchase Receipt Item,Required By,Nepieciešamais Līdz
 DocType: Delivery Note,Return Against Delivery Note,Atgriezties Pret pavadzīme
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadītāji (vai grupas), pret kuru grāmatvedības ieraksti tiek veikti, un atlikumi tiek uzturēti."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Apstrādei nav iesniegti algu aploksnes.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Apstrādei nav iesniegti algu aploksnes.
 DocType: Manufacturing Settings,Default 10 mins,Pēc noklusējuma 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rādīt open
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Pašlaik ir jārīkojas pašiem par iepriekš minēto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Series Atjaunots Veiksmīgi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,izrakstīšanās
 DocType: Pricing Rule,Apply On,Piesakies On
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Visi Piegādātājs Contact
 DocType: Support Settings,Support Settings,atbalsta iestatījumi
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
 ,Batch Item Expiry Status,Partijas Prece derīguma statuss
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Banka projekts
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Banka projekts
 DocType: Membership,membership validaty section,dalības apstiprināšanas sadaļa
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 DocType: Consultation,Consultation,Konsultācija
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiāls
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Veidojot vietni
 DocType: Opening Invoice Creation Tool Item,Quantity,Daudzums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Konti tabula nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Kredītiem (pasīvi)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Konti tabula nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Kredītiem (pasīvi)
 DocType: Employee Education,Year of Passing,Gads Passing
 DocType: Item,Country of Origin,Izcelsmes valsts
 DocType: Soil Texture,Soil Texture Criteria,Augsnes tekstūras kritēriji
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primārā kontaktinformācija
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Atvērt jautājumi
 DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
 DocType: Lab Test Groups,Add new line,Pievienot jaunu rindu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Veselības aprūpe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Maksājuma kavējums (dienas)
@@ -89,7 +85,7 @@
 ,Delay Days,Kavēšanās dienas
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Pavadzīme
+DocType: Subscription Invoice,Invoice,Pavadzīme
 DocType: Purchase Invoice Item,Item Weight Details,Vienuma svara dati
 DocType: Asset Maintenance Log,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kopā Izmaksu summa
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Lūdzu, izvēlieties cenrādi"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Lūdzu, izvēlieties datumu"
 DocType: Daily Work Summary Group,Holiday List,Brīvdienu saraksts
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Grāmatvedis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Grāmatvedis
 DocType: Hub Settings,Selling Price List,Pārdošanas cenrādis
 DocType: Patient,Tobacco Current Use,Tabakas patēriņš
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Pārdošanas likme
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Pārdošanas likme
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Tālruņa Nr
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Jaunais {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Sūtīts sākotnējais e-pasta paziņojums
 ,Sales Partners Commission,Sales Partners Komisija
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Value Pēc nolietojums
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,saistīts
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Apmeklējums datums nevar būt mazāks par darbinieka pievienojas datuma
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Apmeklējums datums nevar būt mazāks par darbinieka pievienojas datuma
 DocType: Grading Scale,Grading Scale Name,Šķirošana Scale Name
-DocType: Subscription,Repeat on Day,Atkārtojiet dienu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tas ir root kontu un to nevar rediģēt.
 DocType: Sales Invoice,Company Address,Uzņēmuma adrese
 DocType: BOM,Operations,Operācijas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},"Nevar iestatīt atļaujas, pamatojoties uz Atlaide {0}"
+DocType: Subscription,Subscription Start Date,Abonēšanas sākuma datums
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pievienojiet .csv failu ar divām kolonnām, viena veco nosaukumu un vienu jaunu nosaukumu"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nekādā aktīvajā fiskālajā gadā.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, Produkta kods: {1} un Klients: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Pārbaudes beigu datums nevar būt pirms pārbaudes laika sākuma datuma
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atvēršana uz darbu.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nav norādīts apakšuzņēmuma postenim {0} rindā {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pats uzņēmums ir reģistrēts vairāk nekā vienu reizi
 DocType: Patient,Married,Precējies
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Aizliegts {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Dabūtu preces no
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Dabūtu preces no
 DocType: Price List,Price Not UOM Dependant,Cena nav atkarīga no UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkta {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,bremžu eļļa
 DocType: Tax Rule,Tax Type,Nodokļu Type
 ,Completed Work Orders,Pabeigti darba uzdevumi
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Ar nodokli apliekamā summa
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Ar nodokli apliekamā summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
 DocType: BOM,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundas likme / 60) * Faktiskais darba laiks
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rinda # {0}: atsauces dokumenta tipam jābūt vienam no izdevumu pieprasījuma vai žurnāla ieraksta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rinda # {0}: atsauces dokumenta tipam jābūt vienam no izdevumu pieprasījuma vai žurnāla ieraksta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Izmaksas piegādāto preču
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Pārvaldiet darbiniekam piešķirto avansa maksājumu
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Piegādes paziņojums
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konts Pay Tikai
-DocType: Employee Loan,Repay Over Number of Periods,Atmaksāt Over periodu skaits
+DocType: Loan,Repay Over Number of Periods,Atmaksāt Over periodu skaits
 DocType: Stock Entry,Additional Costs,Papildu izmaksas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
 DocType: Education Settings,Validate Batch for Students in Student Group,Apstiprināt partiju studentiem Studentu grupas
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nav atvaļinājums ieraksts down darbiniekam {0} uz {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nav atvaļinājums ieraksts down darbiniekam {0} uz {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ievadiet uzņēmuma pirmais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
 DocType: Employee Education,Under Graduate,Zem absolvents
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Lūdzu, iestatiet noklusējuma veidni statusam Paziņojums par atstāšanu personāla iestatījumos."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Darbinieku Loan
 DocType: Fee Schedule,Send Payment Request Email,Sūtīt maksājuma pieprasījuma e-pastu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Veiksmīgi nereģistrēta.
 DocType: Assessment Result,Grade,pakāpe
 DocType: Restaurant Table,No of Seats,Sēdvietu skaits
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Lai pievienotu dinamisko tēmu, izmantojiet jinja tagus, piemēram, <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: Asset Maintenance Task,Asset Maintenance Task,Aktīvu uzturēšanas uzdevums
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Gada alga
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Gada alga
 DocType: Daily Work Summary,Daily Work Summary,Ikdienas darbs kopsavilkums
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ir iesaldēts
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Akciju Izdevumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Akciju Izdevumi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Atlasīt Target noliktava
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Atlasīt Target noliktava
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ievadiet Vēlamā Kontaktinformācija E-pasts
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Ievadiet Vēlamā Kontaktinformācija E-pasts
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Galvenā adrese
 DocType: Production Plan,Material Request Detail,Materiāla pieprasījums detalizēti
 DocType: Selling Settings,Default Quotation Validity Days,Nokotināšanas cesijas derīguma dienas
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Mainīt Summa
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Vadītāja apliecību kategorijas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Lūdzu, ievadiet piegādes datumu"
 DocType: Depreciation Schedule,Make Depreciation Entry,Padarīt Nolietojums Entry
+DocType: HR Settings,Leave Settings,Atstājiet iestatījumus
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Pieprasījums Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Izveidot darbinieku
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Apraides
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS (tiešsaistes / bezsaistes) iestatīšanas režīms
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Atspējo laika žurnālu izveidi pret darba uzdevumiem. Darbības netiek izsekotas saskaņā ar darba kārtību
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Izpildīšana
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Izpildīšana
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
 DocType: Asset Maintenance Log,Maintenance Status,Uzturēšana statuss
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Dalības informācija
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: piegādātājam ir pret maksājams kontā {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Preces un cenu
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Kopējais stundu skaits: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},No datuma jābūt starp fiskālajā gadā. Pieņemot No datums = {0}
 DocType: Drug Prescription,Interval,Intervāls
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Priekšrocība
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Priekšrocība
 DocType: Grant Application,Individual,Indivīds
 DocType: Academic Term,Academics User,akadēmiķi User
 DocType: Cheque Print Template,Amount In Figure,Summa attēlā
-DocType: Employee Loan Application,Loan Info,Loan informācija
+DocType: Loan Application,Loan Info,Loan informācija
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plāns apkopes apmeklējumiem.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Piegādātāju rādītāju karšu periods
 DocType: Share Transfer,Share Transfer,Dalīties ar pārskaitījumu
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Vienuma veidne
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Bioķīmija
 DocType: Job Offer,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out Value
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce iestatījumi
 DocType: Production Plan,Sales Orders,Pārdošanas pasūtījumu
 DocType: Purchase Taxes and Charges,Valuation,Vērtējums
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Default Teritorija
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televīzija
 DocType: Work Order Operation,Updated via 'Time Log',"Atjaunināt, izmantojot ""Time Ieiet"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Izvēlieties klientu vai piegādātāju.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Company,Enable Perpetual Inventory,Iespējot nepārtrauktās inventarizācijas
+DocType: Bank Guarantee,Charges Incurred,Izdevumi radīti
 DocType: Company,Default Payroll Payable Account,Default Algu Kreditoru konts
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Pielāgots rezultāts
 DocType: Delivery Stop,Contact Name,Contact Name
 DocType: Course Assessment Criteria,Course Assessment Criteria,Protams novērtēšanas kritēriji
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Nodokļu ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Nodokļu ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Studenta ID:
 DocType: POS Customer Group,POS Customer Group,POS Klientu Group
 DocType: Land Unit,Land Unit describing various land assets,"Zemes vienība, kurā aprakstīti dažādi zemes īpašumi"
@@ -375,9 +372,8 @@
 ,Open Work Orders,Atvērt darba pasūtījumus
 DocType: Payment Term,Credit Months,Kredīta mēneši
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Pay nedrīkst būt mazāka par 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Lai pārtrauktu atkārtotu kļūdu paziņojumu nosūtīšanu no sistēmas, mēs abonementā esam atzīmējuši lauku Atspējoti"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Lapām gadā
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Lapām gadā
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
 DocType: Email Digest,Profit & Loss,Peļņas un zaudējumu
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Lūdzu, izveidojiet Studentu grupas Studentu grupas ietvaros"
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,bankas ieraksti
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,bankas ieraksti
 DocType: Crop,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,PPR Nr
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentu grupa Creation Tool Course
 DocType: Lead,Do Not Contact,Nesazināties
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Cilvēki, kuri māca jūsu organizācijā"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Course Scheduling Tool,Course Start Date,Kursu sākuma datums
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publicē Hub
 DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Pirkuma Details
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maksimālais vērtējums
 DocType: Email Digest,New Quotations,Jauni Citāti
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-pasti algas kvīts darbiniekam, pamatojoties uz vēlamo e-pastu izvēlēts Darbinieku"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
 DocType: Tax Rule,Shipping County,Piegāde County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Mācīties
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mācīties
 DocType: Asset,Next Depreciation Date,Nākamais Nolietojums Datums
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitāte izmaksas uz vienu darbinieku
 DocType: Accounts Settings,Settings for Accounts,Iestatījumi kontu
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Izcilas Čeki un noguldījumi, lai nodzēstu"
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
 DocType: Driver,Fleet Manager,flotes vadītājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Rinda # {0}: {1} nevar būt negatīvs postenim {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Rinda # {0}: {1} nevar būt negatīvs postenim {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Nepareiza Parole
 DocType: Item,Variant Of,Variants
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Lūdzu, iestatiet viesnīcu cenu par {}"
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Opening Invoice Creation Tool,Invoice Type,Rēķins Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Piegāde Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Piegāde Note
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Izmaksas Sold aktīva
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Protams plānošanas rīks
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,"[Urgent] Kļūda, veidojot% s periodiskumu% s"
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
 DocType: Land Unit,LInked Analysis,Ievilkta analīze
 DocType: Item Tax,Tax Rate,Nodokļa likme
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Pieteikšanās periods nevar būt divos sadalījuma ierakstos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Pieteikšanās periods nevar būt divos sadalījuma ierakstos
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Saņemts
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Izveidot studentu grupas
 DocType: Volunteer,Weekends,Brīvdienās
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredītu piezīme summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredītu piezīme summa
 DocType: Setup Progress Action,Action Document,Rīcības dokuments
 DocType: Chapter Member,Website URL,Mājas lapas URL
 ,Finished Goods,Gatavās preces
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pievienot preces
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postenis kvalitātes pārbaudes parametrs
+DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinātāja Vārds
 DocType: Depreciation Schedule,Schedule Date,Grafiks Datums
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Peļņa, Atskaitījumi un citas Algu sastāvdaļas"
 DocType: Packed Item,Packed Item,Iepakotas postenis
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Pieprasījums piedāvājumam
 DocType: Healthcare Settings,Require Lab Test Approval,Pieprasīt labas pārbaudes apstiprinājumu
 DocType: Salary Slip Timesheet,Working Hours,Darba laiks
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Kopā izcilā
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Kopā izcilā
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
 DocType: Dosage Strength,Strength,Stiprums
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Izveidot jaunu Klientu
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Patērējamās izmaksas
 DocType: Purchase Receipt,Vehicle Date,Transportlīdzekļu Datums
 DocType: Student Log,Medical,Medicīnisks
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Iemesls zaudēt
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Iemesls zaudēt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Atjauniniet konta numuru
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Svins Īpašnieks nevar būt tāds pats kā galvenajam
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Piešķirtā summa nevar pārsniedz nekoriģētajām summu
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Viens
 DocType: Salary Slip,Total Loan Repayment,Kopā Aizdevuma atmaksa
 DocType: Account,Cost of Goods Sold,Pārdotās produkcijas ražošanas izmaksas
-DocType: Subscription,Yearly,Katru gadu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ievadiet izmaksu centram
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Ievadiet izmaksu centram
 DocType: Drug Prescription,Dosage,Devas
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. Pārdodot Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Vid. Pārdodot Rate
 DocType: Assessment Plan,Examiner Name,eksaminētājs Name
 DocType: Lab Test Template,No Result,nav rezultāts
 DocType: Purchase Invoice Item,Quantity and Rate,Daudzums un Rate
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ievadiet uzņēmuma nosaukumu pirmais
 DocType: Purchase Invoice,Supplier Name,Piegādātājs Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lasīt ERPNext rokasgrāmatu
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Rādīt visu departamenta deputātu lapas kalendārā
 DocType: Purchase Invoice,01-Sales Return,01-pārdošanas atdeve
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,Kamēr pirkuma pasūtījumu
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obligāts lauks - akadēmiskais gads
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nav saistīts ar {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Pielāgot ievada tekstu, kas iet kā daļu no šīs e-pastu. Katrs darījums ir atsevišķa ievada tekstu."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Lūdzu iestatīt noklusēto maksājams konts uzņēmumam {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Lūdzu iestatīt noklusēto maksājams konts uzņēmumam {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Darījums nav atļauts pret apstādināto darbu Pasūtījums {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Brīvdienu pārvaldnieks
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervēts pārdošana
 DocType: Packing Slip,From Package No.,No Package Nr
 DocType: Item Attribute,To Range,Svārstās
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nevar mainīt vērtēšanas metode, jo ir darījumi pret dažām precēm, kuras nav tā paša novērtēšanas metode"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Vērtspapīri un noguldījumi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nevar mainīt vērtēšanas metode, jo ir darījumi pret dažām precēm, kuras nav tā paša novērtēšanas metode"
 DocType: Student Report Generation Tool,Attended by Parents,Apmeklē vecāki
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Patient,AB Positive,AB pozitīvs
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Apmeklējumu ieraksts.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Alga Component kontrolsaraksts balstīta algas.
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
-DocType: Employee Loan,Total Payment,kopējais maksājums
+DocType: Loan,Total Payment,kopējais maksājums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nevar atcelt darījumu Pabeigtajam darba uzdevumam.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} tiek anulēts tā darbība nevar tikt pabeigta
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pietiekami Parts Build
 DocType: POS Profile User,POS Profile User,POS lietotāja profils
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direct Ienākumi
+DocType: Subscription Invoice,Subscription Invoice,Abonēšanas rēķins
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direct Ienākumi
 DocType: Patient Appointment,Date TIme,Datums Laiks
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administratīvā amatpersona
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administratīvā amatpersona
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Uzņēmuma un nodokļu izveidošana
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
 DocType: Codification Table,Codification Table,Kodifikācijas tabula
 DocType: Timesheet Detail,Hrs,h
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry Detail,Difference Account,Atšķirība konts
 DocType: Purchase Invoice,Supplier GSTIN,Piegādātājs GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Naudas plūsmas kartēšanas veidne
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
+DocType: Bank Guarantee,Providing,Nodrošināt
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nav atļauts, konfigurēt Laba testa veidni, ja nepieciešams"
 DocType: Patient,Risk Factors,Riska faktori
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
 DocType: Healthcare Settings,Appointment Confirmation,Iecelšanas apstiprinājums
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Noslēguma (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sveiki
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Pārvietot Preci
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Lietotājam {1} jau ir iestatīts noklusējuma profils {0}, lūdzu, atspējots noklusējums"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uzkrātās vērtības
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Teritorija ir nepieciešama POS profilā
 DocType: Supplier,Prevent RFQs,Novērst RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Veikt klientu pasūtījumu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Algu slīdēšana iesniegta periodam no {0} līdz {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Algu slīdēšana iesniegta periodam no {0} līdz {1}
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Piegādes norēķinu datums
 DocType: Production Plan,Production Plan,Ražošanas plāns
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Rēķinu izveides rīka atvēršana
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Piezīme: Kopā piešķirtie lapas {0} nedrīkst būt mazāks par jau apstiprināto lapām {1} par periodu
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,"Iestatiet daudzumu darījumos, kuru pamatā ir sērijas Nr. Ievade"
 ,Total Stock Summary,Kopā Stock kopsavilkums
 DocType: Announcement,Posted By,rakstīja
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lūdzu noteikt Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lūdzu noteikt Company
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Apmācības rezultāts Darbinieku
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
-DocType: Repayment Schedule,Principal Amount,pamatsumma
-DocType: Employee Loan Application,Total Payable Interest,Kopā Kreditoru Procentu
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,pamatsumma
+DocType: Loan Application,Total Payable Interest,Kopā Kreditoru Procentu
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Kopā neizmaksātais: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pārdošanas rēķins laika kontrolsaraksts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
 DocType: Restaurant Reservation,Restaurant Reservation,Restorāna rezervēšana
 DocType: Land Unit,Land Unit Name,Zemes vienības nosaukums
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Priekšlikums Writing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Priekšlikums Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Maksājumu Entry atskaitīšana
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Iesaiņošana
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Paziņojiet klientiem pa e-pastu
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Paziņojiet klientiem pa e-pastu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Vēl Sales Person {0} pastāv ar to pašu darbinieku id
 DocType: Employee Advance,Claimed Amount,Pieprasītā summa
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Maksājumu Gateway konts nav izveidots, lūdzu, izveidojiet to manuāli."
 DocType: Supplier Scorecard,Per Year,Gadā
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nav atļauts pieteikties šajā programmā kā vienu DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
 DocType: Sales Invoice,Sales Taxes and Charges,Pārdošanas nodokļi un maksājumi
 DocType: Employee,Organization Profile,Organizācija Profile
 DocType: Vital Signs,Height (In Meter),Augstums (metros)
 DocType: Student,Sibling Details,Sibling Details
 DocType: Vehicle Service,Vehicle Service,Transportlīdzekļu Service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,"Automātiski izraisa atsauksmes lūgums, pamatojoties uz apstākļiem."
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,"Automātiski izraisa atsauksmes lūgums, pamatojoties uz apstākļiem."
 DocType: Employee,Reason for Resignation,Iemesls atkāpšanās no amata
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Šablons darbības novērtējumus.
 DocType: Sales Invoice,Credit Note Issued,Kredīts piezīme Izdoti
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Uzturēšana grafiks
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tad Cenu Noteikumi tiek filtrētas, balstoties uz klientu, klientu grupā, teritorija, piegādātājs, piegādātāju veida, kampaņas, pārdošanas partneris uc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Neto Izmaiņas sarakstā
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Darbinieku Loan Management
 DocType: Employee,Passport Number,Pases numurs
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Saistība ar Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Vadītājs
 DocType: Payment Entry,Payment From / To,Maksājums no / uz
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Lūdzu, iestatiet kontu noliktavā {0}"
@@ -895,23 +891,23 @@
 DocType: Item,Material Transfer,Materiāls Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nevarēja atrast ceļu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Atvere (DR)
+DocType: Loan,Applicant,Pieteikuma iesniedzējs
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Norīkošanu timestamp jābūt pēc {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Veidot atkārtotus dokumentus
 ,GST Itemised Purchase Register,GST atšifrējums iegāde Reģistrēties
 DocType: Course Scheduling Tool,Reschedule,Pārkārtošana
-DocType: Employee Loan,Total Interest Payable,Kopā maksājamie procenti
+DocType: Loan,Total Interest Payable,Kopā maksājamie procenti
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Izkrauti Izmaksu nodokļi un maksājumi
 DocType: Work Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,apdare
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,bāze
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,bāze
 DocType: Timesheet,Total Billed Hours,Kopā Apmaksājamie Stundas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Uzrakstiet Off summa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Uzrakstiet Off summa
 DocType: Leave Block List Allow,Allow User,Atļaut lietotāju
 DocType: Journal Entry,Bill No,Bill Nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / zaudējumu aprēķins par aktīva atsavināšana
 DocType: Vehicle Log,Service Details,Detalizēta informācija par pakalpojumu
-DocType: Subscription,Quarterly,Ceturkšņa
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Sagrupēti
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Laika uzskaites tabula
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush izejvielas Based On
 DocType: Sales Invoice,Port Code,Ostas kods
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezerves noliktava
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezerves noliktava
 DocType: Lead,Lead is an Organization,Svins ir organizācija
 DocType: Guardian Interest,Interest,Interese
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,Konti
 DocType: Vehicle,Odometer Value (Last),Odometra vērtību (Pēdējā)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Piegādes rezultātu rādītāju kritēriju kritēriji.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Mārketings
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Mārketings
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Maksājums ieraksts ir jau radīta
 DocType: Request for Quotation,Get Suppliers,Iegūt piegādātājus
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Alga Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Alga Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konts {0} ir ievadīts vairākas reizes
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Jūs varat atjaunot tikai tad, ja jūsu dalības termiņš ir 30 dienu laikā"
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Atlasiet tikai tad, ja esat iestatījis naudas plūsmas mapera dokumentus"
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Supplier Scorecard,Per Week,Nedēļā
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Kopējais studējošais
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredītkarte Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kompānija un konti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,vērtība
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,vērtība
 DocType: Asset Settings,Depreciation Options,Nolietojuma iespējas
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Nederīgs publicēšanas laiks
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Nederīgs publicēšanas laiks
 DocType: Lead,Campaign Name,Kampaņas nosaukums
 DocType: Hotel Room,Capacity,Jauda
 DocType: Selling Settings,Close Opportunity After Days,Aizvērt Iespēja pēc dienas
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Budget,Budget Against,budžets pret
 DocType: Employee,Cell Number,Šūnu skaits
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Par šiem kritērijiem nav darbinieku. Pārbaudiet, vai algu likmes vēl nav izveidotas."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Par šiem kritērijiem nav darbinieku. Pārbaudiet, vai algu likmes vēl nav izveidotas."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Lūdzu, atlasiet tabulu"
 DocType: BOM,Website Specifications,Website specifikācijas
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ir nederīga e-pasta adrese saukumā &quot;Saņēmēji&quot;
 DocType: Special Test Items,Particulars,Daži dati
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: No {0} tipa {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: No {0} tipa {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Asset,Maintenance,Uzturēšana
+DocType: Subscriber,Subscriber,Abonents
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Lūdzu, atjauniniet savu projekta statusu"
 DocType: Item,Maximum sample quantity that can be retained,"Maksimālais parauga daudzums, ko var saglabāt"
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Noklusējuma iestatījumi Grozs
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Pievienot laika vietnes
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset metāllūžņos via Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Procentu ienākuma konts
+DocType: Loan,Interest Income Account,Procentu ienākuma konts
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Pārskatīt ielūgumu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnoloģija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Iet uz
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Iestatīšana e-pasta konts
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ievadiet Prece pirmais
 DocType: Asset Repair,Downtime,Dīkstāves
 DocType: Account,Liability,Atbildība
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akadēmiskais termiņš:
 DocType: Salary Detail,Do not include in total,Neiekļaujiet kopā
 DocType: Company,Default Cost of Goods Sold Account,Default pārdotās produkcijas ražošanas izmaksas konta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Paraugu skaits {0} nevar būt lielāks par saņemto daudzumu {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Cenrādis nav izvēlēts
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Request for Quotation Supplier,Send Email,Sūtīt e-pastu
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 DocType: Item,Max Sample Quantity,Maksimālais paraugu daudzums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nav Atļaujas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nav Atļaujas
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citāts pieprasīts
 DocType: Vital Signs,Heart Rate / Pulse,Sirdsdarbības ātrums / impulss
 DocType: Company,Default Bank Account,Default bankas kontu
@@ -1087,12 +1083,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab testu un dzīvības pazīmes
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Darbinieks nav atrasts
-DocType: Subscription,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projekta atjaunināšana.
 DocType: SMS Center,All Customer Contact,Visas klientu Contact
 DocType: Land Unit,Tree Details,Tree Details
@@ -1142,7 +1137,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Visi punkts grupas
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
 DocType: Work Order,Item To Manufacture,Postenis ražot
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} statuss ir {2}
@@ -1156,7 +1150,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Atkārtoti atlasiet, ja pēc saglabāšanas izvēlētā adrese tiek rediģēta"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 DocType: Item,Hub Publishing Details,Hub Publicēšanas informācija
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Atklāšana&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Atklāšana&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atvērt darīt
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
 DocType: Lab Test Template,Result Format,Rezultātu formāts
@@ -1166,7 +1160,7 @@
 DocType: Payroll Entry,Bimonthly,reizi divos mēnešos
 DocType: Vehicle Service,Brake Pad,Bremžu kluči
 DocType: Fertilizer,Fertilizer Contents,Mēslojuma saturs
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Pētniecība un attīstība
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Pētniecība un attīstība
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,"Summa, Bill"
 DocType: Company,Registration Details,Reģistrācija Details
 DocType: Timesheet,Total Billed Amount,Kopējā maksājamā summa
@@ -1180,7 +1174,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Apmeklējiet kredītlimitu pārbaudi pārdošanas pasūtījumā
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Izpildes novērtējuma.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Iespējojot &quot;izmantošana Grozs&quot;, kā Grozs ir iespējota, un ir jābūt vismaz vienam Tax nolikums Grozs"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksājumu Entry {0} ir saistīta pret ordeņa {1}, pārbaudiet, vai tā būtu velk kā iepriekš šajā rēķinā."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksājumu Entry {0} ir saistīta pret ordeņa {1}, pārbaudiet, vai tā būtu velk kā iepriekš šajā rēķinā."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Tirdzniecības vieta
@@ -1214,7 +1208,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimālais sēdvietu skaits
 DocType: Item Attribute,Item Attribute Values,Postenis Prasme Vērtības
 DocType: Examination Result,Examination Result,eksāmens rezultāts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Pirkuma čeka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valūtas maiņas kurss meistars.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Atsauce Doctype jābūt vienam no {0}
@@ -1222,15 +1216,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Work Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} jābūt aktīvam
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nav pieejams neviens elements pārsūtīšanai
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} jābūt aktīvam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nav pieejams neviens elements pārsūtīšanai
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Slēgšana (atvēršana + kopā)
 DocType: Journal Entry,Depreciation Entry,nolietojums Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atcelt Materiāls Vizītes {0} pirms lauzt šo apkopes vizīte
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standarts
 DocType: Pricing Rule,Rate or Discount,Likme vai atlaide
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nepieciešamais Daudz
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Izlase
 DocType: Hub Settings,Custom Data,Pielāgoti dati
@@ -1242,9 +1236,9 @@
 DocType: Medical Code,Medical Code Standard,Medicīnas kodeksa standarts
 DocType: Soil Texture,Clay Composition (%),Māla sastāvs (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Lūdzu, saglabājiet pirms uzdevuma piešķiršanas."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Bilance Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Bilance Value
 DocType: Lab Test,Lab Technician,Lab tehniķis
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Pārdošanas Cenrādis
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ja tiek atzīmēts, klients tiks izveidots, piesaistīts pacientam. Pacienta rēķini tiks radīti pret šo Klientu. Jūs varat arī izvēlēties pašreizējo Klientu, veidojot pacientu."
 DocType: Bank Reconciliation,Account Currency,Konta valūta
@@ -1252,16 +1246,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Lūdzu, atsaucieties uz noapaļot konta Company"
 DocType: Purchase Receipt,Range,Diapazons
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Fee Structure,Components,sastāvdaļas
 DocType: Item Barcode,Item Barcode,Postenis Barcode
 DocType: Woocommerce Settings,Endpoints,Galarezultāti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","lai radītu. Ja tiek aizkavēts, jums būs manuāli jāmaina lauka &quot;Atkārtot par mēneša dienu&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
 DocType: Share Transfer,From Folio No,No Folio Nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
@@ -1296,16 +1288,17 @@
 DocType: Asset,Available-for-use Date,Pieejamais lietojuma datums
 DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,Ir Drukas formāts
-DocType: Employee Loan,Sanctioned,sodīts
+DocType: Loan,Sanctioned,sodīts
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ir obligāta. Varbūt Valūtas ieraksts nav izveidots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
 DocType: Crop Cycle,Crop Cycle,Kultūru cikls
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Par &quot;produkts saišķis&quot; vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no &quot;iepakojumu sarakstu&quot; tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru &quot;produkts saišķis&quot; posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts &quot;iepakojumu sarakstu galda."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Par &quot;produkts saišķis&quot; vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no &quot;iepakojumu sarakstu&quot; tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru &quot;produkts saišķis&quot; posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts &quot;iepakojumu sarakstu galda."
 DocType: Student Admission,Publish on website,Publicēt mājas lapā
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Piegādātājs Rēķina datums nevar būt lielāks par norīkošanu Datums
+DocType: Subscription,Cancelation Date,Atcelšanas datums
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
 DocType: Agriculture Task,Agriculture Task,Lauksaimniecības uzdevums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Netieša Ienākumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Netieša Ienākumi
 DocType: Student Attendance Tool,Student Attendance Tool,Student Apmeklējumu Tool
 DocType: Restaurant Menu,Price List (Auto created),Cenrādis (automātiski izveidots)
 DocType: Cheque Print Template,Date Settings,Datums iestatījumi
@@ -1332,6 +1325,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,metrs
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab testēšana datetime nevar būt pirms savākšanas datuma
+DocType: Subscription Plan,Cost,Izmaksas
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku dzimšanas dienu atgādinājumus
 DocType: Expense Claim,Total Advance Amount,Kopējā avansa summa
 DocType: Delivery Stop,Estimated Arrival,Paredzamais ierašanās laiks
@@ -1343,15 +1337,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
 DocType: Timesheet Detail,Bill,Rēķins
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Balts
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Balts
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rinda {0}: Daudz nav pieejams {4} noliktavā {1} pēc norīkojuma laiku ieraksta ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,No izvēles rūtiņu saraksta var atlasīt ne vairāk kā vienu opciju.
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
 DocType: Item,Automatically Create New Batch,Automātiski Izveidot jaunu partiju
 DocType: Item,Automatically Create New Batch,Automātiski Izveidot jaunu partiju
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Piešķirt {0} līdz {1} (rinda {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Izveidot
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Piešķirt {0} līdz {1} (rinda {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Izveidot
 DocType: Student Admission,Admission Start Date,Uzņemšana sākuma datums
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Jauns darbinieks
@@ -1367,7 +1361,7 @@
 DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
 DocType: Repayment Schedule,Balance Loan Amount,Balance Kredīta summa
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,grafiks Course
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Akciju opcijas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Akciju opcijas
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Atspējot pēdējo pirkuma datu iegūšanu pirkuma pasūtījumā
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Vai jūs tiešām vēlaties atjaunot šo metāllūžņos aktīvu?
@@ -1386,11 +1380,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Iepakošanas Slip postenis
 DocType: Purchase Invoice,Cash/Bank Account,Naudas / bankas kontu
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Lūdzu, norādiet {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantu radīšana ir rindā.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Darba kopsavilkums par {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Atribūts tabula ir obligāta
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pirmais izlaiduma apstiprinātājs sarakstā tiks iestatīts kā noklusējuma atstājēja apstiprinātājs.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Plan,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nevar būt negatīvs
 DocType: Training Event,Self-Study,Pašmācība
@@ -1403,7 +1398,7 @@
 DocType: Workstation,Wages,Alga
 DocType: Asset Maintenance,Maintenance Manager Name,Tehniskās apkopes vadītāja vārds
 DocType: Agriculture Task,Urgent,Steidzams
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Lūdzu, norādiet derīgu Row ID kārtas {0} tabulā {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Lūdzu, norādiet derīgu Row ID kārtas {0} tabulā {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nevar atrast mainīgo:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Lūdzu, izvēlieties lauku, kuru vēlaties rediģēt no numpad"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nevar būt fiksētais postenis, jo tiek izveidots krājumu grāmatvedis."
@@ -1415,7 +1410,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvalitātes pārbaudes veidnes nosaukums
 DocType: Project,First Email,Pirmā e-pasta adrese
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Pārdošanas apjoms
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Pārdošanas apjoms
 DocType: Repayment Schedule,Interest Amount,procentu summa
 DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
 DocType: Share Transfer,Issue,Izdevums
@@ -1429,10 +1424,10 @@
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 ,Projected Quantity as Source,Prognozēts daudzums kā resurss
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Piegādes ceļojums
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Piegādes ceļojums
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Pārsūtīšanas veids
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Pārdošanas izmaksas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Pārdošanas izmaksas
 DocType: Consultation,Diagnosis,Diagnoze
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standarta iepirkums
 DocType: GL Entry,Against,Pret
@@ -1441,12 +1436,13 @@
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Pasta indekss
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Atlasiet procentu ienākumu kontu aizdevumā {0}
 DocType: Opportunity,Contact Info,Kontaktinformācija
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Making Krājumu
 DocType: Packing Slip,Net Weight UOM,Neto svara Mērvienība
 DocType: Item,Default Supplier,Default piegādātājs
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Ražošanas pielaide procentos
-DocType: Employee Loan,Repayment Schedule,atmaksas grafiks
+DocType: Loan,Repayment Schedule,atmaksas grafiks
 DocType: Shipping Rule Condition,Shipping Rule Condition,Piegāde noteikums Stāvoklis
 DocType: Holiday List,Get Weekly Off Dates,Saņemt Nedēļas Off Datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
@@ -1461,7 +1457,7 @@
 DocType: Education Settings,Attendance Freeze Date,Apmeklējums Freeze Datums
 DocType: Education Settings,Attendance Freeze Date,Apmeklējums Freeze Datums
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Skatīt visus produktus
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Skatīt visus produktus
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimālā Lead Vecums (dienas)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimālā Lead Vecums (dienas)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Visas BOMs
@@ -1470,14 +1466,16 @@
 DocType: Expense Claim,From Employee,No darbinieka
 DocType: Driver,Cellphone Number,Mobilā tālruņa numurs
 DocType: Project,Monitor Progress,Pārraudzīt Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
 DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto atkārtotā sadaļa
 DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Platība
 DocType: Program Enrollment,Transportation,Transportēšana
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Nederīga Atribūtu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0}{1} jāiesniedz
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Daudzumam ir jābūt mazākam vai vienādam ar {0}
+DocType: Department Approver,Department Approver,Nodaļas apstiprinātājs
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
 DocType: Employee Advance,Claimed,Pretenzija
 DocType: Crop,Row Spacing,Rindas atstarpe
@@ -1487,6 +1485,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksājumu Samierināšanās rēķins
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Ieguldījums%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Kā vienu Pirkšana iestatījumu, ja pirkuma pasūtījums == &quot;JĀ&quot;, tad, lai izveidotu pirkuma rēķinu, lietotājam ir nepieciešams, lai izveidotu pirkuma pasūtījumu vispirms posteni {0}"
+,HSN-wise-summary of outward supplies,HSN-gudrs kopsavilkums par ārējām piegādēm
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Uzņēmuma reģistrācijas numuri jūsu atsauci. Nodokļu numurus uc
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
@@ -1500,7 +1499,7 @@
 DocType: Setup Progress Action,Action Name,Darbības nosaukums
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start gads
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Pirmie 2 cipari GSTIN vajadzētu saskaņot ar valsts numuru {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Sākuma datums kārtējā rēķinā s perioda
 DocType: Salary Slip,Leave Without Pay,Bezalgas atvaļinājums
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Capacity Planning kļūda
@@ -1518,26 +1517,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Lauki tiks kopēti tikai izveidošanas laikā.
 DocType: Setup Progress Action,Domains,Domains
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""Faktisko beigu datumu"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Vadība
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Vadība
 DocType: Cheque Print Template,Payer Settings,maksātājs iestatījumi
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
 DocType: Purchase Invoice,Is Return,Vai Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Uzmanību!
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Sākuma diena ir lielāka par beigu dienu uzdevumā &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Atgriešana / debeta Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Atgriešana / debeta Note
 DocType: Price List Country,Price List Country,Cenrādis Valsts
 DocType: Item,UOMs,Mērvienības
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Postenis kodekss nevar mainīt Serial Nr
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Postenis kodekss nevar mainīt Serial Nr
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Ievadiet pozīcijas kods, lai iegūtu partijas numurs"
 DocType: Stock Settings,Default Item Group,Default Prece Group
-DocType: Employee Loan,Partially Disbursed,Daļēji Izmaksātā
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Piešķirt informāciju.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Piešķirt informāciju.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Piegādātājs datu bāze.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Jūs nevarat atsākt Abonementu, kas nav atcelts."
 DocType: Account,Balance Sheet,Bilance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
 DocType: Fee Validity,Valid Till,Derīgs līdz
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Kopā vecāku skolotāju sanāksme
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
@@ -1550,7 +1549,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Klienta grupas maiņa izvēlētajam klientam nav atļauta.
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aptuveno ierašanās laiku atjaunināšana.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aptuveno ierašanās laiku atjaunināšana.
 DocType: Program Enrollment Tool,Enrollment Details,Reģistrēšanās informācija
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,"Lūdzu, izvēlieties klientu"
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Purchase Order,Group same items,Grupu paši priekšmeti
 DocType: Purchase Invoice,Disable Rounded Total,Atslēgt noapaļotiem Kopā
-DocType: Employee Loan Application,Repayment Info,atmaksas info
+DocType: Department,Parent Department,Vecāku nodaļa
+DocType: Loan Application,Repayment Info,atmaksas info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 DocType: Maintenance Team Member,Maintenance Role,Uzturēšanas loma
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Iestatīšana Darbinieki
 DocType: Sales Order,SO-,TĀTAD-
 DocType: Hotel Room Reservation,Hotel Reservation User,Viesnīcu rezervācijas lietotājs
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Pētniecība
+DocType: Subscription Settings,Subscription Settings,Abonēšanas iestatījumi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Pētniecība
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Lūdzu, norādiet vismaz vienu atribūtu Atribūti tabulā"
 DocType: Announcement,All Students,Visi studenti
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 DocType: Crop Cycle,Less than a year,Mazāk par gadu
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 DocType: Crop,Yield UOM,Iegūt UOM
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
 DocType: Item,Is Item from Hub,Ir vienība no centrmezgla
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rinda {0}: darbības veids ir obligāta.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Izmaksātajām dividendēm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Izmaksātajām dividendēm
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Grāmatvedības Ledger
 DocType: Stock Reconciliation,Difference Amount,Starpība Summa
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} atstāj uz {1}
 DocType: Purchase Invoice,Reverse Charge,Reversās maksas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Nesadalītā peļņa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Nesadalītā peļņa
 DocType: Purchase Invoice,05-Change in POS,05-maiņa POS
 DocType: Vehicle Log,Service Detail,Servisa Detail
 DocType: BOM,Item Description,Vienība Apraksts
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Iespēja postenis
 ,Student and Guardian Contact Details,Studentu un Guardian kontaktinformācija
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,"Rinda {0}: piegādātājs {0} e-pasta adrese ir nepieciešams, lai nosūtītu e-pastu"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Pagaidu atklāšana
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Pagaidu atklāšana
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Skatīt centru
 ,Employee Leave Balance,Darbinieku Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 DocType: Patient Appointment,More Info,Vairāk info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
 DocType: Supplier Scorecard,Scorecard Actions,Rezultātu kartes darbības
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Piemērs: Masters in Datorzinātnes
 DocType: Purchase Invoice,Rejected Warehouse,Noraidīts Noliktava
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,līdz
 DocType: Supplier Quotation Item,Lead Time in days,Izpildes laiks dienās
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Kreditoru kopsavilkums
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Izmaksa algas no {0} līdz {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Izmaksa algas no {0} līdz {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testēšanas priekšraksti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Mazs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Mazs
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Rēķina izveides rīka atvēršana
 DocType: Education Settings,Employee Number,Darbinieku skaits
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Atcelt rēķinu pēc atvieglojuma perioda
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
 DocType: Project,% Completed,% Pabeigts
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijas testēšanas datuma laiks
 DocType: Email Digest,Add Quote,Pievienot Citēt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Netiešie izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
 DocType: Agriculture Analysis Criteria,Agriculture,Lauksaimniecība
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1691,16 +1693,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitāla Ekipējums
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,"Lūdzu, vispirms iestatiet preces kodu"
 DocType: Item,ITEM-,PRIEKŠMETS-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
+DocType: Subscription Plan,Billing Interval Count,Norēķinu intervāla skaits
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,Team Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Piegādātājam
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Iestatīšana konta veidu palīdz, izvēloties šo kontu darījumos."
 DocType: Purchase Invoice,Grand Total (Company Currency),Pavisam kopā (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Izveidot Drukas formāts
@@ -1726,7 +1729,7 @@
 DocType: POS Item Group,POS Item Group,POS Prece Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatīvajam vienumam nedrīkst būt tāds pats kā vienuma kods
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06. Pagaidu novērtējuma pabeigšana
 DocType: Salary Slip,Bank Account No.,Banka Konta Nr
@@ -1743,7 +1746,7 @@
 DocType: BOM Operation,Workstation,Darba vieta
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Pieprasījums Piedāvājums Piegādātāja
 DocType: Healthcare Settings,Registration Message,Reģistrācijas ziņa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Detaļas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Detaļas
 DocType: Prescription Dosage,Prescription Dosage,Recepšu deva
 DocType: Attendance,HR Manager,HR vadītājs
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Lūdzu, izvēlieties Company"
@@ -1774,7 +1777,7 @@
 DocType: Project,Start and End Dates,Sākuma un beigu datumi
 ,Delivered Items To Be Billed,Piegādāts posteņi ir Jāmaksā
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Atvērt BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
 DocType: Project Update,Great/Quickly,Lieliski / ātri
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1783,8 +1786,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Lūdzu, izvēlieties partijas par iepildīja preci"
 DocType: Asset,Depreciation Schedules,amortizācijas grafiki
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST iestatījumos var atlasīt šādus kontus:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST iestatījumos var atlasīt šādus kontus:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,darījuma valūta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},No {0} | {1}{2}
@@ -1795,6 +1798,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Izejošais
 DocType: POS Profile,Campaign,Kampaņa
 DocType: Supplier,Name and Type,Nosaukums un veids
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Apstiprinājums statuss ir ""Apstiprināts"" vai ""noraidīts"""
 DocType: Physician,Contacts and Address,Kontakti un adrese
 DocType: Purchase Invoice,Contact Person,Kontaktpersona
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Sagaidāmais Sākuma datums"" nevar būt lielāka par ""Sagaidāmais beigu datums"""
@@ -1808,19 +1812,20 @@
 DocType: Student Admission,Eligibility and Details,Atbilstība un detaļas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sakaru žurnāls.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Pieprasījums piedāvājumam ir atspējots piekļūt no portāla, jo vairāk čeku portāla iestatījumiem."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Piegādātāju rezultātu tabulas vērtēšanas mainīgais
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iepirkuma Summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Iepirkuma Summa
 DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Izveidojot kursu grafiku, radās kļūdas"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pirmais izdevumu apstiprinātājs sarakstā tiks iestatīts kā noklusējuma izdevumu apstiprinātājs.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nevar būt lielāks par 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Detail,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
@@ -1841,14 +1846,15 @@
 DocType: Package Code,Package Code,Package Kods
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Māceklis
 DocType: Purchase Invoice,Company GSTIN,Kompānija GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Nodokļu detaļa galda paņemti no postenis kapteiņa kā stīgu un uzglabā šajā jomā. Lieto nodokļiem un nodevām
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,"Atstājiet apstiprinātāju obligāti, atstājot pieteikumu"
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
@@ -1876,15 +1882,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"Maksājuma termiņš rindā {0}, iespējams, ir dublikāts."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Lauksaimniecība (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Iepakošanas Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office Rent
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS vārti iestatījumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Iepakošanas Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup SMS vārti iestatījumi
 DocType: Disease,Common Name,Parastie vārdi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import neizdevās!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Darba vietas darba stunda
 DocType: Vital Signs,Blood Pressure,Asinsspiediens
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analītiķis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analītiķis
 DocType: Item,Inventory,Inventārs
 DocType: Item,Sales Details,Pārdošanas Details
 DocType: Quality Inspection,QI-,QI-
@@ -1894,15 +1900,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Apstiprināt uzņemti kurss studentiem Studentu grupas
 DocType: Notification Control,Expense Claim Rejected,Izdevumu noraida prasību
 DocType: Item,Item Attribute,Postenis Atribūtu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Valdība
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Valdība
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Izdevumu Prasība {0} jau eksistē par servisa
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute Name
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Ievadiet atmaksas summa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Ievadiet atmaksas summa
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Postenis Variants
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Pakalpojumi
 DocType: HR Settings,Email Salary Slip to Employee,Email Alga Slip darbiniekam
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Izvēlieties Iespējamais Piegādātāja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Izvēlieties Iespējamais Piegādātāja
 DocType: Sales Invoice,Source,Avots
 DocType: Customer,"Select, to make the customer searchable with these fields","Atlasiet, lai klients meklētu šos laukus"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rādīt slēgts
@@ -1919,7 +1925,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Packing Slip (s) atcelts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Naudas plūsma no ieguldījumu
 DocType: Program Course,Program Course,Program Course
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Homepage,Company Tagline for website homepage,Uzņēmuma Tagline mājas lapas sākumlapā
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1949,10 +1955,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Personības informācija
 DocType: Leave Block List,Block Holidays on important days.,Bloķēt Holidays par svarīgākajiem dienas.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),"Lūdzu, ievadiet visu nepieciešamo rezultātu vērtību (-as)"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Debitoru kopsavilkums
-DocType: Employee Loan,Monthly Repayment Amount,Ikmēneša maksājums Summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Debitoru kopsavilkums
+DocType: Loan,Monthly Repayment Amount,Ikmēneša maksājums Summa
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Rēķinu atvēršana
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
 DocType: UOM,UOM Name,Mervienības nosaukums
 DocType: GST HSN Code,HSN Code,HSN kodekss
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Ieguldījums Summa
@@ -1974,7 +1980,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Lietotājs {0} jau ir piešķirts ārstiem {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kaste
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,iespējams piegādātājs
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,iespējams piegādātājs
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mēneša Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Uztvērējs saraksts ir tukšs. Lūdzu, izveidojiet Uztvērēja saraksts"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Veselības aprūpe (beta)
@@ -2002,7 +2009,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nav Preces pack
 DocType: Shipping Rule Condition,From Value,No vērtība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
-DocType: Employee Loan,Repayment Method,atmaksas metode
+DocType: Loan,Repayment Method,atmaksas metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ja ieslēgts, tad mājas lapa būs noklusējuma punkts grupa mājas lapā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
@@ -2011,7 +2018,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Obligāts sertifikāts
 DocType: Company,Default Holiday List,Default brīvdienu sarakstu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rinda {0}: laiku un uz laiku no {1} pārklājas ar {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Akciju Saistības
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Akciju Saistības
 DocType: Purchase Invoice,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Izvēlieties uzņēmumu
@@ -2019,7 +2026,7 @@
 DocType: Student Report Generation Tool,Print Section,Drukāt sadaļu
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Lietotājam {0} nav noklusējuma POS profila. Pārbaudiet noklusējuma rindu {1} šim Lietotājam.
 DocType: Student Group,Set 0 for no limit,Uzstādīt 0 bez ierobežojuma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,"Rinda {idx}: {lauks} ir nepieciešama, lai izveidotu rēķinu atvēršanas {invoice_type}"
 DocType: Customer,Primary Address and Contact Detail,Primārā adrese un kontaktinformācija
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
@@ -2030,10 +2037,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,"Lūdzu, atlasiet vismaz vienu domēnu."
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Meklēt punkts
 DocType: Payment Schedule,Payment Amount,Maksājuma summa
@@ -2043,7 +2050,7 @@
 DocType: Assessment Plan,Grading Scale,Šķirošana Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,jau pabeigts
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import veiksmīga!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
@@ -2054,17 +2061,16 @@
 DocType: Quotation Item,Quotation Item,Piedāvājuma rinda
 DocType: Customer,Customer POS Id,Klienta POS ID
 DocType: Account,Account Name,Konta nosaukums
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Sērijas Nr {0} daudzums {1} nevar būt daļa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Sērijas Nr {0} daudzums {1} nevar būt daļa
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Lūdzu, ievadiet Woocommerce servera URL"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Piegādātājs Type meistars.
 DocType: Purchase Order Item,Supplier Part Number,Piegādātājs Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
 DocType: Share Balance,To No,Nē
-DocType: Subscription,Reference Document,atsauces dokuments
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} tiek atcelts vai pārtraukta
 DocType: Accounts Settings,Credit Controller,Kredīts Controller
-DocType: Grant Application,Applicant Type,Pieteikuma iesniedzēja tips
+DocType: Loan,Applicant Type,Pieteikuma iesniedzēja tips
 DocType: Purchase Invoice,03-Deficiency in services,03 - pakalpojumu trūkums
 DocType: Delivery Note,Vehicle Dispatch Date,Transportlīdzekļu Nosūtīšanas datums
 DocType: Healthcare Settings,Default Medical Code Standard,Noklusētais medicīnisko kodu standarts
@@ -2075,13 +2081,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Jāmaksā
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Cilvēkresursi
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Cilvēkresursi
 DocType: Lead,Upper Income,Upper Ienākumi
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,noraidīt
 DocType: Journal Entry Account,Debit in Company Currency,Debeta uzņēmumā Valūta
 DocType: BOM Item,BOM Item,BOM postenis
 DocType: Appraisal,For Employee,Vajadzīgi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Padarīt izmaksa Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Padarīt izmaksa Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance pret Piegādātāju ir norakstīt
 DocType: Company,Default Values,Noklusējuma vērtības
 DocType: Membership,INR,INR
@@ -2111,10 +2117,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} nedrīkst būt lielāks par 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Krājums pieejams
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Krājums pieejams
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning For (dienas)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,iepirkums
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligāts lauks - programma
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligāts lauks - programma
 DocType: Special Test Template,Result Component,Rezultātu komponents
@@ -2135,7 +2141,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,"Iekļaut brīvdienas laikā lapām, lapas"
 DocType: Sales Invoice,Packed Items,Iepakotas preces
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantijas Prasījums pret Sērijas Nr
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Kopā&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Kopā&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ieslēgt Grozs
 DocType: Employee,Permanent Address,Pastāvīga adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2153,10 +2159,10 @@
 DocType: Selling Settings,Selling Settings,Pārdošanas iestatījumi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Apstipriniet darbību
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Izsoles
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,izpilde
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,View in grozs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Mārketinga izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,"Nevar izveidot standarta kritērijus. Lūdzu, pārdēvējiet kritērijus"
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
@@ -2179,9 +2185,9 @@
 DocType: Upload Attendance,Get Template,Saņemt Template
 DocType: Material Request,Transferred,Pārskaitīts
 DocType: Vehicle,Doors,durvis
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Savākt maksu par pacienta reģistrāciju
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nevar mainīt atribūtus pēc akciju darījuma. Izveidojiet jaunu Preci un pārsūtiet akciju uz jauno Preci
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nevar mainīt atribūtus pēc akciju darījuma. Izveidojiet jaunu Preci un pārsūtiet akciju uz jauno Preci
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Nodokļu sabrukuma
 DocType: Packing Slip,PS-,PS-
@@ -2217,12 +2223,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Purchase Invoice Item,Batch No,Partijas Nr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Darbinieku avanss
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 DocType: Grant Application,Assessment  Mark (Out of 10),Novērtējuma zīme (no 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilo Nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Galvenais
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
@@ -2231,15 +2238,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Email Digest,Annual Expenses,gada izdevumi
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Izveidot pirkuma pasūtījumu
 DocType: SMS Center,Send To,Sūtīt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Piešķirtā summa
 DocType: Sales Team,Contribution to Net Total,Ieguldījums kopējiem neto
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
 DocType: Territory,Territory Name,Teritorija Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Abonementā var būt tikai plāni ar tādu pašu norēķinu ciklu
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pretendents uz darbu.
 DocType: Purchase Order Item,Warehouse and Reference,Noliktavas un atsauce
 DocType: Supplier,Statutory info and other general information about your Supplier,Normatīvais info un citu vispārīgu informāciju par savu piegādātāju
@@ -2250,10 +2258,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,vērtējumi
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Apmācības pasākumi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Track Leades ar svina avots.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ievadiet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ievadiet
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Servisa žurnāls
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"Neto svars šīs paketes. (Aprēķināts automātiski, kā summa neto svara vienību)"
@@ -2261,11 +2269,11 @@
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} jāiesniedz
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Dalieties vadībā
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Maksājums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Maksājums
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Noliktava {0} nav saistīta ar jebkuru kontu, lūdzu, norādiet kontu šajā noliktavas ierakstā vai iestatīt noklusējuma inventāra kontu uzņēmumā {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Pārvaldīt savus pasūtījumus
 DocType: Work Order Operation,Actual Time and Cost,Faktiskais laiks un izmaksas
@@ -2275,7 +2283,7 @@
 DocType: Student Leave Application,Student Leave Application,Studentu atvaļinājums
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Par
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
@@ -2285,7 +2293,7 @@
 DocType: Item,Barcodes,Svītrkodi
 DocType: Hub Category,Hub Node,Hub Mezgls
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Līdzstrādnieks
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Līdzstrādnieks
 DocType: Asset Movement,Asset Movement,Asset kustība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Darba kārtojums {0} jāiesniedz
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Jauns grozs
@@ -2303,13 +2311,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Norēķinu valūtai jābūt vienādai ar noklusējuma uzņēmuma valūtas vai partijas konta valūtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rinda {0}: maksājuma datums nevar būt pirms izlikšanas datuma
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rinda {0}: maksājuma datums nevar būt pirms izlikšanas datuma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Izveidot maksājuma Ierakstu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
 ,Sales Invoice Trends,PPR tendences
 DocType: Leave Application,Apply / Approve Leaves,Piesakies / Apstiprināt lapām
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Par
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Var attiekties rindu tikai tad, ja maksa tips ir ""On iepriekšējās rindas summu"" vai ""iepriekšējās rindas Kopā"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Var attiekties rindu tikai tad, ja maksa tips ir ""On iepriekšējās rindas summu"" vai ""iepriekšējās rindas Kopā"""
 DocType: Sales Order Item,Delivery Warehouse,Piegādes Noliktava
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree finanšu izmaksu centriem.
 DocType: Serial No,Delivery Document No,Piegāde Dokuments Nr
@@ -2323,7 +2330,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materiāla patēriņš nav iestatīts ražošanas iestatījumos.
 DocType: Student,Student Mobile Number,Studentu Mobilā tālruņa numurs
 DocType: Item,Has Variants,Ir Varianti
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Prece {0} nevar būt pārnēsājama rindā {1} vairāk nekā {2}. Lai atļautu pārsniegt norēķinus, lūdzu, iestatiet akciju iestatījumus"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Prece {0} nevar būt pārnēsājama rindā {1} vairāk nekā {2}. Lai atļautu pārsniegt norēķinus, lūdzu, iestatiet akciju iestatījumus"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atjaunināt atbildi
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
@@ -2335,12 +2342,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Vispirms izvēlieties programmu
 DocType: Patient Appointment,Patient Age,Pacienta vecums
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Managing Projects
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Sērijas numurs {0} jau ir atgriezies
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Sērijas numurs {0} jau ir atgriezies
 DocType: Supplier,Supplier of Goods or Services.,Preču piegādātājam vai pakalpojumu.
 DocType: Budget,Fiscal Year,Fiskālā gads
 DocType: Asset Maintenance Log,Planned,Plānots
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Neapstiprinātie debitoru parādi, kas jāizmanto, ja nav noteikts Pacientam, lai rezervētu konsultāciju izmaksas."
 DocType: Vehicle Log,Fuel Price,degvielas cena
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Budžets
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Iestatīt atvērtu
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
@@ -2354,16 +2362,16 @@
 DocType: Lead,Follow Up,Seko līdzi
 DocType: Item,Is Sales Item,Produkts tiek pārdots
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Postenis Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
 DocType: Maintenance Visit,Maintenance Time,Apkopes laiks
 ,Amount to Deliver,Summa rīkoties
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Viens un tas pats priekšmets ir ievadīts vairākas reizes. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Sākuma datums nevar būt pirms Year Sākuma datums mācību gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Bija kļūdas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Darbinieks {0} jau ir iesniedzis {1} pieteikumu starp {2} un {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Bija kļūdas.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Darbinieks {0} jau ir iesniedzis {1} pieteikumu starp {2} un {3}:
 DocType: Guardian,Guardian Interests,Guardian intereses
 DocType: Naming Series,Current Value,Pašreizējā vērtība
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
 DocType: Education Settings,Instructor Records to be created by,"Instruktoru ieraksti, ko izveido"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} izveidots
 DocType: GST Account,GST Account,GST konts
@@ -2382,8 +2390,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Pievienots izlasei
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nav atalgojuma slīdes, kas iesniegts iepriekš norādītajiem kritērijiem VAI jau iesniegtās algu kvītis"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Nodevas un nodokļi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nav atalgojuma slīdes, kas iesniegts iepriekš norādītajiem kritērijiem VAI jau iesniegtās algu kvītis"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Nodevas un nodokļi
 DocType: Projects Settings,Projects Settings,Projektu iestatījumi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ievadiet Atsauces datums
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
@@ -2393,27 +2401,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Koks poz grupu.
 DocType: Production Plan,Total Produced Qty,Kopējā produkta daudzums
 DocType: Payroll Entry,Get Employee Details,Iegūstiet darbinieku informāciju
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
 DocType: Asset,Sold,Pārdots
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
 DocType: Account,Frozen,Sasalis
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Summa (Company valūta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Izejvielas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Izejvielas
 DocType: Payment Reconciliation Payment,Reference Row,atsauce Row
 DocType: Installation Note,Installation Time,Uzstādīšana laiks
 DocType: Sales Invoice,Accounting Details,Grāmatvedības Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,"Dzēst visas darījumi, par šo uzņēmumu"
 DocType: Patient,O Positive,O Pozitīvs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investīcijas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,piešķīrumi
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Pieņemšanas kritēriji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Par žurnāla ierakstu nav atmaksājumu
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 DocType: BOM,Show In Website,Show In Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Rādīt Daudzums Website
-DocType: Employee Loan Application,Total Payable Amount,Kopējā maksājamā summa
+DocType: Loan Application,Total Payable Amount,Kopējā maksājamā summa
 DocType: Task,Expected Time (in hours),Sagaidāmais laiks (stundās)
 DocType: Item Reorder,Check in (group),Reģistrēšanās (grupas)
 DocType: Soil Texture,Silt,Silt
@@ -2432,7 +2441,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,veikt maksājumu
 DocType: Room,Room Name,room Name
 DocType: Prescription Duration,Prescription Duration,Receptes ilgums
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 DocType: Activity Cost,Costing Rate,Izmaksu Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Klientu Adreses un kontakti
 ,Campaign Efficiency,Kampaņas efektivitāte
@@ -2452,11 +2461,11 @@
 DocType: Chapter,Chapter,Nodaļa
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pāris
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Noklusētais konts tiks automātiski atjaunināts POS rēķinā, kad būs atlasīts šis režīms."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
 DocType: Asset,Depreciation Schedule,nolietojums grafiks
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Pārdošanas Partner adreses un kontakti
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date jābūt starp No Datums un līdz šim
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date jābūt starp No Datums un līdz šim
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskais datums
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,"Lūdzu, iestatiet noklusējuma izmaksu centru uzņēmumā {0}."
 DocType: Item,Has Batch No,Partijas Nr
@@ -2474,7 +2483,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas)
 DocType: Soil Texture,Soil Type,Augsnes tips
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Jauns ziņojums
 ,Quotation Trends,Piedāvājumu tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless mandāts
@@ -2494,7 +2502,7 @@
 DocType: Hub Category,Hub Category,Hub kategorijas
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
-DocType: Employee Loan,Loan Amount,Kredīta summa
+DocType: Loan,Loan Amount,Kredīta summa
 DocType: Student Report Generation Tool,Add Letterhead,Pievienojiet burtu galu
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Braukšanas Transportlīdzekļu
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Piegādātāju rādītāju karte pastāvīga
@@ -2523,9 +2531,9 @@
 DocType: Cash Flow Mapper,Position,Amats
 DocType: Patient,Patient Details,Pacienta detaļas
 DocType: Patient,B Positive,B Pozitīvs
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 DocType: Patient Medical Record,Patient Medical Record,Pacienta medicīniskais ieraksts
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sporta
@@ -2533,8 +2541,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kopā Faktiskais
 DocType: Lab Test UOM,Test UOM,Pārbaudīt UOM
 DocType: Student Siblings,Student Siblings,studentu Brāļi un māsas
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonēšanas plāna detaļas
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Vienība
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Lūdzu, norādiet Company"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Lūdzu, norādiet Company"
 ,Customer Acquisition and Loyalty,Klientu iegāde un lojalitātes
 DocType: Asset Maintenance Task,Maintenance Task,Apkopes uzdevumi
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,"Lūdzu, iestatiet B2C ierobežojumu GST iestatījumos."
@@ -2549,6 +2558,7 @@
 ,BOM Search,BOM Meklēt
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Kopējā patērētā materiāla cena (izmantojot krājuma ierakstu)
 DocType: Hub Settings,Company Registered,Reģistrēta sabiedrība
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Datums nevar būt mazāks par datumu
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publicēt &quot;Noliktavā&quot; vai &quot;Nav noliktavā&quot; uz centra, pamatojoties uz noliktavā pieejamo noliktavu."
 DocType: Vehicle,Fuel Type,degvielas veids
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
@@ -2556,17 +2566,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Šāds materiāls Pieprasījumi tika automātiski izvirzīts, balstoties uz posteni atjaunotne pasūtījuma līmenī"
 DocType: Email Digest,Pending Sales Orders,Kamēr klientu pasūtījumu
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 DocType: Employee,Create User Permission,Izveidot lietotāja atļauju
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
 DocType: Healthcare Settings,Remind Before,Atgādināt pirms
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
 DocType: Salary Component,Deduction,Atskaitīšana
 DocType: Item,Retain Sample,Saglabājiet paraugu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rinda {0}: laiku un uz laiku ir obligāta.
 DocType: Stock Reconciliation Item,Amount Difference,summa Starpība
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ievadiet Darbinieku Id šīs pārdošanas persona
 DocType: Territory,Classification of Customers by region,Klasifikācija klientiem pa reģioniem
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Ražošanā
@@ -2576,8 +2587,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Aprēķinātais Bankas pārskats bilance
 DocType: Normal Test Template,Normal Test Template,Normālās pārbaudes veidne
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invalīdiem lietotāju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Piedāvājums
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,"Nevar iestatīt saņemto RFQ, ja nav citēta"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Piedāvājums
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,"Nevar iestatīt saņemto RFQ, ja nav citēta"
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Izvēlieties kontu, kuru drukāt konta valūtā"
@@ -2585,7 +2596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tas ir balstīts uz darījumiem ar šo pacientu. Sīkāku informāciju skatiet tālāk redzamajā laika grafikā
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Izmaksas Atjaunots
 DocType: Patient,Date of Birth,Dzimšanas datums
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Postenis {0} jau ir atgriezies
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Piegādātāju veiktspējas kartes iestatīšana
@@ -2596,14 +2607,15 @@
 DocType: Work Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Darba apraksts
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Darba apraksts
 DocType: Student Applicant,Applied,praktisks
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-open
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Daudz kā vienu akciju UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 vārds
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post pārdošanas atlaide
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
+DocType: Department Approver,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Lauks &quot;Akcionārs&quot; nedrīkst būt tukšs
 DocType: Guardian,Work Address,darba adrese
@@ -2617,21 +2629,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kopējā piešķirtā summa (Company valūta)
 DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
 DocType: BOM,Scrap Material Cost,Lūžņi materiālu izmaksas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
 DocType: Grant Application,Email Notification Sent,E-pasta paziņojums nosūtīts
 DocType: Purchase Invoice,In Words (Company Currency),Vārdos (Company valūta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Rindā ir jānorāda vienība Kods, noliktava, daudzums"
-DocType: Pricing Rule,Supplier,Piegādātājs
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Rindā ir jānorāda vienība Kods, noliktava, daudzums"
+DocType: Bank Guarantee,Supplier,Piegādātājs
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Rādīt maksājuma datus
 DocType: Consultation,Consultation Time,Konsultācijas laiks
 DocType: C-Form,Quarter,Ceturksnis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Dažādi izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Dažādi izdevumi
 DocType: Global Defaults,Default Company,Noklusējuma uzņēmums
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Izdevumu vai Atšķirība konts ir obligāta postenī {0}, kā tā ietekmē vispārējo akciju vērtības"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bankas nosaukums
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Virs
-DocType: Employee Loan,Employee Loan Account,Darbinieku Aizdevuma konts
 DocType: Leave Application,Total Leave Days,Kopā atvaļinājuma dienām
 DocType: Email Digest,Note: Email will not be sent to disabled users,Piezīme: e-pasts netiks nosūtīts invalīdiem
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Skaits mijiedarbības
@@ -2647,7 +2658,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Svars (kilogramā)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",nodaļas / chapter_name atstāj tukšu automātiski pēc nodaļas saglabāšanas.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,"Lūdzu, iestatiet GST kontus GST iestatījumos"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,"Lūdzu, iestatiet GST kontus GST iestatījumos"
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Uzņēmējdarbības veids
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Izmaksas jauno pirkumu
@@ -2656,12 +2667,13 @@
 DocType: Grant Application,Grant Description,Granta apraksts
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
 DocType: Student Guardian,Others,Pārējie
+DocType: Subscription,Discounts,Atlaides
 DocType: Payment Entry,Unallocated Amount,nepiešķirto Summa
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
 DocType: POS Profile,Taxes and Charges,Nodokļi un maksājumi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkts vai pakalpojums, kas tiek pirkti, pārdot vai turēt noliktavā."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ne vairāk atjauninājumi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Tas attiecas uz visām rezultātu kartēm, kas piesaistītas šim iestatījumam"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Bērnu Prece nedrīkst būt Product Bundle. Lūdzu, noņemiet objektu `{0}` un saglabāt"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banku
@@ -2670,21 +2682,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Lūdzu, noklikšķiniet uz ""Generate grafiks"", lai saņemtu grafiku"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
 DocType: Bin,Ordered Quantity,Pasūtīts daudzums
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Grading Scale,Grading Scale Intervals,Skalu intervāli
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Gada peļņa
+DocType: Bank Guarantee,Name of Bank,Bankas nosaukums
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Grāmatvedība Entry par {2} var veikt tikai valūtā: {3}
 DocType: Fee Schedule,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Koks finanšu pārskatu.
+DocType: Bank Guarantee,Reference Document Type,Atsauces dokuments Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Naudas plūsmas kartēšana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} pret pārdošanas pasūtījumu {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serializēja inventarizācija
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pasta adrese nav atrasta noklusējuma kontā
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Izveidot slepenu
-DocType: Employee Loan,Account Info,konta informācija
+DocType: Loan,Account Info,konta informācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
 DocType: Fees,Include Payment,Iekļaut maksājumu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,"{0} Student grupas, kas izveidotas."
@@ -2692,24 +2707,24 @@
 DocType: Sales Invoice,Total Billing Amount,Kopā Norēķinu summa
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Maksas struktūras un studentu grupas {0} programmas atšķiras.
 DocType: Fee Schedule,Receivable Account,Debitoru konts
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Sales Order to Apmaksa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Ar nodokļa samaksu
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trīs eksemplāros piegādātājs
 DocType: Land Unit,Is Container,Ir konteiners
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Tas būs ražas cikla 1. diena
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Purchase Invoice Item,Weight UOM,Svara Mērvienība
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Pieejamo Akcionāru saraksts ar folio numuriem
 DocType: Salary Structure Employee,Salary Structure Employee,Alga Struktūra Darbinieku
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Rādīt variantu atribūtus
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Rādīt variantu atribūtus
 DocType: Student,Blood Group,Asins Group
 DocType: Course,Course Name,Kursa nosaukums
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Lietotāji, kuri var apstiprināt konkrētā darbinieka atvaļinājumu pieteikumus"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Biroja iekārtas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Biroja iekārtas
 DocType: Purchase Invoice Item,Qty,Daudz
 DocType: Fiscal Year,Companies,Uzņēmumi
 DocType: Supplier Scorecard,Scoring Setup,Novērtēšanas iestatīšana
@@ -2728,7 +2743,7 @@
 DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debets ir nepieciešama
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Pirkuma Cenrādis
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Piegādes rezultātu tabulas mainīgie modeļi.
 DocType: Job Offer Term,Offer Term,Piedāvājums Term
 DocType: Asset,Quality Manager,Kvalitātes vadītājs
@@ -2740,13 +2755,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Pavisam Neapmaksāta: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Mājas Darbība
 DocType: Supplier Scorecard,Supplier Score,Piegādātāja vērtējums
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Kopējo rēķinā Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Kopējo rēķinā Amt
 DocType: Supplier,Warn RFQs,Brīdināt RFQ
 DocType: BOM,Conversion Rate,Conversion Rate
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Produktu meklēšana
 DocType: Assessment Plan,To Time,Uz laiku
 DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
+DocType: Loan,Total Amount Paid,Kopējā samaksātā summa
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Lūdzu, izvēlieties Studentu uzņemšanu, kas ir obligāta apmaksātajam studenta pretendentam"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Lūdzu, izvēlieties cenu sarakstu, lai publicētu cenu"
@@ -2756,19 +2772,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cenrādis {0} ir invalīds
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rinda {0}: Pabeigts Daudz nevar būt vairāk kā {1} ekspluatācijai {2}
 DocType: Manufacturing Settings,Allow Overtime,Atļaut Virsstundas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializēta Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, lūdzu, izmantojiet Fondu Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializēta Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, lūdzu, izmantojiet Fondu Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializēta Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, lūdzu, izmantojiet Fondu Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serializēta Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, lūdzu, izmantojiet Fondu Entry"
 DocType: Training Event Employee,Training Event Employee,Training Event Darbinieku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimālais paraugu skaits - {0} var tikt saglabāts partijai {1} un vienumam {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Pievienot laika nišas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Pašreizējais Vērtēšanas Rate
 DocType: Training Event,Advance,Avanss
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,lai atkārtotu atkārtotu darbību.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless maksājumu vārtejas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / zaudējumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Gain / zaudējumi
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Row # {0}: konts {1} nepieder uzņēmumam {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Row # {0}: konts {1} nepieder uzņēmumam {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nevar atrast DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
@@ -2787,7 +2802,6 @@
 DocType: Bin,Actual Quantity,Faktiskais daudzums
 DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sērijas Nr {0} nav atrasts
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonements ir {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Maksu grafika programma
 DocType: Fee Schedule Program,Student Batch,Student Partijas
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,padarīt Students
@@ -2803,14 +2817,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-komercija GSTIN
 DocType: Sales Order,Not Delivered,Nav sniegusi
 ,Bank Clearance Summary,Banka Klīrenss kopsavilkums
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
 DocType: Appraisal Goal,Appraisal Goal,Izvērtēšana Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Ieteikt kategoriju?
 DocType: Stock Reconciliation Item,Current Amount,pašreizējais Summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ēkas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ēkas
 DocType: Fee Schedule,Fee Structure,maksa struktūra
 DocType: Timesheet Detail,Costing Amount,Izmaksu summa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 DocType: Student Admission Program,Application Fee,Pieteikuma maksa
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Iesniegt par atalgojumu
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm atlaide Vienības {0}{1}%
@@ -2818,12 +2831,13 @@
 DocType: Sales Partner,Address & Contacts,Adrese & Kontakti
 DocType: SMS Log,Sender Name,Sūtītājs Vārds
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Lauksaimniecības analīzes kritēriji
+DocType: HR Settings,Leave Approval Notification Template,Atstājiet apstiprinājuma paziņojuma veidni
 DocType: POS Profile,[Select],[Izvēlēties]
 DocType: Vital Signs,Blood Pressure (diastolic),Asinsspiediens (diastoliskais)
 DocType: SMS Log,Sent To,Nosūtīts
 DocType: Agriculture Task,Holiday Management,Brīvdienu vadīšana
 DocType: Payment Request,Make Sales Invoice,Izveidot PPR
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,programmatūra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,programmatūra
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
 DocType: Company,For Reference Only.,Tikai atsaucei.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Ārsts {0} nav pieejams {1}
@@ -2841,7 +2855,7 @@
 DocType: Employee,New Workplace,Jaunajā darbavietā
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materiāls patēriņš
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Uzstādīt kā Slēgts
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Pozīcijas ar svītrkodu {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Pozīcijas ar svītrkodu {0}
 DocType: Normal Test Items,Require Result Value,Pieprasīt rezultātu vērtību
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMs
@@ -2856,19 +2870,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nav aktīvas vai noklusējuma Alga struktūra down darbiniekam {0} par dotajiem datumiem
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
 DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Atkārtojas
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Naudas plūsmas kartēšanas veidnes detaļas
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Aizdevumu vadība
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Izsekot atsevišķu ieņēmumi un izdevumi produktu vertikālēm vai nodaļām.
 DocType: Rename Tool,Rename Tool,Pārdēvēt rīks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atjaunināt izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Rādīt Alga Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Rādīt Alga Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Materiāls
 DocType: Fees,Send Payment Request,Sūtīt maksājuma pieprasījumu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
 DocType: Water Analysis,Origin,Izcelsme
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Izvēlieties Mainīt summu konts
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
@@ -2883,14 +2897,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Ir atbildība par ienākuma nodokli
 DocType: Grading Scale Interval,Grade Description,grade Apraksts
 DocType: Stock Entry,Purchase Receipt No,Pirkuma čeka Nr
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Rokas naudas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Rokas naudas
 DocType: Sales Invoice, Shipping Bill Number,Piegādes rēķina numurs
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,izsekojamība
 DocType: Asset Maintenance Log,Actions performed,Veiktās darbības
 DocType: Cash Flow Mapper,Section Leader,Sadaļas vadītājs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Darbinieks
+DocType: Bank Guarantee,Fixed Deposit Number,Fiksētā depozīta numurs
 DocType: Asset Repair,Failure Date,Neveiksmes datums
 DocType: Sample Collection,Collected Time,Savāktais laiks
 DocType: Company,Sales Monthly History,Pārdošanas mēneša vēsture
@@ -2907,10 +2922,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Vai tiešām vēlaties atcelt šo tikšanos?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Viesnīcas numuru cenas pakete
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Ielādēt abonēšanas atjauninājumus
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konta {0} nesakrīt ar uzņēmumu {1} no konta režīms: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurss:
@@ -2920,7 +2936,7 @@
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nav izveidoti darba pasūtījumi
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Alga Slip darbinieka {0} jau izveidotas šajā periodā
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceitisks
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceitisks
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
 DocType: Purchase Invoice,Credit To,Kredīts Lai
@@ -2938,7 +2954,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nekādu citātu
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Gateway Account,Payment Account,Maksājumu konts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Neto izmaiņas debitoru
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompensējošs Off
 DocType: Job Offer,Accepted,Pieņemts
@@ -2951,7 +2967,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Lūdzu, pārliecinieties, ka jūs tiešām vēlaties dzēst visus darījumus šajā uzņēmumā. Jūsu meistars dati paliks kā tas ir. Šo darbību nevar atsaukt."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Meklēšanas rezultāti
 DocType: Room,Room Number,Istabas numurs
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Nederīga atsauce {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Nederīga atsauce {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 DocType: Journal Entry Account,Payroll Entry,Algas ieraksts
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Skatīt maksu ierakstus
@@ -2961,7 +2977,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Lab Test Sample,Lab Test Sample,Laba testa paraugs
 DocType: Item Variant Settings,Allow Rename Attribute Value,Atļaut pārdēvēt atribūtu vērtību
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
 DocType: Restaurant,Invoice Series Prefix,Rēķinu sērijas prefikss
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
@@ -2969,8 +2985,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps integrācija nav iespējota
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0}{1} nav iesniegta
+DocType: Subscription,Trialling,Trialēšana
 DocType: Member,Membership Expiry Date,Dalības termiņa beigu datums
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ir negatīva atgriešanās dokumentā
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ir negatīva atgriešanās dokumentā
 ,Minutes to First Response for Issues,Minūtes First Response jautājumos
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
@@ -2989,7 +3006,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Mērvienības
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Iespējas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Iespējas
 DocType: Operation,Default Workstation,Default Workstation
 DocType: Notification Control,Expense Claim Approved Message,Izdevumu Pretenzija Apstiprināts Message
 DocType: Payment Entry,Deductions or Loss,Samazinājumus vai zaudēšana
@@ -3027,7 +3044,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Atstāt bez samaksas nesakrīt ar apstiprināto atvaļinājums ierakstus
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Veikt rēķinu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Atlikušais atlikums
@@ -3037,7 +3054,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,beigu gads
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Driver,Driver,Vadītājs
 DocType: Vital Signs,Nutrition Values,Uztura vērtības
 DocType: Lab Test Template,Is billable,Ir apmaksājams
@@ -3048,7 +3065,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Faktiskā Sākuma datums (via laiks lapas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Novecošana Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Kopējā avansa summa nevar būt lielāka par kopējo pieprasīto summu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Kopējā avansa summa nevar būt lielāka par kopējo pieprasīto summu
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3083,7 +3100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Atlasiet Atribūtu vērtības
 DocType: Purchase Invoice,Reason For Issuing document,Iemesls dokumentu izsniegšanai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Nākamais Kontaktinformācija Ar nevar būt tāda pati kā vadošais e-pasta adrese
 DocType: Tax Rule,Billing City,Norēķinu City
@@ -3100,7 +3117,8 @@
 DocType: Warranty Claim,Service Address,Servisa adrese
 DocType: Asset Maintenance Task,Calibration,Kalibrēšana
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ir uzņēmuma atvaļinājums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mēbeles un piederumi
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Atstāt statusa paziņojumu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mēbeles un piederumi
 DocType: Item,Manufacture,Ražošana
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Laba testa atskaite
@@ -3116,7 +3134,6 @@
 DocType: Crop,Planting Area,Stādīšanas zona
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Tas varētu būt dažu nederīgu e-pasta adreses dēļ
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Jūs pievienojāt
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,apmācības rezultāts
@@ -3126,16 +3143,17 @@
 DocType: Products Settings,Products per Page,Produkti uz lapu
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizācija filiāle meistars.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ziņojiet par problēmu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility Izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virs
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nav konta {2} vai jau saskaņota pret citu talonu
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kritērijs Svars
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Atteikt apstiprinājuma paziņojumu
 DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Alga Slip Pamatojoties uz laika kontrolsaraksts
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Pirkšanas līmenis
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Pirkšanas līmenis
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Iestatītu noklusētās vērtības, piemēram, Company, valūtas, kārtējā fiskālajā gadā, uc"
 DocType: Payment Entry,Payment Type,Maksājuma veids
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Iepirkumu grozs iestatījumi
 DocType: Journal Entry,Accounting Entries,Grāmatvedības Ieraksti
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ja izvēlēts Cenas noteikums ir iestatīts uz &quot;Rate&quot;, tas atkārto cenu sarakstu. Cenu noteikšana Likmes likme ir galīgā likme, tādēļ vairs nevajadzētu piemērot papildu atlaides. Tādējādi darījumos, piemēram, Pārdošanas pasūtījumos, pirkuma orderīšanā utt, tas tiks fetched laukā &#39;Rate&#39;, nevis laukā &#39;Cenu likmes likme&#39;."
+DocType: Journal Entry,Paid Loan,Apmaksāts aizdevums
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Dublēt ierakstu. Lūdzu, pārbaudiet Autorizācija Reglamenta {0}"
 DocType: Journal Entry Account,Reference Due Date,Atsauces termiņš
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 ,To Produce,Ražot
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Algas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
 DocType: Patient Service Unit,Parent Service Unit,Vecāku servisa nodaļa
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,padarīt lietotāju
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikācija paketes par piegādi (drukāšanai)
@@ -3193,7 +3212,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Ienākumu konta
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Nodošana
 DocType: Volunteer,Weekdays,Nedēļas dienas
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: Restaurant Menu,Restaurant Menu,Restorāna ēdienkarte
@@ -3201,7 +3220,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
 DocType: Payment Entry,Total Allocated Amount,Kopējā piešķirtā summa
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Iestatīt noklusējuma inventāra veido pastāvīgās uzskaites
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Iestatīt noklusējuma inventāra veido pastāvīgās uzskaites
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Nosūtiet Granta pārskata e-pastu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage ir pilna, nav ietaupīt"
@@ -3209,10 +3228,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Telpas ietilpība
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Vienums {0} jau ir ieraksts
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Jūs zaudēsiet iepriekš izveidoto rēķinu ierakstus. Vai tiešām vēlaties atjaunot šo abonementu?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Reģistrācijas maksa
 DocType: Budget,Cost Center,Izmaksas Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Kuponu #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Kuponu #
 DocType: Notification Control,Purchase Order Message,Pasūtījuma Ziņa
 DocType: Tax Rule,Shipping Country,Piegāde Country
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Slēpt Klienta nodokļu ID no pārdošanas darījumu
@@ -3221,20 +3241,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cenu noteikums ir, lai pārrakstītu Cenrādī / noteikt diskonta procentus, pamatojoties uz dažiem kritērijiem."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Noliktavu var mainīt tikai ar Fondu Entry / Piegāde Note / pirkuma čeka
 DocType: Employee Education,Class / Percentage,Klase / procentuālā
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Mārketinga un pārdošanas vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Mārketinga un pārdošanas vadītājs
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Ienākuma nodoklis
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Iet uz Letterheads
+DocType: Subscription,Cancel At End Of Period,Atcelt beigās periodā
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Pārvietošanai nav atlasīts neviens vienums
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Pārvietošanai nav atlasīts neviens vienums
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
 DocType: Vehicle,Electric,elektrības
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Peļņa / zaudējumi aktīva atsavināšana
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Peļņa / zaudējumi aktīva atsavināšana
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Zemāk esošajā tabulā būs atlasīts tikai Studentu pretendents ar statusu &quot;Apstiprināts&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"Konta numurs kontam {0} nav pieejams. <br> Lūdzu, pareizi iestatiet savu kontu karti."
 DocType: Task,Depends on Tasks,Atkarīgs no uzdevumiem
@@ -3249,6 +3270,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nav noliktavā
 DocType: Volunteer,Volunteer Skills,Brīvprātīgo prasmes
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Atsauces dokumenta nosaukums
 DocType: Purchase Invoice,Taxes and Charges Deducted,Nodokļi un maksājumi Atskaitīts
 apps/erpnext/erpnext/hooks.py +142,Issues,Jautājumi
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statuss ir jābūt vienam no {0}
@@ -3262,7 +3284,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ir izslēgts
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Īpaši liels
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Īpaši liels
+DocType: Loan,Loan Application,Kredīta pieteikums
 DocType: Crop,Scientific Name,Zinātniskais nosaukums
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Kopā Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Atkārtoti atlasiet, ja pēc saglabāšanas izvēlētais kontakts tiek rediģēts"
@@ -3271,13 +3294,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Čeku skaits
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Liels
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Liels
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Visi novērtēšanas grupas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Visi novērtēšanas grupas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Jauns Noliktava vārds
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Kopā {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorija
@@ -3298,9 +3321,10 @@
 DocType: Fees,Fees,maksas
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Norādiet Valūtas kurss pārveidot vienu valūtu citā
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Piedāvājums {0} ir atcelts
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Kopējā nesaņemtā summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Kopējā nesaņemtā summa
 DocType: Sales Partner,Targets,Mērķi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Lūdzu, reģistrējiet SIREN numuru uzņēmuma informācijas failā"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 DocType: Price List,Price List Master,Cenrādis Master
 DocType: GST Account,CESS Account,CESS konts
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
@@ -3309,6 +3333,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Atlasiet pacientu
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametra nosaukums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Atstājiet Pieteikumus ar statusu tikai &quot;Apstiprināts&quot; un &quot;Noraidīts&quot; var iesniegt
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Grupas nosaukums ir obligāta kārtas {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkti, kas jānorāda uz mājas lapā mājas lapā"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
@@ -3342,14 +3367,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Rēķins jau ir izveidots visām norēķinu stundām
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Vārds kļūda: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Ir finanšu izmaksas
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
 DocType: Packing Slip,If more than one package of the same type (for print),"Ja vairāk nekā viens iepakojums, no tā paša veida (drukāšanai)"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Lūdzu, iestatiet noklusējuma klientu restorāna iestatījumos"
 ,Salary Register,alga Reģistrēties
 DocType: Warehouse,Parent Warehouse,Parent Noliktava
-DocType: C-Form Invoice Detail,Net Total,Net Kopā
+DocType: Subscription,Net Total,Net Kopā
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default BOM nav atrasts postenī {0} un Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definēt dažādus aizdevumu veidus
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definēt dažādus aizdevumu veidus
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Izcila Summa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laiks (min)
@@ -3381,11 +3406,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root Jāņem grupa
 DocType: Drug Prescription,Drug Prescription,Zāļu recepte
 DocType: Fees,FEE.,MAKSA.
-DocType: Employee Loan,Repaid/Closed,/ Atmaksāto Slēgts
+DocType: Loan,Repaid/Closed,/ Atmaksāto Slēgts
 DocType: Item,Total Projected Qty,Kopā prognozēts Daudz
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Novērtējuma pakāpe nav atrasta vienumam {0}, kas jāveic, lai veiktu grāmatvedības ierakstus par {1} {2}. Ja vienums darījums tiek veikts kā nulles vērtēšanas pakāpes postenis {1}, lūdzu, norādiet to {1} vienumu tabulā. Pretējā gadījumā, lūdzu, izveidojiet priekšmeta ienākošo krājumu darījumu vai norādiet vērtēšanas pakāpi vienuma ierakstā un pēc tam mēģiniet iesniegt / atcelt šo ierakstu"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Nosaukumu sērija"
 DocType: Course,Course Code,kursa kods
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: POS Settings,Use POS in Offline Mode,Izmantojiet POS bezsaistes režīmā
@@ -3405,16 +3429,15 @@
 DocType: Purchase Invoice,Deemed Export,Atzīta eksporta
 DocType: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Atlaide Procentos var piemērot vai nu pret Cenrādī vai visām Cenrāža.
-DocType: Subscription,Half-yearly,Reizi pusgadā
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Lab Test,LabTest Approver,LabTest apstiprinātājs
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Jūs jau izvērtēta vērtēšanas kritērijiem {}.
 DocType: Vehicle Service,Engine Oil,Motora eļļas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Izveidoti darba uzdevumi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Izveidoti darba uzdevumi: {0}
 DocType: Sales Invoice,Sales Team1,Sales team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
-DocType: Employee Loan,Loan Details,aizdevums Details
+DocType: Loan,Loan Details,aizdevums Details
 DocType: Company,Default Inventory Account,Noklusējuma Inventāra konts
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numuri neatbilst
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
@@ -3426,19 +3449,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Saikne ar visām zemes vienībām, kurās audzē kultūraugu"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
 DocType: Item Group,Show this slideshow at the top of the page,Parādiet šo slaidrādi augšpusē lapas
 DocType: BOM,Item UOM,Postenis(Item) UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Nodokļa summa pēc atlaides apmērs (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
 DocType: Cheque Print Template,Primary Settings,primārās iestatījumi
 DocType: Purchase Invoice,Select Supplier Address,Select Piegādātājs adrese
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Pievienot Darbinieki
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Pievienot Darbinieki
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitātes pārbaudes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
 DocType: Payment Request,Mute Email,Mute Email
@@ -3458,11 +3481,10 @@
 DocType: SMS Log,No of Sent SMS,Nosūtīto SMS skaits
 DocType: Antibiotic,Healthcare Administrator,Veselības aprūpes administrators
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Iestatiet mērķi
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
 DocType: Dosage Strength,Dosage Strength,Devas stiprums
 DocType: Account,Expense Account,Izdevumu konts
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Krāsa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Krāsa
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Novērtējums plāns Kritēriji
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Derīguma termiņš ir obligāts atlasītajam vienumam
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Novērst pirkumu pasūtījumus
@@ -3475,18 +3497,18 @@
 DocType: Patient,Personal and Social History,Personiskā un sociālā vēsture
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Lietotājs {0} izveidots
 DocType: Fee Schedule,Fee Breakup for each student,Maksas sadalījums katram studentam
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Mainīt kodu
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dīzelis
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 DocType: Purchase Invoice,Availed ITC Cess,Izmantojis ITC Sess
 ,Student Monthly Attendance Sheet,Student Mēneša Apmeklējumu lapa
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Piegādes noteikums attiecas tikai uz Pārdošanu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Līdz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentu grupas vai Kursu grafiks ir obligāts
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentu grupas vai Kursu grafiks ir obligāts
@@ -3507,7 +3529,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Ierakstiet savus produktus vai pakalpojumus, kurus jūs pērkat vai pārdodat."
 DocType: Water Analysis,Storage Temperature,Uzglabāšanas temperatūra
 DocType: Employee Attendance Tool,Unmarked Attendance,Nemarķēta apmeklējums
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Pētnieks
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Pētnieks
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Uzņemšanas Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Sākuma datumam jābūt mazākam par beigu datumu uzdevumam {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Vārds vai e-pasts ir obligāta
@@ -3520,7 +3542,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} pašlaik ir {1} Piegādātāju rādītāju karte, un šī piegādātāja RFQ ir jāizsaka piesardzīgi."
 DocType: Chapter,Non Profit Manager,Bezpeļņas vadītājs
 DocType: BOM,Total Cost(Company Currency),Kopējās izmaksas (Company valūta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Sērijas Nr {0} izveidots
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Sērijas Nr {0} izveidots
 DocType: Homepage,Company Description for website homepage,Uzņēmuma apraksts mājas lapas sākumlapā
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
@@ -3530,11 +3552,10 @@
 DocType: Employee,You can enter any date manually,Jūs varat ievadīt jebkuru datumu manuāli
 DocType: Healthcare Settings,Result Printed,Rezultāts izdrukāts
 DocType: Asset Category Account,Depreciation Expense Account,Nolietojums Izdevumu konts
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Pārbaudes laiks
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Skatīt {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Pārbaudes laiks
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Project,Total Costing Amount (via Timesheets),Kopējā izmaksu summa (izmantojot laika kontrolsaraksts)
-DocType: Employee Advance,Expense Approver,Izdevumu apstiprinātājs
+DocType: Department,Expense Approver,Izdevumu apstiprinātājs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
 DocType: Project,Hourly,Stundu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group grupas
@@ -3544,7 +3565,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Lai DATETIME
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
 DocType: Accounts Settings,Make Payment via Journal Entry,Veikt maksājumus caur Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Printed On
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pārbaude Nepieciešamais pirms Piegāde
 DocType: Item,Inspection Required before Purchase,"Pārbaude nepieciešams, pirms pirkuma"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Neapstiprinātas aktivitātes
@@ -3554,7 +3575,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimālais pasūtījuma daudzums
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Jūsu organizācija
 DocType: Fee Component,Fees Category,maksas kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Ievadiet atbrīvojot datumu.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Paziņot darbiniekam
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ievadiet nosaukumu, kampaņas, ja avots izmeklēšanas ir kampaņa"
@@ -3564,7 +3585,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Pārkārtot Level
 DocType: Company,Chart Of Accounts Template,Kontu plāns Template
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
 DocType: Purchase Invoice Item,Accepted Warehouse,Pieņemts Noliktava
@@ -3572,10 +3593,11 @@
 DocType: Item,Valuation Method,Vērtēšanas metode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Dublikāts ieraksts
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dublikāts ieraksts
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Pirms iesniegšanas ievadiet Saņēmēja vārdu.
 DocType: Program Enrollment Tool,Get Students,Iegūt Students
 DocType: Serial No,Under Warranty,Zem Garantija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Kļūda]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Kļūda]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt klientu pasūtījumu."
 ,Employee Birthday,Darbinieku Birthday
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,"Lūdzu, atlasiet pabeigtā remonta pabeigšanas datumu"
@@ -3594,7 +3616,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervēta apakšlīgumu slēgšanai
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
 DocType: Shopping Cart Settings,Orders,Pasūtījumi
-DocType: Employee Leave Approver,Leave Approver,Atstājiet apstiprinātāja
+DocType: Department,Leave Approver,Atstājiet apstiprinātāja
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Lūdzu, izvēlieties partiju"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Novērtējums Grupas nosaukums
@@ -3639,7 +3661,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Rumbas izsekotā vienība
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Uzkrātais nolietojums konts
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Šis e-pasts ir automātiski ģenerēts
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
 DocType: Program Enrollment,Boarding Student,iekāpšanas Student
 DocType: Asset,Expected Value After Useful Life,"Paredzams, vērtība pēc Noderīga Life"
@@ -3664,22 +3685,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Apmeklējumu Record {0} nepastāv pret Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Nolietojums Izslēgta dēļ aktīvu atsavināšanas
-DocType: Member,Member,Biedrs
+DocType: Loan,Member,Biedrs
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Pārvaldīt adreses
 DocType: Work Order Item,Work Order Item,Darba uzdevuma postenis
 DocType: Pricing Rule,Item Code,Postenis Code
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Lauksaimniecības vadītājs
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
 DocType: Supplier Scorecard Period,Variables,Mainīgie
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Noslēguma (Dr)
 DocType: Cheque Print Template,Cheque Size,Čeku Size
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
 DocType: Sales Invoice,Write Off Outstanding Amount,Uzrakstiet Off Izcila summa
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konta {0} nesakrīt ar uzņēmumu {1}
@@ -3688,7 +3709,6 @@
 DocType: Stock Settings,Default Stock UOM,Default Stock UOM
 DocType: Asset,Number of Depreciations Booked,Rezervēts skaits nolietojuma
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Daudzums kopā
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Pret darbinieku Loan: {0}
 DocType: Landed Cost Item,Receipt Document,saņemšana Dokumentu
 DocType: Employee Education,School/University,Skola / University
 DocType: Payment Request,Reference Details,Atsauce Details
@@ -3699,7 +3719,7 @@
 DocType: Asset,Double Declining Balance,Paātrināto norakstīšanas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,"Slēgta rīkojumu nevar atcelt. Atvērt, lai atceltu."
 DocType: Student Guardian,Father,tēvs
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 DocType: Attendance,On Leave,Atvaļinājumā
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
@@ -3713,10 +3733,10 @@
 DocType: Lead,Lower Income,Lower Ienākumi
 DocType: Restaurant Order Entry,Current Order,Kārtējais pasūtījums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Avota un mērķa noliktava nevar būt vienāda rindā {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Iet uz programmām
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Rinda {0} # piešķirtā summa {1} nevar būt lielāka par summu, kas nav pieprasīta {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Rinda {0} # piešķirtā summa {1} nevar būt lielāka par summu, kas nav pieprasīta {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
@@ -3739,7 +3759,6 @@
 DocType: Payment Terms Template,Payment Terms,Maksājuma nosacījumi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minūte
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļiem un maksājumiem
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Iet uz piegādātājiem
@@ -3759,30 +3778,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Piedāvājums {0} nav tips {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Lūdzu, norādiet Studenta e-pasta ID, lai nosūtītu Maksājuma pieprasījumu"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Lūdzu, norādiet Studenta e-pasta ID, lai nosūtītu Maksājuma pieprasījumu"
 DocType: Patient,Medical History,Medicīniskā vēsture
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Banka Overdrafts konts
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Banka Overdrafts konts
 DocType: Patient,Patient ID,Pacienta ID
 DocType: Physician Schedule,Schedule Name,Saraksta nosaukums
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Padarīt par atalgojumu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Pievienot visus piegādātājus
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Pievienot visus piegādātājus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: piešķirtā summa nedrīkst būt lielāka par nesamaksāto summu.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Pārlūkot BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Nodrošināti aizdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Nodrošināti aizdevumi
 DocType: Purchase Invoice,Edit Posting Date and Time,Labot ziņas datums un laiks
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Lūdzu noteikt nolietojuma saistīti konti aktīvu kategorijā {0} vai Uzņēmumu {1}
 DocType: Lab Test Groups,Normal Range,Normālais diapazons
 DocType: Academic Term,Academic Year,Akadēmiskais gads
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Pieejams pārdošana
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Atklāšanas Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Atklāšanas Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,atlikušais
 DocType: Appraisal,Appraisal,Novērtējums
+DocType: Loan,Loan Account,Kredīta konts
 DocType: Purchase Invoice,GST Details,GST detaļas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-pasts nosūtīts piegādātājam {0}
 DocType: Item,Default Sales Unit of Measure,Noklusētā pārdošanas apjoma vienība
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akadēmiskais gads:
+DocType: Subscription,Past Due Date,Iepriekšējais maksājuma datums
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nevar atļaut iestatīt alternatīvu objektu vienumam {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datums tiek atkārtots
@@ -3795,7 +3816,7 @@
 DocType: Patient Appointment,Patient Appointment,Pacienta iecelšana
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Apstiprinot loma nevar būt tāds pats kā loma noteikums ir piemērojams
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Atteikties no šo e-pastu Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Iegūt piegādātājus līdz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Iegūt piegādātājus līdz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nav atrasts vienumam {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Iet uz kursiem
 DocType: Accounts Settings,Show Inclusive Tax In Print,Rādīt iekļaujošu nodokli drukāt
@@ -3803,10 +3824,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ziņojums nosūtīts
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konts ar bērnu mezglu nevar iestatīt kā virsgrāmatā
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts klienta bāzes valūtā"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Summa (Uzņēmējdarbības valūta)
 DocType: Physician,Physician Schedules,Ārstu grafiki
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Kopējā avansa summa nevar būt lielāka par kopējo sankciju summu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Kopējā avansa summa nevar būt lielāka par kopējo sankciju summu
 DocType: Salary Slip,Hour Rate,Stundas likme
 DocType: Stock Settings,Item Naming By,Postenis nosaukšana Līdz
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
@@ -3824,6 +3846,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nav atļauts izmainīt akciju darījumiem, kas vecāki par {0}"
 DocType: BOM,Inspection Required,Inspekcija Nepieciešamais
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Pirms iesniegšanas ievadiet bankas garantijas numuru.
 DocType: Driving License Category,Class,Klase
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Darba uzdevumu nevar izvirzīt pret vienuma veidni
@@ -3834,7 +3857,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Assessment Plan,Program,programma
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 DocType: Serial No,Is Cancelled,Tiek atcelta
 DocType: Student Group,Group Based On,"Grupu, kuras pamatā"
 DocType: Student Group,Group Based On,"Grupu, kuras pamatā"
@@ -3846,9 +3868,10 @@
 DocType: Cheque Print Template,Cheque Height,Čeku augstums
 DocType: Supplier,Supplier Details,Piegādātājs Details
 DocType: Setup Progress,Setup Progress,Iestatīšanas progress
+DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 DocType: Hub Settings,Publish Items to Hub,Publicēt preces Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},No vērtība nedrīkst būt mazāka par to vērtību rindā {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Pārbaudi visu
 ,Issued Items Against Work Order,Izdotie priekšmeti pret darba kārtību
 DocType: Vehicle Log,Invoice Ref,rēķina Ref
@@ -3879,12 +3902,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarifu skaits
 DocType: Work Order Item,Available Qty at WIP Warehouse,Pieejams Daudz pie WIP noliktavā
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prognozēts
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
 DocType: Notification Control,Quotation Message,Piedāvājuma Ziņojums
-DocType: Employee Loan,Employee Loan Application,Darbinieku Loan Application
 DocType: Issue,Opening Date,Atvēršanas datums
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,"Lūdzu, vispirms saglabājiet pacientu"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,"Lūdzu, vispirms saglabājiet pacientu"
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Apmeklētība ir veiksmīgi atzīmēts.
 DocType: Program Enrollment,Public Transport,Sabiedriskais transports
 DocType: Soil Texture,Silt Composition (%),Silta sastāvs (%)
@@ -3903,7 +3925,7 @@
 ,Item Balance (Simple),Preces balanss (vienkāršs)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
 DocType: POS Profile,Write Off Account,Uzrakstiet Off kontu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Parādzīmē amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Parādzīmē amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Atlaide Summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
@@ -3926,6 +3948,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
 DocType: Assessment Plan,Assessment Plan,novērtējums Plan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reversās žurnāla ieraksts
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klients {0} ir izveidots.
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Pašlaik nav nevienas noliktavas noliktavā
@@ -3939,14 +3962,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,maksājumu Atsauces
 DocType: C-Form,C-FORM-,C-veidošanos veļas
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Intervālu intervāla intervāla skaits, piemēram, ja intervāls ir &quot;Dienas&quot; un norēķinu intervāla grāfs ir 3, rēķini tiks ģenerēti ik pēc 3 dienām"
 DocType: Vehicle,Insurance Details,apdrošināšana Details
 DocType: Account,Payable,Maksājams
 DocType: Share Balance,Share Type,Kopīgošanas veids
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ievadiet atmaksas termiņi
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Ievadiet atmaksas termiņi
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Robeža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Jauni klienti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto peļņa%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto peļņa%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Mainīt POS profilu
 DocType: Bank Reconciliation Detail,Clearance Date,Klīrenss Datums
@@ -3956,10 +3980,11 @@
 DocType: Lead,Address Desc,Adrese Dilst
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Puse ir obligāta
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Tika atrastas rindas ar dubultiem izpildes termiņiem citās rindās: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Tika atrastas rindas ar dubultiem izpildes termiņiem citās rindās: {list}
 DocType: Topic,Topic Name,Tēma Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Lūdzu, iestatiet noklusējuma veidni paziņojumam par atstāšanu apstiprinājumā personāla iestatījumos."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Jāizvēlas Vismaz viens pirkšana vai pārdošana
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Izvēlieties darbinieku, lai saņemtu darbinieku iepriekš."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Izvēlieties darbinieku, lai saņemtu darbinieku iepriekš."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,"Lūdzu, izvēlieties derīgu datumu"
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Izvēlieties raksturu jūsu biznesu.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3978,7 +4003,7 @@
 DocType: Asset Movement,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Akciju pārvaldnieks
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Tirdzniecības rēķins {0} izveidots
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
 DocType: C-Form,Total Invoiced Amount,Kopā Rēķinā summa
@@ -3987,7 +4012,7 @@
 DocType: Account,Accumulated Depreciation,uzkrātais nolietojums
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Pastāvīgais vārds
 DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
-DocType: Employee Loan Application,Required by Date,Pieprasa Datums
+DocType: Loan Application,Required by Date,Pieprasa Datums
 DocType: Lead,Lead Owner,Lead Īpašnieks
 DocType: Production Plan,Sales Orders Detail,Pārdošanas pasūtījumu detalizēts apraksts
 DocType: Bin,Requested Quantity,Pieprasītā daudzums
@@ -4000,10 +4025,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Kopā atskaitīšana - Kredīta atmaksas
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Alga Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Vairāki varianti
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Pasludināts
+DocType: Subscription,Trial Period Start Date,Izmēģinājuma perioda sākuma datums
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,"Lūdzu, piesakieties kā citam lietotājam."
@@ -4024,12 +4050,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Biedra vārds
 DocType: Stock Settings,Use Naming Series,Izmantojiet nosaukumu sēriju
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,abonementā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 DocType: Membership,Payment Details,Maksājumu informācija
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Apstāšanās darba kārtību nevar atcelt, vispirms atceļiet to, lai atceltu"
 DocType: Asset,Journal Entry for Scrap,Journal Entry metāllūžņos
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
@@ -4049,6 +4074,7 @@
 DocType: Land Unit,Land Unit,Zemes vienība
 ,Purchase Analytics,Pirkuma Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Piegāde Note postenis
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Trūkst pašreizējā rēķina {0}
 DocType: Asset Maintenance Log,Task,Uzdevums
 DocType: Purchase Taxes and Charges,Reference Row #,Atsauce Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
@@ -4061,7 +4087,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / zaudējumu aprēķins
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Darbinieku un apmeklējums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Aizpildiet formu un saglabājiet to
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Aizpildiet formu un saglabājiet to
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forums
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktiskais Daudzums noliktavā
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktiskais Daudzums noliktavā
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard pārdošanas kurss
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
 DocType: Cash Flow Mapper,Section Name,Sadaļas nosaukums
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Pārkārtot Daudz
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Pārkārtot Daudz
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Pašreizējās vakanču
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Uzrakstiet Off
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Rindā tiek atjaunināta pēdējā cena visās materiālu bilancēs. Tas var aizņemt dažas minūtes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nosaukums jaunu kontu. Piezīme: Lūdzu, nav izveidot klientu kontus un piegādātājiem"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Valsts gudrs noklusējuma Adrese veidnes
 DocType: Water Analysis,Appearance,Izskats
+DocType: HR Settings,Leave Status Notification Template,Atstāt statusa paziņojuma veidni
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Vid. Pirkšanas cenu saraksts
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Dalībvalsts informācija.
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,"Nav atļauts. Lūdzu, deaktivizējiet pārbaudes veidni"
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
 DocType: Crop Cycle,Linked Land Unit,Saistītā zemes vienība
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Iet uz Lietotājiem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Nederīga GSTIN vai Enter NA par Nereģistrēts
 DocType: Training Event,Seminar,seminārs
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program iestāšanās maksa
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 DocType: Company,Create Chart Of Accounts Based On,"Izveidot kontu plāns, pamatojoties uz"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nevar pārvērst to par nekonfidenciālu. Bērnu uzdevumi pastāv.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
 ,Stock Ageing,Stock Novecošana
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} nepastāv pret studenta pieteikuma {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Noapaļošanas korekcija (uzņēmuma valūta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Laika uzskaites tabula
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partija:
 DocType: Volunteer,Afternoon,Pēcpusdiena
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Cheque Print Template,Scanned Cheque,Skanētie Čeku
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekts {0} jau eksistē
 DocType: Medical Department,Nursing User,Aprūpes lietotājs
 DocType: Plant Analysis,Plant Analysis Criterias,Augu analīzes kritēriji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Pienākumi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Sērijas numurs {0} nepieder partijai {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Pienākumi
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Šīs kotācijas derīguma termiņš ir beidzies.
 DocType: Expense Claim Account,Expense Claim Account,Izdevumu Prasība konts
 DocType: Accounts Settings,Allow Stale Exchange Rates,Atļaut mainīt valūtas kursus
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Make Variants
 DocType: Item,Default BOM,Default BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Kopējā iekasētā summa (izmantojot pārdošanas rēķinus)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debeta piezīme Summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debeta piezīme Summa
 DocType: Project Update,Not Updated,Nav atjaunināts
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Pastāv neatbilstība starp likmi, akciju skaitu un aprēķināto summu"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Kopā Izcila Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
 DocType: Employee Advance,Advance Account,Avansa konts
 DocType: Job Offer,Job Offer Terms,Darba piedāvājumu noteikumi
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobiļu
 DocType: Vehicle,Insurance Company,Apdrošināšanas sabiedrība
 DocType: Asset Category Account,Fixed Asset Account,Pamatlīdzekļa konts
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,mainīgs
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,mainīgs
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,No piegāde piezīme
 DocType: Chapter,Members,Biedri
 DocType: Student,Student Email Address,Student e-pasta adrese
@@ -4226,7 +4253,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Interns
 DocType: Delivery Stop,Address Name,Adrese nosaukums
 DocType: Stock Entry,From BOM,No BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Sadalot {0} vienību no {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Sadalot {0} vienību no {1}
 DocType: Assessment Code,Assessment Code,novērtējums Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
@@ -4234,25 +4261,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
 DocType: Bank Reconciliation Detail,Payment Document,maksājuma dokumentu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,"Kļūda, novērtējot kritēriju formulu"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
+DocType: Subscription,Plans,Plāni
 DocType: Salary Slip,Salary Structure,Algu struktūra
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Jautājums Materiāls
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,"Radot atkārtotu saturu, radās kļūda"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Noliktavai
 DocType: Employee,Offer Date,Piedāvājuma Datums
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citāti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nav Studentu grupas izveidots.
 DocType: Purchase Invoice Item,Serial No,Sērijas Nr
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Ikmēneša atmaksa summa nedrīkst būt lielāka par aizdevuma summu
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Ikmēneša atmaksa summa nedrīkst būt lielāka par aizdevuma summu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rinda # {0}: sagaidāmais piegādes datums nevar būt pirms pirkuma pasūtījuma datuma
 DocType: Purchase Invoice,Print Language,print valoda
 DocType: Salary Slip,Total Working Hours,Kopējais darba laiks
 DocType: Sales Invoice,Customer PO Details,Klienta PO sīkāk
-DocType: Subscription,Next Schedule Date,Nākamā grafika datums
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Pagaidu atvēršanas konts
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Ievadiet vērtība ir pozitīva
@@ -4280,11 +4306,11 @@
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,No un uz datumiem nepieciešamo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nav minētu kritēriju darbinieku
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
 DocType: Hotel Settings,Default Customer,Noklusējuma klients
 DocType: Assessment Plan,Supervisor Name,uzraudzītājs Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nevar apstiprināt, vai tikšanās ir izveidota tajā pašā dienā"
@@ -4309,16 +4335,16 @@
 DocType: Journal Entry Account,Employee Advance,Darbinieku avanss
 DocType: Payroll Entry,Payroll Frequency,Algas Frequency
 DocType: Lab Test Template,Sensitivity,Jutīgums
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Izejviela
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Augi un mehānika
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Augi un mehānika
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ikdienas darba kopsavilkums Settings
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,"Lūdzu, ievadiet Reqd pēc datuma"
 DocType: Payment Entry,Internal Transfer,iekšējā Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Apkopes uzdevumi
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
 DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par virsgrāmatā"
@@ -4326,14 +4352,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integrācija
 DocType: Crop Cycle,Detected Disease,Noteiktas slimības
 ,Produced,Saražotā
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Atmaksas sākuma datums nevar būt pirms Izmaksāšanas datuma.
 DocType: Item,Item Code for Suppliers,Prece kodekss Piegādātājiem
 DocType: Issue,Raised By (Email),Raised Ar (e-pasts)
 DocType: Training Event,Trainer Name,treneris Name
 DocType: Mode of Payment,General,Vispārīgs
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Pēdējais paziņojums
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Pēdējais paziņojums
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Sērijas Nos Nepieciešamais par sērijveida postenī {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Sērijas Nos Nepieciešamais par sērijveida postenī {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Maksājumi ar rēķini
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
@@ -4347,7 +4374,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} pusdienā Atstājiet {1}
 DocType: Production Plan,Get Material Request,Iegūt Material pieprasījums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Pasta izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Pasta izdevumi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 ,Item Variant Details,Vienuma variantu detaļas
@@ -4358,9 +4385,9 @@
 DocType: Drug Prescription,Hour,Stunda
 DocType: Restaurant Order Entry,Last Sales Invoice,Pēdējais pārdošanas rēķins
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},"Lūdzu, izvēlieties Qty pret vienumu {0}"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
 DocType: Lead,Lead Type,Potenciālā klienta Veids (Type)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 DocType: Company,Monthly Sales Target,Ikmēneša pārdošanas mērķis
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
@@ -4368,7 +4395,7 @@
 DocType: Item,Default Material Request Type,Default Materiāls Pieprasījuma veids
 DocType: Supplier Scorecard,Evaluation Period,Novērtēšanas periods
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nezināms
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Darba uzdevums nav izveidots
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Darba uzdevums nav izveidots
 DocType: Shipping Rule,Shipping Rule Conditions,Piegāde pants Nosacījumi
 DocType: Purchase Invoice,Export Type,Eksporta veids
 DocType: Salary Slip Loan,Salary Slip Loan,Algas slīdēšanas kredīts
@@ -4384,8 +4411,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Kopsavilkums par rēķinu atvēršanu
 DocType: Education Settings,Education Manager,Izglītības vadītājs
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,"Minimālais garums starp katru augu laukā, lai iegūtu optimālu augšanu"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Iepildīja Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, nevis izmantot Fondu Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Iepildīja Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, nevis izmantot Fondu Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Iepildīja Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, nevis izmantot Fondu Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Iepildīja Prece {0} nevar atjaunināt, izmantojot Fondu samierināšanās, nevis izmantot Fondu Entry"
 DocType: Quality Inspection,Report Date,Ziņojums Datums
 DocType: Student,Middle Name,Otrais vārds
 DocType: C-Form,Invoices,Rēķini
@@ -4418,20 +4445,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,kvīts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,kvīts
 ,Sales Register,Sales Reģistrēties
 DocType: Daily Work Summary Group,Send Emails At,Sūtīt e-pastus
 DocType: Quotation,Quotation Lost Reason,Piedāvājuma Zaudējuma Iemesls
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Veidlapas skats
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Izdevumu apstiprinātājs obligāts izdevumu pieprasījumā
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Pievienojiet lietotājus savai organizācijai, izņemot sevi."
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,"No klientiem, kuri vēl!"
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naudas plūsmas pārskats
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nav izveidots neviens materiāls pieprasījums
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
@@ -4454,11 +4482,12 @@
 DocType: Vehicle,Chassis No,šasijas Nr
 DocType: Payment Request,Initiated,Uzsāka
 DocType: Production Plan Item,Planned Start Date,Plānotais sākuma datums
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,"Lūdzu, izvēlieties BOM"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,"Lūdzu, izvēlieties BOM"
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Izmantojis ITC integrēto nodokli
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
+DocType: Bank Guarantee,Clauses and Conditions,Klauzulas un nosacījumi
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
 DocType: Project Task,View Timesheet,Skatīt laika kontrolsaraksts
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Beigu datumam jābūt lielākam par sākuma datumu
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
 DocType: Leave Allocation,New Leaves Allocated,Jaunas lapas Piešķirtie
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
@@ -4472,9 +4501,10 @@
 DocType: Patient,Alcohol Current Use,Alkohola pašreizējā lietošana
 DocType: Student Admission Program,Student Admission Program,Studentu uzņemšanas programma
 DocType: Payment Entry,Account Paid To,Konts Paid To
+DocType: Subscription Settings,Grace Period,Labvēlības periods
 DocType: Item Alternative,Alternative Item Name,Alternatīva priekšmeta nosaukums
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Nevarēja iesniegt algas slīdni <br> \ Iespējamie iemesli: <br> \ 1. Neto samaksa ir mazāka par 0. <br> \ 2. Uzņēmuma e-pasta adrese, kas norādīta darbinieka kapteiņā, nav derīga. <br>"
@@ -4484,7 +4514,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžets konta {1} pret {2} {3} ir {4}. Tas pārsniegs līdz {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Daudz
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,un unchecked invalīdiem
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Dokumenta numurs ir obligāts
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 DocType: Student Sibling,Student ID,Student ID
@@ -4496,14 +4525,16 @@
 DocType: Complaint,Complaint,Sūdzība
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Veikt atmaksu ierakstu
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Visi departamenti
 DocType: Patient,Alcohol Past Use,Alkohola iepriekšējā lietošana
 DocType: Fertilizer Content,Fertilizer Content,Mēslošanas līdzekļa saturs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problēma / iestrēdzis
 DocType: Tax Rule,Billing State,Norēķinu Valsts
 DocType: Share Transfer,Transfer,Nodošana
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Pirms šī Pārdošanas pasūtījuma anulēšanas ir jāanulē darba kārtība {0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
@@ -4527,10 +4558,11 @@
 DocType: Cheque Print Template,Message to show,"Ziņa, lai parādītu"
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Mazumtirdzniecība
 DocType: Student Attendance,Absent,Nekonstatē
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produkta Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Nevar atrast rezultātu, sākot ar {0}. Jums ir jābūt pastāvīgiem punktiem, kas attiecas no 0 līdz 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
+DocType: Subscription,Current Invoice Start Date,Pašreizējā rēķina sākuma datums
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: nu debeta vai kredīta summa ir nepieciešama {2}
 DocType: GL Entry,Remarks,Piezīmes
@@ -4540,11 +4572,13 @@
 DocType: Task,Parent Task,Mātes uzdevums
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,padarīt Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Drukas un Kancelejas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Drukas un Kancelejas
 DocType: Stock Settings,Show Barcode Field,Rādīt Svītrkoda Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Alga jau sagatavotas laika posmā no {0} un {1}, atstājiet piemērošanas periods nevar būt starp šo datumu diapazonā."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Alga jau sagatavotas laika posmā no {0} un {1}, atstājiet piemērošanas periods nevar būt starp šo datumu diapazonā."
+DocType: Fiscal Year,Auto Created,Auto izveidots
 DocType: Chapter Member,Leave Reason,Atstāt iemeslu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Rēķins {0} vairs nepastāv
 DocType: Guardian Interest,Guardian Interest,Guardian Procentu
 DocType: Volunteer,Availability,Pieejamība
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Iestatiet POS rēķinu noklusējuma vērtības
@@ -4553,14 +4587,13 @@
 DocType: Timesheet,Employee Detail,Darbinieku Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
 DocType: Lab Prescription,Test Code,Pārbaudes kods
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Iestatījumi mājas lapā mājas lapā
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ nav atļauts {0} dēļ rezultātu rādītāja stāvokļa {1}
 DocType: Job Offer,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Iepriekš
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Kopā summa {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Kopā summa {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Pieminēt ja nestandarta jāmaksā konts
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Lūdzu, izvēlieties novērtējuma grupu, kas nav &quot;All novērtēšanas grupas&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rinda {0}: priekšmeta {1} ir nepieciešams izmaksu centrs.
@@ -4571,7 +4604,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Ūdens analīze
 DocType: Chapter,Region,Apgabals
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
 DocType: Holiday List,Weekly Off,Weekly Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Pārlādēt saistīto analīzi
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par piemēram, 2012.gada 2012-13"
@@ -4587,7 +4620,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Izmaksas metāllūžņos aktīva
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
 DocType: Vehicle,Policy No,politikas Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 DocType: Asset,Straight Line,Taisne
 DocType: Project User,Project User,projekta User
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,sadalīt
@@ -4627,21 +4660,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Ceļš
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nevar pārvērst izmaksu centru, lai grāmatai, jo tā ir bērnu mezgliem"
 DocType: Production Plan,Total Planned Qty,Kopējais plānotais daudzums
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,atklāšanas Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,atklāšanas Value
 DocType: Salary Detail,Formula,Formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Sērijas #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Sērijas #
 DocType: Lab Test Template,Lab Test Template,Lab testēšanas veidne
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Pārdošanas konts
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Pārdošanas konts
 DocType: Purchase Invoice Item,Total Weight,Kopējais svars
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisijas apjoms
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisijas apjoms
 DocType: Job Offer Term,Value / Description,Vērtība / Apraksts
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
 DocType: Tax Rule,Billing Country,Norēķinu Country
 DocType: Purchase Order Item,Expected Delivery Date,Gaidīts Piegāde Datums
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorāna pasūtījuma ieraksts
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
 DocType: Asset Maintenance Task,Assign To Name,Piešķirt nosaukumam
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Izklaides izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Izklaides izdevumi
 DocType: Hub Settings,Enabled Users,Iespējotie lietotāji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Padarīt Material pieprasījums
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Atvērt Preci {0}
@@ -4654,24 +4687,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Pieteikumi atvaļinājuma.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 DocType: Vehicle,Last Carbon Check,Pēdējais Carbon pārbaude
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridiskie izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Juridiskie izdevumi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Lūdzu, izvēlieties daudzums uz rindu"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Veikt pārdošanas un pirkšanas rēķinu atvēršanu
 DocType: Purchase Invoice,Posting Time,Norīkošanu laiks
 DocType: Timesheet,% Amount Billed,% Summa Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefona izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefona izdevumi
 DocType: Sales Partner,Logo,Logotips
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Atzīmējiet šo, ja vēlaties, lai piespiestu lietotājam izvēlēties vairākus pirms saglabāšanas. Nebūs noklusējuma, ja jūs pārbaudīt šo."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
 DocType: Email Digest,Open Notifications,Atvērt Paziņojumus
 DocType: Payment Entry,Difference Amount (Company Currency),Starpība Summa (Company valūta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Tiešie izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Tiešie izdevumi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Ceļa izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pievienojiet pielāgoto lauku abonementu doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Purchase Receipt Item,Sample Quantity,Parauga daudzums
+DocType: Bank Guarantee,Name of Beneficiary,Saņēmēja nosaukums
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automātiski atjaunināt BOM izmaksas, izmantojot plānotāju, pamatojoties uz jaunāko novērtēšanas likmi / cenrāžu likmi / izejvielu pēdējo pirkumu likmi."
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
@@ -4683,14 +4716,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probācija
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,algu komponenti
 DocType: Program Enrollment Tool,New Academic Year,Jaunā mācību gada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Atgriešana / kredītu piezīmi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Atgriešana / kredītu piezīmi
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Kopējais samaksāto summu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Kopējais samaksāto summu
 DocType: GST Settings,B2C Limit,B2C robeža
 DocType: Work Order Item,Transferred Qty,Nodota Daudz
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigācija
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Plānošana
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Plānošana
 DocType: Share Balance,Issued,Izdots
+DocType: Loan,Repayment Start Date,Atmaksas sākuma datums
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentu aktivitāte
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Piegādātājs Id
 DocType: Payment Request,Payment Gateway Details,Maksājumu Gateway Details
@@ -4703,10 +4737,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Veids lapām, piemēram, gadījuma, slimības uc"
 DocType: Email Digest,Send regular summary reports via Email.,Regulāri jānosūta kopsavilkuma ziņojumu pa e-pastu.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
 DocType: Assessment Result,Student Name,Studenta vārds
 DocType: Brand,Item Manager,Prece vadītājs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Algas Kreditoru
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Algas Kreditoru
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
 DocType: Plant Analysis,Collection Datetime,Kolekcija Datetime
 DocType: Work Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
@@ -4716,9 +4750,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Lietotāja {0} nepastāv
 DocType: Payment Term,Day(s) after invoice date,Diena (-as) pēc rēķina datuma
 DocType: Payment Schedule,Payment Schedule,Maksājumu grafiks
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Saīsinājums
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Maksājumu Entry jau eksistē
+DocType: Subscription,Trial Period End Date,Pārbaudes beigu datums
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Algu veidni meistars.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patoloģija
@@ -4735,9 +4769,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Visas klientu grupas
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,uzkrātais Mēneša
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
@@ -4746,14 +4780,15 @@
 DocType: Lab Prescription,Test Created,Testēts izveidots
 DocType: Healthcare Settings,Custom Signature in Print,Pielāgota paraksta drukāšana
 DocType: Account,Temporary,Pagaidu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Klientu LPO Nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Klientu LPO Nr.
 DocType: Program,Courses,kursi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretārs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretārs
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ja atslēgt, &quot;ar vārdiem&quot; laukā nebūs redzams jebkurā darījumā"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Šī darbība apturēs norēķinus nākotnē. Vai tiešām vēlaties atcelt šo abonementu?
 DocType: Serial No,Distinct unit of an Item,Atsevišķu vienību posteņa
 DocType: Supplier Scorecard Criteria,Criteria Name,Kritērija nosaukums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Lūdzu noteikt Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Lūdzu noteikt Company
 DocType: Pricing Rule,Buying,Iepirkumi
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Slimības un mēslojumi
 DocType: HR Settings,Employee Records to be created by,"Darbinieku Records, kas rada"
@@ -4762,18 +4797,18 @@
 DocType: POS Profile,Apply Discount On,Piesakies atlaide
 DocType: Member,Membership Type,Dalības veids
 ,Reqd By Date,Reqd pēc datuma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditori
 DocType: Assessment Plan,Assessment Name,novērtējums Name
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Parādiet PDC drukā
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Parādiet PDC drukā
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Sērijas numurs ir obligāta
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postenis Wise Nodokļu Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Darba piedāvājums
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute saīsinājums
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Piegādātāja Piedāvājums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Piegādātāja Piedāvājums
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
@@ -4791,7 +4826,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Kopējās dispersijas
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ja ieslēgts, sistēma būs pēc grāmatvedības ierakstus inventāru automātiski."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokeru
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Apmeklējumu par darbiniekam {0} jau ir atzīmēts par šo dienu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Apmeklējumu par darbiniekam {0} jau ir atzīmēts par šo dienu
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","minūtēs Atjaunināts izmantojot 'Time Ieiet """
 DocType: Customer,From Lead,No Lead
@@ -4802,6 +4837,7 @@
 DocType: Lab Test,Approved Date,Apstiprināts datums
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
+DocType: Subscriber,Subscriber Name,Abonenta nosaukums
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Update Tool,Replace,Aizstāt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nav produktu atrasts.
@@ -4811,19 +4847,18 @@
 DocType: Request for Quotation Item,Project Name,Projekta nosaukums
 DocType: Customer,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Izvēlēties procentu ienākumu kontu darbinieku aizdevumā {0}
 DocType: Work Order,Required Items,Nepieciešamie Items
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Cilvēkresursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksājumu Samierināšanās Maksājumu
 DocType: Disease,Treatment Task,Ārstēšanas uzdevums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Nodokļu Aktīvi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Nodokļu Aktīvi
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,BOM kas tiks aizstāti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektroniskās iekārtas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektroniskās iekārtas
 DocType: Asset,Maintenance Required,Nepieciešama tehniskā apkope
 DocType: Account,Debit,Debets
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
@@ -4832,7 +4867,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Izcila Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Noteikt mērķus Prece Group-gudrs šai Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Iesaldēt Krājumi Vecāki par [dienas]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ir obligāta Pamatlīdzekļu pirkšana / pārdošana
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ir obligāta Pamatlīdzekļu pirkšana / pārdošana
 DocType: Asset Maintenance Team,Maintenance Team Name,Tehniskās apkopes komandas nosaukums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ja divi vai vairāki Cenu novērtēšanas noteikumi ir balstīti uz iepriekš minētajiem nosacījumiem, prioritāte tiek piemērota. Prioritāte ir skaitlis no 0 lìdz 20, kamēr noklusējuma vērtība ir nulle (tukšs). Lielāks skaitlis nozīmē, ka tas ir prioritāte, ja ir vairāki cenu veidošanas noteikumi, ar tādiem pašiem nosacījumiem."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Klients ir obligāts, ja izvēles iespēja ir &quot;Iespēja no&quot;"
@@ -4842,19 +4877,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Veidi Izdevumu prasību.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Pārdošanas likmi postenī {0} ir zemāks nekā tā {1}. Pārdošanas kursa vajadzētu būt atleast {2}
-DocType: Item,Taxes,Nodokļi
+DocType: Subscription,Taxes,Nodokļi
 DocType: Purchase Invoice,capital goods,ražošanas līdzekļi
 DocType: Purchase Invoice Item,Weight Per Unit,Svars vienībā
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Maksas un nav sniegusi
 DocType: Project,Default Cost Center,Default Izmaksu centrs
-DocType: Bank Guarantee,End Date,Beigu datums
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,akciju Darījumi
 DocType: Budget,Budget Accounts,budžeta konti
 DocType: Employee,Internal Work History,Iekšējā Work Vēsture
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Uzkrātais nolietojums Summa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Piegādātāju veiktspējas karšu mainīgais
-DocType: Employee Loan,Fully Disbursed,Pilnībā Izmaksātā
 DocType: Employee Advance,Due Advance Amount,Pienācīgs avansa apjoms
 DocType: Maintenance Visit,Customer Feedback,Klientu Atsauksmes
 DocType: Account,Expense,Izdevumi
@@ -4878,7 +4911,7 @@
 ,Employee Information,Darbinieku informācija
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
 DocType: Quality Inspection,Incoming,Ienākošs
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Tiek veidoti noklusējuma nodokļu veidnes pārdošanai un pirkšanai.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Novērtējuma rezultātu reģistrs {0} jau eksistē.
@@ -4886,7 +4919,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Lūdzu noteikt Company filtrēt tukšu, ja Group By ir &quot;Uzņēmuma&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Norīkošanu datums nevar būt nākotnes datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,lai radītu atkārtotu
 DocType: Stock Entry,Target Warehouse Address,Mērķa noliktavas adrese
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Beigu diena
@@ -4911,11 +4943,10 @@
 DocType: Material Request,% Ordered,% Pasūtīts
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Par Kurss balstās studentu grupas, protams, būs jāapstiprina par katru students no uzņemtajiem kursiem programmā Uzņemšanas."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Gabaldarbs
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Pirkšana Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Share Balance,From No,No Nr
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Jauns ziņojums no {sender}
 DocType: Customer,Customer Primary Address,Klienta primārā adrese
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biļeteni
 DocType: Drug Prescription,Description/Strength,Apraksts / izturība
@@ -4924,22 +4955,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Same postenis ir ievadīts vairākas reizes
 DocType: Department,Leave Block List,Atstājiet Block saraksts
 DocType: Purchase Invoice,Tax ID,Nodokļu ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Postenis {0} nav setup Serial Nr. Kolonnas jābūt tukšs
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Postenis {0} nav setup Serial Nr. Kolonnas jābūt tukšs
 DocType: Accounts Settings,Accounts Settings,Konti Settings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,apstiprināt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatēts adrese {0}, lūdzu, labojiet, lai turpinātu."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatēts adrese {0}, lūdzu, labojiet, lai turpinātu."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Jaunas Konta numurs, tas tiks iekļauts konta nosaukumā kā priedēklis"
 DocType: Maintenance Team Member,Team Member,Komandas biedrs
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nav iesniegts rezultāts
 DocType: Customer,Sales Partner and Commission,Pārdošanas Partner un Komisija
-DocType: Employee Loan,Rate of Interest (%) / Year,Procentu likme (%) / gads
+DocType: Loan,Rate of Interest (%) / Year,Procentu likme (%) / gads
 ,Project Quantity,projekta daudzums
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Opportunity,To Discuss,Apspriediet
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,"{0} vienības {1} nepieciešama {2}, lai pabeigtu šo darījumu."
 DocType: Loan Type,Rate of Interest (%) Yearly,Procentu likme (%) Gada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Pagaidu konti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Melns
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Pagaidu konti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Melns
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion postenis
 DocType: Shareholder,Contact List,Kontaktpersonu saraksts
 DocType: Account,Auditor,Revidents
@@ -4947,16 +4978,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} preces ražotas
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Uzzināt vairāk
 DocType: Cheque Print Template,Distance from top edge,Attālums no augšējās malas
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cenrādis {0} ir invalīds vai neeksistē
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cenrādis {0} ir invalīds vai neeksistē
 DocType: Purchase Invoice,Return,Atgriešanās
 DocType: Pricing Rule,Disable,Atslēgt
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,"maksāšanas režīmā ir nepieciešams, lai veiktu maksājumu"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,"maksāšanas režīmā ir nepieciešams, lai veiktu maksājumu"
 DocType: Project Task,Pending Review,Kamēr apskats
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Rediģējiet pilnā lapā, lai iegūtu vairāk iespēju, piemēram, aktīvus, sērijas numurus, sērijas utt."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Tikšanās un konsultācijas
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nav uzņemts Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nevar tikt izmesta, jo tas jau ir {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Obligāti jāpārbauda
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Obligāti jāpārbauda
 DocType: Task,Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Nekonstatē
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Neizdevās iestatīt uzņēmumu
@@ -4968,7 +4999,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,maksa Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Pievienot preces no
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Pievienot preces no
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Kultūraugiem un zemēm
 DocType: Cheque Print Template,Regular,regulārs
 DocType: Fertilizer,Density (if liquid),Blīvums (ja šķidrums)
@@ -4993,24 +5024,26 @@
 DocType: Payment Entry,Paid Amount,Samaksāta summa
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Izpētiet pārdošanas ciklu
 DocType: Assessment Plan,Supervisor,uzraugs
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Uzglabāšanas krājumu ievadīšana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Uzglabāšanas krājumu ievadīšana
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 ,Work Order Stock Report,Darbu pasūtījumu akciju pārskats
+DocType: Purchase Receipt,Auto Repeat Detail,Automātiska atkārtošanas detaļa
 DocType: Assessment Result Tool,Assessment Result Tool,Novērtējums rezultāts Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kā uzraudzītājs
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Ieteikt kategoriju
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Metāllūžņu punkts
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kvalitātes vadība
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kvalitātes vadība
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Prece {0} ir atspējota
 DocType: Project,Total Billable Amount (via Timesheets),Kopējā apmaksājamā summa (izmantojot laika kontrolsaraksts)
 DocType: Agriculture Task,Previous Business Day,Iepriekšējā darba diena
-DocType: Employee Loan,Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu
+DocType: Loan,Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu
 DocType: Employee,Health Insurance No,Veselības apdrošināšanas Nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredītu piezīme Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredītu piezīme Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Kopējā apliekamā summa
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
 DocType: Opening Invoice Creation Tool,Purchase,Pirkums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilance Daudz
@@ -5021,16 +5054,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} uz {1}
 DocType: Healthcare Settings,Valid number of days,Derīgs dienu skaits
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Izmaksu centri
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Restartēt abonementu
 DocType: Land Unit,Linked Plant Analysis,Saistītā augu analīze
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Likmi, pēc kuras piegādātāja valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: hronometrāžu konflikti ar kārtas {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Atļaut Zero vērtēšanas likme
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Atļaut Zero vērtēšanas likme
+DocType: Bank Guarantee,Receiving,Saņemšana
 DocType: Training Event Employee,Invited,uzaicināts
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Vairāki aktīvās Algu Structures atrasti darbiniekam {0} par dotajiem datumiem
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway konti.
 DocType: Employee,Employment Type,Nodarbinātības Type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Pamatlīdzekļi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Pamatlīdzekļi
 DocType: Payment Entry,Set Exchange Gain / Loss,Uzstādīt Exchange Peļņa / zaudējumi
 ,GST Purchase Register,GST iegāde Reģistrēties
 ,Cash Flow,Naudas plūsma
@@ -5051,9 +5086,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Visu akciju darījumu saraksts
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp skaits
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp skaits
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Pievienoju {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Ir jānosaka gan izmēģinājuma perioda sākuma datums, gan izmēģinājuma perioda beigu datums"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Vidējā likme
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksājuma grafikam kopējam maksājuma summai jābūt vienādai ar Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksājuma grafikam kopējam maksājuma summai jābūt vienādai ar Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Plānu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
 DocType: Authorization Rule,Customer / Item Name,Klients / vienības nosaukums
@@ -5083,6 +5119,7 @@
 DocType: Work Order,Warehouses,Noliktavas
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktīvu nevar nodot
 DocType: Hotel Room Pricing,Hotel Room Pricing,Viesnīcas istabu cenas
+DocType: Subscription,Days Until Due,Dienas līdz kavēšanos
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Šis postenis ir variants {0} (veidnes).
 DocType: Workstation,per hour,stundā
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
@@ -5091,13 +5128,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Par Partijas balstīta studentu grupas, tad Studentu Partijas tiks apstiprināts katram studentam no Programmas Uzņemšanas."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Sadale
+DocType: Journal Entry Account,Loan,Aizdevums
 DocType: Expense Claim Advance,Expense Claim Advance,Izdevumu pieprasīšanas avanss
 DocType: Lab Test,Report Preference,Ziņojuma preferences
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informācija par brīvprātīgo.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projekta vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projekta vadītājs
 ,Quoted Item Comparison,Citēts Prece salīdzinājums
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},"Pārklāšanās, vērtējot no {0} līdz {1}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Nosūtīšana
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Neto aktīvu vērtības, kā uz"
 DocType: Crop,Produce,Ražot
@@ -5107,7 +5145,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materiāla patēriņš ražošanai
 DocType: Item Alternative,Alternative Item Code,Alternatīvās vienības kods
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Izvēlieties preces Rūpniecība
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Izvēlieties preces Rūpniecība
 DocType: Delivery Stop,Delivery Stop,Piegādes apturēšana
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
 DocType: Item,Material Issue,Materiāls Issue
@@ -5117,15 +5155,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
 DocType: BOM,Show Items,Rādīt preces
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,No laiks nedrīkst būt lielāks par uz laiku.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vai vēlaties paziņot visiem klientiem pa e-pastu?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vai vēlaties paziņot visiem klientiem pa e-pastu?
+DocType: Subscription Plan,Billing Interval,Norēķinu intervāls
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Turpināt
 DocType: Hub Settings,Hub Username,Huba lietotājvārds
 DocType: Salary Detail,Component,komponents
 DocType: Assessment Criteria,Assessment Criteria Group,Vērtēšanas kritēriji Group
 DocType: Healthcare Settings,Patient Name By,Pacienta nosaukums līdz
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Uzkrāšanas žurnāls Ieraksts algas no {0} līdz {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Uzkrāšanas žurnāls Ieraksts algas no {0} līdz {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
 DocType: Warehouse,Warehouse Name,Noliktavas nosaukums
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
@@ -5139,23 +5177,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Šeit jūs varat saglabāt augstumu, svaru, alerģijas, medicīnas problēmas utt"
 DocType: Leave Block List,Applies to Company,Attiecas uz Company
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
-DocType: Employee Loan,Disbursement Date,izmaksu datums
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Saņēmēji&quot; nav norādīti
+DocType: Loan,Disbursement Date,izmaksu datums
 DocType: BOM Update Tool,Update latest price in all BOMs,Atjauniniet jaunāko cenu visās BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicīniskais ieraksts
 DocType: Vehicle,Vehicle,transporta līdzeklis
 DocType: Purchase Invoice,In Words,In Words
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Pirms iesniegšanas ievadiet bankas vai kredītiestādes nosaukumu.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} jāiesniedz
 DocType: POS Profile,Item Groups,postenis Grupas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Šodien ir {0} 's dzimšanas diena!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Šodien ir {0} 's dzimšanas diena!
 DocType: Sales Order Item,For Production,Par ražošanu
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Lūdzu, pievienojiet pagaidu atvēršanas kontu kontu diagrammā"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Lūdzu, pievienojiet pagaidu atvēršanas kontu kontu diagrammā"
 DocType: Customer,Customer Primary Contact,Klienta primārā kontaktinformācija
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Perioda noslēguma žurnāls
 DocType: Project Task,View Task,Skatīt Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Bankas garantijas veids
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Rēķina daļa
 ,Asset Depreciations and Balances,Aktīvu vērtības kritumu un Svari
@@ -5166,9 +5205,8 @@
 DocType: Production Plan,Include Subcontracted Items,Iekļaujiet apakšuzņēmuma priekšmetus
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,pievienoties
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Variantu īpašības nevar mainīt pēc akciju pārveduma. Lai to paveiktu, jums būs jāveic jauns punkts."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
-DocType: Employee Loan,Repay from Salary,Atmaksāt no algas
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+DocType: Loan,Repay from Salary,Atmaksāt no algas
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
 DocType: Salary Slip,Salary Slip,Alga Slip
@@ -5192,11 +5230,11 @@
 DocType: Employee Education,Employee Education,Darbinieku izglītība
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dublikāts postenis grupa atrodama postenī grupas tabulas
 DocType: Land Unit,Parent Land Unit,Vecāku zemes vienība
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
 DocType: Fertilizer,Fertilizer Name,Mēslojuma nosaukums
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Cash Flow Mapping Accounts,Account,Konts
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
 ,Requested Items To Be Transferred,Pieprasīto pozīcijas jāpārskaita
 DocType: Expense Claim,Vehicle Log,servisa
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Drudzis (temp&gt; 38.5 ° C / 101.3 ° F vai ilgstoša temperatūra&gt; 38 ° C / 100.4 ° F)
@@ -5237,24 +5275,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
 DocType: Asset Maintenance,Manufacturing User,Manufacturing User
 DocType: Purchase Invoice,Raw Materials Supplied,Izejvielas Kopā
-DocType: C-Form,Series,Dokumenta numurs
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Cenrādi {0} valūtā jābūt {1} vai {2}
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
 DocType: Soil Texture,Ternary Plot,Trīs gadi
 DocType: Item Group,Item Classification,Postenis klasifikācija
 DocType: Driver,License Number,Licences numurs
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Biznesa attīstības vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Biznesa attīstības vadītājs
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Uzturēšana Vizītes mērķis
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Rēķina pacientu reģistrācija
 DocType: Crop,Period,Periods
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,General Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Darbinieku {0} atvaļinājumā {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Darbinieku {0} atvaļinājumā {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Skatīt Leads
 DocType: Program Enrollment Tool,New Program,jaunā programma
 DocType: Item Attribute Value,Attribute Value,Atribūta vērtība
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 DocType: Salary Detail,Salary Detail,alga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
 DocType: Appointment Type,Physician,Ārsts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultācijas
@@ -5262,15 +5299,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nevar būt lielāks par plānoto daudzumu ({2}) darba kārtībā {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet for ražošanā.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Starpsumma
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Variantu īpašības nevar mainīt pēc akciju darījuma. Lai to paveiktu, jums būs jāveic jauns punkts."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA mandāts
 DocType: Physician,Charges,Maksas
 DocType: Production Plan,Get Items For Work Order,Iegūstiet preces par darba kārtību
 DocType: Salary Detail,Default Amount,Default Summa
 DocType: Lab Test Template,Descriptive,Aprakstošs
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Noliktava nav atrasts sistēmā
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Noliktava nav atrasts sistēmā
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Šī mēneša kopsavilkums
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitātes pārbaudes Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Iestatiet pārdošanas mērķi, kuru vēlaties sasniegt jūsu uzņēmumam."
 ,Project wise Stock Tracking,Projekts gudrs Stock izsekošana
@@ -5298,11 +5336,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Neizdevās izveidot vietni
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Saglabāto krājumu ieraksts jau ir izveidots vai parauga daudzums nav norādīts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Saglabāto krājumu ieraksts jau ir izveidots vai parauga daudzums nav norādīts
 DocType: Program,Program Abbreviation,Program saīsinājums
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
-DocType: Bank Guarantee,Start Date,Sākuma datums
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Piešķirt atstāj uz laiku.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki un noguldījumi nepareizi noskaidroti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
@@ -5317,11 +5354,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Stundas
 DocType: Project,Expected Start Date,"Paredzams, sākuma datums"
 DocType: Purchase Invoice,04-Correction in Invoice,04-korekcija rēķinā
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Darba pasūtījums jau ir izveidots visiem vienumiem ar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Darba pasūtījums jau ir izveidots visiem vienumiem ar BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variantu detalizētās informācijas pārskats
 DocType: Setup Progress Action,Setup Progress Action,Uzstādīšanas progresa darbība
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Pircēju cenu saraksts
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Pircēju cenu saraksts
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Noņemt objektu, ja maksa nav piemērojama šim postenim"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Atcelt abonementu
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,"Lūdzu, atlasiet uzturēšanas statusu kā pabeigtu vai noņemiet pabeigšanas datumu"
 DocType: Supplier,Default Payment Terms Template,Noklusējuma maksājuma nosacījumu veidne
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Darījuma valūta jābūt tāds pats kā maksājumu Gateway valūtu
@@ -5332,7 +5370,6 @@
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Darbība ja uzkrātie ikmēneša budžets pārsniegts
-DocType: Subscription,Submit on creation,Iesniegt radīšanas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valūta {0} ir {1}
 DocType: Asset,Disposal Date,Atbrīvošanās datums
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pastu tiks nosūtīts visiem Active uzņēmuma darbiniekiem tajā konkrētajā stundā, ja viņiem nav brīvdienu. Atbilžu kopsavilkums tiks nosūtīts pusnaktī."
@@ -5351,6 +5388,7 @@
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Cheque Print Template,Cheque Print Template,Čeku Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Shēma izmaksu centriem
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Dienu skaits pēc rēķina datuma ir pagājis pirms abonēšanas atcelšanas vai abonēšanas atzīmes par neapmaksātu
 DocType: Lab Test Template,Sample Collection,Paraugu kolekcija
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpasūta
 DocType: Price List,Price List Name,Cenrādis Name
@@ -5359,7 +5397,7 @@
 DocType: Account,Income,Ienākums
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Kaut kas nogāja greizi!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,PPR {0} jau ir iesniegts
 DocType: Supplier Scorecard Scoring Criteria,Score,Score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskālā gads {0} neeksistē
@@ -5379,12 +5417,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} jābūt vērtībai no 0 līdz 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Nākamais nolietojuma datums nevar būt pirms pieejamā datuma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nenodrošināti aizdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max darba stundas pret laika kontrolsaraksts
 DocType: Maintenance Schedule Detail,Scheduled Date,Plānotais datums
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Kopējais apmaksātais Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Kopējais apmaksātais Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Vēstules, kas pārsniedz 160 rakstzīmes tiks sadalīta vairākos ziņas"
 DocType: Purchase Receipt Item,Received and Accepted,Saņemts un pieņemts
 DocType: Hub Settings,Company and Seller Profile,Uzņēmuma un pārdevēja profils
@@ -5398,10 +5436,9 @@
 DocType: Item,Variant Based On,"Variants, kura pamatā"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Jūsu Piegādātāji
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Lūdzu, labojiet"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
 DocType: Request for Quotation Item,Supplier Part No,Piegādātājs daļas nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonīms
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Saņemts no
 DocType: Lead,Converted,Konvertē
@@ -5415,6 +5452,7 @@
 DocType: Asset,Assets,Aktīvi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
+DocType: Subscription,Current Invoice End Date,Pašreizējā rēķina beigu datums
 DocType: Payment Term,Due Date Based On,Izpildes datums pamatots
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,"Lūdzu, iestatiet noklusējuma klientu grupu un teritoriju Pārdošanas iestatījumos"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} neeksistē
@@ -5422,7 +5460,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Prece: {0} neeksistē sistēmā
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,No žurnāla ierakstiem nav atgriezta atmaksa
 DocType: Payment Reconciliation,From Invoice Date,No rēķina datuma
+DocType: Loan,Disbursed,Izmaksāts
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijas iestatījumi
 DocType: Patient Appointment,Service Unit,Pakalpojumu vienība
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Veiksmīgi iestatīt piegādātāju
@@ -5435,12 +5475,12 @@
 DocType: Share Balance,No of Shares,Akciju skaits
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Atlasiet statusu
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: School House,House Name,Māja vārds
 DocType: Fee Schedule,Total Amount per Student,Kopējā summa uz vienu studentu
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrības
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrības
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Pievienojiet pārējo Jūsu organizācija, kā jūsu lietotājiem. Jūs varat pievienot arī uzaicināt klientus, lai jūsu portāla, pievienojot tos no kontaktiem"
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
 DocType: Grant Application,Requested Amount,Pieprasītā summa
@@ -5450,7 +5490,7 @@
 DocType: Crop Cycle,Detected Diseases,Noteiktas slimības
 DocType: Stock Entry,Default Source Warehouse,Default Source Noliktava
 DocType: Item,Customer Code,Klienta kods
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 DocType: Asset Maintenance Task,Last Completion Date,Pēdējā pabeigšanas datums
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
@@ -5458,9 +5498,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless iestatījumi
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Akciju aktīvi
 DocType: Restaurant,Active Menu,Aktīvā izvēlne
 DocType: Target Detail,Target Qty,Mērķa Daudz
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Pret aizdevumu: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout iestatījumi
 DocType: Student Attendance,Present,Dāvana
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
@@ -5469,9 +5510,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
 DocType: Vehicle Log,Odometer,odometra
 DocType: Production Plan Item,Ordered Qty,Pasūtīts daudzums
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
 DocType: Chapter,Chapter Head,Nodaļas vadītājs
 DocType: Payment Term,Month(s) after the end of the invoice month,Mēnesis (-i) pēc rēķina mēneša beigām
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projekta aktivitāte / uzdevums.
@@ -5479,11 +5520,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Izveidot algas lapas
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab rezultātu datetime nevar būt pirms testēšanas datuma
 DocType: POS Profile,Allow user to edit Discount,Atļaut lietotājam rediģēt atlaidi
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Iegūt klientus no
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Iegūt klientus no
 DocType: Purchase Invoice Item,Include Exploded Items,Iekļaut izpūstas preces
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
 DocType: Shipping Rule,Restrict to Countries,Ierobežot tikai uz valstīm
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
 DocType: Sales Invoice Timesheet,Billing Hours,Norēķinu Stundas
 DocType: Project,Total Sales Amount (via Sales Order),Kopējā pārdošanas summa (ar pārdošanas pasūtījumu)
@@ -5502,6 +5544,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Novērtēšanas vadītājs
 DocType: Payment Entry,Allocate Payment Amount,Piešķirt Maksājuma summu
+DocType: Subscription Plan,Subscription Plan,Abonēšanas plāns
 DocType: Employee External Work History,Salary,Alga
 DocType: Serial No,Delivery Document Type,Piegāde Dokumenta tips
 DocType: Sales Order,Partly Delivered,Daļēji Pasludināts
@@ -5526,9 +5569,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Novecošana Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Stiprums
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Iepriekš iestatīto instalēšana
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Klientam nav izvēlēta piegādes piezīme {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Klientam nav izvēlēta piegādes piezīme {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM aizstāj
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,"Atlasiet vienumus, pamatojoties uz piegādes datumu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,"Atlasiet vienumus, pamatojoties uz piegādes datumu"
 DocType: Grant Application,Has any past Grant Record,Vai ir kāds pagātnes Granta ieraksts
 ,Sales Analytics,Pārdošanas Analīze
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Pieejams {0}
@@ -5547,7 +5590,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Izejvielas Kopā izmaksas
 DocType: Selling Settings,Settings for Selling Module,Iestatījumi Pārdošana modulis
 DocType: Hotel Room Reservation,Hotel Room Reservation,Viesnīcas numuru rezervēšana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Klientu apkalpošana
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Klientu apkalpošana
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postenis Klientu Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Piedāvāt kandidātam darbu
@@ -5564,7 +5607,7 @@
 DocType: Fees,Student Details,Studentu detaļas
 DocType: Purchase Invoice Item,Stock Qty,Stock Daudz
 DocType: Purchase Invoice Item,Stock Qty,Stock Daudz
-DocType: Employee Loan,Repayment Period in Months,Atmaksas periods mēnešos
+DocType: Loan,Repayment Period in Months,Atmaksas periods mēnešos
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Kļūda: Nav derīgs id?
 DocType: Naming Series,Update Series Number,Update Series skaits
 DocType: Account,Equity,Taisnīgums
@@ -5573,7 +5616,7 @@
 DocType: Task,Closing Date,Slēgšanas datums
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
 DocType: Timesheet,Work Detail,Darba detaļas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inženieris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inženieris
 DocType: Journal Entry,Total Amount Currency,Kopējā summa valūta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meklēt Sub Kompleksi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
@@ -5619,13 +5662,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donoru tipa informācija.
 DocType: Request for Quotation,Supplier Detail,piegādātājs Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Kļūda formulu vai stāvoklī: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Rēķinā summa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Rēķinā summa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritēriju svariem jābūt līdz 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Apmeklētība
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,akciju preces
 DocType: BOM,Materials,Materiāli
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ja nav atzīmēts, sarakstā būs jāpievieno katrā departamentā, kur tas ir jāpiemēro."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} izveidošana
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Avota un mērķa Warehouse nevar būt vienādi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
@@ -5649,14 +5691,14 @@
 DocType: Shipping Rule,Fixed,Fiksēts
 DocType: Vehicle Service,Clutch Plate,sajūga Plate
 DocType: Company,Round Off Account,Noapaļot kontu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administratīvie izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administratīvie izdevumi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
-DocType: Journal Entry,Subscription,Abonēšana
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonēšana
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Maksas izveidošana ir gaidāma
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Uzteikuma termiņš
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Uzteikuma termiņš
 DocType: Asset Category,Asset Category Name,Asset Kategorijas nosaukums
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"Tas ir sakne teritorija, un to nevar rediģēt."
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jauns Sales Person vārds
@@ -5670,7 +5712,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
 DocType: Asset,Frequency of Depreciation (Months),Biežums nolietojums (mēneši)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kredīta konts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Parādīt nulles vērtības
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Daudzums posteņa iegūta pēc ražošanas / pārpakošana no dotajiem izejvielu daudzumu
@@ -5678,7 +5720,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
 DocType: Hub Settings,Company Logo,Uzņēmuma logotips
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 DocType: Healthcare Settings,Patient Registration,Pacienta reģistrācija
@@ -5713,11 +5755,10 @@
 DocType: Journal Entry,Total Debit,Kopējais debets
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Noklusējuma Gatavās produkcijas noliktava
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,"Lūdzu, izvēlieties pacientu"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,Ērtības
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budžets un izmaksu centrs
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Vairāki noklusējuma maksājuma veidi nav atļauti
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,priekš
 ,Appointment Analytics,Iecelšana par Analytics
 DocType: Vehicle Service,Half Yearly,Pusgada
 DocType: Lead,Blog Subscriber,Blog Abonenta
@@ -5734,6 +5775,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Atstājiet tukšu, ja jūs veicat studentu grupas gadā"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ja ieslēgts, Total nē. Darbadienu būs brīvdienas, un tas samazinātu vērtību Alga dienā"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Lietotnes, kurās tiek izmantota pašreizējā atslēga, nevarēs piekļūt, vai jūs esat pārliecināts?"
+DocType: Subscription Settings,Prorate,Prorāts
 DocType: Purchase Invoice,Total Advance,Kopā Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Mainīt veidnes kodu
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term beigu datums nevar būt pirms Term sākuma datuma. Lūdzu izlabojiet datumus un mēģiniet vēlreiz.
@@ -5745,8 +5787,9 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 DocType: Cheque Print Template,Signatory Position,Parakstītājs Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Uzstādīt kā Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Uzstādīt kā Lost
 DocType: Timesheet,Total Billable Hours,Kopējais apmaksājamo stundu
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Dienu skaits, kad abonents ir jāmaksā rēķini, kas radīti ar šo abonementu"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksājumu saņemšana Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tas ir balstīts uz darījumiem pret šo klientu. Skatīt grafiku zemāk informāciju
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rinda {0}: piešķirtā summa {1} ir jābūt mazākam par vai vienāds ar Maksājuma Entry summai {2}
@@ -5765,12 +5808,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Company,Company Info,Uzņēmuma informācija
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tas ir balstīts uz piedalīšanos šī darbinieka
 DocType: Assessment Result,Summary,Kopsavilkums
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Atzīmējiet apmeklējumu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debeta kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debeta kontu
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restorāna pasūtījuma ieraksta vienība
@@ -5782,7 +5825,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkuma summa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Darbinieku pabalsti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Darbinieku pabalsti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Work Order,Manufactured Qty,Ražoti Daudz
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcijas nepastāv ar {0}
@@ -5790,12 +5833,12 @@
 DocType: Asset,Out of Order,Nestrādā
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorēt darbstacijas laika pārklāšanos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Izvēlieties Partijas Numbers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 DocType: Patient Service Unit,Medical Administrator,Medicīnas administrators
 DocType: Assessment Plan,Schedule,Grafiks
 DocType: Account,Parent Account,Mātes vērā
@@ -5825,15 +5868,16 @@
 DocType: Asset Repair,Repair Status,Remonta stāvoklis
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
 DocType: POS Profile,Account for Change Amount,Konts Mainīt summa
 DocType: Purchase Invoice,input service,ievades pakalpojums
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Tehniskās apkopes komandas biedrs
 DocType: Agriculture Analysis Criteria,Soil Analysis,Augsnes analīze
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kursa kods:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ievadiet izdevumu kontu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Noliktava
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
 DocType: Employee,Current Address,Pašreizējā adrese
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
@@ -5882,19 +5926,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Uzņemšana par {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Mainīgais nosaukums
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
 DocType: Asset,Asset Category,Asset kategorija
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto darba samaksa nevar būt negatīvs
 DocType: Purchase Order,Advance Paid,Izmaksāto avansu
 DocType: Item,Item Tax,Postenis Nodokļu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiāls piegādātājam
 DocType: Soil Texture,Loamy Sand,Lūga smiltis
 DocType: Production Plan,Material Request Planning,Materiālu pieprasījuma plānošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Akcīzes Invoice
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% parādās vairāk nekā vienu reizi
 DocType: Expense Claim,Employees Email Id,Darbinieki e-pasta ID
 DocType: Employee Attendance Tool,Marked Attendance,ievērojama apmeklējums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Tekošo saistību
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Tekošo saistību
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Taimeris pārsniedza norādītās stundas.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Sūtīt masu SMS saviem kontaktiem
 DocType: Patient,A Positive,Pozitīvs
@@ -5905,9 +5949,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pašlaik ir {1} piegādātāju rādītāju karte, un šī piegādātāja iepirkuma rīkojumi jāizsaka piesardzīgi."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Aktīvu uzturēšanas komanda
-DocType: Employee Loan,Loan Type,aizdevuma veids
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ir veiksmīgi iesniegts
+DocType: Loan,Loan Type,aizdevuma veids
 DocType: Scheduling Tool,Scheduling Tool,plānošana Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredītkarte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredītkarte
 DocType: BOM,Item to be manufactured or repacked,Postenis tiks ražots pārsaiņojamā
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5939,7 +5984,7 @@
 DocType: Item,Units of Measure,Mērvienību
 DocType: Manufacturing Settings,Allow Production on Holidays,Atļaut Production brīvdienās
 DocType: Sales Invoice,Customer's Purchase Order Date,Klienta Pasūtījuma datums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Pamatkapitāls
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Pamatkapitāls
 DocType: Shopping Cart Settings,Show Public Attachments,Parādīt publisko pielikumus
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
 DocType: Restaurant Reservation,Reservation Time,Rezervācijas laiks
@@ -5954,7 +5999,7 @@
 DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rinda # {0}: Reqd pēc datuma nevar būt pirms darījuma datuma
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,piedāvātie produkti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Dizainers
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
@@ -5964,20 +6009,20 @@
 DocType: Driver,Expiry Date,Derīguma termiņš
 DocType: Healthcare Settings,Employee name and designation in print,Darbinieka vārds un uzvārds drukātā veidā
 ,accounts-browser,konti pārlūkprogrammu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekts meistars.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Lai ļautu pār-rēķinu vai pārāk pasūtīšana, atjaunināt &quot;pabalstu&quot; Noliktavā iestatījumi vai punktā."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Puse dienas)
 DocType: Payment Term,Credit Days,Kredīta dienas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Lūdzu, izvēlieties Pacientu, lai saņemtu Lab testus"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Padarīt Student Sērija
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Izpildes laiks dienas
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ir ienākumu nodokļa izdevumi
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Atzīmējiet šo, ja students dzīvo pie institūta Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
 ,Stock Summary,Stock kopsavilkums
@@ -5988,10 +6033,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datums
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: BOM Operation,Operating Cost(Company Currency),Ekspluatācijas izmaksas (Company valūta)
-DocType: Employee Loan Application,Rate of Interest,Procentu likme
+DocType: Loan Application,Rate of Interest,Procentu likme
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: Item,Shelf Life In Days,Glabāšanas laiks dienās
 DocType: GL Entry,Is Opening,Vai atvēršana
+DocType: Department,Expense Approvers,Izdevumu apstiprinātāji
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
 DocType: Journal Entry,Subscription Section,Abonēšanas sadaļa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konts {0} nepastāv
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index b31ebec..01258de 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Откажи материјали Посетете {0} пред да го раскине овој Гаранција побарување
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Извештаи за проценка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
-DocType: Purchase Receipt,Subscription Detail,Детали за зачленување
 DocType: Supplier Scorecard,Notify Supplier,Известете го снабдувачот
 DocType: Item,Customer Items,Теми на клиентите
 DocType: Project,Costing and Billing,Трошоци и регистрации
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,На сметка {0}: Родител на сметка {1} не може да биде Леџер
 DocType: Item,Publish Item to hub.erpnext.com,"Објавуваат елемент, за да hub.erpnext.com"
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail известувања
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,евалуација
 DocType: Item,Default Unit of Measure,Стандардно единица мерка
 DocType: SMS Center,All Sales Partner Contact,Сите Продажбата партнер контакт
-DocType: Employee,Leave Approvers,Остави Approvers
+DocType: Department,Leave Approvers,Остави Approvers
 DocType: Sales Partner,Dealer,Дилер
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Истраги
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Проверете достапност
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ова е врз основа на трансакции против оваа Добавувачот. Види времеплов подолу за детали
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Правни
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},даноците не може да бидат содржани во ставките во ред {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Правни
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},даноците не може да бидат содржани во ставките во ред {0}
 DocType: Bank Guarantee,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Бара од страна на
 DocType: Delivery Note,Return Against Delivery Note,Врати против Испратница
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Глави (или групи), против кои се направени на сметководствените ставки и рамнотежи се одржува."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Нема поднесени План за плата за обработка.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Нема поднесени План за плата за обработка.
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Show open
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Неопходно е да се преземе оваа акција денес сама за горенаведените периодични
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Плаќање
 DocType: Pricing Rule,Apply On,Apply On
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Сите Добавувачот Контакт
 DocType: Support Settings,Support Settings,Прилагодувања за поддршка
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Серија ставка истечен статус
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Банкарски Draft
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Банкарски Draft
 DocType: Membership,membership validaty section,член валидација дел
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 DocType: Consultation,Consultation,Консултација
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материјал
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Изработка на веб-страница
 DocType: Opening Invoice Creation Tool Item,Quantity,Кол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Кредити (Пасива)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
 DocType: Item,Country of Origin,Земја на потекло
 DocType: Soil Texture,Soil Texture Criteria,Критериуми за текстура на почвата
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Основни детали за контакт
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,отворени прашања
 DocType: Production Plan Item,Production Plan Item,Производство план Точка
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
 DocType: Lab Test Groups,Add new line,Додај нова линија
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Здравствена заштита
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задоцнување на плаќањето (во денови)
@@ -89,7 +85,7 @@
 ,Delay Days,Денови на одложување
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Фактура
+DocType: Subscription Invoice,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Детали за телесната тежина
 DocType: Asset Maintenance Log,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ред # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ред # {0}:
 DocType: Timesheet,Total Costing Amount,Вкупно Чини Износ
 DocType: Delivery Note,Vehicle No,Возило Не
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Ве молиме изберете Ценовник
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Работа во прогрес
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Ве молиме одберете датум
 DocType: Daily Work Summary Group,Holiday List,Список со Празници
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Сметководител
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Сметководител
 DocType: Hub Settings,Selling Price List,Продажба на ценовник
 DocType: Patient,Tobacco Current Use,Тековна употреба на тутун
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Продажба стапка
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Продажба стапка
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Телефон број
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Нов {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Испратена е почетна е-пошта
 ,Sales Partners Commission,Продај Партнери комисија
 DocType: Soil Texture,Sandy Clay Loam,Сенди Клеј Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Вредност по амортизација
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,поврзани
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,датум присуство не може да биде помала од датум приклучи вработениот
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,датум присуство не може да биде помала од датум приклучи вработениот
 DocType: Grading Scale,Grading Scale Name,Скала за оценување Име
-DocType: Subscription,Repeat on Day,Повторете го денот
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ова е root сметката и не може да се уредува.
 DocType: Sales Invoice,Company Address,адреса на компанијата
 DocType: BOM,Operations,Операции
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не може да се постави овластување врз основа на попуст за {0}
+DocType: Subscription,Subscription Start Date,Датум на почеток на претплата
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикачи CSV датотека со две колони, еден за старото име и еден за ново име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не во било кој активно фискална година.
 DocType: Packed Item,Parent Detail docname,Родител Детална docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Суд: {0}, Точка Код: {1} и од купувачи: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Крајниот датум на судечкиот период не може да биде пред датумот на започнување на судечкиот период
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отворање на работа.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM не е наведен за предмет за поддоговор {0} во ред {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Patient,Married,Брак
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не се дозволени за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Се предмети од
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Се предмети од
 DocType: Price List,Price Not UOM Dependant,Цена Не зависена од UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,кочница нафта
 DocType: Tax Rule,Tax Type,Тип на данок
 ,Completed Work Orders,Завршени работни налози
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,оданочливиот износ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,оданочливиот износ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: BOM,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Тип на референтен документ мора да биде еден од тврдењата за трошок или запис на дневникот
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,изберете Бум
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Тип на референтен документ мора да биде еден од тврдењата за трошок или запис на дневникот
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,изберете Бум
 DocType: SMS Log,SMS Log,SMS Влез
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Цената на испорачани материјали
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Управувајте со однапред износот даден на вработениот
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Известување за испорака
 DocType: Journal Entry,Opening Entry,Отворање Влегување
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Сметка плаќаат само
-DocType: Employee Loan,Repay Over Number of Periods,Отплати текот број на периоди
+DocType: Loan,Repay Over Number of Periods,Отплати текот број на периоди
 DocType: Stock Entry,Additional Costs,Е вклучена во цената
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Сметка со постојните трансакцијата не може да се конвертира во групата.
 DocType: Lead,Product Enquiry,Производ пребарување
 DocType: Education Settings,Validate Batch for Students in Student Group,Потврдете Batch за студентите во студентските група
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Не остава рекорд најде за вработените {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Не остава рекорд најде за вработените {0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ве молиме внесете компанија прв
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Ве молиме изберете ја првата компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Ве молиме изберете ја првата компанија
 DocType: Employee Education,Under Graduate,Под Додипломски
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Ве молиме поставете стандарден образец за известување за статусот за напуштање во поставките за човечки ресурси.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,На цел
 DocType: BOM,Total Cost,Вкупно Трошоци
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,вработен кредит
 DocType: Fee Schedule,Send Payment Request Email,Испрати е-пошта за барање за исплата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Недвижнини
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Успешно нерегистриран.
 DocType: Assessment Result,Grade,одделение
 DocType: Restaurant Table,No of Seats,Број на седишта
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","За да додадете динамичен предмет, користете ги џинските ознаки како <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: Asset Maintenance Task,Asset Maintenance Task,Задача за одржување на средства
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Годишна плата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Годишна плата
 DocType: Daily Work Summary,Daily Work Summary,Секојдневната работа Резиме
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} е замрзнат
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Акции Трошоци
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Акции Трошоци
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Одберете Целна Магацински
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Одберете Целна Магацински
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ве молиме внесете Корисно Контакт е-маил
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Ве молиме внесете Корисно Контакт е-маил
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Контра Влегување
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Примарна адреса
 DocType: Production Plan,Material Request Detail,Материјал Барам детали
 DocType: Selling Settings,Default Quotation Validity Days,Стандардни дена за валидност на понудата
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: Sales Invoice,Change Amount,промени Износ
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Категории за возачка дозвола
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Внесете го датумот на испорака
 DocType: Depreciation Schedule,Make Depreciation Entry,Направете Амортизација Влегување
+DocType: HR Settings,Leave Settings,Остави ги поставките
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Тип на Барањето
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Направете вработените
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Емитување
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Режим на поставување на ПОС (онлајн / офлајн)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Оневозможува создавање на логови за време на работните налози. Операциите нема да се следат против работниот налог
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Извршување
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Извршување
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детали за операции извршени.
 DocType: Asset Maintenance Log,Maintenance Status,Одржување Статус
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Детали за членство
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Добавувачот е потребно против плаќа на сметка {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Теми и цени
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Вкупно часови: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
 DocType: Drug Prescription,Interval,Интервал
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Предност
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Предност
 DocType: Grant Application,Individual,Индивидуални
 DocType: Academic Term,Academics User,академиците пристап
 DocType: Cheque Print Template,Amount In Figure,Износ во слика
-DocType: Employee Loan Application,Loan Info,Информации за заем
+DocType: Loan Application,Loan Info,Информации за заем
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посети одржување.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период на оценување на добавувачи
 DocType: Share Transfer,Share Transfer,Сподели трансфер
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Шаблон за предметот
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Биохемија
 DocType: Job Offer,Select Terms and Conditions,Изберете Услови и правила
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Од вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Од вредност
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 DocType: Production Plan,Sales Orders,Продај Нарачка
 DocType: Purchase Taxes and Charges,Valuation,Вреднување
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Стандардно Територија
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Телевизија
 DocType: Work Order Operation,Updated via 'Time Log',Ажурираат преку &quot;Време Вклучи се &#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Изберете го купувачот или добавувачот.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
 DocType: Company,Enable Perpetual Inventory,Овозможи Вечен Инвентар
+DocType: Bank Guarantee,Charges Incurred,Нанесени надоместоци
 DocType: Company,Default Payroll Payable Account,Аватарот на Даноци се плаќаат сметка
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Ажурирање на е-мејл група
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Прилагоден резултат
 DocType: Delivery Stop,Contact Name,Име за Контакт
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критериуми за оценување на курсот
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Id на даноците:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Id на даноците:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Студентски проект:
 DocType: POS Customer Group,POS Customer Group,POS клиентите група
 DocType: Land Unit,Land Unit describing various land assets,Земјиште единица опишува различни земјиште средства
@@ -375,9 +372,8 @@
 ,Open Work Orders,Отвори работни задачи
 DocType: Payment Term,Credit Months,Кредитни месеци
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Нето плата не може да биде помал од 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","За да престанеме да испраќаме повторувачки известувања за грешки од системот, ние го проверивме полето Disabled во претплатата"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Остава на годишно ниво
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Остава на годишно ниво
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
 DocType: Email Digest,Profit & Loss,Добивка и загуба
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Те молам постави ученици од студентски групи
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Банката записи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Банката записи
 DocType: Crop,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продажна Фактура Бр.
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Група на студенти инструмент за создавање на курсот
 DocType: Lead,Do Not Contact,Не го допирајте
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Луѓето кои учат во вашата организација
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Развивач на софтвер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Развивач на софтвер
 DocType: Item,Minimum Order Qty,Минимална Подреди Количина
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Course Scheduling Tool,Course Start Date,Се разбира Почеток Датум
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Објави во Hub
 DocType: Student Admission,Student Admission,за прием на студентите
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Купување Детали за
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Макс
 DocType: Email Digest,New Quotations,Нов Цитати
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Пораките плата лизга на вработените врз основа на склопот на е-маил избрани во вработените
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 DocType: Tax Rule,Shipping County,округот превозот
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Научат
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Научат
 DocType: Asset,Next Depreciation Date,Следна Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Трошоци активност по вработен
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Најдобро Чекови и депозити да се расчисти
 DocType: Item,Synced With Hub,Синхронизираат со Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може да биде негативен за ставката {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може да биде негативен за ставката {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Погрешна лозинка
 DocType: Item,Variant Of,Варијанта на
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Те молам постави го Hotel Room Rate на {}
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Opening Invoice Creation Tool,Invoice Type,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Потврда за испорака
 DocType: Consultation,Encounter Impression,Се судрите со впечатокот
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Трошоци на продадени средства
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс Планирање алатката
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Итно] Грешка при создавање на повторувачки% s за% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,Даночна стапка
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Периодот на примена не може да биде во две записи за распределба
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Периодот на примена не може да биде во две записи за распределба
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Доби
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Креирај студентски групи
 DocType: Volunteer,Weekends,Викенди
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Забелешка кредит Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Забелешка кредит Износ
 DocType: Setup Progress Action,Action Document,Акционен документ
 DocType: Chapter Member,Website URL,URL на веб страната
 ,Finished Goods,Готови производи
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додај ставки
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Точка испитување квалитет Параметар
+DocType: Leave Application,Leave Approver Name,Остави Approver Име
 DocType: Depreciation Schedule,Schedule Date,Распоред Датум
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Приходи, одбивања и други компоненти Плата"
 DocType: Packed Item,Packed Item,Спакувани Точка
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
 DocType: Healthcare Settings,Require Lab Test Approval,Потребно е одобрување од лабораториско испитување
 DocType: Salary Slip Timesheet,Working Hours,Работно време
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Вкупно Најдобро
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Вкупно Најдобро
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
 DocType: Dosage Strength,Strength,Сила
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Креирај нов клиент
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Потрошни Цена
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
 DocType: Student Log,Medical,Медицинска
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Причина за губење
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Причина за губење
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Ажурирајте го бројот на сметката
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Водечкиот сопственикот не може да биде ист како олово
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Распределени износ може да не е поголема од износот нерегулиран
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Еден
 DocType: Salary Slip,Total Loan Repayment,Вкупно кредит Отплата
 DocType: Account,Cost of Goods Sold,Трошоците на продадени производи
-DocType: Subscription,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ве молиме внесете цена центар
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Ве молиме внесете цена центар
 DocType: Drug Prescription,Dosage,Дозирање
 DocType: Journal Entry Account,Sales Order,Продај Побарувања
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Среден Продажен курс
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Среден Продажен курс
 DocType: Assessment Plan,Examiner Name,Име испитувачот
 DocType: Lab Test Template,No Result,без резултат
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ве молиме внесете го името на компанијата прв
 DocType: Purchase Invoice,Supplier Name,Добавувачот Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте го упатството ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Прикажи листови на сите членови на одделот во календарот
 DocType: Purchase Invoice,01-Sales Return,01-Продажба Враќање
 DocType: Account,Is Group,Е група
 DocType: Email Digest,Pending Purchase Orders,Во очекување на нарачки
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Задолжително поле - академска година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} не е поврзан со {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Персонализација на воведниот текст што оди како дел од е-мејл. Секоја трансакција има посебна воведен текст.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Поставете стандардно треба да се плати сметка за компанијата {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Поставете стандардно треба да се плати сметка за компанијата {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Трансакцијата не е дозволена против прекинатиот работен налог {0}
 DocType: Setup Progress Action,Min Doc Count,Мини Док Грофот
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Резервирано за продажба
 DocType: Packing Slip,From Package No.,Од Пакет број
 DocType: Item Attribute,To Range,Да се движи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да го смените начинот на вреднување, како што постојат трансакции против некои предмети кои не го имаат свој метод на вреднување"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Хартии од вредност и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да го смените начинот на вреднување, како што постојат трансакции против некои предмети кои не го имаат свој метод на вреднување"
 DocType: Student Report Generation Tool,Attended by Parents,Посетено од родители
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Вкупно Отсуства распределени е задолжително
 DocType: Patient,AB Positive,АБ Позитивен
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присуство евиденција.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за timesheet врз основа на платен список.
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
-DocType: Employee Loan,Total Payment,Вкупно исплата
+DocType: Loan,Total Payment,Вкупно исплата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Не може да се откаже трансакцијата за Завршено работно уредување.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} е откажана, па не може да се заврши на акција"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Доволно делови да се изгради
 DocType: POS Profile User,POS Profile User,POS профил корисник
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Директните приходи
+DocType: Subscription Invoice,Subscription Invoice,Фактура за претплата
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Директните приходи
 DocType: Patient Appointment,Date TIme,Датум време
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административен службеник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Административен службеник
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Поставување компанија и даноци
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
 DocType: Codification Table,Codification Table,Табела за кодификација
 DocType: Timesheet Detail,Hrs,часот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Ве молиме изберете ја компанијата
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Ве молиме изберете ја компанијата
 DocType: Stock Entry Detail,Difference Account,Разликата профил
 DocType: Purchase Invoice,Supplier GSTIN,добавувачот GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Шаблон за мапирање на готовинскиот тек
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
+DocType: Bank Guarantee,Providing,Обезбедување
 DocType: Account,Profit and Loss,Добивка и загуба
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Не е дозволено, конфигурирајте го Шаблонот за тестирање за тестирање по потреба"
 DocType: Patient,Risk Factors,Фактори на ризик
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
 DocType: Healthcare Settings,Appointment Confirmation,Потврда за назначување
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Затворање (ЦР)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здраво
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Премести ставка
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Веќе поставите стандардно во профилниот профи {0} за корисникот {1}, љубезно е оневозможено"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Акумулирана вредности
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Територијата е потребна во POS профилот
 DocType: Supplier,Prevent RFQs,Спречете RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Направи Продај Побарувања
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Плата за лична достава за период од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Плата за лична достава за период од {0} до {1}
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Потенцијален клиент Id
 DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Предавање Бил Датум
 DocType: Production Plan,Production Plan,План за производство
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Отворање алатка за создавање фактура
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Продажбата Враќање
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забелешка: Вкупно распределени лисја {0} не треба да биде помал од веќе одобрен лисја {1} за периодот
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Поставете Кол во трансакции врз основа на сериски број за внесување
 ,Total Stock Summary,Вкупно Акции Резиме
 DocType: Announcement,Posted By,Испратено од
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардна единица мерка за ставка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (и) со друг UOM. Ќе треба да се создаде нова ставка и да се користи различен стандарден UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Распределени износ не може да биде негативен
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ве молиме да се постави на компанијата
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ве молиме да се постави на компанијата
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Training Result Employee,Training Result Employee,Резултат обука на вработените
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
-DocType: Repayment Schedule,Principal Amount,главнината
-DocType: Employee Loan Application,Total Payable Interest,Вкупно се плаќаат камати
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,главнината
+DocType: Loan Application,Total Payable Interest,Вкупно се плаќаат камати
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Вкупно Најдобро: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продај фактура timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
 DocType: Restaurant Reservation,Restaurant Reservation,Ресторан резерви
 DocType: Land Unit,Land Unit Name,Име на земјиштето
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Пишување предлози
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Пишување предлози
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаќање за влез Одбивање
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Завиткување
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Известување на клиенти преку е-пошта
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Известување на клиенти преку е-пошта
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Постои уште еден продажбата на лице {0} со истиот Вработен проект
 DocType: Employee Advance,Claimed Amount,Обвинетиот износ
 apps/erpnext/erpnext/config/education.py +180,Masters,Мајстори
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Исплата Портал сметка не е создадена, Ве молиме да се создаде една рачно."
 DocType: Supplier Scorecard,Per Year,Годишно
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не ги исполнувате условите за прием во оваа програма според ДОБ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код Код&gt; Точка група&gt; Бренд
 DocType: Sales Invoice,Sales Taxes and Charges,Продажбата на даноци и такси
 DocType: Employee,Organization Profile,Организација Профил
 DocType: Vital Signs,Height (In Meter),Висина (во метар)
 DocType: Student,Sibling Details,брат Детали
 DocType: Vehicle Service,Vehicle Service,сервисирајте го возилото
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Автоматски се активира барање на повратни информации врз основа на условите.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Автоматски се активира барање на повратни информации врз основа на условите.
 DocType: Employee,Reason for Resignation,Причина за оставка
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Шаблон за ефикасност на мислењата.
 DocType: Sales Invoice,Credit Note Issued,Кредитна белешка издадена
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Распоред за одржување
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Потоа цени Правила се филтрирани врз основа на клиент, група на потрошувачи, територија, Добавувачот, Набавувачот Тип на кампањата, продажба партнер итн"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Нето промени во Инвентар
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Вработен за управување со кредит
 DocType: Employee,Passport Number,Број на пасош
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Врска со Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менаџер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Менаџер
 DocType: Payment Entry,Payment From / To,Плаќање од / до
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Поставете сметка во Магацин {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Материјал трансфер
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Не можам да најдам патека за
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Отворање (д-р)
+DocType: Loan,Applicant,Апликант
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Праќање пораки во временската ознака мора да биде по {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Да се прават периодични документи
 ,GST Itemised Purchase Register,GST Индивидуална Набавка Регистрирај се
 DocType: Course Scheduling Tool,Reschedule,Презакажувам
-DocType: Employee Loan,Total Interest Payable,Вкупно камати
+DocType: Loan,Total Interest Payable,Вкупно камати
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Слета Цена даноци и такси
 DocType: Work Order Operation,Actual Start Time,Старт на проектот Време
 DocType: BOM Operation,Operation Time,Операција Време
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Заврши
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,база
 DocType: Timesheet,Total Billed Hours,Вкупно Опишан часа
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Отпише Износ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Отпише Износ
 DocType: Leave Block List Allow,Allow User,Овозможи пристап
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Company,Gain/Loss Account on Asset Disposal,Добивка / загуба сметка за располагање со средства
 DocType: Vehicle Log,Service Details,Детали услуга
 DocType: Vehicle Log,Service Details,Детали услуга
-DocType: Subscription,Quarterly,Квартален
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,време лист
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Суровини врз основа на
 DocType: Sales Invoice,Port Code,Пристаниште код
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Резервен магацин
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Резервен магацин
 DocType: Lead,Lead is an Organization,Олово е организација
 DocType: Guardian Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,пред продажбата
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километража вредност (последна)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони за критериуми за оценување на добавувачот.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Плаќање Влегување веќе е создадена
 DocType: Request for Quotation,Get Suppliers,Добивај добавувачи
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Преглед Плата фиш
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Преглед Плата фиш
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Вие може да продолжите само ако вашето членство истекува во рок од 30 дена
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Изберете само ако имате инсталирано документи за прилив на готовински тек
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Supplier Scorecard,Per Week,Неделно
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Вкупно студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Кредитна картичка за влез
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанија и сметки
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,во вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,во вредност
 DocType: Asset Settings,Depreciation Options,Опции за амортизација
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Невалидно време за објавување
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Невалидно време за објавување
 DocType: Lead,Campaign Name,Име на кампања
 DocType: Hotel Room,Capacity,Капацитет
 DocType: Selling Settings,Close Opportunity After Days,Затвори можност по денови
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Клиентите нарачка Не
 DocType: Budget,Budget Against,буџетот против
 DocType: Employee,Cell Number,Мобилен Број
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадени критериуми нема вработен. Проверете дека лизгачките листови не се веќе создадени.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадени критериуми нема вработен. Проверете дека лизгачките листови не се веќе создадени.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Авто Материјал Барања Генерирано
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изберете табела
 DocType: BOM,Website Specifications,Веб-страница Спецификации
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е неважечка е-поштенска адреса во &#39;Примачи&#39;
 DocType: Special Test Items,Particulars,Спецификации
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Повеќе Правила Цена постои со истите критериуми, ве молиме да го реши конфликтот со давање приоритет. Правила Цена: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Asset,Maintenance,Одржување
+DocType: Subscriber,Subscriber,Претплатник
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Ве молиме да го ажурирате статусот на проектот
 DocType: Item,Maximum sample quantity that can be retained,Максимална количина на примерокот што може да се задржи
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Стандардните поставувања за Кошничка
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Додај Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Средства укинати преку весник Влегување {0}
-DocType: Employee Loan,Interest Income Account,Сметка приход од камата
+DocType: Loan,Interest Income Account,Сметка приход од камата
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Испратена покана за преглед
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Биотехнологијата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Канцеларија Одржување трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Канцеларија Одржување трошоци
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Оди до
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Поставување на e-mail сметка
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Asset Repair,Downtime,Прекини
 DocType: Account,Liability,Одговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Академски термин:
 DocType: Salary Detail,Do not include in total,Не вклучувајте вкупно
 DocType: Company,Default Cost of Goods Sold Account,Стандардно трошоците на продадени производи профил
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Количината на примерокот {0} не може да биде повеќе од добиената количина {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Ценовник не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Request for Quotation Supplier,Send Email,Испрати E-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 DocType: Item,Max Sample Quantity,Максимална количина на примероци
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Нема дозвола
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Нема дозвола
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Цитат е побарано
 DocType: Vital Signs,Heart Rate / Pulse,Срцева стапка / пулс
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Лабораториски тестови и витални знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не се пронајдени вработен
-DocType: Subscription,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Група на студенти веќе се ажурираат.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Група на студенти веќе се ажурираат.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Ажурирање на проектот.
 DocType: SMS Center,All Customer Contact,Сите корисници Контакт
 DocType: Land Unit,Tree Details,Детали за дрво
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Увоз Публика
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Сите групи на ставки
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Work Order,Item To Manufacture,Ставка за производство
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} статус е {2}
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Ресетирај, ако избраната адреса е изменета по зачувување"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 DocType: Item,Hub Publishing Details,Детали за објавување на центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Отворање&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Отворање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
 DocType: Lab Test Template,Result Format,Формат на резултати
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,на секои два месеци
 DocType: Vehicle Service,Brake Pad,Влошка
 DocType: Fertilizer,Fertilizer Contents,Содржина на ѓубрива
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Истражување и развој
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Истражување и развој
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Износ за Наплата
 DocType: Company,Registration Details,Детали за регистрација
 DocType: Timesheet,Total Billed Amount,Вкупно Опишан Износ
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Проверка на кредитниот лимит на бајпас во Нарачка за продажба
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Оценка.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Овозможувањето на &quot;Користи за Корпа&quot;, како што Кошничка е овозможено и треба да има најмалку еден данок Правилникот за Кошничка"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плаќање Влегување {0} е поврзана против редот на {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Плаќање Влегување {0} е поврзана против редот на {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
 DocType: Sales Invoice Item,Stock Details,Детали за акцијата
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проектот вредност
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-Продажба
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,Минимално седење
 DocType: Item Attribute,Item Attribute Values,Точка атрибут вредности
 DocType: Examination Result,Examination Result,испитување резултат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Купување Потврда
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Валута на девизниот курс господар.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Суд DOCTYPE мора да биде еден од {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Work Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} мора да биде активен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Нема достапни ставки за пренос
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} мора да биде активен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Нема достапни ставки за пренос
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Затворање (отворање + вкупно)
 DocType: Journal Entry,Depreciation Entry,амортизација за влез
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 стандард
 DocType: Pricing Rule,Rate or Discount,Стапка или попуст
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Потребни Количина
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Омилени
 DocType: Hub Settings,Custom Data,Прилагодени податоци
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,Медицински законик стандард
 DocType: Soil Texture,Clay Composition (%),Состав на глина (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Те молам снимете пред доделување задача.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Биланс вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Биланс вредност
 DocType: Lab Test,Lab Technician,Лаборант
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Цена за продажба Листа
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Цена за продажба Листа
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Доколку се провери, клиентот ќе биде креиран, мапиран на пациент. Парични фактури ќе бидат креирани против овој клиент. Можете исто така да изберете постоечки клиент додека креирате пациент."
 DocType: Bank Reconciliation,Account Currency,Валута сметка
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Ве молиме спомнете заокружуваат сметка во компанијата
 DocType: Purchase Receipt,Range,Опсег
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
 DocType: Item Barcode,Item Barcode,Точка Баркод
 DocType: Woocommerce Settings,Endpoints,Крајни точки
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","да се генерира. Ако е одложено, ќе треба рачно да го промените полето &quot;Повторете на денот на месецот&quot; за ова"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
 DocType: Share Transfer,From Folio No,Од фолија бр
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,Датум достапен за употреба
 DocType: Guardian,Guardian Name,Име на Гардијан
 DocType: Cheque Print Template,Has Print Format,Има печати формат
-DocType: Employee Loan,Sanctioned,санкционирани
+DocType: Loan,Sanctioned,санкционирани
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,е задолжително. Можеби не е создаден запис Девизен за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За предмети од ""Пакет производ"", Складиште, сериски број и Batch нема да се смета од табелата ""Паковна Листа"". Ако магацински и Batch број не се исти за сите ставки за пакување во ""Пакет производи"", тие вредности може да се внесат во главната табела со ставки, вредностите ќе бидат копирани во табелата ""Паковна Листа""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За предмети од ""Пакет производ"", Складиште, сериски број и Batch нема да се смета од табелата ""Паковна Листа"". Ако магацински и Batch број не се исти за сите ставки за пакување во ""Пакет производи"", тие вредности може да се внесат во главната табела со ставки, вредностите ќе бидат копирани во табелата ""Паковна Листа""."
 DocType: Student Admission,Publish on website,Објавуваат на веб-страницата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Датум на Добавувачот фактура не може да биде поголем од објавувањето Датум
+DocType: Subscription,Cancelation Date,Датум на откажување
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
 DocType: Agriculture Task,Agriculture Task,Задача за земјоделство
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Индиректни доход
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Индиректни доход
 DocType: Student Attendance Tool,Student Attendance Tool,Студентски Публика алатката
 DocType: Restaurant Menu,Price List (Auto created),Ценовник (автоматски креиран)
 DocType: Cheque Print Template,Date Settings,датум Settings
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Метар
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Лабораторија за тестирање на податоци за време не може да биде пред собирање на податоци
+DocType: Subscription Plan,Cost,Цена
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
 DocType: Expense Claim,Total Advance Amount,Вкупно авансно износ
 DocType: Delivery Stop,Estimated Arrival,Предвидено пристигнување
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
 DocType: Timesheet Detail,Bill,Бил
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бела
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Бела
 DocType: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Можете да изберете само максимум една опција од листата на наога.
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
 DocType: Item,Automatically Create New Batch,Автоматски Креирај нова серија
 DocType: Item,Automatically Create New Batch,Автоматски Креирај нова серија
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Доделување {0} до {1} (ред {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Направете
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Доделување {0} до {1} (ред {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Направете
 DocType: Student Admission,Admission Start Date,Услови за прием Дата на започнување
 DocType: Journal Entry,Total Amount in Words,Вкупен износ со зборови
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Нов вработен
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс на кредит Износ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,распоред на курсот
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Опции на акции
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Опции на акции
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Оневозможете ги прибирањето на последните податоци за набавка во Нарачка за нарачка
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Пакување фиш Точка
 DocType: Purchase Invoice,Cash/Bank Account,Пари / банка сметка
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ве молиме наведете {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Создавањето на варијанта е ставено во ред.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Краток преглед на работа за {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Атрибут маса е задолжително
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Првиот одобрение за напуштање на списокот ќе биде поставен како стандарден Останат одобрувач.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Plan,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} не може да биде негативен
 DocType: Training Event,Self-Study,Самопроучување
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,Плати
 DocType: Asset Maintenance,Maintenance Manager Name,Name Manager
 DocType: Agriculture Task,Urgent,Итно
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Ве молиме наведете валидна ред проект за спорот {0} во табелата {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Ве молиме наведете валидна ред проект за спорот {0} во табелата {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не може да се најде променлива:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Изберете поле за уредување од numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Не може да биде елемент на фиксна актива како што се креира Фондовата книга.
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Име на шаблонот за проверка на квалитет
 DocType: Project,First Email,Прва е-пошта
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Задржани Магацински во Продај Побарувања / готови производи Магацински
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажба Износ
 DocType: Repayment Schedule,Interest Amount,Износот на каматата
 DocType: Serial No,Creation Document No,Документот за создавање Не
 DocType: Share Transfer,Issue,Прашање
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,Превозот држава
 ,Projected Quantity as Source,Проектирани Кол како Извор
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Пат за испорака
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Пат за испорака
 DocType: Student,A-,А-
 DocType: Share Transfer,Transfer Type,Вид на трансфер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Трошоци за продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Трошоци за продажба
 DocType: Consultation,Diagnosis,Дијагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Поштенски
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Продај Побарувања {0} е {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Изберете сметка за приход од камата во заем {0}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
 DocType: Item,Default Supplier,Стандардно Добавувачот
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Во текот на производство Додаток Процент
-DocType: Employee Loan,Repayment Schedule,Распоред на отплата
+DocType: Loan,Repayment Schedule,Распоред на отплата
 DocType: Shipping Rule Condition,Shipping Rule Condition,Испорака Правило Состојба
 DocType: Holiday List,Get Weekly Off Dates,Земете Неделен Off Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Датум на крајот не може да биде помал од Почеток Датум
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,Публика замрзнување Датум
 DocType: Education Settings,Attendance Freeze Date,Публика замрзнување Датум
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Листа на неколку од вашите добавувачи. Тие можат да бидат организации или поединци.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Преглед на сите производи
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Преглед на сите производи
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минимална олово време (денови)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минимална олово време (денови)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,сите BOMs
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Од Вработен
 DocType: Driver,Cellphone Number,Број на мобилен телефон
 DocType: Project,Monitor Progress,Следи напредок
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
 DocType: Journal Entry,Make Difference Entry,Направи разликата Влегување
+DocType: Supplier Quotation,Auto Repeat Section,Автоматско повторување
 DocType: Upload Attendance,Attendance From Date,Публика од денот
 DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста
 DocType: Program Enrollment,Transportation,Превоз
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Невалиден Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} мора да се поднесе
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Количините може да биде помалку од или еднакво на {0}
+DocType: Department Approver,Department Approver,Оддел одобрен
 DocType: SMS Center,Total Characters,Вкупно Карактери
 DocType: Employee Advance,Claimed,Тврдеше
 DocType: Crop,Row Spacing,Растојание меѓу редови
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаќање помирување Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Учество%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Како на Settings Купување ако нарачка задолжителни == &quot;ДА&quot;, тогаш за создавање Набавка фактура, корисникот треба да се создаде нарачка прво за ставка {0}"
+,HSN-wise-summary of outward supplies,HSN-мудро-резиме на надворешни резерви
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Броеви за регистрација на фирма за вашата препорака. Даночни броеви итн
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Име на акција
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Почетна година
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Првите 2 цифри GSTIN треба да се совпаѓа со Државниот број {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Датум на почеток на периодот тековната сметка е
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Капацитет Грешка планирање
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Полињата ќе бидат копирани само во времето на создавањето.
 DocType: Setup Progress Action,Domains,Домени
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,За управување со
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,За управување со
 DocType: Cheque Print Template,Payer Settings,Прилагодување обврзник
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
 DocType: Purchase Invoice,Is Return,Е враќање
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Внимание
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Почетен ден е поголем од крајниот ден во задачата &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Враќање / задолжување
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Враќање / задолжување
 DocType: Price List Country,Price List Country,Ценовник Земја
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} валидна сериски броеви за ставката {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Точка законик не може да се промени за Сериски број
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Точка законик не може да се промени за Сериски број
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM конверзија Фактор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ве молиме внесете Точка законик за да се добие број на серијата
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
-DocType: Employee Loan,Partially Disbursed,делумно исплатени
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Информации за грант.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Информации за грант.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдувач база на податоци.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Не можете да ја рестартирате претплатата која не е откажана.
 DocType: Account,Balance Sheet,Биланс на состојба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
 DocType: Fee Validity,Valid Till,Валидно до
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Вкупно Средба на наставниците со родители
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Промена на група клиенти за избраниот клиент не е дозволено.
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Ажурирање на времето за пристигнување.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ажурирање на времето за пристигнување.
 DocType: Program Enrollment Tool,Enrollment Details,Детали за запишување
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Ве молиме изберете клиент
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Purchase Order,Group same items,Група истите елементи
 DocType: Purchase Invoice,Disable Rounded Total,Оневозможи Вкупно заокружено
-DocType: Employee Loan Application,Repayment Info,Информации за отплата
+DocType: Department,Parent Department,Одделение за родители
+DocType: Loan Application,Repayment Info,Информации за отплата
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Записи"" не може да биде празно"
 DocType: Maintenance Team Member,Maintenance Role,Одржување улога
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Поставување на вработените
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Корисник за резервација на хотел
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Ве молиме изберете префикс прв
 DocType: Student,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Истражување
+DocType: Subscription Settings,Subscription Settings,Подесувања на претплата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Истражување
 DocType: Maintenance Visit Purpose,Work Done,Работата е завршена
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Announcement,All Students,сите студенти
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Crop Cycle,Less than a year,Помалку од една година
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Студентски мобилен број
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 DocType: Crop,Yield UOM,Принос UOM
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
 DocType: Item,Is Item from Hub,Е предмет од Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Тип на активност е задолжително.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Дивидендите кои ги исплатува
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Дивидендите кои ги исплатува
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Сметководство Леџер
 DocType: Stock Reconciliation,Difference Amount,Разликата Износ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Др. {0} на Остави на {1}
 DocType: Purchase Invoice,Reverse Charge,Обратна задолжен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Задржана добивка
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Задржана добивка
 DocType: Purchase Invoice,05-Change in POS,05-Промена во ПОС
 DocType: Vehicle Log,Service Detail,сервис детали
 DocType: BOM,Item Description,Опис
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,Можност Точка
 ,Student and Guardian Contact Details,Студент и Гардијан Податоци за контакт
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За снабдувач {0} E-mail адреса за да се испрати е-маил
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Привремено отворање
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Привремено отворање
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Прегледајте Hub
 ,Employee Leave Balance,Вработен Остави Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 DocType: Patient Appointment,More Info,Повеќе Информации
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Вреднување курс потребен за ставка во ред {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Вреднување курс потребен за ставка во ред {0}
 DocType: Supplier Scorecard,Scorecard Actions,Акции на картички
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Пример: Мастерс во Компјутерски науки
 DocType: Purchase Invoice,Rejected Warehouse,Одбиени Магацински
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,до
 DocType: Supplier Quotation Item,Lead Time in days,Потенцијален клиент Време во денови
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Сметки се плаќаат Резиме
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Исплата на плата од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Исплата на плата од {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Рецепти за лабораториски тестови
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Мали
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Отворање алатка за создавање на фактура
 DocType: Education Settings,Employee Number,Број вработен
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Откажи фактура по грејс период
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
 DocType: Project,% Completed,% Завршено
 ,Invoiced Amount (Exculsive Tax),Фактурираниот износ (Exculsive на доход)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораториско тестирање на податоци
 DocType: Email Digest,Add Quote,Додади цитат
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Индиректни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 DocType: Agriculture Analysis Criteria,Agriculture,Земјоделството
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync мајстор на податоци
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитал опрема
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Те молам прво наместете го Код
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
+DocType: Subscription Plan,Billing Interval Count,Интервал на фактурирање
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,тим Новости
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,За Добавувачот
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Поставување тип на сметка помага во изборот на оваа сметка во трансакции.
 DocType: Purchase Invoice,Grand Total (Company Currency),Сѐ Вкупно (Валута на Фирма)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Креирај печати формат
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,ПОС Точка група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Алтернативната ставка не смее да биде иста како код на ставка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Завршување на привремена проценка
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Работна станица
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Барање за прибирање понуди Добавувачот
 DocType: Healthcare Settings,Registration Message,Порака за регистрација
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Хардвер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Хардвер
 DocType: Prescription Dosage,Prescription Dosage,Дозирање на рецепт
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ве молиме изберете една компанија
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,Отпочнување и завршување
 ,Delivered Items To Be Billed,Испорачани ставки за наплата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Отвори Бум {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
 DocType: Authorization Rule,Average Discount,Просечната попуст
 DocType: Project Update,Great/Quickly,Велики / Брзо
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Ве молиме одберете серии за дозирани точка
 DocType: Asset,Depreciation Schedules,амортизација Распоред
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Следните сметки може да бидат избрани во GST Settings:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Следните сметки може да бидат избрани во GST Settings:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валута
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Ср Дневен заминување
 DocType: POS Profile,Campaign,Кампања
 DocType: Supplier,Name and Type,Име и вид
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Одобрување статус мора да биде &#39;одобрена&#39; или &#39;Одбиен&#39;
 DocType: Physician,Contacts and Address,Контакти и адреса
 DocType: Purchase Invoice,Contact Person,Лице за контакт
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекуваниот почетен датум"" не може да биде поголем од 'очекуван краен датум """
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,Подобност и детали
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Нето промени во основни средства
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација се логирате.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Барање за прибирање понуди е забрането да пристапите од порталот за повеќе поставувања проверка портал.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Променлива оценка на постигнати резултати
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Купување Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Купување Износ
 DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака Име
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки во креирањето на наставниот план
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Првиот одобрение за трошоци во листата ќе биде поставен како стандарден Expens Approver.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,не може да биде поголема од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,пакет законик
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Чирак
 DocType: Purchase Invoice,Company GSTIN,компанијата GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Негативни Кол не е дозволено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативни Кол не е дозволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Данок детали табелата се донесени од точка господар како стринг и се чуваат во оваа област. Се користи за даноци и такси
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако на сметката е замрзната, записи им е дозволено да ограничено корисници."
 DocType: Email Digest,Bank Balance,Банката биланс
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Оставете одобрение задолжително во апликацијата за напуштање
 DocType: Job Opening,"Job profile, qualifications required etc.","Работа профил, потребните квалификации итн"
 DocType: Journal Entry Account,Account Balance,Баланс на сметка
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Правило данок за трансакции.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Терминот за плаќање по ред {0} е веројатно дупликат.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Земјоделство (бета)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Пакување фиш
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Канцеларијата изнајмување
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Поставките за поставка на SMS портал
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Канцеларијата изнајмување
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Поставките за поставка на SMS портал
 DocType: Disease,Common Name,Заедничко име
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
 DocType: Vital Signs,Blood Pressure,Крвен притисок
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Аналитичарот
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Аналитичарот
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детали за продажба
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Потврдете Запишани курс за студентите во Студентскиот група
 DocType: Notification Control,Expense Claim Rejected,Сметка Тврдат Одбиени
 DocType: Item,Item Attribute,Точка Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Владата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Владата
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Тврдат сметка {0} веќе постои за регистрација на возила
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Име на Институтот
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Ве молиме внесете отплата износ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Ве молиме внесете отплата износ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Точка Варијанти
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,Е-пошта Плата лизга на вработените
 DocType: Cost Center,Parent Cost Center,Родител цена центар
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Изберете Можни Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Изберете Можни Добавувачот
 DocType: Sales Invoice,Source,Извор
 DocType: Customer,"Select, to make the customer searchable with these fields","Изберете, за да го направите клиентот да се пребарува со овие полиња"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Прикажи затворени
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Пакување фиш (и) откажани
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Парични текови од инвестициони
 DocType: Program Course,Program Course,Предметна програма
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Товар и товар пријави
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Товар и товар пријави
 DocType: Homepage,Company Tagline for website homepage,Слоган компанија за веб-сајт почетната страница од пребарувачот
 DocType: Item Group,Item Group Name,Точка име на група
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Земени
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Детали за меморандумот
 DocType: Leave Block List,Block Holidays on important days.,Забрани празници на важни датуми.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Ве молиме внесете ги сите потребни резултати од резултатот
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Побарувања Резиме
-DocType: Employee Loan,Monthly Repayment Amount,Месечна отплата износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Побарувања Резиме
+DocType: Loan,Monthly Repayment Amount,Месечна отплата износ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Отворање фактури
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
 DocType: UOM,UOM Name,UOM Име
 DocType: GST HSN Code,HSN Code,HSN законик
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Придонес Износ
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Корисникот {0} веќе е назначен на лекар {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Кутија
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,можни Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,можни Добавувачот
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Месечен Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Здравство (бета)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Производна количина е задолжително
-DocType: Employee Loan,Repayment Method,Начин на отплата
+DocType: Loan,Repayment Method,Начин на отплата
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако е означено, на почетната страница ќе биде стандардно Точка група за веб-страницата на"
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Барања за сметка на компанијата.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Потребен сертификат
 DocType: Company,Default Holiday List,Стандардно летни Листа
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од време и на време од {1} е се преклопуваат со {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Акции Обврски
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Акции Обврски
 DocType: Purchase Invoice,Supplier Warehouse,Добавувачот Магацински
 DocType: Opportunity,Contact Mobile No,Контакт Мобилни Не
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Изберете компанија
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,Оддел за печатење
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Корисникот {0} нема стандарден POS профил. Проверете стандардно на редот {1} за овој корисник.
 DocType: Student Group,Set 0 for no limit,Поставете 0 за да нема ограничување
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Ред {idx}: {field} е потребен за создавање на фактури за отворање {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Примарна адреса и контакт детали
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Препратат на плаќање E-mail
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Ве молиме изберете барем еден домен.
 DocType: Dependent Task,Dependent Task,Зависни Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: SMS Center,Receiver List,Листа на примачот
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Барај точка
 DocType: Payment Schedule,Payment Amount,Исплата Износ
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,скала за оценување
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,веќе завршени
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Акции во рака
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Акции во рака
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Увоз успешно!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,Артикал од Понуда
 DocType: Customer,Customer POS Id,Id ПОС клиентите
 DocType: Account,Account Name,Име на сметка
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} количина {1} не може да биде дел
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} количина {1} не може да биде дел
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Внесете URL на Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
 DocType: Share Balance,To No,Да Не
-DocType: Subscription,Reference Document,референтен документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
 DocType: Accounts Settings,Credit Controller,Кредитна контролор
-DocType: Grant Application,Applicant Type,Тип на апликант
+DocType: Loan,Applicant Type,Тип на апликант
 DocType: Purchase Invoice,03-Deficiency in services,03-Недостаток во услугите
 DocType: Delivery Note,Vehicle Dispatch Date,Возило диспечерски Датум
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарден стандард за медицински кодови
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Опишан
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човечки ресурси
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Човечки ресурси
 DocType: Lead,Upper Income,Горниот дел од приходите
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Reject
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна во компанијата Валута
 DocType: BOM Item,BOM Item,BOM ставки
 DocType: Appraisal,For Employee,За вработените
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Направете исплата Влегување
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Направете исплата Влегување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора да биде поголем од 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Достапни акции
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Достапни акции
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирање на капацитет за (во денови)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,набавки
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Задолжително поле - Програма
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Задолжително поле - Програма
 DocType: Special Test Template,Result Component,Компонента на резултати
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Вклучи празници во листовите како лисја
 DocType: Sales Invoice,Packed Items,Спакувани Теми
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранција побарување врз Сериски број
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',„Вкупно“
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',„Вкупно“
 DocType: Shopping Cart Settings,Enable Shopping Cart,Овозможи Кошничка
 DocType: Employee,Permanent Address,Постојана адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,Нагодувања за Продажби
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Потврди акција
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Онлајн аукции
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,исполнување
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Види во кошничката
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинг трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Не може да се креираат стандардни критериуми. Преименувајте ги критериумите
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Material Request,Transferred,пренесени
 DocType: Vehicle,Doors,врати
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Наплати надоместок за регистрација на пациентите
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Не може да се променат атрибутите по трансакција со акции. Направете нова ставка и да пренесете акции на новата ставка
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Не може да се променат атрибутите по трансакција со акции. Направете нова ставка и да пренесете акции на новата ставка
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,данок распад
 DocType: Packing Slip,PS-,PS-
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирување JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Purchase Invoice Item,Batch No,Серија Не
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Напредок на вработените
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 DocType: Grant Application,Assessment  Mark (Out of 10),Оценка за оценка (од 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Мобилен телефон
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Главните
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Email Digest,Annual Expenses,годишните трошоци
 DocType: Item,Variants,Варијанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
 DocType: Sales Team,Contribution to Net Total,Придонес на Нето Вкупно
 DocType: Sales Invoice Item,Customer's Item Code,Купувачи Точка законик
 DocType: Stock Reconciliation,Stock Reconciliation,Акции помирување
 DocType: Territory,Territory Name,Име територија
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Можете да имате само Планови со ист платежен циклус во претплата
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносителот на барањето за работа.
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,оценувања
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Настани за обука
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Следете ги главните извори на енергија.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Ве молиме внесете
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Ве молиме внесете
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Пријава за одржување
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Поставете филтер врз основа на точка или Магацински
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето-тежината на овој пакет. (Се пресметува автоматски како збир на нето-тежината на предмети)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,Да дава и Бил
 DocType: Student Group,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Бум {0} мора да се поднесе
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Управување со акции
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Плаќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Плаќање
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Магацински {0} не е поврзана со било која сметка, ве молиме наведете сметка во рекордно магацин или во собата попис стандардно сметка во друштво {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Управување со вашите нарачки
 DocType: Work Order Operation,Actual Time and Cost,Крај на време и трошоци
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,Студентски оставите апликацијата
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Група предмети во моментот на продажба
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,Баркодове
 DocType: Hub Category,Hub Node,Центар Јазол
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Соработник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Соработник
 DocType: Asset Movement,Asset Movement,средства движење
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Работен налог {0} мора да биде поднесен
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,нов кошничка
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Монетарната валута мора да биде еднаква на валутата на валутата на девизната или партиската сметка на друштвото
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од оваа испорака (Само Предлог)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Ред {0}: Датумот на достасаност не може да биде пред датумот на објавување
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Ред {0}: Датумот на достасаност не може да биде пред датумот на објавување
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Направете плаќање Влегување
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
 ,Sales Invoice Trends,Продажбата Трендови Фактура
 DocType: Leave Application,Apply / Approve Leaves,Спроведување / одобрија Лисја
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,За
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се однесува на ред само ако видот на пресметување е 'Износ на претходниот ред' или 'Вкупно на претходниот ред'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се однесува на ред само ако видот на пресметување е 'Износ на претходниот ред' или 'Вкупно на претходниот ред'
 DocType: Sales Order Item,Delivery Warehouse,Испорака Магацински
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дрвото на Центрите финансиски трошоци.
 DocType: Serial No,Delivery Document No,Испорака л.к
@@ -2325,7 +2332,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Потрошувачката на материјалот не е поставена во Поставките за производство.
 DocType: Student,Student Mobile Number,Студентски мобилен број
 DocType: Item,Has Variants,Има варијанти
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не може да се преоптоварување за Точка {0} во ред {1} повеќе од {2}. За да овозможите преголема наплата, ве молиме поставете ги Подесувања на акции"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не може да се преоптоварување за Точка {0} во ред {1} повеќе од {2}. За да овозможите преголема наплата, ве молиме поставете ги Подесувања на акции"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Ажурирај го одговорот
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
@@ -2337,12 +2344,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Прво изберете ја програмата
 DocType: Patient Appointment,Patient Age,Возраст на пациентот
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Управување со проекти
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Серискиот број {0} веќе е вратен
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Серискиот број {0} веќе е вратен
 DocType: Supplier,Supplier of Goods or Services.,Снабдувач на стоки или услуги.
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Asset Maintenance Log,Planned,Планирано
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Ненаплатени сметки што треба да се користат ако не се поставени во Пациентот за да се резервираат трошоци за консултации.
 DocType: Vehicle Log,Fuel Price,гориво Цена
+DocType: Bank Guarantee,Margin Money,Маргина пари
 DocType: Budget,Budget,Буџет
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Поставете го отворен
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
@@ -2356,16 +2364,16 @@
 DocType: Lead,Follow Up,Следете го
 DocType: Item,Is Sales Item,Е продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Точка Група на дрвото
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Ставка {0} не е подесување за сериски бр. Проверете главна ставка
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Ставка {0} не е подесување за сериски бр. Проверете главна ставка
 DocType: Maintenance Visit,Maintenance Time,Одржување Време
 ,Amount to Deliver,Износ за да овозможи
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Истата ставка е внесена неколку пати. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Датум на поимот на проектот не може да биде порано од годината Датум на почеток на академската година на кој е поврзан на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Вработениот {0} веќе аплицираше за {1} помеѓу {2} и {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Имаше грешки.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Вработениот {0} веќе аплицираше за {1} помеѓу {2} и {3}:
 DocType: Guardian,Guardian Interests,Гардијан Интереси
 DocType: Naming Series,Current Value,Сегашна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
 DocType: Education Settings,Instructor Records to be created by,Записи за инструктори кои треба да се креираат од
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создаден
 DocType: GST Account,GST Account,GST сметка
@@ -2384,8 +2392,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Додадено во Омилени
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не е утврдена плата за плати за гореспоменатите критериуми ИЛИ платен лист веќе е поднесен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Давачки и даноци
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не е утврдена плата за плати за гореспоменатите критериуми ИЛИ платен лист веќе е поднесен
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Давачки и даноци
 DocType: Projects Settings,Projects Settings,Подесувања на проектите
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ве молиме внесете референтен датум
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи плаќање не може да се филтрираат од {1}
@@ -2395,27 +2403,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дрвото на точка групи.
 DocType: Production Plan,Total Produced Qty,Вкупно произведена количина
 DocType: Payroll Entry,Get Employee Details,Дознајте детали за вработените
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мудар Набавка Историја
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 DocType: Sales Invoice Payment,Base Amount (Company Currency),База Износ (Фирма валута)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Суровини
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Суровини
 DocType: Payment Reconciliation Payment,Reference Row,Суд ред
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Детали за сметководство
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Бришење на сите трансакции за оваа компанија
 DocType: Patient,O Positive,О Позитивно
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,алокации
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Прифаќање критериуми
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ве молиме внесете Материјал Барања во горната табела
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Нема достапни отплати за внесување на весници
 DocType: Item Attribute,Attribute Name,Атрибут Име
 DocType: BOM,Show In Website,Прикажи Во вебсајт
 DocType: Shopping Cart Settings,Show Quantity in Website,Прикажи Кол во веб-страница
-DocType: Employee Loan Application,Total Payable Amount,Вкупно се плаќаат Износ
+DocType: Loan Application,Total Payable Amount,Вкупно се плаќаат Износ
 DocType: Task,Expected Time (in hours),Се очекува времето (во часови)
 DocType: Item Reorder,Check in (group),Проверете во (група)
 DocType: Soil Texture,Silt,Silt
@@ -2434,7 +2443,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Направете Плакањето
 DocType: Room,Room Name,соба Име
 DocType: Prescription Duration,Prescription Duration,Времетраење на рецепт
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
 DocType: Activity Cost,Costing Rate,Цена на Чинење
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Адресите на клиентите и контакти
 ,Campaign Efficiency,Ефикасноста кампања
@@ -2454,11 +2463,11 @@
 DocType: Chapter,Chapter,Поглавје
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Пар
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Стандардната сметка автоматски ќе се ажурира во POS фактура кога е избран овој режим.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Изберете BOM и Количина за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Изберете BOM и Количина за производство
 DocType: Asset,Depreciation Schedule,амортизација Распоред
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Продажбата партнер адреси и контакти
 DocType: Bank Reconciliation Detail,Against Account,Против профил
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Половина ден датум треба да биде помеѓу Од датум и до денес
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Половина ден датум треба да биде помеѓу Од датум и до денес
 DocType: Maintenance Schedule Detail,Actual Date,Крај Датум
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Поставете го Центарот за стандардни трошоци во {0} компанија.
 DocType: Item,Has Batch No,Има Batch Не
@@ -2476,7 +2485,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист)
 DocType: Soil Texture,Soil Type,Тип на почва
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Нова порака
 ,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless мандат
@@ -2496,7 +2504,7 @@
 DocType: Hub Category,Hub Category,Категорија на категории
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Број на возило
-DocType: Employee Loan,Loan Amount,Износ на кредитот
+DocType: Loan,Loan Amount,Износ на кредитот
 DocType: Student Report Generation Tool,Add Letterhead,Додај меморандум
 DocType: Program Enrollment,Self-Driving Vehicle,Само-управување со моторно возило
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Постојана
@@ -2525,9 +2533,9 @@
 DocType: Cash Flow Mapper,Position,Позиција
 DocType: Patient,Patient Details,Детали за пациентот
 DocType: Patient,B Positive,Б Позитивен
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr не може да биде празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Медицински рекорд на пациенти
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спорт
@@ -2535,8 +2543,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Вкупно Крај
 DocType: Lab Test UOM,Test UOM,Тест UOM
 DocType: Student Siblings,Student Siblings,студентски Браќа и сестри
+DocType: Subscription Plan Detail,Subscription Plan Detail,Детален план за претплати
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Ве молиме назначете фирма,"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Ве молиме назначете фирма,"
 ,Customer Acquisition and Loyalty,Стекнување на клиентите и лојалност
 DocType: Asset Maintenance Task,Maintenance Task,Задача за одржување
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Ве молиме наместете B2C Limit во GST Settings.
@@ -2551,6 +2560,7 @@
 ,BOM Search,BOM пребарувај
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Вкупен трошок за потрошен материјал (преку внес на акции)
 DocType: Hub Settings,Company Registered,Компанијата е регистрирана
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Да датумот не може да биде помал од датумот
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Објавете &quot;Има во залиха&quot; или &quot;Нема во акции&quot; на Hub врз основа на акции достапни во овој склад.
 DocType: Vehicle,Fuel Type,Тип на гориво
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ве молиме наведете валута во компанијата
@@ -2558,17 +2568,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Акции рамнотежа во Серија {0} ќе стане негативна {1} за Точка {2} На Магацински {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следните Материјал Барања биле воспитани автоматски врз основа на нивото повторно цел елемент
 DocType: Email Digest,Pending Sales Orders,Во очекување Продај Нарачка
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 DocType: Employee,Create User Permission,Креирај дозвола за корисници
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на ставка&gt; Група на производи&gt; Бренд
 DocType: Healthcare Settings,Remind Before,Потсетете претходно
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
 DocType: Salary Component,Deduction,Одбивање
 DocType: Item,Retain Sample,Задржете го примерокот
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
 DocType: Stock Reconciliation Item,Amount Difference,износот на разликата
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
 DocType: Territory,Classification of Customers by region,Класификација на клиенти од регионот
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Во продукција
@@ -2578,8 +2589,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Пресметаната извод од банка биланс
 DocType: Normal Test Template,Normal Test Template,Нормален тест образец
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,корисник со посебни потреби
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Понуда
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Не може да се постави примена RFQ во Нема Цитат
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Не може да се постави примена RFQ во Нема Цитат
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Вкупно Расходи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Изберете сметка за печатење во валута на сметката
@@ -2587,7 +2598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ова се базира на трансакции против овој пациент. Погледнете временска рамка подолу за детали
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Цена освежено
 DocType: Patient,Date of Birth,Датум на раѓање
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Точка {0} веќе се вратени
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Потенцијален клиент адреса
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставување на картичка за снабдувач
@@ -2598,14 +2609,15 @@
 DocType: Work Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Опис на работата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Опис на работата
 DocType: Student Applicant,Applied,Аплицира
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Повторно да се отвори
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Повторно да се отвори
 DocType: Sales Invoice Item,Qty as per Stock UOM,Количина како на берза UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Име Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Попуст за продавање на 2-пост
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете ги Продажните кампањи. Следете ги Потенцијалните клиенти, Понуди, Продажните нарачки итн. од Кампањите за да го измерите Враќањето на инвестицијата."
+DocType: Department Approver,Approver,Approver
 ,SO Qty,ПА Количина
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Полето До Содружниците не може да биде празно
 DocType: Guardian,Work Address,работа адреса
@@ -2619,21 +2631,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Вкупно одобрени Износ (Фирма валута)
 DocType: Purchase Order Item,To be delivered to customer,Да бидат доставени до клиентите
 DocType: BOM,Scrap Material Cost,Отпад материјални трошоци
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
 DocType: Grant Application,Email Notification Sent,Испратено е известување за е-пошта
 DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Код Код, магацин, количина се потребни за ред"
-DocType: Pricing Rule,Supplier,Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Код Код, магацин, количина се потребни за ред"
+DocType: Bank Guarantee,Supplier,Добавувачот
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Прикажи Детали за плаќање
 DocType: Consultation,Consultation Time,Време на консултација
 DocType: C-Form,Quarter,Четвртина
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Останати трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Останати трошоци
 DocType: Global Defaults,Default Company,Стандардно компанијата
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
 DocType: Payment Request,PR,односи со јавноста
 DocType: Cheque Print Template,Bank Name,Име на банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Вработен заем сметка
 DocType: Leave Application,Total Leave Days,Вкупно Денови Отсуство
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забелешка: Е-пошта нема да биде испратена до корисниците со посебни потреби
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број на интеракција
@@ -2649,7 +2660,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Тежина (во килограм)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",поглавја / поглавје оставаат празно за автоматско по зачувување на поглавјето.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Ве молам поставете ги GST профилите во GST Settings
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Ве молам поставете ги GST профилите во GST Settings
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Тип на бизнис
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Цената на нов купувачите
@@ -2658,12 +2669,13 @@
 DocType: Grant Application,Grant Description,Грант Опис
 DocType: Purchase Invoice Item,Rate (Company Currency),Цена (Валута на Фирма)
 DocType: Student Guardian,Others,"Други, пак,"
+DocType: Subscription,Discounts,Попусти
 DocType: Payment Entry,Unallocated Amount,Износ на неиздвоена
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде ставка. Ве молиме одберете некои други вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Даноци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","А производ или услуга, која е купен, кои се продаваат или се чуваат во парк."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Нема повеќе надградби
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете видот на пресметување како 'Износ на претходниот ред' или 'Вкупно на претходниот ред' за првиот ред
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете видот на пресметување како 'Износ на претходниот ред' или 'Вкупно на претходниот ред' за првиот ред
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ова ги опфаќа сите броеви за картички врзани за овој подесување
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ставката од подгрупата, не треба да биде во Пакетот Производи. Ве молиме отстранете ја ставката '{0}'"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Банкарство
@@ -2672,21 +2684,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на &quot;Генерирање Распоред&quot; да се добие распоред
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 DocType: Bin,Ordered Quantity,Нареди Кол
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Скала за оценување интервали
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Добивка за годината
+DocType: Bank Guarantee,Name of Bank,Име на Банката
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Сметководство за влез на {2} може да се направи само во валута: {3}
 DocType: Fee Schedule,In Process,Во процесот
 DocType: Authorization Rule,Itemwise Discount,Itemwise попуст
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дрвото на финансиски сметки.
+DocType: Bank Guarantee,Reference Document Type,Референтен документ Тип
 DocType: Cash Flow Mapping,Cash Flow Mapping,Мапирање на готовински тек
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} против Продај Побарувања {1}
 DocType: Account,Fixed Asset,Основни средства
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Серијали Инвентар
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Е-пошта не е пронајдена во стандардниот контакт
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерирање на тајната
-DocType: Employee Loan,Account Info,информации за сметката
+DocType: Loan,Account Info,информации за сметката
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
 DocType: Fees,Include Payment,Вклучи плаќање
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} студентски групи создадени.
@@ -2694,24 +2709,24 @@
 DocType: Sales Invoice,Total Billing Amount,Вкупен Износ на Наплата
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програмата во структурата на надоместоците и студентската група {0} се различни.
 DocType: Fee Schedule,Receivable Account,Побарувања профил
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
 DocType: Quotation Item,Stock Balance,Биланс на акции
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Продај Побарувања на плаќање
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,извршен директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,извршен директор
 DocType: Purchase Invoice,With Payment of Tax,Со плаќање на данок
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Три примероци за обезбедувачот
 DocType: Land Unit,Is Container,Е контејнер
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ова ќе биде ден 1 од циклусот на култури
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Ве молиме изберете ја точната сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Purchase Invoice Item,Weight UOM,Тежина UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Листа на достапни акционери со фолио броеви
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура на вработените
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Прикажи атрибути на варијанта
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Прикажи атрибути на варијанта
 DocType: Student,Blood Group,Крвна група
 DocType: Course,Course Name,Име на курсот
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисниците кои може да одобри апликации одмор одредена вработениот
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Канцеларија опрема
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Канцеларија опрема
 DocType: Purchase Invoice Item,Qty,Количина
 DocType: Fiscal Year,Companies,Компании
 DocType: Supplier Scorecard,Scoring Setup,Поставување на бодување
@@ -2730,7 +2745,7 @@
 DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Дебитна Да се бара
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Откупната цена Листа
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на резултатите од добавувачот.
 DocType: Job Offer Term,Offer Term,Понуда Рок
 DocType: Asset,Quality Manager,Менаџер за квалитет
@@ -2742,13 +2757,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Вкупно ненаплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,Бум на вебсајт Операција
 DocType: Supplier Scorecard,Supplier Score,Оценка од добавувачот
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Вкупно Фактурирана изн.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Вкупно Фактурирана изн.
 DocType: Supplier,Warn RFQs,Предупреди RFQs
 DocType: BOM,Conversion Rate,конверзии
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Барај производ
 DocType: Assessment Plan,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобрување Улогата (над овластени вредност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
+DocType: Loan,Total Amount Paid,Вкупен износ платен
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ве молиме изберете Студентски прием кој е задолжителен за платен студент апликант
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Ве молиме изберете Ценовник за објавување на цените
@@ -2758,19 +2774,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ценовник {0} е исклучен
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршено Количина не може да биде повеќе од {1} за работа {2}
 DocType: Manufacturing Settings,Allow Overtime,Дозволете Прекувремена работа
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серијали Точка {0} не може да се ажурираат со користење Акции на помирување, ве молиме користете Акции Влегување"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серијали Точка {0} не може да се ажурираат со користење Акции на помирување, ве молиме користете Акции Влегување"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серијали Точка {0} не може да се ажурираат со користење Акции на помирување, ве молиме користете Акции Влегување"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серијали Точка {0} не може да се ажурираат со користење Акции на помирување, ве молиме користете Акции Влегување"
 DocType: Training Event Employee,Training Event Employee,Обука на вработените на настанот
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максималните примероци - {0} може да се задржат за серија {1} и точка {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Додади временски слотови
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за ставка {1}. Сте ги доставиле {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} сериски броеви потребно за ставка {1}. Сте ги доставиле {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тековни Вреднување стапка
 DocType: Training Event,Advance,Однапред
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,за повторно да се повторува.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Подесувања на Gateway за плаќање за GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Размена добивка / загуба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Размена добивка / загуба
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Сметка {1} не припаѓа на компанија {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Сметка {1} не припаѓа на компанија {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не може да се пронајде DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
@@ -2789,7 +2804,6 @@
 DocType: Bin,Actual Quantity,Крај на Кол
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериски № {0} не е пронајдена
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Претплата е {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма Распоред програма
 DocType: Fee Schedule Program,Student Batch,студентски Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Направете Студентски
@@ -2805,14 +2819,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Е-трговија GSTIN
 DocType: Sales Order,Not Delivered,Не Дадени
 ,Bank Clearance Summary,Банката Чистење Резиме
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Креирање и управување со дневни, неделни и месечни Е-содржините."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Креирање и управување со дневни, неделни и месечни Е-содржините."
 DocType: Appraisal Goal,Appraisal Goal,Процена Цел
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Предложете категорија?
 DocType: Stock Reconciliation Item,Current Amount,тековната вредност
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,згради
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,згради
 DocType: Fee Schedule,Fee Structure,Провизија Структура
 DocType: Timesheet Detail,Costing Amount,Чини Износ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
 DocType: Student Admission Program,Application Fee,Такса
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Поднесе Плата фиш
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm попуст за ставката {0} е {1}%
@@ -2820,12 +2833,13 @@
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Испраќачот Име
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Критериуми за анализа на земјоделството
+DocType: HR Settings,Leave Approval Notification Template,Остави шаблон за известување за одобрување
 DocType: POS Profile,[Select],[Избери]
 DocType: Vital Signs,Blood Pressure (diastolic),Крвен притисок (дијастолен)
 DocType: SMS Log,Sent To,Испратени до
 DocType: Agriculture Task,Holiday Management,Холидејт менаџмент
 DocType: Payment Request,Make Sales Invoice,Направи Продажна Фактура
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,софтвери
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,софтвери
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
 DocType: Company,For Reference Only.,За повикување само.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Лекарот {0} не е достапен на {1}
@@ -2843,7 +2857,7 @@
 DocType: Employee,New Workplace,Нов работен простор
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Потрошувачка на материјал
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Постави како Затворено
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Не точка со Баркод {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Не точка со Баркод {0}
 DocType: Normal Test Items,Require Result Value,Потребна вредност на резултатот
 DocType: Item,Show a slideshow at the top of the page,Прикажи слајдшоу на врвот на страната
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2858,19 +2872,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
 DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Повторувачки
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Детали за шаблони за мапирање на готовинскиот тек
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Кредит за управување
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ги пратите одделни приходи и расходи за вертикали производ или поделби.
 DocType: Rename Tool,Rename Tool,Преименувај алатката
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Прикажи Плата фиш
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Прикажи Плата фиш
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Пренос на материјал
 DocType: Fees,Send Payment Request,Испрати барање за исплата
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 DocType: Water Analysis,Origin,Потекло
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Поставете се повторуваат по спасување
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
@@ -2885,14 +2899,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Дали е обврска за данок на доход
 DocType: Grading Scale Interval,Grade Description,степен Опис
 DocType: Stock Entry,Purchase Receipt No,Купување Потврда Не
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Искрена пари
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Искрена пари
 DocType: Sales Invoice, Shipping Bill Number,Број за предавање
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Следење
 DocType: Asset Maintenance Log,Actions performed,Извршени акции
 DocType: Cash Flow Mapper,Section Leader,Лидер на одделот
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Извор на фондови (Пасива)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Извор на фондови (Пасива)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Вработен
+DocType: Bank Guarantee,Fixed Deposit Number,Број за фиксен депозит
 DocType: Asset Repair,Failure Date,Датум на откажување
 DocType: Sample Collection,Collected Time,Собрано време
 DocType: Company,Sales Monthly History,Месечна историја за продажба
@@ -2909,10 +2924,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Дали сте сигурни дека сакате да го откажете овој состанок?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за цени за хотелска соба
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,гасоводот продажба
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Земи ги ажурирањата на претплатата
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Сметка {0} не се поклопува со компанијата {1} во режим на сметка: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Курс:
@@ -2922,7 +2938,7 @@
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Создадени работни нарачки
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Плата фиш на вработените {0} веќе создадена за овој период
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Фармацевтската
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Фармацевтската
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Цената на купените предмети
 DocType: Selling Settings,Sales Order Required,Продај Побарувања задолжителни
 DocType: Purchase Invoice,Credit To,Кредитите за
@@ -2940,7 +2956,7 @@
 DocType: Request for Quotation Supplier,No Quote,Не Цитат
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Gateway Account,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Нето промени во Побарувања
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Обесштетување Off
 DocType: Job Offer,Accepted,Прифатени
@@ -2953,7 +2969,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Резултати од пребарувањето
 DocType: Room,Room Number,Број на соба
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Невалидна референца {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Невалидна референца {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 DocType: Journal Entry Account,Payroll Entry,Влез во платниот список
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Погледни такса записи
@@ -2963,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Lab Test Sample,Lab Test Sample,Примерок за лабораториски испитувања
 DocType: Item Variant Settings,Allow Rename Attribute Value,Дозволи преименување на вредноста на атрибутот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Брзо весник Влегување
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Restaurant,Invoice Series Prefix,Префикс на серија на фактури
 DocType: Employee,Previous Work Experience,Претходно работно искуство
@@ -2971,8 +2987,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Интеграцијата на Google Мапи не е овозможена
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не е поднесен
+DocType: Subscription,Trialling,Испитување
 DocType: Member,Membership Expiry Date,Датум на истекот на членството
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,"{0} мора да биде негативен, во замена документ"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,"{0} мора да биде негативен, во замена документ"
 ,Minutes to First Response for Issues,Минути за прв одговор за прашања
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
@@ -2991,7 +3008,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Единица мерка
 DocType: Fiscal Year,Year End Date,Годината завршува на Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Можност
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Можност
 DocType: Operation,Default Workstation,Стандардно Workstation
 DocType: Notification Control,Expense Claim Approved Message,Сметка Тврдат Одобрени порака
 DocType: Payment Entry,Deductions or Loss,Одбивања или загуба
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Неплатено отсуство не се поклопува со одобрен евиденција оставите апликацијата
 DocType: Campaign,Campaign-.####,Кампања -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направете Фактура
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Преостанато биланс
@@ -3039,7 +3056,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,крајот на годината
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Driver,Driver,Возач
 DocType: Vital Signs,Nutrition Values,Вредности на исхрана
 DocType: Lab Test Template,Is billable,Дали е наплатлив
@@ -3050,7 +3067,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Старт на проектот Датум (преку време лист)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Стареењето опсег 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Вкупниот износ на авансот не може да биде поголем од вкупниот побаран износ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Вкупниот износ на авансот не може да биде поголем од вкупниот побаран износ
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3085,7 +3102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе од ставка {0} од количина {1} во Продажна нарачка
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Изберете вредности за атрибути
 DocType: Purchase Invoice,Reason For Issuing document,Причина за издавање на документ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Следна Контакт Со тоа што не може да биде ист како олово-мејл адреса
 DocType: Tax Rule,Billing City,Платежна Сити
@@ -3102,7 +3119,8 @@
 DocType: Warranty Claim,Service Address,Услуга адреса
 DocType: Asset Maintenance Task,Calibration,Калибрација
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} е одмор на компанијата
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Мебел и тела
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Оставете го известувањето за статусот
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Мебел и тела
 DocType: Item,Manufacture,Производство
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Компанија за поставување
 ,Lab Test Report,Лабораториски тест извештај
@@ -3118,7 +3136,6 @@
 DocType: Crop,Planting Area,Површина за садење
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ова може да биде поради некои неважечки е-мејл адреси во
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Додадовте
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,обука Резултат
@@ -3128,16 +3145,17 @@
 DocType: Products Settings,Products per Page,Производи по страница
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Организација гранка господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Изнеле
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Комунални трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Комунални трошоци
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90-
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: весник Влегување {1} нема сметка {2} или веќе се исти против друг ваучер
 DocType: Supplier Scorecard Criteria,Criteria Weight,Тежина на критериумите
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Оставете го известувањето за одобрување
 DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Плата фиш Врз основа на timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Стапка на купување
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Стапка на купување
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 DocType: Payment Entry,Payment Type,Тип на плаќање
@@ -3160,6 +3178,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Корпа Settings
 DocType: Journal Entry,Accounting Entries,Сметководствени записи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако селектираното правило за цени е направено за &#39;Rate&#39;, тоа ќе ја презапише ценовникот. Стапката на цена на цени е конечна стапка, па не треба да се применува дополнителен попуст. Оттука, во трансакции како што се Нарачка за продажба, Нарачка и така натаму, ќе бидат превземени во полето &quot;Оцени&quot;, наместо полето &quot;Ценова листа на цени&quot;."
+DocType: Journal Entry,Paid Loan,Платен заем
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Дупликат внес. Ве молиме проверете Овластување Правило {0}
 DocType: Journal Entry Account,Reference Due Date,Референтен датум на достасување
 DocType: Purchase Order,Ref SQ,Реф SQ
@@ -3176,7 +3195,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Даноци
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
 DocType: Patient Service Unit,Parent Service Unit,Единица за родителска служба
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Направете пристап
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација на пакетот за испорака (за печатење)
@@ -3195,7 +3214,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Сметка приходи
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Испорака
 DocType: Volunteer,Weekdays,Работни дена
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: Restaurant Menu,Restaurant Menu,Мени за ресторани
@@ -3203,7 +3222,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Поставете инвентар стандардна сметка за постојана инвентар
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Поставете инвентар стандардна сметка за постојана инвентар
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Испратете е-пошта за Грант Преглед
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage е полна, не штедеше"
@@ -3211,10 +3230,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Капацитет на соба
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Веќе постои запис за ставката {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Реф
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Ќе изгубите евиденција на претходно генерирани фактури. Дали сте сигурни дека сакате да ја рестартирате оваа претплата?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Такса за регистрација
 DocType: Budget,Cost Center,Трошоците центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Нарачка порака
 DocType: Tax Rule,Shipping Country,Превозот Земја
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скриј даночен број купувачи од продажбата на трансакции
@@ -3223,20 +3243,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може да се менува само преку берза за влез / Испратница / Купување Потврда
 DocType: Employee Education,Class / Percentage,Класа / Процент
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Раководител на маркетинг и продажба
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Раководител на маркетинг и продажба
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Данок на доход
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Одете во писма
+DocType: Subscription,Cancel At End Of Period,Откажи на крајот на периодот
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Нема селектирани ставки за пренос
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Нема селектирани ставки за пренос
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
 DocType: Vehicle,Electric,електричен
 DocType: Task,% Progress,напредок%
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Добивка / загуба за располагање со средства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Добивка / загуба за располагање со средства
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Само во студентската апликација со статус &quot;Одобрено&quot; ќе бидат избрани во табелата подолу.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Бројот на сметката за сметката {0} не е достапен. <br> Те молам правилно поставете го сметковниот план.
 DocType: Task,Depends on Tasks,Зависи Задачи
@@ -3251,6 +3272,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Не во парк
 DocType: Volunteer,Volunteer Skills,Волонтерски вештини
 DocType: Appraisal,HR User,HR пристап
+DocType: Bank Guarantee,Reference Document Name,Име на референтниот документ
 DocType: Purchase Invoice,Taxes and Charges Deducted,Даноци и давачки одземени
 apps/erpnext/erpnext/hooks.py +142,Issues,Прашања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус мора да биде еден од {0}
@@ -3264,7 +3286,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
+DocType: Loan,Loan Application,Апликација за заем
 DocType: Crop,Scientific Name,Научно име
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Вкупно Лисја
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Ресетирај, ако избраниот контакт се уредува по зачувување"
@@ -3273,13 +3296,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Чек број
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно Должи
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Локалните
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и побарувања (средства)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должниците
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Големи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Големи
 DocType: Homepage Featured Product,Homepage Featured Product,Почетната страница од пребарувачот Избрана производ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Сите оценка групи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Сите оценка групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нова Магацински Име
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Вкупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
@@ -3300,9 +3323,10 @@
 DocType: Fees,Fees,надоместоци
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведете курс за претворање на еден валута во друга
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Понудата {0} е откажана
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Вкупно Неизмирен Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Вкупно Неизмирен Износ
 DocType: Sales Partner,Targets,Цели
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Ве молиме регистрирајте го бројот SIREN во информативната датотека на компанијата
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 DocType: Price List,Price List Master,Ценовник мајстор
 DocType: GST Account,CESS Account,CESS сметка
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
@@ -3311,6 +3335,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изберете пациент
 DocType: Price List,Applicable for Countries,Применливи за земјите
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име на параметри
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само апликации со статус &#39;одобрена &quot;и&quot; Отфрлени &quot;може да се поднесе
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Група на студенти Името е задолжително во ред {0}
 DocType: Homepage,Products to be shown on website homepage,Производи да бидат прикажани на веб-сајтот почетната страница од пребарувачот
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
@@ -3344,14 +3369,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Фактура која е веќе креирана за сите платежни часови
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Име грешка: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Дали трошоците за финансирање
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повеќе од еден пакет од ист тип (за печатење)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ве молиме поставете стандарден клиент во поставките за ресторани
 ,Salary Register,плата Регистрирај се
 DocType: Warehouse,Parent Warehouse,родител Магацински
-DocType: C-Form Invoice Detail,Net Total,Нето Вкупно
+DocType: Subscription,Net Total,Нето Вкупно
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Аватарот на Бум не е најдена Точка {0} и Проектот {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Дефинирање на различни видови на кредитот
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Дефинирање на различни видови на кредитот
 DocType: Bin,FCFS Rate,FCFS стапка
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Преостанатиот износ за наплата
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Време (во минути)
@@ -3383,11 +3408,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root сметката мора да биде група
 DocType: Drug Prescription,Drug Prescription,Рецепт на лекови
 DocType: Fees,FEE.,Плаќање.
-DocType: Employee Loan,Repaid/Closed,Вратени / Затворено
+DocType: Loan,Repaid/Closed,Вратени / Затворено
 DocType: Item,Total Projected Qty,Вкупно планираните Количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Стапката на проценка не е пронајдена за Точката {0}, што е потребно да се извршат сметководствени записи за {1} {2}. Ако предметот е склучен како ставка за проценка на нулта вредност во {1}, наведете го тоа во табелата {1} Точка. Во спротивно, ве молиме креирајте дојдовна трансакција на акции за ставката или споменете проценка на проценката во записот Ставка, а потоа пробајте да го поднесете / откажете овој запис"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 DocType: Course,Course Code,Код на предметната програма
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 DocType: POS Settings,Use POS in Offline Mode,Користете POS во Offline режим
@@ -3407,16 +3431,15 @@
 DocType: Purchase Invoice,Deemed Export,Се смета дека е извоз
 DocType: Stock Entry,Material Transfer for Manufacture,Материјал трансфер за Производство
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Процент може да се примени или против некој Ценовник или за сите ценовникот.
-DocType: Subscription,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Lab Test,LabTest Approver,LabTest одобрувач
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Веќе сте се проценува за критериумите за оценување {}.
 DocType: Vehicle Service,Engine Oil,на моторното масло
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Создадени работни задачи: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Создадени работни задачи: {0}
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
-DocType: Employee Loan,Loan Details,Детали за заем
+DocType: Loan,Loan Details,Детали за заем
 DocType: Company,Default Inventory Account,Стандардно Инвентар сметка
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Фолио броевите не се совпаѓаат
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
@@ -3428,19 +3451,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Поврзаност со сите земјишни единици во кои културата расте
 DocType: Account,Root Type,Корен Тип
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не можам да се вратат повеќе од {1} за Точка {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не можам да се вратат повеќе од {1} за Точка {2}
 DocType: Item Group,Show this slideshow at the top of the page,Прикажи Овој слајдшоу на врвот на страната
 DocType: BOM,Item UOM,Точка UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износот на данокот По Износ попуст (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
 DocType: Cheque Print Template,Primary Settings,Примарен Settings
 DocType: Purchase Invoice,Select Supplier Address,Изберете Добавувачот адреса
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Додај вработени
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Додај вработени
 DocType: Purchase Invoice Item,Quality Inspection,Квалитет инспекција
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Екстра Мали
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Екстра Мали
 DocType: Company,Standard Template,стандардна дефиниција
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
@@ -3460,11 +3483,10 @@
 DocType: SMS Log,No of Sent SMS,Број на испратени СМС
 DocType: Antibiotic,Healthcare Administrator,Администратор за здравство
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Постави цел
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 DocType: Dosage Strength,Dosage Strength,Сила на дозирање
 DocType: Account,Expense Account,Сметка сметка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Софтвер
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Боја
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,План за оценување на критериумите
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Датумот на истекување е задолжителен за избраниот предмет
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Спречи налози за набавки
@@ -3477,18 +3499,18 @@
 DocType: Patient,Personal and Social History,Лична и социјална историја
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Создаден корисник {0}
 DocType: Fee Schedule,Fee Breakup for each student,Провизија на отплата за секој ученик
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Промени го кодот
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Ценовник Валута не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Ценовник Валута не е избрано
 DocType: Purchase Invoice,Availed ITC Cess,Искористил ИТЦ Cess
 ,Student Monthly Attendance Sheet,Студентски Месечен евидентен лист
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило за испорака единствено применливо за Продажба
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Почеток на проектот Датум
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,До
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Преименувај Влез
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Група на студенти или Курс Распоред е задолжително
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Група на студенти или Курс Распоред е задолжително
@@ -3509,7 +3531,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Наведете ги вашите производи или услуги што ги купувате или продавате.
 DocType: Water Analysis,Storage Temperature,Температура на складирање
 DocType: Employee Attendance Tool,Unmarked Attendance,необележани Публика
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Истражувач
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Истражувач
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Програма за запишување на студенти на алатката
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Почетниот датум треба да биде помал од крајниот датум за задача {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Име или е-пошта е задолжително
@@ -3522,7 +3544,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} во моментов има {1} Побарувач за оценувачи, и RFQ на овој добавувач треба да се издаде со претпазливост."
 DocType: Chapter,Non Profit Manager,Непрофитен менаџер
 DocType: BOM,Total Cost(Company Currency),Вкупно трошоци (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Сериски № {0} создаден
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Сериски № {0} создаден
 DocType: Homepage,Company Description for website homepage,Опис на компанијата за веб-сајт почетната страница од пребарувачот
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За погодност на клиентите, овие кодови може да се користи во печатените формати како Фактури и испорака белешки"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Име suplier
@@ -3532,11 +3554,10 @@
 DocType: Employee,You can enter any date manually,Можете да внесете кој било датум рачно
 DocType: Healthcare Settings,Result Printed,Резултатот е отпечатен
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација сметка сметка
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Пробниот период
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Приказ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Пробниот период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакција
 DocType: Project,Total Costing Amount (via Timesheets),Вкупен износ на трошоци (преку тајмс)
-DocType: Employee Advance,Expense Approver,Сметка Approver
+DocType: Department,Expense Approver,Сметка Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
 DocType: Project,Hourly,Часовник
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Не-група до група
@@ -3546,7 +3567,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да DateTime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
 DocType: Accounts Settings,Make Payment via Journal Entry,Се направи исплата преку весник Влегување
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,отпечатена на
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,отпечатена на
 DocType: Item,Inspection Required before Delivery,Потребни инспекција пред породувањето
 DocType: Item,Inspection Required before Purchase,Инспекција што се бара пред да ги купите
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Активности во тек
@@ -3556,7 +3577,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Минимална количина за нарачка
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,вашата организација
 DocType: Fee Component,Fees Category,надоместоци Категорија
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Ве молиме внесете ослободување датум.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,АМТ
 DocType: Supplier Scorecard,Notify Employee,Извести го вработениот
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
@@ -3566,7 +3587,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Пренареждане ниво
 DocType: Company,Chart Of Accounts Template,Сметковниот план Шаблон
 DocType: Attendance,Attendance Date,Публика Датум
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Точка Цена ажурирани за {0} во Ценовникот {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Точка Цена ажурирани за {0} во Ценовникот {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
 DocType: Purchase Invoice Item,Accepted Warehouse,Прифатени Магацински
@@ -3574,10 +3595,11 @@
 DocType: Item,Valuation Method,Начин на вреднување
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Марк Половина ден
 DocType: Sales Invoice,Sales Team,Тим за продажба
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Дупликат внес
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дупликат внес
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Внесете го името на Корисникот пред да поднесете.
 DocType: Program Enrollment Tool,Get Students,Студентите се добие
 DocType: Serial No,Under Warranty,Под гаранција
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе бидат видливи откако ќе го спаси Продај Побарувања.
 ,Employee Birthday,Вработен Роденден
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Ве молиме изберете Датум на завршување за завршено поправка
@@ -3596,7 +3618,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Резервирано за поддоговор
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
 DocType: Shopping Cart Settings,Orders,Нарачка
-DocType: Employee Leave Approver,Leave Approver,Остави Approver
+DocType: Department,Leave Approver,Остави Approver
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Ве молиме изберете една серија
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Името на групата за процена
@@ -3641,7 +3663,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Центар за гасеница
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL за RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Оваа е-пошта е автогенерирана
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
 DocType: Program Enrollment,Boarding Student,интернат Студентски
 DocType: Asset,Expected Value After Useful Life,Предвидена вредност По корисен век
@@ -3666,22 +3687,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Присуство евиденција {0} постои против Студентски {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Амортизација Елиминиран поради пренесување на средствата на
-DocType: Member,Member,Член
+DocType: Loan,Member,Член
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управуваат со адреси
 DocType: Work Order Item,Work Order Item,Точка за работа
 DocType: Pricing Rule,Item Code,Точка законик
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Земјоделски менаџер
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
 DocType: Supplier Scorecard Period,Variables,Променливи
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Затворање (д-р)
 DocType: Cheque Print Template,Cheque Size,чек Големина
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Сериски № {0} не во парк
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Сериски № {0} не во парк
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Даночен шаблон за Продажни трансакции.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отпише преостанатиот износ за наплата
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Сметка {0} не се поклопува со компанијата {1}
@@ -3690,7 +3711,6 @@
 DocType: Stock Settings,Default Stock UOM,Стандардно берза UOM
 DocType: Asset,Number of Depreciations Booked,Број на амортизациони Резервирано
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Количина Вкупно
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Против вработените кредит: {0}
 DocType: Landed Cost Item,Receipt Document,приемот на документи
 DocType: Employee Education,School/University,Училиште / Факултет
 DocType: Payment Request,Reference Details,Референца Детали
@@ -3701,7 +3721,7 @@
 DocType: Asset,Double Declining Balance,Двоен опаѓачки баланс
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Затворена за да не може да биде укинат. Да отворат за да откажете.
 DocType: Student Guardian,Father,татко
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 DocType: Attendance,On Leave,на одмор
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Добијат ажурирања
@@ -3715,10 +3735,10 @@
 DocType: Lead,Lower Income,Помал приход
 DocType: Restaurant Order Entry,Current Order,Тековен ред
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Одете во Програми
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Ослободената сума {1} не може да биде поголема од неподигнатото количество {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Ослободената сума {1} не може да биде поголема од неподигнатото количество {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датум"" мора да биде по ""до датум"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
@@ -3741,7 +3761,6 @@
 DocType: Payment Terms Template,Payment Terms,Услови на плаќање
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Минута
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 DocType: Chapter,Meetup Embed HTML,Meetup Вградување на HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Одете на добавувачи
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Понудата {0} не е од типот {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Те молам постави Идентификатор за е-пошта за ученикот да испрати барање за исплата
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Те молам постави Идентификатор за е-пошта за ученикот да испрати барање за исплата
 DocType: Patient,Medical History,Медицинска историја
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Банка пречекорување на профилот
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Банка пречекорување на профилот
 DocType: Patient,Patient ID,ID на пациентот
 DocType: Physician Schedule,Schedule Name,Распоред име
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Направете Плата фиш
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Додај ги сите добавувачи
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Додај ги сите добавувачи
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Ред # {0}: лимит, не може да биде поголем од преостанатиот износ."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Преглед на бирото
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Препорачана кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Препорачана кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Измени Праќање пораки во Датум и време
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Поставете Амортизација поврзани сметки во Категорија Средства {0} или куќа {1}
 DocType: Lab Test Groups,Normal Range,Нормален опсег
 DocType: Academic Term,Academic Year,Академска година
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Достапно Продажба
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Салдо инвестициски фондови
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Салдо инвестициски фондови
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,останатите
 DocType: Appraisal,Appraisal,Процена
+DocType: Loan,Loan Account,Сметка за заем
 DocType: Purchase Invoice,GST Details,Детали за GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Е-мејл испратен до снабдувачот {0}
 DocType: Item,Default Sales Unit of Measure,Стандардна единица за продажба на мерка
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Академска година:
+DocType: Subscription,Past Due Date,Датум на достасаност
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Не дозволувајте да поставите алтернативен елемент за ставката {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се повторува
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,Именување на пациентот
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Одобрување улога не може да биде иста како и улогата на владеење е се применуваат на
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Се откажете од оваа е-мејл билтени
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Добивај добавувачи
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Добивај добавувачи
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} не е пронајден за Точка {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Оди на курсеви
 DocType: Accounts Settings,Show Inclusive Tax In Print,Прикажи инклузивен данок во печатење
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Пораката испратена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Сметка со дете јазли не можат да се постават како Леџер
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието&gt; Образование
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Стапка по која Ценовник валута е претворена во основна валута купувачи
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: Physician,Physician Schedules,Лекар Распоред
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Вкупниот износ на претплата не може да биде поголем од вкупниот санкциониран износ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Вкупниот износ на претплата не може да биде поголем од вкупниот санкциониран износ
 DocType: Salary Slip,Hour Rate,Цена на час
 DocType: Stock Settings,Item Naming By,Точка грабеж на име со
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурира акции трансакции постари од {0}
 DocType: BOM,Inspection Required,Инспекција што се бара
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Внесете го Гарантниот број на Банката пред да поднесете.
 DocType: Driving License Category,Class,Класа
 DocType: Sales Order,Fully Billed,Целосно Опишан
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Работната нарачка не може да се покрене против Шаблон за Предмет
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Assessment Plan,Program,Програмата
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието&gt; Образование
 DocType: Serial No,Is Cancelled,Е Откажано
 DocType: Student Group,Group Based On,Група врз основа на
 DocType: Student Group,Group Based On,Група врз основа на
@@ -3848,9 +3870,10 @@
 DocType: Cheque Print Template,Cheque Height,чек Висина
 DocType: Supplier,Supplier Details,Добавувачот Детали за
 DocType: Setup Progress,Setup Progress,Прогрес за поставување
+DocType: Expense Claim,Approval Status,Статус на Одобри
 DocType: Hub Settings,Publish Items to Hub,Објавуваат Теми на Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Од вредност мора да биде помал од вредност во ред {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Проверете ги сите
 ,Issued Items Against Work Order,Издадени предмети против работната нарачка
 DocType: Vehicle Log,Invoice Ref,фактура Реф
@@ -3881,12 +3904,11 @@
 DocType: Customs Tariff Number,Tariff Number,тарифен број
 DocType: Work Order Item,Available Qty at WIP Warehouse,Достапно Количина во WIP Магацински
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Проектирани
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
 DocType: Notification Control,Quotation Message,Понуда порака
-DocType: Employee Loan,Employee Loan Application,Вработен апликација за заем
 DocType: Issue,Opening Date,Отворање датум
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Ве молиме прво спаси го пациентот
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Ве молиме прво спаси го пациентот
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Присуство е обележан успешно.
 DocType: Program Enrollment,Public Transport,Јавен превоз
 DocType: Soil Texture,Silt Composition (%),Силен состав (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Баланс на предметот (едноставен)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Сметки кои произлегуваат од добавувачи.
 DocType: POS Profile,Write Off Account,Отпише профил
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Задолжување Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Задолжување Амт
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Продажбата на Ред Датум
 DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
 DocType: Assessment Plan,Assessment Plan,план за оценување
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Внесување обратен весник
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиентот {0} е создаден.
 DocType: Stock Settings,Limit Percent,Процент граница
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Немам моментални ставки на пазарот
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Payment Entry,Payment References,плаќање Референци
 DocType: C-Form,C-FORM-,C-форма-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Број на интервали за полето за интервал, на пр. Ако Интервалот е &quot;Денови&quot; и Интервалот на фактурирање е 3, фактурите ќе бидат генерирани на секои 3 дена"
 DocType: Vehicle,Insurance Details,Детали за осигурување
 DocType: Account,Payable,Треба да се плати
 DocType: Share Balance,Share Type,Тип на акции
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ве молиме внесете отплата периоди
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Ве молиме внесете отплата периоди
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Должници ({0})
 DocType: Pricing Rule,Margin,маргина
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Бруто добивка%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Бруто добивка%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Промени ПОС Профил
 DocType: Bank Reconciliation Detail,Clearance Date,Чистење Датум
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Адреса Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Партијата е задолжително
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Редови со дупликат датуми на достасаност во други редови беа пронајдени: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Редови со дупликат датуми на достасаност во други редови беа пронајдени: {list}
 DocType: Topic,Topic Name,Име на тема
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Ве молиме поставете стандарден образец за известување за дозвола за одобрение во поставките за човечки ресурси.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Најмалку едно мора да биде избрано од Продажби или Купување
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Изберете вработен за да го унапредите работникот.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Изберете вработен за да го унапредите работникот.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Ве молиме изберете важечки Датум
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Изберете од природата на вашиот бизнис.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Сподели книга
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Создадена фактура {0}
 DocType: Employee,Confirmation Date,Потврда Датум
 DocType: C-Form,Total Invoiced Amount,Вкупно Фактуриран износ
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,Акумулираната амортизација
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Постојано име
 DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
-DocType: Employee Loan Application,Required by Date,Потребни по датум
+DocType: Loan Application,Required by Date,Потребни по датум
 DocType: Lead,Lead Owner,Сопственик на Потенцијален клиент
 DocType: Production Plan,Sales Orders Detail,Детали за нарачки за продажба
 DocType: Bin,Requested Quantity,бараната количина
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плата - Вкупно Одбивање - Кредитот пресудите
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Тековни Бум и Нов Бум не може да биде ист
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Плата фиш проект
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Повеќе варијанти
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Дадени
+DocType: Subscription,Trial Period Start Date,Датум на започнување на судечкиот период
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Пријавете се како друг корисник.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,студентски Гардијан
 DocType: Member,Member Name,Име на член
 DocType: Stock Settings,Use Naming Series,Користете имиња на серии
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,во претплатата
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 DocType: Membership,Payment Details,Детали за плаќањата
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Бум стапка
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Прекинувањето на работната нарачка не може да се откаже, исклучете го прво да го откажете"
 DocType: Asset,Journal Entry for Scrap,Весник за влез Отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Земјиште
 ,Purchase Analytics,Купување анализи
 DocType: Sales Invoice Item,Delivery Note Item,Испратница Точка
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Тековната фактура {0} недостасува
 DocType: Asset Maintenance Log,Task,Задача
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Ред #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серија број е задолжително за Точка {0}
@@ -4062,7 +4088,7 @@
 DocType: Company,Exchange Gain / Loss Account,Размена добивка / загуба сметка
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Вработените и Публика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Целта мора да биде еден од {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Пополнете го формуларот и го спаси
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Пополнете го формуларот и го спаси
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форуми во заедницата
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Крај на количество на залиха
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Крај на количество на залиха
@@ -4077,7 +4103,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Стандардна Продажба курс
 DocType: Account,Rate at which this tax is applied,Стапка по која се применува овој данок
 DocType: Cash Flow Mapper,Section Name,Име на делот
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Пренареждане Количина
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Пренареждане Количина
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Тековни работни места
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отпис
@@ -4088,9 +4114,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Редовна за ажурирање на најновата цена во сите нацрт материјали. Може да потрае неколку минути.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земја мудро стандардно адреса Урнеци
 DocType: Water Analysis,Appearance,Изглед
+DocType: HR Settings,Leave Status Notification Template,Остави шаблон за известување за статусот
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Ср. Купување цена листа
 DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Информации за членовите.
@@ -4113,7 +4139,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Не е дозволено. Ве молиме оневозможете Тест Шаблон
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
 DocType: Crop Cycle,Linked Land Unit,Поврзана земјиште единица
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
@@ -4129,7 +4155,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Одете на Корисниците
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + Отпишана сума не може да биде поголемо од Сѐ Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Невалиден GSTIN или Внесете NA за нерегистрирани
 DocType: Training Event,Seminar,Семинар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Програмата за запишување такса
@@ -4145,14 +4171,14 @@
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 DocType: Company,Create Chart Of Accounts Based On,Креирај сметковниот план врз основа на
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не може да се претвори во некоја група. Постојат задачи за деца.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
 ,Stock Ageing,Акции стареење
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Студентски {0} постојат против студентот барателот {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Прилагодување за заокружување (Валута на компанијата)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Попладне
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Cheque Print Template,Scanned Cheque,скенирани чекови
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
@@ -4168,7 +4194,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Проектот {0} веќе постои
 DocType: Medical Department,Nursing User,Корисник за нега
 DocType: Plant Analysis,Plant Analysis Criterias,Критериуми за анализа на растенијата
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Одговорности
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Сериската број {0} не припаѓа на групата {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Одговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодот на валидност на овој цитат заврши.
 DocType: Expense Claim Account,Expense Claim Account,Тврдат сметка сметка
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволи замени стапки на размена
@@ -4190,11 +4217,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Направете варијанти
 DocType: Item,Default BOM,Стандардно Бум
 DocType: Project,Total Billed Amount (via Sales Invoices),Вкупен износ на фактури (преку фактури за продажба)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Задолжување Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Задолжување Износ
 DocType: Project Update,Not Updated,Не се ажурирани
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Постојат недоследности помеѓу стапката, бројот на акции и износот пресметан"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Вкупен Неизмирен Изн.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Вкупен Неизмирен Изн.
 DocType: Journal Entry,Printing Settings,Поставки за печатење
 DocType: Employee Advance,Advance Account,Однапред сметка
 DocType: Job Offer,Job Offer Terms,Услови за понуда за работа
@@ -4203,7 +4230,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Автомобилски
 DocType: Vehicle,Insurance Company,Друштво за осигурување
 DocType: Asset Category Account,Fixed Asset Account,Фиксни средства на сметката
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,променлива
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,променлива
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Од Испратница
 DocType: Chapter,Members,Членови
 DocType: Student,Student Email Address,Студент е-мејл адреса
@@ -4227,7 +4254,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Практикант
 DocType: Delivery Stop,Address Name,адреса
 DocType: Stock Entry,From BOM,Од бирото
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Раздвојување {0} единици на {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Раздвојување {0} единици на {1}
 DocType: Assessment Code,Assessment Code,Код оценување
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
@@ -4235,25 +4262,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 DocType: Bank Reconciliation Detail,Payment Document,плаќање документ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Грешка при проценката на формулата за критериуми
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
+DocType: Subscription,Plans,Планови
 DocType: Salary Slip,Salary Structure,Структура плата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Материјал прашање
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Се појави грешка при создавање на периодични
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Понуди
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Не студентски групи создадени.
 DocType: Purchase Invoice Item,Serial No,Сериски Не
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може да биде поголем од кредит Износ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може да биде поголем од кредит Износ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Ред # {0}: Очекуваниот датум на испорака не може да биде пред датумот на нарачката
 DocType: Purchase Invoice,Print Language,Печати јазик
 DocType: Salary Slip,Total Working Hours,Вкупно Работно време
 DocType: Sales Invoice,Customer PO Details,Детали на клиентот
-DocType: Subscription,Next Schedule Date,Следен датум на распоред
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Привремена сметка за отворање
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
@@ -4282,11 +4308,11 @@
 DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Од и до датуми потребни
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Нема вработени за наведените критериуми
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
 DocType: Hotel Settings,Default Customer,Стандарден клиент
 DocType: Assessment Plan,Supervisor Name,Име супервизор
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдувајте дали состанок е креиран за истиот ден
@@ -4311,16 +4337,16 @@
 DocType: Journal Entry Account,Employee Advance,Напредување на вработените
 DocType: Payroll Entry,Payroll Frequency,Даноци на фреквенција
 DocType: Lab Test Template,Sensitivity,Чувствителност
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Суровина
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Постројки и машинерии
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Постројки и машинерии
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневен работа поставувања Резиме
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Ве молиме внесете Reqd по датум
 DocType: Payment Entry,Internal Transfer,внатрешен трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи за одржување
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или цел количество: Контакт лице или целниот износ е задолжително
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
 DocType: Leave Control Panel,Carry Forward,Пренесување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Трошоците центар со постојните трансакции не може да се конвертира Леџер
@@ -4328,14 +4354,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext интеграции
 DocType: Crop Cycle,Detected Disease,Детектирана болест
 ,Produced,Произведени
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Датумот на отплата не може да биде пред датумот на повлекување.
 DocType: Item,Item Code for Suppliers,Точка Код за добавувачи
 DocType: Issue,Raised By (Email),Покренати од страна на (E-mail)
 DocType: Training Event,Trainer Name,Име тренер
 DocType: Mode of Payment,General,Генералниот
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,последната комуникација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,последната комуникација
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одземе кога категорија е за 'Вреднување' или 'Вреднување и Вкупно'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Сериски броеви кои се потребни за серијали Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одземе кога категорија е за 'Вреднување' или 'Вреднување и Вкупно'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Сериски броеви кои се потребни за серијали Точка {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Натпреварот плаќања со фактури
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
@@ -4349,7 +4376,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Овозможи / оневозможи валути.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Др. {0} на Половина ден Оставете на {1}
 DocType: Production Plan,Get Material Request,Земете материјал Барање
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Поштенски трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Поштенски трошоци
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (Износ)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 ,Item Variant Details,Детали за варијанта на точка
@@ -4360,9 +4387,9 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна продажба фактура
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Ве молиме изберете Кол против ставка {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Потенцијален клиент Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Сите овие ставки се веќе фактурирани
 DocType: Company,Monthly Sales Target,Месечна продажна цел
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да биде одобрена од страна на {0}
@@ -4370,7 +4397,7 @@
 DocType: Item,Default Material Request Type,Аватарот на материјал Барање Тип
 DocType: Supplier Scorecard,Evaluation Period,Период на евалуација
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,непознат
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Работната нарачка не е креирана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Работната нарачка не е креирана
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
 DocType: Purchase Invoice,Export Type,Тип на извоз
 DocType: Salary Slip Loan,Salary Slip Loan,Плата за лизгање на пензија
@@ -4386,8 +4413,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Отворање Резиме на фактури
 DocType: Education Settings,Education Manager,Образование менаџер
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Минималната должина помеѓу секоја фабрика во полето за оптимален раст
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирани Точка {0} не може да се ажурираат со користење Акции на помирување, наместо користење Акции Влегување"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирани Точка {0} не може да се ажурираат со користење Акции на помирување, наместо користење Акции Влегување"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирани Точка {0} не може да се ажурираат со користење Акции на помирување, наместо користење Акции Влегување"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирани Точка {0} не може да се ажурираат со користење Акции на помирување, наместо користење Акции Влегување"
 DocType: Quality Inspection,Report Date,Датум на извештајот
 DocType: Student,Middle Name,Средно име
 DocType: C-Form,Invoices,Фактури
@@ -4420,20 +4447,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,приемот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,приемот
 ,Sales Register,Продажбата Регистрирај се
 DocType: Daily Work Summary Group,Send Emails At,Испрати е-пошта во
 DocType: Quotation,Quotation Lost Reason,Причина за Нереализирана Понуда
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Преглед на форма
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Трошок за одобрување задолжителен во трошок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Додајте корисници во вашата организација, освен вас."
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Сè уште нема клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај за паричниот тек
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Нема креирано материјално барање
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
@@ -4456,11 +4484,12 @@
 DocType: Vehicle,Chassis No,Не шасија
 DocType: Payment Request,Initiated,Инициран
 DocType: Production Plan Item,Planned Start Date,Планираниот почеток Датум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Ве молиме изберете Бум
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Ве молиме изберете Бум
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Искористениот ИТЦ интегриран данок
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
+DocType: Bank Guarantee,Clauses and Conditions,Клаузули и услови
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
 DocType: Project Task,View Timesheet,Преглед на табела
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крајниот датум мора да биде поголем од датумот на почеток
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Leave Allocation,New Leaves Allocated,Нови лисја Распределени
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
@@ -4474,9 +4503,10 @@
 DocType: Patient,Alcohol Current Use,Тековна употреба на алкохол
 DocType: Student Admission Program,Student Admission Program,Програма за прием на студенти
 DocType: Payment Entry,Account Paid To,Сметка Платиле да
+DocType: Subscription Settings,Grace Period,Грејс период
 DocType: Item Alternative,Alternative Item Name,Алтернативна ставка
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Не можам да поднесам фискален лист <br> \ Можни причини: <br> \ 1. Нето платата е помала од 0. <br> 2. Е-пошта на компанијата назначена во господар на вработениот не е валидна. <br>
@@ -4486,7 +4516,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} буџетот на сметка {1} од {2} {3} е {4}. Тоа ќе се надмине со {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Од Количина
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и unchcked Исклучено во
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Серија е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Финансиски Услуги
 DocType: Student Sibling,Student ID,студентски проект
@@ -4498,14 +4527,16 @@
 DocType: Complaint,Complaint,Жалба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Внесете го отплатата
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Сите одделенија
 DocType: Patient,Alcohol Past Use,Користење на алкохол за минатото
 DocType: Fertilizer Content,Fertilizer Content,Содржина на ѓубрива
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Проблематични / заглавени
 DocType: Tax Rule,Billing State,Платежна држава
 DocType: Share Transfer,Transfer,Трансфер
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Работната нарачка {0} мора да биде откажана пред да ја откажете оваа Продажна нарачка
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
@@ -4529,10 +4560,11 @@
 DocType: Cheque Print Template,Message to show,Порака за да се покаже
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Трговија на мало
 DocType: Student Attendance,Absent,Отсутен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Производ Бовча
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Не може да се најде резултат почнувајќи од {0}. Треба да имате рејтинг од 0 до 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
+DocType: Subscription,Current Invoice Start Date,Тековен датум на фактура
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Не е потребно секој дебитна или кредитна износ за {2}
 DocType: GL Entry,Remarks,Забелешки
@@ -4542,11 +4574,13 @@
 DocType: Task,Parent Task,Родителска задача
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Направете Водач
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печатење и идентитет
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Печатење и идентитет
 DocType: Stock Settings,Show Barcode Field,Прикажи Баркод поле
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Испрати Добавувачот пораки
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Плата веќе обработени за периодот од {0} и {1} Остави период апликација не може да биде помеѓу овој период.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Испрати Добавувачот пораки
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Плата веќе обработени за периодот од {0} и {1} Остави период апликација не може да биде помеѓу овој период.
+DocType: Fiscal Year,Auto Created,Автоматски креирано
 DocType: Chapter Member,Leave Reason,Оставете го причинот
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Фактурата {0} повеќе не постои
 DocType: Guardian Interest,Guardian Interest,Гардијан камати
 DocType: Volunteer,Availability,Достапност
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Поставување на стандардните вредности за POS фактури
@@ -4555,14 +4589,13 @@
 DocType: Timesheet,Employee Detail,детали за вработените
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-mail проект
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 e-mail проект
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,ден следниот датум и Повторете на Денот од месецот мора да биде еднаква
 DocType: Lab Prescription,Test Code,Тест законик
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Подесувања за веб-сајт почетната страница од пребарувачот
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Барањата за RFQ не се дозволени за {0} поради поставената оценка од {1}
 DocType: Job Offer,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Над
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Вкупно износ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Вкупно износ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Спомене, ако не-стандардни плаќа сметката"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Ве молиме изберете ја групата за процена освен &quot;Сите групи оценување&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: потребен е центар за трошоци за елемент {1}
@@ -4573,7 +4606,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Анализа на вода
 DocType: Chapter,Region,Регионот
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Превчитај ја поврзаната анализа
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012 година, 2012-13"
@@ -4589,7 +4622,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Цената на расходувани средства
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
 DocType: Vehicle,Policy No,Не политика
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Се предмети од производот Бовча
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,корисник на проектот
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Подели
@@ -4629,21 +4662,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Патека
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Не може да се конвертира цена центар за книга како што има дете јазли
 DocType: Production Plan,Total Planned Qty,Вкупно планирано количество
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,отворање вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,отворање вредност
 DocType: Salary Detail,Formula,формула
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Сериски #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Сериски #
 DocType: Lab Test Template,Lab Test Template,Лабораториски тест обрасци
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Продажна сметка
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Продажна сметка
 DocType: Purchase Invoice Item,Total Weight,Вкупна тежина
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комисијата за Продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Комисијата за Продажба
 DocType: Job Offer Term,Value / Description,Вредност / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 DocType: Purchase Order Item,Expected Delivery Date,Се очекува испорака датум
 DocType: Restaurant Order Entry,Restaurant Order Entry,Влез во рецепција за ресторани
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
 DocType: Asset Maintenance Task,Assign To Name,Доделете го името
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Забава трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Забава трошоци
 DocType: Hub Settings,Enabled Users,Овозможени корисници
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Направете материјал Барање
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Отвори Точка {0}
@@ -4656,24 +4689,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Апликации за отсуство.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
 DocType: Vehicle,Last Carbon Check,Последните јаглерод Проверете
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Правни трошоци
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Ве молиме изберете количина на ред
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Испратете ги фактурите за продажба и купување
 DocType: Purchase Invoice,Posting Time,Праќање пораки во Време
 DocType: Timesheet,% Amount Billed,% Износ Опишан
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефонски трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Телефонски трошоци
 DocType: Sales Partner,Logo,Логото
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Обележете го ова ако сакате да ги принуди на корисникот за да изберете серија пред зачувување. Нема да има стандардно Ако ја изберете оваа.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Не ставка со Сериски Не {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Не ставка со Сериски Не {0}
 DocType: Email Digest,Open Notifications,Отворен Известувања
 DocType: Payment Entry,Difference Amount (Company Currency),Разликата Износ (Фирма валута)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Директни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Директни трошоци
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нов корисник приходи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Патни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додајте сопствено поле Претплати во доктјето {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
 DocType: Purchase Receipt Item,Sample Quantity,Количина на примероци
+DocType: Bank Guarantee,Name of Beneficiary,Име на корисникот
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ажурирајте го БОМ трошокот автоматски преку Распоредувачот, врз основа на најновата проценка за стапката / ценовниот лист / последната стапка на набавка на суровини."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
@@ -4685,14 +4718,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Условна казна
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата Делови
 DocType: Program Enrollment Tool,New Academic Year,Новата академска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Врати / кредит Забелешка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Врати / кредит Забелешка
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Вкупно Исплатен износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Вкупно Исплатен износ
 DocType: GST Settings,B2C Limit,Ограничување на B2C
 DocType: Work Order Item,Transferred Qty,Пренесува Количина
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигацијата
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Планирање
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Планирање
 DocType: Share Balance,Issued,Издадени
+DocType: Loan,Repayment Start Date,Датум на почеток на отплата
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,студент активност
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id снабдувач
 DocType: Payment Request,Payment Gateway Details,Исплата Портал Детали
@@ -4705,10 +4739,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип на листовите како повик, болни итн"
 DocType: Email Digest,Send regular summary reports via Email.,Испрати редовни збирни извештаи преку E-mail.
 DocType: Payment Entry,PE-,пе-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
 DocType: Assessment Result,Student Name,студентски Име
 DocType: Brand,Item Manager,Точка менаџер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Даноци се плаќаат
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Даноци се плаќаат
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
 DocType: Plant Analysis,Collection Datetime,Колекција Datetime
 DocType: Work Order,Total Operating Cost,Вкупни Оперативни трошоци
@@ -4718,9 +4752,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Корисник {0} не постои
 DocType: Payment Term,Day(s) after invoice date,Ден (и) по датумот на фактурата
 DocType: Payment Schedule,Payment Schedule,Распоред на исплата
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Кратенка
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Плаќање Влегување веќе постои
+DocType: Subscription,Trial Period End Date,Датум на завршување на судечкиот период
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized од {0} надминува граници
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Плата дефиниција господар.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Патологија
@@ -4737,9 +4771,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Понуди до Потенцијални клиенти или Клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Сите групи потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Сите групи потрошувачи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Акумулирана Месечни
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Данок Шаблон е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
@@ -4748,14 +4782,15 @@
 DocType: Lab Prescription,Test Created,Тест креиран
 DocType: Healthcare Settings,Custom Signature in Print,Прилагоден потпис во печатење
 DocType: Account,Temporary,Привремено
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Клиент LPO Бр.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Клиент LPO Бр.
 DocType: Program,Courses,курсеви
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ако го исклучите, &quot;Во зборовите&quot; поле нема да бидат видливи во секоја трансакција"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Оваа акција ќе го спречи идното наплата. Дали сте сигурни дека сакате да ја откажете претплатата?
 DocType: Serial No,Distinct unit of an Item,Посебна единица мерка на ставката
 DocType: Supplier Scorecard Criteria,Criteria Name,Критериум Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Поставете компанијата
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Поставете компанијата
 DocType: Pricing Rule,Buying,Купување
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Болести и ѓубрива
 DocType: HR Settings,Employee Records to be created by,Вработен евиденција да бидат создадени од страна
@@ -4764,18 +4799,18 @@
 DocType: POS Profile,Apply Discount On,Применуваат попуст на
 DocType: Member,Membership Type,Тип на членство
 ,Reqd By Date,Reqd Спореддатумот
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Доверителите
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Доверителите
 DocType: Assessment Plan,Assessment Name,проценка Име
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Прикажи PDC во Печати
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Прикажи PDC во Печати
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ред # {0}: Сериски Не е задолжително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудриот Данок Детална
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Понуда за работа
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Институтот Кратенка
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Понуда од Добавувач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Понуда од Добавувач
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
@@ -4793,7 +4828,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Вкупна Варијанса
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е овозможено, системот ќе ја објавите на сметководствените ставки за попис автоматски."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Брокерски
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Публика за вработените {0} веќе е означен за овој ден
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Публика за вработените {0} веќе е означен за овој ден
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",во минути освежено преку &quot;Време Вклучи се &#39;
 DocType: Customer,From Lead,Од Потенцијален клиент
@@ -4804,6 +4839,7 @@
 DocType: Lab Test,Approved Date,Датум на одобрување
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
+DocType: Subscriber,Subscriber Name,Претплатник Име
 DocType: Serial No,Out of Warranty,Надвор од гаранција
 DocType: BOM Update Tool,Replace,Заменете
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не се пронајдени производи.
@@ -4813,19 +4849,18 @@
 DocType: Request for Quotation Item,Project Name,Име на проектот
 DocType: Customer,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Изберете сметка за приход од камата во заем за вработените {0}
 DocType: Work Order,Required Items,Задолжителни предмети
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Човечки ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаќање помирување на плаќање
 DocType: Disease,Treatment Task,Третман задача
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Даночни средства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Даночни средства
 DocType: BOM Item,BOM No,BOM број
 DocType: Instructor,INS/,ИНС /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
 DocType: Item,Moving Average,Се движат просек
 DocType: BOM Update Tool,The BOM which will be replaced,Бум на која ќе биде заменет
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,електронска опрема
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,електронска опрема
 DocType: Asset,Maintenance Required,Потребно е одржување
 DocType: Account,Debit,Дебитна
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
@@ -4834,7 +4869,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Најдобро Амт
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставените таргети Точка група-мудар за ова продажбата на лице.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Замрзнување резерви постари од [Денови]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: Асет е задолжително за фиксни средства купување / продажба
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: Асет е задолжително за фиксни средства купување / продажба
 DocType: Asset Maintenance Team,Maintenance Team Name,Име на тимот за одржување
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повеќе правила Цените се наоѓаат врз основа на горенаведените услови, се применува приоритет. Приоритет е број помеѓу 0 до 20, додека стандардната вредност е нула (празно). Поголем број значи дека ќе имаат предност ако има повеќе Цените правила со истите услови."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Клиентот е задолжителен ако &#39;Клиент е избрана&#39;
@@ -4844,19 +4879,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Видови на расходи тврдење.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},стапка за продажба точка {0} е пониска од својот {1}. продажба стапка треба да биде барем {2}
-DocType: Item,Taxes,Даноци
+DocType: Subscription,Taxes,Даноци
 DocType: Purchase Invoice,capital goods,капитални добра
 DocType: Purchase Invoice Item,Weight Per Unit,Тежина по единица
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Платени и не предаде
 DocType: Project,Default Cost Center,Стандардната цена центар
-DocType: Bank Guarantee,End Date,Крај Датум
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,акции трансакции
 DocType: Budget,Budget Accounts,буџетски сметки
 DocType: Employee,Internal Work History,Внатрешна работа Историја
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Акумулирана амортизација Износ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Променлива табела за набавувачи
-DocType: Employee Loan,Fully Disbursed,целосно исплатен
 DocType: Employee Advance,Due Advance Amount,Долг однапред износ
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
@@ -4880,7 +4913,7 @@
 ,Employee Information,Вработен информации
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Основни даночни обрасци за продажба и купување се создаваат.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Оценка Резултатот од резултатот {0} веќе постои.
@@ -4888,7 +4921,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Поставете компанијата филтер празно ако група од страна е &quot;Друштвото&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Датум на објавување не може да биде иднина
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за генерирање на периодични
 DocType: Stock Entry,Target Warehouse Address,Адреса за целни складишта
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Обичните Leave
 DocType: Agriculture Task,End Day,Краен ден
@@ -4913,11 +4945,10 @@
 DocType: Material Request,% Ordered,Нареди%
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За базирани разбира Група на студенти, се разбира ќе биде потврдена за секој студент од запишаните предмети во програмата за запишување."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Плаќаат на парче
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ср. Купување стапка
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Ср. Купување стапка
 DocType: Share Balance,From No,Од бр
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Нова порака од {испраќачот}
 DocType: Customer,Customer Primary Address,Примарна адреса на потрошувачот
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтени
 DocType: Drug Prescription,Description/Strength,Опис / сила
@@ -4926,22 +4957,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Истата ставка се внесени повеќе пати
 DocType: Department,Leave Block List,Остави Забрани Листа
 DocType: Purchase Invoice,Tax ID,Данок проект
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Ставка {0} не е подесување за сериски бр. Колоната мора да биде празна
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Ставка {0} не е подесување за сериски бр. Колоната мора да биде празна
 DocType: Accounts Settings,Accounts Settings,Сметки Settings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,одобри
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted адреса за {0}, поправете за да продолжите."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted адреса за {0}, поправете за да продолжите."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Број на нова сметка, таа ќе биде вклучена во името на сметката како префикс"
 DocType: Maintenance Team Member,Team Member,Член на тимот
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Нема резултат што треба да се поднесе
 DocType: Customer,Sales Partner and Commission,Продажба партнер и на Комисијата
-DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стапка (%) / година
+DocType: Loan,Rate of Interest (%) / Year,Каматна стапка (%) / година
 ,Project Quantity,проектот Кол
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;"
 DocType: Opportunity,To Discuss,За да дискутираат
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стапка (%) Годишен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Привремени сметки
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Црна
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Привремени сметки
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,BOM разделен ставка по ставка
 DocType: Shareholder,Contact List,Листа на контакти
 DocType: Account,Auditor,Ревизор
@@ -4949,16 +4980,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} произведени ставки
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Научи повеќе
 DocType: Cheque Print Template,Distance from top edge,Одалеченост од горниот раб
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Ценовник {0} е оневозможено или не постои
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Ценовник {0} е оневозможено или не постои
 DocType: Purchase Invoice,Return,Враќање
 DocType: Pricing Rule,Disable,Оневозможи
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Начин на плаќање е потребно да се изврши плаќање
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Начин на плаќање е потребно да се изврши плаќање
 DocType: Project Task,Pending Review,Во очекување Преглед
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Уредете во целосна страница за повеќе опции како средства, сериски број, партии итн."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Назначувања и консултации
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не е запишано во серијата {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Асет {0} не може да се уништи, како што е веќе {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Потребни проверки
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Потребни проверки
 DocType: Task,Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарување за Расход)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Отсутни
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Не успеа да се постави компанија
@@ -4970,7 +5001,7 @@
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,транспортен менаџмент
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Додадете ставки од
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Додадете ставки од
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Култури и земји
 DocType: Cheque Print Template,Regular,редовни
 DocType: Fertilizer,Density (if liquid),Густина (ако е течна)
@@ -4995,24 +5026,26 @@
 DocType: Payment Entry,Paid Amount,Уплатениот износ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Истражувај го циклусот на продажба
 DocType: Assessment Plan,Supervisor,супервизор
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Задржување на акции за задржување
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Задржување на акции за задржување
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 ,Work Order Stock Report,Извештај за работен налог
+DocType: Purchase Receipt,Auto Repeat Detail,Автоматско повторување на детали
 DocType: Assessment Result Tool,Assessment Result Tool,Проценка Резултат алатката
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Како супервизор
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Предложете категорија
 DocType: BOM Scrap Item,BOM Scrap Item,BOM на отпад/кало
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Управување со квалитет
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Управување со квалитет
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Точка {0} е исклучена
 DocType: Project,Total Billable Amount (via Timesheets),Вкупно наплатен износ (преку тајмс)
 DocType: Agriculture Task,Previous Business Day,Претходен работен ден
-DocType: Employee Loan,Repay Fixed Amount per Period,Отплати фиксен износ за период
+DocType: Loan,Repay Fixed Amount per Period,Отплати фиксен износ за период
 DocType: Employee,Health Insurance No,Здравствено осигурување бр
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Кредитна Забелешка Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Кредитна Забелешка Амт
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Вкупно даночен износ
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 DocType: Opening Invoice Creation Tool,Purchase,Купување
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Биланс Количина
@@ -5023,16 +5056,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 DocType: Healthcare Settings,Valid number of days,Валиден број на денови
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Трошковни центри
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Рестартирај претплата
 DocType: Land Unit,Linked Plant Analysis,Анализа на поврзаните фабрики
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Стапка по која добавувачот валута е претворена во основна валута компанијата
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ред # {0}: Timings конфликти со ред {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволете нула Вреднување курс
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволете нула Вреднување курс
+DocType: Bank Guarantee,Receiving,Примање
 DocType: Training Event Employee,Invited,поканети
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Повеќе најде за вработените {0} за дадените датуми активни платежни структури
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Портал сметки поставување.
 DocType: Employee,Employment Type,Тип на вработување
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,"Основни средства,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,"Основни средства,"
 DocType: Payment Entry,Set Exchange Gain / Loss,Внесени курсни добивка / загуба
 ,GST Purchase Register,GST Набавка Регистрирај се
 ,Cash Flow,Готовински тек
@@ -5053,9 +5088,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Листа на сите удели во акции
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Грофот
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Грофот
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Ви доставуваме # {0} {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Мора да се постави датумот на завршување на датумот на судењето и датумот на завршување на судечкиот период
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Просечна стапка
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Вкупниот износ на исплата во распоредот за плаќање мора да биде еднаков на Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Вкупниот износ на исплата во распоредот за плаќање мора да биде еднаков на Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,"Извод од банка биланс, како на генералниот Леџер"
 DocType: Job Applicant,Applicant Name,Подносител на барањето Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Item Име
@@ -5085,6 +5121,7 @@
 DocType: Work Order,Warehouses,Магацини
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} средства не можат да се пренесат
 DocType: Hotel Room Pricing,Hotel Room Pricing,Цените на хотелската соба
+DocType: Subscription,Days Until Due,Денови до доспевање
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Оваа содржина е варијанта на {0} (дефиниција).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,купување
@@ -5093,13 +5130,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","За Batch врз основа Група на студенти, Студентската серија ќе биде потврдена за секој студент од програма за запишување."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Дистрибуција
+DocType: Journal Entry Account,Loan,Заем
 DocType: Expense Claim Advance,Expense Claim Advance,Надоместок за наплата на трошоци
 DocType: Lab Test,Report Preference,Извештај за претпочитање
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Информации за волонтери.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Проект менаџер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Проект менаџер
 ,Quoted Item Comparison,Цитирано Точка споредба
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Преклопување во постигнувајќи помеѓу {0} и {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Испраќање
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Нето вредноста на средствата, како на"
 DocType: Crop,Produce,Производство
@@ -5109,7 +5147,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Потрошувачка на материјал за производство
 DocType: Item Alternative,Alternative Item Code,Код на алтернативна точка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Изберете предмети за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Изберете предмети за производство
 DocType: Delivery Stop,Delivery Stop,Испорака Стоп
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
 DocType: Item,Material Issue,Материјал Број
@@ -5119,15 +5157,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапун и детергент
 DocType: BOM,Show Items,Прикажи Теми
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Од време не може да биде поголема отколку на време.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Дали сакате да ги известите сите клиенти преку е-пошта?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Дали сакате да ги известите сите клиенти преку е-пошта?
+DocType: Subscription Plan,Billing Interval,Интервал на фактурирање
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Филмски и видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продолжи
 DocType: Hub Settings,Hub Username,Корисничко име за центар
 DocType: Salary Detail,Component,компонента
 DocType: Assessment Criteria,Assessment Criteria Group,Критериуми за оценување група
 DocType: Healthcare Settings,Patient Name By,Име на пациентот од
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Вчитај дневник Внес за плати од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Вчитај дневник Внес за плати од {0} до {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
 DocType: Warehouse,Warehouse Name,Магацински Име
 DocType: Naming Series,Select Transaction,Изберете Трансакција
@@ -5141,23 +5179,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
 DocType: Leave Block List,Applies to Company,Се однесува на компанијата
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
-DocType: Employee Loan,Disbursement Date,Датум на повлекување средства
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Не е наведено примачот&#39;
+DocType: Loan,Disbursement Date,Датум на повлекување средства
 DocType: BOM Update Tool,Update latest price in all BOMs,Ажурирај ја најновата цена во сите спецификации
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Медицински рекорд
 DocType: Vehicle,Vehicle,возило
 DocType: Purchase Invoice,In Words,Со зборови
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Внесете го името на банката или кредитната институција пред да поднесете.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} мора да бидат поднесени
 DocType: POS Profile,Item Groups,точка групи
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
 DocType: Sales Order Item,For Production,За производство
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Ве молиме додадете сметка за привремено отворање во сметковниот план
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Ве молиме додадете сметка за привремено отворање во сметковниот план
 DocType: Customer,Customer Primary Contact,Основен контакт на купувачи
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Весник за затворање на периодот
 DocType: Project Task,View Task,Види Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / олово%
+DocType: Bank Guarantee,Bank Guarantee Type,Тип на банкарска гаранција
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Фактура на фактурата
 ,Asset Depreciations and Balances,Средства амортизација и рамнотежа
@@ -5168,9 +5207,8 @@
 DocType: Production Plan,Include Subcontracted Items,Вклучете ги предметите на субдоговор
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Не може да се сменат својствата на варијанта по трансакција на акции. Ќе треба да направите нова ставка за да го направите тоа.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
-DocType: Employee Loan,Repay from Salary,Отплати од плата
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+DocType: Loan,Repay from Salary,Отплати од плата
 DocType: Leave Application,LAP/,КРУГ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
 DocType: Salary Slip,Salary Slip,Плата фиш
@@ -5194,11 +5232,11 @@
 DocType: Employee Education,Employee Education,Вработен образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Дупликат група точка најде во табелата на точката група
 DocType: Land Unit,Parent Land Unit,Родителска единица
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
 DocType: Fertilizer,Fertilizer Name,Име на ѓубриво
 DocType: Salary Slip,Net Pay,Нето плати
 DocType: Cash Flow Mapping Accounts,Account,Сметка
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Сериски № {0} е веќе доби
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Сериски № {0} е веќе доби
 ,Requested Items To Be Transferred,Бара предмети да бидат префрлени
 DocType: Expense Claim,Vehicle Log,возилото се Влез
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Присуство на температура (температура&gt; 38,5 ° C / 101,3 ° F или постојана температура&gt; 38 ° C / 100,4 ° F)"
@@ -5239,24 +5277,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
 DocType: Asset Maintenance,Manufacturing User,Производство корисник
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини Опрема што се испорачува
-DocType: C-Form,Series,Серија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Валутата на ценовникот {0} мора да биде {1} или {2}
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Soil Texture,Ternary Plot,Тернарско земјиште
 DocType: Item Group,Item Classification,Точка Класификација
 DocType: Driver,License Number,Број на лиценца
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Бизнис менаџер за развој
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Бизнис менаџер за развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржување Посетете Цел
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Фактура за регистрација на пациенти
 DocType: Crop,Period,Период
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Општи Леџер
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Вработен {0} на отсуство на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Вработен {0} на отсуство на {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Прикажи ги Потенцијалните клиенти
 DocType: Program Enrollment Tool,New Program,нова програма
 DocType: Item Attribute Value,Attribute Value,Вредноста на атрибутот
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 DocType: Salary Detail,Salary Detail,плата детали
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Ве молиме изберете {0} Првиот
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Ве молиме изберете {0} Првиот
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Серија {0} од ставка {1} е истечен.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултации
@@ -5264,15 +5301,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не може да биде поголема од планираната количина ({2}) во работниот налог {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Временски план за производство.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,субтотална
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Не може да се променат својствата на варијанта по трансакција со акции. Ќе треба да направите нова ставка за да го направите тоа.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Мапа на SEPA без овластување
 DocType: Physician,Charges,Надоместоци
 DocType: Production Plan,Get Items For Work Order,Добијте предмети за работна нарачка
 DocType: Salary Detail,Default Amount,Стандардно Износ
 DocType: Lab Test Template,Descriptive,Описни
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Магацински не се најде во системот
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Магацински не се најде во системот
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резиме Овој месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Квалитет инспекција читање
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Поставете продажбата цел што сакате да постигнете за вашата компанија.
 ,Project wise Stock Tracking,Проектот мудро берза за следење
@@ -5300,11 +5338,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Не успеа да создаде веб-локација
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Веќе креиран запис за задржување на акции или не е обезбеден примерок
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Веќе креиран запис за задржување на акции или не е обезбеден примерок
 DocType: Program,Program Abbreviation,Програмата Кратенка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
 DocType: Warranty Claim,Resolved By,Реши со
-DocType: Bank Guarantee,Start Date,Датум на почеток
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Распредели листови за одреден период.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити неправилно исчистена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
@@ -5319,11 +5356,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часови
 DocType: Project,Expected Start Date,Се очекува Почеток Датум
 DocType: Purchase Invoice,04-Correction in Invoice,04-корекција во фактура
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Работниот ред е веќе креиран за сите предмети со BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Работниот ред е веќе креиран за сите предмети со BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Извештај за детали од варијанта
 DocType: Setup Progress Action,Setup Progress Action,Поставување Акција за напредок
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Купување на ценовник
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Купување на ценовник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Отстрани точка ако обвиненијата не се применува на таа ставка
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Откажи претплата
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Ве молиме изберете Maintenance Status as Completed или отстранете го датумот на комплетирање
 DocType: Supplier,Default Payment Terms Template,Шаблон за условите за исплата
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Валута трансакција мора да биде иста како и за исплата портал валута
@@ -5334,7 +5372,6 @@
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција доколку акумулираните Месечен буџет пречекорување
-DocType: Subscription,Submit on creation,Достават на создавањето
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Валута за {0} мора да биде {1}
 DocType: Asset,Disposal Date,отстранување Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Пораките ќе бидат испратени до сите активни вработени на компанијата во дадениот час, ако тие немаат одмор. Резиме на одговорите ќе бидат испратени на полноќ."
@@ -5353,6 +5390,7 @@
 DocType: Batch,Parent Batch,родител Batch
 DocType: Cheque Print Template,Cheque Print Template,Чек Шаблон за печатење
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Шема на трошоците центри
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Бројот на денови по датумот на фактурата поминал пред да се откаже претплатата или да се обележи претплатата како неплатена
 DocType: Lab Test Template,Sample Collection,Збирка примероци
 ,Requested Items To Be Ordered,Бара предмети да се средат
 DocType: Price List,Price List Name,Ценовник Име
@@ -5361,7 +5399,7 @@
 DocType: Account,Income,Приходи
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нешто не беше во ред!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Продажната Фактура {0} веќе е поднесена
 DocType: Supplier Scorecard Scoring Criteria,Score,резултат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Фискалната година {0} не постои
@@ -5381,12 +5419,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} треба да биде вредност помеѓу 0 и 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Следниот датум на амортизација не може да биде пред датумот достапен за употреба
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необезбедени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Макс работни часови против timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Закажаниот датум
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Вкупно Исплатени изн.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Вкупно Исплатени изн.
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Пораки поголема од 160 карактери ќе бидат поделени во повеќе пораки
 DocType: Purchase Receipt Item,Received and Accepted,Примени и прифатени
 DocType: Hub Settings,Company and Seller Profile,Профил на компанијата и на продавачот
@@ -5400,10 +5438,9 @@
 DocType: Item,Variant Based On,Варијанта врз основа на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Вашите добавувачи
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Те молам поправете
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 DocType: Request for Quotation Item,Supplier Part No,Добавувачот Дел Не
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Анонимен
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Добиени од
 DocType: Lead,Converted,Конвертираната
@@ -5417,6 +5454,7 @@
 DocType: Asset,Assets,Средства
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
+DocType: Subscription,Current Invoice End Date,Тековен датум на фактурата
 DocType: Payment Term,Due Date Based On,Датум на кој се базира датумот
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Ве молиме поставете стандардна корисничка група и територија во Поставки за продажба
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} не постои
@@ -5424,7 +5462,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Точка: {0} не постои во системот
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Нема избрани отплати за внесување на весници
 DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
+DocType: Loan,Disbursed,Исплатени
 DocType: Healthcare Settings,Laboratory Settings,Лабораториски поставки
 DocType: Patient Appointment,Service Unit,Сервизна единица
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Успешно поставите снабдувач
@@ -5437,12 +5477,12 @@
 DocType: Share Balance,No of Shares,Број на акции
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Изберете Статус
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: School House,House Name,Име куќа
 DocType: Fee Schedule,Total Amount per Student,Вкупен износ по ученик
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Електрични
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Електрични
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додадете го остатокот од вашата организација, како на вашите корисници. Можете исто така да ги покани на клиентите да вашиот портал со додавање на нив од Contacts"
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно Разлика во Вредност (Излез - Влез)
 DocType: Grant Application,Requested Amount,Баран износ
@@ -5452,7 +5492,7 @@
 DocType: Crop Cycle,Detected Diseases,Откриени болести
 DocType: Stock Entry,Default Source Warehouse,Стандардно Извор Магацински
 DocType: Item,Customer Code,Код на клиентите
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Роденден Потсетник за {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Роденден Потсетник за {0}
 DocType: Asset Maintenance Task,Last Completion Date,Последен датум на комплетирање
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
@@ -5460,9 +5500,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Акции средства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Акции средства
 DocType: Restaurant,Active Menu,Активно мени
 DocType: Target Detail,Target Qty,Целна Количина
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Против заем: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Плаќање Settings
 DocType: Student Attendance,Present,Моментов
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
@@ -5471,9 +5512,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
 DocType: Vehicle Log,Odometer,километража
 DocType: Production Plan Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM не содржи количини
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM не содржи количини
 DocType: Chapter,Chapter Head,Глава глава
 DocType: Payment Term,Month(s) after the end of the invoice month,Месец (и) по крајот на фактурата месец
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Проектна активност / задача.
@@ -5481,11 +5522,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генерирање на исплатните листи
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Датотеката за резултатите од лабораторијата не може да биде пред да се тестира времето за податоци
 DocType: POS Profile,Allow user to edit Discount,Дозволи му на корисникот да го уреди попустот
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Добијте клиенти од
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Добијте клиенти од
 DocType: Purchase Invoice Item,Include Exploded Items,Вклучи експлодирани елементи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Купување мора да се провери, ако е применливо за е избран како {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
 DocType: Shipping Rule,Restrict to Countries,Ограничи се на земји
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,платежна часа
 DocType: Project,Total Sales Amount (via Sales Order),Вкупен износ на продажба (преку нарачка за продажба)
@@ -5504,6 +5546,7 @@
 DocType: Soil Texture,Sandy Clay,Сенди Клеј
 DocType: Grant Application,Assessment  Manager,Менаџер за проценка
 DocType: Payment Entry,Allocate Payment Amount,Одвои исплата Износ
+DocType: Subscription Plan,Subscription Plan,План за претплата
 DocType: Employee External Work History,Salary,Плата
 DocType: Serial No,Delivery Document Type,Испорака Вид на документ
 DocType: Sales Order,Partly Delivered,Делумно Дадени
@@ -5528,9 +5571,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Стареењето опсег 2
 DocType: SG Creation Tool Course,Max Strength,Макс Сила
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталирање на меморија
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Нема избрана белешка за избор за клиент {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Нема избрана белешка за избор за клиент {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Бум замени
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Изберете предмети врз основа на датумот на испорака
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Изберете предмети врз основа на датумот на испорака
 DocType: Grant Application,Has any past Grant Record,Има некое минато грант рекорд
 ,Sales Analytics,Продажбата анализи
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Достапно {0}
@@ -5549,7 +5592,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
 DocType: Selling Settings,Settings for Selling Module,Нагодувања за модулот Продажби
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервација на хотелот
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Услуги за Потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Услуги за Потрошувачи
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Точка Детали за корисници
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Понуда кандидат работа.
@@ -5566,7 +5609,7 @@
 DocType: Fees,Student Details,Детали за учениците
 DocType: Purchase Invoice Item,Stock Qty,акции Количина
 DocType: Purchase Invoice Item,Stock Qty,акции Количина
-DocType: Employee Loan,Repayment Period in Months,Отплата Период во месеци
+DocType: Loan,Repayment Period in Months,Отплата Период во месеци
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Грешка: Не е валидна проект?
 DocType: Naming Series,Update Series Number,Ажурирање Серија број
 DocType: Account,Equity,Капитал
@@ -5575,7 +5618,7 @@
 DocType: Task,Closing Date,Краен датум
 DocType: Sales Order Item,Produced Quantity,Произведената количина
 DocType: Timesheet,Work Detail,Детална работа
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Инженер
 DocType: Journal Entry,Total Amount Currency,Вкупниот износ Валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Барај Под собранија
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
@@ -5621,13 +5664,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Донатор Тип информации.
 DocType: Request for Quotation,Supplier Detail,добавувачот детали
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка во формулата или состојба: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Фактурираниот износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Фактурираниот износ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Тежините на критериумите мора да содржат до 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Публика
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,акции предмети
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не е означено, листата ќе мора да се додаде на секој оддел каде што треба да се примени."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Креирање {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Изворот и целните Магацински не може да биде ист
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Данок дефиниција за купување трансакции.
@@ -5651,14 +5693,14 @@
 DocType: Shipping Rule,Fixed,Фиксна
 DocType: Vehicle Service,Clutch Plate,спојката Плоча
 DocType: Company,Round Off Account,Заокружуваат профил
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Административни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Административни трошоци
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
-DocType: Journal Entry,Subscription,Претплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Претплата
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Во тек е создавање на надоместоци
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Отказен рок
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Отказен рок
 DocType: Asset Category,Asset Category Name,Средства Име на категоријата
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ова е коренот територија и не може да се уредува.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Име на нови продажбата на лице
@@ -5672,7 +5714,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
 DocType: Asset,Frequency of Depreciation (Months),Фреквенција на амортизација (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина на ставки добиени по производство / препакувани од дадени количини на суровини
@@ -5680,7 +5722,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Во однос на ставка од продажна нарачка
 DocType: Hub Settings,Company Logo,Лого на компанијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 DocType: Healthcare Settings,Patient Registration,Регистрација на пациенти
@@ -5715,11 +5757,10 @@
 DocType: Journal Entry,Total Debit,Вкупно Побарува
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Стандардно готови стоки Магацински
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Изберете пациент
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продажбата на лице
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продажбата на лице
 DocType: Hotel Room Package,Amenities,Услуги
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Буџетот и трошоците центар
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Не е дозволен повеќекратен стандарден начин на плаќање
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Именување на анализи
 DocType: Vehicle Service,Half Yearly,Половина годишно
 DocType: Lead,Blog Subscriber,Блог Претплатникот
@@ -5736,6 +5777,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Оставете го празно ако се направи на студентите групи годишно
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е обележано, Вкупно бр. на работните денови ќе бидат вклучени празници, а со тоа ќе се намали вредноста на платата по ден"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Апликациите што користат тековен клуч нема да можат да пристапат, дали сте сигурни?"
+DocType: Subscription Settings,Prorate,Продре
 DocType: Purchase Invoice,Total Advance,Вкупно Аванс
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Променете го кодот за обрасци
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Термин Датум на завршување не може да биде порано од Датумот Термин Почеток на. Ве молам поправете датумите и обидете се повторно.
@@ -5747,8 +5789,9 @@
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 DocType: Cheque Print Template,Signatory Position,потписник Позиција
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Постави како изгубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Постави како изгубени
 DocType: Timesheet,Total Billable Hours,Вкупно фактурираните часа
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Број на денови што претплатникот мора да ги плати фактурите генерирани од оваа претплата
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаќање Потврда Забелешка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ова е врз основа на трансакциите од овој корисник. Види времеплов подолу за детали
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Ред {0}: висината на посебниот {1} мора да биде помала или еднаква на износот на плаќање за влез {2}
@@ -5767,12 +5810,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Изберете или да додадете нови клиенти
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ова се базира на присуството на вработениот
 DocType: Assessment Result,Summary,Резиме
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Означи присуство
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Дебитни сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година започнува на Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ресторан Цел Влезна точка
@@ -5784,7 +5827,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,купување износ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Користи за вработените
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Користи за вработените
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Work Order,Manufactured Qty,Произведени Количина
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Акциите не постојат со {0}
@@ -5792,12 +5835,12 @@
 DocType: Asset,Out of Order,Надвор од нарачката
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 DocType: Projects Settings,Ignore Workstation Time Overlap,Игнорирај преклопување на работната станица
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Изберете Серија броеви
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Сметки се зголеми на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 DocType: Patient Service Unit,Medical Administrator,Медицински администратор
 DocType: Assessment Plan,Schedule,Распоред
 DocType: Account,Parent Account,Родител профил
@@ -5827,15 +5870,16 @@
 DocType: Asset Repair,Repair Status,Поправка статус
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 DocType: POS Profile,Account for Change Amount,Сметка за промени Износ
 DocType: Purchase Invoice,input service,услуга за внесување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Член на тимот за одржување
 DocType: Agriculture Analysis Criteria,Soil Analysis,Анализа на почвата
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Код:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ве молиме внесете сметка сметка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Employee,Current Address,Тековна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
@@ -5884,19 +5928,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Запишување за {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име на променлива
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
 DocType: Asset,Asset Category,средства Категорија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Нето плата со која не може да биде негативен
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Материјал на Добавувачот
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Планирање на барања за материјали
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Акцизни Фактура
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% чини повеќе од еднаш
 DocType: Expense Claim,Employees Email Id,Вработените-пошта Id
 DocType: Employee Attendance Tool,Marked Attendance,означени Публика
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Тековни обврски
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Тековни обврски
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Тајмерот ги надминал зададените часови.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Испрати маса SMS порака на вашите контакти
 DocType: Patient,A Positive,Позитивен
@@ -5907,9 +5951,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} во моментов има {1} Оценка за набавувачот, а Купувачките налози на овој добавувач треба да бидат претпазливи."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Тим за одржување на средства
-DocType: Employee Loan,Loan Type,Тип на кредит
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} е успешно поднесена
+DocType: Loan,Loan Type,Тип на кредит
 DocType: Scheduling Tool,Scheduling Tool,распоред алатка
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Со кредитна картичка
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Со кредитна картичка
 DocType: BOM,Item to be manufactured or repacked,"Елемент, за да се произведе или да се препакува"
 DocType: Employee Education,Major/Optional Subjects,Големи / изборни предмети
 DocType: Sales Invoice Item,Drop Ship,Капка Брод
@@ -5941,7 +5986,7 @@
 DocType: Item,Units of Measure,На мерните единици
 DocType: Manufacturing Settings,Allow Production on Holidays,Овозможете производството за празниците
 DocType: Sales Invoice,Customer's Purchase Order Date,Клиентите нарачка Датум
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Прикажи јавни додатоци
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
 DocType: Restaurant Reservation,Reservation Time,Време на резервација
@@ -5956,7 +6001,7 @@
 DocType: Purchase Order,To Receive and Bill,За да примите и Бил
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Редот # {0}: Reqd од Датум не може да биде пред датумот на трансакција
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Избрана Производи
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
@@ -5966,20 +6011,20 @@
 DocType: Driver,Expiry Date,Датумот на истекување
 DocType: Healthcare Settings,Employee name and designation in print,Име на вработениот и ознака во печатење
 ,accounts-browser,сметки пребарувач
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Ве молиме изберете категорија во првата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Господар на проектот.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Да им овозможи на над-платежна или над-нарачување, ажурирање &quot;додаток&quot; во парк Прилагодувања или точка."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Пола ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Пола ден)
 DocType: Payment Term,Credit Days,Кредитна дена
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Изберете пациент за да добиете лабораториски тестови
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Направете Студентски Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Земи ставки од BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Земи ставки од BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Потенцијален клиент Време Денови
 DocType: Cash Flow Mapping,Is Income Tax Expense,Дали трошоците за данок на доход
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Изберете го ова ако ученикот е престојуваат во Хостел на Институтот.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
 ,Stock Summary,акции Резиме
@@ -5990,10 +6035,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Причина за напуштање
 DocType: BOM Operation,Operating Cost(Company Currency),Оперативни трошоци (Фирма валута)
-DocType: Employee Loan Application,Rate of Interest,Каматна стапка
+DocType: Loan Application,Rate of Interest,Каматна стапка
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: Item,Shelf Life In Days,Рок на траење во денови
 DocType: GL Entry,Is Opening,Се отвора
+DocType: Department,Expense Approvers,Одобрувачи на трошоци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
 DocType: Journal Entry,Subscription Section,Секција за претплата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,На сметка {0} не постои
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index f20b4d2..60fb514 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ഈ വാറന്റി ക്ലെയിം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനം {0} റദ്ദാക്കുക
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,വിലയിരുത്തൽ റിപ്പോർട്ടുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,കൺസ്യൂമർ ഉൽപ്പന്നങ്ങൾ
-DocType: Purchase Receipt,Subscription Detail,സബ്സ്ക്രിപ്ഷൻ വിശദാംശം
 DocType: Supplier Scorecard,Notify Supplier,വിതരണക്കാരൻ അറിയിക്കുക
 DocType: Item,Customer Items,ഉപഭോക്തൃ ഇനങ്ങൾ
 DocType: Project,Costing and Billing,ആറെണ്ണവും ബില്ലിംഗ്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} അതെല്ലാം ഒരു ആകാൻ പാടില്ല
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com വരെ ഇനം പ്രസിദ്ധീകരിക്കുക
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ഇമെയിൽ അറിയിപ്പുകൾ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,മൂല്യനിർണ്ണയം
 DocType: Item,Default Unit of Measure,അളവു സ്ഥിരസ്ഥിതി യൂണിറ്റ്
 DocType: SMS Center,All Sales Partner Contact,എല്ലാ സെയിൽസ് പങ്കാളി കോണ്ടാക്ട്
-DocType: Employee,Leave Approvers,Approvers വിടുക
+DocType: Department,Leave Approvers,Approvers വിടുക
 DocType: Sales Partner,Dealer,ഡീലർ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,അന്വേഷണം
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ലഭ്യത ഉറപ്പു വരുത്തുക
 DocType: Job Applicant,Job Applicant,ഇയ്യോബ് അപേക്ഷകന്
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ഇത് ഈ വിതരണക്കാരൻ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,നിയമ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},യഥാർത്ഥ തരം നികുതി വരി {0} ൽ ഇനം നിരക്ക് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,നിയമ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},യഥാർത്ഥ തരം നികുതി വരി {0} ൽ ഇനം നിരക്ക് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
 DocType: Bank Guarantee,Customer,കസ്റ്റമർ
 DocType: Purchase Receipt Item,Required By,നിബന്ധനകൾ
 DocType: Delivery Note,Return Against Delivery Note,ഡെലിവറി കുറിപ്പ് മടങ്ങുക
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,മേധാവികൾ (അല്ലെങ്കിൽ ഗ്രൂപ്പുകൾ) അക്കൗണ്ടിംഗ് വിഭാഗരേഖകൾ തീർത്തതു നീക്കിയിരിപ്പും സൂക്ഷിക്കുന്ന ഏത് നേരെ.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,പ്രോസസ്സ് ചെയ്യാൻ സമർപ്പിച്ച സാലറി സ്ലിപ്പുകളൊന്നും ഇല്ല.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,പ്രോസസ്സ് ചെയ്യാൻ സമർപ്പിച്ച സാലറി സ്ലിപ്പുകളൊന്നും ഇല്ല.
 DocType: Manufacturing Settings,Default 10 mins,10 മിനിറ്റ് സ്വതേ സ്വതേ
 DocType: Leave Type,Leave Type Name,ടൈപ്പ് പേര് വിടുക
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,തുറക്കുക കാണിക്കുക
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,മേൽപ്പറഞ്ഞ ആവർത്തനത്തിന് ഇന്ന് തന്നെ ഈ പ്രവർത്തനം ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ചെക്ക് ഔട്ട്
 DocType: Pricing Rule,Apply On,പുരട്ടുക
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,എല്ലാ വിതരണക്കാരൻ കോൺടാക്റ്റ്
 DocType: Support Settings,Support Settings,പിന്തുണ സജ്ജീകരണങ്ങൾ
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
 ,Batch Item Expiry Status,ബാച്ച് ഇനം കാലഹരണപ്പെടൽ അവസ്ഥ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Membership,membership validaty section,അംഗത്വം സാധുതയുള്ള വിഭാഗം
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
 DocType: Consultation,Consultation,കൺസൾട്ടേഷൻ
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,മെറ്റീരിയൽ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,വെബ്സൈറ്റ് ഉണ്ടാക്കുന്നു
 DocType: Opening Invoice Creation Tool Item,Quantity,ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
 DocType: Employee Education,Year of Passing,പാസ് ആയ വര്ഷം
 DocType: Item,Country of Origin,മാതൃരാജ്യം
 DocType: Soil Texture,Soil Texture Criteria,മണ്ണ് ടെക്സ്ച്ചർ മാനദണ്ഡം
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,പ്രാഥമിക കോൺടാക്റ്റ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,തുറന്ന പ്രശ്നങ്ങൾ
 DocType: Production Plan Item,Production Plan Item,പ്രൊഡക്ഷൻ പ്ലാൻ ഇനം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ഉപയോക്താവ് {0} ഇതിനകം എംപ്ലോയിസ് {1} നിയോഗിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ഉപയോക്താവ് {0} ഇതിനകം എംപ്ലോയിസ് {1} നിയോഗിക്കുന്നു
 DocType: Lab Test Groups,Add new line,പുതിയ വരി ചേർക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
@@ -89,7 +85,7 @@
 ,Delay Days,കാലതാമസം ഒഴിവാക്കുക
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,വികയപതം
+DocType: Subscription Invoice,Invoice,വികയപതം
 DocType: Purchase Invoice Item,Item Weight Details,ഇനം ഭാരം വിശദാംശങ്ങൾ
 DocType: Asset Maintenance Log,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),സ്കോർ (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,വരി # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,വരി # {0}:
 DocType: Timesheet,Total Costing Amount,ആകെ ആറെണ്ണവും തുക
 DocType: Delivery Note,Vehicle No,വാഹനം ഇല്ല
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,വില ലിസ്റ്റ് തിരഞ്ഞെടുക്കുക
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,പ്രവൃത്തി പുരോഗതിയിലാണ്
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Daily Work Summary Group,Holiday List,ഹോളിഡേ പട്ടിക
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,കണക്കെഴുത്തുകാരന്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,കണക്കെഴുത്തുകാരന്
 DocType: Hub Settings,Selling Price List,വില ലിസ്റ്റ് വിൽക്കുന്നു
 DocType: Patient,Tobacco Current Use,പുകയില നിലവിലുളള ഉപയോഗം
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,വിൽക്കുന്ന നിരക്ക്
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,വിൽക്കുന്ന നിരക്ക്
 DocType: Cost Center,Stock User,സ്റ്റോക്ക് ഉപയോക്താവ്
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,ഫോൺ ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},പുതിയ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,പ്രാരംഭ ഇമെയിൽ അറിയിപ്പ് അയച്ചു
 ,Sales Partners Commission,സെയിൽസ് പങ്കാളികൾ കമ്മീഷൻ
 DocType: Soil Texture,Sandy Clay Loam,സാൻഡി ക്ലേ ലോം
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,മൂല്യത്തകർച്ച ശേഷം മൂല്യം
 DocType: Student,O+,അവളുടെ O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ബന്ധപ്പെട്ട
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,ഹാജർ തീയതി ജീവനക്കാരന്റെ ചേരുന്ന തീയതി കുറവ് പാടില്ല
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,ഹാജർ തീയതി ജീവനക്കാരന്റെ ചേരുന്ന തീയതി കുറവ് പാടില്ല
 DocType: Grading Scale,Grading Scale Name,ഗ്രേഡിംഗ് സ്കെയിൽ പേര്
-DocType: Subscription,Repeat on Day,ദിവസം ആവർത്തിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ഇത് ഒരു റൂട്ട് അക്കൌണ്ട് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 DocType: Sales Invoice,Company Address,കമ്പനി വിലാസം
 DocType: BOM,Operations,പ്രവര്ത്തനങ്ങള്
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} വേണ്ടി ഡിസ്കൗണ്ട് അടിസ്ഥാനത്തിൽ അധികാരപ്പെടുത്തൽ സജ്ജമാക്കാൻ കഴിയില്ല
+DocType: Subscription,Subscription Start Date,സബ്സ്ക്രിപ്ഷൻ ആരംഭ തീയതി
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","രണ്ടു നിരകൾ, പഴയ പേര് ഒന്നു പുതിയ പേര് ഒന്നു കൂടി .csv ഫയൽ അറ്റാച്ച്"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} അല്ല സജീവമായ സാമ്പത്തിക വർഷത്തിൽ.
 DocType: Packed Item,Parent Detail docname,പാരന്റ് വിശദാംശം docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","പരാമർശം: {2}: {0}, ഇനം കോഡ്: {1} ഉപഭോക്തൃ"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ട്രയൽ കാലാവധി അവസാന തീയതി ട്രയൽ കാലയളവ് ആരംഭിക്കുന്ന തീയതിക്ക് മുമ്പായിരിക്കരുത്
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,കി. ഗ്രാം
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ഒരു ജോലിക്കായി തുറക്കുന്നു.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{0} വരിയിൽ {0} സബ് കൺട്രോൾ ചെയ്യുന്നതിനായി BOM നിർദ്ദേശിക്കപ്പെട്ടിട്ടില്ല.
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ഒരേ കമ്പനി ഒന്നിലധികം തവണ നൽകുമ്പോഴുള്ള
 DocType: Patient,Married,വിവാഹിത
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} അനുവദനീയമല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
 DocType: Price List,Price Not UOM Dependant,വിലയല്ല UOM ആശ്രയിച്ചത്
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ബ്രേക്ക് ഓയിൽ
 DocType: Tax Rule,Tax Type,നികുതി തരം
 ,Completed Work Orders,പൂർത്തിയായ തൊഴിൽ ഉത്തരവുകൾ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,ടാക്സബിളല്ല തുക
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,ടാക്സബിളല്ല തുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
 DocType: BOM,Item Image (if not slideshow),ഇനം ഇമേജ് (അതില് അല്ല എങ്കിൽ)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(അന്ത്യസമയം റേറ്റ് / 60) * യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,വരി # {0}: റഫറൻസ് പ്രമാണ തരം ചെലവിൽ ക്ലെയിമുകളോ ജേർണൽ എൻട്രിയിലോ ആയിരിക്കണം
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,വരി # {0}: റഫറൻസ് പ്രമാണ തരം ചെലവിൽ ക്ലെയിമുകളോ ജേർണൽ എൻട്രിയിലോ ആയിരിക്കണം
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
 DocType: SMS Log,SMS Log,എസ്എംഎസ് ലോഗ്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,കൈമാറി ഇനങ്ങൾ ചെലവ്
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ജീവനക്കാർക്ക് മുൻകൂർ തുക നൽകുക
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ഡെലിവറി അറിയിപ്പ്
 DocType: Journal Entry,Opening Entry,എൻട്രി തുറക്കുന്നു
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,അക്കൗണ്ട് മാത്രം പണം നൽകുക
-DocType: Employee Loan,Repay Over Number of Periods,കാലയളവിന്റെ എണ്ണം ഓവർ പകരം
+DocType: Loan,Repay Over Number of Periods,കാലയളവിന്റെ എണ്ണം ഓവർ പകരം
 DocType: Stock Entry,Additional Costs,അധിക ചെലവ്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Lead,Product Enquiry,ഉൽപ്പന്ന അറിയുവാനുള്ള
 DocType: Education Settings,Validate Batch for Students in Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് വിദ്യാർത്ഥികളുടെ ബാച്ച് സാധൂകരിക്കൂ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},വേണ്ടി {1} {0} ജീവനക്കാരൻ കണ്ടെത്തിയില്ല ലീവ് റിക്കോർഡുകളൊന്നും
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},വേണ്ടി {1} {0} ജീവനക്കാരൻ കണ്ടെത്തിയില്ല ലീവ് റിക്കോർഡുകളൊന്നും
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ആദ്യം കമ്പനി നൽകുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക
 DocType: Employee Education,Under Graduate,ഗ്രാജ്വേറ്റ് കീഴിൽ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ലെവൽ സ്റ്റാറ്റസ് അറിയിപ്പിന് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് സജ്ജീകരിക്കുക.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ടാർഗറ്റിൽ
 DocType: BOM,Total Cost,മൊത്തം ചെലവ്
 DocType: Soil Analysis,Ca/K,സി / കെ
-DocType: Journal Entry Account,Employee Loan,ജീവനക്കാരുടെ വായ്പ
 DocType: Fee Schedule,Send Payment Request Email,പേയ്മെന്റ് അഭ്യർത്ഥന ഇമെയിൽ അയയ്ക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,റിയൽ എസ്റ്റേറ്റ്
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,വിജയകരമായി രജിസ്റ്റർ ചെയ്തത്.
 DocType: Assessment Result,Grade,പദവി
 DocType: Restaurant Table,No of Seats,സീറ്റുകളുടെ എണ്ണം
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ഡൈനാമിക് വിഷയം ചേർക്കാൻ, like jinja tags ഉപയോഗിക്കുക <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,വിതരണക്കാരൻ രക്ഷപ്പെടുത്തി
 DocType: Asset Maintenance Task,Asset Maintenance Task,അസറ്റ് മെയിന്റനൻസ് ടാസ്ക്
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,വാർഷിക ശമ്പളം
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,വാർഷിക ശമ്പളം
 DocType: Daily Work Summary,Daily Work Summary,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം
 DocType: Period Closing Voucher,Closing Fiscal Year,അടയ്ക്കുന്ന ധനകാര്യ വർഷം
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} മരവിച്ചു
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ദയവായി തിരഞ്ഞെടുത്ത ബന്ധപ്പെടുന്നതിനുള്ള ഇമെയിൽ നൽകുക
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,ദയവായി തിരഞ്ഞെടുത്ത ബന്ധപ്പെടുന്നതിനുള്ള ഇമെയിൽ നൽകുക
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,കോൺട്ര എൻട്രി
 DocType: Journal Entry Account,Credit in Company Currency,കമ്പനി കറൻസി ക്രെഡിറ്റ്
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,പ്രാഥമിക വിലാസം
 DocType: Production Plan,Material Request Detail,മെറ്റീരിയൽ അഭ്യർത്ഥന വിശദാംശം
 DocType: Selling Settings,Default Quotation Validity Days,സ്ഥിരസ്ഥിതി ഉദ്ധരണിക്കൽ സാധുത ദിവസങ്ങൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: Sales Invoice,Change Amount,തുക മാറ്റുക
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,ഡ്രൈവിംഗ് ലൈസൻസ് വിഭാഗങ്ങൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ഡെലിവറി തീയതി നൽകുക
 DocType: Depreciation Schedule,Make Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി നിർമ്മിക്കുക
+DocType: HR Settings,Leave Settings,ക്രമീകരണങ്ങൾ വിടുക
 DocType: Appraisal Template Goal,KRA,ക്ര
 DocType: Lead,Request Type,അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,പ്രക്ഷേപണം
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS- യുടെ സെറ്റ്അപ്പ് മോഡ് (ഓൺലൈൻ / ഓഫ്ലൈൻ)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,വർക്ക് ഓർഡറുകളിലേക്കുള്ള സമയരേഖകൾ സൃഷ്ടിക്കുന്നത് അപ്രാപ്തമാക്കുന്നു. പ്രവർത്തന ഓർഡർക്കെതിരെയുള്ള പ്രവർത്തനം ട്രാക്കുചെയ്യരുത്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,വധശിക്ഷയുടെ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,വധശിക്ഷയുടെ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,പ്രവർത്തനങ്ങൾ വിശദാംശങ്ങൾ പുറത്തു കൊണ്ടുപോയി.
 DocType: Asset Maintenance Log,Maintenance Status,മെയിൻറനൻസ് അവസ്ഥ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,അംഗത്വം വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: വിതരണക്കാരൻ പേയബിൾ അക്കൗണ്ട് {2} നേരെ ആവശ്യമാണ്
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ഇനങ്ങൾ ഉള്ളവയും
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ആകെ മണിക്കൂർ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},തീയതി നിന്നും സാമ്പത്തിക വർഷത്തെ ആയിരിക്കണം. ഈ തീയതി മുതൽ കരുതുന്നു = {0}
 DocType: Drug Prescription,Interval,ഇടവേള
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,മുൻഗണന
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,മുൻഗണന
 DocType: Grant Application,Individual,വ്യക്തിഗത
 DocType: Academic Term,Academics User,അക്കാദമിക ഉപയോക്താവ്
 DocType: Cheque Print Template,Amount In Figure,ചിത്രം തുക
-DocType: Employee Loan Application,Loan Info,ലോൺ വിവരങ്ങളും
+DocType: Loan Application,Loan Info,ലോൺ വിവരങ്ങളും
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,അറ്റകുറ്റപ്പണി സന്ദർശനവേളയിൽ പ്ലാൻ.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,വിതരണ സ്കോർകാർഡ് കാലയളവ്
 DocType: Share Transfer,Share Transfer,ട്രാൻസ്ഫർ പങ്കിടുക
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,ഇനം ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ബയോകെമിസ്ട്രി
 DocType: Job Offer,Select Terms and Conditions,നിബന്ധനകളും വ്യവസ്ഥകളും തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,മൂല്യം ഔട്ട്
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,മൂല്യം ഔട്ട്
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ക്രമീകരണങ്ങൾ
 DocType: Production Plan,Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 DocType: Purchase Taxes and Charges,Valuation,വിലമതിക്കല്
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,സ്ഥിരസ്ഥിതി ടെറിട്ടറി
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ടെലിവിഷൻ
 DocType: Work Order Operation,Updated via 'Time Log',&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ്
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ഉപഭോക്താവ് അല്ലെങ്കിൽ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,ഈ ഇടപാടിനായി സീരീസ് പട്ടിക
 DocType: Company,Enable Perpetual Inventory,ഞാനാകട്ടെ ഇൻവെന്ററി പ്രവർത്തനക്ഷമമാക്കുക
+DocType: Bank Guarantee,Charges Incurred,ചാർജ് തന്നു
 DocType: Company,Default Payroll Payable Account,സ്ഥിരസ്ഥിതി പേയ്റോൾ അടയ്ക്കേണ്ട അക്കൗണ്ട്
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
 DocType: Sales Invoice,Is Opening Entry,എൻട്രി തുറക്കുകയാണ്
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,ഇഷ്ടാനുസൃത ഫലം
 DocType: Delivery Stop,Contact Name,കോൺടാക്റ്റ് പേര്
 DocType: Course Assessment Criteria,Course Assessment Criteria,കോഴ്സ് അസസ്മെന്റ് മാനദണ്ഡം
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ടാക്സ് ഐഡി:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ടാക്സ് ഐഡി:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,വിദ്യാർത്ഥിയുടെ ഐഡി:
 DocType: POS Customer Group,POS Customer Group,POS കസ്റ്റമർ ഗ്രൂപ്പ്
 DocType: Land Unit,Land Unit describing various land assets,വിവിധ ഭൂവിനിയോഗങ്ങളെ വിവരിക്കുന്ന ലാൻഡ് യൂണിറ്റ്
@@ -375,9 +372,8 @@
 ,Open Work Orders,വർക്ക് ഓർഡറുകൾ തുറക്കുക
 DocType: Payment Term,Credit Months,ക്രെഡിറ്റ് മാസങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,നെറ്റ് ശമ്പള 0 കുറവ് പാടില്ല
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","സിസ്റ്റത്തിൽ നിന്നുള്ള ആവർത്തിച്ചുള്ള പിശക് അറിയിപ്പുകൾ അയക്കുന്നത് നിർത്താൻ, ഞങ്ങൾ സബ്സ്ക്രിപ്ഷനിൽ ഡിസ്വാഡ് ഫീൽഡ് പരിശോധിച്ചു"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,പ്രതിവർഷം ഇലകൾ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,പ്രതിവർഷം ഇലകൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,വരി {0}: ഈ അഡ്വാൻസ് എൻട്രി ആണ് എങ്കിൽ {1} അക്കൗണ്ട് നേരെ &#39;അഡ്വാൻസ് തന്നെയല്ലേ&#39; പരിശോധിക്കുക.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
 DocType: Email Digest,Profit & Loss,ലാഭം നഷ്ടം
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾക്ക് കീഴിലുള്ള വിദ്യാർത്ഥികളെ ക്രമീകരിക്കുക
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ബാങ്ക് എൻട്രികൾ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,വിടുക തടയപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ബാങ്ക് എൻട്രികൾ
 DocType: Crop,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ക്രിയേഷൻ ടൂൾ കോഴ്സ്
 DocType: Lead,Do Not Contact,ബന്ധപ്പെടുക ചെയ്യരുത്
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,നിങ്ങളുടെ ഓർഗനൈസേഷനിലെ പഠിപ്പിക്കാൻ ആളുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
 DocType: Item,Minimum Order Qty,മിനിമം ഓർഡർ Qty
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
 DocType: Course Scheduling Tool,Course Start Date,കോഴ്സ് ആരംഭ തീയതി
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,മാക്സ് ഗ്രേഡ്
 DocType: Email Digest,New Quotations,പുതിയ ഉദ്ധരണികൾ
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,തിരഞ്ഞെടുത്ത ഇമെയിൽ ജീവനക്കാർ തിരഞ്ഞെടുത്ത അടിസ്ഥാനമാക്കി ജീവനക്കാരൻ ഇമെയിലുകൾ ശമ്പളം സ്ലിപ്പ്
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
 DocType: Tax Rule,Shipping County,ഷിപ്പിംഗ് കൗണ്ടി
-apps/erpnext/erpnext/config/desktop.py +167,Learn,അറിയുക
+apps/erpnext/erpnext/config/desktop.py +159,Learn,അറിയുക
 DocType: Asset,Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ജീവനക്കാർ ശതമാനം പ്രവർത്തനം ചെലവ്
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ക്ലിയർ നിലവിലുള്ള ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
 DocType: Driver,Fleet Manager,ഫ്ലീറ്റ് മാനേജർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},വരി # {0}: {1} ഇനം {2} നെഗറ്റീവ് പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},വരി # {0}: {1} ഇനം {2} നെഗറ്റീവ് പാടില്ല
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{} ഹോട്ടലിൽ ഹോട്ടൽ റൂട്ട് റേറ്റ് ക്രമീകരിക്കുക
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Opening Invoice Creation Tool,Invoice Type,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ഡെലിവറി നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ഡെലിവറി നോട്ട്
 DocType: Consultation,Encounter Impression,എൻകോർട്ട് ഇംപ്രഷൻ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,വിറ്റത് അസറ്റ് ചെലവ്
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,കസ്റ്റമർ നാണയ ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Course Scheduling Tool,Course Scheduling Tool,കോഴ്സ് സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,% S എന്നതിനായുള്ള ആവർത്തിച്ചുള്ള% s സൃഷ്ടിക്കുന്നതിനിടയിൽ [തീർന്നു] പിശക്
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
 DocType: Land Unit,LInked Analysis,LInked വിശകലനം
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,അപേക്ഷാ കാലയളവ് രണ്ട് വകഭേദാ രേഖകളിലായിരിക്കരുത്
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,അപേക്ഷാ കാലയളവ് രണ്ട് വകഭേദാ രേഖകളിലായിരിക്കരുത്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ലഭിച്ചു
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ സൃഷ്ടിക്കുക
 DocType: Volunteer,Weekends,വാരാന്ത്യങ്ങൾ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ക്രെഡിറ്റ് നോട്ട് തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ക്രെഡിറ്റ് നോട്ട് തുക
 DocType: Setup Progress Action,Action Document,പ്രവർത്തന പ്രമാണം
 DocType: Chapter Member,Website URL,വെബ്സൈറ്റ് URL
 ,Finished Goods,ഫിനിഷ്ഡ് സാധനങ്ങളുടെ
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ഡെമോ
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ഇനങ്ങൾ ചേർക്കുക
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ഇനം ക്വാളിറ്റി പരിശോധന പാരാമീറ്റർ
+DocType: Leave Application,Leave Approver Name,Approver പേര് വിടുക
 DocType: Depreciation Schedule,Schedule Date,ഷെഡ്യൂൾ തീയതി
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","വരുമാനം, പൂർണമായും മറ്റ് ശമ്പളം ഘടകങ്ങൾ"
 DocType: Packed Item,Packed Item,ചിലരാകട്ടെ ഇനം
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
 DocType: Healthcare Settings,Require Lab Test Approval,ലാബ് പരിശോധന അംഗീകരിക്കേണ്ടതുണ്ട്
 DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,മൊത്തം ശ്രദ്ധേയമായത്
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,മൊത്തം ശ്രദ്ധേയമായത്
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
 DocType: Dosage Strength,Strength,ശക്തി
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Consumable ചെലവ്
 DocType: Purchase Receipt,Vehicle Date,വാഹന തീയതി
 DocType: Student Log,Medical,മെഡിക്കൽ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,അക്കൗണ്ട് നമ്പർ അപ്ഡേറ്റുചെയ്യുക
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ലീഡ് ഉടമ ലീഡ് അതേ പാടില്ല
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,സിംഗിൾ
 DocType: Salary Slip,Total Loan Repayment,ആകെ വായ്പ തിരിച്ചടവ്
 DocType: Account,Cost of Goods Sold,വിറ്റ സാധനങ്ങളുടെ വില
-DocType: Subscription,Yearly,വാർഷികം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
 DocType: Drug Prescription,Dosage,മരുന്നിന്റെ
 DocType: Journal Entry Account,Sales Order,വിൽപ്പന ഓർഡർ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
 DocType: Assessment Plan,Examiner Name,എക്സാമിനർ പേര്
 DocType: Lab Test Template,No Result,ഫലമൊന്നും
 DocType: Purchase Invoice Item,Quantity and Rate,"ക്വാണ്ടിറ്റി, റേറ്റ്"
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,കമ്പനിയുടെ പേര് ആദ്യം നൽകുക
 DocType: Purchase Invoice,Supplier Name,വിതരണക്കാരൻ പേര്
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext മാനുവൽ വായിക്കുക
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,എല്ലാ ഡിപ്പാർട്ട്മെന്റ് അംഗങ്ങളുടെയും ഇലകൾ കലണ്ടറിൽ കാണിക്കുക
 DocType: Purchase Invoice,01-Sales Return,01-സെയിൽസ് റിട്ടേൺ
 DocType: Account,Is Group,ഗ്രൂപ്പ് തന്നെയല്ലേ
 DocType: Email Digest,Pending Purchase Orders,തീർച്ചപ്പെടുത്തിയിട്ടില്ല വാങ്ങൽ ഓർഡറുകൾ
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,നിർബന്ധമായ ഒരു ഫീൽഡ് - അക്കാദമിക് വർഷം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} ഉപയോഗിച്ച് {3} ബന്ധമില്ല
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ആ ഇമെയിൽ ഭാഗമായി പോകുന്ന ആമുഖ വാചകം ഇഷ്ടാനുസൃതമാക്കുക. ഓരോ ഇടപാട് ഒരു പ്രത്യേക ആമുഖ ടെക്സ്റ്റ് ഉണ്ട്.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},കമ്പനി {0} സ്ഥിരസ്ഥിതി മാറാവുന്ന അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},കമ്പനി {0} സ്ഥിരസ്ഥിതി മാറാവുന്ന അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},ജോലി നിർത്തലാക്കുന്നത് നിർത്തിവയ്ക്കുന്നതിന് ഇടപാട് ഇടപെടരുത് {0}
 DocType: Setup Progress Action,Min Doc Count,മിനി ഡോക് കൌണ്ട്
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,എല്ലാ നിർമാണ പ്രക്രിയകൾ വേണ്ടി ആഗോള ക്രമീകരണങ്ങൾ.
 DocType: Accounts Settings,Accounts Frozen Upto,ശീതീകരിച്ച വരെ അക്കൗണ്ടുകൾ
 DocType: SMS Log,Sent On,ദിവസം അയച്ചു
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,വില്പനയ്ക്ക് സംവരണം
 DocType: Packing Slip,From Package No.,പാക്കേജ് നമ്പർ നിന്ന്
 DocType: Item Attribute,To Range,പരിധി വരെ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",വിപണിമൂല്യം രീതി മാറ്റാൻ കഴിയില്ല അത് സ്വന്തം മതിപ്പു രീതി ഇല്ല ചില ഇനങ്ങൾ നേരെ ഇടപാടുകൾ ഉണ്ട് പോലെ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",വിപണിമൂല്യം രീതി മാറ്റാൻ കഴിയില്ല അത് സ്വന്തം മതിപ്പു രീതി ഇല്ല ചില ഇനങ്ങൾ നേരെ ഇടപാടുകൾ ഉണ്ട് പോലെ
 DocType: Student Report Generation Tool,Attended by Parents,മാതാപിതാക്കൾ പങ്കെടുക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും
 DocType: Patient,AB Positive,AB പോസിറ്റീവ്
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ഹാജർ റെക്കോഡ്.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet അടിസ്ഥാനമാക്കിയുള്ള പേറോളിന് ശമ്പളം ഘടകം.
 DocType: Sales Order Item,Used for Production Plan,പ്രൊഡക്ഷൻ പ്ലാൻ ഉപയോഗിച്ച
-DocType: Employee Loan,Total Payment,ആകെ പേയ്മെന്റ്
+DocType: Loan,Total Payment,ആകെ പേയ്മെന്റ്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,പൂർത്തിയാക്കിയ വർക്ക് ഓർഡറിന് ഇടപാട് റദ്ദാക്കാൻ കഴിയില്ല.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(മിനിറ്റ്) ഓപ്പറേഷൻസ് നുമിടയിൽ സമയം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,അങ്ങനെ നടപടി പൂർത്തിയാക്കാൻ കഴിയില്ല {1} {0} റദ്ദാക്കി
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,"നിങ്ങളുടെ ഉപഭോക്താക്കൾ ഏതാനും കാണിയ്ക്കുക. അവർ സംഘടനകൾ, വ്യക്തികളുടെ ആകാം."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ബിൽഡ് മതിയായ ഭാഗങ്ങൾ
 DocType: POS Profile User,POS Profile User,POS പ്രൊഫൈൽ ഉപയോക്താവ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,നേരിട്ടുള്ള ആദായ
+DocType: Subscription Invoice,Subscription Invoice,സബ്സ്ക്രിപ്ഷൻ ഇൻവോയ്സ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,നേരിട്ടുള്ള ആദായ
 DocType: Patient Appointment,Date TIme,തീയതി സമയം
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","അക്കൗണ്ട് ഭൂഖണ്ടക്രമത്തിൽ, അക്കൗണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,കമ്പനിയേയും നികുതികളേയും സജ്ജമാക്കുക
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 DocType: Codification Table,Codification Table,Codification പട്ടിക
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 DocType: Stock Entry Detail,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
 DocType: Purchase Invoice,Supplier GSTIN,വിതരണക്കാരൻ ഗ്സ്തിന്
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,അതിന്റെ ചുമതല {0} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,ക്യാഷ് ഫ്ലോ മാപ്പിംഗ് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
 DocType: Journal Entry,Difference (Dr - Cr),വ്യത്യാസം (ഡോ - CR)
+DocType: Bank Guarantee,Providing,നൽകൽ
 DocType: Account,Profit and Loss,ലാഭവും നഷ്ടവും
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","അനുവദനീയമല്ല, ആവശ്യമെങ്കിൽ ലാബ് ടെസ്റ്റ് ടെംപ്ലേറ്റ് ക്രമീകരിക്കുക"
 DocType: Patient,Risk Factors,അപകടസാധ്യത ഘടകങ്ങൾ
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
 DocType: Healthcare Settings,Appointment Confirmation,അപ്പോയിന്റ്മെന്റ് സ്ഥിരീകരണം
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","അത് സ്റ്റോക്ക് ഇടപാടുകൾ ഉപയോഗിക്കുന്ന പോലെ, {0} സീരിയൽ ഇല്ല ഇല്ലാതാക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","അത് സ്റ്റോക്ക് ഇടപാടുകൾ ഉപയോഗിക്കുന്ന പോലെ, {0} സീരിയൽ ഇല്ല ഇല്ലാതാക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),(CR) അടയ്ക്കുന്നു
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ഹലോ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ഇനം നീക്കുക
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",ദയനീയമായി അപ്രാപ്തമാക്കിയ ഉപയോക്താവ് {1} എന്ന ഉപയോക്താവിനായി പാസ് പ്രൊഫൈലിൽ {0} സ്ഥിരസ്ഥിതിയായി സജ്ജമാക്കിയിരിക്കുന്നു
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,കുമിഞ്ഞു മൂല്യങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS പ്രൊഫൈലിൽ പ്രദേശം ആവശ്യമാണ്
 DocType: Supplier,Prevent RFQs,RFQ കൾ തടയുക
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} മുതൽ {1} വരെയുള്ള കാലയളവിനുള്ള ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} മുതൽ {1} വരെയുള്ള കാലയളവിനുള്ള ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,ഷിപ്പിംഗ് ബിൽ തീയതി
 DocType: Production Plan,Production Plan,ഉല്പാദന പദ്ധതി
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ഇൻവോയ്സ് ക്രിയേഷൻ ടൂൾ തുറക്കുന്നു
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ശ്രദ്ധിക്കുക: നീക്കിവെച്ചത് മൊത്തം ഇല {0} കാലയളവിൽ {1} ഇതിനകം അംഗീകാരം ഇല കുറവ് പാടില്ല
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,സീരിയൽ നോട്ടിഫിക്കേഷൻ അടിസ്ഥാനമാക്കി ഇടപാടുകാരെ ക്യൂട്ടി സജ്ജമാക്കുക
 ,Total Stock Summary,ആകെ ഓഹരി ചുരുക്കം
 DocType: Announcement,Posted By,പോസ്റ്റ് ചെയ്തത്
 DocType: Item,Delivered by Supplier (Drop Ship),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,വസതി ശാരീരിക
 DocType: Training Result Employee,Training Result Employee,പരിശീലന ഫലം ജീവനക്കാരുടെ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,സ്റ്റോക്ക് എൻട്രികൾ നിർമ്മിക്കുന്ന നേരെ ഒരു ലോജിക്കൽ വെയർഹൗസ്.
-DocType: Repayment Schedule,Principal Amount,പ്രിൻസിപ്പൽ തുക
-DocType: Employee Loan Application,Total Payable Interest,ആകെ പലിശ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,പ്രിൻസിപ്പൽ തുക
+DocType: Loan Application,Total Payable Interest,ആകെ പലിശ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},മൊത്തം ശ്രദ്ധേയൻ: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,വിൽപ്പന ഇൻവോയ്സ് Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},പരാമർശം ഇല്ല &amp; റഫറൻസ് തീയതി {0} ആവശ്യമാണ്
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
 DocType: Restaurant Reservation,Restaurant Reservation,റെസ്റ്റോറന്റ് റിസർവേഷൻ
 DocType: Land Unit,Land Unit Name,ലാൻഡ് യൂണിറ്റ് നാമം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Proposal എഴുത്ത്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,പൊതിയുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ഇമെയിൽ വഴി ഉപഭോക്താക്കളെ അറിയിക്കുക
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ഇമെയിൽ വഴി ഉപഭോക്താക്കളെ അറിയിക്കുക
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,മറ്റൊരു സെയിൽസ് പേഴ്സൺ {0} ഒരേ ജീവനക്കാരന്റെ ഐഡി നിലവിലുണ്ട്
 DocType: Employee Advance,Claimed Amount,ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/education.py +180,Masters,മാസ്റ്റേഴ്സ്
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് സൃഷ്ടിച്ചിട്ടില്ല സ്വമേധയാ ഒരെണ്ണം സൃഷ്ടിക്കുക.
 DocType: Supplier Scorecard,Per Year,പ്രതിവർഷം
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ഈ പരിപാടിയിൽ ഡി.ഇ.ബി പ്രകാരം പ്രവേശനത്തിന് യോഗ്യതയില്ല
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Sales Invoice,Sales Taxes and Charges,സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള
 DocType: Employee,Organization Profile,ഓർഗനൈസേഷൻ പ്രൊഫൈൽ
 DocType: Vital Signs,Height (In Meter),ഉയരം (മീറ്റർ)
 DocType: Student,Sibling Details,സിബ്ലിംഗ് വിവരങ്ങൾ
 DocType: Vehicle Service,Vehicle Service,വാഹന സേവനം
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,യാന്ത്രികമായി നിബന്ധനകൾ അടിസ്ഥാനമാക്കി ഫീഡ്ബാക്ക് അഭ്യർത്ഥന സംഭവനീയമാക്കുന്നു.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,യാന്ത്രികമായി നിബന്ധനകൾ അടിസ്ഥാനമാക്കി ഫീഡ്ബാക്ക് അഭ്യർത്ഥന സംഭവനീയമാക്കുന്നു.
 DocType: Employee,Reason for Resignation,രാജി കാരണം
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,പ്രകടനം യമുനയുടെ വേണ്ടി ഫലകം.
 DocType: Sales Invoice,Credit Note Issued,ക്രെഡിറ്റ് കുറിപ്പ് നൽകിയത്
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,മെയിൻറനൻസ് ഷെഡ്യൂൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","അപ്പോൾ വിലനിർണ്ണയത്തിലേക്ക് കസ്റ്റമർ, കസ്റ്റമർ ഗ്രൂപ്പ്, ടെറിട്ടറി, വിതരണക്കാരൻ, വിതരണക്കാരൻ ടൈപ്പ്, കാമ്പയിൻ, തുടങ്ങിയവ സെയിൽസ് പങ്കാളി അടിസ്ഥാനമാക്കി ഔട്ട് ഫിൽറ്റർ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ജീവനക്കാരുടെ ലോൺ മാനേജ്മെന്റ്
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ഗുഅര്ദിഅന്൨ കൂടെ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,മാനേജർ
 DocType: Payment Entry,Payment From / To,/ To നിന്നുള്ള പേയ്മെന്റ്
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;അടിസ്ഥാനമാക്കി&#39; എന്നതും &#39;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,എന്നതിനായി പാത കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),തുറക്കുന്നു (ഡോ)
+DocType: Loan,Applicant,അപേക്ഷക
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},പോസ്റ്റിംഗ് സമയസ്റ്റാമ്പ് {0} ശേഷം ആയിരിക്കണം
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ആവർത്തന പ്രമാണങ്ങൾ ഉണ്ടാക്കാൻ
 ,GST Itemised Purchase Register,ചരക്കുസേവന ഇനമാക്കിയിട്ടുള്ള വാങ്ങൽ രജിസ്റ്റർ
 DocType: Course Scheduling Tool,Reschedule,പുനരാരംഭിക്കുക
-DocType: Employee Loan,Total Interest Payable,ആകെ തുകയും
+DocType: Loan,Total Interest Payable,ആകെ തുകയും
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ചെലവ് നികുതികളും ചുമത്തിയിട്ടുള്ള റജിസ്റ്റർ
 DocType: Work Order Operation,Actual Start Time,യഥാർത്ഥ ആരംഭിക്കേണ്ട സമയം
 DocType: BOM Operation,Operation Time,ഓപ്പറേഷൻ സമയം
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,തീര്ക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,അടിത്തറ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,അടിത്തറ
 DocType: Timesheet,Total Billed Hours,ആകെ ബില്ലുചെയ്യുന്നത് മണിക്കൂർ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
 DocType: Leave Block List Allow,Allow User,ഉപയോക്താവ് അനുവദിക്കുക
 DocType: Journal Entry,Bill No,ബിൽ ഇല്ല
 DocType: Company,Gain/Loss Account on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 DocType: Vehicle Log,Service Details,സേവന വിശദാംശങ്ങൾ
 DocType: Vehicle Log,Service Details,സേവന വിശദാംശങ്ങൾ
-DocType: Subscription,Quarterly,പാദവാർഷികം
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,അശ്രിറ്റ്ലിബ്
 DocType: Lab Test Template,Grouped,ഗ്രൂപ്പുചെയ്തു
 DocType: Selling Settings,Delivery Note Required,ഡെലിവറി നോട്ട് ആവശ്യമാണ്
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,സമയം ഷീറ്റ്
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush അസംസ്കൃത വസ്തുക്കൾ അടിസ്ഥാനത്തിൽ ഓൺ
 DocType: Sales Invoice,Port Code,പോർട്ട് കോഡ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,റിസർവ് വെയർഹൗസ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,റിസർവ് വെയർഹൗസ്
 DocType: Lead,Lead is an Organization,ലീഡ് ഒരു ഓർഗനൈസേഷനാണ്
 DocType: Guardian Interest,Interest,പലിശ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,പ്രീ സെയിൽസ്
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,അക്കൗണ്ടുകൾ
 DocType: Vehicle,Odometer Value (Last),ഓഡോമീറ്റർ മൂല്യം (അവസാനം)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,വിതരണക്കാരൻ സ്കോർകാർഡ് മാനദണ്ഡങ്ങളുടെ ഫലകങ്ങൾ.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,മാർക്കറ്റിംഗ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,മാർക്കറ്റിംഗ്
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
 DocType: Request for Quotation,Get Suppliers,വിതരണക്കാരെ നേടുക
 DocType: Purchase Receipt Item Supplied,Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക്
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,നിങ്ങളുടെ അംഗത്വം 30 ദിവസത്തിനുള്ളിൽ കാലഹരണപ്പെടുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് പുതുക്കാനാകൂ
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,നിങ്ങൾ ക്യാറ്റ് ഫ്ലോ മാപ്പർ രേഖകൾ ഉണ്ടെങ്കിൽ മാത്രം തിരഞ്ഞെടുക്കുക
 DocType: Email Digest,Next email will be sent on:,അടുത്തത് ഇമെയിൽ ന് അയയ്ക്കും:
 DocType: Supplier Scorecard,Per Week,ആഴ്ചയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ആകെ വിദ്യാർത്ഥി
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],ഫിചിയർ ഡെസ് ഇക്വിറ്ററീസ് കോംപ്ലബിൾസ് [FEC]
 DocType: Journal Entry,Credit Card Entry,ക്രെഡിറ്റ് കാർഡ് എൻട്രി
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,അക്കൗണ്ടുകൾ കമ്പനി ആൻഡ്
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,മൂല്യത്തിൽ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,മൂല്യത്തിൽ
 DocType: Asset Settings,Depreciation Options,ഡിപ്രീസിയേഷൻ ഓപ്ഷനുകൾ
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,പോസ്റ്റ് ചെയ്യുന്ന സമയം അസാധുവാണ്
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,പോസ്റ്റ് ചെയ്യുന്ന സമയം അസാധുവാണ്
 DocType: Lead,Campaign Name,കാമ്പെയ്ൻ പേര്
 DocType: Hotel Room,Capacity,ശേഷി
 DocType: Selling Settings,Close Opportunity After Days,ദിവസം കഴിഞ്ഞശേഷം അടയ്ക്കുക അവസരം
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ ഇല്ല
 DocType: Budget,Budget Against,ബജറ്റ് എതിരെ
 DocType: Employee,Cell Number,സെൽ നമ്പർ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,തന്നിരിക്കുന്ന മാനദണ്ഡത്തിൽ ജീവനക്കാർ ഇല്ല. ശമ്പള സ്ലിപ്പുകൾ ഇതിനകം സൃഷ്ടിച്ചിട്ടില്ല എന്നു പരിശോധിക്കുക.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,തന്നിരിക്കുന്ന മാനദണ്ഡത്തിൽ ജീവനക്കാർ ഇല്ല. ശമ്പള സ്ലിപ്പുകൾ ഇതിനകം സൃഷ്ടിച്ചിട്ടില്ല എന്നു പരിശോധിക്കുക.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,നഷ്ടപ്പെട്ട
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ദയവായി ഒരു പട്ടിക തിരഞ്ഞെടുക്കുക
 DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} എന്നത് &#39;സ്വീകർത്താക്കളുടെ&#39; അസാധുവായ ഇമെയിൽ വിലാസമാണ്
 DocType: Special Test Items,Particulars,വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 DocType: Student,A+,എ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില നിയമങ്ങൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് വൈരുദ്ധ്യം പരിഹരിക്കുക. വില നിയമങ്ങൾ: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Asset,Maintenance,മെയിൻറനൻസ്
+DocType: Subscriber,Subscriber,സബ്സ്ക്രൈബർ
 DocType: Item Attribute Value,Item Attribute Value,ഇനത്തിനും മൂല്യം
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,നിങ്ങളുടെ പ്രോജക്റ്റ് സ്റ്റാറ്റസ് ദയവായി അപ്ഡേറ്റ് ചെയ്യുക
 DocType: Item,Maximum sample quantity that can be retained,നിലനിർത്താൻ കഴിയുന്ന പരമാവധി സാമ്പിൾ അളവ്
@@ -1056,26 +1052,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,ടൈംലോട്ടുകൾ ചേർക്കുക
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ജേർണൽ എൻട്രി {0} വഴി തയ്യാർ അസറ്റ്
-DocType: Employee Loan,Interest Income Account,പലിശ വരുമാനം അക്കൗണ്ട്
+DocType: Loan,Interest Income Account,പലിശ വരുമാനം അക്കൗണ്ട്
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ക്ഷണം അയയ്ക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ബയോടെക്നോളജി
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ഓഫീസ് മെയിൻറനൻസ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ഓഫീസ് മെയിൻറനൻസ് ചെലവുകൾ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,പോകുക
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ഇമെയിൽ അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിന്
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,ആദ്യം ഇനം നൽകുക
 DocType: Asset Repair,Downtime,പ്രവർത്തനരഹിതമായി
 DocType: Account,Liability,ബാധ്യത
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,അക്കാദമിക് ടേം:
 DocType: Salary Detail,Do not include in total,മൊത്തം ഉൾപ്പെടുത്തരുത്
 DocType: Company,Default Cost of Goods Sold Account,ഗുഡ്സ് സ്വതവേയുള്ള ചെലവ് അക്കൗണ്ട് വിറ്റു
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},സാമ്പിൾ അളവ് {0} ലഭിച്ച തുകയേക്കാൾ കൂടുതൽ ആകരുത് {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Request for Quotation Supplier,Send Email,ഇമെയിൽ അയയ്ക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
 DocType: Item,Max Sample Quantity,പരമാവധി സാമ്പിൾ അളവ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,ഇല്ല അനുമതി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,ഇല്ല അനുമതി
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,ക്വാട്ട് അഭ്യർത്ഥിച്ചു
 DocType: Vital Signs,Heart Rate / Pulse,ഹാർട്ട് റേറ്റ് / പൾസ്
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
@@ -1086,12 +1082,11 @@
 DocType: Item,Items with higher weightage will be shown higher,ചിത്രം വെയ്റ്റേജ് ഇനങ്ങൾ ചിത്രം കാണിക്കും
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ലാബ് ടെസ്റ്റുകളും സുപ്രധാന സൂചനകളും
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ബാങ്ക് അനുരഞ്ജനം വിശദാംശം
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
-DocType: Subscription,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,പ്രോജക്റ്റ് അപ്ഡേറ്റ്.
 DocType: SMS Center,All Customer Contact,എല്ലാ കസ്റ്റമർ കോൺടാക്റ്റ്
 DocType: Land Unit,Tree Details,ട്രീ വിശദാംശങ്ങൾ
@@ -1141,7 +1136,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
 DocType: Work Order,Item To Manufacture,നിർമ്മിക്കാനുള്ള ഇനം
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,കോംപ്ടീലിബ്
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} നില {2} ആണ്
@@ -1155,7 +1149,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","തിരഞ്ഞെടുത്തതിനുശേഷം തിരഞ്ഞെടുത്ത വിലാസം എഡിറ്റുചെയ്തിട്ടുണ്ടെങ്കിൽ, തിരഞ്ഞെടുപ്പ് മാറ്റുക"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Item,Hub Publishing Details,ഹബ് പബ്ലിഷിംഗ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;തുറക്കുന്നു&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;തുറക്കുന്നു&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
 DocType: Lab Test Template,Result Format,ഫല ഫോർമാറ്റ്
@@ -1165,7 +1159,7 @@
 DocType: Payroll Entry,Bimonthly,രണ്ടുമാസത്തിലൊരിക്കൽ
 DocType: Vehicle Service,Brake Pad,ബ്രേക്ക് പാഡ്
 DocType: Fertilizer,Fertilizer Contents,രാസവസ്തുക്കൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ഗവേഷണവും വികസനവും
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ഗവേഷണവും വികസനവും
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ബിൽ തുക
 DocType: Company,Registration Details,രജിസ്ട്രേഷൻ വിവരങ്ങൾ
 DocType: Timesheet,Total Billed Amount,ആകെ ബില്ലുചെയ്യുന്നത് തുക
@@ -1179,7 +1173,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,സെസ്സർ ഓർഡറിൽ ബൈപാസ് ക്രെഡിറ്റ് ലിമിറ്റ് ചെക്ക്
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,പ്രകടനം വിലയിരുത്തൽ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ആയി ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കി, &#39;ഷോപ്പിംഗ് കാർട്ട് ഉപയോഗിക്കുക&#39; പ്രാപ്തമാക്കുന്നത് എന്നും ഷോപ്പിംഗ് കാർട്ട് കുറഞ്ഞത് ഒരു നികുതി റൂൾ വേണം"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ഈ ഇൻവോയ്സ് ലെ പുരോഗതി എന്ന കടിച്ചുകീറി വേണം എങ്കിൽ പേയ്മെന്റ് എൻട്രി {0} ഓർഡർ {1} ബന്ധപ്പെടുത്തിയിരിക്കുന്നു, പരിശോധിക്കുക."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ഈ ഇൻവോയ്സ് ലെ പുരോഗതി എന്ന കടിച്ചുകീറി വേണം എങ്കിൽ പേയ്മെന്റ് എൻട്രി {0} ഓർഡർ {1} ബന്ധപ്പെടുത്തിയിരിക്കുന്നു, പരിശോധിക്കുക."
 DocType: Sales Invoice Item,Stock Details,സ്റ്റോക്ക് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,പ്രോജക്ട് മൂല്യം
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക്
@@ -1213,7 +1207,7 @@
 DocType: Restaurant Table,Minimum Seating,കുറഞ്ഞ സീറ്റിംഗ്
 DocType: Item Attribute,Item Attribute Values,ഇനം ഗുണ മൂല്യങ്ങൾ
 DocType: Examination Result,Examination Result,പരീക്ഷാ ഫലം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,വാങ്ങൽ രസീത്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,വാങ്ങൽ രസീത്
 ,Received Items To Be Billed,ബില്ല് ലഭിച്ച ഇനങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,നാണയ വിനിമയ നിരക്ക് മാസ്റ്റർ.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},പരാമർശം Doctype {0} ഒന്ന് ആയിരിക്കണം
@@ -1221,15 +1215,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Work Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ട്രാൻസ്ഫർ ചെയ്യാനായി ഇനങ്ങളൊന്നും ലഭ്യമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ട്രാൻസ്ഫർ ചെയ്യാനായി ഇനങ്ങളൊന്നും ലഭ്യമല്ല
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),അടച്ചു (മൊത്തം + എണ്ണം തുറക്കൽ)
 DocType: Journal Entry,Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 സ്റ്റാൻഡേർഡ്
 DocType: Pricing Rule,Rate or Discount,നിരക്ക് അല്ലെങ്കിൽ കിഴിവ്
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},സീരിയൽ ഇല്ല {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},സീരിയൽ ഇല്ല {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Purchase Receipt Item Supplied,Required Qty,ആവശ്യമായ Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,പ്രിയപ്പെട്ടവ
 DocType: Hub Settings,Custom Data,ഇഷ്ടാനുസൃത ഡാറ്റ
@@ -1241,9 +1235,9 @@
 DocType: Medical Code,Medical Code Standard,മെഡിക്കൽ കോഡ് സ്റ്റാൻഡേർഡ്
 DocType: Soil Texture,Clay Composition (%),ക്ലേ കോമ്പോസിഷൻ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,ചുമതല നിർവ്വഹിക്കുന്നതിന് മുമ്പ് ദയവായി സംരക്ഷിക്കുക.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ബാലൻസ് മൂല്യം
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ബാലൻസ് മൂല്യം
 DocType: Lab Test,Lab Technician,ലാബ് ടെക്നീഷ്യൻ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,സെയിൽസ് വില പട്ടിക
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,സെയിൽസ് വില പട്ടിക
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","പരിശോധിച്ചാൽ, ഒരു ഉപഭോക്താവ് സൃഷ്ടിക്കും, രോഗിക്ക് മാപ്പ് നൽകും. ഈ കസ്റ്റമർക്കെതിരെ രോഗി ഇൻവോയ്സുകൾ സൃഷ്ടിക്കും. രോഗിയെ സൃഷ്ടിക്കുന്ന സമയത്ത് നിങ്ങൾക്ക് നിലവിലുള്ള കസ്റ്റമർ തിരഞ്ഞെടുക്കാം."
 DocType: Bank Reconciliation,Account Currency,അക്കൗണ്ട് കറന്സി
@@ -1251,16 +1245,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,കമ്പനിയിൽ അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട് സൂചിപ്പിക്കുക
 DocType: Purchase Receipt,Range,ശ്രേണി
 DocType: Supplier,Default Payable Accounts,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട തുക
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
 DocType: Item Barcode,Item Barcode,ഇനം ബാർകോഡ്
 DocType: Woocommerce Settings,Endpoints,എൻഡ്പോയിന്റുകൾ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","സൃഷ്ടിക്കാൻ. കാലതാമസം നേരിട്ടെങ്കിൽ, നിങ്ങൾക്ക് ഈ മാസം തന്നെ &quot;മാസത്തിലുടനീളം ആവർത്തിക്കുക&quot; എന്ന രീതിയിൽ മാറ്റം വരുത്തണം"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
 DocType: Share Transfer,From Folio No,ഫോളിയോ നമ്പറിൽ നിന്ന്
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
@@ -1295,16 +1287,17 @@
 DocType: Asset,Available-for-use Date,ലഭ്യമായ ഉപയോഗത്തിനായുള്ള തീയതി
 DocType: Guardian,Guardian Name,ഗാർഡിയൻ പേര്
 DocType: Cheque Print Template,Has Print Format,ഉണ്ട് പ്രിന്റ് ഫോർമാറ്റ്
-DocType: Employee Loan,Sanctioned,അനുവദിച്ചു
+DocType: Loan,Sanctioned,അനുവദിച്ചു
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോഡ് സൃഷ്ടിച്ചു ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
 DocType: Crop Cycle,Crop Cycle,ക്രോപ്പ് സൈക്കിൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനങ്ങൾ, വെയർഹൗസ്, സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച് യാതൊരു &#39;പായ്ക്കിംഗ് ലിസ്റ്റ് മേശയിൽ നിന്നും പരിഗണിക്കും. സംഭരണശാല ആൻഡ് ബാച്ച് ഇല്ല ഏതെങ്കിലും &#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനത്തിനായി എല്ലാ പാക്കിംഗ് ഇനങ്ങളും ഒരേ എങ്കിൽ, ആ മൂല്യങ്ങൾ പ്രധാന ഇനം പട്ടികയിൽ നേടിയെടുക്കുകയും ചെയ്യാം, മൂല്യങ്ങൾ &#39;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനങ്ങൾ, വെയർഹൗസ്, സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച് യാതൊരു &#39;പായ്ക്കിംഗ് ലിസ്റ്റ് മേശയിൽ നിന്നും പരിഗണിക്കും. സംഭരണശാല ആൻഡ് ബാച്ച് ഇല്ല ഏതെങ്കിലും &#39;ഉൽപ്പന്ന ബണ്ടിൽ&#39; ഇനത്തിനായി എല്ലാ പാക്കിംഗ് ഇനങ്ങളും ഒരേ എങ്കിൽ, ആ മൂല്യങ്ങൾ പ്രധാന ഇനം പട്ടികയിൽ നേടിയെടുക്കുകയും ചെയ്യാം, മൂല്യങ്ങൾ &#39;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
 DocType: Student Admission,Publish on website,വെബ്സൈറ്റിൽ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതി തീയതി നോട്സ് ശ്രേഷ്ഠ പാടില്ല
+DocType: Subscription,Cancelation Date,റദ്ദാക്കൽ തീയതി
 DocType: Purchase Invoice Item,Purchase Order Item,വാങ്ങൽ ഓർഡർ ഇനം
 DocType: Agriculture Task,Agriculture Task,കൃഷിവകുപ്പ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,പരോക്ഷ ആദായ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,പരോക്ഷ ആദായ
 DocType: Student Attendance Tool,Student Attendance Tool,വിദ്യാർത്ഥിയുടെ ഹാജർ ടൂൾ
 DocType: Restaurant Menu,Price List (Auto created),വിലവിവരങ്ങൾ (സ്വയമേവ സൃഷ്ടിച്ചത്)
 DocType: Cheque Print Template,Date Settings,തീയതി ക്രമീകരണങ്ങൾ
@@ -1331,6 +1324,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,മീറ്റർ
 DocType: Workstation,Electricity Cost,വൈദ്യുതി ചെലവ്
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ലാബ് പരിശോധന സമയ ഡാറ്റ സമയം ശേഖരിക്കപ്പെടുന്നതിന് മുമ്പായിരിക്കരുത്
+DocType: Subscription Plan,Cost,ചെലവ്
 DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലോയീസ് ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ അയയ്ക്കരുത്
 DocType: Expense Claim,Total Advance Amount,ആകെ അഡ്വാൻസ് തുക
 DocType: Delivery Stop,Estimated Arrival,എത്തിച്ചേരുന്നതിനുള്ള ഏകദേശ സമയം
@@ -1342,15 +1336,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
 DocType: Timesheet Detail,Bill,ബില്
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,വൈറ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,വൈറ്റ്
 DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: അളവ് ({2} {3}) വെയർഹൗസിൽ ലെ {4} ലഭ്യമല്ല {1} ചേരുന്ന സമയത്ത് പോസ്റ്റുചെയ്യുന്നതിൽ
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,ചെക്ക് ബോക്സുകളുടെ പട്ടികയിൽ നിന്ന് പരമാവധി ഓപ്ഷൻ മാത്രമേ നിങ്ങൾക്ക് തിരഞ്ഞെടുക്കാനാവൂ.
 DocType: Purchase Invoice,Get Advances Paid,അഡ്വാൻസുകളും പണം ലഭിക്കുന്നത്
 DocType: Item,Automatically Create New Batch,പുതിയ ബാച്ച് യാന്ത്രികമായി സൃഷ്ടിക്കുക
 DocType: Item,Automatically Create New Batch,പുതിയ ബാച്ച് യാന്ത്രികമായി സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} {1} (വരി {2}) ലേക്ക് നിയുക്തമാക്കുന്നു
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} {1} (വരി {2}) ലേക്ക് നിയുക്തമാക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,നിർമ്മിക്കുക
 DocType: Student Admission,Admission Start Date,അഡ്മിഷൻ ആരംഭ തീയതി
 DocType: Journal Entry,Total Amount in Words,വാക്കുകൾ മൊത്തം തുക
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,പുതിയ ജീവനക്കാരൻ
@@ -1366,7 +1360,7 @@
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
 DocType: Repayment Schedule,Balance Loan Amount,ബാലൻസ് വായ്പാ തുക
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ഷെഡ്യൂൾ കോഴ്സ്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,വാങ്ങൽ ക്രമത്തിൽ അവസാനം വാങ്ങൽ വിശദാംശങ്ങൾ ലഭ്യമാക്കുന്നത് അപ്രാപ്തമാക്കുക
 DocType: Journal Entry Account,Expense Claim,ചിലവേറിയ ക്ലെയിം
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
@@ -1385,11 +1379,12 @@
 DocType: Packing Slip Item,Packing Slip Item,പാക്കിംഗ് ജി ഇനം
 DocType: Purchase Invoice,Cash/Bank Account,ക്യാഷ് / ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ദയവായി ഒരു {0} വ്യക്തമാക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,വേരിയന്റ് ക്രിയ ക്യൂവിലാണ്.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} എന്നതിനുള്ള ഔദ്യോഗിക സംഗ്രഹം
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ലിസ്റ്റിലെ ആദ്യ അവധി അംഗീകരിക്കൽ സ്ഥിര ലീഡ് അപ്പെൻറോവർ ആയി സജ്ജമാക്കും.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Plan,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Training Event,Self-Study,സ്വയം പഠനം
@@ -1402,7 +1397,7 @@
 DocType: Workstation,Wages,വേതനം
 DocType: Asset Maintenance,Maintenance Manager Name,മെയിന്റനൻസ് മാനേജർ നാമം
 DocType: Agriculture Task,Urgent,തിടുക്കപ്പെട്ടതായ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},{1} പട്ടികയിലെ വരി {0} ഒരു സാധുതയുള്ള വരി ID വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},{1} പട്ടികയിലെ വരി {0} ഒരു സാധുതയുള്ള വരി ID വ്യക്തമാക്കുക
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,വേരിയബിനെ കണ്ടെത്താനായില്ല:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,നോർമപ്പിൽ നിന്ന് എഡിറ്റുചെയ്യാൻ ദയവായി ഒരു ഫീൽഡ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,സ്റ്റോക്ക് ലെഡ്ജർ ഉണ്ടാക്കിയത് പോലെ ഒരു നിശ്ചിത അസറ്റ് ഇനം ആകരുത്.
@@ -1414,7 +1409,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,നിലവാര പരിശോധന ടെംപ്ലേറ്റ് നാമം
 DocType: Project,First Email,ആദ്യ ഇമെയിൽ
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,സെയിൽസ് ഓർഡർ / പൂർത്തിയായ ഗുഡ്സ് സംഭരണശാല കരുതിവച്ചിരിക്കുന്ന വെയർഹൗസ്
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,തുക വിൽക്കുന്ന
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,തുക വിൽക്കുന്ന
 DocType: Repayment Schedule,Interest Amount,പലിശ തുക
 DocType: Serial No,Creation Document No,ക്രിയേഷൻ ഡോക്യുമെന്റ് ഇല്ല
 DocType: Share Transfer,Issue,ഇഷ്യൂ
@@ -1428,10 +1423,10 @@
 DocType: Tax Rule,Shipping State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
 ,Projected Quantity as Source,ഉറവിടം പ്രൊജക്റ്റുചെയ്തു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ഡെലിവറി ട്രിപ്പ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ഡെലിവറി ട്രിപ്പ്
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ട്രാൻസ്ഫർ തരം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,സെയിൽസ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,സെയിൽസ് ചെലവുകൾ
 DocType: Consultation,Diagnosis,രോഗനിർണ്ണയം
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
@@ -1440,12 +1435,13 @@
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,സിപ്പ് കോഡ്
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},വായ്പയിൽ പലിശ വരുമാനം അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക {0}
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
 DocType: Packing Slip,Net Weight UOM,മൊത്തം ഭാരം UOM
 DocType: Item,Default Supplier,സ്ഥിരസ്ഥിതി വിതരണക്കാരൻ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,പ്രൊഡക്ഷൻ അലവൻസ് ശതമാനം ഓവര്
-DocType: Employee Loan,Repayment Schedule,തിരിച്ചടവ് ഷെഡ്യൂൾ
+DocType: Loan,Repayment Schedule,തിരിച്ചടവ് ഷെഡ്യൂൾ
 DocType: Shipping Rule Condition,Shipping Rule Condition,ഷിപ്പിംഗ് റൂൾ കണ്ടീഷൻ
 DocType: Holiday List,Get Weekly Off Dates,വീക്കിലി ഓഫാക്കുക നേടുക തീയതി
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,അവസാനിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതി കുറവായിരിക്കണം കഴിയില്ല
@@ -1460,7 +1456,7 @@
 DocType: Education Settings,Attendance Freeze Date,ഹാജർ ഫ്രീസ് തീയതി
 DocType: Education Settings,Attendance Freeze Date,ഹാജർ ഫ്രീസ് തീയതി
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,"നിങ്ങളുടെ വിതരണക്കാരും ഏതാനും കാണിയ്ക്കുക. അവർ സംഘടനകൾ, വ്യക്തികളുടെ ആകാം."
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,എല്ലാ ഉത്പന്നങ്ങളും കാണുക
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,എല്ലാ ഉത്പന്നങ്ങളും കാണുക
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),മിനിമം ലീഡ് പ്രായം (ദിവസം)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),മിനിമം ലീഡ് പ്രായം (ദിവസം)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,എല്ലാ BOMs
@@ -1469,14 +1465,16 @@
 DocType: Expense Claim,From Employee,ജീവനക്കാരുടെ നിന്നും
 DocType: Driver,Cellphone Number,സെൽഫോൺ നമ്പർ
 DocType: Project,Monitor Progress,മോണിറ്റർ പുരോഗതി
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
 DocType: Journal Entry,Make Difference Entry,വ്യത്യാസം എൻട്രി നിർമ്മിക്കുക
+DocType: Supplier Quotation,Auto Repeat Section,സ്വയം ആവർത്തിക്കുക വിഭാഗം
 DocType: Upload Attendance,Attendance From Date,ഈ തീയതി മുതൽ ഹാജർ
 DocType: Appraisal Template Goal,Key Performance Area,കീ പ്രകടനം ഏരിയ
 DocType: Program Enrollment,Transportation,ഗതാഗതം
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,അസാധുവായ ആട്രിബ്യൂട്ട്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ക്വാണ്ടിറ്റി കുറവോ {0} തുല്യമായിരിക്കണം
+DocType: Department Approver,Department Approver,ഡിപ്പാർട്ട്മെന്റ്അപ്രോവർ
 DocType: SMS Center,Total Characters,ആകെ പ്രതീകങ്ങൾ
 DocType: Employee Advance,Claimed,ക്ലെയിം ചെയ്തു
 DocType: Crop,Row Spacing,വരി വിടവ്
@@ -1486,6 +1484,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,പേയ്മെന്റ് അനുരഞ്ജനം ഇൻവോയിസ്
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,സംഭാവന%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","ഓർഡർ ആവശ്യമുണ്ട് വാങ്ങൽ == &#39;അതെ&#39;, പിന്നീട് വാങ്ങൽ ഇൻവോയ്സ് സൃഷ്ടിക്കാൻ, ഉപയോക്തൃ ഇനം {0} ആദ്യം പർച്ചേസ് ഓർഡർ സൃഷ്ടിക്കാൻ ആവശ്യമെങ്കിൽ വാങ്ങൽ ക്രമീകരണങ്ങൾ പ്രകാരം"
+,HSN-wise-summary of outward supplies,എച്ച്എസ്എൻ തിരിച്ചുള്ള - ബാഹ്യ വിതരണങ്ങളുടെ സംഗ്രഹം
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,നിങ്ങളുടെ റഫറൻസിനായി കമ്പനി രജിസ്ട്രേഷൻ നമ്പറുകൾ. നികുതി നമ്പറുകൾ തുടങ്ങിയവ
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
@@ -1499,7 +1498,7 @@
 DocType: Setup Progress Action,Action Name,പ്രവർത്തന നാമം
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ആരംഭ വർഷം
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},ഗ്സ്തിന് ആദ്യ 2 അക്കങ്ങൾ സംസ്ഥാന നമ്പർ {0} പൊരുത്തപ്പെടുന്നില്ല വേണം
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലഘട്ടത്തിലെ തീയതി ആരംഭിക്കുക
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
@@ -1517,26 +1516,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,സൃഷ്ടിയുടെ സമയത്ത് മാത്രമേ ഫീൽഡുകൾ പകർത്തൂ.
 DocType: Setup Progress Action,Domains,മണ്ഡലങ്ങൾ
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,മാനേജ്മെന്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,മാനേജ്മെന്റ്
 DocType: Cheque Print Template,Payer Settings,പണത്തിന് ക്രമീകരണങ്ങൾ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ഈ വകഭേദം എന്ന ഇനം കോഡ് ചേർക്കപ്പെടുകയും ചെയ്യും. നിങ്ങളുടെ ചുരുക്കെഴുത്ത് &quot;എസ് എം &#39;എന്താണ്, ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട് &#39;ഉദാഹരണത്തിന്, വകഭേദം എന്ന ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട്-എസ് എം&quot; ആയിരിക്കും"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,നിങ്ങൾ ശമ്പളം ജി ലാഭിക്കാൻ ഒരിക്കൽ (വാക്കുകളിൽ) നെറ്റ് വേതനം ദൃശ്യമാകും.
 DocType: Purchase Invoice,Is Return,മടക്കം
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ജാഗ്രത
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',ടേബിളിൽ &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
 DocType: Price List Country,Price List Country,വില പട്ടിക രാജ്യം
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ഇനം കോഡ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,ഇനം കോഡ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM പരിവർത്തന ഫാക്ടർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ബാച്ച് നമ്പർ ലഭിക്കാൻ ദയവായി ഇനം കോഡ് നൽകുക
 DocType: Stock Settings,Default Item Group,സ്ഥിരസ്ഥിതി ഇനം ഗ്രൂപ്പ്
-DocType: Employee Loan,Partially Disbursed,ഭാഗികമായി വിതരണം
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,വിവരങ്ങൾ നൽകുക.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,വിവരങ്ങൾ നൽകുക.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,നിങ്ങൾക്ക് റദ്ദാക്കാത്ത ഒരു സബ്സ്ക്രിപ്ഷൻ പുനഃരാരംഭിക്കാൻ കഴിയില്ല.
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
 DocType: Fee Validity,Valid Till,സാധുവാണ്
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,ആകെ രക്ഷിതാക്കൾ ഗുരുദർശന യോഗം
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
@@ -1549,7 +1548,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,വരി # {0}: നിരസിച്ചു Qty വാങ്ങൽ പകരമായി പ്രവേശിക്കുവാൻ പാടില്ല
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,തിരഞ്ഞെടുത്ത കസ്റ്റമർക്കായി ഉപഭോക്തൃ ഗ്രൂപ്പ് മാറ്റുന്നത് അനുവദനീയമല്ല.
 ,Purchase Order Items To Be Billed,ബില്ല് ക്രമത്തിൽ ഇനങ്ങൾ വാങ്ങുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,കണക്കാക്കിയ സമയം അപ്ഡേറ്റ് ചെയ്യുന്നു.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,കണക്കാക്കിയ സമയം അപ്ഡേറ്റ് ചെയ്യുന്നു.
 DocType: Program Enrollment Tool,Enrollment Details,എൻറോൾമെൻറ് വിശദാംശങ്ങൾ
 DocType: Purchase Invoice Item,Net Rate,നെറ്റ് റേറ്റ്
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ഒരു ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുക
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,നടപ്പ് സാമ്പത്തിക വർഷം
 DocType: Purchase Order,Group same items,ഗ്രൂപ്പ് അതേ ഇനങ്ങൾ
 DocType: Purchase Invoice,Disable Rounded Total,വൃത്തത്തിലുള്ള ആകെ അപ്രാപ്തമാക്കുക
-DocType: Employee Loan Application,Repayment Info,തിരിച്ചടവ് വിവരങ്ങളും
+DocType: Department,Parent Department,പാരന്റ് ഡിപ്പാർട്ട്മെൻറ്
+DocType: Loan Application,Repayment Info,തിരിച്ചടവ് വിവരങ്ങളും
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
 DocType: Maintenance Team Member,Maintenance Role,മെയിൻറനൻസ് റോൾ
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
 ,Trial Balance,ട്രയൽ ബാലൻസ്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,ഹോട്ടൽ റിസർവേഷൻ ഉപയോക്താവ്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,റിസർച്ച്
+DocType: Subscription Settings,Subscription Settings,സബ്സ്ക്രിപ്ഷൻ ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,റിസർച്ച്
 DocType: Maintenance Visit Purpose,Work Done,വർക്ക് ചെയ്തുകഴിഞ്ഞു
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,വിശേഷണങ്ങൾ പട്ടികയിൽ കുറഞ്ഞത് ഒരു ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Announcement,All Students,എല്ലാ വിദ്യാർത്ഥികൾക്കും
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 DocType: Crop Cycle,Less than a year,ഒരു വർഷത്തിൽ താഴെ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,വിദ്യാർത്ഥി മൊബൈൽ നമ്പർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ലോകം റെസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
 DocType: Crop,Yield UOM,യീൽഡ് UOM
 ,Budget Variance Report,ബജറ്റ് പൊരുത്തമില്ലായ്മ റിപ്പോർട്ട്
 DocType: Salary Slip,Gross Pay,മൊത്തം വേതനം
 DocType: Item,Is Item from Hub,ഇനം ഹബ് ആണ്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,വരി {0}: പ്രവർത്തന തരം നിർബന്ധമാണ്.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,പണമടച്ചു ഡിവിഡന്റ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,പണമടച്ചു ഡിവിഡന്റ്
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ലെഡ്ജർ എണ്ണുകയും
 DocType: Stock Reconciliation,Difference Amount,വ്യത്യാസം തുക
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{0} {1} ന് പുറപ്പെടൽ
 DocType: Purchase Invoice,Reverse Charge,തിരികെ ഇടാക്കുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,നീക്കിയിരുപ്പ് സമ്പാദ്യം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,നീക്കിയിരുപ്പ് സമ്പാദ്യം
 DocType: Purchase Invoice,05-Change in POS,05-POS- ൽ മാറ്റം വരുത്തുക
 DocType: Vehicle Log,Service Detail,സേവന വിശദാംശങ്ങൾ
 DocType: BOM,Item Description,ഇനത്തെ കുറിച്ചുള്ള വിശദീകരണം
@@ -1618,12 +1619,12 @@
 DocType: Opportunity Item,Opportunity Item,ഓപ്പർച്യൂനിറ്റി ഇനം
 ,Student and Guardian Contact Details,സ്റ്റുഡന്റ് മേൽനോട്ടം ബന്ധപ്പെടാനുള്ള വിവരങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,വരി {0}: വിതരണക്കാരൻ വേണ്ടി {0} ഇമെയിൽ വിലാസം ഇമെയിൽ അയയ്ക്കാൻ ആവശ്യമാണ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,താൽക്കാലിക തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,താൽക്കാലിക തുറക്കുന്നു
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ഹബ് കാണുക
 ,Employee Leave Balance,ജീവനക്കാരുടെ അവധി ബാലൻസ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
 DocType: Patient Appointment,More Info,കൂടുതൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},മൂലധനം നിരക്ക് വരി {0} ൽ ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},മൂലധനം നിരക്ക് വരി {0} ൽ ഇനം ആവശ്യമാണ്
 DocType: Supplier Scorecard,Scorecard Actions,സ്കോർകാർഡ് പ്രവർത്തനങ്ങൾ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ഉദാഹരണം: കമ്പ്യൂട്ടർ സയൻസ് മാസ്റ്റേഴ്സ്
 DocType: Purchase Invoice,Rejected Warehouse,നിരസിച്ചു വെയർഹൗസ്
@@ -1633,7 +1634,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,വരെ
 DocType: Supplier Quotation Item,Lead Time in days,ദിവസങ്ങളിൽ സമയം Lead
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,അക്കൗണ്ടുകൾ അടയ്ക്കേണ്ട ചുരുക്കം
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},ലേക്ക് {1} {0} നിന്ന് ശമ്പളം പേയ്മെന്റ്
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},ലേക്ക് {1} {0} നിന്ന് ശമ്പളം പേയ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 DocType: Journal Entry,Get Outstanding Invoices,മികച്ച ഇൻവോയിസുകൾ നേടുക
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
@@ -1642,9 +1643,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ലാബ് ടെസ്റ്റ് കുറിപ്പുകൾ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,ചെറുകിട
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,ചെറുകിട
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ഇൻവോയ്സ് ക്രിയേഷൻ ടൂൾ ഇനം തുറക്കുന്നു
 DocType: Education Settings,Employee Number,ജീവനക്കാരുടെ നമ്പർ
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ഗ്രേസ് കാലയളവിന് ശേഷം ഇൻവോയ്സ് റദ്ദാക്കുക
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},നേരത്തെ ഉപയോഗത്തിലുണ്ട് കേസ് ഇല്ല (കൾ). കേസ് ഇല്ല {0} മുതൽ ശ്രമിക്കുക
 DocType: Project,% Completed,% പൂർത്തിയാക്കിയത്
 ,Invoiced Amount (Exculsive Tax),Invoiced തുക (Exculsive നികുതി)
@@ -1658,7 +1660,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ലാബറട്ടറി ടെസ്റ്റിംഗ് ഡേറ്റാ ടൈം
 DocType: Email Digest,Add Quote,ഉദ്ധരണി ചേർക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
 DocType: Agriculture Analysis Criteria,Agriculture,കൃഷി
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
@@ -1688,16 +1690,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,ആദ്യം ഇനം കോഡ് സജ്ജീകരിക്കുക
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
+DocType: Subscription Plan,Billing Interval Count,ബില്ലിംഗ് ഇന്റർവൽ കൗണ്ട്
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
 DocType: Antibiotic,Antibiotic,ആൻറിബയോട്ടിക്
 ,Team Updates,ടീം അപ്ഡേറ്റുകൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,വിതരണക്കാരൻ വേണ്ടി
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,അക്കൗണ്ട് തരം സജ്ജീകരിക്കുന്നു ഇടപാടുകൾ ഈ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുന്നതിൽ സഹായിക്കുന്നു.
 DocType: Purchase Invoice,Grand Total (Company Currency),ആകെ മൊത്തം (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,പ്രിന്റ് ഫോർമാറ്റ് സൃഷ്ടിക്കുക
@@ -1723,7 +1726,7 @@
 DocType: POS Item Group,POS Item Group,POS ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ഡൈജസ്റ്റ് ഇമെയിൽ:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ഇതര ഇനം ഇനം കോഡായിരിക്കാൻ പാടില്ല
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Sales Partner,Target Distribution,ടാർജറ്റ് വിതരണം
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-താൽക്കാലിക മൂല്യനിർണ്ണയത്തിനുള്ള അന്തിമരൂപം
 DocType: Salary Slip,Bank Account No.,ബാങ്ക് അക്കൗണ്ട് നമ്പർ
@@ -1740,7 +1743,7 @@
 DocType: BOM Operation,Workstation,വറ്ക്ക്സ്റ്റേഷൻ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ക്വട്ടേഷൻ വിതരണക്കാരൻ അഭ്യർത്ഥന
 DocType: Healthcare Settings,Registration Message,രജിസ്ട്രേഷൻ സന്ദേശം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ഹാര്ഡ്വെയര്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ഹാര്ഡ്വെയര്
 DocType: Prescription Dosage,Prescription Dosage,കുറിപ്പടി ഡോസേജ്
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
@@ -1771,7 +1774,7 @@
 DocType: Project,Start and End Dates,"ആരംഭ, അവസാന തീയതി"
 ,Delivered Items To Be Billed,ബില്ല് രക്ഷപ്പെട്ടിരിക്കുന്നു ഇനങ്ങൾ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},തുറക്കുക BOM ലേക്ക് {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,വെയർഹൗസ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,വെയർഹൗസ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
 DocType: Authorization Rule,Average Discount,ശരാശരി ഡിസ്ക്കൌണ്ട്
 DocType: Project Update,Great/Quickly,മഹത്തായ / ദ്രുതഗതിയിൽ
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1780,8 +1783,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,ബാച്ചുചെയ്ത ഇനം വേണ്ടി ബാച്ചുകൾ തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedules,മൂല്യത്തകർച്ച സമയക്രമം
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST ക്രമീകരണങ്ങളിൽ ഇനിപ്പറയുന്ന അക്കൌണ്ടുകൾ തിരഞ്ഞെടുക്കാം:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST ക്രമീകരണങ്ങളിൽ ഇനിപ്പറയുന്ന അക്കൌണ്ടുകൾ തിരഞ്ഞെടുക്കാം:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
 DocType: Activity Cost,Projects,പ്രോജക്റ്റുകൾ
 DocType: Payment Request,Transaction Currency,ഇടപാട് കറൻസി
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},{0} നിന്ന് | {1} {2}
@@ -1792,6 +1795,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,പേർക്കുള്ള ഡെയ്ലി അയയ്ക്കുന്ന
 DocType: POS Profile,Campaign,കാമ്പെയ്ൻ
 DocType: Supplier,Name and Type,പേര് ടൈപ്പ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',അംഗീകാരം സ്റ്റാറ്റസ് &#39;അംഗീകരിച്ചു&#39; അല്ലെങ്കിൽ &#39;നിഷേധിക്കപ്പെട്ടിട്ടുണ്ട്&#39; വേണം
 DocType: Physician,Contacts and Address,കോൺടാക്റ്റുകളും വിലാസവും
 DocType: Purchase Invoice,Contact Person,സമ്പർക്ക വ്യക്തി
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;പ്രതീക്ഷിച്ച ആരംഭ തീയതി&#39; &#39;പ്രതീക്ഷിച്ച അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
@@ -1805,19 +1809,20 @@
 DocType: Student Admission,Eligibility and Details,യോഗ്യതയും വിശദാംശങ്ങളും
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},പരമാവധി: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,തീയതി-ൽ
 DocType: Email Digest,For Company,കമ്പനിക്ക് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +17,Communication log.,കമ്മ്യൂണിക്കേഷൻ രേഖ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","ക്വട്ടേഷൻ അഭ്യർത്ഥന കൂടുതൽ ചെക്ക് പോർട്ടൽ ക്രമീകരണങ്ങൾക്കായി, പോർട്ടലിൽ നിന്നും ആക്സസ് അപ്രാപ്തമാക്കി."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,വിതരണക്കാരൻ സ്കോർബോർഡ് സ്കോർ വേരിയബിൾ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,വാങ്ങൽ തുക
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,വാങ്ങൽ തുക
 DocType: Sales Invoice,Shipping Address Name,ഷിപ്പിംഗ് വിലാസം പേര്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ പിശകുകൾ ഉണ്ടായിരുന്നു
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,"ലിസ്റ്റിലെ ആദ്യ ചെലവ് അംഗീകൃതമായത്, സാധാരണ ചിലവ് അപ്പാരവർ ആയി സജ്ജമാക്കിയിരിക്കും."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1838,14 +1843,15 @@
 DocType: Package Code,Package Code,പാക്കേജ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,വിദേശികൾക്ക്
 DocType: Purchase Invoice,Company GSTIN,കമ്പനി ഗ്സ്തിന്
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,നെഗറ്റീവ് ക്വാണ്ടിറ്റി അനുവദനീയമല്ല
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,നെഗറ്റീവ് ക്വാണ്ടിറ്റി അനുവദനീയമല്ല
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",നികുതി വിശദമായി ടേബിൾ സ്ടിംഗ് ഐറ്റം മാസ്റ്റർ നിന്നും പിടിച്ചു ഈ വയലിൽ സൂക്ഷിച്ചു. നികുതികളും ചാർജുകളും ഉപയോഗിച്ച
 DocType: Supplier Scorecard Period,SSC-,എസ്എസ്സി-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","അക്കൗണ്ട് മരവിപ്പിച്ചു എങ്കിൽ, എൻട്രികൾ നിയന്ത്രിത ഉപയോക്താക്കൾക്ക് അനുവദിച്ചിരിക്കുന്ന."
 DocType: Email Digest,Bank Balance,ബാങ്ക് ബാലൻസ്
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ലീവ് അപേക്ഷയിൽ അനുവയർ നിർബന്ധമാണ്
 DocType: Job Opening,"Job profile, qualifications required etc.","ഇയ്യോബ് പ്രൊഫൈൽ, യോഗ്യത തുടങ്ങിയവ ആവശ്യമാണ്"
 DocType: Journal Entry Account,Account Balance,അക്കൗണ്ട് ബാലൻസ്
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
@@ -1873,15 +1879,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,വരിയിൽ വരുന്ന പെയ്മെന്റ് ടേം {0} ഒരു തനിപ്പകർപ്പാണ്.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),കൃഷി (ബീറ്റ)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ഓഫീസ് രെംട്
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ഓഫീസ് രെംട്
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
 DocType: Disease,Common Name,പൊതുവായ പേര്
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ഇല്ല വിലാസം ഇതുവരെ ചേർത്തു.
 DocType: Workstation Working Hour,Workstation Working Hour,വർക്ക്സ്റ്റേഷൻ ജോലി അന്ത്യസമയം
 DocType: Vital Signs,Blood Pressure,രക്തസമ്മര്ദ്ദം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,അനലിസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,അനലിസ്റ്റ്
 DocType: Item,Inventory,ഇൻവെന്ററി
 DocType: Item,Sales Details,സെയിൽസ് വിശദാംശങ്ങൾ
 DocType: Quality Inspection,QI-,QI-
@@ -1891,15 +1897,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് വിദ്യാർത്ഥികളുടെ മൂല്യനിർണ്ണയം എൻറോൾ കോഴ്സ്
 DocType: Notification Control,Expense Claim Rejected,ചിലവേറിയ കള്ളമാണെന്ന്
 DocType: Item,Item Attribute,ഇനത്തിനും
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,സർക്കാർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,സർക്കാർ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ചിലവേറിയ ക്ലെയിം {0} ഇതിനകം വാഹനം ലോഗ് നിലവിലുണ്ട്
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ദയവായി തിരിച്ചടവ് തുക നൽകുക
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ദയവായി തിരിച്ചടവ് തുക നൽകുക
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,ഇനം രൂപഭേദങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,സേവനങ്ങള്
 DocType: HR Settings,Email Salary Slip to Employee,രേഖയെ ഇമെയിൽ ശമ്പളം ജി
 DocType: Cost Center,Parent Cost Center,പാരന്റ് ചെലവ് കേന്ദ്രം
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
 DocType: Sales Invoice,Source,ഉറവിടം
 DocType: Customer,"Select, to make the customer searchable with these fields",ഈ ഫീൽഡുകൾ ഉപയോഗിച്ച് ഉപഭോക്താവിനെ തിരയാൻ കഴിയുന്നതിനായി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,അടച്ചു കാണിക്കുക
@@ -1916,7 +1922,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
 DocType: Program Course,Program Course,പ്രോഗ്രാം കോഴ്സ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള
 DocType: Homepage,Company Tagline for website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കമ്പനിയുടെ ടാഗ്ലൈൻ
 DocType: Item Group,Item Group Name,ഇനം ഗ്രൂപ്പ് പേര്
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,എടുത്ത
@@ -1945,10 +1951,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,മെമ്മറിപറേഷന്റെ വിശദാംശങ്ങൾ
 DocType: Leave Block List,Block Holidays on important days.,പ്രധാനപ്പെട്ട ദിവസങ്ങളിൽ അവധി തടയുക.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),ആവശ്യമായ എല്ലാ അവശ്യ മൂല്യവും നൽകുക
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,അക്കൗണ്ടുകൾ സ്വീകാര്യം ചുരുക്കം
-DocType: Employee Loan,Monthly Repayment Amount,പ്രതിമാസ തിരിച്ചടവ് തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,അക്കൗണ്ടുകൾ സ്വീകാര്യം ചുരുക്കം
+DocType: Loan,Monthly Repayment Amount,പ്രതിമാസ തിരിച്ചടവ് തുക
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ഇൻവോയിസുകൾ തുറക്കുന്നു
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,ജീവനക്കാരുടെ റോൾ സജ്ജീകരിക്കാൻ ജീവനക്കാരിയെ രേഖയിൽ ഉപയോക്തൃ ഐഡി ഫീൽഡ് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,ജീവനക്കാരുടെ റോൾ സജ്ജീകരിക്കാൻ ജീവനക്കാരിയെ രേഖയിൽ ഉപയോക്തൃ ഐഡി ഫീൽഡ് സജ്ജീകരിക്കുക
 DocType: UOM,UOM Name,UOM പേര്
 DocType: GST HSN Code,HSN Code,ഹ്സ്ന് കോഡ്
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,സംഭാവനത്തുക
@@ -1970,7 +1976,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ഉപയോക്താവ് {0} ഇതിനകം ഫിസിഷ്യൻ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,ബോക്സ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,പ്രതിമാസ വിതരണം
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,റിസീവർ പട്ടിക ശൂന്യമാണ്. റിസീവർ പട്ടിക സൃഷ്ടിക്കാൻ ദയവായി
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),ഹെൽത്ത് (ബീറ്റ)
@@ -1998,7 +2005,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,പാക്ക് ഇനങ്ങൾ ഇല്ല
 DocType: Shipping Rule Condition,From Value,മൂല്യം നിന്നും
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
-DocType: Employee Loan,Repayment Method,തിരിച്ചടവ് രീതി
+DocType: Loan,Repayment Method,തിരിച്ചടവ് രീതി
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","പരിശോധിച്ചാൽ, ഹോം പേജ് വെബ്സൈറ്റ് സ്ഥിര ഇനം ഗ്രൂപ്പ് ആയിരിക്കും"
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
@@ -2007,14 +2014,14 @@
 DocType: Asset Maintenance Task,Certificate Required,സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്
 DocType: Company,Default Holiday List,സ്വതേ ഹോളിഡേ പട്ടിക
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},വരി {0}: സമയവും ചെയ്യുക കുറഞ്ഞ സമയത്തിനുള്ളില് {1} {2} ഓവർലാപ്പുചെയ്യുന്നു ആണ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
 DocType: Purchase Invoice,Supplier Warehouse,വിതരണക്കാരൻ വെയർഹൗസ്
 DocType: Opportunity,Contact Mobile No,മൊബൈൽ ഇല്ല ബന്ധപ്പെടുക
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 ,Material Requests for which Supplier Quotations are not created,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 DocType: Student Report Generation Tool,Print Section,പ്രിന്റ് വിഭാഗം
 DocType: Student Group,Set 0 for no limit,പരിധികൾ 0 സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,വരി {idx}: തുറക്കൽ {invoice_type} ഇൻവോയിസുകൾ സൃഷ്ടിക്കുന്നതിന് {field} ആവശ്യമാണ്
 DocType: Customer,Primary Address and Contact Detail,"പ്രാഥമിക വിലാസം, ബന്ധപ്പെടാനുള്ള വിശദാംശം"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
@@ -2025,10 +2032,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,കുറഞ്ഞത് ഒരു ഡൊമെയ്നിൽ തിരഞ്ഞെടുക്കുക.
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,മുൻകൂട്ടി എക്സ് ദിവസം വേണ്ടി ഓപ്പറേഷൻസ് ആസൂത്രണം ശ്രമിക്കുക.
 DocType: HR Settings,Stop Birthday Reminders,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,തിരയൽ ഇനം
 DocType: Payment Schedule,Payment Amount,പേയ്മെന്റ് തുക
@@ -2038,7 +2045,7 @@
 DocType: Assessment Plan,Grading Scale,ഗ്രേഡിംഗ് സ്കെയിൽ
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ഇതിനകം പൂർത്തിയായ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,കയ്യിൽ ഓഹരി
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,കയ്യിൽ ഓഹരി
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,വിജയകരം ഇംപോർട്ട്!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ഇഷ്യൂ ഇനങ്ങൾ ചെലവ്
@@ -2049,17 +2056,16 @@
 DocType: Quotation Item,Quotation Item,ക്വട്ടേഷൻ ഇനം
 DocType: Customer,Customer POS Id,കസ്റ്റമർ POS ഐഡി
 DocType: Account,Account Name,അക്കൗണ്ട് നാമം
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,തീയതി തീയതിയെക്കുറിച്ചുള്ള വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,സീരിയൽ ഇല്ല {0} അളവ് {1} ഒരു ഭാഗം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,തീയതി തീയതിയെക്കുറിച്ചുള്ള വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,സീരിയൽ ഇല്ല {0} അളവ് {1} ഒരു ഭാഗം ആകാൻ പാടില്ല
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,ദയവായി Woocommerce സെർവർ URL നൽകുക
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,വിതരണക്കമ്പനിയായ തരം മാസ്റ്റർ.
 DocType: Purchase Order Item,Supplier Part Number,വിതരണക്കമ്പനിയായ ഭാഗം നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
 DocType: Share Balance,To No,ഇല്ല
-DocType: Subscription,Reference Document,റെഫറൻസ് പ്രമാണം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
 DocType: Accounts Settings,Credit Controller,ക്രെഡിറ്റ് കൺട്രോളർ
-DocType: Grant Application,Applicant Type,അപേക്ഷകന്റെ തരം
+DocType: Loan,Applicant Type,അപേക്ഷകന്റെ തരം
 DocType: Purchase Invoice,03-Deficiency in services,03-സേവനങ്ങളുടെ കുറവ്
 DocType: Delivery Note,Vehicle Dispatch Date,വാഹന ഡിസ്പാച്ച് തീയതി
 DocType: Healthcare Settings,Default Medical Code Standard,സ്ഥിരസ്ഥിതി മെഡിക്കൽ കോഡ് സ്റ്റാൻഡേർഡ്
@@ -2070,13 +2076,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,ഈടാക്കൂ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,നിക്ഷിപ്തം Qty
 DocType: Party Account,Party Account,പാർട്ടി അക്കൗണ്ട്
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
 DocType: Lead,Upper Income,അപ്പർ ആദായ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,നിരസിക്കുക
 DocType: Journal Entry Account,Debit in Company Currency,കമ്പനി കറൻസി ഡെബിറ്റ്
 DocType: BOM Item,BOM Item,BOM ഇനം
 DocType: Appraisal,For Employee,ജീവനക്കാർ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ചിലവ് എൻട്രി നടത്തുക
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ചിലവ് എൻട്രി നടത്തുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
 DocType: Membership,INR,INR
@@ -2105,10 +2111,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 വലുതായിരിക്കണം
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,സ്റ്റോക്ക് ലഭ്യമാണ്
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,സ്റ്റോക്ക് ലഭ്യമാണ്
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ദിവസം) ശേഷി ആസൂത്രണ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,നിർവഹണവും
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ഇനങ്ങളുടെ ഒന്നുമില്ല അളവിലും അല്ലെങ്കിൽ മൂല്യം എന്തെങ്കിലും മാറ്റം ഉണ്ടാകും.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ഇനങ്ങളുടെ ഒന്നുമില്ല അളവിലും അല്ലെങ്കിൽ മൂല്യം എന്തെങ്കിലും മാറ്റം ഉണ്ടാകും.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,നിർബന്ധമായ ഒരു ഫീൽഡ് - പ്രോഗ്രാം
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,നിർബന്ധമായ ഒരു ഫീൽഡ് - പ്രോഗ്രാം
 DocType: Special Test Template,Result Component,ഫലം ഘടകം
@@ -2129,7 +2135,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ഇല പോലെ ഇല ഉള്ളിൽ അവധി ദിവസങ്ങൾ ഉൾപ്പെടുത്തുക
 DocType: Sales Invoice,Packed Items,ചിലരാകട്ടെ ഇനങ്ങൾ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,സീരിയൽ നമ്പർ നേരെ വാറന്റി ക്ലെയിം
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ആകെ&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ആകെ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കുക
 DocType: Employee,Permanent Address,സ്ഥിര വിലാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2147,10 +2153,10 @@
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,പ്രവർത്തനം സ്ഥിരീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ഓൺലൈൻ ലേലം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ക്വാണ്ടിറ്റി അല്ലെങ്കിൽ മൂലധനം റേറ്റ് അല്ലെങ്കിൽ രണ്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ക്വാണ്ടിറ്റി അല്ലെങ്കിൽ മൂലധനം റേറ്റ് അല്ലെങ്കിൽ രണ്ട് വ്യക്തമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,നിർവ്വഹണം
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,വണ്ടിയിൽ കാണുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,അടിസ്ഥാന മാനദണ്ഡങ്ങൾ സൃഷ്ടിക്കാൻ കഴിയില്ല. മാനദണ്ഡത്തിന്റെ പേരുമാറ്റുക
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
@@ -2173,9 +2179,9 @@
 DocType: Upload Attendance,Get Template,ഫലകം നേടുക
 DocType: Material Request,Transferred,മാറ്റിയത്
 DocType: Vehicle,Doors,ഡോറുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,രോഗി രജിസ്ട്രേഷനായി ഫീസ് വാങ്ങുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ഓഹരി ഇടപാട് കഴിഞ്ഞ് ആട്രിബ്യൂട്ടുകൾ മാറ്റാൻ കഴിയില്ല. പുതിയ ഇനത്തിലേക്ക് പുതിയ ഇനവും സ്റ്റോക്കും കൈമാറുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ഓഹരി ഇടപാട് കഴിഞ്ഞ് ആട്രിബ്യൂട്ടുകൾ മാറ്റാൻ കഴിയില്ല. പുതിയ ഇനത്തിലേക്ക് പുതിയ ഇനവും സ്റ്റോക്കും കൈമാറുക
 DocType: Course Assessment Criteria,Weightage,വെയിറ്റേജ്
 DocType: Purchase Invoice,Tax Breakup,നികുതി ഖണ്ഡങ്ങളായി
 DocType: Packing Slip,PS-,PS-
@@ -2211,12 +2217,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,അനുരഞ്ജനം JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 DocType: Purchase Invoice Item,Batch No,ബാച്ച് ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ജീവനക്കാരന്റെ അഡ്വാൻസ്
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,കസ്റ്റമറുടെ വാങ്ങൽ ഓർഡർ നേരെ ഒന്നിലധികം സെയിൽസ് ഉത്തരവുകൾ അനുവദിക്കുക
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 DocType: Grant Application,Assessment  Mark (Out of 10),അസ്സസ്മെന്റ് മാർക്ക് (10 ൽ 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,ഗുഅര്ദിഅന്൨ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,പ്രധാന
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
@@ -2225,15 +2232,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,വയലിൽ നിന്ന് ഓപ്പർച്യൂനിറ്റി നിർബന്ധമാണ്
 DocType: Email Digest,Annual Expenses,വാർഷിക ചെലവുകൾ
 DocType: Item,Variants,വകഭേദങ്ങളും
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
 DocType: Sales Team,Contribution to Net Total,നെറ്റ് ആകെ വരെ സംഭാവന
 DocType: Sales Invoice Item,Customer's Item Code,കസ്റ്റമർ ന്റെ ഇനം കോഡ്
 DocType: Stock Reconciliation,Stock Reconciliation,ഓഹരി അനുരഞ്ജനം
 DocType: Territory,Territory Name,ടെറിട്ടറി പേര്
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,ഒരു സബ്സ്ക്രിപ്ഷനിൽ നിങ്ങൾ ഒരേ ബില്ലിംഗ് സൈക്കിൾ മാത്രമുള്ള പ്ലാനുകൾ മാത്രമേ നിങ്ങൾക്ക് ഉൾപ്പെടുത്താൻ കഴിയൂ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ഒരു ജോലിക്കായി അപേക്ഷകന്.
 DocType: Purchase Order Item,Warehouse and Reference,വെയർഹൗസ് റഫറൻസ്
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമപ്രകാരമുള്ള വിവരങ്ങളും നിങ്ങളുടെ വിതരണക്കാരൻ കുറിച്ചുള്ള മറ്റ് ജനറൽ വിവരങ്ങൾ
@@ -2244,10 +2252,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,വിലയിരുത്തലുകളും
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,പരിശീലന പരിപാടികൾ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,ലീഡ് ഉറവിടം ലീഡ് നയിക്കുന്നു.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ഒരു ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ദയവായി നൽകുക
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ദയവായി നൽകുക
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,പരിപാലന ലോഗ്
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,ഇനം അപാകതയുണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ഈ പാക്കേജിന്റെ മൊത്തം ഭാരം. (ഇനങ്ങളുടെ മൊത്തം ഭാരം തുകയുടെ ഒരു സ്വയം കണക്കുകൂട്ടുന്നത്)
@@ -2255,11 +2263,11 @@
 DocType: Sales Order,To Deliver and Bill,എത്തിക്കേണ്ടത് ബിൽ ചെയ്യുക
 DocType: Student Group,Instructors,ഗുരുക്കന്മാർ
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,ഷെയർ മാനേജ്മെന്റ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,പേയ്മെന്റ്
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","വെയർഹൗസ് {0} ഏത് അക്കൗണ്ടിൽ ലിങ്കുചെയ്തിട്ടില്ല, കമ്പനി {1} വെയർഹൗസിൽ റെക്കോർഡ്, സെറ്റ് സ്ഥിര സാധനങ്ങളും അക്കൗണ്ടിൽ അക്കൗണ്ട് പരാമർശിക്കുക."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,നിങ്ങളുടെ ഓർഡറുകൾ നിയന്ത്രിക്കുക
 DocType: Work Order Operation,Actual Time and Cost,യഥാർത്ഥ സമയവും ചെലവ്
@@ -2269,7 +2277,7 @@
 DocType: Student Leave Application,Student Leave Application,വിദ്യാർത്ഥി അനുവാദ അപ്ലിക്കേഷൻ
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ഓൺ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,വില്പനയ്ക്ക് സമയത്ത് ഇനങ്ങളുടെ ചേർത്തുവെക്കുന്നു.
@@ -2279,7 +2287,7 @@
 DocType: Item,Barcodes,ബാർകോഡുകൾ
 DocType: Hub Category,Hub Node,ഹബ് നോഡ്
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,നിങ്ങൾ ഡ്യൂപ്ലിക്കേറ്റ് ഇനങ്ങളുടെ പ്രവേശിച്ചിരിക്കുന്നു. പരിഹരിക്കാൻ വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,അസോസിയേറ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,അസോസിയേറ്റ്
 DocType: Asset Movement,Asset Movement,അസറ്റ് പ്രസ്ഥാനം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,വർക്ക് ഓർഡർ {0} സമർപ്പിക്കേണ്ടതുണ്ട്
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,പുതിയ കാർട്ട്
@@ -2297,13 +2305,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,ബില്ലിംഗ് കറൻസി സ്ഥിര കമ്പനിയുടെ കറൻസി അല്ലെങ്കിൽ കക്ഷി അക്കൗണ്ട് കറൻസിക്ക് തുല്യമാണ്
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(മാത്രം ഡ്രാഫ്റ്റ്) പാക്കേജ് ഈ ഡെലിവറി ഒരു ഭാഗമാണ് സൂചിപ്പിക്കുന്നു
 DocType: Soil Texture,Loam,ഹരം
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,വരി {0}: തീയതി തീയതി പോസ്റ്റുചെയ്യുന്നതിനു മുമ്പുള്ള തീയതി അല്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,വരി {0}: തീയതി തീയതി പോസ്റ്റുചെയ്യുന്നതിനു മുമ്പുള്ള തീയതി അല്ല
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,പേയ്മെന്റ് എൻട്രി നിർമ്മിക്കുക
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ഇനം {0} വേണ്ടി ക്വാണ്ടിറ്റി {1} താഴെ ആയിരിക്കണം
 ,Sales Invoice Trends,സെയിൽസ് ഇൻവോയിസ് ട്രെൻഡുകൾ
 DocType: Leave Application,Apply / Approve Leaves,പ്രയോഗിക്കുക / ഇലകൾ അംഗീകരിക്കുക
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,എന്ന
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ&#39; &#39;മുൻ വരി തുകയ്ക്ക്&#39; ചാർജ് തരം മാത്രമേ വരി പരാമർശിക്കാൻ കഴിയും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ&#39; &#39;മുൻ വരി തുകയ്ക്ക്&#39; ചാർജ് തരം മാത്രമേ വരി പരാമർശിക്കാൻ കഴിയും
 DocType: Sales Order Item,Delivery Warehouse,ഡെലിവറി വെയർഹൗസ്
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,സാമ്പത്തിക ചെലവ് സെന്റേഴ്സ് ട്രീ.
 DocType: Serial No,Delivery Document No,ഡെലിവറി ഡോക്യുമെന്റ് ഇല്ല
@@ -2317,7 +2324,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,മാനുഫാക്ചറിംഗ് ക്രമീകരണങ്ങളിൽ മെറ്റീരിയൽ ഉപഭോഗം സജ്ജീകരിച്ചിട്ടില്ല.
 DocType: Student,Student Mobile Number,സ്റ്റുഡന്റ് മൊബൈൽ നമ്പർ
 DocType: Item,Has Variants,രൂപഭേദങ്ങൾ ഉണ്ട്
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} എന്നതിനേക്കാൾ {2} വരിയിൽ കൂടുതൽ {0} എന്നതിനായുള്ള overbill സാധ്യമല്ല. ഓവർ-ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, ദയവായി ഓഹരി സജ്ജീകരണങ്ങളിൽ സജ്ജമാക്കുക"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} എന്നതിനേക്കാൾ {2} വരിയിൽ കൂടുതൽ {0} എന്നതിനായുള്ള overbill സാധ്യമല്ല. ഓവർ-ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, ദയവായി ഓഹരി സജ്ജീകരണങ്ങളിൽ സജ്ജമാക്കുക"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,പ്രതികരണം അപ്ഡേറ്റുചെയ്യുക
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
@@ -2334,6 +2341,7 @@
 DocType: Asset Maintenance Log,Planned,ആസൂത്രിതമായ
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,കൺസൾട്ടൻസി ചാർജ് ബുക്കു ചെയ്യാനായി രോഗിയിൽ സജ്ജമാക്കാതിരിക്കുകയാണെങ്കിൽ സ്വീകാര്യമായ സ്വീകാര്യമായ അക്കൗണ്ടുകൾ ഉപയോഗിക്കും.
 DocType: Vehicle Log,Fuel Price,ഇന്ധന വില
+DocType: Bank Guarantee,Margin Money,മാർജിൻ മണി
 DocType: Budget,Budget,ബജറ്റ്
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,തുറക്കുക സജ്ജമാക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
@@ -2347,16 +2355,16 @@
 DocType: Lead,Follow Up,ഫോളോ അപ്പ്
 DocType: Item,Is Sales Item,സെയിൽസ് ഇനം തന്നെയല്ലേ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ഇനം ഗ്രൂപ്പ് ട്രീ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. ഇനം മാസ്റ്റർ പരിശോധിക്കുക
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. ഇനം മാസ്റ്റർ പരിശോധിക്കുക
 DocType: Maintenance Visit,Maintenance Time,മെയിൻറനൻസ് സമയം
 ,Amount to Deliver,വിടുവിപ്പാൻ തുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},ഇതേ ഇനം ഒന്നിലധികം തവണ നൽകി. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം ആരംഭ തീയതി ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം ആരംഭിക്കുന്ന തീയതിയ്ക്ക് നേരത്തെ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,പിശകുകളുണ്ടായിരുന്നു.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,{2} ഉം {2} ഉം {3} നും ഇടയിലുള്ള {1} ജീവനക്കാരി ഇതിനകം അപേക്ഷിച്ചു.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,പിശകുകളുണ്ടായിരുന്നു.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,{2} ഉം {2} ഉം {3} നും ഇടയിലുള്ള {1} ജീവനക്കാരി ഇതിനകം അപേക്ഷിച്ചു.
 DocType: Guardian,Guardian Interests,ഗാർഡിയൻ താൽപ്പര്യങ്ങൾ
 DocType: Naming Series,Current Value,ഇപ്പോഴത്തെ മൂല്യം
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
 DocType: Education Settings,Instructor Records to be created by,അധ്യാപക റെക്കോർഡുകൾ സൃഷ്ടിക്കേണ്ടതുണ്ട്
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} സൃഷ്ടിച്ചു
 DocType: GST Account,GST Account,GST അക്കൗണ്ട്
@@ -2375,8 +2383,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
 DocType: Website Item Group,Website Item Group,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,പ്രിയങ്കരങ്ങളിലേക്ക് ചേർത്തു
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ശമ്പള സ്ലിപ്പിൽ മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡം സമർപ്പിക്കുന്നതിന് അല്ലെങ്കിൽ ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,"കടമകൾ, നികുതി"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ശമ്പള സ്ലിപ്പിൽ മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡം സമർപ്പിക്കുന്നതിന് അല്ലെങ്കിൽ ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,"കടമകൾ, നികുതി"
 DocType: Projects Settings,Projects Settings,പ്രോജക്ട് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} പേയ്മെന്റ് എൻട്രികൾ {1} ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല
@@ -2386,27 +2394,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ഇനം ഗ്രൂപ്പ് ട്രീ.
 DocType: Production Plan,Total Produced Qty,ആകെ ഉല്പാദിപ്പിച്ച ക്വറി
 DocType: Payroll Entry,Get Employee Details,ജീവനക്കാരുടെ വിശദാംശങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
 DocType: Asset,Sold,വിറ്റത്
 ,Item-wise Purchase History,ഇനം തിരിച്ചുള്ള വാങ്ങൽ ചരിത്രം
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
 DocType: Account,Frozen,ശീതീകരിച്ച
 DocType: Sales Invoice Payment,Base Amount (Company Currency),അടിസ്ഥാന സംഖ്യ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,അസംസ്കൃത വസ്തുക്കൾ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,അസംസ്കൃത വസ്തുക്കൾ
 DocType: Payment Reconciliation Payment,Reference Row,റഫറൻസ് വരി
 DocType: Installation Note,Installation Time,ഇന്സ്റ്റലേഷന് സമയം
 DocType: Sales Invoice,Accounting Details,അക്കൗണ്ടിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ഈ കമ്പനി വേണ്ടി എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കുക
 DocType: Patient,O Positive,പോസിറ്റീവ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,നിക്ഷേപങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,വിഹിതം
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,സ്വീകാര്യത മാനദണ്ഡം
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,മുകളിലുള്ള പട്ടികയിൽ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ നൽകുക
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ജേർണൽ എൻട്രിക്ക് റീഫേൻസുകൾ ലഭ്യമല്ല
 DocType: Item Attribute,Attribute Name,പേര് ആട്രിബ്യൂട്ട്
 DocType: BOM,Show In Website,വെബ്സൈറ്റ് കാണിക്കുക
 DocType: Shopping Cart Settings,Show Quantity in Website,വെബ്സൈറ്റ് ക്വാണ്ടിറ്റി കാണിക്കുക
-DocType: Employee Loan Application,Total Payable Amount,ആകെ അടയ്ക്കേണ്ട തുക
+DocType: Loan Application,Total Payable Amount,ആകെ അടയ്ക്കേണ്ട തുക
 DocType: Task,Expected Time (in hours),(മണിക്കൂറിനുള്ളിൽ) പ്രതീക്ഷിക്കുന്ന സമയം
 DocType: Item Reorder,Check in (group),(ഗ്രൂപ്പ്) ചെക്ക് ഇൻ
 DocType: Soil Texture,Silt,സിൽറ്റ്
@@ -2425,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,പേയ്മെന്റ് നിർമ്മിക്കുക
 DocType: Room,Room Name,റൂം പേര്
 DocType: Prescription Duration,Prescription Duration,കുറിപ്പിലെ കാലാവധി
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
 DocType: Activity Cost,Costing Rate,ആറെണ്ണവും റേറ്റ്
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,കസ്റ്റമർ വിലാസങ്ങളും ബന്ധങ്ങൾ
 ,Campaign Efficiency,കാമ്പെയ്ൻ എഫിഷ്യൻസി
@@ -2445,11 +2454,11 @@
 DocType: Chapter,Chapter,ചാപ്റ്റർ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,ജോഡി
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ഈ മോഡ് തിരഞ്ഞെടുക്കുമ്പോൾ POS ഇൻവോയിസായി സ്ഥിരസ്ഥിതി അക്കൌണ്ട് സ്വയമായി അപ്ഡേറ്റ് ചെയ്യപ്പെടും.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedule,മൂല്യത്തകർച്ച ഷെഡ്യൂൾ
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,സെയിൽസ് പങ്കാളി വിലാസങ്ങളും ബന്ധങ്ങൾ
 DocType: Bank Reconciliation Detail,Against Account,അക്കൗണ്ടിനെതിരായ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,അര ദിവസം തീയതി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള ആയിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,അര ദിവസം തീയതി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള ആയിരിക്കണം
 DocType: Maintenance Schedule Detail,Actual Date,യഥാർഥ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} കമ്പനിയിൽ സ്ഥിരസ്ഥിതി കോസ്റ്റ് സെന്റർ ക്രമീകരിക്കുക.
 DocType: Item,Has Batch No,ബാച്ച് ഇല്ല ഉണ്ട്
@@ -2467,7 +2476,6 @@
 DocType: Task,Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി)
 DocType: Soil Texture,Soil Type,മണ്ണ് തരം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,പുതിയ സന്ദേശം
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless മാൻഡേറ്റ്
@@ -2487,7 +2495,7 @@
 DocType: Hub Category,Hub Category,ഹബ് വിഭാഗം
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
-DocType: Employee Loan,Loan Amount,വായ്പാ തുക
+DocType: Loan,Loan Amount,വായ്പാ തുക
 DocType: Student Report Generation Tool,Add Letterhead,ലെറ്റർഹെഡ് ചേർക്കുക
 DocType: Program Enrollment,Self-Driving Vehicle,സ്വയം-ഡ്രൈവിംഗ് വാഹനം
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,വിതരണക്കാരൻ സ്കോറർ സ്റ്റാൻഡിംഗ്
@@ -2516,9 +2524,9 @@
 DocType: Cash Flow Mapper,Position,സ്ഥാനം
 DocType: Patient,Patient Details,രോഗിയുടെ വിശദാംശങ്ങൾ
 DocType: Patient,B Positive,ബി പോസിറ്റീവ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 DocType: Patient Medical Record,Patient Medical Record,രോഗിയുടെ മെഡിക്കൽ റെക്കോർഡ്
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,സ്പോർട്സ്
@@ -2526,8 +2534,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,യഥാർത്ഥ ആകെ
 DocType: Lab Test UOM,Test UOM,പരിശോധന UOM
 DocType: Student Siblings,Student Siblings,സ്റ്റുഡന്റ് സഹോദരങ്ങള്
+DocType: Subscription Plan Detail,Subscription Plan Detail,സബ്സ്ക്രിപ്ഷൻ പ്ലാൻ വിശദാംശം
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,യൂണിറ്റ്
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,കമ്പനി വ്യക്തമാക്കുക
 ,Customer Acquisition and Loyalty,കസ്റ്റമർ ഏറ്റെടുക്കൽ ലോയൽറ്റി
 DocType: Asset Maintenance Task,Maintenance Task,മെയിൻറനൻസ് ടാസ്ക്
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,GST ക്രമീകരണങ്ങളിൽ B2C പരിധി സജ്ജീകരിക്കുക.
@@ -2542,6 +2551,7 @@
 ,BOM Search,BOM തിരച്ചിൽ
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ആകെ ഉപഭോഗം ചെയ്യുന്ന മെറ്റീരിയൽ ചെലവ് (സ്റ്റോക്ക് എൻട്രി വഴി)
 DocType: Hub Settings,Company Registered,കമ്പനി രജിസ്റ്റർ ചെയ്തു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,തീയതി മുതൽ കുറവ് തീയതി വരെ ആകരുത്
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ഈ സംഭരണശാലയിൽ ലഭ്യമായ സ്റ്റോക്ക് അടിസ്ഥാനമാക്കിയുള്ള &quot;ഓഹരിയിൽ&quot; അല്ലെങ്കിൽ &quot;നോട്ട് ഇൻ സ്റ്റോക്ക്&quot; പ്രസിദ്ധീകരിക്കുക.
 DocType: Vehicle,Fuel Type,ഇന്ധന തരം
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,കമ്പനിയിൽ കറൻസി വ്യക്തമാക്കുക
@@ -2549,17 +2559,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ബാച്ച് ലെ സ്റ്റോക്ക് ബാലൻസ് {0} സംഭരണശാല {3} ചെയ്തത് ഇനം {2} വേണ്ടി {1} നെഗറ്റീവ് ആയിത്തീരും
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,തുടർന്ന് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഇനത്തിന്റെ റീ-ഓർഡർ തലത്തിൽ അടിസ്ഥാനമാക്കി സ്വയം ഉൾപ്പെടും
 DocType: Email Digest,Pending Sales Orders,തീർച്ചപ്പെടുത്തിയിട്ടില്ല സെയിൽസ് ഓർഡറുകൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
 DocType: Employee,Create User Permission,ഉപയോക്തൃ അനുമതി സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Healthcare Settings,Remind Before,മുമ്പ് ഓർമ്മിപ്പിക്കുക
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM പരിവർത്തന ഘടകം വരി {0} ആവശ്യമാണ്
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Salary Component,Deduction,കുറയ്ക്കല്
 DocType: Item,Retain Sample,സാമ്പിൾ നിലനിർത്തുക
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
 DocType: Stock Reconciliation Item,Amount Difference,തുക വ്യത്യാസം
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ഈ വിൽപ്പന ആളിന്റെ ജീവനക്കാരന്റെ ഐഡി നൽകുക
 DocType: Territory,Classification of Customers by region,പ്രാദേശികതയും ഉപഭോക്താക്കൾക്ക് തിരിക്കൽ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ഉല്പാദനത്തിൽ
@@ -2569,8 +2580,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,കണക്കുകൂട്ടിയത് ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Normal Test Template,Normal Test Template,സാധാരണ ടെസ്റ്റ് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ഉദ്ധരണി
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,ലഭിച്ചിട്ടില്ല RFQ എന്നതിന് ഒരു ഉദ്ധരണിയും നൽകാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ഉദ്ധരണി
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,ലഭിച്ചിട്ടില്ല RFQ എന്നതിന് ഒരു ഉദ്ധരണിയും നൽകാൻ കഴിയില്ല
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,അക്കൗണ്ട് കറൻസിയിൽ അച്ചടിക്കാൻ ഒരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
@@ -2578,7 +2589,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ഈ രോഗിക്ക് എതിരായ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ചുവടെയുള്ള ടൈംലൈൻ കാണുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
 DocType: Patient,Date of Birth,ജനിച്ച ദിവസം
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,ഇനം {0} ഇതിനകം മടങ്ങി ചെയ്തു
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,ഇനം {0} ഇതിനകം മടങ്ങി ചെയ്തു
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** സാമ്പത്തിക വർഷത്തെ ** ഒരു സാമ്പത്തിക വർഷം പ്രതിനിധീകരിക്കുന്നത്. എല്ലാ അക്കൗണ്ടിങ് എൻട്രികൾ മറ്റ് പ്രധാന ഇടപാടുകൾ ** ** സാമ്പത്തിക വർഷത്തിൽ നേരെ അത്രകണ്ട്.
 DocType: Opportunity,Customer / Lead Address,കസ്റ്റമർ / ലീഡ് വിലാസം
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,വിതരണ സ്കോർബോർഡ് സജ്ജീകരണം
@@ -2589,14 +2600,15 @@
 DocType: Work Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,ജോലി വിവരണം
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,ജോലി വിവരണം
 DocType: Student Applicant,Applied,അപ്ലൈഡ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,വീണ്ടും തുറക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,വീണ്ടും തുറക്കുക
 DocType: Sales Invoice Item,Qty as per Stock UOM,ഓഹരി UOM പ്രകാരം Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ഗുഅര്ദിഅന്൨ പേര്
 DocType: Purchase Invoice,02-Post Sale Discount,02-പോസ്റ്റ് വിൽപന കിഴിവ്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ഒഴികെ പ്രത്യേക പ്രതീകങ്ങൾ &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ഒപ്പം &quot;/&quot; പരമ്പര പേരെടുത്ത് അനുവദനീയമല്ല"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","സെയിൽസ് കാമ്പെയ്നുകൾക്കായുള്ള കൃത്യമായി സൂക്ഷിക്കുക. നിക്ഷേപം മടങ്ങിവരിക കണക്കാക്കുന്നതിനുള്ള പടയോട്ടങ്ങൾ നിന്ന് തുടങ്ങിയവ സെയിൽസ് ഓർഡർ, ഉദ്ധരണികൾ, നയിക്കുന്നു ട്രാക്ക് സൂക്ഷിക്കുക."
+DocType: Department Approver,Approver,Approver
 ,SO Qty,ഷൂട്ട്ഔട്ട് Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ഷെയർഹോൾഡർക്ക് ഫീൽഡ് ശൂന്യമായിരിക്കരുത്
 DocType: Guardian,Work Address,ഔദ്യോഗിക വിലാസം
@@ -2610,21 +2622,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ആകെ തുക (കമ്പനി കറൻസി)
 DocType: Purchase Order Item,To be delivered to customer,ഉപഭോക്താവിന് പ്രസവം
 DocType: BOM,Scrap Material Cost,സ്ക്രാപ്പ് വസ്തുക്കളുടെ വില
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,സീരിയൽ ഇല്ല {0} ഏതെങ്കിലും വെയർഹൗസ് ഭാഗമല്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,സീരിയൽ ഇല്ല {0} ഏതെങ്കിലും വെയർഹൗസ് ഭാഗമല്ല
 DocType: Grant Application,Email Notification Sent,ഇമെയിൽ അറിയിപ്പ് അയച്ചത്
 DocType: Purchase Invoice,In Words (Company Currency),വാക്കുകൾ (കമ്പനി കറൻസി) ൽ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","ഇനം കോഡ്, വെയർഹൗസ്, വരിയിൽ വരികൾ ആവശ്യമുണ്ട്"
-DocType: Pricing Rule,Supplier,സപൈ്ളയര്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","ഇനം കോഡ്, വെയർഹൗസ്, വരിയിൽ വരികൾ ആവശ്യമുണ്ട്"
+DocType: Bank Guarantee,Supplier,സപൈ്ളയര്
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,പേയ്മെന്റ് വിശദാംശങ്ങൾ കാണിക്കുക
 DocType: Consultation,Consultation Time,കൺസൾട്ടേഷൻ സമയം
 DocType: C-Form,Quarter,ക്വാര്ട്ടര്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,പലവക ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,പലവക ചെലവുകൾ
 DocType: Global Defaults,Default Company,സ്ഥിരസ്ഥിതി കമ്പനി
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ചിലവേറിയ അല്ലെങ്കിൽ ഈ വ്യത്യാസം അത് കൂട്ടിയിടികൾ പോലെ ഇനം {0} മൊത്തത്തിലുള്ള ഓഹരി മൂല്യം നിര്ബന്ധമാണ്
 DocType: Payment Request,PR,പിആർ
 DocType: Cheque Print Template,Bank Name,ബാങ്ക് പേര്
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,ജീവനക്കാരുടെ ലോൺ അക്കൗണ്ട്
 DocType: Leave Application,Total Leave Days,ആകെ അനുവാദ ദിനങ്ങൾ
 DocType: Email Digest,Note: Email will not be sent to disabled users,കുറിപ്പ്: ഇമെയിൽ ഉപയോക്താക്കൾക്ക് അയച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ഇടപെടൽ എണ്ണം
@@ -2640,7 +2651,7 @@
 DocType: Vital Signs,Weight (In Kilogram),ഭാരം (കിലൊഗ്രാമിൽ)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",സേവ് ചെയതശേഷം ചാപ്റ്ററുകൾ / chapter_name സ്വയം ശൂന്യമാക്കിയിടുക.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST ക്രമീകരണങ്ങളിൽ GST അക്കൗണ്ടുകൾ ദയവായി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST ക്രമീകരണങ്ങളിൽ GST അക്കൗണ്ടുകൾ ദയവായി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ബിസിനസ്സ് തരം
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,പുതിയ വാങ്ങൽ വില
@@ -2649,12 +2660,13 @@
 DocType: Grant Application,Grant Description,വിവരണം നൽകുക
 DocType: Purchase Invoice Item,Rate (Company Currency),നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Student Guardian,Others,മറ്റുള്ളവ
+DocType: Subscription,Discounts,ഡിസ്കൗണ്ട്
 DocType: Payment Entry,Unallocated Amount,ലഭ്യമല്ലാത്ത തുക
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ഒരു പൊരുത്തമുള്ള ഇനം കണ്ടെത്താൻ കഴിയുന്നില്ല. {0} വേണ്ടി മറ്റ് ചില മൂല്യം തിരഞ്ഞെടുക്കുക.
 DocType: POS Profile,Taxes and Charges,നികുതി ചാർജുകളും
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ഒരു ഉല്പന്നം അല്ലെങ്കിൽ സ്റ്റോക്ക്, വാങ്ങിയ വിറ്റു അല്ലെങ്കിൽ സൂക്ഷിച്ചു ഒരു സേവനം."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,കൂടുതൽ അപ്ഡേറ്റുകൾ ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ആദ്യവരിയിൽ &#39;മുൻ വരി തുകയ്ക്ക്&#39; അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ ന്&#39; ചുമതലയേറ്റു തരം തിരഞ്ഞെടുക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ആദ്യവരിയിൽ &#39;മുൻ വരി തുകയ്ക്ക്&#39; അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ ന്&#39; ചുമതലയേറ്റു തരം തിരഞ്ഞെടുക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ഇത് ഈ സെറ്റപ്പുമായി ബന്ധിപ്പിച്ചിട്ടുള്ള എല്ലാ സ്കോർകാർഡുകളും ഉൾക്കൊള്ളുന്നു
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ശിശു ഇനം ഒരു ഉൽപ്പന്നം ബണ്ടിൽ പാടില്ല. ഇനം നീക്കംചെയ്യുക `{0}` സംരക്ഷിക്കാനുമാവും
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ബാങ്കിംഗ്
@@ -2663,45 +2675,48 @@
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ഷെഡ്യൂൾ ലഭിക്കുന്നതിന് &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
 DocType: Bin,Ordered Quantity,ഉത്തരവിട്ടു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ഉദാ: &quot;നിർമ്മാതാക്കളുടേയും ഉപകരണങ്ങൾ നിർമ്മിക്കുക&quot;
 DocType: Grading Scale,Grading Scale Intervals,ഗ്രേഡിംഗ് സ്കെയിൽ ഇടവേളകൾ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,വർഷം ലാഭം
+DocType: Bank Guarantee,Name of Bank,ബാങ്കിന്റെ പേര്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: വേണ്ടി {2} മാത്രം കറൻസി കഴിയും അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Fee Schedule,In Process,പ്രക്രിയയിൽ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ഡിസ്കൗണ്ട്
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,സാമ്പത്തിക അക്കൗണ്ടുകൾ ട്രീ.
+DocType: Bank Guarantee,Reference Document Type,റഫറൻസ് ഡോക്യുമെന്റ് തരം
 DocType: Cash Flow Mapping,Cash Flow Mapping,ക്യാഷ് ഫ്ലോ മാപ്പിംഗ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} സെയിൽസ് ഓർഡർ {1} നേരെ
 DocType: Account,Fixed Asset,സ്ഥിര അസറ്റ്
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,സീരിയൽ ഇൻവെന്ററി
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,സ്ഥിരസ്ഥിതി സമ്പർക്കത്തിൽ ഇമെയിൽ കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,രഹസ്യം സൃഷ്ടിക്കുക
-DocType: Employee Loan,Account Info,അക്കൗണ്ട് വിവരങ്ങളും
+DocType: Loan,Account Info,അക്കൗണ്ട് വിവരങ്ങളും
 DocType: Activity Type,Default Billing Rate,സ്ഥിരസ്ഥിതി ബില്ലിംഗ് റേറ്റ്
 DocType: Fees,Include Payment,പേയ്മെന്റ് ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 DocType: Sales Invoice,Total Billing Amount,ആകെ ബില്ലിംഗ് തുക
 DocType: Fee Schedule,Receivable Account,സ്വീകാ അക്കൗണ്ട്
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
 DocType: Quotation Item,Stock Balance,ഓഹരി ബാലൻസ്
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,സിഇഒ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,സിഇഒ
 DocType: Purchase Invoice,With Payment of Tax,നികുതി അടച്ചുകൊണ്ട്
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,വിതരണക്കാരൻ നുവേണ്ടി ത്രിപ്ലിചതെ
 DocType: Land Unit,Is Container,കണ്ടെയ്നർ ആണ്
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ഇത് ക്രോപ് സൈക്കിളിൽ ഒന്നാം ദിവസം ആയിരിക്കും
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice Item,Weight UOM,ഭാരോദ്വഹനം UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ഫോളിയോ നമ്പറുകളുള്ള ഷെയർഹോൾഡർമാരുടെ പട്ടിക
 DocType: Salary Structure Employee,Salary Structure Employee,ശമ്പള ഘടന ജീവനക്കാരുടെ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,വേരിയന്റ് ആട്രിബ്യൂട്ടുകൾ കാണിക്കുക
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,വേരിയന്റ് ആട്രിബ്യൂട്ടുകൾ കാണിക്കുക
 DocType: Student,Blood Group,രക്ത ഗ്രൂപ്പ്
 DocType: Course,Course Name,കോഴ്സിന്റെ പേര്
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ഒരു പ്രത്യേക ജീവനക്കാരന്റെ ലീവ് അപേക്ഷകൾ അംഗീകരിക്കാം ഉപയോക്താക്കൾ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ഓഫീസ് ഉപകരണങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ഓഫീസ് ഉപകരണങ്ങൾ
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,കമ്പനികൾ
 DocType: Supplier Scorecard,Scoring Setup,സ്കോറിംഗ് സെറ്റ്അപ്പ്
@@ -2720,7 +2735,7 @@
 DocType: Stock Entry,Total Incoming Value,ആകെ ഇൻകമിംഗ് മൂല്യം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,വിതരണക്കാരന്റെ സ്കോർബോർഡ് വേരിയബിളുകൾ.
 DocType: Job Offer Term,Offer Term,ആഫര് ടേം
 DocType: Asset,Quality Manager,ക്വാളിറ്റി മാനേജർ
@@ -2732,13 +2747,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},ആകെ ലഭിക്കാത്ത: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ൽ വെബ്സൈറ്റ് ഓപ്പറേഷൻ
 DocType: Supplier Scorecard,Supplier Score,വിതരണക്കാരൻ സ്കോർ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,ആകെ Invoiced ശാരീരിക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,ആകെ Invoiced ശാരീരിക
 DocType: Supplier,Warn RFQs,മുന്നറിയിപ്പ് RFQ കൾ
 DocType: BOM,Conversion Rate,പരിവർത്തന നിരക്ക്
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ഉൽപ്പന്ന തിരച്ചിൽ
 DocType: Assessment Plan,To Time,സമയം ചെയ്യുന്നതിനായി
 DocType: Authorization Rule,Approving Role (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് റോൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
+DocType: Loan,Total Amount Paid,പണമടച്ച തുക
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,വിദ്യാർത്ഥി അപേക്ഷകന് നിർബന്ധിതമായ വിദ്യാർത്ഥി അഡ്മിഷൻ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,വിലനിർണ്ണയം പ്രസിദ്ധീകരിക്കാൻ ഒരു ശ്രേണിക പട്ടിക തിരഞ്ഞെടുക്കുക
@@ -2748,17 +2764,16 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},വരി {0}: പൂർത്തിയായി അളവ് {2} ഓപ്പറേഷൻ അപേക്ഷിച്ച് {1} കൂടുതലാകാൻ പാടില്ല
 DocType: Manufacturing Settings,Allow Overtime,അധികസമയം അനുവദിക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല, ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല, ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല, ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല, ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
 DocType: Training Event Employee,Training Event Employee,പരിശീലന ഇവന്റ് ജീവനക്കാരുടെ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,"പരമാവധി മാതൃകകൾ - {0} ബാച്ച് {1}, ഇനം {2} എന്നിവയ്ക്കായി നിലനിർത്താം."
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,സമയം സ്ലോട്ടുകൾ ചേർക്കുക
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ഇപ്പോഴത്തെ മൂലധനം റേറ്റ്
 DocType: Training Event,Advance,അഡ്വാൻസ്
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,വീണ്ടും ആവർത്തിക്കുന്നു.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless പേയ്മെന്റ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType കണ്ടെത്താനായില്ല {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,പുതിയ വിലാസം
@@ -2778,7 +2793,6 @@
 DocType: Bin,Actual Quantity,യഥാർത്ഥ ക്വാണ്ടിറ്റി
 DocType: Shipping Rule,example: Next Day Shipping,ഉദാഹരണം: അടുത്ത ദിവസം ഷിപ്പിംഗ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},സബ്സ്ക്രിപ്ഷൻ {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ഫീസ് ഷെഡ്യൂൾ പ്രോഗ്രാം
 DocType: Fee Schedule Program,Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച്
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,കുട്ടിയാണെന്ന്
@@ -2794,14 +2808,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ഇ-കൊമേഴ്സ് GSTIN
 DocType: Sales Order,Not Delivered,കൈമാറിയില്ല
 ,Bank Clearance Summary,ബാങ്ക് ക്ലിയറൻസ് ചുരുക്കം
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","സൃഷ്ടിക്കുക ദിവസേന നിയന്ത്രിക്കുക, പ്രതിവാര മാസ ഇമെയിൽ digests."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","സൃഷ്ടിക്കുക ദിവസേന നിയന്ത്രിക്കുക, പ്രതിവാര മാസ ഇമെയിൽ digests."
 DocType: Appraisal Goal,Appraisal Goal,മൂല്യനിർണയം ഗോൾ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,വിഭാഗം നിർദ്ദേശിക്കണോ?
 DocType: Stock Reconciliation Item,Current Amount,ഇപ്പോഴത്തെ തുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,കെട്ടിടങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,കെട്ടിടങ്ങൾ
 DocType: Fee Schedule,Fee Structure,ഫീസ് ഘടന
 DocType: Timesheet Detail,Costing Amount,തുക ആറെണ്ണവും
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 DocType: Student Admission Program,Application Fee,അപേക്ഷ ഫീസ്
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ശമ്പളം ജി സമർപ്പിക്കുക
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ഇനം {0} വേണ്ടി Maxiumm നല്കിയിട്ടുള്ള {1}% ആണ്
@@ -2809,12 +2822,13 @@
 DocType: Sales Partner,Address & Contacts,വിലാസം &amp; ബന്ധങ്ങൾ
 DocType: SMS Log,Sender Name,പ്രേഷിതനാമം
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,കൃഷി വിശകലന മാനദണ്ഡം
+DocType: HR Settings,Leave Approval Notification Template,അംഗീകാര അറിയിപ്പ് ടെംപ്ലേറ്റ് ഒഴിവാക്കുക
 DocType: POS Profile,[Select],[തിരഞ്ഞെടുക്കുക]
 DocType: Vital Signs,Blood Pressure (diastolic),രക്തസമ്മർദ്ദം (ഡയസ്റ്റോളിക്)
 DocType: SMS Log,Sent To,ലേക്ക് അയച്ചു
 DocType: Agriculture Task,Holiday Management,ഹോളിഡേ മാനേജ്മെന്റ്
 DocType: Payment Request,Make Sales Invoice,സെയിൽസ് ഇൻവോയിസ് നിർമ്മിക്കുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,സോഫ്റ്റ്വെയറുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,സോഫ്റ്റ്വെയറുകൾ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
 DocType: Company,For Reference Only.,മാത്രം റഫറൻസിനായി.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{1} എന്ന വൈദ്യരിൽ {0} ലഭ്യമല്ല
@@ -2832,7 +2846,7 @@
 DocType: Employee,New Workplace,പുതിയ ജോലിസ്ഥലം
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,മെറ്റീരിയൽ ഉപഭോഗം
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,അടഞ്ഞ സജ്ജമാക്കുക
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},ബാർകോഡ് {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},ബാർകോഡ് {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
 DocType: Normal Test Items,Require Result Value,റിസൾട്ട് മൂല്യം ആവശ്യമാണ്
 DocType: Item,Show a slideshow at the top of the page,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2847,19 +2861,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
 DocType: Leave Block List,Allow Users,അനുവദിക്കുക ഉപയോക്താക്കൾ
 DocType: Purchase Order,Customer Mobile No,കസ്റ്റമർ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ആവർത്തിക്കുന്നു
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ക്യാഷ് ഫ്ലോ മാപ്പിംഗ് ടെംപ്ലേറ്റ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ലോൺ മാനേജ്മെന്റ്
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ഉൽപ്പന്ന ലംബമായുള്ള അല്ലെങ്കിൽ ഡിവിഷനുകൾ വേണ്ടി പ്രത്യേക വരുമാനവും ചിലവേറിയ ട്രാക്ക്.
 DocType: Rename Tool,Rename Tool,ടൂൾ പുനർനാമകരണം ചെയ്യുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,അപ്ഡേറ്റ് ചെലവ്
 DocType: Item Reorder,Item Reorder,ഇനം പുനഃക്രമീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 DocType: Fees,Send Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന അയയ്ക്കുക
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
 DocType: Water Analysis,Origin,ഉത്ഭവം
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
@@ -2874,14 +2888,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ആദായ നികുതി ബാധ്യതയാണ്
 DocType: Grading Scale Interval,Grade Description,ഗ്രേഡ് വിവരണം
 DocType: Stock Entry,Purchase Receipt No,വാങ്ങൽ രസീത് ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,അച്ചാരം മണി
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,അച്ചാരം മണി
 DocType: Sales Invoice, Shipping Bill Number,ഷിപ്പിംഗ് ബിൽ നമ്പർ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 DocType: Asset Maintenance Log,Actions performed,പ്രവർത്തനങ്ങൾ നടത്തി
 DocType: Cash Flow Mapper,Section Leader,സെക്ഷൻ ലീഡർ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ഫണ്ട് സ്രോതസ്സ് (ബാധ്യതകളും)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ഫണ്ട് സ്രോതസ്സ് (ബാധ്യതകളും)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
 DocType: Supplier Scorecard Scoring Standing,Employee,ജീവനക്കാരുടെ
+DocType: Bank Guarantee,Fixed Deposit Number,ഫിക്സഡ് ഡെപ്പോസിറ്റ് നമ്പർ
 DocType: Asset Repair,Failure Date,പരാജയ തീയതി
 DocType: Sample Collection,Collected Time,ശേഖരിച്ച സമയം
 DocType: Company,Sales Monthly History,സെയിൽസ് മൺലി ഹിസ്റ്ററി
@@ -2898,10 +2913,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,ഈ അപ്പോയിന്റ്മെന്റ് റദ്ദാക്കണമെന്ന് നിങ്ങൾക്ക് തീർച്ചയാണോ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Room Pricing Package ൻറെ ഹോട്ടൽ നിരക്കുകൾ പുതുക്കുന്നതിനായി തീയതികൾ എൻറർ ചെയ്യുക
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,സെയിൽസ് പൈപ്പ്ലൈൻ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ആവശ്യമാണ്
 DocType: Rename Tool,File to Rename,പേരു്മാറ്റുക ഫയൽ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,സബ്സ്ക്രിപ്ഷൻ അപ്ഡേറ്റുകൾ ലഭ്യമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},"അക്കൗണ്ട് {0}, വിചാരണയുടെ മോഡിൽ കമ്പനി {1} ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല: {2}"
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,കോഴ്സ്:
@@ -2911,7 +2927,7 @@
 DocType: Notification Control,Expense Claim Approved,ചിലവേറിയ ക്ലെയിം അംഗീകരിച്ചു
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,സൃഷ്ടി ഉത്തരവുകളൊന്നും സൃഷ്ടിച്ചിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം ഈ കാലയളവിൽ സൃഷ്ടിച്ച
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ഫാർമസ്യൂട്ടിക്കൽ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ഫാർമസ്യൂട്ടിക്കൽ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,വാങ്ങിയ ഇനങ്ങൾ ചെലവ്
 DocType: Selling Settings,Sales Order Required,സെയിൽസ് ഓർഡർ ആവശ്യമുണ്ട്
 DocType: Purchase Invoice,Credit To,ക്രെഡിറ്റ് ചെയ്യുക
@@ -2929,7 +2945,7 @@
 DocType: Request for Quotation Supplier,No Quote,ഉദ്ധരണി ഇല്ല
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Gateway Account,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
 DocType: Job Offer,Accepted,സ്വീകരിച്ചു
@@ -2942,7 +2958,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,തിരയൽ ഫലങ്ങൾ
 DocType: Room,Room Number,മുറി നമ്പർ
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},അസാധുവായ റഫറൻസ് {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},അസാധുവായ റഫറൻസ് {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
 DocType: Journal Entry Account,Payroll Entry,പേരോൾ എൻട്രി
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ഫീസ് റെക്കോർഡുകൾ കാണുക
@@ -2952,7 +2968,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Lab Test Sample,Lab Test Sample,ലാബ് ടെസ്റ്റ് സാമ്പിൾ
 DocType: Item Variant Settings,Allow Rename Attribute Value,ഗുണനാമത്തിന്റെ പ്രതീക മൂല്യം അനുവദിക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
 DocType: Restaurant,Invoice Series Prefix,ഇൻവോയ്സ് ശ്രേണി പ്രിഫിക്സ്
 DocType: Employee,Previous Work Experience,മുമ്പത്തെ ജോലി പരിചയം
@@ -2960,8 +2976,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google മാപ്സ് ഇന്റഗ്രേഷൻ പ്രാപ്തമാക്കിയിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+DocType: Subscription,Trialling,വിചാരണ
 DocType: Member,Membership Expiry Date,അംഗത്വം കാലാവധി തീയതി
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് ആയിരിക്കണം
 ,Minutes to First Response for Issues,ഇഷ്യുവിനായുള്ള ആദ്യപ്രതികരണം ലേക്കുള്ള മിനിറ്റ്
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
@@ -2980,7 +2997,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,അളവുകോൽ
 DocType: Fiscal Year,Year End Date,വർഷം അവസാന തീയതി
 DocType: Task Depends On,Task Depends On,ടാസ്ക് ആശ്രയിച്ചിരിക്കുന്നു
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,അവസരം
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,അവസരം
 DocType: Operation,Default Workstation,സ്ഥിരസ്ഥിതി വർക്ക്സ്റ്റേഷൻ
 DocType: Notification Control,Expense Claim Approved Message,ചിലവിടൽ ക്ലെയിം അംഗീകരിച്ചു സന്ദേശം
 DocType: Payment Entry,Deductions or Loss,പൂർണമായും അല്ലെങ്കിൽ നഷ്ടം
@@ -3018,7 +3035,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ശമ്പള വിടണമെന്ന് അംഗീകൃത അനുവാദ ആപ്ലിക്കേഷന് രേഖകളുമായി പൊരുത്തപ്പെടുന്നില്ല
 DocType: Campaign,Campaign-.####,കാമ്പയിൻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,അടുത്ത ഘട്ടങ്ങൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ഇൻവോയ്സ് ഉണ്ടാക്കുക
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ശേഷിക്കുന്ന പണം
@@ -3028,7 +3045,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,അവസാനിക്കുന്ന വർഷം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,കരാര് അവസാനിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,കരാര് അവസാനിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 DocType: Driver,Driver,ഡ്രൈവർ
 DocType: Vital Signs,Nutrition Values,പോഷകാഹാര മൂല്യങ്ങൾ
 DocType: Lab Test Template,Is billable,ബിൽ ചെയ്യാവുന്നതാണ്
@@ -3039,7 +3056,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),യഥാർത്ഥ ആരംഭ തീയതി (ടൈം ഷീറ്റ് വഴി)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ഈ ERPNext നിന്നുള്ള സ്വയം സൃഷ്ടിച്ചതാണ് ഒരു ഉദാഹരണം വെബ്സൈറ്റ് ആണ്
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,എയ്ജിങ് ശ്രേണി 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,മൊത്തം മുൻകൂറായി നൽകിയ തുകയേക്കാൾ കൂടുതൽ മുൻകൂർ തുകയായിരിക്കരുത്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,മൊത്തം മുൻകൂറായി നൽകിയ തുകയേക്കാൾ കൂടുതൽ മുൻകൂർ തുകയായിരിക്കരുത്
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3074,7 +3091,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,ആട്രിബ്യൂട്ട് മൂല്യങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Reason For Issuing document,രേഖ രേഖപ്പെടുത്തുന്നതിനുള്ള കാരണം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,അടുത്തത് ബന്ധപ്പെടുക നയിക്കുന്നത് ഇമെയിൽ വിലാസം തന്നെ പാടില്ല
 DocType: Tax Rule,Billing City,ബില്ലിംഗ് സിറ്റി
@@ -3091,7 +3108,8 @@
 DocType: Warranty Claim,Service Address,സേവന വിലാസം
 DocType: Asset Maintenance Task,Calibration,കാലിബ്രേഷൻ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ഒരു കമ്പനി അവധി ദിവസമാണ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures ആൻഡ് മതംതീര്ത്ഥാടനംജ്യോതിഷംഉത്സവങ്ങള്വിശ്വസിക്കാമോ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,സ്റ്റാറ്റസ് അറിയിപ്പ് വിടുക
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures ആൻഡ് മതംതീര്ത്ഥാടനംജ്യോതിഷംഉത്സവങ്ങള്വിശ്വസിക്കാമോ
 DocType: Item,Manufacture,നിര്മ്മാണം
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,സെറ്റപ്പ് കമ്പനി
 ,Lab Test Report,ലാബ് ടെസ്റ്റ് റിപ്പോർട്ട്
@@ -3107,7 +3125,6 @@
 DocType: Crop,Planting Area,നടീൽ പ്രദേശം
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ആകെ (Qty)
 DocType: Installation Note Item,Installed Qty,ഇൻസ്റ്റോൾ ചെയ്ത Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ചില അസാധുവായ ഇമെയിൽ വിലാസങ്ങൾ കാരണം ഇത് ആയിരിക്കും
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,നിങ്ങൾ ചേർത്തു
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,പരിശീലന ഫലം
@@ -3117,16 +3134,17 @@
 DocType: Products Settings,Products per Page,ഓരോ പേജിലും ഉൽപ്പന്നങ്ങൾ
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,അഥവാ
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,അഥവാ
 DocType: Sales Order,Billing Status,ബില്ലിംഗ് അവസ്ഥ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,യൂട്ടിലിറ്റി ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,യൂട്ടിലിറ്റി ചെലവുകൾ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-മുകളിൽ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,വരി # {0}: ജേണൽ എൻട്രി {1} മറ്റൊരു വൗച്ചർ പൊരുത്തപ്പെടും അക്കൗണ്ട് {2} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
 DocType: Supplier Scorecard Criteria,Criteria Weight,മാനദണ്ഡം ഭാരം
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,അംഗീകാര അറിയിപ്പ് വിടുക
 DocType: Buying Settings,Default Buying Price List,സ്ഥിരസ്ഥിതി വാങ്ങൽ വില പട്ടിക
 DocType: Payroll Entry,Salary Slip Based on Timesheet,ശമ്പള ജി Timesheet അടിസ്ഥാനമാക്കി
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,വാങ്ങൽ നിരക്ക്
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,വാങ്ങൽ നിരക്ക്
 DocType: Notification Control,Sales Order Message,സെയിൽസ് ഓർഡർ സന്ദേശം
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","കമ്പനി, കറൻസി, നടപ്പു സാമ്പത്തിക വർഷം, തുടങ്ങിയ സജ്ജമാക്കുക സ്വതേ മൂല്യങ്ങൾ"
 DocType: Payment Entry,Payment Type,പേയ്മെന്റ് തരം
@@ -3149,6 +3167,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,ഷോപ്പിംഗ് കാർട്ട് ക്രമീകരണങ്ങൾ
 DocType: Journal Entry,Accounting Entries,അക്കൗണ്ടിംഗ് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","&#39;റേറ്റ്&#39; എന്നതിനായി തിരഞ്ഞെടുത്ത വിലനിയമനം നടത്തിയാൽ, അത് വില പട്ടികയെ തിരുത്തിയെഴുതും. വിലനിയന്ത്രണ റേറ്റ് അന്തിമ നിരക്ക്, അതിനാൽ കൂടുതൽ കിഴിവരം ബാധകമാക്കരുത്. അതുകൊണ്ടുതന്നെ സെയിൽസ് ഓർഡർ, പർച്ചേസ് ഓർഡർ മുതലായ ഇടപാടുകളിൽ &#39;വിലവിവരപ്പട്ടിക&#39; എന്നതിനേക്കാൾ &#39;റേറ്റ്&#39; ഫീൽഡിൽ ഇത് ലഭ്യമാകും."
+DocType: Journal Entry,Paid Loan,പണമടച്ച വായ്പ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},എൻട്രി തനിപ്പകർപ്പ്. അംഗീകാരം റൂൾ {0} പരിശോധിക്കുക
 DocType: Journal Entry Account,Reference Due Date,റഫറൻസ് തീയതി തീയതി
 DocType: Purchase Order,Ref SQ,റഫറൻസ് ചതുരശ്ര
@@ -3165,7 +3184,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 ,To Produce,ഉത്പാദിപ്പിക്കാൻ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ശന്വളപ്പട്ടിക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} ൽ {0} വരി വേണ്ടി. {2} ഇനം നിരക്ക്, വരികൾ {3} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} ൽ {0} വരി വേണ്ടി. {2} ഇനം നിരക്ക്, വരികൾ {3} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
 DocType: Patient Service Unit,Parent Service Unit,പാരന്റ് സേവന യൂണിറ്റ്
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
 DocType: Packing Slip,Identification of the package for the delivery (for print),(പ്രിന്റ് വേണ്ടി) ഡെലിവറി പാക്കേജിന്റെ തിരിച്ചറിയൽ
@@ -3184,7 +3203,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ഡെലിവറി
 DocType: Volunteer,Weekdays,ആഴ്ച ദിനങ്ങൾ
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
 DocType: Restaurant Menu,Restaurant Menu,റെസ്റ്റോറന്റ് മെനു
@@ -3192,7 +3211,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ശാശ്വതമായ സാധനങ്ങളും സ്ഥിരസ്ഥിതി സാധനങ്ങളും അക്കൗണ്ട് സജ്ജമാക്കുക
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ശാശ്വതമായ സാധനങ്ങളും സ്ഥിരസ്ഥിതി സാധനങ്ങളും അക്കൗണ്ട് സജ്ജമാക്കുക
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ഗ്രാന്റ് അവലോകന ഇമെയിൽ അയയ്ക്കുക
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
@@ -3200,10 +3219,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,റൂം ശേഷി
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},വസ്തുവിനായി ഇതിനകം റെക്കോർഡ് നിലവിലുണ്ട് {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,റഫറൻസ്
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,മുമ്പ് സൃഷ്ടിച്ച ഇൻവോയ്സുകളുടെ റെക്കോർഡുകൾ നിങ്ങൾക്ക് നഷ്ടപ്പെടും. ഈ സബ്സ്ക്രിപ്ഷൻ പുനരാരംഭിക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുവെന്ന് ഉറപ്പാണോ?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,രജിസ്ട്രേഷൻ ഫീസ്
 DocType: Budget,Cost Center,ചെലവ് കേന്ദ്രം
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,സാക്ഷപ്പെടുത്തല് #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,സാക്ഷപ്പെടുത്തല് #
 DocType: Notification Control,Purchase Order Message,ഓർഡർ സന്ദേശം വാങ്ങുക
 DocType: Tax Rule,Shipping Country,ഷിപ്പിംഗ് രാജ്യം
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,സെയിൽസ് ഇടപാടുകളിൽ നിന്നുള്ള ഉപഭോക്താവിന്റെ ടാക്സ് ഐഡി മറയ്ക്കുക
@@ -3212,20 +3232,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","പ്രൈസിങ് റൂൾ ചില മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി, നല്കിയിട്ടുള്ള ശതമാനം define / വില പട്ടിക മാറ്റണമോ ഉണ്ടാക്കിയ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,വെയർഹൗസ് മാത്രം ഓഹരി എൻട്രി / ഡെലിവറി നോട്ട് / വാങ്ങൽ റെസീപ്റ്റ് വഴി മാറ്റാൻ കഴിയൂ
 DocType: Employee Education,Class / Percentage,ക്ലാസ് / ശതമാനം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,മാർക്കറ്റിങ് ആൻഡ് സെയിൽസ് ഹെഡ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,മാർക്കറ്റിങ് ആൻഡ് സെയിൽസ് ഹെഡ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ആദായ നികുതി
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Letterheads ലേക്ക് പോകുക
+DocType: Subscription,Cancel At End Of Period,അവസാന കാലത്ത് റദ്ദാക്കുക
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,കൈമാറാൻ ഇനങ്ങൾ ഒന്നും തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,കൈമാറാൻ ഇനങ്ങൾ ഒന്നും തിരഞ്ഞെടുത്തിട്ടില്ല
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
 DocType: Vehicle,Electric,ഇലക്ട്രിക്
 DocType: Task,% Progress,% പുരോഗതി
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",ചുവടെയുള്ള പട്ടികയിൽ &quot;അംഗീകാരം&quot; എന്ന സ്റ്റാറ്റസ് അപേക്ഷകൻ മാത്രമേ തിരഞ്ഞെടുക്കാവൂ.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,അക്കൗണ്ടിനായുള്ള അക്കൗണ്ട് നമ്പർ {0} ലഭ്യമല്ല. <br> നിങ്ങളുടെ ചാർട്ട് ഓഫ് അക്കൗണ്ട് ശരിയായി സജ്ജമാക്കുക.
 DocType: Task,Depends on Tasks,ചുമതലകൾ ആശ്രയിച്ചിരിക്കുന്നു
@@ -3240,6 +3261,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,അല്ല സ്റ്റോക്കുണ്ട്
 DocType: Volunteer,Volunteer Skills,സന്നദ്ധസേവനം
 DocType: Appraisal,HR User,എച്ച് ഉപയോക്താവ്
+DocType: Bank Guarantee,Reference Document Name,റഫറൻസ് പ്രമാണം പേര്
 DocType: Purchase Invoice,Taxes and Charges Deducted,നികുതി ചാർജുകളും വെട്ടിക്കുറയ്ക്കും
 apps/erpnext/erpnext/hooks.py +142,Issues,പ്രശ്നങ്ങൾ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},നില {0} ഒന്നാണ് ആയിരിക്കണം
@@ -3253,7 +3275,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,അതിബൃഹത്തായ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,അതിബൃഹത്തായ
+DocType: Loan,Loan Application,വായ്പ അപേക്ഷ
 DocType: Crop,Scientific Name,ശാസ്ത്രീയ നാമം
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ആകെ ഇലകൾ
 DocType: Customer,"Reselect, if the chosen contact is edited after save","സംരക്ഷിച്ചതിനുശേഷം തിരഞ്ഞെടുത്ത കോൺടാക്റ്റ് എഡിറ്റുചെയ്തിട്ടുണ്ടെങ്കിൽ, തിരഞ്ഞെടുപ്പ് മാറ്റുക"
@@ -3262,13 +3285,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ചെക്ക് നമ്പർ
 ,Sales Browser,സെയിൽസ് ബ്രൗസർ
 DocType: Journal Entry,Total Credit,ആകെ ക്രെഡിറ്റ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,പ്രാദേശിക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),വായ്പകളും അഡ്വാൻസുകളും (ആസ്തികൾ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,കടക്കാർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,വലുത്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,വലുത്
 DocType: Homepage Featured Product,Homepage Featured Product,ഹോംപേജ് ഫീച്ചർ ഉൽപ്പന്ന
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,എല്ലാ അസസ്മെന്റ് ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,എല്ലാ അസസ്മെന്റ് ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,പുതിയ വെയർഹൗസ് പേര്
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),ആകെ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ടെറിട്ടറി
@@ -3289,9 +3312,10 @@
 DocType: Fees,Fees,ഫീസ്
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,മറ്റൊരു ഒരേ കറൻസി പരിവർത്തനം ചെയ്യാൻ വിനിമയ നിരക്ക് വ്യക്തമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ക്വട്ടേഷൻ {0} റദ്ദാക്കി
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,മൊത്തം തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,മൊത്തം തുക
 DocType: Sales Partner,Targets,ടാർഗെറ്റ്
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,കമ്പനി വിവര ഫയലിൽ SIREN നമ്പർ രജിസ്റ്റർ ചെയ്യുക
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 DocType: Price List,Price List Master,വില പട്ടിക മാസ്റ്റർ
 DocType: GST Account,CESS Account,അക്കൗണ്ട് കുറവ്
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
@@ -3300,6 +3324,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,രോഗിയെ തിരഞ്ഞെടുക്കുക
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,പാരാമീറ്റർ നാമം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,മാത്രം നില അപ്ലിക്കേഷനുകൾ വിടുക &#39;അംഗീകരിച്ചത്&#39; ഉം &#39;നിരസിച്ചു സമർപ്പിക്കാൻ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര് വരി {0} ലെ നിർബന്ധമായും
 DocType: Homepage,Products to be shown on website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കാണിക്കേണ്ട ഉല്പന്നങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഉപഭോക്തൃ ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -3333,14 +3358,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,എല്ലാ ബില്ലിംഗ് പ്രവർത്തനങ്ങൾക്കും ഇൻവോയ്സ് ഇതിനകം സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},പേര് പിശക്: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ധനകാര്യ ചെലവ്
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ജീവനക്കാരൻ {0} വേണ്ടി ഹാജർ ഇതിനകം മലിനമായിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ജീവനക്കാരൻ {0} വേണ്ടി ഹാജർ ഇതിനകം മലിനമായിരിക്കുന്നു
 DocType: Packing Slip,If more than one package of the same type (for print),(പ്രിന്റ് വേണ്ടി) ഒരേ തരത്തിലുള്ള ഒന്നിലധികം പാക്കേജ് എങ്കിൽ
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,റെസ്റ്റോറന്റ് ക്രമീകരണങ്ങളിൽ സ്ഥിരസ്ഥിതി ഉപഭോക്താവിനെ സജ്ജീകരിക്കുക
 ,Salary Register,ശമ്പള രജിസ്റ്റർ
 DocType: Warehouse,Parent Warehouse,രക്ഷാകർതൃ വെയർഹൗസ്
-DocType: C-Form Invoice Detail,Net Total,നെറ്റ് ആകെ
+DocType: Subscription,Net Total,നെറ്റ് ആകെ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},സ്വതേ BOM ലേക്ക് ഇനം {0} കണ്ടില്ല പദ്ധതി {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,വിവിധ വായ്പാ തരം നിർവചിക്കുക
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,വിവിധ വായ്പാ തരം നിർവചിക്കുക
 DocType: Bin,FCFS Rate,അരക്ഷിതാവസ്ഥയിലും റേറ്റ്
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,നിലവിലുള്ള തുക
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),സമയം (മിനിറ്റിനുള്ളിൽ)
@@ -3372,11 +3397,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,റൂട്ട് അക്കൗണ്ട് ഒരു ഗ്രൂപ്പ് ആയിരിക്കണം
 DocType: Drug Prescription,Drug Prescription,മരുന്ന് കുറിപ്പടി
 DocType: Fees,FEE.,ഫീസ്.
-DocType: Employee Loan,Repaid/Closed,പ്രതിഫലം / അടച്ചു
+DocType: Loan,Repaid/Closed,പ്രതിഫലം / അടച്ചു
 DocType: Item,Total Projected Qty,ആകെ പ്രൊജക്റ്റുചെയ്തു അളവ്
 DocType: Monthly Distribution,Distribution Name,വിതരണ പേര്
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{0} {2} for accounting entries ചെയ്യേണ്ട ഇനം {0} എന്നതിന് മൂല്യനിർണ്ണയ നിരക്ക് കണ്ടെത്തിയില്ല. {1} പൂജ്യം മൂല്യം പൂരിപ്പിച്ച വസ്തു എന്ന സ്ഥാനത്തേക്കാണ് ഇനം വരുന്നതെങ്കിൽ, അത് {1} ഇന പട്ടികയിൽ പരാമർശിക്കുക. അല്ലെങ്കിൽ, ഇനത്തിനായുള്ള ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ട്രാൻസാക്ഷൻ ഉണ്ടാക്കുക അല്ലെങ്കിൽ ഇനം റിക്കോർഡിലെ മൂല്യനിർണ്ണയ നിരക്ക് പരാമർശിക്കുക, തുടർന്ന് ഈ എൻട്രി സമർപ്പിക്കുന്നതിൽ / സമർപ്പിക്കുന്നതിനായി ശ്രമിക്കുക"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 DocType: Course,Course Code,കോഴ്സ് കോഡ്
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
 DocType: POS Settings,Use POS in Offline Mode,ഓഫ്സ് മോഡിൽ POS ഉപയോഗിക്കുക
@@ -3396,16 +3420,15 @@
 DocType: Purchase Invoice,Deemed Export,എക്സ്പോർട്ട് ഡിമാൻഡ്
 DocType: Stock Entry,Material Transfer for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,കിഴിവും ശതമാനം ഒരു വില പട്ടിക നേരെ അല്ലെങ്കിൽ എല്ലാ വില പട്ടിക വേണ്ടി ഒന്നുകിൽ പ്രയോഗിക്കാൻ കഴിയും.
-DocType: Subscription,Half-yearly,അർദ്ധവാർഷികം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,ഇതിനകം നിങ്ങൾ വിലയിരുത്തൽ മാനദണ്ഡങ്ങൾ {} വേണ്ടി വിലയിരുത്തി ചെയ്തു.
 DocType: Vehicle Service,Engine Oil,എഞ്ചിൻ ഓയിൽ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},സൃഷ്ടികൾ ഓർഡറുകൾ സൃഷ്ടിച്ചു: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},സൃഷ്ടികൾ ഓർഡറുകൾ സൃഷ്ടിച്ചു: {0}
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
-DocType: Employee Loan,Loan Details,വായ്പ വിശദാംശങ്ങൾ
+DocType: Loan,Loan Details,വായ്പ വിശദാംശങ്ങൾ
 DocType: Company,Default Inventory Account,സ്ഥിരസ്ഥിതി ഇൻവെന്ററി അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ഫോളിയോ നമ്പറുകൾ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
@@ -3417,19 +3440,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,വിളവെടുപ്പ് വളരുന്ന ഭൂവിഭാഗങ്ങളിലേക്കുള്ള ഒരു ലിങ്ക്
 DocType: Account,Root Type,റൂട്ട് തരം
 DocType: Item,FIFO,fifo തുറക്കാന്കഴിയില്ല
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},വരി # {0}: {1} ഇനം വേണ്ടി {2} അധികം മടങ്ങിപ്പോകാനാകില്ല
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},വരി # {0}: {1} ഇനം വേണ്ടി {2} അധികം മടങ്ങിപ്പോകാനാകില്ല
 DocType: Item Group,Show this slideshow at the top of the page,പേജിന്റെ മുകളിലുള്ള ഈ സ്ലൈഡ്ഷോ കാണിക്കുക
 DocType: BOM,Item UOM,ഇനം UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ഡിസ്കൗണ്ട് തുക (കമ്പനി കറന്സി) ശേഷം നികുതിയും
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ടാർജറ്റ് വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
 DocType: Cheque Print Template,Primary Settings,പ്രാഥമിക ക്രമീകരണങ്ങൾ
 DocType: Purchase Invoice,Select Supplier Address,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ജീവനക്കാരെ ചേർക്കുക
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ജീവനക്കാരെ ചേർക്കുക
 DocType: Purchase Invoice Item,Quality Inspection,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,എക്സ്ട്രാ ചെറുകിട
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,എക്സ്ട്രാ ചെറുകിട
 DocType: Company,Standard Template,സ്റ്റാൻഡേർഡ് ഫലകം
 DocType: Training Event,Theory,സിദ്ധാന്തം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 DocType: Payment Request,Mute Email,നിശബ്ദമാക്കുക ഇമെയിൽ
@@ -3449,11 +3472,10 @@
 DocType: SMS Log,No of Sent SMS,അയയ്ക്കുന്ന എസ്എംഎസ് ഒന്നും
 DocType: Antibiotic,Healthcare Administrator,ഹെൽത്ത് അഡ്മിനിസ്ട്രേറ്റർ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ഒരു ടാർഗെറ്റ് സജ്ജമാക്കുക
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
 DocType: Dosage Strength,Dosage Strength,മരുന്നുകളുടെ ശക്തി
 DocType: Account,Expense Account,ചിലവേറിയ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,സോഫ്റ്റ്വെയർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,കളർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,കളർ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,അസസ്മെന്റ് പദ്ധതി മാനദണ്ഡം
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,തിരഞ്ഞെടുത്ത ഇനം കാലഹരണപ്പെടുന്ന തീയതി നിർബന്ധമാണ്
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ തടയുക
@@ -3466,18 +3488,18 @@
 DocType: Patient,Personal and Social History,വ്യക്തിപരവും സാമൂഹ്യവുമായ ചരിത്രം
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ഉപയോക്താവ് {0} സൃഷ്ടിച്ചു
 DocType: Fee Schedule,Fee Breakup for each student,ഓരോ വിദ്യാർത്ഥിക്കും ഫീസ് ഒടിക്കാൻ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,സമമായി മാസം ഉടനീളമുള്ള ലക്ഷ്യങ്ങളിലൊന്നാണ് വിതരണം ചെയ്യാൻ പ്രതിമാസ വിതരണം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,കോഡ് മാറ്റുക
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
 DocType: Stock Reconciliation,SR/,എസ്.ആർ /
 DocType: Vehicle,Diesel,ഡീസൽ
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Purchase Invoice,Availed ITC Cess,ഐടിസി സെസ്സ് ഉപയോഗിച്ചു
 ,Student Monthly Attendance Sheet,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ ഷീറ്റ്
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,വിൽപ്പനയ്ക്കായി മാത്രം ഷിപ്പിംഗ് നിയമം ബാധകമാക്കുന്നു
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,പ്രോജക്ട് ആരംഭ തീയതി
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,എഴു
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,എഴു
 DocType: Rename Tool,Rename Log,രേഖ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് അല്ലെങ്കിൽ കോഴ്സ് ഷെഡ്യൂൾ നിർബന്ധമായും
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് അല്ലെങ്കിൽ കോഴ്സ് ഷെഡ്യൂൾ നിർബന്ധമായും
@@ -3498,7 +3520,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,നിങ്ങൾ വാങ്ങുന്നതോ വിൽക്കുന്നതോ ആയ ഉൽപ്പന്നങ്ങളോ സേവനങ്ങളോ ലിസ്റ്റ് ചെയ്യുക.
 DocType: Water Analysis,Storage Temperature,സംഭരണ താപനില
 DocType: Employee Attendance Tool,Unmarked Attendance,അടയാളപ്പെടുത്താത്ത ഹാജർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ഗവേഷകനും
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ഗവേഷകനും
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,പ്രോഗ്രാം എൻറോൾമെന്റ് ടൂൾ സ്റ്റുഡന്റ്
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},ടാസ്ക്റ്റിന് അവസാന തീയതിക്ക് കുറവായ ആരംഭ തീയതി കുറവായിരിക്കണം {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,പേര് അല്ലെങ്കിൽ ഇമെയിൽ നിർബന്ധമാണ്
@@ -3511,7 +3533,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡേർഡ് നിലയുമുണ്ട്, കൂടാതെ ഈ വിതരണക്കാരന്റെ RFQ കളും മുൻകരുതൽ നൽകണം."
 DocType: Chapter,Non Profit Manager,ലാഭേച്ഛയില്ലാത്ത മാനേജർ
 DocType: BOM,Total Cost(Company Currency),മൊത്തം ചെലവ് (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,സീരിയൽ ഇല്ല {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,സീരിയൽ ഇല്ല {0} സൃഷ്ടിച്ചു
 DocType: Homepage,Company Description for website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കമ്പനിയുടെ വിവരണം
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ഉപഭോക്താക്കൾക്ക് സൗകര്യത്തിനായി, ഈ കോഡുകൾ ഇൻവോയ്സുകളും ഡെലിവറി കുറിപ്പുകൾ പോലെ പ്രിന്റ് രൂപങ്ങളിലും ഉപയോഗിക്കാൻ കഴിയും"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier പേര്
@@ -3521,11 +3543,10 @@
 DocType: Employee,You can enter any date manually,"നിങ്ങൾ സ്വയം ഏതെങ്കിലും തീയതി നൽകാം,"
 DocType: Healthcare Settings,Result Printed,ഫലം പ്രിന്റ് ചെയ്തു
 DocType: Asset Category Account,Depreciation Expense Account,മൂല്യത്തകർച്ച ചിലവേറിയ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,പരിശീലന കാലഖട്ടം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} കാണുക
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,പരിശീലന കാലഖട്ടം
 DocType: Customer Group,Only leaf nodes are allowed in transaction,മാത്രം ഇല നോഡുകൾ ഇടപാട് അനുവദനീയമാണ്
 DocType: Project,Total Costing Amount (via Timesheets),ആകെ ചെലവ് തുക (ടൈംഷെറ്റുകൾ വഴി)
-DocType: Employee Advance,Expense Approver,ചിലവേറിയ Approver
+DocType: Department,Expense Approver,ചിലവേറിയ Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,വരി {0}: കസ്റ്റമർ നേരെ മുൻകൂർ ക്രെഡിറ്റ് ആയിരിക്കണം
 DocType: Project,Hourly,മണിക്കൂറിൽ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ഗ്രൂപ്പ് നോൺ-ഗ്രൂപ്പ്
@@ -3535,7 +3556,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,തീയതി-ചെയ്യുന്നതിനായി
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
 DocType: Accounts Settings,Make Payment via Journal Entry,ജേർണൽ എൻട്രി വഴി പേയ്മെന്റ് നിർമ്മിക്കുക
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,പ്രിന്റ്
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,പ്രിന്റ്
 DocType: Item,Inspection Required before Delivery,ഡെലിവറി മുമ്പ് ആവശ്യമായ ഇൻസ്പെക്ഷൻ
 DocType: Item,Inspection Required before Purchase,വാങ്ങൽ മുമ്പ് ആവശ്യമായ ഇൻസ്പെക്ഷൻ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,തീർച്ചപ്പെടുത്തിയിട്ടില്ലാത്ത പ്രവർത്തനങ്ങൾ
@@ -3545,7 +3566,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,കുറഞ്ഞ ഓർഡർ ക്വാളിറ്റി
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,നിങ്ങളുടെ ഓർഗനൈസേഷൻ
 DocType: Fee Component,Fees Category,ഫീസ് വർഗ്ഗം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ശാരീരിക
 DocType: Supplier Scorecard,Notify Employee,തൊഴിലുടമയെ അറിയിക്കുക
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,അന്വേഷണത്തിന് സ്രോതസ് പ്രചാരണം എങ്കിൽ പ്രചാരണത്തിന്റെ പേര് നൽകുക
@@ -3555,7 +3576,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,പുനഃക്രമീകരിക്കുക ലെവൽ
 DocType: Company,Chart Of Accounts Template,അക്കൗണ്ടുകൾ ഫലകം ചാർട്ട്
 DocType: Attendance,Attendance Date,ഹാജർ തീയതി
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,വരുമാനമുള്ളയാളും കിഴിച്ചുകൊണ്ടു അടിസ്ഥാനമാക്കി ശമ്പളം ഖണ്ഡങ്ങളായി.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Purchase Invoice Item,Accepted Warehouse,അംഗീകരിച്ച വെയർഹൗസ്
@@ -3563,10 +3584,11 @@
 DocType: Item,Valuation Method,മൂലധനം രീതിയുടെ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,മാർക് ഹാഫ് ഡേ
 DocType: Sales Invoice,Sales Team,സെയിൽസ് ടീം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,എൻട്രി തനിപ്പകർപ്പെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,എൻട്രി തനിപ്പകർപ്പെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,സമർപ്പിക്കുന്നതിനുമുമ്പ് ബെനിഫിഷ്യന്റെ പേര് നൽകുക.
 DocType: Program Enrollment Tool,Get Students,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Serial No,Under Warranty,വാറന്റി കീഴിൽ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[പിശക്]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[പിശക്]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,നിങ്ങൾ സെയിൽസ് ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 ,Employee Birthday,ജീവനക്കാരുടെ ജന്മദിനം
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,പൂർത്തിയായ നന്നാക്കലിനായി ദയവായി പൂർത്തിയാക്കൽ തീയതി തിരഞ്ഞെടുക്കുക
@@ -3585,7 +3607,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ഉപ കരാറിനായി കരുതി വച്ചിരിക്കുന്നു
 DocType: Payment Reconciliation Invoice,Invoice Number,ഇൻവോയിസ് നമ്പർ
 DocType: Shopping Cart Settings,Orders,ഉത്തരവുകൾ
-DocType: Employee Leave Approver,Leave Approver,Approver വിടുക
+DocType: Department,Leave Approver,Approver വിടുക
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,അസസ്മെന്റ് ഗ്രൂപ്പ് പേര്
@@ -3630,7 +3652,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,ഹബ് ട്രാക്ക് ചെയ്ത ഇനം
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT യഥാർത്ഥ
 DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ഈ ഇമെയിൽ ഓട്ടോജെനറേറ്റഡ് ആണ്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
 DocType: Program Enrollment,Boarding Student,ബോർഡിംഗ് വിദ്യാർത്ഥി
 DocType: Asset,Expected Value After Useful Life,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം
@@ -3655,22 +3676,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},ഹാജർ റെക്കോർഡ് {0} സ്റ്റുഡന്റ് {1} നേരെ നിലവിലുണ്ട്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,കാരണം ആസ്തി സംസ്കരണവുമായി ലേക്ക് പുറത്തായി മൂല്യത്തകർച്ച
-DocType: Member,Member,അംഗം
+DocType: Loan,Member,അംഗം
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,വിലാസങ്ങൾ നിയന്ത്രിക്കുക
 DocType: Work Order Item,Work Order Item,വർക്ക് ഓർഡർ ഇനം
 DocType: Pricing Rule,Item Code,ഇനം കോഡ്
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിവരങ്ങൾ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
 DocType: Agriculture Analysis Criteria,Agriculture Manager,കൃഷി മാനേജർ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
 DocType: Supplier Scorecard Period,Variables,വേരിയബിളുകൾ
 DocType: Employee Internal Work History,Employee Internal Work History,ജീവനക്കാർ ആന്തരിക വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
 DocType: Cheque Print Template,Cheque Size,ചെക്ക് വലിപ്പം
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,{0} അല്ല സ്റ്റോക്ക് സീരിയൽ ഇല്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,{0} അല്ല സ്റ്റോക്ക് സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ഇടപാടുകൾ വില്ക്കുകയും നികുതി ടെംപ്ലേറ്റ്.
 DocType: Sales Invoice,Write Off Outstanding Amount,നിലവിലുള്ള തുക എഴുതുക
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},അക്കൗണ്ട് {0} {1} കമ്പനി പൊരുത്തപ്പെടുന്നില്ല
@@ -3679,7 +3700,6 @@
 DocType: Stock Settings,Default Stock UOM,സ്വതേ സ്റ്റോക്ക് UOM
 DocType: Asset,Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,മൊത്തം മൊത്തം
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},{0}: ജീവനക്കാരുടെ വായ്പ നേരെ
 DocType: Landed Cost Item,Receipt Document,രസീത് പ്രമാണം
 DocType: Employee Education,School/University,സ്കൂൾ / യൂണിവേഴ്സിറ്റി
 DocType: Payment Request,Reference Details,റഫറൻസ് വിശദാംശങ്ങൾ
@@ -3690,7 +3710,7 @@
 DocType: Asset,Double Declining Balance,ഇരട്ട കുറയുന്ന
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,അടച്ച ഓർഡർ റദ്ദാക്കാൻ സാധിക്കില്ല. റദ്ദാക്കാൻ Unclose.
 DocType: Student Guardian,Father,പിതാവ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
 DocType: Bank Reconciliation,Bank Reconciliation,ബാങ്ക് അനുരഞ്ജനം
 DocType: Attendance,On Leave,അവധിയിലാണ്
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
@@ -3704,8 +3724,8 @@
 DocType: Lead,Lower Income,ലോവർ ആദായ
 DocType: Restaurant Order Entry,Current Order,നിലവിലെ ഓർഡർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,പ്രോഗ്രാമിലേക്ക് പോകുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ഈ തീയതി മുതൽ&#39; &#39;തീയതി ആരംഭിക്കുന്ന&#39; ശേഷം ആയിരിക്കണം
@@ -3729,7 +3749,6 @@
 DocType: Payment Terms Template,Payment Terms,പേയ്മെന്റ് നിബന്ധനകൾ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,മിനിറ്റ്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
 DocType: Chapter,Meetup Embed HTML,മീറ്റ്അപ് എംബഡ് HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,സപ്ലയർമാർക്ക് പോകുക
@@ -3749,30 +3768,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},{0} അല്ല തരത്തിലുള്ള ക്വട്ടേഷൻ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,മെയിൻറനൻസ് ഷെഡ്യൂൾ ഇനം
 DocType: Sales Order,%  Delivered,% കൈമാറി
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന അയയ്ക്കാൻ വിദ്യാർത്ഥിക്ക് ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന അയയ്ക്കാൻ വിദ്യാർത്ഥിക്ക് ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
 DocType: Patient,Medical History,ആരോഗ്യ ചരിത്രം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ബാങ്ക് ഓവർഡ്രാഫ്റ്റിലായില്ല അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ബാങ്ക് ഓവർഡ്രാഫ്റ്റിലായില്ല അക്കൗണ്ട്
 DocType: Patient,Patient ID,രോഗിയുടെ ഐഡി
 DocType: Physician Schedule,Schedule Name,ഷെഡ്യൂൾ പേര്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,ശമ്പളം വ്യതിചലിപ്പിച്ചു
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,എല്ലാ വിതരണക്കാരെയും ചേർക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,എല്ലാ വിതരണക്കാരെയും ചേർക്കുക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,വരി # {0}: തുക കുടിശ്ശിക തുക അധികമാകരുത് കഴിയില്ല.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ബ്രൗസ് BOM ലേക്ക്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,അടച്ച് വായ്പകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,അടച്ച് വായ്പകൾ
 DocType: Purchase Invoice,Edit Posting Date and Time,എഡിറ്റ് പോസ്റ്റിംഗ് തീയതിയും സമയവും
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},അസറ്റ് വർഗ്ഗം {0} അല്ലെങ്കിൽ കമ്പനി {1} ൽ മൂല്യത്തകർച്ച ബന്ധപ്പെട്ട അക്കൗണ്ടുകൾ സജ്ജമാക്കുക
 DocType: Lab Test Groups,Normal Range,സാധാരണ ശ്രേണി
 DocType: Academic Term,Academic Year,അധ്യയന വർഷം
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,വിൽക്കൽ ലഭ്യമാണ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,അവശേഷിക്കുന്ന
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
+DocType: Loan,Loan Account,ലോൺ അക്കൗണ്ട്
 DocType: Purchase Invoice,GST Details,GST വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},വിതരണക്കമ്പനിയായ {0} അയച്ച ഇമെയിൽ
 DocType: Item,Default Sales Unit of Measure,മെഷർ സെലക്ട് സെൽപ്പ് യൂണിറ്റ്
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,അധ്യയന വർഷം:
+DocType: Subscription,Past Due Date,കഴിഞ്ഞ കുറച്ചു തീയതി
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ഇനത്തിന് പകരം മറ്റൊന്ന് സജ്ജീകരിക്കാൻ അനുവദിക്കരുത് {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
@@ -3785,7 +3806,7 @@
 DocType: Patient Appointment,Patient Appointment,രോഗി നിയമനം
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,റോൾ അംഗീകരിക്കുന്നതിൽ ഭരണം ബാധകമാകുന്നതാണ് പങ്ക് അതേ ആകും കഴിയില്ല
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ഈ ഇമെയിൽ ഡൈജസ്റ്റ് നിന്ന് അൺസബ്സ്ക്രൈബ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,വഴി വിതരണക്കാരെ നേടുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,വഴി വിതരണക്കാരെ നേടുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ഇനത്തിനായുള്ള {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,കോഴ്സിലേക്ക് പോകുക
 DocType: Accounts Settings,Show Inclusive Tax In Print,അച്ചടിച്ച ഇൻകമിങ് ടാക്സ് കാണിക്കുക
@@ -3793,10 +3814,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,സന്ദേശം അയച്ചു
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ ആയി സജ്ജമാക്കാൻ കഴിയില്ല
 DocType: C-Form,II,രണ്ടാം
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ദയവായി വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,വില പട്ടിക കറൻസി ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Purchase Invoice Item,Net Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 DocType: Physician,Physician Schedules,വൈദ്യചികിത്സ സമയക്രമങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,മൊത്തം മുൻകൂർ തുകയിൽ കൂടുതൽ മുൻകൂർ തുകയായിരിക്കില്ല
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,മൊത്തം മുൻകൂർ തുകയിൽ കൂടുതൽ മുൻകൂർ തുകയായിരിക്കില്ല
 DocType: Salary Slip,Hour Rate,അന്ത്യസമയം റേറ്റ്
 DocType: Stock Settings,Item Naming By,തന്നെയാണ നാമകരണം ഇനം
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ശേഷം ഇതുവരെ ലഭിച്ചിട്ടുള്ള മറ്റൊരു കാലയളവ് സമാപന എൻട്രി
@@ -3814,6 +3836,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
 DocType: BOM,Inspection Required,ഇൻസ്പെക്ഷൻ ആവശ്യമുണ്ട്
 DocType: Purchase Invoice Item,PR Detail,പി ആർ വിശദാംശം
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,സമർപ്പിക്കുന്നതിനു മുമ്പായി ബാങ്ക് ഗ്യാരണ്ടി നമ്പർ നൽകുക.
 DocType: Driving License Category,Class,ക്ലാസ്
 DocType: Sales Order,Fully Billed,പൂർണ്ണമായി ഈടാക്കൂ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ഒരു ഇനം ടെംപ്ലേറ്റ് ഉപയോഗിച്ച് വർക്ക് ഓർഡർ ഉയർത്താൻ കഴിയില്ല
@@ -3824,7 +3847,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),പാക്കേജിന്റെ ആകെ ഭാരം. മൊത്തം ഭാരം + പാക്കേജിംഗ് മെറ്റീരിയൽ ഭാരം സാധാരണയായി. (പ്രിന്റ് വേണ്ടി)
 DocType: Assessment Plan,Program,പ്രോഗ്രാം
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ഈ പങ്ക് ഉപയോക്താക്കൾ മരവിച്ച അക്കൗണ്ടുകൾ സജ്ജമാക്കാനും സൃഷ്ടിക്കുന്നതിനും / ശീതീകരിച്ച അക്കൗണ്ടുകൾ നേരെ അക്കൗണ്ടിങ് എൻട്രികൾ പരിഷ്ക്കരിക്കുക അനുവദിച്ചിരിക്കുന്ന
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ദയവായി വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
 DocType: Serial No,Is Cancelled,റദ്ദാക്കി മാത്രമാവില്ലല്ലോ
 DocType: Student Group,Group Based On,ഗ്രൂപ്പ് അടിസ്ഥാനമാക്കിയുള്ള
 DocType: Student Group,Group Based On,ഗ്രൂപ്പ് അടിസ്ഥാനമാക്കിയുള്ള
@@ -3836,9 +3858,10 @@
 DocType: Cheque Print Template,Cheque Height,ചെക്ക് ഉയരം
 DocType: Supplier,Supplier Details,വിതരണക്കാരൻ വിശദാംശങ്ങൾ
 DocType: Setup Progress,Setup Progress,സെറ്റപ്പ് പുരോഗതി
+DocType: Expense Claim,Approval Status,അംഗീകാരം അവസ്ഥ
 DocType: Hub Settings,Publish Items to Hub,ഹബ് വരെ ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},മൂല്യം നിന്ന് വരി {0} മൂല്യം വരെ താഴെ ആയിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,വയർ ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,വയർ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,എല്ലാം പരിശോധിക്കുക
 ,Issued Items Against Work Order,വർക്ക് ഓർഡർക്കെതിരെയുള്ള ഇഷ്യു ചെയ്ത ഇനങ്ങൾ
 DocType: Vehicle Log,Invoice Ref,ഇൻവോയ്സ് റഫറൻസ്
@@ -3869,12 +3892,11 @@
 DocType: Customs Tariff Number,Tariff Number,താരിഫ് നമ്പർ
 DocType: Work Order Item,Available Qty at WIP Warehouse,വിപ് വെയർഹൗസ് ലഭ്യമാണ് അളവ്
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},സീരിയൽ ഇല്ല {0} സംഭരണശാല {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},സീരിയൽ ഇല്ല {0} സംഭരണശാല {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,കുറിപ്പ്: സിസ്റ്റം ഇനം വേണ്ടി ഡെലിവറി-കടന്നു-ബുക്കിങ് പരിശോധിക്കില്ല {0} അളവ് അല്ലെങ്കിൽ തുക 0 പോലെ
 DocType: Notification Control,Quotation Message,ക്വട്ടേഷൻ സന്ദേശം
-DocType: Employee Loan,Employee Loan Application,ജീവനക്കാരുടെ ലോൺ അപ്ലിക്കേഷൻ
 DocType: Issue,Opening Date,തീയതി തുറക്കുന്നു
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,ആദ്യം രോഗിയെ രക്ഷിക്കൂ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,ആദ്യം രോഗിയെ രക്ഷിക്കൂ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,ഹാജർ വിജയകരമായി അടയാളപ്പെടുത്തി.
 DocType: Program Enrollment,Public Transport,പൊതു ഗതാഗതം
 DocType: Soil Texture,Silt Composition (%),സിൽറ്റ് കോമ്പോസിഷൻ (%)
@@ -3893,7 +3915,7 @@
 ,Item Balance (Simple),ഐറ്റം ബാലൻസ് (സിമ്പിൾ)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,വിതരണക്കാരും ഉയര്ത്തുന്ന ബില്ലുകള്.
 DocType: POS Profile,Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ഡെബിറ്റ് നോട്ട് ശാരീരിക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ഡെബിറ്റ് നോട്ട് ശാരീരിക
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,കിഴിവും തുക
 DocType: Purchase Invoice,Return Against Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ് എഗെൻസ്റ്റ് മടങ്ങുക
 DocType: Item,Warranty Period (in days),(ദിവസങ്ങളിൽ) വാറന്റി കാലാവധി
@@ -3915,6 +3937,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
 DocType: Sales Invoice Item,Delivered Qty,കൈമാറി Qty
 DocType: Assessment Plan,Assessment Plan,അസസ്മെന്റ് പദ്ധതി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ജേണൽ എൻട്രി റിവേഴ്സ് ചെയ്യുക
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ഉപഭോക്താവ് {0} സൃഷ്ടിച്ചു.
 DocType: Stock Settings,Limit Percent,ശതമാനം പരിമിതപ്പെടുത്തുക
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ഏതൊരു വെയർഹൌസിലും നിലവിൽ സ്റ്റോക്കില്ല
@@ -3928,14 +3951,15 @@
 DocType: Journal Entry,Stock Entry,ഓഹരി എൻട്രി
 DocType: Payment Entry,Payment References,പേയ്മെന്റ് അവലംബം
 DocType: C-Form,C-FORM-,സി-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ഇടവേള ഫീൽഡിനുള്ള ഇടവേളകളുടെ എണ്ണം ഉദാ. ഇടവേള &#39;ഡേയ്സ്&#39;, ബില്ലിംഗ് ഇന്റർവൽ കൗണ്ട് 3 എന്നിവയാണെങ്കിൽ, ഇൻവോയ്സുകൾ എല്ലാ 3 ദിവസത്തിലും സൃഷ്ടിക്കപ്പെടും."
 DocType: Vehicle,Insurance Details,ഇൻഷുറൻസ് വിശദാംശങ്ങൾ
 DocType: Account,Payable,അടയ്ക്കേണ്ട
 DocType: Share Balance,Share Type,പങ്കിടൽ തരം
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),കടക്കാർ ({0})
 DocType: Pricing Rule,Margin,മാർജിൻ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,പുതിയ ഉപഭോക്താക്കളെ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,മൊത്തം ലാഭം %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,മൊത്തം ലാഭം %
 DocType: Appraisal Goal,Weightage (%),വെയിറ്റേജ് (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS പ്രൊഫൈൽ മാറ്റുക
 DocType: Bank Reconciliation Detail,Clearance Date,ക്ലിയറൻസ് തീയതി
@@ -3945,10 +3969,11 @@
 DocType: Lead,Address Desc,DESC വിലാസ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,പാർട്ടി നിർബന്ധമായും
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},മറ്റ് വരികളിലെ തനിപ്പകർപ്പായ തീയതികൾ ഉള്ള വരികൾ കണ്ടെത്തി: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},മറ്റ് വരികളിലെ തനിപ്പകർപ്പായ തീയതികൾ ഉള്ള വരികൾ കണ്ടെത്തി: {list}
 DocType: Topic,Topic Name,വിഷയം പേര്
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ലെവൽ അംഗീകാര അറിയിപ്പ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് സജ്ജീകരിക്കുക.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,കച്ചവടവും അല്ലെങ്കിൽ വാങ്ങുന്നതിനു കുറഞ്ഞത് ഒരു തിരഞ്ഞെടുത്ത വേണം
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ജീവനക്കാരുടെ മുൻകൂറായി ലഭിക്കാൻ ഒരു ജീവനക്കാരനെ തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ജീവനക്കാരുടെ മുൻകൂറായി ലഭിക്കാൻ ഒരു ജീവനക്കാരനെ തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,സാധുതയുള്ള ഒരു തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,നിങ്ങളുടെ ബിസിനസ്സ് സ്വഭാവം തിരഞ്ഞെടുക്കുക.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3967,7 +3992,7 @@
 DocType: Asset Movement,Source Warehouse,ഉറവിട വെയർഹൗസ്
 DocType: Installation Note,Installation Date,ഇന്സ്റ്റലേഷന് തീയതി
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ലഡ്ജർ പങ്കിടുക
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,വിൽപ്പന ഇൻവോയ്സ് {0} സൃഷ്ടിച്ചു
 DocType: Employee,Confirmation Date,സ്ഥിരീകരണം തീയതി
 DocType: C-Form,Total Invoiced Amount,ആകെ Invoiced തുക
@@ -3976,7 +4001,7 @@
 DocType: Account,Accumulated Depreciation,മൊത്ത വിലയിടിവ്
 DocType: Supplier Scorecard Scoring Standing,Standing Name,സ്റ്റാൻഡിംഗ് നെയിം
 DocType: Stock Entry,Customer or Supplier Details,കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ വിവരങ്ങൾ
-DocType: Employee Loan Application,Required by Date,തീയതി പ്രകാരം ആവശ്യമാണ്
+DocType: Loan Application,Required by Date,തീയതി പ്രകാരം ആവശ്യമാണ്
 DocType: Lead,Lead Owner,ലീഡ് ഉടമ
 DocType: Production Plan,Sales Orders Detail,സെയിൽസ് ഓർഡറുകൾ വിശദാംശം
 DocType: Bin,Requested Quantity,അഭ്യർത്ഥിച്ചു ക്വാണ്ടിറ്റി
@@ -3989,10 +4014,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ഗ്രോസ് പേ - ആകെ കിഴിച്ചുകൊണ്ടു - വായ്പാ തിരിച്ചടവ്
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,ഇപ്പോഴത്തെ BOM ലേക്ക് ന്യൂ BOM ഒന്നുതന്നെയായിരിക്കരുത്
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ശമ്പള ജി ഐഡി
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,വിവിധ വകഭേദങ്ങൾ
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,കൈമാറി {0}%
+DocType: Subscription,Trial Period Start Date,ട്രയൽ കാലയളവ് ആരംഭ തീയതി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,മറ്റൊരു ഉപയോക്താവായി ലോഗിൻ ചെയ്യുക.
@@ -4013,12 +4039,11 @@
 DocType: Student Guardian,Student Guardian,സ്റ്റുഡന്റ് ഗാർഡിയൻ
 DocType: Member,Member Name,അംഗത്തിന്റെ പേര്
 DocType: Stock Settings,Use Naming Series,പേര് നൽകൽ സീരീസ് ഉപയോഗിക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,മൂലധനം തരം ചാർജ് സഹായകം ആയി അടയാളപ്പെടുത്തി കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,മൂലധനം തരം ചാർജ് സഹായകം ആയി അടയാളപ്പെടുത്തി കഴിയില്ല
 DocType: POS Profile,Update Stock,സ്റ്റോക്ക് അപ്ഡേറ്റ്
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,സബ്സ്ക്രിപ്ഷനിൽ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ഇനങ്ങളുടെ വ്യത്യസ്ത UOM തെറ്റായ (ആകെ) മൊത്തം ഭാരം മൂല്യം നയിക്കും. ഓരോ ഇനത്തിന്റെ മൊത്തം ഭാരം ഇതേ UOM ഉണ്ടു എന്ന് ഉറപ്പു വരുത്തുക.
 DocType: Membership,Payment Details,പേയ്മെന്റ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM റേറ്റ്
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM റേറ്റ്
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","നിർത്തി ജോലി ഓർഡർ റദ്ദാക്കാൻ കഴിയുന്നില്ല, റദ്ദാക്കാൻ ആദ്യം അതിനെ തടഞ്ഞുനിർത്തുക"
 DocType: Asset,Journal Entry for Scrap,സ്ക്രാപ്പ് ജേണൽ എൻട്രി
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ഡെലിവറി നോട്ട് നിന്നുള്ള ഇനങ്ങൾ pull ദയവായി
@@ -4038,6 +4063,7 @@
 DocType: Land Unit,Land Unit,ലാൻഡ് യൂണിറ്റ്
 ,Purchase Analytics,വാങ്ങൽ അനലിറ്റിക്സ്
 DocType: Sales Invoice Item,Delivery Note Item,ഡെലിവറി നോട്ട് ഇനം
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,നിലവിലെ ഇൻവോയ്സ് {0} കാണുന്നില്ല
 DocType: Asset Maintenance Log,Task,ടാസ്ക്
 DocType: Purchase Taxes and Charges,Reference Row #,റഫറൻസ് വരി #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ബാച്ച് സംഖ്യ ഇനം {0} നിര്ബന്ധമാണ്
@@ -4050,7 +4076,7 @@
 DocType: Company,Exchange Gain / Loss Account,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ജീവനക്കാർ എന്നാല് ബി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ഉദ്ദേശ്യം {0} ഒന്നാണ് ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ഫോം പൂരിപ്പിച്ച് സേവ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ഫോം പൂരിപ്പിച്ച് സേവ്
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,കമ്മ്യൂണിറ്റി ഫോറം
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,സ്റ്റോക്ക് ലെ യഥാർത്ഥ അളവ്
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,സ്റ്റോക്ക് ലെ യഥാർത്ഥ അളവ്
@@ -4065,7 +4091,7 @@
 DocType: Lab Test Template,Standard Selling Rate,സ്റ്റാൻഡേർഡ് വിറ്റുപോകുന്ന നിരക്ക്
 DocType: Account,Rate at which this tax is applied,ഈ നികുതി പ്രയോഗിക്കുന്നു തോത്
 DocType: Cash Flow Mapper,Section Name,വിഭാഗത്തിന്റെ പേര്
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,പുനഃക്രമീകരിക്കുക Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,പുനഃക്രമീകരിക്കുക Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,നിലവിൽ ജോലികൾ
 DocType: Company,Stock Adjustment Account,സ്റ്റോക്ക് ക്രമീകരണ അക്കൗണ്ട്
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,എഴുതുക
@@ -4076,9 +4102,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,എല്ലാ ബില്ലും മെറ്റീരിയലുകളിൽ ഏറ്റവും പുതിയ വില അപ്ഡേറ്റ് ചെയ്യുന്നതിനായി ക്യൂവിലാണ്. ഇതിന് അൽപ്പസമയമെടുത്തേക്കാം.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,പുതിയ അക്കൗണ്ട് പേര്. കുറിപ്പ്: ഉപയോക്താക്കൾക്ക് വിതരണക്കാർക്കും അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാൻ ദയവായി
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,രാജ്യം ജ്ഞാനികൾ സഹജമായ വിലാസം ഫലകങ്ങൾ
 DocType: Water Analysis,Appearance,രൂപഭാവം
+DocType: HR Settings,Leave Status Notification Template,സ്റ്റാറ്റസ് അറിയിപ്പ് ടെംപ്ലേറ്റ് ഒഴിവാക്കുക
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,ശരാശരി. വിലനിരക്ക് വാങ്ങൽ
 DocType: Sales Order Item,Supplier delivers to Customer,വിതരണക്കമ്പനിയായ ഉപയോക്താക്കൾക്കായി വിടുവിക്കുന്നു
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,അംഗത്തെക്കുറിച്ചുള്ള വിവരം.
@@ -4101,7 +4127,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,അനുവദനീയമല്ല. ടെസ്റ്റ് ടെംപ്ലേറ്റ് ദയവായി അപ്രാപ്തമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ശതമാന അലോക്കേഷൻ 100% തുല്യമോ വേണം
 DocType: Crop Cycle,Linked Land Unit,ലിങ്ക്ഡ് ലാൻഡ് യൂണിറ്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
@@ -4117,7 +4143,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ഉപയോക്താക്കളിലേക്ക് പോകുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ഇനം {1} ഒരു സാധുവായ ബാച്ച് നമ്പർ അല്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},കുറിപ്പ്: വേണ്ടത്ര ലീവ് ബാലൻസ് അനുവാദ ടൈപ്പ് {0} വേണ്ടി ഇല്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},കുറിപ്പ്: വേണ്ടത്ര ലീവ് ബാലൻസ് അനുവാദ ടൈപ്പ് {0} വേണ്ടി ഇല്ല
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,അസാധുവായ ഗ്സ്തിന് അല്ലെങ്കിൽ രജിസ്റ്റർ വേണ്ടി ബാധകമല്ല നൽകുക
 DocType: Training Event,Seminar,സെമിനാര്
 DocType: Program Enrollment Fee,Program Enrollment Fee,പ്രോഗ്രാം എൻറോൾമെന്റ് ഫീസ്
@@ -4133,14 +4159,14 @@
 DocType: Hub Settings,Publish Availability,ലഭ്യത പ്രസിദ്ധീകരിക്കുക
 DocType: Company,Create Chart Of Accounts Based On,അക്കൗണ്ടുകൾ അടിസ്ഥാനമാക്കിയുള്ള ചാർട്ട് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ഗ്രൂപ്പ് അല്ലാത്തവരെ ഇത് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല. ശിശു ചുമതലകൾ നിലവിലുണ്ട്.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,ജനന തീയതി ഇന്ന് വലുതായിരിക്കും കഴിയില്ല.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,ജനന തീയതി ഇന്ന് വലുതായിരിക്കും കഴിയില്ല.
 ,Stock Ageing,സ്റ്റോക്ക് എയ്ജിങ്
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},വിദ്യാർത്ഥി {0} വിദ്യാർത്ഥി അപേക്ഷകൻ {1} നേരെ നിലവിലില്ല
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),റൗണ്ടിംഗ് അഡ്ജസ്റ്റ്മെന്റ് (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ബാച്ച്:
 DocType: Volunteer,Afternoon,ഉച്ചകഴിഞ്ഞ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
 DocType: Cheque Print Template,Scanned Cheque,സ്കാൻ ചെയ്ത ചെക്ക്
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,സമർപ്പിക്കുന്നു ഇടപാടുകൾ ബന്ധങ്ങൾ ഓട്ടോമാറ്റിക് ഇമെയിലുകൾ അയയ്ക്കുക.
@@ -4156,7 +4182,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,പ്രോജക്റ്റ് {0} ഇതിനകം നിലവിലുണ്ട്
 DocType: Medical Department,Nursing User,നഴ്സിംഗ് ഉപയോക്താവ്
 DocType: Plant Analysis,Plant Analysis Criterias,പ്ലാന്റ് അനാലിസിസ് ക്രൈറ്റീരിയാസ്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},സീരിയൽ {0} ബാച്ച് {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ഈ ഉദ്ധരണിയുടെ സാധുതാ കാലാവധി കഴിഞ്ഞു.
 DocType: Expense Claim Account,Expense Claim Account,ചിലവേറിയ ക്ലെയിം അക്കൗണ്ട്
 DocType: Accounts Settings,Allow Stale Exchange Rates,സ്റ്റേലെറ്റ് എക്സ്ചേഞ്ച് നിരക്കുകൾ അനുവദിക്കുക
@@ -4178,11 +4205,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,വേരിയൻറുകൾ ഉണ്ടാക്കുക
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
 DocType: Project,Total Billed Amount (via Sales Invoices),മൊത്തം ബില്ലും തുക (വിൽപ്പന ഇൻവോയ്സുകളിലൂടെ)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ഡെബിറ്റ് നോട്ട് തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ഡെബിറ്റ് നോട്ട് തുക
 DocType: Project Update,Not Updated,അപ്ഡേറ്റ് ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","റേറ്റ്, ഷെയറുകളുടെയും കണക്കുകൂട്ടുന്ന തുകയുടെയും തമ്മിലുള്ള വൈരുദ്ധ്യങ്ങൾ ഉണ്ട്"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,മൊത്തം ശാരീരിക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,മൊത്തം ശാരീരിക
 DocType: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
 DocType: Employee Advance,Advance Account,മുൻകൂർ അക്കൗണ്ട്
 DocType: Job Offer,Job Offer Terms,ജോബ് ഓഫർ നിബന്ധനകൾ
@@ -4191,7 +4218,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
 DocType: Vehicle,Insurance Company,ഇൻഷ്വറൻസ് കമ്പനി
 DocType: Asset Category Account,Fixed Asset Account,ഫിക്സ്ഡ് അസറ്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,വേരിയബിൾ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,വേരിയബിൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
 DocType: Chapter,Members,അംഗങ്ങൾ
 DocType: Student,Student Email Address,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ വിലാസം
@@ -4215,7 +4242,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,തടവുകാരി
 DocType: Delivery Stop,Address Name,വിലാസം പേര്
 DocType: Stock Entry,From BOM,BOM നിന്നും
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} ന്റെ {0} സ്പ്ലിറ്റ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} ന്റെ {0} സ്പ്ലിറ്റ്
 DocType: Assessment Code,Assessment Code,അസസ്മെന്റ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,അടിസ്ഥാന
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ഫ്രീസുചെയ്തിരിക്കുമ്പോൾ സ്റ്റോക്ക് ഇടപാടുകൾ മുമ്പ്
@@ -4223,25 +4250,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
 DocType: Bank Reconciliation Detail,Payment Document,പേയ്മെന്റ് പ്രമാണം
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,മാനദണ്ഡ ഫോർമുല മൂല്യനിർണ്ണയിക്കുന്നതിൽ പിശക്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,ചേരുന്നു തീയതി ജനന തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,ചേരുന്നു തീയതി ജനന തീയതി വലുതായിരിക്കണം
+DocType: Subscription,Plans,പ്ലാനുകൾ
 DocType: Salary Slip,Salary Structure,ശമ്പളം ഘടന
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ആവർത്തന സൃഷ്ടിക്കുന്നതിനിടയിൽ ഒരു പിശക് സംഭവിച്ചു
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
 DocType: Employee,Offer Date,ആഫര് തീയതി
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ഉദ്ധരണികളും
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ഇല്ല സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 DocType: Purchase Invoice Item,Serial No,സീരിയൽ ഇല്ല
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,പ്രതിമാസ തിരിച്ചടവ് തുക വായ്പാ തുക ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,പ്രതിമാസ തിരിച്ചടവ് തുക വായ്പാ തുക ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,വരി # {0}: പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി പർച്ചേസ് ഓർഡർ തീയതിക്ക് മുമ്പായിരിക്കരുത്
 DocType: Purchase Invoice,Print Language,പ്രിന്റ് ഭാഷ
 DocType: Salary Slip,Total Working Hours,ആകെ ജോലി മണിക്കൂർ
 DocType: Sales Invoice,Customer PO Details,കസ്റ്റമർ പി.ഒ.
-DocType: Subscription,Next Schedule Date,അടുത്ത ഷെഡ്യൂൾ തീയതി
 DocType: Stock Entry,Including items for sub assemblies,സബ് സമ്മേളനങ്ങൾ ഇനങ്ങൾ ഉൾപ്പെടെ
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,താൽക്കാലിക തുറക്കൽ അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
@@ -4270,11 +4296,11 @@
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,നിന്ന് ആവശ്യമായ തീയതികൾ ചെയ്യുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,പരാമർശിക്കപ്പെട്ട മാനദണ്ഡത്തിനായി ജീവനക്കാർ ഇല്ല
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
 DocType: Hotel Settings,Default Customer,സ്ഥിരസ്ഥിതി ഉപഭോക്താവ്
 DocType: Assessment Plan,Supervisor Name,സൂപ്പർവൈസർ പേര്
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ഒരേ ദിവസം തന്നെ അസൈൻ ചെയ്യപ്പെട്ടാൽ അത് സ്ഥിരീകരിക്കരുത്
@@ -4299,16 +4325,16 @@
 DocType: Journal Entry Account,Employee Advance,തൊഴിലാളി അഡ്വാൻസ്
 DocType: Payroll Entry,Payroll Frequency,ശമ്പളപ്പട്ടിക ഫ്രീക്വൻസി
 DocType: Lab Test Template,Sensitivity,സെൻസിറ്റിവിറ്റി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,അസംസ്കൃത വസ്തു
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,അസംസ്കൃത വസ്തു
 DocType: Leave Application,Follow via Email,ഇമെയിൽ വഴി പിന്തുടരുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,"സസ്യങ്ങൾ, യന്ത്രസാമഗ്രികളും"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,"സസ്യങ്ങൾ, യന്ത്രസാമഗ്രികളും"
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ഡിസ്കൗണ്ട് തുക ശേഷം നികുതിയും
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,ദയവായി തീയതി അനുസരിച്ച് Reqd നൽകുക
 DocType: Payment Entry,Internal Transfer,ആന്തരിക ട്രാൻസ്ഫർ
 DocType: Asset Maintenance,Maintenance Tasks,മെയിൻറനൻസ് ടാസ്കുകൾ
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമായും
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
 DocType: Leave Control Panel,Carry Forward,മുന്നോട്ട് കൊണ്ടുപോകും
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
@@ -4316,14 +4342,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext ഇന്റഗ്രേഷൻസ്
 DocType: Crop Cycle,Detected Disease,രോഗബാധ കണ്ടെത്തി
 ,Produced,നിർമ്മാണം
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,"തിരിച്ചടവ് ആരംഭ തീയതി, വിതരണ തീയതിക്ക് മുമ്പായിരിക്കരുത്."
 DocType: Item,Item Code for Suppliers,വിതരണക്കാരും വേണ്ടി ഇനം കോഡ്
 DocType: Issue,Raised By (Email),(ഇമെയിൽ) ഉന്നയിച്ച
 DocType: Training Event,Trainer Name,പരിശീലകൻ പേര്
 DocType: Mode of Payment,General,ജനറൽ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,അവസാനം കമ്യൂണിക്കേഷൻ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,അവസാനം കമ്യൂണിക്കേഷൻ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"വിഭാഗം &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; വേണ്ടി എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},സീരിയൽ ഇനം {0} വേണ്ടി സീരിയൽ ഒഴിവ് ആവശ്യമുണ്ട്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"വിഭാഗം &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; വേണ്ടി എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് ചെയ്യാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},സീരിയൽ ഇനം {0} വേണ്ടി സീരിയൽ ഒഴിവ് ആവശ്യമുണ്ട്
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ഇൻവോയിസുകൾ കളിയിൽ പേയ്മെന്റുകൾ
 DocType: Journal Entry,Bank Entry,ബാങ്ക് എൻട്രി
 DocType: Authorization Rule,Applicable To (Designation),(തസ്തിക) ബാധകമായ
@@ -4337,7 +4364,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,പ്രാപ്തമാക്കുക / കറൻസിയുടെ അപ്രാപ്തമാക്കാൻ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},{0} ദിവസം {0}
 DocType: Production Plan,Get Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നേടുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,തപാൽ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,തപാൽ ചെലവുകൾ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ആകെ (ശാരീരിക)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,വിനോദം &amp; ഒഴിവുസമയ
 ,Item Variant Details,ഇനം വ്യത്യാസത്തിന്റെ വിശദാംശങ്ങൾ
@@ -4347,9 +4374,9 @@
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
 DocType: Drug Prescription,Hour,അന്ത്യസമയം
 DocType: Restaurant Order Entry,Last Sales Invoice,അവസാന സെയിൽസ് ഇൻവോയ്സ്
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ പാണ്ടികശാലയും പാടില്ല. വെയർഹൗസ് ഓഹരി എൻട്രി വാങ്ങാനും റെസീപ്റ്റ് സജ്ജമാക്കി വേണം
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ പാണ്ടികശാലയും പാടില്ല. വെയർഹൗസ് ഓഹരി എൻട്രി വാങ്ങാനും റെസീപ്റ്റ് സജ്ജമാക്കി വേണം
 DocType: Lead,Lead Type,ലീഡ് തരം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ഇവർ എല്ലാവരും ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
 DocType: Company,Monthly Sales Target,മാസംതോറുമുള്ള ടാർഗെറ്റ്
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} അംഗീകരിച്ച കഴിയുമോ
@@ -4357,7 +4384,7 @@
 DocType: Item,Default Material Request Type,സ്വതേ മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
 DocType: Supplier Scorecard,Evaluation Period,വിലയിരുത്തൽ കാലയളവ്
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,അറിയപ്പെടാത്ത
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,വർക്ക് ഓർഡർ സൃഷ്ടിച്ചില്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,വർക്ക് ഓർഡർ സൃഷ്ടിച്ചില്ല
 DocType: Shipping Rule,Shipping Rule Conditions,ഷിപ്പിംഗ് റൂൾ അവസ്ഥകൾ
 DocType: Purchase Invoice,Export Type,എക്സ്പോർട്ട് തരം
 DocType: Salary Slip Loan,Salary Slip Loan,ശമ്പളം സ്ലിപ്പ് വായ്പ
@@ -4373,8 +4400,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ഇൻവോയ്സുകൾ സംഗ്രഹം തുറക്കുന്നു
 DocType: Education Settings,Education Manager,വിദ്യാഭ്യാസ മാനേജർ
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,പരമാവധി വളർച്ചയ്ക്ക് വയലിൽ ഓരോ പ്ലാന്റിലും ഏറ്റവും കുറഞ്ഞ ദൂരം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ബാച്ചുചെയ്ത ഇനം {0} പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക, ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ബാച്ചുചെയ്ത ഇനം {0} പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക, ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ബാച്ചുചെയ്ത ഇനം {0} പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക, ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","ബാച്ചുചെയ്ത ഇനം {0} പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക, ഓഹരി അനുരഞ്ജനം ഉപയോഗിച്ച് അപ്ഡേറ്റ് കഴിയില്ല"
 DocType: Quality Inspection,Report Date,റിപ്പോർട്ട് തീയതി
 DocType: Student,Middle Name,പേരിന്റെ മധ്യഭാഗം
 DocType: C-Form,Invoices,ഇൻവോയിസുകൾ
@@ -4406,20 +4433,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,രസീത്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,രസീത്
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Daily Work Summary Group,Send Emails At,ഇമെയിലുകൾ അയയ്ക്കുക
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,തിരുത്തിയെഴുതുന്നത് ഒന്നുമില്ല.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ഫോം കാഴ്ച
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ചെലവ് ക്ലെയിമിലെ ചെലവ് സമീപനം നിർബന്ധിതം
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","നിങ്ങളെക്കാളുപരി, നിങ്ങളുടെ ഓർഗനൈസേഷനിൽ ഉപയോക്താക്കളെ ചേർക്കുക."
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ഇതുവരെ ഉപഭോക്താക്കൾ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,ഭൌതിക അഭ്യർത്ഥനയൊന്നും സൃഷ്ടിച്ചിട്ടില്ല
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,അനുമതി
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
@@ -4442,11 +4470,12 @@
 DocType: Vehicle,Chassis No,ഷാസി ഇല്ല
 DocType: Payment Request,Initiated,ആകൃഷ്ടനായി
 DocType: Production Plan Item,Planned Start Date,ആസൂത്രണം ചെയ്ത ആരംഭ തീയതി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,ദയവായി ഒരു BOM തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,ദയവായി ഒരു BOM തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ഐടിസി ഇന്റഗ്രേറ്റഡ് ടാക്സ് പ്രയോജനപ്പെടുത്തി
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
+DocType: Bank Guarantee,Clauses and Conditions,നിബന്ധനകളും വ്യവസ്ഥകളും
 DocType: Serial No,Creation Document Type,ക്രിയേഷൻ ഡോക്യുമെന്റ് തരം
 DocType: Project Task,View Timesheet,ടൈംഷീറ്റ് കാണുക
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ആരംഭിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതിയിൽ കൂടുതലായിരിക്കണം
 DocType: Leave Type,Is Encash,Encash Is
 DocType: Leave Allocation,New Leaves Allocated,അലോക്കേറ്റഡ് പുതിയ ഇലകൾ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
@@ -4460,9 +4489,10 @@
 DocType: Patient,Alcohol Current Use,ആൽക്കഹോൾ നിലവിലെ ഉപയോഗം
 DocType: Student Admission Program,Student Admission Program,വിദ്യാർത്ഥി പ്രവേശന പരിപാടി
 DocType: Payment Entry,Account Paid To,അക്കൗണ്ടിലേക്ക് പണമടച്ചു
+DocType: Subscription Settings,Grace Period,അധിക സമയം
 DocType: Item Alternative,Alternative Item Name,ഇതര ഇന നാമം
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,പാരന്റ് ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം പാടില്ല
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ഒരു ശമ്പള സ്ലിപ്പ് സമർപ്പിക്കാൻ കഴിഞ്ഞില്ല <br> \ സാധ്യമായ കാരണങ്ങൾ: <br> \ 1. നെറ്റ് പേയ്മെന്റ് 0 ൽ കുറവാണ്. <br> \ 2. ജീവനക്കാരന്റെ മാസ്റ്റർ വ്യക്തമാക്കിയ കമ്പനി ഇമെയിൽ വിലാസം സാധുവായതല്ല. <br>
@@ -4472,7 +4502,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} അക്കൗണ്ട് ബജറ്റ് {1} {2} {3} നേരെ {4} ആണ്. ഇത് {5} വഴി കവിയുമെന്നും
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty ഔട്ട്
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ഒപ്പം അൺചെക്കുചെയ്തത് അപ്രാപ്തമാക്കി
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,സാമ്പത്തിക സേവനങ്ങൾ
 DocType: Student Sibling,Student ID,സ്റ്റുഡന്റ് ഐഡി
@@ -4484,14 +4513,16 @@
 DocType: Complaint,Complaint,പരാതി
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,തിരിച്ചടയ്ക്കാനുള്ള എൻട്രി ചെയ്യുക
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,എല്ലാ വകുപ്പുകളും
 DocType: Patient,Alcohol Past Use,മദ്യപിക്കുന്ന ഭൂതകാല ഉപയോഗം
 DocType: Fertilizer Content,Fertilizer Content,വളപ്രയോഗം ഉള്ളടക്കം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,കോടിയുടെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,കോടിയുടെ
 DocType: Project Update,Problematic/Stuck,പ്രശ്നമുണ്ട് / തടസ്സം
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
 DocType: Share Transfer,Transfer,ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിന് മുമ്പ് വർക്ക് ഓർഡർ {0} റദ്ദാക്കണം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
@@ -4514,10 +4545,11 @@
 DocType: Cheque Print Template,Message to show,കാണിക്കാൻ സന്ദേശം
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,റീട്ടെയിൽ
 DocType: Student Attendance,Absent,അസാന്നിദ്ധ്യം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} ൽ ആരംഭിക്കുന്ന സ്കോർ കണ്ടെത്താനായില്ല. നിങ്ങൾക്ക് 0 മുതൽ 100 വരെയുള്ള സ്കോറുകൾ കണ്ടെത്തേണ്ടതുണ്ട്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,നികുതി ചാർജുകളും ഫലകം വാങ്ങുക
+DocType: Subscription,Current Invoice Start Date,നിലവിലെ ഇൻവോയ്സ് ആരംഭ തീയതി
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ഡെബിറ്റ് അല്ലെങ്കിൽ ക്രെഡിറ്റ് തുക ഒന്നുകിൽ {2} ആവശ്യമാണ്
 DocType: GL Entry,Remarks,അഭിപ്രായപ്രകടനം
@@ -4527,11 +4559,13 @@
 DocType: Task,Parent Task,പാരന്റ് ടാസ്ക്
 DocType: Journal Entry,Write Off Based On,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ലീഡ് നിർമ്മിക്കുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
 DocType: Stock Settings,Show Barcode Field,കാണിക്കുക ബാർകോഡ് ഫീൽഡ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ശമ്പള ഇതിനകം തമ്മിലുള്ള {0} കാലയളവിൽ പ്രോസസ്സ് {1}, അപ്ലിക്കേഷൻ കാലയളവിൽ വിടുക ഈ തീയതി പരിധിയിൽ തമ്മിലുള്ള പാടില്ല."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ശമ്പള ഇതിനകം തമ്മിലുള്ള {0} കാലയളവിൽ പ്രോസസ്സ് {1}, അപ്ലിക്കേഷൻ കാലയളവിൽ വിടുക ഈ തീയതി പരിധിയിൽ തമ്മിലുള്ള പാടില്ല."
+DocType: Fiscal Year,Auto Created,യാന്ത്രികമായി സൃഷ്ടിച്ചു
 DocType: Chapter Member,Leave Reason,കാരണം ഉപേക്ഷിക്കുക
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ഇൻവോയ്സ് {0} നിലവിലില്ല
 DocType: Guardian Interest,Guardian Interest,ഗാർഡിയൻ പലിശ
 DocType: Volunteer,Availability,ലഭ്യത
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ഇൻവോയിസുകൾക്കായി സ്ഥിര മൂല്യങ്ങൾ സജ്ജമാക്കുക
@@ -4540,13 +4574,12 @@
 DocType: Timesheet,Employee Detail,ജീവനക്കാരുടെ വിശദാംശം
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ഗുഅര്ദിഅന്൧ ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ഗുഅര്ദിഅന്൧ ഇമെയിൽ ഐഡി
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,മാസം അടുത്ത ദിവസം തിയതി ദിവസം ആവർത്തിക്കുക തുല്യമായിരിക്കണം
 DocType: Lab Prescription,Test Code,ടെസ്റ്റ് കോഡ്
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} എന്ന സ്കോർകാർഡ് സ്റ്റാൻഡേർഡ് കാരണം {0}
 DocType: Job Offer,Awaiting Response,കാത്തിരിക്കുന്നു പ്രതികരണത്തിന്റെ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,മുകളിൽ
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
 DocType: Supplier,Mention if non-standard payable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത മാറാവുന്ന അക്കൗണ്ട് എങ്കിൽ പരാമർശിക്കുക
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',ദയവായി &#39;എല്ലാ വിലയിരുത്തൽ ഗ്രൂപ്പുകൾ&#39; പുറമെ വിലയിരുത്തൽ ഗ്രൂപ്പ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,അശ്രിറ്റ് ഡിറ്റ്
@@ -4556,7 +4589,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ജല വിശകലനം
 DocType: Chapter,Region,പ്രവിശ്യ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ഓപ്ഷണൽ. ഈ ക്രമീകരണം വിവിധ വ്യവഹാരങ്ങളിൽ ഫിൽട്ടർ ഉപയോഗിക്കും.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
 DocType: Holiday List,Weekly Off,പ്രതിവാര ഓഫാക്കുക
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,ലിങ്ക്ഡ് അനാലിസിസ് വീണ്ടും ലോഡ് ചെയ്യുക
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ഉദാ 2012 വേണ്ടി, 2012-13"
@@ -4572,7 +4605,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,എന്തുതോന്നുന്നു അസറ്റ് ചെലവ്
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
 DocType: Vehicle,Policy No,നയം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Asset,Straight Line,വര
 DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,രണ്ടായി പിരിയുക
@@ -4612,21 +4645,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,പാത
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,അത് കുട്ടി റോഡുകളുണ്ട് പോലെ ലെഡ്ജർ വരെ ചെലവ് കേന്ദ്രം പരിവർത്തനം ചെയ്യാൻ കഴിയുമോ
 DocType: Production Plan,Total Planned Qty,മൊത്തം ആസൂത്രണ കോഡ്
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,തുറക്കുന്നു മൂല്യം
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,തുറക്കുന്നു മൂല്യം
 DocType: Salary Detail,Formula,ഫോർമുല
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,സീരിയൽ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,സീരിയൽ #
 DocType: Lab Test Template,Lab Test Template,ടെസ്റ്റ് ടെംപ്ലേറ്റ് ടെംപ്ലേറ്റ്
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,സെൽ അക്കൌണ്ട്
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,സെൽ അക്കൌണ്ട്
 DocType: Purchase Invoice Item,Total Weight,ആകെ ഭാരം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
 DocType: Job Offer Term,Value / Description,മൂല്യം / വിവരണം
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 DocType: Purchase Order Item,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
 DocType: Restaurant Order Entry,Restaurant Order Entry,റെസ്റ്റോറന്റ് ഓർഡർ എൻട്രി
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
 DocType: Asset Maintenance Task,Assign To Name,പേരു് നൽകുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,വിനോദം ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,വിനോദം ചെലവുകൾ
 DocType: Hub Settings,Enabled Users,പ്രാപ്തമാക്കിയ ഉപയോക്താക്കൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നടത്തുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},തുറക്കുക ഇനം {0}
@@ -4639,24 +4672,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ലീവ് അപേക്ഷകൾ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Vehicle,Last Carbon Check,അവസാനം കാർബൺ ചെക്ക്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,നിയമ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,നിയമ ചെലവുകൾ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,വരിയിൽ അളവ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,"വിൽപന ആരംഭിക്കുക, വാങ്ങൽ ഇൻവോയ്സുകൾ സൃഷ്ടിക്കുക"
 DocType: Purchase Invoice,Posting Time,പോസ്റ്റിംഗ് സമയം
 DocType: Timesheet,% Amount Billed,ഈടാക്കൂ% തുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ടെലിഫോൺ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ടെലിഫോൺ ചെലവുകൾ
 DocType: Sales Partner,Logo,ലോഗോ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,സംരക്ഷിക്കാതെ മുമ്പ് ഒരു പരമ്പര തിരഞ്ഞെടുക്കുന്നതിന് ഉപയോക്താവിനെ നിർബ്ബന്ധമായും ചെയ്യണമെങ്കിൽ ഇത് പരിശോധിക്കുക. നിങ്ങൾ ഈ പരിശോധിക്കുക ആരും സ്വതവേ അവിടെ ആയിരിക്കും.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},സീരിയൽ ഇല്ല {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},സീരിയൽ ഇല്ല {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
 DocType: Email Digest,Open Notifications,ഓപ്പൺ അറിയിപ്പുകൾ
 DocType: Payment Entry,Difference Amount (Company Currency),വ്യത്യാസം തുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,നേരിട്ടുള്ള ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,നേരിട്ടുള്ള ചെലവുകൾ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,പുതിയ കസ്റ്റമർ റവന്യൂ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,യാത്രാ ചെലവ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,യാത്രാ ചെലവ്
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},ഡോക്യുമെന്റിൽ ഇഷ്ടാനുസൃത ഫീൽഡ് സബ്സ്ക്രിപ്ഷൻ ചേർക്കുക {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
 DocType: Purchase Receipt Item,Sample Quantity,സാമ്പിൾ അളവ്
+DocType: Bank Guarantee,Name of Beneficiary,ഗുണഭോക്താവിന്റെ പേര്
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ഏറ്റവും പുതിയ മൂല്യനിർണ്ണയ നിരക്ക് / വിലനിർണയ നിരക്ക് / അസംസ്കൃത വസ്തുക്കളുടെ അവസാന വാങ്ങൽ നിരക്ക് എന്നിവ അടിസ്ഥാനമാക്കി ഷെഡ്യൂളർ വഴി BOM നിരക്ക് അപ്ഡേറ്റ് ചെയ്യുക.
 DocType: Bank Reconciliation Detail,Cheque Date,ചെക്ക് തീയതി
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
@@ -4668,14 +4701,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,പരീക്ഷണകാലഘട്ടം
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ശമ്പള ഘടകങ്ങൾ
 DocType: Program Enrollment Tool,New Academic Year,ന്യൂ അക്കാദമിക് വർഷം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ആകെ തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ആകെ തുക
 DocType: GST Settings,B2C Limit,B2C പരിധി
 DocType: Work Order Item,Transferred Qty,മാറ്റിയത് Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,നീങ്ങുന്നത്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ആസൂത്രണ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ആസൂത്രണ
 DocType: Share Balance,Issued,ഇഷ്യൂചെയ്തു
+DocType: Loan,Repayment Start Date,തിരിച്ചടവ് ആരംഭിക്കുന്ന തീയതി
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,വിദ്യാർത്ഥിയുടെ പ്രവർത്തനം
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,വിതരണക്കമ്പനിയായ ഐഡി
 DocType: Payment Request,Payment Gateway Details,പേയ്മെന്റ് ഗേറ്റ്വേ വിവരങ്ങൾ
@@ -4688,10 +4722,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","കാഷ്വൽ, രോഗികളെ മുതലായ ഇല തരം"
 DocType: Email Digest,Send regular summary reports via Email.,ഇമെയിൽ വഴി പതിവ് സംഗ്രഹം റിപ്പോർട്ടുകൾ അയയ്ക്കുക.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Assessment Result,Student Name,വിദ്യാർഥിയുടെ പേര്
 DocType: Brand,Item Manager,ഇനം മാനേജർ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,ശമ്പളപ്പട്ടിക പേയബിൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,ശമ്പളപ്പട്ടിക പേയബിൾ
 DocType: Buying Settings,Default Supplier Type,സ്ഥിരസ്ഥിതി വിതരണക്കാരൻ തരം
 DocType: Plant Analysis,Collection Datetime,ശേഖര തീയതി സമയം
 DocType: Work Order,Total Operating Cost,ആകെ ഓപ്പറേറ്റിംഗ് ചെലവ്
@@ -4701,9 +4735,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ഉപയോക്താവ് {0} നിലവിലില്ല
 DocType: Payment Term,Day(s) after invoice date,ഇൻവോയ്സ് തീയതിക്കുശേഷം ദിവസം (ങ്ങൾ)
 DocType: Payment Schedule,Payment Schedule,തുക അടക്കേണ്ട തിയതികൾ
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,ചുരുക്കല്
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,പേയ്മെന്റ് എൻട്രി ഇതിനകം നിലവിലുണ്ട്
+DocType: Subscription,Trial Period End Date,ട്രയൽ കാലയളവ് അവസാനിക്കുന്ന തീയതി
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} പരിധികൾ കവിയുന്നു മുതലുള്ള authroized ഒരിക്കലും പാടില്ല
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,ശമ്പളം ടെംപ്ലേറ്റ് മാസ്റ്റർ.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,പാത്തോളജി
@@ -4720,9 +4754,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
 ,Territory Target Variance Item Group-Wise,ടെറിട്ടറി ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനും
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,നികുതി ഫലകം നിർബന്ധമാണ്.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} നിലവിലില്ല
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),വില പട്ടിക നിരക്ക് (കമ്പനി കറൻസി)
@@ -4731,14 +4765,15 @@
 DocType: Lab Prescription,Test Created,പരിശോധന സൃഷ്ടിച്ചു
 DocType: Healthcare Settings,Custom Signature in Print,പ്രിന്റ് ചെയ്യാവുന്ന ഇഷ്ടാനുസൃത ഒപ്പ്
 DocType: Account,Temporary,താൽക്കാലിക
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ഉപഭോക്താവ് LPO നമ്പർ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ഉപഭോക്താവ് LPO നമ്പർ
 DocType: Program,Courses,കോഴ്സുകൾ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ശതമാന അലോക്കേഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,സെക്രട്ടറി
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,സെക്രട്ടറി
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, വയലിൽ &#39;വാക്കുകളിൽ&#39; ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ഈ പ്രവർത്തനം ഭാവി ബില്ലിംഗ് നിർത്തും. ഈ സബ്സ്ക്രിപ്ഷൻ റദ്ദാക്കണമെന്ന് നിങ്ങൾക്ക് തീർച്ചയാണോ?
 DocType: Serial No,Distinct unit of an Item,ഒരു ഇനം വ്യക്തമായ യൂണിറ്റ്
 DocType: Supplier Scorecard Criteria,Criteria Name,മാനദണ്ഡനാമ നാമം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,കമ്പനി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,കമ്പനി സജ്ജീകരിക്കുക
 DocType: Pricing Rule,Buying,വാങ്ങൽ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,രോഗങ്ങൾ &amp; രാസവളങ്ങൾ
 DocType: HR Settings,Employee Records to be created by,സൃഷ്ടിച്ച ചെയ്യേണ്ട ജീവനക്കാരൻ റെക്കോർഡ്സ്
@@ -4747,18 +4782,18 @@
 DocType: POS Profile,Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക
 DocType: Member,Membership Type,അംഗത്വ തരം
 ,Reqd By Date,തീയതിയനുസരിച്ചു് Reqd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,കടക്കാരിൽ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,കടക്കാരിൽ
 DocType: Assessment Plan,Assessment Name,അസസ്മെന്റ് പേര്
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,പി.ഡി.സി അച്ചടിക്കുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,പി.ഡി.സി അച്ചടിക്കുക
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,വരി # {0}: സീരിയൽ ഇല്ല നിർബന്ധമാണ്
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം യുക്തിമാനും നികുതി വിശദാംശം
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,ജോലി വാഗ്ദാനം
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ഇൻസ്റ്റിറ്റ്യൂട്ട് സംഗ്രഹം
 ,Item-wise Price List Rate,ഇനം തിരിച്ചുള്ള വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 DocType: Consultation,C-,സി-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
@@ -4776,7 +4811,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ആകെ പൊരുത്തമില്ലായ്മ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","പ്രവർത്തനക്ഷമമായാൽ, സിസ്റ്റം ഓട്ടോമാറ്റിക്കായി സാധനങ്ങളും വേണ്ടി അക്കൗണ്ടിങ് എൻട്രികൾ പോസ്റ്റ് ചെയ്യും."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,ബ്രോക്കറേജ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ജീവനക്കാർക്ക് ഹാജർ {0} ഇതിനകം ഈ ദിവസം അടയാളപ്പെടുത്തി
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ജീവനക്കാർക്ക് ഹാജർ {0} ഇതിനകം ഈ ദിവസം അടയാളപ്പെടുത്തി
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ് മിനിറ്റിനുള്ളിൽ
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
@@ -4787,6 +4822,7 @@
 DocType: Lab Test,Approved Date,അംഗീകരിച്ച തീയതി
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
+DocType: Subscriber,Subscriber Name,സബ്സ്ക്രൈബർ നാമം
 DocType: Serial No,Out of Warranty,വാറന്റി പുറത്താണ്
 DocType: BOM Update Tool,Replace,മാറ്റിസ്ഥാപിക്കുക
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ഉൽപ്പന്നങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
@@ -4796,19 +4832,18 @@
 DocType: Request for Quotation Item,Project Name,പ്രോജക്ട് പേര്
 DocType: Customer,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ജീവനക്കാരുടെ വായ്പയിൽ പലിശ വരുമാനമുള്ള അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക {0}
 DocType: Work Order,Required Items,ആവശ്യമായ ഇനങ്ങൾ
 DocType: Stock Ledger Entry,Stock Value Difference,സ്റ്റോക്ക് മൂല്യം വ്യത്യാസം
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,മാനവ വിഭവശേഷി
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,പേയ്മെന്റ് അനുരഞ്ജനം പേയ്മെന്റ്
 DocType: Disease,Treatment Task,ചികിത്സ ടാസ്ക്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,നികുതി ആസ്തികൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,നികുതി ആസ്തികൾ
 DocType: BOM Item,BOM No,BOM ഇല്ല
 DocType: Instructor,INS/,ഐഎൻഎസ് /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ജേർണൽ എൻട്രി {0} അക്കൗണ്ട് {1} അല്ലെങ്കിൽ ഇതിനകം മറ്റ് വൗച്ചർ പൊരുത്തപ്പെടും ഇല്ല
 DocType: Item,Moving Average,ശരാശരി നീക്കുന്നു
 DocType: BOM Update Tool,The BOM which will be replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിക്കും
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ഇലക്ട്രോണിക് ഉപകരണങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ഇലക്ട്രോണിക് ഉപകരണങ്ങൾ
 DocType: Asset,Maintenance Required,അറ്റകുറ്റപണി ആവശ്യമാണ്
 DocType: Account,Debit,ഡെബിറ്റ്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ഇലകൾ 0.5 ഗുണിതങ്ങളായി നീക്കിവച്ചിരുന്നു വേണം
@@ -4817,7 +4852,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,നിലവിലുള്ള ശാരീരിക
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ഈ സെയിൽസ് പേഴ്സൺ വേണ്ടി ലക്ഷ്യങ്ങളിലൊന്നാണ് ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള സജ്ജമാക്കുക.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[ദിനങ്ങൾ] ചെന്നവർ സ്റ്റോക്കുകൾ ഫ്രീസ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,വരി # {0}: അസറ്റ് നിർണയത്തിനുള്ള അസറ്റ് വാങ്ങൽ / വില്പനയ്ക്ക് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,വരി # {0}: അസറ്റ് നിർണയത്തിനുള്ള അസറ്റ് വാങ്ങൽ / വില്പനയ്ക്ക് നിര്ബന്ധമാണ്
 DocType: Asset Maintenance Team,Maintenance Team Name,പരിപാലന ടീം പേര്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","രണ്ടോ അതിലധികമോ പ്രൈസിങ് നിയമങ്ങൾ മുകളിൽ നിബന്ധനകൾ അടിസ്ഥാനമാക്കി കണ്ടെത്തിയാൽ, മുൻഗണന പ്രയോഗിക്കുന്നു. സ്വതവേയുള്ള മൂല്യം പൂജ്യം (ഇടുക) പോൾ മുൻഗണന 0 20 വരെ തമ്മിലുള്ള ഒരു എണ്ണം. ഹയർ എണ്ണം ഒരേ ഉപാധികളോടെ ഒന്നിലധികം വിലനിർണ്ണയത്തിലേക്ക് അവിടെ കണ്ടാൽ അതിനെ പ്രാധാന്യം എന്നാണ്."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ഉപഭോക്താവ് &#39;ഓപ്പർച്യുനിറ്റി ഫ്രം&#39; കസ്റ്റമർ ആയി തിരഞ്ഞെടുത്തിട്ടുണ്ടെങ്കിൽ കസ്റ്റമർ നിർബന്ധമാണ്
@@ -4827,19 +4862,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ചിലവിടൽ ക്ലെയിം തരം.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ഇനം {0} നിരക്ക് വിൽക്കുന്ന അധികം അതിന്റെ {1} കുറവാണ്. വിൽക്കുന്ന നിരക്ക് കുറയാതെ {2} ആയിരിക്കണം
-DocType: Item,Taxes,നികുതികൾ
+DocType: Subscription,Taxes,നികുതികൾ
 DocType: Purchase Invoice,capital goods,മൂലധന സാമഗ്രികൾ
 DocType: Purchase Invoice Item,Weight Per Unit,യൂണിറ്റിന് ഒരു തൂക്കം
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറി"
 DocType: Project,Default Cost Center,സ്ഥിരസ്ഥിതി ചെലവ് കേന്ദ്രം
-DocType: Bank Guarantee,End Date,അവസാന ദിവസം
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ഓഹരി ഇടപാടുകൾ
 DocType: Budget,Budget Accounts,ബജറ്റ് അക്കൗണ്ടുകൾ
 DocType: Employee,Internal Work History,ആന്തരിക വർക്ക് ചരിത്രം
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,സ്വകാര്യ ഓഹരി
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,വിതരണക്കാരൻ സ്കോർബോർഡ് വേരിയബിൾ
-DocType: Employee Loan,Fully Disbursed,പൂർണ്ണമായി വിതരണം
 DocType: Employee Advance,Due Advance Amount,പ്രീ ഡി അഡ്വാൻസ് തുക
 DocType: Maintenance Visit,Customer Feedback,കസ്റ്റമർ ഫീഡ്ബാക്ക്
 DocType: Account,Expense,ചിലവേറിയ
@@ -4863,7 +4896,7 @@
 ,Employee Information,ജീവനക്കാരുടെ വിവരങ്ങൾ
 DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,വിൽപ്പനയ്ക്കായി വാങ്ങുന്നതിനും വാങ്ങുന്നതിനുമുള്ള സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റുകൾ സൃഷ്ടിക്കുന്നു.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,മൂല്യനിർണ്ണയ ഫല റിക്കോഡ് {0} ഇതിനകം നിലവിലുണ്ട്.
@@ -4871,7 +4904,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ശൂന്യമായ ഫിൽട്ടർ ഗ്രൂപ്പ് &#39;കമ്പനി&#39; എങ്കിൽ കമ്പനി സജ്ജമാക്കുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,പോസ്റ്റുചെയ്ത തീയതി ഭാവി തീയതി കഴിയില്ല
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},വരി # {0}: സീരിയൽ ഇല്ല {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,ആവർത്തനത്തെ സൃഷ്ടിക്കുന്നതിന്
 DocType: Stock Entry,Target Warehouse Address,ടാർഗറ്റ് വേൾഹൗസ് വിലാസം
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,കാഷ്വൽ ലീവ്
 DocType: Agriculture Task,End Day,അന്ത്യ ദിനം
@@ -4896,11 +4928,10 @@
 DocType: Material Request,% Ordered,% ക്രമപ്പെടുത്തിയ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള സ്റ്റുഡന്റ് ഗ്രൂപ്പ്, കോഴ്സ് പ്രോഗ്രാം എൻറോൾമെന്റ് എൻറോൾ കോഴ്സുകൾ നിന്ന് എല്ലാ വിദ്യാർത്ഥികൾക്കും വേണ്ടി സാധൂകരിക്കാൻ ചെയ്യും."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
 DocType: Share Balance,From No,ഇല്ല
 DocType: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
 DocType: Employee,History In Company,കമ്പനിയിൽ ചരിത്രം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{Sender} ൽ നിന്നുള്ള പുതിയ സന്ദേശം
 DocType: Customer,Customer Primary Address,ഉപഭോക്താവ് പ്രൈമറി വിലാസം
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,വാർത്താക്കുറിപ്പുകൾ
 DocType: Drug Prescription,Description/Strength,വിവരണം / ദൃഢത
@@ -4909,22 +4940,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി
 DocType: Department,Leave Block List,ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
 DocType: Purchase Invoice,Tax ID,നികുതി ഐഡി
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. കോളം ശ്യൂന്യമായിടണം
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. കോളം ശ്യൂന്യമായിടണം
 DocType: Accounts Settings,Accounts Settings,ക്രമീകരണങ്ങൾ അക്കൗണ്ടുകൾ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,അംഗീകരിക്കുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} എന്നതിനായുള്ള വൈകല്യമുള്ള വിലാസം, തുടരാൻ ദയവായി പരിഹരിക്കുക."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} എന്നതിനായുള്ള വൈകല്യമുള്ള വിലാസം, തുടരാൻ ദയവായി പരിഹരിക്കുക."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","പുതിയ അക്കൌണ്ടിന്റെ എണ്ണം, അത് മുൻഗണനയായി അക്കൗണ്ട് നാമത്തിൽ ഉൾപ്പെടുത്തും"
 DocType: Maintenance Team Member,Team Member,ടീം അംഗം
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,സമർപ്പിക്കുന്നതിന് ഫലങ്ങളൊന്നുമില്ല
 DocType: Customer,Sales Partner and Commission,"സെയിൽസ് പങ്കാളി, കമ്മീഷൻ"
-DocType: Employee Loan,Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം
+DocType: Loan,Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം
 ,Project Quantity,പദ്ധതി ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം"
 DocType: Opportunity,To Discuss,ചർച്ച ചെയ്യാൻ
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
 DocType: Loan Type,Rate of Interest (%) Yearly,പലിശ നിരക്ക് (%) വാർഷികം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,താൽക്കാലിക അക്കൗണ്ടുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ബ്ലാക്ക്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,താൽക്കാലിക അക്കൗണ്ടുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ബ്ലാക്ക്
 DocType: BOM Explosion Item,BOM Explosion Item,BOM പൊട്ടിത്തെറി ഇനം
 DocType: Shareholder,Contact List,കോൺടാക്റ്റ് പട്ടിക
 DocType: Account,Auditor,ഓഡിറ്റർ
@@ -4932,16 +4963,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} നിർമ്മിക്കുന്ന ഇനങ്ങൾ
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,കൂടുതലറിവ് നേടുക
 DocType: Cheque Print Template,Distance from top edge,മുകളറ്റത്തെ നിന്നുള്ള ദൂരം
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,വില ലിസ്റ്റ് {0} പ്രവർത്തനരഹിതമാക്കി അല്ലെങ്കിൽ നിലവിലില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,വില ലിസ്റ്റ് {0} പ്രവർത്തനരഹിതമാക്കി അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Purchase Invoice,Return,മടങ്ങിവരവ്
 DocType: Pricing Rule,Disable,അപ്രാപ്തമാക്കുക
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","കൂടുതൽ ഓപ്ഷനുകൾക്ക് ആസ്തി, സീരിയൽ നോസ്, ബാച്ച്സ് മുതലായവക്കായി പൂർണ്ണമായി എഡിറ്റുചെയ്യുക."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,നിയമനങ്ങളും കൺസൾട്ടേഷനുകളും
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ബാച്ച് {2} എൻറോൾ ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","അത് ഇതിനകം {1} പോലെ അസറ്റ്, {0} ബോംബെടുക്കുന്നവനും കഴിയില്ല"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,പരിശോധനകൾ ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,പരിശോധനകൾ ആവശ്യമാണ്
 DocType: Task,Total Expense Claim (via Expense Claim),(ചിലവിടൽ ക്ലെയിം വഴി) ആകെ ചിലവേറിയ ക്ലെയിം
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,മാർക് േചാദി
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,കമ്പനി സജ്ജമാക്കുന്നതിൽ പരാജയപ്പെട്ടു
@@ -4953,7 +4984,7 @@
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,വിളകൾ &amp; ലാൻഡ്സ്
 DocType: Cheque Print Template,Regular,സ്ഥിരമായ
 DocType: Fertilizer,Density (if liquid),സാന്ദ്രത (ലിക്വിഡ് ആണെങ്കിൽ)
@@ -4978,24 +5009,26 @@
 DocType: Payment Entry,Paid Amount,തുക
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,സെൽസ് സൈക്കിൾ പര്യവേക്ഷണം ചെയ്യുക
 DocType: Assessment Plan,Supervisor,പരിശോധക
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,സ്റ്റോക്ക് എൻട്രി നിലനിർത്തൽ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,സ്റ്റോക്ക് എൻട്രി നിലനിർത്തൽ
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
 ,Work Order Stock Report,വർക്ക് ഓർഡർ സ്റ്റോക്ക് റിപ്പോർട്ട്
+DocType: Purchase Receipt,Auto Repeat Detail,സ്വയം ആവർത്തിക്കുക വിശദാംശം
 DocType: Assessment Result Tool,Assessment Result Tool,അസസ്മെന്റ് ഫലം ടൂൾ
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,സൂപ്പർവൈസർ ആയി
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,വിഭാഗം നിർദ്ദേശിക്കുക
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ലേക്ക് സ്ക്രാപ്പ് ഇനം
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
 DocType: Project,Total Billable Amount (via Timesheets),ആകെ ബില്ലബിൾ തുക (ടൈംഷെറ്റുകൾ വഴി)
 DocType: Agriculture Task,Previous Business Day,മുമ്പത്തെ വ്യാപാര ദിനം
-DocType: Employee Loan,Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം
+DocType: Loan,Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം
 DocType: Employee,Health Insurance No,ആരോഗ്യ ഇൻഷ്വറൻസ് നമ്പർ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ക്രെഡിറ്റ് നോട്ട് ശാരീരിക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ക്രെഡിറ്റ് നോട്ട് ശാരീരിക
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,നികുതി അടയ്ക്കാനുള്ള തുക
 DocType: Employee External Work History,Employee External Work History,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
 DocType: Opening Invoice Creation Tool,Purchase,വാങ്ങൽ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ബാലൻസ് Qty
@@ -5006,16 +5039,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} വേണ്ടി
 DocType: Healthcare Settings,Valid number of days,ദിവസങ്ങൾ സാധുതയുള്ളതാണ്
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ചെലവ് സെന്ററുകൾ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,സബ്സ്ക്രിപ്ഷൻ പുനരാരംഭിക്കുക
 DocType: Land Unit,Linked Plant Analysis,ലിങ്കുചെയ്ത പ്ലാൻ അനാലിസിസ്
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,വിതരണക്കമ്പനിയായ നാണയത്തിൽ കമ്പനിയുടെ അടിത്തറ കറൻസി മാറ്റുമ്പോൾ തോത്
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},വരി # {0}: വരി ടൈമിങ്സ് തർക്കങ്ങൾ {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,സീറോ മൂലധനം നിരക്ക് അനുവദിക്കുക
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,സീറോ മൂലധനം നിരക്ക് അനുവദിക്കുക
+DocType: Bank Guarantee,Receiving,സ്വീകരിക്കുന്നത്
 DocType: Training Event Employee,Invited,ക്ഷണിച്ചു
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ഒന്നിലധികം സജീവ ശമ്പളം ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,സെറ്റപ്പ് ഗേറ്റ്വേ അക്കൗണ്ടുകൾ.
 DocType: Employee,Employment Type,തൊഴിൽ തരം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,നിശ്ചിത ആസ്തികൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,നിശ്ചിത ആസ്തികൾ
 DocType: Payment Entry,Set Exchange Gain / Loss,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം സജ്ജമാക്കുക
 ,GST Purchase Register,ചരക്കുസേവന വാങ്ങൽ രജിസ്റ്റർ
 ,Cash Flow,ധനപ്രവാഹം
@@ -5036,9 +5071,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,എല്ലാ പങ്കിടൽ ഇടപാടുകളുടെയും ലിസ്റ്റ്
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,സ്ഥലം പരിശോധന എണ്ണം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,സ്ഥലം പരിശോധന എണ്ണം
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},{0} # {1} ചേർക്കപ്പട്ടവ ദയവായി
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ട്രയൽ കാലയളവ് ആരംഭിക്കുക തീയതിയും ട്രയൽ കാലയളവും അവസാന തീയതി സജ്ജമാക്കണം
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ശരാശരി നിരക്ക്
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,മൊത്തം പേയ്മെന്റ് തുക പേയ്മെന്റ് ഷെഡ്യൂൾ ഗ്രാൻഡ് / വൃത്തത്തിലുള്ള മൊത്തമായി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,മൊത്തം പേയ്മെന്റ് തുക പേയ്മെന്റ് ഷെഡ്യൂൾ ഗ്രാൻഡ് / വൃത്തത്തിലുള്ള മൊത്തമായി തുല്യമായിരിക്കണം
+DocType: Subscription Plan Detail,Plan,പദ്ധതി
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ജനറൽ ലെഡ്ജർ പ്രകാരം ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Job Applicant,Applicant Name,അപേക്ഷകന് പേര്
 DocType: Authorization Rule,Customer / Item Name,കസ്റ്റമർ / ഇനം പേര്
@@ -5068,6 +5104,7 @@
 DocType: Work Order,Warehouses,അബദ്ധങ്ങളും
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} അസറ്റ് കൈമാറാൻ കഴിയില്ല
 DocType: Hotel Room Pricing,Hotel Room Pricing,ഹോട്ടൽ മുറികൾ
+DocType: Subscription,Days Until Due,Due വരെ ദിവസം
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ഈ ഇനം {0} (ഫലകം) ഒരു പാഠം.
 DocType: Workstation,per hour,മണിക്കൂറിൽ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,പർച്ചേസിംഗ്
@@ -5076,13 +5113,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","അടിസ്ഥാനമാക്കിയുള്ള സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ബാച്ച് വേണ്ടി, സ്റ്റുഡന്റ് ബാച്ച് പ്രോഗ്രാം എൻറോൾമെന്റ് നിന്നും എല്ലാ വിദ്യാർത്ഥികൾക്കും വേണ്ടി സാധൂകരിക്കാൻ ചെയ്യും."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,വിതരണം
+DocType: Journal Entry Account,Loan,വായ്പ
 DocType: Expense Claim Advance,Expense Claim Advance,ചെലവ് ക്ലെയിം അഡ്വാൻസ്
 DocType: Lab Test,Report Preference,മുൻഗണന റിപ്പോർട്ടുചെയ്യുക
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,സ്വമേധയാ വിവരങ്ങൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,പ്രോജക്റ്റ് മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,പ്രോജക്റ്റ് മാനേജർ
 ,Quoted Item Comparison,ഉദ്ധരിച്ച ഇനം താരതമ്യം
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},"{0}, {1} എന്നിവയ്ക്കിടയിലുള്ള സ്കോറിംഗ് ഓവർലാപ്പ് ചെയ്യുക"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ഡിസ്പാച്ച്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ഡിസ്പാച്ച്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ഇനത്തിന്റെ അനുവദിച്ചിട്ടുള്ള പരമാവധി കുറഞ്ഞ: {0} ആണ് {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,പോലെ വല അസറ്റ് മൂല്യം
 DocType: Crop,Produce,ഉൽപ്പാദിപ്പിക്കുക
@@ -5092,7 +5130,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ഉപഭോഗം
 DocType: Item Alternative,Alternative Item Code,ഇതര ഇന കോഡ്
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,സജ്ജമാക്കാൻ ക്രെഡിറ്റ് പരിധി ഇടപാടുകള് സമർപ്പിക്കാൻ അനുവാദമുള്ളൂ ആ റോൾ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Delivery Stop,Delivery Stop,ഡെലിവറി സ്റ്റോപ്പ്
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
@@ -5102,15 +5140,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,സോപ്പ് &amp; മാലിനനിര്മാര്ജനി
 DocType: BOM,Show Items,ഇനങ്ങൾ കാണിക്കുക
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,കാലാകാലങ്ങളിൽ ശ്രേഷ്ഠ പാടില്ല.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ഇമെയിൽ വഴി എല്ലാ ഉപഭോക്താക്കളെയും നിങ്ങൾക്ക് അറിയിക്കാൻ താൽപ്പര്യമുണ്ടോ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ഇമെയിൽ വഴി എല്ലാ ഉപഭോക്താക്കളെയും നിങ്ങൾക്ക് അറിയിക്കാൻ താൽപ്പര്യമുണ്ടോ?
+DocType: Subscription Plan,Billing Interval,ബില്ലിംഗ് ഇടവേള
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,മോഷൻ പിക്ചർ &amp; വീഡിയോ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,പുനരാരംഭിക്കുക
 DocType: Hub Settings,Hub Username,ഹബ് യൂസർ
 DocType: Salary Detail,Component,ഘടകം
 DocType: Assessment Criteria,Assessment Criteria Group,അസസ്മെന്റ് മാനദണ്ഡം ഗ്രൂപ്പ്
 DocType: Healthcare Settings,Patient Name By,വഴി രോഗിയുടെ പേര്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} മുതൽ {1} വരെയുള്ള ശമ്പളത്തിനായി കൃത്യമായ ജേണൽ എൻട്രി
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} മുതൽ {1} വരെയുള്ള ശമ്പളത്തിനായി കൃത്യമായ ജേണൽ എൻട്രി
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
 DocType: Warehouse,Warehouse Name,വെയർഹൗസ് പേര്
 DocType: Naming Series,Select Transaction,ഇടപാട് തിരഞ്ഞെടുക്കുക
@@ -5124,23 +5162,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ഇവിടെ നിങ്ങൾ ഉയരം, ഭാരം, അലർജി, മെഡിക്കൽ ആശങ്കകൾ മുതലായവ നിലനിർത്താൻ കഴിയും"
 DocType: Leave Block List,Applies to Company,കമ്പനി പ്രയോഗിക്കുന്നു
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
-DocType: Employee Loan,Disbursement Date,ചിലവ് തീയതി
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;സ്വീകർത്താക്കൾ&#39; വ്യക്തമാക്കിയിട്ടില്ല
+DocType: Loan,Disbursement Date,ചിലവ് തീയതി
 DocType: BOM Update Tool,Update latest price in all BOMs,എല്ലാ BOM കളിലും പുതിയ വില അപ്ഡേറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,മെഡിക്കൽ റെക്കോർഡ്
 DocType: Vehicle,Vehicle,വാഹനം
 DocType: Purchase Invoice,In Words,വാക്കുകളിൽ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,സമർപ്പിക്കുന്നതിനു മുമ്പായി ബാങ്കിന്റെ അല്ലെങ്കിൽ വായ്പ നൽകുന്ന സ്ഥാപനത്തിന്റെ പേര് നൽകുക.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: POS Profile,Item Groups,ഇനം ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
 DocType: Sales Order Item,For Production,ഉത്പാദനത്തിന്
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,അക്കൗണ്ടുകളുടെ ചാർട്ടിൽ ഒരു താൽക്കാലിക തുറക്കൽ അക്കൗണ്ട് ചേർക്കുക
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,അക്കൗണ്ടുകളുടെ ചാർട്ടിൽ ഒരു താൽക്കാലിക തുറക്കൽ അക്കൗണ്ട് ചേർക്കുക
 DocType: Customer,Customer Primary Contact,ഉപഭോക്താവ് പ്രാഥമിക കോൺടാക്റ്റ്
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,കാലാവധി അവസാനിക്കൽ ജേർണൽ
 DocType: Project Task,View Task,കാണുക ടാസ്ക്
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,സ്ഥലം പരിശോധന / ലീഡ്%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,സ്ഥലം പരിശോധന / ലീഡ്%
+DocType: Bank Guarantee,Bank Guarantee Type,ബാങ്ക് ഗ്യാരണ്ടി തരം
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ഇൻവോയ്സ് പോസിഷൻ
 ,Asset Depreciations and Balances,അസറ്റ് Depreciations നീക്കിയിരിപ്പും
@@ -5151,9 +5190,8 @@
 DocType: Production Plan,Include Subcontracted Items,സബ്കോൺട്രാക്റ്റഡ് ഇനങ്ങൾ ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ചേരുക
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,സ്റ്റോക്ക് ട്രാന്സിഷനുശേഷം വ്യത്യാസമായ സ്വഭാവസവിശേഷത മാറ്റാന് കഴിയില്ല. ഇത് ചെയ്യുന്നതിന് നിങ്ങൾ ഒരു പുതിയ വസ്തു സൃഷ്ടിക്കേണ്ടി വരും.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
-DocType: Employee Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+DocType: Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
 DocType: Leave Application,LAP/,ലാപ് /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
 DocType: Salary Slip,Salary Slip,ശമ്പളം ജി
@@ -5177,11 +5215,11 @@
 DocType: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ഇനം ഗ്രൂപ്പ് പട്ടികയിൽ കണ്ടെത്തി തനിപ്പകർപ്പ് ഇനം ഗ്രൂപ്പ്
 DocType: Land Unit,Parent Land Unit,പാരന്റ് ലാൻഡ് യൂണിറ്റ്
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
 DocType: Fertilizer,Fertilizer Name,രാസവളത്തിന്റെ പേര്
 DocType: Salary Slip,Net Pay,നെറ്റ് വേതനം
 DocType: Cash Flow Mapping Accounts,Account,അക്കൗണ്ട്
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,സീരിയൽ ഇല്ല {0} ഇതിനകം ലഭിച്ചു ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,സീരിയൽ ഇല്ല {0} ഇതിനകം ലഭിച്ചു ചെയ്തു
 ,Requested Items To Be Transferred,മാറ്റിയത് അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Expense Claim,Vehicle Log,വാഹന ലോഗ്
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),പനിവിന്റെ സാന്നിധ്യം (താൽക്കാലിക&gt; 38.5 ° C / 101.3 ° F അല്ലെങ്കിൽ സുസ്ഥിരമായ താപനില&gt; 38 ° C / 100.4 ° F)
@@ -5221,39 +5259,39 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം."
 DocType: Asset Maintenance,Manufacturing User,ണം ഉപയോക്താവ്
 DocType: Purchase Invoice,Raw Materials Supplied,നൽകിയത് അസംസ്കൃത വസ്തുക്കൾ
-DocType: C-Form,Series,സീരീസ്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},വിലവിവരങ്ങളുടെ നാണയം {0} {1} അല്ലെങ്കിൽ {2} ആയിരിക്കണം
 DocType: Appraisal,Appraisal Template,അപ്രൈസൽ ഫലകം
 DocType: Soil Texture,Ternary Plot,ടെർണറി പ്ലോട്ട്
 DocType: Item Group,Item Classification,ഇനം തിരിക്കൽ
 DocType: Driver,License Number,ലൈസൻസ് നമ്പർ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ബിസിനസ് ഡെവലപ്മെന്റ് മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ബിസിനസ് ഡെവലപ്മെന്റ് മാനേജർ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,മെയിൻറനൻസ് സന്ദർശിക്കുക ഉദ്ദേശ്യം
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ഇൻവോയ്സ് രോഗി രജിസ്ട്രേഷൻ
 DocType: Crop,Period,കാലാവധി
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,ജനറൽ ലെഡ്ജർ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ജീവനക്കാർ {0} ന് അവധിയിൽ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ജീവനക്കാർ {0} ന് അവധിയിൽ {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,കാണുക നയിക്കുന്നു
 DocType: Program Enrollment Tool,New Program,പുതിയ പ്രോഗ്രാം
 DocType: Item Attribute Value,Attribute Value,ന്റെതിരച്ചറിവിനു്തെറ്റായധാര്മ്മികമൂല്യം
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 DocType: Salary Detail,Salary Detail,ശമ്പള വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
 DocType: Appointment Type,Physician,വൈദ്യൻ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,കൺസൾട്ടേഷനുകൾ
 DocType: Sales Invoice,Commission,കമ്മീഷൻ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,നിർമാണ സമയം ഷീറ്റ്.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ആകെത്തുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,സ്റ്റോക്ക് ഇടപാടിനുശേഷം വ്യത്യാസമായ സ്വഭാവസവിശേഷത മാറ്റാനാവില്ല. ഇത് ചെയ്യുന്നതിന് നിങ്ങൾ ഒരു പുതിയ വസ്തു സൃഷ്ടിക്കേണ്ടി വരും.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA മാൻഡേറ്റ്
 DocType: Physician,Charges,നിരക്കുകൾ
 DocType: Production Plan,Get Items For Work Order,വർക്ക് ഓർഡർ ഇനങ്ങൾ നേടുക
 DocType: Salary Detail,Default Amount,സ്ഥിരസ്ഥിതി തുക
 DocType: Lab Test Template,Descriptive,വിവരണാത്മക
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ഈ മാസം ചുരുക്കം
 DocType: Quality Inspection Reading,Quality Inspection Reading,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ വായന
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,നിങ്ങളുടെ കമ്പനിയ്ക്കായി നിങ്ങൾ നേടാൻ ആഗ്രഹിക്കുന്ന ഒരു സെയിൽ ഗോൾ സജ്ജമാക്കുക.
 ,Project wise Stock Tracking,പ്രോജക്ട് ജ്ഞാനികൾ സ്റ്റോക്ക് ട്രാക്കിംഗ്
@@ -5281,11 +5319,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,വെബ്സൈറ്റ് സൃഷ്ടിക്കുന്നതിൽ പരാജയപ്പെട്ടു
 DocType: Soil Analysis,Mg/K,എം ജി / കെ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM പരിവർത്തന വിശദാംശം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,സൂക്ഷിക്കൽ സ്റ്റോക്ക് എൻട്രി ഇതിനകം സൃഷ്ടിച്ചു അല്ലെങ്കിൽ മാതൃകാ അളവ് നൽകിയിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,സൂക്ഷിക്കൽ സ്റ്റോക്ക് എൻട്രി ഇതിനകം സൃഷ്ടിച്ചു അല്ലെങ്കിൽ മാതൃകാ അളവ് നൽകിയിട്ടില്ല
 DocType: Program,Program Abbreviation,പ്രോഗ്രാം സംഗ്രഹം
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്
 DocType: Warranty Claim,Resolved By,തന്നെയാണ പരിഹരിക്കപ്പെട്ട
-DocType: Bank Guarantee,Start Date,തുടങ്ങുന്ന ദിവസം
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ഒരു കാലയളവിൽ ഇല മതി.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,തെറ്റായി മായ്ച്ചു ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
@@ -5300,11 +5337,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,മണിക്കൂറുകൾ
 DocType: Project,Expected Start Date,പ്രതീക്ഷിച്ച ആരംഭ തീയതി
 DocType: Purchase Invoice,04-Correction in Invoice,04-ഇൻവോയ്സിലെ തിരുത്തൽ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM- ൽ ഉള്ള എല്ലാ ഇനങ്ങൾക്കുമായി സൃഷ്ടിച്ച ഓർഡർ ഇതിനകം സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM- ൽ ഉള്ള എല്ലാ ഇനങ്ങൾക്കുമായി സൃഷ്ടിച്ച ഓർഡർ ഇതിനകം സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,വേരിയന്റ് വിശദാംശങ്ങൾ റിപ്പോർട്ട് ചെയ്യുക
 DocType: Setup Progress Action,Setup Progress Action,സെറ്റപ്പ് പുരോഗതി ആക്ഷൻ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,വിലവിപണി വാങ്ങൽ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,വിലവിപണി വാങ്ങൽ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ചാർജ് ആ ഇനത്തിനും ബാധകമായ എങ്കിൽ ഇനം നീക്കം
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,സബ്സ്ക്രിപ്ഷൻ റദ്ദാക്കുക
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,മെയിന്റനന്റ് സ്റ്റാറ്റസ് പൂർത്തിയാക്കുക അല്ലെങ്കിൽ പൂർത്തിയാക്കൽ തീയതി നീക്കം ചെയ്യുക തിരഞ്ഞെടുക്കുക
 DocType: Supplier,Default Payment Terms Template,സ്ഥിരസ്ഥിതി പേമെന്റ് നിബന്ധനകൾ ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ഇടപാട് കറൻസി പേയ്മെന്റ് ഗേറ്റ്വേ കറൻസി അതേ ആയിരിക്കണം
@@ -5315,7 +5353,6 @@
 DocType: Employee,Educational Qualification,വിദ്യാഭ്യാസ യോഗ്യത
 DocType: Workstation,Operating Costs,ഓപ്പറേറ്റിംഗ് വിലയും
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,സൂക്ഷിക്കുന്നത് പ്രതിമാസം ബജറ്റ് നടപടികൾ കവിഞ്ഞു
-DocType: Subscription,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
 DocType: Asset,Disposal Date,തീർപ്പ് തീയതി
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ഇമെയിലുകൾ അവർ അവധി ഇല്ലെങ്കിൽ, തന്നിരിക്കുന്ന നാഴിക കമ്പനിയുടെ എല്ലാ സജീവ ജീവനക്കാർക്ക് അയയ്ക്കും. പ്രതികരണങ്ങളുടെ സംഗ്രഹം അർദ്ധരാത്രിയിൽ അയയ്ക്കും."
@@ -5334,6 +5371,7 @@
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Cheque Print Template,Cheque Print Template,ചെക്ക് പ്രിന്റ് ഫലകം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ചെലവ് സെന്റേഴ്സ് ചാർട്ട്
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,സബ്സ്ക്രിപ്ഷൻ റദ്ദാക്കുന്നതിന് മുമ്പായി ഇൻവോയ്സ് തീയതി കഴിഞ്ഞതിന് ശേഷമുള്ള ദിവസങ്ങൾ അല്ലെങ്കിൽ അടയ്ക്കപ്പെടാത്തതായി സബ്സ്ക്രിപ്ഷൻ അടയാളപ്പെടുത്തുന്നു
 DocType: Lab Test Template,Sample Collection,സാമ്പിൾ ശേഖരണം
 ,Requested Items To Be Ordered,ക്രമപ്പെടുത്തിയ അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Price List,Price List Name,വില പട്ടിക പേര്
@@ -5342,7 +5380,7 @@
 DocType: Account,Income,ആദായ
 DocType: Industry Type,Industry Type,വ്യവസായം തരം
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,എന്തോ കുഴപ്പം സംഭവിച്ചു!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,സെയിൽസ് ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു
 DocType: Supplier Scorecard Scoring Criteria,Score,സ്കോർ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,സാമ്പത്തിക വർഷത്തെ {0} നിലവിലില്ല
@@ -5362,12 +5400,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് പ്രൊഫൈൽ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0-നും 100-നും ഇടയിലുള്ള ഒരു മൂല്യമായിരിക്കണം
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,ലഭ്യമായ മൂല്യവിനിമയ തീയതിക്ക് മുമ്പുള്ള വില വ്യത്യാസപ്പെടുത്തൽ തീയതി ആയിരിക്കരുത്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,മുൻവാതിൽ വായ്പകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,മുൻവാതിൽ വായ്പകൾ
 DocType: Cost Center,Cost Center Name,കോസ്റ്റ് സെന്റർ പേര്
 DocType: Student,B+,B &#39;
 DocType: HR Settings,Max working hours against Timesheet,Timesheet നേരെ മാക്സ് ജോലി സമയം
 DocType: Maintenance Schedule Detail,Scheduled Date,ഷെഡ്യൂൾഡ് തീയതി
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ആകെ പണമടച്ചു ശാരീരിക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ആകെ പണമടച്ചു ശാരീരിക
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 അക്ഷരങ്ങളിൽ കൂടുതൽ ഗുരുതരമായത് സന്ദേശങ്ങൾ ഒന്നിലധികം സന്ദേശങ്ങൾ വിഭജിക്കും
 DocType: Purchase Receipt Item,Received and Accepted,ലഭിച്ച അംഗീകരിക്കപ്പെടുകയും
 DocType: Hub Settings,Company and Seller Profile,കമ്പനിയും വിൽപ്പനക്കാരന്റെ പ്രൊഫൈലും
@@ -5381,10 +5419,9 @@
 DocType: Item,Variant Based On,വേരിയന്റ് അടിസ്ഥാനമാക്കിയുള്ള
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,ദയവായി അത് ശരിയാക്കുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
 DocType: Request for Quotation Item,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,അജ്ഞാത
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,നിന്നു ലഭിച്ച
 DocType: Lead,Converted,പരിവർത്തനം
@@ -5398,6 +5435,7 @@
 DocType: Asset,Assets,അസറ്റുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,കമ്പ്യൂട്ടർ
 DocType: Item,List this Item in multiple groups on the website.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
+DocType: Subscription,Current Invoice End Date,നിലവിലെ ഇൻവോയ്സ് അവസാന തീയതി
 DocType: Payment Term,Due Date Based On,നിശ്ചിത തീയതി അടിസ്ഥാനമാക്കിയ തീയതി
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,സെറ്റിംഗ്സ് ക്രമീകരണങ്ങളിൽ സ്ഥിരസ്ഥിതി ഉപഭോക്തൃ ഗ്രൂപ്പും പ്രദേശവും ക്രമീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} നിലവിലില്ല
@@ -5405,7 +5443,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,ഇനം: {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ജേർണൽ എൻട്രിയ്ക്കായി റീഫെയ്നുകളൊന്നും തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
+DocType: Loan,Disbursed,വിതരണം ചെയ്തു
 DocType: Healthcare Settings,Laboratory Settings,ലബോറട്ടറി ക്രമീകരണം
 DocType: Patient Appointment,Service Unit,സർവീസ് യൂണിറ്റ്
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,വിതരണക്കാരൻ വിജയകരമായി സജ്ജമാക്കുക
@@ -5418,12 +5458,12 @@
 DocType: Share Balance,No of Shares,ഷെയറുകളുടെ എണ്ണം
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,നില തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
 DocType: School House,House Name,ഹൗസ് പേര്
 DocType: Fee Schedule,Total Amount per Student,വിദ്യാർത്ഥിക്ക് ആകെ തുക
 DocType: Purchase Taxes and Charges,Account Head,അക്കൗണ്ട് ഹെഡ്
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ഇലക്ട്രിക്കൽ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ഇലക്ട്രിക്കൽ
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,നിങ്ങളുടെ ഉപയോക്താക്കളെ നിങ്ങളുടെ ഓർഗനൈസേഷന്റെ ബാക്കി ചേർക്കുക. നിങ്ങൾക്ക് ബന്ധങ്ങൾ നിന്ന് ചേർത്തുകൊണ്ട് നിങ്ങളുടെ പോർട്ടൽ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ചേർക്കാൻ കഴിയും
 DocType: Stock Entry,Total Value Difference (Out - In),(- ഔട്ട്) ആകെ മൂല്യം വ്യത്യാസം
 DocType: Grant Application,Requested Amount,അഭ്യർത്ഥിച്ച തുക
@@ -5433,7 +5473,7 @@
 DocType: Crop Cycle,Detected Diseases,രോഗബാധയുള്ള രോഗങ്ങൾ
 DocType: Stock Entry,Default Source Warehouse,സ്ഥിരസ്ഥിതി ഉറവിട വെയർഹൗസ്
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 DocType: Asset Maintenance Task,Last Completion Date,അവസാനം പൂർത്തിയാക്കിയ തീയതി
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
@@ -5441,9 +5481,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless ക്രമീകരണങ്ങൾ
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,സ്റ്റോക്ക് അസറ്റുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,സ്റ്റോക്ക് അസറ്റുകൾ
 DocType: Restaurant,Active Menu,സജീവ മെനു
 DocType: Target Detail,Target Qty,ടാർജറ്റ് Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},വായ്പയ്ക്കെതിരെയുള്ളത്: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ചെക്കൗട്ട് ക്രമീകരണങ്ങൾ
 DocType: Student Attendance,Present,ഇപ്പോഴത്തെ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിയ്ക്കാൻ വേണം
@@ -5452,9 +5493,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
 DocType: Vehicle Log,Odometer,ഓഡോമീറ്റർ
 DocType: Production Plan Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
 DocType: Chapter,Chapter Head,അധ്യായം ശീർഷകം
 DocType: Payment Term,Month(s) after the end of the invoice month,ഇൻവോയ്സ് മാസം അവസാനിച്ചതിന് ശേഷം മാസം (മാസം)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
@@ -5462,11 +5503,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ശമ്പളം സ്ലിപ്പിൽ ജനറേറ്റുചെയ്യൂ
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ലാബ് ഫലത്തിന്റെ കാലാവധി സമയവിവരപ്പട്ടിക പരിശോധിക്കുന്നതിനു മുമ്പുള്ളതായിരിക്കരുത്
 DocType: POS Profile,Allow user to edit Discount,ഡിസ്കൗണ്ട് എഡിറ്റുചെയ്യാൻ ഉപയോക്താവിനെ അനുവദിക്കുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ഉപഭോക്താക്കളിൽ നിന്ന് വാങ്ങുക
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ഉപഭോക്താക്കളിൽ നിന്ന് വാങ്ങുക
 DocType: Purchase Invoice Item,Include Exploded Items,എക്സ്പ്ലോഡഡ് ഇനങ്ങൾ ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","ബാധകമായ വേണ്ടി {0} തിരഞ്ഞെടുക്കപ്പെട്ടു എങ്കിൽ വാങ്ങൽ, ചെക്ക് ചെയ്തിരിക്കണം"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ഡിസ്കൗണ്ട് 100 താഴെ ആയിരിക്കണം
 DocType: Shipping Rule,Restrict to Countries,രാജ്യങ്ങളിലേയ്ക്ക് നിയന്ത്രിക്കുക
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
 DocType: Sales Invoice Timesheet,Billing Hours,ബില്ലിംഗ് മണിക്കൂർ
 DocType: Project,Total Sales Amount (via Sales Order),ആകെ വില്പന തുക (സെയിൽസ് ഓർഡർ വഴി)
@@ -5485,6 +5527,7 @@
 DocType: Soil Texture,Sandy Clay,സാൻഡി ക്ലേ
 DocType: Grant Application,Assessment  Manager,മൂല്യനിർണ്ണയ മാനേജർ
 DocType: Payment Entry,Allocate Payment Amount,പേയ്മെന്റ് തുക വിനിയോഗിക്കുക
+DocType: Subscription Plan,Subscription Plan,സബ്സ്ക്രിപ്ഷൻ പ്ലാൻ
 DocType: Employee External Work History,Salary,ശമ്പളം
 DocType: Serial No,Delivery Document Type,ഡെലിവറി ഡോക്യുമെന്റ് തരം
 DocType: Sales Order,Partly Delivered,ഭാഗികമായി കൈമാറി
@@ -5508,9 +5551,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,എയ്ജിങ് ശ്രേണി 2
 DocType: SG Creation Tool Course,Max Strength,മാക്സ് ദൃഢത
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,പ്രീസെറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യുന്നു
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ഉപഭോക്താവിന് {@} ഡെലിവറി നോട്ട് തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ഉപഭോക്താവിന് {@} ഡെലിവറി നോട്ട് തിരഞ്ഞെടുത്തിട്ടില്ല
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിച്ചു
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ഡെലിവറി തീയതി അടിസ്ഥാനമാക്കിയുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ഡെലിവറി തീയതി അടിസ്ഥാനമാക്കിയുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Grant Application,Has any past Grant Record,ഏതെങ്കിലും മുൻകാല ഗ്രാന്റാഡ് റെക്കോർഡ് ഉണ്ട്
 ,Sales Analytics,സെയിൽസ് അനലിറ്റിക്സ്
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ലഭ്യമായ {0}
@@ -5529,7 +5572,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,അസംസ്കൃത വസ്തുക്കൾ ചെലവ് നൽകിയത്
 DocType: Selling Settings,Settings for Selling Module,അതേസമയം മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: Hotel Room Reservation,Hotel Room Reservation,ഹോട്ടൽ മുറികൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,കസ്റ്റമർ സർവീസ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,കസ്റ്റമർ സർവീസ്
 DocType: BOM,Thumbnail,ലഘുചിത്രം
 DocType: Item Customer Detail,Item Customer Detail,ഇനം ഉപഭോക്തൃ വിശദാംശം
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,സ്ഥാനാർഥി ഒരു ജോലി ഓഫര്.
@@ -5546,7 +5589,7 @@
 DocType: Fees,Student Details,വിദ്യാർത്ഥിയുടെ വിശദാംശങ്ങൾ
 DocType: Purchase Invoice Item,Stock Qty,ഓഹരി അളവ്
 DocType: Purchase Invoice Item,Stock Qty,ഓഹരി അളവ്
-DocType: Employee Loan,Repayment Period in Months,മാസങ്ങളിലെ തിരിച്ചടവ് കാലാവധി
+DocType: Loan,Repayment Period in Months,മാസങ്ങളിലെ തിരിച്ചടവ് കാലാവധി
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,പിശക്: സാധുവായ ഐഡി?
 DocType: Naming Series,Update Series Number,അപ്ഡേറ്റ് സീരീസ് നമ്പർ
 DocType: Account,Equity,ഇക്വിറ്റി
@@ -5555,7 +5598,7 @@
 DocType: Task,Closing Date,അവസാന തീയതി
 DocType: Sales Order Item,Produced Quantity,നിർമ്മാണം ക്വാണ്ടിറ്റി
 DocType: Timesheet,Work Detail,ജോലി വിശദാംശം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,എഞ്ചിനീയർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,എഞ്ചിനീയർ
 DocType: Journal Entry,Total Amount Currency,ആകെ തുക കറൻസി
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,തിരച്ചിൽ സബ് അസംബ്ലീസ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
@@ -5601,13 +5644,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,സംഭാവന നൽകുന്ന വിവരങ്ങൾ.
 DocType: Request for Quotation,Supplier Detail,വിതരണക്കാരൻ വിശദാംശം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ പിശക്: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Invoiced തുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Invoiced തുക
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,മാനദണ്ഡങ്ങളുടെ ഘടന 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,ഹാജർ
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,ഓഹരി ഇനങ്ങൾ
 DocType: BOM,Materials,മെറ്റീരിയൽസ്
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ചെക്കുചെയ്യാത്തത്, പട്ടിക അത് ബാധകമായി ഉണ്ട് എവിടെ ഓരോ വകുപ്പ് ചേർക്കും വരും."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} സൃഷ്ടിക്കുന്നു
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് ഒന്നുതന്നെയായിരിക്കരുത്"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,തീയതിയും പോസ്റ്റിംഗ് സമയം ചേർക്കൽ നിർബന്ധമായും
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ഇടപാടുകൾ വാങ്ങിയതിന് നികുതി ടെംപ്ലേറ്റ്.
@@ -5631,14 +5673,14 @@
 DocType: Shipping Rule,Fixed,നിശ്ചിത
 DocType: Vehicle Service,Clutch Plate,ക്ലച്ച് പ്ലേറ്റ്
 DocType: Company,Round Off Account,അക്കൗണ്ട് ഓഫാക്കുക റൌണ്ട്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,അഡ്മിനിസ്ട്രേറ്റീവ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,അഡ്മിനിസ്ട്രേറ്റീവ് ചെലവുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,കൺസൾട്ടിംഗ്
 DocType: Customer Group,Parent Customer Group,പാരന്റ് ഉപഭോക്തൃ ഗ്രൂപ്പ്
-DocType: Journal Entry,Subscription,സബ്സ്ക്രിപ്ഷൻ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,സബ്സ്ക്രിപ്ഷൻ
 DocType: Purchase Invoice,Contact Email,കോൺടാക്റ്റ് ഇമെയിൽ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ഫീസ് ക്രിയേഷൻ തീർപ്പാക്കിയിരിക്കുന്നു
 DocType: Appraisal Goal,Score Earned,സ്കോർ നേടി
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,നോട്ടീസ് പിരീഡ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,നോട്ടീസ് പിരീഡ്
 DocType: Asset Category,Asset Category Name,അസറ്റ് വിഭാഗത്തിന്റെ പേര്
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ഇത് ഒരു റൂട്ട് പ്രദേശത്തിന്റെ ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,പുതിയ സെയിൽസ് വ്യക്തി നാമം
@@ -5652,7 +5694,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
 DocType: Asset,Frequency of Depreciation (Months),മൂല്യത്തകർച്ചയെത്തുടർന്ന് ഫ്രീക്വൻസി (മാസം)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
 DocType: Landed Cost Item,Landed Cost Item,റജിസ്റ്റർ ചെലവ് ഇനം
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,പൂജ്യം മൂല്യങ്ങൾ കാണിക്കുക
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,അസംസ്കൃത വസ്തുക്കളുടെ തന്നിരിക്കുന്ന അളവിൽ നിന്ന് തിരസ്കൃതമൂല്യങ്ങള് / നിര്മ്മാണ ശേഷം ഇനത്തിന്റെ അളവ്
@@ -5660,7 +5702,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,സ്വീകാ / അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Delivery Note Item,Against Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം എഗെൻസ്റ്റ്
 DocType: Hub Settings,Company Logo,കമ്പനി ലോഗോ
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
 DocType: Healthcare Settings,Patient Registration,രോഗി രജിസ്ട്രേഷൻ
@@ -5695,11 +5737,10 @@
 DocType: Journal Entry,Total Debit,ആകെ ഡെബിറ്റ്
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,സ്വതേ ഉത്പ്പന്ന വെയർഹൗസ് പൂർത്തിയായി
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,ദയവായി രോഗി തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,സെയിൽസ് വ്യാക്തി
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,സെയിൽസ് വ്യാക്തി
 DocType: Hotel Room Package,Amenities,സൌകര്യങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,പണമടയ്ക്കലിന്റെ സ്ഥിരസ്ഥിതി മോഡ് അനുവദനീയമല്ല
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,വേണ്ടി
 ,Appointment Analytics,അപ്പോയിന്റ്മെൻറ് അനലിറ്റിക്സ്
 DocType: Vehicle Service,Half Yearly,പകുതി വാർഷികം
 DocType: Lead,Blog Subscriber,ബ്ലോഗ് സബ്സ്ക്രൈബർ
@@ -5716,6 +5757,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,നിങ്ങൾ പ്രതിവർഷം വിദ്യാർത്ഥികളുടെ ഗ്രൂപ്പുകൾ ഉണ്ടാക്കുന്ന ശൂന്യമായിടൂ
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ചെക്കുചെയ്തിട്ടുണ്ടെങ്കിൽ ആകെ എങ്കിൽ. ത്തി ദിവസം വരയന് ഉൾപ്പെടുത്തും, ഈ സാലറി ദിവസം മൂല്യം കുറയ്ക്കും"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","നിലവിലെ കീ ഉപയോഗിക്കുന്ന അപ്ലിക്കേഷനുകൾക്ക് ആക്സസ് ചെയ്യാൻ കഴിയില്ല, നിങ്ങൾക്ക് ഉറപ്പാണോ?"
+DocType: Subscription Settings,Prorate,പ്രോറേറ്റ്
 DocType: Purchase Invoice,Total Advance,ആകെ മുൻകൂർ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ടെംപ്ലേറ്റ് കോഡ് മാറ്റുക
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ടേം അവസാന തീയതി ടേം ആരംഭ തീയതി മുമ്പുള്ള പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
@@ -5727,8 +5769,9 @@
 DocType: Opportunity Item,Basic Rate,അടിസ്ഥാന റേറ്റ്
 DocType: GL Entry,Credit Amount,ക്രെഡിറ്റ് തുക
 DocType: Cheque Print Template,Signatory Position,ഒപ്പുടമയുടെ സ്ഥാനം
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
 DocType: Timesheet,Total Billable Hours,ആകെ ബില്ലടയ്ക്കണം മണിക്കൂർ
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,വരിക്കാരൻ ഈ സബ്സ്ക്രിപ്ഷൻ സൃഷ്ടിച്ച ഇൻവോയ്സുകൾ അടയ്ക്കേണ്ട ദിവസങ്ങളുടെ എണ്ണം
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,പേയ്മെന്റ് രസീത് കുറിപ്പ്
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ഇത് ഈ കസ്റ്റമർ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},വരി {0}: തുക {1} പേയ്മെന്റ് എൻട്രി തുക {2} ലേക്ക് കുറവോ തുല്യം ആയിരിക്കണം
@@ -5746,12 +5789,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ഈ ജോലിയില് ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
 DocType: Assessment Result,Summary,സംഗ്രഹം
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,മാർക്ക് അറ്റൻഡൻസ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
 DocType: Fiscal Year,Year Start Date,വർഷം ആരംഭ തീയതി
 DocType: Attendance,Employee Name,ജീവനക്കാരുടെ പേര്
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,റെസ്റ്റോറന്റ് ഓർഡർ ഇനം
@@ -5763,7 +5806,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,വാങ്ങൽ തുക
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Work Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},ഷെയറുകള് {0}
@@ -5771,12 +5814,12 @@
 DocType: Asset,Out of Order,പ്രവർത്തനരഹിതം
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
 DocType: Projects Settings,Ignore Workstation Time Overlap,വർക്ക്സ്റ്റേഷൻ സമയം ഓവർലാപ്പ് അവഗണിക്കുക
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ബാച്ച് നമ്പറുകൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,പ്രോജക്ട് ഐഡി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
 DocType: Patient Service Unit,Medical Administrator,മെഡിക്കൽ അഡ്മിനിസ്ട്രേറ്റർ
 DocType: Assessment Plan,Schedule,ഷെഡ്യൂൾ
 DocType: Account,Parent Account,പാരന്റ് അക്കൗണ്ട്
@@ -5806,15 +5849,16 @@
 DocType: Asset Repair,Repair Status,അറ്റകുറ്റപ്പണി നില
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
 DocType: POS Profile,Account for Change Amount,തുക മാറ്റത്തിനായി അക്കൗണ്ട്
 DocType: Purchase Invoice,input service,ഇൻപുട്ട് സേവനം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 DocType: Maintenance Team Member,Maintenance Team Member,മെയിൻറനൻസ് ടീം അംഗം
 DocType: Agriculture Analysis Criteria,Soil Analysis,മണ്ണ് വിശകലനം
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,കോഴ്സ് കോഡ്:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ചിലവേറിയ നൽകുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Employee,Current Address,ഇപ്പോഴത്തെ വിലാസം
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ഇനത്തിന്റെ മറ്റൊരു ഇനത്തിന്റെ ഒരു വകഭേദം ഇതാണെങ്കിൽ കീഴ്വഴക്കമായി വ്യക്തമാക്കപ്പെടുന്നതുവരെ പിന്നെ വിവരണം, ചിത്രം, ഉള്ളവയും, നികുതികൾ തുടങ്ങിയവ ടെംപ്ലേറ്റിൽ നിന്നും ആയിരിക്കും"
 DocType: Serial No,Purchase / Manufacture Details,വാങ്ങൽ / ഉത്പാദനം വിവരങ്ങൾ
@@ -5863,19 +5907,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},വേണ്ടി {0} പ്രവേശനം
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","ബജറ്റുകൾ സ്ഥാപിക്കുന്നതിനുള്ള Seasonality, ടാർഗറ്റുകൾ തുടങ്ങിയവ"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,വേരിയബിൾ പേര്
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
 DocType: Asset,Asset Category,അസറ്റ് വർഗ്ഗം
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,നെറ്റ് വേതനം നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
 DocType: Soil Texture,Loamy Sand,ലോമഡി മണൽ
 DocType: Production Plan,Material Request Planning,മെറ്റീരിയൽ അഭ്യർത്ഥന ആസൂത്രണം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ത്രെഷോൾഡ് {0}% ഒന്നിലധികം തവണ ലഭ്യമാകുന്നു
 DocType: Expense Claim,Employees Email Id,എംപ്ലോയീസ് ഇമെയിൽ ഐഡി
 DocType: Employee Attendance Tool,Marked Attendance,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,നിലവിലുള്ള ബാധ്യതകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,നിലവിലുള്ള ബാധ്യതകൾ
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,നൽകിയിട്ടുള്ള മണിക്കൂർ ടൈമർ കവിഞ്ഞു.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,സമ്പർക്കങ്ങളിൽ പിണ്ഡം എസ്എംഎസ് അയയ്ക്കുക
 DocType: Patient,A Positive,ഒരു പോസിറ്റീവ്
@@ -5886,9 +5930,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,യഥാർത്ഥ Qty നിർബന്ധമായും
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡ് ഉണ്ട്, ഈ വിതരണക്കാരന് പർച്ചേസ് ഓർഡറുകൾ മുൻകരുതൽ നൽകണം."
 DocType: Asset Maintenance Team,Asset Maintenance Team,അസറ്റ് മെയിന്റനൻസ് ടീം
-DocType: Employee Loan,Loan Type,ലോൺ ഇനം
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} വിജയകരമായി സമർപ്പിച്ചു
+DocType: Loan,Loan Type,ലോൺ ഇനം
 DocType: Scheduling Tool,Scheduling Tool,സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ക്രെഡിറ്റ് കാർഡ്
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ക്രെഡിറ്റ് കാർഡ്
 DocType: BOM,Item to be manufactured or repacked,ഇനം നിർമിക്കുന്ന അല്ലെങ്കിൽ repacked ചെയ്യേണ്ട
 DocType: Employee Education,Major/Optional Subjects,മേജർ / ഓപ്ഷണൽ വിഷയങ്ങൾ
 DocType: Sales Invoice Item,Drop Ship,ഡ്രോപ്പ് കപ്പൽ
@@ -5920,7 +5965,7 @@
 DocType: Item,Units of Measure,അളവിന്റെ യൂണിറ്റുകൾ
 DocType: Manufacturing Settings,Allow Production on Holidays,അവധിദിനങ്ങളിൽ പ്രൊഡക്ഷൻ അനുവദിക്കുക
 DocType: Sales Invoice,Customer's Purchase Order Date,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ തീയതി
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
 DocType: Shopping Cart Settings,Show Public Attachments,പൊതു അറ്റാച്മെന്റ് കാണിക്കുക
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം വിശദാംശങ്ങൾ
 DocType: Restaurant Reservation,Reservation Time,റിസർവേഷൻ സമയം
@@ -5935,7 +5980,7 @@
 DocType: Purchase Order,To Receive and Bill,സ്വീകരിക്കുക ബിൽ ചെയ്യുക
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,വരി # {0}: തീയതി അനുസരിച്ച് ട്രാൻസാക്ഷൻ തീയതിക്ക് മുമ്പായിരിക്കരുത്
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,തിരഞ്ഞെടുത്ത ഉൽപ്പന്നം
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ഡിസൈനർ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ഡിസൈനർ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,നിബന്ധനകളും വ്യവസ്ഥകളും ഫലകം
 DocType: Serial No,Delivery Details,ഡെലിവറി വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
@@ -5945,20 +5990,20 @@
 DocType: Driver,Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
 DocType: Healthcare Settings,Employee name and designation in print,അച്ചടി ജീവനക്കാരന്റെ പേരും പദവിയും
 ,accounts-browser,അക്കൗണ്ടുകൾ-ബ്രൗസർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/projects.py +13,Project master.,പ്രോജക്ട് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","മേൽ-ബില്ലിംഗ് അല്ലെങ്കിൽ മേൽ-ക്രമം ഓഹരി ക്രമീകരണങ്ങൾ അല്ലെങ്കിൽ ഇനത്തിൽ, അപ്ഡേറ്റ് &quot;അലവൻസ്&quot; അനുവദിക്കുക."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,കറൻസികൾ വരെ തുടങ്ങിയവ $ പോലുള്ള ഏതെങ്കിലും ചിഹ്നം അടുത്ത കാണിക്കരുത്.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(അര ദിവസം)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(അര ദിവസം)
 DocType: Payment Term,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ലാ ടെസ്റ്റുകൾ നേടുന്നതിന് ദയവായി രോഗിയെ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ലീഡ് സമയം ദിനങ്ങൾ
 DocType: Cash Flow Mapping,Is Income Tax Expense,ആദായ നികുതി ചെലവ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,വിദ്യാർത്ഥി ഇൻസ്റ്റിറ്റ്യൂട്ട് ഹോസ്റ്റൽ വസിക്കുന്നു എങ്കിൽ ഈ പരിശോധിക്കുക.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
 ,Stock Summary,ഓഹരി ചുരുക്കം
@@ -5969,10 +6014,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,റഫറൻസ് തീയതി
 DocType: Employee,Reason for Leaving,പോകാനുള്ള കാരണം
 DocType: BOM Operation,Operating Cost(Company Currency),ഓപ്പറേറ്റിങ് ചെലവ് (കമ്പനി കറൻസി)
-DocType: Employee Loan Application,Rate of Interest,പലിശ നിരക്ക്
+DocType: Loan Application,Rate of Interest,പലിശ നിരക്ക്
 DocType: Expense Claim Detail,Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക
 DocType: Item,Shelf Life In Days,ദിനങ്ങളിൽ ഷെൽഫ് ലൈഫ്
 DocType: GL Entry,Is Opening,തുറക്കുകയാണ്
+DocType: Department,Expense Approvers,ചെലവ് പരിധികൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
 DocType: Journal Entry,Subscription Section,സബ്സ്ക്രിപ്ഷൻ വിഭാഗം
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index e5abe03..532321b 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,साहित्य भेट रद्द करा {0} हा हमी दावा रद्द होण्यापुर्वी रद्द करा
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,मूल्यांकन अहवाल
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
-DocType: Purchase Receipt,Subscription Detail,सदस्यता तपशील
 DocType: Supplier Scorecard,Notify Supplier,पुरवठादार सूचित करा
 DocType: Item,Customer Items,ग्राहक आयटम
 DocType: Project,Costing and Billing,भांडवलाच्या आणि बिलिंग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक लेजर असू शकत नाही
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करण्यासाठी आयटम प्रकाशित
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ईमेल सूचना
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,मूल्यमापन
 DocType: Item,Default Unit of Measure,माप डीफॉल्ट युनिट
 DocType: SMS Center,All Sales Partner Contact,सर्व विक्री भागीदार संपर्क
-DocType: Employee,Leave Approvers,रजा साक्षीदार
+DocType: Department,Leave Approvers,रजा साक्षीदार
 DocType: Sales Partner,Dealer,विक्रेता
 DocType: Work Order,WO-,डब्ल्यूओ-
 DocType: Consultation,Investigations,अन्वेषण
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,उपलब्धता तपासा
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,हे या पुरवठादार विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,कायदेशीर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},प्रत्यक्ष प्रकार कर सलग बाबींचा दर समाविष्ट केले जाऊ शकत नाही {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,कायदेशीर
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},प्रत्यक्ष प्रकार कर सलग बाबींचा दर समाविष्ट केले जाऊ शकत नाही {0}
 DocType: Bank Guarantee,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,ने  आवश्यक
 DocType: Delivery Note,Return Against Delivery Note,डिलिव्हरी टीप विरुद्ध परत
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,प्रमुख (किंवा गट) ज्या लेखा नोंदी केले जातात व शिल्लक ठेवली आहेत.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} साठीची बाकी   शून्य ({1}) पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,प्रक्रियेसाठी कोणतेही जमा वेतन स्लिप्स नाहीत.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,प्रक्रियेसाठी कोणतेही जमा वेतन स्लिप्स नाहीत.
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,रजा प्रकारचे नाव
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुल्या दर्शवा
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,उपरोक्त आवर्तीसाठी आजच ही क्रिया करणे आवश्यक आहे
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,चेकआऊट
 DocType: Pricing Rule,Apply On,रोजी लागू करा
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,सर्व पुरवठादार संपर्क
 DocType: Support Settings,Support Settings,समर्थन सेटिंग्ज
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,बॅच बाबींचा कालावधी समाप्ती स्थिती
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,बँक ड्राफ्ट
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,बँक ड्राफ्ट
 DocType: Membership,membership validaty section,सदस्यता वैधता विभाग
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
 DocType: Consultation,Consultation,सल्ला
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,साहित्य
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,वेबसाइट बनविणे
 DocType: Opening Invoice Creation Tool Item,Quantity,प्रमाण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),कर्ज (दायित्व)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
 DocType: Item,Country of Origin,मूळ देश
 DocType: Soil Texture,Soil Texture Criteria,माती बनावट मानदंड
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,प्राथमिक संपर्क तपशील
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,खुल्या समस्या
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी  {1} ला  नियुक्त केले आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी  {1} ला  नियुक्त केले आहे
 DocType: Lab Test Groups,Add new line,नवीन ओळ जोडा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,हेल्थ केअर
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भरणा विलंब (दिवस)
@@ -89,7 +85,7 @@
 ,Delay Days,विलंब दिवस
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,चलन
+DocType: Subscription Invoice,Invoice,चलन
 DocType: Purchase Invoice Item,Item Weight Details,आयटम वजन तपशील
 DocType: Asset Maintenance Log,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},सलग  {0}: {1} {2}  हे  {3}सह जुळत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,रो # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,रो # {0}:
 DocType: Timesheet,Total Costing Amount,एकूण भांडवलाच्या रक्कम
 DocType: Delivery Note,Vehicle No,वाहन क्रमांक
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,कृपया किंमत सूची निवडा
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,कार्य प्रगती मध्ये आहे
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,कृपया तारीख निवडा
 DocType: Daily Work Summary Group,Holiday List,सुट्टी यादी
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,लेखापाल
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,लेखापाल
 DocType: Hub Settings,Selling Price List,किंमत सूची विक्री
 DocType: Patient,Tobacco Current Use,तंबाखू वर्तमान वापर
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,विक्री दर
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,विक्री दर
 DocType: Cost Center,Stock User,शेअर सदस्य
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए + एमजी) / के
 DocType: Company,Phone No,फोन नाही
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},नवी {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,आरंभिक ईमेल सूचना पाठविले
 ,Sales Partners Commission,विक्री भागीदार आयोग
 DocType: Soil Texture,Sandy Clay Loam,वालुकामय चिकणमाती लोम
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,मूल्य घसारा केल्यानंतर
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,संबंधित
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,उपस्थिती तारीख कर्मचारी सामील तारीख पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,उपस्थिती तारीख कर्मचारी सामील तारीख पेक्षा कमी असू शकत नाही
 DocType: Grading Scale,Grading Scale Name,प्रतवारी स्केल नाव
-DocType: Subscription,Repeat on Day,दिवसाची पुनरावृत्ती करा
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,हे  रूट खाते आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Sales Invoice,Company Address,कंपनीचा पत्ता
 DocType: BOM,Operations,ऑपरेशन्स
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},सवलत साठी आधारावर अधिकृतता सेट करू शकत नाही {0}
+DocType: Subscription,Subscription Start Date,सदस्यता प्रारंभ तारीख
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दोन स्तंभ, जुना नाव आणि एक नवीन नाव एक .csv फाइल संलग्न"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} कोणत्याही सक्रिय आर्थिक वर्षात.
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, आयटम कोड: {1} आणि ग्राहक: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,चाचणी कालावधी समाप्ती तारीख चाचणी कालावधी प्रारंभ दिनांक आधी होऊ शकत नाही
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,जॉब साठी उघडत आहे.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{1} पंक्तीमधील उपसाक्षीकरणासाठी {{1} बीओएम निर्दिष्ट नाही
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनीने  एका  पेक्षा अधिक प्रवेश केला आहे
 DocType: Patient,Married,लग्न
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ला परवानगी नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,आयटम मिळवा
 DocType: Price List,Price Not UOM Dependant,किंमत नाही UOM अवलंबित्व
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,कर प्रकार
 ,Completed Work Orders,पूर्ण झालेले कार्य ऑर्डर
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,करपात्र रक्कम
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,करपात्र रक्कम
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: BOM,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नसेल  तर)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: संदर्भ दस्तऐवज प्रकार हा खर्च दावा किंवा जर्नल एंट्री असावा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: संदर्भ दस्तऐवज प्रकार हा खर्च दावा किंवा जर्नल एंट्री असावा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM निवडा
 DocType: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,कर्मचार्यास दिलेली आगाऊ रक्कम व्यवस्थापित करा
@@ -200,20 +196,20 @@
 DocType: Delivery Trip,Delivery Notification,वितरण सूचना
 DocType: Journal Entry,Opening Entry,उघडणे प्रवेश
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,केवळ खाते वेतन
-DocType: Employee Loan,Repay Over Number of Periods,"कालावधी, म्हणजे क्रमांक परत फेड करा"
+DocType: Loan,Repay Over Number of Periods,"कालावधी, म्हणजे क्रमांक परत फेड करा"
 DocType: Stock Entry,Additional Costs,अतिरिक्त खर्च
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट मधे रूपांतरीत केले जाऊ शकत नाही.
 DocType: Lead,Product Enquiry,उत्पादन चौकशी
 DocType: Education Settings,Validate Batch for Students in Student Group,विद्यार्थी गट मध्ये विद्यार्थ्यांसाठी बॅच प्रमाणित
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},रजा रेकॉर्ड कर्मचारी आढळला नाही {0} साठी {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},रजा रेकॉर्ड कर्मचारी आढळला नाही {0} साठी {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"पहिली  कंपनीची
 यादी  प्रविष्ट करा"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,कृपया पहिले कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,कृपया पहिले कंपनी निवडा
 DocType: Employee Education,Under Graduate,पदवीधर अंतर्गत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,कृपया एचआर सेटिंग्जमध्ये रजा स्थिती सूचना देण्यासाठी डीफॉल्ट टेम्पलेट सेट करा.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,लक्ष्य रोजी
 DocType: BOM,Total Cost,एकूण खर्च
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,कर्मचारी कर्ज
 DocType: Fee Schedule,Send Payment Request Email,पेमेंट विनंती ईमेल पाठवा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,आयटम {0} प्रणालीत  अस्तित्वात नाही किंवा कालबाह्य झाला आहे
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,स्थावर मालमत्ता
@@ -233,21 +229,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,यशस्वीरित्या नोंदणी रद्द न केलेले
 DocType: Assessment Result,Grade,ग्रेड
 DocType: Restaurant Table,No of Seats,सीटची संख्या
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","डायनॅमिक विषय जोडण्यासाठी, जेंजा टॅग्जचा वापर करा <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: Asset Maintenance Task,Asset Maintenance Task,मालमत्ता देखभाल कार्य
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,वार्षिक पगार
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,वार्षिक पगार
 DocType: Daily Work Summary,Daily Work Summary,दररोज काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} गोठविले
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,शेअर खर्च
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,शेअर खर्च
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,लक्ष्य वखार निवडा
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,लक्ष्य वखार निवडा
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,प्रविष्ट करा प्राधान्य संपर्क ईमेल
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,प्रविष्ट करा प्राधान्य संपर्क ईमेल
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAxNum
 DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
@@ -268,7 +261,7 @@
 DocType: Customer,Primary Address,प्राथमिक पत्ता
 DocType: Production Plan,Material Request Detail,साहित्य विनंती तपशील
 DocType: Selling Settings,Default Quotation Validity Days,डीफॉल्ट कोटेशन वैधता दिवस
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,रक्कम बदल
@@ -278,26 +271,28 @@
 DocType: Driver,Driving License Categories,ड्रायव्हिंग लायसेन्स श्रेण्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,कृपया वितरण तारीख प्रविष्ट करा
 DocType: Depreciation Schedule,Make Depreciation Entry,घसारा प्रवेश करा
+DocType: HR Settings,Leave Settings,सेटिंग्ज सोडा
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,विनंती प्रकार
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,कर्मचारी करा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),पीओएसची सेटअप मोड (ऑनलाइन / ऑफलाइन)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,कार्य ऑर्डर विरुद्ध वेळ लॉग तयार करणे अक्षम करते कार्य ऑर्डर विरुद्ध ऑपरेशन्सचा मागोवा घेतला जाणार नाही
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,कार्यवाही
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,कार्यवाही
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Asset Maintenance Log,Maintenance Status,देखभाल स्थिती
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,सदस्यता तपशील
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: पुरवठादार देय खात्यावरील आवश्यक आहे {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,आयटम आणि किंमत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},एकूण तास: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},तारीख पासून आर्थिक वर्षाच्या आत असावे. गृहीत धरा तारीख पासून  = {0}
 DocType: Drug Prescription,Interval,मध्यंतर
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,प्राधान्य
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,प्राधान्य
 DocType: Grant Application,Individual,वैयक्तिक
 DocType: Academic Term,Academics User,शैक्षणिक वापरकर्ता
 DocType: Cheque Print Template,Amount In Figure,आकृती मध्ये रक्कम
-DocType: Employee Loan Application,Loan Info,कर्ज माहिती
+DocType: Loan Application,Loan Info,कर्ज माहिती
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,देखभाल भेटींसाठी योजना.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,पुरवठादार धावसंख्याकार्ड कालावधी
 DocType: Share Transfer,Share Transfer,हस्तांतरण सामायिक करा
@@ -313,7 +308,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,आयटम टेम्पलेट
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,बायोकेमेस्ट्री
 DocType: Job Offer,Select Terms and Conditions,अटी आणि नियम निवडा
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,मूल्य Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,मूल्य Qty
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce सेटिंग्ज
 DocType: Production Plan,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
@@ -336,10 +331,12 @@
 DocType: Selling Settings,Default Territory,मुलभूत प्रदेश
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,दूरदर्शन
 DocType: Work Order Operation,Updated via 'Time Log',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ग्राहक किंवा पुरवठादार निवडा.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
 DocType: Company,Enable Perpetual Inventory,शा्वत यादी सक्षम
+DocType: Bank Guarantee,Charges Incurred,शुल्क आकारले
 DocType: Company,Default Payroll Payable Account,डीफॉल्ट वेतनपट देय खाते
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,ईमेल गट सुधारणा
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
@@ -363,7 +360,7 @@
 DocType: Lab Test,Custom Result,सानुकूल परिणाम
 DocType: Delivery Stop,Contact Name,संपर्क नाव
 DocType: Course Assessment Criteria,Course Assessment Criteria,अर्थात मूल्यांकन निकष
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,कर क्रमांक:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,कर क्रमांक:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,विद्यार्थी ओळखपत्र:
 DocType: POS Customer Group,POS Customer Group,POS ग्राहक गट
 DocType: Land Unit,Land Unit describing various land assets,जमीन एकक विविध जमिनींचे वर्णन करतात
@@ -376,9 +373,8 @@
 ,Open Work Orders,ओपन वर्क ऑर्डर
 DocType: Payment Term,Credit Months,क्रेडिट महीना
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,निव्वळ वेतन 0 पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","सिस्टमवरून पुनरावृत्त त्रुटी सूचना पाठविणे थांबविण्यासाठी, आम्ही सदस्यता मधील अक्षम फील्ड तपासले आहे"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,रजा वर्ष प्रति
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,रजा वर्ष प्रति
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: कृपया  ' आगाऊ आहे' खाते {1} विरुद्ध  ही  एक आगाऊ नोंद असेल  तर तपासा.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},कोठार{0}  कंपनी {1} ला  संबंधित नाही
 DocType: Email Digest,Profit & Loss,नफा व तोटा
@@ -386,9 +382,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,विद्यार्थी गटांद्वारे विद्यार्थी सेट करा
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,बँक नोंदी
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,रजा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,बँक नोंदी
 DocType: Crop,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन क्रमांक
@@ -396,7 +392,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,विद्यार्थी गट तयार साधन कोर्स
 DocType: Lead,Do Not Contact,संपर्क करू नका
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,आपल्या संस्थेतील शिकविता लोक
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,सॉफ्टवेअर डेव्हलपर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान ऑर्डर Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Course Scheduling Tool,Course Start Date,कोर्स प्रारंभ तारीख
@@ -405,8 +401,8 @@
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,खरेदी तपशील
@@ -442,9 +438,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,कमाल ग्रेड
 DocType: Email Digest,New Quotations,नवी अवतरणे
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,प्राधान्य ईमेल कर्मचारी निवड आधारित कर्मचारी ईमेल पगारपत्रक
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 DocType: Tax Rule,Shipping County,शिपिंग परगणा
-apps/erpnext/erpnext/config/desktop.py +167,Learn,जाणून घ्या
+apps/erpnext/erpnext/config/desktop.py +159,Learn,जाणून घ्या
 DocType: Asset,Next Depreciation Date,पुढील घसारा दिनांक
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी दर क्रियाकलाप खर्च
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
@@ -454,7 +449,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,थकबाकी चेक आणि स्पष्ट ठेवी
 DocType: Item,Synced With Hub,हबला  समक्रमित
 DocType: Driver,Fleet Manager,वेगवान व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},पंक्ती # {0}: {1} आयटम नकारात्मक असू शकत नाही {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},पंक्ती # {0}: {1} आयटम नकारात्मक असू शकत नाही {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
@@ -476,7 +471,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},कृपया {0 वर हॉटेल रूम रेट सेट करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Opening Invoice Creation Tool,Invoice Type,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,डिलिव्हरी टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,डिलिव्हरी टीप
 DocType: Consultation,Encounter Impression,एन्काउंटर इंप्रेशन
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,विक्री मालमत्ता खर्च
@@ -504,11 +499,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहक बेस चलन रूपांतरित दर
 DocType: Course Scheduling Tool,Course Scheduling Tool,अर्थात अनुसूचित साधन
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,% S साठी आवर्त% s तयार करताना [त्वरित] त्रुटी
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
 DocType: Land Unit,LInked Analysis,LInked विश्लेषण
 DocType: Item Tax,Tax Rate,कर दर
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,अर्ज कालावधी दोन वाटपांच्या रेकॉर्डमध्ये असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,अर्ज कालावधी दोन वाटपांच्या रेकॉर्डमध्ये असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
@@ -522,7 +516,7 @@
 DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,विद्यार्थी गट तयार करा
 DocType: Volunteer,Weekends,आठवड्याचे शेवटचे दिवस
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,क्रेडिट टीप रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,क्रेडिट टीप रक्कम
 DocType: Setup Progress Action,Action Document,क्रिया दस्तऐवज
 DocType: Chapter Member,Website URL,वेबसाइट URL
 ,Finished Goods,तयार वस्तू
@@ -536,6 +530,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,आयटम जोडा
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आयटम गुणवत्ता तपासणी मापदंड
+DocType: Leave Application,Leave Approver Name,रजा साक्षीदारा चे   नाव
 DocType: Depreciation Schedule,Schedule Date,वेळापत्रक तारीख
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","कमाई, वजावट आणि इतर पगार घटक"
 DocType: Packed Item,Packed Item,पॅक केलेला  आयटम
@@ -554,7 +549,7 @@
 DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
 DocType: Healthcare Settings,Require Lab Test Approval,लॅब चाचणी मान्यता आवश्यक
 DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,एकूण शिल्लक
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,एकूण शिल्लक
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
 DocType: Dosage Strength,Strength,सामर्थ्य
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,एक नवीन ग्राहक तयार करा
@@ -567,7 +562,7 @@
 DocType: Workstation,Consumable Cost,Consumable खर्च
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 DocType: Student Log,Medical,वैद्यकीय
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,तोट्याचे  कारण
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,तोट्याचे  कारण
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,खाते क्रमांक अद्यतनित करा
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,आघाडी मालक लीड म्हणून समान असू शकत नाही
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,रक्कम unadjusted रक्कम अधिक करू शकता
@@ -577,11 +572,10 @@
 DocType: Lab Test Template,Single,सिंगल
 DocType: Salary Slip,Total Loan Repayment,एकूण कर्ज परतफेड
 DocType: Account,Cost of Goods Sold,माल किंमत विक्री
-DocType: Subscription,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
 DocType: Drug Prescription,Dosage,डोस
 DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,सरासरी. विक्री दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,सरासरी. विक्री दर
 DocType: Assessment Plan,Examiner Name,परीक्षक नाव
 DocType: Lab Test Template,No Result,निकाल नाही
 DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
@@ -590,6 +584,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,पहिल्या कंपनीचे नाव प्रविष्ट करा
 DocType: Purchase Invoice,Supplier Name,पुरवठादार नाव
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मॅन्युअल वाचा
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,कॅलेंडरमध्ये सर्व विभागातील सभासदांची पाने दर्शवा
 DocType: Purchase Invoice,01-Sales Return,01-सेल्स रिटर्न
 DocType: Account,Is Group,गट आहे
 DocType: Email Digest,Pending Purchase Orders,खरेदी प्रलंबित आदेश
@@ -607,13 +602,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,अनिवार्य फील्ड - शैक्षणिक वर्ष
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} सह संबंधित नाही
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,प्रास्ताविक मजकूर सानुकूलित करा जो ईमेलचा  एक भाग म्हणून जातो.   प्रत्येक व्यवहाराला स्वतंत्र प्रास्ताविक मजकूर आहे.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},कंपनी मुलभूत देय खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},कंपनी मुलभूत देय खाते सेट करा {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},स्टॉप वर्क ऑर्डर {0} विरुद्ध व्यवहाराला परवानगी नाही
 DocType: Setup Progress Action,Min Doc Count,किमान डॉक्टर संख्या
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया साठीचे ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,खाती फ्रोजन पर्यंत
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
@@ -637,8 +632,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,विक्रीसाठी राखीव
 DocType: Packing Slip,From Package No.,संकुल क्रमांक पासून
 DocType: Item Attribute,To Range,श्रेणी
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", बदलू शकत नाही मूल्यांकन पद्धत काही आयटम विरुद्ध व्यवहार जे नाही आहेत म्हणून स्वत: च्या मूल्यांकन पद्धत आहे"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,सिक्युरिटीज आणि ठेवी
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", बदलू शकत नाही मूल्यांकन पद्धत काही आयटम विरुद्ध व्यवहार जे नाही आहेत म्हणून स्वत: च्या मूल्यांकन पद्धत आहे"
 DocType: Student Report Generation Tool,Attended by Parents,पालकांनी उपस्थित
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,वाटप एकूण रजा  अनिवार्य आहे
 DocType: Patient,AB Positive,अबाला सकारात्मक
@@ -647,7 +642,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिती रेकॉर्ड
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित उपयोग पे रोल पगार घटक.
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
-DocType: Employee Loan,Total Payment,एकूण भरणा
+DocType: Loan,Total Payment,एकूण भरणा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,पूर्ण वर्क ऑर्डरसाठी व्यवहार रद्द करू शकत नाही
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिये च्या  दरम्यानची  वेळ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} कारवाई पूर्ण करणे शक्य नाही रद्द
@@ -663,16 +658,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांची यादी करा.  ते संघटना किंवा व्यक्तींना असू शकते.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बिल्ड पुरेसे भाग
 DocType: POS Profile User,POS Profile User,पीओएस प्रोफाइल वापरकर्ता
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,थेट उत्पन्न
+DocType: Subscription Invoice,Subscription Invoice,सदस्यता बीजक
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,थेट उत्पन्न
 DocType: Patient Appointment,Date TIme,तारीख वेळ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,प्रशासकीय अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,प्रशासकीय अधिकारी
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,कंपनी आणि कर सेट करणे
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
 DocType: Codification Table,Codification Table,कोडिंग टेबल
 DocType: Timesheet Detail,Hrs,तास
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,कृपया कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,कृपया कंपनी निवडा
 DocType: Stock Entry Detail,Difference Account,फरक खाते
 DocType: Purchase Invoice,Supplier GSTIN,पुरवठादार GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
@@ -698,6 +694,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,रोख प्रवाह मॅपिंग टेम्पलेट
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
 DocType: Journal Entry,Difference (Dr - Cr),फरक  (Dr - Cr)
+DocType: Bank Guarantee,Providing,पुरविणे
 DocType: Account,Profit and Loss,नफा व तोटा
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","परवानगी नाही, आवश्यक म्हणून लॅब टेस्ट टेम्पलेट कॉन्फिगर करा"
 DocType: Patient,Risk Factors,धोका कारक
@@ -729,7 +726,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,पुरवठादार चलन क्रमांक
 DocType: Territory,For reference,संदर्भासाठी
 DocType: Healthcare Settings,Appointment Confirmation,नेमणूक पुष्टीकरण
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",सिरियल  क्रमांक {0} हटवू शकत नाही कारण  तो स्टॉक व्यवहार मध्ये  वापरला जातो
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",सिरियल  क्रमांक {0} हटवू शकत नाही कारण  तो स्टॉक व्यवहार मध्ये  वापरला जातो
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),बंद (कोटी)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,हॅलो
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,आयटम हलवा
@@ -754,11 +751,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","उपयोक्त्यास {0} साठी आधीच {0} प्रोफाईल प्रोफाइलमध्ये सेट केले आहे, कृपया दिलगिरी अक्षम"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,जमा मूल्ये
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,पीओएस प्रोफाइलमध्ये प्रदेश आवश्यक आहे
 DocType: Supplier,Prevent RFQs,आरएफक्यू थोपवणे
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,विक्री ऑर्डर करा
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} ते {1} कालावधीसाठी वेतन जमा
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} ते {1} कालावधीसाठी वेतन जमा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
@@ -779,8 +776,9 @@
 DocType: Sales Invoice,Shipping Bill Date,शिपिंग बिल तारीख
 DocType: Production Plan,Production Plan,उत्पादन योजना
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,चलन तयार करण्याचे साधन
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,विक्री परत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,विक्री परत
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,टीप: एकूण वाटप पाने {0} आधीच मंजूर पाने कमी असू नये {1} कालावधीसाठी
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,अनुक्रमांक इनपुटवर आधारित व्यवहारांची संख्या सेट करा
 ,Total Stock Summary,एकूण शेअर सारांश
 DocType: Announcement,Posted By,द्वारा पोस्ट केलेले
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
@@ -791,7 +789,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आपण अगोदरच काही व्यवहार (चे) दुसर्या UOM केलेल्या कारण {0} थेट बदलले करू शकत नाही आयटम माप मुलभूत युनिट जाईल. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी एक नवीन आयटम तयार करणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कंपनी सेट करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,कंपनी सेट करा
@@ -799,8 +797,8 @@
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Training Result Employee,Training Result Employee,प्रशिक्षण निकाल कर्मचारी
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,तार्किक वखार च्या विरोधात स्टॉक नोंदी केल्या जातात
-DocType: Repayment Schedule,Principal Amount,मुख्य रक्कम
-DocType: Employee Loan Application,Total Payable Interest,एकूण व्याज देय
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,मुख्य रक्कम
+DocType: Loan Application,Total Payable Interest,एकूण व्याज देय
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},एकूण शिल्लक: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,विक्री चलन Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
@@ -809,10 +807,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
 DocType: Restaurant Reservation,Restaurant Reservation,रेस्टॉरन्ट आरक्षण
 DocType: Land Unit,Land Unit Name,जमीन युनिट नाव
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भरणा प्रवेश कापून
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,अप लपेटणे
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ईमेलद्वारे ग्राहकांना सूचित करा
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ईमेलद्वारे ग्राहकांना सूचित करा
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,आणखी विक्री व्यक्ती {0} त्याच कर्मचारी ID अस्तित्वात
 DocType: Employee Advance,Claimed Amount,हक्क सांगितलेली रक्कम
 apps/erpnext/erpnext/config/education.py +180,Masters,मास्टर्स
@@ -831,13 +829,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","पेमेंट गेटवे खाते तयार नाही, स्वतः एक तयार करा."
 DocType: Supplier Scorecard,Per Year,दर वर्षी
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,डीओबीनुसार या कार्यक्रमात प्रवेशासाठी पात्र नाही
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Sales Invoice,Sales Taxes and Charges,विक्री कर आणि शुल्क
 DocType: Employee,Organization Profile,संघटना प्रोफाइल
 DocType: Vital Signs,Height (In Meter),उंची (मीटरमध्ये)
 DocType: Student,Sibling Details,भावंडे तपशील
 DocType: Vehicle Service,Vehicle Service,वाहन सेवा
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,स्थितीवर आधारित अभिप्राय विनंती आपोआप ट्रिगर.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,स्थितीवर आधारित अभिप्राय विनंती आपोआप ट्रिगर.
 DocType: Employee,Reason for Resignation,राजीनाम्याचे  कारण
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,कामगिरी मूल्यमापने साचा.
 DocType: Sales Invoice,Credit Note Issued,क्रेडिट टीप जारी
@@ -852,10 +849,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,देखभाल वेळापत्रक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","त्यानंतर किंमत नियम ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार   इ  वर आधारित बाहेर फिल्टर आहेत"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,यादी निव्वळ बदला
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,कर्मचारी कर्ज व्यवस्थापन
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 संबंध
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,व्यवस्थापक
 DocType: Payment Entry,Payment From / To,भरणा / मधून
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},कृपया वेअरहाऊसमध्ये खाते सेट करा {0}
@@ -897,24 +893,24 @@
 DocType: Item,Material Transfer,साहित्य ट्रान्सफर
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,यासाठी पथ शोधू शकले नाही
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),उघडणे (डॉ)
+DocType: Loan,Applicant,अर्जदार
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग शिक्का  {0} नंतर असणे आवश्यक आहे
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,आवर्ती कागदजत्र बनविण्यासाठी
 ,GST Itemised Purchase Register,&#39;जीएसटी&#39; क्रमवारी मांडणे खरेदी नोंदणी
 DocType: Course Scheduling Tool,Reschedule,रीशेड्यूल केले
-DocType: Employee Loan,Total Interest Payable,देय एकूण व्याज
+DocType: Loan,Total Interest Payable,देय एकूण व्याज
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,स्थावर खर्च कर आणि शुल्क
 DocType: Work Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,समाप्त
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,बेस
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,बेस
 DocType: Timesheet,Total Billed Hours,एकूण बिल आकारले तास
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Write Off रक्कम
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Write Off रक्कम
 DocType: Leave Block List Allow,Allow User,सदस्य परवानगी द्या
 DocType: Journal Entry,Bill No,बिल नाही
 DocType: Company,Gain/Loss Account on Asset Disposal,लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर
 DocType: Vehicle Log,Service Details,सेवा तपशील
 DocType: Vehicle Log,Service Details,सेवा तपशील
-DocType: Subscription,Quarterly,तिमाही
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,गटबद्ध
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
@@ -926,7 +922,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,वेळ पत्रक
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush कच्चा माल आधारित रोजी
 DocType: Sales Invoice,Port Code,पोर्ट कोड
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,रिझर्व्ह वेअरहाऊस
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,रिझर्व्ह वेअरहाऊस
 DocType: Lead,Lead is an Organization,लीड एक संस्था आहे
 DocType: Guardian Interest,Interest,व्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,पूर्व विक्री
@@ -938,12 +934,12 @@
 DocType: Account,Accounts,खाते
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,पुरवठादार स्कोरकार्ड मापदंडाच्या टेम्पलेट
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,विपणन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,विपणन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
 DocType: Request for Quotation,Get Suppliers,पुरवठादार मिळवा
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,आपली सदस्यता 30 दिवसांच्या आत कालबाह्य झाल्यास आपण केवळ नूतनीकरण करू शकता
@@ -953,7 +949,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,आपण कॅप फ्लो मॅपर दस्तऐवज सेट केले असेल तरच निवडा
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Supplier Scorecard,Per Week,प्रति आठवडा
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,आयटमला रूपे आहेत.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,एकूण विद्यार्थी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळला नाही
 DocType: Bin,Stock Value,शेअर मूल्य
@@ -975,9 +971,9 @@
 ,Fichier des Ecritures Comptables [FEC],फिचर्स डेस इक्वेटरीज कॉप्पीटेबल [एफईसी]
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड प्रवेश
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,कंपनी व लेखा
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,मूल्य
 DocType: Asset Settings,Depreciation Options,घसारा पर्याय
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,अवैध पोस्टिंग वेळ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,अवैध पोस्टिंग वेळ
 DocType: Lead,Campaign Name,मोहीम नाव
 DocType: Hotel Room,Capacity,क्षमता
 DocType: Selling Settings,Close Opportunity After Days,संधी दिवसांनी बंद करा
@@ -1002,7 +998,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहकाच्या पर्चेस order क्रमांक
 DocType: Budget,Budget Against,बजेट विरुद्ध
 DocType: Employee,Cell Number,सेल क्रमांक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिलेल्या निकषांसाठी कोणतेही कर्मचारी नाही. वेतन स्लिप्स आधीपासून तयार केलेले नसल्याचे तपासा.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिलेल्या निकषांसाठी कोणतेही कर्मचारी नाही. वेतन स्लिप्स आधीपासून तयार केलेले नसल्याचे तपासा.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ऑटो साहित्य विनंत्या तयार होतो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
@@ -1014,15 +1010,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक सारणी निवडा
 DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;प्राप्तकर्ते&#39; मध्ये अवैध ईमेल पत्ता आहे
 DocType: Special Test Items,Particulars,तपशील
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} पासून {1} प्रकारच्या
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {0} पासून {1} प्रकारच्या
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
 DocType: Student,A+,अ +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","अनेक किंमतीचे  नियम समान निकषा सह  अस्तित्वात नाहीत , प्राधान्य सोपवून संघर्षाचे निराकरण करा. किंमत नियम: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
 DocType: Asset,Maintenance,देखभाल
+DocType: Subscriber,Subscriber,सदस्य
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,कृपया आपली प्रकल्प स्थिती अद्यतनित करा
 DocType: Item,Maximum sample quantity that can be retained,राखून ठेवता येईल असा जास्तीत जास्त नमुना प्रमाण
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,हे खरेदी सूचीत टाका साठी मुलभूत सेटिंग्ज
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,टाईमस्लॉट जोडा
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},मालमत्ता जर्नल प्रवेश द्वारे रद्द {0}
-DocType: Employee Loan,Interest Income Account,व्याज उत्पन्न खाते
+DocType: Loan,Interest Income Account,व्याज उत्पन्न खाते
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,आमंत्रण प्रेषित पुनरावलोकनासाठी
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,जैवतंत्रज्ञान
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,कार्यालय देखभाल खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,कार्यालय देखभाल खर्च
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,जा
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ईमेल खाते सेट अप करत आहे
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
 DocType: Asset Repair,Downtime,डाउनटाइम
 DocType: Account,Liability,दायित्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा  जास्त असू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा  जास्त असू शकत नाही.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,शैक्षणिक कालावधी:
 DocType: Salary Detail,Do not include in total,एकूण मध्ये समाविष्ट करू नका
 DocType: Company,Default Cost of Goods Sold Account,वस्तू विकल्या खाते डीफॉल्ट खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},नमुना प्रमाण {0} प्राप्त केलेल्या प्रमाणाहून अधिक असू शकत नाही {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,किंमत सूची निवडलेली  नाही
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Request for Quotation Supplier,Send Email,ईमेल पाठवा
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 DocType: Item,Max Sample Quantity,कमाल नमुना प्रमाण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,कोणतीही परवानगी नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,कोणतीही परवानगी नाही
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,विनंती केलेली रक्कम
 DocType: Vital Signs,Heart Rate / Pulse,हृदय गती / पल्स
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,प्रयोगशाळा चाचण्या आणि महत्वपूर्ण चिन्हे
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,कर्मचारी आढळले  नाहीत
-DocType: Subscription,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,प्रकल्प अद्यतन
 DocType: SMS Center,All Customer Contact,सर्व ग्राहक संपर्क
 DocType: Land Unit,Tree Details,झाड तपशील
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,सर्व आयटम गट
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Work Order,Item To Manufacture,आयटम निर्मिती करणे
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,कॉम्पलेट लिब
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} चा स्थिती {2} आहे
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","निवड रद्द केलेला पत्ता जतन केल्यानंतर संपादित केले असल्यास, निवड रद्द करा"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
 DocType: Item,Hub Publishing Details,हब प्रकाशन तपशील
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;उघडणे&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;उघडणे&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
 DocType: Lab Test Template,Result Format,परिणाम स्वरूप
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,द्विमासिक
 DocType: Vehicle Service,Brake Pad,ब्रेक पॅड
 DocType: Fertilizer,Fertilizer Contents,खते सामग्री
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,संशोधन आणि विकास
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,संशोधन आणि विकास
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,बिल रक्कम
 DocType: Company,Registration Details,नोंदणी तपशील
 DocType: Timesheet,Total Billed Amount,एकुण बिल केलेली रक्कम
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,विक्री ऑर्डरवर क्रेडिट मर्यादा तपासणीचे बाईपास करा
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,कामाचे मूल्यमापन.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम हे खरेदी सूचीत टाका सक्षम आहे की, हे खरेदी सूचीत टाका वापरा &#39;आणि हे खरेदी सूचीत टाका आणि कमीत कमी एक कर नियम असावा"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भरणा प्रवेश {0} ऑर्डर {1}, हे चलन आगाऊ म्हणून कुलशेखरा धावचीत केले पाहिजे की नाही हे तपासण्यासाठी विरूद्ध जोडली आहे."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","भरणा प्रवेश {0} ऑर्डर {1}, हे चलन आगाऊ म्हणून कुलशेखरा धावचीत केले पाहिजे की नाही हे तपासण्यासाठी विरूद्ध जोडली आहे."
 DocType: Sales Invoice Item,Stock Details,शेअर तपशील
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,प्रकल्प मूल्य
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,पॉइंट-ऑफ-सेल
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,किमान आसन
 DocType: Item Attribute,Item Attribute Values,आयटम विशेषता मूल्ये
 DocType: Examination Result,Examination Result,परीक्षेचा निकाल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,खरेदी पावती
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,बिल करायचे प्राप्त आयटम
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,चलन विनिमय दर मास्टर.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},संदर्भ Doctype एक असणे आवश्यक आहे {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
 DocType: Work Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,स्थानांतरणासाठी कोणतेही आयटम उपलब्ध नाहीत
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,स्थानांतरणासाठी कोणतेही आयटम उपलब्ध नाहीत
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),बंद करणे (उघडणे + एकूण)
 DocType: Journal Entry,Depreciation Entry,घसारा प्रवेश
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,पहले दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,साहित्य भेट रद्द करा {0} ही  देखभाल भेट रद्द होण्यापुर्वी रद्द करा
 DocType: Crop Cycle,ISO 8016 standard,आयएसओ 8016 मानक
 DocType: Pricing Rule,Rate or Discount,दर किंवा सवलत
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},सिरियल क्रमांक {0} आयटम  {1} शी संबंधित नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},सिरियल क्रमांक {0} आयटम  {1} शी संबंधित नाही
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,आवडते
 DocType: Hub Settings,Custom Data,सानुकूल डेटा
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,वैद्यकीय कोड मानक
 DocType: Soil Texture,Clay Composition (%),चिकणमाती रचना (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,कार्य सोपण्यापूर्वी जतन करा.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,शिल्लक मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,शिल्लक मूल्य
 DocType: Lab Test,Lab Technician,लॅब तंत्रज्ञ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,विक्री किंमत सूची
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","तपासले असल्यास, ग्राहक तयार केला जाईल, रुग्णांच्याकडे मॅप केला जाईल. या ग्राहकांविरुध्द रुग्ण बीजक तयार केले जातील. पेशंट तयार करताना आपण विद्यमान ग्राहक देखील निवडू शकता"
 DocType: Bank Reconciliation,Account Currency,खाते चलन
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,कंपनी मध्ये Round Off खाते उल्लेख करा
 DocType: Purchase Receipt,Range,श्रेणी
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
 DocType: Item Barcode,Item Barcode,आयटम बारकोड
 DocType: Woocommerce Settings,Endpoints,अंत्यबिंदू
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,आयटम रूपे {0} सुधारित
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","व्युत्पन्न करणे विलंबित असल्यास, आपल्याला यातील &quot;महिन्याचे पुनरावृत्ती&quot; फील्ड स्वहस्ते बदलावे लागेल"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
 DocType: Share Transfer,From Folio No,फोलिओ नं
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,उपलब्ध-वापरण्याच्या तारखेस
 DocType: Guardian,Guardian Name,पालक नाव
 DocType: Cheque Print Template,Has Print Format,प्रिंट स्वरूप आहे
-DocType: Employee Loan,Sanctioned,मंजूर
+DocType: Loan,Sanctioned,मंजूर
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,बंधनकारक आहे. कदाचित त्यासाठी चलन विनिमय रेकॉर्ड तयार केलेले  नसेल.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम {1} साठी   सिरियल क्रमांक निर्दिष्ट करा
 DocType: Crop Cycle,Crop Cycle,पीक सायकल
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
 DocType: Student Admission,Publish on website,वेबसाइट वर प्रकाशित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,पुरवठादार चलन तारीख पोस्ट दिनांक पेक्षा जास्त असू शकत नाही
+DocType: Subscription,Cancelation Date,रद्द करण्याची तारीख
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
 DocType: Agriculture Task,Agriculture Task,कृषी कार्य
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,अप्रत्यक्ष उत्पन्न
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,अप्रत्यक्ष उत्पन्न
 DocType: Student Attendance Tool,Student Attendance Tool,विद्यार्थी उपस्थिती साधन
 DocType: Restaurant Menu,Price List (Auto created),किंमत सूची (स्वयं तयार)
 DocType: Cheque Print Template,Date Settings,तारीख सेटिंग्ज
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,मीटर
 DocType: Workstation,Electricity Cost,वीज खर्च
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,लॅब चाचणी डेटाटाईम संग्रहित करण्याच्या तारखेपयंत आधी होऊ शकत नाही
+DocType: Subscription Plan,Cost,खर्च
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
 DocType: Expense Claim,Total Advance Amount,एकूण आगाऊ रक्कम
 DocType: Delivery Stop,Estimated Arrival,अंदाजे आगमन
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
 DocType: Timesheet Detail,Bill,बिल
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,व्हाइट
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,व्हाइट
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,आपण केवळ चेक बॉक्सच्या सूचीमधून एक कमाल निवड करू शकता.
 DocType: Purchase Invoice,Get Advances Paid,सुधारण अदा करा
 DocType: Item,Automatically Create New Batch,नवीन बॅच आपोआप तयार करा
 DocType: Item,Automatically Create New Batch,नवीन बॅच आपोआप तयार करा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} ला {1} (पंक्ती {2}) देणे
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} ला {1} (पंक्ती {2}) देणे
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,करा
 DocType: Student Admission,Admission Start Date,प्रवेश प्रारंभ तारीख
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,नवीन कर्मचारी
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
 DocType: Repayment Schedule,Balance Loan Amount,शिल्लक कर्ज रक्कम
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,वेळापत्रक कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,शेअर पर्याय
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,शेअर पर्याय
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,खरेदी ऑर्डरमध्ये अंतिम खरेदी तपशील लावणे अक्षम करा
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,पॅकिंग स्लिप्स आयटम
 DocType: Purchase Invoice,Cash/Bank Account,रोख / बँक खाते
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},निर्दिष्ट करा एक {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
 DocType: Delivery Note,Delivery To,वितरण
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,प्रकार निर्मिती रांगेत केली गेली आहे.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} साठी कार्य सारांश
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,सूचीमधील प्रथम सुटलेला अपॉईव्हर डीफॉल्ट ड्रॉप अपॉओव्हर म्हणून सेट केला जाईल
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Plan,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} नकारात्मक असू शकत नाही
 DocType: Training Event,Self-Study,स्वत: ची अभ्यास
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,पगार
 DocType: Asset Maintenance,Maintenance Manager Name,देखभाल व्यवस्थापक नाव
 DocType: Agriculture Task,Urgent,त्वरित
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},कृपया टेबल {1} मध्ये सलग {0}साठी  एक वैध रो ID निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},कृपया टेबल {1} मध्ये सलग {0}साठी  एक वैध रो ID निर्दिष्ट करा
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,व्हेरिएबल शोधण्यात अक्षम:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,कृपया नमपॅड मधून संपादित करण्यासाठी एक फील्ड निवडा
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,स्टॉक लेजर तयार केल्यामुळे निश्चित मालमत्ता आयटम असू शकत नाही.
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,गुणवत्ता निरीक्षण टेम्पलेट नाव
 DocType: Project,First Email,प्रथम ईमेल
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,विक्री ऑर्डर / तयार वस्तू भांडार मध्ये राखीव कोठार
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,विक्री रक्कम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,विक्री रक्कम
 DocType: Repayment Schedule,Interest Amount,व्याज रक्कम
 DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
 DocType: Share Transfer,Issue,अंक
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 ,Projected Quantity as Source,स्रोत म्हणून प्रक्षेपित प्रमाण
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,डिलिव्हरी ट्रिप
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,डिलिव्हरी ट्रिप
 DocType: Student,A-,अ-
 DocType: Share Transfer,Transfer Type,हस्तांतरण प्रकार
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,विक्री खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,विक्री खर्च
 DocType: Consultation,Diagnosis,निदान
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,मानक खरेदी
 DocType: GL Entry,Against,विरुद्ध
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,पिनकोड
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},कर्जाचा व्याज उत्पन्न खाते निवडा {0}
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,मुलभूत पुरवठादार
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता टक्केवारी प्रती
-DocType: Employee Loan,Repayment Schedule,परतफेड वेळापत्रकाच्या
+DocType: Loan,Repayment Schedule,परतफेड वेळापत्रकाच्या
 DocType: Shipping Rule Condition,Shipping Rule Condition,शिपिंग नियम अट
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक बंद तारखा मिळवा
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ती तारीख प्रारंभ तारखेच्या पेक्षा कमी असू शकत नाही
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,उपस्थिती गोठवा तारीख
 DocType: Education Settings,Attendance Freeze Date,उपस्थिती गोठवा तारीख
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,आपल्या पुरवठादारांची यादी करा.  ते संघटना किंवा व्यक्ती असू शकते.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,सर्व उत्पादने पहा
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,सर्व उत्पादने पहा
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),किमान लीड वय (दिवस)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),किमान लीड वय (दिवस)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,सर्व BOMs
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,कर्मचारी पासून
 DocType: Driver,Cellphone Number,भ्रमणध्वनी क्रमांक
 DocType: Project,Monitor Progress,मॉनिटर प्रगती
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
 DocType: Journal Entry,Make Difference Entry,फरक प्रवेश करा
+DocType: Supplier Quotation,Auto Repeat Section,ऑटो पुनरावृत्ती विभाग
 DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती
 DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र
 DocType: Program Enrollment,Transportation,वाहतूक
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,अवैध विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},प्रमाणात या पेक्षा कमी किंवा या समान असणे आवश्यक आहे {0}
+DocType: Department Approver,Department Approver,विभाग अपॉओव्हर
 DocType: SMS Center,Total Characters,एकूण वर्ण
 DocType: Employee Advance,Claimed,हक्क सांगितले
 DocType: Crop,Row Spacing,पंक्ती अंतर
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भरणा सलोखा बीजक
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,योगदान%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","प्रति खरेदी सेटिंग्ज तर ऑर्डर खरेदी आवश्यक == &#39;होय&#39;, नंतर चलन खरेदी तयार करण्यासाठी, वापरकर्ता आयटम प्रथम पर्चेस तयार करणे आवश्यक आहे {0}"
+,HSN-wise-summary of outward supplies,बाह्य पुरवठाांचा एचएसएन-वार-सारांश
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,आपल्या संदर्भासाठी कंपनी नोंदणी क्रमांक. कर संख्या इ
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,क्रिया नाव
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,प्रारंभ वर्ष
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN प्रथम 2 अंक राज्य संख्या जुळणे आवश्यक आहे {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,पीडीसी / एलसी
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,पीडीसी / एलसी
 DocType: Purchase Invoice,Start date of current invoice's period,चालू चलन च्या कालावधी प्रारंभ तारीख
 DocType: Salary Slip,Leave Without Pay,पे न करता रजा
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,क्षमता नियोजन त्रुटी
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,निर्मितीच्या वेळी केवळ फील्डवर कॉपी केली जाईल.
 DocType: Setup Progress Action,Domains,डोमेन
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,व्यवस्थापन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,व्यवस्थापन
 DocType: Cheque Print Template,Payer Settings,देणारा सेटिंग्ज
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","हा  जिच्यामध्ये variant आयटम कोड आहे त्यासाठी जोडला  जाईल. उदाहरणार्थ जर आपला  संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,आपल्या  पगाराच्या स्लिप्स  एकदा जतन केल्यावर  निव्वळ वेतन ( शब्दांत ) दृश्यमान होईल.
 DocType: Purchase Invoice,Is Return,परत आहे
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,खबरदारी
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',कार्य दिवस समाप्ती दिवसापेक्षा अधिक आहे &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,परत / डेबिट टीप
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,परत / डेबिट टीप
 DocType: Price List Country,Price List Country,किंमत यादी देश
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} हा आयटम {1} साठी वैध सिरीयल क्रमांक आहे
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,आयटम कोड सिरियल क्रमांकासाठी  बदलला  जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,आयटम कोड सिरियल क्रमांकासाठी  बदलला  जाऊ शकत नाही
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,बॅच क्रमांक आयटम कोड प्रविष्ट करा
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
-DocType: Employee Loan,Partially Disbursed,अंशत: वाटप
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,माहिती द्या
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,माहिती द्या
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,पुरवठादार डेटाबेस.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,आपण रद्द न केलेली सबस्क्रिप्शन पुन्हा सुरू करू शकत नाही.
 DocType: Account,Balance Sheet,ताळेबंद
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
 DocType: Fee Validity,Valid Till,पर्यंत वैध
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,एकूण पालक शिक्षक बैठक
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: नाकारलेली Qty खरेदी परत मधे  प्रविष्ट करणे शक्य नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,निवडलेल्या ग्राहकांसाठी कस्टमर ग्रुप बदलण्याची परवानगी नाही.
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,अंदाजे आगमन वेळ अद्यतनित करणे
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,अंदाजे आगमन वेळ अद्यतनित करणे
 DocType: Program Enrollment Tool,Enrollment Details,नावनोंदणी तपशील
 DocType: Purchase Invoice Item,Net Rate,नेट दर
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,कृपया एक ग्राहक निवडा
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्ष
 DocType: Purchase Order,Group same items,गट समान आयटम
 DocType: Purchase Invoice,Disable Rounded Total,एकूण गोळाबेरीज अक्षम करा
-DocType: Employee Loan Application,Repayment Info,परतफेड माहिती
+DocType: Department,Parent Department,पालक विभाग
+DocType: Loan Application,Repayment Info,परतफेड माहिती
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
 DocType: Maintenance Team Member,Maintenance Role,देखभाल भूमिका
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
 ,Trial Balance,चाचणी शिल्लक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,कर्मचारी सेट अप
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,हॉटेल आरक्षण वापरकर्ता
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,कृपया पहले उपसर्ग निवडा
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,संशोधन
+DocType: Subscription Settings,Subscription Settings,सदस्यता सेटिंग्ज
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,संशोधन
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Announcement,All Students,सर्व विद्यार्थी
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
 DocType: Crop Cycle,Less than a year,एक वर्षापेक्षा कमी
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,विद्यार्थी भ्रमणध्वनी क्रमांक
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 DocType: Crop,Yield UOM,पीक यूओएम
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
 DocType: Item,Is Item from Hub,आयटम हब पासून आहे
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,सलग {0}: क्रियाकलाप प्रकार आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,लाभांश पेड
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,लाभांश पेड
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,लेखा लेजर
 DocType: Stock Reconciliation,Difference Amount,फरक रक्कम
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{0} वर सोडून द्या {1}
 DocType: Purchase Invoice,Reverse Charge,रिवर्स शुल्क
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,कायम ठेवण्यात कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,कायम ठेवण्यात कमाई
 DocType: Purchase Invoice,05-Change in POS,05-पीओएस मध्ये बदल
 DocType: Vehicle Log,Service Detail,सेवा तपशील
 DocType: BOM,Item Description,आयटम वर्णन
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,संधी आयटम
 ,Student and Guardian Contact Details,विद्यार्थी आणि पालक संपर्क तपशील
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,सलग {0}: पुरवठादार साठी {0} ईमेल पत्ता ईमेल पाठवा करणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,तात्पुरती उघडणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,तात्पुरती उघडणे
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,पहा केंद्र
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 DocType: Patient Appointment,More Info,अधिक माहिती
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},मूल्यांकन दर सलग आयटम आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},मूल्यांकन दर सलग आयटम आवश्यक {0}
 DocType: Supplier Scorecard,Scorecard Actions,स्कोअरकार्ड क्रिया
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,उदाहरण: संगणक विज्ञान मध्ये मास्टर्स
 DocType: Purchase Invoice,Rejected Warehouse,नाकारल्याचे कोठार
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ते
 DocType: Supplier Quotation Item,Lead Time in days,दिवस आघाडीची  वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,खाती देय सारांश
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},ते {0} पासून पगार भरणा {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},ते {0} पासून पगार भरणा {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लॅब टेस्ट प्रिस्क्रिप्शन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,लहान
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,लहान
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,चलन तयार करण्याचे साधन आयटम
 DocType: Education Settings,Employee Number,कर्मचारी संख्या
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ग्रेस कालावधीनंतर बीजक रद्द करा
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},प्रकरण क्रमांक (s) आधीपासून वापरात आहेत .  प्रकरण {0} पासून वापरून पहा
 DocType: Project,% Completed,% पूर्ण
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,प्रयोगशाळा चाचणी Datetime
 DocType: Email Digest,Add Quote,कोट जोडा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,अप्रत्यक्ष खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 DocType: Agriculture Analysis Criteria,Agriculture,कृषी
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,समक्रमण मास्टर डेटा
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,कॅपिटल उपकरणे
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,कृपया प्रथम आयटम कोड सेट करा
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
+DocType: Subscription Plan,Billing Interval Count,बिलिंग मध्यांतर संख्या
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 DocType: Antibiotic,Antibiotic,प्रतिजैविक
 ,Team Updates,टीम सुधारणा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,पुरवठादार साठी
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट करणे हे व्यवहारामधील account निवडण्यास मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,प्रिंट स्वरूप तयार करा
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,POS बाबींचा गट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,वैकल्पिक आयटम आयटम कोडप्रमाणेच नसणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 अस्थायी मूल्यांकनाची अंमलबजावणी
 DocType: Salary Slip,Bank Account No.,बँक खाते क्रमांक
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,वर्कस्टेशन
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,अवतरण पुरवठादार विनंती
 DocType: Healthcare Settings,Registration Message,नोंदणी संदेश
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,हार्डवेअर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,हार्डवेअर
 DocType: Prescription Dosage,Prescription Dosage,प्रिस्क्रिप्शन डोस
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,कृपया कंपनी निवडा
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,सुरू आणि तारखा समाप्त
 ,Delivered Items To Be Billed,वितरित केलेले  आयटम जे बिल करायचे आहेत
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},BOM ओपन {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,कोठार सिरियल क्रमांक साठी बदलले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,कोठार सिरियल क्रमांक साठी बदलले जाऊ शकत नाही
 DocType: Authorization Rule,Average Discount,सरासरी सवलत
 DocType: Project Update,Great/Quickly,ग्रेट / पटकन
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,कृपया बॅच आयटम बॅच निवडा
 DocType: Asset,Depreciation Schedules,घसारा वेळापत्रक
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,खालील खाती जीएसटी सेटिंग्जमध्ये निवडली जाऊ शकतात:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,खालील खाती जीएसटी सेटिंग्जमध्ये निवडली जाऊ शकतात:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
 DocType: Payment Request,Transaction Currency,व्यवहार चलन
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},पासून {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,सरासरी दैनिक जाणारे
 DocType: POS Profile,Campaign,मोहीम
 DocType: Supplier,Name and Type,नाव आणि प्रकार
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',मंजूरीची स्थिती &#39;मंजूर&#39; किंवा &#39;नाकारलेली&#39; करणे आवश्यक आहे
 DocType: Physician,Contacts and Address,संपर्क आणि पत्ता
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ती
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','अपेक्षित प्रारंभ तारीख' ही 'अपेक्षित शेवटची तारीख' पेक्षा जास्त असू शकत नाही.
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,पात्रता आणि तपशील
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदांसाठी  विचारल्यास रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संवाद लॉग.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",कोटेशन विनंती अधिक तपासणी पोर्टल सेटिंग्ज पोर्टल प्रवेश करू अक्षम केले आहे.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,पुरवठादार धावसंख्याकार्ड स्कोअरिंग व्हेरिएबल
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,खरेदी रक्कम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,खरेदी रक्कम
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता नाव
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स वेळापत्रक तयार करण्यात त्रुटी होत्या
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,यादीतील पहिल्या खर्चाच्या अंदाजानुसार डिफॉल्ट एक्स्पेन्स अॅपरॉव्हर म्हणून सेट केले जाईल.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,पॅकेज कोड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,शिकाऊ उमेदवार
 DocType: Purchase Invoice,Company GSTIN,कंपनी GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,नकारात्मक प्रमाणाला     परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,नकारात्मक प्रमाणाला     परवानगी नाही
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",स्ट्रिंग म्हणून आयटम मालक प्राप्त आणि या क्षेत्रात संग्रहित कर तपशील टेबल. कर आणि शुल्क करीता वापरले जाते
 DocType: Supplier Scorecard Period,SSC-,एसएससी-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाते गोठविले तर, नोंदी मर्यादित वापरकर्त्यांना परवानगी आहे."
 DocType: Email Digest,Bank Balance,बँक बॅलन्स
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,सोडल्यातील अनुप्रयोगात अनिवार्य रजा सोडा
 DocType: Job Opening,"Job profile, qualifications required etc.","कामाचे, पात्रता आवश्यक इ"
 DocType: Journal Entry Account,Account Balance,खाते शिल्लक
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,व्यवहार कर नियम.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,{0} पंक्तीमधील देयक टर्म संभवत: एक डुप्लिकेट आहे.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),कृषी (बीटा)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,पॅकिंग स्लिप्स
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,कार्यालय भाडे
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय भाडे
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
 DocType: Disease,Common Name,सामान्य नाव
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,आयात अयशस्वी!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,पत्ते  अद्याप जोडले नाहीत
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
 DocType: Vital Signs,Blood Pressure,रक्तदाब
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,विश्लेषक
 DocType: Item,Inventory,सूची
 DocType: Item,Sales Details,विक्री तपशील
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,विद्यार्थी गट विद्यार्थी प्रवेश कोर्स प्रमाणित
 DocType: Notification Control,Expense Claim Rejected,खर्च हक्क नाकारला
 DocType: Item,Item Attribute,आयटम विशेषता
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,सरकार
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,सरकार
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,खर्च दावा {0} वाहनाकरीता लॉग आधिपासूनच अस्तित्वात आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,संस्था नाव
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,परतफेड रक्कम प्रविष्ट करा
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,परतफेड रक्कम प्रविष्ट करा
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,आयटम रूपे
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,सेवा
 DocType: HR Settings,Email Salary Slip to Employee,कर्मचारी ईमेल पगाराच्या स्लिप्स
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,संभाव्य पुरवठादार निवडा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,संभाव्य पुरवठादार निवडा
 DocType: Sales Invoice,Source,स्रोत
 DocType: Customer,"Select, to make the customer searchable with these fields","या फील्डसह ग्राहक शोधण्यायोग्य करण्यासाठी, निवडा"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,बंद शो
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,रद्द केलेल्या  पॅकिंग स्लिप (चे)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,गुंतवणूक रोख प्रवाह
 DocType: Program Course,Program Course,कार्यक्रम कोर्स
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 DocType: Homepage,Company Tagline for website homepage,वेबसाइट मुख्यपृष्ठावर कंपनी टॅगलाइन
 DocType: Item Group,Item Group Name,आयटम गट नाव
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,घेतले
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,मेम्बरशिप तपशील
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),कृपया आवश्यक असलेले सर्व परिणाम मूल्य (इनपुट) इनपुट करा
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
-DocType: Employee Loan,Monthly Repayment Amount,मासिक परतफेड रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
+DocType: Loan,Monthly Repayment Amount,मासिक परतफेड रक्कम
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,उघडणे चलने
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
 DocType: UOM,UOM Name,UOM नाव
 DocType: GST HSN Code,HSN Code,HSN कोड
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,योगदान रक्कम
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},वापरकर्ता {0} आधीपासूनच फिजिशियनला नियुक्त केले आहे {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,बॉक्स
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,शक्य पुरवठादार
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,शक्य पुरवठादार
+DocType: Journal Entry,JV-RET-,जेवी-आरईटी-
 DocType: Budget,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणार्याची सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),हेल्थकेअर (बीटा)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,पॅक करण्यासाठी आयटम नाहीत
 DocType: Shipping Rule Condition,From Value,मूल्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
-DocType: Employee Loan,Repayment Method,परतफेड पद्धत
+DocType: Loan,Repayment Method,परतफेड पद्धत
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","चेक केलेले असल्यास, मुख्यपृष्ठ वेबसाइट मुलभूत बाबींचा गट असेल"
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,कंपनी खर्च दावे.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,प्रमाणपत्र आवश्यक
 DocType: Company,Default Holiday List,सुट्टी यादी डीफॉल्ट
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},सलग {0}: कडून वेळ आणि वेळ {1} आच्छादित आहे {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,शेअर दायित्व
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,शेअर दायित्व
 DocType: Purchase Invoice,Supplier Warehouse,पुरवठादार कोठार
 DocType: Opportunity,Contact Mobile No,संपर्क मोबाइल नाही
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,कंपनी निवडा
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,प्रिंट विभाग
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,वापरकर्ता {0} कडे कोणताही डीफॉल्ट POS प्रोफाइल नाही. या वापरकर्त्यासाठी पंक्ती {1} येथे डीफॉल्ट तपासा.
 DocType: Student Group,Set 0 for no limit,कोणतीही मर्यादा नाही सेट करा 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,पंक्ती {idx}: {field} उघडणे {invoice_type} चलने तयार करणे आवश्यक आहे
 DocType: Customer,Primary Address and Contact Detail,प्राथमिक पत्ता आणि संपर्क तपशील
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,कृपया किमान एक डोमेन निवडा.
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,आयटम शोध
 DocType: Payment Schedule,Payment Amount,भरणा रक्कम
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,प्रतवारी स्केल
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,आधीच पूर्ण
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,हातात शेअर
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,हातात शेअर
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,आयात यशस्वी!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
 DocType: Customer,Customer POS Id,ग्राहक POS आयडी
 DocType: Account,Account Name,खाते नाव
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,तारखेपासून ची तारीख तारीख पर्यंतच्या तारखेपेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,सिरियल क्रमांक {0} हा  {1} प्रमाणात एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,तारखेपासून ची तारीख तारीख पर्यंतच्या तारखेपेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,सिरियल क्रमांक {0} हा  {1} प्रमाणात एक अपूर्णांक असू शकत नाही
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,कृपया Woocommerce सर्व्हर URL प्रविष्ट करा
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
 DocType: Share Balance,To No,नाही ते
-DocType: Subscription,Reference Document,संदर्भ दस्तऐवज
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} हे रद्द किंवा बंद आहे
 DocType: Accounts Settings,Credit Controller,क्रेडिट कंट्रोलर
-DocType: Grant Application,Applicant Type,अर्जदार प्रकार
+DocType: Loan,Applicant Type,अर्जदार प्रकार
 DocType: Purchase Invoice,03-Deficiency in services,03 - सेवांमध्ये कमतरता
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन खलिता तारीख
 DocType: Healthcare Settings,Default Medical Code Standard,डीफॉल्ट मेडिकल कोड मानक
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानव संसाधन
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,मानव संसाधन
 DocType: Lead,Upper Income,उच्च उत्पन्न
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,नकार
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी चलनात डेबिट
 DocType: BOM Item,BOM Item,BOM आयटम
 DocType: Appraisal,For Employee,कर्मचारी साठी
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,वितरण प्रवेश करा
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,वितरण प्रवेश करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
 DocType: Membership,INR,भारतीय रुपया
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,स्टॉक उपलब्ध आहे
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,स्टॉक उपलब्ध आहे
 DocType: Manufacturing Settings,Capacity Planning For (Days),( दिवस) क्षमता नियोजन
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,खरेदी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,कोणत्याही आयटमधे   प्रमाण किंवा मूल्यांमध्ये  बदल नाहीत .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,कोणत्याही आयटमधे   प्रमाण किंवा मूल्यांमध्ये  बदल नाहीत .
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,अनिवार्य फील्ड - कार्यक्रम
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,अनिवार्य फील्ड - कार्यक्रम
 DocType: Special Test Template,Result Component,परिणाम घटक
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,leaves म्हणून leaves मध्ये सुट्ट्यांचा सामावेश करा
 DocType: Sales Invoice,Packed Items,पॅक केलेला आयटम
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,सिरियल क्रमांका  विरुद्ध हमी दावा
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;एकूण&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;एकूण&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,खरेदी सूचीत टाका आणि सक्षम करा
 DocType: Employee,Permanent Address,स्थायी पत्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,अॅक्शनची पुष्टी करा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,कृपया प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,कृपया प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,पूर्ण
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,टाका पहा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,विपणन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,मानक निकष तयार करू शकत नाही कृपया मापदंड पुनर्नामित करा
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Material Request,Transferred,हस्तांतरित
 DocType: Vehicle,Doors,दारे
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,रुग्णांच्या नोंदणीसाठी फी गोळा करणे
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,स्टॉक व्यवहारा नंतर विशेषता बदलू शकत नाही. नवीन आयटम तयार करा आणि नवीन आयटमवर स्टॉक हस्तांतरित करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,स्टॉक व्यवहारा नंतर विशेषता बदलू शकत नाही. नवीन आयटम तयार करा आणि नवीन आयटमवर स्टॉक हस्तांतरित करा
 DocType: Course Assessment Criteria,Weightage,वजन
 DocType: Purchase Invoice,Tax Breakup,कर चित्रपटाने
 DocType: Packing Slip,PS-,PS-
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,मेळ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Purchase Invoice Item,Batch No,बॅच नाही
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,कर्मचारी आगाऊ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 DocType: Grant Application,Assessment  Mark (Out of 10),आकलन चिन्ह (10 पैकी)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,field पासून संधी अनिवार्य आहे
 DocType: Email Digest,Annual Expenses,वार्षिक खर्च
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
 DocType: Sales Team,Contribution to Net Total,नेट एकूण अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आयटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,शेअर मेळ
 DocType: Territory,Territory Name,प्रदेश नाव
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,आपण केवळ सबस्क्रिप्शनमधील समान बिलिंग सायकलसह योजना करू शकता
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,नोकरी साठी अर्जदार
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,त्यावेळच्या
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,प्रशिक्षण कार्यक्रम
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},आयटम  {0} साठी  डुप्लिकेट सिरियल क्रमांक प्रविष्ट केला नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},आयटम  {0} साठी  डुप्लिकेट सिरियल क्रमांक प्रविष्ट केला नाही
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,लीड स्त्रोताद्वारे मागोवा घ्या.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,प्रविष्ट करा
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,प्रविष्ट करा
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,देखभाल लॉग
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,आयटम किंवा वखार आधारित फिल्टर सेट करा
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),या पॅकेजमधील निव्वळ वजन. (आयटम निव्वळ वजन रक्कम म्हणून स्वयंचलितपणे गणना)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,वितरीत आणि बिल
 DocType: Student Group,Instructors,शिक्षक
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलनातील  क्रेडिट रक्कम
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,शेअर व्यवस्थापन
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,भरणा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,भरणा
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","वखार {0} कोणत्याही खात्याशी लिंक केले नाही, कंपनी मध्ये कोठार रेकॉर्ड मध्ये खाते किंवा सेट मुलभूत यादी खाते उल्लेख करा {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,आपल्या ऑर्डर व्यवस्थापित करा
 DocType: Work Order Operation,Actual Time and Cost,वास्तविक वेळ आणि खर्च
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,विद्यार्थी रजेचा अर्ज
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,रोजी
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,बारकोड्स
 DocType: Hub Category,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. कृपया सरळ आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,सहकारी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,सहकारी
 DocType: Asset Movement,Asset Movement,मालमत्ता चळवळ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,वर्क ऑर्डर {0} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,नवीन टाका
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,बिलिंग चलन एकतर डीफॉल्ट कंपनीच्या चलन किंवा पक्ष खाते चलनाच्या बरोबरीने असणे आवश्यक आहे
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 DocType: Soil Texture,Loam,लोम
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,पंक्ती {0}: तारखेच्या तारखेची तारीख पोस्ट करण्यापूर्वी असू शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,पंक्ती {0}: तारखेच्या तारखेची तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,भरणा प्रवेश करा
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
 ,Sales Invoice Trends,विक्री चलन ट्रेन्ड
 DocType: Leave Application,Apply / Approve Leaves,सुट्या  मंजूर / लागू करा
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,साठी
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total','मागील पंक्ती एकूण' किंवा 'मागील पंक्ती रकमेवर' शुल्क प्रकार असेल तर सलग पाहू  शकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total','मागील पंक्ती एकूण' किंवा 'मागील पंक्ती रकमेवर' शुल्क प्रकार असेल तर सलग पाहू  शकता
 DocType: Sales Order Item,Delivery Warehouse,डिलिव्हरी कोठार
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,आर्थिक खर्च केंद्रे Tree.
 DocType: Serial No,Delivery Document No,डिलिव्हरी दस्तऐवज क्रमांक
@@ -2336,12 +2343,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,प्रथम कार्यक्रम निवडा
 DocType: Patient Appointment,Patient Age,रुग्ण वय
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,प्रकल्प व्यवस्थापकीय
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,अनुक्रमांक {0} आधीच परत केले गेले आहेत
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,अनुक्रमांक {0} आधीच परत केले गेले आहेत
 DocType: Supplier,Supplier of Goods or Services.,वस्तू किंवा सेवा पुरवठादार.
 DocType: Budget,Fiscal Year,आर्थिक वर्ष
 DocType: Asset Maintenance Log,Planned,नियोजित
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,परामर्श शुल्क बुक करण्यासाठी रुग्णांमध्ये सेट न केल्यास डिफॉल्ट प्राप्य खाते.
 DocType: Vehicle Log,Fuel Price,इंधन किंमत
+DocType: Bank Guarantee,Margin Money,मार्जिन मनी
 DocType: Budget,Budget,अर्थसंकल्प
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,उघडा सेट करा
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
@@ -2355,16 +2363,16 @@
 DocType: Lead,Follow Up,अनुसरण करा
 DocType: Item,Is Sales Item,विक्री आयटम आहे
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आयटम गट वृक्ष
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आयटम {0} सिरियल क्रमांकासाठी  सेटअप नाही. आयटम मास्टर तपासा
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,आयटम {0} सिरियल क्रमांकासाठी  सेटअप नाही. आयटम मास्टर तपासा
 DocType: Maintenance Visit,Maintenance Time,देखभाल वेळ
 ,Amount to Deliver,रक्कम वितरीत करण्यासाठी
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},समान आयटम अनेक वेळा प्रविष्ट केले गेले आहे. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत प्रारंभ तारीख मुदत लिंक आहे शैक्षणिक वर्ष वर्ष प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,तेथे त्रुटी होत्या.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,कर्मचारी {0} आधीपासून {2} आणि {3} दरम्यान {1} साठी अर्ज केला आहे:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,तेथे त्रुटी होत्या.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,कर्मचारी {0} आधीपासून {2} आणि {3} दरम्यान {1} साठी अर्ज केला आहे:
 DocType: Guardian,Guardian Interests,पालक छंद
 DocType: Naming Series,Current Value,वर्तमान मूल्य
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
 DocType: Education Settings,Instructor Records to be created by,द्वारे तयार करण्यासाठी शिक्षक रेकॉर्ड
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} तयार
 DocType: GST Account,GST Account,जीएसटी खाते
@@ -2383,8 +2391,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,आवडींमध्ये जोडले
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,वरील निवडक मापदंड किंवा वेतन स्लिप आधीपासूनच सादर केल्याबद्दल कोणतीही पगारपत्रक सापडली नाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,कर आणि कर्तव्ये
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,वरील निवडक मापदंड किंवा वेतन स्लिप आधीपासूनच सादर केल्याबद्दल कोणतीही पगारपत्रक सापडली नाही
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,कर आणि कर्तव्ये
 DocType: Projects Settings,Projects Settings,प्रकल्प सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी {1} ने फिल्टर होऊ शकत नाही
@@ -2394,27 +2402,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,आयटम गटांचा  वृक्ष.
 DocType: Production Plan,Total Produced Qty,एकूण उत्पादित प्रमाण
 DocType: Payroll Entry,Get Employee Details,कर्मचारी तपशील मिळवा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
 DocType: Asset,Sold,विक्री
 ,Item-wise Purchase History,आयटमनूसार खरेदी इतिहास
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},कृपया   आयटम {0} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
 DocType: Account,Frozen,फ्रोजन
 DocType: Sales Invoice Payment,Base Amount (Company Currency),बेस रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,कच्चा माल
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,कच्चा माल
 DocType: Payment Reconciliation Payment,Reference Row,संदर्भ पंक्ती
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
 DocType: Sales Invoice,Accounting Details,लेखा माहिती
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ह्या कंपनीसाठी सर्व व्यवहार हटवा
 DocType: Patient,O Positive,ओ सकारात्मक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,गुंतवणूक
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,वाटप
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,स्वीकृती निकष
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,वरील टेबलमधे  साहित्य विनंत्या प्रविष्ट करा
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,जर्नल एन्ट्रीसाठी कोणतेही परतफेड उपलब्ध नाही
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 DocType: BOM,Show In Website,वेबसाइट मध्ये दर्शवा
 DocType: Shopping Cart Settings,Show Quantity in Website,वेबसाइट मध्ये प्रमाण दर्शवा
-DocType: Employee Loan Application,Total Payable Amount,एकूण देय रक्कम
+DocType: Loan Application,Total Payable Amount,एकूण देय रक्कम
 DocType: Task,Expected Time (in hours),अपेक्षित वेळ(तासामधे )
 DocType: Item Reorder,Check in (group),चेक इन (गट)
 DocType: Soil Texture,Silt,गाळ
@@ -2433,7 +2442,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,रक्कम
 DocType: Room,Room Name,खोली नाव
 DocType: Prescription Duration,Prescription Duration,प्रिस्क्रिप्शन कालावधी
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजा शिल्लक आधीच   रजा वाटप रेकॉर्ड{1} मधे भविष्यात carry-forward केले आहे म्हणून, रजा  {0} च्या आधी रद्द / लागू केल्या  जाऊ शकत नाहीत"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजा शिल्लक आधीच   रजा वाटप रेकॉर्ड{1} मधे भविष्यात carry-forward केले आहे म्हणून, रजा  {0} च्या आधी रद्द / लागू केल्या  जाऊ शकत नाहीत"
 DocType: Activity Cost,Costing Rate,भांडवलाच्या दर
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क
 ,Campaign Efficiency,मोहीम कार्यक्षमता
@@ -2453,11 +2462,11 @@
 DocType: Chapter,Chapter,अध्याय
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,जोडी
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,जेव्हा ही मोड निवडली जाते तेव्हा डीओएसपी खाते आपोआप पीओएस इनव्हॉइसमध्ये अपडेट होईल.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
 DocType: Asset,Depreciation Schedule,घसारा वेळापत्रक
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,विक्री भागीदार पत्ते आणि संपर्क
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,अर्धा दिवस तारीख पासून आणि तारिक करण्यासाठी दरम्यान असावे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,अर्धा दिवस तारीख पासून आणि तारिक करण्यासाठी दरम्यान असावे
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,कृपया {0} कंपनीत डीफॉल्ट मूल्य केंद्र सेट करा.
 DocType: Item,Has Batch No,बॅच नाही आहे
@@ -2475,7 +2484,6 @@
 DocType: Task,Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे)
 DocType: Soil Texture,Soil Type,मातीचा प्रकार
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,नवीन संदेश
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2495,7 +2503,7 @@
 DocType: Hub Category,Hub Category,हब श्रेणी
 DocType: Purchase Invoice,SEZ,सेझ
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
-DocType: Employee Loan,Loan Amount,कर्ज रक्कम
+DocType: Loan,Loan Amount,कर्ज रक्कम
 DocType: Student Report Generation Tool,Add Letterhead,लेटरहेड जोडा
 DocType: Program Enrollment,Self-Driving Vehicle,-ड्राव्हिंग वाहन
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,पुरवठादार धावसंख्याकार्ड उभे राहणे
@@ -2524,9 +2532,9 @@
 DocType: Cash Flow Mapper,Position,स्थान
 DocType: Patient,Patient Details,पेशंटचा तपशील
 DocType: Patient,B Positive,ब सकारात्मक
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 DocType: Patient Medical Record,Patient Medical Record,पेशंट मेडिकल रेकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,गट  पासून नॉन-गट पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,क्रीडा
@@ -2534,8 +2542,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,वास्तविक एकूण
 DocType: Lab Test UOM,Test UOM,यूओएम चाचणी
 DocType: Student Siblings,Student Siblings,विद्यार्थी भावंड
+DocType: Subscription Plan Detail,Subscription Plan Detail,सदस्यता योजना तपशील
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,युनिट
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,कृपया कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,कृपया कंपनी निर्दिष्ट करा
 ,Customer Acquisition and Loyalty,ग्राहक संपादन आणि लॉयल्टी
 DocType: Asset Maintenance Task,Maintenance Task,देखभाल कार्य
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,कृपया GST सेटिंग्जमध्ये B2C मर्यादा सेट करा.
@@ -2550,6 +2559,7 @@
 ,BOM Search,BOM शोध
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),टोटल कन्स्ट्रक्टेड मटेरियल कॉस्ट (स्टॉक एंट्री द्वारे)
 DocType: Hub Settings,Company Registered,कंपनी नोंदणीकृत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,तारीख तारखेपासून कमी असू शकत नाही
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",या गोदामात उपलब्ध स्टॉकवर आधारित &quot;स्टॉकमध्ये&quot; किंवा &quot;स्टॉक इन नॉन&quot; हबवर प्रकाशित करा.
 DocType: Vehicle,Fuel Type,इंधन प्रकार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,कृपया कंपनीतील  चलन निर्दिष्ट करा
@@ -2557,17 +2567,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बॅच {0} मधील शेअर शिल्लक  नकारात्मक होईल{1}  आयटम {2} साठी वखार  {3} येथे
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,साहित्य विनंत्या खालील आयटम च्या पुन्हा ऑर्डर स्तरावर आधारित आपोआप उठविला गेला आहे
 DocType: Email Digest,Pending Sales Orders,प्रलंबित विक्री आदेश
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
 DocType: Employee,Create User Permission,वापरकर्ता परवानगी तयार करा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Healthcare Settings,Remind Before,आधी स्मरण द्या
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग  {0} मधे आवश्यक आहे
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Salary Component,Deduction,कपात
 DocType: Item,Retain Sample,नमुना ठेवा
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
 DocType: Stock Reconciliation Item,Amount Difference,रक्कम फरक
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,या विक्री व्यक्तीसाठी  कर्मचारी आयडी प्रविष्ट करा
 DocType: Territory,Classification of Customers by region,प्रदेशानुसार ग्राहक वर्गीकरण
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,उत्पादन
@@ -2577,8 +2588,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,गणिती बँक स्टेटमेंट शिल्लक
 DocType: Normal Test Template,Normal Test Template,सामान्य टेस्ट टेम्पलेट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,अक्षम वापरकर्ता
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,कोटेशन
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,कोणतेही भाव नाही प्राप्त आरएफक्यू सेट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,कोटेशन
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,कोणतेही भाव नाही प्राप्त आरएफक्यू सेट करू शकत नाही
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,एकूण कपात
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,खाते चलनात मुद्रण करण्यासाठी एक खाते निवडा
@@ -2586,7 +2597,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,हे या पेशंटच्या व्यवहारावर आधारित आहे. तपशीलासाठी खाली टाइमलाइन पहा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,खर्च अद्यतनित
 DocType: Patient,Date of Birth,जन्म तारीख
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,आयटम {0} आधीच परत आला  आहे
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,आयटम {0} आधीच परत आला  आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**आर्थिक वर्ष** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार **आर्थिक वर्ष** विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,पुरवठादार धावसंख्याकार्ड सेटअप
@@ -2597,14 +2608,15 @@
 DocType: Work Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,कामाचे वर्णन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,कामाचे वर्णन
 DocType: Student Applicant,Applied,लागू
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,पुन्हा उघडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,पुन्हा उघडा
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty शेअर UOM नुसार
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 नाव
 DocType: Purchase Invoice,02-Post Sale Discount,02-पोस्ट विक्री सवलत
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","विक्री मोहिमांचा  ट्रॅक ठेवा. Leads, अवतरणे, विक्री ऑर्डर इत्यादी मोहीम पासून  गुंतवणूक वर परत गेज."
+DocType: Department Approver,Approver,माफीचा साक्षीदार
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,समभागधारकांना फील्ड रिक्त नसावे
 DocType: Guardian,Work Address,काम पत्ता
@@ -2618,21 +2630,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),एकूण रक्कम (कंपनी चलन)
 DocType: Purchase Order Item,To be delivered to customer,ग्राहकाला वितरित करणे
 DocType: BOM,Scrap Material Cost,स्क्रॅप साहित्य खर्च
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,सिरियल क्रमांक  {0} कोणत्याही वखारशी  संबंधित नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,सिरियल क्रमांक  {0} कोणत्याही वखारशी  संबंधित नाही
 DocType: Grant Application,Email Notification Sent,ईमेल सूचना पाठविले
 DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","आयटम कोड, कोठार, रकमेची संख्या आवश्यक आहे"
-DocType: Pricing Rule,Supplier,पुरवठादार
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","आयटम कोड, कोठार, रकमेची संख्या आवश्यक आहे"
+DocType: Bank Guarantee,Supplier,पुरवठादार
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,देय तपशील दर्शवा
 DocType: Consultation,Consultation Time,सल्ला वेळ
 DocType: C-Form,Quarter,तिमाहीत
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,मिश्र खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,मिश्र खर्च
 DocType: Global Defaults,Default Company,मुलभूत कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
 DocType: Payment Request,PR,जनसंपर्क
 DocType: Cheque Print Template,Bank Name,बँक नाव
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-वरती
-DocType: Employee Loan,Employee Loan Account,कर्मचारी कर्ज खाते
 DocType: Leave Application,Total Leave Days,एकूण दिवस रजा
 DocType: Email Digest,Note: Email will not be sent to disabled users,टीप: ईमेल वापरकर्त्यांना अक्षम पाठविली जाऊ शकत नाही
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,संवाद संख्या
@@ -2648,7 +2659,7 @@
 DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्रॅममध्ये)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",अध्याय / अध्याय_नाव अध्याय वाचविण्यापूर्वी आपोआप सेट अप रिकामे ठेवा.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,कृपया GST सेटिंग्जमध्ये GST खाती सेट करा
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,कृपया GST सेटिंग्जमध्ये GST खाती सेट करा
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,व्यवसायाचा प्रकार
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,नवीन खरेदी खर्च
@@ -2657,12 +2668,13 @@
 DocType: Grant Application,Grant Description,अनुदान वर्णन
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
 DocType: Student Guardian,Others,इतर
+DocType: Subscription,Discounts,सवलत
 DocType: Payment Entry,Unallocated Amount,न वाटप केलेली रक्कम
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,मानक क्षेत्रात हटवू शकत नाही. आपण {0} साठी काही इतर मूल्य निवडा.
 DocType: POS Profile,Taxes and Charges,कर आणि शुल्क
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पादन किंवा सेवा म्हणजे जी विकत घेतली जाते, विकली जाते किंवा स्टॉक मध्ये ठेवली जाते"
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,आणखी कोणतेही अद्यतने
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी 'मागील पंक्ती एकूण रोजी' किंवा  'मागील पंक्ती रकमेवर' म्हणून जबाबदारी प्रकार निवडू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी 'मागील पंक्ती एकूण रोजी' किंवा  'मागील पंक्ती रकमेवर' म्हणून जबाबदारी प्रकार निवडू शकत नाही
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,या सेटअपसह बद्ध केलेल्या सर्व स्कोअरकार्डमध्ये हे समाविष्ट आहे
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child आयटम उत्पादन बंडल मधे असू नये. आयटम  '{0}' काढा आणि जतन करा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,बँकिंग
@@ -2671,21 +2683,24 @@
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
 DocType: Bin,Ordered Quantity,आदेश दिलेले प्रमाण
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","उदा ""बांधकाम व्यावसायिकांसाठी  बिल्ड साधने """
 DocType: Grading Scale,Grading Scale Intervals,प्रतवारी स्केल मध्यांतरे
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,वर्षासाठी नफा
+DocType: Bank Guarantee,Name of Bank,बँकेचे नाव
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} एकट्या प्रवेशाचे फक्त चलनात केले जाऊ शकते: {3}
 DocType: Fee Schedule,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,आर्थिक खाती Tree.
+DocType: Bank Guarantee,Reference Document Type,संदर्भ दस्तऐवज प्रकार
 DocType: Cash Flow Mapping,Cash Flow Mapping,रोख प्रवाह मॅपिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} विक्री आदेशा विरुद्ध {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,सिरीयलाइज यादी
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ईमेल डीफॉल्ट संपर्कात सापडला नाही
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,गुप्त व्युत्पन्न करा
-DocType: Employee Loan,Account Info,खात्याची माहिती
+DocType: Loan,Account Info,खात्याची माहिती
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
 DocType: Fees,Include Payment,पेमेंट समाविष्ट करा
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} विद्यार्थी गट तयार केला.
@@ -2693,24 +2708,24 @@
 DocType: Sales Invoice,Total Billing Amount,एकूण बिलिंग रक्कम
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,फी संरचना आणि विद्यार्थी गट {0} मधील कार्यक्रम भिन्न आहेत.
 DocType: Fee Schedule,Receivable Account,प्राप्त खाते
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
 DocType: Quotation Item,Stock Balance,शेअर शिल्लक
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,मुख्य कार्यकारी अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,मुख्य कार्यकारी अधिकारी
 DocType: Purchase Invoice,With Payment of Tax,कराचा भरणा सह
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,पुरवठादार साठी तिप्पट
 DocType: Land Unit,Is Container,कंटेनर आहे
 DocType: Crop Cycle,This will be day 1 of the crop cycle,हे पीक चक्रातील पहिला दिवस असेल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,कृपया  योग्य खाते निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,कृपया  योग्य खाते निवडा
 DocType: Purchase Invoice Item,Weight UOM,वजन UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,फोलीओ नंबरसह उपलब्ध भागधारकांची यादी
 DocType: Salary Structure Employee,Salary Structure Employee,पगार संरचना कर्मचारी
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,भिन्न वैशिष्ट्ये दर्शवा
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,भिन्न वैशिष्ट्ये दर्शवा
 DocType: Student,Blood Group,रक्त गट
 DocType: Course,Course Name,अर्थातच नाव
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,जे वापरकर्ते विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,कार्यालय उपकरणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,कार्यालय उपकरणे
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,कंपन्या
 DocType: Supplier Scorecard,Scoring Setup,स्कोअरिंग सेटअप
@@ -2729,7 +2744,7 @@
 DocType: Stock Entry,Total Incoming Value,एकूण येणारी  मूल्य
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,डेबिट करणे आवश्यक आहे
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,खरेदी दर सूची
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,सप्लायर स्कोअरकार्ड व्हेरिएबल्सचे टेम्पलेट
 DocType: Job Offer Term,Offer Term,ऑफर मुदत
 DocType: Asset,Quality Manager,गुणवत्ता व्यवस्थापक
@@ -2741,13 +2756,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},एकूण न चुकता: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM वेबसाइट ऑपरेशन
 DocType: Supplier Scorecard,Supplier Score,पुरवठादार धावसंख्या
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,एकूण Invoiced रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,एकूण Invoiced रक्कम
 DocType: Supplier,Warn RFQs,RFQs चेतावणी द्या
 DocType: BOM,Conversion Rate,रूपांतरण दर
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,उत्पादन शोध
 DocType: Assessment Plan,To Time,वेळ
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य वरील) भूमिका मंजूर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,क्रेडिट खाते देय खाते असणे आवश्यक आहे
+DocType: Loan,Total Amount Paid,देय एकूण रक्कम
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,कृपया विद्यार्थी प्रवेश निवडा जे सशुल्क विद्यार्थ्यासाठी अनिवार्य आहे
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,किंमत प्रकाशित करण्यासाठी कृपया एक किंमत सूची निवडा
@@ -2757,19 +2773,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},सलग {0}: पूर्ण प्रमाण जास्त असू शकत नाही {1} ऑपरेशन {2}
 DocType: Manufacturing Settings,Allow Overtime,जादा वेळ परवानगी द्या
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",सिरीयलाइज आयटम {0} शेअर सलोखा वापरून कृपया शेअर प्रवेश केले जाऊ शकत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",सिरीयलाइज आयटम {0} शेअर सलोखा वापरून कृपया शेअर प्रवेश केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",सिरीयलाइज आयटम {0} शेअर सलोखा वापरून कृपया शेअर प्रवेश केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",सिरीयलाइज आयटम {0} शेअर सलोखा वापरून कृपया शेअर प्रवेश केले जाऊ शकत नाही
 DocType: Training Event Employee,Training Event Employee,प्रशिक्षण कार्यक्रम कर्मचारी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,अधिकतम नमुने - {0} बॅच {1} आणि आयटम {2} साठी ठेवता येतात.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,वेळ स्लॉट जोडा
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} सिरिअल क्रमांक हा आयटम {1} साठी आवश्यक आहे. आपल्याला {2} प्रदान केलेल्या आहेत
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} सिरिअल क्रमांक हा आयटम {1} साठी आवश्यक आहे. आपल्याला {2} प्रदान केलेल्या आहेत
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Training Event,Advance,प्रगती
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,पुन्हा आवर्ती करण्यासाठी
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless देयक गेटवे सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,विनिमय लाभ / कमी होणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,विनिमय लाभ / कमी होणे
 DocType: Opportunity,Lost Reason,कारण गमावले
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},पंक्ती # {0}: खाते {1} कंपनीशी संबंधित नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},पंक्ती # {0}: खाते {1} कंपनीशी संबंधित नाही {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},डॉकटाइप {0} शोधण्यात अक्षम
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
@@ -2788,7 +2803,6 @@
 DocType: Bin,Actual Quantity,वास्तविक प्रमाण
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},सदस्यता {0} झाली आहे
 DocType: Fee Schedule Program,Fee Schedule Program,फी अनुसूची कार्यक्रम
 DocType: Fee Schedule Program,Student Batch,विद्यार्थी बॅच
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,विद्यार्थी करा
@@ -2804,14 +2818,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ई-कॉमर्स GSTIN
 DocType: Sales Order,Not Delivered,वितरित नाही
 ,Bank Clearance Summary,बँक लाभ सारांश
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,श्रेणी सुचवायचे?
 DocType: Stock Reconciliation Item,Current Amount,चालू रक्कम
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,इमारती
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,इमारती
 DocType: Fee Schedule,Fee Structure,फी
 DocType: Timesheet Detail,Costing Amount,भांडवलाच्या रक्कम
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Student Admission Program,Application Fee,अर्ज फी
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,पगाराच्या स्लिप्स सादर करा
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,आयटम {0}  साठी Maxiumm सवलत  {1}% आहे
@@ -2819,12 +2832,13 @@
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,कृषी विश्लेषण मापदंड
+DocType: HR Settings,Leave Approval Notification Template,मंजूरी सूचना मांडणी सोडा
 DocType: POS Profile,[Select],[निवडा]
 DocType: Vital Signs,Blood Pressure (diastolic),रक्तदाब (डायस्टोलिक)
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 DocType: Agriculture Task,Holiday Management,सुट्टी व्यवस्थापन
 DocType: Payment Request,Make Sales Invoice,विक्री चलन करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,सॉफ्टवेअर
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,सॉफ्टवेअर
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
 DocType: Company,For Reference Only.,संदर्भ केवळ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{0} वर वैद्यक {0} उपलब्ध नाही
@@ -2842,7 +2856,7 @@
 DocType: Employee,New Workplace,नवीन कामाची जागा
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,सामग्री वापर
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,बंद म्हणून सेट करा
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},बारकोड असलेले कोणतेही आयटम {0} नाहीत
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},बारकोड असलेले कोणतेही आयटम {0} नाहीत
 DocType: Normal Test Items,Require Result Value,परिणाम मूल्य आवश्यक आहे
 DocType: Item,Show a slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2857,19 +2871,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,दिले तारखा कर्मचारी {0} आढळले सक्रिय नाही किंवा मुलभूत तत्वे
 DocType: Leave Block List,Allow Users,वापरकर्त्यांना परवानगी द्या
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,आवर्ती
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,रोख प्रवाह मॅपिंग टेम्पलेट तपशील
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,कर्ज व्यवस्थापन
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,स्वतंत्र उत्पन्न ट्रॅक आणि उत्पादन verticals किंवा विभाग लवकरात.
 DocType: Rename Tool,Rename Tool,साधन पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,पगार शो स्लिप्स
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,पगार शो स्लिप्स
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ट्रान्सफर साहित्य
 DocType: Fees,Send Payment Request,पैसे विनंती पाठवा
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च  आणि आपल्या ऑपरेशनसाठी    एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
 DocType: Water Analysis,Origin,मूळ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
@@ -2884,14 +2898,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,आयकर दायित्व आहे
 DocType: Grading Scale Interval,Grade Description,ग्रेड वर्णन
 DocType: Stock Entry,Purchase Receipt No,खरेदी पावती नाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,इसा-याची रक्कम
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,इसा-याची रक्कम
 DocType: Sales Invoice, Shipping Bill Number,शिपिंग बिल क्रमांक
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 DocType: Asset Maintenance Log,Actions performed,क्रिया पूर्ण
 DocType: Cash Flow Mapper,Section Leader,विभाग प्रमुख
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),निधी स्रोत (दायित्व)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),निधी स्रोत (दायित्व)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,कर्मचारी
+DocType: Bank Guarantee,Fixed Deposit Number,मुदत ठेव क्रमांक
 DocType: Asset Repair,Failure Date,अयशस्वी तारीख
 DocType: Sample Collection,Collected Time,एकत्रित वेळ
 DocType: Company,Sales Monthly History,विक्री मासिक इतिहास
@@ -2908,10 +2923,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,आपली खात्री आहे की आपण ही नियोजित भेट रद्द करू इच्छिता?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,हॉटेल रूम प्राइसिंग पॅकेज
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,विक्री पाईपलाईन
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,रोजी आवश्यक
 DocType: Rename Tool,File to Rename,फाइल पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,सदस्यता अद्यतने प्राप्त करा
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},खाते {0} खाते मोड मध्ये {1} कंपनी जुळत नाही: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},आयटम  {1} साठी निर्दिष्ट BOM {0} अस्तित्वात नाही
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,कोर्स:
@@ -2921,7 +2937,7 @@
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,कोणतेही कार्य ऑर्डर तयार नाहीत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,कर्मचारी पगार स्लिप {0} आधीच या काळात निर्माण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,फार्मास्युटिकल
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,फार्मास्युटिकल
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरेदी आयटम खर्च
 DocType: Selling Settings,Sales Order Required,विक्री ऑर्डर आवश्यक
 DocType: Purchase Invoice,Credit To,श्रेय
@@ -2939,7 +2955,7 @@
 DocType: Request for Quotation Supplier,No Quote,नाही कोट
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Gateway Account,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,भरपाई देणारा बंद
 DocType: Job Offer,Accepted,स्वीकारले
@@ -2952,7 +2968,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनीतील  सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master  data  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,शोध परिणाम
 DocType: Room,Room Number,खोली क्रमांक
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},अवैध संदर्भ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},अवैध संदर्भ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 DocType: Journal Entry Account,Payroll Entry,वेतन प्रविष्ट करा
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,शुल्क रेकॉर्ड पहा
@@ -2962,7 +2978,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
 DocType: Lab Test Sample,Lab Test Sample,लॅब चाचणी नमुना
 DocType: Item Variant Settings,Allow Rename Attribute Value,विशेषता नाव बदलण्याची अनुमती द्या
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,जलद प्रवेश जर्नल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
 DocType: Restaurant,Invoice Series Prefix,बीजक मालिका उपसर्ग
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
@@ -2970,8 +2986,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},सलग  आयटम {0} सलग{1} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps एकीकरण सक्षम नाही
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,"{0} {1} हे सबमिट केलेली नाही,"
+DocType: Subscription,Trialling,ट्रायलिंग
 DocType: Member,Membership Expiry Date,सदस्यता कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} परत दस्तऐवज नकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} परत दस्तऐवज नकारात्मक असणे आवश्यक आहे
 ,Minutes to First Response for Issues,मुद्दे प्रथम प्रतिसाद मिनिटे
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
@@ -2990,7 +3007,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,माप युनिट
 DocType: Fiscal Year,Year End Date,अंतिम वर्ष  तारीख
 DocType: Task Depends On,Task Depends On,कार्य अवलंबून असते
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,संधी
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,संधी
 DocType: Operation,Default Workstation,मुलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,खर्च क्लेम मंजूर संदेश
 DocType: Payment Entry,Deductions or Loss,कपात किंवा कमी होणे
@@ -3028,7 +3045,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,वेतन न करता सोडू मंजूर रजा रेकॉर्ड जुळत नाही
 DocType: Campaign,Campaign-.####,मोहीम -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
 DocType: Membership,USD,अमेरिकन डॉलर
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चलन करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,बाकी शिल्लक
@@ -3038,7 +3055,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,समाप्त वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Driver,Driver,ड्रायवर
 DocType: Vital Signs,Nutrition Values,पोषण मूल्ये
 DocType: Lab Test Template,Is billable,बिल करण्यायोग्य आहे
@@ -3049,7 +3066,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),प्रत्यक्ष प्रारंभ तारीख (वेळ पत्रक द्वारे)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,हा नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेला  आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Ageing श्रेणी 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,एकूण आगाऊ रक्कम ही एकुण हक्क सांगितलेल्या रकमेपेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,एकूण आगाऊ रक्कम ही एकुण हक्क सांगितलेल्या रकमेपेक्षा जास्त असू शकत नाही
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3084,7 +3101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,विशेषता मूल्ये निवडा
 DocType: Purchase Invoice,Reason For Issuing document,दस्तऐवज जारी करण्याचे कारण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,पुढील संपर्क होऊ ईमेल पत्ता समान असू शकत नाही
 DocType: Tax Rule,Billing City,बिलिंग शहर
@@ -3101,7 +3118,8 @@
 DocType: Warranty Claim,Service Address,सेवा पत्ता
 DocType: Asset Maintenance Task,Calibration,कॅलिब्रेशन
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} कंपनीची सुट्टी आहे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,फर्निचर आणि सामने
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,स्थिती सूचना सोडा
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,फर्निचर आणि सामने
 DocType: Item,Manufacture,उत्पादन
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,सेटअप कंपनी
 ,Lab Test Report,प्रयोगशाळा चाचणी अहवाल
@@ -3117,7 +3135,6 @@
 DocType: Crop,Planting Area,लागवड क्षेत्र
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,याचे कारण काही अवैध ईमेल पत्ते असू शकतात
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,आपण जोडले
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,प्रशिक्षण निकाल
@@ -3127,16 +3144,17 @@
 DocType: Products Settings,Products per Page,प्रत्येक पृष्ठावरील उत्पादने
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,संघटना शाखा मास्टर.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,समस्या नोंदवणे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,उपयुक्तता खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,उपयुक्तता खर्च
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-वर
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,सलग # {0}: जर्नल प्रवेश {1} खाते नाही {2} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
 DocType: Supplier Scorecard Criteria,Criteria Weight,निकष वजन
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,स्वीकृति सूचना सोडून द्या
 DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet आधारित पगाराच्या स्लिप्स
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,खरेदी दर
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,खरेदी दर
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","कंपनी, चलन, वर्तमान आर्थिक वर्ष इ  मुलभूत मुल्य  सेट करा"
 DocType: Payment Entry,Payment Type,भरणा प्रकार
@@ -3159,6 +3177,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,हे खरेदी सूचीत टाका सेटिंग्ज
 DocType: Journal Entry,Accounting Entries,लेखा नोंदी
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","&#39;दर&#39; साठी निवडलेला मूल्यनिर्धारण नियम केल्यास, तो किंमत सूची अधिलिखित करेल. मूल्य नियम दर अंतिम दर आहे, म्हणून आणखी सवलत लागू केली जाऊ नये. म्हणूनच विक्री आदेश, खरेदी आदेश इत्यादी व्यवहारात ते &#39;किंमत सूची रेट&#39; ऐवजी &#39;रेट&#39; क्षेत्रात आणले जाईल."
+DocType: Journal Entry,Paid Loan,पेड लोन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},प्रवेश डुप्लिकेट. कृपया प्राधिकृत नियम {0} तपासा
 DocType: Journal Entry Account,Reference Due Date,संदर्भ देय दिनांक
 DocType: Purchase Order,Ref SQ,संदर्भ SQ
@@ -3175,7 +3194,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/config/hr.py +93,Payroll,उपयोग पे रोल
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग {0} मधील {1} साठी . आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग {0} मधील {1} साठी . आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
 DocType: Patient Service Unit,Parent Service Unit,पालक सेवा एकक
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,वापरकर्ता करा
 DocType: Packing Slip,Identification of the package for the delivery (for print),डिलिव्हरी संकुल ओळख (मुद्रण)
@@ -3194,7 +3213,7 @@
 DocType: Shareholder,SH-,एसएच-
 DocType: Account,Income Account,उत्पन्न खाते
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,डिलिव्हरी
 DocType: Volunteer,Weekdays,आठवड्यातील दिवस
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: Restaurant Menu,Restaurant Menu,रेस्टॉरन्ट मेनू
@@ -3202,7 +3221,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,शाश्वत यादी मुलभूत यादी खाते सेट
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,शाश्वत यादी मुलभूत यादी खाते सेट
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ग्रांन्ट रिव्यू ईमेल पाठवा
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage पूर्ण आहे, जतन नाही"
@@ -3210,10 +3229,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,खोली क्षमता
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},आयटम {0} साठी आधीपासूनच रेकॉर्ड अस्तित्वात आहे
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,संदर्भ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,आपण पूर्वी व्युत्पन्न केलेली इन्व्हॉइसेसचे रेकॉर्ड गमवाल. आपल्याला खात्री आहे की आपण ही सदस्यता रीस्टार्ट करू इच्छिता?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,नोंदणी शुल्क
 DocType: Budget,Cost Center,खर्च केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,प्रमाणक #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,प्रमाणक #
 DocType: Notification Control,Purchase Order Message,ऑर्डर संदेश खरेदी
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,पासून विक्री व्यवहार ग्राहक कर आयडी लपवा
@@ -3222,20 +3242,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारीने  परिभाषित केले आहे."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश / डिलिव्हरी टीप / खरेदी पावती द्वारे बदलले जाऊ शकते
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,आयकर
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,लेटरहेडवर जा
+DocType: Subscription,Cancel At End Of Period,कालावधी समाप्ती वर रद्द करा
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,स्थानांतरणासाठी कोणतेही आयटम निवडले नाहीत
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,स्थानांतरणासाठी कोणतेही आयटम निवडले नाहीत
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
 DocType: Vehicle,Electric,विद्युत
 DocType: Task,% Progress,% प्रगती
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,मालमत्ता विल्हेवाट वाढणे / कमी होणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,मालमत्ता विल्हेवाट वाढणे / कमी होणे
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",फक्त &quot;स्वीकृत&quot; दर्जा असलेला विद्यार्थी अर्जदार खालील तक्त्यामध्ये निवडला जाईल.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,{0} खात्यासाठी खाते क्रमांक उपलब्ध नाही. <br> कृपया आपला चार्ट अचूकपणे सेटअप करा.
 DocType: Task,Depends on Tasks,कार्ये अवलंबून
@@ -3250,6 +3271,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,स्टॉक मध्ये नाही
 DocType: Volunteer,Volunteer Skills,स्वयंसेवक कौशल्य
 DocType: Appraisal,HR User,एचआर सदस्य
+DocType: Bank Guarantee,Reference Document Name,संदर्भ दस्तऐवज नाव
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर आणि शुल्क वजा
 apps/erpnext/erpnext/hooks.py +142,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},{0} पैकी स्थिती एक असणे आवश्यक आहे
@@ -3263,7 +3285,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,अधिक मोठे
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,अधिक मोठे
+DocType: Loan,Loan Application,कर्ज अर्ज
 DocType: Crop,Scientific Name,शास्त्रीय नाव
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,एकूण पाने
 DocType: Customer,"Reselect, if the chosen contact is edited after save","निवड रद्द केलेले संपर्क जतन केल्यानंतर संपादित केले असल्यास, निवड रद्द करा"
@@ -3272,13 +3295,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,धनादेश क्रमांक
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश  {2} विरुद्ध अस्तित्वात
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश  {2} विरुद्ध अस्तित्वात
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,स्थानिक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),कर्ज आणि  मालमत्ता (assets)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,कर्जदार
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,मोठे
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,मोठे
 DocType: Homepage Featured Product,Homepage Featured Product,मुख्यपृष्ठ वैशिष्ट्यीकृत उत्पादन
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,सर्व मूल्यांकन गट
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,सर्व मूल्यांकन गट
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नवीन वखार नाव
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),एकूण {0} ({1})
 DocType: C-Form Invoice Detail,Territory,प्रदेश
@@ -3299,9 +3322,10 @@
 DocType: Fees,Fees,शुल्क
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,एक चलन दुसर्यात रूपांतरित करण्यासाठी  विनिमय दर निर्देशीत  करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,कोटेशन {0} रद्द
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,एकूण थकबाकी रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,एकूण थकबाकी रक्कम
 DocType: Sales Partner,Targets,लक्ष्य
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,कृपया कंपनीच्या माहितीच्या फाइलमध्ये SIREN क्रमांक नोंदवा
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Price List,Price List Master,किंमत सूची मास्टर
 DocType: GST Account,CESS Account,CESS खाते
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते यासाठी की, तुम्ही सेट आणि लक्ष्य निरीक्षण करू शकता"
@@ -3310,6 +3334,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,रुग्ण निवडा
 DocType: Price List,Applicable for Countries,देशांसाठी  लागू
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,पॅरामीटर नाव
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,फक्त स्थिती सह अनुप्रयोग सोडा &#39;मंजूर&#39; आणि &#39;रिजेक्टेड&#39; सादर केला जाऊ शकतो
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},विद्यार्थी गट नाव सलग आवश्यक आहे {0}
 DocType: Homepage,Products to be shown on website homepage,उत्पादने वेबसाइटवर मुख्यपृष्ठावर दर्शविले करणे
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,हा  मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -3343,14 +3368,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,सर्व बिलिंग तासांसाठी आधीच तयार केलेले बीजक
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},नाव त्रुटी: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,वित्त खर्च आहे
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} हजेरी आधीच खूण आहे
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,कर्मचारी {0} हजेरी आधीच खूण आहे
 DocType: Packing Slip,If more than one package of the same type (for print),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,कृपया रेस्टॉरंट सेटिंग्जमध्ये डीफॉल्ट ग्राहक सेट करा
 ,Salary Register,पगार नोंदणी
 DocType: Warehouse,Parent Warehouse,पालक वखार
-DocType: C-Form Invoice Detail,Net Total,निव्वळ एकूण
+DocType: Subscription,Net Total,निव्वळ एकूण
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},डीफॉल्ट BOM आयटम आढळले नाही {0} आणि प्रकल्प {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,विविध कर्ज प्रकार काय हे स्पष्ट करा
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,विविध कर्ज प्रकार काय हे स्पष्ट करा
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,बाकी रक्कम
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),वेळ (मिनिटांनी)
@@ -3382,11 +3407,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,रूट खाते एक गट असणे आवश्यक आहे
 DocType: Drug Prescription,Drug Prescription,ड्रग प्रिस्क्रिप्शन
 DocType: Fees,FEE.,शुल्क.
-DocType: Employee Loan,Repaid/Closed,परतफेड / बंद
+DocType: Loan,Repaid/Closed,परतफेड / बंद
 DocType: Item,Total Projected Qty,एकूण अंदाज प्रमाण
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","आयटम {0} साठी मूल्यमापन दर सापडत नाही, ज्यासाठी {1} {2} साठी लेखा प्रविष्ट करणे आवश्यक आहे. आयटम {1} मध्ये शून्य मूल्यांकनातील दर आयटम म्हणून व्यवहार करत असल्यास, कृपया {1} आयटम सारणीमध्ये हे निर्दिष्ट करा. अन्यथा, कृपया आयटमसाठी येणारे स्टॉक ट्रान्झॅक्शन तयार करा किंवा आयटम रेकॉर्डमध्ये व्हॅल्यूशन रेट नमूद करा आणि नंतर ही नोंदणी सबमिट करण्याचा / रद्द करण्याचा प्रयत्न करा"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया {0} साठी सेटअप&gt; सेटिंग्ज&gt; नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
 DocType: Course,Course Code,अर्थात कोड
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ऑफलाइन मोडमध्ये वापरा
@@ -3406,16 +3430,15 @@
 DocType: Purchase Invoice,Deemed Export,डीम्ड एक्सपोर्ट
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
-DocType: Subscription,Half-yearly,सहामाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Lab Test,LabTest Approver,लॅबस्टेस्ट अॅपरॉव्हर
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,आपण मूल्यांकन निकष आधीच मूल्यमापन आहे {}.
 DocType: Vehicle Service,Engine Oil,इंजिन तेल
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},तयार केलेल्या कार्य ऑर्डर: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},तयार केलेल्या कार्य ऑर्डर: {0}
 DocType: Sales Invoice,Sales Team1,विक्री Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
-DocType: Employee Loan,Loan Details,कर्ज तपशील
+DocType: Loan,Loan Details,कर्ज तपशील
 DocType: Company,Default Inventory Account,डीफॉल्ट यादी खाते
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,फोलिओ संख्या जुळत नाहीत
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
@@ -3427,19 +3450,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,क्रॉप वाढत आहे अशा सर्व जमिनीच्या एककांशी दुवा
 DocType: Account,Root Type,रूट प्रकार
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
 DocType: Item Group,Show this slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी हा स्लाइडशो दर्शवा
 DocType: BOM,Item UOM,आयटम UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग {0} साठी अनिवार्य आहे
 DocType: Cheque Print Template,Primary Settings,प्राथमिक सेटिंग्ज
 DocType: Purchase Invoice,Select Supplier Address,पुरवठादाराचा  पत्ता निवडा
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,कर्मचारी जोडा
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,कर्मचारी जोडा
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता तपासणी
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,अतिरिक्त लहान
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,अतिरिक्त लहान
 DocType: Company,Standard Template,मानक साचा
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
@@ -3459,11 +3482,10 @@
 DocType: SMS Log,No of Sent SMS,पाठविलेला एसएमएस क्रमांक
 DocType: Antibiotic,Healthcare Administrator,हेल्थकेअर प्रशासक
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,लक्ष्य सेट करा
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
 DocType: Dosage Strength,Dosage Strength,डोस सामर्थ्य
 DocType: Account,Expense Account,खर्च खाते
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,सॉफ्टवेअर
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,रंग
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,रंग
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,मूल्यांकन योजना निकष
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,निवडलेल्या आयटमसाठी समाप्ती तारीख अनिवार्य आहे
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,खरेदी ऑर्डर थांबवा
@@ -3476,18 +3498,18 @@
 DocType: Patient,Personal and Social History,वैयक्तिक आणि सामाजिक इतिहास
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,वापरकर्ता {0} तयार केले
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक विद्यार्थ्यासाठी फी ब्रेकअप
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,कोड बदला
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 DocType: Stock Reconciliation,SR/,सचिन /
 DocType: Vehicle,Diesel,डिझेल
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
 DocType: Purchase Invoice,Availed ITC Cess,लाभलेल्या आयटीसी उपकर
 ,Student Monthly Attendance Sheet,विद्यार्थी मासिक उपस्थिती पत्रक
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,शिपिंग नियम फक्त विक्रीसाठी लागू आहे
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,प्रकल्प सुरू तारीख
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,पर्यंत
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,पर्यंत
 DocType: Rename Tool,Rename Log,लॉग पुनर्नामित करा
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,विद्यार्थी किंवा गट कोर्स वेळापत्रक अनिवार्य आहे
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,विद्यार्थी किंवा गट कोर्स वेळापत्रक अनिवार्य आहे
@@ -3508,7 +3530,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,आपण खरेदी किंवा विक्री केलेल्या वस्तू किंवा सेवांची सूची करा.
 DocType: Water Analysis,Storage Temperature,साठवण तापमान
 DocType: Employee Attendance Tool,Unmarked Attendance,खुणा न केलेली  उपस्थिती
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,संशोधक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,संशोधक
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,कार्यक्रम नावनोंदणी साधन विद्यार्थी
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},प्रारंभ तारीख कार्य {0} साठी समाप्ती तारखेपेक्षा कमी असली पाहिजे
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,नाव किंवा ईमेल अनिवार्य आहे
@@ -3521,7 +3543,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} सध्या येथे {1} पुरवठादार धावसंख्याकार्ड उभे आहे आणि या पुरवठादाराला आरएफक्यू सावधगिरीने देणे आवश्यक आहे.
 DocType: Chapter,Non Profit Manager,नॉन प्रॉफिट मॅनेजर
 DocType: BOM,Total Cost(Company Currency),एकूण खर्च (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,सिरियल क्रमांक{0} तयार केला
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,सिरियल क्रमांक{0} तयार केला
 DocType: Homepage,Company Description for website homepage,वेबसाइट मुख्यपृष्ठावर कंपनी वर्णन
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ग्राहकांच्या सोयीसाठी, हे कोड पावत्या आणि वितरण टिपा सारख्या प्रिंट स्वरूपात वापरले जाऊ शकते"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier नाव
@@ -3531,11 +3553,10 @@
 DocType: Employee,You can enter any date manually,तुम्ही स्वतः तारीख प्रविष्ट करू शकता
 DocType: Healthcare Settings,Result Printed,परिणाम मुद्रित
 DocType: Asset Category Account,Depreciation Expense Account,इतर किरकोळ खर्च खाते
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,परीविक्षण कालावधी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} पहा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,परीविक्षण कालावधी
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Project,Total Costing Amount (via Timesheets),एकूण किंमत (वेळपत्रके मार्गे)
-DocType: Employee Advance,Expense Approver,खर्च माफीचा साक्षीदार
+DocType: Department,Expense Approver,खर्च माफीचा साक्षीदार
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
 DocType: Project,Hourly,ताशी
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,गट न गट
@@ -3545,7 +3566,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME करण्यासाठी
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रवेश द्वारे रक्कम
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,छापील रोजी
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,छापील रोजी
 DocType: Item,Inspection Required before Delivery,तपासणी वितरण आधी आवश्यक
 DocType: Item,Inspection Required before Purchase,तपासणी खरेदी करण्यापूर्वी आवश्यक
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,प्रलंबित उपक्रम
@@ -3555,7 +3576,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,किमान मागणी प्रमाण
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,आपले संघटना
 DocType: Fee Component,Fees Category,शुल्क वर्ग
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,रक्कम
 DocType: Supplier Scorecard,Notify Employee,कर्मचार्याला सूचित करा
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्त्रोत मोहीम असेल तर मोहीम नाव प्रविष्ट करा
@@ -3565,7 +3586,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,स्तर पुनर्क्रमित करा
 DocType: Company,Chart Of Accounts Template,खाती साचा चार्ट
 DocType: Attendance,Attendance Date,उपस्थिती दिनांक
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},आयटम किंमत {0} मध्ये दर सूची अद्ययावत {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},आयटम किंमत {0} मध्ये दर सूची अद्ययावत {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,child नोडस् सह खाते लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 DocType: Purchase Invoice Item,Accepted Warehouse,स्वीकृत कोठार
@@ -3573,10 +3594,11 @@
 DocType: Item,Valuation Method,मूल्यांकन पद्धत
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,मार्क अर्धा दिवस
 DocType: Sales Invoice,Sales Team,विक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,डुप्लिकेट नोंदणी
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,डुप्लिकेट नोंदणी
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,सादर करण्यापूर्वी लाभार्थीचे नाव प्रविष्ट करा.
 DocType: Program Enrollment Tool,Get Students,विद्यार्थी मिळवा
 DocType: Serial No,Under Warranty,हमी अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[त्रुटी]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[त्रुटी]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर एकदा जतन केल्यावर शब्दा मध्ये दृश्यमान होईल.
 ,Employee Birthday,कर्मचारी वाढदिवस
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,पूर्ण दुरुस्तीसाठी पूर्ण तारीख निवडा
@@ -3595,7 +3617,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,सब कॉन्ट्रॅक्टिंगसाठी राखीव
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
 DocType: Shopping Cart Settings,Orders,आदेश
-DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
+DocType: Department,Leave Approver,माफीचा साक्षीदार सोडा
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,कृपया एक बॅच निवडा
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,मूल्यांकन गट नाव
@@ -3640,7 +3662,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,हब ट्रॅक केलेले आयटम
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT मूळ
 DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,हे ईमेल स्वयं-निर्मित आहे
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
 DocType: Program Enrollment,Boarding Student,बोर्डिंग विद्यार्थी
 DocType: Asset,Expected Value After Useful Life,अपेक्षित मूल्य उपयुक्त जीवन नंतर
@@ -3665,22 +3686,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},उपस्थिती नोंद {0} विद्यार्थी विरुद्ध अस्तित्वात {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,घसारा योग्य मालमत्ता विल्हेवाट करण्यासाठी बाहेर पडला
-DocType: Member,Member,सदस्य
+DocType: Loan,Member,सदस्य
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Work Order Item,Work Order Item,वर्क ऑर्डर आयटम
 DocType: Pricing Rule,Item Code,आयटम कोड
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
 DocType: Agriculture Analysis Criteria,Agriculture Manager,कृषी व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
 DocType: Supplier Scorecard Period,Variables,व्हेरिएबल्स
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),बंद (डॉ)
 DocType: Cheque Print Template,Cheque Size,धनादेश आकार
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,सिरियल क्रमांक {0} स्टॉक मध्ये नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,सिरियल क्रमांक {0} स्टॉक मध्ये नाही
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,व्यवहार विक्री कर टेम्प्लेट.
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off बाकी रक्कम
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},खाते {0} कंपनी जुळत नाही {1}
@@ -3689,7 +3710,6 @@
 DocType: Stock Settings,Default Stock UOM,डिफॉल्ट स्टॉक UOM
 DocType: Asset,Number of Depreciations Booked,पूर्वनियोजित Depreciations संख्या
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,गणक एकूण
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},कर्मचारी कर्ज विरुध्द: {0}
 DocType: Landed Cost Item,Receipt Document,पावती दस्तऐवज
 DocType: Employee Education,School/University,शाळा / विद्यापीठ
 DocType: Payment Request,Reference Details,संदर्भ तपशील
@@ -3700,7 +3720,7 @@
 DocType: Asset,Double Declining Balance,दुहेरी नाकारून शिल्लक
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,बंद मागणी रद्द जाऊ शकत नाही. रद्द करण्यासाठी उघडकीस आणणे.
 DocType: Student Guardian,Father,वडील
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
 DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
 DocType: Attendance,On Leave,रजेवर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अद्यतने मिळवा
@@ -3714,10 +3734,10 @@
 DocType: Lead,Lower Income,अल्प उत्पन्न
 DocType: Restaurant Order Entry,Current Order,वर्तमान ऑर्डर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार  {0} रांगेत समान असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,प्रोग्रामवर जा
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},रो {0} # वाटप केलेली रक्कम {1} हक्क न सांगितलेल्या रकमेपेक्षा मोठी असू शकत नाही {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},रो {0} # वाटप केलेली रक्कम {1} हक्क न सांगितलेल्या रकमेपेक्षा मोठी असू शकत नाही {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी  क्रमांक खरेदी {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
@@ -3740,7 +3760,6 @@
 DocType: Payment Terms Template,Payment Terms,देयक अटी
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,मिनिट
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,पुरवठादारांकडे जा
@@ -3760,30 +3779,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},कोटेशन {0}  प्रकारच्या {1} नाहीत
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,कृपया देयक विनंती पाठविण्यासाठी विद्यार्थीसाठी ईमेल आयडी सेट करा
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,कृपया देयक विनंती पाठविण्यासाठी विद्यार्थीसाठी ईमेल आयडी सेट करा
 DocType: Patient,Medical History,वैद्यकीय इतिहास
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
 DocType: Patient,Patient ID,रुग्ण आयडी
 DocType: Physician Schedule,Schedule Name,शेड्यूल नाव
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,पगाराच्या स्लिप्स करा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,सर्व पुरवठादार जोडा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,सर्व पुरवठादार जोडा
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ती # {0}: रक्कम थकबाकी रक्कम पेक्षा जास्त असू शकत नाही.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ब्राउझ करा BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,सुरक्षित कर्ज
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,सुरक्षित कर्ज
 DocType: Purchase Invoice,Edit Posting Date and Time,पोस्टिंग तारीख आणि वेळ संपादित
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},मालमत्ता वर्ग {0} किंवा कंपनी मध्ये घसारा संबंधित खाती सेट करा {1}
 DocType: Lab Test Groups,Normal Range,सामान्य श्रेणी
 DocType: Academic Term,Academic Year,शैक्षणिक वर्ष
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,उपलब्ध विक्री
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,शिल्लक इक्विटी उघडणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,शिल्लक इक्विटी उघडणे
 DocType: Lead,CRM,सी आर एम
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,उर्वरित
 DocType: Appraisal,Appraisal,मूल्यमापन
+DocType: Loan,Loan Account,कर्ज खाते
 DocType: Purchase Invoice,GST Details,जीएसटी तपशील
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},पुरवठादार वर ईमेल पाठविले {0}
 DocType: Item,Default Sales Unit of Measure,मोजणीचे डिफॉल्ट विक्री युनिट
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,शैक्षणिक वर्ष:
+DocType: Subscription,Past Due Date,भूतकाळातील तारीख
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},आयटम {0} साठी पर्यायी आयटम सेट करण्याची अनुमती नाही
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तारीख पुनरावृत्ती आहे
@@ -3796,17 +3817,18 @@
 DocType: Patient Appointment,Patient Appointment,रुग्ण नेमणूक
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,भूमिका मंजूर नियम लागू आहे भूमिका समान असू शकत नाही
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,या ईमेल डायजेस्ट पासून सदस्यता रद्द करा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,द्वारे पुरवठादार मिळवा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,द्वारे पुरवठादार मिळवा
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,अभ्यासक्रमांकडे जा
 DocType: Accounts Settings,Show Inclusive Tax In Print,प्रिंटमध्ये समावेशक कर दाखवा
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory","बँक खाते, दिनांकापासून आणि तारखेपर्यंत अनिवार्य आहे"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,संदेश पाठवला
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,child नोडस् सह खाते लेजर म्हणून सेट केली जाऊ शकत  नाही
 DocType: C-Form,II,दुसरा
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मध्ये शिक्षक नाव प्रणालीची मांडणी करा
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर ज्यामध्ये किंमत यादी चलन ग्राहक बेस चलनमधे  रूपांतरित आहे
 DocType: Purchase Invoice Item,Net Amount (Company Currency),निव्वळ रक्कम (कंपनी चलन)
 DocType: Physician,Physician Schedules,फिजिशियन वेळापत्रक
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,एकूण आगाऊ रक्कम एकूण स्वीकृत रकमेपेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,एकूण आगाऊ रक्कम एकूण स्वीकृत रकमेपेक्षा जास्त असू शकत नाही
 DocType: Salary Slip,Hour Rate,तास दर
 DocType: Stock Settings,Item Naming By,आयटम करून नामांकन
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
@@ -3824,6 +3846,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: BOM,Inspection Required,तपासणी आवश्यक
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क(PR ) तपशील
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,सादर करण्यापूर्वी बँकांची हमी क्रमांक प्रविष्ट करा.
 DocType: Driving License Category,Class,वर्ग
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,आयटम टेम्पलेट विरूद्ध काम करण्याची मागणी केली जाऊ शकत नाही
@@ -3834,7 +3857,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Assessment Plan,Program,कार्यक्रम
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्त्यांनी  गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मध्ये शिक्षक नाव प्रणालीची मांडणी करा
 DocType: Serial No,Is Cancelled,रद्द आहे
 DocType: Student Group,Group Based On,गट आधारित
 DocType: Student Group,Group Based On,गट आधारित
@@ -3846,9 +3868,10 @@
 DocType: Cheque Print Template,Cheque Height,धनादेश उंची
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
 DocType: Setup Progress,Setup Progress,सेटअप प्रगती
+DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 DocType: Hub Settings,Publish Items to Hub,हब करण्यासाठी आयटम प्रकाशित
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},सलग {0} मधे  मूल्य पासून मूल्य पर्यंत कमी असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,वायर हस्तांतरण
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,सर्व चेक करा
 ,Issued Items Against Work Order,कार्य ऑर्डर विरूद्ध दिलेले आयटम
 DocType: Vehicle Log,Invoice Ref,चलन संदर्भ
@@ -3879,12 +3902,11 @@
 DocType: Customs Tariff Number,Tariff Number,दर क्रमांक
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP वखार येथे उपलब्ध प्रमाण
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,अंदाज
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},सिरियल क्रमांक {0} कोठार  {1} शी संबंधित नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},सिरियल क्रमांक {0} कोठार  {1} शी संबंधित नाही
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
-DocType: Employee Loan,Employee Loan Application,कर्मचारी कर्ज अर्ज
 DocType: Issue,Opening Date,उघडण्याची  तारीख
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,कृपया प्रथम रुग्णाला वाचवा
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,कृपया प्रथम रुग्णाला वाचवा
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,उपस्थिती यशस्वीरित्या चिन्हांकित केले गेले.
 DocType: Program Enrollment,Public Transport,सार्वजनिक वाहतूक
 DocType: Soil Texture,Silt Composition (%),सिल्ट रचना (%)
@@ -3903,7 +3925,7 @@
 ,Item Balance (Simple),बाब शिल्लक (साधी)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
 DocType: POS Profile,Write Off Account,Write Off खाते
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,टीप रक्कम डेबिट
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,टीप रक्कम डेबिट
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
@@ -3926,6 +3948,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,विक्री ऑर्डर तारीख
 DocType: Sales Invoice Item,Delivered Qty,वितरित केलेली  Qty
 DocType: Assessment Plan,Assessment Plan,मूल्यांकन योजना
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,रिव्हर्स जर्नल एंट्री
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} तयार आहे.
 DocType: Stock Settings,Limit Percent,मर्यादा टक्के
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,सध्या कोणत्याही कोठारमध्ये कोणतीही स्टॉक उपलब्ध नाही
@@ -3939,14 +3962,15 @@
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Payment Entry,Payment References,भरणा संदर्भ
 DocType: C-Form,C-FORM-,सी-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","मध्यांतर क्षेत्रासाठी मध्यांतरांची संख्या उदा. जर मध्यांतर &#39;दिवस&#39; आणि बिलिंग आंतरराल गणना 3 असेल तर, प्रत्येक 3 दिवसांमध्ये चलने तयार केली जातील."
 DocType: Vehicle,Insurance Details,विमा तपशील
 DocType: Account,Payable,देय
 DocType: Share Balance,Share Type,सामायिक प्रकार
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),कर्जदार ({0})
 DocType: Pricing Rule,Margin,मार्जिन
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नवीन ग्राहक
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,निव्वळ नफा%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,निव्वळ नफा%
 DocType: Appraisal Goal,Weightage (%),वजन (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,पीओएस प्रोफाइल बदला
 DocType: Bank Reconciliation Detail,Clearance Date,मंजुरी तारीख
@@ -3956,10 +3980,11 @@
 DocType: Lead,Address Desc,Desc पत्ता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,पक्ष अनिवार्य आहे
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},इतर पंक्तींमध्ये डुप्लिकेट देय तारखांसह असलेली पंक्ती सापडली: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},इतर पंक्तींमध्ये डुप्लिकेट देय तारखांसह असलेली पंक्ती सापडली: {list}
 DocType: Topic,Topic Name,विषय नाव
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,कृपया एचआर सेटिंग्जमध्ये स्वीकृति सूट देण्याकरिता डीफॉल्ट टेम्पलेट सेट करा.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,विक्री किंवा खरेदी कमीत कमी एक निवडणे आवश्यक आहे
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,कर्मचारी अग्रिम प्राप्त करण्यासाठी एक कर्मचारी निवडा
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,कर्मचारी अग्रिम प्राप्त करण्यासाठी एक कर्मचारी निवडा
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,कृपया एक वैध तारीख निवडा
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,आपल्या व्यवसाय स्वरूप निवडा.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3978,7 +4003,7 @@
 DocType: Asset Movement,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,लेजर सामायिक करा
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,विक्री चालान {0} तयार केले
 DocType: Employee,Confirmation Date,पुष्टीकरण तारीख
 DocType: C-Form,Total Invoiced Amount,एकूण Invoiced रक्कम
@@ -3987,7 +4012,7 @@
 DocType: Account,Accumulated Depreciation,जमा घसारा
 DocType: Supplier Scorecard Scoring Standing,Standing Name,स्थायी नाव
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
-DocType: Employee Loan Application,Required by Date,तारीख आवश्यक
+DocType: Loan Application,Required by Date,तारीख आवश्यक
 DocType: Lead,Lead Owner,लीड मालक
 DocType: Production Plan,Sales Orders Detail,विक्री ऑर्डर तपशील
 DocType: Bin,Requested Quantity,विनंती प्रमाण
@@ -4000,10 +4025,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,एकूण पे - एकूण कापून - कर्जाची परतफेड
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,वर्तमान BOM आणि नवीन BOM समान असू शकत नाही
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,पगाराच्या स्लिप्स आयडी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,एकाधिक वेरिएंट
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरण
+DocType: Subscription,Trial Period Start Date,चाचणी कालावधी प्रारंभ तारीख
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,कृपया दुसरे वापरकर्ता म्हणून लॉगिन करा.
@@ -4024,12 +4050,11 @@
 DocType: Student Guardian,Student Guardian,विद्यार्थी पालक
 DocType: Member,Member Name,सदस्याचे नाव
 DocType: Stock Settings,Use Naming Series,नेमिंग मालिका वापरा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
 DocType: POS Profile,Update Stock,अद्यतन शेअर
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,सबस्क्रिप्शनमध्ये
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 DocType: Membership,Payment Details,भरणा माहिती
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM दर
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","थांबलेले वर्क ऑर्डर रद्द करता येत नाही, रद्द करण्यासाठी प्रथम तो अनस्टॉप करा"
 DocType: Asset,Journal Entry for Scrap,स्क्रॅप साठी जर्नल प्रवेश
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिव्हरी Note मधून  आयटम पुल करा/ओढा
@@ -4049,6 +4074,7 @@
 DocType: Land Unit,Land Unit,जमीन युनिट
 ,Purchase Analytics,खरेदी Analytics
 DocType: Sales Invoice Item,Delivery Note Item,डिलिव्हरी टीप आयटम
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,वर्तमान चलन {0} गहाळ आहे
 DocType: Asset Maintenance Log,Task,कार्य
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ रो #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बॅच नंबर आयटम अनिवार्य आहे {0}
@@ -4061,7 +4087,7 @@
 DocType: Company,Exchange Gain / Loss Account,विनिमय लाभ / तोटा लेखा
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी आणि उपस्थिती
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,फॉर्म भरा आणि तो जतन
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,फॉर्म भरा आणि तो जतन
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,समूह
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,शेअर प्रत्यक्ष प्रमाण
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,शेअर प्रत्यक्ष प्रमाण
@@ -4076,7 +4102,7 @@
 DocType: Lab Test Template,Standard Selling Rate,मानक विक्री दर
 DocType: Account,Rate at which this tax is applied,कर लागू आहे जेथे  हा  दर
 DocType: Cash Flow Mapper,Section Name,विभाग नाव
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Qty पुनर्क्रमित करा
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Qty पुनर्क्रमित करा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नोकरी संबंधी
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,बंद लिहा
@@ -4087,9 +4113,9 @@
 DocType: Task,depends_on,च्या वर अवलंबून असणे
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,सर्व बिल ऑफ मटेरिअममध्ये नवीनतम किंमत अद्यतनित करण्यासाठी रांगेत. यास काही मिनिटे लागतील.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देशनिहाय मुलभूत पत्ता टेम्पलेट
 DocType: Water Analysis,Appearance,स्वरूप
+DocType: HR Settings,Leave Status Notification Template,स्थिती सूचिबद्धता टेम्पलेट सोडा
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,सरासरी किंमत सूची दर खरेदी
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,सदस्य माहिती.
@@ -4112,7 +4138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,परवानगी नाही. कृपया चाचणी टेम्प्लेट अक्षम करा
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
 DocType: Crop Cycle,Linked Land Unit,लिंक केलेले जमीन युनिट
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,वापरकर्त्यांकडे जा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम + एकूण रक्कमेपेक्षा   पेक्षा जास्त असू शकत नाही बंद लिहा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,अवैध GSTIN किंवा अनोंदणीकृत साठी लागू प्रविष्ट करा
 DocType: Training Event,Seminar,सेमिनार
 DocType: Program Enrollment Fee,Program Enrollment Fee,कार्यक्रम नावनोंदणी फी
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित
 DocType: Company,Create Chart Of Accounts Based On,लेखा आधारित चार्ट तयार करा
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ते गटबद्ध करू शकत नाही बालकार्य अस्तित्वात आहेत.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},विद्यार्थी {0} विद्यार्थी अर्जदार विरुद्ध अस्तित्वात {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),गोलाकार समायोजन (कंपनी चलन)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,वेळ पत्रक
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,बॅच:
 DocType: Volunteer,Afternoon,दुपारी
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,उघडा म्हणून सेट करा
 DocType: Cheque Print Template,Scanned Cheque,स्कॅन धनादेश
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,व्यवहार सादर केल्यावर   संपर्कांना  स्वयंचलित ईमेल पाठवा.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,{0} प्रकल्प आधीच अस्तित्वात आहे
 DocType: Medical Department,Nursing User,नर्सिंग उपयोगकर्ता
 DocType: Plant Analysis,Plant Analysis Criterias,वनस्पती विश्लेषण Criterias
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,जबाबदारी
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},सिरिअल नाही {0} बॅचचे सदस्य नसतात {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,जबाबदारी
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,या कोटेशनची वैधता संपली आहे.
 DocType: Expense Claim Account,Expense Claim Account,खर्च दावा खाते
 DocType: Accounts Settings,Allow Stale Exchange Rates,लावलेल्या विनिमय दरांना परवानगी द्या
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,रूपे बनवा
 DocType: Item,Default BOM,मुलभूत BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),एकूण बिल रक्कम (विक्री चलन द्वारे)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,डेबिट टीप रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,डेबिट टीप रक्कम
 DocType: Project Update,Not Updated,अद्यतनित केले नाही
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","दर, शेअरची संख्या आणि गणना केलेली रक्कम यातील विसंगती आहेत"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,कंपनीचे नाव  पुष्टी करण्यासाठी पुन्हा-टाइप करा
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,एकूण थकबाकी रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
 DocType: Employee Advance,Advance Account,आगाऊ खाते
 DocType: Job Offer,Job Offer Terms,नोकरी ऑफर अटी
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ऑटोमोटिव्ह
 DocType: Vehicle,Insurance Company,विमा कंपनी
 DocType: Asset Category Account,Fixed Asset Account,मुदत मालमत्ता खाते
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,अस्थिर
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,अस्थिर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Chapter,Members,सदस्य
 DocType: Student,Student Email Address,विद्यार्थी ई-मेल पत्ता
@@ -4226,7 +4253,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,हद्दीच्या
 DocType: Delivery Stop,Address Name,पत्ता नाव
 DocType: Stock Entry,From BOM,BOM पासून
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} च्या विभाजन {0} एकके
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} च्या विभाजन {0} एकके
 DocType: Assessment Code,Assessment Code,मूल्यांकन कोड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,मूलभूत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} पूर्वीचे  शेअर व्यवहार गोठविली आहेत
@@ -4234,25 +4261,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
 DocType: Bank Reconciliation Detail,Payment Document,भरणा दस्तऐवज
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,मापदंड सूत्रांचे मूल्यांकन करताना त्रुटी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
+DocType: Subscription,Plans,योजना
 DocType: Salary Slip,Salary Structure,वेतन रचना
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,समस्या साहित्य
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,आवर्ती तयार करताना त्रुटी आली
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,बोली
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,नाही विद्यार्थी गट निर्माण केले.
 DocType: Purchase Invoice Item,Serial No,सिरियल नाही
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक परतफेड रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक परतफेड रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,पहिले  Maintaince तपशील प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,पंक्ती # {0}: अपेक्षित वितरण तारीख खरेदी ऑर्डर तारखेपूर्वी असू शकत नाही
 DocType: Purchase Invoice,Print Language,मुद्रण भाषा
 DocType: Salary Slip,Total Working Hours,एकूण कार्याचे तास
 DocType: Sales Invoice,Customer PO Details,ग्राहक पीओ तपशील
-DocType: Subscription,Next Schedule Date,पुढील वेळापत्रक तारीख
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,तात्पुरते उघडण्याचे खाते
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
@@ -4281,11 +4307,11 @@
 DocType: Issue,Opening Time,उघडण्याची  वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,पासून आणि  पर्यंत तारखा आवश्यक आहेत
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,नमूद केलेल्या निकषांसाठी कोणतेही कर्मचारी नाहीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
 DocType: Hotel Settings,Default Customer,डीफॉल्ट ग्राहक
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक नाव
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,त्याच दिवशी नियोजित भेटीची तयार झाल्याची पुष्टी करू नका
@@ -4310,16 +4336,16 @@
 DocType: Journal Entry Account,Employee Advance,कर्मचारी आगाऊ
 DocType: Payroll Entry,Payroll Frequency,उपयोग पे रोल वारंवारता
 DocType: Lab Test Template,Sensitivity,संवेदनशीलता
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,कच्चा माल
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,कच्चा माल
 DocType: Leave Application,Follow via Email,ईमेल द्वारे अनुसरण करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,वनस्पती आणि यंत्रसामग्री
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,वनस्पती आणि यंत्रसामग्री
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दररोज काम सारांश सेटिंग्ज
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,कृपया दिनांकानुसार Reqd प्रविष्ट करा
 DocType: Payment Entry,Internal Transfer,अंतर्गत ट्रान्सफर
 DocType: Asset Maintenance,Maintenance Tasks,देखभाल कार्ये
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
 DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर मधे रूपांतरीत केले जाऊ शकत नाही
@@ -4327,14 +4353,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext एकत्रीकरण
 DocType: Crop Cycle,Detected Disease,डिटेक्टेड डिसीझ
 ,Produced,निर्मिती
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,परतफेड प्रारंभ तारीख वितरण तारीख आधी असू शकत नाही
 DocType: Item,Item Code for Suppliers,पुरवठादारासाठी  आयटम कोड
 DocType: Issue,Raised By (Email),उपस्थित (ईमेल)
 DocType: Training Event,Trainer Name,प्रशिक्षक नाव
 DocType: Mode of Payment,General,सामान्य
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,गेल्या कम्युनिकेशन
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,गेल्या कम्युनिकेशन
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम  {0}साठी सिरियल क्रमांक आवश्यक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम  {0}साठी सिरियल क्रमांक आवश्यक
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,पावत्या सह देयके सामना
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
@@ -4348,7 +4375,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,चलने अक्षम  /सक्षम करा.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},अर्ध्या दिवसावरील {0} वरील डॉ {0}
 DocType: Production Plan,Get Material Request,साहित्य विनंती मिळवा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,पोस्टल खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,पोस्टल खर्च
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक्कम)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 ,Item Variant Details,आयटम प्रकार तपशील
@@ -4359,9 +4386,9 @@
 DocType: Drug Prescription,Hour,तास
 DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम विक्री चलन
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},कृपया आयटम {0} विरुद्ध घाटी निवडा
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
 DocType: Company,Monthly Sales Target,मासिक विक्री लक्ष्य
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},मंजूर केले जाऊ शकते {0}
@@ -4369,7 +4396,7 @@
 DocType: Item,Default Material Request Type,मुलभूत साहित्य विनंती प्रकार
 DocType: Supplier Scorecard,Evaluation Period,मूल्यांकन कालावधी
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,अज्ञात
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,कार्य ऑर्डर तयार नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,कार्य ऑर्डर तयार नाही
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
 DocType: Purchase Invoice,Export Type,निर्यात प्रकार
 DocType: Salary Slip Loan,Salary Slip Loan,वेतन स्लिप कर्ज
@@ -4385,8 +4412,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,उघडण्याचे चलन सारांश
 DocType: Education Settings,Education Manager,शैक्षणिक व्यवस्थापक
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,इष्टतम वाढीसाठी क्षेत्रातील प्रत्येक वनस्पतीच्या दरम्यान किमान लांबी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","बॅच आयटम {0} शेअर सलोखा वापरून केले जाऊ शकत नाही, त्याऐवजी शेअर प्रवेश वापर"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","बॅच आयटम {0} शेअर सलोखा वापरून केले जाऊ शकत नाही, त्याऐवजी शेअर प्रवेश वापर"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","बॅच आयटम {0} शेअर सलोखा वापरून केले जाऊ शकत नाही, त्याऐवजी शेअर प्रवेश वापर"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","बॅच आयटम {0} शेअर सलोखा वापरून केले जाऊ शकत नाही, त्याऐवजी शेअर प्रवेश वापर"
 DocType: Quality Inspection,Report Date,अहवाल तारीख
 DocType: Student,Middle Name,मधले नाव
 DocType: C-Form,Invoices,पावत्या
@@ -4419,20 +4446,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,पावती
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,पावती
 ,Sales Register,विक्री नोंदणी
 DocType: Daily Work Summary Group,Send Emails At,वेळी ई-मेल पाठवा
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,फॉर्म दृश्य
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,खर्चात दावा करणे अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",आपल्या व्यतिरिक्त इतरांना आपल्या संस्थेत सामील करा
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,अद्याप कोणत्याही ग्राहक!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,रोख फ्लो स्टेटमेंट
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,कोणतीही भौतिक विनंती तयार केली नाही
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,परवाना
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
@@ -4455,11 +4483,12 @@
 DocType: Vehicle,Chassis No,चेसिस कोणत्याही
 DocType: Payment Request,Initiated,सुरू
 DocType: Production Plan Item,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,कृपया एक BOM निवडा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,कृपया एक BOM निवडा
 DocType: Purchase Invoice,Availed ITC Integrated Tax,लाभलेल्या आयटीसी एकात्मिक कर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
+DocType: Bank Guarantee,Clauses and Conditions,कलमे आणि अटी
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज क्रमांक
 DocType: Project Task,View Timesheet,टाइम्सशीट पहा
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,समाप्ती तारीख प्रारंभ तारखेपेक्षा मोठी असणे आवश्यक आहे
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Leave Allocation,New Leaves Allocated,नवी पाने वाटप
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
@@ -4473,9 +4502,10 @@
 DocType: Patient,Alcohol Current Use,मद्य चालू वापर
 DocType: Student Admission Program,Student Admission Program,विद्यार्थी प्रवेश कार्यक्रम
 DocType: Payment Entry,Account Paid To,खाते अदा
+DocType: Subscription Settings,Grace Period,वाढीव कालावधी
 DocType: Item Alternative,Alternative Item Name,वैकल्पिक आयटम नाव
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",कोणतेही वेतन स्लिप सबमिट करू शकले नाही <br> संभाव्य कारणांमुळे: <br> 1. 1. निव्वळ वेतन 0 पेक्षा कमी आहे. <br> \ 2. कर्मचारी मास्टर मध्ये निर्दिष्ट कंपनी ईमेल पत्ता वैध नाही. <br>
@@ -4485,7 +4515,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} खाते अर्थसंकल्पात {1} विरुद्ध {2} {3} आहे {4}. तो टाकेल {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,आउट Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,आणि बंद न केलेले
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,मालिका अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,वित्तीय सेवा
 DocType: Student Sibling,Student ID,विद्यार्थी ओळखपत्र
@@ -4497,14 +4526,16 @@
 DocType: Complaint,Complaint,तक्रार
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,परतफेड प्रवेश करा
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,सर्व विभाग
 DocType: Patient,Alcohol Past Use,मद्याचा शेवटचा वापर
 DocType: Fertilizer Content,Fertilizer Content,खते सामग्री
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,कोटी
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,कोटी
 DocType: Project Update,Problematic/Stuck,समस्याग्रस्त / अडकले
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 DocType: Share Transfer,Transfer,ट्रान्सफर
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,विक्री आदेश {0} रद्द करण्यापूर्वी तो रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
@@ -4528,10 +4559,11 @@
 DocType: Cheque Print Template,Message to show,दर्शविण्यासाठी संदेश
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,किरकोळ
 DocType: Student Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,उत्पादन बंडल
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} पासून सुरू होणारा अंक शोधण्यात अक्षम. आपण 0 ते 100 च्या आसपासचे स्कोअर असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
+DocType: Subscription,Current Invoice Start Date,वर्तमान चलन प्रारंभ तारीख
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: क्रेडिट रक्कम डेबिट किंवा एकतर आवश्यक आहे {2}
 DocType: GL Entry,Remarks,शेरा
@@ -4541,11 +4573,13 @@
 DocType: Task,Parent Task,पालक कार्य
 DocType: Journal Entry,Write Off Based On,आधारित Write Off
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,लीड करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,प्रिंट आणि स्टेशनरी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,प्रिंट आणि स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,बारकोड फिल्ड दर्शवा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",पगार दरम्यान {0} आणि {1} द्या अनुप्रयोग या कालावधीत तारीख श्रेणी दरम्यान असू शकत नाही कालावधीसाठी आधीपासून प्रक्रिया.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",पगार दरम्यान {0} आणि {1} द्या अनुप्रयोग या कालावधीत तारीख श्रेणी दरम्यान असू शकत नाही कालावधीसाठी आधीपासून प्रक्रिया.
+DocType: Fiscal Year,Auto Created,स्वयं निर्मित
 DocType: Chapter Member,Leave Reason,कारण सोडा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,चलन {0} आता अस्तित्वात नाही
 DocType: Guardian Interest,Guardian Interest,पालक व्याज
 DocType: Volunteer,Availability,उपलब्धता
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,पीओएस इन्व्हॉइसेससाठी डिफॉल्ट व्हॅल्यू सेट करा
@@ -4554,14 +4588,13 @@
 DocType: Timesheet,Employee Detail,कर्मचारी तपशील
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ईमेल आयडी
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ईमेल आयडी
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,पुढील तारीख दिवस आणि पुन्हा महिन्याच्या दिवशी समान असणे आवश्यक आहे
 DocType: Lab Prescription,Test Code,चाचणी कोड
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,वेबसाइट मुख्यपृष्ठ सेटिंग्ज
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} च्या स्कोअरकार्ड स्टँडमुळे RFQs ला {0} अनुमती नाही
 DocType: Job Offer,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,वर
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},एकूण रक्कम {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},एकूण रक्कम {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
 DocType: Supplier,Mention if non-standard payable account,उल्लेख मानक-नसलेला देय खाते तर
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',कृपया &#39;सर्व मूल्यांकन गट&#39; ऐवजी मूल्यांकन गट निवडा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},रो {0}: आयटम {1} साठी मूल्य केंद्र आवश्यक आहे
@@ -4572,7 +4605,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,पाणी विश्लेषण
 DocType: Chapter,Region,प्रदेश
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरले  जाईल.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,लिंक विश्लेषण पुन्हा लोड करा
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदा 2012, 2012-13 साठी"
@@ -4588,7 +4621,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,रद्द मालमत्ता खर्च
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आयटम {2} ला खर्च केंद्र अनिवार्य आहे
 DocType: Vehicle,Policy No,कोणतेही धोरण नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
 DocType: Asset,Straight Line,सरळ रेष
 DocType: Project User,Project User,प्रकल्प वापरकर्ता
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,स्प्लिट
@@ -4628,21 +4661,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,पथ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,त्याला child nodes आहेत म्हणून खातेवही खर्च केंद्र रूपांतरित करू शकत नाही
 DocType: Production Plan,Total Planned Qty,एकूण नियोजित खंड
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,उघडण्याचे  मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,उघडण्याचे  मूल्य
 DocType: Salary Detail,Formula,सुत्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,सिरियल #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,सिरियल #
 DocType: Lab Test Template,Lab Test Template,लॅब टेस्ट टेम्पलेट
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,विक्री खाते
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,विक्री खाते
 DocType: Purchase Invoice Item,Total Weight,एकूण वजन
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,विक्री आयोगाने
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,विक्री आयोगाने
 DocType: Job Offer Term,Value / Description,मूल्य / वर्णन
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,अपेक्षित वितरण तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्टॉरंट ऑर्डर प्रविष्टी
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
 DocType: Asset Maintenance Task,Assign To Name,नाव नियुक्त करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,मनोरंजन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,मनोरंजन खर्च
 DocType: Hub Settings,Enabled Users,सक्षम वापरकर्ते
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,साहित्य विनंती करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},आयटम उघडा {0}
@@ -4655,24 +4688,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,निरोप साठी अनुप्रयोग.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
 DocType: Vehicle,Last Carbon Check,गेल्या कार्बन तपासा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,कायदेशीर खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,कायदेशीर खर्च
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,कृपया रांगेत प्रमाणात निवडा
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,उघडणे विक्री आणि खरेदी चलने करा
 DocType: Purchase Invoice,Posting Time,पोस्टिंग वेळ
 DocType: Timesheet,% Amount Billed,% रक्कम बिल
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,टेलिफोन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,टेलिफोन खर्च
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास हे  तपासा. आपण या चेक केले, तर मुलभूत नसेल."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},सिरियल क्रमांक  असलेले कोणतेही आयटम  {0} नाहीत
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},सिरियल क्रमांक  असलेले कोणतेही आयटम  {0} नाहीत
 DocType: Email Digest,Open Notifications,ओपन सूचना
 DocType: Payment Entry,Difference Amount (Company Currency),फरक रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,थेट खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,थेट खर्च
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नवीन ग्राहक महसूल
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,प्रवास खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} मध्ये सानुकूल फील्ड सदस्यता जोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
 DocType: Purchase Receipt Item,Sample Quantity,नमुना प्रमाण
+DocType: Bank Guarantee,Name of Beneficiary,लाभार्थीचे नाव
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / किंमत सूची दर / कच्चा माल शेवटच्या खरेदी दर यावर आधारित, शेड्युलरद्वारे स्वयंचलितपणे BOM दर अद्यतनित करा."
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी {2} ला संबंधित नाही:
@@ -4684,14 +4717,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,उमेदवारीचा काळ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,पगार घटक
 DocType: Program Enrollment Tool,New Academic Year,नवीन शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,परत / क्रेडिट टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,परत / क्रेडिट टीप
 DocType: Stock Settings,Auto insert Price List rate if missing,दर सूची दर गहाळ असेल तर आपोआप घाला
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,एकूण देय रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,एकूण देय रक्कम
 DocType: GST Settings,B2C Limit,B2C मर्यादा
 DocType: Work Order Item,Transferred Qty,हस्तांतरित Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नॅव्हिगेट
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,नियोजन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,नियोजन
 DocType: Share Balance,Issued,जारी
+DocType: Loan,Repayment Start Date,परतफेड प्रारंभ तारीख
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,विद्यार्थी क्रियाकलाप
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,पुरवठादार आयडी
 DocType: Payment Request,Payment Gateway Details,पेमेंट गेटवे तपशील
@@ -4704,10 +4738,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","प्रासंगिक जसे पाने प्रकार, आजारी इ"
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल द्वारे नियमित सारांश अहवाल पाठवा.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
 DocType: Assessment Result,Student Name,विद्यार्थी नाव
 DocType: Brand,Item Manager,आयटम व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,उपयोग पे रोल देय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,उपयोग पे रोल देय
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
 DocType: Plant Analysis,Collection Datetime,संकलन डेटटाईम
 DocType: Work Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
@@ -4717,9 +4751,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,सदस्य {0} अस्तित्वात नाही
 DocType: Payment Term,Day(s) after invoice date,चलन तारखेनंतर दिवस (से)
 DocType: Payment Schedule,Payment Schedule,पेमेंट वेळापत्रक
-DocType: Subscription,SUB-,उप-
 DocType: Item Attribute Value,Abbreviation,संक्षेप
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,भरणा प्रवेश आधिपासूनच अस्तित्वात आहे
+DocType: Subscription,Trial Period End Date,चाचणी कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ने मर्यादा ओलांडल्यापासून authroized नाही
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्प्लेट मास्टर.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,पॅथॉलॉजी
@@ -4736,9 +4770,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,सर्व ग्राहक गट
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,सर्व ग्राहक गट
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,जमा मासिक
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
@@ -4747,14 +4781,15 @@
 DocType: Lab Prescription,Test Created,चाचणी तयार
 DocType: Healthcare Settings,Custom Signature in Print,प्रिंटमध्ये सानुकूल स्वाक्षरी
 DocType: Account,Temporary,अस्थायी
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ग्राहक एलपीओ क्रमांक
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ग्राहक एलपीओ क्रमांक
 DocType: Program,Courses,अभ्यासक्रम
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,सचिव
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","अक्षम केला तर, क्षेत्र &#39;शब्द मध्ये&#39; काही व्यवहार दृश्यमान होणार नाही"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ही क्रिया भविष्यातील बिलिंग थांबवेल आपली खात्री आहे की आपण ही सदस्यता रद्द करू इच्छिता?
 DocType: Serial No,Distinct unit of an Item,एक आयटम वेगळा एकक
 DocType: Supplier Scorecard Criteria,Criteria Name,मापदंड नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,कंपनी सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,कंपनी सेट करा
 DocType: Pricing Rule,Buying,खरेदी
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,रोग आणि खते
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रेकॉर्ड करून तयार करणे
@@ -4763,18 +4798,18 @@
 DocType: POS Profile,Apply Discount On,सवलत लागू
 DocType: Member,Membership Type,सदस्यता प्रकार
 ,Reqd By Date,Reqd तारीख करून
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,कर्ज
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,कर्ज
 DocType: Assessment Plan,Assessment Name,मूल्यांकन नाव
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,मुद्रण मध्ये PDC दर्शवा
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,मुद्रण मध्ये PDC दर्शवा
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल क्रमांक  बंधनकारक आहे
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटमनूसार  कर तपशील
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,जॉब ऑफर
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,संस्था संक्षेप
 ,Item-wise Price List Rate,आयटमनूसार  किंमत सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,पुरवठादार कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण एकदा जतन केल्यावर  शब्दा मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 DocType: Consultation,C-,सी-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
@@ -4792,7 +4827,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,एकूण फरक
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","सक्षम असल्यास, प्रणाली आपोआप यादी एकट्या नोंदी पोस्ट होईल."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,दलाली
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,कर्मचारी {0} हजेरी आधीच आज करीता चिन्हाकृत केले
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,कर्मचारी {0} हजेरी आधीच आज करीता चिन्हाकृत केले
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
@@ -4803,6 +4838,7 @@
 DocType: Lab Test,Approved Date,मंजूर तारीख
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
+DocType: Subscriber,Subscriber Name,सदस्यांचे नाव
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Update Tool,Replace,बदला
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,कोणतीही उत्पादने आढळले.
@@ -4812,19 +4848,18 @@
 DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
 DocType: Customer,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च असेल तर
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},कर्मचारी कर्ज मध्ये व्याज उत्पन्न खाते निवडा {0}
 DocType: Work Order,Required Items,आवश्यक आयटम
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,मानव संसाधन
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भरणा सलोखा भरणा
 DocType: Disease,Treatment Task,उपचार कार्य
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,कर मालमत्ता
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,कर मालमत्ता
 DocType: BOM Item,BOM No,BOM नाही
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} इतर व्हाउचर विरुद्ध {1} किंवा आधीच जुळणारे खाते नाही
 DocType: Item,Moving Average,हलवित/Moving सरासरी
 DocType: BOM Update Tool,The BOM which will be replaced,BOM पुनर्स्थित केले जाईल
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,इलेक्ट्रॉनिक उपकरणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,इलेक्ट्रॉनिक उपकरणे
 DocType: Asset,Maintenance Required,देखरेख आवश्यक
 DocType: Account,Debit,डेबिट
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,रजा 0.5 च्या पटीत वाटप करणे आवश्यक आहे
@@ -4833,7 +4868,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,बाकी रक्कम
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,या विक्री व्यक्ती साठी item गट निहाय लक्ष्य सेट करा .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक  पेक्षा जुने [दिवस]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,सलग # {0}: मालमत्ता निश्चित मालमत्ता खरेदी / विक्री अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,सलग # {0}: मालमत्ता निश्चित मालमत्ता खरेदी / विक्री अनिवार्य आहे
 DocType: Asset Maintenance Team,Maintenance Team Name,देखभाल समूहाचे नाव
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दोन किंवा अधिक किंमत नियम वरील स्थितीवर आधारित आढळल्यास, अग्रक्रम लागू आहे. डीफॉल्ट मूल्य शून्य (रिक्त) आहे, तर प्राधान्य 0 ते 20 दरम्यान एक नंबर आहे. उच्च संख्येचा  अर्थ जर तेथे समान परिस्थितीमधे  एकाधिक किंमत नियम असतील तर त्याला प्राधान्य मिळेल"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,जर &#39;ग्राहकांकडून संधी&#39; निवडली असेल तर ग्राहक अनिवार्य आहे
@@ -4843,19 +4878,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,खर्चाचे हक्काचा प्रकार.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"विक्री आयटम दर {0} पेक्षा कमी आहे, त्याच्या {1}. विक्री दर असावे किमान {2}"
-DocType: Item,Taxes,कर
+DocType: Subscription,Taxes,कर
 DocType: Purchase Invoice,capital goods,भांडवली वस्तू
 DocType: Purchase Invoice Item,Weight Per Unit,वजन प्रति युनिट
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,दिले आणि वितरित नाही
 DocType: Project,Default Cost Center,मुलभूत खर्च केंद्र
-DocType: Bank Guarantee,End Date,शेवटची तारीख
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेअर व्यवहार
 DocType: Budget,Budget Accounts,बजेट खाती
 DocType: Employee,Internal Work History,अंतर्गत कार्य इतिहास
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,जमा घसारा रक्कम
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,पुरवठादार धावसंख्याकार्ड अक्षरमाळा
-DocType: Employee Loan,Fully Disbursed,पूर्णपणे वाटप
 DocType: Employee Advance,Due Advance Amount,मुदतीपूर्वी आगाऊ रक्कम
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
@@ -4879,7 +4912,7 @@
 ,Employee Information,कर्मचारी माहिती
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,विक्री आणि खरेदीसाठी डिफॉल्ट कर टेम्पलेट तयार केले जातात.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रेकॉर्ड {0} आधीपासूनच अस्तित्वात आहे.
@@ -4887,7 +4920,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',गट करून &#39;कंपनी&#39; आहे तर कंपनी रिक्त फिल्टर सेट करा
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,पोस्टिंग तारीख भविष्यातील तारीख असू शकत नाही
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल क्रमांक  {1} हा {2} {3}सोबत  जुळत नाही
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,आवर्ती निर्माण करण्यासाठी
 DocType: Stock Entry,Target Warehouse Address,लक्ष्य वेअरहाऊस पत्ता
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,प्रासंगिक रजा
 DocType: Agriculture Task,End Day,समाप्ती दिवस
@@ -4912,11 +4944,10 @@
 DocType: Material Request,% Ordered,% आदेश दिले
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित विद्यार्थी गट, कार्यक्रम नावनोंदणी नोंदणी अभ्यासक्रम पासून प्रत्येक विद्यार्थ्यासाठी कोर्स तपासले जाईल."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,सरासरी. खरेदी दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Share Balance,From No,नाही पासून
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{प्रेषक} कडून नवीन संदेश
 DocType: Customer,Customer Primary Address,ग्राहक प्राधान्य पत्ता
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,वृत्तपत्रे
 DocType: Drug Prescription,Description/Strength,वर्णन / सामर्थ्य
@@ -4925,22 +4956,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,त्याच आयटम अनेक वेळा केलेला आहे
 DocType: Department,Leave Block List,रजा ब्लॉक यादी
 DocType: Purchase Invoice,Tax ID,कर आयडी
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} आयटम सिरियल क्रमांकासाठी  सेटअप केलेला नाही. स्तंभ रिक्त असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} आयटम सिरियल क्रमांकासाठी  सेटअप केलेला नाही. स्तंभ रिक्त असणे आवश्यक आहे
 DocType: Accounts Settings,Accounts Settings,खाती सेटिंग्ज
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,मंजूर
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} साठी सदोषीत पत्ता, कृपया पुढे जाण्यासाठी निश्चित करा"
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} साठी सदोषीत पत्ता, कृपया पुढे जाण्यासाठी निश्चित करा"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","नवीन खात्याची संख्या, हे उपसर्ग म्हणून खाते नावामध्ये समाविष्ट केले जाईल"
 DocType: Maintenance Team Member,Team Member,संघ सदस्य
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,सबमिट करण्याचे कोणतेही परिणाम नाहीत
 DocType: Customer,Sales Partner and Commission,विक्री भागीदार व आयोगाच्या
-DocType: Employee Loan,Rate of Interest (%) / Year,व्याज (%) / वर्ष दर
+DocType: Loan,Rate of Interest (%) / Year,व्याज (%) / वर्ष दर
 ,Project Quantity,प्रकल्प प्रमाण
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे"
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} युनिट {1} {2} हा व्यवहार पूर्ण करण्यासाठी आवश्यक.
 DocType: Loan Type,Rate of Interest (%) Yearly,व्याज दर (%) वार्षिक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,तात्पुरती खाती
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,ब्लॅक
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,तात्पुरती खाती
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,ब्लॅक
 DocType: BOM Explosion Item,BOM Explosion Item,BOM स्फोट आयटम
 DocType: Shareholder,Contact List,संपर्क यादी
 DocType: Account,Auditor,लेखापरीक्षक
@@ -4948,16 +4979,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} आयटम उत्पादन
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,अधिक जाणून घ्या
 DocType: Cheque Print Template,Distance from top edge,शीर्ष किनार अंतर
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,दर सूची {0} अक्षम असल्यास किंवा अस्तित्वात नाही
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,दर सूची {0} अक्षम असल्यास किंवा अस्तित्वात नाही
 DocType: Purchase Invoice,Return,परत
 DocType: Pricing Rule,Disable,अक्षम करा
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,भरण्याची पध्दत देयक आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,भरण्याची पध्दत देयक आवश्यक आहे
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","अधिक पर्याय जसे की मालमत्ता, सिरीअल क्रमांक, बॅच इत्यादींसाठी संपूर्ण पृष्ठावर संपादित करा."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,नेमणूक आणि सल्लामसलत
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} बॅच नोंदणी केलेली नाही आहे {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","मालमत्ता {0} तो आधीपासूनच आहे म्हणून, रद्द जाऊ शकत नाही {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,चेकची आवश्यकता आहे
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,चेकची आवश्यकता आहे
 DocType: Task,Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपिस्थत
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,कंपनी सेटअप करण्यात अयशस्वी
@@ -4969,7 +5000,7 @@
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,वेगवान व्यवस्थापन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,आयटम जोडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,आयटम जोडा
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,पिके आणि जमीन
 DocType: Cheque Print Template,Regular,नियमित
 DocType: Fertilizer,Density (if liquid),घनत्व (द्रव असल्यास)
@@ -4994,24 +5025,26 @@
 DocType: Payment Entry,Paid Amount,पेड रक्कम
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,विक्री चक्र एक्सप्लोर करा
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,धारणा स्टॉक प्रवेश
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,धारणा स्टॉक प्रवेश
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 ,Work Order Stock Report,कार्य ऑर्डर स्टॉक अहवाल
+DocType: Purchase Receipt,Auto Repeat Detail,ऑटो पुनरावृत्ती तपशील
 DocType: Assessment Result Tool,Assessment Result Tool,मूल्यांकन निकाल साधन
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,पर्यवेक्षक म्हणून
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,श्रेणी सुचवा
 DocType: BOM Scrap Item,BOM Scrap Item,BOM स्क्रॅप बाबींचा
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट मध्ये खाते शिल्लक आहे , आपल्याला ' क्रेडिट ' म्हणून ' शिल्लक असणे आवश्यक आहे ' सेट करण्याची परवानगी नाही"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,गुणवत्ता व्यवस्थापन
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,गुणवत्ता व्यवस्थापन
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
 DocType: Project,Total Billable Amount (via Timesheets),एकूण बिल करण्यायोग्य रक्कम (टाईम्सशीट्सद्वारे)
 DocType: Agriculture Task,Previous Business Day,मागील व्यवसाय दिन
-DocType: Employee Loan,Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड
+DocType: Loan,Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड
 DocType: Employee,Health Insurance No,आरोग्य विमा
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आयटम {0} साठी  संख्या प्रविष्ट करा
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,क्रेडिट टीप रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,क्रेडिट टीप रक्कम
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,एकूण करपात्र रक्कम
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 DocType: Opening Invoice Creation Tool,Purchase,खरेदी
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,शिल्लक Qty
@@ -5022,16 +5055,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} साठी {1}
 DocType: Healthcare Settings,Valid number of days,दिवसाची वैध संख्या
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,खर्च केंद्रे
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,सदस्यता रीस्टार्ट करा
 DocType: Land Unit,Linked Plant Analysis,लिंक्ड प्लान्ट विश्लेषण
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,दर ज्यामध्ये पुरवठादार चलन कंपनी बेस चलनमधे  रूपांतरित आहे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},रो # {0}: ओळ वेळा संघर्ष {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,परवानगी द्या शून्य मूल्यांकन दर
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,परवानगी द्या शून्य मूल्यांकन दर
+DocType: Bank Guarantee,Receiving,प्राप्त करीत आहे
 DocType: Training Event Employee,Invited,आमंत्रित केले
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय पगार स्ट्रक्चर दिले तारखा कर्मचारी {0} आढळले
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,सेटअप गेटवे खाती.
 DocType: Employee,Employment Type,रोजगार प्रकार
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,स्थिर मालमत्ता
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,स्थिर मालमत्ता
 DocType: Payment Entry,Set Exchange Gain / Loss,एक्सचेंज लाभ / सेट कमी होणे
 ,GST Purchase Register,जीएसटी खरेदी नोंदणी
 ,Cash Flow,वित्त प्रवाह
@@ -5052,9 +5087,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,सर्व शेअर व्यवहारांची यादी
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,डॉ संख्या
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,डॉ संख्या
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},संलग्न {0} # {1} शोधा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,दोन्ही चाचणी कालावधी प्रारंभ तारीख आणि चाचणी कालावधी समाप्ती तारीख सेट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,सरासरी दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,पेमेंट शेड्यूल मध्ये एकूण देयक रकमेच्या रुंदीच्या एकूण / उरलेली रक्कम
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,पेमेंट शेड्यूल मध्ये एकूण देयक रकमेच्या रुंदीच्या एकूण / उरलेली रक्कम
+DocType: Subscription Plan Detail,Plan,योजना
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,सामान्य लेजर नुसार बँक स्टेटमेंट शिल्लक
 DocType: Job Applicant,Applicant Name,अर्जदाराचे नाव
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / आयटम नाव
@@ -5084,6 +5120,7 @@
 DocType: Work Order,Warehouses,गोदामे
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} मालमत्ता हस्तांतरित केली जाऊ शकत नाही
 DocType: Hotel Room Pricing,Hotel Room Pricing,हॉटेल रूम मूल्यनिर्धारण
+DocType: Subscription,Days Until Due,देय पर्यंत दिवस
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,हा आयटम {0} (साचा) एक प्रकार आहे.
 DocType: Workstation,per hour,प्रती तास
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,खरेदी
@@ -5092,13 +5129,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","बॅच आधारित विद्यार्थी गट, कार्यक्रम नावनोंदणी पासून प्रत्येक विद्यार्थ्यासाठी विद्यार्थी बॅच तपासले जाईल."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,वितरण
+DocType: Journal Entry Account,Loan,कर्ज
 DocType: Expense Claim Advance,Expense Claim Advance,खर्च दावा आगाऊ
 DocType: Lab Test,Report Preference,अहवाल प्राधान्य
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,स्वयंसेवक माहिती
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,प्रकल्प व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,प्रकल्प व्यवस्थापक
 ,Quoted Item Comparison,उद्धृत बाबींचा तुलना
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} आणि {1} दरम्यान स्कोअरिंगमध्ये ओव्हरलॅप
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,पाठवणे
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,आयटम: {0} साठी कमाल {1} % सवलतिची परवानगी आहे
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,म्हणून नेट असेट व्हॅल्यू
 DocType: Crop,Produce,तयार करा
@@ -5108,7 +5146,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,उत्पादनासाठी सामग्री वापर
 DocType: Item Alternative,Alternative Item Code,वैकल्पिक आयटम कोड
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,भूमिका ज्याला सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
 DocType: Delivery Stop,Delivery Stop,डिलिव्हरी स्टॉप
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
 DocType: Item,Material Issue,साहित्य अंक
@@ -5118,15 +5156,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
 DocType: BOM,Show Items,आयटम दर्शवा
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,पासून वेळ पेक्षा जास्त असू शकत नाही.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,आपण सर्व ग्राहकांना ईमेलद्वारे सूचित करू इच्छिता?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,आपण सर्व ग्राहकांना ईमेलद्वारे सूचित करू इच्छिता?
+DocType: Subscription Plan,Billing Interval,बिलिंग मध्यांतर
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,पुन्हा सुरू करा
 DocType: Hub Settings,Hub Username,Hub Username
 DocType: Salary Detail,Component,घटक
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन निकष गट
 DocType: Healthcare Settings,Patient Name By,रुग्णांच्या नावाने
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} ते {1} पर्यंतच्या पगाराच्या तारखेसाठी उपार्जित जर्नल प्रवेश
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} ते {1} पर्यंतच्या पगाराच्या तारखेसाठी उपार्जित जर्नल प्रवेश
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
@@ -5140,23 +5178,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत करू  शकता"
 DocType: Leave Block List,Applies to Company,कंपनीसाठी  लागू
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
-DocType: Employee Loan,Disbursement Date,खर्च तारीख
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;प्राप्तकर्ते&#39; निर्दिष्ट नाहीत
+DocType: Loan,Disbursement Date,खर्च तारीख
 DocType: BOM Update Tool,Update latest price in all BOMs,सर्व BOMs मध्ये नवीनतम किंमत अद्यतनित करा
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,वैद्यकीय रेकॉर्ड
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्द मध्ये
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,सबमिट करण्यापूर्वी बँक किंवा कर्ज संस्था यांचे नाव प्रविष्ट करा.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} सादर करणे आवश्यक आहे
 DocType: POS Profile,Item Groups,आयटम गट
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
 DocType: Sales Order Item,For Production,उत्पादन
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,कृपया चार्ट्स अकाउंट्समध्ये तात्पुरते उघडत खाते जोडा
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,कृपया चार्ट्स अकाउंट्समध्ये तात्पुरते उघडत खाते जोडा
 DocType: Customer,Customer Primary Contact,ग्राहक प्राथमिक संपर्क
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,पीरियड क्लोजिंग जर्नल
 DocType: Project Task,View Task,कार्य पहा
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,डॉ / लीड%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,डॉ / लीड%
+DocType: Bank Guarantee,Bank Guarantee Type,बँक गॅरंटी प्रकार
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,बीजक भाग
 ,Asset Depreciations and Balances,मालमत्ता Depreciations आणि शिल्लक
@@ -5167,9 +5206,8 @@
 DocType: Production Plan,Include Subcontracted Items,उपकांक्षिक आयटम समाविष्ट करा
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,सामील व्हा
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,स्टॉक ट्रान्सफरनंतर व्हेरियंट गुणधर्म बदलू शकत नाही. असे करण्यासाठी आपल्याला एक नवीन आयटम तयार करावा लागेल.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
-DocType: Employee Loan,Repay from Salary,पगार पासून परत फेड करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+DocType: Loan,Repay from Salary,पगार पासून परत फेड करा
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
@@ -5193,11 +5231,11 @@
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,आयटम गट टेबल मध्ये आढळले डुप्लिकेट आयटम गट
 DocType: Land Unit,Parent Land Unit,पालक जमीन युनिट
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
 DocType: Fertilizer,Fertilizer Name,खते नाव
 DocType: Salary Slip,Net Pay,नेट पे
 DocType: Cash Flow Mapping Accounts,Account,खाते
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,सिरियल क्रमांक {0} आधीच प्राप्त झाला  आहे
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,सिरियल क्रमांक {0} आधीच प्राप्त झाला  आहे
 ,Requested Items To Be Transferred,विनंती आयटम हस्तांतरित करणे
 DocType: Expense Claim,Vehicle Log,वाहन लॉग
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ताप येणे (temp&gt; 38.5 डिग्री से / 101.3 फूट किंवा निरंतर तापमान&gt; 38 ° से / 100.4 ° फॅ)
@@ -5238,39 +5276,39 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
 DocType: Asset Maintenance,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चा माल प्रदान
-DocType: C-Form,Series,मालिका
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},किंमत सूची {0} ची चलन {1} किंवा {2}
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Soil Texture,Ternary Plot,टर्नरी प्लॉट
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
 DocType: Driver,License Number,परवाना नंबर
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,व्यवसाय विकास व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,व्यवसाय विकास व्यवस्थापक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,देखभाल भेट द्या उद्देश
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,इनव्हॉइस पेशंट नोंदणी
 DocType: Crop,Period,कालावधी
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,सामान्य खातेवही
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},वर रजेवर कर्मचारी {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},वर रजेवर कर्मचारी {0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,पहा निष्पन्न
 DocType: Program Enrollment Tool,New Program,नवीन कार्यक्रम
 DocType: Item Attribute Value,Attribute Value,मूल्य विशेषता
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 DocType: Salary Detail,Salary Detail,पगार तपशील
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,कृपया प्रथम {0} निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,कृपया प्रथम {0} निवडा
 DocType: Appointment Type,Physician,फिजिशियन
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,सल्लामसलत
 DocType: Sales Invoice,Commission,आयोग
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,उत्पादन वेळ पत्रक.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,एकूण
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,शेअर व्यवहारा नंतर व्हेरियंट गुणधर्म बदलू शकत नाही. असे करण्यासाठी आपल्याला एक नवीन आयटम तयार करावा लागेल.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA मँडेट
 DocType: Physician,Charges,शुल्क
 DocType: Production Plan,Get Items For Work Order,कार्य ऑर्डरसाठी आयटम मिळवा
 DocType: Salary Detail,Default Amount,डीफॉल्ट रक्कम
 DocType: Lab Test Template,Descriptive,वर्णनात्मक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,या  महिन्याचा  सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता तपासणी वाचन
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,आपण आपल्या कंपनीसाठी साध्य करू इच्छित विक्री लक्ष्य सेट करा.
 ,Project wise Stock Tracking,प्रकल्प शहाणा शेअर ट्रॅकिंग
@@ -5298,11 +5336,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,वेबसाइट तयार करण्यात अयशस्वी
 DocType: Soil Analysis,Mg/K,मिग्रॅ / के
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,धारणा केलेला स्टॉक एंट्री आधीपासून तयार केलेला किंवा नमुना प्रमाण प्रदान केलेला नाही
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,धारणा केलेला स्टॉक एंट्री आधीपासून तयार केलेला किंवा नमुना प्रमाण प्रदान केलेला नाही
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षेप
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात
 DocType: Warranty Claim,Resolved By,ने  निराकरण
-DocType: Bank Guarantee,Start Date,प्रारंभ तारीख
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचे  साफ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
@@ -5317,11 +5354,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,तास
 DocType: Project,Expected Start Date,अपेक्षित प्रारंभ तारीख
 DocType: Purchase Invoice,04-Correction in Invoice,04-इनव्हॉइस मधील सुधारणा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,काम ऑर्डर आधीच BOM सह सर्व आयटम साठी तयार
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,काम ऑर्डर आधीच BOM सह सर्व आयटम साठी तयार
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,भिन्न अहवाल अहवाल
 DocType: Setup Progress Action,Setup Progress Action,प्रगती क्रिया सेट करा
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,खरेदी किंमत सूची
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,खरेदी किंमत सूची
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,शुल्क जर आयटमला  लागू होत नाही तर आयटम काढा
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,सदस्यता रद्द करा
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,कृपया पूर्ण केल्यानुसार देखभाल स्थिती निवडा किंवा पूर्ण केल्याची तारीख काढा
 DocType: Supplier,Default Payment Terms Template,डीफॉल्ट देयक अटी टेम्पलेट
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,व्यवहार चलन पेमेंट गेटवे चलन म्हणून समान असणे आवश्यक आहे
@@ -5332,7 +5370,6 @@
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,क्रिया जमा मासिक अंदाजपत्रक ओलांडला तर
-DocType: Subscription,Submit on creation,निर्माण केल्यावर सबमिट
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
 DocType: Asset,Disposal Date,विल्हेवाट दिनांक
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ई-मेल ते सुट्टी नसेल तर दिले क्षणी कंपनी सर्व सक्रिय कर्मचारी पाठवला जाईल. प्रतिसादांचा सारांश मध्यरात्री पाठवला जाईल.
@@ -5351,6 +5388,7 @@
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Cheque Print Template,Cheque Print Template,धनादेश प्रिंट साचा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,कॉस्ट केंद्रे चार्ट
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,सबस्क्रिप्शन रद्द करण्यापूर्वी किंवा सदस्यता न मिळाल्याप्रमाणे चिन्हांकित करण्यापूर्वी बीजक तारखेची तारीख निघून गेल्यानंतरची संख्या
 DocType: Lab Test Template,Sample Collection,नमुना संकलन
 ,Requested Items To Be Ordered,विनंती आयटमची  मागणी करणे
 DocType: Price List,Price List Name,किंमत सूची नाव
@@ -5359,7 +5397,7 @@
 DocType: Account,Income,उत्पन्न
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,काहीतरी चूक झाली!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,विक्री चलन {0} आधीच सादर केला गेला आहे
 DocType: Supplier Scorecard Scoring Criteria,Score,धावसंख्या
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,आर्थिक वर्ष {0} अस्तित्वात नाही
@@ -5379,12 +5417,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,पॉइंट-ऑफ-सेल  प्रोफाइल
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 आणि 100 च्या दरम्यानचे मूल्य असावे
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,पुढील अवमूल्यन तारीख उपलब्ध-वापरण्याच्या तारखेपूर्वी असू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,बिनव्याजी कर्ज
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,बिनव्याजी कर्ज
 DocType: Cost Center,Cost Center Name,खर्च केंद्र नाव
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,कमाल Timesheet विरुद्ध तास काम
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तारीख
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,एकूण सशुल्क रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,एकूण सशुल्क रक्कम
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 वर्ण या पेक्षा मोठे संदेश एकाधिक संदेशा मधे   विभागले  जातील
 DocType: Purchase Receipt Item,Received and Accepted,प्राप्त झालेले आहे आणि स्वीकारले आहे
 DocType: Hub Settings,Company and Seller Profile,कंपनी आणि विक्रेता प्रोफाइल
@@ -5398,10 +5436,9 @@
 DocType: Item,Variant Based On,चल आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,आपले पुरवठादार
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,कृपया दुरूस्त करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 DocType: Request for Quotation Item,Supplier Part No,पुरवठादार भाग नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,अनामिक
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,पासून प्राप्त
 DocType: Lead,Converted,रूपांतरित
@@ -5415,6 +5452,7 @@
 DocType: Asset,Assets,मालमत्ता
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
+DocType: Subscription,Current Invoice End Date,वर्तमान चलन शेवट तारीख
 DocType: Payment Term,Due Date Based On,निहित दिनांक
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,कृपया विकसक सेटिंग्जमध्ये डीफॉल्ट ग्राहक गट आणि प्रदेश सेट करा
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} अस्तित्वात नाही
@@ -5422,7 +5460,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,आयटम: {0} प्रणालीत  अस्तित्वात नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,आपल्याला गोठविलेले  मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,जर्नल एन्ट्रीसाठी कोणतीही परतफेड निवडली नाही
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
+DocType: Loan,Disbursed,वाटप
 DocType: Healthcare Settings,Laboratory Settings,प्रयोगशाळा सेटिंग्ज
 DocType: Patient Appointment,Service Unit,सेवा एकक
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,पुरवठादार यशस्वीरित्या सेट
@@ -5435,12 +5475,12 @@
 DocType: Share Balance,No of Shares,समभागांची संख्या
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,स्थिती निवडा
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: School House,House Name,घर नाव
 DocType: Fee Schedule,Total Amount per Student,प्रति विद्यार्थी एकूण रक्कम
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,इलेक्ट्रिकल
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,इलेक्ट्रिकल
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,आपल्या वापरकर्त्यांना आपल्या संस्थेसाठी उर्वरित जोडा. आपण संपर्क जोडून त्यांना आपले पोर्टल ग्राहकांना आमंत्रित करा जोडू शकता
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
 DocType: Grant Application,Requested Amount,विनंती केलेली रक्कम
@@ -5450,7 +5490,7 @@
 DocType: Crop Cycle,Detected Diseases,सापडलेल्या रोग
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 DocType: Asset Maintenance Task,Last Completion Date,अंतिम पूर्णता तारीख
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
@@ -5458,9 +5498,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless सेटिंग्ज
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेअर मालमत्ता
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,शेअर मालमत्ता
 DocType: Restaurant,Active Menu,सक्रिय मेनू
 DocType: Target Detail,Target Qty,लक्ष्य Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},कर्जावर: {0}
 DocType: Shopping Cart Settings,Checkout Settings,चेकआऊट सेटिंग्ज
 DocType: Student Attendance,Present,सादर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,डिलिव्हरी टीप {0} सादर जाऊ नये
@@ -5469,9 +5510,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Production Plan Item,Ordered Qty,आदेश दिलेली  Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
 DocType: Chapter,Chapter Head,अध्याय मुख्य
 DocType: Payment Term,Month(s) after the end of the invoice month,बीजक महिन्याच्या शेवटी महिना (र्स)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
@@ -5479,11 +5520,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,पगार Slips तयार  करा
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,प्रयोगशाळेचा परिणाम datetime असल्याचे परीक्षण केल्याशिवाय होऊ शकत नाही
 DocType: POS Profile,Allow user to edit Discount,वापरकर्त्यास सूट संपादित करण्याची परवानगी द्या
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,कडून ग्राहक मिळवा
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,कडून ग्राहक मिळवा
 DocType: Purchase Invoice Item,Include Exploded Items,विस्फोट केलेल्या वस्तू समाविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर खरेदी, चेक करणे आवश्यक आहे {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
 DocType: Shipping Rule,Restrict to Countries,देशांपर्यंत प्रतिबंधित
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया {0} साठी सेटअप&gt; सेटिंग्ज&gt; नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off रक्कम (कंपनी चलन)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग तास
 DocType: Project,Total Sales Amount (via Sales Order),एकूण विक्री रक्कम (विक्री आदेशानुसार)
@@ -5502,6 +5544,7 @@
 DocType: Soil Texture,Sandy Clay,वालुकामय चिकणमाती
 DocType: Grant Application,Assessment  Manager,मूल्यांकन व्यवस्थापक
 DocType: Payment Entry,Allocate Payment Amount,देयक रक्कम वाटप
+DocType: Subscription Plan,Subscription Plan,सदस्यता योजना
 DocType: Employee External Work History,Salary,पगार
 DocType: Serial No,Delivery Document Type,डिलिव्हरी दस्तऐवज प्रकार
 DocType: Sales Order,Partly Delivered,अंशतः वितरण आकारले
@@ -5526,9 +5569,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing श्रेणी 2
 DocType: SG Creation Tool Course,Max Strength,कमाल शक्ती
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,प्रिसेट्स स्थापित करीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ग्राहकांसाठी डिलिव्हरी नोट नाही.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ग्राहकांसाठी डिलिव्हरी नोट नाही.
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM बदलले
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,वितरण तारीख वर आधारित आयटम निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,वितरण तारीख वर आधारित आयटम निवडा
 DocType: Grant Application,Has any past Grant Record,कोणतीही मागील ग्रांट रेकॉर्ड आहे
 ,Sales Analytics,विक्री Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},उपलब्ध {0}
@@ -5547,7 +5590,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चा माल प्रदान खर्च
 DocType: Selling Settings,Settings for Selling Module,विभाग विक्री साठी सेटिंग्ज
 DocType: Hotel Room Reservation,Hotel Room Reservation,हॉटेल रूम आरक्षण
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ग्राहक सेवा
 DocType: BOM,Thumbnail,लघुप्रतिमा
 DocType: Item Customer Detail,Item Customer Detail,आयटम ग्राहक तपशील
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ऑफर उमेदवार जॉब.
@@ -5564,7 +5607,7 @@
 DocType: Fees,Student Details,विद्यार्थी तपशील
 DocType: Purchase Invoice Item,Stock Qty,शेअर प्रमाण
 DocType: Purchase Invoice Item,Stock Qty,शेअर प्रमाण
-DocType: Employee Loan,Repayment Period in Months,महिने कर्जफेड कालावधी
+DocType: Loan,Repayment Period in Months,महिने कर्जफेड कालावधी
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,त्रुटी: एक वैध आयडी नाही ?
 DocType: Naming Series,Update Series Number,अद्यतन मालिका क्रमांक
 DocType: Account,Equity,इक्विटी
@@ -5573,7 +5616,7 @@
 DocType: Task,Closing Date,अखेरची दिनांक
 DocType: Sales Order Item,Produced Quantity,निर्मिती प्रमाण
 DocType: Timesheet,Work Detail,कार्य तपशील
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,अभियंता
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,अभियंता
 DocType: Journal Entry,Total Amount Currency,एकूण रक्कम चलन
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,शोध उप विधानसभा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},आयटम कोड रो क्रमांक   {0} साठी आवश्यक आहे
@@ -5619,13 +5662,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,देणगी प्रकार माहिती
 DocType: Request for Quotation,Supplier Detail,पुरवठादार तपशील
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},सूत्र किंवा अट त्रुटी: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Invoiced रक्कम
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Invoiced रक्कम
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,मापदंड वजन 100% पर्यंत जोडणे आवश्यक आहे
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,विधान परिषदेच्या
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,शेअर आयटम
 DocType: BOM,Materials,साहित्य
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","तपासले नाही, तर यादी तो लागू करण्यात आली आहे, जेथे प्रत्येक विभाग जोडले आहे."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} तयार करत आहे
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,स्रोत आणि लक्ष्य वखार समान असू शकत नाही
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,पोस्ट करण्याची तारीख आणि  पोस्ट करण्याची वेळ आवश्यक आहे
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,व्यवहार खरेदी कर टेम्प्लेट.
@@ -5649,14 +5691,14 @@
 DocType: Shipping Rule,Fixed,मुदत
 DocType: Vehicle Service,Clutch Plate,घट्ट पकड प्लेट
 DocType: Company,Round Off Account,खाते बंद फेरीत
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,प्रशासकीय खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,प्रशासकीय खर्च
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,सल्ला
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
-DocType: Journal Entry,Subscription,सदस्यता
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,सदस्यता
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,फी बनविणे प्रलंबित
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,सूचना कालावधी
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,सूचना कालावधी
 DocType: Asset Category,Asset Category Name,मालमत्ता वर्गवारी नाव
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,या मूळ प्रदेश आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नवीन विक्री व्यक्ती नाव
@@ -5670,7 +5712,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
 DocType: Asset,Frequency of Depreciation (Months),घसारा वारंवारता (महिने)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,क्रेडिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,स्थावर खर्च आयटम
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
@@ -5678,7 +5720,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
 DocType: Hub Settings,Company Logo,कंपनी लोगो
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},अर्थसंकल्प गट खाते विरुद्ध नियुक्त केला जाऊ शकत नाही {0}
 DocType: Healthcare Settings,Patient Registration,रुग्ण नोंदणी
@@ -5713,11 +5755,10 @@
 DocType: Journal Entry,Total Debit,एकूण डेबिट
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,मुलभूत पूर्ण वस्तू वखार
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,कृपया रुग्ण निवडा
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,विक्री व्यक्ती
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,विक्री व्यक्ती
 DocType: Hotel Room Package,Amenities,सुविधा
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,बजेट आणि खर्च केंद्र
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,पेमेंटचा एकाधिक डीफॉल्ट मोड अनुमत नाही
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,साठी
 ,Appointment Analytics,नेमणूक Analytics
 DocType: Vehicle Service,Half Yearly,सहामाही
 DocType: Lead,Blog Subscriber,ब्लॉग ग्राहक
@@ -5734,6 +5775,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,आपण दर वर्षी विद्यार्थ्यांचे गट तर रिक्त सोडा
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","चेक केलेले असल्यास, एकूण कार्यरत दिवसंमध्ये सुट्ट्यांचा समावेश असेल, आणि यामुळे  पगार प्रति दिवस मूल्य कमी होईल."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","चालू की वापरणारे अॅप्स प्रवेश करण्यात सक्षम होणार नाहीत, आपल्याला खात्री आहे?"
+DocType: Subscription Settings,Prorate,प्रोरेट
 DocType: Purchase Invoice,Total Advance,एकूण आगाऊ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,टेम्पलेट कोड बदला
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,मुदत समाप्ती तारीख मुदत प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही. तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
@@ -5745,8 +5787,9 @@
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 DocType: Cheque Print Template,Signatory Position,ना स्थिती
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,हरवले म्हणून सेट करा
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,हरवले म्हणून सेट करा
 DocType: Timesheet,Total Billable Hours,एकूण बिल तास
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,अशा सदस्यांद्वारे व्युत्पन्न केलेल्या चलनांचे देय द्यावे लागणार्या दिवसाची संख्या
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भरणा पावती टीप
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,हे या ग्राहक विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},सलग {0}: रक्कम {1} पेक्षा कमी असेल किंवा भरणा प्रवेश रक्कम बरोबरी करणे आवश्यक आहे {2}
@@ -5765,12 +5808,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,हे या कर्मचा उपस्थिती आधारित आहे
 DocType: Assessment Result,Summary,सारांश
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,मार्क अॅटॅन्डन्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,डेबिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,रेस्टॉरंट ऑर्डर प्रविष्टी आयटम
@@ -5782,7 +5825,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरेदी रक्कम
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,कर्मचारी फायदे
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,कर्मचारी फायदे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} ची  संख्या समान असणे आवश्यक आहे {1}
 DocType: Work Order,Manufactured Qty,उत्पादित Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},{0} सह शेअर्स अस्तित्वात नाहीत
@@ -5790,12 +5833,12 @@
 DocType: Asset,Out of Order,नियमबाह्य
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 DocType: Projects Settings,Ignore Workstation Time Overlap,वर्कस्टेशन टाइम आच्छादन दुर्लक्ष करा
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,बॅच क्रमांक निवडा
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
 DocType: Patient Service Unit,Medical Administrator,वैद्यकीय प्रशासक
 DocType: Assessment Plan,Schedule,वेळापत्रक
 DocType: Account,Parent Account,पालक खाते
@@ -5825,15 +5868,16 @@
 DocType: Asset Repair,Repair Status,स्थिती दुरुस्ती
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
 DocType: POS Profile,Account for Change Amount,खाते रक्कम बदल
 DocType: Purchase Invoice,input service,इनपुट सेवा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: {3} {4} मधील  {1} / {2} पक्ष / खात्याशी जुळत नाही
 DocType: Maintenance Team Member,Maintenance Team Member,देखरेख कार्यसंघ सदस्य
 DocType: Agriculture Analysis Criteria,Soil Analysis,माती विश्लेषण
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,कोर्स कोड:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
 DocType: Employee,Current Address,सध्याचा पत्ता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","आयटम आणखी एक नग प्रकार असेल  तर  वर्णन , प्रतिमा, किंमत, कर आदी टेम्पलेट निश्चित केली जाईल"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
@@ -5882,19 +5926,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},प्रवेश {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,अस्थिर नाव
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
 DocType: Asset,Asset Category,मालमत्ता वर्ग
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,निव्वळ वेतन नकारात्मक असू शकत नाही
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,पुरवठादार साहित्य
 DocType: Soil Texture,Loamy Sand,लोमी वाळू
 DocType: Production Plan,Material Request Planning,साहित्य विनंती प्लॅनिंग
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,उत्पादन शुल्क चलन
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,थ्रेशोल्ड {0}% एकदा एकापेक्षा जास्त वेळा दिसून
 DocType: Expense Claim,Employees Email Id,कर्मचारी ई मेल आयडी
 DocType: Employee Attendance Tool,Marked Attendance,चिन्हांकित उपस्थिती
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,वर्तमान दायित्व
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,वर्तमान दायित्व
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,टाइमर दिलेल्या वेळेपेक्षा जास्त ओलांडला
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,आपले संपर्क वस्तुमान एसएमएस पाठवा
 DocType: Patient,A Positive,एक सकारात्मक
@@ -5905,9 +5949,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक प्रमाण अनिवार्य आहे
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} येथे सध्याचे एक {1} पुरवठादार स्कोअरकार्ड उभे आहे आणि या पुरवठादारास खरेदी ऑर्डर देणे आवश्यक आहे.
 DocType: Asset Maintenance Team,Asset Maintenance Team,मालमत्ता देखभाल कार्यसंघ
-DocType: Employee Loan,Loan Type,कर्ज प्रकार
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} यशस्वीपणे सबमिट केले गेले आहे
+DocType: Loan,Loan Type,कर्ज प्रकार
 DocType: Scheduling Tool,Scheduling Tool,शेड्युलिंग साधन
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा repacked करणे
 DocType: Employee Education,Major/Optional Subjects,मुख्य / पर्यायी विषय
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
@@ -5939,7 +5984,7 @@
 DocType: Item,Units of Measure,माप युनिट
 DocType: Manufacturing Settings,Allow Production on Holidays,सुट्टीच्या दिवशी उत्पादन परवानगी द्या
 DocType: Sales Invoice,Customer's Purchase Order Date,ग्राहकाच्या पर्चेस तारीख
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,कॅपिटल शेअर
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,कॅपिटल शेअर
 DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक संलग्नक दर्शवा
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
 DocType: Restaurant Reservation,Reservation Time,आरक्षण वेळ
@@ -5954,7 +5999,7 @@
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,पंक्ती # {0}: तारखेनुसार रेकार्ड व्यवहार तारीख आधी असू शकत नाही
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,वैशिष्ट्यीकृत उत्पादने
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,डिझायनर
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
@@ -5964,20 +6009,20 @@
 DocType: Driver,Expiry Date,कालावधी समाप्ती तारीख
 DocType: Healthcare Settings,Employee name and designation in print,कर्मचारी नाव आणि मुद्रणाचे नाव
 ,accounts-browser,खाती ब्राउझर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,कृपया   पहिले  वर्ग निवडा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,कृपया   पहिले  वर्ग निवडा
 apps/erpnext/erpnext/config/projects.py +13,Project master.,प्रकल्प मास्टर.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",", प्रती-बिलिंग किंवा क्रमवारी लावणे परवानगी शेअर सेटिंग्ज किंवा Item &quot;भत्ता&quot; अद्यतनित."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(अर्धा दिवस)
 DocType: Payment Term,Credit Days,क्रेडिट दिवस
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,लॅब टेस्ट मिळविण्यासाठी कृपया रुग्ण निवडा
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,विद्यार्थी बॅच करा
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM चे आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM चे आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,आघाडी  वेळ दिवस
 DocType: Cash Flow Mapping,Is Income Tax Expense,आयकर खर्च आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,विद्यार्थी संस्थेचे वसतिगृह येथे राहत आहे तर हे तपासा.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
 ,Stock Summary,शेअर सारांश
@@ -5988,10 +6033,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,संदर्भ तारीख
 DocType: Employee,Reason for Leaving,सोडण्यासाठी  कारण
 DocType: BOM Operation,Operating Cost(Company Currency),ऑपरेटिंग खर्च (कंपनी चलन)
-DocType: Employee Loan Application,Rate of Interest,व्याज दर
+DocType: Loan Application,Rate of Interest,व्याज दर
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: Item,Shelf Life In Days,दिवसात शेल्फ लाइफ
 DocType: GL Entry,Is Opening,उघडत आहे
+DocType: Department,Expense Approvers,खर्च Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद  {1} सोबत लिंक केले जाऊ शकत नाही
 DocType: Journal Entry,Subscription Section,सदस्यता विभाग
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,खाते {0} अस्तित्वात नाही
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index d7e15dc..f1784c5 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Melawat {0} sebelum membatalkan Waranti Tuntutan
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Laporan Penilaian
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produk Pengguna
-DocType: Purchase Receipt,Subscription Detail,Detail Langganan
 DocType: Supplier Scorecard,Notify Supplier,Maklumkan Pembekal
 DocType: Item,Customer Items,Item Pelanggan
 DocType: Project,Costing and Billing,Kos dan Billing
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
 DocType: Item,Publish Item to hub.erpnext.com,Terbitkan Perkara untuk hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mel Pemberitahuan
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,penilaian
 DocType: Item,Default Unit of Measure,Unit keingkaran Langkah
 DocType: SMS Center,All Sales Partner Contact,Semua Jualan Rakan Hubungi
-DocType: Employee,Leave Approvers,Tinggalkan Approvers
+DocType: Department,Leave Approvers,Tinggalkan Approvers
 DocType: Sales Partner,Dealer,Peniaga
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Siasatan
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Semak ketersediaan
 DocType: Job Applicant,Job Applicant,Kerja Pemohon
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ini adalah berdasarkan kepada urus niaga terhadap Pembekal ini. Lihat garis masa di bawah untuk maklumat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Undang-undang
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Jenis cukai sebenar tidak boleh dimasukkan dalam kadar Perkara berturut-turut {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Undang-undang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Jenis cukai sebenar tidak boleh dimasukkan dalam kadar Perkara berturut-turut {0}
 DocType: Bank Guarantee,Customer,Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan oleh
 DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Penghantaran Nota
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Tidak ada Slip Gaji yang dikemukakan untuk diproses.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Tidak ada Slip Gaji yang dikemukakan untuk diproses.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minit
 DocType: Leave Type,Leave Type Name,Tinggalkan Nama Jenis
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tunjukkan terbuka
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ia perlu mengambil tindakan ini hari ini sendiri untuk berulang yang disebutkan di atas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Siri Dikemaskini Berjaya
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Checkout
 DocType: Pricing Rule,Apply On,Memohon Pada
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Semua Pembekal Contact
 DocType: Support Settings,Support Settings,Tetapan sokongan
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Cuti Permohonan Baru
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Perkara Status luput
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Draf
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Draf
 DocType: Membership,membership validaty section,bahagian validaty keahlian
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
 DocType: Consultation,Consultation,Perundingan
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,bahan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Membuat laman web
 DocType: Opening Invoice Creation Tool Item,Quantity,Kuantiti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Jadual account tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Pinjaman (Liabiliti)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Jadual account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Pinjaman (Liabiliti)
 DocType: Employee Education,Year of Passing,Tahun Pemergian
 DocType: Item,Country of Origin,Negara asal
 DocType: Soil Texture,Soil Texture Criteria,Kriteria Tekanan Tanah
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Butiran Hubungan Utama
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Isu Terbuka
 DocType: Production Plan Item,Production Plan Item,Rancangan Pengeluaran Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
 DocType: Lab Test Groups,Add new line,Tambah barisan baru
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Penjagaan Kesihatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
@@ -89,7 +85,7 @@
 ,Delay Days,Hari Kelewatan
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Invois
+DocType: Subscription Invoice,Invoice,Invois
 DocType: Purchase Invoice Item,Item Weight Details,Butiran Butiran Butiran
 DocType: Asset Maintenance Log,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Kos
 DocType: Delivery Note,Vehicle No,Kenderaan Tiada
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Sila pilih Senarai Harga
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Kerja Dalam Kemajuan
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Sila pilih tarikh
 DocType: Daily Work Summary Group,Holiday List,Senarai Holiday
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Akauntan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Akauntan
 DocType: Hub Settings,Selling Price List,Senarai Harga Jualan
 DocType: Patient,Tobacco Current Use,Penggunaan Semasa Tembakau
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Kadar Jualan
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Kadar Jualan
 DocType: Cost Center,Stock User,Saham pengguna
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefon No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Pemberitahuan E-mel Awal Dihantar
 ,Sales Partners Commission,Pasangan Jualan Suruhanjaya
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Nilai Selepas Susutnilai
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Berkaitan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Tarikh kehadirannya tidak boleh kurang daripada tarikh pendaftaran pekerja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Tarikh kehadirannya tidak boleh kurang daripada tarikh pendaftaran pekerja
 DocType: Grading Scale,Grading Scale Name,Grading Nama Skala
-DocType: Subscription,Repeat on Day,Ulang hari
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ini adalah akaun akar dan tidak boleh diedit.
 DocType: Sales Invoice,Company Address,Alamat syarikat
 DocType: BOM,Operations,Operasi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak boleh menetapkan kebenaran secara Diskaun untuk {0}
+DocType: Subscription,Subscription Start Date,Tarikh Mula Langganan
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Lampirkan fail csv dengan dua lajur, satu untuk nama lama dan satu untuk nama baru"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} tidak dalam apa-apa aktif Tahun Anggaran.
 DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rujukan: {0}, Kod Item: {1} dan Pelanggan: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Tarikh Akhir Tempoh Percubaan Tidak boleh sebelum Tarikh Mula Tempoh Percubaan
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Membuka pekerjaan.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM tidak dinyatakan untuk subkontrak item {0} pada baris {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Syarikat yang sama memasuki lebih daripada sekali
 DocType: Patient,Married,Berkahwin
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak dibenarkan untuk {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Mendapatkan barangan dari
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Mendapatkan barangan dari
 DocType: Price List,Price Not UOM Dependant,Harga tidak bergantung kepada UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brek Minyak
 DocType: Tax Rule,Tax Type,Jenis Cukai
 ,Completed Work Orders,Perintah Kerja yang telah selesai
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Amaun yang dikenakan cukai
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Amaun yang dikenakan cukai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Rujukan mestilah salah satu Tuntutan Perbelanjaan atau Kemasukan Jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Pilih BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Baris # {0}: Jenis Dokumen Rujukan mestilah salah satu Tuntutan Perbelanjaan atau Kemasukan Jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Menguruskan jumlah pendahuluan yang diberikan kepada Pekerja
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Pemberitahuan Penghantaran
 DocType: Journal Entry,Opening Entry,Entry pembukaan
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akaun Pay Hanya
-DocType: Employee Loan,Repay Over Number of Periods,Membayar balik Over Bilangan Tempoh
+DocType: Loan,Repay Over Number of Periods,Membayar balik Over Bilangan Tempoh
 DocType: Stock Entry,Additional Costs,Kos Tambahan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Lead,Product Enquiry,Pertanyaan Produk
 DocType: Education Settings,Validate Batch for Students in Student Group,Mengesahkan Batch untuk Pelajar dalam Kumpulan Pelajar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Tiada rekod cuti dijumpai untuk pekerja {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Tiada rekod cuti dijumpai untuk pekerja {0} untuk {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Sila masukkan syarikat pertama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Sila pilih Syarikat pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Sila pilih Syarikat pertama
 DocType: Employee Education,Under Graduate,Di bawah Siswazah
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Sila tetapkan templat lalai untuk Pemberitahuan Status Pemberitahuan dalam Tetapan HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Sasaran Pada
 DocType: BOM,Total Cost,Jumlah Kos
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Pinjaman pekerja
 DocType: Fee Schedule,Send Payment Request Email,Hantar E-mel Permintaan Pembayaran
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Harta Tanah
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Berhasil tidak berdaftar.
 DocType: Assessment Result,Grade,gred
 DocType: Restaurant Table,No of Seats,Tiada tempat duduk
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Untuk menambah subjek dinamik, gunakan tag jinja seperti <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tugas Penyelenggaraan Aset
 DocType: SMS Center,All Contact,Semua Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Kerja Harian
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} dibekukan
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Perbelanjaan saham
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Perbelanjaan saham
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Pilih Warehouse sasaran
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Pilih Warehouse sasaran
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Sila masukkan Preferred hubungan Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Sila masukkan Preferred hubungan Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredit dalam Mata Wang Syarikat
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Alamat Utama
 DocType: Production Plan,Material Request Detail,Detail Permintaan Bahan
 DocType: Selling Settings,Default Quotation Validity Days,Hari Kesahan Sebutharga Lalai
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Tetapan untuk HR Modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Tukar Jumlah
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kategori Lesen Memandu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Sila masukkan Tarikh Penghantaran
 DocType: Depreciation Schedule,Make Depreciation Entry,Buat Entry Susutnilai
+DocType: HR Settings,Leave Settings,Tinggalkan Tetapan
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Jenis Permintaan
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,membuat pekerja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Mod persediaan POS (Dalam Talian / Luar Talian)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Menyahdayakan penciptaan log masa terhadap Perintah Kerja. Operasi tidak boleh dikesan terhadap Perintah Kerja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Pelaksanaan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Pelaksanaan
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Butiran operasi dijalankan.
 DocType: Asset Maintenance Log,Maintenance Status,Penyelenggaraan Status
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Butiran Keahlian
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pembekal diperlukan terhadap akaun Dibayar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Item dan Harga
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Jumlah jam: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
 DocType: Drug Prescription,Interval,Selang
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Pilihan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Pilihan
 DocType: Grant Application,Individual,Individu
 DocType: Academic Term,Academics User,akademik Pengguna
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Rajah
-DocType: Employee Loan Application,Loan Info,Maklumat pinjaman
+DocType: Loan Application,Loan Info,Maklumat pinjaman
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rancangan untuk lawatan penyelenggaraan.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tempoh Kad Scorecard Pembekal
 DocType: Share Transfer,Share Transfer,Pemindahan Saham
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Templat Perkara
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokimia
 DocType: Job Offer,Select Terms and Conditions,Pilih Terma dan Syarat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Nilai keluar
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Nilai keluar
 DocType: Woocommerce Settings,Woocommerce Settings,Tetapan Woocommerce
 DocType: Production Plan,Sales Orders,Jualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Penilaian
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Wilayah Default
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisyen
 DocType: Work Order Operation,Updated via 'Time Log',Dikemaskini melalui &#39;Time Log&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Pilih pelanggan atau pembekal.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: Company,Enable Perpetual Inventory,Membolehkan Inventori kekal
+DocType: Bank Guarantee,Charges Incurred,Caj Ditanggung
 DocType: Company,Default Payroll Payable Account,Lalai Payroll Akaun Kena Bayar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update E-mel Group
 DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Keputusan Tersuai
 DocType: Delivery Stop,Contact Name,Nama Kenalan
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian Kursus
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ID cukai:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ID cukai:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,ID pelajar:
 DocType: POS Customer Group,POS Customer Group,POS Kumpulan Pelanggan
 DocType: Land Unit,Land Unit describing various land assets,Unit Tanah menggambarkan pelbagai aset tanah
@@ -375,9 +372,8 @@
 ,Open Work Orders,Perintah Kerja Terbuka
 DocType: Payment Term,Credit Months,Bulan Kredit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay bersih tidak boleh kurang daripada 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Untuk berhenti menghantar pemberitahuan ralat berulang dari sistem, kami telah memeriksa bidang Dinyahaktifkan dalam langganan"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Meninggalkan setiap Tahun
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Meninggalkan setiap Tahun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak &#39;Adakah Advance&#39; terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
 DocType: Email Digest,Profit & Loss,Untung rugi
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Sila persediaan Pelajar di bawah Kumpulan Pelajar
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Penyertaan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Penyertaan
 DocType: Crop,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
 DocType: Stock Entry,Sales Invoice No,Jualan Invois No
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Kumpulan Pelajar Creation Tool
 DocType: Lead,Do Not Contact,Jangan Hubungi
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Orang yang mengajar di organisasi anda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Perisian Pemaju
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Perisian Pemaju
 DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
 DocType: Course Scheduling Tool,Course Start Date,Kursus Tarikh Mula
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Butiran Pembelian
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Gred Maks
 DocType: Email Digest,New Quotations,Sebut Harga baru
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip e-mel gaji kepada pekerja berdasarkan e-mel pilihan yang dipilih di pekerja
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
 DocType: Tax Rule,Shipping County,Penghantaran County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Belajar
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Belajar
 DocType: Asset,Next Depreciation Date,Selepas Tarikh Susutnilai
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Kos aktiviti setiap Pekerja
 DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cek cemerlang dan Deposit untuk membersihkan
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
 DocType: Driver,Fleet Manager,Pengurus Fleet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak boleh negatif untuk item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak boleh negatif untuk item {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Salah Kata Laluan
 DocType: Item,Variant Of,Varian Daripada
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Sila tetapkan Kadar Bilik Hotel pada {}
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Opening Invoice Creation Tool,Invoice Type,Jenis invois
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Penghantaran Nota
 DocType: Consultation,Encounter Impression,Impresi Encounter
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kos Aset Dijual
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Alat Penjadualan
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,Ralat [Urgent] semasa membuat% s berulang untuk% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
 DocType: Land Unit,LInked Analysis,Analisis Berfikir
 DocType: Item Tax,Tax Rate,Kadar Cukai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Tempoh permohonan tidak boleh merangkumi dua rekod peruntukan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Tempoh permohonan tidak boleh merangkumi dua rekod peruntukan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Cipta Kumpulan Pelajar
 DocType: Volunteer,Weekends,Hujung minggu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Jumlah kredit Nota
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Jumlah kredit Nota
 DocType: Setup Progress Action,Action Document,Dokumen Tindakan
 DocType: Chapter Member,Website URL,URL laman web
 ,Finished Goods,Barangan selesai
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Tambah Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Perkara Kualiti Pemeriksaan Parameter
+DocType: Leave Application,Leave Approver Name,Tinggalkan nama Pelulus
 DocType: Depreciation Schedule,Schedule Date,Jadual Tarikh
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Pendapatan, Potongan dan komponen Gaji lain"
 DocType: Packed Item,Packed Item,Makan Perkara
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan untuk sebut harga
 DocType: Healthcare Settings,Require Lab Test Approval,Memerlukan Kelulusan Ujian Lab
 DocType: Salary Slip Timesheet,Working Hours,Waktu Bekerja
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Jumlah yang belum dijelaskan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Jumlah yang belum dijelaskan
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
 DocType: Dosage Strength,Strength,Kekuatan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Buat Pelanggan baru
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Kos guna habis
 DocType: Purchase Receipt,Vehicle Date,Kenderaan Tarikh
 DocType: Student Log,Medical,Perubatan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Sebab bagi kehilangan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Sebab bagi kehilangan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Kemas kini Nombor Akaun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Lead Pemilik tidak boleh menjadi sama seperti Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah tidak dilaras
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Single
 DocType: Salary Slip,Total Loan Repayment,Jumlah Bayaran Balik Pinjaman
 DocType: Account,Cost of Goods Sold,Kos Barang Dijual
-DocType: Subscription,Yearly,Setiap tahun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Sila masukkan PTJ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Sila masukkan PTJ
 DocType: Drug Prescription,Dosage,Dos
 DocType: Journal Entry Account,Sales Order,Pesanan Jualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Purata. Menjual Kadar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Purata. Menjual Kadar
 DocType: Assessment Plan,Examiner Name,Nama pemeriksa
 DocType: Lab Test Template,No Result,Tiada Keputusan
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Sila masukkan nama syarikat pertama
 DocType: Purchase Invoice,Supplier Name,Nama Pembekal
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Manual ERPNext yang
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Tunjukkan Daun Semua Ahli Jabatan Dalam Kalendar
 DocType: Purchase Invoice,01-Sales Return,Pulangan 01-Jualan
 DocType: Account,Is Group,Adakah Kumpulan
 DocType: Email Digest,Pending Purchase Orders,Sementara menunggu Pesanan Pembelian
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,medan mandatori - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} tidak dikaitkan dengan {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Menyesuaikan teks pengenalan yang berlaku sebagai sebahagian daripada e-mel itu. Setiap transaksi mempunyai teks pengenalan yang berasingan.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Sila menetapkan akaun dibayar lalai bagi syarikat itu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Sila menetapkan akaun dibayar lalai bagi syarikat itu {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Urus niaga yang tidak dibenarkan terhadap berhenti Kerja Perintah {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dikhaskan untuk dijual
 DocType: Packing Slip,From Package No.,Dari Pakej No.
 DocType: Item Attribute,To Range,Untuk Julat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak boleh menukar kaedah penilaian, kerana terdapat urus niaga terhadap beberapa item yang tidak mempunyai ia kaedah penilaian sendiri"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Sekuriti dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak boleh menukar kaedah penilaian, kerana terdapat urus niaga terhadap beberapa item yang tidak mempunyai ia kaedah penilaian sendiri"
 DocType: Student Report Generation Tool,Attended by Parents,Dihadiri oleh Ibu Bapa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
 DocType: Patient,AB Positive,AB Positif
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekod kehadiran.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan timesheet.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
-DocType: Employee Loan,Total Payment,Jumlah Bayaran
+DocType: Loan,Total Payment,Jumlah Bayaran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Tidak dapat membatalkan transaksi untuk Perintah Kerja yang Selesai.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} dibatalkan supaya tindakan itu tidak boleh diselesaikan
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bahagian Cukup untuk Membina
 DocType: POS Profile User,POS Profile User,POS Profil Pengguna
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
+DocType: Subscription Invoice,Subscription Invoice,Invois Langganan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Pendapatan Langsung
 DocType: Patient Appointment,Date TIme,Masa tarikh
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Pegawai Tadbir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Pegawai Tadbir
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Menyediakan syarikat dan cukai
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
 DocType: Codification Table,Codification Table,Jadual Pengkodan
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Sila pilih Syarikat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Sila pilih Syarikat
 DocType: Stock Entry Detail,Difference Account,Akaun perbezaan
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN pembekal
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Templat Pemetaan Aliran Tunai
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
 DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
+DocType: Bank Guarantee,Providing,Menyediakan
 DocType: Account,Profit and Loss,Untung dan Rugi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Tidak dibenarkan, konfigurasi Templat Ujian Lab seperti yang diperlukan"
 DocType: Patient,Risk Factors,Faktor-faktor risiko
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Pembekal Invois No
 DocType: Territory,For reference,Untuk rujukan
 DocType: Healthcare Settings,Appointment Confirmation,Pengesahan Pelantikan
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat memadam No Serial {0}, kerana ia digunakan dalam urus niaga saham"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat memadam No Serial {0}, kerana ia digunakan dalam urus niaga saham"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Penutup (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hello
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Move Perkara
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Sediakan lalai dalam profil pos {0} untuk pengguna {1}, lalai dilumpuhkan secara lalai"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai terkumpul
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Wilayah diperlukan dalam Profil POS
 DocType: Supplier,Prevent RFQs,Cegah RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Buat Jualan Pesanan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Slip gaji dihantar untuk tempoh dari {0} hingga {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Slip gaji dihantar untuk tempoh dari {0} hingga {1}
 DocType: Project Task,Project Task,Projek Petugas
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Tarikh Bil Penghantaran
 DocType: Production Plan,Production Plan,Pelan Pengeluaran
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Pembukaan Alat Penciptaan Invois
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Jualan Pulangan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Jumlah daun diperuntukkan {0} hendaklah tidak kurang daripada daun yang telah pun diluluskan {1} untuk tempoh yang
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Tetapkan Qty dalam Transaksi berdasarkan Serial No Input
 ,Total Stock Summary,Ringkasan Jumlah Saham
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Sila tetapkan Syarikat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Sila tetapkan Syarikat
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Billed AMT
 DocType: Training Result Employee,Training Result Employee,Keputusan Latihan Pekerja
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
-DocType: Repayment Schedule,Principal Amount,Jumlah prinsipal
-DocType: Employee Loan Application,Total Payable Interest,Jumlah Faedah yang Perlu Dibayar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Jumlah prinsipal
+DocType: Loan Application,Total Payable Interest,Jumlah Faedah yang Perlu Dibayar
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Jumlah yang belum dijelaskan: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Invois Jualan Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
 DocType: Restaurant Reservation,Restaurant Reservation,Tempahan Restoran
 DocType: Land Unit,Land Unit Name,Nama Unit Tanah
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Penulisan Cadangan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Mengakhiri
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Beritahu Pelanggan melalui E-mel
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Beritahu Pelanggan melalui E-mel
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Satu lagi Orang Jualan {0} wujud dengan id Pekerja yang sama
 DocType: Employee Advance,Claimed Amount,Jumlah yang dituntut
 apps/erpnext/erpnext/config/education.py +180,Masters,Sarjana
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Pembayaran Akaun Gateway tidak diciptakan, sila buat secara manual."
 DocType: Supplier Scorecard,Per Year,Setiap tahun
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Tidak layak menerima kemasukan dalam program ini seperti DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 DocType: Sales Invoice,Sales Taxes and Charges,Jualan Cukai dan Caj
 DocType: Employee,Organization Profile,Organisasi Profil
 DocType: Vital Signs,Height (In Meter),Ketinggian (dalam meter)
 DocType: Student,Sibling Details,Maklumat adik-beradik
 DocType: Vehicle Service,Vehicle Service,Perkhidmatan kenderaan
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Secara automatik akan mencetuskan permintaan maklum balas berdasarkan keadaan.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Secara automatik akan mencetuskan permintaan maklum balas berdasarkan keadaan.
 DocType: Employee,Reason for Resignation,Sebab Peletakan jawatan
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Template bagi tujuan penilaian prestasi.
 DocType: Sales Invoice,Credit Note Issued,Nota Kredit Dikeluarkan
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Jadual Penyelenggaraan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Peraturan Kemudian Harga ditapis keluar berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Jenis Pembekal, Kempen, Rakan Jualan dan lain-lain"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Perubahan Bersih dalam Inventori
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Pengurusan Pinjaman pekerja
 DocType: Employee,Passport Number,Nombor Pasport
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Berhubung dengan Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Pengurus
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Pengurus
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Ke
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Sila tentukan akaun dalam Gudang {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Pemindahan bahan
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Tidak dapat mencari jalan untuk
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Pembukaan (Dr)
+DocType: Loan,Applicant,Pemohon
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Penempatan tanda waktu mesti selepas {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Untuk membuat dokumen berulang
 ,GST Itemised Purchase Register,GST Terperinci Pembelian Daftar
 DocType: Course Scheduling Tool,Reschedule,Reschedule
-DocType: Employee Loan,Total Interest Payable,Jumlah Faedah yang Perlu Dibayar
+DocType: Loan,Total Interest Payable,Jumlah Faedah yang Perlu Dibayar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Cukai Tanah Kos dan Caj
 DocType: Work Order Operation,Actual Start Time,Masa Mula Sebenar
 DocType: BOM Operation,Operation Time,Masa Operasi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Selesai
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,base
 DocType: Timesheet,Total Billed Hours,Jumlah Jam Diiktiraf
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Tulis Off Jumlah
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Tulis Off Jumlah
 DocType: Leave Block List Allow,Allow User,Benarkan pengguna
 DocType: Journal Entry,Bill No,Rang Undang-Undang No
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaun Keuntungan / Kerugian daripada Pelupusan Aset
 DocType: Vehicle Log,Service Details,Maklumat perkhidmatan
 DocType: Vehicle Log,Service Details,Maklumat perkhidmatan
-DocType: Subscription,Quarterly,Suku Tahunan
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Lembaran masa
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
 DocType: Sales Invoice,Port Code,Kod Pelabuhan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Warehouse Reserve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Warehouse Reserve
 DocType: Lead,Lead is an Organization,Lead adalah Organisasi
 DocType: Guardian Interest,Interest,Faedah
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Jualan pra
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Akaun-akaun
 DocType: Vehicle,Odometer Value (Last),Nilai Odometer (Akhir)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templat kriteria kad skor pembekal.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Pemasaran
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Pemasaran
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Kemasukan bayaran telah membuat
 DocType: Request for Quotation,Get Suppliers,Dapatkan Pembekal
 DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Slip Gaji
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Anda hanya boleh memperbaharui sekiranya keahlian anda tamat tempoh dalam masa 30 hari
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Hanya pilih jika anda mempunyai dokumen persediaan Aliran Tunai
 DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
 DocType: Supplier Scorecard,Per Week,Seminggu
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Perkara mempunyai varian.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumlah Pelajar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
 DocType: Bin,Stock Value,Nilai saham
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Entry Kad Kredit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Syarikat dan Akaun
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,dalam Nilai
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,dalam Nilai
 DocType: Asset Settings,Depreciation Options,Pilihan Susut nilai
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Masa Penghantaran tidak sah
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Masa Penghantaran tidak sah
 DocType: Lead,Campaign Name,Nama Kempen
 DocType: Hotel Room,Capacity,Kapasiti
 DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Selepas Hari
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
 DocType: Budget,Budget Against,bajet Terhadap
 DocType: Employee,Cell Number,Bilangan sel
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tiada kakitangan untuk kriteria yang diberikan. Semak bahawa Slip Gaji belum dibuat.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tiada kakitangan untuk kriteria yang diberikan. Semak bahawa Slip Gaji belum dibuat.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Permintaan bahan Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Sila pilih jadual
 DocType: BOM,Website Specifications,Laman Web Spesifikasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat e-mel yang tidak sah dalam &#39;Penerima&#39;
 DocType: Special Test Items,Particulars,Butiran
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
 DocType: Asset,Maintenance,Penyelenggaraan
+DocType: Subscriber,Subscriber,Pelanggan
 DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Sila Kemaskini Status Projek anda
 DocType: Item,Maximum sample quantity that can be retained,Kuantiti maksimum sampel yang dapat dikekalkan
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Tetapan lalai untuk Troli Beli Belah
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Tambah Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset dimansuhkan melalui Journal Kemasukan {0}
-DocType: Employee Loan,Interest Income Account,Akaun Pendapatan Faedah
+DocType: Loan,Interest Income Account,Akaun Pendapatan Faedah
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Semak Jemputan Dihantar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Pergi ke
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Menyediakan Akaun E-mel
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Sila masukkan Perkara pertama
 DocType: Asset Repair,Downtime,Waktu turun
 DocType: Account,Liability,Liabiliti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Tempoh Akademik:
 DocType: Salary Detail,Do not include in total,Tidak termasuk dalam jumlah
 DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Kuantiti sampel {0} tidak boleh melebihi kuantiti yang diterima {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Senarai Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Hantar E-mel
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
 DocType: Item,Max Sample Quantity,Kuantiti Sampel Maksima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Tiada Kebenaran
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Tiada Kebenaran
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Tuntut Sebut
 DocType: Vital Signs,Heart Rate / Pulse,Kadar Jantung / Pulse
 DocType: Company,Default Bank Account,Akaun Bank Default
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Ujian Makmal dan Tanda Penting
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tiada pekerja didapati
-DocType: Subscription,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Kemas kini Projek.
 DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
 DocType: Land Unit,Tree Details,Tree Butiran
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Semua Kumpulan Perkara
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
 DocType: Work Order,Item To Manufacture,Perkara Untuk Pembuatan
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status adalah {2}
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Pilih semula, jika alamat yang dipilih disunting selepas menyimpan"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
 DocType: Item,Hub Publishing Details,Butiran Penerbitan Hab
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Pembukaan&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Pembukaan&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka To Do
 DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
 DocType: Lab Test Template,Result Format,Format Keputusan
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,dua bulan sekali
 DocType: Vehicle Service,Brake Pad,Alas brek
 DocType: Fertilizer,Fertilizer Contents,Kandungan Pupuk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Penyelidikan &amp; Pembangunan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Penyelidikan &amp; Pembangunan
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Jumlah untuk Rang Undang-undang
 DocType: Company,Registration Details,Butiran Pendaftaran
 DocType: Timesheet,Total Billed Amount,Jumlah Diiktiraf
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Bypass cek had kredit pada Perintah Jualan
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Penilaian prestasi.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mendayakan &#39;Gunakan untuk Shopping Cart&#39;, kerana Troli didayakan dan perlu ada sekurang-kurangnya satu Peraturan cukai bagi Troli Membeli-belah"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kemasukan Pembayaran {0} dikaitkan terhadap Perintah {1}, semak sama ada ia perlu ditarik sebagai pendahuluan dalam invois ini."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kemasukan Pembayaran {0} dikaitkan terhadap Perintah {1}, semak sama ada ia perlu ditarik sebagai pendahuluan dalam invois ini."
 DocType: Sales Invoice Item,Stock Details,Stok
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Projek
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Tempat jualan
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,Tempat Duduk Minimum
 DocType: Item Attribute,Item Attribute Values,Nilai Perkara Sifat
 DocType: Examination Result,Examination Result,Keputusan peperiksaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Resit Pembelian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Resit Pembelian
 ,Received Items To Be Billed,Barangan yang diterima dikenakan caj
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Rujukan DOCTYPE mesti menjadi salah satu {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
 DocType: Work Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} mesti aktif
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Tiada Item yang tersedia untuk dipindahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Tiada Item yang tersedia untuk dipindahkan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Penutupan (pembukaan + jumlah)
 DocType: Journal Entry,Depreciation Entry,Kemasukan susutnilai
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Sila pilih jenis dokumen pertama
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
 DocType: Crop Cycle,ISO 8016 standard,Standard ISO 8016
 DocType: Pricing Rule,Rate or Discount,Kadar atau Diskaun
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Kegemaran
 DocType: Hub Settings,Custom Data,Data Tersuai
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,Standard Kod Perubatan
 DocType: Soil Texture,Clay Composition (%),Komposisi tanah liat (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Sila simpan sebelum memberikan tugasan.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Nilai Baki
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Nilai Baki
 DocType: Lab Test,Lab Technician,Juruteknik makmal
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Senarai Harga Jualan
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Sekiranya disemak, pelanggan akan dibuat, dipetakan kepada Pesakit. Invois Pesakit akan dibuat terhadap Pelanggan ini. Anda juga boleh memilih Pelanggan sedia ada semasa membuat Pesakit."
 DocType: Bank Reconciliation,Account Currency,Mata Wang Akaun
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
 DocType: Purchase Receipt,Range,Pelbagai
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Fee Structure,Components,komponen
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Woocommerce Settings,Endpoints,Titik akhir
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","dijana. Jika ditangguhkan, anda perlu mengubah secara manual bidang &quot;Ulang Hari Hari&quot; ini"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
 DocType: Share Transfer,From Folio No,Daripada Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,Tarikh sedia untuk digunakan
 DocType: Guardian,Guardian Name,Nama Guardian
 DocType: Cheque Print Template,Has Print Format,Mempunyai Format Cetak
-DocType: Employee Loan,Sanctioned,Diiktiraf
+DocType: Loan,Sanctioned,Diiktiraf
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin rekod pertukaran mata wang tidak dicipta untuk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
 DocType: Crop Cycle,Crop Cycle,Kitaran Tanaman
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk item &#39;Bundle Produk&#39;, Gudang, No Serial dan batch Tidak akan dipertimbangkan dari &#39;Packing List&#39; meja. Jika Gudang dan Batch No adalah sama untuk semua barangan pembungkusan untuk item apa-apa &#39;Bundle Produk&#39;, nilai-nilai boleh dimasukkan dalam jadual Perkara utama, nilai akan disalin ke &#39;Packing List&#39; meja."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk item &#39;Bundle Produk&#39;, Gudang, No Serial dan batch Tidak akan dipertimbangkan dari &#39;Packing List&#39; meja. Jika Gudang dan Batch No adalah sama untuk semua barangan pembungkusan untuk item apa-apa &#39;Bundle Produk&#39;, nilai-nilai boleh dimasukkan dalam jadual Perkara utama, nilai akan disalin ke &#39;Packing List&#39; meja."
 DocType: Student Admission,Publish on website,Menerbitkan di laman web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
+DocType: Subscription,Cancelation Date,Tarikh Pembatalan
 DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
 DocType: Agriculture Task,Agriculture Task,Petugas Pertanian
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Pendapatan tidak langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Pendapatan tidak langsung
 DocType: Student Attendance Tool,Student Attendance Tool,Alat Kehadiran Pelajar
 DocType: Restaurant Menu,Price List (Auto created),Senarai harga (dicipta secara automatik)
 DocType: Cheque Print Template,Date Settings,tarikh Tetapan
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,meter
 DocType: Workstation,Electricity Cost,Kos Elektrik
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Masa ujian makmal tidak boleh sebelum tarikh pengumpulan
+DocType: Subscription Plan,Cost,Kos
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
 DocType: Expense Claim,Total Advance Amount,Jumlah Jumlah Pendahuluan
 DocType: Delivery Stop,Estimated Arrival,jangkaan ketibaan
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
 DocType: Timesheet Detail,Bill,Rang Undang-Undang
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,White
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,White
 DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} dalam gudang {1} di mencatat masa catatan ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Anda hanya boleh memilih maksimum satu pilihan dari senarai kotak semak.
 DocType: Purchase Invoice,Get Advances Paid,Mendapatkan Pendahuluan Dibayar
 DocType: Item,Automatically Create New Batch,Secara automatik Buat Batch New
 DocType: Item,Automatically Create New Batch,Secara automatik Buat Batch New
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Menugaskan {0} ke {1} (baris {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Buat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Menugaskan {0} ke {1} (baris {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Buat
 DocType: Student Admission,Admission Start Date,Kemasukan Tarikh Mula
 DocType: Journal Entry,Total Amount in Words,Jumlah Amaun dalam Perkataan
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Pekerja baru
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Jumlah Baki Pinjaman
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Kursus jadual
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Pilihan Saham
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Pilihan Saham
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Lumpuhkan Pengambilan Butir Belian Terakhir dalam Pesanan Pembelian
 DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Adakah anda benar-benar mahu memulihkan aset dilupuskan ini?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pembungkusan Slip Perkara
 DocType: Purchase Invoice,Cash/Bank Account,Akaun Tunai / Bank
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Sila nyatakan {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
 DocType: Delivery Note,Delivery To,Penghantaran Untuk
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Penciptaan variasi telah diberikan giliran.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Ringkasan Kerja untuk {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Jadual atribut adalah wajib
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pengendali Tinggalkan pertama dalam senarai akan ditetapkan sebagai Penolakan Cuti lalai.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Plan,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} tidak boleh negatif
 DocType: Training Event,Self-Study,Belajar sendiri
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,Upah
 DocType: Asset Maintenance,Maintenance Manager Name,Nama Pengurus Penyelenggaraan
 DocType: Agriculture Task,Urgent,Segera
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Sila nyatakan ID Row sah untuk barisan {0} dalam jadual {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Sila nyatakan ID Row sah untuk barisan {0} dalam jadual {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Tidak dapat mencari variabel:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Sila pilih medan untuk mengedit dari numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Tidak boleh menjadi item aset tetap sebagai Lejar Saham dicipta.
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nama Templat Pemeriksaan Kualiti
 DocType: Project,First Email,E-mel Pertama
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Jumlah Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Jumlah Jualan
 DocType: Repayment Schedule,Interest Amount,Amaun Faedah
 DocType: Serial No,Creation Document No,Penciptaan Dokumen No
 DocType: Share Transfer,Issue,Isu
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,Negeri Penghantaran
 ,Projected Quantity as Source,Kuantiti Unjuran sebagai Sumber
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Lawatan Penghantaran
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Lawatan Penghantaran
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Jenis Pemindahan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Perbelanjaan jualan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Perbelanjaan jualan
 DocType: Consultation,Diagnosis,Diagnosis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Membeli Standard
 DocType: GL Entry,Against,Terhadap
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Poskod
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Pilih akaun pendapatan faedah dalam pinjaman {0}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Membuat Kemasukan Stok
 DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
 DocType: Item,Default Supplier,Pembekal Default
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Lebih Pengeluaran Peratus Peruntukan
-DocType: Employee Loan,Repayment Schedule,Jadual Pembayaran Balik
+DocType: Loan,Repayment Schedule,Jadual Pembayaran Balik
 DocType: Shipping Rule Condition,Shipping Rule Condition,Penghantaran Keadaan Peraturan
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,Kehadiran Freeze Tarikh
 DocType: Education Settings,Attendance Freeze Date,Kehadiran Freeze Tarikh
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Senarai beberapa pembekal anda. Mereka boleh menjadi organisasi atau individu.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Lihat Semua Produk
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead Minimum Umur (Hari)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead Minimum Umur (Hari)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,semua boms
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Dari Pekerja
 DocType: Driver,Cellphone Number,Nombor telefon bimbit
 DocType: Project,Monitor Progress,Memantau Kemajuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
 DocType: Journal Entry,Make Difference Entry,Membawa Perubahan Entry
+DocType: Supplier Quotation,Auto Repeat Section,Seksyen Ulang Auto
 DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tarikh
 DocType: Appraisal Template Goal,Key Performance Area,Kawasan Prestasi Utama
 DocType: Program Enrollment,Transportation,Pengangkutan
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Sifat tidak sah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} mestilah diserahkan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Kuantiti mesti kurang daripada atau sama dengan {0}
+DocType: Department Approver,Department Approver,Pengendali Jabatan
 DocType: SMS Center,Total Characters,Jumlah Watak
 DocType: Employee Advance,Claimed,Dikenakan
 DocType: Crop,Row Spacing,Barisan Baris
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Bayaran Penyesuaian Invois
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Sumbangan%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Sebagai satu Tetapan Membeli jika Purchase Order Diperlukan == &#39;YA&#39;, maka untuk mewujudkan Invois Belian, pengguna perlu membuat Pesanan Belian pertama bagi item {0}"
+,HSN-wise-summary of outward supplies,Ringkasan ringkasan HSN bekalan luar
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nombor pendaftaran syarikat untuk rujukan anda. Nombor cukai dan lain-lain
 DocType: Sales Partner,Distributor,Pengedar
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,Nama Tindakan
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Mula Tahun
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Pertama 2 digit GSTIN harus sepadan dengan nombor Negeri {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Tarikh tempoh invois semasa memulakan
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapasiti Ralat Perancangan
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Bidang akan disalin hanya pada waktu penciptaan.
 DocType: Setup Progress Action,Domains,Domain
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Asal Mula' tidak boleh lebih besar daripada 'Tarikh Asal Tamat'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Pengurusan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Pengurusan
 DocType: Cheque Print Template,Payer Settings,Tetapan pembayar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Tempat kembalinya
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Awas
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Hari permulaan adalah lebih besar daripada hari akhir dalam tugas &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Pulangan / Nota Debit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Pulangan / Nota Debit
 DocType: Price List Country,Price List Country,Senarai harga Negara
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
 DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor Penukaran UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Sila masukkan Kod Item untuk mendapatkan Nombor kumpulan
 DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
-DocType: Employee Loan,Partially Disbursed,sebahagiannya Dikeluarkan
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Berikan maklumat.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Berikan maklumat.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Pangkalan data pembekal.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Anda tidak boleh memulakan semula Langganan yang tidak dibatalkan.
 DocType: Account,Balance Sheet,Kunci Kira-kira
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
 DocType: Fee Validity,Valid Till,Sah sehingga
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Mesyuarat Guru Ibu Jumlah
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Mengubah Kumpulan Pelanggan untuk Pelanggan yang dipilih tidak dibenarkan.
 ,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Mengemas kini anggaran masa ketibaan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Mengemas kini anggaran masa ketibaan.
 DocType: Program Enrollment Tool,Enrollment Details,Butiran Pendaftaran
 DocType: Purchase Invoice Item,Net Rate,Kadar bersih
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Sila pilih pelanggan
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
 DocType: Purchase Order,Group same items,Kumpulan barangan yang sama
 DocType: Purchase Invoice,Disable Rounded Total,Melumpuhkan Bulat Jumlah
-DocType: Employee Loan Application,Repayment Info,Maklumat pembayaran balik
+DocType: Department,Parent Department,Jabatan Induk
+DocType: Loan Application,Repayment Info,Maklumat pembayaran balik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
 DocType: Maintenance Team Member,Maintenance Role,Peranan Penyelenggaraan
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
 ,Trial Balance,Imbangan Duga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Menubuhkan Pekerja
 DocType: Sales Order,SO-,demikian-
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Tempahan Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Sila pilih awalan pertama
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Penyelidikan
+DocType: Subscription Settings,Subscription Settings,Tetapan Langganan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Penyelidikan
 DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Sila nyatakan sekurang-kurangnya satu atribut dalam jadual Atribut
 DocType: Announcement,All Students,semua Pelajar
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
 DocType: Crop Cycle,Less than a year,Kurang dari setahun
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Pelajar Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
 DocType: Crop,Yield UOM,Hasil UOM
 ,Budget Variance Report,Belanjawan Laporan Varian
 DocType: Salary Slip,Gross Pay,Gaji kasar
 DocType: Item,Is Item from Hub,Adakah Item dari Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Aktiviti adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividen Dibayar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividen Dibayar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Perakaunan Lejar
 DocType: Stock Reconciliation,Difference Amount,Perbezaan Amaun
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} pada Cuti di {1}
 DocType: Purchase Invoice,Reverse Charge,Caj Songsang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Pendapatan tertahan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Pendapatan tertahan
 DocType: Purchase Invoice,05-Change in POS,05-Tukar dalam POS
 DocType: Vehicle Log,Service Detail,Detail perkhidmatan
 DocType: BOM,Item Description,Perkara Penerangan
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,Peluang Perkara
 ,Student and Guardian Contact Details,Pelajar dan Guardian Butiran Hubungi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Untuk pembekal {0} Alamat e-mel diperlukan untuk menghantar e-mel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Pembukaan sementara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Pembukaan sementara
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Lihat Hub
 ,Employee Leave Balance,Pekerja Cuti Baki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
 DocType: Patient Appointment,More Info,Banyak Lagi Maklumat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
 DocType: Supplier Scorecard,Scorecard Actions,Tindakan Kad Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Contoh: Sarjana Sains Komputer
 DocType: Purchase Invoice,Rejected Warehouse,Gudang Ditolak
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,kepada
 DocType: Supplier Quotation Item,Lead Time in days,Masa utama dalam hari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Pembayaran gaji daripada {0} kepada {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Pembayaran gaji daripada {0} kepada {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Preskripsi Ubat Lab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Kecil
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Membuka Item Penciptaan Alat Invois
 DocType: Education Settings,Employee Number,Bilangan pekerja
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Batal Invois Selepas Tempoh Grace
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
 DocType: Project,% Completed,% Selesai
 ,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Ujian Laboratorium Datetime
 DocType: Email Digest,Add Quote,Tambah Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Perbelanjaan tidak langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Perbelanjaan tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 DocType: Agriculture Analysis Criteria,Agriculture,Pertanian
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Peralatan Modal
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Sila nyatakan Kod Item terlebih dahulu
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
+DocType: Subscription Plan,Billing Interval Count,Count Interval Pengebilan
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Pasukan Terbaru
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Untuk Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Untuk Pembekal
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Menetapkan Jenis Akaun membantu dalam memilih Akaun ini dalam urus niaga.
 DocType: Purchase Invoice,Grand Total (Company Currency),Jumlah Besar (Syarikat mata wang)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Buat Format Cetak
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Kumpulan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Item alternatif tidak boleh sama dengan kod item
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
 DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Muktamadkan penilaian sementara
 DocType: Salary Slip,Bank Account No.,No. Akaun Bank
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Stesen kerja
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sebut Harga Pembekal
 DocType: Healthcare Settings,Registration Message,Mesej Pendaftaran
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Perkakasan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Perkakasan
 DocType: Prescription Dosage,Prescription Dosage,Dosis Preskripsi
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Sila pilih sebuah Syarikat
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,Tarikh mula dan tamat
 ,Delivered Items To Be Billed,Item Dihantar dikenakan caj
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Terbuka BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
 DocType: Authorization Rule,Average Discount,Diskaun Purata
 DocType: Project Update,Great/Quickly,Besar / Cepat
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Sila pilih kumpulan untuk item batched
 DocType: Asset,Depreciation Schedules,Jadual susutnilai
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Berikut akaun mungkin dipilih dalam Tetapan CBP:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Berikut akaun mungkin dipilih dalam Tetapan CBP:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
 DocType: Activity Cost,Projects,Projek
 DocType: Payment Request,Transaction Currency,transaksi mata Wang
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Purata harian Keluar
 DocType: POS Profile,Campaign,Kempen
 DocType: Supplier,Name and Type,Nama dan Jenis
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
 DocType: Physician,Contacts and Address,Kenalan dan Alamat
 DocType: Purchase Invoice,Contact Person,Dihubungi
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,Kelayakan dan Butiran
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari datetime
 DocType: Email Digest,For Company,Bagi Syarikat
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sebut Harga dilumpuhkan untuk mengakses dari portal, lebih tetapan portal cek."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Pembekal Skor Kad Pembekal Pembekal
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Membeli Jumlah
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Membeli Jumlah
 DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
 DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Terdapat kesilapan mencipta Jadual Kursus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pengendali Perbelanjaan pertama dalam senarai akan ditetapkan sebagai Pengecualian Perbelanjaan lalai.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Detail,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,Kod pakej
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Perantis
 DocType: Purchase Invoice,Company GSTIN,syarikat GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Cukai terperinci jadual diambil dari ruang induk sebagai rentetan dan disimpan di dalam bidang ini. Digunakan untuk Cukai dan Caj
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
 DocType: Email Digest,Bank Balance,Baki Bank
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Tinggalkan Permohonan Mandat Masuk Pendahuluan
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
 DocType: Journal Entry Account,Account Balance,Baki Akaun
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Tempoh Bayaran pada baris {0} mungkin pendua.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Pertanian (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Slip pembungkusan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pejabat Disewa
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pejabat Disewa
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
 DocType: Disease,Common Name,Nama yang selalu digunakan
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Tiada alamat ditambah lagi.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
 DocType: Vital Signs,Blood Pressure,Tekanan darah
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Penganalisis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Penganalisis
 DocType: Item,Inventory,Inventori
 DocType: Item,Sales Details,Jualan Butiran
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Mengesahkan supply Kursus Pelajar dalam Kumpulan Pelajar
 DocType: Notification Control,Expense Claim Rejected,Perbelanjaan Tuntutan Ditolak
 DocType: Item,Item Attribute,Perkara Sifat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Kerajaan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Kerajaan
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Perbelanjaan Tuntutan {0} telah wujud untuk Log Kenderaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Nama Institut
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Sila masukkan Jumlah pembayaran balik
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Sila masukkan Jumlah pembayaran balik
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Kelainan Perkara
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Perkhidmatan
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Gaji kepada Pekerja
 DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Pilih Pembekal Kemungkinan
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Pilih Pembekal Kemungkinan
 DocType: Sales Invoice,Source,Sumber
 DocType: Customer,"Select, to make the customer searchable with these fields","Pilih, untuk membuat pelanggan dicari dengan medan ini"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show ditutup
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Aliran tunai daripada Pelaburan
 DocType: Program Course,Program Course,Kursus program
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding dan Caj
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Freight Forwarding dan Caj
 DocType: Homepage,Company Tagline for website homepage,Syarikat Tagline untuk laman web laman utama
 DocType: Item Group,Item Group Name,Perkara Kumpulan Nama
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Butiran Memebership
 DocType: Leave Block List,Block Holidays on important days.,Sekat Cuti pada hari-hari penting.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Sila masukkan semua Nilai Hasil yang diperlukan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Ringkasan Akaun Belum Terima
-DocType: Employee Loan,Monthly Repayment Amount,Jumlah Bayaran Balik Bulanan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Ringkasan Akaun Belum Terima
+DocType: Loan,Monthly Repayment Amount,Jumlah Bayaran Balik Bulanan
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Pembukaan Invois
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
 DocType: UOM,UOM Name,Nama UOM
 DocType: GST HSN Code,HSN Code,Kod HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Jumlah Sumbangan
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Pengguna {0} telah ditugaskan kepada Doktor {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Pembekal mungkin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Pembekal mungkin
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Pengagihan Bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Penerima Senarai kosong. Sila buat Penerima Senarai
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Kesihatan (beta)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Tiada item untuk pek
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
-DocType: Employee Loan,Repayment Method,Kaedah Bayaran Balik
+DocType: Loan,Repayment Method,Kaedah Bayaran Balik
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jika disemak, page Utama akan menjadi lalai Item Kumpulan untuk laman web"
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Tuntutan perbelanjaan syarikat.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sijil Diperlukan
 DocType: Company,Default Holiday List,Default Senarai Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Masa dan Untuk Masa {1} adalah bertindih dengan {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Liabiliti saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Liabiliti saham
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Pembekal
 DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Pilih Syarikat
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,Seksyen Cetak
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Pengguna {0} tidak mempunyai profil POS lalai. Semak lalai di Row {1} untuk Pengguna ini.
 DocType: Student Group,Set 0 for no limit,Hanya 0 untuk tiada had
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Baris {idx}: {field} diperlukan untuk mencipta Invois Pembukaan {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Alamat Utama dan Butiran Kenalan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Hantar semula Pembayaran E-mel
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Sila pilih sekurang-kurangnya satu domain.
 DocType: Dependent Task,Dependent Task,Petugas bergantung
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
 DocType: SMS Center,Receiver List,Penerima Senarai
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Cari Item
 DocType: Payment Schedule,Payment Amount,Jumlah Bayaran
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,Skala penggredan
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,sudah selesai
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import yang berjaya!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,Sebut Harga Item
 DocType: Customer,Customer POS Id,Id POS pelanggan
 DocType: Account,Account Name,Nama Akaun
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} kuantiti {1} tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} kuantiti {1} tidak boleh menjadi sebahagian kecil
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Sila masukkan URL Pelayan Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Jenis pembekal induk.
 DocType: Purchase Order Item,Supplier Part Number,Pembekal Bahagian Nombor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
 DocType: Share Balance,To No,Tidak
-DocType: Subscription,Reference Document,Dokumen rujukan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Pengawal Kredit
-DocType: Grant Application,Applicant Type,Jenis Pemohon
+DocType: Loan,Applicant Type,Jenis Pemohon
 DocType: Purchase Invoice,03-Deficiency in services,03-Kekurangan perkhidmatan
 DocType: Delivery Note,Vehicle Dispatch Date,Kenderaan Dispatch Tarikh
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Kod Perubatan Default
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% dibilkan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Terpelihara Qty
 DocType: Party Account,Party Account,Akaun Pihak
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Manusia
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Sumber Manusia
 DocType: Lead,Upper Income,Pendapatan atas
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Tolak
 DocType: Journal Entry Account,Debit in Company Currency,Debit dalam Syarikat Mata Wang
 DocType: BOM Item,BOM Item,BOM Perkara
 DocType: Appraisal,For Employee,Untuk Pekerja
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Membuat Pengeluaran Kemasukan
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Membuat Pengeluaran Kemasukan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
 DocType: Company,Default Values,Nilai lalai
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mesti lebih besar daripada 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Saham Tersedia
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Saham Tersedia
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perancangan Keupayaan (Hari)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Perolehan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,medan mandatori - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,medan mandatori - Program
 DocType: Special Test Template,Result Component,Komponen Hasil
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Termasuk cuti dalam daun daun
 DocType: Sales Invoice,Packed Items,Makan Item
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Jaminan Tuntutan terhadap No. Siri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Jumlah&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Jumlah&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Membolehkan Troli
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Sahkan Tindakan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Lelong Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Fulfillment
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Lihat dalam Troli
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Perbelanjaan pemasaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Tidak boleh membuat kriteria standard. Sila tukar nama kriteria
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Material Request,Transferred,dipindahkan
 DocType: Vehicle,Doors,Doors
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kumpulkan Bayaran Pendaftaran Pesakit
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Tidak dapat mengubah Sifat selepas transaksi stok. Buat Item baru dan pindahan stok ke Item baru
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Tidak dapat mengubah Sifat selepas transaksi stok. Buat Item baru dan pindahan stok ke Item baru
 DocType: Course Assessment Criteria,Weightage,Wajaran
 DocType: Purchase Invoice,Tax Breakup,Breakup cukai
 DocType: Packing Slip,PS-,PS-
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Pendahuluan Pekerja
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 DocType: Grant Application,Assessment  Mark (Out of 10),Penilaian Penilaian (Daripada 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Bimbit
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
 DocType: Email Digest,Annual Expenses,Perbelanjaan tahunan
 DocType: Item,Variants,Kelainan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang diperuntukkan
 DocType: Sales Team,Contribution to Net Total,Sumbangan kepada Jumlah Bersih
 DocType: Sales Invoice Item,Customer's Item Code,Kod Item Pelanggan
 DocType: Stock Reconciliation,Stock Reconciliation,Saham Penyesuaian
 DocType: Territory,Territory Name,Wilayah Nama
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Anda hanya boleh mempunyai Pelan dengan kitaran pengebilan yang sama dalam Langganan
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon pekerjaan.
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Rujukan
 DocType: Supplier,Statutory info and other general information about your Supplier,Maklumat berkanun dan maklumat umum lain mengenai pembekal anda
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak mempunyai apa-apa yang tidak dapat ditandingi {1} masuk
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,penilaian
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Peristiwa Latihan
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Trek Memimpin oleh Sumber Utama.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Sila masukkan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Sila masukkan
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Log penyelenggaraan
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih pakej ini. (Dikira secara automatik sebagai jumlah berat bersih item)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
 DocType: Student Group,Instructors,pengajar
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Pengurusan Saham
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pembayaran
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} tidak dikaitkan dengan mana-mana akaun, sila sebutkan akaun dalam rekod gudang atau menetapkan akaun inventori lalai dalam syarikat {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Menguruskan pesanan anda
 DocType: Work Order Operation,Actual Time and Cost,Masa sebenar dan Kos
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,Pelajar Permohonan Cuti
 DocType: Item,Will also apply for variants,Juga akan memohon varian
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pada
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Barangan bundle pada masa jualan.
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,Barcode
 DocType: Hub Category,Hub Node,Hub Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Madya
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Madya
 DocType: Asset Movement,Asset Movement,Pergerakan aset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Perintah Kerja {0} mesti dihantar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Troli baru
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Mata wang penagihan mestilah sama dengan mata wang syarikat atau mata wang akaun pihak ketiga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Baris {0}: Tarikh Hutang tidak dapat sebelum tarikh siaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Baris {0}: Tarikh Hutang tidak dapat sebelum tarikh siaran
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Buat Entry Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
 ,Sales Invoice Trends,Sales Trend Invois
 DocType: Leave Application,Apply / Approve Leaves,Sapukan / Meluluskan Daun
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Untuk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
 DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree of Centers Kos kewangan.
 DocType: Serial No,Delivery Document No,Penghantaran Dokumen No
@@ -2325,7 +2332,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Penggunaan Bahan tidak ditetapkan dalam Tetapan Pembuatan.
 DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
 DocType: Item,Has Variants,Mempunyai Kelainan
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Tidak boleh mengatasi Perkara {0} dalam baris {1} lebih daripada {2}. Untuk membenarkan lebihan pengebilan, sila tetapkan di Tetapan Stok"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Tidak boleh mengatasi Perkara {0} dalam baris {1} lebih daripada {2}. Untuk membenarkan lebihan pengebilan, sila tetapkan di Tetapan Stok"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Kemas kini Semula
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
@@ -2337,12 +2344,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Pilih program pertama
 DocType: Patient Appointment,Patient Age,Umur pesakit
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Menguruskan Projek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} telah dikembalikan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} telah dikembalikan
 DocType: Supplier,Supplier of Goods or Services.,Pembekal Barangan atau Perkhidmatan.
 DocType: Budget,Fiscal Year,Tahun Anggaran
 DocType: Asset Maintenance Log,Planned,Dirancang
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Akaun boleh terima ingkar akan digunakan jika tidak ditetapkan dalam Pesakit untuk memohon caj Perundingan.
 DocType: Vehicle Log,Fuel Price,Harga bahan api
+DocType: Bank Guarantee,Margin Money,Wang Margin
 DocType: Budget,Budget,Bajet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Tetapkan Terbuka
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
@@ -2356,16 +2364,16 @@
 DocType: Lead,Follow Up,Mengikuti
 DocType: Item,Is Sales Item,Adalah Item Jualan
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Perkara Kumpulan Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
 DocType: Maintenance Visit,Maintenance Time,Masa penyelenggaraan
 ,Amount to Deliver,Jumlah untuk Menyampaikan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Item yang sama telah dimasukkan beberapa kali. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Permulaan Term Tarikh tidak boleh lebih awal daripada Tarikh Tahun Permulaan Tahun Akademik mana istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Terdapat ralat.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Pekerja {0} telah memohon untuk {1} antara {2} dan {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Terdapat ralat.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Pekerja {0} telah memohon untuk {1} antara {2} dan {3}:
 DocType: Guardian,Guardian Interests,Guardian minat
 DocType: Naming Series,Current Value,Nilai semasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
 DocType: Education Settings,Instructor Records to be created by,Rekod Pengajar akan diwujudkan oleh
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dihasilkan
 DocType: GST Account,GST Account,Akaun GST
@@ -2384,8 +2392,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
 DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Ditambah ke Kegemaran
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tiada slip gaji yang didapati mengemukakan untuk kriteria yang dipilih di atas ATAU slip gaji yang telah diserahkan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tugas dan Cukai
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tiada slip gaji yang didapati mengemukakan untuk kriteria yang dipilih di atas ATAU slip gaji yang telah diserahkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Tugas dan Cukai
 DocType: Projects Settings,Projects Settings,Tetapan Projek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Sila masukkan tarikh Rujukan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri bayaran tidak boleh ditapis oleh {1}
@@ -2395,27 +2403,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Pohon Kumpulan Item.
 DocType: Production Plan,Total Produced Qty,Jumlah Dihasilkan Qty
 DocType: Payroll Entry,Get Employee Details,Dapatkan Butiran Pekerja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
 DocType: Asset,Sold,dijual
 ,Item-wise Purchase History,Perkara-bijak Pembelian Sejarah
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
 DocType: Account,Frozen,Beku
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Jumlah (Syarikat Mata Wang)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Bahan mentah
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Bahan mentah
 DocType: Payment Reconciliation Payment,Reference Row,rujukan Row
 DocType: Installation Note,Installation Time,Masa pemasangan
 DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
 DocType: Patient,O Positive,O Positif
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Pelaburan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,peruntukan
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Tiada bayaran balik yang tersedia untuk Kemasukan Jurnal
 DocType: Item Attribute,Attribute Name,Atribut Nama
 DocType: BOM,Show In Website,Show Dalam Laman Web
 DocType: Shopping Cart Settings,Show Quantity in Website,Tunjuk Kuantiti dalam Laman Web
-DocType: Employee Loan Application,Total Payable Amount,Jumlah Dibayar
+DocType: Loan Application,Total Payable Amount,Jumlah Dibayar
 DocType: Task,Expected Time (in hours),Jangkaan Masa (dalam jam)
 DocType: Item Reorder,Check in (group),Daftar-masuk (kumpulan)
 DocType: Soil Texture,Silt,Lumpur
@@ -2434,7 +2443,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Buat bayaran
 DocType: Room,Room Name,Nama bilik
 DocType: Prescription Duration,Prescription Duration,Durasi Preskripsi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Kadar berharga
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Alamat Pelanggan Dan Kenalan
 ,Campaign Efficiency,Kecekapan kempen
@@ -2454,11 +2463,11 @@
 DocType: Chapter,Chapter,Bab
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pasangan
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Akaun lalai akan dikemas kini secara automatik dalam Invoice POS apabila mod ini dipilih.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
 DocType: Asset,Depreciation Schedule,Jadual susutnilai
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Alamat Partner Sales And Hubungi
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Tarikh Hari harus antara Dari Tarikh dan To Date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Tarikh Hari harus antara Dari Tarikh dan To Date
 DocType: Maintenance Schedule Detail,Actual Date,Tarikh sebenar
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Sila tetapkan Pusat Kos Lalai dalam {0} syarikat.
 DocType: Item,Has Batch No,Mempunyai Batch No
@@ -2476,7 +2485,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
 DocType: Soil Texture,Soil Type,Jenis Tanah
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Mesej baru
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandat GoCardless
@@ -2496,7 +2504,7 @@
 DocType: Hub Category,Hub Category,Kategori Hab
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
-DocType: Employee Loan,Loan Amount,Jumlah pinjaman
+DocType: Loan,Loan Amount,Jumlah pinjaman
 DocType: Student Report Generation Tool,Add Letterhead,Tambah Letterhead
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Driving Kenderaan
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Pembekal kad skor pembekal
@@ -2525,9 +2533,9 @@
 DocType: Cash Flow Mapper,Position,Jawatan
 DocType: Patient,Patient Details,Maklumat Pesakit
 DocType: Patient,B Positive,B Positif
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 DocType: Patient Medical Record,Patient Medical Record,Rekod Perubatan Pesakit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sukan
@@ -2535,8 +2543,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Jumlah Sebenar
 DocType: Lab Test UOM,Test UOM,UOM ujian
 DocType: Student Siblings,Student Siblings,Adik-beradik pelajar
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detail Pelan Langganan
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unit
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Sila nyatakan Syarikat
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Sila nyatakan Syarikat
 ,Customer Acquisition and Loyalty,Perolehan Pelanggan dan Kesetiaan
 DocType: Asset Maintenance Task,Maintenance Task,Tugas Penyelenggaraan
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Sila tetapkan Had B2C dalam Tetapan GST.
@@ -2551,6 +2560,7 @@
 ,BOM Search,BOM Search
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Jumlah Kos Bahan Terutu (melalui Entry Saham)
 DocType: Hub Settings,Company Registered,Syarikat Berdaftar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Kepada Tarikh tidak boleh kurang dari Tarikh
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Terbitkan &quot;Dalam Stok&quot; atau &quot;Tidak Ada Stok&quot; di Hab berdasarkan stok yang terdapat di gudang ini.
 DocType: Vehicle,Fuel Type,Jenis bahan api
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
@@ -2558,17 +2568,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Mengikuti Permintaan Bahan telah dibangkitkan secara automatik berdasarkan pesanan semula tahap Perkara ini
 DocType: Email Digest,Pending Sales Orders,Sementara menunggu Jualan Pesanan
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
 DocType: Employee,Create User Permission,Buat Kebenaran Pengguna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 DocType: Healthcare Settings,Remind Before,Ingatkan Sebelum
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
 DocType: Salary Component,Deduction,Potongan
 DocType: Item,Retain Sample,Kekalkan Sampel
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Masa dan Untuk Masa adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbezaan
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
 DocType: Territory,Classification of Customers by region,Pengelasan Pelanggan mengikut wilayah
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Dalam Pengeluaran
@@ -2578,8 +2589,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dikira-kira Penyata Bank
 DocType: Normal Test Template,Normal Test Template,Templat Ujian Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna orang kurang upaya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Sebut Harga
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Tidak dapat menetapkan RFQ yang diterima untuk Tiada Kata Sebut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Sebut Harga
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Tidak dapat menetapkan RFQ yang diterima untuk Tiada Kata Sebut
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Pilih akaun untuk mencetak dalam mata wang akaun
@@ -2587,7 +2598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ini berdasarkan urus niaga terhadap Pesakit ini. Lihat garis masa di bawah untuk maklumat lanjut
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kos Dikemaskini
 DocType: Patient,Date of Birth,Tarikh Lahir
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Perkara {0} telah kembali
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Perkara {0} telah kembali
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Persediaan Kad Scorecard Pembekal
@@ -2598,14 +2609,15 @@
 DocType: Work Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Penerangan mengenai Jawatan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Penerangan mengenai Jawatan
 DocType: Student Applicant,Applied,Applied
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Buka semula
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Buka semula
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty seperti Saham UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nama Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Diskaun Jualan 02-Diskaun
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Simpan Track Kempen Jualan. Jejaki Leads, Sebut Harga, Pesanan Jualan dan lain-lain daripada kempen untuk mengukur Pulangan atas Pelaburan."
+DocType: Department Approver,Approver,Pelulus
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Bidang Kepada Pemegang Saham tidak boleh kosong
 DocType: Guardian,Work Address,kerja Alamat
@@ -2619,21 +2631,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Jumlah Peruntukan (Syarikat Mata Wang)
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
 DocType: BOM,Scrap Material Cost,Kos Scrap Material
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
 DocType: Grant Application,Email Notification Sent,Pemberitahuan E-mel Dihantar
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Perkataan (Syarikat mata wang)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kod Perkara, gudang, kuantiti diperlukan pada baris"
-DocType: Pricing Rule,Supplier,Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kod Perkara, gudang, kuantiti diperlukan pada baris"
+DocType: Bank Guarantee,Supplier,Pembekal
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Tunjukkan Butiran Pembayaran
 DocType: Consultation,Consultation Time,Masa Perundingan
 DocType: C-Form,Quarter,Suku
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Perbelanjaan Pelbagai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Perbelanjaan Pelbagai
 DocType: Global Defaults,Default Company,Syarikat Default
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Perbelanjaan atau akaun perbezaan adalah wajib bagi Perkara {0} kerana ia kesan nilai saham keseluruhan
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Di atas
-DocType: Employee Loan,Employee Loan Account,Akaun Pinjaman pekerja
 DocType: Leave Application,Total Leave Days,Jumlah Hari Cuti
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: Email tidak akan dihantar kepada pengguna kurang upaya
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Bilangan Interaksi
@@ -2649,7 +2660,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Berat (Dalam Kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",cuti / bab_name meninggalkan kosong secara automatik selepas menyimpan bab.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Sila tetapkan Akaun GST dalam Tetapan CBP
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Sila tetapkan Akaun GST dalam Tetapan CBP
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Jenis perniagaan
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kos Pembelian New
@@ -2658,12 +2669,13 @@
 DocType: Grant Application,Grant Description,Pemberian Geran
 DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
 DocType: Student Guardian,Others,Lain
+DocType: Subscription,Discounts,Diskaun
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak diperuntukkan
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Cukai dan Caj
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Satu Produk atau Perkhidmatan yang dibeli, dijual atau disimpan dalam stok."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Tiada lagi kemas kini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ini merangkumi semua kad skor yang terikat pada Persediaan ini
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kanak-kanak Item tidak seharusnya menjadi Fail Produk. Sila keluarkan item `{0}` dan menyelamatkan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Perbankan
@@ -2672,21 +2684,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Sila klik pada &#39;Menjana Jadual&#39; untuk mendapatkan jadual
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
 DocType: Grading Scale,Grading Scale Intervals,Selang Grading Skala
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Keuntungan untuk tahun ini
+DocType: Bank Guarantee,Name of Bank,Nama Bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kemasukan Perakaunan untuk {2} hanya boleh dibuat dalam mata wang: {3}
 DocType: Fee Schedule,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskaun
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tree akaun kewangan.
+DocType: Bank Guarantee,Reference Document Type,Rujukan Jenis Dokumen
 DocType: Cash Flow Mapping,Cash Flow Mapping,Pemetaan Aliran Tunai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
 DocType: Account,Fixed Asset,Aset Tetap
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventori bersiri
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mel tidak dijumpai dalam hubungan lalai
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Menjana Rahsia
-DocType: Employee Loan,Account Info,Maklumat akaun
+DocType: Loan,Account Info,Maklumat akaun
 DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
 DocType: Fees,Include Payment,Termasuk Pembayaran
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Kumpulan Pelajar diwujudkan.
@@ -2694,24 +2709,24 @@
 DocType: Sales Invoice,Total Billing Amount,Jumlah Bil
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program dalam Struktur Yuran dan Kumpulan Pelajar {0} adalah berbeza.
 DocType: Fee Schedule,Receivable Account,Akaun Belum Terima
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Baki saham
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Perintah Jualan kepada Pembayaran
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Ketua Pegawai Eksekutif
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Ketua Pegawai Eksekutif
 DocType: Purchase Invoice,With Payment of Tax,Dengan Pembayaran Cukai
 DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tiga salinan BAGI PEMBEKAL
 DocType: Land Unit,Is Container,Adakah Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ini akan menjadi hari 1 kitaran tanaman
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Sila pilih akaun yang betul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Sila pilih akaun yang betul
 DocType: Purchase Invoice Item,Weight UOM,Berat UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Senarai Pemegang Saham yang tersedia dengan nombor folio
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji pekerja
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Tunjukkan Atribut Variasi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Tunjukkan Atribut Variasi
 DocType: Student,Blood Group,Kumpulan Darah
 DocType: Course,Course Name,Nama kursus
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang boleh meluluskan permohonan cuti kakitangan yang khusus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Peralatan Pejabat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Peralatan Pejabat
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Syarikat
 DocType: Supplier Scorecard,Scoring Setup,Persediaan Pemarkahan
@@ -2730,7 +2745,7 @@
 DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Pembelian Senarai Harga
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templat pemboleh ubah kad skor pembekal.
 DocType: Job Offer Term,Offer Term,Tawaran Jangka
 DocType: Asset,Quality Manager,Pengurus Kualiti
@@ -2742,13 +2757,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Jumlah belum dibayar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operasi laman web
 DocType: Supplier Scorecard,Supplier Score,Skor Pembekal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Jumlah invois AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Jumlah invois AMT
 DocType: Supplier,Warn RFQs,Amaran RFQs
 DocType: BOM,Conversion Rate,Kadar penukaran
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cari produk
 DocType: Assessment Plan,To Time,Untuk Masa
 DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
+DocType: Loan,Total Amount Paid,Jumlah Amaun Dibayar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Sila pilih Kemasukan Pelajar yang wajib bagi pemohon pelajar berbayar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Sila pilih Senarai Harga untuk menerbitkan harga
@@ -2758,19 +2774,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Bidang Qty tidak boleh lebih daripada {1} untuk operasi {2}
 DocType: Manufacturing Settings,Allow Overtime,Benarkan kerja lebih masa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Perkara bersiri {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sila gunakan Kemasukan Stock"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Perkara bersiri {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sila gunakan Kemasukan Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Perkara bersiri {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sila gunakan Kemasukan Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Perkara bersiri {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sila gunakan Kemasukan Stock"
 DocType: Training Event Employee,Training Event Employee,Training Event pekerja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Sampel Maksimum - {0} boleh dikekalkan untuk Batch {1} dan Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Tambah Slot Masa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Kadar Penilaian semasa
 DocType: Training Event,Advance,Advance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,untuk membuat ulang berulang.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Tetapan gerbang pembayaran GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Keuntungan / Kerugian
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Keuntungan / Kerugian
 DocType: Opportunity,Lost Reason,Hilang Akal
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akaun {1} tidak tergolong dalam syarikat {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akaun {1} tidak tergolong dalam syarikat {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Tidak dapat mencari DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
@@ -2789,7 +2804,6 @@
 DocType: Bin,Actual Quantity,Kuantiti sebenar
 DocType: Shipping Rule,example: Next Day Shipping,contoh: Penghantaran Hari Seterusnya
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,No siri {0} tidak dijumpai
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Langganan telah {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program Jadual Bayaran
 DocType: Fee Schedule Program,Student Batch,Batch pelajar
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Buat Pelajar
@@ -2805,14 +2819,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,GSTIN E-dagang
 DocType: Sales Order,Not Delivered,Tidak Dihantar
 ,Bank Clearance Summary,Bank Clearance Ringkasan
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Matlamat
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Cadangkan Kategori?
 DocType: Stock Reconciliation Item,Current Amount,Jumlah Semasa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,bangunan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,bangunan
 DocType: Fee Schedule,Fee Structure,Struktur Bayaran
 DocType: Timesheet Detail,Costing Amount,Jumlah berharga
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 DocType: Student Admission Program,Application Fee,Bayaran permohonan
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Hantar Slip Gaji
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
@@ -2820,12 +2833,13 @@
 DocType: Sales Partner,Address & Contacts,Alamat Kenalan
 DocType: SMS Log,Sender Name,Nama Pengirim
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriteria Analisis Pertanian
+DocType: HR Settings,Leave Approval Notification Template,Tinggalkan Templat Pemberitahuan Kelulusan
 DocType: POS Profile,[Select],[Pilih]
 DocType: Vital Signs,Blood Pressure (diastolic),Tekanan Darah (diastolik)
 DocType: SMS Log,Sent To,Dihantar Kepada
 DocType: Agriculture Task,Holiday Management,Pengurusan Percutian
 DocType: Payment Request,Make Sales Invoice,Buat Jualan Invois
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
 DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Doktor {0} tidak boleh didapati di {1}
@@ -2843,7 +2857,7 @@
 DocType: Employee,New Workplace,New Tempat Kerja
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Penggunaan Bahan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ditetapkan sebagai Ditutup
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No Perkara dengan Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No Perkara dengan Barcode {0}
 DocType: Normal Test Items,Require Result Value,Memerlukan Nilai Hasil
 DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2858,19 +2872,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Tiada Struktur aktif atau Gaji lalai dijumpai untuk pekerja {0} pada tarikh yang diberikan
 DocType: Leave Block List,Allow Users,Benarkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Pelanggan Bimbit
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Berulang
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Butiran Templat Pemetaan Aliran Tunai
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Pengurusan Pinjaman
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jejaki Pendapatan berasingan dan Perbelanjaan untuk menegak produk atau bahagian.
 DocType: Rename Tool,Rename Tool,Nama semula Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update Kos
 DocType: Item Reorder,Item Reorder,Perkara Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Show Slip Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Show Slip Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Pemindahan Bahan
 DocType: Fees,Send Payment Request,Hantar Permintaan Bayaran
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
 DocType: Water Analysis,Origin,Asal
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Pilih perubahan kira jumlah
 DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
 DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
@@ -2885,14 +2899,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Kewajipan Cukai Pendapatan
 DocType: Grading Scale Interval,Grade Description,gred Penerangan
 DocType: Stock Entry,Purchase Receipt No,Resit Pembelian No
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Wang Earnest
 DocType: Sales Invoice, Shipping Bill Number,Nombor Bil Pengiriman
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,kebolehkesanan
 DocType: Asset Maintenance Log,Actions performed,Tindakan dilakukan
 DocType: Cash Flow Mapper,Section Leader,Bahagian Pemimpin
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Pekerja
+DocType: Bank Guarantee,Fixed Deposit Number,Nombor Deposit Tetap
 DocType: Asset Repair,Failure Date,Tarikh Kegagalan
 DocType: Sample Collection,Collected Time,Masa Dikumpul
 DocType: Company,Sales Monthly History,Sejarah Bulanan Jualan
@@ -2909,10 +2924,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Adakah anda pasti ingin membatalkan janji temu ini?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakej Harga Bilik Hotel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline jualan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Mengambil Update Langganan
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akaun {0} tidak sepadan dengan Syarikat {1} dalam Kaedah akaun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursus:
@@ -2922,7 +2938,7 @@
 DocType: Notification Control,Expense Claim Approved,Perbelanjaan Tuntutan Diluluskan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Tiada Perintah Kerja dibuat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip gaji pekerja {0} telah dicipta untuk tempoh ini
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
 DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
@@ -2940,7 +2956,7 @@
 DocType: Request for Quotation Supplier,No Quote,No Quote
 DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
 DocType: Payment Gateway Account,Payment Account,Akaun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Pampasan Off
 DocType: Job Offer,Accepted,Diterima
@@ -2953,7 +2969,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sila pastikan anda benar-benar ingin memadam semua urus niaga bagi syarikat ini. Data induk anda akan kekal kerana ia adalah. Tindakan ini tidak boleh dibuat asal.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Keputusan Carian
 DocType: Room,Room Number,Nombor bilik
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Rujukan tidak sah {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Rujukan tidak sah {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
 DocType: Journal Entry Account,Payroll Entry,Kemasukan Payroll
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Lihat Rekod Bayaran
@@ -2963,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Lab Test Sample,Lab Test Sample,Sampel Ujian Makmal
 DocType: Item Variant Settings,Allow Rename Attribute Value,Benarkan Namakan Nilai Atribut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
 DocType: Restaurant,Invoice Series Prefix,Awalan Siri Invois
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
@@ -2971,8 +2987,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Penyepaduan Peta Google tidak didayakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} tidak diserahkan
+DocType: Subscription,Trialling,Menguji
 DocType: Member,Membership Expiry Date,Keahlian Tarikh Luput
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} mesti negatif dalam dokumen pulangan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} mesti negatif dalam dokumen pulangan
 ,Minutes to First Response for Issues,Minit ke Response Pertama untuk Isu
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
@@ -2991,7 +3008,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unit Tindakan
 DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
 DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Peluang
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Peluang
 DocType: Operation,Default Workstation,Workstation Default
 DocType: Notification Control,Expense Claim Approved Message,Mesej perbelanjaan Tuntutan Diluluskan
 DocType: Payment Entry,Deductions or Loss,Potongan atau Kehilangan
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Cuti Tanpa Gaji tidak sepadan dengan rekod Cuti Permohonan diluluskan
 DocType: Campaign,Campaign-.####,Kempen -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah seterusnya
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
 DocType: Membership,USD,Dolar Amerika
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Buat Invois
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Baki yang tinggal
@@ -3039,7 +3056,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
 DocType: Driver,Driver,Pemandu
 DocType: Vital Signs,Nutrition Values,Nilai pemakanan
 DocType: Lab Test Template,Is billable,Boleh ditebus
@@ -3050,7 +3067,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Tarikh Mula Sebenar (melalui Lembaran Time)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Range Penuaan 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Jumlah pendahuluan tidak boleh melebihi jumlah yang dituntut
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Jumlah pendahuluan tidak boleh melebihi jumlah yang dituntut
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3085,7 +3102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Pilih Nilai Atribut
 DocType: Purchase Invoice,Reason For Issuing document,Sebab Pembuat dokumen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
 DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Seterusnya Hubungi Dengan tidak boleh menjadi sama seperti Alamat E-mel Lead
 DocType: Tax Rule,Billing City,Bandar Bil
@@ -3102,7 +3119,8 @@
 DocType: Warranty Claim,Service Address,Alamat Perkhidmatan
 DocType: Asset Maintenance Task,Calibration,Penentukuran
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} adalah percutian syarikat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Perabot dan Fixtures
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Tinggalkan Pemberitahuan Status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Perabot dan Fixtures
 DocType: Item,Manufacture,Pembuatan
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Persediaan Syarikat
 ,Lab Test Report,Laporan Ujian Makmal
@@ -3118,7 +3136,6 @@
 DocType: Crop,Planting Area,Kawasan Penanaman
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
 DocType: Installation Note Item,Installed Qty,Dipasang Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ini mungkin disebabkan oleh beberapa Alamat E-mel tidak sah di
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Anda tambah
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Keputusan latihan
@@ -3128,16 +3145,17 @@
 DocType: Products Settings,Products per Page,Produk setiap halaman
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Master cawangan organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,atau
 DocType: Sales Order,Billing Status,Bil Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Perbelanjaan utiliti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Perbelanjaan utiliti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Ke atas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Kemasukan {1} tidak mempunyai akaun {2} atau sudah dipadankan dengan baucar lain
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Berat
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Berikan Pemberitahuan Kelulusan
 DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kadar Beli
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Kadar Beli
 DocType: Notification Control,Sales Order Message,Pesanan Jualan Mesej
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nilai Default Tetapkan seperti Syarikat, mata wang, fiskal semasa Tahun, dan lain-lain"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
@@ -3160,6 +3178,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Troli membeli-belah Tetapan
 DocType: Journal Entry,Accounting Entries,Catatan Perakaunan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika Peraturan Harga yang dipilih dibuat untuk &#39;Rate&#39;, ia akan menimpa Senarai Harga. Kadar penetapan harga adalah kadar terakhir, jadi tiada lagi diskaun yang perlu dikenakan. Oleh itu, dalam urus niaga seperti Perintah Jualan, Pesanan Pembelian dan lain-lain, ia akan diambil dalam medan &#39;Rate&#39;, bukannya &#39;Bidang Senarai Harga&#39;."
+DocType: Journal Entry,Paid Loan,Pinjaman Berbayar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Salinan Entry. Sila semak Kebenaran Peraturan {0}
 DocType: Journal Entry Account,Reference Due Date,Tarikh Disebabkan Rujukan
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3176,7 +3195,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
 ,To Produce,Hasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
 DocType: Patient Service Unit,Parent Service Unit,Unit Perkhidmatan Ibu Bapa
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Buat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Pengenalan pakej untuk penghantaran (untuk cetak)
@@ -3195,7 +3214,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Akaun Pendapatan
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Penghantaran
 DocType: Volunteer,Weekdays,Harijadi
 DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
 DocType: Restaurant Menu,Restaurant Menu,Menu Restoran
@@ -3203,7 +3222,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Menetapkan akaun inventori lalai untuk inventori yang berterusan
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Menetapkan akaun inventori lalai untuk inventori yang berterusan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Hantar E-mel Semakan Hibah
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyelamatkan"
@@ -3211,10 +3230,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapasiti Bilik
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Sudah ada rekod untuk item {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Anda akan kehilangan rekod invois yang dijana sebelum ini. Adakah anda pasti mahu memulakan semula langganan ini?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Yuran pendaftaran
 DocType: Budget,Cost Center,PTJ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Baucer #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Baucer #
 DocType: Notification Control,Purchase Order Message,Membeli Pesanan Mesej
 DocType: Tax Rule,Shipping Country,Penghantaran Negara
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Menyembunyikan Id Cukai Pelanggan dari Transaksi Jualan
@@ -3223,20 +3243,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Peraturan Harga dibuat untuk menulis ganti Senarai Harga / menentukan peratusan diskaun, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya boleh ditukar melalui Saham Entry / Penghantaran Nota / Resit Pembelian
 DocType: Employee Education,Class / Percentage,Kelas / Peratus
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Cukai Pendapatan
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Pergi ke Letterheads
+DocType: Subscription,Cancel At End Of Period,Batalkan Pada Akhir Tempoh
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Tiada Item yang dipilih untuk dipindahkan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Tiada Item yang dipilih untuk dipindahkan
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Kemajuan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Keuntungan / Kerugian daripada Pelupusan Aset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Keuntungan / Kerugian daripada Pelupusan Aset
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Hanya Pemohon Pelajar dengan status &quot;Diluluskan&quot; akan dipilih dalam jadual di bawah.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Nombor akaun untuk akaun {0} tidak tersedia. <br> Sila persiapkan Carta Akaun anda dengan betul.
 DocType: Task,Depends on Tasks,Bergantung kepada Tugas
@@ -3251,6 +3272,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Tidak dalam Saham
 DocType: Volunteer,Volunteer Skills,Kemahiran Sukarelawan
 DocType: Appraisal,HR User,HR pengguna
+DocType: Bank Guarantee,Reference Document Name,Nama Dokumen Rujukan
 DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
 apps/erpnext/erpnext/hooks.py +142,Issues,Isu-isu
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mestilah salah seorang daripada {0}
@@ -3264,7 +3286,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} dilumpuhkan
 DocType: Supplier,Billing Currency,Bil Mata Wang
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Lebih Besar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Lebih Besar
+DocType: Loan,Loan Application,Permohonan Pinjaman
 DocType: Crop,Scientific Name,Nama saintifik
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Jumlah Daun
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Pilih semula, jika kenalan yang dipilih diedit selepas disimpan"
@@ -3273,13 +3296,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Nombor Cek
 ,Sales Browser,Jualan Pelayar
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Tempatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Besar
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage produk yang ditampilkan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Semua Kumpulan Penilaian
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Semua Kumpulan Penilaian
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nama Warehouse New
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Jumlah {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
@@ -3300,9 +3323,10 @@
 DocType: Fees,Fees,yuran
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nyatakan Kadar Pertukaran untuk menukar satu matawang kepada yang lain
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Sebut Harga {0} dibatalkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Jumlah Cemerlang
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Jumlah Cemerlang
 DocType: Sales Partner,Targets,Sasaran
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Sila daftar nombor SIREN dalam fail maklumat syarikat
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Price List,Price List Master,Senarai Harga Master
 DocType: GST Account,CESS Account,Akaun CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
@@ -3311,6 +3335,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Pilih Pesakit
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nama Parameter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; dan &#39;Telah&#39; boleh dikemukakan
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Pelajar Kumpulan Nama adalah wajib berturut-turut {0}
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan dipaparkan pada laman web utama
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ini adalah kumpulan pelanggan akar dan tidak boleh diedit.
@@ -3344,14 +3369,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Invois telah dibuat untuk semua jam pengebilan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ralat Nama: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Adakah Kos Kewangan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Sila tetapkan pelanggan lalai dalam Tetapan Restoran
 ,Salary Register,gaji Daftar
 DocType: Warehouse,Parent Warehouse,Warehouse Ibu Bapa
-DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
+DocType: Subscription,Net Total,Jumlah bersih
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Lalai BOM tidak dijumpai untuk Perkara {0} dan Projek {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Tentukan pelbagai jenis pinjaman
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Tentukan pelbagai jenis pinjaman
 DocType: Bin,FCFS Rate,Kadar FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Jumlah yang tertunggak
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Masa (dalam minit)
@@ -3383,11 +3408,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Akaun root mestilah kumpulan
 DocType: Drug Prescription,Drug Prescription,Preskripsi Dadah
 DocType: Fees,FEE.,BAYARAN.
-DocType: Employee Loan,Repaid/Closed,Dibayar balik / Ditutup
+DocType: Loan,Repaid/Closed,Dibayar balik / Ditutup
 DocType: Item,Total Projected Qty,Jumlah unjuran Qty
 DocType: Monthly Distribution,Distribution Name,Nama pengedaran
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kadar penilaian tidak dijumpai untuk Item {0}, yang diperlukan untuk melakukan penyertaan perakaunan untuk {1} {2}. Sekiranya item tersebut berurusniaga sebagai item kadar penilaian sifar dalam {1}, nyatakan di dalam jadual {1} Item. Jika tidak, sila buat urus niaga saham yang masuk untuk item tersebut atau sebutkan kadar penilaian dalam rekod Item, dan kemudian cuba menyerahkan / membatalkan entri ini"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 DocType: Course,Course Code,Kod kursus
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
 DocType: POS Settings,Use POS in Offline Mode,Gunakan POS dalam Mod Luar Talian
@@ -3407,16 +3431,15 @@
 DocType: Purchase Invoice,Deemed Export,Dianggap Eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
-DocType: Subscription,Half-yearly,Setengah tahun
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Lab Test,LabTest Approver,Penyertaan LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Anda telah pun dinilai untuk kriteria penilaian {}.
 DocType: Vehicle Service,Engine Oil,Minyak enjin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Perintah Kerja Dibuat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Perintah Kerja Dibuat: {0}
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
-DocType: Employee Loan,Loan Details,Butiran pinjaman
+DocType: Loan,Loan Details,Butiran pinjaman
 DocType: Company,Default Inventory Account,Akaun Inventori lalai
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Nombor folio tidak sepadan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
@@ -3428,19 +3451,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Pautan kepada semua Unit Tanah di mana Tanaman semakin berkembang
 DocType: Account,Root Type,Jenis akar
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
 DocType: Item Group,Show this slideshow at the top of the page,Menunjukkan tayangan gambar ini di bahagian atas halaman
 DocType: BOM,Item UOM,Perkara UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Amaun Cukai Selepas Jumlah Diskaun (Syarikat mata wang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
 DocType: Cheque Print Template,Primary Settings,Tetapan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Tambahkan Pekerja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Tambahkan Pekerja
 DocType: Purchase Invoice Item,Quality Inspection,Pemeriksaan Kualiti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Tambahan Kecil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Tambahan Kecil
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akaun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
 DocType: Payment Request,Mute Email,Senyapkan E-mel
@@ -3460,11 +3483,10 @@
 DocType: SMS Log,No of Sent SMS,Bilangan SMS dihantar
 DocType: Antibiotic,Healthcare Administrator,Pentadbir Kesihatan
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Tetapkan Sasaran
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Dosage Strength,Dosage Strength,Kekuatan Dos
 DocType: Account,Expense Account,Akaun Perbelanjaan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Perisian
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Warna
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Penilaian Pelan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Tarikh luput wajib untuk item yang dipilih
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Cegah Pesanan Pembelian
@@ -3477,18 +3499,18 @@
 DocType: Patient,Personal and Social History,Sejarah Peribadi dan Sosial
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Pengguna {0} dibuat
 DocType: Fee Schedule,Fee Breakup for each student,Breakout Fee untuk setiap pelajar
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Pengagihan Bulanan untuk tidak sekata mengedarkan sasaran seluruh bulan.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Tukar Kod
 DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Senarai harga mata wang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Senarai harga mata wang tidak dipilih
 DocType: Purchase Invoice,Availed ITC Cess,Berkhidmat ITC Cess
 ,Student Monthly Attendance Sheet,Pelajar Lembaran Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Peraturan penghantaran hanya terpakai untuk Jualan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Sehingga
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Sehingga
 DocType: Rename Tool,Rename Log,Log menamakan semula
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Kumpulan pelajar atau Jadual Kursus adalah wajib
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Kumpulan pelajar atau Jadual Kursus adalah wajib
@@ -3509,7 +3531,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Senaraikan produk atau perkhidmatan anda yang anda beli atau jual.
 DocType: Water Analysis,Storage Temperature,Suhu Penyimpanan
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran yang dinyahtandakan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Penyelidik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Penyelidik
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Pendaftaran Tool Pelajar
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Tarikh mula harus kurang dari tarikh tamat untuk tugas {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nama atau E-mel adalah wajib
@@ -3522,7 +3544,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Kedudukan Pembekal Kad Pengeluar, dan RFQ untuk pembekal ini perlu dikeluarkan dengan berhati-hati."
 DocType: Chapter,Non Profit Manager,Pengurus Bukan Untung
 DocType: BOM,Total Cost(Company Currency),Jumlah Kos (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,No siri {0} dicipta
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,No siri {0} dicipta
 DocType: Homepage,Company Description for website homepage,Penerangan Syarikat untuk laman web laman utama
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama Suplier
@@ -3532,11 +3554,10 @@
 DocType: Employee,You can enter any date manually,Anda boleh memasuki mana-mana tarikh secara manual
 DocType: Healthcare Settings,Result Printed,Hasil Dicetak
 DocType: Asset Category Account,Depreciation Expense Account,Akaun Susut Perbelanjaan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Tempoh Percubaan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Lihat {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Tempoh Percubaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya nod daun dibenarkan dalam urus niaga
 DocType: Project,Total Costing Amount (via Timesheets),Jumlah Kos Jumlah (melalui Timesheet)
-DocType: Employee Advance,Expense Approver,Perbelanjaan Pelulus
+DocType: Department,Expense Approver,Perbelanjaan Pelulus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
 DocType: Project,Hourly,Jam
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group untuk Kumpulan
@@ -3546,7 +3567,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Buat Pembayaran melalui Journal Kemasukan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Printed On
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pemeriksaan yang diperlukan sebelum penghantaran
 DocType: Item,Inspection Required before Purchase,Pemeriksaan yang diperlukan sebelum Pembelian
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Sementara menunggu Aktiviti
@@ -3556,7 +3577,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Kuantiti Pesanan Minima
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Organisasi anda
 DocType: Fee Component,Fees Category,yuran Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Sila masukkan tarikh melegakan.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Sila masukkan tarikh melegakan.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,Memberitahu Pekerja
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kempen jika sumber siasatan adalah kempen
@@ -3566,7 +3587,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Pesanan semula Level
 DocType: Company,Chart Of Accounts Template,Carta Of Akaun Template
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Diterima
@@ -3574,10 +3595,11 @@
 DocType: Item,Valuation Method,Kaedah Penilaian
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Day Half
 DocType: Sales Invoice,Sales Team,Pasukan Jualan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Entri pendua
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entri pendua
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Masukkan nama Benefisiari sebelum diserahkan.
 DocType: Program Enrollment Tool,Get Students,Dapatkan Pelajar
 DocType: Serial No,Under Warranty,Di bawah Waranti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Ralat]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Ralat]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Perintah Jualan.
 ,Employee Birthday,Pekerja Hari Lahir
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Sila pilih Tarikh Siap untuk Pembaikan yang Siap
@@ -3596,7 +3618,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Dikhaskan untuk sub contracting
 DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
 DocType: Shopping Cart Settings,Orders,Pesanan
-DocType: Employee Leave Approver,Leave Approver,Tinggalkan Pelulus
+DocType: Department,Leave Approver,Tinggalkan Pelulus
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Sila pilih satu kelompok
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nama Kumpulan Penilaian
@@ -3641,7 +3663,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Item yang Diacak Hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL UNTUK RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,E-mel ini autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
 DocType: Program Enrollment,Boarding Student,Boarding Pelajar
 DocType: Asset,Expected Value After Useful Life,Nilai dijangka After Life Berguna
@@ -3666,22 +3687,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Kehadiran Rekod {0} wujud terhadap Pelajar {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Susut nilai atau penyingkiran kerana pelupusan aset
-DocType: Member,Member,Ahli
+DocType: Loan,Member,Ahli
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Mengurus Alamat
 DocType: Work Order Item,Work Order Item,Item Pesanan Kerja
 DocType: Pricing Rule,Item Code,Kod Item
 DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Pengurus Pertanian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
 DocType: Supplier Scorecard Period,Variables,Pembolehubah
 DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Saiz Cek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,No siri {0} tidak dalam stok
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,No siri {0} tidak dalam stok
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
 DocType: Sales Invoice,Write Off Outstanding Amount,Tulis Off Cemerlang Jumlah
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Akaun {0} tidak sepadan dengan Syarikat {1}
@@ -3690,7 +3711,6 @@
 DocType: Stock Settings,Default Stock UOM,Default Saham UOM
 DocType: Asset,Number of Depreciations Booked,Jumlah penurunan nilai Ditempah
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Jumlah Qty
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Terhadap pinjaman pekerja: {0}
 DocType: Landed Cost Item,Receipt Document,Dokumen penerimaan
 DocType: Employee Education,School/University,Sekolah / Universiti
 DocType: Payment Request,Reference Details,Rujukan Butiran
@@ -3701,7 +3721,7 @@
 DocType: Asset,Double Declining Balance,Baki Penurunan Double
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,perintah tertutup tidak boleh dibatalkan. Unclose untuk membatalkan.
 DocType: Student Guardian,Father,Bapa
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
 DocType: Attendance,On Leave,Bercuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
@@ -3715,10 +3735,10 @@
 DocType: Lead,Lower Income,Pendapatan yang lebih rendah
 DocType: Restaurant Order Entry,Current Order,Perintah Semasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Sumber dan sasaran gudang tidak boleh sama berturut-turut untuk {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Pergi ke Program
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah yang diperuntukkan {1} tidak boleh melebihi jumlah yang tidak dituntut {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah yang diperuntukkan {1} tidak boleh melebihi jumlah yang tidak dituntut {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
@@ -3741,7 +3761,6 @@
 DocType: Payment Terms Template,Payment Terms,Terma pembayaran
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Saat
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Pergi ke Pembekal
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Jadual Penyelenggaraan
 DocType: Sales Order,%  Delivered,% Dihantar
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Sila tetapkan ID E-mel untuk Pelajar untuk menghantar Permintaan Pembayaran
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Sila tetapkan ID E-mel untuk Pelajar untuk menghantar Permintaan Pembayaran
 DocType: Patient,Medical History,Sejarah perubatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Akaun Overdraf bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Akaun Overdraf bank
 DocType: Patient,Patient ID,ID pesakit
 DocType: Physician Schedule,Schedule Name,Nama Jadual
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Membuat Slip Gaji
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Tambah Semua Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Tambah Semua Pembekal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Jumlah Diperuntukkan tidak boleh lebih besar daripada jumlah tertunggak.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Browse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Pinjaman Bercagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Pinjaman Bercagar
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Tarikh Posting dan Masa
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Sila menetapkan Akaun berkaitan Susutnilai dalam Kategori Asset {0} atau Syarikat {1}
 DocType: Lab Test Groups,Normal Range,Julat Normal
 DocType: Academic Term,Academic Year,Tahun akademik
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Jualan Sedia Ada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Pembukaan Ekuiti Baki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Pembukaan Ekuiti Baki
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,baki
 DocType: Appraisal,Appraisal,Penilaian
+DocType: Loan,Loan Account,Akaun Pinjaman
 DocType: Purchase Invoice,GST Details,Butiran GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mel dihantar kepada pembekal {0}
 DocType: Item,Default Sales Unit of Measure,Unit Jualan Kesilapan
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Tahun akademik:
+DocType: Subscription,Past Due Date,Tarikh Tamat Tempoh
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Tidak membenarkan menetapkan item alternatif untuk item {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarikh diulang
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,Pelantikan Pesakit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Meluluskan Peranan tidak boleh sama dengan peranan peraturan adalah Terpakai Untuk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Dapatkan Pembekal Oleh
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Dapatkan Pembekal Oleh
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} tidak dijumpai untuk Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Pergi ke Kursus
 DocType: Accounts Settings,Show Inclusive Tax In Print,Tunjukkan Cukai Dalam Cetakan Termasuk
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesej dihantar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Akaun dengan nod kanak-kanak tidak boleh ditetapkan sebagai lejar
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas pelanggan
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Syarikat mata wang)
 DocType: Physician,Physician Schedules,Jadual Perubatan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Jumlah jumlah pendahuluan tidak boleh lebih besar dari jumlah jumlah yang dibenarkan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Jumlah jumlah pendahuluan tidak boleh lebih besar dari jumlah jumlah yang dibenarkan
 DocType: Salary Slip,Hour Rate,Kadar jam
 DocType: Stock Settings,Item Naming By,Perkara Menamakan Dengan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Satu lagi Entry Tempoh Penutup {0} telah dibuat selepas {1}
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
 DocType: BOM,Inspection Required,Pemeriksaan Diperlukan
 DocType: Purchase Invoice Item,PR Detail,Detail PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Masukkan Nombor Jaminan Bank sebelum menyerahkan.
 DocType: Driving License Category,Class,Kelas
 DocType: Sales Order,Fully Billed,Membilkan sepenuhnya
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Perintah Kerja tidak boleh dibangkitkan terhadap Template Item
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kasar pakej. Biasanya berat bersih + pembungkusan berat badan yang ketara. (Untuk cetak)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
 DocType: Student Group,Group Based On,Pada Based Group
 DocType: Student Group,Group Based On,Pada Based Group
@@ -3848,9 +3870,10 @@
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Butiran Pembekal
 DocType: Setup Progress,Setup Progress,Kemajuan Persediaan
+DocType: Expense Claim,Approval Status,Kelulusan Status
 DocType: Hub Settings,Publish Items to Hub,Menerbitkan item untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Memeriksa semua
 ,Issued Items Against Work Order,Item Terbitan Terhadap Perintah Kerja
 DocType: Vehicle Log,Invoice Ref,invois Ref
@@ -3881,12 +3904,11 @@
 DocType: Customs Tariff Number,Tariff Number,Nombor tarif
 DocType: Work Order Item,Available Qty at WIP Warehouse,Ada Qty di WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Unjuran
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
 DocType: Notification Control,Quotation Message,Sebut Harga Mesej
-DocType: Employee Loan,Employee Loan Application,Permohonan Pinjaman pekerja
 DocType: Issue,Opening Date,Tarikh pembukaan
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Sila simpan pesakit terlebih dahulu
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Sila simpan pesakit terlebih dahulu
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Kehadiran telah ditandakan dengan jayanya.
 DocType: Program Enrollment,Public Transport,Pengangkutan awam
 DocType: Soil Texture,Silt Composition (%),Komposisi lumpur (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),Baki Item (Mudah)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
 DocType: POS Profile,Write Off Account,Tulis Off Akaun
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota Debit AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota Debit AMT
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Jumlah diskaun
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Invois Belian
 DocType: Item,Warranty Period (in days),Tempoh jaminan (dalam hari)
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Pesanan Jualan Tarikh
 DocType: Sales Invoice Item,Delivered Qty,Dihantar Qty
 DocType: Assessment Plan,Assessment Plan,Rancangan penilaian
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Kemasukan Jurnal Terbalik
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat.
 DocType: Stock Settings,Limit Percent,had Peratus
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tidak ada stok sedia ada di mana-mana gudang
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,Saham Entry
 DocType: Payment Entry,Payment References,Rujukan pembayaran
 DocType: C-Form,C-FORM-,C-yang-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Bilangan selang untuk medan jarak contohnya jika Selang ialah &#39;Hari&#39; dan Pengiraan Interval Pengebilan ialah 3, invois akan dihasilkan setiap 3 hari"
 DocType: Vehicle,Insurance Details,Butiran Insurance
 DocType: Account,Payable,Kena dibayar
 DocType: Share Balance,Share Type,Jenis Kongsi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Penghutang ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Keuntungan kasar%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Keuntungan kasar%
 DocType: Appraisal Goal,Weightage (%),Wajaran (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Tukar Profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Alamat Deskripsi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Parti adalah wajib
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Baris dengan pendua tarikh akhir pada baris lain telah dijumpai: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Baris dengan pendua tarikh akhir pada baris lain telah dijumpai: {list}
 DocType: Topic,Topic Name,Topic Nama
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Sila tetapkan templat lalai untuk Pemberitahuan Kelulusan Cuti dalam Tetapan HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Pilih pekerja untuk mendapatkan pekerja terlebih dahulu.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Pilih pekerja untuk mendapatkan pekerja terlebih dahulu.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Sila pilih Tarikh yang sah
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Pilih jenis perniagaan anda.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Tarikh pemasangan
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Kongsi Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Invois Jualan {0} dibuat
 DocType: Employee,Confirmation Date,Pengesahan Tarikh
 DocType: C-Form,Total Invoiced Amount,Jumlah Invois
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,Susut nilai terkumpul
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nama Berdiri
 DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
-DocType: Employee Loan Application,Required by Date,Diperlukan oleh Tarikh
+DocType: Loan Application,Required by Date,Diperlukan oleh Tarikh
 DocType: Lead,Lead Owner,Lead Pemilik
 DocType: Production Plan,Sales Orders Detail,Detail pesanan jualan
 DocType: Bin,Requested Quantity,diminta Kuantiti
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay kasar - Jumlah Potongan - Bayaran Balik Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Slip Gaji ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Pelbagai variasi
 DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dihantar
+DocType: Subscription,Trial Period Start Date,Tarikh Mulai Percubaan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Sila log masuk sebagai pengguna lain.
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,Guardian pelajar
 DocType: Member,Member Name,Nama ahli
 DocType: Stock Settings,Use Naming Series,Gunakan Siri Penamaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
 DocType: POS Profile,Update Stock,Update Saham
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,dalam langganan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
 DocType: Membership,Payment Details,Butiran Pembayaran
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Kadar BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Perintah Kerja Berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkannya"
 DocType: Asset,Journal Entry for Scrap,Kemasukan Jurnal untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Sila tarik item daripada Nota Penghantaran
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,Unit Tanah
 ,Purchase Analytics,Analytics Pembelian
 DocType: Sales Invoice Item,Delivery Note Item,Penghantaran Nota Perkara
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Invois semasa {0} hilang
 DocType: Asset Maintenance Log,Task,Petugas
 DocType: Purchase Taxes and Charges,Reference Row #,Rujukan Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
@@ -4063,7 +4089,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain Akaun / Kerugian
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pekerja dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Isi borang dan simpannya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Isi borang dan simpannya
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Komuniti Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,qty sebenar dalam stok
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,qty sebenar dalam stok
@@ -4078,7 +4104,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Kadar Jualan Standard
 DocType: Account,Rate at which this tax is applied,Kadar yang cukai ini dikenakan
 DocType: Cash Flow Mapper,Section Name,Nama Bahagian
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Pesanan semula Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Pesanan semula Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Lowongan Kerja Semasa
 DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Tulis Off
@@ -4089,9 +4115,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Beratur untuk mengemaskini harga terkini dalam semua Rang Undang-Undang Bahan. Ia mungkin mengambil masa beberapa minit.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akaun baru. Nota: Sila jangan membuat akaun untuk Pelanggan dan Pembekal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara lalai bijak Templat Alamat
 DocType: Water Analysis,Appearance,Rupa
+DocType: HR Settings,Leave Status Notification Template,Tinggalkan Templat Pemberitahuan Status
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Purata. Membeli Kadar Senarai Harga
 DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Maklumat ahli.
@@ -4114,7 +4140,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Tidak dibenarkan. Sila lumpuhkan Templat Ujian
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
 DocType: Crop Cycle,Linked Land Unit,Unit Tanah Berkaitan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
@@ -4130,7 +4156,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Pergi ke Pengguna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Amaun yang dibayar + Tulis Off Jumlah tidak boleh lebih besar daripada Jumlah Besar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN tidak sah atau Masukkan NA untuk tidak berdaftar
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Bayaran Pendaftaran
@@ -4146,14 +4172,14 @@
 DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat carta akaun Based On
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Tidak boleh menukarnya kepada bukan kumpulan. Tugas Kanak-kanak wujud.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
 ,Stock Ageing,Saham Penuaan
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Pelajar {0} wujud terhadap pemohon pelajar {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Pelarasan Membulat (Mata Wang Syarikat)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Kumpulan:
 DocType: Volunteer,Afternoon,Petang
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
 DocType: Cheque Print Template,Scanned Cheque,diimbas Cek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
@@ -4169,7 +4195,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projek {0} sudah wujud
 DocType: Medical Department,Nursing User,Pengguna Kejururawatan
 DocType: Plant Analysis,Plant Analysis Criterias,Kriterias Analisis Tanaman
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Tanggungjawab
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} tidak tergolong dalam Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Tanggungjawab
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tempoh sah tempoh sebut harga ini telah berakhir.
 DocType: Expense Claim Account,Expense Claim Account,Akaun Perbelanjaan Tuntutan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Benarkan Kadar Pertukaran Stale
@@ -4191,11 +4218,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Buat Variasi
 DocType: Item,Default BOM,BOM Default
 DocType: Project,Total Billed Amount (via Sales Invoices),Jumlah Amaun Dibilkan (melalui Invois Jualan)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Amaun debit Nota
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Amaun debit Nota
 DocType: Project Update,Not Updated,Tidak dikemas kini
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Terdapat ketidaksesuaian antara kadar, tiada saham dan jumlah yang dikira"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Jumlah Cemerlang AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Jumlah Cemerlang AMT
 DocType: Journal Entry,Printing Settings,Tetapan Percetakan
 DocType: Employee Advance,Advance Account,Akaun Advance
 DocType: Job Offer,Job Offer Terms,Syarat Tawaran Kerja
@@ -4204,7 +4231,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotif
 DocType: Vehicle,Insurance Company,Syarikat insurans
 DocType: Asset Category Account,Fixed Asset Account,Akaun Aset Tetap
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ubah
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ubah
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Penghantaran Nota
 DocType: Chapter,Members,Ahli
 DocType: Student,Student Email Address,Pelajar Alamat E-mel
@@ -4228,7 +4255,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Pelatih
 DocType: Delivery Stop,Address Name,alamat Nama
 DocType: Stock Entry,From BOM,Dari BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Pemisahan {0} unit {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Pemisahan {0} unit {1}
 DocType: Assessment Code,Assessment Code,Kod penilaian
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Asas
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
@@ -4236,25 +4263,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
 DocType: Bank Reconciliation Detail,Payment Document,Dokumen pembayaran
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Ralat menilai formula kriteria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
+DocType: Subscription,Plans,Rancangan
 DocType: Salary Slip,Salary Structure,Struktur gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Syarikat Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Isu Bahan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ralat berlaku semasa membuat berulang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Isu Bahan
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Tawaran Tarikh
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sebut Harga
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Tiada Kumpulan Pelajar diwujudkan.
 DocType: Purchase Invoice Item,Serial No,No siri
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Jumlah Pembayaran balik bulanan tidak boleh lebih besar daripada Jumlah Pinjaman
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Jumlah Pembayaran balik bulanan tidak boleh lebih besar daripada Jumlah Pinjaman
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Baris # {0}: Tarikh Penghantaran Yang Diharapkan tidak boleh sebelum Tarikh Pesanan Pembelian
 DocType: Purchase Invoice,Print Language,Cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Sales Invoice,Customer PO Details,Maklumat Pelanggan Details
-DocType: Subscription,Next Schedule Date,Tarikh Jadual Seterusnya
 DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Akaun Pembukaan sementara
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Masukkan nilai mesti positif
@@ -4283,11 +4309,11 @@
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Dari dan kepada tarikh yang dikehendaki
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Tiada pekerja untuk kriteria yang disebutkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
 DocType: Hotel Settings,Default Customer,Pelanggan Lalai
 DocType: Assessment Plan,Supervisor Name,Nama penyelia
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengesahkan jika pelantikan dibuat untuk hari yang sama
@@ -4312,16 +4338,16 @@
 DocType: Journal Entry Account,Employee Advance,Advance Pekerja
 DocType: Payroll Entry,Payroll Frequency,Kekerapan Payroll
 DocType: Lab Test Template,Sensitivity,Kepekaan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Bahan mentah
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Bahan mentah
 DocType: Leave Application,Follow via Email,Ikut melalui E-mel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Tumbuhan dan Jentera
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Tumbuhan dan Jentera
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Harian Tetapan Ringkasan Kerja
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Sila masukkan Reqd mengikut Tarikh
 DocType: Payment Entry,Internal Transfer,Pindahan dalaman
 DocType: Asset Maintenance,Maintenance Tasks,Tugas Penyelenggaraan
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sama ada qty sasaran atau jumlah sasaran adalah wajib
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar
@@ -4329,14 +4355,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integrasi ERPNext
 DocType: Crop Cycle,Detected Disease,Penyakit yang Dikesan
 ,Produced,Dihasilkan
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tarikh Mula Pembayaran Balik tidak boleh sebelum Tarikh Pengeluaran.
 DocType: Item,Item Code for Suppliers,Kod Item untuk Pembekal
 DocType: Issue,Raised By (Email),Dibangkitkan Oleh (E-mel)
 DocType: Training Event,Trainer Name,Nama Trainer
 DocType: Mode of Payment,General,Ketua
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi lalu
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi lalu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial No Diperlukan untuk Perkara bersiri {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial No Diperlukan untuk Perkara bersiri {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Pembayaran perlawanan dengan Invois
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
@@ -4350,7 +4377,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} pada Cuti Setengah Hari di {1}
 DocType: Production Plan,Get Material Request,Dapatkan Permintaan Bahan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Perbelanjaan pos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Perbelanjaan pos
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumlah (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
 ,Item Variant Details,Butiran Varian Item
@@ -4361,9 +4388,9 @@
 DocType: Drug Prescription,Hour,Jam
 DocType: Restaurant Order Entry,Last Sales Invoice,Invois Jualan Terakhir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Sila pilih Qty terhadap item {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
 DocType: Lead,Lead Type,Jenis Lead
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Semua barang-barang ini telah diinvois
 DocType: Company,Monthly Sales Target,Sasaran Jualan Bulanan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Boleh diluluskan oleh {0}
@@ -4371,7 +4398,7 @@
 DocType: Item,Default Material Request Type,Lalai Bahan Jenis Permintaan
 DocType: Supplier Scorecard,Evaluation Period,Tempoh Penilaian
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,tidak diketahui
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Perintah Kerja tidak dibuat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Perintah Kerja tidak dibuat
 DocType: Shipping Rule,Shipping Rule Conditions,Penghantaran Peraturan Syarat
 DocType: Purchase Invoice,Export Type,Jenis Eksport
 DocType: Salary Slip Loan,Salary Slip Loan,Pinjaman Slip Gaji
@@ -4387,8 +4414,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Ringkasan Invois Terbuka
 DocType: Education Settings,Education Manager,Pengurus Pendidikan
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Panjang minimum antara setiap loji di lapangan untuk pertumbuhan optimum
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Perkara {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sebaliknya menggunakan Kemasukan Stock"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Perkara {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sebaliknya menggunakan Kemasukan Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Perkara {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sebaliknya menggunakan Kemasukan Stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Perkara {0} tidak boleh dikemas kini menggunakan Stock Perdamaian, sebaliknya menggunakan Kemasukan Stock"
 DocType: Quality Inspection,Report Date,Laporan Tarikh
 DocType: Student,Middle Name,Nama tengah
 DocType: C-Form,Invoices,Invois
@@ -4421,20 +4448,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,resit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,resit
 ,Sales Register,Jualan Daftar
 DocType: Daily Work Summary Group,Send Emails At,Menghantar e-mel di
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Lihat Borang
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Pendakwa Perbelanjaan Mandatori Dalam Tuntutan Perbelanjaan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Tambah pengguna ke organisasi anda, selain diri anda."
 DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,No Pelanggan lagi!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Penyata aliran tunai
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Tiada permintaan bahan dibuat
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lesen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
@@ -4457,11 +4485,12 @@
 DocType: Vehicle,Chassis No,Chassis Tiada
 DocType: Payment Request,Initiated,Dimulakan
 DocType: Production Plan Item,Planned Start Date,Dirancang Tarikh Mula
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Sila pilih BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Sila pilih BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Mengagumkan ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
+DocType: Bank Guarantee,Clauses and Conditions,Fasal dan Syarat
 DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
 DocType: Project Task,View Timesheet,Lihat Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tarikh akhir mestilah lebih besar dari tarikh mula
 DocType: Leave Type,Is Encash,Adalah menunaikan
 DocType: Leave Allocation,New Leaves Allocated,Daun baru Diperuntukkan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
@@ -4475,9 +4504,10 @@
 DocType: Patient,Alcohol Current Use,Penggunaan Semasa Alkohol
 DocType: Student Admission Program,Student Admission Program,Program Kemasukan Pelajar
 DocType: Payment Entry,Account Paid To,Akaun Dibayar Kepada
+DocType: Subscription Settings,Grace Period,Tempoh penangguhan
 DocType: Item Alternative,Alternative Item Name,Nama Item Alternatif
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Tidak boleh mengemukakan Slip Gaji <br> \ Kemungkinan sebab: <br> 1. Bayaran bersih adalah kurang daripada 0. <br> \ 2. Alamat E-mel Syarikat yang dinyatakan dalam tuan pekerja tidak sah. <br>
@@ -4487,7 +4517,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajet akaun {1} daripada {2} {3} adalah {4}. Ia akan melebihi oleh {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Keluar Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dan Disabled yang tidak dicuba di
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Siri adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
 DocType: Student Sibling,Student ID,ID pelajar
@@ -4499,14 +4528,16 @@
 DocType: Complaint,Complaint,Aduan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
 DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Buat Entri Pembayaran Balik
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Semua Jabatan
 DocType: Patient,Alcohol Past Use,Penggunaan Pasti Alkohol
 DocType: Fertilizer Content,Fertilizer Content,Kandungan Baja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Masalah / Stuck
 DocType: Tax Rule,Billing State,Negeri Bil
 DocType: Share Transfer,Transfer,Pemindahan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Perintah Kerja {0} mesti dibatalkan sebelum membatalkan Perintah Jualan ini
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
 DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
@@ -4530,10 +4561,11 @@
 DocType: Cheque Print Template,Message to show,Mesej untuk menunjukkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Runcit
 DocType: Student Attendance,Absent,Tidak hadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle Produk
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Tidak dapat mencari skor bermula pada {0}. Anda perlu mempunyai skor tetap yang meliputi 0 hingga 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Cukai dan Caj Template
+DocType: Subscription,Current Invoice Start Date,Tarikh Mula Invois Semasa
 DocType: Timesheet,TS-,TS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Sama ada debit atau jumlah kredit diperlukan untuk {2}
 DocType: GL Entry,Remarks,Catatan
@@ -4543,11 +4575,13 @@
 DocType: Task,Parent Task,Tugas Ibu Bapa
 DocType: Journal Entry,Write Off Based On,Tulis Off Based On
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,membuat Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Cetak dan Alat Tulis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Hantar Email Pembekal
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk tempoh antara {0} dan {1}, Tinggalkan tempoh permohonan tidak boleh di antara julat tarikh ini."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Hantar Email Pembekal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk tempoh antara {0} dan {1}, Tinggalkan tempoh permohonan tidak boleh di antara julat tarikh ini."
+DocType: Fiscal Year,Auto Created,Dicipta Auto
 DocType: Chapter Member,Leave Reason,Tinggalkan Sebab
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Invois {0} tidak wujud lagi
 DocType: Guardian Interest,Guardian Interest,Guardian Faedah
 DocType: Volunteer,Availability,Ketersediaan
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Tetapkan nilai lalai untuk Invois POS
@@ -4556,14 +4590,13 @@
 DocType: Timesheet,Employee Detail,Detail pekerja
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID E-mel
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID E-mel
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
 DocType: Lab Prescription,Test Code,Kod Ujian
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Tetapan untuk laman web laman utama
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ tidak dibenarkan untuk {0} kerana kedudukan kad skor {1}
 DocType: Job Offer,Awaiting Response,Menunggu Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Di atas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Jumlah Jumlah {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Jumlah Jumlah {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Menyebut jika tidak standard akaun yang perlu dibayar
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Sila pilih kumpulan penilaian selain daripada &#39;Semua Kumpulan Penilaian&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Baris {0}: Pusat kos diperlukan untuk item {1}
@@ -4574,7 +4607,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisis Air
 DocType: Chapter,Region,Wilayah
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
 DocType: Holiday List,Weekly Off,Mingguan Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Muat semula Analisis Berkaitan
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk contoh: 2012, 2012-13"
@@ -4590,7 +4623,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kos Aset Dihapuskan
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
 DocType: Vehicle,Policy No,Polisi Tiada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,projek Pengguna
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4630,21 +4663,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Jalan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Tidak boleh menukar PTJ ke lejar kerana ia mempunyai nod anak
 DocType: Production Plan,Total Planned Qty,Jumlah Qty Yang Dirancang
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Nilai pembukaan
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Nilai pembukaan
 DocType: Salary Detail,Formula,formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Templat Ujian Lab
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Akaun Jualan
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Akaun Jualan
 DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Suruhanjaya Jualan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Suruhanjaya Jualan
 DocType: Job Offer Term,Value / Description,Nilai / Penerangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
 DocType: Tax Rule,Billing Country,Bil Negara
 DocType: Purchase Order Item,Expected Delivery Date,Jangkaan Tarikh Penghantaran
 DocType: Restaurant Order Entry,Restaurant Order Entry,Kemasukan Pesanan Restoran
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
 DocType: Asset Maintenance Task,Assign To Name,Berikan Nama
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Perbelanjaan hiburan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Perbelanjaan hiburan
 DocType: Hub Settings,Enabled Users,Pengguna Enabled
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Buat Permintaan Bahan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Terbuka Item {0}
@@ -4657,24 +4690,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Permohonan untuk kebenaran.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
 DocType: Vehicle,Last Carbon Check,Carbon lalu Daftar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Perbelanjaan Undang-undang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Perbelanjaan Undang-undang
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Sila pilih kuantiti hukuman
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Membuat Invois Jualan dan Pembelian
 DocType: Purchase Invoice,Posting Time,Penempatan Masa
 DocType: Timesheet,% Amount Billed,% Jumlah Dibilkan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Perbelanjaan Telefon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Perbelanjaan Telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Semak ini jika anda mahu untuk memaksa pengguna untuk memilih siri sebelum menyimpan. Tidak akan ada lalai jika anda mendaftar ini.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
 DocType: Email Digest,Open Notifications,Pemberitahuan Terbuka
 DocType: Payment Entry,Difference Amount (Company Currency),Perbezaan Jumlah (Syarikat Mata Wang)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Perbelanjaan langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Perbelanjaan langsung
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Hasil Pelanggan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Perbelanjaan Perjalanan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Perbelanjaan Perjalanan
 DocType: Maintenance Visit,Breakdown,Pecahan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Tambah Langganan bidang adat dalam doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
 DocType: Purchase Receipt Item,Sample Quantity,Contoh Kuantiti
+DocType: Bank Guarantee,Name of Beneficiary,Nama Penerima
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Perbarui kos BOM secara automatik melalui Penjadual, berdasarkan kadar penilaian terkini / harga senarai harga / kadar pembelian terakhir bahan mentah."
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
@@ -4686,14 +4719,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Percubaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,New Akademik Tahun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Pulangan / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Pulangan / Nota Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Jumlah Amaun Dibayar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Jumlah Amaun Dibayar
 DocType: GST Settings,B2C Limit,Had B2C
 DocType: Work Order Item,Transferred Qty,Dipindahkan Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Melayari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Perancangan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Perancangan
 DocType: Share Balance,Issued,Isu
+DocType: Loan,Repayment Start Date,Tarikh Mula Pembayaran Balik
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Aktiviti pelajar
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id Pembekal
 DocType: Payment Request,Payment Gateway Details,Pembayaran Gateway Butiran
@@ -4706,10 +4740,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
 DocType: Email Digest,Send regular summary reports via Email.,Hantar laporan ringkasan tetap melalui E-mel.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Sila menetapkan akaun lalai dalam Jenis Perbelanjaan Tuntutan {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Sila menetapkan akaun lalai dalam Jenis Perbelanjaan Tuntutan {0}
 DocType: Assessment Result,Student Name,Nama pelajar
 DocType: Brand,Item Manager,Perkara Pengurus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,gaji Dibayar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,gaji Dibayar
 DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
 DocType: Plant Analysis,Collection Datetime,Tarikh Dataran
 DocType: Work Order,Total Operating Cost,Jumlah Kos Operasi
@@ -4719,9 +4753,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Pengguna {0} tidak wujud
 DocType: Payment Term,Day(s) after invoice date,Hari selepas tarikh invois
 DocType: Payment Schedule,Payment Schedule,Jadual pembayaran
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Kemasukan bayaran yang sudah wujud
+DocType: Subscription,Trial Period End Date,Tarikh Akhir Tempoh Percubaan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Master template gaji.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologi
@@ -4738,9 +4772,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Varian Perkara Kumpulan Bijaksana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Semua Kumpulan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,terkumpul Bulanan
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Template cukai adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
@@ -4749,14 +4783,15 @@
 DocType: Lab Prescription,Test Created,Uji Dibuat
 DocType: Healthcare Settings,Custom Signature in Print,Tandatangan Tersuai dalam Cetak
 DocType: Account,Temporary,Sementara
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Pelanggan LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Pelanggan LPO No.
 DocType: Program,Courses,kursus
 DocType: Monthly Distribution Percentage,Percentage Allocation,Peratus Peruntukan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Setiausaha
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Setiausaha
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika melumpuhkan, &#39;Dalam Perkataan&#39; bidang tidak akan dapat dilihat dalam mana-mana transaksi"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Tindakan ini akan menghentikan pengebilan masa depan. Adakah anda pasti ingin membatalkan langganan ini?
 DocType: Serial No,Distinct unit of an Item,Unit yang berbeza Perkara yang
 DocType: Supplier Scorecard Criteria,Criteria Name,Nama Kriteria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Sila tetapkan Syarikat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Sila tetapkan Syarikat
 DocType: Pricing Rule,Buying,Membeli
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Penyakit &amp; Baja
 DocType: HR Settings,Employee Records to be created by,Rekod Pekerja akan diwujudkan oleh
@@ -4765,18 +4800,18 @@
 DocType: POS Profile,Apply Discount On,Memohon Diskaun Pada
 DocType: Member,Membership Type,Jenis Keahlian
 ,Reqd By Date,Reqd Tarikh
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Pemiutang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Pemiutang
 DocType: Assessment Plan,Assessment Name,Nama penilaian
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Tunjukkan PDC di Cetak
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Tunjukkan PDC di Cetak
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Tiada Serial adalah wajib
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Perkara Bijaksana Cukai Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Tawaran pekerjaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut Singkatan
 ,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Sebutharga Pembekal
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
@@ -4794,7 +4829,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Jumlah Varian
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan menghantar entri perakaunan untuk inventori secara automatik."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Kehadiran pekerja {0} sudah ditanda pada hari ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Kehadiran pekerja {0} sudah ditanda pada hari ini
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",dalam minit dikemaskini melalui &#39;Time Log&#39;
 DocType: Customer,From Lead,Dari Lead
@@ -4805,6 +4840,7 @@
 DocType: Lab Test,Approved Date,Tarikh Diluluskan
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+DocType: Subscriber,Subscriber Name,Nama Pelanggan
 DocType: Serial No,Out of Warranty,Daripada Waranti
 DocType: BOM Update Tool,Replace,Ganti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Belum ada produk found.
@@ -4814,19 +4850,18 @@
 DocType: Request for Quotation Item,Project Name,Nama Projek
 DocType: Customer,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
 DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Pilih akaun pendapatan faedah dalam pinjaman pekerja {0}
 DocType: Work Order,Required Items,Item yang diperlukan
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Sumber Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Penyesuaian Pembayaran Pembayaran
 DocType: Disease,Treatment Task,Tugas Rawatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Aset Cukai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Aset Cukai
 DocType: BOM Item,BOM No,BOM Tiada
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
 DocType: Item,Moving Average,Purata bergerak
 DocType: BOM Update Tool,The BOM which will be replaced,The BOM yang akan digantikan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,peralatan elektronik
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,peralatan elektronik
 DocType: Asset,Maintenance Required,Penyelenggaraan Diperlukan
 DocType: Account,Debit,Debit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Daun mesti diperuntukkan dalam gandaan 0.5
@@ -4835,7 +4870,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,AMT Cemerlang
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sasaran yang ditetapkan Perkara Kumpulan-bijak untuk Orang Jualan ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stok Freeze Lama Than [Hari]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib bagi aset tetap pembelian / penjualan
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib bagi aset tetap pembelian / penjualan
 DocType: Asset Maintenance Team,Maintenance Team Name,Nama Pasukan Penyelenggaraan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Pelanggan adalah wajib jika &#39;Opportunity From&#39; dipilih sebagai Pelanggan
@@ -4845,19 +4880,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Jenis-jenis Tuntutan Perbelanjaan.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kadar untuk item menjual {0} adalah lebih rendah berbanding {1}. Kadar menjual harus atleast {2}
-DocType: Item,Taxes,Cukai
+DocType: Subscription,Taxes,Cukai
 DocType: Purchase Invoice,capital goods,barang modal
 DocType: Purchase Invoice Item,Weight Per Unit,Berat Per Unit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Dibayar dan Tidak Dihantar
 DocType: Project,Default Cost Center,Kos Pusat Default
-DocType: Bank Guarantee,End Date,Tarikh akhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Urusniaga saham
 DocType: Budget,Budget Accounts,Akaun belanjawan
 DocType: Employee,Internal Work History,Sejarah Kerja Dalaman
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Terkumpul Jumlah Susutnilai
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Ekuiti Persendirian
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Pembolehubah Kad Skor Pembekal
-DocType: Employee Loan,Fully Disbursed,Dikeluarkan sepenuhnya
 DocType: Employee Advance,Due Advance Amount,Amaun Pendahuluan
 DocType: Maintenance Visit,Customer Feedback,Maklum Balas Pelanggan
 DocType: Account,Expense,Perbelanjaan
@@ -4881,7 +4914,7 @@
 ,Employee Information,Maklumat Kakitangan
 DocType: Stock Entry Detail,Additional Cost,Kos tambahan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Membuat Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Membuat Sebutharga Pembekal
 DocType: Quality Inspection,Incoming,Masuk
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Templat cukai lalai untuk jualan dan pembelian dicipta.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Rekod Keputusan Penilaian {0} sudah wujud.
@@ -4889,7 +4922,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Sila tetapkan Syarikat menapis kosong jika Group By adalah &#39;Syarikat&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Tarikh tidak boleh tarikh masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,untuk menjana berulang
 DocType: Stock Entry,Target Warehouse Address,Alamat Gudang Sasaran
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Cuti kasual
 DocType: Agriculture Task,End Day,Hari Akhir
@@ -4914,11 +4946,10 @@
 DocType: Material Request,% Ordered,% Mengarahkan
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kumpulan Pelajar berdasarkan, Kursus yang akan disahkan bagi tiap-tiap Pelajar daripada Kursus mendaftar dalam Program Pendaftaran."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Purata. Kadar Membeli
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Purata. Kadar Membeli
 DocType: Share Balance,From No,Daripada No
 DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
 DocType: Employee,History In Company,Sejarah Dalam Syarikat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Mesej Baru dari {sender}
 DocType: Customer,Customer Primary Address,Alamat Utama Pelanggan
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Surat Berita
 DocType: Drug Prescription,Description/Strength,Penerangan / Kekuatan
@@ -4927,22 +4958,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,item yang sama telah dimasukkan beberapa kali
 DocType: Department,Leave Block List,Tinggalkan Sekat Senarai
 DocType: Purchase Invoice,Tax ID,ID Cukai
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
 DocType: Accounts Settings,Accounts Settings,Tetapan Akaun-akaun
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Terima
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Alamat malformatted untuk {0}, sila tukar untuk meneruskan."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Alamat malformatted untuk {0}, sila tukar untuk meneruskan."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Bilangan Akaun baru, ia akan dimasukkan ke dalam nama akaun sebagai awalan"
 DocType: Maintenance Team Member,Team Member,Ahli pasukan
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Tiada Keputusan untuk dihantar
 DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
-DocType: Employee Loan,Rate of Interest (%) / Year,Kadar faedah (%) / Tahun
+DocType: Loan,Rate of Interest (%) / Year,Kadar faedah (%) / Tahun
 ,Project Quantity,projek Kuantiti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;"
 DocType: Opportunity,To Discuss,Bincang
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} diperlukan dalam {2} untuk melengkapkan urus niaga ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kadar faedah (%) tahunan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Akaun sementara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Black
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Akaun sementara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Letupan BOM Perkara
 DocType: Shareholder,Contact List,Senarai kenalan
 DocType: Account,Auditor,Audit
@@ -4950,16 +4981,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} barangan yang dihasilkan
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Ketahui lebih lanjut
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Senarai Harga {0} dilumpuhkan atau tidak wujud
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Senarai Harga {0} dilumpuhkan atau tidak wujud
 DocType: Purchase Invoice,Return,Pulangan
 DocType: Pricing Rule,Disable,Melumpuhkan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Cara pembayaran adalah dikehendaki untuk membuat pembayaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Cara pembayaran adalah dikehendaki untuk membuat pembayaran
 DocType: Project Task,Pending Review,Sementara menunggu Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Edit halaman penuh untuk lebih banyak pilihan seperti aset, nada siri, batch dll."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Pelantikan dan Perundingan
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} tidak mendaftar dalam Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} tidak boleh dimansuhkan, kerana ia sudah {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cek diperlukan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cek diperlukan
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Tidak Hadir
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Gagal persediaan syarikat
@@ -4971,7 +5002,7 @@
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Pengurusan Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Tambah item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Tambah item dari
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Tanaman &amp; Tanah
 DocType: Cheque Print Template,Regular,biasa
 DocType: Fertilizer,Density (if liquid),Ketumpatan (jika cecair)
@@ -4996,24 +5027,26 @@
 DocType: Payment Entry,Paid Amount,Jumlah yang dibayar
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Terokai Kitaran Jualan
 DocType: Assessment Plan,Supervisor,penyelia
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Penyimpanan Stok Penyimpanan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Penyimpanan Stok Penyimpanan
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
 ,Work Order Stock Report,Laporan Saham Pesanan Kerja
+DocType: Purchase Receipt,Auto Repeat Detail,Butiran Ulang Auto
 DocType: Assessment Result Tool,Assessment Result Tool,Penilaian Keputusan Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Sebagai Penyelia
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Cadangkan Kategori
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Pengurusan Kualiti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Pengurusan Kualiti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
 DocType: Project,Total Billable Amount (via Timesheets),Jumlah Jumlah Yang Boleh Dibayar (melalui Timesheet)
 DocType: Agriculture Task,Previous Business Day,Hari Perniagaan Sebelumnya
-DocType: Employee Loan,Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh
+DocType: Loan,Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh
 DocType: Employee,Health Insurance No,Insurans Kesihatan No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota Kredit AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota Kredit AMT
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Jumlah Cukai Yang Boleh Dibayar
 DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
 DocType: Opening Invoice Creation Tool,Purchase,Pembelian
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Baki Kuantiti
@@ -5024,16 +5057,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 DocType: Healthcare Settings,Valid number of days,Bilangan hari yang sah
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Pusat Kos
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Restart Langganan
 DocType: Land Unit,Linked Plant Analysis,Analisis Loji Terkait
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Kadar di mana pembekal mata wang ditukar kepada mata wang asas syarikat
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik pengaturan masa dengan barisan {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Benarkan Kadar Penilaian Zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Benarkan Kadar Penilaian Zero
+DocType: Bank Guarantee,Receiving,Menerima
 DocType: Training Event Employee,Invited,dijemput
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Pelbagai Struktur Gaji aktif dijumpai untuk pekerja {0} pada tarikh yang diberikan
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Persediaan akaun Gateway.
 DocType: Employee,Employment Type,Jenis pekerjaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Aset Tetap
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Aset Tetap
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Keuntungan / Kerugian
 ,GST Purchase Register,GST Pembelian Daftar
 ,Cash Flow,Aliran tunai
@@ -5054,9 +5089,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Senarai semua urusniaga saham
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Dilampirkan {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Tarikh Mulai Tempoh Percubaan dan Tarikh Akhir Tempoh Percubaan mesti ditetapkan
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Kadar purata
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
+DocType: Subscription Plan Detail,Plan,Rancang
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
 DocType: Job Applicant,Applicant Name,Nama pemohon
 DocType: Authorization Rule,Customer / Item Name,Pelanggan / Nama Item
@@ -5086,6 +5122,7 @@
 DocType: Work Order,Warehouses,Gudang
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak boleh dipindahkan
 DocType: Hotel Room Pricing,Hotel Room Pricing,Harga Bilik Hotel
+DocType: Subscription,Days Until Due,Hari Sehingga Hutang
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Perkara ini adalah Variant {0} (Template).
 DocType: Workstation,per hour,sejam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Membeli
@@ -5094,13 +5131,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Untuk Kumpulan Pelajar Batch berasaskan, Batch Pelajar akan disahkan bagi tiap-tiap pelajar daripada Program Pendaftaran."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Pengagihan
+DocType: Journal Entry Account,Loan,Pinjaman
 DocType: Expense Claim Advance,Expense Claim Advance,Pendahuluan Tuntutan Perbelanjaan
 DocType: Lab Test,Report Preference,Laporkan Keutamaan
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Maklumat sukarela.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Pengurus Projek
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Pengurus Projek
 ,Quoted Item Comparison,Perkara dipetik Perbandingan
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Tumpuan dalam pemarkahan antara {0} dan {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Nilai Aset Bersih pada
 DocType: Crop,Produce,Menghasilkan
@@ -5110,7 +5148,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Penggunaan Bahan untuk Pembuatan
 DocType: Item Alternative,Alternative Item Code,Kod Item Alternatif
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Pilih item untuk mengeluarkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Pilih item untuk mengeluarkan
 DocType: Delivery Stop,Delivery Stop,Stop Penghantaran
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
 DocType: Item,Material Issue,Isu Bahan
@@ -5120,15 +5158,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun &amp; Detergen
 DocType: BOM,Show Items,persembahan Item
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari Masa tidak boleh lebih besar daripada ke semasa.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Adakah anda ingin memberitahu semua pelanggan melalui e-mel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Adakah anda ingin memberitahu semua pelanggan melalui e-mel?
+DocType: Subscription Plan,Billing Interval,Selang Pengebilan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Teruskan
 DocType: Hub Settings,Hub Username,Hub Nama Pengguna
 DocType: Salary Detail,Component,komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria Penilaian Kumpulan
 DocType: Healthcare Settings,Patient Name By,Nama Pesakit Mengikut
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Kemasukan Jurnal Akruan untuk gaji dari {0} hingga {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Kemasukan Jurnal Akruan untuk gaji dari {0} hingga {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -5142,23 +5180,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini anda boleh mengekalkan ketinggian, berat badan, alahan, masalah kesihatan dan lain-lain"
 DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
-DocType: Employee Loan,Disbursement Date,Tarikh pembayaran
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Penerima&#39; tidak ditentukan
+DocType: Loan,Disbursement Date,Tarikh pembayaran
 DocType: BOM Update Tool,Update latest price in all BOMs,Kemas kini harga terkini dalam semua BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Rekod kesihatan
 DocType: Vehicle,Vehicle,kenderaan
 DocType: Purchase Invoice,In Words,Dalam Perkataan
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Masukkan nama bank atau institusi pemberi pinjaman sebelum mengemukakan.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} mesti dikemukakan
 DocType: POS Profile,Item Groups,Kumpulan item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
 DocType: Sales Order Item,For Production,Untuk Pengeluaran
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Sila tambah akaun Pembukaan Sementara dalam Carta Akaun
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Sila tambah akaun Pembukaan Sementara dalam Carta Akaun
 DocType: Customer,Customer Primary Contact,Hubungi Utama Utama Pelanggan
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Jurnal Penutupan Tempoh
 DocType: Project Task,View Task,Lihat Petugas
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,RRJP / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,RRJP / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Jenis Jaminan Bank
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Bahagian Invois
 ,Asset Depreciations and Balances,Penurunan nilai aset dan Baki
@@ -5169,9 +5208,8 @@
 DocType: Production Plan,Include Subcontracted Items,Termasuk Item Subkontrak
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Sertai
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Tidak dapat mengubah sifat Varian selepas pemindahan saham. Anda perlu membuat Item baru untuk melakukan ini.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
-DocType: Employee Loan,Repay from Salary,Membayar balik dari Gaji
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+DocType: Loan,Repay from Salary,Membayar balik dari Gaji
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Meminta pembayaran daripada {0} {1} untuk jumlah {2}
 DocType: Salary Slip,Salary Slip,Slip Gaji
@@ -5195,11 +5233,11 @@
 DocType: Employee Education,Employee Education,Pendidikan Pekerja
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,kumpulan item Duplicate dijumpai di dalam jadual kumpulan item
 DocType: Land Unit,Parent Land Unit,Unit Tanah Induk
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
 DocType: Fertilizer,Fertilizer Name,Nama Baja
 DocType: Salary Slip,Net Pay,Gaji bersih
 DocType: Cash Flow Mapping Accounts,Account,Akaun
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,No siri {0} telah diterima
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,No siri {0} telah diterima
 ,Requested Items To Be Transferred,Item yang diminta Akan Dipindahkan
 DocType: Expense Claim,Vehicle Log,kenderaan Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Kehadiran demam (temp&gt; 38.5 ° C / 101.3 ° F atau temp tetap&gt; 38 ° C / 100.4 ° F)
@@ -5240,24 +5278,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
 DocType: Asset Maintenance,Manufacturing User,Pembuatan pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan mentah yang dibekalkan
-DocType: C-Form,Series,Siri
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Mata wang senarai harga {0} mestilah {1} atau {2}
 DocType: Appraisal,Appraisal Template,Templat Penilaian
 DocType: Soil Texture,Ternary Plot,Plot Ternary
 DocType: Item Group,Item Classification,Item Klasifikasi
 DocType: Driver,License Number,Nombor lesen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Pengurus Pembangunan Perniagaan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Pengurus Pembangunan Perniagaan
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Penyelenggaraan Lawatan Tujuan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Pendaftaran Pesakit Invois
 DocType: Crop,Period,Tempoh
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Lejar Am
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Pekerja {0} pada Cuti pada {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Pekerja {0} pada Cuti pada {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Leads
 DocType: Program Enrollment Tool,New Program,Program baru
 DocType: Item Attribute Value,Attribute Value,Atribut Nilai
 ,Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level
 DocType: Salary Detail,Salary Detail,Detail gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Sila pilih {0} pertama
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Sila pilih {0} pertama
 DocType: Appointment Type,Physician,Pakar Perubatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Perundingan
@@ -5265,15 +5302,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) tidak boleh melebihi kuantiti terancang ({2}) dalam Perintah Kerja {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Lembaran Masa untuk pembuatan.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,jumlah kecil
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Tidak boleh mengubah Variasi hartanah selepas transaksi stok. Anda perlu membuat Item baru untuk melakukan ini.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandat SEPA GoCardless
 DocType: Physician,Charges,Caj
 DocType: Production Plan,Get Items For Work Order,Dapatkan Item Untuk Perintah Kerja
 DocType: Salary Detail,Default Amount,Jumlah Default
 DocType: Lab Test Template,Descriptive,Deskriptif
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ringkasan ini Bulan ini
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
 DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Tetapkan matlamat jualan yang anda ingin capai untuk syarikat anda.
 ,Project wise Stock Tracking,Projek Landasan Saham bijak
@@ -5301,11 +5339,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Gagal membuat laman web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Penukaran
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Kemasukan Saham Penyimpanan yang telah dibuat atau Kuantiti Sampel yang tidak disediakan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Kemasukan Saham Penyimpanan yang telah dibuat atau Kuantiti Sampel yang tidak disediakan
 DocType: Program,Program Abbreviation,Singkatan program
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
 DocType: Warranty Claim,Resolved By,Diselesaikan oleh
-DocType: Bank Guarantee,Start Date,Tarikh Mula
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Memperuntukkan daun untuk suatu tempoh.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak betul dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
@@ -5320,11 +5357,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Jam
 DocType: Project,Expected Start Date,Jangkaan Tarikh Mula
 DocType: Purchase Invoice,04-Correction in Invoice,04-Pembetulan dalam Invois
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Perintah Kerja sudah dibuat untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Perintah Kerja sudah dibuat untuk semua item dengan BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Laporan Butiran Variasi
 DocType: Setup Progress Action,Setup Progress Action,Tindakan Kemajuan Persediaan
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Membeli Senarai Harga
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Membeli Senarai Harga
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Buang item jika caj tidak berkenaan dengan perkara yang
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Batal Langganan
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Sila pilih Status Penyelenggaraan sebagai Selesai atau keluarkan Tarikh Selesai
 DocType: Supplier,Default Payment Terms Template,Templat Terma Pembayaran Lalai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Mata wang urus niaga mesti sama dengan mata wang Pembayaran Gateway
@@ -5335,7 +5373,6 @@
 DocType: Employee,Educational Qualification,Kelayakan pendidikan
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Terkumpul Anggaran Bulanan Melebihi
-DocType: Subscription,Submit on creation,Mengemukakan kepada penciptaan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
 DocType: Asset,Disposal Date,Tarikh pelupusan
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mel akan dihantar kepada semua Pekerja Active syarikat itu pada jam yang diberikan, jika mereka tidak mempunyai percutian. Ringkasan jawapan akan dihantar pada tengah malam."
@@ -5354,6 +5391,7 @@
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Cheque Print Template,Cheque Print Template,Cek Cetak Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Carta Pusat Kos
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Bilangan hari selepas tarikh invois telah berlalu sebelum membatalkan langganan atau menandakan langganan sebagai belum dibayar
 DocType: Lab Test Template,Sample Collection,Pengumpulan sampel
 ,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
 DocType: Price List,Price List Name,Senarai Harga Nama
@@ -5362,7 +5400,7 @@
 DocType: Account,Income,Pendapatan
 DocType: Industry Type,Industry Type,Jenis industri
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Sesuatu telah berlaku!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
 DocType: Supplier Scorecard Scoring Criteria,Score,Rata
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Tahun Anggaran {0} tidak wujud
@@ -5382,12 +5420,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} harus bernilai antara 0 dan 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Tersedia untuk Penggunaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pinjaman tidak bercagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Pinjaman tidak bercagar
 DocType: Cost Center,Cost Center Name,Kos Nama Pusat
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max jam bekerja terhadap Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Tarikh yang dijadualkan
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Jumlah dibayar AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Jumlah dibayar AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesej yang lebih besar daripada 160 aksara akan berpecah kepada berbilang mesej
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
 DocType: Hub Settings,Company and Seller Profile,Syarikat dan Profil Penjual
@@ -5401,10 +5439,9 @@
 DocType: Item,Variant Based On,Based On Variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Pembekal anda
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Sila betulkan
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
 DocType: Request for Quotation Item,Supplier Part No,Pembekal bahagian No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonymous
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Pemberian
 DocType: Lead,Converted,Ditukar
@@ -5418,6 +5455,7 @@
 DocType: Asset,Assets,Aset
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
+DocType: Subscription,Current Invoice End Date,Tarikh Tamat Invois Semasa
 DocType: Payment Term,Due Date Based On,Berdasarkan Tarikh Dikenakan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Sila tetapkan kumpulan pelanggan dan wilayah lalai dalam Tetapan Penjualan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} tidak wujud
@@ -5425,7 +5463,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Tiada bayaran balik yang dipilih untuk Kemasukan Jurnal
 DocType: Payment Reconciliation,From Invoice Date,Dari Invois Tarikh
+DocType: Loan,Disbursed,Dibelanjakan
 DocType: Healthcare Settings,Laboratory Settings,Tetapan Makmal
 DocType: Patient Appointment,Service Unit,Unit Perkhidmatan
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Berjaya Membekal Pembekal
@@ -5438,12 +5478,12 @@
 DocType: Share Balance,No of Shares,Tiada Saham
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Pilih Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Fee Schedule,Total Amount per Student,Jumlah Amaun setiap Pelajar
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrik
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Menambah seluruh organisasi anda sebagai pengguna anda. Anda juga boleh menambah menjemput Pelanggan untuk portal anda dengan menambah mereka dari Kenalan
 DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
 DocType: Grant Application,Requested Amount,Amaun yang Diminta
@@ -5453,7 +5493,7 @@
 DocType: Crop Cycle,Detected Diseases,Penyakit yang Dikesan
 DocType: Stock Entry,Default Source Warehouse,Default Sumber Gudang
 DocType: Item,Customer Code,Kod Pelanggan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 DocType: Asset Maintenance Task,Last Completion Date,Tarikh Penyempurnaan Terakhir
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
@@ -5461,9 +5501,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Tetapan GoCardless
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Aset saham
 DocType: Restaurant,Active Menu,Menu Aktif
 DocType: Target Detail,Target Qty,Sasaran Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Terhadap Pinjaman: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Tetapan Checkout
 DocType: Student Attendance,Present,Hadir
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
@@ -5472,9 +5513,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Production Plan Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
 DocType: Chapter,Chapter Head,Kepala Bab
 DocType: Payment Term,Month(s) after the end of the invoice month,Bulan (s) selepas akhir bulan invois
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Aktiviti projek / tugasan.
@@ -5482,11 +5523,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Menjana Gaji Slip
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Data hasil makmal tidak boleh sebelum menguji waktu
 DocType: POS Profile,Allow user to edit Discount,Benarkan pengguna mengedit Diskaun
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Dapatkan pelanggan dari
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Dapatkan pelanggan dari
 DocType: Purchase Invoice Item,Include Exploded Items,Termasuk Item Meletup
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
 DocType: Shipping Rule,Restrict to Countries,Hadkan kepada Negara
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
 DocType: Sales Invoice Timesheet,Billing Hours,Waktu Billing
 DocType: Project,Total Sales Amount (via Sales Order),Jumlah Jumlah Jualan (melalui Perintah Jualan)
@@ -5505,6 +5547,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Pengurus Penilaian
 DocType: Payment Entry,Allocate Payment Amount,Memperuntukkan Jumlah Pembayaran
+DocType: Subscription Plan,Subscription Plan,Pelan Langganan
 DocType: Employee External Work History,Salary,Gaji
 DocType: Serial No,Delivery Document Type,Penghantaran Dokumen Jenis
 DocType: Sales Order,Partly Delivered,Sebahagiannya Dihantar
@@ -5529,9 +5572,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Range Penuaan 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Memasang pratetap
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Tiada Nota Penghantaran yang dipilih untuk Pelanggan {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Tiada Nota Penghantaran yang dipilih untuk Pelanggan {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM digantikan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Pilih Item berdasarkan Tarikh Penghantaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Pilih Item berdasarkan Tarikh Penghantaran
 DocType: Grant Application,Has any past Grant Record,Mempunyai Rekod Geran yang lalu
 ,Sales Analytics,Jualan Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Terdapat {0}
@@ -5550,7 +5593,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kos Bahan mentah yang dibekalkan
 DocType: Selling Settings,Settings for Selling Module,Tetapan untuk Menjual Modul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Tempahan Bilik Hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Khidmat Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Khidmat Pelanggan
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Pelanggan Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tawaran calon Kerja a.
@@ -5567,7 +5610,7 @@
 DocType: Fees,Student Details,Butiran Pelajar
 DocType: Purchase Invoice Item,Stock Qty,saham Qty
 DocType: Purchase Invoice Item,Stock Qty,saham Qty
-DocType: Employee Loan,Repayment Period in Months,Tempoh pembayaran balik dalam Bulan
+DocType: Loan,Repayment Period in Months,Tempoh pembayaran balik dalam Bulan
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Ralat: Bukan id sah?
 DocType: Naming Series,Update Series Number,Update Siri Nombor
 DocType: Account,Equity,Ekuiti
@@ -5576,7 +5619,7 @@
 DocType: Task,Closing Date,Tarikh Tutup
 DocType: Sales Order Item,Produced Quantity,Dihasilkan Kuantiti
 DocType: Timesheet,Work Detail,Butiran Kerja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Jurutera
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Jurutera
 DocType: Journal Entry,Total Amount Currency,Jumlah Mata Wang
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Mencari Sub Dewan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
@@ -5622,13 +5665,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Maklumat jenis Donor.
 DocType: Request for Quotation,Supplier Detail,Detail pembekal
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Ralat dalam formula atau keadaan: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Invois
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Invois
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriteria berat mesti menambah sehingga 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Kehadiran
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Item saham
 DocType: BOM,Materials,Bahan
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak disemak, senarai itu perlu ditambah kepada setiap Jabatan di mana ia perlu digunakan."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Mewujudkan {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan sasaran Warehouse tidak boleh sama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
@@ -5652,14 +5694,14 @@
 DocType: Shipping Rule,Fixed,Tetap
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Bundarkan Akaun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Perbelanjaan pentadbiran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Perbelanjaan pentadbiran
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Ibu Bapa Kumpulan Pelanggan
-DocType: Journal Entry,Subscription,Langganan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Langganan
 DocType: Purchase Invoice,Contact Email,Hubungi E-mel
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Penciptaan Kos Penangguhan
 DocType: Appraisal Goal,Score Earned,Skor Diperoleh
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Tempoh notis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Tempoh notis
 DocType: Asset Category,Asset Category Name,Asset Kategori Nama
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak boleh diedit.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama New Orang Sales
@@ -5673,7 +5715,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
 DocType: Asset,Frequency of Depreciation (Months),Kekerapan Susutnilai (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Akaun Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Akaun Kredit
 DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Menunjukkan nilai-nilai sifar
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kuantiti item diperolehi selepas pembuatan / pembungkusan semula daripada kuantiti diberi bahan mentah
@@ -5681,7 +5723,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
 DocType: Hub Settings,Company Logo,Logo syarikat
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
 DocType: Healthcare Settings,Patient Registration,Pendaftaran Pesakit
@@ -5716,11 +5758,10 @@
 DocType: Journal Entry,Total Debit,Jumlah Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Barangan lalai Mendapat Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Sila pilih Pesakit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Orang Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Orang Jualan
 DocType: Hotel Room Package,Amenities,Kemudahan
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Belanjawan dan PTJ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Pelbagai mod lalai pembayaran tidak dibenarkan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,untuk
 ,Appointment Analytics,Pelantikan Analitis
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Pelanggan
@@ -5737,6 +5778,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Biarkan kosong jika anda membuat kumpulan pelajar setahun
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika disemak, Jumlah no. Hari Kerja termasuk cuti, dan ini akan mengurangkan nilai Gaji Setiap Hari"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apl yang menggunakan kekunci semasa tidak dapat mengakses, adakah anda pasti?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Jumlah Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Tukar Kod Template
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lebih awal daripada Tarikh Mula Term. Sila betulkan tarikh dan cuba lagi.
@@ -5748,8 +5790,9 @@
 DocType: Opportunity Item,Basic Rate,Kadar asas
 DocType: GL Entry,Credit Amount,Jumlah Kredit
 DocType: Cheque Print Template,Signatory Position,Jawatan penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Ditetapkan sebagai Hilang
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Ditetapkan sebagai Hilang
 DocType: Timesheet,Total Billable Hours,Jumlah jam kerja yang dibayar
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Bilangan hari yang pelanggan perlu membayar invois yang dihasilkan oleh langganan ini
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ini adalah berdasarkan kepada urus niaga terhadap Pelanggan ini. Lihat garis masa di bawah untuk maklumat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan jumlah Kemasukan Pembayaran {2}
@@ -5768,12 +5811,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
 DocType: Company,Company Info,Maklumat Syarikat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Pilih atau menambah pelanggan baru
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ini adalah berdasarkan kepada kehadiran pekerja ini
 DocType: Assessment Result,Summary,Ringkasan
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Tandatangan Kehadiran
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Akaun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Akaun Debit
 DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
 DocType: Attendance,Employee Name,Nama Pekerja
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item Masuk Kemasukan Restoran
@@ -5785,7 +5828,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Manfaat Pekerja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Manfaat Pekerja
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
 DocType: Work Order,Manufactured Qty,Dikilangkan Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Saham tidak wujud dengan {0}
@@ -5793,12 +5836,12 @@
 DocType: Asset,Out of Order,Telah habis
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
 DocType: Projects Settings,Ignore Workstation Time Overlap,Abaikan Masa Tumpuan Workstation
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} tidak wujud
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Pilih Nombor Batch
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
 DocType: Patient Service Unit,Medical Administrator,Pentadbir Perubatan
 DocType: Assessment Plan,Schedule,Jadual
 DocType: Account,Parent Account,Akaun Ibu Bapa
@@ -5828,15 +5871,16 @@
 DocType: Asset Repair,Repair Status,Status Pembaikan
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
 DocType: POS Profile,Account for Change Amount,Akaun untuk Perubahan Jumlah
 DocType: Purchase Invoice,input service,perkhidmatan input
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Ahli Pasukan Penyelenggaraan
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analisis Tanah
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kod Kursus:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
 DocType: Employee,Current Address,Alamat Semasa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah variasi yang lain item maka penerangan, gambar, harga, cukai dan lain-lain akan ditetapkan dari template melainkan jika dinyatakan secara jelas"
 DocType: Serial No,Purchase / Manufacture Details,Pembelian / Butiran Pembuatan
@@ -5885,19 +5929,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Kemasukan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nama Variabel
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
 DocType: Asset,Asset Category,Kategori Asset
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Gaji bersih tidak boleh negatif
 DocType: Purchase Order,Advance Paid,Advance Dibayar
 DocType: Item,Item Tax,Perkara Cukai
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Bahan kepada Pembekal
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Perancangan Permintaan Bahan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Cukai Invois
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Ambang {0}% muncul lebih daripada sekali
 DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
 DocType: Employee Attendance Tool,Marked Attendance,Kehadiran ketara
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Liabiliti Semasa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Liabiliti Semasa
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Pemasa melebihi masa yang diberikan.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Hantar SMS massa ke kenalan anda
 DocType: Patient,A Positive,A Positif
@@ -5908,9 +5952,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Pembekal Kad Skor Pembekal, dan Pesanan Pembelian kepada pembekal ini perlu dikeluarkan dengan berhati-hati."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Pasukan Penyelenggaraan Aset
-DocType: Employee Loan,Loan Type,Jenis pinjaman
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} telah berjaya diserahkan
+DocType: Loan,Loan Type,Jenis pinjaman
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadualan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kad Kredit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kad Kredit
 DocType: BOM,Item to be manufactured or repacked,Perkara yang perlu dibuat atau dibungkus semula
 DocType: Employee Education,Major/Optional Subjects,Subjek utama / Pilihan
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5942,7 +5987,7 @@
 DocType: Item,Units of Measure,Unit ukuran
 DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
 DocType: Sales Invoice,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Modal Saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Modal Saham
 DocType: Shopping Cart Settings,Show Public Attachments,Tunjuk Lampiran Awam
 DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
 DocType: Restaurant Reservation,Reservation Time,Masa Tempahan
@@ -5957,7 +6002,7 @@
 DocType: Purchase Order,To Receive and Bill,Terima dan Rang Undang-undang
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Baris # {0}: Reqd oleh Tarikh tidak boleh sebelum Tarikh Urus Niaga
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produk yang diketengahkan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terma dan Syarat Template
 DocType: Serial No,Delivery Details,Penghantaran Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
@@ -5967,20 +6012,20 @@
 DocType: Driver,Expiry Date,Tarikh Luput
 DocType: Healthcare Settings,Employee name and designation in print,Nama dan jawatan pekerja yang dicetak
 ,accounts-browser,akaun pelayar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Sila pilih Kategori pertama
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Sila pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Induk projek.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Untuk membolehkan lebih-bil atau terlebih-tempahan, mengemas kini &quot;Elaun&quot; dalam Tetapan Saham atau item itu."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Separuh Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Separuh Hari)
 DocType: Payment Term,Credit Days,Hari Kredit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Sila pilih Pesakit untuk mendapatkan Ujian Makmal
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Buat Batch Pelajar
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Dapatkan Item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Membawa Hari Masa
 DocType: Cash Flow Mapping,Is Income Tax Expense,Adakah Perbelanjaan Cukai Pendapatan
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Semak ini jika Pelajar itu yang menetap di Institut Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
 ,Stock Summary,Ringkasan Stock
@@ -5991,10 +6036,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Tarikh
 DocType: Employee,Reason for Leaving,Sebab Berhenti
 DocType: BOM Operation,Operating Cost(Company Currency),Kos operasi (Syarikat Mata Wang)
-DocType: Employee Loan Application,Rate of Interest,Kadar faedah
+DocType: Loan Application,Rate of Interest,Kadar faedah
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
 DocType: Item,Shelf Life In Days,Shelf Life In Days
 DocType: GL Entry,Is Opening,Adalah Membuka
+DocType: Department,Expense Approvers,Kelulusan Perbelanjaan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
 DocType: Journal Entry,Subscription Section,Seksyen Subskrip
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Akaun {0} tidak wujud
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index fde4460..93116b2 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,အကဲဖြတ်အစီရင်ခံစာများ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
-DocType: Purchase Receipt,Subscription Detail,subscription အသေးစိတ်
 DocType: Supplier Scorecard,Notify Supplier,ပေးသွင်းအကြောင်းကြားရန်
 DocType: Item,Customer Items,customer ပစ္စည်းများ
 DocType: Project,Costing and Billing,ကုန်ကျနှင့်ငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} တစ်ဦးလယ်ဂျာမဖွစျနိုငျ
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com မှ Item ထုတ်ဝေ
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,အီးမေးလ်အသိပေးချက်များ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,အကဲဖြတ်
 DocType: Item,Default Unit of Measure,တိုင်း၏ default ယူနစ်
 DocType: SMS Center,All Sales Partner Contact,အားလုံးသည်အရောင်း Partner ဆက်သွယ်ရန်
-DocType: Employee,Leave Approvers,ခွင့်ပြုချက် Leave
+DocType: Department,Leave Approvers,ခွင့်ပြုချက် Leave
 DocType: Sales Partner,Dealer,အရောင်းကိုယ်စားလှယ်
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,စုံစမ်းစစ်ဆေးမှုတွေ
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,check ရရှိနိုင်မှု
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ဒီပေးသွင်းဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,ဥပဒေကြောင်းအရ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},အမှန်တကယ် type ကိုအခွန်အတန်း {0} အတွက် Item နှုန်းကတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,ဥပဒေကြောင်းအရ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},အမှန်တကယ် type ကိုအခွန်အတန်း {0} အတွက် Item နှုန်းကတွင်ထည့်သွင်းမရနိုင်ပါ
 DocType: Bank Guarantee,Customer,ဝယ်သူ
 DocType: Purchase Receipt Item,Required By,အားဖြင့်လိုအပ်သော
 DocType: Delivery Note,Return Against Delivery Note,Delivery Note ကိုဆန့်ကျင်သို့ပြန်သွားသည်
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ဦးခေါင်း (သို့မဟုတ်အုပ်စုများ) စာရင်းကိုင် Entries စေကြနှင့်ချိန်ခွင်ထိန်းသိမ်းထားသည့်ဆန့်ကျင်။
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,လစာ process မှဆွဲထုတ်လိုက်တယ်တင်သွင်းမျှရှိနေပါသည်။
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,လစာ process မှဆွဲထုတ်လိုက်တယ်တင်သွင်းမျှရှိနေပါသည်။
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ပွင့်လင်းပြရန်
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ထပ်တလဲလဲဖော်ပြထားသောအထက်တွင်ယနေ့ကိုယ်တိုင်ကဤ action ယူရန်လိုအပ်သောကြောင့်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ထွက်ခွာသည်
 DocType: Pricing Rule,Apply On,တွင် Apply
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
 DocType: Support Settings,Support Settings,ပံ့ပိုးမှုက Settings
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
 ,Batch Item Expiry Status,အသုတ်ပစ္စည်းသက်တမ်းကုန်ဆုံးအခြေအနေ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ဘဏ်မှမူကြမ်း
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Membership,membership validaty section,အဖွဲ့ဝင် validaty အပိုင်း
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 DocType: Consultation,Consultation,တိုင်ပင်ဆွေးနွေး
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ပစ္စည်း
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,က်ဘ်ဆိုက်အောင်
 DocType: Opening Invoice Creation Tool Item,Quantity,အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ချေးငွေများ (စိစစ်)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ချေးငွေများ (စိစစ်)
 DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ
 DocType: Item,Country of Origin,မူရင်းထုတ်လုပ်သည့်နိုင်ငံ
 DocType: Soil Texture,Soil Texture Criteria,မြေဆီလွှာတွင်အသွေးအရောင်လိုအပ်ချက်
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,မူလတန်းဆက်သွယ်ပါအသေးစိတ်
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ပွင့်လင်းကိစ္စများ
 DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
 DocType: Lab Test Groups,Add new line,အသစ်ကလိုင်း Add
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
@@ -89,7 +85,7 @@
 ,Delay Days,နှောင့်နှေးနေ့ရက်များ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ဝယ်ကုန်စာရင်း
+DocType: Subscription Invoice,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Purchase Invoice Item,Item Weight Details,item အလေးချိန်အသေးစိတ်
 DocType: Asset Maintenance Log,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,row # {0}:
 DocType: Timesheet,Total Costing Amount,စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,ရက်စွဲကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Daily Work Summary Group,Holiday List,အားလပ်ရက်များစာရင်း
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,စာရင်းကိုင်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,စာရင်းကိုင်
 DocType: Hub Settings,Selling Price List,စျေးစာရင်းရောင်းချနေ
 DocType: Patient,Tobacco Current Use,ဆေးရွက်ကြီးလက်ရှိအသုံးပြုမှု
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,ရောင်းချနှုန်း
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,ရောင်းချနှုန်း
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K သည်
 DocType: Company,Phone No,Phone များမရှိပါ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},နယူး {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Sent ကနဦးအီးမေးလ်သတိပေးချက်
 ,Sales Partners Commission,အရောင်း Partners ကော်မရှင်
 DocType: Soil Texture,Sandy Clay Loam,စန္ဒီရွှံ့စေး Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,တန်ဖိုးပြီးနောက် Value တစ်ခု
 DocType: Student,O+,အို +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Related
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,တက်ရောက်သူနေ့စွဲန်ထမ်းရဲ့ပူးပေါင်းရက်စွဲထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,တက်ရောက်သူနေ့စွဲန်ထမ်းရဲ့ပူးပေါင်းရက်စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Grading Scale,Grading Scale Name,grade စကေးအမည်
-DocType: Subscription,Repeat on Day,နေ့တွင် Repeat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ဒါကအမြစ်အကောင့်ကိုဖြစ်ပါတယ်နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Sales Invoice,Company Address,ကုမ္ပဏီလိပ်စာ
 DocType: BOM,Operations,စစ်ဆင်ရေး
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} သည်လျှော့၏အခြေခံပေါ်မှာခွင့်ပြုချက်ထားနိုင်ဘူး
+DocType: Subscription,Subscription Start Date,subscription ကို Start နေ့စွဲ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာမအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} မတက်ကြွဘဏ္ဍာရေးတစ်နှစ်တာ။
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ကိုးကားစရာ: {0}, Item Code ကို: {1} နှင့်ဖောက်သည်: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,စမ်းသပ်မှုကာလပြီးဆုံးရက်စွဲရုံးတင်စစ်ဆေးကာလ Start ကိုနေ့စွဲမတိုင်မီမဖြစ်နိုင်သလား
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,ကီလိုဂရမ်
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM {1} အတန်းမှာကို item {0} subcontracting များအတွက်သတ်မှတ်ထားသောမဟုတ်ပါ
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,တူညီသော Company ကိုတစ်ကြိမ်ထက်ပိုပြီးသို့ ဝင်. ဖြစ်ပါတယ်
 DocType: Patient,Married,အိမ်ထောင်သည်
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ဘို့ခွင့်မပြု
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,အထဲကပစ္စည်းတွေကို Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,အထဲကပစ္စည်းတွေကို Get
 DocType: Price List,Price Not UOM Dependant,စျေး UOM မှီခိုမ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,ဘရိတ်ရေနံ
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
 ,Completed Work Orders,Completed လုပ်ငန်းခွင်အမိန့်
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Taxable ငွေပမာဏ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Taxable ငွေပမာဏ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
 DocType: BOM,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားသုံးစွဲမှုအရေးဆိုမှုသို့မဟုတ်ဂျာနယ် Entry &#39;တစ်ဦးဖြစ်ရပါမည်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM ကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားသုံးစွဲမှုအရေးဆိုမှုသို့မဟုတ်ဂျာနယ် Entry &#39;တစ်ဦးဖြစ်ရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM ကို Select လုပ်ပါ
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,အဆိုပါန်ထမ်းအားပေးပြီးမှစီမံခန့်ခွဲရန်ကြိုတင်ငွေပမာဏ
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Delivery သတိပေးချက်
 DocType: Journal Entry,Opening Entry,Entry &#39;ဖွင့်လှစ်
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,အကောင့်သာလျှင် Pay
-DocType: Employee Loan,Repay Over Number of Periods,ကာလနံပါတ်ကျော်ပြန်ဆပ်
+DocType: Loan,Repay Over Number of Periods,ကာလနံပါတ်ကျော်ပြန်ဆပ်
 DocType: Stock Entry,Additional Costs,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Lead,Product Enquiry,ထုတ်ကုန်ပစ္စည်း Enquiry
 DocType: Education Settings,Validate Batch for Students in Student Group,ကျောင်းသားအုပ်စုအတွက်ကျောင်းသားများအဘို့အသုတ်လိုက်မှန်ကန်ကြောင်းသက်သေပြ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},{1} များအတွက် {0} ဝန်ထမ်းများအတွက်မျှမတွေ့ခွင့်စံချိန်တင်
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},{1} များအတွက် {0} ဝန်ထမ်းများအတွက်မျှမတွေ့ခွင့်စံချိန်တင်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee Education,Under Graduate,ဘွဲ့လွန်အောက်မှာ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,HR က Settings ထဲမှာခွင့်အခြေအနေသတိပေးချက်များအတွက် default အ template ကိုသတ်မှတ်ထားပေးပါ။
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
 DocType: Soil Analysis,Ca/K,ca / K သည်
-DocType: Journal Entry Account,Employee Loan,ဝန်ထမ်းချေးငွေ
 DocType: Fee Schedule,Send Payment Request Email,ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်းအီးမေးလ်ပို့ပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,အောင်မြင်စွာမှတ်ပုံတင်မထားတဲ့။
 DocType: Assessment Result,Grade,grade
 DocType: Restaurant Table,No of Seats,ထိုင်ခုံ၏အဘယ်သူမျှမ
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ပြောင်းလဲနေသောဘာသာရပ်ထည့်ရန်တူ jinja tags များကိုသုံးပါ <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: Asset Maintenance Task,Asset Maintenance Task,ပိုင်ဆိုင်မှုကို Maintenance Task ကို
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,နှစ်ပတ်လည်လစာ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Daily Work Summary,Daily Work Summary,Daily သတင်းစာလုပ်ငန်းခွင်အကျဉ်းချုပ်
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ပိုမိုနှစ်သက်ဆက်သွယ်ရန်အီးမေးလ်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,ပိုမိုနှစ်သက်ဆက်သွယ်ရန်အီးမေးလ်ရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry &#39;
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,မူလတန်းလိပ်စာ
 DocType: Production Plan,Material Request Detail,ပစ္စည်းတောင်းဆိုခြင်းအသေးစိတ်
 DocType: Selling Settings,Default Quotation Validity Days,default စျေးနှုန်းသက်တမ်းနေ့ရက်များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: Sales Invoice,Change Amount,ပြောင်းလဲမှုပမာဏ
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,လိုင်စင်အုပ်စုများမောင်းနှင်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Delivery နေ့စွဲကိုရိုက်ထည့်ပေးပါ
 DocType: Depreciation Schedule,Make Depreciation Entry,တန်ဖိုး Entry &#39;Make
+DocType: HR Settings,Leave Settings,Settings များ Leave
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ထမ်း Make
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,အသံလွှင့်
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS ၏ setup mode ကို (အွန်လိုင်း / အော့ဖလိုင်း)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,လုပ်ငန်းခွင်အမိန့်ဆန့်ကျင်အချိန်မှတ်တမ်းများ၏ဖန်တီးမှုကိုပိတ်ထားသည်။ စစ်ဆင်ရေးလုပ်ငန်းခွင်အမိန့်ဆန့်ကျင်ခြေရာခံလိမ့်မည်မဟုတ်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,သတ်ခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,သတ်ခြင်း
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Asset Maintenance Log,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,အသင်းဝင်အသေးစိတ်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ပေးသွင်းပေးချေအကောင့် {2} ဆန့်ကျင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},စုစုပေါင်းနာရီ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},နေ့စွဲကနေဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ မှစ. ယူဆ = {0}
 DocType: Drug Prescription,Interval,အကြား
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ပိုမိုနှစ်ကြိုက်ခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ပိုမိုနှစ်ကြိုက်ခြင်း
 DocType: Grant Application,Individual,တစ်ဦးချင်း
 DocType: Academic Term,Academics User,ပညာရှင်တွေအသုံးပြုသူတို့၏
 DocType: Cheque Print Template,Amount In Figure,ပုံထဲမှာပမာဏ
-DocType: Employee Loan Application,Loan Info,ချေးငွေအင်ဖို
+DocType: Loan Application,Loan Info,ချေးငွေအင်ဖို
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ပြုပြင်ထိန်းသိမ်းမှုလာလည်သူများသည် Plan စ။
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,ပေးသွင်း Scorecard ကာလ
 DocType: Share Transfer,Share Transfer,ဝေမျှမယ်လွှဲပြောင်း
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,item Template ကို
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ဇီဝဓါတုဗေဒ
 DocType: Job Offer,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Value တစ်ခုအထဲက
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Value တစ်ခုအထဲက
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings များ
 DocType: Production Plan,Sales Orders,အရောင်းအမှာ
 DocType: Purchase Taxes and Charges,Valuation,အဘိုးထားခြင်း
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,default နယ်မြေတွေကို
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ရုပ်မြင်သံကြား
 DocType: Work Order Operation,Updated via 'Time Log',&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,ဖောက်သည်သို့မဟုတ်ပေးသွင်းရွေးချယ်ပါ။
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Company,Enable Perpetual Inventory,ထာဝရ Inventory Enable
+DocType: Bank Guarantee,Charges Incurred,မြှုတ်စွဲချက်
 DocType: Company,Default Payroll Payable Account,default လစာပေးရန်အကောင့်
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update ကိုအီးမေးလ်အုပ်စု
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,စိတ်တိုင်းကျရလဒ်
 DocType: Delivery Stop,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Course Assessment Criteria,Course Assessment Criteria,သင်တန်းအမှတ်စဥ်အကဲဖြတ်လိုအပ်ချက်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,အခွန် Id:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,အခွန် Id:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,ကျောင်းသားကဒ်:
 DocType: POS Customer Group,POS Customer Group,POS ဖောက်သည်အုပ်စု
 DocType: Land Unit,Land Unit describing various land assets,အမျိုးမျိုးသောမြေယာပိုင်ဆိုင်မှုများကိုဖော်ပြမြေယာယူနစ်
@@ -375,9 +372,8 @@
 ,Open Work Orders,ပွင့်လင်းသူ Work အမိန့်
 DocType: Payment Term,Credit Months,ခရက်ဒစ်လ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net က Pay ကို 0 င်ထက်လျော့နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",စနစ်ကနေထပ်တလဲလဲအမှားအကြောင်းကြားစာများပေးပို့ခြင်းရပ်တန့်ဖို့ကျနော်တို့ကြေးပေးသွင်းအတွက်မသန်စွမ်းလယ်ကို check လုပ်ထားကြပါပြီ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် &#39;&#39; ကြိုတင်ထုတ် Is &#39;&#39; စစ်ဆေးပါ။
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
 DocType: Email Digest,Profit & Loss,အမြတ်အစွန်း &amp; ဆုံးရှုံးမှု
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,ကျောင်းသားအဖွဲ့များအောက်တွင် ကျေးဇူးပြု. setup ကိုကျောင်းသားများ
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,ဘဏ်မှ Entries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,ဘဏ်မှ Entries
 DocType: Crop,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ကျောင်းသားအုပ်စုဖန်ဆင်းခြင်း Tool ကိုသင်တန်းအမှတ်စဥ်
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,သင်၏အဖွဲ့အစည်းမှာသင်ပေးတဲ့သူကလူ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software ကို Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Course Scheduling Tool,Course Start Date,သင်တန်းကို Start နေ့စွဲ
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,မက်စ်အဆင့်
 DocType: Email Digest,New Quotations,နယူးကိုးကားချက်များ
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ထမ်းရွေးချယ်နှစ်သက်သောအီးမေးလ်ကိုအပေါ်အခြေခံပြီးန်ထမ်းရန်အီးမေးလ်များကိုလစာစလစ်
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 DocType: Tax Rule,Shipping County,သဘောင်္တင်ခတီ
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Learn
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Learn
 DocType: Asset,Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ထမ်းနှုန်းဖြင့်လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ရှင်းရှင်းလင်းလင်းမှထူးချွန်ထက်မြက် Cheques နှင့်စာရင်း
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
 DocType: Driver,Fleet Manager,ရေယာဉ်စု Manager ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},အတန်း # {0}: {1} ကို item {2} ဘို့အနုတ်လက္ခဏာမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},အတန်း # {0}: {1} ကို item {2} ဘို့အနုတ်လက္ခဏာမဖွစျနိုငျ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,မှားယွင်းနေ Password ကို
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{} အပေါ်ဟိုတယ်အခန်းနှုန်းသတ်မှတ်ပေးပါ
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Opening Invoice Creation Tool,Invoice Type,ကုန်ပို့လွှာ Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Delivery မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Delivery မှတ်ချက်
 DocType: Consultation,Encounter Impression,တှေ့ဆုံရလဒ်ပြသမှု
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,ရောင်းချပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Course Scheduling Tool,Course Scheduling Tool,သင်တန်းစီစဉ်ခြင်း Tool ကို
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,ထပ်တလဲလဲကို% s% များအတွက် s ကိုဖန်တီးနေချိန်တွင် [အရေးပေါ်] မှားယွင်းနေသည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
 DocType: Land Unit,LInked Analysis,နှင့်ဆက်စပ်သုံးသပ်ခြင်း
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,လျှောက်လွှာကာလနှစ်ခုခွဲဝေမှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,လျှောက်လွှာကာလနှစ်ခုခွဲဝေမှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ကျောင်းသားအဖွဲ့များ Create
 DocType: Volunteer,Weekends,တနင်္ဂနွေ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,credit မှတ်ချက်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,credit မှတ်ချက်ငွေပမာဏ
 DocType: Setup Progress Action,Action Document,လှုပ်ရှားမှုစာရွက်စာတမ်း
 DocType: Chapter Member,Website URL,website URL ကို
 ,Finished Goods,လက်စသတ်ကုန်စည်
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,ပစ္စည်းများ Add
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,item အရည်အသွေးစစ်ဆေးရေး Parameter
+DocType: Leave Application,Leave Approver Name,ခွင့်ပြုချက်အမည် Leave
 DocType: Depreciation Schedule,Schedule Date,ဇယားနေ့စွဲ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ဝင်ငွေရရှိမှု, ဖြတ်တောက်ခြင်းများကိုများနှင့်အခြားလစာအစိတ်အပိုင်းများ"
 DocType: Packed Item,Packed Item,ထုပ်ပိုး Item
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,စျေးနှုန်းအဘို့တောင်းဆိုခြင်း
 DocType: Healthcare Settings,Require Lab Test Approval,Lab ကစမ်းသပ်အတည်ပြုချက်လိုအပ်
 DocType: Salary Slip Timesheet,Working Hours,အလုပ်လုပ်နာရီ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,ထူးချွန်စုစုပေါင်း
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,ထူးချွန်စုစုပေါင်း
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
 DocType: Dosage Strength,Strength,ခွန်အား
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
 DocType: Student Log,Medical,ဆေးဘက်ဆိုင်ရာ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,အကောင့်နံပါတ်ကိုအပ်ဒိတ်လုပ်
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ခဲပိုင်ရှင်အခဲအဖြစ်အတူတူပင်မဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,တခုတည်းသော
 DocType: Salary Slip,Total Loan Repayment,စုစုပေါင်းချေးငွေပြန်ဆပ်
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
-DocType: Subscription,Yearly,နှစ်အလိုက်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
 DocType: Drug Prescription,Dosage,ဆေးတခါသောက်
 DocType: Journal Entry Account,Sales Order,အရောင်းအမှာစာ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
 DocType: Assessment Plan,Examiner Name,စစျဆေးသူအမည်
 DocType: Lab Test Template,No Result,အဘယ်သူမျှမရလဒ်
 DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ကုမ္ပဏီအမည်ကိုပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice,Supplier Name,ပေးသွင်းအမည်
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ထို ERPNext လက်စွဲစာအုပ် Read
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,အားလုံးဦးစီးဌာနအဖွဲ့ဝင်များအနက် Show ကိုအရွက်ပြက္ခဒိန်မှာတော့
 DocType: Purchase Invoice,01-Sales Return,01-အရောင်းပြန်သွား
 DocType: Account,Is Group,အုပ်စုဖြစ်ပါတယ်
 DocType: Email Digest,Pending Purchase Orders,ဆိုင်းငံ့အရစ်ကျအမိန့်
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,မသင်မနေရကိုလယ် - ပညာရေးဆိုင်ရာတစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} နှင့်အတူဆက်စပ်ခြင်းမရှိပါ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,အီးမေးလ်ရဲ့တစ်စိတ်တစ်ပိုင်းအဖြစ်ဝင်သောနိဒါန်းစာသားစိတ်ကြိုက်ပြုလုပ်ပါ။ အသီးအသီးအရောင်းအဝယ်သီးခြားနိဒါန်းစာသားရှိပါတယ်။
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},ကုမ္ပဏီ {0} များအတွက် default အနေနဲ့ပေးဆောင်အကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},ကုမ္ပဏီ {0} များအတွက် default အနေနဲ့ပေးဆောင်အကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},ငွေသွင်းငွေထုတ်ရပ်တန့်လုပ်ငန်းခွင်အမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
 DocType: Setup Progress Action,Min Doc Count,min Doc အရေအတွက်
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ရောင်းမည် reserved
 DocType: Packing Slip,From Package No.,Package ကိုအမှတ်ကနေ
 DocType: Item Attribute,To Range,Range ကိုမှ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ဒါဟာ၏ကိုယ်ပိုင်အဘိုးပြတ်နည်းလမ်းမရှိပါဘူးရသောအချို့သောပစ္စည်းဆန့်ကျင်အရောင်းအရှိဖြစ်သကဲ့သို့, အဘိုးပြတ်နည်းလမ်းမပြောင်းနိုင်သလား"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Securities and စာရင်း
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ဒါဟာ၏ကိုယ်ပိုင်အဘိုးပြတ်နည်းလမ်းမရှိပါဘူးရသောအချို့သောပစ္စည်းဆန့်ကျင်အရောင်းအရှိဖြစ်သကဲ့သို့, အဘိုးပြတ်နည်းလမ်းမပြောင်းနိုင်သလား"
 DocType: Student Report Generation Tool,Attended by Parents,မိဘများအနေဖြင့်တက်ရောက်ခဲ့သည်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Patient,AB Positive,AB အပြုသဘောဆောင်သော
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,တက်ရောက်သူစံချိန်တင်။
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet အခြေစိုက်လုပ်ခလစာများအတွက်လစာစိတျအပိုငျး။
 DocType: Sales Order Item,Used for Production Plan,ထုတ်လုပ်ရေးစီမံကိန်းအတွက်အသုံးပြု
-DocType: Employee Loan,Total Payment,စုစုပေါင်းငွေပေးချေမှုရမည့်
+DocType: Loan,Total Payment,စုစုပေါင်းငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Completed သူ Work Order အတွက်အရောင်းအဝယ်မပယ်ဖျက်နိုင်ပါ။
 DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ်အတွက်) Operations အကြားတွင်အချိန်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,လုပ်ဆောင်ချက်ပြီးစီးမရနိုင်ဒါကြောင့် {0} {1} ဖျက်သိမ်းနေသည်
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Build ဖို့လုံလောက်တဲ့အစိတ်အပိုင်းများ
 DocType: POS Profile User,POS Profile User,POS ကိုယ်ရေးဖိုင်အသုံးပြုသူ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
+DocType: Subscription Invoice,Subscription Invoice,subscription ငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
 DocType: Patient Appointment,Date TIme,ရက်စွဲအချိန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ကုမ္ပဏီနှင့်အခွန်တက်ချိန်ညှိခြင်း
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
 DocType: Codification Table,Codification Table,Codification ဇယား
 DocType: Timesheet Detail,Hrs,နာရီ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Stock Entry Detail,Difference Account,ခြားနားချက်အကောင့်
 DocType: Purchase Invoice,Supplier GSTIN,ပေးသွင်း GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,ငွေသား Flow မြေပုံ Template ကို
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
+DocType: Bank Guarantee,Providing,ပေး
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","အခွင့်မရှိကြရန်လိုအပ်ပါသည်အဖြစ်, Lab ကစမ်းသပ် Template ကို configure"
 DocType: Patient,Risk Factors,စွန့်စားမှုအချက်များ
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
 DocType: Healthcare Settings,Appointment Confirmation,ခန့်အပ်တာဝန်ပေးခြင်းအတည်ပြုချက်
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),(Cr) ပိတ်ပစ်
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ဟလို
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Item Move
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","အသုံးပြုသူများအတွက် POS ပရိုဖိုင်း {0} အတွက်ယခုပင်လျှင် set ကို default {1}, ကြင်နာစွာမသန်စွမ်းက default"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,စုဆောင်းတန်ဖိုးများ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,နယ်မြေတွေကို POS ကိုယ်ရေးဖိုင်အတွက်လိုအပ်သောဖြစ်ပါတယ်
 DocType: Supplier,Prevent RFQs,ကာကွယ်ဆေး RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{1} မှ {0} ကနေကာလအတွက်တင်သွင်းလစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{1} မှ {0} ကနေကာလအတွက်တင်သွင်းလစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,shipping ဘီလ်နေ့စွဲ
 DocType: Production Plan,Production Plan,ထုတ်လုပ်မှုအစီအစဉ်
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ဖွင့်လှစ်ငွေတောင်းခံလွှာဖန်ဆင်းခြင်း Tool ကို
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,အရောင်းသို့ပြန်သွားသည်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,မှတ်ချက်: စုစုပေါင်းခွဲဝေရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုရွက် {1} ထက်လျော့နည်းမဖြစ်သင့်ပါဘူး
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Serial ဘယ်သူမျှမက Input ကိုအပျေါအခွခေံအရောင်းအဝယ်အတွက်အရည်အတွက် Set
 ,Total Stock Summary,စုစုပေါငျးစတော့အိတ်အကျဉ်းချုပ်
 DocType: Announcement,Posted By,အားဖြင့် Posted
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Training Result Employee,Training Result Employee,လေ့ကျင့်ရေးရလဒ်ထမ်း
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
-DocType: Repayment Schedule,Principal Amount,ကျောင်းအုပ်ကြီးငွေပမာဏ
-DocType: Employee Loan Application,Total Payable Interest,စုစုပေါင်းပေးရန်စိတ်ဝင်စားမှု
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ကျောင်းအုပ်ကြီးငွေပမာဏ
+DocType: Loan Application,Total Payable Interest,စုစုပေါင်းပေးရန်စိတ်ဝင်စားမှု
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ထူးချွန်စုစုပေါင်း: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,အရောင်းပြေစာ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
 DocType: Restaurant Reservation,Restaurant Reservation,စားသောက်ဆိုင် Reservation များ
 DocType: Land Unit,Land Unit Name,မြေယာယူနစ်အမည်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,အဆိုပြုချက်ကို Writing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,"တက်အရှေ့ဥရောပ, တောင်အာဖရိက"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,အီးမေးလ်ကနေတဆင့်ဖောက်သည်အကြောင်းကြားရန်
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,အီးမေးလ်ကနေတဆင့်ဖောက်သည်အကြောင်းကြားရန်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,နောက်ထပ်အရောင်းပုဂ္ဂိုလ် {0} တူညီသောန်ထမ်းက id နှင့်အတူတည်ရှိ
 DocType: Employee Advance,Claimed Amount,အခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/education.py +180,Masters,မာစတာ
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","ဖန်တီးမပေးချေမှု Gateway ရဲ့အကောင့်ကို, ကို manually တဦးတည်းဖန်တီးပါ။"
 DocType: Supplier Scorecard,Per Year,တစ်နှစ်လျှင်
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB နှုန်းအတိုင်းဤအစီအစဉ်ကိုအတွက်ဝန်ခံချက်များအတွက်သတ်မှတ်ချက်မပြည့်မီ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Sales Invoice,Sales Taxes and Charges,အရောင်းအခွန်နှင့်စွပ်စွဲချက်
 DocType: Employee,Organization Profile,အစည်းအရုံးကိုယ်ရေးအချက်အလက်များ profile
 DocType: Vital Signs,Height (In Meter),(မီတာများတွင်) အမြင့်
 DocType: Student,Sibling Details,မှေးခငျြးအသေးစိတ်
 DocType: Vehicle Service,Vehicle Service,ယာဉ်ဝန်ဆောင်မှု
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,အလိုအလျှောက်အခြေအနေများအပေါ် အခြေခံ. တုံ့ပြန်ချက်တောင်းဆိုမှုကိုအစပျိုးလိုက်ခြင်းဖြစ်သည်။
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,အလိုအလျှောက်အခြေအနေများအပေါ် အခြေခံ. တုံ့ပြန်ချက်တောင်းဆိုမှုကိုအစပျိုးလိုက်ခြင်းဖြစ်သည်။
 DocType: Employee,Reason for Resignation,ရာထူးမှနုတ်ထွက်ရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,စွမ်းဆောင်ရည်အကဲဖြတ်သုံးသပ်ဖို့သည် template ။
 DocType: Sales Invoice,Credit Note Issued,ခရက်ဒစ်မှတ်ချက်ထုတ်ပေး
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,ပြုပြင်ထိန်းသိမ်းမှုဇယား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ဝန်ထမ်းချေးငွေစီမံခန့်ခွဲမှု
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 နှင့်အတူ relation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager က
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager က
 DocType: Payment Entry,Payment From / To,/ စေရန် မှစ. ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ဂိုဒေါင် {0} အတွက်အကောင့်ကိုသတ်မှတ်ပေးပါ
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,အဘို့လမ်းကြောင်းကိုရှာမတွေ့ပါ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ဖွင့်ပွဲ (ဒေါက်တာ)
+DocType: Loan,Applicant,လြှောကျသူ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Post Timestamp ကို {0} နောက်မှာဖြစ်ရပါမည်
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,စာရွက်စာတမ်းများထပ်တလဲလဲလုပ်
 ,GST Itemised Purchase Register,GST Item ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Course Scheduling Tool,Reschedule,ပြန်လည်စီမံကိန်းပြုလုပ်
-DocType: Employee Loan,Total Interest Payable,စုစုပေါင်းအကျိုးစီးပွားပေးရန်
+DocType: Loan,Total Interest Payable,စုစုပေါင်းအကျိုးစီးပွားပေးရန်
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ကုန်ကျစရိတ်အခွန်နှင့်စွပ်စွဲချက်ဆင်းသက်
 DocType: Work Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,အပြီးသတ်
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,base
 DocType: Timesheet,Total Billed Hours,စုစုပေါင်းကောက်ခံခဲ့နာရီ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
 DocType: Leave Block List Allow,Allow User,အသုံးပြုသူ Allow
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
 DocType: Company,Gain/Loss Account on Asset Disposal,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်းအကောင့်
 DocType: Vehicle Log,Service Details,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: Vehicle Log,Service Details,ဝန်ဆောင်မှုအသေးစိတ်
-DocType: Subscription,Quarterly,သုံးလတစ်ကြိမ်
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,အုပ်စုဖွဲ့
 DocType: Selling Settings,Delivery Note Required,Delivery မှတ်ချက်လိုအပ်သော
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,အချိန်ဇယား
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ကုန်ကြမ်းပစ္စည်းများအခြေပြုတွင်
 DocType: Sales Invoice,Port Code,ဆိပ်ကမ်း Code ကို
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,reserve ဂိုဒေါင်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,reserve ဂိုဒေါင်
 DocType: Lead,Lead is an Organization,ခဲထားတဲ့အဖွဲ့အစည်းဖြစ်ပါတယ်
 DocType: Guardian Interest,Interest,စိတ်ဝင်စားမှု
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,အကြိုအရောင်း
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,ငွေစာရင်း
 DocType: Vehicle,Odometer Value (Last),Odometer Value ကို (နောက်ဆုံး)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,ကုန်ပစ္စည်းပေးသွင်း scorecard စံ၏ Templates ကို။
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 DocType: Request for Quotation,Get Suppliers,ပေးသွင်းရယူလိုက်ပါ
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,သင့်ရဲ့အဖွဲ့ဝင်ရက်ပေါင်း 30 အတွင်းကုန်ဆုံးလျှင်သင်သာသက်တမ်းတိုးလို့ရပါတယ်
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,သငျသညျ setup ကိုငွေ Flow Mapper စာရွက်စာတမ်းများရှိပါကသာလျှင် select လုပ်ပါ
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Supplier Scorecard,Per Week,per အပတ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,စုစုပေါင်းကျောင်းသား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry &#39;
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,ကုမ္ပဏီနှင့်ငွေစာရင်း
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Value တစ်ခုအတွက်
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Value တစ်ခုအတွက်
 DocType: Asset Settings,Depreciation Options,တန်ဖိုးလျော့ Options ကို
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,မှားနေသော post အချိန်
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,မှားနေသော post အချိန်
 DocType: Lead,Campaign Name,ကင်ပိန်းအမည်
 DocType: Hotel Room,Capacity,စွမ်းဆောင်ရည်
 DocType: Selling Settings,Close Opportunity After Days,နေ့ရက်များပြီးနောက်နီးကပ်အခွင့်အလမ်း
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Budget,Budget Against,ဘတ်ဂျက်ဆန့်ကျင်
 DocType: Employee,Cell Number,cell အရေအတွက်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ပေးထားသောစံအဘို့အဘယ်သူမျှမန်ထမ်းရှိပါတယ်။ လစာချော်ပြီးသားဖန်တီးခဲ့ကြပြီမဟုတ်ကြောင်းစစ်ဆေးပါ။
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ပေးထားသောစံအဘို့အဘယ်သူမျှမန်ထမ်းရှိပါတယ်။ လစာချော်ပြီးသားဖန်တီးခဲ့ကြပြီမဟုတ်ကြောင်းစစ်ဆေးပါ။
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,စားပွဲတစ်ခုကို select ပေးပါ
 DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;လက်ခံသူများ&#39; &#39;တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
 DocType: Special Test Items,Particulars,အထူးသဖြင့်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးစည်းကမ်းများတူညီတဲ့စံနှင့်အတူတည်ရှိ, ဦးစားပေးတာဝန်ပေးဖို့ခြင်းဖြင့်ပဋိပက္ခဖြေရှင်းရန်ပါ။ စျေးစည်းကမ်းများ: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Asset,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
+DocType: Subscriber,Subscriber,စာရင်းပေးသွင်းသူ
 DocType: Item Attribute Value,Item Attribute Value,item Attribute Value တစ်ခု
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,သင့်ရဲ့ Project မှအဆင့်အတန်းကိုအပ်ဒိတ်လုပ် ကျေးဇူးပြု.
 DocType: Item,Maximum sample quantity that can be retained,ထိန်းသိမ်းထားနိုင်အများဆုံးနမူနာအရေအတွက်
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းသည် default setting များ
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,အချိန်အပိုင်းအခြားများအား Add
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ဂျာနယ် Entry &#39;{0} ကနေတဆင့်ဖျက်သိမ်းပိုင်ဆိုင်မှု
-DocType: Employee Loan,Interest Income Account,အကျိုးစီးပွားဝင်ငွေခွန်အကောင့်
+DocType: Loan,Interest Income Account,အကျိုးစီးပွားဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ဆန်းစစ်ခြင်းဖိတ်ကြားလွှာ Sent
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ဇီဝနည်းပညာ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ကိုသွားပါ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,အီးမေးလ်အကောင့်ကိုဖွင့်သတ်မှတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Asset Repair,Downtime,ကျချိန်
 DocType: Account,Liability,တာဝန်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,ပညာရေးဆိုင်ရာ Term:
 DocType: Salary Detail,Do not include in total,စုစုပေါင်းမပါဝင်ပါနဲ့
 DocType: Company,Default Cost of Goods Sold Account,ကုန်စည်၏ default ကုန်ကျစရိတ်အကောင့်ရောင်းချ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},နမူနာအရေအတွက် {0} လက်ခံရရှိအရေအတွက် {1} ထက်ပိုမဖွစျနိုငျ
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Request for Quotation Supplier,Send Email,အီးမေးလ်ပို့ပါ
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 DocType: Item,Max Sample Quantity,မက်စ်နမူနာအရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,quote တောင်းဆိုထားသော
 DocType: Vital Signs,Heart Rate / Pulse,နှလုံးခုန်နှုန်း / Pulse
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab ကစမ်းသပ်မှုများနှင့်အရေးပါသောလက္ခဏာများ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
-DocType: Subscription,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Project မှ Update ကို။
 DocType: SMS Center,All Customer Contact,အားလုံးသည်ဖောက်သည်ဆက်သွယ်ရန်
 DocType: Land Unit,Tree Details,သစ်ပင်ကိုအသေးစိတ်
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,All item အဖွဲ့များ
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Work Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Reselect, ရွေးကောက်တော်မူသောလိပ်စာမှတပါးပြီးနောက် edited လျှင်"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Item,Hub Publishing Details,hub ထုတ်ဝေရေးအသေးစိတ်
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,လုပ်ပါရန်ပွင့်လင်း
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
 DocType: Lab Test Template,Result Format,ရလဒ် Format ကို
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,ဘရိတ် Pad
 DocType: Fertilizer,Fertilizer Contents,ဓာတ်မြေသြဇာမာတိကာ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ဘီလ်မှငွေပမာဏကို
 DocType: Company,Registration Details,မှတ်ပုံတင်ခြင်းအသေးစိတ်ကို
 DocType: Timesheet,Total Billed Amount,စုစုပေါင်းကောက်ခံခဲ့ပမာဏ
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,အရောင်းအမိန့်မှာ Bypass လုပ်ရအကြွေးကန့်သတ်စစ်ဆေးမှုများ
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,စွမ်းဆောင်ရည်အကဲဖြတ်။
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","စျေးဝယ်လှည်း enabled အတိုင်း, &#39;&#39; စျေးဝယ်လှည်းများအတွက်သုံးပါ &#39;&#39; ကို Enable နှင့်စျေးဝယ်လှည်းဘို့အနည်းဆုံးအခွန်စည်းမျဉ်းရှိသင့်တယ်"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဒါကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်မဲအဖြစ်ဆွဲထုတ်ထားရမည်ဆိုပါကငွေပေးချေမှုရမည့် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်စပ်နေသည်, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဒါကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်မဲအဖြစ်ဆွဲထုတ်ထားရမည်ဆိုပါကငွေပေးချေမှုရမည့် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်စပ်နေသည်, စစ်ဆေးပါ။"
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,point-of-Sale
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,နိမ့်ဆုံးလက်ခံ
 DocType: Item Attribute,Item Attribute Values,item Attribute တန်ဖိုးများ
 DocType: Examination Result,Examination Result,စာမေးပွဲရလဒ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ဝယ်ယူခြင်း Receipt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},ကိုးကားစရာ DOCTYPE {0} တယောက်ဖြစ်ရပါမည်
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Work Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,လွှဲပြောင်းရရှိနိုင်ပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,လွှဲပြောင်းရရှိနိုင်ပစ္စည်းများအဘယ်သူမျှမ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),ပိတ် (ဖွင့်ပွဲ + စုစုပေါင်း)
 DocType: Journal Entry,Depreciation Entry,တန်ဖိုး Entry &#39;
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
 DocType: Crop Cycle,ISO 8016 standard,က ISO 8016 စံ
 DocType: Pricing Rule,Rate or Discount,rate သို့မဟုတ်လျှော့
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Purchase Receipt Item Supplied,Required Qty,မရှိမဖြစ်တဲ့ Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,အနှစ်သက်ဆုံး
 DocType: Hub Settings,Custom Data,စိတ်တိုင်းကျမှာ Data
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,ဆေးဘက်ဆိုင်ရာကျင့်ထုံးစံ
 DocType: Soil Texture,Clay Composition (%),ရွှံ့ရေးစပ်သီကုံး (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,အလုပ်တခုကိုတာဝန်ပေးဖို့မတိုင်မီကယ်တင်ပေးပါ။
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ချိန်ခွင် Value တစ်ခု
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ချိန်ခွင် Value တစ်ခု
 DocType: Lab Test,Lab Technician,ဓာတ်ခွဲခန်းပညာရှင်
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","check လုပ်ထားပါက, ဖောက်သည်တစ်ဦးလူနာတစ်ခုသို့ဆက်စပ်, နေသူများကဖန်တီးလိမ့်မည်။ လူနာငွေတောင်းခံလွှာဒီဖောက်သည်ဆန့်ကျင်နေသူများကဖန်တီးလိမ့်မည်။ လူနာကိုစဉ်ကိုလည်းသင်ရှိပြီးသားဖောက်သည်ရွေးချယ်နိုင်ပါသည်။"
 DocType: Bank Reconciliation,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,ကုမ္ပဏီထဲမှာအကောင့်ပိတ် Round ကိုဖော်ပြရန် ကျေးဇူးပြု.
 DocType: Purchase Receipt,Range,အကွာအဝေး
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
 DocType: Item Barcode,Item Barcode,item Barcode
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","generated ခံရဖို့။ နှောင့်နှေးလျှင်, သင်ကိုယ်တိုင်ဒီ၏ &quot;Repeat လ၏နေ့တွင်&quot; လယ်ကိုပြောင်းလဲပစ်ရန်ရှိသည်လိမ့်မယ်"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
 DocType: Share Transfer,From Folio No,ဖိုလီယိုအဘယ်သူမျှမကနေ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,ရရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲ
 DocType: Guardian,Guardian Name,ဂါးဒီးယန်းသတင်းစာအမည်
 DocType: Cheque Print Template,Has Print Format,ရှိပါတယ်ပရင့်ထုတ်ရန် Format ကို
-DocType: Employee Loan,Sanctioned,ဒဏ်ခတ်အရေးယူ
+DocType: Loan,Sanctioned,ဒဏ်ခတ်အရေးယူ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,မဖြစ်မနေဖြစ်ပါတယ်။ ဒီတစ်ခါလည်းငွေကြေးစနစ်အိတ်ချိန်းစံချိန်ဖန်တီးသည်မ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
 DocType: Crop Cycle,Crop Cycle,သီးနှံ Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ &#39;&#39; List ကိုထုပ်ပိုး &#39;&#39; စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို &#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို &#39;&#39; Pack များစာရင်း &#39;&#39; စားပွဲကိုမှကူးယူလိမ့်မည်။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ &#39;&#39; List ကိုထုပ်ပိုး &#39;&#39; စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို &#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို &#39;&#39; Pack များစာရင်း &#39;&#39; စားပွဲကိုမှကူးယူလိမ့်မည်။"
 DocType: Student Admission,Publish on website,website တွင် Publish
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+DocType: Subscription,Cancelation Date,ပယ်ဖျက်ခြင်းနေ့စွဲ
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
 DocType: Agriculture Task,Agriculture Task,စိုက်ပျိုးရေးလုပ်ငန်း
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Student Attendance Tool,Student Attendance Tool,ကျောင်းသားများကျောင်း Tool ကို
 DocType: Restaurant Menu,Price List (Auto created),စျေးစာရင်း (အော်တို created)
 DocType: Cheque Print Template,Date Settings,နေ့စွဲက Settings
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,မီတာ
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab ကစမ်းသပ် DATETIME စုဆောင်းခြင်း DATETIME မတိုင်မီမဖွစျနိုငျ
+DocType: Subscription Plan,Cost,ပေးရ
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
 DocType: Expense Claim,Total Advance Amount,စုစုပေါင်းကြိုတင်ပမာဏ
 DocType: Delivery Stop,Estimated Arrival,ခန့်မှန်းခြေဆိုက်ရောက်ဗီဇာ
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
 DocType: Timesheet Detail,Bill,ဘီလ်
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,အဖြူ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),အတန်း {0}: ({2} {3}) entry ကို၏အချိန်ပို့စ်တင်မှာ {1} ဂိုဒေါင်ထဲမှာ {4} များအတွက်အရည်အတွက်ရရှိနိုင်မ
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,သင်သာစစ်ဆေးမှုများသေတ္တာများစာရင်းထဲကတဦးတည်း option ကိုအများဆုံးရွေးချယ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
 DocType: Item,Automatically Create New Batch,နယူးသုတ်အလိုအလျှောက် Create
 DocType: Item,Automatically Create New Batch,နယူးသုတ်အလိုအလျှောက် Create
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{1} (အတန်း {2}) မှ {0} သတ်မှတ်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{1} (အတန်း {2}) မှ {0} သတ်မှတ်ခြင်း
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,လုပ်ပါ
 DocType: Student Admission,Admission Start Date,ဝန်ခံချက် Start ကိုနေ့စွဲ
 DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,နယူးန်ထမ်း
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 DocType: Repayment Schedule,Balance Loan Amount,balance ချေးငွေပမာဏ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ဇယားသင်တန်းအမှတ်စဥ်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,စတော့အိတ် Options ကို
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,စတော့အိတ် Options ကို
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,အရစ်ကျအမိန့်ထဲမှာကိုရယူနေနောက်ဆုံးဝယ်ယူအသေးစိတ် Disable
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ထုပ်ပိုး Item စလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Purchase Invoice,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},တစ် {0} ကိုသတ်မှတ်ပေးပါ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,မူကွဲဖန်ဆင်းခြင်းတန်းစီလျက်ရှိသည်။
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} များအတွက်အလုပ်အနှစ်ချုပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,အဆိုပါစာရင်းထဲတွင်ပထမဦးဆုံးခွင့်သဘောတူညီချက်ကို default ခွင့်သဘောတူညီချက်ပေးအဖြစ်သတ်မှတ်ထားပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Plan,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Training Event,Self-Study,self-လေ့လာ
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,လုပ်ခလစာ
 DocType: Asset Maintenance,Maintenance Manager Name,ကို Maintenance Manager ကိုအမည်
 DocType: Agriculture Task,Urgent,အမြန်လိုသော
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},{1} table ထဲမှာအတန်း {0} သည်မှန်ကန်သော Row ID ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},{1} table ထဲမှာအတန်း {0} သည်မှန်ကန်သော Row ID ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,variable ကိုရှာတွေ့ဖို့မအောင်မြင်ဘူး:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,နံပါတ်ကွက်ထဲကနေတည်းဖြတ်ရန်လယ်ကို select ပေးပါ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,စတော့အိတ် Ledger နေသူများကဖန်တီးသောသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုကို item မဖြစ်နိုင်ပါ။
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,အရည်အသွေးစစ်ဆေးရေး Template: အမည်
 DocType: Project,First Email,ပထမဦးစွာအီးမေးလ်
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ငွေပမာဏရောင်းချနေ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ငွေပမာဏရောင်းချနေ
 DocType: Repayment Schedule,Interest Amount,အကျိုးစီးပွားငွေပမာဏ
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 DocType: Share Transfer,Issue,ထုတ်ပြန်သည်
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 ,Projected Quantity as Source,အရင်းအမြစ်အဖြစ်စီမံကိန်းအရေအတွက်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Delivery ခရီးစဉ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Delivery ခရီးစဉ်
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,လွှဲပြောင်းခြင်းပုံစံ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,အရောင်းအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,အရောင်းအသုံးစရိတ်များ
 DocType: Consultation,Diagnosis,ရောဂါအမည်ဖေါ်ခြင်း
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,စာပို့သင်္ကေတ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},ချေးငွေ {0} စိတ်ဝင်စားကြောင်းဝင်ငွေအကောင့်ကိုရွေးချယ်ပါ
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
 DocType: Item,Default Supplier,default ပေးသွင်း
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ထုတ်လုပ်မှု Allow ရာခိုင်နှုန်းကျော်
-DocType: Employee Loan,Repayment Schedule,ပြန်ဆပ်ဇယား
+DocType: Loan,Repayment Schedule,ပြန်ဆပ်ဇယား
 DocType: Shipping Rule Condition,Shipping Rule Condition,သဘောင်္တင်ခ Rule အခြေအနေ
 DocType: Holiday List,Get Weekly Off Dates,အပတ်စဉ်ပိတ် Get နေ့ရက်များ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,တက်ရောက်သူ Freeze နေ့စွဲ
 DocType: Education Settings,Attendance Freeze Date,တက်ရောက်သူ Freeze နေ့စွဲ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,သင့်ရဲ့ပေးသွင်းသူများ၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,အားလုံးကုန်ပစ္စည်းများ View
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,အားလုံးကုန်ပစ္စည်းများ View
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),နိမ့်ဆုံးခဲခေတ် (နေ့ရက်များ)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),နိမ့်ဆုံးခဲခေတ် (နေ့ရက်များ)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,အားလုံး BOMs
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
 DocType: Driver,Cellphone Number,ဆဲလ်ဖုန်းနံပါတ်
 DocType: Project,Monitor Progress,တိုးတက်မှုစောင့်ကြည့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
 DocType: Journal Entry,Make Difference Entry,Difference Entry &#39;ပါစေ
+DocType: Supplier Quotation,Auto Repeat Section,အော်တိုထပ်ခါတလဲလဲပုဒ်မ
 DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက်
 DocType: Appraisal Template Goal,Key Performance Area,Key ကိုစွမ်းဆောင်ရည်ဧရိယာ
 DocType: Program Enrollment,Transportation,သယ်ယူပို့ဆောင်ရေး
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,မှားနေသော Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},အရေအတွက်ထက်လျော့နည်းသို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+DocType: Department Approver,Department Approver,ဦးစီးဌာနသဘောတူညီချက်ပေး
 DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင်
 DocType: Employee Advance,Claimed,ပြောဆိုထားသည်
 DocType: Crop,Row Spacing,အတန်း Spacing
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးပြေစာ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,contribution%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","အဆိုပါဝယ်ချိန်ညှိမှုများနှုန်းအဖြစ်ဝယ်ယူမိန့်လိုအပ်ပါသည် == &#39;&#39; ဟုတ်ကဲ့ &#39;&#39;, ထို့နောက်အရစ်ကျငွေတောင်းခံလွှာအတွက်, အသုံးပြုသူကို item {0} များအတွက်ပထမဦးဆုံးဝယ်ယူအမိန့်ကိုဖန်တီးရန်လိုအပ်တယ်ဆိုရင်"
+,HSN-wise-summary of outward supplies,အပြင်ထောက်ပံ့ရေးပစ္စည်းများ၏ HSN ပညာရှိ-အကျဉ်းချုပ်
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,သင့်ရဲ့ကိုးကားနိုင်ရန်ကုမ္ပဏီမှတ်ပုံတင်နံပါတ်များ။ အခွန်နံပါတ်များစသည်တို့
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
@@ -1502,7 +1501,7 @@
 DocType: Setup Progress Action,Action Name,လှုပ်ရှားမှုအမည်
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start ကိုတစ်နှစ်တာ
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN ၏ပထမဦးဆုံး 2 ဂဏန်းပြည်နယ်အရေအတွက်သည် {0} နှင့်အတူကိုက်ညီသင့်တယ်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,ကောင်စီ / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,ကောင်စီ / LC
 DocType: Purchase Invoice,Start date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏နေ့စွဲ Start
 DocType: Salary Slip,Leave Without Pay,Pay ကိုမရှိရင် Leave
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
@@ -1520,26 +1519,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,လယ်ကွင်းများသာဖန်ဆင်းခြင်းအချိန်တွင်ကျော်ကူးယူပါလိမ့်မည်။
 DocType: Setup Progress Action,Domains,domains
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,စီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,စီမံခန့်ခွဲမှု
 DocType: Cheque Print Template,Payer Settings,အခွန်ထမ်းက Settings
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
 DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,သတိ
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',&#39;&#39; {0} &#39;&#39; နေ့ကတာဝန်အတွက်အဆုံးသောနေ့ထက် သာ. ကြီးမြတ်သည် Start
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
 DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,item Code ကို Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,item Code ကို Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ကူးပြောင်းခြင်း Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,အသုတ်လိုက်နံပါတ်ရဖို့ Item Code ကိုရိုက်ထည့်ပေးပါ
 DocType: Stock Settings,Default Item Group,default Item Group က
-DocType: Employee Loan,Partially Disbursed,တစ်စိတ်တစ်ပိုင်းထုတ်ချေး
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,သတင်းအချက်အလက်ပေးသနား။
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,သတင်းအချက်အလက်ပေးသနား။
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,သငျသညျဖျက်သိမ်းမပေးကြောင်းတစ် Subscription ပြန်လည်စတင်ရန်လို့မရပါဘူး။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
 DocType: Fee Validity,Valid Till,မှီတိုငျအောငျသက်တမ်းရှိ
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,စုစုပေါင်းမိဘများဆရာအစည်းအဝေး
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ရွေးချယ်ထားသောဖောက်သည်များအတွက်ဖောက်သည်အုပ်စုပြောင်းခြင်းခွင့်ပြုမထားပေ။
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,ခန့်မှန်းဆိုက်ရောက်အချိန်များကိုအသစ်ပြောင်းခြင်း။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ခန့်မှန်းဆိုက်ရောက်အချိန်များကိုအသစ်ပြောင်းခြင်း။
 DocType: Program Enrollment Tool,Enrollment Details,ကျောင်းအပ်အသေးစိတ်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ဖောက်သည်တစ်ဦးကို select ပေးပါ
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Purchase Order,Group same items,Group ကတူညီပစ္စည်းများကို
 DocType: Purchase Invoice,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
-DocType: Employee Loan Application,Repayment Info,ပြန်ဆပ်အင်ဖို
+DocType: Department,Parent Department,မိဘဦးစီးဌာန
+DocType: Loan Application,Repayment Info,ပြန်ဆပ်အင်ဖို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
 DocType: Maintenance Team Member,Maintenance Role,ကို Maintenance အခန်းက္ပ
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,ဟိုတယ် Reservation များအသုံးပြုသူ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,သုတေသန
+DocType: Subscription Settings,Subscription Settings,subscription က Settings
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,သုတေသန
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,ထို Attribute တွေက table ထဲမှာအနည်းဆုံးတစ်ခု attribute ကို specify ကျေးဇူးပြု.
 DocType: Announcement,All Students,အားလုံးကျောင်းသားများ
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Crop Cycle,Less than a year,တစ်နှစ်ထက်လျော့နည်း
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ကျောင်းသားသမဂ္ဂမိုဘိုင်းအမှတ်
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 DocType: Crop,Yield UOM,အထွက်နှုန်း UOM
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
 DocType: Item,Is Item from Hub,Hub ကနေပစ္စည်းဖြစ်ပါသည်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,အတန်း {0}: Activity ကိုအမျိုးအစားမဖြစ်မနေဖြစ်ပါတယ်။
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Paid အမြတ်ဝေစု
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Paid အမြတ်ဝေစု
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,လယ်ဂျာစာရင်းကိုင်
 DocType: Stock Reconciliation,Difference Amount,ကွာခြားချက်ပမာဏ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ဒေါက်တာ {0} ခွင့်အပေါ် {1} အပေါ်
 DocType: Purchase Invoice,Reverse Charge,တာဝန်ခံ reverse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ထိန်းသိမ်းထားသောဝင်ငွေများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ထိန်းသိမ်းထားသောဝင်ငွေများ
 DocType: Purchase Invoice,05-Change in POS,POS များတွင် 05-ပြောင်းလဲခြင်း
 DocType: Vehicle Log,Service Detail,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: BOM,Item Description,item ဖော်ပြချက်များ
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,အခွင့်အလမ်း Item
 ,Student and Guardian Contact Details,ကျောင်းသားနှင့်ဂါးဒီးယန်းဆက်သွယ်ပါအသေးစိတ်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,အတန်း {0}: ပေးသွင်းသည် {0} အီးမေးလ်လိပ်စာကအီးမေးလ်ပို့ပေးရန်လိုအပ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,ယာယီဖွင့်ပွဲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,ယာယီဖွင့်ပွဲ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ကြည့်ရန် Hub
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 DocType: Patient Appointment,More Info,ပိုပြီး Info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard လုပ်ဆောင်ချက်များ
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ဥပမာ: ကွန်ပျူတာသိပ္ပံအတွက်မာစတာ
 DocType: Purchase Invoice,Rejected Warehouse,ပယ်ချဂိုဒေါင်
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ရန်
 DocType: Supplier Quotation Item,Lead Time in days,လက်ထက်ကာလ၌အချိန်ကိုဦးဆောင်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{1} မှ {0} ကနေလစာ၏ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{1} မှ {0} ကနေလစာ၏ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab ကစမ်းသပ်ဆေးညွှန်း
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,သေးငယ်သော
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,သေးငယ်သော
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ဖွင့်လှစ်ငွေတောင်းခံလွှာဖန်ဆင်းခြင်း Tool ကို Item
 DocType: Education Settings,Employee Number,ဝန်ထမ်းအရေအတွက်
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ကျေးဇူးတော်ရှိစေသတည်းကာလပြီးနောက်ငွေတောင်းခံလွှာ Cancel
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
 DocType: Project,% Completed,% ပြီးစီး
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ဓာတ်ခွဲခန်းစမ်းသပ်ခြင်း DATETIME
 DocType: Email Digest,Add Quote,Quote Add
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 DocType: Agriculture Analysis Criteria,Agriculture,လယ်ယာစိုက်ပျိုးရေး
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync ကိုမာစတာ Data ကို
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,မြို့တော်ပစ္စည်းများ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,မြို့တော်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,ပထမဦးဆုံးပစ္စည်း Code ကိုသတ်မှတ်ပေးပါ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
+DocType: Subscription Plan,Billing Interval Count,ငွေတောင်းခံလွှာပေါ်ရှိ Interval သည်အရေအတွက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 DocType: Antibiotic,Antibiotic,ရောဂါတိုက်ဖျက်ရေးဆေးဝါး
 ,Team Updates,အသင်းကိုအပ်ဒိတ်များ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,ပေးသွင်းအကြောင်းမူကား
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Account Type ကိုချိန်ညှိခြင်းကိစ္စများကို၌ဤအကောင့်ကိုရွေးချယ်ခြင်းအတွက်ကူညီပေးသည်။
 DocType: Purchase Invoice,Grand Total (Company Currency),က Grand စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ပုံနှိပ်ပါ Format ကို Create
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,POS ပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,အခြားရွေးချယ်စရာကို item ကို item code ကိုအဖြစ်အတူတူပင်ဖြစ်မနေရပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,ယာယီအကဲဖြတ်၏ 06-Final
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Workstation နှင့်
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,စျေးနှုန်းပေးသွင်းဘို့တောင်းဆိုခြင်း
 DocType: Healthcare Settings,Registration Message,မှတ်ပုံတင်ခြင်းကို Message
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,hardware
 DocType: Prescription Dosage,Prescription Dosage,ဆေးညွှန်းသောက်သုံးသော
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,Start နဲ့ရပ်တန့်နေ့စွဲများ
 ,Delivered Items To Be Billed,ကြေညာတဲ့ခံရဖို့ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ပွင့်လင်း BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
 DocType: Project Update,Great/Quickly,ဂရိတ် / လျင်မြန်စွာ
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,ဝင်းနိုင်ထွန်း /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,batch ကို item အဘို့အသုတ်ကို select ပေးပါ
 DocType: Asset,Depreciation Schedules,တန်ဖိုးအချိန်ဇယား
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,အောက်ပါအကောင့် GST က Settings ထဲမှာရှေးခယျြထားစေခြင်းငှါ:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,အောက်ပါအကောင့် GST က Settings ထဲမှာရှေးခယျြထားစေခြင်းငှါ:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 DocType: Payment Request,Transaction Currency,ငွေသွင်းငွေထုတ်ငွေကြေးစနစ်
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},{0} ကနေ | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,AVG Daily သတင်းစာအထွက်
 DocType: POS Profile,Campaign,ကင်ပိန်း
 DocType: Supplier,Name and Type,အမည်နှင့်အမျိုးအစား
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',ခွင့်ပြုချက်နဲ့ Status &#39;&#39; Approved &#39;သို့မဟုတ်&#39; &#39;ငြင်းပယ်&#39; &#39;ရမည်
 DocType: Physician,Contacts and Address,ဆက်သွယ်ရန်နှင့်လိပ်စာ
 DocType: Purchase Invoice,Contact Person,ဆက်သွယ်ရမည့်သူ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;&#39; မျှော်မှန်း Start ကိုနေ့စွဲ &#39;&#39; မျှော်မှန်း End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -1810,19 +1814,20 @@
 DocType: Student Admission,Eligibility and Details,ထိုက်ခွင့်နှင့်အသေးစိတ်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","စျေးနှုန်းအဘို့တောင်းဆိုခြင်းပိုပြီးစစ်ဆေးမှုများပေါ်တယ် setting များကိုအဘို့, ပေါ်တယ်မှလက်လှမ်းမီဖို့ကိုပိတ်ထားသည်။"
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ပေးသွင်း Scorecard အမှတ်ပေး Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ဝယ်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,ဝယ်ငွေပမာဏ
 DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခလိပ်စာအမည်
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,သင်တန်းဇယားကိုအမှားအယွင်းများရှိခဲ့သည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,အဆိုပါစာရင်းထဲတွင်ပထမဦးဆုံးသုံးစွဲမှုသဘောတူညီချက်ကို default သုံးစွဲမှုသဘောတူညီချက်ပေးအဖြစ်သတ်မှတ်ထားပါလိမ့်မည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Detail,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,package Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,အလုပ်သင်သူ
 DocType: Purchase Invoice,Company GSTIN,ကုမ္ပဏီ GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",အခွန်အသေးစိတ်စားပွဲတစ် string ကို item ကိုမာစတာကနေခေါ်ယူသောအခါနှင့်ဤလယ်ပြင်၌သိုလှောင်ထား။ အခွန်နှင့်စွပ်စွဲချက်အတွက်အသုံးပြု
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Leave လျှောက်လွှာခုနှစ်တွင်သဘောတူညီချက်ပေးမသင်မနေရ Leave
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,အတန်းမှာငွေပေးချေ Term {0} ဖြစ်နိုင်သည်တစ်ထပ်ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),စိုက်ပျိုးရေး (beta ကို)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Office ကိုငှား
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office ကိုငှား
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 DocType: Disease,Common Name,လူအသုံးအများဆုံးအမည်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
 DocType: Vital Signs,Blood Pressure,သွေးပေါင်ချိန်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,လေ့လာဆန်းစစ်သူ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,လေ့လာဆန်းစစ်သူ
 DocType: Item,Inventory,စာရင်း
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ကျောင်းသားအုပ်စုအတွင်းကျောင်းသားများသည်သက်တမ်းကျောင်းအပ်သင်တန်းအမှတ်စဥ်
 DocType: Notification Control,Expense Claim Rejected,စရိတ်ဖြစ်သည်ဆိုခြင်းကိုပယ်ချခဲ့သည်
 DocType: Item,Item Attribute,item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,အစိုးရ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,အစိုးရ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,စရိတ်တိုင်ကြား {0} ရှိပြီးသားယာဉ် Log in ဝင်ရန်အဘို့တည်ရှိ
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute မှအမည်
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ပြန်ဆပ်ငွေပမာဏရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ပြန်ဆပ်ငွေပမာဏရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,item Variant
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,န်ဆောင်မှုများ
 DocType: HR Settings,Email Salary Slip to Employee,ထမ်းအီးမေးလ်လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်းကို Select လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်းကို Select လုပ်ပါ
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 DocType: Customer,"Select, to make the customer searchable with these fields","Select လုပ်ပါ, အဆိုပါနယ်ပယ်နှင့်အတူဖောက်သည်ရှာဖွေအောင်"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show ကိုပိတ်ထား
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
 DocType: Program Course,Program Course,Program ကိုသင်တန်းအမှတ်စဥ်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Homepage,Company Tagline for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ကုမ္ပဏီတဂ်လိုင်း
 DocType: Item Group,Item Group Name,item Group မှအမည်
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership အသေးစိတ်
 DocType: Leave Block List,Block Holidays on important days.,အရေးကြီးသောရက်အားလပ်ရက်ပိတ်ဆို့။
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),အားလုံးလိုအပ်သောရလဒ် Value ကို (s) ကို input ကိုနှစ်သက်သော
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Accounts ကို receiver အကျဉ်းချုပ်
-DocType: Employee Loan,Monthly Repayment Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Accounts ကို receiver အကျဉ်းချုပ်
+DocType: Loan,Monthly Repayment Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ဖွင့်လှစ်ငွေတောင်းခံလွှာ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,န်ထမ်းအခန်းက္ပတင်ထားရန်တစ်ထမ်းစံချိန်အတွက်အသုံးပြုသူ ID လယ်ပြင်၌ထားကြ၏ ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,န်ထမ်းအခန်းက္ပတင်ထားရန်တစ်ထမ်းစံချိန်အတွက်အသုံးပြုသူ ID လယ်ပြင်၌ထားကြ၏ ကျေးဇူးပြု.
 DocType: UOM,UOM Name,UOM အမည်
 DocType: GST HSN Code,HSN Code,HSN Code ကို
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,contribution ငွေပမာဏ
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},အသုံးပြုသူ {0} ပြီးသားဆရာဝန် {1} ဖို့တာဝန်ဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,သေတ္တာ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
+DocType: Journal Entry,JV-RET-,ဖက်စပ်-RET-
 DocType: Budget,Monthly Distribution,လစဉ်ဖြန့်ဖြူး
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,receiver List ကိုအချည်းနှီးပါပဲ။ Receiver များစာရင်းဖန်တီး ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),ကျန်းမာရေးစောင့်ရှောက်မှု (beta ကို)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
-DocType: Employee Loan,Repayment Method,ပြန်ဆပ် Method ကို
+DocType: Loan,Repayment Method,ပြန်ဆပ် Method ကို
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","check လုပ်ထားလျှင်, ပင်မစာမျက်နှာဝက်ဘ်ဆိုက်များအတွက် default အနေနဲ့ Item Group မှဖြစ်လိမ့်မည်"
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,လက်မှတ်လိုအပ်ပါသည်
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},အတန်း {0}: အချိန်နှင့်ရန်ကနေ {1} ၏အချိန် {2} နှင့်အတူထပ်ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,စတော့အိတ်မှုစိစစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,စတော့အိတ်မှုစိစစ်
 DocType: Purchase Invoice,Supplier Warehouse,ပေးသွင်းဂိုဒေါင်
 DocType: Opportunity,Contact Mobile No,မိုဘိုင်းလ်မရှိဆက်သွယ်ရန်
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,ကုမ္ပဏီကိုရွေးချယ်ပါ
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,ပုံနှိပ်ပါပုဒ်မ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,အသုံးပြုသူ {0} ကိုမဆို default အနေနဲ့ POS ကိုယ်ရေးဖိုင်မရှိပါ။ ဤအသုံးပြုသူများအတွက် Row {1} မှာပုံမှန်စစ်ဆေးပါ။
 DocType: Student Group,Set 0 for no limit,အဘယ်သူမျှမကန့်သတ်များအတွက် 0 င် Set
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,အတန်း {idx}: {လယ်ကွင်း} ဖွင့် {invoice_type} ငွေတောင်းခံလွှာကိုဖန်တီးရန်လိုအပ်ပါသည်
 DocType: Customer,Primary Address and Contact Detail,မူလတန်းလိပ်စာနှင့်ဆက်သွယ်ရန်အသေးစိတ်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,အနည်းဆုံးဒိုမိန်းရွေးချယ်ပါ။
 DocType: Dependent Task,Dependent Task,မှီခို Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: SMS Center,Receiver List,receiver များစာရင်း
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,ရှာရန် Item
 DocType: Payment Schedule,Payment Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,grade စကေး
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ယခုပင်လျှင်ပြီးစီး
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,လက်ခုနှစ်တွင်စတော့အိတ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,လက်ခုနှစ်တွင်စတော့အိတ်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,အောင်မြင်သောတင်သွင်း!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
 DocType: Customer,Customer POS Id,ဖောက်သည် POS Id
 DocType: Account,Account Name,အကောင့်အမည်
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,serial No {0} အရေအတွက် {1} တဲ့အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,serial No {0} အရေအတွက် {1} တဲ့အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Woocommerce ဆာဗာ URL ရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
 DocType: Share Balance,To No,အဘယ်သူမျှမမှ
-DocType: Subscription,Reference Document,ကိုးကားစရာစာရွက်စာတမ်း
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
 DocType: Accounts Settings,Credit Controller,ခရက်ဒစ် Controller
-DocType: Grant Application,Applicant Type,လျှောက်ထားသူအမျိုးအစား
+DocType: Loan,Applicant Type,လျှောက်ထားသူအမျိုးအစား
 DocType: Purchase Invoice,03-Deficiency in services,န်ဆောင်မှုအတွက် 03-Deficiency
 DocType: Delivery Note,Vehicle Dispatch Date,မော်တော်ယာဉ် Dispatch နေ့စွဲ
 DocType: Healthcare Settings,Default Medical Code Standard,default ဆေးဘက်ဆိုင်ရာကျင့်ထုံးစံ
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,ကြေညာတဲ့ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,လူ့အင်အားအရင်းအမြစ်
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,လူ့အင်အားအရင်းအမြစ်
 DocType: Lead,Upper Income,အထက်ဝင်ငွေခွန်
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ပယ်ချ
 DocType: Journal Entry Account,Debit in Company Currency,Company မှငွေကြေးစနစ်အတွက် debit
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,န်ထမ်းများအတွက်
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ငွေပေးချေ Entry &#39;Make
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ငွေပေးချေ Entry &#39;Make
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
 DocType: Company,Default Values,default တန်ဖိုးများ
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ရရှိနိုင်သောစတော့အိတ်
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,ရရှိနိုင်သောစတော့အိတ်
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Days) သည်စွမ်းဆောင်ရည်စီမံကိန်း
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ဝယ်ယူရေး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,မသင်မနေရကိုလယ် - အစီအစဉ်
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,မသင်မနေရကိုလယ် - အစီအစဉ်
 DocType: Special Test Template,Result Component,ရလဒ်စိတျအပိုငျး
@@ -2137,7 +2143,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,အရွက်အဖြစ်အရွက်အတွင်းအားလပ်ရက် Include
 DocType: Sales Invoice,Packed Items,ထုပ်ပိုးပစ္စည်းများ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Serial နံပါတ်ဆန့်ကျင်အာမခံပြောဆိုချက်ကို
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','' စုစုပေါင်း ''
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','' စုစုပေါင်း ''
 DocType: Shopping Cart Settings,Enable Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းကို Enable
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2155,10 +2161,10 @@
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,လှုပ်ရှားမှုအားအတည်ပြု
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ပွညျ့စုံ
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,လှည်းအတွက်ကြည့်ရန်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,marketing အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,စံသတ်မှတ်ချက်ကိုမဖန်တီးနိုင်။ အဆိုပါသတ်မှတ်ချက်ကိုအမည်ပြောင်း ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
@@ -2181,9 +2187,9 @@
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Material Request,Transferred,လွှဲပြောင်း
 DocType: Vehicle,Doors,တံခါးပေါက်
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,လူနာမှတ်ပုံတင်ခြင်းအဘို့အကြေးစုဆောင်း
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,စတော့ရှယ်ယာငွေပေးငွေယူပြီးနောက် Attribute တွေကမပြောင်းနိုင်ပါ။ သစ်တစ်ခုအရာဝတ္ထု Make နှင့်အသစ်သောအရာဝတ္ထုမှစတော့ရှယ်ယာလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,စတော့ရှယ်ယာငွေပေးငွေယူပြီးနောက် Attribute တွေကမပြောင်းနိုင်ပါ။ သစ်တစ်ခုအရာဝတ္ထု Make နှင့်အသစ်သောအရာဝတ္ထုမှစတော့ရှယ်ယာလွှဲပြောင်း
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,အခွန်အဖွဲ့ဟာ
 DocType: Packing Slip,PS-,PS-
@@ -2219,12 +2225,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ပြန်လည်သင့်မြတ်ရေး JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Purchase Invoice Item,Batch No,batch မရှိပါ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ဝန်ထမ်းတိုးတက်လာတာနဲ့အမျှ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 DocType: Grant Application,Assessment  Mark (Out of 10),(10 ထဲက) အကဲဖြတ်မာကု
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 မိုဘိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,အဓိက
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
@@ -2233,15 +2240,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Email Digest,Annual Expenses,နှစ်ပတ်လည်ကုန်ကျစရိတ်
 DocType: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
 DocType: Sales Team,Contribution to Net Total,Net ကစုစုပေါင်းမှ contribution
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ Item Code ကို
 DocType: Stock Reconciliation,Stock Reconciliation,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး
 DocType: Territory,Territory Name,နယ်မြေတွေကိုအမည်
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,သင်သာတစ်ဦး Subscription အတွက်တူညီတဲ့ငွေတောင်းခံသံသရာနှင့်အတူစီစဉ်ရှိနိုင်ပါသည်
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,တစ်ဦးယောဘသည်လျှောက်ထားသူ။
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
@@ -2252,10 +2260,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,လေ့ကျင့်ရေးအဖွဲ့တွေ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,track ခဲရင်းမြစ်များကပို့ဆောင်။
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ကျေးဇူးပြု. ထည့်သွင်းပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ကျေးဇူးပြု. ထည့်သွင်းပါ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,ကို Maintenance Log in ဝင်ရန်
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ဒီအထုပ်၏ကျော့ကွင်းကိုအလေးချိန်။ (ပစ္စည်းပိုက်ကွန်ကိုအလေးချိန်၏အချုပ်အခြာအဖြစ်ကိုအလိုအလျောက်တွက်ချက်)
@@ -2263,11 +2271,11 @@
 DocType: Sales Order,To Deliver and Bill,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: Student Group,Instructors,နည်းပြဆရာ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,ဝေမျှမယ်စီမံခန့်ခွဲမှု
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","ဂိုဒေါင် {0} မည်သည့်အကောင့်နှင့်ဆက်စပ်သည်မ, ကုမ္ပဏီ {1} အတွက်ဂိုဒေါင်စံချိန်သို့မဟုတ် set ကို default စာရင်းအကောင့်ထဲမှာအကောင့်ဖော်ပြထားခြင်းပါ။"
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,သင့်ရဲ့အမိန့်ကိုစီမံခန့်ခွဲ
 DocType: Work Order Operation,Actual Time and Cost,အမှန်တကယ်အချိန်နှင့်ကုန်ကျစရိတ်
@@ -2277,7 +2285,7 @@
 DocType: Student Leave Application,Student Leave Application,ကျောင်းသားသမဂ္ဂခွင့်လျှောက်လွှာ
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,အပေါ်
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
@@ -2287,7 +2295,7 @@
 DocType: Item,Barcodes,ဘားကုဒ်များ
 DocType: Hub Category,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,အပေါင်းအဖေါ်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,အပေါင်းအဖေါ်
 DocType: Asset Movement,Asset Movement,ပိုင်ဆိုင်မှုလပ်ြရြားမြ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,အလုပ်အမိန့် {0} တင်သွင်းရမည်ဖြစ်သည်
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,နယူးလှည်း
@@ -2305,13 +2313,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အကုမ္ပဏီ၏ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးညီမျှရှိရမည်
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,အတန်း {0}: ကြောင့်နေ့စွဲရက်စွဲကိုပို့စ်တင်မတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,အတန်း {0}: ကြောင့်နေ့စွဲရက်စွဲကိုပို့စ်တင်မတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;ပါစေ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
 ,Sales Invoice Trends,အရောင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Leave Application,Apply / Approve Leaves,Apply / ရွက်အတည်ပြု
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,"အကြောင်းမူကား,"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်း &#39;&#39; ယခင် Row ပမာဏတွင် &#39;&#39; ဟုတာဝန်ခံ type ကိုအသုံးပြုမှသာလျှင်အတန်းရည်ညွှန်းနိုင်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်း &#39;&#39; ယခင် Row ပမာဏတွင် &#39;&#39; ဟုတာဝန်ခံ type ကိုအသုံးပြုမှသာလျှင်အတန်းရည်ညွှန်းနိုင်ပါသည်
 DocType: Sales Order Item,Delivery Warehouse,Delivery ဂိုဒေါင်
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,ဘဏ္ဍာရေးကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 DocType: Serial No,Delivery Document No,Delivery Document ဖိုင်မရှိပါ
@@ -2325,7 +2332,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ပစ္စည်းစားသုံးမှုထုတ်လုပ်ခြင်းလုပ်ငန်းကိုဆက်တင်ထဲမှာ set မပေးပါ။
 DocType: Student,Student Mobile Number,ကျောင်းသားသမဂ္ဂမိုဘိုင်းနံပါတ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ကပိုပစ္စည်းများအတွက် overbill လို့မရပါဘူး။ Over-ငွေတောင်းခံခွင့်ပြုပါရန်, စတော့အိတ်ချိန်ညှိမှုများအတွက်သတ်မှတ်ထားကျေးဇူးပြုပြီး"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ကပိုပစ္စည်းများအတွက် overbill လို့မရပါဘူး။ Over-ငွေတောင်းခံခွင့်ပြုပါရန်, စတော့အိတ်ချိန်ညှိမှုများအတွက်သတ်မှတ်ထားကျေးဇူးပြုပြီး"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,တုံ့ပြန်မှုကိုအပ်ဒိတ်လုပ်
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
@@ -2337,12 +2344,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,ပထမဦးဆုံးအစီအစဉ်ကို Select လုပ်ပါ
 DocType: Patient Appointment,Patient Age,လူနာအသက်
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,serial မျှ {0} ပြီးသားပြန်ရောက်ခဲ့ပြီး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,serial မျှ {0} ပြီးသားပြန်ရောက်ခဲ့ပြီး
 DocType: Supplier,Supplier of Goods or Services.,ကုန်စည်သို့မဟုတ်န်ဆောင်မှုများ၏ပေးသွင်း။
 DocType: Budget,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Asset Maintenance Log,Planned,စီစဉ်ထား
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,လူနာအတွက်မသတ်မှတ်လျှင်တိုင်ပင်စွဲချက်စာအုပ်ဆိုင်ဖို့အသုံးပြုခံရဖို့ default receiver အကောင့်အသစ်များ၏။
 DocType: Vehicle Log,Fuel Price,လောင်စာစျေးနှုန်း
+DocType: Bank Guarantee,Margin Money,margin ငွေ
 DocType: Budget,Budget,ဘတ်ဂျက်
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ပွင့်လင်း Set
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
@@ -2356,16 +2364,16 @@
 DocType: Lead,Follow Up,နောက်ဆက်တွဲ
 DocType: Item,Is Sales Item,အရောင်း Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,item Group ကသစ်ပင်
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
 DocType: Maintenance Visit,Maintenance Time,ပြုပြင်ထိန်းသိမ်းမှုအချိန်
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ခဲ့တာဖြစ်ပါတယ်။ {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term Start ကိုနေ့စွဲဟူသောဝေါဟာရ (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာ Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,အမှားများရှိကြ၏။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,: ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားလိုက်ပါတယ်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,အမှားများရှိကြ၏။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,: ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားလိုက်ပါတယ်
 DocType: Guardian,Guardian Interests,ဂါးဒီးယန်းစိတ်ဝင်စားမှုများ
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
 DocType: Education Settings,Instructor Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့နည်းပြမှတ်တမ်း
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} နေသူများကဖန်တီး
 DocType: GST Account,GST Account,GST အကောင့်
@@ -2384,8 +2392,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,အကြိုက်ဆုံးများ Added
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ပြီးသားတင်သွင်းအထက်ပါရွေးချယ်ထားသည့်စံနှုန်းများ OR လစာစလစ်ဘို့တင်ပြမျှမတွေ့လစာစလစ်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,တာဝန်နှင့်အခွန်
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ပြီးသားတင်သွင်းအထက်ပါရွေးချယ်ထားသည့်စံနှုန်းများ OR လစာစလစ်ဘို့တင်ပြမျှမတွေ့လစာစလစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,တာဝန်နှင့်အခွန်
 DocType: Projects Settings,Projects Settings,စီမံကိန်းများ Settings များ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
@@ -2395,27 +2403,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Item အဖွဲ့များ၏ပင်လည်းရှိ၏။
 DocType: Production Plan,Total Produced Qty,စုစုပေါင်းထုတ်လုပ်အရည်အတွက်
 DocType: Payroll Entry,Get Employee Details,ထမ်းအသေးစိတ် Get
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
 DocType: Asset,Sold,ကိုရောင်းချ
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 DocType: Sales Invoice Payment,Base Amount (Company Currency),base ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,ကုန်ကြမ်းများ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,ကုန်ကြမ်းများ
 DocType: Payment Reconciliation Payment,Reference Row,ကိုးကားစရာ Row
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
 DocType: Sales Invoice,Accounting Details,စာရင်းကိုင် Details ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ဒီကုမ္ပဏီအပေါငျးတို့သငွေကြေးကိစ္စရှင်းလင်းမှု Delete
 DocType: Patient,O Positive,အိုအပြုသဘောဆောင်သော
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,နေရာချထားခြင်း
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,အထက်ပါဇယားတွင်ပစ္စည်းတောင်းဆိုမှုများကိုထည့်သွင်းပါ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ဂျာနယ် Entry များအတွက်မရှိနိုင်ပါပြန်ဆပ်ဖို့တွေအတွက်
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 DocType: BOM,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
 DocType: Shopping Cart Settings,Show Quantity in Website,ဝက်ဘ်ဆိုက်များတွင် Show ကိုပမာဏ
-DocType: Employee Loan Application,Total Payable Amount,စုစုပေါင်းပေးရန်ငွေပမာဏ
+DocType: Loan Application,Total Payable Amount,စုစုပေါင်းပေးရန်ငွေပမာဏ
 DocType: Task,Expected Time (in hours),(နာရီအတွင်း) မျှော်လင့်ထားအချိန်
 DocType: Item Reorder,Check in (group),(အုပ်စု) တွင် Check
 DocType: Soil Texture,Silt,နုန်း
@@ -2434,7 +2443,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ငွေပေးချေမှုရမည့် Make
 DocType: Room,Room Name,ROOM တွင်အမည်
 DocType: Prescription Duration,Prescription Duration,ဆေးညွှန်း Duration:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
 DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန်
 ,Campaign Efficiency,ကင်ပိန်းစွမ်းရည်
@@ -2454,11 +2463,11 @@
 DocType: Chapter,Chapter,အခနျး
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,လင်မယား
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရှေးခယျြထားသညျ့အခါ default account ကိုအလိုအလျှောက် POS ငွေတောင်းခံလွှာအတွက် updated လိမ့်မည်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
 DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,အရောင်း Partner လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ဝက်နေ့နေ့စွဲနေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားဖြစ်သင့်တယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ဝက်နေ့နေ့စွဲနေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားဖြစ်သင့်တယ်
 DocType: Maintenance Schedule Detail,Actual Date,အမှန်တကယ်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} ကုမ္ပဏီအတွက်ပုံမှန်ကုန်ကျစရိတ် Center ကသတ်မှတ်ပါ။
 DocType: Item,Has Batch No,Batch မရှိရှိပါတယ်
@@ -2476,7 +2485,6 @@
 DocType: Task,Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ
 DocType: Soil Texture,Soil Type,မြေဆီလွှာတွင်အမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,နယူးမက်စေ့
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless လုပ်ပိုင်ခွင့်
@@ -2496,7 +2504,7 @@
 DocType: Hub Category,Hub Category,hub Category:
 DocType: Purchase Invoice,SEZ,အထူးစီးပွားရေးဇုန်
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
-DocType: Employee Loan,Loan Amount,ချေးငွေပမာဏ
+DocType: Loan,Loan Amount,ချေးငွေပမာဏ
 DocType: Student Report Generation Tool,Add Letterhead,Letterhead Add
 DocType: Program Enrollment,Self-Driving Vehicle,self-မောင်းနှင်ယာဉ်
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,ပေးသွင်း Scorecard အမြဲတမ်း
@@ -2525,9 +2533,9 @@
 DocType: Cash Flow Mapper,Position,ရာထူး
 DocType: Patient,Patient Details,လူနာအသေးစိတ်
 DocType: Patient,B Positive,B ကအပြုသဘောဆောင်သော
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 DocType: Patient Medical Record,Patient Medical Record,လူနာဆေးဘက်ဆိုင်ရာမှတ်တမ်း
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,က Non-Group ကိုမှ Group က
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,အားကစား
@@ -2535,8 +2543,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,အမှန်တကယ်စုစုပေါင်း
 DocType: Lab Test UOM,Test UOM,စမ်းသပ်ခြင်း UOM
 DocType: Student Siblings,Student Siblings,ကျောင်းသားမောင်နှမ
+DocType: Subscription Plan Detail,Subscription Plan Detail,subscription အစီအစဉ်အသေးစိတ်
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,ယူနစ်
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
 DocType: Asset Maintenance Task,Maintenance Task,ကို Maintenance Task ကို
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,GST က Settings ထဲမှာ B2C ကန့်သတ်သတ်မှတ်ပါ။
@@ -2551,6 +2560,7 @@
 ,BOM Search,BOM ရှာရန်
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),(စတော့အိတ် Entry &#39;မှတဆင့်) စုစုပေါင်းစားသုံးပစ္စည်းကုန်ကျစရိတ်
 DocType: Hub Settings,Company Registered,ကုမ္ပဏီမှတ်ပုံတင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,နေ့စွဲရန်နေ့စွဲမှစထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ဒီဂိုဒေါင်ထဲမှာရရှိနိုင်ပါစတော့ရှယ်ယာအပေါ်အခြေခံပြီး Hub ပေါ်တွင် &quot;စတော့အိတ်အတွက်မဟုတ်&quot; &quot;စတော့အိတ်များတွင်&quot; Publish သို့မဟုတ်။
 DocType: Vehicle,Fuel Type,လောင်စာအမျိုးအစား
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
@@ -2558,17 +2568,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
 DocType: Email Digest,Pending Sales Orders,ဆိုင်းငံ့အရောင်းအမိန့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 DocType: Employee,Create User Permission,အသုံးပြုသူခွင့်ပြုချက် Create
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Healthcare Settings,Remind Before,မတိုင်မှီသတိပေး
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
 DocType: Salary Component,Deduction,သဘောအယူအဆ
 DocType: Item,Retain Sample,နမူနာကိုဆက်လက်ထိန်းသိမ်းရန်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,အတန်း {0}: အချိန်နှင့်ရန်အချိန် မှစ. မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Stock Reconciliation Item,Amount Difference,ငွေပမာဏ Difference
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
 DocType: Territory,Classification of Customers by region,ဒေသအားဖြင့် Customer များ၏ခွဲခြား
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ထုတ်လုပ်မှုအတွက်
@@ -2578,8 +2589,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,တွက်ချက် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Normal Test Template,Normal Test Template,ပုံမှန်စမ်းသပ်ခြင်း Template ကို
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,မသန်မစွမ်းအသုံးပြုသူ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ကိုးကာချက်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,အဘယ်သူမျှမ Quote တစ်ခုလက်ခံရရှိ RFQ မသတ်မှတ်နိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ကိုးကာချက်
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,အဘယ်သူမျှမ Quote တစ်ခုလက်ခံရရှိ RFQ မသတ်မှတ်နိုင်ပါ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,အကောင့်ငွေကြေးအတွက် print ထုတ်အကောင့်တစ်ခုရွေးပါ
@@ -2587,7 +2598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ဒီလူနာဆန့်ကျင်အရောင်းအပေါ်တွင်အခြေခံထားသည်။ အသေးစိတ်အချက်အလက်များကိုအောက်ပါအချိန်ဇယားကိုကြည့်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Patient,Date of Birth,မွေးနေ့
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,ပေးသွင်း Scorecard Setup ကို
@@ -2598,14 +2609,15 @@
 DocType: Work Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
 DocType: Student Applicant,Applied,အသုံးချ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-ပွင့်လင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-ပွင့်လင်း
 DocType: Sales Invoice Item,Qty as per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ် Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 အမည်
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post ကိုရောင်းရန်လျှော့
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
+DocType: Department Approver,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ရှယ်ယာရှင်များရန်လယ်ပြင်ကွက်လပ်မဖွစျနိုငျ
 DocType: Guardian,Work Address,အလုပ်လိပ်စာ
@@ -2619,21 +2631,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),စုစုပေါင်းခွဲဝေငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Purchase Order Item,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 DocType: BOM,Scrap Material Cost,အပိုင်းအစပစ္စည်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
 DocType: Grant Application,Email Notification Sent,အီးမေးလ်ပို့ရန်သတိပေးချက် Sent
 DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","item ကုဒ်, ဂိုဒေါင်, အရေအတွက်အတန်းအပေါ်လိုအပ်သည်"
-DocType: Pricing Rule,Supplier,ကုန်သွင်းသူ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","item ကုဒ်, ဂိုဒေါင်, အရေအတွက်အတန်းအပေါ်လိုအပ်သည်"
+DocType: Bank Guarantee,Supplier,ကုန်သွင်းသူ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ငွေပေးချေမှုရမည့်အသေးစိတ်များကိုပြရန်
 DocType: Consultation,Consultation Time,တိုင်ပင်ဆွေးနွေးအချိန်
 DocType: C-Form,Quarter,လေးပုံတစ်ပုံ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
 DocType: Global Defaults,Default Company,default ကုမ္ပဏီ
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,စရိတ်သို့မဟုတ် Difference အကောင့်ကိုကသက်ရောက်မှုအဖြစ် Item {0} ခြုံငုံစတော့ရှယ်ယာတန်ဖိုးသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Payment Request,PR,PR စနစ်
 DocType: Cheque Print Template,Bank Name,ဘဏ်မှအမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,ဝန်ထမ်းချေးငွေအကောင့်
 DocType: Leave Application,Total Leave Days,စုစုပေါင်းထွက်ခွာ Days
 DocType: Email Digest,Note: Email will not be sent to disabled users,မှတ်ချက်: အီးမေးလ်မသန်မစွမ်းအသုံးပြုသူများထံသို့စေလွှတ်လိမ့်မည်မဟုတ်ပေ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Interaction အရေအတွက်
@@ -2649,7 +2660,7 @@
 DocType: Vital Signs,Weight (In Kilogram),(ကီလိုဂရမ်ခုနှစ်တွင်) အလေးချိန်
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",အခန်းကြီး / chapter_name အလိုအလျှောက်အခနျးမှာချွေတာပြီးနောက်သတ်မှတ်ထားအလွတ်ထားခဲ့ပါ။
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST က Settings ထဲမှာ GST Accounts ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST က Settings ထဲမှာ GST Accounts ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,စီးပွားရေးအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,နယူးအရစ်ကျ၏ကုန်ကျစရိတ်
@@ -2658,12 +2669,13 @@
 DocType: Grant Application,Grant Description,Grant ကဖျေါပွခကျြ
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Student Guardian,Others,အခြားသူများ
+DocType: Subscription,Discounts,လျှော့စျေး
 DocType: Payment Entry,Unallocated Amount,ထဲကအသုံးမပြုတဲ့ငွေပမာဏ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: POS Profile,Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်စတော့ရှယ်ယာအတွက်ဝယ်ရောင်းမစောင့်ဘဲပြုလုပ်ထားတဲ့န်ဆောင်မှု။
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,အဘယ်သူမျှမကပို updates များကို
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ဒီ Setup ကိုမှချည်ထားသောအားလုံး scorecards ဖုံးလွှမ်း
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ကလေး Item တစ်ကုန်ပစ္စည်း Bundle ကိုမဖြစ်သင့်ပါဘူး။ `{0} ကို item ကိုဖယ်ရှား` ကယ်တင်ပေးပါ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
@@ -2672,21 +2684,24 @@
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
 DocType: Grading Scale,Grading Scale Intervals,ဂမ်စကေး Interval
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,ယခုနှစ်အဘို့အမြတ်
+DocType: Bank Guarantee,Name of Bank,ဘဏ်အမည်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} ကိုသာငွေကြေးဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Fee Schedule,In Process,Process ကိုအတွက်
 DocType: Authorization Rule,Itemwise Discount,Itemwise လျှော့
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,ဘဏ္ဍာရေးအကောင့်အသစ်များ၏ပင်လည်းရှိ၏။
+DocType: Bank Guarantee,Reference Document Type,ကိုးကားစရာ Document ဖိုင် Type အမျိုးအစား
 DocType: Cash Flow Mapping,Cash Flow Mapping,ငွေသား Flow မြေပုံ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serial Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,အီးမေးလ်ပို့ရန်က default အဆက်အသွယ်မတွေ့ရှိ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,လျှို့ဝှက်ချက် Generate
-DocType: Employee Loan,Account Info,အကောင့်အင်ဖို
+DocType: Loan,Account Info,အကောင့်အင်ဖို
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
 DocType: Fees,Include Payment,ငွေပေးချေမှုရမည့် Include
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ကျောင်းသားအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
@@ -2694,24 +2709,24 @@
 DocType: Sales Invoice,Total Billing Amount,စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,အဆိုပါကြေးဖွဲ့စည်းပုံနဲ့ Student Group မှ {0} အတွက်အစီအစဉ်ကိုကွဲပြားခြားနားပါသည်။
 DocType: Fee Schedule,Receivable Account,receiver အကောင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
 DocType: Quotation Item,Stock Balance,စတော့အိတ် Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,စီအီးအို
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,စီအီးအို
 DocType: Purchase Invoice,With Payment of Tax,အခွန်၏ငွေပေးချေနှင့်အတူ
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ပေးသွင်းသူများအတွက် TRIPLICATE
 DocType: Land Unit,Is Container,ကွန်တိန်နာ Is
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ဤသည်သီးနှံသံသရာ၏နေ့ 1 ဖြစ်ရလိမ့်မည်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Purchase Invoice Item,Weight UOM,အလေးချိန် UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ဖိုလီယိုနံပါတ်များနှင့်အတူရရှိနိုင်ပါသည်ရှယ်ယာရှင်များမှာများစာရင်း
 DocType: Salary Structure Employee,Salary Structure Employee,လစာဖွဲ့စည်းပုံထမ်း
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Show ကိုမူကွဲ Attribute တွေက
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Show ကိုမူကွဲ Attribute တွေက
 DocType: Student,Blood Group,လူအသွေး Group က
 DocType: Course,Course Name,သင်တန်းအမည်
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,အတိအကျန်ထမ်းရဲ့ခွင့်ပလီကေးရှင်းကိုအတည်ပြုနိုင်သူသုံးစွဲသူများက
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Office ကိုပစ္စည်းများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Office ကိုပစ္စည်းများ
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,ကုမ္ပဏီများ
 DocType: Supplier Scorecard,Scoring Setup,Setup ကိုသွင်းယူ
@@ -2730,7 +2745,7 @@
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,debit ရန်လိုအပ်သည်
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ကုန်ပစ္စည်းပေးသွင်း scorecard variable တွေကို၏ Templates ကို။
 DocType: Job Offer Term,Offer Term,ကမ်းလှမ်းမှုကို Term
 DocType: Asset,Quality Manager,အရည်အသွေးအ Manager က
@@ -2742,13 +2757,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ဝက်ဘ်ဆိုက်စစ်ဆင်ရေး
 DocType: Supplier Scorecard,Supplier Score,ပေးသွင်းရမှတ်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,စုစုပေါင်းငွေတောင်းခံလွှာ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,စုစုပေါင်းငွေတောင်းခံလွှာ Amt
 DocType: Supplier,Warn RFQs,RFQs သတိပေး
 DocType: BOM,Conversion Rate,ပြောင်းလဲမှုနှုန်း
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ကုန်ပစ္စည်းရှာရန်
 DocType: Assessment Plan,To Time,အချိန်မှ
 DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအခန်းက္ပ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
+DocType: Loan,Total Amount Paid,စုစုပေါင်းငွေပမာဏ Paid
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,အဆိုပါပေးဆောင်ကျောင်းသားလျှောက်ထားသူများအတွက်မဖြစ်မနေဖြစ်သည့်ကျောင်းသားင်ခွင့်ကို select ပေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,စျေးနှုန်းထုတ်ဝေနေတဲ့စျေးစာရင်းကို select ပေးပါ
@@ -2758,19 +2774,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},အတန်း {0}: Completed အရည်အတွက် {2} စစ်ဆင်ရေးများအတွက် {1} ထက်ပိုပြီးမဖွစျနိုငျ
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Item {0} စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုငျသညျ, စတော့အိတ် Entry &#39;ကိုသုံးပါ"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Item {0} စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုငျသညျ, စတော့အိတ် Entry &#39;ကိုသုံးပါ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Item {0} စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုငျသညျ, စတော့အိတ် Entry &#39;ကိုသုံးပါ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serial Item {0} စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုငျသညျ, စတော့အိတ် Entry &#39;ကိုသုံးပါ"
 DocType: Training Event Employee,Training Event Employee,လေ့ကျင့်ရေးပွဲထမ်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,အများဆုံးနမူနာ - {0} အသုတ်လိုက် {1} နှင့် Item {2} များအတွက်ထိန်းသိမ်းထားနိုင်ပါသည်။
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,အချိန် slot Add
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
 DocType: Stock Reconciliation Item,Current Valuation Rate,လက်ရှိအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate
 DocType: Training Event,Advance,ကြိုတင်မဲ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,နောက်တဖန်ထပ်တလဲလဲအောင်သည်။
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ငွေပေးချေမှုတံခါးပေါက် settings ကို
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},အတန်း # {0}: အကောင့် {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},အတန်း # {0}: အကောင့် {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DOCTYPE {0} ကိုရှာဖွေနိုင်ခြင်း
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
@@ -2789,7 +2804,6 @@
 DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ
 DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} မတွေ့ရှိ serial No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},subscription {0} ခဲ့
 DocType: Fee Schedule Program,Fee Schedule Program,အခကြေးငွေဇယားအစီအစဉ်
 DocType: Fee Schedule Program,Student Batch,ကျောင်းသားအသုတ်လိုက်
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ကျောင်းသား Make
@@ -2805,14 +2819,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,ကယ်နှုတ်တော်မူ၏မဟုတ်
 ,Bank Clearance Summary,ဘဏ်မှရှင်းလင်းရေးအကျဉ်းချုပ်
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
 DocType: Appraisal Goal,Appraisal Goal,စိစစ်ရေးဂိုး
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Category: အကြံပြုရန်?
 DocType: Stock Reconciliation Item,Current Amount,လက်ရှိပမာဏ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,အဆောက်အဦးများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,အဆောက်အဦးများ
 DocType: Fee Schedule,Fee Structure,အခကြေးငွေဖွဲ့စည်းပုံ
 DocType: Timesheet Detail,Costing Amount,ငွေပမာဏကုန်ကျ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Student Admission Program,Application Fee,လျှောက်လွှာကြေး
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Item {0} သည် Maxiumm လျှော့စျေး {1}% ဖြစ်ပါသည်
@@ -2820,12 +2833,13 @@
 DocType: Sales Partner,Address & Contacts,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: SMS Log,Sender Name,ပေးပို့သူအမည်
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,စိုက်ပျိုးရေးခွဲခြမ်းစိတ်ဖြာခြင်းလိုအပ်ချက်
+DocType: HR Settings,Leave Approval Notification Template,အတည်ပြုချက်သတိပေးချက် Template: Leave
 DocType: POS Profile,[Select],[ရွေးပါ]
 DocType: Vital Signs,Blood Pressure (diastolic),သွေးဖိအား (diastolic)
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 DocType: Agriculture Task,Holiday Management,အားလပ်ရက်စီမံခန့်ခွဲမှု
 DocType: Payment Request,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},ဆရာဝန် {1} အပေါ်ရရှိနိုင် {0} မဟုတ်
@@ -2843,7 +2857,7 @@
 DocType: Employee,New Workplace,နယူးလုပ်ငန်းခွင်
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,ပစ္စည်းစားသုံးမှု
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ပိတ်ထားသောအဖြစ် Set
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Barcode {0} နှင့်အတူမရှိပါ Item
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Barcode {0} နှင့်အတူမရှိပါ Item
 DocType: Normal Test Items,Require Result Value,ရလဒ် Value ကိုလိုအပ်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2858,19 +2872,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
 DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ထပ်တလဲလဲ
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ငွေသား Flow မြေပုံ Template ကိုအသေးစိတ်
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ချေးငွေစီမံခန့်ခွဲမှု
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ထုတ်ကုန် Vertical သို့မဟုတ်ကွဲပြားမှုသည်သီးခြားဝင်ငွေနှင့်သုံးစွဲမှုပြထားသည်။
 DocType: Rename Tool,Rename Tool,Tool ကို Rename
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: Fees,Send Payment Request,ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်း Send
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 DocType: Water Analysis,Origin,မူလ
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
@@ -2885,14 +2899,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ဝင်ငွေခွန်တာဝန်ဝတ္တရား Is
 DocType: Grading Scale Interval,Grade Description,grade ဖျေါပွခကျြ
 DocType: Stock Entry,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
 DocType: Sales Invoice, Shipping Bill Number,ဘီလ်နံပါတ်တင်ပို့
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 DocType: Asset Maintenance Log,Actions performed,ဖျော်ဖြေလုပ်ဆောင်ချက်များ
 DocType: Cash Flow Mapper,Section Leader,ပုဒ်မခေါင်းဆောင်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
 DocType: Supplier Scorecard Scoring Standing,Employee,လုပ်သား
+DocType: Bank Guarantee,Fixed Deposit Number,Fixed Deposit အရေအတွက်
 DocType: Asset Repair,Failure Date,ပျက်ကွက်ခြင်းနေ့စွဲ
 DocType: Sample Collection,Collected Time,ကောက်ခံအချိန်
 DocType: Company,Sales Monthly History,အရောင်းလစဉ်သမိုင်း
@@ -2909,10 +2924,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,သင်ဤချိန်းသင်ပယ်ဖျက်လိုတာသေချာလား?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ဟိုတယ်အခန်းစျေးနှုန်းပက်ကေ့
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,အရောင်းပိုက်လိုင်း
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Subscription အပ်ဒိတ်များဆွဲယူ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},အကောင့် {0} အကောင့်၏ Mode တွင်ကုမ္ပဏီ {1} နှင့်အတူမကိုက်ညီ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,သင်တန်းအမှတ်စဥ်:
@@ -2922,7 +2938,7 @@
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,created အဘယ်သူမျှမ Work ကိုအမိန့်
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဤကာလအဘို့ဖန်တီး
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ဆေးဝါး
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ဆေးဝါး
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ဝယ်ယူပစ္စည်းများ၏ကုန်ကျစရိတ်
 DocType: Selling Settings,Sales Order Required,အရောင်းအမိန့်လိုအပ်ပါသည်
 DocType: Purchase Invoice,Credit To,ခရက်ဒစ်ရန်
@@ -2940,7 +2956,7 @@
 DocType: Request for Quotation Supplier,No Quote,အဘယ်သူမျှမ Quote
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Gateway Account,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ပိတ် Compensatory
 DocType: Job Offer,Accepted,လက်ခံထားတဲ့
@@ -2953,7 +2969,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,ရှာဖွေမှုရလာဒ်များ
 DocType: Room,Room Number,အခန်းနံပတ်
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 DocType: Journal Entry Account,Payroll Entry,လုပ်ခလစာ Entry &#39;
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ကြည့်ရန်အခကြေးငွေများမှတ်တမ်း
@@ -2963,7 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Lab Test Sample,Lab Test Sample,Lab ကစမ်းသပ်နမူနာ
 DocType: Item Variant Settings,Allow Rename Attribute Value,Rename Attribute Value ကို Allow
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Restaurant,Invoice Series Prefix,ငွေတောင်းခံလွှာစီးရီးရှေ့စာလုံး
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
@@ -2971,8 +2987,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps ကိုပေါင်းစည်းမှု enabled မဟုတ်ပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
+DocType: Subscription,Trialling,စမ်းသပ်
 DocType: Member,Membership Expiry Date,အသင်းဝင်သက်တမ်းကုန်ဆုံးနေ့စွဲ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာဖြစ်ရပါမည်
 ,Minutes to First Response for Issues,ကိစ္စများများအတွက်ပထမဦးဆုံးတုံ့ပြန်မှုမှမိနစ်
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
@@ -2991,7 +3008,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,အခွင့်အရေး
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,အခွင့်အရေး
 DocType: Operation,Default Workstation,default Workstation နှင့်
 DocType: Notification Control,Expense Claim Approved Message,စရိတ်တောင်းဆိုမှုများ Approved Message
 DocType: Payment Entry,Deductions or Loss,ဖြတ်တောက်ခြင်းများကိုသို့မဟုတ်ပျောက်ဆုံးခြင်း
@@ -3029,7 +3046,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Pay ကိုမရှိရင် Leave အတည်ပြုခွင့်လျှောက်လွှာမှတ်တမ်းများနှင့်အတူမကိုက်ညီ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
 DocType: Membership,USD,အမေရိကန်ဒေါ်လာ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ပြေစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ကျန်ရှိသောလက်ကျန်ငွေ
@@ -3039,7 +3056,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,အဆုံးတစ်နှစ်တာ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Driver,Driver,မောင်းသူ
 DocType: Vital Signs,Nutrition Values,အာဟာရတန်ဖိုးများ
 DocType: Lab Test Template,Is billable,ဘီလ်ဆောင်ဖြစ်ပါသည်
@@ -3050,7 +3067,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,စုစုပေါင်းကြိုတင်မဲငွေပမာဏစုစုပေါင်းအခိုင်အမာငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,စုစုပေါင်းကြိုတင်မဲငွေပမာဏစုစုပေါင်းအခိုင်အမာငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3085,7 +3102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,ကို Select လုပ်ပါ Attribute တန်ဖိုးများ
 DocType: Purchase Invoice,Reason For Issuing document,စာရွက်စာတမ်းထုတ်ပေးခြင်းသည်အကြောင်းပြချက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Next ကိုဆက်သွယ်ပါအားဖြင့်ခဲအီးမေးလ်လိပ်စာအတိုင်းအတူတူမဖွစျနိုငျ
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
@@ -3102,7 +3119,8 @@
 DocType: Warranty Claim,Service Address,Service ကိုလိပ်စာ
 DocType: Asset Maintenance Task,Calibration,စံကိုက်ညှိ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ကုမ္ပဏီအားလပ်ရက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ပရိဘောဂများနှင့်ပွဲတွင်
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,အခြေအနေသတိပေးချက် Leave
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,ပရိဘောဂများနှင့်ပွဲတွင်
 DocType: Item,Manufacture,ပြုလုပ်
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup ကိုကုမ္ပဏီ
 ,Lab Test Report,Lab ကစမ်းသပ်အစီရင်ခံစာ
@@ -3118,7 +3136,6 @@
 DocType: Crop,Planting Area,စပါးစိုက်ပျိုးချိန်ဧရိယာ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ဤသည်မှာအဘယ်ကြောင့်ဆိုသော်အချို့မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာများဖြစ်နိုင်
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,သငျသညျကဆက်ပြောသည်
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,လေ့ကျင့်ရေးရလဒ်
@@ -3128,16 +3145,17 @@
 DocType: Products Settings,Products per Page,စာမျက်နှာနှုန်းထုတ်ကုန်များ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-အထက်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,အတန်း # {0}: ဂျာနယ် Entry &#39;{1} အကောင့် {2} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Supplier Scorecard Criteria,Criteria Weight,လိုအပ်ချက်အလေးချိန်
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,အတည်ပြုချက်သတိပေးချက် Leave
 DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet အပေါ်အခြေခံပြီးလစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ဝယ်ယူနှုန်း
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,ဝယ်ယူနှုန်း
 DocType: Notification Control,Sales Order Message,အရောင်းအမှာစာ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 DocType: Payment Entry,Payment Type,ငွေပေးချေမှုရမည့် Type
@@ -3160,6 +3178,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,စျေးဝယ်တွန်းလှည်း Settings ကို
 DocType: Journal Entry,Accounting Entries,စာရင်းကိုင် Entries
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ရွေးချယ်ထားသည့်စျေးနှုန်းနည်းဥပဒေ &#39;&#39; နှုန်း &#39;&#39; အဘို့ဖန်ဆင်းတော်မူ၏သည်ဆိုပါကစျေးစာရင်း overwrite ပါလိမ့်မယ်။ စျေးနှုန်းနည်းဥပဒေနှုန်းမှာနောက်ဆုံးနှုန်းမှာဖြစ်တယ်, ဒါမျှမကနောက်ထပ်လျှော့စျေးလျှောက်ထားရပါမည်။ ဒါကွောငျ့အရောင်းအမိန့်, အရစ်ကျအမိန့်စသည်တို့ကဲ့သို့အငွေကြေးလွှဲပြောင်းမှုမှာကြောင့်မဟုတ်ဘဲ &#39;&#39; စျေးနှုန်းစာရင်းနှုန်း &#39;&#39; လယ်ပြင်ထက်, &#39;နှုန်း&#39; &#39;လယ်ပြင်၌ခေါ်ယူလိမ့်မည်။"
+DocType: Journal Entry,Paid Loan,paid ချေးငွေ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entry Duplicate ။ ခွင့်ပြုချက်နည်းဥပဒေ {0} စစ်ဆေးပါ
 DocType: Journal Entry Account,Reference Due Date,ကိုးကားစရာကြောင့်နေ့စွဲ
 DocType: Purchase Order,Ref SQ,Ref စတုရန်းမိုင်
@@ -3176,7 +3195,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/config/hr.py +93,Payroll,အခစာရင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
 DocType: Patient Service Unit,Parent Service Unit,မိဘဝန်ဆောင်မှုယူနစ်
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,အသုံးပြုသူ Make
 DocType: Packing Slip,Identification of the package for the delivery (for print),(ပုံနှိပ်သည်) ကိုပေးပို့များအတွက်အထုပ်၏ identification
@@ -3195,7 +3214,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,delivery
 DocType: Volunteer,Weekdays,ကြားရက်များ
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: Restaurant Menu,Restaurant Menu,စားသောက်ဆိုင်မီနူး
@@ -3203,7 +3222,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,အစဉ်အမြဲစာရင်းမဘို့ရာခန့်က default စာရင်းအကောင့်
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,အစဉ်အမြဲစာရင်းမဘို့ရာခန့်က default စာရင်းအကောင့်
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Grant ကပြန်လည်ဆန်းစစ်ခြင်းအီးမေးလ်ပို့ပါ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage အပြည့်အဝဖြစ်ပါသည်, မကယ်တင်ခဲ့ဘူး"
@@ -3211,10 +3230,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,ROOM တွင်စွမ်းဆောင်ရည်
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},ယခုပင်လျှင်စံချိန်ပစ္စည်း {0} များအတွက်တည်ရှိ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,သင်ယခင်ကထုတ်ပေးငွေတောင်းခံလွှာ၏မှတ်တမ်းများကိုဆုံးရှုံးပါလိမ့်မယ်။ သင်ဤ subscription ကိုပြန်လည်စတင်ရန်ချင်သင်သေချာပါသလား?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,မှတ်ပုံတင်ခြင်းကြေး
 DocType: Budget,Cost Center,ကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,ဘောက်ချာ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,ဘောက်ချာ #
 DocType: Notification Control,Purchase Order Message,အမိန့် Message ယ်ယူ
 DocType: Tax Rule,Shipping Country,သဘောင်္တင်ခနိုင်ငံဆိုင်ရာ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,အရောင်းအရောင်းအဝယ်ကနေဖောက်သည်ရဲ့အခွန် Id Hide
@@ -3223,20 +3243,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","စျေးနှုန်းနည်းဥပဒေအချို့သတ်မှတ်ချက်များအပေါ်အခြေခံပြီး, လျှော့စျေးရာခိုင်နှုန်းသတ်မှတ် / စျေးနှုန်း List ကို overwrite မှလုပ်ဖြစ်ပါတယ်။"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ဂိုဒေါင်သာစတော့အိတ် Entry / Delivery မှတ်ချက် / ဝယ်ယူခြင်းပြေစာကနေတဆင့်ပြောင်းလဲနိုင်ပါသည်
 DocType: Employee Education,Class / Percentage,class / ရေရာခိုင်နှုန်း
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ဝင်ငွေခွန်
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Letterheads ကိုသွားပါ
+DocType: Subscription,Cancel At End Of Period,ကာလ၏အဆုံးမှာ Cancel
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,အပြောင်းအရွှေ့အတွက်ရွေးချယ်ပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,အပြောင်းအရွှေ့အတွက်ရွေးချယ်ပစ္စည်းများအဘယ်သူမျှမ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
 DocType: Vehicle,Electric,လျှပ်စစ်စွမ်းအား
 DocType: Task,% Progress,% တိုးတက်ရေးပါတီ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်း
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",&quot;Approved&quot; ဟုအဆိုပါအဆင့်အတန်းနှင့်အတူကျောင်းသားသမဂ္ဂများအဖွဲ့ချုပ်လျှောက်ထားသူသာလျှင်အောက်က table ထဲမှာမရွေးပါလိမ့်မည်။
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,အကောင့် {0} များအတွက်အကောင့်အရေအတွက်ကမရရှိနိုင်။ <br> မှန်ကန်စွာ Accounts ကို၏ ကျေးဇူးပြု. setup ကိုသင့်ရဲ့ဇယား။
 DocType: Task,Depends on Tasks,လုပ်ငန်းများအပေါ်မူတည်
@@ -3251,6 +3272,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,မစတော့အိတ်အတွက်
 DocType: Volunteer,Volunteer Skills,စေတနာ့ဝန်ထမ်းကျွမ်းကျင်မှု
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
+DocType: Bank Guarantee,Reference Document Name,ကိုးကားစရာစာရွက်စာတမ်းအမည်
 DocType: Purchase Invoice,Taxes and Charges Deducted,အခွန်နှင့်စွပ်စွဲချက်နုတ်ယူ
 apps/erpnext/erpnext/hooks.py +142,Issues,အရေးကိစ္စများ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},အဆင့်အတန်း {0} တယောက်ဖြစ်ရပါမည်
@@ -3264,7 +3286,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,အပိုအကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,အပိုအကြီးစား
+DocType: Loan,Loan Application,ချေးငွေလျှောက်လွှာ
 DocType: Crop,Scientific Name,သိပ္ပံနည်းကျအမည်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,စုစုပေါင်းအရွက်
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Reselect, ရွေးကောက်တော်မူသောအဆက်အသွယ်မှတပါးပြီးနောက် edited လျှင်"
@@ -3273,13 +3296,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Cheques နံပါတ်
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,ဒေသဆိုင်ရာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ငျြ့ရမညျအကွောငျး
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,အကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,အကြီးစား
 DocType: Homepage Featured Product,Homepage Featured Product,မူလစာမျက်နှာ Featured ကုန်ပစ္စည်း
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,အားလုံးအကဲဖြတ်အဖွဲ့များ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,အားလုံးအကဲဖြတ်အဖွဲ့များ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,နယူးဂိုဒေါင်အမည်
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),စုစုပေါင်း {0} ({1})
 DocType: C-Form Invoice Detail,Territory,နယျမွေ
@@ -3300,9 +3323,10 @@
 DocType: Fees,Fees,အဖိုးအခ
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
 DocType: Sales Partner,Targets,ပစ်မှတ်
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,ကုမ္ပဏီ၏သတင်းအချက်အလက်များဖိုင်ထဲမှာဥဩအရေအတွက်ကိုမှတ်ပုံတင်ပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Price List,Price List Master,စျေးနှုန်း List ကိုမဟာ
 DocType: GST Account,CESS Account,အခွန်အကောင့်
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
@@ -3311,6 +3335,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,လူနာကို Select လုပ်ပါ
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,parameter အမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;&#39; Approved &#39;နဲ့&#39; ငြင်းပယ် &#39;&#39; တင်သွင်းနိုင်ပါသည် status ကိုအတူ Applications ကိုသာလျှင် Leave
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},ကျောင်းသားအုပ်စုအမည်အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Homepage,Products to be shown on website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာပေါ်မှာပြသခံရဖို့ထုတ်ကုန်များ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
@@ -3344,14 +3369,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,ပြီးသားအားလုံးငွေတောင်းခံနာရီဖန်တီးငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},အမှားအမည်: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ဘဏ္ဍာရေးကုန်ကျစရိတ်ဖြစ်ပါသည်
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
 DocType: Packing Slip,If more than one package of the same type (for print),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,စားသောက်ဆိုင်က Settings ထဲမှာ default အနေနဲ့ဖောက်သည်သတ်မှတ်ပေးပါ
 ,Salary Register,လစာမှတ်ပုံတင်မည်
 DocType: Warehouse,Parent Warehouse,မိဘဂိုဒေါင်
-DocType: C-Form Invoice Detail,Net Total,Net ကစုစုပေါင်း
+DocType: Subscription,Net Total,Net ကစုစုပေါင်း
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},default Item {0} ဘို့မတွေ့ရှိ BOM နှင့်စီမံကိန်း {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,အမျိုးမျိုးသောချေးငွေအမျိုးအစားများကိုသတ်မှတ်
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,အမျိုးမျိုးသောချေးငွေအမျိုးအစားများကိုသတ်မှတ်
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ထူးချွန်ငွေပမာဏ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(မိနစ်၌) အချိန်
@@ -3383,11 +3408,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
 DocType: Drug Prescription,Drug Prescription,မူးယစ်ဆေးညွှန်း
 DocType: Fees,FEE.,ခ။
-DocType: Employee Loan,Repaid/Closed,ဆပ် / ပိတ်သည်
+DocType: Loan,Repaid/Closed,ဆပ် / ပိတ်သည်
 DocType: Item,Total Projected Qty,စုစုပေါင်းစီမံကိန်းအရည်အတွက်
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","အဘိုးပြတ်မှုနှုန်း {1} {2} များအတွက်စာရင်းကိုင် entries တွေကိုလုပ်ဖို့လိုအပ်သောပစ္စည်း {0}, အဘို့ရှာမတွေ့ပါ။ ပစ္စည်းတစ်ခုသုညအဘိုးပြတ်မှုနှုန်းကို item အဖြစ်လုပ်ဆောင်လျက်ရှိသည်လျှင် {1}, ပု {1} Item table ထဲမှာကြောင်းဖော်ပြထားခြင်းပါ။ ဒီလိုမှမဟုတ်ရင်ပစ္စည်းတစ်ခုဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်အတွက်ဖန်တီးသို့မဟုတ်ဖော်ပြထားခြင်းအဘိုးပြတ်နှုန်း Item စံချိန်အတွက်, ပြီးတော့ဒီ entry ပယ်ဖျက် / submiting ကြိုးစားကြည့်ပါ"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Course,Course Code,သင်တန်း Code ကို
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: POS Settings,Use POS in Offline Mode,အော့ဖ်လိုင်းဖြင့် Mode တွင် POS သုံးပါ
@@ -3407,16 +3431,15 @@
 DocType: Purchase Invoice,Deemed Export,ယူဆပါသည်ပို့ကုန်
 DocType: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,လျော့စျေးရာခိုင်နှုန်းတစ်စျေးနှုန်း List ကိုဆန့်ကျင်သို့မဟုတ်အားလုံးစျေးနှုန်းစာရင်းများအတွက်လည်းကောင်းလျှောက်ထားနိုင်ပါသည်။
-DocType: Subscription,Half-yearly,ဝက်နှစ်စဉ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Lab Test,LabTest Approver,LabTest သဘောတူညီချက်ပေး
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,သငျသညျပြီးသား {} အဆိုပါအကဲဖြတ်သတ်မှတ်ချက်အဘို့အအကဲဖြတ်ပါပြီ။
 DocType: Vehicle Service,Engine Oil,အင်ဂျင်ပါဝါရေနံ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},အလုပ်အမိန့် Created: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},အလုပ်အမိန့် Created: {0}
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
-DocType: Employee Loan,Loan Details,ချေးငွေအသေးစိတ်
+DocType: Loan,Loan Details,ချေးငွေအသေးစိတ်
 DocType: Company,Default Inventory Account,default Inventory အကောင့်
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,အဆိုပါဖိုလီယိုနံပါတ်များကိုကိုက်ညီကြသည်မဟုတ်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
@@ -3428,19 +3451,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,အဆိုပါသီးနှံကြီးထွားလာသောသူအပေါင်းတို့ကိုမြေယူနစ်မှတစ်ဦးက link ကို
 DocType: Account,Root Type,အမြစ်ကအမျိုးအစား
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
 DocType: Item Group,Show this slideshow at the top of the page,စာမျက်နှာရဲ့ထိပ်မှာဒီဆလိုက်ရှိုးပြရန်
 DocType: BOM,Item UOM,item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 DocType: Cheque Print Template,Primary Settings,မူလတန်းက Settings
 DocType: Purchase Invoice,Select Supplier Address,ပေးသွင်းလိပ်စာကို Select လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ဝန်ထမ်းများ Add
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ဝန်ထမ်းများ Add
 DocType: Purchase Invoice Item,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,အပိုအသေးစား
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,အပိုအသေးစား
 DocType: Company,Standard Template,စံ Template
 DocType: Training Event,Theory,သဘောတရား
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 DocType: Payment Request,Mute Email,အသံတိတ်အီးမေးလ်
@@ -3460,11 +3483,10 @@
 DocType: SMS Log,No of Sent SMS,Sent SMS ၏မရှိပါ
 DocType: Antibiotic,Healthcare Administrator,ကျန်းမာရေးစောင့်ရှောက်မှုအုပ်ချုပ်ရေးမှူး
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,တစ်ပစ်မှတ် Set
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: Dosage Strength,Dosage Strength,သောက်သုံးသောအစွမ်းသတ္တိ
 DocType: Account,Expense Account,စရိတ်အကောင့်
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software များ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,အရောင်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,အရောင်
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,အကဲဖြတ်အစီအစဉ်လိုအပ်ချက်
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲရွေးချယ်ထားသောပစ္စည်းအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,အရစ်ကျမိန့်တားဆီး
@@ -3477,18 +3499,18 @@
 DocType: Patient,Personal and Social History,ပုဂ္ဂိုလ်ရေးနှင့်လူမှုသမိုင်း
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,အသုံးပြုသူ {0} created
 DocType: Fee Schedule,Fee Breakup for each student,တစ်ခုချင်းစီကိုကျောင်းသားများအတွက်အခကြေးငွေအဖွဲ့ဟာ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,ပြောင်းလဲမှုကို Code ကို
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ဒီဇယ်
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 DocType: Purchase Invoice,Availed ITC Cess,ရရှိနိုင်ပါ ITC အခွန်
 ,Student Monthly Attendance Sheet,ကျောင်းသားသမဂ္ဂလစဉ်တက်ရောက်စာရွက်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ရောင်းအားအဘို့ကိုသာသက်ဆိုင် shipping အုပ်ချုပ်မှုကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project မှ Start ကိုနေ့စွဲ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,တိုငျအောငျ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ကျောင်းသားအုပ်စုသို့မဟုတ်သင်တန်းအမှတ်စဥ်ဇယားမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ကျောင်းသားအုပ်စုသို့မဟုတ်သင်တန်းအမှတ်စဥ်ဇယားမဖြစ်မနေဖြစ်ပါသည်
@@ -3509,7 +3531,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,သငျသညျရောင်းမဝယ်သင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်းပြုစုပါ။
 DocType: Water Analysis,Storage Temperature,သိုလှောင်ခြင်းအပူချိန်
 DocType: Employee Attendance Tool,Unmarked Attendance,ထငျရှားတက်ရောက်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,သုတေသီတစ်ဦး
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,သုတေသီတစ်ဦး
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program ကိုစာရငျးပေးသှငျး Tool ကိုကျောင်းသားသမဂ္ဂ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},ရက်စွဲကိုတာဝန် {0} များအတွက်အဆုံးသည့်ရက်စွဲထက်လျော့နည်းဖြစ်သင့် Start
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,အမည်သို့မဟုတ်အီးမေးလ်မသင်မနေရ
@@ -3522,7 +3544,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့ RFQs သတိနဲ့ထုတ်ပေးရပါမည်။"
 DocType: Chapter,Non Profit Manager,non အမြတ် Manager ကို
 DocType: BOM,Total Cost(Company Currency),စုစုပေါင်းကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,serial No {0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,serial No {0} နေသူများကဖန်တီး
 DocType: Homepage,Company Description for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ကုမ္ပဏီဖျေါပွခကျြ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier အမည်
@@ -3532,11 +3554,10 @@
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
 DocType: Healthcare Settings,Result Printed,ရလဒ်ပုံနှိပ်
 DocType: Asset Category Account,Depreciation Expense Account,တန်ဖိုးသုံးစွဲမှုအကောင့်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Probationary Period
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ကြည့်ရန် {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Probationary Period
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Project,Total Costing Amount (via Timesheets),(Timesheets မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
-DocType: Employee Advance,Expense Approver,စရိတ်အတည်ပြုချက်
+DocType: Department,Expense Approver,စရိတ်အတည်ပြုချက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
 DocType: Project,Hourly,နာရီတိုင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Group ကိုမှ non-Group က
@@ -3546,7 +3567,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime မှ
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
 DocType: Accounts Settings,Make Payment via Journal Entry,ဂျာနယ် Entry မှတဆင့်ငွေပေးချေမှုရမည့် Make
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,တွင်ပုံနှိပ်
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,တွင်ပုံနှိပ်
 DocType: Item,Inspection Required before Delivery,ဖြန့်ဝေမီကတောင်းဆိုနေတဲ့စစ်ဆေးရေး
 DocType: Item,Inspection Required before Purchase,အရစ်ကျမီကတောင်းဆိုနေတဲ့စစ်ဆေးရေး
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
@@ -3556,7 +3577,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,အနိမ့်အမိန့်အရေအတွက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,သင့်ရဲ့အဖွဲ့
 DocType: Fee Component,Fees Category,အဖိုးအခ Category:
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,ထမ်းအကြောင်းကြားရန်
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
@@ -3566,7 +3587,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Reorder အဆင့်
 DocType: Company,Chart Of Accounts Template,Accounts ကို Template ၏ဇယား
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Purchase Invoice Item,Accepted Warehouse,လက်ခံထားတဲ့ဂိုဒေါင်
@@ -3574,10 +3595,11 @@
 DocType: Item,Valuation Method,အဘိုးပြတ် Method ကို
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,မာကုတစ်ဝက်နေ့
 DocType: Sales Invoice,Sales Team,အရောင်းရေးအဖွဲ့
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,entry ကို Duplicate
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,entry ကို Duplicate
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,submittting ရှေ့တော်၌ထိုအကျိုးခံစား၏အမည်ကိုရိုက်ထည့်ပါ။
 DocType: Program Enrollment Tool,Get Students,ကျောင်းသားများ get
 DocType: Serial No,Under Warranty,အာမခံအောက်မှာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[အမှား]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[အမှား]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,သင်အရောင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Completed ပြုပြင်ခြင်းများအတွက်ပြီးစီးနေ့စွဲကို select ပေးပါ
@@ -3596,7 +3618,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ခွဲစာချုပ်ကိုချုပ်ဆိုဘို့ reserved
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
 DocType: Shopping Cart Settings,Orders,အမိန့်
-DocType: Employee Leave Approver,Leave Approver,ခွင့်ပြုချက် Leave
+DocType: Department,Leave Approver,ခွင့်ပြုချက် Leave
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,တစ်သုတ်ကို select ပေးပါ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,အကဲဖြတ် Group မှအမည်
@@ -3641,7 +3663,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,hub ခြေရာခံပစ္စည်း
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT FOR ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ဤသည်ကိုအီးမေးလ် autogenerated ဖြစ်ပါတယ်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
 DocType: Program Enrollment,Boarding Student,boarding ကျောင်းသား
 DocType: Asset,Expected Value After Useful Life,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထား Value တစ်ခု
@@ -3666,22 +3687,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},တက်ရောက်သူမှတ်တမ်း {0} ကျောင်းသားသမဂ္ဂ {1} ဆန့်ကျင်တည်ရှိ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ကြောင့်ပိုင်ဆိုင်မှုများစွန့်ပစ်ခြင်းမှဖယ်ရှားပစ်တန်ဖိုး
-DocType: Member,Member,အဖှဲ့ဝငျ
+DocType: Loan,Member,အဖှဲ့ဝငျ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,လိပ်စာ Manage
 DocType: Work Order Item,Work Order Item,အလုပ်အမိန့် Item
 DocType: Pricing Rule,Item Code,item Code ကို
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
 DocType: Agriculture Analysis Criteria,Agriculture Manager,စိုက်ပျိုးရေး Manager ကို
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Supplier Scorecard Period,Variables,variables ကို
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Cheque Print Template,Cheque Size,Cheque တစ်စောင်လျှင် Size ကို
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
 DocType: Sales Invoice,Write Off Outstanding Amount,ထူးချွန်ငွေပမာဏပိတ်ရေးထား
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},အကောင့် {0} {1} ကုမ္ပဏီနှင့်အတူမကိုက်ညီ
@@ -3690,7 +3711,6 @@
 DocType: Stock Settings,Default Stock UOM,default စတော့အိတ် UOM
 DocType: Asset,Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,အရည်အတွက်စုစုပေါင်း
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},{0}: ထမ်းချေးငွေဆန့်ကျင်
 DocType: Landed Cost Item,Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်း
 DocType: Employee Education,School/University,ကျောင်း / တက္ကသိုလ်က
 DocType: Payment Request,Reference Details,ကိုးကားစရာ Details ကို
@@ -3701,7 +3721,7 @@
 DocType: Asset,Double Declining Balance,နှစ်ချက်ကျဆင်းနေ Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ပိတ်ထားသောအမိန့်ကိုဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့မပိတ်ထားသည့်။
 DocType: Student Guardian,Father,ဖခင်
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 DocType: Attendance,On Leave,Leave တွင်
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates ကိုရယူပါ
@@ -3715,10 +3735,10 @@
 DocType: Lead,Lower Income,lower ဝင်ငွေခွန်
 DocType: Restaurant Order Entry,Current Order,လက်ရှိအမိန့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Programs ကိုကိုသွားပါ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},အတန်း {0} # ခွဲဝေငွေပမာဏ {1} သည့်အရေးမဆိုထားသောငွေပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},အတန်း {0} # ခွဲဝေငွေပမာဏ {1} သည့်အရေးမဆိုထားသောငွေပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
@@ -3741,7 +3761,6 @@
 DocType: Payment Terms Template,Payment Terms,ငွေပေးချေမှုရမည့်စည်းမျဉ်းစည်းကမ်းများ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,မိနစ်
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 DocType: Chapter,Meetup Embed HTML,Meetup Embed က HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ပေးသွင်းကိုသွားပါ
@@ -3761,30 +3780,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,အဆိုပါငွေပေးချေတောင်းဆိုမှုပေးပို့ဖို့ကျောင်းသားများအတွက်အီးမေးလ် ID ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,အဆိုပါငွေပေးချေတောင်းဆိုမှုပေးပို့ဖို့ကျောင်းသားများအတွက်အီးမေးလ် ID ကိုသတ်မှတ်ပေးပါ
 DocType: Patient,Medical History,ဆေးဘက်ဆိုင်ရာသမိုင်း
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
 DocType: Patient,Patient ID,လူနာ ID ကို
 DocType: Physician Schedule,Schedule Name,ဇယားအမည်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,အားလုံးပေးသွင်း Add
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,အားလုံးပေးသွင်း Add
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,အတန်း # {0}: ခွဲဝေငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Browse ကို BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,လုံခြုံသောချေးငွေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,လုံခြုံသောချေးငွေ
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit ကို Post date နှင့်အချိန်
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ပိုင်ဆိုင်မှုအမျိုးအစား {0} သို့မဟုတ်ကုမ္ပဏီ {1} အတွက်တန်ဖိုးနှင့်ဆက်စပ်သော Accounts ကိုသတ်မှတ်ထားပေးပါ
 DocType: Lab Test Groups,Normal Range,ပုံမှန် Range
 DocType: Academic Term,Academic Year,စာသင်နှစ်
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,ရောင်းချခြင်းရရှိနိုင်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N ကို
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ကျန်ရှိနေသေးသော
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
+DocType: Loan,Loan Account,ချေးငွေအကောင့်
 DocType: Purchase Invoice,GST Details,GST အသေးစိတ်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ကုန်ပစ္စည်းပေးသွင်း {0} မှစလှေတျတျောအီးမေးလ်
 DocType: Item,Default Sales Unit of Measure,တိုင်း၏ default အရောင်းယူနစ်
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,စာသင်နှစ်:
+DocType: Subscription,Past Due Date,အတိတ်ကြောင့်နေ့စွဲ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ပစ္စည်း {0} များအတွက်အခြားရွေးချယ်စရာကို item set ဖို့ခွင့်မပြု
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
@@ -3797,7 +3818,7 @@
 DocType: Patient Appointment,Patient Appointment,လူနာခန့်အပ်တာဝန်ပေးခြင်း
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,အခန်းက္ပအတည်ပြုပေးသောစိုးမိုးရေးသက်ဆိုင်သည်အခန်းကဏ္ဍအဖြစ်အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ဒီအအီးမေးလ် Digest မဂ္ဂဇင်းထဲကနေနှုတ်ထွက်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,အားဖြင့်ပေးသွင်း Get
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,အားဖြင့်ပေးသွင်း Get
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} Item {1} ဘို့မတွေ့ရှိ
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,သင်တန်းများသို့သွားရန်
 DocType: Accounts Settings,Show Inclusive Tax In Print,ပုံနှိပ်ပါခုနှစ်တွင် Inclusive အခွန်ပြရန်
@@ -3805,10 +3826,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,message Sent
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,ကလေးသူငယ် node များနှင့်အတူအကောင့်ကိုလယ်ဂျာအဖြစ်သတ်မှတ်မရနိုငျ
 DocType: C-Form,II,II ကို
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,စျေးနှုန်းစာရင်းငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Physician,Physician Schedules,ဆရာဝန်အချိန်ဇယားများ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,စုစုပေါင်းကြိုတင်မဲငွေပမာဏစုစုပေါင်းပိတ်ဆို့အရေးယူငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,စုစုပေါင်းကြိုတင်မဲငွေပမာဏစုစုပေါင်းပိတ်ဆို့အရေးယူငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Salary Slip,Hour Rate,အချိန်နာရီနှုန်း
 DocType: Stock Settings,Item Naming By,အားဖြင့်အမည် item
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry &#39;
@@ -3826,6 +3848,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ထက်အသက်အရွယ်ကြီးစတော့ရှယ်ယာအရောင်းအ update လုပ်ဖို့ခွင့်မပြု
 DocType: BOM,Inspection Required,စစ်ဆေးရေးလိုအပ်ပါသည်
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,submittting ရှေ့တော်၌ထိုဘဏ်အာမခံနံပါတ်ရိုက်ထည့်ပါ။
 DocType: Driving License Category,Class,class
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,အလုပ်အမိန့်တစ်ခုအရာဝတ္ထု Template ကိုဆန့်ကျင်ကြီးပြင်းရနိုင်မှာမဟုတ်ဘူး
@@ -3836,7 +3859,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Assessment Plan,Program,အစီအစဉ်
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
 DocType: Student Group,Group Based On,Group မှအခြေပြုတွင်
 DocType: Student Group,Group Based On,Group မှအခြေပြုတွင်
@@ -3848,9 +3870,10 @@
 DocType: Cheque Print Template,Cheque Height,Cheque တစ်စောင်လျှင်အမြင့်
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
 DocType: Setup Progress,Setup Progress,Setup ကိုတိုးတက်ရေးပါတီ
+DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 DocType: Hub Settings,Publish Items to Hub,Hub မှပစ္စည်းများထုတ်ဝေ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},တန်ဖိုးမြှင်ထံမှအတန်း {0} အတွက်တန်ဖိုးထက်နည်းရှိရမည်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,ငွေလွှဲခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,အားလုံး Check
 ,Issued Items Against Work Order,လုပ်ငန်းခွင်အမိန့်ဆန့်ကျင်ထုတ်ပေးပစ္စည်းများ
 DocType: Vehicle Log,Invoice Ref,ငွေတောင်းခံလွှာ Ref
@@ -3881,12 +3904,11 @@
 DocType: Customs Tariff Number,Tariff Number,အခွန်နံပါတ်
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP ဂိုဒေါင်မှာမရရှိနိုင်အရည်အတွက်
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
-DocType: Employee Loan,Employee Loan Application,ဝန်ထမ်းချေးငွေလျှောက်လွှာ
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,ပထမဦးဆုံးလူနာကယ်တင်ပေးပါ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,ပထမဦးဆုံးလူနာကယ်တင်ပေးပါ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,တက်ရောက်သူအောင်မြင်စွာမှတ်လိုက်ပါပြီ။
 DocType: Program Enrollment,Public Transport,ပြည်သူ့ပို့ဆောင်ရေး
 DocType: Soil Texture,Silt Composition (%),နုန်းရေးစပ်သီကုံး (%)
@@ -3905,7 +3927,7 @@
 ,Item Balance (Simple),item Balance (ရိုးရှင်းသော)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ပေးသွင်းခြင်းဖြင့်ကြီးပြင်းဥပဒေကြမ်းများ။
 DocType: POS Profile,Write Off Account,အကောင့်ပိတ်ရေးထား
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,debit မှတ်ချက် Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,debit မှတ်ချက် Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
@@ -3928,6 +3950,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
 DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
 DocType: Assessment Plan,Assessment Plan,အကဲဖြတ်အစီအစဉ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ပြောင်းပြန်ဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ဖောက်သည် {0} နေသူများကဖန်တီး။
 DocType: Stock Settings,Limit Percent,ရာခိုင်နှုန်းကန့်သတ်ရန်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,မည်သည့်ဂိုဒေါင်ထဲမှာရရှိနိုင်လောလောဆယ်အဘယ်သူမျှမစတော့ရှယ်ယာ
@@ -3941,14 +3964,15 @@
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Payment Entry,Payment References,ငွေပေးချေမှုရမည့်ကိုးကား
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Interval သည် &#39;&#39; နေ့ရက်များ &#39;နှင့်ငွေတောင်းခံလွှာ Interval သည်အရေအတွက် 3 ဖြစ်ပါသည်လျှင်ကြားကာလလယ်ကိုဥပမာအဘို့အကြားကာလအရေအတွက်, ငွေတောင်းခံလွှာများကိုတိုင်း 3 ရက်အတွင်းထုတ်ပေးပါလိမ့်မည်"
 DocType: Vehicle,Insurance Details,အာမခံအသေးစိတ်
 DocType: Account,Payable,ပေးအပ်သော
 DocType: Share Balance,Share Type,ဝေမျှမယ်အမျိုးအစား
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ပြန်ဆပ်ကာလကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ပြန်ဆပ်ကာလကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ကိုက် ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,နယူး Customer များ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,စုစုပေါင်းအမြတ်%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,စုစုပေါင်းအမြတ်%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,ပြောင်းလဲမှု POS ကိုယ်ရေးဖိုင်
 DocType: Bank Reconciliation Detail,Clearance Date,ရှင်းလင်းရေးနေ့စွဲ
@@ -3958,10 +3982,11 @@
 DocType: Lead,Address Desc,Desc လိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,ပါတီမဖြစ်မနေဖြစ်ပါသည်
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},အခြားအတနျးထဲမှာထပ်နေမှုများကြောင့်ရက်စွဲများနှင့်အတူတန်းစီတွေ့ရှိခဲ့သည်: {စာရင်း}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},အခြားအတနျးထဲမှာထပ်နေမှုများကြောင့်ရက်စွဲများနှင့်အတူတန်းစီတွေ့ရှိခဲ့သည်: {စာရင်း}
 DocType: Topic,Topic Name,ခေါင်းစဉ်အမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,HR က Settings ထဲမှာခွင့်အတည်ပြုချက်သတိပေးချက်များအတွက် default အ template ကိုသတ်မှတ်ထားပေးပါ။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,ရောင်းစျေးသို့မဟုတ်ဝယ်ယူ၏ Atleast တယောက်ရွေးချယ်ထားရမည်ဖြစ်သည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,အလုပျသမားကြိုတင်မဲရဖို့တစ်ခုဝန်ထမ်းရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,အလုပျသမားကြိုတင်မဲရဖို့တစ်ခုဝန်ထမ်းရွေးချယ်ပါ။
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,ခိုင်လုံသောနေ့စွဲကို select ပေးပါ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,သင့်ရဲ့စီးပွားရေးလုပ်ငန်း၏သဘောသဘာဝကို Select လုပ်ပါ။
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3980,7 +4005,7 @@
 DocType: Asset Movement,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ဝေမျှမယ် Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,အရောင်းပြေစာ {0} created
 DocType: Employee,Confirmation Date,အတည်ပြုချက်နေ့စွဲ
 DocType: C-Form,Total Invoiced Amount,စုစုပေါင်း Invoiced ငွေပမာဏ
@@ -3989,7 +4014,7 @@
 DocType: Account,Accumulated Depreciation,စုဆောင်းတန်ဖိုး
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ရပ်နေသည်ကိုအမည်
 DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
-DocType: Employee Loan Application,Required by Date,နေ့စွဲခြင်းဖြင့်တောင်းဆိုနေတဲ့
+DocType: Loan Application,Required by Date,နေ့စွဲခြင်းဖြင့်တောင်းဆိုနေတဲ့
 DocType: Lead,Lead Owner,ခဲပိုင်ရှင်
 DocType: Production Plan,Sales Orders Detail,အရောင်းအမိန့်အသေးစိတ်
 DocType: Bin,Requested Quantity,တောင်းဆိုထားသောပမာဏ
@@ -4002,10 +4027,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,စုစုပေါင်း Pay ကို - စုစုပေါင်းထုတ်ယူ - ချေးငွေပြန်ဆပ်
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,အကွိမျမြားစှာမူကွဲ
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
+DocType: Subscription,Trial Period Start Date,စမ်းသပ်မှုကာလကို Start နေ့စွဲ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,အခြားအသုံးပြုသူအဖြစ် login ပေးပါ။
@@ -4026,12 +4052,11 @@
 DocType: Student Guardian,Student Guardian,ကျောင်းသားသမဂ္ဂဂါးဒီးယန်း
 DocType: Member,Member Name,အဖွဲ့ဝင်အမည်
 DocType: Stock Settings,Use Naming Series,စီးရီးအမည်ဖြင့်သမုတ်ကိုသုံးပါ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,စာရင်းသွင်းထားသောအတွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 DocType: Membership,Payment Details,ငွေပေးချေမှုရမည့်အသေးစိတ်အကြောင်းအရာ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","လုပ်ငန်းခွင်အမိန့်ကိုပယ်ဖျက်ပေးဖို့ပထမဦးဆုံးက Unstop, ဖျက်သိမ်းမရနိုငျရပ်တန့်"
 DocType: Asset,Journal Entry for Scrap,အပိုင်းအစအဘို့အဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
@@ -4051,6 +4076,7 @@
 DocType: Land Unit,Land Unit,မြေယာယူနစ်
 ,Purchase Analytics,ဝယ်ယူခြင်း Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Delivery မှတ်ချက် Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,လက်ရှိငွေတောင်းခံလွှာ {0} ပျောက်ဆုံးနေ
 DocType: Asset Maintenance Log,Task,လုပ်ငန်း
 DocType: Purchase Taxes and Charges,Reference Row #,ကိုးကားစရာ Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
@@ -4063,7 +4089,7 @@
 DocType: Company,Exchange Gain / Loss Account,ချိန်း Gain / ပျောက်ဆုံးခြင်းအကောင့်
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ဝန်ထမ်းနှင့်တက်ရောက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ကွန်မြူနတီဖိုရမ်၏
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,စတော့ရှယ်ယာအတွက်အမှန်တကယ်အရည်အတွက်
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,စတော့ရှယ်ယာအတွက်အမှန်တကယ်အရည်အတွက်
@@ -4078,7 +4104,7 @@
 DocType: Lab Test Template,Standard Selling Rate,စံရောင်းအားနှုန်း
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
 DocType: Cash Flow Mapper,Section Name,ပုဒ်မအမည်
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Reorder Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,လက်ရှိယောဘသည်င့်
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,အကြွေးလျှော်ပစ်ခြင်း
@@ -4089,9 +4115,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,ပစ္စည်းများအပေါငျးတို့သဘီလ်အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကို update တန်းစီထားသည်။ ဒါဟာမိနစ်အနည်းငယ်ကြာနိုင်ပါသည်။
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,တိုင်းပြည်ပညာရှိသောသူကို default လိပ်စာ Templates
 DocType: Water Analysis,Appearance,ပုံပန်းသဏ္ဍာန်
+DocType: HR Settings,Leave Status Notification Template,အခြေအနေသတိပေးချက် Template: Leave
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,ပျမ်းမျှ။ စျေးစာရင်းနှုန်းဝယ်ယူ
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,အဖွဲ့ဝင်သတင်းအချက်အလက်။
@@ -4114,7 +4140,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,အခွင့်မရှိကြ။ အဆိုပါစမ်းသပ်မှု Template ကို disable ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
 DocType: Crop Cycle,Linked Land Unit,လင့်ခ်လုပ်ထားသောမြေယာယူနစ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -4130,7 +4156,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,အသုံးပြုသူများကိုသွားပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,မှားနေသော GSTIN သို့မဟုတ်မှတ်ပုံမတင်ထားသောများအတွက် NA Enter
 DocType: Training Event,Seminar,ညှိနှိုငျးဖလှယျပှဲ
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program ကိုကျောင်းအပ်ကြေး
@@ -4146,14 +4172,14 @@
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 DocType: Company,Create Chart Of Accounts Based On,Accounts ကိုအခြေပြုတွင်၏ဇယား Create
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Non-အုပ်စုတစ်ခုကိုပြောင်းလို့မရပါဘူး။ ကလေးသူငယ်လုပ်ငန်းများတည်ရှိ။
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်ထား {1} ဆန့်ကျင်တည်ရှိ
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),ရှာနိုင်ပါတယ်ညှိယူ (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,အချိန်ဇယား
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,batch:
 DocType: Volunteer,Afternoon,မှနျးလှဲ
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Cheque Print Template,Scanned Cheque,Scan Cheque တစ်စောင်လျှင်
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
@@ -4169,7 +4195,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,စီမံကိန်း {0} ပြီးသားတည်ရှိ
 DocType: Medical Department,Nursing User,သူနာပြုအသုံးပြုသူ
 DocType: Plant Analysis,Plant Analysis Criterias,စက်ရုံအားသုံးသပ်ခြင်းစံ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,တာဝန်ဝတ္တရားများ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},serial ဘယ်သူမျှမက {0} အသုတ်လိုက်မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,တာဝန်ဝတ္တရားများ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ဒီ quotation အများ၏တရားဝင်မှုကာလအဆုံးသတ်ခဲ့သည်။
 DocType: Expense Claim Account,Expense Claim Account,စရိတ်တိုင်ကြားအကောင့်
 DocType: Accounts Settings,Allow Stale Exchange Rates,ဟောင်းနွမ်းငွေလဲနှုန်း Allow
@@ -4191,11 +4218,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,မူကွဲ Make
 DocType: Item,Default BOM,default BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),(အရောင်းငွေတောင်းခံလွှာကနေတဆင့်) စုစုပေါင်းကောက်ခံခဲ့ငွေပမာဏ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,debit မှတ်ချက်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,debit မှတ်ချက်ငွေပမာဏ
 DocType: Project Update,Not Updated,နောက်ဆုံးရေးသားချိန်မဟုတ်
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","နှုန်း, ရှယ်ယာမျှနှင့်တွက်ချက်ပမာဏကိုအကြားရှေ့နောက်မညီရှိပါတယ်"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
 DocType: Employee Advance,Advance Account,ကြိုတင်မဲအကောင့်
 DocType: Job Offer,Job Offer Terms,ယောဘသည်ကမ်းလှမ်းချက်စည်းမျဉ်းစည်းကမ်းများ
@@ -4204,7 +4231,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 DocType: Vehicle,Insurance Company,အာမခံကုမ္ပဏီ
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset အကောင့်
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ပွောငျးလဲတတျသော
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ပွောငျးလဲတတျသော
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Chapter,Members,အဖွဲ့ဝင်များ
 DocType: Student,Student Email Address,ကျောင်းသားအီးမေးလ်လိပ်စာ
@@ -4228,7 +4255,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,အလုပ်သင်ဆရာဝန်
 DocType: Delivery Stop,Address Name,လိပ်စာအမည်
 DocType: Stock Entry,From BOM,BOM ကနေ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},splitting {1} ၏ {0} ယူနစ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},splitting {1} ၏ {0} ယူနစ်
 DocType: Assessment Code,Assessment Code,အကဲဖြတ် Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
@@ -4236,25 +4263,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 DocType: Bank Reconciliation Detail,Payment Document,ငွေပေးချေမှုရမည့်စာရွက်စာတမ်း
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,အဆိုပါစံသတ်မှတ်ချက်ပုံသေနည်းအကဲဖြတ်မှုမှားယွင်းနေ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+DocType: Subscription,Plans,အစီအစဉ်များ
 DocType: Salary Slip,Salary Structure,လစာဖွဲ့စည်းပုံ
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ပြဿနာပစ္စည်း
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,ထပ်တလဲလဲကိုစဉ်တွင်အမှားတစ်ခုဖြစ်ပေါ်နေပါသည်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ကိုးကား
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,အဘယ်သူမျှမကျောင်းသားသမဂ္ဂအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
 DocType: Purchase Invoice Item,Serial No,serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏချေးငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏချေးငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,အတန်း # {0}: မျှော်မှန်း Delivery နေ့စွဲဝယ်ယူမိန့်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: Purchase Invoice,Print Language,ပုံနှိပ်ပါဘာသာစကားများ
 DocType: Salary Slip,Total Working Hours,စုစုပေါင်းအလုပ်အဖွဲ့နာရီ
 DocType: Sales Invoice,Customer PO Details,ဖောက်သည်စာတိုက်အသေးစိတ်
-DocType: Subscription,Next Schedule Date,Next ကိုဇယားနေ့စွဲ
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ယာယီဖွင့်ပွဲအကောင့်
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
@@ -4283,11 +4309,11 @@
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,အဆိုပါဖော်ပြခဲ့တဲ့စံအဘို့အဘယ်သူမျှမကန်ထမ်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
 DocType: Hotel Settings,Default Customer,default ဖောက်သည်
 DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ချိန်းထိုနေ့အဘို့အနေသူများကဖန်တီးလျှင်အတည်ပြုမပြုပါ
@@ -4312,16 +4338,16 @@
 DocType: Journal Entry Account,Employee Advance,ဝန်ထမ်းကြိုတင်
 DocType: Payroll Entry,Payroll Frequency,လစာကြိမ်နှုန်း
 DocType: Lab Test Template,Sensitivity,အာရုံများကိုထိခိုက်လွယ်ခြင်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,ကုန်ကြမ်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,အပင်များနှင့်သုံးစက်ပစ္စည်း
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,အပင်များနှင့်သုံးစက်ပစ္စည်း
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily သတင်းစာလုပ်ငန်းခွင်အနှစ်ချုပ်က Settings
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,နေ့စွဲခြင်းဖြင့် Reqd ရိုက်ထည့်ပေးပါ
 DocType: Payment Entry,Internal Transfer,ပြည်တွင်းလွှဲပြောင်း
 DocType: Asset Maintenance,Maintenance Tasks,ကို Maintenance လုပ်ငန်းများ
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကလယ်ဂျာမှပြောင်းလဲမပြနိုင်
@@ -4329,14 +4355,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrated
 DocType: Crop Cycle,Detected Disease,ရှာဖွေတွေ့ရှိထားသည့်ရောဂါ
 ,Produced,ထုတ်လုပ်
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ပြန်ဆပ်ဖို့ Start နေ့စွဲငွေပေးချေနေ့စွဲမတိုင်မီမဖြစ်နိုင်ပါ။
 DocType: Item,Item Code for Suppliers,ပေးသွင်းသည် item Code ကို
 DocType: Issue,Raised By (Email),(အီးမေးလ်) အားဖြင့်ထမြောက်စေတော်
 DocType: Training Event,Trainer Name,သင်တန်းပေးသူအမည်
 DocType: Mode of Payment,General,ယေဘုယျ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,နောက်ဆုံးဆက်သွယ်ရေး
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,နောက်ဆုံးဆက်သွယ်ရေး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
@@ -4350,7 +4377,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},ဒေါက်တာ {0} တစ်ဝက်နေ့၌ {1} အပေါ် Leave
 DocType: Production Plan,Get Material Request,ပစ္စည်းတောင်းဆိုမှု Get
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါင်း (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 ,Item Variant Details,item မူကွဲအသေးစိတ်
@@ -4361,9 +4388,9 @@
 DocType: Drug Prescription,Hour,နာရီ
 DocType: Restaurant Order Entry,Last Sales Invoice,နောက်ဆုံးအရောင်းပြေစာ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},ကို item ဆန့်ကျင် {0} အရည်အတွက်ကို select ပေးပါ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 DocType: Company,Monthly Sales Target,လစဉ်အရောင်းပစ်မှတ်
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
@@ -4371,7 +4398,7 @@
 DocType: Item,Default Material Request Type,default ပစ္စည်းတောင်းဆိုမှုအမျိုးအစား
 DocType: Supplier Scorecard,Evaluation Period,အကဲဖြတ်ကာလ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,အမည်မသိ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,အလုပ်အမိန့်နေသူများကဖန်တီးမပေး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,အလုပ်အမိန့်နေသူများကဖန်တီးမပေး
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: Purchase Invoice,Export Type,ပို့ကုန်အမျိုးအစား
 DocType: Salary Slip Loan,Salary Slip Loan,လစာစလစ်ဖြတ်ပိုင်းပုံစံချေးငွေ
@@ -4387,8 +4414,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ဖွင့်လှစ်ငွေတောင်းခံလွှာအနှစ်ချုပ်
 DocType: Education Settings,Education Manager,ပညာရေး Manager ကို
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,အကောင်းဆုံးတိုးတက်မှုအတွက်လယ်ပြင်၌အသီးအသီးစက်ရုံအကြားနိမ့်ဆုံးအရှည်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","batch Item {0} အစားစတော့အိတ် Entry &#39;ကိုအသုံးပြုဖို့, စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုင်"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","batch Item {0} အစားစတော့အိတ် Entry &#39;ကိုအသုံးပြုဖို့, စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုင်"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","batch Item {0} အစားစတော့အိတ် Entry &#39;ကိုအသုံးပြုဖို့, စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုင်"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","batch Item {0} အစားစတော့အိတ် Entry &#39;ကိုအသုံးပြုဖို့, စတော့အိတ်ပြန်လည်သင့်မြတ်ရေးကို အသုံးပြု. updated မရနိုင်"
 DocType: Quality Inspection,Report Date,အစီရင်ခံစာနေ့စွဲ
 DocType: Student,Middle Name,အလယ်နာမည်
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
@@ -4421,20 +4448,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ပွေစာ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ပွေစာ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Daily Work Summary Group,Send Emails At,မှာထားတဲ့အီးမေးလ်ပို့ပါ
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,form ကိုကြည့်ရန်
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,စရိတ်ဆိုနေခုနှစ်တွင်သဘောတူညီချက်ပေးမသင်မနေရစရိတ်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းကမှအသုံးပြုသူများကိုထည့်ပါ။"
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,မရှိသေးပါဖောက်သည်!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,created အဘယ်သူမျှမပစ္စည်းကိုတောငျးဆိုခကျြ
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,လိုင်စင်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
@@ -4457,11 +4485,12 @@
 DocType: Vehicle,Chassis No,ကိုယ်ထည်အဘယ်သူမျှမ
 DocType: Payment Request,Initiated,စတင်ခဲ့သည်
 DocType: Production Plan Item,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,တစ်ဦး BOM ကို select ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,တစ်ဦး BOM ကို select ပေးပါ
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ရရှိနိုင်ပါ ITC ပေါင်းစည်းအခွန်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
+DocType: Bank Guarantee,Clauses and Conditions,clauses နှင့်အခြေအနေများ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
 DocType: Project Task,View Timesheet,ကြည့်ရန် Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ပြီးဆုံးရက်စွဲသည်စတင်နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
 DocType: Leave Allocation,New Leaves Allocated,ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
@@ -4475,9 +4504,10 @@
 DocType: Patient,Alcohol Current Use,အရက်လက်ရှိအသုံးပြုမှု
 DocType: Student Admission Program,Student Admission Program,ကျောင်းသားသမဂ္ဂများအဖွဲ့ချုပ်င်ခွင့်အစီအစဉ်
 DocType: Payment Entry,Account Paid To,ရန် Paid အကောင့်
+DocType: Subscription Settings,Grace Period,ကျေးဇူးတော်ရှိစေသတည်းကာလ
 DocType: Item Alternative,Alternative Item Name,အခြားရွေးချယ်စရာ Item Name ကို
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",မည်သည့်လစာစလစ်ဖြတ်ပိုင်းပုံစံတင်သွင်းလို့မရပါ <br> \ ဖြစ်နိုင်ပါ့မလားအကြောင်းပြချက်: <br> \ 1. Net ကလစာ 0 င်ထက်လျော့နည်းသည်။ <br> ဝန်ထမ်းမာစတာအတွက်သတ်မှတ်ထားသော \ 2. ကုမ္ပဏီအီးမေးလ်လိပ်စာတရားဝင်မဟုတ်ပါဘူး။ <br>
@@ -4487,7 +4517,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} ဆန့်ကျင် {4} ဖြစ်ပါတယ်။ ဒါဟာ {5} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qty out
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ယင်းနှင့် unchcked မသန်စွမ်း
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,စီးရီးမသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 DocType: Student Sibling,Student ID,ကျောင်းသား ID ကို
@@ -4499,14 +4528,16 @@
 DocType: Complaint,Complaint,တိုင်ကြားစာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ပြန်ဆပ် Entry &#39;Make
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,အားလုံးဌာန
 DocType: Patient,Alcohol Past Use,အရက်အတိတ်မှအသုံးပြုခြင်း
 DocType: Fertilizer Content,Fertilizer Content,ဓာတ်မြေသြဇာအကြောင်းအရာ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,ပြဿနာ / သောင်တင်
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
 DocType: Share Transfer,Transfer,လွှဲပြောင်း
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,အလုပ်အမိန့် {0} ဤအရောင်းအမိန့်ပယ်ဖျက်မတိုင်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
@@ -4530,10 +4561,11 @@
 DocType: Cheque Print Template,Message to show,ပြသနိုင်ဖို့ကို Message
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,လက်လီ
 DocType: Student Attendance,Absent,မရှိသော
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} မှာစတင်ဂိုးသွင်းကိုရှာမရခဲ့ပါ။ သငျသညျ 100 0 ဖုံးအုပ်ရမှတ်ရပ်နေခဲ့ကြရန်လိုအပ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
+DocType: Subscription,Current Invoice Start Date,လက်ရှိငွေတောင်းခံလွှာကို Start နေ့စွဲ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ဒက်ဘစ်သို့မဟုတ်ခရက်ဒစ်ပမာဏကိုဖြစ်စေ {2} ဘို့လိုအပ်ပါသည်
 DocType: GL Entry,Remarks,အမှာစကား
@@ -4543,11 +4575,13 @@
 DocType: Task,Parent Task,မိဘ Task ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ခဲ Make
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
 DocType: Stock Settings,Show Barcode Field,Show ကိုဘားကုဒ်ဖျော်ဖြေမှု
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","လစာပြီးသားဤရက်စွဲအကွာအဝေးအကြားမဖွစျနိုငျ {0} အကြားကာလအတွက်လုပ်ငန်းများ၌နှင့် {1}, လျှောက်လွှာကာလချန်ထားပါ။"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","လစာပြီးသားဤရက်စွဲအကွာအဝေးအကြားမဖွစျနိုငျ {0} အကြားကာလအတွက်လုပ်ငန်းများ၌နှင့် {1}, လျှောက်လွှာကာလချန်ထားပါ။"
+DocType: Fiscal Year,Auto Created,အော်တို Created
 DocType: Chapter Member,Leave Reason,အကြောင်းပြချက် Leave
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ငွေတောင်းခံလွှာ {0} မရှိတော့ပါ
 DocType: Guardian Interest,Guardian Interest,ဂါးဒီးယန်းအကျိုးစီးပွား
 DocType: Volunteer,Availability,အသုံးပြုနိုင်မှု
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ငွေတောင်းခံလွှာများအတွက် Setup ကို default အတန်ဖိုးများ
@@ -4556,14 +4590,13 @@
 DocType: Timesheet,Employee Detail,ဝန်ထမ်း Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 အီးမေးလ် ID ကို
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 အီးမေးလ် ID ကို
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
 DocType: Lab Prescription,Test Code,စမ်းသပ်ခြင်း Code ကို
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ချိန်ညှိမှုများ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} အဘို့အခွင့်ပြုခဲ့ကြသည်မဟုတ်
 DocType: Job Offer,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,အထက်
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},စုစုပေါင်းငွေပမာဏ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},စုစုပေါင်းငွေပမာဏ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Non-စံပေးဆောင်အကောင့်လျှင်ဖော်ပြထားခြင်း
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',&#39;&#39; အားလုံးအကဲဖြတ်အဖွဲ့များ &#39;&#39; ထက်အခြားအကဲဖြတ်အဖွဲ့ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},အတန်း {0}: ကုန်ကျစရိတ်စင်တာတစ်ခုကို item {1} ဘို့လိုအပ်ပါသည်
@@ -4574,7 +4607,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ရေအားသုံးသပ်ခြင်း
 DocType: Chapter,Region,ဒေသ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
 DocType: Holiday List,Weekly Off,အပတ်စဉ်ထုတ်ပိတ်
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,လင့်ခ်လုပ်ထားသောခွဲခြမ်းစိတ်ဖြာခြင်းပြန်တင်ရန်
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ဥပမာ 2012 ခုနှစ်, 2012-13"
@@ -4590,7 +4623,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,ဖျက်သိမ်းပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
 DocType: Vehicle,Policy No,ပေါ်လစီအဘယ်သူမျှမ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 DocType: Asset,Straight Line,မျဥ်းဖြောင့်
 DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,ကွဲ
@@ -4630,21 +4663,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,path
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ဒါကြောင့်ကလေးဆုံမှတ်များရှိပါတယ်အဖြစ်လယ်ဂျာမှကုန်ကျစရိတ် Center က convert နိုင်ဘူး
 DocType: Production Plan,Total Planned Qty,စုစုပေါင်းစီစဉ်ထားအရည်အတွက်
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ဖွင့်လှစ် Value တစ်ခု
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ဖွင့်လှစ် Value တစ်ခု
 DocType: Salary Detail,Formula,နည်း
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,serial #
 DocType: Lab Test Template,Lab Test Template,Lab ကစမ်းသပ် Template ကို
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,အရောင်းအကောင့်
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,အရောင်းအကောင့်
 DocType: Purchase Invoice Item,Total Weight,စုစုပေါင်းအလေးချိန်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
 DocType: Job Offer Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 DocType: Purchase Order Item,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
 DocType: Restaurant Order Entry,Restaurant Order Entry,စားသောက်ဆိုင်အမိန့် Entry &#39;
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
 DocType: Asset Maintenance Task,Assign To Name,အမည်ရန် assign
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
 DocType: Hub Settings,Enabled Users,enabled အသုံးပြုသူများ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ပစ္စည်းတောင်းဆိုခြင်း Make
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ပွင့်လင်း Item {0}
@@ -4657,24 +4690,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,ခွင့်သည်ပလီကေးရှင်း။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
 DocType: Vehicle,Last Carbon Check,ပြီးခဲ့သည့်ကာဗွန်စစ်ဆေးမှု
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,အတန်းအပေါ်အရေအတွက်ကို select ပေးပါ
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,အရောင်းနှင့်အရစ်ကျငွေတောင်းခံလွှာဖွင့်လှစ် Make
 DocType: Purchase Invoice,Posting Time,posting အချိန်
 DocType: Timesheet,% Amount Billed,ကြေညာတဲ့% ပမာဏ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,တယ်လီဖုန်းအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,တယ်လီဖုန်းအသုံးစရိတ်များ
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,သင်ချွေတာရှေ့တော်၌စီးရီးကိုရွေးဖို့ user ကိုတွန်းအားပေးချင်တယ်ဆိုရင်ဒီစစ်ဆေးပါ။ သင်သည်ဤစစ်ဆေးလျှင်အဘယ်သူမျှမက default ရှိပါတယ်ဖြစ်လိမ့်မည်။
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
 DocType: Email Digest,Open Notifications,ပွင့်လင်းအသိပေးချက်များ
 DocType: Payment Entry,Difference Amount (Company Currency),ကွာခြားချက်ပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,တိုက်ရိုက်အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,တိုက်ရိုက်အသုံးစရိတ်များ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,နယူးဖောက်သည်အခွန်ဝန်ကြီးဌာန
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},အဆိုပါ DOCTYPE {0} အတွက်ထုံးစံကိုလယ်စာရင်းပေးသွင်းမှု Add
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Purchase Receipt Item,Sample Quantity,နမူနာအရေအတွက်
+DocType: Bank Guarantee,Name of Beneficiary,အကျိုးခံစားအမည်
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update ကို BOM နောက်ဆုံးပေါ်အဘိုးပြတ်မှုနှုန်း / စျေးနှုန်းစာရင်းနှုန်းသည် / ကုန်ကြမ်း၏နောက်ဆုံးဝယ်ယူမှုနှုန်းအပေါ်အခြေခံပြီး, Scheduler ကိုမှတဆင့်အလိုအလျှောက်ကုန်ကျခဲ့ပါတယ်။"
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
@@ -4686,14 +4719,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,အစမ်းထား
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,လစာ Components
 DocType: Program Enrollment Tool,New Academic Year,နယူးပညာရေးဆိုင်ရာတစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 DocType: GST Settings,B2C Limit,B2C ကန့်သတ်
 DocType: Work Order Item,Transferred Qty,လွှဲပြောင်း Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigator
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,စီမံကိန်း
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,စီမံကိန်း
 DocType: Share Balance,Issued,ထုတ်ပြန်သည်
+DocType: Loan,Repayment Start Date,ပြန်ဆပ်ဖို့ Start နေ့စွဲ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,ကျောင်းသားလှုပ်ရှားမှု
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ပေးသွင်း Id
 DocType: Payment Request,Payment Gateway Details,ငွေပေးချေမှုရမည့် Gateway မှာအသေးစိတ်
@@ -4706,10 +4740,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ကျပန်း, ဖျားနာစသည်တို့ကဲ့သို့သောအရွက်အမျိုးအစား"
 DocType: Email Digest,Send regular summary reports via Email.,အီးမေးလ်ကနေတဆင့်ပုံမှန်အကျဉ်းချုပ်အစီရင်ခံစာပေးပို့ပါ။
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 DocType: Assessment Result,Student Name,ကျောင်းသားအမည်
 DocType: Brand,Item Manager,item Manager က
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,လုပ်ခလစာပေးချေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,လုပ်ခလစာပေးချေ
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
 DocType: Plant Analysis,Collection Datetime,ငွေကောက်ခံ DATETIME
 DocType: Work Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
@@ -4719,9 +4753,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,အသုံးပြုသူ {0} မတည်ရှိပါဘူး
 DocType: Payment Term,Day(s) after invoice date,ငွေတောင်းခံလွှာရက်စွဲပြီးနောက်နေ့ (s) ကို
 DocType: Payment Schedule,Payment Schedule,ငွေပေးချေမှုရမည့်ဇယား
-DocType: Subscription,SUB-,ခွဲများ
 DocType: Item Attribute Value,Abbreviation,အကျဉ်း
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ငွေပေးချေမှုရမည့် Entry ပြီးသားတည်ရှိ
+DocType: Subscription,Trial Period End Date,စမ်းသပ်မှုကာလပြီးဆုံးရက်စွဲ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ကန့်သတ်ထက်ကျော်လွန်ပြီးကတည်းက authroized မဟုတ်
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,လစာ template ကိုမာစတာ။
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,ရောဂါဗေဒ
@@ -4738,9 +4772,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,လစဉ်စုဆောင်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -4749,14 +4783,15 @@
 DocType: Lab Prescription,Test Created,စမ်းသပ်ခြင်း Created
 DocType: Healthcare Settings,Custom Signature in Print,ပုံနှိပ်ပါအတွက်စိတ်တိုင်းကျထိုးမြဲလက်မှတ်
 DocType: Account,Temporary,ယာယီ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ဖောက်သည် LPO အမှတ်
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ဖောက်သည် LPO အမှတ်
 DocType: Program,Courses,သင်တန်းများ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,အတွင်းဝန်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,အတွင်းဝန်
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ကို disable လြှငျ, လယ်ပြင် &#39;&#39; စကားထဲမှာ &#39;&#39; ဆိုငွေပေးငွေယူမြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ဤလုပ်ဆောင်ချက်သည်အနာဂတ်ငွေတောင်းခံကိုရပ်တန့်ပါလိမ့်မယ်။ သင်ဤ subscription ကိုသင်ပယ်ဖျက်လိုတာသေချာလား?
 DocType: Serial No,Distinct unit of an Item,တစ်ဦး Item ၏ထူးခြားသောယူနစ်
 DocType: Supplier Scorecard Criteria,Criteria Name,လိုအပ်ချက်အမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
 DocType: Pricing Rule,Buying,ဝယ်
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ရောဂါများ &amp; ဓါတ်မြေသြဇာ
 DocType: HR Settings,Employee Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့ဝန်ထမ်းမှတ်တမ်း
@@ -4765,18 +4800,18 @@
 DocType: POS Profile,Apply Discount On,လျှော့တွင် Apply
 DocType: Member,Membership Type,အသင်းဝင်အမျိုးအစား
 ,Reqd By Date,နေ့စွဲအားဖြင့် Reqd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,အကြွေးရှင်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,အကြွေးရှင်
 DocType: Assessment Plan,Assessment Name,အကဲဖြတ်အမည်
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,ပုံနှိပ်ပါထဲမှာကောင်စီပြရန်
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,ပုံနှိပ်ပါထဲမှာကောင်စီပြရန်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,row # {0}: Serial မရှိပါမဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,item ပညာရှိခွန် Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,ယောဘသည်ကမ်းလှမ်းချက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute မှအတိုကောက်
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
@@ -4794,7 +4829,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,စုစုပေါင်းကှဲလှဲ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","enabled လျှင်, system ကိုအလိုအလျှောက်စာရင်းသည်စာရင်းကိုင် entries တွေကို post လိမ့်မည်။"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ဝန်ထမ်းများအတွက်တက်ရောက်သူ {0} ပြီးသားဤသည်နေ့ရက်သည်မှတ်သားသည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ဝန်ထမ်းများအတွက်တက်ရောက်သူ {0} ပြီးသားဤသည်နေ့ရက်သည်မှတ်သားသည်
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated မိနစ်အနည်းငယ်အတွက်
 DocType: Customer,From Lead,ခဲကနေ
@@ -4805,6 +4840,7 @@
 DocType: Lab Test,Approved Date,approved နေ့စွဲ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
+DocType: Subscriber,Subscriber Name,စာရင်းပေးသွင်းသူအမည်
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Update Tool,Replace,အစားထိုးဖို့
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,အဘယ်သူမျှမထုတ်ကုန်တွေ့ရှိခဲ့ပါတယ်။
@@ -4814,19 +4850,18 @@
 DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
 DocType: Customer,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ဝန်ထမ်းချေးငွေ {0} စိတ်ဝင်စားကြောင်းဝင်ငွေအကောင့်ကိုရွေးချယ်ပါ
 DocType: Work Order,Required Items,လိုအပ်သောပစ္စည်းများ
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,လူ့စွမ်းအားအရင်းအမြစ်
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးငွေပေးချေမှုရမည့်
 DocType: Disease,Treatment Task,ကုသမှု Task ကို
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
 DocType: BOM Item,BOM No,BOM မရှိပါ
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Update Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,အီလက်ထရောနစ်ပစ္စည်းများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,အီလက်ထရောနစ်ပစ္စည်းများ
 DocType: Asset,Maintenance Required,ကို Maintenance လိုအပ်ပါသည်
 DocType: Account,Debit,debit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
@@ -4835,7 +4870,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,ထူးချွန် Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ဒီအရောင်းပုဂ္ဂိုလ်များအတွက်ပစ်မှတ် Item Group မှပညာ Set ။
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] သန်း Older စတော့စျေးကွက်အေးခဲ
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,အတန်း # {0}: ပိုင်ဆိုင်မှုသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုဝယ်ယူ / ရောင်းမည်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,အတန်း # {0}: ပိုင်ဆိုင်မှုသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုဝယ်ယူ / ရောင်းမည်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Asset Maintenance Team,Maintenance Team Name,ကို Maintenance ရေးအဖွဲ့အမည်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","နှစ်ခုသို့မဟုတ်ထို့ထက်ပိုသောစျေးနှုန်းနည်းဥပဒေများအထက်ဖော်ပြပါအခြေအနေများအပေါ် အခြေခံ. တွေ့ရှိနေတယ်ဆိုရင်, ဦးစားပေးလျှောက်ထားတာဖြစ်ပါတယ်။ default value ကိုသုည (အလွတ်) ဖြစ်ပါသည်စဉ်ဦးစားပေး 0 င်မှ 20 အကြားတစ်ဦးအရေအတွက်ဖြစ်ပါတယ်။ ပိုမိုမြင့်မားသောအရေအတွက်တူညီသည့်အခြေအနေများနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်လျှင်ဦးစားပေးယူလိမ့်မည်ဆိုလိုသည်။"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,&#39;&#39; ကနေအခွင့်အလမ်း &#39;&#39; ဖောက်သည်အဖြစ်ရွေးချယ်လျှင်ဖောက်သည်မဖြစ်မနေဖြစ်ပါသည်
@@ -4845,19 +4880,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,သုံးစွဲမှုပြောဆိုချက်ကိုအမျိုးအစားများ။
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},ကို item {0} အဘို့အမှုနှုန်းရောင်းချနေသည်၎င်း၏ {1} ထက်နိမ့်သည်။ ရောင်းမှုနှုန်း atleast {2} ဖြစ်သင့်
-DocType: Item,Taxes,အခွန်
+DocType: Subscription,Taxes,အခွန်
 DocType: Purchase Invoice,capital goods,မြို့တော်ကုန်ပစ္စည်းများ
 DocType: Purchase Invoice Item,Weight Per Unit,ယူနစ်လျှင်အလေးချိန်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်
 DocType: Project,Default Cost Center,default ကုန်ကျစရိတ် Center က
-DocType: Bank Guarantee,End Date,အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,စတော့အိတ်အရောင်းအဝယ်
 DocType: Budget,Budget Accounts,ဘတ်ဂျက်ငွေစာရင်း
 DocType: Employee,Internal Work History,internal လုပ်ငန်းသမိုင်း
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,စုဆောင်းတန်ဖိုးပမာဏ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,ပေးသွင်း Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,အပြည့်အဝထုတ်ချေး
 DocType: Employee Advance,Due Advance Amount,ကြောင့်ကြိုတင်ပမာဏ
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
@@ -4881,7 +4914,7 @@
 ,Employee Information,ဝန်ထမ်းပြန်ကြားရေး
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,အရောင်းနှင့်ဝယ်ယူဘို့ default အခွန်တင်းပလိတ်များဖန်တီးနေကြသည်။
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,အကဲဖြတ်ရလဒ်စံချိန် {0} ရှိပြီးဖြစ်သည်။
@@ -4889,7 +4922,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',အုပ်စုအားဖြင့် &#39;&#39; ကုမ္ပဏီ &#39;&#39; လျှင်အလွတ် filter ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Post date အနာဂတ်နေ့စွဲမဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,အဆိုပါထပ်တလဲလဲထုတ်လုပ်ဘို့
 DocType: Stock Entry,Target Warehouse Address,ပစ်မှတ်ဂိုဒေါင်လိပ်စာ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Agriculture Task,End Day,အဆုံးနေ့
@@ -4914,11 +4946,10 @@
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","သင်တန်းများအတွက်အခြေစိုက်ကျောင်းသားအုပ်စု, ထိုသင်တန်းအစီအစဉ်ကျောင်းအပ်အတွက်စာရင်းသွင်းသင်တန်းများအနေဖြင့်တိုင်းကျောင်းသားများအတွက်အတည်ပြုလိမ့်မည်။"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Share Balance,From No,အဘယ်သူမျှမကနေ
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{ပေးပို့သူ} ကနေ New ကိုကို Message
 DocType: Customer,Customer Primary Address,ဖောက်သည်မူလတန်းလိပ်စာ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,သတင်းလွှာ
 DocType: Drug Prescription,Description/Strength,ဖော်ပြချက် / အစွမ်းသတ္တိ
@@ -4927,22 +4958,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ထားပြီး
 DocType: Department,Leave Block List,Block List ကို Leave
 DocType: Purchase Invoice,Tax ID,အခွန် ID ကို
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ စစ်ကြောင်းအလွတ်ရှိရမည်
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ စစ်ကြောင်းအလွတ်ရှိရမည်
 DocType: Accounts Settings,Accounts Settings,Settings ကိုအကောင့်
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,အတည်ပြု
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0}, ဆက်လက်ဖြေရှင်း ကျေးဇူးပြု. အဘို့အ Malformatted လိပ်စာ။"
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0}, ဆက်လက်ဖြေရှင်း ကျေးဇူးပြု. အဘို့အ Malformatted လိပ်စာ။"
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",အသစ်ကအကောင့်အရေအတွက်ကရှေ့ဆက်အဖြစ်အကောင့်အမည်ကိုတွင်ထည့်သွင်းပါလိမ့်မည်
 DocType: Maintenance Team Member,Team Member,ရေးအဖွဲ့အဖွဲ့ဝင်
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,တင်ပြခြင်းမရှိပါရလဒ်
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
-DocType: Employee Loan,Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ
+DocType: Loan,Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ
 ,Project Quantity,စီမံကိန်းအရေအတွက်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်"
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} ဒီအရောင်းအဝယ်ပြီးမြောက်ရန် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: Loan Type,Rate of Interest (%) Yearly,အကျိုးစီးပွား၏နှုန်းမှာ (%) နှစ်အလိုက်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,ယာယီ Accounts ကို
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,black
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,ယာယီ Accounts ကို
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Shareholder,Contact List,ဆက်သွယ်ရန်စာရင်း
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
@@ -4950,16 +4981,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,ထုတ်လုပ် {0} ပစ္စည်းများ
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ပိုမိုသိရှိရန်
 DocType: Cheque Print Template,Distance from top edge,ထိပ်ဆုံးအစွန်ကနေအဝေးသင်
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,စျေးစာရင်း {0} ကိုပိတ်ထားသည်သို့မဟုတ်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,စျေးစာရင်း {0} ကိုပိတ်ထားသည်သို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Purchase Invoice,Return,ပြန်လာ
 DocType: Pricing Rule,Disable,ကို disable
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ငွေပေးချေမှု၏ Mode ကိုငွေပေးချေရန်လိုအပ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ငွေပေးချေမှု၏ Mode ကိုငွေပေးချေရန်လိုအပ်ပါသည်
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","ပိုင်ဆိုင်မှု, အမှတ်စဉ် nos, သုတ်စသည်တို့ကိုတူသောပိုပြီးရွေးချယ်စရာအဘို့အပြည့်အဝစာမျက်နှာတည်းဖြတ်မှု"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ချိန်းနှင့်တိုင်ပင်ညှိနှိုင်းမှုများ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ဟာအသုတ်လိုက် {2} စာရင်းသွင်းမဟုတ်ပါ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","ဒါကြောင့် {1} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု {0}, ဖျက်သိမ်းမရနိုငျ"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,လိုအပ်သောစစ်ဆေးမှုများ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,လိုအပ်သောစစ်ဆေးမှုများ
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,မာကုဒူးယောင်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,setup ကိုကုမ္ပဏီရန်မအောင်မြင်ခဲ့ပါ
@@ -4971,7 +5002,7 @@
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,အထဲကပစ္စည်းတွေကို Add
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,အထဲကပစ္စည်းတွေကို Add
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,ကောက်ပဲသီးနှံ &amp; မြေ
 DocType: Cheque Print Template,Regular,ပုံမှန်အစည်းအဝေး
 DocType: Fertilizer,Density (if liquid),သိပ်သည်းဆ (အရည်လျှင်)
@@ -4996,24 +5027,26 @@
 DocType: Payment Entry,Paid Amount,Paid ငွေပမာဏ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,အရောင်း Cycle Explore
 DocType: Assessment Plan,Supervisor,ကြီးကြပ်သူ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,retention စတော့အိတ် Entry &#39;
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,retention စတော့အိတ် Entry &#39;
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 ,Work Order Stock Report,အမိန့်စတော့အိတ်အစီရင်ခံစာအလုပ်မလုပ်
+DocType: Purchase Receipt,Auto Repeat Detail,အော်တိုထပ်ခါတလဲလဲအသေးစိတ်
 DocType: Assessment Result Tool,Assessment Result Tool,အကဲဖြတ်ရလဒ် Tool ကို
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,ကြီးကြပ်ရေးမှူးအဖြစ်
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Category: အကြံပြုရန်
 DocType: BOM Scrap Item,BOM Scrap Item,BOM အပိုင်းအစ Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
 DocType: Project,Total Billable Amount (via Timesheets),(Timesheets မှတဆင့်) စုစုပေါင်းဘီလ်ဆောင်ငွေပမာဏ
 DocType: Agriculture Task,Previous Business Day,ယခင်စီးပွားရေးနေ့
-DocType: Employee Loan,Repay Fixed Amount per Period,ကာလနှုန်း Fixed ငွေပမာဏပြန်ဆပ်
+DocType: Loan,Repay Fixed Amount per Period,ကာလနှုန်း Fixed ငွေပမာဏပြန်ဆပ်
 DocType: Employee,Health Insurance No,ကနျြးမာရေးအာမခံခြင်းမရှိပါ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,credit မှတ်ချက် Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,credit မှတ်ချက် Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,စုစုပေါင်း Taxable ငွေပမာဏ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
 DocType: Opening Invoice Creation Tool,Purchase,ဝယ်ခြမ်း
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ချိန်ခွင် Qty
@@ -5024,16 +5057,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} သည်
 DocType: Healthcare Settings,Valid number of days,ကာလ၏သက်တမ်းရှိအရေအတွက်ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ကုန်ကျစရိတ်စင်တာများ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,ပြန်လည်စတင်ပါ Subscription
 DocType: Land Unit,Linked Plant Analysis,လင့်ခ်လုပ်ထားသောစက်ရုံအားသုံးသပ်ခြင်း
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ပေးသွင်းမယ့်ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},row # {0}: အတန်းနှင့်အတူအချိန်ပဋိပက္ခများ {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,သုညအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှုန်း Allow
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,သုညအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှုန်း Allow
+DocType: Bank Guarantee,Receiving,လက်ခံခြင်း
 DocType: Training Event Employee,Invited,ဖိတ်ကြားခဲ့
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} တွေ့ရှိအကွိမျမြားစှာတက်ကြွလစာ structures များ
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup ကို Gateway ရဲ့အကောင့်။
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
 DocType: Payment Entry,Set Exchange Gain / Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း Set
 ,GST Purchase Register,GST ဝယ်ယူမှတ်ပုံတင်မည်
 ,Cash Flow,ငွေလည်ပတ်မှု
@@ -5054,9 +5089,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,အားလုံးရှယ်ယာအရောင်းအများစာရင်း
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp အရေအတွက်
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,စမ်းသပ်ကာလကို Start နေ့စွဲနှင့်စမ်းသပ်ကာလပြီးဆုံးရက်စွဲကိုသတ်မှတ်ရမည်ဖြစ်သည်နှစ်ဦးစလုံး
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ပျမ်းမျှနှုန်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ငွေပေးချေမှုရမည့်ဇယားများတွင်စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏက Grand / Rounded စုစုပေါင်းညီမျှရှိရမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ငွေပေးချေမှုရမည့်ဇယားများတွင်စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏက Grand / Rounded စုစုပေါင်းညီမျှရှိရမည်
+DocType: Subscription Plan Detail,Plan,စီမံကိန်း
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
 DocType: Authorization Rule,Customer / Item Name,customer / Item အမည်
@@ -5086,6 +5122,7 @@
 DocType: Work Order,Warehouses,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ပိုင်ဆိုင်မှုလွှဲပြောင်းမရနိုငျ
 DocType: Hotel Room Pricing,Hotel Room Pricing,ဟိုတယ်အခန်းစျေးနှုန်း
+DocType: Subscription,Days Until Due,ကြောင့်အချိန်အထိနေ့ရက်များ
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ဤသည်အရာဝတ္ထု {0} (Template) ၏မူကွဲဖြစ်ပါတယ်။
 DocType: Workstation,per hour,တစ်နာရီကို
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ယ်ယူခြင်း
@@ -5094,13 +5131,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ကျောင်းသားအုပ်စုအခြေစိုက်အသုတ်လိုက်အဘို့, ကျောင်းသားအသုတ်လိုက်အစီအစဉ်ကျောင်းအပ်ထံမှတိုင်းကျောင်းသားများအတွက်အတည်ပြုလိမ့်မည်။"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ဖြန့်ဝေ
+DocType: Journal Entry Account,Loan,ခြေးငှေ
 DocType: Expense Claim Advance,Expense Claim Advance,စရိတ်ဆိုနေကြိုတင်
 DocType: Lab Test,Report Preference,အစီရင်ခံစာဦးစားပေးမှု
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,စေတနာ့ဝန်ထမ်းသတင်းအချက်အလက်။
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,စီမံကိန်းမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,စီမံကိန်းမန်နေဂျာ
 ,Quoted Item Comparison,ကိုးကားအရာဝတ္ထုနှိုင်းယှဉ်ခြင်း
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} နှင့် {1} အကြားအမှတ်ပေးအတွက်ထပ်တူ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,အဖြစ်အပေါ် Net ကပိုင်ဆိုင်မှုတန်ဖိုးကို
 DocType: Crop,Produce,ဟင်းသီးဟင်းရွက်
@@ -5110,7 +5148,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,ထုတ်လုပ်ခြင်းတို့အတွက်ပစ္စည်းစားသုံးမှု
 DocType: Item Alternative,Alternative Item Code,အခြားရွေးချယ်စရာ Item Code ကို
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
 DocType: Delivery Stop,Delivery Stop,Delivery Stop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
@@ -5120,15 +5158,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
 DocType: BOM,Show Items,Show ကိုပစ္စည်းများ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,အခြိနျမှနျမှထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,သငျသညျအီးမေးလ်ဖြင့်လူအပေါင်းတို့သည်ဖောက်သည်အကြောင်းကြားချင်ပါသလား?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,သငျသညျအီးမေးလ်ဖြင့်လူအပေါင်းတို့သည်ဖောက်သည်အကြောင်းကြားချင်ပါသလား?
+DocType: Subscription Plan,Billing Interval,ငွေတောင်းခံ Interval သည်
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ပြန်စသည်
 DocType: Hub Settings,Hub Username,hub အသုံးပြုသူအမည်
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,အကဲဖြတ်လိုအပ်ချက် Group မှ
 DocType: Healthcare Settings,Patient Name By,အားဖြင့်လူနာအမည်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိုးပွားလာသောဂျာနယ် Entry &#39;
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိုးပွားလာသောဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
@@ -5142,23 +5180,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
 DocType: Leave Block List,Applies to Company,ကုမ္ပဏီသက်ဆိုင်
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
-DocType: Employee Loan,Disbursement Date,ငွေပေးချေနေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;&#39; လက်ခံသူများ &#39;&#39; မသတ်မှတ်ရသေးပါ
+DocType: Loan,Disbursement Date,ငွေပေးချေနေ့စွဲ
 DocType: BOM Update Tool,Update latest price in all BOMs,အားလုံး BOMs အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကိုအပ်ဒိတ်လုပ်
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,ဆေးဘက်ဆိုင်ရာမှတ်တမ်း
 DocType: Vehicle,Vehicle,ယာဉ်
 DocType: Purchase Invoice,In Words,စကားအတွက်
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,submittting ရှေ့တော်၌ထိုဘဏ်သို့မဟုတ်ငွေချေးအဖွဲ့အစည်း၏အမည်ကိုရိုက်ထည့်ပါ။
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} တင်သွင်းရမည်ဖြစ်သည်
 DocType: POS Profile,Item Groups,item အဖွဲ့များ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
 DocType: Sales Order Item,For Production,ထုတ်လုပ်မှုများအတွက်
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,ငွေစာရင်းဇယားအတွက်ယာယီဖွင့်ပွဲအကောင့် add ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,ငွေစာရင်းဇယားအတွက်ယာယီဖွင့်ပွဲအကောင့် add ပေးပါ
 DocType: Customer,Customer Primary Contact,ဖောက်သည်မူလတန်းဆက်သွယ်ပါ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,ကာလပိတ်ခြင်းဂျာနယ်
 DocType: Project Task,View Task,view Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ခဲ%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ခဲ%
+DocType: Bank Guarantee,Bank Guarantee Type,ဘဏ်အာမခံအမျိုးအစား
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ငွေတောင်းခံလွှာသောအဘို့ကို
 ,Asset Depreciations and Balances,ပိုင်ဆိုင်မှုတန်ဖိုးနှင့် Balance
@@ -5169,9 +5208,8 @@
 DocType: Production Plan,Include Subcontracted Items,နှုံးပစ္စည်းများ Include
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ပူးပေါင်း
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,စတော့ရှယ်ယာ transction ပြီးနောက်မူကွဲဂုဏ်သတ္တိများမပြောင်းနိုင်ပါ။ သင်ဤလုပ်ဖို့သစ်တစ်ခုအရာဝတ္ထုလုပ်ရပါလိမ့်မယ်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
-DocType: Employee Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+DocType: Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
 DocType: Leave Application,LAP/,ရင်ခွင် /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ငွေပမာဏများအတွက် {0} {1} ဆန့်ကျင်ငွေပေးချေမှုတောင်းခံ {2}
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
@@ -5195,11 +5233,11 @@
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ပစ္စည်းအုပ်စု table ထဲမှာကိုတွေ့မိတ္တူပွားကို item အုပ်စု
 DocType: Land Unit,Parent Land Unit,မိဘမြေယာယူနစ်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
 DocType: Fertilizer,Fertilizer Name,ဓာတ်မြေသြဇာအမည်
 DocType: Salary Slip,Net Pay,Net က Pay ကို
 DocType: Cash Flow Mapping Accounts,Account,အကောင့်ဖွင့်
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
 ,Requested Items To Be Transferred,လွှဲပြောင်းရန်မေတ္တာရပ်ခံပစ္စည်းများ
 DocType: Expense Claim,Vehicle Log,ယာဉ် Log in ဝင်ရန်
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"တစ်အဖျား (အပူချိန်&gt; 38.5 ° C / 101,3 ° F ကိုသို့မဟုတ်စဉ်ဆက်မပြတ်အပူချိန်&gt; 38 ဒီဂရီစင်တီဂရိတ် / 100,4 ° F) ၏ရောက်ရှိခြင်း"
@@ -5240,24 +5278,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
 DocType: Asset Maintenance,Manufacturing User,ကုန်ထုတ်လုပ်မှုအသုံးပြုသူတို့၏
 DocType: Purchase Invoice,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
-DocType: C-Form,Series,စီးရီး
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},စျေးနှုန်းစာရင်း၏ငွေကြေးစနစ် {0} {1} သို့မဟုတ် {2} ရှိရမည်
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Soil Texture,Ternary Plot,Ternary ကြံစည်မှု
 DocType: Item Group,Item Classification,item ခွဲခြား
 DocType: Driver,License Number,လိုင်စင်နံပါတ်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်ရည်ရွယ်ချက်
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ငွေတောင်းခံလွှာလူနာမှတ်ပုံတင်ခြင်း
 DocType: Crop,Period,ကာလ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,အထွေထွေလယ်ဂျာ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ဝန်ထမ်း {0} ခွင့်အပေါ် {1} အပေါ်
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ဝန်ထမ်း {0} ခွင့်အပေါ် {1} အပေါ်
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ကြည့်ရန်ခဲ
 DocType: Program Enrollment Tool,New Program,နယူးအစီအစဉ်
 DocType: Item Attribute Value,Attribute Value,attribute Value တစ်ခု
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 DocType: Salary Detail,Salary Detail,လစာ Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 DocType: Appointment Type,Physician,ဆရာဝန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ဆွေးနွေးညှိနှိုင်း
@@ -5265,15 +5302,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) လုပ်ငန်းခွင်အမိန့် {3} အတွက်စီစဉ်ထားအရေအတွက် ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ကုန်ထုတ်လုပ်မှုများအတွက်အချိန်စာရွက်။
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,စုစုပေါင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,စတော့ရှယ်ယာငွေပေးငွေယူပြီးနောက်မူကွဲဂုဏ်သတ္တိများမပြောင်းနိုင်ပါ။ သင်ဤလုပ်ဖို့သစ်တစ်ခုအရာဝတ္ထုလုပ်ရပါလိမ့်မယ်။
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA လုပ်ပိုင်ခွင့်
 DocType: Physician,Charges,စွဲချက်
 DocType: Production Plan,Get Items For Work Order,လုပ်ငန်းခွင်အမိန့်သည်ပစ္စည်းများ Get
 DocType: Salary Detail,Default Amount,default ငွေပမာဏ
 DocType: Lab Test Template,Descriptive,ဖော်ပြရန်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
 DocType: Quality Inspection Reading,Quality Inspection Reading,အရည်အသွေးအစစ်ဆေးရေးစာဖတ်ခြင်း
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,သင်သည်သင်၏ကုမ္ပဏီအတွက်အောင်မြင်ရန်ချင်ပါတယ်အရောင်းရည်မှန်းချက်သတ်မှတ်မည်။
 ,Project wise Stock Tracking,Project သည်ပညာရှိသောသူသည်စတော့အိတ်ခြေရာကောက်
@@ -5301,11 +5339,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,website ကိုဖန်တီးရန်မအောင်မြင်ခဲ့ပါ
 DocType: Soil Analysis,Mg/K,mg / K သည်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,retention စတော့အိတ် Entry ပြီးသား created သို့မဟုတ်နမူနာအရေအတွက်မပေးထား
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,retention စတော့အိတ် Entry ပြီးသား created သို့မဟုတ်နမူနာအရေအတွက်မပေးထား
 DocType: Program,Program Abbreviation,Program ကိုအတိုကောက်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
-DocType: Bank Guarantee,Start Date,စတင်သည့်ရက်စွဲ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,တစ်ဦးကာလသည်အရွက်ခွဲဝေချထားပေးရန်။
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,မှားယွင်းစွာရှင်းလင်း Cheques နှင့်စာရင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
@@ -5320,11 +5357,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,နာရီ
 DocType: Project,Expected Start Date,မျှော်လင့်ထားသည့် Start ကိုနေ့စွဲ
 DocType: Purchase Invoice,04-Correction in Invoice,ငွေတောင်းခံလွှာအတွက် 04-ပြင်ဆင်ခြင်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးအလုပ်အမိန့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးအလုပ်အမိန့်
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,မူကွဲအသေးစိတ်အစီရင်ခံစာ
 DocType: Setup Progress Action,Setup Progress Action,Setup ကိုတိုးတက်ရေးပါတီလှုပ်ရှားမှု
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,စျေးစာရင်းဝယ်ယူ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,စျေးစာရင်းဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,စွဲချက်က item တခုကိုသက်ဆိုင်မဖြစ်လျှင်တဲ့ item Remove
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Subscription Cancel
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Completed အဖြစ်ကို Maintenance အဆင့်အတန်းကိုရွေးချယ်ပါသို့မဟုတ်ပြီးစီးနေ့စွဲကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Supplier,Default Payment Terms Template,default ငွေပေးချေမှုရမည့်စည်းကမ်းချက်များကို Template ကို
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,transaction ငွေကြေးငွေပေးချေမှုရမည့် Gateway မှာငွေကြေးအဖြစ်အတူတူဖြစ်ရပါမည်
@@ -5335,7 +5373,6 @@
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,စုဆောင်းမိလစဉ်ဘတ်ဂျက်လျှင်လှုပ်ရှားမှုကျော်သွားပါပြီ
-DocType: Subscription,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
 DocType: Asset,Disposal Date,စွန့်ပစ်နေ့စွဲ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","သူတို့အားလပ်ရက်ရှိသည်မဟုတ်ကြဘူးလျှင်အီးမေးလ်များ, ပေးထားသောနာရီမှာကုမ္ပဏီအပေါငျးတို့သ Active ကိုဝန်ထမ်းများထံသို့စေလွှတ်လိမ့်မည်။ တုံ့ပြန်မှု၏အကျဉ်းချုပ်သန်းခေါင်မှာကိုစလှေတျပါလိမ့်မည်။"
@@ -5354,6 +5391,7 @@
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Cheque Print Template,Cheque Print Template,Cheque တစ်စောင်လျှင်ပရင့်ထုတ်ရန် Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ငွေတောင်းခံလွှာရက်စွဲပြီးနောက်ရက်ပေါင်းအရေအတွက် subscription ကိုပယ်ဖျက်သို့မဟုတ်မရတဲ့အဖြစ် subscription ကို marking မတိုင်မီကြာထားပါတယ်
 DocType: Lab Test Template,Sample Collection,နမူနာစုစည်းမှု
 ,Requested Items To Be Ordered,အမိန့်ခံရဖို့မေတ္တာရပ်ခံပစ္စည်းများ
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
@@ -5362,7 +5400,7 @@
 DocType: Account,Income,ဝင်ငွေခွန်
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Supplier Scorecard Scoring Criteria,Score,နိုင်ပြီ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတည်ရှိပါဘူး
@@ -5382,12 +5420,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 င် 100 ကြားတန်ဖိုးတစ်ခုဖြစ်သင့်တယ်
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Next ကိုတန်ဖိုးနေ့စွဲရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲမတိုင်မီမဖွစျနိုငျ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,မလုံခြုံချေးငွေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Timesheet ဆန့်ကျင် max အလုပ်ချိန်
 DocType: Maintenance Schedule Detail,Scheduled Date,Scheduled နေ့စွဲ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,စုစုပေါင်း Paid Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,စုစုပေါင်း Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ဇာတ်ကောင်ထက် သာ. ကြီးမြတ် messages အများအပြားသတင်းစကားများသို့ခွဲထွက်လိမ့်မည်
 DocType: Purchase Receipt Item,Received and Accepted,ရရှိထားသည့်နှင့်လက်ခံရရှိပါသည်
 DocType: Hub Settings,Company and Seller Profile,ကုမ္ပဏီနှင့်ရောင်းချသူကိုယ်ရေးဖိုင်
@@ -5401,10 +5439,9 @@
 DocType: Item,Variant Based On,မူကွဲအခြေပြုတွင်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,သင့်ရဲ့ပေးသွင်း
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,အဆိုပါပြင်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 DocType: Request for Quotation Item,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,အမည်မသိ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,မှစ. ရရှိထားသည့်
 DocType: Lead,Converted,ပွောငျး
@@ -5418,6 +5455,7 @@
 DocType: Asset,Assets,ပိုင်ဆိုင်မှုများ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
+DocType: Subscription,Current Invoice End Date,လက်ရှိငွေတောင်းခံလွှာပြီးဆုံးရက်စွဲ
 DocType: Payment Term,Due Date Based On,ကြောင့်နေ့စွဲတွင် အခြေခံ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Settings များရောင်းချခြင်းအတွက် default အနေနဲ့ဖောက်သည်အုပ်စုတစ်စုနှင့်နယ်မြေသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} မတည်ရှိပါဘူး
@@ -5425,7 +5463,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ဂျာနယ် Entry &#39;အဘို့မရွေးပြန်ဆပ်ဖို့တွေအတွက်
 DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
+DocType: Loan,Disbursed,ထုတ်ချေး
 DocType: Healthcare Settings,Laboratory Settings,ဓာတ်ခွဲခန်းက Settings
 DocType: Patient Appointment,Service Unit,Service ကိုယူနစ်
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,အောင်မြင်စွာ Set ပေးသွင်း
@@ -5438,12 +5478,12 @@
 DocType: Share Balance,No of Shares,အစုရှယ်ယာများအဘယ်သူမျှမ
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,အဆင့်အတန်းကို Select လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: School House,House Name,အိမ်အမည်
 DocType: Fee Schedule,Total Amount per Student,ကျောင်းသားတစ်ဦးလျှင်စုစုပေါင်းငွေပမာဏ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,electrical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,electrical
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,သင်၏အသုံးပြုသူများအဖြစ်သင်၏အဖွဲ့အစည်း၏ကျန်ထည့်ပါ။ သင်တို့သည်လည်း Contacts မှသူတို့ကိုထည့်သွင်းခြင်းအားဖြင့်သင့်ပေါ်တယ်မှ Customer များဖိတ်ခေါ် add နိုင်ပါတယ်
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
 DocType: Grant Application,Requested Amount,တောင်းဆိုထားသောပမာဏ
@@ -5453,7 +5493,7 @@
 DocType: Crop Cycle,Detected Diseases,ရှာဖွေတွေ့ရှိထားသည့်ရောဂါများ
 DocType: Stock Entry,Default Source Warehouse,default Source ကိုဂိုဒေါင်
 DocType: Item,Customer Code,customer Code ကို
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 DocType: Asset Maintenance Task,Last Completion Date,နောက်ဆုံးပြီးစီးနေ့စွဲ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
@@ -5461,9 +5501,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings များ
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
 DocType: Restaurant,Active Menu,တက်ကြွ Menu ကို
 DocType: Target Detail,Target Qty,Target က Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ချေးငွေဆန့်ကျင်: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout ချိန်ညှိ
 DocType: Student Attendance,Present,လက်ဆောင်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
@@ -5472,9 +5513,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
 DocType: Chapter,Chapter Head,အခန်းကြီးဌာနမှူး
 DocType: Payment Term,Month(s) after the end of the invoice month,ငွေတောင်းခံလွှာလကုန်အပြီးတစ်လ (s) ကို
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
@@ -5482,11 +5523,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,လစာစလစ် Generate
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab မှရလဒ် DATETIME စမ်းသပ်ခြင်း DATETIME မတိုင်မီမဖွစျနိုငျ
 DocType: POS Profile,Allow user to edit Discount,အသုံးပြုသူလျှော့တည်းဖြတ်ရန် Allow
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ကနေဖောက်သည် Get
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ကနေဖောက်သည် Get
 DocType: Purchase Invoice Item,Include Exploded Items,ပေါက်ကွဲပစ္စည်းများ Include
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","application များအတွက် {0} အဖြစ်ရွေးချယ်မယ်ဆိုရင်ဝယ်, checked ရမည်"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
 DocType: Shipping Rule,Restrict to Countries,နိုင်ငံများမှကန့်သတ်ရန်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Sales Invoice Timesheet,Billing Hours,ငွေတောင်းခံနာရီ
 DocType: Project,Total Sales Amount (via Sales Order),(အရောင်းအမိန့်မှတဆင့်) စုစုပေါင်းအရောင်းပမာဏ
@@ -5505,6 +5547,7 @@
 DocType: Soil Texture,Sandy Clay,စန္ဒီရွှံ့စေး
 DocType: Grant Application,Assessment  Manager,အကဲဖြတ် Manager ကို
 DocType: Payment Entry,Allocate Payment Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏခွဲဝေချထားပေးရန်
+DocType: Subscription Plan,Subscription Plan,subscription အစီအစဉ်
 DocType: Employee External Work History,Salary,လခ
 DocType: Serial No,Delivery Document Type,Delivery Document ဖိုင် Type
 DocType: Sales Order,Partly Delivered,တစ်စိတ်တစ်ပိုင်းကယ်နှုတ်တော်မူ၏
@@ -5529,9 +5572,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,မက်စ်အစွမ်းသတ္တိ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ရလာဒ်ကဒိ Installing
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ဖောက်သည်များအတွက်မရွေး Delivery မှတ်ချက် {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ဖောက်သည်များအတွက်မရွေး Delivery မှတ်ချက် {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM အစားထိုး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Delivery နေ့စွဲအပေါ်အခြေခံပြီးပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Delivery နေ့စွဲအပေါ်အခြေခံပြီးပစ္စည်းများကို Select လုပ်ပါ
 DocType: Grant Application,Has any past Grant Record,မည်သည့်အတိတ် Grant ကစံချိန်တင်ထားပါတယ်
 ,Sales Analytics,အရောင်း Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ရရှိနိုင် {0}
@@ -5550,7 +5593,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ကုန်ကြမ်းပစ္စည်းများကုန်ကျစရိတ်ထောက်ပံ့
 DocType: Selling Settings,Settings for Selling Module,ရောင်းချသည့် Module သည် Settings ကို
 DocType: Hotel Room Reservation,Hotel Room Reservation,ဟိုတယ်အခန်းကြိုတင်မှာယူမှု
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,ဧည့်ဝန်ဆောင်မှု
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,ဧည့်ဝန်ဆောင်မှု
 DocType: BOM,Thumbnail,thumbnail
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ကိုယ်စားလှယ်လောင်းတစ်ဦးယောဘငှေပါ။
@@ -5567,7 +5610,7 @@
 DocType: Fees,Student Details,ကျောင်းသားအသေးစိတ်
 DocType: Purchase Invoice Item,Stock Qty,စတော့အိတ်အရည်အတွက်
 DocType: Purchase Invoice Item,Stock Qty,စတော့အိတ်အရည်အတွက်
-DocType: Employee Loan,Repayment Period in Months,လထဲမှာပြန်ဆပ်ကာလ
+DocType: Loan,Repayment Period in Months,လထဲမှာပြန်ဆပ်ကာလ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,error: မမှန်ကန်သောက id?
 DocType: Naming Series,Update Series Number,Update ကိုစီးရီးနံပါတ်
 DocType: Account,Equity,equity
@@ -5576,7 +5619,7 @@
 DocType: Task,Closing Date,နိဂုံးချုပ်နေ့စွဲ
 DocType: Sales Order Item,Produced Quantity,ထုတ်လုပ်ပမာဏ
 DocType: Timesheet,Work Detail,အလုပ်အသေးစိတ်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,အင်ဂျင်နီယာ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,အင်ဂျင်နီယာ
 DocType: Journal Entry,Total Amount Currency,စုစုပေါင်းငွေပမာဏငွေကြေး
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ရှာဖွေရန် Sub စညျးဝေး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
@@ -5622,13 +5665,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,အလှူရှင်အမျိုးအစားသတင်းအချက်အလက်။
 DocType: Request for Quotation,Supplier Detail,ပေးသွင်း Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Invoiced ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Invoiced ငွေပမာဏ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,လိုအပ်ချက်အလေး 100% မှတက် add ရပါမည်
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,သွားရောက်ရှိနေခြင်း
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,စတော့အိတ်ပစ္စည်းများ
 DocType: BOM,Materials,ပစ္စည်းများ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","checked မလျှင်, စာရင်းကလျှောက်ထားခံရဖို့ရှိပါတယ်ရှိရာတစ်ဦးစီဦးစီးဌာနမှထည့်သွင်းရပါလိမ့်မယ်။"
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Creating {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
@@ -5652,14 +5694,14 @@
 DocType: Shipping Rule,Fixed,သတ်မှတ်ထားတဲ့
 DocType: Vehicle Service,Clutch Plate,clutch ပြား
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
-DocType: Journal Entry,Subscription,subscription
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,subscription
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,အခကြေးငွေဖန်ဆင်းခြင်းရွှေ့ဆိုင်း
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,သတိပေးချက်ကာလ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,သတိပေးချက်ကာလ
 DocType: Asset Category,Asset Category Name,ပိုင်ဆိုင်မှုအမျိုးအစားအမည်
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"ဒါကအမြစ်နယ်မြေဖြစ်ပြီး, edited မရနိုင်ပါ။"
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,နယူးအရောင်းပုဂ္ဂိုလ်အမည်
@@ -5673,7 +5715,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
 DocType: Asset,Frequency of Depreciation (Months),တန်ဖိုး၏ frequency (လ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ခရက်ဒစ်အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
@@ -5681,7 +5723,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
 DocType: Hub Settings,Company Logo,ကုမ္ပဏီအမှတ်တံဆိပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 DocType: Healthcare Settings,Patient Registration,လူနာမှတ်ပုံတင်ခြင်း
@@ -5716,11 +5758,10 @@
 DocType: Journal Entry,Total Debit,စုစုပေါင်း Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default အနေနဲ့ကုန်စည်ဂိုဒေါင် Finished
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,လူနာကို select ပေးပါ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,အရောင်းပုဂ္ဂိုလ်
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,အရောင်းပုဂ္ဂိုလ်
 DocType: Hotel Room Package,Amenities,အာမင်
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ငွေပေးချေမှု၏အကွိမျမြားစှာက default mode ကိုခွင့်မပြုပါ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,အတွက်
 ,Appointment Analytics,ခန့်အပ်တာဝန်ပေးခြင်း Analytics မှ
 DocType: Vehicle Service,Half Yearly,တစ်ဝက်နှစ်အလိုက်
 DocType: Lead,Blog Subscriber,ဘလော့ Subscriber
@@ -5737,6 +5778,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,သငျသညျတစ်နှစ်လျှင်ကျောင်းသားကျောင်းသူများအုပ်စုများစေလျှင်လွတ် Leave
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","checked, စုစုပေါင်းမျှမပါ။ အလုပ်အဖွဲ့ Days ၏အားလပ်ရက်ပါဝင်ပါလိမ့်မယ်, ဒီလစာ Per နေ့၏တန်ဖိုးကိုလျော့ချလိမ့်မည်"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","လက်ရှိ key ကိုသုံးပြီး Apps ကပရယူနိုင်လိမ့်မည်မဟုတ်ပေ, သင်သေချာရှိပါသလဲ"
+DocType: Subscription Settings,Prorate,Prorated
 DocType: Purchase Invoice,Total Advance,စုစုပေါင်းကြိုတင်ထုတ်
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,ပြောင်းလဲမှု Template Code ကို
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,အဆိုပါ Term အဆုံးရက်စွဲ Term Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
@@ -5748,8 +5790,9 @@
 DocType: Opportunity Item,Basic Rate,အခြေခံပညာ Rate
 DocType: GL Entry,Credit Amount,အကြွေးပမာဏ
 DocType: Cheque Print Template,Signatory Position,လက်မှတ်ရေးထိုးရာထူး
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
 DocType: Timesheet,Total Billable Hours,စုစုပေါင်းဘီလ်ဆောင်နာရီ
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,အဆိုပါစာရင်းပေးသွင်းထားသူကဒီကြေးပေးသွင်းခြင်းဖြင့်ထုတ်ပေးငွေတောင်းခံလွှာများပေးချေရန်ရှိကြောင်းရက်ပေါင်းအရေအတွက်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ငွေပေးချေမှုရမည့်ပြေစာမှတ်ချက်
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ဒီဖောက်သည်ဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},အတန်း {0}: ခွဲဝေငွေပမာဏ {1} ငွေပေးချေမှုရမည့် Entry ငွေပမာဏ {2} ဖို့ထက်လျော့နည်းသို့မဟုတ်ညီမျှရှိရမည်
@@ -5768,12 +5811,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Company,Company Info,ကုမ္ပဏီ Info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ဒီထမ်းများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
 DocType: Assessment Result,Summary,အကျဉ်းချုပ်
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,မာကုတက်ရောက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,debit အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,စားသောက်ဆိုင်အမိန့် Entry Item
@@ -5785,7 +5828,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,အရစ်ကျငွေပမာဏ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Work Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},အဆိုပါရှယ်ယာ {0} နှင့်အတူတည်ရှိကြဘူး
@@ -5793,12 +5836,12 @@
 DocType: Asset,Out of Order,အမိန့်များထဲက
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 DocType: Projects Settings,Ignore Workstation Time Overlap,Workstation နှင့်အချိန်ထပ်လျစ်လျူရှု
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,ကို Select လုပ်ပါအသုတ်လိုက်နံပါတ်များ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
 DocType: Patient Service Unit,Medical Administrator,ဆေးဘက်ဆိုင်ရာအုပ်ချုပ်ရေးမှူး
 DocType: Assessment Plan,Schedule,ဇယား
 DocType: Account,Parent Account,မိဘအကောင့်
@@ -5828,15 +5871,16 @@
 DocType: Asset Repair,Repair Status,ပြုပြင်ရေးအခြေအနေ
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 DocType: POS Profile,Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်
 DocType: Purchase Invoice,input service,input ကိုဝန်ဆောင်မှု
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 DocType: Maintenance Team Member,Maintenance Team Member,ကို Maintenance အဖွဲ့အဖွဲ့ဝင်
 DocType: Agriculture Analysis Criteria,Soil Analysis,မြေဆီလွှာကိုအားသုံးသပ်ခြင်း
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,သင်တန်းအမှတ်စဥ် Code ကို:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
 DocType: Employee,Current Address,လက်ရှိလိပ်စာ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ကို item အခြားတဲ့ item တစ်ခုမူကွဲဖြစ်ပါတယ် အကယ်. အတိအလင်းသတ်မှတ်လိုက်သောမဟုတ်လျှင်ထို့နောက်ဖော်ပြချက်, ပုံရိပ်, စျေးနှုန်း, အခွန်စသည်တို့အတွက် template ကိုကနေသတ်မှတ်ကြလိမ့်မည်"
 DocType: Serial No,Purchase / Manufacture Details,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
@@ -5885,19 +5929,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} များအတွက်အဆင့်လက်ခံရေး
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,variable အမည်
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
 DocType: Asset,Asset Category,ပိုင်ဆိုင်မှုအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net ကအခပေးအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,ပေးသွင်းဖို့ material
 DocType: Soil Texture,Loamy Sand,နုန်းဆန်သောသဲ
 DocType: Production Plan,Material Request Planning,ပစ္စည်းတောင်းဆိုခြင်းစီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ယစ်မျိုးပြေစာ
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% တစ်ကြိမ်ထက်ပိုပြီးပုံပေါ်
 DocType: Expense Claim,Employees Email Id,န်ထမ်းအီးမေးလ် Id
 DocType: Employee Attendance Tool,Marked Attendance,တခုတ်တရတက်ရောက်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,လက်ရှိမှုစိစစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,လက်ရှိမှုစိစစ်
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,timer ပေးထားသောနာရီထက်ကျော်လွန်။
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,သင့်ရဲ့အဆက်အသွယ်မှအစုလိုက်အပြုံလိုက် SMS ပို့
 DocType: Patient,A Positive,တစ်ဦးကအပြုသဘောဆောင်သော
@@ -5908,9 +5952,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့အမိန့်ဝယ်ရန်သတိနဲ့ထုတ်ပေးရပါမည်။"
 DocType: Asset Maintenance Team,Asset Maintenance Team,ပိုင်ဆိုင်မှုကို Maintenance ရေးအဖွဲ့
-DocType: Employee Loan,Loan Type,ချေးငွေအမျိုးအစား
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ကိုအောင်မြင်စွာတင်ပြပြီးပါပြီ
+DocType: Loan,Loan Type,ချေးငွေအမျိုးအစား
 DocType: Scheduling Tool,Scheduling Tool,စီစဉ်ခြင်း Tool ကို
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,အကြွေးဝယ်ကဒ်
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,အကြွေးဝယ်ကဒ်
 DocType: BOM,Item to be manufactured or repacked,item ထုတ်လုပ်သောသို့မဟုတ် repacked ခံရဖို့
 DocType: Employee Education,Major/Optional Subjects,ဗိုလ်မှူး / မလုပ်မဖြစ်ကျအောကျခံ
 DocType: Sales Invoice Item,Drop Ship,drop သင်္ဘော
@@ -5942,7 +5987,7 @@
 DocType: Item,Units of Measure,တိုင်း၏ယူနစ်
 DocType: Manufacturing Settings,Allow Production on Holidays,အားလပ်ရက်အပေါ်ထုတ်လုပ်မှု Allow
 DocType: Sales Invoice,Customer's Purchase Order Date,customer ရဲ့ဝယ်ယူခြင်းအမိန့်နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,မြို့တော်စတော့အိတ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,မြို့တော်စတော့အိတ်
 DocType: Shopping Cart Settings,Show Public Attachments,ပြည်သူ့ပူးတွဲပါပြရန်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
 DocType: Restaurant Reservation,Reservation Time,reservation အချိန်
@@ -5957,7 +6002,7 @@
 DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီလ်မှ
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,အတန်း # {0}: နေ့စွဲခြင်းဖြင့် Reqd ငွေသွင်းငွေထုတ်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,အသားပေးထုတ်ကုန်များ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ပုံစံရေးဆှဲသူ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
@@ -5967,20 +6012,20 @@
 DocType: Driver,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
 DocType: Healthcare Settings,Employee name and designation in print,ပုံနှိပ်အတွက်ဝန်ထမ်းအမည်နှင့်သတ်မှတ်ရေး
 ,accounts-browser,အကောင့်-browser ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project မှမာစတာ။
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",စတော့အိတ်ချိန်ညှိခြင်းသို့မဟုတ်အရာဝတ္ထုအတွက် update ကို &quot;Allow&quot; ငွေတောင်းခံ-ကျော်သို့မဟုတ် Over-သာသနာကိုခွင့်ပြုပါရန်။
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(တစ်ဝက်နေ့)
 DocType: Payment Term,Credit Days,ခရက်ဒစ် Days
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Lab ကစမ်းသပ်မှုအရလူနာကို select ပေးပါ
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
 DocType: Fee Schedule,FRQ.,FRQ ။
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ခဲအချိန် Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,ဝင်ငွေခွန်စျေးကြီးသည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ကျောင်းသားသမဂ္ဂဟာအင်စတီကျုရဲ့ဘော်ဒါဆောင်မှာနေထိုင်လျှင်ဒီစစ်ဆေးပါ။
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
 ,Stock Summary,စတော့အိတ်အကျဉ်းချုပ်
@@ -5991,10 +6036,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref နေ့စွဲ
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: BOM Operation,Operating Cost(Company Currency),operating ကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
-DocType: Employee Loan Application,Rate of Interest,အကျိုးစီးပွား၏နှုန်းမှာ
+DocType: Loan Application,Rate of Interest,အကျိုးစီးပွား၏နှုန်းမှာ
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: Item,Shelf Life In Days,နေ့ရက်များထဲမှာကမ်းလွန်ရေတိမ်ပိုင်းဘဝ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
+DocType: Department,Expense Approvers,ကုန်ကျစရိတ်ခွင့်ပြုချက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 DocType: Journal Entry,Subscription Section,subscription ပုဒ်မ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 561a2a4..cc63f7b 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Beoordelingsrapporten
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumentenproducten
-DocType: Purchase Receipt,Subscription Detail,Abonnement Detail
 DocType: Supplier Scorecard,Notify Supplier,Meld Leverancier in
 DocType: Item,Customer Items,Klant Items
 DocType: Project,Costing and Billing,Kostenberekening en facturering
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
 DocType: Item,Publish Item to hub.erpnext.com,Publiceer Item om hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail Notificaties
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,evaluatie
 DocType: Item,Default Unit of Measure,Standaard Eenheid
 DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Contact
-DocType: Employee,Leave Approvers,Verlof goedkeurders
+DocType: Department,Leave Approvers,Verlof goedkeurders
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,onderzoeken
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Beschikbaarheid controleren
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dit is gebaseerd op transacties tegen deze leverancier. Zie tijdlijn hieronder voor meer informatie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Wettelijk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Wettelijk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}
 DocType: Bank Guarantee,Customer,Klant
 DocType: Purchase Receipt Item,Required By,Benodigd op
 DocType: Delivery Note,Return Against Delivery Note,Terug Tegen Delivery Note
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofden (of groepen) waartegen de boekingen worden gemaakt en saldi worden gehandhaafd.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Er zijn geen loonslips ingediend om te verwerken.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Er zijn geen loonslips ingediend om te verwerken.
 DocType: Manufacturing Settings,Default 10 mins,Standaard 10 min
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Toon geopend
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Het is noodzakelijk om deze actie vandaag zelf te nemen voor bovengenoemde herhalende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Reeks succesvol bijgewerkt
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Uitchecken
 DocType: Pricing Rule,Apply On,toepassing op
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Alle Leverancier Contact
 DocType: Support Settings,Support Settings,ondersteuning Instellingen
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Item Vervaldatum Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bankcheque
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bankcheque
 DocType: Membership,membership validaty section,lidmaatschapsvalidatie
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 DocType: Consultation,Consultation,Overleg
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Website maken
 DocType: Opening Invoice Creation Tool Item,Quantity,Hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Rekeningtabel mag niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Leningen (Passiva)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Rekeningtabel mag niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Leningen (Passiva)
 DocType: Employee Education,Year of Passing,Voorbije Jaar
 DocType: Item,Country of Origin,Land van herkomst
 DocType: Soil Texture,Soil Texture Criteria,Bodemtextuurcriteria
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primaire contactgegevens
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Open Issues
 DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
 DocType: Lab Test Groups,Add new line,Voeg een nieuwe regel toe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Gezondheidszorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in de betaling (Dagen)
@@ -89,7 +85,7 @@
 ,Delay Days,Vertragingen dagen
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Factuur
+DocType: Subscription Invoice,Invoice,Factuur
 DocType: Purchase Invoice Item,Item Weight Details,Item Gewicht Details
 DocType: Asset Maintenance Log,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Rij # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Rij # {0}:
 DocType: Timesheet,Total Costing Amount,Totaal bedrag Costing
 DocType: Delivery Note,Vehicle No,Voertuig nr.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Selecteer Prijslijst
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Onderhanden Werk
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Kies een datum
 DocType: Daily Work Summary Group,Holiday List,Holiday Lijst
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Accountant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Accountant
 DocType: Hub Settings,Selling Price List,Verkoopprijslijst
 DocType: Patient,Tobacco Current Use,Tabaksgebruik
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Verkoopcijfers
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Verkoopcijfers
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefoonnummer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nieuwe {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,E-mailkennisgeving verzonden
 ,Sales Partners Commission,Verkoop Partners Commissie
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Restwaarde
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Verwant
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Aanwezigheid datum kan niet lager zijn dan het samenvoegen van de datum werknemer zijn
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Aanwezigheid datum kan niet lager zijn dan het samenvoegen van de datum werknemer zijn
 DocType: Grading Scale,Grading Scale Name,Grading Scale Naam
-DocType: Subscription,Repeat on Day,Herhaal op dag
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dit is een basisrekening en kan niet worden bewerkt.
 DocType: Sales Invoice,Company Address,bedrijfsadres
 DocType: BOM,Operations,Bewerkingen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan de autorisatie niet instellen op basis van korting voor {0}
+DocType: Subscription,Subscription Start Date,Begindatum abonnement
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bevestig .csv-bestand met twee kolommen, één voor de oude naam en één voor de nieuwe naam"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} in geen enkel actief fiscale jaar.
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referentie: {0}, Artikelcode: {1} en klant: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Einddatum van proefperiode Mag niet vóór Startdatum proefperiode zijn
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vacature voor een baan.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Stuklijst is niet gespecificeerd voor uitbesteding van item {0} in rij {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Hetzelfde bedrijf is meer dan één keer ingevoerd
 DocType: Patient,Married,Getrouwd
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Niet toegestaan voor {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Krijgen items uit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Krijgen items uit
 DocType: Price List,Price Not UOM Dependant,Prijs niet afhankelijk van UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,remolie
 DocType: Tax Rule,Tax Type,Belasting Type
 ,Completed Work Orders,Voltooide werkorders
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Belastbaar bedrag
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Belastbaar bedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: BOM,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rij # {0}: Referentiedocumenttype moet één van de kostenrekening of het journaalboekje zijn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rij # {0}: Referentiedocumenttype moet één van de kostenrekening of het journaalboekje zijn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Beheer vooraf bedrag gegeven aan de werknemer
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Bezorg notificatie
 DocType: Journal Entry,Opening Entry,Opening Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Rekening betalen enkel
-DocType: Employee Loan,Repay Over Number of Periods,Terug te betalen gedurende een aantal perioden
+DocType: Loan,Repay Over Number of Periods,Terug te betalen gedurende een aantal perioden
 DocType: Stock Entry,Additional Costs,Bijkomende kosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
 DocType: Lead,Product Enquiry,Product Aanvraag
 DocType: Education Settings,Validate Batch for Students in Student Group,Batch valideren voor studenten in de studentengroep
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Geen verlof gevonden record voor werknemer {0} voor {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Geen verlof gevonden record voor werknemer {0} voor {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vul aub eerst bedrijf in
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Selecteer Company eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Student zonder graad
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Stel de standaardsjabloon in voor Verlofstatusmelding in HR-instellingen.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,werknemer Loan
 DocType: Fee Schedule,Send Payment Request Email,Stuur een e-mail voor betalingsverzoek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Vastgoed
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Succesvol afgemeld.
 DocType: Assessment Result,Grade,Rang
 DocType: Restaurant Table,No of Seats,Aantal zitplaatsen
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Om dynamisch onderwerp toe te voegen, gebruik jinja tags zoals <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset Maintenance Task
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Jaarsalaris
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Jaarsalaris
 DocType: Daily Work Summary,Daily Work Summary,Dagelijks Werk Samenvatting
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} is bevroren
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Voorraadkosten
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Voorraadkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selecteer Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selecteer Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vul Preferred Contact E-mail
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Vul Preferred Contact E-mail
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,hoofdadres
 DocType: Production Plan,Material Request Detail,Materiaal Verzoek Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standaard prijsofferte dagen
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Change Bedrag
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Rijbewijscategorieën
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Vul de Leveringsdatum in
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak Afschrijvingen Entry
+DocType: HR Settings,Leave Settings,Laat instellingen staan
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Aanvraag type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,maak Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Uitzenden
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Setup-modus van POS (online / offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Hiermee wordt het maken van tijdregistraties tegen werkorders uitgeschakeld. Bewerkingen worden niet getraceerd op werkorder
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Uitvoering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details van de uitgevoerde handelingen.
 DocType: Asset Maintenance Log,Maintenance Status,Onderhoud Status
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Lidmaatschap details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverancier is vereist tegen Te Betalen account {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikelen en prijzen
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Totaal aantal uren: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Van Datum moet binnen het boekjaar zijn. Er vanuit gaande dat Van Datum {0} is
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Voorkeur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Voorkeur
 DocType: Grant Application,Individual,Individueel
 DocType: Academic Term,Academics User,Academici Gebruiker
 DocType: Cheque Print Template,Amount In Figure,Bedrag In figuur
-DocType: Employee Loan Application,Loan Info,Loan Info
+DocType: Loan Application,Loan Info,Loan Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan voor onderhoud bezoeken.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Leverancier Scorecard Periode
 DocType: Share Transfer,Share Transfer,Deel overdracht
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Artikel sjabloon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemie
 DocType: Job Offer,Select Terms and Conditions,Select Voorwaarden
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out Value
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-instellingen
 DocType: Production Plan,Sales Orders,Verkooporders
 DocType: Purchase Taxes and Charges,Valuation,Waardering
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Standaard Regio
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,televisie
 DocType: Work Order Operation,Updated via 'Time Log',Bijgewerkt via 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Selecteer de klant of leverancier.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: Company,Enable Perpetual Inventory,Perpetual Inventory inschakelen
+DocType: Bank Guarantee,Charges Incurred,Kosten komen voor
 DocType: Company,Default Payroll Payable Account,Default Payroll Payable Account
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Pas E-Group
 DocType: Sales Invoice,Is Opening Entry,Wordt Opening Entry
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Aangepast resultaat
 DocType: Delivery Stop,Contact Name,Contact Naam
 DocType: Course Assessment Criteria,Course Assessment Criteria,Cursus Beoordelingscriteria
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,BTW-nummer:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,BTW-nummer:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student-ID:
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Land Unit,Land Unit describing various land assets,Landeenheid beschrijft verschillende terreinen
@@ -375,9 +372,8 @@
 ,Open Work Orders,Open werkorders
 DocType: Payment Term,Credit Months,Kredietmaanden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Nettoloon kan niet lager zijn dan 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Om te stoppen met het verzenden van herhaalde foutmeldingen van het systeem, hebben we het veld Uitgeschakeld in het abonnement gecontroleerd"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Verlaat per jaar
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Verlaat per jaar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
 DocType: Email Digest,Profit & Loss,Verlies
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Stel de studenten onder Student Groups in
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Gegevens
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Gegevens
 DocType: Crop,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Neem geen contact op
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Mensen die lesgeven op uw organisatie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Course Scheduling Tool,Course Start Date,Cursus Startdatum
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publiceren in Hub
 DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Inkoop Details
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nieuwe Offertes
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails loonstrook van medewerkers op basis van de voorkeur e-mail geselecteerd in Employee
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld
 DocType: Tax Rule,Shipping County,verzending County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Leren
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Leren
 DocType: Asset,Next Depreciation Date,Volgende Afschrijvingen Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteitskosten per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito&#39;s te ontruimen
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kan niet negatief voor producten van post {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kan niet negatief voor producten van post {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Verkeerd Wachtwoord
 DocType: Item,Variant Of,Variant van
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Voltooid aantal mag niet groter zijn dan 'Aantal te produceren'
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Stel de hotelkamerprijs in op {}
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Factuur Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Vrachtbrief
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kosten van Verkochte Asset
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Course Scheduling Tool,Course Scheduling Tool,Course Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Fout bij het maken van terugkerende% s voor% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
 DocType: Land Unit,LInked Analysis,Geïntegreerde analyse
 DocType: Item Tax,Tax Rate,Belastingtarief
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,De toepassingsperiode kan niet over twee toewijzingsrecords lopen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,De toepassingsperiode kan niet over twee toewijzingsrecords lopen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Ontvangen
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Maak Student Groepen
 DocType: Volunteer,Weekends,weekends
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Credit Note Bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Credit Note Bedrag
 DocType: Setup Progress Action,Action Document,Actie Document
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Gereed Product
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Items toevoegen
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artikel Kwaliteitsinspectie Parameter
+DocType: Leave Application,Leave Approver Name,Verlaat Goedkeurder Naam
 DocType: Depreciation Schedule,Schedule Date,Plan datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","De winst, aftrekposten en andere looncomponenten"
 DocType: Packed Item,Packed Item,Levering Opmerking Verpakking Item
@@ -551,7 +546,7 @@
 DocType: Request for Quotation,Request for Quotation,Offerte
 DocType: Healthcare Settings,Require Lab Test Approval,Vereist laboratoriumtest goedkeuring
 DocType: Salary Slip Timesheet,Working Hours,Werkuren
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Totaal uitstekend
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Totaal uitstekend
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
 DocType: Dosage Strength,Strength,Kracht
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Maak een nieuwe klant
@@ -564,7 +559,7 @@
 DocType: Workstation,Consumable Cost,Verbruiksartikel kostprijs
 DocType: Purchase Receipt,Vehicle Date,Voertuiggegegevns
 DocType: Student Log,Medical,medisch
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Reden voor het verliezen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Reden voor het verliezen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Accountnummer bijwerken
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Lead eigenaar kan niet hetzelfde zijn als de lead zijn
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Toegekende bedrag kan niet hoger zijn dan niet-gecorrigeerde bedrag
@@ -574,11 +569,10 @@
 DocType: Lab Test Template,Single,Enkele
 DocType: Salary Slip,Total Loan Repayment,Totaal aflossing van de lening
 DocType: Account,Cost of Goods Sold,Kostprijs verkochte goederen
-DocType: Subscription,Yearly,Jaarlijks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vul kostenplaats in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Vul kostenplaats in
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Verkooporder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gem. Verkoopkoers
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Gem. Verkoopkoers
 DocType: Assessment Plan,Examiner Name,Examinator Naam
 DocType: Lab Test Template,No Result,Geen resultaat
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
@@ -587,6 +581,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vul aub eerst de naam van het bedrijf in
 DocType: Purchase Invoice,Supplier Name,Leverancier Naam
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lees de ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Bladeren van alle afdelingsleden weergeven in de agenda
 DocType: Purchase Invoice,01-Sales Return,01-verkoopretour
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,In afwachting van Bestellingen
@@ -604,13 +599,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Verplicht veld - Academiejaar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} is niet gekoppeld aan {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Pas de inleidende tekst aan die meegaat als een deel van die e-mail. Elke transactie heeft een aparte inleidende tekst.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Stel alsjeblieft de standaard betaalbare rekening voor het bedrijf in {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Stel alsjeblieft de standaard betaalbare rekening voor het bedrijf in {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transactie niet toegestaan tegen gestopte werkorder {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
@@ -634,8 +629,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Gereserveerd voor verkoop
 DocType: Packing Slip,From Package No.,Van Pakket No
 DocType: Item Attribute,To Range,Om Bereik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan de waarderingsmethode niet wijzigen, aangezien er transacties zijn tegen sommige items die geen eigen waarderingsmethode hebben"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Effecten en Deposito's
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan de waarderingsmethode niet wijzigen, aangezien er transacties zijn tegen sommige items die geen eigen waarderingsmethode hebben"
 DocType: Student Report Generation Tool,Attended by Parents,Bijgewoond door ouders
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Patient,AB Positive,AB Positief
@@ -644,7 +639,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aanwezigheid record.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Salaris Component voor rooster gebaseerde payroll.
 DocType: Sales Order Item,Used for Production Plan,Gebruikt voor Productie Plan
-DocType: Employee Loan,Total Payment,Totale betaling
+DocType: Loan,Total Payment,Totale betaling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Kan transactie voor voltooide werkorder niet annuleren.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (in minuten)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} is geannuleerd dus de actie kan niet voltooid worden
@@ -660,16 +655,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Parts te bouwen
 DocType: POS Profile User,POS Profile User,POS-profielgebruiker
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Directe Inkomsten
+DocType: Subscription Invoice,Subscription Invoice,Abonnementsfactuur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Directe Inkomsten
 DocType: Patient Appointment,Date TIme,Datum Tijd
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Boekhouder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Boekhouder
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opzetten van bedrijf en belastingen
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
 DocType: Codification Table,Codification Table,Codificatie Tabel
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Selecteer Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Selecteer Company
 DocType: Stock Entry Detail,Difference Account,Verschillenrekening
 DocType: Purchase Invoice,Supplier GSTIN,Leverancier GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan taak niet afsluiten als haar afhankelijke taak {0} niet is afgesloten.
@@ -695,6 +691,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Cash Flow Mapping Template
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
+DocType: Bank Guarantee,Providing,Het verstrekken van
 DocType: Account,Profit and Loss,Winst en Verlies
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Niet toegestaan, configureer Lab-testsjabloon zoals vereist"
 DocType: Patient,Risk Factors,Risicofactoren
@@ -726,7 +723,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
 DocType: Healthcare Settings,Appointment Confirmation,Afspraak bevestiging
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan Serienummer {0} niet verwijderen, omdat het wordt gebruikt in voorraadtransacties"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan Serienummer {0} niet verwijderen, omdat het wordt gebruikt in voorraadtransacties"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Sluiten (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Item verplaatsen
@@ -751,11 +748,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Al ingesteld standaard in pos profiel {0} voor gebruiker {1}, vriendelijk uitgeschakeld standaard"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Geaccumuleerde waarden
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory is verplicht in POS Profiel
 DocType: Supplier,Prevent RFQs,Voorkom RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Maak verkooporder
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salarisslip ingediend voor een periode van {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Salarisslip ingediend voor een periode van {0} tot {1}
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
@@ -776,8 +773,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Verzendingsbiljetdatum
 DocType: Production Plan,Production Plan,Productieplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Opening factuur creatie tool
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Terugkerende verkoop
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opmerking: Totaal toegewezen bladeren {0} mag niet kleiner zijn dan die reeds zijn goedgekeurd bladeren zijn {1} voor de periode
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Aantal instellen in transacties op basis van serieel geen invoer
 ,Total Stock Summary,Totale voorraadoverzicht
 DocType: Announcement,Posted By,Gepost door
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
@@ -788,7 +786,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel het bedrijf alstublieft in
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stel het bedrijf alstublieft in
@@ -796,8 +794,8 @@
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Training Result Employee,Training Result Employee,Training Resultaat Werknemer
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
-DocType: Repayment Schedule,Principal Amount,hoofdsom
-DocType: Employee Loan Application,Total Payable Interest,Totaal verschuldigde rente
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,hoofdsom
+DocType: Loan Application,Total Payable Interest,Totaal verschuldigde rente
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totaal Uitstaande: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
@@ -806,10 +804,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant reservering
 DocType: Land Unit,Land Unit Name,Land Eenheid Naam
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Voorstel Schrijven
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Afsluiten
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Breng klanten op de hoogte via e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Breng klanten op de hoogte via e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Een andere Sales Person {0} bestaat met dezelfde werknemer id
 DocType: Employee Advance,Claimed Amount,Geclaimd bedrag
 apps/erpnext/erpnext/config/education.py +180,Masters,Stamdata
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway-account aangemaakt, dan kunt u een handmatig maken."
 DocType: Supplier Scorecard,Per Year,Per jaar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Komt niet in aanmerking voor de toelating in dit programma volgens DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 DocType: Sales Invoice,Sales Taxes and Charges,Verkoop Belasting en Toeslagen
 DocType: Employee,Organization Profile,organisatie Profiel
 DocType: Vital Signs,Height (In Meter),Hoogte (in meter)
 DocType: Student,Sibling Details,sibling Details
 DocType: Vehicle Service,Vehicle Service,voertuig
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatisch leidt tot de feedback verzoek op basis van de omstandigheden.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatisch leidt tot de feedback verzoek op basis van de omstandigheden.
 DocType: Employee,Reason for Resignation,Reden voor ontslag
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Sjabloon voor functioneringsgesprekken .
 DocType: Sales Invoice,Credit Note Issued,Credit Note Uitgegeven
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Onderhoudsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dan worden prijsregels uitgefilterd op basis van Klant, Klantgroep, Regio,  Leverancier, Leverancier Type, Campagne, Verkooppartner, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Netto wijziging in Inventory
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Employee Lening Beheer
 DocType: Employee,Passport Number,Paspoortnummer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relatie met Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling van / naar
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Stel een account in in Magazijn {0}
@@ -894,23 +890,23 @@
 DocType: Item,Material Transfer,Materiaal Verplaatsing
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Kan pad niet vinden voor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening ( Dr )
+DocType: Loan,Applicant,aanvrager
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Plaatsing timestamp moet na {0} zijn
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Om terugkerende documenten te maken
 ,GST Itemised Purchase Register,GST Itemized Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Afspraak verzetten
-DocType: Employee Loan,Total Interest Payable,Totaal te betalen rente
+DocType: Loan,Total Interest Payable,Totaal te betalen rente
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Vrachtkosten belastingen en toeslagen
 DocType: Work Order Operation,Actual Start Time,Werkelijke Starttijd
 DocType: BOM Operation,Operation Time,Operatie Tijd
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Afwerking
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Baseren
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Baseren
 DocType: Timesheet,Total Billed Hours,Totaal gefactureerd Hours
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Afschrijvingsbedrag
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Afschrijvingsbedrag
 DocType: Leave Block List Allow,Allow User,Door gebruiker toestaan
 DocType: Journal Entry,Bill No,Factuur nr
 DocType: Company,Gain/Loss Account on Asset Disposal,Winst / verliesrekening op de verkoop van activa
 DocType: Vehicle Log,Service Details,Service Details
-DocType: Subscription,Quarterly,Kwartaal
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,gegroepeerd
 DocType: Selling Settings,Delivery Note Required,Vrachtbrief Verplicht
@@ -922,7 +918,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Urenregistratie
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Grondstoffen afgeboekt op basis van
 DocType: Sales Invoice,Port Code,Poortcode
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Magazijn reserveren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Magazijn reserveren
 DocType: Lead,Lead is an Organization,Lead is een organisatie
 DocType: Guardian Interest,Interest,Interesseren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkoop
@@ -934,12 +930,12 @@
 DocType: Account,Accounts,Rekeningen
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Laatste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Templates van leveranciers scorecard criteria.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Betaling Entry is al gemaakt
 DocType: Request for Quotation,Get Suppliers,Krijg leveranciers
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Voorbeschouwing loonstrook
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Voorbeschouwing loonstrook
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,U kunt alleen verlengen als uw lidmaatschap binnen 30 dagen verloopt
@@ -949,7 +945,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Selecteer alleen als u Cash Flow Mapper-documenten hebt ingesteld
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Supplier Scorecard,Per Week,Per week
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totaal student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
@@ -971,9 +967,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredietkaart invoer
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Bedrijf en Accounts
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,in Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,in Value
 DocType: Asset Settings,Depreciation Options,Afschrijvingsopties
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ongeldige boekingstijd
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ongeldige boekingstijd
 DocType: Lead,Campaign Name,Campagnenaam
 DocType: Hotel Room,Capacity,Capaciteit
 DocType: Selling Settings,Close Opportunity After Days,Sluiten Opportunity Na Days
@@ -998,7 +994,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Budget,Budget Against,budget Against
 DocType: Employee,Cell Number,Mobiel nummer
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Er is geen medewerker voor de gegeven criteria. Controleer of salarisstroken nog niet zijn gemaakt.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Er is geen medewerker voor de gegeven criteria. Controleer of salarisstroken nog niet zijn gemaakt.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,U kan geen 'Voucher' invoeren in een 'Tegen Journal Entry' kolom
@@ -1010,15 +1006,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecteer een tafel
 DocType: BOM,Website Specifications,Website Specificaties
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is een ongeldig e-mailadres in &#39;Ontvangers&#39;
 DocType: Special Test Items,Particulars,bijzonderheden
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Van {0} van type {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Van {0} van type {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Asset,Maintenance,Onderhoud
+DocType: Subscriber,Subscriber,Abonnee
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Werk uw projectstatus bij
 DocType: Item,Maximum sample quantity that can be retained,Maximum aantal monsters dat kan worden bewaard
@@ -1075,26 +1071,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standaardinstellingen voor Winkelwagen
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Voeg tijdsloten toe
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset gesloopt via Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Rentebaten Account
+DocType: Loan,Interest Income Account,Rentebaten Account
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Review Uitnodiging verzonden
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Gebouwen Onderhoudskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Gebouwen Onderhoudskosten
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Ga naar
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Het opzetten van e-mailaccount
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Vul eerst artikel in
 DocType: Asset Repair,Downtime,uitvaltijd
 DocType: Account,Liability,Verplichting
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Academische termijn:
 DocType: Salary Detail,Do not include in total,Neem niet alles mee
 DocType: Company,Default Cost of Goods Sold Account,Standaard kosten van verkochte goederen Account
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Voorbeeldhoeveelheid {0} kan niet meer dan ontvangen aantal {1} zijn
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Prijslijst niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Request for Quotation Supplier,Send Email,E-mail verzenden
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 DocType: Item,Max Sample Quantity,Max. Aantal monsters
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Geen toestemming
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Geen toestemming
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Offerte aangevraagd
 DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pulse
 DocType: Company,Default Bank Account,Standaard bankrekening
@@ -1105,11 +1101,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab-tests en vitale functies
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevonden
-DocType: Subscription,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentgroep is al bijgewerkt.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgroep is al bijgewerkt.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Project update.
 DocType: SMS Center,All Customer Contact,Alle Customer Contact
 DocType: Land Unit,Tree Details,Tree Details
@@ -1159,7 +1154,6 @@
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alle Artikel Groepen
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
 DocType: Work Order,Item To Manufacture,Artikel te produceren
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status {2}
@@ -1173,7 +1167,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Selecteer opnieuw, als het gekozen adres is bewerkt na opslaan"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
 DocType: Item,Hub Publishing Details,Hub publicatie details
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Opening&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
 DocType: Lab Test Template,Result Format,Resultaatformaat
@@ -1183,7 +1177,7 @@
 DocType: Payroll Entry,Bimonthly,Tweemaandelijks
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Kunstmest Inhoud
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Research & Development
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Research & Development
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Registratie Details
 DocType: Timesheet,Total Billed Amount,Totaal factuurbedrag
@@ -1197,7 +1191,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Creditlimietcontrole overslaan op klantorder
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Beoordeling van de prestaties.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Inschakelen &quot;Gebruik voor Winkelwagen &#39;, zoals Winkelwagen is ingeschakeld en er moet minstens één Tax Rule voor Winkelwagen zijn"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} is verbonden met de Orde {1}, controleer dan of het als tevoren in deze factuur moet worden getrokken."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} is verbonden met de Orde {1}, controleer dan of het als tevoren in deze factuur moet worden getrokken."
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Verkooppunt
@@ -1231,7 +1225,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimum aantal zitplaatsen
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaarden
 DocType: Examination Result,Examination Result,examenresultaat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Ontvangstbevestiging
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Wisselkoers stam.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referentie Doctype moet een van {0}
@@ -1239,15 +1233,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Stuklijst {0} moet actief zijn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Geen items beschikbaar voor overdracht
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Geen items beschikbaar voor overdracht
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Sluiten (Opening + totaal)
 DocType: Journal Entry,Depreciation Entry,afschrijvingen Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuleren Materiaal Bezoeken {0} voor het annuleren van deze Maintenance Visit
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016-norm
 DocType: Pricing Rule,Rate or Discount,Tarief of korting
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Benodigde hoeveelheid
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,favorieten
 DocType: Hub Settings,Custom Data,Aangepaste gegevens
@@ -1259,9 +1253,9 @@
 DocType: Medical Code,Medical Code Standard,Medische Code Standaard
 DocType: Soil Texture,Clay Composition (%),Kleisamenstelling (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Sla op voordat u een taak toewijst.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balans Waarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balans Waarde
 DocType: Lab Test,Lab Technician,Laboratorium technicus
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Sales Prijslijst
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Als gecontroleerd, wordt een klant aangemaakt, aangepast aan Patiënt. Patiëntfacturen worden aangemaakt tegen deze klant. U kunt ook de bestaande klant selecteren bij het maken van een patiënt."
 DocType: Bank Reconciliation,Account Currency,Account Valuta
@@ -1269,16 +1263,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Vermeld Ronde Off Account in Company
 DocType: Purchase Receipt,Range,Reeks
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Fee Structure,Components,Components
 DocType: Item Barcode,Item Barcode,Artikel Barcode
 DocType: Woocommerce Settings,Endpoints,Eindpunten
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","gegenereerd worden. Als u vertraagd bent, moet u het veld &#39;Herhalen op dag van maand&#39; handmatig wijzigen"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
 DocType: Share Transfer,From Folio No,Van Folio Nee
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
@@ -1313,16 +1305,17 @@
 DocType: Asset,Available-for-use Date,Beschikbaar voor gebruik Datum
 DocType: Guardian,Guardian Name,Naam pleegouder
 DocType: Cheque Print Template,Has Print Format,Heeft Print Format
-DocType: Employee Loan,Sanctioned,Sanctioned
+DocType: Loan,Sanctioned,Sanctioned
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,is verplicht. Misschien is dit Valuta record niet gemaakt voor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Voor &#39;Product Bundel&#39; items, Warehouse, Serienummer en Batch Geen zal worden beschouwd van de &#39;Packing List&#39; tafel. Als Warehouse en Batch Geen zijn hetzelfde voor alle verpakking items voor welke &#39;Product Bundle&#39; punt, kunnen die waarden in de belangrijkste Item tafel worden ingevoerd, wordt waarden worden gekopieerd naar &quot;Packing List &#39;tafel."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Voor &#39;Product Bundel&#39; items, Warehouse, Serienummer en Batch Geen zal worden beschouwd van de &#39;Packing List&#39; tafel. Als Warehouse en Batch Geen zijn hetzelfde voor alle verpakking items voor welke &#39;Product Bundle&#39; punt, kunnen die waarden in de belangrijkste Item tafel worden ingevoerd, wordt waarden worden gekopieerd naar &quot;Packing List &#39;tafel."
 DocType: Student Admission,Publish on website,Publiceren op de website
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
+DocType: Subscription,Cancelation Date,Annuleringsdatum
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
 DocType: Agriculture Task,Agriculture Task,Landbouwtaak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirecte Inkomsten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirecte Inkomsten
 DocType: Student Attendance Tool,Student Attendance Tool,Student Attendance Tool
 DocType: Restaurant Menu,Price List (Auto created),Prijslijst (automatisch aangemaakt)
 DocType: Cheque Print Template,Date Settings,date Settings
@@ -1349,6 +1342,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Labetesten van datetime kan niet vóór verzameling datetime zijn
+DocType: Subscription Plan,Cost,Kosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
 DocType: Expense Claim,Total Advance Amount,Totaal voorschotbedrag
 DocType: Delivery Stop,Estimated Arrival,Geschatte aankomst
@@ -1360,15 +1354,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Wit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rij {0}: Aantal niet beschikbaar voor {4} in het magazijn van {1} op het plaatsen van tijd van de invoer ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,U kunt maximaal één optie selecteren in de lijst met selectievakjes.
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
 DocType: Item,Automatically Create New Batch,Maak automatisch een nieuwe partij aan
 DocType: Item,Automatically Create New Batch,Maak automatisch een nieuwe partij aan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} toewijzen aan {1} (rij {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Maken
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} toewijzen aan {1} (rij {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Maken
 DocType: Student Admission,Admission Start Date,Entree Startdatum
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nieuwe medewerker
@@ -1384,7 +1378,7 @@
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 DocType: Repayment Schedule,Balance Loan Amount,Balans Leningsbedrag
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Aandelenopties
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Aandelenopties
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Schakel het ophalen van de laatste aankoopdetails in de bestelling uit
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Wilt u deze schrapte activa echt herstellen?
@@ -1403,11 +1397,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakbon Artikel
 DocType: Purchase Invoice,Cash/Bank Account,Kas/Bankrekening
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Geef een {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Het maken van varianten is in de wachtrij geplaatst.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Werkoverzicht voor {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Attributentabel is verplicht
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,De eerste verlof goedkeurder in de lijst zal worden ingesteld als de standaard verlof goedkeurder.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Plan,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kan niet negatief zijn
 DocType: Training Event,Self-Study,Zelfstudie
@@ -1419,7 +1414,7 @@
 DocType: Workstation,Wages,Loon
 DocType: Asset Maintenance,Maintenance Manager Name,Naam onderhoudsmanager
 DocType: Agriculture Task,Urgent,Dringend
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan variabele niet vinden:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Selecteer alstublieft een veld om van numpad te bewerken
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Kan geen vast activumartikel zijn omdat het grootboek Voorraad wordt gecreëerd.
@@ -1431,7 +1426,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kwaliteit inspectiesjabloon naam
 DocType: Project,First Email,Eerste e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selling Bedrag
 DocType: Repayment Schedule,Interest Amount,Interestbedrag
 DocType: Serial No,Creation Document No,Aanmaken Document nr
 DocType: Share Transfer,Issue,Kwestie
@@ -1445,10 +1440,10 @@
 DocType: Tax Rule,Shipping State,Scheepvaart State
 ,Projected Quantity as Source,Geprojecteerd Hoeveelheid als Bron
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Levering reis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Levering reis
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Overdrachtstype
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Verkoopkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Verkoopkosten
 DocType: Consultation,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
@@ -1457,12 +1452,13 @@
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postcode
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} is {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Selecteer rente-inkomstenrekening in lening {0}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Maken Stock Inzendingen
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
 DocType: Item,Default Supplier,Standaardleverancier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Production Allowance Percentage
-DocType: Employee Loan,Repayment Schedule,Terugbetalingsschema
+DocType: Loan,Repayment Schedule,Terugbetalingsschema
 DocType: Shipping Rule Condition,Shipping Rule Condition,Verzendregel Voorwaarde
 DocType: Holiday List,Get Weekly Off Dates,Ontvang wekelijkse Uit Data
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
@@ -1477,7 +1473,7 @@
 DocType: Education Settings,Attendance Freeze Date,Bijwonen Vries Datum
 DocType: Education Settings,Attendance Freeze Date,Bijwonen Vries Datum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Bekijk alle producten
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Bekijk alle producten
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum leeftijd (dagen)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,alle stuklijsten
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Hotelkamers van het type {0} zijn niet beschikbaar op {1}
@@ -1485,14 +1481,16 @@
 DocType: Expense Claim,From Employee,Van Medewerker
 DocType: Driver,Cellphone Number,mobiel nummer
 DocType: Project,Monitor Progress,Voortgang in de gaten houden
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
 DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,Vervoer
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ongeldige attribuut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} moet worden ingediend
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Hoeveelheid moet kleiner dan of gelijk aan {0}
+DocType: Department Approver,Department Approver,Afdelingsmedewerker
 DocType: SMS Center,Total Characters,Totaal Tekens
 DocType: Employee Advance,Claimed,beweerde
 DocType: Crop,Row Spacing,Rijafstand
@@ -1502,6 +1500,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Afletteren Factuur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Bijdrage %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Conform de Aankoop Instellingen indien Aankoop Order Vereist == 'JA', dient de gebruiker eerst een Aankoop Order voor item {0} aan te maken om een Aankoop Factuur aan te kunnen maken"
+,HSN-wise-summary of outward supplies,HSN-wise-samenvatting van uitgaande benodigdheden
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Registratienummers van de onderneming voor uw referentie. Fiscale nummers, enz."
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
@@ -1515,7 +1514,7 @@
 DocType: Setup Progress Action,Action Name,Actie Naam
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Jaar
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},De eerste 2 cijfers van GSTIN moeten overeenkomen met staat nummer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Begindatum van de huidige factuurperiode
 DocType: Salary Slip,Leave Without Pay,Onbetaald verlof
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Capacity Planning Fout
@@ -1533,26 +1532,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Velden worden alleen gekopieerd op het moment van creatie.
 DocType: Setup Progress Action,Domains,Domeinen
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Beheer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Beheer
 DocType: Cheque Print Template,Payer Settings,Payer Instellingen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
 DocType: Purchase Invoice,Is Return,Is Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Voorzichtigheid
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Startdag is groter dan einddag in taak &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / betaalkaart Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / betaalkaart Note
 DocType: Price List Country,Price List Country,Prijslijst Land
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelcode kan niet worden gewijzigd voor Serienummer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Artikelcode kan niet worden gewijzigd voor Serienummer
 DocType: Purchase Invoice Item,UOM Conversion Factor,Eenheid Omrekeningsfactor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vul de artikelcode voor Batch Number krijgen
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
-DocType: Employee Loan,Partially Disbursed,gedeeltelijk uitbetaald
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Informatie verstrekken.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Informatie verstrekken.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverancierbestand
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,U kunt een Abonnement dat niet is geannuleerd niet opnieuw opstarten.
 DocType: Account,Balance Sheet,Balans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
 DocType: Fee Validity,Valid Till,Geldig tot
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Totale ouder lerarenbijeenkomst
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
@@ -1565,7 +1564,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Het wijzigen van de klantengroep voor de geselecteerde klant is niet toegestaan.
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Bijwerken geschatte aankomsttijden.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Bijwerken geschatte aankomsttijden.
 DocType: Program Enrollment Tool,Enrollment Details,Inschrijfgegevens
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Selecteer een klant alsjeblieft
@@ -1586,18 +1585,20 @@
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Purchase Order,Group same items,Groep dezelfde items
 DocType: Purchase Invoice,Disable Rounded Total,Deactiveer Afgerond Totaal
-DocType: Employee Loan Application,Repayment Info,terugbetaling Info
+DocType: Department,Parent Department,Ouderafdeling
+DocType: Loan Application,Repayment Info,terugbetaling Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 DocType: Maintenance Team Member,Maintenance Role,Onderhoudsrol
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Het opzetten van Werknemers
 DocType: Sales Order,SO-,ZO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservering Gebruiker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Selecteer eerst een voorvoegsel
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,onderzoek
+DocType: Subscription Settings,Subscription Settings,Abonnementsinstellingen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,onderzoek
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Gelieve ten minste één attribuut in de tabel attributen opgeven
 DocType: Announcement,All Students,Alle studenten
@@ -1608,19 +1609,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 DocType: Crop Cycle,Less than a year,Minder dan een jaar
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 DocType: Crop,Yield UOM,Opbrengst UOM
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
 DocType: Item,Is Item from Hub,Is item van Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rij {0}: Activiteit Type is verplicht.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividenden betaald
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividenden betaald
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Boekhoudboek
 DocType: Stock Reconciliation,Difference Amount,Verschil Bedrag
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} bij Verlof op {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Ingehouden winsten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Ingehouden winsten
 DocType: Purchase Invoice,05-Change in POS,05-Verandering in POS
 DocType: Vehicle Log,Service Detail,dienst Detail
 DocType: BOM,Item Description,Artikelomschrijving
@@ -1635,12 +1636,12 @@
 DocType: Opportunity Item,Opportunity Item,Opportuniteit artikel
 ,Student and Guardian Contact Details,Student and Guardian Contactgegevens
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Rij {0}: Voor leveranciers {0} e-mailadres is vereist om e-mail te sturen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tijdelijke Opening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Tijdelijke Opening
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Hub bekijken
 ,Employee Leave Balance,Werknemer Verlof Balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 DocType: Patient Appointment,More Info,Meer info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard Acties
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Voorbeeld: Masters in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Afgewezen Magazijn
@@ -1650,7 +1651,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,naar
 DocType: Supplier Quotation Item,Lead Time in days,Levertijd in dagen
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Crediteuren Samenvatting
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},De betaling van het salaris van {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},De betaling van het salaris van {0} tot {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
@@ -1659,9 +1660,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Klein
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Het item voor het creëren van facturen openen
 DocType: Education Settings,Employee Number,Werknemer Nummer
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Factuur na genadeperiode annuleren
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
 DocType: Project,% Completed,% Voltooid
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
@@ -1675,7 +1677,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoriumtest Datetime
 DocType: Email Digest,Add Quote,Quote voegen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirecte Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
 DocType: Agriculture Analysis Criteria,Agriculture,landbouw
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1706,16 +1708,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaalgoederen
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Stel eerst de productcode in
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
+DocType: Subscription Plan,Billing Interval Count,Factuurinterval tellen
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 DocType: Antibiotic,Antibiotic,Antibioticum
 ,Team Updates,team updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Instellen Account Type helpt bij het selecteren van deze account in transacties.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Munt)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Maak Print Format
@@ -1741,7 +1744,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatief artikel mag niet hetzelfde zijn als artikelcode
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalisatie van voorlopige beoordeling
 DocType: Salary Slip,Bank Account No.,Bankrekeningnummer
@@ -1757,7 +1760,7 @@
 DocType: BOM Operation,Workstation,Werkstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offerte Supplier
 DocType: Healthcare Settings,Registration Message,Registratie Bericht
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,hardware
 DocType: Prescription Dosage,Prescription Dosage,Voorschrift Dosering
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Selecteer aub een andere vennootschap
@@ -1788,7 +1791,7 @@
 DocType: Project,Start and End Dates,Begin- en einddatum
 ,Delivered Items To Be Billed,Geleverde Artikelen nog te factureren
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
 DocType: Project Update,Great/Quickly,Great / Snel
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1797,8 +1800,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Selecteer batches voor batched item
 DocType: Asset,Depreciation Schedules,afschrijvingen Roosters
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Volgende accounts kunnen worden geselecteerd in GST-instellingen:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Volgende accounts kunnen worden geselecteerd in GST-instellingen:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 DocType: Payment Request,Transaction Currency,transactie Munt
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Van {0} | {1} {2}
@@ -1809,6 +1812,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Gem Daily Uitgaande
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Naam en Type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Goedkeuring Status moet worden ' goedgekeurd ' of ' Afgewezen '
 DocType: Physician,Contacts and Address,Contacten en adres
 DocType: Purchase Invoice,Contact Person,Contactpersoon
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Verwacht Startdatum' kan niet groter zijn dan 'Verwachte Einddatum'
@@ -1822,19 +1826,20 @@
 DocType: Student Admission,Eligibility and Details,Geschiktheid en details
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Netto wijziging in vaste activa
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offerte is uitgeschakeld om de toegang van portal, voor meer controle portaal instellingen."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverancier Scorecard Scorevariabele
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Aankoop Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Aankoop Bedrag
 DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Er zijn fouten opgetreden bij het maken van cursusplanning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,De eerste onkostende goedkeurder in de lijst wordt ingesteld als de standaard kostenaannemer.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,mag niet groter zijn dan 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Detail,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
@@ -1855,15 +1860,16 @@
 DocType: Package Code,Package Code,Package Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,leerling
 DocType: Purchase Invoice,Company GSTIN,Bedrijf GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Belasting detail tafel haalden van post meester als een string en opgeslagen in dit gebied.
  Gebruikt voor en -heffingen"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Rekening ingave voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Verlaat Approver Verplicht in verlof applicatie
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Fiscale Regel voor transacties.
@@ -1891,15 +1897,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,De betalingstermijn op rij {0} is mogelijk een duplicaat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Landbouw (bèta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kantoorhuur
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Instellingen SMS gateway
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakbon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantoorhuur
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Instellingen SMS gateway
 DocType: Disease,Common Name,Gemeenschappelijke naam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Importeren mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Werkstation Werkuur
 DocType: Vital Signs,Blood Pressure,Bloeddruk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,analist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,analist
 DocType: Item,Inventory,Voorraad
 DocType: Item,Sales Details,Verkoop Details
 DocType: Quality Inspection,QI-,Qi-
@@ -1909,15 +1915,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Valideer ingeschreven cursus voor studenten in de studentengroep
 DocType: Notification Control,Expense Claim Rejected,Kostendeclaratie afgewezen
 DocType: Item,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Overheid
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Overheid
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Declaratie {0} bestaat al voor de Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,naam van het instituut
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Vul hier terug te betalen bedrag
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Vul hier terug te betalen bedrag
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Item Varianten
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,E-mail loonstrook te Employee
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Stel mogelijke Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Stel mogelijke Leverancier
 DocType: Sales Invoice,Source,Bron
 DocType: Customer,"Select, to make the customer searchable with these fields","Selecteer, om de klant doorzoekbaar te maken met deze velden"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Toon gesloten
@@ -1934,7 +1940,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakbon(nen) geannuleerd
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,De cashflow uit investeringsactiviteiten
 DocType: Program Course,Program Course,programma Course
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Vracht-en verzendkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Homepage,Company Tagline for website homepage,Company Tag voor website homepage
 DocType: Item Group,Item Group Name,Artikel groepsnaam
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen
@@ -1964,10 +1970,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Gegevens over lidmaatschap
 DocType: Leave Block List,Block Holidays on important days.,Blokkeer vakantie op belangrijke dagen.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Voer alle vereiste resultaatwaarde (n) in
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Debiteuren Samenvatting
-DocType: Employee Loan,Monthly Repayment Amount,Maandelijks te betalen bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Debiteuren Samenvatting
+DocType: Loan,Monthly Repayment Amount,Maandelijks te betalen bedrag
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Facturen openen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
 DocType: UOM,UOM Name,Eenheid Naam
 DocType: GST HSN Code,HSN Code,HSN-code
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Bijdrage hoeveelheid
@@ -1989,7 +1995,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Gebruiker {0} is al toegewezen aan Arts {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Doos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mogelijke Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mogelijke Leverancier
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Maandelijkse Verdeling
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Ontvanger Lijst is leeg. Maak Ontvanger Lijst
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Gezondheidszorg (beta)
@@ -2017,7 +2024,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Geen Artikelen om te verpakken
 DocType: Shipping Rule Condition,From Value,Van Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
-DocType: Employee Loan,Repayment Method,terugbetaling Method
+DocType: Loan,Repayment Method,terugbetaling Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Indien aangevinkt, zal de startpagina de standaard Item Group voor de website"
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Claims voor bedrijfsonkosten
@@ -2026,7 +2033,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificaat vereist
 DocType: Company,Default Holiday List,Standaard Vakantiedagen Lijst
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rij {0}: Van tijd en de tijd van de {1} overlapt met {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Voorraad Verplichtingen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Invoice,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Selecteer Bedrijf
@@ -2034,7 +2041,7 @@
 DocType: Student Report Generation Tool,Print Section,Print sectie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Gebruiker {0} heeft geen standaard POS-profiel. Schakel Standaard in rij {1} voor deze gebruiker in.
 DocType: Student Group,Set 0 for no limit,Stel 0 voor geen limiet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Rij {idx}: {field} is vereist om de opening {invoice_type} facturen te maken
 DocType: Customer,Primary Address and Contact Detail,Primaire adres en contactgegevens
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,E-mail opnieuw te verzenden Betaling
@@ -2045,10 +2052,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Selecteer minimaal één domein.
 DocType: Dependent Task,Dependent Task,Afhankelijke taak
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
 DocType: SMS Center,Receiver List,Ontvanger Lijst
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Zoekitem
 DocType: Payment Schedule,Payment Amount,Betaling Bedrag
@@ -2058,7 +2065,7 @@
 DocType: Assessment Plan,Grading Scale,Grading Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Reeds voltooid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Voorraad in de hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Voorraad in de hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importeren succesvol!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
@@ -2069,17 +2076,16 @@
 DocType: Quotation Item,Quotation Item,Offerte Artikel
 DocType: Customer,Customer POS Id,Klant POS-id
 DocType: Account,Account Name,Rekening Naam
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} hoeveelheid {1} moet een geheel getal zijn
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} hoeveelheid {1} moet een geheel getal zijn
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Voer de URL van de Woocommerce-server in
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverancier Type stam.
 DocType: Purchase Order Item,Supplier Part Number,Leverancier Onderdeelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
 DocType: Share Balance,To No,Naar Nee
-DocType: Subscription,Reference Document,Referentie document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} is geannuleerd of gestopt
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,aanvrager Type
+DocType: Loan,Applicant Type,aanvrager Type
 DocType: Purchase Invoice,03-Deficiency in services,03-Deficiency in services
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Vertrekdatum
 DocType: Healthcare Settings,Default Medical Code Standard,Standaard Medische Code Standaard
@@ -2090,13 +2096,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% gefactureerd
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Human Resources
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Human Resources
 DocType: Lead,Upper Income,Bovenste Inkomen
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,afwijzen
 DocType: Journal Entry Account,Debit in Company Currency,Debet in Company Valuta
 DocType: BOM Item,BOM Item,Stuklijst Artikel
 DocType: Appraisal,For Employee,Voor Werknemer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Maak uitbetaling Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Maak uitbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
 DocType: Company,Default Values,Standaard Waarden
 DocType: Membership,INR,INR
@@ -2126,10 +2132,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter zijn dan 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Beschikbare voorraad
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Beschikbare voorraad
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning Voor (Dagen)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Inkoop
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Verplicht veld - Programma
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Verplicht veld - Programma
 DocType: Special Test Template,Result Component,Resultaatcomponent
@@ -2150,7 +2156,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Inclusief vakantie binnen bladeren als bladeren
 DocType: Sales Invoice,Packed Items,Verpakt Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantie Claim tegen Serienummer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Totaal&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Totaal&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Inschakelen Winkelwagen
 DocType: Employee,Permanent Address,Vast Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2168,10 +2174,10 @@
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Bevestig actie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,online Veilingen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Vervulling
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Bekijk in winkelwagen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kan geen standaardcriteria maken. Wijzig de naam van de criteria
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
@@ -2194,9 +2200,9 @@
 DocType: Upload Attendance,Get Template,Get Sjabloon
 DocType: Material Request,Transferred,overgedragen
 DocType: Vehicle,Doors,deuren
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup is voltooid!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup is voltooid!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Verzamelkosten voor patiëntregistratie
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan attributen na beurstransactie niet wijzigen. Maak een nieuw artikel en breng aandelen over naar het nieuwe item
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan attributen na beurstransactie niet wijzigen. Maak een nieuw artikel en breng aandelen over naar het nieuwe item
 DocType: Course Assessment Criteria,Weightage,Weging
 DocType: Purchase Invoice,Tax Breakup,Belastingverdeling
 DocType: Packing Slip,PS-,PS-
@@ -2232,12 +2238,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Purchase Invoice Item,Batch No,Partij nr.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Voorschotten voor werknemers
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 DocType: Grant Application,Assessment  Mark (Out of 10),Beoordelingstabel (van de 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Hoofd
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
@@ -2246,15 +2253,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht"
 DocType: Email Digest,Annual Expenses,jaarlijkse kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewezen bedrag
 DocType: Sales Team,Contribution to Net Total,Bijdrage aan Netto Totaal
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
 DocType: Territory,Territory Name,Regio Naam
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,U kunt alleen abonnementen met dezelfde betalingscyclus in een abonnement hebben
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidaat voor een baan.
 DocType: Purchase Order Item,Warehouse and Reference,Magazijn en Referentie
 DocType: Supplier,Statutory info and other general information about your Supplier,Wettelijke info en andere algemene informatie over uw leverancier
@@ -2265,10 +2273,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,taxaties
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Trainingsevenementen
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Leads bijhouden op leadbron.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Kom binnen alstublieft
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Kom binnen alstublieft
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Onderhoudslogboek
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Het nettogewicht van dit pakket. (Wordt automatisch berekend als de som van de netto-gewicht van de artikelen)
@@ -2276,11 +2284,11 @@
 DocType: Sales Order,To Deliver and Bill,Te leveren en Bill
 DocType: Student Group,Instructors,instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Share Management
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Betaling
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Magazijn {0} is niet gekoppeld aan een account, vermeld alstublieft het account in het magazijnrecord of stel de standaard inventaris rekening in bedrijf {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Beheer uw bestellingen
 DocType: Work Order Operation,Actual Time and Cost,Werkelijke Tijd en kosten
@@ -2290,7 +2298,7 @@
 DocType: Student Leave Application,Student Leave Application,Student verlofaanvraag
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Op
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
@@ -2300,7 +2308,7 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,associëren
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,associëren
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Werkorder {0} moet worden ingediend
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,nieuwe winkelwagen
@@ -2318,13 +2326,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Factuurvaluta moet gelijk zijn aan de valuta van het standaardbedrijf of de valuta van het partijaccount
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 DocType: Soil Texture,Loam,Leem
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rij {0}: vervaldatum kan niet vóór de boekingsdatum zijn
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rij {0}: vervaldatum kan niet vóór de boekingsdatum zijn
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
 ,Sales Invoice Trends,Verkoopfactuur Trends
 DocType: Leave Application,Apply / Approve Leaves,Toepassing / Goedkeuren Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Voor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan de rij enkel verwijzen bij het aanrekeningstype 'Hoeveelheid vorige rij' of 'Totaal vorige rij'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan de rij enkel verwijzen bij het aanrekeningstype 'Hoeveelheid vorige rij' of 'Totaal vorige rij'
 DocType: Sales Order Item,Delivery Warehouse,Levering magazijn
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Boom van de financiële Cost Centers.
 DocType: Serial No,Delivery Document No,Leveringsdocument nr.
@@ -2338,7 +2345,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materiaalverbruik is niet ingesteld in Productie-instellingen.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Heeft Varianten
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan niet overbilleren voor item {0} in rij {1} meer dan {2}. Om overrekening toe te staan, stel in Voorraad Instellingen in"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan niet overbilleren voor item {0} in rij {1} meer dan {2}. Om overrekening toe te staan, stel in Voorraad Instellingen in"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Update reactie
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
@@ -2350,12 +2357,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Selecteer eerst het programma
 DocType: Patient Appointment,Patient Age,Patiënt leeftijd
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Managing Projects
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serienummer {0} is al geretourneerd
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serienummer {0} is al geretourneerd
 DocType: Supplier,Supplier of Goods or Services.,Leverancier van goederen of diensten.
 DocType: Budget,Fiscal Year,Boekjaar
 DocType: Asset Maintenance Log,Planned,Gepland
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standaard debiteurenrekening die gebruikt moet worden indien niet in Patiënt ingesteld om te reserveren.
 DocType: Vehicle Log,Fuel Price,Fuel Price
+DocType: Bank Guarantee,Margin Money,Marge geld
 DocType: Budget,Budget,Begroting
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Stel Open
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
@@ -2369,16 +2377,16 @@
 DocType: Lead,Follow Up,Opvolgen
 DocType: Item,Is Sales Item,Is verkoopartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikel groepstructuur
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
 DocType: Maintenance Visit,Maintenance Time,Onderhoud Tijd
 ,Amount to Deliver,Bedrag te leveren
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Hetzelfde item is meerdere keren ingevoerd. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Start datum kan niet eerder dan het jaar startdatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Er zijn fouten opgetreden.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Werknemer {0} heeft al een aanvraag ingediend voor {1} tussen {2} en {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Er zijn fouten opgetreden.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Werknemer {0} heeft al een aanvraag ingediend voor {1} tussen {2} en {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesses
 DocType: Naming Series,Current Value,Huidige waarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
 DocType: Education Settings,Instructor Records to be created by,Instructor Records te creëren door
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} aangemaakt
 DocType: GST Account,GST Account,GST-account
@@ -2398,8 +2406,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Toegevoegd aan favorieten
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrook gevonden om in te dienen voor de hierboven geselecteerde criteria OF salarisstrook al ingediend
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Invoerrechten en Belastingen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrook gevonden om in te dienen voor de hierboven geselecteerde criteria OF salarisstrook al ingediend
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Invoerrechten en Belastingen
 DocType: Projects Settings,Projects Settings,Projectinstellingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vul Peildatum in
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
@@ -2409,27 +2417,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Boom van Artikelgroepen .
 DocType: Production Plan,Total Produced Qty,Totaal geproduceerd aantal
 DocType: Payroll Entry,Get Employee Details,Krijg medewerkersgegevens
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
 DocType: Asset,Sold,uitverkocht
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
 DocType: Account,Frozen,Bevroren
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbedrag (Company Munt)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Grondstoffen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Grondstoffen
 DocType: Payment Reconciliation Payment,Reference Row,Referentie Row
 DocType: Installation Note,Installation Time,Installatie Tijd
 DocType: Sales Invoice,Accounting Details,Boekhouding Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Verwijder alle transacties voor dit bedrijf
 DocType: Patient,O Positive,O Positief
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investeringen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Toekenningen
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptatiecriteria
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Geen terugbetalingen beschikbaar voor journaalboeking
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 DocType: BOM,Show In Website,Toon in Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Toon Hoeveelheid in Website
-DocType: Employee Loan Application,Total Payable Amount,Totaal te betalen bedrag
+DocType: Loan Application,Total Payable Amount,Totaal te betalen bedrag
 DocType: Task,Expected Time (in hours),Verwachte Tijd (in uren)
 DocType: Item Reorder,Check in (group),Check-in (groeps)
 DocType: Soil Texture,Silt,Slib
@@ -2448,7 +2457,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Betaling maken
 DocType: Room,Room Name,Kamer naam
 DocType: Prescription Duration,Prescription Duration,Voorschrift Duur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Klant adressen en contacten
 ,Campaign Efficiency,Campagne-efficiëntie
@@ -2467,11 +2476,11 @@
 DocType: Chapter,Chapter,Hoofdstuk
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,paar
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Het standaardaccount wordt automatisch bijgewerkt in POS Invoice wanneer deze modus is geselecteerd.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
 DocType: Asset,Depreciation Schedule,afschrijving Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Verkooppartneradressen en contactpersonen
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Halve dag datum moet zijn tussen Van Datum en To Date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Halve dag datum moet zijn tussen Van Datum en To Date
 DocType: Maintenance Schedule Detail,Actual Date,Werkelijke Datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Stel het standaard kostenplaatsadres in {0} bedrijf in.
 DocType: Item,Has Batch No,Heeft Batch nr.
@@ -2489,7 +2498,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie)
 DocType: Soil Texture,Soil Type,Grondsoort
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nieuw bericht
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2509,7 +2517,7 @@
 DocType: Hub Category,Hub Category,Hubcategorie
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
-DocType: Employee Loan,Loan Amount,Leenbedrag
+DocType: Loan,Loan Amount,Leenbedrag
 DocType: Student Report Generation Tool,Add Letterhead,Voeg briefhoofd toe
 DocType: Program Enrollment,Self-Driving Vehicle,Zelfrijdend voertuig
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverancier Scorecard Standing
@@ -2538,9 +2546,9 @@
 DocType: Cash Flow Mapper,Position,Positie
 DocType: Patient,Patient Details,Patient Details
 DocType: Patient,B Positive,B positief
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Groep om Non-groep
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2548,8 +2556,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totaal Werkelijke
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,student Broers en zussen
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonnementsplan Detail
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,eenheid
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Specificeer Bedrijf
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Specificeer Bedrijf
 ,Customer Acquisition and Loyalty,Klantenwerving en behoud
 DocType: Asset Maintenance Task,Maintenance Task,Onderhoudstaak
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Stel B2C-limiet in GST-instellingen in.
@@ -2564,6 +2573,7 @@
 ,BOM Search,BOM Zoeken
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Totale verbruikte materiaalkosten (via voorraadinvoer)
 DocType: Hub Settings,Company Registered,Bedrijf geregistreerd
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Tot op heden kan niet minder zijn dan Van datum
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiceer &#39;In voorraad&#39; of &#39;Niet op voorraad&#39; op Hub op basis van de voorraad die beschikbaar is in dit magazijn.
 DocType: Vehicle,Fuel Type,Brandstoftype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Omschrijf valuta Company
@@ -2571,17 +2581,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Material Aanvragen werden automatisch verhoogd op basis van re-order niveau-item
 DocType: Email Digest,Pending Sales Orders,In afwachting van klantorders
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
 DocType: Employee,Create User Permission,Maak gebruiker toestemming
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 DocType: Healthcare Settings,Remind Before,Herinner je alvast
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
 DocType: Salary Component,Deduction,Aftrek
 DocType: Item,Retain Sample,Bewaar monster
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rij {0}: Van tijd en binnen Tijd is verplicht.
 DocType: Stock Reconciliation Item,Amount Difference,bedrag Verschil
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vul Employee Id van deze verkoper
 DocType: Territory,Classification of Customers by region,Indeling van de klanten per regio
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,In de maak
@@ -2591,8 +2602,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berekende bankafschrift balans
 DocType: Normal Test Template,Normal Test Template,Normaal Testsjabloon
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Uitgeschakelde gebruiker
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Offerte
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Kan geen ontvangen RFQ zonder citaat instellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Offerte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Kan geen ontvangen RFQ zonder citaat instellen
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Selecteer een account om in rekeningsvaluta af te drukken
@@ -2600,7 +2611,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseerd op transacties tegen deze patiënt. Zie de tijdlijn hieronder voor details
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kosten Bijgewerkt
 DocType: Patient,Date of Birth,Geboortedatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Artikel {0} is al geretourneerd
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leveranciers Scorecard Setup
@@ -2611,14 +2622,15 @@
 DocType: Work Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Functiebeschrijving
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Functiebeschrijving
 DocType: Student Applicant,Applied,Toegepast
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Heropenen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Heropenen
 DocType: Sales Invoice Item,Qty as per Stock UOM,Aantal per Voorraad eenheid
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Naam
 DocType: Purchase Invoice,02-Post Sale Discount,Korting na verkoop
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment."
+DocType: Department Approver,Approver,Goedkeurder
 ,SO Qty,VO Aantal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Het veld Naar aandeelhouder mag niet leeg zijn
 DocType: Guardian,Work Address,Werk adres
@@ -2632,21 +2644,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totaal toegewezen bedrag (Company Munt)
 DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
 DocType: BOM,Scrap Material Cost,Scrap Materiaal Cost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
 DocType: Grant Application,Email Notification Sent,E-mailmelding verzonden
 DocType: Purchase Invoice,In Words (Company Currency),In Woorden (Bedrijfsvaluta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Artikelcode, magazijn, aantal is verplicht op rij"
-DocType: Pricing Rule,Supplier,Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Artikelcode, magazijn, aantal is verplicht op rij"
+DocType: Bank Guarantee,Supplier,Leverancier
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Toon betalingsgegevens
 DocType: Consultation,Consultation Time,Raadplegingstijd
 DocType: C-Form,Quarter,Kwartaal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Diverse Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Diverse Kosten
 DocType: Global Defaults,Default Company,Standaard Bedrijf
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kosten- of verschillenrekening is verplicht voor artikel {0} omdat het invloed heeft op de totale voorraadwaarde
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banknaam
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Boven
-DocType: Employee Loan,Employee Loan Account,Werknemer Leningsrekening
 DocType: Leave Application,Total Leave Days,Totaal verlofdagen
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opmerking: E-mail wordt niet verzonden naar uitgeschakelde gebruikers
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Aantal interacties
@@ -2661,7 +2672,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Gewicht (in kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",hoofdstukken / hoofdstuknaam blanco laten automatisch ingesteld na hoofdstuk opslaan.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Stel GST-accounts in via GST-instellingen
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Stel GST-accounts in via GST-instellingen
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Soort bedrijf
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kosten van nieuwe aankoop
@@ -2670,12 +2681,13 @@
 DocType: Grant Application,Grant Description,Grant Description
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
 DocType: Student Guardian,Others,anderen
+DocType: Subscription,Discounts,Kortingen
 DocType: Payment Entry,Unallocated Amount,Niet-toegewezen bedrag
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Een Product of een Dienst dat wordt gekocht, verkocht of in voorraad wordt gehouden."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Niet meer updates
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Dit omvat alle scorecards die aan deze Setup zijn gekoppeld
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Onderliggend item mag geen productbundel zijn. Gelieve item `{0}` te verwijderen en op te slaan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankieren
@@ -2684,21 +2696,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik op 'Genereer Planning' om planning te krijgen
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup&gt; Nummeringserie
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Grading Scale,Grading Scale Intervals,Grading afleeseenheden
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Jaarwinst
+DocType: Bank Guarantee,Name of Bank,Naam van de bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry voor {2} kan alleen worden gemaakt in valuta: {3}
 DocType: Fee Schedule,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Boom van de financiële rekeningen.
+DocType: Bank Guarantee,Reference Document Type,Referentie Document Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cash Flow Mapping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Geserialiseerde Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mailadres niet gevonden in standaardcontact
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genereer geheim
-DocType: Employee Loan,Account Info,Account informatie
+DocType: Loan,Account Info,Account informatie
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
 DocType: Fees,Include Payment,Inclusief betaling
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentgroepen aangemaakt.
@@ -2706,24 +2721,24 @@
 DocType: Sales Invoice,Total Billing Amount,Totaal factuurbedrag
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Het programma in de kostenstructuur en studentengroep {0} verschilt.
 DocType: Fee Schedule,Receivable Account,Vorderingen Account
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
 DocType: Quotation Item,Stock Balance,Voorraad Saldo
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Sales om de betaling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Directeur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Directeur
 DocType: Purchase Invoice,With Payment of Tax,Met betaling van de belasting
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE VOOR LEVERANCIER
 DocType: Land Unit,Is Container,Is Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Dit wordt dag 1 van de gewascyclus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Selecteer juiste account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Selecteer juiste account
 DocType: Purchase Invoice Item,Weight UOM,Gewicht Eenheid
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lijst met beschikbare aandeelhouders met folionummers
 DocType: Salary Structure Employee,Salary Structure Employee,Salarisstructuur Employee
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Show Variant Attributes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Show Variant Attributes
 DocType: Student,Blood Group,Bloedgroep
 DocType: Course,Course Name,Cursus naam
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers die verlofaanvragen een bepaalde werknemer kan goedkeuren
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kantoor Apparatuur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kantoor Apparatuur
 DocType: Purchase Invoice Item,Qty,Aantal
 DocType: Fiscal Year,Companies,Bedrijven
 DocType: Supplier Scorecard,Scoring Setup,Scoring instellen
@@ -2742,7 +2757,7 @@
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debet Om vereist
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Purchase Price List
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sjablonen van leveranciers scorecard variabelen.
 DocType: Job Offer Term,Offer Term,Aanbod Term
 DocType: Asset,Quality Manager,Quality Manager
@@ -2754,13 +2769,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Totaal Onbetaalde: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 DocType: Supplier Scorecard,Supplier Score,Leverancierscore
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Totale gefactureerde Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Totale gefactureerde Amt
 DocType: Supplier,Warn RFQs,Waarschuw RFQs
 DocType: BOM,Conversion Rate,Conversion Rate
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,product zoeken
 DocType: Assessment Plan,To Time,Tot Tijd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
+DocType: Loan,Total Amount Paid,Totaal betaald bedrag
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selecteer een studententoelating die verplicht is voor de betaalde student-aanvrager
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Selecteer een prijslijst om prijzen te publiceren
@@ -2770,19 +2786,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rij {0}: Voltooid Aantal kan niet meer zijn dan {1} voor de bediening {2}
 DocType: Manufacturing Settings,Allow Overtime,Laat Overwerk
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan niet worden bijgewerkt met Stock Reconciliation, gebruik dan Voorraadinvoer"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan niet worden bijgewerkt met Stock Reconciliation, gebruik dan Voorraadinvoer"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan niet worden bijgewerkt met Stock Reconciliation, gebruik dan Voorraadinvoer"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan niet worden bijgewerkt met Stock Reconciliation, gebruik dan Voorraadinvoer"
 DocType: Training Event Employee,Training Event Employee,Training Event Medewerker
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximum aantal voorbeelden - {0} kan worden bewaard voor batch {1} en item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Voeg tijdslots toe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Valuation Rate
 DocType: Training Event,Advance,Van te voren
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,om weer terug te keren.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless betalingsgateway-instellingen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange winst / verlies
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange winst / verlies
 DocType: Opportunity,Lost Reason,Reden van verlies
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rij # {0}: account {1} hoort niet bij bedrijf {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rij # {0}: account {1} hoort niet bij bedrijf {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kon DocType {0} niet vinden
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
@@ -2801,7 +2816,6 @@
 DocType: Bin,Actual Quantity,Werkelijke hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} niet gevonden
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonnement is {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Fee Schedule Programma
 DocType: Fee Schedule Program,Student Batch,student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,maak Student
@@ -2817,14 +2831,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Niet geleverd
 ,Bank Clearance Summary,Bankbewaring samenvatting
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail samenvattingen."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail samenvattingen."
 DocType: Appraisal Goal,Appraisal Goal,Beoordeling Doel
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Stel categorie voor?
 DocType: Stock Reconciliation Item,Current Amount,Huidige hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Gebouwen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Gebouwen
 DocType: Fee Schedule,Fee Structure,fee Structuur
 DocType: Timesheet Detail,Costing Amount,Costing Bedrag
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverancier&gt; leverancier type
 DocType: Student Admission Program,Application Fee,Aanvraagkosten
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Indienen salarisstrook
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maximum korting voor artikel {0} is {1} %
@@ -2832,12 +2845,13 @@
 DocType: Sales Partner,Address & Contacts,Adres & Contacten
 DocType: SMS Log,Sender Name,Naam afzender
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Criteria voor landbouwanalyse
+DocType: HR Settings,Leave Approval Notification Template,Laat goedkeuringsmeldingssjabloon achter
 DocType: POS Profile,[Select],[Selecteer]
 DocType: Vital Signs,Blood Pressure (diastolic),Bloeddruk (diastolische)
 DocType: SMS Log,Sent To,Verzenden Naar
 DocType: Agriculture Task,Holiday Management,Vakantie Management
 DocType: Payment Request,Make Sales Invoice,Maak verkoopfactuur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
 DocType: Company,For Reference Only.,Alleen voor referentie.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Arts {0} niet beschikbaar op {1}
@@ -2855,7 +2869,7 @@
 DocType: Employee,New Workplace,Nieuwe werkplek
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materiale consumptie
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Instellen als Gesloten
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Geen Artikel met Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Geen Artikel met Barcode {0}
 DocType: Normal Test Items,Require Result Value,Vereiste resultaatwaarde
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2870,19 +2884,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Geen actieve of default salarisstructuur gevonden voor werknemer {0} de uitgekozen datum
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
 DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Terugkerende
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping Template-details
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Leningbeheer
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Volg afzonderlijke baten en lasten over het product verticalen of divisies.
 DocType: Rename Tool,Rename Tool,Hernoem Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Show loonstrook
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Show loonstrook
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Verplaats Materiaal
 DocType: Fees,Send Payment Request,Verzend betalingsverzoek
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
 DocType: Water Analysis,Origin,Oorsprong
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Stel terugkerende na het opslaan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Selecteer verandering bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
@@ -2897,14 +2911,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Is de aansprakelijkheid van de inkomstenbelasting
 DocType: Grading Scale Interval,Grade Description,Grade Beschrijving
 DocType: Stock Entry,Purchase Receipt No,Ontvangstbevestiging nummer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Onderpand
 DocType: Sales Invoice, Shipping Bill Number,Scheepsbriefnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceerbaarheid
 DocType: Asset Maintenance Log,Actions performed,Uitgevoerde acties
 DocType: Cash Flow Mapper,Section Leader,Sectieleider
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Werknemer
+DocType: Bank Guarantee,Fixed Deposit Number,Vast deponeringsnummer
 DocType: Asset Repair,Failure Date,Failure Date
 DocType: Sample Collection,Collected Time,Verzamelde tijd
 DocType: Company,Sales Monthly History,Verkoop Maandelijkse Geschiedenis
@@ -2921,10 +2936,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Weet je zeker dat je deze afspraak wilt annuleren?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Prijsarrangement hotelkamer
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Abonnementsupdates ophalen
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Rekening {0} komt niet overeen met Bedrijf {1} in Rekeningmodus: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Cursus:
@@ -2934,7 +2950,7 @@
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Geen werkorders aangemaakt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Loonstrook van de werknemer {0} al gemaakt voor deze periode
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutisch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutisch
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
 DocType: Purchase Invoice,Credit To,Met dank aan
@@ -2952,7 +2968,7 @@
 DocType: Request for Quotation Supplier,No Quote,Geen citaat
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Gateway Account,Payment Account,Betaalrekening
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,compenserende Off
 DocType: Job Offer,Accepted,Geaccepteerd
@@ -2964,7 +2980,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Zorg ervoor dat u echt wilt alle transacties voor dit bedrijf te verwijderen. Uw stamgegevens zal blijven zoals het is. Deze actie kan niet ongedaan gemaakt worden.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Zoekresultaten
 DocType: Room,Room Number,Kamernummer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ongeldige referentie {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ongeldige referentie {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 DocType: Journal Entry Account,Payroll Entry,Payroll Entry
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Bekijk tarieven Records
@@ -2974,7 +2990,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 DocType: Item Variant Settings,Allow Rename Attribute Value,Toestaan Rename attribuutwaarde toestaan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 DocType: Restaurant,Invoice Series Prefix,Prefix voor factuurreeks
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
@@ -2982,8 +2998,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integratie met Google Maps is niet ingeschakeld
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} is niet ingediend
+DocType: Subscription,Trialling,proefprogramma
 DocType: Member,Membership Expiry Date,Vervaldatum lidmaatschap
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} moet negatief zijn in teruggave document
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} moet negatief zijn in teruggave document
 ,Minutes to First Response for Issues,Minuten naar First Response voor problemen
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,De naam van het instituut waarvoor u het opzetten van dit systeem.
@@ -3002,7 +3019,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Meeteenheid
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Opportunity
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Opportunity
 DocType: Operation,Default Workstation,Standaard Werkstation
 DocType: Notification Control,Expense Claim Approved Message,Kostendeclaratie Goedgekeurd Bericht
 DocType: Payment Entry,Deductions or Loss,Aftrek of verlies
@@ -3040,7 +3057,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Onbetaald verlof komt niet overeen met de goedgekeurde verlofaanvraag verslagen
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
 DocType: Membership,USD,Amerikaanse Dollar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Resterende saldo
@@ -3050,7 +3067,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindjaar
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 DocType: Driver,Driver,Bestuurder
 DocType: Vital Signs,Nutrition Values,Voedingswaarden
 DocType: Lab Test Template,Is billable,Is facturabel
@@ -3061,7 +3078,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Werkelijke Startdatum (via Urenregistratie)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Vergrijzing Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Het totale voorschotbedrag kan niet groter zijn dan het totaalbedrag waarvoor een claim is ingediend
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Het totale voorschotbedrag kan niet groter zijn dan het totaalbedrag waarvoor een claim is ingediend
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3116,7 +3133,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Selecteer kenmerkwaarden
 DocType: Purchase Invoice,Reason For Issuing document,Reden voor afgifte document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Volgende Contact Door het kan niet hetzelfde zijn als de Lead e-mailadres
 DocType: Tax Rule,Billing City,Stad
@@ -3133,7 +3150,8 @@
 DocType: Warranty Claim,Service Address,Service Adres
 DocType: Asset Maintenance Task,Calibration,ijking
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} is een bedrijfsvakantie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Meubels en Wedstrijden
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Laat statusmelding achter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Meubels en Wedstrijden
 DocType: Item,Manufacture,Fabricage
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
@@ -3149,7 +3167,6 @@
 DocType: Crop,Planting Area,Plant gebied
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dit kan zijn door sommige ongeldige e-mailadressen in de
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Jij voegde toe
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,training Resultaat
@@ -3159,16 +3176,17 @@
 DocType: Products Settings,Products per Page,Producten per pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisatie tak meester .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,of
 DocType: Sales Order,Billing Status,Factuurstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utiliteitskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Boven
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rij # {0}: Journal Entry {1} heeft geen account {2} of al vergeleken met een ander voucher
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteria Gewicht
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Laat goedkeuringskennisgeving achter
 DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Salarisstrook Op basis van Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Koopsnelheid
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Koopsnelheid
 DocType: Notification Control,Sales Order Message,Verkooporder Bericht
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Instellen Standaardwaarden zoals Bedrijf , Valuta , huidige boekjaar , etc."
 DocType: Payment Entry,Payment Type,Betaling Type
@@ -3190,6 +3208,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Winkelwagen Instellingen
 DocType: Journal Entry,Accounting Entries,Boekingen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Als de geselecteerde prijsbepalingsregel is gemaakt voor &#39;Tarief&#39;, overschrijft deze de prijslijst. Prijzen Regel tarief is het laatste tarief, dus geen verdere korting moet worden toegepast. Daarom wordt het bij transacties zoals klantorder, inkooporder, enz. Opgehaald in het veld &#39;Tarief&#39; in plaats van het veld &#39;Prijslijstsnelheid&#39;."
+DocType: Journal Entry,Paid Loan,Betaalde lening
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Dubbele invoer. Controleer Autorisatie Regel {0}
 DocType: Journal Entry Account,Reference Due Date,Referentie vervaldag
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3206,7 +3225,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Loonlijst
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
 DocType: Patient Service Unit,Parent Service Unit,Parent Service Unit
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,maak Gebruiker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken)
@@ -3225,7 +3244,7 @@
 DocType: Shareholder,SH-,SH
 DocType: Account,Income Account,Inkomstenrekening
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Levering
 DocType: Volunteer,Weekdays,Doordeweekse dagen
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: Restaurant Menu,Restaurant Menu,Restaurant Menu
@@ -3233,7 +3252,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Stel standaard inventaris rekening voor permanente inventaris
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Stel standaard inventaris rekening voor permanente inventaris
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Verstuur Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage vol is, niet te redden"
@@ -3241,10 +3260,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kamer capaciteit
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Er bestaat al record voor het item {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,U verliest records van eerder gegenereerde facturen. Weet je zeker dat je dit abonnement opnieuw wilt opstarten?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Zonder registratie
 DocType: Budget,Cost Center,Kostenplaats
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Coupon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Coupon #
 DocType: Notification Control,Purchase Order Message,Inkooporder Bericht
 DocType: Tax Rule,Shipping Country,Verzenden Land
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Klant het BTW-nummer van Verkooptransacties
@@ -3253,20 +3273,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prijsbepalingsregel overschrijft de prijslijst / defininieer een kortingspercentage, gebaseerd op een aantal criteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Voorraad Invoer / Vrachtbrief / Ontvangstbewijs worden veranderd
 DocType: Employee Education,Class / Percentage,Klasse / Percentage
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Hoofd Marketing en Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Hoofd Marketing en Verkoop
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Inkomstenbelasting
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Ga naar Briefhoofden
+DocType: Subscription,Cancel At End Of Period,Annuleer aan het einde van de periode
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Geen items geselecteerd voor overdracht
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Geen items geselecteerd voor overdracht
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
 DocType: Vehicle,Electric,elektrisch
 DocType: Task,% Progress,% Voortgang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Winst / verlies op de verkoop van activa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Winst / verlies op de verkoop van activa
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Alleen de studentaanvrager met de status &quot;Goedgekeurd&quot; wordt geselecteerd in de onderstaande tabel.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Accountnummer voor account {0} is niet beschikbaar. <br> Stel uw rekeningschema correct in.
 DocType: Task,Depends on Tasks,Hangt af van Taken
@@ -3281,6 +3302,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Niet op voorraad
 DocType: Volunteer,Volunteer Skills,Vrijwilligersvaardigheden
 DocType: Appraisal,HR User,HR Gebruiker
+DocType: Bank Guarantee,Reference Document Name,Referentiedocumentnaam
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belastingen en Toeslagen Afgetrokken
 apps/erpnext/erpnext/hooks.py +142,Issues,Kwesties
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet één zijn van {0}
@@ -3294,7 +3316,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-terugwerkende
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Groot
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Groot
+DocType: Loan,Loan Application,Aanvraag voor een lening
 DocType: Crop,Scientific Name,Wetenschappelijke naam
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Totaal Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Selecteer opnieuw, als het gekozen contact is bewerkt na opslaan"
@@ -3303,13 +3326,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Cheque nummer
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Groot
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Groot
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alle Assessment Groepen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alle Assessment Groepen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nieuwe Warehouse Naam
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Totaal {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regio
@@ -3330,9 +3353,10 @@
 DocType: Fees,Fees,vergoedingen
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een valuta om te zetten in een andere
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Offerte {0} is geannuleerd
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Totale uitstaande bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Totale uitstaande bedrag
 DocType: Sales Partner,Targets,Doelen
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Registreer het SIREN-nummer in het bedrijfsinformatiedossier
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel Employee Naming System in Human Resource&gt; HR-instellingen in
 DocType: Price List,Price List Master,Prijslijst Master
 DocType: GST Account,CESS Account,CESS-account
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
@@ -3341,6 +3365,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selecteer Patiënt
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameter Naam
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Alleen verlofaanvragen met de status &#39;Goedgekeurd&#39; en &#39;Afgewezen&#39; kunnen worden ingediend
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student groepsnaam is verplicht in de rij {0}
 DocType: Homepage,Products to be shown on website homepage,Producten die worden getoond op de website homepage
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
@@ -3386,14 +3411,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Factuur al gemaakt voor alle factureringsuren
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Naam fout: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Zijn financiële kosten
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Stel de standaardklant in in restaurantinstellingen
 ,Salary Register,salaris Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
-DocType: C-Form Invoice Detail,Net Total,Netto Totaal
+DocType: Subscription,Net Total,Netto Totaal
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Standaard BOM niet gevonden voor Item {0} en Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definieer verschillende soorten lening
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definieer verschillende soorten lening
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Openstaand Bedrag
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tijd (in minuten)
@@ -3425,11 +3450,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root account moet een groep
 DocType: Drug Prescription,Drug Prescription,Drug Prescription
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Afgelost / Gesloten
+DocType: Loan,Repaid/Closed,Afgelost / Gesloten
 DocType: Item,Total Projected Qty,Totale geraamde Aantal
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waarderingspercentage niet gevonden voor het item {0}, die vereist is om boekhoudkundige vermeldingen voor {1} {2} te doen. Als het item als een nulwaarderingspercentage in de {1} wordt verwerkt, vermeld dan dat in de {1} Item tabel. Anders kunt u een inkomende voorraadtransactie voor het item maken of een waarderingspercentage vermelden in het Item-record, en probeer dan deze invoer te verzenden / annuleren"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Instellingen&gt; Instellingen&gt; Reeks benoemen
 DocType: Course,Course Code,cursus Code
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: POS Settings,Use POS in Offline Mode,Gebruik POS in de offline modus
@@ -3449,16 +3473,15 @@
 DocType: Purchase Invoice,Deemed Export,Geachte export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kortingspercentage kan worden toegepast tegen een prijslijst of voor alle prijslijsten.
-DocType: Subscription,Half-yearly,Halfjaarlijks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,U heeft al beoordeeld op de beoordelingscriteria {}.
 DocType: Vehicle Service,Engine Oil,Motorolie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Werkorders aangemaakt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Werkorders aangemaakt: {0}
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
-DocType: Employee Loan,Loan Details,Loan Details
+DocType: Loan,Loan Details,Loan Details
 DocType: Company,Default Inventory Account,Standaard Inventaris Account
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,De folionummers komen niet overeen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rij {0}: Voltooid Aantal moet groter zijn dan nul.
@@ -3470,19 +3493,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Een link naar alle landeenheden waarin het gewas groeit
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
 DocType: Item Group,Show this slideshow at the top of the page,Laat deze slideshow aan de bovenkant van de pagina
 DocType: BOM,Item UOM,Artikel Eenheid
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belasting Bedrag na korting Bedrag (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
 DocType: Cheque Print Template,Primary Settings,Primaire Instellingen
 DocType: Purchase Invoice,Select Supplier Address,Select Leverancier Adres
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Werknemers toevoegen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Werknemers toevoegen
 DocType: Purchase Invoice Item,Quality Inspection,Kwaliteitscontrole
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
 DocType: Payment Request,Mute Email,Mute-mail
@@ -3502,11 +3525,10 @@
 DocType: SMS Log,No of Sent SMS,Aantal gestuurde SMS
 DocType: Antibiotic,Healthcare Administrator,Gezondheidszorg Administrator
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Stel een doel in
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup&gt; Nummeringserie
 DocType: Dosage Strength,Dosage Strength,Dosis Sterkte
 DocType: Account,Expense Account,Kostenrekening
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Kleur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Kleur
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,De vervaldatum is verplicht voor het geselecteerde artikel
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Voorkom aankopen
@@ -3519,18 +3541,18 @@
 DocType: Patient,Personal and Social History,Persoonlijke en sociale geschiedenis
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Gebruiker {0} gemaakt
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup voor elke student
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Wijzig code
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 DocType: Purchase Invoice,Availed ITC Cess,Beschikbaar ITC Cess
 ,Student Monthly Attendance Sheet,Student Maandelijkse presentielijst
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Verzendregel alleen van toepassing op verkopen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Totdat
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgroep of cursusschema is verplicht
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgroep of cursusschema is verplicht
@@ -3551,7 +3573,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Maak een overzicht van uw producten of diensten die u koopt of verkoopt.
 DocType: Water Analysis,Storage Temperature,Bewaar temperatuur
 DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte aanwezigheid
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,onderzoeker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,onderzoeker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Inschrijving Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Startdatum moet minder zijn dan de einddatum voor taak {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Naam of E-mail is verplicht
@@ -3564,7 +3586,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} heeft momenteel een {1} leverancierscore kaart, en RFQs aan deze leverancier moeten met voorzichtigheid worden uitgegeven."
 DocType: Chapter,Non Profit Manager,Non-profit manager
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Munt)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serienummer {0} aangemaakt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serienummer {0} aangemaakt
 DocType: Homepage,Company Description for website homepage,Omschrijving bedrijf voor website homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Naam
@@ -3574,11 +3596,10 @@
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
 DocType: Healthcare Settings,Result Printed,Resultaat afgedrukt
 DocType: Asset Category Account,Depreciation Expense Account,Afschrijvingen Account
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Proeftijd
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Bekijk {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Proeftijd
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan in transactie
 DocType: Project,Total Costing Amount (via Timesheets),Totale kostenbedrag (via urenstaten)
-DocType: Employee Advance,Expense Approver,Onkosten Goedkeurder
+DocType: Department,Expense Approver,Onkosten Goedkeurder
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
 DocType: Project,Hourly,ieder uur
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-groep tot groep
@@ -3588,7 +3609,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Om Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Betalen via Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Gedrukt op
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Gedrukt op
 DocType: Item,Inspection Required before Delivery,Inspectie vereist voordat Delivery
 DocType: Item,Inspection Required before Purchase,Inspectie vereist voordat Purchase
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afwachting Activiteiten
@@ -3598,7 +3619,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum bestelhoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Uw organisatie
 DocType: Fee Component,Fees Category,vergoedingen Categorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vul het verlichten datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Meld de medewerker in kennis
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer de naam van de campagne in als bron van onderzoek Campagne is
@@ -3608,7 +3629,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Bestelniveau
 DocType: Company,Chart Of Accounts Template,Rekeningschema Template
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
 DocType: Purchase Invoice Item,Accepted Warehouse,Geaccepteerd Magazijn
@@ -3616,10 +3637,11 @@
 DocType: Item,Valuation Method,Waardering Methode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Halve dag
 DocType: Sales Invoice,Sales Team,Verkoop Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Dubbele invoer
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dubbele invoer
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Voer de naam van de Begunstigde in voordat u een aanvraag indient.
 DocType: Program Enrollment Tool,Get Students,krijg Studenten
 DocType: Serial No,Under Warranty,Binnen Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Fout]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorden zijn zichtbaar zodra u de Verkooporder opslaat.
 ,Employee Birthday,Werknemer Verjaardag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Selecteer de voltooiingsdatum voor de voltooide reparatie
@@ -3638,7 +3660,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Gereserveerd voor onderaanneming
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
 DocType: Shopping Cart Settings,Orders,Bestellingen
-DocType: Employee Leave Approver,Leave Approver,Verlof goedkeurder
+DocType: Department,Leave Approver,Verlof goedkeurder
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Selecteer een batch alsjeblieft
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
@@ -3683,7 +3705,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Bijgehouden post
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINEEL VOOR RECEPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Rekening
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Deze email is autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Verwachte waarde Na Nuttig Life
@@ -3708,22 +3729,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Attendance Record {0} bestaat tegen Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Afschrijvingen Uitgeschakeld als gevolg van verkoop van activa
-DocType: Member,Member,Lid
+DocType: Loan,Member,Lid
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Beheer Adressen
 DocType: Work Order Item,Work Order Item,Werkorderitem
 DocType: Pricing Rule,Item Code,Artikelcode
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Details
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landbouwmanager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
 DocType: Supplier Scorecard Period,Variables,Variabelen
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Sluiten (Db)
 DocType: Cheque Print Template,Cheque Size,Cheque Size
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serienummer {0} niet op voorraad
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serienummer {0} niet op voorraad
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
 DocType: Sales Invoice,Write Off Outstanding Amount,Afschrijving uitstaande bedrag
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Rekening {0} komt niet overeen met Bedrijf {1}
@@ -3731,7 +3752,6 @@
 DocType: Stock Settings,Default Stock UOM,Standaard Voorraad Eenheid
 DocType: Asset,Number of Depreciations Booked,Aantal Afschrijvingen Geboekt
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Aantal Totaal
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Tegen Werknemer lening: {0}
 DocType: Landed Cost Item,Receipt Document,ontvangst Document
 DocType: Employee Education,School/University,School / Universiteit
 DocType: Payment Request,Reference Details,Reference Details
@@ -3742,7 +3762,7 @@
 DocType: Asset,Double Declining Balance,Double degressief
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Gesloten bestelling kan niet worden geannuleerd. Openmaken om te annuleren.
 DocType: Student Guardian,Father,Vader
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 DocType: Attendance,On Leave,Met verlof
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Blijf op de hoogte
@@ -3756,10 +3776,10 @@
 DocType: Lead,Lower Income,Lager inkomen
 DocType: Restaurant Order Entry,Current Order,Huidige bestelling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Bron- en doelmagazijn kan niet hetzelfde zijn voor de rij {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Ga naar Programma&#39;s
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rij {0} # Toegewezen hoeveelheid {1} kan niet groter zijn dan het niet-opgeëiste bedrag {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rij {0} # Toegewezen hoeveelheid {1} kan niet groter zijn dan het niet-opgeëiste bedrag {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
@@ -3782,7 +3802,6 @@
 DocType: Payment Terms Template,Payment Terms,Betaalvoorwaarden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,minuut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel Employee Naming System in Human Resource&gt; HR-instellingen in
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
 DocType: Chapter,Meetup Embed HTML,Meetup HTML insluiten
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Ga naar leveranciers
@@ -3802,30 +3821,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Stel het e-mail-ID voor de student in om het betalingsverzoek te verzenden
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Stel het e-mail-ID voor de student in om het betalingsverzoek te verzenden
 DocType: Patient,Medical History,Medische Geschiedenis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Kredietrekening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bank Kredietrekening
 DocType: Patient,Patient ID,Patient ID
 DocType: Physician Schedule,Schedule Name,Schema Naam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Maak Salarisstrook
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Voeg alle leveranciers toe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Voeg alle leveranciers toe
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rij # {0}: Toegewezen bedrag mag niet groter zijn dan het uitstaande bedrag.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Bladeren BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Leningen met onderpand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Leningen met onderpand
 DocType: Purchase Invoice,Edit Posting Date and Time,Wijzig Posting Datum en tijd
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Stel afschrijvingen gerelateerd Accounts in Vermogensbeheer categorie {0} of Company {1}
 DocType: Lab Test Groups,Normal Range,Normaal bereik
 DocType: Academic Term,Academic Year,Academisch jaar
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Beschikbare verkoop
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Opening Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Opening Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,resterende
 DocType: Appraisal,Appraisal,Beoordeling
+DocType: Loan,Loan Account,Lening account
 DocType: Purchase Invoice,GST Details,GST Details
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mail verzonden naar leverancier {0}
 DocType: Item,Default Sales Unit of Measure,Standaard Verkoopeenheid van Maatregel
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Academiejaar:
+DocType: Subscription,Past Due Date,Verstreken einddatum
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Niet toestaan om alternatief item in te stellen voor het item {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum wordt herhaald
@@ -3838,7 +3859,7 @@
 DocType: Patient Appointment,Patient Appointment,Patient Benoeming
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeuring Rol kan niet hetzelfde zijn als de rol van de regel is van toepassing op
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Ontvang leveranciers door
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Ontvang leveranciers door
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} niet gevonden voor item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Ga naar cursussen
 DocType: Accounts Settings,Show Inclusive Tax In Print,Toon Inclusive Tax In Print
@@ -3846,10 +3867,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Rekening met de onderliggende knooppunten kan niet worden ingesteld als grootboek
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs&gt; Onderwijsinstellingen in
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basisvaluta van de klant
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobedrag (Company valuta)
 DocType: Physician,Physician Schedules,Arts Schedules
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Het totale voorschotbedrag kan niet hoger zijn dan het totale gesanctioneerde bedrag
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Het totale voorschotbedrag kan niet hoger zijn dan het totale gesanctioneerde bedrag
 DocType: Salary Slip,Hour Rate,Uurtarief
 DocType: Stock Settings,Item Naming By,Artikel benoeming door
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
@@ -3867,6 +3889,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niet toegestaan om voorraadtransacties ouder dan  {0} bij te werken
 DocType: BOM,Inspection Required,Inspectie Verplicht
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Voer het bankgarantienummer in voordat u het verzendt.
 DocType: Driving License Category,Class,Klasse
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Werkopdracht kan niet worden verhoogd met een itemsjabloon
@@ -3877,7 +3900,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
 DocType: Assessment Plan,Program,Programma
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs&gt; Onderwijsinstellingen in
 DocType: Serial No,Is Cancelled,Is Geannuleerd
 DocType: Student Group,Group Based On,Groep Gebaseerd op
 DocType: Student Group,Group Based On,Groep Gebaseerd op
@@ -3889,9 +3911,10 @@
 DocType: Cheque Print Template,Cheque Height,Cheque Hoogte
 DocType: Supplier,Supplier Details,Leverancier Details
 DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiceer Artikelen toevoegen aan Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Van waarde moet minder zijn dan waarde in rij {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,overboeking
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,overboeking
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Alles aanvinken
 ,Issued Items Against Work Order,Uitgegeven items tegen werkorder
 DocType: Vehicle Log,Invoice Ref,factuur Ref
@@ -3922,12 +3945,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarief Aantal
 DocType: Work Order Item,Available Qty at WIP Warehouse,Beschikbaar Aantal bij WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,verwachte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
-DocType: Employee Loan,Employee Loan Application,Werknemer lening aanvraag
 DocType: Issue,Opening Date,Openingsdatum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Sla de patiënt alstublieft eerst op
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Sla de patiënt alstublieft eerst op
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Aanwezigheid is met succes gemarkeerd.
 DocType: Program Enrollment,Public Transport,Openbaar vervoer
 DocType: Soil Texture,Silt Composition (%),Silt-samenstelling (%)
@@ -3946,7 +3968,7 @@
 ,Item Balance (Simple),Artikel saldo (eenvoudig)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturen van leveranciers.
 DocType: POS Profile,Write Off Account,Afschrijvingsrekening
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debietnota Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debietnota Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
@@ -3969,6 +3991,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Verkooporder Datum
 DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
 DocType: Assessment Plan,Assessment Plan,assessment Plan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klant {0} is gemaakt.
 DocType: Stock Settings,Limit Percent,Limit Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momenteel geen voorraad beschikbaar in een magazijn
@@ -3982,14 +4005,15 @@
 DocType: Journal Entry,Stock Entry,Voorraadtransactie
 DocType: Payment Entry,Payment References,betaling Referenties
 DocType: C-Form,C-FORM-,C-vorm-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Aantal intervallen voor het intervalveld, bijv. Als het interval &#39;Dagen&#39; is en het factuurinterval is 3, worden er om de 3 dagen facturen gegenereerd"
 DocType: Vehicle,Insurance Details,verzekering Details
 DocType: Account,Payable,betaalbaar
 DocType: Share Balance,Share Type,Type delen
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vul de aflossingsperiode
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Vul de aflossingsperiode
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debiteuren ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nieuwe klanten
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brutowinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brutowinst%
 DocType: Appraisal Goal,Weightage (%),Weging (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS-profiel wijzigen
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
@@ -3999,10 +4023,11 @@
 DocType: Lead,Address Desc,Adres Omschr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party is verplicht
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rijen met dubbele vervaldatums in andere rijen zijn gevonden: {lijst}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rijen met dubbele vervaldatums in andere rijen zijn gevonden: {lijst}
 DocType: Topic,Topic Name,topic Naam
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Stel de standaardsjabloon voor toestemming voor vertrekauthenticatie in HR-instellingen in.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Tenminste een van de verkopen of aankopen moeten worden gekozen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Selecteer een medewerker om de werknemer voor te bereiden.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Selecteer een medewerker om de werknemer voor te bereiden.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Selecteer een geldige datum alstublieft
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Selecteer de aard van uw bedrijf.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4021,7 +4046,7 @@
 DocType: Asset Movement,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Deel Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Verkoopfactuur {0} gemaakt
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: C-Form,Total Invoiced Amount,Totaal Gefactureerd bedrag
@@ -4030,7 +4055,7 @@
 DocType: Account,Accumulated Depreciation,Cumulatieve afschrijvingen
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Staande naam
 DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
-DocType: Employee Loan Application,Required by Date,Vereist door Date
+DocType: Loan Application,Required by Date,Vereist door Date
 DocType: Lead,Lead Owner,Lead Eigenaar
 DocType: Production Plan,Sales Orders Detail,Detail verkooporders
 DocType: Bin,Requested Quantity,gevraagde hoeveelheid
@@ -4043,10 +4068,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutoloon - Total Aftrek - aflossing van de lening
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Loonstrook ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Meerdere varianten
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Geleverd
+DocType: Subscription,Trial Period Start Date,Startdatum proefperiode
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Meld u aan als een andere gebruiker.
@@ -4067,12 +4093,11 @@
 DocType: Student Guardian,Student Guardian,student Guardian
 DocType: Member,Member Name,Lid Naam
 DocType: Stock Settings,Use Naming Series,Gebruik Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Voorraad bijwerken
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,in het abonnement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 DocType: Membership,Payment Details,Betalingsdetails
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Stuklijst tarief
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order kan niet geannuleerd worden, laat het eerst annuleren om te annuleren"
 DocType: Asset,Journal Entry for Scrap,Dagboek voor Productieverlies
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
@@ -4092,6 +4117,7 @@
 DocType: Land Unit,Land Unit,Landeenheid
 ,Purchase Analytics,Inkoop Analyse
 DocType: Sales Invoice Item,Delivery Note Item,Vrachtbrief Artikel
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Huidige factuur {0} ontbreekt
 DocType: Asset Maintenance Log,Task,Taak
 DocType: Purchase Taxes and Charges,Reference Row #,Referentie Rij #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
@@ -4104,7 +4130,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange winst / verliesrekening
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Werknemer en Aanwezigheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Doel moet één zijn van {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Vul het formulier in en sla het op
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Vul het formulier in en sla het op
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Werkelijke hoeveelheid op voorraad
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Werkelijke hoeveelheid op voorraad
@@ -4119,7 +4145,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard Selling Rate
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
 DocType: Cash Flow Mapper,Section Name,sectie naam
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Bestelaantal
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Bestelaantal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Huidige vacatures
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afschrijven
@@ -4130,9 +4156,9 @@
 DocType: Task,depends_on,hangt af van
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,In afwachting van het bijwerken van de laatste prijs in alle Materialen. Het kan enkele minuten duren.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,De naam van de nieuwe account. Let op: Gelieve niet goed voor klanten en leveranciers te creëren
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landgebaseerde standaard adressjablonen
 DocType: Water Analysis,Appearance,Uiterlijk
+DocType: HR Settings,Leave Status Notification Template,Verlof status notificatiesjabloon
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Gem. Prijslijst kopen
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informatie over leden.
@@ -4155,7 +4181,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Niet toegestaan. Schakel de testsjabloon uit
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
 DocType: Crop Cycle,Linked Land Unit,Linked Land Unit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
@@ -4171,7 +4197,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Ga naar gebruikers
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ongeldige GSTIN of voer NA in voor niet-geregistreerde
 DocType: Training Event,Seminar,congres
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma inschrijvingsgeld
@@ -4187,14 +4213,14 @@
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 DocType: Company,Create Chart Of Accounts Based On,Maak rekeningschema op basis van
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan het niet omzetten naar een niet-groep. Kindertaken bestaan.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Geboortedatum mag niet groter zijn dan vandaag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Geboortedatum mag niet groter zijn dan vandaag.
 ,Stock Ageing,Voorraad Veroudering
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} bestaat tegen student aanvrager {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Afronding aanpassing (bedrijfsmunt)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Rooster
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partij:
 DocType: Volunteer,Afternoon,Middag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Cheque Print Template,Scanned Cheque,gescande Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
@@ -4210,7 +4236,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Project {0} bestaat al
 DocType: Medical Department,Nursing User,Verpleegkundige gebruiker
 DocType: Plant Analysis,Plant Analysis Criterias,Plant Analysis Criteria
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Verantwoordelijkheden
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serienummer {0} hoort niet bij Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Verantwoordelijkheden
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van deze offerte is beëindigd.
 DocType: Expense Claim Account,Expense Claim Account,Declaratie Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staale wisselkoersen toestaan
@@ -4232,11 +4259,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Varianten maken
 DocType: Item,Default BOM,Standaard Stuklijst
 DocType: Project,Total Billed Amount (via Sales Invoices),Totaal gefactureerd bedrag (via verkoopfacturen)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debietnota Bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debietnota Bedrag
 DocType: Project Update,Not Updated,Niet geüpdate
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Er zijn inconsistenties tussen de koers, aantal aandelen en het berekende bedrag"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Totale uitstaande Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
 DocType: Employee Advance,Advance Account,Voorschot rekening
 DocType: Job Offer,Job Offer Terms,Biedingsvoorwaarden
@@ -4245,7 +4272,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Verzekeringsbedrijf
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabele
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabele
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Van Vrachtbrief
 DocType: Chapter,Members,leden
 DocType: Student,Student Email Address,Student e-mailadres
@@ -4269,7 +4296,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,intern
 DocType: Delivery Stop,Address Name,Adres naam
 DocType: Stock Entry,From BOM,Van BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{0} eenheden van {1} splitsen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{0} eenheden van {1} splitsen
 DocType: Assessment Code,Assessment Code,assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
@@ -4277,25 +4304,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
 DocType: Bank Reconciliation Detail,Payment Document,betaling Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Fout bij het evalueren van de criteria formule
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum van indiensttreding moet groter zijn dan geboortedatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum van indiensttreding moet groter zijn dan geboortedatum
+DocType: Subscription,Plans,Plannen
 DocType: Salary Slip,Salary Structure,Salarisstructuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Materiaal uitgeven
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Er is een fout opgetreden tijdens het maken van terugkerende
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Materiaal uitgeven
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citaten
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je opnieuw verbonden bent met het netwerk.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Geen groepen studenten gecreëerd.
 DocType: Purchase Invoice Item,Serial No,Serienummer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelijks te betalen bedrag kan niet groter zijn dan Leningen zijn
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelijks te betalen bedrag kan niet groter zijn dan Leningen zijn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rij # {0}: Verwachte Afleverdatum kan niet vóór de Aankoopdatum zijn
 DocType: Purchase Invoice,Print Language,Print Taal
 DocType: Salary Slip,Total Working Hours,Totaal aantal Werkuren
 DocType: Sales Invoice,Customer PO Details,Klant PO-details
-DocType: Subscription,Next Schedule Date,Volgende schema datum
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tijdelijk account openen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Voer waarde moet positief zijn
@@ -4324,11 +4350,11 @@
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Van en naar data vereist
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Geen werknemers voor de genoemde criteria
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
 DocType: Hotel Settings,Default Customer,Standaard klant
 DocType: Assessment Plan,Supervisor Name,supervisor Naam
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bevestig niet of afspraak voor dezelfde dag is gemaakt
@@ -4353,16 +4379,16 @@
 DocType: Journal Entry Account,Employee Advance,Medewerker Advance
 DocType: Payroll Entry,Payroll Frequency,payroll Frequency
 DocType: Lab Test Template,Sensitivity,Gevoeligheid
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,grondstof
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Installaties en Machines
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Installaties en Machines
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dagelijks Werk Samenvatting Instellingen
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Voer Reqd in op datum
 DocType: Payment Entry,Internal Transfer,Interne overplaatsing
 DocType: Asset Maintenance,Maintenance Tasks,Onderhoudstaken
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ofwel doelwit aantal of streefbedrag is verplicht
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Selecteer Boekingsdatum eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Selecteer Boekingsdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenplaats met bestaande transacties kan niet worden omgezet naar grootboek
@@ -4370,14 +4396,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext-integraties
 DocType: Crop Cycle,Detected Disease,Gedetecteerde ziekte
 ,Produced,Geproduceerd
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Startdatum van de terugbetaling kan niet vóór de datum van uitbetaling zijn.
 DocType: Item,Item Code for Suppliers,Item Code voor leveranciers
 DocType: Issue,Raised By (Email),Opgevoerd door (E-mail)
 DocType: Training Event,Trainer Name,trainer Naam
 DocType: Mode of Payment,General,Algemeen
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Laatste Communicatie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Laatste Communicatie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Volgnummers zijn vereist voor Seriegebonden Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Volgnummers zijn vereist voor Seriegebonden Artikel {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Betalingen met Facturen
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
@@ -4391,7 +4418,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,In- / uitschakelen valuta .
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} op halve dag Verlof op {1}
 DocType: Production Plan,Get Material Request,Krijg Materiaal Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Portokosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Portokosten
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 ,Item Variant Details,Artikel Variant Details
@@ -4402,9 +4429,9 @@
 DocType: Drug Prescription,Hour,uur
 DocType: Restaurant Order Entry,Last Sales Invoice,Laatste verkoopfactuur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Selecteer alstublieft Aantal tegen item {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 DocType: Company,Monthly Sales Target,Maandelijks verkooppunt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
@@ -4412,7 +4439,7 @@
 DocType: Item,Default Material Request Type,Standaard Materiaal Request Type
 DocType: Supplier Scorecard,Evaluation Period,Evaluatie periode
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Onbekend
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Werkorder niet gemaakt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Werkorder niet gemaakt
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: Purchase Invoice,Export Type,Exporttype
 DocType: Salary Slip Loan,Salary Slip Loan,Salaris Sliplening
@@ -4428,8 +4455,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Factuuroverzicht openen
 DocType: Education Settings,Education Manager,Education Manager
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,De minimale lengte tussen elke plant in het veld voor optimale groei
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched item {0} kan niet worden bijgewerkt met behulp van Stock Reconciliation, maar gebruik Voorraadinvoer"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched item {0} kan niet worden bijgewerkt met behulp van Stock Reconciliation, maar gebruik Voorraadinvoer"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched item {0} kan niet worden bijgewerkt met behulp van Stock Reconciliation, maar gebruik Voorraadinvoer"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched item {0} kan niet worden bijgewerkt met behulp van Stock Reconciliation, maar gebruik Voorraadinvoer"
 DocType: Quality Inspection,Report Date,Rapport datum
 DocType: Student,Middle Name,Midden-naam
 DocType: C-Form,Invoices,Facturen
@@ -4462,20 +4489,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Ontvangst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Ontvangst
 ,Sales Register,Verkoopregister
 DocType: Daily Work Summary Group,Send Emails At,Stuur e-mails
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formulierweergave
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Expense Approver Verplicht in onkostendeclaratie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Voeg gebruikers toe aan uw organisatie, behalve uzelf."
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nog geen klanten!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kasstroomoverzicht
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Er is geen aanvraag voor een artikel gemaakt
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licentie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
@@ -4498,11 +4526,12 @@
 DocType: Vehicle,Chassis No,chassis Geen
 DocType: Payment Request,Initiated,Geïnitieerd
 DocType: Production Plan Item,Planned Start Date,Geplande Startdatum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Selecteer een stuklijst
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Selecteer een stuklijst
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Beschikbaar in ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverancier&gt; leverancier type
+DocType: Bank Guarantee,Clauses and Conditions,Clausules en voorwaarden
 DocType: Serial No,Creation Document Type,Aanmaken Document type
 DocType: Project Task,View Timesheet,Bekijk urenformulier
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Einddatum moet groter zijn dan startdatum
 DocType: Leave Type,Is Encash,Is incasseren
 DocType: Leave Allocation,New Leaves Allocated,Nieuwe Verloven Toegewezen
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
@@ -4516,9 +4545,10 @@
 DocType: Patient,Alcohol Current Use,Alcohol Huidig Gebruik
 DocType: Student Admission Program,Student Admission Program,Studenten toelating programma
 DocType: Payment Entry,Account Paid To,Rekening betaald aan
+DocType: Subscription Settings,Grace Period,Genade periode
 DocType: Item Alternative,Alternative Item Name,Alternatieve artikelnaam
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Kon geen salarisstrook indienen <br> \ Mogelijke redenen: <br> \ 1. Nettoloon is minder dan 0. <br> \ 2. Het e-mailadres van het bedrijf dat in de werknemermaster is opgegeven, is niet geldig. <br>"
@@ -4528,7 +4558,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget voor Account {1} tegen {2} {3} is {4}. Het zal overschrijden tegen {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,out Aantal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,en unchcked Uitgeschakeld in de
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Reeks is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Financiële Dienstverlening
 DocType: Student Sibling,Student ID,student ID
@@ -4540,14 +4569,16 @@
 DocType: Complaint,Complaint,Klacht
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Maak terugbetaling
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alle afdelingen
 DocType: Patient,Alcohol Past Use,Alcohol voorbij gebruik
 DocType: Fertilizer Content,Fertilizer Content,Kunstmestinhoud
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematische / Stuck
 DocType: Tax Rule,Billing State,Billing State
 DocType: Share Transfer,Transfer,Verplaatsen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Werkorder {0} moet worden geannuleerd voordat deze klantorder wordt geannuleerd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Vervaldatum is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
@@ -4571,10 +4602,11 @@
 DocType: Cheque Print Template,Message to show,Bericht om te laten zien
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Retail
 DocType: Student Attendance,Absent,Afwezig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Product Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Kan geen score beginnen bij {0}. Je moet een score hebben van 0 tot 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
+DocType: Subscription,Current Invoice Start Date,Huidige startdatum factuur
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ofwel debet of credit bedrag is vereist voor {2}
 DocType: GL Entry,Remarks,Opmerkingen
@@ -4584,11 +4616,13 @@
 DocType: Task,Parent Task,Oudertaak
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,maak Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print en stationaire
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print en stationaire
 DocType: Stock Settings,Show Barcode Field,Show streepjescodeveld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Stuur Leverancier Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris al verwerkt voor de periode tussen {0} en {1}, Laat aanvraagperiode kan niet tussen deze periode."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Stuur Leverancier Emails
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris al verwerkt voor de periode tussen {0} en {1}, Laat aanvraagperiode kan niet tussen deze periode."
+DocType: Fiscal Year,Auto Created,Auto gemaakt
 DocType: Chapter Member,Leave Reason,Verlaat de Rede
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Factuur {0} bestaat niet meer
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Volunteer,Availability,Beschikbaarheid
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Stel standaardwaarden in voor POS-facturen
@@ -4597,14 +4631,13 @@
 DocType: Timesheet,Employee Detail,werknemer Detail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
 DocType: Lab Prescription,Test Code,Testcode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Instellingen voor website homepage
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;s zijn niet toegestaan voor {0} door een scorecard van {1}
 DocType: Job Offer,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Boven
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Totaalbedrag {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Totaalbedrag {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Noem als niet-standaard betaalbaar account
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Selecteer de beoordelingsgroep anders dan &#39;Alle beoordelingsgroepen&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rij {0}: Kostencentrum is vereist voor een item {1}
@@ -4615,7 +4648,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Water analyse
 DocType: Chapter,Region,Regio
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
 DocType: Holiday List,Weekly Off,Wekelijks Vrij
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reload Linked Analysis
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Voor bijvoorbeeld 2012, 2012-13"
@@ -4631,7 +4664,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kosten van Gesloopt Asset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
 DocType: Vehicle,Policy No,beleid Geen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Krijg Items uit Product Bundle
 DocType: Asset,Straight Line,Rechte lijn
 DocType: Project User,Project User,project Gebruiker
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,spleet
@@ -4671,21 +4704,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Pad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Kan kostenplaats niet omzetten naar grootboek vanwege onderliggende nodes
 DocType: Production Plan,Total Planned Qty,Totaal aantal geplande
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,opening Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,opening Value
 DocType: Salary Detail,Formula,Formule
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Verkoopaccount
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Verkoopaccount
 DocType: Purchase Invoice Item,Total Weight,Totale gewicht
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commissie op de verkoop
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Commissie op de verkoop
 DocType: Job Offer Term,Value / Description,Waarde / Beschrijving
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
 DocType: Tax Rule,Billing Country,Land
 DocType: Purchase Order Item,Expected Delivery Date,Verwachte leverdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestelling
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
 DocType: Asset Maintenance Task,Assign To Name,Toewijzen aan naam
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Representatiekosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Representatiekosten
 DocType: Hub Settings,Enabled Users,Ingeschakelde gebruikers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Maak Material Request
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Open Item {0}
@@ -4698,24 +4731,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aanvragen voor verlof.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 DocType: Vehicle,Last Carbon Check,Laatste Carbon controleren
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Juridische Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Juridische Kosten
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Selecteer alstublieft de hoeveelheid op rij
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Open verkoop- en inkoopfacturen
 DocType: Purchase Invoice,Posting Time,Plaatsing Time
 DocType: Timesheet,% Amount Billed,% Gefactureerd Bedrag
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefoonkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefoonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Geen Artikel met Serienummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Geen Artikel met Serienummer {0}
 DocType: Email Digest,Open Notifications,Open Meldingen
 DocType: Payment Entry,Difference Amount (Company Currency),Verschil Bedrag (Company Munt)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Directe Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Directe Kosten
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Voeg een aangepast veld toe Abonnement in het doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Purchase Receipt Item,Sample Quantity,Monsterhoeveelheid
+DocType: Bank Guarantee,Name of Beneficiary,Naam van de begunstigde
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update BOM kosten automatisch via Scheduler, op basis van de laatste waarderingssnelheid / prijslijst koers / laatste aankoophoeveelheid grondstoffen."
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
@@ -4727,14 +4760,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,proeftijd
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,salaris Components
 DocType: Program Enrollment Tool,New Academic Year,New Academisch Jaar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Totale betaalde bedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Totale betaalde bedrag
 DocType: GST Settings,B2C Limit,B2C-limiet
 DocType: Work Order Item,Transferred Qty,Verplaatst Aantal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigeren
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,planning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,planning
 DocType: Share Balance,Issued,Uitgegeven
+DocType: Loan,Repayment Start Date,Startdatum aflossing
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentactiviteit
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverancier Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Details
@@ -4747,10 +4781,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Stuur regelmatige samenvattende rapporten via e-mail.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
 DocType: Assessment Result,Student Name,Studenten naam
 DocType: Brand,Item Manager,Item Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,payroll Payable
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,payroll Payable
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
 DocType: Plant Analysis,Collection Datetime,Verzameling Datetime
 DocType: Work Order,Total Operating Cost,Totale exploitatiekosten
@@ -4760,9 +4794,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Gebruiker {0} bestaat niet
 DocType: Payment Term,Day(s) after invoice date,Dag (en) na factuurdatum
 DocType: Payment Schedule,Payment Schedule,Betalingsschema
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Afkorting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Betaling Entry bestaat al
+DocType: Subscription,Trial Period End Date,Einddatum van de proefperiode
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salaris sjabloon stam .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Pathologie
@@ -4779,9 +4813,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offertes naar leads of klanten.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alle Doelgroepen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Maandelijks geaccumuleerd
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
@@ -4790,14 +4824,15 @@
 DocType: Lab Prescription,Test Created,Test gemaakt
 DocType: Healthcare Settings,Custom Signature in Print,Aangepaste handtekening in afdrukken
 DocType: Account,Temporary,Tijdelijk
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,LPO-nummer klant
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,LPO-nummer klant
 DocType: Program,Courses,cursussen
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,secretaresse
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,secretaresse
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Als uitschakelen, &#39;In de woorden&#39; veld niet zichtbaar in elke transactie"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Deze actie stopt toekomstige facturering. Weet je zeker dat je dit abonnement wilt annuleren?
 DocType: Serial No,Distinct unit of an Item,Aanwijsbare eenheid van een Artikel
 DocType: Supplier Scorecard Criteria,Criteria Name,Criteria Naam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Stel alsjeblieft bedrijf in
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Stel alsjeblieft bedrijf in
 DocType: Pricing Rule,Buying,Inkoop
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Ziekten &amp; Meststoffen
 DocType: HR Settings,Employee Records to be created by,Werknemer Records worden gecreëerd door
@@ -4806,18 +4841,18 @@
 DocType: POS Profile,Apply Discount On,Breng Korting op
 DocType: Member,Membership Type,soort lidmaatschap
 ,Reqd By Date,Benodigd op datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Crediteuren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Crediteuren
 DocType: Assessment Plan,Assessment Name,assessment Naam
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC weergeven in Afdrukken
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC weergeven in Afdrukken
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Rij # {0}: Serienummer is verplicht
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelgebaseerde BTW Details
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Vacature
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Instituut Afkorting
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
@@ -4835,7 +4870,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Indien aangevinkt, zal het systeem voorraadboekingen automatisch plaatsen."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,makelaardij
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Attendance voor personeelsbeloningen {0} is al gemarkeerd voor deze dag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Attendance voor personeelsbeloningen {0} is al gemarkeerd voor deze dag
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","in Minuten 
  Bijgewerkt via 'Time Log'"
@@ -4847,6 +4882,7 @@
 DocType: Lab Test,Approved Date,Goedgekeurde Datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
+DocType: Subscriber,Subscriber Name,Naam abonnee
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Update Tool,Replace,Vervang
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Geen producten gevonden.
@@ -4856,19 +4892,18 @@
 DocType: Request for Quotation Item,Project Name,Naam van het project
 DocType: Customer,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Selecteer rentebatenrekening in personeelslening {0}
 DocType: Work Order,Required Items,Vereiste items
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Afletteren Betaling
 DocType: Disease,Treatment Task,Behandelingstaak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Belastingvorderingen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Belastingvorderingen
 DocType: BOM Item,BOM No,Stuklijst nr.
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronische apparatuur
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronische apparatuur
 DocType: Asset,Maintenance Required,Onderhoud vereist
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
@@ -4877,7 +4912,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Openstaande Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set richt Item Group-wise voor deze verkoper.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bevries Voorraden ouder dan [dagen]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rij # {0}: Asset is verplicht voor vaste activa aankoop / verkoop
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rij # {0}: Asset is verplicht voor vaste activa aankoop / verkoop
 DocType: Asset Maintenance Team,Maintenance Team Name,Onderhoudsteam naam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Als twee of meer Pricing Regels zijn gevonden op basis van de bovenstaande voorwaarden, wordt prioriteit toegepast. Prioriteit is een getal tussen 0 en 20, terwijl standaardwaarde nul (blanco). Hoger aantal betekent dat het voorrang krijgen als er meerdere prijzen Regels met dezelfde voorwaarden."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Klant is verplicht als &#39;Opportunity vanaf&#39; is geselecteerd als klant
@@ -4887,19 +4922,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Typen Onkostendeclaraties.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Verkoopprijs voor item {0} is lager dan de {1}. Verkoopprijs moet ten minste {2} zijn
-DocType: Item,Taxes,Belastingen
+DocType: Subscription,Taxes,Belastingen
 DocType: Purchase Invoice,capital goods,kapitaalgoederen
 DocType: Purchase Invoice Item,Weight Per Unit,Gewicht per eenheid
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Betaald en niet geleverd
 DocType: Project,Default Cost Center,Standaard Kostenplaats
-DocType: Bank Guarantee,End Date,Einddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transactions
 DocType: Budget,Budget Accounts,budget Accounts
 DocType: Employee,Internal Work History,Interne Werk Geschiedenis
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Cumulatieve afschrijvingen Bedrag
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Leverancier Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,volledig uitbetaald
 DocType: Employee Advance,Due Advance Amount,Voorschotbedrag
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
@@ -4923,7 +4956,7 @@
 ,Employee Information,Werknemer Informatie
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van vouchernummer, indien gegroepeerd per voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standaardbelastingsjablonen voor verkopen en kopen worden gemaakt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Beoordeling Resultaat record {0} bestaat al.
@@ -4931,7 +4964,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel alsjeblieft Bedrijfsfilter leeg als Group By is &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting datum kan niet de toekomst datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,voor het genereren van de terugkerende
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Address
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Einde dag
@@ -4956,11 +4988,10 @@
 DocType: Material Request,% Ordered,% Besteld
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Voor cursusgerichte studentengroep wordt de cursus voor elke student gevalideerd van de ingeschreven cursussen in de inschrijving van het programma.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,stukwerk
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gem. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Gem. Buying Rate
 DocType: Share Balance,From No,Van Nee
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nieuw bericht van {sender}
 DocType: Customer,Customer Primary Address,Primair adres van klant
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nieuwsbrieven
 DocType: Drug Prescription,Description/Strength,Beschrijving / Strength
@@ -4969,22 +5000,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Hetzelfde artikel is meerdere keren ingevoerd
 DocType: Department,Leave Block List,Verlof bloklijst
 DocType: Purchase Invoice,Tax ID,BTW-nummer
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} is niet ingesteld voor serienummers. Kolom moet leeg zijn
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} is niet ingesteld voor serienummers. Kolom moet leeg zijn
 DocType: Accounts Settings,Accounts Settings,Rekeningen Instellingen
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Goedkeuren
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted adres voor {0}, gelieve te herstellen om verder te gaan."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted adres voor {0}, gelieve te herstellen om verder te gaan."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Nummer van nieuwe account, deze zal als een prefix in de accountnaam worden opgenomen"
 DocType: Maintenance Team Member,Team Member,Teamlid
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Geen resultaat om in te dienen
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
-DocType: Employee Loan,Rate of Interest (%) / Year,Rate of Interest (%) / Jaar
+DocType: Loan,Rate of Interest (%) / Year,Rate of Interest (%) / Jaar
 ,Project Quantity,project Hoeveelheid
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;"
 DocType: Opportunity,To Discuss,Te bespreken
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} om deze transactie te voltooien.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Jaarlijkse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Tijdelijke Accounts
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Zwart
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Tijdelijke Accounts
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Zwart
 DocType: BOM Explosion Item,BOM Explosion Item,Stuklijst Uitklap Artikel
 DocType: Shareholder,Contact List,Contactlijst
 DocType: Account,Auditor,Revisor
@@ -4992,16 +5023,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} items geproduceerd
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Kom meer te weten
 DocType: Cheque Print Template,Distance from top edge,Afstand van bovenrand
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Prijslijst {0} is uitgeschakeld of bestaat niet
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Prijslijst {0} is uitgeschakeld of bestaat niet
 DocType: Purchase Invoice,Return,Terugkeer
 DocType: Pricing Rule,Disable,Uitschakelen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Wijze van betaling is vereist om een betaling te doen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Wijze van betaling is vereist om een betaling te doen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Bewerken op de volledige pagina voor meer opties zoals activa, serienummers, batches etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Afspraken en overleg
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} is niet ingeschreven in de partij {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan niet worden gesloopt, want het is al {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Controles vereist
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Controles vereist
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Afwezig
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kan bedrijf niet instellen
@@ -5013,7 +5044,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Vloot beheer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Items uit voegen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Items uit voegen
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Gewassen en land
 DocType: Cheque Print Template,Regular,regelmatig
 DocType: Fertilizer,Density (if liquid),Dichtheid (indien vloeibaar)
@@ -5038,24 +5069,26 @@
 DocType: Payment Entry,Paid Amount,Betaald Bedrag
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Verken de verkoopcyclus
 DocType: Assessment Plan,Supervisor,opzichter
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Artikel Variant
 ,Work Order Stock Report,Werkorder Voorraadverslag
+DocType: Purchase Receipt,Auto Repeat Detail,Detail van automatische herhaling
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Result Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Als supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Stel categorie voor
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Accountbalans reeds in Debet, 'Balans moet zijn' mag niet als 'Credit' worden ingesteld"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Quality Management
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Quality Management
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is uitgeschakeld
 DocType: Project,Total Billable Amount (via Timesheets),Totaal factureerbare hoeveelheid (via urenstaten)
 DocType: Agriculture Task,Previous Business Day,Vorige werkdag
-DocType: Employee Loan,Repay Fixed Amount per Period,Terugbetalen vast bedrag per periode
+DocType: Loan,Repay Fixed Amount per Period,Terugbetalen vast bedrag per periode
 DocType: Employee,Health Insurance No,Ziektekostenverzekering Nee
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Totaal belastbaar bedrag
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
 DocType: Opening Invoice Creation Tool,Purchase,Inkopen
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balans Aantal
@@ -5066,16 +5099,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} voor {1}
 DocType: Healthcare Settings,Valid number of days,Geldig aantal dagen
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kostenplaatsen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Start Abonnement opnieuw
 DocType: Land Unit,Linked Plant Analysis,Linked Plant Analysis
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Koers waarmee de leverancier valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rij #{0}: Tijden conflicteren met rij {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zero waarderingspercentage toestaan
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zero waarderingspercentage toestaan
+DocType: Bank Guarantee,Receiving,Het ontvangen
 DocType: Training Event Employee,Invited,Uitgenodigd
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Meerdere actieve Salaris Structuren gevonden voor werknemer {0} de uitgekozen datum
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway accounts.
 DocType: Employee,Employment Type,Dienstverband Type
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Vaste Activa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Vaste Activa
 DocType: Payment Entry,Set Exchange Gain / Loss,Stel Exchange winst / verlies
 ,GST Purchase Register,GST Aankoopregister
 ,Cash Flow,Cashflow
@@ -5096,9 +5131,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lijst met alle aandelentransacties
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Zowel de startdatum van de proefperiode als de einddatum van de proefperiode moeten worden ingesteld
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gemiddelde score
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Het totale betalingsbedrag in het betalingsschema moet gelijk zijn aan het groot / afgerond totaal
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Het totale betalingsbedrag in het betalingsschema moet gelijk zijn aan het groot / afgerond totaal
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankafschrift saldo per General Ledger
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
 DocType: Authorization Rule,Customer / Item Name,Klant / Naam van het punt
@@ -5128,6 +5164,7 @@
 DocType: Work Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actief kan niet worden overgedragen
 DocType: Hotel Room Pricing,Hotel Room Pricing,Prijzen van hotelkamers
+DocType: Subscription,Days Until Due,Dagen tot Due
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Dit artikel is een variant van {0} (Sjabloon).
 DocType: Workstation,per hour,per uur
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,inkoop
@@ -5136,13 +5173,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Voor Batch-based Student Group wordt de Student Batch voor elke student gevalideerd van de Programma Inschrijving.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distributie
+DocType: Journal Entry Account,Loan,Lening
 DocType: Expense Claim Advance,Expense Claim Advance,Onkostendeclaratie doorvoeren
 DocType: Lab Test,Report Preference,Rapportvoorkeur
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Vrijwilliger informatie.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Geciteerd Item Vergelijking
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Overlappen in scoren tussen {0} en {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Intrinsieke waarde Op
 DocType: Crop,Produce,Produceren
@@ -5152,7 +5190,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materiaalverbruik voor productie
 DocType: Item Alternative,Alternative Item Code,Alternatieve artikelcode
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Selecteer Items voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Selecteer Items voor fabricage
 DocType: Delivery Stop,Delivery Stop,Levering Stop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
 DocType: Item,Material Issue,Materiaal uitgifte
@@ -5162,15 +5200,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
 DocType: BOM,Show Items,Show items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van tijd kan niet groter zijn dan tot tijd.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Wilt u alle klanten per e-mail op de hoogte stellen?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Wilt u alle klanten per e-mail op de hoogte stellen?
+DocType: Subscription Plan,Billing Interval,Factuurinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Hervat
 DocType: Hub Settings,Hub Username,Hub-gebruikersnaam
 DocType: Salary Detail,Component,bestanddeel
 DocType: Assessment Criteria,Assessment Criteria Group,Beoordelingscriteria Group
 DocType: Healthcare Settings,Patient Name By,Patiëntnaam By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Inschrijvingsboekingang voor salarissen van {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Inschrijvingsboekingang voor salarissen van {0} tot {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
@@ -5184,22 +5222,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kunt u onderhouden lengte, gewicht, allergieën, medische zorgen, enz."
 DocType: Leave Block List,Applies to Company,Geldt voor Bedrijf
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
-DocType: Employee Loan,Disbursement Date,uitbetaling Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Ontvangers&#39; niet gespecificeerd
+DocType: Loan,Disbursement Date,uitbetaling Date
 DocType: BOM Update Tool,Update latest price in all BOMs,Update de laatste prijs in alle BOM&#39;s
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medisch dossier
 DocType: Vehicle,Vehicle,Voertuig
 DocType: Purchase Invoice,In Words,In Woorden
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Voer de naam van de bank of uitleeninstelling in voordat u ze indient.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} moet worden ingediend
 DocType: POS Profile,Item Groups,Item Groepen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
 DocType: Sales Order Item,For Production,Voor Productie
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Voeg een tijdelijk openstaand account toe in het rekeningschema
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Voeg een tijdelijk openstaand account toe in het rekeningschema
 DocType: Customer,Customer Primary Contact,Hoofdcontactpersoon klant
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periode afsluitingsjournaal
 DocType: Project Task,View Task,Bekijk Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Type bankgarantie
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Factuurgedeelte
 ,Asset Depreciations and Balances,Asset Afschrijvingen en Weegschalen
@@ -5210,9 +5249,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inclusief uitbestede items
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Indiensttreding
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,De Variant-eigenschappen kunnen niet worden gewijzigd na stocktransactie. U moet een nieuw item maken om dit te doen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
-DocType: Employee Loan,Repay from Salary,Terugbetalen van Loon
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+DocType: Loan,Repay from Salary,Terugbetalen van Loon
 DocType: Leave Application,LAP/,RONDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Betalingsverzoeken tegen {0} {1} van {2} bedrag
 DocType: Salary Slip,Salary Slip,Salarisstrook
@@ -5236,11 +5274,11 @@
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate artikelgroep gevonden in de artikelgroep tafel
 DocType: Land Unit,Parent Land Unit,Parent Land Unit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
 DocType: Fertilizer,Fertilizer Name,Meststofnaam
 DocType: Salary Slip,Net Pay,Nettoloon
 DocType: Cash Flow Mapping Accounts,Account,Rekening
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
 ,Requested Items To Be Transferred,Aangevraagde Artikelen te Verplaatsen
 DocType: Expense Claim,Vehicle Log,Voertuig log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Aanwezigheid van een koorts (temp&gt; 38,5 ° C of bijgehouden temperatuur&gt; 38 ° C / 100,4 ° F)"
@@ -5281,24 +5319,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,"
 DocType: Asset Maintenance,Manufacturing User,Productie Gebruiker
 DocType: Purchase Invoice,Raw Materials Supplied,Grondstoffen Geleverd
-DocType: C-Form,Series,Reeksen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta van de prijslijst {0} moet {1} of {2} zijn
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Item Classificatie
 DocType: Driver,License Number,Licentienummer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Doel van onderhouds bezoek
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Invoice Patient Registration
 DocType: Crop,Period,periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Grootboek
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} met verlof om {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} met verlof om {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Bekijk Leads
 DocType: Program Enrollment Tool,New Program,nieuw programma
 DocType: Item Attribute Value,Attribute Value,Eigenschap Waarde
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 DocType: Salary Detail,Salary Detail,salaris Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Selecteer eerst {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Selecteer eerst {0}
 DocType: Appointment Type,Physician,Arts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,overleg
@@ -5306,15 +5343,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan niet groter zijn dan de geplande hoeveelheid ({2}) in werkorder {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet voor de productie.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotaal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Variant-eigenschappen kunnen niet worden gewijzigd na beurstransactie. U moet een nieuw item maken om dit te doen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA-mandaat
 DocType: Physician,Charges,kosten
 DocType: Production Plan,Get Items For Work Order,Items voor werkorder ophalen
 DocType: Salary Detail,Default Amount,Standaard Bedrag
 DocType: Lab Test Template,Descriptive,Beschrijvend
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Magazijn niet gevonden in het systeem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazijn niet gevonden in het systeem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Samenvatting van deze maand
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteitscontrole Meting
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Stel een verkoopdoel dat u voor uw bedrijf wilt bereiken.
 ,Project wise Stock Tracking,Projectgebaseerde Aandelenhandel
@@ -5342,11 +5380,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Kan website niet maken
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retentie Stock Entry al gemaakt of Sample Quantity niet verstrekt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retentie Stock Entry al gemaakt of Sample Quantity niet verstrekt
 DocType: Program,Program Abbreviation,programma Afkorting
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
 DocType: Warranty Claim,Resolved By,Opgelost door
-DocType: Bank Guarantee,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Toewijzen bladeren voor een periode .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques en Deposito verkeerd ontruimd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
@@ -5361,11 +5398,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Uren
 DocType: Project,Expected Start Date,Verwachte startdatum
 DocType: Purchase Invoice,04-Correction in Invoice,04-correctie op factuur
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Werkorder al gemaakt voor alle artikelen met Stuklijst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Werkorder al gemaakt voor alle artikelen met Stuklijst
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Details Rapport
 DocType: Setup Progress Action,Setup Progress Action,Setup Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Prijslijst kopen
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Prijslijst kopen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Artikel verwijderen als de kosten niet van toepassing zijn op dat artikel
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Annuleer abonnement
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Selecteer Onderhoudsstatus als voltooid of verwijder de voltooiingsdatum
 DocType: Supplier,Default Payment Terms Template,Standaard betalingsvoorwaarden sjabloon
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transactie valuta moet hetzelfde zijn als Payment Gateway valuta
@@ -5376,7 +5414,6 @@
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Actie als gezamenlijke maandelijkse budget overschreden
-DocType: Subscription,Submit on creation,Toevoegen aan de creatie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Munt voor {0} moet {1}
 DocType: Asset,Disposal Date,verwijdering Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails worden meegedeeld aan alle actieve werknemers van het bedrijf worden verzonden op het opgegeven uur, als ze geen vakantie. Samenvatting van de reacties zal worden verzonden om middernacht."
@@ -5395,6 +5432,7 @@
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Cheque Print Template,Cheque Print Template,Cheque Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenplaatsenschema
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Het aantal dagen na de factuurdatum is verstreken voordat het abonnements- of markeringsabonnement als onbetaald werd geannuleerd
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
 DocType: Price List,Price List Name,Prijslijst Naam
@@ -5403,7 +5441,7 @@
 DocType: Account,Income,Inkomsten
 DocType: Industry Type,Industry Type,Industrie Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Er is iets fout gegaan!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 DocType: Supplier Scorecard Scoring Criteria,Score,partituur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Boekjaar {0} bestaat niet
@@ -5423,12 +5461,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} moet een waarde tussen 0 en 100 zijn
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,De volgende waarderingsdatum kan niet eerder zijn dan de datum van gebruik voor gebruik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Leningen zonder onderpand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max werkuren tegen Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplande Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Totale betaalde Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Totale betaalde Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere berichten
 DocType: Purchase Receipt Item,Received and Accepted,Ontvangen en geaccepteerd
 DocType: Hub Settings,Company and Seller Profile,Bedrijf en verkoperprofiel
@@ -5442,10 +5480,9 @@
 DocType: Item,Variant Based On,Variant gebaseerd op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Uw Leveranciers
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corrigeer alstublieft de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
 DocType: Request for Quotation Item,Supplier Part No,Leverancier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anoniem
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Gekregen van
 DocType: Lead,Converted,Omgezet
@@ -5459,6 +5496,7 @@
 DocType: Asset,Assets,Middelen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
+DocType: Subscription,Current Invoice End Date,Huidige factuur einddatum
 DocType: Payment Term,Due Date Based On,Vervaldatum op basis van
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Stel de standaard klantgroep en het gebied in de verkoopinstellingen in
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} bestaat niet
@@ -5466,7 +5504,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Geen terugbetalingen geselecteerd voor journaalboeking
 DocType: Payment Reconciliation,From Invoice Date,Na factuurdatum
+DocType: Loan,Disbursed,uitbetaald
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriuminstellingen
 DocType: Patient Appointment,Service Unit,Service-eenheid
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Leverancier met succes instellen
@@ -5479,12 +5519,12 @@
 DocType: Share Balance,No of Shares,Aantal aandelen
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Selecteer Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: School House,House Name,Huis naam
 DocType: Fee Schedule,Total Amount per Student,Totaal Bedrag per student
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,elektrisch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,elektrisch
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg de rest van uw organisatie als uw gebruikers. U kunt ook toevoegen uitnodigen klanten naar uw portal door ze toe te voegen vanuit Contacten
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
 DocType: Grant Application,Requested Amount,Gevraagde bedrag
@@ -5494,7 +5534,7 @@
 DocType: Crop Cycle,Detected Diseases,Gedetecteerde ziekten
 DocType: Stock Entry,Default Source Warehouse,Standaard Bronmagazijn
 DocType: Item,Customer Code,Klantcode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 DocType: Asset Maintenance Task,Last Completion Date,Laatste voltooiingsdatum
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
@@ -5502,9 +5542,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless-instellingen
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Voorraad Activa
 DocType: Restaurant,Active Menu,Actief menu
 DocType: Target Detail,Target Qty,Doel Aantal
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Tegen lening: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Afrekenen Instellingen
 DocType: Student Attendance,Present,Presenteer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
@@ -5513,9 +5554,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Production Plan Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
 DocType: Chapter,Chapter Head,Hoofdstuk hoofd
 DocType: Payment Term,Month(s) after the end of the invoice month,Maand (en) na het einde van de factuurmaand
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Project activiteit / taak.
@@ -5523,11 +5564,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstroken
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab-resultaat datetime kan niet vóór het testen van datetime zijn
 DocType: POS Profile,Allow user to edit Discount,Sta de gebruiker toe om Korting te bewerken
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Haal klanten uit
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Haal klanten uit
 DocType: Purchase Invoice Item,Include Exploded Items,Exploded Items opnemen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
 DocType: Shipping Rule,Restrict to Countries,Beperken tot landen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Instellingen&gt; Instellingen&gt; Serie benoemen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
 DocType: Project,Total Sales Amount (via Sales Order),Totaal verkoopbedrag (via klantorder)
@@ -5546,6 +5588,7 @@
 DocType: Soil Texture,Sandy Clay,Zanderige klei
 DocType: Grant Application,Assessment  Manager,Assessment Manager
 DocType: Payment Entry,Allocate Payment Amount,Toewijzen Betaling Bedrag
+DocType: Subscription Plan,Subscription Plan,Abonnement
 DocType: Employee External Work History,Salary,Salaris
 DocType: Serial No,Delivery Document Type,Levering Soort document
 DocType: Sales Order,Partly Delivered,Deels geleverd
@@ -5570,9 +5613,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Vergrijzing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voorinstellingen installeren
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Geen leveringsbewijs geselecteerd voor klant {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Geen leveringsbewijs geselecteerd voor klant {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Stuklijst vervangen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Selecteer items op basis van leveringsdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Selecteer items op basis van leveringsdatum
 DocType: Grant Application,Has any past Grant Record,Heeft een eerdere Grant Record
 ,Sales Analytics,Verkoop analyse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Beschikbaar {0}
@@ -5591,7 +5634,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstoffen Leveringskosten
 DocType: Selling Settings,Settings for Selling Module,Instellingen voor het verkopen van Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelkamerreservering
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Klantenservice
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Klantenservice
 DocType: BOM,Thumbnail,Miniatuur
 DocType: Item Customer Detail,Item Customer Detail,Artikel Klant Details
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Aanbieding kandidaat een baan.
@@ -5607,7 +5650,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studenten zijn ingeschreven
 DocType: Fees,Student Details,Student Details
 DocType: Purchase Invoice Item,Stock Qty,Aantal voorraad
-DocType: Employee Loan,Repayment Period in Months,Terugbetaling Periode in maanden
+DocType: Loan,Repayment Period in Months,Terugbetaling Periode in maanden
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fout: geen geldig id?
 DocType: Naming Series,Update Series Number,Serienummer bijwerken
 DocType: Account,Equity,Vermogen
@@ -5616,7 +5659,7 @@
 DocType: Task,Closing Date,Afsluitingsdatum
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
 DocType: Timesheet,Work Detail,Werkdetails
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingenieur
 DocType: Journal Entry,Total Amount Currency,Totaal bedrag Currency
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zoeken Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
@@ -5662,13 +5705,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donor Type informatie.
 DocType: Request for Quotation,Supplier Detail,Leverancier Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fout in formule of aandoening: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Factuurbedrag
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Factuurbedrag
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Criteriumgewichten moeten maximaal 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Aanwezigheid
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Stock items
 DocType: BOM,Materials,Materialen
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} maken
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Bron en Target Warehouse kan niet hetzelfde zijn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
@@ -5692,14 +5734,14 @@
 DocType: Shipping Rule,Fixed,vast
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afronden Account
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administratie Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administratie Kosten
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
-DocType: Journal Entry,Subscription,Abonnement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Contact E-mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Fee Creation In afwachting
 DocType: Appraisal Goal,Score Earned,Verdiende Score
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Opzegtermijn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Opzegtermijn
 DocType: Asset Category,Asset Category Name,Asset Categorie Naam
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dit is een basis regio en kan niet worden bewerkt .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nieuwe Sales Person Naam
@@ -5713,7 +5755,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
 DocType: Asset,Frequency of Depreciation (Months),Frequentie van afschrijvingen (Maanden)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Credit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Toon nulwaarden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na productie / herverpakken van de gegeven hoeveelheden grondstoffen
@@ -5721,7 +5763,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
 DocType: Hub Settings,Company Logo,Bedrijfslogo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 DocType: Healthcare Settings,Patient Registration,Patiëntregistratie
@@ -5756,11 +5798,10 @@
 DocType: Journal Entry,Total Debit,Totaal Debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standaard Finished Goods Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Selecteer alstublieft Patiënt
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Verkoper
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Verkoper
 DocType: Hotel Room Package,Amenities,voorzieningen
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Begroting en Cost Center
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Meerdere standaard betalingswijze is niet toegestaan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,voor de
 ,Appointment Analytics,Benoemingsanalyse
 DocType: Vehicle Service,Half Yearly,Halfjaarlijkse
 DocType: Lead,Blog Subscriber,Blog Abonnee
@@ -5777,6 +5818,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Verlaat leeg als u studentengroepen per jaar maakt
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien aangevinkt, Totaal niet. van Werkdagen zal omvatten feestdagen, en dit zal de waarde van het salaris per dag te verminderen"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apps die de huidige sleutel gebruiken, hebben geen toegang, weet u het zeker?"
+DocType: Subscription Settings,Prorate,pro-rata
 DocType: Purchase Invoice,Total Advance,Totaal Voorschot
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Sjablooncode wijzigen
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,De Term Einddatum kan niet eerder dan de Term startdatum. Corrigeer de data en probeer het opnieuw.
@@ -5788,8 +5830,9 @@
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 DocType: Cheque Print Template,Signatory Position,ondertekenaar Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Instellen als Verloren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Instellen als Verloren
 DocType: Timesheet,Total Billable Hours,Totaal factureerbare uren
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Aantal dagen dat de abonnee de facturen moet betalen die door dit abonnement worden gegenereerd
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Ontvangst Opmerking
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dit is gebaseerd op transacties tegen deze klant. Zie tijdlijn hieronder voor meer informatie
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan Payment Entry bedrag {2}
@@ -5808,12 +5851,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Company,Company Info,Bedrijfsinformatie
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Selecteer of voeg nieuwe klant
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseerd op de aanwezigheid van deze werknemer
 DocType: Assessment Result,Summary,Overzicht
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debetrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debetrekening
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurantbestelling Item invoeren
@@ -5825,7 +5868,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Aankoopbedrag
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Employee Benefits
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Employee Benefits
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Work Order,Manufactured Qty,Geproduceerd Aantal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},De shares bestaan niet met de {0}
@@ -5833,12 +5876,12 @@
 DocType: Asset,Out of Order,Out of Order
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 DocType: Projects Settings,Ignore Workstation Time Overlap,Negeer overlapping werkstationtijd
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Stel een standaard Holiday-lijst voor Employee {0} of Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Stel een standaard Holiday-lijst voor Employee {0} of Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Selecteer batchnummers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factureren aan Klanten
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 DocType: Patient Service Unit,Medical Administrator,Medisch beheerder
 DocType: Assessment Plan,Schedule,Plan
 DocType: Account,Parent Account,Bovenliggende rekening
@@ -5868,15 +5911,16 @@
 DocType: Asset Repair,Repair Status,Reparatiestatus
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Selecteer eerst Werknemer Record.
 DocType: POS Profile,Account for Change Amount,Account for Change Bedrag
 DocType: Purchase Invoice,input service,invoerdienst
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Onderhoudsteamlid
 DocType: Agriculture Analysis Criteria,Soil Analysis,Bodemanalyse
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Cursuscode:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vul Kostenrekening in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Als artikel is een variant van een ander item dan beschrijving, afbeelding, prijzen, belastingen etc zal worden ingesteld van de sjabloon, tenzij expliciet vermeld"
 DocType: Serial No,Purchase / Manufacture Details,Inkoop / Productie Details
@@ -5925,19 +5969,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Opnames voor {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabele naam
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
 DocType: Asset,Asset Category,Asset Categorie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettoloon kan niet negatief zijn
 DocType: Purchase Order,Advance Paid,Voorschot Betaald
 DocType: Item,Item Tax,Artikel Belasting
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiaal aan Leverancier
 DocType: Soil Texture,Loamy Sand,Leemachtige zand
 DocType: Production Plan,Material Request Planning,Materiaal Verzoek Planning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Accijnzen Factuur
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% meer dan eens
 DocType: Expense Claim,Employees Email Id,Medewerkers E-mail ID
 DocType: Employee Attendance Tool,Marked Attendance,Gemarkeerde Attendance
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kortlopende Schulden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kortlopende Schulden
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer heeft de gegeven uren overschreden.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Stuur massa SMS naar uw contacten
 DocType: Patient,A Positive,Een positief
@@ -5948,9 +5992,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} heeft momenteel een {1} Leveranciers Scorecard, en er worden voorzichtige waarborgen uitgegeven bij inkooporders."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
-DocType: Employee Loan,Loan Type,Loan Type
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} is succesvol ingediend
+DocType: Loan,Loan Type,Loan Type
 DocType: Scheduling Tool,Scheduling Tool,scheduling Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredietkaart
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredietkaart
 DocType: BOM,Item to be manufactured or repacked,Artikel te vervaardigen of herverpakken
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5982,7 +6027,7 @@
 DocType: Item,Units of Measure,Meeteenheden
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat Productie op vakantie
 DocType: Sales Invoice,Customer's Purchase Order Date,Inkooporder datum van Klant
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitaal Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitaal Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Publieke bijlagen tonen
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
 DocType: Restaurant Reservation,Reservation Time,Reservatietijd
@@ -5997,7 +6042,7 @@
 DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rij # {0}: Gewenste datum mag niet vóór Transactiedatum liggen
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Aanbevolen producten
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Ontwerper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
@@ -6007,20 +6052,20 @@
 DocType: Driver,Expiry Date,Vervaldatum
 DocType: Healthcare Settings,Employee name and designation in print,Werknemer naam en aanduiding in print
 ,accounts-browser,accounts-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Selecteer eerst een Categorie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project stam.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Om ervoor te zorgen over-facturering of over-bestellen, &quot;Allowance&quot; actualiseren Stock Settings of het item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Halve Dag)
 DocType: Payment Term,Credit Days,Credit Dagen
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Selecteer Patiënt om Lab-tests te krijgen
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Maak Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lead Time Dagen
 DocType: Cash Flow Mapping,Is Income Tax Expense,Is de inkomstenbelasting
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controleer dit als de student in het hostel van het Instituut verblijft.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
 ,Stock Summary,Stock Samenvatting
@@ -6031,10 +6076,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: BOM Operation,Operating Cost(Company Currency),Bedrijfskosten (Company Munt)
-DocType: Employee Loan Application,Rate of Interest,Rentevoet
+DocType: Loan Application,Rate of Interest,Rentevoet
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: Item,Shelf Life In Days,Houdbaarheid in dagen
 DocType: GL Entry,Is Opening,Opent
+DocType: Department,Expense Approvers,Expense Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
 DocType: Journal Entry,Subscription Section,Abonnementsafdeling
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Rekening {0} bestaat niet
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 2074397..a1035c4 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Evalueringsrapporter
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Forbrukerprodukter
-DocType: Purchase Receipt,Subscription Detail,Abonnementsdetaljer
 DocType: Supplier Scorecard,Notify Supplier,Informer Leverandør
 DocType: Item,Customer Items,Kunde Items
 DocType: Project,Costing and Billing,Kalkulasjon og fakturering
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-postvarsling
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,evaluering
 DocType: Item,Default Unit of Measure,Standard måleenhet
 DocType: SMS Center,All Sales Partner Contact,All Sales Partner Kontakt
-DocType: Employee,Leave Approvers,La godkjennere
+DocType: Department,Leave Approvers,La godkjennere
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,undersøkelser
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Sjekk tilgjengelighet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er basert på transaksjoner mot denne leverandøren. Se tidslinjen nedenfor for detaljer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juridisk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juridisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
 DocType: Bank Guarantee,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kreves av
 DocType: Delivery Note,Return Against Delivery Note,Tilbake mot følgeseddel
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoder (eller grupper) mot hvilke regnskapspostene er laget og balanserer opprettholdes.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Det er ingen innsendte lønnslister å behandle.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Det er ingen innsendte lønnslister å behandle.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åpen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det er nødvendig å ta denne handlingen i dag selv for ovennevnte tilbakevendende
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Sjekk ut
 DocType: Pricing Rule,Apply On,Påfør på
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
 DocType: Support Settings,Support Settings,støtte~~POS=TRUNC Innstillinger
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New La Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Element Utløps Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Draft
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Draft
 DocType: Membership,membership validaty section,medlemskapsvaliditetsseksjon
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 DocType: Consultation,Consultation,Konsultasjon
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Å lage nettside
 DocType: Opening Invoice Creation Tool Item,Quantity,Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Lån (gjeld)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
 DocType: Item,Country of Origin,Opprinnelsesland
 DocType: Soil Texture,Soil Texture Criteria,Kriterier for jordstruktur
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primær kontaktdetaljer
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,åpne spørsmål
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 DocType: Lab Test Groups,Add new line,Legg til ny linje
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Helsevesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dager)
@@ -89,7 +85,7 @@
 ,Delay Days,Forsinkelsesdager
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Vektdetaljer
 DocType: Asset Maintenance Log,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total koster Beløp
 DocType: Delivery Note,Vehicle No,Vehicle Nei
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Vennligst velg Prisliste
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Arbeid På Går
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Vennligst velg dato
 DocType: Daily Work Summary Group,Holiday List,Holiday List
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Accountant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Accountant
 DocType: Hub Settings,Selling Price List,Selge prisliste
 DocType: Patient,Tobacco Current Use,Nåværende bruk av tobakk
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Selgingsfrekvens
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Selgingsfrekvens
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonnr
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0} # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Innledende e-postvarsling sendt
 ,Sales Partners Commission,Sales Partners Commission
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Verdi etter avskrivninger
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,I slekt
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Oppmøte dato kan ikke være mindre enn ansattes bli dato
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Oppmøte dato kan ikke være mindre enn ansattes bli dato
 DocType: Grading Scale,Grading Scale Name,Grading Scale Name
-DocType: Subscription,Repeat on Day,Gjenta på dagen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dette er en rot konto og kan ikke redigeres.
 DocType: Sales Invoice,Company Address,Firma adresse
 DocType: BOM,Operations,Operasjoner
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sette autorisasjon på grunnlag av Rabatt for {0}
+DocType: Subscription,Subscription Start Date,Abonnements startdato
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Fest CSV-fil med to kolonner, en for det gamle navnet og en for det nye navnet"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ikke i noen aktiv regnskapsåret.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Henvisning: {0}, Varenummer: {1} og kunde: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Prøveperiode Sluttdato kan ikke være før startdato for prøveperiode
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Åpning for en jobb.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke spesifisert for underleverandørelementet {0} på rad {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tillatt for {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Få elementer fra
 DocType: Price List,Price Not UOM Dependant,Pris Ikke UOM Avhengig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,bremse~~POS=TRUNC Oil
 DocType: Tax Rule,Tax Type,Skatt Type
 ,Completed Work Orders,Fullførte arbeidsordrer
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Skattepliktig beløp
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Skattepliktig beløp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: BOM,Item Image (if not slideshow),Sak Image (hvis ikke show)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referansedokumenttype må være en av kostnadskrav eller journaloppføring
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Velg BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referansedokumenttype må være en av kostnadskrav eller journaloppføring
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Velg BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad for leverte varer
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Administrer forhåndsbeløp gitt til Medarbeider
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Leveringsvarsling
 DocType: Journal Entry,Opening Entry,Åpning Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Bare konto Pay
-DocType: Employee Loan,Repay Over Number of Periods,Betale tilbake over antall perioder
+DocType: Loan,Repay Over Number of Periods,Betale tilbake over antall perioder
 DocType: Stock Entry,Additional Costs,Tilleggskostnader
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørsel
 DocType: Education Settings,Validate Batch for Students in Student Group,Valider batch for studenter i studentgruppen
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen forlater plate funnet for ansatt {0} og {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ingen forlater plate funnet for ansatt {0} og {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Skriv inn et selskap først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Vennligst velg selskapet først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Vennligst angi standardmal for statusmeldingsstatus i HR-innstillinger.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Medarbeider Loan
 DocType: Fee Schedule,Send Payment Request Email,Send betalingsanmodning e-post
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Eiendom
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Helt uregistrert.
 DocType: Assessment Result,Grade,grade
 DocType: Restaurant Table,No of Seats,Antall plasser
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","For å legge til dynamisk emne, bruk jinja-koder som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset Maintenance Task
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Årslønn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Årslønn
 DocType: Daily Work Summary,Daily Work Summary,Daglig arbeid Oppsummering
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Aksje Utgifter
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Aksje Utgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Velg Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Velg Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Fyll inn foretrukne e-
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Fyll inn foretrukne e-
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,hoved adresse
 DocType: Production Plan,Material Request Detail,Material Request Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standard Quotation Gyldighetsdager
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Sales Invoice,Change Amount,endring Beløp
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kjørelisenskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Vennligst oppgi Leveringsdato
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
+DocType: HR Settings,Leave Settings,Forlat innstillinger
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Forespørsel Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Gjør Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Kringkasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Oppsettmodus for POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Deaktiverer opprettelse av tidslogger mot arbeidsordre. Operasjoner skal ikke spores mot arbeidsordre
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Execution
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Execution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Asset Maintenance Log,Maintenance Status,Vedlikehold Status
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Medlemskapsdetaljer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandør er nødvendig mot Betales konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Elementer og priser
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Antall timer: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
 DocType: Drug Prescription,Interval,intervall
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preference
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preference
 DocType: Grant Application,Individual,Individuell
 DocType: Academic Term,Academics User,akademikere Bruker
 DocType: Cheque Print Template,Amount In Figure,Beløp I figur
-DocType: Employee Loan Application,Loan Info,lån info
+DocType: Loan Application,Loan Info,lån info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedlikeholdsbesøk.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Leverandør Scorecard Periode
 DocType: Share Transfer,Share Transfer,Del overføring
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Artikkelmal
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,biokjemi
 DocType: Job Offer,Select Terms and Conditions,Velg Vilkår
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ut Verdi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ut Verdi
 DocType: Woocommerce Settings,Woocommerce Settings,Innstillinger for WoCommerce
 DocType: Production Plan,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Verdivurdering
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Standard Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,TV
 DocType: Work Order Operation,Updated via 'Time Log',Oppdatert via &#39;Time Logg&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Velg kunden eller leverandøren.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Company,Enable Perpetual Inventory,Aktiver evigvarende beholdning
+DocType: Bank Guarantee,Charges Incurred,Avgifter opphørt
 DocType: Company,Default Payroll Payable Account,Standard Lønn betales konto
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Oppdater E-postgruppe
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Tilpasset resultat
 DocType: Delivery Stop,Contact Name,Kontakt Navn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kursvurderingskriteriene
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Skatte-ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Skatte-ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student ID:
 DocType: POS Customer Group,POS Customer Group,POS Kundegruppe
 DocType: Land Unit,Land Unit describing various land assets,Land Enhet som beskriver ulike eiendeler
@@ -375,9 +372,8 @@
 ,Open Work Orders,Åpne arbeidsordre
 DocType: Payment Term,Credit Months,Kredittmåneder
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","For å slutte å sende gjentatte feilmeldinger fra systemet, har vi sjekket deaktivert felt i abonnementet"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Later per år
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Later per år
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk &#39;Er Advance &quot;mot Account {1} hvis dette er et forskudd oppføring.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Email Digest,Profit & Loss,Profitt tap
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Vennligst oppsett Studentene under Student Grupper
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank Entries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank Entries
 DocType: Crop,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Gruppe Creation Tool Course
 DocType: Lead,Do Not Contact,Ikke kontakt
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Folk som underviser i organisasjonen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Programvareutvikler
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Course Scheduling Tool,Course Start Date,Kursstart
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Kjøps Detaljer
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maksimal karakter
 DocType: Email Digest,New Quotations,Nye Sitater
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poster lønn slip til ansatte basert på foretrukne e-post valgt i Employee
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Tax Rule,Shipping County,Shipping fylke
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Lære
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lære
 DocType: Asset,Next Depreciation Date,Neste Avskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per Employee
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
 DocType: Driver,Fleet Manager,Flåtesjef
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} ikke kan være negativ for elementet {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} ikke kan være negativ for elementet {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Vennligst sett inn hotellrenten på {}
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Levering Note
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Cost of Selges Asset
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Planlegging Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Feil mens du oppretter tilbakevendende% s for% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
 DocType: Land Unit,LInked Analysis,Analyse
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Søknadsperioden kan ikke være over to allokeringsregister
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Søknadsperioden kan ikke være over to allokeringsregister
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
 DocType: Volunteer,Weekends,helger
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kreditt Note Beløp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kreditt Note Beløp
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Ferdigvarer
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Legg varer
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Sak Quality Inspection Parameter
+DocType: Leave Application,Leave Approver Name,La Godkjenner Name
 DocType: Depreciation Schedule,Schedule Date,Schedule Date
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Inntjening, fradrag og andre Lønn komponenter"
 DocType: Packed Item,Packed Item,Pakket Element
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
 DocType: Healthcare Settings,Require Lab Test Approval,Krever godkjenning av laboratorietest
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Totalt Utestående
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Totalt Utestående
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
 DocType: Dosage Strength,Strength,Styrke
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Opprett en ny kunde
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Forbrukskostnads
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
 DocType: Student Log,Medical,Medisinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Grunnen for å tape
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Grunnen for å tape
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Oppdater kontonummer
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Bly Eier kan ikke være det samme som Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Avsatt beløp kan ikke større enn ujustert beløp
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Enslig
 DocType: Salary Slip,Total Loan Repayment,Total Loan Nedbetaling
 DocType: Account,Cost of Goods Sold,Varekostnad
-DocType: Subscription,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Skriv inn kostnadssted
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Skriv inn kostnadssted
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Salgskurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Salgskurs
 DocType: Assessment Plan,Examiner Name,Examiner Name
 DocType: Lab Test Template,No Result,Ingen resultater
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Skriv inn firmanavn først
 DocType: Purchase Invoice,Supplier Name,Leverandør Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Les ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Vis blader av alle avdelingsmedlemmer i kalender
 DocType: Purchase Invoice,01-Sales Return,01-salgs retur
 DocType: Account,Is Group,Is Gruppe
 DocType: Email Digest,Pending Purchase Orders,Avventer innkjøpsordrer
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} er ikke knyttet til {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Tilpass innledende tekst som går som en del av e-posten. Hver transaksjon har en egen innledende tekst.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Vennligst angi standard betalbar konto for selskapet {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Vennligst angi standard betalbar konto for selskapet {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transaksjon ikke tillatt mot stoppet Arbeidsordre {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc-tall
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservert for salg
 DocType: Packing Slip,From Package No.,Fra Package No.
 DocType: Item Attribute,To Range,Range
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke endre verdsettelsesmetoden, da det er transaksjoner mot enkelte poster som ikke har egen verdsettelsesmetode"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Verdipapirer og innskudd
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke endre verdsettelsesmetoden, da det er transaksjoner mot enkelte poster som ikke har egen verdsettelsesmetode"
 DocType: Student Report Generation Tool,Attended by Parents,Deltatt av foreldre
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Patient,AB Positive,AB Positiv
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Tilskuerrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønn Component for timebasert lønn.
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
-DocType: Employee Loan,Total Payment,totalt betaling
+DocType: Loan,Total Payment,totalt betaling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Kan ikke avbryte transaksjonen for fullført arbeidsordre.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} er kansellert, slik at handlingen ikke kan fullføres"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Deler bygge
 DocType: POS Profile User,POS Profile User,POS Profil Bruker
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Inntekt
+DocType: Subscription Invoice,Subscription Invoice,Abonnementsfaktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direkte Inntekt
 DocType: Patient Appointment,Date TIme,Dato tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Sette opp selskap og skatter
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
 DocType: Codification Table,Codification Table,Kodifiseringstabell
 DocType: Timesheet Detail,Hrs,timer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Vennligst velg selskapet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry Detail,Difference Account,Forskjellen konto
 DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Cash Flow Mapping Template
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
+DocType: Bank Guarantee,Providing,Gir
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ikke tillatt, konfigurer Lab Test Template etter behov"
 DocType: Patient,Risk Factors,Risikofaktorer
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 DocType: Healthcare Settings,Appointment Confirmation,Avtalebekreftelse
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Lukking (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Flytt element
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Sett allerede standard i pos profil {0} for bruker {1}, vennligst deaktivert standard"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akkumulerte verdier
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Område er påkrevd i POS-profil
 DocType: Supplier,Prevent RFQs,Forhindre RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Gjør Salgsordre
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Lønnsslipp legges inn for perioden fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Lønnsslipp legges inn for perioden fra {0} til {1}
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Fraktregningsdato
 DocType: Production Plan,Production Plan,Produksjonsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Åpning av fakturaopprettingsverktøy
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Merk: Totalt tildelte blader {0} bør ikke være mindre enn allerede innvilgede permisjoner {1} for perioden
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Angi antall i transaksjoner basert på serienummerinngang
 ,Total Stock Summary,Totalt lageroppsummering
 DocType: Announcement,Posted By,Postet av
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vennligst sett selskapet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vennligst sett selskapet
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Trening Resultat Medarbeider
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
-DocType: Repayment Schedule,Principal Amount,hovedstol
-DocType: Employee Loan Application,Total Payable Interest,Total skyldige renter
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,hovedstol
+DocType: Loan Application,Total Payable Interest,Total skyldige renter
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totalt utestående: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurantreservasjon
 DocType: Land Unit,Land Unit Name,Land Enhetsnavn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Forslaget Writing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Innpakning
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Meld kundene via e-post
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Meld kundene via e-post
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
 DocType: Employee Advance,Claimed Amount,Påkrevd beløp
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
 DocType: Supplier Scorecard,Per Year,Per år
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ikke kvalifisert for opptak i dette programmet i henhold til DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Sales Invoice,Sales Taxes and Charges,Salgs Skatter og avgifter
 DocType: Employee,Organization Profile,Organisasjonsprofil
 DocType: Vital Signs,Height (In Meter),Høyde (i meter)
 DocType: Student,Sibling Details,søsken Detaljer
 DocType: Vehicle Service,Vehicle Service,Vehicle service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatisk utløser tilbakemeldinger forespørsel basert på forholdene.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatisk utløser tilbakemeldinger forespørsel basert på forholdene.
 DocType: Employee,Reason for Resignation,Grunnen til Resignasjon
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Mal for medarbeidersamtaler.
 DocType: Sales Invoice,Credit Note Issued,Kreditnota Utstedt
@@ -851,14 +848,13 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Vedlikeholdsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Netto endring i varelager
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Ansattes lån Ledelse
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relasjon med Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling fra / til
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vennligst sett inn konto i Lager {0}
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Based On&quot; og &quot;Grupper etter&quot; ikke kan være det samme
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basert på"" og ""Grupper etter"" ikke kan være det samme"
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
 DocType: Installation Note,IN-,I-
 DocType: Work Order Operation,In minutes,I løpet av minutter
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Material Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Kunne ikke finne banen for
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Åpning (Dr)
+DocType: Loan,Applicant,Søker
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Oppslaget tidsstempel må være etter {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Å gjøre gjentatte dokumenter
 ,GST Itemised Purchase Register,GST Artized Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Planlegge på nytt
-DocType: Employee Loan,Total Interest Payable,Total rentekostnader
+DocType: Loan,Total Interest Payable,Total rentekostnader
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter og avgifter
 DocType: Work Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Bli ferdig
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Utgangspunkt
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Utgangspunkt
 DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Skriv Off Beløp
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Skriv Off Beløp
 DocType: Leave Block List Allow,Allow User,Tillat User
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / tap-konto på Asset Avhending
 DocType: Vehicle Log,Service Details,Servicedetaljer
 DocType: Vehicle Log,Service Details,Servicedetaljer
-DocType: Subscription,Quarterly,Quarterly
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,gruppert
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tids skjema
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Spylings Råvare basert på
 DocType: Sales Invoice,Port Code,Portkode
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Warehouse
 DocType: Lead,Lead is an Organization,Bly er en organisasjon
 DocType: Guardian Interest,Interest,Renter
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Før salg
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Kontoer
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Siste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Maler med leverandørpoengkriterier.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Markedsføring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Markedsføring
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Betaling Entry er allerede opprettet
 DocType: Request for Quotation,Get Suppliers,Få leverandører
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Forhåndsvisning Lønn Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Forhåndsvisning Lønn Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Du kan bare fornye hvis medlemskapet ditt utløper innen 30 dager
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Bare velg hvis du har installert Cash Flow Mapper-dokumenter
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Supplier Scorecard,Per Week,Per uke
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totalt Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredittkort Entry
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Selskapet og regnskap
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,i Verdi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,i Verdi
 DocType: Asset Settings,Depreciation Options,Avskrivningsalternativer
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ugyldig innleggstid
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ugyldig innleggstid
 DocType: Lead,Campaign Name,Kampanjenavn
 DocType: Hotel Room,Capacity,Kapasitet
 DocType: Selling Settings,Close Opportunity After Days,Lukk mulighet da Days
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Budget,Budget Against,budsjett Against
 DocType: Employee,Cell Number,Cell Number
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det er ingen ansatt for de oppgitte kriteriene. Sjekk at Lønnslister ikke allerede er opprettet.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det er ingen ansatt for de oppgitte kriteriene. Sjekk at Lønnslister ikke allerede er opprettet.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vennligst velg en tabell
 DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-postadresse i &quot;Mottakere&quot;
 DocType: Special Test Items,Particulars,opplysninger
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Asset,Maintenance,Vedlikehold
+DocType: Subscriber,Subscriber,abonnent
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Vennligst oppdater prosjektstatusen din
 DocType: Item,Maximum sample quantity that can be retained,Maksimal prøvemengde som kan beholdes
@@ -1059,26 +1055,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinnstillingene for handlekurv
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Legg til Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset kasserte via bilagsregistrering {0}
-DocType: Employee Loan,Interest Income Account,Renteinntekter konto
+DocType: Loan,Interest Income Account,Renteinntekter konto
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Gjennomgå invitasjon sendt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gå til
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Sette opp e-postkonto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Skriv inn Sak først
 DocType: Asset Repair,Downtime,nedetid
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Faglig semester:
 DocType: Salary Detail,Do not include in total,Ikke inkluder i alt
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Prøvekvantitet {0} kan ikke være mer enn mottatt mengde {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Request for Quotation Supplier,Send Email,Send E-Post
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 DocType: Item,Max Sample Quantity,Maks antall prøver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Ingen tillatelse
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Sitat forespurt
 DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
 DocType: Company,Default Bank Account,Standard Bank Account
@@ -1089,12 +1085,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab Tests og Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
-DocType: Subscription,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentgruppen er allerede oppdatert.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen er allerede oppdatert.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Prosjektoppdatering.
 DocType: SMS Center,All Customer Contact,All Kundekontakt
 DocType: Land Unit,Tree Details,Tree Informasjon
@@ -1144,7 +1139,6 @@
 DocType: Stock Entry,STE-,an- drogene
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alle varegrupper
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
 DocType: Work Order,Item To Manufacture,Element for å produsere
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status er {2}
@@ -1158,7 +1152,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",Velg hvis den valgte adressen redigeres etter lagre
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Opening&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Opening&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åpne for å gjøre
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Lab Test Template,Result Format,Resultatformat
@@ -1168,7 +1162,7 @@
 DocType: Payroll Entry,Bimonthly,annenhver måned
 DocType: Vehicle Service,Brake Pad,Bremsekloss
 DocType: Fertilizer,Fertilizer Contents,Innhold av gjødsel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Forskning Og Utvikling
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Forskning Og Utvikling
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
 DocType: Timesheet,Total Billed Amount,Total Fakturert beløp
@@ -1182,7 +1176,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Bypass kredittgrense sjekke på salgsordre
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Medarbeidersamtaler.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven&quot;, som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Utsalgssted
@@ -1216,7 +1210,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimum sitteplasser
 DocType: Item Attribute,Item Attribute Values,Sak attributtverdier
 DocType: Examination Result,Examination Result,Sensur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referanse DOCTYPE må være en av {0}
@@ -1224,15 +1218,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} må være aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Ingen elementer tilgjengelig for overføring
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Ingen elementer tilgjengelig for overføring
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Avslutning (Åpning + Totalt)
 DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Pris eller rabatt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoritter
 DocType: Hub Settings,Custom Data,Tilpassede data
@@ -1244,9 +1238,9 @@
 DocType: Medical Code,Medical Code Standard,Medisinskode Standard
 DocType: Soil Texture,Clay Composition (%),Leirekomposisjon (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Vennligst lagre før du tilordner oppgaven.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balanse Verdi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balanse Verdi
 DocType: Lab Test,Lab Technician,Lab tekniker
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg Prisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Salg Prisliste
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Hvis det er merket, vil en kunde bli opprettet, kartlagt til Pasient. Pasientfakturaer vil bli opprettet mot denne kunden. Du kan også velge eksisterende kunde mens du oppretter pasient."
 DocType: Bank Reconciliation,Account Currency,Account Valuta
@@ -1254,16 +1248,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Vennligst oppgi Round Off-konto i selskapet
 DocType: Purchase Receipt,Range,Område
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
 DocType: Item Barcode,Item Barcode,Sak Barcode
 DocType: Woocommerce Settings,Endpoints,endepunkter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","å bli generert. Hvis forsinket, må du manuelt endre feltet Repeter på dag i måneden av dette"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
 DocType: Share Transfer,From Folio No,Fra Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
@@ -1298,16 +1290,17 @@
 DocType: Asset,Available-for-use Date,Tilgjengelig dato for bruk
 DocType: Guardian,Guardian Name,Guardian navn
 DocType: Cheque Print Template,Has Print Format,Har Print Format
-DocType: Employee Loan,Sanctioned,sanksjonert
+DocType: Loan,Sanctioned,sanksjonert
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
 DocType: Crop Cycle,Crop Cycle,Beskjæringssyklus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For &#39;Produkt Bundle&#39; elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra &quot;Pakkeliste&quot; bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen &quot;Product Bundle &#39;elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til&quot; Pakkeliste &quot;bord."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For &#39;Produkt Bundle&#39; elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra &quot;Pakkeliste&quot; bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen &quot;Product Bundle &#39;elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til&quot; Pakkeliste &quot;bord."
 DocType: Student Admission,Publish on website,Publiser på nettstedet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
+DocType: Subscription,Cancelation Date,Avbestillingsdato
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 DocType: Agriculture Task,Agriculture Task,Landbruk Oppgave
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekte inntekt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirekte inntekt
 DocType: Student Attendance Tool,Student Attendance Tool,Student Oppmøte Tool
 DocType: Restaurant Menu,Price List (Auto created),Prisliste (automatisk opprettet)
 DocType: Cheque Print Template,Date Settings,Dato Innstillinger
@@ -1334,6 +1327,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Labtesting datetime kan ikke være før datetime samling
+DocType: Subscription Plan,Cost,Koste
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
 DocType: Expense Claim,Total Advance Amount,Total forhåndsbeløp
 DocType: Delivery Stop,Estimated Arrival,forventet ankomst
@@ -1345,15 +1339,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Hvit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antall ikke tilgjengelig for {4} i lageret {1} ved å legge tidspunktet for innreise ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Du kan bare velge maksimalt ett alternativ fra listen med avmerkingsbokser.
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
 DocType: Item,Automatically Create New Batch,Opprett automatisk ny batch automatisk
 DocType: Item,Automatically Create New Batch,Opprett automatisk ny batch automatisk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Tilordne {0} til {1} (rad {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Tilordne {0} til {1} (rad {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Gjøre
 DocType: Student Admission,Admission Start Date,Opptak Startdato
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Ny ansatt
@@ -1369,7 +1363,7 @@
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 DocType: Repayment Schedule,Balance Loan Amount,Balanse Lånebeløp
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Aksjeopsjoner
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Aksjeopsjoner
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Deaktiver Henting av siste innkjøpsdetaljer i innkjøpsordre
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
@@ -1388,11 +1382,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakking Slip Element
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vennligst oppgi en {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantskaping har vært i kø.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Arbeidssammendrag for {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Attributt tabellen er obligatorisk
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Den første permisjonen for permisjon i listen blir satt som standard permisjon for permisjon.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Plan,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kan ikke være negativ
 DocType: Training Event,Self-Study,Selvstudium
@@ -1405,7 +1400,7 @@
 DocType: Workstation,Wages,Lønn
 DocType: Asset Maintenance,Maintenance Manager Name,Vedlikeholdsansvarlig navn
 DocType: Agriculture Task,Urgent,Haster
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Kan ikke finne variabel:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Vennligst velg et felt for å redigere fra numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Kan ikke være en fast eiendelsobjekt når lagerboksen er opprettet.
@@ -1417,7 +1412,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvalitetsinspeksjonsmalnavn
 DocType: Project,First Email,Første e-post
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selge Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selge Beløp
 DocType: Repayment Schedule,Interest Amount,rente~~POS=TRUNC
 DocType: Serial No,Creation Document No,Creation Dokument nr
 DocType: Share Transfer,Issue,Problem
@@ -1431,10 +1426,10 @@
 DocType: Tax Rule,Shipping State,Shipping State
 ,Projected Quantity as Source,Anslått Antall som kilde
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Leveringsreise
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Leveringsreise
 DocType: Student,A-,EN-
 DocType: Share Transfer,Transfer Type,Overføringstype
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Salgs Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Salgs Utgifter
 DocType: Consultation,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
@@ -1443,12 +1438,13 @@
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Post kode
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Velg renteinntekter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
-DocType: Employee Loan,Repayment Schedule,tilbakebetaling Schedule
+DocType: Loan,Repayment Schedule,tilbakebetaling Schedule
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping Rule Tilstand
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
@@ -1463,7 +1459,7 @@
 DocType: Education Settings,Attendance Freeze Date,Deltagelsesfrysedato
 DocType: Education Settings,Attendance Freeze Date,Deltagelsesfrysedato
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Se alle produkter
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum levealder (dager)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum levealder (dager)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,alle stykklister
@@ -1472,14 +1468,16 @@
 DocType: Expense Claim,From Employee,Fra Employee
 DocType: Driver,Cellphone Number,Mobiltelefonnummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ugyldig Egenskap
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} må sendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
+DocType: Department Approver,Department Approver,Avdeling Godkjenning
 DocType: SMS Center,Total Characters,Totalt tegn
 DocType: Employee Advance,Claimed,hevdet
 DocType: Crop,Row Spacing,Row Spacing
@@ -1489,6 +1487,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Avstemming Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Bidrag%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","I henhold til kjøpsinnstillingene hvis innkjøpsordre er påkrevd == &#39;JA&#39; og deretter for å opprette Kjøpfaktura, må brukeren opprette innkjøpsordre først for element {0}"
+,HSN-wise-summary of outward supplies,HSN-vis-oppsummering av utadvendte forsyninger
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firmaregistreringsnumre som referanse. Skatte tall osv
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
@@ -1502,9 +1501,9 @@
 DocType: Setup Progress Action,Action Name,Handlingsnavn
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,start-år
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},De to første sifrene i GSTIN skal samsvare med statens nummer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nåværende fakturaperiode
-DocType: Salary Slip,Leave Without Pay,La Uten Pay
+DocType: Salary Slip,Leave Without Pay,Dager uten lønn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
@@ -1519,27 +1518,27 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record &#39;{0} finnes allerede mot {1} {2} for regnskapsåret {3}
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Feltene vil bli kopiert bare på tidspunktet for opprettelsen.
 DocType: Setup Progress Action,Domains,Domener
-apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Ledelse
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Faktisk startdato' kan ikke være større enn ""Faktisk Slutt Dato '"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,Payer Innstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
 DocType: Purchase Invoice,Is Return,Er Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Forsiktighet
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Startdagen er større enn sluttdagen i oppgaven &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retur / debitnota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retur / debitnota
 DocType: Price List Country,Price List Country,Prisliste Land
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres for Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres for Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Målenheter Omregningsfaktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Fyll inn Element kode for å få Batch Number
 DocType: Stock Settings,Default Item Group,Standard varegruppe
-DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Gi informasjon.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Gi informasjon.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Du kan ikke starte en abonnement som ikke er kansellert.
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
 DocType: Fee Validity,Valid Till,Gyldig til
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Totalt foreldres lærermøte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
@@ -1552,7 +1551,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Endring av kundegruppe for den valgte kunden er ikke tillatt.
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Oppdaterer estimerte ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Oppdaterer estimerte ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Registreringsdetaljer
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vennligst velg en kunde
@@ -1573,18 +1572,20 @@
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Purchase Order,Group same items,Gruppe samme elementene
 DocType: Purchase Invoice,Disable Rounded Total,Deaktiver Avrundet Total
-DocType: Employee Loan Application,Repayment Info,tilbakebetaling info
+DocType: Department,Parent Department,Foreldreavdeling
+DocType: Loan Application,Repayment Info,tilbakebetaling info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
 DocType: Maintenance Team Member,Maintenance Role,Vedlikeholdsrolle
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Sette opp ansatte
 DocType: Sales Order,SO-,SÅ-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Vennligst velg først prefiks
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Forskning
+DocType: Subscription Settings,Subscription Settings,Abonnementsinnstillinger
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Announcement,All Students,alle studenter
@@ -1595,19 +1596,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 DocType: Crop Cycle,Less than a year,Mindre enn et år
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 DocType: Crop,Yield UOM,Utbytte UOM
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
 DocType: Item,Is Item from Hub,Er element fra nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Utbytte betalt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Utbytte betalt
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskap Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskjellen Beløp
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} på permisjon på {1}
 DocType: Purchase Invoice,Reverse Charge,Omvendt ladning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Opptjent egenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Opptjent egenkapital
 DocType: Purchase Invoice,05-Change in POS,05-Endring i POS
 DocType: Vehicle Log,Service Detail,tjenesten Detalj
 DocType: BOM,Item Description,Element Beskrivelse
@@ -1622,12 +1623,12 @@
 DocType: Opportunity Item,Opportunity Item,Opportunity Element
 ,Student and Guardian Contact Details,Student og Guardian Kontaktdetaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Rad {0}: For Leverandøren pålegges {0} e-postadresse for å sende e-post
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Midlertidig Åpning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Midlertidig Åpning
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Se Hub
 ,Employee Leave Balance,Ansatt La Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 DocType: Patient Appointment,More Info,Mer Info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard Actions
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Eksempel: Masters i informatikk
 DocType: Purchase Invoice,Rejected Warehouse,Avvist Warehouse
@@ -1637,7 +1638,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,til
 DocType: Supplier Quotation Item,Lead Time in days,Lead Tid i dager
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Leverandørgjeld Sammendrag
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Utbetaling av lønn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Utbetaling av lønn fra {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
@@ -1646,9 +1647,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Liten
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Åpning av fakturaopprettingsverktøyet
 DocType: Education Settings,Employee Number,Ansatt Number
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Avbryt Faktura Etter Grace Period
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
 DocType: Project,% Completed,% Fullført
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
@@ -1662,7 +1664,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorietesting Datetime
 DocType: Email Digest,Add Quote,Legg Sitat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekte kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
 DocType: Agriculture Analysis Criteria,Agriculture,Landbruk
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1693,16 +1695,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Vennligst sett inn varenummeret først
 DocType: Item,ITEM-,PUNKT-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
+DocType: Subscription Plan,Billing Interval Count,Faktureringsintervalltelling
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 DocType: Antibiotic,Antibiotic,Antibiotika
 ,Team Updates,laget Oppdateringer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opprett Print Format
@@ -1728,7 +1731,7 @@
 DocType: POS Item Group,POS Item Group,POS Varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativt element må ikke være det samme som varenummer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalisering av foreløpig vurdering
 DocType: Salary Slip,Bank Account No.,Bank Account No.
@@ -1745,7 +1748,7 @@
 DocType: BOM Operation,Workstation,Arbeidsstasjon
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Forespørsel om prisanslag Leverandør
 DocType: Healthcare Settings,Registration Message,Registreringsmelding
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Reseptdosering
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vennligst velg et selskap
@@ -1776,7 +1779,7 @@
 DocType: Project,Start and End Dates,Start- og sluttdato
 ,Delivered Items To Be Billed,Leverte varer til å bli fakturert
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Åpen BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
 DocType: Project Update,Great/Quickly,Great / raskt
 DocType: Purchase Invoice Item,UOM,målenheter
@@ -1785,8 +1788,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Vennligst velg batch for batched item
 DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Følgende kontoer kan velges i GST-innstillinger:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Følgende kontoer kan velges i GST-innstillinger:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 DocType: Payment Request,Transaction Currency,transaksjonsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1797,6 +1800,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Gjennomsnittlig Daily Utgående
 DocType: POS Profile,Campaign,Kampanje
 DocType: Supplier,Name and Type,Navn og Type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Godkjenningsstatus må være &quot;Godkjent&quot; eller &quot;Avvist&quot;
 DocType: Physician,Contacts and Address,Kontakter og adresse
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tiltredelse&#39; ikke kan være større enn &quot;Forventet sluttdato
@@ -1810,22 +1814,23 @@
 DocType: Student Admission,Eligibility and Details,Kvalifisering og detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Netto endring i Fixed Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Forespørsel om prisanslag er deaktivert tilgang fra portal for flere sjekkportalinnstillingene.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kjøpe Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Kjøpe Beløp
 DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det var feil å opprette kursplan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den første utgiftsgodkjenningen i listen blir satt som standard utgiftsgodkjent.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,kan ikke være større enn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
-DocType: Salary Detail,Depends on Leave Without Pay,Avhenger La Uten Pay
+DocType: Salary Detail,Depends on Leave Without Pay,Avhengig av dager uten lønn
 DocType: Pricing Rule,"Higher the number, higher the priority","Høyere tallet er, høyere prioritet"
 ,Purchase Invoice Trends,Fakturaen Trender
 DocType: Employee,Better Prospects,Bedre utsikter
@@ -1843,14 +1848,15 @@
 DocType: Package Code,Package Code,pakke kode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Lærling
 DocType: Purchase Invoice,Company GSTIN,Firma GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negative Antall er ikke tillatt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detalj tabell hentet fra elementet Hoved som en streng, og som er lagret på dette feltet. Brukes for skatter og avgifter"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,La godkjenning være obligatorisk i permisjon
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Skatteregel for transaksjoner.
@@ -1878,15 +1884,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Betalingsperioden i rad {0} er muligens en duplikat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Jordbruk (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakkseddel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontor Leie
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontor Leie
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 DocType: Disease,Common Name,Vanlig navn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import mislyktes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
 DocType: Vital Signs,Blood Pressure,Blodtrykk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytiker
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Salgs Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1896,15 +1902,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Bekreft innmeldt kurs for studenter i studentgruppen
 DocType: Notification Control,Expense Claim Rejected,Expense krav Avvist
 DocType: Item,Item Attribute,Sak Egenskap
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Regjeringen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Regjeringen
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} finnes allerede for Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute Name
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Fyll inn gjenværende beløpet
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Fyll inn gjenværende beløpet
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Element Varianter
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,E-post Lønn Slip til Employee
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Velg Mulig Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Velg Mulig Leverandør
 DocType: Sales Invoice,Source,Source
 DocType: Customer,"Select, to make the customer searchable with these fields","Velg, for å gjøre kunden søkbar med disse feltene"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis stengt
@@ -1921,7 +1927,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Kontantstrøm fra investerings
 DocType: Program Course,Program Course,program Course
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Spedisjons- og Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Homepage,Company Tagline for website homepage,Selskapet Undertittel for nettstedet hjemmeside
 DocType: Item Group,Item Group Name,Sak Gruppenavn
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt
@@ -1951,10 +1957,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Detaljer
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Vennligst skriv inn alle nødvendige Resultat Verdi (r)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Kundefordringer Sammendrag
-DocType: Employee Loan,Monthly Repayment Amount,Månedlig nedbetaling beløpet
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Kundefordringer Sammendrag
+DocType: Loan,Monthly Repayment Amount,Månedlig nedbetaling beløpet
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Åpning av fakturaer
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
 DocType: GST HSN Code,HSN Code,HSN kode
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Bidrag Beløp
@@ -1976,7 +1982,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Bruker {0} er allerede tilordnet Legen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Eske
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mulig Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mulig Leverandør
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottaker-listen er tom. Opprett Receiver Liste
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Helsevesenet (beta)
@@ -2004,7 +2011,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
-DocType: Employee Loan,Repayment Method,tilbakebetaling Method
+DocType: Loan,Repayment Method,tilbakebetaling Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis det er merket, vil hjemmesiden være standard Varegruppe for nettstedet"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Krav på bekostning av selskapet.
@@ -2013,7 +2020,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifikat kreves
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Aksje Gjeld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Velg firma
@@ -2021,7 +2028,7 @@
 DocType: Student Report Generation Tool,Print Section,Utskriftseksjon
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Bruker {0} har ingen standard POS-profil. Kontroller standard i rad {1} for denne brukeren.
 DocType: Student Group,Set 0 for no limit,Sett 0 for ingen begrensning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} er påkrevd for å opprette Fakturaer for åpning {faktura_type}
 DocType: Customer,Primary Address and Contact Detail,Primæradresse og kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
@@ -2032,10 +2039,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vennligst velg minst ett domene.
 DocType: Dependent Task,Dependent Task,Avhengig Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
 DocType: SMS Center,Receiver List,Mottaker List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Søk Element
 DocType: Payment Schedule,Payment Amount,Betalings Beløp
@@ -2045,7 +2052,7 @@
 DocType: Assessment Plan,Grading Scale,Grading Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,allerede fullført
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager i hånd
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Lager i hånd
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import Vellykket!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
@@ -2056,17 +2063,16 @@
 DocType: Quotation Item,Quotation Item,Sitat Element
 DocType: Customer,Customer POS Id,Kundens POS-ID
 DocType: Account,Account Name,Brukernavn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Vennligst skriv inn Woocommerce Server URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
 DocType: Share Balance,To No,Til nr
-DocType: Subscription,Reference Document,Reference Document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Søker Type
+DocType: Loan,Applicant Type,Søker Type
 DocType: Purchase Invoice,03-Deficiency in services,03-mangel på tjenester
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Publiseringsdato
 DocType: Healthcare Settings,Default Medical Code Standard,Standard medisinsk kode Standard
@@ -2077,13 +2083,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturert
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Menneskelige Ressurser
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Menneskelige Ressurser
 DocType: Lead,Upper Income,Øvre Inntekt
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Avvis
 DocType: Journal Entry Account,Debit in Company Currency,Debet i selskapet Valuta
 DocType: BOM Item,BOM Item,BOM Element
 DocType: Appraisal,For Employee,For Employee
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gjør Utbetaling Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Gjør Utbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
 DocType: Membership,INR,INR
@@ -2113,10 +2119,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,På lager
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,På lager
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasitetsplanlegging For (dager)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,innkjøp
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligatorisk felt - Program
 DocType: Special Test Template,Result Component,Resultat Komponent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantikrav
@@ -2136,7 +2142,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Inkluder hellig innen blader som løv
 DocType: Sales Invoice,Packed Items,Lunsj Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mot Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Handlevogn
 DocType: Employee,Permanent Address,Permanent Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2154,10 +2160,10 @@
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Bekreft handling
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online auksjoner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Oppfyllelse
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Vis i handlekurven
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Markedsføringskostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kan ikke opprette standard kriterier. Vennligst gi nytt navn til kriteriene
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
@@ -2180,9 +2186,9 @@
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Material Request,Transferred,overført
 DocType: Vehicle,Doors,dører
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Samle avgift for pasientregistrering
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan ikke endre attributter etter aksje transaksjon. Lag en ny vare og overfør lager til den nye varen
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan ikke endre attributter etter aksje transaksjon. Lag en ny vare og overfør lager til den nye varen
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Skatteavbrudd
 DocType: Packing Slip,PS-,PS
@@ -2218,11 +2224,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Purchase Invoice Item,Batch No,Batch No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Ansattes fremskritt
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 DocType: Grant Application,Assessment  Mark (Out of 10),Vurderingsmerke (ut av 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
@@ -2231,15 +2238,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige utgifter
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
 DocType: Territory,Territory Name,Territorium Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Du kan bare ha planer med samme faktureringsperiode i en abonnement
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat til en jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovfestet info og annen generell informasjon om din Leverandør
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,medarbeidersamtaler
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Treningsarrangementer
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Sporledninger av blykilde.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Vennligst skriv inn
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Vennligst skriv inn
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Vedlikeholdslogg
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovekten av denne pakken. (Automatisk beregnet som summen av nettovekt elementer)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
 DocType: Student Group,Instructors,instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} må sendes
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Aksjeforvaltning
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Betaling
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Lager {0} er ikke knyttet til noen konto, vennligst oppgi kontoen i lagerregisteret eller sett inn standardbeholdningskonto i selskap {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Administrere dine bestillinger
 DocType: Work Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,Student La Application
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,strek~~POS=TRUNC
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Forbinder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Forbinder
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Arbeidsordre {0} må sendes
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,New Handlekurv
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta må være lik enten selskapets valuta- eller partikonto-valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 DocType: Soil Texture,Loam,leirjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Row {0}: Forfallsdato kan ikke være før innleggsdato
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Row {0}: Forfallsdato kan ikke være før innleggsdato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Utfør betaling Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
 ,Sales Invoice Trends,Salgsfaktura Trender
 DocType: Leave Application,Apply / Approve Leaves,Påfør / Godkjenn Løv
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Til
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er &#39;On Forrige Row beløp &quot;eller&quot; Forrige Row Totals
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er &#39;On Forrige Row beløp &quot;eller&quot; Forrige Row Totals
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tre av finansielle kostnadssteder.
 DocType: Serial No,Delivery Document No,Levering Dokument nr
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materialforbruk er ikke angitt i produksjonsinnstillinger.
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan ikke overbillett for element {0} i rad {1} mer enn {2}. For å tillate overfakturering, vennligst sett inn Lagerinnstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan ikke overbillett for element {0} i rad {1} mer enn {2}. For å tillate overfakturering, vennligst sett inn Lagerinnstillinger"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Oppdater svar
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Velg programmet først
 DocType: Patient Appointment,Patient Age,Pasientalder
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Managing Projects
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serienummer {0} har allerede blitt returnert
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serienummer {0} har allerede blitt returnert
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
 DocType: Budget,Fiscal Year,Regnskapsår
 DocType: Asset Maintenance Log,Planned,planlagt
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standardfordelbare kontoer som skal brukes hvis ikke satt inn i pasienten for å bestille konsultasjonsgebyrer.
 DocType: Vehicle Log,Fuel Price,Fuel Pris
+DocType: Bank Guarantee,Margin Money,Marginpenger
 DocType: Budget,Budget,Budsjett
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Sett inn
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
@@ -2352,16 +2360,16 @@
 DocType: Lead,Follow Up,Følge opp
 DocType: Item,Is Sales Item,Er Sales Element
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppe treet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
 DocType: Maintenance Visit,Maintenance Time,Vedlikehold Tid
 ,Amount to Deliver,Beløp å levere
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Samme gjenstand er oppgitt flere ganger. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Startdato kan ikke være tidligere enn året startdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Det var feil.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Ansatt {0} har allerede søkt om {1} mellom {2} og {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Det var feil.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Ansatt {0} har allerede søkt om {1} mellom {2} og {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Nåværende Verdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
 DocType: Education Settings,Instructor Records to be created by,Instruktørposter som skal opprettes av
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} opprettet
 DocType: GST Account,GST Account,GST-konto
@@ -2380,8 +2388,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Lagt til Favoritter
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønnsslipp funnet å sende inn for ovennevnte utvalgte kriterier ELLER lønnsslipp allerede sendt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Skatter og avgifter
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønnsslipp funnet å sende inn for ovennevnte utvalgte kriterier ELLER lønnsslipp allerede sendt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Skatter og avgifter
 DocType: Projects Settings,Projects Settings,Prosjekter Innstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
@@ -2391,27 +2399,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of varegrupper.
 DocType: Production Plan,Total Produced Qty,Totalt produsert antall
 DocType: Payroll Entry,Get Employee Details,Få medarbeiderdetaljer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 DocType: Asset,Sold,selges
 ,Item-wise Purchase History,Element-messig Purchase History
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
 DocType: Account,Frozen,Frozen
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Grunnbeløp (Selskap Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Råstoffer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Råstoffer
 DocType: Payment Reconciliation Payment,Reference Row,Referanse Row
 DocType: Installation Note,Installation Time,Installasjon Tid
 DocType: Sales Invoice,Accounting Details,Regnskap Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Slett alle transaksjoner for dette selskapet
 DocType: Patient,O Positive,O Positiv
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investeringer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akseptkriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Ingen tilbakebetalinger tilgjengelig for Journal Entry
 DocType: Item Attribute,Attribute Name,Attributt navn
 DocType: BOM,Show In Website,Show I Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Antall i Website
-DocType: Employee Loan Application,Total Payable Amount,Totalt betales beløpet
+DocType: Loan Application,Total Payable Amount,Totalt betales beløpet
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 DocType: Item Reorder,Check in (group),Sjekk inn (gruppe)
 DocType: Soil Texture,Silt,silt
@@ -2430,7 +2439,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Utføre betaling
 DocType: Room,Room Name,Room Name
 DocType: Prescription Duration,Prescription Duration,Reseptbeløp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kunde Adresser og kontakter
 ,Campaign Efficiency,Kampanjeeffektivitet
@@ -2450,11 +2459,11 @@
 DocType: Chapter,Chapter,Kapittel
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Standardkontoen oppdateres automatisk i POS-faktura når denne modusen er valgt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
 DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Salgspartneradresser og kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date bør være mellom Fra dato og Til dato
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date bør være mellom Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Selve Dato
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Angi standardkostnadssenteret i {0} selskapet.
 DocType: Item,Has Batch No,Har Batch No
@@ -2472,7 +2481,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
 DocType: Soil Texture,Soil Type,Jordtype
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Ny melding
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandat
@@ -2492,7 +2500,7 @@
 DocType: Hub Category,Hub Category,Hub kategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
-DocType: Employee Loan,Loan Amount,Lånebeløp
+DocType: Loan,Loan Amount,Lånebeløp
 DocType: Student Report Generation Tool,Add Letterhead,Legg til brevpapir
 DocType: Program Enrollment,Self-Driving Vehicle,Selvkjørende kjøretøy
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverandør Scorecard Standing
@@ -2521,9 +2529,9 @@
 DocType: Cash Flow Mapper,Position,Posisjon
 DocType: Patient,Patient Details,Pasientdetaljer
 DocType: Patient,B Positive,B Positiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2531,8 +2539,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,student Søsken
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonnementsplandetaljer
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Enhet
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Vennligst oppgi selskapet
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
 DocType: Asset Maintenance Task,Maintenance Task,Vedlikeholdsoppgave
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Vennligst sett inn B2C Limit i GST-innstillinger.
@@ -2547,6 +2556,7 @@
 ,BOM Search,BOM Søk
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Total forbruket materialkostnad (via lagerinngang)
 DocType: Hub Settings,Company Registered,Firma Registrert
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Til dato kan ikke være mindre enn Fra dato
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publiser &quot;På lager&quot; eller &quot;Ikke på lager&quot; på Hub basert på lager tilgjengelig i dette varehuset.
 DocType: Vehicle,Fuel Type,drivstoff
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vennligst oppgi valuta i selskapet
@@ -2554,17 +2564,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materiale Requests har vært reist automatisk basert på element re-order nivå
 DocType: Email Digest,Pending Sales Orders,Avventer salgsordrer
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 DocType: Employee,Create User Permission,Opprett brukertillatelse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Healthcare Settings,Remind Before,Påminn før
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
 DocType: Salary Component,Deduction,Fradrag
 DocType: Item,Retain Sample,Behold prøve
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløp Difference
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
 DocType: Territory,Classification of Customers by region,Klassifisering av kunder etter region
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,I produksjon
@@ -2574,8 +2585,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnet kontoutskrift balanse
 DocType: Normal Test Template,Normal Test Template,Normal testmal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Sitat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Kan ikke angi en mottatt RFQ til No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Kan ikke angi en mottatt RFQ til No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Fradrag
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Velg en konto for å skrive ut i kontovaluta
@@ -2583,7 +2594,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er basert på transaksjoner mot denne pasienten. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kostnad Oppdatert
 DocType: Patient,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Element {0} er allerede returnert
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverandør Scorecard Setup
@@ -2594,14 +2605,15 @@
 DocType: Work Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Tatt i bruk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-open
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Antall pr Stock målenheter
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Name
 DocType: Purchase Invoice,02-Post Sale Discount,02-post salg rabatt
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
+DocType: Department Approver,Approver,Godkjenner
 ,SO Qty,SO Antall
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Feltet Til Aksjonær kan ikke være tomt
 DocType: Guardian,Work Address,arbeid Adresse
@@ -2615,21 +2627,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totalt tildelte beløp (Selskap Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
 DocType: BOM,Scrap Material Cost,Skrap Material Cost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
 DocType: Grant Application,Email Notification Sent,E-postvarsling sendt
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Varenummer, lager, antall er påkrevd på rad"
-DocType: Pricing Rule,Supplier,Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Varenummer, lager, antall er påkrevd på rad"
+DocType: Bank Guarantee,Supplier,Leverandør
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Vis betalingsdetaljer
 DocType: Consultation,Consultation Time,Konsultasjonstid
 DocType: C-Form,Quarter,Quarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Diverse utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Name
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Medarbeider Loan konto
 DocType: Leave Application,Total Leave Days,Totalt La Days
 DocType: Email Digest,Note: Email will not be sent to disabled users,Merk: E-post vil ikke bli sendt til funksjonshemmede brukere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antall interaksjoner
@@ -2645,7 +2656,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Vekt (i kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitler / kapittelnavn la blankt sett automatisk etter lagring av kapittel.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Vennligst sett GST-kontoer i GST-innstillinger
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Vennligst sett GST-kontoer i GST-innstillinger
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Type virksomhet
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kostnad for nye kjøp
@@ -2654,12 +2665,13 @@
 DocType: Grant Application,Grant Description,Grant Beskrivelse
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
 DocType: Student Guardian,Others,Annet
+DocType: Subscription,Discounts,rabatter
 DocType: Payment Entry,Unallocated Amount,uallokert Beløp
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ingen flere oppdateringer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Dette dekker alle scorecards knyttet til denne oppsettet
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Varen bør ikke være et produkt Bundle. Vennligst fjern element `{0}` og lagre
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2668,21 +2680,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på &quot;Generer Schedule &#39;for å få timeplanen
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 DocType: Bin,Ordered Quantity,Bestilte Antall
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
 DocType: Grading Scale,Grading Scale Intervals,Karakterskalaen Intervaller
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Årets resultat
+DocType: Bank Guarantee,Name of Bank,Navn på bank
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskap Entry for {2} kan bare gjøres i valuta: {3}
 DocType: Fee Schedule,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Tre av finansregnskap.
+DocType: Bank Guarantee,Reference Document Type,Reference Document Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Cash Flow Mapping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialisert Lager
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post ikke funnet i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generer hemmelighet
-DocType: Employee Loan,Account Info,Kontoinformasjon
+DocType: Loan,Account Info,Kontoinformasjon
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
 DocType: Fees,Include Payment,Inkluder betaling
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentgrupper opprettet.
@@ -2690,24 +2705,24 @@
 DocType: Sales Invoice,Total Billing Amount,Total Billing Beløp
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programmet i avgiftsstrukturen og studentgruppen {0} er forskjellig.
 DocType: Fee Schedule,Receivable Account,Fordring konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Salgsordre til betaling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,administrerende direktør
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,administrerende direktør
 DocType: Purchase Invoice,With Payment of Tax,Med betaling av skatt
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FOR LEVERANDØR
 DocType: Land Unit,Is Container,Er Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Dette blir dag 1 i avlingen syklus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Velg riktig konto
 DocType: Purchase Invoice Item,Weight UOM,Vekt målenheter
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Liste over tilgjengelige Aksjonærer med folio nummer
 DocType: Salary Structure Employee,Salary Structure Employee,Lønn Struktur Employee
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Vis variantattributter
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Vis variantattributter
 DocType: Student,Blood Group,Blodgruppe
 DocType: Course,Course Name,Course Name
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Brukere som kan godkjenne en bestemt ansattes permisjon applikasjoner
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontor utstyr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kontor utstyr
 DocType: Purchase Invoice Item,Qty,Antall
 DocType: Fiscal Year,Companies,Selskaper
 DocType: Supplier Scorecard,Scoring Setup,Scoring Setup
@@ -2726,7 +2741,7 @@
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debet Å kreves
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Kjøp Prisliste
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Maler av leverandørens scorecard-variabler.
 DocType: Job Offer Term,Offer Term,Tilbudet Term
 DocType: Asset,Quality Manager,Quality Manager
@@ -2738,13 +2753,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total Ubetalte: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Nettstedet Operasjon
 DocType: Supplier Scorecard,Supplier Score,Leverandørpoeng
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Total Fakturert Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Total Fakturert Amt
 DocType: Supplier,Warn RFQs,Advarsel RFQs
 DocType: BOM,Conversion Rate,konverterings~~POS=TRUNC
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Produktsøk
 DocType: Assessment Plan,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
+DocType: Loan,Total Amount Paid,Totalt beløp betalt
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vennligst velg Student Admission, som er obligatorisk for den betalte student søkeren"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vennligst velg en prisliste for å publisere priser
@@ -2754,19 +2770,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktivert
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rad {0}: Fullført Antall kan ikke være mer enn {1} for drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialisert element {0} kan ikke oppdateres ved hjelp av Stock Forsoning, vennligst bruk Stock Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialisert element {0} kan ikke oppdateres ved hjelp av Stock Forsoning, vennligst bruk Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialisert element {0} kan ikke oppdateres ved hjelp av Stock Forsoning, vennligst bruk Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialisert element {0} kan ikke oppdateres ved hjelp av Stock Forsoning, vennligst bruk Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Trening Hendelses Employee
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksimale prøver - {0} kan beholdes for Batch {1} og Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Legg til tidsluker
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Training Event,Advance,Avansere
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,for å gjenta igjen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless betalings gateway innstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Valutagevinst / tap
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Valutagevinst / tap
 DocType: Opportunity,Lost Reason,Mistet Reason
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rute # {0}: Konto {1} tilhører ikke firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rute # {0}: Konto {1} tilhører ikke firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kan ikke finne DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
@@ -2785,7 +2800,6 @@
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ikke funnet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonnementet har vært {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Avgift Schedule Program
 DocType: Fee Schedule Program,Student Batch,student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Gjør Student
@@ -2801,14 +2815,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Ikke levert
 ,Bank Clearance Summary,Bank Lagersalg Summary
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
 DocType: Appraisal Goal,Appraisal Goal,Appraisal Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Foreslå kategori?
 DocType: Stock Reconciliation Item,Current Amount,Gjeldende Beløp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,bygninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,bygninger
 DocType: Fee Schedule,Fee Structure,Avgiftsstruktur struktur~~POS=HEADCOMP
 DocType: Timesheet Detail,Costing Amount,Costing Beløp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Student Admission Program,Application Fee,Påmeldingsavgift
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Send Lønn Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
@@ -2816,12 +2829,13 @@
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Landbruk Analyse Kriterier
+DocType: HR Settings,Leave Approval Notification Template,Legg igjen godkjenningsmeldingskjemaet
 DocType: POS Profile,[Select],[Velg]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtrykk (diastolisk)
 DocType: SMS Log,Sent To,Sendt til
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Gjør Sales Faktura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,programvare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,programvare
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
 DocType: Company,For Reference Only.,For referanse.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lege {0} ikke tilgjengelig på {1}
@@ -2839,7 +2853,7 @@
 DocType: Employee,New Workplace,Nye arbeidsplassen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materialforbruk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Sett som Stengt
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ingen Element med Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ingen Element med Barcode {0}
 DocType: Normal Test Items,Require Result Value,Krever resultatverdi
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2854,19 +2868,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Gjentakende
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Kontantstrøm kartlegging detaljer
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Lånestyring
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat inntekter og kostnader for produkt vertikaler eller divisjoner.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Vis Lønn Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Vis Lønn Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Material
 DocType: Fees,Send Payment Request,Send betalingsforespørsel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
 DocType: Water Analysis,Origin,Opprinnelse
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Vennligst sett gjentakende etter lagring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
@@ -2881,14 +2895,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Er skatt på inntektsskatt
 DocType: Grading Scale Interval,Grade Description,grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Kvitteringen Nei
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Earnest Penger
 DocType: Sales Invoice, Shipping Bill Number,Fraktregningsnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sporbarhet
 DocType: Asset Maintenance Log,Actions performed,Handlinger utført
 DocType: Cash Flow Mapper,Section Leader,Seksjonsleder
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Source of Funds (Gjeld)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Source of Funds (Gjeld)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Ansatt
+DocType: Bank Guarantee,Fixed Deposit Number,Fast innskuddsnummer
 DocType: Asset Repair,Failure Date,Feil dato
 DocType: Sample Collection,Collected Time,Samlet tid
 DocType: Company,Sales Monthly History,Salg Månedlig historie
@@ -2905,10 +2920,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Er du sikker på at du vil avbryte denne avtalen?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellrom Prispakke
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,salgs~~POS=TRUNC
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Hent abonnementsoppdateringer
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} stemmer ikke overens med Selskapet {1} i Konto modus: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurs:
@@ -2918,7 +2934,7 @@
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Ingen arbeidsordre opprettet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
 DocType: Purchase Invoice,Credit To,Kreditt til
@@ -2936,7 +2952,7 @@
 DocType: Request for Quotation Supplier,No Quote,Ingen sitat
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompenserende Off
 DocType: Job Offer,Accepted,Akseptert
@@ -2948,7 +2964,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sørg for at du virkelig ønsker å slette alle transaksjoner for dette selskapet. Dine stamdata vil forbli som det er. Denne handlingen kan ikke angres.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Søkeresultater
 DocType: Room,Room Number,Romnummer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ugyldig referanse {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ugyldig referanse {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 DocType: Journal Entry Account,Payroll Entry,Lønninngang
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Se avgifter
@@ -2958,7 +2974,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
 DocType: Item Variant Settings,Allow Rename Attribute Value,Tillat omdøpe attributtverdi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Hurtig Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefiks
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
@@ -2966,8 +2982,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrasjon med Google Maps er ikke aktivert
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ikke er sendt
+DocType: Subscription,Trialling,Tester ut
 DocType: Member,Membership Expiry Date,Medlemskapets utløpsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} må være negativ i retur dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} må være negativ i retur dokument
 ,Minutes to First Response for Issues,Minutter til First Response for Issues
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
@@ -2986,7 +3003,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Opportunity
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Opportunity
 DocType: Operation,Default Workstation,Standard arbeidsstasjon
 DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkjent melding
 DocType: Payment Entry,Deductions or Loss,Fradrag eller tap
@@ -3021,10 +3038,10 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkjenne Brukeren kan ikke være det samme som bruker regelen gjelder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Dager uten lønn samsvarer ikke med godkjente Dager uten lønn
 DocType: Campaign,Campaign-.####,Kampanje -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gjør Faktura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Gjenværende balanse
@@ -3034,7 +3051,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slutt År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 DocType: Driver,Driver,Sjåfør
 DocType: Vital Signs,Nutrition Values,Ernæringsverdier
 DocType: Lab Test Template,Is billable,Er fakturerbart
@@ -3045,7 +3062,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Timeregistrering)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Aldring Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Samlet forskuddsbeløp kan ikke være større enn totalt beløp
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Samlet forskuddsbeløp kan ikke være større enn totalt beløp
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3080,12 +3097,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Velg Attributtverdier
 DocType: Purchase Invoice,Reason For Issuing document,Årsak til utstedelse av dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Neste Kontakt By kan ikke være samme som Lead e-postadresse
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Asset,Manual,Håndbok
-DocType: Salary Component Account,Salary Component Account,Lønn Component konto
+DocType: Salary Component Account,Salary Component Account,Lønnstype konto
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
 apps/erpnext/erpnext/config/non_profit.py +58,Donor information.,Donorinformasjon.
 apps/erpnext/erpnext/config/accounts.py +330,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
@@ -3097,7 +3114,8 @@
 DocType: Warranty Claim,Service Address,Tjenesten Adresse
 DocType: Asset Maintenance Task,Calibration,kalibrering
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} er en firmas ferie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Møbler og inventar
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Oppgi statusmelding
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Møbler og inventar
 DocType: Item,Manufacture,Produksjon
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Oppsett Company
 ,Lab Test Report,Lab Test Report
@@ -3113,7 +3131,6 @@
 DocType: Crop,Planting Area,Planteområde
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Installation Note Item,Installed Qty,Installert antall
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Dette kan skyldes noen ugyldige e-postadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Du har lagt til
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,trening Resultat
@@ -3123,16 +3140,17 @@
 DocType: Products Settings,Products per Page,Produkter per side
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vekt
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Legg igjen godkjenningsvarsling
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Lønn Slip Basert på Timeregistrering
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kjøpspris
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Kjøpspris
 DocType: Notification Control,Sales Order Message,Salgsordre Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Sett standardverdier som Company, Valuta, værende regnskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalings Type
@@ -3155,6 +3173,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Handlevogn Innstillinger
 DocType: Journal Entry,Accounting Entries,Regnskaps Entries
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgt prismodell er laget for «Rate», vil den overskrive Prisliste. Prissetting Regelsats er sluttprisen, så ingen ytterligere rabatt skal brukes. Derfor, i transaksjoner som salgsordre, innkjøpsordre osv., Blir det hentet i feltet &#39;Rate&#39;, i stedet for &#39;Prislistefrekvens&#39;."
+DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplisere Entry. Vennligst sjekk Authorization Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Referansedato
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3171,7 +3190,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,lønn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
 DocType: Patient Service Unit,Parent Service Unit,Foreldre Service Unit
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Gjør Bruker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasjon av pakken for levering (for print)
@@ -3190,7 +3209,7 @@
 DocType: Shareholder,SH-,SH
 DocType: Account,Income Account,Inntekt konto
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Levering
 DocType: Volunteer,Weekdays,hver~~POS=TRUNC
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: Restaurant Menu,Restaurant Menu,Restaurantmeny
@@ -3198,7 +3217,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Angi standard beholdningskonto for evigvarende beholdning
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Angi standard beholdningskonto for evigvarende beholdning
 DocType: Item Reorder,Material Request Type,Materialet Request Type
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Send Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Localstorage er full, ikke redde"
@@ -3206,10 +3225,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Romkapasitet
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Det finnes allerede en post for elementet {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Du vil miste oversikt over tidligere genererte fakturaer. Er du sikker på at du vil starte dette abonnementet på nytt?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registreringsavgift
 DocType: Budget,Cost Center,Kostnadssted
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Kupong #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Kupong #
 DocType: Notification Control,Purchase Order Message,Innkjøpsordre Message
 DocType: Tax Rule,Shipping Country,Shipping Land
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skjule Kundens Tax ID fra salgstransaksjoner
@@ -3218,20 +3238,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prising Rule er laget for å overskrive Prisliste / definere rabattprosenten, basert på noen kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lageret kan bare endres via Stock Entry / følgeseddel / Kjøpskvittering
 DocType: Employee Education,Class / Percentage,Klasse / Prosent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Head of Marketing and Sales
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Head of Marketing and Sales
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Inntektsskatt
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Gå til Letterheads
+DocType: Subscription,Cancel At End Of Period,Avbryt ved slutten av perioden
 DocType: Item Supplier,Item Supplier,Sak Leverandør
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Ingen elementer valgt for overføring
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Ingen elementer valgt for overføring
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Gevinst / Tap på Asset Avhending
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Gevinst / Tap på Asset Avhending
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Kun Student søker med statusen &quot;Godkjent&quot; vil bli valgt i tabellen nedenfor.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Kontonummer for konto {0} er ikke tilgjengelig. <br> Vennligst konfigurer kontoregnskapet ditt riktig.
 DocType: Task,Depends on Tasks,Avhenger Oppgaver
@@ -3246,6 +3267,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ikke på lager
 DocType: Volunteer,Volunteer Skills,Frivillig Ferdigheter
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Referansedokumentnavn
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
 apps/erpnext/erpnext/hooks.py +142,Issues,Problemer
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status må være en av {0}
@@ -3259,7 +3281,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra large
+DocType: Loan,Loan Application,Lånesøknad
 DocType: Crop,Scientific Name,Vitenskapelig navn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Totalt Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save",Velg hvis den valgte kontakten redigeres etter lagre
@@ -3268,13 +3291,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Sjekk Antall
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Aktuelle produkter
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alle Assessment grupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alle Assessment grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Warehouse navn
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
@@ -3295,9 +3318,10 @@
 DocType: Fees,Fees,avgifter
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiser Exchange Rate å konvertere en valuta til en annen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Sitat {0} er kansellert
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Totalt utestående beløp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Totalt utestående beløp
 DocType: Sales Partner,Targets,Targets
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Vennligst registrer SIREN-nummeret i bedriftsinformasjonsfilen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Price List,Price List Master,Prisliste Master
 DocType: GST Account,CESS Account,CESS-konto
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
@@ -3306,6 +3330,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Velg Pasient
 DocType: Price List,Applicable for Countries,Gjelder for Land
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternavn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Bare La Applikasjoner med status &#39;Godkjent&#39; og &#39;Avvist&#39; kan sendes inn
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Gruppenavn er obligatorisk i rad {0}
 DocType: Homepage,Products to be shown on website homepage,Produkter som skal vises på nettstedet hjemmeside
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
@@ -3339,14 +3364,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktura som allerede er opprettet for alle faktureringstimer
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Navn feil: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Er finansieringskostnad
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vennligst sett standardkunden i Restaurantinnstillinger
 ,Salary Register,lønn Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
-DocType: C-Form Invoice Detail,Net Total,Net Total
+DocType: Subscription,Net Total,Net Total
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Standard BOM ikke funnet for element {0} og prosjekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definere ulike typer lån
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definere ulike typer lån
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Utestående Beløp
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i minutter)
@@ -3378,11 +3403,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root-kontoen må være en gruppe
 DocType: Drug Prescription,Drug Prescription,Drug Prescription
 DocType: Fees,FEE.,AVGIFT.
-DocType: Employee Loan,Repaid/Closed,Tilbakebetalt / Stengt
+DocType: Loan,Repaid/Closed,Tilbakebetalt / Stengt
 DocType: Item,Total Projected Qty,Samlet forventet Antall
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verdsettelsesraten ikke funnet for elementet {0}, som er nødvendig for å gjøre regnskapsposter for {1} {2}. Hvis varen er transaksjon som nullverdieringsgrad i {1}, må du nevne det i {1} elementtabellen. Ellers kan du opprette en inntektsaksjonstransaksjon for varen eller nevne verdsettelsesraten i vareoppføringen, og prøv deretter å sende inn / avbryte denne oppføringen"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kurskode
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: POS Settings,Use POS in Offline Mode,Bruk POS i frakoblet modus
@@ -3402,16 +3426,15 @@
 DocType: Purchase Invoice,Deemed Export,Gjeldende eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
-DocType: Subscription,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Du har allerede vurdert for vurderingskriteriene {}.
 DocType: Vehicle Service,Engine Oil,Motorolje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Arbeidsordre opprettet: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Arbeidsordre opprettet: {0}
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-DocType: Employee Loan,Loan Details,lån Detaljer
+DocType: Loan,Loan Details,lån Detaljer
 DocType: Company,Default Inventory Account,Standard lagerkonto
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio tallene stemmer ikke overens
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
@@ -3423,19 +3446,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,En kobling til alle arealene der grøften vokser
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
 DocType: Item Group,Show this slideshow at the top of the page,Vis lysbildefremvisning på toppen av siden
 DocType: BOM,Item UOM,Sak målenheter
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebeløp Etter Rabattbeløp (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Cheque Print Template,Primary Settings,primære Innstillinger
 DocType: Purchase Invoice,Select Supplier Address,Velg Leverandør Adresse
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Legg Medarbeidere
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Legg Medarbeidere
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 DocType: Payment Request,Mute Email,Demp Email
@@ -3455,11 +3478,10 @@
 DocType: SMS Log,No of Sent SMS,Ingen av Sendte SMS
 DocType: Antibiotic,Healthcare Administrator,Helseadministrator
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Angi et mål
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 DocType: Dosage Strength,Dosage Strength,Doseringsstyrke
 DocType: Account,Expense Account,Expense konto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programvare
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Farge
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Farge
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Kriterier
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Utløpsdato er obligatorisk for valgt element
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Forhindre innkjøpsordrer
@@ -3472,18 +3494,18 @@
 DocType: Patient,Personal and Social History,Personlig og sosial historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bruker {0} opprettet
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver student
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Endre kode
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Prisliste Valuta ikke valgt
 DocType: Purchase Invoice,Availed ITC Cess,Benyttet ITC Cess
 ,Student Monthly Attendance Sheet,Student Månedlig Oppmøte Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Fraktregel gjelder kun for salg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Inntil
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgruppe eller kursplan er obligatorisk
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgruppe eller kursplan er obligatorisk
@@ -3504,7 +3526,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Oppgi produktene eller tjenestene du kjøper eller selger.
 DocType: Water Analysis,Storage Temperature,Lager temperatur
 DocType: Employee Attendance Tool,Unmarked Attendance,Umerket Oppmøte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Forsker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Påmelding Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Startdato bør være mindre enn sluttdato for oppgaven {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navn eller E-post er obligatorisk
@@ -3517,7 +3539,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og RFQs til denne leverandøren skal utstedes med forsiktighet."
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Totalkostnad (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial No {0} opprettet
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial No {0} opprettet
 DocType: Homepage,Company Description for website homepage,Selskapet beskrivelse for nettstedet hjemmeside
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
@@ -3527,11 +3549,10 @@
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
 DocType: Healthcare Settings,Result Printed,Resultat Trykt
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Prøvetid
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Se {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Project,Total Costing Amount (via Timesheets),Totalt kostende beløp (via tidsskrifter)
-DocType: Employee Advance,Expense Approver,Expense Godkjenner
+DocType: Department,Expense Approver,Expense Godkjenner
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
 DocType: Project,Hourly,Hver time
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-gruppe til gruppe
@@ -3541,7 +3562,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Utfør betaling via bilagsregistrering
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Trykt på
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Trykt på
 DocType: Item,Inspection Required before Delivery,Inspeksjon Påkrevd før Levering
 DocType: Item,Inspection Required before Purchase,Inspeksjon Påkrevd før kjøp
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
@@ -3551,7 +3572,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum antall
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Din organisasjon
 DocType: Fee Component,Fees Category,avgifter Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Skriv inn lindrende dato.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Informer medarbeider
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
@@ -3561,7 +3582,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Omgjøre nivå
 DocType: Company,Chart Of Accounts Template,Konto Mal
 DocType: Attendance,Attendance Date,Oppmøte Dato
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Akseptert Warehouse
@@ -3569,10 +3590,11 @@
 DocType: Item,Valuation Method,Verdsettelsesmetode
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Skriv inn mottakerens navn før du sender inn.
 DocType: Program Enrollment Tool,Get Students,Få Studenter
 DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord vil være synlig når du lagrer kundeordre.
 ,Employee Birthday,Ansatt Bursdag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Vennligst velg Fullføringsdato for fullført reparasjon
@@ -3591,7 +3613,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reservert for underentreprise
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Bestillinger
-DocType: Employee Leave Approver,Leave Approver,La Godkjenner
+DocType: Department,Leave Approver,La Godkjenner
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vennligst velg en batch
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Assessment Gruppenavn
@@ -3615,7 +3637,7 @@
 DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Kredittgrense
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,Nr. Selge prisliste rate
-DocType: Salary Component,Salary Component,lønn Component
+DocType: Salary Component,Salary Component,Lønnstype
 apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
 DocType: GL Entry,Voucher No,Kupong Ingen
 ,Lead Owner Efficiency,Leder Eier Effektivitet
@@ -3636,7 +3658,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub sporet element
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Denne e-posten er autogenerert
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Studerende Student
 DocType: Asset,Expected Value After Useful Life,Forventet verdi Etter Levetid
@@ -3661,21 +3682,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Oppmøte Record {0} finnes mot Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Avskrivninger Slått på grunn av salg av eiendeler
-DocType: Member,Member,Medlem
+DocType: Loan,Member,Medlem
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrer Adresser
 DocType: Work Order Item,Work Order Item,Arbeid Bestillingselement
 DocType: Pricing Rule,Item Code,Sak Kode
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Landbruksansvarlig
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
 DocType: Supplier Scorecard Period,Variables,variabler
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Lukking (Dr)
 DocType: Cheque Print Template,Cheque Size,sjekk Size
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} ikke på lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Av utestående beløp
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} stemmer ikke overens med selskapets {1}
@@ -3684,7 +3705,6 @@
 DocType: Stock Settings,Default Stock UOM,Standard Stock målenheter
 DocType: Asset,Number of Depreciations Booked,Antall Avskrivninger bestilt
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Antall totalt
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Mot Ansattes lån: {0}
 DocType: Landed Cost Item,Receipt Document,kvittering Document
 DocType: Employee Education,School/University,Skole / universitet
 DocType: Payment Request,Reference Details,Referanse Detaljer
@@ -3695,7 +3715,7 @@
 DocType: Asset,Double Declining Balance,Dobbel degressiv
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Stengt for kan ikke avbestilles. Unclose å avbryte.
 DocType: Student Guardian,Father,Far
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 DocType: Attendance,On Leave,På ferie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
@@ -3709,12 +3729,12 @@
 DocType: Lead,Lower Income,Lavere inntekt
 DocType: Restaurant Order Entry,Current Order,Nåværende ordre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Kilden og målet lageret kan ikke være det samme for rad {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Gå til Programmer
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Tilordnet mengde {1} kan ikke være større enn uanmeldt beløp {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Tilordnet mengde {1} kan ikke være større enn uanmeldt beløp {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Fra dato"" må være etter 'Til Dato'"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
 DocType: Asset,Fully Depreciated,fullt avskrevet
 DocType: Item Barcode,UPC-A,UPC-A
@@ -3735,7 +3755,6 @@
 DocType: Payment Terms Template,Payment Terms,Betalingsbetingelser
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minutt
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Gå til Leverandører
@@ -3754,30 +3773,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Vennligst still inn e-post-IDen for studenten for å sende betalingsanmodningen
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Vennligst still inn e-post-IDen for studenten for å sende betalingsanmodningen
 DocType: Patient,Medical History,Medisinsk historie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Kassekreditt konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Kassekreditt konto
 DocType: Patient,Patient ID,Pasient ID
 DocType: Physician Schedule,Schedule Name,Planleggingsnavn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Gjør Lønn Slip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Legg til alle leverandører
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Lag Lønn Slip
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Legg til alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rad # {0}: Tilordnet beløp kan ikke være større enn utestående beløp.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Bla BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Sikret lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Sikret lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Rediger konteringsdato og klokkeslett
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vennligst sett Avskrivninger relatert kontoer i Asset Kategori {0} eller selskapet {1}
 DocType: Lab Test Groups,Normal Range,Normal rekkevidde
 DocType: Academic Term,Academic Year,Studieår
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Tilgjengelig salg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Åpningsbalanse Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Åpningsbalanse Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Gjenværende værende~~POS=HEADCOMP
 DocType: Appraisal,Appraisal,Appraisal
+DocType: Loan,Loan Account,Lånekonto
 DocType: Purchase Invoice,GST Details,GST-detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-post sendt til leverandøren {0}
 DocType: Item,Default Sales Unit of Measure,Standard salgsmengde av mål
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Studieår:
+DocType: Subscription,Past Due Date,Forfallsdato
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ikke tillat å angi alternativt element for elementet {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gjentas
@@ -3790,7 +3811,7 @@
 DocType: Patient Appointment,Patient Appointment,Pasientavtale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkjenne Role kan ikke være det samme som rollen regelen gjelder for
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Få leverandører av
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Få leverandører av
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ikke funnet for element {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Gå til kurs
 DocType: Accounts Settings,Show Inclusive Tax In Print,Vis inklusiv skatt i utskrift
@@ -3798,10 +3819,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Melding Sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto med barnet noder kan ikke settes som hovedbok
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning&gt; Utdanningsinnstillinger
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Hastigheten som Prisliste valuta er konvertert til kundens basisvaluta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløp (Company Valuta)
 DocType: Physician,Physician Schedules,Legeplaner
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Samlet forskuddbeløp kan ikke være større enn total sanksjonert beløp
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Samlet forskuddbeløp kan ikke være større enn total sanksjonert beløp
 DocType: Salary Slip,Hour Rate,Time Rate
 DocType: Stock Settings,Item Naming By,Sak Naming Av
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
@@ -3819,6 +3841,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
 DocType: BOM,Inspection Required,Inspeksjon påkrevd
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Oppgi bankgarantienummeret før du sender inn.
 DocType: Driving License Category,Class,Klasse
 DocType: Sales Order,Fully Billed,Fullt Fakturert
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Arbeidsordre kan ikke heves opp mot en varemaling
@@ -3829,7 +3852,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning&gt; Utdanningsinnstillinger
 DocType: Serial No,Is Cancelled,Er Avlyst
 DocType: Student Group,Group Based On,Gruppe basert på
 DocType: Student Group,Group Based On,Gruppe basert på
@@ -3841,9 +3863,10 @@
 DocType: Cheque Print Template,Cheque Height,sjekk Høyde
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Setup Progress,Setup Progress,Oppsett Progress
+DocType: Expense Claim,Approval Status,Godkjenningsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiser varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Sjekk alt
 ,Issued Items Against Work Order,Utstedte varer mot arbeidsordre
 DocType: Vehicle Log,Invoice Ref,faktura~~POS=TRUNC Ref
@@ -3874,12 +3897,11 @@
 DocType: Customs Tariff Number,Tariff Number,tariff Antall
 DocType: Work Order Item,Available Qty at WIP Warehouse,Tilgjengelig antall på WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prosjekterte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
-DocType: Employee Loan,Employee Loan Application,Medarbeider lånesøknad
 DocType: Issue,Opening Date,Åpningsdato
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Vennligst lagre pasienten først
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Vennligst lagre pasienten først
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Oppmøte er merket med hell.
 DocType: Program Enrollment,Public Transport,Offentlig transport
 DocType: Soil Texture,Silt Composition (%),Siltkomposisjon (%)
@@ -3898,7 +3920,7 @@
 ,Item Balance (Simple),Varebalanse (Enkel)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debet notat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debet notat Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
@@ -3921,6 +3943,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Salgsordre Dato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
 DocType: Assessment Plan,Assessment Plan,Assessment Plan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Omvendt journalinngang
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er opprettet.
 DocType: Stock Settings,Limit Percent,grense Prosent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Foreløpig ingen lager tilgjengelig i varehus
@@ -3934,14 +3957,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,Betalings Referanser
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Antall intervaller for intervallfeltet, for eksempel hvis Intervall er &#39;Dager&#39; og Faktureringsintervalltall er 3, vil fakturaene bli generert hver tredje dag"
 DocType: Vehicle,Insurance Details,forsikring Detaljer
 DocType: Account,Payable,Betales
 DocType: Share Balance,Share Type,Del Type
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Fyll inn nedbetalingstid
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Fyll inn nedbetalingstid
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Skyldnere ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttofortjeneste%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruttofortjeneste%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Endre POS-profil
 DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
@@ -3951,10 +3975,11 @@
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rader med dupliserte forfallsdatoer i andre rader ble funnet: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rader med dupliserte forfallsdatoer i andre rader ble funnet: {list}
 DocType: Topic,Topic Name,emne Name
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Vennligst angi standardmal for godkjenning av varsling i HR-innstillinger.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Velg en ansatt for å få ansatt på forhånd.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Velg en ansatt for å få ansatt på forhånd.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vennligst velg en gyldig dato
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Velg formålet med virksomheten.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3973,7 +3998,7 @@
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Del Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Salgsfaktura {0} opprettet
 DocType: Employee,Confirmation Date,Bekreftelse Dato
 DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
@@ -3982,7 +4007,7 @@
 DocType: Account,Accumulated Depreciation,akkumulerte avskrivninger
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående navn
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
-DocType: Employee Loan Application,Required by Date,Kreves av Dato
+DocType: Loan Application,Required by Date,Kreves av Dato
 DocType: Lead,Lead Owner,Lead Eier
 DocType: Production Plan,Sales Orders Detail,Salgsordre detalj
 DocType: Bin,Requested Quantity,Requested Antall
@@ -3995,10 +4020,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutto lønn - Totalt Fradrag - Loan Nedbetaling
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Lønn Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flere variasjoner
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveres
+DocType: Subscription,Trial Period Start Date,Prøveperiode Startdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Vennligst logg inn som en annen bruker.
@@ -4019,12 +4045,11 @@
 DocType: Student Guardian,Student Guardian,student Guardian
 DocType: Member,Member Name,Medlemsnavn
 DocType: Stock Settings,Use Naming Series,Bruk Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i abonnementet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 DocType: Membership,Payment Details,Betalingsinformasjon
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stoppet arbeidsordre kan ikke kanselleres, Unstop det først for å avbryte"
 DocType: Asset,Journal Entry for Scrap,Bilagsregistrering for Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
@@ -4044,6 +4069,7 @@
 DocType: Land Unit,Land Unit,Land Unit
 ,Purchase Analytics,Kjøps Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Element
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nåværende faktura {0} mangler
 DocType: Asset Maintenance Log,Task,Task
 DocType: Purchase Taxes and Charges,Reference Row #,Referanse Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
@@ -4056,7 +4082,7 @@
 DocType: Company,Exchange Gain / Loss Account,Valutagevinst / tap-konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbeider og oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Hensikten må være en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Fyll ut skjemaet og lagre det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Fyll ut skjemaet og lagre det
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktisk antall på lager
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktisk antall på lager
@@ -4071,7 +4097,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard salgskurs
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
 DocType: Cash Flow Mapper,Section Name,Seksjonsnavn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Omgjøre Antall
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Omgjøre Antall
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nåværende jobb Åpninger
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Skriv Off
@@ -4082,9 +4108,9 @@
 DocType: Task,depends_on,kommer an på
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,I kø for å oppdatere siste pris i alle Materialebevis. Det kan ta noen minutter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country klok standardadresse Maler
 DocType: Water Analysis,Appearance,Utseende
+DocType: HR Settings,Leave Status Notification Template,Meldingsmal for permisjon
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Nr. Kjøpe prisliste rate
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Medlemsinformasjon.
@@ -4107,7 +4133,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ikke tillatt. Vennligst deaktiver testmalen
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
 DocType: Crop Cycle,Linked Land Unit,Tilknyttet landsenhet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
@@ -4123,7 +4149,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Gå til Brukere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ugyldig GSTIN eller Skriv inn NA for Uregistrert
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innmeldingsavgift
@@ -4139,14 +4165,14 @@
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 DocType: Company,Create Chart Of Accounts Based On,Opprett kontoplan basert på
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan ikke konvertere det til ikke-gruppe. Barnoppgaver eksisterer.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} eksistere mot student Søkeren {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Avrundingsjustering (Bedriftsvaluta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Tids skjema
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Parti:
 DocType: Volunteer,Afternoon,Ettermiddag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Cheque Print Template,Scanned Cheque,skannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
@@ -4162,7 +4188,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Prosjektet {0} eksisterer allerede
 DocType: Medical Department,Nursing User,Sykepleier Bruker
 DocType: Plant Analysis,Plant Analysis Criterias,Plant Analyse Kriterier
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Ansvarsområder
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serienummer {0} tilhører ikke Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Ansvarsområder
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighetsperioden for dette sitatet er avsluttet.
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillat uaktuelle valutakurser
@@ -4184,11 +4211,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Lag variasjoner
 DocType: Item,Default BOM,Standard BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Sum fakturert beløp (via salgsfakturaer)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debet Note Beløp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debet Note Beløp
 DocType: Project Update,Not Updated,Ikke oppdatert
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Det er uoverensstemmelser mellom rente, antall aksjer og beregnet beløp"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Total Outstanding Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Total Outstanding Amt
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
 DocType: Employee Advance,Advance Account,Forhåndskonto
 DocType: Job Offer,Job Offer Terms,Jobbtilbudsbetingelser
@@ -4197,7 +4224,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskap
 DocType: Asset Category Account,Fixed Asset Account,Fast Asset konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,variabel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
 DocType: Chapter,Members,medlemmer
 DocType: Student,Student Email Address,Student e-postadresse
@@ -4221,7 +4248,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,Adressenavn
 DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Splitting {0} enheter av {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Splitting {0} enheter av {1}
 DocType: Assessment Code,Assessment Code,Assessment Kode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
@@ -4229,25 +4256,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 DocType: Bank Reconciliation Detail,Payment Document,betaling Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Feil ved vurdering av kriterieformelen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
+DocType: Subscription,Plans,planer
 DocType: Salary Slip,Salary Structure,Lønn Struktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Issue Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Det oppstod en feil under oppretting
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sitater
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ingen studentgrupper opprettet.
 DocType: Purchase Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig nedbetaling beløpet kan ikke være større enn Lånebeløp
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig nedbetaling beløpet kan ikke være større enn Lånebeløp
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rute # {0}: Forventet leveringsdato kan ikke være før innkjøpsordrenes dato
 DocType: Purchase Invoice,Print Language,Print Språk
 DocType: Salary Slip,Total Working Hours,Samlet arbeidstid
 DocType: Sales Invoice,Customer PO Details,Kunde PO Detaljer
-DocType: Subscription,Next Schedule Date,Neste planleggingsdato
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Midlertidig åpningskonto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Oppgi verdien skal være positiv
@@ -4276,11 +4302,11 @@
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ingen ansatte for de nevnte kriteriene
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
 DocType: Hotel Settings,Default Customer,Standardkund
 DocType: Assessment Plan,Supervisor Name,Supervisor Name
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekreft ikke om avtalen er opprettet for samme dag
@@ -4305,16 +4331,16 @@
 DocType: Journal Entry Account,Employee Advance,Ansattes fremskritt
 DocType: Payroll Entry,Payroll Frequency,lønn Frequency
 DocType: Lab Test Template,Sensitivity,Følsomhet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Råmateriale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Planter og Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Planter og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige arbeid Oppsummering Innstillinger
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Vennligst skriv inn reqd etter dato
 DocType: Payment Entry,Internal Transfer,Internal Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Vedlikeholdsoppgaver
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten målet stk eller mål beløpet er obligatorisk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Vennligst velg Publiseringsdato først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Vennligst velg Publiseringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
 DocType: Leave Control Panel,Carry Forward,Fremføring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
@@ -4322,14 +4348,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrasjoner
 DocType: Crop Cycle,Detected Disease,Oppdaget sykdom
 ,Produced,Produsert
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tilbakebetaling Startdato kan ikke være før Utbetalingsdato.
 DocType: Item,Item Code for Suppliers,Sak Kode for leverandører
 DocType: Issue,Raised By (Email),Raised By (e-post)
 DocType: Training Event,Trainer Name,trener Name
 DocType: Mode of Payment,General,Generelt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Siste kommunikasjon
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Siste kommunikasjon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Betalinger med Fakturaer
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
@@ -4343,7 +4370,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} på halv dag permisjon på {1}
 DocType: Production Plan,Get Material Request,Få Material Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Post Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Post Utgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 ,Item Variant Details,Varevarianter Detaljer
@@ -4354,9 +4381,9 @@
 DocType: Drug Prescription,Hour,Time
 DocType: Restaurant Order Entry,Last Sales Invoice,Siste salgsfaktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Vennligst velg antall til elementet {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 DocType: Company,Monthly Sales Target,Månedlig salgsmål
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
@@ -4364,7 +4391,7 @@
 DocType: Item,Default Material Request Type,Standard Material Request Type
 DocType: Supplier Scorecard,Evaluation Period,Evalueringsperiode
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Ukjent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Arbeidsordre er ikke opprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Arbeidsordre er ikke opprettet
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: Purchase Invoice,Export Type,Eksporttype
 DocType: Salary Slip Loan,Salary Slip Loan,Lønnsslipplån
@@ -4380,8 +4407,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Åpning av fakturaoversikt
 DocType: Education Settings,Education Manager,Utdannelsesleder
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimale lengde mellom hver plante i feltet for optimal vekst
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke oppdateres ved hjelp av Stock Forsoning, bruk i stedet Lagerinngang"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke oppdateres ved hjelp av Stock Forsoning, bruk i stedet Lagerinngang"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke oppdateres ved hjelp av Stock Forsoning, bruk i stedet Lagerinngang"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke oppdateres ved hjelp av Stock Forsoning, bruk i stedet Lagerinngang"
 DocType: Quality Inspection,Report Date,Rapporter Date
 DocType: Student,Middle Name,Mellomnavn
 DocType: C-Form,Invoices,Fakturaer
@@ -4414,20 +4441,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Kvittering
 ,Sales Register,Salg Register
 DocType: Daily Work Summary Group,Send Emails At,Send e-post til
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formvisning
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Kostnadsgodkjenning Obligatorisk Utgiftskrav
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Legg til brukere i organisasjonen din, bortsett fra deg selv."
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Ingen kunder ennå!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantstrømoppstilling
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Ingen materiell forespørsel opprettet
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Tillatelse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
@@ -4450,11 +4478,12 @@
 DocType: Vehicle,Chassis No,chassis Nei
 DocType: Payment Request,Initiated,Initiert
 DocType: Production Plan Item,Planned Start Date,Planlagt startdato
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vennligst velg en BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vennligst velg en BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Benyttet ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
+DocType: Bank Guarantee,Clauses and Conditions,Klausuler og betingelser
 DocType: Serial No,Creation Document Type,Creation dokumenttype
 DocType: Project Task,View Timesheet,Se tidsskema
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Sluttdato må være større enn startdato
 DocType: Leave Type,Is Encash,Er encash
 DocType: Leave Allocation,New Leaves Allocated,Nye Leaves Avsatt
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
@@ -4468,9 +4497,10 @@
 DocType: Patient,Alcohol Current Use,Alkoholstrømbruk
 DocType: Student Admission Program,Student Admission Program,Studentopptaksprogram
 DocType: Payment Entry,Account Paid To,Konto Betalt for å
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternativt varenavn
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Kunne ikke sende inn Lønnsslipp <br> \ Mulige årsaker: <br> \ 1. Netto lønn er mindre enn 0. <br> \ 2. Firmaets e-postadresse som er oppgitt i ansattmesteren, er ikke gyldig. <br>"
@@ -4480,7 +4510,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budsjettet for kontoen {1} mot {2} {3} er {4}. Det vil overstige ved {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ut Antall
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,og unchcked Disabled in the
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansielle Tjenester
 DocType: Student Sibling,Student ID,Student ID
@@ -4492,14 +4521,16 @@
 DocType: Complaint,Complaint,Klage
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gjør tilbakebetalingsoppføring
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alle avdelinger
 DocType: Patient,Alcohol Past Use,Alkohol Tidligere Bruk
 DocType: Fertilizer Content,Fertilizer Content,Gjødselinnhold
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematisk / Stuck
 DocType: Tax Rule,Billing State,Billing State
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Arbeidsordre {0} må avbestilles før du kansellerer denne salgsordren
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
@@ -4523,10 +4554,11 @@
 DocType: Cheque Print Template,Message to show,Melding for visning
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Retail
 DocType: Student Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produktet Bundle
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Kan ikke finne poeng som starter ved {0}. Du må ha stående poeng som dekker 0 til 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
+DocType: Subscription,Current Invoice Start Date,Daglig faktura startdato
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet- eller kredittbeløpet er nødvendig for {2}
 DocType: GL Entry,Remarks,Bemerkninger
@@ -4536,11 +4568,13 @@
 DocType: Task,Parent Task,Foreldreoppgave
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Gjør Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Skriv ut og Saker
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Skriv ut og Saker
 DocType: Stock Settings,Show Barcode Field,Vis strekkodefelt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Send Leverandør e-post
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Send Leverandør e-post
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
+DocType: Fiscal Year,Auto Created,Automatisk opprettet
 DocType: Chapter Member,Leave Reason,Legg igjen grunn
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} eksisterer ikke lenger
 DocType: Guardian Interest,Guardian Interest,Guardian Rente
 DocType: Volunteer,Availability,Tilgjengelighet
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Oppsett standardverdier for POS-fakturaer
@@ -4549,14 +4583,13 @@
 DocType: Timesheet,Employee Detail,Medarbeider Detalj
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
 DocType: Lab Prescription,Test Code,Testkode
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Innstillinger for nettstedet hjemmeside
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ er ikke tillatt for {0} på grunn av et resultatkort som står for {1}
 DocType: Job Offer,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Fremfor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Totalt beløp {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Totalt beløp {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Nevn hvis ikke-standard betalingskonto
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vennligst velg vurderingsgruppen annet enn &#39;Alle vurderingsgrupper&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Kostnadsstedet kreves for et element {1}
@@ -4567,7 +4600,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vannanalyse
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Last inn sammenkoblet analyse
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
@@ -4583,7 +4616,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kostnad for kasserte Asset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
 DocType: Vehicle,Policy No,Regler Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Dele
@@ -4623,21 +4656,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Sti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Kan ikke konvertere kostnadssted til hovedbok som den har barnet noder
 DocType: Production Plan,Total Planned Qty,Totalt planlagt antall
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,åpning Verdi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,åpning Verdi
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Salgskonto
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Salgskonto
 DocType: Purchase Invoice Item,Total Weight,Total vekt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provisjon på salg
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Provisjon på salg
 DocType: Job Offer Term,Value / Description,Verdi / beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 DocType: Purchase Order Item,Expected Delivery Date,Forventet Leveringsdato
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Bestillingsinngang
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
 DocType: Asset Maintenance Task,Assign To Name,Tilordne til navn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Underholdning Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Underholdning Utgifter
 DocType: Hub Settings,Enabled Users,Aktiverte brukere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Gjør Material Request
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Åpen Element {0}
@@ -4650,24 +4683,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Søknader om permisjon.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Siste Carbon Sjekk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rettshjelp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Rettshjelp
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vennligst velg antall på rad
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Lag åpne salgs- og kjøpsfakturaer
 DocType: Purchase Invoice,Posting Time,Postering Tid
 DocType: Timesheet,% Amount Billed,% Mengde Fakturert
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon Utgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ingen Element med Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ingen Element med Serial No {0}
 DocType: Email Digest,Open Notifications,Åpne Påminnelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskjell Beløp (Selskap Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direkte kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direkte kostnader
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Reiseutgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Legg til egendefinert felt Abonnement i doktypen {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Purchase Receipt Item,Sample Quantity,Prøvekvantitet
+DocType: Bank Guarantee,Name of Beneficiary,Navn på mottaker
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Oppdater BOM kostnad automatisk via Scheduler, basert på siste verdivurdering / prisliste rate / siste kjøpshastighet av råvarer."
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
@@ -4679,14 +4712,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Prøvetid
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lønn Components
 DocType: Program Enrollment Tool,New Academic Year,Nytt studieår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Totalt innbetalt beløp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Totalt innbetalt beløp
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,Overført Antall
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigere
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planlegging
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planlegging
 DocType: Share Balance,Issued,Utstedt
+DocType: Loan,Repayment Start Date,Tilbakebetaling Startdato
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentaktivitet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverandør Id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
@@ -4699,10 +4733,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blader som casual, syke etc."
 DocType: Email Digest,Send regular summary reports via Email.,Send vanlige oppsummeringsrapporter via e-post.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
 DocType: Assessment Result,Student Name,Student navn
 DocType: Brand,Item Manager,Sak manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,lønn Betales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,lønn Betales
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Plant Analysis,Collection Datetime,Samling Datetime
 DocType: Work Order,Total Operating Cost,Total driftskostnader
@@ -4712,9 +4746,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Bruker {0} finnes ikke
 DocType: Payment Term,Day(s) after invoice date,Dag (er) etter faktura dato
 DocType: Payment Schedule,Payment Schedule,Nedbetalingsplan
-DocType: Subscription,SUB-,UNDER-
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Betaling Entry finnes allerede
+DocType: Subscription,Trial Period End Date,Prøveperiode Sluttdato
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lønn mal mester.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologi
@@ -4731,9 +4765,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akkumulert pr måned
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
@@ -4742,14 +4776,15 @@
 DocType: Lab Prescription,Test Created,Test laget
 DocType: Healthcare Settings,Custom Signature in Print,Tilpasset signatur i utskrift
 DocType: Account,Temporary,Midlertidig
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kunde LPO nr.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kunde LPO nr.
 DocType: Program,Courses,kurs
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretær
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Ord-feltet ikke vil være synlig i enhver transaksjon"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Denne handlingen stopper fremtidig fakturering. Er du sikker på at du vil avbryte dette abonnementet?
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet av et element
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterium Navn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Vennligst sett selskap
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Vennligst sett selskap
 DocType: Pricing Rule,Buying,Kjøpe
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Sykdommer og gjødsel
 DocType: HR Settings,Employee Records to be created by,Medarbeider Records å være skapt av
@@ -4758,18 +4793,18 @@
 DocType: POS Profile,Apply Discount On,Påfør rabatt på
 DocType: Member,Membership Type,Medlemskapstype
 ,Reqd By Date,Reqd etter dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditorer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditorer
 DocType: Assessment Plan,Assessment Name,Assessment Name
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Vis PDC i Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Vis PDC i Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial No er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Jobbtilbud
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute forkortelse
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
@@ -4787,7 +4822,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktivert, vil systemet starte regnskapspostene for inventar automatisk."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Oppmøte for arbeidstaker {0} er allerede markert for denne dagen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Oppmøte for arbeidstaker {0} er allerede markert for denne dagen
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",Minutter Oppdatert via &#39;Time Logg&#39;
 DocType: Customer,From Lead,Fra Lead
@@ -4798,6 +4833,7 @@
 DocType: Lab Test,Approved Date,Godkjent dato
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
+DocType: Subscriber,Subscriber Name,Abonnentnavn
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Update Tool,Replace,Erstatt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ingen produkter funnet.
@@ -4807,19 +4843,18 @@
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
 DocType: Customer,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Velg renteinntekter konto i ansatt lån {0}
 DocType: Work Order,Required Items,nødvendige elementer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Menneskelig Resurs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Avstemming Betaling
 DocType: Disease,Treatment Task,Behandlingsoppgave
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skattefordel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Update Tool,The BOM which will be replaced,BOM som vil bli erstattet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronisk utstyr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronisk utstyr
 DocType: Asset,Maintenance Required,Vedlikehold kreves
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
@@ -4828,7 +4863,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sette mål varegruppe-messig for Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Aksjer Eldre enn [dager]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
 DocType: Asset Maintenance Team,Maintenance Team Name,Vedlikehold Lagnavn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Kunden er obligatorisk dersom &#39;Mulighet Fra&#39; er valgt som kunde
@@ -4837,19 +4872,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillat følgende brukere å godkjenne La Applications for blokk dager.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Typer av Expense krav.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Selgingsfrekvensen for elementet {0} er lavere enn dens {1}. Salgsprisen bør være minst {2}
-DocType: Item,Taxes,Skatter
+DocType: Subscription,Taxes,Skatter
 DocType: Purchase Invoice,capital goods,kapitalvarer
 DocType: Purchase Invoice Item,Weight Per Unit,Vekt pr. Enhet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Betalt og ikke levert
 DocType: Project,Default Cost Center,Standard kostnadssted
-DocType: Bank Guarantee,End Date,Sluttdato
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,aksje~~POS=TRUNC
 DocType: Budget,Budget Accounts,Budsjett Regnskap
 DocType: Employee,Internal Work History,Intern Work History
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumulerte avskrivninger beløp
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Leverandør Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,fullt utbetalt
 DocType: Employee Advance,Due Advance Amount,Forfallsbeløp
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
@@ -4873,7 +4906,7 @@
 ,Employee Information,Informasjon ansatt
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standard skattemaler for salg og kjøp opprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Vurderingsresultatrekord {0} eksisterer allerede.
@@ -4881,7 +4914,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vennligst sett Company filter blank hvis Group By er &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Publiseringsdato kan ikke være fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,for å generere de tilbakevendende
 DocType: Stock Entry,Target Warehouse Address,Mållageradresse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual La
 DocType: Agriculture Task,End Day,Endedag
@@ -4906,11 +4938,10 @@
 DocType: Material Request,% Ordered,% Bestilt
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursbasert studentgruppe vil kurset bli validert for hver student fra de innmeldte kursene i programopptaket.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Kjøpe Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Share Balance,From No,Fra nr
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Ny melding fra {avsender}
 DocType: Customer,Customer Primary Address,Kunde hovedadresse
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Drug Prescription,Description/Strength,Beskrivelse / styrke
@@ -4919,22 +4950,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Samme element er angitt flere ganger
 DocType: Department,Leave Block List,La Block List
 DocType: Purchase Invoice,Tax ID,Skatt ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} er ikke oppsett for Serial Nos. Kolonne må være tomt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} er ikke oppsett for Serial Nos. Kolonne må være tomt
 DocType: Accounts Settings,Accounts Settings,Regnskap Innstillinger
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Vedta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatted adresse for {0}, vær så snill å fikse for å fortsette."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatted adresse for {0}, vær så snill å fikse for å fortsette."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Antall ny konto, den vil bli inkludert i kontonavnet som prefiks"
 DocType: Maintenance Team Member,Team Member,Teammedlem
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Ingen resultat å sende inn
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
-DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / År
+DocType: Loan,Rate of Interest (%) / Year,Rente (%) / År
 ,Project Quantity,prosjekt Antall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;"
 DocType: Opportunity,To Discuss,Å Diskutere
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Midlertidige kontoer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Svart
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Midlertidige kontoer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Element
 DocType: Shareholder,Contact List,Kontaktliste
 DocType: Account,Auditor,Revisor
@@ -4942,16 +4973,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} elementer produsert
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Lære mer
 DocType: Cheque Print Template,Distance from top edge,Avstand fra øvre kant
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Prisliste {0} er deaktivert eller eksisterer ikke
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Prisliste {0} er deaktivert eller eksisterer ikke
 DocType: Purchase Invoice,Return,Return
 DocType: Pricing Rule,Disable,Deaktiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Modus for betaling er nødvendig å foreta en betaling
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Modus for betaling er nødvendig å foreta en betaling
 DocType: Project Task,Pending Review,Avventer omtale
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Rediger på full side for flere alternativer som eiendeler, serienummer, batcher etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Utnevnelser og konsultasjoner
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} er ikke påmeldt i batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan ikke bli vraket, som det er allerede {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Sjekker påkrevd
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Sjekker påkrevd
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kunne ikke opprette selskapet
@@ -4963,7 +4994,7 @@
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flåtestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Legg elementer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Legg elementer fra
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Crops &amp; Lands
 DocType: Cheque Print Template,Regular,Regelmessig
 DocType: Fertilizer,Density (if liquid),Tetthet (hvis flytende)
@@ -4988,24 +5019,26 @@
 DocType: Payment Entry,Paid Amount,Innbetalt beløp
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Utforsk salgssyklusen
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Beholdningsinngang
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Beholdningsinngang
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 ,Work Order Stock Report,Arbeide ordre lagerrapport
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Som veileder
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Foreslå kategori
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Element
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kvalitetsstyring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kvalitetsstyring
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} har blitt deaktivert
 DocType: Project,Total Billable Amount (via Timesheets),Totalt fakturerbart beløp (via tidsskrifter)
 DocType: Agriculture Task,Previous Business Day,Tidligere arbeidsdag
-DocType: Employee Loan,Repay Fixed Amount per Period,Smelle fast beløp per periode
+DocType: Loan,Repay Fixed Amount per Period,Smelle fast beløp per periode
 DocType: Employee,Health Insurance No,Helseforsikring nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditt notat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditt notat Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Sum skattepliktig beløp
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 DocType: Opening Invoice Creation Tool,Purchase,Kjøp
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balanse Antall
@@ -5016,15 +5049,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 DocType: Healthcare Settings,Valid number of days,Gyldig antall dager
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kostnadssteder
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Start abonnementet på nytt
 DocType: Land Unit,Linked Plant Analysis,Linked Plant Analysis
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hastigheten som leverandørens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: timings konflikter med rad {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillat null verdivurdering
+DocType: Bank Guarantee,Receiving,motta
 DocType: Training Event Employee,Invited,invitert
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Oppsett Gateway kontoer.
 DocType: Employee,Employment Type,Type stilling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Anleggsmidler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Anleggsmidler
 DocType: Payment Entry,Set Exchange Gain / Loss,Sett valutagevinst / tap
 ,GST Purchase Register,GST Innkjøpsregister
 ,Cash Flow,Cash Flow
@@ -5044,9 +5079,10 @@
 DocType: Academic Term,Term Start Date,Term Startdato
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Liste over alle aksje transaksjoner
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opptelling
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Begge prøveperiodens startdato og prøveperiodens sluttdato må settes
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gjennomsnittlig rente
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
 DocType: Job Applicant,Applicant Name,Søkerens navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Navn
@@ -5076,6 +5112,7 @@
 DocType: Work Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eiendelen kan ikke overføres
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotellrompriser
+DocType: Subscription,Days Until Due,Dager til forfallsdato
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Denne varen er en variant av {0} (mal).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,innkjøp
@@ -5084,13 +5121,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","For Batch-baserte Studentgruppen, vil studentenes batch bli validert for hver student fra programopptaket."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribusjon
+DocType: Journal Entry Account,Loan,Låne
 DocType: Expense Claim Advance,Expense Claim Advance,Kostnadskrav Advance
 DocType: Lab Test,Report Preference,Rapportpreferanse
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Frivillig informasjon.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Prosjektleder
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Prosjektleder
 ,Quoted Item Comparison,Sitert Element Sammenligning
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Overlappe i scoring mellom {0} og {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Net Asset verdi som på
 DocType: Crop,Produce,Produsere
@@ -5100,7 +5138,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materialforbruk for produksjon
 DocType: Item Alternative,Alternative Item Code,Alternativ produktkode
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Velg delbetaling Produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Velg delbetaling Produksjon
 DocType: Delivery Stop,Delivery Stop,Leveringsstopp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
 DocType: Item,Material Issue,Material Issue
@@ -5110,15 +5148,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
 DocType: BOM,Show Items,Vis Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra tid kan ikke være større enn til annen.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vil du varsle alle kundene via e-post?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vil du varsle alle kundene via e-post?
+DocType: Subscription Plan,Billing Interval,Faktureringsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Gjenoppta
 DocType: Hub Settings,Hub Username,Hub Brukernavn
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Gruppe
 DocType: Healthcare Settings,Patient Name By,Pasientnavn Av
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Periodiseringstidspunkt Oppføring for lønn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Periodiseringstidspunkt Oppføring for lønn fra {0} til {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
@@ -5132,22 +5170,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
-DocType: Employee Loan,Disbursement Date,Innbetalingsdato
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Mottakere&#39; ikke spesifisert
+DocType: Loan,Disbursement Date,Innbetalingsdato
 DocType: BOM Update Tool,Update latest price in all BOMs,Oppdater siste pris i alle BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Pasientjournal
 DocType: Vehicle,Vehicle,Kjøretøy
 DocType: Purchase Invoice,In Words,I Words
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Skriv inn navnet på banken eller låneinstitusjonen før du sender inn.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} må sendes
 DocType: POS Profile,Item Groups,varegruppene
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,I dag er {0} s bursdag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,I dag er {0} s bursdag!
 DocType: Sales Order Item,For Production,For Production
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Vennligst legg til en midlertidig åpningskonto i kontoplan
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Vennligst legg til en midlertidig åpningskonto i kontoplan
 DocType: Customer,Customer Primary Contact,Kundens primære kontakt
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periode avsluttende journal
 DocType: Project Task,View Task,Vis Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Bankgaranti Type
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fakturaandel
 ,Asset Depreciations and Balances,Asset Avskrivninger og Balanserer
@@ -5158,9 +5197,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inkluder underleverte varer
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Bli med
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Kan ikke endre Variantegenskaper etter lageroverføring. Du må lage en ny gjenstand for å gjøre dette.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
-DocType: Employee Loan,Repay from Salary,Smelle fra Lønn
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+DocType: Loan,Repay from Salary,Smelle fra Lønn
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Ber om betaling mot {0} {1} for mengden {2}
 DocType: Salary Slip,Salary Slip,Lønn Slip
@@ -5184,11 +5222,11 @@
 DocType: Employee Education,Employee Education,Ansatt Utdanning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate varegruppe funnet i varegruppen bordet
 DocType: Land Unit,Parent Land Unit,Moderselskap
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Fertilizer,Fertilizer Name,Navn på gjødsel
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial No {0} er allerede mottatt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial No {0} er allerede mottatt
 ,Requested Items To Be Transferred,Etterspør elementene som skal overføres
 DocType: Expense Claim,Vehicle Log,Vehicle Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Tilstedeværelse av feber (temp&gt; 38,5 ° C eller vedvarende temp&gt; 38 ° C / 100,4 ° F)"
@@ -5229,24 +5267,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
 DocType: Asset Maintenance,Manufacturing User,Manufacturing User
 DocType: Purchase Invoice,Raw Materials Supplied,Råvare Leveres
-DocType: C-Form,Series,Series
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta på prislisten {0} må være {1} eller {2}
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Sak Klassifisering
 DocType: Driver,License Number,Lisensnummer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedlikehold Besøk Formål
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Faktura Pasientregistrering
 DocType: Crop,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,General Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} på La den {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} på La den {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vis Leads
 DocType: Program Enrollment Tool,New Program,nytt program
 DocType: Item Attribute Value,Attribute Value,Attributtverdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 DocType: Salary Detail,Salary Detail,lønn Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Vennligst velg {0} først
 DocType: Appointment Type,Physician,lege
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultasjoner
@@ -5254,15 +5291,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan ikke være større enn planlagt antall ({2}) i Work Order {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Timeregistrering for produksjon.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,delsum
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan ikke endre Variant egenskaper etter aksje transaksjon. Du må lage en ny gjenstand for å gjøre dette.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandat
 DocType: Physician,Charges,kostnader
 DocType: Production Plan,Get Items For Work Order,Få varer for arbeidsordre
 DocType: Salary Detail,Default Amount,Standard Beløp
 DocType: Lab Test Template,Descriptive,beskrivende
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Warehouse ikke funnet i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse ikke funnet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Denne måneden Oppsummering
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`frys Aksjer Eldre en` bør være mindre enn %d dager.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Sett et salgsmål du vil oppnå for din bedrift.
 ,Project wise Stock Tracking,Prosjektet klok Stock Tracking
@@ -5290,11 +5328,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Kunne ikke opprette nettside
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry allerede opprettet eller Sample Quantity ikke oppgitt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry allerede opprettet eller Sample Quantity ikke oppgitt
 DocType: Program,Program Abbreviation,program forkortelse
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Warranty Claim,Resolved By,Løst Av
-DocType: Bank Guarantee,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sjekker og Innskudd feil ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
@@ -5309,11 +5346,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timer
 DocType: Project,Expected Start Date,Tiltredelse
 DocType: Purchase Invoice,04-Correction in Invoice,04-korreksjon i faktura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Arbeidsordre som allerede er opprettet for alle elementer med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Arbeidsordre som allerede er opprettet for alle elementer med BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Detaljer Report
 DocType: Setup Progress Action,Setup Progress Action,Oppsett Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kjøpe prisliste
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kjøpe prisliste
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Fjern artikkel om avgifter er ikke aktuelt til dette elementet
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Avbestille abonnementet
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,"Vennligst velg Vedlikeholdsstatus som Fullført, eller fjern sluttdato"
 DocType: Supplier,Default Payment Terms Template,Standard betalingsbetingelser mal
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaksjons valuta må være samme som Payment Gateway valuta
@@ -5324,7 +5362,6 @@
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tiltak hvis Snø Månedlig budsjett Skredet
-DocType: Subscription,Submit on creation,Send inn på skapelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta for {0} må være {1}
 DocType: Asset,Disposal Date,Deponering Dato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post vil bli sendt til alle aktive ansatte i selskapet ved den gitte timen, hvis de ikke har ferie. Oppsummering av svarene vil bli sendt ved midnatt."
@@ -5342,6 +5379,7 @@
 DocType: Batch,Parent Batch,Parent Batch
 DocType: Cheque Print Template,Cheque Print Template,Sjekk ut Mal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plan Kostnadssteder
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Antall dager etter fakturadato er gått før du kansellerer abonnement eller markeringsabonnement som ubetalt
 DocType: Lab Test Template,Sample Collection,Eksempel Innsamling
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
 DocType: Price List,Price List Name,Prisliste Name
@@ -5350,7 +5388,7 @@
 DocType: Account,Income,Inntekt
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Noe gikk galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 DocType: Supplier Scorecard Scoring Criteria,Score,Score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskapsåret {0} finnes ikke
@@ -5370,12 +5408,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} skal være en verdi mellom 0 og 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Neste avskrivningsdato kan ikke være før Tilgjengelig-til-bruk-dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Usikret lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbeidstid mot Timeregistrering
 DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Sum innskutt Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Sum innskutt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meldinger som er større enn 160 tegn vil bli delt inn i flere meldinger
 DocType: Purchase Receipt Item,Received and Accepted,Mottatt og akseptert
 DocType: Hub Settings,Company and Seller Profile,Bedrift og selgerprofil
@@ -5389,10 +5427,9 @@
 DocType: Item,Variant Based On,Variant basert på
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vennligst korrigér
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonym
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Mottatt fra
 DocType: Lead,Converted,Omregnet
@@ -5406,6 +5443,7 @@
 DocType: Asset,Assets,Eiendeler
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
+DocType: Subscription,Current Invoice End Date,Faktura for sluttfaktura
 DocType: Payment Term,Due Date Based On,Forfallsdato basert på
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Vennligst angi standard kundegruppe og territorium i salgsinnstillinger
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} finnes ikke
@@ -5413,7 +5451,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Ingen tilbakebetalinger valgt for Journal Entry
 DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
+DocType: Loan,Disbursed,utbetalt
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieinnstillinger
 DocType: Patient Appointment,Service Unit,Servicenhet
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Vellykket sett leverandør
@@ -5426,12 +5466,12 @@
 DocType: Share Balance,No of Shares,Antall aksjer
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Velg Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: School House,House Name,Husnavn
 DocType: Fee Schedule,Total Amount per Student,Totalt beløp per student
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrisk
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsett resten av organisasjonen som brukerne. Du kan også legge invitere kunder til portalen ved å legge dem fra Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
 DocType: Grant Application,Requested Amount,Ønsket beløp
@@ -5441,7 +5481,7 @@
 DocType: Crop Cycle,Detected Diseases,Detekterte sykdommer
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Bursdag Påminnelse for {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 DocType: Asset Maintenance Task,Last Completion Date,Siste sluttdato
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
@@ -5449,9 +5489,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Innstillinger
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Aksje Eiendeler
 DocType: Restaurant,Active Menu,Aktiv meny
 DocType: Target Detail,Target Qty,Target Antall
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Mot lån: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Kasse Innstillinger
 DocType: Student Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
@@ -5460,9 +5501,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Production Plan Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM inneholder ikke lagervare
 DocType: Chapter,Chapter Head,Kapittelhode
 DocType: Payment Term,Month(s) after the end of the invoice month,Måned (e) etter slutten av faktura måneden
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Prosjektet aktivitet / oppgave.
@@ -5470,11 +5511,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab-resultat datetime kan ikke være før testing av datetime
 DocType: POS Profile,Allow user to edit Discount,Tillat brukeren å redigere rabatt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Få kunder fra
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Få kunder fra
 DocType: Purchase Invoice Item,Include Exploded Items,Inkluder eksploderte elementer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
 DocType: Shipping Rule,Restrict to Countries,Begrens til land
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
 DocType: Project,Total Sales Amount (via Sales Order),Total salgsbeløp (via salgsordre)
@@ -5493,6 +5535,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Vurderingsleder
 DocType: Payment Entry,Allocate Payment Amount,Fordele Betalingsbeløp
+DocType: Subscription Plan,Subscription Plan,Abonnementsplan
 DocType: Employee External Work History,Salary,Lønn
 DocType: Serial No,Delivery Document Type,Levering dokumenttype
 DocType: Sales Order,Partly Delivered,Delvis Leveres
@@ -5517,9 +5560,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Aldring Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installere forhåndsinnstillinger
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Ingen leveringsnotering valgt for kunden {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Ingen leveringsnotering valgt for kunden {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM erstattet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Velg elementer basert på leveringsdato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Velg elementer basert på leveringsdato
 DocType: Grant Application,Has any past Grant Record,Har noen tidligere Grant Record
 ,Sales Analytics,Salgs Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Tilgjengelig {0}
@@ -5538,7 +5581,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellrombestilling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kundeservice
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilbudet kandidat en jobb.
@@ -5554,7 +5597,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Studentene har blitt registrert
 DocType: Fees,Student Details,Studentdetaljer
 DocType: Purchase Invoice Item,Stock Qty,Varenummer
-DocType: Employee Loan,Repayment Period in Months,Nedbetalingstid i måneder
+DocType: Loan,Repayment Period in Months,Nedbetalingstid i måneder
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Feil: Ikke en gyldig id?
 DocType: Naming Series,Update Series Number,Update-serien Nummer
 DocType: Account,Equity,Egenkapital
@@ -5563,7 +5606,7 @@
 DocType: Task,Closing Date,Avslutningsdato
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
 DocType: Timesheet,Work Detail,Arbeidsdetalj
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingeniør
 DocType: Journal Entry,Total Amount Currency,Totalbeløp Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
@@ -5609,13 +5652,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donor Type informasjon.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Feil i formel eller betingelse: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturert beløp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturert beløp
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterievekter må legge opp til 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Oppmøte
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,lager~~POS=TRUNC
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Opprette {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være det samme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
@@ -5639,14 +5681,14 @@
 DocType: Shipping Rule,Fixed,fast
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Rund av konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrative utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrative utgifter
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
-DocType: Journal Entry,Subscription,Abonnement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonnement
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Avgiftskapasitet venter
 DocType: Appraisal Goal,Score Earned,Resultat tjent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Oppsigelsestid
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Oppsigelsestid
 DocType: Asset Category,Asset Category Name,Asset Category Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er en rot territorium og kan ikke redigeres.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person navn
@@ -5660,7 +5702,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av Avskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
@@ -5668,7 +5710,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
 DocType: Hub Settings,Company Logo,Firmalogo
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 DocType: Healthcare Settings,Patient Registration,Pasientregistrering
@@ -5703,11 +5745,10 @@
 DocType: Journal Entry,Total Debit,Total debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standardferdigvarelageret
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Vennligst velg Pasient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,fasiliteter
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budsjett og kostnadssted
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Flere standard betalingsmåter er ikke tillatt
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
 ,Appointment Analytics,Avtale Analytics
 DocType: Vehicle Service,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blogg Subscriber
@@ -5724,6 +5765,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,La være tom hvis du lager studentgrupper hvert år
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis det er merket, Total nei. arbeidsdager vil omfatte helligdager, og dette vil redusere verdien av Lønn per dag"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Apper som bruker nåværende nøkkel vil ikke kunne få tilgang til, er du sikker?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,Total Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Endre malkode
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Begrepet Sluttdatoen kan ikke være tidligere enn Term startdato. Korriger datoene, og prøv igjen."
@@ -5735,8 +5777,9 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 DocType: Cheque Print Template,Signatory Position,Signataren plassering
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Sett som tapte
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Sett som tapte
 DocType: Timesheet,Total Billable Hours,Totalt fakturerbare timer
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Antall dager som abonnenten må betale fakturaer generert av dette abonnementet
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Kvittering Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er basert på transaksjoner mot denne kunden. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rad {0}: Avsatt beløp {1} må være mindre enn eller lik Betaling Entry mengden {2}
@@ -5755,12 +5798,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Company,Company Info,Selskap Info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Velg eller legg til ny kunde
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
 DocType: Assessment Result,Summary,Sammendrag
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurant Bestillingsinngang
@@ -5772,7 +5815,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kjøpesummen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Slutt År kan ikke være før start År
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Ytelser til ansatte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Ytelser til ansatte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Work Order,Manufactured Qty,Produsert Antall
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Aksjene eksisterer ikke med {0}
@@ -5780,12 +5823,12 @@
 DocType: Asset,Out of Order,I ustand
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorer arbeidsstasjonstidoverlapping
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Velg batchnumre
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger hevet til kundene.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 DocType: Patient Service Unit,Medical Administrator,Medisinsk administrator
 DocType: Assessment Plan,Schedule,Tidsplan
 DocType: Account,Parent Account,Parent konto
@@ -5815,15 +5858,16 @@
 DocType: Asset Repair,Repair Status,Reparasjonsstatus
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Vennligst velg Employee Record først.
 DocType: POS Profile,Account for Change Amount,Konto for Change Beløp
 DocType: Purchase Invoice,input service,inntjeningstjeneste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Vedlikeholdsteammedlem
 DocType: Agriculture Analysis Criteria,Soil Analysis,Jordanalyse
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Bankkode:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Skriv inn Expense konto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
@@ -5872,19 +5916,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Innleggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt navn
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
 DocType: Asset,Asset Category,Asset Kategori
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolønn kan ikke være negativ
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiale til Leverandør
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Material Request Planning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Vesenet Faktura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% kommer mer enn én gang
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
 DocType: Employee Attendance Tool,Marked Attendance,merket Oppmøte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kortsiktig gjeld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kortsiktig gjeld
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timeren oversteg de angitte timene.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Sende masse SMS til kontaktene dine
 DocType: Patient,A Positive,En positiv
@@ -5895,9 +5939,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og innkjøpsordre til denne leverandøren skal utstedes med forsiktighet."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
-DocType: Employee Loan,Loan Type,låne~~POS=TRUNC
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} har blitt sendt inn
+DocType: Loan,Loan Type,låne~~POS=TRUNC
 DocType: Scheduling Tool,Scheduling Tool,planlegging Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredittkort
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredittkort
 DocType: BOM,Item to be manufactured or repacked,Elementet som skal produseres eller pakkes
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5929,7 +5974,7 @@
 DocType: Item,Units of Measure,Måleenheter
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillat Produksjonen på helligdager
 DocType: Sales Invoice,Customer's Purchase Order Date,Kundens Purchase Order Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitalbeholdningen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitalbeholdningen
 DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedlegg
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 DocType: Restaurant Reservation,Reservation Time,Reservasjonstid
@@ -5944,7 +5989,7 @@
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd by Date kan ikke være før transaksjonsdato
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Utvalgte produkter
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
@@ -5954,20 +5999,20 @@
 DocType: Driver,Expiry Date,Utløpsdato
 DocType: Healthcare Settings,Employee name and designation in print,Ansattes navn og betegnelse på trykk
 ,accounts-browser,kontoer-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vennligst første velg kategori
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Prosjektet mester.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Å tillate overfakturering eller over-bestilling, oppdatere &quot;Fradrag&quot; på lager Innstillinger eller elementet."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Halv Dag)
 DocType: Payment Term,Credit Days,Kreditt Days
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Vennligst velg Pasient for å få Lab Tests
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Gjør Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Ledetid Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er inntektsskatt utgift
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Sjekk dette hvis studenten er bosatt ved instituttets Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
 ,Stock Summary,Stock oppsummering
@@ -5978,10 +6023,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: BOM Operation,Operating Cost(Company Currency),Driftskostnader (Selskap Valuta)
-DocType: Employee Loan Application,Rate of Interest,Rente
+DocType: Loan Application,Rate of Interest,Rente
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: Item,Shelf Life In Days,Holdbarhet i dager
 DocType: GL Entry,Is Opening,Er Åpnings
+DocType: Department,Expense Approvers,Utgifter Godkjenninger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
 DocType: Journal Entry,Subscription Section,Abonnementsseksjon
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} finnes ikke
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 95bc20e..98449c4 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Raporty z oceny
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produkty konsumenckie
-DocType: Purchase Receipt,Subscription Detail,Szczegóły subskrypcji
 DocType: Supplier Scorecard,Notify Supplier,Powiadom o Dostawcy
 DocType: Item,Customer Items,Pozycje klientów
 DocType: Project,Costing and Billing,Kalkulacja kosztów i fakturowanie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
 DocType: Item,Publish Item to hub.erpnext.com,Publikacja na hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Powiadomienia na e-mail
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Ocena
 DocType: Item,Default Unit of Measure,Domyślna jednostka miary
 DocType: SMS Center,All Sales Partner Contact,Wszystkie dane kontaktowe Partnera Sprzedaży
-DocType: Employee,Leave Approvers,Osoby Zatwierdzające Urlop
+DocType: Department,Leave Approvers,Osoby Zatwierdzające Urlop
 DocType: Sales Partner,Dealer,Diler
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Dochodzenia
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Sprawdź dostępność
 DocType: Job Applicant,Job Applicant,Aplikujący o pracę
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Jest to oparte na operacjach przeciwko tym Dostawcę. Zobacz harmonogram poniżej w szczegółach
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legalnie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legalnie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0}
 DocType: Bank Guarantee,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Wymagane przez
 DocType: Delivery Note,Return Against Delivery Note,Powrót Przeciwko dostawy nocie
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Rachunku bankowego nie może być nazwany {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (lub grupy), przeciwko którym zapisy księgowe są i sald są utrzymywane."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nie ma zadnych Slipów Wynagrodzenia do przetworzenia.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nie ma zadnych Slipów Wynagrodzenia do przetworzenia.
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaż otwarta
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Konieczne jest samo podjęcie tej akcji w odniesieniu do wyżej wspomnianego powtarzania
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Seria zaktualizowana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Sprawdzić
 DocType: Pricing Rule,Apply On,Zastosuj Na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców
 DocType: Support Settings,Support Settings,Ustawienia wsparcia
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Nowe Zgłoszenie Nieobecności
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Batch Przedmiot status ważności
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Przekaz bankowy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Przekaz bankowy
 DocType: Membership,membership validaty section,sekcja zatwierdzania członkostwa
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 DocType: Consultation,Consultation,Konsultacja
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiał
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Tworzenie strony internetowej
 DocType: Opening Invoice Creation Tool Item,Quantity,Ilość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabela kont nie może być pusta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Kredyty (zobowiązania)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Tabela kont nie może być pusta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,Mijający rok
 DocType: Item,Country of Origin,Kraj pochodzenia
 DocType: Soil Texture,Soil Texture Criteria,Kryteria tekstury gleby
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Podstawowe dane kontaktowe
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Otwarte kwestie
 DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
 DocType: Lab Test Groups,Add new line,Dodaj nową linię
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Opieka zdrowotna
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Opóźnienie w płatności (dni)
@@ -89,7 +85,7 @@
 ,Delay Days,Dni opóźnienia
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Szczegóły dotyczące wagi przedmiotu
 DocType: Asset Maintenance Log,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),Wynik (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Wiersz # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Wiersz # {0}:
 DocType: Timesheet,Total Costing Amount,Łączna kwota Costing
 DocType: Delivery Note,Vehicle No,Nr pojazdu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Wybierz Cennik
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Produkty w toku
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Proszę wybrać datę
 DocType: Daily Work Summary Group,Holiday List,Lista świąt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Księgowy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Księgowy
 DocType: Hub Settings,Selling Price List,Cennik sprzedaży
 DocType: Patient,Tobacco Current Use,Obecne użycie tytoniu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Kurs sprzedaży
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Kurs sprzedaży
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Nr telefonu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nowy {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Wstępne powiadomienie e-mail wysłane
 ,Sales Partners Commission,Prowizja Partnera Sprzedaży
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Wartość po amortyzacji
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Związane z
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,data frekwencja nie może być mniejsza niż data łączącej pracownika
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,data frekwencja nie może być mniejsza niż data łączącej pracownika
 DocType: Grading Scale,Grading Scale Name,Skala ocen Nazwa
-DocType: Subscription,Repeat on Day,Powtórz w dzień
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jest konto root i nie może być edytowane.
 DocType: Sales Invoice,Company Address,adres spółki
 DocType: BOM,Operations,Działania
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nie można ustawić autoryzacji na podstawie Zniżki dla {0}
+DocType: Subscription,Subscription Start Date,Data rozpoczęcia subskrypcji
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Dołączyć plik .csv z dwoma kolumnami, po jednym dla starej nazwy i jeden dla nowej nazwy"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nie w każdej aktywnej roku obrotowego.
 DocType: Packed Item,Parent Detail docname,Nazwa dokumentu ze szczegółami nadrzędnego rodzica
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odniesienie: {0}, Kod pozycji: {1} i klient: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Termin zakończenia okresu próbnego Nie może być przed datą rozpoczęcia okresu próbnego
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ogłoszenie o pracę
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Zestawienie materiałów nie zostało określone dla przedmiotu podwykonawstwa {0} w wierszu {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ta sama Spółka wpisana jest więcej niż jeden raz
 DocType: Patient,Married,Żonaty / Zamężna
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nie dopuszczony do {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pobierz zawartość z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Pobierz zawartość z
 DocType: Price List,Price Not UOM Dependant,Cena nie zależna od UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Olej hamulcowy
 DocType: Tax Rule,Tax Type,Rodzaj podatku
 ,Completed Work Orders,Zrealizowane zlecenia pracy
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Kwota podlegająca opodatkowaniu
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Kwota podlegająca opodatkowaniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
 DocType: BOM,Item Image (if not slideshow),Element Obrazek (jeśli nie slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Wiersz # {0}: Typ dokumentu referencyjnego musi być jednym z wydatków roszczenia lub wpisu do dziennika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Wybierz BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Wiersz # {0}: Typ dokumentu referencyjnego musi być jednym z wydatków roszczenia lub wpisu do dziennika
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Wybierz BOM
 DocType: SMS Log,SMS Log,Dziennik zdarzeń SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koszt dostarczonych przedmiotów
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Zarządzaj kwotą zaliczki przekazaną Pracownikowi
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Powiadomienie o dostawie
 DocType: Journal Entry,Opening Entry,Wpis początkowy
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tylko płatne konto
-DocType: Employee Loan,Repay Over Number of Periods,Spłaty przez liczbę okresów
+DocType: Loan,Repay Over Number of Periods,Spłaty przez liczbę okresów
 DocType: Stock Entry,Additional Costs,Dodatkowe koszty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
 DocType: Lead,Product Enquiry,Zapytanie o produkt
 DocType: Education Settings,Validate Batch for Students in Student Group,Sprawdź partię dla studentów w grupie studentów
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nie znaleziono rekordu urlopu pracownika {0} dla {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nie znaleziono rekordu urlopu pracownika {0} dla {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Proszę najpierw wpisać Firmę
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Najpierw wybierz firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Najpierw wybierz firmę
 DocType: Employee Education,Under Graduate,Absolwent
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Ustaw domyślny szablon dla Opuszczania powiadomienia o statusie w Ustawieniach HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,
 DocType: BOM,Total Cost,Koszt całkowity
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,pracownik Kredyt
 DocType: Fee Schedule,Send Payment Request Email,Wyślij e-mail z zapytaniem o płatność
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nieruchomości
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Pomyślnie wyrejestrowana.
 DocType: Assessment Result,Grade,Stopień
 DocType: Restaurant Table,No of Seats,Liczba miejsc
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Aby dodać temat dynamiczny, użyj tagów jinja, takich jak <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: Asset Maintenance Task,Asset Maintenance Task,Zadanie utrzymania aktywów
 DocType: SMS Center,All Contact,Wszystkie dane Kontaktu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Roczne Wynagrodzenie
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Roczne Wynagrodzenie
 DocType: Daily Work Summary,Daily Work Summary,Dziennie Podsumowanie zawodowe
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} jest zamrożone
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Wydatki magazynowe
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Wydatki magazynowe
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Wybierz Magazyn docelowy
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Wybierz Magazyn docelowy
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Proszę wpisać Preferowany Kontakt Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Proszę wpisać Preferowany Kontakt Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,adres główny
 DocType: Production Plan,Material Request Detail,Szczegółowy wniosek o materiał
 DocType: Selling Settings,Default Quotation Validity Days,Domyślne dni ważności ofert
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Ustawienia dla modułu HR
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: Sales Invoice,Change Amount,Zmień Kwota
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kategorie prawa jazdy
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Proszę podać datę doręczenia
 DocType: Depreciation Schedule,Make Depreciation Entry,Bądź Amortyzacja Entry
+DocType: HR Settings,Leave Settings,Opuść ustawienia
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ zapytania
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Bądź pracownika
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Transmitowanie
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Tryb konfiguracji POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Wyłącza tworzenie dzienników czasowych względem zleceń pracy. Operacji nie można śledzić na podstawie zlecenia pracy
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Wykonanie
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Wykonanie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
 DocType: Asset Maintenance Log,Maintenance Status,Status Konserwacji
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Dane dotyczące członkostwa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dostawca jest wymagany w odniesieniu do konta z możliwością opłacenia {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Produkty i cennik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Całkowita liczba godzin: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
 DocType: Drug Prescription,Interval,Interwał
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Pierwszeństwo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Pierwszeństwo
 DocType: Grant Application,Individual,Indywidualny
 DocType: Academic Term,Academics User,Studenci
 DocType: Cheque Print Template,Amount In Figure,Kwota Na rysunku
-DocType: Employee Loan Application,Loan Info,pożyczka Info
+DocType: Loan Application,Loan Info,pożyczka Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan wizyt serwisowych.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Okres kartoteki dostawcy
 DocType: Share Transfer,Share Transfer,Udostępnij przelew
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Szablon przedmiotu
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemia
 DocType: Job Offer,Select Terms and Conditions,Wybierz Regulamin
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Brak Wartości
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Brak Wartości
 DocType: Woocommerce Settings,Woocommerce Settings,Ustawienia Woocommerce
 DocType: Production Plan,Sales Orders,Zlecenia sprzedaży
 DocType: Purchase Taxes and Charges,Valuation,Wycena
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Domyślne terytorium
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Telewizja
 DocType: Work Order Operation,Updated via 'Time Log',"Aktualizowana przez ""Czas Zaloguj"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Wybierz klienta lub dostawcę.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,Kod dziennika
 DocType: Naming Series,Series List for this Transaction,Lista serii dla tej transakcji
 DocType: Company,Enable Perpetual Inventory,Włącz wieczne zapasy
+DocType: Bank Guarantee,Charges Incurred,Naliczone opłaty
 DocType: Company,Default Payroll Payable Account,Domyślny Płace Płatne konta
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Aktualizacja Grupa E
 DocType: Sales Invoice,Is Opening Entry,
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Wynik niestandardowy
 DocType: Delivery Stop,Contact Name,Nazwa kontaktu
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kryteria oceny kursu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Identyfikator podatkowy:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Identyfikator podatkowy:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Legitymacja studencka:
 DocType: POS Customer Group,POS Customer Group,POS Grupa klientów
 DocType: Land Unit,Land Unit describing various land assets,Jednostka lądowa opisująca różne aktywa ziemne
@@ -375,9 +372,8 @@
 ,Open Work Orders,Otwórz zlecenia pracy
 DocType: Payment Term,Credit Months,Miesiące kredytowe
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Wynagrodzenie netto nie może być mniejsza niż 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Aby zatrzymać wysyłanie powtarzających się powiadomień o błędach z systemu, sprawdziliśmy pole Wyłączone w subskrypcji"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Urlopy na Rok
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Urlopy na Rok
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
 DocType: Email Digest,Profit & Loss,Rachunek zysków i strat
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Proszę ustawić Studentów w grupach studenckich
 DocType: Item Website Specification,Item Website Specification,Element Specyfikacja Strony
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Operacje bankowe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Operacje bankowe
 DocType: Crop,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedaży
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs grupy studentów Stworzenie narzędzia
 DocType: Lead,Do Not Contact,Nie Kontaktuj
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Ludzie, którzy uczą w organizacji"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Programista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Course Scheduling Tool,Course Start Date,Data rozpoczęcia kursu
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publikowanie w Hub
 DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Szczegóły zakupu
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nowa oferta
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emaile wynagrodzenia poślizgu pracownikowi na podstawie wybranego w korzystnej email Pracownika
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 DocType: Tax Rule,Shipping County,Dostawa County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Samouczek
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Samouczek
 DocType: Asset,Next Depreciation Date,Następny Amortyzacja Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Koszt aktywność na pracownika
 DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć"
 DocType: Item,Synced With Hub,Synchronizowane z Hub
 DocType: Driver,Fleet Manager,Menadżer floty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Wiersz # {0}: {1} nie może być negatywne dla pozycji {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Wiersz # {0}: {1} nie może być negatywne dla pozycji {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Niepoprawne hasło
 DocType: Item,Variant Of,Wariant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Ustaw stawkę hotelową na {}
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Dowód dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Dowód dostawy
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Koszt sprzedanych aktywów
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Oczywiście Narzędzie Scheduling
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[PILNE] Błąd podczas tworzenia cyklicznych %s dla %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
 DocType: Land Unit,LInked Analysis,Analiza LInked
 DocType: Item Tax,Tax Rate,Stawka podatku
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Okres aplikacji nie może mieć dwóch rekordów przydziału
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Okres aplikacji nie może mieć dwóch rekordów przydziału
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Otrzymanych
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tworzenie grup studenckich
 DocType: Volunteer,Weekends,Weekendy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kwota kredytu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kwota kredytu
 DocType: Setup Progress Action,Action Document,Dokument roboczy
 DocType: Chapter Member,Website URL,URL strony WWW
 ,Finished Goods,Ukończone dobra
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj produkty
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Element Parametr Inspekcja Jakości
+DocType: Leave Application,Leave Approver Name,Imię Zatwierdzającego Urlop
 DocType: Depreciation Schedule,Schedule Date,Planowana Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Zarobki, potrącenia i inne składniki wynagrodzenia"
 DocType: Packed Item,Packed Item,Przedmiot pakowany
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
 DocType: Healthcare Settings,Require Lab Test Approval,Wymagaj zatwierdzenia testu laboratoryjnego
 DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total Outstanding
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
 DocType: Dosage Strength,Strength,Wytrzymałość
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Tworzenie nowego klienta
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny
 DocType: Purchase Receipt,Vehicle Date,Pojazd Data
 DocType: Student Log,Medical,Medyczny
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Powód straty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Powód straty
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Zaktualizuj numer konta
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Ołów Właściciel nie może być taka sama jak Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Przyznana kwota nie może większa niż ilość niewyrównanej
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Pojedynczy
 DocType: Salary Slip,Total Loan Repayment,Suma spłaty kredytu
 DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia
-DocType: Subscription,Yearly,Rocznie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Wprowadź Centrum Kosztów
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Wprowadź Centrum Kosztów
 DocType: Drug Prescription,Dosage,Dawkowanie
 DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Średnia. Cena sprzedaży
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Średnia. Cena sprzedaży
 DocType: Assessment Plan,Examiner Name,Nazwa Examiner
 DocType: Lab Test Template,No Result,Brak wyników
 DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Proszę najpierw wpisać nazwę Firmy
 DocType: Purchase Invoice,Supplier Name,Nazwa dostawcy
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Przeczytać instrukcję ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Pokaż liście wszystkich członków działu w kalendarzu
 DocType: Purchase Invoice,01-Sales Return,01-Zwrot sprzedaży
 DocType: Account,Is Group,Czy Grupa
 DocType: Email Digest,Pending Purchase Orders,W oczekiwaniu zamówień zakupu
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Pole obowiązkowe - rok akademicki
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nie jest powiązane z {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Proszę ustawić domyślne konto płatne dla firmy {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Proszę ustawić domyślne konto płatne dla firmy {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakcja nie jest dozwolona w przypadku zatrzymanego zlecenia pracy {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,Wysłano w
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Zarezerwowane na sprzedaż
 DocType: Packing Slip,From Package No.,Nr Przesyłki
 DocType: Item Attribute,To Range,Do osiągnięcia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Papiery wartościowe i depozyty
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nie można zmienić metody wyceny, ponieważ istnieją transakcje dotyczące niektórych pozycji, które nie mają własnej metody wyceny"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Papiery wartościowe i depozyty
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nie można zmienić metody wyceny, ponieważ istnieją transakcje dotyczące niektórych pozycji, które nie mają własnej metody wyceny"
 DocType: Student Report Generation Tool,Attended by Parents,Uczestniczyli w nim rodzice
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Patient,AB Positive,AB Pozytywne
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Wpis Obecności
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Składnik wynagrodzenia za płac opartego grafik.
 DocType: Sales Order Item,Used for Production Plan,Używane do Planu Produkcji
-DocType: Employee Loan,Total Payment,Całkowita płatność
+DocType: Loan,Total Payment,Całkowita płatność
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nie można anulować transakcji dotyczącej ukończonego zlecenia pracy.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} jest anulowany, więc działanie nie może zostać zakończone"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Wystarczające elementy do budowy
 DocType: POS Profile User,POS Profile User,Użytkownik profilu POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Przychody bezpośrednie
+DocType: Subscription Invoice,Subscription Invoice,Faktura subskrypcyjna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Przychody bezpośrednie
 DocType: Patient Appointment,Date TIme,Data TIm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Urzędnik administracyjny
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Urzędnik administracyjny
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Zakładanie firmy i podatków
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
 DocType: Codification Table,Codification Table,Tabela kodyfikacji
 DocType: Timesheet Detail,Hrs,godziny
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Proszę wybrać firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry Detail,Difference Account,Konto Różnic
 DocType: Purchase Invoice,Supplier GSTIN,Dostawca GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Szablon mapowania przepływów pieniężnych
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
+DocType: Bank Guarantee,Providing,Że
 DocType: Account,Profit and Loss,Zyski i Straty
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Niedozwolone, w razie potrzeby skonfiguruj szablon testu laboratorium"
 DocType: Patient,Risk Factors,Czynniki ryzyka
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
 DocType: Healthcare Settings,Appointment Confirmation,Potwierdzenie spotkania
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Zamknięcie (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,cześć
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Move Item
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Już ustawiono domyślne w profilu pozycji {0} dla użytkownika {1}, domyślnie wyłączone"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,skumulowane wartości
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Niestety, numery seryjne nie mogą zostać połączone"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Niestety, numery seryjne nie mogą zostać połączone"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Obszar jest wymagany w profilu POS
 DocType: Supplier,Prevent RFQs,Zapobiegaj RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Stwórz Zamówienie Sprzedaży
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Przesłane wynagrodzenie za okres od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Przesłane wynagrodzenie za okres od {0} do {1}
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Suma Całkowita
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Data wystawienia rachunku
 DocType: Production Plan,Production Plan,Plan produkcji
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otwieranie narzędzia tworzenia faktury
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Zwrot sprzedaży
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Uwaga: Wszystkie przydzielone liście {0} nie powinna być mniejsza niż już zatwierdzonych liści {1} dla okresu
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Ustaw liczbę w transakcjach na podstawie numeru seryjnego
 ,Total Stock Summary,Całkowity podsumowanie zasobów
 DocType: Announcement,Posted By,Wysłane przez
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Proszę ustawić firmę
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Proszę ustawić firmę
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Training Result Employee,Training Result Employee,Wynik szkolenia pracowników
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
-DocType: Repayment Schedule,Principal Amount,Główna kwota
-DocType: Employee Loan Application,Total Payable Interest,Całkowita zapłata odsetek
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Główna kwota
+DocType: Loan Application,Total Payable Interest,Całkowita zapłata odsetek
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Całkowity stan: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Faktura sprzedaży grafiku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezerwacja restauracji
 DocType: Land Unit,Land Unit Name,Nazwa jednostki lądowej
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Pisanie Wniosku
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Pisanie Wniosku
 DocType: Payment Entry Deduction,Payment Entry Deduction,Płatność Wejście Odliczenie
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Zawijanie
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Powiadom klientów przez e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Powiadom klientów przez e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika
 DocType: Employee Advance,Claimed Amount,Kwota roszczenia
 apps/erpnext/erpnext/config/education.py +180,Masters,
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway konta nie jest tworzony, należy utworzyć ręcznie."
 DocType: Supplier Scorecard,Per Year,Na rok
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie kwalifikuje się do przyjęcia w tym programie zgodnie z DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 DocType: Sales Invoice,Sales Taxes and Charges,Podatki i Opłaty od Sprzedaży
 DocType: Employee,Organization Profile,Profil organizacji
 DocType: Vital Signs,Height (In Meter),Wysokość (w metrze)
 DocType: Student,Sibling Details,rodzeństwo Szczegóły
 DocType: Vehicle Service,Vehicle Service,Obsługa pojazdu
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatycznie wyzwala żądanie zwrotne na podstawie warunków.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatycznie wyzwala żądanie zwrotne na podstawie warunków.
 DocType: Employee,Reason for Resignation,Powód rezygnacji
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Szablon do oceny wyników.
 DocType: Sales Invoice,Credit Note Issued,Credit blanco wystawiony
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Plan Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Zmiana netto stanu zapasów
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Zarząd Kredyt pracownik
 DocType: Employee,Passport Number,Numer Paszportu
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relacja z Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Menager
 DocType: Payment Entry,Payment From / To,Płatność Od / Do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ustaw konto w magazynie {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Transfer materiałów
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nie mogłem znaleźć ścieżki dla
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Otwarcie (Dr)
+DocType: Loan,Applicant,Petent
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Datownik musi byś ustawiony przed {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Wykonywanie powtarzających się dokumentów
 ,GST Itemised Purchase Register,GST Wykaz zamówień zakupu
 DocType: Course Scheduling Tool,Reschedule,Zmień harmonogram
-DocType: Employee Loan,Total Interest Payable,Razem odsetki płatne
+DocType: Loan,Total Interest Payable,Razem odsetki płatne
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Koszt podatków i opłat
 DocType: Work Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
 DocType: BOM Operation,Operation Time,Czas operacji
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,koniec
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Baza
 DocType: Timesheet,Total Billed Hours,Wszystkich Zafakturowane Godziny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Wartość Odpisu
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Wartość Odpisu
 DocType: Leave Block List Allow,Allow User,Zezwól Użytkownikowi
 DocType: Journal Entry,Bill No,Numer Rachunku
 DocType: Company,Gain/Loss Account on Asset Disposal,Konto Zysk / Strata na Aktywów pozbywaniu
 DocType: Vehicle Log,Service Details,Szczegóły usługi
 DocType: Vehicle Log,Service Details,Szczegóły usługi
-DocType: Subscription,Quarterly,Kwartalnie
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Zgrupowane
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Czas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Płukanie surowce na podstawie
 DocType: Sales Invoice,Port Code,Kod portu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reserve Warehouse
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reserve Warehouse
 DocType: Lead,Lead is an Organization,Ołów to organizacja
 DocType: Guardian Interest,Interest,Zainteresowanie
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Przedsprzedaż
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Księgowość
 DocType: Vehicle,Odometer Value (Last),Drogomierz Wartość (Ostatni)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Szablony kryteriów oceny dostawców.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Zapis takiej Płatności już został utworzony
 DocType: Request for Quotation,Get Suppliers,Dostaj Dostawców
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Podgląd Zarobki Slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Podgląd Zarobki Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} zostało wprowadzone wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Przedłużenie członkostwa można odnowić w ciągu 30 dni
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Wybierz tylko, jeśli masz skonfigurowane dokumenty programu Cash Flow Mapper"
 DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu:
 DocType: Supplier Scorecard,Per Week,Na tydzień
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} nie został znaleziony
 DocType: Bin,Stock Value,Wartość zapasów
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Karta kredytowa
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Ustawienia księgowości jednostki
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,w polu Wartość
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,w polu Wartość
 DocType: Asset Settings,Depreciation Options,Opcje amortyzacji
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Nieprawidłowy czas publikacji
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Nieprawidłowy czas publikacji
 DocType: Lead,Campaign Name,Nazwa kampanii
 DocType: Hotel Room,Capacity,Pojemność
 DocType: Selling Settings,Close Opportunity After Days,Po blisko Szansa Dni
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Budget,Budget Against,budżet Against
 DocType: Employee,Cell Number,Numer komórki
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Dla danego kryterium nie ma pracownika. Sprawdź, czy Salary Slips nie zostały jeszcze utworzone."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Dla danego kryterium nie ma pracownika. Sprawdź, czy Salary Slips nie zostały jeszcze utworzone."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Wnioski Auto Materiał Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Proszę wybrać tabelę
 DocType: BOM,Website Specifications,Specyfikacja strony WWW
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} jest nieprawidłowym adresem e-mail w polu ""Odbiorcy"""
 DocType: Special Test Items,Particulars,Szczegóły
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: od {0} typu {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: od {0} typu {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Asset,Maintenance,Konserwacja
+DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Zaktualizuj swój status projektu
 DocType: Item,Maximum sample quantity that can be retained,"Maksymalna ilość próbki, którą można zatrzymać"
@@ -1078,26 +1074,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Domyślne ustawienia koszyku
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Dodaj czasopisma
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Zaleta złomowany poprzez Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Konto przychodów odsetkowych
+DocType: Loan,Interest Income Account,Konto przychodów odsetkowych
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Wysłane zaproszenie do recenzji
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Technologia Bio
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Wydatki na obsługę biura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Wydatki na obsługę biura
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Iść do
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Konfigurowanie konta e-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Asset Repair,Downtime,Przestój
 DocType: Account,Liability,Zobowiązania
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Okres akademicki:
 DocType: Salary Detail,Do not include in total,Nie obejmują łącznie
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Ilość próbki {0} nie może być większa niż ilość odebranej {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Cennik nie wybrany
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Request for Quotation Supplier,Send Email,Wyślij E-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 DocType: Item,Max Sample Quantity,Maksymalna ilość próbki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Brak uprawnień
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Brak uprawnień
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Zapytanie o wycenę
 DocType: Vital Signs,Heart Rate / Pulse,Częstość tętna / impuls
 DocType: Company,Default Bank Account,Domyślne konto bankowe
@@ -1108,12 +1104,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Testy laboratoryjne i Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nie znaleziono pracowników
-DocType: Subscription,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grupa studentów jest już aktualizowana.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupa studentów jest już aktualizowana.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Aktualizacja projektu.
 DocType: SMS Center,All Customer Contact,Wszystkie dane kontaktowe klienta
 DocType: Land Unit,Tree Details,drzewo Szczegóły
@@ -1163,7 +1158,6 @@
 DocType: Stock Entry,STE-,STEMI
 DocType: Upload Attendance,Import Attendance,Importuj Frekwencję
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Wszystkie grupy produktów
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
 DocType: Work Order,Item To Manufacture,Rzecz do wyprodukowania
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} Stan jest {2}
@@ -1177,7 +1171,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Ponownie wybierz, jeśli wybrany adres jest edytowany po zapisaniu"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 DocType: Item,Hub Publishing Details,Szczegóły publikacji wydawnictwa Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Otwarcie&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Otwarcie&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otwarty na uwagi
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
 DocType: Lab Test Template,Result Format,Format wyników
@@ -1187,7 +1181,7 @@
 DocType: Payroll Entry,Bimonthly,Dwumiesięczny
 DocType: Vehicle Service,Brake Pad,Klocek hamulcowy
 DocType: Fertilizer,Fertilizer Contents,Zawartość nawozu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Badania i rozwój
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Badania i rozwój
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Kwota rachunku
 DocType: Company,Registration Details,Szczegóły Rejestracji
 DocType: Timesheet,Total Billed Amount,Kwota całkowita Zapowiadane
@@ -1201,7 +1195,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Pomiń limit kredytowy w zleceniu klienta
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Szacowanie osiągów
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Włączenie &quot;użycie do koszyka&quot;, ponieważ koszyk jest włączony i nie powinno być co najmniej jedna zasada podatkowa w koszyku"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Płatność Wejście {0} jest związana na zamówienie {1}, sprawdź, czy powinien on być wyciągnięty jak wcześniej w tej fakturze."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Płatność Wejście {0} jest związana na zamówienie {1}, sprawdź, czy powinien on być wyciągnięty jak wcześniej w tej fakturze."
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punkt sprzedaży
@@ -1235,7 +1229,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimalne miejsce siedzące
 DocType: Item Attribute,Item Attribute Values,Wartości atrybutu elementu
 DocType: Examination Result,Examination Result,badanie Wynik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Potwierdzenia Zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Główna wartość Wymiany walut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Doctype referencyjny musi być jednym z {0}
@@ -1243,15 +1237,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Work Order,Plan material for sub-assemblies,Materiał plan podzespołów
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} musi być aktywny
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Brak przedmiotów do przeniesienia
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Brak przedmiotów do przeniesienia
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Zamknięcie (otwarcie + suma)
 DocType: Journal Entry,Depreciation Entry,Amortyzacja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią
 DocType: Crop Cycle,ISO 8016 standard,Norma ISO 8016
 DocType: Pricing Rule,Rate or Discount,Stawka lub zniżka
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Nr seryjny {0} nie należy do żadnej rzeczy {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Nr seryjny {0} nie należy do żadnej rzeczy {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Ulubione
 DocType: Hub Settings,Custom Data,Dane niestandardowe
@@ -1263,9 +1257,9 @@
 DocType: Medical Code,Medical Code Standard,Standardowy kod medyczny
 DocType: Soil Texture,Clay Composition (%),Skład gliny (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Zapisz przed przypisaniem zadania.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Wartość bilansu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Wartość bilansu
 DocType: Lab Test,Lab Technician,Technik laboratoryjny
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista cena sprzedaży
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Jeśli zostanie zaznaczone, zostanie utworzony klient, który będzie mapowany na pacjenta. Dla tego klienta powstanie faktury pacjenta. Można również wybrać istniejącego klienta podczas tworzenia pacjenta."
 DocType: Bank Reconciliation,Account Currency,Waluta konta
@@ -1273,16 +1267,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie
 DocType: Purchase Receipt,Range,Przedział
 DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Fee Structure,Components,składniki
 DocType: Item Barcode,Item Barcode,Kod kreskowy
 DocType: Woocommerce Settings,Endpoints,Punkty końcowe
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","do wygenerowania. Jeśli zostanie opóźnione, musisz ręcznie zmienić pole &quot;Powtarzaj na ten dzień&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
 DocType: Share Transfer,From Folio No,Z Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
@@ -1317,16 +1309,17 @@
 DocType: Asset,Available-for-use Date,Data przydatności do użycia
 DocType: Guardian,Guardian Name,Nazwa Stróża
 DocType: Cheque Print Template,Has Print Format,Ma format wydruku
-DocType: Employee Loan,Sanctioned,usankcjonowane
+DocType: Loan,Sanctioned,usankcjonowane
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,jest obowiązkowe. Może rekord Wymiana walut nie jest stworzony dla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Dla pozycji &quot;Produkt Bundle&quot;, magazyn, nr seryjny i numer partii będą rozpatrywane z &quot;packing list&quot; tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego &quot;produkt Bundle&quot;, wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do &quot;packing list&quot; tabeli."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Dla pozycji &quot;Produkt Bundle&quot;, magazyn, nr seryjny i numer partii będą rozpatrywane z &quot;packing list&quot; tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego &quot;produkt Bundle&quot;, wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do &quot;packing list&quot; tabeli."
 DocType: Student Admission,Publish on website,Publikuje na stronie internetowej
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
+DocType: Subscription,Cancelation Date,Data anulowania
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
 DocType: Agriculture Task,Agriculture Task,Zadanie rolnicze
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Przychody pośrednie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Przychody pośrednie
 DocType: Student Attendance Tool,Student Attendance Tool,Obecność Student Narzędzie
 DocType: Restaurant Menu,Price List (Auto created),Cennik (utworzony automatycznie)
 DocType: Cheque Print Template,Date Settings,Data Ustawienia
@@ -1353,6 +1346,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metr
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Data testowania laboratorium nie może być datą zbierania danych
+DocType: Subscription Plan,Cost,Koszt
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypomnień o urodzinach Pracowników
 DocType: Expense Claim,Total Advance Amount,Łączna kwota zaliczki
 DocType: Delivery Stop,Estimated Arrival,Szacowany przyjazd
@@ -1364,15 +1358,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
 DocType: Timesheet Detail,Bill,Rachunek
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Biały
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Biały
 DocType: SMS Center,All Lead (Open),Wszystkie Leady (Otwarte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Wiersz {0}: Ilość nie jest dostępny dla {4} w magazynie {1} w delegowania chwili wejścia ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Możesz wybrać maksymalnie jedną opcję z listy pól wyboru.
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
 DocType: Item,Automatically Create New Batch,Automatyczne tworzenie nowych partii
 DocType: Item,Automatically Create New Batch,Automatyczne tworzenie nowych partii
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Przypisywanie {0} do {1} (wiersz {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Stwórz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Przypisywanie {0} do {1} (wiersz {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Stwórz
 DocType: Student Admission,Admission Start Date,Wstęp Data rozpoczęcia
 DocType: Journal Entry,Total Amount in Words,Wartość całkowita słownie
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nowy pracownik
@@ -1388,7 +1382,7 @@
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 DocType: Repayment Schedule,Balance Loan Amount,Kwota salda kredytu
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Plan zajęć
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opcje magazynu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opcje magazynu
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Wyłącz pobieranie ostatnich szczegółów zakupu w zamówieniu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Czy na pewno chcesz przywrócić złomowane atut?
@@ -1407,11 +1401,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pozycja listu przewozowego
 DocType: Purchase Invoice,Cash/Bank Account,Konto Gotówka / Bank
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Proszę podać {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Tworzenie wariantu zostało umieszczone w kolejce.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Podsumowanie pracy dla {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pierwszy odznaczony urlop na liście zostanie ustawiony jako domyślny urlopowy zatwierdzający.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Plan,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nie może być ujemna
 DocType: Training Event,Self-Study,Samokształcenie
@@ -1424,7 +1419,7 @@
 DocType: Workstation,Wages,Zarobki
 DocType: Asset Maintenance,Maintenance Manager Name,Nazwa menedżera konserwacji
 DocType: Agriculture Task,Urgent,Pilne
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Proszę podać poprawny identyfikator wiersz dla rzędu {0} w tabeli {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Proszę podać poprawny identyfikator wiersz dla rzędu {0} w tabeli {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nie można znaleźć zmiennej:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Proszę wybrać pole do edycji z numpadu
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nie może być pozycją środka trwałego, ponieważ tworzona jest księga zapasowa."
@@ -1436,7 +1431,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nazwa szablonu kontroli jakości
 DocType: Project,First Email,Pierwszy e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Kwota sprzedaży
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kwota sprzedaży
 DocType: Repayment Schedule,Interest Amount,Kwota procentowa
 DocType: Serial No,Creation Document No,
 DocType: Share Transfer,Issue,Zdarzenie
@@ -1450,10 +1445,10 @@
 DocType: Tax Rule,Shipping State,Stan zakupu
 ,Projected Quantity as Source,Prognozowana ilość jako źródło
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Podróż dostawy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Podróż dostawy
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Rodzaj transferu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Koszty Sprzedaży
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Koszty Sprzedaży
 DocType: Consultation,Diagnosis,Diagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardowe zakupy
 DocType: GL Entry,Against,Wyklucza
@@ -1462,12 +1457,13 @@
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Kod pocztowy
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Wybierz rachunek odsetkowy w banku {0}
 DocType: Opportunity,Contact Info,Dane kontaktowe
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Dokonywanie stockowe Wpisy
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
 DocType: Item,Default Supplier,Domyślny dostawca
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad zasiłkach Procent Produkcji
-DocType: Employee Loan,Repayment Schedule,Harmonogram spłaty
+DocType: Loan,Repayment Schedule,Harmonogram spłaty
 DocType: Shipping Rule Condition,Shipping Rule Condition,Warunek zasady dostawy
 DocType: Holiday List,Get Weekly Off Dates,Pobierz Tygodniowe zestawienie dat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
@@ -1482,7 +1478,7 @@
 DocType: Education Settings,Attendance Freeze Date,Data zamrożenia obecności
 DocType: Education Settings,Attendance Freeze Date,Data zamrożenia obecności
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pokaż wszystke
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Pokaż wszystke
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalny wiek ołowiu (dni)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Wszystkie LM
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Pokoje hotelowe typu {0} są niedostępne w dniu {1}
@@ -1490,14 +1486,16 @@
 DocType: Expense Claim,From Employee,Od pracownika
 DocType: Driver,Cellphone Number,numer telefonu komórkowego
 DocType: Project,Monitor Progress,Monitorowanie postępu
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,Wprowadź różnicę
+DocType: Supplier Quotation,Auto Repeat Section,Sekcja automatycznego powtarzania
 DocType: Upload Attendance,Attendance From Date,Obecność od Daty
 DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Nieprawidłowy Atrybut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} musi zostać wysłane
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Ilość musi być mniejsze niż lub równe {0}
+DocType: Department Approver,Department Approver,Departament zatwierdzający
 DocType: SMS Center,Total Characters,Wszystkich Postacie
 DocType: Employee Advance,Claimed,Roszczenie
 DocType: Crop,Row Spacing,Rozstaw wierszy
@@ -1507,6 +1505,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Płatność Wyrównawcza Faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Udział %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Zgodnie z ustawieniami zakupu, jeśli wymagane jest zamówienie zakupu == &quot;YES&quot;, a następnie do utworzenia faktury zakupu użytkownik musi najpierw utworzyć zamówienie kupna dla pozycji {0}"
+,HSN-wise-summary of outward supplies,Podsumowanie HSN dostaw zewnętrznych
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
@@ -1520,7 +1519,7 @@
 DocType: Setup Progress Action,Action Name,Nazwa akcji
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Rok rozpoczęcia
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Pierwsze 2 cyfry GSTIN powinny odpowiadać numerowi państwa {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Początek okresu rozliczeniowego dla faktury
 DocType: Salary Slip,Leave Without Pay,Urlop bezpłatny
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Planowanie zdolności błąd
@@ -1538,26 +1537,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Pola będą kopiowane tylko w momencie tworzenia.
 DocType: Setup Progress Action,Domains,Domeny
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Zarząd
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Zarząd
 DocType: Cheque Print Template,Payer Settings,Ustawienia płatnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
 DocType: Purchase Invoice,Is Return,Czy Wróć
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Uwaga
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Dzień rozpoczęcia jest większy niż dzień zakończenia w zadaniu &quot;{0}&quot;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Powrót / noty obciążeniowej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Powrót / noty obciążeniowej
 DocType: Price List Country,Price List Country,Cena Kraj
 DocType: Item,UOMs,Jednostki miary
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod przedmiotu nie może być zmieniony na podstawie numeru seryjnego
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kod przedmiotu nie może być zmieniony na podstawie numeru seryjnego
 DocType: Purchase Invoice Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Proszę wpisać kod produkt, aby uzyskać numer partii"
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
-DocType: Employee Loan,Partially Disbursed,częściowo wypłacona
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Udziel informacji.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Udziel informacji.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza dostawców
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Nie można ponownie uruchomić subskrypcji, która nie zostanie anulowana."
 DocType: Account,Balance Sheet,Arkusz Bilansu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
 DocType: Fee Validity,Valid Till,Obowiązuje do
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Spotkanie nauczycieli wszystkich rodziców
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
@@ -1570,7 +1569,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Zmiana grupy klientów dla wybranego klienta jest niedozwolona.
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aktualizacja szacunkowych czasów przybycia.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizacja szacunkowych czasów przybycia.
 DocType: Program Enrollment Tool,Enrollment Details,Szczegóły rejestracji
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Proszę wybrać klienta
@@ -1591,18 +1590,20 @@
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Purchase Order,Group same items,Grupa same pozycje
 DocType: Purchase Invoice,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
-DocType: Employee Loan Application,Repayment Info,Informacje spłata
+DocType: Department,Parent Department,Departament rodziców
+DocType: Loan Application,Repayment Info,Informacje spłata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 DocType: Maintenance Team Member,Maintenance Role,Rola konserwacji
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Konfigurowanie Pracownicy
 DocType: Sales Order,SO-,WIĘC-
 DocType: Hotel Room Reservation,Hotel Reservation User,Użytkownik rezerwacji hotelu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Wybierz prefix
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Badania
+DocType: Subscription Settings,Subscription Settings,Ustawienia subskrypcji
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów
 DocType: Announcement,All Students,Wszyscy uczniowie
@@ -1613,19 +1614,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 DocType: Crop Cycle,Less than a year,Mniej niż rok
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nie Student Komórka
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 DocType: Crop,Yield UOM,Wydajność UOM
 ,Budget Variance Report,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
 DocType: Item,Is Item from Hub,Jest Przedmiot z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Wiersz {0}: Typ aktywny jest obowiązkowe.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dywidendy wypłacone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dywidendy wypłacone
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Księgi rachunkowe
 DocType: Stock Reconciliation,Difference Amount,Kwota różnicy
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} w dniu urlopu w dniu {1}
 DocType: Purchase Invoice,Reverse Charge,Opłata zwrotna
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Zyski zatrzymane
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Zyski zatrzymane
 DocType: Purchase Invoice,05-Change in POS,05-Zmiana w POS
 DocType: Vehicle Log,Service Detail,Szczegóły usługi
 DocType: BOM,Item Description,Opis produktu
@@ -1640,12 +1641,12 @@
 DocType: Opportunity Item,Opportunity Item,Przedmiot Szansy
 ,Student and Guardian Contact Details,Uczeń i opiekun Dane kontaktowe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Wiersz {0}: Dla dostawcy {0} adres email jest wymagany do wysyłania wiadomości e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tymczasowe otwarcia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Tymczasowe otwarcia
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Wyświetl centrum
 ,Employee Leave Balance,Bilans zwolnień pracownika
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 DocType: Patient Appointment,More Info,Więcej informacji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
 DocType: Supplier Scorecard,Scorecard Actions,Działania kartoteki
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Przykład: Masters w dziedzinie informatyki
 DocType: Purchase Invoice,Rejected Warehouse,Odrzucony Magazyn
@@ -1655,7 +1656,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,do
 DocType: Supplier Quotation Item,Lead Time in days,Czas oczekiwania w dniach
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Zobowiązania Podsumowanie
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Wypłata wynagrodzenia z {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Wypłata wynagrodzenia z {0} {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
@@ -1664,9 +1665,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Zasady badań laboratoryjnych
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Mały
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Mały
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otwieranie narzędzia tworzenia faktury
 DocType: Education Settings,Employee Number,Numer pracownika
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Anuluj fakturę po okresie łaski
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
 DocType: Project,% Completed,% ukończone
 ,Invoiced Amount (Exculsive Tax),Zafakturowana kwota netto
@@ -1680,7 +1682,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Testowanie laboratoryjne Datetime
 DocType: Email Digest,Add Quote,Dodaj Cytat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Wydatki pośrednie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
 DocType: Agriculture Analysis Criteria,Agriculture,Rolnictwo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1711,16 +1713,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko Kredytowane konta mogą być połączone z innym zapisem po stronie debetowej"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Proszę najpierw ustawić kod pozycji
 DocType: Item,ITEM-,POZYCJA-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
+DocType: Subscription Plan,Billing Interval Count,Liczba interwałów rozliczeń
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 DocType: Antibiotic,Antibiotic,Antybiotyk
 ,Team Updates,Aktualizacje zespół
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ustawienie Typu Konta pomaga w wyborze tego konta w transakcji.
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Tworzenie format wydruku
@@ -1746,7 +1749,7 @@
 DocType: POS Item Group,POS Item Group,POS Pozycja Grupy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,"Element alternatywny nie może być taki sam, jak kod produktu"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,Dystrybucja docelowa
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalizacja oceny tymczasowej
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
@@ -1763,7 +1766,7 @@
 DocType: BOM Operation,Workstation,Stacja robocza
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zapytanie ofertowe do dostawcy
 DocType: Healthcare Settings,Registration Message,Wiadomość rejestracyjna
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Sprzęt komputerowy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Sprzęt komputerowy
 DocType: Prescription Dosage,Prescription Dosage,Dawka leku na receptę
 DocType: Attendance,HR Manager,
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Wybierz firmę
@@ -1794,7 +1797,7 @@
 DocType: Project,Start and End Dates,Daty rozpoczęcia i zakończenia
 ,Delivered Items To Be Billed,Dostarczone przedmioty oczekujące na fakturowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otwarte BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
 DocType: Authorization Rule,Average Discount,Średni rabat
 DocType: Project Update,Great/Quickly,Świetnie / Szybko
 DocType: Purchase Invoice Item,UOM,Jednostka miary
@@ -1803,8 +1806,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Wybierz partie dla partii
 DocType: Asset,Depreciation Schedules,Rozkłady amortyzacyjne
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,W ustawieniach GST można wybrać następujące konta:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,W ustawieniach GST można wybrać następujące konta:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,walucie transakcji
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1815,6 +1818,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Średnia dzienna Wychodzące
 DocType: POS Profile,Campaign,Kampania
 DocType: Supplier,Name and Type,Nazwa i typ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Status Zatwierdzenia musi być 'Zatwierdzono' albo 'Odrzucono'
 DocType: Physician,Contacts and Address,Kontakty i adres
 DocType: Purchase Invoice,Contact Person,Osoba kontaktowa
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Przewidywana data rozpoczęcia' nie może nastąpić później niż 'Przewidywana data zakończenia'
@@ -1828,19 +1832,20 @@
 DocType: Student Admission,Eligibility and Details,Kwalifikowalność i szczegóły
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Zmiana netto stanu trwałego
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zapytanie ofertowe zostało wyłączone z dostępem do portalu, więcej ustawień portalowych wyboru."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dostawca Scorecard Zmienna scoringowa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kwota zakupu
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Kwota zakupu
 DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Podczas tworzenia harmonogramu kursów wystąpiły błędy
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pierwszy zatwierdzający wydatek na liście zostanie ustawiony jako domyślny zatwierdzający koszt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nie może być większa niż 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Detail,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1861,15 +1866,16 @@
 DocType: Package Code,Package Code,Kod pakietu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Uczeń
 DocType: Purchase Invoice,Company GSTIN,Firma GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Podatki pobierane z tabeli szczegółów mistrza poz jako ciąg znaków i przechowywane w tej dziedzinie.
  Służy do podatkach i opłatach"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Pozostaw zatwierdzającego obowiązkowo w aplikacji opuszczającej
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil stanowiska pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
@@ -1897,15 +1903,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Magazyn źródłowy jest obowiązkowy dla wiersza {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Termin płatności w wierszu {0} jest prawdopodobnie duplikatem.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Rolnictwo (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,List przewozowy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Wydatki na wynajem
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,List przewozowy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Wydatki na wynajem
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 DocType: Disease,Common Name,Nazwa zwyczajowa
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import nie powiódł się!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
 DocType: Vital Signs,Blood Pressure,Ciśnienie krwi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analityk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analityk
 DocType: Item,Inventory,Inwentarz
 DocType: Item,Sales Details,Szczegóły sprzedaży
 DocType: Quality Inspection,QI-,QI-
@@ -1915,15 +1921,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Zatwierdzić zapisany kurs dla studentów w grupie studentów
 DocType: Notification Control,Expense Claim Rejected,Zwrot wydatku odrzucony
 DocType: Item,Item Attribute,Atrybut elementu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Rząd
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Rząd
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Koszty roszczenie {0} już istnieje dla Zaloguj Pojazdów
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Nazwa Instytutu
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Wpisz Kwota spłaty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Wpisz Kwota spłaty
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Warianty artykuł
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Usługi
 DocType: HR Settings,Email Salary Slip to Employee,Email Wynagrodzenie Slip pracownikowi
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Wybierz Możliwa Dostawca
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Wybierz Możliwa Dostawca
 DocType: Sales Invoice,Source,Źródło
 DocType: Customer,"Select, to make the customer searchable with these fields","Wybierz, aby klient mógł wyszukać za pomocą tych pól"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Pokaż closed
@@ -1940,7 +1946,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,List(y) przewozowe anulowane
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie
 DocType: Program Course,Program Course,Program kursu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Koszty dostaw i przesyłek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline do strony głównej
 DocType: Item Group,Item Group Name,Element Nazwa grupy
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty
@@ -1970,10 +1976,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Szczegóły Memebership
 DocType: Leave Block List,Block Holidays on important days.,Blok Wakacje na ważne dni.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Podaj wszystkie wymagane wartości wynikowe
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Należności Podsumowanie
-DocType: Employee Loan,Monthly Repayment Amount,Miesięczna kwota spłaty
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Należności Podsumowanie
+DocType: Loan,Monthly Repayment Amount,Miesięczna kwota spłaty
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Otwieranie faktur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
 DocType: UOM,UOM Name,Nazwa Jednostki Miary
 DocType: GST HSN Code,HSN Code,Kod HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Kwota udziału
@@ -1995,7 +2001,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Użytkownik {0} jest już przydzielony do lekarza {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Pudło
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Dostawca możliwe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Dostawca możliwe
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Miesięczny Dystrybucja
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista odbiorców jest pusta. Proszę stworzyć Listę Odbiorców
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Opieka zdrowotna (beta)
@@ -2023,7 +2030,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Brak Przedmiotów do pakowania
 DocType: Shipping Rule Condition,From Value,Od wartości
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
-DocType: Employee Loan,Repayment Method,Sposób spłaty
+DocType: Loan,Repayment Method,Sposób spłaty
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jeśli zaznaczone, strona główna będzie Grupa domyślna pozycja na stronie"
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Zwrot wydatków
@@ -2032,7 +2039,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Wymagany certyfikat
 DocType: Company,Default Holiday List,Domyślnie lista urlopowa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Wiersz {0}: od czasu do czasu i od {1} pokrywa się z {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zadłużenie zapasów
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Zadłużenie zapasów
 DocType: Purchase Invoice,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Wybierz firmę
@@ -2040,7 +2047,7 @@
 DocType: Student Report Generation Tool,Print Section,Sekcja drukowania
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Użytkownik {0} nie ma żadnego domyślnego profilu POS. Sprawdź domyślne w wierszu {1} dla tego użytkownika.
 DocType: Student Group,Set 0 for no limit,Ustaw 0 oznacza brak limitu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Wiersz {idx}: {pole} jest wymagany do utworzenia faktur otwarcia {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Główny adres i dane kontaktowe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Wyślij ponownie płatności E-mail
@@ -2051,10 +2058,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Wybierz co najmniej jedną domenę.
 DocType: Dependent Task,Dependent Task,Zadanie zależne
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
 DocType: SMS Center,Receiver List,Lista odbiorców
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Szukaj przedmiotu
 DocType: Payment Schedule,Payment Amount,Kwota płatności
@@ -2064,7 +2071,7 @@
 DocType: Assessment Plan,Grading Scale,Skala ocen
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Zakończone
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,W Parze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,W Parze
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import powiódł się!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
@@ -2075,17 +2082,16 @@
 DocType: Quotation Item,Quotation Item,Przedmiot oferty
 DocType: Customer,Customer POS Id,Identyfikator klienta klienta
 DocType: Account,Account Name,Nazwa konta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Nr seryjny {0} dla ilości {1} nie może być ułamkiem
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Nr seryjny {0} dla ilości {1} nie może być ułamkiem
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Wprowadź adres URL serwera Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
 DocType: Share Balance,To No,Do Nie
-DocType: Subscription,Reference Document,Dokument referencyjny
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} jest anulowane lub wstrzymane
 DocType: Accounts Settings,Credit Controller,
-DocType: Grant Application,Applicant Type,Typ Wnioskodawcy
+DocType: Loan,Applicant Type,Typ Wnioskodawcy
 DocType: Purchase Invoice,03-Deficiency in services,03-Niedobór usług
 DocType: Delivery Note,Vehicle Dispatch Date,Data wysłania pojazdu
 DocType: Healthcare Settings,Default Medical Code Standard,Domyślny standard kodu medycznego
@@ -2096,13 +2102,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% rozliczono
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Kadry
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Kadry
 DocType: Lead,Upper Income,Wzrost Wpływów
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Odrzucać
 DocType: Journal Entry Account,Debit in Company Currency,Debet w firmie Waluta
 DocType: BOM Item,BOM Item,
 DocType: Appraisal,For Employee,Dla pracownika
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Dokonaj wydatkowania Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Dokonaj wydatkowania Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Wiersz {0}: Advance przed Dostawcę należy obciążyć
 DocType: Company,Default Values,Domyślne Wartości
 DocType: Membership,INR,INR
@@ -2131,10 +2137,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Razem (bez podatku)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Liczba potencjalnych klientów
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musi być większy niż 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Dostępność towaru
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Dostępność towaru
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planowanie zdolności Do (dni)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Dostarczanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Pole obowiązkowe - program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Pole obowiązkowe - program
 DocType: Special Test Template,Result Component,Komponent wyników
@@ -2155,7 +2161,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Dołączaj święta w ciągu urlopu
 DocType: Sales Invoice,Packed Items,Przedmioty pakowane
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Roszczenie gwarancyjne z numerem seryjnym
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Całkowity&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Całkowity&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Włącz Koszyk
 DocType: Employee,Permanent Address,Stały adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2173,10 +2179,10 @@
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potwierdź działanie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Aukcje Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Podaj dokładnie Ilość lub Stawkę lub obie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Spełnienie
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Zobacz Koszyk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Wydatki marketingowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,Element Zgłoś Niedobór
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Nie można utworzyć standardowych kryteriów. Zmień nazwę kryteriów
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
@@ -2199,9 +2205,9 @@
 DocType: Upload Attendance,Get Template,Pobierz szablon
 DocType: Material Request,Transferred,Przeniesiony
 DocType: Vehicle,Doors,drzwi
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Zbierz opłatę za rejestrację pacjenta
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nie można zmienić atrybutów po transakcji giełdowej. Zrób nowy przedmiot i prześlij towar do nowego przedmiotu
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nie można zmienić atrybutów po transakcji giełdowej. Zrób nowy przedmiot i prześlij towar do nowego przedmiotu
 DocType: Course Assessment Criteria,Weightage,Waga/wiek
 DocType: Purchase Invoice,Tax Breakup,Podział podatków
 DocType: Packing Slip,PS-,PS
@@ -2237,12 +2243,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Purchase Invoice Item,Batch No,Nr Partii
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Zaliczki dla pracowników
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 DocType: Grant Application,Assessment  Mark (Out of 10),Ocena (na 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Komórka Nie
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Główny
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
@@ -2251,15 +2258,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Email Digest,Annual Expenses,roczne koszty
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
 DocType: Sales Team,Contribution to Net Total,
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
 DocType: Territory,Territory Name,Nazwa Regionu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Możesz mieć tylko Plany z tym samym cyklem rozliczeniowym w Subskrypcji
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikant do Pracy.
 DocType: Purchase Order Item,Warehouse and Reference,Magazyn i punkt odniesienia
 DocType: Supplier,Statutory info and other general information about your Supplier,Informacje prawne na temat dostawcy
@@ -2270,10 +2278,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,wyceny
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Wydarzenia szkoleniowe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Śledzenie potencjalnych klientów przez źródło potencjalnych klientów.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunki wysyłki
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Podaj
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Podaj
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Dziennik konserwacji
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Masa netto tego pakietu. (Obliczone automatycznie jako suma masy netto poszczególnych pozycji)
@@ -2281,11 +2289,11 @@
 DocType: Sales Order,To Deliver and Bill,Do dostarczenia i Bill
 DocType: Student Group,Instructors,instruktorzy
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} musi być złożony
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Zarządzanie udziałami
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Płatność
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Płatność
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Magazyn {0} nie jest powiązany z jakimikolwiek kontem, wspomnij o tym w raporcie magazynu lub ustaw domyślnego konta zapasowego w firmie {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Zarządzanie zamówień
 DocType: Work Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
@@ -2295,7 +2303,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Application Leave
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,włączony
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pakiet przedmiotów w momencie sprzedaży
@@ -2305,7 +2313,7 @@
 DocType: Item,Barcodes,Kody kreskowe
 DocType: Hub Category,Hub Node,Hub Węzeł
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Współpracownik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Współpracownik
 DocType: Asset Movement,Asset Movement,Zaleta Ruch
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Zamówienie pracy {0} musi zostać przesłane
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nowy Koszyk
@@ -2323,13 +2331,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Waluta rozliczeniowa musi być równa domyślnej walucie firmy lub walucie konta strony
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 DocType: Soil Texture,Loam,Ił
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Wiersz {0}: termin płatności nie może być wcześniejszy niż data księgowania
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Wiersz {0}: termin płatności nie może być wcześniejszy niż data księgowania
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Wprowadź wpływ płatności
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
 ,Sales Invoice Trends,
 DocType: Leave Application,Apply / Approve Leaves,Zastosuj / Zatwierdź liście
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Dla
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Może odnosić się do wierdza tylko wtedy, gdy typ opłata jest ""Poprzedniej Wartości Wiersza Suma"" lub ""poprzedniego wiersza Razem"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Może odnosić się do wierdza tylko wtedy, gdy typ opłata jest ""Poprzedniej Wartości Wiersza Suma"" lub ""poprzedniego wiersza Razem"""
 DocType: Sales Order Item,Delivery Warehouse,Magazyn Dostawa
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Drzewo MPK finansowych.
 DocType: Serial No,Delivery Document No,Nr dokumentu dostawy
@@ -2343,7 +2350,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Zużycie materiału nie jest ustawione w Ustawieniach produkcyjnych.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ma Warianty
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nie można przeliterować dla elementu {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżanie opłat, ustaw w Ustawieniach fotografii"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nie można przeliterować dla elementu {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżanie opłat, ustaw w Ustawieniach fotografii"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Zaktualizuj odpowiedź
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
@@ -2355,12 +2362,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Najpierw wybierz program
 DocType: Patient Appointment,Patient Age,Wiek pacjenta
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Zarządzanie projektami
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Numer seryjny {0} został już zwrócony
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Numer seryjny {0} został już zwrócony
 DocType: Supplier,Supplier of Goods or Services.,Dostawca towarów lub usług.
 DocType: Budget,Fiscal Year,Rok Podatkowy
 DocType: Asset Maintenance Log,Planned,Zaplanowany
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Domyślne konta należności, które mają być wykorzystane, jeśli nie zostały ustawione w Księdze Pacjenta, aby zarezerwować opłaty Konsultacyjne."
 DocType: Vehicle Log,Fuel Price,Cena paliwa
+DocType: Bank Guarantee,Margin Money,Marża pieniężna
 DocType: Budget,Budget,Budżet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Ustaw Otwórz
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
@@ -2374,16 +2382,16 @@
 DocType: Lead,Follow Up,Zagryźć
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} nie jest ustawiony na nr seryjny. Sprawdź mastera tego elementu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Element {0} nie jest ustawiony na nr seryjny. Sprawdź mastera tego elementu
 DocType: Maintenance Visit,Maintenance Time,Czas Konserwacji
 ,Amount to Deliver,Kwota do Deliver
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Ten sam element został wprowadzony wielokrotnie. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data rozpoczęcia nie może być krótszy niż rok od daty rozpoczęcia roku akademickiego, w jakim termin ten jest powiązany (Academic Year {}). Popraw daty i spróbuj ponownie."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Wystąpiły błędy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Pracownik {0} złożył już wniosek o przyznanie {1} między {2} a {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Wystąpiły błędy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Pracownik {0} złożył już wniosek o przyznanie {1} między {2} a {3}:
 DocType: Guardian,Guardian Interests,opiekun Zainteresowania
 DocType: Naming Series,Current Value,Bieżąca Wartość
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
 DocType: Education Settings,Instructor Records to be created by,"Rekord instruktorski, który zostanie utworzony przez"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} utworzone
 DocType: GST Account,GST Account,Konto GST
@@ -2403,8 +2411,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Dodano do ulubionych
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nie znaleziono pokwitowania wypłaty za wyżej wymienione kryteria LUB wniosek o wypłatę wynagrodzenia już przesłano
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Podatki i cła
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nie znaleziono pokwitowania wypłaty za wyżej wymienione kryteria LUB wniosek o wypłatę wynagrodzenia już przesłano
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Podatki i cła
 DocType: Projects Settings,Projects Settings,Ustawienia projektów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
@@ -2414,27 +2422,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Drzewo grupy produktów
 DocType: Production Plan,Total Produced Qty,Całkowita ilość wyprodukowanej
 DocType: Payroll Entry,Get Employee Details,Uzyskaj dane pracownika
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty
 DocType: Asset,Sold,Sprzedany
 ,Item-wise Purchase History,
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
 DocType: Account,Frozen,Zamrożony
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Kwota bazowa (Waluta firmy)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Surowy materiał
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Surowy materiał
 DocType: Payment Reconciliation Payment,Reference Row,Odniesienie Row
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
 DocType: Patient,O Positive,O pozytywne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Inwestycje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Inwestycje
 DocType: Issue,Resolution Details,Szczegóły Rozstrzygnięcia
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,przydziały
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kryteria akceptacji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Wpisy do dziennika nie są dostępne
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 DocType: BOM,Show In Website,Pokaż na stronie internetowej
 DocType: Shopping Cart Settings,Show Quantity in Website,Pokaż ilość w Serwisie
-DocType: Employee Loan Application,Total Payable Amount,Całkowita należna kwota
+DocType: Loan Application,Total Payable Amount,Całkowita należna kwota
 DocType: Task,Expected Time (in hours),Oczekiwany czas (w godzinach)
 DocType: Item Reorder,Check in (group),Przyjazd (grupa)
 DocType: Soil Texture,Silt,Muł
@@ -2453,7 +2462,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Dokonać płatności
 DocType: Room,Room Name,Nazwa pokoju
 DocType: Prescription Duration,Prescription Duration,Czas trwania recepty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,
 ,Campaign Efficiency,Skuteczność kampanii
@@ -2473,11 +2482,11 @@
 DocType: Chapter,Chapter,Rozdział
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Para
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Domyślne konto zostanie automatycznie zaktualizowane na fakturze POS po wybraniu tego trybu.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
 DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy partnerów handlowych i kontakty
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Pół Dzień Data powinna być pomiędzy Od Data i do tej pory
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Pół Dzień Data powinna być pomiędzy Od Data i do tej pory
 DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Ustaw domyślne miejsce powstawania kosztów w firmie {0}.
 DocType: Item,Has Batch No,Posada numer partii (batch)
@@ -2495,7 +2504,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu)
 DocType: Soil Texture,Soil Type,Typ gleby
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nowa wiadomość
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Upoważnienie GoCardless
@@ -2515,7 +2523,7 @@
 DocType: Hub Category,Hub Category,Kategoria koncentratora
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
-DocType: Employee Loan,Loan Amount,Kwota kredytu
+DocType: Loan,Loan Amount,Kwota kredytu
 DocType: Student Report Generation Tool,Add Letterhead,Dodaj papier firmowy
 DocType: Program Enrollment,Self-Driving Vehicle,Samochód osobowy
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Dostawca Scorecard Standing
@@ -2543,9 +2551,9 @@
 DocType: Cash Flow Mapper,Position,Pozycja
 DocType: Patient,Patient Details,Szczegóły pacjenta
 DocType: Patient,B Positive,B dodatni
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 DocType: Patient Medical Record,Patient Medical Record,Medyczny dokument medyczny pacjenta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sporty
@@ -2553,8 +2561,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Razem Rzeczywisty
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Rodzeństwo studenckie
+DocType: Subscription Plan Detail,Subscription Plan Detail,Szczegóły abonamentu
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,szt.
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Sprecyzuj Firmę
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Sprecyzuj Firmę
 ,Customer Acquisition and Loyalty,
 DocType: Asset Maintenance Task,Maintenance Task,Zadanie konserwacji
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Ustaw Limit B2C w Ustawieniach GST.
@@ -2568,6 +2577,7 @@
 ,BOM Search,BOM Szukaj
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Całkowity koszt materiałów konsumpcyjnych (poprzez wprowadzenie do magazynu)
 DocType: Hub Settings,Company Registered,Firma zarejestrowana
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Data nie może być mniejsza niż Od daty
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Opublikuj &quot;W magazynie&quot; lub &quot;Nie w magazynie&quot; w Hub na podstawie zapasów dostępnych w tym magazynie.
 DocType: Vehicle,Fuel Type,Typ paliwa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Proszę określić walutę w Spółce
@@ -2575,17 +2585,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Niniejszy materiał Wnioski zostały podniesione automatycznie na podstawie poziomu ponownego zamówienia elementu
 DocType: Email Digest,Pending Sales Orders,W oczekiwaniu zleceń sprzedaży
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
 DocType: Employee,Create User Permission,Utwórz uprawnienia użytkownika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 DocType: Healthcare Settings,Remind Before,Przypomnij wcześniej
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
 DocType: Salary Component,Deduction,Odliczenie
 DocType: Item,Retain Sample,Zachowaj próbkę
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Wiersz {0}: od czasu do czasu i jest obowiązkowe.
 DocType: Stock Reconciliation Item,Amount Difference,kwota różnicy
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Proszę podać ID pracownika tej osoby ze sprzedaży
 DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,W produkcji
@@ -2595,8 +2606,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Obliczony bilans wyciągu bankowego
 DocType: Normal Test Template,Normal Test Template,Normalny szablon testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Wycena
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nie można ustawić odebranego RFQ na Żadne Cytat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Wycena
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nie można ustawić odebranego RFQ na Żadne Cytat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Wybierz konto do wydrukowania w walucie konta
@@ -2604,7 +2615,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Opiera się to na transakcjach przeciwko temu pacjentowi. Zobacz poniżej linię czasu, aby uzyskać szczegółowe informacje"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Koszt Zaktualizowano
 DocType: Patient,Date of Birth,Data urodzenia
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Element {0} został zwrócony
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Element {0} został zwrócony
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Dostawca Scorecard Setup
@@ -2615,14 +2626,15 @@
 DocType: Work Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Opis stanowiska Pracy
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Opis stanowiska Pracy
 DocType: Student Applicant,Applied,Stosowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Otwórz ponownie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Otwórz ponownie
 DocType: Sales Invoice Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nazwa Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Zniżka po sprzedaży
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
+DocType: Department Approver,Approver,Osoba zatwierdzająca
 ,SO Qty,
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Pole Do akcjonariusza nie może być puste
 DocType: Guardian,Work Address,Adres miejsca pracy
@@ -2636,21 +2648,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Łączna kwota przyznanego wsparcia (Spółka waluty)
 DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
 DocType: BOM,Scrap Material Cost,Złom Materiał Koszt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Nr seryjny: {0} nie należy do żadnego Magazynu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Nr seryjny: {0} nie należy do żadnego Magazynu
 DocType: Grant Application,Email Notification Sent,Wysłane powiadomienie e-mail
 DocType: Purchase Invoice,In Words (Company Currency),Słownie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kod przedmiotu, magazyn, ilość są wymagane w wierszu"
-DocType: Pricing Rule,Supplier,Dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kod przedmiotu, magazyn, ilość są wymagane w wierszu"
+DocType: Bank Guarantee,Supplier,Dostawca
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Pokaż szczegóły płatności
 DocType: Consultation,Consultation Time,Czas konsultacji
 DocType: C-Form,Quarter,Kwartał
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Pozostałe drobne wydatki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Pozostałe drobne wydatki
 DocType: Global Defaults,Default Company,Domyślna Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Wydatek albo różnica w koncie jest obowiązkowa dla przedmiotu {0} jako że ma wpływ na końcową wartość zapasów
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nazwa banku
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Powyżej
-DocType: Employee Loan,Employee Loan Account,Pracownik rachunku kredytowym
 DocType: Leave Application,Total Leave Days,Całkowita ilość dni zwolnienia od pracy
 DocType: Email Digest,Note: Email will not be sent to disabled users,Uwaga: E-mail nie zostanie wysłany do nieaktywnych użytkowników
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Liczba interakcji
@@ -2666,7 +2677,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Waga (w kilogramach)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",rozdziały / chapter_name pozostaw puste puste automatycznie ustawione po zapisaniu rozdziału.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Ustaw konta GST w Ustawieniach GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Ustaw konta GST w Ustawieniach GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Rodzaj biznesu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Koszt zakupu nowego
@@ -2675,12 +2686,13 @@
 DocType: Grant Application,Grant Description,Opis dotacji
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
 DocType: Student Guardian,Others,Inni
+DocType: Subscription,Discounts,Rabaty
 DocType: Payment Entry,Unallocated Amount,Kwota nieprzydzielone
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Brak więcej aktualizacji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Obejmuje to wszystkie karty wyników powiązane z niniejszą kartą
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dziecko pozycja nie powinna być Bundle produktu. Proszę usunąć pozycję `` {0} i zapisać
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankowość
@@ -2689,21 +2701,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kliknij na ""Generuj Harmonogram"" aby otrzymać harmonogram"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup&gt; Numbering Series
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Grading Scale,Grading Scale Intervals,Odstępy Skala ocen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Zysk za rok
+DocType: Bank Guarantee,Name of Bank,Nazwa banku
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Wejście księgowe dla {2} mogą być dokonywane wyłącznie w walucie: {3}
 DocType: Fee Schedule,In Process,W trakcie
 DocType: Authorization Rule,Itemwise Discount,Pozycja Rabat automatyczny
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Drzewo kont finansowych.
+DocType: Bank Guarantee,Reference Document Type,Oznaczenie typu dokumentu
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapowanie przepływów pieniężnych
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inwentaryzacja w odcinkach
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Nie znaleziono wiadomości e-mail w domyślnym kontakcie
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generuj sekret
-DocType: Employee Loan,Account Info,Informacje o koncie
+DocType: Loan,Account Info,Informacje o koncie
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
 DocType: Fees,Include Payment,Dołącz płatności
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Utworzono grupy studentów.
@@ -2711,24 +2726,24 @@
 DocType: Sales Invoice,Total Billing Amount,Łączna kwota płatności
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program w strukturze opłat i grupa studencka {0} są różne.
 DocType: Fee Schedule,Receivable Account,Konto Należności
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
 DocType: Quotation Item,Stock Balance,Bilans zapasów
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Płatności do zamówienia sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Z zapłatą podatku
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT DLA DOSTAWCY
 DocType: Land Unit,Is Container,To kontener
 DocType: Crop Cycle,This will be day 1 of the crop cycle,To będzie pierwszy dzień cyklu zbiorów
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Proszę wybrać prawidłową konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Purchase Invoice Item,Weight UOM,Waga jednostkowa
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lista dostępnych akcjonariuszy z numerami folio
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Wynagrodzenie pracownicze
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Pokaż atrybuty wariantu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Pokaż atrybuty wariantu
 DocType: Student,Blood Group,Grupa Krwi
 DocType: Course,Course Name,Nazwa przedmiotu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Użytkownicy którzy mogą zatwierdzić wnioski o urlop konkretnych użytkowników
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Urządzenie Biura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Urządzenie Biura
 DocType: Purchase Invoice Item,Qty,Ilość
 DocType: Fiscal Year,Companies,Firmy
 DocType: Supplier Scorecard,Scoring Setup,Konfiguracja punktów
@@ -2747,7 +2762,7 @@
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debetowane Konto jest wymagane
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Cennik zakupowy
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Szablony dostawców zmiennych.
 DocType: Job Offer Term,Offer Term,Oferta Term
 DocType: Asset,Quality Manager,Manager Jakości
@@ -2759,13 +2774,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Razem Niepłatny: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operacja WWW
 DocType: Supplier Scorecard,Supplier Score,Ocena Dostawcy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Razem zafakturowane Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Razem zafakturowane Amt
 DocType: Supplier,Warn RFQs,Ostrzegaj RFQ
 DocType: BOM,Conversion Rate,Współczynnik konwersji
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Wyszukiwarka produktów
 DocType: Assessment Plan,To Time,Do czasu
 DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredytowane Konto powinno być kontem typu Zobowiązania
+DocType: Loan,Total Amount Paid,Łączna kwota zapłacona
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Wybierz Wstęp studenta, który jest obowiązkowy dla płatnego studenta"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Wybierz cennik, aby opublikować wycenę"
@@ -2775,19 +2791,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cennik {0} jest wyłączony
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Wiersz {0}: Zakończony Ilosc nie może zawierać więcej niż {1} do pracy {2}
 DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Nie można zaktualizować elementu seryjnego {0} za pomocą funkcji zgrupowania, proszę użyć wpisu fotografii"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Nie można zaktualizować elementu seryjnego {0} za pomocą funkcji zgrupowania, proszę użyć wpisu fotografii"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Nie można zaktualizować elementu seryjnego {0} za pomocą funkcji zgrupowania, proszę użyć wpisu fotografii"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Nie można zaktualizować elementu seryjnego {0} za pomocą funkcji zgrupowania, proszę użyć wpisu fotografii"
 DocType: Training Event Employee,Training Event Employee,Training Event urzędnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maksymalne próbki - {0} mogą zostać zachowane dla Batch {1} i Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Dodaj gniazda czasowe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena
 DocType: Training Event,Advance,Postęp
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,do powtórnego powtarzania.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Ustawienia bramy płatności bez płatności
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Wymiana Zysk / Strata
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Wymiana Zysk / Strata
 DocType: Opportunity,Lost Reason,Powód straty
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Wiersz nr {0}: konto {1} nie należy do firmy {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Wiersz nr {0}: konto {1} nie należy do firmy {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nie można znaleźć DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
@@ -2806,7 +2821,6 @@
 DocType: Bin,Actual Quantity,Rzeczywista Ilość
 DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr seryjny {0} nie znaleziono
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Subskrypcja została {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program planu opłat
 DocType: Fee Schedule Program,Student Batch,Batch Student
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Dokonaj Studenta
@@ -2822,14 +2836,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nie dostarczony
 ,Bank Clearance Summary,Rozliczenia bankowe
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",
 DocType: Appraisal Goal,Appraisal Goal,Cel oceny
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Zaproponuj kategorię?
 DocType: Stock Reconciliation Item,Current Amount,Aktualny Kwota
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Budynki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Budynki
 DocType: Fee Schedule,Fee Structure,Struktura opłat
 DocType: Timesheet Detail,Costing Amount,Kwota zestawienia kosztów
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dostawca&gt; Dostawca Typ
 DocType: Student Admission Program,Application Fee,Opłata za zgłoszenie
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Zatwierdź potrącenie z pensji
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maksymalny rabat dla produktu {0} to {1}%
@@ -2837,12 +2850,13 @@
 DocType: Sales Partner,Address & Contacts,Adresy i kontakty
 DocType: SMS Log,Sender Name,Nazwa Nadawcy
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kryteria analizy rolnictwa
+DocType: HR Settings,Leave Approval Notification Template,Pozostaw szablon powiadomienia o zatwierdzeniu
 DocType: POS Profile,[Select],[Wybierz]
 DocType: Vital Signs,Blood Pressure (diastolic),Ciśnienie krwi (rozkurczowe)
 DocType: SMS Log,Sent To,Wysłane Do
 DocType: Agriculture Task,Holiday Management,Zarządzanie wakacjami
 DocType: Payment Request,Make Sales Invoice,Nowa faktura sprzedaży
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Oprogramowania
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Oprogramowania
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lekarz {0} niedostępny w {1}
@@ -2860,7 +2874,7 @@
 DocType: Employee,New Workplace,Nowe Miejsce Pracy
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Zużycie materiału
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ustaw jako Zamknięty
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nie istnieje Przedmiot o kodzie kreskowym {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nie istnieje Przedmiot o kodzie kreskowym {0}
 DocType: Normal Test Items,Require Result Value,Wymagaj wartości
 DocType: Item,Show a slideshow at the top of the page,Pokazuj slideshow na górze strony
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,LM
@@ -2875,19 +2889,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Brak aktywnego czy ustawiona Wynagrodzenie Struktura znalezionych dla pracownika {0} dla podanych dat
 DocType: Leave Block List,Allow Users,Zezwól Użytkownikom
 DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Powtarzający się
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Szczegóły szablonu mapowania przepływu gotówki
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Zarządzanie kredytem
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Śledź oddzielnie przychody i koszty dla branż produktowych lub oddziałów.
 DocType: Rename Tool,Rename Tool,Zmień nazwę narzędzia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,Element Zamów ponownie
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Slip Pokaż Wynagrodzenie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Slip Pokaż Wynagrodzenie
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer materiału
 DocType: Fees,Send Payment Request,Wyślij żądanie płatności
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 DocType: Water Analysis,Origin,Pochodzenie
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Wybierz opcję Zmień konto kwotę
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
@@ -2902,14 +2916,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Jest odpowiedzialnością z tytułu podatku dochodowego
 DocType: Grading Scale Interval,Grade Description,Stopień Opis
 DocType: Stock Entry,Purchase Receipt No,Nr Potwierdzenia Zakupu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Pieniądze zaliczkowe
 DocType: Sales Invoice, Shipping Bill Number,Numer rachunku wysyłkowego
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Śledzenie
 DocType: Asset Maintenance Log,Actions performed,Wykonane akcje
 DocType: Cash Flow Mapper,Section Leader,Kierownik sekcji
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Pasywa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Pasywa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Pracownik
+DocType: Bank Guarantee,Fixed Deposit Number,Naprawiono numer depozytu
 DocType: Asset Repair,Failure Date,Data awarii
 DocType: Sample Collection,Collected Time,Zbierz czas
 DocType: Company,Sales Monthly History,Historia miesięczna sprzedaży
@@ -2926,10 +2941,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Czy na pewno chcesz anulować to spotkanie?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakiet cen pokoi hotelowych
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline sprzedaży
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane na
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Pobierz aktualizacje subskrypcji
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} nie jest zgodne z firmą {1} w trybie konta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kierunek:
@@ -2939,7 +2955,7 @@
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nie utworzono zleceń pracy
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Wynagrodzenie Slip pracownika {0} już stworzony dla tego okresu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutyczny
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutyczny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Selling Settings,Sales Order Required,Wymagane Zamówienie Sprzedaży
 DocType: Purchase Invoice,Credit To,Kredytowane konto (Ma)
@@ -2957,7 +2973,7 @@
 DocType: Request for Quotation Supplier,No Quote,Brak cytatu
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Gateway Account,Payment Account,Konto Płatność
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Zmiana netto stanu należności
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,
 DocType: Job Offer,Accepted,Przyjęte
@@ -2970,7 +2986,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Upewnij się, że na pewno chcesz usunąć wszystkie transakcje dla tej firmy. Twoje dane podstawowe pozostanie tak jak jest. Ta akcja nie można cofnąć."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Wyniki wyszukiwania
 DocType: Room,Room Number,Numer pokoju
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Nieprawidłowy odniesienia {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Nieprawidłowy odniesienia {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Etykieta z zasadami wysyłki i transportu
 DocType: Journal Entry Account,Payroll Entry,Wpis o płace
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Zobacz rekord opłat
@@ -2980,7 +2996,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
 DocType: Lab Test Sample,Lab Test Sample,Próbka do badań laboratoryjnych
 DocType: Item Variant Settings,Allow Rename Attribute Value,Zezwalaj na zmianę nazwy wartości atrybutu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Szybkie Księgowanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
 DocType: Restaurant,Invoice Series Prefix,Prefiks serii faktur
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
@@ -2988,8 +3004,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integracja Map Google nie jest włączona
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nie zostało dodane
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Data wygaśnięcia członkostwa
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} musi być ujemna w dokumencie zwrotnym
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} musi być ujemna w dokumencie zwrotnym
 ,Minutes to First Response for Issues,Minutes to pierwsza odpowiedź do Spraw
 DocType: Purchase Invoice,Terms and Conditions1,Warunki1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
@@ -3008,7 +3025,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Jednostka miary
 DocType: Fiscal Year,Year End Date,Data końca roku
 DocType: Task Depends On,Task Depends On,Zadanie Zależy od
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oferta
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oferta
 DocType: Operation,Default Workstation,Domyślne Miejsce Pracy
 DocType: Notification Control,Expense Claim Approved Message,Widomość o zwrotach kosztów zatwierdzona
 DocType: Payment Entry,Deductions or Loss,Odliczenia lub strata
@@ -3046,7 +3063,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Urlopu bezpłatnego nie jest zgodny z zatwierdzonymi zapisów Leave aplikacji
 DocType: Campaign,Campaign-.####,Kampania-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Stwórz Fakturę
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Pozostałe saldo
@@ -3056,7 +3073,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 DocType: Driver,Driver,Kierowca
 DocType: Vital Signs,Nutrition Values,Wartości odżywcze
 DocType: Lab Test Template,Is billable,Jest rozliczalny
@@ -3067,7 +3084,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Faktyczna data rozpoczęcia (przez czas arkuszu)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ta przykładowa strona została automatycznie wygenerowana przez ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Starzenie Zakres 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Całkowita kwota zaliczki nie może być większa niż całkowita kwota roszczenia
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Całkowita kwota zaliczki nie może być większa niż całkowita kwota roszczenia
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3122,7 +3139,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Wybierz wartości atrybutów
 DocType: Purchase Invoice,Reason For Issuing document,Powód wydania dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Rachunek Bankowy/Kasowy
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Następnie Kontakt By nie może być taki sam jak adres e-mail Wiodącego
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
@@ -3139,7 +3156,8 @@
 DocType: Warranty Claim,Service Address,Adres usługi
 DocType: Asset Maintenance Task,Calibration,Kalibrowanie
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} to święto firmowe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Meble i wyposażenie
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Pozostaw powiadomienie o statusie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Meble i wyposażenie
 DocType: Item,Manufacture,Produkcja
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Konfiguracja firmy
 ,Lab Test Report,Raport z testów laboratoryjnych
@@ -3155,7 +3173,6 @@
 DocType: Crop,Planting Area,Obszar sadzenia
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Może to być spowodowane nieprawidłowymi adresami e-mail w folderze
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ty dodałeś
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Wynik treningowe
@@ -3165,16 +3182,17 @@
 DocType: Products Settings,Products per Page,Produkty na stronę
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Szef oddziału Organizacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Wydatki na usługi komunalne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Wydatki na usługi komunalne
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ponad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Wiersz # {0}: Journal Entry {1} nie masz konta {2} lub już porównywana z innym kuponie
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kryteria Waga
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Pozostaw powiadomienie o zatwierdzeniu
 DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Wynagrodzenie podstawie grafiku
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Cena zakupu
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Cena zakupu
 DocType: Notification Control,Sales Order Message,Informacje Zlecenia Sprzedaży
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ustaw wartości domyślne jak firma, waluta, bieżący rok rozliczeniowy, itd."
 DocType: Payment Entry,Payment Type,Typ płatności
@@ -3197,6 +3215,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Koszyk Ustawienia
 DocType: Journal Entry,Accounting Entries,Zapisy księgowe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jeśli wybrana zostanie reguła cenowa dla &quot;Stawka&quot;, nadpisze ona Cennik. Stawka za ustalanie stawek jest ostateczną stawką, więc nie należy stosować dodatkowej zniżki. W związku z tym w transakcjach takich jak zamówienie sprzedaży, zamówienie itp. Zostanie ono pobrane w polu &quot;stawka&quot;, a nie w polu &quot;cennik ofert&quot;."
+DocType: Journal Entry,Paid Loan,Płatna pożyczka
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Wpis zduplikowany. Proszę sprawdzić zasadę autoryzacji {0}
 DocType: Journal Entry Account,Reference Due Date,Referencyjny termin płatności
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3213,7 +3232,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,Do produkcji
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lista płac
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
 DocType: Patient Service Unit,Parent Service Unit,Jednostka usług dla rodziców
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Dokonaj użytkownika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Nr identyfikujący paczkę do dostawy (do druku)
@@ -3232,7 +3251,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Konto przychodów
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Dostarczanie
 DocType: Volunteer,Weekdays,Dni powszednie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: Restaurant Menu,Restaurant Menu,Menu restauracji
@@ -3240,7 +3259,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Ustaw domyślne konto zapasów dla zasobów reklamowych wieczystych
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Ustaw domyślne konto zapasów dla zasobów reklamowych wieczystych
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Wyślij wiadomość e-mail dotyczącą oceny grantu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage jest pełna, nie oszczędzać"
@@ -3248,10 +3267,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Pojemność pokoju
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Już istnieje rekord dla elementu {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Utracisz zapis wcześniej wygenerowanych faktur. Czy na pewno chcesz zrestartować tę subskrypcję?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Opłata za rejestrację
 DocType: Budget,Cost Center,Centrum kosztów
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Bon #
 DocType: Notification Control,Purchase Order Message,Wiadomość Zamówienia Kupna
 DocType: Tax Rule,Shipping Country,Wysyłka Kraj
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ukryj NIP Klienta z transakcji sprzedaży
@@ -3260,20 +3280,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu
 DocType: Employee Education,Class / Percentage,
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Podatek dochodowy
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Idź do Blankiety firmowe
+DocType: Subscription,Cancel At End Of Period,Anuluj na koniec okresu
 DocType: Item Supplier,Item Supplier,Dostawca
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nie wybrano pozycji do przeniesienia
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nie wybrano pozycji do przeniesienia
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
 DocType: Vehicle,Electric,Elektryczny
 DocType: Task,% Progress,% Postęp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Zysk / Strata na Aktywów pozbywaniu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Zysk / Strata na Aktywów pozbywaniu
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",W poniższej tabeli zostanie wybrana tylko osoba ubiegająca się o przyjęcie ze statusem &quot;Zatwierdzona&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Numer konta dla konta {0} jest niedostępny. <br> Skonfiguruj poprawnie swój plan kont.
 DocType: Task,Depends on Tasks,Zależy Zadania
@@ -3288,6 +3309,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Brak na stanie
 DocType: Volunteer,Volunteer Skills,Umiejętności ochotnicze
 DocType: Appraisal,HR User,Kadry - użytkownik
+DocType: Bank Guarantee,Reference Document Name,Nazwa dokumentu referencyjnego
 DocType: Purchase Invoice,Taxes and Charges Deducted,Podatki i opłaty potrącenia
 apps/erpnext/erpnext/hooks.py +142,Issues,Zagadnienia
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status musi być jednym z {0}
@@ -3301,7 +3323,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 DocType: Sales Invoice,SINV-RET-,SINV-RET
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Bardzo Duży
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Bardzo Duży
+DocType: Loan,Loan Application,Podanie o pożyczkę
 DocType: Crop,Scientific Name,Nazwa naukowa
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Wszystkich Liście
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Ponownie wybierz, jeśli wybrany kontakt jest edytowany po zapisaniu"
@@ -3310,13 +3333,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Numer czeku
 ,Sales Browser,Przeglądarka Sprzedaży
 DocType: Journal Entry,Total Credit,Całkowita kwota kredytu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Duży
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Duży
 DocType: Homepage Featured Product,Homepage Featured Product,Ciekawa Strona produktu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Wszystkie grupy oceny
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Wszystkie grupy oceny
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nowy magazyn Nazwa
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Razem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
@@ -3337,9 +3360,10 @@
 DocType: Fees,Fees,Opłaty
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Oferta {0} jest anulowana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Łączna kwota
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Łączna kwota
 DocType: Sales Partner,Targets,Cele
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Zarejestruj numer SIREN w pliku z informacjami o firmie
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę ustawić system nazewnictwa pracowników w Zasobach Ludzkich&gt; Ustawienia HR
 DocType: Price List,Price List Master,Ustawienia Cennika
 DocType: GST Account,CESS Account,Konto CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
@@ -3348,6 +3372,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Wybierz pacjenta
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nazwa parametru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pozostawić tylko Aplikacje ze statusem „Approved” i „Odrzucone” mogą być składane
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Nazwa grupy jest obowiązkowe w wierszu {0}
 DocType: Homepage,Products to be shown on website homepage,Produkty mają być wyświetlane na stronie głównej
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To jest grupa klientów root i nie mogą być edytowane.
@@ -3393,14 +3418,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktura została już utworzona dla wszystkich godzin rozliczeniowych
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Błąd Nazwa: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Koszt finansowy
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
 DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ustaw domyślnego klienta w Ustawieniach restauracji
 ,Salary Register,wynagrodzenie Rejestracja
 DocType: Warehouse,Parent Warehouse,Dominująca Magazyn
-DocType: C-Form Invoice Detail,Net Total,Łączna wartość netto
+DocType: Subscription,Net Total,Łączna wartość netto
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Domyślnie nie znaleziono elementu BOM dla elementu {0} i projektu {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definiować różne rodzaje kredytów
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definiować różne rodzaje kredytów
 DocType: Bin,FCFS Rate,Pierwsza rata
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Zaległa Ilość
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Czas (w minutach)
@@ -3432,11 +3457,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Konto root musi być grupą
 DocType: Drug Prescription,Drug Prescription,Na receptę
 DocType: Fees,FEE.,OPŁATA.
-DocType: Employee Loan,Repaid/Closed,Spłacone / Zamknięte
+DocType: Loan,Repaid/Closed,Spłacone / Zamknięte
 DocType: Item,Total Projected Qty,Łącznej prognozowanej szt
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Nie ustalono stawki za element {0}, który jest wymagany do wpisów księgowych dla {1} {2}. Jeśli transakcja jest transakcją jako element zerowej stawki wyceny w {1}, wspomnij, że w tabeli {1} pozycji. W przeciwnym razie należy utworzyć transakcję przychodzącą na akcje dla elementu lub wymienić wskaźnik wyceny w rekordzie Element, a następnie spróbować poddać lub anulować ten wpis"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kod kursu
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kontrola jakości wymagana dla przedmiotu {0}
 DocType: POS Settings,Use POS in Offline Mode,Użyj POS w trybie offline
@@ -3456,16 +3480,15 @@
 DocType: Purchase Invoice,Deemed Export,Uważa się na eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
-DocType: Subscription,Half-yearly,Półroczny
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Lab Test,LabTest Approver,Przybliżenie LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Oceniałeś już kryteria oceny {}.
 DocType: Vehicle Service,Engine Oil,Olej silnikowy
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Utworzono zlecenia pracy: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Utworzono zlecenia pracy: {0}
 DocType: Sales Invoice,Sales Team1,Team Sprzedażowy1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Element {0} nie istnieje
 DocType: Sales Invoice,Customer Address,Adres klienta
-DocType: Employee Loan,Loan Details,pożyczka Szczegóły
+DocType: Loan,Loan Details,pożyczka Szczegóły
 DocType: Company,Default Inventory Account,Domyślne konto zasobów reklamowych
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Numery folio nie pasują do siebie
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Wiersz {0}: Zakończony Ilość musi być większa od zera.
@@ -3477,19 +3500,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Łącze do wszystkich jednostek lądowych, w których rośnie uprawa"
 DocType: Account,Root Type,Typ Root
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Wiersz # {0}: Nie można wrócić więcej niż {1} dla pozycji {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Wiersz # {0}: Nie można wrócić więcej niż {1} dla pozycji {2}
 DocType: Item Group,Show this slideshow at the top of the page,Pokaż slideshow na górze strony
 DocType: BOM,Item UOM,Jednostka miary produktu
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Magazyn docelowy jest obowiązkowy dla wiersza {0}
 DocType: Cheque Print Template,Primary Settings,Ustawienia podstawowe
 DocType: Purchase Invoice,Select Supplier Address,Wybierz Dostawca Adres
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Dodaj Pracownikom
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Dodaj Pracownikom
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola jakości
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Szablon Standardowy
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
 DocType: Payment Request,Mute Email,Wyciszenie email
@@ -3509,11 +3532,10 @@
 DocType: SMS Log,No of Sent SMS,Numer wysłanego Sms
 DocType: Antibiotic,Healthcare Administrator,Administrator Ochrony Zdrowia
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Ustaw cel
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup&gt; Numbering Series
 DocType: Dosage Strength,Dosage Strength,Siła dawkowania
 DocType: Account,Expense Account,Konto Wydatków
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Oprogramowanie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Kolor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Kolor
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kryteria oceny planu
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Data ważności jest obowiązkowa dla wybranej pozycji
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zapobiegaj zamówieniom zakupu
@@ -3526,18 +3548,18 @@
 DocType: Patient,Personal and Social History,Historia osobista i społeczna
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utworzono użytkownika {0}
 DocType: Fee Schedule,Fee Breakup for each student,Podział wynagrodzenia dla każdego ucznia
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Zmień kod
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Nie wybrano Cennika w Walucie
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Nie wybrano Cennika w Walucie
 DocType: Purchase Invoice,Availed ITC Cess,Korzystał z ITC Cess
 ,Student Monthly Attendance Sheet,Student miesięczny Obecność Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Reguła wysyłki dotyczy tylko sprzedaży
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Do
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Plan zajęć dla studentów lub kurs jest obowiązkowy
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Plan zajęć dla studentów lub kurs jest obowiązkowy
@@ -3558,7 +3580,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Wymień swoje produkty lub usługi, które kupujesz lub sprzedajesz."
 DocType: Water Analysis,Storage Temperature,Temperatura przechowywania
 DocType: Employee Attendance Tool,Unmarked Attendance,Obecność nieoznaczona
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Researcher
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Researcher
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Rejestracja w programie Narzędzie Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Data rozpoczęcia powinna być mniejsza niż data zakończenia dla zadania {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe
@@ -3571,7 +3593,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} aktualnie posiada {1} tabelę wyników karty wyników, a zlecenia RFQ dla tego dostawcy powinny być wydawane z ostrożnością."
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Całkowity koszt (Spółka waluty)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Stworzono nr seryjny {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Stworzono nr seryjny {0}
 DocType: Homepage,Company Description for website homepage,Opis firmy na stronie głównej
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nazwa suplier
@@ -3581,11 +3603,10 @@
 DocType: Employee,You can enter any date manually,Możesz wprowadzić jakąkolwiek datę ręcznie
 DocType: Healthcare Settings,Result Printed,Wynik wydrukowany
 DocType: Asset Category Account,Depreciation Expense Account,Konto amortyzacji wydatków
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Okres próbny
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Wyświetl {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Okres próbny
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Project,Total Costing Amount (via Timesheets),Łączna kwota kosztów (za pośrednictwem kart pracy)
-DocType: Employee Advance,Expense Approver,Osoba zatwierdzająca wydatki
+DocType: Department,Expense Approver,Osoba zatwierdzająca wydatki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej
 DocType: Project,Hourly,Cogodzinny
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Dla grupy do grupy
@@ -3595,7 +3616,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aby DateTime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
 DocType: Accounts Settings,Make Payment via Journal Entry,Wykonywanie płatności za pośrednictwem Zapisów Księgowych dziennika
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,wydrukowane na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,wydrukowane na
 DocType: Item,Inspection Required before Delivery,Wymagane Kontrola przed dostawą
 DocType: Item,Inspection Required before Purchase,Wymagane Kontrola przed zakupem
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Oczekujące Inne
@@ -3605,7 +3626,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimalna ilość zamówienia
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Twoja organizacja
 DocType: Fee Component,Fees Category,Opłaty Kategoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Powiadom o pracowniku
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
@@ -3615,7 +3636,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Poziom Uporządkowania
 DocType: Company,Chart Of Accounts Template,Szablon planu kont
 DocType: Attendance,Attendance Date,Data usługi
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Średnie wynagrodzenie w oparciu o zarobki i odliczenia
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
 DocType: Purchase Invoice Item,Accepted Warehouse,Przyjęty magazyn
@@ -3623,10 +3644,11 @@
 DocType: Item,Valuation Method,Metoda wyceny
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Oznacz pół dnia
 DocType: Sales Invoice,Sales Team,Team Sprzedażowy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Wpis zduplikowany
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Wpis zduplikowany
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Wprowadź nazwę Beneficjenta przed złożeniem wniosku.
 DocType: Program Enrollment Tool,Get Students,Uzyskaj Studentów
 DocType: Serial No,Under Warranty,Pod Gwarancją
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Błąd]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Błąd]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Słownie, będzie widoczne w Zamówieniu Sprzedaży, po zapisaniu"
 ,Employee Birthday,Data urodzenia pracownika
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Proszę wybrać datę zakończenia naprawy zakończonej
@@ -3645,7 +3667,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Zarezerwowany dla podwykonawców
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
 DocType: Shopping Cart Settings,Orders,Zamówienia
-DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop
+DocType: Department,Leave Approver,Zatwierdzający Urlop
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Wybierz partię
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nazwa grupy Assessment
@@ -3690,7 +3712,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Tracked Item
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORYGINAŁ DO ODBIORU
 DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana Amortyzacja konta
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ten e-mail jest autotrenerowany
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
 DocType: Program Enrollment,Boarding Student,Student Wyżywienia
 DocType: Asset,Expected Value After Useful Life,Przewidywany okres użytkowania wartości po
@@ -3715,22 +3736,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Obecność Record {0} istnieje przeciwko Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Odnośnik #{0} z datą {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortyzacja Wyeliminowany z tytułu zbycia aktywów
-DocType: Member,Member,Członek
+DocType: Loan,Member,Członek
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Zarządzaj adresy
 DocType: Work Order Item,Work Order Item,Pozycja zlecenia pracy
 DocType: Pricing Rule,Item Code,Kod identyfikacyjny
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 DocType: Journal Entry,User Remark,Nota Użytkownika
 DocType: Lead,Market Segment,Segment rynku
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Dyrektor ds. Rolnictwa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
 DocType: Supplier Scorecard Period,Variables,Zmienne
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Zamknięcie (Dr)
 DocType: Cheque Print Template,Cheque Size,Czek Rozmiar
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Szablon podatkowy dla transakcji sprzedaży.
 DocType: Sales Invoice,Write Off Outstanding Amount,Nieuregulowana Wartość Odpisu
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} nie pasuje do firmy {1}
@@ -3739,7 +3760,6 @@
 DocType: Stock Settings,Default Stock UOM,Domyślna jednostka miary Asortymentu
 DocType: Asset,Number of Depreciations Booked,Ilość amortyzacją zarezerwowano
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Ilość całkowita
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Wobec pracownika pożyczki: {0}
 DocType: Landed Cost Item,Receipt Document,Otrzymanie dokumentu
 DocType: Employee Education,School/University,Szkoła/Uniwersytet
 DocType: Payment Request,Reference Details,Szczegóły odniesienia
@@ -3750,7 +3770,7 @@
 DocType: Asset,Double Declining Balance,Podwójne Bilans Spadek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Kolejność Zamknięty nie mogą być anulowane. Unclose aby anulować.
 DocType: Student Guardian,Father,Ojciec
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 DocType: Attendance,On Leave,Na urlopie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Informuj o aktualizacjach
@@ -3764,10 +3784,10 @@
 DocType: Lead,Lower Income,Niższy przychód
 DocType: Restaurant Order Entry,Current Order,Aktualne zamówienie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Źródło i magazyn docelowy nie mogą być takie sama dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Przejdź do Programów
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Wiersz {0} # Przydzielona kwota {1} nie może być większa od kwoty nieodebranej {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Wiersz {0} # Przydzielona kwota {1} nie może być większa od kwoty nieodebranej {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
@@ -3790,7 +3810,6 @@
 DocType: Payment Terms Template,Payment Terms,Zasady płatności
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę ustawić system nazewnictwa pracownika w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
 DocType: Chapter,Meetup Embed HTML,Meetup Osadź HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Przejdź do Dostawców
@@ -3810,30 +3829,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Oferta {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Proszę podać identyfikator e-mailowy studenta, aby wysłać żądanie płatności"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Proszę podać identyfikator e-mailowy studenta, aby wysłać żądanie płatności"
 DocType: Patient,Medical History,Historia medyczna
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Konto z kredytem w rachunku bankowym
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Konto z kredytem w rachunku bankowym
 DocType: Patient,Patient ID,Identyfikator pacjenta
 DocType: Physician Schedule,Schedule Name,Nazwa harmonogramu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Dodaj wszystkich dostawców
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Dodaj wszystkich dostawców
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Wiersz {0}: alokowana kwota nie może być większa niż kwota pozostająca do spłaty.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Przeglądaj BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Kredyty Hipoteczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Kredyty Hipoteczne
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit data księgowania i czas
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Proszę ustawić amortyzacyjny dotyczący Konta aktywów z kategorii {0} lub {1} Spółki
 DocType: Lab Test Groups,Normal Range,Normalny zakres
 DocType: Academic Term,Academic Year,Rok akademicki
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Dostępne sprzedawanie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Bilans otwarcia Kapitału własnego
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Bilans otwarcia Kapitału własnego
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Pozostały
 DocType: Appraisal,Appraisal,Ocena
+DocType: Loan,Loan Account,Konto kredytowe
 DocType: Purchase Invoice,GST Details,Szczegóły GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mail wysłany do dostawcy {0}
 DocType: Item,Default Sales Unit of Measure,Domyślna jednostka sprzedaży środka
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Rok akademicki:
+DocType: Subscription,Past Due Date,Minione terminy
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nie zezwalaj na ustawienie pozycji alternatywnej dla pozycji {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data jest powtórzona
@@ -3846,7 +3867,7 @@
 DocType: Patient Appointment,Patient Appointment,Powtarzanie Pacjenta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Rola Zatwierdzająca nie może być taka sama jak rola którą zatwierdza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Wypisać się z tej Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Dostaj Dostawców przez
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Dostaj Dostawców przez
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},Nie znaleziono {0} dla elementu {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Przejdź do Kursów
 DocType: Accounts Settings,Show Inclusive Tax In Print,Pokaż płatny podatek w druku
@@ -3854,10 +3875,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Wiadomość wysłana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto z węzłów podrzędnych nie może być ustawiony jako księgi
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji&gt; Ustawienia edukacyjne
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty klienta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta Spółki)
 DocType: Physician,Physician Schedules,Harmonogramy lekarzy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Całkowita kwota zaliczki nie może być większa niż całkowita kwota sankcjonowana
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Całkowita kwota zaliczki nie może być większa niż całkowita kwota sankcjonowana
 DocType: Salary Slip,Hour Rate,Stawka godzinowa
 DocType: Stock Settings,Item Naming By,Element Nazwy przez
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Kolejny okres Zamknięcie Wejście {0} została wykonana po {1}
@@ -3875,6 +3897,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
 DocType: BOM,Inspection Required,Wymagana kontrola
 DocType: Purchase Invoice Item,PR Detail,
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Wprowadź numer gwarancyjny banku przed złożeniem wniosku.
 DocType: Driving License Category,Class,Klasa
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Zlecenie pracy nie może zostać podniesione na podstawie szablonu przedmiotu
@@ -3885,7 +3908,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Waga brutto opakowania. Zazwyczaj waga netto + waga materiału z jakiego jest wykonane opakowanie. (Do druku)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji&gt; Ustawienia edukacyjne
 DocType: Serial No,Is Cancelled,
 DocType: Student Group,Group Based On,Grupa oparta na
 DocType: Journal Entry,Bill Date,Data Rachunku
@@ -3896,9 +3918,10 @@
 DocType: Cheque Print Template,Cheque Height,Czek Wysokość
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
 DocType: Setup Progress,Setup Progress,Konfiguracja Postępu
+DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 DocType: Hub Settings,Publish Items to Hub,Publikowanie produkty do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"Wartość ""od"" musi być mniejsza niż wartość w rzędzie {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Przelew
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Przelew
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Zaznacz wszystkie
 ,Issued Items Against Work Order,Wydane przedmioty na zlecenie pracy
 DocType: Vehicle Log,Invoice Ref,faktura Ref
@@ -3929,12 +3952,11 @@
 DocType: Customs Tariff Number,Tariff Number,Numer taryfy
 DocType: Work Order Item,Available Qty at WIP Warehouse,Dostępne ilości w magazynie WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prognozowany
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Nr seryjny {0} nie należy do magazynu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Nr seryjny {0} nie należy do magazynu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0
 DocType: Notification Control,Quotation Message,Wiadomość ofertowa
-DocType: Employee Loan,Employee Loan Application,Pracownik Loan Application
 DocType: Issue,Opening Date,Data Otwarcia
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Najpierw zapisz pacjenta
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Najpierw zapisz pacjenta
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Obecność została oznaczona pomyślnie.
 DocType: Program Enrollment,Public Transport,Transport publiczny
 DocType: Soil Texture,Silt Composition (%),Skład mułu (%)
@@ -3953,7 +3975,7 @@
 ,Item Balance (Simple),Bilans przedmiotu (prosty)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rachunki od dostawców.
 DocType: POS Profile,Write Off Account,Konto Odpisu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota debetowa Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota debetowa Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Wartość zniżki
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
@@ -3976,6 +3998,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Data Zlecenia
 DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
 DocType: Assessment Plan,Assessment Plan,Plan oceny
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Utworzono klienta {0}.
 DocType: Stock Settings,Limit Percent,Limit Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Obecnie brak dostępnych zasobów w magazynach
@@ -3989,14 +4012,15 @@
 DocType: Journal Entry,Stock Entry,Zapis magazynowy
 DocType: Payment Entry,Payment References,Odniesienia płatności
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Liczba interwałów dla pola interwałowego, np. Jeśli Interwał to &quot;Dni&quot;, a liczba interwałów rozliczeń to 3, faktury będą generowane co 3 dni"
 DocType: Vehicle,Insurance Details,Szczegóły ubezpieczenia
 DocType: Account,Payable,Płatność
 DocType: Share Balance,Share Type,Rodzaj udziału
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Proszę wprowadzić okresy spłaty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Proszę wprowadzić okresy spłaty
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dłużnicy ({0})
 DocType: Pricing Rule,Margin,
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Zysk brutto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Zysk brutto%
 DocType: Appraisal Goal,Weightage (%),Waga/wiek (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Zmień profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Data Czystki
@@ -4006,10 +4030,11 @@
 DocType: Lead,Address Desc,Opis adresu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partia jest obowiązkowe
 DocType: Journal Entry,JV-,V-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Znaleziono wiersze z powtarzającymi się datami w innych wierszach: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Znaleziono wiersze z powtarzającymi się datami w innych wierszach: {list}
 DocType: Topic,Topic Name,Nazwa tematu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Ustaw domyślny szablon powiadomienia o pozostawieniu zatwierdzania w Ustawieniach HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Conajmniej jeden sprzedaż lub zakup musi być wybrany
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Wybierz pracownika, aby uzyskać awans pracownika."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Wybierz pracownika, aby uzyskać awans pracownika."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Proszę wybrać prawidłową datę
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Wybierz charakteru swojej działalności.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4028,7 +4053,7 @@
 DocType: Asset Movement,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Udostępnij księgę
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Utworzono fakturę sprzedaży {0}
 DocType: Employee,Confirmation Date,Data potwierdzenia
 DocType: C-Form,Total Invoiced Amount,Całkowita zafakturowana kwota
@@ -4037,7 +4062,7 @@
 DocType: Account,Accumulated Depreciation,Umorzenia (skumulowana amortyzacja)
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stały Nazwa
 DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
-DocType: Employee Loan Application,Required by Date,Wymagane przez Data
+DocType: Loan Application,Required by Date,Wymagane przez Data
 DocType: Lead,Lead Owner,Właściciel Tropu
 DocType: Production Plan,Sales Orders Detail,Szczegóły zamówienia sprzedaży
 DocType: Bin,Requested Quantity,Oczekiwana ilość
@@ -4050,10 +4075,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Razem Odliczenie - Spłata kredytu
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Wynagrodzenie Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Wiele wariantów
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dostarczono
+DocType: Subscription,Trial Period Start Date,Data rozpoczęcia okresu próbnego
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Zaloguj się jako inny użytkownik.
@@ -4074,12 +4100,11 @@
 DocType: Student Guardian,Student Guardian,Student Stróża
 DocType: Member,Member Name,Nazwa członka
 DocType: Stock Settings,Use Naming Series,Użyj serii nazw
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizuj Stan
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,w subskrypcji
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 DocType: Membership,Payment Details,Szczegóły płatności
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Kursy
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zatwierdzone zlecenie pracy nie może zostać anulowane, należy je najpierw anulować, aby anulować"
 DocType: Asset,Journal Entry for Scrap,Księgowanie na złom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Wyciągnij elementy z dowodu dostawy
@@ -4099,6 +4124,7 @@
 DocType: Land Unit,Land Unit,Jednostka lądowa
 ,Purchase Analytics,Analiza Zakupów
 DocType: Sales Invoice Item,Delivery Note Item,Przedmiot z dowodu dostawy
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Brak aktualnej faktury {0}
 DocType: Asset Maintenance Log,Task,Zadanie
 DocType: Purchase Taxes and Charges,Reference Row #,Rząd Odniesienia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
@@ -4111,7 +4137,7 @@
 DocType: Company,Exchange Gain / Loss Account,Wymiana Zysk / strat
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pracownik i obecność
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Cel musi być jednym z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Wypełnij formularz i zapisz
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Wypełnij formularz i zapisz
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Społeczność Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Rzeczywista ilość w magazynie
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Rzeczywista ilość w magazynie
@@ -4126,7 +4152,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standardowy kurs sprzedaży
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
 DocType: Cash Flow Mapper,Section Name,Nazwa sekcji
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Ilość do ponownego zamówienia
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Ilość do ponownego zamówienia
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktualne ofert pracy
 DocType: Company,Stock Adjustment Account,Konto korekty
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpis
@@ -4137,9 +4163,9 @@
 DocType: Task,depends_on,zależy_od
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Usługa kolejkowania aktualizacji najnowszej ceny we wszystkich materiałach. Może potrwać kilka minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nazwa nowego konta. Uwaga: Proszę nie tworzyć konta dla odbiorców i dostawców
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Szablony Adresów na dany kraj
 DocType: Water Analysis,Appearance,Wygląd
+DocType: HR Settings,Leave Status Notification Template,Pozostaw szablon powiadomienia o statusie
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Śr. Kupowanie kursu cenowego
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informacje o członkach.
@@ -4162,7 +4188,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nie dozwolone. Wyłącz szablon testowy
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
 DocType: Crop Cycle,Linked Land Unit,Połączona jednostka lądowa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
@@ -4178,7 +4204,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Przejdź do Użytkownicy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Nieprawidłowe GSTIN lub Wpisz NA dla niezarejestrowanych
 DocType: Training Event,Seminar,Seminarium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Rejestracji Opłata
@@ -4194,14 +4220,14 @@
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 DocType: Company,Create Chart Of Accounts Based On,Tworzenie planu kont w oparciu o
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nie można przekonwertować go na grupę inną niż grupa. Zadania dla dzieci istnieją.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,Starzenie się zapasów
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} istnieć przed studenta wnioskodawcy {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Korekta zaokrąglenia (waluta firmy)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Lista obecności
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partia:
 DocType: Volunteer,Afternoon,Popołudnie
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Otwarty
 DocType: Cheque Print Template,Scanned Cheque,zeskanowanych Czek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
@@ -4217,7 +4243,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} już istnieje
 DocType: Medical Department,Nursing User,Pielęgniarka
 DocType: Plant Analysis,Plant Analysis Criterias,Kryteria analizy roślin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Obowiązki
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Numer seryjny {0} nie należy do partii {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Obowiązki
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Okres ważności tej oferty zakończył się.
 DocType: Expense Claim Account,Expense Claim Account,Konto Koszty Roszczenie
 DocType: Accounts Settings,Allow Stale Exchange Rates,Zezwalaj na Stałe Kursy walut
@@ -4239,11 +4266,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Stwórz warianty
 DocType: Item,Default BOM,Domyślne Zestawienie Materiałów
 DocType: Project,Total Billed Amount (via Sales Invoices),Całkowita kwota faktury (za pośrednictwem faktur sprzedaży)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Kwota debetowa Kwota
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Kwota debetowa Kwota
 DocType: Project Update,Not Updated,Nie są aktualizowane
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Występują niespójności między stopą, liczbą akcji i obliczoną kwotą"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Razem Najlepszy Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
 DocType: Employee Advance,Advance Account,Rachunek zaawansowany
 DocType: Job Offer,Job Offer Terms,Warunki oferty pracy
@@ -4252,7 +4279,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,
 DocType: Vehicle,Insurance Company,Firma ubezpieczeniowa
 DocType: Asset Category Account,Fixed Asset Account,Konto trwałego
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Zmienna
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Zmienna
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dowodu dostawy
 DocType: Chapter,Members,Członkowie
 DocType: Student,Student Email Address,Student adres email
@@ -4276,7 +4303,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Stażysta
 DocType: Delivery Stop,Address Name,Adres
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Dzielenie {0} jednostek {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Dzielenie {0} jednostek {1}
 DocType: Assessment Code,Assessment Code,Kod Assessment
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Podstawowy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacje magazynowe przed {0} są zamrożone
@@ -4284,25 +4311,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
 DocType: Bank Reconciliation Detail,Payment Document,Płatność Dokument
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Błąd podczas oceny formuły kryterium
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
+DocType: Subscription,Plans,Plany
 DocType: Salary Slip,Salary Structure,Struktura Wynagrodzenia
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Wydanie Materiał
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Wystąpił błąd podczas tworzenia cyklicznego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Wydanie Materiał
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Notowania
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Brak grup studenckich utworzony.
 DocType: Purchase Invoice Item,Serial No,Nr seryjny
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Miesięczna kwota spłaty nie może być większa niż Kwota kredytu
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Miesięczna kwota spłaty nie może być większa niż Kwota kredytu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Wiersz # {0}: oczekiwana data dostarczenia nie może być poprzedzona datą zamówienia zakupu
 DocType: Purchase Invoice,Print Language,Język drukowania
 DocType: Salary Slip,Total Working Hours,Całkowita liczba godzin pracy
 DocType: Sales Invoice,Customer PO Details,Szczegóły zamówienia klienta
-DocType: Subscription,Next Schedule Date,Następny dzień harmonogramu
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tymczasowe konto otwarcia
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Wprowadź wartość musi być dodatnia
@@ -4331,11 +4357,11 @@
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Papiery i Notowania Giełdowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Brak pracowników dla wymienionych kryteriów
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
 DocType: Hotel Settings,Default Customer,Domyślny klient
 DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nie potwierdzaj, czy spotkanie zostanie utworzone na ten sam dzień"
@@ -4360,16 +4386,16 @@
 DocType: Journal Entry Account,Employee Advance,Advance pracownika
 DocType: Payroll Entry,Payroll Frequency,Częstotliwość Płace
 DocType: Lab Test Template,Sensitivity,Wrażliwość
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Surowiec
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Rośliny i maszyn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Rośliny i maszyn
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kwota podatku po odliczeniu wysokości rabatu
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Codzienne podsumowanie Ustawienia Pracuj
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Wprowadź Reqd według daty
 DocType: Payment Entry,Internal Transfer,Transfer wewnętrzny
 DocType: Asset Maintenance,Maintenance Tasks,Zadania konserwacji
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Wymagana jest ilość lub kwota docelowa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr
@@ -4377,14 +4403,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integracje ERPNext
 DocType: Crop Cycle,Detected Disease,Wykryto chorobę
 ,Produced,Wyprodukowany
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Data rozpoczęcia spłaty nie może przypadać przed datą wypłaty.
 DocType: Item,Item Code for Suppliers,Rzecz kod dla dostawców
 DocType: Issue,Raised By (Email),Wywołany przez (Email)
 DocType: Training Event,Trainer Name,Nazwa Trainer
 DocType: Mode of Payment,General,Ogólne
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ostatnia komunikacja
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ostatnia komunikacja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nie można wywnioskować, kiedy kategoria dotyczy ""Ocena"" a kiedy ""Oceny i Total"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nr-y seryjne Wymagane do szeregowania pozycji {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nie można wywnioskować, kiedy kategoria dotyczy ""Ocena"" a kiedy ""Oceny i Total"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nr-y seryjne Wymagane do szeregowania pozycji {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Płatności mecz fakturami
 DocType: Journal Entry,Bank Entry,Operacja bankowa
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
@@ -4398,7 +4425,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Włącz/wyłącz waluty.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} w Half day Leave on {1}
 DocType: Production Plan,Get Material Request,Uzyskaj Materiał Zamówienie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Wydatki pocztowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Wydatki pocztowe
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 ,Item Variant Details,Szczegóły wariantu przedmiotu
@@ -4409,9 +4436,9 @@
 DocType: Drug Prescription,Hour,Godzina
 DocType: Restaurant Order Entry,Last Sales Invoice,Ostatnia sprzedaż faktury
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Wybierz Qty przeciwko pozycji {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nowy nr seryjny nie może mieć Magazynu. Magazyn musi być ustawiona przez Zasoby lub  na podstawie Paragonu Zakupu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nowy nr seryjny nie może mieć Magazynu. Magazyn musi być ustawiona przez Zasoby lub  na podstawie Paragonu Zakupu
 DocType: Lead,Lead Type,Typ Tropu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania tych urlopów
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania tych urlopów
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 DocType: Company,Monthly Sales Target,Miesięczny cel sprzedaży
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
@@ -4419,7 +4446,7 @@
 DocType: Item,Default Material Request Type,Domyślnie Materiał Typ żądania
 DocType: Supplier Scorecard,Evaluation Period,Okres próbny
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Nieznany
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Zamówienie pracy nie zostało utworzone
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Zamówienie pracy nie zostało utworzone
 DocType: Shipping Rule,Shipping Rule Conditions,Warunki zasady dostawy
 DocType: Purchase Invoice,Export Type,Typ eksportu
 DocType: Salary Slip Loan,Salary Slip Loan,Salary Slip Loan
@@ -4435,8 +4462,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Otwieranie podsumowań faktur
 DocType: Education Settings,Education Manager,Menedżer edukacji
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimalna długość między każdą rośliną w polu dla optymalnego wzrostu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Element zakodowany {0} nie może zostać zaktualizowany za pomocą funkcji zgrupowania, zamiast tego użyć wpisu fotografii"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Element zakodowany {0} nie może zostać zaktualizowany za pomocą funkcji zgrupowania, zamiast tego użyć wpisu fotografii"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Element zakodowany {0} nie może zostać zaktualizowany za pomocą funkcji zgrupowania, zamiast tego użyć wpisu fotografii"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Element zakodowany {0} nie może zostać zaktualizowany za pomocą funkcji zgrupowania, zamiast tego użyć wpisu fotografii"
 DocType: Quality Inspection,Report Date,Data raportu
 DocType: Student,Middle Name,Drugie imię
 DocType: C-Form,Invoices,Faktury
@@ -4469,20 +4496,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Paragon
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Paragon
 ,Sales Register,Rejestracja Sprzedaży
 DocType: Daily Work Summary Group,Send Emails At,Wyślij pocztę elektroniczną w
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nie ma nic do edycji
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Widok formularza
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Potwierdzenie wydatków Obowiązkowe w rachunku kosztów
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Dodaj użytkowników do organizacji, innych niż Ty."
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Brak klientów!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Raport kasowy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nie utworzono żadnego żadnego materialnego wniosku
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
@@ -4505,11 +4533,12 @@
 DocType: Vehicle,Chassis No,Podwozie Nie
 DocType: Payment Request,Initiated,Zapoczątkowany
 DocType: Production Plan Item,Planned Start Date,Planowana data rozpoczęcia
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Wybierz zestawienie materiałów
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Wybierz zestawienie materiałów
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Korzystał ze zintegrowanego podatku ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dostawca&gt; Dostawca Typ
+DocType: Bank Guarantee,Clauses and Conditions,Klauzule i warunki
 DocType: Serial No,Creation Document Type,
 DocType: Project Task,View Timesheet,Zobacz grafiku
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data zakończenia musi być większa niż data rozpoczęcia
 DocType: Leave Type,Is Encash,
 DocType: Leave Allocation,New Leaves Allocated,Nowe Zwolnienie Przypisano
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,
@@ -4523,9 +4552,10 @@
 DocType: Patient,Alcohol Current Use,Obecne stosowanie alkoholu
 DocType: Student Admission Program,Student Admission Program,Studencki program przyjęć
 DocType: Payment Entry,Account Paid To,Konto do zapłaty
+DocType: Subscription Settings,Grace Period,Okres łaski
 DocType: Item Alternative,Alternative Item Name,Alternatywna nazwa przedmiotu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nie można przesłać żadnego wynagrodzenia płacowego <br> \ Możliwe przyczyny: <br> \ 1. Wynagrodzenie netto jest mniejsze niż 0. <br> \ 2. Firmowy adres e-mail określony w danych podstawowych pracownika jest nieważny. <br>
@@ -4535,7 +4565,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budżet dla rachunku {1} w stosunku do {2} {3} wynosi {4}. Będzie przekraczać o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Brak Ilości
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i unchcked Wyłączone w
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Usługi finansowe
 DocType: Student Sibling,Student ID,legitymacja studencka
@@ -4547,14 +4576,16 @@
 DocType: Complaint,Complaint,Skarga
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Dokonaj wpisu o spłatę
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Wszystkie departamenty
 DocType: Patient,Alcohol Past Use,Alkohol w przeszłości
 DocType: Fertilizer Content,Fertilizer Content,Zawartość nawozu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Kr
 DocType: Project Update,Problematic/Stuck,Problematyczne / zablokowane
 DocType: Tax Rule,Billing State,Stan Billing
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Zamówienie pracy {0} musi zostać anulowane przed anulowaniem tego zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
@@ -4578,10 +4609,11 @@
 DocType: Cheque Print Template,Message to show,Wiadomość pokazać
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Detal
 DocType: Student Attendance,Absent,Nieobecny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Pakiet produktów
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Nie można znaleźć wyników, począwszy od {0}. Musisz mieć stały wynik od 0 do 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
+DocType: Subscription,Current Invoice Start Date,Aktualna data rozpoczęcia faktury
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Debet lub wielkość kredytu jest wymagana dla {2}
 DocType: GL Entry,Remarks,Uwagi
@@ -4591,11 +4623,13 @@
 DocType: Task,Parent Task,Zadanie rodzica
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Dokonaj Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Druk i Materiały Biurowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Druk i Materiały Biurowe
 DocType: Stock Settings,Show Barcode Field,Pokaż pole kodu kreskowego
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Wyślij e-maile Dostawca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Wynagrodzenie już przetwarzane w okresie od {0} i {1} Zostaw okresu stosowania nie może być pomiędzy tym zakresie dat.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Wyślij e-maile Dostawca
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Wynagrodzenie już przetwarzane w okresie od {0} i {1} Zostaw okresu stosowania nie może być pomiędzy tym zakresie dat.
+DocType: Fiscal Year,Auto Created,Automatycznie utworzone
 DocType: Chapter Member,Leave Reason,Zostaw powód
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} już nie istnieje
 DocType: Guardian Interest,Guardian Interest,Strażnik Odsetki
 DocType: Volunteer,Availability,Dostępność
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Ustaw wartości domyślne dla faktur POS
@@ -4604,14 +4638,13 @@
 DocType: Timesheet,Employee Detail,Szczegóły urzędnik
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Identyfikator e-maila Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Identyfikator e-maila Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
 DocType: Lab Prescription,Test Code,Kod testowy
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ustawienia strony głównej
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Zlecenia RFQ nie są dozwolone w {0} z powodu karty wyników {1}
 DocType: Job Offer,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Powyżej
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Łączna kwota {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Łączna kwota {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Wspomnij, jeśli nietypowe konto płatne"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Proszę wybrać grupę oceniającą inną niż &quot;Wszystkie grupy oceny&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Wiersz {0}: wymagany jest koszt centrum dla elementu {1}
@@ -4622,7 +4655,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza wody
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
 DocType: Holiday List,Weekly Off,Tygodniowy wyłączony
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Przeładuj połączoną analizę
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
@@ -4638,7 +4671,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Koszt złomowany aktywach
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
 DocType: Vehicle,Policy No,Polityka nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Elementy z Bundle produktu
 DocType: Asset,Straight Line,Linia prosta
 DocType: Project User,Project User,Użytkownik projektu
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Rozdzielać
@@ -4678,21 +4711,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Ścieżka
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nie można przekonwertować centrum kosztów do księgi głównej, jak to ma węzły potomne"
 DocType: Production Plan,Total Planned Qty,Całkowita planowana ilość
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Wartość otwarcia
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Wartość otwarcia
 DocType: Salary Detail,Formula,Formuła
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Seryjny #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seryjny #
 DocType: Lab Test Template,Lab Test Template,Szablon testu laboratoryjnego
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Konto sprzedaży
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Konto sprzedaży
 DocType: Purchase Invoice Item,Total Weight,Waga całkowita
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Prowizja od sprzedaży
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Prowizja od sprzedaży
 DocType: Job Offer Term,Value / Description,Wartość / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
 DocType: Tax Rule,Billing Country,Kraj fakturowania
 DocType: Purchase Order Item,Expected Delivery Date,Spodziewana data odbioru przesyłki
 DocType: Restaurant Order Entry,Restaurant Order Entry,Wprowadzanie do restauracji
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
 DocType: Asset Maintenance Task,Assign To Name,Przypisywanie do nazwy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Wydatki na reprezentację
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Wydatki na reprezentację
 DocType: Hub Settings,Enabled Users,Włączone Użytkownicy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Materiał uczynić żądanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Pozycja otwarta {0}
@@ -4705,24 +4738,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Wnioski o rezygnację
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 DocType: Vehicle,Last Carbon Check,Ostatni Carbon Sprawdź
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Wydatki na obsługę prawną
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Wydatki na obsługę prawną
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Wybierz ilość w wierszu
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Zrób faktury otwarcia i zakupu
 DocType: Purchase Invoice,Posting Time,Czas publikacji
 DocType: Timesheet,% Amount Billed,% wartości rozliczonej
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Wydatki telefoniczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Wydatki telefoniczne
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
 DocType: Email Digest,Open Notifications,Otwarte Powiadomienia
 DocType: Payment Entry,Difference Amount (Company Currency),Różnica Kwota (waluta firmy)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Wydatki bezpośrednie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Wydatki bezpośrednie
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Wydatki na podróże
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,Rozkład
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodaj niestandardowe pole Subskrypcja w typie dokumentu {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Purchase Receipt Item,Sample Quantity,Ilość próbki
+DocType: Bank Guarantee,Name of Beneficiary,Imię beneficjenta
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Zaktualizuj koszt BOM automatycznie za pomocą harmonogramu, w oparciu o ostatnią wycenę / kurs cen / ostatni kurs zakupu surowców."
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
@@ -4734,14 +4767,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Wyrok lub staż
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,składników wynagrodzenia
 DocType: Program Enrollment Tool,New Academic Year,Nowy rok akademicki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Powrót / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Powrót / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Automatycznie wstaw wartość z cennika jeśli jej brakuje
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Kwota całkowita Płatny
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Kwota całkowita Płatny
 DocType: GST Settings,B2C Limit,Limit B2C
 DocType: Work Order Item,Transferred Qty,Przeniesione ilości
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Nawigacja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planowanie
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planowanie
 DocType: Share Balance,Issued,Wydany
+DocType: Loan,Repayment Start Date,Data rozpoczęcia spłaty
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Działalność uczniowska
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID Dostawcy
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Szczegóły
@@ -4754,10 +4788,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ urlopu (okolicznościowy, chorobowy, itp.)"
 DocType: Email Digest,Send regular summary reports via Email.,Wyślij regularne raporty podsumowujące poprzez e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Proszę ustawić domyślne konto w Expense Claim typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Proszę ustawić domyślne konto w Expense Claim typu {0}
 DocType: Assessment Result,Student Name,Nazwa Student
 DocType: Brand,Item Manager,Pozycja menedżera
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Płace Płatne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Płace Płatne
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
 DocType: Plant Analysis,Collection Datetime,Kolekcja Datetime
 DocType: Work Order,Total Operating Cost,Całkowity koszt operacyjny
@@ -4767,9 +4801,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Użytkownik {0} nie istnieje
 DocType: Payment Term,Day(s) after invoice date,Dzień (dni) po dacie faktury
 DocType: Payment Schedule,Payment Schedule,Harmonogram płatności
-DocType: Subscription,SUB-,POD-
 DocType: Item Attribute Value,Abbreviation,Skrót
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Zapis takiej Płatności już istnieje
+DocType: Subscription,Trial Period End Date,Termin zakończenia okresu próbnego
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Szablon wynagrodzenia
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologia
@@ -4786,9 +4820,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rola Zezwala na edycję zamrożonych zasobów
 ,Territory Target Variance Item Group-Wise,
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Wszystkie grupy klientów
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,skumulowane miesięcznie
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
@@ -4797,14 +4831,15 @@
 DocType: Lab Prescription,Test Created,Utworzono test
 DocType: Healthcare Settings,Custom Signature in Print,Podpis niestandardowy w druku
 DocType: Account,Temporary,Tymczasowy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Numer klienta LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Numer klienta LPO
 DocType: Program,Courses,Pola
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretarka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretarka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Jeśli wyłączyć &quot;w słowach&quot; pole nie będzie widoczne w każdej transakcji
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ta czynność zatrzyma przyszłe płatności. Czy na pewno chcesz anulować subskrypcję?
 DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu
 DocType: Supplier Scorecard Criteria,Criteria Name,Kryteria Nazwa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Proszę ustawić firmę
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Proszę ustawić firmę
 DocType: Pricing Rule,Buying,Zakupy
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Choroby i nawozy
 DocType: HR Settings,Employee Records to be created by,Rekordy pracownika do utworzenia przez
@@ -4813,18 +4848,18 @@
 DocType: POS Profile,Apply Discount On,Zastosuj RABAT
 DocType: Member,Membership Type,typ członkostwa
 ,Reqd By Date,
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Wierzyciele
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Wierzyciele
 DocType: Assessment Plan,Assessment Name,Nazwa ocena
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Pokaż PDC w Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Pokaż PDC w Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Wiersz # {0}: Numer seryjny jest obowiązkowe
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Oferta pracy
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Instytut Skrót
 ,Item-wise Price List Rate,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Oferta dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Oferta dostawcy
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 DocType: Consultation,C-,DO-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używany dla przedmiotu {1}
@@ -4842,7 +4877,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Całkowitej wariancji
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jeśli opcja jest włączona, system będzie zamieszczać wpisy księgowe dla inwentarza automatycznie."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Pośrednictwo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Frekwencja na pracownika {0} jest już zaznaczone na ten dzień
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Frekwencja na pracownika {0} jest już zaznaczone na ten dzień
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","w minutach 
  Aktualizacja poprzez ""Czas Zaloguj"""
@@ -4854,6 +4889,7 @@
 DocType: Lab Test,Approved Date,Zatwierdzona data
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
+DocType: Subscriber,Subscriber Name,Nazwa subskrybenta
 DocType: Serial No,Out of Warranty,Brak Gwarancji
 DocType: BOM Update Tool,Replace,Zamień
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nie znaleziono produktów.
@@ -4863,19 +4899,18 @@
 DocType: Request for Quotation Item,Project Name,Nazwa projektu
 DocType: Customer,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
 DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Wybierz rachunek odsetkowy w ramach pożyczki pracowniczej {0}
 DocType: Work Order,Required Items,wymagane przedmioty
 DocType: Stock Ledger Entry,Stock Value Difference,Różnica wartości zapasów
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Zasoby Ludzkie
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatność Wyrównawcza Płatności
 DocType: Disease,Treatment Task,Zadanie leczenia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Podatek należny (zwrot)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Podatek należny (zwrot)
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
 DocType: Item,Moving Average,Średnia Ruchoma
 DocType: BOM Update Tool,The BOM which will be replaced,BOM zostanie zastąpiony
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Urządzenia elektroniczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Urządzenia elektroniczne
 DocType: Asset,Maintenance Required,Wymagane czynności konserwacyjne
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
@@ -4884,7 +4919,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Zaległa wartość
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamroź asortyment starszy niż [dni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Wiersz # {0}: atutem jest obowiązkowe w przypadku środków trwałych kupna / sprzedaży
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Wiersz # {0}: atutem jest obowiązkowe w przypadku środków trwałych kupna / sprzedaży
 DocType: Asset Maintenance Team,Maintenance Team Name,Nazwa zespołu obsługi technicznej
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Klient jest obowiązkowy, jeśli jako klienta wybrano &quot;Możliwość sprzedaży&quot;"
@@ -4894,19 +4929,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Rodzaje roszczeń.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Procent sprzedaży powinien wynosić co najmniej {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Współczynnik sprzedaży dla elementu {0} jest niższy niż {1}. Prędkość sprzedaży powinna wynosić co najmniej {2}
-DocType: Item,Taxes,Podatki
+DocType: Subscription,Taxes,Podatki
 DocType: Purchase Invoice,capital goods,dobra inwestycyjne
 DocType: Purchase Invoice Item,Weight Per Unit,Waga na jednostkę
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Płatny i niedostarczone
 DocType: Project,Default Cost Center,Domyślne Centrum Kosztów
-DocType: Bank Guarantee,End Date,Data zakończenia
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Operacje magazynowe
 DocType: Budget,Budget Accounts,Rachunki ekonomiczne
 DocType: Employee,Internal Work History,Wewnętrzne Historia Pracuj
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kwota Skumulowanej amortyzacji
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Kapitał prywatny
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Zmienną Scorecard dostawcy
-DocType: Employee Loan,Fully Disbursed,w pełni wydatkowane
 DocType: Employee Advance,Due Advance Amount,Kwota należności z góry
 DocType: Maintenance Visit,Customer Feedback,Informacja zwrotna Klienta
 DocType: Account,Expense,Koszt
@@ -4930,7 +4963,7 @@
 ,Employee Information,Informacja o pracowniku
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,Przychodzące
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Definiowane są domyślne szablony podatkowe dla sprzedaży i zakupu.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Wynik Wynik {0} już istnieje.
@@ -4938,7 +4971,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Proszę wyłączyć filtr firmy, jeśli Group By jest &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Data publikacji nie może być datą przyszłą
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,do generowania powtarzających się
 DocType: Stock Entry,Target Warehouse Address,Docelowy adres hurtowni
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Urlop okolicznościowy
 DocType: Agriculture Task,End Day,Koniec dnia
@@ -4963,11 +4995,10 @@
 DocType: Material Request,% Ordered,% Zamówione
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Dla Grupy Studenckiej na Kursie kurs zostanie sprawdzony dla każdego Uczestnika z zapisanych kursów w ramach Rejestracji Programu.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Praca akordowa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Średnia. Kupno Cena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Share Balance,From No,Od Nie
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nowa wiadomość od {sender}
 DocType: Customer,Customer Primary Address,Główny adres klienta
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biuletyny
 DocType: Drug Prescription,Description/Strength,Opis / Siła
@@ -4976,22 +5007,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Sama pozycja została wprowadzona wielokrotnie
 DocType: Department,Leave Block List,Lista Blokowanych Urlopów
 DocType: Purchase Invoice,Tax ID,Identyfikator podatkowy (NIP)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste
 DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Zatwierdzać
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatowany adres dla {0}, proszę poprawić, aby kontynuować."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatowany adres dla {0}, proszę poprawić, aby kontynuować."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Numer nowego Konta, zostanie dodany do nazwy konta jako prefiks"
 DocType: Maintenance Team Member,Team Member,Członek zespołu
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Brak wyniku
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
-DocType: Employee Loan,Rate of Interest (%) / Year,Stopa procentowa (% / rok)
+DocType: Loan,Rate of Interest (%) / Year,Stopa procentowa (% / rok)
 ,Project Quantity,Ilość projektów
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”"
 DocType: Opportunity,To Discuss,Do omówienia
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,"{0} jednostki {1} potrzebne w {2}, aby zakończyć tę transakcję."
 DocType: Loan Type,Rate of Interest (%) Yearly,Stopa procentowa (%) Roczne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Rachunki tymczasowe
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Czarny
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Rachunki tymczasowe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Shareholder,Contact List,Lista kontaktów
 DocType: Account,Auditor,Audytor
@@ -4999,16 +5030,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} pozycji wyprodukowanych
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Ucz się więcej
 DocType: Cheque Print Template,Distance from top edge,Odległość od górnej krawędzi
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cennik {0} jest wyłączona lub nie istnieje
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cennik {0} jest wyłączona lub nie istnieje
 DocType: Purchase Invoice,Return,Powrót
 DocType: Pricing Rule,Disable,Wyłącz
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,"Sposób płatności jest wymagane, aby dokonać płatności"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,"Sposób płatności jest wymagane, aby dokonać płatności"
 DocType: Project Task,Pending Review,Czekający na rewizję
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Edytuj na całej stronie, aby uzyskać więcej opcji, takich jak zasoby, numery seryjne, partie itp."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Terminy i konsultacje
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie jest powiązana z transakcją{2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Składnik {0} nie może zostać wycofane, jak to jest już {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Wymagane kontrole
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Wymagane kontrole
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Oznacz Nieobecna
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Nie udało się skonfigurować firmy
@@ -5020,7 +5051,7 @@
 DocType: Homepage,Tag Line,tag Linia
 DocType: Fee Component,Fee Component,opłata Komponent
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Dodaj elementy z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Dodaj elementy z
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Uprawy i ziemie
 DocType: Cheque Print Template,Regular,Regularny
 DocType: Fertilizer,Density (if liquid),Gęstość (jeśli ciecz)
@@ -5045,24 +5076,26 @@
 DocType: Payment Entry,Paid Amount,Zapłacona kwota
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Zbadaj cykl sprzedaży
 DocType: Assessment Plan,Supervisor,Kierownik
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Wpis do magazynu retencyjnego
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Wpis do magazynu retencyjnego
 ,Available Stock for Packing Items,Dostępne ilości dla materiałów opakunkowych
 DocType: Item Variant,Item Variant,Pozycja Wersja
 ,Work Order Stock Report,Raport o stanie zlecenia pracy
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Wynik oceny Narzędzie
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Jako Supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Zaproponuj kategorię
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Złom Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Zarządzanie jakością
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Zarządzanie jakością
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} została wyłączona
 DocType: Project,Total Billable Amount (via Timesheets),Całkowita kwota do naliczenia (za pośrednictwem kart pracy)
 DocType: Agriculture Task,Previous Business Day,Poprzedni dzień roboczy
-DocType: Employee Loan,Repay Fixed Amount per Period,Spłacić ustaloną kwotę za okres
+DocType: Loan,Repay Fixed Amount per Period,Spłacić ustaloną kwotę za okres
 DocType: Employee,Health Insurance No,Numer ubezpieczenia zdrowotnego
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Uwaga kredytowa Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Uwaga kredytowa Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Całkowita kwota podlegająca opodatkowaniu
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
 DocType: Opening Invoice Creation Tool,Purchase,Zakup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Ilość bilansu
@@ -5073,16 +5106,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} do {1}
 DocType: Healthcare Settings,Valid number of days,Ważna liczba dni
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centra Kosztów
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Ponownie uruchom subskrypcję
 DocType: Land Unit,Linked Plant Analysis,Połączona analiza roślin
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stawka przy użyciu której waluta dostawcy jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Wiersz # {0}: taktowania konflikty z rzędu {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zezwalaj na zerową wartość wyceny
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Zezwalaj na zerową wartość wyceny
+DocType: Bank Guarantee,Receiving,Odbieranie
 DocType: Training Event Employee,Invited,Zaproszony
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Wiele aktywnych Struktury wynagrodzeń znalezionych dla pracownika {0} dla podanych dat
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Rachunki konfiguracji bramy.
 DocType: Employee,Employment Type,Typ zatrudnienia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Środki trwałe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Środki trwałe
 DocType: Payment Entry,Set Exchange Gain / Loss,Ustaw Exchange Zysk / strata
 ,GST Purchase Register,Rejestr zakupów GST
 ,Cash Flow,Cash Flow
@@ -5103,9 +5138,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista wszystkich transakcji akcji
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Załączeniu {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Należy ustawić zarówno datę rozpoczęcia okresu próbnego, jak i datę zakończenia okresu próbnego"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Średnia stawka
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Całkowita kwota płatności w harmonogramie płatności musi być równa sumie całkowitej / zaokrąglonej
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Całkowita kwota płatności w harmonogramie płatności musi być równa sumie całkowitej / zaokrąglonej
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bilans wyciągów bankowych wedle Księgi Głównej
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
 DocType: Authorization Rule,Customer / Item Name,Klient / Nazwa Przedmiotu
@@ -5135,6 +5171,7 @@
 DocType: Work Order,Warehouses,Magazyny
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} zasób nie może zostać przetransferowany
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ceny pokoi w hotelu
+DocType: Subscription,Days Until Due,Dni do końca
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ta pozycja jest wariantem {0} (szablon).
 DocType: Workstation,per hour,na godzinę
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabywczy
@@ -5143,13 +5180,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Dla grupy studentów opartej na partiach, partia ucznia zostanie zatwierdzona dla każdego ucznia z wpisu do programu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Dystrybucja
+DocType: Journal Entry Account,Loan,Pożyczka
 DocType: Expense Claim Advance,Expense Claim Advance,Advance Claim Advance
 DocType: Lab Test,Report Preference,Preferencje raportu
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informacje o wolontariuszu.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Menadżer Projektu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Menadżer Projektu
 ,Quoted Item Comparison,Porównanie cytowany Item
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Pokrywaj się w punktacji pomiędzy {0} a {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Wyślij
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Wartość aktywów netto na
 DocType: Crop,Produce,Produkować
@@ -5159,7 +5197,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Zużycie materiału do produkcji
 DocType: Item Alternative,Alternative Item Code,Alternatywny kod towaru
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rola pozwala na zatwierdzenie transakcji, których kwoty przekraczają ustalone limity kredytowe."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Wybierz produkty do Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Wybierz produkty do Manufacture
 DocType: Delivery Stop,Delivery Stop,Przystanek dostawy
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
 DocType: Item,Material Issue,Wydanie materiałów
@@ -5169,15 +5207,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Środki czystości i Detergenty
 DocType: BOM,Show Items,jasnowidze
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od czasu nie może być większa niż do czasu.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Czy chcesz powiadomić wszystkich klientów pocztą e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Czy chcesz powiadomić wszystkich klientów pocztą e-mail?
+DocType: Subscription Plan,Billing Interval,Okres rozliczeniowy
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Ruchomy Obraz i Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Wznawianie
 DocType: Hub Settings,Hub Username,Nazwa użytkownika koncentratora
 DocType: Salary Detail,Component,Składnik
 DocType: Assessment Criteria,Assessment Criteria Group,Kryteria oceny grupowej
 DocType: Healthcare Settings,Patient Name By,Nazwisko pacjenta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Zapis wstępny w dzienniku dla zarobków od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Zapis wstępny w dzienniku dla zarobków od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 DocType: Naming Series,Select Transaction,Wybierz Transakcję
@@ -5191,23 +5229,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd"
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
-DocType: Employee Loan,Disbursement Date,wypłata Data
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Odbiorcy&quot; nie podano
+DocType: Loan,Disbursement Date,wypłata Data
 DocType: BOM Update Tool,Update latest price in all BOMs,Zaktualizuj ostatnią cenę we wszystkich biuletynach
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Historia choroby
 DocType: Vehicle,Vehicle,Pojazd
 DocType: Purchase Invoice,In Words,Słownie
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Wprowadź nazwę banku lub instytucji kredytowej przed złożeniem wniosku.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musi zostać wysłany
 DocType: POS Profile,Item Groups,Pozycja Grupy
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
 DocType: Sales Order Item,For Production,Dla Produkcji
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Dodaj konto tymczasowego otwarcia w planie kont
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Dodaj konto tymczasowego otwarcia w planie kont
 DocType: Customer,Customer Primary Contact,Kontakt główny klienta
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Okresowy dziennik zamknięcia
 DocType: Project Task,View Task,Zobacz Zadanie
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ołów%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ołów%
+DocType: Bank Guarantee,Bank Guarantee Type,Rodzaj gwarancji bankowej
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fragment faktury
 ,Asset Depreciations and Balances,Aktywów Amortyzacja i salda
@@ -5218,9 +5257,8 @@
 DocType: Production Plan,Include Subcontracted Items,Uwzględnij elementy podwykonawstwa
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,łączyć
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Nie można zmienić właściwości wariantu po transferze towaru. Będziesz musiał zrobić nową rzecz, aby to zrobić."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
-DocType: Employee Loan,Repay from Salary,Spłaty z pensji
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+DocType: Loan,Repay from Salary,Spłaty z pensji
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Żądanie zapłatę przed {0} {1} w ilości {2}
 DocType: Salary Slip,Salary Slip,Pasek wynagrodzenia
@@ -5244,11 +5282,11 @@
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikat grupę pozycji w tabeli grupy produktów
 DocType: Land Unit,Parent Land Unit,Jednostka macierzysta
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Fertilizer,Fertilizer Name,Nazwa nawozu
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nr seryjny {0} otrzymano
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Nr seryjny {0} otrzymano
 ,Requested Items To Be Transferred,Proszę o Przetranferowanie Przedmiotów
 DocType: Expense Claim,Vehicle Log,pojazd Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Obecność gorączki (temp.&gt; 38,5 ° C / 101,3 ° F lub trwała temperatura&gt; 38 ° C / 100,4 ° F)"
@@ -5289,24 +5327,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
 DocType: Asset Maintenance,Manufacturing User,Produkcja użytkownika
 DocType: Purchase Invoice,Raw Materials Supplied,Dostarczone surowce
-DocType: C-Form,Series,Seria
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Waluta listy cen {0} musi wynosić {1} lub {2}
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
 DocType: Driver,License Number,Numer licencji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Cel Wizyty Konserwacji
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Rejestracja pacjenta faktury
 DocType: Crop,Period,Okres
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Księga główna
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Pracownik {0} na urlopach {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Pracownik {0} na urlopach {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobacz Tropy
 DocType: Program Enrollment Tool,New Program,Nowy program
 DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
 ,Itemwise Recommended Reorder Level,Pozycja Zalecany poziom powtórnego zamówienia
 DocType: Salary Detail,Salary Detail,Wynagrodzenie Szczegóły
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Proszę najpierw wybrać {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Proszę najpierw wybrać {0}
 DocType: Appointment Type,Physician,Lekarz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Konsultacje
@@ -5314,15 +5351,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nie może być większe niż planowana ilość ({2}) w zleceniu pracy {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Arkusz Czas produkcji.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Razem
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Nie można zmienić właściwości wariantu po transakcji giełdowej. Będziesz musiał zrobić nową rzecz, aby to zrobić."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandat SEPA bez karty
 DocType: Physician,Charges,Opłaty
 DocType: Production Plan,Get Items For Work Order,Zdobądź przedmioty na zlecenie pracy
 DocType: Salary Detail,Default Amount,Domyślnie Kwota
 DocType: Lab Test Template,Descriptive,Opisowy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Podsumowanie tego miesiąca
 DocType: Quality Inspection Reading,Quality Inspection Reading,Odczyt kontroli jakości
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Określ cel sprzedaży, jaki chcesz osiągnąć dla swojej firmy."
 ,Project wise Stock Tracking,
@@ -5350,11 +5388,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Nie udało się utworzyć witryny
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Wpis zapasu retencji już utworzony lub nie podano próbki próbki
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Wpis zapasu retencji już utworzony lub nie podano próbki próbki
 DocType: Program,Program Abbreviation,Skrót programu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
 DocType: Warranty Claim,Resolved By,Rozstrzygnięte przez
-DocType: Bank Guarantee,Start Date,Data startu
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Czeki i Depozyty nieprawidłowo rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
@@ -5369,11 +5406,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Godziny
 DocType: Project,Expected Start Date,Spodziewana data startowa
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korekta na fakturze
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Zamówienie pracy zostało już utworzone dla wszystkich produktów z zestawieniem komponentów
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Zamówienie pracy zostało już utworzone dla wszystkich produktów z zestawieniem komponentów
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Szczegółowy raport dotyczący wariantu
 DocType: Setup Progress Action,Setup Progress Action,Konfiguracja działania
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kupowanie cennika
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kupowanie cennika
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Usuń element, jeśli opłata nie ma zastosowania do tej pozycji"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Anuluj subskrypcje
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Wybierz Stan konserwacji jako Zakończony lub Usuń datę ukończenia
 DocType: Supplier,Default Payment Terms Template,Domyślny szablon warunków płatności
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,"Waluta transakcji musi być taka sama, jak waluta wybranej płatności"
@@ -5384,7 +5422,6 @@
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Działanie w przypadku nagromadzonych miesięcznego budżetu Przekroczono
-DocType: Subscription,Submit on creation,Prześlij na tworzeniu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Waluta dla {0} musi być {1}
 DocType: Asset,Disposal Date,Utylizacja Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emaile zostaną wysłane do wszystkich aktywnych pracowników Spółki w danej godzinie, jeśli nie mają wakacji. Streszczenie odpowiedzi będą wysyłane na północy."
@@ -5403,6 +5440,7 @@
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Cheque Print Template,Cheque Print Template,Sprawdź Szablon druku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Struktura kosztów (MPK)
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Liczba dni po dacie faktury upłynęła przed anulowaniem subskrypcji lub oznaczenia subskrypcji jako niepłatne
 DocType: Lab Test Template,Sample Collection,Kolekcja Próbek
 ,Requested Items To Be Ordered,Proszę o Zamówienie Przedmiotów
 DocType: Price List,Price List Name,Nazwa cennika
@@ -5411,7 +5449,7 @@
 DocType: Account,Income,Przychody
 DocType: Industry Type,Industry Type,Typ Przedsiębiorstwa
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Coś poszło nie tak!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 DocType: Supplier Scorecard Scoring Criteria,Score,Wynik
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Rok fiskalny {0} nie istnieje
@@ -5431,12 +5469,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} powinno być wartością z zakresu od 0 do 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Data następnej amortyzacji nie może być wcześniejsza niż data przydatności do użycia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Pożyczki bez pokrycia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksymalny czas pracy przed grafiku
 DocType: Maintenance Schedule Detail,Scheduled Date,Zaplanowana Data
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Łączna wypłacona Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Łączna wypłacona Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Wiadomości dłuższe niż 160 znaków zostaną podzielone na kilka wiadomości
 DocType: Purchase Receipt Item,Received and Accepted,Otrzymano i zaakceptowano
 DocType: Hub Settings,Company and Seller Profile,Firma i profil sprzedawcy
@@ -5450,10 +5488,9 @@
 DocType: Item,Variant Based On,Wariant na podstawie
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Twoi Dostawcy
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Proszę poprawić
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
 DocType: Request for Quotation Item,Supplier Part No,Dostawca Część nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonimowy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Otrzymane od
 DocType: Lead,Converted,Przekształcono
@@ -5467,6 +5504,7 @@
 DocType: Asset,Assets,Majątek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej.
+DocType: Subscription,Current Invoice End Date,Aktualna data zakończenia faktury
 DocType: Payment Term,Due Date Based On,Termin wykonania oparty na
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Proszę ustawić domyślną grupę klientów i terytorium w Ustawieniach sprzedaży
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} nie istnieje
@@ -5474,7 +5512,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nie wybrano żadnych spłat za wpis do dziennika
 DocType: Payment Reconciliation,From Invoice Date,Od daty faktury
+DocType: Loan,Disbursed,Wypłacony
 DocType: Healthcare Settings,Laboratory Settings,Ustawienia laboratoryjne
 DocType: Patient Appointment,Service Unit,Jednostka serwisowa
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Pomyślnie ustaw dostawcę
@@ -5487,12 +5527,12 @@
 DocType: Share Balance,No of Shares,Liczba akcji
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Wybierz Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: School House,House Name,Nazwa domu
 DocType: Fee Schedule,Total Amount per Student,Łączna kwota na jednego studenta
 DocType: Purchase Taxes and Charges,Account Head,Konto główne
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektryczne
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektryczne
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodać resztę organizacji jako użytkowników. Można również dodać zaprosić klientów do portalu dodając je z Kontaktów
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
 DocType: Grant Application,Requested Amount,Wnioskowana kwota
@@ -5502,7 +5542,7 @@
 DocType: Crop Cycle,Detected Diseases,Wykryto choroby
 DocType: Stock Entry,Default Source Warehouse,Domyślny magazyn źródłowy
 DocType: Item,Customer Code,Kod Klienta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 DocType: Asset Maintenance Task,Last Completion Date,Ostatnia data ukończenia
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
@@ -5510,9 +5550,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Ustawienia bez karty
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Kapitał zasobów
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Kapitał zasobów
 DocType: Restaurant,Active Menu,Aktywne menu
 DocType: Target Detail,Target Qty,Ilość docelowa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Against Loan: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Zamówienie Ustawienia
 DocType: Student Attendance,Present,Obecny
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
@@ -5521,9 +5562,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
 DocType: Vehicle Log,Odometer,Drogomierz
 DocType: Production Plan Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,Zamroź zapasy do
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
 DocType: Chapter,Chapter Head,Rozdział Głowy
 DocType: Payment Term,Month(s) after the end of the invoice month,Miesiąc (y) po zakończeniu miesiąca faktury
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Czynność / zadanie projektu
@@ -5531,11 +5572,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Utwórz Paski Wypłaty
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Data zestawienia wyników laboratorium nie może być wcześniejsza niż test datetime
 DocType: POS Profile,Allow user to edit Discount,Zezwól użytkownikowi na edycję rabatu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Zdobądź klientów
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Zdobądź klientów
 DocType: Purchase Invoice Item,Include Exploded Items,Dołącz rozstrzelone przedmioty
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
 DocType: Shipping Rule,Restrict to Countries,Ogranicz do krajów
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kwota Odpisu (Waluta Firmy)
 DocType: Sales Invoice Timesheet,Billing Hours,Godziny billingowe
 DocType: Project,Total Sales Amount (via Sales Order),Całkowita kwota sprzedaży (poprzez zamówienie sprzedaży)
@@ -5554,6 +5596,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Menedżer oceny
 DocType: Payment Entry,Allocate Payment Amount,Przeznaczyć Kwota płatności
+DocType: Subscription Plan,Subscription Plan,Abonament abonamentowy
 DocType: Employee External Work History,Salary,Wynagrodzenia
 DocType: Serial No,Delivery Document Type,Typ dokumentu dostawy
 DocType: Sales Order,Partly Delivered,Częściowo Dostarczono
@@ -5579,9 +5622,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Starzenie Zakres 2
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalowanie ustawień wstępnych
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nie wybrano uwagi dostawy dla klienta {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nie wybrano uwagi dostawy dla klienta {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Wybierz pozycje w oparciu o datę dostarczenia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Wybierz pozycje w oparciu o datę dostarczenia
 DocType: Grant Application,Has any past Grant Record,Ma jakąkolwiek przeszłość Grant Record
 ,Sales Analytics,Analityka sprzedaży
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Dostępne {0}
@@ -5600,7 +5643,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Koszt dostarczonych surowców
 DocType: Selling Settings,Settings for Selling Module,Ustawienia modułu sprzedaży
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezerwacja pokoju hotelowego
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Obsługa Klienta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Obsługa Klienta
 DocType: BOM,Thumbnail,Miniaturka
 DocType: Item Customer Detail,Item Customer Detail,Element Szczegóły klienta
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Zaproponuj kandydatowi pracę
@@ -5617,7 +5660,7 @@
 DocType: Fees,Student Details,Szczegóły Uczniów
 DocType: Purchase Invoice Item,Stock Qty,Ilość zapasów
 DocType: Purchase Invoice Item,Stock Qty,Ilość zapasów
-DocType: Employee Loan,Repayment Period in Months,Spłata Okres w miesiącach
+DocType: Loan,Repayment Period in Months,Spłata Okres w miesiącach
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Błąd: Nie ważne id?
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
@@ -5626,7 +5669,7 @@
 DocType: Task,Closing Date,Data zamknięcia
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
 DocType: Timesheet,Work Detail,Szczegóły pracy
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inżynier
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inżynier
 DocType: Journal Entry,Total Amount Currency,Suma Waluta Kwota
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zespoły Szukaj Sub
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
@@ -5672,13 +5715,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informacje o typie dawcy.
 DocType: Request for Quotation,Supplier Detail,Dostawca Szczegóły
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Błąd wzoru lub stanu {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Kwota zafakturowana
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Kwota zafakturowana
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kryteria wag muszą dodać do 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Obecność
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,produkty seryjne
 DocType: BOM,Materials,Materiały
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jeśli nie jest zaznaczone, lista będzie musiała być dodana do każdego działu, w którym ma zostać zastosowany."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Tworzenie {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Źródło i Cel Magazyn nie może być taki sam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Szablon podatkowy dla transakcji zakupu.
@@ -5702,14 +5744,14 @@
 DocType: Shipping Rule,Fixed,Naprawiony
 DocType: Vehicle Service,Clutch Plate,sprzęgło
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Wydatki na podstawową działalność
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Wydatki na podstawową działalność
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Konsulting
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
-DocType: Journal Entry,Subscription,Subskrypcja
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Subskrypcja
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Tworzenie opłat w toku
 DocType: Appraisal Goal,Score Earned,Ilość zdobytych punktów
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Okres wypowiedzenia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Okres wypowiedzenia
 DocType: Asset Category,Asset Category Name,Zaleta Nazwa kategorii
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To jest obszar root i nie może być edytowany.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nazwa nowej osoby Sprzedaży
@@ -5723,7 +5765,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
 DocType: Asset,Frequency of Depreciation (Months),Częstotliwość Amortyzacja (miesiące)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Konto kredytowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Pokaż wartości zerowe
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców
@@ -5731,7 +5773,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
 DocType: Hub Settings,Company Logo,Logo firmy
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 DocType: Healthcare Settings,Patient Registration,Rejestracja pacjenta
@@ -5766,11 +5808,10 @@
 DocType: Journal Entry,Total Debit,Całkowita kwota debetu
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Magazyn wyrobów gotowych domyślne
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Proszę wybrać Pacjenta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sprzedawca
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sprzedawca
 DocType: Hotel Room Package,Amenities,Udogodnienia
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budżet i MPK
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Wielokrotny domyślny tryb płatności nie jest dozwolony
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,dla
 ,Appointment Analytics,Analytics analityków
 DocType: Vehicle Service,Half Yearly,Pół Roku
 DocType: Lead,Blog Subscriber,Subskrybent Bloga
@@ -5787,6 +5828,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Zostaw puste, jeśli uczysz grupy studentów rocznie"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jeśli zaznaczone, Całkowita liczba Dni Roboczych obejmie święta, a to zmniejsza wartość Wynagrodzenie za dzień"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikacje używające obecnego klucza nie będą mogły uzyskać dostępu, czy na pewno?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Całość zaliczka
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Zmień kod szablonu
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termin Data zakończenia nie może być wcześniejsza niż data początkowa Term. Popraw daty i spróbuj ponownie.
@@ -5798,8 +5840,9 @@
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 DocType: Cheque Print Template,Signatory Position,Sygnatariusz Pozycja
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Ustaw jako utracony
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Ustaw jako utracony
 DocType: Timesheet,Total Billable Hours,Całkowita liczba godzin rozliczanych
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Liczba dni, w których subskrybent musi płacić faktury wygenerowane w ramach tej subskrypcji"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Otrzymanie płatności Uwaga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Jest to oparte na operacjach przeciwko tym Klienta. Zobacz harmonogram poniżej w szczegółach
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa kwocie Entry Płatność {2}
@@ -5818,12 +5861,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Company,Company Info,Informacje o firmie
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Wybierz lub dodaj nowego klienta
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Jest to oparte na obecności pracownika
 DocType: Assessment Result,Summary,Podsumowanie
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Oznaczaj Uczestnictwo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Konto debetowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Konto debetowe
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restauracja Order Entry Pozycja
@@ -5835,7 +5878,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kwota zakupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Świadczenia pracownicze
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Świadczenia pracownicze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Work Order,Manufactured Qty,Ilość wyprodukowanych
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcje nie istnieją z {0}
@@ -5843,12 +5886,12 @@
 DocType: Asset,Out of Order,Nieczynny
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 DocType: Projects Settings,Ignore Workstation Time Overlap,Zignoruj nakładanie się czasu w stacji roboczej
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub {1} firmy
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub {1} firmy
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Wybierz numery partii
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rachunki dla klientów.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 DocType: Patient Service Unit,Medical Administrator,Administrator medyczny
 DocType: Assessment Plan,Schedule,Harmonogram
 DocType: Account,Parent Account,Nadrzędne konto
@@ -5878,15 +5921,16 @@
 DocType: Asset Repair,Repair Status,Status naprawy
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
 DocType: POS Profile,Account for Change Amount,Konto dla zmiany kwoty
 DocType: Purchase Invoice,input service,usługa wprowadzania danych
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Członek zespołu ds. Konserwacji
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza gleby
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kod kursu:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Wprowadź konto Wydatków
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Magazyn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
 DocType: Employee,Current Address,Obecny adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jeśli pozycja jest wariant innego elementu, a następnie opis, zdjęcia, ceny, podatki itp zostanie ustalony z szablonu, o ile nie określono wyraźnie"
 DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji
@@ -5935,19 +5979,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Rekrutacja dla {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nazwa zmiennej
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
 DocType: Asset,Asset Category,Aktywa Kategoria
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Stawka Netto nie może być na minusie
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiał do Dostawcy
 DocType: Soil Texture,Loamy Sand,Piasek gliniasty
 DocType: Production Plan,Material Request Planning,Planowanie zapotrzebowania materiałowego
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Akcyza Faktura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Próg {0}% występuje więcej niż jeden raz
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
 DocType: Employee Attendance Tool,Marked Attendance,Zaznaczona Obecność
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Bieżące Zobowiązania
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Bieżące Zobowiązania
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Minutnik przekroczył podane godziny.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Wyślij zbiorczo sms do swoich kontaktów
 DocType: Patient,A Positive,Pozytywny
@@ -5958,9 +6002,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualnie posiada pozycję {1} Karty wyników dostawcy, a zlecenia kupna dostawcy powinny być wydawane z ostrożnością."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Zespół ds. Utrzymania aktywów
-DocType: Employee Loan,Loan Type,Rodzaj kredytu
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,Aplikacja {0} została pomyślnie przesłana
+DocType: Loan,Loan Type,Rodzaj kredytu
 DocType: Scheduling Tool,Scheduling Tool,Narzędzie Scheduling
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,
 DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany"
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5992,7 +6037,7 @@
 DocType: Item,Units of Measure,Jednostki miary
 DocType: Manufacturing Settings,Allow Production on Holidays,Pozwól Produkcja na święta
 DocType: Sales Invoice,Customer's Purchase Order Date,Data Zamówienia Zakupu Klienta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapitał zakładowy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapitał zakładowy
 DocType: Shopping Cart Settings,Show Public Attachments,Pokaż załączniki publiczne
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
 DocType: Restaurant Reservation,Reservation Time,Czas rezerwacji
@@ -6007,7 +6052,7 @@
 DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Wiersz nr {0}: żądanie według daty nie może być wcześniejsze niż data transakcji
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Polecane produkty
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Projektant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},
@@ -6017,20 +6062,20 @@
 DocType: Driver,Expiry Date,Data ważności
 DocType: Healthcare Settings,Employee name and designation in print,Nazwisko pracownika i oznaczenie w druku
 ,accounts-browser,Przeglądarka rachunków
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Proszę najpierw wybrać kategorię
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Dyrektor projektu
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Aby umożliwić over-fakturowania lub zbyt zamawiającego, update &quot;dodatek&quot; w ustawieniach zasobu lub elementu."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pół dnia)
 DocType: Payment Term,Credit Days,
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Wybierz pacjenta, aby uzyskać testy laboratoryjne"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Bądź Batch Studenta
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Czas realizacji (dni)
 DocType: Cash Flow Mapping,Is Income Tax Expense,Jest kosztem podatku dochodowego
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Sprawdź, czy Student mieszka w Hostelu Instytutu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
 ,Stock Summary,Podsumowanie Zdjęcie
@@ -6041,10 +6086,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: BOM Operation,Operating Cost(Company Currency),Koszty operacyjne (Spółka waluty)
-DocType: Employee Loan Application,Rate of Interest,Stopa procentowa
+DocType: Loan Application,Rate of Interest,Stopa procentowa
 DocType: Expense Claim Detail,Sanctioned Amount,Zatwierdzona Kwota
 DocType: Item,Shelf Life In Days,Okres przydatności do spożycia w dniach
 DocType: GL Entry,Is Opening,Otwiera się
+DocType: Department,Expense Approvers,Koszty zatwierdzający
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
 DocType: Journal Entry,Subscription Section,Sekcja subskrypcji
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Konto {0} nie istnieje
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 897b8ce..0bad269 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,د موادو {0} سفر مخکې له دې ګرنټی ادعا بندول لغوه کړه
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,د ارزونې راپورونه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,د استهلاکي تولیداتو
-DocType: Purchase Receipt,Subscription Detail,د ګډون تفصیل
 DocType: Supplier Scorecard,Notify Supplier,خبرتیاوو سپارل
 DocType: Item,Customer Items,پيرودونکو لپاره توکي
 DocType: Project,Costing and Billing,لګښت او اولګښت
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ګڼون {0}: Parent حساب {1} نه شي د پنډو وي
 DocType: Item,Publish Item to hub.erpnext.com,ته hub.erpnext.com د قالب د خپرېدو
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ليک د خبرتیا
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ارزونې
 DocType: Item,Default Unit of Measure,د اندازه کولو واحد (Default)
 DocType: SMS Center,All Sales Partner Contact,ټول خرڅلاو همکار سره اړيکي
-DocType: Employee,Leave Approvers,تصویبونکي ووځي
+DocType: Department,Leave Approvers,تصویبونکي ووځي
 DocType: Sales Partner,Dealer,مشتری
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,تحقیقات
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,د لاسرسي کتنه
 DocType: Job Applicant,Job Applicant,دنده متقاضي
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,دا په دې عرضه په وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,د حقوقي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},واقعي ډول د ماليې په قطار د قالب بیه نه وي شامل شي کولای {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,د حقوقي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},واقعي ډول د ماليې په قطار د قالب بیه نه وي شامل شي کولای {0}
 DocType: Bank Guarantee,Customer,پيرودونکو
 DocType: Purchase Receipt Item,Required By,د غوښتل شوي By
 DocType: Delivery Note,Return Against Delivery Note,پر وړاندې د سپارنې يادونه Return
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سرونه (یا ډلو) په وړاندې چې د محاسبې توکي دي او انډول وساتل شي.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,د پروسې لپاره د معاشونو نشتوالی شتون نلري.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,د پروسې لپاره د معاشونو نشتوالی شتون نلري.
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقیقه
 DocType: Leave Type,Leave Type Name,پريږدئ ډول نوم
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,وښایاست خلاص
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,دا اړینه ده چې دا عمل خپل ځان ته د پورته ذکر شوي تکرار لپاره ونیسو
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,بشپړ ی وګوره
 DocType: Pricing Rule,Apply On,Apply د
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ټول عرضه سره اړيکي
 DocType: Support Settings,Support Settings,د ملاتړ امستنې
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,د کتارونو تر # {0}: کچه باید په توګه ورته وي {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,نوي اجازه کاریال
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,د کتارونو تر # {0}: کچه باید په توګه ورته وي {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,دسته شمیره د پای حالت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,بانک مسوده
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,بانک مسوده
 DocType: Membership,membership validaty section,د غړیتوب تصدیق کول برخه
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
 DocType: Consultation,Consultation,مشورې
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,د مادي
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ویب پاڼه جوړول
 DocType: Opening Invoice Creation Tool Item,Quantity,کمیت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),پورونه (مسؤلیتونه)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),پورونه (مسؤلیتونه)
 DocType: Employee Education,Year of Passing,د تصویب کال
 DocType: Item,Country of Origin,د استوګنی اصلی ځای
 DocType: Soil Texture,Soil Texture Criteria,د خاوری د جوړښت معیارونه
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,د اړیکو لومړني تفصیلات
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,د پرانیستې مسایل
 DocType: Production Plan Item,Production Plan Item,تولید پلان د قالب
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
 DocType: Lab Test Groups,Add new line,نوې کرښه زیاته کړئ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,روغتیایی پاملرنه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
@@ -89,7 +85,7 @@
 ,Delay Days,ناوخته ورځ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,صورتحساب
+DocType: Subscription Invoice,Invoice,صورتحساب
 DocType: Purchase Invoice Item,Item Weight Details,د وزن وزن توضیحات
 DocType: Asset Maintenance Log,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),نمره (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,د کتارونو تر # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,د کتارونو تر # {0}:
 DocType: Timesheet,Total Costing Amount,Total لګښت مقدار
 DocType: Delivery Note,Vehicle No,موټر نه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,مهرباني غوره بیې لېست
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,کار په جریان کښی
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,مهرباني غوره نیټه
 DocType: Daily Work Summary Group,Holiday List,رخصتي بشپړفهرست
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,محاسب
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,محاسب
 DocType: Hub Settings,Selling Price List,د نرخ پلور لیست
 DocType: Patient,Tobacco Current Use,تمباکو اوسنی کارول
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,د پلور کچه
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,د پلور کچه
 DocType: Cost Center,Stock User,دحمل کارن
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,تيليفون نه
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},نوي {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,د بریښناليک بریښنالیک لیږل
 ,Sales Partners Commission,خرڅلاو همکاران کمیسیون
 DocType: Soil Texture,Sandy Clay Loam,د سیني مټې لوام
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ارزښت د استهالک وروسته
 DocType: Student,O+,اې +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,اړوند
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,د حاضرۍ نېټه نه شي کولای د کارکوونکي د یوځای نېټې څخه کم وي
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,د حاضرۍ نېټه نه شي کولای د کارکوونکي د یوځای نېټې څخه کم وي
 DocType: Grading Scale,Grading Scale Name,د رتبو او مقياس نوم
-DocType: Subscription,Repeat on Day,په ورځ کې تکرار کړئ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,دا یو د ريښو په حساب او د نه تصحيح شي.
 DocType: Sales Invoice,Company Address,شرکت پته
 DocType: BOM,Operations,عملیاتو په
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لپاره د کمښت په اساس اجازه نه شي {0}
+DocType: Subscription,Subscription Start Date,د ګډون نېټه پېل
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",سره دوه ستنې، یو زوړ نوم لپاره او يوه د نوي نوم لپاره .csv دوتنې سره ضمیمه
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} د {1} په هر فعال مالي کال نه.
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,د ازموینې دورې پای نیټه د آزموینې دوره د پیل نیټه نه شي کیدی
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,کيلوګرام
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,د دنده پرانيستل.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM د فرعي قرارداد کولو توکي لپاره {0} د صفر {1} لپاره مشخص نه دی
@@ -147,7 +143,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همدې شرکت څخه یو ځل بیا ننوتل
 DocType: Patient,Married,واده
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},لپاره نه اجازه {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,له توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,له توکي ترلاسه کړئ
 DocType: Price List,Price Not UOM Dependant,بیه د UOM پرځای نه ده
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
@@ -178,12 +174,12 @@
 DocType: Vehicle Service,Brake Oil,لنت ترمز د تیلو
 DocType: Tax Rule,Tax Type,د مالياتو ډول
 ,Completed Work Orders,د کار بشپړ شوي سپارښتنې
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,د ماليې وړ مقدار
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,د ماليې وړ مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: BOM,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,انتخاب هیښ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,انتخاب هیښ
 DocType: SMS Log,SMS Log,SMS ننوتنه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,د تحویلوونکی سامان لګښت
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,د کارمندانو ته ورکړل شوي وړاندیز شوي مقدار اداره کړئ
@@ -199,19 +195,19 @@
 DocType: Delivery Trip,Delivery Notification,د سپارلو خبرتیا
 DocType: Journal Entry,Opening Entry,د پرانستلو په انفاذ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب د معاشونو يوازې
-DocType: Employee Loan,Repay Over Number of Periods,بيرته د د پړاوونه شمیره
+DocType: Loan,Repay Over Number of Periods,بيرته د د پړاوونه شمیره
 DocType: Stock Entry,Additional Costs,اضافي لګښتونو
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې حساب ته ډلې بدل نه شي.
 DocType: Lead,Product Enquiry,د محصول د ږنو
 DocType: Education Settings,Validate Batch for Students in Student Group,لپاره د زده کونکو د زده ګروپ دسته اعتباري
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},نه رخصت شی پيدا نشول لپاره کارکوونکي {0} د {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},نه رخصت شی پيدا نشول لپاره کارکوونکي {0} د {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,مهرباني وکړئ لومړی شرکت ته ننوځي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,مهرباني غوره شرکت لومړۍ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,مهرباني غوره شرکت لومړۍ
 DocType: Employee Education,Under Graduate,لاندې د فراغت
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,مهرباني وکړئ د بشري سایټونو کې د وینډوز د خبرتیا نوښت لپاره د ډیزاینټ ټاپ ډک کړئ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,هدف د
 DocType: BOM,Total Cost,ټولیز لګښت،
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,د کارګر د پور
 DocType: Fee Schedule,Send Payment Request Email,د بریښناليک غوښتن لیک استول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,املاک
@@ -231,21 +227,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,په بریالیتوب سره ندی ثبت شوی.
 DocType: Assessment Result,Grade,ټولګي
 DocType: Restaurant Table,No of Seats,د څوکیو شمیر
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","د متحرک موضوع اضافه کولو لپاره، د جینج ټګګ په څیر کاروئ <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: Asset Maintenance Task,Asset Maintenance Task,د شتمنیو ساتنه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,کلنی معاش
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,کلنی معاش
 DocType: Daily Work Summary,Daily Work Summary,هره ورځ د کار لنډیز
 DocType: Period Closing Voucher,Closing Fiscal Year,مالي کال تړل
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} د {1} ده کنګل
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,دحمل داخراجاتو
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,دحمل داخراجاتو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,وټاکئ هدف ګدام
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,وټاکئ هدف ګدام
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,لطفا غوره تماس بريښناليک
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,لطفا غوره تماس بريښناليک
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,د CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra انفاذ
 DocType: Journal Entry Account,Credit in Company Currency,په شرکت د پیسو د اعتبار
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,لومړني پته
 DocType: Production Plan,Material Request Detail,د موادو غوښتنې وړاندیز
 DocType: Selling Settings,Default Quotation Validity Days,د داوطلبۍ د داوطلبۍ ورځې ورځې
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,د موټر چلولو جوازونو کټګوري
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,مهرباني وکړئ د سپارلو نېټه ولیکئ
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
+DocType: HR Settings,Leave Settings,پریښودل ترتیبات
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,د کارګر د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,broadcasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),د POS د سیٹ اپ طریقه (آنلاین / آف لائن)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,د کاري امرونو په وړاندې د وخت وختونو جوړول. عملیات باید د کار د نظم په وړاندې تعقیب نشي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,د اجرا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,د اجرا
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,د عملیاتو په بشپړه توګه کتل ترسره.
 DocType: Asset Maintenance Log,Maintenance Status,د ساتنې حالت
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,د غړیتوب تفصیلات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پېرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} د {1}: عرضه ده د راتلوونکې ګڼون په وړاندې د اړتيا {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,توکي او د بیې ټاکل
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total ساعتونو: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},له نېټه بايد د مالي کال په چوکاټ کې وي. فرض له نېټه = {0}
 DocType: Drug Prescription,Interval,انټرالول
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,غوره توب
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,غوره توب
 DocType: Grant Application,Individual,انفرادي
 DocType: Academic Term,Academics User,پوهانو کارن
 DocType: Cheque Print Template,Amount In Figure,اندازه په شکل کې
-DocType: Employee Loan Application,Loan Info,د پور پيژندنه
+DocType: Loan Application,Loan Info,د پور پيژندنه
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,د ساتنې کتنو پلان.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,د سپړاوی د کرایې دوره
 DocType: Share Transfer,Share Transfer,د شریک لیږد
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,د توکي ټکي
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,بایو کیمیا
 DocType: Job Offer,Select Terms and Conditions,منتخب اصطلاحات او شرایط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,له جملې څخه د ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,له جملې څخه د ارزښت
 DocType: Woocommerce Settings,Woocommerce Settings,د واو کامیریک امستنې
 DocType: Production Plan,Sales Orders,خرڅلاو امر
 DocType: Purchase Taxes and Charges,Valuation,سنجي
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,default خاوره
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ټلويزيون د
 DocType: Work Order Operation,Updated via 'Time Log',روز &#39;د وخت څېره&#39; له لارې
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,پیرودونکي یا عرضه کوونکي غوره کړئ.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,ژورنالډ
 DocType: Naming Series,Series List for this Transaction,د دې پیسو د انتقال د لړۍ بشپړفهرست
 DocType: Company,Enable Perpetual Inventory,دايمي موجودي فعال
+DocType: Bank Guarantee,Charges Incurred,لګښتونه مصرف شوي
 DocType: Company,Default Payroll Payable Account,Default د معاشاتو د راتلوونکې حساب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,تازه بريښناليک ګروپ
 DocType: Sales Invoice,Is Opening Entry,ده انفاذ پرانيستل
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,د ګمرکي پایلې
 DocType: Delivery Stop,Contact Name,تماس نوم
 DocType: Course Assessment Criteria,Course Assessment Criteria,کورس د ارزونې معیارونه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,د مالیې ادرس:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,د مالیې ادرس:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,د زده کونکي ID:
 DocType: POS Customer Group,POS Customer Group,POS پيرودونکو ګروپ
 DocType: Land Unit,Land Unit describing various land assets,د ځمکې واحد د بیالبیلو ځمکو شتمنیو تشریح کوي
@@ -374,9 +371,8 @@
 ,Open Work Orders,د کار خلاص فعالیتونه
 DocType: Payment Term,Credit Months,د کریډیټ میاشت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",د سیسټم څخه د تکرار غلطی خبرتیاوو لیږلو مخه نیولو لپاره، موږ په ګډون کې د معلولینو ساحه وګورئ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,روان شو هر کال
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,روان شو هر کال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
 DocType: Email Digest,Profit & Loss,ګټه او زیان
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,لطفا د زده کونکو د شاګردانو له ډلې څخه فارغ کړئ
 DocType: Item Website Specification,Item Website Specification,د قالب د ځانګړتیاوو وېب پاڼه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,بانک توکي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,د وتو بنديز لګېدلی
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,بانک توکي
 DocType: Crop,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
 DocType: Stock Entry,Sales Invoice No,خرڅلاو صورتحساب نه
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,د زده کونکو د ګروپ خلقت اسباب کورس
 DocType: Lead,Do Not Contact,نه د اړيکې
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,هغه خلک چې په خپل سازمان د درس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,د پوستکالي د پراختیا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,د پوستکالي د پراختیا
 DocType: Item,Minimum Order Qty,لږ تر لږه نظم Qty
 DocType: Pricing Rule,Supplier Type,عرضه ډول
 DocType: Course Scheduling Tool,Course Start Date,د کورس د پیل نیټه
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,رانيول نورولوله
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,لوړې درجې
 DocType: Email Digest,New Quotations,نوي Quotations
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,د کارکوونکو د برېښناليک معاش ټوټه پر بنسټ د خوښې ایمیل کې د کارګر ټاکل
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,په لست کې د اجازه لومړی Approver به د تلواله اجازه Approver په توګه جوړ شي
 DocType: Tax Rule,Shipping County,انتقال County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,وکړئ
+apps/erpnext/erpnext/config/desktop.py +159,Learn,وکړئ
 DocType: Asset,Next Depreciation Date,بل د استهالک نېټه
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فعالیت لګښت په سلو کې د کارګر
 DocType: Accounts Settings,Settings for Accounts,لپاره حسابونه امستنې
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بيالنس Cheques او سپما او پاکول
 DocType: Item,Synced With Hub,دفارسی د مرکزي
 DocType: Driver,Fleet Manager,د بیړیو د مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,غلط شفر
 DocType: Item,Variant Of,د variant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},مهرباني وکړئ د هوټل روم شرح په {}
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Opening Invoice Creation Tool,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,د سپارنې پرمهال یادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,د سپارنې پرمهال یادونه
 DocType: Consultation,Encounter Impression,اغیزه اغیزه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,مالیات ترتیبول
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,د شتمنيو د دلال لګښت
@@ -502,11 +497,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,په ميزان کي پيرودونکو د اسعارو له دی چې د مشتريانو د اډې اسعارو بدل
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس اوقات اوزار
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[متوجه] د بیاکتنې لپاره د٪ s لپاره تېروتنه
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
 DocType: Land Unit,LInked Analysis,محدود معلومات
 DocType: Item Tax,Tax Rate,د مالياتو د Rate
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,د غوښتنلیک موده نشي کولی د تخصیص دوه ریکارډونو کې وي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,د غوښتنلیک موده نشي کولی د تخصیص دوه ریکارډونو کې وي
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
@@ -520,7 +514,7 @@
 DocType: Purchase Order,% Received,٪ د ترلاسه
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
 DocType: Volunteer,Weekends,اونۍ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,اعتبار يادونه مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,اعتبار يادونه مقدار
 DocType: Setup Progress Action,Action Document,د عمل سند
 DocType: Chapter Member,Website URL,د ویب پاڼې یو آر ایل
 ,Finished Goods,پای ته سامانونه
@@ -534,6 +528,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext قالب
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,سامان ورزیات کړئ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,د قالب د کیفیت د تفتیش د پاراميټر
+DocType: Leave Application,Leave Approver Name,پريږدئ Approver نوم
 DocType: Depreciation Schedule,Schedule Date,مهال ويش نېټه
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",عوايد، وضع او نورو معاش برخې
 DocType: Packed Item,Packed Item,ډک د قالب
@@ -552,7 +547,7 @@
 DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
 DocType: Healthcare Settings,Require Lab Test Approval,د لابراتوار ازموینې ته اړتیا
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,بشپړ شوی
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,بشپړ شوی
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
 DocType: Dosage Strength,Strength,ځواک
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,یو نوی پيرودونکو جوړول
@@ -565,7 +560,7 @@
 DocType: Workstation,Consumable Cost,د مصرف لګښت
 DocType: Purchase Receipt,Vehicle Date,موټر نېټه
 DocType: Student Log,Medical,د طب
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,د له لاسه ورکولو لامل
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,د له لاسه ورکولو لامل
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,د نوي حساب ورکولو شمیره
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,سرب د خاوند نه شي کولی چې په غاړه په توګه ورته وي
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
@@ -575,11 +570,10 @@
 DocType: Lab Test Template,Single,مجرد
 DocType: Salary Slip,Total Loan Repayment,ټول پور بيرته ورکول
 DocType: Account,Cost of Goods Sold,د اجناسو د لګښت پلورل
-DocType: Subscription,Yearly,کلنی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
 DocType: Drug Prescription,Dosage,ډوډۍ
 DocType: Journal Entry Account,Sales Order,خرڅلاو نظم
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. د پلورلو نرخ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. د پلورلو نرخ
 DocType: Assessment Plan,Examiner Name,Examiner نوم
 DocType: Lab Test Template,No Result,نه د پايلو
 DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
@@ -588,6 +582,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,مهرباني وکړئ د شرکت نوم د لومړي ننوځي
 DocType: Purchase Invoice,Supplier Name,عرضه کوونکي نوم
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,د ERPNext لارښود ادامه
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,د ټولو څانګو د غړو پاڼي په Calendar کې ښکاره کړئ
 DocType: Purchase Invoice,01-Sales Return,د پلور پلورنې 01
 DocType: Account,Is Group,دی ګروپ
 DocType: Email Digest,Pending Purchase Orders,رانيول امر په تمه
@@ -605,13 +600,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} د {2} {3} سره تړاو نلري.
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,د مقدماتي متن چې د دغې ایمیل يوې برخې په توګه ځي دتنظيمولو. هر معامله جلا مقدماتي متن لري.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},د کار امر بندولو لپاره د لیږد اجازه نه ورکول کیږي {0}
 DocType: Setup Progress Action,Min Doc Count,د کانونو شمیرنه
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,د ټولو د توليد د پروسې Global امستنې.
 DocType: Accounts Settings,Accounts Frozen Upto,جوړوي ګنګل ترمړوندونو پورې
 DocType: SMS Log,Sent On,ته وليږدول د
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
@@ -634,8 +629,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,خرڅلاو لپاره خوندي دي
 DocType: Packing Slip,From Package No.,له مجموعې شمیره
 DocType: Item Attribute,To Range,ته Range
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,امنيت او د سپما
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
 DocType: Student Report Generation Tool,Attended by Parents,د والدینو لخوا تمرکز
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Patient,AB Positive,AB مثبت دی
@@ -644,7 +639,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,د حاضرۍ ریکارډ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,د timesheet پر بنسټ د معاشونو د معاش برخه.
 DocType: Sales Order Item,Used for Production Plan,د تولید پلان لپاره کارول کيږي
-DocType: Employee Loan,Total Payment,ټول تاديه
+DocType: Loan,Total Payment,ټول تاديه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,د بشپړ کار د نظم لپاره لیږد رد نه شي کولی.
 DocType: Manufacturing Settings,Time Between Operations (in mins),د وخت عملیاتو تر منځ (په دقیقه)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} د {1} ده لغوه نو د عمل نه بشپړ شي
@@ -660,16 +655,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,لست د خپل پېرېدونکي يو څو. هغوی کولی شي، سازمانونو یا وګړو.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس برخي د جوړولو
 DocType: POS Profile User,POS Profile User,د پی ایس پی پی ایل کارن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,مستقيم عايداتو
+DocType: Subscription Invoice,Subscription Invoice,د ګډون تفتیش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,مستقيم عايداتو
 DocType: Patient Appointment,Date TIme,نیټه او وخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,اداري مامور
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,اداري مامور
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,د شرکت او مالیاتو ترتیب کول
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
 DocType: Codification Table,Codification Table,د کوډیزشن جدول
 DocType: Timesheet Detail,Hrs,بجو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,مهرباني وکړئ د شرکت وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,مهرباني وکړئ د شرکت وټاکئ
 DocType: Stock Entry Detail,Difference Account,توپير اکانټ
 DocType: Purchase Invoice,Supplier GSTIN,عرضه GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
@@ -695,6 +691,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,د نغدو فلو نقشه اخیستنې ټکي
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
 DocType: Journal Entry,Difference (Dr - Cr),توپير (ډاکټر - CR)
+DocType: Bank Guarantee,Providing,چمتو کول
 DocType: Account,Profit and Loss,ګټه او زیان
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",اجازه نشته، د لابراتوار ټکي سمبول چې اړتیا وي
 DocType: Patient,Risk Factors,د خطر فکتورونه
@@ -726,7 +723,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,عرضه صورتحساب نه
 DocType: Territory,For reference,د ماخذ
 DocType: Healthcare Settings,Appointment Confirmation,د تایید تصدیق
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",ړنګ نه شي کولای شعبه {0}، لکه څنګه چې په سټاک معاملو کارول
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",ړنګ نه شي کولای شعبه {0}، لکه څنګه چې په سټاک معاملو کارول
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),تړل د (سي آر)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,سلام
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,خوځول د قالب
@@ -751,11 +748,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",مخکې له دې چې د کارن {1} لپاره پۀ پروفايل کې {0} ډیزاین وټاکئ، مهربانۍ په سم ډول بې معیوب شوی
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,د مالي / جوړوي کال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع ارزښتونه
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",بښنه غواړو، سریال وځيري نه مدغم شي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",بښنه غواړو، سریال وځيري نه مدغم شي
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,علاقه د POS پروفیور ته اړتیا ده
 DocType: Supplier,Prevent RFQs,د آر ایف پی څخه مخنیوی وکړئ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},د معاش معاش چې د {1} څخه تر {1} پورې مودې لپاره وسپارل شو
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},د معاش معاش چې د {1} څخه تر {1} پورې مودې لپاره وسپارل شو
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
@@ -776,8 +773,9 @@
 DocType: Sales Invoice,Shipping Bill Date,د تیلو لیږد نیټه
 DocType: Production Plan,Production Plan,د تولید پلان
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,د انوائس د جوړولو وسیله پرانیزي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,خرڅلاو Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوټ: ټولې اختصاص پاڼي {0} بايد نه مخکې تصویب پاڼو څخه کم وي {1} د مودې لپاره
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,د سیریل نمبر انټرنیټ پر بنسټ د راکړې ورکړې مقدار ټاکئ
 ,Total Stock Summary,Total سټاک لنډيز
 DocType: Announcement,Posted By,خپرندوی
 DocType: Item,Delivered by Supplier (Drop Ship),تحویلوونکی له خوا عرضه (لاسرسئ کښتۍ)
@@ -788,7 +786,7 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,مهرباني وکړئ د شرکت جوړ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,مهرباني وکړئ د شرکت جوړ
@@ -796,8 +794,8 @@
 DocType: Purchase Order Item,Billed Amt,د بلونو د نننیو
 DocType: Training Result Employee,Training Result Employee,د روزنې د پايلو د کارګر
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,يو منطقي ګدام چې پر وړاندې د سټاک زياتونې دي.
-DocType: Repayment Schedule,Principal Amount,د مدیر مقدار
-DocType: Employee Loan Application,Total Payable Interest,ټول د راتلوونکې په زړه پوری
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,د مدیر مقدار
+DocType: Loan Application,Total Payable Interest,ټول د راتلوونکې په زړه پوری
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ټول ټاکل شوي: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,خرڅلاو صورتحساب Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
@@ -806,10 +804,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
 DocType: Restaurant Reservation,Restaurant Reservation,د رستورانت ساتنه
 DocType: Land Unit,Land Unit Name,د ځمکې واحد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,د پروپوزل ليکلو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,پورته کول
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,پیرودونکي د بریښنالیک له لارې خبرتیاوي
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,پیرودونکي د بریښنالیک له لارې خبرتیاوي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,بل خرڅلاو کس {0} د همدې کارکوونکی پېژند شتون لري
 DocType: Employee Advance,Claimed Amount,ادعا شوې پیسې
 apps/erpnext/erpnext/config/education.py +180,Masters,بادارانو
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
 DocType: Supplier Scorecard,Per Year,په کال کې
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,په دې پروګرام کې د داخلیدو لپاره د DOB مطابق
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 DocType: Sales Invoice,Sales Taxes and Charges,خرڅلاو مالیات او په تور
 DocType: Employee,Organization Profile,اداره پېژندنه
 DocType: Vital Signs,Height (In Meter),لوړې کچې (په مترۍ کې)
 DocType: Student,Sibling Details,ورونړه نورولوله
 DocType: Vehicle Service,Vehicle Service,موټر خدمتونه
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,په خپلکارې توګه د پر بنسټ د شرايطو نظر غوښتنه اچول کیږي.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,په خپلکارې توګه د پر بنسټ د شرايطو نظر غوښتنه اچول کیږي.
 DocType: Employee,Reason for Resignation,د استعفا دليل
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,د نتائجو د کينډۍ.
 DocType: Sales Invoice,Credit Note Issued,اعتبار يادونه خپور شوی
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,د ساتنې او مهال ويش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",بيا د بیې اصول دي فلتر څخه پر بنسټ د پيرودونکو، پيرودونکو ګروپ، خاوره، عرضه، عرضه ډول، د کمپاین، خرڅلاو همکار او نور
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,په موجودي خالص د بدلون
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,د کارګر د پور د مدیریت
 DocType: Employee,Passport Number,د پاسپورټ ګڼه
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,سره د اړیکو Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,مدير
 DocType: Payment Entry,Payment From / To,د پیسو له / د
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},مهرباني وکړئ په ګودام کې حساب ورکړئ {0}
@@ -894,24 +890,24 @@
 DocType: Item,Material Transfer,د توکو لېږدونه د
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,د پاره لاره ونه موندل شوه
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),د پرانستلو په (ډاکټر)
+DocType: Loan,Applicant,غوښتنلیک ورکوونکی
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},نوکرې timestamp باید وروسته وي {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,د بیاکتنې اسناد چمتو کولو لپاره
 ,GST Itemised Purchase Register,GST مشخص کړل رانيول د نوم ثبتول
 DocType: Course Scheduling Tool,Reschedule,بیا پیل کړئ
-DocType: Employee Loan,Total Interest Payable,ټولې ګټې د راتلوونکې
+DocType: Loan,Total Interest Payable,ټولې ګټې د راتلوونکې
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,تيرماښام لګښت مالیات او په تور
 DocType: Work Order Operation,Actual Start Time,واقعي د پیل وخت
 DocType: BOM Operation,Operation Time,د وخت د عملياتو
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,فنلند
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,اډه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,اډه
 DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,مقدار ولیکئ پړاو
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,مقدار ولیکئ پړاو
 DocType: Leave Block List Allow,Allow User,کارن اجازه
 DocType: Journal Entry,Bill No,بیل نه
 DocType: Company,Gain/Loss Account on Asset Disposal,د شتمنيو د برطرف ګټې / زیان اکانټ
 DocType: Vehicle Log,Service Details,خدمتونو نورولوله
 DocType: Vehicle Log,Service Details,خدمتونو نورولوله
-DocType: Subscription,Quarterly,درې میاشتنی
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,ګروپ شوی
 DocType: Selling Settings,Delivery Note Required,د سپارنې پرمهال يادونه اړينه ده
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,د وخت پاڼه
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مواد پر بنسټ
 DocType: Sales Invoice,Port Code,پورت کوډ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,د ریزرو ګودام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,د ریزرو ګودام
 DocType: Lead,Lead is an Organization,رهبري سازمان دی
 DocType: Guardian Interest,Interest,په زړه پوري
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,مخکې خرڅلاو
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,حسابونه
 DocType: Vehicle,Odometer Value (Last),Odometer ارزښت (په تېره)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,د عرضه کوونکي د سکورډ معیار معیارونه.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,بازار موندنه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,بازار موندنه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,د پیسو د داخلولو د مخکې نه جوړ
 DocType: Request for Quotation,Get Suppliers,سپلائر ترلاسه کړئ
 DocType: Purchase Receipt Item Supplied,Current Stock,اوسني دحمل
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,د مخکتنې معاش ټوټه
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,د مخکتنې معاش ټوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,تاسو کولی شئ یواځې نوی توب وکړئ که ستاسو غړیتوب په 30 ورځو کې پای ته ورسیږي
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,یوازې یواځې انتخاب کړئ که تاسو د نغدو پیسو نقشې اسناد چمتو کړئ که نه
 DocType: Email Digest,Next email will be sent on:,بل برېښليک به واستول شي په:
 DocType: Supplier Scorecard,Per Week,په اونۍ کې
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,د قالب د بېرغونو لري.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ټول زده کونکي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,د قالب {0} ونه موندل شو
 DocType: Bin,Stock Value,دحمل ارزښت
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],فیکیر des Ecritures لنډیزونه [FEC]
 DocType: Journal Entry,Credit Card Entry,کریډیټ کارټ انفاذ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,شرکت او حسابونه
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,په ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,په ارزښت
 DocType: Asset Settings,Depreciation Options,د استهالک انتخابونه
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,د پوستې ناسم وخت
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,د پوستې ناسم وخت
 DocType: Lead,Campaign Name,د کمپاین نوم
 DocType: Hotel Room,Capacity,وړتیا
 DocType: Selling Settings,Close Opportunity After Days,بندول فرصت ورځې وروسته
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,پيرودونکو د اخستلو امر نه
 DocType: Budget,Budget Against,د بودجې پر وړاندې د
 DocType: Employee,Cell Number,ګرځنده شمیره
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,د ورکړل شوي معیارونو لپاره هیڅ کارمند نشته. وګورۍ چې د معاش سلپسونه لا دمخه ندي رامینځته شوي.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,د ورکړل شوي معیارونو لپاره هیڅ کارمند نشته. وګورۍ چې د معاش سلپسونه لا دمخه ندي رامینځته شوي.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,د موټرونو د موادو غوښتنه تولید شوی
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,له لاسه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون &#39;پر وړاندې د ژورنال انفاذ&#39; کالم ننوځي
@@ -1012,13 +1008,14 @@
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,مهرباني وکړئ یو میز انتخاب کړئ
 DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
 DocType: Special Test Items,Particulars,درسونه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: د {0} د ډول {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: د {0} د ډول {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",څو د بیو د اصول سره ورته معیارونه شتون، لطفا له خوا لومړیتوب وګومارل شخړې حل کړي. بيه اصول: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
 DocType: Asset,Maintenance,د ساتنې او
+DocType: Subscriber,Subscriber,ګډون کوونکي
 DocType: Item Attribute Value,Item Attribute Value,د قالب ځانتیا ارزښت
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,مهرباني وکړئ خپل د پروژې حالت تازه کړئ
 DocType: Item,Maximum sample quantity that can be retained,د نمونې خورا مهم مقدار چې ساتل کیدی شي
@@ -1056,25 +1053,25 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,کولر په ګاډۍ تلواله امستنو
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,مهال ویشونه زیات کړئ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},د شتمنیو د پرزه ژورنال انفاذ له لارې د {0}
-DocType: Employee Loan,Interest Income Account,په زړه د عوايدو د حساب
+DocType: Loan,Interest Income Account,په زړه د عوايدو د حساب
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,د دعوت کولو لیږل بیاکتنه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,د ټېکنالوجۍ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,دفتر د ترمیم لګښتونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,دفتر د ترمیم لګښتونه
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ورتګ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ترتیبول بريښناليک حساب
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,مهرباني وکړئ لومړی د قالب ته ننوځي
 DocType: Asset Repair,Downtime,رخصتۍ
 DocType: Account,Liability,Liability
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,اکادمیک اصطلاح:
 DocType: Salary Detail,Do not include in total,په مجموع کې شامل نه کړئ
 DocType: Company,Default Cost of Goods Sold Account,د حساب د پلورل شوو اجناسو Default لګښت
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 DocType: Request for Quotation Supplier,Send Email,برېښنا لیک ولېږه
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
 DocType: Item,Max Sample Quantity,د مکس نمونې مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,نه د اجازې د
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,نه د اجازې د
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,غوښتل شوی غوښتنه
 DocType: Vital Signs,Heart Rate / Pulse,د زړه درجه / پلس
 DocType: Company,Default Bank Account,Default بانک حساب
@@ -1085,12 +1082,11 @@
 DocType: Item,Items with higher weightage will be shown higher,سره د لوړو weightage توکي به د لوړو ښودل شي
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,د لابراتوار آزموینې او حیاتي نښانې
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بانک پخلاينې تفصیلي
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,هیڅ یو کارمند وموندل شول
-DocType: Subscription,Stopped,ودرول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,د پروژې تازه حال.
 DocType: SMS Center,All Customer Contact,ټول پيرودونکو سره اړيکي
 DocType: Land Unit,Tree Details,د ونو په بشپړه توګه کتل
@@ -1140,7 +1136,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ټول د قالب ډلې
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
 DocType: Work Order,Item To Manufacture,د قالب تولید
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,کامپلیټ
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} د {1} حالت دی {2}
@@ -1154,7 +1149,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",بې ځایه کړئ، که چیرې غوره شوي پتې د خوندي کولو وروسته سمبال شي
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
 DocType: Item,Hub Publishing Details,د هوب د خپرولو توضیحات
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;پرانیستل&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
 DocType: Lab Test Template,Result Format,د پایلو فارم
@@ -1164,7 +1159,7 @@
 DocType: Payroll Entry,Bimonthly,د جلسو
 DocType: Vehicle Service,Brake Pad,لنت ترمز Pad
 DocType: Fertilizer,Fertilizer Contents,د سرې وړ توکي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,د څیړنې او پراختیا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,د څیړنې او پراختیا
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ته بیل اندازه
 DocType: Company,Registration Details,د نوم ليکنې په بشپړه توګه کتل
 DocType: Timesheet,Total Billed Amount,Total محاسبې ته مقدار
@@ -1178,7 +1173,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,د پلور په حکم کې د کریډیټ محدودیت چک وګورئ
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,د اجرآتو ارزونه.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
 DocType: Sales Invoice Item,Stock Details,دحمل په بشپړه توګه کتل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,د پروژې د ارزښت
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-خرڅول
@@ -1212,7 +1207,7 @@
 DocType: Restaurant Table,Minimum Seating,لږ تر لږه څوکۍ
 DocType: Item Attribute,Item Attribute Values,د قالب ځانتیا ارزښتونه
 DocType: Examination Result,Examination Result,د ازموینې د پایلو د
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,رانيول رسيد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,رانيول رسيد
 ,Received Items To Be Billed,ترلاسه توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,د اسعارو د تبادلې نرخ د بادار.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
@@ -1220,15 +1215,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
 DocType: Work Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,هیښ {0} بايد فعال وي
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,د لیږد لپاره کوم توکي شتون نلري
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,هیښ {0} بايد فعال وي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,د لیږد لپاره کوم توکي شتون نلري
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),تړل (کلینګ + ټول)
 DocType: Journal Entry,Depreciation Entry,د استهالک د داخلولو
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,مهرباني وکړئ لومړی انتخاب سند ډول
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغوه مواد ليدنه {0} بندول د دې د ساتنې سفر مخکې
 DocType: Crop Cycle,ISO 8016 standard,د ISO 8016 معیارونه
 DocType: Pricing Rule,Rate or Discount,اندازه یا رخصتۍ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,خوښې
 DocType: Hub Settings,Custom Data,دودیز ډاټا
@@ -1239,9 +1234,9 @@
 DocType: Medical Code,Medical Code Standard,د طبی کوډ معیار
 DocType: Soil Texture,Clay Composition (%),د مڼې جوړښت (٪)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,مهرباني وکړئ مخکې له دې چې دنده وټاکئ خوندي وساتئ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,توازن ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,توازن ارزښت
 DocType: Lab Test,Lab Technician,د لابراتوار تخنیکین
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,د پلورنې د بیې لېست
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,د پلورنې د بیې لېست
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",که چیرته چک شوی وي، یو پېرودونکی به جوړ شي، ناروغ ته نقشه شوی. د دې پیرود په وړاندې به د ناروغۍ انوګانې جوړ شي. تاسو کولی شئ د ناروغ پیدا کولو پر مهال موجوده پیرود هم وټاکئ.
 DocType: Bank Reconciliation,Account Currency,حساب د اسعارو
@@ -1249,16 +1244,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,لطفا په شرکت ذکر پړاو پړاو په حساب
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
 DocType: Item Barcode,Item Barcode,د توکو بارکوډ
 DocType: Woocommerce Settings,Endpoints,د پای ټکی
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,د قالب تانبه {0} تازه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",تولید شي. که ځنډ کیږي، تاسو باید په دستي توګه د &quot;میاشتې په ورځ تکرار&quot; بدل کړئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
 DocType: Share Transfer,From Folio No,له فولولو نه
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,پیري صورتحساب پرمختللی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
@@ -1293,16 +1286,17 @@
 DocType: Asset,Available-for-use Date,د کارولو لپاره نیټه
 DocType: Guardian,Guardian Name,ګارډین نوم
 DocType: Cheque Print Template,Has Print Format,لري چاپ شکل
-DocType: Employee Loan,Sanctioned,تحریم
+DocType: Loan,Sanctioned,تحریم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه ده لپاره جوړ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
 DocType: Crop Cycle,Crop Cycle,د کرهنې سائیکل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",لپاره &#39;د محصول د بنډل په&#39; توکي، ګدام، شعبه او دسته نه به د &#39;پروپیلن لیست جدول کې له پام کې ونیول شي. که ګدام او دسته هيڅ لپاره د هر &#39;د محصول د بنډل په&#39; توکی د ټولو بسته بنديو توکو يو شان دي، د هغو ارزښتونو په اصلي شمیره جدول داخل شي، ارزښتونو به کاپي شي چې د &#39;پروپیلن لیست جدول.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",لپاره &#39;د محصول د بنډل په&#39; توکي، ګدام، شعبه او دسته نه به د &#39;پروپیلن لیست جدول کې له پام کې ونیول شي. که ګدام او دسته هيڅ لپاره د هر &#39;د محصول د بنډل په&#39; توکی د ټولو بسته بنديو توکو يو شان دي، د هغو ارزښتونو په اصلي شمیره جدول داخل شي، ارزښتونو به کاپي شي چې د &#39;پروپیلن لیست جدول.
 DocType: Student Admission,Publish on website,په ويب پاڼه د خپرېدو
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
+DocType: Subscription,Cancelation Date,د تایید نیټه
 DocType: Purchase Invoice Item,Purchase Order Item,نظم د قالب پیري
 DocType: Agriculture Task,Agriculture Task,کرهنیز ټیم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,نامستقیم عايداتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,نامستقیم عايداتو
 DocType: Student Attendance Tool,Student Attendance Tool,د زده کوونکو د حاضرۍ اوزار
 DocType: Restaurant Menu,Price List (Auto created),د بیې لیست (آٹو جوړ شوی)
 DocType: Cheque Print Template,Date Settings,نېټه امستنې
@@ -1329,6 +1323,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,متره
 DocType: Workstation,Electricity Cost,د بريښنا د لګښت
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,د لابراتوار ازموینه د وخت څخه د راټولولو دمخه نشي کیدی
+DocType: Subscription Plan,Cost,لګښت
 DocType: HR Settings,Don't send Employee Birthday Reminders,آيا د کارګر کالیزې په دوراني ډول نه استوي
 DocType: Expense Claim,Total Advance Amount,د ټولې پرمختیا مقدار
 DocType: Delivery Stop,Estimated Arrival,اټکل شوی رایی
@@ -1340,15 +1335,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
 DocType: Timesheet Detail,Bill,بیل
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,سپین
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,سپین
 DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,تاسو کولی شئ یواځې د چک بکسونو لیست څخه د ډیزاین انتخاب انتخاب وکړئ.
 DocType: Purchase Invoice,Get Advances Paid,ترلاسه کړئ پرمختګونه ورکړل
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} ته {1} وټاکئ (قطار {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,د کمکیانو لپاره د
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} ته {1} وټاکئ (قطار {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,د کمکیانو لپاره د
 DocType: Student Admission,Admission Start Date,د شاملیدو د پیل نیټه
 DocType: Journal Entry,Total Amount in Words,په وييکي Total مقدار
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,نوی کارمند
@@ -1364,7 +1359,7 @@
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 DocType: Repayment Schedule,Balance Loan Amount,د توازن د پور مقدار
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,مهال ويش کورس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,دحمل غوراوي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,دحمل غوراوي
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,د اخیستو وړ کول د اخستنې د اخري وروستیو پیرود تفصیلات
 DocType: Journal Entry Account,Expense Claim,اخراجاتو ادعا
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
@@ -1383,11 +1378,12 @@
 DocType: Packing Slip Item,Packing Slip Item,بسته بنديو ټوټه د قالب
 DocType: Purchase Invoice,Cash/Bank Account,د نغدو پيسو / بانک حساب
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},مهرباني وکړئ مشخص یو {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,د ويیرټ جوړول په ليکه کې ليکل شوی.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},د {0} لپاره کاري کاري لنډیز
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ځانتیا جدول الزامی دی
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,په لیست کې د لومړي کنوانسیون وړاندیز به د Default Default Leave Approver په توګه وټاکل شي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Plan,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} کېدای شي منفي نه وي
 DocType: Training Event,Self-Study,د ځان سره مطالعه
@@ -1400,7 +1396,7 @@
 DocType: Workstation,Wages,د معاشونو
 DocType: Asset Maintenance,Maintenance Manager Name,د ترمیم مدیر نوم
 DocType: Agriculture Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},مهرباني وکړئ مشخص لپاره چي په کتارونو {0} په جدول کې یو باوري د کتارونو تر تذکرو د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},مهرباني وکړئ مشخص لپاره چي په کتارونو {0} په جدول کې یو باوري د کتارونو تر تذکرو د {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,د متغیر موندلو توان نلري:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,مهرباني وکړئ د نمپاد څخه د سمون لپاره یو ډګر وټاکئ
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,د سایټ لیجر پیدا کیږي لکه څنګه چې ثابت شوي شتمنۍ نشي کیدی.
@@ -1412,7 +1408,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,د کیفیت تفتیش چوکاټ
 DocType: Project,First Email,لومړی برېښلیک
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,په خرڅلاو نظم / د بشپړو شویو جنسونو ګدام خوندي دي ګدام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,پلورل مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,پلورل مقدار
 DocType: Repayment Schedule,Interest Amount,په زړه مقدار
 DocType: Serial No,Creation Document No,خلقت Document No
 DocType: Share Transfer,Issue,Issue
@@ -1426,10 +1422,10 @@
 DocType: Tax Rule,Shipping State,انتقال د بهرنیو چارو
 ,Projected Quantity as Source,وړاندوینی مقدار په توګه سرچینه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,د لېږد سفر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,د لېږد سفر
 DocType: Student,A-,خبرتیاوي
 DocType: Share Transfer,Transfer Type,د لېږد ډول
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,خرڅلاو داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,خرڅلاو داخراجاتو
 DocType: Consultation,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,معياري خريداري
 DocType: GL Entry,Against,په وړاندې
@@ -1443,7 +1439,7 @@
 DocType: Packing Slip,Net Weight UOM,خالص وزن UOM
 DocType: Item,Default Supplier,default عرضه
 DocType: Manufacturing Settings,Over Production Allowance Percentage,تولید امتياز سلنه
-DocType: Employee Loan,Repayment Schedule,بیرته ورکړې مهالویش
+DocType: Loan,Repayment Schedule,بیرته ورکړې مهالویش
 DocType: Shipping Rule Condition,Shipping Rule Condition,انتقال حاکمیت حالت
 DocType: Holiday List,Get Weekly Off Dates,د اونۍ پړاو نیټی ترلاسه کړئ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,د پای نیټه نه شي کولای په پرتله د پیل نیټه کمه وي
@@ -1458,7 +1454,7 @@
 DocType: Education Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
 DocType: Education Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,لست ستاسو د عرضه کوونکو د څو. هغوی کولی شي، سازمانونو یا وګړو.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ښکاره ټول محصولات د
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,ښکاره ټول محصولات د
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,ټول BOMs
@@ -1467,14 +1463,16 @@
 DocType: Expense Claim,From Employee,له کارګر
 DocType: Driver,Cellphone Number,د ګرڅنده ټیلیفون شمېره
 DocType: Project,Monitor Progress,پرمختګ څارنه
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
 DocType: Journal Entry,Make Difference Entry,بدلون د داخلولو د کمکیانو لپاره
+DocType: Supplier Quotation,Auto Repeat Section,د اتوماتیک برخې برخه
 DocType: Upload Attendance,Attendance From Date,د حاضرۍ له نېټه
 DocType: Appraisal Template Goal,Key Performance Area,د اجراآتو مهم Area
 DocType: Program Enrollment,Transportation,د ترانسپورت
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,ناباوره ځانتیا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
+DocType: Department Approver,Department Approver,د څانګې موقعیت
 DocType: SMS Center,Total Characters,Total خویونه
 DocType: Employee Advance,Claimed,ادعا شوې
 DocType: Crop,Row Spacing,د قطار فاصله
@@ -1484,6 +1482,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,قطعا د پخلاينې د صورتحساب
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,بسپنه٪
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",لکه څنګه چې هر د خريداري امستنې که د اخستلو امر مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید د اخستلو امر لومړي لپاره توکی جوړ {0}
+,HSN-wise-summary of outward supplies,د بهرنی تجهیزاتو HSN-wise- لنډیز
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ستاسو د مرجع شرکت ليکنې د کارت شمېرې. د مالياتو د شمېر او نور
 DocType: Sales Partner,Distributor,ویشونکی-
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خرید په ګاډۍ نقل حاکمیت
@@ -1497,7 +1496,7 @@
 DocType: Setup Progress Action,Action Name,د عمل نوم
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,بیا کال
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},د GSTIN لومړی 2 ګڼې باید سره د بهرنیو چارو شمېر سمون {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,بیا د روان صورتحساب د مودې نېټه
 DocType: Salary Slip,Leave Without Pay,پرته له معاشونو څخه ووځي
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
@@ -1515,25 +1514,25 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ساحې به یوازې د جوړونې په وخت کې کاپي شي.
 DocType: Setup Progress Action,Domains,Domains
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','واقعي د پیل نیټه ' نه شي پورته له 'واقعي د پای نیټه' څخه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,مدیریت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,مدیریت
 DocType: Cheque Print Template,Payer Settings,د ورکوونکي امستنې
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی &quot;SM&quot;، او د توکي کوډ دی &quot;T-کميس&quot;، د variant توکی کوډ به &quot;T-کميس-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
 DocType: Purchase Invoice,Is Return,آیا بیرته
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,احتیاط
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,بیرته / ګزارې يادونه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,بیرته / ګزارې يادونه
 DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,د قالب قانون د سریال شمیره بدلون نه شي کولای
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,د قالب قانون د سریال شمیره بدلون نه شي کولای
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM د تغیر فکتور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
-DocType: Employee Loan,Partially Disbursed,په نسبی ډول مصرف
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,د مرستې معلومات.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,د مرستې معلومات.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,عرضه ډیټابیس.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,تاسو نشي کولی هغه یو بل ریکارډ بیا پیل کړئ چې رد شوی نه وي.
 DocType: Account,Balance Sheet,توازن پاڼه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
 DocType: Fee Validity,Valid Till,دقیقه
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,د والدینو ټول ټیم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
@@ -1546,7 +1545,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,د ټاکل شوي پیرودونکو لپاره د پیرودونکي ګروپ بدلول اجازه نه لري.
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,د رسیدلو اټکل وخت.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,د رسیدلو اټکل وخت.
 DocType: Program Enrollment Tool,Enrollment Details,د نومونې تفصیلات
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,مهرباني وکړئ یو پیرود غوره کړئ
@@ -1566,18 +1565,20 @@
 DocType: Global Defaults,Current Fiscal Year,روان مالي کال
 DocType: Purchase Order,Group same items,ګروپ ورته توکي
 DocType: Purchase Invoice,Disable Rounded Total,نافعال مونډ Total
-DocType: Employee Loan Application,Repayment Info,دبيرته پيژندنه
+DocType: Department,Parent Department,د والدین څانګه
+DocType: Loan Application,Repayment Info,دبيرته پيژندنه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
 DocType: Maintenance Team Member,Maintenance Role,د ساتنې رول
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
 ,Trial Balance,د محاکمې بیلانس
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,مامورین ترتیبول
 DocType: Sales Order,SO-,اصطالح
 DocType: Hotel Room Reservation,Hotel Reservation User,د هوټل رژیم کارن
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
 DocType: Student,O-,فرنګ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,د څیړنې
+DocType: Subscription Settings,Subscription Settings,د ګډون ترتیبونه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,د څیړنې
 DocType: Maintenance Visit Purpose,Work Done,کار وشو
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,مهرباني وکړی په صفات جدول کې لږ تر لږه يو د خاصه مشخص
 DocType: Announcement,All Students,ټول زده کوونکي
@@ -1588,19 +1589,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
 DocType: Crop Cycle,Less than a year,له یو کال څخه کم
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,د زده کوونکو د موبايل په شمیره
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,د نړۍ پاتې
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,د نړۍ پاتې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
 DocType: Crop,Yield UOM,د UOM ساتنه
 ,Budget Variance Report,د بودجې د توپیر راپور
 DocType: Salary Slip,Gross Pay,Gross د معاشونو
 DocType: Item,Is Item from Hub,د هب څخه توکي دي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,د کتارونو تر {0}: فعالیت ډول فرض ده.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,د سهم ورکړل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,د سهم ورکړل
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,د محاسبې د پنډو
 DocType: Stock Reconciliation,Difference Amount,توپیر رقم
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {2} په Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,بیرته راوړل شوي چارج
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,ساتل شوې ګټه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,ساتل شوې ګټه
 DocType: Purchase Invoice,05-Change in POS,05 - په POS کې بدلون
 DocType: Vehicle Log,Service Detail,د خدماتو تفصیلي
 DocType: BOM,Item Description,د قالب Description
@@ -1614,12 +1615,12 @@
 DocType: Opportunity Item,Opportunity Item,فرصت د قالب
 ,Student and Guardian Contact Details,د زده کوونکو او د ګارډین د اړیکې جزئیات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,د کتارونو تر {0}: د عرضه {0} دبرېښنا ليک پته ته اړتيا ده چې د برېښناليک واستوي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,لنډمهاله پرانیستل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,لنډمهاله پرانیستل
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,حب وګوره
 ,Employee Leave Balance,د کارګر اجازه بیلانس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},د حساب انډول {0} بايد تل وي {1}
 DocType: Patient Appointment,More Info,نور معلومات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {0}
 DocType: Supplier Scorecard,Scorecard Actions,د کوډ کارډ کړنې
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,مثال په توګه: په کمپیوټر ساینس د ماسټرۍ
 DocType: Purchase Invoice,Rejected Warehouse,رد ګدام
@@ -1629,7 +1630,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ته
 DocType: Supplier Quotation Item,Lead Time in days,په ورځو په غاړه وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,حسابونه د راتلوونکې لنډيز
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
 DocType: Journal Entry,Get Outstanding Invoices,يو وتلي صورتحساب ترلاسه کړئ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
@@ -1638,9 +1639,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,د لابراتوار ازموینه
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,د کوچنیو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,د کوچنیو
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,د انوائس د جوړولو وسیله توکي پرانیزي
 DocType: Education Settings,Employee Number,د کارګر شمېر
+DocType: Subscription Settings,Cancel Invoice After Grace Period,د ګرمې دورې وروسته انوائس فسخه کړئ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case (ونه) نشته د مخه په استعمال. له Case هیڅ هڅه {0}
 DocType: Project,% Completed,٪ بشپړ شوي
 ,Invoiced Amount (Exculsive Tax),د رسیدونو مقدار (Exculsive د مالياتو)
@@ -1654,7 +1656,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,د لابراتواري آزموینی ازموینه
 DocType: Email Digest,Add Quote,Add بیه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion عامل لپاره UOM ضروري دي: {0} په شمیره: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,غیر مستقیم مصارف
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,غیر مستقیم مصارف
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
 DocType: Agriculture Analysis Criteria,Agriculture,د کرنې
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,پرانیځئ ماسټر معلوماتو
@@ -1684,16 +1686,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,پلازمیینه تجهیزاتو
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,پلازمیینه تجهیزاتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,مهرباني وکړئ لومړی د کوډ کوډ ولیکئ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
+DocType: Subscription Plan,Billing Interval Count,د بلې درجې د شمېرنې شمېره
 DocType: Sales Invoice Item,Edit Description,سمول Description
 DocType: Antibiotic,Antibiotic,انټي بيوټيټ
 ,Team Updates,ټيم اوسمهالونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,د عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,د عرضه
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,د خوښو حساب ډول په معاملو دې حساب په ټاکلو کې مرسته کوي.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,چاپ شکل جوړول
@@ -1718,7 +1721,7 @@
 DocType: POS Item Group,POS Item Group,POS د قالب ګروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,بدیل توکي باید د شونې کوډ په څیر نه وي
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
 DocType: Sales Partner,Target Distribution,د هدف د ویش
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - د انتقالي ارزونې ارزونه
 DocType: Salary Slip,Bank Account No.,بانکي حساب شمیره
@@ -1735,7 +1738,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,لپاره د داوطلبۍ عرضه غوښتنه
 DocType: Healthcare Settings,Registration Message,د نوم ليکنې پیغام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,هډوتري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,هډوتري
 DocType: Prescription Dosage,Prescription Dosage,نسخه ډوز
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,لطفا یو شرکت غوره
@@ -1766,7 +1769,7 @@
 DocType: Project,Start and End Dates,بیا او نیټی پای
 ,Delivered Items To Be Billed,تحویلوونکی توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},د پرانیستې هیښ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ګدام د سریال شمیره بدلون نه شي کولای
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,ګدام د سریال شمیره بدلون نه شي کولای
 DocType: Authorization Rule,Average Discount,په اوسط ډول کمښت
 DocType: Project Update,Great/Quickly,لوی / ژر
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1775,8 +1778,8 @@
 DocType: Employee,EMP/,د چاپېريال د /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,لطفا د يووړل توکی دستو انتخاب
 DocType: Asset,Depreciation Schedules,د استهالک ویش
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,لاندې حسابونه کیدای شي د GST په ترتیباتو کې وټاکل شي:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,لاندې حسابونه کیدای شي د GST په ترتیباتو کې وټاکل شي:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي
 DocType: Activity Cost,Projects,د پروژو
 DocType: Payment Request,Transaction Currency,د راکړې ورکړې د اسعارو
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},څخه د {0} | {1} {2}
@@ -1787,6 +1790,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg دورځني باورلیک
 DocType: POS Profile,Campaign,د کمپاین
 DocType: Supplier,Name and Type,نوم او ډول
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
 DocType: Physician,Contacts and Address,اړیکې او پته
 DocType: Purchase Invoice,Contact Person,د اړیکې نفر
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;د تمی د پیل نیټه د&#39; نه وي زیات &#39;د تمی د پای نیټه&#39;
@@ -1800,19 +1804,20 @@
 DocType: Student Admission,Eligibility and Details,وړتیا او تفصیلات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,په ثابته شتمني خالص د بدلون
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالي پريږدئ که د ټولو هغو کارونو په پام کې
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},اعظمي: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,له Datetime
 DocType: Email Digest,For Company,د شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,د مخابراتو يادښت.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",لپاره د داوطلبۍ د غوښتنې له تانبه ته لاسرسی ناچارن شوی، د زياتو چک تانبه امستنې.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,د سپریري کرایه کارونې متغیر سکریټ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,د خريداري مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,د خريداري مقدار
 DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,د غلطۍ شتون شتون لري د کورس مهال ویش جوړول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,په لیست کې د لومړنۍ لګښتونو ارزونه به د اصلي لګښت لګښت په توګه وټاکل شي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
@@ -1833,14 +1838,15 @@
 DocType: Package Code,Package Code,بستې کوډ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,شاګرد
 DocType: Purchase Invoice,Company GSTIN,شرکت GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,منفي مقدار اجازه نه وي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,منفي مقدار اجازه نه وي
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",د مالياتو د تفصیل جدول توکی په توګه یو تار د بادار څخه راوړل شوی او په دې برخه کې ساتل کيږي. د مالیات او په تور لپاره کارول کيږي
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",که په پام کې ده کنګل، زياتونې پورې محدود کاروونکو اجازه لري.
 DocType: Email Digest,Bank Balance,بانک دبیلانس
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,د تګ اجازه غوښتنلیک کې د معلولینو پریښودل
 DocType: Job Opening,"Job profile, qualifications required etc.",دنده پېژنڅېر، وړتوبونه اړتیا او داسې نور
 DocType: Journal Entry Account,Account Balance,موجوده حساب
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,د معاملو د ماليې حاکمیت.
@@ -1868,15 +1874,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,په صف کې {0} د تادیاتو موده ممکن یو نقل وي.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),کرنه (بیٹا)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,بسته بنديو ټوټه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر کرایې
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر کرایې
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
 DocType: Disease,Common Name,عام نوم
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,د وارداتو کې ناکام شو!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,کومه پته نه زياته کړه تر اوسه.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation کاري قيامت
 DocType: Vital Signs,Blood Pressure,د وينې فشار
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,شنونکي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,شنونکي
 DocType: Item,Inventory,موجودي
 DocType: Item,Sales Details,د پلورنې په بشپړه توګه کتل
 DocType: Quality Inspection,QI-,QI-
@@ -1886,15 +1892,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,لپاره د زده کونکو د زده ګروپ اعتباري زده کورس
 DocType: Notification Control,Expense Claim Rejected,اخراجاتو ادعا رد کړه
 DocType: Item,Item Attribute,د قالب ځانتیا
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,د دولت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,د دولت
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,اخراجاتو ادعا {0} لپاره د وسایطو د ننوتنه مخکې نه شتون لري
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,د انستیتوت نوم
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,لطفا د قسط اندازه ولیکۍ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,لطفا د قسط اندازه ولیکۍ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,د قالب تانبه
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,خدمتونه
 DocType: HR Settings,Email Salary Slip to Employee,Email معاش د کارکونکو ټوټه
 DocType: Cost Center,Parent Cost Center,Parent لګښت مرکز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ممکنه عرضه وټاکئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ممکنه عرضه وټاکئ
 DocType: Sales Invoice,Source,سرچینه
 DocType: Customer,"Select, to make the customer searchable with these fields",غوره کړئ، د دې پېرېدونکو سره د پیرودونکي د موندلو وړ کولو لپاره
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,انکړپټه ښودل تړل
@@ -1911,7 +1917,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,بسته بنديو ټوټه (s) لغوه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,له پانګه اچونه نقدو پیسو د جریان
 DocType: Program Course,Program Course,د پروګرام د کورس
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,بار او استول په تور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,بار او استول په تور
 DocType: Homepage,Company Tagline for website homepage,د ویب پاڼه شرکت Tagline
 DocType: Item Group,Item Group Name,د قالب ډلې نوم
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,وړل
@@ -1941,10 +1947,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,د یادونې تفصیلات
 DocType: Leave Block List,Block Holidays on important days.,په مهمو ورځو د بنديز رخصتۍ.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),مهرباني وکړئ ټولې اړینې پایلې د ارزښت ارزښت
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,حسابونه ترلاسه لنډيز
-DocType: Employee Loan,Monthly Repayment Amount,میاشتنی پور بيرته مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,حسابونه ترلاسه لنډيز
+DocType: Loan,Monthly Repayment Amount,میاشتنی پور بيرته مقدار
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,د انوګانو پرانیستل
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
 DocType: UOM,UOM Name,UOM نوم
 DocType: GST HSN Code,HSN Code,HSN کوډ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,مرستې مقدار
@@ -1965,7 +1971,8 @@
 DocType: Purchase Receipt,Transporter Details,ته لېږدول، په بشپړه توګه کتل
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,بکس
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ممکنه عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ممکنه عرضه
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,میاشتنی ویش
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,د اخيستونکي بشپړفهرست تش دی. لطفا رامنځته اخيستونکي بشپړفهرست
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),روغتیایی پاملرنې (بیٹا)
@@ -1993,7 +2000,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,نه سامان ته واچوئ
 DocType: Shipping Rule Condition,From Value,له ارزښت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
-DocType: Employee Loan,Repayment Method,دبيرته طريقه
+DocType: Loan,Repayment Method,دبيرته طريقه
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",که وکتل، د کور مخ کې به د دغې ویب پاڼې د تلواله د قالب ګروپ وي
 DocType: Quality Inspection Reading,Reading 4,لوستلو 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,د شرکت د لګښت د ادعا.
@@ -2002,7 +2009,7 @@
 DocType: Asset Maintenance Task,Certificate Required,سند ضروري دی
 DocType: Company,Default Holiday List,افتراضي رخصتي بشپړفهرست
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},د کتارونو تر {0}: د وخت او د وخت د {1} له ده سره د تداخل {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,دحمل مسؤلیتونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,دحمل مسؤلیتونه
 DocType: Purchase Invoice,Supplier Warehouse,عرضه ګدام
 DocType: Opportunity,Contact Mobile No,د تماس د موبايل په هيڅ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,د شرکت غوره کول
@@ -2010,7 +2017,7 @@
 DocType: Student Report Generation Tool,Print Section,د چاپ برخه
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,کارن {0} نه لري د اصلي پی ایس پی پېژني. د دې کارن لپاره د {1} په صف کې اصلي ځای وګورئ.
 DocType: Student Group,Set 0 for no limit,جوړ 0 لپاره پرته، حدود نه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,صف {idx}: {field} اړین دی چې د پرانیستلو {invoice_type} انوګانې جوړ کړي
 DocType: Customer,Primary Address and Contact Detail,لومړني پته او د اړیکو تفصیل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,بیا ولېږې قطعا د ليک
@@ -2021,10 +2028,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,مهرباني وکړئ لږترلږه یو ډومین انتخاب کړئ.
 DocType: Dependent Task,Dependent Task,اتکا کاري
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,له مخکې پلان لپاره د X ورځو عملیاتو کوښښ وکړئ.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,د لټون د قالب
 DocType: Payment Schedule,Payment Amount,د تادياتو مقدار
@@ -2034,7 +2041,7 @@
 DocType: Assessment Plan,Grading Scale,د رتبو او مقياس
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,لا د بشپړ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,دحمل په لاس کې
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,دحمل په لاس کې
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,د وارداتو بریالی!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,د خپریدلو سامان لګښت
@@ -2045,17 +2052,16 @@
 DocType: Quotation Item,Quotation Item,د داوطلبۍ د قالب
 DocType: Customer,Customer POS Id,پيرودونکو POS Id
 DocType: Account,Account Name,دحساب نوم
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,له نېټه نه شي ته د نېټه څخه ډيره وي
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,شعبه {0} کمیت {1} نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,له نېټه نه شي ته د نېټه څخه ډيره وي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,شعبه {0} کمیت {1} نه شي کولای یوه برخه وي
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,مهرباني وکړئ د Woocommerce Server URL ولیکئ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,عرضه ډول بادار.
 DocType: Purchase Order Item,Supplier Part Number,عرضه برخه شمېر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,conversion کچه نه شي کولای 0 يا 1 وي
 DocType: Share Balance,To No,نه
-DocType: Subscription,Reference Document,ماخذ لاسوند
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} د {1} ده لغوه یا ودرول
 DocType: Accounts Settings,Credit Controller,اعتبار کنټرولر
-DocType: Grant Application,Applicant Type,د غوښتنلیک ډول
+DocType: Loan,Applicant Type,د غوښتنلیک ډول
 DocType: Purchase Invoice,03-Deficiency in services,03 - په خدمتونو کې کمښت
 DocType: Delivery Note,Vehicle Dispatch Date,چلاونه د موټرو نېټه
 DocType: Healthcare Settings,Default Medical Code Standard,اصلي طبی کوډ معياري
@@ -2066,13 +2072,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ محاسبې ته
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,خوندي دي Qty
 DocType: Party Account,Party Account,ګوند حساب
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,بشري منابع
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,بشري منابع
 DocType: Lead,Upper Income,د مشرانو پر عايداتو
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,رد
 DocType: Journal Entry Account,Debit in Company Currency,په شرکت د پیسو د ډیبیټ
 DocType: BOM Item,BOM Item,هیښ د قالب
 DocType: Appraisal,For Employee,د کارګر
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,د تادياتو د داخلولو د کمکیانو لپاره د
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,د تادياتو د داخلولو د کمکیانو لپاره د
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
 DocType: Membership,INR,INR
@@ -2102,10 +2108,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,د استوګنې شتون
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,د استوګنې شتون
 DocType: Manufacturing Settings,Capacity Planning For (Days),د ظرفیت د پلان د (ورځې)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,د تدارکاتو
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,د توکو نه لري او په اندازه او ارزښت کوم بدلون.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,د توکو نه لري او په اندازه او ارزښت کوم بدلون.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,اجباري ډګر - پروګرام
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,اجباري ډګر - پروګرام
 DocType: Special Test Template,Result Component,د پایلو برخې
@@ -2126,7 +2132,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,دننه د پاڼو په توګه پاڼي رخصتي شامل دي
 DocType: Sales Invoice,Packed Items,ډک توکی
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,سریال نمبر په وړاندې تضمین ادعا
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ټول&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ټول&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,خرید په ګاډۍ فعال کړه
 DocType: Employee,Permanent Address,دایمی استو ګنځی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2144,10 +2150,10 @@
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,عمل تایید کړئ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,په آنلاین توګه لیلام
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,تحقق
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,محتویات یی په ګاډۍ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,بازار موندنه داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,معياري معیارونه نشي جوړولای. مهرباني وکړئ د معیارونو نوم بدل کړئ
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
@@ -2170,9 +2176,9 @@
 DocType: Upload Attendance,Get Template,ترلاسه کينډۍ
 DocType: Material Request,Transferred,سپارل
 DocType: Vehicle,Doors,دروازو
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup بشپړ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup بشپړ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,د ناروغ د ثبت لپاره فیس راټول کړئ
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,د ذخیرې له معاملې وروسته امتیازات نشي راوولی. یو نوی توکي جوړ کړئ او نوي شي ته ذخیره انتقال کړئ
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,د ذخیرې له معاملې وروسته امتیازات نشي راوولی. یو نوی توکي جوړ کړئ او نوي شي ته ذخیره انتقال کړئ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,د مالياتو د تګلاردا
 DocType: Packing Slip,PS-,PS-
@@ -2208,11 +2214,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,پخلاینې JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ډېر زيات ستنې. په راپور کې د صادرولو او د چاپولو لپاره دا وېړې پاڼې د درخواست په کارولو.
 DocType: Purchase Invoice Item,Batch No,دسته نه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,د کارمندانو خدمتونه
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
 DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
 DocType: Grant Application,Assessment  Mark (Out of 10),د ارزونې نښه (له 10 څخه بهر)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 د موبايل په هيڅ
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,اصلي
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,اصلي
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
 DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
@@ -2221,15 +2228,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت له ډګر الزامی دی
 DocType: Email Digest,Annual Expenses,د کلني لګښتونو
 DocType: Item,Variants,تانبه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
 DocType: Sales Team,Contribution to Net Total,له افغان بېسیم څخه د ټولې ونډې
 DocType: Sales Invoice Item,Customer's Item Code,پيرودونکو د قالب کوډ
 DocType: Stock Reconciliation,Stock Reconciliation,دحمل پخلاينې
 DocType: Territory,Territory Name,خاوره نوم
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,تاسو کولی شئ یوازې د ګډون کولو په وخت کې د ورته بل چا سره سره پالنونه ولرئ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,د دنده متقاضي.
 DocType: Purchase Order Item,Warehouse and Reference,ګدام او ماخذ
 DocType: Supplier,Statutory info and other general information about your Supplier,قانوني معلومات او ستاسو د عرضه په هکله د نورو عمومي معلومات
@@ -2240,10 +2248,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ارزونه
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,د روزنې پیښې
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},دوه شعبه لپاره د قالب ته ننوتل {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},دوه شعبه لپاره د قالب ته ننوتل {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,د لیډ سرچینه لخوا الرښوونه.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,لپاره يو نقل د حاکمیت شرط
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,ولیکۍ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,ولیکۍ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,د ساتنې ساتنه
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),د دې بسته خالص وزن. (په توګه د توکو خالص وزن مبلغ په اتوماتيک ډول محاسبه)
@@ -2251,11 +2259,11 @@
 DocType: Sales Order,To Deliver and Bill,ته کول او د بیل
 DocType: Student Group,Instructors,د ښوونکو
 DocType: GL Entry,Credit Amount in Account Currency,په حساب د اسعارو د پورونو مقدار
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,د شریک مدیریت
 DocType: Authorization Control,Authorization Control,د واک ورکولو د کنټرول
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,د پیسو
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,د پیسو
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",ګدام {0} دی چې هر ډول حساب سره تړاو نه، مهرباني وکړئ په شرکت کې د ګدام ریکارډ د حساب يا جوړ تلوالیزه انبار حساب ذکر {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,ستاسو د امر اداره
 DocType: Work Order Operation,Actual Time and Cost,واقعي وخت او لګښت
@@ -2265,7 +2273,7 @@
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,د خرڅلاو وخت بنډل په پېژندتورو.
@@ -2275,7 +2283,7 @@
 DocType: Item,Barcodes,بارکوډ
 DocType: Hub Category,Hub Node,مرکزي غوټه
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,تا د دوه ګونو توکو ته ننوتل. لطفا د سمولو او بیا کوښښ وکړه.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ملګري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,د کار امر {0} باید وسپارل شي
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,د نوي په ګاډۍ
@@ -2293,13 +2301,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,د بلې پیسو پیسې باید د یاغیانو د کمپنۍ یا د ګوند حساب حساب سره مساوي وي
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ښيي چې د کڅوړه ده د دې د وړاندې کولو (یوازې مسوده) یوه برخه
 DocType: Soil Texture,Loam,لوام
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,د پیسو د داخلولو د کمکیانو لپاره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},لپاره د قالب مقدار {0} بايد په پرتله کمه وي {1}
 ,Sales Invoice Trends,خرڅلاو صورتحساب رجحانات
 DocType: Leave Application,Apply / Approve Leaves,Apply / پاڼي منظور کړل
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,د
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
 DocType: Sales Order Item,Delivery Warehouse,د سپارنې پرمهال ګدام
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,د مالي لګښت په مرکزونو کې ونه ده.
 DocType: Serial No,Delivery Document No,د سپارنې سند نه
@@ -2313,7 +2320,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,د موادو مصرف د تولیدي کولو په ترتیب کې ندی ټاکل شوی.
 DocType: Student,Student Mobile Number,د زده کوونکو د موبايل په شمېر
 DocType: Item,Has Variants,لري تانبه
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",د {1} څخه په {1} څخه زیات {2} د اضافي زیان نشي کولی. د اضافه کولو اجازه ورکول، مهرباني وکړئ د سټیټ سیسټمونو کې ځای ونیسئ
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",د {1} څخه په {1} څخه زیات {2} د اضافي زیان نشي کولی. د اضافه کولو اجازه ورکول، مهرباني وکړئ د سټیټ سیسټمونو کې ځای ونیسئ
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,تازه ځواب
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
@@ -2330,6 +2337,7 @@
 DocType: Asset Maintenance Log,Planned,پلان شوی
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,د رسیدونکي اصلي رسیدونکي حسابونه باید وکارول شي که چیرې ناروغانو ته د مشورې ورکولو تورونه ونه سپارل شي.
 DocType: Vehicle Log,Fuel Price,د ګازو د بیو
+DocType: Bank Guarantee,Margin Money,مارګین پیس
 DocType: Budget,Budget,د بودجې د
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,پرانيستی
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
@@ -2343,15 +2351,15 @@
 DocType: Lead,Follow Up,تعقیب یی کړه
 DocType: Item,Is Sales Item,آیا د پلورنې د قالب
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,د قالب ګروپ ونو
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. د قالب د بادار د وګورئ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. د قالب د بادار د وګورئ
 DocType: Maintenance Visit,Maintenance Time,د ساتنې او د وخت
 ,Amount to Deliver,اندازه کول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},ورته سامان څو ځله ننوتل شوی. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,تېروتنې وې.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,تېروتنې وې.
 DocType: Guardian,Guardian Interests,ګارډین علاقه
 DocType: Naming Series,Current Value,اوسنی ارزښت
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
 DocType: Education Settings,Instructor Records to be created by,د روزونکي ریکارډونه باید جوړ شي
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} جوړ
 DocType: GST Account,GST Account,د GST حساب
@@ -2370,8 +2378,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
 DocType: Website Item Group,Website Item Group,وېب پاڼه د قالب ګروپ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,خوښې ته اضافه شوې
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,د پورته ټاکل شوي معیارونو لپاره جمع کولو لپاره هیڅ معاش ندی موندلی یا د معاش معاشی دمخه وړاندیز شوی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,دندې او مالیات
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,د پورته ټاکل شوي معیارونو لپاره جمع کولو لپاره هیڅ معاش ندی موندلی یا د معاش معاشی دمخه وړاندیز شوی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,دندې او مالیات
 DocType: Projects Settings,Projects Settings,د پروژې ترتیبونه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} د پیسو زياتونې له خوا فلتر نه شي {1}
@@ -2381,27 +2389,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,د قالب ډلې ونه ده.
 DocType: Production Plan,Total Produced Qty,ټول تولید شوي مقدار
 DocType: Payroll Entry,Get Employee Details,د کارمندانو جزئیات ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
 DocType: Asset,Sold,پلورل
 ,Item-wise Purchase History,د قالب-هوښيار رانيول تاریخ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا شعبه لپاره د قالب زياته کړه راوړلو په &#39;تولید مهال ویش&#39; کلیک {0}
 DocType: Account,Frozen,ګنګل
 DocType: Sales Invoice Payment,Base Amount (Company Currency),داساسی مبلغ (شرکت د اسعارو)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,خام توکي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,خام توکي
 DocType: Payment Reconciliation Payment,Reference Row,ماخذ د کتارونو
 DocType: Installation Note,Installation Time,نصب او د وخت
 DocType: Sales Invoice,Accounting Details,د محاسبې په بشپړه توګه کتل
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,دا د شرکت د ټولو معاملې ړنګول
 DocType: Patient,O Positive,اې مثبت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,پانګه اچونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,پانګه اچونه
 DocType: Issue,Resolution Details,د حل په بشپړه توګه کتل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیصونه
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,د منلو وړ ټکي
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,مهرباني وکړی په پورته جدول د موادو غوښتنې ته ننوځي
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,د ژورنال ننوتلو لپاره هیڅ تادیات شتون نلري
 DocType: Item Attribute,Attribute Name,نوم منسوب
 DocType: BOM,Show In Website,خپرونه په وېب پاڼه
 DocType: Shopping Cart Settings,Show Quantity in Website,په ویب پاڼه مقدار وښایاست
-DocType: Employee Loan Application,Total Payable Amount,ټول د راتلوونکې مقدار
+DocType: Loan Application,Total Payable Amount,ټول د راتلوونکې مقدار
 DocType: Task,Expected Time (in hours),د تمی د وخت (په ساعتونو)
 DocType: Item Reorder,Check in (group),په چک (ډله)
 DocType: Soil Texture,Silt,Silt
@@ -2420,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,د تادیاتو د کمکیانو لپاره د
 DocType: Room,Room Name,کوټه نوم
 DocType: Prescription Duration,Prescription Duration,د نسخه موده
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",د وتو نه شي استعمال شي / {0} مخکې لغوه، په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",د وتو نه شي استعمال شي / {0} مخکې لغوه، په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
 DocType: Activity Cost,Costing Rate,لګښت کچه
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,پيرودونکو Addresses او د اړيکې
 ,Campaign Efficiency,د کمپاین موثريت
@@ -2440,11 +2449,11 @@
 DocType: Chapter,Chapter,فصل
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,جوړه
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,کله چې دا اکر غوره شو نو اصلي حساب به په POS انو کې خپل ځان تازه شي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,خرڅلاو همکار پتې او د اړيکو
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,نيمه ورځ نېټه بايد د تاريخ او تر اوسه پورې تر منځ وي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,نيمه ورځ نېټه بايد د تاريخ او تر اوسه پورې تر منځ وي
 DocType: Maintenance Schedule Detail,Actual Date,واقعي نېټه
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,مهرباني وکړئ د شرکت په {0} کمپنۍ کې د اصلي لګښت مرکز ولیکئ.
 DocType: Item,Has Batch No,لري دسته نه
@@ -2462,7 +2471,6 @@
 DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
 DocType: Soil Texture,Soil Type,د خاوری ډول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,نوی پیغام
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
 DocType: GoCardless Mandate,GoCardless Mandate,د ګرمډرډ منډټ
@@ -2482,7 +2490,7 @@
 DocType: Hub Category,Hub Category,حب کټګوري
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
-DocType: Employee Loan,Loan Amount,د پور مقدار
+DocType: Loan,Loan Amount,د پور مقدار
 DocType: Student Report Generation Tool,Add Letterhead,ليټريډ زياتول
 DocType: Program Enrollment,Self-Driving Vehicle,د ځان د چلونې د وسایطو د
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,د کټګورۍ د رایو کارډونه
@@ -2511,9 +2519,9 @@
 DocType: Cash Flow Mapper,Position,حالت
 DocType: Patient,Patient Details,د ناروغ توضیحات
 DocType: Patient,B Positive,B مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 DocType: Patient Medical Record,Patient Medical Record,د ناروغ درملنه
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,د غیر ګروپ ګروپ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,لوبې
@@ -2521,8 +2529,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total واقعي
 DocType: Lab Test UOM,Test UOM,د ام ای امتحان
 DocType: Student Siblings,Student Siblings,د زده کونکو د ورور
+DocType: Subscription Plan Detail,Subscription Plan Detail,د ګډون پلان پلان
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,د واحد
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,مهرباني وکړئ د شرکت مشخص
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,مهرباني وکړئ د شرکت مشخص
 ,Customer Acquisition and Loyalty,پيرودونکو د استملاک او داری
 DocType: Asset Maintenance Task,Maintenance Task,د ساتنې ساتنه
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,مهرباني وکړئ د GST ترتیباتو کې B2C محدودیت وټاکئ.
@@ -2537,6 +2546,7 @@
 ,BOM Search,هیښ پلټنه
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),د مصرف شوو موادو مجموعه لګښت (د ذخیرې ننوتلو له لارې)
 DocType: Hub Settings,Company Registered,شرکت ثبت شوی
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,د نیټې نیټه د نیټې څخه لږ نه وي
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",په هوب کې &quot;په اسٹاک کې&quot; یا &quot;نه په ذخیره&quot; کې خپور کړئ په دې ګودام کې موجود زیرمې پورې اړه لري.
 DocType: Vehicle,Fuel Type,د تیلو د ډول
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,لطفا په شرکت اسعارو مشخص
@@ -2544,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},دحمل په دسته توازن {0} به منفي {1} لپاره د قالب {2} په ګدام {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,مادي غوښتنې لاندې پر بنسټ د قالب د بيا نظم په کچه دي په اتوماتيک ډول راپورته شوې
 DocType: Email Digest,Pending Sales Orders,انتظار خرڅلاو امر
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
 DocType: Employee,Create User Permission,د کارن اجازه جوړول
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 DocType: Healthcare Settings,Remind Before,مخکې یادونه وکړئ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},په قطار UOM تغیر فکتور ته اړتيا ده {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
 DocType: Salary Component,Deduction,مجرايي
 DocType: Item,Retain Sample,نمونه ساتل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
 DocType: Stock Reconciliation Item,Amount Difference,اندازه بدلون
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,مهرباني وکړئ او دې د پلورنې کس ته ننوځي د کارګر Id
 DocType: Territory,Classification of Customers by region,له خوا د سيمې د پېرېدونکي طبقه
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,په تولید کې
@@ -2564,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه شوې بانک اعلامیه توازن
 DocType: Normal Test Template,Normal Test Template,د عادي امتحان ټکي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معيوبينو د کارونکي عکس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,د داوطلبۍ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,نشي کولی د ترلاسه شوي آر ایف پی ترلاسه کولو لپاره هیڅ معرفي نه کړي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,نشي کولی د ترلاسه شوي آر ایف پی ترلاسه کولو لپاره هیڅ معرفي نه کړي
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Deduction
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,د حساب په چاپیریال کې د چاپ کولو لپاره یو حساب وټاکئ
@@ -2573,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,دا د دې ناروغۍ په وړاندې د راکړې ورکړې پر بنسټ والړ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,لګښت Updated
 DocType: Patient,Date of Birth,د زیږون نیټه
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,{0} د قالب لا ته راوړل شوي دي
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,{0} د قالب لا ته راوړل شوي دي
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالي کال ** د مالي کال استازيتوب کوي. ټول د محاسبې زياتونې او نورو لويو معاملو ** مالي کال په وړاندې تعقیبیږي **.
 DocType: Opportunity,Customer / Lead Address,پيرودونکو / سوق پته
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,د سپریري کرایډ کارټ Setup
@@ -2584,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,واقعي عملياتو د وخت
 DocType: Authorization Rule,Applicable To (User),د تطبیق وړ د (کارن)
 DocType: Purchase Taxes and Charges,Deduct,وضع
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Job Description
 DocType: Student Applicant,Applied,تطبیقی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re علني
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re علني
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty هر دحمل UOM په توګه
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نوم
 DocType: Purchase Invoice,02-Post Sale Discount,02-د پلور پلور رعایت
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",ځانګړي خویونه پرته &quot;-&quot; &quot;.&quot;، &quot;#&quot;، او &quot;/&quot; نه په نوم لړ اجازه
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",وساتئ د خرڅلاو د کمپاینونو Track. د ياه، قیمت د روان وساتئ، خرڅلاو نظم او نور له مبارزو ته ورستون د پانګونې کچه معلومه کړي.
+DocType: Department Approver,Approver,Approver
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,د ونډې اخیستونکي ساحه خالي نه وي
 DocType: Guardian,Work Address,د کار پته
@@ -2605,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ټولې مقدار (شرکت د اسعارو)
 DocType: Purchase Order Item,To be delivered to customer,د دې لپاره چې د پېرېدونکو ته وسپارل شي
 DocType: BOM,Scrap Material Cost,د اوسپنې د موادو لګښت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,شعبه {0} نه د هر ډول ګدام سره تړاو نه لري
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,شعبه {0} نه د هر ډول ګدام سره تړاو نه لري
 DocType: Grant Application,Email Notification Sent,د بریښناليک خبرتیا استول شوی
 DocType: Purchase Invoice,In Words (Company Currency),په وييکي (شرکت د اسعارو)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",د توکو کود، ګودام، مقدار په قطار کې اړین دی
-DocType: Pricing Rule,Supplier,عرضه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",د توکو کود، ګودام، مقدار په قطار کې اړین دی
+DocType: Bank Guarantee,Supplier,عرضه
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,د تادیاتو تفصیلات وښایاست
 DocType: Consultation,Consultation Time,د مشورې وخت
 DocType: C-Form,Quarter,پدې ربع کې
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,متفرقه لګښتونو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,متفرقه لګښتونو
 DocType: Global Defaults,Default Company,default شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجاتو او يا بدلون حساب لپاره د قالب {0} په توګه دا اغیزې په ټولیزه توګه د ونډې ارزښت الزامی دی
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,بانک نوم
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,د کارګر د پور حساب
 DocType: Leave Application,Total Leave Days,Total اجازه ورځې
 DocType: Email Digest,Note: Email will not be sent to disabled users,يادونه: دبرېښنا ليک به د معلولينو کارنان نه واستول شي
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,د عمل له شمیره
@@ -2635,7 +2646,7 @@
 DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",فصلونه / فصل_ نوم نومیږي په خپل ځان سره په محفوظ ډول د سپما د فصل وروسته.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,مهرباني وکړئ د GST حسابونه د GST ترتیباتو کې وټاکئ
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,مهرباني وکړئ د GST حسابونه د GST ترتیباتو کې وټاکئ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,د کاروبار رقم
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا په تيروخت کي يو قطار تخصيص مقدار، صورتحساب ډول او صورتحساب شمېر غوره
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,د نوي رانيول لګښت
@@ -2644,12 +2655,13 @@
 DocType: Grant Application,Grant Description,د وړاندوینه تفصیل
 DocType: Purchase Invoice Item,Rate (Company Currency),کچه (د شرکت د اسعارو)
 DocType: Student Guardian,Others,نور
+DocType: Subscription,Discounts,رخصتۍ
 DocType: Payment Entry,Unallocated Amount,Unallocated مقدار
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,کولی کوم ساری توکی ونه موندل. لورينه وکړئ د {0} يو شمېر نورو ارزښت ټاکي.
 DocType: POS Profile,Taxes and Charges,مالیه او په تور
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",د تولید یا د خدمت دی چې اخيستي، پلورل او يا په ګدام کې وساتل.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,نه زیات تازه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,پدې کې د دې سایپ سره تړلي ټول سکډډرډونه شامل دي
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,د ماشومانو د قالب باید د محصول د بنډل نه وي. لطفا توکی لرې `{0}` او وژغوري
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,بانکداري
@@ -2658,21 +2670,24 @@
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا د مهال ویش به په &#39;تولید مهال ویش&#39; کیکاږۍ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 DocType: Bin,Ordered Quantity,امر مقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
 DocType: Grading Scale,Grading Scale Intervals,د رتبو مقیاس انټروالونه
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,د کال لپاره ګټه
+DocType: Bank Guarantee,Name of Bank,د بانک نوم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} د {1}: د {2} د محاسبې انفاذ کولای شي يوازې په اسعارو کړې: {3}
 DocType: Fee Schedule,In Process,په بهیر کې
 DocType: Authorization Rule,Itemwise Discount,نورتسهیالت کمښت
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,د مالي حسابونو د ونو.
+DocType: Bank Guarantee,Reference Document Type,د حوالې سند ډول
 DocType: Cash Flow Mapping,Cash Flow Mapping,د نقد فلو نقشه اخیستنه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} خرڅلاو نظم په وړاندې د {1}
 DocType: Account,Fixed Asset,د ثابت د شتمنیو
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized موجودي
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,په بریښناليک اړیکه کې ای میل ونه موندل شو
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,پټ ساتل
-DocType: Employee Loan,Account Info,حساب پيژندنه
+DocType: Loan,Account Info,حساب پيژندنه
 DocType: Activity Type,Default Billing Rate,Default اولګښت Rate
 DocType: Fees,Include Payment,د پیسو ورکړه
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} د زده کوونکو ډلو جوړ.
@@ -2680,24 +2695,24 @@
 DocType: Sales Invoice,Total Billing Amount,Total اولګښت مقدار
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,د فیس جوړښت او د زده کوونکو ګروپ {0} پروګرام مختلف دی.
 DocType: Fee Schedule,Receivable Account,ترلاسه اکانټ
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
 DocType: Quotation Item,Stock Balance,دحمل بیلانس
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ته قطعا د خرڅلاو د ترتیب پر اساس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,اجرايوي ريس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,اجرايوي ريس
 DocType: Purchase Invoice,With Payment of Tax,د مالیې تادیه کولو سره
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجاتو ادعا تفصیلي
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,د عرضه TRIPLICATE
 DocType: Land Unit,Is Container,کنټینر دی
 DocType: Crop Cycle,This will be day 1 of the crop cycle,دا به د فصل دورې 1 ورځ وي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,لطفا صحيح حساب وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,لطفا صحيح حساب وټاکئ
 DocType: Purchase Invoice Item,Weight UOM,وزن UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,د فولیو شمېر سره د شته شریکانو لیست لیست
 DocType: Salary Structure Employee,Salary Structure Employee,معاش جوړښت د کارګر
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,مختلف ډولونه ښکاره کړئ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,مختلف ډولونه ښکاره کړئ
 DocType: Student,Blood Group,د وينې ګروپ
 DocType: Course,Course Name,کورس نوم
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,هغه کارنان چې کولای شي یو ځانګړي کارکوونکي د رخصتۍ غوښتنلیکونه تصویب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,دفتر او تجهیزاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,دفتر او تجهیزاتو
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,د شرکتونو
 DocType: Supplier Scorecard,Scoring Setup,د سایټ لګول
@@ -2716,7 +2731,7 @@
 DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ډیبیټ ته اړتيا ده
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,رانيول بیې لېست
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,د عرضه کونکي سکورټ کارډ متغیرات.
 DocType: Job Offer Term,Offer Term,وړاندیز مهاله
 DocType: Asset,Quality Manager,د کیفیت د مدير
@@ -2728,13 +2743,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total معاش: {0}
 DocType: BOM Website Operation,BOM Website Operation,هیښ وېب پاڼه د عملياتو
 DocType: Supplier Scorecard,Supplier Score,د سپرایټ شمیره
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Total رسیدونو د نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Total رسیدونو د نننیو
 DocType: Supplier,Warn RFQs,د آر ایف اسو خبرداری
 DocType: BOM,Conversion Rate,conversion Rate
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,د محصول د لټون
 DocType: Assessment Plan,To Time,ته د وخت
 DocType: Authorization Rule,Approving Role (above authorized value),رول (اجازه ارزښت پورته) تصویب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,د حساب د پور باید یو د راتلوونکې حساب وي
+DocType: Loan,Total Amount Paid,ټولې پیسې ورکړل شوي
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,مهرباني وکړئ د زده کونکي داخلي انتخاب وټاکئ کوم چې د ورکړل شوې زده کونکي غوښتونکي لپاره ضروري دی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,مهرباني وکړئ د قیمتونو د خپریدو لپاره د قیمت لیست غوره کړئ
@@ -2744,19 +2760,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,د بیې په لېست {0} معلول دی
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},د کتارونو تر {0}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
 DocType: Manufacturing Settings,Allow Overtime,اضافه اجازه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
 DocType: Training Event Employee,Training Event Employee,د روزنې دکمپاینونو د کارګر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ډیری نمونې - {1} د بچ لپاره ساتل کیدی شي {1} او توکي {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,د وخت سلایډونه زیات کړئ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} پرلپسې لپاره د قالب اړتیا {1}. تاسي چمتو {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} پرلپسې لپاره د قالب اړتیا {1}. تاسي چمتو {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,اوسنی ارزښت Rate
 DocType: Training Event,Advance,پرمختګ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,د بیا ځل بیا کولو لپاره.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,د ګیرډless بېې د پیرود امستنې
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,په بدل کې لاسته راغلې ګټه / له لاسه ورکول
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,په بدل کې لاسته راغلې ګټه / له لاسه ورکول
 DocType: Opportunity,Lost Reason,له لاسه دلیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Row # {0}: حساب {1} د شرکت سره تړاو نلري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Row # {0}: حساب {1} د شرکت سره تړاو نلري {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},د ډاټا ټائپ موندلو توان نلري {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نوې پته
 DocType: Quality Inspection,Sample Size,نمونه اندازه
@@ -2775,7 +2790,6 @@
 DocType: Bin,Actual Quantity,واقعي اندازه
 DocType: Shipping Rule,example: Next Day Shipping,مثال په توګه: بل د ورځې په نقل
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,شعبه {0} ونه موندل شو
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},سبسایپشن {0} دی
 DocType: Fee Schedule Program,Fee Schedule Program,د فیس شیډی پروګرام
 DocType: Fee Schedule Program,Student Batch,د زده کونکو د دسته
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,د زده کوونکو د کمکیانو لپاره د
@@ -2791,14 +2805,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ای کامرس GSTIN
 DocType: Sales Order,Not Delivered,نه تحویلوونکی
 ,Bank Clearance Summary,بانک چاڼېزو لنډيز
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
 DocType: Appraisal Goal,Appraisal Goal,د ارزونې موخه
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,کټګورۍ ته وړاندیز
 DocType: Stock Reconciliation Item,Current Amount,اوسني مقدار
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ودانۍ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ودانۍ
 DocType: Fee Schedule,Fee Structure,د فیس جوړښت
 DocType: Timesheet Detail,Costing Amount,لګښت مقدار
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
 DocType: Student Admission Program,Application Fee,د غوښتنلیک فیس
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,سپارل معاش ټوټه
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
@@ -2806,12 +2819,13 @@
 DocType: Sales Partner,Address & Contacts,پته او د اړيکې
 DocType: SMS Log,Sender Name,استوونکی نوم
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,د زراعت تحلیل معیار
+DocType: HR Settings,Leave Approval Notification Template,د منظورولو خبرتیا پریښودل پریږدئ
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Vital Signs,Blood Pressure (diastolic),د وینی فشار
 DocType: SMS Log,Sent To,لیږل شوی ورته
 DocType: Agriculture Task,Holiday Management,د رخصتۍ اداره
 DocType: Payment Request,Make Sales Invoice,د کمکیانو لپاره د خرڅلاو صورتحساب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,دکمپیوتر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,دکمپیوتر
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
 DocType: Company,For Reference Only.,د ماخذ یوازې.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2577,Select Batch No,انتخاب دسته نه
@@ -2828,7 +2842,7 @@
 DocType: Employee,New Workplace,نوی کارځای
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,د توکو مصرف
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,د ټاکلو په توګه تړل شوي
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},سره Barcode نه د قالب {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},سره Barcode نه د قالب {0}
 DocType: Normal Test Items,Require Result Value,د مطلوب پایلې ارزښت
 DocType: Item,Show a slideshow at the top of the page,د پاڼې په سر کې یو سلاید وښایاست
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2843,19 +2857,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
 DocType: Leave Block List,Allow Users,کارنان پرېښودل
 DocType: Purchase Order,Customer Mobile No,پيرودونکو د موبايل په هيڅ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,بیا راګرځېدل
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,د نغدو پیسو نقشې کولو نمونې تفصیلات
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,د پور مدیریت
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,جلا عايداتو وڅارئ او د محصول verticals یا اختلافات اخراجاتو.
 DocType: Rename Tool,Rename Tool,ونوموئ اوزار
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,تازه لګښت
 DocType: Item Reorder,Item Reorder,د قالب ترمیمي
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,انکړپټه ښودل معاش ټوټه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,انکړپټه ښودل معاش ټوټه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,د انتقال د موادو
 DocType: Fees,Send Payment Request,د تادیاتو غوښتنه واستوئ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
 DocType: Water Analysis,Origin,اصلي
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
@@ -2870,14 +2884,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,د عایداتو مالیه ده
 DocType: Grading Scale Interval,Grade Description,ټولګي Description
 DocType: Stock Entry,Purchase Receipt No,رانيول رسيد نه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ارنست د پیسو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ارنست د پیسو
 DocType: Sales Invoice, Shipping Bill Number,د تیلو لیږد شمیره
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,د واردکوونکو
 DocType: Asset Maintenance Log,Actions performed,کړنې ترسره شوې
 DocType: Cash Flow Mapper,Section Leader,برخه برخه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),د بودیجو سرچینه (مسؤلیتونه)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),د بودیجو سرچینه (مسؤلیتونه)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,د کارګر
+DocType: Bank Guarantee,Fixed Deposit Number,ثابت شوي شمېره
 DocType: Asset Repair,Failure Date,د ناکامي نیټه
 DocType: Sample Collection,Collected Time,راغونډ شوی وخت
 DocType: Company,Sales Monthly History,د پلور میاشتني تاریخ
@@ -2894,10 +2909,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,ایا تاسو ډاډه یاست چې تاسو دا ټاکل رد کړئ؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,د هوټل خونه د قیمت ارزونه
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خرڅلاو نل
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,اړتیا ده
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,د ترلاسه کولو تازه راپورونه
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},حساب {0} سره د شرکت د {1} کې د حساب اکر سره سمون نه خوري: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},مشخص هیښ {0} لپاره د قالب نه شته {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,کورس:
@@ -2907,7 +2923,7 @@
 DocType: Notification Control,Expense Claim Approved,اخراجاتو ادعا تصویب
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,د کار سپارښتنې نه رامنځته شوې
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,د رانیولې سامان لګښت
 DocType: Selling Settings,Sales Order Required,خرڅلاو نظم مطلوب
 DocType: Purchase Invoice,Credit To,د اعتبار
@@ -2925,7 +2941,7 @@
 DocType: Request for Quotation Supplier,No Quote,هیڅ ارزښت نشته
 DocType: Warranty Claim,Raised By,راپورته By
 DocType: Payment Gateway Account,Payment Account,د پیسو حساب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,په حسابونه ترلاسه خالص د بدلون
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,د معاوضې پړاو
 DocType: Job Offer,Accepted,منل
@@ -2938,7 +2954,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,د لټون پايلې
 DocType: Room,Room Number,کوټه شمېر
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},باطلې مرجع {0} د {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},باطلې مرجع {0} د {1}
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
 DocType: Journal Entry Account,Payroll Entry,د معاشونو داخله
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,د فیس ریکارډونه وګورئ
@@ -2948,7 +2964,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
 DocType: Lab Test Sample,Lab Test Sample,د لابراتوار ازموینه
 DocType: Item Variant Settings,Allow Rename Attribute Value,اجازه ورکړه د ارزښت ارزښت بدل کړئ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,د چټک ژورنال انفاذ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,د چټک ژورنال انفاذ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
 DocType: Restaurant,Invoice Series Prefix,د انوائس سایډ پریفسکس
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
@@ -2956,8 +2972,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},لطفا د قطار د {0} د قالب ته ننوځي پلان Qty {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,د ګوګل نقشه انډول فعال نه دی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} د {1} نه سپارل
+DocType: Subscription,Trialling,درېم
 DocType: Member,Membership Expiry Date,د غړیتوب پای نیټه
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
 ,Minutes to First Response for Issues,د مسایل لومړی غبرګون دقيقو
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
@@ -2976,7 +2993,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,د اندازه کولو واحد
 DocType: Fiscal Year,Year End Date,کال د پای نیټه
 DocType: Task Depends On,Task Depends On,کاري پورې تړلی دی د
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,فرصت
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,فرصت
 DocType: Operation,Default Workstation,default Workstation
 DocType: Notification Control,Expense Claim Approved Message,اخراجاتو ادعا تصویب پيغام
 DocType: Payment Entry,Deductions or Loss,د مجرايي او يا له لاسه ورکول
@@ -3014,7 +3031,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
 DocType: Campaign,Campaign-.####,کمپاين - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,نور ګامونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
 DocType: Membership,USD,امریکايي ډالر
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس جوړ کړئ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,پاتې پاتې والی
@@ -3024,7 +3041,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,د پای کال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
 DocType: Driver,Driver,چلوونکی
 DocType: Vital Signs,Nutrition Values,د تغذيې ارزښتونه
 DocType: Lab Test Template,Is billable,د اعتبار وړ دی
@@ -3035,7 +3052,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),واقعي د پیل نیټه د (د وخت پاڼه له لارې)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,دا يو مثال ویب پاڼه د Auto-تولید څخه ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,ټول وړاندیز شوی مقدار د ټولو ادعا شوي مقدار څخه زیات نه وي
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,ټول وړاندیز شوی مقدار د ټولو ادعا شوي مقدار څخه زیات نه وي
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3070,7 +3087,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,د ځانګړتیا ارزښتونه غوره کړئ
 DocType: Purchase Invoice,Reason For Issuing document,د سند د صادرولو لپاره دلیل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
 DocType: Payment Reconciliation,Bank / Cash Account,بانک / د نقدو پیسو حساب
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,بل تماس By نه شي کولای په غاړه دبرېښنا ليک پته په توګه ورته وي
 DocType: Tax Rule,Billing City,د بیلونو په ښار
@@ -3087,7 +3104,8 @@
 DocType: Warranty Claim,Service Address,خدمتونو پته
 DocType: Asset Maintenance Task,Calibration,تجاوز
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} د شرکت رخصتي ده
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures او لامپ
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,د حالت خبرتیا پریږدئ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures او لامپ
 DocType: Item,Manufacture,د جوړون
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,د سایټ اپ کمپنۍ
 ,Lab Test Report,د لابراتوار آزموینه
@@ -3103,7 +3121,6 @@
 DocType: Crop,Planting Area,د کښت کولو ساحه
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,نصب Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,دا کېدی شي د ځینو ناسمو بریښنالیک پته په دې کې وي
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,تاسو اضافه کړه
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,د روزنې د پايلو
@@ -3113,16 +3130,17 @@
 DocType: Products Settings,Products per Page,محصول په هر مخ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,سازمان د څانګې د بادار.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,او یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ټولګټې داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ټولګټې داخراجاتو
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-پورته
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
 DocType: Supplier Scorecard Criteria,Criteria Weight,معیارونه وزن
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,د تایید خبرتیا پریږدئ
 DocType: Buying Settings,Default Buying Price List,Default د خريداري د بیې په لېست
 DocType: Payroll Entry,Salary Slip Based on Timesheet,معاش ټوټه پر بنسټ Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,د پیرودلو کچه
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,د پیرودلو کچه
 DocType: Notification Control,Sales Order Message,خرڅلاو نظم پيغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",د ټاکلو په تلواله ارزښتونو شرکت، د اسعارو، روان مالي کال، او داسې نور په شان
 DocType: Payment Entry,Payment Type,د پیسو ډول
@@ -3145,6 +3163,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,خرید په ګاډۍ امستنې
 DocType: Journal Entry,Accounting Entries,د محاسبې توکي
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",که چیرې د قیمت ټاکلو اصول د &#39;شرح&#39; لپاره جوړ شي، نو دا به د قیمت لیست لوړ کړي. د قیمت اندازه کولو قواعد وروستی نرخ دی، نو نور نور رعایت باید تطبیق نشي. له همدې کبله، د پلور امر، د پیرود امر، او نور، په لیږد کې، دا د &#39;بیه لیست نرخ&#39; فیلم پرځای د &#39;درجه&#39; میدان کې لیږدول کیږي.
+DocType: Journal Entry,Paid Loan,پور ورکړ شوی پور
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},انفاذ ړنګ کړئ. مهرباني وکړئ وګورئ د واک د حاکمیت د {0}
 DocType: Journal Entry Account,Reference Due Date,د ماخذ حواله نیټه
 DocType: Purchase Order,Ref SQ,دسرچینی یادونه مربع
@@ -3161,7 +3180,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
 ,To Produce,توليدول
 apps/erpnext/erpnext/config/hr.py +93,Payroll,د معاشاتو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
 DocType: Patient Service Unit,Parent Service Unit,د والدین خدمت واحد
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,د کارن د کمکیانو لپاره د
 DocType: Packing Slip,Identification of the package for the delivery (for print),لپاره د وړاندې کولو د ټولګې د پيژندنې (د چاپي)
@@ -3180,7 +3199,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,پر عايداتو باندې حساب
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,د سپارنې پرمهال
 DocType: Volunteer,Weekdays,اونۍ
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
 DocType: Restaurant Menu,Restaurant Menu,د رستورانت ماین
@@ -3188,17 +3207,18 @@
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,د وړیا بیاکتنې بریښنالیک واستوئ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,د خونې ظرفیت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,دسرچینی یادونه
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,تاسو به د مخکینیو پیرود شویو ریکارډونو ریکارډ ورک کړئ. ایا ته باوري یې چې دا ګډون بیا پیلول غواړئ؟
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,د نوم ليکنې فیس
 DocType: Budget,Cost Center,لګښت مرکز
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,ګټمنو #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,ګټمنو #
 DocType: Notification Control,Purchase Order Message,پیري نظم پيغام
 DocType: Tax Rule,Shipping Country,انتقال د هېواد
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,د پیرودونکو د مالياتو د Id څخه د خرڅلاو معاملې پټول
@@ -3207,20 +3227,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",د بیې د حاکمیت دی ځاېناستول د بیې په لېست / تعريف تخفیف سلنه، پر بنسټ د ځینو معیارونو.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ګدام يوازې دحمل د ننوتلو لارې بدليدای شي / د سپارنې پرمهال یادونه / رانيول رسيد
 DocType: Employee Education,Class / Percentage,ټولګی / سلنه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,عايداتو باندې د مالياتو
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ليټر هير ته لاړ شه
+DocType: Subscription,Cancel At End Of Period,د دورې په پاې کې رد کړئ
 DocType: Item Supplier,Item Supplier,د قالب عرضه
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,د لېږد لپاره ټاکل شوي توکي نشته
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,د لېږد لپاره ټاکل شوي توکي نشته
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
 DocType: Company,Stock Settings,دحمل امستنې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,٪ پرمختګ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ګټې / له لاسه ورکول د شتمنيو د برطرف
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ګټې / له لاسه ورکول د شتمنيو د برطرف
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",یوازې د زده کوونکو غوښتنلیک ورکوونکي چې &quot;د منل شوي&quot; حالت سره به په لاندې جدول کې وټاکل شي.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,د حساب لپاره د حساب شمیر {0} شتون نلري. <br> مهرباني وکړئ خپل حسابونه په سمه توګه سمبال کړئ.
 DocType: Task,Depends on Tasks,په دندې پورې تړاو لري
@@ -3235,6 +3256,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,نه په سټاک
 DocType: Volunteer,Volunteer Skills,رضاکار مهارتونه
 DocType: Appraisal,HR User,د بشري حقونو څانګې د کارن
+DocType: Bank Guarantee,Reference Document Name,د حوالې سند نوم
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیه او په تور مجرايي
 apps/erpnext/erpnext/hooks.py +142,Issues,مسایل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید د یو وي {0}
@@ -3248,7 +3270,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ډېر لوی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,ډېر لوی
+DocType: Loan,Loan Application,د پور غوښتنلیک
 DocType: Crop,Scientific Name,سائنسي نوم
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ټولې پاڼې
 DocType: Customer,"Reselect, if the chosen contact is edited after save",بې ځایه کړئ، که چیرې غوره شوي تماس د خوندي کولو وروسته تایید شي
@@ -3257,13 +3280,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,آرډر شمېر
 ,Sales Browser,خرڅلاو د لټووني
 DocType: Journal Entry,Total Credit,Total اعتبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,د محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),پورونو او پرمختګ (شتمني)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,پوروړو
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,لوی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,لوی
 DocType: Homepage Featured Product,Homepage Featured Product,کورپاڼه د ځانګړي محصول
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ټول د ارزونې ډلې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ټول د ارزونې ډلې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نوي ګدام نوم
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,خاوره
@@ -3284,9 +3307,10 @@
 DocType: Fees,Fees,فيس
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ليکئ د بدلولو نرخ ته بل یو اسعارو بدلوي
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,د داوطلبۍ {0} دی لغوه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Total وتلي مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Total وتلي مقدار
 DocType: Sales Partner,Targets,موخې
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,مهرباني وکړی د سیرین شمیره د شرکت د معلوماتو فایل کې ثبت کړئ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: GST Account,CESS Account,CESS ګڼون
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
@@ -3295,6 +3319,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ناروغ
 DocType: Price List,Applicable for Countries,لپاره هیوادونه د تطبيق وړ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,د پیرس نوم
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يوازې سره حالت غوښتنلیکونه پرېږدئ &#39;تصویب&#39; او &#39;رد&#39; کولای وسپارل شي
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
 DocType: Homepage,Products to be shown on website homepage,توليدات په ويب پاڼه کې ښودل شي
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,دا یو د ريښي د مشتريانو د ډلې او نه تصحيح شي.
@@ -3328,14 +3353,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,رسید دمخه د ټولو بارو ساعتونو لپاره جوړ شوی
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},نوم تېروتنه: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,د مالي لګښت دی
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
 DocType: Packing Slip,If more than one package of the same type (for print),که د همدې ډول له يوه څخه زيات بسته (د چاپي)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,مهرباني وکړئ د رستورانت ترتیباتو کې ډیزاین پیرود کړئ
 ,Salary Register,معاش د نوم ثبتول
 DocType: Warehouse,Parent Warehouse,Parent ګدام
-DocType: C-Form Invoice Detail,Net Total,خالص Total
+DocType: Subscription,Net Total,خالص Total
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,د پور د مختلفو ډولونو تعریف
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,د پور د مختلفو ډولونو تعریف
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,بيالنس مقدار
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),د وخت (په دقیقه)
@@ -3367,11 +3392,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,د ريښي د حساب بايد د يوې ډلې وي
 DocType: Drug Prescription,Drug Prescription,د مخدره موادو نسخه
 DocType: Fees,FEE.,فیس.
-DocType: Employee Loan,Repaid/Closed,بیرته / تړل
+DocType: Loan,Repaid/Closed,بیرته / تړل
 DocType: Item,Total Projected Qty,ټول پيشبيني Qty
 DocType: Monthly Distribution,Distribution Name,ویش نوم
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",د تادیاتو کچه د {0} لپاره نده موندل شوې، کوم چې د {1} {2} لپاره د حساب ورکونې اندیښنو ته اړتیا لري. که چیرې توکي په {1} کې د صفر ارزښت د اندازې په توګه لیږدول کیږي، لطفا دا د {1} توکي میز کې یادونه وکړئ. که نه نو، مهرباني وکړئ د توکو لپاره د زیرمې راتلونکی لیږد رامنځته کړئ یا د توکو ریکارډ کې د ارزښت اندازه وشمیرئ، او بیا د دې داخلي ثبت کولو / فسخ کولو هڅه وکړئ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 DocType: Course,Course Code,کورس کوډ
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
 DocType: POS Settings,Use POS in Offline Mode,د پی ایس کارول په نالیکي اکر کې
@@ -3391,16 +3415,15 @@
 DocType: Purchase Invoice,Deemed Export,د صادراتو وضعیت
 DocType: Stock Entry,Material Transfer for Manufacture,د جوړون د توکو لېږدونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
-DocType: Subscription,Half-yearly,Half-کلنی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Lab Test,LabTest Approver,د لابراتوار تګلاره
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,تاسو مخکې د ارزونې معیارونه ارزول {}.
 DocType: Vehicle Service,Engine Oil,د انجن د تیلو
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},د کار امرونه جوړ شوي: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},د کار امرونه جوړ شوي: {0}
 DocType: Sales Invoice,Sales Team1,خرڅلاو Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,د قالب {0} نه شته
 DocType: Sales Invoice,Customer Address,پيرودونکو پته
-DocType: Employee Loan,Loan Details,د پور نورولوله
+DocType: Loan,Loan Details,د پور نورولوله
 DocType: Company,Default Inventory Account,Default موجودي حساب
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,د فولولو شمیرې مطابقت نلري
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
@@ -3412,19 +3435,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,د ټولو ځمکو واحدونو لپاره چې پکښې کرهنه وده کوي
 DocType: Account,Root Type,د ريښي ډول
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},د کتارونو تر # {0}: بېرته نشي څخه زيات {1} لپاره د قالب {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},د کتارونو تر # {0}: بېرته نشي څخه زيات {1} لپاره د قالب {2}
 DocType: Item Group,Show this slideshow at the top of the page,د پاڼې په سر کې د دې سلاید وښایاست
 DocType: BOM,Item UOM,د قالب UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),د مالیې د مقدار کمښت مقدار وروسته (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {0}
 DocType: Cheque Print Template,Primary Settings,لومړنۍ امستنې
 DocType: Purchase Invoice,Select Supplier Address,انتخاب عرضه پته
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,مامورین ورزیات کړئ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,مامورین ورزیات کړئ
 DocType: Purchase Invoice Item,Quality Inspection,د کیفیت د تفتیش
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,اضافي واړه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,اضافي واړه
 DocType: Company,Standard Template,معياري کينډۍ
 DocType: Training Event,Theory,تیوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ګڼون {0} ده کنګل
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
 DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
@@ -3444,11 +3467,10 @@
 DocType: SMS Log,No of Sent SMS,نه د ته وليږدول شوه پیغامونه
 DocType: Antibiotic,Healthcare Administrator,د روغتیا پاملرنې اداره
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,هدف ټاکئ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 DocType: Dosage Strength,Dosage Strength,د غصب ځواک
 DocType: Account,Expense Account,اخراجاتو اکانټ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ساوتري
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,رنګ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,رنګ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,د ارزونې معیارونه پلان
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,د تایید نیټه د غوره شوي توکي لپاره لازمي ده
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,د پیرودونکو مخنیوی مخه ونیسئ
@@ -3461,18 +3483,18 @@
 DocType: Patient,Personal and Social History,شخصي او ټولنیز تاریخ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,کارن {0} جوړ شوی
 DocType: Fee Schedule,Fee Breakup for each student,د هر زده کوونکی لپاره د فیس ماتونکی
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,میاشتنی ویش وټاکئ نا متوازنه توګه په ټول مياشتو هدفونو وویشي.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,د بدلولو کوډ
 DocType: Purchase Invoice Item,Valuation Rate,سنجي Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
 DocType: Purchase Invoice,Availed ITC Cess,د آی ټي ټي سي انټرنیټ ترلاسه کول
 ,Student Monthly Attendance Sheet,د زده کوونکو میاشتنی حاضرۍ پاڼه
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,د پلور کولو لپاره یوازې د لیږد حاکمیت
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,د پروژې د پیل نیټه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,تر
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,تر
 DocType: Rename Tool,Rename Log,د رښتو يادښت
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,د زده کوونکو د ډلې يا کورس ويش الزامی دی
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,د زده کوونکو د ډلې يا کورس ويش الزامی دی
@@ -3493,7 +3515,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,خپل محصولات یا خدمات لیست کړئ کوم چې تاسو یې اخلئ یا پلورئ.
 DocType: Water Analysis,Storage Temperature,د ذخیرې درجه
 DocType: Employee Attendance Tool,Unmarked Attendance,بې نښې حاضريدل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,څیړونکې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,څیړونکې
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,پروګرام شمولیت وسیله د زده کوونکو
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,نوم يا ليک الزامی دی
 DocType: Member,MEM-,MEM-
@@ -3504,7 +3526,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,د کوټونو لګولو کې ناکام شو
 DocType: Chapter,Non Profit Manager,د غیر ګټې مدیر
 DocType: BOM,Total Cost(Company Currency),ټولیز لګښت (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,شعبه {0} جوړ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,شعبه {0} جوړ
 DocType: Homepage,Company Description for website homepage,د ویب پاڼه Company Description
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",د مشتريانو د مناسب وخت، دغو کوډونو په چاپي فرمت څخه په څېر بلونه او د محصول سپارل یاداښتونه وکارول شي
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier نوم
@@ -3514,11 +3536,10 @@
 DocType: Employee,You can enter any date manually,تاسو کولای شی هر نېټې په لاسي ننوځي
 DocType: Healthcare Settings,Result Printed,پایلې چاپ شوی
 DocType: Asset Category Account,Depreciation Expense Account,د استهالک اخراجاتو اکانټ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,امتحاني دوره
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},وګورئ {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,امتحاني دوره
 DocType: Customer Group,Only leaf nodes are allowed in transaction,يوازې د پاڼی غوټو کې د راکړې ورکړې اجازه لري
 DocType: Project,Total Costing Amount (via Timesheets),د ټول لګښت لګښت (د ټایټ شیټونو له لارې)
-DocType: Employee Advance,Expense Approver,اخراجاتو Approver
+DocType: Department,Expense Approver,اخراجاتو Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
 DocType: Project,Hourly,ورځي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,غیر ګروپ ته ګروپ
@@ -3528,7 +3549,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ته Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
 DocType: Accounts Settings,Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,چاپ شوی
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,چاپ شوی
 DocType: Item,Inspection Required before Delivery,د سپارنې مخکې د تفتیش د غوښتل شوي
 DocType: Item,Inspection Required before Purchase,رانيول مخکې د تفتیش د غوښتل شوي
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,انتظار فعالیتونه
@@ -3538,7 +3559,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,د کم تر لږه اندازه
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,ستاسو د سازمان
 DocType: Fee Component,Fees Category,فیس کټه ګورۍ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,لطفا کرارولو نیټه.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,لطفا کرارولو نیټه.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
 DocType: Supplier Scorecard,Notify Employee,کارمندان خبرتیا
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,د کمپاین د نوم ورکړه که د معلوماتو سرچينه ده کمپاین
@@ -3548,7 +3569,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,ترمیمي د ليول
 DocType: Company,Chart Of Accounts Template,د حسابونو کينډۍ چارت
 DocType: Attendance,Attendance Date,د حاضرۍ نېټه
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,معاش سترواکې بنسټ د ګټې وټې او Deduction.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو حساب بدل نه شي چې د پنډو
 DocType: Purchase Invoice Item,Accepted Warehouse,منل ګدام
@@ -3556,10 +3577,11 @@
 DocType: Item,Valuation Method,سنجي Method
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,مارک نيمه ورځ
 DocType: Sales Invoice,Sales Team,خرڅلاو ټيم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,دوه ګونو ننوتلو
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,دوه ګونو ننوتلو
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,د تسلیم کولو دمخه وړاندې د ګټه اخیستونکي نوم درج کړئ.
 DocType: Program Enrollment Tool,Get Students,زده کوونکي ترلاسه کړئ
 DocType: Serial No,Under Warranty,لاندې ګرنټی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[تېروتنه]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[تېروتنه]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو نظم وژغوري.
 ,Employee Birthday,د کارګر کالیزې
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,مهرباني وکړئ د بشپړ شوي ترمیم لپاره د بشپړولو نیټه وټاکئ
@@ -3578,7 +3600,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,د فرعي قراردادي لپاره خوندي دي
 DocType: Payment Reconciliation Invoice,Invoice Number,صورتحساب شمېر
 DocType: Shopping Cart Settings,Orders,امر کړی
-DocType: Employee Leave Approver,Leave Approver,Approver ووځي
+DocType: Department,Leave Approver,Approver ووځي
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,مهرباني وکړئ داځکه انتخاب
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,ژورناليب
 DocType: Assessment Group,Assessment Group Name,د ارزونې ډلې نوم
@@ -3623,7 +3645,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,د مرکز څارل شوی توکي
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,اصلي لپاره د دترلاسه
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,دا بریښنالیک تایید شوی
 DocType: Stock Settings,Freeze Stock Entries,د يخبندان دحمل توکي
 DocType: Program Enrollment,Boarding Student,دمېړه د زده کوونکو
 DocType: Asset,Expected Value After Useful Life,د تمی وړ ارزښت ګټور ژوند وروسته
@@ -3647,22 +3668,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},د حاضرۍ دثبت {0} شتون د زده کوونکو پر وړاندې د {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},ماخذ # {0} د میاشتې په {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,د استهالک له امله د شتمنيو د شنډولو څخه ویستل کیږي
-DocType: Member,Member,غړی
+DocType: Loan,Member,غړی
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Addresses
 DocType: Work Order Item,Work Order Item,د کار امر توکي
 DocType: Pricing Rule,Item Code,د قالب کوډ
 DocType: Serial No,Warranty / AMC Details,ګرنټی / AMC نورولوله
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
 DocType: Agriculture Analysis Criteria,Agriculture Manager,د کرنې مدیر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
 DocType: Supplier Scorecard Period,Variables,ډولونه
 DocType: Employee Internal Work History,Employee Internal Work History,د کارګر کورني کار تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),تړل د (ډاکټر)
 DocType: Cheque Print Template,Cheque Size,آرډر اندازه
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,شعبه {0} په ګدام کې نه
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,شعبه {0} په ګدام کې نه
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,د معاملو د پلورلو د مالياتو کېنډۍ.
 DocType: Sales Invoice,Write Off Outstanding Amount,ولیکئ پړاو وتلي مقدار
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},حساب {0} سره شرکت سره سمون نه خوري {1}
@@ -3671,7 +3692,6 @@
 DocType: Stock Settings,Default Stock UOM,Default دحمل UOM
 DocType: Asset,Number of Depreciations Booked,بک د Depreciations شمېر
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,مقدار کل
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},د کارګر د پور په وړاندې: {0}
 DocType: Landed Cost Item,Receipt Document,د رسيد سند
 DocType: Employee Education,School/University,ښوونځی / پوهنتون
 DocType: Payment Request,Reference Details,ماخذ په بشپړه توګه کتل
@@ -3682,7 +3702,7 @@
 DocType: Asset,Double Declining Balance,Double کموالی بیلانس
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,د تړلو امر لغوه نه شي. Unclose لغوه.
 DocType: Student Guardian,Father,پلار
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
 DocType: Bank Reconciliation,Bank Reconciliation,بانک پخلاينې
 DocType: Attendance,On Leave,په اړه چې رخصت
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
@@ -3696,10 +3716,10 @@
 DocType: Lead,Lower Income,ولسي عايداتو
 DocType: Restaurant Order Entry,Current Order,اوسنۍ امر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,پروګرامونو ته لاړ شئ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} تخصیص شوی رقم {1} د ناپیژندل شوی مقدار څخه ډیر نه وی. {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} تخصیص شوی رقم {1} د ناپیژندل شوی مقدار څخه ډیر نه وی. {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
@@ -3722,7 +3742,6 @@
 DocType: Payment Terms Template,Payment Terms,د تادیاتو شرایط
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,دقیقه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
 DocType: Chapter,Meetup Embed HTML,ملګری ایمیل ایچ ایچ ایل
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,سپلائر ته لاړ شئ
@@ -3742,30 +3761,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,د ساتنې او مهال ویش د قالب
 DocType: Sales Order,%  Delivered,٪ تحویلوونکی
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,مهرباني وکړئ د زده کونکي لپاره د بریښناليک ID مقرر کړئ ترڅو د تادیاتو غوښتنه واستوي
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,مهرباني وکړئ د زده کونکي لپاره د بریښناليک ID مقرر کړئ ترڅو د تادیاتو غوښتنه واستوي
 DocType: Patient,Medical History,طبی تاریخ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,بانک قرضې اکانټ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,بانک قرضې اکانټ
 DocType: Patient,Patient ID,د ناروغ پېژندنه
 DocType: Physician Schedule,Schedule Name,د مهال ویش نوم
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,معاش ټوټه د کمکیانو لپاره
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,ټول سپلولونه زیات کړئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,ټول سپلولونه زیات کړئ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,د کتارونو تر # {0}: ځانګړې شوې مقدار نه بيالنس اندازه په پرتله زیات وي.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,کتنه د هیښ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,خوندي پور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,خوندي پور
 DocType: Purchase Invoice,Edit Posting Date and Time,سمول نوکرې نېټه او وخت
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا په شتمنیو کټه ګورۍ {0} یا د شرکت د استهالک اړوند حسابونه جوړ {1}
 DocType: Lab Test Groups,Normal Range,عمومی رینج
 DocType: Academic Term,Academic Year,تعلیمي کال
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,موجود پلورل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,د پرانستلو په انډول مساوات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,د پرانستلو په انډول مساوات
 DocType: Lead,CRM,دمراسمو
 DocType: Purchase Invoice,N,ن
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,پاتې
 DocType: Appraisal,Appraisal,قيمت
+DocType: Loan,Loan Account,د پور حساب
 DocType: Purchase Invoice,GST Details,د GST تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ليک ته د عرضه کوونکي ته استول {0}
 DocType: Item,Default Sales Unit of Measure,د اندازه کولو اصلي سیسټم
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,تعلیمي کال:
+DocType: Subscription,Past Due Date,د تېر وخت نیټه
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,نېټه تکرار
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,اجازه لاسليک
@@ -3777,7 +3798,7 @@
 DocType: Patient Appointment,Patient Appointment,د ناروغ ټاکنه
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,رول تصویب نه شي کولای ورته په توګه رول د واکمنۍ ته د تطبیق وړ وي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,له دې ليک Digest وباسو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,عرضه کونکي ترلاسه کړئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,عرضه کونکي ترلاسه کړئ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} د توکي {1} لپاره ندی موندلی
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,کورسونو ته لاړ شئ
 DocType: Accounts Settings,Show Inclusive Tax In Print,په چاپ کې انډول مالیه ښودل
@@ -3785,10 +3806,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پيغام ته وليږدول شوه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,سره د ماشومانو د غوټو حساب نه په توګه د پنډو جوړ شي
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د زده کړې ترتیبات
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,په ميزان کي د بیو د لست د اسعارو ده چې د مشتريانو د اډې اسعارو بدل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),خالص مقدار (شرکت د اسعارو)
 DocType: Physician,Physician Schedules,د ډاکټرانو شیان
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,ټول وړاندیز شوی رقم کیدای شي د ټولو منظور شوي مقدار څخه ډیر نه وي
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,ټول وړاندیز شوی رقم کیدای شي د ټولو منظور شوي مقدار څخه ډیر نه وي
 DocType: Salary Slip,Hour Rate,ساعت Rate
 DocType: Stock Settings,Item Naming By,د قالب نوم By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},وروسته يو بل د دورې په تړلو انفاذ {0} شوی دی {1}
@@ -3806,6 +3828,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
 DocType: BOM,Inspection Required,تفتیش مطلوب
 DocType: Purchase Invoice Item,PR Detail,PR تفصیلي
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,د تسلیم کولو دمخه د بانک ضمانت نمبر درج کړئ.
 DocType: Driving License Category,Class,ټولګي
 DocType: Sales Order,Fully Billed,په بشپړ ډول محاسبې ته
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,د کار آرشيف د توکي د سرلیک پر وړاندې نشي پورته کیدی
@@ -3816,7 +3839,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),د بنډل خالص وزن. معمولا د خالص وزن + د بسته بندۍ مواد وزن. (د چاپي)
 DocType: Assessment Plan,Program,پروګرام
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,سره د دغه رول د کاروونکو دي چې کنګل شوي حسابونه کنګل شوي حسابونه په وړاندې د محاسبې زياتونې جوړ او رامنځته / تعديلوي اجازه
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ په زده کړه کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د زده کړې ترتیبات
 DocType: Serial No,Is Cancelled,ده ردشوي
 DocType: Student Group,Group Based On,ګروپ پر بنسټ
 DocType: Student Group,Group Based On,ګروپ پر بنسټ
@@ -3828,9 +3850,10 @@
 DocType: Cheque Print Template,Cheque Height,آرډر لوړوالی
 DocType: Supplier,Supplier Details,عرضه نورولوله
 DocType: Setup Progress,Setup Progress,پرمختللی پرمختګ
+DocType: Expense Claim,Approval Status,تصویب حالت
 DocType: Hub Settings,Publish Items to Hub,تر مرکزي توکی د خپرېدو
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},له ارزښت باید په پرتله د ارزښت په قطار کمه وي {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,تار بدلول
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,تار بدلول
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ټول وګوره
 ,Issued Items Against Work Order,د کار د امر په وړاندې د توکو لیږل
 DocType: Vehicle Log,Invoice Ref,صورتحساب ګروف
@@ -3860,12 +3883,11 @@
 DocType: Customs Tariff Number,Tariff Number,د تعرفې شمیره
 DocType: Work Order Item,Available Qty at WIP Warehouse,موجود Qty په WIP ګدام
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,وړاندوینی
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},شعبه {0} نه ګدام سره تړاو نه لري {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},شعبه {0} نه ګدام سره تړاو نه لري {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,يادونه: د سیستم به وګورئ نه د رسولو او د-پرواز لپاره د قالب {0} په توګه مقدار يا اندازه ده 0
 DocType: Notification Control,Quotation Message,د داوطلبۍ پيغام
-DocType: Employee Loan,Employee Loan Application,د کارګر د پور کاریال
 DocType: Issue,Opening Date,د پرانستلو نېټه
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,مهرباني وکړئ لومړی ناروغ ته وساتئ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,مهرباني وکړئ لومړی ناروغ ته وساتئ
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
 DocType: Program Enrollment,Public Transport,د عامه ترانسپورت
 DocType: Soil Texture,Silt Composition (%),د Silt جوړښت (٪)
@@ -3884,7 +3906,7 @@
 ,Item Balance (Simple),د توکو توازن (ساده)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,بلونه له خوا عرضه راپورته کړې.
 DocType: POS Profile,Write Off Account,حساب ولیکئ پړاو
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ډیبیټ یادونه نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ډیبیټ یادونه نننیو
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,تخفیف مقدار
 DocType: Purchase Invoice,Return Against Purchase Invoice,بېرته پر وړاندې رانيول صورتحساب
 DocType: Item,Warranty Period (in days),ګرنټی د دورې (په ورځو)
@@ -3907,6 +3929,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,خرڅلاو نظم نېټه
 DocType: Sales Invoice Item,Delivered Qty,تحویلوونکی Qty
 DocType: Assessment Plan,Assessment Plan,د ارزونې پلان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,د ژورنالیستانو ننوتلو ته
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
 DocType: Stock Settings,Limit Percent,حد سلنه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,اوس مهال په کوم ګودام کې هیڅ ذخیره شتون نلري
@@ -3920,14 +3943,15 @@
 DocType: Journal Entry,Stock Entry,دحمل انفاذ
 DocType: Payment Entry,Payment References,د پیسو ماخذونه
 DocType: C-Form,C-FORM-,C-جوړښت
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",د منځنۍ ساحې لپاره د وقفونو شمیره لکه که چېرې انټرالول &#39;ورځی&#39; او د بل کولو د مینځلو شمیره 3 وي، نو رسیدونه به په هر درې ورځو کې رامینځته شي
 DocType: Vehicle,Insurance Details,د بیمې په بشپړه توګه کتل
 DocType: Account,Payable,د تادیې وړ
 DocType: Share Balance,Share Type,د شریک ډول
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),پوروړو ({0})
 DocType: Pricing Rule,Margin,څنډی
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نوي پېرېدونکي
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ټولټال ګټه ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ټولټال ګټه ٪
 DocType: Appraisal Goal,Weightage (%),Weightage)٪ (
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,د POS پېژندل بدل کړئ
 DocType: Bank Reconciliation Detail,Clearance Date,بېلوګډو چاڼېزو نېټه
@@ -3937,10 +3961,11 @@
 DocType: Lead,Address Desc,د حل نزولی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,ګوند الزامی دی
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {لیست}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {لیست}
 DocType: Topic,Topic Name,موضوع نوم
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,مهرباني وکړئ د بشري حقونو په څانګو کې د اجازې تصویب نوښت لپاره ډیزاینټ ټاپ ډک کړئ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,تيروخت د خرڅالو او يا د خريداري يو باید وټاکل شي
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,د کارموندنې د ترلاسه کولو لپاره یو مامور غوره کړئ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,د کارموندنې د ترلاسه کولو لپاره یو مامور غوره کړئ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,لطفا یو باوري نیټه وټاکئ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3959,7 +3984,7 @@
 DocType: Asset Movement,Source Warehouse,سرچینه ګدام
 DocType: Installation Note,Installation Date,نصب او نېټه
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,شریک لیجر
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,د پلور انوائس {0} جوړ شوی
 DocType: Employee,Confirmation Date,باوريينه نېټه
 DocType: C-Form,Total Invoiced Amount,Total رسیدونو د مقدار
@@ -3968,7 +3993,7 @@
 DocType: Account,Accumulated Depreciation,جمع د استهالک
 DocType: Supplier Scorecard Scoring Standing,Standing Name,تړل نوم
 DocType: Stock Entry,Customer or Supplier Details,پیرودونکي یا عرضه نورولوله
-DocType: Employee Loan Application,Required by Date,د اړتیا له خوا نېټه
+DocType: Loan Application,Required by Date,د اړتیا له خوا نېټه
 DocType: Lead,Lead Owner,سرب د خاوند
 DocType: Production Plan,Sales Orders Detail,د خرڅلاو حکمونه
 DocType: Bin,Requested Quantity,غوښتل شوي مقدار
@@ -3981,10 +4006,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ناخالص معاشونو - ټول Deduction - پور بيرته ورکول
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,معاش ټوټه ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ګڼ شمیر متغیرات
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویلوونکی
+DocType: Subscription,Trial Period Start Date,د آزموینې دوره د پیل نیټه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,لطفا د بل کاروونکي په توګه ننوتل
@@ -4005,12 +4031,11 @@
 DocType: Student Guardian,Student Guardian,د زده کونکو د ګارډین
 DocType: Member,Member Name,د غړو نوم
 DocType: Stock Settings,Use Naming Series,د نومونې لړۍ استعمال کړئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
 DocType: POS Profile,Update Stock,تازه دحمل
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,په ګډون کې
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,لپاره شیان ډول UOM به د ناسم (Total) خالص وزن ارزښت لامل شي. ډاډه کړئ چې د هر توکی خالص وزن په همدې UOM ده.
 DocType: Membership,Payment Details,د تاديې جزئيات
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,هیښ Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",د کار امر بند شوی نشي تایید شوی، دا لومړی ځل وځنډول چې فسخه شي
 DocType: Asset,Journal Entry for Scrap,د Scrap ژورنال انفاذ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفآ د سپارنې پرمهال يادونه توکي وباسي
@@ -4030,6 +4055,7 @@
 DocType: Land Unit,Land Unit,د ځمکې واحد
 ,Purchase Analytics,رانيول Analytics
 DocType: Sales Invoice Item,Delivery Note Item,د سپارنې پرمهال يادونه د قالب
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,اوسنۍ انوائس {0} ورک دی
 DocType: Asset Maintenance Log,Task,کاري
 DocType: Purchase Taxes and Charges,Reference Row #,ماخذ د کتارونو تر #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},د بستې شمېره لپاره د قالب الزامی دی {0}
@@ -4042,7 +4068,7 @@
 DocType: Company,Exchange Gain / Loss Account,په بدل کې لاسته راغلې ګټه / زیان اکانټ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,د کارګر او د حاضرۍ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},هدف باید د یو وي {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,د فورمې په ډکولو او بيا يې خوندي
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,د فورمې په ډکولو او بيا يې خوندي
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,د ټولنې د بحث فورم
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,په سټاک واقعي qty
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,په سټاک واقعي qty
@@ -4057,7 +4083,7 @@
 DocType: Lab Test Template,Standard Selling Rate,معياري پلورل Rate
 DocType: Account,Rate at which this tax is applied,په ميزان کي دغه ماليه د اجرا وړ ده
 DocType: Cash Flow Mapper,Section Name,د برخې نوم
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,ترمیمي Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,ترمیمي Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,اوسنۍ دنده په پرانیستولو
 DocType: Company,Stock Adjustment Account,دحمل اصلاحاتو اکانټ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ولیکئ پړاو
@@ -4068,9 +4094,9 @@
 DocType: Task,depends_on,اړه لري پر
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,د ټولو موادو په وروستیو کې د وروستي قیمت نوي کولو لپاره قطع شوي. دا کیدای شي څو دقیقو وخت ونیسي.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,د نوو حساب نوم. یادونه: لطفا لپاره پېرودونکي او عرضه کوونکي حسابونو نه رامنځته کوي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پېرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,د هیواد په تلواله پته نمونې
 DocType: Water Analysis,Appearance,بڼه
+DocType: HR Settings,Leave Status Notification Template,د وضعیت د خبرتیا سمبول پریږدئ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,اوسط. د نرخ لیست نرخ
 DocType: Sales Order Item,Supplier delivers to Customer,عرضه کوونکي ته پيرودونکو برابروی
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,د غړو معلومات.
@@ -4093,7 +4119,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,اجازه نشته. مهرباني وکړئ د ازموینې چوکاټ غیر فعال کړئ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,سلنه تخصيص بايد مساوي له 100٪ وي
 DocType: Crop Cycle,Linked Land Unit,لینک شوی ځمکه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
@@ -4109,7 +4135,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,کاروونکو ته لاړ شه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} لپاره د قالب یو باوري دسته شمېر نه دی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},نوټ: د اجازه ډول کافي رخصت توازن نه شته {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},نوټ: د اجازه ډول کافي رخصت توازن نه شته {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,ناسم GSTIN يا د ناثبت شویو NA وليکئ
 DocType: Training Event,Seminar,سیمینار
 DocType: Program Enrollment Fee,Program Enrollment Fee,پروګرام شمولیت فیس
@@ -4125,14 +4151,14 @@
 DocType: Hub Settings,Publish Availability,پیدايښت د خپرېدو
 DocType: Company,Create Chart Of Accounts Based On,د حسابونو پر بنسټ چارت جوړول
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,نشي کولای چې په غیر ګروپ بدل شي. د ماشوم دندې شتون لري.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
 ,Stock Ageing,دحمل Ageing
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},د زده کونکو د {0} زده کوونکو د درخواست په وړاندې د شته {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),د سمبالولو رژیم (د شرکت پیسو)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ډله:
 DocType: Volunteer,Afternoon,ماسپښین
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,د ټاکل شويو Open
 DocType: Cheque Print Template,Scanned Cheque,سکن آرډر
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,اتومات بریښنالیکونو ته سپارل معاملو د اړيکې وليږئ.
@@ -4147,7 +4173,8 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +102,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
 DocType: Medical Department,Nursing User,د نرس کولو کارن
 DocType: Plant Analysis,Plant Analysis Criterias,د پلان تحلیل کونکيري
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,مسؤليتونه
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},سیریل نمبر {1} د بچ پورې تړاو نلري {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,مسؤليتونه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,د دې نرخ د اعتبار موده پای ته رسیدلې ده.
 DocType: Expense Claim Account,Expense Claim Account,اخراجاتو ادعا اکانټ
 DocType: Accounts Settings,Allow Stale Exchange Rates,د سټلایټ تبادلې نرخونو ته اجازه ورکړئ
@@ -4169,11 +4196,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ډولونه جوړ کړئ
 DocType: Item,Default BOM,default هیښ
 DocType: Project,Total Billed Amount (via Sales Invoices),د بشپړې شوې پیسې (د پلور انوګانو له لارې)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ډیبیټ يادونه مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ډیبیټ يادونه مقدار
 DocType: Project Update,Not Updated,تازه شوی نه دی
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",د نرخ تر مینځ توپیر شتون نلري، د ونډې او د حساب اندازه یې نه
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,مهرباني وکړئ د بيا ډول شرکت نوم د تایید
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Total وتلي نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Total وتلي نننیو
 DocType: Journal Entry,Printing Settings,د چاپونې امستنې
 DocType: Employee Advance,Advance Account,د پرمختګ حساب
 DocType: Job Offer,Job Offer Terms,د دندې وړاندیزونه شرطونه
@@ -4182,7 +4209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,مشين
 DocType: Vehicle,Insurance Company,د بیمې کمپنۍ
 DocType: Asset Category Account,Fixed Asset Account,د ثابت د شتمنیو د حساب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,څخه د سپارنې يادونه
 DocType: Chapter,Members,غړي
 DocType: Student,Student Email Address,د زده کوونکو دبرېښنا ليک پته:
@@ -4213,25 +4240,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
 DocType: Bank Reconciliation Detail,Payment Document,د پیسو د سند
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,د معیار فارمول ارزونه کې تېروتنه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,د داخلیدل نېټه بايد په پرتله د زېږېدو نېټه ډيره وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,د داخلیدل نېټه بايد په پرتله د زېږېدو نېټه ډيره وي
+DocType: Subscription,Plans,پلانونه
 DocType: Salary Slip,Salary Structure,معاش جوړښت
 DocType: Account,Bank,بانک د
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,هوايي شرکت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Issue مواد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,د بیا ځلې کولو په وخت کې یوه تېروتنه رامنځته شوه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Issue مواد
 DocType: Material Request Item,For Warehouse,د ګدام
 DocType: Employee,Offer Date,وړاندیز نېټه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,نه د زده کوونکو ډلو جوړ.
 DocType: Purchase Invoice Item,Serial No,پر له پسې ګڼه
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,مهرباني وکړئ لومړی داخل Maintaince نورولوله
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: د تمویل شوي نیټه نیټه د اخیستلو د نیټې نه مخکې نشي کیدی
 DocType: Purchase Invoice,Print Language,چاپ ژبه
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Sales Invoice,Customer PO Details,پیرودونکي پوټ جزئیات
-DocType: Subscription,Next Schedule Date,د بل شیدو نیټه
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,د لنډ وخت پرانيستلو حساب
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
@@ -4260,11 +4286,11 @@
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,څخه او د خرما اړتیا
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,د ذکر شویو معیارونو لپاره هیڅ کارمندان نشته
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
 DocType: Hotel Settings,Default Customer,اصلي پیرودونکی
 DocType: Assessment Plan,Supervisor Name,څارونکي نوم
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,دا تایید نه کړئ که چیرې د ورته ورځې لپاره ټاکنې جوړې شي
@@ -4289,16 +4315,16 @@
 DocType: Journal Entry Account,Employee Advance,د کارموندنې پرمختیا
 DocType: Payroll Entry,Payroll Frequency,د معاشونو د فریکونسۍ
 DocType: Lab Test Template,Sensitivity,حساسیت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,خام توکي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,خام توکي
 DocType: Leave Application,Follow via Email,ایمیل له لارې تعقيب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,د نباتاتو او ماشینونو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,د نباتاتو او ماشینونو
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,د مالیې د مقدار کمښت مقدار وروسته
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,هره ورځ د کار لنډیز امستنې
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,مهرباني وکړئ د رادډ نیټه په نیټه درج کړئ
 DocType: Payment Entry,Internal Transfer,کورني انتقال
 DocType: Asset Maintenance,Maintenance Tasks,د ترمیم دندې
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,يا هدف qty يا هدف اندازه فرض ده
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,د موجوده معاملو لګښت مرکز بدل نه شي چې د پنډو
@@ -4306,14 +4332,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext انټرنیټونه
 DocType: Crop Cycle,Detected Disease,ناروغی معلوم شوی
 ,Produced,تولید
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,د بیرته ورکولو تمدید نیټه د تادیاتو نیټه نه شي کیدی.
 DocType: Item,Item Code for Suppliers,د عرضه کوونکي د قالب کوډ
 DocType: Issue,Raised By (Email),راپورته By (Email)
 DocType: Training Event,Trainer Name,د روزونکي نوم
 DocType: Mode of Payment,General,جنرال
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},د Serialized د قالب سریال ترانسفارمرونو د مطلوب {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},د Serialized د قالب سریال ترانسفارمرونو د مطلوب {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,سره صورتحساب لوبه د پیسو ورکړه
 DocType: Journal Entry,Bank Entry,بانک د داخلولو
 DocType: Authorization Rule,Applicable To (Designation),د تطبیق وړ د (دنده)
@@ -4326,7 +4353,7 @@
 DocType: Guardian,Interests,د ګټو
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,فعال / معلول اسعارو.
 DocType: Production Plan,Get Material Request,د موادو غوښتنه ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,د پستي داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,د پستي داخراجاتو
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (نننیو)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,ساعتېري &amp; تفريح
 ,Item Variant Details,د توکي ډول توکی
@@ -4337,9 +4364,9 @@
 DocType: Drug Prescription,Hour,ساعت
 DocType: Restaurant Order Entry,Last Sales Invoice,د پلورنې وروستنی تیلیفون
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},مهرباني وکړئ د مقدار په مقابل کښی مقدار انتخاب کړئ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
 DocType: Lead,Lead Type,سرب د ډول
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,دا ټول توکي لا د رسیدونو شوي
 DocType: Company,Monthly Sales Target,د میاشتنۍ خرڅلاو هدف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},آیا له خوا تصویب شي {0}
@@ -4347,7 +4374,7 @@
 DocType: Item,Default Material Request Type,Default د موادو غوښتنه ډول
 DocType: Supplier Scorecard,Evaluation Period,د ارزونې موده
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,نامعلوم
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,د کار امر ندی جوړ شوی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,د کار امر ندی جوړ شوی
 DocType: Shipping Rule,Shipping Rule Conditions,انتقال حاکمیت شرايط
 DocType: Purchase Invoice,Export Type,د صادرولو ډول
 DocType: Salary Slip Loan,Salary Slip Loan,د معاش لپ ټاپ
@@ -4363,8 +4390,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,د انوګانو لنډیز
 DocType: Education Settings,Education Manager,د ښوونکي مدیر
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,د مطلوبه ودې لپاره په ساحه کې د هر نبات تر مینځ لږترلږه اوږدوالی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
 DocType: Quality Inspection,Report Date,د راپور تاریخ
 DocType: Student,Middle Name,منځنی نوم
 DocType: C-Form,Invoices,رسیدونه
@@ -4397,20 +4424,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,رسيد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,رسيد
 ,Sales Register,خرڅلاو د نوم ثبتول
 DocType: Daily Work Summary Group,Send Emails At,برېښناليک وليږئ کې
 DocType: Quotation,Quotation Lost Reason,د داوطلبۍ ورک دلیل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,د فارم لید
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,د لګښت لګښتونه د لګښت ادعا کې اجباري
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",کاروونکي د خپل ځان پرته بل سازمان ته اضافه کړئ.
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,نه پېرېدونکي تر اوسه!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,د مادي غوښتنه نه جوړه شوې
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
@@ -4433,11 +4461,12 @@
 DocType: Vehicle,Chassis No,Chassis نه
 DocType: Payment Request,Initiated,پیل
 DocType: Production Plan Item,Planned Start Date,پلان د پیل نیټه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,مهرباني وکړئ BOM غوره کړئ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,مهرباني وکړئ BOM غوره کړئ
 DocType: Purchase Invoice,Availed ITC Integrated Tax,د آی ټي ټي انډول شوي مالیه ترلاسه کړه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
+DocType: Bank Guarantee,Clauses and Conditions,بندیزونه او شرایط
 DocType: Serial No,Creation Document Type,د خلقت د سند ډول
 DocType: Project Task,View Timesheet,ټايمز پاڼه وګورئ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,د پای نیټه باید د پیل نیټې څخه ډیره وي
 DocType: Leave Type,Is Encash,ده Encash
 DocType: Leave Allocation,New Leaves Allocated,نوې پاڼې د تخصيص
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,د پروژې-هوښيار معلوماتو لپاره د داوطلبۍ شتون نه لري
@@ -4451,9 +4480,10 @@
 DocType: Patient,Alcohol Current Use,شرابو اوسنۍ استعمال
 DocType: Student Admission Program,Student Admission Program,د زده کوونکو د داخلیدو پروګرام
 DocType: Payment Entry,Account Paid To,حساب ته تحویلیږي.
+DocType: Subscription Settings,Grace Period,د ګرمې دوره
 DocType: Item Alternative,Alternative Item Name,د بدیل توکي
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,{0} د موروپلار د قالب باید یو دحمل د قالب نه وي
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",نشي کولی د معاش معاشونه وسپاري <br> \ ممکنه دلیلونه: <br> \ 1 خالص معاش د 0 څخه کم دی. <br> \ 2. د شرکت بریښنالیک پتې د کارمند ماسټر کې مشخص شوي ندي اعتباري. <br>
@@ -4463,7 +4493,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} لپاره د حساب د بودجې د {1} په وړاندې د {2} {3} دی {4}. دا به د زیات {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,له جملې څخه Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,او په معلول معلولیت لرونکی
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,لړۍ الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
@@ -4475,14 +4504,16 @@
 DocType: Complaint,Complaint,شکایت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,د بیرته راستنیدلو داخله واخلئ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,ټولې څانګې
 DocType: Patient,Alcohol Past Use,الکولي پخوانی کارول
 DocType: Fertilizer Content,Fertilizer Content,د سرې وړ منځپانګه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,CR
 DocType: Project Update,Problematic/Stuck,ستونزمن / پټه
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
 DocType: Share Transfer,Transfer,د انتقال د
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,د کار امر {0} باید د دې خرڅلاو د سپارلو مخه ونیسي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
@@ -4506,10 +4537,11 @@
 DocType: Cheque Print Template,Message to show,پيغام تر څو وښيي
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,پرچون
 DocType: Student Attendance,Absent,غیرحاضر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,د محصول د بنډل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,د محصول د بنډل
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,په {0} پېل کې د پېسو د موندلو توان نلري. تاسو اړتیا لرئ چې د 0 څخه تر 100 پورې پوښلو ته ولاړ شئ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,پیري مالیات او په تور کينډۍ
+DocType: Subscription,Current Invoice Start Date,د اوسنی انوائس د پیل نیټه
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} د {1}: یا ډیبیټ یا د پور اندازه د اړتيا {2}
 DocType: GL Entry,Remarks,څرګندونې
@@ -4519,11 +4551,13 @@
 DocType: Task,Parent Task,د والدین دندې
 DocType: Journal Entry,Write Off Based On,ولیکئ پړاو پر بنسټ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,د کمکیانو لپاره د مشرتابه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,چاپ او قرطاسيه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,چاپ او قرطاسيه
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,عرضه برېښناليک وليږئ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,عرضه برېښناليک وليږئ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
+DocType: Fiscal Year,Auto Created,اتوم جوړ شوی
 DocType: Chapter Member,Leave Reason,علت پریږدئ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,رسید {0} نور شتون نلري
 DocType: Guardian Interest,Guardian Interest,د ګارډین په زړه پوري
 DocType: Volunteer,Availability,شتون
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,د پیسو د انوز لپاره د بیالبیلو ارزښتونو ترتیبول
@@ -4532,14 +4566,13 @@
 DocType: Timesheet,Employee Detail,د کارګر تفصیلي
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,بل نېټه د ورځې او د مياشتې په ورځ تکرار بايد مساوي وي
 DocType: Lab Prescription,Test Code,د ازموینې کود
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,د ویب پاڼه امستنې
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFJs د {1} لپاره د سکډورډ کارډ له امله اجازه نه لري {1}
 DocType: Job Offer,Awaiting Response,په تمه غبرګون
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,پورته
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ټوله شمیره {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ټوله شمیره {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
 DocType: Supplier,Mention if non-standard payable account,یادونه که غیر معیاري د تادیې وړ حساب
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',لطفا د ارزونې په پرتله &#39;ټول ارزونه ډلو د نورو ګروپ غوره
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: د توکو لپاره د لګښت مرکز ته اړتیا ده {1}
@@ -4550,7 +4583,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,د اوبو تحلیل
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
 DocType: Holiday List,Weekly Off,د اونۍ پړاو
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,لینک شوي تجزیه بیاکتنه
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",د بيلګې په توګه د 2012 کال، 2012-13
@@ -4566,7 +4599,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,د پرزه د شتمنیو د لګښت
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} د {1}: لګښت لپاره مرکز د قالب الزامی دی {2}
 DocType: Vehicle,Policy No,د پالیسۍ نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,وېشل شوى
@@ -4606,21 +4639,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,پټه
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ته د پنډو لګښت مرکز بدلوي نشي کولای، ځکه دا د ماشوم غوټو لري
 DocType: Production Plan,Total Planned Qty,ټول پلان شوي مقدار
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,د پرانستلو په ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,د پرانستلو په ارزښت
 DocType: Salary Detail,Formula,فورمول
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,سریال #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سریال #
 DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,د پلور حساب
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,د پلور حساب
 DocType: Purchase Invoice Item,Total Weight,ټول وزن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,د کمیسیون په خرڅلاو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,د کمیسیون په خرڅلاو
 DocType: Job Offer Term,Value / Description,د ارزښت / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
 DocType: Purchase Order Item,Expected Delivery Date,د تمی د سپارلو نېټه
 DocType: Restaurant Order Entry,Restaurant Order Entry,د رستورانت امر
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
 DocType: Asset Maintenance Task,Assign To Name,نوم ته مراجعه وکړئ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ساعتېري داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,ساعتېري داخراجاتو
 DocType: Hub Settings,Enabled Users,فعال کارونکي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,د موادو غوښتنه د کمکیانو لپاره د
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},د پرانیستې شمیره {0}
@@ -4633,24 +4666,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,لپاره رخصت غوښتنلیکونه.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,سره د موجوده د راکړې ورکړې حساب نه ړنګ شي
 DocType: Vehicle,Last Carbon Check,تېره کاربن Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانوني داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,قانوني داخراجاتو
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,لطفا د قطار په کمیت وټاکي
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,د پرانستلو خرڅلاو او د پیرودونو انوایس جوړ کړئ
 DocType: Purchase Invoice,Posting Time,نوکرې وخت
 DocType: Timesheet,% Amount Billed,٪ بیل د
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telephone داخراجاتو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telephone داخراجاتو
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,وګورئ دا که تاسو غواړئ چې د کارونکي زور راوړي ترڅو د سپما لپاره مخکې له یو لړ ټاکي. هلته به نه default وي که چېرې تاسو د دې وګورئ.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},سره سریال نه نه د قالب {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},سره سریال نه نه د قالب {0}
 DocType: Email Digest,Open Notifications,د پرانستې د خبرتیا
 DocType: Payment Entry,Difference Amount (Company Currency),توپیر رقم (شرکت د اسعارو)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,مستقیم لګښتونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,مستقیم لګښتونه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نوي پېرېدونکي د عوایدو
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,د سفر لګښت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,د سفر لګښت
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},په doctype کې د ګمرک ساحه ګډون کړئ {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
 DocType: Purchase Receipt Item,Sample Quantity,نمونې مقدار
+DocType: Bank Guarantee,Name of Beneficiary,د ګټه اخیستونکي نوم
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",د BOM تازه معلومات د مهال ویش له لارې لګښت کوي، د قیمت د قیمت د نرخ / د نرخونو نرخ / د خامو موادو اخیستل شوي نرخ پر اساس.
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
@@ -4662,14 +4695,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,تعليقي
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,معاش د اجزاو
 DocType: Program Enrollment Tool,New Academic Year,د نوي تعليمي کال د
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,بیرته / اعتبار يادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,بیرته / اعتبار يادونه
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,ټولې ورکړل شوې پیسې د
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,ټولې ورکړل شوې پیسې د
 DocType: GST Settings,B2C Limit,B2C محدودیت
 DocType: Work Order Item,Transferred Qty,انتقال Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigating
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,د پلان
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,د پلان
 DocType: Share Balance,Issued,صادر شوی
+DocType: Loan,Repayment Start Date,د بیرته ورکولو تمدید نیټه
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,د زده کونکو د فعالیت
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,عرضه Id
 DocType: Payment Request,Payment Gateway Details,د پیسو ليدونکی نورولوله
@@ -4682,10 +4716,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",د پاڼو په شان واله ډول، ناروغ او داسې نور
 DocType: Email Digest,Send regular summary reports via Email.,منظم لنډیز راپورونه ليک له لارې واستوئ.
 DocType: Payment Entry,PE-,پيشبيني شوي
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
 DocType: Assessment Result,Student Name,د زده کوونکو نوم
 DocType: Brand,Item Manager,د قالب مدير
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,د معاشونو د راتلوونکې
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,د معاشونو د راتلوونکې
 DocType: Buying Settings,Default Supplier Type,Default عرضه ډول
 DocType: Plant Analysis,Collection Datetime,د وخت وخت راټولول
 DocType: Work Order,Total Operating Cost,Total عملياتي لګښت
@@ -4695,9 +4729,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,کارن {0} نه شته
 DocType: Payment Term,Day(s) after invoice date,د رسید نیټې وروسته ورځ (ورځې)
 DocType: Payment Schedule,Payment Schedule,د تادیاتو مهال ویش
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,لنډیزونه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,د پیسو د داخلولو د مخکې نه شتون
+DocType: Subscription,Trial Period End Date,د ازموینې موده پای نیټه
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,نه authroized راهیسې {0} حدودو څخه تجاوز
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,معاش کېنډۍ د بادار.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,پیژندولو
@@ -4714,9 +4748,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ته د ياه یا پېرېدونکي له قوله.
 DocType: Stock Settings,Role Allowed to edit frozen stock,رول اجازه کنګل سټاک د سمولو
 ,Territory Target Variance Item Group-Wise,خاوره د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ټول پيرودونکو ډلې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ټول پيرودونکو ډلې
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,جمع میاشتنی
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,د مالياتو د کينډۍ الزامی دی.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ګڼون {0}: Parent حساب {1} نه شته
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),د بیې په لېست کچه (د شرکت د اسعارو)
@@ -4725,14 +4759,15 @@
 DocType: Lab Prescription,Test Created,ازموینه جوړه شوه
 DocType: Healthcare Settings,Custom Signature in Print,په چاپ کې د ګمرک لاسلیک
 DocType: Account,Temporary,لنډمهاله
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,پیرودونکي LPO نمبر
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,پیرودونکي LPO نمبر
 DocType: Program,Courses,کورسونه
 DocType: Monthly Distribution Percentage,Percentage Allocation,سلنه تخصيص
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,منشي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,منشي
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",که ناتوان، &#39;په لفظ&#39; ډګر به په هيڅ معامله د لیدو وړ وي
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,دا عمل به راتلونکې راتلونکی بندول ودروي. ایا ته باوري یې چې دا ګډون رد کړې؟
 DocType: Serial No,Distinct unit of an Item,د يو قالب توپیر واحد
 DocType: Supplier Scorecard Criteria,Criteria Name,معیارونه نوم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,لطفا جوړ شرکت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,لطفا جوړ شرکت
 DocType: Pricing Rule,Buying,د خريداري
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ناروغي او سرې
 DocType: HR Settings,Employee Records to be created by,د کارګر سوابق له خوا جوړ شي
@@ -4741,18 +4776,18 @@
 DocType: POS Profile,Apply Discount On,Apply کمښت د
 DocType: Member,Membership Type,د غړیتوب ډول
 ,Reqd By Date,Reqd By نېټه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,پور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,پور
 DocType: Assessment Plan,Assessment Name,ارزونه نوم
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,په چاپ کې د PDC ښودل
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,په چاپ کې د PDC ښودل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,د کتارونو تر # {0}: شعبه الزامی دی
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,د قالب تدبيراومصلحت سره د مالياتو د تفصیلي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,دندې وړانديز
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,انستیتوت Abbreviation
 ,Item-wise Price List Rate,د قالب-هوښيار بیې په لېست کې و ارزوئ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,عرضه کوونکي د داوطلبۍ
 DocType: Quotation,In Words will be visible once you save the Quotation.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د داوطلبۍ وژغوري.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
@@ -4770,7 +4805,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total توپیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",که چېرې توانول شوی، دا سيستم به د محاسبې زياتونې لپاره د انبار په اتوماتيک ډول وروسته.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,صرافي
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,د {0} کارمند په ګډون لا د مخه د دې ورځې لپاره په نښه
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,د {0} کارمند په ګډون لا د مخه د دې ورځې لپاره په نښه
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",په دقيقه يي روز &#39;د وخت څېره&#39; له لارې
 DocType: Customer,From Lead,له کوونکۍ
@@ -4781,6 +4816,7 @@
 DocType: Lab Test,Approved Date,منظور شوی نیټه
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
+DocType: Subscriber,Subscriber Name,د ګډون کونکي نوم
 DocType: Serial No,Out of Warranty,د ګرنټی له جملې څخه
 DocType: BOM Update Tool,Replace,ځاېناستول
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,نه محصولات وموندل.
@@ -4790,19 +4826,18 @@
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
 DocType: Customer,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
 DocType: Journal Entry Account,If Income or Expense,که پر عايداتو او يا اخراجاتو
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},د کارموندنې پور کې د ګټو عوایدو حساب انتخاب کړئ {0}
 DocType: Work Order,Required Items,د اړتیا توکي
 DocType: Stock Ledger Entry,Stock Value Difference,دحمل ارزښت بدلون
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,د بشري منابعو
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,قطعا د پخلاينې د پیسو
 DocType: Disease,Treatment Task,د درملنې ټیم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,د مالياتو د جايدادونو د
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,د مالياتو د جايدادونو د
 DocType: BOM Item,BOM No,هیښ نه
 DocType: Instructor,INS/,ISP د /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ژورنال انفاذ {0} نه په پام کې نه لري د {1} يا لا نه خوری نورو کوپون پر وړاندې د
 DocType: Item,Moving Average,حرکت اوسط
 DocType: BOM Update Tool,The BOM which will be replaced,د هیښ چې به بدل شي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,الکترونیکي وسایلو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,الکترونیکي وسایلو
 DocType: Asset,Maintenance Required,ساتنه اړینه ده
 DocType: Account,Debit,ډیبیټ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,پاڼي باید د 0.5 ګونی ځانګړي شي
@@ -4811,7 +4846,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,بيالنس نننیو
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ټولګې اهدافو د قالب ګروپ-هوښيار د دې خرڅلاو شخص.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],د يخبندان په ډیپو کې د زړو څخه [ورځې]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
 DocType: Asset Maintenance Team,Maintenance Team Name,د ساتنې ټیم نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",که دوه يا زيات د بیې اصول دي د پورته شرايطو پر بنسټ وموندل شول، د لومړيتوب په توګه استعماليږي. د لومړیتوب دا دی چې 20 0 تر منځ د یو شمیر داسې حال کې تلواله ارزښت صفر ده (تش). د لوړو شمېر معنی چې که له هماغه حالت ته څو د بیو اصول شته دي دا به د لمړيتوب حق واخلي.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,پېرودونکي اړینه ده که چیرې د &quot;فرصت څخه&quot; د پیرودونکي په توګه وټاکل شي
@@ -4821,19 +4856,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,د اخراجاتو ادعا ډولونه.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
-DocType: Item,Taxes,مالیات
+DocType: Subscription,Taxes,مالیات
 DocType: Purchase Invoice,capital goods,سرمایه توکي
 DocType: Purchase Invoice Item,Weight Per Unit,د فی واحد وزن
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ورکړل او نه تحویلوونکی
 DocType: Project,Default Cost Center,Default لګښت مرکز
-DocType: Bank Guarantee,End Date,د پای نیټه
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,دحمل معاملې
 DocType: Budget,Budget Accounts,د بودجې د حسابونه
 DocType: Employee,Internal Work History,کورني کار تاریخ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,د استهلاک د مقدار
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,د خصوصي مساوات
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,د سپریرو څراغونو کارت variable
-DocType: Employee Loan,Fully Disbursed,په بشپړه توګه مصرف
 DocType: Employee Advance,Due Advance Amount,د وړاندیز شوي پیسو له امله
 DocType: Maintenance Visit,Customer Feedback,پيرودونکو Feedback
 DocType: Account,Expense,اخراجاتو
@@ -4857,7 +4890,7 @@
 ,Employee Information,د کارګر معلومات
 DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
 DocType: Quality Inspection,Incoming,راتلونکي
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,د پلور او اخیستلو لپاره د اصلي مالیې ټیکنالوژي جوړېږي.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
@@ -4865,7 +4898,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,نوکرې نېټه نه شي کولای راتلونکې نیټه وي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,د بیا تکرارولو لپاره
 DocType: Stock Entry,Target Warehouse Address,د ګودام ګودام پته
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,واله ته لاړل
 DocType: Agriculture Task,End Day,د پای پای
@@ -4890,11 +4922,10 @@
 DocType: Material Request,% Ordered,٪ د سپارښتنې
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",د کورس پر بنسټ د زده کوونکو د ډلې، د کورس لپاره به په پروګرام شموليت شامل کورسونه هر زده کوونکو اعتبار ورکړ شي.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. د خريداري Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. د خريداري Rate
 DocType: Share Balance,From No,له
 DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
 DocType: Employee,History In Company,تاریخ په شرکت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},د {sender} څخه نوی پیغام
 DocType: Customer,Customer Primary Address,پيرودونکي ابتدايي پته
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرپا
 DocType: Drug Prescription,Description/Strength,تفصیل / ځواک
@@ -4903,22 +4934,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ورته توکی دی څو ځله داخل شوي دي
 DocType: Department,Leave Block List,پريږدئ بالک بشپړفهرست
 DocType: Purchase Invoice,Tax ID,د مالياتو د تذکرو
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. کالم بايد خالي وي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. کالم بايد خالي وي
 DocType: Accounts Settings,Accounts Settings,جوړوي امستنې
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,منظور کړل
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",د {0} لپاره د خرابې بڼې پتې، مهرباني وکړئ دوام ومومي.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",د {0} لپاره د خرابې بڼې پتې، مهرباني وکړئ دوام ومومي.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",د نوي حساب شمېره، دا به د حساب په نوم کې د مخفف په توګه وکارول شي
 DocType: Maintenance Team Member,Team Member,د ډلې غړی
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,د سپارلو لپاره هیڅ نتیجه نشته
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
-DocType: Employee Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
+DocType: Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
 ,Project Quantity,د پروژې د مقدار
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
 DocType: Opportunity,To Discuss,د خبرو اترو
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
 DocType: Loan Type,Rate of Interest (%) Yearly,د ګټې کچه)٪ (کلنی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,لنډمهاله حسابونه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,تور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,لنډمهاله حسابونه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,تور
 DocType: BOM Explosion Item,BOM Explosion Item,هیښ چاودنه د قالب
 DocType: Shareholder,Contact List,د اړیکو لیست
 DocType: Account,Auditor,پلټونکي
@@ -4926,16 +4957,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} توکو توليد
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,نور زده کړئ
 DocType: Cheque Print Template,Distance from top edge,له پورتنی څنډې فاصله
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
 DocType: Purchase Invoice,Return,بیرته راتګ
 DocType: Pricing Rule,Disable,نافعال
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
 DocType: Project Task,Pending Review,انتظار کتنه
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",په نورو مخونو کې د نورو انتخابونو لکه شتمنۍ، سیریل نکس، بسته او نور لپاره سم کړئ.
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,ټاکنې او مشورې
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} په دسته کې د ده شامل نه {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",د شتمنیو د {0} نه پرزه شي، لکه څنګه چې د مخه د {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,اړتیاوې
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,اړتیاوې
 DocType: Task,Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک حاضر
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,د شرکت جوړولو لپاره ناکام شو
@@ -4947,7 +4978,7 @@
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,د بیړیو د مدیریت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Add له توکي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Add له توکي
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,فصلونه او ځمکې
 DocType: Cheque Print Template,Regular,منظم
 DocType: Fertilizer,Density (if liquid),کثافت (که چیری مائع)
@@ -4972,24 +5003,26 @@
 DocType: Payment Entry,Paid Amount,ورکړل مقدار
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,د پلور سایټ وپلټئ
 DocType: Assessment Plan,Supervisor,څارونکي
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,د ساتلو ذخیره کول
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,د ساتلو ذخیره کول
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
 ,Work Order Stock Report,د کار آرډ اسٹاک راپور
+DocType: Purchase Receipt,Auto Repeat Detail,د اتوماتیک تمدید تفصیل
 DocType: Assessment Result Tool,Assessment Result Tool,د ارزونې د پایلو د اوزار
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,د څارونکي په توګه
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,کټګورۍ ته لارښوونه
 DocType: BOM Scrap Item,BOM Scrap Item,هیښ Scrap د قالب
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,د کیفیت د مدیریت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,د کیفیت د مدیریت
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
 DocType: Project,Total Billable Amount (via Timesheets),د ټول وړ وړ مقدار (د ټایټ شیټونو له لارې)
 DocType: Agriculture Task,Previous Business Day,مخکینی کاروباری ورځ
-DocType: Employee Loan,Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول
+DocType: Loan,Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول
 DocType: Employee,Health Insurance No,د روغتیا بیمې نه
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,اعتبار يادونه نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,اعتبار يادونه نننیو
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,د مالیې وړ وړ ټولیز مقدار
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
 DocType: Opening Invoice Creation Tool,Purchase,رانيول
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,توازن Qty
@@ -5000,16 +5033,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} د {1}
 DocType: Healthcare Settings,Valid number of days,دقیق وخت
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,لګښت د مرکزونو
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,د ګډون بیا پیلول
 DocType: Land Unit,Linked Plant Analysis,تړل شوي پلان شننه
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,چې د عرضه کوونکي د پيسو کچه چې د شرکت د اډې اسعارو بدل
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},د کتارونو تر # {0}: د قطار تیارولو شخړو د {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
+DocType: Bank Guarantee,Receiving,ترلاسه کول
 DocType: Training Event Employee,Invited,بلنه
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,څو فعال معاش جوړښت لپاره د ورکړل شوي خرما د {0} کارمند وموندل شول
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup ليدونکی حسابونو.
 DocType: Employee,Employment Type,وظيفي نوع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ثابته شتمني
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ثابته شتمني
 DocType: Payment Entry,Set Exchange Gain / Loss,د ټاکلو په موخه د بدل لازمې / له لاسه ورکول
 ,GST Purchase Register,GST رانيول د نوم ثبتول
 ,Cash Flow,نقدو پیسو د جریان
@@ -5030,9 +5065,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,د ټولو ونډې لیږد لیست
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,د کارموندنۍ شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,د کارموندنۍ شمېرنې
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},لطفا پیدا ضميمه {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,د آزموینې دواړه د پیل نیټه د پیل نیټه او د آزموینې دورې پای نیټه باید وټاکل شي
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,اوسط کچه
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
+DocType: Subscription Plan Detail,Plan,پلان
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,بانک اعلامیه سلنه له بلونو په توګه انډول
 DocType: Job Applicant,Applicant Name,متقاضي نوم
 DocType: Authorization Rule,Customer / Item Name,پيرودونکو / د قالب نوم
@@ -5061,6 +5097,7 @@
 DocType: Work Order,Warehouses,Warehouses
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} د شتمنیو نه انتقال شي
 DocType: Hotel Room Pricing,Hotel Room Pricing,د هوټل خونې قیمت
+DocType: Subscription,Days Until Due,تر هغې پورې چې ورځې
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,د دې توکي د {0} (کينډۍ) يو variant ده.
 DocType: Workstation,per hour,په يوه ګړۍ کې
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,د خريدارۍ د
@@ -5069,13 +5106,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",د دسته پر بنسټ د زده کوونکو د ډلې، د زده کوونکو د سته به د پروګرام څخه د هر زده کوونکو اعتبار ورکړ شي.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ګدام په توګه د دې ګودام سټاک د پنډو ننوتلو شتون نه ړنګ شي.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ویش
+DocType: Journal Entry Account,Loan,پور
 DocType: Expense Claim Advance,Expense Claim Advance,د ادعا ادعا غوښتنه
 DocType: Lab Test,Report Preference,راپور غوره کول
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,رضاکار معلومات.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,پروژې سمبالګر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,پروژې سمبالګر
 ,Quoted Item Comparison,له خولې د قالب پرتله
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},په {0} او {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,چلاونه د
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,چلاونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max تخفیف لپاره توکی اجازه: {0} دی {1}٪
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,خالص د شتمنیو ارزښت په توګه د
 DocType: Crop,Produce,توليدول، جوړول
@@ -5085,7 +5123,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,د تولید لپاره د توکو مصرف
 DocType: Item Alternative,Alternative Item Code,د بدیل توکي
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
 DocType: Delivery Stop,Delivery Stop,د سپارلو بند
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
@@ -5095,15 +5133,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; پاکونکو
 DocType: BOM,Show Items,خپرونه توکی
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,له وخت نه شي کولای د وخت څخه ډيره وي.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ایا تاسو غواړئ ټول پیرودونکي د بریښنالیک له لارې خبر کړئ؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ایا تاسو غواړئ ټول پیرودونکي د بریښنالیک له لارې خبر کړئ؟
+DocType: Subscription Plan,Billing Interval,د بل کولو منځګړیتوب
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,حرکت انځوريز &amp; ویډیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,بیا پیل کول
 DocType: Hub Settings,Hub Username,د ګوتو کارن نوم
 DocType: Salary Detail,Component,برخه
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
 DocType: Healthcare Settings,Patient Name By,د ناروغ نوم
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},د {1} څخه تر {1} معاشونو لپاره د اشتراوی ژورنال ننوت
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},د {1} څخه تر {1} معاشونو لپاره د اشتراوی ژورنال ننوت
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
 DocType: Warehouse,Warehouse Name,ګدام نوم
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
@@ -5117,22 +5155,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",دلته تاسو د قد، وزن، الرجی، طبي اندېښنې او نور وساتي
 DocType: Leave Block List,Applies to Company,د دې شرکت د تطبيق وړ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
-DocType: Employee Loan,Disbursement Date,دویشلو نېټه
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;اخیستونکي&#39; مشخص شوي ندي
+DocType: Loan,Disbursement Date,دویشلو نېټه
 DocType: BOM Update Tool,Update latest price in all BOMs,په ټولو بومونو کې وروستي قیمت تازه کړئ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,طبي ریکارډ
 DocType: Vehicle,Vehicle,موټر
 DocType: Purchase Invoice,In Words,په وييکي
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,د تسلیم کولو دمخه د بانک یا پور ورکونکي سازمان نوم درج کړئ.
 DocType: POS Profile,Item Groups,د قالب ډلې
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
 DocType: Sales Order Item,For Production,د تولید
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,مهرباني وکړئ د حسابونو په چارټ کې د عارضي پرانیستلو حساب اضافه کړئ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,مهرباني وکړئ د حسابونو په چارټ کې د عارضي پرانیستلو حساب اضافه کړئ
 DocType: Customer,Customer Primary Contact,پیرودونکي لومړني اړیکه
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,د ژورنال تړلو موده
 DocType: Project Task,View Task,محتویات کاري
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
+DocType: Bank Guarantee,Bank Guarantee Type,د بانکي تضمین ډول
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,د انوائس پوسشن
 ,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
@@ -5143,9 +5182,8 @@
 DocType: Production Plan,Include Subcontracted Items,فرعي قرارداد شوي توکي شامل کړئ
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,سره یو ځای شول
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,په کمښت کې Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,د ذخیره کولو وروسته مختلف توپیرونه نشي راوولی. تاسو باید دا کار کولو لپاره نوي توکي جوړ کړئ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
-DocType: Employee Loan,Repay from Salary,له معاش ورکول
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+DocType: Loan,Repay from Salary,له معاش ورکول
 DocType: Leave Application,LAP/,دورو /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
 DocType: Salary Slip,Salary Slip,معاش ټوټه
@@ -5169,11 +5207,11 @@
 DocType: Employee Education,Employee Education,د کارګر ښوونه
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
 DocType: Land Unit,Parent Land Unit,د مور د ځمکې څانګه
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
 DocType: Fertilizer,Fertilizer Name,د سرې نوم
 DocType: Salary Slip,Net Pay,خالص د معاشونو
 DocType: Cash Flow Mapping Accounts,Account,ګڼون
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,شعبه {0} لا ترلاسه شوي دي
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,شعبه {0} لا ترلاسه شوي دي
 ,Requested Items To Be Transferred,غوښتنه سامان ته انتقال شي
 DocType: Expense Claim,Vehicle Log,موټر ننوتنه
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),د تبه شتون (temp&gt; 38.5 ° C / 101.3 ° F یا دوام لرونکی طنز&gt; 38 ° C / 100.4 ° F)
@@ -5214,38 +5252,38 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.
 DocType: Asset Maintenance,Manufacturing User,دفابريکي کارن
 DocType: Purchase Invoice,Raw Materials Supplied,خام مواد
-DocType: C-Form,Series,لړۍ
 DocType: Appraisal,Appraisal Template,ارزونې کينډۍ
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,د قالب طبقه
 DocType: Driver,License Number,د جواز نمبر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,کاروبار انکشاف مدير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,کاروبار انکشاف مدير
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,د ساتنې سفر هدف
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,د رسیدګۍ ناروغۍ راجستر
 DocType: Crop,Period,د دورې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,له بلونو
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},کارکوونکی د {0} په اړه چې رخصت پر {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},کارکوونکی د {0} په اړه چې رخصت پر {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,محتویات ياه
 DocType: Program Enrollment Tool,New Program,د نوي پروګرام
 DocType: Item Attribute Value,Attribute Value,منسوب ارزښت
 ,Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول
 DocType: Salary Detail,Salary Detail,معاش تفصیلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,مهرباني غوره {0} په لومړي
 DocType: Appointment Type,Physician,ډاکټر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشورې
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,د تولید د وخت پاڼه.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,پاسنۍ
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,د سود لیږد وروسته مختلف توپیرونه نشي راوولی. تاسو باید دا کار کولو لپاره نوي توکي جوړ کړئ.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,د ګیرډless SEPA منډول
 DocType: Physician,Charges,لګښتونه
 DocType: Production Plan,Get Items For Work Order,د کار امر لپاره توکي ترلاسه کړئ
 DocType: Salary Detail,Default Amount,default مقدار
 DocType: Lab Test Template,Descriptive,تشریحات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,دا مياشت د لنډيز
 DocType: Quality Inspection Reading,Quality Inspection Reading,د کیفیت د تفتیش د لوستلو
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,د پلور موخې وټاکئ چې تاسو غواړئ د خپل شرکت لپاره ترلاسه کړئ.
 ,Project wise Stock Tracking,د پروژې هوښيار دحمل څارلو
@@ -5273,11 +5311,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,د وېب پاڼه جوړولو کې پاتې راغله
 DocType: Soil Analysis,Mg/K,MG / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM اړونه تفصیلي
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,د ساتلو د ذخیره ننوتنې مخکې له مخکې رامینځته شوې یا نمونې مقدار ندی برابر شوی
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,د ساتلو د ذخیره ننوتنې مخکې له مخکې رامینځته شوې یا نمونې مقدار ندی برابر شوی
 DocType: Program,Program Abbreviation,پروګرام Abbreviation
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
 DocType: Warranty Claim,Resolved By,حل د
-DocType: Bank Guarantee,Start Date,پیل نېټه
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,د يوې مودې لپاره پاڼي تخصيص.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques او سپما په ناسم ډول پاکه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
@@ -5292,11 +5329,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعتونه
 DocType: Project,Expected Start Date,د تمی د پیل نیټه
 DocType: Purchase Invoice,04-Correction in Invoice,04-په انوائس کې اصلاح
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,د کار امر مخکې له دې د BOM سره د ټولو شیانو لپاره جوړ شو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,د کار امر مخکې له دې د BOM سره د ټولو شیانو لپاره جوړ شو
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,د توپیر تفصیلات
 DocType: Setup Progress Action,Setup Progress Action,د پرمختګ پرمختګ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,د نرخ لیست
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,د نرخ لیست
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,توکی لرې که په تور د تطبیق وړ نه دی چې توکی
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,ګډون تایید کړئ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,مهرباني وکړئ د بشپړولو په حال کې د ساتنې وضعیت غوره کړئ یا د ختم نیټه نیټه
 DocType: Supplier,Default Payment Terms Template,د اصلي تادیاتو شرایط سانچہ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,د راکړې ورکړې د اسعارو په توګه باید د پیسو ليدونکی اسعارو ورته وي
@@ -5307,7 +5345,6 @@
 DocType: Employee,Educational Qualification,د زده کړې شرایط
 DocType: Workstation,Operating Costs,د عملیاتي لګښتونو
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,که کړنه جمع میاشتنی بودجې زیات شو
-DocType: Subscription,Submit on creation,پر رامنځته سپارل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
 DocType: Asset,Disposal Date,برطرف نېټه
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",برېښناليک به د ورکړل ساعت چې د شرکت د ټولو فعاله کارمندان واستول شي، که رخصتي نه لرو. د ځوابونو لنډیز به په نيمه شپه ته واستول شي.
@@ -5326,6 +5363,7 @@
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Cheque Print Template,Cheque Print Template,آرډر چاپ کينډۍ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,د لګښت د مرکزونو چارت
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,د تادیې نیټې څخه وروسته د ورځو شمیر د ګډون تایید یا د غړیتوب نښې نښانې د نامناسب په توګه رد کړې
 DocType: Lab Test Template,Sample Collection,نمونه راغونډول
 ,Requested Items To Be Ordered,غوښتل توکي چې د سپارښتنې شي
 DocType: Price List,Price List Name,د بیې په لېست نوم
@@ -5334,7 +5372,7 @@
 DocType: Account,Income,پر عايداتو
 DocType: Industry Type,Industry Type,صنعت ډول
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,کومه تیروتنه وشوه!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,خبرداری: د وتو درخواست لاندې د بنديز خرما لرونکی د
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,خبرداری: د وتو درخواست لاندې د بنديز خرما لرونکی د
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,خرڅلاو صورتحساب {0} د مخکې نه سپارل
 DocType: Supplier Scorecard Scoring Criteria,Score,نمره
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,مالي کال د {0} نه شته
@@ -5353,12 +5391,12 @@
 DocType: Email Digest,Pending Quotations,انتظار Quotations
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,د استهلاک نیټه د شتون لپاره د کارولو نیټې نه وړاندې کیدی شي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ضمانته پور
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,ضمانته پور
 DocType: Cost Center,Cost Center Name,لګښت مرکز نوم
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max کار ساعتونو Timesheet پر وړاندې د
 DocType: Maintenance Schedule Detail,Scheduled Date,ټاکل شوې نېټه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ټولې ورکړل نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ټولې ورکړل نننیو
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages په پرتله 160 تورو هماغه اندازه به په څو پېغامونه ویشل شي
 DocType: Purchase Receipt Item,Received and Accepted,تر لاسه کړي او منل
 DocType: Hub Settings,Company and Seller Profile,د شرکت او پلورونکي پیژندنه
@@ -5372,10 +5410,9 @@
 DocType: Item,Variant Based On,variant پر بنسټ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,ستاسو د عرضه کوونکي
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,مهرباني وکړئ سم کړئ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,بې نومه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ترلاسه له
 DocType: Lead,Converted,بدلوی
@@ -5389,6 +5426,7 @@
 DocType: Asset,Assets,شتمنۍ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,کمپيوټر
 DocType: Item,List this Item in multiple groups on the website.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
+DocType: Subscription,Current Invoice End Date,د اوسنی انوائس پای نیټه
 DocType: Payment Term,Due Date Based On,د ټاکل شوي نیټې پر بنسټ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,مهرباني وکړئ د پلورونکو ترتیباتو کې د ډیزاین کونکي ګروپ او ساحه وټاکئ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} د {1} نه شته
@@ -5396,7 +5434,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,شمیره: {0} په سيستم کې نه شته
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
 DocType: Payment Reconciliation,Get Unreconciled Entries,تطبیق توکي ترلاسه کړئ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,د ژورنال ننوتلو لپاره هیڅ بیرته تادیه نه ده شوې
 DocType: Payment Reconciliation,From Invoice Date,له صورتحساب نېټه
+DocType: Loan,Disbursed,اختصاص شوی
 DocType: Healthcare Settings,Laboratory Settings,د لابراتواري امستنې
 DocType: Patient Appointment,Service Unit,د خدماتو څانګه
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,په بریالیتوب سره چمتو کونکي
@@ -5409,12 +5449,12 @@
 DocType: Share Balance,No of Shares,د ونډو نه
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,حالت وټاکئ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
 DocType: School House,House Name,ماڼۍ نوم
 DocType: Fee Schedule,Total Amount per Student,د هر زده کونکي ټوله اندازه
 DocType: Purchase Taxes and Charges,Account Head,ګڼون مشر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,برق
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ستاسو د کاروونکو د خپل سازمان د پاتې کړئ. تاسو هم کولای شی چې ستاسو تانبه پېرېدونکي ته بلنه اضافه له خوا څخه د اړيکې شمېره زياته يې
 DocType: Stock Entry,Total Value Difference (Out - In),Total ارزښت بدلون (له جملې څخه - په)
 DocType: Grant Application,Requested Amount,غوښتل شوي مقدار
@@ -5424,7 +5464,7 @@
 DocType: Crop Cycle,Detected Diseases,درملو ناروغي
 DocType: Stock Entry,Default Source Warehouse,Default سرچینه ګدام
 DocType: Item,Customer Code,پيرودونکو کوډ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
 DocType: Asset Maintenance Task,Last Completion Date,د پای بشپړولو نیټه
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
@@ -5432,9 +5472,10 @@
 DocType: GoCardless Settings,GoCardless Settings,د کډوال بې سارې ترتیبونه
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دحمل شتمني
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,دحمل شتمني
 DocType: Restaurant,Active Menu,فعالې غورنۍ
 DocType: Target Detail,Target Qty,هدف Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},د پور خلاف: {0}
 DocType: Shopping Cart Settings,Checkout Settings,رایستل امستنې
 DocType: Student Attendance,Present,اوسنی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,د سپارنې پرمهال يادونه {0} بايد وړاندې نه شي
@@ -5443,9 +5484,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
 DocType: Chapter,Chapter Head,د فصل سر
 DocType: Payment Term,Month(s) after the end of the invoice month,د رسیدنې میاشتې پای پورې میاشت میاشتې
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,د پروژې د فعاليت / دنده.
@@ -5453,11 +5494,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,معاش ټوټه تولید
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,د لابراتوار پایلې د وخت څخه ازموینې دمخه نشي کیدای
 DocType: POS Profile,Allow user to edit Discount,د کاروونکو د تادیه کولو اجازه ورکړه
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,پیرودونکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,پیرودونکي ترلاسه کړئ
 DocType: Purchase Invoice Item,Include Exploded Items,چاودیدونکي توکي شامل کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",د خريداري باید وکتل شي، که د تطبیق لپاره د ده په توګه وټاکل {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید څخه کم 100 وي
 DocType: Shipping Rule,Restrict to Countries,هیوادونو ته محدودیت
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),مقدار ولیکئ پړاو (د شرکت د اسعارو)
 DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
 DocType: Project,Total Sales Amount (via Sales Order),د پلور مجموعي مقدار (د پلور امر له الرې)
@@ -5476,6 +5518,7 @@
 DocType: Soil Texture,Sandy Clay,د سینڈی کلی
 DocType: Grant Application,Assessment  Manager,د ارزونې مدیر
 DocType: Payment Entry,Allocate Payment Amount,د پیسو مقدار د تخصيص
+DocType: Subscription Plan,Subscription Plan,د ګډون پلان
 DocType: Employee External Work History,Salary,معاش
 DocType: Serial No,Delivery Document Type,د سپارنې پرمهال د سند ډول
 DocType: Sales Order,Partly Delivered,خفيف د تحویلوونکی
@@ -5500,9 +5543,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max پياوړتيا
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,لګول شوي سایټونه
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},د سپارښتنې یادښت د پیرودونکو لپاره غوره شوی {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},د سپارښتنې یادښت د پیرودونکو لپاره غوره شوی {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,هیښ بدل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
 DocType: Grant Application,Has any past Grant Record,د تیر وړیا مرستې ریکارډ لري
 ,Sales Analytics,خرڅلاو Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},موجود {0}
@@ -5521,7 +5564,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مواد لګښت
 DocType: Selling Settings,Settings for Selling Module,لپاره خرڅول ماډل امستنې
 DocType: Hotel Room Reservation,Hotel Room Reservation,د هوټل خوندیتوب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,د پیرودونکو خدمت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,د پیرودونکو خدمت
 DocType: BOM,Thumbnail,بټنوک
 DocType: Item Customer Detail,Item Customer Detail,د قالب پيرودونکو تفصیلي
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,وړاندیز کانديد په دنده.
@@ -5536,7 +5579,7 @@
 DocType: Restaurant,Default Tax Template,اصلي مالی ټکي
 DocType: Fees,Student Details,د زده کونکو توضیحات
 DocType: Purchase Invoice Item,Stock Qty,سټاک Qty
-DocType: Employee Loan,Repayment Period in Months,په میاشتو کې بیرته ورکړې دوره
+DocType: Loan,Repayment Period in Months,په میاشتو کې بیرته ورکړې دوره
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,تېروتنه: يو د اعتبار وړ پېژند نه؟
 DocType: Naming Series,Update Series Number,تازه لړۍ شمېر
 DocType: Account,Equity,مساوات
@@ -5545,7 +5588,7 @@
 DocType: Task,Closing Date,بنديدو نېټه
 DocType: Sales Order Item,Produced Quantity,توليد مقدار
 DocType: Timesheet,Work Detail,د کار تفصیل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,انجنير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,انجنير
 DocType: Journal Entry,Total Amount Currency,Total مقدار د اسعارو
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,د لټون فرعي شورا
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
@@ -5591,13 +5634,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,د ډونر ډول ډول.
 DocType: Request for Quotation,Supplier Detail,عرضه تفصیلي
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},په فورمول يا حالت تېروتنه: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,رسیدونو د مقدار
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,رسیدونو د مقدار
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,د معیارونو وزن باید 100٪ ته ورسیږي
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,د حاضرۍ
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,سټاک توکی
 DocType: BOM,Materials,د توکو
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",که چک، په لست کې به ته د هر ریاست چې دا لري چې کارول کيږي زياته شي.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},جوړول {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,سرچینه او د هدف ګدام نه شي کولای ورته وي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,پست کوي وخت او نېټه امخ د الزامی دی
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,د معاملو اخلي د مالياتو کېنډۍ.
@@ -5621,14 +5663,14 @@
 DocType: Shipping Rule,Fixed,ثابت شوی
 DocType: Vehicle Service,Clutch Plate,د کلچ ذريعه
 DocType: Company,Round Off Account,حساب پړاو
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,اداري لګښتونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,اداري لګښتونه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent پيرودونکو ګروپ
-DocType: Journal Entry,Subscription,ګډون
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,ګډون
 DocType: Purchase Invoice,Contact Email,تماس دبرېښنا ليک
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,د فیس جوړونې تادیه کول
 DocType: Appraisal Goal,Score Earned,نمره لاسته راول
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,دمهلت دوره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,دمهلت دوره
 DocType: Asset Category,Asset Category Name,د شتمنیو کټه ګورۍ نوم
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,دا یوه د ريښو خاوره کې دی او نه تصحيح شي.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نوي خرڅلاو شخص نوم
@@ -5642,7 +5684,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Asset,Frequency of Depreciation (Months),د استهالک د فريکوينسي (مياشتې)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,اعتبار اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,اعتبار اکانټ
 DocType: Landed Cost Item,Landed Cost Item,تيرماښام لګښت د قالب
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر ارزښتونو وښایاست
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,د توکي مقدار توليدي وروسته ترلاسه / څخه د خامو موادو ورکول اندازه ګیلاسو
@@ -5650,7 +5692,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,ترلاسه / د راتلوونکې اکانټ
 DocType: Delivery Note Item,Against Sales Order Item,په وړاندې د خرڅلاو نظم قالب
 DocType: Hub Settings,Company Logo,د شرکت علامت
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},د بودجې د ګروپ د حساب په وړاندې نه شي کولای {0}
 DocType: Healthcare Settings,Patient Registration,د ناروغۍ ثبت
@@ -5685,11 +5727,10 @@
 DocType: Journal Entry,Total Debit,Total ګزارې
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default توکو د ګدام
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,لطفا ناروغان وټاکئ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,خرڅلاو شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,خرڅلاو شخص
 DocType: Hotel Room Package,Amenities,امکانات
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,د بودجې او لګښتونو مرکز
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,د پیسو ډیری ډیزاین موډل اجازه نه لري
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,لپاره
 ,Appointment Analytics,د استوګنې انټرنېټونه
 DocType: Vehicle Service,Half Yearly,نيمايي د اکتوبر
 DocType: Lead,Blog Subscriber,Blog د ګډون
@@ -5706,6 +5747,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,خالي پريږدئ که تاسو په هر کال کې زده کوونکو ډلو لپاره
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",که وکتل، ټول نه. د کاري ورځې به رخصتي شامل دي او دا کار به د معاش د ورځې د ارزښت د کمولو
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",د اوسني کیلي کارولو کاروونې به د لاسرسي وړ نه وي، ایا تاسو ډاډه یاست؟
+DocType: Subscription Settings,Prorate,پراخوالی
 DocType: Purchase Invoice,Total Advance,Total پرمختللی
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,د کود کوډ بدل کړئ
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
@@ -5717,8 +5759,9 @@
 DocType: Opportunity Item,Basic Rate,اساسي Rate
 DocType: GL Entry,Credit Amount,اعتبار مقدار
 DocType: Cheque Print Template,Signatory Position,لاسليک مقام
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,د ټاکل شويو Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,د ټاکل شويو Lost
 DocType: Timesheet,Total Billable Hours,Total Billable ساعتونه
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,د هغه ورځو شمېر چې هغه سبسایټ باید د دې ګډون لخوا تولید شوي انوګانو پیسې ورکړي
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,د پيسو د رسيد يادونه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,دا په دې پيرودونکو پر وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},د کتارونو تر {0}: ځانګړې اندازه {1} بايد په پرتله کمه وي او یا د پیسو د داخلولو اندازه مساوي {2}
@@ -5736,12 +5779,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),د بسپنو (شتمني) کاریال
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
 DocType: Assessment Result,Summary,لنډیز
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,نښه نښه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ډیبیټ اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,د رستورانت امر د ننوت توکي
@@ -5753,7 +5796,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,رانيول مقدار
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,د کارګر ګټې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Work Order,Manufactured Qty,جوړيږي Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},ونډې د {0} سره شتون نلري
@@ -5761,12 +5804,12 @@
 DocType: Asset,Out of Order,له کاره وتلی
 DocType: Purchase Receipt Item,Accepted Quantity,منل مقدار
 DocType: Projects Settings,Ignore Workstation Time Overlap,د کارګرۍ وخت وخت پرانيزئ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} نه شتون
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,انتخاب دسته شمیرې
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,بلونه د پېرېدونکي راپورته کړې.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,د پروژې Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
 DocType: Patient Service Unit,Medical Administrator,طبي مدیریت
 DocType: Assessment Plan,Schedule,مهال ويش
 DocType: Account,Parent Account,Parent اکانټ
@@ -5796,15 +5839,16 @@
 DocType: Asset Repair,Repair Status,د ترمیم حالت
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,د محاسبې ژورنال زياتونې.
 DocType: Delivery Note Item,Available Qty at From Warehouse,موجود Qty په له ګدام
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
 DocType: POS Profile,Account for Change Amount,د بدلون لپاره د مقدار حساب
 DocType: Purchase Invoice,input service,تڼۍ خدمت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,د ساتنې د ټیم غړی
 DocType: Agriculture Analysis Criteria,Soil Analysis,د خاورې شننه
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,د کورس کود:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
 DocType: Employee,Current Address,اوسني پته
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",که جنس د بل جنس بيا توضيحات، انځور، د قيمتونو، ماليه او نور به د کېنډۍ څخه جوړ شي يو variant دی، مګر په واضح ډول مشخص
 DocType: Serial No,Purchase / Manufacture Details,رانيول / جوړون نورولوله
@@ -5853,19 +5897,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},لپاره د شمولیت {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",د ټاکلو لپاره د بودجې، نښې او نور موسمي
 DocType: Supplier Scorecard Scoring Variable,Variable Name,متغیر نوم
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
 DocType: Asset,Asset Category,د شتمنیو کټه ګورۍ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,خالص د معاشونو نه کېدای شي منفي وي
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,ته عرضه مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,ته عرضه مواد
 DocType: Soil Texture,Loamy Sand,لامین ریت
 DocType: Production Plan,Material Request Planning,د موادو غوښتنې پلان جوړونه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,وسیله صورتحساب
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ښکاري څخه یو ځل بیا
 DocType: Expense Claim,Employees Email Id,د کارکوونکو دبرېښنا ليک Id
 DocType: Employee Attendance Tool,Marked Attendance,د پام وړ د حاضرۍ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,اوسني مسؤلیتونه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,اوسني مسؤلیتونه
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,تیمر له ځینو ساعتونو څخه تیریږي.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ستاسو د تماس ډله SMS وليږئ
 DocType: Patient,A Positive,A مثبت
@@ -5876,9 +5920,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,واقعي Qty الزامی دی
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
 DocType: Asset Maintenance Team,Asset Maintenance Team,د شتمنیو د ساتنې ټیم
-DocType: Employee Loan,Loan Type,د پور ډول
+DocType: Loan,Loan Type,د پور ډول
 DocType: Scheduling Tool,Scheduling Tool,مهال ويش له اوزار
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,باور كارت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,باور كارت
 DocType: BOM,Item to be manufactured or repacked,د قالب توليد شي او يا repacked
 DocType: Employee Education,Major/Optional Subjects,جګړن / اختیاري مضمونونه
 DocType: Sales Invoice Item,Drop Ship,څاڅکی کښتۍ
@@ -5909,7 +5953,7 @@
 DocType: Item,Units of Measure,د اندازه کولو واحدونه
 DocType: Manufacturing Settings,Allow Production on Holidays,په رخصتۍ تولید اجازه
 DocType: Sales Invoice,Customer's Purchase Order Date,پيرودونکو د اخستلو امر نېټه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,پلازمیینه دحمل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,پلازمیینه دحمل
 DocType: Shopping Cart Settings,Show Public Attachments,د عامې ضم وښایاست
 DocType: Packing Slip,Package Weight Details,بستې وزن نورولوله
 DocType: Restaurant Reservation,Reservation Time,د خوندیتوب وخت
@@ -5924,7 +5968,7 @@
 DocType: Purchase Order,To Receive and Bill,تر لاسه کول او د بیل
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: د رادډ تاریخ د لېږد نیټې څخه وړاندې نشي کیدی
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,مستند محصوالت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,په سکښتګر کې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,په سکښتګر کې
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,د قرارداد شرايط کينډۍ
 DocType: Serial No,Delivery Details,د وړاندې کولو په بشپړه توګه کتل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
@@ -5934,20 +5978,20 @@
 DocType: Driver,Expiry Date,د ختم نیټه
 DocType: Healthcare Settings,Employee name and designation in print,د کارمند نوم او چاپ په چاپ کې
 ,accounts-browser,حسابونو-کتنمل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,د پروژې د بادار.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ته-بلونو او یا د فرمایشاتو لپاره اجازه ورکړي، په سټاک امستنې او يا د قالب &quot;امتياز&quot; د اوسمهالولو.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,مه $ نور په څېر د هر سمبول تر څنګ اسعارو نه ښيي.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(نیمه ورځ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(نیمه ورځ)
 DocType: Payment Term,Credit Days,اعتبار ورځې
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,مهرباني وکړئ د لابراتوار آزموینې لپاره ناروغ ته وټاکئ
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,له هیښ توکي ترلاسه کړئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,د وخت ورځې سوق
 DocType: Cash Flow Mapping,Is Income Tax Expense,د عایداتو مالی لګښت دی
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,وګورئ دا که د زده کوونکو د ده په انستیتیوت په ليليه درلوده.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
 ,Stock Summary,دحمل لنډيز
@@ -5958,10 +6002,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,دسرچینی یادونه نېټه
 DocType: Employee,Reason for Leaving,د پرېښودو لامل
 DocType: BOM Operation,Operating Cost(Company Currency),عادي لګښت (شرکت د اسعارو)
-DocType: Employee Loan Application,Rate of Interest,د سود اندازه
+DocType: Loan Application,Rate of Interest,د سود اندازه
 DocType: Expense Claim Detail,Sanctioned Amount,تحریم مقدار
 DocType: Item,Shelf Life In Days,د شیلف ژوند په ورځو کې
 DocType: GL Entry,Is Opening,ده پرانيستل
+DocType: Department,Expense Approvers,لګښت تاوان
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
 DocType: Journal Entry,Subscription Section,د ګډون برخې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,ګڼون {0} نه شته
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 9ad35d7..6b48305 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -2,21 +2,19 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produtos para o Consumidor
-DocType: Purchase Receipt,Subscription Detail,Detalhe da inscrição
 DocType: Item,Customer Items,Itens de clientes
 DocType: Project,Costing and Billing,Custos e Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Superior {1} não pode ser um livro-razão
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações por Email
 DocType: SMS Center,All Sales Partner Contact,Todos os Contatos de Parceiros de Vendas
-DocType: Employee,Leave Approvers,Aprovadores de Licença
+DocType: Department,Leave Approvers,Aprovadores de Licença
 DocType: Purchase Order,PO-,PC-
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +253,Do you really want to scrap this asset?,Você realmente quer se desfazer deste ativo?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Job Applicant,Job Applicant,Candidato à Vaga
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado nas transações envolvendo este Fornecedor. Veja a linha do tempo abaixo para maiores detalhes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: Purchase Receipt Item,Required By,Entrega em
 DocType: Delivery Note,Return Against Delivery Note,Devolução contra Guia de Remessa
 DocType: Purchase Order,% Billed,Faturado %
@@ -34,17 +32,16 @@
 DocType: SMS Center,All Supplier Contact,Todos os Contatos de Fornecedor
 DocType: Support Settings,Support Settings,Configurações do Pós Vendas
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,A Data Prevista de Término não pode ser menor que a Data Prevista de Início
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha # {0}: O Valor deve ser o mesmo da {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha # {0}: O Valor deve ser o mesmo da {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Status do Vencimento do Item do Lote
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Cheque Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Cheque Administrativo
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
 DocType: Employee Education,Year of Passing,Ano de passagem
 apps/erpnext/erpnext/templates/includes/product_page.js +25,In Stock,Em Estoque
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes Abertos
 DocType: Production Plan Item,Production Plan Item,Item do Planejamento de Produção
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao Colaborador {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao Colaborador {1}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Plano de Saúde
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no Pagamento (Dias)
 DocType: Payment Terms Template Detail,Payment Terms Template Detail,Detalhes do Modelo de Termos de Pagamento
@@ -54,16 +51,14 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não corresponde com {3}
 DocType: Delivery Note,Vehicle No,Placa do Veículo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Por favor, selecione Lista de Preço"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Contador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Contador
 DocType: Cost Center,Stock User,Usuário de Estoque
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +46,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
 DocType: Asset,Value After Depreciation,Valor após Depreciação
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relacionados
 DocType: Grading Scale,Grading Scale Name,Nome escala de avaliação
-DocType: Subscription,Repeat on Day,Repetir no dia
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta é uma conta de root e não pode ser editada.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base em desconto para {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
@@ -87,7 +82,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo de operação real
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Selecionar LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Selecionar LDM
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
 DocType: Student Log,Student Log,Log do Aluno
@@ -99,11 +94,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
 DocType: Lead,Product Enquiry,Consulta de Produto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Por favor insira primeira empresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Por favor, selecione Empresa primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Em Graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Meta em
 DocType: BOM,Total Cost,Custo total
-DocType: Journal Entry Account,Employee Loan,Empréstimo para Colaboradores
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Extrato da conta
 DocType: Purchase Invoice Item,Is Fixed Asset,É Ativo Imobilizado
@@ -117,8 +111,8 @@
 DocType: Daily Work Summary,Daily Work Summary,Resumo de Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do Exercício Fiscal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} está congelado
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despesas com Estoque
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Despesas com Estoque
 DocType: Journal Entry,Contra Entry,Contrapartida de Entrada
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em moeda da empresa
 DocType: Delivery Note,Installation Status,Status da Instalação
@@ -126,7 +120,7 @@
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-primas para a Compra
 DocType: Products Settings,Show Products as a List,Mostrar Produtos como uma Lista
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +574,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Configurações para o Módulo de RH
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
@@ -134,7 +128,7 @@
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Criar Colaborador
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radio-difusão
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modo de Configuração do PDV (Online / Offline)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,execução
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Asset Maintenance Log,Maintenance Status,Status da Manutenção
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fornecedor é necessário contra Conta a Pagar {2}
@@ -143,14 +137,14 @@
 DocType: Grant Application,Individual,Pessoa Física
 DocType: Academic Term,Academics User,Usuário Acadêmico
 DocType: Cheque Print Template,Amount In Figure,Total em Espécie
-DocType: Employee Loan Application,Loan Info,Informações do Empréstimo
+DocType: Loan Application,Loan Info,Informações do Empréstimo
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Demonstrativos Financeiros
 DocType: Guardian,Students,Alunos
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regras para aplicação de preços e de desconto.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Valor Saída
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Valor Saída
 DocType: Production Plan,Sales Orders,Pedidos de Venda
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +394,Set as Default,Definir como padrão
 ,Purchase Order Trends,Tendência de Pedidos de Compra
@@ -162,7 +156,7 @@
 DocType: Employee,Create User,Criar Usuário
 DocType: Selling Settings,Default Territory,Território padrão
 DocType: Work Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},O valor do adiantamento não pode ser maior do que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},O valor do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: Company,Default Payroll Payable Account,Conta Padrão para Folha de Pagamentos
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Atualizar Grupo de Email
@@ -181,29 +175,29 @@
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nenhuma descrição informada
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitação de Compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Isto é baseado nos Registros de Tempo relacionados a este Projeto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,A Data da Licença deve ser maior que Data de Contratação
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,A Data da Licença deve ser maior que Data de Contratação
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione 'É Adiantamento' se este é um lançamento de adiantamento  relacionado à conta {1}."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Email Digest,Profit & Loss,Lucro e Perdas
 DocType: Task,Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo)
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Lançamentos do Banco
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Lançamentos do Banco
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item da Conciliação de Estoque
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Ferramenta de Criação de Grupo de Alunos
 DocType: Lead,Do Not Contact,Não entre em contato
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Pedido Mínimo
 ,Student Batch-Wise Attendance,Controle de Frequência por Série de Alunos
 DocType: POS Profile,Allow user to edit Rate,Permitir que o usuário altere o preço
 DocType: Item,Publish in Hub,Publicar no Hub
 DocType: Student Admission,Student Admission,Admissão do Aluno
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Requisição de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Requisição de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +448,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Item {0} não encontrado em 'matérias-primas fornecidas"" na tabela Pedido de Compra {1}"
@@ -218,7 +212,6 @@
 DocType: Student Group Student,Student Group Student,Aluno Grupo de Alunos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mais recentes
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Enviar contracheques para os colaboradores com base em email preferido selecionado no cadastro do colaborador
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro aprovador de licenças na lista vai ser definido como o aprovador de licenças padrão
 DocType: Tax Rule,Shipping County,Condado de Entrega
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo da Atividade por Colaborador
 DocType: Accounts Settings,Settings for Accounts,Configurações para Contas
@@ -249,8 +242,7 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Cursos
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgente] Ocorreu um erro ao criar %s recorrentes para %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
 DocType: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
@@ -265,6 +257,7 @@
 DocType: Quality Inspection,Inspected By,Inspecionado por
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demo do ERPNext
+DocType: Leave Application,Leave Approver Name,Nome do Aprovador de Licenças
 DocType: Depreciation Schedule,Schedule Date,Data Agendada
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Ganhos, Deduções e outros Componentes Salariais"
 DocType: Packed Item,Packed Item,Item do Pacote da Guia de Remessa
@@ -285,13 +278,13 @@
 DocType: Workstation,Consumable Cost,Custo dos Consumíveis
 DocType: Purchase Receipt,Vehicle Date,Data do Veículo
 DocType: Student Log,Medical,Médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Motivo para perder
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Motivo para perder
 DocType: Announcement,Receiver,Recebedor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Lab Test Template,Single,Solteiro
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, indique Centro de Custo"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Por favor, indique Centro de Custo"
 DocType: Journal Entry Account,Sales Order,Pedido de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Valor Médio de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Valor Médio de Venda
 DocType: Delivery Note,% Installed,Instalado %
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 DocType: Email Digest,Pending Purchase Orders,Pedidos de Compra Pendentes
@@ -305,7 +298,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registro do colaborador é criado usando o campo selecionado.
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Cadastro de feriados.
 DocType: Request for Quotation Item,Required Date,Para o Dia
@@ -325,7 +318,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registro de comparecimento.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente salarial para pagamento por hora.
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
-DocType: Employee Loan,Total Payment,Pagamento Total
+DocType: Loan,Total Payment,Pagamento Total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo entre operações (em minutos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado então a ação não pode ser concluída
 DocType: Pricing Rule,Valid Upto,Válido até
@@ -333,10 +326,10 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peças suficientes para construir
 DocType: POS Profile User,POS Profile User,Perfil de Usuário do PDV
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Receita Direta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Receita Direta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Escritório Administrativo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Por favor, selecione Empresa"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta Diferença
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
@@ -360,7 +353,7 @@
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Encargos
 DocType: Payment Entry Reference,Supplier Invoice No,Nº da nota fiscal de compra
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Fechamento (Cr)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
@@ -374,7 +367,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +34,Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Ano Financeiro / Exercício.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
 DocType: Supplier,Prevent RFQs,Evitar Orçamentos
 ,Lead Id,Cliente em Potencial ID
 DocType: Timesheet,Payslip,Holerite
@@ -385,24 +378,24 @@
 DocType: Job Applicant,Resume Attachment,Anexo currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes Repetidos
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Devolução de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Devolução de Vendas
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Banco de Dados de Clientes
 DocType: Quotation,Quotation To,Orçamento para
 DocType: Lead,Middle Income,Média Renda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Total alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Training Result Employee,Training Result Employee,Resultado do Treinamento do Colaborador
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
-DocType: Repayment Schedule,Principal Amount,Valor Principal
-DocType: Employee Loan Application,Total Payable Interest,Total de Juros a Pagar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Valor Principal
+DocType: Loan Application,Total Payable Interest,Total de Juros a Pagar
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Tempo da Fatura de Venda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,Selecione a conta de pagamento para fazer o lançamento bancário
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendedor {0} existe com o mesmo ID de Colaborador
 apps/erpnext/erpnext/config/education.py +180,Masters,Cadastros
 apps/erpnext/erpnext/config/accounts.py +138,Update Bank Transaction Dates,Conciliação Bancária
@@ -411,7 +404,7 @@
 DocType: Packing Slip Item,DN Detail,Detalhe DN
 DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas sobre Vendas
 DocType: Vehicle Service,Vehicle Service,Manutenção no Veículo
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Dispara automaticamente solicitações de feedback baseado em condições.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Dispara automaticamente solicitações de feedback baseado em condições.
 DocType: Employee,Reason for Resignation,Motivo para Demissão
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Modelo para avaliação de desempenho.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitida
@@ -423,9 +416,8 @@
 DocType: Activity Type,Default Costing Rate,Preço de Custo Padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação da Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Gestão de Emprestimos à Colaboradores
 DocType: Employee,Passport Number,Número do Passaporte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Gerente
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
@@ -452,11 +444,10 @@
 DocType: Work Order Operation,Actual Start Time,Hora Real de Início
 DocType: BOM Operation,Operation Time,Tempo da Operação
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Finalizar
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Valor do abatimento
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Valor do abatimento
 DocType: Leave Block List Allow,Allow User,Permitir que o usuário
 DocType: Journal Entry,Bill No,Nota nº
 DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganho / Perda com Descarte de Ativos
-DocType: Subscription,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Obrigatória
 DocType: BOM Item,Basic Rate (Company Currency),Valor Base (moeda da empresa)
 DocType: Student Attendance,Student Attendance,Frequência do Aluno
@@ -467,14 +458,14 @@
 DocType: Instructor Log,Other Details,Outros detalhes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Fornecedor
 DocType: Vehicle,Odometer Value (Last),Quilometragem do Odômetro (última)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Entrada de pagamento já foi criada
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Avaliação
 ,Absent Student Report,Relatório de Frequência do Aluno
 DocType: Email Digest,Next email will be sent on:,Próximo email será enviado em:
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,Tree Type,Tipo de árvore
@@ -484,7 +475,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Lançamento de Cartão de Crédito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresas e Contas
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Valor Entrada
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Valor Entrada
 DocType: Selling Settings,Close Opportunity After Days,Fechar Oportunidade Após Dias
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-primas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
@@ -502,7 +493,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para fabricação
 DocType: Opportunity,Opportunity From,Oportunidade de
 DocType: BOM,Website Specifications,Especificações do Site
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Linha {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
@@ -552,22 +543,22 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Parcialmente Comprados
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Pedido de Reembolso de Despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Despesas com Manutenção de Escritório
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Despesas com Manutenção de Escritório
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurando Conta de Email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Por favor, indique primeiro item"
 DocType: Account,Liability,Passivo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Liberado não pode ser maior do que no Pedido de Reembolso na linha {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Liberado não pode ser maior do que no Pedido de Reembolso na linha {0}.
 DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nenhuma permissão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nenhuma permissão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +59,"To filter based on Party, select Party Type first","Para filtrar baseado em Sujeito, selecione o Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
 DocType: Vehicle,Acquisition Date,Data da Aquisição
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da conciliação bancária
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenhum colaborador encontrado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 DocType: SMS Center,All Customer Contact,Todo o Contato do Cliente
@@ -594,7 +585,6 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
 DocType: Upload Attendance,Import Attendance,Importação de Ponto
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Todos os grupos de itens
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Work Order,Item To Manufacture,Item para Fabricação
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},O status {0} {1} é {2}
 DocType: Shopping Cart Settings,Enable Checkout,Ativar Caixa
@@ -602,7 +592,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Abrindo'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Abrindo'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atribuições em aberto
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
@@ -615,7 +605,7 @@
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +94,BOM #{0}: Raw material cannot be same as main Item,LDM # {0}: A matéria-prima não pode ser igual ao item principal
 DocType: SMS Log,Requested Numbers,Números solicitadas
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagamento {0} está vinculado à Ordem de Compra {1}, verificar se ele deve ser puxado como adiantamento da presente fatura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagamento {0} está vinculado à Ordem de Compra {1}, verificar se ele deve ser puxado como adiantamento da presente fatura."
 DocType: Sales Invoice Item,Stock Details,Detalhes do Estoque
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Ponto de Vendas
 DocType: Vehicle Log,Odometer Reading,Leitura do Odômetro
@@ -638,22 +628,22 @@
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Cadastro de Taxa de Câmbio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Work Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,LDM {0} deve ser ativa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,LDM {0} deve ser ativa
 DocType: Journal Entry,Depreciation Entry,Lançamento de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Materiais Visitas {0} antes de cancelar este Manutenção Visita
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qtde Requerida
 DocType: Bank Reconciliation,Total Amount,Valor total
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,Publishing Internet
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +25,Creating {0} Invoice,Criando Fatura de {0}
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valor Patrimonial
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valor Patrimonial
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe
 DocType: Item Barcode,Item Barcode,Código de barras do Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Adiantamento da Nota Fiscal de Compra
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}
 apps/erpnext/erpnext/config/accounts.py +246,Define budget for a financial year.,Defina orçamento para um ano fiscal.
@@ -669,14 +659,14 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +802,Sync Offline Invoices,Sincronizar Faturas Offline
 DocType: Program Fee,Program Fee,Taxa do Programa
 DocType: Material Request Item,Lead Time Date,Prazo de Entrega
-DocType: Employee Loan,Sanctioned,Liberada
+DocType: Loan,Sanctioned,Liberada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,é obrigatório. Talvez o registro de taxas de câmbios não está criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
 DocType: Student Admission,Publish on website,Publicar no site
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,A data da nota fiscal do fornecedor não pode ser maior do que data do lançamento
 DocType: Purchase Invoice Item,Purchase Order Item,Item do Pedido de Compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Receita Indireta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Receita Indireta
 DocType: Student Attendance Tool,Student Attendance Tool,Ferramenta de Presença dos Alunos
 DocType: Cheque Print Template,Date Settings,Configurações de Data
 DocType: SMS Center,Total Message(s),Total de mensagem(s)
@@ -697,7 +687,7 @@
 DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: Qtde não disponível do item {4} no armazén {1} no horário do lançamento ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor total por extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro. Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu carrinho
@@ -707,7 +697,7 @@
 DocType: Program Enrollment Tool Student,Student Batch Name,Nome da Série de Alunos
 DocType: Holiday List,Holiday List Name,Nome da Lista de Feriados
 DocType: Repayment Schedule,Balance Loan Amount,Saldo do Empréstimo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo descartado?
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +402,Qty for {0},Qtde para {0}
@@ -719,22 +709,22 @@
 DocType: Packing Slip Item,Packing Slip Item,Item da Lista de Embalagem
 DocType: Purchase Invoice,Cash/Bank Account,Conta do Caixa/Banco
 DocType: Delivery Note,Delivery To,Entregar Para
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Plan,Get Sales Orders,Obter Pedidos de Venda
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
 DocType: Workstation,Wages,Salário
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique um ID válido para Row linha {0} na tabela {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique um ID válido para Row linha {0} na tabela {1}"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o ambiente de trabalho e começar a usar ERPNext
 DocType: Landed Cost Item,Purchase Receipt Item,Item do Recibo de Compra
 DocType: POS Profile,Sales Invoice Payment,Pagamento da Fatura de Venda
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Venda / Armazém de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Valor de Venda
 DocType: Serial No,Creation Document No,Número de Criação do Documento
 DocType: Asset,Scrapped,Sucateada
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +42,WIP Warehouse,Armazén de Trabalho em Andamento
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Nº de Série {0} está sob contrato de manutenção até {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Viagem de Entrega
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Viagem de Entrega
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de Custo Padrão de Vendas
@@ -745,7 +735,7 @@
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Fazendo Lançamentos no Estoque
 DocType: Packing Slip,Net Weight UOM,Unidade de Medida do Peso Líquido
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentual Permitido de Produção Excedente
-DocType: Employee Loan,Repayment Schedule,Agenda de Pagamentos
+DocType: Loan,Repayment Schedule,Agenda de Pagamentos
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regra Condições de envio
 DocType: Holiday List,Get Weekly Off Dates,Obter datas de descanso semanal
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
@@ -756,7 +746,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Tempo de Cadastro Mínimo do Cliente  em Potencial (dias)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Todas as LDMs
 DocType: Expense Claim,From Employee,Do Colaborador
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento uma vez que o valor para o item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento uma vez que o valor para o item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar Lançamento de Contrapartida
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área de performance principal
@@ -785,15 +775,15 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
 DocType: Purchase Invoice,Is Return,É Devolução
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Devolução / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Devolução / Nota de Débito
 DocType: Price List Country,Price List Country,Preço da lista País
 DocType: Item,UOMs,Unidades de Medida
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Código do item não pode ser alterado para o nº de série.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código do item não pode ser alterado para o nº de série.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Fator de Conversão da Unidade de Medida
 DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados do fornecedor.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em Grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 DocType: Lead,Lead,Cliente em Potencial
 DocType: Email Digest,Payables,Contas a Pagar
@@ -821,7 +811,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Celular do Aluno
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resto do Mundo
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resto do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registro Contábil
@@ -837,7 +827,7 @@
 DocType: Opportunity Item,Opportunity Item,Item da Oportunidade
 ,Employee Leave Balance,Saldo de Licenças do Colaborador
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Taxa de avaliação exigida para o Item na linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Taxa de avaliação exigida para o Item na linha {0}
 DocType: Purchase Invoice,Rejected Warehouse,Armazén de Itens Rejeitados
 DocType: GL Entry,Against Voucher,Contra o Comprovante
 DocType: Item,Default Buying Cost Center,Centro de Custo Padrão de Compra
@@ -876,12 +866,12 @@
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Alíquota do Imposto do Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Bens de Capital
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Bens de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
 ,Team Updates,Updates da Equipe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Para Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total geral (moeda da empresa)
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Não havia nenhuma item chamado {0}
@@ -896,14 +886,14 @@
 DocType: Grading Scale Interval,Grade Code,Código de Nota de Avaliação
 DocType: POS Item Group,POS Item Group,Grupo de Itens PDV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
 DocType: Salary Slip,Bank Account No.,Nº Conta Bancária
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Lançar de Depreciação de Ativos no Livro Automaticamente
 DocType: BOM Operation,Workstation,Estação de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Orçamento para Fornecedor
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Ferramentas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Ferramentas
 DocType: Attendance,HR Manager,Gerente de RH
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, selecione uma empresa"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Privilege Leave,Privilege Deixar
@@ -923,15 +913,16 @@
 DocType: Project,Start and End Dates,Datas de início e término
 ,Delivered Items To Be Billed,"Itens Entregues, mas não Faturados"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir LDM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
 DocType: Purchase Invoice Item,UOM,UDM
 DocType: Rename Tool,Utilities,Serviços Públicos
 DocType: Asset,Depreciation Schedules,Tabelas de Depreciação
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Período de aplicação não pode estar fora do período de atribuição de licença
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicação não pode estar fora do período de atribuição de licença
 DocType: Payment Request,Transaction Currency,Moeda de transação
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},A partir de {0} | {1} {2}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Média Diária de Saída
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Status de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Purchase Invoice,Contact Person,Pessoa de Contato
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data de Início Esperada' não pode ser maior que 'Data Final Esperada'
 DocType: Holiday List,Holidays,Feriados
@@ -940,14 +931,14 @@
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir da data e hora
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Valor de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Valor de Compra
 DocType: Sales Invoice,Shipping Address Name,Endereço de Entrega
 DocType: Material Request,Terms and Conditions Content,Conteúdo dos Termos e Condições
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem Agendamento
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
 ,Purchase Invoice Trends,Tendência de Notas Fiscais de Compra
@@ -960,10 +951,10 @@
 DocType: HR Settings,Employee Settings,Configurações de Colaboradores
 ,Batch-Wise Balance History,Balanço por Histórico de Lotes
 DocType: Package Code,Package Code,Código do pacote
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativo Quantidade não é permitido
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Detalhe da tabela de imposto obtido a partir do cadastro do item como texto e armazenado neste campo. Usado para Tributos e Encargos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada, os lançamentos só serão permitidos aos usuários restritos."
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da vaga, qualificações exigidas, etc."
@@ -978,9 +969,9 @@
 DocType: Shipping Rule Condition,To Value,Para o Valor
 DocType: Asset Movement,Stock Manager,Gerente de Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},O armazén de origem é obrigatório para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Lista de Embalagem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Aluguel do Escritório
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurações de gateway SMS Setup
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Lista de Embalagem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Aluguel do Escritório
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configurações de gateway SMS Setup
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Falha na Importação!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho da Estação de Trabalho
@@ -991,14 +982,14 @@
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variantes dos Itens
 DocType: HR Settings,Email Salary Slip to Employee,Enviar contracheque para colaborador via email
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Selecione Possível Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Selecione Possível Fornecedor
 DocType: Sales Invoice,Source,Origem
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar fechada
 DocType: Leave Type,Is Leave Without Pay,É Licença não remunerada
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 DocType: Student Attendance Tool,Students HTML,Alunos HTML
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Lista(s) de embalagem cancelada(s)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Frete e Encargos de Envio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Frete e Encargos de Envio
 DocType: Homepage,Company Tagline for website homepage,O Slogan da Empresa para página inicial do site
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
 DocType: Pricing Rule,For Price List,Para Lista de Preço
@@ -1015,16 +1006,16 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Custo de Desembarque Ajuda
 DocType: Purchase Invoice,Select Shipping Address,Selecione um Endereço de Entrega
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Resumo do Contas a Receber
-DocType: Employee Loan,Monthly Repayment Amount,Valor da Parcela Mensal
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Resumo do Contas a Receber
+DocType: Loan,Monthly Repayment Amount,Valor da Parcela Mensal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome da Unidade de Medida
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Contribuição Total
 DocType: Purchase Invoice,Shipping Address,Endereço para Entrega
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta ferramenta ajuda você a atualizar ou corrigir a quantidade ea valorização das ações no sistema. Ele é geralmente usado para sincronizar os valores do sistema e que realmente existe em seus armazéns.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Por extenso será visível quando você salvar a Guia de Remessa.
 DocType: Purchase Receipt,Transporter Details,Detalhes da Transportadora
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Possível Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Possível Fornecedor
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Serviço de Saúde (beta)
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pedido de Venda do Plano de Produção
@@ -1047,17 +1038,17 @@
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se for selecionado, a Página Inicial será o Grupo de Itens padrão do site"
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Os pedidos de despesa da empresa.
 DocType: Company,Default Holiday List,Lista Padrão de Feriados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Passivo Estoque
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Passivo Estoque
 DocType: Purchase Invoice,Supplier Warehouse,Armazén do Fornecedor
 DocType: Opportunity,Contact Mobile No,Celular do Contato
 ,Material Requests for which Supplier Quotations are not created,"Itens Requisitados, mas não Cotados"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Linha {idx}: {field} é obrigatório para criar as notas de abertura {invoice_type}
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar email de pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova Tarefa
 apps/erpnext/erpnext/config/education.py +230,Other Reports,Relatórios Adicionais
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planejar operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Interromper lembretes de aniversários
 DocType: SMS Center,Receiver List,Lista de recebedores
@@ -1072,8 +1063,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +406,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,O Ano Financeiro Anterior não está fechado
 DocType: Quotation Item,Quotation Item,Item do Orçamento
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Cadastro de Tipo de Fornecedor
 DocType: Purchase Order Item,Supplier Part Number,Número da Peça do Fornecedor
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} está cancelado ou parado
@@ -1102,7 +1093,7 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve ser maior que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Cotação
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
 ,Lead Details,Detalhes do Cliente em Potencial
 DocType: Salary Slip,Loan repayment,Pagamento do empréstimo
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
@@ -1113,7 +1104,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Incluir feriados dentro de licenças como licenças
 DocType: Sales Invoice,Packed Items,Pacotes de Itens
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamação de Garantia contra nº de Série
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior do que o Total Geral {2}
@@ -1122,9 +1113,9 @@
 DocType: Packed Item,To Warehouse (Optional),Para o Armazén (Opcional)
 DocType: Payment Entry,Paid Amount (Company Currency),Valor pago (moeda da empresa)
 DocType: Selling Settings,Selling Settings,Configurações de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Realização
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despesas com Marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Despesas com Marketing
 ,Item Shortage Report,Relatório de Itens em Falta no Estoque
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisição de Material usada para fazer esta Entrada de Material
@@ -1136,7 +1127,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Warehouse required at Row No {0},Armazén necessário na Linha nº {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,Please enter valid Financial Year Start and End Dates,"Por favor, indique datas inicial e final válidas do Ano Financeiro"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Centro de Custo é necessário para a conta de ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Novo Contato
@@ -1161,7 +1152,7 @@
 DocType: Employee,Leave Encashed?,Licenças Cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"O campo ""Oportunidade de"" é obrigatório"
 DocType: Email Digest,Annual Expenses,Despesas Anuais
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Criar Pedido de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Criar Pedido de Compra
 DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
 DocType: Stock Reconciliation,Stock Reconciliation,Conciliação de Estoque
 DocType: Territory,Territory Name,Nome do Território
@@ -1169,13 +1160,13 @@
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidato à uma Vaga.
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações contratuais e outras informações gerais sobre o seu fornecedor
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Faturar
 DocType: GL Entry,Credit Amount in Account Currency,Crédito em moeda da conta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,LDM {0} deve ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1}
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gerir seus pedidos
@@ -1189,7 +1180,7 @@
 DocType: Material Request Plan Item,Actual Qty,Qtde Real
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Você digitou itens duplicados . Por favor, corrigir e tentar novamente."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associado
 DocType: Asset Movement,Asset Movement,Movimentação de Ativos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Novo Carrinho
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
@@ -1204,7 +1195,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendência de Faturamento de Vendas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Armazén de Entrega
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Árvore de Centros de Custo.
 DocType: Serial No,Delivery Document No,Nº do Documento de Entrega
@@ -1225,12 +1216,12 @@
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árvore de Grupos do Item
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Item {0} não está configurado para nºs de série mestre, verifique o cadastro do item"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Item {0} não está configurado para nºs de série mestre, verifique o cadastro do item"
 DocType: Maintenance Visit,Maintenance Time,Horário da Manutenção
 ,Amount to Deliver,Total à Entregar
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Ocorreram erros.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Ocorreram erros.
 DocType: Guardian,Guardian Interests,Interesses do Responsável
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criou
 DocType: Delivery Note Item,Against Sales Order,Relacionado ao Pedido de Venda
 ,Serial No Status,Status do Nº de Série
@@ -1245,14 +1236,14 @@
 DocType: Sales Person,Name and Employee ID,Nome e ID do Colaborador
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
 DocType: Website Item Group,Website Item Group,Grupo de Itens do Site
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impostos e Contribuições
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Qtde fornecida
 DocType: Purchase Order Item,Material Request Item,Item da Requisição de Material
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árvore de Grupos de itens .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Valor Base (moeda da empresa)
@@ -1264,7 +1255,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Por favor insira as Requisições de Material na tabela acima
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: BOM,Show In Website,Mostrar no Site
-DocType: Employee Loan Application,Total Payable Amount,Total a Pagar
+DocType: Loan Application,Total Payable Amount,Total a Pagar
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 DocType: Item Reorder,Check in (group),Entrada (grupo)
 ,Qty to Order,Qtde para Encomendar
@@ -1276,7 +1267,7 @@
 DocType: Appraisal,For Employee Name,Para Nome do Colaborador
 DocType: C-Form Invoice Detail,Invoice No,Nota nº
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Fazer Pagamento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Preço de Custo
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Endereços e Contatos do Cliente
 DocType: Employee,Resignation Letter Date,Data da Carta de Demissão
@@ -1284,7 +1275,7 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +127,Not Set,Não Definido
 DocType: Task,Total Billing Amount (via Time Sheet),Total Faturado (via Registro de Tempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Clientes Repetidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
 DocType: Asset,Depreciation Schedule,Tabela de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Item,Has Batch No,Tem nº de Lote
@@ -1295,7 +1286,6 @@
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
 ,Maintenance Schedules,Horários de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nova Mensagem
 ,Quotation Trends,Tendência de Orçamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
@@ -1304,7 +1294,7 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
 ,Vehicle Expenses,Despesas com Veículos
 DocType: Purchase Receipt,Vehicle Number,Placa do Veículo
-DocType: Employee Loan,Loan Amount,Valor do Empréstimo
+DocType: Loan,Loan Amount,Valor do Empréstimo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +443,Row {0}: Bill of Materials not found for the Item {1},Linha {0}: Lista de MAteriais não encontrada para o item {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de licenças alocadas {0} não pode ser menor do que as licenças já aprovadas {1} para o período
 DocType: Salary Structure,Select employees for current Salary Structure,Selecionar colaboradores para Estrutura Salário atual
@@ -1316,15 +1306,15 @@
 DocType: HR Settings,HR Settings,Configurações de RH
 DocType: Salary Slip,net pay info,Informações de remuneração líquida
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo para Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Esportes
 DocType: Loan Type,Loan Name,Nome do Empréstimo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Atual
 DocType: Student Siblings,Student Siblings,Irmãos do Aluno
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Por favor, especifique Empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Aquisição de Clientes e Fidelização
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazén onde você está mantendo estoque de itens rejeitados
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize seu navegador para que a alteração tenha efeito."
@@ -1337,29 +1327,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Requisições de Material foram criadas automaticamente com base no nível de reposição do item
 DocType: Email Digest,Pending Sales Orders,Pedidos de Venda Pendentes
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fator de Conversão da Unidade de Medida é necessário na linha {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
 DocType: Stock Reconciliation Item,Amount Difference,Valor da Diferença
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Digite o ID de Colaborador deste Vendedor
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +65,Difference Amount must be zero,O Valor da Diferença deve ser zero
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +61,Please enter Production Item first,"Por favor, indique item Produção primeiro"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo calculado do extrato bancário
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Orçamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Orçamento
 DocType: Salary Slip,Total Deduction,Dedução total
 ,Production Analytics,Análise de Produção
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Item {0} já foi devolvido
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Work Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descrição do Trabalho
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Abrir Novamente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descrição da Vaga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Abrir Novamente
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qtde por UDM do Estoque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"", não são permitidos em nomeação em série"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Clientes em Potencial, Orçamentos, Pedidos de Venda, de Campanhas e etc, para medir retorno sobre o investimento."
@@ -1371,10 +1361,9 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total alocado (moeda da empresa)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 DocType: BOM,Scrap Material Cost,Custo do Material Sucateado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,O Nº de Série {0} não pertence a nenhum Armazén
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,O Nº de Série {0} não pertence a nenhum Armazén
 DocType: Purchase Invoice,In Words (Company Currency),Por extenso (moeda da empresa)
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
-DocType: Employee Loan,Employee Loan Account,Conta de Empréstimo para Colaboradores
 DocType: Leave Application,Total Leave Days,Total de dias de licença
 DocType: Email Digest,Note: Email will not be sent to disabled users,Observação: Emails não serão enviado para usuários desabilitados
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,Selecione a Empresa...
@@ -1389,7 +1378,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou um serviço que é comprado, vendido ou mantido em estoque."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nenhum update
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Criança item não deve ser um pacote de produtos. Por favor remover o item `` {0} e salvar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bancário
 DocType: Vehicle Service,Service Item,Item de Manutenção
@@ -1408,11 +1397,11 @@
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
 DocType: Sales Invoice,Total Billing Amount,Valor Total do Faturamento
 DocType: Fee Schedule,Receivable Account,Contas a Receber
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Estoque
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Pedido de Venda para Pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Por favor, selecione conta correta"
 DocType: Purchase Invoice Item,Weight UOM,UDM de Peso
 DocType: Salary Structure Employee,Salary Structure Employee,Colaborador da Estrutura Salário
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um colaborador específico
@@ -1427,14 +1416,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não serão mostrados se a lista de preços não estiver configurada
 DocType: Stock Entry,Total Incoming Value,Valor Total Recebido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Para Débito é necessária
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Preço de Compra Lista
 DocType: Job Offer Term,Offer Term,Termos da Oferta
 DocType: Asset,Quality Manager,Gerente de Qualidade
 DocType: Job Applicant,Job Opening,Vaga de Trabalho
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, selecione a pessoa responsável"
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total a Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,LDM da Operação do Site
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Valor Total Faturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Valor Total Faturado
 DocType: Supplier,Warn RFQs,Alertar em Solicitações de Orçamentos
 DocType: Assessment Plan,To Time,Até o Horário
 DocType: Authorization Rule,Approving Role (above authorized value),Função de Aprovador (para autorização de valor excedente)
@@ -1445,11 +1434,11 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preço de {0} está desativado
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A qtde concluída não pode ser superior a {1} para a operação {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir Hora Extra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado utilizando a Reconciliação de Estoque, utilize o Lançamento de Estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado utilizando a Reconciliação de Estoque, utilize o Lançamento de Estoque"
 DocType: Training Event Employee,Training Event Employee,Colaborador do Evento de Treinamento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} número de série é necessário para item {1}. Você forneceu {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} número de série é necessário para item {1}. Você forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taxa Atual de Avaliação
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganho/Perda com Câmbio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Ganho/Perda com Câmbio
 DocType: Opportunity,Lost Reason,Motivo da Perda
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Por favor insira o Documento de Recibo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
@@ -1459,15 +1448,14 @@
 DocType: Bin,Actual Quantity,Quantidade Real
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: envio no dia seguinte
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} não foi encontrado
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},A inscrição foi {0}
 DocType: Fee Schedule Program,Student Batch,Série de Alunos
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Fazer Aluno
 apps/erpnext/erpnext/projects/doctype/project/project.py +218,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplique agora
 ,Bank Clearance Summary,Resumo da Liquidação Bancária
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
 DocType: Appraisal Goal,Appraisal Goal,Meta de Avaliação
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Edifícios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Edifícios
 DocType: Fee Schedule,Fee Structure,Estrutura da Taxa
 DocType: Timesheet Detail,Costing Amount,Valor de Custo
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Enviar Folha de Pagamentos
@@ -1482,7 +1470,7 @@
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,Informe a 'Data Inicial'
 DocType: Employee,Employment Details,Detalhes de emprego
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nenhum artigo com código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nenhum artigo com código de barras {0}
 DocType: Item,Show a slideshow at the top of the page,Mostrar uma apresentação de slides no topo da página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,LDMs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +33,Ageing Based On,Envelhecimento Baseado em
@@ -1495,10 +1483,10 @@
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Reposição de Item
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Mostrar Contracheque
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Mostrar Contracheque
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Selecione a conta de troco
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
@@ -1507,8 +1495,8 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +78,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
 DocType: Grading Scale Interval,Grade Description,Descrição da Nota de Avaliação
 DocType: Stock Entry,Purchase Receipt No,Nº do Recibo de Compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal/Garantia em Dinheiro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fonte de Recursos (Passivos)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Sinal/Garantia em Dinheiro
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Fonte de Recursos (Passivos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},A quantidade na linha {0} ( {1} ) deve ser a mesma que a quantidade fabricada {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Colaborador
 DocType: Training Event,End Time,Horário de Término
@@ -1533,7 +1521,7 @@
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 DocType: Warranty Claim,Raised By,Levantadas por
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Por favor, especifique a Empresa para prosseguir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Por favor, especifique a Empresa para prosseguir"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,compensatória Off
 DocType: Job Offer,Accepted,Aceito
 DocType: BOM Update Tool,BOM Update Tool,Ferramenta de atualização da Lista de Materiais
@@ -1544,7 +1532,7 @@
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Lançamento no Livro Diário Rápido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Lançamento no Livro Diário Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
@@ -1585,12 +1573,12 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo com a UDM do estoque)
 DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Por favor, informe os melhores valores e condições possíveis para os itens especificados"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Por favor, informe os melhores valores e condições possíveis para os itens especificados"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Criar Fatura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Fechar automaticamente a oportunidade após 15 dias
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ano Final
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Orçamento  / Cliente em Potencial %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
 DocType: Delivery Note,DN-,GDR-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} relacionado ao Pedido de Compra {1}
@@ -1642,7 +1630,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},Registos de Taxas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade no Pedido de Venda {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,O responsável pelo Próximo Contato não pode ser o mesmo que o Endereço de Email de Potencial Cliente
 DocType: Tax Rule,Billing City,Cidade de Faturamento
@@ -1662,9 +1650,9 @@
 DocType: Salary Structure,Total Earning,Total de ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Branch master da organização.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ou
 DocType: Sales Order,Billing Status,Status do Faturamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Despesas com Serviços Públicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Lista de preço de compra padrão
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Demonstrativo de pagamento baseado em controle de tempo
@@ -1690,7 +1678,7 @@
 DocType: Delivery Note,DN-RET-,GDR-DEV
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerada para todos os itens. Por favor, clique em ""Gerar Agenda"""
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Fazer Usuário
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a Entrega (para impressão)
 DocType: Landed Cost Voucher,Purchase Receipt Items,Itens do Recibo de Compra
@@ -1704,7 +1692,7 @@
 DocType: Item Reorder,Material Request Type,Tipo de Requisição de Material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row {0}: UOM Conversion Factor is mandatory,Linha {0}: Fator de Conversão da Unidade de Medida é obrigatório
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Referência
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Comprovante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Comprovante #
 DocType: Notification Control,Purchase Order Message,Mensagem do Pedido de Compra
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Esconder CPF/CNPJ em transações de vendas
 DocType: Upload Attendance,Upload HTML,Upload HTML
@@ -1714,11 +1702,11 @@
 DocType: Employee Education,Class / Percentage,Classe / Percentual
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Imposto de Renda
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
 DocType: Company,Stock Settings,Configurações de Estoque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Ganho/Perda no Descarte de Ativo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Ganho/Perda no Descarte de Ativo
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerenciar grupos de clientes
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
@@ -1732,11 +1720,11 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,Admissões de Alunos
 DocType: Supplier,Billing Currency,Moeda de Faturamento
 DocType: Sales Invoice,SINV-RET-,NFV-DEV-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Grande
 ,Profit and Loss Statement,Demonstrativo de Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número do cheque
 DocType: Journal Entry,Total Credit,Crédito total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
 DocType: Homepage Featured Product,Homepage Featured Product,Produtos em Destaque na Página Inicial
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nome do Novo Armazén
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,O número de visitas é obrigatório
@@ -1748,12 +1736,13 @@
 DocType: Fees,Fees,Taxas
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,O Orçamento {0} está cancelado
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Saldo devedor total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Saldo devedor total
 DocType: Price List,Price List Master,Cadastro da Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número da Ordem de Venda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +241,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Somente pedidos de licença com o status ""Aprovado"" ou ""Rejeitado"" podem ser enviados"
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Nome do Grupo de Alunos é obrigatório na linha {0}
 DocType: Homepage,Products to be shown on website homepage,Produtos para serem mostrados na página inicial
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este é um grupo de clientes de raiz e não pode ser editada.
@@ -1788,10 +1777,10 @@
  1. Formas de disputas de endereçamento, indenização, responsabilidade, etc. 
  1. Endereço e de contato da sua empresa."
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Despesa conta / Diferença ({0}) deve ser um 'resultados' conta
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Comparecimento para o colaborador {0} já está marcado
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Comparecimento para o colaborador {0} já está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Se mais do que uma embalagem do mesmo tipo (para impressão)
 DocType: Warehouse,Parent Warehouse,Armazén Pai
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Defina vários tipos de empréstimos
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Defina vários tipos de empréstimos
 DocType: Bin,FCFS Rate,Taxa FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Valor Devido
 DocType: Project Task,Working,Trabalhando
@@ -1824,21 +1813,21 @@
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
-DocType: Employee Loan,Loan Details,Detalhes do Empréstimo
+DocType: Loan,Loan Details,Detalhes do Empréstimo
 DocType: Company,Default Inventory Account,Conta de Inventário Padrão
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A qtde concluída deve superior a zero.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional em
 DocType: Account,Root Type,Tipo de Raiz
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de slides no topo da página
 DocType: BOM,Item UOM,Unidade de Medida do Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto após desconto (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Purchase Invoice,Select Supplier Address,Selecione um Endereço do Fornecedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Adicionar Colaboradores
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Muito Pequeno
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Adicionar Colaboradores
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Muito Pequeno
 DocType: Company,Standard Template,Template Padrão
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
 DocType: Payment Request,Mute Email,Mudo Email
@@ -1857,10 +1846,10 @@
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de orçamento.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Student Log,Academic,Acadêmico
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente metas nos meses.
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Lista de Preço Moeda não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Lista de Preço Moeda não selecionado
 ,Student Monthly Attendance Sheet,Folha de Presença Mensal do Aluno
 DocType: Rename Tool,Rename Log,Renomear Log
 DocType: Maintenance Visit Purpose,Against Document No,Contra o Documento Nº
@@ -1870,7 +1859,7 @@
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Presença Desmarcada
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Pesquisador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Pesquisador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ferramenta de Inscrição de Alunos no Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome ou email é obrigatório
 DocType: Purchase Order Item,Returned Qty,Qtde Devolvida
@@ -1878,14 +1867,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +156,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, as Cotações para este fornecedor devem ser emitidas com cautela."
 DocType: BOM,Total Cost(Company Currency),Custo total (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Nº de Série {0} criado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Nº de Série {0} criado
 DocType: Homepage,Company Description for website homepage,A Descrição da Empresa para a página inicial do site
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como Notas Fiscais e Guias de Remessa"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome do Fornecedor
 DocType: Sales Invoice,Time Sheet List,Lista de Registros de Tempo
 DocType: Employee,You can enter any date manually,Você pode inserir qualquer data manualmente
 DocType: Asset Category Account,Depreciation Expense Account,Conta de Depreciação
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Período Probatório
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Avanço contra o Cliente deve estar de crédito
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Não-Grupo para Grupo
@@ -1894,7 +1883,7 @@
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o Pagamento via Lançamento no Livro Diário
 DocType: Fee Component,Fees Category,Categoria de Taxas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Por favor, indique data da liberação."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Por favor, indique data da liberação."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Total
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se o motivo da consulta foi uma campanha.
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selecione Ano Fiscal
@@ -1906,7 +1895,7 @@
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marcar Meio Período
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicar lançamento
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicar lançamento
 DocType: Program Enrollment Tool,Get Students,Obter Alunos
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar o Pedido de Venda.
 ,Employee Birthday,Aniversário dos Colaboradores
@@ -1961,11 +1950,11 @@
 DocType: Serial No,Warranty / AMC Details,Garantia / Detalhes do CAM
 DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de Renda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de Trabalho Interno do Colaborador
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Fechamento (Dr)
 DocType: Cheque Print Template,Cheque Size,Tamanho da Folha de Cheque
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Nº de Série {0} esgotado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Nº de Série {0} esgotado
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modelo impostos para transações de venda.
 DocType: Sales Invoice,Write Off Outstanding Amount,Abater saldo devedor
 DocType: Stock Settings,Default Stock UOM,Unidade de Medida Padrão do Estoque
@@ -1977,14 +1966,14 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Total Faturado
 DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ordem fechada não pode ser cancelada. Unclose para cancelar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliação bancária
 DocType: Attendance,On Leave,De Licença
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Receber notícias
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Conta {2} não pertence à empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +166,Material Request {0} is cancelled or stopped,Requisição de Material {0} é cancelada ou parada
 DocType: Lead,Lower Income,Baixa Renda
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número do Pedido de Compra necessário para o item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
@@ -2008,11 +1997,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +60,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},O Orçamento {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Conta Bancária Garantida
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Conta Bancária Garantida
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Navegar LDM
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as contas relacionadas com depreciação de ativos em Categoria {0} ou Empresa {1}"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo de Abertura do Patrimônio Líquido
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Saldo de Abertura do Patrimônio Líquido
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Remanescente
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
@@ -2024,7 +2013,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Conta com nós filho não pode ser definido como contabilidade
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base do cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (moeda da empresa)
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante liberado total
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante liberado total
 DocType: Salary Slip,Hour Rate,Valor por Hora
 DocType: Stock Settings,Item Naming By,Nomeação de Item por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
@@ -2044,9 +2033,10 @@
 DocType: Journal Entry,Bill Date,Data de Faturamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
+DocType: Expense Claim,Approval Status,Estado da Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,por transferência bancária
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Marcar todos
 DocType: Vehicle Log,Invoice Ref,Nota Fiscal de Referência
 DocType: Company,Default Income Account,Conta Padrão de Recebimento
@@ -2062,17 +2052,16 @@
 DocType: Purchase Order Item Supplied,Stock UOM,Unidade de Medida do Estoque
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,Pedido de Compra {0} não é enviado
 DocType: Work Order Item,Available Qty at WIP Warehouse,Qtd disponível no Armazén de Trabalho em Andamento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem do Orçamento
-DocType: Employee Loan,Employee Loan Application,Pedido de Emprestimo de Colaborador
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +76,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Nenhum contato adicionado ainda.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Comprovante de Custo do Desembarque
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturas emitidas por Fornecedores.
 DocType: POS Profile,Write Off Account,Conta de Abatimentos
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota de débito Total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota de débito Total
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Valor do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolução Relacionada à Nota Fiscal de Compra
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,Subcontratação
@@ -2092,7 +2081,7 @@
 DocType: Vehicle,Insurance Details,Detalhes do Seguro
 DocType: Account,Payable,A pagar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Novos
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Lucro Bruto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Lucro Bruto %
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
 DocType: Lead,Address Desc,Descrição do Endereço
@@ -2102,7 +2091,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Selecione a natureza do seu negócio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
 DocType: Asset Movement,Source Warehouse,Armazém de origem
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
 DocType: C-Form,Total Invoiced Amount,Valor Total Faturado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +50,Min Qty can not be greater than Max Qty,Qtde mínima não pode ser maior do que qtde máxima
 DocType: Stock Entry,Customer or Supplier Details,Detalhes do Cliente ou Fornecedor
@@ -2111,7 +2100,7 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qtde Disponível do Lote no Armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID da folha de pagamento
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Contratação
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Contratação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Recebimentos
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
@@ -2125,11 +2114,10 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Cabeçalhos para modelos de impressão.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 DocType: Student Guardian,Student Guardian,Responsável pelo Aluno
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Atualizar Estoque
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,na inscrição
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDM diferente para itens gerará um Peso Líquido (Total ) incorreto. Certifique-se de que o peso líquido de cada item está na mesma UDM.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Valor na LDM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Valor na LDM
 DocType: Asset,Journal Entry for Scrap,Lançamento no Livro Diário para Sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
 apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Lançamentos no Livro Diário {0} são desvinculados
@@ -2149,7 +2137,7 @@
 DocType: Company,Exchange Gain / Loss Account,Conta de Ganho / Perda com Câmbio
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Colaborador e Ponto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Objetivo deve ser um dos {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Preencha o formulário e salve
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Preencha o formulário e salve
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Quantidade real em estoque
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças Antes da Solicitação
@@ -2158,7 +2146,7 @@
 DocType: Purchase Order,Get Items from Open Material Requests,Obter Itens de Requisições de Material Abertas
 DocType: Lab Test Template,Standard Selling Rate,Valor de venda padrão
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Qtde para Reposição
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Qtde para Reposição
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas Disponíveis Atualmente
 DocType: Company,Stock Adjustment Account,Conta de Ajuste
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abatimento
@@ -2176,7 +2164,7 @@
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data do Lançamento da Fatura
 DocType: Product Bundle,List items that form the package.,Lista de itens que compõem o pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
 DocType: Serial No,Out of AMC,Fora do CAM
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Criar Visita de Manutenção
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +215,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas"
@@ -2185,7 +2173,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,A Guia de Remessa {0} deve ser cancelada antes de cancelar este Pedido de Venda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Valor do abatimento não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Taxa de Inscrição no Programa
 DocType: Item,Supplier Items,Itens do Fornecedor
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transações só podem ser excluídos pelo criador da Companhia
@@ -2193,10 +2181,10 @@
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar Preço de Venda para o Item de acordo com o Valor de Compra ou Taxa de Avaliação
 DocType: Fee Schedule,Fee Schedule,Cronograma de Taxas
 DocType: Company,Create Chart Of Accounts Based On,Criar plano de contas baseado em
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registro de Tempo
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' está desativado
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' está desativado
 DocType: Cheque Print Template,Scanned Cheque,Cheque Escaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contatos sobre transações de enviar.
 DocType: Customer,Credit Limit and Payment Terms,Limite de Crédito e Termos de Pagamento
@@ -2212,7 +2200,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas acrescidos (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Por favor, digite novamente o nome da empresa para confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Total devido
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Total devido
 DocType: Journal Entry,Printing Settings,Configurações de impressão
 DocType: Employee Advance,Advance Account,Conta de Adiantamentos
 DocType: Sales Invoice,Include Payment (POS),Incluir pagamento (PDV)
@@ -2230,8 +2218,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda"""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data de Contratação deve ser maior do que a Data de Nascimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Saída de Material
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data de Contratação deve ser maior do que a Data de Nascimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Saída de Material
 DocType: Material Request Item,For Warehouse,Para Armazén
 DocType: Employee,Offer Date,Data da Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Orçamentos
@@ -2239,7 +2227,6 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Não foi criado nenhum grupo de alunos.
 DocType: Purchase Invoice Item,Serial No,Nº de Série
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
-DocType: Subscription,Next Schedule Date,Próxima data programada
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +34,Student is already enrolled.,Aluno já está inscrito.
 DocType: Fiscal Year,Year Name,Nome do ano
@@ -2252,10 +2239,10 @@
 DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Armazén de Origem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Não há itens com Lista de Materiais para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Não há itens com Lista de Materiais para Fabricação
 DocType: Assessment Plan,Supervisor Name,Nome do supervisor
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
 DocType: Notification Control,Customize the Notification,Personalizar a Notificação
@@ -2266,11 +2253,11 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dias desde a última Ordem' deve ser maior ou igual a zero
 DocType: Journal Entry Account,Employee Advance,Adiantamento à Colaboradores
 DocType: Leave Application,Follow via Email,Receber alterações por Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Instalações e Maquinários
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Instalações e Maquinários
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Configurações do Resumo de Trabalho Diário
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Meta de qtde ou valor da meta são obrigatórios
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Data de Abertura deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Encaminhar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de custo com as operações existentes não podem ser convertidos em registro
@@ -2278,8 +2265,8 @@
 DocType: Issue,Raised By (Email),Levantadas por (Email)
 DocType: Training Event,Trainer Name,Nome do Instrutor
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Último Contato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nº de Série Obrigatório para o Item Serializado {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nº de Série Obrigatório para o Item Serializado {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Conciliação de Pagamentos
 DocType: Journal Entry,Bank Entry,Lançamento Bancário
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
@@ -2294,9 +2281,9 @@
 apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,Criar registros de colaboradores
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,Demonstrativos Contábeis
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Tipo de Cliente em Potencial
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Todos esses itens já foram faturados
 DocType: Company,Monthly Sales Target,Meta de Vendas Mensais
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
@@ -2305,7 +2292,7 @@
 DocType: BOM Update Tool,The new BOM after replacement,A nova LDM após substituição
 ,Point of Sale,Ponto de Vendas
 DocType: Payment Entry,Received Amount,Total recebido
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado utilizando a Reconciliação de Estoque, em vez disso, utilize o Lançamento de Estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado utilizando a Reconciliação de Estoque, em vez disso, utilize o Lançamento de Estoque"
 DocType: Quality Inspection,Report Date,Data do Relatório
 DocType: Job Opening,Job Title,Cargo
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Atualize automaticamente o preço da lista de materiais
@@ -2355,8 +2342,9 @@
 DocType: Stock Entry Detail,Basic Amount,Valor Base
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
+DocType: Patient,Alcohol Past Use,Uso passado de álcool
 DocType: Tax Rule,Billing State,Estado de Faturamento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável para (Colaborador)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,A data de vencimento é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2374,16 +2362,15 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matérias-primas
 DocType: Journal Entry,Write Off Based On,Abater baseado em
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo Código de Barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Enviar emails a fornecedores
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Enviar emails a fornecedores
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configurar valores padrão para faturas do PDV
 apps/erpnext/erpnext/config/hr.py +182,Training,Treinamento
 DocType: Timesheet,Employee Detail,Detalhes do Colaborador
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Configurações para página inicial do site
 DocType: Job Offer,Awaiting Response,Aguardando Resposta
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Taxa de Avaliação negativa não é permitida
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Taxa de Avaliação negativa não é permitida
 DocType: Holiday List,Weekly Off,Descanso semanal
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Provisão Lucro / Prejuízo (Crédito)
@@ -2397,7 +2384,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Custo do Ativo Sucateado
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
 DocType: Vehicle,Policy No,Nº da Apólice
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
 DocType: Asset,Straight Line,Linha reta
 DocType: Project User,Project User,Usuário do Projeto
 DocType: GL Entry,Is Advance,É Adiantamento
@@ -2416,13 +2403,13 @@
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valor de Abertura
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valor de Abertura
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}"
 DocType: Tax Rule,Billing Country,País de Faturamento
 DocType: Purchase Order Item,Expected Delivery Date,Data Prevista de Entrega
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e Crédito não são iguais para {0} # {1}. A diferença é de {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despesas com Entretenimento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Despesas com Entretenimento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Fazer Requisição de Material
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Abrir Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,A Fatura de Venda {0} deve ser cancelada antes de cancelar este Pedido de Venda
@@ -2434,31 +2421,31 @@
 DocType: Vehicle,Last Carbon Check,Última Inspeção de Emissão de Carbono
 DocType: Purchase Invoice,Posting Time,Horário da Postagem
 DocType: Timesheet,% Amount Billed,Valor Faturado %
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despesas com Telefone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Despesas com Telefone
 DocType: Sales Partner,Logo,Logotipo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Marque esta opção se você deseja forçar o usuário a selecionar uma série antes de salvar. Não haverá nenhum padrão se você marcar isso.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nenhum Item com Nº de Série {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nenhum Item com Nº de Série {0}
 DocType: Payment Entry,Difference Amount (Company Currency),Total da diferença (moeda da empresa)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Receita com novos clientes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despesas com viagem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Despesas com viagem
 DocType: Maintenance Visit,Breakdown,Pane
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atualize o custo da lista lista de materiais automaticamente através do Agendador, com base na taxa de avaliação / taxa de preços mais recente / última taxa de compra de matérias-primas."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Superior {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +106,Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,As on Date,Como na Data
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Provação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Devolução / Nota de Crédito
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Quantia total paga
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Devolução / Nota de Crédito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Quantia total paga
 DocType: Work Order Item,Transferred Qty,Qtde Transferida
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planejamento
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planejamento
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,ID do Fornecedor
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +276,Quantity should be greater than 0,Quantidade deve ser maior do que 0
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios periódicos de síntese via Email.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Por favor configure uma conta padrão no tipo de Reembolso de Despesas {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Por favor configure uma conta padrão no tipo de Reembolso de Despesas {0}
 DocType: Brand,Item Manager,Gerente de Item
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
 DocType: Work Order,Total Operating Cost,Custo de Operacional Total
@@ -2477,14 +2464,14 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Clientes em Potencial ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Variação Territorial de Público por Grupo de Item
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Modelo de impostos é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Superior {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço da Lista de Preços (moeda da empresa)
 DocType: Products Settings,Products Settings,Configurações de Produtos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação Percentual
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,secretário
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,secretário
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Desativa campo ""por extenso"" em qualquer tipo de transação"
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Compras
@@ -2494,7 +2481,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Linha # {0}: O número de série é obrigatório
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhes do Imposto Vinculados ao Item
 ,Item-wise Price List Rate,Lista de Preços por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Orçamento de Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar o orçamento.
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
@@ -2506,7 +2493,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Corretagem
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Presença para o colaborador {0} já está registrada para este dia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Presença para o colaborador {0} já está registrada para este dia
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
  Atualizado via 'Registro de Tempo'"
@@ -2527,7 +2514,7 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento da Conciliação de Pagamento
 DocType: BOM Item,BOM No,Nº da LDM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Lançamento no Livro Diário {0} não tem conta {1} ou já conciliado com outro comprovante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equipamentos Eletrônicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Equipamentos Eletrônicos
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Work Order,Operation Cost,Custo da Operação
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Carregar comparecimento a partir de um arquivo CSV.
@@ -2539,7 +2526,6 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir que os usuários a seguir para aprovar aplicações deixam para os dias de bloco.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipos de reembolso de despesas.
 DocType: Purchase Invoice Item,Weight Per Unit,Peso Unitário
-DocType: Bank Guarantee,End Date,Data Final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Estoque
 DocType: Employee,Internal Work History,História Trabalho Interno
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Total de Depreciação Acumulada
@@ -2556,7 +2542,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +36,Production Item,Bem de Produção
 ,Employee Information,Informações do Colaborador
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Criar Orçamento do Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Criar Orçamento do Fornecedor
 DocType: BOM,Materials Required (Exploded),Materiais necessários (lista explodida)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Deixar
@@ -2571,21 +2557,21 @@
 DocType: Purchase Order,To Bill,Para Faturar
 DocType: Material Request,% Ordered,% Comprado
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,trabalho por peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Méd. Valor de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Méd. Valor de Compra
 DocType: Task,Actual Time (in Hours),Tempo Real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletim de Notícias
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lançamento do Livro de Inventário
 DocType: Department,Leave Block List,Lista de Bloqueio de Licença
 DocType: Purchase Invoice,Tax ID,CPF/CNPJ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} não está configurado para Serial Coluna N º s deve estar em branco
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} não está configurado para Serial Coluna N º s deve estar em branco
 DocType: Accounts Settings,Accounts Settings,Configurações de Contas
 DocType: Customer,Sales Partner and Commission,Parceiro de Vendas e Comissão
-DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de Juros (%) / Ano
+DocType: Loan,Rate of Interest (%) / Year,Taxa de Juros (%) / Ano
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de Juros (%) Anual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Contas Temporárias
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Contas Temporárias
 DocType: BOM Explosion Item,BOM Explosion Item,Item da Explosão da LDM
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe
 DocType: Purchase Invoice,Return,Devolução
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no Lote {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}"
@@ -2614,7 +2600,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} foi desativado
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota de crédito Total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota de crédito Total
 DocType: Employee External Work History,Employee External Work History,Histórico de Trabalho Externo do Colaborador
 DocType: Opening Invoice Creation Tool,Purchase,Compras
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Qtde Balanço
@@ -2637,7 +2623,6 @@
 DocType: Work Order,Planned Operating Cost,Custo Operacional Planejado
 DocType: Academic Term,Term Start Date,Data de Início do Ano Letivo
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Nº de Oportunidades
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Segue em anexo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Extrato bancário de acordo com o livro razão
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -2661,11 +2646,11 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Requisições
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 DocType: Expense Claim Advance,Expense Claim Advance,Adiantamento de Solicitação de Reembolso
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Gerente de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha # {0}: Não é permitido mudar de fornecedor quando o Pedido de Compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Selecionar Itens para Produzir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Selecionar Itens para Produzir
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
 DocType: Item Price,Item Price,Preço do Item
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & detergente
@@ -2681,10 +2666,9 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, restrições médicas, etc"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
-DocType: Employee Loan,Disbursement Date,Data do Desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,'Destinatários' não especificado
+DocType: Loan,Disbursement Date,Data do Desembolso
 DocType: BOM Update Tool,Update latest price in all BOMs,Atualize o preço mais recente em todas as LDMs
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,{0} faz aniversário hoje!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,{0} faz aniversário hoje!
 DocType: Sales Order Item,For Production,Para Produção
 DocType: Payment Request,payment_url,payment_url
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Oportunidade / Cliente em Potencial %
@@ -2694,7 +2678,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Junte-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Qtde em Falta
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Leave Application,LAP/,SDL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Esta é uma solicitação de pagamento relacionada à {0} {1} no valor de {2}
 DocType: Salary Slip,Salary Slip,Contracheque
@@ -2708,9 +2692,9 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são ""Enviadas"", um pop-up abre automaticamente para enviar um email para o ""Contato"" associado a transação, com a transação como um anexo. O usuário pode ou não enviar o email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configurações Globais
 DocType: Employee Education,Employee Education,Escolaridade do Colaborador
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Isto é necessário para buscar detalhes de itens
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Isto é necessário para buscar detalhes de itens
 DocType: Salary Slip,Net Pay,Pagamento Líquido
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nº de Série {0} já foi recebido
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Nº de Série {0} já foi recebido
 ,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
 DocType: Expense Claim,Vehicle Log,Log do Veículo
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
@@ -2732,22 +2716,22 @@
 DocType: Budget,Warn,Avisar
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve constar nos registros."
 DocType: Asset Maintenance,Manufacturing User,Usuário de Fabricação
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Gerente de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Gerente de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade da Visita de Manutenção
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Livro Razão
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Colaborador {0} de licença em {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Colaborador {0} de licença em {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veja os Clientes em Potencial
 DocType: Item Attribute Value,Attribute Value,Atributo Valor
 ,Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item
 DocType: Salary Detail,Salary Detail,Detalhes de Salário
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Por favor selecione {0} primeiro
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Por favor selecione {0} primeiro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Registro de Tempo para fabricação
 DocType: Salary Detail,Default Amount,Quantidade Padrão
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Armazén não foi encontrado no sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Armazén não foi encontrado no sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumo deste mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura da Inspeção de Qualidade
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
 DocType: Tax Rule,Purchase Tax Template,Modelo de Impostos sobre a compra
 ,Project wise Stock Tracking,Rastreio de Estoque por Projeto
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Real (na origem / destino)
@@ -2780,7 +2764,6 @@
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Orçamentos:
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Acumulado Mensal Exceder o Orçamento
-DocType: Subscription,Submit on creation,Enviar ao criar
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os e-mails serão enviados para todos os colaboradores ativos da empresa na hora informada, caso não estejam de férias. O resumo das respostas serão enviadas à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Colaborador Aprovada
 apps/erpnext/erpnext/stock/doctype/item/item.py +510,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
@@ -2797,7 +2780,7 @@
 DocType: Account,Income,Receita
 DocType: Industry Type,Industry Type,Tipo de Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Algo deu errado!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Ano Fiscal {0} não existe
 DocType: Purchase Invoice Item,Amount (Company Currency),Total (moeda da empresa)
 DocType: Fee Schedule,Student Category,Categoria do Aluno
@@ -2806,9 +2789,9 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 DocType: Email Digest,Pending Quotations,Orçamentos Pendentes
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Perfil do Ponto de Vendas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Empréstimos não Garantidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Empréstimos não Garantidos
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Quantia total paga
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Quantia total paga
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mensagens maiores do que 160 caracteres vão ser divididos em múltiplas mensagens
 DocType: Purchase Receipt Item,Received and Accepted,Recebeu e aceitou
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
@@ -2834,23 +2817,23 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +26,All Student Admissions,Todas Admissões de Alunos
 ,Average Commission Rate,Percentual de Comissão Médio
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,elétrico
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Adicione o resto de sua organização como seus usuários. Você também pode adicionar clientes convidados ao seu portal adicionando-os de Contatos
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença do Valor Total (Saída - Entrada)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Linha {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuário não definida para Colaborador {0}
 DocType: Stock Entry,Default Source Warehouse,Armazén de Origem Padrão
 DocType: Item,Customer Code,Código do Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Lembrete de aniversário para {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última compra
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Código dos Documentos
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de início da cobertura do seguro deve ser inferior a data de término da cobertura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos Estoque
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Ativos Estoque
 DocType: Target Detail,Target Qty,Meta de Qtde
 DocType: Shopping Cart Settings,Checkout Settings,Configurações de Vendas
 DocType: Notification Control,Sales Invoice Message,Mensagem da Fatura de Venda
@@ -2858,9 +2841,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Contracheque do colaborador {0} já criado para o registro de tempo {1}
 DocType: Vehicle Log,Odometer,Odômetro
 DocType: Production Plan Item,Ordered Qty,Qtde Encomendada
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,LDM não contém nenhum item de estoque
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,LDM não contém nenhum item de estoque
 DocType: Vehicle Log,Refuelling Details,Detalhes de Abastecimento
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar contracheques
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
@@ -2897,7 +2880,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nome da Nova Conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de fornecimento de Matérias-primas
 DocType: Selling Settings,Settings for Selling Module,Configurações do Módulo de Vendas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Atendimento ao Cliente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Atendimento ao Cliente
 DocType: Item Customer Detail,Item Customer Detail,Detalhe do Cliente do Item
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ofertar vaga ao candidato.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar o Envio de Email no Envio do Documento
@@ -2934,7 +2917,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +132,Successfully Reconciled,Reconciliados com sucesso
 DocType: Work Order,Planned End Date,Data Planejada de Término
 DocType: Request for Quotation,Supplier Detail,Detalhe do Fornecedor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Valor Faturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Valor Faturado
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Comparecimento
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Itens de estoque
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
@@ -2948,10 +2931,10 @@
 DocType: Vehicle Service,Clutch Plate,Disco de Embreagem
 DocType: Company,Round Off Account,Conta de Arredondamento
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
-DocType: Journal Entry,Subscription,Inscrição
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Inscrição
 DocType: Purchase Invoice,Contact Email,Email do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Período de Aviso Prévio
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Período de Aviso Prévio
 DocType: Asset Category,Asset Category Name,Ativo Categoria Nome
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este é um território de raiz e não pode ser editada.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nome do Novo Vendedor
@@ -2959,13 +2942,13 @@
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
 DocType: Bin,Reserved Qty for Production,Qtde Reservada para Produção
 DocType: Asset,Frequency of Depreciation (Months),Frequência das Depreciações (meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Conta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de Desembarque do Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores zerados
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
 DocType: Delivery Note Item,Against Sales Order Item,Relacionado ao Item do Pedido de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir sem valores
@@ -2982,7 +2965,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
 DocType: Journal Entry,Total Debit,Débito total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazén de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedor
 DocType: Vehicle Service,Half Yearly,Semestral
 DocType: Assessment Plan Criteria,Maximum Score,Nota Máxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
@@ -2991,7 +2974,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de Orçamentos
 ,BOM Stock Report,Relatório de Estoque por LDM
 DocType: GL Entry,Credit Amount,Total de crédito
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Definir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Definir como Perdido
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Isto é baseado nas transações envolvendo este Cliente. Veja a linha do tempo abaixo para maiores detalhes
 DocType: Tax Rule,Tax Rule,Regras de Aplicação de Impostos
@@ -3012,14 +2995,14 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Valor de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Orçamento do fornecedor {0} criado
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Benefícios a Colaboradores
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Benefícios a Colaboradores
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Work Order,Manufactured Qty,Qtde Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Colaboador(a) {0} ou para a Empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Colaboador(a) {0} ou para a Empresa {1}"
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturas emitidas para Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha {0}: Valor não pode ser superior ao valor pendente relacionado ao Reembolso de Despesas {1}. O valor pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha {0}: Valor não pode ser superior ao valor pendente relacionado ao Reembolso de Despesas {1}. O valor pendente é {2}
 DocType: Assessment Plan,Schedule,Agendar
 DocType: Account,Parent Account,Conta Superior
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
@@ -3032,11 +3015,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Lançamentos no livro Diário.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qtde disponível no armazén de origem
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro."
 DocType: POS Profile,Account for Change Amount,Conta para troco
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: Sujeito / Conta não coincidem com {1} / {2} em {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Por favor insira Conta Despesa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Detalhes Compra / Fabricação
 apps/erpnext/erpnext/config/stock.py +333,Batch Inventory,Inventário por Lote
@@ -3059,18 +3043,18 @@
 DocType: BOM Operation,BOM Operation,Operação da LDM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Valor da Linha Anterior
 DocType: POS Profile,POS Profile,Perfil do PDV
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
 DocType: Asset,Asset Category,Categoria de Ativos
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salário líquido não pode ser negativo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material a Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Guia de Recolhimento de Tributos
 DocType: Expense Claim,Employees Email Id,Endereços de Email dos Colaboradores
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passivo Circulante
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Passivo Circulante
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde Real é obrigatória
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, os Pedidos de Compra para este fornecedor devem ser emitidos com cautela."
-DocType: Employee Loan,Loan Type,Tipo de Empréstimo
+DocType: Loan,Loan Type,Tipo de Empréstimo
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
@@ -3100,10 +3084,10 @@
 DocType: Serial No,Delivery Details,Detalhes da entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 ,Item-wise Purchase Register,Registro de Compras por Item
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Por favor selecione a Categoria primeiro
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Por favor selecione a Categoria primeiro
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar nenhum símbolo como R$ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Meio Período)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Meio Período)
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Faça uma Série de Alunos
 DocType: Leave Type,Is Carry Forward,É encaminhado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Prazo de Entrega (em dias)
@@ -3113,7 +3097,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: BOM Operation,Operating Cost(Company Currency),Custo operacional (moeda da empresa)
-DocType: Employee Loan Application,Rate of Interest,Taxa de Juros
+DocType: Loan Application,Rate of Interest,Taxa de Juros
 DocType: Expense Claim Detail,Sanctioned Amount,Valor Liberado
 DocType: GL Entry,Is Opening,É Abertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 52e94d6..02738c9 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancele a Visita Material {0} antes de cancelar esta Solicitação de Garantia
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Relatórios de Avaliação
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Bens de Consumo
-DocType: Purchase Receipt,Subscription Detail,Detalhe da subscrição
 DocType: Supplier Scorecard,Notify Supplier,Notificar fornecedor
 DocType: Item,Customer Items,Artigos do Cliente
 DocType: Project,Costing and Billing,Custos e Faturação
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Conta {0}: Conta paterna {1} não pode ser um livro fiscal
 DocType: Item,Publish Item to hub.erpnext.com,Publicar o artigo em hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações por E-mail
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Avaliação
 DocType: Item,Default Unit of Measure,Unidade de Medida Padrão
 DocType: SMS Center,All Sales Partner Contact,Todos os Contactos de Parceiros Comerciais
-DocType: Employee,Leave Approvers,Autorizadores de Baixa
+DocType: Department,Leave Approvers,Autorizadores de Baixa
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Investigações
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Verificar disponibilidade
 DocType: Job Applicant,Job Applicant,Candidato a Emprego
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado em operações com este fornecedor. Veja o cronograma abaixo para obter detalhes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Jurídico
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto efetivo não pode ser incluído no preço do artigo na linha {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Jurídico
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto efetivo não pode ser incluído no preço do artigo na linha {0}
 DocType: Bank Guarantee,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado Por
 DocType: Delivery Note,Return Against Delivery Note,Devolução Contra Nota de Entrega
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Conta bancária não pode ser nomeada como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Elementos (ou grupos) dos quais os Lançamentos Contabilísticos são feitas e os saldos são mantidos.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Pendente para {0} não pode ser menor que zero ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Não há rascunhos salariais enviados para processar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Não há rascunhos salariais enviados para processar.
 DocType: Manufacturing Settings,Default 10 mins,Padrão de 10 min
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Baixa
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar aberto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,É necessário tomar essa ação hoje em dia para o mencionado anteriormente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Série Atualizada com Sucesso
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Check-out
 DocType: Pricing Rule,Apply On,Aplicar Em
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Todos os Contactos do Fornecedor
 DocType: Support Settings,Support Settings,Definições de suporte
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Data de Término não pode ser inferior a Data de Início
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha #{0}: A taxa deve ser a mesma que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Novo Pedido de Licença
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha #{0}: A taxa deve ser a mesma que {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch item de status de validade
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Depósito Bancário
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Depósito Bancário
 DocType: Membership,membership validaty section,seção de validação de membros
 DocType: Mode of Payment Account,Mode of Payment Account,Modo da Conta de Pagamento
 DocType: Consultation,Consultation,Consulta
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Fazendo o site
 DocType: Opening Invoice Creation Tool Item,Quantity,Quantidade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,A tabela de contas não pode estar vazia.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Empréstimos (Passivo)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,A tabela de contas não pode estar vazia.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Empréstimos (Passivo)
 DocType: Employee Education,Year of Passing,Ano de conclusão
 DocType: Item,Country of Origin,País de origem
 DocType: Soil Texture,Soil Texture Criteria,Critérios de textura do solo
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalhes principais de contato
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes em Aberto
 DocType: Production Plan Item,Production Plan Item,Artigo do Plano de Produção
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},O utilizador {0} já está atribuído ao funcionário {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},O utilizador {0} já está atribuído ao funcionário {1}
 DocType: Lab Test Groups,Add new line,Adicionar nova linha
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Assistência Médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no pagamento (Dias)
@@ -89,7 +85,7 @@
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Fatura
+DocType: Subscription Invoice,Invoice,Fatura
 DocType: Purchase Invoice Item,Item Weight Details,Detalhes do peso do item
 DocType: Asset Maintenance Log,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,O Ano Fiscal {0} é obrigatório
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Pontuação (de 0 a 5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não coincide com a {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Linha # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Linha # {0}:
 DocType: Timesheet,Total Costing Amount,Valor Total dos Custos
 DocType: Delivery Note,Vehicle No,Nº do Veículo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Por favor, selecione a Lista de Preços"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Trabalho em Andamento
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor selecione a data
 DocType: Daily Work Summary Group,Holiday List,Lista de Feriados
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Contabilista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Contabilista
 DocType: Hub Settings,Selling Price List,Lista de preços de venda
 DocType: Patient,Tobacco Current Use,Uso atual do tabaco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Taxa de vendas
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Taxa de vendas
 DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Nº de Telefone
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Novo {0}: #{1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notificação inicial de e-mail enviada
 ,Sales Partners Commission,Comissão de Parceiros de Vendas
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Valor Após Amortização
 DocType: Student,O+,O+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relacionado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Data de presença não pode ser inferior á data de admissão do funcionário
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Data de presença não pode ser inferior á data de admissão do funcionário
 DocType: Grading Scale,Grading Scale Name,Nome escala de classificação
-DocType: Subscription,Repeat on Day,Repita no dia
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta é uma conta principal e não pode ser editada.
 DocType: Sales Invoice,Company Address,Endereço da companhia
 DocType: BOM,Operations,Operações
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base no Desconto de {0}
+DocType: Subscription,Subscription Start Date,Data de início da assinatura
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexe o ficheiro .csv com duas colunas, uma para o nome antigo e uma para o novo nome"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} não em qualquer ano fiscal ativa.
 DocType: Packed Item,Parent Detail docname,Dados Principais de docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referência: {0}, Código do Item: {1} e Cliente: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Data de término do período de avaliação não pode ser anterior à data de início do período de avaliação
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga para um Emprego.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},A lista técnica não está especificada para o item de subcontratação {0} na linha {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Esta mesma empresa está inscrita mais do que uma vez
 DocType: Patient,Married,Casado/a
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Não tem permissão para {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obter itens de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Obter itens de
 DocType: Price List,Price Not UOM Dependant,Preço não Dependente do UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Óleo dos Travões
 DocType: Tax Rule,Tax Type,Tipo de imposto
 ,Completed Work Orders,Ordens de trabalho concluídas
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Valor taxado
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Valor taxado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Não está autorizado a adicionar ou atualizar registos antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for diapositivo de imagens)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo Real Operacional
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Linha # {0}: O tipo de documento de referência deve ser um pedido de despesa ou entrada de diário
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Selecionar BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Linha # {0}: O tipo de documento de referência deve ser um pedido de despesa ou entrada de diário
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Selecionar BOM
 DocType: SMS Log,SMS Log,Registo de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Itens Entregues
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gerenciar o valor antecipado concedido ao empregado
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Notificação de entrega
 DocType: Journal Entry,Opening Entry,Registo de Abertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Só Conta de Pagamento
-DocType: Employee Loan,Repay Over Number of Periods,Reembolsar Ao longo Número de Períodos
+DocType: Loan,Repay Over Number of Periods,Reembolsar Ao longo Número de Períodos
 DocType: Stock Entry,Additional Costs,Custos Adicionais
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,A conta da transação existente não pode ser convertida a grupo.
 DocType: Lead,Product Enquiry,Inquérito de Produto
 DocType: Education Settings,Validate Batch for Students in Student Group,Validar Lote para Estudantes em Grupo de Estudantes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nenhum registo de falta encontrados para o funcionário {0} para {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nenhum registo de falta encontrados para o funcionário {0} para {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Por favor, insira primeiro a empresa"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Por favor, selecione primeiro a Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Por favor, selecione primeiro a Empresa"
 DocType: Employee Education,Under Graduate,Universitário
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Por favor, defina o modelo padrão para Notificação de status de saída em Configurações de RH."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo
 DocType: BOM,Total Cost,Custo Total
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Empréstimo a funcionário
 DocType: Fee Schedule,Send Payment Request Email,Enviar e-mail de pedido de pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,O Item {0} não existe no sistema ou já expirou
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Imóveis
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Exitosamente não registrado.
 DocType: Assessment Result,Grade,Classe
 DocType: Restaurant Table,No of Seats,No of Seats
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Para adicionar assunto dinâmico, use jinja tags como <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Entregue Pelo Fornecedor
 DocType: Asset Maintenance Task,Asset Maintenance Task,Tarefa de manutenção de ativos
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salário Anual
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salário Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumo do Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,A Encerrar Ano Fiscal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} foi suspenso
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despesas de Stock
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Despesas de Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selecionar depósito de destino
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selecionar depósito de destino
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, indique contato preferencial Email"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Por favor, indique contato preferencial Email"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contrapartida
 DocType: Journal Entry Account,Credit in Company Currency,Crédito na Moeda da Empresa
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Endereço primário
 DocType: Production Plan,Material Request Detail,Detalhes do pedido de material
 DocType: Selling Settings,Default Quotation Validity Days,Dias de validade de cotação padrão
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Definições para o Módulo RH
 DocType: SMS Center,SMS Center,Centro de SMS
 DocType: Sales Invoice,Change Amount,Alterar Montante
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Categorias de licenças de condução
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Digite Data de Entrega
 DocType: Depreciation Schedule,Make Depreciation Entry,Efetuar Registo de Depreciação
+DocType: HR Settings,Leave Settings,Deixe as configurações
 DocType: Appraisal Template Goal,KRA,ACR
 DocType: Lead,Request Type,Tipo de Solicitação
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Tornar Funcionário
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Transmissão
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modo de Configuração do POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Desativa a criação de registros de horário em Ordens de Serviço. As operações não devem ser rastreadas em relação à ordem de serviço
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Execução
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os dados das operações realizadas.
 DocType: Asset Maintenance Log,Maintenance Status,Estado de Manutenção
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalhes da associação
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: É necessário colocar o fornecedor na Conta a pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Itens e Preços
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Horas totais: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A Data De deve estar dentro do Ano Fiscal. Assumindo que a Data De = {0}
 DocType: Drug Prescription,Interval,Intervalo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferência
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferência
 DocType: Grant Application,Individual,Individual
 DocType: Academic Term,Academics User,Utilizador Académico
 DocType: Cheque Print Template,Amount In Figure,Montante em Números
-DocType: Employee Loan Application,Loan Info,Informações empréstimo
+DocType: Loan Application,Loan Info,Informações empréstimo
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plano de visitas de manutenção.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Período do Scorecard do Fornecedor
 DocType: Share Transfer,Share Transfer,Transferência de ações
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Modelo de item
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Bioquímica
 DocType: Job Offer,Select Terms and Conditions,Selecione os Termos e Condições
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Valor de Saída
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Valor de Saída
 DocType: Woocommerce Settings,Woocommerce Settings,Configurações do Woocommerce
 DocType: Production Plan,Sales Orders,Ordens de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Território Padrão
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisão
 DocType: Work Order Operation,Updated via 'Time Log',"Atualizado através de ""Registo de Tempo"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},O montante do adiantamento não pode ser maior do que {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Selecione o cliente ou fornecedor.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},O montante do adiantamento não pode ser maior do que {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,Código diário
 DocType: Naming Series,Series List for this Transaction,Lista de Séries para esta Transação
 DocType: Company,Enable Perpetual Inventory,Habilitar inventário perpétuo
+DocType: Bank Guarantee,Charges Incurred,Taxas incorridas
 DocType: Company,Default Payroll Payable Account,Folha de pagamento padrão Contas a Pagar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Atualização Email Grupo
 DocType: Sales Invoice,Is Opening Entry,É Registo de Entrada
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Resultado personalizado
 DocType: Delivery Stop,Contact Name,Nome de Contacto
 DocType: Course Assessment Criteria,Course Assessment Criteria,Critérios de Avaliação do Curso
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,CPF:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,CPF:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Identidade estudantil:
 DocType: POS Customer Group,POS Customer Group,Grupo de Cliente POS
 DocType: Land Unit,Land Unit describing various land assets,Unidade de terra descrevendo vários ativos da terra
@@ -375,9 +372,8 @@
 ,Open Work Orders,Abrir ordens de serviço
 DocType: Payment Term,Credit Months,Meses de Crédito
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,A Remuneração Líquida não pode ser inferior a 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Para parar de enviar notificações de erro repetitivo do sistema, verificamos o campo Desativado na subscrição"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,A Data de Dispensa deve ser mais recente que a Data de Adesão
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Licenças por Ano
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,A Data de Dispensa deve ser mais recente que a Data de Adesão
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Licenças por Ano
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione ""É um Adiantamento"" na Conta {1} se for um registo dum adiantamento."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},O Armazém {0} não pertence à empresa {1}
 DocType: Email Digest,Profit & Loss,Lucros e Perdas
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Por favor, configure alunos sob grupos de estudantes"
 DocType: Item Website Specification,Item Website Specification,Especificação de Website do Item
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Licença Bloqueada
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Registos Bancários
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Licença Bloqueada
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Registos Bancários
 DocType: Crop,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item de Reconciliação de Stock
 DocType: Stock Entry,Sales Invoice No,Fatura de Vendas Nr
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso de Ferramenta de Criação de Grupo de Estudantes
 DocType: Lead,Do Not Contact,Não Contactar
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Pessoas que ensinam na sua organização
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Desenvolvedor de Software
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Desenvolvedor de Software
 DocType: Item,Minimum Order Qty,Qtd de Pedido Mínima
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Course Scheduling Tool,Course Start Date,Data de Início do Curso
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publicar na Plataforma
 DocType: Student Admission,Student Admission,Admissão de Estudante
 ,Terretory,Território
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,O Item {0} foi cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Solicitação de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Solicitação de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data de Liquidação
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Dados de Compra
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Novas Cotações
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envia as folhas de vencimento por email com baxe no email preferido selecionado em Funcionário
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiroAprovador de Licenças na lista será definido como o Aprovador de Licenças padrão
 DocType: Tax Rule,Shipping County,Condado de Envio
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Aprender
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprender
 DocType: Asset,Next Depreciation Date,Próxima Data de Depreciação
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo de Atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições de Contas
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques a Cobrar e Depósitos a receber
 DocType: Item,Synced With Hub,Sincronizado com a Plataforma
 DocType: Driver,Fleet Manager,Gestor de Frotas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} não pode ser negativo para o item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} não pode ser negativo para o item {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Senha Incorreta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"A Qtd Concluída não pode ser superior à ""Qtd de Fabrico"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Defina a tarifa do quarto do hotel em {}
 DocType: Journal Entry,Multi Currency,Múltiplas Moedas
 DocType: Opening Invoice Creation Tool,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Guia de Remessa
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,A Configurar Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Custo do Ativo Vendido
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Categoria profissional do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa a que a Moeda do Cliente é convertida para a moeda principal do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Curso
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,Erro [Urgente] ao criar% s recorrentes para% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
 DocType: Land Unit,LInked Analysis,LInked Analysis
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,O período de aplicação não pode ser realizado em dois registros de alocação
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,O período de aplicação não pode ser realizado em dois registros de alocação
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já foi alocado para o Funcionário {1} para o período de {2} a {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: O Nº de Lote deve ser igual a {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Recebida
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Estudantes
 DocType: Volunteer,Weekends,Finais de semana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Valor da Nota de Crédito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Valor da Nota de Crédito
 DocType: Setup Progress Action,Action Document,Documento de ação
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Produtos Acabados
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demonstração
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Adicionar Itens
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parâmetro de Inspeção de Qualidade do Item
+DocType: Leave Application,Leave Approver Name,Nome do Aprovador da Licença
 DocType: Depreciation Schedule,Schedule Date,Data Marcada
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Remunerações, Deduções e outros componentes Salariais"
 DocType: Packed Item,Packed Item,Item Embalado
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Cotação
 DocType: Healthcare Settings,Require Lab Test Approval,Exigir aprovação de teste de laboratório
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabalho
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total pendente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total pendente
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.
 DocType: Dosage Strength,Strength,Força
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Criar um novo cliente
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Custo de Consumíveis
 DocType: Purchase Receipt,Vehicle Date,Data de Veículo
 DocType: Student Log,Medical,Clínico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Motivo de perda
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Motivo de perda
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Atualizar número de conta
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,O Dono do Potencial Cliente não pode ser o mesmo que o Potencial Cliente
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,O montante atribuído não pode ser superior ao montante não ajustado
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Solteiro/a
 DocType: Salary Slip,Total Loan Repayment,O reembolso total do empréstimo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
-DocType: Subscription,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, insira o Centro de Custos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Por favor, insira o Centro de Custos"
 DocType: Drug Prescription,Dosage,Dosagem
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Preço de Venda Médio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Preço de Venda Médio
 DocType: Assessment Plan,Examiner Name,Nome do Examinador
 DocType: Lab Test Template,No Result,nenhum resultado
 DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, insira o nome da empresa primeiro"
 DocType: Purchase Invoice,Supplier Name,Nome do Fornecedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o Manual de ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Mostrar folhas de todos os membros do departamento no calendário
 DocType: Purchase Invoice,01-Sales Return,01-Retorno de vendas
 DocType: Account,Is Group,É Grupo
 DocType: Email Digest,Pending Purchase Orders,Ordens de Compra Pendentes
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Campo obrigatório - Ano Acadêmico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} não está associado a {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personaliza o texto introdutório que vai fazer parte desse email. Cada transação tem um texto introdutório em separado.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Defina a conta pagável padrão da empresa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Defina a conta pagável padrão da empresa {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transação não permitida em relação à ordem de trabalho interrompida {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As definições gerais para todos os processos de fabrico.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas Congeladas Até
 DocType: SMS Log,Sent On,Enviado Em
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registo de funcionário é criado ao utilizar o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Definidor de Feriados.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venda
 DocType: Packing Slip,From Package No.,Do Pacote Nr.
 DocType: Item Attribute,To Range,Para Gama
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e Depósitos
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Não é possível alterar o método de avaliação, uma vez que há transações contra alguns itens que não tem seu próprio método de avaliação"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Títulos e Depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Não é possível alterar o método de avaliação, uma vez que há transações contra alguns itens que não tem seu próprio método de avaliação"
 DocType: Student Report Generation Tool,Attended by Parents,Assistido pelos pais
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,É obrigatório o total de licenças alocadas
 DocType: Patient,AB Positive,AB Positivo
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registo de assiduidade.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Salarial para a folha de presença com base no pagamento.
 DocType: Sales Order Item,Used for Production Plan,Utilizado para o Plano de Produção
-DocType: Employee Loan,Total Payment,Pagamento total
+DocType: Loan,Total Payment,Pagamento total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Não é possível cancelar a transação para a ordem de serviço concluída.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo Entre Operações (em minutos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} é cancelado para que a ação não possa ser concluída
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Insira alguns dos seus clientes. Podem ser organizações ou indivíduos.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peças suficiente para construir
 DocType: POS Profile User,POS Profile User,Usuário do perfil POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Rendimento Direto
+DocType: Subscription Invoice,Subscription Invoice,Fatura de Subscrição
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Rendimento Direto
 DocType: Patient Appointment,Date TIme,Data hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Funcionário Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Funcionário Administrativo
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Criando empresa e impostos
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
 DocType: Codification Table,Codification Table,Tabela de codificação
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Por favor, selecione a Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Por favor, selecione a Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta de Diferenças
 DocType: Purchase Invoice,Supplier GSTIN,Fornecedor GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode encerrar a tarefa pois a sua tarefa dependente {0} não está encerrada.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Modelo de mapeamento de fluxo de caixa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
 DocType: Journal Entry,Difference (Dr - Cr),Diferença (Db - Cr)
+DocType: Bank Guarantee,Providing,Fornecendo
 DocType: Account,Profit and Loss,Lucros e Perdas
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Não permitido, configure o modelo de teste de laboratório conforme necessário"
 DocType: Patient,Risk Factors,Fatores de risco
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Nr. de Fatura de Fornecedor
 DocType: Territory,For reference,Para referência
 DocType: Healthcare Settings,Appointment Confirmation,Confirmação de compromisso
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível eliminar o Nº de Série {0}, pois está a ser utilizado em transações de stock"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível eliminar o Nº de Série {0}, pois está a ser utilizado em transações de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),A Fechar (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Olá
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Mover Item
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Já definiu o padrão no perfil pos {0} para o usuário {1}, desabilitado gentilmente por padrão"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Ano fiscal / financeiro.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores Acumulados
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Desculpe, mas os Nrs. de Série não podem ser unidos"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Desculpe, mas os Nrs. de Série não podem ser unidos"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Território é obrigatório no perfil POS
 DocType: Supplier,Prevent RFQs,Prevenir PDOs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Criar Pedido de Venda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Salário Slip enviado para o período de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Salário Slip enviado para o período de {0} a {1}
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,ID de Potencial Cliente
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Data de envio da conta
 DocType: Production Plan,Production Plan,Plano de produção
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Ferramenta de criação de fatura de abertura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Retorno de Vendas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Nota: O total de licenças atribuídas {0} não deve ser menor do que as licenças já aprovadas {1}, para esse período"
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Definir Qtd em transações com base na entrada serial
 ,Total Stock Summary,Resumo de estoque total
 DocType: Announcement,Posted By,Postado Por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Envio Direto)
@@ -790,15 +788,15 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Inicial (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,O montante atribuído não pode ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Defina a Empresa
 DocType: Share Balance,Share Balance,Partilha de equilíbrio
 DocType: Purchase Order Item,Billed Amt,Qtd Faturada
 DocType: Training Result Employee,Training Result Employee,Resultado de Formação de Funcionário
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Armazém lógico no qual são efetuados registos de stock.
-DocType: Repayment Schedule,Principal Amount,Quantia principal
-DocType: Employee Loan Application,Total Payable Interest,Juros a Pagar total
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Quantia principal
+DocType: Loan Application,Total Payable Interest,Juros a Pagar total
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total pendente: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fatura de Vendas de Registo de Horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},É necessário colocar o Nr. de Referência e a Data de Referência em {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurante
 DocType: Land Unit,Land Unit Name,Nome da unidade terrestre
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Elaboração de Proposta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Elaboração de Proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de Registo de Pagamento
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Empacotando
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Notificar clientes por e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Notificar clientes por e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Já existe outro Vendedor {0} com a mesma id de Funcionário
 DocType: Employee Advance,Claimed Amount,Montante reclamado
 apps/erpnext/erpnext/config/education.py +180,Masters,Definidores
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Não foi criada uma Conta do Portal de Pagamento, por favor, crie uma manualmente."
 DocType: Supplier Scorecard,Per Year,Por ano
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Não é elegível para a admissão neste programa conforme DBA
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas de Vendas
 DocType: Employee,Organization Profile,Perfil da Organização
 DocType: Vital Signs,Height (In Meter),Altura (em metros)
 DocType: Student,Sibling Details,Dados de Irmão/Irmã
 DocType: Vehicle Service,Vehicle Service,Serviço de Veículo
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,aciona automaticamente o pedido de feedback com base nas condições.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,aciona automaticamente o pedido de feedback com base nas condições.
 DocType: Employee,Reason for Resignation,Motivo de Demissão
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Modelo para avaliação de desempenho .
 DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitido
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Cronograma de Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então as Regras de Fixação de Preços serão filtradas com base no Cliente, Grupo de Clientes, Território, Fornecedor, Tipo de fornecedor, Campanha, Parceiro de Vendas etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Variação Líquida no Inventário
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Gestão de empréstimos a funcionários
 DocType: Employee,Passport Number,Número de Passaporte
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relação com Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gestor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Gestor
 DocType: Payment Entry,Payment From / To,Pagamento De / Para
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Defina conta no Warehouse {0}
@@ -894,23 +890,23 @@
 DocType: Item,Material Transfer,Transferência de Material
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Não foi possível encontrar o caminho para
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Inicial (Db)
+DocType: Loan,Applicant,Candidato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},A marca temporal postada deve ser posterior a {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Para fazer documentos recorrentes
 ,GST Itemised Purchase Register,Registo de compra por itens do GST
 DocType: Course Scheduling Tool,Reschedule,Reprogramar
-DocType: Employee Loan,Total Interest Payable,Interesse total a pagar
+DocType: Loan,Total Interest Payable,Interesse total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos e Taxas de Custo de Entrega
 DocType: Work Order Operation,Actual Start Time,Hora de Início Efetiva
 DocType: BOM Operation,Operation Time,Tempo de Operação
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Terminar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Base
 DocType: Timesheet,Total Billed Hours,Horas Totais Faturadas
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Liquidar Quantidade
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Liquidar Quantidade
 DocType: Leave Block List Allow,Allow User,Permitir Utilizador
 DocType: Journal Entry,Bill No,Nr. de Conta
 DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganhos/Perdas de Eliminação de Ativos
 DocType: Vehicle Log,Service Details,Detalhes do serviço
-DocType: Subscription,Quarterly,Trimestral
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Agrupados
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
@@ -921,7 +917,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Folha de Presença
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmar Matérias-Primas com Base Em
 DocType: Sales Invoice,Port Code,Código de porta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Armazém de reserva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Armazém de reserva
 DocType: Lead,Lead is an Organization,Lead é uma organização
 DocType: Guardian Interest,Interest,Juros
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré-vendas
@@ -933,12 +929,12 @@
 DocType: Account,Accounts,Contas
 DocType: Vehicle,Odometer Value (Last),Valor do Conta-quilómetros (Último)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelos de critérios de scorecard do fornecedor.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,O Registo de Pagamento já tinha sido criado
 DocType: Request for Quotation,Get Suppliers,Obter Fornecedores
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Linha #{0}: O Ativo {1} não está vinculado ao Item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Pré-visualizar Folha de Pagamento
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Linha #{0}: O Ativo {1} não está vinculado ao Item {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Pré-visualizar Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A Conta {0} foi inserida várias vezes
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Estimativa
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Você só pode renovar se a sua adesão expirar dentro de 30 dias
@@ -948,7 +944,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Selecione apenas se você configurou os documentos do Mapeador de fluxo de caixa
 DocType: Email Digest,Next email will be sent on:,O próximo email será enviado em:
 DocType: Supplier Scorecard,Per Week,Por semana
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,O Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,O Item tem variantes.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Estudante total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Não foi encontrado o Item {0}
 DocType: Bin,Stock Value,Valor do Stock
@@ -969,9 +965,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Registo de Cartão de Crédito
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa e Contas
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,No Valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,No Valor
 DocType: Asset Settings,Depreciation Options,Opções de depreciação
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Tempo de lançamento inválido
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Tempo de lançamento inválido
 DocType: Lead,Campaign Name,Nome da Campanha
 DocType: Hotel Room,Capacity,Capacidade
 DocType: Selling Settings,Close Opportunity After Days,Fechar Oportunidade Depois Dias
@@ -996,7 +992,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Nr. da Ordem de Compra do Cliente
 DocType: Budget,Budget Against,Orçamento Em
 DocType: Employee,Cell Number,Numero de Telemóvel
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Não há empregado para os critérios fornecidos. Verifique se os Slides Salariais ainda não foram criados.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Não há empregado para os critérios fornecidos. Verifique se os Slides Salariais ainda não foram criados.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Solicitações de Materiais Geradas Automaticamente
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Não pode inserir o voucher atual na coluna ""Lançamento Contabilístico Em"""
@@ -1008,15 +1004,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecione uma tabela
 DocType: BOM,Website Specifications,Especificações do Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} é um endereço de e-mail inválido em &#39;Destinatários&#39;
 DocType: Special Test Items,Particulars,Informações
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: De {0} do tipo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: De {0} do tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Existem Várias Regras de Preços com os mesmos critérios, por favor, resolva o conflito através da atribuição de prioridades. Regras de Preços: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar a LDM pois está associada a outras LDM
 DocType: Asset,Maintenance,Manutenção
+DocType: Subscriber,Subscriber,Assinante
 DocType: Item Attribute Value,Item Attribute Value,Valor do Atributo do Item
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Por favor, atualize seu status do projeto"
 DocType: Item,Maximum sample quantity that can be retained,Quantidade máxima de amostras que pode ser mantida
@@ -1073,26 +1069,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As definições padrão para o Carrinho de Compras
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Adicionar Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Ativo excluído através do Lançamento Contabilístico {0}
-DocType: Employee Loan,Interest Income Account,Conta Margem
+DocType: Loan,Interest Income Account,Conta Margem
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Revisão do convite enviado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotecnologia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Despesas de Manutenção de Escritório
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Despesas de Manutenção de Escritório
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Vamos para
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurar conta de email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Por favor, insira o Item primeiro"
 DocType: Asset Repair,Downtime,Tempo de inatividade
 DocType: Account,Liability,Responsabilidade
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Período Acadêmico:
 DocType: Salary Detail,Do not include in total,Não inclua no total
 DocType: Company,Default Cost of Goods Sold Account,Custo Padrão de Conta de Produtos Vendidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},A quantidade de amostra {0} não pode ser superior à quantidade recebida {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,A Lista de Preços não foi selecionada
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,A Lista de Preços não foi selecionada
 DocType: Employee,Family Background,Antecedentes Familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 DocType: Item,Max Sample Quantity,Quantidade Máx. De Amostra
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Sem Permissão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Sem Permissão
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citação solicitada
 DocType: Vital Signs,Heart Rate / Pulse,Frequência cardíaca / pulso
 DocType: Company,Default Bank Account,Conta Bancária Padrão
@@ -1103,11 +1099,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior peso serão mostrados em primeiro lugar
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Testes laboratoriais e sinais vitais
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dados de Conciliação Bancária
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Linha #{0}: O Ativo {1} deve ser enviado
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Linha #{0}: O Ativo {1} deve ser enviado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Não foi encontrado nenhum funcionário
-DocType: Subscription,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se for subcontratado a um fornecedor
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,O grupo de alunos já está atualizado.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,O grupo de alunos já está atualizado.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Atualização do Projeto.
 DocType: SMS Center,All Customer Contact,Todos os Contactos de Clientes
 DocType: Land Unit,Tree Details,Dados de Esquema
@@ -1157,7 +1152,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importar Assiduidade
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Todos os Grupos de Itens
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Criar mensagem automática no envio de transações.
 DocType: Work Order,Item To Manufacture,Item Para Fabrico
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},O estado de {0} {1} é {2}
@@ -1171,7 +1165,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Reseleccione, se o endereço escolhido for editado após salvar"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
 DocType: Item,Hub Publishing Details,Detalhes da publicação do hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Abertura'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Abertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Tarefas Abertas
 DocType: Notification Control,Delivery Note Message,Mensagem de Guia de Remessa
 DocType: Lab Test Template,Result Format,Formato de resultado
@@ -1181,7 +1175,7 @@
 DocType: Payroll Entry,Bimonthly,Quinzenal
 DocType: Vehicle Service,Brake Pad,Pastilha de Travão
 DocType: Fertilizer,Fertilizer Contents,Conteúdo de fertilizantes
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Pesquisa e Desenvolvimento
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Montante a Faturar
 DocType: Company,Registration Details,Dados de Inscrição
 DocType: Timesheet,Total Billed Amount,Valor Total Faturado
@@ -1195,7 +1189,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Controle do limite de crédito de bypass na ordem do cliente
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Avaliação de desempenho.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ao ativar a ""Utilização para Carrinho de Compras"", o Carrinho de Compras ficará ativado e deverá haver pelo menos uma Regra de Impostos para o Carrinho de Compras"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","O Registo de Pagamento {0} está ligado ao Pedido {1}, por favor verifique se o mesmo deve ser retirado como adiantamento da presente fatura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","O Registo de Pagamento {0} está ligado ao Pedido {1}, por favor verifique se o mesmo deve ser retirado como adiantamento da presente fatura."
 DocType: Sales Invoice Item,Stock Details,Dados de Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Ponto de Venda
@@ -1229,7 +1223,7 @@
 DocType: Restaurant Table,Minimum Seating,Assentos mínimos
 DocType: Item Attribute,Item Attribute Values,Valores do Atributo do Item
 DocType: Examination Result,Examination Result,Resultado do Exame
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Recibo de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,Itens Recebidos a Serem Faturados
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Definidor de taxa de câmbio de moeda.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},O Tipo de Documento de Referência deve ser um de {0}
@@ -1237,15 +1231,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
 DocType: Work Order,Plan material for sub-assemblies,Planear material para subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,A LDM {0} deve estar ativa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nenhum item disponível para transferência
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,A LDM {0} deve estar ativa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nenhum item disponível para transferência
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Fechamento (Abertura + Total)
 DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas Materiais {0} antes de cancelar esta Visita de Manutenção
 DocType: Crop Cycle,ISO 8016 standard,Padrão ISO 8016
 DocType: Pricing Rule,Rate or Discount,Taxa ou desconto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},O Nr. de Série {0} não pertence ao Item {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},O Nr. de Série {0} não pertence ao Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qtd Necessária
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoritos
 DocType: Hub Settings,Custom Data,Dados personalizados
@@ -1257,9 +1251,9 @@
 DocType: Medical Code,Medical Code Standard,Padrão do Código Médico
 DocType: Soil Texture,Clay Composition (%),Composição da argila (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Salve antes de atribuir a tarefa.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valor de Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valor de Saldo
 DocType: Lab Test,Lab Technician,Técnico de laboratório
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista de Preço de Venda
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Se marcado, um cliente será criado, mapeado para Paciente. As faturas do paciente serão criadas contra este Cliente. Você também pode selecionar o Cliente existente ao criar o Paciente."
 DocType: Bank Reconciliation,Account Currency,Moeda da Conta
@@ -1267,16 +1261,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Por favor, mencione a Conta de Arredondamentos na Empresa"
 DocType: Purchase Receipt,Range,Faixa
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
 DocType: Fee Structure,Components,Componentes
 DocType: Item Barcode,Item Barcode,Código de barras do item
 DocType: Woocommerce Settings,Endpoints,Pontos de extremidade
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Variantes do Item {0} atualizadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Variantes do Item {0} atualizadas
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","a ser gerado. Se atrasado, você precisará alterar manualmente o campo &quot;Repetir no dia do mês&quot; deste"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
 DocType: Share Transfer,From Folio No,Do Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avanço de Fatura de Compra
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: O registo de crédito não pode ser ligado a {1}
@@ -1311,16 +1303,17 @@
 DocType: Asset,Available-for-use Date,Data disponível para uso
 DocType: Guardian,Guardian Name,Nome do Responsável
 DocType: Cheque Print Template,Has Print Format,Tem Formato de Impressão
-DocType: Employee Loan,Sanctioned,sancionada
+DocType: Loan,Sanctioned,sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,é obrigatório. Talvez o registo de Câmbio não tenha sido criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Linha #{0}: Por favor, especifique o Nr. de Série para o Item {1}"
 DocType: Crop Cycle,Crop Cycle,Ciclo de colheita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens dos ""Pacote de Produtos"", o Armazém e Nr. de Lote serão considerados a partir da tabela de ""Lista de Empacotamento"". Se o Armazém e o Nr. de Lote forem os mesmos para todos os itens empacotados para qualquer item dum ""Pacote de Produto"", esses valores podem ser inseridos na tabela do Item principal, e os valores serão copiados para a tabela da ""Lista de Empacotamento'""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens dos ""Pacote de Produtos"", o Armazém e Nr. de Lote serão considerados a partir da tabela de ""Lista de Empacotamento"". Se o Armazém e o Nr. de Lote forem os mesmos para todos os itens empacotados para qualquer item dum ""Pacote de Produto"", esses valores podem ser inseridos na tabela do Item principal, e os valores serão copiados para a tabela da ""Lista de Empacotamento'""."
 DocType: Student Admission,Publish on website,Publicar no website
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,A Data da Fatura do Fornecedor não pode ser maior que Data de Lançamento
+DocType: Subscription,Cancelation Date,Data de cancelamento
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
 DocType: Agriculture Task,Agriculture Task,Tarefa de agricultura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Rendimento Indireto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Rendimento Indireto
 DocType: Student Attendance Tool,Student Attendance Tool,Ferramenta de Assiduidade dos Alunos
 DocType: Restaurant Menu,Price List (Auto created),Lista de preços (criada automaticamente)
 DocType: Cheque Print Template,Date Settings,Definições de Data
@@ -1347,6 +1340,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metro
 DocType: Workstation,Electricity Cost,Custo de Eletricidade
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,O tempo de exibição no laboratório não pode ser anterior à data de coleta
+DocType: Subscription Plan,Cost,Custo
 DocType: HR Settings,Don't send Employee Birthday Reminders,Não enviar Lembretes de Aniversário de Funcionários
 DocType: Expense Claim,Total Advance Amount,Valor antecipado total
 DocType: Delivery Stop,Estimated Arrival,Chegada estimada
@@ -1358,15 +1352,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Carregue o cabeçalho e logótipo da carta. (Pode editá-los mais tarde.)
 DocType: Timesheet Detail,Bill,Fatura
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Branco
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Branco
 DocType: SMS Center,All Lead (Open),Todos Potenciais Clientes (Abertos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: A qtd não está disponível para {4} no armazém {1} no momento da postagem do registo ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Você só pode selecionar um máximo de uma opção na lista de caixas de seleção.
 DocType: Purchase Invoice,Get Advances Paid,Obter Adiantamentos Pagos
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Atribuindo {0} a {1} (linha {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Registar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Atribuindo {0} a {1} (linha {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Registar
 DocType: Student Admission,Admission Start Date,Data de Início de Admissão
 DocType: Journal Entry,Total Amount in Words,Valor Total por Extenso
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novo empregado
@@ -1382,7 +1376,7 @@
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Valor do Empréstimo
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendário de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opções de Stock
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opções de Stock
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Desativar Obter detalhes da última compra na ordem de compra
 DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Deseja realmente restaurar este ativo descartado?
@@ -1401,11 +1395,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Item de Nota Fiscal
 DocType: Purchase Invoice,Cash/Bank Account,Dinheiro/Conta Bancária
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Por favor especificar um {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregue A
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,A criação de variantes foi colocada na fila.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Resumo do trabalho para {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,O primeiro Aprovador de Saídas na lista será definido como o Aprovado de Saída padrão.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
 DocType: Production Plan,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} não pode ser negativo
 DocType: Training Event,Self-Study,Auto estudo
@@ -1418,7 +1413,7 @@
 DocType: Workstation,Wages,Salários
 DocType: Asset Maintenance,Maintenance Manager Name,Nome do gerente de manutenção
 DocType: Agriculture Task,Urgent,Urgente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique uma ID de Linha válida para a linha {0} na tabela {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique uma ID de Linha válida para a linha {0} na tabela {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Não foi possível encontrar a variável:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Selecione um campo para editar a partir do numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Não pode ser um item de ativos fixos, pois o Ledger de estoque é criado."
@@ -1430,7 +1425,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Nome do modelo de inspeção de qualidade
 DocType: Project,First Email,Primeiro email
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém Reservado na Ordem de Vendas / Armazém de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Vendas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Valor de Vendas
 DocType: Repayment Schedule,Interest Amount,Montante de juros
 DocType: Serial No,Creation Document No,Nr. de Documento de Criação
 DocType: Share Transfer,Issue,Incidente
@@ -1444,10 +1439,10 @@
 DocType: Tax Rule,Shipping State,Estado de Envio
 ,Projected Quantity as Source,Quantidade Projetada como Fonte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O item deve ser adicionado utilizando o botão ""Obter Itens de Recibos de Compra"""
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Viagem de entrega
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Viagem de entrega
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo de transferência
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Despesas com Vendas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Despesas com Vendas
 DocType: Consultation,Diagnosis,Diagnóstico
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra Padrão
 DocType: GL Entry,Against,Em
@@ -1456,12 +1451,13 @@
 DocType: Sales Partner,Implementation Partner,Parceiro de Implementação
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Selecione a conta de receita de juros no empréstimo {0}
 DocType: Opportunity,Contact Info,Informações de Contacto
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Efetuar Registos de Stock
 DocType: Packing Slip,Net Weight UOM,Peso Líquido de UNID
 DocType: Item,Default Supplier,Fornecedor Padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentagem Permitida de Sobreprodução
-DocType: Employee Loan,Repayment Schedule,Cronograma de amortização
+DocType: Loan,Repayment Schedule,Cronograma de amortização
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condições de Regra de Envio
 DocType: Holiday List,Get Weekly Off Dates,Obter Datas de Folgas Semanais
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,A Data de Término não pode ser mais recente que a Data de Início
@@ -1476,7 +1472,7 @@
 DocType: Education Settings,Attendance Freeze Date,Data de congelamento do comparecimento
 DocType: Education Settings,Attendance Freeze Date,Data de congelamento do comparecimento
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Insira alguns dos seus fornecedores. Podem ser organizações ou indivíduos.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver Todos os Produtos
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Ver Todos os Produtos
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Idade mínima de entrega (dias)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Idade mínima de entrega (dias)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Todos os BOMs
@@ -1485,14 +1481,16 @@
 DocType: Expense Claim,From Employee,Do(a) Funcionário(a)
 DocType: Driver,Cellphone Number,Número de telemóvel
 DocType: Project,Monitor Progress,Monitorar o progresso
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso: O sistema não irá verificar a sobre faturação pois o montante para o Item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso: O sistema não irá verificar a sobre faturação pois o montante para o Item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Efetuar Registo de Diferença
+DocType: Supplier Quotation,Auto Repeat Section,Seção de Repetição Automática
 DocType: Upload Attendance,Attendance From Date,Assiduidade a Partir De
 DocType: Appraisal Template Goal,Key Performance Area,Área de Desempenho Fundamental
 DocType: Program Enrollment,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atributo Inválido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} deve ser enviado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},A quantidade deve ser inferior ou igual a {0}
+DocType: Department Approver,Department Approver,Aprovador do departamento
 DocType: SMS Center,Total Characters,Total de Caracteres
 DocType: Employee Advance,Claimed,Reivindicado
 DocType: Crop,Row Spacing,Espaçamento entre linhas
@@ -1502,6 +1500,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fatura de Conciliação de Pagamento
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Contribuição %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","De acordo com as Configurações de compra, se a ordem de compra necessária == &#39;SIM&#39;, então, para criar a factura de compra, o usuário precisa criar a ordem de compra primeiro para o item {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-resumo de fontes externas
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Os números de registo da empresa para sua referência. Números fiscais, etc."
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio de Carrinho de Compras
@@ -1515,7 +1514,7 @@
 DocType: Setup Progress Action,Action Name,Nome da Ação
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Ano de Início
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Os primeiros 2 dígitos do GSTIN devem corresponder com o número do estado {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,A data de início do período de fatura atual
 DocType: Salary Slip,Leave Without Pay,Licença Sem Vencimento
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Erro de Planeamento de Capacidade
@@ -1533,26 +1532,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Os campos serão copiados apenas no momento da criação.
 DocType: Setup Progress Action,Domains,Domínios
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Efetiva' não pode ser mais recente que a 'Data de Término Efetiva'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Gestão
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Gestão
 DocType: Cheque Print Template,Payer Settings,Definições de Pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
 DocType: Purchase Invoice,Is Return,É um Retorno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Cuidado
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',O dia de início é maior que o final da tarefa &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retorno / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,País da Lista de Preços
 DocType: Item,UOMs,UNIDs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},Nr. de série válido {0} para o Item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,O Código de Item não pode ser alterado por um Nr. de Série.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,O Código de Item não pode ser alterado por um Nr. de Série.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Fator de Conversão de UNID
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Por favor insira o Código Item para obter número de lote
 DocType: Stock Settings,Default Item Group,Grupo de Item Padrão
-DocType: Employee Loan,Partially Disbursed,parcialmente Desembolso
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Conceda informações.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Conceda informações.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados de fornecedores.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Você não pode reiniciar uma Assinatura que não seja cancelada.
 DocType: Account,Balance Sheet,Balanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
 DocType: Fee Validity,Valid Till,Válida até
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Reunião total de professores de pais
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
@@ -1565,7 +1564,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha #{0}: A Qtd Rejeitada não pode ser inserida na Devolução de Compra
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,A alteração do grupo de clientes para o cliente selecionado não é permitida.
 ,Purchase Order Items To Be Billed,Itens da Ordem de Compra a faturar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Atualizando os horários de chegada estimados.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Atualizando os horários de chegada estimados.
 DocType: Program Enrollment Tool,Enrollment Details,Detalhes da inscrição
 DocType: Purchase Invoice Item,Net Rate,Taxa Líquida
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Selecione um cliente
@@ -1584,18 +1583,20 @@
 DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
 DocType: Purchase Order,Group same items,Mesmos itens do grupo
 DocType: Purchase Invoice,Disable Rounded Total,Desativar Total Arredondado
-DocType: Employee Loan Application,Repayment Info,Informações de reembolso
+DocType: Department,Parent Department,Departamento dos pais
+DocType: Loan Application,Repayment Info,Informações de reembolso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"As ""Entradas"" não podem estar vazias"
 DocType: Maintenance Team Member,Maintenance Role,Função de manutenção
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,A Configurar Funcionários
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuário de reserva de hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Pesquisa
+DocType: Subscription Settings,Subscription Settings,Configurações de assinatura
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Efetuado
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Por favor, especifique pelo menos um atributo na tabela de Atributos"
 DocType: Announcement,All Students,Todos os Alunos
@@ -1606,19 +1607,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
 DocType: Crop Cycle,Less than a year,Menos de um ano
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nr. de Telemóvel de Estudante
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resto Do Mundo
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resto Do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O Item {0} não pode ter um Lote
 DocType: Crop,Yield UOM,Rendimento UOM
 ,Budget Variance Report,Relatório de Desvios de Orçamento
 DocType: Salary Slip,Gross Pay,Salário Bruto
 DocType: Item,Is Item from Hub,É Item do Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Linha {0}: É obrigatório colocar o Tipo de Atividade.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendos Pagos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendos Pagos
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livro Contabilístico
 DocType: Stock Reconciliation,Difference Amount,Montante da Diferença
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} em Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,Carga reversa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Lucros Acumulados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Lucros Acumulados
 DocType: Purchase Invoice,05-Change in POS,05-Mudança no POS
 DocType: Vehicle Log,Service Detail,Dados de Serviço
 DocType: BOM,Item Description,Descrição do Item
@@ -1633,12 +1634,12 @@
 DocType: Opportunity Item,Opportunity Item,Item de Oportunidade
 ,Student and Guardian Contact Details,Student and Guardian Detalhes de Contato
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Linha {0}: É necessário o Endereço de Email para o fornecedor {0} para poder enviar o email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Abertura Temporária
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Abertura Temporária
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Ver Hub
 ,Employee Leave Balance,Balanço de Licenças do Funcionário
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},O Saldo da Conta {0} deve ser sempre {1}
 DocType: Patient Appointment,More Info,Mais informações
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},É necessária a Taxa de Avaliação para o Item na linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},É necessária a Taxa de Avaliação para o Item na linha {0}
 DocType: Supplier Scorecard,Scorecard Actions,Ações do Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Exemplo: Mestrado em Ciência de Computadores
 DocType: Purchase Invoice,Rejected Warehouse,Armazém Rejeitado
@@ -1648,7 +1649,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Supplier Quotation Item,Lead Time in days,Chegada ao Armazém em dias
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Resumo das Contas a Pagar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},O pagamento do salário de {0} para {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},O pagamento do salário de {0} para {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não está autorizado a editar a Conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter Faturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
@@ -1657,9 +1658,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrições de teste de laboratório
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferência {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Pequeno
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Pequeno
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Item de Ferramenta de Criação de Fatura de Abertura
 DocType: Education Settings,Employee Number,Número de Funcionário/a
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Cancelar fatura após período de carência
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},O Processo Nr. (s) já está a ser utilizado. Tente a partir do Processo Nr. {0}
 DocType: Project,% Completed,% Concluído
 ,Invoiced Amount (Exculsive Tax),Montante Faturado (Taxa Exclusiva)
@@ -1673,7 +1675,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Teste de Laboratório Data Tempo
 DocType: Email Digest,Add Quote,Adicionar Cotação
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Fator de conversão de UNID necessário para a UNID: {0} no Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Despesas Indiretas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Linha {0}: É obrigatório colocar a qtd
 DocType: Agriculture Analysis Criteria,Agriculture,Agricultura
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sincronização de Def. de Dados
@@ -1703,16 +1705,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, só podem ser ligadas contas de crédito noutro registo de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Bens de Equipamentos
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Bens de Equipamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Defina primeiro o código do item
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,A percentagem total atribuída à equipa de vendas deve ser de 100
+DocType: Subscription Plan,Billing Interval Count,Contagem de intervalos de faturamento
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 DocType: Antibiotic,Antibiotic,Antibiótico
 ,Team Updates,equipe Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Para o Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Para o Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total Geral (Moeda da Empresa)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Criar Formato de Impressão
@@ -1738,7 +1741,7 @@
 DocType: POS Item Group,POS Item Group,Grupo de Itens POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email de Resumo:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Item alternativo não deve ser igual ao código do item
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
 DocType: Sales Partner,Target Distribution,Objetivo de Distribuição
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalização da avaliação provisória
 DocType: Salary Slip,Bank Account No.,Conta Bancária Nr.
@@ -1755,7 +1758,7 @@
 DocType: BOM Operation,Workstation,Posto de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Cotação de Fornecedor
 DocType: Healthcare Settings,Registration Message,Mensagem de registro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Dosagem de Prescrição
 DocType: Attendance,HR Manager,Gestor de RH
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Por favor, selecione uma Empresa"
@@ -1786,7 +1789,7 @@
 DocType: Project,Start and End Dates,Datas de início e Término
 ,Delivered Items To Be Billed,Itens Entregues a Serem Cobrados
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,O Armazém não pode ser modificado pelo Nr. de Série
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,O Armazém não pode ser modificado pelo Nr. de Série
 DocType: Authorization Rule,Average Discount,Desconto Médio
 DocType: Project Update,Great/Quickly,Ótimo / Rapidamente
 DocType: Purchase Invoice Item,UOM,UNID
@@ -1795,8 +1798,8 @@
 DocType: Employee,EMP/,EMP/
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Selecione lotes para itens em lotes
 DocType: Asset,Depreciation Schedules,Cronogramas de Depreciação
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,As seguintes contas podem ser selecionadas nas Configurações de GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,O período do pedido não pode estar fora do período de atribuição de licença
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,As seguintes contas podem ser selecionadas nas Configurações de GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,O período do pedido não pode estar fora do período de atribuição de licença
 DocType: Activity Cost,Projects,Projetos
 DocType: Payment Request,Transaction Currency,Moeda de Transação
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},De {0} | {1} {2}
@@ -1807,6 +1810,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Saída Diária Média
 DocType: POS Profile,Campaign,Campanha
 DocType: Supplier,Name and Type,Nome e Tipo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"O Estado de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Physician,Contacts and Address,Contatos e endereço
 DocType: Purchase Invoice,Contact Person,Contactar Pessoa
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"A ""Data de Início Esperada"" não pode ser mais recente que a ""Data de Término Esperada"""
@@ -1820,19 +1824,20 @@
 DocType: Student Admission,Eligibility and Details,Elegibilidade e detalhes
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Máx.: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
 DocType: Email Digest,For Company,Para a Empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registo de comunicação.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","A Solicitação de Cotação é desativada para o acesso a partir do portal, para saber mais vá às definições do portal."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variável de pontuação do Scorecard do fornecedor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montante de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Montante de Compra
 DocType: Sales Invoice,Shipping Address Name,Nome de Endereço de Envio
 DocType: Material Request,Terms and Conditions Content,Conteúdo de Termos e Condições
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Houve erros na criação da programação do curso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,O Item {0} não é um item de stock
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,O primeiro Aprovador de despesas na lista será definido como o Aprovador de despesas padrão.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,não pode ser maior do que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,O Item {0} não é um item de stock
 DocType: Maintenance Visit,Unscheduled,Sem Marcação
 DocType: Employee,Owned,Pertencente
 DocType: Salary Detail,Depends on Leave Without Pay,Depende da Licença Sem Vencimento
@@ -1853,15 +1858,16 @@
 DocType: Package Code,Package Code,Código pacote
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Aprendiz
 DocType: Purchase Invoice,Company GSTIN,Empresa GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Não são permitidas Quantidades Negativas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Não são permitidas Quantidades Negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","O dado da tabela de imposto obtido a partir do definidor de item como uma string e armazenado neste campo.
  Utilizado para Impostos e Encargos"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,O Funcionário não pode reportar-se a si mesmo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,O Funcionário não pode reportar-se a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta está congelada, só são permitidos registos a utilizadores restritos."
 DocType: Email Digest,Bank Balance,Saldo Bancário
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Deixe o Aprovador Obrigatório no Pedido de Licença
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de emprego, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Regra de Impostos para transações.
@@ -1889,15 +1895,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},É obrigatório colocar o armazém de origem para a linha {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,O termo de pagamento na linha {0} é possivelmente uma duplicata.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agricultura (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Nota Fiscal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Alugar Escritório
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurar definições de portal de SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Nota Fiscal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alugar Escritório
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configurar definições de portal de SMS
 DocType: Disease,Common Name,Nome comum
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Falha ao Importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ainda não foi adicionado nenhum endereço.
 DocType: Workstation Working Hour,Workstation Working Hour,Horário de Posto de Trabalho
 DocType: Vital Signs,Blood Pressure,Pressão sanguínea
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analista
 DocType: Item,Inventory,Inventário
 DocType: Item,Sales Details,Dados de Vendas
 DocType: Quality Inspection,QI-,QI-
@@ -1907,15 +1913,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validar curso matriculado para alunos do grupo estudantil
 DocType: Notification Control,Expense Claim Rejected,Reembolso de Despesas Rejeitado
 DocType: Item,Item Attribute,Atributo do Item
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Governo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Governo
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,O Relatório de Despesas {0} já existe no Registo de Veículo
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Nome do Instituto
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Por favor, indique reembolso Valor"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Por favor, indique reembolso Valor"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variantes do Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Serviços
 DocType: HR Settings,Email Salary Slip to Employee,Enviar Email de Folha de Pagamento a um Funcionário
 DocType: Cost Center,Parent Cost Center,Centro de Custo Principal
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Selecione Fornecedor Possível
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Selecione Fornecedor Possível
 DocType: Sales Invoice,Source,Fonte
 DocType: Customer,"Select, to make the customer searchable with these fields","Selecione, para tornar o cliente pesquisável com esses campos"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar encerrado
@@ -1932,7 +1938,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Nota(s) Fiscal(ais) cancelada(s)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Fluxo de Caixa de Investimentos
 DocType: Program Course,Program Course,Curso do Programa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Custos de Transporte e Envio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Custos de Transporte e Envio
 DocType: Homepage,Company Tagline for website homepage,O Slogan da Empresa para página inicial do website
 DocType: Item Group,Item Group Name,Nome do Grupo do Item
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
@@ -1962,10 +1968,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Detalhes da Memebership
 DocType: Leave Block List,Block Holidays on important days.,Bloquear Férias em dias importantes.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Insira todos os valores de resultado necessários
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Resumo das Contas a Receber
-DocType: Employee Loan,Monthly Repayment Amount,Mensal montante de reembolso
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Resumo das Contas a Receber
+DocType: Loan,Monthly Repayment Amount,Mensal montante de reembolso
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Abertura de faturas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo da ID de Utilizador no registo de Funcionário para definir a Função de Funcionário"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo da ID de Utilizador no registo de Funcionário para definir a Função de Funcionário"
 DocType: UOM,UOM Name,Nome da UNID
 DocType: GST HSN Code,HSN Code,Código HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Montante de Contribuição
@@ -1987,7 +1993,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},O usuário {0} já foi atribuído ao médico {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Caixa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Fornecedor possível
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Fornecedor possível
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"A Lista de Recetores está vazia. Por favor, crie uma Lista de Recetores"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Healthcare (beta)
@@ -2015,7 +2022,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Sem Itens para embalar
 DocType: Shipping Rule Condition,From Value,Valor De
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,É obrigatório colocar a Quantidade de Fabrico
-DocType: Employee Loan,Repayment Method,Método de reembolso
+DocType: Loan,Repayment Method,Método de reembolso
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se for selecionado, a Página Inicial será o Grupo de Itens padrão do website"
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Os reembolsos de despesa da empresa.
@@ -2024,7 +2031,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificado necessário
 DocType: Company,Default Holiday List,Lista de Feriados Padrão
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Linha {0}: A Periodicidade de {1} está a sobrepor-se com {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Responsabilidades de Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Responsabilidades de Stock
 DocType: Purchase Invoice,Supplier Warehouse,Armazém Fornecedor
 DocType: Opportunity,Contact Mobile No,Nº de Telemóvel de Contacto
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Selecione Empresa
@@ -2032,7 +2039,7 @@
 DocType: Student Report Generation Tool,Print Section,Seção de impressão
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,O usuário {0} não possui perfil de POS padrão. Verifique Padrão na Linha {1} para este Usuário.
 DocType: Student Group,Set 0 for no limit,Defina 0 para sem limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} é necessário para criar as faturas Opening {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Endereço principal e detalhes de contato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar Email de Pagamento
@@ -2043,10 +2050,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Selecione pelo menos um domínio.
 DocType: Dependent Task,Dependent Task,Tarefa Dependente
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},A licença do tipo {0} não pode ser mais longa do que {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},A licença do tipo {0} não pode ser mais longa do que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Lembretes de Aniversário
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
 DocType: SMS Center,Receiver List,Lista de Destinatários
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Pesquisar Item
 DocType: Payment Schedule,Payment Amount,Valor do Pagamento
@@ -2056,7 +2063,7 @@
 DocType: Assessment Plan,Grading Scale,Escala de classificação
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Já foi concluído
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Estoque na mão
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Estoque na mão
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importação Com Sucesso!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},A Solicitação de Pagamento {0} já existe
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Itens Emitidos
@@ -2067,17 +2074,16 @@
 DocType: Quotation Item,Quotation Item,Item de Cotação
 DocType: Customer,Customer POS Id,ID do PD do cliente
 DocType: Account,Account Name,Nome da Conta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,A Data De não pode ser mais recente do que a Data A
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,O Nr. de Série {0} de quantidade {1} não pode ser uma fração
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,A Data De não pode ser mais recente do que a Data A
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,O Nr. de Série {0} de quantidade {1} não pode ser uma fração
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Por favor, indique o URL do servidor de Woocommerce"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Definidor de Tipo de Fornecedor.
 DocType: Purchase Order Item,Supplier Part Number,Número de Peça de Fornecedor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 DocType: Share Balance,To No,Para não
-DocType: Subscription,Reference Document,Documento de Referência
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} foi cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de Crédito
-DocType: Grant Application,Applicant Type,Tipo de candidato
+DocType: Loan,Applicant Type,Tipo de candidato
 DocType: Purchase Invoice,03-Deficiency in services,03-Deficiência em serviços
 DocType: Delivery Note,Vehicle Dispatch Date,Datade Expedição do Veículo
 DocType: Healthcare Settings,Default Medical Code Standard,Padrão do Código Médico Padrão
@@ -2088,13 +2094,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qtd Reservada
 DocType: Party Account,Party Account,Conta da Parte
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Rendimento Superior
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rejeitar
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Moeda da Empresa
 DocType: BOM Item,BOM Item,Item da LDM
 DocType: Appraisal,For Employee,Para o Funcionário
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Faça Desembolso Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Faça Desembolso Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Linha {0}: O Avanço do Fornecedor deve ser um débito
 DocType: Company,Default Values,Valores Padrão
 DocType: Membership,INR,EM R
@@ -2124,10 +2130,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Disponível em estoque
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Disponível em estoque
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planeamento de Capacidade Para (Dias)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Adjudicação
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nenhum dos itens teve qualquer alteração na sua quantidade ou montante.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nenhum dos itens teve qualquer alteração na sua quantidade ou montante.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Campo obrigatório - Programa
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Campo obrigatório - Programa
 DocType: Special Test Template,Result Component,Componente de Resultado
@@ -2148,7 +2154,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Incluir as férias nas licenças como licenças
 DocType: Sales Invoice,Packed Items,Itens Embalados
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamação de Garantia em Nr. de Série.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Total'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Total'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho de Compras
 DocType: Employee,Permanent Address,Endereço Permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2166,10 +2172,10 @@
 DocType: Selling Settings,Selling Settings,Definições de Vendas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Confirmar ação
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Leilões Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a Quantidade e/ou Taxa de Valorização"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a Quantidade e/ou Taxa de Valorização"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Cumprimento
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Ver Carrinho
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despesas de Marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Comunicação de Falta de Item
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Não é possível criar critérios padrão. Renomeie os critérios
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
@@ -2192,9 +2198,9 @@
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Material Request,Transferred,Transferido
 DocType: Vehicle,Doors,Portas
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Taxa de Recolha para Registro de Pacientes
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Não é possível alterar os Atributos após a transação do estoque. Faça um novo Item e transfira estoque para o novo Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Não é possível alterar os Atributos após a transação do estoque. Faça um novo Item e transfira estoque para o novo Item
 DocType: Course Assessment Criteria,Weightage,Peso
 DocType: Purchase Invoice,Tax Breakup,Desagregação de impostos
 DocType: Packing Slip,PS-,PS-
@@ -2230,12 +2236,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Conciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Purchase Invoice Item,Batch No,Nº de Lote
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Avanços do funcionário
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias Ordens de Venda relacionadas a mesma Ordem de Compra do Cliente
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 DocType: Grant Application,Assessment  Mark (Out of 10),Marca de avaliação (fora de 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 móvel Não
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,HTML de Funcionários
@@ -2244,15 +2251,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,É obrigatório colocar o campo Oportunidade De
 DocType: Email Digest,Annual Expenses,Despesas anuais
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Criar Ordem de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Criar Ordem de Compra
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montante alocado
 DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
 DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Da Reconciliação
 DocType: Territory,Territory Name,Nome território
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Você só pode ter planos com o mesmo ciclo de faturamento em uma assinatura
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidato a um Emprego.
 DocType: Purchase Order Item,Warehouse and Reference,Armazém e Referência
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações legais e outras informações gerais sobre o seu Fornecedor
@@ -2263,10 +2271,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,No Lançamento Contábil {0} não possui qualquer registo {1} ímpar
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Avaliações
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eventos de treinamento
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Foi inserido um Nº de Série em duplicado para o Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Foi inserido um Nº de Série em duplicado para o Item {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Rastrear leads por origem de leads.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uma condição para uma Regra de Envio
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,"Por favor, insira"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,"Por favor, insira"
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Log de Manutenção
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base no Item ou no Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma de peso líquido dos itens)
@@ -2274,11 +2282,11 @@
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Cobrar
 DocType: Student Group,Instructors,instrutores
 DocType: GL Entry,Credit Amount in Account Currency,Montante de Crédito na Moeda da Conta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,A LDM {0} deve ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,A LDM {0} deve ser enviada
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gerenciamento de compartilhamento
 DocType: Authorization Control,Authorization Control,Controlo de Autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha #{0}:  É obrigatório colocar o Armazém Rejeitado no Item Rejeitado {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pagamento
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","O depósito {0} não está vinculado a nenhuma conta, mencione a conta no registro do depósito ou defina a conta do inventário padrão na empresa {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gerir as suas encomendas
 DocType: Work Order Operation,Actual Time and Cost,Horas e Custos Efetivos
@@ -2288,7 +2296,7 @@
 DocType: Student Leave Application,Student Leave Application,Solicitação de Licença de Estudante
 DocType: Item,Will also apply for variants,Também se aplicará para as variantes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Em
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pacote de itens no momento da venda.
@@ -2298,7 +2306,7 @@
 DocType: Item,Barcodes,Códigos de barra
 DocType: Hub Category,Hub Node,Nó da Plataforma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Sócio
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Sócio
 DocType: Asset Movement,Asset Movement,Movimento de Ativo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,A ordem de serviço {0} deve ser enviada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,New Cart
@@ -2316,13 +2324,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,A moeda de faturamento deve ser igual à moeda da empresa padrão ou à moeda da conta do partido
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só no Rascunho)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Linha {0}: data de vencimento não pode ser antes da data de publicação
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Linha {0}: data de vencimento não pode ser antes da data de publicação
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Efetuar Registo de Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendências de Fatura de Vendas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Licenças
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Para
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Só pode referir a linha se o tipo de cobrança for ""No Montante da Linha Anterior"" ou ""Total de Linha Anterior"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Só pode referir a linha se o tipo de cobrança for ""No Montante da Linha Anterior"" ou ""Total de Linha Anterior"""
 DocType: Sales Order Item,Delivery Warehouse,Armazém de Entrega
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Esquema de Centros de Custo financeiro.
 DocType: Serial No,Delivery Document No,Nr. de Documento de Entrega
@@ -2336,7 +2343,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,O consumo de material não está definido em Configurações de fabricação.
 DocType: Student,Student Mobile Number,Número de telemóvel do Estudante
 DocType: Item,Has Variants,Tem Variantes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Não é possível sobrepor o item {0} na linha {1} mais do que {2}. Para permitir o excesso de cobrança, defina Configurações de estoque"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Não é possível sobrepor o item {0} na linha {1} mais do que {2}. Para permitir o excesso de cobrança, defina Configurações de estoque"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Atualizar Resposta
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da Distribuição Mensal
@@ -2348,12 +2355,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Selecione primeiro o programa
 DocType: Patient Appointment,Patient Age,Idade do Paciente
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Gestão de Projetos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,O número de série {0} já foi retornado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,O número de série {0} já foi retornado
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de Bens ou Serviços.
 DocType: Budget,Fiscal Year,Ano Fiscal
 DocType: Asset Maintenance Log,Planned,Planejado
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Contas de recebimento por defeito a serem usadas se não estiver configurada no Paciente para reservar taxas de Consulta.
 DocType: Vehicle Log,Fuel Price,Preço de Combustível
+DocType: Bank Guarantee,Margin Money,Dinheiro Margem
 DocType: Budget,Budget,Orçamento
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Set Open
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
@@ -2367,16 +2375,16 @@
 DocType: Lead,Follow Up,Acompanhamento
 DocType: Item,Is Sales Item,É um Item de Vendas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Esquema de Grupo de Item
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,O Item {0} não está configurado para os Nrs. de série. Verifique o definidor de Item
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,O Item {0} não está configurado para os Nrs. de série. Verifique o definidor de Item
 DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
 ,Amount to Deliver,Montante a Entregar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},O mesmo item foi inserido várias vezes. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo da Data de Início não pode ser antes da Data de Início do Ano Letivo com o qual o termo está vinculado (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Ocorreram erros
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,O empregado {0} já aplicou {1} entre {2} e {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Ocorreram erros
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,O empregado {0} já aplicou {1} entre {2} e {3}:
 DocType: Guardian,Guardian Interests,guardião Interesses
 DocType: Naming Series,Current Value,Valor Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
 DocType: Education Settings,Instructor Records to be created by,Registros de instrutor a serem criados por
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criado
 DocType: GST Account,GST Account,Conta GST
@@ -2396,8 +2404,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
 DocType: Website Item Group,Website Item Group,Website de Grupo de Item
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Adicionado aos Favoritos
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nenhum recibo de salário encontrado para enviar para o critério acima selecionado OU recibo de salário já enviado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impostos e Taxas
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nenhum recibo de salário encontrado para enviar para o critério acima selecionado OU recibo de salário já enviado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Impostos e Taxas
 DocType: Projects Settings,Projects Settings,Configurações de projetos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, insira a Data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},Há {0} registos de pagamento que não podem ser filtrados por {1}
@@ -2407,27 +2415,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Esquema de Grupos de Itens.
 DocType: Production Plan,Total Produced Qty,Qtd Total Produzido
 DocType: Payroll Entry,Get Employee Details,Obter detalhes do empregado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível referir o número da linha como superior ou igual ao número da linha atual para este tipo de Cobrança
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível referir o número da linha como superior ou igual ao número da linha atual para este tipo de Cobrança
 DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Histórico de Compras por Item
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para obter o Nr. de Série adicionado ao Item {0}"
 DocType: Account,Frozen,Suspenso
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Valor Base (Moeda da Empresa)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Matéria prima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Matéria prima
 DocType: Payment Reconciliation Payment,Reference Row,Linha de Referência
 DocType: Installation Note,Installation Time,Tempo de Instalação
 DocType: Sales Invoice,Accounting Details,Dados Contabilísticos
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Eliminar todas as Transações desta Empresa
 DocType: Patient,O Positive,O Positivo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investimentos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investimentos
 DocType: Issue,Resolution Details,Dados de Resolução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atribuições
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critérios de Aceitação
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Por favor, insira as Solicitações de Materiais na tabela acima"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Nenhum reembolso disponível para lançamento no diário
 DocType: Item Attribute,Attribute Name,Nome do Atributo
 DocType: BOM,Show In Website,Mostrar No Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Mostrar Quantidade em site
-DocType: Employee Loan Application,Total Payable Amount,Valor Total a Pagar
+DocType: Loan Application,Total Payable Amount,Valor Total a Pagar
 DocType: Task,Expected Time (in hours),Tempo Previsto (em horas)
 DocType: Item Reorder,Check in (group),Check-in (grupo)
 DocType: Soil Texture,Silt,Silt
@@ -2446,7 +2455,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Faça o pagamento
 DocType: Room,Room Name,Nome da Sala
 DocType: Prescription Duration,Prescription Duration,Duração da prescrição
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser aplicada/cancelada antes de {0}, pois o saldo da licença já foi encaminhado no registo de atribuição de licenças futuras {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser aplicada/cancelada antes de {0}, pois o saldo da licença já foi encaminhado no registo de atribuição de licenças futuras {1}"
 DocType: Activity Cost,Costing Rate,Taxa de Cálculo dos Custos
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Endereços e Contactos de Clientes
 ,Campaign Efficiency,Eficiência da Campanha
@@ -2466,11 +2475,11 @@
 DocType: Chapter,Chapter,Capítulo
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,A conta padrão será atualizada automaticamente na Fatura POS quando esse modo for selecionado.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
 DocType: Asset,Depreciation Schedule,Cronograma de Depreciação
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Endereços e contatos do parceiro de vendas
 DocType: Bank Reconciliation Detail,Against Account,Na Conta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Metade Data Day deve estar entre De Data e To Date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Metade Data Day deve estar entre De Data e To Date
 DocType: Maintenance Schedule Detail,Actual Date,Data Real
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Defina o Centro de custo padrão na {0} empresa.
 DocType: Item,Has Batch No,Tem Nr. de Lote
@@ -2488,7 +2497,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Data de Término Efetiva (através da Folha de Presenças)
 DocType: Soil Texture,Soil Type,Tipo de solo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nova mensagem
 ,Quotation Trends,Tendências de Cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no definidor de item para o item {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandato GoCardless
@@ -2508,7 +2516,7 @@
 DocType: Hub Category,Hub Category,Categoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Número de Veículos
-DocType: Employee Loan,Loan Amount,Montante do empréstimo
+DocType: Loan,Loan Amount,Montante do empréstimo
 DocType: Student Report Generation Tool,Add Letterhead,Adicionar papel timbrado
 DocType: Program Enrollment,Self-Driving Vehicle,Veículo de auto-condução
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Scorecard do fornecedor em pé
@@ -2537,9 +2545,9 @@
 DocType: Cash Flow Mapper,Position,Posição
 DocType: Patient,Patient Details,Detalhes do paciente
 DocType: Patient,B Positive,B Positivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
 DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico do Paciente
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupo a Fora do Grupo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Desportos
@@ -2547,8 +2555,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Real
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Irmãos do Estudante
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detalhe do plano de assinatura
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unidade
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Por favor, especifique a Empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Por favor, especifique a Empresa"
 ,Customer Acquisition and Loyalty,Aquisição e Lealdade de Cliente
 DocType: Asset Maintenance Task,Maintenance Task,Tarefa de manutenção
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Defina B2C Limit em GST Settings.
@@ -2563,6 +2572,7 @@
 ,BOM Search,Pesquisa da LDM
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Custo total de material consumido (via entrada em estoque)
 DocType: Hub Settings,Company Registered,Empresa Registrada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Até a data não pode ser menor que a partir da data
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publicar &quot;Em estoque&quot; ou &quot;Não disponível&quot; no Hub com base nas ações disponíveis neste armazém.
 DocType: Vehicle,Fuel Type,Tipo de Comb.
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique a moeda na Empresa"
@@ -2570,17 +2580,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},O saldo de stock no Lote {0} vai ficar negativo {1} para o item {2} no Armazém {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Solicitações de Materiais têm sido automaticamente executadas com base no nível de reencomenda do Item
 DocType: Email Digest,Pending Sales Orders,Ordens de Venda Pendentes
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
 DocType: Employee,Create User Permission,Criar permissão de usuário
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 DocType: Healthcare Settings,Remind Before,Lembre-se antes
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},É necessário colocar o fator de Conversão de UNID na linha {0}
 DocType: Production Plan Item,material_request_item,item_de_solicitação_de_material
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
 DocType: Salary Component,Deduction,Dedução
 DocType: Item,Retain Sample,Manter a amostra
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Linha {0}: É obrigatório colocar a Periodicidade.
 DocType: Stock Reconciliation Item,Amount Difference,Diferença de Montante
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},O Preço de Item foi adicionada a {0} na Lista de Preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},O Preço de Item foi adicionada a {0} na Lista de Preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, insira a ID de Funcionário deste(a) vendedor(a)"
 DocType: Territory,Classification of Customers by region,Classificação dos Clientes por Região
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Em produção
@@ -2590,8 +2601,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo de de Extrato Bancário calculado
 DocType: Normal Test Template,Normal Test Template,Modelo de teste normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizador desativado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Cotação
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Não é possível definir um RFQ recebido para nenhuma cotação
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Cotação
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Não é possível definir um RFQ recebido para nenhuma cotação
 DocType: Quotation,QTN-,QUEST-
 DocType: Salary Slip,Total Deduction,Total de Reduções
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Selecione uma conta para imprimir na moeda da conta
@@ -2599,7 +2610,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Isso é baseado em transações contra este Paciente. Veja a linha de tempo abaixo para detalhes
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Custo Atualizado
 DocType: Patient,Date of Birth,Data de Nascimento
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,O Item {0} já foi devolvido
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,O Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um Ano de Exercício Financeiro. Todos os lançamentos contabilísticos e outras transações principais são controladas no **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço de Cliente / Potencial Cliente
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuração do Scorecard Fornecedor
@@ -2610,14 +2621,15 @@
 DocType: Work Order Operation,Actual Operation Time,Tempo Operacional Efetivo
 DocType: Authorization Rule,Applicable To (User),Aplicável Ao/À (Utilizador/a)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descrição do Emprego
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descrição do Emprego
 DocType: Student Applicant,Applied,Aplicado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Novamento aberto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Novamento aberto
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qtd como UNID de Stock
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nome Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Sale Discount
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Não são permitido Caracteres especiais na série de atribuição de nomes, exceto ""-"" ""."", ""#"", e ""/"""
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o Controlo das Campanhas de Vendas. Mantenha o controlo dos Potenciais Clientes, Orçamentos, Ordens de Venda, etc. das Campanhas para medir o Retorno do Investimento."
+DocType: Department Approver,Approver,Aprovador
 ,SO Qty,Qtd SO
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,O campo Acionista não pode estar em branco
 DocType: Guardian,Work Address,Endereço de Trabalho
@@ -2631,21 +2643,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montante Alocado Total (Moeda da Empresa)
 DocType: Purchase Order Item,To be delivered to customer,A ser entregue ao cliente
 DocType: BOM,Scrap Material Cost,Custo de Material de Sucata
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,O Nr. de Série {0} não pertence a nenhum Armazém
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,O Nr. de Série {0} não pertence a nenhum Armazém
 DocType: Grant Application,Email Notification Sent,Notificação por email enviada
 DocType: Purchase Invoice,In Words (Company Currency),Por Extenso (Moeda da Empresa)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Código do item, armazém, quantidade é necessária na linha"
-DocType: Pricing Rule,Supplier,Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Código do item, armazém, quantidade é necessária na linha"
+DocType: Bank Guarantee,Supplier,Fornecedor
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Mostrar detalhes de pagamento
 DocType: Consultation,Consultation Time,Tempo de consulta
 DocType: C-Form,Quarter,Trimestre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Despesas Diversas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa Padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,É obrigatório ter uma conta de Despesas ou Diferenças para o Item {0} pois ele afeta o valor do stock em geral
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nome do Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Acima
-DocType: Employee Loan,Employee Loan Account,Conta de empréstimo a funcionário
 DocType: Leave Application,Total Leave Days,Total de Dias de Licença
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: O email não será enviado a utilizadores desativados
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de Interações
@@ -2661,7 +2672,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Peso (em quilograma)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",capítulos / chapter_name deixa em branco definido automaticamente depois de salvar o capítulo.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Defina as Contas GST em Configurações GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Defina as Contas GST em Configurações GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tipo de negócios
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione o Montante Alocado, o Tipo de Fatura e o Número de Fatura em pelo menos uma linha"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Custo de Nova Compra
@@ -2670,12 +2681,13 @@
 DocType: Grant Application,Grant Description,Descrição do Grant
 DocType: Purchase Invoice Item,Rate (Company Currency),Taxa (Moeda da Empresa)
 DocType: Student Guardian,Others,Outros
+DocType: Subscription,Discounts,Descontos
 DocType: Payment Entry,Unallocated Amount,Montante Não Atribuído
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Não foi possível encontrar um item para esta pesquisa. Por favor, selecione outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um Produto ou Serviço que é comprado, vendido ou mantido em stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Não há mais atualizações
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de cobrança como ""No Valor da Linha Anterior"" ou ""No Total da Linha Anterior"" para a primeira linha"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de cobrança como ""No Valor da Linha Anterior"" ou ""No Total da Linha Anterior"" para a primeira linha"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Isso abrange todos os scorecards vinculados a esta configuração
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Um Subitem não deve ser um Pacote de Produtos. Por favor remova o item `{0}` e guarde-o
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Ativ. Bancária
@@ -2684,21 +2696,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em 'Gerar Cronograma' para obter o cronograma"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure a série de numeração para Presença via Configuração&gt; Série de Numeração"
 DocType: Bin,Ordered Quantity,Quantidade Pedida
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","ex: ""Ferramentas de construção para construtores"""
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de classificação na grelha
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Lucros para o ano
+DocType: Bank Guarantee,Name of Bank,Nome do banco
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: O Registo Contabilístico para {2} só pode ser efetuado na moeda: {3}
 DocType: Fee Schedule,In Process,A Decorrer
 DocType: Authorization Rule,Itemwise Discount,Desconto Por Item
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Esquema de contas financeiras.
+DocType: Bank Guarantee,Reference Document Type,Referência Tipo de Documento
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapeamento de fluxo de caixa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} no Ordem de Vendas {1}
 DocType: Account,Fixed Asset,Ativos Imobilizados
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventário Serializado
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail não encontrado em contato padrão
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gerar Segredo
-DocType: Employee Loan,Account Info,Informações da Conta
+DocType: Loan,Account Info,Informações da Conta
 DocType: Activity Type,Default Billing Rate,Taxa de Faturação Padrão
 DocType: Fees,Include Payment,Incluir Pagamento
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grupos de Alunos criados.
@@ -2706,24 +2721,24 @@
 DocType: Sales Invoice,Total Billing Amount,Valor Total de Faturação
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,O programa na estrutura de tarifas e no grupo de alunos {0} são diferentes.
 DocType: Fee Schedule,Receivable Account,Conta a Receber
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Linha #{0}: O Ativo {1} já é {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Linha #{0}: O Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Stock
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Ordem de Venda para Pagamento
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Com Pagamento de Imposto
 DocType: Expense Claim Detail,Expense Claim Detail,Dados de Reembolso de Despesas
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICADO PARA FORNECEDOR
 DocType: Land Unit,Is Container,Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Este será o dia 1 do ciclo da cultura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Por favor, selecione a conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Por favor, selecione a conta correta"
 DocType: Purchase Invoice Item,Weight UOM,UNID de Peso
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lista de accionistas disponíveis com números folio
 DocType: Salary Structure Employee,Salary Structure Employee,Estrutura Salarial de Funcionários
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Mostrar atributos variantes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Mostrar atributos variantes
 DocType: Student,Blood Group,Grupo Sanguíneo
 DocType: Course,Course Name,Nome do Curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizadores que podem aprovar pedidos de licença de um determinado funcionário
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Equipamentos de Escritório
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Equipamentos de Escritório
 DocType: Purchase Invoice Item,Qty,Qtd
 DocType: Fiscal Year,Companies,Empresas
 DocType: Supplier Scorecard,Scoring Setup,Configuração de pontuação
@@ -2742,7 +2757,7 @@
 DocType: Stock Entry,Total Incoming Value,Valor Total de Entrada
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,É necessário colocar o Débito Para
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","O Registo de Horas ajudar a manter o controlo do tempo, custo e faturação para atividades feitas pela sua equipa"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Preços de Compra
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Lista de Preços de Compra
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelos de variáveis do scorecard do fornecedor.
 DocType: Job Offer Term,Offer Term,Termo de Oferta
 DocType: Asset,Quality Manager,Gestor da Qualidade
@@ -2754,13 +2769,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total Por Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operação Site
 DocType: Supplier Scorecard,Supplier Score,Pontuação do fornecedor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Qtd Total Faturada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Qtd Total Faturada
 DocType: Supplier,Warn RFQs,Avisar PDOs
 DocType: BOM,Conversion Rate,Taxa de Conversão
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Pesquisa de produto
 DocType: Assessment Plan,To Time,Para Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Função (acima do valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,O Crédito Para a conta deve ser uma conta A Pagar
+DocType: Loan,Total Amount Paid,Valor Total Pago
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selecione a Admissão de Estudante que é obrigatória para o estudante pago.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Recursividade da LDM: {0} não pode ser o grupo de origem ou o subgrupo de {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Selecione uma lista de preços para publicar preços
@@ -2770,19 +2786,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,A Lista de Preços {0} está desativada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A Qtd Concluída não pode ser superior a {1} para a operação {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir Horas Extra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
 DocType: Training Event Employee,Training Event Employee,Evento de Formação de Funcionário
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Amostras máximas - {0} podem ser mantidas para Batch {1} e Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Adicionar intervalos de tempo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nrs. de Série para o Item {1}. Forneceu {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nrs. de Série para o Item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação Atual da Taxa
 DocType: Training Event,Advance,Avançar
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,para se repetir de novo.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Configurações do gateway de pagamento GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Ganhos / Perdas de Câmbio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Ganhos / Perdas de Câmbio
 DocType: Opportunity,Lost Reason,Motivo de Perda
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Linha # {0}: Conta {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Linha # {0}: Conta {1} não pertence à empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Não foi possível encontrar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Novo Endereço
 DocType: Quality Inspection,Sample Size,Tamanho da Amostra
@@ -2801,7 +2816,6 @@
 DocType: Bin,Actual Quantity,Quantidade Efetiva
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Envio no Dia Seguinte
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr. de Série {0} não foi encontrado
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},A subscrição foi {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programa de Programação de Taxas
 DocType: Fee Schedule Program,Student Batch,Classe de Estudantes
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Faça Student
@@ -2817,14 +2831,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Não Entregue
 ,Bank Clearance Summary,Resumo de Liquidações Bancárias
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Criar e gerir resumos de email diários, semanais e mensais."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Criar e gerir resumos de email diários, semanais e mensais."
 DocType: Appraisal Goal,Appraisal Goal,Objetivo da Avaliação
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Sugerir categoria?
 DocType: Stock Reconciliation Item,Current Amount,Valor Atual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Prédios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Prédios
 DocType: Fee Schedule,Fee Structure,Estrutura de Propinas
 DocType: Timesheet Detail,Costing Amount,Montante de Cálculo dos Custos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 DocType: Student Admission Program,Application Fee,Taxa de Inscrição
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Enviar Folha de Vencimento
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,O desconto Máximo para o Item {0} é de {1}%
@@ -2832,12 +2845,13 @@
 DocType: Sales Partner,Address & Contacts,Endereço e Contactos
 DocType: SMS Log,Sender Name,Nome do Remetente
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Critérios de análise da agricultura
+DocType: HR Settings,Leave Approval Notification Template,Deixar modelo de notificação de aprovação
 DocType: POS Profile,[Select],[Selecionar]
 DocType: Vital Signs,Blood Pressure (diastolic),Pressão sanguínea (diastólica)
 DocType: SMS Log,Sent To,Enviado Para
 DocType: Agriculture Task,Holiday Management,Gestão de férias
 DocType: Payment Request,Make Sales Invoice,Efetuar Fatura de Compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
 DocType: Company,For Reference Only.,Só para Referência.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Médico {0} não disponível no {1}
@@ -2855,7 +2869,7 @@
 DocType: Employee,New Workplace,Novo Local de Trabalho
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Consumo de material
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Definir como Fechado
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nenhum Item com Código de Barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nenhum Item com Código de Barras {0}
 DocType: Normal Test Items,Require Result Value,Exigir o valor do resultado
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,boms
@@ -2870,19 +2884,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o funcionário {0} ou para as datas indicadas
 DocType: Leave Block List,Allow Users,Permitir Utilizadores
 DocType: Purchase Order,Customer Mobile No,Nr. de Telemóvel de Cliente
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recorrente
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalhes do modelo de mapeamento de fluxo de caixa
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Gestão de Empréstimos
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe Rendimentos e Despesas separados para verticais ou divisões de produtos.
 DocType: Rename Tool,Rename Tool,Ferr. de Alt. de Nome
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Atualizar Custo
 DocType: Item Reorder,Item Reorder,Reencomenda do Item
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Mostrar Folha de Vencimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transferência de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Mostrar Folha de Vencimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transferência de Material
 DocType: Fees,Send Payment Request,Enviar pedido de pagamento
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custo operacional e dar um só Nr. Operação às suas operações."
 DocType: Water Analysis,Origin,Origem
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Selecionar alterar montante de conta
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
@@ -2897,14 +2911,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,É Responsabilidade Fiscal de Renda
 DocType: Grading Scale Interval,Grade Description,Descrição de Classe
 DocType: Stock Entry,Purchase Receipt No,Nº de Recibo de Compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Sinal
 DocType: Sales Invoice, Shipping Bill Number,Número de conta de envio
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Rastreabilidade
 DocType: Asset Maintenance Log,Actions performed,Ações realizadas
 DocType: Cash Flow Mapper,Section Leader,Líder da seção
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fonte de Fundos (Passivos)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Fonte de Fundos (Passivos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},A quantidade na linha {0} ( {1}) deve ser igual à quantidade fabricada em {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Funcionário
+DocType: Bank Guarantee,Fixed Deposit Number,Número de depósito fixo
 DocType: Asset Repair,Failure Date,Data de falha
 DocType: Sample Collection,Collected Time,Tempo coletado
 DocType: Company,Sales Monthly History,Histórico mensal de vendas
@@ -2921,10 +2936,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Tem certeza de que deseja cancelar esse compromisso?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pacote de preços de quarto de hotel
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Canal de Vendas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Necessário Em
 DocType: Rename Tool,File to Rename,Ficheiro para Alterar Nome
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Buscar atualizações de assinatura
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},A conta {0} não coincide com a Empresa {1} no Modo de Conta: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},A LDM especificada {0} não existe para o Item {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Curso:
@@ -2934,7 +2950,7 @@
 DocType: Notification Control,Expense Claim Approved,Reembolso de Despesas Aprovado
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nenhuma ordem de serviço criada
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Já foi criada a Folha de Vencimento do funcionário {0} para este período
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmacêutico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo dos Itens Adquiridos
 DocType: Selling Settings,Sales Order Required,Ordem de Venda necessária
 DocType: Purchase Invoice,Credit To,Creditar Em
@@ -2952,7 +2968,7 @@
 DocType: Request for Quotation Supplier,No Quote,Sem cotação
 DocType: Warranty Claim,Raised By,Levantado Por
 DocType: Payment Gateway Account,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Descanso de Compensação
 DocType: Job Offer,Accepted,Aceite
@@ -2964,7 +2980,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que realmente deseja apagar todas as transações para esta empresa. Os seus dados principais permanecerão como estão. Esta ação não pode ser anulada."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Procurar Resultados
 DocType: Room,Room Number,Número de Sala
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referência inválida {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referência inválida {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Regra Rotulação de Envio
 DocType: Journal Entry Account,Payroll Entry,Entrada de folha de pagamento
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Exibir registros de taxas
@@ -2974,7 +2990,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
 DocType: Lab Test Sample,Lab Test Sample,Amostra de teste de laboratório
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permitir Renomear o Valor do Atributo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Lançamento Contabilístico Rápido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Lançamento Contabilístico Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Não pode alterar a taxa se a LDM for mencionada nalgum item
 DocType: Restaurant,Invoice Series Prefix,Prefixo da série de fatura
 DocType: Employee,Previous Work Experience,Experiência Laboral Anterior
@@ -2982,8 +2998,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a Qtd Planeada para o Item {0} na linha {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,A integração do Google Maps não está ativada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} não foi enviado
+DocType: Subscription,Trialling,Julgamento
 DocType: Member,Membership Expiry Date,Data de expiração da associação
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} deve ser negativo no documento de devolução
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} deve ser negativo no documento de devolução
 ,Minutes to First Response for Issues,Minutos para a Primeira Resposta a Incidentes
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,O nome do instituto para o qual está a instalar este sistema.
@@ -3002,7 +3019,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,Data de Fim de Ano
 DocType: Task Depends On,Task Depends On,A Tarefa Depende De
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oportunidade
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oportunidade
 DocType: Operation,Default Workstation,Posto de Trabalho Padrão
 DocType: Notification Control,Expense Claim Approved Message,Mensagem de Reembolso de Despesas Aprovadas
 DocType: Payment Entry,Deductions or Loss,Deduções ou Perdas
@@ -3040,7 +3057,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,A Licença Sem Vencimento não coincide com os registos de Pedido de Licença aprovados
 DocType: Campaign,Campaign-.####,Campanha-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos Passos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Por favor, forneça os itens especificados com as melhores taxas possíveis"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Por favor, forneça os itens especificados com as melhores taxas possíveis"
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Saldo remanescente
@@ -3050,7 +3067,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fim do Ano
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,A Data de Término do Contrato deve ser mais recente que a Data de Adesão
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,A Data de Término do Contrato deve ser mais recente que a Data de Adesão
 DocType: Driver,Driver,Motorista
 DocType: Vital Signs,Nutrition Values,Valores nutricionais
 DocType: Lab Test Template,Is billable,É faturável
@@ -3061,7 +3078,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Data de Início Efetiva (através da Folha de Presenças)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este é um exemplo dum website gerado automaticamente a partir de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Faixa de Idade 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,A quantia de antecipação total não pode ser maior do que o montante total reclamado
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,A quantia de antecipação total não pode ser maior do que o montante total reclamado
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3116,7 +3133,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais Itens {0} do que a quantidade da Ordem de Vendas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Selecione os Valores do Atributo
 DocType: Purchase Invoice,Reason For Issuing document,Razão para emitir documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,O Registo de Stock {0} não foi enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,O Registo de Stock {0} não foi enviado
 DocType: Payment Reconciliation,Bank / Cash Account,Conta Bancária / Dinheiro
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,O Próximo Contacto Por não pode ser o mesmo que o Endereço de Email de Potencial Cliente
 DocType: Tax Rule,Billing City,Cidade de Faturação
@@ -3133,7 +3150,8 @@
 DocType: Warranty Claim,Service Address,Endereço de Serviço
 DocType: Asset Maintenance Task,Calibration,Calibração
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} é um feriado da empresa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Móveis e Utensílios
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Deixar a notificação de status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Móveis e Utensílios
 DocType: Item,Manufacture,Fabrico
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Empresa de Configuração
 ,Lab Test Report,Relatório de teste de laboratório
@@ -3149,7 +3167,6 @@
 DocType: Crop,Planting Area,Área de plantação
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtd)
 DocType: Installation Note Item,Installed Qty,Qtd Instalada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Isso pode ser devido a alguns endereços de e-mail inválidos no
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Tu adicionaste
 DocType: Purchase Taxes and Charges,Parenttype,Tipoprincipal
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado de Formação
@@ -3159,16 +3176,17 @@
 DocType: Products Settings,Products per Page,Produtos por Página
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Definidor da filial da organização.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturação
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Relatar um Incidente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Despesas de Serviços
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Despesas de Serviços
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima-de-90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Linha # {0}: O Lançamento Contabilístico {1} não tem uma conta {2} ou está relacionado a outro voucher
 DocType: Supplier Scorecard Criteria,Criteria Weight,Critérios Peso
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Deixar a notificação de aprovação
 DocType: Buying Settings,Default Buying Price List,Lista de Compra de Preço Padrão
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Folha de Vencimento Baseada no Registo de Horas
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Taxa de compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Taxa de compra
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir Valores Padrão, como a Empresa, Moeda, Ano Fiscal Atual, etc."
 DocType: Payment Entry,Payment Type,Tipo de Pagamento
@@ -3191,6 +3209,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Definições de Carrinho
 DocType: Journal Entry,Accounting Entries,Registos Contabilísticos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se a Regra de preços selecionada for feita para &#39;Taxa&#39;, ela substituirá a Lista de preços. A taxa de tarifa de preços é a taxa final, portanto, nenhum desconto adicional deve ser aplicado. Assim, em transações como Ordem de Vendas, Ordem de Compra, etc., será buscado no campo &quot;Taxa&quot;, em vez do campo &quot;Taxa de Lista de Preços&quot;."
+DocType: Journal Entry,Paid Loan,Empréstimo pago
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Registo Duplicado. Por favor, verifique a Regra de Autorização {0}"
 DocType: Journal Entry Account,Reference Due Date,Data de Vencimento de Referência
 DocType: Purchase Order,Ref SQ,SQ de Ref
@@ -3207,7 +3226,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Não foi criado um Cronograma de Manutenção para todos os itens. Por favor, clique em ""Gerar Cronograma"""
 ,To Produce,Para Produzir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Folha de Pagamento
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para a linha {0} em {1}. Para incluir {2} na taxa do Item, também devem ser incluídas as linhas {3}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para a linha {0} em {1}. Para incluir {2} na taxa do Item, também devem ser incluídas as linhas {3}"
 DocType: Patient Service Unit,Parent Service Unit,Unidade de serviço dos pais
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Criar utilizador
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a entrega (para impressão)
@@ -3226,7 +3245,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Conta de Rendimento
 DocType: Payment Request,Amount in customer's currency,Montante na moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Entrega
 DocType: Volunteer,Weekdays,Dias da semana
 DocType: Stock Reconciliation Item,Current Qty,Qtd Atual
 DocType: Restaurant Menu,Restaurant Menu,Menu do restaurante
@@ -3234,7 +3253,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
 DocType: Payment Entry,Total Allocated Amount,Valor Total Atribuído
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Defina a conta de inventário padrão para o inventário perpétuo
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Defina a conta de inventário padrão para o inventário perpétuo
 DocType: Item Reorder,Material Request Type,Tipo de Solicitação de Material
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Enviar o e-mail de revisão de concessão
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage está cheio, não salvou"
@@ -3242,10 +3261,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Capacidade do quarto
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Já existe registro para o item {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Você perderá registros de faturas geradas anteriormente. Tem certeza de que deseja reiniciar esta assinatura?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Taxa de registro
 DocType: Budget,Cost Center,Centro de Custos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Mensagem da Ordem de Compra
 DocType: Tax Rule,Shipping Country,País de Envio
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Esconder do Cliente Tax Id de Transações de vendas
@@ -3254,20 +3274,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","A Regra de Fixação de Preços é efetuada para substituir a Lista de Preços / definir a percentagem de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,O Armazém só pode ser alterado através do Registo de Stock / Guia de Remessa / Recibo de Compra
 DocType: Employee Education,Class / Percentage,Classe / Percentagem
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Diretor de Marketing e Vendas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Diretor de Marketing e Vendas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Imposto Sobre o Rendimento
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Acompanhar Potenciais Clientes por Tipo de Setor.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Ir para cabeçalho
+DocType: Subscription,Cancel At End Of Period,Cancelar no final do período
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nenhum item selecionado para transferência
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nenhum item selecionado para transferência
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Definições de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A união só é possível caso as seguintes propriedades sejam iguais em ambos os registos. Estes são o Grupo, Tipo Principal, Empresa"
 DocType: Vehicle,Electric,Elétrico
 DocType: Task,% Progress,% de Progresso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Ganhos/Perdas de Eliminação de Ativos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Ganhos/Perdas de Eliminação de Ativos
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Apenas o Candidato Estudante com o status &quot;Aprovado&quot; será selecionado na tabela abaixo.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,O número da conta da conta {0} não está disponível. <br> Configure seu Gráfico de Contas corretamente.
 DocType: Task,Depends on Tasks,Depende de Tarefas
@@ -3282,6 +3303,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Não há no Stock
 DocType: Volunteer,Volunteer Skills,Habilidades Voluntárias
 DocType: Appraisal,HR User,Utilizador de RH
+DocType: Bank Guarantee,Reference Document Name,Nome do documento de referência
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
 apps/erpnext/erpnext/hooks.py +142,Issues,Problemas
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},O estado deve ser um dos {0}
@@ -3295,7 +3317,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Moeda de Faturação
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra-Grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra-Grande
+DocType: Loan,Loan Application,Pedido de Empréstimo
 DocType: Crop,Scientific Name,Nome científico
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,total de folhas
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Reseleccione, se o contato escolhido for editado após salvar"
@@ -3304,13 +3327,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Cheque
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Existe outro/a {0} # {1} no registo de stock {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Existe outro/a {0} # {1} no registo de stock {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativos)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Página Inicial do Produto Em Destaque
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Todos os Grupos de Avaliação
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Todos os Grupos de Avaliação
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo Nome de Armazém
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Território
@@ -3331,9 +3354,10 @@
 DocType: Fees,Fees,Propinas
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique a Taxa de Câmbio para converter uma moeda noutra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,A cotação {0} foi cancelada
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Montante Total em Dívida
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Montante Total em Dívida
 DocType: Sales Partner,Targets,Metas
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Registre o número SIREN no arquivo de informações da empresa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Price List,Price List Master,Definidor de Lista de Preços
 DocType: GST Account,CESS Account,Conta CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as Transações de Vendas podem ser assinaladas em vários **Vendedores** para que possa definir e monitorizar as metas.
@@ -3342,6 +3366,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selecione Paciente
 DocType: Price List,Applicable for Countries,Aplicável aos Países
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nome do parâmetro
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Apenas Deixar Aplicações com status de &#39;Aprovado&#39; e &#39;Rejeitado&#39; podem ser submetidos
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}
 DocType: Homepage,Products to be shown on website homepage,Os produtos a serem mostrados na página inicial do website
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este é um cliente principal e não pode ser editado.
@@ -3387,14 +3412,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Fatura já criada para todos os horários de cobrança
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nome de erro: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,O custo das finanças
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Já foi registada a presença do funcionário {0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Já foi registada a presença do funcionário {0}
 DocType: Packing Slip,If more than one package of the same type (for print),Se houver mais do que um pacote do mesmo tipo (por impressão)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Defina o cliente padrão em Configurações do restaurante
 ,Salary Register,salário Register
 DocType: Warehouse,Parent Warehouse,Armazém Principal
-DocType: C-Form Invoice Detail,Net Total,Total Líquido
+DocType: Subscription,Net Total,Total Líquido
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Lista de materiais padrão não encontrada para Item {0} e Projeto {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definir vários tipos de empréstimo
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definir vários tipos de empréstimo
 DocType: Bin,FCFS Rate,Preço FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Montante em Dívida
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (em minutos)
@@ -3426,11 +3451,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,A Conta Principal deve ser um grupo
 DocType: Drug Prescription,Drug Prescription,Prescrição de drogas
 DocType: Fees,FEE.,PROPINA.
-DocType: Employee Loan,Repaid/Closed,Reembolsado / Fechado
+DocType: Loan,Repaid/Closed,Reembolsado / Fechado
 DocType: Item,Total Projected Qty,Qtd Projetada Total
 DocType: Monthly Distribution,Distribution Name,Nome de Distribuição
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Taxa de avaliação não encontrada para o Item {0}, que é necessário para fazer as entradas contábeis para {1} {2}. Se o item estiver sendo negociado como item de taxa de avaliação zero no {1}, mencione que na tabela {1} Item. Caso contrário, crie uma transação de estoque recebida para o item ou mencione a taxa de avaliação no registro do item e tente enviar / cancelar esta entrada"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 DocType: Course,Course Code,Código de Curso
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspeção de Qualidade necessária para o item {0}
 DocType: POS Settings,Use POS in Offline Mode,Use POS no modo off-line
@@ -3450,16 +3474,15 @@
 DocType: Purchase Invoice,Deemed Export,Exceção de exportação
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material para Fabrico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,A Percentagem de Desconto pode ser aplicada numa Lista de Preços ou em todas as Listas de Preços.
-DocType: Subscription,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Registo Contabilístico de Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Você já avaliou os critérios de avaliação {}.
 DocType: Vehicle Service,Engine Oil,Óleo de Motor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Ordens de Serviço Criadas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Ordens de Serviço Criadas: {0}
 DocType: Sales Invoice,Sales Team1,Equipa de Vendas1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,O Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço de Cliente
-DocType: Employee Loan,Loan Details,Detalhes empréstimo
+DocType: Loan,Loan Details,Detalhes empréstimo
 DocType: Company,Default Inventory Account,Conta de inventário padrão
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Os números do folio não estão combinando
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A Qtd Concluída deve superior a zero.
@@ -3471,19 +3494,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Um link para todas as Unidades Terrestres em que a Cultivo está crescendo
 DocType: Account,Root Type,Tipo de Fonte
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível devolver mais de {1} para o Item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível devolver mais de {1} para o Item {2}
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de diapositivos no topo da página
 DocType: BOM,Item UOM,UNID de Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do Imposto Após Montante de Desconto (Moeda da Empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},É obrigatório colocar o Destino do Armazém para a linha {0}
 DocType: Cheque Print Template,Primary Settings,Definições Principais
 DocType: Purchase Invoice,Select Supplier Address,Escolha um Endereço de Fornecedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Adicionar Funcionários
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Adicionar Funcionários
 DocType: Purchase Invoice Item,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra-pequeno
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra-pequeno
 DocType: Company,Standard Template,Modelo Padrão
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um Gráfico de Contas separado pertencente à Organização.
 DocType: Payment Request,Mute Email,Email Sem Som
@@ -3503,11 +3526,10 @@
 DocType: SMS Log,No of Sent SMS,N º de SMS Enviados
 DocType: Antibiotic,Healthcare Administrator,Administrador de cuidados de saúde
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Definir um alvo
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure a série de numeração para Presença via Configuração&gt; Série de Numeração"
 DocType: Dosage Strength,Dosage Strength,Força de dosagem
 DocType: Account,Expense Account,Conta de Despesas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Cor
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Critérios plano de avaliação
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,A data de validade é obrigatória para o item selecionado
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Prevenir ordens de compra
@@ -3520,18 +3542,18 @@
 DocType: Patient,Personal and Social History,História pessoal e social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Usuário {0} criado
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup para cada aluno
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione a distribuição mensal para distribuir os objetivos desigualmente através meses.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Código de mudança
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 DocType: Stock Reconciliation,SR/,SR/
 DocType: Vehicle,Diesel,Gasóleo
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
 DocType: Purchase Invoice,Availed ITC Cess,Aproveitou o ITC Cess
 ,Student Monthly Attendance Sheet,Folha de Assiduidade Mensal de Estudante
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regra de envio aplicável apenas para venda
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de Início do Projeto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Até
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Até
 DocType: Rename Tool,Rename Log,Renomear o Registo
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupo de Estudantes ou Programação do Curso é obrigatório
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupo de Estudantes ou Programação do Curso é obrigatório
@@ -3552,7 +3574,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Liste seus produtos ou serviços que você compra ou vende.
 DocType: Water Analysis,Storage Temperature,Temperatura de armazenamento
 DocType: Employee Attendance Tool,Unmarked Attendance,Presença Não Marcada
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ferramenta de Estudante de Inscrição no Programa
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},A data de início deve ser inferior à data de término da tarefa {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,É obrigatório colocar o Nome ou Email
@@ -3565,7 +3587,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} atualmente tem um {1} Guia de Scorecard do Fornecedor, e as PDOs para este fornecedor devem ser emitidas com cautela."
 DocType: Chapter,Non Profit Manager,Gerente sem fins lucrativos
 DocType: BOM,Total Cost(Company Currency),Custo Total (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Nr. de Série {0} criado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Nr. de Série {0} criado
 DocType: Homepage,Company Description for website homepage,A Descrição da Empresa para a página inicial do website
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a maior comodidade dos clientes, estes códigos podem ser utilizados em formatos de impressão, como Faturas e Guias de Remessa"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
@@ -3575,11 +3597,10 @@
 DocType: Employee,You can enter any date manually,Pode inserir qualquer dado manualmente
 DocType: Healthcare Settings,Result Printed,Resultado impresso
 DocType: Asset Category Account,Depreciation Expense Account,Conta de Depreciação de Despesas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Período de Experiência
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ver {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Período de Experiência
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Só são permitidos nós de folha numa transação
 DocType: Project,Total Costing Amount (via Timesheets),Montante total de custeio (via timesheets)
-DocType: Employee Advance,Expense Approver,Aprovador de Despesas
+DocType: Department,Expense Approver,Aprovador de Despesas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Linha {0}: O Avanço do Cliente deve ser creditado
 DocType: Project,Hourly,De hora em hora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,De Fora do Grupo a Grupo
@@ -3589,7 +3610,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para Data e Hora
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Registo para a manutenção do estado de entrega de sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o pagamento através do Lançamento Contabilístico
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Impresso Em
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Impresso Em
 DocType: Item,Inspection Required before Delivery,Inspeção Requerida antes da Entrega
 DocType: Item,Inspection Required before Purchase,Inspeção Requerida antes da Compra
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Atividades Pendentes
@@ -3599,7 +3620,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Quantidade mínima de pedido
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Sua organização
 DocType: Fee Component,Fees Category,Categoria de Propinas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Por favor, insira a data de saída."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Por favor, insira a data de saída."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Mtt
 DocType: Supplier Scorecard,Notify Employee,Notificar Empregado
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Insira o nome da campanha se a fonte da consulta for a campanha
@@ -3609,7 +3630,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Reordenar Nível
 DocType: Company,Chart Of Accounts Template,Modelo de Plano de Contas
 DocType: Attendance,Attendance Date,Data de Presença
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salarial com base nas Remunerações e Reduções.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Uma conta com subgrupos não pode ser convertida num livro
 DocType: Purchase Invoice Item,Accepted Warehouse,Armazém Aceite
@@ -3617,10 +3638,11 @@
 DocType: Item,Valuation Method,Método de Avaliação
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marcar Meio Dia
 DocType: Sales Invoice,Sales Team,Equipa de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicar registo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicar registo
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Digite o nome do beneficiário antes de enviar.
 DocType: Program Enrollment Tool,Get Students,Obter Estudantes
 DocType: Serial No,Under Warranty,Sob Garantia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Erro]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por Extenso será visível quando guardar a Ordem de Venda.
 ,Employee Birthday,Aniversário do Funcionário
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Selecione a Data de Conclusão para o Reparo Completo
@@ -3639,7 +3661,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reservado para subcontratação
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
 DocType: Shopping Cart Settings,Orders,Pedidos
-DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
+DocType: Department,Leave Approver,Aprovador de Licenças
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Selecione um lote
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Nome do Grupo de Avaliação
@@ -3684,7 +3706,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Item rastreado por hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PARA RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Conta de Depreciação Acumulada
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Este e-mail é gerado automaticamente
 DocType: Stock Settings,Freeze Stock Entries,Suspender Registos de Stock
 DocType: Program Enrollment,Boarding Student,Estudante de embarque
 DocType: Asset,Expected Value After Useful Life,Valor Previsto Após Vida Útil
@@ -3709,21 +3730,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Existe um Registo de Assiduidade {0} no Estudante {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referência #{0} datada de {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,A Depreciação foi Eliminada devido à alienação de ativos
-DocType: Member,Member,Membro
+DocType: Loan,Member,Membro
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gerir Endereços
 DocType: Work Order Item,Work Order Item,Item de ordem de trabalho
 DocType: Pricing Rule,Item Code,Código do Item
 DocType: Serial No,Warranty / AMC Details,Garantia / Dados CMA
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
 DocType: Journal Entry,User Remark,Observação de Utiliz.
 DocType: Lead,Market Segment,Segmento de Mercado
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Gerente de Agricultura
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
 DocType: Supplier Scorecard Period,Variables,Variáveis
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabalho Interno do Funcionário
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),A Fechar (Db)
 DocType: Cheque Print Template,Cheque Size,Tamanho do Cheque
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,O Nr. de Série {0} não está em stock
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,O Nr. de Série {0} não está em stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,O modelo de impostos pela venda de transações.
 DocType: Sales Invoice,Write Off Outstanding Amount,Liquidar Montante em Dívida
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},A Conta {0} não coincide com a Empresa {1}
@@ -3732,7 +3753,6 @@
 DocType: Stock Settings,Default Stock UOM,UNID de Stock Padrão
 DocType: Asset,Number of Depreciations Booked,Número de Depreciações Reservadas
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qtd Total
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Contra Employee Empréstimo: {0}
 DocType: Landed Cost Item,Receipt Document,Documento de Receção
 DocType: Employee Education,School/University,Escola/Universidade
 DocType: Payment Request,Reference Details,Dados de Referência
@@ -3743,7 +3763,7 @@
 DocType: Asset,Double Declining Balance,Saldo Decrescente Duplo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Um pedido fechado não pode ser cancelado. Anule o fecho para o cancelar.
 DocType: Student Guardian,Father,Pai
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Stock"" não pode ser ativado para a venda de ativos imobilizado"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Stock"" não pode ser ativado para a venda de ativos imobilizado"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliação Bancária
 DocType: Attendance,On Leave,em licença
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter Atualizações
@@ -3757,10 +3777,10 @@
 DocType: Lead,Lower Income,Rendimento Mais Baixo
 DocType: Restaurant Order Entry,Current Order,Ordem atual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Fonte e armazém de destino não pode ser o mesmo para a linha {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","A Conta de Diferenças deve ser uma conta do tipo Ativo/Passivo, pois esta Conciliação de Stock é um Registo de Abertura"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","A Conta de Diferenças deve ser uma conta do tipo Ativo/Passivo, pois esta Conciliação de Stock é um Registo de Abertura"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Ir para Programas
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},A linha {0} # O valor alocado {1} não pode ser maior do que a quantidade não reclamada {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},A linha {0} # O valor alocado {1} não pode ser maior do que a quantidade não reclamada {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nº da Ordem de Compra necessário para o Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data De"" deve ser depois da ""Data Para"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
@@ -3783,7 +3803,6 @@
 DocType: Payment Terms Template,Payment Terms,Termos de pagamento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Não podem ser criados Pedidos de Produção para:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minuto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Taxas de Compra
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Ir para Fornecedores
@@ -3803,30 +3822,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},A Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item do Cronograma de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Defina a ID de e-mail para que o Aluno envie a Solicitação de Pagamento
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Defina a ID de e-mail para que o Aluno envie a Solicitação de Pagamento
 DocType: Patient,Medical History,Histórico médico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Descoberto na Conta Bancária
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Descoberto na Conta Bancária
 DocType: Patient,Patient ID,Identificação do paciente
 DocType: Physician Schedule,Schedule Name,Nome da programação
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Criar Folha de Vencimento
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Adicionar todos os fornecedores
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Adicionar todos os fornecedores
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allocated Amount não pode ser maior do que o montante pendente.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Pesquisar na LDM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Empréstimos Garantidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Empréstimos Garantidos
 DocType: Purchase Invoice,Edit Posting Date and Time,Editar postagem Data e Hora
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as Contas relacionadas com a Depreciação na Categoria de ativos {0} ou na Empresa {1}"
 DocType: Lab Test Groups,Normal Range,Intervalo normal
 DocType: Academic Term,Academic Year,Ano Letivo
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Venda disponível
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Equidade de Saldo Inicial
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Equidade de Saldo Inicial
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Restante
 DocType: Appraisal,Appraisal,Avaliação
+DocType: Loan,Loan Account,Conta de Empréstimo
 DocType: Purchase Invoice,GST Details,GST Detalhes
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email enviado ao fornecedor {0}
 DocType: Item,Default Sales Unit of Measure,Unidade de medida de vendas padrão
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Ano acadêmico:
+DocType: Subscription,Past Due Date,Data de vencimento passado
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Não permite definir item alternativo para o item {0}
 DocType: Opportunity,OPTY-,OPTD-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,A data está repetida
@@ -3839,7 +3860,7 @@
 DocType: Patient Appointment,Patient Appointment,Nomeação do paciente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,A Função Aprovada não pode ser igual à da regra Aplicável A
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Cancelar a Inscrição neste Resumo de Email
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Obter provedores por
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Obter provedores por
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} não encontrado para Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Ir para Cursos
 DocType: Accounts Settings,Show Inclusive Tax In Print,Mostrar imposto inclusivo na impressão
@@ -3847,10 +3868,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem Enviada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Uma conta com subgrupos não pode ser definida como um livro
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa à qual a moeda da lista de preços é convertida para a moeda principal do cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Moeda da Empresa)
 DocType: Physician,Physician Schedules,Agendamentos Médicos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante sancionado total
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante sancionado total
 DocType: Salary Slip,Hour Rate,Preço por Hora
 DocType: Stock Settings,Item Naming By,Dar Nome de Item Por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Foi efetuado outro Registo de Encerramento de Período {0} após {1}
@@ -3868,6 +3890,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais antigas que {0}
 DocType: BOM,Inspection Required,Inspeção Obrigatória
 DocType: Purchase Invoice Item,PR Detail,Dados de RC
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Digite o número da garantia bancária antes de enviar.
 DocType: Driving License Category,Class,Classe
 DocType: Sales Order,Fully Billed,Totalmente Faturado
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,A ordem de serviço não pode ser levantada em relação a um modelo de item
@@ -3878,7 +3901,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Assessment Plan,Program,Programa
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os utilizadores com esta função poderão definir contas congeladas e criar / modificar os registos contabilísticos em contas congeladas
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 DocType: Serial No,Is Cancelled,Foi Cancelado/a
 DocType: Student Group,Group Based On,Grupo baseado em
 DocType: Student Group,Group Based On,Grupo baseado em
@@ -3890,9 +3912,10 @@
 DocType: Cheque Print Template,Cheque Height,Altura do Cheque
 DocType: Supplier,Supplier Details,Dados de Fornecedor
 DocType: Setup Progress,Setup Progress,Progresso da Instalação
+DocType: Expense Claim,Approval Status,Estado de Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar Itens na Plataforma
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},O valor de deve ser inferior ao valor da linha {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transferência Bancária
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transferência Bancária
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Verificar tudo
 ,Issued Items Against Work Order,Itens Emitidos Contra Ordem de Serviço
 DocType: Vehicle Log,Invoice Ref,Ref. de Fatura
@@ -3923,12 +3946,11 @@
 DocType: Customs Tariff Number,Tariff Number,Número de tarifas
 DocType: Work Order Item,Available Qty at WIP Warehouse,Qtd disponível no WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projetado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},O Nr. de Série {0} não pertence ao Armazém {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},O Nr. de Série {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e de reservas do Item {0} pois a quantidade ou montante é 0
 DocType: Notification Control,Quotation Message,Mensagem de Cotação
-DocType: Employee Loan,Employee Loan Application,Pedido de empréstimo a funcionário
 DocType: Issue,Opening Date,Data de Abertura
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Salve primeiro o paciente
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Salve primeiro o paciente
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,A presença foi registada com sucesso.
 DocType: Program Enrollment,Public Transport,Transporte público
 DocType: Soil Texture,Silt Composition (%),Composição do Silt (%)
@@ -3947,7 +3969,7 @@
 ,Item Balance (Simple),Balanço de itens (Simples)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Contas criadas por Fornecedores.
 DocType: POS Profile,Write Off Account,Liquidar Conta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota de débito Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota de débito Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolver Na Fatura de Compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
@@ -3970,6 +3992,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Data da Ordem de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtd Entregue
 DocType: Assessment Plan,Assessment Plan,Plano de avaliação
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Entrada de Diário Reversa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,O cliente {0} é criado.
 DocType: Stock Settings,Limit Percent,limite Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Atualmente não há estoque disponível em qualquer armazém
@@ -3983,14 +4006,15 @@
 DocType: Journal Entry,Stock Entry,Registo de Stock
 DocType: Payment Entry,Payment References,Referências de Pagamento
 DocType: C-Form,C-FORM-,FORM-C-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Número de intervalos para o campo de intervalo, por exemplo, se o intervalo for &#39;Dias&#39; e a Contagem de intervalos de faturamento for 3, as faturas serão geradas a cada 3 dias"
 DocType: Vehicle,Insurance Details,Dados de Seguro
 DocType: Account,Payable,A Pagar
 DocType: Share Balance,Share Type,Tipo de compartilhamento
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, indique períodos de reembolso"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Por favor, indique períodos de reembolso"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Devedores ({0})
 DocType: Pricing Rule,Margin,Margem
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% de Lucro Bruto
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,% de Lucro Bruto
 DocType: Appraisal Goal,Weightage (%),Peso (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Alterar o perfil do POS
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
@@ -4000,10 +4024,11 @@
 DocType: Lead,Address Desc,Descrição de Endereço
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,É obrigatório colocar a parte
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},As linhas com datas de vencimento duplicadas em outras linhas foram encontradas: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},As linhas com datas de vencimento duplicadas em outras linhas foram encontradas: {list}
 DocType: Topic,Topic Name,Nome do Tópico
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Por favor, defina o modelo padrão para deixar a notificação de aprovação nas configurações de RH."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Deverá ser selecionado pelo menos um dos Vendedores ou Compradores
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Selecione um funcionário para obter o adiantamento do funcionário.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Selecione um funcionário para obter o adiantamento do funcionário.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Por favor selecione uma data válida
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Seleccione a natureza do seu negócio.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4022,7 +4047,7 @@
 DocType: Asset Movement,Source Warehouse,Armazém Fonte
 DocType: Installation Note,Installation Date,Data de Instalação
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Linha #{0}: O Ativo {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Linha #{0}: O Ativo {1} não pertence à empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Fatura de vendas {0} criada
 DocType: Employee,Confirmation Date,Data de Confirmação
 DocType: C-Form,Total Invoiced Amount,Valor total faturado
@@ -4031,7 +4056,7 @@
 DocType: Account,Accumulated Depreciation,Depreciação Acumulada
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Nome permanente
 DocType: Stock Entry,Customer or Supplier Details,Dados de Cliente ou Fornecedor
-DocType: Employee Loan Application,Required by Date,Exigido por Data
+DocType: Loan Application,Required by Date,Exigido por Data
 DocType: Lead,Lead Owner,Dono de Potencial Cliente
 DocType: Production Plan,Sales Orders Detail,Detalhamento das encomendas de vendas
 DocType: Bin,Requested Quantity,Quantidade Solicitada
@@ -4044,10 +4069,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagamento Bruto - Dedução Total - reembolso do empréstimo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDN não podem ser iguais
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID de Folha de Vencimento
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,A Data De Saída deve ser posterior à Data de Admissão
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,A Data De Saída deve ser posterior à Data de Admissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variantes múltiplas
 DocType: Sales Invoice,Against Income Account,Na Conta de Rendimentos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregue
+DocType: Subscription,Trial Period Start Date,Data de Início do Período de Avaliação
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentagem de Distribuição Mensal
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Faça o login como outro usuário.
@@ -4068,12 +4094,11 @@
 DocType: Student Guardian,Student Guardian,Responsável do Estudante
 DocType: Member,Member Name,Nome do membro
 DocType: Stock Settings,Use Naming Series,Usar a série de nomes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
 DocType: POS Profile,Update Stock,Actualizar Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,na subscrição
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Uma UNID diferente para os itens levará a um Valor de Peso Líquido (Total) incorreto. Certifique-se de que o Peso Líquido de cada item está na mesma UNID.
 DocType: Membership,Payment Details,Detalhes do pagamento
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Preço na LDM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Preço na LDM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","A ordem de trabalho interrompida não pode ser cancelada, descompacte-a primeiro para cancelar"
 DocType: Asset,Journal Entry for Scrap,Lançamento Contabilístico para Sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, remova os itens da Guia de Remessa"
@@ -4093,6 +4118,7 @@
 DocType: Land Unit,Land Unit,Unidade de terra
 ,Purchase Analytics,Análise de Compra
 DocType: Sales Invoice Item,Delivery Note Item,Item da Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,A fatura atual {0} está faltando
 DocType: Asset Maintenance Log,Task,Tarefa
 DocType: Purchase Taxes and Charges,Reference Row #,Linha de Referência #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},É obrigatório colocar o número do lote para o Item {0}
@@ -4105,7 +4131,7 @@
 DocType: Company,Exchange Gain / Loss Account,Conta de Ganhos / Perdas de Câmbios
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Funcionário e Assiduidade
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},O objetivo deve pertencer a {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Preencha o formulário e guarde-o
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Preencha o formulário e guarde-o
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fórum Comunitário
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Quantidade real em stock
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Quantidade real em stock
@@ -4120,7 +4146,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Taxa de Vendas Padrão
 DocType: Account,Rate at which this tax is applied,Taxa à qual este imposto é aplicado
 DocType: Cash Flow Mapper,Section Name,Nome da Seção
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Qtd de Reencomenda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Qtd de Reencomenda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas de Emprego Atuais
 DocType: Company,Stock Adjustment Account,Conta de Acerto de Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Liquidar
@@ -4131,9 +4157,9 @@
 DocType: Task,depends_on,depende_de
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Em fila para atualizar o preço mais recente em todas as Marcas de materiais. Pode demorar alguns minutos.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova Conta. Nota: Por favor, não crie contas para Clientes e Fornecedores"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereço por País
 DocType: Water Analysis,Appearance,Aparência
+DocType: HR Settings,Leave Status Notification Template,Deixe o modelo de notificação de status
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Taxa de lista de preços de compra
 DocType: Sales Order Item,Supplier delivers to Customer,Entregas de Fornecedor ao Cliente
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informações dos membros.
@@ -4156,7 +4182,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Não é permitido. Desative o modelo de teste
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,A Percentagem de Atribuição deve ser igual a 100%
 DocType: Crop Cycle,Linked Land Unit,Unidade de terra vinculada
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
@@ -4172,7 +4198,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Ir aos usuários
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,O Montante Pago + Montante Liquidado não pode ser superior ao Total Geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um Número de Lote válido para o Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Nota: Não possui saldo de licença suficiente para o Tipo de Licença {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Nota: Não possui saldo de licença suficiente para o Tipo de Licença {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN inválido ou Digite NA para não registrado
 DocType: Training Event,Seminar,Seminário
 DocType: Program Enrollment Fee,Program Enrollment Fee,Propina de Inscrição no Programa
@@ -4188,14 +4214,14 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 DocType: Company,Create Chart Of Accounts Based On,Criar Plano de Contas Baseado Em
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Não é possível convertê-lo em não-grupo. Tarefas infantis existem.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,A Data de Nascimento não pode ser após hoje.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,A Data de Nascimento não pode ser após hoje.
 ,Stock Ageing,Envelhecimento de Stock
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},O aluno {0} existe contra candidato a estudante {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajuste de arredondamento (Moeda da empresa)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registo de Horas
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Aberto
 DocType: Cheque Print Template,Scanned Cheque,Cheque Digitalizado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contactos nas transações A Enviar.
@@ -4211,7 +4237,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,O projeto {0} já existe
 DocType: Medical Department,Nursing User,Usuário de enfermagem
 DocType: Plant Analysis,Plant Analysis Criterias,Critérios de análise de planta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},O número de série {0} não pertence ao Lote {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,O período de validade desta citação terminou.
 DocType: Expense Claim Account,Expense Claim Account,Conta de Reembolso de Despesas
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir taxas de câmbio fechadas
@@ -4233,11 +4260,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Fazer variantes
 DocType: Item,Default BOM,LDM Padrão
 DocType: Project,Total Billed Amount (via Sales Invoices),Valor total faturado (através de faturas de vendas)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Valor da nota de débito
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Valor da nota de débito
 DocType: Project Update,Not Updated,Não atualizado
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Existem inconsistências entre a taxa, o número de ações e o valor calculado"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Por favor, reescreva o nome da empresa para confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Qtd Total Em Falta
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Qtd Total Em Falta
 DocType: Journal Entry,Printing Settings,Definições de Impressão
 DocType: Employee Advance,Advance Account,Conta antecipada
 DocType: Job Offer,Job Offer Terms,Termos da Oferta de Emprego
@@ -4246,7 +4273,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automóvel
 DocType: Vehicle,Insurance Company,Companhia de Seguros
 DocType: Asset Category Account,Fixed Asset Account,Conta de Ativos Imobilizados
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variável
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variável
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Guia de Remessa
 DocType: Chapter,Members,Membros
 DocType: Student,Student Email Address,Endereço de Email do Estudante
@@ -4270,7 +4297,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Estagiário
 DocType: Delivery Stop,Address Name,Nome endereço
 DocType: Stock Entry,From BOM,Da LDM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Divisão {0} unidades de {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Divisão {0} unidades de {1}
 DocType: Assessment Code,Assessment Code,Código de Avaliação
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Estão congeladas as transações com stock antes de {0}
@@ -4278,25 +4305,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,É obrigatório colocar o Nr. de Referência se tiver inserido a Data de Referência
 DocType: Bank Reconciliation Detail,Payment Document,Documento de Pagamento
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Erro ao avaliar a fórmula de critérios
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,A Data de Admissão deve ser mais recente do que a Data de Nascimento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,A Data de Admissão deve ser mais recente do que a Data de Nascimento
+DocType: Subscription,Plans,Planos
 DocType: Salary Slip,Salary Structure,Estrutura Salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Enviar Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ocorreu um erro ao criar uma repetição
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Enviar Material
 DocType: Material Request Item,For Warehouse,Para o Armazém
 DocType: Employee,Offer Date,Data de Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Não foi criado nenhum Grupo de Estudantes.
 DocType: Purchase Invoice Item,Serial No,Nr. de Série
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Por favor, insira os Dados de Manutenção primeiro"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Linha # {0}: a data de entrega prevista não pode ser anterior à data da ordem de compra
 DocType: Purchase Invoice,Print Language,Idioma de Impressão
 DocType: Salary Slip,Total Working Hours,Total de Horas de Trabalho
 DocType: Sales Invoice,Customer PO Details,Detalhes do cliente PO
-DocType: Subscription,Next Schedule Date,Próximo horário Data
 DocType: Stock Entry,Including items for sub assemblies,A incluir itens para subconjuntos
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Conta de abertura temporária
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,O valor introduzido deve ser positivo
@@ -4325,11 +4351,11 @@
 DocType: Issue,Opening Time,Tempo de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,São necessárias as datas De e A
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
 DocType: Delivery Note Item,From Warehouse,Armazém De
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nenhum empregado pelos critérios mencionados
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
 DocType: Hotel Settings,Default Customer,Cliente padrão
 DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Não confirme se o compromisso foi criado no mesmo dia
@@ -4354,16 +4380,16 @@
 DocType: Journal Entry Account,Employee Advance,Empregado Avançado
 DocType: Payroll Entry,Payroll Frequency,Frequência de Pagamento
 DocType: Lab Test Template,Sensitivity,Sensibilidade
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Matéria-prima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Seguir através do Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Plantas e Máquinas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Plantas e Máquinas
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois do Montante do Desconto
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Definições de Resumo de Trabalho Diário
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Digite Reqd by Date
 DocType: Payment Entry,Internal Transfer,Transferência Interna
 DocType: Asset Maintenance,Maintenance Tasks,Tarefas de manutenção
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,É obrigatório colocar a qtd prevista ou o montante previsto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,A Data de Abertura deve ser antes da Data de Término
 DocType: Leave Control Panel,Carry Forward,Continuar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"O Centro de Custo, com as operações existentes, não pode ser convertido em livro"
@@ -4371,14 +4397,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integrações ERPNext
 DocType: Crop Cycle,Detected Disease,Doença detectada
 ,Produced,Produzido
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,A data de início do reembolso não pode ser anterior à data do desembolso.
 DocType: Item,Item Code for Suppliers,Código do Item para Fornecedores
 DocType: Issue,Raised By (Email),Levantado Por (Email)
 DocType: Training Event,Trainer Name,Nome do Formador
 DocType: Mode of Payment,General,Geral
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicação
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicação
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Não pode deduzir quando a categoria é da ""Estimativa"" ou ""Estimativa e Total"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},É Necessário colocar o Nr. de Série para o Item em Série {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Não pode deduzir quando a categoria é da ""Estimativa"" ou ""Estimativa e Total"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},É Necessário colocar o Nr. de Série para o Item em Série {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Combinar Pagamentos com Faturas
 DocType: Journal Entry,Bank Entry,Registo Bancário
 DocType: Authorization Rule,Applicable To (Designation),Aplicável A (Designação)
@@ -4392,7 +4419,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} no meio dia. Deixe em {1}
 DocType: Production Plan,Get Material Request,Obter Solicitação de Material
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Despesas Postais
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Despesas Postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Qtd)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entretenimento e Lazer
 ,Item Variant Details,Item Variant Details
@@ -4403,9 +4430,9 @@
 DocType: Drug Prescription,Hour,Hora
 DocType: Restaurant Order Entry,Last Sales Invoice,Última fatura de vendas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Selecione Qtd. Contra o item {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
 DocType: Lead,Lead Type,Tipo Potencial Cliente
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Não está autorizado a aprovar licenças em Datas Bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Não está autorizado a aprovar licenças em Datas Bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Todos estes itens já foram faturados
 DocType: Company,Monthly Sales Target,Alvo de Vendas Mensais
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
@@ -4413,7 +4440,7 @@
 DocType: Item,Default Material Request Type,Tipo de Solicitação de Material Padrão
 DocType: Supplier Scorecard,Evaluation Period,Periodo de avaliação
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Desconhecido
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Ordem de serviço não criada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Ordem de serviço não criada
 DocType: Shipping Rule,Shipping Rule Conditions,Condições de Regras de Envio
 DocType: Purchase Invoice,Export Type,Tipo de exportação
 DocType: Salary Slip Loan,Salary Slip Loan,Empréstimo Salarial
@@ -4429,8 +4456,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Resumo das faturas de abertura
 DocType: Education Settings,Education Manager,Gerente de Educação
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,O comprimento mínimo entre cada planta no campo para o melhor crescimento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
 DocType: Quality Inspection,Report Date,Data de Relatório
 DocType: Student,Middle Name,Nome do Meio
 DocType: C-Form,Invoices,Faturas
@@ -4462,20 +4489,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
 DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Recibo
 ,Sales Register,Registo de Vendas
 DocType: Daily Work Summary Group,Send Emails At,Enviar Emails Em
 DocType: Quotation,Quotation Lost Reason,Motivo de Perda de Cotação
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transação de referência nr. {0} datada de {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada para editar.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vista de formulário
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Aprovador de despesas obrigatório na declaração de despesas
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Adicione usuários à sua organização, além de você."
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nenhum cliente ainda!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstração dos Fluxos de Caixa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Não foi criada nenhuma solicitação de material
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licença
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Continuar se também deseja incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
@@ -4498,11 +4526,12 @@
 DocType: Vehicle,Chassis No,Nr. de Chassis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Plan Item,Planned Start Date,Data de Início Planeada
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Selecione uma lista de materiais
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Selecione uma lista de materiais
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Imposto Integrado do ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
+DocType: Bank Guarantee,Clauses and Conditions,Cláusulas e Condições
 DocType: Serial No,Creation Document Type,Tipo de Criação de Documento
 DocType: Project Task,View Timesheet,Horário de exibição
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,A data de término deve ser superior à data de início
 DocType: Leave Type,Is Encash,Está Liquidado
 DocType: Leave Allocation,New Leaves Allocated,Novas Licenças Atribuídas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Não estão disponíveis dados por projecto para a Cotação
@@ -4516,9 +4545,10 @@
 DocType: Patient,Alcohol Current Use,Uso atual de álcool
 DocType: Student Admission Program,Student Admission Program,Programa de admissão de estudantes
 DocType: Payment Entry,Account Paid To,Conta Paga A
+DocType: Subscription Settings,Grace Period,Período de carência
 DocType: Item Alternative,Alternative Item Name,Nome alternativo do item
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,O Item Principal {0} não deve ser um Item do Stock
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Não foi possível enviar nenhum Slider Salarial <br> \ Razões possíveis: <br> \ 1. O pagamento líquido é inferior a 0. <br> \ 2. O endereço de e-mail da empresa especificado no mestre do empregado não é válido. <br>
@@ -4528,7 +4558,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},O Orçamento {0} para a conta {1} em {2} {3} é de {4}. Ele irá exceder em {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',"Linha {0}# A conta deve ser do tipo ""Ativo Fixo"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Qtd de Saída
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,e desativado desativado no
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,É obrigatório colocar a Série
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Serviços Financeiros
 DocType: Student Sibling,Student ID,Identidade estudantil
@@ -4540,14 +4569,16 @@
 DocType: Complaint,Complaint,Queixa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
 DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Fazer entrada de reembolso
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Todos os departamentos
 DocType: Patient,Alcohol Past Use,Uso passado do álcool
 DocType: Fertilizer Content,Fertilizer Content,Conteúdo de fertilizante
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problemática / Preso
 DocType: Tax Rule,Billing State,Estado de Faturação
 DocType: Share Transfer,Transfer,Transferir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,A ordem de serviço {0} deve ser cancelada antes de cancelar este pedido de venda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Ao/À (Funcionário/a)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,O Aumento do Atributo {0} não pode ser 0
@@ -4571,10 +4602,11 @@
 DocType: Cheque Print Template,Message to show,Mensagem a mostrar
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Retalho
 DocType: Student Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Pacote de Produtos
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Não foi possível encontrar uma pontuação a partir de {0}. Você precisa ter pontuações em pé cobrindo de 0 a 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Linha {0}: Referência inválida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelo de Impostos e Taxas de Compra
+DocType: Subscription,Current Invoice Start Date,Data de início da fatura atual
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: É necessário colocar o débito ou valor do crédito para {2}
 DocType: GL Entry,Remarks,Observações
@@ -4584,11 +4616,13 @@
 DocType: Task,Parent Task,Tarefa dos pais
 DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Crie um Potencial Cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impressão e artigos de papelaria
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Impressão e artigos de papelaria
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo do Código de Barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Enviar Emails de Fornecedores
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","O salário já foi processado para período entre {0} e {1}, o período de aplicação da Licença não pode estar entre este intervalo de datas."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Enviar Emails de Fornecedores
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","O salário já foi processado para período entre {0} e {1}, o período de aplicação da Licença não pode estar entre este intervalo de datas."
+DocType: Fiscal Year,Auto Created,Auto criado
 DocType: Chapter Member,Leave Reason,Deixe razão
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,A fatura {0} não existe mais
 DocType: Guardian Interest,Guardian Interest,Interesse do Responsável
 DocType: Volunteer,Availability,Disponibilidade
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configurar valores padrão para faturas de PDV
@@ -4597,14 +4631,13 @@
 DocType: Timesheet,Employee Detail,Dados do Funcionário
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de e-mail
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de e-mail
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,A Próxima Data e Repetir no Dia do Mês Seguinte devem ser iguais
 DocType: Lab Prescription,Test Code,Código de Teste
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Definições para página inicial do website
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs não são permitidos para {0} devido a um ponto de avaliação de {1}
 DocType: Job Offer,Awaiting Response,A aguardar Resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Acima
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Quantidade total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Atributo inválido {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Quantidade total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Atributo inválido {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Mencionar se a conta a pagar não padrão
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Selecione o grupo de avaliação diferente de &quot;Todos os grupos de avaliação&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Linha {0}: o centro de custo é necessário para um item {1}
@@ -4615,7 +4648,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Análise de água
 DocType: Chapter,Region,Região
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcional. Esta definição será utilizada para filtrar várias transações.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Não são permitidas Percentagens de Avaliação Negativas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Não são permitidas Percentagens de Avaliação Negativas
 DocType: Holiday List,Weekly Off,Semanas de Folga
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Análise Recarregada
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por ex: 2012, 2012-13"
@@ -4631,7 +4664,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Custo do Ativo Descartado
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: O Centro de Custo é obrigatório para o Item {2}
 DocType: Vehicle,Policy No,Nr. de Política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
 DocType: Asset,Straight Line,Linha Reta
 DocType: Project User,Project User,Utilizador do Projecto
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Dividido
@@ -4671,21 +4704,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Caminho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter o Centro de Custo a livro, uma vez que tem subgrupos"
 DocType: Production Plan,Total Planned Qty,Qtd total planejado
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valor Inicial
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valor Inicial
 DocType: Salary Detail,Formula,Fórmula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Série #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Série #
 DocType: Lab Test Template,Lab Test Template,Modelo de teste de laboratório
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Conta de vendas
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Conta de vendas
 DocType: Purchase Invoice Item,Total Weight,Peso total
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comissão sobre Vendas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Comissão sobre Vendas
 DocType: Job Offer Term,Value / Description,Valor / Descrição
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
 DocType: Tax Rule,Billing Country,País de Faturação
 DocType: Purchase Order Item,Expected Delivery Date,Data de Entrega Prevista
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de pedido de restaurante
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e o Crédito não são iguais para {0} #{1}. A diferença é de {2}.
 DocType: Asset Maintenance Task,Assign To Name,Atribuir para nomear
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despesas de Entretenimento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Despesas de Entretenimento
 DocType: Hub Settings,Enabled Users,Usuários habilitados
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Fazer Pedido de Material
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Abrir item {0}
@@ -4698,24 +4731,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Pedido de licença.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Não pode eliminar a conta com a transação existente
 DocType: Vehicle,Last Carbon Check,Último Duplicado de Cheque
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Despesas Legais
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Despesas Legais
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Selecione a quantidade na linha
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Faça vendas de abertura e faturas de compra
 DocType: Purchase Invoice,Posting Time,Hora de Postagem
 DocType: Timesheet,% Amount Billed,% Valor Faturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despesas Telefónicas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Despesas Telefónicas
 DocType: Sales Partner,Logo,Logótipo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Selecione esta opção se deseja forçar o utilizador a selecionar uma série antes de guardar. Não haverá nenhum padrão caso selecione esta opção.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nr. de Item com o Nr. de Série {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nr. de Item com o Nr. de Série {0}
 DocType: Email Digest,Open Notifications,Notificações Abertas
 DocType: Payment Entry,Difference Amount (Company Currency),Montante da Diferença (Moeda da Empresa)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Despesas Diretas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Despesas Diretas
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novo Rendimento de Cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despesas de Viagem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Despesas de Viagem
 DocType: Maintenance Visit,Breakdown,Decomposição
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Adicionar campo personalizado Subscrição no doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
 DocType: Purchase Receipt Item,Sample Quantity,Quantidade da amostra
+DocType: Bank Guarantee,Name of Beneficiary,Nome do beneficiário
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atualize o custo da lista técnica automaticamente através do Agendador, com base na taxa de avaliação / taxa de preços mais recente / última taxa de compra de matérias-primas."
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},A Conta {0}: da Conta Principal {1} não pertence à empresa: {2}
@@ -4727,14 +4760,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,À Experiência
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componentes Salariais
 DocType: Program Enrollment Tool,New Academic Year,Novo Ano Letivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retorno / Nota de Crédito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retorno / Nota de Crédito
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Montante Total Pago
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Montante Total Pago
 DocType: GST Settings,B2C Limit,Limite B2C
 DocType: Work Order Item,Transferred Qty,Qtd Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planeamento
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planeamento
 DocType: Share Balance,Issued,Emitido
+DocType: Loan,Repayment Start Date,Data de início do reembolso
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Atividade estudantil
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id de Fornecedor
 DocType: Payment Request,Payment Gateway Details,Dados do Portal de Pagamento
@@ -4747,10 +4781,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, por doença, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios de resumo periódicos através do Email.
 DocType: Payment Entry,PE-,RP-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Por favor, defina a conta padrão no Tipo de Despesas de Reembolso {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Por favor, defina a conta padrão no Tipo de Despesas de Reembolso {0}"
 DocType: Assessment Result,Student Name,Nome do Aluno
 DocType: Brand,Item Manager,Gestor do Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,folha de pagamento Pagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,folha de pagamento Pagar
 DocType: Buying Settings,Default Supplier Type,Tipo de Fornecedor Padrão
 DocType: Plant Analysis,Collection Datetime,Data de coleta
 DocType: Work Order,Total Operating Cost,Custo Operacional Total
@@ -4760,9 +4794,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilizador {0} não existe
 DocType: Payment Term,Day(s) after invoice date,Dia (s) após a data da factura
 DocType: Payment Schedule,Payment Schedule,Agenda de pagamentos
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,O Registo de Pagamento já existe
+DocType: Subscription,Trial Period End Date,Data de término do período de avaliação
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não está autorizado pois {0} excede os limites
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Definidor de modelo de salário.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologia
@@ -4779,9 +4813,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Potenciais Clientes ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Função Com Permissão para editar o stock congelado
 ,Territory Target Variance Item Group-Wise,Variação de Item de Alvo Territorial por Grupo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Todos os Grupos de Clientes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Todos os Grupos de Clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Acumulada Mensalmente
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,É obrigatório inserir o Modelo de Impostos.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,A Conta {0}: Conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taxa de Lista de Preços (Moeda da Empresa)
@@ -4790,14 +4824,15 @@
 DocType: Lab Prescription,Test Created,Test criado
 DocType: Healthcare Settings,Custom Signature in Print,Assinatura personalizada na impressão
 DocType: Account,Temporary,Temporário
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Cliente número LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Cliente número LPO
 DocType: Program,Courses,Cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentagem de Atribuição
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretário
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secretário
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se desativar o campo ""Por Extenso"" ele não será visível em nenhuma transação"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Essa ação interromperá o faturamento futuro. Tem certeza de que deseja cancelar esta assinatura?
 DocType: Serial No,Distinct unit of an Item,Unidade distinta dum Item
 DocType: Supplier Scorecard Criteria,Criteria Name,Nome dos critérios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Defina Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Defina Company
 DocType: Pricing Rule,Buying,Comprar
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Doenças e fertilizantes
 DocType: HR Settings,Employee Records to be created by,Os Registos de Funcionário devem ser criados por
@@ -4806,18 +4841,18 @@
 DocType: POS Profile,Apply Discount On,Aplicar Desconto Em
 DocType: Member,Membership Type,Tipo de Membro
 ,Reqd By Date,Req. Por Data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Credores
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Credores
 DocType: Assessment Plan,Assessment Name,Nome da Avaliação
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Mostrar PDC em impressão
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Mostrar PDC em impressão
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Linha # {0}: É obrigatório colocar o Nr. de Série
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Dados de Taxa por Item
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Oferta de emprego
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Abreviação do Instituto
 ,Item-wise Price List Rate,Taxa de Lista de Preço por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Cotação do Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível assim que guardar o Orçamento.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
@@ -4835,7 +4870,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variância Total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se for ativado, o sistema irá postar registos contabilísticos automáticos para o inventário."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Corretor/a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,A Assiduidade do funcionário {0} já foi marcada para este dia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,A Assiduidade do funcionário {0} já foi marcada para este dia
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos
 Atualizado através do ""Registo de Tempo"""
@@ -4847,6 +4882,7 @@
 DocType: Lab Test,Approved Date,Data aprovada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda Padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,É obrigatório colocar pelo menos um armazém
+DocType: Subscriber,Subscriber Name,Nome do Assinante
 DocType: Serial No,Out of Warranty,Fora da Garantia
 DocType: BOM Update Tool,Replace,Substituir
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Não foram encontrados produtos.
@@ -4856,19 +4892,18 @@
 DocType: Request for Quotation Item,Project Name,Nome do Projeto
 DocType: Customer,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
 DocType: Journal Entry Account,If Income or Expense,Se forem Rendimentos ou Despesas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Selecione a conta de receita de juros no empréstimo do empregado {0}
 DocType: Work Order,Required Items,Itens Obrigatórios
 DocType: Stock Ledger Entry,Stock Value Difference,Diferença de Valor de Stock
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento de Conciliação de Pagamento
 DocType: Disease,Treatment Task,Tarefa de Tratamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Ativo Fiscal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,Nr. da LDM
 DocType: Instructor,INS/,INS/
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,O Lançamento Contabilístico {0} não tem conta {1} ou já foi vinculado a outro voucher
 DocType: Item,Moving Average,Média Móvel
 DocType: BOM Update Tool,The BOM which will be replaced,A LDM que será substituída
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equipamentos Eletrónicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Equipamentos Eletrónicos
 DocType: Asset,Maintenance Required,Manutenção requerida
 DocType: Account,Debit,Débito
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"As licenças devem ser atribuídas em múltiplos de 0,5"
@@ -4877,7 +4912,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Mtt em Dívida
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estabelecer Item Alvo por Grupo para este Vendedor/a.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Suspender Stocks Mais Antigos Que [Dias]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Linha #{0}: É obrigatória colocar o Ativo para a compra/venda do ativo fixo
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Linha #{0}: É obrigatória colocar o Ativo para a compra/venda do ativo fixo
 DocType: Asset Maintenance Team,Maintenance Team Name,Nome da Equipe de Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se forem encontradas duas ou mais Regras de Fixação de Preços baseadas nas condições acima, é aplicada a Prioridade. A Prioridade é um número entre 0 a 20, enquanto que o valor padrão é zero (em branco). Um número maior significa que terá prioridade se houver várias Regras de Fixação de Preços com as mesmas condições."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,O Cliente é obrigatório se &quot;Oportunidade de&quot; for selecionada como Cliente
@@ -4887,19 +4922,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipos de Reembolso de Despesas.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},A taxa de venda do item {0} é menor que a {1}. A taxa de venda deve ser pelo menos {2}
-DocType: Item,Taxes,Impostos
+DocType: Subscription,Taxes,Impostos
 DocType: Purchase Invoice,capital goods,bens de capital
 DocType: Purchase Invoice Item,Weight Per Unit,Peso por unidade
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Pago e Não Entregue
 DocType: Project,Default Cost Center,Centro de Custo Padrão
-DocType: Bank Guarantee,End Date,Data de Término
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Stock
 DocType: Budget,Budget Accounts,Contas do Orçamento
 DocType: Employee,Internal Work History,Historial de Trabalho Interno
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Montante de Depreciação Acumulada
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Equidade Privada
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variável do Scorecard do Fornecedor
-DocType: Employee Loan,Fully Disbursed,totalmente Desembolso
 DocType: Employee Advance,Due Advance Amount,Quantidade adiantada devida
 DocType: Maintenance Visit,Customer Feedback,Feedback dos Clientes
 DocType: Account,Expense,Despesa
@@ -4923,7 +4956,7 @@
 ,Employee Information,Informações do Funcionário
 DocType: Stock Entry Detail,Additional Cost,Custo Adicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Não pode filtrar com base no Nr. de Voucher, se estiver agrupado por Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Efetuar Cotação de Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Efetuar Cotação de Fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Os modelos de imposto padrão para vendas e compra são criados.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Avaliação O registro de resultados {0} já existe.
@@ -4931,7 +4964,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Defina o filtro de empresa em branco se Group By for &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,A Data de Postagem não pode ser uma data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Linha # {0}: O Nr. de Série {1} não corresponde a {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,para gerar o recorrente
 DocType: Stock Entry,Target Warehouse Address,Endereço do depósito de destino
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Licença Ocasional
 DocType: Agriculture Task,End Day,Dia final
@@ -4956,11 +4988,10 @@
 DocType: Material Request,% Ordered,% Pedida
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para o Grupo de Estudantes com Curso, o Curso será validado para cada Estudante dos Cursos Inscritos em Inscrição no Programa."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Trabalho à Peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Preço de compra médio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Preço de compra médio
 DocType: Share Balance,From No,De não
 DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
 DocType: Employee,History In Company,Historial na Empresa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nova mensagem de {sender}
 DocType: Customer,Customer Primary Address,Endereço principal do cliente
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Drug Prescription,Description/Strength,Descrição / Força
@@ -4969,22 +5000,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Mesmo item foi inserido várias vezes
 DocType: Department,Leave Block List,Lista de Bloqueio de Licenças
 DocType: Purchase Invoice,Tax ID,NIF/NIPC
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,"O Item {0} não está configurado para os Nrs. de Série, a coluna deve estar em branco"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,"O Item {0} não está configurado para os Nrs. de Série, a coluna deve estar em branco"
 DocType: Accounts Settings,Accounts Settings,Definições de Contas
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Aprovar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Endereço malformatado para {0}, corrija para continuar."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Endereço malformatado para {0}, corrija para continuar."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Número da nova conta, será incluído no nome da conta como um prefixo"
 DocType: Maintenance Team Member,Team Member,Membro da equipe
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Nenhum resultado para enviar
 DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
-DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de juro (%) / Ano
+DocType: Loan,Rate of Interest (%) / Year,Taxa de juro (%) / Ano
 ,Project Quantity,Quantidade de Projeto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;"
 DocType: Opportunity,To Discuss,Para Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,São necessárias {0} unidades de {1} em {2} para concluir esta transação.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de juro (%) Anual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Contas temporárias
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Preto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Contas temporárias
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,Expansão de Item da LDM
 DocType: Shareholder,Contact List,Lista de contatos
 DocType: Account,Auditor,Auditor
@@ -4992,16 +5023,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} itens produzidos
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Saber mais
 DocType: Cheque Print Template,Distance from top edge,Distância da margem superior
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Preço de tabela {0} está desativado ou não existe
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Preço de tabela {0} está desativado ou não existe
 DocType: Purchase Invoice,Return,Devolver
 DocType: Pricing Rule,Disable,Desativar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Modo de pagamento é necessário para fazer um pagamento
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Modo de pagamento é necessário para fazer um pagamento
 DocType: Project Task,Pending Review,Revisão Pendente
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Edite em página inteira para obter mais opções, como ativos, números de série, lotes etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Nomeações e Consultas
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} não está inscrito no lote {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","O ativo {0} não pode ser eliminado, uma vez que já é um/a {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cheques necessários
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cheques necessários
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (através de Reembolso de Despesas)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausência
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Falha na configuração da empresa
@@ -5013,7 +5044,7 @@
 DocType: Homepage,Tag Line,Linha de tag
 DocType: Fee Component,Fee Component,Componente de Propina
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestão de Frotas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Adicionar itens de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Adicionar itens de
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Culturas e Terras
 DocType: Cheque Print Template,Regular,Regular
 DocType: Fertilizer,Density (if liquid),Densidade (se líquido)
@@ -5038,24 +5069,26 @@
 DocType: Payment Entry,Paid Amount,Montante Pago
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Explore o ciclo de vendas
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Entrada de estoque de retenção
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Entrada de estoque de retenção
 ,Available Stock for Packing Items,Stock Disponível para Items Embalados
 DocType: Item Variant,Item Variant,Variante do Item
 ,Work Order Stock Report,Relatório de estoque de ordem de trabalho
+DocType: Purchase Receipt,Auto Repeat Detail,Detalhe de Repetição Automática
 DocType: Assessment Result Tool,Assessment Result Tool,Avaliação Resultado Ferramenta
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Como supervisor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugerir Categoria
 DocType: BOM Scrap Item,BOM Scrap Item,Item de Sucata da LDM
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo da conta já está em débito, não tem permissão para definir o ""Saldo Deve Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Gestão da Qualidade
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,O Item {0} foi desativado
 DocType: Project,Total Billable Amount (via Timesheets),Valor Billable total (via timesheets)
 DocType: Agriculture Task,Previous Business Day,Dia útil anterior
-DocType: Employee Loan,Repay Fixed Amount per Period,Pagar quantia fixa por Período
+DocType: Loan,Repay Fixed Amount per Period,Pagar quantia fixa por Período
 DocType: Employee,Health Insurance No,Seguro de Saúde Não
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, insira a quantidade para o Item {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota de crédito Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota de crédito Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Valor Total Tributável
 DocType: Employee External Work History,Employee External Work History,Historial de Trabalho Externo do Funcionário
 DocType: Opening Invoice Creation Tool,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Qtd de Saldo
@@ -5066,16 +5099,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
 DocType: Healthcare Settings,Valid number of days,Número de dias válidos
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centros de Custo
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Reinicie a Assinatura
 DocType: Land Unit,Linked Plant Analysis,Análise de planta vinculada
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa à qual a moeda do fornecedor é convertida para a moeda principal do cliente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Linha #{0}: Conflitos temporais na linha {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir taxa de avaliação zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir taxa de avaliação zero
+DocType: Bank Guarantee,Receiving,Recebendo
 DocType: Training Event Employee,Invited,Convidado
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Foram encontrados Várias Estruturas Salariais ativas para o funcionário {0} para as datas indicadas
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Configuração de contas do Portal.
 DocType: Employee,Employment Type,Tipo de Contratação
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Ativos Imobilizados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Ativos Imobilizados
 DocType: Payment Entry,Set Exchange Gain / Loss,Definir o as Perdas / Ganhos de Câmbio
 ,GST Purchase Register,Registro de Compra de GST
 ,Cash Flow,Fluxo de Caixa
@@ -5096,9 +5131,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista de todas as transações de compartilhamento
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},"Por favor, encontre no anexo {0} #{1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,A data de início do período de avaliação e a data de término do período de avaliação devem ser definidas
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Taxa média
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,O valor total do pagamento no cronograma de pagamento deve ser igual a total / total arredondado
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,O valor total do pagamento no cronograma de pagamento deve ser igual a total / total arredondado
+DocType: Subscription Plan Detail,Plan,Plano
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Declaração Bancária de Saldo de acordo com a Razão Geral
 DocType: Job Applicant,Applicant Name,Nome do Candidato
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do Item
@@ -5134,6 +5170,7 @@
 DocType: Work Order,Warehouses,Armazéns
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,O ativo {0} não pode ser transferido
 DocType: Hotel Room Pricing,Hotel Room Pricing,Preços do quarto do hotel
+DocType: Subscription,Days Until Due,Dias até o vencimento
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Este Item é uma Variante de {0} (Modelo).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Aquisição
@@ -5142,13 +5179,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para o grupo de alunos com base em lote, o lote de estudante será validado para cada aluno da inscrição no programa."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser eliminado porque existe um registo de livro de stock para este armazém.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribuição
+DocType: Journal Entry Account,Loan,Empréstimo
 DocType: Expense Claim Advance,Expense Claim Advance,Avance de reclamação de despesas
 DocType: Lab Test,Report Preference,Prevenção de relatório
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informação de voluntários.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Gestor de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Gestor de Projetos
 ,Quoted Item Comparison,Comparação de Cotação de Item
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Sobreposição na pontuação entre {0} e {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Expedição
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,O máx. de desconto permitido para o item: {0} é de {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Valor Patrimonial Líquido como em
 DocType: Crop,Produce,Produzir
@@ -5158,7 +5196,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Consumo de material para manufatura
 DocType: Item Alternative,Alternative Item Code,Código de item alternativo
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,A função para a qual é permitida enviar transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Selecione os itens para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Selecione os itens para Fabricação
 DocType: Delivery Stop,Delivery Stop,Parada de entrega
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
 DocType: Item,Material Issue,Saída de Material
@@ -5168,15 +5206,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabão e Detergentes
 DocType: BOM,Show Items,Exibir itens
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,O Tempo De não pode ser após o Tempo Para.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Deseja notificar todos os clientes por e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Deseja notificar todos os clientes por e-mail?
+DocType: Subscription Plan,Billing Interval,Intervalo de cobrança
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Filmes e Vídeos
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Currículo
 DocType: Hub Settings,Hub Username,Nome de Usuário do Hub
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Critérios de Avaliação Grupo
 DocType: Healthcare Settings,Patient Name By,Nome do paciente por
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Entrada de diário de acréscimo para salários de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Entrada de diário de acréscimo para salários de {0} a {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
 DocType: Warehouse,Warehouse Name,Nome dp Armazém
 DocType: Naming Series,Select Transaction,Selecionar Transação
@@ -5190,23 +5228,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui pode colocar a altura, o peso, as alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Aplica-se à Empresa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar porque o Registo de Stock {0} existe
-DocType: Employee Loan,Disbursement Date,Data de desembolso
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Recipientes&#39; não especificados
+DocType: Loan,Disbursement Date,Data de desembolso
 DocType: BOM Update Tool,Update latest price in all BOMs,Atualize o preço mais recente em todas as BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Registo médico
 DocType: Vehicle,Vehicle,Veículo
 DocType: Purchase Invoice,In Words,Por Extenso
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Digite o nome do banco ou instituição de empréstimo antes de enviar.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} deve ser enviado
 DocType: POS Profile,Item Groups,Grupos de Itens
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Hoje é o seu {0} aniversário!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Hoje é o seu {0} aniversário!
 DocType: Sales Order Item,For Production,Para a Produção
 DocType: Payment Request,payment_url,url_de_pagamento
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Adicione uma conta de abertura temporária no plano de contas
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Adicione uma conta de abertura temporária no plano de contas
 DocType: Customer,Customer Primary Contact,Contato primário do cliente
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Jornal de encerramento do período
 DocType: Project Task,View Task,Ver Tarefa
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Tipo de garantia bancária
 DocType: Material Request,MREQ-,SOLMAT-
 DocType: Payment Schedule,Invoice Portion,Porção de fatura
 ,Asset Depreciations and Balances,Depreciações e Saldos de Ativo
@@ -5217,9 +5256,8 @@
 DocType: Production Plan,Include Subcontracted Items,Incluir itens subcontratados
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Inscrição
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Qtd de Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Não é possível alterar as propriedades da Variante após a transição do estoque. Você terá que criar um novo Item para fazer isso.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
-DocType: Employee Loan,Repay from Salary,Reembolsar a partir de Salário
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+DocType: Loan,Repay from Salary,Reembolsar a partir de Salário
 DocType: Leave Application,LAP/,APL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Solicitando o pagamento contra {0} {1} para montante {2}
 DocType: Salary Slip,Salary Slip,Folha de Vencimento
@@ -5243,11 +5281,11 @@
 DocType: Employee Education,Employee Education,Educação do Funcionário
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Foi encontrado um grupo item duplicado na tabela de grupo de itens
 DocType: Land Unit,Parent Land Unit,Unidade de Terra Parental
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
 DocType: Fertilizer,Fertilizer Name,Nome do fertilizante
 DocType: Salary Slip,Net Pay,Rem. Líquida
 DocType: Cash Flow Mapping Accounts,Account,Conta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,O Nr. de Série {0} já foi recebido
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,O Nr. de Série {0} já foi recebido
 ,Requested Items To Be Transferred,Itens Solicitados A Serem Transferidos
 DocType: Expense Claim,Vehicle Log,Registo de Veículo
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presença de febre (temperatura&gt; 38,5 ° C / 101,3 ° F ou temperatura sustentada&gt; 38 ° C / 100,4 ° F)"
@@ -5288,24 +5326,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, dignas de serem mencionadas, que devem ir para os registos."
 DocType: Asset Maintenance,Manufacturing User,Utilizador de Fabrico
 DocType: Purchase Invoice,Raw Materials Supplied,Matérias-primas Fornecidas
-DocType: C-Form,Series,Série
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Moeda da lista de preços {0} deve ser {1} ou {2}
 DocType: Appraisal,Appraisal Template,Modelo de Avaliação
 DocType: Soil Texture,Ternary Plot,Parcela Ternar
 DocType: Item Group,Item Classification,Classificação do Item
 DocType: Driver,License Number,Número de licença
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Gestor de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Gestor de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Objetivo da Visita de Manutenção
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Fatura Registro de Pacientes
 DocType: Crop,Period,Período
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Razão Geral
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} em licença {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} em licença {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver Potenciais Clientes
 DocType: Program Enrollment Tool,New Program,Novo Programa
 DocType: Item Attribute Value,Attribute Value,Valor do Atributo
 ,Itemwise Recommended Reorder Level,Nível de Reposição Recomendada por Item
 DocType: Salary Detail,Salary Detail,Dados Salariais
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Por favor, seleccione primeiro {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Por favor, seleccione primeiro {0}"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,O Lote {0} do Item {1} expirou.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultas
@@ -5313,15 +5350,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) não pode ser maior que a quantidade planejada ({2}) na Ordem de Serviço {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Folha de Presença de fabrico.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Não é possível alterar as propriedades da Variante após a transação de estoque. Você terá que fazer um novo item para fazer isso.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandato SEPA GoCardless
 DocType: Physician,Charges,Cobranças
 DocType: Production Plan,Get Items For Work Order,Obter itens para ordem de trabalho
 DocType: Salary Detail,Default Amount,Montante Padrão
 DocType: Lab Test Template,Descriptive,Descritivo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,O armazém não foi encontrado no sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,O armazém não foi encontrado no sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resumo Deste Mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura de Inspeção de Qualidade
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
 DocType: Tax Rule,Purchase Tax Template,Modelo de Taxa de Compra
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Defina um objetivo de vendas que você deseja alcançar para sua empresa.
 ,Project wise Stock Tracking,Controlo de Stock por Projeto
@@ -5349,11 +5387,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Falha ao criar o site
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Dados de Conversão de UNID
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Entrada de estoque de retenção já criada ou quantidade de amostra não fornecida
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Entrada de estoque de retenção já criada ou quantidade de amostra não fornecida
 DocType: Program,Program Abbreviation,Abreviação do Programa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Os custos de cada item são atualizados no Recibo de Compra
 DocType: Warranty Claim,Resolved By,Resolvido Por
-DocType: Bank Guarantee,Start Date,Data de Início
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Atribuir licenças para um determinado período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Os Cheques e Depósitos foram apagados incorretamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Conta {0}: Não pode atribuí-la como conta principal
@@ -5368,11 +5405,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Horas
 DocType: Project,Expected Start Date,Data de Início Prevista
 DocType: Purchase Invoice,04-Correction in Invoice,04-Correção na Fatura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Ordem de Serviço já criada para todos os itens com BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Ordem de Serviço já criada para todos os itens com BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Relatório de Detalhes da Variante
 DocType: Setup Progress Action,Setup Progress Action,Configurar a ação de progresso
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Lista de preços de compra
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Lista de preços de compra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Remover item, se os encargos não forem aplicáveis a esse item"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Cancelar assinatura
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Selecione o Status da manutenção como concluído ou remova a Data de conclusão
 DocType: Supplier,Default Payment Terms Template,Modelo de Termos de Pagamento Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,O moeda do câmbio deve ser a mesmo da moeda do Portal de Pagamento
@@ -5383,7 +5421,6 @@
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos de Funcionamento
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Orçamento Mensal Acumulado for Excedido
-DocType: Subscription,Submit on creation,Enviar na criação
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},A moeda para {0} deve ser {1}
 DocType: Asset,Disposal Date,Data de Eliminação
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os emails serão enviados para todos os funcionários ativos da empresa na hora estabelecida, se não estiverem de férias. O resumo das respostas será enviado à meia-noite."
@@ -5402,6 +5439,7 @@
 DocType: Batch,Parent Batch,Lote pai
 DocType: Cheque Print Template,Cheque Print Template,Modelo de Impressão de Cheque
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gráfico de Centros de Custo
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Número de dias após a data da fatura ter expirado antes de cancelar a assinatura ou marcar a assinatura como não remunerada
 DocType: Lab Test Template,Sample Collection,Coleção de amostras
 ,Requested Items To Be Ordered,Itens solicitados para encomendar
 DocType: Price List,Price List Name,Nome da Lista de Preços
@@ -5410,7 +5448,7 @@
 DocType: Account,Income,Rendimento
 DocType: Industry Type,Industry Type,Tipo de Setor
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ocorreu um problema!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Atenção: A solicitação duma licença contém as seguintes datas bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Atenção: A solicitação duma licença contém as seguintes datas bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,A Fatura de Venda {0} já foi enviada
 DocType: Supplier Scorecard Scoring Criteria,Score,Ponto
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,O Ano Fiscal de {0} não existe
@@ -5430,12 +5468,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Perfil de Ponto de Venda
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} deve ser um valor entre 0 e 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,A próxima data de depreciação não pode ser anterior à data disponível para uso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Empréstimos Não Garantidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Empréstimos Não Garantidos
 DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Máx. de horas de trabalho no Registo de Horas
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Qtd Total Paga
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Qtd Total Paga
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,As mensagens maiores do que 160 caracteres vão ser divididas em múltiplas mensagens
 DocType: Purchase Receipt Item,Received and Accepted,Recebido e Aceite
 DocType: Hub Settings,Company and Seller Profile,Perfil da empresa e do vendedor
@@ -5449,10 +5487,9 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},O peso total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Seus Fornecedores
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corrija o
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
 DocType: Request for Quotation Item,Supplier Part No,Peça de Fornecedor Nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anônimo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Recebido De
 DocType: Lead,Converted,Convertido
@@ -5466,6 +5503,7 @@
 DocType: Asset,Assets,Ativos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos do website.
+DocType: Subscription,Current Invoice End Date,Data final da fatura atual
 DocType: Payment Term,Due Date Based On,Data de vencimento baseada em
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Defina o grupo de clientes e o território padrão em Configurações de venda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} não existe
@@ -5473,7 +5511,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,O Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Não está autorizado a definir como valor Congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Registos Não Conciliados
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nenhum reembolso selecionado para Entrada no Diário
 DocType: Payment Reconciliation,From Invoice Date,Data de Fatura De
+DocType: Loan,Disbursed,Desembolsado
 DocType: Healthcare Settings,Laboratory Settings,Configurações de Laboratório
 DocType: Patient Appointment,Service Unit,Unidade de serviço
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Definir o fornecedor com sucesso
@@ -5486,12 +5526,12 @@
 DocType: Share Balance,No of Shares,Nº de Ações
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Selecionar status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ajuda da Regra Fixação de Preços
 DocType: School House,House Name,Nome casa
 DocType: Fee Schedule,Total Amount per Student,Montante total por aluno
 DocType: Purchase Taxes and Charges,Account Head,Título de Conta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elétrico
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elétrico
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adicione o resto da sua organização como seus utilizadores. Você também pode adicionar convidar clientes para o seu portal, adicionando-os a partir de Contactos"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença de Valor Total (Saída - Entrada)
 DocType: Grant Application,Requested Amount,Montante Requerido
@@ -5501,7 +5541,7 @@
 DocType: Crop Cycle,Detected Diseases,Doenças detectadas
 DocType: Stock Entry,Default Source Warehouse,Armazém Fonte Padrão
 DocType: Item,Customer Code,Código de Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
 DocType: Asset Maintenance Task,Last Completion Date,Última Data de Conclusão
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias Desde a última Ordem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
@@ -5509,9 +5549,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Configurações GoCardless
 DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos de Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Ativos de Stock
 DocType: Restaurant,Active Menu,Menu Ativo
 DocType: Target Detail,Target Qty,Qtd Alvo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Contra Empréstimo: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Definições de Saída
 DocType: Student Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,A Guia de Remessa {0} não deve ser enviada
@@ -5520,9 +5561,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},A Folha de Vencimento do funcionário {0} já foi criada para folha de vencimento {1}
 DocType: Vehicle Log,Odometer,Conta-km
 DocType: Production Plan Item,Ordered Qty,Qtd Pedida
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,O Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,O Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Stock Congelado Até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,A LDM não contém nenhum item em stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,A LDM não contém nenhum item em stock
 DocType: Chapter,Chapter Head,Chefe de capítulo
 DocType: Payment Term,Month(s) after the end of the invoice month,Mês (s) após o final do mês da factura
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Atividade / tarefa do projeto.
@@ -5530,11 +5571,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Vencimento
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,O tempo da data do resultado do laboratório não pode ser antes de testar a data e hora
 DocType: POS Profile,Allow user to edit Discount,Permitir ao usuário editar o desconto
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Obtenha clientes de
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Obtenha clientes de
 DocType: Purchase Invoice Item,Include Exploded Items,Incluir itens Explodidos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","A compra deve ser verificada, se Aplicável Para for selecionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,O Desconto deve ser inferior a 100
 DocType: Shipping Rule,Restrict to Countries,Restringir aos países
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montante de Liquidação (Moeda da Empresa)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Faturação
 DocType: Project,Total Sales Amount (via Sales Order),Valor total das vendas (por ordem do cliente)
@@ -5553,6 +5595,7 @@
 DocType: Soil Texture,Sandy Clay,Argila arenosa
 DocType: Grant Application,Assessment  Manager,Gerente de Avaliação
 DocType: Payment Entry,Allocate Payment Amount,Atribuir Valor do Pagamento
+DocType: Subscription Plan,Subscription Plan,Plano de Assinatura
 DocType: Employee External Work History,Salary,Salário
 DocType: Serial No,Delivery Document Type,Tipo de Documento de Entrega
 DocType: Sales Order,Partly Delivered,Parcialmente Entregue
@@ -5577,9 +5620,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Faixa Etária 2
 DocType: SG Creation Tool Course,Max Strength,Força Máx.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalando predefinições
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nenhuma nota de entrega selecionada para o cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nenhuma nota de entrega selecionada para o cliente {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,LDM substituída
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Selecione itens com base na data de entrega
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Selecione itens com base na data de entrega
 DocType: Grant Application,Has any past Grant Record,Já havia passado Grant Record
 ,Sales Analytics,Análise de Vendas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponível {0}
@@ -5598,7 +5641,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de Matérias-primas Fornecidas
 DocType: Selling Settings,Settings for Selling Module,Definições para Vender Módulo
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva de quarto de hotel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Apoio ao Cliente
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Apoio ao Cliente
 DocType: BOM,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Dados de Cliente do Item
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferecer Emprego ao candidato.
@@ -5615,7 +5658,7 @@
 DocType: Fees,Student Details,Detalhes do aluno
 DocType: Purchase Invoice Item,Stock Qty,Quantidade de stock
 DocType: Purchase Invoice Item,Stock Qty,Quantidade de Stock
-DocType: Employee Loan,Repayment Period in Months,Período de reembolso em meses
+DocType: Loan,Repayment Period in Months,Período de reembolso em meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é uma ID válida?
 DocType: Naming Series,Update Series Number,Atualização de Número de Série
 DocType: Account,Equity,Equidade
@@ -5624,7 +5667,7 @@
 DocType: Task,Closing Date,Data de Encerramento
 DocType: Sales Order Item,Produced Quantity,Quantidade Produzida
 DocType: Timesheet,Work Detail,Detalhe do trabalho
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Engenheiro
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Engenheiro
 DocType: Journal Entry,Total Amount Currency,Valor Total da Moeda
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisar Subconjuntos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},É necessário o Código do Item na Linha Nr. {0}
@@ -5670,13 +5713,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informação do tipo de doador.
 DocType: Request for Quotation,Supplier Detail,Dados de Fornecedor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Erro na fórmula ou condição: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Montante Faturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Montante Faturado
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Os pesos dos critérios devem somar até 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Assiduidade
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Itens de Stock
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for selecionada, a lista deverá ser adicionada a cada Departamento onde tem de ser aplicada."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Criando {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,O Armazém de Origem e Destino não pode ser o mesmo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,É obrigatório colocar a data e hora de postagem
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
@@ -5700,14 +5742,14 @@
 DocType: Shipping Rule,Fixed,Fixo
 DocType: Vehicle Service,Clutch Plate,Embraiagem
 DocType: Company,Round Off Account,Arredondar Conta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Despesas Administrativas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Despesas Administrativas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consultoria
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes Principal
-DocType: Journal Entry,Subscription,Subscrição
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Subscrição
 DocType: Purchase Invoice,Contact Email,Email de Contacto
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Criação de taxa pendente
 DocType: Appraisal Goal,Score Earned,Classificação Ganha
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Período de Aviso
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Período de Aviso
 DocType: Asset Category,Asset Category Name,Nome de Categoria de Ativo
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este é um território principal e não pode ser editado.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo Nome de Vendedor
@@ -5721,7 +5763,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
 DocType: Asset,Frequency of Depreciation (Months),Frequência de Depreciação (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Conta de Crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Conta de Crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de Entrega do Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,A quantidade do item obtido após a fabrico / reembalagem de determinadas quantidades de matérias-primas
@@ -5729,7 +5771,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta A Receber / A Pagar
 DocType: Delivery Note Item,Against Sales Order Item,No Item da Ordem de Venda
 DocType: Hub Settings,Company Logo,Logotipo da empresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém Padrão
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},O Orçamento não pode ser atribuído à Conta de Grupo {0}
 DocType: Healthcare Settings,Patient Registration,Registro de Paciente
@@ -5763,11 +5805,10 @@
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazém de Produtos Acabados Padrão
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Selecione Paciente
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor/a
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedor/a
 DocType: Hotel Room Package,Amenities,Facilidades
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Orçamento e Centro de Custo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,O modo de pagamento padrão múltiplo não é permitido
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para o
 ,Appointment Analytics,Análise de nomeação
 DocType: Vehicle Service,Half Yearly,Semestrais
 DocType: Lead,Blog Subscriber,Assinante do Blog
@@ -5783,6 +5824,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deixe em branco se você fizer grupos de alunos por ano
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se for selecionado, o nr. Total de Dias de Úteis incluirá os feriados, e isto irá reduzir o valor do Salário Por Dia"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplicativos que usam a chave atual não poderão acessar, tem certeza?"
+DocType: Subscription Settings,Prorate,Proporcionado
 DocType: Purchase Invoice,Total Advance,Antecipação Total
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Código de modelo de mudança
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"O Prazo de Data Final não pode ser anterior ao Prazo de Data de Início. Por favor, corrija as datas e tente novamente."
@@ -5794,8 +5836,9 @@
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Montante de Crédito
 DocType: Cheque Print Template,Signatory Position,Posição do Signatário
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Defenir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Defenir como Perdido
 DocType: Timesheet,Total Billable Hours,Total de Horas Trabalhadas
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Número de dias que o assinante deve pagar as faturas geradas por esta assinatura
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota de Recibo de Pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Isto é baseado em operações neste cliente. Veja cronograma abaixo para obter mais detalhes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Linha {0}: O montante atribuído {1} deve ser menor ou igual ao montante de Registo de Pagamento {2}
@@ -5814,12 +5857,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obter Última Taxa de Compra
 DocType: Company,Company Info,Informações da Empresa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Selecionar ou adicionar novo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Fundos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esta baseia-se na assiduidade deste Funcionário
 DocType: Assessment Result,Summary,Resumo
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Conta de Débito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Conta de Débito
 DocType: Fiscal Year,Year Start Date,Data de Início do Ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Item de entrada de pedido de restaurante
@@ -5831,7 +5874,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montante de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Cotação de Fornecedor {0} criada
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Benefícios do Funcionário
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Benefícios do Funcionário
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},A quantidade embalada deve ser igual à quantidade do Item {0} na linha {1}
 DocType: Work Order,Manufactured Qty,Qtd Fabricada
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},As ações não existem com o {0}
@@ -5839,12 +5882,12 @@
 DocType: Asset,Out of Order,Fora de serviço
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorar a sobreposição do tempo da estação de trabalho
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Funcionário(a) {0} ou para a Empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Funcionário(a) {0} ou para a Empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Selecione números de lote
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Contas levantadas a Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID de Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
 DocType: Patient Service Unit,Medical Administrator,Administrador Médico
 DocType: Assessment Plan,Schedule,Programar
 DocType: Account,Parent Account,Conta Principal
@@ -5874,15 +5917,16 @@
 DocType: Asset Repair,Repair Status,Status do reparo
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Registo de Lançamentos Contabilísticos.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qtd Disponível Do Armazém
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Por favor, selecione primeiro o Registo de Funcionário."
 DocType: POS Profile,Account for Change Amount,Conta para a Mudança de Montante
 DocType: Purchase Invoice,input service,serviço de insumos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: A Parte / Conta não corresponde a {1} / {2} em {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Membro da equipe de manutenção
 DocType: Agriculture Analysis Criteria,Soil Analysis,Análise do solo
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Código do curso:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Por favor, insira a Conta de Despesas"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Por favor, insira a Conta de Despesas"
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item for uma variante doutro item, então, a descrição, a imagem, os preços, as taxas, etc. serão definidos a partir do modelo, a menos que seja explicitamente especificado o contrário"
 DocType: Serial No,Purchase / Manufacture Details,Dados de Compra / Fabrico
@@ -5931,19 +5975,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admissões para {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nome variável
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","O Item {0} é um modelo, por favor, selecione uma das suas variantes"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","O Item {0} é um modelo, por favor, selecione uma das suas variantes"
 DocType: Asset,Asset Category,Categoria de Ativo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,A Remuneração Líquida não pode ser negativa
 DocType: Purchase Order,Advance Paid,Adiantamento Pago
 DocType: Item,Item Tax,Imposto do Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material para o Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material para o Fornecedor
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Planejamento de Solicitação de Material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Fatura de Imposto Especial
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% aparece mais de uma vez
 DocType: Expense Claim,Employees Email Id,ID de Email de Funcionários
 DocType: Employee Attendance Tool,Marked Attendance,Presença Marcada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passivo a Curto Prazo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Passivo a Curto Prazo
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,O temporizador excedeu as horas dadas.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Enviar SMS em massa para seus contactos
 DocType: Patient,A Positive,Um positivo
@@ -5954,9 +5998,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,É obrigatório colocar a Qtd Efetiva
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} atualmente tem um {1} Guia de Scorecard do Fornecedor e as Ordens de Compra para este fornecedor devem ser emitidas com cautela.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Equipe de manutenção de ativos
-DocType: Employee Loan,Loan Type,Tipo de empréstimo
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} foi enviado com sucesso
+DocType: Loan,Loan Type,Tipo de empréstimo
 DocType: Scheduling Tool,Scheduling Tool,Ferramenta de Agendamento
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Cartão de Crédito
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Cartão de Crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricado ou reembalado
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais/Opcionais
 DocType: Sales Invoice Item,Drop Ship,Envio Direto
@@ -5988,7 +6033,7 @@
 DocType: Item,Units of Measure,Unidades de medida
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Produção nas Férias
 DocType: Sales Invoice,Customer's Purchase Order Date,Data de Ordem de Compra do Cliente
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Social
 DocType: Shopping Cart Settings,Show Public Attachments,Mostrar anexos públicos
 DocType: Packing Slip,Package Weight Details,Dados de Peso do Pacote
 DocType: Restaurant Reservation,Reservation Time,Tempo de Reserva
@@ -6003,7 +6048,7 @@
 DocType: Purchase Order,To Receive and Bill,Para Receber e Faturar
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Linha # {0}: Reqd por data não pode ser antes da data da transação
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produtos Em Destaque
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termos e Condições de Modelo
 DocType: Serial No,Delivery Details,Dados de Entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},É necessário colocar o Centro de Custo na linha {0} na Tabela de Impostos para o tipo {1}
@@ -6013,20 +6058,20 @@
 DocType: Driver,Expiry Date,Data de Validade
 DocType: Healthcare Settings,Employee name and designation in print,Nome do empregado e designação em impressão
 ,accounts-browser,navegador-de-contas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Por favor, selecione primeiro a Categoria"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Por favor, selecione primeiro a Categoria"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Definidor de Projeto.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir que o excesso de Faturação ou excesso de pedidos, atualize a ""Provisão"" nas Definições de Stock ou do Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como $ ao lado das moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Meio Dia)
 DocType: Payment Term,Credit Days,Dias de Crédito
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Selecione Paciente para obter testes laboratoriais
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Criar Classe de Estudantes
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,É para Continuar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obter itens da LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obter itens da LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Dias para Chegar ao Armazém
 DocType: Cash Flow Mapping,Is Income Tax Expense,É a despesa de imposto de renda
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verifique se o estudante reside no albergue do Instituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Insira as Ordens de Venda na tabela acima
 ,Stock Summary,Resumo de Stock
@@ -6037,10 +6082,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Data de Ref.
 DocType: Employee,Reason for Leaving,Motivo de Saída
 DocType: BOM Operation,Operating Cost(Company Currency),Custo Operacional (Moeda da Empresa)
-DocType: Employee Loan Application,Rate of Interest,Taxa de interesse
+DocType: Loan Application,Rate of Interest,Taxa de interesse
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade Sancionada
 DocType: Item,Shelf Life In Days,Vida útil em dias
 DocType: GL Entry,Is Opening,Está a Abrir
+DocType: Department,Expense Approvers,Aprovadores de despesas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Um registo de débito não pode ser vinculado a {1}
 DocType: Journal Entry,Subscription Section,Secção de Subscrição
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,A conta {0} não existe
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 917f29c..2f4ab89 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Rapoarte de evaluare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Produse consumator
-DocType: Purchase Receipt,Subscription Detail,Detalii privind abonamentul
 DocType: Supplier Scorecard,Notify Supplier,Notificați furnizorul
 DocType: Item,Customer Items,Articole clientului
 DocType: Project,Costing and Billing,Calculație a costurilor și de facturare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
 DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificări Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Evaluare
 DocType: Item,Default Unit of Measure,Unitatea de Măsură Implicita
 DocType: SMS Center,All Sales Partner Contact,Toate contactele partenerului de vânzări
-DocType: Employee,Leave Approvers,Aprobatori Concediu
+DocType: Department,Leave Approvers,Aprobatori Concediu
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Investigații
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Verifică disponibilitatea
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui furnizor. A se vedea calendarul de mai jos pentru detalii
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Juridic
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Juridic
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
 DocType: Bank Guarantee,Customer,Client
 DocType: Purchase Receipt Item,Required By,Cerute de
 DocType: Delivery Note,Return Against Delivery Note,Reveni Împotriva livrare Nota
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (sau grupuri) față de care înregistrările contabile sunt făcute și soldurile sunt menținute.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nu există nicio plată a Salariilor care să fie procesată.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nu există nicio plată a Salariilor care să fie procesată.
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afișați deschis
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Este necesar să luăm această acțiune astăzi pentru recidiva menționată mai sus
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Seria Actualizat cu succes
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Verifică
 DocType: Pricing Rule,Apply On,Se aplică pe
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
 DocType: Support Settings,Support Settings,Setări de sprijin
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Lot Articol Stare de expirare
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Ciorna bancară
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Ciorna bancară
 DocType: Membership,membership validaty section,membru valabil secțiune
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 DocType: Consultation,Consultation,Consultare
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Realizarea site-ului
 DocType: Opening Invoice Creation Tool Item,Quantity,Cantitate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Planul de conturi nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Imprumuturi (Raspunderi)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Planul de conturi nu poate fi gol.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Imprumuturi (Raspunderi)
 DocType: Employee Education,Year of Passing,Ani de la promovarea
 DocType: Item,Country of Origin,Tara de origine
 DocType: Soil Texture,Soil Texture Criteria,Criterii de textură a solului
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalii de contact primare
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Probleme deschise
 DocType: Production Plan Item,Production Plan Item,Planul de producție Articol
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
 DocType: Lab Test Groups,Add new line,Adăugați o linie nouă
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Servicii de Sanatate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Întârziere de plată (zile)
@@ -89,7 +85,7 @@
 ,Delay Days,Zilele întârziate
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Factură
+DocType: Subscription Invoice,Invoice,Factură
 DocType: Purchase Invoice Item,Item Weight Details,Greutate Detalii articol
 DocType: Asset Maintenance Log,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,
 DocType: Timesheet,Total Costing Amount,Suma totală Costing
 DocType: Delivery Note,Vehicle No,Vehicul Nici
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Vă rugăm să selectați lista de prețuri
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Lucrări în curs
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Vă rugăm să selectați data
 DocType: Daily Work Summary Group,Holiday List,Lista de Vacanță
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Contabil
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Contabil
 DocType: Hub Settings,Selling Price List,Lista de prețuri de vânzare
 DocType: Patient,Tobacco Current Use,Utilizarea curentă a tutunului
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Rata de vanzare
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Rata de vanzare
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Nu telefon
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nou {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Notificarea inițială de e-mail trimisă
 ,Sales Partners Commission,Comision Agenţi Vânzări
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Valoarea după amortizare
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Legate de
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Data de prezență nu poate fi anteriara datii angajarii salariatului
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Data de prezență nu poate fi anteriara datii angajarii salariatului
 DocType: Grading Scale,Grading Scale Name,Standard Nume Scala
-DocType: Subscription,Repeat on Day,Repetați în Ziua
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Acesta este un cont de rădăcină și nu pot fi editate.
 DocType: Sales Invoice,Company Address,adresa companiei
 DocType: BOM,Operations,Operatii
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nu se poate seta autorizare pe baza de Discount pentru {0}
+DocType: Subscription,Subscription Start Date,Data de începere a abonamentului
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru denumirea veche și una pentru denumirea nouă"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nu se gaseste in niciun an fiscal activ.
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referință: {0}, Cod articol: {1} și Client: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Perioada de încheiere a perioadei de încercare nu poate fi înainte de data începerii perioadei de încercare
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Deschidere pentru un loc de muncă.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nu este specificat pentru subcontractarea elementului {0} la rândul {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aceeași societate este înscris de mai multe ori
 DocType: Patient,Married,Căsătorit
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nu este permisă {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obține elemente din
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Obține elemente din
 DocType: Price List,Price Not UOM Dependant,Pretul nu este dependent de UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produs {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Ulei de frână
 DocType: Tax Rule,Tax Type,Tipul de impozitare
 ,Completed Work Orders,Ordine de lucru finalizate
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Sumă impozabilă
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Sumă impozabilă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
 DocType: BOM,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rândul # {0}: Tipul de document de referință trebuie să fie una dintre revendicările de cheltuieli sau intrări în jurnal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Selectați BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rândul # {0}: Tipul de document de referință trebuie să fie una dintre revendicările de cheltuieli sau intrări în jurnal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Selectați BOM
 DocType: SMS Log,SMS Log,SMS Conectare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gestionați suma avansului acordată angajatului
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Notificare de livrare
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Contul Plătiți numai
-DocType: Employee Loan,Repay Over Number of Periods,Rambursa Peste Număr de Perioade
+DocType: Loan,Repay Over Number of Periods,Rambursa Peste Număr de Perioade
 DocType: Stock Entry,Additional Costs,Costuri suplimentare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
 DocType: Lead,Product Enquiry,Intrebare produs
 DocType: Education Settings,Validate Batch for Students in Student Group,Validați lotul pentru elevii din grupul de studenți
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nici o înregistrare de concediu găsite pentru angajat {0} pentru {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nici o înregistrare de concediu găsite pentru angajat {0} pentru {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Va rugam sa introduceti prima companie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Vă rugăm să selectați Company primul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Vă rugăm să selectați Company primul
 DocType: Employee Education,Under Graduate,Sub Absolvent
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Stabiliți șablonul implicit pentru notificarea de stare la ieșire în setările HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,angajat de împrumut
 DocType: Fee Schedule,Send Payment Request Email,Trimiteți e-mail de solicitare de plată
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Imobiliare
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Neînregistrați cu succes.
 DocType: Assessment Result,Grade,calitate
 DocType: Restaurant Table,No of Seats,Numărul de scaune
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Pentru a adăuga subiect dinamic, utilizați etichete de tip jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: Asset Maintenance Task,Asset Maintenance Task,Activitatea de întreținere a activelor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Salariu anual
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Salariu anual
 DocType: Daily Work Summary,Daily Work Summary,Sumar zilnic de lucru
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} este blocat
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Cheltuieli stoc
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Cheltuieli stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selectați Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Selectați Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vă rugăm să introduceți preferate Contact E-mail
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Vă rugăm să introduceți preferate Contact E-mail
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra intrare
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,adresa primara
 DocType: Production Plan,Material Request Detail,Detalii privind solicitarea materialului
 DocType: Selling Settings,Default Quotation Validity Days,Valabilitatea zilnică a cotațiilor
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Sumă schimbare
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Categorii de licență de conducere
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Introduceți data livrării
 DocType: Depreciation Schedule,Make Depreciation Entry,Asigurați-vă Amortizarea Intrare
+DocType: HR Settings,Leave Settings,Lăsați Setările
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tip Cerere
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Asigurați-angajat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Transminiune
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modul de configurare a POS (online / offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Dezactivează crearea de jurnale de timp împotriva comenzilor de lucru. Operațiunile nu vor fi urmărite împotriva ordinului de lucru
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Executie
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Executie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalii privind operațiunile efectuate.
 DocType: Asset Maintenance Log,Maintenance Status,Stare Mentenanta
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalii de membru
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Furnizorul este necesar pentru Contul de plăți {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articole și Prețuri
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Numărul total de ore: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},De la data trebuie să fie în anul fiscal. Presupunând că la data = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferinţă
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferinţă
 DocType: Grant Application,Individual,Individual
 DocType: Academic Term,Academics User,Utilizator cadru pedagogic
 DocType: Cheque Print Template,Amount In Figure,Suma în Figura
-DocType: Employee Loan Application,Loan Info,Creditul Info
+DocType: Loan Application,Loan Info,Creditul Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planul de de vizite de întreținere.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Perioada de evaluare a furnizorului
 DocType: Share Transfer,Share Transfer,Trimiteți transferul
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Șablon de șablon
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochimie
 DocType: Job Offer,Select Terms and Conditions,Selectați Termeni și condiții
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Valoarea afară
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Valoarea afară
 DocType: Woocommerce Settings,Woocommerce Settings,Setări Woocommerce
 DocType: Production Plan,Sales Orders,Comenzi de vânzări
 DocType: Purchase Taxes and Charges,Valuation,Evaluare
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Teritoriu Implicit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televiziune
 DocType: Work Order Operation,Updated via 'Time Log',"Actualizat prin ""Ora Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Selectați clientul sau furnizorul.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: Company,Enable Perpetual Inventory,Activați inventarul perpetuu
+DocType: Bank Guarantee,Charges Incurred,Taxele incasate
 DocType: Company,Default Payroll Payable Account,Implicit Salarizare cont de plati
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Actualizare e-mail Group
 DocType: Sales Invoice,Is Opening Entry,Deschiderea este de intrare
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Rezultate personalizate
 DocType: Delivery Stop,Contact Name,Nume Persoana de Contact
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criterii de evaluare a cursului
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Cod fiscal:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Cod fiscal:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Carnet de student:
 DocType: POS Customer Group,POS Customer Group,Grup Clienți POS
 DocType: Land Unit,Land Unit describing various land assets,Unitate funciară care descrie diverse bunuri funciare
@@ -375,9 +372,8 @@
 ,Open Work Orders,Deschideți comenzile de lucru
 DocType: Payment Term,Credit Months,Lunile de credit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Plata netă nu poate fi mai mică decât 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Pentru a nu mai trimite notificări de eroare repetitive din sistem, am bifat câmpul Dezactivat în abonament"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Frunze pe an
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Frunze pe an
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
 DocType: Email Digest,Profit & Loss,Pierderea profitului
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Configurați elevii din grupurile de studenți
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Intrările bancare
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Intrările bancare
 DocType: Crop,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs de grup studențesc instrument de creare
 DocType: Lead,Do Not Contact,Nu contactati
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Oameni care predau la organizația dumneavoastră
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Course Scheduling Tool,Course Start Date,Data începerii cursului
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publica in Hub
 DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Detalii de cumpărare
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grad
 DocType: Email Digest,New Quotations,Noi Citatele
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,alunecare email-uri salariul angajatului în funcție de e-mail preferat selectat în Angajat
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Primul Aprobatorul Lăsați în lista va fi setat ca implicit concediu aprobator
 DocType: Tax Rule,Shipping County,County transport maritim
-apps/erpnext/erpnext/config/desktop.py +167,Learn,A invata
+apps/erpnext/erpnext/config/desktop.py +159,Learn,A invata
 DocType: Asset,Next Depreciation Date,Data următoarei amortizări
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost activitate per angajat
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cecuri restante și pentru a șterge Depozite
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 DocType: Driver,Fleet Manager,Manager de flotă
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nu poate fi negativ pentru elementul {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nu poate fi negativ pentru elementul {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Vă rugăm să stabiliți tariful camerei la {}
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Opening Invoice Creation Tool,Invoice Type,Factura Tip
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Nota de Livrare
 DocType: Consultation,Encounter Impression,Întâlniți impresiile
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Costul de active vândute
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Course Scheduling Tool,Course Scheduling Tool,Instrument curs de programare
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Eroare la crearea %s recurente pentru %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
 DocType: Land Unit,LInked Analysis,Analiza analizată
 DocType: Item Tax,Tax Rate,Cota de impozitare
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Perioada de aplicare nu poate fi cuprinsă între două înregistrări de alocare
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Perioada de aplicare nu poate fi cuprinsă între două înregistrări de alocare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajatul {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Primit
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creați Grupurile de studenți
 DocType: Volunteer,Weekends,Weekend-uri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Nota de credit Notă
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Nota de credit Notă
 DocType: Setup Progress Action,Action Document,Document de acțiune
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Produse Finite
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Adăugați articole
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametru Inspecție de Calitate Articol
+DocType: Leave Application,Leave Approver Name,Lăsați Nume aprobator
 DocType: Depreciation Schedule,Schedule Date,Program Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Câștigurile, deducerile și alte componente salariale"
 DocType: Packed Item,Packed Item,Articol ambalate
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
 DocType: Healthcare Settings,Require Lab Test Approval,Necesita aprobarea laboratorului de test
 DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Total deosebit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Total deosebit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
 DocType: Dosage Strength,Strength,Putere
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Creați un nou client
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Cost Consumabile
 DocType: Purchase Receipt,Vehicle Date,Vehicul Data
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Motiv pentru pierdere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Motiv pentru pierdere
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Actualizați numărul contului
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Plumb Proprietarul nu poate fi aceeași ca de plumb
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Suma alocată poate nu este mai mare decât valoarea brută
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Celibatar
 DocType: Salary Slip,Total Loan Repayment,Rambursarea totală a creditului
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
-DocType: Subscription,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Va rugam sa introduceti Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Va rugam sa introduceti Cost Center
 DocType: Drug Prescription,Dosage,Dozare
 DocType: Journal Entry Account,Sales Order,Comandă de vânzări
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Rată de vânzare medie
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Rată de vânzare medie
 DocType: Assessment Plan,Examiner Name,Nume examinator
 DocType: Lab Test Template,No Result,Nici un rezultat
 DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Va rugam sa introduceti numele companiei în primul rând
 DocType: Purchase Invoice,Supplier Name,Furnizor Denumire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Citiți manualul ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Afișați frunzele tuturor membrilor departamentului în calendar
 DocType: Purchase Invoice,01-Sales Return,01-returnare vânzări
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,În așteptare comenzi de aprovizionare
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Domeniu obligatoriu - An universitar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nu este asociat cu {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Particulariza textul introductiv, care merge ca o parte din acel email. Fiecare tranzacție are un text introductiv separat."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Ați setat contul de plată implicit pentru compania {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Ați setat contul de plată implicit pentru compania {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Tranzacția nu este permisă împotriva comenzii de lucru oprita {0}
 DocType: Setup Progress Action,Min Doc Count,Numărul minim de documente
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atributul {0} este selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atributul {0} este selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervat pentru vânzare
 DocType: Packing Slip,From Package No.,Din Pachetul Nr.
 DocType: Item Attribute,To Range,La gama
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda de evaluare nu poate fi schimbată, deoarece există tranzacții împotriva anumitor elemente care nu au metoda de evaluare proprie"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Titluri de valoare și depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda de evaluare nu poate fi schimbată, deoarece există tranzacții împotriva anumitor elemente care nu au metoda de evaluare proprie"
 DocType: Student Report Generation Tool,Attended by Parents,Participat de părinți
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Patient,AB Positive,AB pozitiv
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Înregistrare prezenţă.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componenta de salarizare pentru salarizare bazate pe timesheet.
 DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
-DocType: Employee Loan,Total Payment,Plată totală
+DocType: Loan,Total Payment,Plată totală
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nu se poate anula tranzacția pentru comanda finalizată de lucru.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} este anulată, astfel încât acțiunea nu poate fi terminată"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piese de schimb suficient pentru a construi
 DocType: POS Profile User,POS Profile User,Utilizator de profil POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Venituri Directe
+DocType: Subscription Invoice,Subscription Invoice,Factura de abonament
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Venituri Directe
 DocType: Patient Appointment,Date TIme,Data TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Ofițer administrativ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Ofițer administrativ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Înființarea companiei și a taxelor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
 DocType: Codification Table,Codification Table,Tabelul de codificare
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Vă rugăm să selectați Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry Detail,Difference Account,Diferența de Cont
 DocType: Purchase Invoice,Supplier GSTIN,Furnizor GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Formatul de cartografiere a fluxului de numerar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
+DocType: Bank Guarantee,Providing,Furnizarea
 DocType: Account,Profit and Loss,Profit și pierdere
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nu este permisă, configurați Șablon de testare Lab așa cum este necesar"
 DocType: Patient,Risk Factors,Factori de risc
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
 DocType: Healthcare Settings,Appointment Confirmation,Confirmare programare
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),De închidere (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,buna
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Postul mutare
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Deja a fost setat implicit în profilul pos {0} pentru utilizatorul {1}, dezactivat în mod prestabilit"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valorile acumulate
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Teritoriul este necesar în POS Profile
 DocType: Supplier,Prevent RFQs,Preveniți RFQ-urile
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Realizeaza Comandă de Vânzări
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Plata salariului trimisă pentru perioada de la {0} la {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Plata salariului trimisă pentru perioada de la {0} la {1}
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Data livrării în cont
 DocType: Production Plan,Production Plan,Plan de productie
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Deschiderea Instrumentului de creare a facturilor
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Vânzări de returnare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Notă: Totalul frunzelor alocate {0} nu ar trebui să fie mai mică decât frunzele deja aprobate {1} pentru perioada
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Setați cantitatea din tranzacții pe baza numărului de intrare sir
 ,Total Stock Summary,Rezumatul total al stocului
 DocType: Announcement,Posted By,Postat de
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stabiliți compania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Stabiliți compania
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Training Result Employee,Training Result Employee,Angajat de formare Rezultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
-DocType: Repayment Schedule,Principal Amount,Suma principală
-DocType: Employee Loan Application,Total Payable Interest,Dobânda totală de plată
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Suma principală
+DocType: Loan Application,Total Payable Interest,Dobânda totală de plată
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Total excepție: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Vânzări factură Pontaj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervare la restaurant
 DocType: Land Unit,Land Unit Name,Numele unității de teren
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Propunere de scriere
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Propunere de scriere
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plată Deducerea intrare
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Înfășurați-vă
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Notificați clienții prin e-mail
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Notificați clienții prin e-mail
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un alt Sales Person {0} există cu același ID Angajat
 DocType: Employee Advance,Claimed Amount,Suma solicitată
 apps/erpnext/erpnext/config/education.py +180,Masters,Masterat
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Plata Gateway Cont nu a fost creată, vă rugăm să creați manual unul."
 DocType: Supplier Scorecard,Per Year,Pe an
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nu este eligibil pentru admiterea în acest program ca pe DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Sales Invoice,Sales Taxes and Charges,Taxele de vânzări și Taxe
 DocType: Employee,Organization Profile,Organizație de profil
 DocType: Vital Signs,Height (In Meter),Înălțime (în metri)
 DocType: Student,Sibling Details,Detalii sibling
 DocType: Vehicle Service,Vehicle Service,Serviciu de vehicule
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,declanșează automat cererea de feedback pe baza condițiilor.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,declanșează automat cererea de feedback pe baza condițiilor.
 DocType: Employee,Reason for Resignation,Motiv pentru demisie
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Șablon pentru evaluările de performanță.
 DocType: Sales Invoice,Credit Note Issued,Nota de credit Eliberat
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Program Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Apoi normelor privind prețurile sunt filtrate pe baza Customer, Client Group, Territory, furnizor, furnizor de tip, Campania, Vanzari Partener etc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Schimbarea net în inventar
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Managementul de împrumut Angajat
 DocType: Employee,Passport Number,Numărul de pașaport
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relația cu Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plata De la / la
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vă rugăm să configurați un cont în Warehouse {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Transfer de material
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Căutarea nu a putut fi găsită
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Deschidere (Dr)
+DocType: Loan,Applicant,Solicitant
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postarea trebuie să fie după {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Pentru a face documente recurente
 ,GST Itemised Purchase Register,GST Registrul achiziționărilor detaliate
 DocType: Course Scheduling Tool,Reschedule,reprograma
-DocType: Employee Loan,Total Interest Payable,Dobânda totală de plată
+DocType: Loan,Total Interest Payable,Dobânda totală de plată
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impozite cost debarcate și Taxe
 DocType: Work Order Operation,Actual Start Time,Timpul efectiv de începere
 DocType: BOM Operation,Operation Time,Funcționare Ora
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,finalizarea
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Baza
 DocType: Timesheet,Total Billed Hours,Numărul total de ore facturate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Scrie Off Suma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Scrie Off Suma
 DocType: Leave Block List Allow,Allow User,Permiteţi utilizator
 DocType: Journal Entry,Bill No,Factură nr.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cont câștig / Pierdere de eliminare a activelor
 DocType: Vehicle Log,Service Details,Detalii de serviciu
 DocType: Vehicle Log,Service Details,Detalii de serviciu
-DocType: Subscription,Quarterly,Trimestrial
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,grupate
 DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Fișa de timp
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materii Prime bazat pe
 DocType: Sales Invoice,Port Code,Codul portului
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervați depozitul
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervați depozitul
 DocType: Lead,Lead is an Organization,Plumbul este o organizație
 DocType: Guardian Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vânzări pre
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Conturi
 DocType: Vehicle,Odometer Value (Last),Valoarea contorului de parcurs (Ultimul)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Șabloane ale criteriilor privind tabloul de bord al furnizorului.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Plata Intrarea este deja creat
 DocType: Request for Quotation,Get Suppliers,Obțineți furnizori
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Previzualizare Salariu alunecare
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Previzualizare Salariu alunecare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Contul {0} a fost introdus de mai multe ori
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Puteți reînnoi numai dacă expirați în termen de 30 de zile
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Selectați numai dacă aveți setarea documentelor Mapper Flow Flow
 DocType: Email Digest,Next email will be sent on:,Următorul email va fi trimis la:
 DocType: Supplier Scorecard,Per Week,Pe saptamana
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Element are variante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Student total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptabile [FEC]
 DocType: Journal Entry,Credit Card Entry,Card de credit intrare
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Și evidența contabilă
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,în valoare
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,în valoare
 DocType: Asset Settings,Depreciation Options,Opțiunile de amortizare
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ora nevalidă a postării
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ora nevalidă a postării
 DocType: Lead,Campaign Name,Denumire campanie
 DocType: Hotel Room,Capacity,Capacitate
 DocType: Selling Settings,Close Opportunity After Days,Închide oportunitate După zile
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Budget,Budget Against,Buget împotriva
 DocType: Employee,Cell Number,Număr Celula
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nu există angajat pentru criteriile date. Verificați dacă salariile nu au fost deja create.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nu există angajat pentru criteriile date. Verificați dacă salariile nu au fost deja create.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Cereri materiale Auto Generat
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selectați un tabel
 DocType: BOM,Website Specifications,Site-ul Specificații
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} este o adresă de e-mail nevalidă în secțiunea &quot;Destinatari&quot;
 DocType: Special Test Items,Particulars,Particularități
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Asset,Maintenance,Mentenanţă
+DocType: Subscriber,Subscriber,Abonat
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Actualizați starea proiectului
 DocType: Item,Maximum sample quantity that can be retained,Cantitatea maximă de mostră care poate fi reținută
@@ -1077,26 +1073,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Setările implicite pentru Cosul de cumparaturi
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Adăugați Intervale de Timp
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Activ casate prin Jurnal de intrare {0}
-DocType: Employee Loan,Interest Income Account,Contul Interes Venit
+DocType: Loan,Interest Income Account,Contul Interes Venit
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Examinarea invitației trimisă
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Cheltuieli de întreținere birou
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Cheltuieli de întreținere birou
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Mergi la
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurarea contului de e-mail
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Va rugam sa introduceti Articol primul
 DocType: Asset Repair,Downtime,downtime
 DocType: Account,Liability,Răspundere
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Termen academic:
 DocType: Salary Detail,Do not include in total,Nu includeți în total
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Cantitatea de probe {0} nu poate fi mai mare decât cantitatea primită {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Lista de prețuri nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Request for Quotation Supplier,Send Email,Trimiteți-ne email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 DocType: Item,Max Sample Quantity,Cantitate maximă de probă
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nici o permisiune
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nici o permisiune
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Citat Solicitat
 DocType: Vital Signs,Heart Rate / Pulse,Ritm cardiac / puls
 DocType: Company,Default Bank Account,Cont Bancar Implicit
@@ -1107,12 +1103,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Teste de laborator și semne vitale
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nu a fost gasit angajat
-DocType: Subscription,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grupul de studenți este deja actualizat.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupul de studenți este deja actualizat.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Actualizarea proiectului.
 DocType: SMS Center,All Customer Contact,Toate contactele clienților
 DocType: Land Unit,Tree Details,copac Detalii
@@ -1162,7 +1157,6 @@
 DocType: Stock Entry,STE-,sterilizabile
 DocType: Upload Attendance,Import Attendance,Import Spectatori
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Toate grupurile articolului
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la transmiterea de tranzacțiilor.
 DocType: Work Order,Item To Manufacture,Articol pentru Fabricare
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} statusul este {2}
@@ -1176,7 +1170,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",Resetați dacă adresa editată este editată după salvare
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 DocType: Item,Hub Publishing Details,Detalii privind publicarea Hubului
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Deschiderea&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Deschiderea&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Deschideți To Do
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
 DocType: Lab Test Template,Result Format,Formatul rezultatelor
@@ -1186,7 +1180,7 @@
 DocType: Payroll Entry,Bimonthly,Bilunar
 DocType: Vehicle Service,Brake Pad,Pad de frână
 DocType: Fertilizer,Fertilizer Contents,Conținutul de îngrășăminte
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Cercetare & Dezvoltare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Cercetare & Dezvoltare
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Sumă pentru facturare
 DocType: Company,Registration Details,Detalii de înregistrare
 DocType: Timesheet,Total Billed Amount,Suma totală Billed
@@ -1200,7 +1194,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Treceți la verificarea limită de credit la Comandă de vânzări
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,De evaluare a performantei.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Dacă activați opțiunea &quot;Utilizare pentru Cos de cumparaturi &#39;, ca Cosul de cumparaturi este activat și trebuie să existe cel puțin o regulă fiscală pentru Cos de cumparaturi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Intrarea plată {0} este legată de comanda {1}, verificați dacă acesta ar trebui să fie tras ca avans în această factură."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Intrarea plată {0} este legată de comanda {1}, verificați dacă acesta ar trebui să fie tras ca avans în această factură."
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Punct de vânzare
@@ -1234,7 +1228,7 @@
 DocType: Restaurant Table,Minimum Seating,Scaunele minime
 DocType: Item Attribute,Item Attribute Values,Valori Postul Atribut
 DocType: Examination Result,Examination Result,examinarea Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Primirea de cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Maestru cursului de schimb valutar.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referință Doctype trebuie să fie una dintre {0}
@@ -1242,15 +1236,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Work Order,Plan material for sub-assemblies,Material Plan de subansambluri
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} trebuie să fie activ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Nu există elemente disponibile pentru transfer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Nu există elemente disponibile pentru transfer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Închidere (deschidere + total)
 DocType: Journal Entry,Depreciation Entry,amortizare intrare
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuleaza Vizite Material {0} înainte de a anula această Vizita de întreținere
 DocType: Crop Cycle,ISO 8016 standard,Standardul ISO 8016
 DocType: Pricing Rule,Rate or Discount,Tarif sau Discount
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cantitate ceruta
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favorite
 DocType: Hub Settings,Custom Data,Date personalizate
@@ -1262,9 +1256,9 @@
 DocType: Medical Code,Medical Code Standard,Codul medical standard
 DocType: Soil Texture,Clay Composition (%),Compoziția de lut (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Salvați înainte de atribuirea unei sarcini.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Valoarea bilanţului
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Valoarea bilanţului
 DocType: Lab Test,Lab Technician,Tehnician de laborator
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista de prețuri de vânzare
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Dacă este bifată, va fi creat un client, cartografiat pacientului. Facturile de pacienți vor fi create împotriva acestui Client. De asemenea, puteți selecta Clientul existent în timp ce creați pacientul."
 DocType: Bank Reconciliation,Account Currency,Moneda cont
@@ -1272,16 +1266,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Vă rugăm să menționați rotunji contul în companie
 DocType: Purchase Receipt,Range,Interval
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Fee Structure,Components,Componente
 DocType: Item Barcode,Item Barcode,Element de coduri de bare
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","pentru a fi generat. Dacă este întârziată, va trebui să schimbați manual câmpul &quot;Repetați pe Ziua lunii&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
 DocType: Share Transfer,From Folio No,Din Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
@@ -1316,16 +1308,17 @@
 DocType: Asset,Available-for-use Date,Data disponibilă pentru utilizare
 DocType: Guardian,Guardian Name,Nume tutore
 DocType: Cheque Print Template,Has Print Format,Are Format imprimare
-DocType: Employee Loan,Sanctioned,consacrat
+DocType: Loan,Sanctioned,consacrat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,este obligatorie. Poate înregistrarea de schimb valutar nu este creeatã pentru
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
 DocType: Crop Cycle,Crop Cycle,Ciclu de recoltare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pentru elementele &quot;produse Bundle&quot;, Warehouse, Serial No și lot nr vor fi luate în considerare de la &quot;ambalare List&quot; masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice &quot;Bundle produs&quot;, aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate &quot;de ambalare Lista&quot; masă."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pentru elementele &quot;produse Bundle&quot;, Warehouse, Serial No și lot nr vor fi luate în considerare de la &quot;ambalare List&quot; masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice &quot;Bundle produs&quot;, aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate &quot;de ambalare Lista&quot; masă."
 DocType: Student Admission,Publish on website,Publica pe site-ul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
+DocType: Subscription,Cancelation Date,Data de anulare
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
 DocType: Agriculture Task,Agriculture Task,Agricultura
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Venituri indirecte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Venituri indirecte
 DocType: Student Attendance Tool,Student Attendance Tool,Instrumentul de student Participarea
 DocType: Restaurant Menu,Price List (Auto created),Lista de prețuri (creată automat)
 DocType: Cheque Print Template,Date Settings,dată Setări
@@ -1352,6 +1345,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metru
 DocType: Workstation,Electricity Cost,Cost energie electrică
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Timpul de testare al laboratorului nu poate fi înainte de data de colectare
+DocType: Subscription Plan,Cost,Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
 DocType: Expense Claim,Total Advance Amount,Suma totală a avansului
 DocType: Delivery Stop,Estimated Arrival,Sosirea estimată
@@ -1363,15 +1357,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
 DocType: Timesheet Detail,Bill,Factură
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Data următoarei amortizări este introdusă ca dată trecută
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Alb
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rândul {0}: Cant nu este disponibil pentru {4} în depozit {1} în postarea momentul înscrierii ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Puteți selecta numai o singură opțiune din lista de casete de selectare.
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
 DocType: Item,Automatically Create New Batch,Creare automată Lot nou
 DocType: Item,Automatically Create New Batch,Creare automată a Lot nou
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Se atribuie {0} lui {1} (rândul {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Realizare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Se atribuie {0} lui {1} (rândul {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Realizare
 DocType: Student Admission,Admission Start Date,Data de începere a Admiterii
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Angajat nou
@@ -1387,7 +1381,7 @@
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 DocType: Repayment Schedule,Balance Loan Amount,Soldul Suma creditului
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Curs orar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Opțiuni pe acțiuni
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Opțiuni pe acțiuni
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Dezactivați preluarea ultimelor detalii de achiziție din comanda de aprovizionare
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Sigur doriți să restabiliți acest activ casate?
@@ -1406,11 +1400,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Bonul Articol
 DocType: Purchase Invoice,Cash/Bank Account,Numerar/Cont Bancar
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vă rugăm să specificați un {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Crearea de variante a fost în coada de așteptare.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Rezumatul lucrării pentru {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Tabelul atribut este obligatoriu
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Primul Aprobator de plecare din listă va fi setat ca implicit Permis de plecare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Plan,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nu poate fi negativ
 DocType: Training Event,Self-Study,Studiu individual
@@ -1423,7 +1418,7 @@
 DocType: Workstation,Wages,Salarizare
 DocType: Asset Maintenance,Maintenance Manager Name,Numele Managerului de întreținere
 DocType: Agriculture Task,Urgent,De urgență
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Vă rugăm să specificați un ID rând valabil pentru rând {0} în tabelul {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Vă rugăm să specificați un ID rând valabil pentru rând {0} în tabelul {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Imposibil de găsit variabila:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Selectați un câmp de editat din numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nu poate fi un element de activ fix, deoarece este creat un registru de stoc."
@@ -1435,7 +1430,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Numele de șablon de inspecție a calității
 DocType: Project,First Email,Primul e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Depozit rezervat în Comanda de Vânzări / Depozit Produse Finite
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Vanzarea Suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Vanzarea Suma
 DocType: Repayment Schedule,Interest Amount,Suma Dobânda
 DocType: Serial No,Creation Document No,Creare Document Nr.
 DocType: Share Transfer,Issue,Problema
@@ -1449,10 +1444,10 @@
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 ,Projected Quantity as Source,Cantitatea ca sursă proiectată
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Excursie la expediere
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Excursie la expediere
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tip de transfer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Cheltuieli de vânzare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Cheltuieli de vânzare
 DocType: Consultation,Diagnosis,Diagnostic
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Cumpararea Standard
 DocType: GL Entry,Against,Comparativ
@@ -1461,12 +1456,13 @@
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Cod postal
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Selectați contul de venituri din dobânzi în împrumut {0}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Efectuarea de stoc Entries
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
 DocType: Item,Default Supplier,Furnizor Implicit
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Peste producție Reduceri Procentaj
-DocType: Employee Loan,Repayment Schedule,rambursare Program
+DocType: Loan,Repayment Schedule,rambursare Program
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regula Condiții presetate
 DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
@@ -1481,7 +1477,7 @@
 DocType: Education Settings,Attendance Freeze Date,Data de înghețare a prezenței
 DocType: Education Settings,Attendance Freeze Date,Data de înghețare a prezenței
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Vezi toate produsele
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Vezi toate produsele
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Vârsta minimă de plumb (zile)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,toate BOM
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Camerele Hotel de tip {0} nu sunt disponibile în {1}
@@ -1489,14 +1485,16 @@
 DocType: Expense Claim,From Employee,Din Angajat
 DocType: Driver,Cellphone Number,număr de telefon
 DocType: Project,Monitor Progress,Monitorizați progresul
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
 DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
+DocType: Supplier Quotation,Auto Repeat Section,Se repetă secțiunea Auto
 DocType: Upload Attendance,Attendance From Date,Prezenţa de la data
 DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atribut nevalid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Cantitatea trebuie sa fie mai mic sau egal cu {0}
+DocType: Department Approver,Department Approver,Departamentul Aprobare
 DocType: SMS Center,Total Characters,Total de caractere
 DocType: Employee Advance,Claimed,Revendicat
 DocType: Crop,Row Spacing,Spațierea rândului
@@ -1506,6 +1504,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconcilierea plata facturii
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Contribuția%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","În conformitate cu Setările de cumpărare dacă comanda de aprovizionare este obligatorie == &#39;YES&#39;, atunci pentru a crea factura de cumpărare, utilizatorul trebuie să creeze mai întâi comanda de aprovizionare pentru elementul {0}"
+,HSN-wise-summary of outward supplies,Rezumatul HSN pentru rezervele exterioare
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numerele de înregistrare companie pentru referință. Numerele fiscale etc
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
@@ -1519,7 +1518,7 @@
 DocType: Setup Progress Action,Action Name,Numele acțiunii
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Anul de începere
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Primele 2 cifre ale GSTIN ar trebui să se potrivească cu numărul de stat {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Data perioadei de factura de curent începem
 DocType: Salary Slip,Leave Without Pay,Concediu Fără Plată
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Capacitate de eroare de planificare
@@ -1537,26 +1536,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Câmpurile vor fi copiate numai în momentul creării.
 DocType: Setup Progress Action,Domains,Domenii
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Management
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Management
 DocType: Cheque Print Template,Payer Settings,Setări plătitorilor
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
 DocType: Purchase Invoice,Is Return,Este de returnare
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Prudență
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Ziua de început este mai mare decât ziua de sfârșit în sarcina &quot;{0}&quot;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Returnare / debit Notă
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Returnare / debit Notă
 DocType: Price List Country,Price List Country,Lista de preturi Țară
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Factorul de conversie UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vă rugăm să introduceți codul de articol pentru a obține numărul de lot
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
-DocType: Employee Loan,Partially Disbursed,parţial Se eliberează
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Acordați informații.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Acordați informații.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza de date furnizor.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Nu puteți reporni o abonament care nu este anulat.
 DocType: Account,Balance Sheet,Bilant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
 DocType: Fee Validity,Valid Till,Valabil până la
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Întâlnire între profesorii de părinți
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
@@ -1569,7 +1568,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Schimbarea Grupului de Clienți pentru Clientul selectat nu este permisă.
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Actualizând orele de sosire estimate.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualizând orele de sosire estimate.
 DocType: Program Enrollment Tool,Enrollment Details,Detalii de înscriere
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Selectați un client
@@ -1590,18 +1589,20 @@
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Purchase Order,Group same items,Același grup de elemente
 DocType: Purchase Invoice,Disable Rounded Total,Dezactivati Totalul Rotunjit
-DocType: Employee Loan Application,Repayment Info,Info rambursarea
+DocType: Department,Parent Department,Departamentul părinților
+DocType: Loan Application,Repayment Info,Info rambursarea
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Intrările' nu pot fi vide
 DocType: Maintenance Team Member,Maintenance Role,Rolul de întreținere
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Configurarea angajati
 DocType: Sales Order,SO-,ASA DE-
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilizator rezervare hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Vă rugăm să selectați prefix întâi
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Cercetare
+DocType: Subscription Settings,Subscription Settings,Setările pentru abonament
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Cercetare
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Vă rugăm să specificați cel puțin un atribut în tabelul Atribute
 DocType: Announcement,All Students,toţi elevii
@@ -1612,19 +1613,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 DocType: Crop Cycle,Less than a year,Mai putin de un an
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Elev mobil Nr
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 DocType: Crop,Yield UOM,Randamentul UOM
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
 DocType: Item,Is Item from Hub,Este element din Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rândul {0}: Activitatea de tip este obligatorie.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendele plătite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendele plătite
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registru Jurnal
 DocType: Stock Reconciliation,Difference Amount,Diferența Suma
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} în Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,Taxare inversă
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Venituri Reținute
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Venituri Reținute
 DocType: Purchase Invoice,05-Change in POS,05 - Schimbarea în POS
 DocType: Vehicle Log,Service Detail,Detaliu serviciu
 DocType: BOM,Item Description,Descriere Articol
@@ -1639,12 +1640,12 @@
 DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
 ,Student and Guardian Contact Details,Student și Guardian Detalii de contact
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Rândul {0}: furnizor {0} Adresa de e-mail este necesară pentru a trimite e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Deschiderea temporară
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Deschiderea temporară
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Vizualizați centrul
 ,Employee Leave Balance,Bilant Concediu Angajat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 DocType: Patient Appointment,More Info,Mai multe informatii
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
 DocType: Supplier Scorecard,Scorecard Actions,Caracteristicile Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Exemplu: Master în Informatică
 DocType: Purchase Invoice,Rejected Warehouse,Depozit Respins
@@ -1654,7 +1655,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,la
 DocType: Supplier Quotation Item,Lead Time in days,Timp de plumb în zile
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Rezumat conturi pentru plăți
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita Contul {0} blocat
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
@@ -1665,9 +1666,10 @@
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} din solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} în solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Mic
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Mic
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Deschiderea elementului instrumentului de creare a facturilor
 DocType: Education Settings,Employee Number,Numar angajat
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Anulați factura după perioada de grație
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
 DocType: Project,% Completed,% Finalizat
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
@@ -1681,7 +1683,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Timp de testare a laboratorului
 DocType: Email Digest,Add Quote,Adaugați citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Cheltuieli indirecte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
 DocType: Agriculture Analysis Criteria,Agriculture,Agricultură
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sincronizare Date
@@ -1711,16 +1713,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Echipamente de Capital
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Vă rugăm să setați mai întâi Codul elementului
 DocType: Item,ITEM-,ARTICOL-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
+DocType: Subscription Plan,Billing Interval Count,Intervalul de facturare
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 DocType: Antibiotic,Antibiotic,Antibiotic
 ,Team Updates,echipa Actualizări
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Pentru furnizor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Creați Format imprimare
@@ -1746,7 +1749,7 @@
 DocType: POS Item Group,POS Item Group,POS Articol Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Elementul alternativ nu trebuie să fie identic cu cel al articolului
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Finalizarea evaluării provizorii
 DocType: Salary Slip,Bank Account No.,Cont bancar nr.
@@ -1763,7 +1766,7 @@
 DocType: BOM Operation,Workstation,Stație de lucru
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Furnizor Cerere de Ofertă
 DocType: Healthcare Settings,Registration Message,Mesaj de înregistrare
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Dozaj de prescripție
 DocType: Attendance,HR Manager,Manager Resurse Umane
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vă rugăm să selectați o companie
@@ -1794,7 +1797,7 @@
 DocType: Project,Start and End Dates,Începere și de încheiere Date
 ,Delivered Items To Be Billed,Produse Livrate Pentru a fi Facturate
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Deschideți BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
 DocType: Authorization Rule,Average Discount,Discount mediiu
 DocType: Project Update,Great/Quickly,Marele / rapid
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1803,8 +1806,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Selectați loturile pentru elementul vărsat
 DocType: Asset,Depreciation Schedules,Orarele de amortizare
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Următoarele conturi ar putea fi selectate în Setări GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Următoarele conturi ar putea fi selectate în Setări GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
 DocType: Payment Request,Transaction Currency,Operațiuni valutare
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},De la {0} | {1} {2}
@@ -1815,6 +1818,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Ieșire zilnică medie
 DocType: POS Profile,Campaign,Campanie
 DocType: Supplier,Name and Type,Numele și tipul
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
 DocType: Physician,Contacts and Address,Contacte și adresă
 DocType: Purchase Invoice,Contact Person,Persoană de contact
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Data de început preconizatã' nu poate fi dupa data 'Data de sfârșit anticipatã'
@@ -1828,19 +1832,20 @@
 DocType: Student Admission,Eligibility and Details,Eligibilitate și detalii
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Schimbarea net în active fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Accesul din portal la Cererea de Oferta este dezactivat, verificați setările portalului."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorul variabil al scorului de performanță al furnizorului
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Suma de Cumpărare
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Suma de Cumpărare
 DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Au apărut erori la crearea programului de curs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Primul deținător de cheltuieli din listă va fi setat ca implicit pentru Exportare de cheltuieli.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nu poate fi mai mare de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Detail,Depends on Leave Without Pay,Depinde de concediu fără plată
@@ -1861,15 +1866,16 @@
 DocType: Package Code,Package Code,Cod pachet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Începător
 DocType: Purchase Invoice,Company GSTIN,Compania GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Nu este permisă cantitate negativă
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Nu este permisă cantitate negativă
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Taxa detaliu tabel preluat de la maestru articol ca un șir și stocate în acest domeniu.
  Folosit pentru Impozite și Taxe"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Angajat nu pot raporta la sine.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Intrarea contabila pentru {0}: {1} se poate face numai în valuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Concedierea obligatorie la cerere
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
@@ -1897,15 +1903,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"Termenul de plată la rândul {0} este, eventual, un duplicat."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Agricultura (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Slip de ambalare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Birou inchiriat
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Slip de ambalare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Birou inchiriat
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 DocType: Disease,Common Name,Denumirea comună
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import a eșuat!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Nici o adresă adăugată încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
 DocType: Vital Signs,Blood Pressure,Tensiune arteriala
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Item,Sales Details,Detalii vânzări
 DocType: Quality Inspection,QI-,QI-
@@ -1915,15 +1921,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validați cursul înscris pentru elevii din grupul de studenți
 DocType: Notification Control,Expense Claim Rejected,Revendicare Cheltuieli Respinsa
 DocType: Item,Item Attribute,Postul Atribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Guvern
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Guvern
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Cheltuiala Revendicarea {0} există deja pentru vehicul Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Numele Institutului
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Vă rugăm să introduceți Suma de rambursare
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Vă rugăm să introduceți Suma de rambursare
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variante Postul
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Servicii
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Salariu Slip angajatului
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Selectați Posibil furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Selectați Posibil furnizor
 DocType: Sales Invoice,Source,Sursă
 DocType: Customer,"Select, to make the customer searchable with these fields","Selectați, pentru a face ca clientul să poată fi căutat în aceste câmpuri"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afișează închis
@@ -1940,7 +1946,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Cash Flow de la Investiții
 DocType: Program Course,Program Course,Curs Program
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline pentru pagina de start site
 DocType: Item Group,Item Group Name,Denumire Grup Articol
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate
@@ -1970,10 +1976,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Detalii de membru
 DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Introduceți toate rezultatele valorii necesare
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Rezumat conturi de încasare
-DocType: Employee Loan,Monthly Repayment Amount,Suma de rambursare lunar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Rezumat conturi de încasare
+DocType: Loan,Monthly Repayment Amount,Suma de rambursare lunar
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Deschiderea facturilor
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
 DocType: UOM,UOM Name,Numele UOM
 DocType: GST HSN Code,HSN Code,Codul HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Contribuția Suma
@@ -1995,7 +2001,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Utilizatorul {0} este deja alocat medicului {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Cutie
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,posibil furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,posibil furnizor
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Distributie lunar
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receptor Lista goala. Vă rugăm să creați Receiver Lista
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Servicii medicale (beta)
@@ -2024,7 +2031,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Nu sunt produse în ambalaj
 DocType: Shipping Rule Condition,From Value,Din Valoare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
-DocType: Employee Loan,Repayment Method,Metoda de rambursare
+DocType: Loan,Repayment Method,Metoda de rambursare
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Dacă este bifată, pagina de pornire va fi implicit postul Grupului pentru site-ul web"
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Cererile pentru cheltuieli companie.
@@ -2033,7 +2040,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certificat necesar
 DocType: Company,Default Holiday List,Implicit Listă de vacanță
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rândul {0}: De la timp și Ora {1} se suprapune cu {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Pasive stoc
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Pasive stoc
 DocType: Purchase Invoice,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Selectați Companie
@@ -2041,7 +2048,7 @@
 DocType: Student Report Generation Tool,Print Section,Imprimare secțiune
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Utilizatorul {0} nu are niciun POS profil implicit. Verificați implicit la Rând {1} pentru acest Utilizator.
 DocType: Student Group,Set 0 for no limit,0 pentru a seta nici o limită
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,"Pentru a crea Facturile de deschidere {invoice_type}, este necesar {{idx}: {field}"
 DocType: Customer,Primary Address and Contact Detail,Adresa principală și detaliile de contact
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Retrimiteți e-mail-ul de plată
@@ -2052,10 +2059,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Selectați cel puțin un domeniu.
 DocType: Dependent Task,Dependent Task,Sarcina dependent
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
 DocType: SMS Center,Receiver List,Receptor Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,căutare articol
 DocType: Payment Schedule,Payment Amount,Plata Suma
@@ -2065,7 +2072,7 @@
 DocType: Assessment Plan,Grading Scale,Scala de notare
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,deja finalizat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stoc în mână
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stoc în mână
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importa cu succes!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Cerere de plată există deja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
@@ -2076,17 +2083,16 @@
 DocType: Quotation Item,Quotation Item,Citat Articol
 DocType: Customer,Customer POS Id,ID POS utilizator
 DocType: Account,Account Name,Numele Contului
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial Nu {0} {1} cantitate nu poate fi o fracțiune
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial Nu {0} {1} cantitate nu poate fi o fracțiune
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Introduceți adresa URL a serverului Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizor de tip maestru.
 DocType: Purchase Order Item,Supplier Part Number,Furnizor Număr
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
 DocType: Share Balance,To No,Pentru a Nu
-DocType: Subscription,Reference Document,Documentul de referință
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} este anulată sau oprită
 DocType: Accounts Settings,Credit Controller,Controler de Credit
-DocType: Grant Application,Applicant Type,Tipul solicitantului
+DocType: Loan,Applicant Type,Tipul solicitantului
 DocType: Purchase Invoice,03-Deficiency in services,03 - Deficiență în servicii
 DocType: Delivery Note,Vehicle Dispatch Date,Dispeceratul vehicul Data
 DocType: Healthcare Settings,Default Medical Code Standard,Standardul medical standard standard
@@ -2097,13 +2103,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Facturat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Cant. rezervata
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Resurse umane
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Resurse umane
 DocType: Lead,Upper Income,Venituri de sus
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Respinge
 DocType: Journal Entry Account,Debit in Company Currency,Debit în companie valutar
 DocType: BOM Item,BOM Item,Articol BOM
 DocType: Appraisal,For Employee,Pentru Angajat
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Asigurați-debursare de intrare
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Asigurați-debursare de intrare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance împotriva Furnizor trebuie să fie de debit
 DocType: Company,Default Values,Valori implicite
 DocType: Membership,INR,INR
@@ -2133,10 +2139,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} trebuie să fie mai mare decât 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stoc disponibil
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stoc disponibil
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificarea capacitate de (zile)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,achiziții publice
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Câmp obligatoriu - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Câmp obligatoriu - Program
 DocType: Special Test Template,Result Component,Componenta Rezultat
@@ -2157,7 +2163,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Includ zilele de sărbătoare în frunze ca frunze
 DocType: Sales Invoice,Packed Items,Articole pachet
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantie revendicarea împotriva Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activați cosul de cumparaturi
 DocType: Employee,Permanent Address,Permanent Adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2175,10 +2181,10 @@
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Confirmați acțiunea
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Licitatii Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Împlinire
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Vizualizare Coș
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Cheltuieli de marketing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Nu se pot crea criterii standard. Renunțați la criterii
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
@@ -2201,9 +2207,9 @@
 DocType: Upload Attendance,Get Template,Obține șablon
 DocType: Material Request,Transferred,transferat
 DocType: Vehicle,Doors,Usi
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Colectați taxa pentru înregistrarea pacientului
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nu se poate modifica atributele după tranzacția de stoc. Creați un element nou și transferați stocul la noul element
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nu se poate modifica atributele după tranzacția de stoc. Creați un element nou și transferați stocul la noul element
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Descărcarea de impozite
 DocType: Packing Slip,PS-,PS-
@@ -2239,12 +2245,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Purchase Invoice Item,Batch No,Lot nr.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Avansuri ale angajaților
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 DocType: Grant Application,Assessment  Mark (Out of 10),Marca de evaluare (din 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobil nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
@@ -2253,15 +2260,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Email Digest,Annual Expenses,Cheltuielile anuale
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Suma alocată
 DocType: Sales Team,Contribution to Net Total,Contribuție la Total Net
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
 DocType: Territory,Territory Name,Teritoriului Denumire
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Puteți avea numai planuri cu același ciclu de facturare într-un abonament
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitant pentru un loc de muncă.
 DocType: Purchase Order Item,Warehouse and Reference,Depozit și referință
 DocType: Supplier,Statutory info and other general information about your Supplier,Info statutar și alte informații generale despre dvs. de Furnizor
@@ -2272,10 +2280,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Cotatie
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Evenimente de instruire
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Track Leads by Lead Source.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Te rog intra
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Te rog intra
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Meniu de întreținere
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Greutatea netă a acestui pachet. (Calculat automat ca suma de greutate netă de produs)
@@ -2283,11 +2291,11 @@
 DocType: Sales Order,To Deliver and Bill,Pentru a livra și Bill
 DocType: Student Group,Instructors,instructorii
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Gestiune partajare
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Plată
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Plată
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} nu este conectat la niciun cont, menționați contul din înregistrarea din depozit sau setați contul de inventar implicit din compania {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gestionați comenzile
 DocType: Work Order Operation,Actual Time and Cost,Timp și cost efective
@@ -2297,7 +2305,7 @@
 DocType: Student Leave Application,Student Leave Application,Aplicație elev Concediul
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Activul nu poate fi anulat, deoarece este deja {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pornit
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Set de articole în momemntul vânzării.
@@ -2307,7 +2315,7 @@
 DocType: Item,Barcodes,Coduri de bare
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Asociaţi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Asociaţi
 DocType: Asset Movement,Asset Movement,Mișcarea activelor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Ordinul de lucru {0} trebuie trimis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Coș nou
@@ -2325,13 +2333,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,"Valuta de facturare trebuie să fie egală fie cu valuta implicită a companiei, fie cu moneda contului de partid"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 DocType: Soil Texture,Loam,Lut
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rând {0}: data de scadență nu poate fi înainte de data postării
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rând {0}: data de scadență nu poate fi înainte de data postării
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Realizeaza Intrare de Plati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
 ,Sales Invoice Trends,Vânzări Tendințe factură
 DocType: Leave Application,Apply / Approve Leaves,Aplicați / aprobaţi concedii
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pentru
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Se poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Se poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
 DocType: Sales Order Item,Delivery Warehouse,Depozit de livrare
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Tree of centre de cost financiare.
 DocType: Serial No,Delivery Document No,Nr. de document de Livrare
@@ -2345,7 +2352,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Consumul de materiale nu este setat în Setări de fabricare.
 DocType: Student,Student Mobile Number,Elev Număr mobil
 DocType: Item,Has Variants,Are variante
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nu puteți suprascrie pentru articolul {0} pe rândul {1} mai mult de {2}. Pentru a permite facturarea excesivă, vă rugăm să setați Setări stoc"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nu puteți suprascrie pentru articolul {0} pe rândul {1} mai mult de {2}. Pentru a permite facturarea excesivă, vă rugăm să setați Setări stoc"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualizați răspunsul
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
@@ -2357,12 +2364,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Selectați mai întâi programul
 DocType: Patient Appointment,Patient Age,Vârsta pacientului
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Managementul Proiectelor
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Numărul serial {0} nu a fost deja returnat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Numărul serial {0} nu a fost deja returnat
 DocType: Supplier,Supplier of Goods or Services.,Furnizor de bunuri sau servicii.
 DocType: Budget,Fiscal Year,An Fiscal
 DocType: Asset Maintenance Log,Planned,Planificat
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Conturi implicite de încasat pentru a fi utilizate dacă nu sunt stabilite în pacient pentru a rezerva taxele de consultare.
 DocType: Vehicle Log,Fuel Price,Preț de combustibil
+DocType: Bank Guarantee,Margin Money,Marja de bani
 DocType: Budget,Budget,Buget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Setați Deschideți
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
@@ -2376,16 +2384,16 @@
 DocType: Lead,Follow Up,Urmare
 DocType: Item,Is Sales Item,Este produs de vânzări
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ramificatie Grup Articole
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
 DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
 ,Amount to Deliver,Cntitate de livrat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Același element a fost introdus de mai multe ori. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Start Termen Data nu poate fi mai devreme decât data Anul de începere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Au fost erori.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Angajatul {0} a solicitat deja {1} între {2} și {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Au fost erori.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Angajatul {0} a solicitat deja {1} între {2} și {3}:
 DocType: Guardian,Guardian Interests,Guardian Interese
 DocType: Naming Series,Current Value,Valoare curenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
 DocType: Education Settings,Instructor Records to be created by,Instructor de înregistrări care urmează să fie create de către
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: GST Account,GST Account,Contul GST
@@ -2404,8 +2412,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Adăugat la Favorite
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nu s-a găsit nicio corespondență salarială pentru criteriile de mai sus sau salariul deja trimis
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Impozite și taxe
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nu s-a găsit nicio corespondență salarială pentru criteriile de mai sus sau salariul deja trimis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Impozite și taxe
 DocType: Projects Settings,Projects Settings,Setări pentru proiecte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vă rugăm să introduceți data de referință
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
@@ -2415,27 +2423,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arborele de Postul grupuri.
 DocType: Production Plan,Total Produced Qty,Cantitate total produsă
 DocType: Payroll Entry,Get Employee Details,Obțineți detalii despre angajați
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
 DocType: Asset,Sold,Vândut
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
 DocType: Account,Frozen,Blocat
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Suma de bază (Companie Moneda)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Materie prima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Materie prima
 DocType: Payment Reconciliation Payment,Reference Row,rândul de referință
 DocType: Installation Note,Installation Time,Timp de instalare
 DocType: Sales Invoice,Accounting Details,Detalii Contabilitate
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
 DocType: Patient,O Positive,O pozitiv
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investiții
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocări
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteriile de receptie
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Nu sunt disponibile rambursări pentru înscrierea în Jurnal
 DocType: Item Attribute,Attribute Name,Denumire atribut
 DocType: BOM,Show In Website,Arata pe site-ul
 DocType: Shopping Cart Settings,Show Quantity in Website,Arată Cantitatea în site-ul
-DocType: Employee Loan Application,Total Payable Amount,Suma totală de plată
+DocType: Loan Application,Total Payable Amount,Suma totală de plată
 DocType: Task,Expected Time (in hours),Timp de așteptat (în ore)
 DocType: Item Reorder,Check in (group),Check-in (grup)
 DocType: Soil Texture,Silt,Nămol
@@ -2454,7 +2463,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Plateste
 DocType: Room,Room Name,Numele camerei
 DocType: Prescription Duration,Prescription Duration,Durata prescrierii
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adrese de clienți și Contacte
 ,Campaign Efficiency,Eficiența campaniei
@@ -2474,11 +2483,11 @@
 DocType: Chapter,Chapter,Capitol
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pereche
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Contul implicit va fi actualizat automat în factură POS când este selectat acest mod.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
 DocType: Asset,Depreciation Schedule,Program de amortizare
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adrese de parteneri de vânzări și contacte
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Jumătate Data zi ar trebui să fie între De la data si pana in prezent
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Jumătate Data zi ar trebui să fie între De la data si pana in prezent
 DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Alegeți Centrul de cost implicit în compania {0}.
 DocType: Item,Has Batch No,Are nr. de Lot
@@ -2496,7 +2505,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Data de încheiere efectivă (prin Pontaj)
 DocType: Soil Texture,Soil Type,Tipul de sol
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Mesaj nou
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2516,7 +2524,7 @@
 DocType: Hub Category,Hub Category,Categorie Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
-DocType: Employee Loan,Loan Amount,Sumă împrumutată
+DocType: Loan,Loan Amount,Sumă împrumutată
 DocType: Student Report Generation Tool,Add Letterhead,Adăugați antetul
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicul cu autovehicul
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Graficul Scorecard pentru furnizori
@@ -2545,9 +2553,9 @@
 DocType: Cash Flow Mapper,Position,Poziţie
 DocType: Patient,Patient Details,Detalii pacient
 DocType: Patient,B Positive,B pozitiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abr. nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abr. nu poate fi gol sau spațiu
 DocType: Patient Medical Record,Patient Medical Record,Dosarul medical al pacientului
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup non-grup
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2555,8 +2563,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Raport real
 DocType: Lab Test UOM,Test UOM,Testați UOM
 DocType: Student Siblings,Student Siblings,Siblings Student
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detaliile planului de abonament
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unitate
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Vă rugăm să specificați companiei
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Vă rugăm să specificați companiei
 ,Customer Acquisition and Loyalty,Achiziționare și Loialitate Client
 DocType: Asset Maintenance Task,Maintenance Task,Activitate de întreținere
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Setați limita B2C în setările GST.
@@ -2571,6 +2580,7 @@
 ,BOM Search,BOM Căutare
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Costul total al materialelor consumate (prin intrarea în stoc)
 DocType: Hub Settings,Company Registered,Compania înregistrată
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Data nu poate fi mai mică decât Din data
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Publicați &quot;În stoc&quot; sau &quot;Nu este în stoc&quot; pe Hub, pe baza stocurilor disponibile în acest depozit."
 DocType: Vehicle,Fuel Type,Tipul combustibilului
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vă rugăm să specificați în valută companie
@@ -2578,17 +2588,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ca urmare a solicitărilor de materiale au fost ridicate în mod automat în funcție de nivelul de re-comanda item
 DocType: Email Digest,Pending Sales Orders,Comenzile de vânzări în așteptare
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Valuta contului trebuie să fie {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Valuta contului trebuie să fie {1}
 DocType: Employee,Create User Permission,Creați permisiunea utilizatorului
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Healthcare Settings,Remind Before,Amintește-te înainte
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
 DocType: Salary Component,Deduction,Deducere
 DocType: Item,Retain Sample,Păstrați eșantionul
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rândul {0}: De la timp și de Ora este obligatorie.
 DocType: Stock Reconciliation Item,Amount Difference,suma diferenţă
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vă rugăm să introduceți ID-ul de angajat al acestei persoane de vânzări
 DocType: Territory,Classification of Customers by region,Clasificarea clienți în funcție de regiune
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,In productie
@@ -2598,8 +2609,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat Bank echilibru Declaratie
 DocType: Normal Test Template,Normal Test Template,Șablonul de test normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizator dezactivat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Citat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nu se poate seta un RFQ primit la nici o cotatie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nu se poate seta un RFQ primit la nici o cotatie
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total de deducere
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Selectați un cont pentru a imprima în moneda contului
@@ -2607,7 +2618,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui pacient. Consultați linia temporală de mai jos pentru detalii
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Cost actualizat
 DocType: Patient,Date of Birth,Data Nașterii
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Articolul {0} a fost deja returnat
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Setarea Scorecard pentru furnizori
@@ -2618,14 +2629,15 @@
 DocType: Work Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Descrierea postului
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Descrierea postului
 DocType: Student Applicant,Applied,Aplicat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-deschide
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-deschide
 DocType: Sales Invoice Item,Qty as per Stock UOM,Cantitate conform Stock UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nume Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Reducere după vânzare
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment."
+DocType: Department Approver,Approver,Aprobator
 ,SO Qty,SO Cantitate
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Câmpul către acționar nu poate fi necompletat
 DocType: Guardian,Work Address,Adresa de
@@ -2639,21 +2651,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Suma totală alocată (Companie Moneda)
 DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
 DocType: BOM,Scrap Material Cost,Cost resturi de materiale
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
 DocType: Grant Application,Email Notification Sent,Trimiterea notificării prin e-mail
 DocType: Purchase Invoice,In Words (Company Currency),În cuvinte (Compania valutar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Codul articolului, depozitul, cantitatea necesară pe rând"
-DocType: Pricing Rule,Supplier,Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Codul articolului, depozitul, cantitatea necesară pe rând"
+DocType: Bank Guarantee,Supplier,Furnizor
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Afișați detaliile de plată
 DocType: Consultation,Consultation Time,Timpul de consultare
 DocType: C-Form,Quarter,Trimestru
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Cheltuieli diverse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Cheltuieli diverse
 DocType: Global Defaults,Default Company,Companie Implicita
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
 DocType: Payment Request,PR,relatii cu publicul
 DocType: Cheque Print Template,Bank Name,Denumire bancă
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,de mai sus
-DocType: Employee Loan,Employee Loan Account,Contul de împrumut Angajat
 DocType: Leave Application,Total Leave Days,Total de zile de concediu
 DocType: Email Digest,Note: Email will not be sent to disabled users,Notă: Adresa de email nu va fi trimis la utilizatorii cu handicap
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numărul interacțiunii
@@ -2668,7 +2679,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Greutate (în kilograme)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",capitole / nume_capitale lasă setul automat să fie setat automat după salvarea capitolului.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Vă rugăm să setați Conturi GST în Setări GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Vă rugăm să setați Conturi GST în Setări GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Tip de afacere
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Costul de achiziție nouă
@@ -2677,12 +2688,13 @@
 DocType: Grant Application,Grant Description,Descrierea granturilor
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
 DocType: Student Guardian,Others,Altel
+DocType: Subscription,Discounts,reduceri
 DocType: Payment Entry,Unallocated Amount,Suma nealocată
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nu există mai multe actualizări
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Aceasta acoperă toate tabelele de scoruri legate de această configurație
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Postul copil nu ar trebui să fie un pachet de produse. Vă rugăm să eliminați elementul `{0}` și de a salva
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bancar
@@ -2691,21 +2703,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Grading Scale,Grading Scale Intervals,Intervale de notare Scala
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Profitul anului
+DocType: Bank Guarantee,Name of Bank,Numele băncii
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Intrarea contabila {2} poate fi făcută numai în moneda: {3}
 DocType: Fee Schedule,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Arborescentă conturilor financiare.
+DocType: Bank Guarantee,Reference Document Type,Referință Document Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Fluxul de numerar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventarul serializat
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mailul nu a fost găsit în contactul implicit
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generați secret
-DocType: Employee Loan,Account Info,Informaţii cont
+DocType: Loan,Account Info,Informaţii cont
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
 DocType: Fees,Include Payment,Includeți plata
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grupurile de elevi au fost create.
@@ -2713,24 +2728,24 @@
 DocType: Sales Invoice,Total Billing Amount,Suma totală de facturare
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programul din structura taxelor și grupul de studenți {0} este diferit.
 DocType: Fee Schedule,Receivable Account,Contul de încasat
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
 DocType: Quotation Item,Stock Balance,Stoc Sold
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Comanda de vânzări la plată
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Cu plata impozitului
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE PENTRU FURNIZOR
 DocType: Land Unit,Is Container,Este Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Aceasta va fi prima zi a ciclului de cultură
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Vă rugăm să selectați contul corect
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Vă rugăm să selectați contul corect
 DocType: Purchase Invoice Item,Weight UOM,Greutate UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lista Acționarilor disponibili cu numere folio
 DocType: Salary Structure Employee,Salary Structure Employee,Structura de salarizare Angajat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Afișați atribute variate
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Afișați atribute variate
 DocType: Student,Blood Group,Grupă de sânge
 DocType: Course,Course Name,Numele cursului
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Echipamente de birou
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Echipamente de birou
 DocType: Purchase Invoice Item,Qty,Cantitate
 DocType: Fiscal Year,Companies,Companii
 DocType: Supplier Scorecard,Scoring Setup,Punctul de configurare
@@ -2749,7 +2764,7 @@
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Pentru debit este necesar
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Cumparare Lista de preturi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Șabloane ale variabilelor pentru scorurile pentru furnizori.
 DocType: Job Offer Term,Offer Term,Termen oferta
 DocType: Asset,Quality Manager,Manager de calitate
@@ -2761,13 +2776,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Neremunerat totală: {0}
 DocType: BOM Website Operation,BOM Website Operation,Site-ul BOM Funcționare
 DocType: Supplier Scorecard,Supplier Score,Scorul furnizorului
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Totală facturată Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Totală facturată Amt
 DocType: Supplier,Warn RFQs,Aflați RFQ-urile
 DocType: BOM,Conversion Rate,Rata de conversie
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cauta produse
 DocType: Assessment Plan,To Time,La timp
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
+DocType: Loan,Total Amount Paid,Suma totală plătită
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Selectați admiterea studenților care este obligatorie pentru solicitantul studenților plătiți
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Selectați o listă de prețuri pentru a publica prețurile
@@ -2777,19 +2793,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rândul {0}: Completat Cant nu poate fi mai mare de {1} pentru funcționare {2}
 DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Articolul {0} cu elementul serializat nu poate fi actualizat utilizând Reconcilierea stocurilor, vă rugăm să utilizați înregistrarea stocului"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Articolul {0} cu elementul serializat nu poate fi actualizat utilizând Reconcilierea stocurilor, vă rugăm să utilizați înregistrarea stocului"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Articolul {0} cu elementul serializat nu poate fi actualizat utilizând Reconcilierea stocurilor, vă rugăm să utilizați înregistrarea stocului"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Articolul {0} cu elementul serializat nu poate fi actualizat utilizând Reconcilierea stocurilor, vă rugăm să utilizați înregistrarea stocului"
 DocType: Training Event Employee,Training Event Employee,Eveniment de formare Angajat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Probele maxime - {0} pot fi păstrate pentru lotul {1} și articolul {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Adăugați intervale de timp
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
 DocType: Training Event,Advance,Avans
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pentru a face din nou recurente.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Setările gateway-ului de plată GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Schimb de câștig / Pierdere
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Schimb de câștig / Pierdere
 DocType: Opportunity,Lost Reason,Motiv Pierdere
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rândul # {0}: Contul {1} nu aparține companiei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rândul # {0}: Contul {1} nu aparține companiei {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nu se poate găsi DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
@@ -2808,7 +2823,6 @@
 DocType: Bin,Actual Quantity,Cantitate Efectivă
 DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial nr {0} nu a fost găsit
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonamentul a fost {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programul programului de plăți
 DocType: Fee Schedule Program,Student Batch,Lot de student
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Asigurați-Student
@@ -2824,14 +2838,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Nu Pronunțată
 ,Bank Clearance Summary,Sumar aprobare bancă
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
 DocType: Appraisal Goal,Appraisal Goal,Obiectiv expertiză
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Sugerează categoria?
 DocType: Stock Reconciliation Item,Current Amount,Suma curentă
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Corpuri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Corpuri
 DocType: Fee Schedule,Fee Structure,Structura Taxa de
 DocType: Timesheet Detail,Costing Amount,Costing Suma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 DocType: Student Admission Program,Application Fee,Taxă de aplicare
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Prezenta Salariul Slip
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Reducere Maxiumm pentru postul {0} este {1}%
@@ -2839,12 +2852,13 @@
 DocType: Sales Partner,Address & Contacts,Adresă şi contacte
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Criterii de analiză a agriculturii
+DocType: HR Settings,Leave Approval Notification Template,Lăsați șablonul de notificare de aprobare
 DocType: POS Profile,[Select],[Selectati]
 DocType: Vital Signs,Blood Pressure (diastolic),Tensiunea arterială (diastolică)
 DocType: SMS Log,Sent To,Trimis La
 DocType: Agriculture Task,Holiday Management,Gestionarea concediului
 DocType: Payment Request,Make Sales Invoice,Realizeaza Factura de Vanzare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
 DocType: Company,For Reference Only.,Numai Pentru referință.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Medic {0} nu este disponibil la {1}
@@ -2862,7 +2876,7 @@
 DocType: Employee,New Workplace,Nou loc de muncă
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Consumul de materiale
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Setați ca Închis
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
 DocType: Normal Test Items,Require Result Value,Necesita valoarea rezultatului
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOM
@@ -2877,19 +2891,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nr Structură activă sau Salariul implicit găsite pentru angajat al {0} pentru datele indicate
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
 DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Recurent
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detaliile șablonului pentru fluxul de numerar
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Managementul împrumuturilor
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Urmăriți Venituri separat și cheltuieli verticale produse sau divizii.
 DocType: Rename Tool,Rename Tool,Unealta Redenumire
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Afișează Salariu alunecare
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Material de transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Afișează Salariu alunecare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Material de transfer
 DocType: Fees,Send Payment Request,Trimiteți Cerere de Plată
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Vă rugăm să setați recurente după salvare
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,cont Selectați suma schimbare
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
@@ -2904,14 +2918,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Răspunderea pentru impozitul pe venit
 DocType: Grading Scale Interval,Grade Description,grad Descriere
 DocType: Stock Entry,Purchase Receipt No,Primirea de cumpărare Nu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Banii cei mai castigati
 DocType: Sales Invoice, Shipping Bill Number,Codul expedierii de transport
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,trasabilitatea
 DocType: Asset Maintenance Log,Actions performed,Acțiuni efectuate
 DocType: Cash Flow Mapper,Section Leader,Liderul secțiunii
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Sursa fondurilor (pasive)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Sursa fondurilor (pasive)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Angajat
+DocType: Bank Guarantee,Fixed Deposit Number,Numărul depozitului fix
 DocType: Asset Repair,Failure Date,Dată de nerespectare
 DocType: Sample Collection,Collected Time,Timpul colectat
 DocType: Company,Sales Monthly History,Istoric lunar de vânzări
@@ -2928,10 +2943,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Sigur doriți să anulați această întâlnire?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pachetul pentru tarifarea camerei hotelului
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,conducte de vânzări
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Cerut pe
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Actualizați abonamentul la preluare
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Contul {0} nu se potrivește cu Compania {1} în modul de cont: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Curs:
@@ -2941,7 +2957,7 @@
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nu au fost create comenzi de lucru
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Platā angajatului {0} deja creat pentru această perioadă
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutic
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
 DocType: Purchase Invoice,Credit To,De Creditat catre
@@ -2959,7 +2975,7 @@
 DocType: Request for Quotation Supplier,No Quote,Nici o citare
 DocType: Warranty Claim,Raised By,Ridicat de
 DocType: Payment Gateway Account,Payment Account,Cont de plăți
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Fara Masuri Compensatorii
 DocType: Job Offer,Accepted,Acceptat
@@ -2971,7 +2987,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vă rugăm să asigurați-vă că într-adevăr să ștergeți toate tranzacțiile pentru această companie. Datele dvs. de bază vor rămâne așa cum este. Această acțiune nu poate fi anulată.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,rezultatele cautarii
 DocType: Room,Room Number,Numărul de cameră
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referință invalid {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referință invalid {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 DocType: Journal Entry Account,Payroll Entry,Salarizare intrare
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Vizualizați înregistrările de taxe
@@ -2981,7 +2997,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Lab Test Sample,Lab Test Sample,Test de laborator
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permiteți redenumirea valorii atributului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Jurnal de intrare
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 DocType: Restaurant,Invoice Series Prefix,Prefixul seriei de facturi
 DocType: Employee,Previous Work Experience,Anterior Work Experience
@@ -2989,8 +3005,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrarea Google Maps nu este activată
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nu este introdus
+DocType: Subscription,Trialling,experimentării
 DocType: Member,Membership Expiry Date,Data expirării membrilor
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} trebuie să fie negativ în documentul de retur
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} trebuie să fie negativ în documentul de retur
 ,Minutes to First Response for Issues,Minute la First Response pentru Probleme
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Numele institutului pentru care configurați acest sistem.
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Unitate de măsură
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Oportunitate
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Oportunitate
 DocType: Operation,Default Workstation,Implicit Workstation
 DocType: Notification Control,Expense Claim Approved Message,Mesaj Aprobare Revendicare Cheltuieli
 DocType: Payment Entry,Deductions or Loss,Deducerile sau Pierdere
@@ -3047,7 +3064,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Concediu fără plată nu se potrivește cu înregistrările privind concediul de aplicare aprobat
 DocType: Campaign,Campaign-.####,Campanie-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Realizare Factura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Balanța rămasă
@@ -3056,7 +3073,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Codul de bare {0} nu este un cod valid {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Anul de încheiere
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cota / Plumb%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: Driver,Driver,Conducător auto
 DocType: Vital Signs,Nutrition Values,Valorile nutriției
 DocType: Lab Test Template,Is billable,Este facturabil
@@ -3067,7 +3084,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Data Efectiva de Început (prin Pontaj)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Clasă de uzură 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Suma avansului total nu poate fi mai mare decât suma totală revendicată
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Suma avansului total nu poate fi mai mare decât suma totală revendicată
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3122,7 +3139,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Selectați valorile atributelor
 DocType: Purchase Invoice,Reason For Issuing document,Motivul pentru documentul de emitere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Următoarea Contact Prin faptul că nu poate fi aceeași cu adresa de e-mail Plumb
 DocType: Tax Rule,Billing City,Oraș de facturare
@@ -3139,7 +3156,8 @@
 DocType: Warranty Claim,Service Address,Adresa serviciu
 DocType: Asset Maintenance Task,Calibration,Calibrarea
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} este o sărbătoare de companie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures și Programe
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Lăsați notificarea de stare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures și Programe
 DocType: Item,Manufacture,Fabricare
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Compania de configurare
 ,Lab Test Report,Raport de testare în laborator
@@ -3155,7 +3173,6 @@
 DocType: Crop,Planting Area,Zona de plantare
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Acest lucru se poate datora unor adrese de e-mail nevalide din
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ați adăugat
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultatul de formare
@@ -3165,16 +3182,17 @@
 DocType: Products Settings,Products per Page,Produse pe pagină
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Ramură organizație maestru.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportați o problemă
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Cheltuieli de utilitate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Cheltuieli de utilitate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-si mai mult
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rând # {0}: Jurnal de intrare {1} nu are cont {2} sau deja compensată împotriva unui alt voucher
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criterii Greutate
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Lăsați notificarea de aprobare
 DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Bazat pe salariu Slip Pontaj
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rata de cumparare
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Rata de cumparare
 DocType: Notification Control,Sales Order Message,Comandă de vânzări Mesaj
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Seta valorile implicite, cum ar fi Compania, valutar, Current Anul fiscal, etc"
 DocType: Payment Entry,Payment Type,Tip de plată
@@ -3197,6 +3215,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Setări Cosul de cumparaturi
 DocType: Journal Entry,Accounting Entries,Înregistrări contabile
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Dacă regula de preț este selectată pentru &quot;Rate&quot;, va suprascrie lista de prețuri. Tarifarea tarifului Rata de rată este rata finală, deci nu trebuie să aplicați nici o reducere suplimentară. Prin urmare, în tranzacții cum ar fi Comandă de Vânzare, Comandă de Achiziție etc, va fi extrasă în câmpul &quot;Rată&quot;, mai degrabă decât în câmpul &quot;Rata Prețurilor&quot;."
+DocType: Journal Entry,Paid Loan,Imprumut platit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Inregistrare Duplicat. Vă rugăm să verificați Regula de Autorizare {0}
 DocType: Journal Entry Account,Reference Due Date,Data de referință pentru referință
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3213,7 +3232,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/config/hr.py +93,Payroll,stat de plată
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
 DocType: Patient Service Unit,Parent Service Unit,Serviciul pentru părinți
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Asigurați-vă utilizatorului
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificarea pachetului pentru livrare (pentru imprimare)
@@ -3232,7 +3251,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Contul de venit
 DocType: Payment Request,Amount in customer's currency,Suma în moneda clientului
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Livrare
 DocType: Volunteer,Weekdays,Zilele saptamanii
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: Restaurant Menu,Restaurant Menu,Meniu Restaurant
@@ -3240,7 +3259,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Setați contul inventarului implicit pentru inventarul perpetuu
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Setați contul inventarului implicit pentru inventarul perpetuu
 DocType: Item Reorder,Material Request Type,Material Cerere tip
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Trimiteți e-mailul de examinare a granturilor
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage este plin, nu a salvat"
@@ -3248,10 +3267,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Capacitatea camerei
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Încă există înregistrare pentru articolul {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Re
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Veți pierde înregistrări ale facturilor generate anterior. Sigur doriți să reporniți acest abonament?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Taxa de înregistrare
 DocType: Budget,Cost Center,Centrul de cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Purchase Order Mesaj
 DocType: Tax Rule,Shipping Country,Transport Tara
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ascunde Id-ul fiscal al Clientului din tranzacțiile de vânzare
@@ -3260,20 +3280,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regula de stabilire a prețurilor se face pentru a suprascrie Pret / defini procent de reducere, pe baza unor criterii."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depozit poate fi modificat numai prin Bursa de primire de intrare / livrare Nota / cumparare
 DocType: Employee Education,Class / Percentage,Clasă / Procent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Director de Marketing și Vânzări
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Director de Marketing și Vânzări
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Impozit pe venit
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track conduce de Industrie tip.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Mergeți la Letterheads
+DocType: Subscription,Cancel At End Of Period,Anulați la sfârșitul perioadei
 DocType: Item Supplier,Item Supplier,Furnizor Articol
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nu există elemente selectate pentru transfer
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nu există elemente selectate pentru transfer
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Progres
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Câștigul / Pierdere de eliminare a activelor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Câștigul / Pierdere de eliminare a activelor
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",În tabelul de mai jos va fi selectat numai Solicitantul studenților cu statutul &quot;Aprobat&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Numărul contului pentru contul {0} nu este disponibil. <br> Vă rugăm să configurați corect planul de conturi.
 DocType: Task,Depends on Tasks,Depinde de Sarcini
@@ -3288,6 +3309,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Nu este în stoc
 DocType: Volunteer,Volunteer Skills,Abilități de voluntariat
 DocType: Appraisal,HR User,Utilizator HR
+DocType: Bank Guarantee,Reference Document Name,Numele documentului de referință
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
 apps/erpnext/erpnext/hooks.py +142,Issues,Probleme
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusul trebuie să fie unul din {0}
@@ -3301,7 +3323,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra mare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra mare
+DocType: Loan,Loan Application,Cerere de împrumut
 DocType: Crop,Scientific Name,Nume stiintific
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Frunze totale
 DocType: Customer,"Reselect, if the chosen contact is edited after save",Resetați dacă contactul ales este editat după salvare
@@ -3310,13 +3333,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Număr Cec
 ,Sales Browser,Browser de vanzare
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Mare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Mare
 DocType: Homepage Featured Product,Homepage Featured Product,Pagina de intrare de produse recomandate
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Toate grupurile de evaluare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Toate grupurile de evaluare
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nume nou depozit
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritoriu
@@ -3337,9 +3360,10 @@
 DocType: Fees,Fees,Taxele de
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Citat {0} este anulat
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Total Suma Impresionant
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Total Suma Impresionant
 DocType: Sales Partner,Targets,Obiective
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Înregistrați numărul SIREN în fișierul cu informații despre companie
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Price List,Price List Master,Lista de preturi Masterat
 DocType: GST Account,CESS Account,Cont CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
@@ -3348,6 +3372,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Selectați pacientul
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nume parametru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lăsați numai aplicațiile cu statut „Aprobat“ și „Respins“ pot fi depuse
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Grupul studențesc Nume este obligatoriu în rândul {0}
 DocType: Homepage,Products to be shown on website homepage,Produsele care urmează să fie afișate pe pagina de pornire site
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Acesta este un grup de clienți rădăcină și nu pot fi editate.
@@ -3393,14 +3418,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Factura deja creată pentru toate orele de facturare
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Numele de eroare: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Este costul de finanțare
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Alegeți clientul implicit în Setări restaurant
 ,Salary Register,Salariu Înregistrare
 DocType: Warehouse,Parent Warehouse,Depozit-mamă
-DocType: C-Form Invoice Detail,Net Total,Total net
+DocType: Subscription,Net Total,Total net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Implicit BOM nu a fost găsit pentru articolele {0} și proiectul {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definirea diferitelor tipuri de împrumut
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definirea diferitelor tipuri de împrumut
 DocType: Bin,FCFS Rate,Rata FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Remarcabil Suma
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Timp (în min)
@@ -3432,11 +3457,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Contul de root trebuie să fie un grup
 DocType: Drug Prescription,Drug Prescription,Droguri de prescripție
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Nerambursate / Închis
+DocType: Loan,Repaid/Closed,Nerambursate / Închis
 DocType: Item,Total Projected Qty,Cantitate totală prevăzută
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rata de evaluare nu a fost găsită pentru articolul {0}, care trebuie să facă înregistrări contabile pentru {1} {2}. Dacă elementul tranzacționează ca element cu rată zero de evaluare în {1}, vă rugăm să menționați acest lucru în tabelul {1} Item. În caz contrar, vă rugăm să creați o tranzacție de stoc de intrare pentru elementul respectiv sau să menționați rata de evaluare în înregistrarea elementului și apoi încercați să trimiteți / anulați această intrare"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 DocType: Course,Course Code,Codul cursului
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilizați POS în modul offline
@@ -3456,16 +3480,15 @@
 DocType: Purchase Invoice,Deemed Export,Considerat export
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer de materii pentru fabricarea
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
-DocType: Subscription,Half-yearly,Semestrial
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Intrare contabila pentru stoc
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ați evaluat deja criteriile de evaluare {}.
 DocType: Vehicle Service,Engine Oil,Ulei de motor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Comenzi de lucru create: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Comenzi de lucru create: {0}
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă clientului
-DocType: Employee Loan,Loan Details,Creditul Detalii
+DocType: Loan,Loan Details,Creditul Detalii
 DocType: Company,Default Inventory Account,Contul de inventar implicit
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Numerele folio nu se potrivesc
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rândul {0}: Completat Cant trebuie să fie mai mare decât zero.
@@ -3477,19 +3500,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,O legătură cu toate unitățile terestre în care cultura crește
 DocType: Account,Root Type,Rădăcină Tip
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nu se pot întoarce mai mult {1} pentru postul {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nu se pot întoarce mai mult {1} pentru postul {2}
 DocType: Item Group,Show this slideshow at the top of the page,Arată această prezentare în partea de sus a paginii
 DocType: BOM,Item UOM,Articol FDM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma impozitului pe urma Discount Suma (companie de valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
 DocType: Cheque Print Template,Primary Settings,Setări primare
 DocType: Purchase Invoice,Select Supplier Address,Selectați Furnizor Adresă
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Adăugați angajați
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Adăugați angajați
 DocType: Purchase Invoice Item,Quality Inspection,Inspecție de calitate
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,Format standard
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3509,11 +3532,10 @@
 DocType: SMS Log,No of Sent SMS,Nu de SMS-uri trimise
 DocType: Antibiotic,Healthcare Administrator,Administrator de asistență medicală
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Setați un obiectiv
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 DocType: Dosage Strength,Dosage Strength,Dozabilitate
 DocType: Account,Expense Account,Cont de cheltuieli
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Culoare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Culoare
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterii Plan de evaluare
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Data expirării este obligatorie pentru elementul selectat
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Împiedicați comenzile de achiziție
@@ -3526,18 +3548,18 @@
 DocType: Patient,Personal and Social History,Istoria personală și socială
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utilizatorul {0} a fost creat
 DocType: Fee Schedule,Fee Breakup for each student,Taxă pentru fiecare student
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Modificați codul
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Lista de pret Valuta nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Lista de pret Valuta nu selectat
 DocType: Purchase Invoice,Availed ITC Cess,Avansat ITC Cess
 ,Student Monthly Attendance Sheet,Elev foaia de prezență lunară
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regulă de expediere aplicabilă numai pentru vânzare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Până la
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupul de studenți sau programul de cursuri este obligatoriu
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupul de studenți sau programul de cursuri este obligatoriu
@@ -3558,7 +3580,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listați produsele sau serviciile pe care le cumpărați sau le vindeți.
 DocType: Water Analysis,Storage Temperature,Temperatura de depozitare
 DocType: Employee Attendance Tool,Unmarked Attendance,Participarea nemarcat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Cercetător
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Cercetător
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programul de înscriere Instrumentul Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Data de începere ar trebui să fie mai mică decât data de încheiere pentru sarcina {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nume sau E-mail este obligatorie
@@ -3571,7 +3593,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} are în prezent {1} Scor de Furnizor, iar cererile de oferta către acest furnizor ar trebui emise cu prudență."
 DocType: Chapter,Non Profit Manager,Manager non-profit
 DocType: BOM,Total Cost(Company Currency),Cost total (companie Moneda)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial Nu {0} a creat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial Nu {0} a creat
 DocType: Homepage,Company Description for website homepage,Descriere companie pentru pagina de start site
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nume furnizo
@@ -3581,11 +3603,10 @@
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
 DocType: Healthcare Settings,Result Printed,Rezultat imprimat
 DocType: Asset Category Account,Depreciation Expense Account,Contul de amortizare de cheltuieli
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Perioadă De Probă
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Vizualizați {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Perioadă De Probă
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Project,Total Costing Amount (via Timesheets),Suma totală a costurilor (prin intermediul foilor de pontaj)
-DocType: Employee Advance,Expense Approver,Cheltuieli aprobator
+DocType: Department,Expense Approver,Cheltuieli aprobator
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
 DocType: Project,Hourly,ore
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Grup la Grup
@@ -3595,7 +3616,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Pentru a Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Efectuați o plată prin Jurnalul de intrare
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,imprimat pe
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,imprimat pe
 DocType: Item,Inspection Required before Delivery,Necesar de inspecție înainte de livrare
 DocType: Item,Inspection Required before Purchase,Necesar de inspecție înainte de achiziționare
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activități în curs
@@ -3605,7 +3626,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Cantitatea minima pentru comanda
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Organizația dumneavoastră
 DocType: Fee Component,Fees Category,Taxele de Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Suma
 DocType: Supplier Scorecard,Notify Employee,Notificați angajatul
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
@@ -3615,7 +3636,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Nivel pentru re-comanda
 DocType: Company,Chart Of Accounts Template,Diagrama de conturi de șabloane
 DocType: Attendance,Attendance Date,Dată prezenţă
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
 DocType: Purchase Invoice Item,Accepted Warehouse,Depozit Acceptat
@@ -3623,10 +3644,11 @@
 DocType: Item,Valuation Method,Metoda de evaluare
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark jumatate de zi
 DocType: Sales Invoice,Sales Team,Echipa de vânzări
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Inregistrare duplicat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Inregistrare duplicat
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Introduceți numele Beneficiarului înainte de depunerea.
 DocType: Program Enrollment Tool,Get Students,Studenți primi
 DocType: Serial No,Under Warranty,În garanție
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Eroare]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Eroare]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,În cuvinte va fi vizibil după ce a salva comanda de vânzări.
 ,Employee Birthday,Zi de naștere angajat
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Selectați Data de finalizare pentru Repararea finalizată
@@ -3645,7 +3667,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervat pentru subcontractare
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
 DocType: Shopping Cart Settings,Orders,Comenzi
-DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
+DocType: Department,Leave Approver,Aprobator Concediu
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Selectați un lot
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Numele grupului de evaluare
@@ -3690,7 +3712,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Articol urmărit
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PENTRU RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Acest e-mail este generat automat
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
 DocType: Program Enrollment,Boarding Student,Student de internare
 DocType: Asset,Expected Value After Useful Life,Valoarea așteptată după viață utilă
@@ -3715,21 +3736,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Înregistrarea prezenței {0} există pentru elevul {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortizare Eliminată din cauza eliminării activelor
-DocType: Member,Member,Membru
+DocType: Loan,Member,Membru
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gestionați Adrese
 DocType: Work Order Item,Work Order Item,Postul de comandă de lucru
 DocType: Pricing Rule,Item Code,Cod articol
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Directorul Agriculturii
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
 DocType: Supplier Scorecard Period,Variables,variabile
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),De închidere (Dr)
 DocType: Cheque Print Template,Cheque Size,Dimensiune cecului
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrie Off remarcabile Suma
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Contul {0} nu se potrivește cu Compania {1}
@@ -3738,7 +3759,6 @@
 DocType: Stock Settings,Default Stock UOM,Stoc UOM Implicit
 DocType: Asset,Number of Depreciations Booked,Numărul de Deprecieri rezervat
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Cantitate totală
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Împotriva angajaților Loan: {0}
 DocType: Landed Cost Item,Receipt Document,Documentul de primire
 DocType: Employee Education,School/University,Școlar / universitar
 DocType: Payment Request,Reference Details,Detalii de referință
@@ -3749,7 +3769,7 @@
 DocType: Asset,Double Declining Balance,Dublu degresive
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Pentru închis nu poate fi anulată. Pentru a anula redeschide.
 DocType: Student Guardian,Father,tată
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 DocType: Attendance,On Leave,La plecare
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obțineți actualizări
@@ -3763,10 +3783,10 @@
 DocType: Lead,Lower Income,Micsoreaza Venit
 DocType: Restaurant Order Entry,Current Order,Comanda actuală
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Sursă și depozit țintă nu poate fi același pentru rând {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Accesați Programe
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rândul {0} # Suma alocată {1} nu poate fi mai mare decât suma nerevendicată {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rândul {0} # Suma alocată {1} nu poate fi mai mare decât suma nerevendicată {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
@@ -3789,7 +3809,6 @@
 DocType: Payment Terms Template,Payment Terms,Termeni de plată
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Mergeți la furnizori
@@ -3809,30 +3828,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Vă rugăm să setați ID-ul de e-mail pentru ca studentul să trimită Solicitarea de plată
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Vă rugăm să setați ID-ul de e-mail pentru ca studentul să trimită Solicitarea de plată
 DocType: Patient,Medical History,Istoricul medical
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Descoperire cont bancar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Descoperire cont bancar
 DocType: Patient,Patient ID,ID-ul pacientului
 DocType: Physician Schedule,Schedule Name,Numele programului
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Realizeaza Fluturas de Salar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Adăugați toți furnizorii
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Adăugați toți furnizorii
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rândul # {0}: Suma alocată nu poate fi mai mare decât suma rămasă.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Navigare BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Împrumuturi garantate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Împrumuturi garantate
 DocType: Purchase Invoice,Edit Posting Date and Time,Editare postare Data și ora
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vă rugăm să setați Conturi aferente amortizării în categoria activelor {0} sau companie {1}
 DocType: Lab Test Groups,Normal Range,Interval normal
 DocType: Academic Term,Academic Year,An academic
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Vânzări disponibile
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Sold Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Sold Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Rămas
 DocType: Appraisal,Appraisal,Expertiză
+DocType: Loan,Loan Account,Contul împrumutului
 DocType: Purchase Invoice,GST Details,Detalii GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mail trimis la furnizorul {0}
 DocType: Item,Default Sales Unit of Measure,Unitatea de vânzare standard de măsură
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,An academic:
+DocType: Subscription,Past Due Date,Data trecută
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nu permiteți setarea unui element alternativ pentru articolul {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data se repetă
@@ -3845,7 +3866,7 @@
 DocType: Patient Appointment,Patient Appointment,Numirea pacientului
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea unui rol nu poate fi aceeaşi cu rolul. Regula este aplicabilă pentru
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Dezabona de la acest e-mail Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Obțineți furnizori prin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Obțineți furnizori prin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nu a fost găsit pentru articolul {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Mergeți la Cursuri
 DocType: Accounts Settings,Show Inclusive Tax In Print,Afișați impozitul inclus în imprimare
@@ -3853,10 +3874,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesajul a fost trimis
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Cont cu noduri copil nu poate fi setat ca Registru Contabil
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educaționale
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rata la care lista de prețuri moneda este convertit în valuta de bază a clientului
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Suma netă (companie de valuta)
 DocType: Physician,Physician Schedules,Medicul programează
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Suma avansului total nu poate fi mai mare decât suma totală sancționată
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Suma avansului total nu poate fi mai mare decât suma totală sancționată
 DocType: Salary Slip,Hour Rate,Rata Oră
 DocType: Stock Settings,Item Naming By,Denumire Articol Prin
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
@@ -3874,6 +3896,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nu este permis să actualizeze tranzacțiile bursiere mai vechi de {0}
 DocType: BOM,Inspection Required,Inspecție obligatorii
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Introduceți numărul de garanție bancară înainte de depunere.
 DocType: Driving License Category,Class,Clasă
 DocType: Sales Order,Fully Billed,Complet Taxat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Ordinul de lucru nu poate fi ridicat împotriva unui șablon de element
@@ -3884,7 +3907,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educaționale
 DocType: Serial No,Is Cancelled,Este anulat
 DocType: Student Group,Group Based On,Grup bazat pe
 DocType: Student Group,Group Based On,Grup bazat pe
@@ -3896,9 +3918,10 @@
 DocType: Cheque Print Template,Cheque Height,Cheque Inaltime
 DocType: Supplier,Supplier Details,Detalii furnizor
 DocType: Setup Progress,Setup Progress,Progresul de instalare
+DocType: Expense Claim,Approval Status,Status aprobare
 DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Selectați toate
 ,Issued Items Against Work Order,Articole emise împotriva comenzii de lucru
 DocType: Vehicle Log,Invoice Ref,factură Ref
@@ -3929,12 +3952,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarif Număr
 DocType: Work Order Item,Available Qty at WIP Warehouse,Cantitate disponibilă la WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proiectat
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
-DocType: Employee Loan,Employee Loan Application,Cererea de împrumut Angajat
 DocType: Issue,Opening Date,Data deschiderii
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Salvați mai întâi pacientul
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Salvați mai întâi pacientul
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Prezența a fost marcată cu succes.
 DocType: Program Enrollment,Public Transport,Transport public
 DocType: Soil Texture,Silt Composition (%),Compoziția Silt (%)
@@ -3953,7 +3975,7 @@
 ,Item Balance (Simple),Balanța postului (simplă)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
 DocType: POS Profile,Write Off Account,Scrie Off cont
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nota de debit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nota de debit Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Reducere Suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
@@ -3976,6 +3998,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Comandă de vânzări Data
 DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
 DocType: Assessment Plan,Assessment Plan,Plan de evaluare
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Intrare în jurnal invers
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Clientul {0} este creat.
 DocType: Stock Settings,Limit Percent,Limita procentuală
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,În prezent nu există stoc disponibil în niciun depozit
@@ -3989,14 +4012,15 @@
 DocType: Journal Entry,Stock Entry,Stoc de intrare
 DocType: Payment Entry,Payment References,Referințe de plată
 DocType: C-Form,C-FORM-,C-forma-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Numărul de intervale pentru câmpul intervalului, de exemplu, dacă Intervalul este &quot;Zile&quot; și Numărul de intervale de facturare este de 3, facturile vor fi generate la fiecare 3 zile"
 DocType: Vehicle,Insurance Details,Detalii de asigurare
 DocType: Account,Payable,Plătibil
 DocType: Share Balance,Share Type,Tipul de distribuire
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vă rugăm să introduceți perioada de rambursare
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Vă rugăm să introduceți perioada de rambursare
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitorilor ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Profit Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Profit Brut%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Schimbarea profilului POS
 DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
@@ -4006,10 +4030,11 @@
 DocType: Lead,Address Desc,Adresă Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party este obligatorie
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Au fost găsite rânduri cu date scadente în alte rânduri: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Au fost găsite rânduri cu date scadente în alte rânduri: {list}
 DocType: Topic,Topic Name,Nume subiect
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Stabiliți șablonul prestabilit pentru notificarea de aprobare de ieșire din setările HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Selectați un angajat pentru a avansa angajatul.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Selectați un angajat pentru a avansa angajatul.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Selectați o dată validă
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Selectați natura afacerii dumneavoastră.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4028,7 +4053,7 @@
 DocType: Asset Movement,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Împărțiți cartea
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Factura de vânzări {0} a fost creată
 DocType: Employee,Confirmation Date,Data de Confirmare
 DocType: C-Form,Total Invoiced Amount,Sumă totală facturată
@@ -4037,7 +4062,7 @@
 DocType: Account,Accumulated Depreciation,Amortizarea cumulată
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Numele permanent
 DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
-DocType: Employee Loan Application,Required by Date,Cerere livrare la data de
+DocType: Loan Application,Required by Date,Cerere livrare la data de
 DocType: Lead,Lead Owner,Proprietar Conducere
 DocType: Production Plan,Sales Orders Detail,Detalii privind comenzile de vânzări
 DocType: Bin,Requested Quantity,Cantitate solicitată
@@ -4050,10 +4075,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Plata brută - Deducerea totală - rambursare a creditului
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID-ul de salarizare alunecare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variante multiple
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livrat
+DocType: Subscription,Trial Period Start Date,Perioada de începere a perioadei de încercare
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Conectați-vă ca un alt utilizator.
@@ -4074,12 +4100,11 @@
 DocType: Student Guardian,Student Guardian,student la Guardian
 DocType: Member,Member Name,Numele membrului
 DocType: Stock Settings,Use Naming Series,Utilizați seria de numire
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,în abonament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 DocType: Membership,Payment Details,Detalii de plata
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Rată BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Oprirea comenzii de lucru nu poate fi anulată, deblocați mai întâi pentru a anula"
 DocType: Asset,Journal Entry for Scrap,Jurnal de intrare pentru deseuri
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
@@ -4099,6 +4124,7 @@
 DocType: Land Unit,Land Unit,Unitate Land
 ,Purchase Analytics,Analytics de cumpărare
 DocType: Sales Invoice Item,Delivery Note Item,Articol de nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Factura curentă {0} lipsește
 DocType: Asset Maintenance Log,Task,Sarcină
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
@@ -4111,7 +4137,7 @@
 DocType: Company,Exchange Gain / Loss Account,Schimb de câștig / pierdere de cont
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Angajaților și prezență
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Completați formularul și salvați-l
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Completați formularul și salvați-l
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Cant. efectiva în stoc
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Cant. efectiva în stoc
@@ -4126,7 +4152,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard de vânzare Rata
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
 DocType: Cash Flow Mapper,Section Name,Numele secțiunii
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Cantitatea de comandat
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Cantitatea de comandat
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Locuri de munca disponibile
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Achita
@@ -4137,9 +4163,9 @@
 DocType: Task,depends_on,depinde de
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,A intrat în așteptare pentru actualizarea ultimului preț în toate materialele. Ar putea dura câteva minute.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Numele de cont nou. Notă: Vă rugăm să nu creați conturi pentru clienți și furnizori
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
 DocType: Water Analysis,Appearance,Aspect
+DocType: HR Settings,Leave Status Notification Template,Părăsiți șablonul de notificare a statutului
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Med. Achiziționarea ratei listei de prețuri
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informații despre membri.
@@ -4162,7 +4188,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nu sunt acceptate. Dezactivați șablonul de testare
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
 DocType: Crop Cycle,Linked Land Unit,Unitatea de teren conectată
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
@@ -4178,7 +4204,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Accesați Utilizatori
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN nevalid sau Enter NA pentru neînregistrat
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programul de înscriere Taxa
@@ -4194,14 +4220,14 @@
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
 DocType: Company,Create Chart Of Accounts Based On,"Creează Plan de conturi, bazate pe"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nu se poate converti în non-grup. Sarcini pentru copii există.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
 ,Stock Ageing,Stoc Îmbătrânirea
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} există împotriva solicitantului de student {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rotunjire ajustare (moneda companiei)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Pontaj
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lot:
 DocType: Volunteer,Afternoon,Dupa amiaza
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Cheque Print Template,Scanned Cheque,scanate cecului
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
@@ -4217,7 +4243,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Proiectul {0} există deja
 DocType: Medical Department,Nursing User,Utilizator Nursing
 DocType: Plant Analysis,Plant Analysis Criterias,Condiții de analiză a plantelor
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Responsabilitati
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Numărul de serie {0} nu aparține lotului {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Responsabilitati
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Perioada de valabilitate a acestui citat sa încheiat.
 DocType: Expense Claim Account,Expense Claim Account,Cont de cheltuieli de revendicare
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permiteți rate de schimb stale
@@ -4239,11 +4266,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Faceți variante
 DocType: Item,Default BOM,FDM Implicit
 DocType: Project,Total Billed Amount (via Sales Invoices),Suma facturată totală (prin facturi de vânzare)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debit Notă Sumă
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debit Notă Sumă
 DocType: Project Update,Not Updated,Neactualizat
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Există neconcordanțe între rata, numărul de acțiuni și suma calculată"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Totală restantă Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Totală restantă Amt
 DocType: Journal Entry,Printing Settings,Setări de imprimare
 DocType: Employee Advance,Advance Account,Advance Account
 DocType: Job Offer,Job Offer Terms,Condiții de ofertă de muncă
@@ -4252,7 +4279,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Autopropulsat
 DocType: Vehicle,Insurance Company,Companie de asigurari
 DocType: Asset Category Account,Fixed Asset Account,Cont activ fix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabil
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabil
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Din Nota de Livrare
 DocType: Chapter,Members,Membrii
 DocType: Student,Student Email Address,Adresa de e-mail Student
@@ -4276,7 +4303,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Interna
 DocType: Delivery Stop,Address Name,Numele adresei
 DocType: Stock Entry,From BOM,De la BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Împărțirea {0} unităților din {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Împărțirea {0} unităților din {1}
 DocType: Assessment Code,Assessment Code,Codul de evaluare
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
@@ -4284,25 +4311,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
 DocType: Bank Reconciliation Detail,Payment Document,Documentul de plată
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Eroare la evaluarea formulei de criterii
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
+DocType: Subscription,Plans,Planuri
 DocType: Salary Slip,Salary Structure,Structura salariu
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Eliberarea Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,A apărut o eroare la crearea unei recurențe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Eliberarea Material
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotațiile
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nu există grupuri create de studenți.
 DocType: Purchase Invoice Item,Serial No,Nr. serie
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rambursarea lunară Suma nu poate fi mai mare decât Suma creditului
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Rambursarea lunară Suma nu poate fi mai mare decât Suma creditului
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Data livrării așteptată nu poate fi înainte de data comenzii de achiziție
 DocType: Purchase Invoice,Print Language,Limba de imprimare
 DocType: Salary Slip,Total Working Hours,Numărul total de ore de lucru
 DocType: Sales Invoice,Customer PO Details,Detalii PO pentru clienți
-DocType: Subscription,Next Schedule Date,Data următoare a programării
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Contul de deschidere temporar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
@@ -4331,11 +4357,11 @@
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Datele De La și Pana La necesare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nu există angajați pentru criteriile menționate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
 DocType: Hotel Settings,Default Customer,Clientul implicit
 DocType: Assessment Plan,Supervisor Name,Nume supervizor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nu confirmați dacă se creează o întâlnire pentru aceeași zi
@@ -4360,16 +4386,16 @@
 DocType: Journal Entry Account,Employee Advance,Angajat Advance
 DocType: Payroll Entry,Payroll Frequency,Frecventa de salarizare
 DocType: Lab Test Template,Sensitivity,Sensibilitate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Material brut
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Plante și mașini
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Plante și mașini
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Setări de zi cu zi de lucru Sumar
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Introduceți Reqd după dată
 DocType: Payment Entry,Internal Transfer,Transfer intern
 DocType: Asset Maintenance,Maintenance Tasks,Sarcini de întreținere
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cantitatea țintă sau valoarea țintă este obligatorie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrul de Cost cu tranzacții existente nu poate fi transformat în registru contabil
@@ -4377,14 +4403,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integrarea ERPNext
 DocType: Crop Cycle,Detected Disease,Boala detectată
 ,Produced,Produs
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Data de începere a rambursării nu poate fi înainte de data de debursare.
 DocType: Item,Item Code for Suppliers,Articol Cod pentru Furnizori
 DocType: Issue,Raised By (Email),Ridicat de (e-mail)
 DocType: Training Event,Trainer Name,Nume formator
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicare
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Plățile se potrivesc cu facturi
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
@@ -4398,7 +4425,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Activare / dezactivare valute.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} la o jumătate de zi pe {1}
 DocType: Production Plan,Get Material Request,Material Cerere obțineți
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Cheltuieli poștale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Cheltuieli poștale
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 ,Item Variant Details,Element Variant Details
@@ -4409,9 +4436,9 @@
 DocType: Drug Prescription,Hour,Oră
 DocType: Restaurant Order Entry,Last Sales Invoice,Ultima factură de vânzare
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Selectați Cantitate pentru elementul {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 DocType: Company,Monthly Sales Target,Vânzări lunare
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
@@ -4419,7 +4446,7 @@
 DocType: Item,Default Material Request Type,Implicit Material Tip de solicitare
 DocType: Supplier Scorecard,Evaluation Period,Perioada de evaluare
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Necunoscut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Ordinul de lucru nu a fost creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Ordinul de lucru nu a fost creat
 DocType: Shipping Rule,Shipping Rule Conditions,Condiții Regula de transport maritim
 DocType: Purchase Invoice,Export Type,Tipul de export
 DocType: Salary Slip Loan,Salary Slip Loan,Salariu Slip împrumut
@@ -4435,8 +4462,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Sumar de deschidere a facturilor
 DocType: Education Settings,Education Manager,Director de educație
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Lungimea minimă dintre fiecare plantă din câmp pentru creștere optimă
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Produsul primit {0} nu poate fi actualizat utilizând Reconcilierea stocului, ci folosiți înregistrarea stocului"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Produsul primit {0} nu poate fi actualizat utilizând Reconcilierea stocului, ci folosiți înregistrarea stocului"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Produsul primit {0} nu poate fi actualizat utilizând Reconcilierea stocului, ci folosiți înregistrarea stocului"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Produsul primit {0} nu poate fi actualizat utilizând Reconcilierea stocului, ci folosiți înregistrarea stocului"
 DocType: Quality Inspection,Report Date,Data raportului
 DocType: Student,Middle Name,Al doilea nume
 DocType: C-Form,Invoices,Facturi
@@ -4469,20 +4496,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Chitanţă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Chitanţă
 ,Sales Register,Vânzări Inregistrare
 DocType: Daily Work Summary Group,Send Emails At,Trimite email-uri La
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Vizualizare formular
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Cheltuieli de asistare obligatorii în cererea de cheltuieli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Adăugați utilizatori în organizația dvs., în afară de dvs."
 DocType: Customer Group,Customer Group Name,Nume Group Client
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nu există clienți încă!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Situația fluxurilor de trezorerie
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Nu a fost creată nicio solicitare materială
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licență
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
@@ -4505,11 +4533,12 @@
 DocType: Vehicle,Chassis No,Număr șasiu
 DocType: Payment Request,Initiated,Iniţiat
 DocType: Production Plan Item,Planned Start Date,Start data planificată
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Selectați un BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Selectați un BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Avantaje fiscale integrate ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
+DocType: Bank Guarantee,Clauses and Conditions,Clauze și condiții
 DocType: Serial No,Creation Document Type,Tip de document creație
 DocType: Project Task,View Timesheet,Vizualizați foaia de lucru
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data de încheiere trebuie să fie mai mare decât data de începere
 DocType: Leave Type,Is Encash,Este încasa
 DocType: Leave Allocation,New Leaves Allocated,Cereri noi de concediu alocate
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
@@ -4523,9 +4552,10 @@
 DocType: Patient,Alcohol Current Use,Utilizarea curentă a alcoolului
 DocType: Student Admission Program,Student Admission Program,Programul de Admitere în Studenți
 DocType: Payment Entry,Account Paid To,Contul Plătite
+DocType: Subscription Settings,Grace Period,Perioadă de grație
 DocType: Item Alternative,Alternative Item Name,Numele elementului alternativ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nu am putut trimite niciun salariu de salariu <br> \ Motive posibile: <br> \ 1. Salariul net este mai mic de 0. <br> \\ 2. Adresa de e-mail a companiei specificată în comandantul angajatului nu este validă. <br>
@@ -4535,7 +4565,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},Bugetul {0} pentru Contul {1} fata de {2} {3} este {4}. Acesta este depășit cu {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rândul {0} # cont trebuie să fie de tip &quot;Activ fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Cantitate
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,și dezactivat Dezactivat în
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Seria este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Servicii financiare
 DocType: Student Sibling,Student ID,Carnet de student
@@ -4547,14 +4576,16 @@
 DocType: Complaint,Complaint,Plângere
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Faceți intrarea în rambursare
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Toate departamentele
 DocType: Patient,Alcohol Past Use,Utilizarea anterioară a alcoolului
 DocType: Fertilizer Content,Fertilizer Content,Conținut de îngrășăminte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematic / Stuck
 DocType: Tax Rule,Billing State,Stat de facturare
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Ordinul de lucru {0} trebuie anulat înainte de a anula acest ordin de vânzări
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
@@ -4578,10 +4609,11 @@
 DocType: Cheque Print Template,Message to show,Mesaj pentru a arăta
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Cu amănuntul
 DocType: Student Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle produs
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nu se poate găsi scorul începând cu {0}. Trebuie să aveți scoruri în picioare care acoperă între 0 și 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rândul {0}: referință invalid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achiziționa impozite și taxe Template
+DocType: Subscription,Current Invoice Start Date,Data de începere a facturii actuale
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Fie valoarea creditului de debit sau creditul sunt necesare pentru {2}
 DocType: GL Entry,Remarks,Remarci
@@ -4591,11 +4623,13 @@
 DocType: Task,Parent Task,Activitatea părintească
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Asigurați-vă de plumb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Imprimare și articole de papetărie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Imprimare și articole de papetărie
 DocType: Stock Settings,Show Barcode Field,Afișează coduri de bare Câmp
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Trimite email-uri Furnizor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salariu au fost deja procesate pentru perioada între {0} și {1}, Lăsați perioada de aplicare nu poate fi între acest interval de date."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Trimite email-uri Furnizor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salariu au fost deja procesate pentru perioada între {0} și {1}, Lăsați perioada de aplicare nu poate fi între acest interval de date."
+DocType: Fiscal Year,Auto Created,Crearea automată
 DocType: Chapter Member,Leave Reason,Lăsați rațiunea
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Factura {0} nu mai există
 DocType: Guardian Interest,Guardian Interest,Interes tutore
 DocType: Volunteer,Availability,Disponibilitate
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configurați valorile implicite pentru facturile POS
@@ -4604,14 +4638,13 @@
 DocType: Timesheet,Employee Detail,Detaliu angajat
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Codul de e-mail al Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Codul de e-mail al Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
 DocType: Lab Prescription,Test Code,Cod de test
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Setările pentru pagina de start site-ul web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},CV-urile nu sunt permise pentru {0} datorită unui punctaj din {1}
 DocType: Job Offer,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Deasupra
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Sumă totală {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},atribut nevalid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Sumă totală {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},atribut nevalid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Menționați dacă contul de plată non-standard
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Selectați alt grup de evaluare decât &quot;Toate grupurile de evaluare&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rând {0}: este necesar un centru de cost pentru un element {1}
@@ -4622,7 +4655,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza apei
 DocType: Chapter,Region,Regiune
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
 DocType: Holiday List,Weekly Off,Săptămânal Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reîncărcați Analiza Legată
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","De exemplu, 2012, 2012-13"
@@ -4638,7 +4671,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Costul de active scoase din uz
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 아이템 {2} 는 Cost Center가  필수임
 DocType: Vehicle,Policy No,Politica nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Obține elemente din Bundle produse
 DocType: Asset,Straight Line,Linie dreapta
 DocType: Project User,Project User,utilizator proiect
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Despică
@@ -4678,21 +4711,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,cale
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
 DocType: Production Plan,Total Planned Qty,Cantitatea totală planificată
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Valoarea de deschidere
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Valoarea de deschidere
 DocType: Salary Detail,Formula,Formulă
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Cont de vanzari
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Cont de vanzari
 DocType: Purchase Invoice Item,Total Weight,Greutate totală
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comision pentru Vânzări
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Comision pentru Vânzări
 DocType: Job Offer Term,Value / Description,Valoare / Descriere
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
 DocType: Tax Rule,Billing Country,Țara facturării
 DocType: Purchase Order Item,Expected Delivery Date,Data de Livrare Preconizata
 DocType: Restaurant Order Entry,Restaurant Order Entry,Intrare comandă de restaurant
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
 DocType: Asset Maintenance Task,Assign To Name,Alocați nume
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Cheltuieli de Divertisment
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Cheltuieli de Divertisment
 DocType: Hub Settings,Enabled Users,Utilizatori activi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Asigurați-vă Material Cerere
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Deschis Postul {0}
@@ -4705,24 +4738,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Cererile de concediu.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 DocType: Vehicle,Last Carbon Check,Ultima Verificare carbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Cheltuieli Juridice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Cheltuieli Juridice
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Selectați cantitatea pe rând
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Faceți deschiderea facturilor de vânzare și cumpărare
 DocType: Purchase Invoice,Posting Time,Postarea de timp
 DocType: Timesheet,% Amount Billed,% Suma facturata
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Cheltuieli de telefon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Cheltuieli de telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nici un articol cu ordine {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nici un articol cu ordine {0}
 DocType: Email Digest,Open Notifications,Notificări deschise
 DocType: Payment Entry,Difference Amount (Company Currency),Diferența Sumă (Companie Moneda)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Cheltuieli Directe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Cheltuieli Directe
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cheltuieli de călătorie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Adăugați abonarea câmpului personalizat în doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Purchase Receipt Item,Sample Quantity,Cantitate de probă
+DocType: Bank Guarantee,Name of Beneficiary,Numele beneficiarului
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizați costul BOM în mod automat prin programator, bazat pe cea mai recentă rată de evaluare / rata de prețuri / ultima rată de achiziție a materiilor prime."
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
@@ -4734,14 +4767,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probă
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componente salariale
 DocType: Program Enrollment Tool,New Academic Year,Anul universitar nou
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Revenire / credit Notă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Revenire / credit Notă
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserare automată a pretului de listă, dacă lipsește"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Total Suma plătită
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Total Suma plătită
 DocType: GST Settings,B2C Limit,Limita B2C
 DocType: Work Order Item,Transferred Qty,Transferat Cantitate
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigarea
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planificare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planificare
 DocType: Share Balance,Issued,Emis
+DocType: Loan,Repayment Start Date,Data de începere a rambursării
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Activitatea studenților
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Furnizor Id
 DocType: Payment Request,Payment Gateway Details,Plata Gateway Detalii
@@ -4754,10 +4788,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip de frunze, cum ar fi casual, bolnavi, etc"
 DocType: Email Digest,Send regular summary reports via Email.,Trimite rapoarte de sinteză periodice prin e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Vă rugăm să setați contul implicit în cheltuielile de revendicare Tip {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Vă rugăm să setați contul implicit în cheltuielile de revendicare Tip {0}
 DocType: Assessment Result,Student Name,Numele studentului
 DocType: Brand,Item Manager,Postul de manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Salarizare plateste
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Salarizare plateste
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
 DocType: Plant Analysis,Collection Datetime,Data colecției
 DocType: Work Order,Total Operating Cost,Cost total de operare
@@ -4767,9 +4801,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Utilizatorul {0} nu există
 DocType: Payment Term,Day(s) after invoice date,Ziua (zilele) după data facturii
 DocType: Payment Schedule,Payment Schedule,Planul de plăți
-DocType: Subscription,SUB-,SUB
 DocType: Item Attribute Value,Abbreviation,Abreviere
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Există deja intrare plată
+DocType: Subscription,Trial Period End Date,Data de încheiere a perioadei de încercare
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maestru șablon salariu.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologie
@@ -4786,9 +4820,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Toate grupurile de clienți
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,lunar acumulat
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
@@ -4797,14 +4831,15 @@
 DocType: Lab Prescription,Test Created,Testul a fost creat
 DocType: Healthcare Settings,Custom Signature in Print,Semnătură personalizată în imprimare
 DocType: Account,Temporary,Temporar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Client nr. LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Client nr. LPO
 DocType: Program,Courses,cursuri
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Secretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","În cazul în care dezactivați, &quot;în cuvinte&quot; câmp nu vor fi vizibile în orice tranzacție"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Această acțiune va opri facturarea viitoare. Sigur doriți să anulați acest abonament?
 DocType: Serial No,Distinct unit of an Item,Unitate distinctă de Postul
 DocType: Supplier Scorecard Criteria,Criteria Name,Numele de criterii
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Stabiliți compania
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Stabiliți compania
 DocType: Pricing Rule,Buying,Cumpărare
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Boli și îngrășăminte
 DocType: HR Settings,Employee Records to be created by,Inregistrari Angajaților pentru a fi create prin
@@ -4813,18 +4848,18 @@
 DocType: POS Profile,Apply Discount On,Aplicați Discount pentru
 DocType: Member,Membership Type,Tipul de membru
 ,Reqd By Date,Cerere livrare la data de
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Creditorii
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Creditorii
 DocType: Assessment Plan,Assessment Name,Nume evaluare
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Afișați PDC în imprimantă
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Afișați PDC în imprimantă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Nu serial este obligatorie
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Articol
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ofertă de muncă
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institutul Abreviere
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
@@ -4842,7 +4877,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Raport Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Dacă este activat, sistemul va posta automat înregistrări contabile pentru inventar."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokeraj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Prezența pentru angajatul {0} este deja marcată pentru această zi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Prezența pentru angajatul {0} este deja marcată pentru această zi
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","în procesul-verbal 
  Actualizat prin ""Ora Log"""
@@ -4854,6 +4889,7 @@
 DocType: Lab Test,Approved Date,Data aprobarii
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
+DocType: Subscriber,Subscriber Name,Numele Abonatului
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Update Tool,Replace,Înlocuirea
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nu găsiți produse.
@@ -4863,19 +4899,18 @@
 DocType: Request for Quotation Item,Project Name,Denumirea proiectului
 DocType: Customer,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Selectați contul de venituri din dobânzi în împrumutul angajatului {0}
 DocType: Work Order,Required Items,Articole cerute
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Resurse Umane
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
 DocType: Disease,Treatment Task,Sarcina de tratament
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Active fiscale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Active fiscale
 DocType: BOM Item,BOM No,Nr. BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Update Tool,The BOM which will be replaced,BOM care va fi înlocuit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Echipamente electronice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Echipamente electronice
 DocType: Asset,Maintenance Required,Revizia este necesară
 DocType: Account,Debit,Debitare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
@@ -4884,7 +4919,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Impresionant Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Stabilească obiective Articol Grupa-înțelept pentru această persoană de vânzări.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocheaza Stocurile Mai Vechi De [zile]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rând # {0}: Activ este obligatorie pentru active fixe cumpărare / vânzare
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rând # {0}: Activ este obligatorie pentru active fixe cumpărare / vânzare
 DocType: Asset Maintenance Team,Maintenance Team Name,Numele echipei de întreținere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Clientul este obligatoriu dacă opțiunea &quot;Oportunitate de la&quot; este selectată ca client
@@ -4894,19 +4929,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipuri de cheltuieli de revendicare.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Rata de vânzare pentru articolul {0} este mai mică decât {1}. Rata de vânzare trebuie să fie atinsă {2}
-DocType: Item,Taxes,Impozite
+DocType: Subscription,Taxes,Impozite
 DocType: Purchase Invoice,capital goods,bunuri capitale
 DocType: Purchase Invoice Item,Weight Per Unit,Greutate pe unitate
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Plătite și nu sunt livrate
 DocType: Project,Default Cost Center,Cost Center Implicit
-DocType: Bank Guarantee,End Date,Dată finalizare
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Tranzacții de stoc
 DocType: Budget,Budget Accounts,Conturile bugetare
 DocType: Employee,Internal Work History,Istoria interne de lucru
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Sumă Amortizarea cumulată
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variabila tabelului de variabile pentru furnizori
-DocType: Employee Loan,Fully Disbursed,deblocată în întregime
 DocType: Employee Advance,Due Advance Amount,Suma datorată în avans
 DocType: Maintenance Visit,Customer Feedback,Feedback Client
 DocType: Account,Expense,Cheltuială
@@ -4930,7 +4963,7 @@
 ,Employee Information,Informații angajat
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Se creează șabloane fiscale predefinite pentru vânzări și achiziții.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Inregistrarea Rezultatului evaluării {0} există deja.
@@ -4938,7 +4971,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Filtru filtru de companie gol dacă grupul de grup este &quot;companie&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Dată postare nu poate fi data viitoare
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nu se potrivește cu {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,pentru generarea recurentei
 DocType: Stock Entry,Target Warehouse Address,Adresa de destinație a depozitului
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Concediu Aleator
 DocType: Agriculture Task,End Day,Sfârșitul zilei
@@ -4963,11 +4995,10 @@
 DocType: Material Request,% Ordered,% Comandat
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pentru grupul de studenți bazat pe cursuri, cursul va fi validat pentru fiecare student din cursurile înscrise în înscrierea în program."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Muncă în acord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Rată de cumparare medie
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Rată de cumparare medie
 DocType: Share Balance,From No,De la nr
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Mesaj nou de la {expeditor}
 DocType: Customer,Customer Primary Address,Adresa primară a clientului
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletine
 DocType: Drug Prescription,Description/Strength,Descriere / Putere
@@ -4976,22 +5007,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Același articol a fost introdus de mai multe ori
 DocType: Department,Leave Block List,Lista Concedii Blocate
 DocType: Purchase Invoice,Tax ID,ID impozit
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Articolul {0} nu este configurat pentru Numerotare Seriala. Coloana trebuie să fie vida
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Articolul {0} nu este configurat pentru Numerotare Seriala. Coloana trebuie să fie vida
 DocType: Accounts Settings,Accounts Settings,Setări Conturi
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Aproba
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Adresa malformată pentru {0}, vă rugăm să remediați dacă doriți să continuați."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Adresa malformată pentru {0}, vă rugăm să remediați dacă doriți să continuați."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Numărul de cont nou, acesta va fi inclus în numele contului ca prefix"
 DocType: Maintenance Team Member,Team Member,Membru al echipei
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Niciun rezultat nu trebuie trimis
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
-DocType: Employee Loan,Rate of Interest (%) / Year,Rata dobânzii (%) / An
+DocType: Loan,Rate of Interest (%) / Year,Rata dobânzii (%) / An
 ,Project Quantity,proiectul Cantitatea
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“"
 DocType: Opportunity,To Discuss,Pentru a discuta
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} unități de {1} necesare în {2} pentru a finaliza această tranzacție.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rata dobânzii (%) anual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Conturi temporare
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Negru
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Conturi temporare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Negru
 DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
 DocType: Shareholder,Contact List,Listă de contacte
 DocType: Account,Auditor,Auditor
@@ -4999,16 +5030,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} articole produse
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Află mai multe
 DocType: Cheque Print Template,Distance from top edge,Distanța de la marginea de sus
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Listă de prețuri {0} este dezactivat sau nu există
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Listă de prețuri {0} este dezactivat sau nu există
 DocType: Purchase Invoice,Return,Întoarcere
 DocType: Pricing Rule,Disable,Dezactivati
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Modul de plată este necesară pentru a efectua o plată
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Modul de plată este necesară pentru a efectua o plată
 DocType: Project Task,Pending Review,Revizuirea în curs
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Modificați pagina completă pentru mai multe opțiuni, cum ar fi active, numere de serie, loturi etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Numiri și consultări
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nu este înscris în Lotul {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Activul {0} nu poate fi scos din uz, deoarece este deja {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Verificări necesare
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Verificări necesare
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Setarea companiei nu a reușit
@@ -5020,7 +5051,7 @@
 DocType: Homepage,Tag Line,Eticheta linie
 DocType: Fee Component,Fee Component,Taxa de Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Conducerea flotei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Adăugați articole din
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Adăugați articole din
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Culturi și terenuri
 DocType: Cheque Print Template,Regular,Regulat
 DocType: Fertilizer,Density (if liquid),Densitatea (dacă este lichidă)
@@ -5045,24 +5076,26 @@
 DocType: Payment Entry,Paid Amount,Suma plătită
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Explorați ciclul vânzărilor
 DocType: Assessment Plan,Supervisor,supraveghetor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Reținerea stocului
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Reținerea stocului
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 ,Work Order Stock Report,Raport de stoc pentru comanda de lucru
+DocType: Purchase Receipt,Auto Repeat Detail,Repeatarea detaliilor automate
 DocType: Assessment Result Tool,Assessment Result Tool,Instrumentul de evaluare rezultat
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Ca supraveghetor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugerează categoria
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Resturi Postul
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Managementul calității
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Managementul calității
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Postul {0} a fost dezactivat
 DocType: Project,Total Billable Amount (via Timesheets),Sumă totală facturată (prin intermediul foilor de pontaj)
 DocType: Agriculture Task,Previous Business Day,Ziua lucrătoare anterioară
-DocType: Employee Loan,Repay Fixed Amount per Period,Rambursa Suma fixă pentru fiecare perioadă
+DocType: Loan,Repay Fixed Amount per Period,Rambursa Suma fixă pentru fiecare perioadă
 DocType: Employee,Health Insurance No,Asigurări de sănătate nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Nota de credit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Nota de credit Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Sumă impozabilă totală
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
 DocType: Opening Invoice Creation Tool,Purchase,Cumpărarea
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Cantitate de bilanţ
@@ -5073,16 +5106,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pentru {1}
 DocType: Healthcare Settings,Valid number of days,Număr valid de zile
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Centre de cost
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Reporniți abonamentul
 DocType: Land Unit,Linked Plant Analysis,Analiza plantelor conectate
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Rata la care moneda furnizorului este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rând # {0}: conflicte timpilor cu rândul {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permiteți ratei de evaluare zero
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permiteți ratei de evaluare zero
+DocType: Bank Guarantee,Receiving,primire
 DocType: Training Event Employee,Invited,invitați
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,"Mai multe structuri salariale active, găsite pentru angajat al {0} pentru datele indicate"
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup conturi Gateway.
 DocType: Employee,Employment Type,Tip angajare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Active Fixe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Active Fixe
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Pierdere
 ,GST Purchase Register,Registrul achizițiilor GST
 ,Cash Flow,Fluxul de numerar
@@ -5102,9 +5137,10 @@
 DocType: Academic Term,Term Start Date,Termenul Data de începere
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista tuturor tranzacțiilor cu acțiuni
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Trebuie să fie setată atât data de începere a perioadei de încercare, cât și data de încheiere a perioadei de încercare"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Rata medie
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Suma totală de plată în Planul de Plăți trebuie să fie egală cu Total / Rotunjit
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Suma totală de plată în Planul de Plăți trebuie să fie egală cu Total / Rotunjit
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banca echilibru Declarație pe General Ledger
 DocType: Job Applicant,Applicant Name,Nume solicitant
 DocType: Authorization Rule,Customer / Item Name,Client / Denumire articol
@@ -5134,6 +5170,7 @@
 DocType: Work Order,Warehouses,Depozite
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activul nu poate fi transferat
 DocType: Hotel Room Pricing,Hotel Room Pricing,Pretul camerei hotelului
+DocType: Subscription,Days Until Due,Zile până la termen
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Acest element este o variantă de {0} (șablon).
 DocType: Workstation,per hour,pe oră
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,cumpărare
@@ -5142,13 +5179,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Pentru grupul de studenți bazat pe loturi, lotul student va fi validat pentru fiecare student din înscrierea în program."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribuire
+DocType: Journal Entry Account,Loan,Împrumut
 DocType: Expense Claim Advance,Expense Claim Advance,Cheltuieli de revendicare Advance
 DocType: Lab Test,Report Preference,Raportați raportul
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informații despre voluntari.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Manager de Proiect
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Manager de Proiect
 ,Quoted Item Comparison,Compararea Articol citat
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Suprapunerea punctajului între {0} și {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Expediere
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Valoarea activelor nete pe
 DocType: Crop,Produce,Legume şi fructe
@@ -5158,7 +5196,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Consumul de materiale pentru fabricare
 DocType: Item Alternative,Alternative Item Code,Codul elementului alternativ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Selectați elementele de Fabricare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Selectați elementele de Fabricare
 DocType: Delivery Stop,Delivery Stop,Livrare Stop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
 DocType: Item,Material Issue,Problema de material
@@ -5168,15 +5206,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Afișare articole
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Din Timpul nu poate fi mai mare decât în timp.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Doriți să anunțați toți clienții prin e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Doriți să anunțați toți clienții prin e-mail?
+DocType: Subscription Plan,Billing Interval,Intervalul de facturare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Reluare
 DocType: Hub Settings,Hub Username,Utilizator Hub
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Grup de criterii de evaluare
 DocType: Healthcare Settings,Patient Name By,Nume pacient
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Înregistrarea jurnalelor de angajare pentru salariile de la {0} la {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Înregistrarea jurnalelor de angajare pentru salariile de la {0} la {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
 DocType: Warehouse,Warehouse Name,Denumire depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
@@ -5190,23 +5228,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aici puteți stoca informatii despre inaltime, greutate, alergii, probleme medicale etc"
 DocType: Leave Block List,Applies to Company,Se aplică companiei
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
-DocType: Employee Loan,Disbursement Date,debursare
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,"Nu sunt specificați ""Destinatari"""
+DocType: Loan,Disbursement Date,debursare
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualizați cel mai recent preț în toate BOM-urile
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Fișă medicală
 DocType: Vehicle,Vehicle,Vehicul
 DocType: Purchase Invoice,In Words,În cuvinte
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Introduceți numele băncii sau al instituției de credit înainte de depunere.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} trebuie transmis
 DocType: POS Profile,Item Groups,Grupuri articol
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Astăzi este {0} nu a aniversare!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Astăzi este {0} nu a aniversare!
 DocType: Sales Order Item,For Production,Pentru Producție
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Adăugați un cont de deschidere temporară în Planul de conturi
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Adăugați un cont de deschidere temporară în Planul de conturi
 DocType: Customer,Customer Primary Contact,Contact primar client
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Jurnal de închidere a perioadei
 DocType: Project Task,View Task,Vezi Sarcina
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plumb%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plumb%
+DocType: Bank Guarantee,Bank Guarantee Type,Tip de garanție bancară
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fracțiunea de facturi
 ,Asset Depreciations and Balances,Amortizari si Balante Active
@@ -5217,9 +5256,8 @@
 DocType: Production Plan,Include Subcontracted Items,Includeți articole subcontractate
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,A adera
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Nu se pot schimba proprietățile Variant după transportarea stocului. Va trebui să faceți un nou element pentru a face acest lucru.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
-DocType: Employee Loan,Repay from Salary,Rambursa din salariu
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+DocType: Loan,Repay from Salary,Rambursa din salariu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Se solicita plata contra {0} {1} pentru suma {2}
 DocType: Salary Slip,Salary Slip,Salariul Slip
@@ -5243,11 +5281,11 @@
 DocType: Employee Education,Employee Education,Educație Angajat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Grup de element dublu exemplar găsit în tabelul de grup de elemente
 DocType: Land Unit,Parent Land Unit,Unitatea pământului părinte
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
 DocType: Fertilizer,Fertilizer Name,Denumirea îngrășămintelor
 DocType: Salary Slip,Net Pay,Plată netă
 DocType: Cash Flow Mapping Accounts,Account,Cont
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
 ,Requested Items To Be Transferred,Articole solicitate de transferat
 DocType: Expense Claim,Vehicle Log,vehicul Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prezența febrei (temperatură&gt; 38,5 ° C sau temperatură susținută&gt; 38 ° C / 100,4 ° F)"
@@ -5288,25 +5326,24 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
 DocType: Asset Maintenance,Manufacturing User,Producție de utilizare
 DocType: Purchase Invoice,Raw Materials Supplied,Materii prime furnizate
-DocType: C-Form,Series,Serii
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Moneda din lista de prețuri {0} trebuie să fie {1} sau {2}
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Soil Texture,Ternary Plot,Ternar Plot
 DocType: Item Group,Item Classification,Postul Clasificare
 DocType: Driver,License Number,Numărul de licență
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scop Vizita Mentenanta
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Inregistrarea pacientului
 DocType: Crop,Period,Perioada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Registru Contabil General
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Angajat {0} pe Lăsați pe {1}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Angajat {0} pe Lăsați pe {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Angajat {0} pe Lăsați pe {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Angajat {0} pe Lăsați pe {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vezi Oportunitati
 DocType: Program Enrollment Tool,New Program,programul nou
 DocType: Item Attribute Value,Attribute Value,Valoare Atribut
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 DocType: Salary Detail,Salary Detail,Detalii salariu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Vă rugăm selectați 0} {întâi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Vă rugăm selectați 0} {întâi
 DocType: Appointment Type,Physician,Medic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,consultări
@@ -5314,15 +5351,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nu poate fi mai mare decât cantitatea planificată ({2}) din Ordinul de Lucru {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Fișa de timp pentru fabricație.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,subtotală
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Nu se pot modifica proprietățile Variant după tranzacția stoc. Va trebui să faceți un nou element pentru a face acest lucru.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless Mandatul SEPA
 DocType: Physician,Charges,Taxe
 DocType: Production Plan,Get Items For Work Order,Obțineți comenzi pentru lucru
 DocType: Salary Detail,Default Amount,Implicit Suma
 DocType: Lab Test Template,Descriptive,Descriptiv
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Rezumat această lună
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Stabiliți un obiectiv de vânzări pe care doriți să-l atingeți pentru compania dvs.
 ,Project wise Stock Tracking,Proiect înțelept Tracking Stock
@@ -5350,11 +5388,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Eroare la crearea site-ului
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Reținerea stocului de stocare deja creată sau Cantitatea de eșantion care nu a fost furnizată
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Reținerea stocului de stocare deja creată sau Cantitatea de eșantion care nu a fost furnizată
 DocType: Program,Program Abbreviation,Abreviere de program
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
 DocType: Warranty Claim,Resolved By,Rezolvat prin
-DocType: Bank Guarantee,Start Date,Data începerii
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cecuri și Depozite respingă incorect
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
@@ -5369,11 +5406,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ore
 DocType: Project,Expected Start Date,Data de Incepere Preconizata
 DocType: Purchase Invoice,04-Correction in Invoice,04-Corectarea facturii
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Ordin de lucru deja creat pentru toate articolele cu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Ordin de lucru deja creat pentru toate articolele cu BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Varianta Detalii raport
 DocType: Setup Progress Action,Setup Progress Action,Acțiune de instalare progresivă
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Achiziționarea listei de prețuri
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Achiziționarea listei de prețuri
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Anuleaza abonarea
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Selectați Stare de întreținere ca Completat sau eliminați Data de finalizare
 DocType: Supplier,Default Payment Terms Template,Șablonul Termenii de plată standard
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Moneda de tranzacție trebuie să fie aceeași ca și de plată Gateway monedă
@@ -5384,7 +5422,6 @@
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acțiune în cazul în care Bugetul Lunar Acumulat a fost depășit
-DocType: Subscription,Submit on creation,Publica cu privire la crearea
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
 DocType: Asset,Disposal Date,eliminare Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailuri vor fi trimise tuturor angajaților activi ai companiei la ora dat, în cazul în care nu au vacanță. Rezumatul răspunsurilor vor fi trimise la miezul nopții."
@@ -5403,6 +5440,7 @@
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Cheque Print Template,Cheque Print Template,Format Imprimare Cec
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafic Centre de Cost
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Numărul de zile după expirarea datei facturii înainte de a anula abonamentul sau marcarea abonamentului ca neplătit
 DocType: Lab Test Template,Sample Collection,Colectie de mostre
 ,Requested Items To Be Ordered,Articole solicitate de comandat
 DocType: Price List,Price List Name,Lista de prețuri Nume
@@ -5411,7 +5449,7 @@
 DocType: Account,Income,Venit
 DocType: Industry Type,Industry Type,Industrie Tip
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ceva a mers prost!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 DocType: Supplier Scorecard Scoring Criteria,Score,Scor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Anul fiscal {0} nu există
@@ -5431,12 +5469,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ar trebui să fie o valoare cuprinsă între 0 și 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Data următoarei amortizări nu poate fi dată înainte de Data disponibilă pentru utilizare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Creditele negarantate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ore de lucru împotriva Pontaj
 DocType: Maintenance Schedule Detail,Scheduled Date,Data programată
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total plătit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total plătit Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesaje mai mari de 160 de caractere vor fi împărțite în mai multe mesaje
 DocType: Purchase Receipt Item,Received and Accepted,Primit și acceptat
 DocType: Hub Settings,Company and Seller Profile,Profilul companiei și al vânzătorului
@@ -5450,10 +5488,9 @@
 DocType: Item,Variant Based On,Varianta Bazat pe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Furnizorii dumneavoastră
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Corectați
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
 DocType: Request for Quotation Item,Supplier Part No,Furnizor de piesa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Primit de la
 DocType: Lead,Converted,Transformat
@@ -5467,6 +5504,7 @@
 DocType: Asset,Assets,bunuri
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
+DocType: Subscription,Current Invoice End Date,Data de încheiere a facturii actuale
 DocType: Payment Term,Due Date Based On,Data de bază bazată pe
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Vă rugăm să setați grupul de clienți și teritoriul implicit în Setări de vânzare
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} nu există
@@ -5474,7 +5512,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nu sunt selectate rambursări pentru înscrierea în Jurnal
 DocType: Payment Reconciliation,From Invoice Date,De la data facturii
+DocType: Loan,Disbursed,debursate
 DocType: Healthcare Settings,Laboratory Settings,Setări de laborator
 DocType: Patient Appointment,Service Unit,Unitate de service
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Setați cu succes furnizorul
@@ -5487,12 +5527,12 @@
 DocType: Share Balance,No of Shares,Numărul de acțiuni
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Selectați Stare
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: School House,House Name,Numele casei
 DocType: Fee Schedule,Total Amount per Student,Suma totală pe student
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Electric
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Electric
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adăugați restul organizației dvs. ca utilizatori. Puteți, de asemenea, invita Clienții în portal prin adăugarea acestora din Contacte"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
 DocType: Grant Application,Requested Amount,Suma solicitată
@@ -5502,7 +5542,7 @@
 DocType: Crop Cycle,Detected Diseases,Au detectat bolile
 DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
 DocType: Item,Customer Code,Cod client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Memento dată naştere pentru {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Memento dată naştere pentru {0}
 DocType: Asset Maintenance Task,Last Completion Date,Ultima dată de finalizare
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
@@ -5510,9 +5550,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Setări GoCardless
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Active stoc
 DocType: Restaurant,Active Menu,Meniul activ
 DocType: Target Detail,Target Qty,Țintă Cantitate
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Împotriva împrumutului: {0}
 DocType: Shopping Cart Settings,Checkout Settings,setările checkout pentru
 DocType: Student Attendance,Present,Prezenta
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
@@ -5521,9 +5562,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
 DocType: Vehicle Log,Odometer,Contorul de kilometraj
 DocType: Production Plan Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nu conține nici un element de stoc
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nu conține nici un element de stoc
 DocType: Chapter,Chapter Head,Capitolul Cap
 DocType: Payment Term,Month(s) after the end of the invoice month,Luna (luni) după sfârșitul lunii facturii
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Activitatea de proiect / sarcină.
@@ -5531,11 +5572,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generează fluturașe de salariu
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Rezultatul datetimei de laborator nu poate fi înainte de data testării
 DocType: POS Profile,Allow user to edit Discount,Permiteți utilizatorului să editeze Discount
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Obțineți clienți de la
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Obțineți clienți de la
 DocType: Purchase Invoice Item,Include Exploded Items,Includeți articole explodate
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
 DocType: Shipping Rule,Restrict to Countries,Limitați la țări
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore de facturare
 DocType: Project,Total Sales Amount (via Sales Order),Suma totală a vânzărilor (prin comandă de vânzări)
@@ -5554,6 +5596,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Manager de evaluare
 DocType: Payment Entry,Allocate Payment Amount,Alocați Suma de plată
+DocType: Subscription Plan,Subscription Plan,Planul de abonament
 DocType: Employee External Work History,Salary,Salariu
 DocType: Serial No,Delivery Document Type,Tipul documentului de Livrare
 DocType: Sales Order,Partly Delivered,Parțial livrate
@@ -5579,9 +5622,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Clasă de uzură 2
 DocType: SG Creation Tool Course,Max Strength,Putere max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalarea presetărilor
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nu este selectată nicio notificare de livrare pentru client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nu este selectată nicio notificare de livrare pentru client {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM înlocuit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Selectați elementele bazate pe data livrării
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Selectați elementele bazate pe data livrării
 DocType: Grant Application,Has any past Grant Record,Are vreun dosar Grant trecut
 ,Sales Analytics,Analitice de vânzare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Disponibile {0}
@@ -5600,7 +5643,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costul materiilor prime livrate
 DocType: Selling Settings,Settings for Selling Module,Setări pentru vânzare Modulul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervarea camerelor hotelului
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Service Client
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Service Client
 DocType: BOM,Thumbnail,Miniatură
 DocType: Item Customer Detail,Item Customer Detail,Detaliu Articol Client
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidat un loc de muncă.
@@ -5617,7 +5660,7 @@
 DocType: Fees,Student Details,Detalii studențești
 DocType: Purchase Invoice Item,Stock Qty,Cota stocului
 DocType: Purchase Invoice Item,Stock Qty,Cota stocului
-DocType: Employee Loan,Repayment Period in Months,Rambursarea Perioada în luni
+DocType: Loan,Repayment Period in Months,Rambursarea Perioada în luni
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Eroare: Nu a id valid?
 DocType: Naming Series,Update Series Number,Actualizare Serii Număr
 DocType: Account,Equity,Echitate
@@ -5626,7 +5669,7 @@
 DocType: Task,Closing Date,Data de Inchidere
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
 DocType: Timesheet,Work Detail,Detaliile lucrării
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inginer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inginer
 DocType: Journal Entry,Total Amount Currency,Suma totală Moneda
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Căutare subansambluri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
@@ -5671,13 +5714,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informații tip donator.
 DocType: Request for Quotation,Supplier Detail,Detalii furnizor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Eroare în formulă sau o condiție: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Suma facturată
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Suma facturată
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Criteriile de greutate trebuie să adauge până la 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Prezență
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,stoc
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","In cazul in care este debifat, lista va trebui să fie adăugata fiecarui Departament unde trebuie sa fie aplicată."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Crearea {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sursa si Target Warehouse nu poate fi aceeași
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
@@ -5701,14 +5743,14 @@
 DocType: Shipping Rule,Fixed,Fix
 DocType: Vehicle Service,Clutch Plate,Placă de ambreiaj
 DocType: Company,Round Off Account,Rotunji cont
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Cheltuieli administrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Cheltuieli administrative
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consilia
 DocType: Customer Group,Parent Customer Group,Părinte Grup Clienți
-DocType: Journal Entry,Subscription,Abonament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Abonament
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Crearea taxelor în așteptare
 DocType: Appraisal Goal,Score Earned,Scor Earned
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Perioada De Preaviz
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Perioada De Preaviz
 DocType: Asset Category,Asset Category Name,Nume activ Categorie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Acesta este un teritoriu rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nume nou Agent de vânzări
@@ -5722,7 +5764,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
 DocType: Asset,Frequency of Depreciation (Months),Frecventa de amortizare (Luni)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Cont de credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Afiseaza valorile nule
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
@@ -5730,7 +5772,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Contra articolului comenzii de vânzări
 DocType: Hub Settings,Company Logo,Logoul companiei
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 DocType: Healthcare Settings,Patient Registration,Inregistrarea pacientului
@@ -5765,11 +5807,10 @@
 DocType: Journal Entry,Total Debit,Total debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Implicite terminat Marfuri Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Selectați pacientul
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Persoana de vânzări
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Persoana de vânzări
 DocType: Hotel Room Package,Amenities,dotări
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Buget și centru de cost
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Modul implicit de plată multiple nu este permis
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pentru
 ,Appointment Analytics,Analiza programării
 DocType: Vehicle Service,Half Yearly,Semestrial
 DocType: Lead,Blog Subscriber,Abonat blog
@@ -5785,6 +5826,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lăsați necompletat dacă faceți grupuri de elevi pe an
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","In cazul in care se bifeaza, nr. total de zile lucratoare va include si sarbatorile, iar acest lucru va reduce valoarea Salariul pe Zi"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplicațiile care utilizează cheia curentă nu vor putea accesa, sunteți sigur?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Total de Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Schimbați codul de șablon
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai devreme decât Start Termen Data. Vă rugăm să corectați datele și încercați din nou.
@@ -5796,8 +5838,9 @@
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 DocType: Cheque Print Template,Signatory Position,Poziție semnatar
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Setați ca Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Setați ca Lost
 DocType: Timesheet,Total Billable Hours,Numărul total de ore facturabile
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Numărul de zile în care abonatul trebuie să plătească facturile generate de acest abonament
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plată Primirea Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui client. A se vedea calendarul de mai jos pentru detalii
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rândul {0}: Suma alocată {1} trebuie să fie mai mic sau egal cu suma de plată de intrare {2}
@@ -5816,12 +5859,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Company,Company Info,Informaţii Companie
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Selectați sau adăugați client nou
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Aceasta se bazează pe prezența a acestui angajat
 DocType: Assessment Result,Summary,rezumat
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Marchează prezența
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Contul debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Contul debit
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Articol de intrare pentru comandă pentru restaurant
@@ -5833,7 +5876,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Suma cumpărată
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Furnizor de oferta {0} creat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Beneficiile angajatului
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Beneficiile angajatului
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Work Order,Manufactured Qty,Produs Cantitate
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Acțiunile nu există cu {0}
@@ -5841,12 +5884,12 @@
 DocType: Asset,Out of Order,Scos din uz
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorați suprapunerea timpului de lucru al stației
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Selectați numerele lotului
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 DocType: Patient Service Unit,Medical Administrator,Administrator medical
 DocType: Assessment Plan,Schedule,Program
 DocType: Account,Parent Account,Contul părinte
@@ -5876,15 +5919,16 @@
 DocType: Asset Repair,Repair Status,Stare de reparare
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
 DocType: POS Profile,Account for Change Amount,Contul pentru Schimbare Sumă
 DocType: Purchase Invoice,input service,serviciu de intrare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rând {0}: Parte / conturi nu se potrivește cu {1} / {2} din {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Membru al echipei de întreținere
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza solului
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Codul cursului:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
 DocType: Employee,Current Address,Adresa actuală
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
 DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
@@ -5933,19 +5977,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Admitere pentru {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Numele variabil
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
 DocType: Asset,Asset Category,Categorie activ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salariul net nu poate fi negativ
 DocType: Purchase Order,Advance Paid,Avans plătit
 DocType: Item,Item Tax,Taxa Articol
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material de Furnizor
 DocType: Soil Texture,Loamy Sand,Nisip argilos
 DocType: Production Plan,Material Request Planning,Planificarea solicitărilor materiale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Accize factură
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% apare mai mult decât o dată
 DocType: Expense Claim,Employees Email Id,Id Email Angajat
 DocType: Employee Attendance Tool,Marked Attendance,Participarea marcat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Raspunderi Curente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Raspunderi Curente
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timerul a depășit orele date.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
 DocType: Patient,A Positive,A Pozitive
@@ -5956,9 +6000,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} are în prezent {1} Scor de Furnizor, iar comenzile de achiziție catre acest furnizor ar trebui emise cu prudență."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Echipa de întreținere a activelor
-DocType: Employee Loan,Loan Type,Tip credit
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} a fost trimis cu succes
+DocType: Loan,Loan Type,Tip credit
 DocType: Scheduling Tool,Scheduling Tool,Instrumentul de programare
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Card de Credit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Card de Credit
 DocType: BOM,Item to be manufactured or repacked,Articol care urmează să fie fabricat sau reambalat
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
 DocType: Sales Invoice Item,Drop Ship,Drop navelor
@@ -5990,7 +6035,7 @@
 DocType: Item,Units of Measure,Unitati de masura
 DocType: Manufacturing Settings,Allow Production on Holidays,Permiteţi operaţii de producție pe durata sărbătorilor
 DocType: Sales Invoice,Customer's Purchase Order Date,Data Comanda de Aprovizionare Client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Afișați atașamentele publice
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
 DocType: Restaurant Reservation,Reservation Time,Timp de rezervare
@@ -6005,7 +6050,7 @@
 DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rândul # {0}: Reqd by Date nu poate fi înainte de data tranzacției
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produse recomandate
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Proiectant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
@@ -6015,20 +6060,20 @@
 DocType: Driver,Expiry Date,Data expirării
 DocType: Healthcare Settings,Employee name and designation in print,Numele și denumirea angajatului în imprimat
 ,accounts-browser,conturi de browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vă rugăm să selectați categoria întâi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Maestru proiect.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pentru a permite supra-facturare sau supra-ordonare, să actualizeze &quot;alocație&quot; în Setări stoc sau elementul."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Jumatate de zi)
 DocType: Payment Term,Credit Days,Zile de Credit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Selectați pacientul pentru a obține testele de laborator
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Asigurați-Lot Student
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Timpul in Zile Conducere
 DocType: Cash Flow Mapping,Is Income Tax Expense,Cheltuielile cu impozitul pe venit
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verificați dacă studentul este rezident la Hostelul Institutului.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
 ,Stock Summary,Rezumat de stoc
@@ -6039,10 +6084,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru plecare
 DocType: BOM Operation,Operating Cost(Company Currency),Costul de operare (Companie Moneda)
-DocType: Employee Loan Application,Rate of Interest,Rata dobânzii
+DocType: Loan Application,Rate of Interest,Rata dobânzii
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: Item,Shelf Life In Days,Perioada de valabilitate în zile
 DocType: GL Entry,Is Opening,Se deschide
+DocType: Department,Expense Approvers,Examinatorii de cheltuieli
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
 DocType: Journal Entry,Subscription Section,Secțiunea de abonamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Contul {0} nu există
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index bfa0776..2d8cc90 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Отменить Материал Визит {0} до отмены этой претензии по гарантийным обязательствам
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Отчеты об оценке
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Потребительские товары
-DocType: Purchase Receipt,Subscription Detail,Сведения о подписке
 DocType: Supplier Scorecard,Notify Supplier,Сообщите поставщику
 DocType: Item,Customer Items,Продукты для клиентов
 DocType: Project,Costing and Billing,Калькуляция и биллинг
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
 DocType: Item,Publish Item to hub.erpnext.com,Опубликовать деталь к hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Уведомления электронной почты
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,оценка
 DocType: Item,Default Unit of Measure,Единица измерения по умолчанию
 DocType: SMS Center,All Sales Partner Contact,Всем Контактам Торговых Партнеров
-DocType: Employee,Leave Approvers,Оставьте Утверждающие
+DocType: Department,Leave Approvers,Оставьте Утверждающие
 DocType: Sales Partner,Dealer,Дилер
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,исследования
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Проверить наличие свободных мест
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Это основано на операциях против этого поставщика. См график ниже для получения подробной информации
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Легальный
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Фактический тип налога не может быть включён в стоимость продукта в строке {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Легальный
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Фактический тип налога не может быть включён в стоимость продукта в строке {0}
 DocType: Bank Guarantee,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Требуется По
 DocType: Delivery Note,Return Against Delivery Note,Вернуться На накладной
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или группы), против которого бухгалтерских проводок производится и остатки сохраняются."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Для обработки не поступает заявка на зарплату.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Для обработки не поступает заявка на зарплату.
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показать открыт
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Сегодня необходимо принять это действие для вышеупомянутого повторяющегося
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,"Проверять, выписываться"
 DocType: Pricing Rule,Apply On,Применить на
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Всем Контактам Поставщиков
 DocType: Support Settings,Support Settings,Настройки поддержки
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Статус срока годности партии продукта
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Банковский счет
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Банковский счет
 DocType: Membership,membership validaty section,членство в разделе validaty
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 DocType: Consultation,Consultation,Консультация
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материал
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Создание веб-сайта
 DocType: Opening Invoice Creation Tool Item,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Таблица учета не может быть пустой.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Кредиты (обязательства)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Таблица учета не может быть пустой.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год прохождения
 DocType: Item,Country of Origin,Страна происхождения
 DocType: Soil Texture,Soil Texture Criteria,Критерии качества почвы
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Основные контактные данные
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Открыть вопросы
 DocType: Production Plan Item,Production Plan Item,Производственный план Пункт
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
 DocType: Lab Test Groups,Add new line,Добавить строку
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Здравоохранение
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задержка в оплате (дни)
@@ -89,7 +85,7 @@
 ,Delay Days,Дни задержки
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Счет
+DocType: Subscription Invoice,Invoice,Счет
 DocType: Purchase Invoice Item,Item Weight Details,Деталь Вес Подробности
 DocType: Asset Maintenance Log,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ряд # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ряд # {0}:
 DocType: Timesheet,Total Costing Amount,Общая сумма Стоимостью
 DocType: Delivery Note,Vehicle No,Автомобиль №
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Пожалуйста, выберите прайс-лист"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Незавершенная работа
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Пожалуйста, выберите даты"
 DocType: Daily Work Summary Group,Holiday List,Список праздников
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Бухгалтер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Бухгалтер
 DocType: Hub Settings,Selling Price List,Продажа прайс-листа
 DocType: Patient,Tobacco Current Use,Текущее потребление табака
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Стоимость продажи
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Стоимость продажи
 DocType: Cost Center,Stock User,Пользователь склада
 DocType: Soil Analysis,(Ca+Mg)/K,(Са + Mg) / К
 DocType: Company,Phone No,Номер телефона
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Новый {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Исходящее уведомление по электронной почте отправлено
 ,Sales Partners Commission,Комиссионные Партнеров по продажам
 DocType: Soil Texture,Sandy Clay Loam,Песчаный глиняный суглинок
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Значение после амортизации
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Связанный
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,"Дата Посещаемость не может быть меньше, чем присоединение даты работника"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,"Дата Посещаемость не может быть меньше, чем присоединение даты работника"
 DocType: Grading Scale,Grading Scale Name,Градация шкалы Имя
-DocType: Subscription,Repeat on Day,Повторить в День
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Это корень счета и не могут быть изменены.
 DocType: Sales Invoice,Company Address,Адрес компании
 DocType: BOM,Operations,Эксплуатация
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
+DocType: Subscription,Subscription Start Date,Дата начала подписки
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепите файл .csv с двумя колоннами, одна для старого имени и одина для нового названия"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не в каком-либо активном финансовом годе.
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Ссылка: {0}, Код товара: {1} и Заказчик: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Дата окончания пробного периода Не может быть до начала периода пробного периода
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Открытие на работу.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM не указывается для объекта субподряда {0} в строке {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Patient,Married,Замужем
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускается для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Получить продукты от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Получить продукты от
 DocType: Price List,Price Not UOM Dependant,Цена не зависит от УОМ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Тормозные масла
 DocType: Tax Rule,Tax Type,Налоги Тип
 ,Completed Work Orders,Завершенные рабочие задания
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Налогооблагаемая сумма
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Налогооблагаемая сумма
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавлять или обновлять записи ранее {0}"
 DocType: BOM,Item Image (if not slideshow),Изображение продукта (не для слайд-шоу)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(часовая ставка ÷ 60) × фактическое время работы
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Строка # {0}: Тип ссылочного документа должен быть одним из заголовка расхода или записи журнала
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Выберите BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Строка # {0}: Тип ссылочного документа должен быть одним из заголовка расхода или записи журнала
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Выберите BOM
 DocType: SMS Log,SMS Log,СМС-журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Затраты по поставленным продуктам
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,"Управляйте суммой аванса, предоставленной Работнику"
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Уведомление о доставке
 DocType: Journal Entry,Opening Entry,Начальная запись
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Счет Оплатить только
-DocType: Employee Loan,Repay Over Number of Periods,Погашать Over Количество периодов
+DocType: Loan,Repay Over Number of Periods,Погашать Over Количество периодов
 DocType: Stock Entry,Additional Costs,Дополнительные расходы
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
 DocType: Lead,Product Enquiry,Запрос на продукт
 DocType: Education Settings,Validate Batch for Students in Student Group,Проверка партии для студентов в студенческой группе
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Нет отпуска найденная запись для сотрудника {0} для {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Нет отпуска найденная запись для сотрудника {0} для {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Пожалуйста, введите название первой Компании"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
 DocType: Employee Education,Under Graduate,Под Выпускник
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Пожалуйста, установите шаблон по умолчанию для уведомления о статусе отпуска в настройках HR."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Целевая На
 DocType: BOM,Total Cost,Общая стоимость
 DocType: Soil Analysis,Ca/K,Са / К
-DocType: Journal Entry Account,Employee Loan,Сотрудник займа
 DocType: Fee Schedule,Send Payment Request Email,Отправить запрос на оплату по E-mail
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Продукт {0} не существует или просрочен
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Недвижимость
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Успешно незарегистрированный.
 DocType: Assessment Result,Grade,класс
 DocType: Restaurant Table,No of Seats,Количество мест
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Чтобы добавить динамический объект, используйте теги jinja, например <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Поставленные Поставщиком
 DocType: Asset Maintenance Task,Asset Maintenance Task,Задача по обслуживанию активов
 DocType: SMS Center,All Contact,Всем Контактам
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Годовой оклад
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Годовой оклад
 DocType: Daily Work Summary,Daily Work Summary,Ежедневно Резюме Работа
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} заморожен
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Расходы по Запасам
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Расходы по Запасам
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Выберите целевое хранилище
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Выберите целевое хранилище
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Пожалуйста, введите Preferred Контакт E-mail"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Пожалуйста, введите Preferred Контакт E-mail"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra запись
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,основной адрес
 DocType: Production Plan,Material Request Detail,Подробности заявки на метериал
 DocType: Selling Settings,Default Quotation Validity Days,Дни по умолчанию для котировок
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС-центр
 DocType: Sales Invoice,Change Amount,Изменение Сумма
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Категории водительских прав
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Укажите дату поставки
 DocType: Depreciation Schedule,Make Depreciation Entry,Сделать запись амортизации
+DocType: HR Settings,Leave Settings,Оставить настройки
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип заявки
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Вещание
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Режим настройки POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Отключает создание журналов времени с помощью Work Orders. Операции не должны отслеживаться в отношении Рабочего заказа
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Реализация
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Реализация
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Информация о выполненных операциях.
 DocType: Asset Maintenance Log,Maintenance Status,Техническое обслуживание Статус
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Сведения о членстве
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Наименование поставщика обязательно для кредиторской задолженности {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Продукты и цены
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Общее количество часов: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},С даты должно быть в пределах финансового года. Предполагая С даты = {0}
 DocType: Drug Prescription,Interval,интервал
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,предпочтение
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,предпочтение
 DocType: Grant Application,Individual,Частное лицо
 DocType: Academic Term,Academics User,Пользователь
 DocType: Cheque Print Template,Amount In Figure,Сумма На рисунке
-DocType: Employee Loan Application,Loan Info,Заем информация
+DocType: Loan Application,Loan Info,Заем информация
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Запланируйте для посещения технического обслуживания.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период оценки поставщика
 DocType: Share Transfer,Share Transfer,Передача акций
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Шаблон продукта
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,биохимия
 DocType: Job Offer,Select Terms and Conditions,Выберите Сроки и условия
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,аута
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,аута
 DocType: Woocommerce Settings,Woocommerce Settings,Настройки Woocommerce
 DocType: Production Plan,Sales Orders,Заказы клиентов
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,По умолчанию Территория
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Телевидение
 DocType: Work Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Выберите клиента или поставщика.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Company,Enable Perpetual Inventory,Включить вечный инвентарь
+DocType: Bank Guarantee,Charges Incurred,Расходы
 DocType: Company,Default Payroll Payable Account,По умолчанию Payroll оплаты счетов
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Обновление Email Group
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Пользовательский результат
 DocType: Delivery Stop,Contact Name,Имя Контакта
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерии оценки курса
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Идентификатор налога:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Идентификатор налога:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Студенческий билет:
 DocType: POS Customer Group,POS Customer Group,POS Группа клиентов
 DocType: Land Unit,Land Unit describing various land assets,"Земельная единица, описывающая различные земельные активы"
@@ -375,9 +372,8 @@
 ,Open Work Orders,Открытые рабочие задания
 DocType: Payment Term,Credit Months,Кредитные месяцы
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,"Net Pay не может быть меньше, чем 0"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Чтобы остановить отправку повторяющихся уведомлений об ошибках из системы, мы отметили поле «Отключено» в подписке"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Листья в год
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Листья в год
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
 DocType: Email Digest,Profit & Loss,Потеря прибыли
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (с помощью Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Пожалуйста, настройте учащихся по студенческим группам"
 DocType: Item Website Specification,Item Website Specification,Описание продукта для сайта
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Банковские записи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Банковские записи
 DocType: Crop,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар с Сверки Запасов
 DocType: Stock Entry,Sales Invoice No,№ Счета на продажу
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Курс Студенческая группа Инструмент создания
 DocType: Lead,Do Not Contact,Не обращайтесь
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Люди, которые преподают в вашей организации"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Разработчик Программного обеспечения
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Разработчик Программного обеспечения
 DocType: Item,Minimum Order Qty,Минимальное количество заказа
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Course Scheduling Tool,Course Start Date,Дата начала курса
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Опубликовать в Hub
 DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Запрос материала
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Запрос материала
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Покупка Подробности
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Макс. Класс
 DocType: Email Digest,New Quotations,Новые запросы на поставку
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Электронные письма зарплаты скольжения сотруднику на основе предпочтительного электронной почты, выбранного в Employee"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 DocType: Tax Rule,Shipping County,графство Доставка
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Справка
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Справка
 DocType: Asset,Next Depreciation Date,Следующий Износ Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Выдающиеся чеки и депозиты, чтобы очистить"
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
 DocType: Driver,Fleet Manager,Менеджер автопарка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Строка # {0}: {1} не может быть отрицательным по пункту {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Строка # {0}: {1} не может быть отрицательным по пункту {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Пожалуйста, установите рейтинг номера в отеле {}"
 DocType: Journal Entry,Multi Currency,Мультивалютность
 DocType: Opening Invoice Creation Tool,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Накладная
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Накладная
 DocType: Consultation,Encounter Impression,Впечатление от Encounter
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Себестоимость проданных активов
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Курс по которому валюта Покупателя конвертируется в базовую валюту покупателя
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планирования Инструмент
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Срочно] Ошибка при создании повторяющихся% s для% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
 DocType: Land Unit,LInked Analysis,Анализ LInked
 DocType: Item Tax,Tax Rate,Размер налога
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Период применения не может быть через две записи распределения
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Период применения не может быть через две записи распределения
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Получено
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Создание студенческих групп
 DocType: Volunteer,Weekends,Выходные дни
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Сумма кредитной записи
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Сумма кредитной записи
 DocType: Setup Progress Action,Action Document,Документ действия
 DocType: Chapter Member,Website URL,URL веб-сайта
 ,Finished Goods,Готовая продукция
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Добавить продукты
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Параметр контроля качества продукта
+DocType: Leave Application,Leave Approver Name,Оставить Имя утверждающего
 DocType: Depreciation Schedule,Schedule Date,Дата планирования
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Доходы, Вычеты и другие компоненты Зарплатные"
 DocType: Packed Item,Packed Item,Упаковано
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Заявка на предложение
 DocType: Healthcare Settings,Require Lab Test Approval,Требовать лабораторное тестирование
 DocType: Salary Slip Timesheet,Working Hours,Часы работы
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Всего выдающихся
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Всего выдающихся
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
 DocType: Dosage Strength,Strength,Прочность
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Создать нового клиента
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Расходные Стоимость
 DocType: Purchase Receipt,Vehicle Date,Дата транспортного средства
 DocType: Student Log,Medical,Медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Причина потери
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Причина потери
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Обновить номер учетной записи
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Владельцем лида не может быть сам лид
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Выделенная сумма не может превышать суммы нерегулируемого
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Единственный
 DocType: Salary Slip,Total Loan Repayment,Общая сумма погашения кредита
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
-DocType: Subscription,Yearly,Ежегодно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Пожалуйста, введите МВЗ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Пожалуйста, введите МВЗ"
 DocType: Drug Prescription,Dosage,дозировка
 DocType: Journal Entry Account,Sales Order,Заказ клиента
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Средняя Цена Продажи
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Средняя Цена Продажи
 DocType: Assessment Plan,Examiner Name,Имя Examiner
 DocType: Lab Test Template,No Result,Безрезультатно
 DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Пожалуйста, введите название компании сначала"
 DocType: Purchase Invoice,Supplier Name,Наименование поставщика
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте руководство ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Показать листы всех членов Департамента в календаре
 DocType: Purchase Invoice,01-Sales Return,01-продажа
 DocType: Account,Is Group,Группа
 DocType: Email Digest,Pending Purchase Orders,В ожидании заказов на поставку
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Обязательное поле — академический год
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} не связано с {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Настроить вводный текст, который идет в составе этой электронной почте. Каждая транзакция имеет отдельный вводный текст."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Пожалуйста, задайте кредитную карту по умолчанию для компании {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Пожалуйста, задайте кредитную карту по умолчанию для компании {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Транзакция не разрешена против прекращенного рабочего заказа {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены до
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер выходных.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Зарезервировано для продажи
 DocType: Packing Slip,From Package No.,Номер упаковки
 DocType: Item Attribute,To Range,В диапазоне
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Невозможно изменить метод оценки, так как существуют транзакции в отношении некоторых продуктов, у которых нет собственного метода оценки"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Невозможно изменить метод оценки, так как существуют транзакции в отношении некоторых продуктов, у которых нет собственного метода оценки"
 DocType: Student Report Generation Tool,Attended by Parents,Присутствуют родители
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Patient,AB Positive,АВ положительная
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Информация о посещаемости.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Заработная плата Компонент для расчета заработной платы на основе расписания.
 DocType: Sales Order Item,Used for Production Plan,Используется для производственного плана
-DocType: Employee Loan,Total Payment,Всего к оплате
+DocType: Loan,Total Payment,Всего к оплате
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Невозможно отменить транзакцию для выполненного рабочего заказа.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Время между операциями (в мин)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} отменяется, поэтому действие не может быть завершено"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Это могут быть как организации так и частные лица.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достаточно части для сборки
 DocType: POS Profile User,POS Profile User,Пользователь профиля POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
+DocType: Subscription Invoice,Subscription Invoice,Счет-фактура
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Прямая прибыль
 DocType: Patient Appointment,Date TIme,Дата и время
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Администратор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Администратор
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Создание компаний и налогов
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
 DocType: Codification Table,Codification Table,Таблица кодирования
 DocType: Timesheet Detail,Hrs,часов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Stock Entry Detail,Difference Account,Учетная запись
 DocType: Purchase Invoice,Supplier GSTIN,Поставщик GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Шаблон сопоставления денежных потоков
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Серийный номер продукта не может быть дробным
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
+DocType: Bank Guarantee,Providing,обеспечение
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Не разрешено, настройте шаблон лабораторного тестирования по мере необходимости."
 DocType: Patient,Risk Factors,Факторы риска
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Поставщик Счет №
 DocType: Territory,For reference,Для справки
 DocType: Healthcare Settings,Appointment Confirmation,Подтверждение назначения
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в операции перемещения по складу."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в операции перемещения по складу."
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Закрытие (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравствуйте
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Переместить продукт
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Уже задан по умолчанию в pos-профиле {0} для пользователя {1}, любезно отключен по умолчанию"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Финансовый / отчетный год.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Накопленные значения
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Территория требуется в профиле POS
 DocType: Supplier,Prevent RFQs,Предотвращение запросов
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Создать накладную
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},"Зарплатный сальс, представленный на период от {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},"Зарплатный сальс, представленный на период от {0} до {1}"
 DocType: Project Task,Project Task,Задача проекта
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Дата платежа
 DocType: Production Plan,Production Plan,План производства
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Открытие инструмента создания счета-фактуры
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Возвраты с продаж
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примечание: Суммарное количество выделенных листьев {0} не должно быть меньше, чем уже утвержденных листьев {1} на период"
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Установить количество в транзакциях на основе ввода без последовательного ввода
 ,Total Stock Summary,Общая статистика запасов
 DocType: Announcement,Posted By,Сообщение от
 DocType: Item,Delivered by Supplier (Drop Ship),Доставка поставщиком
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Предложение
 DocType: Lead,Middle Income,Средний уровень дохода
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Начальное сальдо (кредит)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Укажите компанию
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Укажите компанию
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Training Result Employee,Training Result Employee,Обучение Результат Сотрудник
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логический Склад, по которому сделаны складские записи"
-DocType: Repayment Schedule,Principal Amount,Основная сумма
-DocType: Employee Loan Application,Total Payable Interest,Общая задолженность по процентам
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Основная сумма
+DocType: Loan Application,Total Payable Interest,Общая задолженность по процентам
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Итого выдающийся: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Счет по табелю
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
 DocType: Restaurant Reservation,Restaurant Reservation,Бронирование ресторанов
 DocType: Land Unit,Land Unit Name,Название земельного участка
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Предложение Написание
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Предложение Написание
 DocType: Payment Entry Deduction,Payment Entry Deduction,Оплата запись Вычет
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Завершение
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Уведомлять клиентов по электронной почте
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Уведомлять клиентов по электронной почте
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Другой человек Продажи {0} существует с тем же идентификатором Сотрудника
 DocType: Employee Advance,Claimed Amount,Заявленная сумма
 apps/erpnext/erpnext/config/education.py +180,Masters,Мастеры
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Payment Gateway Account не создан, создайте его вручную."
 DocType: Supplier Scorecard,Per Year,В год
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Не допускается вход в эту программу в соответствии с DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 DocType: Sales Invoice,Sales Taxes and Charges,Налоги и сборы с продаж
 DocType: Employee,Organization Profile,Профиль организации
 DocType: Vital Signs,Height (In Meter),Высота (в метрах)
 DocType: Student,Sibling Details,подробности Родственные
 DocType: Vehicle Service,Vehicle Service,Обслуживание автомобиля
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Автоматически запускает запрос на обратную связь в зависимости от условий.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Автоматически запускает запрос на обратную связь в зависимости от условий.
 DocType: Employee,Reason for Resignation,Причина отставки
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Шаблон для аттестации.
 DocType: Sales Invoice,Credit Note Issued,Кредит выдается справка
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,График технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Затем Правила ценообразования отфильтровываются на основе Клиента, Группы клиентов, Территории, Поставщика, Типа поставщика, Кампании, Партнера по продажам и т. д."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Чистое изменение в запасах
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Управление кредитов сотрудников
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Связь с Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / по
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Укажите учетную запись в Складском {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Доставка материалов
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Не удалось найти путь для
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Начальное сальдо (дебет)
+DocType: Loan,Applicant,заявитель
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Сделать повторяющиеся документы
 ,GST Itemised Purchase Register,Регистр покупки в GST
 DocType: Course Scheduling Tool,Reschedule,Перепланирование
-DocType: Employee Loan,Total Interest Payable,Общий процент кредиторов
+DocType: Loan,Total Interest Payable,Общий процент кредиторов
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Work Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Завершить
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,База
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,База
 DocType: Timesheet,Total Billed Hours,Всего Оплачиваемые Часы
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Списание Количество
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Списание Количество
 DocType: Leave Block List Allow,Allow User,Разрешить пользователю
 DocType: Journal Entry,Bill No,Номер накладной
 DocType: Company,Gain/Loss Account on Asset Disposal,Счет отражения прибыли / убытка от выбытия основных средств
 DocType: Vehicle Log,Service Details,Сведения о службе
 DocType: Vehicle Log,Service Details,Сведения о службе
-DocType: Subscription,Quarterly,Ежеквартально
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Сгруппировано
 DocType: Selling Settings,Delivery Note Required,Необходим Документы  Отгрузки
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Время Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,На основе обратного отнесения затрат на сырье и материалы
 DocType: Sales Invoice,Port Code,Код порта
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Резервный склад
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Резервный склад
 DocType: Lead,Lead is an Organization,Свинец - это Организация
 DocType: Guardian Interest,Interest,Интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предпродажа
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,Счета
 DocType: Vehicle,Odometer Value (Last),Значение одометра (последнее)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблоны критериев оценки поставщиков.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Оплата запись уже создан
 DocType: Request for Quotation,Get Suppliers,Получить поставщиков
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Просмотр Зарплата скольжению
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Просмотр Зарплата скольжению
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Счёт {0} был введен несколько раз
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Вы можете продлить действие только в случае истечения срока действия вашего членства в течение 30 дней
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Выбирайте только, если у вас есть настройки документов Cash Flow Mapper"
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Supplier Scorecard,Per Week,В неделю
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Продукт имеет модификации
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Продукт имеет модификации
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Всего учеников
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Продукт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компания и счетам
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,В цене
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,В цене
 DocType: Asset Settings,Depreciation Options,Варианты амортизации
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Недопустимое время проводки
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Недопустимое время проводки
 DocType: Lead,Campaign Name,Название кампании
 DocType: Hotel Room,Capacity,Вместимость
 DocType: Selling Settings,Close Opportunity After Days,Закрыть Opportunity После дней
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Клиентам Заказ Нет
 DocType: Budget,Budget Against,Бюджет против
 DocType: Employee,Cell Number,Количество звонков
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для данного критерия нет сотрудника. Убедитесь, что зарплатные слайды еще не созданы."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для данного критерия нет сотрудника. Убедитесь, что зарплатные слайды еще не созданы."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,"Запросы Авто материал, полученный"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Выберите таблицу
 DocType: BOM,Website Specifications,Сайт характеристики
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - неверный адрес электронной почты в поле «Получатели»
 DocType: Special Test Items,Particulars,Частности
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} типа {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: От {0} типа {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Несколько Цена Правила существует с теми же критериями, пожалуйста разрешить конфликт путем присвоения приоритета. Цена Правила: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Asset,Maintenance,Обслуживание
+DocType: Subscriber,Subscriber,подписчик
 DocType: Item Attribute Value,Item Attribute Value,Значение признака продукта
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Пожалуйста, обновите статус проекта"
 DocType: Item,Maximum sample quantity that can be retained,"Максимальное количество образцов, которое можно сохранить"
@@ -1077,26 +1073,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройки по умолчанию для корзину
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Добавить таймслоты
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset слом через журнал запись {0}
-DocType: Employee Loan,Interest Income Account,Счет Процентные доходы
+DocType: Loan,Interest Income Account,Счет Процентные доходы
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Отправлено приглашение на просмотр
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Биотехнологии
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Эксплуатационные расходы на офис
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Эксплуатационные расходы на офис
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Идти к
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Настройка учетной записи электронной почты
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Пожалуйста, введите сначала продукт"
 DocType: Asset Repair,Downtime,время простоя
 DocType: Account,Liability,Ответственность сторон
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Учебный термин:
 DocType: Salary Detail,Do not include in total,Не включать в общей сложности
 DocType: Company,Default Cost of Goods Sold Account,По умолчанию Себестоимость проданных товаров счет
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},"Количество образцов {0} не может быть больше, чем полученное количество {1}"
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Request for Quotation Supplier,Send Email,Отправить e-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Внимание: Неверное приложение {0}
 DocType: Item,Max Sample Quantity,Максимальное количество образцов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Нет разрешения
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Нет разрешения
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Ответить Цитировать
 DocType: Vital Signs,Heart Rate / Pulse,Частота сердечных сокращений / пульс
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
@@ -1107,12 +1103,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Продукты с более высоким весом будут показаны выше
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Лабораторные тесты и жизненные знаки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Подробности банковской сверки
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Строка # {0}: Актив {1} должен быть проведен
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Строка # {0}: Актив {1} должен быть проведен
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Сотрудник не найден
-DocType: Subscription,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студенческая группа уже обновлена.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студенческая группа уже обновлена.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Обновление проекта.
 DocType: SMS Center,All Customer Contact,Контакты всех клиентов
 DocType: Land Unit,Tree Details,Детали Дерево
@@ -1162,7 +1157,6 @@
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Все группы продуктов
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Work Order,Item To Manufacture,Продукт в производство
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} статус — {2}
@@ -1176,7 +1170,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Повторно выберите, если выбранный адрес отредактирован после сохранения"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Модификация продукта {0} с этими атрибутами уже существует
 DocType: Item,Hub Publishing Details,Сведения о публикации концентратора
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',«Открывается»
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',«Открывается»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Открыть список дел
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Lab Test Template,Result Format,Формат результата
@@ -1186,7 +1180,7 @@
 DocType: Payroll Entry,Bimonthly,Раз в два месяца
 DocType: Vehicle Service,Brake Pad,Комплект тормозных колодок
 DocType: Fertilizer,Fertilizer Contents,Содержание удобрений
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Научно-исследовательские и опытно-конструкторские работы
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Научно-исследовательские и опытно-конструкторские работы
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,"Сумма, Биллу"
 DocType: Company,Registration Details,Регистрационные данные
 DocType: Timesheet,Total Billed Amount,Общая сумма Объявленный
@@ -1200,7 +1194,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Обход проверки кредитного лимита по заказу клиента
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Служебная аттестация.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включение &quot;Использовать для Корзине», как Корзина включена и должно быть по крайней мере один налог Правило Корзина"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Оплата запись {0} связан с Орденом {1}, проверить, если он должен быть подтянут, как шаг вперед в этом счете-фактуре."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Оплата запись {0} связан с Орденом {1}, проверить, если он должен быть подтянут, как шаг вперед в этом счете-фактуре."
 DocType: Sales Invoice Item,Stock Details,Подробности Запасов
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Значимость проекта
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Торговая точка
@@ -1234,7 +1228,7 @@
 DocType: Restaurant Table,Minimum Seating,Минимальное размещение
 DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
 DocType: Examination Result,Examination Result,Экспертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Товарный чек
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Товарный чек
 ,Received Items To Be Billed,"Полученные товары, на которые нужно выписать счет"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Мастер Валютный курс.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
@@ -1242,15 +1236,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Work Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,ВМ {0} должен быть активным
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Нет доступных продуктов для перемещения
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,ВМ {0} должен быть активным
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Нет доступных продуктов для перемещения
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Закрытие (Открытие + Итого)
 DocType: Journal Entry,Depreciation Entry,Износ Вход
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
 DocType: Pricing Rule,Rate or Discount,Стоимость или скидка
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обязательные Кол-во
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Избранные
 DocType: Hub Settings,Custom Data,Пользовательские данные
@@ -1262,9 +1256,9 @@
 DocType: Medical Code,Medical Code Standard,Стандарт медицинского кода
 DocType: Soil Texture,Clay Composition (%),Состав глины (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Сохраните задачу перед назначением.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Валюта баланса
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Валюта баланса
 DocType: Lab Test,Lab Technician,Лаборант
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Прайс-лист продажи
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Прайс-лист продажи
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Если этот флажок установлен, клиент будет создан, привязанный к пациенту. С этого клиента будет создан счет-фактура пациента. Вы также можете выбрать существующего клиента при создании Пациента."
 DocType: Bank Reconciliation,Account Currency,Валюта счета
@@ -1272,16 +1266,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Пожалуйста, укажите округлить счет в компании"
 DocType: Purchase Receipt,Range,Диапазон
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
 DocType: Item Barcode,Item Barcode,Штрих-код продукта
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Модификация продукта {0} обновлена
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Модификация продукта {0} обновлена
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","для генерации. Если вы задерживаетесь, вам придется вручную изменить поле «Повторить в день месяца» этого"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
 DocType: Share Transfer,From Folio No,Из Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
@@ -1316,16 +1308,17 @@
 DocType: Asset,Available-for-use Date,Доступная для использования дата
 DocType: Guardian,Guardian Name,Имя опекуна
 DocType: Cheque Print Template,Has Print Format,Имеет формат печати
-DocType: Employee Loan,Sanctioned,санкционированные
+DocType: Loan,Sanctioned,санкционированные
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,"является обязательным. Может быть, Обмен валюты запись не создана для"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
 DocType: Crop Cycle,Crop Cycle,Цикл урожая
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для элементов 'Товарный набор', складской номер, серийный номер и номер партии будет подтягиваться из таблицы ""Упаковочный лист"". Если складской номер и номер партии одинаковы для всех пакуемых единиц для каждого наименования ""Товарного набора"", эти номера можно ввести в таблице основного наименования, значения будут скопированы в таблицу ""Упаковочного листа""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для элементов 'Товарный набор', складской номер, серийный номер и номер партии будет подтягиваться из таблицы ""Упаковочный лист"". Если складской номер и номер партии одинаковы для всех пакуемых единиц для каждого наименования ""Товарного набора"", эти номера можно ввести в таблице основного наименования, значения будут скопированы в таблицу ""Упаковочного листа""."
 DocType: Student Admission,Publish on website,Публикация на сайте
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,"Дата Поставщик Счет не может быть больше, чем Дата публикации"
+DocType: Subscription,Cancelation Date,Дата отмены
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
 DocType: Agriculture Task,Agriculture Task,Сельхоз-задача
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Косвенная прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Косвенная прибыль
 DocType: Student Attendance Tool,Student Attendance Tool,Student Участники Инструмент
 DocType: Restaurant Menu,Price List (Auto created),Прейскурант (автоматически создан)
 DocType: Cheque Print Template,Date Settings,Настройки даты
@@ -1352,6 +1345,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,метр
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Лабораторное тестирование datetime не может быть до даты сбора данных
+DocType: Subscription Plan,Cost,Стоимость
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
 DocType: Expense Claim,Total Advance Amount,Общая сумма аванса
 DocType: Delivery Stop,Estimated Arrival,ожидаемое прибытие
@@ -1363,15 +1357,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Загрузить шапку фирменного бланка и логотип. (Вы можете отредактировать их позднее).
 DocType: Timesheet Detail,Bill,Билл
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Белый
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Белый
 DocType: SMS Center,All Lead (Open),Всем Входящим (Созданным)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Вы можете выбрать только один вариант из списка флажков.
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
 DocType: Item,Automatically Create New Batch,Автоматически создавать новую группу
 DocType: Item,Automatically Create New Batch,Автоматически создавать новую группу
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Присвоение {0} {1} (строка {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Сделать
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Присвоение {0} {1} (строка {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Сделать
 DocType: Student Admission,Admission Start Date,Прием Начальная дата
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Новый сотрудник
@@ -1387,7 +1381,7 @@
 DocType: Holiday List,Holiday List Name,Название списка выходных
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сумма кредита
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Расписание курса
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Опционы
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Опционы
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Отключить получение последней информации о покупке в заказе на поставку
 DocType: Journal Entry Account,Expense Claim,Заявка на возмещение
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
@@ -1406,11 +1400,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Строка упаковочного листа
 DocType: Purchase Invoice,Cash/Bank Account,Наличные / Банковский счет
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Введите {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Создание вариантов было поставлено в очередь.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Резюме работы для {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Таблица атрибутов является обязательной
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Первый одобритель вылета в списке будет установлен как «Утверждающий по умолчанию».
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Plan,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} не может быть отрицательным
 DocType: Training Event,Self-Study,Самообучения
@@ -1423,7 +1418,7 @@
 DocType: Workstation,Wages,Заработная плата
 DocType: Asset Maintenance,Maintenance Manager Name,Имя менеджера обслуживания
 DocType: Agriculture Task,Urgent,Важно
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Пожалуйста, укажите действительный идентификатор строки для строки {0} в таблице {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Пожалуйста, укажите действительный идентификатор строки для строки {0} в таблице {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не удалось найти переменную:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Выберите поле для редактирования из numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Не может быть элементом фиксированного актива, так как создается складская книга."
@@ -1435,7 +1430,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Название шаблона контроля качества
 DocType: Project,First Email,Первая электронная почта
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервировано Склад в заказ клиента / склад готовой продукции
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажа Сумма
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажа Сумма
 DocType: Repayment Schedule,Interest Amount,Проценты Сумма
 DocType: Serial No,Creation Document No,Создание номера документа
 DocType: Share Transfer,Issue,Вопрос
@@ -1449,10 +1444,10 @@
 DocType: Tax Rule,Shipping State,Государственный Доставка
 ,Projected Quantity as Source,Планируемое количество как источник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Продукт должен быть добавлен с помощью кнопки ""Получить продукты из покупки '"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Доставка поездки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Доставка поездки
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип передачи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Расходы на продажи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Расходы на продажи
 DocType: Consultation,Diagnosis,диагностика
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
@@ -1461,12 +1456,13 @@
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Почтовый индекс
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Заказ клиента {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Выберите процентный доход в кредите {0}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Создание складской проводки
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
 DocType: Item,Default Supplier,Поставщик по умолчанию
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на производство Процент
-DocType: Employee Loan,Repayment Schedule,График погашения
+DocType: Loan,Repayment Schedule,График погашения
 DocType: Shipping Rule Condition,Shipping Rule Condition,Правило Начальные
 DocType: Holiday List,Get Weekly Off Dates,Получить Weekly Выкл Даты
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше, чем Дата начала"
@@ -1480,7 +1476,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
 DocType: Education Settings,Attendance Freeze Date,Дата остановки посещения
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Список несколько ваших поставщиков. Они могут быть организациями или частными лицами.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Показать все товары
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Показать все товары
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минимальный срок лида (в днях)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Все ВОМ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Номера отеля типа {0} недоступны в {1}
@@ -1488,14 +1484,16 @@
 DocType: Expense Claim,From Employee,От работника
 DocType: Driver,Cellphone Number,номер мобильного телефона
 DocType: Project,Monitor Progress,Мониторинг готовности
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
+DocType: Supplier Quotation,Auto Repeat Section,Секция автоматического повтора
 DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
 DocType: Program Enrollment,Transportation,Перевозки
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Неправильный атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} должен быть проведен
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Количество должно быть меньше или равно {0}
+DocType: Department Approver,Department Approver,Подтверждение департамента
 DocType: SMS Center,Total Characters,Всего символов
 DocType: Employee Advance,Claimed,Заявленное
 DocType: Crop,Row Spacing,Интервал между рядами
@@ -1505,6 +1503,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Оплата Примирение Счет
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Вклад%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","В соответствии с настройками покупки, если требуемый заказ на поставку == «ДА», то для создания счета-фактуры пользователю необходимо сначала создать заказ на поставку для пункта {0}"
+,HSN-wise-summary of outward supplies,HSN-краткая сводка внешних поставок
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Регистрационные номера компании для вашей справки. Налоговые числа и т.д.
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
@@ -1518,7 +1517,7 @@
 DocType: Setup Progress Action,Action Name,Название действия
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Год начала
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Первые 2 цифры GSTIN должны совпадать с номером государства {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Дату периода текущего счета-фактуры начнем
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Ошибка Планирования Мощностей
@@ -1536,26 +1535,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поля будут скопированы только во время создания.
 DocType: Setup Progress Action,Domains,Домены
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Управление
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Управление
 DocType: Cheque Print Template,Payer Settings,Настройки плательщика
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
 DocType: Purchase Invoice,Is Return,Является Вернуться
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,предосторожность
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',"Дата начала задачи '{0}' позже, чем дата завершения."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Возврат / дебетовые Примечание
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Возврат / дебетовые Примечание
 DocType: Price List Country,Price List Country,Цены Страна
 DocType: Item,UOMs,Единицы измерения
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} действительные серийные номера для продукта {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код товара не может быть изменен для серийный номер
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Код товара не может быть изменен для серийный номер
 DocType: Purchase Invoice Item,UOM Conversion Factor,Коэффициент пересчета единицы измерения
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Пожалуйста, введите код товара, чтобы получить номер партии"
 DocType: Stock Settings,Default Item Group,Продуктовая группа по умолчанию
-DocType: Employee Loan,Partially Disbursed,Частично Освоено
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Предоставить информацию.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Предоставить информацию.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База данных поставщиков.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Вы не можете перезапустить подписку, которая не отменена."
 DocType: Account,Balance Sheet,Балансовый отчет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
 DocType: Fee Validity,Valid Till,Годен до
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Общее собрание учителей родителей
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
@@ -1568,7 +1567,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Изменение группы клиентов для выбранного Клиента запрещено.
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Обновление предполагаемого времени прибытия.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Обновление предполагаемого времени прибытия.
 DocType: Program Enrollment Tool,Enrollment Details,Сведения о зачислении
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Выберите клиента
@@ -1588,18 +1587,20 @@
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Purchase Order,Group same items,Сгруппировать похожие продукты
 DocType: Purchase Invoice,Disable Rounded Total,Отключение закругленными Итого
-DocType: Employee Loan Application,Repayment Info,Погашение информация
+DocType: Department,Parent Department,Родительский отдел
+DocType: Loan Application,Repayment Info,Погашение информация
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
 DocType: Maintenance Team Member,Maintenance Role,Роль обслуживания
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Финансовый год {0} не найден
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Финансовый год {0} не найден
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Настройка сотрудников
 DocType: Sales Order,SO-,ТАК-
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронирование отеля
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Student,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Исследования
+DocType: Subscription Settings,Subscription Settings,Настройки подписки
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Исследования
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Announcement,All Students,Все студенты
@@ -1610,19 +1611,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Продуктовая группа с этим именем уже существует. Пожалуйста, измените название продукта или название продуктовой группы."
 DocType: Crop Cycle,Less than a year,"Меньше, чем год"
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продукт {0} не может быть партией
 DocType: Crop,Yield UOM,Доходность UOM
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
 DocType: Item,Is Item from Hub,Продукт из концентратора
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Оплачено дивидендов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Оплачено дивидендов
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Главная книга
 DocType: Stock Reconciliation,Difference Amount,Разница Сумма
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Д-р {0} в отпуске на {1}
 DocType: Purchase Invoice,Reverse Charge,Разрядка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Нераспределенная Прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Нераспределенная Прибыль
 DocType: Purchase Invoice,05-Change in POS,05-Изменение в POS
 DocType: Vehicle Log,Service Detail,Деталь обслуживания
 DocType: BOM,Item Description,Описание продукта
@@ -1637,12 +1638,12 @@
 DocType: Opportunity Item,Opportunity Item,Возможность Пункт
 ,Student and Guardian Contact Details,Студент и радетель Контактная информация
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Строка {0}: Для поставщика {0} Адрес электронной почты необходимо отправить по электронной почте
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Временное открытие
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Временное открытие
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Посмотреть профиль
 ,Employee Leave Balance,Сотрудник Оставить Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Patient Appointment,More Info,Подробнее
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
 DocType: Supplier Scorecard,Scorecard Actions,Действия в Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Пример: Мастера в области компьютерных наук
 DocType: Purchase Invoice,Rejected Warehouse,Склад непринятой продукции
@@ -1652,7 +1653,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,для
 DocType: Supplier Quotation Item,Lead Time in days,Время выполнения
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Сводка кредиторской задолженности
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Выплата заработной платы от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Выплата заработной платы от {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
@@ -1661,9 +1662,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторные тесты
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Небольшой
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Небольшой
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Открытие инструмента для создания счета-фактуры
 DocType: Education Settings,Employee Number,Общее число сотрудников
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Отменить счет после льготного периода
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 DocType: Project,% Completed,% Завершено
 ,Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
@@ -1677,7 +1679,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораторное тестирование Дата и время
 DocType: Email Digest,Add Quote,Добавить Цитата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Косвенные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 DocType: Agriculture Analysis Criteria,Agriculture,Сельское хозяйство
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Синхронизация Master Data
@@ -1708,16 +1710,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с дебетовой записью"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правило ценообразования сначала выбирается на основе поля «Применить на», значением которого может быть Позиция, Группа Позиций, Торговая Марка."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Сначала укажите код продукта
 DocType: Item,ITEM-,ПУНКТ-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+DocType: Subscription Plan,Billing Interval Count,Счет интервала фактурирования
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,Команда обновления
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Создание Формат печати
@@ -1743,7 +1746,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,"Альтернативный элемент не должен быть таким же, как код позиции"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Спецификация {0} не относится к продукту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Спецификация {0} не относится к продукту {1}
 DocType: Sales Partner,Target Distribution,Распределение цели
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Завершение предварительной оценки
 DocType: Salary Slip,Bank Account No.,Счет №
@@ -1760,7 +1763,7 @@
 DocType: BOM Operation,Workstation,Рабочая станция
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запрос на предложение поставщика
 DocType: Healthcare Settings,Registration Message,Регистрация сообщения
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Оборудование
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Оборудование
 DocType: Prescription Dosage,Prescription Dosage,Дозировка по рецепту
 DocType: Attendance,HR Manager,Менеджер отдела кадров
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Пожалуйста, выберите компанию"
@@ -1791,7 +1794,7 @@
 DocType: Project,Start and End Dates,Даты начала и окончания
 ,Delivered Items To Be Billed,"Поставленные товары, на которые нужно выписать счет"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Открыть ВОМ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
 DocType: Authorization Rule,Average Discount,Средняя скидка
 DocType: Project Update,Great/Quickly,Большой / Быстро
 DocType: Purchase Invoice Item,UOM,Единица измерения
@@ -1800,8 +1803,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Выберите партии для партии товара
 DocType: Asset,Depreciation Schedules,Амортизационные Расписания
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,В настройках GST можно выбрать следующие учетные записи:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,В настройках GST можно выбрать следующие учетные записи:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
 DocType: Payment Request,Transaction Currency,Валюта сделки
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},С {0} | {1} {2}
@@ -1812,6 +1815,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Среднедневные исходящие
 DocType: POS Profile,Campaign,Кампания
 DocType: Supplier,Name and Type,Наименование и тип
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
 DocType: Physician,Contacts and Address,Контакты и адрес
 DocType: Purchase Invoice,Contact Person,Контактное Лицо
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Ожидаемая Дата начала"" не может быть больше, чем ""Ожидаемая Дата окончания"""
@@ -1825,19 +1829,20 @@
 DocType: Student Admission,Eligibility and Details,Приемлемость и подробная информация
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Чистое изменение в основных фондов
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,С DateTime
 DocType: Email Digest,For Company,Для Компании
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запрос предложения отключен доступ из портала, для большего количества настроек портала проверки."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Переменная переменной Scorecard поставщика
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сумма покупки
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Сумма покупки
 DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Были ошибки, связанные с расписанием курсов"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Продукта {0} нет на складе
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Первый Подтвердитель расходов в списке будет установлен в качестве Утвердителя расходов по умолчанию.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,"не может быть больше, чем 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Продукта {0} нет на складе
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1858,15 +1863,16 @@
 DocType: Package Code,Package Code,Код пакета
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Ученик
 DocType: Purchase Invoice,Company GSTIN,Компания GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Отрицательное количество недопустимо
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Отрицательное количество недопустимо
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Налоговый Подробная таблица выбирается из мастера элемента в виде строки и хранится в этой области.
  Используется по налогам и сборам"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Сотрудник не может сообщить себе.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Сотрудник не может сообщить себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Если счет замораживается, записи разрешается ограниченных пользователей."
 DocType: Email Digest,Bank Balance,Банковский баланс
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Оставить утвердительный мандат в приложении «Оставить заявку»
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы, необходимая квалификация и т.д."
 DocType: Journal Entry Account,Account Balance,Остаток на счете
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Налоговый Правило для сделок.
@@ -1894,15 +1900,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"Термин платежа в строке {0}, возможно, является дубликатом."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Сельское хозяйство (бета)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Упаковочный лист
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Аренда площади для офиса
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Указать настройки СМС-шлюза
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Аренда площади для офиса
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Указать настройки СМС-шлюза
 DocType: Disease,Common Name,Распространенное имя
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Адресов пока нет.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
 DocType: Vital Signs,Blood Pressure,Кровяное давление
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Аналитик
 DocType: Item,Inventory,Товарный запас
 DocType: Item,Sales Details,Продажи Подробности
 DocType: Quality Inspection,QI-,Qi-
@@ -1912,15 +1918,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Подтвердить зарегистрированный курс для студентов в студенческой группе
 DocType: Notification Control,Expense Claim Rejected,Авансовый Отчет Отклонен
 DocType: Item,Item Attribute,Атрибут продукта
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Правительство
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Правительство
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Авансовый Отчет {0} уже существует для журнала автомобиля
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Название института
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Пожалуйста, введите Сумма погашения"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Пожалуйста, введите Сумма погашения"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Варианты продукта
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Зарплата скольжению работнику
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Выбор возможного поставщика
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Выбор возможного поставщика
 DocType: Sales Invoice,Source,Источник
 DocType: Customer,"Select, to make the customer searchable with these fields","Выберите, чтобы сделать поиск клиента с этими полями"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показать закрыто
@@ -1937,7 +1943,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Упаковочный лист (ы) отменены
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Поток денежных средств от инвестиционной
 DocType: Program Course,Program Course,Программа курса
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Homepage,Company Tagline for website homepage,Компания Слоган на главную страницу сайта
 DocType: Item Group,Item Group Name,Пункт Название группы
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый
@@ -1967,10 +1973,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Меморандум
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Введите все необходимые значения результата (ов)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Сводка дебиторской задолженности
-DocType: Employee Loan,Monthly Repayment Amount,Ежемесячная сумма погашения
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Сводка дебиторской задолженности
+DocType: Loan,Monthly Repayment Amount,Ежемесячная сумма погашения
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Открытие счетов-фактур
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Название единицы измерения
 DocType: GST HSN Code,HSN Code,Код HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Вклад Сумма
@@ -1992,7 +1998,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Пользователь {0} уже назначен врачу {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Требуется основной склад для выбранного продукта
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Рамка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Возможный поставщик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Возможный поставщик
+DocType: Journal Entry,JV-RET-,СП-RET-
 DocType: Budget,Monthly Distribution,Ежемесячно дистрибуция
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Список получателей пуст. Пожалуйста, создайте список"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Здравоохранение (бета)
@@ -2019,7 +2026,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нет продуктов для упаковки
 DocType: Shipping Rule Condition,From Value,От стоимости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Производство Количество является обязательным
-DocType: Employee Loan,Repayment Method,Способ погашения
+DocType: Loan,Repayment Method,Способ погашения
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Если этот флажок установлен, главная страница будет по умолчанию Item Group для веб-сайте"
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Претензии по счет компании.
@@ -2028,7 +2035,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Требуется сертификат
 DocType: Company,Default Holiday List,По умолчанию Список праздников
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Строка {0}: От времени и времени {1} перекрывается с {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Обязательства по запасам
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Обязательства по запасам
 DocType: Purchase Invoice,Supplier Warehouse,Склад поставщика
 DocType: Opportunity,Contact Mobile No,Связаться Мобильный Нет
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Выберите компанию
@@ -2036,7 +2043,7 @@
 DocType: Student Report Generation Tool,Print Section,Печать раздела
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Пользователь {0} не имеет профиля по умолчанию POS. Проверьте значение по умолчанию для строки {1} для этого пользователя.
 DocType: Student Group,Set 0 for no limit,Установите 0 для каких-либо ограничений
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Строка {idx}: {поле} требуется для создания счетов-фактур открытия {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Первичный адрес и контактная информация
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплаты на e-mail
@@ -2047,10 +2054,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Выберите хотя бы один домен.
 DocType: Dependent Task,Dependent Task,Зависимая задача
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
 DocType: SMS Center,Receiver List,Список получателей
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Поиск продукта
 DocType: Payment Schedule,Payment Amount,Сумма платежа
@@ -2060,7 +2067,7 @@
 DocType: Assessment Plan,Grading Scale,Оценочная шкала
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Уже закончено
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Запасы в руке
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Запасы в руке
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Успешно импортированно!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Платежная заявка {0} уже существует
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость выпущенных продуктов
@@ -2071,17 +2078,16 @@
 DocType: Quotation Item,Quotation Item,Цитата Пункт
 DocType: Customer,Customer POS Id,Идентификатор клиента POS
 DocType: Account,Account Name,Имя Учетной Записи
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Введите URL-адрес сервера Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Мастер типа поставщика.
 DocType: Purchase Order Item,Supplier Part Number,Номер детали поставщика
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 DocType: Share Balance,To No,Нет
-DocType: Subscription,Reference Document,Справочный документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} отменён или остановлен
 DocType: Accounts Settings,Credit Controller,Кредитная контроллер
-DocType: Grant Application,Applicant Type,Тип заявителя
+DocType: Loan,Applicant Type,Тип заявителя
 DocType: Purchase Invoice,03-Deficiency in services,03 - Недостаток услуг
 DocType: Delivery Note,Vehicle Dispatch Date,Автомобиль Отправка Дата
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарт медицинского стандарта по умолчанию
@@ -2092,13 +2098,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0} % оплачено
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Персонал
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Персонал
 DocType: Lead,Upper Income,Высокий уровень дохода
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,отклонять
 DocType: Journal Entry Account,Debit in Company Currency,Дебет в валюте компании
 DocType: BOM Item,BOM Item,ВМ продукта
 DocType: Appraisal,For Employee,Для сотрудника
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Сделать запись выплат
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Сделать запись выплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
 DocType: Company,Default Values,Значения По Умолчанию
 DocType: Membership,INR,INR
@@ -2128,10 +2134,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} должно быть больше 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Имеется в наличии
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Имеется в наличии
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирование мощности в течение (дней)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Закупка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ни одному продукту не изменено количество или объём.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ни одному продукту не изменено количество или объём.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обязательное поле — программа
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обязательное поле — программа
 DocType: Special Test Template,Result Component,Компонент результата
@@ -2152,7 +2158,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Включить праздники в отпуска как отпускные дни
 DocType: Sales Invoice,Packed Items,Упакованные продукты
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Претензия по гарантии по серийному номеру
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',«Итого»
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',«Итого»
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включить Корзина
 DocType: Employee,Permanent Address,Постоянный адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2170,10 +2176,10 @@
 DocType: Selling Settings,Selling Settings,Продажа Настройки
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Подтвердить действие
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Аукционы в Интернете
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,свершение
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Смотрите в корзину
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинговые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Отчет о нехватке продуктов
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Невозможно создать стандартные критерии. Переименуйте критерии
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
@@ -2196,9 +2202,9 @@
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Material Request,Transferred,Переданы
 DocType: Vehicle,Doors,двери
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Настройка ERPNext завершена!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Настройка ERPNext завершена!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Сбор платы за регистрацию пациентов
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Невозможно изменить атрибуты после транзакции с акциями. Сделайте новый предмет и переведите запас на новый элемент
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Невозможно изменить атрибуты после транзакции с акциями. Сделайте новый предмет и переведите запас на новый элемент
 DocType: Course Assessment Criteria,Weightage,Взвешивание
 DocType: Purchase Invoice,Tax Breakup,Распределение налогов
 DocType: Packing Slip,PS-,PS-
@@ -2234,12 +2240,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспортируйте отчет и распечатайте его с помощью приложения для электронных таблиц.
 DocType: Purchase Invoice Item,Batch No,№ партии
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Достижения сотрудников
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 DocType: Grant Application,Assessment  Mark (Out of 10),Оценка Оценка (из 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Нет
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Основные
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
@@ -2248,15 +2255,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Email Digest,Annual Expenses,годовые расходы
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Создать заказ на поставку
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Создать заказ на поставку
 DocType: SMS Center,Send To,Отправить
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
 DocType: Sales Team,Contribution to Net Total,Вклад в Сумму
 DocType: Sales Invoice Item,Customer's Item Code,Клиентский код продукта
 DocType: Stock Reconciliation,Stock Reconciliation,Инвентаризация запасов
 DocType: Territory,Territory Name,Территория Имя
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,У вас могут быть только планы с одинаковым биллинговым циклом в подписке
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявитель на работу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
@@ -2267,10 +2275,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Аттестации
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Учебные мероприятия
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Отслеживание ведет по источнику свинца.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие доставки
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Пожалуйста входите
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Пожалуйста входите
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Журнал технического обслуживания
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Вес нетто этого пакета. (Рассчитывается суммированием веса продуктов)
@@ -2278,11 +2286,11 @@
 DocType: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: Student Group,Instructors,Инструкторы
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,ВМ {0} должен быть проведён
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,ВМ {0} должен быть проведён
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Управление долями
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Оплата
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Склад {0} не связан ни с одной учетной записью, укажите учётную запись в записи склада или установите учётную запись по умолчанию в компании {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Управляйте свои заказы
 DocType: Work Order Operation,Actual Time and Cost,Фактическое время и стоимость
@@ -2292,7 +2300,7 @@
 DocType: Student Leave Application,Student Leave Application,Студент Оставить заявку
 DocType: Item,Will also apply for variants,Также применять к модификациям
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Вкл
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Собирать продукты в момент продажи.
@@ -2302,7 +2310,7 @@
 DocType: Item,Barcodes,штрихкоды
 DocType: Hub Category,Hub Node,Узел хаба
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели дублирующиеся продукты. Пожалуйста, исправьте и попробуйте снова."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Помощник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Помощник
 DocType: Asset Movement,Asset Movement,Движение активов
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Порядок работы {0} должен быть отправлен
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Новая корзина
@@ -2320,13 +2328,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Валюта платежа должна быть равна валюте валюты дефолта или валюте счета участника
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 DocType: Soil Texture,Loam,суглинок
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Строка {0}: дата выполнения не может быть до даты публикации
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Строка {0}: дата выполнения не может быть до даты публикации
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Произвести оплату запись
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Расходная накладная тенденции
 DocType: Leave Application,Apply / Approve Leaves,Применить / Утвердить отпуска
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Для
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
 DocType: Serial No,Delivery Document No,Номер документа доставки
@@ -2340,7 +2347,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Потребление материала не задано в настройках производства.
 DocType: Student,Student Mobile Number,Студент Мобильный телефон
 DocType: Item,Has Variants,Имеет варианты
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Невозможно переопределить элемент {0} в строке {1} больше, чем {2}. Чтобы разрешить перерасчет, пожалуйста, установите в настройках запаса"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Невозможно переопределить элемент {0} в строке {1} больше, чем {2}. Чтобы разрешить перерасчет, пожалуйста, установите в настройках запаса"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Обновить ответ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Вы уже выбрали продукты из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
@@ -2352,12 +2359,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Сначала выберите программу
 DocType: Patient Appointment,Patient Age,Возраст пациента
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Управление проектами
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Серийный номер {0} уже возвращен
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Серийный номер {0} уже возвращен
 DocType: Supplier,Supplier of Goods or Services.,Поставщик товаров или услуг.
 DocType: Budget,Fiscal Year,Отчетный год
 DocType: Asset Maintenance Log,Planned,планируемый
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Дебиторские счета по умолчанию, которые будут использоваться, если не установлены в Пациенте, чтобы заказать плату за консультацию."
 DocType: Vehicle Log,Fuel Price,Топливо Цена
+DocType: Bank Guarantee,Margin Money,Маржинальные деньги
 DocType: Budget,Budget,Бюджет
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Открыть
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
@@ -2371,16 +2379,16 @@
 DocType: Lead,Follow Up,Следовать за
 DocType: Item,Is Sales Item,Продаваемый продукт
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Структура продуктовых групп
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Техническое обслуживание Время
 ,Amount to Deliver,Сумма доставки
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Один и тот же элемент был введен несколько раз. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата начала не может быть раньше, чем год Дата начала учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Были ошибки.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Сотрудник {0} уже подал заявку на {1} между {2} и {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Были ошибки.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Сотрудник {0} уже подал заявку на {1} между {2} и {3}:
 DocType: Guardian,Guardian Interests,хранители Интересы
 DocType: Naming Series,Current Value,Текущее значение
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
 DocType: Education Settings,Instructor Records to be created by,Записи инструкторов должны быть созданы
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Создано {0}
 DocType: GST Account,GST Account,Учетная запись GST
@@ -2400,8 +2408,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Продуктовая группа на сайте
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Добавлено в Избранное
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Никакой оговорки о зарплате не было найдено для вышеуказанных выбранных критериев.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Пошлины и налоги
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Никакой оговорки о зарплате не было найдено для вышеуказанных выбранных критериев.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Пошлины и налоги
 DocType: Projects Settings,Projects Settings,Настройки проектов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплаты не могут быть отфильтрованы по {1}
@@ -2411,27 +2419,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Структура продуктовых групп
 DocType: Production Plan,Total Produced Qty,Общее количество произведенных
 DocType: Payroll Entry,Get Employee Details,Получить информацию о сотрудниках
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продан
 ,Item-wise Purchase History,Пункт мудрый История покупок
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовая сумма (Компания Валюта)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Сырье
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Сырье
 DocType: Payment Reconciliation Payment,Reference Row,Ссылка Row
 DocType: Installation Note,Installation Time,Время установки
 DocType: Sales Invoice,Accounting Details,Подробности ведения учета
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Удалить все транзакции этой компании
 DocType: Patient,O Positive,O Положительный
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ассигнования
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерий приемлемости
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Пожалуйста, введите Материал запросов в приведенной выше таблице"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Нет доступных платежей для записи журнала
 DocType: Item Attribute,Attribute Name,Имя атрибута
 DocType: BOM,Show In Website,Показать на сайте
 DocType: Shopping Cart Settings,Show Quantity in Website,Показать Количество в веб-сайт
-DocType: Employee Loan Application,Total Payable Amount,Общая сумма оплачивается
+DocType: Loan Application,Total Payable Amount,Общая сумма оплачивается
 DocType: Task,Expected Time (in hours),Ожидаемое время (в часах)
 DocType: Item Reorder,Check in (group),Заезд (группа)
 DocType: Soil Texture,Silt,наносы
@@ -2450,7 +2459,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Создать платёж
 DocType: Room,Room Name,Название комнаты
 DocType: Prescription Duration,Prescription Duration,Продолжительность рецепта
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставьте не могут быть применены / отменены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставьте не могут быть применены / отменены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
 DocType: Activity Cost,Costing Rate,Калькуляция Оценить
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Адреса клиентов и Контакты
 ,Campaign Efficiency,Эффективность кампании
@@ -2470,11 +2479,11 @@
 DocType: Chapter,Chapter,глава
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Носите
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Учетная запись по умолчанию будет автоматически обновляться в POS-счете, если выбран этот режим."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
 DocType: Asset,Depreciation Schedule,Амортизация Расписание
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Адреса и партнеры торговых партнеров
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Поаяся Дата должна быть в пределах от даты и до настоящего времени
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Поаяся Дата должна быть в пределах от даты и до настоящего времени
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,"Пожалуйста, установите Центр затрат по умолчанию в {0} компании."
 DocType: Item,Has Batch No,Имеет номер партии
@@ -2492,7 +2501,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
 DocType: Soil Texture,Soil Type,Тип почвы
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Новое сообщение
 ,Quotation Trends,Динамика предложений
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Безрукий мандат
@@ -2512,7 +2520,7 @@
 DocType: Hub Category,Hub Category,Категория концентратора
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Номер транспортного средства
-DocType: Employee Loan,Loan Amount,Сумма кредита
+DocType: Loan,Loan Amount,Сумма кредита
 DocType: Student Report Generation Tool,Add Letterhead,Добавить бланки
 DocType: Program Enrollment,Self-Driving Vehicle,Самоходное транспортное средство
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Постоянный счет поставщика
@@ -2541,9 +2549,9 @@
 DocType: Cash Flow Mapper,Position,Должность
 DocType: Patient,Patient Details,Сведения о пациенте
 DocType: Patient,B Positive,В позитивный
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 DocType: Patient Medical Record,Patient Medical Record,Медицинская запись пациента
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спорт
@@ -2551,8 +2559,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Общий фактический
 DocType: Lab Test UOM,Test UOM,Тест UOM
 DocType: Student Siblings,Student Siblings,"Студенческие Братья, сестры"
+DocType: Subscription Plan Detail,Subscription Plan Detail,Деталь плана подписки
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Пожалуйста, сформулируйте Компания"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Пожалуйста, сформулируйте Компания"
 ,Customer Acquisition and Loyalty,Приобретение и лояльности клиентов
 DocType: Asset Maintenance Task,Maintenance Task,Задача обслуживания
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Установите B2C Limit в настройках GST.
@@ -2567,6 +2576,7 @@
 ,BOM Search,Спецификация Поиск
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Общая потребляемая материальная стоимость (через вход запаса)
 DocType: Hub Settings,Company Registered,Зарегистрированная компания
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,"Дата не может быть меньше, чем с даты"
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Опубликуйте «На складе» или «Нет на складе» на концентраторе на основе имеющихся в наличии на складе.
 DocType: Vehicle,Fuel Type,Тип топлива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
@@ -2574,17 +2584,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Для продукта {2} на складе {3} остатки запасов для партии {0} станут отрицательными {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следующие запросы на материалы были созданы автоматически на основании минимального уровня запасов продукта
 DocType: Email Digest,Pending Sales Orders,В ожидании заказов на продажу
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Счёт {0} является недопустимым. Валюта счёта должна быть {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Счёт {0} является недопустимым. Валюта счёта должна быть {1}
 DocType: Employee,Create User Permission,Создать разрешение пользователя
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 DocType: Healthcare Settings,Remind Before,Напомнить
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
 DocType: Salary Component,Deduction,Вычет
 DocType: Item,Retain Sample,Сохранить образец
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
 DocType: Stock Reconciliation Item,Amount Difference,Сумма разница
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Цена продукта {0} добавлена в прайс-лист {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Цена продукта {0} добавлена в прайс-лист {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
 DocType: Territory,Classification of Customers by region,Классификация клиентов по регионам
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,В производстве
@@ -2594,8 +2605,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Расчетный банк себе баланс
 DocType: Normal Test Template,Normal Test Template,Шаблон нормального теста
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,отключенный пользователь
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Предложение
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Невозможно установить полученный RFQ без цитаты
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Предложение
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Невозможно установить полученный RFQ без цитаты
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всего Вычет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Выберите учетную запись для печати в валюте счета.
@@ -2603,7 +2614,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Это основано на транзакциях против этого пациента. См. Ниже подробное описание
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Стоимость Обновлено
 DocType: Patient,Date of Birth,Дата рождения
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Продукт {0} уже возвращен
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Продукт {0} уже возвращен
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,"Адрес лида, клиента"
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставщик Scorecard Setup
@@ -2614,14 +2625,15 @@
 DocType: Work Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Описание работы
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Описание работы
 DocType: Student Applicant,Applied,прикладная
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Снова откройте
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Снова откройте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кол-во в соответствии с ед.измерения запасов
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Имя Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Скидки на скидку 02
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите за кампаниями по продажам. Отслеживайте лидов, предложения, заказы и т. п. в «Кампаниях» и оцените отдачу от инвестиций."
+DocType: Department Approver,Approver,Утверждаю
 ,SO Qty,ТАК Кол-во
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Поле «Акционеру» не может быть пустым
 DocType: Guardian,Work Address,Рабочий адрес
@@ -2635,21 +2647,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Общая Выделенная сумма (Компания Валюта)
 DocType: Purchase Order Item,To be delivered to customer,Для поставляться заказчику
 DocType: BOM,Scrap Material Cost,Лом Материал Стоимость
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
 DocType: Grant Application,Email Notification Sent,Уведомление по электронной почте отправлено
 DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Код товара, склад, количество требуется в строке"
-DocType: Pricing Rule,Supplier,Поставщик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Код товара, склад, количество требуется в строке"
+DocType: Bank Guarantee,Supplier,Поставщик
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Показать данные платежа
 DocType: Consultation,Consultation Time,Время консультаций
 DocType: C-Form,Quarter,Квартал
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Прочие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Компания по умолчанию
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Название банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Выше
-DocType: Employee Loan,Employee Loan Account,Сотрудник ссудного счета
 DocType: Leave Application,Total Leave Days,Всего Оставить дней
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примечание: E-mail не будет отправлен отключенному пользователю
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Количество взаимодействий
@@ -2665,7 +2676,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Вес (в килограммах)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",главы / chapter_name оставить пустым автоматически после сохранения главы.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,"Пожалуйста, установите учетные записи GST в настройках GST"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,"Пожалуйста, установите учетные записи GST в настройках GST"
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Тип бизнеса
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Стоимость новой покупки
@@ -2674,12 +2685,13 @@
 DocType: Grant Application,Grant Description,Описание гранта
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
 DocType: Student Guardian,Others,Другое
+DocType: Subscription,Discounts,Скидки
 DocType: Payment Entry,Unallocated Amount,Нераспределенные Сумма
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Нет столько продуктов. Пожалуйста, выберите другое количество для {0}."
 DocType: POS Profile,Taxes and Charges,Налоги и сборы
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или услуга, которая покупается, продается, или хранится на складе."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Нет больше обновлений
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Это охватывает все оценочные карточки, привязанные к этой настройке"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ребенок Пункт не должен быть Bundle продукта. Пожалуйста, удалите пункт `{0}` и сохранить"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Банковские операции
@@ -2688,21 +2700,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
 DocType: Bin,Ordered Quantity,Заказанное количество
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Grading Scale,Grading Scale Intervals,Интервалы Оценочная шкала
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Прибыль за год
+DocType: Bank Guarantee,Name of Bank,Название банка
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Бухгалтерская запись для {2} может быть сделана только в валюте: {3}
 DocType: Fee Schedule,In Process,В процессе
 DocType: Authorization Rule,Itemwise Discount,Itemwise Скидка
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дерево финансовых счетов.
+DocType: Bank Guarantee,Reference Document Type,Ссылка Тип документа
 DocType: Cash Flow Mapping,Cash Flow Mapping,Отображение денежных потоков
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} против заказов клиентов {1}
 DocType: Account,Fixed Asset,Основное средство
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Учет сериями
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Электронная почта не найдена в контакте по умолчанию
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Создать секрет
-DocType: Employee Loan,Account Info,Информация об аккаунте
+DocType: Loan,Account Info,Информация об аккаунте
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 DocType: Fees,Include Payment,Включить оплату
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Созданы группы учащихся.
@@ -2710,24 +2725,24 @@
 DocType: Sales Invoice,Total Billing Amount,Всего счетов Сумма
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Программа в структуре вознаграждения и студенческой группе {0} отличается.
 DocType: Fee Schedule,Receivable Account,Счет Дебиторской задолженности
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
 DocType: Quotation Item,Stock Balance,Баланс запасов
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Заказы к оплате
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Исполнительный директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Исполнительный директор
 DocType: Purchase Invoice,With Payment of Tax,С уплатой налога
 DocType: Expense Claim Detail,Expense Claim Detail,Детали Авансового Отчета
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,ТРИПЛИКАЦИЯ ДЛЯ ПОСТАВЩИКА
 DocType: Land Unit,Is Container,Контейнер
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Это будет первый день цикла урожая
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Пожалуйста, выберите правильный счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Purchase Invoice Item,Weight UOM,Вес Единица измерения
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Список доступных Акционеров с номерами фолио
 DocType: Salary Structure Employee,Salary Structure Employee,Зарплата Структура сотрудников
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Показать атрибуты варианта
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Показать атрибуты варианта
 DocType: Student,Blood Group,Группа крови
 DocType: Course,Course Name,Название курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Пользователи, которые могут утвердить отпуска приложения конкретного работника"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Оборудование офиса
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол-во
 DocType: Fiscal Year,Companies,Компании
 DocType: Supplier Scorecard,Scoring Setup,Настройка подсчета очков
@@ -2746,7 +2761,7 @@
 DocType: Stock Entry,Total Incoming Value,Всего входное значение
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Дебет требуется
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупки
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Прайс-лист закупки
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблоны переменных показателей поставщика.
 DocType: Job Offer Term,Offer Term,Условие предложения
 DocType: Asset,Quality Manager,Менеджер по качеству
@@ -2758,13 +2773,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Общая сумма невыплаченных: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операция Сайт
 DocType: Supplier Scorecard,Supplier Score,Оценка поставщика
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Всего в счете-фактуре Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Всего в счете-фактуре Amt
 DocType: Supplier,Warn RFQs,Предупреждать о RFQ
 DocType: BOM,Conversion Rate,Коэффициент конверсии
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Поиск продукта
 DocType: Assessment Plan,To Time,Чтобы время
 DocType: Authorization Rule,Approving Role (above authorized value),Утверждении роль (выше уставного стоимости)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
+DocType: Loan,Total Amount Paid,Общая сумма
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Пожалуйста, выберите Вход для студентов, который является обязательным для оплачиваемого студента"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Пожалуйста, выберите Прейскурант, чтобы опубликовать цены."
@@ -2774,19 +2790,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} отключена
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Строка {0}: Завершена Кол-во не может быть больше, чем {1} для операции {2}"
 DocType: Manufacturing Settings,Allow Overtime,Разрешить Овертайм
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серийный продукт {0} не может быть обновлён с помощью ревизии склада, пожалуйста, используйте приходную накладную"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серийный продукт {0} не может быть обновлён с помощью ревизии склада, пожалуйста, используйте приходную накладную"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серийный продукт {0} не может быть обновлён с помощью ревизии склада, пожалуйста, используйте приходную накладную"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Серийный продукт {0} не может быть обновлён с помощью ревизии склада, пожалуйста, используйте приходную накладную"
 DocType: Training Event Employee,Training Event Employee,Обучение сотрудников Событие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максимальные образцы - {0} могут сохраняться для Batch {1} и Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Добавление временных интервалов
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Серийные номера необходимы для продукта {1}. Вы предоставили {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Серийные номера необходимы для продукта {1}. Вы предоставили {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка
 DocType: Training Event,Advance,авансировать
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,для повторного повторения.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Настройки шлюза без платы без оплаты
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Обмен Прибыль / убыток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Обмен Прибыль / убыток
 DocType: Opportunity,Lost Reason,Забыли Причина
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Строка # {0}: Учетная запись {1} не принадлежит компании {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Строка # {0}: Учетная запись {1} не принадлежит компании {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не удалось найти DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер образца
@@ -2805,7 +2820,6 @@
 DocType: Bin,Actual Quantity,Фактическое количество
 DocType: Shipping Rule,example: Next Day Shipping,Пример: доставка на следующий день
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серийный номер {0} не найден
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Подписка была {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Планирование программы
 DocType: Fee Schedule Program,Student Batch,Student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Создать студента
@@ -2821,14 +2835,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Электронная коммерция GSTIN
 DocType: Sales Order,Not Delivered,Не доставлен
 ,Bank Clearance Summary,Банк уплата по счетам итого
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
 DocType: Appraisal Goal,Appraisal Goal,Оценка Гол
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Предложить категорию?
 DocType: Stock Reconciliation Item,Current Amount,Текущий объем
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,здания
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,здания
 DocType: Fee Schedule,Fee Structure,Структура оплаты
 DocType: Timesheet Detail,Costing Amount,Калькуляция Сумма
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 DocType: Student Admission Program,Application Fee,Регистрационный взнос
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Провести Зарплатную ведомость
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
@@ -2836,12 +2849,13 @@
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
 DocType: SMS Log,Sender Name,Имя отправителя
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Критерии анализа сельского хозяйства
+DocType: HR Settings,Leave Approval Notification Template,Оставить шаблон уведомления об уведомлении
 DocType: POS Profile,[Select],[Выберите]
 DocType: Vital Signs,Blood Pressure (diastolic),артериальное давление (диастолическое)
 DocType: SMS Log,Sent To,Отправить
 DocType: Agriculture Task,Holiday Management,Праздничное управление
 DocType: Payment Request,Make Sales Invoice,Создать счёт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Дата следующего контакта не может быть в прошлом
 DocType: Company,For Reference Only.,Только для справки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Врач {0} недоступен в {1}
@@ -2859,7 +2873,7 @@
 DocType: Employee,New Workplace,Новый рабочий участок
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Расход материала
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Установить как Закрыт
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Нет продукта со штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Нет продукта со штрих-кодом {0}
 DocType: Normal Test Items,Require Result Value,Требовать значение результата
 DocType: Item,Show a slideshow at the top of the page,Показывать слайд-шоу в верхней части страницы
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2874,19 +2888,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
 DocType: Leave Block List,Allow Users,Разрешить пользователям
 DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Периодическая
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Подробное описание шаблонов движения денежных средств
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Управление кредитами
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Подписка отдельный доходы и расходы за вертикалей продукции или подразделений.
 DocType: Rename Tool,Rename Tool,Переименование файлов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Повторный заказ продукта
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Показать Зарплата скольжению
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,О передаче материала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Показать Зарплата скольжению
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,О передаче материала
 DocType: Fees,Send Payment Request,Отправить запрос на оплату
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 DocType: Water Analysis,Origin,происхождения
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
@@ -2901,14 +2915,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Ответственность подоходного налога
 DocType: Grading Scale Interval,Grade Description,Описание класса
 DocType: Stock Entry,Purchase Receipt No,Покупка Получение Нет
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задаток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Задаток
 DocType: Sales Invoice, Shipping Bill Number,Номер билета доставки
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,прослеживаемость
 DocType: Asset Maintenance Log,Actions performed,Выполненные действия
 DocType: Cash Flow Mapper,Section Leader,Руководитель раздела
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Источник финансирования (обязательства)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Источник финансирования (обязательства)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Сотрудник
+DocType: Bank Guarantee,Fixed Deposit Number,Номер фиксированного депозита
 DocType: Asset Repair,Failure Date,Дата отказа
 DocType: Sample Collection,Collected Time,Время сбора
 DocType: Company,Sales Monthly History,История продаж в месяц
@@ -2925,10 +2940,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Вы действительно хотите отменить эту встречу?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет услуг для гостиничных номеров
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Воронка продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Rename Tool,File to Rename,Файл Переименовать
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Выберите в строке {0} спецификацию для продукта
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Получение обновлений подписки
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Учетная запись {0} не совпадает с компанией {1} в Способе учетной записи: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Указанная ВМ {0} для продукта {1} не существует
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Курс:
@@ -2938,7 +2954,7 @@
 DocType: Notification Control,Expense Claim Approved,Авансовый Отчет Одобрен
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Нет рабочих заказов
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Фармацевтический
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Стоимость поставленных продуктов
 DocType: Selling Settings,Sales Order Required,Требования Заказа клиента
 DocType: Purchase Invoice,Credit To,Кредитная Для
@@ -2956,7 +2972,7 @@
 DocType: Request for Quotation Supplier,No Quote,Нет цитаты
 DocType: Warranty Claim,Raised By,Создал
 DocType: Payment Gateway Account,Payment Account,Счёт оплаты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Компенсационные Выкл
 DocType: Job Offer,Accepted,Принято
@@ -2968,7 +2984,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,результаты поиска
 DocType: Room,Room Number,Номер комнаты
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Название правила доставки
 DocType: Journal Entry Account,Payroll Entry,Ввод зарплаты
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Посмотреть рекорды
@@ -2978,7 +2994,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторный пробный образец
 DocType: Item Variant Settings,Allow Rename Attribute Value,Разрешить переименование значения атрибута
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Быстрый журнал запись
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить рейтинг, если ВМ упоминается agianst любого продукта"
 DocType: Restaurant,Invoice Series Prefix,Префикс серии Invoice
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
@@ -2986,8 +3002,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Интеграция с Google Maps не включена
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не проведен
+DocType: Subscription,Trialling,возможность проверки
 DocType: Member,Membership Expiry Date,Дата истечения срока членства
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} должен быть отрицательным в обратном документе
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} должен быть отрицательным в обратном документе
 ,Minutes to First Response for Issues,Протокол к First Response по делам
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Название института, для которого вы устанавливаете эту систему."
@@ -3006,7 +3023,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Единица Измерения
 DocType: Fiscal Year,Year End Date,Дата окончания года
 DocType: Task Depends On,Task Depends On,Задача зависит от
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Выявление
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Выявление
 DocType: Operation,Default Workstation,По умолчанию Workstation
 DocType: Notification Control,Expense Claim Approved Message,Сообщение об Одобрении Авансового Отчета
 DocType: Payment Entry,Deductions or Loss,Отчисления или убыток
@@ -3044,7 +3061,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
 DocType: Membership,USD,доллар США
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Создать счет-фактуру
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Остаток средств
@@ -3053,7 +3070,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Barcode {0} не является допустимым кодом {1}
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Конец года
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Предл/Лид %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Driver,Driver,Водитель
 DocType: Vital Signs,Nutrition Values,Значения питания
 DocType: Lab Test Template,Is billable,Является платным
@@ -3064,7 +3081,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Фактическая дата начала (с помощью Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Старение Диапазон 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Общая сумма аванса не может превышать общую заявленную сумму
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Общая сумма аванса не может превышать общую заявленную сумму
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3119,7 +3136,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Нельзя производить продукта {0} больше, чем в заказе на продажу ({1})"
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Выберите значения атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Причина выдачи документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Складской акт {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Складской акт {0} не проведен
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"«Следующий контакт через» не может быть тем же, что и email лида"
 DocType: Tax Rule,Billing City,Город платильщика
@@ -3136,7 +3153,8 @@
 DocType: Warranty Claim,Service Address,Адрес сервисного центра
 DocType: Asset Maintenance Task,Calibration,калибровка
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} - праздник компании
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Мебель и Светильники
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Оставить уведомление о состоянии
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Мебель и Светильники
 DocType: Item,Manufacture,Производство
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Установка компании
 ,Lab Test Report,Отчет лабораторного теста
@@ -3152,7 +3170,6 @@
 DocType: Crop,Planting Area,Площадь посадки
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
 DocType: Installation Note Item,Installed Qty,Установленное количество
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Это может быть связано с некоторыми недействительными адресами электронной почты в
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Вы добавили
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Обучение Результат
@@ -3162,16 +3179,17 @@
 DocType: Products Settings,Products per Page,Продукты на страницу
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Организация филиал мастер.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Отправить вопрос
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Коммунальные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Над
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Строка # {0}: Запись в журнале {1} не имеет учетной записи {2} или уже сопоставляется с другой купон
 DocType: Supplier Scorecard Criteria,Criteria Weight,Вес критериев
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Оставить уведомление об утверждении
 DocType: Buying Settings,Default Buying Price List,По умолчанию Покупка Прайс-лист
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Зарплата скольжения на основе Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Частота покупки
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Частота покупки
 DocType: Notification Control,Sales Order Message,Заказ клиента Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Вид оплаты
@@ -3193,6 +3211,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Корзина Настройки
 DocType: Journal Entry,Accounting Entries,Бухгалтерские Проводки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Если выбрано Правило ценообразования для «Rate», оно будет перезаписывать Прейскурант. Ценообразование Правильная ставка - это конечная ставка, поэтому дальнейшая скидка не должна применяться. Следовательно, в таких транзакциях, как «Порядок продаж», «Заказ на поставку» и т. Д., Он будет выбран в поле «Цена», а не в поле «Прейскурант»."
+DocType: Journal Entry,Paid Loan,Платный кредит
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Копия записи. Пожалуйста, проверьте Авторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Справочная дата
 DocType: Purchase Order,Ref SQ,Ссылка SQ
@@ -3209,7 +3228,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
 DocType: Patient Service Unit,Parent Service Unit,Группа родительского обслуживания
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Создать пользователя
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация упаковки для доставки (для печати)
@@ -3228,7 +3247,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Счет Доходов
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Доставка
 DocType: Volunteer,Weekdays,Будни
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: Restaurant Menu,Restaurant Menu,Меню ресторана
@@ -3236,7 +3255,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации
 DocType: Item Reorder,Material Request Type,Тип заявки на материал
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Отправить отзыв
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage полна, не спасло"
@@ -3244,10 +3263,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Вместимость номера
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Уже существует запись для элемента {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ссылка
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Вы потеряете записи ранее сгенерированных счетов-фактур. Вы действительно хотите перезапустить эту подписку?
 DocType: Lab Test,LP-,ЛВ
 DocType: Healthcare Settings,Registration Fee,Регистрационный взнос
 DocType: Budget,Cost Center,Центр затрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Заказ на сообщение
 DocType: Tax Rule,Shipping Country,Доставка Страна
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скрыть Налоговый идентификатор клиента от сделки купли-продажи
@@ -3256,20 +3276,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правило ценообразования делается для того, чтобы изменить Прайс-лист / определить процент скидки, основанный на некоторых критериях."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
 DocType: Employee Education,Class / Percentage,Класс / в процентах
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Руководитель отделов маркетинга и продаж
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Руководитель отделов маркетинга и продаж
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Подоходный налог
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Отслеживать лиды по отрасли.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Перейти к бланкам
+DocType: Subscription,Cancel At End Of Period,Отмена на конец периода
 DocType: Item Supplier,Item Supplier,Поставщик продукта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Не выбраны продукты для перемещения
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Не выбраны продукты для перемещения
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Настройки Запасов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
 DocType: Vehicle,Electric,электрический
 DocType: Task,% Progress,% Прогресс
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Прибыль / убыток от выбытия основных средств
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Прибыль / убыток от выбытия основных средств
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",В таблице ниже будет выбран только кандидат-студент со статусом «Approved».
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Номер учетной записи для учетной записи {0} недоступен. <br> Правильно настройте свой план счетов.
 DocType: Task,Depends on Tasks,Зависит от задач
@@ -3284,6 +3305,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Нет в наличии
 DocType: Volunteer,Volunteer Skills,Волонтерские навыки
 DocType: Appraisal,HR User,Сотрудник отдела кадров
+DocType: Bank Guarantee,Reference Document Name,Название ссылочного документа
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги и сборы, вычитаемые"
 apps/erpnext/erpnext/hooks.py +142,Issues,Вопросов
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
@@ -3297,7 +3319,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 DocType: Sales Invoice,SINV-RET-,СИНВ-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Очень Большой
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Очень Большой
+DocType: Loan,Loan Application,Заявка на получение ссуды
 DocType: Crop,Scientific Name,Научное название
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Всего Листья
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Повторно выберите, если выбранный контакт отредактирован после сохранения"
@@ -3306,13 +3329,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Количество
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Локальные
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы (активы)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должники
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Большой
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Большой
 DocType: Homepage Featured Product,Homepage Featured Product,Главная рекомендуемых продуктов
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Все группы по оценке
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Все группы по оценке
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новое название склада
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Общая {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Территория
@@ -3333,9 +3356,10 @@
 DocType: Fees,Fees,Оплаты
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Укажите Курс конвертировать одну валюту в другую
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Цитата {0} отменяется
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Общей суммой задолженности
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Общей суммой задолженности
 DocType: Sales Partner,Targets,Цели
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Пожалуйста, зарегистрируйте номер SIREN в файле информации о компании"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 DocType: Price List,Price List Master,Прайс-лист Мастер
 DocType: GST Account,CESS Account,CESS-аккаунт
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
@@ -3344,6 +3368,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Выберите пациента
 DocType: Price List,Applicable for Countries,Применимо для стран
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Имя параметра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Только оставьте приложения со статусом «Одобрено» и «Отклонено» могут быть представлены
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Студенческая группа Имя является обязательным в строке {0}
 DocType: Homepage,Products to be shown on website homepage,Продукты будут показаны на главную страницу сайта
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
@@ -3389,14 +3414,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,"Счет, уже созданный для всех платежных часов"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ошибка Имя: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Стоимость финансирования
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Если несколько пакетов одного типа (для печати)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Укажите клиента по умолчанию в настройках ресторана
 ,Salary Register,Доход Регистрация
 DocType: Warehouse,Parent Warehouse,Родитель склад
-DocType: C-Form Invoice Detail,Net Total,Чистая Всего
+DocType: Subscription,Net Total,Чистая Всего
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Спецификация по умолчанию для продукта {0} и проекта {1} не найдена
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Определение различных видов кредита
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Определение различных видов кредита
 DocType: Bin,FCFS Rate,Уровень FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Непогашенная сумма
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Время (в мин)
@@ -3428,11 +3453,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Корень аккаунт должна быть группа
 DocType: Drug Prescription,Drug Prescription,Рецепт лекарств
 DocType: Fees,FEE.,Плата
-DocType: Employee Loan,Repaid/Closed,Возвращенный / Closed
+DocType: Loan,Repaid/Closed,Возвращенный / Closed
 DocType: Item,Total Projected Qty,Общая запланированная Кол-во
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Показатель оценки не найден для элемента {0}, который требуется для учета записей для {1} {2}. Если элемент совершает транзакцию в качестве элемента оценки нулевой оценки в {1}, укажите это в таблице {1}. В противном случае, пожалуйста, создайте транзакцию входящего запаса для данного элемента или укажите показатель оценки в записи позиции, а затем попробуйте отправить или отменить эту запись"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 DocType: Course,Course Code,Код курса
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: POS Settings,Use POS in Offline Mode,Использовать POS в автономном режиме
@@ -3452,16 +3476,15 @@
 DocType: Purchase Invoice,Deemed Export,Рассмотренный экспорт
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,"Процент скидки может применяться либо к Прайс-листу, либо ко всем Прайс-листам."
-DocType: Subscription,Half-yearly,Раз в полгода
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Lab Test,LabTest Approver,Подтверждение LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Вы уже оценили критерии оценки {}.
 DocType: Vehicle Service,Engine Oil,Машинное масло
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Созданы рабочие задания: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Созданы рабочие задания: {0}
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Продукт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
-DocType: Employee Loan,Loan Details,Кредит Подробнее
+DocType: Loan,Loan Details,Кредит Подробнее
 DocType: Company,Default Inventory Account,Учетная запись по умолчанию
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Номера фолио не совпадают
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
@@ -3473,19 +3496,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Ссылка на все земельные единицы, в которых растет урожай"
 DocType: Account,Root Type,Корневая Тип
 DocType: Item,FIFO,FIFO (ФИФО)
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
 DocType: Item Group,Show this slideshow at the top of the page,Показать этот слайд-шоу в верхней части страницы
 DocType: BOM,Item UOM,Единиц продукта
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Cheque Print Template,Primary Settings,Основные настройки
 DocType: Purchase Invoice,Select Supplier Address,Выбрать адрес поставщика
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Добавить сотрудников
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Добавить сотрудников
 DocType: Purchase Invoice Item,Quality Inspection,Контроль качества
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Очень Маленький
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Очень Маленький
 DocType: Company,Standard Template,Стандартный шаблон
 DocType: Training Event,Theory,теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Кол-во в запросе на материалы меньше минимального количества для заказа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Кол-во в запросе на материалы меньше минимального количества для заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 DocType: Payment Request,Mute Email,Отключение E-mail
@@ -3505,11 +3528,10 @@
 DocType: SMS Log,No of Sent SMS,Кол-во отправленных СМС
 DocType: Antibiotic,Healthcare Administrator,Администратор здравоохранения
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Установить цель
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
 DocType: Dosage Strength,Dosage Strength,Дозировка
 DocType: Account,Expense Account,Расходов счета
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Программное обеспечение
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Цвет
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Цвет
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критерии оценки плана
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Дата истечения срока действия является обязательной для выбранного элемента
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Запретить заказы на поставку
@@ -3522,18 +3544,18 @@
 DocType: Patient,Personal and Social History,Личная и социальная история
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Пользователь {0} создан
 DocType: Fee Schedule,Fee Breakup for each student,Расплата за каждого студента
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Выберете Распределение по Месяцам, чтобы разбить цель"
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Изменить код
 DocType: Purchase Invoice Item,Valuation Rate,Оценка
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Прайс-лист Обмен не выбран
 DocType: Purchase Invoice,Availed ITC Cess,Пользуется ITC Cess
 ,Student Monthly Attendance Sheet,Student Ежемесячная посещаемость Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило доставки применимо только для продажи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата начала проекта
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,До
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Переименовать Входить
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студенческая группа или расписание курсов обязательно
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студенческая группа или расписание курсов обязательно
@@ -3554,7 +3576,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Перечислите свои продукты или услуги, которые вы покупаете или продаете."
 DocType: Water Analysis,Storage Temperature,Температура хранения
 DocType: Employee Attendance Tool,Unmarked Attendance,Немаркированных Посещаемость
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Исследователь
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Исследователь
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Программа набора студентов для обучения Инструмент
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Дата начала задачи {0} должна быть меньше даты завершения
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Имя или E-mail являются обязательными
@@ -3567,7 +3589,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и RFQ для этого поставщика должны выдаваться с осторожностью."
 DocType: Chapter,Non Profit Manager,Менеджер некоммерческих организаций
 DocType: BOM,Total Cost(Company Currency),Общая стоимость (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Серийный номер {0} создан
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Серийный номер {0} создан
 DocType: Homepage,Company Description for website homepage,Описание компании на главную страницу сайта
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных формах документов, таких как Счета и Документы  Отгрузки"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Название поставщика
@@ -3577,11 +3599,10 @@
 DocType: Employee,You can enter any date manually,Вы можете ввести любую дату вручную
 DocType: Healthcare Settings,Result Printed,Результат напечатан
 DocType: Asset Category Account,Depreciation Expense Account,Износ счет расходов
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Испытательный Срок
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Просмотреть {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Испытательный Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Project,Total Costing Amount (via Timesheets),Общая сумма калькуляции (через расписания)
-DocType: Employee Advance,Expense Approver,Подтверждающий расходы
+DocType: Department,Expense Approver,Подтверждающий расходы
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
 DocType: Project,Hourly,почасовой
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-группы к группе
@@ -3591,7 +3612,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки СМС
 DocType: Accounts Settings,Make Payment via Journal Entry,Платежи через журнал Вход
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Отпечатано на
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Отпечатано на
 DocType: Item,Inspection Required before Delivery,Перед отправкой необходима проверка
 DocType: Item,Inspection Required before Purchase,Перед приходованием необходима проверка
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В ожидании Деятельность
@@ -3601,7 +3622,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Минимум для заказа
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Ваша организация
 DocType: Fee Component,Fees Category,Категория плат
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Пожалуйста, введите даты снятия."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Пожалуйста, введите даты снятия."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Уведомить сотрудника
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
@@ -3611,7 +3632,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Уровень переупорядочения
 DocType: Company,Chart Of Accounts Template,План счетов бухгалтерского учета шаблона
 DocType: Attendance,Attendance Date,Посещаемость Дата
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Цена продукта {0} обновлена в прайс-листе {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Цена продукта {0} обновлена в прайс-листе {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,"Счет, имеющий субсчета не может быть преобразован в регистр"
 DocType: Purchase Invoice Item,Accepted Warehouse,Принимающий склад
@@ -3619,10 +3640,11 @@
 DocType: Item,Valuation Method,Метод оценки
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Отметить Полдня
 DocType: Sales Invoice,Sales Team,Отдел продаж
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Дублировать запись
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дублировать запись
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Введите имя Получателя перед отправкой.
 DocType: Program Enrollment Tool,Get Students,Получить Студенты
 DocType: Serial No,Under Warranty,Под гарантии
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Ошибка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Ошибка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По словам будет виден только вы сохраните заказ клиента.
 ,Employee Birthday,Сотрудник День рождения
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,"Пожалуйста, выберите Дата завершения для завершенного ремонта"
@@ -3641,7 +3663,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Зарезервировано для субподряда
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер Счета
 DocType: Shopping Cart Settings,Orders,Заказы
-DocType: Employee Leave Approver,Leave Approver,Подтверждение отпусков
+DocType: Department,Leave Approver,Подтверждение отпусков
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Выберите пакет
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Название группы по оценке
@@ -3686,7 +3708,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Отслеживаемый элемент концентратора
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГИНАЛ ДЛЯ ПОЛУЧАТЕЛЯ
 DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Это письмо автогенерировано
 DocType: Stock Settings,Freeze Stock Entries,Замораживание поступления запасов
 DocType: Program Enrollment,Boarding Student,Студент-интернат
 DocType: Asset,Expected Value After Useful Life,Ожидаемое значение после срока полезного использования
@@ -3711,22 +3732,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Рекордное {0} существует против Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Ссылка №{0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Амортизация Дошел вследствие выбытия активов
-DocType: Member,Member,член
+DocType: Loan,Member,член
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управление адресами
 DocType: Work Order Item,Work Order Item,Продукт под заказ
 DocType: Pricing Rule,Item Code,Код продукта
 DocType: Serial No,Warranty / AMC Details,Гарантия / подробная информация
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Менеджер по развитию
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
 DocType: Supplier Scorecard Period,Variables,переменные
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Закрытие (д-р)
 DocType: Cheque Print Template,Cheque Size,Cheque Размер
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Серийный номер {0} не в наличии
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
 DocType: Sales Invoice,Write Off Outstanding Amount,Списание суммы задолженности
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Учетная запись {0} не соответствует компании {1}
@@ -3735,7 +3756,6 @@
 DocType: Stock Settings,Default Stock UOM,Единица измерения запасов по умолчанию
 DocType: Asset,Number of Depreciations Booked,Количество отчислений на амортизацию бронирования
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Количество Всего
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Против Сотрудника кредита: {0}
 DocType: Landed Cost Item,Receipt Document,Документ получения
 DocType: Employee Education,School/University,Школа / университет
 DocType: Payment Request,Reference Details,Ссылка Подробнее
@@ -3746,7 +3766,7 @@
 DocType: Asset,Double Declining Balance,Двойной баланс Отклонение
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Закрытый заказ не может быть отменен. Отменить открываться.
 DocType: Student Guardian,Father,Отец
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Обновить запасы"" нельзя выбрать при продаже основных средств"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Обновить запасы"" нельзя выбрать при продаже основных средств"
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 DocType: Attendance,On Leave,в отпуске
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получить обновления
@@ -3760,10 +3780,10 @@
 DocType: Lead,Lower Income,Низкий уровень дохода
 DocType: Restaurant Order Entry,Current Order,Текущий заказ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоено Сумма не может быть больше, чем сумма займа {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},"Освоено Сумма не может быть больше, чем сумма займа {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Перейти в Программы
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Строка {0} # Выделенная сумма {1} не может быть больше, чем невостребованная сумма {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Строка {0} # Выделенная сумма {1} не может быть больше, чем невостребованная сумма {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
@@ -3786,7 +3806,6 @@
 DocType: Payment Terms Template,Payment Terms,Условия оплаты
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Минута
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 DocType: Chapter,Meetup Embed HTML,Вставить HTML-код
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Перейти к поставщикам
@@ -3805,30 +3824,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания продукта
 DocType: Sales Order,%  Delivered,% Доставлен
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Пожалуйста, установите идентификатор электронной почты для Студента, чтобы отправить Запрос оплаты"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Пожалуйста, установите идентификатор электронной почты для Студента, чтобы отправить Запрос оплаты"
 DocType: Patient,Medical History,История болезни
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Банковский овердрафтовый счет
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Банковский овердрафтовый счет
 DocType: Patient,Patient ID,Идентификатор пациента
 DocType: Physician Schedule,Schedule Name,Название расписания
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Сделать Зарплата Слип
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Добавить все поставщики
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Добавить все поставщики
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Строка # {0}: выделенная сумма не может превышать невыплаченную сумму.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Просмотр спецификации
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Обеспеченные кредиты
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Обеспеченные кредиты
 DocType: Purchase Invoice,Edit Posting Date and Time,Изменить дату и время публикации
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Пожалуйста, установите Амортизация соответствующих счетов в Asset Категория {0} или компании {1}"
 DocType: Lab Test Groups,Normal Range,Нормальный диапазон
 DocType: Academic Term,Academic Year,Учебный год
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Доступные продажи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Начальная Балансовая стоимость собственных средств
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Начальная Балансовая стоимость собственных средств
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,осталось
 DocType: Appraisal,Appraisal,Оценка
+DocType: Loan,Loan Account,Ссудная ссуда
 DocType: Purchase Invoice,GST Details,Детали GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Электронная почта отправляется поставщику {0}
 DocType: Item,Default Sales Unit of Measure,Единица измерения продаж по умолчанию
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Академический год:
+DocType: Subscription,Past Due Date,Прошлая дата погашения
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Не разрешить установку альтернативного элемента для элемента {0}
 DocType: Opportunity,OPTY-,ВЗМЖ-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторяется
@@ -3841,7 +3862,7 @@
 DocType: Patient Appointment,Patient Appointment,Назначение пациента
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Отказаться от этой Email Дайджест
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Получить поставщиков по
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Получить поставщиков по
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} не найден для продукта {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Перейти на курсы
 DocType: Accounts Settings,Show Inclusive Tax In Print,Показать Включенный налог в печать
@@ -3849,10 +3870,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Сообщение отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,"Счет с дочерних узлов, не может быть установлен как книгу"
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему именования инструкторов в образовании&gt; Настройки образования"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Курс по которому валюта Прайс листа конвертируется в базовую валюту покупателя
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (валюта Компании)
 DocType: Physician,Physician Schedules,Расписания врачей
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Общая сумма аванса не может превышать общую сумму санкций
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Общая сумма аванса не может превышать общую сумму санкций
 DocType: Salary Slip,Hour Rate,Часовой разряд
 DocType: Stock Settings,Item Naming By,Наименование продукта по
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
@@ -3870,6 +3892,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Не допускается обновление операций перемещений по складу, старше чем {0}"
 DocType: BOM,Inspection Required,Инспекция Обязательные
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Перед отправкой введите номер банковской гарантии.
 DocType: Driving License Category,Class,Класс
 DocType: Sales Order,Fully Billed,Полностью Объявленный
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Рабочий ордер не может быть поднят против шаблона предмета
@@ -3880,7 +3903,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + вес упаковки. (Для печати)
 DocType: Assessment Plan,Program,программа
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему именования инструкторов в образовании&gt; Настройки образования"
 DocType: Serial No,Is Cancelled,Является Отмененные
 DocType: Student Group,Group Based On,Группа основана на
 DocType: Student Group,Group Based On,Группа основана на
@@ -3892,9 +3914,10 @@
 DocType: Cheque Print Template,Cheque Height,Cheque Высота
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
 DocType: Setup Progress,Setup Progress,Установка готовности
+DocType: Expense Claim,Approval Status,Статус утверждения
 DocType: Hub Settings,Publish Items to Hub,Опубликовать товары в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От значение должно быть меньше, чем значение в строке {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Банковский перевод
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Отметить все
 ,Issued Items Against Work Order,Продукты выпущенные под заказ
 DocType: Vehicle Log,Invoice Ref,Счет-фактура Ссылка
@@ -3925,12 +3948,11 @@
 DocType: Customs Tariff Number,Tariff Number,Тарифный номер
 DocType: Work Order Item,Available Qty at WIP Warehouse,Доступное количество в WIP-хранилище
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Проектированный
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитата Сообщение
-DocType: Employee Loan,Employee Loan Application,Служащая заявка на получение кредита
 DocType: Issue,Opening Date,Дата открытия
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Сначала сохраните пациента
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Сначала сохраните пациента
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Зрители были успешно отмечены.
 DocType: Program Enrollment,Public Transport,Общественный транспорт
 DocType: Soil Texture,Silt Composition (%),Состав ила (%)
@@ -3949,7 +3971,7 @@
 ,Item Balance (Simple),Остаток продукта (простой)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Платежи Поставщикам
 DocType: POS Profile,Write Off Account,Списание счет
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Дебетовая нота
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Дебетовая нота
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный период (дней)
@@ -3972,6 +3994,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Дата Заказа клиента
 DocType: Sales Invoice Item,Delivered Qty,Поставляемое кол-во
 DocType: Assessment Plan,Assessment Plan,План оценки
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Обратная запись журнала
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} создан.
 DocType: Stock Settings,Limit Percent,Предельный процент
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Сейчас нет доступного запаса на складах
@@ -3985,14 +4008,15 @@
 DocType: Journal Entry,Stock Entry,Поступление запасов
 DocType: Payment Entry,Payment References,Ссылки оплаты
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Количество интервалов для поля интервалов, например, если Interval является «Days», а количество интервалов фактурирования - 3, счета-фактуры будут генерироваться каждые 3 дня"
 DocType: Vehicle,Insurance Details,Страхование Подробнее
 DocType: Account,Payable,К оплате
 DocType: Share Balance,Share Type,Share Тип
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Пожалуйста, введите сроки погашения"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Пожалуйста, введите сроки погашения"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Должники ({0})
 DocType: Pricing Rule,Margin,Разница
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Новые клиенты
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Валовая Прибыль%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Валовая Прибыль%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Изменить профиль POS
 DocType: Bank Reconciliation Detail,Clearance Date,Клиренс Дата
@@ -4002,10 +4026,11 @@
 DocType: Lead,Address Desc,Адрес по убыванию
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Партия является обязательным
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Были найдены строки с повторяющимися датами в других строках: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Были найдены строки с повторяющимися датами в других строках: {list}
 DocType: Topic,Topic Name,Название темы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Пожалуйста, установите шаблон по умолчанию для уведомления об утверждении по уходу в настройках HR."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Выберите сотрудника, чтобы получить работу сотрудника."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Выберите сотрудника, чтобы получить работу сотрудника."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Пожалуйста выберите правильную дату
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Выберите характер вашего бизнеса.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4024,7 +4049,7 @@
 DocType: Asset Movement,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Счет на продажу {0} создан
 DocType: Employee,Confirmation Date,Дата подтверждения
 DocType: C-Form,Total Invoiced Amount,Всего Сумма по счетам
@@ -4033,7 +4058,7 @@
 DocType: Account,Accumulated Depreciation,начисленной амортизации
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Постоянное имя
 DocType: Stock Entry,Customer or Supplier Details,Детали по Заказчику или Поставщику
-DocType: Employee Loan Application,Required by Date,Требуется Дата
+DocType: Loan Application,Required by Date,Требуется Дата
 DocType: Lead,Lead Owner,Ответственный
 DocType: Production Plan,Sales Orders Detail,Сведения о заказах на продажу
 DocType: Bin,Requested Quantity,Запрашиваемое количество
@@ -4046,10 +4071,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Итого Вычет - Погашение кредита
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Зарплата скольжения ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Несколько вариантов
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% доставлено
+DocType: Subscription,Trial Period Start Date,Дата начала пробного периода
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Войдите в систему как другой пользователь.
@@ -4070,12 +4096,11 @@
 DocType: Student Guardian,Student Guardian,Студент-хранитель
 DocType: Member,Member Name,Имя участника
 DocType: Stock Settings,Use Naming Series,Использование серии имен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновление стока
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в подписке
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные единицы измерения (ЕИ) продуктов приведут к некорректному (общему) значению массы нетто. Убедитесь, что вес нетто каждого продукта находится в одной ЕИ."
 DocType: Membership,Payment Details,Детали оплаты
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Цена спецификации
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Цена спецификации
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Прекращенный рабочий заказ не может быть отменен, отмените его сначала, чтобы отменить"
 DocType: Asset,Journal Entry for Scrap,Запись в журнале для лома
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните продукты из транспортной накладной
@@ -4095,6 +4120,7 @@
 DocType: Land Unit,Land Unit,Земельный участок
 ,Purchase Analytics,Аналитика поставок
 DocType: Sales Invoice Item,Delivery Note Item,Доставка Примечание Пункт
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Текущий счет-фактура {0} отсутствует
 DocType: Asset Maintenance Log,Task,Задача
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка строка #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Номер партии является обязательным для продукта {0}
@@ -4107,7 +4133,7 @@
 DocType: Company,Exchange Gain / Loss Account,Обмен Прибыль / убытках
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Сотрудник и посещаемости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Заполните и сохранить форму
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Заполните и сохранить форму
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Количество штук в наличии
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Количество штук в наличии
@@ -4122,7 +4148,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Стандартная ставка продажи
 DocType: Account,Rate at which this tax is applied,Курс по которому этот налог применяется
 DocType: Cash Flow Mapper,Section Name,Название раздела
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Изменить порядок Кол-во
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Изменить порядок Кол-во
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списать
@@ -4133,9 +4159,9 @@
 DocType: Task,depends_on,зависит от
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очередь для обновления последней цены во всех Биллях материалов. Это может занять несколько минут.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Название нового счёта. Примечание: Пожалуйста, не создавайте счета для клиентов и поставщиков"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
 DocType: Water Analysis,Appearance,Внешность
+DocType: HR Settings,Leave Status Notification Template,Оставить шаблон уведомления о состоянии
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Цена прайс-листа
 DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Информация о членах.
@@ -4158,7 +4184,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Не разрешено. Отключите тестовый шаблон
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Crop Cycle,Linked Land Unit,Связанная земельная единица
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Из КУА
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
@@ -4174,7 +4200,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Перейти к Пользователям
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Оплаченная сумма + сумма списания не могут быть больше общего итога
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} недопустимый номер партии для продукта {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Недопустимый GSTIN или введите NA для незарегистрированных
 DocType: Training Event,Seminar,Семинар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Программа Зачисление Плата
@@ -4190,14 +4216,14 @@
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 DocType: Company,Create Chart Of Accounts Based On,"Создание плана счетов бухгалтерского учета, основанные на"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Невозможно преобразовать его в не-группу. Существуют детские задачи.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старые запасы (Неликвиды)
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} существует против студента заявителя {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Коррекция округления (валюта компании)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Табель
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,После полудня
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Cheque Print Template,Scanned Cheque,Сканированные чеками
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправлять автоматические  электронные письма Контактам по проводимым операциям.
@@ -4213,7 +4239,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Проект {0} уже существует
 DocType: Medical Department,Nursing User,Уход за больным
 DocType: Plant Analysis,Plant Analysis Criterias,Критерий анализа оборудования
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Обязанности
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Серийный номер {0} не принадлежит к пакету {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Обязанности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Срок действия этой цитаты закончился.
 DocType: Expense Claim Account,Expense Claim Account,Счет Авансового Отчета
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешить статичные обменные курсы
@@ -4235,11 +4262,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Сделать модификации
 DocType: Item,Default BOM,По умолчанию BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Общая сумма выставленных счетов (через счета-фактуры)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Сумма дебетовой ноты
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Сумма дебетовой ноты
 DocType: Project Update,Not Updated,Не обновляется
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Существуют несоответствия между ставкой, количеством акций и рассчитанной суммой"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Общая сумма задолженности по Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Общая сумма задолженности по Amt
 DocType: Journal Entry,Printing Settings,Настройки печати
 DocType: Employee Advance,Advance Account,Предварительный счет
 DocType: Job Offer,Job Offer Terms,Условия работы
@@ -4248,7 +4275,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Автомобилестроение
 DocType: Vehicle,Insurance Company,Страховая компания
 DocType: Asset Category Account,Fixed Asset Account,Счет учета основных средств
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,переменная
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,переменная
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из накладной
 DocType: Chapter,Members,члены
 DocType: Student,Student Email Address,Студент E-mail адрес
@@ -4271,7 +4298,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Стажер
 DocType: Delivery Stop,Address Name,Адрес
 DocType: Stock Entry,From BOM,Из спецификации
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Разделение {0} единиц {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Разделение {0} единиц {1}
 DocType: Assessment Code,Assessment Code,Код оценки
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Перемещения по складу до {0} заморожены
@@ -4279,25 +4306,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,платежный документ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Ошибка оценки формулы критериев
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+DocType: Subscription,Plans,планы
 DocType: Salary Slip,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Запрос на материал
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Произошла ошибка при создании повторяющихся
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Запрос на материал
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Дата предложения
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете обновить без подключения к сети.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Ни один студент группы не создано.
 DocType: Purchase Invoice Item,Serial No,Серийный номер
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Ежемесячное погашение Сумма не может быть больше, чем сумма займа"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,"Ежемесячное погашение Сумма не может быть больше, чем сумма займа"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Строка # {0}: ожидаемая дата поставки не может быть до даты заказа на поставку
 DocType: Purchase Invoice,Print Language,Язык печати
 DocType: Salary Slip,Total Working Hours,Всего часов работы
 DocType: Sales Invoice,Customer PO Details,Детали заказа клиента
-DocType: Subscription,Next Schedule Date,Следующая дата расписания
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Временный вступительный счет
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Введите значение должно быть положительным
@@ -4326,11 +4352,11 @@
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,"От и До даты, необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Фондовые и товарные биржи
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Нет сотрудников по указанным критериям
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
 DocType: Hotel Settings,Default Customer,Клиент по умолчанию
 DocType: Assessment Plan,Supervisor Name,Имя супервизора
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Не подтверждайте, назначено ли назначение на тот же день"
@@ -4355,16 +4381,16 @@
 DocType: Journal Entry Account,Employee Advance,Продвижение сотрудников
 DocType: Payroll Entry,Payroll Frequency,Расчет заработной платы Частота
 DocType: Lab Test Template,Sensitivity,чувствительность
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Сырьё
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Сырьё
 DocType: Leave Application,Follow via Email,Следить по электронной почте
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Растения и Механизмов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Растения и Механизмов
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ежедневные Настройки работы Резюме
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,"Пожалуйста, введите Reqd by Date"
 DocType: Payment Entry,Internal Transfer,Внутренний трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи обслуживания
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
 DocType: Leave Control Panel,Carry Forward,Переносить
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
@@ -4372,14 +4398,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Интеграция ERPNext
 DocType: Crop Cycle,Detected Disease,Обнаруженная болезнь
 ,Produced,Произведено
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Дата начала погашения не может быть до даты выплаты.
 DocType: Item,Item Code for Suppliers,Код продукта для поставщиков
 DocType: Issue,Raised By (Email),Создал (Email)
 DocType: Training Event,Trainer Name,Имя тренера
 DocType: Mode of Payment,General,Основное
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последнее сообщение
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последнее сообщение
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть, когда категория для ""Оценка"" или ""Оценка и Всего"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Требуются серийные номера для серийного продукта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть, когда категория для ""Оценка"" или ""Оценка и Всего"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Требуются серийные номера для серийного продукта {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Соответствие Платежи с счетов-фактур
 DocType: Journal Entry,Bank Entry,Банковская запись
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
@@ -4393,7 +4420,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Д-р {0} в полдня на {1}
 DocType: Production Plan,Get Material Request,Получить заявку на материал
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Почтовые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (сумма)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 ,Item Variant Details,Подробности модификации продукта
@@ -4404,9 +4431,9 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последний счет на продажу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Выберите кол-во продукта {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Тип лида
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,На все эти продукты уже выписаны счета
 DocType: Company,Monthly Sales Target,Месячная цель продаж
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
@@ -4414,7 +4441,7 @@
 DocType: Item,Default Material Request Type,Тип заявки на материал по умолчанию
 DocType: Supplier Scorecard,Evaluation Period,Период оценки
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,неизвестный
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Рабочий заказ не создан
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Рабочий заказ не создан
 DocType: Shipping Rule,Shipping Rule Conditions,Правило перевозки груза
 DocType: Purchase Invoice,Export Type,Тип экспорта
 DocType: Salary Slip Loan,Salary Slip Loan,Зарплатный ссудный кредит
@@ -4430,8 +4457,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Открытие счета-фактуры
 DocType: Education Settings,Education Manager,Менеджер по образованию
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Минимальная длина между каждой установкой в поле для оптимального роста
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Пакетированный продукт {0} не может быть обновлён с помощью инвентаризации склада, вместо этого используется приход по складу"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Пакетированный продукт {0} не может быть обновлён с помощью инвентаризации склада, вместо этого используется приход по складу"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Пакетированный продукт {0} не может быть обновлён с помощью инвентаризации склада, вместо этого используется приход по складу"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Пакетированный продукт {0} не может быть обновлён с помощью инвентаризации склада, вместо этого используется приход по складу"
 DocType: Quality Inspection,Report Date,Дата отчета
 DocType: Student,Middle Name,Второе имя
 DocType: C-Form,Invoices,Счета
@@ -4464,20 +4491,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
 DocType: Serial No,AMC Expiry Date,Срок действия AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Квитанция
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Квитанция
 ,Sales Register,Книга продаж
 DocType: Daily Work Summary Group,Send Emails At,Отправить по электронной почте на
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Просмотр формы
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,"Утверждение о расходах, обязательный для покрытия расходов"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Добавьте пользователей в свою организацию, кроме вас."
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Клиентов еще нет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,О движении денежных средств
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Нет созданных заявок на материал
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Лицензия
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
@@ -4500,11 +4528,12 @@
 DocType: Vehicle,Chassis No,Шасси Нет
 DocType: Payment Request,Initiated,По инициативе
 DocType: Production Plan Item,Planned Start Date,Планируемая дата начала
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Выберите спецификацию
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Выберите спецификацию
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Доступный Интегрированный налог МТЦ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
+DocType: Bank Guarantee,Clauses and Conditions,Положения и условия
 DocType: Serial No,Creation Document Type,Создание типа документа
 DocType: Project Task,View Timesheet,Просмотр табеля
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,"Дата окончания должна быть больше, чем дата начала"
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Leave Allocation,New Leaves Allocated,Новые листья Выделенные
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
@@ -4518,9 +4547,10 @@
 DocType: Patient,Alcohol Current Use,Использование алкоголя
 DocType: Student Admission Program,Student Admission Program,Программа приема студентов
 DocType: Payment Entry,Account Paid To,Счет оплачены до
+DocType: Subscription Settings,Grace Period,Льготный период
 DocType: Item Alternative,Alternative Item Name,Альтернативное название товара
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Не удалось отправить жалобу на зарплату <br> \ Возможные причины: <br> \ 1. Чистая заработная плата меньше 0. <br> \ 2. Адрес электронной почты компании, указанный в заголовке сотрудника, недействителен. <br>"
@@ -4530,7 +4560,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет по Счету {1} для {2} {3} составляет {4}. Он будет израсходован к {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Из кол-ва
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и unchcked Отключено в
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Финансовые услуги
 DocType: Student Sibling,Student ID,Студенческий билет
@@ -4542,14 +4571,16 @@
 DocType: Complaint,Complaint,жалоба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Сделать заявку на погашение
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Все отделы
 DocType: Patient,Alcohol Past Use,Использование алкоголя в прошлом
 DocType: Fertilizer Content,Fertilizer Content,Содержание удобрений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Проблемные / Штук
 DocType: Tax Rule,Billing State,Государственный счетов
 DocType: Share Transfer,Transfer,Переложить
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Рабочий заказ {0} должен быть отменен до отмены этого заказа клиента
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
@@ -4573,10 +4604,11 @@
 DocType: Cheque Print Template,Message to show,"Сообщение, чтобы показать"
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Розничная торговля
 DocType: Student Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Продуктовый набор
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Продуктовый набор
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Не удалось найти результат, начинающийся с {0}. Вы должны иметь постоянные баллы, покрывающие 0 до 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
+DocType: Subscription,Current Invoice Start Date,Дата начала текущего счета
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Требуется указать сумму дебета или кредита для {2}
 DocType: GL Entry,Remarks,Примечания
@@ -4586,11 +4618,13 @@
 DocType: Task,Parent Task,Родительская задача
 DocType: Journal Entry,Write Off Based On,Списание на основе
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Создать лид
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печать и канцелярские
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Печать и канцелярские
 DocType: Stock Settings,Show Barcode Field,Показать поле штрих-кода
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Отправить Поставщик электронных писем
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Отправить Поставщик электронных писем
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
+DocType: Fiscal Year,Auto Created,Автосоздан
 DocType: Chapter Member,Leave Reason,Оставить разум
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Счет-фактура {0} больше не существует
 DocType: Guardian Interest,Guardian Interest,Опекун Проценты
 DocType: Volunteer,Availability,Доступность
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Настройка значений по умолчанию для счетов-фактур POS
@@ -4599,14 +4633,13 @@
 DocType: Timesheet,Employee Detail,Сотрудник Деталь
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификатор электронной почты Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Идентификатор электронной почты Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,день Дата следующего и повторить на День месяца должен быть равен
 DocType: Lab Prescription,Test Code,Тестовый код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки для сайта домашнюю страницу
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},"Запросы не допускаются для {0} из-за того, что значение показателя {1}"
 DocType: Job Offer,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Выше
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Общая сумма {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Общая сумма {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Упомяните, если нестандартный подлежащий оплате счет"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Выберите группу оценки, отличную от «Все группы оценки»,"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Строка {0}: МВЗ требуется для элемента {1}
@@ -4617,7 +4650,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Анализ воды
 DocType: Chapter,Region,Область
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Обновить связанный анализ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Например, 2012, 2012-13"
@@ -4633,7 +4666,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Стоимость списанных активов
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
 DocType: Vehicle,Policy No,Политика Нет
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Получить продукты из продуктового набора
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Получить продукты из продуктового набора
 DocType: Asset,Straight Line,Прямая линия
 DocType: Project User,Project User,Пользователь проекта
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Трещина
@@ -4672,21 +4705,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Дорожка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге, как это имеет дочерние узлы"
 DocType: Production Plan,Total Planned Qty,Общее количество запланированных
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Начальное значение
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Начальное значение
 DocType: Salary Detail,Formula,формула
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Шаблон лабораторных тестов
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Сбыт
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Сбыт
 DocType: Purchase Invoice Item,Total Weight,Общий вес
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комиссия по продажам
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Комиссия по продажам
 DocType: Job Offer Term,Value / Description,Значение / Описание
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
 DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата доставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ввод заказа ресторана
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
 DocType: Asset Maintenance Task,Assign To Name,Назначить имя
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представительские расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Представительские расходы
 DocType: Hub Settings,Enabled Users,Включенные пользователи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Создать запрос на материал
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Открыть продукт {0}
@@ -4699,24 +4732,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Заявки на отпуск.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Счет с существующими проводками не может быть удален
 DocType: Vehicle,Last Carbon Check,Последний Carbon Проверить
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судебные издержки
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Судебные издержки
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Выберите количество в строке
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Сделать открытие счетов-фактур на покупку и покупку
 DocType: Purchase Invoice,Posting Time,Время публикации
 DocType: Timesheet,% Amount Billed,% Сумма счета
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Проверьте это, если вы хотите, чтобы заставить пользователя выбрать серию перед сохранением. Там не будет по умолчанию, если вы проверить это."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Нет продукта с серийным № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Нет продукта с серийным № {0}
 DocType: Email Digest,Open Notifications,Открытые Уведомления
 DocType: Payment Entry,Difference Amount (Company Currency),Разница Сумма (Компания Валюта)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Прямые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Прямые расходы
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новый Выручка клиентов
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Командировочные Pасходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Добавить пользовательское поле Подписки в doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
 DocType: Purchase Receipt Item,Sample Quantity,Количество образцов
+DocType: Bank Guarantee,Name of Beneficiary,Имя получателя
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Автоматически обновлять стоимость спецификации через Планировщик, исходя из последней оценки / курса прейскуранта / последней покупки сырья."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
@@ -4728,14 +4761,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Испытательный срок
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатные Компоненты
 DocType: Program Enrollment Tool,New Academic Year,Новый учебный год
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Возвращение / Кредит Примечание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Возвращение / Кредит Примечание
 DocType: Stock Settings,Auto insert Price List rate if missing,Автоматическая вставка прайс - листа при отсутствии цены
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Всего уплаченной суммы
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Всего уплаченной суммы
 DocType: GST Settings,B2C Limit,Ограничение B2C
 DocType: Work Order Item,Transferred Qty,Передано кол-во
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигационный
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Планирование
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Планирование
 DocType: Share Balance,Issued,Запрошено
+DocType: Loan,Repayment Start Date,Дата начала погашения
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Студенческая деятельность
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id поставщика
 DocType: Payment Request,Payment Gateway Details,Компенсация Детали шлюза
@@ -4748,10 +4782,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листьев, как случайный, больным и т.д."
 DocType: Email Digest,Send regular summary reports via Email.,Отправить регулярные сводные отчеты по электронной почте.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию для Типа Авансового Отчета {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию для Типа Авансового Отчета {0}"
 DocType: Assessment Result,Student Name,Имя ученика
 DocType: Brand,Item Manager,Менеджер продукта
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Расчет заработной платы оплачивается
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Расчет заработной платы оплачивается
 DocType: Buying Settings,Default Supplier Type,Тип Поставщика по умолчанию
 DocType: Plant Analysis,Collection Datetime,Коллекция Datetime
 DocType: Work Order,Total Operating Cost,Общие эксплуатационные расходы
@@ -4761,9 +4795,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Пользователь {0} не существует
 DocType: Payment Term,Day(s) after invoice date,День (ы) после даты выставления счета
 DocType: Payment Schedule,Payment Schedule,График оплаты
-DocType: Subscription,SUB-,СУБПОДРЯДЧИКА
 DocType: Item Attribute Value,Abbreviation,Аббревиатура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Оплата запись уже существует
+DocType: Subscription,Trial Period End Date,Дата окончания пробного периода
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Шаблоном Зарплата.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,патология
@@ -4780,9 +4814,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Предложения лидам или клиентам.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль с разрешением редактировать замороженный запас
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Все группы клиентов
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Все группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Накопленный в месяц
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Налоговый шаблона является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
@@ -4791,14 +4825,15 @@
 DocType: Lab Prescription,Test Created,Тест создан
 DocType: Healthcare Settings,Custom Signature in Print,Пользовательская подпись в печати
 DocType: Account,Temporary,Временный
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Номер клиента LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Номер клиента LPO
 DocType: Program,Courses,курсы
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Секретарь
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Секретарь
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Если отключить, &quot;В словах&quot; поле не будет видно в любой сделке"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Это действие остановит будущий биллинг. Вы действительно хотите отменить эту подписку?
 DocType: Serial No,Distinct unit of an Item,Отдельного подразделения из пункта
 DocType: Supplier Scorecard Criteria,Criteria Name,Название критерия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Укажите компанию
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Укажите компанию
 DocType: Pricing Rule,Buying,Покупка
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Болезни и удобрения
 DocType: HR Settings,Employee Records to be created by,Сотрудник отчеты должны быть созданные
@@ -4807,18 +4842,18 @@
 DocType: POS Profile,Apply Discount On,Применить скидки на
 DocType: Member,Membership Type,Тип членства
 ,Reqd By Date,Логика включения по дате
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Кредиторы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Кредиторы
 DocType: Assessment Plan,Assessment Name,Оценка Имя
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Показать PDC в печати
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Показать PDC в печати
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Предложение работы
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,институт Аббревиатура
 ,Item-wise Price List Rate,Цена продукта в прайс-листе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Запрос Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Запрос Поставщику
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,попыт-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Штрихкод {0} уже используется для продукта {1}
@@ -4836,7 +4871,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Общей дисперсии
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Если включен, то система будет отправлять бухгалтерских проводок для инвентаризации автоматически."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Посредничество
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Участие для работника {0} уже помечено на этот день
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Участие для работника {0} уже помечено на этот день
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","в минутах 
  Обновлено помощью ""Time Вход"""
@@ -4848,6 +4883,7 @@
 DocType: Lab Test,Approved Date,Утвержденная дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
+DocType: Subscriber,Subscriber Name,Имя подписчика
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
 DocType: BOM Update Tool,Replace,Заменить
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не найдено продуктов.
@@ -4857,19 +4893,18 @@
 DocType: Request for Quotation Item,Project Name,Название проекта
 DocType: Customer,Mention if non-standard receivable account,Отметка при нестандартном счете
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Выберите процентный доход в ссуде сотрудника {0}
 DocType: Work Order,Required Items,Требуемые товары
 DocType: Stock Ledger Entry,Stock Value Difference,Расхождение Стоимости Запасов
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Кадры
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирение Оплата
 DocType: Disease,Treatment Task,Лечебная задача
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Налоговые активы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Налоговые активы
 DocType: BOM Item,BOM No,ВМ №
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
 DocType: Item,Moving Average,Скользящее среднее
 DocType: BOM Update Tool,The BOM which will be replaced,"В спецификации, которые будут заменены"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Электронные приборы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Электронные приборы
 DocType: Asset,Maintenance Required,Требуется техническое обслуживание
 DocType: Account,Debit,Дебет
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
@@ -4878,7 +4913,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Выдающийся Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Задайте цели Продуктовых Групп для Продавца
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Замороженные запасы старше, чем [Дни]"
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
 DocType: Asset Maintenance Team,Maintenance Team Name,Название службы технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если найдено два или более Правил ценообразования на основе вышеуказанных условий, применяется Приоритет. Приоритет - это число от 0 до 20, а значение по умолчанию равно нулю (пустое). Более высокий номер означает, что он будет иметь приоритет, если в нем действуют несколько Правил ценообразования с одинаковыми условиями."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Клиент является обязательным, если в качестве Заказчика выбрано «Возможность из»"
@@ -4888,19 +4923,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Тип Авансового Отчета.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продажная ставка для продукта {0} ниже его {1}. Продажная ставка должна быть не менее {2}
-DocType: Item,Taxes,Налоги
+DocType: Subscription,Taxes,Налоги
 DocType: Purchase Invoice,capital goods,капитальные товары
 DocType: Purchase Invoice Item,Weight Per Unit,Вес на единицу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Оплаченные и не доставленные
 DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
-DocType: Bank Guarantee,End Date,Дата окончания
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Транзакции запасов
 DocType: Budget,Budget Accounts,Счета бюджета
 DocType: Employee,Internal Work History,Внутренняя история Работа
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Сумма начисленной амортизации
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Частные капиталовложения
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Переменная поставщика Scorecard
-DocType: Employee Loan,Fully Disbursed,Полностью Освоено
 DocType: Employee Advance,Due Advance Amount,Сумма авансового платежа
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
@@ -4924,7 +4957,7 @@
 ,Employee Information,Сотрудник Информация
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Создаются шаблоны налогов по умолчанию для продаж и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Запись результатов оценки {0} уже существует.
@@ -4932,7 +4965,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Пожалуйста, установите фильтр компании blank, если Group By является «Company»"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Дата размещения не может быть будущая дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,для генерации повторяющихся
 DocType: Stock Entry,Target Warehouse Address,Адрес целевого склада
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Повседневная Оставить
 DocType: Agriculture Task,End Day,Конец дня
@@ -4957,11 +4989,10 @@
 DocType: Material Request,% Ordered,% заказано
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для студенческой группы, основанной на курсах, курс будет подтвержден для каждого студента с зачисленных курсов по зачислению в программу."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Сдельная работа
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Средняя Цена Покупки
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Средняя Цена Покупки
 DocType: Share Balance,From No,От Нет
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История в компании
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Новое сообщение от {sender}
 DocType: Customer,Customer Primary Address,Основной адрес клиента
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Информационная рассылка
 DocType: Drug Prescription,Description/Strength,Описание / Strength
@@ -4970,22 +5001,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Тот же пункт был введен несколько раз
 DocType: Department,Leave Block List,Оставьте список есть
 DocType: Purchase Invoice,Tax ID,ИНН
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Одобрить
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Откорректированный адрес для {0}, пожалуйста, исправьте, чтобы продолжить."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Откорректированный адрес для {0}, пожалуйста, исправьте, чтобы продолжить."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Номер новой учетной записи, она будет включена в имя учетной записи в качестве префикса"
 DocType: Maintenance Team Member,Team Member,Участник команды
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Нет результатов для отправки
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
-DocType: Employee Loan,Rate of Interest (%) / Year,Процентная ставка (%) / год
+DocType: Loan,Rate of Interest (%) / Year,Процентная ставка (%) / год
 ,Project Quantity,Проект Количество
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»"
 DocType: Opportunity,To Discuss,Для обсуждения
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} единиц {1} требуется в {2} для завершения этой транзакции..
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентная ставка (%) Годовой
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Временные счета
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Черный
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Временные счета
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Черный
 DocType: BOM Explosion Item,BOM Explosion Item,Дерево ВМ продукта
 DocType: Shareholder,Contact List,Список контактов
 DocType: Account,Auditor,Аудитор
@@ -4993,16 +5024,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} продуктов произведено
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Выучить больше
 DocType: Cheque Print Template,Distance from top edge,Расстояние от верхнего края
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Прайс-лист {0} отключен или не существует
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Прайс-лист {0} отключен или не существует
 DocType: Purchase Invoice,Return,Возвращение
 DocType: Pricing Rule,Disable,Отключить
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Способ оплаты требуется произвести оплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Способ оплаты требуется произвести оплату
 DocType: Project Task,Pending Review,В ожидании отзыв
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Редактируйте на полной странице дополнительные параметры, такие как активы, серийные номера, партии и т. Д."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Назначения и консультации
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не зарегистрирован в пакете {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не может быть утилизированы, как это уже {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Требуется проверка
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Требуется проверка
 DocType: Task,Total Expense Claim (via Expense Claim),Итоговая сумма аванса (через Авансовый Отчет)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Отметка отсутствует
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Не удалось настроить компанию
@@ -5014,7 +5045,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Компонент платы
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управление флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Добавить продукты из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Добавить продукты из
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Сельскохозяйственные культуры и земли
 DocType: Cheque Print Template,Regular,регулярное
 DocType: Fertilizer,Density (if liquid),Плотность (если жидкость)
@@ -5039,24 +5070,26 @@
 DocType: Payment Entry,Paid Amount,Оплаченная сумма
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Исследуйте цикл продаж
 DocType: Assessment Plan,Supervisor,Руководитель
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Запись запаса запаса
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Запись запаса запаса
 ,Available Stock for Packing Items,Доступные Запасы для Комплектации Продуктов
 DocType: Item Variant,Item Variant,Модификация продукта
 ,Work Order Stock Report,Отчет о работе заказа
+DocType: Purchase Receipt,Auto Repeat Detail,Авторежим
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка результата инструмент
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Как супервизор
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Предложить категорию
 DocType: BOM Scrap Item,BOM Scrap Item,Спецификация отходов продукта
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Управление качеством
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Управление качеством
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Продукт {0} не годен
 DocType: Project,Total Billable Amount (via Timesheets),Общая сумма платежа (через расписания)
 DocType: Agriculture Task,Previous Business Day,Предыдущий рабочий день
-DocType: Employee Loan,Repay Fixed Amount per Period,Погашать фиксированную сумму за период
+DocType: Loan,Repay Fixed Amount per Period,Погашать фиксированную сумму за период
 DocType: Employee,Health Insurance No,Медицинское страхование Нет
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество продукта {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Кредитная нота Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Кредитная нота Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Общая сумма налогооблагаемой суммы
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
 DocType: Opening Invoice Creation Tool,Purchase,Купить
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Баланс Кол-во
@@ -5067,16 +5100,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 DocType: Healthcare Settings,Valid number of days,Действительное количество дней
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Центр затрат
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Перезапустить подписку
 DocType: Land Unit,Linked Plant Analysis,Анализ связанных растений
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Курс конвертирования валюты поставщика в базовую валюту компании
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: тайминги конфликты с рядом {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевую оценку
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевую оценку
+DocType: Bank Guarantee,Receiving,получающий
 DocType: Training Event Employee,Invited,приглашенный
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,"Несколько активных Зарплатные структуры, найденные для работника {0} для указанных дат"
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Настройка шлюза счета.
 DocType: Employee,Employment Type,Вид занятости
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Основные средства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Основные средства
 DocType: Payment Entry,Set Exchange Gain / Loss,Установить Курсовая прибыль / убыток
 ,GST Purchase Register,Регистр закупок GST
 ,Cash Flow,Поток наличных денег
@@ -5097,9 +5132,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Список всех сделок с акциями
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Счетчик Opp
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Счетчик Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Прилагается {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Должны быть установлены как дата начала пробного периода, так и дата окончания пробного периода"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Средняя оценка
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общая сумма платежа в Графе платежей должна быть равна Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общая сумма платежа в Графе платежей должна быть равна Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовый отчет за Главную книгу
 DocType: Job Applicant,Applicant Name,Имя заявителя
 DocType: Authorization Rule,Customer / Item Name,Клиент / Название продукта
@@ -5129,6 +5165,7 @@
 DocType: Work Order,Warehouses,Склады
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не может быть перемещён
 DocType: Hotel Room Pricing,Hotel Room Pricing,Цены на гостиничные номера
+DocType: Subscription,Days Until Due,Дни до срока
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Этот продукт является вариантом {0} (Шаблон).
 DocType: Workstation,per hour,в час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
@@ -5137,13 +5174,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Для пакетной студенческой группы, Студенческая партия будет подтверждена для каждого ученика из заявки на участие в программе."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не может быть удалён, так как существует запись в складкой книге  этого склада."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Распределение
+DocType: Journal Entry Account,Loan,ссуда
 DocType: Expense Claim Advance,Expense Claim Advance,Претензия на увеличение расходов
 DocType: Lab Test,Report Preference,Предпочтение отчета
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Информация о волонтерах.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Менеджер проектов
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Менеджер проектов
 ,Quoted Item Comparison,Цитируется Сравнение товара
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Перекрытие при подсчете между {0} и {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Отправка
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Чистая стоимость активов на
 DocType: Crop,Produce,Производить
@@ -5153,7 +5191,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Потребление материала для производства
 DocType: Item Alternative,Alternative Item Code,Альтернативный код товара
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, позволяющая проводить операции, превышающие кредитный лимит, установлена."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Выберите продукты для производства
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Выберите продукты для производства
 DocType: Delivery Stop,Delivery Stop,Остановка доставки
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Вопрос по материалу
@@ -5163,15 +5201,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Моющие средства
 DocType: BOM,Show Items,Показать продукты
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,От времени не может быть больше времени.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Вы хотите уведомить всех клиентов по электронной почте?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Вы хотите уведомить всех клиентов по электронной почте?
+DocType: Subscription Plan,Billing Interval,Интервал выставления счетов
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Кино- и видеостудия
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Продолжить
 DocType: Hub Settings,Hub Username,Имя пользователя-концентратора
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии оценки Группа
 DocType: Healthcare Settings,Patient Name By,Имя пациента
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Запись журнала начислений для зарплат от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Запись журнала начислений для зарплат от {0} до {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
@@ -5185,23 +5223,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете записывать рост, вес, аллергии, медицинские проблемы и т. п."
 DocType: Leave Block List,Applies to Company,Относится к компании
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, так как проведена учетная запись по Запасам {0}"
-DocType: Employee Loan,Disbursement Date,Расходование Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,«Получатели» не указаны
+DocType: Loan,Disbursement Date,Расходование Дата
 DocType: BOM Update Tool,Update latest price in all BOMs,Обновление последней цены во всех спецификациях
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Медицинская запись
 DocType: Vehicle,Vehicle,Средство передвижения
 DocType: Purchase Invoice,In Words,Прописью
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Введите имя банка или кредитной организации перед отправкой.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} необходимо отправить
 DocType: POS Profile,Item Groups,Продуктовые группы
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Сегодня у {0} день рождения!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Сегодня у {0} день рождения!
 DocType: Sales Order Item,For Production,Для производства
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Пожалуйста, добавьте временный вступительный счет в План счетов"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Пожалуйста, добавьте временный вступительный счет в План счетов"
 DocType: Customer,Customer Primary Contact,Первичный контакт с клиентом
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Журнал закрытия периода
 DocType: Project Task,View Task,Просмотр задачи
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Возм/Лид %
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Возм/Лид %
+DocType: Bank Guarantee,Bank Guarantee Type,Тип банковской гарантии
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Часть счета
 ,Asset Depreciations and Balances,Активов Амортизация и противовесов
@@ -5212,9 +5251,8 @@
 DocType: Production Plan,Include Subcontracted Items,Включить субподрядные товары
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Невозможно изменить свойства Variant после переноса материала. Вам нужно будет сделать новый элемент для этого.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Модификация продукта {0} с этими атрибутами существует
-DocType: Employee Loan,Repay from Salary,Погашать из заработной платы
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Модификация продукта {0} с этими атрибутами существует
+DocType: Loan,Repay from Salary,Погашать из заработной платы
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Запрос платеж против {0} {1} на сумму {2}
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
@@ -5238,11 +5276,11 @@
 DocType: Employee Education,Employee Education,Сотрудник Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Повторяющаяся группа находке в таблице группы товаров
 DocType: Land Unit,Parent Land Unit,Группа родительских домов
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Это необходимо для отображения подробностей продукта.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Это необходимо для отображения подробностей продукта.
 DocType: Fertilizer,Fertilizer Name,Название удобрения
 DocType: Salary Slip,Net Pay,Чистая Оплата
 DocType: Cash Flow Mapping Accounts,Account,Аккаунт
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серийный номер {0} уже существует
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Серийный номер {0} уже существует
 ,Requested Items To Be Transferred,Запрашиваемые продукты к доставке
 DocType: Expense Claim,Vehicle Log,Автомобиль Вход
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наличие лихорадки (темп&gt; 38,5 ° C / 101,3 ° F или постоянная температура&gt; 38 ° C / 100,4 ° F)"
@@ -5283,24 +5321,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
 DocType: Asset Maintenance,Manufacturing User,Сотрудник производства
 DocType: Purchase Invoice,Raw Materials Supplied,Поставка сырья
-DocType: C-Form,Series,Серии
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Валюта прейскуранта {0} должна быть {1} или {2}
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Soil Texture,Ternary Plot,Тройной участок
 DocType: Item Group,Item Classification,Продуктовая классификация
 DocType: Driver,License Number,Лицензионный номер
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Менеджер по развитию бизнеса
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Менеджер по развитию бизнеса
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Техническое обслуживание Посетить Цель
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Регистрация счета-фактуры
 DocType: Crop,Period,Период обновления
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Бухгалтерская книга
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Сотрудник {0} отпуска по {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Сотрудник {0} отпуска по {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Посмотреть лиды
 DocType: Program Enrollment Tool,New Program,Новая программа
 DocType: Item Attribute Value,Attribute Value,Значение атрибута
 ,Itemwise Recommended Reorder Level,Рекомендация пополнения уровня продукта
 DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Пожалуйста, выберите {0} первый"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Пожалуйста, выберите {0} первый"
 DocType: Appointment Type,Physician,врач
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Партия {0} продукта {1} просрочена
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,консультации
@@ -5308,15 +5345,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не может быть больше запланированного количества ({2}) в рабочем порядке {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Время Лист для изготовления.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Промежуточный итог
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Невозможно изменить свойства Variant после транзакции с акциями. Вам нужно будет сделать новый элемент для этого.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Безрукий мандат SEPA
 DocType: Physician,Charges,расходы
 DocType: Production Plan,Get Items For Work Order,Выбрать продукты для заказа
 DocType: Salary Detail,Default Amount,По умолчанию количество
 DocType: Lab Test Template,Descriptive,Описательный
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Склад не найден в системе
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Склад не найден в системе
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме этого месяца
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Задайте цель продаж, которую вы хотите достичь для своей компании."
 ,Project wise Stock Tracking,Проект мудрый слежения со
@@ -5344,11 +5382,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Не удалось создать веб-сайт
 DocType: Soil Analysis,Mg/K,Мг / К
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,"Удержание запаса, которое уже создано или количество образцов не указано"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,"Удержание запаса, которое уже создано или количество образцов не указано"
 DocType: Program,Program Abbreviation,Программа Аббревиатура
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта
 DocType: Warranty Claim,Resolved By,Решили По
-DocType: Bank Guarantee,Start Date,Дата Начала
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Распределить отпуска на определенный срок.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чеки и депозиты неправильно очищена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Счёт {0}: Вы не можете  назначить самого себя родительским счётом
@@ -5363,11 +5400,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часов
 DocType: Project,Expected Start Date,Ожидаемая дата начала
 DocType: Purchase Invoice,04-Correction in Invoice,04-Исправление в счете-фактуре
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Рабочий заказ уже создан для всех элементов с спецификацией
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Рабочий заказ уже создан для всех элементов с спецификацией
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Подробный отчет о вариантах
 DocType: Setup Progress Action,Setup Progress Action,Установка готовности работ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Ценовой список покупок
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Ценовой список покупок
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Удалить продукт, если сборы не применимы к этому продукту"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Отменить подписку
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Выберите «Состояние обслуживания» как «Завершено» или «Дата завершения»
 DocType: Supplier,Default Payment Terms Template,Шаблон условий оплаты по умолчанию
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
@@ -5378,7 +5416,6 @@
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие, если накопилось Превышен Ежемесячный бюджет"
-DocType: Subscription,Submit on creation,Провести по создании
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Валюта для {0} должно быть {1}
 DocType: Asset,Disposal Date,Утилизация Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Электронные письма будут отправлены во все активные работники компании на данный час, если у них нет отпуска. Резюме ответов будет отправлен в полночь."
@@ -5396,6 +5433,7 @@
 DocType: Batch,Parent Batch,Родительская партия
 DocType: Cheque Print Template,Cheque Print Template,Чеками печати шаблона
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,План МВЗ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Количество дней после истечения срока выставления счета перед отменой подписки или подпиской по подписке как неоплаченной
 DocType: Lab Test Template,Sample Collection,Сбор образцов
 ,Requested Items To Be Ordered,Запрошенные продукты заказаны
 DocType: Price List,Price List Name,Цена Имя
@@ -5404,7 +5442,7 @@
 DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Тип индустрии
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Что-то пошло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,"Внимание: Покиньте приложение, содержащее следующие блоки данных"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,"Внимание: Покиньте приложение, содержащее следующие блоки данных"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Счет на продажу {0} уже проведен
 DocType: Supplier Scorecard Scoring Criteria,Score,Гол
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Финансовый год {0} не существует
@@ -5424,12 +5462,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} должно быть значением от 0 до 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,"Следующая дата амортизации не может быть до даты, доступной для использования."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Необеспеченных кредитов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Название учетного отдела
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Максимальное рабочее время против Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланированная дата
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Всего выплачено Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Всего выплачено Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Сообщения с более, чем 160 символами, будут разделены на несколько"
 DocType: Purchase Receipt Item,Received and Accepted,Получил и принял
 DocType: Hub Settings,Company and Seller Profile,Профиль компании и продавца
@@ -5443,10 +5481,9 @@
 DocType: Item,Variant Based On,Модификация на основе
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Ваши Поставщики
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Пожалуйста, исправьте"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 DocType: Request for Quotation Item,Supplier Part No,Деталь поставщика №
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,анонимное
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Получено от
 DocType: Lead,Converted,Конвертировано
@@ -5460,6 +5497,7 @@
 DocType: Asset,Assets,Активы
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Укажите этот продукт в нескольких группах на сайте
+DocType: Subscription,Current Invoice End Date,Дата окончания текущего счета
 DocType: Payment Term,Due Date Based On,Дата составления финансовой отчетности
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Укажите группу и территорию клиента по умолчанию в разделе «Настройки продаж»
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} не существует
@@ -5467,7 +5505,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Продукт: {0} не существует
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить несверенные записи
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Не выбрано никаких выплат для записи журнала
 DocType: Payment Reconciliation,From Invoice Date,От Дата Счета
+DocType: Loan,Disbursed,Освоено
 DocType: Healthcare Settings,Laboratory Settings,Настройки лаборатории
 DocType: Patient Appointment,Service Unit,Сервисный блок
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Успешно установить поставщика
@@ -5480,12 +5520,12 @@
 DocType: Share Balance,No of Shares,Нет акций
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,«Имеет серийный номер» не может быть «Да» для нескладируемого продукта
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Выберите статус
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: School House,House Name,Название дома
 DocType: Fee Schedule,Total Amount per Student,Общая сумма на одного студента
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Электрический
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Электрический
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавьте остальную часть вашей организации в качестве пользователей. Вы можете также добавить приглашать клиентов на ваш портал, добавив их из списка контактов"
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
 DocType: Grant Application,Requested Amount,Запрошенная сумма
@@ -5495,7 +5535,7 @@
 DocType: Crop Cycle,Detected Diseases,Обнаруженные заболевания
 DocType: Stock Entry,Default Source Warehouse,По умолчанию склад сырья
 DocType: Item,Customer Code,Код клиента
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Напоминание о дне рождения для {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 DocType: Asset Maintenance Task,Last Completion Date,Последняя дата завершения
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
@@ -5503,9 +5543,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Настройки бездорожья
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Капитал запасов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Капитал запасов
 DocType: Restaurant,Active Menu,Активное меню
 DocType: Target Detail,Target Qty,Целевое количество
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Против кредита: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Настройки
 DocType: Student Attendance,Present,Настоящее.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Уведомление о доставке {0} не должно быть проведено
@@ -5514,9 +5555,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Production Plan Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,ВМ не содержит какой-либо складируемый продукт
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,ВМ не содержит какой-либо складируемый продукт
 DocType: Chapter,Chapter Head,Глава главы
 DocType: Payment Term,Month(s) after the end of the invoice month,Месяц (ы) после окончания месяца счета-фактуры
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Проектная деятельность / задачи.
@@ -5524,11 +5565,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Создать зарплат Slips
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Лабораторный результат datetime не может быть до тестирования даты и времени
 DocType: POS Profile,Allow user to edit Discount,Разрешить пользователю редактировать скидку
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Получить клиентов от
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Получить клиентов от
 DocType: Purchase Invoice Item,Include Exploded Items,Включить раздробленные элементы
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Покупка должна быть проверена, если выбран Применимо для как {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Shipping Rule,Restrict to Countries,Ограничить страны
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Платежная часы
 DocType: Project,Total Sales Amount (via Sales Order),Общая сумма продаж (по заказу клиента)
@@ -5547,6 +5589,7 @@
 DocType: Soil Texture,Sandy Clay,Песчаная глина
 DocType: Grant Application,Assessment  Manager,Менеджер по оценке
 DocType: Payment Entry,Allocate Payment Amount,Выделяют Сумма платежа
+DocType: Subscription Plan,Subscription Plan,План подписки
 DocType: Employee External Work History,Salary,Зарплата
 DocType: Serial No,Delivery Document Type,Тип документа поставки
 DocType: Sales Order,Partly Delivered,Небольшая Поставляются
@@ -5572,9 +5615,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Старение Диапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальная прочность
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Установка пресетов
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Нет примечания о доставке для клиента {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Нет примечания о доставке для клиента {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM заменить
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Выбрать продукты по дате поставки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Выбрать продукты по дате поставки
 DocType: Grant Application,Has any past Grant Record,Имеет ли какая-либо прошлая грантовая запись
 ,Sales Analytics,Аналитика продаж
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Доступно {0}
@@ -5593,7 +5636,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Стоимость поставленного сырья
 DocType: Selling Settings,Settings for Selling Module,Настройки по продаже модуля
 DocType: Hotel Room Reservation,Hotel Room Reservation,Бронирование номеров в гостинице
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Обслуживание Клиентов
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Обслуживание Клиентов
 DocType: BOM,Thumbnail,Миниатюра
 DocType: Item Customer Detail,Item Customer Detail,Пункт Детальное клиентов
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Предложить кандидату работу.
@@ -5610,7 +5653,7 @@
 DocType: Fees,Student Details,Сведения о студенте
 DocType: Purchase Invoice Item,Stock Qty,Кол-во в запасе
 DocType: Purchase Invoice Item,Stock Qty,Кол-во в запасе
-DocType: Employee Loan,Repayment Period in Months,Период погашения в месяцах
+DocType: Loan,Repayment Period in Months,Период погашения в месяцах
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Ошибка: Не действует ID?
 DocType: Naming Series,Update Series Number,Обновление Номер серии
 DocType: Account,Equity,Ценные бумаги
@@ -5619,7 +5662,7 @@
 DocType: Task,Closing Date,Дата закрытия
 DocType: Sales Order Item,Produced Quantity,Добытое количество
 DocType: Timesheet,Work Detail,Детали работы
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Инженер
 DocType: Journal Entry,Total Amount Currency,Общая сумма валюты
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Поиск Sub сборки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
@@ -5665,13 +5708,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Информация о доноре.
 DocType: Request for Quotation,Supplier Detail,Подробнее о поставщике
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Ошибка в формуле или условие: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Сумма по счетам
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Сумма по счетам
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Критерии веса должны составлять до 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Посещаемость
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Позиции на складе
 DocType: BOM,Materials,Материалы
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Если не установлен, то список нужно будет добавлен в каждом департаменте, где он должен быть применен."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Создание {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,"Исходный и целевой склад не может быть таким же,"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
@@ -5695,14 +5737,14 @@
 DocType: Shipping Rule,Fixed,Исправлена
 DocType: Vehicle Service,Clutch Plate,Диск сцепления
 DocType: Company,Round Off Account,Округление аккаунт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Административные затраты
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Административные затраты
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
-DocType: Journal Entry,Subscription,Подписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Подписка
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Платежное создание ожидается
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Срок Уведомления
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Срок Уведомления
 DocType: Asset Category,Asset Category Name,Asset Категория Название
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Это корень территории и не могут быть изменены.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Имя нового менеджера по продажам
@@ -5716,7 +5758,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизации (месяцев)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Кредитный счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
@@ -5724,7 +5766,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
 DocType: Delivery Note Item,Against Sales Order Item,Заказ на продажу продукта
 DocType: Hub Settings,Company Logo,Логотип компании
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,Склад по умолчанию
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 DocType: Healthcare Settings,Patient Registration,Регистрация пациентов
@@ -5759,11 +5801,10 @@
 DocType: Journal Entry,Total Debit,Всего Дебет
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,По умолчанию склад готовой продукции
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Выберите пациента
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продавец
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продавец
 DocType: Hotel Room Package,Amenities,Удобства
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет и МВЗ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Множественный режим оплаты по умолчанию не разрешен
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
 ,Appointment Analytics,Аналитика встреч
 DocType: Vehicle Service,Half Yearly,Половина года
 DocType: Lead,Blog Subscriber,Подписчик блога
@@ -5780,6 +5821,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Оставьте пустым, если вы создаете группы студентов в год"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Если флажок установлен, все время не. рабочих дней будет включать в себя праздники, и это приведет к снижению стоимости Зарплата в день"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Приложения, использующие текущий ключ, не смогут получить доступ, вы уверены?"
+DocType: Subscription Settings,Prorate,пропорциональная доля
 DocType: Purchase Invoice,Total Advance,Всего Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Изменить шаблонный код
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Срок Дата окончания не может быть раньше, чем срок Дата начала. Пожалуйста, исправьте дату и попробуйте еще раз."
@@ -5790,8 +5832,9 @@
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 DocType: Cheque Print Template,Signatory Position,подписавшая Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Установить как Остаться в живых
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Установить как Остаться в живых
 DocType: Timesheet,Total Billable Hours,Всего человеко-часов
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Количество дней, в течение которых абонент должен оплатить счета, сгенерированные этой подпиской"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Получение Примечание
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Это основано на операциях против этого клиента. См график ниже для получения подробной информации
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Строка {0}: Выделенная сумма {1} должна быть меньше или равна сумме платежа ввода {2}
@@ -5810,12 +5853,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Выберите или добавить новый клиент
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
 DocType: Assessment Result,Summary,Резюме
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Пометить посещаемость
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Дебетовый счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Номер заказа заказа ресторана
@@ -5827,7 +5870,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Сумма покупки
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Ценовое предложение поставщика {0} создано
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Вознаграждения работникам
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Вознаграждения работникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Упакованное количество должно соответствовать количеству  продукта  {0} в строке {1}
 DocType: Work Order,Manufactured Qty,Изготовлено Кол-во
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Акций не существует с {0}
@@ -5835,12 +5878,12 @@
 DocType: Asset,Out of Order,Вышел из строя
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 DocType: Projects Settings,Ignore Workstation Time Overlap,Игнорировать перекрытие рабочей станции
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Выберите пакетные номера
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Платежи Заказчиков
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Идентификатор проекта
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд № {0}: Сумма не может быть больше, чем указанная в Авансовом Отчете {1}. Указанная сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд № {0}: Сумма не может быть больше, чем указанная в Авансовом Отчете {1}. Указанная сумма {2}"
 DocType: Patient Service Unit,Medical Administrator,Медицинский администратор
 DocType: Assessment Plan,Schedule,Расписание
 DocType: Account,Parent Account,Родитель счета
@@ -5870,15 +5913,16 @@
 DocType: Asset Repair,Repair Status,Статус ремонта
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 DocType: POS Profile,Account for Change Amount,Счет для изменения высоты
 DocType: Purchase Invoice,input service,услуга ввода
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Член технической службы
 DocType: Agriculture Analysis Criteria,Soil Analysis,Анализ почвы
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Код курса:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Пожалуйста, введите Expense счет"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Запасы
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если продукт — вариант другого продукта, то описание, изображение, цена, налоги и т. д., будут установлены из шаблона, если не указано другое"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
@@ -5927,19 +5971,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Поступающим для {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Имя переменной
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
 DocType: Asset,Asset Category,Категория активов
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Чистая зарплата не может быть отрицательным
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Налог на продукт
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Материал Поставщику
 DocType: Soil Texture,Loamy Sand,Супесь
 DocType: Production Plan,Material Request Planning,Планирование заявки на материал
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Акцизный Счет
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% появляется более одного раза
 DocType: Expense Claim,Employees Email Id,Сотрудники Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Выраженное Посещаемость
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Текущие обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Текущие обязательства
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Таймер превысил указанные часы.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Отправить массовое СМС по списку контактов
 DocType: Patient,A Positive,А положительная
@@ -5950,9 +5994,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и Заказы на поставку этому поставщику должны выдаваться с осторожностью."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Группа поддержки активов
-DocType: Employee Loan,Loan Type,Тип кредита
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} успешно отправлен
+DocType: Loan,Loan Type,Тип кредита
 DocType: Scheduling Tool,Scheduling Tool,Планирование Инструмент
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Кредитная карта
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Кредитная карта
 DocType: BOM,Item to be manufactured or repacked,Продукт должен быть произведен или переупакован
 DocType: Employee Education,Major/Optional Subjects,Основные / факультативных предметов
 DocType: Sales Invoice Item,Drop Ship,Корабль падения
@@ -5984,7 +6029,7 @@
 DocType: Item,Units of Measure,Единицы измерения
 DocType: Manufacturing Settings,Allow Production on Holidays,Позволяют производить на праздниках
 DocType: Sales Invoice,Customer's Purchase Order Date,Клиентам Дата Заказ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Капитал
 DocType: Shopping Cart Settings,Show Public Attachments,Показать общедоступные приложения
 DocType: Packing Slip,Package Weight Details,Подробности о весе упаковки
 DocType: Restaurant Reservation,Reservation Time,Время резервирования
@@ -5999,7 +6044,7 @@
 DocType: Purchase Order,To Receive and Bill,Для приема и Билл
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Строка # {0}: Reqd by Date не может быть до даты транзакции
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Представленные продукты
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
@@ -6009,20 +6054,20 @@
 DocType: Driver,Expiry Date,Срок годности:
 DocType: Healthcare Settings,Employee name and designation in print,Имя и обозначение сотрудника в печати
 ,accounts-browser,счета-браузер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Пожалуйста, выберите категорию первый"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Мастер проекта.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Чтобы разрешить более-биллинга или по-заказа, обновление &quot;льгота&quot; в настройках изображения или предмет."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Полдня)
 DocType: Payment Term,Credit Days,Кредитных дней
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Выберите «Пациент», чтобы получить лабораторные тесты"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Получить продукты из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Получить продукты из спецификации
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Время выполнения
 DocType: Cash Flow Mapping,Is Income Tax Expense,Расходы на подоходный налог
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверьте это, если Студент проживает в Хостеле Института."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
 ,Stock Summary,Всего запасов
@@ -6033,10 +6078,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Дата ссылки
 DocType: Employee,Reason for Leaving,Причина увольнения
 DocType: BOM Operation,Operating Cost(Company Currency),Эксплуатационные расходы (Компания Валюта)
-DocType: Employee Loan Application,Rate of Interest,Процентная ставка
+DocType: Loan Application,Rate of Interest,Процентная ставка
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: Item,Shelf Life In Days,Срок хранения в днях
 DocType: GL Entry,Is Opening,Открывает
+DocType: Department,Expense Approvers,Утвердители расходов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
 DocType: Journal Entry,Subscription Section,Раздел подписки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Аккаунт {0} не существует
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 1a4c9a3..174f3dc 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,මෙම Warranty හිමිකම් අවලංගු කිරීම පෙර ද්රව්ය සංචාරය {0} අවලංගු කරන්න
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,තක්සේරු වාර්තා
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,පාරිභෝගික භාණ්ඩ
-DocType: Purchase Receipt,Subscription Detail,දායකත්ව විස්තර
 DocType: Supplier Scorecard,Notify Supplier,සැපයුම්කරු දැනුවත් කරන්න
 DocType: Item,Customer Items,පාරිභෝගික අයිතම
 DocType: Project,Costing and Billing,පිරිවැය හා බිල්පත්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ගිණුම {0}: මාපිය ගිණුමක් {1} දේශලජර් විය නොහැකි
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com කිරීමට අයිතමය ප්රකාශයට පත් කරනු ලබයි
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ඊ-තැපැල් නිවේදන
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ඇගයීම
 DocType: Item,Default Unit of Measure,නු පෙරනිමි ඒකකය
 DocType: SMS Center,All Sales Partner Contact,සියලු විකුණුම් සහකරු අමතන්න
-DocType: Employee,Leave Approvers,Approvers තබන්න
+DocType: Department,Leave Approvers,Approvers තබන්න
 DocType: Sales Partner,Dealer,අලෙවි නියෝජිත
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,විමර්ශන
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ලබා ගන්න
 DocType: Job Applicant,Job Applicant,රැකියා අයදුම්කරු
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,මෙය මේ සැපයුම්කරු එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,නීතිමය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},සැබෑ වර්ගය බදු පේළිය {0} තුළ අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,නීතිමය
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},සැබෑ වර්ගය බදු පේළිය {0} තුළ අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
 DocType: Bank Guarantee,Customer,පාරිභෝගික
 DocType: Purchase Receipt Item,Required By,වන විට අවශ්ය
 DocType: Delivery Note,Return Against Delivery Note,සැපයුම් සටහන එරෙහි නැවත
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},බැංකු ගිණුමක් {0} ලෙස නම් කළ නොහැකි
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ප්රධානීන් (හෝ කණ්ඩායම්) ගිණුම්කරණය අයැදුම්පත් ඉදිරිපත් කර ඇති අතර තුලනය නඩත්තු කරගෙන යනු ලබන එරෙහිව.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} ශුන්ය ({1}) ට වඩා අඩු විය නොහැක විශිෂ්ට සඳහා
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ක්රියාවලිය සඳහා වැටුප් නොලැබී තිබේ.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ක්රියාවලිය සඳහා වැටුප් නොලැබී තිබේ.
 DocType: Manufacturing Settings,Default 10 mins,මිනිත්තු 10 Default
 DocType: Leave Type,Leave Type Name,"අවසරය, වර්ගය නම"
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,විවෘත පෙන්වන්න
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,ඉහත සඳහන් පුනරාවර්තනය සඳහා අද මෙම පියවර ගැනීම අවශ්ය වේ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,පරීක්ෂාකාරී වන්න
 DocType: Pricing Rule,Apply On,දා යොමු කරන්න
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,සියලු සැපයුම්කරු අමතන්න
 DocType: Support Settings,Support Settings,සහාය සැකසුම්
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,අපේක්ෂිත අවසානය දිනය අපේක්ෂා ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ෙරෝ # {0}: {2} ({3} / {4}): අනුපාත {1} ලෙස සමාන විය යුතුයි
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,නව නිවාඩු ඉල්ලුම්
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ෙරෝ # {0}: {2} ({3} / {4}): අනුපාත {1} ලෙස සමාන විය යුතුයි
 ,Batch Item Expiry Status,කණ්ඩායම අයිතමය කල් ඉකුත් වීමේ තත්ත්වය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,බැංකු අණකරයකින් ෙගවිය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,බැංකු අණකරයකින් ෙගවිය
 DocType: Membership,membership validaty section,සාමාජිකත්වයේ වලංගු කොටස
 DocType: Mode of Payment Account,Mode of Payment Account,ගෙවීම් ගිණුම වන ආකාරය
 DocType: Consultation,Consultation,උපදේශනය
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ද්රව්ය
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,වෙබ් අඩවියක් නිර්මාණය කිරීම
 DocType: Opening Invoice Creation Tool Item,Quantity,ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),ණය (වගකීම්)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),ණය (වගකීම්)
 DocType: Employee Education,Year of Passing,විසිර වර්ෂය
 DocType: Item,Country of Origin,මුල් රට
 DocType: Soil Texture,Soil Texture Criteria,පාංශු ආකෘතිය
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,ප්රාථමික ඇමතුම් විස්තර
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,විවෘත ගැටළු
 DocType: Production Plan Item,Production Plan Item,නිශ්පාදන සැළැස්ම අයිතමය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},පරිශීලක {0} සේවක {1} කිරීමට දැනටමත් අනුයුක්ත කර ඇත
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},පරිශීලක {0} සේවක {1} කිරීමට දැනටමත් අනුයුක්ත කර ඇත
 DocType: Lab Test Groups,Add new line,නව රේඛාවක් එකතු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,සෞඛ්ය සත්කාර
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ෙගවීම පමාද (දින)
@@ -89,7 +85,7 @@
 ,Delay Days,ප්රමාද වූ දින
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ඉන්වොයිසිය
+DocType: Subscription Invoice,Invoice,ඉන්වොයිසිය
 DocType: Purchase Invoice Item,Item Weight Details,අයිතම බර ප්රමාණය විස්තර
 DocType: Asset Maintenance Log,Periodicity,ආවර්තයක්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,මුදල් වර්ෂය {0} අවශ්ය වේ
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ලකුණු (0-5 දක්වා)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ෙරෝ {0}: {1} {2} {3} සමග නොගැලපේ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ෙරෝ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ෙරෝ # {0}:
 DocType: Timesheet,Total Costing Amount,මුළු සැඳුම්ලත් මුදල
 DocType: Delivery Note,Vehicle No,වාහන අංක
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,වර්ක් ඉන් ප්රෝග්රස්
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,කරුණාකර දිනය තෝරන්න
 DocType: Daily Work Summary Group,Holiday List,නිවාඩු ලැයිස්තුව
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,ගණකාධිකාරී
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,ගණකාධිකාරී
 DocType: Hub Settings,Selling Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Patient,Tobacco Current Use,දුම්කොළ භාවිතය
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,විකුණුම් අනුපාතිකය
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,විකුණුම් අනුපාතිකය
 DocType: Cost Center,Stock User,කොටස් පරිශීලක
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,දුරකතන අංකය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},නව {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ආරම්භක ඊමේල් දැනුම්දීම යැවූ
 ,Sales Partners Commission,විකුණුම් හවුල්කරුවන් කොමිසම
 DocType: Soil Texture,Sandy Clay Loam,සැන්ඩි ක්ලේ ලොම්
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,අගය ක්ෂය කිරීමෙන් පසු
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ආශ්රිත
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,පැමිණීම දිනය සේවක එක්වීමට දිනය ට වඩා අඩු විය නොහැක
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,පැමිණීම දිනය සේවක එක්වීමට දිනය ට වඩා අඩු විය නොහැක
 DocType: Grading Scale,Grading Scale Name,ශ්රේණිගත පරිමාණ නම
-DocType: Subscription,Repeat on Day,දිනපතා නැවත සිදු කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,"මෙම root පරිශීලක සඳහා ගිණුමක් වන අතර, සංස්කරණය කළ නොහැක."
 DocType: Sales Invoice,Company Address,සමාගම ලිපිනය
 DocType: BOM,Operations,මෙහෙයුම්
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} සඳහා වට්ටම් පදනම මත බලය සිටුවම් කල නොහැක
+DocType: Subscription,Subscription Start Date,දායක ආරම්භක දිනය
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","කුළුණු දෙක, පැරණි නම සඳහා එක හා නව නාමය සඳහා එක් .csv ගොනුව අමුණන්න"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ඕනෑම ක්රියාශීලී මුදල් වර්ෂය තුළ නැත.
 DocType: Packed Item,Parent Detail docname,මව් විස්තර docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","මූලාශ්ර: {0}, අයිතමය සංකේතය: {1} සහ පාරිභෝගික: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,පරීක්ෂා කාලය අවසන් කළ දිනය ආරම්භක දිනයට පෙර දින ආරම්භ කළ නොහැක
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,රැකියාවක් සඳහා විවෘත.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},උප කොන්ත්රාත්තුවේ අයිතමය {0} හි පේළියෙහි BOM නියම කර නැත {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,එම සමාගම එක් වරකට වඩා ඇතුලත් කර
 DocType: Patient,Married,විවාහක
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} සඳහා අවසර නැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,සිට භාණ්ඩ ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,සිට භාණ්ඩ ලබා ගන්න
 DocType: Price List,Price Not UOM Dependant,මිළ ගණන් නැත
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,බ්රේක් ඔයිල්
 DocType: Tax Rule,Tax Type,බදු වර්ගය
 ,Completed Work Orders,සම්පූර්ණ කරන ලද වැඩ ඇණවුම්
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,බදු අයකල හැකි ප්රමාණය
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,බදු අයකල හැකි ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
 DocType: BOM,Item Image (if not slideshow),අයිතමය අනුරුව (Slideshow නොවේ නම්)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(පැය අනුපාතිකය / 60) * සත මෙහෙයුම කාල
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,පේළිය # {0}: ආශ්රේය ලේඛන වර්ගය Expense Claim හෝ Journal Entry වලින් එකක් විය යුතුය
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,පේළිය # {0}: ආශ්රේය ලේඛන වර්ගය Expense Claim හෝ Journal Entry වලින් එකක් විය යුතුය
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
 DocType: SMS Log,SMS Log,කෙටි පණිවුඩ ලොග්
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,භාර අයිතම පිරිවැය
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,සේවකයාට ලබා දෙන අත්තිකාරම් මුදල කළමනාකරණය කරන්න
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,බෙදාහැරීමේ නිවේදනය
 DocType: Journal Entry,Opening Entry,විවෘත පිවිසුම්
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ගිණුම් පමණක් ගෙවන්න
-DocType: Employee Loan,Repay Over Number of Periods,"කාල පරිච්ඡේදය, සංඛ්යාව අධික ආපසු ගෙවීම"
+DocType: Loan,Repay Over Number of Periods,"කාල පරිච්ඡේදය, සංඛ්යාව අධික ආපසු ගෙවීම"
 DocType: Stock Entry,Additional Costs,අතිරේක පිරිවැය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව ගිණුමක් පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Lead,Product Enquiry,නිෂ්පාදන විමසීම්
 DocType: Education Settings,Validate Batch for Students in Student Group,ශිෂ්ය සමූහය සිසුන් සඳහා කණ්ඩායම තහවුරු කර
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},{1} සඳහා කිසිදු නිවාඩු වාර්තා සේවකයා සඳහා සොයා {0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},{1} සඳහා කිසිදු නිවාඩු වාර්තා සේවකයා සඳහා සොයා {0}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,පළමු සමාගම ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,කරුණාකර සමාගම පළමු තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,කරුණාකර සමාගම පළමු තෝරා
 DocType: Employee Education,Under Graduate,උපාධි යටතේ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"කරුණාකර HR සැකසීම් තුළ, Leave Status Notification සඳහා ප්රකෘති ආකෘතිය සකසන්න."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ඉලක්කය මත
 DocType: BOM,Total Cost,මුළු වියදම
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,සේවක ණය
 DocType: Fee Schedule,Send Payment Request Email,ගෙවීම් ඉල්ලීම් ඊ-තැපෑල යවන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} අයිතමය පද්ධතිය තුළ නොපවතියි හෝ කල් ඉකුත් වී ඇත
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,දේපළ වෙළදාම්
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,සාර්ථකව ලියාපදිංචි නොවූ.
 DocType: Assessment Result,Grade,ශ්රේණියේ
 DocType: Restaurant Table,No of Seats,ආසන ගණන
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","ගතික විෂය එකතු කිරීම සඳහා, ජින්ජාඩ් ටැග් භාවිතා කරන්න <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,සැපයුම්කරු විසින් ඉදිරිපත්
 DocType: Asset Maintenance Task,Asset Maintenance Task,වත්කම් නඩත්තු කාර්යය
 DocType: SMS Center,All Contact,සියලු විමසීම්
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,වාර්ෂික වැටුප
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,වාර්ෂික වැටුප
 DocType: Daily Work Summary,Daily Work Summary,ඩේලි වැඩ සාරාංශය
 DocType: Period Closing Voucher,Closing Fiscal Year,වසා මුදල් වර්ෂය
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,කොටස් වෙළඳ වියදම්
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,කොටස් වෙළඳ වියදම්
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,කැමති අමතන්න විද්යුත් ඇතුලත් කරන්න
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,කැමති අමතන්න විද්යුත් ඇතුලත් කරන්න
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,කොන්ට්රා සටහන්
 DocType: Journal Entry Account,Credit in Company Currency,"සමාගම ව්යවහාර මුදල්, නය"
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ප්රාථමික ලිපිනය
 DocType: Production Plan,Material Request Detail,ද්රව්ය ඉල්ලීම් විස්තර
 DocType: Selling Settings,Default Quotation Validity Days,පෙරනිමි නිශ්කාෂණ වලංගු කාලය
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
 DocType: SMS Center,SMS Center,කෙටි පණිවුඩ මධ්යස්ථානය
 DocType: Sales Invoice,Change Amount,මුදල වෙනස්
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,රියදුරු බලපත්ර කාණ්ඩය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,කරුණාකර සැපයුම් දිනය ඇතුලත් කරන්න
 DocType: Depreciation Schedule,Make Depreciation Entry,ක්ෂය සටහන් කරන්න
+DocType: HR Settings,Leave Settings,අත්හැර දමන්න
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ඉල්ලීම වර්ගය
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,සේවක කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ගුවන් විදුලි
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS සැකසුම (ඔන්ලයින් / අන්තේ)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,රැකියා ඇණවුම්වලට එරෙහිව වේලා සටහන් කිරීම අවලංගු කිරීම. වැඩ පිළිවෙලට මෙහෙයුම් සිදු නොකළ යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ක්රියාකරවීම
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ක්රියාකරවීම
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,මෙහෙයුම් පිළිබඳ විස්තර සිදු කරන ලදී.
 DocType: Asset Maintenance Log,Maintenance Status,නඩත්තු කිරීම තත්වය
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,සාමාජිකත්ව තොරතුරු
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම්&gt; ප්රදේශය
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: සැපයුම්කරු ගෙවිය යුතු ගිණුම් {2} එරෙහිව අවශ්ය වේ
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,ද්රව්ය හා මිල ගණන්
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},මුළු පැය: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},දිනය සිට මුදල් වර්ෂය තුළ විය යුතුය. දිනය සිට උපකල්පනය = {0}
 DocType: Drug Prescription,Interval,කාලය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,මනාපය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,මනාපය
 DocType: Grant Application,Individual,තනි
 DocType: Academic Term,Academics User,විද්වතුන් පරිශීලක
 DocType: Cheque Print Template,Amount In Figure,රූපය දී මුදල
-DocType: Employee Loan Application,Loan Info,ණය තොරතුරු
+DocType: Loan Application,Loan Info,ණය තොරතුරු
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,නඩත්තු සංචාර සඳහා සැලැස්ම.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,සැපයුම්කරුවන් ලකුණු කාලය
 DocType: Share Transfer,Share Transfer,හුවමාරු කිරීම
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,අයිතම ආකෘතිය
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ජෛව රසායනය
 DocType: Job Offer,Select Terms and Conditions,නියමයන් හා කොන්දේසි තෝරන්න
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,අගය පෙන්වා
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,අගය පෙන්වා
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce සැකසුම්
 DocType: Production Plan,Sales Orders,විකුණුම් නියෝග
 DocType: Purchase Taxes and Charges,Valuation,තක්සේරු
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,පෙරනිමි දේශසීමාවේ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,රූපවාහිනී
 DocType: Work Order Operation,Updated via 'Time Log',&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,පාරිභෝගිකයා හෝ සැපයුම්කරු තෝරන්න.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,ජෝර්ඩ් කෝඩ්
 DocType: Naming Series,Series List for this Transaction,මෙම ගනුදෙනු සඳහා මාලාවක් ලැයිස්තුව
 DocType: Company,Enable Perpetual Inventory,භාණ්ඩ තොගය සක්රිය කරන්න
+DocType: Bank Guarantee,Charges Incurred,අයකිරීම්
 DocType: Company,Default Payroll Payable Account,පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම්
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,යාවත්කාලීන විද්යුත් සමූහ
 DocType: Sales Invoice,Is Opening Entry,විවෘත වේ සටහන්
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,අභිරුචි ප්රතිඵල
 DocType: Delivery Stop,Contact Name,අප අමතන්න නම
 DocType: Course Assessment Criteria,Course Assessment Criteria,පාඨමාලා තක්සේරු නිර්ණායක
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,බදු අංකය:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,බදු අංකය:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,ශිෂ්ය හැඳුනුම්පත:
 DocType: POS Customer Group,POS Customer Group,POS කස්ටමර් සමූහයේ
 DocType: Land Unit,Land Unit describing various land assets,විවිධ ඉඩම් වල ඉඩම් විස්තර කිරීම
@@ -375,9 +372,8 @@
 ,Open Work Orders,විවෘත සේවා ඇණවුම්
 DocType: Payment Term,Credit Months,ණය මාසය
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,"ශුද්ධ වැටුප්, 0 ට වඩා අඩු විය නොහැක"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","පද්ධතියෙන් පුනරාවර්තී දෝෂ දැනුම් දීම් නැවැත්වීම නැවැත්වීමට, දායකත්වය තුල අබල කළ ක්ෂේත්රය පරික්ෂා කර ඇත"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,වසරකට කොළ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,වසරකට කොළ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ෙරෝ {0}: මෙම අත්තිකාරම් ප්රවේශය නම් අත්තිකාරම් ලෙසයි &#39;ගිණුම එරෙහිව පරීක්ෂා කරන්න {1}.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},පොත් ගබඩාව {0} සමාගම අයිති නැත {1}
 DocType: Email Digest,Profit & Loss,ලාභය සහ අඞු කිරීමට
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,ශිෂ්ය කණ්ඩායම් යටතේ සිසුන් හදන්න
 DocType: Item Website Specification,Item Website Specification,අයිතමය වෙබ් අඩවිය පිරිවිතර
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,බැංකු අයැදුම්පත්
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,අවසරය ඇහිරීම
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,බැංකු අයැදුම්පත්
 DocType: Crop,Annual,වාර්ෂික
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,කොටස් ප්රතිසන්ධාන අයිතමය
 DocType: Stock Entry,Sales Invoice No,විකුණුම් ඉන්වොයිසිය නොමැත
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ශිෂ්ය කණ්ඩායම් නිර්මාණය මෙවලම පාඨමාලා
 DocType: Lead,Do Not Contact,අමතන්න එපා
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,ඔබගේ සංවිධානය ට උගන්වන්න අය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,මෘදුකාංග සංවර්ධකයා
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,මෘදුකාංග සංවර්ධකයා
 DocType: Item,Minimum Order Qty,අවම සාමය යවන ලද
 DocType: Pricing Rule,Supplier Type,සැපයුම්කරු වර්ගය
 DocType: Course Scheduling Tool,Course Start Date,පාඨමාලා ආරම්භය දිනය
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,"ද්රව්ය, ඉල්ලීම්"
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,මිලදී විස්තර
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,මැක්ස් ශ්රේණියේ
 DocType: Email Digest,New Quotations,නව මිල ගණන්
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,සේවක තෝරාගත් කැමති ඊ-තැපැල් මත පදනම් සේවකයාට විද්යුත් තැපැල් පණිවුඩ වැටුප් ස්ලිප්
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ලැයිස්තුවේ ඇති පළමු නිවාඩු Approver පෙරනිමි නිවාඩු Approver ලෙස ස්ථාපනය කරනු ලබන
 DocType: Tax Rule,Shipping County,නැව් කවුන්ටි
-apps/erpnext/erpnext/config/desktop.py +167,Learn,ඉගෙන ගන්න
+apps/erpnext/erpnext/config/desktop.py +159,Learn,ඉගෙන ගන්න
 DocType: Asset,Next Depreciation Date,ඊළඟ ක්ෂය දිනය
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,සේවක අනුව ලද වියදම
 DocType: Accounts Settings,Settings for Accounts,ගිණුම් සඳහා සැකසුම්
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,පැහැදිලි කිරීමට කැපී පෙනෙන චෙක්පත් සහ තැන්පතු
 DocType: Item,Synced With Hub,Hub සමඟ සමමුහුර්ත
 DocType: Driver,Fleet Manager,ඇණිය කළමනාකරු
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},පේළියේ # {0}: {1} අයිතමය {2} සඳහා සෘණ විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},පේළියේ # {0}: {1} අයිතමය {2} සඳහා සෘණ විය නොහැකි
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,වැරදි මුරපදය
 DocType: Item,Variant Of,අතරින් ප්රභේද්යයක්
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},කරුණාකර හෝටල් කාමර ගාස්තු {{
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Opening Invoice Creation Tool,Invoice Type,ඉන්වොයිසිය වර්ගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,සැපයුම් සටහන
 DocType: Consultation,Encounter Impression,පෙනෙන්නට ඇත
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,බදු සකස් කිරීම
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,අලෙවි වත්කම් පිරිවැය
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,පාරිභෝගික ව්යවහාර මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Course Scheduling Tool,Course Scheduling Tool,පාඨමාලා අවස මෙවලම
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[හදිසි විය හැකි]% s සඳහා පුනරාවර්තනය වන විටදී දෝශයක්
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
 DocType: Land Unit,LInked Analysis,ලින්ක්ඩ් විශ්ලේෂණය
 DocType: Item Tax,Tax Rate,බදු අනුපාතය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,අයදුම්පත්ර කාලය වෙන් කළ ලේඛන දෙකක් අතර විය නොහැක
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,අයදුම්පත්ර කාලය වෙන් කළ ලේඛන දෙකක් අතර විය නොහැක
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} කාලයක් සඳහා සේවක {1} සඳහා වන විටත් වෙන් {2} {3} වෙත
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ලැබී
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ශිෂ්ය කණ්ඩායම් නිර්මාණය කරන්න
 DocType: Volunteer,Weekends,සති අන්ත
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,ණය සටහන මුදල
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,ණය සටහන මුදල
 DocType: Setup Progress Action,Action Document,ක්රියාකාරී ලේඛනය
 DocType: Chapter Member,Website URL,වෙබ් අඩවි ලිපිනය
 ,Finished Goods,නිමි භාණ්ඩ
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,අයිතම එකතු කරන්න
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,අයිතමය තත්ත්ව පරීක්ෂක පරාමිති
+DocType: Leave Application,Leave Approver Name,අවසරය Approver නම
 DocType: Depreciation Schedule,Schedule Date,උපෙල්ඛනෙය් දිනය
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ඉපැයීම්, අඩු කිරීම් හා අනෙකුත් වැටුප් සංරචක"
 DocType: Packed Item,Packed Item,හැකිළු අයිතමය
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,උද්ධෘත සඳහා ඉල්ලුම්
 DocType: Healthcare Settings,Require Lab Test Approval,පරීක්ෂණය සඳහා අනුමැතිය අවශ්ය වේ
 DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,විශිෂ්ටයි
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,විශිෂ්ටයි
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
 DocType: Dosage Strength,Strength,ශක්තිය
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,නව පාරිභෝගික නිර්මාණය
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,පාරිෙභෝජන වියදම
 DocType: Purchase Receipt,Vehicle Date,වාහන දිනය
 DocType: Student Log,Medical,වෛද්ය
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,අහිමි හේතුව
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,අහිමි හේතුව
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,ගිණුම් අංකය යාවත්කාලීන කරන්න
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,ඊයම් න පෙරමුණ ලෙස සමාන විය නොහැකි
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,තනි
 DocType: Salary Slip,Total Loan Repayment,මුළු ණය ආපසු ගෙවීමේ
 DocType: Account,Cost of Goods Sold,විකුණුම් පිරිවැය
-DocType: Subscription,Yearly,වාර්ෂිකව
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
 DocType: Drug Prescription,Dosage,ආහාරය
 DocType: Journal Entry Account,Sales Order,විකුණුම් න්යාය
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
 DocType: Assessment Plan,Examiner Name,පරීක්ෂක නම
 DocType: Lab Test Template,No Result,කිසිදු ප්රතිඵල
 DocType: Purchase Invoice Item,Quantity and Rate,ප්රමාණය හා වේගය
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,සමාගමේ නම පළමු ඇතුලත් කරන්න
 DocType: Purchase Invoice,Supplier Name,සපයන්නාගේ නම
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,මෙම ERPNext අත්පොත කියවන්න
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,සියලු දෙපාර්තමේන්තු සාමාජිකයින්ගේ නිවාඩු දිනදර්ශනය
 DocType: Purchase Invoice,01-Sales Return,01-විකුණුම් ප්රතිලාභ
 DocType: Account,Is Group,"සමූහය,"
 DocType: Email Digest,Pending Purchase Orders,විභාග මිලදී ගැනීම නියෝග
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,අනිවාර්ය ක්ෂේත්රයේ - අධ්යයන වර්ෂය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} සමග සම්බන්ධ වී නැත {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,එම ඊමේල් කොටසක් ලෙස බෙදීයන හඳුන්වාදීමේ පෙළ වෙනස් කරගන්න. එක් එක් ගනුදෙනුව වෙනම හඳුන්වාදීමේ පෙළ ඇත.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},සමාගම {0} සඳහා පෙරනිමි ගෙවිය යුතු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},සමාගම {0} සඳහා පෙරනිමි ගෙවිය යුතු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},නැවැත්වීමට වැඩ කිරීම තහනම් නොවේ {0}
 DocType: Setup Progress Action,Min Doc Count,මිනුම් දණ්ඩ
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,සියලු නිෂ්පාදන ක්රියාවලීන් සඳහා වන ගෝලීය සැකසුම්.
 DocType: Accounts Settings,Accounts Frozen Upto,ගිණුම් ශීත කළ තුරුත්
 DocType: SMS Log,Sent On,දා යවන
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
 DocType: HR Settings,Employee record is created using selected field. ,සේවක වාර්තාවක් තෝරාගත් ක්ෂේත්ර භාවිතා කිරීමෙන්ය.
 DocType: Sales Order,Not Applicable,අදාළ නොවේ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,නිවාඩු ස්වාමියා.
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,විකිණීමට සඳහා දැන්වීම් වෙන්කර
 DocType: Packing Slip,From Package No.,පැකේජය අංක සිට
 DocType: Item Attribute,To Range,රංගේ කිරීමට
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,සුරැකුම්පත් හා තැන්පතු
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","එය ම ඇගයීමේ ක්රමය නැති අතර සමහර භාණ්ඩ එරෙහිව ගනුදෙනු ඇත ලෙස, ඇගයීමේ ක්රමය වෙනස් කළ නොහැක"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,සුරැකුම්පත් හා තැන්පතු
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","එය ම ඇගයීමේ ක්රමය නැති අතර සමහර භාණ්ඩ එරෙහිව ගනුදෙනු ඇත ලෙස, ඇගයීමේ ක්රමය වෙනස් කළ නොහැක"
 DocType: Student Report Generation Tool,Attended by Parents,දෙමව්පියන් සහභාගී විය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,වෙන් මුළු කොළ අනිවාර්ය වේ
 DocType: Patient,AB Positive,AB ධනාත්මක
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,පැමිනීමේ වාර්තාව.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet පදනම් වැටුප් වැටුප් සංරචක.
 DocType: Sales Order Item,Used for Production Plan,නිශ්පාදන සැළැස්ම සඳහා භාවිතා
-DocType: Employee Loan,Total Payment,මුළු ගෙවීම්
+DocType: Loan,Total Payment,මුළු ගෙවීම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,සම්පූර්ණ කරන ලද වැඩ පිළිවෙල සඳහා ගනුදෙනුව අවලංගු කළ නොහැක.
 DocType: Manufacturing Settings,Time Between Operations (in mins),මෙහෙයුම් අතර කාලය (මිනිත්තු දී)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} පියවර අවසන් කළ නොහැකි නිසා අවලංගු
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,ඔබේ ගනුදෙනුකරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ගොඩනගනු කිරීමට තරම් අමතර කොටස්
 DocType: POS Profile User,POS Profile User,POS පැතිකඩ පරිශීලක
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,සෘජු ආදායම්
+DocType: Subscription Invoice,Subscription Invoice,දායකත්ව ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,සෘජු ආදායම්
 DocType: Patient Appointment,Date TIme,දිනය වෙලාව
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","ගිණුම් වර්ගීකරණය නම්, ගිණුම් මත පදනම් පෙරීමට නොහැකි"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,පරිපාලන නිලධාරී
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,පරිපාලන නිලධාරී
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,සමාගම් හා බදු පිහිටුවීම
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 DocType: Codification Table,Codification Table,සංගහ වගුව
 DocType: Timesheet Detail,Hrs,ට
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,කරුණාකර සමාගම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,කරුණාකර සමාගම තෝරා
 DocType: Stock Entry Detail,Difference Account,වෙනස ගිණුම
 DocType: Purchase Invoice,Supplier GSTIN,සැපයුම්කරු GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,මුදල් ප්රවාහ සිතියම්කරණය
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
 DocType: Journal Entry,Difference (Dr - Cr),වෙනස (ආචාර්ය - Cr)
+DocType: Bank Guarantee,Providing,සපයමින්
 DocType: Account,Profit and Loss,ලාභ සහ අලාභ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","අවසර නොලැබූ විට, අවශ්ය පරිදි ලේසර් ටෙස්ට් සැකසුම වින්යාස කරන්න"
 DocType: Patient,Risk Factors,අවදානම් සාධක
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,සැපයුම්කරු ගෙවීම් නොමැත
 DocType: Territory,For reference,පරිශීලනය සඳහා
 DocType: Healthcare Settings,Appointment Confirmation,පත්වීම් ස්ථිර කිරීම
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","අනු අංකය මකා දැමිය නොහැකි {0}, එය කොටස් ගනුදෙනු සඳහා භාවිතා වන පරිදි"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","අනු අංකය මකා දැමිය නොහැකි {0}, එය කොටස් ගනුදෙනු සඳහා භාවිතා වන පරිදි"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),වැසීම (බැර)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,හෙලෝ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,විෂය ගෙන යන්න
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","පරිශීලකයා {1} සඳහා පරිශීලක පැතිකඩ {0} සඳහා සුපුරුදු ලෙස සකසා ඇත, කරුණාකර කාරුණිකව අබල කරන පෙරනිමිය"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,මූල්ය / ගිණුම් වර්ෂය.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,සමුච්චිත අගයන්
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","සමාවන්න, අනු අංක ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","සමාවන්න, අනු අංක ඒකාබද්ධ කළ නොහැකි"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS පැතිකඩ තුළ අවශ්ය ප්රදේශය අවශ්ය වේ
 DocType: Supplier,Prevent RFQs,RFQs වැළැක්වීම
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,විකුණුම් සාමය කරන්න
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},කාල පරාසය තුළ {0} සිට {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},කාල පරාසය තුළ {0} සිට {1}
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 ,Lead Id,ඊයම් අංකය
 DocType: C-Form Invoice Detail,Grand Total,මුලු එකතුව
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,නැව් බිල්පත දිනය
 DocType: Production Plan,Production Plan,නිෂ්පාදන සැලැස්ම
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ආරම්භක ඉන්වොයිස් සෑදීම මෙවලම
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,විකුණුම් ප්රතිලාභ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,සටහන: මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට අඩු නොවිය යුතු ය
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,අනුක්රමික අංකයක් මත පදනම් වූ ගනුදෙනුවලදී Qty සකසන්න
 ,Total Stock Summary,මුළු කොටස් සාරාංශය
 DocType: Announcement,Posted By,පලකරන්නා
 DocType: Item,Delivered by Supplier (Drop Ship),සැපයුම්කරුවන් (Drop නෞකාව) විසින් පවත්වන
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ඔබ මේ වන විටත් තවත් UOM සමග සමහර ගනුදෙනු (ව) කර ඇති නිසා අයිතමය සඳහා නු පෙරනිමි ඒකකය {0} සෘජුවම වෙනස් කළ නොහැක. ඔබ වෙනස් පෙරනිමි UOM භාවිතා කිරීම සඳහා නව විෂය නිර්මාණය කිරීමට අවශ්ය වනු ඇත.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,සමාගම සකස් කරන්න
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,සමාගම සකස් කරන්න
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,අසූහත ඒඑම්ටී
 DocType: Training Result Employee,Training Result Employee,පුහුණු ප්රතිඵල සේවක
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,කොටස් ඇතුළත් කිරීම් සිදු කරනු ලබන එරෙහිව තාර්කික ගබඩාව.
-DocType: Repayment Schedule,Principal Amount,විදුහල්පති මුදල
-DocType: Employee Loan Application,Total Payable Interest,මුළු ගෙවිය යුතු පොලී
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,විදුහල්පති මුදල
+DocType: Loan Application,Total Payable Interest,මුළු ගෙවිය යුතු පොලී
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},කැපී පෙනෙන ලෙස: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,විකුණුම් ඉන්වොයිසිය Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
 DocType: Restaurant Reservation,Restaurant Reservation,ආපන ශාලා
 DocType: Land Unit,Land Unit Name,ඉඩම් ඒකක නම
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,යෝජනාව ලේඛන
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,යෝජනාව ලේඛන
 DocType: Payment Entry Deduction,Payment Entry Deduction,ගෙවීම් සටහන් අඩු
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ආවරණය කිරීම
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,විද්යුත් තැපෑල හරහා ගනුදෙනුකරුවන් දැනුවත් කරන්න
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,විද්යුත් තැපෑල හරහා ගනුදෙනුකරුවන් දැනුවත් කරන්න
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,තවත් විකුණුම් පුද්ගලයෙක් {0} එම සේවක අංකය සහිත පවතී
 DocType: Employee Advance,Claimed Amount,හිමිකම් ලද මුදල
 apps/erpnext/erpnext/config/education.py +180,Masters,ශාස්ත්රපති
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","තනා නැති ගෙවීම් ගේට්වේ ගිණුම, අතින් එකක් නිර්මාණය කරන්න."
 DocType: Supplier Scorecard,Per Year,වසරකට
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB අනුව අනුව මෙම වැඩසටහනට ඇතුළත්වීම සුදුසු නැත
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
 DocType: Sales Invoice,Sales Taxes and Charges,විකුණුම් බදු හා ගාස්තු
 DocType: Employee,Organization Profile,සංවිධානය නරඹන්න
 DocType: Vital Signs,Height (In Meter),උස (මීටරයේ)
 DocType: Student,Sibling Details,සහෝදර විස්තර
 DocType: Vehicle Service,Vehicle Service,වාහන සේවා
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,ස්වයංක්රීයව කොන්දේසි මත පදනම් වූ ප්රතිචාර ඉල්ලීම මූලික හේතුව.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,ස්වයංක්රීයව කොන්දේසි මත පදනම් වූ ප්රතිචාර ඉල්ලීම මූලික හේතුව.
 DocType: Employee,Reason for Resignation,ඉ ලා අස් හේතුව
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,"කාර්ය සාධන ඇගයීම් සඳහා, සැකිල්ල."
 DocType: Sales Invoice,Credit Note Issued,ක්රෙඩිට් සටහන නිකුත් කර ඇත්තේ
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,නඩත්තු උපෙල්ඛනෙය්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","එවිට මිල ගණන් රීති පාරිභෝගික, පාරිභෝගික සමූහය, ප්රදේශය සැපයුම්කරු සැපයුම්කරුවන් වර්ගය, ව්යාපාරය, විකුණුම් සහකරු ආදිය මත පදනම් අතරින් ප්රේරණය වේ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,බඩු තොග ශුද්ධ වෙනස්
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,සේවක ණය කළමනාකරණ
 DocType: Employee,Passport Number,විදේශ ගමන් බලපත්ර අංකය
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 සමඟ සම්බන්ධය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,කළමනාකරු
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,කළමනාකරු
 DocType: Payment Entry,Payment From / To,/ සිට දක්වා ගෙවීම්
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ගබඩාවෙහි ගිණුම සකසන්න {0}
@@ -894,24 +890,24 @@
 DocType: Item,Material Transfer,ද්රව්ය හුවමාරු
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,සඳහා මාර්ගය සොයාගත නොහැකි විය
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),විවෘත කිරීමේ (ආචාර්ය)
+DocType: Loan,Applicant,ඉල්ලුම්කරු
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},"ගිය තැන, වේලාමුද්රාව {0} පසු විය යුතුය"
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,පුනරාවර්ත ලියකියවිලි සකස් කිරීම
 ,GST Itemised Purchase Register,GST අයිතමගත මිලදී ගැනීම ලියාපදිංචි
 DocType: Course Scheduling Tool,Reschedule,නැවත සැලසුම් කරන්න
-DocType: Employee Loan,Total Interest Payable,සම්පූර්ණ පොලී ගෙවිය යුතු
+DocType: Loan,Total Interest Payable,සම්පූර්ණ පොලී ගෙවිය යුතු
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,වියදම බදු හා ගාස්තු ගොඩ බස්වන ලදී
 DocType: Work Order Operation,Actual Start Time,සැබෑ ආරම්භය කාල
 DocType: BOM Operation,Operation Time,මෙහෙයුම කාල
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,අවසානයි
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,පදනම
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,පදනම
 DocType: Timesheet,Total Billed Hours,මුළු අසූහත පැය
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,මුදල කපා
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,මුදල කපා
 DocType: Leave Block List Allow,Allow User,පරිශීලක ඉඩ දෙන්න
 DocType: Journal Entry,Bill No,පනත් කෙටුම්පත මෙයට
 DocType: Company,Gain/Loss Account on Asset Disposal,වත්කම් බැහැර මත ලාභ / අලාභ ගිණුම්
 DocType: Vehicle Log,Service Details,සේවා තොරතුරු
 DocType: Vehicle Log,Service Details,සේවා තොරතුරු
-DocType: Subscription,Quarterly,කාර්තුමය
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,සමූහගත කර ඇත
 DocType: Selling Settings,Delivery Note Required,සැපයුම් සටහන අවශ්ය
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,කාලය පත්රය
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush, අමු ද්රව්ය මත පදනම් වන දින"
 DocType: Sales Invoice,Port Code,වරාය කේතය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,සංචිත ගබඩාව
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,සංචිත ගබඩාව
 DocType: Lead,Lead is an Organization,නායකත්වය සංවිධානයකි
 DocType: Guardian Interest,Interest,පොලී
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,පෙර විකුණුම්
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,ගිණුම්
 DocType: Vehicle,Odometer Value (Last),Odometer අගය (අවසන්)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,සැපයුම්කරුවන්ගේ ලකුණුකරුවන්ගේ නිර්ණායක
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,අලෙවි
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,අලෙවි
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ගෙවීම් සටහන් දැනටමත් නිර්මාණය
 DocType: Request for Quotation,Get Suppliers,සැපයුම්කරුවන් ලබා ගන්න
 DocType: Purchase Receipt Item Supplied,Current Stock,වත්මන් කොටස්
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
 DocType: Account,Expenses Included In Valuation,ඇතුලත් තක්සේරු දී වියදම්
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,ඔබගේ සාමාජිකත්වය දින 30 ක් ඇතුලත කල් ඉකුත් වන්නේ නම් පමණක් ඔබ හට අලුත් කළ හැකිය
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,ඔබ විසින් සැකසූ මුදල් ප්රවාහ සිතියම් ලේඛන සකසා ඇත්නම් පමණක් තෝරා ගන්න
 DocType: Email Digest,Next email will be sent on:,ඊළඟ ඊ-තැපැල් යවා වනු ඇත:
 DocType: Supplier Scorecard,Per Week,සතියකට
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,අයිතමය ප්රභේද ඇත.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,සම්පූර්ණ ශිෂ්යයා
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,අයිතමය {0} සොයාගත නොහැකි
 DocType: Bin,Stock Value,කොටස් අගය
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,ක්රෙඩිට් කාඩ් සටහන්
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,සමාගම හා ගිණුම්
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,අගය දී
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,අගය දී
 DocType: Asset Settings,Depreciation Options,ක්ෂයවීම් ක්රම
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,වලංගු නොවන තැපැල් කිරීම
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,වලංගු නොවන තැපැල් කිරීම
 DocType: Lead,Campaign Name,ව්යාපාරය නම
 DocType: Hotel Room,Capacity,ධාරිතාව
 DocType: Selling Settings,Close Opportunity After Days,අවස්ථා දින පසු සමීප
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක් නැත
 DocType: Budget,Budget Against,එරෙහි අයවැය
 DocType: Employee,Cell Number,සෛල අංකය
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ලබා දුන් නිර්ණායක සඳහා කිසිදු සේවකයෙකු නොමැත. ප්ලාස්ටි ස්ලිප් දැනටමත් නිර්මාණය කර නැතැයි පරීක්ෂා කරන්න.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ලබා දුන් නිර්ණායක සඳහා කිසිදු සේවකයෙකු නොමැත. ප්ලාස්ටි ස්ලිප් දැනටමත් නිර්මාණය කර නැතැයි පරීක්ෂා කරන්න.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,වාහන ද්රව්ය ඉල්ලීම් උත්පාදිත
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,අහිමි
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,ඔබ තීරුව &#39;සඟරාව සටහන් එරෙහි&#39; වර්තමාන වවුචරය ඇතුල් විය නොහැකියි
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,කරුණාකර වගුවක් තෝරන්න
 DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',&#39;ලබන්නන්&#39; තුළ {0} වලංගු නොවන ඊ-තැපැල් ලිපිනයකි.
 DocType: Special Test Items,Particulars,විස්තර
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} වර්ගයේ {1} සිට
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {0} වර්ගයේ {1} සිට
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ෙරෝ {0}: පරිවර්තන සාධකය අනිවාර්ය වේ
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","බහු මිල රීති එම නිර්ණායක සමග පවතී, ප්රමුඛත්වය යොමු කිරීම මගින් ගැටුම විසඳීමට කරන්න. මිල රීති: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,එය අනෙක් BOMs සම්බන්ධ වන ලෙස ද ෙව් විසන්ධි කිරීම හෝ අවලංගු කිරීම කළ නොහැකි
 DocType: Asset,Maintenance,නඩත්තු
+DocType: Subscriber,Subscriber,ග්රාහකයා
 DocType: Item Attribute Value,Item Attribute Value,අයිතමය Attribute අගය
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,කරුණාකර ඔබගේ ව්යාපෘති තත්ත්වය යාවත්කාලීන කරන්න
 DocType: Item,Maximum sample quantity that can be retained,රඳවා ගත හැකි උපරිම නියැදි ප්රමාණය
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,සාප්පු සවාරි කරත්ත සඳහා පෙරනිමි සැකසුම්
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Timeslots එකතු කරන්න
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ජර්නල් සටහන් {0} හරහා ඒම වත්කම්
-DocType: Employee Loan,Interest Income Account,පොලී ආදායම ගිණුම
+DocType: Loan,Interest Income Account,පොලී ආදායම ගිණුම
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,සමාලෝචනය යැවූ ලිපිය
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,ජෛව තාක්ෂණ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,කාර්යාලය නඩත්තු වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,කාර්යාලය නඩත්තු වියදම්
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,යන්න
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ඊ-තැපැල් ගිණුම සකස් කිරීම
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,පළමු අයිතමය ඇතුලත් කරන්න
 DocType: Asset Repair,Downtime,අතිකාල දීමනා
 DocType: Account,Liability,වගකීම්
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,අනුමැතිය ලත් මුදල ෙරෝ {0} තුළ හිමිකම් ප්රමාණය ට වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,අනුමැතිය ලත් මුදල ෙරෝ {0} තුළ හිමිකම් ප්රමාණය ට වඩා වැඩි විය නොහැක.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,අධ්යයන වාරය:
 DocType: Salary Detail,Do not include in total,මුලුමනින්ම ඇතුළත් නොකරන්න
 DocType: Company,Default Cost of Goods Sold Account,විදුලි උපකරණ පැහැර වියදම ගිණුම අලෙවි
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},සාම්පල ප්රමාණය {0} ප්රමාණයට වඩා වැඩි විය නොහැක {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
 DocType: Employee,Family Background,පවුල් පසුබිම
 DocType: Request for Quotation Supplier,Send Email,යවන්න විද්යුත්
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
 DocType: Item,Max Sample Quantity,නියැදි නියැදි ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,කිසිදු අවසරය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,කිසිදු අවසරය
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,ඉල්ලූම් කරන ලද ඉල්ලීම
 DocType: Vital Signs,Heart Rate / Pulse,හෘද ස්පන්දනය / ස්පන්දනය
 DocType: Company,Default Bank Account,පෙරනිමි බැංකු ගිණුම්
@@ -1087,12 +1083,11 @@
 DocType: Item,Items with higher weightage will be shown higher,අයිතම ඉහළ weightage සමග ඉහළ පෙන්වනු ලැබේ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ලේසර් ටෙස්ට් හා වැදගත් සංඥා
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,බැංකු සැසඳුම් විස්තර
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,සොයා ගත් සේවකයෙකු කිසිදු
-DocType: Subscription,Stopped,නතර
 DocType: Item,If subcontracted to a vendor,එය ඔබම කිරීමට උප කොන්ත්රාත්තු නම්
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,ව්යාපෘති යාවත්කාලීන කිරීම.
 DocType: SMS Center,All Customer Contact,සියලු පාරිභෝගික ඇමතුම්
 DocType: Land Unit,Tree Details,රුක් විස්තර
@@ -1142,7 +1137,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ස්වයංක්රීයව ගනුදෙනු ඉදිරිපත් කරන පණිවිඩය රචනා.
 DocType: Work Order,Item To Manufacture,අයිතමය නිෂ්පාදනය කිරීම සඳහා
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} තත්ත්වය {2} වේ
@@ -1156,7 +1150,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","තෝරාගත් පසු, තෝරාගත් ලිපිනය සුරැකීමෙන් අනතුරුව සංස්කරණය කරනු ලැබේ"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
 DocType: Item,Hub Publishing Details,තොරතුරු මධ්යස්ථානය තොරතුරු විස්තර
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;විවෘත&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;විවෘත&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
 DocType: Lab Test Template,Result Format,ප්රතිඵල ආකෘතිය
@@ -1166,7 +1160,7 @@
 DocType: Payroll Entry,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,තිරිංග Pad
 DocType: Fertilizer,Fertilizer Contents,පොහොර අන්තර්ගතය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,පර්යේෂණ හා සංවර්ධන
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,පර්යේෂණ හා සංවර්ධන
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,පනත් කෙටුම්පත මුදල
 DocType: Company,Registration Details,ලියාපදිංචි විස්තර
 DocType: Timesheet,Total Billed Amount,මුළු අසූහත මුදල
@@ -1180,7 +1174,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,විකුණුම් නියෝගයේ මගී ණය සීමාව පරීක්ෂා කරන්න
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,කාර්ය සාධන ඇගයීම්.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","සාප්පු සවාරි කරත්ත සක්රීය වේ පරිදි, &#39;&#39; කරත්තයක් සඳහා භාවිතා කරන්න &#39;සක්රීය කිරීම හා ෂොපිං කරත්ත සඳහා අවම වශයෙන් එක් බදු පාලනය කිරීමට හැකි විය යුතුය"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","එය මේ කුවිතාන්සියේ අත්තිකාරම් වශයෙන් ඇද ගත යුතු නම්, ගෙවීම් සටහන් {0} සාමය {1} හා සම්බන්ධ කර තිබේ, පරීක්ෂා කරන්න."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","එය මේ කුවිතාන්සියේ අත්තිකාරම් වශයෙන් ඇද ගත යුතු නම්, ගෙවීම් සටහන් {0} සාමය {1} හා සම්බන්ධ කර තිබේ, පරීක්ෂා කරන්න."
 DocType: Sales Invoice Item,Stock Details,කොටස් විස්තර
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ව්යාපෘති අගය
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,පේදුරු-of-Sale විකිණීමට
@@ -1214,7 +1208,7 @@
 DocType: Restaurant Table,Minimum Seating,අවම ආසන
 DocType: Item Attribute,Item Attribute Values,අයිතමය Attribute වටිනාකම්
 DocType: Examination Result,Examination Result,විභාග ප්රතිඵල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
 ,Received Items To Be Billed,ලැබී අයිතම බිල්පතක්
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,මුදල් හුවමාරු අනුපාතය ස්වාමියා.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},විමර්ශන Doctype {0} එකක් විය යුතුය
@@ -1222,15 +1216,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
 DocType: Work Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ස්ථාන මාරු සඳහා අයිතම නොමැත
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ස්ථාන මාරු සඳහා අයිතම නොමැත
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),අවසාන (විවෘත කිරීම + සම්පූර්ණ)
 DocType: Journal Entry,Depreciation Entry,ක්ෂය සටහන්
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,කරුණාකර පළමු ලිපි වර්ගය තෝරා
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,මෙම නඩත්තු සංචාරය අවලංගු කර පෙර ද්රව්ය සංචාර {0} අවලංගු කරන්න
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 ප්රමිතිය
 DocType: Pricing Rule,Rate or Discount,අනුපාතිකය හෝ වට්ටම්
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},අනු අංකය {0} අයිතමය අයිති නැත {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},අනු අංකය {0} අයිතමය අයිති නැත {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,අවශ්ය යවන ලද
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,ප්රියතම
 DocType: Hub Settings,Custom Data,අභිරුචි දත්ත
@@ -1242,9 +1236,9 @@
 DocType: Medical Code,Medical Code Standard,වෛද්ය කේත ප්රමිතිය
 DocType: Soil Texture,Clay Composition (%),මැටි සංයුතිය (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,කාර්යය පැවරීමට පෙර ඉතිරි කරන්න.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ශේෂ අගය
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ශේෂ අගය
 DocType: Lab Test,Lab Technician,විද්යාගාරය
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,විකුණුම් මිල ලැයිස්තුව
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","පරික්ෂා කර ඇත්නම්, පාරිභෝගිකයා නිර්මාණය කරනු ලබන අතර, රෝගියා වෙත සිතියම්කරණය කර ඇත. මෙම ගණුදෙනුකරුට රෝගියාගේ ඉන්වොයිස මතුවනු ඇත. Patient නිර්මාණය කිරීමේදී ඔබට පවතින පාරිභෝගිකයා තෝරා ගත හැකිය."
 DocType: Bank Reconciliation,Account Currency,ගිණුම ව්යවහාර මුදල්
@@ -1252,16 +1246,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,සමාගම ගිණුම අක්රිය වටය සඳහන් කරන්න
 DocType: Purchase Receipt,Range,රංගේ
 DocType: Supplier,Default Payable Accounts,පෙරනිමි ගෙවිය යුතු ගිණුම්
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
 DocType: Item Barcode,Item Barcode,අයිතමය Barcode
 DocType: Woocommerce Settings,Endpoints,අවසානය
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","උත්පාදනය කළ යුතුය. ප්රමාද වී ඇත්නම්, ඔබ මෙය &quot;මාසයේ නැවත දින&quot; ක්ෂේත්රයේ අතින් වෙනස් කිරීමට සිදුවනු ඇත"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
 DocType: Share Transfer,From Folio No,ෙප්ලි අංක
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,මිලදී ගැනීම ඉන්වොයිසිය අත්තිකාරම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ෙරෝ {0}: ක්රෙඩිට් විසයක් {1} සමග සම්බන්ධ විය නොහැකි
@@ -1296,16 +1288,17 @@
 DocType: Asset,Available-for-use Date,භාවිතයට ගත හැකි දිනය
 DocType: Guardian,Guardian Name,ගාඩියන් නම
 DocType: Cheque Print Template,Has Print Format,ඇත මුද්රණය ආකෘතිය
-DocType: Employee Loan,Sanctioned,අනුමත
+DocType: Loan,Sanctioned,අනුමත
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තාවක් සඳහා නිර්මාණය කර නැත
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ෙරෝ # {0}: අයිතමය {1} සඳහා අනු අංකය සඳහන් කරන්න
 DocType: Crop Cycle,Crop Cycle,බෝග චක්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;නිෂ්පාදන පැකේජය&#39; භාණ්ඩ, ගබඩා, අනු අංකය හා කණ්ඩායම සඳහා කිසිඳු මෙම &#39;ඇසුරුම් ලැයිස්තු මේසයෙන් සලකා බලනු ඇත. ගබඩාව සහ කණ්ඩායම මෙයට කිසිම &#39;නිෂ්පාදන පැකේජය&#39; අයිතමයේ සඳහා සියලු ඇසුරුම් භාණ්ඩ සඳහා සමාන වේ නම්, එම අගයන් ප්රධාන විෂය වගුවේ ඇතුළත් කළ හැකි, සාරධර්ම &#39;ඇසුරුම් ලැයිස්තු&#39; වගුව වෙත පිටපත් කිරීමට නියමිතය."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;නිෂ්පාදන පැකේජය&#39; භාණ්ඩ, ගබඩා, අනු අංකය හා කණ්ඩායම සඳහා කිසිඳු මෙම &#39;ඇසුරුම් ලැයිස්තු මේසයෙන් සලකා බලනු ඇත. ගබඩාව සහ කණ්ඩායම මෙයට කිසිම &#39;නිෂ්පාදන පැකේජය&#39; අයිතමයේ සඳහා සියලු ඇසුරුම් භාණ්ඩ සඳහා සමාන වේ නම්, එම අගයන් ප්රධාන විෂය වගුවේ ඇතුළත් කළ හැකි, සාරධර්ම &#39;ඇසුරුම් ලැයිස්තු&#39; වගුව වෙත පිටපත් කිරීමට නියමිතය."
 DocType: Student Admission,Publish on website,වෙබ් අඩවිය ප්රකාශයට පත් කරනු ලබයි
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,"සැපයුම්කරු ගෙවීම් දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය නොහැකි"
+DocType: Subscription,Cancelation Date,අවලංගු දිනය
 DocType: Purchase Invoice Item,Purchase Order Item,මිලදී ගැනීමේ නියෝගයක් අයිතමය
 DocType: Agriculture Task,Agriculture Task,කෘෂිකාර්මික කාර්යය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,වක්ර ආදායම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,වක්ර ආදායම්
 DocType: Student Attendance Tool,Student Attendance Tool,ශිෂ්ය පැමිණීම මෙවලම
 DocType: Restaurant Menu,Price List (Auto created),මිල ලැයිස්තුව (ස්වයංක්රීයව සාදා ඇති)
 DocType: Cheque Print Template,Date Settings,දිනය සැකසුම්
@@ -1332,6 +1325,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,මීටර්
 DocType: Workstation,Electricity Cost,විදුලිබල වියදම
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,පරීක්ෂණ කාලය datetime ලේබල් පරික්ෂා කිරීම datetime පෙර විය නොහැක
+DocType: Subscription Plan,Cost,පිරිවැය
 DocType: HR Settings,Don't send Employee Birthday Reminders,සේවක උපන්දින මතක් යවන්න එපා
 DocType: Expense Claim,Total Advance Amount,මුළු අත්තිකාරම් මුදල
 DocType: Delivery Stop,Estimated Arrival,ඇස්තමේන්තුගත පැමිණීම
@@ -1343,15 +1337,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
 DocType: Timesheet Detail,Bill,පනත් කෙටුම්පත
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,සුදු
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,සුදු
 DocType: SMS Center,All Lead (Open),සියලු ඊයම් (විවෘත)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({2} {3}) නොවේ
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,ඔබට පමණක් චෙක්පත් පෙට්ටි ලැයිස්තුවෙන් එක් විකල්පය උපරිම තෝරාගත හැක.
 DocType: Purchase Invoice,Get Advances Paid,අත්තිකාරම් ගෙවීම්
 DocType: Item,Automatically Create New Batch,නව කණ්ඩායම ස්වයංක්රීයව නිර්මාණය
 DocType: Item,Automatically Create New Batch,නව කණ්ඩායම ස්වයංක්රීයව නිර්මාණය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} සිට {1} (පේලිය {2}) පැවරීම
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} සිට {1} (පේලිය {2}) පැවරීම
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,කරන්න
 DocType: Student Admission,Admission Start Date,ඇතුල් වීමේ ආරම්භය දිනය
 DocType: Journal Entry,Total Amount in Words,වචන මුළු මුදල
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,නව ෙසේවකයා
@@ -1367,7 +1361,7 @@
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
 DocType: Repayment Schedule,Balance Loan Amount,ඉතිරි ණය මුදල
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,උපෙල්ඛනෙය් පාඨමාලා
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,කොටස් විකල්ප
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,කොටස් විකල්ප
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,මිලදී ගැනීමේ නියෝගයේ අවසන් මිලදී ගැනීමේ විස්තර අක්රිය කිරීම
 DocType: Journal Entry Account,Expense Claim,වියදම් හිමිකම්
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
@@ -1386,11 +1380,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ඇසුරුම් පුරවා අයිතමය
 DocType: Purchase Invoice,Cash/Bank Account,මුදල් / බැංකු ගිණුම්
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},ඇති {0} කරුණාකර සඳහන් කරන්න
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
 DocType: Delivery Note,Delivery To,වෙත බෙදා හැරීමේ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variant නිර්මානය පෝලිමේ ඇත.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} සඳහා වැඩ සාරාංශය
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ලැයිස්තුවෙහි පළමු අවසර පත්ර අනුමැතිය ලැබෙන්නේ පෙරනිමි නිවාඩු අනුමත කිරීම වශයෙනි.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Plan,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} සෘණ විය නොහැකි
 DocType: Training Event,Self-Study,ස්වයං අධ්යයනය
@@ -1403,7 +1398,7 @@
 DocType: Workstation,Wages,වැටුප්
 DocType: Asset Maintenance,Maintenance Manager Name,නඩත්තු කළමණාකරු නම
 DocType: Agriculture Task,Urgent,හදිසි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},පේළියක {0} සඳහා වලංගු ෙරෝ හැඳුනුම්පත සඳහන් කරන්න {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},පේළියක {0} සඳහා වලංගු ෙරෝ හැඳුනුම්පත සඳහන් කරන්න {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,විචල්යය සොයා ගත නොහැක:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,කරුණාකර numpad වෙතින් සංස්කරණය කිරීමට ක්ෂේත්රයක් තෝරන්න
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,තොග ලෙජරය සාදන නිසා ස්ථාවර වත්කම් අයිතමයක් විය නොහැක.
@@ -1415,7 +1410,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,තත්ත්ව පරීක්ෂක ආකෘති නම
 DocType: Project,First Email,පළමු විද්යුත් තැපෑල
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,විකුණුම් න්යාය / නිමි භාණ්ඩ ගබඩා තුළ ඇවිරිනි ගබඩාව
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,මුදල විකිණීම
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,මුදල විකිණීම
 DocType: Repayment Schedule,Interest Amount,පොලී මුදල
 DocType: Serial No,Creation Document No,නිර්මාණය ලේඛන නොමැත
 DocType: Share Transfer,Issue,නිකුත් කිරීම
@@ -1429,10 +1424,10 @@
 DocType: Tax Rule,Shipping State,නැව් රාජ්ය
 ,Projected Quantity as Source,මූලාශ්රය ලෙස ප්රක්ෂේපණය ප්රමාණ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,අයිතමය බොත්තම &#39;මිලදී ගැනීම ලැබීම් සිට අයිතම ලබා ගන්න&#39; භාවිතා එකතු කල යුතුය
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,සැපයුම් චාරිකාව
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,සැපයුම් චාරිකාව
 DocType: Student,A-,ඒ-
 DocType: Share Transfer,Transfer Type,මාරු වර්ගය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,විකුණුම් වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,විකුණුම් වියදම්
 DocType: Consultation,Diagnosis,ඩයග්නේෂන්
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,සම්මත මිලට ගැනීම
 DocType: GL Entry,Against,එරෙහි
@@ -1441,12 +1436,13 @@
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,කලාප කේතය
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},පොලී ආදායම් ගිණුමක් තෝරන්න {0}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
 DocType: Packing Slip,Net Weight UOM,ශුද්ධ බර UOM
 DocType: Item,Default Supplier,පෙරනිමි සැපයුම්කරු
 DocType: Manufacturing Settings,Over Production Allowance Percentage,නිෂ්පාදන වියදම් දීමනාව ප්රතිශතය කට අධික
-DocType: Employee Loan,Repayment Schedule,ණය ආපසු ගෙවීමේ කාලසටහන
+DocType: Loan,Repayment Schedule,ණය ආපසු ගෙවීමේ කාලසටහන
 DocType: Shipping Rule Condition,Shipping Rule Condition,නැව් පාලනය තත්වය
 DocType: Holiday List,Get Weekly Off Dates,සතිපතා Off ලබා ගන්න දිනයන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,අවසන් දිනය ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
@@ -1461,7 +1457,7 @@
 DocType: Education Settings,Attendance Freeze Date,පැමිණීම කණ්ඩරාව දිනය
 DocType: Education Settings,Attendance Freeze Date,පැමිණීම කණ්ඩරාව දිනය
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,ඔබේ සැපයුම්කරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,සියලු නිෂ්පාදන බලන්න
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,සියලු නිෂ්පාදන බලන්න
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),අවම ඊයම් වයස (දින)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,සියලු BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0} වර්ගයේ හෝටල් කාමර නොමැත {1}
@@ -1469,14 +1465,16 @@
 DocType: Expense Claim,From Employee,සේවක සිට
 DocType: Driver,Cellphone Number,ජංගම දුරකථන අංකය
 DocType: Project,Monitor Progress,ප්රගතිය අධීක්ෂණය කරන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {1} ශුන්ය වේ දී
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {1} ශුන්ය වේ දී
 DocType: Journal Entry,Make Difference Entry,වෙනස සටහන් කරන්න
+DocType: Supplier Quotation,Auto Repeat Section,ස්වයංක්රියව නැවත කියවීම
 DocType: Upload Attendance,Attendance From Date,දිනය සිට පැමිණීම
 DocType: Appraisal Template Goal,Key Performance Area,ප්රධාන කාර්ය සාධන ප්රදේශය
 DocType: Program Enrollment,Transportation,ප්රවාහන
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,වලංගු නොවන Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ප්රමාණය අඩු හෝ {0} වෙත සමාන විය යුතුයි
+DocType: Department Approver,Department Approver,දෙපාර්තමේන්තු අනුමැතිය
 DocType: SMS Center,Total Characters,මුළු අක්ෂර
 DocType: Employee Advance,Claimed,හිමිකම් කියන ලදී
 DocType: Crop,Row Spacing,පේළි පරතරය
@@ -1486,6 +1484,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ගෙවීම් ප්රතිසන්ධාන ඉන්වොයිසිය
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,දායකත්වය %
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","අර Buy සැකසුම් අනුව මිලදී ගැනීමේ නියෝගයක් අවශ්ය == &#39;ඔව්&#39; නම් ගැනුම් නිර්මාණය කිරීම සඳහා, පරිශීලක අයිතමය {0} සඳහා පළමු මිලදී ගැනීමේ නියෝගයක් නිර්මාණය කිරීමට අවශ්ය නම්"
+,HSN-wise-summary of outward supplies,HSN-ප්රඥාව-බාහිර සැපයුම්වල සාරාංශය
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ඔබේ ප්රයෝජනය සඳහා සමාගම ලියාපදිංචි අංක. බදු අංක ආදිය
 DocType: Sales Partner,Distributor,බෙදාහැරීමේ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,සාප්පු සවාරි කරත්ත නැව් පාලනය
@@ -1499,7 +1498,7 @@
 DocType: Setup Progress Action,Action Name,ක්රියාකාරී නම
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ආරම්භක වර්ෂය
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN පළමු 2 ඉලක්කම් රාජ්ය අංකය {0} සමග සැසඳිය යුතුයි
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,ආරම්භ කරන්න වත්මන් ඉන්වොයිස් කාලයේ දිනය
 DocType: Salary Slip,Leave Without Pay,වැටුප් නැතිව තබන්න
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
@@ -1517,26 +1516,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,බිම්වල පිටපත් පමණක් පිටපත් කෙරෙනු ඇත.
 DocType: Setup Progress Action,Domains,වසම්
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;සත ඇරඹුම් දිනය&#39; &#39;සත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,කළමනාකරණ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,කළමනාකරණ
 DocType: Cheque Print Template,Payer Settings,ගෙවන්නා සැකසුම්
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","මෙය ප්රභේද්යයක් යන විෂය සංග්රහයේ ඇත්තා වූ ද, ඇත. උදාහරණයක් ලෙස, ඔබේ වචන සහ &quot;එස් එම්&quot; වන අතර, අයිතමය කේතය &quot;T-shirt&quot; වේ නම්, ප්රභේද්යයක් ක අයිතමය කේතය &quot;T-shirt-එස්.එම්&quot; වනු"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ඔබ වැටුප් පුරවා ඉතිරි වරක් (වචන) ශුද්ධ වැටුප් දෘශ්යමාන වනු ඇත.
 DocType: Purchase Invoice,Is Return,ප්රතිලාභ වේ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,අවවාදයයි
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',කාර්යය අවසන් වන දිනට ආරම්භක දිනය &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
 DocType: Price List Country,Price List Country,මිල ලැයිස්තුව රට
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,අයිතමය සංග්රහයේ අනු අංකය වෙනස් කළ නොහැකි
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,අයිතමය සංග්රහයේ අනු අංකය වෙනස් කළ නොහැකි
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM පරිවර්තන සාධකය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,කණ්ඩායම අංකය ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
 DocType: Stock Settings,Default Item Group,පෙරනිමි අයිතමය සමූහ
-DocType: Employee Loan,Partially Disbursed,අර්ධ වශයෙන් මුදාහැරේ
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,තොරතුරු ලබා දෙන්න.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,තොරතුරු ලබා දෙන්න.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,සැපයුම්කරු දත්ත සමුදාය.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,අවලංගු නොකළ දායකත්ව නැවත ආරම්භ කළ නොහැක.
 DocType: Account,Balance Sheet,ශේෂ පත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
 DocType: Fee Validity,Valid Till,වලංගු ටී
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,සමස්ත දෙමව්පියන් ගුරු රැස්වීම
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
@@ -1549,7 +1548,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ෙරෝ # {0}: ප්රතික්ෂේප යවන ලද මිලදී ගැනීම ප්රතිලාභ ඇතුළත් කළ නොහැකි
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,තෝරාගත් ගනුදෙනුකරු සඳහා පාරිභෝගික කණ්ඩායම් වෙනස් කිරීම තහනම් කර ඇත.
 ,Purchase Order Items To Be Billed,මිලදී ගැනීමේ නියෝගයක් අයිතම බිල්පතක්
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,ඇස්තමේන්තුගත පැමිණීමේ කාලය යාවත්කාලීන කිරීම.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ඇස්තමේන්තුගත පැමිණීමේ කාලය යාවත්කාලීන කිරීම.
 DocType: Program Enrollment Tool,Enrollment Details,ඇතුළත් කිරීම් විස්තර
 DocType: Purchase Invoice Item,Net Rate,ශුද්ධ ෙපොලී අනුපාතිකය
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,කරුණාකර පාරිභෝගිකයා තෝරා ගන්න
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,වත්මන් මුදල් වර්ෂය
 DocType: Purchase Order,Group same items,සමූහ එම භාණ්ඩ
 DocType: Purchase Invoice,Disable Rounded Total,වුනාට මුළු අක්රීය
-DocType: Employee Loan Application,Repayment Info,ණය ආපසු ගෙවීමේ තොරතුරු
+DocType: Department,Parent Department,ෙදමාපිය ෙදපාර්තෙම්න්තුව
+DocType: Loan Application,Repayment Info,ණය ආපසු ගෙවීමේ තොරතුරු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;අයැදුම්පත්&#39; හිස් විය නොහැක
 DocType: Maintenance Team Member,Maintenance Role,නඩත්තු භූමිකාව
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},එම {1} සමග පේළිය {0} අනුපිටපත්
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},එම {1} සමග පේළිය {0} අනුපිටපත්
 ,Trial Balance,මාසික බැංකු සැසඳුම්
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,සේවක සකස් කිරීම
 DocType: Sales Order,SO-,ඒ නිසා-
 DocType: Hotel Room Reservation,Hotel Reservation User,හෝටල් වෙන් කිරීමේ පරිශීලක
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,පර්යේෂණ
+DocType: Subscription Settings,Subscription Settings,ග්රාහක සැකසුම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,පර්යේෂණ
 DocType: Maintenance Visit Purpose,Work Done,කළ වැඩ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,මෙම දන්ත ධාතුන් වගුවේ අවම වශයෙන් එක් විශේෂණය සඳහන් කරන්න
 DocType: Announcement,All Students,සියලු ශිෂ්ය
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
 DocType: Crop Cycle,Less than a year,අවුරුද්දකට වඩා අඩු කාලයක්
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,ශිෂ්ය ජංගම අංක
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ලෝකයේ සෙසු
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ලෝකයේ සෙසු
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
 DocType: Crop,Yield UOM,අස්වැන්න නෙලීම
 ,Budget Variance Report,අයවැය විචලතාව වාර්තාව
 DocType: Salary Slip,Gross Pay,දළ වැටුප්
 DocType: Item,Is Item from Hub,අයිතමයේ සිට අයිතමය දක්වා ඇත
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ෙරෝ {0}: ක්රියාකාරකම් වර්ගය අනිවාර්ය වේ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,ගෙවුම් ලාභාංශ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,ගෙවුම් ලාභාංශ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,ගිණුම් කරණය ලේජර
 DocType: Stock Reconciliation,Difference Amount,වෙනස මුදල
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ආචාර්ය {0} මත {1}
 DocType: Purchase Invoice,Reverse Charge,ප්රතිලෝම ගාස්තු
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,රඳවාගත් ඉපැයුම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,රඳවාගත් ඉපැයුම්
 DocType: Purchase Invoice,05-Change in POS,05-POS හි වෙනසක්
 DocType: Vehicle Log,Service Detail,සේවා විස්තර
 DocType: BOM,Item Description,අයිතම විවහතරය
@@ -1619,12 +1620,12 @@
 DocType: Opportunity Item,Opportunity Item,අවස්ථාව අයිතමය
 ,Student and Guardian Contact Details,ශිෂ්ය හා ගාඩියන් ඇමතුම් විස්තර
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,පේළියේ {0}: සැපයුම්කරු සඳහා {0} විද්යුත් තැපැල් ලිපිනය ඊ-තැපැල් යැවීමට අවශ්ය වේ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,තාවකාලික විවෘත
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,තාවකාලික විවෘත
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,හබල් බලන්න
 ,Employee Leave Balance,සේවක නිවාඩු ශේෂ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ගිණුම සඳහා ශේෂ {0} සැමවිටම විය යුතුය {1}
 DocType: Patient Appointment,More Info,තවත් තොරතුරු
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},පේළියේ {0} තුළ අයිතමය සඳහා අවශ්ය තක්සේරු අනුපාත
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},පේළියේ {0} තුළ අයිතමය සඳහා අවශ්ය තක්සේරු අනුපාත
 DocType: Supplier Scorecard,Scorecard Actions,ලකුණු කරන්න
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,උදාහරණය: පරිගණක විද්යාව පිළිබඳ ශාස්ත්රපති
 DocType: Purchase Invoice,Rejected Warehouse,ප්රතික්ෂේප ගබඩාව
@@ -1634,7 +1635,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,දක්වා
 DocType: Supplier Quotation Item,Lead Time in days,දින තුළ කාල Lead
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,ගෙවිය යුතු ගිණුම් සාරාංශය
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} සිට {1} වැටුප් ගෙවීම
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} සිට {1} වැටුප් ගෙවීම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ශීත කළ ගිණුම් {0} සංස්කරණය කිරීමට අවසර නැත
 DocType: Journal Entry,Get Outstanding Invoices,විශිෂ්ට ඉන්වොයිසි ලබා ගන්න
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
@@ -1643,9 +1644,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,පරීක්ෂණ පරීක්ෂණ නිර්දේශ කිරීම
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,කුඩා
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,කුඩා
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ආරම්භක ඉන්වොයිස් සෑදීම මෙවලම අයිතමය
 DocType: Education Settings,Employee Number,සේවක සංඛ්යාව
+DocType: Subscription Settings,Cancel Invoice After Grace Period,කාල පරිච්ඡේදයෙන් පසු ඉන්වොයිසිය අහෝසි කරන්න
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},නඩු අංක (ය) දැනටමත් භාවිත වේ. නඩු අංක {0} සිට උත්සාහ කරන්න
 DocType: Project,% Completed,% සම්පූර්ණ
 ,Invoiced Amount (Exculsive Tax),ඉන්වොයිස් ප්රමාණය (Exculsive බදු)
@@ -1659,7 +1661,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ඩී
 DocType: Email Digest,Add Quote,Quote එකතු කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM සඳහා අවශ්ය UOM coversion සාධකය: අයිතම ගැන {0}: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,වක්ර වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,වක්ර වියදම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ෙරෝ {0}: යවන ලද අනිවාර්ය වේ
 DocType: Agriculture Analysis Criteria,Agriculture,කෘෂිකර්ම
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ප්රාග්ධන උපකරණ
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,ප්රාග්ධන උපකරණ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, &#39;මත යොමු කරන්න&#39; මත පදනම් වූ තෝරා ගනු ලැබේ."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,කරුණාකර අයිතම කේතය මුලින්ම සකසන්න
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
+DocType: Subscription Plan,Billing Interval Count,බිල්ගත කිරීමේ කාල ගණනය කිරීම
 DocType: Sales Invoice Item,Edit Description,සංස්කරණය කරන්න විස්තරය
 DocType: Antibiotic,Antibiotic,ප්රතිජීවක ඖෂධ
 ,Team Updates,කණ්ඩායම යාවත්කාලීන
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,සැපයුම්කරු සඳහා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,සැපයුම්කරු සඳහා
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ගිණුම් වර්ගය කිරීම ගනුදෙනු මෙම ගිණුම තෝරා උපකාරී වේ.
 DocType: Purchase Invoice,Grand Total (Company Currency),මුළු එකතුව (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,මුද්රණය ආකෘතිය නිර්මාණය
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS අයිතමය සමූහ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,විද්යුත් Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,විකල්ප අයිතම අයිතමය කේතයට සමාන නොවිය යුතුය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
 DocType: Sales Partner,Target Distribution,ඉලක්ක බෙදාහැරීම්
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - තාවකාලික ඇගයීම අවසන් කිරීම
 DocType: Salary Slip,Bank Account No.,බැංකු ගිණුම් අංක
@@ -1742,7 +1745,7 @@
 DocType: BOM Operation,Workstation,සේවා පරිගණකයක්
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,උද්ධෘත සැපයුම්කරු සඳහා වන ඉල්ලීම
 DocType: Healthcare Settings,Registration Message,ලියාපදිංචි වීමේ පණිවිඩය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,දෘඩාංග
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,දෘඩාංග
 DocType: Prescription Dosage,Prescription Dosage,බෙහෙත් වට්ටෝරුව
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,කරුණාකර සමාගම තෝරා
@@ -1773,7 +1776,7 @@
 DocType: Project,Start and End Dates,ආරම්භ කිරීම හා අවසන් දිනයන්
 ,Delivered Items To Be Billed,භාර අයිතම බිල්පතක්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},විවෘත ද්රව්ය ලේඛණය {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,පොත් ගබඩාව අනු අංකය වෙනස් කළ නොහැකි
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,පොත් ගබඩාව අනු අංකය වෙනස් කළ නොහැකි
 DocType: Authorization Rule,Average Discount,සාමාන්ය වට්ටම්
 DocType: Project Update,Great/Quickly,මහා / කඩිනම්
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1782,8 +1785,8 @@
 DocType: Employee,EMP/,දන්නේ නෑ නේද /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,batched අයිතමය සඳහා කාණ්ඩ තෝරන්න
 DocType: Asset,Depreciation Schedules,ක්ෂය කාලසටහන
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,පහත සඳහන් ගිණුම GST සැකසුම් තුළ තෝරා ගත හැකිය:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,අයදුම් කාලය පිටත නිවාඩු වෙන් කාලය විය නොහැකි
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,පහත සඳහන් ගිණුම GST සැකසුම් තුළ තෝරා ගත හැකිය:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,අයදුම් කාලය පිටත නිවාඩු වෙන් කාලය විය නොහැකි
 DocType: Activity Cost,Projects,ව්යාපෘති
 DocType: Payment Request,Transaction Currency,ගනුදෙනු ව්යවහාර මුදල්
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},{0} සිට | {1} {2}
@@ -1794,6 +1797,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,සාමාන්යය ඩේලි ඇමතුම්
 DocType: POS Profile,Campaign,ව්යාපාරය
 DocType: Supplier,Name and Type,නම සහ වර්ගය
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',අනුමැතිය තත්ත්වය &#39;අනුමත&#39; කළ යුතුය හෝ &#39;ප්රතික්ෂේප&#39;
 DocType: Physician,Contacts and Address,ඇමතුම් සහ ලිපිනය
 DocType: Purchase Invoice,Contact Person,අදාළ පුද්ගලයා
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;අපේක්ෂිත ඇරඹුම් දිනය&#39; &#39;අපේක්ෂිත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
@@ -1807,19 +1811,20 @@
 DocType: Student Admission,Eligibility and Details,සුදුසුකම් සහ විස්තර
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,ස්ථාවර වත්කම් ශුද්ධ වෙනස්
 DocType: Leave Control Panel,Leave blank if considered for all designations,සියලු තනතුරු සඳහා සලකා නම් හිස්ව තබන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},මැක්ස්: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,දිනයවේලාව සිට
 DocType: Email Digest,For Company,සමාගම වෙනුවෙන්
 apps/erpnext/erpnext/config/support.py +17,Communication log.,සන්නිවේදන ලඝු-සටහන.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","උද්ධෘත සඳහා ඉල්ලුම් තවත් කිව බිහිදොර සැකසුම් සඳහා, බිහිදොර සිට ප්රවේශ අක්රීය කර ඇත."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,සැපයුම්කරුවන් ලකුණු Scorecard ලකුණු කිරීම විචල්යය
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
 DocType: Sales Invoice,Shipping Address Name,නැව් ලිපිනය නම
 DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,පාඨමාලාවේ උපලේඛන නිර්මාණය කිරීමේ දෝෂ ඇත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ලැයිස්තුවේ පළමු වියදම් සහතිකය පෙරනිමි වියදම් සහතිකය ලෙස නියම කරනු ලැබේ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
@@ -1840,14 +1845,15 @@
 DocType: Package Code,Package Code,පැකේජය සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,ආධුනිකත්ව
 DocType: Purchase Invoice,Company GSTIN,සමාගම GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,ඍණ ප්රමාණ කිරීමට අවසර නැත
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,ඍණ ප්රමාණ කිරීමට අවසර නැත
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",බදු විස්තර වගුව වැලක් ලෙස අයිතමය ස්වාමියා සිට ඉහළම අගය හා මෙම ක්ෂේත්රය තුළ ගබඩා. බදු හා ගාස්තු සඳහා භාවිතා
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ගිණුම කැටි නම්, ඇතුළත් කිරීම් සීමා පරිශීලකයන්ට ඉඩ දෙනු ලැබේ."
 DocType: Email Digest,Bank Balance,බැංකු ශේෂ
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,නිවාඩු ඉල්ලුම් පත්රයෙහි අනුමත කිරීම අනුමත කරන්න
 DocType: Job Opening,"Job profile, qualifications required etc.","රැකියා පැතිකඩ, සුදුසුකම් අවශ්ය ආදිය"
 DocType: Journal Entry Account,Account Balance,ගිණුම් ශේෂය
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,ගනුදෙනු සඳහා බදු පාලනය.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},මූලාශ්රය ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,පේලිය {0} හි ගෙවීමේ වාරිකය අනු පිටපතක් විය හැක.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),කෘෂිකර්ම (බීටා)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,කාර්යාලය කුලියට
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,කාර්යාලය කුලියට
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
 DocType: Disease,Common Name,පොදු නම
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,ආනයන අසාර්ථක විය!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,කිසිදු ලිපිනය තවමත් වැඩිදුරටත් සඳහන් කළේය.
 DocType: Workstation Working Hour,Workstation Working Hour,සේවා පරිගණකයක් කෘත්යාධිකාරී හෝරාව
 DocType: Vital Signs,Blood Pressure,රුධිර පීඩනය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,රස පරීක්ෂක
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,රස පරීක්ෂක
 DocType: Item,Inventory,බඩු තොග
 DocType: Item,Sales Details,විකුණුම් විස්තර
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ශිෂ්ය සමූහය සිසුන් සඳහා වලංගුකරණය භාරදුන් පාඨමාලාව
 DocType: Notification Control,Expense Claim Rejected,වියදම් හිමිකම් ප්රතික්ෂේප
 DocType: Item,Item Attribute,අයිතමය Attribute
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ආණ්ඩුව
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ආණ්ඩුව
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,වියදම් හිමිකම් {0} දැනටමත් වාහන ඇතුළුවන්න සඳහා පවතී
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,සංවිධානයේ නම
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,ණය ආපසු ගෙවීමේ ප්රමාණය ඇතුලත් කරන්න
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,ණය ආපසු ගෙවීමේ ප්රමාණය ඇතුලත් කරන්න
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,අයිතමය ප්රභේද
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,සේවා
 DocType: HR Settings,Email Salary Slip to Employee,සේවකයෙකුට ලබා විද්යුත් වැටුප කුවිතාන්සියක්
 DocType: Cost Center,Parent Cost Center,මව් පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,හැකි සැපයුම්කරු තෝරා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,හැකි සැපයුම්කරු තෝරා
 DocType: Sales Invoice,Source,මූලාශ්රය
 DocType: Customer,"Select, to make the customer searchable with these fields",මෙම ක්ෂේත්රයන් සමඟ පාරිභෝගිකයා සොයා ගත හැකි පරිදි තෝරා ගන්න
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,පෙන්වන්න වසා
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,ඇසුරුම් කුවිතාන්සියක් (ව) අවලංගු
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ආයෝජනය සිට මුදල් ප්රවාහ
 DocType: Program Course,Program Course,වැඩසටහන පාඨමාලා
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ගැල් පරිවහන හා භාණ්ඩ යොමු ගාස්තු
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ගැල් පරිවහන හා භාණ්ඩ යොමු ගාස්තු
 DocType: Homepage,Company Tagline for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සමාගම තේමා පාඨය
 DocType: Item Group,Item Group Name,අයිතමය සමූහ නම
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ගත වන
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,මංගල තොරතුරු
 DocType: Leave Block List,Block Holidays on important days.,වැදගත් දිනවල නිවාඩු අවහිර කරයි.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),කරුණාකර අවශ්ය ප්රතිඵශ වටිනාකම (s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,ලැබිය යුතු ගිණුම් සාරාංශය
-DocType: Employee Loan,Monthly Repayment Amount,මාසික නැවත ගෙවන ප්රමාණය
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,ලැබිය යුතු ගිණුම් සාරාංශය
+DocType: Loan,Monthly Repayment Amount,මාසික නැවත ගෙවන ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ආරම්භක ඉන්වොයිසි
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,සේවක කාර්යභාරය සකස් කිරීම සඳහා සේවක වාර්තාගත පරිශීලක අනන්යාංකය ක්ෂේත්රයේ සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,සේවක කාර්යභාරය සකස් කිරීම සඳහා සේවක වාර්තාගත පරිශීලක අනන්යාංකය ක්ෂේත්රයේ සකස් කරන්න
 DocType: UOM,UOM Name,UOM නම
 DocType: GST HSN Code,HSN Code,HSN සංග්රහයේ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,දායකත්වය මුදල
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},පරිශීලක {0} දැනටමත් වෛද්යවරයා වෙත පවරා ඇත. {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,කොටුව
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,හැකි සැපයුම්කරු
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,හැකි සැපයුම්කරු
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,මාසික බෙදාහැරීම්
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ලබන්නා ලැයිස්තුව හිස්ය. Receiver ලැයිස්තුව නිර්මාණය කරන්න
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),සෞඛ්ය (බීටා)
@@ -2001,7 +2008,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,පැක් කරගන්න අයිතම කිසිදු
 DocType: Shipping Rule Condition,From Value,අගය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
-DocType: Employee Loan,Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය
+DocType: Loan,Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","පරීක්ෂා නම්, මුල් පිටුව වෙබ් අඩවිය සඳහා පෙරනිමි අයිතමය සමූහ වනු ඇත"
 DocType: Quality Inspection Reading,Reading 4,කියවීම 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,සමාගම වියදම් සඳහා හිමිකම්.
@@ -2010,7 +2017,7 @@
 DocType: Asset Maintenance Task,Certificate Required,සහතිකය අවශ්ය වේ
 DocType: Company,Default Holiday List,පෙරනිමි නිවාඩු ලැයිස්තුව
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ෙරෝ {0}: කාලය හා සිට දක්වා {1} ගතවන කාලය {2} සමග අතිච්ඡාදනය වේ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,කොටස් වගකීම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,කොටස් වගකීම්
 DocType: Purchase Invoice,Supplier Warehouse,සැපයුම්කරු ගබඩාව
 DocType: Opportunity,Contact Mobile No,අමතන්න ජංගම නොමැත
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,සමාගම තෝරන්න
@@ -2018,7 +2025,7 @@
 DocType: Student Report Generation Tool,Print Section,මුදණ අංශය
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,පරිශීලක {0} කිසිදු පෙරනිමි POS පැතිකඩක් නොමැත. මෙම පරිශීලක සඳහා Row {1} හි පෙරනිමිය පරීක්ෂා කරන්න.
 DocType: Student Group,Set 0 for no limit,සීමාවක් සඳහා 0 සකසන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} විවෘත කිරීම {invoice_type} ඉන්වොයිසි නිර්මාණය කිරීම අවශ්ය වේ
 DocType: Customer,Primary Address and Contact Detail,ප්රාථමික ලිපිනය සහ සම්බන්ධතා විස්තරය
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,නැවත භාරදුන් ගෙවීම් විද්යුත්
@@ -2029,10 +2036,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,කරුණාකර අවම වසයෙන් එක් වසමක් තෝරන්න.
 DocType: Dependent Task,Dependent Task,රඳා කාර්ය සාධක
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,කල්තියා X දින සඳහා මෙහෙයුම් සැලසුම් උත්සාහ කරන්න.
 DocType: HR Settings,Stop Birthday Reminders,උපන්දින මතක් නතර
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,සොයන්න අයිතමය
 DocType: Payment Schedule,Payment Amount,ගෙවීමේ මුදල
@@ -2042,7 +2049,7 @@
 DocType: Assessment Plan,Grading Scale,ශ්රේණිගත පරිමාණ
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,මේ වන විටත් අවසන්
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,අතේ කොටස්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,අතේ කොටස්
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,සාර්ථක ආනයනය!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ගෙවීම් ඉල්ලීම් මේ වන විටත් {0} පවතී
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,නිකුත් කර ඇත්තේ අයිතම පිරිවැය
@@ -2053,17 +2060,16 @@
 DocType: Quotation Item,Quotation Item,උද්ධෘත අයිතමය
 DocType: Customer,Customer POS Id,පාරිභෝගික POS ඉඞ්
 DocType: Account,Account Name,ගිණුමේ නම
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,දිනය සිට මේ දක්වා වඩා වැඩි විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,අනු අංකය {0} ප්රමාණය {1} අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,දිනය සිට මේ දක්වා වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,අනු අංකය {0} ප්රමාණය {1} අල්පයක් විය නොහැකි
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,කරුණාකර Woocommerce සේවාදායකයේ URL එක ඇතුලත් කරන්න
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,සැපයුම්කරු වර්ගය ස්වාමියා.
 DocType: Purchase Order Item,Supplier Part Number,සැපයුම්කරු අඩ අංකය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,බවට පරිවර්තනය කිරීමේ අනුපාතිකය 0 හෝ 1 විය නොහැකි
 DocType: Share Balance,To No,නැත
-DocType: Subscription,Reference Document,විමර්ශන ලේඛන
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} අවලංගු කර හෝ නතර
 DocType: Accounts Settings,Credit Controller,ක්රෙඩිට් පාලක
-DocType: Grant Application,Applicant Type,අයදුම්කරු වර්ගය
+DocType: Loan,Applicant Type,අයදුම්කරු වර්ගය
 DocType: Purchase Invoice,03-Deficiency in services,03-සේවා හිඟය
 DocType: Delivery Note,Vehicle Dispatch Date,වාහන යැවීම දිනය
 DocType: Healthcare Settings,Default Medical Code Standard,සම්මත වෛද්ය කේත ප්රමිතිය
@@ -2074,13 +2080,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% අසූහත
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ඇවිරිනි යවන ලද
 DocType: Party Account,Party Account,පක්ෂය ගිණුම
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,මානව සම්පත්
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,මානව සම්පත්
 DocType: Lead,Upper Income,ඉහළ ආදායම්
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ප්රතික්ෂේප
 DocType: Journal Entry Account,Debit in Company Currency,සමාගම ව්යවහාර මුදල් ඩෙබිට්
 DocType: BOM Item,BOM Item,ද්රව්ය ලේඛණය අයිතමය
 DocType: Appraisal,For Employee,සේවක සඳහා
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ටහිර සටහන් කරන්න
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ටහිර සටහන් කරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ෙරෝ {0}: සැපයුම්කරු එරෙහිව උසස් හර කළ යුතුය
 DocType: Company,Default Values,පෙරනිමි අගයන්
 DocType: Membership,INR,INR
@@ -2109,10 +2115,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),මුළු (බදු රහිත)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ඊයම් ගණන්
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 ට වඩා වැඩි විය යුතුය"
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,තොග ඇත
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,තොග ඇත
 DocType: Manufacturing Settings,Capacity Planning For (Days),(දින) සඳහා ධාරිතා සැලසුම්
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ප්රසම්පාදන
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,භාණ්ඩ කිසිවක් ප්රමාණය සහ වටිනාකම යම් වෙනසක් තිබෙනවා.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,භාණ්ඩ කිසිවක් ප්රමාණය සහ වටිනාකම යම් වෙනසක් තිබෙනවා.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,අනිවාර්ය ක්ෂේත්රයේ - වැඩසටහන
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,අනිවාර්ය ක්ෂේත්රයේ - වැඩසටහන
 DocType: Special Test Template,Result Component,ප්රතිඵල අන්තර්ගතය
@@ -2133,7 +2139,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,කොළ ලෙස කොළ තුළ නිවාඩු දින ඇතුළත්
 DocType: Sales Invoice,Packed Items,හැකිළු අයිතම
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,අනු අංකය එරෙහිව වගකීම් හිමිකම්
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;මුළු&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;මුළු&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,සාප්පු සවාරි කරත්ත සබල කරන්න
 DocType: Employee,Permanent Address,ස්ථිර ලිපිනය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2151,10 +2157,10 @@
 DocType: Selling Settings,Selling Settings,සැකසුම් විකිණීම
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ක්රියාකාරීත්වය තහවුරු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ඔන්ලයින් තේ වෙන්දේසියේදී
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,ප්රමාණ හෝ තක්සේරු අනුපාත හෝ දෙකම සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ප්රමාණ හෝ තක්සේරු අනුපාත හෝ දෙකම සඳහන් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,ඉටු වීම
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,කරත්ත තුළ බලන්න
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,අලෙවි වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,අලෙවි වියදම්
 ,Item Shortage Report,අයිතමය හිඟය වාර්තාව
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,සම්මත නිර්ණායක නිර්මාණය කළ නොහැක. කරුණාකර නිර්ණායක වෙනස් කරන්න
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
@@ -2177,9 +2183,9 @@
 DocType: Upload Attendance,Get Template,සැකිල්ල ලබා ගන්න
 DocType: Material Request,Transferred,මාරු
 DocType: Vehicle,Doors,දොරවල්
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,රෝගියා ලියාපදිංචි කිරීමේ ගාස්තුව අයකර ගැනීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,කොටස් ගනුදෙනුවකින් පසුව ගුණාංග වෙනස් කළ නොහැක. නව අයිතමයට නව අයිතමයක් හා ස්ථාන මාරු තොගයක් සාදන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,කොටස් ගනුදෙනුවකින් පසුව ගුණාංග වෙනස් කළ නොහැක. නව අයිතමයට නව අයිතමයක් හා ස්ථාන මාරු තොගයක් සාදන්න
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,"බදු බිඳ වැටීම,"
 DocType: Packing Slip,PS-,PS-
@@ -2215,12 +2221,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ප්රතිසන්ධාන JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,බොහෝ තීරු. එම වාර්තාව අපනයනය සහ පැතුරුම්පත් උපයෝගයක් භාවිතා කරමින් එය මුද්රණය කරන්න.
 DocType: Purchase Invoice Item,Batch No,කණ්ඩායම කිසිදු
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,සේවක අත්තිකාරම්
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,හැකි පාරිභෝගික ගේ මිලදී ගැනීමේ නියෝගයක් එරෙහිව බහු විකුණුම් නියෝග ඉඩ දෙන්න
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 DocType: Grant Application,Assessment  Mark (Out of 10),ඇගයීම් ලකුණු (10 න්)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ජංගම නොමැත
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ප්රධාන
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ප්රධාන
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ප්රභේද්යයක්
 DocType: Naming Series,Set prefix for numbering series on your transactions,ඔබගේ ගනුදෙනු මාලාවක් සංඛ්යාවක් සඳහා උපසර්ගය සකසන්න
 DocType: Employee Attendance Tool,Employees HTML,සේවක HTML
@@ -2229,15 +2236,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ක්ෂේත්රයේ සිට අවස්ථාව අනිවාර්ය වේ
 DocType: Email Digest,Annual Expenses,වාර්ෂික වියදම්
 DocType: Item,Variants,ප්රභේද
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
 DocType: SMS Center,Send To,කිරීම යවන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
 DocType: Payment Reconciliation Payment,Allocated amount,වෙන් කල මුදල
 DocType: Sales Team,Contribution to Net Total,ශුද්ධ මුළු දායකත්වය
 DocType: Sales Invoice Item,Customer's Item Code,පාරිභෝගික අයිතමය සංග්රහයේ
 DocType: Stock Reconciliation,Stock Reconciliation,කොටස් ප්රතිසන්ධාන
 DocType: Territory,Territory Name,භූමි ප්රදේශය නම
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,සිදු වෙමින් පවතින වැඩ ගබඩාව පෙර ඉදිරිපත් අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,ඔබට ග්රාහකත්වය යටතේ එකම බිල් කිරීමේ චක්රයක් සහිතව සැලසුම් ඇත
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,රැකියාවක් සඳහා අයදුම්කරු.
 DocType: Purchase Order Item,Warehouse and Reference,ගබඩාවක් සහ විමර්ශන
 DocType: Supplier,Statutory info and other general information about your Supplier,ව්යවස්ථාපිත තොරතුරු හා ඔබගේ සැපයුම්කරු ගැන අනෙක් සාමාන්ය තොරතුරු
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ජර්නල් සටහන් {0} එරෙහිව කිසිදු අසමසම {1} ප්රවේශය නොමැති
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ඇගයීම්
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,පුහුණු සිදුවීම්
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},අනු අංකය අයිතමය {0} සඳහා ඇතුල් අනුපිටපත්
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},අනු අංකය අයිතමය {0} සඳහා ඇතුල් අනුපිටපත්
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,මූලාශ්ර ප්රභවයෙන් මඟ පෙන්වීම
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,"එය නාවික, නීතියේ ආධිපත්යය සඳහා වන තත්ත්වය"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,කරුණාකර ඇතුලත් කරන්න
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,කරුණාකර ඇතුලත් කරන්න
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,නඩත්තු ලොග්
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),මෙම පැකේජයේ ශුද්ධ බර. (භාණ්ඩ ශුද්ධ බර මුදලක් සේ ස්වයංක්රීයව ගණනය)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,බේරාගන්න සහ පනත් කෙටුම්පත
 DocType: Student Group,Instructors,උපදේශක
 DocType: GL Entry,Credit Amount in Account Currency,"ගිණුම ව්යවහාර මුදල්, නය මුදල"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,කොටස් කළමණාකරණය
 DocType: Authorization Control,Authorization Control,බලය පැවරීමේ පාලන
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ෙරෝ # {0}: ප්රතික්ෂේප ගබඩාව ප්රතික්ෂේප අයිතමය {1} එරෙහිව අනිවාර්ය වේ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ගෙවීම
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ගෙවීම
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","පොත් ගබඩාව {0} ගිණුම් සම්බන්ධ නොවේ, සමාගම {1} තුළ ගබඩා වාර්තා කර හෝ පෙරනිමි බඩු තොග ගිණුමේ ගිණුම් සඳහන් කරන්න."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,ඔබේ ඇණවුම් කළමනාකරණය
 DocType: Work Order Operation,Actual Time and Cost,සැබෑ කාලය හා වියදම
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,ශිෂ්ය නිවාඩු ඉල්ලුම්
 DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,මත
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,පාවිච්චි කරන කාලය වන භාණ්ඩ ලැබුනු.
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,බාර්කෝඩ්
 DocType: Hub Category,Hub Node,මධ්යස්ථානයක් node එකක් මතම ඊට අදාල
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ඔබ අනුපිටපත් භාණ්ඩ ඇතුළු වී තිබේ. නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ආශ්රිත
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ආශ්රිත
 DocType: Asset Movement,Asset Movement,වත්කම් ව්යාපාරය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,වැඩ පිළිවෙළ {0} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,නව කරත්ත
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,බිල්පත් මුදල් ගෙවීම් පැහැර හරින සමාගමක මුදලින් හෝ පාර්ශවීය ගිණුම් මුදලකට සමාන විය යුතුය
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"මෙම පැකේජය මෙම බෙදාහැරීමේ කොටසක් බව පෙන්නුම් කරයි (පමණක් කෙටුම්පත),"
 DocType: Soil Texture,Loam,ලෝම්
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,පේළිය {0}: කල් ඉකුත්වන දිනයට පෙර දින නියමිත විය නොහැක
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,පේළිය {0}: කල් ඉකුත්වන දිනයට පෙර දින නියමිත විය නොහැක
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ගෙවීම් සටහන් කරන්න
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},විෂය {0} සඳහා ප්රමාණ {1} වඩා අඩු විය යුතුය
 ,Sales Invoice Trends,විකුණුම් ඉන්වොයිසිය ප්රවණතා
 DocType: Leave Application,Apply / Approve Leaves,අදාළ / පත්ර අනුමත
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,සදහා
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',හෝ &#39;පෙර ෙරෝ මුළු&#39; &#39;පෙර ෙරෝ මුදල මත&#39; යන චෝදනාව වර්ගය නම් පමණයි පේළිය යොමු වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',හෝ &#39;පෙර ෙරෝ මුළු&#39; &#39;පෙර ෙරෝ මුදල මත&#39; යන චෝදනාව වර්ගය නම් පමණයි පේළිය යොමු වේ
 DocType: Sales Order Item,Delivery Warehouse,සැපයුම් ගබඩාව
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,මූල්ය පිරිවැය මධ්යස්ථාන රුක්.
 DocType: Serial No,Delivery Document No,සැපයුම් ලේඛන නොමැත
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,ද්රව්ය පරිභෝජනය කර්මාන්ත සැකසුම් තුළ නැත.
 DocType: Student,Student Mobile Number,ශිෂ්ය ජංගම දුරකතන අංකය
 DocType: Item,Has Variants,ප්රභේද ඇත
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{0} අයිතමය {1} ට වඩා {1} ට වඩා වැඩි ගණනකට වැඩි කළ නොහැක. වැඩි බිල්පත් කිරීමට ඉඩ දෙන්න, කරුණාකර කොටස් සැකසීම් සැකසීමට"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{0} අයිතමය {1} ට වඩා {1} ට වඩා වැඩි ගණනකට වැඩි කළ නොහැක. වැඩි බිල්පත් කිරීමට ඉඩ දෙන්න, කරුණාකර කොටස් සැකසීම් සැකසීමට"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ප්රතිචාර යාවත්කාලීන කරන්න
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,මුලින්ම වැඩසටහන තෝරන්න
 DocType: Patient Appointment,Patient Age,රෝගීන්ගේ වයස
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,කළමනාකාර ව්යාපෘති
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,අනුක්රමික අංකය {0} දැනටමත් ආපසු ලබාදී ඇත
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,අනුක්රමික අංකය {0} දැනටමත් ආපසු ලබාදී ඇත
 DocType: Supplier,Supplier of Goods or Services.,භාණ්ඩ ෙහෝ ෙසේවා සැපයුම්කරු.
 DocType: Budget,Fiscal Year,මුදල් වර්ෂය
 DocType: Asset Maintenance Log,Planned,සැලසුම් කර ඇත
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,උපදේශක ගාස්තු සඳහා රෝගියාට නියම නොකළහොත් භාවිතා කළ යුතු නොගෙවන ලද ගෙවීම්.
 DocType: Vehicle Log,Fuel Price,ඉන්ධන මිල
+DocType: Bank Guarantee,Margin Money,පේළි මුදල්
 DocType: Budget,Budget,අයවැය
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,විවෘත කරන්න
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
@@ -2352,16 +2360,16 @@
 DocType: Lead,Follow Up,පසු විපරම
 DocType: Item,Is Sales Item,විකුණුම් අයිතමය වේ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,අයිතමය සමූහ රුක්
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ. අයිතමය ස්වාමියා පරීක්ෂා කරන්න
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ. අයිතමය ස්වාමියා පරීක්ෂා කරන්න
 DocType: Maintenance Visit,Maintenance Time,නඩත්තු කාල
 ,Amount to Deliver,බේරාගන්න මුදල
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},එකම අයිතමය කිහිප වතාවක් ඇතුළත් කර ඇත. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අරඹන්න දිනය කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසරේ ආරම්භය දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,දෝෂ ඇතිවිය.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,සේවකයා {0} දැනටමත් {2} සහ {3} අතර {1} සඳහා අයදුම් කර ඇත:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,දෝෂ ඇතිවිය.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,සේවකයා {0} දැනටමත් {2} සහ {3} අතර {1} සඳහා අයදුම් කර ඇත:
 DocType: Guardian,Guardian Interests,ගාඩියන් උනන්දුව දක්වන ක්ෂෙත්ර:
 DocType: Naming Series,Current Value,වත්මන් වටිනාකම
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
 DocType: Education Settings,Instructor Records to be created by,විසින් නිර්මාණය කළ උපදේශක වාර්තා
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} නිර්මාණය
 DocType: GST Account,GST Account,GST ගිණුම
@@ -2380,8 +2388,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
 DocType: Website Item Group,Website Item Group,වෙබ් අඩවිය අයිතමය සමූහ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,ප්රසාදයට එකතු කරන ලදි
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ඉදිරිපත් කළ වැටුප ස්ලැබ් හෝ දැනටමත් ඉදිරිපත් කර ඇති වැටුප් ස්ලිප්
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,තීරු බදු හා බදු
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ඉදිරිපත් කළ වැටුප ස්ලැබ් හෝ දැනටමත් ඉදිරිපත් කර ඇති වැටුප් ස්ලිප්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,තීරු බදු හා බදු
 DocType: Projects Settings,Projects Settings,ව්යාපෘති සැකසීම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ගෙවීම් සටහන් ඇතුළත් කිරීම් {1} පෙරීම කළ නොහැකි
@@ -2391,27 +2399,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,විෂය කණ්ඩායම් රුක්.
 DocType: Production Plan,Total Produced Qty,මුළු නිෂ්පාදිත ප්රමාණය
 DocType: Payroll Entry,Get Employee Details,සේවක විස්තර ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,මෙම ගාස්තු වර්ගය සඳහා විශාල හෝ වත්මන් පේළිය සංඛ්යාවට සමාන පේළිය අංකය යොමු නො හැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,මෙම ගාස්තු වර්ගය සඳහා විශාල හෝ වත්මන් පේළිය සංඛ්යාවට සමාන පේළිය අංකය යොමු නො හැකි
 DocType: Asset,Sold,අලෙවි
 ,Item-wise Purchase History,අයිතමය ප්රඥාවන්ත මිලදී ගැනීම ඉතිහාසය
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},අනු අංකය බැරිතැන &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න අයිතමය {0} වෙනුවෙන් එකතු
 DocType: Account,Frozen,ශීත කළ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),මූලික මුදල (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,අමු ද්රව්ය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,අමු ද්රව්ය
 DocType: Payment Reconciliation Payment,Reference Row,විමර්ශන ෙරෝ
 DocType: Installation Note,Installation Time,ස්ථාපන කාල
 DocType: Sales Invoice,Accounting Details,මුල්ය විස්තර
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,මෙම සමාගම වෙනුවෙන් සියලු ගනුදෙනු Delete
 DocType: Patient,O Positive,O ධනාත්මකයි
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ආයෝජන
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ආයෝජන
 DocType: Issue,Resolution Details,යෝජනාව විස්තර
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ප්රතිපාදන
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,පිළිගැනීම නිර්ණායක
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,ඉහත වගුවේ ද්රව්ය ඉල්ලීම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Journal Entry සඳහා ආපසු ගෙවීම් නොමැත
 DocType: Item Attribute,Attribute Name,ආරෝපණය නම
 DocType: BOM,Show In Website,වෙබ් අඩවිය ගැන පෙන්වන්න
 DocType: Shopping Cart Settings,Show Quantity in Website,වෙබ් අඩවිය ප්රමාණ පෙන්වන්න
-DocType: Employee Loan Application,Total Payable Amount,මුළු ගෙවිය යුතු මුදල
+DocType: Loan Application,Total Payable Amount,මුළු ගෙවිය යුතු මුදල
 DocType: Task,Expected Time (in hours),අපේක්ෂිත කාලය (පැය)
 DocType: Item Reorder,Check in (group),(කණ්ඩායම්) දී පරීක්ෂා
 DocType: Soil Texture,Silt,සිල්ට්
@@ -2430,7 +2439,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ගෙවීම් කරන්න
 DocType: Room,Room Name,කාමරය නම
 DocType: Prescription Duration,Prescription Duration,කාලපරිච්ඡේදය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි, {0} පෙර අවලංගු / Leave යෙදිය නොහැකි"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි, {0} පෙර අවලංගු / Leave යෙදිය නොහැකි"
 DocType: Activity Cost,Costing Rate,ක වියදමින් අනුපාතිකය
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,පාරිභෝගික ලිපින හා සම්බන්ධ වන්න
 ,Campaign Efficiency,ව්යාපාරය කාර්යක්ෂමතා
@@ -2450,11 +2459,11 @@
 DocType: Chapter,Chapter,පරිච්ඡේදය
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pair
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,මෙම ප්රකාරය තෝරාගත් පසු පෙරනිමි ගිණුම POS ඉන්වොයිසියේ ස්වයංක්රියව යාවත්කාලීන කෙරේ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
 DocType: Asset,Depreciation Schedule,ක්ෂය උපෙල්ඛනෙය්
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,"විකුණුම් සහකරු, ලිපින හා සම්බන්ධ වන්න"
 DocType: Bank Reconciliation Detail,Against Account,ගිණුම එරෙහිව
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,අර්ධ දින දිනය දිනය සිට මේ දක්වා අතර විය යුතුය
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,අර්ධ දින දිනය දිනය සිට මේ දක්වා අතර විය යුතුය
 DocType: Maintenance Schedule Detail,Actual Date,සැබෑ දිනය
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,කරුණාකර {0} සමාගමෙහි ප්රමිති පිරිවැය මධ්යස්ථානය සකසන්න.
 DocType: Item,Has Batch No,ඇත කණ්ඩායම කිසිදු
@@ -2472,7 +2481,6 @@
 DocType: Task,Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය
 DocType: Soil Texture,Soil Type,පාංශු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,නව පණිවිඩය
 ,Quotation Trends,උද්ධෘත ප්රවණතා
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless මැන්ඩේට්
@@ -2492,7 +2500,7 @@
 DocType: Hub Category,Hub Category,ප්රවර්ග කේන්ද්රස්ථානය
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
-DocType: Employee Loan,Loan Amount,ණය මුදල
+DocType: Loan,Loan Amount,ණය මුදල
 DocType: Student Report Generation Tool,Add Letterhead,ලිපින එකතු කරන්න
 DocType: Program Enrollment,Self-Driving Vehicle,ස්වයං-රියදුරු වාහන
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,සැපයුම් සිතුවම් ස්ථාවර
@@ -2521,9 +2529,9 @@
 DocType: Cash Flow Mapper,Position,පිහිටීම
 DocType: Patient,Patient Details,රෝගීන් විස්තර
 DocType: Patient,B Positive,B ධනාත්මකයි
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
 DocType: Patient Medical Record,Patient Medical Record,රෝගියා වෛද්ය වාර්තාව
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,නොවන සමූහ සමූහ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ක්රීඩා
@@ -2531,8 +2539,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,මුළු තත
 DocType: Lab Test UOM,Test UOM,පරීක්ෂණය යූඕම්
 DocType: Student Siblings,Student Siblings,ශිෂ්ය සහෝදර සහෝදරියන්
+DocType: Subscription Plan Detail,Subscription Plan Detail,දායක සැලැස්ම විස්තර
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,ඒකකය
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,සමාගම සඳහන් කරන්න
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,සමාගම සඳහන් කරන්න
 ,Customer Acquisition and Loyalty,පාරිභෝගික අත්කරගැනීම සහ සහෘද
 DocType: Asset Maintenance Task,Maintenance Task,නඩත්තු කාර්යය
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,කරුණාකර GST සැකසුම් තුළ B2C සීමාව සකසන්න.
@@ -2546,6 +2555,7 @@
 ,BOM Search,ද්රව්ය ලේඛණය සොයන්න
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),මුළු පාරිභේාිත ද්රව්ය පිරිවැය (කොටස් තොගය හරහා)
 DocType: Hub Settings,Company Registered,ලියාපදිංචි කළ සමාගම
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,දිනය සිට දිනට වඩා අඩු විය නොහැක
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",මෙම ගබඩාවේ ඇති කොටස් පදනම් කරගත් &quot;පදනම් කරගත්&quot; හෝ &quot;නොකරන ලද කොටස්&quot; ප්රකාශයට පත් කරන්න.
 DocType: Vehicle,Fuel Type,ඉන්ධන වර්ගය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,සමාගම මුදල් නියම කරන්න
@@ -2553,17 +2563,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},කණ්ඩායම කොටස් ඉතිරි {0} ගබඩා {3} හි විෂය {2} සඳහා {1} සෘණ බවට පත් වනු
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,පහත සඳහන් ද්රව්ය ඉල්ලීම් අයිතමය යලි සඳහා මට්ටම මත පදනම්ව ස්වයංක්රීයව ඉහළ නංවා තිබෙනවා
 DocType: Email Digest,Pending Sales Orders,විභාග විකුණුම් නියෝග
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
 DocType: Employee,Create User Permission,පරිශීලක අවසරය සාදන්න
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
 DocType: Healthcare Settings,Remind Before,කලින් මතක් කරන්න
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM පරිවර්තනය සාධකය පේළිය {0} අවශ්ය කරන්නේ
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Salary Component,Deduction,අඩු කිරීම්
 DocType: Item,Retain Sample,නියැදිය රඳවා ගැනීම
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
 DocType: Stock Reconciliation Item,Amount Difference,මුදල වෙනස
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,මෙම අලෙවි පුද්ගලයා සේවක අංකය ඇතුල් කරන්න
 DocType: Territory,Classification of Customers by region,කලාපය අනුව ගනුදෙනුකරුවන් වර්ගීකරණය
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,නිෂ්පාදනය තුල
@@ -2573,8 +2584,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ගණනය බැංකු ප්රකාශය ඉතිරි
 DocType: Normal Test Template,Normal Test Template,සාමාන්ය ටෙම්ප්ලේටරයක්
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ආබාධිත පරිශීලක
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,උද්ධෘත
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,කිසිදු සෘජු අත්දැකීමක් ලබා ගැනීමට RFQ නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,කිසිදු සෘජු අත්දැකීමක් ලබා ගැනීමට RFQ නැත
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,මුළු අඩු
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,ගිණුම් මුදලේ මුද්රණය කිරීම සඳහා ගිණුමක් තෝරන්න
@@ -2582,7 +2593,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,මෙය මෙම රෝගියාට එරෙහි ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහන බලන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
 DocType: Patient,Date of Birth,උපන්දිනය
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,අයිතමය {0} දැනටමත් ආපසු යවා ඇත
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,අයිතමය {0} දැනටමත් ආපසු යවා ඇත
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** මුදල් වර්ෂය ** මූල්ය වර්ෂය නියෝජනය කරයි. ** ** මුදල් වර්ෂය එරෙහි සියලු ගිණුම් සටහන් ඇතුළත් කිරීම් සහ අනෙකුත් ප්රධාන ගනුදෙනු දම්වැල් මත ධාවනය වන ඇත.
 DocType: Opportunity,Customer / Lead Address,ගණුදෙනුකරු / ඊයම් ලිපිනය
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,සැපයුම් සිතුවම් සැකසුම
@@ -2593,14 +2604,15 @@
 DocType: Work Order Operation,Actual Operation Time,සැබෑ මෙහෙයුම කාල
 DocType: Authorization Rule,Applicable To (User),(පරිශීලක) අදාළ
 DocType: Purchase Taxes and Charges,Deduct,අඩු
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,රැකියා විස්තරය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,රැකියා විස්තරය
 DocType: Student Applicant,Applied,ව්යවහාරික
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,නැවත විවෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,නැවත විවෘත
 DocType: Sales Invoice Item,Qty as per Stock UOM,කොටස් UOM අනුව යවන ලද
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 නම
 DocType: Purchase Invoice,02-Post Sale Discount,02-තැපැල් විකුණුම් වට්ටම්
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","හැර විශේෂ අක්ෂර &quot;-&quot;, &quot;#&quot;, &quot;.&quot; සහ &quot;/&quot; මාලාවක් නම් කිරීමට ඉඩ නොදෙන"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","විකුණුම් ප්රචාරණ ව්යාපාර පිළිබඳ වර්තාවක් තබා ගන්න. ආදර්ශ පිළිබඳ වාර්තා, මිල ගණන්, විකුණුම් සාමය ආදිය ප්රචාරණ ව්යාපාර සිට ආයෝජන මත ප්රතිලාභ තක්සේරු කිරීමට තබා ගන්න."
+DocType: Department Approver,Approver,Approver
 ,SO Qty,SO යවන ලද
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ක්ෂේත්රයට කොටස්කරුවන් හිස් විය නොහැක
 DocType: Guardian,Work Address,වැඩ ලිපිනය
@@ -2614,21 +2626,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),මුළු වෙන් කළ මුදල (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Order Item,To be delivered to customer,පාරිභෝගිකයා වෙත බාර දීමට
 DocType: BOM,Scrap Material Cost,පරණ ද්රව්ය පිරිවැය
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,අනු අංකය {0} ඕනෑම ගබඩා අයිති නැත
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,අනු අංකය {0} ඕනෑම ගබඩා අයිති නැත
 DocType: Grant Application,Email Notification Sent,ඊමේල් දැනුම්දීම යැවූ
 DocType: Purchase Invoice,In Words (Company Currency),වචන (සමාගම ව්යවහාර මුදල්) දී
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","අයිතමය සංග්රහය, ගබඩාව, ප්රමාණය පේළි අවශ්ය වේ"
-DocType: Pricing Rule,Supplier,සැපයුම්කරු
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","අයිතමය සංග්රහය, ගබඩාව, ප්රමාණය පේළි අවශ්ය වේ"
+DocType: Bank Guarantee,Supplier,සැපයුම්කරු
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ගෙවීම් විස්තර පෙන්වන්න
 DocType: Consultation,Consultation Time,උපදේශන වේලාව
 DocType: C-Form,Quarter,කාර්තුවේ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,විවිධ වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,විවිධ වියදම්
 DocType: Global Defaults,Default Company,පෙරනිමි සමාගම
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,වියදම් හෝ වෙනසක් ගිණුමක් අයිතමය {0} එය බලපෑම් ලෙස සමස්ත කොටස් අගය සඳහා අනිවාර්ය වේ
 DocType: Payment Request,PR,මහජන සම්බන්ධතා
 DocType: Cheque Print Template,Bank Name,බැංකුවේ නම
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-ඉහත
-DocType: Employee Loan,Employee Loan Account,සේවක ණය ගිණුමට
 DocType: Leave Application,Total Leave Days,මුළු නිවාඩු දින
 DocType: Email Digest,Note: Email will not be sent to disabled users,සටහන: විද්යුත් තැපෑල ආබාධිත පරිශීලකයන් වෙත යවනු නොලැබේ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,අන්තර් ක්රියාකාරිත්වය සංඛ්යාව
@@ -2643,7 +2654,7 @@
 DocType: Vital Signs,Weight (In Kilogram),සිරුරේ බර (කිලෝවක)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",පරිච්ඡේදය පරිච්ඡේදයේ පරිශිලනයෙන් පසු හිස්ව තැබීමෙන් පරිච්ඡේද / පරිච්ඡේද_name ඉතිරිව තබයි.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,කරුණාකර GST සැකසුම් තුළ GST ගිණුම සකසන්න
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,කරුණාකර GST සැකසුම් තුළ GST ගිණුම සකසන්න
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ව්යාපාර වර්ගය
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",කරුණාකර බෙ එක් පේළිය වෙන් කළ මුදල ඉන්වොයිසිය වර්ගය හා ඉන්වොයිසිය අංකය තෝරා
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,නව මිලදී ගැනීමේ පිරිවැය
@@ -2652,12 +2663,13 @@
 DocType: Grant Application,Grant Description,දීමනා විස්තරය
 DocType: Purchase Invoice Item,Rate (Company Currency),අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
 DocType: Student Guardian,Others,අන් අය
+DocType: Subscription,Discounts,වට්ටම්
 DocType: Payment Entry,Unallocated Amount,වෙළුමේ ප්රමාණය
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ගැලපෙන විෂය සොයා ගැනීමට නොහැක. කරුණාකර {0} සඳහා තවත් අගය තෝරන්න.
 DocType: POS Profile,Taxes and Charges,බදු හා බදු ගාස්තු
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",භාණ්ඩයක් හෝ කොටස් මිලදී ගෙන විකුණා හෝ තබා ඇති සේවය.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,තවත් යාවත්කාලීන
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,පළමු පේළි සඳහා &#39;පෙර ෙරෝ මුදල මත&#39; හෝ &#39;පෙර ෙරෝ මුළු දා&#39; ලෙස භාර වර්ගය තෝරන්න බැහැ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,පළමු පේළි සඳහා &#39;පෙර ෙරෝ මුදල මත&#39; හෝ &#39;පෙර ෙරෝ මුළු දා&#39; ලෙස භාර වර්ගය තෝරන්න බැහැ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,මෙම සැකසුමට සම්බන්ධ සියලු සාධක කාඩ්පත් ආවරණය කරයි
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ළමා අයිතමය නිෂ්පාදනයක් පැකේජය විය යුතු නොවේ. අයිතමය ඉවත් කරන්න &#39;{0}&#39; හා බේරා
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,බැංකු
@@ -2666,21 +2678,24 @@
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,කාලසටහන ලබා ගැනීම සඳහා &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
 DocType: Bin,Ordered Quantity,නියෝග ප්රමාණ
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",උදා: &quot;ඉදි කරන්නන් සඳහා වන මෙවලම් බිල්ඩ්&quot;
 DocType: Grading Scale,Grading Scale Intervals,ශ්රේණිගත පරිමාණ ප්රාන්තර
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,වර්ෂය සඳහා ලාභය
+DocType: Bank Guarantee,Name of Bank,බැංකුවේ නම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
 DocType: Fee Schedule,In Process,ක්රියාවලිය
 DocType: Authorization Rule,Itemwise Discount,Itemwise වට්ටම්
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,මූල්ය ගිණුම් රුක්.
+DocType: Bank Guarantee,Reference Document Type,ආශ්රිත ලේඛන වර්ගය
 DocType: Cash Flow Mapping,Cash Flow Mapping,මුදල් ප්රවාහ සිතියම්කරණය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} විකුණුම් සාමය {1} එරෙහිව
 DocType: Account,Fixed Asset,ඉස්තාවර වත්කම්
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized බඩු තොග
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,පෙරනිමි සබඳතාවයේ ඊමේල් හමු නොවිනි
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,රහස් නිර්මාණය කරන්න
-DocType: Employee Loan,Account Info,ගිණුමක් තොරතුරු
+DocType: Loan,Account Info,ගිණුමක් තොරතුරු
 DocType: Activity Type,Default Billing Rate,පෙරනිමි බිල් අනුපාත
 DocType: Fees,Include Payment,ගෙවීම් ඇතුළත් කරන්න
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} ශිෂ්ය කණ්ඩායම් නිර්මාණය.
@@ -2688,24 +2703,24 @@
 DocType: Sales Invoice,Total Billing Amount,මුළු බිල්පත් ප්රමාණය
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ගාස්තු ව්යුහය හා ශිෂ්ය සමූහයෙහි වැඩසටහන {0} වෙනස් වේ.
 DocType: Fee Schedule,Receivable Account,ලැබිය යුතු ගිණුම්
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
 DocType: Quotation Item,Stock Balance,කොටස් වෙළඳ ශේෂ
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ගෙවීම විකුණුම් න්යාය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,විධායක නිලධාරී
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,විධායක නිලධාරී
 DocType: Purchase Invoice,With Payment of Tax,බදු ගෙවීමෙන්
 DocType: Expense Claim Detail,Expense Claim Detail,වියදම් හිමිකම් විස්තර
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,සැපයුම්කරු සඳහා පිටපත් තුනකින්
 DocType: Land Unit,Is Container,බහාලුම් වේ
 DocType: Crop Cycle,This will be day 1 of the crop cycle,මෙම බෝග බෝගයේ දින 1 වනු ඇත
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
 DocType: Purchase Invoice Item,Weight UOM,සිරුරේ බර UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,කොටස් හිමියන්ගේ කොටස් ලැයිස්තුව
 DocType: Salary Structure Employee,Salary Structure Employee,වැටුප් ව්යුහය සේවක
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,විචල්ය ලක්ෂණ පෙන්වන්න
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,විචල්ය ලක්ෂණ පෙන්වන්න
 DocType: Student,Blood Group,ලේ වර්ගය
 DocType: Course,Course Name,පාඨමාලා නම
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"නිශ්චිත සේවක නිවාඩු අයදුම්පත් අනුමත කළ හැකි ද කරන භාවිතා කරන්නන්,"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,කාර්යාල උපකරණ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,කාර්යාල උපකරණ
 DocType: Purchase Invoice Item,Qty,යවන ලද
 DocType: Fiscal Year,Companies,සමාගම්
 DocType: Supplier Scorecard,Scoring Setup,ස්කොරින් පිහිටුවීම
@@ -2724,7 +2739,7 @@
 DocType: Stock Entry,Total Incoming Value,මුළු එන අගය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,සැපයුම්කරුවන් ලකුණු දර්ශක විචල්යයන්හි තේමාවන්.
 DocType: Job Offer Term,Offer Term,ඉල්ලුමට කාලීන
 DocType: Asset,Quality Manager,තත්ත්ව කළමනාකාර
@@ -2736,13 +2751,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},මුළු නොගෙවූ: {0}
 DocType: BOM Website Operation,BOM Website Operation,ද්රව්ය ලේඛණය වෙබ් අඩවිය මෙහෙයුම
 DocType: Supplier Scorecard,Supplier Score,සැපයුම් ලකුණු
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,මුළු ඉන්වොයිස් ඒඑම්ටී
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,මුළු ඉන්වොයිස් ඒඑම්ටී
 DocType: Supplier,Warn RFQs,RFQs අනතුරු ඇඟවීම
 DocType: BOM,Conversion Rate,පරිවර්තන අනුපාතය
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,නිෂ්පාදන සෙවුම්
 DocType: Assessment Plan,To Time,වේලාව
 DocType: Authorization Rule,Approving Role (above authorized value),අනුමත කාර්ය භාරය (බලය ලත් අගය ඉහළ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,ගිණුමක් සඳහා ක්රෙඩිට් ගෙවිය යුතු ගිණුම් විය යුතුය
+DocType: Loan,Total Amount Paid,මුළු මුදල ගෙවා ඇත
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ගෙවන ලද ශිෂ්ය අයදුම්කරුට අනිවාර්යයෙන්ම ඇතුළත් වන ශිෂ්ය හැඳුනුම්පත තෝරා ගන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},ද්රව්ය ලේඛණය සහානුයාත: {0} {2} මව් හෝ ළමා විය නොහැකි
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,මිල ගණන් ප්රකාශයට පත් කරන්න
@@ -2752,18 +2768,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,මිල ලැයිස්තුව {0} අක්රීය කර ඇත
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද මෙහෙයුම් සඳහා {1} වඩා වැඩි {2} විය නොහැකි
 DocType: Manufacturing Settings,Allow Overtime,අතිකාල ඉඩ දෙන්න
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized අයිතමය {0} කොටස් වෙළඳ ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක, කොටස් සටහන් භාවිතා කරන්න"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized අයිතමය {0} කොටස් වෙළඳ ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක, කොටස් සටහන් භාවිතා කරන්න"
 DocType: Training Event Employee,Training Event Employee,පුහුණු EVENT සේවක
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,උපරිම නියැදි - {0} කණ්ඩායම {1} සහ අයිතම {2} සඳහා රඳවා තබා ගත හැකිය.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,කාල අවකාශ එකතු කරන්න
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} අයිතමය {1} සඳහා අවශ්ය අනු ගණන්. ඔබ {2} විසින් ජනතාවට ලබා දී ඇත.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} අයිතමය {1} සඳහා අවශ්ය අනු ගණන්. ඔබ {2} විසින් ජනතාවට ලබා දී ඇත.
 DocType: Stock Reconciliation Item,Current Valuation Rate,වත්මන් තක්සේරු අනුපාත
 DocType: Training Event,Advance,අත්තිකාරම්
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,නැවත නැවත උත්පාදනය කිරීම සඳහා.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ගෙවීම් මාර්ග සැකසුම්
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,විනිමය ලාභ / අඞු කිරීමට
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,විනිමය ලාභ / අඞු කිරීමට
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},පේලිය # {0}: ගිණුම {1} සමාගමට අයත් නොවේ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},පේලිය # {0}: ගිණුම {1} සමාගමට අයත් නොවේ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType සොයා ගැනීමට නොහැකි විය {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,නව ලිපිනය
 DocType: Quality Inspection,Sample Size,නියැදියේ ප්රමාණය
@@ -2782,7 +2797,6 @@
 DocType: Bin,Actual Quantity,සැබෑ ප්රමාණය
 DocType: Shipping Rule,example: Next Day Shipping,උදාහරණයක් ලෙස: ඊළඟ දින නැව්
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} සොයාගත නොහැකි අනු අංකය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},දායකත්වය {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ගාස්තු වැඩ සටහන
 DocType: Fee Schedule Program,Student Batch,ශිෂ්ය කණ්ඩායම
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ශිෂ්ය කරන්න
@@ -2798,14 +2812,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ඊ-වාණිජ්යය GSTIN
 DocType: Sales Order,Not Delivered,භාර නොවන
 ,Bank Clearance Summary,බැංකු නිෂ්කාශන සාරාංශය
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","නිර්මාණය හා දෛනික, කළමනාකරණය කිරීම, සතිපතා හා මාසික ඊ-තැපැල් digests."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","නිර්මාණය හා දෛනික, කළමනාකරණය කිරීම, සතිපතා හා මාසික ඊ-තැපැල් digests."
 DocType: Appraisal Goal,Appraisal Goal,ඇගයීෙම් අරමුණ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,ප්රවර්ගය යෝජනා කරන්න?
 DocType: Stock Reconciliation Item,Current Amount,වත්මන් මුදල
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,ගොඩනැගිලි
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,ගොඩනැගිලි
 DocType: Fee Schedule,Fee Structure,ගාස්තු ව්යුහය
 DocType: Timesheet Detail,Costing Amount,මුදල ක වියදමින්
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
 DocType: Student Admission Program,Application Fee,අයදුම් කිරීමේ ගාස්තුව
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,වැටුප පුරවා ඉදිරිපත්
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,විෂය {0} සඳහා Maxiumm වට්ටමක් {1}% ක්
@@ -2813,12 +2826,13 @@
 DocType: Sales Partner,Address & Contacts,ලිපිනය සහ අප අමතන්න
 DocType: SMS Log,Sender Name,යවන්නාගේ නම
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,කෘෂිකාර්මික විශ්ලේෂණ නිර්නායක
+DocType: HR Settings,Leave Approval Notification Template,නිවාඩු අනුමත නිවේදන ආකෘතිය
 DocType: POS Profile,[Select],[තෝරන්න]
 DocType: Vital Signs,Blood Pressure (diastolic),රුධිර පීඩනය (දූරකථන)
 DocType: SMS Log,Sent To,කිරීම සඳහා යවා
 DocType: Agriculture Task,Holiday Management,නිවාඩු කළමනාකරණය
 DocType: Payment Request,Make Sales Invoice,විකුණුම් ඉන්වොයිසිය කරන්න
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,මෘදුකාංග
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,මෘදුකාංග
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
 DocType: Company,For Reference Only.,විමර්ශන පමණක් සඳහා.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},වෛද්යවරයා {0} {1}
@@ -2836,7 +2850,7 @@
 DocType: Employee,New Workplace,නව සේවා ස්ථාන
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,ද්රව්ය පරිභෝජනය
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,සංවෘත ලෙස සකසන්න
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Barcode {0} සමග කිසිදු විෂය
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Barcode {0} සමග කිසිදු විෂය
 DocType: Normal Test Items,Require Result Value,ප්රතිඵල වටිනාකම
 DocType: Item,Show a slideshow at the top of the page,පිටුවේ ඉහළ ඇති වූ අතිබහුතරයකගේ පෙන්වන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2851,19 +2865,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
 DocType: Leave Block List,Allow Users,පරිශීලකයන් ඉඩ දෙන්න
 DocType: Purchase Order,Customer Mobile No,පාරිභෝගික ජංගම නොමැත
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,පුනරාවර්තනය
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,මුදල් ප්රවාහ සිතියම් කිරීමේ තොරතුරු විස්තර
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,ණය කළමනාකරණය
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,නිෂ්පාදන ක්ෂේත්රය තුළට හෝ කොට්ඨාශ සඳහා වෙන වෙනම ආදායම් සහ වියදම් නිරීක්ෂණය කරන්න.
 DocType: Rename Tool,Rename Tool,මෙවලම නැවත නම් කරන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,යාවත්කාලීන වියදම
 DocType: Item Reorder,Item Reorder,අයිතමය සීරුමාරු කිරීමේ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ද්රව්ය මාරු
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ද්රව්ය මාරු
 DocType: Fees,Send Payment Request,ගෙවීම් ඉල්ලුම යවන්න
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", මෙහෙයුම් විශේෂයෙන් සඳහන් මෙහෙයුම් පිරිවැය සහ අද්විතීය මෙහෙයුම ඔබේ ක්රියාකාරිත්වය සඳහා කිසිදු දෙන්න."
 DocType: Water Analysis,Origin,මූලාරම්භය
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
@@ -2878,14 +2892,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ආදායම් බදු වගකීම්
 DocType: Grading Scale Interval,Grade Description,ශ්රේණියේ විස්තරය
 DocType: Stock Entry,Purchase Receipt No,මිලදී ගැනීම රිසිට්පත නොමැත
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,අර්නස්ට් මුදල්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,අර්නස්ට් මුදල්
 DocType: Sales Invoice, Shipping Bill Number,නැව් බිල්පත් අංකය
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,පාලනයන් යනාදී
 DocType: Asset Maintenance Log,Actions performed,ක්රියාත්මක කළ ක්රියාවන්
 DocType: Cash Flow Mapper,Section Leader,අංශ නායක
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),අරමුදල් ප්රභවයන් (වගකීම්)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),අරමුදල් ප්රභවයන් (වගකීම්)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},පේළියේ ප්රමාණය {0} ({1}) නිෂ්පාදනය ප්රමාණය {2} ලෙස සමාන විය යුතුයි
 DocType: Supplier Scorecard Scoring Standing,Employee,සේවක
+DocType: Bank Guarantee,Fixed Deposit Number,ස්ථාවර තැන්පතු අංකය
 DocType: Asset Repair,Failure Date,අසමත් දිනය
 DocType: Sample Collection,Collected Time,එකතු කළ කාලය
 DocType: Company,Sales Monthly History,විකුණුම් මාසික ඉතිහාසය
@@ -2902,10 +2917,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,මෙම හමුවීම අවලංගු කිරීමට අවශ්ය බව ඔබට විශ්වාසද?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,හෝටල් කාමර මිල කිරීමේ පැකේජය
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,විකුණුම් නල
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,දා අවශ්ය
 DocType: Rename Tool,File to Rename,නැවත නම් කරන්න කිරීමට ගොනු
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},කරුණාකර ෙරෝ {0} තුළ අයිතමය සඳහා ද ෙව් තෝරා
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,අනුගාමිකයන් යාවත්කාලීන කිරීම්
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ගිණුමක් {0} ගිණුම ප්රකාරය සමාගම {1} සමග නොගැලපේ: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},නිශ්චිතව දක්වා ඇති ද්රව්ය ලේඛණය {0} අයිතමය {1} සඳහා නොපවතියි
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,පාඨමාලාව:
@@ -2915,7 +2931,7 @@
 DocType: Notification Control,Expense Claim Approved,වියදම් හිමිකම් අනුමත
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,රැකියා ඇණවුම් නිර්මාණය කළේ නැත
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,සේවක වැටුප් පුරවා {0} දැනටමත් මෙම කාල සීමාව සඳහා නිර්මාණය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ඖෂධ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ඖෂධ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,මිලදී ගත් අයිතම පිරිවැය
 DocType: Selling Settings,Sales Order Required,විකුණුම් සාමය අවශ්ය
 DocType: Purchase Invoice,Credit To,ක්රෙඩිට් කිරීම
@@ -2933,7 +2949,7 @@
 DocType: Request for Quotation Supplier,No Quote,නැත
 DocType: Warranty Claim,Raised By,විසින් මතු
 DocType: Payment Gateway Account,Payment Account,ගෙවීම් ගිණුම
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,ලැබිය යුතු ගිණුම් ශුද්ධ වෙනස්
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Off වන්දි
 DocType: Job Offer,Accepted,පිළිගත්තා
@@ -2946,7 +2962,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,ප්රතිඵල සොයන්න
 DocType: Room,Room Number,කාමර අංකය
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},වලංගු නොවන සමුද්දේශ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},වලංගු නොවන සමුද්දේශ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,නැව් පාලනය ලේබල්
 DocType: Journal Entry Account,Payroll Entry,වැටුප් ගෙවීම්
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ගාස්තු ලේඛන බලන්න
@@ -2956,7 +2972,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
 DocType: Lab Test Sample,Lab Test Sample,පරීක්ෂණ පරීක්ෂණ නියැදිය
 DocType: Item Variant Settings,Allow Rename Attribute Value,ඇඩ්රයිව් අගය නැවත නම් කරන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
 DocType: Restaurant,Invoice Series Prefix,ඉන්වොයිසි ශ්රේණියේ Prefix
 DocType: Employee,Previous Work Experience,පසුගිය සේවා පළපුරුද්ද
@@ -2964,8 +2980,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},පේළියේ දී අයිතමය {0} සඳහා සැලසුම් යවන ලද ඇතුලත් කරන්න {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google සිතියම් ඒකාබද්ධ කිරීම සක්රිය කර නැත
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ඉදිරිපත් කර නැත
+DocType: Subscription,Trialling,අභිධර්මය
 DocType: Member,Membership Expiry Date,සාමාජිකත්ව කාලය කල් ඉකුත්වීම
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} ආපසු ලියවිල්ල තුල සෘණාත්මක විය යුතුය
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} ආපසු ලියවිල්ල තුල සෘණාත්මක විය යුතුය
 ,Minutes to First Response for Issues,ගැටළු සඳහා පළමු ප්රතිචාර සඳහා විනාඩි
 DocType: Purchase Invoice,Terms and Conditions1,නියමයන් හා Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
@@ -2984,7 +3001,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,නු ඒකකය
 DocType: Fiscal Year,Year End Date,වසර අවසාන දිනය
 DocType: Task Depends On,Task Depends On,කාර්ය සාධක මත රඳා පවතී
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,අවස්ථාවක්
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,අවස්ථාවක්
 DocType: Operation,Default Workstation,පෙරනිමි වර්ක්ස්ටේෂන්
 DocType: Notification Control,Expense Claim Approved Message,වියදම් හිමිකම් අනුමත පණිවුඩය
 DocType: Payment Entry,Deductions or Loss,අඩු කිරීම් හෝ අඞු කිරීමට
@@ -3022,7 +3039,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,වැටුප් නැතිව නිවාඩු අනුමත නිවාඩු ඉල්ලුම් වාර්තා සමග නොගැලපේ
 DocType: Campaign,Campaign-.####,ව්යාපාරය -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ඊළඟ පියවර
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ඉන්වොයිසියක් සාදන්න
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ඉතිරි ගාන
@@ -3032,7 +3049,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,අවසන් වසර
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,කොන්ත්රාත්තුව අවසානය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,කොන්ත්රාත්තුව අවසානය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 DocType: Driver,Driver,රියදුරු
 DocType: Vital Signs,Nutrition Values,පෝෂණ ගුණයන්
 DocType: Lab Test Template,Is billable,බිලිය හැකිද?
@@ -3043,7 +3060,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ ඇරඹුම් දිනය
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,මෙම ERPNext සිට ස්වයංක්රීය-ජනනය උදාහරණයක් වෙබ් අඩවිය
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,වයස්ගතවීම රංගේ 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,මුළු අත්තිකාරම් මුදල සම්පූර්ණ හිමිකම් ප්රමාණයට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,මුළු අත්තිකාරම් මුදල සම්පූර්ණ හිමිකම් ප්රමාණයට වඩා වැඩි විය නොහැක
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3078,7 +3095,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Атрибут අගයන් තෝරන්න
 DocType: Purchase Invoice,Reason For Issuing document,ලියවිල්ල නිකුත් කිරීම සඳහා හේතුව
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
 DocType: Payment Reconciliation,Bank / Cash Account,බැංකුව / මුදල් ගිණුම්
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,ඊළඟ අමතන්න වන විට පෙරමුණ විද්යුත් තැපැල් ලිපිනය ලෙස සමාන විය නොහැකි
 DocType: Tax Rule,Billing City,බිල්පත් නගරය
@@ -3095,7 +3112,8 @@
 DocType: Warranty Claim,Service Address,සේවා ලිපිනය
 DocType: Asset Maintenance Task,Calibration,ක්රමාංකනය
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} යනු සමාගම් නිවාඩු දිනයකි
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,ගෘහ භාණ්ඞ සහ සවිකිරීම්
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,තත්ත්වය දැනුම්දීම
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,ගෘහ භාණ්ඞ සහ සවිකිරීම්
 DocType: Item,Manufacture,නිෂ්පාදනය
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup සමාගම
 ,Lab Test Report,පරීක්ෂණ පරීක්ෂණ වාර්තාව
@@ -3111,7 +3129,6 @@
 DocType: Crop,Planting Area,රෝපණ ප්රදේශය
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),එකතුව (යවන ලද)
 DocType: Installation Note Item,Installed Qty,ස්ථාපනය යවන ලද
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,මෙය වලංගු නොවන ඊ-තැපැල් ලිපිනයන් නිසා විය හැක
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,ඔබ එකතු කළා
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,පුහුණු ප්රතිඵල
@@ -3121,16 +3138,17 @@
 DocType: Products Settings,Products per Page,පිටුවකට භාණ්ඩ
 DocType: Stock Ledger Entry,Outgoing Rate,පිටතට යන අනුපාතය
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,හෝ
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,හෝ
 DocType: Sales Order,Billing Status,බිල්පත් තත්ත්වය
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ක නිකුත් වාර්තා
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,උපයෝගීතා වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,උපයෝගීතා වියදම්
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ඉහත
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ෙරෝ # {0}: ජර්නල් සටහන් {1} ගිණුම {2} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
 DocType: Supplier Scorecard Criteria,Criteria Weight,මිනුම් බර
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,අනුමැතිය අනුමැතිය දැනුම්දීම
 DocType: Buying Settings,Default Buying Price List,පෙරනිමි මිලට ගැනීම මිල ලැයිස්තුව
 DocType: Payroll Entry,Salary Slip Based on Timesheet,වැටුප් පුරවා Timesheet මත පදනම්ව
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,මිලදී ගැනීමේ අනුපාතිකය
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,මිලදී ගැනීමේ අනුපාතිකය
 DocType: Notification Control,Sales Order Message,විකුණුම් සාමය පණිවුඩය
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","සමාගම, මුදල්, මුදල් වර්ෂය ආදිය සකස් පෙරනිමි අගයන්"
 DocType: Payment Entry,Payment Type,ගෙවීම් වර්ගය
@@ -3153,6 +3171,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,සාප්පු සවාරි කරත්ත සැකසුම්
 DocType: Journal Entry,Accounting Entries,මුල්ය අයැදුම්පත්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","තෝරාගත් මිල නියම කිරීමේදී &#39;අනුපාතිකය&#39; සඳහා නම්, එය මිල ගණන් ලැයිස්තුගත කරනු ඇත. මිල නියම කිරීමේ අනුපාතය අවසාන අනුපාතය වේ, එබැවින් තවදුරටත් වට්ටමක් යෙදිය යුතුය. එබැවින්, විකුණුම් නියෝගය, මිලදී ගැනීමේ නියෝගය වැනි ගනුදෙනු වලදී එය &#39;අනුපාතික&#39; ක්ෂේත්රයේ &#39;මිල ලැයිස්තුවේ&#39; ක්ෂේත්රයට වඩා එය ලබා දේ."
+DocType: Journal Entry,Paid Loan,ගෙවුම් ණය
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},පිවිසුම් අනුපිටපත්. බලය පැවරීමේ පාලනය {0} කරුණාකර පරීක්ෂා කරන්න
 DocType: Journal Entry Account,Reference Due Date,යොමු නියමිත දිනය
 DocType: Purchase Order,Ref SQ,ref SQ
@@ -3169,7 +3188,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',නඩත්තු උපෙල්ඛනෙය් සියලු භාණ්ඩ සඳහා ජනනය කර නැත. &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
 ,To Produce,නිර්මාණය කිරීම සඳහා
 apps/erpnext/erpnext/config/hr.py +93,Payroll,වැටුප්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{0} පේළියේ සඳහා {1} දී. {2} අයිතමය අනුපාතය, පේළි {3} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{0} පේළියේ සඳහා {1} දී. {2} අයිතමය අනුපාතය, පේළි {3} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
 DocType: Patient Service Unit,Parent Service Unit,ෙදමාපිය ෙසේවා ඒකකය
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,පරිශීලක කරන්න
 DocType: Packing Slip,Identification of the package for the delivery (for print),ප්රසූතියට සඳහා පැකේජය හඳුනා ගැනීම (මුද්රිත)
@@ -3188,7 +3207,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ආදායම් ගිණුම
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,සැපයුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,සැපයුම්
 DocType: Volunteer,Weekdays,සතියේ දිනවල
 DocType: Stock Reconciliation Item,Current Qty,වත්මන් යවන ලද
 DocType: Restaurant Menu,Restaurant Menu,ආපන ශාලා මෙනුව
@@ -3196,7 +3215,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,භාණ්ඩ තොගය සඳහා සකසන්න පෙරනිමි බඩු තොග ගිණුමක්
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,භාණ්ඩ තොගය සඳහා සකසන්න පෙරනිමි බඩු තොග ගිණුමක්
 DocType: Item Reorder,Material Request Type,ද්රව්ය ඉල්ලීම් වර්ගය
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
@@ -3204,10 +3223,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,කාමරයේ ධාරිතාව
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},අයිතමයට {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,කලින් ජනනය කළ ඉන්වොයිසිවල වාර්තා ඔබ අහිමි වනු ඇත. මෙම දායකත්වය නැවත ආරම්භ කිරීමට අවශ්ය බව ඔබට විශ්වාසද?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,ලියාපදිංචි ගාස්තු
 DocType: Budget,Cost Center,පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,වවුචරය #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,වවුචරය #
 DocType: Notification Control,Purchase Order Message,මිලදී ගැනීමේ නියෝගයක් පණිවුඩය
 DocType: Tax Rule,Shipping Country,නැව් රට
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,විකුණුම් ගනුදෙනු වලින් පාරිභෝගික බදු අංකය සඟවන්න
@@ -3216,20 +3236,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","මිල ගණන් පාලනය සමහර නිර්ණායක මත පදනම් වූ, මිල ලැයිස්තු මඟින් නැවත ලියවෙනු / වට්ටම් ප්රතිශතය නිර්වචනය කිරීමට සිදු වේ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,පොත් ගබඩාව පමණක් හරහා කොටස් Entry / ප්රවාහනය සටහන / මිලදී ගැනීම රිසිට්පත වෙනස් කළ හැකි
 DocType: Employee Education,Class / Percentage,පන්තියේ / ප්රතිශතය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,අලෙවි සහ විකුණුම් අංශ ප්රධානී
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,අලෙවි සහ විකුණුම් අංශ ප්රධානී
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ආදායම් බදු
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ලිපි වලට යන්න
+DocType: Subscription,Cancel At End Of Period,කාලය අවසානයේ අවලංගු කරන්න
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ස්ථාන මාරු සඳහා තෝරා නොගත් අයිතම
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ස්ථාන මාරු සඳහා තෝරා නොගත් අයිතම
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,සියළු ලිපිනයන්.
 DocType: Company,Stock Settings,කොටස් සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","පහත සඳහන් ලක්ෂණ වාර්තා දෙකම එකම නම් යනවාත් පමණි. සමූහය, රූට් වර්ගය, සමාගම,"
 DocType: Vehicle,Electric,විද්යුත්
 DocType: Task,% Progress,% ප්රගතිය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ලාභ / අඞු කිරීමට වත්කම් බැහැර මත
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ලාභ / අඞු කිරීමට වත්කම් බැහැර මත
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",පහත දැක්වෙන වගුවේ &quot;අනුමත&quot; තත්වය සහිත ශිෂ්ය අයදුම්කරු පමණක් තෝරා ගනු ලැබේ.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,ගිණුම {0} සඳහා ගිණුම් අංක නොමැත. <br> කරුණාකර ඔබගේ ගිණුමේ වගුව නිවැරදිව සකස් කරන්න.
 DocType: Task,Depends on Tasks,කාර්යයන් මත රඳා පවතී
@@ -3244,6 +3265,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,නැහැ දී කොටස්
 DocType: Volunteer,Volunteer Skills,ස්වේච්ඡා කුසලතා
 DocType: Appraisal,HR User,මානව සම්පත් පරිශීලක
+DocType: Bank Guarantee,Reference Document Name,විමර්ශන ලේඛන නම
 DocType: Purchase Invoice,Taxes and Charges Deducted,බදු හා බදු ගාස්තු අඩු කිරීමේ
 apps/erpnext/erpnext/hooks.py +142,Issues,ගැටලු
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},තත්ත්වය {0} එකක් විය යුතුය
@@ -3257,7 +3279,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,මහා පරිමාණ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,මහා පරිමාණ
+DocType: Loan,Loan Application,ණය අයදුම්පත
 DocType: Crop,Scientific Name,විද්යාත්මක නාමය
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,මුළු පත්ර
 DocType: Customer,"Reselect, if the chosen contact is edited after save","තෝරාගත් පසු, තෝරාගත් ස්පර්ශය සුරැකීමෙන් අනතුරුව සංස්කරණය කරනු ලැබේ"
@@ -3266,13 +3289,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් අංකය"
 ,Sales Browser,විකුණුම් බ්රව්සරය
 DocType: Journal Entry,Total Credit,මුළු ණය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},අවවාදයයි: තවත් {0} # {1} කොටස් ඇතුලත් {2} එරෙහිව පවතී
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},අවවාදයයි: තවත් {0} # {1} කොටස් ඇතුලත් {2} එරෙහිව පවතී
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,දේශීය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),"ණය හා අත්තිකාරම්, (වත්කම්)"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ණය ගැතියන්
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,මහා
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,මහා
 DocType: Homepage Featured Product,Homepage Featured Product,මුල් පිටුව Featured නිෂ්පාදන
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,සියලු තක්සේරු කණ්ඩායම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,සියලු තක්සේරු කණ්ඩායම්
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,නව ගබඩා නම
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),මුළු {0} ({1})
 DocType: C-Form Invoice Detail,Territory,භූමි ප්රදේශය
@@ -3293,9 +3316,10 @@
 DocType: Fees,Fees,ගාස්තු
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,තවත් බවට එක් මුදල් බවට පරිවර්තනය කිරීමට විනිමය අනුපාතය නියම කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,උද්ධෘත {0} අවලංගුයි
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,සම්පුර්ණ හිඟ මුදල
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,සම්පුර්ණ හිඟ මුදල
 DocType: Sales Partner,Targets,ඉලක්ක
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,සමාගම් තොරතුරු ලිපිගොනුවෙහි SIREN අංකය ලියාපදිංචි කරන්න
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 DocType: Price List,Price List Master,මිල ලැයිස්තුව මාස්ටර්
 DocType: GST Account,CESS Account,සෙස් ගිණුම
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,සියලු විකුණුම් ගනුදෙනු බහු ** විකුණුම් පුද්ගලයින් එරෙහිව tagged කළ හැකි ** ඔබ ඉලක්ක තබා නිරීක්ෂණය කළ හැකි බව එසේ.
@@ -3304,6 +3328,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Patient තෝරන්න
 DocType: Price List,Applicable for Countries,රටවල් සඳහා අදාළ වන
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,පරාමිති නාමය
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;අනුමත&#39; සහ &#39;ප්රතික්ෂේප&#39; ඉදිරිපත් කළ හැකි එකම තත්ත්වය සහිත යෙදුම් තබන්න
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},ශිෂ්ය සමූහය නම පේළිය {0} අනිවාර්ය වේ
 DocType: Homepage,Products to be shown on website homepage,නිෂ්පාදන වෙබ් අඩවිය මුල්පිටුව පෙන්වා කිරීමට
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"මෙය මූල පාරිභෝගික පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -3337,14 +3362,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,සෑම බිල්පත් පැය සඳහාම දැනටමත් නිර්මාණය කර ඇති ඉන්වොයිසිය
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},නම දෝෂය: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,මූල්ය පිරිවැය
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,සේවක {0} සඳහා සහභාගි වන විටත් ලකුණු කර ඇත
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,සේවක {0} සඳහා සහභාගි වන විටත් ලකුණු කර ඇත
 DocType: Packing Slip,If more than one package of the same type (for print),එකම වර්ගයේ (මුද්රිත) එකකට වඩා වැඩි පැකේජය නම්
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,රෙස්ටුරන්ට් සැකසීම් තුළ ප්රකෘති පාරිභෝගිකයා සකසන්න
 ,Salary Register,වැටුප් රෙජිස්ටර්
 DocType: Warehouse,Parent Warehouse,මව් ගබඩාව
-DocType: C-Form Invoice Detail,Net Total,ශුද්ධ මුළු
+DocType: Subscription,Net Total,ශුද්ධ මුළු
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},පෙරනිමි ද්රව්ය ලේඛණය අයිතමය {0} සඳහා සොයාගත නොහැකි හා ව්යාපෘති {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,විවිධ ණය වර්ග නිර්වචනය
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,විවිධ ණය වර්ග නිර්වචනය
 DocType: Bin,FCFS Rate,FCFS අනුපාතිකය
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,හිඟ මුදල
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),කාලය (මිනිත්තු දී)
@@ -3376,11 +3401,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root ගිණුම පිරිසක් විය යුතුය
 DocType: Drug Prescription,Drug Prescription,ඖෂධ නියම කිරීම
 DocType: Fees,FEE.,ගාස්තු.
-DocType: Employee Loan,Repaid/Closed,ආපසු ගෙවන / වසා
+DocType: Loan,Repaid/Closed,ආපසු ගෙවන / වසා
 DocType: Item,Total Projected Qty,මුලූ ව්යාපෘතිමය යවන ලද
 DocType: Monthly Distribution,Distribution Name,බෙදා හැරීම නම
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} සඳහා ගිණුම් සටහන් සඳහා අවශ්ය වන අයිතමය {0} සඳහා සොයාගත නොහැක. අයිතමය {1} හි ශුන්ය තක්සේරු අනුපාත අයිතමයක් ලෙස ගණනය කරන්නේ නම්, කරුණාකර {1} අයිතම වගුවෙහි සඳහන් කරන්න. එසේ නොමැතිනම් අයිතමයට පැමිණෙන කොටස් ගනුදෙනු හෝ අයිතම අයිතමයේ අගය තක්සේරු අනුපාතය සඳහන් කරන්න, පසුව මෙම සටහන ඉදිරිපත් කිරීම / අවලංගු කිරීමට උත්සාහ කරන්න."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 DocType: Course,Course Code,පාඨමාලා කේතය
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},විෂය {0} සඳහා අවශ්ය තත්ත්ව පරීක්ෂක
 DocType: POS Settings,Use POS in Offline Mode,නොබැඳි ආකාරයේ POS භාවිතා කරන්න
@@ -3400,16 +3424,15 @@
 DocType: Purchase Invoice,Deemed Export,සළකා අපනයන
 DocType: Stock Entry,Material Transfer for Manufacture,නිෂ්පාදනය සඳහා ද්රව්ය හුවමාරු
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,වට්ටමක් ප්රතිශතය ඉතා මිල ලැයිස්තුව එරෙහිව හෝ සියලුම මිල ලැයිස්තුව සඳහා එක්කෝ ඉල්ලුම් කළ හැක.
-DocType: Subscription,Half-yearly,අර්ධ වාර්ෂික
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
 DocType: Lab Test,LabTest Approver,LabTest අනුමැතිය
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,තක්සේරු නිර්ණායක {} සඳහා ඔබ දැනටමත් තක්සේරු කර ඇත.
 DocType: Vehicle Service,Engine Oil,එන්ජින් ඔයිල්
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},රැකියා ඇණවුම් නිර්මාණය: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},රැකියා ඇණවුම් නිර්මාණය: {0}
 DocType: Sales Invoice,Sales Team1,විකුණුම් Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,අයිතමය {0} නොපවතියි
 DocType: Sales Invoice,Customer Address,පාරිභෝගික ලිපිනය
-DocType: Employee Loan,Loan Details,ණය තොරතුරු
+DocType: Loan,Loan Details,ණය තොරතුරු
 DocType: Company,Default Inventory Account,පෙරනිමි තොග ගිණුම
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio අංක නොගැලපේ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
@@ -3421,19 +3444,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,භෝග වගා කරන සියලුම බිම් ඒකක වෙත ලින්ක් එකක්
 DocType: Account,Root Type,මූල වර්ගය
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ෙරෝ # {0}: {1} අයිතමය සඳහා {2} වඩා වැඩි ආපසු නොහැක
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ෙරෝ # {0}: {1} අයිතමය සඳහා {2} වඩා වැඩි ආපසු නොහැක
 DocType: Item Group,Show this slideshow at the top of the page,පිටුවේ ඉහළ ඇති මෙම අතිබහුතරයකගේ පෙන්වන්න
 DocType: BOM,Item UOM,අයිතමය UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),වට්ටම් මුදල (සමාගම ව්යවහාර මුදල්) පසු බදු මුදල
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ඉලක්ක ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
 DocType: Cheque Print Template,Primary Settings,ප්රාථමික සැකසීම්
 DocType: Purchase Invoice,Select Supplier Address,සැපයුම්කරු ලිපිනය තෝරන්න
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,සේවක එකතු කරන්න
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,සේවක එකතු කරන්න
 DocType: Purchase Invoice Item,Quality Inspection,තත්ත්ව පරීක්ෂක
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,අමතර කුඩා
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,අමතර කුඩා
 DocType: Company,Standard Template,සම්මත සැකිල්ල
 DocType: Training Event,Theory,න්යාය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ගිණුම {0} කැටි වේ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,සංවිධානය සතු ගිණුම් වෙනම සටහන සමග නීතිමය ආයතනයක් / පාලිත.
 DocType: Payment Request,Mute Email,ගොළු විද්යුත්
@@ -3453,11 +3476,10 @@
 DocType: SMS Log,No of Sent SMS,යැවූ කෙටි පණිවුඩ අංක
 DocType: Antibiotic,Healthcare Administrator,සෞඛ්ය ආරක්ෂණ පරිපාලක
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ඉලක්කයක් සකසන්න
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
 DocType: Dosage Strength,Dosage Strength,ඖෂධීය ශක්තිය
 DocType: Account,Expense Account,වියදම් ගිණුම
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,මෘදුකාංග
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,වර්ණ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,වර්ණ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,තක්සේරු සැලැස්ම නිර්ණායක
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,තෝරාගත් අයිතමයේ කල් ඉකුත්වීම අනිවාර්ය වේ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,මිලදී ගැනීමේ නියෝග වැළැක්වීම
@@ -3470,18 +3492,18 @@
 DocType: Patient,Personal and Social History,පෞද්ගලික සහ සමාජ ඉතිහාසය
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,පරිශීලකයා {0} නිර්මාණය කරන ලදි
 DocType: Fee Schedule,Fee Breakup for each student,එක් සිසුවෙකු සඳහා ගාස්තු වෙන් කිරීම
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,අසාමාන ෙලස මාස හරහා ඉලක්ක බෙදා හැරීමට මාසික බෙදාහැරීම් තෝරන්න.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,කේතය වෙනස් කරන්න
 DocType: Purchase Invoice Item,Valuation Rate,තක්සේරු අනුපාත
 DocType: Stock Reconciliation,SR/,සස /
 DocType: Vehicle,Diesel,ඩීසල්
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
 DocType: Purchase Invoice,Availed ITC Cess,ITC සෙස් සඳහා උපකාරී විය
 ,Student Monthly Attendance Sheet,ශිෂ්ය මාසික පැමිණීම පත්රය
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,නැව්ගත කිරීමේ නීතිය විකිණීම සඳහා පමණි
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ව්යාපෘති ආරම්භක දිනය
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,තුරු
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,තුරු
 DocType: Rename Tool,Rename Log,ඇතුළුවන්න නැවත නම් කරන්න
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ශිෂ්ය කණ්ඩායම් හෝ පාඨමාලාව උපෙල්ඛනෙය් අනිවාර්ය වේ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,ශිෂ්ය කණ්ඩායම් හෝ පාඨමාලාව උපෙල්ඛනෙය් අනිවාර්ය වේ
@@ -3502,7 +3524,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ඔබ මිලදී ගන්නා හෝ විකිණෙන ඔබේ භාණ්ඩ හෝ සේවාවන් ලැයිස්තුගත කරන්න.
 DocType: Water Analysis,Storage Temperature,ගබඩා උෂ්ණත්වය
 DocType: Employee Attendance Tool,Unmarked Attendance,නොපෙනෙන පැමිණීම
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,පර්යේෂක
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,පර්යේෂක
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,වැඩසටහන ඇතුළත් මෙවලම ශිෂ්ය
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},ආරම්භක දිනය කර්තව්යය සඳහා අවසන් දිනයට වඩා අඩු විය යුතුය {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,නම හෝ විද්යුත් අනිවාර්ය වේ
@@ -3515,7 +3537,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම්කරුවන්ගේ ලකුණු පුවරුව තබා ඇති අතර, මෙම සැපයුම්කරුට RFQs විසින් අවදානය යොමු කළ යුතුය."
 DocType: Chapter,Non Profit Manager,ලාභ නොලැබූ කළමනාකරු
 DocType: BOM,Total Cost(Company Currency),මුළු වියදම (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,අනු අංකය {0} නිර්මාණය
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,අනු අංකය {0} නිර්මාණය
 DocType: Homepage,Company Description for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සමාගම විස්තරය
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ගනුදෙනුකරුවන්ගේ පහසුව සඳහා, මෙම කේත ඉන්වොයිසි හා සැපයුම් සටහන් වැනි මුද්රිත ආකෘති භාවිතා කළ හැක"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier නම
@@ -3525,11 +3547,10 @@
 DocType: Employee,You can enter any date manually,ඔබ අතින් යම් දිනයක් ඇතුල් විය හැකිය
 DocType: Healthcare Settings,Result Printed,ප්රතිඵල මුද්රණය
 DocType: Asset Category Account,Depreciation Expense Account,ක්ෂය ගෙවීමේ ගිණුම්
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,පරිවාස කාලය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},බලන්න {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,පරිවාස කාලය
 DocType: Customer Group,Only leaf nodes are allowed in transaction,පමණක් කොළ මංසල ගනුදෙනුව කිරීමට ඉඩ ඇත
 DocType: Project,Total Costing Amount (via Timesheets),මුළු පිරිවැය ප්රමාණය (පත්රිකා මගින්)
-DocType: Employee Advance,Expense Approver,වියදම් Approver
+DocType: Department,Expense Approver,වියදම් Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ෙරෝ {0}: පාරිභෝගික එරෙහිව උසස් ගෞරවය දිය යුතුයි
 DocType: Project,Hourly,පැය
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,නොවන සමූහ සමූහ
@@ -3539,7 +3560,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,දිනයවේලාව කිරීමට
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,කෙටි පණිවිඩ බෙදා හැරීමේ තත්වය පවත්වා ගෙන යාම සඳහා ලඝු-සටහන්
 DocType: Accounts Settings,Make Payment via Journal Entry,ජර්නල් සටහන් හරහා ගෙවීම් කරන්න
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,මුද්රණය
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,මුද්රණය
 DocType: Item,Inspection Required before Delivery,පරීක්ෂණ සැපයුම් පෙර අවශ්ය
 DocType: Item,Inspection Required before Purchase,පරීක්ෂණ මිලදී ගැනීම පෙර අවශ්ය
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,විභාග කටයුතු
@@ -3549,7 +3570,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,අවම ඇණවුම් ප්රමාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,ඔබේ සංවිධානය
 DocType: Fee Component,Fees Category,ගාස්තු ප්රවර්ගය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ඒඑම්ටී
 DocType: Supplier Scorecard,Notify Employee,දැනුම් දෙන්න සේවකයා
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,පරීක්ෂණ ප්රභවය ව්යාපාරය නම් ව්යාපාරය නම ඇතුලත් කරන්න
@@ -3559,7 +3580,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,සීරුමාරු කිරීමේ පෙළ
 DocType: Company,Chart Of Accounts Template,ගිණුම් සැකිල්ල සටහන
 DocType: Attendance,Attendance Date,පැමිණීම දිනය
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,"උපයන සහ අඩු කිරීම් මත පදනම් වූ වැටුප් බිඳ වැටීම,."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය බවට පරිවර්තනය කළ නොහැකි
 DocType: Purchase Invoice Item,Accepted Warehouse,පිළිගත් ගබඩා
@@ -3567,10 +3588,11 @@
 DocType: Item,Valuation Method,තක්සේරුව
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,මාක් අඩක් දිනය
 DocType: Sales Invoice,Sales Team,අලෙවි කණ්ඩායම
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ප්රවේශය අනුපිටපත්
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ප්රවේශය අනුපිටපත්
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,උපුටා ගැනීමට පෙර ප්රතිලාභියාගේ නම ඇතුළත් කරන්න.
 DocType: Program Enrollment Tool,Get Students,ශිෂ්ය ලබා ගන්න
 DocType: Serial No,Under Warranty,වගකීම් යටතේ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[දෝෂය]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[දෝෂය]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ඔබ විකුණුම් සාමය සුරැකීමට වරක් වචන දෘශ්යමාන වනු ඇත.
 ,Employee Birthday,සේවක ජන්ම දිනය
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,සම්පූර්ණ කරන ලද අලුත්වැඩියා සඳහා සම්පූර්ණ කරන ලද දිනය තෝරන්න
@@ -3589,7 +3611,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,උප කොන්ත්රාත් සඳහා වෙන් කර ඇත
 DocType: Payment Reconciliation Invoice,Invoice Number,ඉන්වොයිසිය අංකය
 DocType: Shopping Cart Settings,Orders,නියෝග
-DocType: Employee Leave Approver,Leave Approver,Approver තබන්න
+DocType: Department,Leave Approver,Approver තබන්න
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,කරුණාකර කණ්ඩායම තෝරා
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,ජර්නල් ලිබ්
 DocType: Assessment Group,Assessment Group Name,තක්සේරු කණ්ඩායම නම
@@ -3634,7 +3656,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub ගොනුවල අයිතමය බලන්න
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ලබන්නන් සඳහා ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,සමුච්චිත ක්ෂය ගිණුම
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,මෙම ඊමේල් ස්වයංක්රීයව නිර්මාණය වේ
 DocType: Stock Settings,Freeze Stock Entries,කැටි කොටස් අයැදුම්පත්
 DocType: Program Enrollment,Boarding Student,බෝඩිං ශිෂ්ය
 DocType: Asset,Expected Value After Useful Life,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය
@@ -3659,22 +3680,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},පැමිණීම වාර්තා {0} ශිෂ්ය {1} එරෙහිව පවතී
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},විමර්ශන # {0} දිනැති {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,නිසා වත්කම් බැහැර කිරීම නැති වී ක්ෂය
-DocType: Member,Member,සාමාජිකයෙකි
+DocType: Loan,Member,සාමාජිකයෙකි
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ලිපිනයන් කළමනාකරණය
 DocType: Work Order Item,Work Order Item,වැඩ පිළිවෙල අයිතමය
 DocType: Pricing Rule,Item Code,අයිතමය සංග්රහයේ
 DocType: Serial No,Warranty / AMC Details,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් විස්තර
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
 DocType: Lead,Market Segment,වෙළෙඳපොළ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,කෘෂිකර්ම කළමනාකරු
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
 DocType: Supplier Scorecard Period,Variables,විචල්යයන්
 DocType: Employee Internal Work History,Employee Internal Work History,සේවක අභ්යන්තර රැකියා ඉතිහාසය
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),වැසීම (ආචාර්ය)
 DocType: Cheque Print Template,Cheque Size,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් තරම"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,අනු අංකය {0} නොවේ කොටස්
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,අනු අංකය {0} නොවේ කොටස්
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,ගනුදෙනු විකිණීම සඳහා බදු ආකෘතියකි.
 DocType: Sales Invoice,Write Off Outstanding Amount,විශිෂ්ට මුදල කපා
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},ගිණුමක් {0} සමාගම සමග නොගැලපේ {1}
@@ -3683,7 +3704,6 @@
 DocType: Stock Settings,Default Stock UOM,පෙරනිමි කොටස් UOM
 DocType: Asset,Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,එකතුව
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},{0}: සේවක ණය එරෙහිව
 DocType: Landed Cost Item,Receipt Document,රිසිට්පත ලේඛන
 DocType: Employee Education,School/University,පාසල් / විශ්ව
 DocType: Payment Request,Reference Details,විමර්ශන විස්තර
@@ -3694,7 +3714,7 @@
 DocType: Asset,Double Declining Balance,ද්විත්ව පහත වැටෙන ශේෂ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,සංවෘත ඇණවුම අවලංගු කළ නොහැක. අවලංගු කිරීමට Unclose.
 DocType: Student Guardian,Father,පියා
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
 DocType: Bank Reconciliation,Bank Reconciliation,බැංකු සැසඳුම්
 DocType: Attendance,On Leave,නිවාඩු මත
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,යාවත්කාලීන ලබා ගන්න
@@ -3708,10 +3728,10 @@
 DocType: Lead,Lower Income,අඩු ආදායම්
 DocType: Restaurant Order Entry,Current Order,වත්මන් ඇණවුම
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය පේළිය {0} සඳහා සමාන විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,වැඩසටහන් වෙත යන්න
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},පේළිය {0} # වෙන් කළ ප්රමාණය {1} නොලැබූ මුදලට වඩා විශාල විය නොහැක {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},පේළිය {0} # වෙන් කළ ප්රමාණය {1} නොලැබූ මුදලට වඩා විශාල විය නොහැක {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;දිනය සිට&#39; &#39;මේ දක්වා&#39; &#39;පසුව විය යුතුය
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
@@ -3734,7 +3754,6 @@
 DocType: Payment Terms Template,Payment Terms,ගෙවීම් කොන්දේසි
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,ව්යවස්ථාව
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 DocType: Purchase Invoice,Purchase Taxes and Charges,මිලදී බදු හා ගාස්තු
 DocType: Chapter,Meetup Embed HTML,රැස්වීම HTML කරන්න
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,සැපයුම්කරුවන් වෙත යන්න
@@ -3754,30 +3773,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},උද්ධෘත {0} නොවේ වර්ගයේ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,නඩත්තු උපෙල්ඛනෙය් විෂය
 DocType: Sales Order,%  Delivered,% භාර
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,කරුණාකර ගෙවීම් ඉල්ලීම යැවීමට ශිෂ්ය හැඳුනුම්පත සකසන්න
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,කරුණාකර ගෙවීම් ඉල්ලීම යැවීමට ශිෂ්ය හැඳුනුම්පත සකසන්න
 DocType: Patient,Medical History,වෛද්ය ඉතිහාසය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,බැංකු අයිරා ගිණුමක්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,බැංකු අයිරා ගිණුමක්
 DocType: Patient,Patient ID,රෝගියාගේ ID
 DocType: Physician Schedule,Schedule Name,උපලේඛනයේ නම
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,වැටුප පුරවා ගන්න
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,සියලු සැපයුම්කරුවන් එකතු කරන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,සියලු සැපයුම්කරුවන් එකතු කරන්න
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,පේළියේ # {0}: වෙන් කළ මුදල ගෙවීමට ඇති මුදල වඩා වැඩි විය නොහැක.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ගවේශක ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,ආරක්ෂිත ණය
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,ආරක්ෂිත ණය
 DocType: Purchase Invoice,Edit Posting Date and Time,"සංස්කරණය කරන්න ගිය තැන, දිනය හා වේලාව"
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},වත්කම් ප්රවර්ගය {0} හෝ සමාගම {1} තුළ ක්ෂය සම්බන්ධ ගිණුම් සකස් කරන්න
 DocType: Lab Test Groups,Normal Range,සාමාන්ය පරාසය
 DocType: Academic Term,Academic Year,අධ්යන වර්ෂය
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,විකුණා තිබේ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ශේෂ කොටස් විවෘත
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,ශේෂ කොටස් විවෘත
 DocType: Lead,CRM,සී.ආර්.එම්
 DocType: Purchase Invoice,N,එම්
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ඉතිරි
 DocType: Appraisal,Appraisal,ඇගයීෙම්
+DocType: Loan,Loan Account,ණය ගිණුම
 DocType: Purchase Invoice,GST Details,GST විස්තර
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},සැපයුම්කරු {0} වෙත යවන විද්යුත්
 DocType: Item,Default Sales Unit of Measure,මිනුම් ප්රමිතිගත විකුණුම් ඒකකය
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,අධ්යන වර්ෂය:
+DocType: Subscription,Past Due Date,කල් ඉකුත්වන දිනය
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},අයිතමය සඳහා විකල්ප අයිතමයක් තැබීමට ඉඩ නොදේ. {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,දිනය නැවත නැවත
@@ -3790,7 +3811,7 @@
 DocType: Patient Appointment,Patient Appointment,රෝගීන් පත්කිරීම
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"කාර්යභාරය අනුමත පාලනය කිරීම සඳහා අදාළ වේ භූමිකාව, සමාන විය නොහැකි"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,"මෙම විද්යුත් Digest සිට වනවාද,"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,සැපයුම්කරුවන් ලබා ගන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,සැපයුම්කරුවන් ලබා ගන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} අයිතමයට {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,පාඨමාලා වෙත යන්න
 DocType: Accounts Settings,Show Inclusive Tax In Print,මුද්රිතයේ ඇතුළත් කර ඇති බදු පෙන්වන්න
@@ -3798,10 +3819,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,පණිවිඩය යැව්වා
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය ලෙස සැකසීම කළ නොහැකි
 DocType: C-Form,II,දෙවන
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්යාපනය&gt; අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,මිල ලැයිස්තුව මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ශුද්ධ මුදල (සමාගම ව්යවහාර මුදල්)
 DocType: Physician,Physician Schedules,වෛද්යවරු කාලසටහන්
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,සම්පූර්ණ අත්තිකාරම් මුදල මුළු අනුමත ප්රමාණයට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,සම්පූර්ණ අත්තිකාරම් මුදල මුළු අනුමත ප්රමාණයට වඩා වැඩි විය නොහැක
 DocType: Salary Slip,Hour Rate,පැය අනුපාත
 DocType: Stock Settings,Item Naming By,කිරීම අනුප්රාප්තිකයා නම් කිරීම අයිතමය
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} පසු කර තිබේ තවත් කාලය අවසාන සටහන්
@@ -3819,6 +3841,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
 DocType: BOM,Inspection Required,පරීක්ෂණ අවශ්ය
 DocType: Purchase Invoice Item,PR Detail,මහජන සම්බන්ධතා විස්තර
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,ඉදිරිපත් කිරීමට පෙර බැංකු ඇපකරයේ අංකය ඇතුල් කරන්න.
 DocType: Driving License Category,Class,පන්තිය
 DocType: Sales Order,Fully Billed,පූර්ණ අසූහත
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,වැඩ පිළිවෙල අයිතම ආකෘතියට එරෙහිව ඉදිරිපත් කළ නොහැක
@@ -3829,7 +3852,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ඇසුරුම් දළ බර. ශුද්ධ බර + ඇසුරුම් ද්රව්ය බර සාමාන්යයෙන්. (මුද්රිත)
 DocType: Assessment Plan,Program,වැඩසටහන
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,මෙම භූමිකාව ඇති පරිශීලකයන්ට ශීත කළ ගිණුම් සකස් කිරීම හා නිර්මාණ / ශීත කළ ගිණුම් එරෙහිව ගිණුම් සටහන් ඇතුළත් කිරීම් වෙනස් කිරීමට අවසර ඇත
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්යාපනය&gt; අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
 DocType: Serial No,Is Cancelled,අවලංගුෙව්
 DocType: Student Group,Group Based On,සමූහ පදනම් මත
 DocType: Student Group,Group Based On,සමූහ පදනම් මත
@@ -3841,9 +3863,10 @@
 DocType: Cheque Print Template,Cheque Height,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් උස"
 DocType: Supplier,Supplier Details,සැපයුම්කරු විස්තර
 DocType: Setup Progress,Setup Progress,ප්රගතිය සැකසීම
+DocType: Expense Claim,Approval Status,පතේ තත්වය
 DocType: Hub Settings,Publish Items to Hub,හබ් අයිතම ප්රකාශයට පත් කරනු ලබයි
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},වටිනාකම පේළිය {0} අගය කිරීමට වඩා අඩු විය යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,වයර් ට්රාන්ෆර්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,වයර් ට්රාන්ෆර්
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,සියල්ල පරීක්ෂා කරන්න
 ,Issued Items Against Work Order,වැඩ පිලිවෙලට එරෙහිව නිකුත් කළ අයිතම
 DocType: Vehicle Log,Invoice Ref,ඉන්වොයිසිය අංකය
@@ -3874,12 +3897,11 @@
 DocType: Customs Tariff Number,Tariff Number,ගාස්තු අංකය
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP ගබඩා ලබා ගත හැක යවන ලද
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ප්රක්ෂේපිත
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},අනු අංකය {0} ගබඩා {1} අයත් නොවේ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},අනු අංකය {0} ගබඩා {1} අයත් නොවේ
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,සටහන: පද්ධතිය අයිතමය සඳහා අධික ලෙස බෙදාහැරීම හා අධික ලෙස වෙන්කර ගැනීම පරීක්ෂා නැහැ {0} ප්රමාණය හෝ ප්රමාණය 0 ලෙස
 DocType: Notification Control,Quotation Message,උද්ධෘත පණිවුඩය
-DocType: Employee Loan,Employee Loan Application,සේවක ණය ඉල්ලුම්
 DocType: Issue,Opening Date,විවෘත දිනය
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,කරුණාකර රෝගියා පළමුව බේරා ගන්න
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,කරුණාකර රෝගියා පළමුව බේරා ගන්න
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,පැමිණීම සාර්ථකව සලකුණු කර ඇත.
 DocType: Program Enrollment,Public Transport,රාජ්ය ප්රවාහන
 DocType: Soil Texture,Silt Composition (%),සල්ට සංයුතිය (%)
@@ -3898,7 +3920,7 @@
 ,Item Balance (Simple),අයිතමය ශේෂය (සරල)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,සැපයුම්කරුවන් විසින් මතු බිල්පත්.
 DocType: POS Profile,Write Off Account,ගිණුම අක්රිය ලියන්න
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,හර සටහන ඒඑම්ටී
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,හර සටහන ඒඑම්ටී
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,වට්ටමක් මුදල
 DocType: Purchase Invoice,Return Against Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය එරෙහි නැවත
 DocType: Item,Warranty Period (in days),වගකීම් කාලය (දින තුළ)
@@ -3921,6 +3943,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,විකුණුම් සාමය දිනය
 DocType: Sales Invoice Item,Delivered Qty,භාර යවන ලද
 DocType: Assessment Plan,Assessment Plan,තක්සේරු සැලැස්ම
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ප්රතිලෝම ජර්නල් ප්රවේශය
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,පාරිභෝගිකයා {0} නිර්මාණය වේ.
 DocType: Stock Settings,Limit Percent,සියයට සීමා
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,දැනට කිසිදු ගබඩාවක් නොමැත
@@ -3934,14 +3957,15 @@
 DocType: Journal Entry,Stock Entry,කොටස් සටහන්
 DocType: Payment Entry,Payment References,ගෙවීම් ආශ්රිත
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","අන්තර් කාල ක්ෙෂේතයට සඳහා වූ පරාසයන් ගණන, උදා. කාල සීමාව නම් &#39;දින&#39; සහ බිල්පත් කාල පරිච්ඡේදය 3, ඉන් දින 3 කට වරක් ඉන්ෙවොයිස් නිපදවනු ඇත."
 DocType: Vehicle,Insurance Details,රක්ෂණ විස්තර
 DocType: Account,Payable,ගෙවිය යුතු
 DocType: Share Balance,Share Type,කොටස් වර්ගය
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ණය ආපසු ගෙවීමේ කාල සීමාවක් ඇතුල් කරන්න
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,ණය ආපසු ගෙවීමේ කාල සීමාවක් ඇතුල් කරන්න
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ණය ගැතියන් ({0})
 DocType: Pricing Rule,Margin,ආන්තිකය
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,නව ගනුදෙනුකරුවන්
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,දළ ලාභය %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,දළ ලාභය %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS පැතිකඩ බලන්න
 DocType: Bank Reconciliation Detail,Clearance Date,නිශ්කාශනෙය් දිනය
@@ -3951,10 +3975,11 @@
 DocType: Lead,Address Desc,ෙමරට ලිපිනය DESC
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,පක්ෂය අනිවාර්ය වේ
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},අනෙකුත් පේළි අනුපිටපත් නියමිත දිනයක් සහිත පේළිය හමු වූයේ: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},අනෙකුත් පේළි අනුපිටපත් නියමිත දිනයක් සහිත පේළිය හමු වූයේ: {list}
 DocType: Topic,Topic Name,මාතෘකාව නම
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,කරුණාකර HR සැකසීම් වල අවසර පත්ර අනුමත කිරීම සඳහා කරුණාකර පෙරනිමි සැකිල්ල සකස් කරන්න.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,මෙම විකිණීම හෝ මිලදී ගැනීමේ ආයෝජිත තෝරාගත් කළ යුතුය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,සේවකයා ලබා ගැනීමට සේවකයෙකු තෝරන්න.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,සේවකයා ලබා ගැනීමට සේවකයෙකු තෝරන්න.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,කරුණාකර වලංගු දිනය තෝරන්න
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,ඔබේ ව්යාපාරයේ ස්වභාවය තෝරන්න.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3973,7 +3998,7 @@
 DocType: Asset Movement,Source Warehouse,මූලාශ්රය ගබඩාව
 DocType: Installation Note,Installation Date,ස්ථාපනය දිනය
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share ලෙජරය
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},ෙරෝ # {0}: වත්කම් {1} සමාගම අයිති නැත {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},ෙරෝ # {0}: වත්කම් {1} සමාගම අයිති නැත {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,විකුණුම් ඉන්වොයිසිය {0} සෑදී ඇත
 DocType: Employee,Confirmation Date,ස්ථිර කිරීම දිනය
 DocType: C-Form,Total Invoiced Amount,මුළු ඉන්වොයිස් මුදල
@@ -3982,7 +4007,7 @@
 DocType: Account,Accumulated Depreciation,සමුච්චිත ක්ෂය
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ස්ථාවර නම
 DocType: Stock Entry,Customer or Supplier Details,පාරිභෝගික හෝ සැපයුම්කරු විස්තර
-DocType: Employee Loan Application,Required by Date,දිනය අවශ්ය
+DocType: Loan Application,Required by Date,දිනය අවශ්ය
 DocType: Lead,Lead Owner,ඊයම් න
 DocType: Production Plan,Sales Orders Detail,විකුණුම් නියෝග detail
 DocType: Bin,Requested Quantity,ඉල්ලන ප්රමාණය
@@ -3995,10 +4020,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,දළ වැටුප් - මුළු අඩු - ණය ආපසු ගෙවීමේ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,වත්මන් ද්රව්ය ලේඛණය හා නව ද්රව්ය ලේඛණය සමාන විය නොහැකි
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,වැටුප් පුරවා හැඳුනුම්පත
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,විශ්රාම ගිය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,විශ්රාම ගිය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,බහු ප්රභේද
 DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% භාර
+DocType: Subscription,Trial Period Start Date,Trial Period ආරම්භක දිනය
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,අයිතමය {0}: අනුපිළිවලින් යවන ලද {1} {2} (විෂයාංක අර්ථ දක්වා) අවම පිණිස යවන ලද ට වඩා අඩු විය නොහැක.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,මාසික බෙදාහැරීම් ප්රතිශතය
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,කරුණාකර වෙනත් පරිශීලකයෙකු ලෙස පුරනය වන්න.
@@ -4019,12 +4045,11 @@
 DocType: Student Guardian,Student Guardian,ශිෂ්ය ගාඩියන්
 DocType: Member,Member Name,සාමාජික නම
 DocType: Stock Settings,Use Naming Series,නම් කිරීමේ ශ්රේණි භාවිතා කරන්න
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,තක්සේරු වර්ගය චෝදනා සියල්ල ඇතුළත් ලෙස සලකුණු නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,තක්සේරු වර්ගය චෝදනා සියල්ල ඇතුළත් ලෙස සලකුණු නොහැකි
 DocType: POS Profile,Update Stock,කොටස් යාවත්කාලීන
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,දායකත්වයේ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,භාණ්ඩ සඳහා විවිධ UOM වැරදි (මුළු) ශුද්ධ බර අගය කිරීමට හේතු වනු ඇත. එක් එක් භාණ්ඩය ශුද්ධ බර එම UOM ඇති බව තහවුරු කර ගන්න.
 DocType: Membership,Payment Details,ගෙවීම් තොරතුරු
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ද්රව්ය ලේඛණය අනුපාතිකය
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,ද්රව්ය ලේඛණය අනුපාතිකය
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",නව වැඩ පිළිවෙළ නවතා දැමිය නොහැක
 DocType: Asset,Journal Entry for Scrap,ලාංකික සඳහා ජර්නල් සටහන්
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,සැපයුම් සටහන භාණ්ඩ අදින්න කරුණාකර
@@ -4044,6 +4069,7 @@
 DocType: Land Unit,Land Unit,ඉඩම් අංශය
 ,Purchase Analytics,මිලදී ගැනීම විශ්ලේෂණ
 DocType: Sales Invoice Item,Delivery Note Item,සැපයුම් සටහන අයිතමය
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,වත්මන් ඉන්වොයිසිය {0} නැතිව ඇත
 DocType: Asset Maintenance Log,Task,කාර්ය
 DocType: Purchase Taxes and Charges,Reference Row #,විමර්ශන ෙරෝ #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},කාණ්ඩ අංකය අයිතමය {0} සඳහා අනිවාර්ය වේ
@@ -4056,7 +4082,7 @@
 DocType: Company,Exchange Gain / Loss Account,විනිමය ලාභ / අලාභ ගිණුම්
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,සේවකයෙකුට සහ පැමිණීෙම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},අරමුණ {0} එකක් විය යුතුය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,පෝරමය පුරවා එය රැක
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,පෝරමය පුරවා එය රැක
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ප්රජා සංසදය
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,කොටස් සැබෑ යවන ලද
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,කොටස් සැබෑ යවන ලද
@@ -4071,7 +4097,7 @@
 DocType: Lab Test Template,Standard Selling Rate,සම්මත විකිණීම අනුපාතිකය
 DocType: Account,Rate at which this tax is applied,මෙම බදු අයදුම් වන අවස්ථාවේ අනුපාතය
 DocType: Cash Flow Mapper,Section Name,කොටස නම
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,සීරුමාරු කිරීමේ යවන ලද
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,සීරුමාරු කිරීමේ යවන ලද
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,වත්මන් රැකියා අවස්ථා
 DocType: Company,Stock Adjustment Account,කොටස් ගැලපුම් ගිණුම
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ලියා හරින්න
@@ -4082,9 +4108,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,සියලු බිල්පත් ද්රව්යවල නවතම මිල යාවත්කාලීන කිරීම සඳහා පේළිය. විනාඩි කිහිපයක් ගත විය හැකිය.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,නව ගිණුම් නම. සටහන: පාරිභෝගිකයින් සහ සැපයුම්කරුවන් සඳහා ගිණුම් නිර්මාණය කරන්න එපා
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම&gt; ප්රදේශය
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,රටේ බුද්ධිමත් පෙරනිමි ලිපිනය ආකෘති පත්ර
 DocType: Water Analysis,Appearance,පෙනුම
+DocType: HR Settings,Leave Status Notification Template,තත්ත්ව දැනුම් ආකෘතිය තබන්න
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,අවු. මිල ගණන් මිල ලැයිස්තුව
 DocType: Sales Order Item,Supplier delivers to Customer,සැපයුම්කරු පාරිභෝගික බාර
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,සාමාජික තොරතුරු.
@@ -4107,7 +4133,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,අවසර නොදේ. කරුණාකර ටෙස්ට් ටෙම්ප්ලේට අක්රිය කරන්න
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ප්රතිශතයක් වෙන් කිරීම 100% ක් සමාන විය යුතුයි
 DocType: Crop Cycle,Linked Land Unit,සම්බන්ධිත ඉඩම් ඒකකය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
@@ -4123,7 +4149,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,පරිශීලකයින් වෙත යන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ගෙවනු ලබන මුදල + ප්රමාණය මුළු එකතුව වඩා වැඩි විය නොහැකි Off ලියන්න
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} අයිතමය {1} සඳහා වලංගු කණ්ඩායම අංකය නොවේ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},සටහන: මෙහි නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ඉතිරි නොවේ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},සටහන: මෙහි නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ඉතිරි නොවේ
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,වලංගු නොවන GSTIN හෝ ලියාපදිංචි නොකල සඳහා එන් ඇතුලත් කරන්න
 DocType: Training Event,Seminar,සම්මන්ත්රණය
 DocType: Program Enrollment Fee,Program Enrollment Fee,වැඩසටහන ඇතුළත් ගාස්තු
@@ -4139,14 +4165,14 @@
 DocType: Hub Settings,Publish Availability,ලැබිය හැකි ප්රකාශයට පත් කරනු ලබයි
 DocType: Company,Create Chart Of Accounts Based On,ගිණුම් පදනම් කරගත් මත සටහන නිර්මාණය
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,කණ්ඩායම් නොවන අයට එය පරිවර්තනය කළ නොහැක. ළමා කර්තව්යයන් පවතී.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,උපන් දිනය අද ට වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,උපන් දිනය අද ට වඩා වැඩි විය නොහැක.
 ,Stock Ageing,කොටස් වයස්ගතවීම
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},ශිෂ්ය {0} ශිෂ්ය අයදුම්කරු {1} එරෙහිව පවතින
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),වටය ගැලපුම්කරණය (සමාගම් ව්යවහාර මුදල්)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,කණ්ඩායම:
 DocType: Volunteer,Afternoon,දහවල්
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,විවෘත ලෙස සකසන්න
 DocType: Cheque Print Template,Scanned Cheque,ස්කෑන් චෙක්පත්
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ගනුදෙනු ඉදිරිපත් මත සම්බන්ධතා වෙත ස්වයංක්රීය ඊමේල් යවන්න.
@@ -4162,7 +4188,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,ව්යාපෘතිය {0} දැනටමත් පවතී
 DocType: Medical Department,Nursing User,හෙද පරිශීලකයා
 DocType: Plant Analysis,Plant Analysis Criterias,ශාක විශ්ලේෂක මිනුම්
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,වගකීම්
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},අනු අංකය අංක {0} කණ්ඩායමට අයත් නොවේ {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,වගකීම්
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,මෙම උපලේඛනයේ වලංගු කාලය අවසන් වී ඇත.
 DocType: Expense Claim Account,Expense Claim Account,වියදම් හිමිකම් ගිණුම
 DocType: Accounts Settings,Allow Stale Exchange Rates,ස්ට්රේල් විනිමය අනුපාතිකයන්ට ඉඩ දෙන්න
@@ -4184,11 +4211,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,වෙනස්කම් කරන්න
 DocType: Item,Default BOM,පෙරනිමි ද්රව්ය ලේඛණය
 DocType: Project,Total Billed Amount (via Sales Invoices),මුළු බිල්පත් ප්රමාණය (විකුණුම් ඉන්වොයිසි හරහා)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,හර සටහන මුදල
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,හර සටහන මුදල
 DocType: Project Update,Not Updated,යාවත්කාලීන නැත
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","අනුපාතය, කොටස්වල ප්රමාණය සහ ගණනය කළ ප්රමාණය අතර නොගැලපීම්"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,තහවුරු කිරීමට සමාගමේ නම වර්ගයේ නැවත කරුණාකර
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,මුළු විශිෂ්ට ඒඑම්ටී
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,මුළු විශිෂ්ට ඒඑම්ටී
 DocType: Journal Entry,Printing Settings,මුද්රණ සැකසුම්
 DocType: Employee Advance,Advance Account,අත්තිකාරම් ගිණුම
 DocType: Job Offer,Job Offer Terms,රැකියා පිරිනමන කොන්දේසි
@@ -4197,7 +4224,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,රථ
 DocType: Vehicle,Insurance Company,රක්ෂණ සමාගම
 DocType: Asset Category Account,Fixed Asset Account,ස්ථාවර වත්කම් ගිණුම්
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,විචල්ය
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,විචල්ය
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,සැපයුම් සටහන
 DocType: Chapter,Members,සාමාජිකයින්
 DocType: Student,Student Email Address,ශිෂ්ය විද්යුත් තැපැල් ලිපිනය
@@ -4221,7 +4248,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,ආධුනිකයා
 DocType: Delivery Stop,Address Name,ලිපිනය නම
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{0} ඒකක {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{0} ඒකක {1}
 DocType: Assessment Code,Assessment Code,තක්සේරු සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,මූලික
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} කැටි වේ කොටස් ගනුදෙනු පෙර
@@ -4229,25 +4256,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ධව ඔබ විමර්ශන දිනය ඇතුළු නම් කිසිම අනිවාර්ය වේ
 DocType: Bank Reconciliation Detail,Payment Document,ගෙවීම් ලේඛන
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,නිර්ණායක සූත්රය තක්සේරු කිරීමේ දෝෂයකි
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,සමඟ සම්බන්ධවීම දිනය උපන් දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,සමඟ සම්බන්ධවීම දිනය උපන් දිනය වඩා වැඩි විය යුතුය
+DocType: Subscription,Plans,සැලසුම්
 DocType: Salary Slip,Salary Structure,වැටුප් ව්යුහය
 DocType: Account,Bank,බැංකුව
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ගුවන්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,නිකුත් ද්රව්ය
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,පුනරාවර්තනය කිරීමේදී දෝශයක් ඇති විය
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,නිකුත් ද්රව්ය
 DocType: Material Request Item,For Warehouse,ගබඩා සඳහා
 DocType: Employee,Offer Date,ඉල්ලුමට දිනය
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,උපුටා දැක්වීම්
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,කිසිදු ශිෂ්ය කණ්ඩායම් නිර්මාණය.
 DocType: Purchase Invoice Item,Serial No,අනුක්රමික අංකය
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,මාසික නැවත ගෙවීමේ ප්රමාණය ණය මුදල වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,මාසික නැවත ගෙවීමේ ප්රමාණය ණය මුදල වඩා වැඩි විය නොහැකි
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince විස්තර පළමු ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,පේළිය # {0}: අපේක්ෂිත සැපයුම් දිනය මිලදී ගැනීමේ නියෝගය දිනට පෙර නොවිය හැක
 DocType: Purchase Invoice,Print Language,මුද්රණය භාෂා
 DocType: Salary Slip,Total Working Hours,මුළු වැඩ කරන වේලාවන්
 DocType: Sales Invoice,Customer PO Details,පාරිභෝගික සේවා විස්තරය
-DocType: Subscription,Next Schedule Date,ඊළඟ උපලේඛන දිනය
 DocType: Stock Entry,Including items for sub assemblies,උප එකලස්කිරීම් සඳහා ද්රව්ය ඇතුළු
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,තාවකාලික විවෘත කිරීමේ ගිණුම
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
@@ -4276,11 +4302,11 @@
 DocType: Issue,Opening Time,විවෘත වේලාව
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,හා අවශ්ය දිනයන් සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,සුරැකුම්පත් සහ වෙළඳ භාණ්ඩ විනිමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ඉහත නිර්ණායකයන් සඳහා සේවකයින් නොමැත
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
 DocType: Hotel Settings,Default Customer,පාරිබෝගිකයා
 DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,එදිනම හමුවීම සඳහා නිර්මාණය කර ඇත්දැයි තහවුරු නොකරන්න
@@ -4305,16 +4331,16 @@
 DocType: Journal Entry Account,Employee Advance,සේවක අත්තිකාරම්
 DocType: Payroll Entry,Payroll Frequency,වැටුප් සංඛ්යාත
 DocType: Lab Test Template,Sensitivity,සංවේදීතාව
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,අමුදව්ය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,අමුදව්ය
 DocType: Leave Application,Follow via Email,විද්යුත් හරහා අනුගමනය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,ශාක හා යන්ත්රෝපකරණ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,ශාක හා යන්ත්රෝපකරණ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,බදු මුදල වට්ටම් මුදල පසු
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ඩේලි වැඩ සාරාංශය සැකසුම්
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,කරුණාකර Date by Reqd ඇතුලත් කරන්න
 DocType: Payment Entry,Internal Transfer,අභ තර ස්ථ
 DocType: Asset Maintenance,Maintenance Tasks,නඩත්තු කාර්යයන්
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
 DocType: Leave Control Panel,Carry Forward,ඉදිරියට ගෙන
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය ලෙජර් බවට පරිවර්තනය කළ නොහැකි
@@ -4322,14 +4348,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext ඒකාබද්ධතා
 DocType: Crop Cycle,Detected Disease,හඳුනාගත් රෝගය
 ,Produced,ඉදිරිපත්
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,ආපසු ගෙවීමේ ආරම්භක දිනය වන දිනට පෙර ගෙවීම් කළ නොහැක.
 DocType: Item,Item Code for Suppliers,සැපයුම්කරුවන් සඳහා අයිතමය සංග්රහයේ
 DocType: Issue,Raised By (Email),(විද්යුත්) වන විට මතු
 DocType: Training Event,Trainer Name,පුහුණුකරු නම
 DocType: Mode of Payment,General,ජනරාල්
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,පසුගිය සන්නිවේදන
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,පසුගිය සන්නිවේදන
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; තක්සේරු හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serialized අයිතමය {0} සඳහා අනු අංක අවශ්ය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; තක්සේරු හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serialized අයිතමය {0} සඳහා අනු අංක අවශ්ය
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,ඉන්වොයිසි සමග සසදන්න ගෙවීම්
 DocType: Journal Entry,Bank Entry,බැංකු පිවිසුම්
 DocType: Authorization Rule,Applicable To (Designation),(තනතුර) කිරීම සඳහා අදාළ
@@ -4343,7 +4370,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,මුදල් සක්රිය කරන්න / අක්රිය කරන්න.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {{0}} අර්ධ දින නිවාඩු {1}
 DocType: Production Plan,Get Material Request,"ද්රව්ය, ඉල්ලීම් ලබා ගන්න"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,තැපැල් වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,තැපැල් වියදම්
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),එකතුව (ඒඑම්ටී)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,විනෝදාස්වාදය සහ විනෝද
 ,Item Variant Details,අයිතම ප්රභේද විස්තරය
@@ -4354,9 +4381,9 @@
 DocType: Drug Prescription,Hour,පැය
 DocType: Restaurant Order Entry,Last Sales Invoice,අවසාන විකුණුම් ඉන්වොයිසිය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},අයිතමයට එරෙහිව Qty තෝරන්න {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,නව අනු අංකය ගබඩා තිබිය නොහැකිය. පොත් ගබඩාව කොටස් සටහන් හෝ මිළදී රිසිට්පත විසින් තබා ගත යුතු
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,නව අනු අංකය ගබඩා තිබිය නොහැකිය. පොත් ගබඩාව කොටස් සටහන් හෝ මිළදී රිසිට්පත විසින් තබා ගත යුතු
 DocType: Lead,Lead Type,ඊයම් වර්ගය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,මේ සියලු විෂයන් දැනටමත් ඉන්වොයිස් කර ඇත
 DocType: Company,Monthly Sales Target,මාසික විකුණුම් ඉලක්කය
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} අනුමත කළ හැකි
@@ -4364,7 +4391,7 @@
 DocType: Item,Default Material Request Type,පෙරනිමි ද්රව්ය ඉල්ලීම් වර්ගය
 DocType: Supplier Scorecard,Evaluation Period,ඇගයීම් කාලය
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,නොදන්නා
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,වැඩ පිළිවෙල නිර්මාණය කර නැත
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,වැඩ පිළිවෙල නිර්මාණය කර නැත
 DocType: Shipping Rule,Shipping Rule Conditions,නැව් පාලනය කොන්දේසි
 DocType: Purchase Invoice,Export Type,අපනයන වර්ගය
 DocType: Salary Slip Loan,Salary Slip Loan,වැටුප් ස්ලිප් ණය
@@ -4380,8 +4407,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ඉන්වොයිසි සාරාංශය විවෘත කිරීම
 DocType: Education Settings,Education Manager,අධ්යාපන කළමණාකරු
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,ප්රශස්ත වර්ධනය සඳහා ක්ෂේත්රයේ එක් එක් ශාක අතර අවම දිග
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched අයිතමය {0}, කොටස් ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක ඒ වෙනුවට කොටස් සටහන් භාවිතා"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched අයිතමය {0}, කොටස් ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක ඒ වෙනුවට කොටස් සටහන් භාවිතා"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched අයිතමය {0}, කොටස් ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක ඒ වෙනුවට කොටස් සටහන් භාවිතා"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched අයිතමය {0}, කොටස් ප්රතිසන්ධාන භාවිතා යාවත්කාලීන කළ නොහැක ඒ වෙනුවට කොටස් සටහන් භාවිතා"
 DocType: Quality Inspection,Report Date,වාර්තාව දිනය
 DocType: Student,Middle Name,මැද නම
 DocType: C-Form,Invoices,ඉන්වොයිසි
@@ -4413,20 +4440,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,රිසිට්පත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,රිසිට්පත
 ,Sales Register,විකුණුම් රෙජිස්ටර්
 DocType: Daily Work Summary Group,Send Emails At,දී විද්යුත් තැපැල් පණිවුඩ යවන්න
 DocType: Quotation,Quotation Lost Reason,උද්ධෘත ලොස්ට් හේතුව
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,සංස්කරණය කරන්න කිසිම දෙයක් නැහැ.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Expense Claims
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",ඔබගේ ආයතනයට අමතරව පරිශීලකයන්ට එකතු කරන්න.
 DocType: Customer Group,Customer Group Name,කස්ටමර් සමූහයේ නම
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,තවමත් ගනුදෙනුකරුවන් නැත!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,කිසිදු ද්රව්යමය ඉල්ලීමක් නිර්මාණය කර නැත
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,බලපත්රය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ඔබ ද පෙර මූල්ය වර්ෂය ශේෂ මෙම මුදල් වසරේදී පිටත්ව ඇතුළත් කිරීමට අවශ්ය නම් ඉදිරියට ගෙන කරුණාකර තෝරා
@@ -4449,11 +4477,12 @@
 DocType: Vehicle,Chassis No,චැසි අංක
 DocType: Payment Request,Initiated,ආරම්භ
 DocType: Production Plan Item,Planned Start Date,සැලසුම් ඇරඹුම් දිනය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,කරුණාකර BOM එකක් තෝරන්න
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,කරුණාකර BOM එකක් තෝරන්න
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC ඒකාබද්ධ බදු අනුපමාණය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
+DocType: Bank Guarantee,Clauses and Conditions,වගන්ති සහ කොන්දේසි
 DocType: Serial No,Creation Document Type,නිර්මාණය ලේඛන වර්ගය
 DocType: Project Task,View Timesheet,පත්රිකා බලන්න
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,අවසාන දිනය ආරම්භක දිනයට වඩා වැඩි විය යුතුය
 DocType: Leave Type,Is Encash,මාරු වේ
 DocType: Leave Allocation,New Leaves Allocated,වෙන් අලුත් කොළ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ව්යාපෘති ප්රඥාවන්ත දත්ත උපුටා දක්වමිනි සඳහා ගත නොහැකි ය
@@ -4467,9 +4496,10 @@
 DocType: Patient,Alcohol Current Use,මත්පැන් භාවිතය
 DocType: Student Admission Program,Student Admission Program,ශිෂ්ය ප්රවේශ වැඩසටහන
 DocType: Payment Entry,Account Paid To,කිරීම ගෙවුම් ගිණුම
+DocType: Subscription Settings,Grace Period,සහන කාලය
 DocType: Item Alternative,Alternative Item Name,විකල්ප අයිතම නම
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,මව් අයිතමය {0} යනු කොටස් අයිතමය නොවිය යුතුයි
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",කිසිදු වැටුප් පදාන ඉදිරිපත් කළ ෙනොහැකි විය <br> \ හේතු විය හැකි හේතු <br> \ 1. ශුද්ධ ගෙවීම් 0 ට වඩා අඩුය. <br> \ 2. සේවක මාස්ටර්හි සඳහන් වන විද්යුත් තැපැල් ලිපිනය වලංගු නොවේ. <br>
@@ -4479,7 +4509,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ගිණුම සඳහා වූ අයවැය {1} {2} {3} එරෙහිව {4} වේ. එය {5} විසින් ඉක්මවා ඇත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,යවන ලද අතරින්
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,සහ අස්ථීර වූ ආබාධිතයන්
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,මාලාවක් අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,මූල්යමය සේවා
 DocType: Student Sibling,Student ID,ශිෂ්ය හැඳුනුම්පතක්
@@ -4491,14 +4520,16 @@
 DocType: Complaint,Complaint,පැමිණිල්ලක්
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ආපසු ගෙවීමේ පිවිසුම කරන්න
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,සියලුම දෙපාර්තමේන්තු
 DocType: Patient,Alcohol Past Use,මත්පැන් අතීත භාවිතය
 DocType: Fertilizer Content,Fertilizer Content,පොහොර අන්තර්ගතය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,ගැටළුව / ඇනහිටයි
 DocType: Tax Rule,Billing State,බිල්පත් රාජ්ය
 DocType: Share Transfer,Transfer,මාරු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,මෙම වැඩ පිළිවෙල අවලංගු කිරීමට පෙර වැඩ පිළිවෙළ {0} අවලංගු කළ යුතුය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
 DocType: Authorization Rule,Applicable To (Employee),(සේවක) කිරීම සඳහා අදාළ
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
@@ -4522,10 +4553,11 @@
 DocType: Cheque Print Template,Message to show,පෙන්වන්න පණිවුඩය
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,සිල්ලර
 DocType: Student Attendance,Absent,නැති කල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,නිෂ්පාදන පැකේජය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,නිෂ්පාදන පැකේජය
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} ආරම්භ කිරීමේ ලකුණු සොයාගත නොහැක. ඔබ 0 සිට 100 ආවරණ මට්ටමේ සිට ස්ථීර ලකුණු තිබිය යුතුය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ෙරෝ {0}: වලංගු නොවන සමුද්දේශ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,බදු හා ගාස්තු මිලදී සැකිල්ල
+DocType: Subscription,Current Invoice Start Date,ජංගම ඉන්වොයිසිය ආරම්භක දිනය
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: හර හෝ බැර ප්රමාණය එක්කෝ {2} සඳහා අවශ්ය
 DocType: GL Entry,Remarks,සටහන්
@@ -4535,11 +4567,13 @@
 DocType: Task,Parent Task,මාපිය කාර්යය
 DocType: Journal Entry,Write Off Based On,පදනම් කරගත් දින Off ලියන්න
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ඊයම් කරන්න
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
 DocType: Stock Settings,Show Barcode Field,Barcode ක්ෂේත්ර පෙන්වන්න
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","වැටුප් දැනටමත් {0} අතර කාල සීමාව සඳහා සකස් සහ {1}, අයදුම්පත් කාලය Leave මෙම දින පරාසයක් අතර විය නොහැක."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","වැටුප් දැනටමත් {0} අතර කාල සීමාව සඳහා සකස් සහ {1}, අයදුම්පත් කාලය Leave මෙම දින පරාසයක් අතර විය නොහැක."
+DocType: Fiscal Year,Auto Created,ස්වයංක්රීයව නිර්මාණය කර ඇත
 DocType: Chapter Member,Leave Reason,හේතුව
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ඉන්වොයිසිය {0} තවදුරටත් නොමැත
 DocType: Guardian Interest,Guardian Interest,ගාඩියන් පොලී
 DocType: Volunteer,Availability,ලබාගත හැකිය
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ඉන්වොයිසි සඳහා පෙරනිමි අගයන් සැකසීම
@@ -4548,14 +4582,13 @@
 DocType: Timesheet,Employee Detail,සේවක විස්තර
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 විද්යුත් හැඳුනුම්පත
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 විද්යුත් හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,මාසික දින ඊළඟට දිනය දවසේ හා නැවත සමාන විය යුතුයි
 DocType: Lab Prescription,Test Code,ටෙස්ට් සංග්රහය
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සැකසුම්
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} සඳහා ලකුණු ලබා දීම සඳහා අවසර ලබා දී නොමැත {1}
 DocType: Job Offer,Awaiting Response,බලා සිටින ප්රතිචාර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,ඉහත
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},මුළු මුදල {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},මුළු මුදල {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
 DocType: Supplier,Mention if non-standard payable account,සම්මත නොවන ගෙවිය යුතු ගිණුම් නම් සඳහන්
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',කරුණාකර &#39;සියලුම තක්සේරු කණ්ඩායම්&#39; හැර වෙනත් තක්සේරු කණ්ඩායම තෝරන්න
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},පේළිය {0}: භාණ්ඩයක් සඳහා පිරිවැය මධ්යස්ථානය අවශ්ය වේ {1}
@@ -4566,7 +4599,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,ජල විශ්ලේෂණය
 DocType: Chapter,Region,කලාපයේ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,විකල්ප. මෙම සිටුවම විවිධ ගනුදෙනු පෙරහන් කිරීමට භාවිතා කරනු ඇත.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
 DocType: Holiday List,Weekly Off,සතිපතා Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Reload Linked විශ්ලේෂණය
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","උදා: 2012, 2012-13"
@@ -4582,7 +4615,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,කටුගා දමා වත්කම් පිරිවැය
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: පිරිවැය මධ්යස්ථානය අයිතමය {2} සඳහා අනිවාර්ය වේ
 DocType: Vehicle,Policy No,ප්රතිපත්ති නැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
 DocType: Asset,Straight Line,සරල රේඛාව
 DocType: Project User,Project User,ව්යාපෘති පරිශීලක
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,බෙදුණු
@@ -4622,21 +4655,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,මාර්ගය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ලෙජර් පිරිවැය මධ්යස්ථානය බවට පත් කළ නොහැක එය ළමා මංසල කර ඇති පරිදි
 DocType: Production Plan,Total Planned Qty,මුලුමනින් සැලසුම්ගත Q
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,විවෘත කළ අගය
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,විවෘත කළ අගය
 DocType: Salary Detail,Formula,සූත්රය
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,අනු #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,අනු #
 DocType: Lab Test Template,Lab Test Template,පරීක්ෂණ පරීක්ෂණ ආකෘතිය
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,විකුණුම් ගිණුම
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,විකුණුම් ගිණුම
 DocType: Purchase Invoice Item,Total Weight,සම්පූර්ණ බර
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,විකුණුම් මත කොමිසම
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,විකුණුම් මත කොමිසම
 DocType: Job Offer Term,Value / Description,අගය / විස්තරය
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
 DocType: Purchase Order Item,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
 DocType: Restaurant Order Entry,Restaurant Order Entry,ආපන ශාලා ප්රවේශය
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,හර සහ බැර {0} # {1} සඳහා සමාන නැත. වෙනස {2} වේ.
 DocType: Asset Maintenance Task,Assign To Name,නමට පැවරීම
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,විනෝදාස්වාදය වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,විනෝදාස්වාදය වියදම්
 DocType: Hub Settings,Enabled Users,සක්රීය පරිශීලකයන්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ද්රව්ය ඉල්ලීම් කරන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},විවෘත අයිතමය {0}
@@ -4649,24 +4682,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,නිවාඩු සඳහා අයදුම්පත්.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,පවත්නා ගනුදෙනුව ගිණුමක් මකා දැමිය නොහැක
 DocType: Vehicle,Last Carbon Check,පසුගිය කාබන් පරීක්ෂා කරන්න
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,නීතිමය වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,නීතිමය වියදම්
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,කරුණාකර දණ්ඩනය ප්රමාණය තෝරා
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,විකුණුම් සහ මිලදී ගැනීම් ඉන්වොයිසි විවෘත කරන්න
 DocType: Purchase Invoice,Posting Time,"ගිය තැන, වේලාව"
 DocType: Timesheet,% Amount Billed,% මුදල අසූහත
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,දුරකථන අංකය වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,දුරකථන අංකය වියදම්
 DocType: Sales Partner,Logo,ලාංඡනය
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"ඔබ &#39;සුරැකුමට පෙර, මාලාවක් තෝරාගැනීමට පරිශීලක බල කිරීම සඳහා අවශ්ය නම් මෙම පරීක්ෂා කරන්න. ඔබ මෙම පරීක්ෂා නම් කිසිඳු පෙරනිමි වනු ඇත."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},අනු අංකය {0} සමග කිසිදු විෂය
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},අනු අංකය {0} සමග කිසිදු විෂය
 DocType: Email Digest,Open Notifications,විවෘත නිවේදන
 DocType: Payment Entry,Difference Amount (Company Currency),වෙනස ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,සෘජු වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,සෘජු වියදම්
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,නව පාරිභෝගික ආදායම්
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ගමන් වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ගමන් වියදම්
 DocType: Maintenance Visit,Breakdown,බිඳ වැටීම
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},අභිමත ක්ෂේත්රය අනුපිළිවෙලට එකතු කරන්න doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
 DocType: Purchase Receipt Item,Sample Quantity,සාම්පල ප්රමාණය
+DocType: Bank Guarantee,Name of Beneficiary,ප්රතිලාභියාගේ නම
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",නවතම තක්සේරු අනුපාතය / මිල ලැයිස්තුවේ අනුපාතය / අමු ද්රව්යයේ අවසන් මිලදී ගැනීමේ අනුපාතය මත පදනම්ව Scheduler හරහා ස්වයංක්රීයව BOM පිරිවැය යාවත්කාලීන කරන්න.
 DocType: Bank Reconciliation Detail,Cheque Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් දිනය"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ගිණුම {0}: මාපිය ගිණුමක් {1} සමාගම අයිති නැත: {2}
@@ -4678,14 +4711,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,පරිවාස
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,වැටුප් සංරචක
 DocType: Program Enrollment Tool,New Academic Year,නව අධ්යයන වර්ෂය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
 DocType: Stock Settings,Auto insert Price List rate if missing,වාහන ළ මිල ලැයිස්තුව අනුපාතය අතුරුදහන් නම්
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,මුළු ු ර්
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,මුළු ු ර්
 DocType: GST Settings,B2C Limit,B2C සීමාව
 DocType: Work Order Item,Transferred Qty,මාරු යවන ලද
 apps/erpnext/erpnext/config/learn.py +11,Navigating,යාත්රා
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,සැලසුම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,සැලසුම්
 DocType: Share Balance,Issued,නිකුත් කල
+DocType: Loan,Repayment Start Date,ආපසු ගෙවීමේ ආරම්භක දිනය
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,ශිෂ්ය ක්රියාකාරකම්
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,සැපයුම්කරු අංකය
 DocType: Payment Request,Payment Gateway Details,ගෙවීම් ගේට්වේ විස්තර
@@ -4698,10 +4732,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","අනියම්, ලෙඩ ආදිය කොළ වර්ගය"
 DocType: Email Digest,Send regular summary reports via Email.,විද්යුත් හරහා නිතිපතා සාරාංශයක් වාර්තා යවන්න.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
 DocType: Assessment Result,Student Name,ශිෂ්ය නම
 DocType: Brand,Item Manager,අයිතමය කළමනාකරු
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,පඩි නඩි ගෙවිය යුතු
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,පඩි නඩි ගෙවිය යුතු
 DocType: Buying Settings,Default Supplier Type,පෙරනිමි සැපයුම්කරු වර්ගය
 DocType: Plant Analysis,Collection Datetime,එකතුව
 DocType: Work Order,Total Operating Cost,මුළු මෙහෙයුම් පිරිවැය
@@ -4711,9 +4745,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,පරිශීලක {0} නොපවතියි
 DocType: Payment Term,Day(s) after invoice date,ඉන්වොයිස් දිනයෙන් පසු දිනය
 DocType: Payment Schedule,Payment Schedule,ගෙවීම් උපලේඛනය
-DocType: Subscription,SUB-,උප-
 DocType: Item Attribute Value,Abbreviation,කෙටි යෙදුම්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ගෙවීම් සටහන් දැනටමත් පවතී
+DocType: Subscription,Trial Period End Date,පරීක්ෂණ කාලය අවසන් වන දිනය
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized නොහැකි නිසා {0} සීමාවන් ඉක්මවා
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,වැටුප් සැකිල්ල ස්වාමියා.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,රෝග විද්යාව
@@ -4730,9 +4764,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ආදර්ශ හෝ ගනුදෙනුකරුවන් වෙත උපුටා දක්වයි.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ශීත කළ කොටස් සංස්කරණය කිරීමට අවසර කාර්යභාරය
 ,Territory Target Variance Item Group-Wise,භූමි ප්රදේශය ඉලක්ක විචලතාව අයිතමය සමූහ ප්රාඥ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,මාසික සමුච්චිත
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,බදු සැකිල්ල අනිවාර්ය වේ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ගිණුම {0}: මාපිය ගිණුමක් {1} නොපවතියි
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),මිල ලැයිස්තුව අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
@@ -4741,14 +4775,15 @@
 DocType: Lab Prescription,Test Created,ටෙස්ට් නිර්මාණය
 DocType: Healthcare Settings,Custom Signature in Print,මුද්රිත චරිත අත්සන්
 DocType: Account,Temporary,තාවකාලික
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ගණුදෙනුකරු LPO අංක
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ගණුදෙනුකරු LPO අංක
 DocType: Program,Courses,පාඨමාලා
 DocType: Monthly Distribution Percentage,Percentage Allocation,ප්රතිශතයක් වෙන් කිරීම
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,ලේකම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,ලේකම්
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ආබාධිත නම්, ක්ෂේත්රය &#39;වචන දී&#39; ඕනෑම ගනුදෙනුවක් තුළ දිස් නොවන"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,මෙම ක්රියාවලිය අනාගත බිල්පත් කරනු ඇත. මෙම දායකත්වය අවලංගු කිරීමට අවශ්ය බව ඔබට විශ්වාසද?
 DocType: Serial No,Distinct unit of an Item,කළ භාණ්ඩයක වෙනස් ඒකකය
 DocType: Supplier Scorecard Criteria,Criteria Name,නිර්ණායක නාම
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,සමාගම සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,සමාගම සකස් කරන්න
 DocType: Pricing Rule,Buying,මිලදී ගැනීමේ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,රෝග හා පොහොර
 DocType: HR Settings,Employee Records to be created by,සේවක වාර්තා විසින් නිර්මාණය කල
@@ -4757,18 +4792,18 @@
 DocType: POS Profile,Apply Discount On,වට්ටම් මත අදාළ
 DocType: Member,Membership Type,සාමාජිකත්ව වර්ගය
 ,Reqd By Date,දිනය වන විට Reqd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,ණය හිමියන්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,ණය හිමියන්
 DocType: Assessment Plan,Assessment Name,තක්සේරු නම
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,මුද්රණයේදී PDC පෙන්වන්න
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,මුද්රණයේදී PDC පෙන්වන්න
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ෙරෝ # {0}: අනු අංකය අනිවාර්ය වේ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,අයිතමය ප්රඥාවන්ත බදු විස්තර
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,රැකියා අවස්ථාව
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ආයතනය කෙටි යෙදුම්
 ,Item-wise Price List Rate,අයිතමය ප්රඥාවන්ත මිල ලැයිස්තුව අනුපාතිකය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,සැපයුම්කරු උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,සැපයුම්කරු උද්ධෘත
 DocType: Quotation,In Words will be visible once you save the Quotation.,ඔබ උද්ධෘත බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
@@ -4786,7 +4821,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,සමස්ත විචලතාව
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","මෙම පහසුකම සක්රීය කළ විට, පද්ධතිය ස්වයංක්රීයව බඩු තොග සඳහා ගිණුම් සටහන් ඇතුළත් කිරීම් පල කරන්නෙමු."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,තැරැව් ගාස්තු
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,සේවකයා සඳහා සහභාගි {0} දැනටමත් මේ දවස ලෙස ලකුණු කර ඇත
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,සේවකයා සඳහා සහභාගි {0} දැනටමත් මේ දවස ලෙස ලකුණු කර ඇත
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම ව්යවස්ථා සංග්රහයේ
 DocType: Customer,From Lead,ඊයම් සිට
@@ -4797,6 +4832,7 @@
 DocType: Lab Test,Approved Date,අනුමත දිනය
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,හිතුව එක තේ ගබඩාවක් අනිවාර්ය වේ
+DocType: Subscriber,Subscriber Name,අනුසන්කරු නම
 DocType: Serial No,Out of Warranty,Warranty න්
 DocType: BOM Update Tool,Replace,ආදේශ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,නිෂ්පාදන සොයාගත්තේ නැත.
@@ -4806,19 +4842,18 @@
 DocType: Request for Quotation Item,Project Name,ව්යාපෘතියේ නම
 DocType: Customer,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
 DocType: Journal Entry Account,If Income or Expense,ආදායම් හෝ වියදම් නම්
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},සේවක ණය ලෙස පොලී ආදායම් ගිණුමක් තෝරන්න {0}
 DocType: Work Order,Required Items,අවශ්ය අයිතම
 DocType: Stock Ledger Entry,Stock Value Difference,කොටස් අගය වෙනස
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,මානව සම්පත්
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ගෙවීම් ප්රතිසන්ධාන ගෙවීම්
 DocType: Disease,Treatment Task,ප්රතිකාර කාර්යය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,බදු වත්කම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,බදු වත්කම්
 DocType: BOM Item,BOM No,ද්රව්ය ලේඛණය නොමැත
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ජර්නල් සටහන් {0} ගිණුම {1} නැති හෝ වෙනත් වවුචරය එරෙහිව මේ වන විටත් අදාල කරගත කරන්නේ
 DocType: Item,Moving Average,වෙනස්වන සාමාන්යය
 DocType: BOM Update Tool,The BOM which will be replaced,ද්රව්ය ලේඛණය වෙනුවට කරනු ලබන
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ඉලෙක්ට්රෝනික උපකරණ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ඉලෙක්ට්රෝනික උපකරණ
 DocType: Asset,Maintenance Required,නඩත්තු කිරීම අවශ්ය වේ
 DocType: Account,Debit,ඩෙබිට්
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,කොළ 0.5 ගුණාකාරවලින් වෙන් කල යුතු
@@ -4827,7 +4862,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,විශිෂ්ට ඒඑම්ටී
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,මෙම වෙළෙඳ පුද්ගලයෙක් සඳහා ඉලක්ක අයිතමය සමූහ ප්රඥාවන්ත Set.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[දින] වඩා පැරණි කොටස් කැටි
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ෙරෝ # {0}: වත්කම් ස්ථාවර වත්කම් මිලදී ගැනීම / විකිණීම සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ෙරෝ # {0}: වත්කම් ස්ථාවර වත්කම් මිලදී ගැනීම / විකිණීම සඳහා අනිවාර්ය වේ
 DocType: Asset Maintenance Team,Maintenance Team Name,නඩත්තු කණ්ඩායම නම
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","මිල නියම කිරීම නීති දෙකක් හෝ ඊට වැඩි ඉහත තත්වයන් මත පදනම්ව දක්නට ලැබේ නම්, ප්රමුඛ ආලේප කරයි. අතර පෙරනිමි අගය ශුන්ය (හිස්ව තබන්න) වේ ප්රමුඛ 0 සිට 20 දක්වා අතර සංඛ්යාවක්. සංඛ්යාව ඉහල එම කොන්දේසි සමග බහු මිල නියම රීති පවතී නම් එය මුල් තැන ඇත යන්නයි."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,&#39;ප්රස්ථායෙන්&#39; තෝරා ගනු ලබන්නේ පාරිභෝගිකයා ලෙස නම් ගනුදෙනුකරු අනිවාර්ය වේ
@@ -4837,19 +4872,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,වියදම් හිමිකම් වර්ග.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},අයිතමය {0} සඳහා අනුපාතය අලෙවි එහි {1} වඩා අඩු ය. අලෙවි අනුපාතය කටවත් {2} විය යුතු
-DocType: Item,Taxes,බදු
+DocType: Subscription,Taxes,බදු
 DocType: Purchase Invoice,capital goods,ප්රාග්ධන භාණ්ඩ
 DocType: Purchase Invoice Item,Weight Per Unit,ඒකකය සඳහා බර
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ගෙවුම් හා නොවේ භාර
 DocType: Project,Default Cost Center,පෙරනිමි පිරිවැය මධ්යස්ථානය
-DocType: Bank Guarantee,End Date,අවසාන දිනය
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,කොටස් ගනුදෙනු
 DocType: Budget,Budget Accounts,අයවැය ගිණුම්
 DocType: Employee,Internal Work History,අභ්යන්තර රැකියා ඉතිහාසය
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,සමුච්චිත ක්ෂය ප්රමාණය
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,පෞද්ගලික කොටස්
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,සැපයුම්කරුවන් ලකුණු පුවරුව විචල්ය
-DocType: Employee Loan,Fully Disbursed,පූර්ණ මුදාහැරේ
 DocType: Employee Advance,Due Advance Amount,නියමිත අත්තිකාරම් මුදල
 DocType: Maintenance Visit,Customer Feedback,පාරිභෝගික සේවාව ඇගයීම
 DocType: Account,Expense,වියදම්
@@ -4873,7 +4906,7 @@
 ,Employee Information,සේවක තොරතුරු
 DocType: Stock Entry Detail,Additional Cost,අමතර පිරිවැය
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
 DocType: Quality Inspection,Incoming,ලැබෙන
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,විකිණුම් සහ මිලදී ගැනීම සඳහා පෙරනිමි බදු ආකෘති නිර්මාණය කර ඇත.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,තක්සේරු ප්රතිඵල ප්රතිඵලය {0} දැනටමත් පවතී.
@@ -4881,7 +4914,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',පිරිසක් විසින් &#39;සමාගම&#39; නම් හිස් පෙරීමට සමාගම සකස් කරන්න
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,"ගිය තැන, දිනය අනාගත දිනයක් විය නොහැකි"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ෙරෝ # {0}: අනු අංකය {1} {2} {3} සමග නොගැලපේ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,පුනරාවර්තනය වීම සඳහා
 DocType: Stock Entry,Target Warehouse Address,ඉලක්කගත ගබඩා ලිපිනය
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,අනියම් නිවාඩු
 DocType: Agriculture Task,End Day,අවසන් දිනය
@@ -4906,11 +4938,10 @@
 DocType: Material Request,% Ordered,% අනුපිළිවලින්
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","පාඨමාලාව සඳහා පදනම් ශිෂ්ය සමූහය, පාඨමාලා වැඩසටහන ඇතුලත් දී ලියාපදිංචි පාඨමාලා සෑම ශිෂ්ය සඳහා වලංගු වනු ඇත."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
 DocType: Share Balance,From No,අංක සිට
 DocType: Task,Actual Time (in Hours),සැබෑ කාලය (පැය දී)
 DocType: Employee,History In Company,සමාගම දී ඉතිහාසය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{Sender} වෙතින් නව පණිවිඩයක්
 DocType: Customer,Customer Primary Address,පාරිභෝගික ප්රාථමික ලිපිනය
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,පුවත් ලිපි
 DocType: Drug Prescription,Description/Strength,විස්තරය / ශක්තිය
@@ -4919,22 +4950,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,එම අයිතමය වාර කිහිපයක් ඇතුළු කර ඇත
 DocType: Department,Leave Block List,වාරණ ලැයිස්තුව තබන්න
 DocType: Purchase Invoice,Tax ID,බදු හැඳුනුම්පත
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ තීරුව හිස්ව තිබිය යුතුයි.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ තීරුව හිස්ව තිබිය යුතුයි.
 DocType: Accounts Settings,Accounts Settings,ගිණුම් සැකසුම්
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,අනුමත
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} සඳහා දුර්වර්ණිත ලිපිනයක්, කරුණාකර ඉදිරියට යන්න."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} සඳහා දුර්වර්ණිත ලිපිනයක්, කරුණාකර ඉදිරියට යන්න."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","නව ගිණුමේ අංකය, එය පෙරනිමි නම ලෙස ගිණුමේ ඇතුළත් වේ"
 DocType: Maintenance Team Member,Team Member,කණ්ඩායම් සාමාජික
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,ඉදිරිපත් කිරීමට නොහැකි ප්රතිඵල
 DocType: Customer,Sales Partner and Commission,විකුණුම් සහකරු හා කොමිෂන් සභාව
-DocType: Employee Loan,Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද
+DocType: Loan,Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද
 ,Project Quantity,ව්යාපෘති ප්රමාණය
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය
 DocType: Opportunity,To Discuss,සාකච්චා කිරීමට
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,"{0} මෙම ගනුදෙනුව සම්පූර්ණ කර ගැනීම සඳහා, {2} අවශ්ය {1} ඒකක."
 DocType: Loan Type,Rate of Interest (%) Yearly,පොලී අනුපාතය (%) වාර්ෂික
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,තාවකාලික ගිණුම්
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,කලු
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,තාවකාලික ගිණුම්
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,කලු
 DocType: BOM Explosion Item,BOM Explosion Item,ද්රව්ය ලේඛණය පිපිරීගිය අයිතමය
 DocType: Shareholder,Contact List,සම්බන්ධතා ලැයිස්තුව
 DocType: Account,Auditor,විගණකාධිපති
@@ -4942,16 +4973,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ඉදිරිපත් භාණ්ඩ
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,වැඩිදුර ඉගෙන ගන්න
 DocType: Cheque Print Template,Distance from top edge,ඉහළ දාරය සිට දුර
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,මිල ලැයිස්තුව {0} අක්රීය කර ඇත නැත්නම් ස්ථානීකව නොපවතියි
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,මිල ලැයිස්තුව {0} අක්රීය කර ඇත නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Purchase Invoice,Return,ආපසු
 DocType: Pricing Rule,Disable,අක්රීය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ගෙවීම් ක්රමය ගෙවීම් කිරීමට අවශ්ය වේ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ගෙවීම් ක්රමය ගෙවීම් කිරීමට අවශ්ය වේ
 DocType: Project Task,Pending Review,විභාග සමාලෝචන
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","වත්කම්, අනුක්රමික අංක, කණ්ඩායම් වැනි තවත් විකල්ප සඳහා සම්පූර්ණ පිටුවක සංස්කරණය කරන්න."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,පත් කිරීම් හා උපදේශනයන්
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} මෙම කණ්ඩායම {2} ලියාපදිංචි වී නොමැති
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","එය දැනටමත් {1} පරිදි වත්කම්, {0} කටුගා දමා ගත නොහැකි"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,අවශ්ය චෙක්පත්
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,අවශ්ය චෙක්පත්
 DocType: Task,Total Expense Claim (via Expense Claim),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,මාක් නැති කල
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,සමාගම පිහිටුවීමට අපොහොසත් විය
@@ -4963,7 +4994,7 @@
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,රථ වාහන කළමනාකරණය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,සිට අයිතම එකතු කරන්න
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,සිට අයිතම එකතු කරන්න
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,බෝග හා ඉඩම්
 DocType: Cheque Print Template,Regular,සාමාන්ය
 DocType: Fertilizer,Density (if liquid),ඝනත්වය (ද්රවිතය නම්)
@@ -4988,24 +5019,26 @@
 DocType: Payment Entry,Paid Amount,ු ර්
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,විකුණුම් චක්රය
 DocType: Assessment Plan,Supervisor,සුපරීක්ෂක
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,රඳවා ගැනීමේ කොටස් ප්රවේශය
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,රඳවා ගැනීමේ කොටස් ප්රවේශය
 ,Available Stock for Packing Items,ඇසුරුම් අයිතම සඳහා ලබා ගත හැකි කොටස්
 DocType: Item Variant,Item Variant,අයිතමය ප්රභේද්යයක්
 ,Work Order Stock Report,වැඩ පිළිවෙළේ වාර්තාව
+DocType: Purchase Receipt,Auto Repeat Detail,ස්වයං නැවත නැවත විස්තර කරන්න
 DocType: Assessment Result Tool,Assessment Result Tool,තක්සේරු ප්රතිඵල මෙවලම
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,අධීක්ෂක ලෙස
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,යෝජනා කරන්න
 DocType: BOM Scrap Item,BOM Scrap Item,ද්රව්ය ලේඛණය ලාංකික අයිතමය
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ඩෙබිට් දැනටමත් ගිණුම් ශේෂය, ඔබ &#39;ක්රෙඩිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39; නියම කිරීමට අවසර නැත"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,තත්ත්ව කළමනාකරණ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,තත්ත්ව කළමනාකරණ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
 DocType: Project,Total Billable Amount (via Timesheets),මුළු බිල්පත් ප්රමාණය (පත්රිකා මගින්)
 DocType: Agriculture Task,Previous Business Day,පසුගිය ව්යාපාරික දිනය
-DocType: Employee Loan,Repay Fixed Amount per Period,කාලය අනුව ස්ථාවර මුදල ආපසු ගෙවීම
+DocType: Loan,Repay Fixed Amount per Period,කාලය අනුව ස්ථාවර මුදල ආපසු ගෙවීම
 DocType: Employee,Health Insurance No,සෞඛ්ය රක්ෂණය අංක
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,ණය සටහන ඒඑම්ටී
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,ණය සටහන ඒඑම්ටී
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,මුළු බදු මුදල
 DocType: Employee External Work History,Employee External Work History,සේවක විදේශ රැකියා ඉතිහාසය
 DocType: Opening Invoice Creation Tool,Purchase,මිලදී
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,ශේෂ යවන ලද
@@ -5016,16 +5049,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} සඳහා
 DocType: Healthcare Settings,Valid number of days,වලංගු දින ගණන
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,පිරිවැය මධ්යස්ථාන
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,නැවත ආරම්භ කිරීම
 DocType: Land Unit,Linked Plant Analysis,සම්බන්ධිත ශාක විශ්ලේෂණය
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,සැපයුම්කරුගේ මුදල් සමාගමේ පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ෙරෝ # {0}: පේළියේ සමග ලෙවල් ගැටුම් {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,"Zero, තක්සේරු අනුපාත ඉඩ"
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,"Zero, තක්සේරු අනුපාත ඉඩ"
+DocType: Bank Guarantee,Receiving,ලැබීම
 DocType: Training Event Employee,Invited,ආරාධනා
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා බහු ක්රියාකාරී වැටුප් තල
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup ගේට්වේ කියයි.
 DocType: Employee,Employment Type,රැකියා වර්ගය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ස්ථාවර වත්කම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,ස්ථාවර වත්කම්
 DocType: Payment Entry,Set Exchange Gain / Loss,විනිමය ලාභ / අඞු කිරීමට සකසන්න
 ,GST Purchase Register,GST මිලදී ගැනීම ලියාපදිංචි
 ,Cash Flow,මුදල් ප්රවාහය
@@ -5046,9 +5081,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,සියලුම කොටස් ගනුදෙනු ලැයිස්තුව
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,විපක්ෂ ගණන්
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,විපක්ෂ ගණන්
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},{0} # {1} ඇමුණුම බලන්න
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Trial Period ආරම්භක දිනය සහ පරීක්ෂණ කාලය අවසන් දිනය නියම කළ යුතුය
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,සාමාන්ය අනුපාතය
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ගෙවීම් කිරීමේ උපලේඛනයේ මුළු මුදල / ග්රෑන්ඩ් / වටලා ඇති මුළු එකතුව සමාන විය යුතුය
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ගෙවීම් කිරීමේ උපලේඛනයේ මුළු මුදල / ග්රෑන්ඩ් / වටලා ඇති මුළු එකතුව සමාන විය යුතුය
+DocType: Subscription Plan Detail,Plan,සැලැස්ම
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,පොදු ලෙජරය අනුව බැංකු ප්රකාශය ඉතිරි
 DocType: Job Applicant,Applicant Name,අයදුම්කරු නම
 DocType: Authorization Rule,Customer / Item Name,පාරිභෝගික / අයිතම නම
@@ -5078,6 +5114,7 @@
 DocType: Work Order,Warehouses,බඞු ගබඞාව
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} වත්කම් මාරු කල නොහැක
 DocType: Hotel Room Pricing,Hotel Room Pricing,හෝටලයේ කාමර මිලකරණය
+DocType: Subscription,Days Until Due,නියමිත දින දක්වා
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,මෙම අයිතමය {0} (සැකිල්ල) ක ප්රභේද්යයක් වේ.
 DocType: Workstation,per hour,පැයකට
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,මිලදී ගැනීම
@@ -5086,13 +5123,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","පදනම් ශිෂ්ය සමූහ කණ්ඩායම සඳහා, ශිෂ්ය කණ්ඩායම වැඩසටහන ඇතුළත් සෑම ශිෂ්ය සඳහා වලංගු වනු ඇත."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,කොටස් ලෙජර් ප්රවේශය මෙම ගබඩා සංකීර්ණය සඳහා පවතින අයුරිනි ගබඩා සංකීර්ණය ඉවත් කල නොහැක.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,බෙදා හැරීම
+DocType: Journal Entry Account,Loan,ණය
 DocType: Expense Claim Advance,Expense Claim Advance,වියදම් හිමිකම් අත්තිකාරම්
 DocType: Lab Test,Report Preference,වාර්තා අභිමතය
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ස්වේච්ඡා තොරතුරු.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ව්යාපෘති කළමනාකරු
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ව්යාපෘති කළමනාකරු
 ,Quoted Item Comparison,උපුටා අයිතමය සංසන්දනය
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} සහ {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,සරයක
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,සරයක
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,අයිතමය සඳහා අවසර මැක්ස් වට්ටමක්: {0} වේ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,ලෙස මත ශුද්ධ වත්කම්වල වටිනාකම
 DocType: Crop,Produce,නිපැයුම
@@ -5102,7 +5140,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,නිෂ්පාදනය සඳහා ද්රව්යමය පරිභෝජනය
 DocType: Item Alternative,Alternative Item Code,විකල්ප අයිතම සංග්රහය
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,සකස් ණය සීමා ඉක්මවා යන ගනුදෙනු ඉදිරිපත් කිරීමට අවසර තිබේ එම භූමිකාව.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
 DocType: Delivery Stop,Delivery Stop,බෙදාහැරීමේ නැවතුම්
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
@@ -5112,15 +5150,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,සබන් සහ ඩිටර්ජන්ට්
 DocType: BOM,Show Items,අයිතම පෙන්වන්න
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,වරින් වර ට වඩා වැඩි විය නොහැක.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,ඊ-මේල් මගින් පාරිභෝගිකයින්ට දැනුම් දීමට ඔබට අවශ්යද?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,ඊ-මේල් මගින් පාරිභෝගිකයින්ට දැනුම් දීමට ඔබට අවශ්යද?
+DocType: Subscription Plan,Billing Interval,බිල්ගත කිරීමේ කාලය
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,චලන පින්තූර සහ වීඩියෝ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,නියෝග
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,අරඹන්න
 DocType: Hub Settings,Hub Username,Hub පරිශීලක නාමය
 DocType: Salary Detail,Component,සංරචකය
 DocType: Assessment Criteria,Assessment Criteria Group,තක්සේරු නිර්ණායක සමූහ
 DocType: Healthcare Settings,Patient Name By,රෝගියාගේ නම
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},උපචිත සඟරාව {0} සිට {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},උපචිත සඟරාව {0} සිට {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
 DocType: Warehouse,Warehouse Name,පොත් ගබඩාව නම
 DocType: Naming Series,Select Transaction,ගනුදෙනු තෝරන්න
@@ -5134,23 +5172,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","මෙහිදී ඔබට උස, බර, අසාත්මිකතා, වෛද්ය කනස්සල්ල ආදිය පවත්වා ගැනීමට නොහැකි"
 DocType: Leave Block List,Applies to Company,සමාගම සඳහා අදාළ ෙව්
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
-DocType: Employee Loan,Disbursement Date,ටහිර දිනය
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ලබන්නන්&#39; නිශ්චිතව දක්වා නැත
+DocType: Loan,Disbursement Date,ටහිර දිනය
 DocType: BOM Update Tool,Update latest price in all BOMs,සියලුම BOM හි නවතම මිල යාවත්කාලීන කරන්න
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,වෛද්ය වාර්තාව
 DocType: Vehicle,Vehicle,වාහන
 DocType: Purchase Invoice,In Words,වචන ගැන
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,ඉදිරිපත් කිරීමට පෙර බැංකුව හෝ ණය දෙන ආයතනයෙහි නම ඇතුළත් කරන්න.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} ඉදිරිපත් කළ යුතුය
 DocType: POS Profile,Item Groups,අයිතමය කණ්ඩායම්
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,අද {0} &#39;උපන් දිනය වේ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,අද {0} &#39;උපන් දිනය වේ!
 DocType: Sales Order Item,For Production,නිෂ්පාදන සඳහා
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,කරුණාකර ගිණුම් සටහනේ කරුණාකර තාවකාලික විවෘත කිරීමේ ගිණුමක් එක් කරන්න
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,කරුණාකර ගිණුම් සටහනේ කරුණාකර තාවකාලික විවෘත කිරීමේ ගිණුමක් එක් කරන්න
 DocType: Customer,Customer Primary Contact,පාරිභෝගික ප්රාථමික ඇමතුම්
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,කාලය අවසන් කිරීමේ ජර්නලය
 DocType: Project Task,View Task,දැක්ම කාර්ය සාධක
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,විපක්ෂ / ඊයම්%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,විපක්ෂ / ඊයම්%
+DocType: Bank Guarantee,Bank Guarantee Type,බැංකු ඇපකරය වර්ගය
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ඉන්වොයිසිය බිත්තිය
 ,Asset Depreciations and Balances,වත්කම් අගය පහත හා තුලනය
@@ -5161,9 +5200,8 @@
 DocType: Production Plan,Include Subcontracted Items,උප කොන්ත්රාත් භාණ්ඩ ඇතුළත් කරන්න
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,කොටස් හුවමාරුවේ පසු වෙනස්කම් ගුණාංග වෙනස් කළ නොහැක. මෙය කිරීමට නව අයිතමයක් ඔබට අවශ්ය වනු ඇත.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
-DocType: Employee Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+DocType: Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},මුදල සඳහා {0} {1} එරෙහිව ගෙවීම් ඉල්ලා {2}
 DocType: Salary Slip,Salary Slip,වැටුප් ස්ලිප්
@@ -5187,11 +5225,11 @@
 DocType: Employee Education,Employee Education,සේවක අධ්යාපන
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,අයිතමය පිරිසක් වගුව සොයා ගෙන අනුපිටපත් අයිතමය පිරිසක්
 DocType: Land Unit,Parent Land Unit,ෙදමළ ඉඩම් ඒකක
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
 DocType: Fertilizer,Fertilizer Name,පොහොර වර්ගය
 DocType: Salary Slip,Net Pay,ශුද්ධ වැටුප්
 DocType: Cash Flow Mapping Accounts,Account,ගිණුම
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,අනු අංකය {0} දැනටමත් ලැබී ඇත
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,අනු අංකය {0} දැනටමත් ලැබී ඇත
 ,Requested Items To Be Transferred,ඉල්ලන අයිතම මාරු කර
 DocType: Expense Claim,Vehicle Log,වාහන ලොග්
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),උණ (තාප&gt; 38.5 ° C / 101.3 ° F හෝ අඛණ්ඩ තාපය&gt; 38 ° C / 100.4 ° F)
@@ -5232,24 +5270,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","වෙනත් ඕනෑම ප්රකාශ, වාර්තාවන් යා යුතු බව විශේෂයෙන් සඳහන් කළ යුතු උත්සාහයක්."
 DocType: Asset Maintenance,Manufacturing User,නිෂ්පාදන පරිශීලක
 DocType: Purchase Invoice,Raw Materials Supplied,"සපයා, අමු ද්රව්ය"
-DocType: C-Form,Series,මාලාවක්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},මිල ලැයිස්තුවේ මුදල් {0} විය යුතුය {1} හෝ {2}
 DocType: Appraisal,Appraisal Template,ඇගයීෙම් සැකිල්ල
 DocType: Soil Texture,Ternary Plot,ටර්නරි ප්ලොට්
 DocType: Item Group,Item Classification,අයිතමය වර්ගීකරණය
 DocType: Driver,License Number,බලපත්ර අංකය
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ව්යාපාර සංවර්ධන කළමණාකරු
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ව්යාපාර සංවර්ධන කළමණාකරු
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,නඩත්තු සංචාරය අරමුණ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ඉන්වොයිස් රෝගියා ලියාපදිංචිය
 DocType: Crop,Period,කාලය
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,පොදු ලෙජරය
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},සේවක {0} නිවාඩු මත {1} මත
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},සේවක {0} නිවාඩු මත {1} මත
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ආදර්ශ දැක්ම
 DocType: Program Enrollment Tool,New Program,නව වැඩසටහන
 DocType: Item Attribute Value,Attribute Value,ගති ලක්ෂණය අගය
 ,Itemwise Recommended Reorder Level,Itemwise සීරුමාරු කිරීමේ පෙළ නිර්දේශිත
 DocType: Salary Detail,Salary Detail,වැටුප් විස්තර
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,කරුණාකර පළමු {0} තෝරා
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,කරුණාකර පළමු {0} තෝරා
 DocType: Appointment Type,Physician,වෛද්යවරයෙක්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,උපදේශන
@@ -5257,15 +5294,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) සැලසුම් කර ඇති ප්රමාණයට වඩා ({2}) වැඩ පිළිවෙළ {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,නිෂ්පාදන සඳහා කාලය පත්රය.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,උප ශීර්ෂයට
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,කොටස් ගනුදෙනු පසු ප්රභව ගුණාංග වෙනස් කළ නොහැක. මෙය කිරීමට නව අයිතමයක් ඔබට අවශ්ය වනු ඇත.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoAardless SEPA මැන්ඩේට්
 DocType: Physician,Charges,ගාස්තු
 DocType: Production Plan,Get Items For Work Order,වැඩ පිළිවෙළ සඳහා අයිතම ලබා ගන්න
 DocType: Salary Detail,Default Amount,පෙරනිමි මුදල
 DocType: Lab Test Template,Descriptive,විස්තරාත්මක
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,මෙම මාසික ගේ සාරාංශය
 DocType: Quality Inspection Reading,Quality Inspection Reading,තත්ත්ව පරීක්ෂක වර කියවීම
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,ඔබේ සමාගම සඳහා ඔබ අපේක්ෂා කරන විකුණුම් ඉලක්කයක් සකසන්න.
 ,Project wise Stock Tracking,ව්යාපෘති ප්රඥාවන්ත කොටස් ට්රැකින්
@@ -5293,11 +5331,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,වෙබ් අඩවියක් නිර්මාණය කිරීම අසාර්ථක විය
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM පරිවර්තනය විස්තර
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,දැනටමත් නිර්මාණය කර ඇති රඳවා තබා ගැනීමේ කොටස් ලේඛනය හෝ සාම්පල ප්රමාණය ලබා දී නොමැත
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,දැනටමත් නිර්මාණය කර ඇති රඳවා තබා ගැනීමේ කොටස් ලේඛනය හෝ සාම්පල ප්රමාණය ලබා දී නොමැත
 DocType: Program,Program Abbreviation,වැඩසටහන කෙටි යෙදුම්
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ
 DocType: Warranty Claim,Resolved By,විසින් විසඳා
-DocType: Bank Guarantee,Start Date,ආරම්භක දිනය
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,කාලයක් සඳහා කොළ වෙන් කරමි.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,වැරදි ලෙස එළි පෙහෙළි චෙක්පත් සහ තැන්පතු
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ගිණුම {0}: ඔබ මව් ගිණුම ලෙස ම යෙදිය නොහැක
@@ -5312,11 +5349,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,පැය
 DocType: Project,Expected Start Date,අපේක්ෂිත ඇරඹුම් දිනය
 DocType: Purchase Invoice,04-Correction in Invoice,ඉන්වොයිස් 04-නිවැරදි කිරීම
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM මගින් සියලු අයිතම සඳහා නිර්මාණය කරන ලද වැඩ පිළිවෙල
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM මගින් සියලු අයිතම සඳහා නිර්මාණය කරන ලද වැඩ පිළිවෙල
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,ප්රභූ විස්තර වාර්තාව
 DocType: Setup Progress Action,Setup Progress Action,ප්රගති ක්රියාමාර්ග සැකසීම
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,මිලට ගැනීමේ මිල ලැයිස්තුව
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,මිලට ගැනීමේ මිල ලැයිස්තුව
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,චෝදනා අයිතමය අදාළ නොවේ නම් අයිතමය ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,දායකත්වය අවලංගු කිරීම
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,සම්පූර්ණ කරන ලද හෝ නඩත්තු තත්ත්වය අවසන් කිරීම හෝ අවසන් කිරීම ඉවත් කරන්න
 DocType: Supplier,Default Payment Terms Template,පෙර ගෙවුම් නියමයන් සැකිල්ල
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ගනුදෙනු මුදල් ගෙවීම් ගේට්වේ මුදල් ලෙස සමාන විය යුතුයි
@@ -5327,7 +5365,6 @@
 DocType: Employee,Educational Qualification,අධ්යාපන සුදුසුකම්
 DocType: Workstation,Operating Costs,මෙහෙයුම් පිරිවැය
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,සමුච්චිත මාසික අයවැය කටයුතු කර ඉක්මවා
-DocType: Subscription,Submit on creation,නිර්මානය කිරීම මත ඉදිරිපත්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
 DocType: Asset,Disposal Date,බැහැර කිරීමේ දිනය
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","විද්යුත් තැපැල් පණිවුඩ ඔවුන් නිවාඩු නැති නම්, ලබා දී ඇති පැයක දී සමාගමේ සියළු ක්රියාකාරී සේවක වෙත යවනු ලැබේ. ප්රතිචාර සාරාංශය මධ්යම රාත්රියේ යවනු ඇත."
@@ -5346,6 +5383,7 @@
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Cheque Print Template,Cheque Print Template,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් මුද්රණය සැකිල්ල"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,පිරිවැය මධ්යස්ථාන සටහන
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,දායක මුදල් අහෝසි කිරීම හෝ නොගෙවන ලද පරිදි දායක මුදල අවලංගු කිරීමට පෙර ඉන්වොයිස් දිනට පසු දින ගණනක් ගත වී ඇත
 DocType: Lab Test Template,Sample Collection,සාම්පල එකතුව
 ,Requested Items To Be Ordered,ඉල්ලන අයිතම ඇණවුම් කළ යුතු
 DocType: Price List,Price List Name,මිල ලැයිස්තුව නම
@@ -5354,7 +5392,7 @@
 DocType: Account,Income,ආදායම්
 DocType: Industry Type,Industry Type,කර්මාන්ත වර්ගය
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,මොකක්හරි වැරද්දක් වෙලා!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,"අවවාදයයි: අවසරය, අයදුම් පහත වාරණ දින අඩංගු"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,"අවවාදයයි: අවසරය, අයදුම් පහත වාරණ දින අඩංගු"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,විකුණුම් ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත් කර ඇති
 DocType: Supplier Scorecard Scoring Criteria,Score,ලකුණු
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,මුදල් වර්ෂය {0} නොපවතියි
@@ -5374,12 +5412,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,පේදුරු-of-Sale විකිණීමට නරඹන්න
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 සිට 100 අතර අගයක් විය යුතුය
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,ඊළඟට ක්ෂයවීම් දිනය සඳහා භාවිතා කළ හැකි දිනට පෙර නොවිය හැක
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,අනාරක්ෂිත ණය
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,අනාරක්ෂිත ණය
 DocType: Cost Center,Cost Center Name,වියදම මධ්යස්ථානය නම
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Timesheet එරෙහිව උපරිම වැඩ කරන පැය
 DocType: Maintenance Schedule Detail,Scheduled Date,නියමිත දිනය
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,මුළු ගෙවුම් ඒඑම්ටී
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,මුළු ගෙවුම් ඒඑම්ටී
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,අකුරු 160 ට වඩා වැඩි පණිවිඩ කිහිපයක් පණිවුඩ බෙදී ඇත
 DocType: Purchase Receipt Item,Received and Accepted,ලැබුණු හා පිළිගත්
 DocType: Hub Settings,Company and Seller Profile,සමාගම සහ විකුණුම්කරුගේ පැතිකඩ
@@ -5393,10 +5431,9 @@
 DocType: Item,Variant Based On,ප්රභේද්යයක් පදනම් මත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 100% ක් විය යුතුය. එය {0} වේ
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,ඔබේ සැපයුම්කරුවන්
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,නිවැරදි කරන්න
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
 DocType: Request for Quotation Item,Supplier Part No,සැපයුම්කරු අඩ නොමැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,නිර්නාමික
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,සිට ලැබුණු
 DocType: Lead,Converted,පරිවර්තනය කරන
@@ -5410,6 +5447,7 @@
 DocType: Asset,Assets,වත්කම්
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,පරිගණක
 DocType: Item,List this Item in multiple groups on the website.,එම වෙබ් අඩවිය බහු කණ්ඩායම් ෙමම අයිතමය ලැයිස්තුගත කරන්න.
+DocType: Subscription,Current Invoice End Date,ජංගම ඉන්වොයිසිය අවසානය
 DocType: Payment Term,Due Date Based On,නියමිත දිනය මත පදනම්ව
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,කරුණාකර විකුණුම් සැකසුම් තුළ ප්රකෘති පාරිභෝගික කණ්ඩායම සහ ප්රදේශය සැකසීම කරන්න
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} නොපවතියි
@@ -5417,7 +5455,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,අයිතමය: {0} පද්ධතිය තුළ නොපවතියි
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,ඔබ ශීත කළ අගය නියම කිරීමට අවසර නැත
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled අයැදුම්පත් ලබා ගන්න
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Journal Entry සඳහා තෝරාගත් ආපසු ගෙවීම් නොමැත
 DocType: Payment Reconciliation,From Invoice Date,ඉන්වොයිසිය දිනය
+DocType: Loan,Disbursed,උපෙයෝජනය
 DocType: Healthcare Settings,Laboratory Settings,රසායනාගාර සැකසුම්
 DocType: Patient Appointment,Service Unit,සේවා ඒකකය
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,සැපයුම්කරු සාර්ථක ලෙස සකසන්න
@@ -5430,12 +5470,12 @@
 DocType: Share Balance,No of Shares,කොටස් ගණන
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,තත්ත්වය තෝරන්න
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
 DocType: Pricing Rule,Pricing Rule Help,මිල ගණන් පාලනය උදවු
 DocType: School House,House Name,හවුස් නම
 DocType: Fee Schedule,Total Amount per Student,එක් ශිෂ්යයෙකු සඳහා මුළු මුදල
 DocType: Purchase Taxes and Charges,Account Head,ගිණුම් අංශයේ ප්රධානී
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,විදුලි
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,විදුලි
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ඔබේ පරිශීලකයන් ලෙස ඔබගේ සංවිධානය සෙසු එකතු කරන්න. ඔබ ද අප අමතන්න ඔවුන් එකතු කිරීම මඟින් ඔබගේ භාව්ත කිරීමට ගනුදෙනුකරුවන් ආරාධනා එකතු කල හැක
 DocType: Stock Entry,Total Value Difference (Out - In),(- දී අතරින්) මුළු අගය වෙනස
 DocType: Grant Application,Requested Amount,ඉල්ලූ මුදල
@@ -5445,7 +5485,7 @@
 DocType: Crop Cycle,Detected Diseases,හඳුනාගත් රෝග
 DocType: Stock Entry,Default Source Warehouse,පෙරනිමි ප්රභවය ගබඩාව
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
 DocType: Asset Maintenance Task,Last Completion Date,අවසන් අවසන් දිනය
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
@@ -5453,9 +5493,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless සැකසුම්
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,කොටස් වත්කම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,කොටස් වත්කම්
 DocType: Restaurant,Active Menu,ක්රියාකාරී මෙනුව
 DocType: Target Detail,Target Qty,ඉලක්ක යවන ලද
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},ණයට එරෙහිව: {0}
 DocType: Shopping Cart Settings,Checkout Settings,ලොව පුරාවටම සැකසුම්
 DocType: Student Attendance,Present,වර්තමාන
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,සැපයුම් සටහන {0} ඉදිරිපත් නොකළ යුතුය
@@ -5464,9 +5505,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,නියෝග යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
 DocType: Chapter,Chapter Head,පරිච්ඡේදය
 DocType: Payment Term,Month(s) after the end of the invoice month,ඉන්වොයිස් මාසය අවසන් වීමෙන් පසු මාස
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,ව්යාපෘති ක්රියාකාරකම් / කටයුත්තක්.
@@ -5474,11 +5515,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,වැටුප ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය උත්පාදනය
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,පරීක්ෂණ ප්රතිඵල datetime පරීක්ෂණ datetime පරීක්ෂා කිරීමට පෙර කළ නොහැක
 DocType: POS Profile,Allow user to edit Discount,වට්ටම් වෙනස් කිරීමට පරිශීලකයාට ඉඩ දෙන්න
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,ගනුදෙනුකරුවන්ගෙන් ලබාගන්න
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,ගනුදෙනුකරුවන්ගෙන් ලබාගන්න
 DocType: Purchase Invoice Item,Include Exploded Items,පුපුරණ ද්රව්ය අඩංගු කරන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","අදාළ සඳහා {0} ලෙස තෝරා ගන්නේ නම් මිලට ගැනීම, පරීක්ෂා කළ යුතු"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,වට්ටමක් 100 කට වඩා අඩු විය යුතු
 DocType: Shipping Rule,Restrict to Countries,රටවල් වලට සීමා කිරීම
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Off ලියන්න ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Sales Invoice Timesheet,Billing Hours,බිල්පත් පැය
 DocType: Project,Total Sales Amount (via Sales Order),මුළු විකුණුම් මුදල (විකුණුම් නියෝගය හරහා)
@@ -5497,6 +5539,7 @@
 DocType: Soil Texture,Sandy Clay,සැන්ඩි ක්ලේ
 DocType: Grant Application,Assessment  Manager,තක්සේරු කළමනාකරු
 DocType: Payment Entry,Allocate Payment Amount,ගෙවීම් ප්රමාණය වෙන්
+DocType: Subscription Plan,Subscription Plan,දායක සැලැස්ම
 DocType: Employee External Work History,Salary,වැටුප
 DocType: Serial No,Delivery Document Type,සැපයුම් ලේඛන වර්ගය
 DocType: Sales Order,Partly Delivered,අර්ධ වශයෙන් භාර
@@ -5521,9 +5564,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,වයස්ගතවීම රංගේ 2
 DocType: SG Creation Tool Course,Max Strength,මැක්ස් ශක්තිය
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,පෙරසැකසුම් ස්ථාපනය කිරීම
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ගනුදෙනුකරු සඳහා තෝරා ගන්නා ලද සටහන {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ගනුදෙනුකරු සඳහා තෝරා ගන්නා ලද සටහන {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,ද්රව්ය ලේඛණය වෙනුවට
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Delivery Date මත පදනම් අයිතම තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Delivery Date මත පදනම් අයිතම තෝරන්න
 DocType: Grant Application,Has any past Grant Record,කිසිදු අතීත ප්රදාන වාර්තාවක් තිබේ
 ,Sales Analytics,විකුණුම් විශ්ලේෂණ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ලබා ගත හැකි {0}
@@ -5542,7 +5585,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,", අමු ද්රව්ය පිරිවැය සපයා"
 DocType: Selling Settings,Settings for Selling Module,විකිණීම මොඩියුලය සඳහා සැකසුම්
 DocType: Hotel Room Reservation,Hotel Room Reservation,හෝටල් කාමර වෙන් කිරීම
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,පාරිභෝගික සේවය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,පාරිභෝගික සේවය
 DocType: BOM,Thumbnail,සිඟිති-රූපය
 DocType: Item Customer Detail,Item Customer Detail,අයිතමය පාරිභෝගික විස්තර
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,අපේක්ෂකයා රැකියා ඉදිරිපත් කිරීම.
@@ -5558,7 +5601,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} ශිෂ්යයන් ලියාපදිංචි වී ඇත
 DocType: Fees,Student Details,ශිෂ්ය විස්තර
 DocType: Purchase Invoice Item,Stock Qty,කොටස් යවන ලද
-DocType: Employee Loan,Repayment Period in Months,මාස තුළ ආපසු ගෙවීමේ කාලය
+DocType: Loan,Repayment Period in Months,මාස තුළ ආපසු ගෙවීමේ කාලය
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,දෝෂය: වලංගු id නොවේ ද?
 DocType: Naming Series,Update Series Number,යාවත්කාලීන ශ්රේණි අංකය
 DocType: Account,Equity,කොටස්
@@ -5567,7 +5610,7 @@
 DocType: Task,Closing Date,අවසන් දිනය
 DocType: Sales Order Item,Produced Quantity,ඉදිරිපත් ප්රමාණ
 DocType: Timesheet,Work Detail,වැඩ විස්තර
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ඉංජිනේරු
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ඉංජිනේරු
 DocType: Journal Entry,Total Amount Currency,මුළු මුදල ව්යවහාර මුදල්
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,සොයන්න උප එක්රැස්වීම්
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},ෙරෝ නැත {0} හි අවශ්ය අයිතමය සංග්රහයේ
@@ -5613,13 +5656,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,තොරතුරු ලබා දෙන්න.
 DocType: Request for Quotation,Supplier Detail,සැපයුම්කරු විස්තර
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},සූත්රය හෝ තත්ත්වය දෝෂය: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ඉන්වොයිස් මුදල
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ඉන්වොයිස් මුදල
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,මිනුම් දණ්ඩ 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,පැමිණීම
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,කොටස් අයිතම
 DocType: BOM,Materials,ද්රව්ය
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","සලකුණු කර නැත නම්, ලැයිස්තුව ඉල්ලුම් කළ යුතු වේ එහිදී එක් එක් දෙපාර්තමේන්තුව වෙත එකතු කිරීමට සිදු වනු ඇත."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} නිර්මාණය කිරීම
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,මූලාශ්රය සහ ඉලක්ක ගබඩාව සමාන විය නොහැකි
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,"දිනය සහ වෙබ් අඩවියේ කාලය ගිය තැන, ශ්රී ලංකා තැපෑල අනිවාර්ය වේ"
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ගනුදෙනු මිලට ගැනීම සඳහා බදු ආකෘතියකි.
@@ -5643,14 +5685,14 @@
 DocType: Shipping Rule,Fixed,ස්ථාවර
 DocType: Vehicle Service,Clutch Plate,ක්ලච් ප්ලේට්
 DocType: Company,Round Off Account,වටයේ ගිණුම අක්රිය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,පරිපාලන වියදම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,පරිපාලන වියදම්
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,උපදේශන
 DocType: Customer Group,Parent Customer Group,මව් කස්ටමර් සමූහයේ
-DocType: Journal Entry,Subscription,දායකත්වය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,දායකත්වය
 DocType: Purchase Invoice,Contact Email,අප අමතන්න විද්යුත්
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ගාස්තු නිර්මාණ ඉදිරිපත් කිරීම
 DocType: Appraisal Goal,Score Earned,ලකුණු උපයා
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,දැනුම්දීමේ කාල පරිච්ඡේදය
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,දැනුම්දීමේ කාල පරිච්ඡේදය
 DocType: Asset Category,Asset Category Name,වත්කම් ප්රවර්ගය නම
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,මෙය මූල භූමියක් සහ සංස්කරණය කළ නොහැක.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,නව විකුණුම් පුද්ගලයා නම
@@ -5664,7 +5706,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
 DocType: Asset,Frequency of Depreciation (Months),ක්ෂය වාර ගණන (මාස)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,ක්රෙඩිට් ගිණුම්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,ක්රෙඩිට් ගිණුම්
 DocType: Landed Cost Item,Landed Cost Item,ඉඩම් හිමි වියදම අයිතමය
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ශුන්ය අගයන් පෙන්වන්න
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,නිෂ්පාදන / අමු ද්රව්ය ලබා රාශි වෙතින් නැවත ඇසුරුම්කර පසු ලබා අයිතමය ප්රමාණය
@@ -5672,7 +5714,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,ලැබිය යුතු / ගෙවිය යුතු ගිණුම්
 DocType: Delivery Note Item,Against Sales Order Item,විකුණුම් සාමය අයිතමය එරෙහිව
 DocType: Hub Settings,Company Logo,සමාගම ලාංඡනය
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},අයවැය සමූහ ගිණුම {0} එරෙහිව පවරා ගත නොහැකි
 DocType: Healthcare Settings,Patient Registration,රෝගියා ලියාපදිංචිය
@@ -5707,11 +5749,10 @@
 DocType: Journal Entry,Total Debit,මුළු ඩෙබිට්
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,පෙරනිමි භාණ්ඩ ගබඩා නිමි
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,කරුණාකර රෝගියා තෝරා ගන්න
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,විකුණුම් පුද්ගලයෙක්
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,විකුණුම් පුද්ගලයෙක්
 DocType: Hotel Room Package,Amenities,පහසුකම්
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,අයවැය සහ වියදම මධ්යස්ථානය
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ගෙවීමේදී බහුතරයේ පෙරනිමි ආකාරයේ ගෙවීම් කිරීමට අවසර නැත
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,සඳහා
 ,Appointment Analytics,පත්වීම් විශ්ලේෂණය
 DocType: Vehicle Service,Half Yearly,අර්ධ වාර්ෂිකව
 DocType: Lead,Blog Subscriber,බ්ලොග් ග්රාහකයා
@@ -5728,6 +5769,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ඔබ වසරකට සිසුන් කණ්ඩායම් කරන්න නම් හිස්ව තබන්න
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","පරීක්ෂා, සමස්ත කිසිදු නම්. වැඩ කරන දින වල නිවාඩු දින ඇතුලත් වනු ඇත, සහ මෙම වැටුප එක් දිනය අගය අඩු වනු ඇත"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","වත්මන් යතුර භාවිතා කරන යෙදුම්වලට ප්රවේශ වීමට නොහැකි වනු ඇත, ඔබට විශ්වාසද?"
+DocType: Subscription Settings,Prorate,නොපෙනී
 DocType: Purchase Invoice,Total Advance,මුළු අත්තිකාරම්
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,කේතය වෙනස් කරන්න
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,හදුන්වන අවසානය දිනය කාලීන ඇරඹුම් දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
@@ -5739,8 +5781,9 @@
 DocType: Opportunity Item,Basic Rate,මූලික අනුපාත
 DocType: GL Entry,Credit Amount,ක්රෙඩිට් මුදල
 DocType: Cheque Print Template,Signatory Position,අත්සන් තත්ත්වය
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ලොස්ට් ලෙස සකසන්න
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ලොස්ට් ලෙස සකසන්න
 DocType: Timesheet,Total Billable Hours,මුළු බිල්ගත කළ හැකි පැය
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,මෙම දායකත්වය මගින් ජනනය කරන ලද ඉන්වොයිසි ගෙවීමට පාරිභෝගිකයාට ගෙවිය යුතු දින ගණන
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ගෙවීම් ලදුපත සටහන
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,මෙය මේ පාරිභෝගික එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ෙරෝ {0}: වෙන් කළ මුදල {1} ගෙවීම් සටහන් ප්රමාණය {2} වඩා අඩු හෝ සමාන විය යුතුයි
@@ -5759,12 +5802,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),අරමුදල් ඉල්ලුම් පත්රය (වත්කම්)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,මෙය මේ සේවක පැමිණීම මත පදනම් වේ
 DocType: Assessment Result,Summary,සාරාංශය
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,මාක් පැමිණීම
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ඩෙබිට් ගිණුම
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ඩෙබිට් ගිණුම
 DocType: Fiscal Year,Year Start Date,වසරේ ආරම්භක දිනය
 DocType: Attendance,Employee Name,සේවක නම
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ආපනශාලා ඇණවුම් සටහන
@@ -5776,7 +5819,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,මිලදී ගැනීම මුදල
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,සේවක ප්රතිලාභ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,සේවක ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},හැකිළු ප්රමාණය පේළිය {1} තුළ අයිතමය {0} සඳහා ප්රමාණය සමාන විය යුතුය
 DocType: Work Order,Manufactured Qty,නිෂ්පාදනය යවන ලද
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},{0} සමඟ කොටස් නොපවතී
@@ -5784,12 +5827,12 @@
 DocType: Asset,Out of Order,ක්රියාවිරහිත වී ඇත
 DocType: Purchase Receipt Item,Accepted Quantity,පිළිගත් ප්රමාණ
 DocType: Projects Settings,Ignore Workstation Time Overlap,වැඩකරන කාලය නොසලකා හැරීම
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} පවතී නැත
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,තේරීම් කණ්ඩායම අංක
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ගනුදෙනුකරුවන් වෙත මතු බිල්පත්.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ව්යාපෘති අංකය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
 DocType: Patient Service Unit,Medical Administrator,වෛද්ය පරිපාලක
 DocType: Assessment Plan,Schedule,උපෙල්ඛනෙය්
 DocType: Account,Parent Account,මව් ගිණුම
@@ -5819,15 +5862,16 @@
 DocType: Asset Repair,Repair Status,අළුත්වැඩියා තත්ත්වය
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,මුල්ය සඟරාව සටහන් ඇතුළත් කිරීම්.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ලබා ගත හැකි යවන ලද පොත් ගබඩාව සිට දී
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,කරුණාකර සේවක වාර්තා පළමු තෝරන්න.
 DocType: POS Profile,Account for Change Amount,වෙනස් මුදල ගිණුම්
 DocType: Purchase Invoice,input service,ආදාන සේවා
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ෙරෝ {0}: පක්ෂය / ගිණුම් {3} {4} තුළ {1} / {2} සමග නොගැලපේ
 DocType: Maintenance Team Member,Maintenance Team Member,නඩත්තු කණ්ඩායම් සාමාජික
 DocType: Agriculture Analysis Criteria,Soil Analysis,පාංශු විශ්ලේෂණය
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,පාඨමාලා කේතය:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
 DocType: Account,Stock,කොටස්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Employee,Current Address,වර්තමාන ලිපිනය
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","නිශ්චිත ලෙස නම් අයිතමය තවත් අයිතමය ක ප්රභේද්යයක් කරනවා නම් විස්තර, ප්රතිරූපය, මිල ගණන්, බදු ආදිය සැකිල්ල සිට ස්ථාපනය කරනු ලබන"
 DocType: Serial No,Purchase / Manufacture Details,මිලදී ගැනීම / නිෂ්පාදනය විස්තර
@@ -5876,19 +5920,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} සඳහා ප්රවේශ
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","අයවැය සැකසීම සඳහා යමක සෘතුමය බලපෑම, ඉලක්ක ආදිය"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,විචල්ය නම
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","අයිතමය {0} සැකිලි වේ, කරුණාකර එහි විවිධ එකක් තෝරන්න"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","අයිතමය {0} සැකිලි වේ, කරුණාකර එහි විවිධ එකක් තෝරන්න"
 DocType: Asset,Asset Category,වත්කම් ප්රවර්ගය
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,ශුද්ධ වැටුප් සෘණ විය නොහැකි
 DocType: Purchase Order,Advance Paid,උසස් ගෙවුම්
 DocType: Item,Item Tax,අයිතමය බදු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,සැපයුම්කරු ද්රව්යමය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,සැපයුම්කරු ද්රව්යමය
 DocType: Soil Texture,Loamy Sand,ලමයි වැලි
 DocType: Production Plan,Material Request Planning,ද්රව්ය ඉල්ලීම් සැලසුම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,සුරාබදු ඉන්වොයිසිය
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% වරකට වඩා පෙනී
 DocType: Expense Claim,Employees Email Id,සේවක විද්යුත් අංකය
 DocType: Employee Attendance Tool,Marked Attendance,කැපී පෙනෙන පැමිණීම
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,ජංගම වගකීම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,ජංගම වගකීම්
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,කාල සීමාව ලබා දී ඇති කාලය ඉක්මවා ඇත.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ඔබගේ සම්බන්ධතා මහජන SMS යවන්න
 DocType: Patient,A Positive,ධනාත්මකයි
@@ -5899,9 +5943,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,සැබෑ යවන ලද අනිවාර්ය වේ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම් කරුවෙකුගේ කාඩ්පතක් තිබෙන අතර, මෙම සැපයුම්කරුට මිලදී ගැනීමේ ඇණවුම් ගැන සැලකිලිමත් විය යුතුය."
 DocType: Asset Maintenance Team,Asset Maintenance Team,වත්කම් නඩත්තු කණ්ඩායම
-DocType: Employee Loan,Loan Type,ණය වර්ගය
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} සාර්ථකව ඉදිරිපත් කර ඇත
+DocType: Loan,Loan Type,ණය වර්ගය
 DocType: Scheduling Tool,Scheduling Tool,අවස මෙවලම
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,ණයවර පත
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,ණයවර පත
 DocType: BOM,Item to be manufactured or repacked,අයිතමය නිෂ්පාදිත හෝ repacked කිරීමට
 DocType: Employee Education,Major/Optional Subjects,විශාල / විකල්ප විෂයයන්
 DocType: Sales Invoice Item,Drop Ship,පහත නෞකාව
@@ -5933,7 +5978,7 @@
 DocType: Item,Units of Measure,නු ඒකක
 DocType: Manufacturing Settings,Allow Production on Holidays,නිවාඩු දින නිෂ්පාදන ඉඩ දෙන්න
 DocType: Sales Invoice,Customer's Purchase Order Date,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක් දිනය
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,කැපිටල් කොටස්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,කැපිටල් කොටස්
 DocType: Shopping Cart Settings,Show Public Attachments,රාජ්ය ඇමුණුම් පෙන්වන්න
 DocType: Packing Slip,Package Weight Details,පැකේජය සිරුරේ බර විස්තර
 DocType: Restaurant Reservation,Reservation Time,වෙන් කර ගත හැකි කාලය
@@ -5948,7 +5993,7 @@
 DocType: Purchase Order,To Receive and Bill,පිළිගන්න සහ පනත් කෙටුම්පත
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,පේළිය # {0}: දිනය අනුව නැවත ලබා ගත හැක
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,විශේෂාංග නිෂ්පාදන
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,නිර්මාණකරුවා
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,නිර්මාණකරුවා
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,නියමයන් හා කොන්දේසි සැකිල්ල
 DocType: Serial No,Delivery Details,සැපයුම් විස්තර
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},වර්ගය {1} සඳහා බදු පේළියක {0} පිරිවැය මධ්යස්ථානය අවශ්ය වේ
@@ -5958,20 +6003,20 @@
 DocType: Driver,Expiry Date,කල්පිරෙන දිනය
 DocType: Healthcare Settings,Employee name and designation in print,සේවක නම සහ තනතුර මුද්රණය කර ඇත
 ,accounts-browser,ගිණුම්-බ්රවුසරය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,කරුණාකර පළමු ප්රවර්ගය තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,කරුණාකර පළමු ප්රවර්ගය තෝරන්න
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ව්යාපෘති ස්වාමියා.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","අධික ලෙස බිල් ෙහෝ අධික ලෙස ඇනවුම් කිරීම කොටස් සැකසුම් හෝ විෂය තුළ, යාවත්කාලීන &quot;දීමනාව&quot; ඉඩ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,මුදල් ලබන $ ආදිය මෙන් කිසිදු සංකේතයක් පෙන්වන්න එපා.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(අඩක් දිනය)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(අඩක් දිනය)
 DocType: Payment Term,Credit Days,ක්රෙඩිට් දින
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,කරුණාකර පරීක්ෂණය සඳහා රෝගීන් තෝරා ගන්න
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,ඉදිරියට ඇති කාලය දින
 DocType: Cash Flow Mapping,Is Income Tax Expense,ආදායම් බදු වියදම
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"ශිෂ්ය ආයතනයේ නේවාසිකාගාරය පදිංචි, නම් මෙම පරීක්ෂා කරන්න."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
 ,Stock Summary,කොටස් සාරාංශය
@@ -5982,10 +6027,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ref දිනය
 DocType: Employee,Reason for Leaving,බැහැරවීම හේතුව
 DocType: BOM Operation,Operating Cost(Company Currency),මෙහෙයුම් වියදම (සමාගම ව්යවහාර මුදල්)
-DocType: Employee Loan Application,Rate of Interest,පොලී අනුපාතය
+DocType: Loan Application,Rate of Interest,පොලී අනුපාතය
 DocType: Expense Claim Detail,Sanctioned Amount,අනුමැතිය ලත් මුදල
 DocType: Item,Shelf Life In Days,දිවා රාත්රි ජීවිත කාලය
 DocType: GL Entry,Is Opening,විවෘත වේ
+DocType: Department,Expense Approvers,වියදම් අනුමැති
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ෙරෝ {0}: හර සටහන ඇති {1} සමග සම්බන්ධ විය නොහැකි
 DocType: Journal Entry,Subscription Section,දායකත්ව අංශය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,ගිණුම {0} නොපවතියි
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 880fe59..719853e 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Hodnotiace správy
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Zákaznícke produkty
-DocType: Purchase Receipt,Subscription Detail,Podrobnosti upísania
 DocType: Supplier Scorecard,Notify Supplier,Informujte dodávateľa
 DocType: Item,Customer Items,Zákazník položky
 DocType: Project,Costing and Billing,Kalkulácia a fakturácia
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mailová upozornění
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ohodnotenie
 DocType: Item,Default Unit of Measure,Predvolená merná jednotka
 DocType: SMS Center,All Sales Partner Contact,Všechny Partneři Kontakt
-DocType: Employee,Leave Approvers,Schvaľovatelia priepustiek
+DocType: Department,Leave Approvers,Schvaľovatelia priepustiek
 DocType: Sales Partner,Dealer,Dealer
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,vyšetrovania
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Skontrolovať dostupnosť
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,To je založené na transakciách proti tomuto dodávateľovi. Pozri časovú os nižšie podrobnosti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Právne
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Aktuálny typ daň nemôže byť zahrnutý v cene Položka v riadku {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Právne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Aktuálny typ daň nemôže byť zahrnutý v cene Položka v riadku {0}
 DocType: Bank Guarantee,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
 DocType: Delivery Note,Return Against Delivery Note,Návrat Proti dodací list
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankový účet nemôže byť pomenovaný {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Neexistujú žiadne predložené platobné klacky na spracovanie.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Neexistujú žiadne predložené platobné klacky na spracovanie.
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ukázať otvorené
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,"Je nevyhnutné, aby sa toto opatrenie vykonalo už dnes samo osebe v súvislosti s vyššie uvedeným opakovaním"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Odhlásiť sa
 DocType: Pricing Rule,Apply On,Aplikujte na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Support Settings,Support Settings,nastavenie podporných
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Leave Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Batch Item Zánik Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Návrh
 DocType: Membership,membership validaty section,platnosť členstva
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 DocType: Consultation,Consultation,Konzultácia
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Vytváranie webových stránok
 DocType: Opening Invoice Creation Tool Item,Quantity,Množstvo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Účty tabuľka nemôže byť prázdne.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Úvěry (závazky)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Účty tabuľka nemôže byť prázdne.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 DocType: Item,Country of Origin,Krajina pôvodu
 DocType: Soil Texture,Soil Texture Criteria,Kritériá textúry pôdy
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Priame kontaktné údaje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otvorené problémy
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 DocType: Lab Test Groups,Add new line,Pridať nový riadok
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Oneskorenie s platbou (dni)
@@ -89,7 +85,7 @@
 ,Delay Days,Oneskorené dni
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktúra
+DocType: Subscription Invoice,Invoice,Faktúra
 DocType: Purchase Invoice Item,Item Weight Details,Podrobnosti o položke hmotnosti
 DocType: Asset Maintenance Log,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Řádek # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Řádek # {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulácie Čiastka
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Prosím, vyberte cenník"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Work in Progress
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte dátum"
 DocType: Daily Work Summary Group,Holiday List,Dovolená Seznam
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Účtovník
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Účtovník
 DocType: Hub Settings,Selling Price List,Cenník predaja
 DocType: Patient,Tobacco Current Use,Súčasné používanie tabaku
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Predajná sadzba
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Predajná sadzba
 DocType: Cost Center,Stock User,Používateľ skladu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefónne číslo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nový {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Odoslané pôvodné oznámenie o e-maile
 ,Sales Partners Commission,Obchodní partneři Komise
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Hodnota po odpisoch
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,príbuzný
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Dátum návštevnosť nemôže byť nižšia ako spojovacie dáta zamestnanca
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Dátum návštevnosť nemôže byť nižšia ako spojovacie dáta zamestnanca
 DocType: Grading Scale,Grading Scale Name,Stupnica Name
-DocType: Subscription,Repeat on Day,Opakujte v deň
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: Sales Invoice,Company Address,Adresa spoločnosti
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
+DocType: Subscription,Subscription Start Date,Dátum začiatku odberu
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripojiť CSV súbor s dvomi stĺpci, jeden pre starý názov a jeden pre nový názov"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} žiadnym aktívnym fiškálny rok.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, Kód položky: {1} a zákazník: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Dátum ukončenia skúšobného obdobia nemôže byť pred začiatkom skúšobného obdobia
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},Kusovník nie je špecifikovaný pre subdodávateľskú položku {0} v riadku {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Patient,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nepovolené pre {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Získať predmety z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Získať predmety z
 DocType: Price List,Price Not UOM Dependant,Cena nie je závislá od UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Typ dane
 ,Completed Work Orders,Dokončené pracovné príkazy
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Zdaniteľná čiastka
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Zdaniteľná čiastka
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riadok # {0}: Typ referenčného dokumentu musí byť jeden z nárokov na výdaj alebo denníka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,select BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Riadok # {0}: Typ referenčného dokumentu musí byť jeden z nárokov na výdaj alebo denníka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Správa sumy preddavku poskytnutej zamestnancovi
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Oznámenie o doručení
 DocType: Journal Entry,Opening Entry,Otevření Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Účet Pay Iba
-DocType: Employee Loan,Repay Over Number of Periods,Splatiť Over počet období
+DocType: Loan,Repay Over Number of Periods,Splatiť Over počet období
 DocType: Stock Entry,Additional Costs,Dodatočné náklady
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 DocType: Education Settings,Validate Batch for Students in Student Group,Overenie dávky pre študentov v študentskej skupine
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Žiadny záznam dovolenka nájdené pre zamestnancov {0} na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Žiadny záznam dovolenka nájdené pre zamestnancov {0} na {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosím, najprv zadajte spoločnosť"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Prosím, vyberte najprv firmu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Prosím, vyberte najprv firmu"
 DocType: Employee Education,Under Graduate,Za absolventa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Nastavte predvolenú šablónu pre možnosť Ohlásiť stav upozornenia v nastaveniach ľudských zdrojov.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Pôžička zamestnanca
 DocType: Fee Schedule,Send Payment Request Email,Poslať e-mail s požiadavkou na platbu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nemovitost
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Úspešné zrušenie registrácie.
 DocType: Assessment Result,Grade,stupeň
 DocType: Restaurant Table,No of Seats,Počet sedadiel
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ak chcete pridať dynamický objekt, použite značky ako napríklad <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: Asset Maintenance Task,Asset Maintenance Task,Úloha údržby majetku
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Ročné Plat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Ročné Plat
 DocType: Daily Work Summary,Daily Work Summary,Denná práca Súhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Náklady na skladovanie
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Náklady na skladovanie
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Vyberte položku Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Vyberte položku Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Prosím, zadajte Preferred Kontaktný e-mail"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Prosím, zadajte Preferred Kontaktný e-mail"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Primárna adresa
 DocType: Production Plan,Material Request Detail,Podrobnosti o vyžiadaní materiálu
 DocType: Selling Settings,Default Quotation Validity Days,Predvolené dni platnosti cenovej ponuky
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,zmena Suma
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kategórie vodičských preukazov
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Zadajte dátum doručenia
 DocType: Depreciation Schedule,Make Depreciation Entry,Urobiť Odpisy Entry
+DocType: HR Settings,Leave Settings,Nechajte nastavenia
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Vytvoriť zamestnanca
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Nastavovací režim POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Zakazuje vytváranie časových denníkov proti pracovným príkazom. Operácie sa nesmú sledovať proti pracovnému príkazu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Provedení
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Asset Maintenance Log,Maintenance Status,Status Maintenance
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Podrobnosti o členstve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodávateľ je potrebná proti zaplatení účtu {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Celkom hodín: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Drug Prescription,Interval,interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,prednosť
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,prednosť
 DocType: Grant Application,Individual,Individuální
 DocType: Academic Term,Academics User,akademici Užívateľ
 DocType: Cheque Print Template,Amount In Figure,Na obrázku vyššie
-DocType: Employee Loan Application,Loan Info,pôžička Informácie
+DocType: Loan Application,Loan Info,pôžička Informácie
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Termín dodacieho obdobia dodávateľa
 DocType: Share Transfer,Share Transfer,Prenos podielu
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Šablóna položky
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,biochémie
 DocType: Job Offer,Select Terms and Conditions,Vyberte Podmienky
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,limitu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,limitu
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 DocType: Production Plan,Sales Orders,Predajné objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Výchozí Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televize
 DocType: Work Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Vyberte zákazníka alebo dodávateľa.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Enable Perpetual Inventory,Povoliť trvalý inventár
+DocType: Bank Guarantee,Charges Incurred,Poplatky vzniknuté
 DocType: Company,Default Payroll Payable Account,"Predvolené mzdy, splatnú Account"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Aktualizácia e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Vlastný výsledok
 DocType: Delivery Stop,Contact Name,Meno kontaktu
 DocType: Course Assessment Criteria,Course Assessment Criteria,Hodnotiace kritériá kurz
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ID dane:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ID dane:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Študentská karta:
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Land Unit,Land Unit describing various land assets,Pozemná jednotka popisujúca rôzne pozemkové aktíva
@@ -375,9 +372,8 @@
 ,Open Work Orders,Otvorte pracovné príkazy
 DocType: Payment Term,Credit Months,Kreditné mesiace
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Čistý Pay nemôže byť nižšia ako 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ak chcete zastaviť odosielanie upozornení na opakované chyby zo systému, v odberu sme skontrolovali pole Zakázané"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Listy za rok
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Listy za rok
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Email Digest,Profit & Loss,Zisk & Strata
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Nastavte prosím študentov pod študentskými skupinami
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,bankový Príspevky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,bankový Príspevky
 DocType: Crop,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Inventúrna položka
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Študent Group Creation Tool ihrisko
 DocType: Lead,Do Not Contact,Nekontaktujte
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Ľudia, ktorí vyučujú vo vašej organizácii"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Course Scheduling Tool,Course Start Date,Začiatok Samozrejme Dátum
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Požiadavka na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Požiadavka na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Nákupné podrobnosti
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max stupeň
 DocType: Email Digest,New Quotations,Nové Citace
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-maily výplatnej páske, aby zamestnanci na základe prednostného e-mailu vybraného v zamestnaneckých"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Tax Rule,Shipping County,Okres dodania
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Učenie
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Učenie
 DocType: Asset,Next Depreciation Date,Vedľa Odpisy Dátum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnosť na jedného zamestnanca
 DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikajúci Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Driver,Fleet Manager,fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Riadok # {0}: {1} nemôže byť negatívne na {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Riadok # {0}: {1} nemôže byť negatívne na {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Zlé Heslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Prosím, nastavte sadzbu izby hotela na {}"
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktúry
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Dodací list
 DocType: Consultation,Encounter Impression,Zaznamenajte zobrazenie
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Náklady predaných aktív
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozrejme Plánovanie Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgentné] Chyba pri vytváraní opakujúcich sa% s pre% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
 DocType: Land Unit,LInked Analysis,Llnked Analysis
 DocType: Item Tax,Tax Rate,Sadzba dane
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Obdobie žiadosti nemôže prebiehať medzi dvoma alokačnými záznamami
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Obdobie žiadosti nemôže prebiehať medzi dvoma alokačnými záznamami
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Prijaté
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvorenie skupiny študentov
 DocType: Volunteer,Weekends,víkendy
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Výška úverovej poznámky
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Výška úverovej poznámky
 DocType: Setup Progress Action,Action Document,Akčný dokument
 DocType: Chapter Member,Website URL,URL webu
 ,Finished Goods,Hotové zboží
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Pridať položky
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
+DocType: Leave Application,Leave Approver Name,Meno schvaľovateľa priepustky
 DocType: Depreciation Schedule,Schedule Date,Plán Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Zisk, rabaty a ostatné súčasti Plat"
 DocType: Packed Item,Packed Item,Zabalená položka
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
 DocType: Healthcare Settings,Require Lab Test Approval,Vyžadovať schválenie testu laboratória
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Celkom nevybavené
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Celkom nevybavené
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 DocType: Dosage Strength,Strength,pevnosť
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Vytvoriť nový zákazník
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Spotrebné náklady
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
 DocType: Student Log,Medical,Lékařský
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Aktualizovať číslo účtu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Získateľ Obchodnej iniciatívy nemôže byť to isté ako Obchodná iniciatíva
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Pridelená suma nemôže väčšie ako množstvo neupravené
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Slobodný/á
 DocType: Salary Slip,Total Loan Repayment,celkové splátky
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Subscription,Yearly,Ročne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadajte nákladové stredisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Prosím, zadajte nákladové stredisko"
 DocType: Drug Prescription,Dosage,dávkovanie
 DocType: Journal Entry Account,Sales Order,Predajné objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Prodej Rate
 DocType: Assessment Plan,Examiner Name,Meno Examiner
 DocType: Lab Test Template,No Result,žiadny výsledok
 DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a Sadzba
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosím, zadajte najprv názov spoločnosti"
 DocType: Purchase Invoice,Supplier Name,Názov dodávateľa
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Prečítajte si ERPNext Manuál
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Zobraziť listy všetkých členov katedry v kalendári
 DocType: Purchase Invoice,01-Sales Return,01-Sales Return
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,čaká objednávok
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Povinná oblasť - akademický rok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nie je priradená k {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Nastavte predvolený splatný účet pre spoločnosť {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Nastavte predvolený splatný účet pre spoločnosť {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakcia nie je povolená proti zastavenej pracovnej zákazke {0}
 DocType: Setup Progress Action,Min Doc Count,Minimálny počet dokladov
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslané na
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Zamestnanecký záznam sa vytvorí použitím vybraného poľa
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Vyhradené pre predaj
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metódu oceňovania nemožno zmeniť, pretože existujú transakcie proti niektorým položkám, ktoré nemajú vlastnú metódu oceňovania"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metódu oceňovania nemožno zmeniť, pretože existujú transakcie proti niektorým položkám, ktoré nemajú vlastnú metódu oceňovania"
 DocType: Student Report Generation Tool,Attended by Parents,Zúčastnili sa rodičia
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Patient,AB Positive,AB Pozitívny
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponentov pre mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
-DocType: Employee Loan,Total Payment,celkové platby
+DocType: Loan,Total Payment,celkové platby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Pre dokončenú pracovnú zákazku nie je možné zrušiť transakciu.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi operáciou (v min)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je zrušená, takže akciu nemožno dokončiť"
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosť Časti vybudovať
 DocType: POS Profile User,POS Profile User,Používateľ profilu POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
+DocType: Subscription Invoice,Subscription Invoice,Faktúra odberu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Přímý příjmů
 DocType: Patient Appointment,Date TIme,Dátum Čas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Založenie spoločnosti a dane
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
 DocType: Codification Table,Codification Table,Kodifikačná tabuľka
 DocType: Timesheet Detail,Hrs,hod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Prosím, vyberte spoločnosť"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Prosím, vyberte spoločnosť"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 DocType: Purchase Invoice,Supplier GSTIN,Dodávateľ GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Šablóna mapovania peňažných tokov
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
+DocType: Bank Guarantee,Providing,ak
 DocType: Account,Profit and Loss,Zisk a strata
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ak nie je povolené, nakonfigurujte podľa potreby šablónu Lab Test"
 DocType: Patient,Risk Factors,Rizikové faktory
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
 DocType: Healthcare Settings,Appointment Confirmation,Potvrdenie menovania
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Uzavření (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Ahoj
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Posunúť položku
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",Už bolo nastavené predvolené nastavenie profilu {0} pre používateľa {1}
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,neuhradená Hodnoty
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Územie je vyžadované v POS profile
 DocType: Supplier,Prevent RFQs,Zabráňte RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Vytvoriť prijatú objednávku
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Zápis platu bol odoslaný na obdobie od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Zápis platu bol odoslaný na obdobie od {0} do {1}
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Dátum zasielania účtov
 DocType: Production Plan,Production Plan,Výrobný plán
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvorenie nástroja na tvorbu faktúr
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by nemala byť menšia ako ktoré už boli schválené listy {1} pre obdobie
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Nastavte počet v transakciách na základe sériového č. Vstupu
 ,Total Stock Summary,Súhrnné zhrnutie zásob
 DocType: Announcement,Posted By,Pridané
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte spoločnosť
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavte spoločnosť
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Fakturovaná čiastka
 DocType: Training Result Employee,Training Result Employee,vzdelávacie Výsledok
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
-DocType: Repayment Schedule,Principal Amount,istina
-DocType: Employee Loan Application,Total Payable Interest,Celková splatný úrok
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,istina
+DocType: Loan Application,Total Payable Interest,Celková splatný úrok
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Celkom nevybavené: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Predajná faktúry časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervácia reštaurácie
 DocType: Land Unit,Land Unit Name,Názov pozemku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukcie
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Zahaliť
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Informujte zákazníkov prostredníctvom e-mailu
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Informujte zákazníkov prostredníctvom e-mailu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ďalšia predaja osoba {0} existuje s rovnakým id zamestnanca
 DocType: Employee Advance,Claimed Amount,Požadovaná suma
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Platobná brána účet nevytvorili, prosím, vytvorte ručne."
 DocType: Supplier Scorecard,Per Year,Za rok
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nie je oprávnený na prijatie do tohto programu podľa DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Sales Invoice,Sales Taxes and Charges,Dane z predaja a poplatky
 DocType: Employee,Organization Profile,Profil organizace
 DocType: Vital Signs,Height (In Meter),Výška (v metre)
 DocType: Student,Sibling Details,súrodenec Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozidiel
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automaticky spúšťa žiadosť o spätné väzby na základe podmienok.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automaticky spúšťa žiadosť o spätné väzby na základe podmienok.
 DocType: Employee,Reason for Resignation,Důvod rezignace
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Šablona pro hodnocení výkonu.
 DocType: Sales Invoice,Credit Note Issued,dobropisu vystaveného
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Čistá Zmena stavu zásob
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Zamestnanec úveru Vedenie
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Súvislosť s Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manažér
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manažér
 DocType: Payment Entry,Payment From / To,Platba od / do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavte si účet v službe Warehouse {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nepodarilo sa nájsť cestu pre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Opening (Dr)
+DocType: Loan,Applicant,žiadateľ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Vytvárať opakujúce sa dokumenty
 ,GST Itemised Purchase Register,Registrovaný nákupný register spoločnosti GST
 DocType: Course Scheduling Tool,Reschedule,presunúť
-DocType: Employee Loan,Total Interest Payable,Celkové úroky splatné
+DocType: Loan,Total Interest Payable,Celkové úroky splatné
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Work Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Skončiť
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Základ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Základ
 DocType: Timesheet,Total Billed Hours,Celkom Predpísané Hodiny
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Odepsat Částka
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Odepsat Částka
 DocType: Leave Block List Allow,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / straty na majetku likvidáciu
 DocType: Vehicle Log,Service Details,Podrobnosti o službe
 DocType: Vehicle Log,Service Details,Podrobnosti o službe
-DocType: Subscription,Quarterly,Čtvrtletně
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,zoskupené
 DocType: Selling Settings,Delivery Note Required,Dodací list povinný
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Časový rozvrh
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,So spätným suroviny na základe
 DocType: Sales Invoice,Port Code,Port Code
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervný sklad
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervný sklad
 DocType: Lead,Lead is an Organization,Vedenie je organizácia
 DocType: Guardian Interest,Interest,záujem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Predpredaj
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Hodnota počítadla kilometrov (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Šablóny kritérií kritérií pre dodávateľa.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Vstup Platba je už vytvorili
 DocType: Request for Quotation,Get Suppliers,Získajte dodávateľov
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview výplatnej páske
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview výplatnej páske
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} bol zadaný viackrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Môžete obnoviť iba vtedy, ak vaše členstvo uplynie do 30 dní"
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Vyberte len, ak máte nastavené dokumenty Mapper Cash Flow"
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Supplier Scorecard,Per Week,Za týždeň
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Celkový počet študentov
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Hodnota na zásobách
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Spoločnosť a účty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,v Hodnota
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,v Hodnota
 DocType: Asset Settings,Depreciation Options,Možnosti odpisovania
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Neplatný čas odoslania
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Neplatný čas odoslania
 DocType: Lead,Campaign Name,Název kampaně
 DocType: Hotel Room,Capacity,kapacita
 DocType: Selling Settings,Close Opportunity After Days,Close Opportunity po niekoľkých dňoch
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Budget,Budget Against,rozpočet Proti
 DocType: Employee,Cell Number,Číslo buňky
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pre dané kritériá neexistuje žiadny zamestnanec. Skontrolujte, či ešte neboli vytvorené platobné kľúče."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pre dané kritériá neexistuje žiadny zamestnanec. Skontrolujte, či ešte neboli vytvorené platobné kľúče."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte tabuľku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v priečinku &quot;Príjemcovia&quot;
 DocType: Special Test Items,Particulars,podrobnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Asset,Maintenance,Údržba
+DocType: Subscriber,Subscriber,predplatiteľ
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Aktualizujte stav projektu
 DocType: Item,Maximum sample quantity that can be retained,"Maximálne množstvo vzorky, ktoré možno uchovať"
@@ -1077,26 +1073,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Pridať Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset vyhodený cez položka denníka {0}
-DocType: Employee Loan,Interest Income Account,Účet Úrokové výnosy
+DocType: Loan,Interest Income Account,Účet Úrokové výnosy
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Recenzia pozvánky odoslaná
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Náklady Office údržby
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Ísť do
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavenie e-mailového konta
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Prosím, najprv zadajte položku"
 DocType: Asset Repair,Downtime,prestoje
 DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademický termín:
 DocType: Salary Detail,Do not include in total,Nezaradenie celkom
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Množstvo vzorky {0} nemôže byť väčšie ako prijaté množstvo {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Nie je zvolený cenník
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Nie je zvolený cenník
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odoslať email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 DocType: Item,Max Sample Quantity,Max. Množstvo vzoriek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nemáte oprávnenie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nemáte oprávnenie
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Požadovaná citácia
 DocType: Vital Signs,Heart Rate / Pulse,Srdcová frekvencia / pulz
 DocType: Company,Default Bank Account,Prednastavený Bankový účet
@@ -1107,12 +1103,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratórne testy a vitálne znaky
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail bankového odsúhlasenia
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenájdený žiadny zamestnanec
-DocType: Subscription,Stopped,Zastavené
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Skupina študentov je už aktualizovaná.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Skupina študentov je už aktualizovaná.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Aktualizácia projektu.
 DocType: SMS Center,All Customer Contact,Všetky Kontakty Zákazníka
 DocType: Land Unit,Tree Details,Tree Podrobnosti
@@ -1162,7 +1157,6 @@
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Všechny skupiny položek
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Work Order,Item To Manufacture,Bod K výrobě
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} stav je {2}
@@ -1176,7 +1170,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Znovu zvoľte, ak je zvolená adresa upravená po uložení"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
 DocType: Item,Hub Publishing Details,Podrobnosti o publikovaní Hubu
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Otváranie"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Otváranie"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,otvorená robiť
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Lab Test Template,Result Format,Formát výsledkov
@@ -1186,7 +1180,7 @@
 DocType: Payroll Entry,Bimonthly,dvojmesačne
 DocType: Vehicle Service,Brake Pad,Brzdová doštička
 DocType: Fertilizer,Fertilizer Contents,Obsah hnojiva
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Výzkum a vývoj
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
 DocType: Timesheet,Total Billed Amount,Celková suma Fakturovaný
@@ -1200,7 +1194,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Zablokujte kontrolu kreditného limitu na objednávke
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Hodnocení výkonu.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolenie &quot;použitia na nákupného košíka&quot;, ako je povolené Nákupný košík a tam by mala byť aspoň jedna daňové pravidlá pre Košík"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je prepojený na objednávku {1}, skontrolujte, či by mal byť ťahaný za pokrok v tejto faktúre."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je prepojený na objednávku {1}, skontrolujte, či by mal byť ťahaný za pokrok v tejto faktúre."
 DocType: Sales Invoice Item,Stock Details,Detaily zásob
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Mieste predaja
@@ -1234,7 +1228,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimálne sedenie
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetrenie Výsledok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referenčná DOCTYPE musí byť jedným z {0}
@@ -1242,15 +1236,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Work Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Pre prenos nie sú k dispozícii žiadne položky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Pre prenos nie sú k dispozícii žiadne položky
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Uzávierka (otvorenie + celkom)
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Najprv vyberte typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016
 DocType: Pricing Rule,Rate or Discount,Sadzba alebo zľava
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Obľúbené
 DocType: Hub Settings,Custom Data,Vlastné údaje
@@ -1262,9 +1256,9 @@
 DocType: Medical Code,Medical Code Standard,Štandardný zdravotnícky kód
 DocType: Soil Texture,Clay Composition (%),Zloženie hliny (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Uložte pred udelením úlohy.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Hodnota zostatku
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Hodnota zostatku
 DocType: Lab Test,Lab Technician,Laboratórny technik
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Predajný cenník
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Predajný cenník
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ak je začiarknuté, vytvorí sa zákazník, zmapovaný na pacienta. Faktúry pacienta budú vytvorené voči tomuto zákazníkovi. Môžete tiež vybrať existujúceho zákazníka pri vytváraní pacienta."
 DocType: Bank Reconciliation,Account Currency,Mena účtu
@@ -1272,16 +1266,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Prosím, uveďte zaokrúhliť účet v spoločnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zamestnanec {0} nie je aktívny alebo neexistuje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Zamestnanec {0} nie je aktívny alebo neexistuje
 DocType: Fee Structure,Components,komponenty
 DocType: Item Barcode,Item Barcode,Položka Barcode
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",ktoré sa majú generovať. Pri oneskorení budete musieť ručne zmeniť pole &quot;Opakovať v deň dňa&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
 DocType: Share Transfer,From Folio No,Z Folio č
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
@@ -1316,16 +1308,17 @@
 DocType: Asset,Available-for-use Date,Dátum k dispozícii na použitie
 DocType: Guardian,Guardian Name,Meno Guardian
 DocType: Cheque Print Template,Has Print Format,Má formát tlače
-DocType: Employee Loan,Sanctioned,Sankcionované
+DocType: Loan,Sanctioned,Sankcionované
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možno, Zmenáreň záznam nie je vytvorená pre"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 DocType: Crop Cycle,Crop Cycle,Orezový cyklus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pre &quot;produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo&quot; Balenie zoznam &#39;tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek &quot;Výrobok balík&quot; položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do &quot;Balenie zoznam&quot; tabuľku."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pre &quot;produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo&quot; Balenie zoznam &#39;tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek &quot;Výrobok balík&quot; položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do &quot;Balenie zoznam&quot; tabuľku."
 DocType: Student Admission,Publish on website,Publikovať na webových stránkach
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
+DocType: Subscription,Cancelation Date,Dátum zrušenia
 DocType: Purchase Invoice Item,Purchase Order Item,Položka nákupnej objednávky
 DocType: Agriculture Task,Agriculture Task,Úloha poľnohospodárstva
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Nepřímé příjmy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Nepřímé příjmy
 DocType: Student Attendance Tool,Student Attendance Tool,Študent Účasť Tool
 DocType: Restaurant Menu,Price List (Auto created),Cenník (vytvorený automaticky)
 DocType: Cheque Print Template,Date Settings,dátum Nastavenie
@@ -1352,6 +1345,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,meter
 DocType: Workstation,Electricity Cost,Cena elektřiny
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Laboratórne testovanie dátumu nemôže byť pred dátumom zberu
+DocType: Subscription Plan,Cost,náklady
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 DocType: Expense Claim,Total Advance Amount,Celková čiastka preddavku
 DocType: Delivery Stop,Estimated Arrival,Odhadovaný príchod
@@ -1363,14 +1357,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
 DocType: Timesheet Detail,Bill,Účtenka
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Biela
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riadok {0}: Množstvo nie je k dispozícii pre {4} v sklade {1} pri účtovaní čas zápisu ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,V zozname začiarkavacích políčok môžete vybrať maximálne jednu možnosť.
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 DocType: Item,Automatically Create New Batch,Automaticky vytvoriť novú dávku
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Priradenie {0} do {1} (riadok {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Urobiť
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Priradenie {0} do {1} (riadok {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Urobiť
 DocType: Student Admission,Admission Start Date,Vstupné Dátum začatia
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nový zamestnanec
@@ -1386,7 +1380,7 @@
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 DocType: Repayment Schedule,Balance Loan Amount,Bilancia Výška úveru
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Možnosti zásob
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Možnosti zásob
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Zakázať načítanie posledných detailov nákupu v objednávke
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Naozaj chcete obnoviť tento vyradený aktívum?
@@ -1405,11 +1399,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostný / Bankový účet
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Zadajte {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Tvorba variantu bola zaradená do frontu.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Súhrn práce pre {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Atribút tabuľka je povinné
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvý prideľovač odchýlok v zozname bude nastavený ako predvolený neprístupný.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Plan,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nemôže byť záporné
 DocType: Training Event,Self-Study,Samoštúdium
@@ -1422,7 +1417,7 @@
 DocType: Workstation,Wages,Mzdy
 DocType: Asset Maintenance,Maintenance Manager Name,Názov správcu údržby
 DocType: Agriculture Task,Urgent,Naléhavý
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Zadajte platný riadok ID riadku tabuľky {0} {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Zadajte platný riadok ID riadku tabuľky {0} {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nepodarilo sa nájsť premennú:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Vyberte pole, ktoré chcete upraviť z čísla"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Nemôže byť položka fixného majetku, pretože je vytvorená účtovná kniha."
@@ -1434,7 +1429,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Názov šablóny inšpekcie kvality
 DocType: Project,First Email,Prvý e-mail
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Predajná čiastka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Predajná čiastka
 DocType: Repayment Schedule,Interest Amount,záujem Suma
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Share Transfer,Issue,Problém
@@ -1448,10 +1443,10 @@
 DocType: Tax Rule,Shipping State,Prepravné State
 ,Projected Quantity as Source,Množstvo projekciou as Zdroj
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Výlet z dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Výlet z dodávky
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Typ prenosu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Predajné náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Predajné náklady
 DocType: Consultation,Diagnosis,diagnóza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Štandardný nákup
 DocType: GL Entry,Against,Proti
@@ -1460,12 +1455,13 @@
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Predajné objednávky {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Vyberte účet úrokového príjmu v úvere {0}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Tvorba prírastkov zásob
 DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Percento príspevkoch
-DocType: Employee Loan,Repayment Schedule,splátkový kalendár
+DocType: Loan,Repayment Schedule,splátkový kalendár
 DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
@@ -1480,7 +1476,7 @@
 DocType: Education Settings,Attendance Freeze Date,Účasť
 DocType: Education Settings,Attendance Freeze Date,Účasť
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Zobraziť všetky produkty
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Zobraziť všetky produkty
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimálny vek vedenia (dni)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimálny vek vedenia (dni)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,všetky kusovníky
@@ -1489,14 +1485,16 @@
 DocType: Expense Claim,From Employee,Od Zaměstnance
 DocType: Driver,Cellphone Number,Mobilné číslo
 DocType: Project,Monitor Progress,Monitorovanie pokroku
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
+DocType: Supplier Quotation,Auto Repeat Section,Sekcia Auto Repeat
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 DocType: Program Enrollment,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,neplatný Atribút
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Množstvo musí byť menší ako alebo rovný {0}
+DocType: Department Approver,Department Approver,Schôdza oddelenia
 DocType: SMS Center,Total Characters,Celkový počet znaků
 DocType: Employee Advance,Claimed,vyhlasoval
 DocType: Crop,Row Spacing,Rozstup riadkov
@@ -1506,6 +1504,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Příspěvek%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Podľa nákupných nastavení, ak je objednávka požadovaná == &#39;ÁNO&#39;, potom pre vytvorenie nákupnej faktúry musí používateľ najprv vytvoriť nákupnú objednávku pre položku {0}"
+,HSN-wise-summary of outward supplies,HSN-múdre zhrnutie vonkajších dodávok
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
@@ -1519,7 +1518,7 @@
 DocType: Setup Progress Action,Action Name,Názov akcie
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začiatočný rok
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Prvé dve číslice GSTIN by sa mali zhodovať so stavovým číslom {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Datum období současného faktury je Začátek
 DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Plánovanie kapacít Chyba
@@ -1537,26 +1536,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polia budú kopírované iba v čase vytvorenia.
 DocType: Setup Progress Action,Domains,Domény
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Manažment
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Manažment
 DocType: Cheque Print Template,Payer Settings,nastavenie platcu
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,pozor
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Začiatočný deň je väčší ako koniec dňa v úlohe &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Return / ťarchopis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Return / ťarchopis
 DocType: Price List Country,Price List Country,Cenník Krajina
 DocType: Item,UOMs,Merné Jednotky
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor konverzie MJ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Prosím, zadajte kód položky sa dostať číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-DocType: Employee Loan,Partially Disbursed,čiastočne Vyplatené
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Poskytnite informácie.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Poskytnite informácie.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Predplatné, ktoré nie je zrušené, nemôžete reštartovať."
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 DocType: Fee Validity,Valid Till,Platný do
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Celkové stretnutie učiteľov rodičov
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
@@ -1569,7 +1568,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Zmena zákazníckej skupiny pre vybraného zákazníka nie je povolená.
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Aktualizácia predpokladaných časov príchodu.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizácia predpokladaných časov príchodu.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o registrácii
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vyberte zákazníka
@@ -1590,18 +1589,20 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuálny fiškálny rok
 DocType: Purchase Order,Group same items,Skupina rovnaké položky
 DocType: Purchase Invoice,Disable Rounded Total,Zakázat Zaoblený Celkem
-DocType: Employee Loan Application,Repayment Info,splácanie Info
+DocType: Department,Parent Department,Rodičovské oddelenie
+DocType: Loan Application,Repayment Info,splácanie Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
 DocType: Maintenance Team Member,Maintenance Role,Úloha údržby
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Nastavenia pre modul Zamestnanci
 DocType: Sales Order,SO-,PO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Používateľ rezervácie hotelov
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Výzkum
+DocType: Subscription Settings,Subscription Settings,Nastavenia odberu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Uveďte aspoň jeden atribút v tabuľke atribúty
 DocType: Announcement,All Students,všetci študenti
@@ -1612,19 +1613,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Položková  skupina s rovnakým názvom už existuje. Prosím, zmeňte názov položky alebo premenujte skupinu položiek"
 DocType: Crop Cycle,Less than a year,Menej ako rok
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Študent Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 DocType: Crop,Yield UOM,Výnos UOM
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
 DocType: Item,Is Item from Hub,Je položka z Hubu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Riadok {0}: typ činnosti je povinná.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividendy platené
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividendy platené
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účtovné Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdiel Suma
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} v službe Leave On {1}
 DocType: Purchase Invoice,Reverse Charge,Spätné nabíjanie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Nerozdelený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Nerozdelený zisk
 DocType: Purchase Invoice,05-Change in POS,05-Zmena POS
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
@@ -1639,12 +1640,12 @@
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 ,Student and Guardian Contact Details,Študent a Guardian Kontaktné údaje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Riadok {0}: Pre dodávateľov je potrebná {0} E-mailová adresa pre odoslanie e-mailu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Dočasné Otvorenie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Dočasné Otvorenie
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Zobraziť Hub
 ,Employee Leave Balance,Zostatok voľna pre zamestnanca
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Zostatok na účte {0} musí byť vždy {1}
 DocType: Patient Appointment,More Info,Více informací
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
 DocType: Supplier Scorecard,Scorecard Actions,Akcie Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Príklad: Masters v informatike
 DocType: Purchase Invoice,Rejected Warehouse,Zamítnuto Warehouse
@@ -1654,7 +1655,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,k
 DocType: Supplier Quotation Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
@@ -1663,9 +1664,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Predpisy pre laboratórne testy
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Malý
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otvorenie položky nástroja na vytvorenie faktúry
 DocType: Education Settings,Employee Number,Počet zaměstnanců
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Zrušiť faktúru po období odkladu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončených
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
@@ -1679,7 +1681,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratórne testovanie
 DocType: Email Digest,Add Quote,Pridať ponuku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Koeficient prepočtu MJ je potrebný k MJ: {0} v bode: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Nepřímé náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 DocType: Agriculture Analysis Criteria,Agriculture,Poľnohospodárstvo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1710,16 +1712,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Najprv nastavte kód položky
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
+DocType: Subscription Plan,Billing Interval Count,Počet fakturačných intervalov
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 DocType: Antibiotic,Antibiotic,antibiotikum
 ,Team Updates,tím Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Vytvoriť formát tlače
@@ -1745,7 +1748,7 @@
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternatívna položka nesmie byť rovnaká ako kód položky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Dokončenie predbežného hodnotenia
 DocType: Salary Slip,Bank Account No.,Číslo bankového účtu
@@ -1762,7 +1765,7 @@
 DocType: BOM Operation,Workstation,pracovna stanica
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žiadosť o cenovú ponuku dodávateľa
 DocType: Healthcare Settings,Registration Message,Registrácia Správa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Technické vybavení
 DocType: Prescription Dosage,Prescription Dosage,Dávkovanie na predpis
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Vyberte spoločnosť
@@ -1793,7 +1796,7 @@
 DocType: Project,Start and End Dates,Dátum začatia a ukončenia
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otvorená BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Project Update,Great/Quickly,Great / Rýchlo
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1802,8 +1805,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Vyberte dávky pre doručenú položku
 DocType: Asset,Depreciation Schedules,odpisy Plány
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Nasledujúce účty môžu byť vybraté v nastaveniach GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Nasledujúce účty môžu byť vybraté v nastaveniach GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,transakčné mena
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1814,6 +1817,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: POS Profile,Campaign,Kampaň
 DocType: Supplier,Name and Type,Názov a typ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Physician,Contacts and Address,Kontakty a adresa
 DocType: Purchase Invoice,Contact Person,Kontaktná osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže byť väčší ako ""Očakávaný Dátum Ukončenia"""
@@ -1827,19 +1831,20 @@
 DocType: Student Admission,Eligibility and Details,Oprávnenosť a podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 DocType: Leave Control Panel,Leave blank if considered for all designations,Nechajte prázdne ak má platiť pre všetky zadelenia
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pre spoločnosť
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žiadosť o cenovú ponuku je zakázaný prístup z portálu pre viac Skontrolujte nastavenie portálu.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Hodnota ukazovateľa skóre skóre dodávateľa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Nákup Částka
 DocType: Sales Invoice,Shipping Address Name,Názov dodacej adresy
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Pri vytváraní kurzov sa vyskytli chyby
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Položka {0} není skladem
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvý odhadovač výdavkov v zozname bude nastavený ako predvolený odhadovač nákladov.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nemôže byť väčšie ako 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
@@ -1860,15 +1865,16 @@
 DocType: Package Code,Package Code,code Package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Učeň
 DocType: Purchase Invoice,Company GSTIN,Spoločnosť GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Záporné množstvo nie je dovolené
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Záporné množstvo nie je dovolené
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Zamestnanec nemôže reportovať sám sebe.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zamestnanec nemôže reportovať sám sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bankový zostatok
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Povolenie odchýlky je povinné v aplikácii zanechať
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
@@ -1896,15 +1902,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Platobný termín na riadku {0} je pravdepodobne duplicitný.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Poľnohospodárstvo (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,List k balíku
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Pronájem kanceláře
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavenie SMS brány
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,List k balíku
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Nastavenie SMS brány
 DocType: Disease,Common Name,Spoločný názov
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
 DocType: Vital Signs,Blood Pressure,Krvný tlak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Predajné podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1914,15 +1920,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Overiť zapísaný kurz pre študentov v študentskej skupine
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Item,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Vláda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Vláda
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na poistné {0} už existuje pre jázd
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Meno Institute
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Prosím, zadajte splácanie Čiastka"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Prosím, zadajte splácanie Čiastka"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Varianty Položky
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Služby
 DocType: HR Settings,Email Salary Slip to Employee,Email výplatnej páske pre zamestnancov
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Zvoľte Možné dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Zvoľte Možné dodávateľa
 DocType: Sales Invoice,Source,Zdroj
 DocType: Customer,"Select, to make the customer searchable with these fields","Vyberte, ak chcete, aby sa zákazník stal pomocou týchto polí"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zobraziť uzatvorené
@@ -1939,7 +1945,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Peňažný tok z investičných
 DocType: Program Course,Program Course,program kurzu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Homepage,Company Tagline for website homepage,Firma fb na titulnej stránke webu
 DocType: Item Group,Item Group Name,Názov položkovej skupiny
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
@@ -1969,10 +1975,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Informácie o členstve
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Zadajte všetky požadované hodnoty výsledkov
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Pohledávky Shrnutí
-DocType: Employee Loan,Monthly Repayment Amount,Mesačné splátky čiastka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Pohledávky Shrnutí
+DocType: Loan,Monthly Repayment Amount,Mesačné splátky čiastka
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Otvorenie faktúr
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte používateľské ID v karte zamestnanca ak chcete umožniť rolu zamestnanca
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte používateľské ID v karte zamestnanca ak chcete umožniť rolu zamestnanca
 DocType: UOM,UOM Name,Názov Mernej Jednotky
 DocType: GST HSN Code,HSN Code,Kód HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Výše příspěvku
@@ -1994,7 +2000,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Používateľ {0} je už pridelený lekárovi {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Krabica
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,možné Dodávateľ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,možné Dodávateľ
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Zdravotníctvo (beta)
@@ -2022,7 +2029,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Výrobné množstvo je povinné
-DocType: Employee Loan,Repayment Method,splácanie Method
+DocType: Loan,Repayment Method,splácanie Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ak je zaškrtnuté, domovská stránka bude východiskový bod skupina pre webové stránky"
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Nároky na náklady firmy.
@@ -2031,7 +2038,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Potrebný certifikát
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Riadok {0}: čas od času aj na čas z {1} sa prekrýva s {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zásoby Pasíva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Zásoby Pasíva
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Vyberte spoločnosť
@@ -2039,7 +2046,7 @@
 DocType: Student Report Generation Tool,Print Section,Tlačiť sekciu
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Používateľ {0} nemá predvolený profil POS. Začiarknite predvolené nastavenie v riadku {1} pre tohto používateľa.
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pre žiadny limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} je povinný vytvoriť faktúry Opening {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Primárna adresa a podrobnosti kontaktu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslať e-mail Payment
@@ -2050,10 +2057,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vyberte aspoň jednu doménu.
 DocType: Dependent Task,Dependent Task,Závislý Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastaviť pripomenutie narodenín
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,hľadanie položky
 DocType: Payment Schedule,Payment Amount,Částka platby
@@ -2063,7 +2070,7 @@
 DocType: Assessment Plan,Grading Scale,stupnica
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,už boli dokončené
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Skladom v ruke
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Skladom v ruke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import byl úspěšný!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Platba Dopyt už existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
@@ -2074,17 +2081,16 @@
 DocType: Quotation Item,Quotation Item,Položka ponuky
 DocType: Customer,Customer POS Id,ID zákazníka POS
 DocType: Account,Account Name,Názov účtu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dátum OD nemôže byť väčší ako dátum DO
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Dátum OD nemôže byť väčší ako dátum DO
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Zadajte URL servera Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 DocType: Share Balance,To No,Nie
-DocType: Subscription,Reference Document,referenčný dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} je zrušená alebo zastavená
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Typ žiadateľa
+DocType: Loan,Applicant Type,Typ žiadateľa
 DocType: Purchase Invoice,03-Deficiency in services,03-Nedostatok služieb
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Predvolený štandard medicínskeho kódu
@@ -2095,13 +2101,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% fakturované
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Odmietnuť
 DocType: Journal Entry Account,Debit in Company Currency,Debetnej v spoločnosti Mena
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Urobiť vyplácanie Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Urobiť vyplácanie Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riadok {0}: Advance proti dodávateľom musí byť odpísať
 DocType: Company,Default Values,Predvolené hodnoty
 DocType: Membership,INR,INR
@@ -2131,10 +2137,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí byť väčšia ako 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Skladom k dispozícii
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Skladom k dispozícii
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánovanie kapacít Pro (dni)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Obstarávanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Žiadna z týchto položiek nemá zmenu v množstve alebo hodnote.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Žiadna z týchto položiek nemá zmenu v množstve alebo hodnote.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Povinné pole - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Povinné pole - Program
 DocType: Special Test Template,Result Component,Zložka výsledkov
@@ -2155,7 +2161,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Zahrnúť dovolenku v listoch sú listy
 DocType: Sales Invoice,Packed Items,Zabalené položky
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reklamační proti sériového čísla
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Celkom&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Celkom&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2173,10 +2179,10 @@
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potvrďte akciu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množstvo alebo Pomer ocenenia, alebo obidve."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množstvo alebo Pomer ocenenia, alebo obidve."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,splnenie
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Zobraziť Košík
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketingové náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Štandardné kritériá sa nedajú vytvoriť. Premenujte kritériá
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
@@ -2199,9 +2205,9 @@
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Material Request,Transferred,prevedená
 DocType: Vehicle,Doors,dvere
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Získať poplatok za registráciu pacienta
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Atribúty nie je možné zmeniť po transakcii s akciami. Vytvorte novú položku a presuňte materiál do novej položky
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Atribúty nie je možné zmeniť po transakcii s akciami. Vytvorte novú položku a presuňte materiál do novej položky
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Daňové rozdelenie
 DocType: Packing Slip,PS-,PS-
@@ -2237,12 +2243,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Zamestnanecké zálohy
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 DocType: Grant Application,Assessment  Mark (Out of 10),Značka hodnotenia (z 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žiadne
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Hlavné
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
@@ -2251,15 +2258,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,ročné náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Vytvoriť odoslanú objednávku
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Vytvoriť odoslanú objednávku
 DocType: SMS Center,Send To,Odoslať na
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Inventúra zásob
 DocType: Territory,Territory Name,Území Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,V predplatnom môžete mať len Plány s rovnakým účtovacím cyklom
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
@@ -2270,10 +2278,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,ocenenie
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Školenia
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Track Leads by Lead Zdroj.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Prosím zadajte
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Prosím zadajte
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Denník údržby
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
@@ -2281,11 +2289,11 @@
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
 DocType: Student Group,Instructors,inštruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} musí být předloženy
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Správa podielov
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Splátka
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Warehouse {0} nie je prepojený s žiadnym účtom, uveďte účet v zozname skladov alebo nastavte predvolený inventárny účet v spoločnosti {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Spravovať svoje objednávky
 DocType: Work Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
@@ -2295,7 +2303,7 @@
 DocType: Student Leave Application,Student Leave Application,Študent nechať aplikáciu
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
@@ -2305,7 +2313,7 @@
 DocType: Item,Barcodes,čiarové kódy
 DocType: Hub Category,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,asset Movement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Musí sa odoslať pracovná objednávka {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,new košík
@@ -2323,13 +2331,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Mena fakturácie sa musí rovnať mene menovej jednotky alebo účtovnej parity
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Soil Texture,Loam,hlina
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Riadok {0}: dátum splatnosti nemôže byť pred dátumom odoslania
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Riadok {0}: dátum splatnosti nemôže byť pred dátumom odoslania
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Pre
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Strom Nákl.stredisko finančných.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
@@ -2343,7 +2350,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Spotreba materiálu nie je nastavená v nastaveniach výroby.
 DocType: Student,Student Mobile Number,Študent Číslo mobilného telefónu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nie je možné prepísať položku {0} v riadku {1} viac ako {2}. Ak chcete povoliť nadmerné fakturácie, nastavte prosím nastavenia v ponuke"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nie je možné prepísať položku {0} v riadku {1} viac ako {2}. Ak chcete povoliť nadmerné fakturácie, nastavte prosím nastavenia v ponuke"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Aktualizácia odpovede
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
@@ -2355,12 +2362,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprv vyberte program
 DocType: Patient Appointment,Patient Age,Vek pacienta
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Správa projektov
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Sériové číslo {0} už bolo vrátené
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Sériové číslo {0} už bolo vrátené
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget,Fiscal Year,Fiškálny rok
 DocType: Asset Maintenance Log,Planned,plánovaná
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Predvolené pohľadávky, ktoré sa majú použiť, ak nie sú stanovené v pacientovi, aby si rezervovali poplatky za konzultácie."
 DocType: Vehicle Log,Fuel Price,palivo Cena
+DocType: Bank Guarantee,Margin Money,Margin Money
 DocType: Budget,Budget,Rozpočet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Otvorte Otvoriť
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
@@ -2374,16 +2382,16 @@
 DocType: Lead,Follow Up,Nasleduj
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Strom položkových skupín
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Suma, ktorá má dodávať"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Rovnaká položka bola zadaná viackrát. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum začatia nemôže byť skôr ako v roku dátum začiatku akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Zamestnanec {0} už požiadal {1} medzi {2} a {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Byly tam chyby.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Zamestnanec {0} už požiadal {1} medzi {2} a {3}:
 DocType: Guardian,Guardian Interests,Guardian záujmy
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
 DocType: Education Settings,Instructor Records to be created by,"Záznamy inštruktorov, ktoré vytvorí"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvoril
 DocType: GST Account,GST Account,Účet GST
@@ -2403,8 +2411,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Pridané do obľúbených položiek
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žiadna schéma platu sa nepodarilo predložiť na vyššie uvedené kritériá ALEBO platový výkaz už bol predložený
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Odvody a dane
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žiadna schéma platu sa nepodarilo predložiť na vyššie uvedené kritériá ALEBO platový výkaz už bol predložený
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Odvody a dane
 DocType: Projects Settings,Projects Settings,Nastavenia projektov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky nemôžu byť filtrované podľa {1}
@@ -2414,27 +2422,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Strom skupiny položek.
 DocType: Production Plan,Total Produced Qty,Celkový vyrobený počet
 DocType: Payroll Entry,Get Employee Details,Získajte podrobnosti o zamestnancoch
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 DocType: Asset,Sold,Predané
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základná suma (Company Currency)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Suroviny
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Suroviny
 DocType: Payment Reconciliation Payment,Reference Row,referenčnej Row
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účtovné Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Odstráňte všetky transakcie pre túto spoločnosť
 DocType: Patient,O Positive,O pozitívne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokácie
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Pre položku zápisu nie sú k dispozícii žiadne splátky
 DocType: Item Attribute,Attribute Name,Názov atribútu
 DocType: BOM,Show In Website,Zobraziť na webstránke
 DocType: Shopping Cart Settings,Show Quantity in Website,Vykazujú množstvo webových stránok
-DocType: Employee Loan Application,Total Payable Amount,Celková suma Splatné
+DocType: Loan Application,Total Payable Amount,Celková suma Splatné
 DocType: Task,Expected Time (in hours),Predpokladaná doba (v hodinách)
 DocType: Item Reorder,Check in (group),Check in (skupina)
 DocType: Soil Texture,Silt,kal
@@ -2453,7 +2462,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Vykonať platbu
 DocType: Room,Room Name,Room Meno
 DocType: Prescription Duration,Prescription Duration,Trvanie predpisu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
 ,Campaign Efficiency,Efektívnosť kampane
@@ -2473,11 +2482,11 @@
 DocType: Chapter,Chapter,kapitola
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Pár
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Predvolený účet sa automaticky aktualizuje v POS faktúre, keď je vybratý tento režim."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
 DocType: Asset,Depreciation Schedule,plán odpisy
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresy predajných partnerov a kontakty
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Day Date by mala byť v rozmedzí od dátumu a do dnešného dňa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Day Date by mala byť v rozmedzí od dátumu a do dnešného dňa
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Nastavte štandardné cenové centrum v spoločnosti {0}.
 DocType: Item,Has Batch No,Má číslo šarže
@@ -2495,7 +2504,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet)
 DocType: Soil Texture,Soil Type,Typ pôdy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nová správa
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Položková skupina nie je uvedená v hlavnej položke pre  položku {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2515,7 +2523,7 @@
 DocType: Hub Category,Hub Category,Kategória Hubu
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
-DocType: Employee Loan,Loan Amount,Výška pôžičky
+DocType: Loan,Loan Amount,Výška pôžičky
 DocType: Student Report Generation Tool,Add Letterhead,Pridať hlavičkový papier
 DocType: Program Enrollment,Self-Driving Vehicle,Samohybné vozidlo
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Hodnota karty dodávateľa je stála
@@ -2544,9 +2552,9 @@
 DocType: Cash Flow Mapper,Position,pozície
 DocType: Patient,Patient Details,Podrobnosti o pacientoch
 DocType: Patient,B Positive,B Pozitívne
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportovní
@@ -2554,8 +2562,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Celkem Aktuální
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,študentské Súrodenci
+DocType: Subscription Plan Detail,Subscription Plan Detail,Podrobný popis predplatného
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Jednotka
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Uveďte prosím, firmu"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Asset Maintenance Task,Maintenance Task,Úloha údržby
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,V nastavení GST nastavte limit B2C.
@@ -2570,6 +2579,7 @@
 ,BOM Search,BOM Search
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Celková spotreba materiálových nákladov (prostredníctvom vkladu)
 DocType: Hub Settings,Company Registered,Registrovaná spoločnosť
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Dátumu nemôže byť menšia ako od dátumu
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Zverejnite na sklade &quot;Na sklade&quot; alebo &quot;Nie je na sklade&quot; na základe dostupných zásob v tomto sklade.
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
@@ -2577,17 +2587,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nasledujúci materiál žiadosti boli automaticky zvýšená na základe úrovni re-poradie položky
 DocType: Email Digest,Pending Sales Orders,Čaká Predajné objednávky
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 DocType: Employee,Create User Permission,Vytvoriť povolenie používateľa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Healthcare Settings,Remind Before,Pripomenúť predtým
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 DocType: Item,Retain Sample,Zachovať ukážku
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Riadok {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,vyššie Rozdiel
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadajte ID zamestnanca z tohto predaja osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Vo výrobe
@@ -2597,8 +2608,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočítaná výpis z bankového účtu zostatok
 DocType: Normal Test Template,Normal Test Template,Normálna šablóna testu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Ponuka
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nie je možné nastaviť prijatú RFQ na žiadnu ponuku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Ponuka
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nie je možné nastaviť prijatú RFQ na žiadnu ponuku
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Vyberte účet, ktorý chcete vytlačiť v mene účtu"
@@ -2606,7 +2617,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Toto je založené na transakciách proti tomuto pacientovi. Viac informácií nájdete v nasledujúcej časovej osi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Náklady Aktualizované
 DocType: Patient,Date of Birth,Datum narození
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Bod {0} již byla vrácena
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Adresa zákazníka/obchodnej iniciatívy
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavenie tabuľky dodávateľov
@@ -2617,14 +2628,15 @@
 DocType: Work Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Popis Práca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Popis Práca
 DocType: Student Applicant,Applied,aplikovaný
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Znovu otevřít
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Znovu otevřít
 DocType: Sales Invoice Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Meno Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02 - Zľava po predaji
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Špeciálne znaky okrem ""-"". """", ""#"", a ""/"" nie sú povolené v číselnej rade"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Majte prehľad o predajných kampaniach. Majte prehľad o Iniciatívach, ponukách, objednávkach z kampane, aby ste zistili, návratnosť investície."
+DocType: Department Approver,Approver,Schvalovatel
 ,SO Qty,Množstvo na PO
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Pole Akcionár nesmie byť prázdne
 DocType: Guardian,Work Address,pracovná adresa
@@ -2638,21 +2650,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná suma (Company mena)
 DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
 DocType: Grant Application,Email Notification Sent,E-mailové upozornenie bolo odoslané
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kód položky, sklad, množstvo sa vyžaduje v riadku"
-DocType: Pricing Rule,Supplier,Dodávateľ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kód položky, sklad, množstvo sa vyžaduje v riadku"
+DocType: Bank Guarantee,Supplier,Dodávateľ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Zobraziť podrobnosti platby
 DocType: Consultation,Consultation Time,Konzultačný čas
 DocType: C-Form,Quarter,Čtvrtletí
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Různé výdaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Názov banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Nad
-DocType: Employee Loan,Employee Loan Account,Úverový účet zamestnanca
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail nebude odoslaný neaktívnym používateľom
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Počet interakcií
@@ -2668,7 +2679,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Hmotnosť (v kilogramoch)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitoly / názov_kategórie nechajte prázdne automaticky nastavené po uložení kapitoly.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Nastavte si účty GST v nastaveniach služby GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Nastavte si účty GST v nastaveniach služby GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Typ podnikania
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Náklady na nový nákup
@@ -2677,12 +2688,13 @@
 DocType: Grant Application,Grant Description,Názov grantu
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 DocType: Student Guardian,Others,Ostatní
+DocType: Subscription,Discounts,zľavy
 DocType: Payment Entry,Unallocated Amount,nepridelené Suma
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Žiadne ďalšie aktualizácie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Toto pokrýva všetky výsledkové karty viazané na toto nastavenie
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dieťa Položka by nemala byť produkt Bundle. Odstráňte položku `{0}` a uložiť
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankovníctvo
@@ -2691,21 +2703,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
 DocType: Bin,Ordered Quantity,Objednané množstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Grading Scale,Grading Scale Intervals,Triedenie dielikov
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Zisk za rok
+DocType: Bank Guarantee,Name of Bank,Názov banky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účtovné Vstup pre {2} môžu vykonávať len v mene: {3}
 DocType: Fee Schedule,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Strom finančných účtov.
+DocType: Bank Guarantee,Reference Document Type,Referenčná Typ dokumentu
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapovanie peňažných tokov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
 DocType: Account,Fixed Asset,Základní Jmění
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serialized Zásoby
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail sa v predvolenom kontakte nenachádza
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generovať tajomstvo
-DocType: Employee Loan,Account Info,Informácie o účte
+DocType: Loan,Account Info,Informácie o účte
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
 DocType: Fees,Include Payment,Zahrňte platbu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Vytvorené študentské skupiny.
@@ -2713,24 +2728,24 @@
 DocType: Sales Invoice,Total Billing Amount,Celková suma fakturácie
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program v štruktúre poplatkov a študentskej skupine {0} je odlišný.
 DocType: Fee Schedule,Receivable Account,Pohledávky účtu
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
 DocType: Quotation Item,Stock Balance,Stav zásob
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Predajné objednávky na platby
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,S platbou dane
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKÁT PRE DODÁVATEĽA
 DocType: Land Unit,Is Container,Je kontajner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Toto bude prvý deň cyklu plodín
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Prosím, vyberte správny účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Purchase Invoice Item,Weight UOM,Hmotnostná MJ
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Zoznam dostupných akcionárov s číslami fotiek
 DocType: Salary Structure Employee,Salary Structure Employee,Plat štruktúra zamestnancov
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Zobraziť atribúty variantu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Zobraziť atribúty variantu
 DocType: Student,Blood Group,Krevní Skupina
 DocType: Course,Course Name,Názov kurzu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kancelářské Vybavení
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
 DocType: Supplier Scorecard,Scoring Setup,Nastavenie bodovania
@@ -2749,7 +2764,7 @@
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debetné K je vyžadované
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablóny premenných ukazovateľa skóre dodávateľa.
 DocType: Job Offer Term,Offer Term,Ponuka Term
 DocType: Asset,Quality Manager,Manažér kvality
@@ -2761,13 +2776,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Celkové nezaplatené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 DocType: Supplier Scorecard,Supplier Score,Skóre dodávateľa
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Celkové fakturované Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Supplier,Warn RFQs,Upozornenie na RFQ
 DocType: BOM,Conversion Rate,Konverzný kurz
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Hľadať produkt
 DocType: Assessment Plan,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
+DocType: Loan,Total Amount Paid,Celková čiastka bola zaplatená
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vyberte Študentské prijatie, ktoré je povinné pre platených študentov"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vyberte cenník a zverejnite ceny
@@ -2777,19 +2793,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cenník {0} je vypnutý
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riadok {0}: Dokončené Množstvo nemôže byť viac ako {1} pre prevádzku {2}
 DocType: Manufacturing Settings,Allow Overtime,Povoliť Nadčasy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serializovaná položka {0} sa nedá aktualizovať pomocou zmiernenia skladových položiek
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serializovaná položka {0} sa nedá aktualizovať pomocou zmiernenia skladových položiek
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serializovaná položka {0} sa nedá aktualizovať pomocou zmiernenia skladových položiek
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serializovaná položka {0} sa nedá aktualizovať pomocou zmiernenia skladových položiek
 DocType: Training Event Employee,Training Event Employee,Vzdelávanie zamestnancov Event
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximálne vzorky - {0} môžu byť zadržané pre dávky {1} a položku {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Pridať časové sloty
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuálne ocenenie Rate
 DocType: Training Event,Advance,záloha
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,pre opätovné opakovanie.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Nastavenia platobnej brány GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange zisk / strata
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange zisk / strata
 DocType: Opportunity,Lost Reason,Ztracené Důvod
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Riadok # {0}: Účet {1} nepatrí spoločnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Riadok # {0}: Účet {1} nepatrí spoločnosti {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nepodarilo sa nájsť DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Veľkosť vzorky
@@ -2808,7 +2823,6 @@
 DocType: Bin,Actual Quantity,Skutočné Množstvo
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Predplatné bolo {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program rozpisu poplatkov
 DocType: Fee Schedule Program,Student Batch,študent Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Vytvoriť študenta
@@ -2824,14 +2838,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Elektronický obchod GSTIN
 DocType: Sales Order,Not Delivered,Nedodané
 ,Bank Clearance Summary,Súhrn bankového zúčtovania
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Navrhnúť kategóriu?
 DocType: Stock Reconciliation Item,Current Amount,Aktuálna výška
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,budovy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,budovy
 DocType: Fee Schedule,Fee Structure,štruktúra poplatkov
 DocType: Timesheet Detail,Costing Amount,Kalkulácie Čiastka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 DocType: Student Admission Program,Application Fee,Poplatok za prihlášku
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Odeslat výplatní pásce
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
@@ -2839,12 +2852,13 @@
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Meno odosielateľa
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kritériá analýzy poľnohospodárstva
+DocType: HR Settings,Leave Approval Notification Template,Ponechať šablónu oznámenia o schválení
 DocType: POS Profile,[Select],[Vybrať]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvný tlak (diastolický)
 DocType: SMS Log,Sent To,Odoslané na
 DocType: Agriculture Task,Holiday Management,Správa prázdnin
 DocType: Payment Request,Make Sales Invoice,Vytvoriť faktúru
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,programy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,programy
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Lekár {0} nie je k dispozícii v {1}
@@ -2862,7 +2876,7 @@
 DocType: Employee,New Workplace,Nové pracovisko
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Spotreba materiálu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastaviť ako Zatvorené
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},No Položka s čárovým kódem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},No Položka s čárovým kódem {0}
 DocType: Normal Test Items,Require Result Value,Vyžadovať výslednú hodnotu
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,kusovníky
@@ -2877,19 +2891,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Žiadny aktívny alebo implicitné Plat Štruktúra nájdených pre zamestnancov {0} pre dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Opakujúce sa
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Podrobné informácie o šablóne mapovania peňažných tokov
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Správa úverov
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Nástroj na premenovanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Show výplatnej páske
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Show výplatnej páske
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Přenos materiálu
 DocType: Fees,Send Payment Request,Odoslať žiadosť o platbu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Water Analysis,Origin,pôvod
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Prosím nastavte opakovanie po uložení
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Prosím nastavte opakovanie po uložení
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Vybrať zmena výšky účet
 DocType: Purchase Invoice,Price List Currency,Mena cenníka
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
@@ -2904,14 +2918,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Zodpovednosť za dane z príjmov
 DocType: Grading Scale Interval,Grade Description,grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Earnest Money
 DocType: Sales Invoice, Shipping Bill Number,Prepravné číslo účtu
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledovateľnosť
 DocType: Asset Maintenance Log,Actions performed,Vykonané akcie
 DocType: Cash Flow Mapper,Section Leader,Vedúci sekcie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Zamestnanec
+DocType: Bank Guarantee,Fixed Deposit Number,Číslo s pevným vkladom
 DocType: Asset Repair,Failure Date,Dátum zlyhania
 DocType: Sample Collection,Collected Time,Zhromaždený čas
 DocType: Company,Sales Monthly History,Mesačná história predaja
@@ -2928,10 +2943,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Naozaj chcete zrušiť túto schôdzku?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Balík ceny izieb v hoteli
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,predajné Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Načítať aktualizácie odberov
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Účet {0} sa nezhoduje so spoločnosťou {1} v režime účtov: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Predmet:
@@ -2941,7 +2957,7 @@
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Žiadne pracovné príkazy neboli vytvorené
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Výplatnej páske zamestnanca {0} už vytvorili pre toto obdobie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Je potrebná predajná objednávka
 DocType: Purchase Invoice,Credit To,Kredit:
@@ -2959,7 +2975,7 @@
 DocType: Request for Quotation Supplier,No Quote,Žiadna citácia
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Vyrovnávací Off
 DocType: Job Offer,Accepted,Přijato
@@ -2972,7 +2988,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Uistite sa, že naozaj chcete vymazať všetky transakcie pre túto spoločnosť. Vaše kmeňové dáta zostanú, ako to je. Túto akciu nie je možné vrátiť späť."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Výsledky vyhľadávania
 DocType: Room,Room Number,Číslo izby
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Neplatná referencie {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Neplatná referencie {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 DocType: Journal Entry Account,Payroll Entry,Mzdový účet
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Zobrazenie záznamov poplatkov
@@ -2982,7 +2998,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Lab Test Sample,Lab Test Sample,Laboratórna vzorka
 DocType: Item Variant Settings,Allow Rename Attribute Value,Povoliť premenovanie hodnoty atribútu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Rýchly vstup Journal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Restaurant,Invoice Series Prefix,Prefix radu faktúr
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
@@ -2990,8 +3006,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrácia služby Mapy Google nie je povolená
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nie je odoslané
+DocType: Subscription,Trialling,skúšanie
 DocType: Member,Membership Expiry Date,Dátum ukončenia členstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} musí byť negatívny vo vratnom dokumente
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} musí byť negatívny vo vratnom dokumente
 ,Minutes to First Response for Issues,Zápisy do prvej reakcie na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Názov inštitútu pre ktorý nastavujete tento systém.
@@ -3010,7 +3027,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Merná jednotka
 DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Příležitost
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Příležitost
 DocType: Operation,Default Workstation,Výchozí Workstation
 DocType: Notification Control,Expense Claim Approved Message,Správa o schválení úhrady výdavkov
 DocType: Payment Entry,Deductions or Loss,Odpočty alebo strata
@@ -3048,7 +3065,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Nechať bez nároku na odmenu nesúhlasí so schválenými záznamov nechať aplikáciu
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
 DocType: Membership,USD,Americký dolár
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Zostávajúci zostatok
@@ -3058,7 +3075,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Driver,Driver,vodič
 DocType: Vital Signs,Nutrition Values,Výživové hodnoty
 DocType: Lab Test Template,Is billable,Je fakturovaná
@@ -3069,7 +3086,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Skutočný dátum začatia (cez Časový rozvrh)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Toto je príklad webovej stránky automaticky generovanej z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Celková čiastka zálohy nemôže byť vyššia ako celková nárokovaná čiastka
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Celková čiastka zálohy nemôže byť vyššia ako celková nárokovaná čiastka
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3124,7 +3141,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nie je možné vyrobiť viac Položiek {0} ako je množstvo na predajnej objednávke {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Vyberte hodnoty atribútov
 DocType: Purchase Invoice,Reason For Issuing document,Dôvod pre vydanie dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bankový / Peňažný účet
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Nasledujúce Kontakt Tým nemôže byť rovnaký ako hlavný e-mailovú adresu
 DocType: Tax Rule,Billing City,Fakturačné mesto
@@ -3141,7 +3158,8 @@
 DocType: Warranty Claim,Service Address,Servisní adresy
 DocType: Asset Maintenance Task,Calibration,Kalibrácia
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} je firemný sviatok
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Nábytok a svietidlá
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Zanechať upozornenie na stav
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Nábytok a svietidlá
 DocType: Item,Manufacture,Výroba
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Inštalačná spoločnosť
 ,Lab Test Report,Lab Test Report
@@ -3157,7 +3175,6 @@
 DocType: Crop,Planting Area,Oblasť výsadby
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Môže to byť spôsobené niektorými neplatnými e-mailovými adresami v priečinku
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Pridali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,tréning Výsledok
@@ -3167,16 +3184,17 @@
 DocType: Products Settings,Products per Page,Produkty na stránku
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,alebo
 DocType: Sales Order,Billing Status,Stav fakturácie
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Riadok # {0}: Journal Entry {1} nemá účet {2} alebo už uzavreté proti inému poukazu
 DocType: Supplier Scorecard Criteria,Criteria Weight,Hmotnosť kritérií
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Zanechajte oznámenie o schválení
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Plat Slip na základe časového rozvrhu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Sadzba nákupu
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Sadzba nákupu
 DocType: Notification Control,Sales Order Message,Poznámka predajnej objednávky
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 DocType: Payment Entry,Payment Type,Typ platby
@@ -3199,6 +3217,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Nastavenie Nákupného košíka
 DocType: Journal Entry,Accounting Entries,Účetní záznamy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ak sa zvolí pravidlo Pricing for &#39;Rate&#39;, prepíše cenník. Sadzba Pravidlo sadzba je konečná sadzba, takže žiadna ďalšia zľava by sa mala použiť. Preto v transakciách, ako je Predajná objednávka, Objednávka atď., Bude vyzdvihnuté v poli &quot;Rýchlosť&quot;, a nie v poli Cena."
+DocType: Journal Entry,Paid Loan,Platené pôžičky
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicitní záznam. Zkontrolujte autorizační pravidlo {0}
 DocType: Journal Entry Account,Reference Due Date,Referenčný dátum splatnosti
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3215,7 +3234,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
 DocType: Patient Service Unit,Parent Service Unit,Rodičovská služba
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Vytvoriť používateľa
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
@@ -3233,7 +3252,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Dodávka
 DocType: Volunteer,Weekdays,Dni v týždni
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: Restaurant Menu,Restaurant Menu,Reštaurácia
@@ -3241,7 +3260,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Nastavte predvolený inventárny účet pre trvalý inventár
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Nastavte predvolený inventárny účet pre trvalý inventár
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Odošlite e-mail na posúdenie grantu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Miestne úložisko je plné, nezachránil"
@@ -3249,10 +3268,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapacita miestnosti
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Už existuje záznam pre položku {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Ztratíte záznamy o predtým vygenerovaných faktúrach. Naozaj chcete tento odber reštartovať?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Registračný poplatok
 DocType: Budget,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Poznámka k nákupnej objednávke
 DocType: Tax Rule,Shipping Country,Krajina dodania
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Inkognito dane zákazníka z predajných transakcií
@@ -3261,20 +3281,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Vedoucí marketingu a prodeje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Daň z příjmů
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Prejdite na Letterheads
+DocType: Subscription,Cancel At End Of Period,Zrušiť na konci obdobia
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Nie sú vybraté žiadne položky na prenos
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Nie sú vybraté žiadne položky na prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všetky adresy
 DocType: Company,Stock Settings,Nastavenie Skladu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
 DocType: Vehicle,Electric,elektrický
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Zisk / strata z aktív likvidácii
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Zisk / strata z aktív likvidácii
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Do nasledujúcej tabuľky bude vybraný iba žiadateľ o štúdium so stavom &quot;Schválený&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"Číslo účtu pre účet {0} nie je k dispozícii. <br> Prosím, nastavte účtovnú schému správne."
 DocType: Task,Depends on Tasks,Závisí na Úlohy
@@ -3289,6 +3310,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,nie je na sklade
 DocType: Volunteer,Volunteer Skills,Dobrovoľnícke zručnosti
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Názov referenčného dokumentu
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
 apps/erpnext/erpnext/hooks.py +142,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
@@ -3302,7 +3324,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Veľké
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Veľké
+DocType: Loan,Loan Application,Aplikácia úveru
 DocType: Crop,Scientific Name,Vedecké meno
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Celkom Listy
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Znova vyberte, ak sa zvolený kontakt upraví po uložení"
@@ -3311,13 +3334,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
 ,Sales Browser,Prehliadač predaja
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Veľký
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Veľký
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodná Odporúčané tovar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Všetky skupiny Assessment
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Všetky skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Celkom {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
@@ -3338,9 +3361,10 @@
 DocType: Fees,Fees,poplatky
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Ponuka {0} je zrušená
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Celková dlužná částka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Celková dlužná částka
 DocType: Sales Partner,Targets,Cíle
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Prihláste prosím číslo SIREN do informačného súboru spoločnosti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 DocType: Price List,Price List Master,Ceník Master
 DocType: GST Account,CESS Account,Účet CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
@@ -3349,6 +3373,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Vyberte pacienta
 DocType: Price List,Applicable for Countries,Pre krajiny
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Názov parametra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechajte len aplikácie, ktoré majú status, schválené &#39;i, Zamietnuté&#39; môžu byť predložené"
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Študent Názov skupiny je povinné v rade {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkty, ktoré majú byť uvedené na internetových stránkach domovskej"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
@@ -3394,14 +3419,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktúra už vytvorená pre všetky fakturačné hodiny
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Názov chyba: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Sú finančné náklady
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Nastavte štandardný zákazník v nastaveniach reštaurácie
 ,Salary Register,plat Register
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
-DocType: C-Form Invoice Detail,Net Total,Netto Spolu
+DocType: Subscription,Net Total,Netto Spolu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Predvolený kusovník sa nenašiel pre položku {0} a projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definovať rôzne typy úverov
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definovať rôzne typy úverov
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Dlužné částky
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v min)
@@ -3433,11 +3458,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root účet musí byť skupina
 DocType: Drug Prescription,Drug Prescription,Predpísaný liek
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Splatená / Zatvorené
+DocType: Loan,Repaid/Closed,Splatená / Zatvorené
 DocType: Item,Total Projected Qty,Celková predpokladaná Množstvo
 DocType: Monthly Distribution,Distribution Name,Názov distribúcie
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Miera zhodnotenia sa nezistila pre položku {0}, ktorá je povinná robiť účtovné položky pre {1} {2}. Ak položka transakcia prebieha ako položku s nulovou hodnotou v {1}, uveďte ju v tabuľke {1} položky. V opačnom prípade prosím vytvorte pre túto položku transakciu s akciami alebo zmienku o oceňovaní v položke záznamu a skúste odoslať / zrušiť túto položku"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 DocType: Course,Course Code,kód predmetu
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: POS Settings,Use POS in Offline Mode,Používajte POS v režime offline
@@ -3457,16 +3481,15 @@
 DocType: Purchase Invoice,Deemed Export,Považovaný export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
-DocType: Subscription,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Vyhodnotili ste kritériá hodnotenia {}.
 DocType: Vehicle Service,Engine Oil,Motorový olej
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Vytvorené pracovné príkazy: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Vytvorené pracovné príkazy: {0}
 DocType: Sales Invoice,Sales Team1,Sales Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Adresa zákazníka
-DocType: Employee Loan,Loan Details,pôžička Podrobnosti
+DocType: Loan,Loan Details,pôžička Podrobnosti
 DocType: Company,Default Inventory Account,Predvolený inventárny účet
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Čísla fotiek sa nezhodujú
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Riadok {0}: Dokončené množstvo musí byť väčšia ako nula.
@@ -3478,19 +3501,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Spojenie so všetkými pozemnými jednotkami, v ktorých rastie plodina"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Riadok # {0}: Nemožno vrátiť viac ako {1} pre bodu {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Riadok # {0}: Nemožno vrátiť viac ako {1} pre bodu {2}
 DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
 DocType: BOM,Item UOM,MJ položky
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Cheque Print Template,Primary Settings,primárnej Nastavenie
 DocType: Purchase Invoice,Select Supplier Address,Vybrať Dodávateľ Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Pridajte Zamestnanci
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Pridajte Zamestnanci
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Malé
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Malé
 DocType: Company,Standard Template,štandardná šablóna
 DocType: Training Event,Theory,teória
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
@@ -3510,11 +3533,10 @@
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Antibiotic,Healthcare Administrator,Administrátor zdravotnej starostlivosti
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Nastavte cieľ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
 DocType: Dosage Strength,Dosage Strength,Pevnosť dávkovania
 DocType: Account,Expense Account,Účtet nákladů
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Farebné
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Farebné
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Dátum vypršania platnosti je pre vybranú položku povinný
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zabráňte nákupným objednávkam
@@ -3527,18 +3549,18 @@
 DocType: Patient,Personal and Social History,Osobná a sociálna história
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Používateľ {0} bol vytvorený
 DocType: Fee Schedule,Fee Breakup for each student,Poplatok za každý študent
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Zmeniť kód
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Mena pre cenník nie je vybratá
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Mena pre cenník nie je vybratá
 DocType: Purchase Invoice,Availed ITC Cess,Využil ITC Cess
 ,Student Monthly Attendance Sheet,Študent mesačná návštevnosť Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravidlo platia iba pre predaj
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Dokud
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Dokud
 DocType: Rename Tool,Rename Log,Premenovať Log
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Plán študentskej skupiny alebo kurzu je povinný
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Plán študentskej skupiny alebo kurzu je povinný
@@ -3559,7 +3581,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Uveďte zoznam svojich produktov alebo služieb, ktoré kupujete alebo predávate."
 DocType: Water Analysis,Storage Temperature,Teplota skladovania
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštevnosť
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Výzkumník
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Registrácia do programu Student Tool
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Dátum začiatku by mal byť menší ako dátum ukončenia úlohy {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Meno alebo e-mail je povinné
@@ -3572,7 +3594,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} v súčasnosti má {1} hodnotiacu kartu pre dodávateľa, a RFQ pre tohto dodávateľa by mali byť vydané opatrne."
 DocType: Chapter,Non Profit Manager,Neziskový manažér
 DocType: BOM,Total Cost(Company Currency),Celkové náklady (Company mena)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Pořadové číslo {0} vytvořil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Homepage,Company Description for website homepage,Spoločnosť Popis pre webové stránky domovskú stránku
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Meno suplier
@@ -3582,11 +3604,10 @@
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Healthcare Settings,Result Printed,Výsledok vytlačený
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Skúšobná doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Zobraziť {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Skúšobná doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Project,Total Costing Amount (via Timesheets),Celková výška sumy (prostredníctvom časových rozpisov)
-DocType: Employee Advance,Expense Approver,Schvalovatel výdajů
+DocType: Department,Expense Approver,Schvalovatel výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
 DocType: Project,Hourly,hodinový
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-skupiny k skupine
@@ -3596,7 +3617,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Vykonať platbu cez Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Vytlačené na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Vytlačené na
 DocType: Item,Inspection Required before Delivery,Inšpekcia Požadované pred pôrodom
 DocType: Item,Inspection Required before Purchase,Inšpekcia Požadované pred nákupom
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevybavené Aktivity
@@ -3606,7 +3627,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimálna objednávka
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Vaša organizácia
 DocType: Fee Component,Fees Category,kategórie poplatky
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Zadejte zmírnění datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Upozorniť zamestnanca
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
@@ -3616,7 +3637,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablóny
 DocType: Attendance,Attendance Date,Účast Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Purchase Invoice Item,Accepted Warehouse,Schválené Sklad
@@ -3624,10 +3645,11 @@
 DocType: Item,Valuation Method,Ocenění Method
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Poldenné
 DocType: Sales Invoice,Sales Team,Predajný tím
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Pred odoslaním zadajte meno príjemcu.
 DocType: Program Enrollment Tool,Get Students,získať študentov
 DocType: Serial No,Under Warranty,V rámci záruky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Vyberte dátum dokončenia dokončenej opravy
@@ -3646,7 +3668,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Vyhradené pre subkontraktovanie
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
 DocType: Shopping Cart Settings,Orders,Objednávky
-DocType: Employee Leave Approver,Leave Approver,Schvaľovateľ voľna
+DocType: Department,Leave Approver,Schvaľovateľ voľna
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vyberte dávku
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Názov skupiny Assessment
@@ -3691,7 +3713,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Pásová sledovaná položka
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINÁL PRE PRÍJEMCU
 DocType: Asset Category Account,Accumulated Depreciation Account,účet oprávok
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Tento e-mail je automaticky generovaný
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
 DocType: Program Enrollment,Boarding Student,Stravovanie Študent
 DocType: Asset,Expected Value After Useful Life,Očakávaná hodnota po celú dobu životnosti
@@ -3716,22 +3737,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Účasť Record {0} existuje proti Študent {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Odpisy vypadol v dôsledku nakladania s majetkom
-DocType: Member,Member,člen
+DocType: Loan,Member,člen
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Správa adries
 DocType: Work Order Item,Work Order Item,Položka pracovnej objednávky
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Poľnohospodársky manažér
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
 DocType: Supplier Scorecard Period,Variables,Premenné
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,šek Veľkosť
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Pořadové číslo {0} není skladem
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Účet {0} sa nezhoduje so spoločnosťou {1}
@@ -3740,7 +3761,6 @@
 DocType: Stock Settings,Default Stock UOM,Východzia skladová MJ
 DocType: Asset,Number of Depreciations Booked,Počet Odpisy rezervované
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Celkový počet
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Proti zamestnancov úveru: {0}
 DocType: Landed Cost Item,Receipt Document,príjem dokumentov
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
@@ -3751,7 +3771,7 @@
 DocType: Asset,Double Declining Balance,double degresívne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Uzavretá objednávka nemôže byť zrušený. Otvoriť zrušiť.
 DocType: Student Guardian,Father,otec
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
 DocType: Bank Reconciliation,Bank Reconciliation,Bankové odsúhlasenie
 DocType: Attendance,On Leave,Na odchode
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získať aktualizácie
@@ -3765,10 +3785,10 @@
 DocType: Lead,Lower Income,S nižšími příjmy
 DocType: Restaurant Order Entry,Current Order,Aktuálna objednávka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Prejdite na položku Programy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riadok {0} # Pridelená čiastka {1} nemôže byť väčšia ako suma neoprávnene nárokovaná {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riadok {0} # Pridelená čiastka {1} nemôže byť väčšia ako suma neoprávnene nárokovaná {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
@@ -3791,7 +3811,6 @@
 DocType: Payment Terms Template,Payment Terms,Platobné podmienky
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minúta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 DocType: Chapter,Meetup Embed HTML,Meetup Vložiť HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Prejdite na dodávateľov
@@ -3811,30 +3830,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Prosím, nastavte ID e-mailu, aby študent poslal Žiadosť o platbu"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Prosím, nastavte ID e-mailu, aby študent poslal Žiadosť o platbu"
 DocType: Patient,Medical History,História medicíny
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Kontokorentní úvěr na účtu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Kontokorentní úvěr na účtu
 DocType: Patient,Patient ID,Identifikácia pacienta
 DocType: Physician Schedule,Schedule Name,Názov plánu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Proveďte výplatní pásce
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Pridať všetkých dodávateľov
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Pridať všetkých dodávateľov
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Riadok # {0}: Pridelená čiastka nemôže byť vyššia ako dlžná suma.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Prechádzať BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Zajištěné úvěry
 DocType: Purchase Invoice,Edit Posting Date and Time,Úpraviť dátum a čas vzniku
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizácia účty s ním súvisiacich v kategórii Asset {0} alebo {1} Company"
 DocType: Lab Test Groups,Normal Range,Normálny rozsah
 DocType: Academic Term,Academic Year,Akademický rok
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Dostupný predaj
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Počiatočný stav Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Počiatočný stav Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,zostávajúce
 DocType: Appraisal,Appraisal,Ocenění
+DocType: Loan,Loan Account,Úverový účet
 DocType: Purchase Invoice,GST Details,Podrobnosti GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-mailu zaslaného na dodávateľa {0}
 DocType: Item,Default Sales Unit of Measure,Predvolená predajná jednotka merania
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademický rok:
+DocType: Subscription,Past Due Date,Dátum splatnosti
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Nepovoliť nastavenie alternatívnej položky pre položku {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
@@ -3847,7 +3868,7 @@
 DocType: Patient Appointment,Patient Appointment,Menovanie pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odhlásiť sa z tohto Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Získajte dodávateľov od
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Získajte dodávateľov od
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} sa nenašiel pre položku {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Prejdite na Kurzy
 DocType: Accounts Settings,Show Inclusive Tax In Print,Zobraziť inkluzívnu daň v tlači
@@ -3855,10 +3876,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Správa bola odoslaná
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Účet s podriadené uzly nie je možné nastaviť ako hlavnej knihy
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní&gt; Nastavenia vzdelávania"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou Ceník měna je převeden na zákazníka základní měny"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá suma (Company Mena)
 DocType: Physician,Physician Schedules,Lekárske plány
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Celková výška zálohy nemôže byť vyššia ako celková výška sankcie
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Celková výška zálohy nemôže byť vyššia ako celková výška sankcie
 DocType: Salary Slip,Hour Rate,Hodinová sadzba
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
@@ -3876,6 +3898,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: BOM,Inspection Required,Kontrola je povinná
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Pred odoslaním zadajte číslo bankovej záruky.
 DocType: Driving License Category,Class,Trieda
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Pracovnú objednávku nemožno vzniesť voči šablóne položky
@@ -3886,7 +3909,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní&gt; Nastavenia vzdelávania"
 DocType: Serial No,Is Cancelled,Je zrušené
 DocType: Student Group,Group Based On,Skupina založená na
 DocType: Student Group,Group Based On,Skupina založená na
@@ -3898,9 +3920,10 @@
 DocType: Cheque Print Template,Cheque Height,šek Výška
 DocType: Supplier,Supplier Details,Detaily dodávateľa
 DocType: Setup Progress,Setup Progress,Pokročilé nastavenie
+DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,"skontrolujte, či všetky"
 ,Issued Items Against Work Order,Vydané položky proti pracovnému príkazu
 DocType: Vehicle Log,Invoice Ref,faktúra Ref
@@ -3931,12 +3954,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarif Počet
 DocType: Work Order Item,Available Qty at WIP Warehouse,Dostupné množstvo v WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Plánovaná
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Poznámka: Systém nebude kontrolovať nad-dodávku a nad-rezerváciu pre Položku {0} , keďže množstvo alebo čiastka je 0"
 DocType: Notification Control,Quotation Message,Správa k ponuke
-DocType: Employee Loan,Employee Loan Application,Zamestnanec žiadosť o úver
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Najprv si pacienta uložte
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Najprv si pacienta uložte
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Účasť bola úspešne označená.
 DocType: Program Enrollment,Public Transport,Verejná doprava
 DocType: Soil Texture,Silt Composition (%),Zloženie sklonu (%)
@@ -3955,7 +3977,7 @@
 ,Item Balance (Simple),Zostatok položky (jednoduché)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faktúry od dodávateľov
 DocType: POS Profile,Write Off Account,Odepsat účet
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debetná poznámka Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debetná poznámka Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
@@ -3978,6 +4000,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Dátum predajnej objednávky
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Zadanie reverzného denníka
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvorený.
 DocType: Stock Settings,Limit Percent,limit Percento
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momentálne niesu k dispozícii položky v žiadnom sklade
@@ -3991,14 +4014,15 @@
 DocType: Journal Entry,Stock Entry,Pohyb zásob
 DocType: Payment Entry,Payment References,platobné Referencie
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Počet intervalov pre intervalové pole, napr. Ak je Interval &quot;Dni&quot; a Interval fakturácie je 3, faktúry sa vygenerujú každých 3 dni"
 DocType: Vehicle,Insurance Details,poistenie Podrobnosti
 DocType: Account,Payable,Splatný
 DocType: Share Balance,Share Type,Typ zdieľania
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadajte dobu splácania"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Prosím, zadajte dobu splácania"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dlžníci ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Zmeniť profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
@@ -4008,10 +4032,11 @@
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Riadky s duplicitnými dátumami splatnosti boli nájdené v ďalších riadkoch: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Riadky s duplicitnými dátumami splatnosti boli nájdené v ďalších riadkoch: {list}
 DocType: Topic,Topic Name,Názov témy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Nastavte predvolenú šablónu pre upozornenie na povolenie na odchýlku v nastaveniach ľudských zdrojov.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Vyberte zamestnanca, aby ste zamestnanca vopred."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Vyberte zamestnanca, aby ste zamestnanca vopred."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vyberte platný dátum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Vyberte podstatu svojho podnikania.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4030,7 +4055,7 @@
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Zdieľať knihu
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Faktúra predaja {0} bola vytvorená
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celková fakturovaná čiastka
@@ -4039,7 +4064,7 @@
 DocType: Account,Accumulated Depreciation,oprávky
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stály názov
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
-DocType: Employee Loan Application,Required by Date,Vyžadované podľa dátumu
+DocType: Loan Application,Required by Date,Vyžadované podľa dátumu
 DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy
 DocType: Production Plan,Sales Orders Detail,Podrobné obchodné pokyny
 DocType: Bin,Requested Quantity,požadované množstvo
@@ -4052,10 +4077,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total dedukcie - splátky
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Plat Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Viac variantov
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodané
+DocType: Subscription,Trial Period Start Date,Dátum začiatku skúšobného obdobia
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Prihláste sa ako iný používateľ.
@@ -4076,12 +4102,11 @@
 DocType: Student Guardian,Student Guardian,študent Guardian
 DocType: Member,Member Name,Meno člena
 DocType: Stock Settings,Use Naming Series,Použite pomenovanie série
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v predplatnom
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 DocType: Membership,Payment Details,Platobné údaje
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zastavenú pracovnú objednávku nemožno zrušiť, najskôr ju zrušte zrušením"
 DocType: Asset,Journal Entry for Scrap,Zápis do denníka do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
@@ -4101,6 +4126,7 @@
 DocType: Land Unit,Land Unit,Pozemná jednotka
 ,Purchase Analytics,Analýza nákupu
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Aktuálna faktúra {0} chýba
 DocType: Asset Maintenance Log,Task,Úkol
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
@@ -4113,7 +4139,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Zisk / straty
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zamestnancov a dochádzky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Vyplňte formulář a uložte jej
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Navštívte komunitné fórum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Aktuálne množstvo na sklade
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Aktuálne množstvo na sklade
@@ -4128,7 +4154,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Štandardné predajné kurz
 DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
 DocType: Cash Flow Mapper,Section Name,Názov sekcie
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Změna pořadí Množství
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuálne pracovné príležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpísať
@@ -4139,9 +4165,9 @@
 DocType: Task,depends_on,záleží na
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Naliehavá aktualizácia najnovšej ceny vo všetkých účtovných dokladoch. Môže to trvať niekoľko minút.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Názov nového účtu. Poznámka: Prosím, vytvárať účty pre zákazníkov a dodávateľmi"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Water Analysis,Appearance,vzhľad
+DocType: HR Settings,Leave Status Notification Template,Opustiť šablónu oznamovania stavu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Cena nákupného cenníka
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informácie pre členov.
@@ -4164,7 +4190,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nepovolené. Vypnite testovaciu šablónu
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Crop Cycle,Linked Land Unit,Prepojenej pozemnej jednotky
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
@@ -4180,7 +4206,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Prejdite na položku Používatelia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nie je platné číslo Šarže pre Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Neplatné GSTIN alebo Enter NA pre neregistrované
 DocType: Training Event,Seminar,seminár
 DocType: Program Enrollment Fee,Program Enrollment Fee,program zápisné
@@ -4196,14 +4222,14 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvorte účtový rozvrh založený na
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nemožno ju previesť na inú skupinu. Detské úlohy existujú.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
 ,Stock Ageing,Starnutie zásob
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Existujú Študent {0} proti uchádzač študent {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Úprava zaokrúhľovania (mena spoločnosti)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,pracovný výkaz
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,šarže:
 DocType: Volunteer,Afternoon,Popoludnie
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
@@ -4219,7 +4245,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} už existuje
 DocType: Medical Department,Nursing User,Ošetrujúci používateľ
 DocType: Plant Analysis,Plant Analysis Criterias,Kritériá analýzy rastlín
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Zodpovednosť
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Sériové číslo {0} nepatrí do dávky {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Zodpovednosť
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnosť tejto ponuky sa skončila.
 DocType: Expense Claim Account,Expense Claim Account,Náklady na poistné Account
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povoliť stale kurzy výmeny
@@ -4241,11 +4268,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Vykonajte varianty
 DocType: Item,Default BOM,Výchozí BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Celková fakturovaná suma (prostredníctvom faktúr za predaj)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Výška dlžnej sumy
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Výška dlžnej sumy
 DocType: Project Update,Not Updated,Neaktualizované
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Existujú nezrovnalosti medzi sadzbou, počtom akcií a vypočítanou sumou"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Celkem Vynikající Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
 DocType: Employee Advance,Advance Account,Advance účet
 DocType: Job Offer,Job Offer Terms,Podmienky ponuky práce
@@ -4254,7 +4281,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobilový
 DocType: Vehicle,Insurance Company,Poisťovňa
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,premenlivý
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,premenlivý
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
 DocType: Chapter,Members,členovia
 DocType: Student,Student Email Address,Študent E-mailová adresa
@@ -4278,7 +4305,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Internovat
 DocType: Delivery Stop,Address Name,Meno adresy
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Rozdelenie {0} jednotiek z {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Rozdelenie {0} jednotiek z {1}
 DocType: Assessment Code,Assessment Code,kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Základné
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Skladové transakcie pred {0} sú zmrazené
@@ -4286,25 +4313,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 DocType: Bank Reconciliation Detail,Payment Document,platba Document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Chyba pri hodnotení kritéria kritérií
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+DocType: Subscription,Plans,plány
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Vydání Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Vyskytla sa chyba pri vytváraní opakovania
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Dátum Ponuky
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ponuky
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Žiadne študentské skupiny vytvorený.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesačné splátky suma nemôže byť vyššia ako suma úveru
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mesačné splátky suma nemôže byť vyššia ako suma úveru
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Riadok # {0}: Predpokladaný dátum doručenia nemôže byť pred dátumom objednávky
 DocType: Purchase Invoice,Print Language,Jazyk tlače
 DocType: Salary Slip,Total Working Hours,Celkovej pracovnej doby
 DocType: Sales Invoice,Customer PO Details,Podrobnosti PO zákazníka
-DocType: Subscription,Next Schedule Date,Nasledujúci dátum plánovania
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Dočasný úvodný účet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Zadajte hodnota musí byť kladná
@@ -4333,11 +4359,11 @@
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Delivery Note Item,From Warehouse,Zo skladu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Žiadni zamestnanci pre uvedené kritériá
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
 DocType: Hotel Settings,Default Customer,Predvolený zákazník
 DocType: Assessment Plan,Supervisor Name,Meno Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrdzujú, či sa schôdzka vytvorí v ten istý deň"
@@ -4362,16 +4388,16 @@
 DocType: Journal Entry Account,Employee Advance,Zamestnanec Advance
 DocType: Payroll Entry,Payroll Frequency,mzdové frekvencia
 DocType: Lab Test Template,Sensitivity,citlivosť
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Surovina
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Rastliny a strojné vybavenie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Rastliny a strojné vybavenie
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodennú prácu Súhrnné Nastavenie
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Zadajte Reqd podľa dátumu
 DocType: Payment Entry,Internal Transfer,vnútorné Prevod
 DocType: Asset Maintenance,Maintenance Tasks,Úlohy údržby
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
@@ -4379,14 +4405,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integrácie
 DocType: Crop Cycle,Detected Disease,Zistená choroba
 ,Produced,Produkoval
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Dátum začiatku splácania nemôže byť pred dátumom vyplatenia.
 DocType: Item,Item Code for Suppliers,Položka Kód pre dodávateľa
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
 DocType: Training Event,Trainer Name,Meno tréner
 DocType: Mode of Payment,General,Všeobecný
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posledná komunikácia
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posledná komunikácia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Spárovať úhrady s faktúrami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
@@ -4400,7 +4427,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} na poldenný pobyt na {1}
 DocType: Production Plan,Get Material Request,Získať Materiál Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Poštovní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 ,Item Variant Details,Podrobnosti o variantoch položky
@@ -4411,9 +4438,9 @@
 DocType: Drug Prescription,Hour,Hodina
 DocType: Restaurant Order Entry,Last Sales Invoice,Posledná faktúra predaja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Vyberte položku Qty v položke {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ Iniciatívy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 DocType: Company,Monthly Sales Target,Mesačný cieľ predaja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
@@ -4421,7 +4448,7 @@
 DocType: Item,Default Material Request Type,Predvolený typ materiálovej požiadavky
 DocType: Supplier Scorecard,Evaluation Period,Hodnotiace obdobie
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nevedno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Pracovná objednávka nebola vytvorená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Pracovná objednávka nebola vytvorená
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: Purchase Invoice,Export Type,Typ exportu
 DocType: Salary Slip Loan,Salary Slip Loan,Úverový splátkový úver
@@ -4437,8 +4464,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Otvorenie súhrnu faktúr
 DocType: Education Settings,Education Manager,Správca vzdelávania
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minimálna dĺžka medzi jednotlivými rastlinami v teréne pre optimálny rast
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Doručená položka {0} sa nedá aktualizovať pomocou odsúhlasenia skladových položiek
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Doručená položka {0} sa nedá aktualizovať pomocou odsúhlasenia skladových položiek
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Doručená položka {0} sa nedá aktualizovať pomocou odsúhlasenia skladových položiek
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Doručená položka {0} sa nedá aktualizovať pomocou odsúhlasenia skladových položiek
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: Student,Middle Name,Stredné meno
 DocType: C-Form,Invoices,Faktúry
@@ -4471,20 +4498,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,príjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Group,Send Emails At,Posielať e-maily At
 DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Zobrazenie formulára
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Povinnosť priraďovania nákladov v nárokoch na výdavky
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",Pridajte používateľov do svojej organizácie okrem vás.
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Zatiaľ žiadni zákazníci!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Prehľad o peňažných tokoch
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Žiadna materiálová žiadosť nebola vytvorená
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
@@ -4507,11 +4535,12 @@
 DocType: Vehicle,Chassis No,podvozok Žiadne
 DocType: Payment Request,Initiated,Zahájil
 DocType: Production Plan Item,Planned Start Date,Plánované datum zahájení
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vyberte kusovník
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vyberte kusovník
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Využil integrovanú daň z ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
+DocType: Bank Guarantee,Clauses and Conditions,Doložky a podmienky
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Project Task,View Timesheet,Zobraziť časový rozvrh
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Dátum ukončenia musí byť väčší ako dátum začatia
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
@@ -4525,9 +4554,10 @@
 DocType: Patient,Alcohol Current Use,Alkohol Súčasné použitie
 DocType: Student Admission Program,Student Admission Program,Prijímací program pre študentov
 DocType: Payment Entry,Account Paid To,účet Venovaná
+DocType: Subscription Settings,Grace Period,Doba odkladu
 DocType: Item Alternative,Alternative Item Name,Alternatívny názov položky
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nepodarilo sa odoslať ľubovoľnú platovú schému <br> \ Možné dôvody: <br> \ 1. Čistá mzda je nižšia ako 0. <br> \ 2. E-mailová adresa spoločnosti uvedená v kapitáne zamestnancov nie je platná. <br>
@@ -4537,7 +4567,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude presahovať o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Množství
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,a zrušené Vypnuté v priečinku
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Študentská karta
@@ -4549,14 +4578,16 @@
 DocType: Complaint,Complaint,sťažnosť
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Vykonajte splatenie položky
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Všetky oddelenia
 DocType: Patient,Alcohol Past Use,Použitie alkoholu v minulosti
 DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematické / Stuck
 DocType: Tax Rule,Billing State,Fakturačný štát
 DocType: Share Transfer,Transfer,Převod
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Pred zrušením tejto objednávky musí byť pracovná objednávka {0} zrušená
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Dátum splatnosti je povinný
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
@@ -4580,10 +4611,11 @@
 DocType: Cheque Print Template,Message to show,správa ukázať
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Maloobchod
 DocType: Student Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produktový balíček
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produktový balíček
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nepodarilo sa nájsť skóre od {0}. Musíte mať stály počet bodov od 0 do 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
+DocType: Subscription,Current Invoice Start Date,Aktuálny dátum začiatku faktúry
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetnou alebo kreditnou čiastku je nutné pre {2}
 DocType: GL Entry,Remarks,Poznámky
@@ -4593,11 +4625,13 @@
 DocType: Task,Parent Task,Rodičovská úloha
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,urobiť Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tlač a papiernictva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Tlač a papiernictva
 DocType: Stock Settings,Show Barcode Field,Show čiarového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Poslať Dodávateľ e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat už spracované pre obdobie medzi {0} a {1}, ponechajte dobu použiteľnosti nemôže byť medzi tomto časovom období."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Poslať Dodávateľ e-maily
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat už spracované pre obdobie medzi {0} a {1}, ponechajte dobu použiteľnosti nemôže byť medzi tomto časovom období."
+DocType: Fiscal Year,Auto Created,Automatické vytvorenie
 DocType: Chapter Member,Leave Reason,Nechajte dôvod
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktúra {0} už neexistuje
 DocType: Guardian Interest,Guardian Interest,Guardian Záujem
 DocType: Volunteer,Availability,Dostupnosť
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Nastavte predvolené hodnoty POS faktúr
@@ -4606,14 +4640,13 @@
 DocType: Timesheet,Employee Detail,Detail zamestnanca
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID e-mailu Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
 DocType: Lab Prescription,Test Code,Testovací kód
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavenie titulnej stránky webu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ nie sú povolené pre {0} kvôli postaveniu skóre {1}
 DocType: Job Offer,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Vyššie
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Celková čiastka {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Neplatný atribút {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Celková čiastka {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Neplatný atribút {0} {1}
 DocType: Supplier,Mention if non-standard payable account,"Uveďte, či je neštandardný splatný účet"
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vyberte inú hodnotiacu skupinu ako &quot;Všetky hodnotiace skupiny&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Riadok {0}: Pre položku {1} sa vyžaduje nákladové centrum.
@@ -4624,7 +4657,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analýza vody
 DocType: Chapter,Region,Kraj
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Znova načítať prepojenú analýzu
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
@@ -4640,7 +4673,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Náklady na vyradenie aktív
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
 DocType: Vehicle,Policy No,nie politika
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Získať predmety z Bundle Product
 DocType: Asset,Straight Line,Priamka
 DocType: Project User,Project User,projekt Užívateľ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Rozdeliť
@@ -4679,21 +4712,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,cesta
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
 DocType: Production Plan,Total Planned Qty,Celkový plánovaný počet
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,otvorenie Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,otvorenie Value
 DocType: Salary Detail,Formula,vzorec
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Šablóna testu laboratória
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Predajný účet
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Predajný účet
 DocType: Purchase Invoice Item,Total Weight,Celková váha
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provize z prodeje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Provize z prodeje
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
 DocType: Tax Rule,Billing Country,Fakturačná krajina
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky reštaurácie
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
 DocType: Asset Maintenance Task,Assign To Name,Priradiť k názvu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Výdaje na reprezentaci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Výdaje na reprezentaci
 DocType: Hub Settings,Enabled Users,Povolení používateľov
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Vytvoriť žiadosť na materiál
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Otvorená Položka {0}
@@ -4706,24 +4739,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Žádosti o dovolenou.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Posledné Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Výdavky na právne služby
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Výdavky na právne služby
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vyberte prosím množstvo na riadku
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Vytvorte otvorenie predajných a nákupných faktúr
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturovanej čiastky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonní Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},No Položka s Serial č {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},No Položka s Serial č {0}
 DocType: Email Digest,Open Notifications,Otvorené Oznámenie
 DocType: Payment Entry,Difference Amount (Company Currency),Rozdiel Suma (Company mena)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Přímé náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Přímé náklady
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Cestovní výdaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Pridajte vlastné pole Subscription do doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Purchase Receipt Item,Sample Quantity,Množstvo vzoriek
+DocType: Bank Guarantee,Name of Beneficiary,Názov príjemcu
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Aktualizujte náklady na BOM automaticky prostredníctvom Plánovača na základe najnovšej sadzby ocenenia / cien / posledného nákupu surovín.
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
@@ -4735,14 +4768,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Skúšobná lehota
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Return / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,Automaticky vložiť cenníkovú cenu ak neexistuje
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Celkem uhrazené částky
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Celkem uhrazené částky
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigácia
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Plánování
 DocType: Share Balance,Issued,Vydané
+DocType: Loan,Repayment Start Date,Dátum začiatku splácania
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Aktivita študentov
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platobná brána Podrobnosti
@@ -4755,10 +4789,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Prosím nastaviť predvolený účet v Expense reklamačný typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Prosím nastaviť predvolený účet v Expense reklamačný typu {0}
 DocType: Assessment Result,Student Name,Meno študenta
 DocType: Brand,Item Manager,Manažér položiek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,mzdové Splatné
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,mzdové Splatné
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Plant Analysis,Collection Datetime,Dátum zberu
 DocType: Work Order,Total Operating Cost,Celkové provozní náklady
@@ -4768,9 +4802,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uživatel: {0} neexistuje
 DocType: Payment Term,Day(s) after invoice date,Deň (dni) po dátume fakturácie
 DocType: Payment Schedule,Payment Schedule,Rozvrh platieb
-DocType: Subscription,SUB-,pod-
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Platba Entry už existuje
+DocType: Subscription,Trial Period End Date,Dátum ukončenia skúšobného obdobia
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plat master šablona.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,patológie
@@ -4787,9 +4821,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromadené za mesiac
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenníková cena (mena firmy)
@@ -4798,14 +4832,15 @@
 DocType: Lab Prescription,Test Created,Test bol vytvorený
 DocType: Healthcare Settings,Custom Signature in Print,Vlastný podpis v tlači
 DocType: Account,Temporary,Dočasný
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Číslo zákazníka LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Číslo zákazníka LPO
 DocType: Program,Courses,predmety
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretárka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretárka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokiaľ zakázať, &quot;v slovách&quot; poli nebude viditeľný v akejkoľvek transakcie"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Táto akcia zastaví budúcu fakturáciu. Naozaj chcete zrušiť tento odber?
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Supplier Scorecard Criteria,Criteria Name,Názov kritéria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Nastavte spoločnosť
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Nastavte spoločnosť
 DocType: Pricing Rule,Buying,Nákupy
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Choroby a hnojivá
 DocType: HR Settings,Employee Records to be created by,Zamestnanecké záznamy na vytvorenie kým
@@ -4814,18 +4849,18 @@
 DocType: POS Profile,Apply Discount On,Použiť Zľava na
 DocType: Member,Membership Type,Typ členstva
 ,Reqd By Date,Pr p Podľa dátumu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Věřitelé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Věřitelé
 DocType: Assessment Plan,Assessment Name,Názov Assessment
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Zobraziť PDC v tlači
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Zobraziť PDC v tlači
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ponuka práce
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,inštitút Skratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
@@ -4843,7 +4878,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Makléřská
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Účasť na zamestnancov {0} je už označený pre tento deň
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Účasť na zamestnancov {0} je už označený pre tento deň
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","v minútach 
  aktualizované pomocou ""Time Log"""
@@ -4855,6 +4890,7 @@
 DocType: Lab Test,Approved Date,Schválený dátum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Štandardný predaj
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
+DocType: Subscriber,Subscriber Name,Názov účastníka
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Update Tool,Replace,Vyměnit
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nenašli sa žiadne produkty.
@@ -4864,19 +4900,18 @@
 DocType: Request for Quotation Item,Project Name,Název projektu
 DocType: Customer,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Vyberte účet úrokových výnosov v zamestnaneckom úvere {0}
 DocType: Work Order,Required Items,povinné predmety
 DocType: Stock Ledger Entry,Stock Value Difference,Rozdiel v hodnote zásob
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Ľudské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 DocType: Disease,Treatment Task,Liečebná úloha
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Daňové Aktiva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Update Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronické zariadenia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronické zariadenia
 DocType: Asset,Maintenance Required,Požadovaná údržba
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
@@ -4885,7 +4920,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Vynikající Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Riadok # {0}: Prostriedok je povinné pre dlhodobého majetku nákup / predaj
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Riadok # {0}: Prostriedok je povinné pre dlhodobého majetku nákup / predaj
 DocType: Asset Maintenance Team,Maintenance Team Name,Názov tímu údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Zákazník je povinný, ak je ako zákazník vybratá možnosť &quot;Príležitosť od&quot;"
@@ -4895,19 +4930,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Druhy výdajů nároku.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Miera predaja pre položku {0} je nižšia ako {1}. Miera predaja by mala byť najmenej {2}
-DocType: Item,Taxes,Daně
+DocType: Subscription,Taxes,Daně
 DocType: Purchase Invoice,capital goods,investičný majetok
 DocType: Purchase Invoice Item,Weight Per Unit,Hmotnosť na jednotku
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Platená a nie je doručenie
 DocType: Project,Default Cost Center,Výchozí Center Náklady
-DocType: Bank Guarantee,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transackia na zásobách
 DocType: Budget,Budget Accounts,rozpočtové účty
 DocType: Employee,Internal Work History,Vnitřní práce History
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,oprávky Suma
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Premenná ukazovateľa tabuľky dodávateľov
-DocType: Employee Loan,Fully Disbursed,úplne vyčerpaný
 DocType: Employee Advance,Due Advance Amount,Splatná výška zálohy
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
@@ -4931,7 +4964,7 @@
 ,Employee Information,Informace o zaměstnanci
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
 DocType: Quality Inspection,Incoming,Přicházející
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Predvolené daňové šablóny pre predaj a nákup sú vytvorené.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Hodnotenie výsledkov {0} už existuje.
@@ -4939,7 +4972,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Filtrovanie spoločnosti nastavte prázdne, ak je položka Skupina pod skupinou &quot;Spoločnosť&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Vysielanie dátum nemôže byť budúci dátum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,na generovanie opakujúcich sa
 DocType: Stock Entry,Target Warehouse Address,Adresa cieľového skladu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Leave
 DocType: Agriculture Task,End Day,Koniec dňa
@@ -4964,11 +4996,10 @@
 DocType: Material Request,% Ordered,% Objednané
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",V prípade kurzov študentskej skupiny bude kurz potvrdený pre každého študenta z prihlásených kurzov pri zaradení do programu.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Share Balance,From No,Od č
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nová správa od {odosielateľa}
 DocType: Customer,Customer Primary Address,Primárna adresa zákazníka
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newslettery
 DocType: Drug Prescription,Description/Strength,Opis / Sila
@@ -4977,22 +5008,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Rovnaký bod bol zadaný viackrát
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Purchase Invoice,Tax ID,DIČ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavenie účtu
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,schvaľovať
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformátovaná adresa pre {0}, prosím opravte, aby ste pokračovali."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformátovaná adresa pre {0}, prosím opravte, aby ste pokračovali."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Číslo nového účtu, bude zahrnuté do názvu účtu ako predpona"
 DocType: Maintenance Team Member,Team Member,Člen tímu
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Žiadny výsledok na odoslanie
 DocType: Customer,Sales Partner and Commission,Partner predaja a provízia
-DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sadzba (%) / rok
+DocType: Loan,Rate of Interest (%) / Year,Úroková sadzba (%) / rok
 ,Project Quantity,projekt Množstvo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotiek {1} potrebná {2} pre dokončenie tejto transakcie.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sadzba (%) Ročné
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Čierna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Dočasné Účty
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Shareholder,Contact List,Zoznam kontaktov
 DocType: Account,Auditor,Auditor
@@ -5000,16 +5031,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} predmety vyrobené
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Uč sa viac
 DocType: Cheque Print Template,Distance from top edge,Vzdialenosť od horného okraja
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cenníková cena {0} je zakázaná alebo neexistuje
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cenníková cena {0} je zakázaná alebo neexistuje
 DocType: Purchase Invoice,Return,Spiatočná
 DocType: Pricing Rule,Disable,Zakázat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Spôsob platby je povinný vykonať platbu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Spôsob platby je povinný vykonať platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Upravte celú stránku pre ďalšie možnosti, ako sú aktíva, sériové nosiče, dávky atď."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Menovania a konzultácie
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nie je zapísaná v dávke {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Aktíva {0} nemôže byť vyhodený, ako je to už {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Potrebné kontroly
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Potrebné kontroly
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Označiť ako neprítomný
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Nepodarilo sa nastaviť spoločnosť
@@ -5021,7 +5052,7 @@
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatok Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Pridať položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Pridať položky z
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Plodiny a pôdy
 DocType: Cheque Print Template,Regular,pravidelný
 DocType: Fertilizer,Density (if liquid),Hustota (ak je kvapalná)
@@ -5046,24 +5077,26 @@
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Preskúmajte predajný cyklus
 DocType: Assessment Plan,Supervisor,Nadriadený
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retenčný záznam
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retenčný záznam
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
 ,Work Order Stock Report,Správa o stave pracovnej objednávky
+DocType: Purchase Receipt,Auto Repeat Detail,Podrobnosti o automatickom opakovaní
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledok
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Ako školiteľ
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Navrhnúť kategóriu
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Řízení kvality
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Řízení kvality
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} bol zakázaný
 DocType: Project,Total Billable Amount (via Timesheets),Celková fakturovaná suma (prostredníctvom dochádzky)
 DocType: Agriculture Task,Previous Business Day,Predchádzajúci pracovný deň
-DocType: Employee Loan,Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie
+DocType: Loan,Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie
 DocType: Employee,Health Insurance No,Zdravotné poistenie č
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditná poznámka Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditná poznámka Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Celková zdaniteľná suma
 DocType: Employee External Work History,Employee External Work History,Externá pracovná história zamestnanca
 DocType: Opening Invoice Creation Tool,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Zostatkové množstvo
@@ -5074,16 +5107,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pre {1}
 DocType: Healthcare Settings,Valid number of days,Platný počet dní
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Nákladové středisko
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Reštartujte odber
 DocType: Land Unit,Linked Plant Analysis,Analýza prepojených rastlín
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povoliť sadzbu nulového oceňovania
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Povoliť sadzbu nulového oceňovania
+DocType: Bank Guarantee,Receiving,príjem
 DocType: Training Event Employee,Invited,pozvaný
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Viac aktívny Plat Structures nájdených pre zamestnancov {0} pre dané termíny
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Nastavenia brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Dlouhodobý majetek
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange zisk / strata
 ,GST Purchase Register,Registrácia nákupov GST
 ,Cash Flow,Cash Flow
@@ -5104,9 +5139,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Zoznam všetkých transakcií s akciami
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Musí sa nastaviť dátum spustenia skúšobného obdobia a dátum ukončenia skúšobného obdobia
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Priemerná hodnota
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková čiastka platby v pláne platieb sa musí rovnať veľkému / zaokrúhlenému súčtu
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková čiastka platby v pláne platieb sa musí rovnať veľkému / zaokrúhlenému súčtu
+DocType: Subscription Plan Detail,Plan,plán
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankový zostatok podľa hlavnej knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -5136,6 +5172,7 @@
 DocType: Work Order,Warehouses,Sklady
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} pohľadávku nemôže byť prevedená
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ceny izieb v hoteli
+DocType: Subscription,Days Until Due,Dni až do splatnosti
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Táto položka je variantom {0} (šablóna).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,nákup
@@ -5144,13 +5181,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",V prípade dávkovej študentskej skupiny bude študentská dávka schválená pre každého študenta zo zápisu do programu.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribúcia
+DocType: Journal Entry Account,Loan,pôžička
 DocType: Expense Claim Advance,Expense Claim Advance,Nároky na nárok na výdavky
 DocType: Lab Test,Report Preference,Preferencia prehľadu
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informácie o dobrovoľníkoch.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Citoval Položka Porovnanie
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Prekrývajúci sa bodovanie medzi {0} a {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Čistá hodnota aktív aj na
 DocType: Crop,Produce,vyrobiť
@@ -5160,7 +5198,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Spotreba materiálu na výrobu
 DocType: Item Alternative,Alternative Item Code,Kód alternatívnej položky
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Vyberte položky do výroby
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Vyberte položky do výroby
 DocType: Delivery Stop,Delivery Stop,Zastavenie doručenia
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
 DocType: Item,Material Issue,Material Issue
@@ -5170,15 +5208,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Zobraziť položky
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemôže byť väčšia ako na čas.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Chcete upozorniť všetkých zákazníkov e-mailom?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Chcete upozorniť všetkých zákazníkov e-mailom?
+DocType: Subscription Plan,Billing Interval,Fakturačný interval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Pokračovať
 DocType: Hub Settings,Hub Username,Hubové používateľské meno
 DocType: Salary Detail,Component,komponentov
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotiace kritériá Group
 DocType: Healthcare Settings,Patient Name By,Názov pacienta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Záznam o účtovaní časového rozlíšenia pre platy od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Záznam o účtovaní časového rozlíšenia pre platy od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -5192,23 +5230,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
 DocType: Leave Block List,Applies to Company,Platí pre firmu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
-DocType: Employee Loan,Disbursement Date,vyplatenie Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Príjemcovia&quot; nie sú špecifikované
+DocType: Loan,Disbursement Date,vyplatenie Date
 DocType: BOM Update Tool,Update latest price in all BOMs,Aktualizujte najnovšiu cenu vo všetkých kusovníkoch
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Zdravotný záznam
 DocType: Vehicle,Vehicle,vozidlo
 DocType: Purchase Invoice,In Words,Slovy
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Pred odoslaním zadajte názov banky alebo inštitúcie poskytujúcej pôžičku.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musí byť odoslaná
 DocType: POS Profile,Item Groups,Skupiny položiek
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Sales Order Item,For Production,Pro Výrobu
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Pridajte účet dočasného otvorenia v účtovej tabuľke
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Pridajte účet dočasného otvorenia v účtovej tabuľke
 DocType: Customer,Customer Primary Contact,Primárny kontakt zákazníka
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Časopis uzávierky obdobia
 DocType: Project Task,View Task,Zobraziť Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
+DocType: Bank Guarantee,Bank Guarantee Type,Typ bankovej záruky
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Časť faktúry
 ,Asset Depreciations and Balances,Asset Odpisy a zostatkov
@@ -5219,9 +5258,8 @@
 DocType: Production Plan,Include Subcontracted Items,Zahrňte subdodávateľné položky
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,pripojiť
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Nemožno zmeniť vlastnosti Variantu po prevode zásob. Budete musieť urobiť novú položku.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
-DocType: Employee Loan,Repay from Salary,Splatiť z platu
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+DocType: Loan,Repay from Salary,Splatiť z platu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Požiadavka na platbu proti {0} {1} na sumu {2}
 DocType: Salary Slip,Salary Slip,Plat Slip
@@ -5245,11 +5283,11 @@
 DocType: Employee Education,Employee Education,Vzdelávanie zamestnancov
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicitné skupinu položiek uvedené v tabuľke na položku v skupine
 DocType: Land Unit,Parent Land Unit,Rodičovská jednotka
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
 DocType: Fertilizer,Fertilizer Name,Názov hnojiva
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Cash Flow Mapping Accounts,Account,Účet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
 DocType: Expense Claim,Vehicle Log,jázd
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prítomnosť horúčky (teplota&gt; 38,5 ° C alebo udržiavaná teplota&gt; 38 ° C / 100,4 ° F)"
@@ -5290,24 +5328,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
 DocType: Asset Maintenance,Manufacturing User,Používateľ výroby
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
-DocType: C-Form,Series,Série
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Mena cenníka {0} musí byť {1} alebo {2}
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Položka Klasifikace
 DocType: Driver,License Number,Číslo licencie
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Faktúra Registrácia pacienta
 DocType: Crop,Period,Obdobie
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Hlavná Účtovná Kniha
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zamestnancov {0} na dovolenke z {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zamestnancov {0} na dovolenke z {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Obchodné iniciatívy
 DocType: Program Enrollment Tool,New Program,nový program
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Prosím, najprv vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Prosím, najprv vyberte {0}"
 DocType: Appointment Type,Physician,lekár
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konzultácie
@@ -5315,15 +5352,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nemôže byť väčšia ako plánované množstvo ({2}) v pracovnom poradí {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas list pre výrobu.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,medzisúčet
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Nemožno zmeniť vlastnosti Variantu po transakcii s akciami. Budete musieť urobiť novú položku.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA mandát
 DocType: Physician,Charges,poplatky
 DocType: Production Plan,Get Items For Work Order,Získajte položky pre pracovnú objednávku
 DocType: Salary Detail,Default Amount,Výchozí částka
 DocType: Lab Test Template,Descriptive,opisný
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Sklad nebyl nalezen v systému
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tento mesiac je zhrnutie
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Nastavte cieľ predaja, ktorý chcete dosiahnuť pre vašu spoločnosť."
 ,Project wise Stock Tracking,Sledování zboží dle projektu
@@ -5351,11 +5389,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Nepodarilo sa vytvoriť webové stránky
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Už vytvorený záznam o zadržaní alebo množstvo neposkytnuté
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Už vytvorený záznam o zadržaní alebo množstvo neposkytnuté
 DocType: Program,Program Abbreviation,program Skratka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
-DocType: Bank Guarantee,Start Date,Dátum začiatku
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávne vymazané
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -5370,11 +5407,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
 DocType: Purchase Invoice,04-Correction in Invoice,04 - Oprava faktúry
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Pracovná objednávka už vytvorená pre všetky položky s kusovníkom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Pracovná objednávka už vytvorená pre všetky položky s kusovníkom
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Details Report
 DocType: Setup Progress Action,Setup Progress Action,Akcia pokroku pri inštalácii
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Nákupný cenník
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Nákupný cenník
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Zrušiť odber
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Vyberte stav údržby ako dokončené alebo odstráňte dátum dokončenia
 DocType: Supplier,Default Payment Terms Template,Šablóna predvolených platobných podmienok
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Mena transakcie musí byť rovnaká ako platobná brána menu
@@ -5385,7 +5423,6 @@
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akčný ak súhrnné mesačný rozpočet prekročený
-DocType: Subscription,Submit on creation,Potvrdiť pri vytvorení
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Mena pre {0} musí byť {1}
 DocType: Asset,Disposal Date,Likvidácia Dátum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budú zaslané všetkým aktívnym zamestnancom spoločnosti v danú hodinu, ak nemajú dovolenku. Zhrnutie odpovedí budú zaslané do polnoci."
@@ -5404,6 +5441,7 @@
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablóny tlače
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Počet dní po uplynutí dátumu faktúry pred zrušením predplatného alebo označením predplatného ako nezaplateného
 DocType: Lab Test Template,Sample Collection,Zbierka vzoriek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
 DocType: Price List,Price List Name,Názov cenníka
@@ -5412,7 +5450,7 @@
 DocType: Account,Income,Příjem
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Niečo sa pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Predajná faktúra {0} už bola odoslaná
 DocType: Supplier Scorecard Scoring Criteria,Score,skóre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiškálny rok {0} neexistuje
@@ -5432,12 +5470,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} by mala byť hodnota medzi 0 a 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Nasledujúci Dátum odpisovania nemôže byť pred dátumom k dispozícii
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maximálna pracovná doba proti časového rozvrhu
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Celkem uhrazeno Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Celkem uhrazeno Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Přijaté a Přijato
 DocType: Hub Settings,Company and Seller Profile,Profil spoločnosti a predajcu
@@ -5451,10 +5489,9 @@
 DocType: Item,Variant Based On,Variant založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vaši Dodávatelia
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prosím opravte
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 DocType: Request for Quotation Item,Supplier Part No,Žiadny dodávateľ Part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,anonymný
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Prijaté Od
 DocType: Lead,Converted,Převedené
@@ -5468,6 +5505,7 @@
 DocType: Asset,Assets,Aktíva
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
+DocType: Subscription,Current Invoice End Date,Aktuálny dátum ukončenia faktúry
 DocType: Payment Term,Due Date Based On,Dátum splatnosti založený na
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Nastavte predvolenú skupinu zákazníkov a územie v nastaveniach predaja
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} neexistuje
@@ -5475,7 +5513,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Neboli vybraté žiadne splátky pre záznam denníka
 DocType: Payment Reconciliation,From Invoice Date,Z faktúry Dátum
+DocType: Loan,Disbursed,vyplatená
 DocType: Healthcare Settings,Laboratory Settings,Laboratórne nastavenia
 DocType: Patient Appointment,Service Unit,Servisná jednotka
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Úspešne nastaviť dodávateľa
@@ -5488,12 +5528,12 @@
 DocType: Share Balance,No of Shares,Počet akcií
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Vyberte položku Stav
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Meno dom
 DocType: Fee Schedule,Total Amount per Student,Celková suma na študenta
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrický
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridajte ostatných z vašej organizácie ako používateľov. Môžete tiež pridať a pozvať zákazníkov na portál ich pridaním zo zoznamu kontaktov
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 DocType: Grant Application,Requested Amount,Požadovaná suma
@@ -5503,7 +5543,7 @@
 DocType: Crop Cycle,Detected Diseases,Zistené choroby
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Narozeninová připomínka pro {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 DocType: Asset Maintenance Task,Last Completion Date,Posledný dátum dokončenia
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
@@ -5511,9 +5551,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Nastavenia GoCardless
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Stock Aktiva
 DocType: Restaurant,Active Menu,Aktívna ponuka
 DocType: Target Detail,Target Qty,Target Množství
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Proti úveru: {0}
 DocType: Shopping Cart Settings,Checkout Settings,pokladňa Nastavenie
 DocType: Student Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
@@ -5522,9 +5563,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo najazdených kilometrov
 DocType: Production Plan Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
 DocType: Chapter,Chapter Head,Kapitola hlavu
 DocType: Payment Term,Month(s) after the end of the invoice month,Mesiac (mesiace) po skončení mesiaca faktúry
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektová činnost / úkol.
@@ -5532,11 +5573,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Výsledok dátumu výsledku laboratória nemôže byť pred dátumom testovania
 DocType: POS Profile,Allow user to edit Discount,Povoliť používateľovi upraviť zľavu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Získajte zákazníkov z
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Získajte zákazníkov z
 DocType: Purchase Invoice Item,Include Exploded Items,Zahrňte explodované položky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: Shipping Rule,Restrict to Countries,Obmedziť na krajiny
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
 DocType: Sales Invoice Timesheet,Billing Hours,billing Hodiny
 DocType: Project,Total Sales Amount (via Sales Order),Celková výška predaja (prostredníctvom objednávky predaja)
@@ -5555,6 +5597,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Manažér pre hodnotenie
 DocType: Payment Entry,Allocate Payment Amount,Vyčleniť sumu platby
+DocType: Subscription Plan,Subscription Plan,Plán predplatného
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
@@ -5580,9 +5623,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Sila
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Inštalácia predvolieb
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Pre zákazníka nie je vybratá žiadna dodacia poznámka {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Pre zákazníka nie je vybratá žiadna dodacia poznámka {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM nahradil
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Vyberte položku podľa dátumu doručenia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Vyberte položku podľa dátumu doručenia
 DocType: Grant Application,Has any past Grant Record,Má nejaký predchádzajúci grantový záznam
 ,Sales Analytics,Analýza predaja
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},K dispozícii {0}
@@ -5601,7 +5644,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervácia izieb v hoteli
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Služby zákazníkům
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuka kandidát Job.
@@ -5618,7 +5661,7 @@
 DocType: Fees,Student Details,Podrobnosti študenta
 DocType: Purchase Invoice Item,Stock Qty,Množstvo zásob
 DocType: Purchase Invoice Item,Stock Qty,Množstvo zásob
-DocType: Employee Loan,Repayment Period in Months,Doba splácania v mesiacoch
+DocType: Loan,Repayment Period in Months,Doba splácania v mesiacoch
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Chyba: Nie je platný id?
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
@@ -5627,7 +5670,7 @@
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Vyrobené Množstvo
 DocType: Timesheet,Work Detail,Detail práce
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inženýr
 DocType: Journal Entry,Total Amount Currency,Celková suma Mena
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhľadávanie Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
@@ -5673,13 +5716,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informácie o dárcovom type.
 DocType: Request for Quotation,Supplier Detail,Detail dodávateľa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Chyba vo vzorci alebo stave: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturovaná čiastka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturovaná čiastka
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kritériové váhy musia pripočítať až 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Účast
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Položky zásob
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Vytváranie {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cieľové skladov nemôžu byť rovnaké
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
@@ -5703,14 +5745,14 @@
 DocType: Shipping Rule,Fixed,fixné
 DocType: Vehicle Service,Clutch Plate,kotúč spojky
 DocType: Company,Round Off Account,Zaokrúhliť účet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativní náklady
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-DocType: Journal Entry,Subscription,predplatné
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,predplatné
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Tvorba poplatkov čaká
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Výpovedná Lehota
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Výpovedná Lehota
 DocType: Asset Category,Asset Category Name,Asset názov kategórie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Meno Nová Sales Osoba
@@ -5724,7 +5766,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
 DocType: Asset,Frequency of Depreciation (Months),Frekvencia odpisy (mesiace)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Úverový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
@@ -5732,7 +5774,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
 DocType: Hub Settings,Company Logo,Logo spoločnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 DocType: Healthcare Settings,Patient Registration,Registrácia pacienta
@@ -5766,11 +5808,10 @@
 DocType: Journal Entry,Total Debit,Celkem Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Východzí hotových výrobkov Warehouse
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Vyberte pacienta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Predajca
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Predajca
 DocType: Hotel Room Package,Amenities,Vybavenie
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Rozpočet a nákladového strediska
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Nie je povolený viacnásobný predvolený spôsob platby
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pre
 ,Appointment Analytics,Aplikácia Analytics
 DocType: Vehicle Service,Half Yearly,Polročne
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -5787,6 +5828,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Nechajte prázdne, ak robíte študentské skupiny ročne"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikácie používajúce aktuálny kľúč nebudú mať prístup, určite?"
+DocType: Subscription Settings,Prorate,kľúčovanie
 DocType: Purchase Invoice,Total Advance,Total Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Zmena kódu šablóny
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termínovaný Dátum ukončenia nesmie byť starší ako Počiatočný dátum doby platnosti. Opravte dáta a skúste to znova.
@@ -5798,8 +5840,9 @@
 DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 DocType: Cheque Print Template,Signatory Position,signatár Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Nastaviť ako Nezískané
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Nastaviť ako Nezískané
 DocType: Timesheet,Total Billable Hours,Celkovo zúčtované hodiny
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Počet dní, ktoré musí účastník zaplatiť faktúry generované týmto odberom"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplatení Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To je založené na transakciách proti tomuto zákazníkovi. Pozri časovú os nižšie podrobnosti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Riadok {0}: Pridelená suma {1} musí byť menší ako alebo sa rovná sume zaplatení výstavného {2}
@@ -5818,12 +5861,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Informácie o spoločnosti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Vyberte alebo pridajte nového zákazníka
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založené na účasti základu tohto zamestnanca
 DocType: Assessment Result,Summary,zhrnutie
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Označenie účasti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debetné účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debetné účet
 DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Meno zamestnanca
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Položka objednávky reštaurácie
@@ -5835,7 +5878,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,suma nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Zamestnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Zamestnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Balené množstvo se musí rovnať množstvu pre položku {0} v riadku {1}
 DocType: Work Order,Manufactured Qty,Vyrobeno Množství
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Akcie neexistujú pri {0}
@@ -5843,12 +5886,12 @@
 DocType: Asset,Out of Order,Mimo prevádzky
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množstvo
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorovať prekrytie pracovnej doby
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Vyberte dávkové čísla
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faktúry zákazníkom
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
 DocType: Patient Service Unit,Medical Administrator,Zdravotnícky administrátor
 DocType: Assessment Plan,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
@@ -5878,15 +5921,16 @@
 DocType: Asset Repair,Repair Status,Stav opravy
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
 DocType: POS Profile,Account for Change Amount,Účet pre zmenu Suma
 DocType: Purchase Invoice,input service,vstupná služba
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Člen tímu údržby
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analýza pôdy
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kód kurzu:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
 DocType: Employee,Current Address,Aktuálna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -5934,19 +5978,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Prijímacie konanie pre {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Názov premennej
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
 DocType: Asset,Asset Category,asset Kategórie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Netto plat nemôže byť záporný
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiál Dodávateľovi
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Plánovanie žiadostí o materiál
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Spotrebný Faktúra
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prah {0}% sa objaví viac ako raz
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštevnosť
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Krátkodobé závazky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Krátkodobé závazky
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Časovač prekročil daný čas.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Patient,A Positive,Pozitívny
@@ -5957,9 +6001,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutočné množstvo je povinné
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v súčasnosti má postavenie {1} Scorecardu pre dodávateľov a nákupné objednávky tomuto dodávateľovi by mali byť vydané opatrne.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Tím na údržbu aktív
-DocType: Employee Loan,Loan Type,pôžička Type
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} bola úspešne odoslaná
+DocType: Loan,Loan Type,pôžička Type
 DocType: Scheduling Tool,Scheduling Tool,plánovanie Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
@@ -5991,7 +6036,7 @@
 DocType: Item,Units of Measure,merné jednotky
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Invoice,Customer's Purchase Order Date,Zákazníka Objednávka Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Základný kapitál
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Základný kapitál
 DocType: Shopping Cart Settings,Show Public Attachments,Zobraziť verejné prílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Restaurant Reservation,Reservation Time,Čas rezervácie
@@ -6006,7 +6051,7 @@
 DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Riadok # {0}: Reqd by Date nemôže byť pred dátumom transakcie
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Predstavované produkty
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
@@ -6016,20 +6061,20 @@
 DocType: Driver,Expiry Date,Datum vypršení platnosti
 DocType: Healthcare Settings,Employee name and designation in print,Meno a označenie zamestnanca v tlači
 ,accounts-browser,Účty-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Nejdřív vyberte kategorii
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Ak chcete povoliť over-fakturáciu alebo over-objednávanie, aktualizujte &quot;príspevok&quot; v Nastavenie sklade, alebo výtlačku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pól dňa)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pól dňa)
 DocType: Payment Term,Credit Days,Úvěrové dny
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Ak chcete získať laboratórne testy, vyberte položku Pacient"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Urobiť Študent Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Vek Obchodnej iniciatívy v dňoch
 DocType: Cash Flow Mapping,Is Income Tax Expense,Daň z príjmov
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Skontrolujte, či študent býva v hosteli inštitútu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
 ,Stock Summary,Sumár zásob
@@ -6040,10 +6085,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Prevádzkové náklady (Company mena)
-DocType: Employee Loan Application,Rate of Interest,úroková sadzba
+DocType: Loan Application,Rate of Interest,úroková sadzba
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionovaná čiastka
 DocType: Item,Shelf Life In Days,Životnosť počas dní
 DocType: GL Entry,Is Opening,Se otevírá
+DocType: Department,Expense Approvers,Sprostredkovatelia výdavkov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
 DocType: Journal Entry,Subscription Section,Sekcia odberu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Účet {0} neexistuje
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 8ceb402..4fbfe6d 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Poročila o oceni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Podrobnosti o naročnini
 DocType: Supplier Scorecard,Notify Supplier,Obvesti dobavitelja
 DocType: Item,Customer Items,Artikli stranke
 DocType: Project,Costing and Billing,Obračunavanje stroškov in plačevanja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matični račun {1} ne more biti Glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-poštna obvestila
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,vrednotenje
 DocType: Item,Default Unit of Measure,Privzeto mersko enoto
 DocType: SMS Center,All Sales Partner Contact,Vse Sales Partner Kontakt
-DocType: Employee,Leave Approvers,Pustite Approvers
+DocType: Department,Leave Approvers,Pustite Approvers
 DocType: Sales Partner,Dealer,Trgovec
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Preiskave
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Preveri razpoložljivost
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ta temelji na transakcijah proti temu dobavitelju. Oglejte si časovnico spodaj za podrobnosti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Pravna
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Pravna
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0}
 DocType: Bank Guarantee,Customer,Stranka
 DocType: Purchase Receipt Item,Required By,Zahtevani Z
 DocType: Delivery Note,Return Against Delivery Note,Vrni Proti dobavnica
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Glave (ali skupine) po katerih so narejene vknjižbe in se ohranjajo bilance.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Za obdelavo ni predloženih plačljivih lističev.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Za obdelavo ni predloženih plačljivih lističev.
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži odprte
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,To akcijo je treba sprejeti sam danes za zgoraj omenjeno ponavljajoče se obdobje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Zaporedje uspešno posodobljeno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Naročilo
 DocType: Pricing Rule,Apply On,Nanesite na
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt
 DocType: Support Settings,Support Settings,Nastavitve podpora
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Leave Application
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Serija Točka preteka Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank Osnutek
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank Osnutek
 DocType: Membership,membership validaty section,članstvo veljaven oddelek
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 DocType: Consultation,Consultation,Posvetovanje
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Izdelava spletne strani
 DocType: Opening Invoice Creation Tool Item,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Predstavlja tabela ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Posojili (obveznosti)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Predstavlja tabela ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Posojili (obveznosti)
 DocType: Employee Education,Year of Passing,"Leto, ki poteka"
 DocType: Item,Country of Origin,Država izvora
 DocType: Soil Texture,Soil Texture Criteria,Kriteriji za teksturo tal
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primarni kontaktni podatki
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,odprta vprašanja
 DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
 DocType: Lab Test Groups,Add new line,Dodaj novo vrstico
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Zdravstvo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zamuda pri plačilu (dnevi)
@@ -89,7 +85,7 @@
 ,Delay Days,Dnevi zamude
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Račun
+DocType: Subscription Invoice,Invoice,Račun
 DocType: Purchase Invoice Item,Item Weight Details,Element Teža Podrobnosti
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Vrstica # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Vrstica # {0}:
 DocType: Timesheet,Total Costing Amount,Skupaj Stanejo Znesek
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Izberite Cenik
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,V razvoju
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Izberite datum
 DocType: Daily Work Summary Group,Holiday List,Seznam praznikov
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Računovodja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Računovodja
 DocType: Hub Settings,Selling Price List,Prodajni cenik
 DocType: Patient,Tobacco Current Use,Trenutna uporaba tobaka
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prodajna cena
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Prodajna cena
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
 DocType: Company,Phone No,Telefon
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Nov {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Poslano je poslano obvestilo o e-pošti
 ,Sales Partners Commission,Partnerji Sales Komisija
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Vrednost po amortizaciji
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Podobni
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Datum udeležba ne sme biti manjša od povezuje datumu zaposlenega
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Datum udeležba ne sme biti manjša od povezuje datumu zaposlenega
 DocType: Grading Scale,Grading Scale Name,Ocenjevalna lestvica Ime
-DocType: Subscription,Repeat on Day,Ponovi na dan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je račun root in jih ni mogoče urejati.
 DocType: Sales Invoice,Company Address,Naslov podjetja
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ni mogoče nastaviti dovoljenja na podlagi popust za {0}
+DocType: Subscription,Subscription Start Date,Začetni datum naročnine
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripni datoteko .csv z dvema stolpcema, eno za staro ime in enega za novim imenom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ni v nobenem poslovnem letu
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Oznaka: {1} in stranke: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Datum konca poskusnega obdobja ne more biti pred začetkom začetnega poskusnega obdobja
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Odpiranje za službo.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM ni določen za podizvajalsko postavko {0} v vrstici {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Patient,Married,Poročen
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ni dovoljeno za {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pridobi artikle iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Pridobi artikle iz
 DocType: Price List,Price Not UOM Dependant,Cena ni odvisna od UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Izdelek {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Zavorna olja
 DocType: Tax Rule,Tax Type,Davčna Type
 ,Completed Work Orders,Dokončana delovna naročila
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Davčna osnova
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Davčna osnova
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
 DocType: BOM,Item Image (if not slideshow),Postavka Image (če ne slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urna postavka / 60) * Dejanski  čas operacije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Vrstica # {0}: Referenčni dokument mora biti eden od zahtevkov za stroške ali vpisa v dnevnik
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Izberite BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Vrstica # {0}: Referenčni dokument mora biti eden od zahtevkov za stroške ali vpisa v dnevnik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Izberite BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,"Upravljajte znesek vnaprej, ki ga dobite zaposleni"
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Obvestilo o dostavi
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun Pay samo
-DocType: Employee Loan,Repay Over Number of Periods,Odplačilo Over število obdobij
+DocType: Loan,Repay Over Number of Periods,Odplačilo Over število obdobij
 DocType: Stock Entry,Additional Costs,Dodatni stroški
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
 DocType: Lead,Product Enquiry,Povpraševanje izdelek
 DocType: Education Settings,Validate Batch for Students in Student Group,Potrdite Batch za študente v študentskih skupine
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Št odsotnost zapisa dalo za delavca {0} za {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Št odsotnost zapisa dalo za delavca {0} za {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosimo, da najprej vnesete podjetje"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Prosimo, izberite Company najprej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Prosimo, izberite Company najprej"
 DocType: Employee Education,Under Graduate,Pod Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Prosimo, nastavite privzeto predlogo za obvestilo o opustitvi statusa v HR nastavitvah."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,zaposlenih Loan
 DocType: Fee Schedule,Send Payment Request Email,Pošlji e-pošto za plačilni zahtevek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Nepremičnina
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Uspešno neregistriran.
 DocType: Assessment Result,Grade,razred
 DocType: Restaurant Table,No of Seats,Število sedežev
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Če želite dodati dinamični predmet, uporabite oznake z oznako <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: Asset Maintenance Task,Asset Maintenance Task,Naloga vzdrževanja sredstev
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Letne plače
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Letne plače
 DocType: Daily Work Summary,Daily Work Summary,Dnevni Delo Povzetek
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} je zamrznjeno
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Zaloga Stroški
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Zaloga Stroški
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Izberite Target Skladišče
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Izberite Target Skladišče
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vnesite Želeni Kontakt Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Vnesite Želeni Kontakt Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Začetek
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Primarni naslov
 DocType: Production Plan,Material Request Detail,Materialna zahteva Podrobnosti
 DocType: Selling Settings,Default Quotation Validity Days,Privzeti dnevi veljavnosti ponudbe
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 DocType: Sales Invoice,Change Amount,Znesek spremembe
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kategorije vozniških dovoljenj
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Vnesite datum dostave
 DocType: Depreciation Schedule,Make Depreciation Entry,Naj Amortizacija Začetek
+DocType: HR Settings,Leave Settings,Pustite nastavitve
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahteva Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Naj Zaposleni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Način nastavitve POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Onemogoči ustvarjanje časovnih dnevnikov z delovnimi nalogi. Operacijam se ne sme slediti delovnemu nalogu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Izvedba
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Izvedba
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
 DocType: Asset Maintenance Log,Maintenance Status,Status vzdrževanje
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Podrobnosti o članstvu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: zahtevan je Dobavitelj za račun izdatkov {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Predmeti in Pricing
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Skupno število ur: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Prednost
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Prednost
 DocType: Grant Application,Individual,Individualno
 DocType: Academic Term,Academics User,akademiki Uporabnik
 DocType: Cheque Print Template,Amount In Figure,Znesek v sliki
-DocType: Employee Loan Application,Loan Info,posojilo Info
+DocType: Loan Application,Loan Info,posojilo Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Načrt za vzdrževanje obiskov.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Period ocenjevanja dobaviteljev
 DocType: Share Transfer,Share Transfer,Prenos delnic
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Predloga postavke
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemija
 DocType: Job Offer,Select Terms and Conditions,Izberite Pogoji
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,iz Vrednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,iz Vrednost
 DocType: Woocommerce Settings,Woocommerce Settings,Nastavitve Woocommerce
 DocType: Production Plan,Sales Orders,Naročila Kupcev
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Privzeto Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizija
 DocType: Work Order Operation,Updated via 'Time Log',Posodobljeno preko &quot;Čas Logu&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Izberite kupca ali dobavitelja.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Seznam zaporedij za to transakcijo
 DocType: Company,Enable Perpetual Inventory,Omogoči nepretrganega popisovanja
+DocType: Bank Guarantee,Charges Incurred,"Stroški, nastali"
 DocType: Company,Default Payroll Payable Account,Privzeto Plače plačljivo račun
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Posodobitev e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstopna odprtina
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Rezultat po meri
 DocType: Delivery Stop,Contact Name,Kontaktno ime
 DocType: Course Assessment Criteria,Course Assessment Criteria,Merila ocenjevanja tečaj
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Davčna številka:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Davčna številka:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Študentski ID:
 DocType: POS Customer Group,POS Customer Group,POS Group stranke
 DocType: Land Unit,Land Unit describing various land assets,"Land enota, ki opisuje različna zemljišča"
@@ -375,9 +372,8 @@
 ,Open Work Orders,Odpiranje delovnih nalogov
 DocType: Payment Term,Credit Months,Kreditni meseci
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Neto plača ne sme biti manjši od 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Če želite prenehati pošiljati ponavljajoča obvestila o napakah iz sistema, smo v naročnini označili polje Disabled"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Listi na leto
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Listi na leto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite &quot;Je Advance&quot; proti račun {1}, če je to predujem vnos."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Prosimo, nastavite Študente v študentskih skupinah"
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,bančni vnosi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,bančni vnosi
 DocType: Crop,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Orodje za oblikovanje študent Group tečaj
 DocType: Lead,Do Not Contact,Ne Pišite
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Ljudje, ki poučujejo v vaši organizaciji"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Razvijalec programske opreme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Course Scheduling Tool,Course Start Date,Datum začetka predmeta
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Objavite v Hub
 DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Zahteva za material
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Nakup Podrobnosti
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max razred
 DocType: Email Digest,New Quotations,Nove ponudbe
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-pošta plačilni list na zaposlenega, ki temelji na prednostni e-pošti izbrani na zaposlenega"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja"
 DocType: Tax Rule,Shipping County,Dostava County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Naučite
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučite
 DocType: Asset,Next Depreciation Date,Naslednja Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Stroški dejavnost na zaposlenega
 DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neporavnani čeki in depoziti želite počistiti
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Vrstica # {0} {1} ne more biti negativna za element {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Vrstica # {0} {1} ne more biti negativna za element {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Napačno geslo
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Prosimo, nastavite hotelsko sobo na {"
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Račun Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Poročilo o dostavi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Poročilo o dostavi
 DocType: Consultation,Encounter Impression,Ujemanje prikaza
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Stroški Prodano sredstvi
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Seveda razporejanje orodje
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Nujno] Napaka med ustvarjanjem ponavljajočega  %s za %s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
 DocType: Land Unit,LInked Analysis,LInked analiza
 DocType: Item Tax,Tax Rate,Davčna stopnja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Obdobje uporabe ne more biti v dveh evidencah dodelitve
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Obdobje uporabe ne more biti v dveh evidencah dodelitve
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljeno za zaposlenega {1} za obdobje {2} do {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Prejeto
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Ustvarjanje skupin študentov
 DocType: Volunteer,Weekends,Vikendi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Credit Opomba Znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Credit Opomba Znesek
 DocType: Setup Progress Action,Action Document,Akcijski dokument
 DocType: Chapter Member,Website URL,Spletna stran URL
 ,Finished Goods,"Končnih izdelkov,"
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj artikel
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postavka Inšpekcijski parametrov kakovosti
+DocType: Leave Application,Leave Approver Name,Pustite odobritelju Name
 DocType: Depreciation Schedule,Schedule Date,Urnik Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Plače, Odbitki in druge komponente plač"
 DocType: Packed Item,Packed Item,Pakirani Postavka
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
 DocType: Healthcare Settings,Require Lab Test Approval,Zahtevajte odobritev testa za laboratorij
 DocType: Salary Slip Timesheet,Working Hours,Delovni čas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Skupaj izjemen
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Skupaj izjemen
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
 DocType: Dosage Strength,Strength,Moč
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Ustvari novo stranko
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Potrošni stroški
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Razlog za izgubo
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Razlog za izgubo
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Posodobi številko računa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Svinec Lastnik ne more biti isto kot vodilni
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Dodeljen znesek ne more večja od neprilagojene zneska
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Samski
 DocType: Salary Slip,Total Loan Repayment,Skupaj posojila Povračilo
 DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga
-DocType: Subscription,Yearly,Letni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vnesite stroškovni center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Vnesite stroškovni center
 DocType: Drug Prescription,Dosage,Odmerjanje
 DocType: Journal Entry Account,Sales Order,Naročilo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodajni tečaj
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Prodajni tečaj
 DocType: Assessment Plan,Examiner Name,Ime Examiner
 DocType: Lab Test Template,No Result,Ne Rezultat
 DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja"
 DocType: Purchase Invoice,Supplier Name,Dobavitelj Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Preberite priročnik ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Prikaži liste vseh članov oddelka v koledarju
 DocType: Purchase Invoice,01-Sales Return,01-Prodaja Vrnitev
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,Dokler naročilnice
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obvezno polje - študijsko leto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ni povezan z {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Prilagodite uvodno besedilo, ki gre kot del te e-pošte. Vsaka transakcija ima ločeno uvodno besedilo."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Prosimo, nastavite privzeto se plača račun za podjetje {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Prosimo, nastavite privzeto se plača račun za podjetje {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transakcija ni dovoljena prekinjena Delovni nalog {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Upravnik praznikov
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodajo
 DocType: Packing Slip,From Package No.,Od paketa No.
 DocType: Item Attribute,To Range,Da Domet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ne more spremeniti metode vrednotenja, kot so transakcije pred nekaj elementov, ki ga ne imeti svojo lastno metodo vrednotenja"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Vrednostne papirje in depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ne more spremeniti metode vrednotenja, kot so transakcije pred nekaj elementov, ki ga ne imeti svojo lastno metodo vrednotenja"
 DocType: Student Report Generation Tool,Attended by Parents,Obiskujejo starši
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Patient,AB Positive,AB pozitivno
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Šivih.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,"Plača Komponenta za Timesheet na izplačane plače, ki temelji."
 DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta
-DocType: Employee Loan,Total Payment,Skupaj plačila
+DocType: Loan,Total Payment,Skupaj plačila
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Transakcije za zaključeno delovno nalogo ni mogoče preklicati.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} je preklican, dejanje ne more biti dokončano"
@@ -662,15 +657,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dovolj deli za izgradnjo
 DocType: POS Profile User,POS Profile User,POS profil uporabnika
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Neposredne dohodkovne
+DocType: Subscription Invoice,Subscription Invoice,Naročniški račun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Neposredne dohodkovne
 DocType: Patient Appointment,Date TIme,Datum čas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Upravni uradnik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Upravni uradnik
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Ustanovitev podjetja in davkov
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Izberite tečaj
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,Ur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Prosimo, izberite Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry Detail,Difference Account,Razlika račun
 DocType: Purchase Invoice,Supplier GSTIN,Dobavitelj GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Predloga za preslikavo denarnega toka
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
+DocType: Bank Guarantee,Providing,Zagotavljanje
 DocType: Account,Profit and Loss,Dobiček in izguba
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ni dovoljeno, če je potrebno, konfigurirate preskusno različico Lab Labels"
 DocType: Patient,Risk Factors,Dejavniki tveganja
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
 DocType: Healthcare Settings,Appointment Confirmation,Potrditev imenovanja
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Zapiranje (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Pozdravljeni
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Move Item
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Že nastavljeno privzeto v profilu pos {0} za uporabnika {1}, prijazno onemogočeno privzeto"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,nakopičene Vrednosti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Ozemlje je obvezno v profilu POS
 DocType: Supplier,Prevent RFQs,Preprečite RFQ-je
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Naredite Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Plačilo za plačilo je oddano za obdobje od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Plačilo za plačilo je oddano za obdobje od {0} do {1}
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,ID Ponudbe
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Datum pošiljanja
 DocType: Production Plan,Production Plan,Načrt proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Odpiranje orodja za ustvarjanje računov
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Prodaja Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Prodaja Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opomba: Skupna dodeljena listi {0} ne sme biti manjši od že odobrene listov {1} za obdobje
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Nastavite količino transakcij na podlagi serijskega vhoda
 ,Total Stock Summary,Skupaj Stock Povzetek
 DocType: Announcement,Posted By,Avtor
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,Ponudba za
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavite Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Nastavite Company
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Training Result Employee,Training Result Employee,Usposabljanje Rezultat zaposlenih
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
-DocType: Repayment Schedule,Principal Amount,glavni Znesek
-DocType: Employee Loan Application,Total Payable Interest,Skupaj plačljivo Obresti
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,glavni Znesek
+DocType: Loan Application,Total Payable Interest,Skupaj plačljivo Obresti
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Skupno izjemno: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restavracij
 DocType: Land Unit,Land Unit Name,Ime enote zemljišča
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Predlog Pisanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Predlog Pisanje
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plačilo Začetek odštevanja
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Zavijanje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Obvesti stranke po e-pošti
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Obvesti stranke po e-pošti
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih
 DocType: Employee Advance,Claimed Amount,Zahtevani znesek
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Plačilo Gateway računa ni ustvaril, si ustvariti ročno."
 DocType: Supplier Scorecard,Per Year,Letno
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ni upravičen do sprejema v tem programu kot na DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
 DocType: Sales Invoice,Sales Taxes and Charges,Prodajne Davki in dajatve
 DocType: Employee,Organization Profile,Organizacija Profil
 DocType: Vital Signs,Height (In Meter),Višina (v metrih)
 DocType: Student,Sibling Details,sorodstvena Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozila
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,"Samodejno sproži zahteva povratne informacije, ki temeljijo na pogojih."
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,"Samodejno sproži zahteva povratne informacije, ki temeljijo na pogojih."
 DocType: Employee,Reason for Resignation,Razlog za odstop
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Predloga za izvajanje cenitve.
 DocType: Sales Invoice,Credit Note Issued,Credit Note Izdano
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Vzdrževanje Urnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Neto sprememba v popisu
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Posojilo Employee Management
 DocType: Employee,Passport Number,Številka potnega lista
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Povezava z skrbnika2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plačilo Od / Do
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavite račun v Galeriji {0}
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,Prenos materialov
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Pot ni mogla najti
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Odprtje (Dr)
+DocType: Loan,Applicant,Vlagatelj
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Napotitev žig mora biti po {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Za ponavljajoče se dokumente
 ,GST Itemised Purchase Register,DDV Razčlenjeni Nakup Registracija
 DocType: Course Scheduling Tool,Reschedule,Ponovni premik
-DocType: Employee Loan,Total Interest Payable,Skupaj Obresti plačljivo
+DocType: Loan,Total Interest Payable,Skupaj Obresti plačljivo
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Iztovorjeni stroškov Davki in prispevki
 DocType: Work Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Operacija čas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Finish
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Osnovna
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Osnovna
 DocType: Timesheet,Total Billed Hours,Skupaj Obračunane ure
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Napišite enkratnem znesku
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Napišite enkratnem znesku
 DocType: Leave Block List Allow,Allow User,Dovoli Uporabnik
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobiček / izguba račun o odlaganju sredstev
 DocType: Vehicle Log,Service Details,storitev Podrobnosti
 DocType: Vehicle Log,Service Details,storitev Podrobnosti
-DocType: Subscription,Quarterly,Četrtletno
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Združeno
 DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,čas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush Surovine, ki temelji na"
 DocType: Sales Invoice,Port Code,Pristaniška koda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Rezervno skladišče
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Rezervno skladišče
 DocType: Lead,Lead is an Organization,Svinec je organizacija
 DocType: Guardian Interest,Interest,Obresti
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Vrednost števca (Zadnja)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Predloge meril uspešnosti dobaviteljev.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Trženje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Trženje
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Začetek Plačilo je že ustvarjena
 DocType: Request for Quotation,Get Suppliers,Pridobite dobavitelje
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Predogled Plača listek
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Predogled Plača listek
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je bil vpisan večkrat
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,"Obnovite lahko le, če vaše članstvo poteče v 30 dneh"
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Izberite samo, če imate nastavljene dokumente o denarnem toku Mapper"
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Supplier Scorecard,Per Week,Tedensko
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Skupaj študent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Začetek Credit Card
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Podjetje in računi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,v vrednosti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,v vrednosti
 DocType: Asset Settings,Depreciation Options,Možnosti amortizacije
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Neveljaven čas pošiljanja
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Neveljaven čas pošiljanja
 DocType: Lead,Campaign Name,Ime kampanje
 DocType: Hotel Room,Capacity,Zmogljivost
 DocType: Selling Settings,Close Opportunity After Days,Zapri Priložnost Po dnevih
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne
 DocType: Budget,Budget Against,proračun proti
 DocType: Employee,Cell Number,Število celic
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Za določena merila ni nobenega zaposlenega. Preverite, da plačilne liste še niso bile ustvarjene."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Za določena merila ni nobenega zaposlenega. Preverite, da plačilne liste še niso bile ustvarjene."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Material Zahteve Izdelano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izberite tabelo
 DocType: BOM,Website Specifications,Spletna Specifikacije
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neveljaven e-poštni naslov med »Prejemniki«
 DocType: Special Test Items,Particulars,Podrobnosti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
 DocType: Asset,Maintenance,Vzdrževanje
+DocType: Subscriber,Subscriber,Naročnik
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Posodobite svoj status projekta
 DocType: Item,Maximum sample quantity that can be retained,"Največja količina vzorca, ki jo je mogoče obdržati"
@@ -1058,26 +1054,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Privzete nastavitve za Košarica
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Dodaj Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Sredstvo izločeni preko Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Prihodki od obresti račun
+DocType: Loan,Interest Income Account,Prihodki od obresti račun
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Povabljeni vabilo
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotehnologija
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Pojdi do
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavitev e-poštnega računa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Asset Repair,Downtime,Odmore
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademski izraz:
 DocType: Salary Detail,Do not include in total,Ne vključite v celoti
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Količina vzorca {0} ne sme biti večja od prejete količine {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Cenik ni izbrana
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Request for Quotation Supplier,Send Email,Pošlji e-pošto
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 DocType: Item,Max Sample Quantity,Max vzorčna količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Ne Dovoljenje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Ne Dovoljenje
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Zahtevan cenik
 DocType: Vital Signs,Heart Rate / Pulse,Srčni utrip / pulz
 DocType: Company,Default Bank Account,Privzeti bančni račun
@@ -1088,12 +1084,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratorijski testi in vitalni znaki
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Najdenih ni delavec
-DocType: Subscription,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Študent Skupina je že posodobljen.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Študent Skupina je že posodobljen.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Posodobitev projekta.
 DocType: SMS Center,All Customer Contact,Vse Customer Contact
 DocType: Land Unit,Tree Details,drevo Podrobnosti
@@ -1143,7 +1138,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Vse Postavka Skupine
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
 DocType: Work Order,Item To Manufacture,Postavka za izdelavo
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status {2}
@@ -1157,7 +1151,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Ponovno izberite, če je izbrani naslov urejen po shranjevanju"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
 DocType: Item,Hub Publishing Details,Podrobnosti o objavi vozlišča
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Odpiranje&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Odpiranje&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Odpri storiti
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
 DocType: Lab Test Template,Result Format,Format zapisa
@@ -1167,7 +1161,7 @@
 DocType: Payroll Entry,Bimonthly,vsaka dva meseca
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Vsebina gnojil
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Raziskave in razvoj
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Raziskave in razvoj
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Podrobnosti registracije
 DocType: Timesheet,Total Billed Amount,Skupaj zaračunano Znesek
@@ -1181,7 +1175,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Obvezno preverjanje kreditne omejitve pri prodajni nalogi
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Cenitev uspešnosti.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogočanje &quot;uporabiti za košarico&quot;, kot je omogočeno Košarica in da mora biti vsaj ena Davčna pravilo za Košarica"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plačilo Začetek {0} je povezan proti odredbi {1}, preverite, če je treba izvleči, kot prej v tem računu."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plačilo Začetek {0} je povezan proti odredbi {1}, preverite, če je treba izvleči, kot prej v tem računu."
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Prodajno mesto
@@ -1215,7 +1209,7 @@
 DocType: Restaurant Table,Minimum Seating,Najmanjše število sedežev
 DocType: Item Attribute,Item Attribute Values,Postavka Lastnost Vrednote
 DocType: Examination Result,Examination Result,Preizkus Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Potrdilo o nakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referenčna DOCTYPE mora biti eden od {0}
@@ -1223,15 +1217,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Work Order,Plan material for sub-assemblies,Plan material za sklope
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} mora biti aktiven
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Ni razpoložljivih elementov za prenos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Ni razpoložljivih elementov za prenos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Zapiranje (odpiranje + skupno)
 DocType: Journal Entry,Depreciation Entry,Amortizacija Začetek
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Stopnja ali popust
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Priljubljene
 DocType: Hub Settings,Custom Data,Podatki po meri
@@ -1243,9 +1237,9 @@
 DocType: Medical Code,Medical Code Standard,Standard medicinske oznake
 DocType: Soil Texture,Clay Composition (%),Glina Sestava (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Prosimo, shranite, preden dodelite nalogo."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balance Vrednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balance Vrednost
 DocType: Lab Test,Lab Technician,Laboratorijski tehnik
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Prodaja Cenik
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Če je označeno, bo stranka ustvarjena, mapirana na Patient. Pacientovi računi bodo ustvarjeni proti tej Stranki. Med ustvarjanjem bolnika lahko izberete tudi obstoječo stranko."
 DocType: Bank Reconciliation,Account Currency,Valuta računa
@@ -1253,16 +1247,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi
 DocType: Purchase Receipt,Range,Razpon
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Fee Structure,Components,komponente
 DocType: Item Barcode,Item Barcode,Postavka Barcode
 DocType: Woocommerce Settings,Endpoints,Končne točke
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ki se generirajo. Če je odloženo, boste morali ročno spremeniti polje »Ponovi na dan v mesecu« tega"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
 DocType: Share Transfer,From Folio No,Iz Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
@@ -1297,16 +1289,17 @@
 DocType: Asset,Available-for-use Date,"Datum, ki je na voljo za uporabo"
 DocType: Guardian,Guardian Name,Ime Guardian
 DocType: Cheque Print Template,Has Print Format,Ima format tiskanja
-DocType: Employee Loan,Sanctioned,sankcionirano
+DocType: Loan,Sanctioned,sankcionirano
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,je obvezna. Mogoče Menjalni zapis ni ustvarjen za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
 DocType: Crop Cycle,Crop Cycle,Crop Crop
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &quot;izdelek Bundle &#39;predmetov, skladišče, serijska številka in serijska se ne šteje od&quot; seznam vsebine &quot;mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli &quot;izdelek Bundle &#39;postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na&quot; seznam vsebine &quot;mizo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Za &quot;izdelek Bundle &#39;predmetov, skladišče, serijska številka in serijska se ne šteje od&quot; seznam vsebine &quot;mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli &quot;izdelek Bundle &#39;postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na&quot; seznam vsebine &quot;mizo."
 DocType: Student Admission,Publish on website,Objavi na spletni strani
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
+DocType: Subscription,Cancelation Date,Datum preklica
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
 DocType: Agriculture Task,Agriculture Task,Kmetijska naloga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Posredna Prihodki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Posredna Prihodki
 DocType: Student Attendance Tool,Student Attendance Tool,Študent Udeležba orodje
 DocType: Restaurant Menu,Price List (Auto created),Cenik (samodejno ustvarjen)
 DocType: Cheque Print Template,Date Settings,Datum Nastavitve
@@ -1332,6 +1325,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,meter
 DocType: Workstation,Electricity Cost,Stroški električne energije
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Testiranje datotečnega laboratorija ne more biti pred zbiranjem datetime
+DocType: Subscription Plan,Cost,Cena
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov
 DocType: Expense Claim,Total Advance Amount,Skupni znesek vnaprej
 DocType: Delivery Stop,Estimated Arrival,Ocenjeni prihod
@@ -1343,15 +1337,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bela
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Bela
 DocType: SMS Center,All Lead (Open),Vse ponudbe (Odprte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Vrstica {0}: Kol ni na voljo za {4} v skladišču {1} na objavo čas začetka ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Iz seznama potrditvenih polj lahko izberete največ eno možnost.
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
 DocType: Item,Automatically Create New Batch,Samodejno Ustvari novo serijo
 DocType: Item,Automatically Create New Batch,Samodejno Ustvari novo serijo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Dodeljevanje {0} do {1} (vrstica {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Poskrbite
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Dodeljevanje {0} do {1} (vrstica {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Poskrbite
 DocType: Student Admission,Admission Start Date,Vstop Datum začetka
 DocType: Journal Entry,Total Amount in Words,Skupni znesek z besedo
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novi zaposleni
@@ -1367,7 +1361,7 @@
 DocType: Holiday List,Holiday List Name,Naziv seznama praznikov
 DocType: Repayment Schedule,Balance Loan Amount,Bilanca Znesek posojila
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,urnik predmeta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Delniških opcij
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Delniških opcij
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Onemogoči pridobivanje zadnjih podrobnosti nakupa v naročilu
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Ali res želite obnoviti ta izločeni sredstva?
@@ -1386,11 +1380,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Pakiranje Slip Postavka
 DocType: Purchase Invoice,Cash/Bank Account,Gotovina / bančni račun
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Navedite {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Ustvarjanje variant je bilo v čakalni vrsti.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Povzetek dela za {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Lastnost miza je obvezna
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvi dovolnik za dovoljenje na seznamu bo nastavljen kot privzeti odobritveni odjemalec.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Plan,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ne more biti negativna
 DocType: Training Event,Self-Study,Samo-študija
@@ -1403,7 +1398,7 @@
 DocType: Workstation,Wages,Plače
 DocType: Asset Maintenance,Maintenance Manager Name,Ime upravitelja vzdrževanja
 DocType: Agriculture Task,Urgent,Nujna
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Navedite veljavno Row ID za vrstico {0} v tabeli {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Navedite veljavno Row ID za vrstico {0} v tabeli {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Ni mogoče najti spremenljivke:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Izberite polje za urejanje iz numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Ne more biti postavka osnovnega sredstva, kot je ustvarjena knjiga zalog."
@@ -1415,7 +1410,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kakovostna inšpekcijska preglednica Ime
 DocType: Project,First Email,Prva e-pošta
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodajni Znesek
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodajni Znesek
 DocType: Repayment Schedule,Interest Amount,Obresti Znesek
 DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
 DocType: Share Transfer,Issue,Težava
@@ -1429,10 +1424,10 @@
 DocType: Tax Rule,Shipping State,Dostava država
 ,Projected Quantity as Source,Predvidena količina kot vir
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Dostava potovanje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Dostava potovanje
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Vrsta prenosa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Prodajna Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Prodajna Stroški
 DocType: Consultation,Diagnosis,Diagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna nabavna
 DocType: GL Entry,Against,Proti
@@ -1441,12 +1436,13 @@
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Poštna številka
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Naročilo {0} je {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Izberite račun obrestnih prihodkov v posojilu {0}
 DocType: Opportunity,Contact Info,Kontaktni podatki
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
 DocType: Item,Default Supplier,Privzeto Dobavitelj
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek
-DocType: Employee Loan,Repayment Schedule,Povračilo Urnik
+DocType: Loan,Repayment Schedule,Povračilo Urnik
 DocType: Shipping Rule Condition,Shipping Rule Condition,Pogoj dostavnega pravila
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Končni datum ne sme biti manjši kot začetni datum
@@ -1461,7 +1457,7 @@
 DocType: Education Settings,Attendance Freeze Date,Udeležba Freeze Datum
 DocType: Education Settings,Attendance Freeze Date,Udeležba Freeze Datum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Oglejte si vse izdelke
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Oglejte si vse izdelke
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimalna Svinec Starost (dnevi)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Vse BOMs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Sobe Hotela tipa {0} niso na voljo na {1}
@@ -1469,14 +1465,16 @@
 DocType: Expense Claim,From Employee,Od zaposlenega
 DocType: Driver,Cellphone Number,številka mobilnega telefona
 DocType: Project,Monitor Progress,Spremljajte napredek
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
 DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry
+DocType: Supplier Quotation,Auto Repeat Section,Samodejni del ponovitve
 DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Key Uspešnost Area
 DocType: Program Enrollment,Transportation,Prevoz
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Neveljavna Lastnost
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} je potrebno vložiti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Količina mora biti manjša ali enaka {0}
+DocType: Department Approver,Department Approver,Odobreni oddelek
 DocType: SMS Center,Total Characters,Skupaj Znaki
 DocType: Employee Advance,Claimed,Zahtevana
 DocType: Crop,Row Spacing,Razmik vrstic
@@ -1486,6 +1484,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Plačilo Sprava Račun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Prispevek%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Kot je na Nastavitve Nakup če narocilo Obvezno == &quot;DA&quot;, nato pa za ustvarjanje računu o nakupu, uporabniki potrebujejo za ustvarjanje naročilnice najprej za postavko {0}"
+,HSN-wise-summary of outward supplies,HSN-modri povzetek zunanjih dobav
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registracijska št. podjetja za lastno evidenco. Davčna številka itn.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Pravilo za dostavo za košaro
@@ -1499,7 +1498,7 @@
 DocType: Setup Progress Action,Action Name,Ime dejanja
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začetek Leto
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Prvi 2 številki GSTIN se mora ujemati z državno številko {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Datum začetka obdobja sedanje faktura je
 DocType: Salary Slip,Leave Without Pay,Leave brez plačila
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
@@ -1517,26 +1516,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja bodo kopirana samo v času ustvarjanja.
 DocType: Setup Progress Action,Domains,Domene
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Dejanski datum začetka"" ne more biti novejši od ""dejanskega končnega datuma"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Vodstvo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Vodstvo
 DocType: Cheque Print Template,Payer Settings,Nastavitve plačnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
 DocType: Purchase Invoice,Is Return,Je Return
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Previdno
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Začetni dan je večji od končnega dne pri nalogi &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Nazaj / opominu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Nazaj / opominu
 DocType: Price List Country,Price List Country,Cenik Država
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} veljavna serijska številka za postavko {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za Serial No.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vnesite Koda priti Serija Število
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
-DocType: Employee Loan,Partially Disbursed,delno črpanju
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Informacije o donaciji.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Informacije o donaciji.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavitelj baze podatkov.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Naročnino, ki ni preklican, ne morete znova zagnati."
 DocType: Account,Balance Sheet,Bilanca stanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
 DocType: Fee Validity,Valid Till,Veljavno do
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Skupaj učiteljski sestanek staršev
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
@@ -1549,7 +1548,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Spreminjanje skupine strank za izbrano stranko ni dovoljeno.
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Posodabljanje predvidenih časov prihoda.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Posodabljanje predvidenih časov prihoda.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o vpisu
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Izberite kupca
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Purchase Order,Group same items,Skupina Iste vsebine
 DocType: Purchase Invoice,Disable Rounded Total,Onemogoči zaokroževanje
-DocType: Employee Loan Application,Repayment Info,Povračilo Info
+DocType: Department,Parent Department,Oddelek za starše
+DocType: Loan Application,Repayment Info,Povračilo Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Vnos"" ne more biti prazen"
 DocType: Maintenance Team Member,Maintenance Role,Vzdrževalna vloga
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Postavitev Zaposleni
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Uporabnik rezervacije hotela
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Prosimo, izberite predpono najprej"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Raziskave
+DocType: Subscription Settings,Subscription Settings,Nastavitve naročnine
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Raziskave
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi
 DocType: Announcement,All Students,Vse Študenti
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 DocType: Crop Cycle,Less than a year,Manj kot eno leto
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Študent Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 DocType: Crop,Yield UOM,Donosnost UOM
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
 DocType: Item,Is Item from Hub,Je predmet iz vozlišča
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Vrstica {0}: Vrsta dejavnosti je obvezna.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Plačane dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Plačane dividende
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Znesek
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} na pusti {1}
 DocType: Purchase Invoice,Reverse Charge,Povratna obremenitev
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Preneseni čisti poslovni izid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Preneseni čisti poslovni izid
 DocType: Purchase Invoice,05-Change in POS,05-Sprememba v POS
 DocType: Vehicle Log,Service Detail,Service Podrobnosti
 DocType: BOM,Item Description,Postavka Opis
@@ -1619,12 +1620,12 @@
 DocType: Opportunity Item,Opportunity Item,Priložnost Postavka
 ,Student and Guardian Contact Details,Študent in Guardian Kontaktni podatki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Vrstica {0}: Za dobavitelja je potrebno {0} e-poštni naslov za pošiljanje e-pošte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Začasna Otvoritev
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Začasna Otvoritev
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Oglejte si vozlišče
 ,Employee Leave Balance,Zaposleni Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 DocType: Patient Appointment,More Info,Več informacij
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
 DocType: Supplier Scorecard,Scorecard Actions,Akcije kazalnikov
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Primer: Masters v računalništvu
 DocType: Purchase Invoice,Rejected Warehouse,Zavrnjeno Skladišče
@@ -1634,7 +1635,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,do
 DocType: Supplier Quotation Item,Lead Time in days,Lead time v dnevih
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Računi plačljivo Povzetek
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Izplačilo plače iz {0} na {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Izplačilo plače iz {0} na {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Naročilo {0} ni veljavno
@@ -1643,9 +1644,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testi laboratorijskih testov
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Majhno
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Majhno
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Element orodja za ustvarjanje odprtega računa
 DocType: Education Settings,Employee Number,Število zaposlenih
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Prekliči račun Po Grace Periodu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
 DocType: Project,% Completed,% končano
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
@@ -1659,7 +1661,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijsko testiranje Datetime
 DocType: Email Digest,Add Quote,Dodaj Citiraj
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Posredni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
 DocType: Agriculture Analysis Criteria,Agriculture,Kmetijstvo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalski Oprema
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Najprej nastavite kodo izdelka
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
+DocType: Subscription Plan,Billing Interval Count,Številka obračunavanja
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,ekipa Posodobitve
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev vrste računa pomaga pri izbiri računa v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Ustvari Print Format
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Element Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativna postavka ne sme biti enaka kot oznaka izdelka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Dokončanje začasne ocene
 DocType: Salary Slip,Bank Account No.,Št. bančnega računa
@@ -1742,7 +1745,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahteva za ponudbo dobavitelja
 DocType: Healthcare Settings,Registration Message,Registracija sporočilo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Strojna oprema
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Strojna oprema
 DocType: Prescription Dosage,Prescription Dosage,Odmerjanje na recept
 DocType: Attendance,HR Manager,Upravljanje človeških virov
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Prosimo izberite Company
@@ -1773,7 +1776,7 @@
 DocType: Project,Start and End Dates,Začetni in končni datum
 ,Delivered Items To Be Billed,Dobavljeni artikli placevali
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Odprti BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
 DocType: Authorization Rule,Average Discount,Povprečen Popust
 DocType: Project Update,Great/Quickly,Odlično / hitro
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1782,8 +1785,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Izberite serij za združena postavko
 DocType: Asset,Depreciation Schedules,Amortizacija Urniki
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,V nastavitvah GST se lahko izberejo naslednji računi:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,V nastavitvah GST se lahko izberejo naslednji računi:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1794,6 +1797,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Odhodni
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Ime in Type
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Stanje odobritve mora biti &quot;Approved&quot; ali &quot;Zavrnjeno&quot;
 DocType: Physician,Contacts and Address,Stiki in naslov
 DocType: Purchase Invoice,Contact Person,Kontaktna oseba
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Pričakovani datum začetka' ne more biti večji od 'Pričakovan datum zaključka'
@@ -1807,19 +1811,20 @@
 DocType: Student Admission,Eligibility and Details,Upravičenost in podrobnosti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za podjetje
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",Zahteva za ponudbo je onemogočen dostop iz portala za več nastavitev za preverjanje portala.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavitelj Scorecard Scoring Spremenljivka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Znesek nabave
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Znesek nabave
 DocType: Sales Invoice,Shipping Address Name,Naslov dostave
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Prišlo je do napak pri urejanju tečaja tečaja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi odobritev Expenses na seznamu bo nastavljen kot privzeti odobritev Expense.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ne more biti večja kot 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Detail,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
@@ -1840,14 +1845,15 @@
 DocType: Package Code,Package Code,paket koda
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Vajenec
 DocType: Purchase Invoice,Company GSTIN,Podjetje GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Davčna podrobnosti tabela nerealne iz postavke mojstra kot vrvico in shranjena na tem področju. Uporablja se za davki in dajatve
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Delavec ne more poročati zase.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Pustite odobritev obvezno v odjavi
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Davčna pravilo za transakcije.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Izraz plačila v vrstici {0} je morda dvojnik.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Kmetijstvo (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Pakiranje listek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Urad za najem
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavitve Setup SMS gateway
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Pakiranje listek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Urad za najem
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 DocType: Disease,Common Name,Pogosto ime
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz uspelo!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
 DocType: Vital Signs,Blood Pressure,Krvni pritisk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analitik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analitik
 DocType: Item,Inventory,Popis
 DocType: Item,Sales Details,Prodajna Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Potrdite vpisanih tečaj za študente v študentskih skupine
 DocType: Notification Control,Expense Claim Rejected,Expense zahtevek zavrnjen
 DocType: Item,Item Attribute,Postavka Lastnost
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Vlada
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Vlada
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Zahtevek {0} že obstaja za Prijavi vozil
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Ime Institute
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Vnesite odplačevanja Znesek
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Vnesite odplačevanja Znesek
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Artikel Variante
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Storitve
 DocType: HR Settings,Email Salary Slip to Employee,Email Plača Slip na zaposlenega
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Izberite Možni Dobavitelj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Izberite Možni Dobavitelj
 DocType: Sales Invoice,Source,Vir
 DocType: Customer,"Select, to make the customer searchable with these fields","Izberite, da bo stranka s temi področji omogočila iskanje"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zaprto
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Denarni tokovi iz naložbenja
 DocType: Program Course,Program Course,Tečaj programa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Homepage,Company Tagline for website homepage,Podjetje Slogan za domačo stran spletnega mesta
 DocType: Item Group,Item Group Name,Item Name Group
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Podrobnosti o memorandumu
 DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Vnesite vso zahtevano vrednost (-e)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Terjatve Povzetek
-DocType: Employee Loan,Monthly Repayment Amount,Mesečni Povračilo Znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Terjatve Povzetek
+DocType: Loan,Monthly Repayment Amount,Mesečni Povračilo Znesek
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Odpiranje računov
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
 DocType: UOM,UOM Name,UOM Name
 DocType: GST HSN Code,HSN Code,Tarifna številka
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Prispevek Znesek
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Uporabnik {0} je že dodeljen zdravniku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Škatla
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Možni Dobavitelj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Možni Dobavitelj
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Mesečni Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Sprejemnik Seznam je prazen. Prosimo, da ustvarite sprejemnik seznam"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Zdravstvo (beta)
@@ -2001,7 +2008,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Ni prispevkov za pakiranje
 DocType: Shipping Rule Condition,From Value,Od vrednosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
-DocType: Employee Loan,Repayment Method,Povračilo Metoda
+DocType: Loan,Repayment Method,Povračilo Metoda
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Če je omogočeno, bo Naslovna stran je skupina privzeta točka za spletno stran"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Terjatve za račun družbe.
@@ -2010,7 +2017,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Zahtevano potrdilo
 DocType: Company,Default Holiday List,Privzeti seznam praznikov
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Vrstica {0}: V času in času {1} se prekrivajo z {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Zaloga Obveznosti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Invoice,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontaktna mobilna številka
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Izberite podjetje
@@ -2018,7 +2025,7 @@
 DocType: Student Report Generation Tool,Print Section,Oddelek za tiskanje
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Uporabnik {0} nima privzetega profila POS. Preverite privzeto na vrstici {1} za tega uporabnika.
 DocType: Student Group,Set 0 for no limit,Nastavite 0 za brez omejitev
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Vrstica {idx}: {field} je potrebna za ustvarjanje računov za odpiranje {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Osnovni naslov in kontaktni podatki
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno pošlji plačila Email
@@ -2029,10 +2036,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Izberite vsaj eno domeno.
 DocType: Dependent Task,Dependent Task,Odvisna Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Iskanje Item
 DocType: Payment Schedule,Payment Amount,Znesek Plačila
@@ -2042,7 +2049,7 @@
 DocType: Assessment Plan,Grading Scale,Ocenjevalna lestvica
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,že končana
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Zaloga v roki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Zaloga v roki
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Uvoz uspešno!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Plačilni Nalog že obstaja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
@@ -2053,17 +2060,16 @@
 DocType: Quotation Item,Quotation Item,Postavka ponudbe
 DocType: Customer,Customer POS Id,ID POS stranka
 DocType: Account,Account Name,Ime računa
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Vnesite URL strežnika Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavitelj Type gospodar.
 DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
 DocType: Share Balance,To No,Na št
-DocType: Subscription,Reference Document,referenčni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} je preklican ali ustavljen
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Grant Application,Applicant Type,Vrsta vlagatelja
+DocType: Loan,Applicant Type,Vrsta vlagatelja
 DocType: Purchase Invoice,03-Deficiency in services,03-Pomanjkanje storitev
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Privzeti standard za medicinsko kodo
@@ -2074,13 +2080,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% zaračunano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Človeški viri
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Človeški viri
 DocType: Lead,Upper Income,Zgornja Prihodki
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Zavrni
 DocType: Journal Entry Account,Debit in Company Currency,Debetno v podjetju valuti
 DocType: BOM Item,BOM Item,BOM Postavka
 DocType: Appraisal,For Employee,Za zaposlenega
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Naredite izplačilu vnos
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Naredite izplačilu vnos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Vrstica {0}: Advance zoper dobavitelja mora biti v breme
 DocType: Company,Default Values,Privzete vrednosti
 DocType: Membership,INR,INR
@@ -2110,10 +2116,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večje od 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Na voljo
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Na voljo
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapaciteta Načrtovanje Za (dnevi)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Javna naročila
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obvezno polje - program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obvezno polje - program
 DocType: Special Test Template,Result Component,Komponenta rezultata
@@ -2134,7 +2140,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Vključite počitnice v listih kot listja
 DocType: Sales Invoice,Packed Items,Pakirane Items
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancija zahtevek zoper Serial No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Skupaj&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Skupaj&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogoči Košarica
 DocType: Employee,Permanent Address,stalni naslov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2152,10 +2158,10 @@
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Potrdi dejanje
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Dražbe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,izpolnitev
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Poglej v košarico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Ne morem ustvariti standardnih meril. Preimenujte merila
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
@@ -2178,9 +2184,9 @@
 DocType: Upload Attendance,Get Template,Get predlogo
 DocType: Material Request,Transferred,Preneseni
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Zberi pristojbino za registracijo pacientov
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ne morem spremeniti atributov po transakciji z delnicami. Na novo postavko naredite nov element in prenesite zalogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Ne morem spremeniti atributov po transakciji z delnicami. Na novo postavko naredite nov element in prenesite zalogo
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,davčna Breakup
 DocType: Packing Slip,PS-,PS-
@@ -2216,12 +2222,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Uskladitev JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Purchase Invoice Item,Batch No,Serija Ne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Napredek zaposlenih
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 DocType: Grant Application,Assessment  Mark (Out of 10),Ocenjevalna oznaka (od 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Skrbnika2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
@@ -2230,15 +2237,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Email Digest,Annual Expenses,letni stroški
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Uskladitev zalog
 DocType: Territory,Territory Name,Territory Name
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,V naročnini lahko imate samo načrte z enakim obračunskim ciklom
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat za službo.
 DocType: Purchase Order Item,Warehouse and Reference,Skladišče in Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutarna info in druge splošne informacije o vašem dobavitelju
@@ -2249,10 +2257,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,cenitve
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Dogodki za usposabljanje
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Sledite navodilom po viru.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,vnesite
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,vnesite
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Dnevnik vzdrževanja
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto teža tega paketa. (samodejno izračuna kot vsota neto težo blaga)
@@ -2260,11 +2268,11 @@
 DocType: Sales Order,To Deliver and Bill,Dostaviti in Bill
 DocType: Student Group,Instructors,inštruktorji
 DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} je treba predložiti
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Deljeno upravljanje
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Plačilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Plačilo
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Skladišče {0} ni povezano z nobenim računom, navedite račun v evidenco skladišče ali nastavite privzeto inventarja račun v družbi {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Upravljajte naročila
 DocType: Work Order Operation,Actual Time and Cost,Dejanski čas in stroški
@@ -2274,7 +2282,7 @@
 DocType: Student Leave Application,Student Leave Application,Študent Zapusti Uporaba
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle predmeti v času prodaje.
@@ -2284,7 +2292,7 @@
 DocType: Item,Barcodes,Črtne kode
 DocType: Hub Category,Hub Node,Vozliščna točka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravite in poskusite znova."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Sodelavec
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Sodelavec
 DocType: Asset Movement,Asset Movement,Gibanje sredstvo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Delovni nalog {0} mora biti predložen
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nova košarico
@@ -2302,13 +2310,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti enaka valuti podjetja ali valuti stranke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Vrstica {0}: Datum roka ne more biti pred datumom objavljanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Vrstica {0}: Datum roka ne more biti pred datumom objavljanja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Naredite Entry plačila
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
 ,Sales Invoice Trends,Prodajni fakturi Trendi
 DocType: Leave Application,Apply / Approve Leaves,Uporabi / Odobri Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Za
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Lahko sklicuje vrstico le, če je tip naboj &quot;Na prejšnje vrstice Znesek&quot; ali &quot;prejšnje vrstice Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Lahko sklicuje vrstico le, če je tip naboj &quot;Na prejšnje vrstice Znesek&quot; ali &quot;prejšnje vrstice Total&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Drevo centrov finančnih stroškov.
 DocType: Serial No,Delivery Document No,Dostava dokument št
@@ -2322,7 +2329,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Poraba materiala ni nastavljena v proizvodnih nastavitvah.
 DocType: Student,Student Mobile Number,Študent mobilno številko
 DocType: Item,Has Variants,Ima različice
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Za postavko {0} v vrstici {1} ne moremo preseči več kot {2}. Če želite omogočiti prekomerno zaračunavanje, nastavite nastavitve zalog"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Za postavko {0} v vrstici {1} ne moremo preseči več kot {2}. Če želite omogočiti prekomerno zaračunavanje, nastavite nastavitve zalog"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Posodobi odgovor
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
@@ -2334,12 +2341,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Najprej izberite program
 DocType: Patient Appointment,Patient Age,Pacientova doba
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Upravljanje projektov
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serijski št. {0} je bil že vrnjen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serijski št. {0} je bil že vrnjen
 DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev.
 DocType: Budget,Fiscal Year,Poslovno leto
 DocType: Asset Maintenance Log,Planned,Načrtovano
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Neplačani računi za terjatve, ki jih je treba uporabiti, če niso določeni v Patientu za rezervacijo stroškov posvetovanja."
 DocType: Vehicle Log,Fuel Price,gorivo Cena
+DocType: Bank Guarantee,Margin Money,Margin denar
 DocType: Budget,Budget,Proračun
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Nastavi odprto
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
@@ -2353,16 +2361,16 @@
 DocType: Lead,Follow Up,Nadaljuj
 DocType: Item,Is Sales Item,Je Sales Postavka
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
 DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas
 ,Amount to Deliver,"Znesek, Deliver"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Isti element je bil večkrat vnesen. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Datum izraz začetka ne more biti zgodnejši od datuma Leto začetku študijskega leta, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Tam so bile napake.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposleni {0} je že zaprosil za {1} med {2} in {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Tam so bile napake.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Zaposleni {0} je že zaprosil za {1} med {2} in {3}:
 DocType: Guardian,Guardian Interests,Guardian Zanima
 DocType: Naming Series,Current Value,Trenutna vrednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
 DocType: Education Settings,Instructor Records to be created by,"Zapise za inštruktorje, ki jih bo ustvaril"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ustvaril
 DocType: GST Account,GST Account,GST račun
@@ -2381,8 +2389,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Dodano v priljubljene
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Za zgoraj navedena izbrana merila ILI plačilni list, ki je že bil predložen, ni bilo mogoče najti nobene plačilne liste"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Dajatve in davki
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Za zgoraj navedena izbrana merila ILI plačilni list, ki je že bil predložen, ni bilo mogoče najti nobene plačilne liste"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Dajatve in davki
 DocType: Projects Settings,Projects Settings,Nastavitve projektov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vnesite Referenčni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
@@ -2392,27 +2400,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Drevo skupin artiklov.
 DocType: Production Plan,Total Produced Qty,Skupno število proizvedenih količin
 DocType: Payroll Entry,Get Employee Details,Pridobite podrobnosti o zaposlenih
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
 DocType: Asset,Sold,Prodano
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
 DocType: Account,Frozen,Frozen
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Osnovna Znesek (družba Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Surovine
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Surovine
 DocType: Payment Reconciliation Payment,Reference Row,referenčna Row
 DocType: Installation Note,Installation Time,Namestitev čas
 DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Izbriši vse transakcije za to družbo
 DocType: Patient,O Positive,O Pozitivno
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Naložbe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,dodelitve
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Merila sprejemljivosti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Za vnose v dnevnik ni na voljo vračil
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: BOM,Show In Website,Pokaži V Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Prikaži Količina na spletni strani
-DocType: Employee Loan Application,Total Payable Amount,Skupaj plačljivo Znesek
+DocType: Loan Application,Total Payable Amount,Skupaj plačljivo Znesek
 DocType: Task,Expected Time (in hours),Pričakovani čas (v urah)
 DocType: Item Reorder,Check in (group),Preverite v (skupina)
 DocType: Soil Texture,Silt,Silt
@@ -2431,7 +2440,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Plačam
 DocType: Room,Room Name,soba Ime
 DocType: Prescription Duration,Prescription Duration,Trajanje recepta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 DocType: Activity Cost,Costing Rate,Stanejo Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Naslovi strank in kontakti
 ,Campaign Efficiency,kampanja Učinkovitost
@@ -2450,11 +2459,11 @@
 DocType: Chapter,Chapter,Poglavje
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Privzet račun se samodejno posodablja v računu POS, ko je ta način izbran."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
 DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Prodaja Partner naslovi in kontakti
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Poldnevni datum mora biti med Od datuma in Do datuma
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Poldnevni datum mora biti med Od datuma in Do datuma
 DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Center za privzete stroške nastavite v {0} podjetju.
 DocType: Item,Has Batch No,Ima številko serije
@@ -2472,7 +2481,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista)
 DocType: Soil Texture,Soil Type,Vrsta tal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Novo sporočilo
 ,Quotation Trends,Trendi ponudb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless mandat
@@ -2492,7 +2500,7 @@
 DocType: Hub Category,Hub Category,Kategorija vozlišča
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Število vozil
-DocType: Employee Loan,Loan Amount,Znesek posojila
+DocType: Loan,Loan Amount,Znesek posojila
 DocType: Student Report Generation Tool,Add Letterhead,Dodaj slovo
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Vožnja vozil
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Stalni ocenjevalni list dobavitelja
@@ -2521,9 +2529,9 @@
 DocType: Cash Flow Mapper,Position,Položaj
 DocType: Patient,Patient Details,Podrobnosti bolnika
 DocType: Patient,B Positive,B Pozitivni
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
 DocType: Patient Medical Record,Patient Medical Record,Zdravniški zapis bolnika
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Skupina Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Šport
@@ -2531,8 +2539,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Skupaj Actual
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Študentski Bratje in sestre
+DocType: Subscription Plan Detail,Subscription Plan Detail,Podrobnosti o naročniškem načrtu
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Enota
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Prosimo, navedite Company"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Prosimo, navedite Company"
 ,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe
 DocType: Asset Maintenance Task,Maintenance Task,Vzdrževalna naloga
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Nastavite omejitev B2C v nastavitvah GST.
@@ -2547,6 +2556,7 @@
 ,BOM Search,BOM Iskanje
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Skupni stroški porabljenega materiala (preko zaloge na borzi)
 DocType: Hub Settings,Company Registered,Registrirana družba
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Datum ne sme biti krajši od datuma
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.","Objavite &quot;Na zalogi&quot; ali &quot;Ni na zalogi&quot; na vozlišču na podlagi zalog, ki so na voljo v tem skladišču."
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
@@ -2554,17 +2564,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Po Material Zahteve so bile samodejno dvigne temelji na ravni re-naročilnico elementa
 DocType: Email Digest,Pending Sales Orders,Dokler prodajnih naročil
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
 DocType: Employee,Create User Permission,Ustvarite dovoljenje za uporabnika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
 DocType: Healthcare Settings,Remind Before,Opomni pred
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
 DocType: Salary Component,Deduction,Odbitek
 DocType: Item,Retain Sample,Ohrani vzorec
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Vrstica {0}: Od časa in do časa je obvezna.
 DocType: Stock Reconciliation Item,Amount Difference,znesek Razlika
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba
 DocType: Territory,Classification of Customers by region,Razvrstitev stranke po regijah
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,V izdelavi
@@ -2574,8 +2585,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunan Izjava bilance banke
 DocType: Normal Test Template,Normal Test Template,Običajna preskusna predloga
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogočena uporabnik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Ponudba
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Prejeti RFQ ni mogoče nastaviti na nobeno ceno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Ponudba
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Prejeti RFQ ni mogoče nastaviti na nobeno ceno
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,"Izberite račun, ki ga želite natisniti v valuti računa"
@@ -2583,7 +2594,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To temelji na transakcijah proti temu bolniku. Podrobnosti si oglejte spodaj
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Stroškovno Posodobljeno
 DocType: Patient,Date of Birth,Datum rojstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Postavka {0} je bil že vrnjen
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Poslovno leto** predstavlja knjigovodsko leto. Vse vknjižbe in druge transakcije so povezane s **poslovnim letom**.
 DocType: Opportunity,Customer / Lead Address,Stranka / Naslov ponudbe
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Nastavitev kazalčevega kazalnika
@@ -2594,14 +2605,15 @@
 DocType: Work Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Opis dela
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Opis dela
 DocType: Student Applicant,Applied,Applied
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re-open
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re-open
 DocType: Sales Invoice Item,Qty as per Stock UOM,Kol. kot na UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Ime skrbnika2
 DocType: Purchase Invoice,02-Post Sale Discount,Popust za prodajo po pošti
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen ""-"" ""."", ""#"", in ""/"" niso dovoljeni v poimenovanju zaporedja"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
+DocType: Department Approver,Approver,Odobritelj
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Polje Delničarju ne more biti prazno
 DocType: Guardian,Work Address,Delovni naslov
@@ -2615,21 +2627,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Skupaj Dodeljena Znesek (družba Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Stroški odpadnega materiala
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
 DocType: Grant Application,Email Notification Sent,Poslano obvestilo o e-pošti
 DocType: Purchase Invoice,In Words (Company Currency),V besedi (družba Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Koda postavke, skladišče, količina sta potrebna v vrstici"
-DocType: Pricing Rule,Supplier,Dobavitelj
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Koda postavke, skladišče, količina sta potrebna v vrstici"
+DocType: Bank Guarantee,Supplier,Dobavitelj
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Prikaži podatke o plačilu
 DocType: Consultation,Consultation Time,Čas posvetovanja
 DocType: C-Form,Quarter,Quarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Razni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Razni stroški
 DocType: Global Defaults,Default Company,Privzeto Podjetje
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Ime Banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Nad
-DocType: Employee Loan,Employee Loan Account,Zaposlenih Loan račun
 DocType: Leave Application,Total Leave Days,Skupaj dni dopusta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opomba: E-mail ne bo poslano uporabnike invalide
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Število interakcij
@@ -2645,7 +2656,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Teža (v kilogramih)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",poglavja / poglavje_name pustite samodejno nastaviti prazno po shranjevanju poglavja.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Nastavite GST račune v nastavitvah GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Nastavite GST račune v nastavitvah GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Vrsta podjetja
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Stroški New Nakup
@@ -2654,12 +2665,13 @@
 DocType: Grant Application,Grant Description,Grant Opis
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
 DocType: Student Guardian,Others,Drugi
+DocType: Subscription,Discounts,Popusti
 DocType: Payment Entry,Unallocated Amount,nerazporejena Znesek
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nič več posodobitve
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"To zajema vse kazalnike, povezane s tem Setup"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Otrok točka ne bi smela biti izdelka Bundle. Odstranite element &#39;{0}&#39; in shranite
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bančništvo
@@ -2668,21 +2680,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;, da bi dobili razpored"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
 DocType: Bin,Ordered Quantity,Naročeno Količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
 DocType: Grading Scale,Grading Scale Intervals,Ocenjevalna lestvica intervali
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Dobiček za leto
+DocType: Bank Guarantee,Name of Bank,Ime banke
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: računovodski zapis za {2} se lahko zapiše le v valuti: {3}
 DocType: Fee Schedule,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Drevo finančnih računov.
+DocType: Bank Guarantee,Reference Document Type,Referenčni dokument Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Kartiranje denarnih tokov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} za Naročilnico {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Zaporednimi Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,V privzetem stiku ni mogoče najti e-pošte
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Ustvari skrivnost
-DocType: Employee Loan,Account Info,Informacije o računu
+DocType: Loan,Account Info,Informacije o računu
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
 DocType: Fees,Include Payment,Vključi plačilo
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} skupine študentov ustvarjene
@@ -2690,24 +2705,24 @@
 DocType: Sales Invoice,Total Billing Amount,Skupni znesek plačevanja
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program v strukturi pristojbin in študentski skupini {0} je drugačen.
 DocType: Fee Schedule,Receivable Account,Terjatev račun
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Sales Order do plačila
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,direktor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,direktor
 DocType: Purchase Invoice,With Payment of Tax,S plačilom davka
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Trojnih dobavitelja
 DocType: Land Unit,Is Container,Je kontejner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,To bo dan 1 ciklusa poljščin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Prosimo, izberite ustrezen račun"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Purchase Invoice Item,Weight UOM,Teža UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Seznam razpoložljivih delničarjev s številkami folije
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Plač zaposlenih
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Prikaži lastnosti različic
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Prikaži lastnosti različic
 DocType: Student,Blood Group,Blood Group
 DocType: Course,Course Name,Ime predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Pisarniška oprema
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Pisarniška oprema
 DocType: Purchase Invoice Item,Qty,Kol.
 DocType: Fiscal Year,Companies,Podjetja
 DocType: Supplier Scorecard,Scoring Setup,Nastavitev točkovanja
@@ -2726,7 +2741,7 @@
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Bremenitev je potrebno
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Nakup Cenik
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predloge spremenljivk rezultatov dobaviteljev.
 DocType: Job Offer Term,Offer Term,Ponudba Term
 DocType: Asset,Quality Manager,Quality Manager
@@ -2738,13 +2753,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Skupaj neplačano: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Spletna stran Operacija
 DocType: Supplier Scorecard,Supplier Score,Ocen dobavitelja
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Skupaj Fakturna Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Skupaj Fakturna Amt
 DocType: Supplier,Warn RFQs,Opozori RFQs
 DocType: BOM,Conversion Rate,Stopnja konverzije
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Iskanje
 DocType: Assessment Plan,To Time,Time
 DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
+DocType: Loan,Total Amount Paid,Skupni znesek plačan
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Prosimo, izberite Študentski Pristop, ki je obvezen za študenta, ki plača študent"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Izberite cenik za objavo cen
@@ -2754,19 +2770,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Seznam Cena {0} je onemogočena
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Vrstica {0}: Zaključen Količina ne sme biti večja od {1} za delovanje {2}
 DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Zaporednimi Postavka {0} ni mogoče posodobiti s pomočjo zaloge sprave, uporabite zaloge Entry"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Zaporednimi Postavka {0} ni mogoče posodobiti s pomočjo zaloge sprave, uporabite zaloge Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Zaporednimi Postavka {0} ni mogoče posodobiti s pomočjo zaloge sprave, uporabite zaloge Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Zaporednimi Postavka {0} ni mogoče posodobiti s pomočjo zaloge sprave, uporabite zaloge Entry"
 DocType: Training Event Employee,Training Event Employee,Dogodek usposabljanje zaposlenih
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Največje vzorce - {0} lahko hranite za paket {1} in element {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Dodaj časovne reže
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijska(e) številka(e) zahtevana(e) za postavko {1}. Navedli ste {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijska(e) številka(e) zahtevana(e) za postavko {1}. Navedli ste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje
 DocType: Training Event,Advance,Napredovanje
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,za ponovni ponovitev.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless nastavitve plačilnih prehodov
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange dobiček / izguba
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange dobiček / izguba
 DocType: Opportunity,Lost Reason,Lost Razlog
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Vrstica # {0}: Račun {1} ne pripada podjetju {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Vrstica # {0}: Račun {1} ne pripada podjetju {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Datoteke DocType {0} ni mogoče najti
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
@@ -2785,7 +2800,6 @@
 DocType: Bin,Actual Quantity,Dejanska količina
 DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Naročnina je bila {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Program urnika
 DocType: Fee Schedule Program,Student Batch,študent serije
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Naredite Študent
@@ -2801,14 +2815,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-trgovina GSTIN
 DocType: Sales Order,Not Delivered,Ne Delivered
 ,Bank Clearance Summary,Banka Potrditev Povzetek
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
 DocType: Appraisal Goal,Appraisal Goal,Cenitev cilj
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Predlagaj kategorijo?
 DocType: Stock Reconciliation Item,Current Amount,Trenutni znesek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgradbe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,zgradbe
 DocType: Fee Schedule,Fee Structure,Fee Struktura
 DocType: Timesheet Detail,Costing Amount,Stanejo Znesek
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
 DocType: Student Admission Program,Application Fee,Fee uporaba
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Predloži plačilni list
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm popust za Element {0} je {1}%
@@ -2816,12 +2829,13 @@
 DocType: Sales Partner,Address & Contacts,Naslov &amp; Kontakti
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriteriji za analizo kmetijstva
+DocType: HR Settings,Leave Approval Notification Template,Zapusti predlogo za odobritev odobritve
 DocType: POS Profile,[Select],[Izberite]
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni tlak (diastolični)
 DocType: SMS Log,Sent To,Poslano
 DocType: Agriculture Task,Holiday Management,Upravljanje praznikov
 DocType: Payment Request,Make Sales Invoice,Naredi račun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Programska oprema
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Programska oprema
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
 DocType: Company,For Reference Only.,Samo za referenco.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Zdravnik {0} ni na voljo {1}
@@ -2839,7 +2853,7 @@
 DocType: Employee,New Workplace,Novo delovno mesto
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Poraba materiala
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavi kot Zaprto
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ne Postavka s črtno kodo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ne Postavka s črtno kodo {0}
 DocType: Normal Test Items,Require Result Value,Zahtevajte vrednost rezultata
 DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2854,19 +2868,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,"Ni aktivnega ali privzeti plač struktura, ugotovljena za zaposlenega {0} za datumoma"
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
 DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ponavljajoči
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Podrobnosti o predlogi za kartiranje denarnega toka
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Upravljanje posojil
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledi ločeno prihodki in odhodki za vertikal proizvodov ali delitve.
 DocType: Rename Tool,Rename Tool,Preimenovanje orodje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Prikaži Plača listek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Prenos Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Prikaži Plača listek
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Prenos Material
 DocType: Fees,Send Payment Request,Pošiljanje zahtevka za plačilo
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
 DocType: Water Analysis,Origin,Izvor
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,znesek računa Izberite sprememba
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
@@ -2881,14 +2895,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Je obveznost dohodnine
 DocType: Grading Scale Interval,Grade Description,razred Opis
 DocType: Stock Entry,Purchase Receipt No,Potrdilo o nakupu Ne
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Kapara
 DocType: Sales Invoice, Shipping Bill Number,Številka naročila
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledljivost
 DocType: Asset Maintenance Log,Actions performed,Izvedeni ukrepi
 DocType: Cash Flow Mapper,Section Leader,Oddelek Leader
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Vir sredstev (obveznosti)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Vir sredstev (obveznosti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Zaposleni
+DocType: Bank Guarantee,Fixed Deposit Number,Fiksna številka depozita
 DocType: Asset Repair,Failure Date,Datum odpovedi
 DocType: Sample Collection,Collected Time,Zbrani čas
 DocType: Company,Sales Monthly History,Mesečna zgodovina prodaje
@@ -2905,10 +2920,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,"Ali ste prepričani, da želite preklicati ta sestanek?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket hotelskih cen
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Prenesi posodobitve naročnine
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Račun {0} ne ujema z družbo {1} v načinu račun: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Tečaj:
@@ -2918,7 +2934,7 @@
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Št delovnih nalogov ustvarjenih
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Plača Slip delavca {0} že ustvarili za to obdobje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Vrednost kupljenih artiklov
 DocType: Selling Settings,Sales Order Required,Zahtevano je naročilo
 DocType: Purchase Invoice,Credit To,Kredit
@@ -2936,7 +2952,7 @@
 DocType: Request for Quotation Supplier,No Quote,Brez cenika
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Plačilo računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompenzacijske Off
 DocType: Job Offer,Accepted,Sprejeto
@@ -2949,7 +2965,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prosimo, preverite, ali ste prepričani, da želite izbrisati vse posle, za te družbe. Vaši matični podatki bodo ostali kot je. Ta ukrep ni mogoče razveljaviti."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Rezultati iskanja
 DocType: Room,Room Number,Številka sobe
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Neveljavna referenčna {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Neveljavna referenčna {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Oznaka dostavnega pravila
 DocType: Journal Entry Account,Payroll Entry,Vnos plače
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Oglejte si zapisi o prispevkih
@@ -2959,7 +2975,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Lab Test Sample,Lab Test Sample,Vzorec laboratorijskega testa
 DocType: Item Variant Settings,Allow Rename Attribute Value,Dovoli preimenovanje vrednosti atributa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Hitro Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 DocType: Restaurant,Invoice Series Prefix,Predpisi serije računov
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
@@ -2967,8 +2983,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integracija Google Zemljevidov ni omogočena
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ni vložen
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Datum prenehanja članstva
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} mora biti negativno na povratnem dokumentu
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} mora biti negativno na povratnem dokumentu
 ,Minutes to First Response for Issues,Minut do prvega odziva na vprašanja
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
@@ -2987,7 +3004,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Merska enota
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Priložnost
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Priložnost
 DocType: Operation,Default Workstation,Privzeto Workstation
 DocType: Notification Control,Expense Claim Approved Message,Expense Zahtevek Odobreno Sporočilo
 DocType: Payment Entry,Deductions or Loss,Odbitki ali izguba
@@ -3025,7 +3042,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Pusti brez plačila ne ujema z odobrenimi evidence Leave aplikacij
 DocType: Campaign,Campaign-.####,Akcija -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
 DocType: Membership,USD,ameriški dolar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Izračunajte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Ostati v ravnotežju
@@ -3035,7 +3052,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Leto zaključka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 DocType: Driver,Driver,Voznik
 DocType: Vital Signs,Nutrition Values,Prehranske vrednosti
 DocType: Lab Test Template,Is billable,Je zaračunljiv
@@ -3046,7 +3063,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Dejanski začetni datum (preko Čas lista)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Staranje Razpon 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Skupni znesek vnaprej ne more biti večji od skupnega zahtevanega zneska
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Skupni znesek vnaprej ne more biti večji od skupnega zahtevanega zneska
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3081,7 +3098,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Izberite vrednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdajo dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Naslednja Kontakt Po ne more biti enaka kot vodilni e-poštni naslov
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
@@ -3098,7 +3115,8 @@
 DocType: Warranty Claim,Service Address,Storitev Naslov
 DocType: Asset Maintenance Task,Calibration,Praznovanje
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} je praznik podjetja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Pohištvo in Fixtures
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Pustite obvestilo o stanju
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Pohištvo in Fixtures
 DocType: Item,Manufacture,Izdelava
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Poročilo o laboratorijskem testu
@@ -3114,7 +3132,6 @@
 DocType: Crop,Planting Area,Območje sajenja
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,To je lahko zaradi nekaterih neveljavnih e - poštnih naslovov v
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Dodali ste
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultat usposabljanja
@@ -3124,16 +3141,17 @@
 DocType: Products Settings,Products per Page,Izdelki na stran
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organizacija podružnica gospodar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Pomožni Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Nad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nima računa {2} ali pa so že primerjali z drugo kupona
 DocType: Supplier Scorecard Criteria,Criteria Weight,Teža meril
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Pustite obvestilo o odobritvi
 DocType: Buying Settings,Default Buying Price List,Privzet nabavni cenik
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Plača Slip Na Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Nakupna cena
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Nakupna cena
 DocType: Notification Control,Sales Order Message,Sales Order Sporočilo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Privzeta nastavitev Vrednote, kot so podjetja, valuta, tekočem proračunskem letu, itd"
 DocType: Payment Entry,Payment Type,Način plačila
@@ -3156,6 +3174,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Nastavitve Košarica
 DocType: Journal Entry,Accounting Entries,Vknjižbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Če je izbrano cenovno pravilo za &quot;Oceni&quot;, bo prepisalo cenik. Cena pravilnika je končna obrestna mera, zato ni treba uporabljati dodatnega popusta. Zato se pri transakcijah, kot je prodajna naročilo, naročilnica itd., Dobijo v polju »Oceni«, ne pa na »cenik tečaja«."
+DocType: Journal Entry,Paid Loan,Plačano posojilo
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Podvojenega vnosa. Prosimo, preverite Dovoljenje Pravilo {0}"
 DocType: Journal Entry Account,Reference Due Date,Referenčni datum roka
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3172,7 +3191,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/config/hr.py +93,Payroll,izplačane plače
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
 DocType: Patient Service Unit,Parent Service Unit,Enota starševske službe
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Naredite uporabnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketu za dostavo (za tisk)
@@ -3191,7 +3210,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Prihodki račun
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Dostava
 DocType: Volunteer,Weekdays,Delovni dnevi
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: Restaurant Menu,Restaurant Menu,Restavracija Meni
@@ -3199,7 +3218,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Privzeta nastavitev popis račun za stalne inventarizacije
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Privzeta nastavitev popis račun za stalne inventarizacije
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Pošlji e-pošto za pregled e-pošte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Lokalno shrambo je polna, ni rešil"
@@ -3207,10 +3226,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Zmogljivost sob
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Že obstaja zapis za postavko {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,"Izgubili boste zapise o že ustvarjenih računih. Ali ste prepričani, da želite znova zagnati to naročnino?"
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Kotizacija
 DocType: Budget,Cost Center,Stroškovno Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Naročilnica sporočilo
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skrij ID za DDV naročnika od prodajnih transakcij
@@ -3219,20 +3239,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladišče je mogoče spremeniti samo prek borze Vstop / Delivery Note / Potrdilo o nakupu
 DocType: Employee Education,Class / Percentage,Razred / Odstotek
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Vodja marketinga in prodaje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Vodja marketinga in prodaje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Davek na prihodek
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Pojdite v Letterheads
+DocType: Subscription,Cancel At End Of Period,Prekliči ob koncu obdobja
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Ni izbranih elementov za prenos
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Ni izbranih elementov za prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
 DocType: Vehicle,Electric,električni
 DocType: Task,% Progress,% napredka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Dobiček / izgube pri prodaji premoženja
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Dobiček / izgube pri prodaji premoženja
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",V spodnji tabeli bo izbran samo kandidat s statusom »Odobreno«.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Številka računa za račun {0} ni na voljo. <br> Pravilno nastavite svoj račun.
 DocType: Task,Depends on Tasks,Odvisno od Opravila
@@ -3247,6 +3268,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Ni na zalogi
 DocType: Volunteer,Volunteer Skills,Prostovoljne spretnosti
 DocType: Appraisal,HR User,Uporabnik človeških virov
+DocType: Bank Guarantee,Reference Document Name,Referenčno ime dokumenta
 DocType: Purchase Invoice,Taxes and Charges Deducted,Davki in dajatve Odbitek
 apps/erpnext/erpnext/hooks.py +142,Issues,Vprašanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stanje mora biti eno od {0}
@@ -3260,7 +3282,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} je onemogočeno
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Large
+DocType: Loan,Loan Application,Loan Application
 DocType: Crop,Scientific Name,Znanstveno ime
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Skupaj Listi
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Ponovno izbere, če je izbrani stik po urejanju urejen"
@@ -3269,13 +3292,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Število
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Velika
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Velika
 DocType: Homepage Featured Product,Homepage Featured Product,Domača stran izbranega izdelka
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Vse skupine za ocenjevanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Vse skupine za ocenjevanje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladišče Ime
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Skupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Ozemlje
@@ -3296,9 +3319,10 @@
 DocType: Fees,Fees,pristojbine
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Ponudba {0} je odpovedana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Skupni preostali znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Skupni preostali znesek
 DocType: Sales Partner,Targets,Cilji
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Prosimo, registrirajte številko SIREN v podatkovni datoteki podjetja"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 DocType: Price List,Price List Master,Cenik Master
 DocType: GST Account,CESS Account,CESS račun
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev."
@@ -3307,6 +3331,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izberite Patient
 DocType: Price List,Applicable for Countries,Velja za države
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Ime parametra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; in &quot;Zavrnjeno&quot; se lahko predloži
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Študent Group Ime je obvezno v vrsti {0}
 DocType: Homepage,Products to be shown on website homepage,"Proizvodi, ki se prikaže na spletni strani"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
@@ -3340,14 +3365,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,"Račun, ki je že ustvarjen za vse obračunske ure"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ime napaka: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Je strošek financiranja
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Privzeto stran nastavite v nastavitvah restavracij
 ,Salary Register,plača Registracija
 DocType: Warehouse,Parent Warehouse,Parent Skladišče
-DocType: C-Form Invoice Detail,Net Total,Neto Skupaj
+DocType: Subscription,Net Total,Neto Skupaj
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Privzeti BOM nismo našli v postavki {0} in projektno {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Opredeliti različne vrste posojil
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Opredeliti različne vrste posojil
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Neporavnani znesek
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v minutah)
@@ -3379,11 +3404,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root račun mora biti skupina
 DocType: Drug Prescription,Drug Prescription,Predpis o drogah
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Povrne / Zaprto
+DocType: Loan,Repaid/Closed,Povrne / Zaprto
 DocType: Item,Total Projected Qty,Skupne projekcije Kol
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopnja vrednotenja ni mogoče najti za postavko {0}, ki je potrebna za izvršitev računovodskih vnosov za {1} {2}. Če je predmet predmet transakcije kot element ničelne vrednosti za vrednost v {1}, navedite to v tabeli {1} Item. V nasprotnem primeru ustvarite transakcijo dohodne delnice za postavko ali navedite stopnjo vrednotenja v zapisu postavke in poskusite poslati / preklicati ta vnos"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 DocType: Course,Course Code,Koda predmeta
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: POS Settings,Use POS in Offline Mode,Uporabite POS v načinu brez povezave
@@ -3403,16 +3427,15 @@
 DocType: Purchase Invoice,Deemed Export,Izbrisani izvoz
 DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik.
-DocType: Subscription,Half-yearly,Polletni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Lab Test,LabTest Approver,Odobritev LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ste že ocenili za ocenjevalnih meril {}.
 DocType: Vehicle Service,Engine Oil,Motorno olje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Ustvarjeni delovni nalogi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Ustvarjeni delovni nalogi: {0}
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Naslov stranke
-DocType: Employee Loan,Loan Details,posojilo Podrobnosti
+DocType: Loan,Loan Details,posojilo Podrobnosti
 DocType: Company,Default Inventory Account,Privzeti Popis račun
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio številke se ne ujemajo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Vrstica {0}: Zaključen Kol mora biti večji od nič.
@@ -3424,19 +3447,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Povezava na vse enote kopenskih površin, v katerih rastlina raste"
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
 DocType: Item Group,Show this slideshow at the top of the page,Pokažite ta diaprojekcije na vrhu strani
 DocType: BOM,Item UOM,Postavka UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
 DocType: Cheque Print Template,Primary Settings,primarni Nastavitve
 DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Dodaj Zaposleni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Dodaj Zaposleni
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim računom ki pripada organizaciji.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3456,11 +3479,10 @@
 DocType: SMS Log,No of Sent SMS,Število poslanih SMS
 DocType: Antibiotic,Healthcare Administrator,Skrbnik zdravstva
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Nastavite cilj
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
 DocType: Dosage Strength,Dosage Strength,Odmerek
 DocType: Account,Expense Account,Expense račun
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programska oprema
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Barva
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Barva
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Merila načrt ocenjevanja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Datum izteka roka je obvezen za izbrani predmet
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Preprečevanje nakupnih naročil
@@ -3473,18 +3495,18 @@
 DocType: Patient,Personal and Social History,Osebna in socialna zgodovina
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Uporabnik {0} je ustvaril
 DocType: Fee Schedule,Fee Breakup for each student,Povračilo stroškov za vsakega študenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Spremeni kodo
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Cenik Valuta ni izbran
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Cenik Valuta ni izbran
 DocType: Purchase Invoice,Availed ITC Cess,Uporabil ITC Cess
 ,Student Monthly Attendance Sheet,Študent Mesečni Udeležba Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o dostavi velja samo za prodajo
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Do
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Študent skupine ali tečaj Urnik je obvezna
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Študent skupine ali tečaj Urnik je obvezna
@@ -3505,7 +3527,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Navedite svoje izdelke ali storitve, ki jih kupite ali prodajate."
 DocType: Water Analysis,Storage Temperature,Temperatura shranjevanja
 DocType: Employee Attendance Tool,Unmarked Attendance,neoznačena in postrežbo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Raziskovalec
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Raziskovalec
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Vpis Orodje Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Začetni datum mora biti krajši od končnega datuma za opravilo {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ali E-pošta je obvezna
@@ -3518,7 +3540,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} ima trenutno {1} oceno dobavitelja in naročila temu dobavitelju je treba izdajati s previdnostjo
 DocType: Chapter,Non Profit Manager,Neprofitni menedžer
 DocType: BOM,Total Cost(Company Currency),Skupni stroški (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serijska št {0} ustvaril
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serijska št {0} ustvaril
 DocType: Homepage,Company Description for website homepage,Podjetje Opis za domačo stran spletnega mesta
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Ime suplier
@@ -3528,11 +3550,10 @@
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
 DocType: Healthcare Settings,Result Printed,Rezultat natisnjen
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija račun
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Poskusna doba
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Ogled {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Poskusna doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Project,Total Costing Amount (via Timesheets),Skupni znesek stroškov (prek časopisov)
-DocType: Employee Advance,Expense Approver,Expense odobritelj
+DocType: Department,Expense Approver,Expense odobritelj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
 DocType: Project,Hourly,Na uro
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group skupini
@@ -3542,7 +3563,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Da datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Naredite plačilo preko Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Tiskano na
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Tiskano na
 DocType: Item,Inspection Required before Delivery,Inšpekcijski Zahtevana pred dostavo
 DocType: Item,Inspection Required before Purchase,Inšpekcijski Zahtevana pred nakupom
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Čakanju Dejavnosti
@@ -3552,7 +3573,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Najmanjša količina naročila
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Vaša organizacija
 DocType: Fee Component,Fees Category,pristojbine Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vnesite lajšanje datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Obvesti delavca
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vnesite ime oglaševalske akcije, če je vir preiskovalne akcije"
@@ -3562,7 +3583,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Preureditev Raven
 DocType: Company,Chart Of Accounts Template,Graf Of predlogo računov
 DocType: Attendance,Attendance Date,Udeležba Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepted Skladišče
@@ -3570,10 +3591,11 @@
 DocType: Item,Valuation Method,Metoda vrednotenja
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Day Half
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Dvojnik vnos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dvojnik vnos
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Vnesite ime upravičenca pred predložitvijo.
 DocType: Program Enrollment Tool,Get Students,Get Študenti
 DocType: Serial No,Under Warranty,Pod garancijo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"V besedi bo viden, ko boste shranite Sales Order."
 ,Employee Birthday,Zaposleni Rojstni dan
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Izberite datum zaključka za dokončano popravilo
@@ -3592,7 +3614,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervirano za podizvajalce
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
 DocType: Shopping Cart Settings,Orders,Naročila
-DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju
+DocType: Department,Leave Approver,Pustite odobritelju
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Izberite serijo
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Ime skupine ocena
@@ -3637,7 +3659,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub Gosenica Postavka
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL ZA PREJEMNIKA
 DocType: Asset Category Account,Accumulated Depreciation Account,Bilančni Amortizacija račun
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,To e-poštno sporočilo je samodejno generirano
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
 DocType: Program Enrollment,Boarding Student,Boarding Študent
 DocType: Asset,Expected Value After Useful Life,Pričakovana vrednost Po Koristne življenja
@@ -3662,21 +3683,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Šivih {0} obstaja proti Študent {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortizacija je izpadlo zaradi odprodaje premoženja
-DocType: Member,Member,Član
+DocType: Loan,Member,Član
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje naslovov
 DocType: Work Order Item,Work Order Item,Postavka delovnega naloga
 DocType: Pricing Rule,Item Code,Oznaka
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Kmetijski vodja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
 DocType: Supplier Scorecard Period,Variables,Spremenljivke
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Zapiranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Velikost
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serijska št {0} ni na zalogi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serijska št {0} ni na zalogi
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Davčna predlogo za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Napišite Off neporavnanega zneska
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Račun {0} ne ujema z družbo {1}
@@ -3684,7 +3705,6 @@
 DocType: Stock Settings,Default Stock UOM,Privzeto Stock UOM
 DocType: Asset,Number of Depreciations Booked,Število amortizacije Rezervirano
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Količina skupaj
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Proti delavcev doba: {0}
 DocType: Landed Cost Item,Receipt Document,prejem dokumenta
 DocType: Employee Education,School/University,Šola / univerza
 DocType: Payment Request,Reference Details,Referenčna Podrobnosti
@@ -3695,7 +3715,7 @@
 DocType: Asset,Double Declining Balance,Double Upadanje Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Zaprta naročila ni mogoče preklicati. Unclose za preklic.
 DocType: Student Guardian,Father,oče
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 DocType: Attendance,On Leave,Na dopustu
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dobite posodobitve
@@ -3709,10 +3729,10 @@
 DocType: Lead,Lower Income,Nižji od dobička
 DocType: Restaurant Order Entry,Current Order,Trenutni naročilo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Vir in cilj skladišče ne more biti enaka za vrstico {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Pojdite v programe
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Vrstica {0} # Razdeljena količina {1} ne sme biti večja od količine, za katero je vložena zahtevka {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Vrstica {0} # Razdeljena količina {1} ne sme biti večja od količine, za katero je vložena zahtevka {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti za 'Do datuma '
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
@@ -3735,7 +3755,6 @@
 DocType: Payment Terms Template,Payment Terms,Plačilni pogoji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minute
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
 DocType: Chapter,Meetup Embed HTML,Meetup Vstavi HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Pojdi na dobavitelje
@@ -3755,30 +3774,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponudba {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Dostavljeno
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Prosimo, nastavite e-poštni ID za študenta, da pošljete zahtevek za plačilo"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Prosimo, nastavite e-poštni ID za študenta, da pošljete zahtevek za plačilo"
 DocType: Patient,Medical History,Zdravstvena zgodovina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bančnem računu računa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bančnem računu računa
 DocType: Patient,Patient ID,ID bolnika
 DocType: Physician Schedule,Schedule Name,Ime seznama
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Naredite plačilnega lista
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Dodaj vse dobavitelje
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Dodaj vse dobavitelje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Vrstica # {0}: Razporejeni vrednosti ne sme biti večja od neplačanega zneska.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Prebrskaj BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Secured Posojila
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Secured Posojila
 DocType: Purchase Invoice,Edit Posting Date and Time,Uredi datum in uro vnosa
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosim, nastavite račune, povezane Amortizacija v sredstvih kategoriji {0} ali družbe {1}"
 DocType: Lab Test Groups,Normal Range,Normalni obseg
 DocType: Academic Term,Academic Year,Študijsko leto
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Razpoložljiva prodaja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Otvoritev Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Otvoritev Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,preostala
 DocType: Appraisal,Appraisal,Cenitev
+DocType: Loan,Loan Account,Kreditni račun
 DocType: Purchase Invoice,GST Details,Podrobnosti o GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-pošta poslana dobavitelju {0}
 DocType: Item,Default Sales Unit of Measure,Privzeta prodajna enota ukrepa
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Študijsko leto:
+DocType: Subscription,Past Due Date,Pretekli rok
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Ne dovolite nastavitve nadomestnega elementa za predmet {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponovi
@@ -3791,7 +3812,7 @@
 DocType: Patient Appointment,Patient Appointment,Imenovanje pacienta
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Odobritvi vloge ne more biti enaka kot vloga je pravilo, ki veljajo za"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Pridobite dobavitelje po
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Pridobite dobavitelje po
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} ni najden za postavko {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Pojdi na predmete
 DocType: Accounts Settings,Show Inclusive Tax In Print,Prikaži inkluzivni davek v tisku
@@ -3799,10 +3820,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sporočilo je bilo poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Račun z zapirali vozlišč ni mogoče nastaviti kot knjigo
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju&gt; Nastavitve izobraževanja"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Obrestna mera, po kateri Cenik valuti se pretvorijo v osn stranke"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta)
 DocType: Physician,Physician Schedules,Urnik zdravnikov
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Skupni znesek predplačila ne more biti večji od skupnega sankcioniranega zneska
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Skupni znesek predplačila ne more biti večji od skupnega sankcioniranega zneska
 DocType: Salary Slip,Hour Rate,Urna postavka
 DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
@@ -3820,6 +3842,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}"
 DocType: BOM,Inspection Required,Inšpekcijski Zahtevano
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Vnesti bančno garancijsko številko pred predložitvijo.
 DocType: Driving License Category,Class,Razred
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Delovnega reda ni mogoče dvigniti glede na predlogo postavke
@@ -3830,7 +3853,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju&gt; Nastavitve izobraževanja"
 DocType: Serial No,Is Cancelled,Je Preklicana
 DocType: Student Group,Group Based On,"Skupina, ki temelji na"
 DocType: Journal Entry,Bill Date,Bill Datum
@@ -3841,9 +3863,10 @@
 DocType: Cheque Print Template,Cheque Height,Ček Višina
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
 DocType: Setup Progress,Setup Progress,Napredek nastavitve
+DocType: Expense Claim,Approval Status,Stanje odobritve
 DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Preveri vse
 ,Issued Items Against Work Order,Izdane predmete proti delovnemu nalogu
 DocType: Vehicle Log,Invoice Ref,Ref na računu
@@ -3874,12 +3897,11 @@
 DocType: Customs Tariff Number,Tariff Number,tarifna številka
 DocType: Work Order Item,Available Qty at WIP Warehouse,Na voljo Količina na WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Predvidoma
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
-DocType: Employee Loan,Employee Loan Application,Zaposlenih Loan Application
 DocType: Issue,Opening Date,Otvoritev Datum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Najprej shranite bolnika
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Najprej shranite bolnika
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Udeležba je bila uspešno označena.
 DocType: Program Enrollment,Public Transport,Javni prevoz
 DocType: Soil Texture,Silt Composition (%),Siltova sestava (%)
@@ -3898,7 +3920,7 @@
 ,Item Balance (Simple),Postavka Balance (Enostavno)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
 DocType: POS Profile,Write Off Account,Odpišite račun
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Opomin Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Opomin Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Popust Količina
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
@@ -3921,6 +3943,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Datum Naročila Kupca
 DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
 DocType: Assessment Plan,Assessment Plan,načrt ocenjevanja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Stranka {0} je ustvarjena.
 DocType: Stock Settings,Limit Percent,omejitev Odstotek
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno ni na zalogi
@@ -3934,14 +3957,15 @@
 DocType: Journal Entry,Stock Entry,Stock Začetek
 DocType: Payment Entry,Payment References,Plačilni Reference
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Število intervalov za intervalno polje, npr. Če je interval &quot;Dnevi&quot; in časovni interval obračunavanja 3, bodo računi ustvarjeni vsakih 3 dni"
 DocType: Vehicle,Insurance Details,zavarovanje Podrobnosti
 DocType: Account,Payable,Plačljivo
 DocType: Share Balance,Share Type,Vrsta delnice
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vnesite roki odplačevanja
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Vnesite roki odplačevanja
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Dolžniki ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobiček %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobiček %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Spremenite profil POS
 DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum
@@ -3951,10 +3975,11 @@
 DocType: Lead,Address Desc,Naslov opis izdelka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party je obvezen
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Vrstice s podvojenimi datumi v drugih vrsticah so bile najdene: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Vrstice s podvojenimi datumi v drugih vrsticah so bile najdene: {list}
 DocType: Topic,Topic Name,Ime temo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Prosimo, nastavite privzeto predlogo za obvestilo o zavrnitvi odobritve v HR nastavitvah."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Izberite zaposlenega, da zaposleni vnaprej napreduje."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Izberite zaposlenega, da zaposleni vnaprej napreduje."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Izberite veljaven datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Izberite naravo vašega podjetja.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3973,7 +3998,7 @@
 DocType: Asset Movement,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Delež knjige
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Ustvarjen je račun za prodajo {0}
 DocType: Employee,Confirmation Date,Datum potrditve
 DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek
@@ -3982,7 +4007,7 @@
 DocType: Account,Accumulated Depreciation,Bilančni Amortizacija
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalno ime
 DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
-DocType: Employee Loan Application,Required by Date,Zahtevana Datum
+DocType: Loan Application,Required by Date,Zahtevana Datum
 DocType: Lead,Lead Owner,Lastnik ponudbe
 DocType: Production Plan,Sales Orders Detail,Prodajna naročila Podrobnosti
 DocType: Bin,Requested Quantity,Zahtevana količina
@@ -3995,10 +4020,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plača - Skupaj Odbitek - Posojilo Povračilo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Plača Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Večkratne različice
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dostavljeno
+DocType: Subscription,Trial Period Start Date,Začetni datum poskusnega obdobja
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Prijavite se kot drugi uporabnik.
@@ -4019,12 +4045,11 @@
 DocType: Student Guardian,Student Guardian,študent Guardian
 DocType: Member,Member Name,Ime člana
 DocType: Stock Settings,Use Naming Series,Uporabite Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobi zalogo
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,v naročnini
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 DocType: Membership,Payment Details,Podatki o plačilu
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Prenehanja delovnega naročila ni mogoče preklicati, jo najprej izključite"
 DocType: Asset,Journal Entry for Scrap,Journal Entry za pretep
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
@@ -4044,6 +4069,7 @@
 DocType: Land Unit,Land Unit,Land enota
 ,Purchase Analytics,Odkupne Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Dostava Opomba Postavka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Trenuten račun {0} manjka
 DocType: Asset Maintenance Log,Task,Naloga
 DocType: Purchase Taxes and Charges,Reference Row #,Referenčna Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
@@ -4056,7 +4082,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / izida
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenih in postrežbo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Cilj mora biti eden od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Izpolnite obrazec in ga shranite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Izpolnite obrazec in ga shranite
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Skupnost
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Dejanska kol v zalogi
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Dejanska kol v zalogi
@@ -4071,7 +4097,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standardni Prodajni tečaj
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
 DocType: Cash Flow Mapper,Section Name,Ime oddelka
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Preureditev Kol
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Preureditev Kol
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Razpisana delovna
 DocType: Company,Stock Adjustment Account,Račun prilagoditev zaloge
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpisati
@@ -4082,9 +4108,9 @@
 DocType: Task,depends_on,odvisno od
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Vrstni red za posodobitev najnovejše cene v vseh gradivih. Traja lahko nekaj minut.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ime novega računa. Opomba: Prosimo, da ne ustvarjajo računov za kupce in dobavitelje"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država pametno privzeti naslov Predloge
 DocType: Water Analysis,Appearance,Videz
+DocType: HR Settings,Leave Status Notification Template,Zapusti predlogo o statusu obvestila
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Povpr. Nakup cenik seznam
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Podatki o članih.
@@ -4107,7 +4133,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,"Ni dovoljeno. Prosimo, onemogočite preskusno predlogo"
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
 DocType: Crop Cycle,Linked Land Unit,Povezana zemljiška enota
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 DocType: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
@@ -4123,7 +4149,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Pojdi na uporabnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Neveljavna GSTIN ali Enter NA za Neregistrirani
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Vpis Fee
@@ -4139,14 +4165,14 @@
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
 DocType: Company,Create Chart Of Accounts Based On,"Ustvariti kontni okvir, ki temelji na"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Ne morete ga pretvoriti v ne-skupino. Otroške naloge obstajajo.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
 ,Stock Ageing,Staranje zaloge
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Študent {0} obstaja proti študentskega prijavitelja {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Prilagajanje zaokroževanja (valuta podjetja)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Evidenca prisotnosti
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Serija:
 DocType: Volunteer,Afternoon,Popoldne
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Cheque Print Template,Scanned Cheque,skeniranih Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
@@ -4162,7 +4188,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekt {0} že obstaja
 DocType: Medical Department,Nursing User,Uporabnik zdravstvene nege
 DocType: Plant Analysis,Plant Analysis Criterias,Kriteriji za analizo rastlin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serijska številka {0} ne sodi v paket {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Obdobje veljavnosti te ponudbe se je končalo.
 DocType: Expense Claim Account,Expense Claim Account,Expense Zahtevek računa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dovoli tečajne menjalne tečaje
@@ -4184,11 +4211,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Make Variants
 DocType: Item,Default BOM,Privzeto BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Skupni fakturirani znesek (prek prodajnih računov)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Opomin Znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Opomin Znesek
 DocType: Project Update,Not Updated,Ni posodobljeno
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Obstajajo neskladja med stopnjo, brez delnic in izračunanim zneskom"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Skupaj Izjemna Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Journal Entry,Printing Settings,Nastavitve tiskanja
 DocType: Employee Advance,Advance Account,Predplačniški račun
 DocType: Job Offer,Job Offer Terms,Pogoji ponudb za delo
@@ -4197,7 +4224,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Avtomobilizem
 DocType: Vehicle,Insurance Company,Zavarovalnica
 DocType: Asset Category Account,Fixed Asset Account,Fiksna račun premoženja
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,spremenljivka
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,spremenljivka
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dobavnica
 DocType: Chapter,Members,Člani
 DocType: Student,Student Email Address,Študent e-poštni naslov
@@ -4221,7 +4248,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,naslov Ime
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Razdelitev {0} enot {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Razdelitev {0} enot {1}
 DocType: Assessment Code,Assessment Code,Koda ocena
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
@@ -4229,25 +4256,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
 DocType: Bank Reconciliation Detail,Payment Document,plačilo dokumentov
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Napaka pri ocenjevanju formule za merila
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum pridružitva mora biti večji od datuma rojstva
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum pridružitva mora biti večji od datuma rojstva
+DocType: Subscription,Plans,Načrti
 DocType: Salary Slip,Salary Structure,Struktura Plače
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Vprašanje Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Pri ustvarjanju ponavljajoče se napake
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ponudbe
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ustvaril nobene skupine študentov.
 DocType: Purchase Invoice Item,Serial No,Zaporedna številka
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesečni Povračilo Znesek ne sme biti večja od zneska kredita
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Mesečni Povračilo Znesek ne sme biti večja od zneska kredita
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Vrstica # {0}: Pričakovani datum dostave ne sme biti pred datumom naročila
 DocType: Purchase Invoice,Print Language,Jezik tiskanja
 DocType: Salary Slip,Total Working Hours,Skupaj Delovni čas
 DocType: Sales Invoice,Customer PO Details,Podrobnosti kupca PO
-DocType: Subscription,Next Schedule Date,Naslednji datum načrta
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Začasni odpiranje računa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Vnesite vrednost mora biti pozitivna
@@ -4276,11 +4302,11 @@
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Od in Do datumov zahtevanih
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Za omenjena merila ni zaposlenih
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
 DocType: Hotel Settings,Default Customer,Privzeta stranka
 DocType: Assessment Plan,Supervisor Name,Ime nadzornik
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne potrdite, če je sestanek ustvarjen za isti dan"
@@ -4305,16 +4331,16 @@
 DocType: Journal Entry Account,Employee Advance,Napredek zaposlenih
 DocType: Payroll Entry,Payroll Frequency,izplačane Frequency
 DocType: Lab Test Template,Sensitivity,Občutljivost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Surovina
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Rastline in stroje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Rastline in stroje
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Nastavitve Delo Povzetek
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Vnesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interni prenos
 DocType: Asset Maintenance,Maintenance Tasks,Vzdrževalna opravila
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bodisi ciljna kol ali ciljna vrednost je obvezna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev
@@ -4322,14 +4348,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integracije ERPNext
 DocType: Crop Cycle,Detected Disease,Detektirana bolezen
 ,Produced,Proizvedena
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Začetni datum odplačila ne more biti pred datumom izplačila.
 DocType: Item,Item Code for Suppliers,Oznaka za dobavitelje
 DocType: Issue,Raised By (Email),Postavljeno Z (e-naslov)
 DocType: Training Event,Trainer Name,Ime Trainer
 DocType: Mode of Payment,General,Splošno
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje sporočilo
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje sporočilo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match plačila z računov
 DocType: Journal Entry,Bank Entry,Banka Začetek
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
@@ -4343,7 +4370,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Omogoči / onemogoči valute.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} na poldnevni dan pustite {1}
 DocType: Production Plan,Get Material Request,Get Zahteva material
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Poštni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Poštni stroški
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 ,Item Variant Details,Podrobnosti o elementu Variante
@@ -4354,9 +4381,9 @@
 DocType: Drug Prescription,Hour,Ura
 DocType: Restaurant Order Entry,Last Sales Invoice,Zadnji račun za prodajo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Izberite količino proti elementu {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Tip ponudbe
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Vsi ti artikli so že bili obračunani
 DocType: Company,Monthly Sales Target,Mesečni prodajni cilj
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
@@ -4364,7 +4391,7 @@
 DocType: Item,Default Material Request Type,Privzeto Material Vrsta Zahteva
 DocType: Supplier Scorecard,Evaluation Period,Ocenjevalno obdobje
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Neznan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Delovni nalog ni bil ustvarjen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Delovni nalog ni bil ustvarjen
 DocType: Shipping Rule,Shipping Rule Conditions,Pogoji dostavnega pravila
 DocType: Purchase Invoice,Export Type,Izvozna vrsta
 DocType: Salary Slip Loan,Salary Slip Loan,Posojilo za plačilo
@@ -4380,8 +4407,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Povzetek povzetka računov
 DocType: Education Settings,Education Manager,Vodja izobraževanja
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Najmanjša dolžina med posameznimi rastlinami na polju za optimalno rast
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Združena Točka {0} ni mogoče posodobiti uporabo zaloga spravi namesto uporabiti zaloga Entry
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Združena Točka {0} ni mogoče posodobiti uporabo zaloga spravi namesto uporabiti zaloga Entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Združena Točka {0} ni mogoče posodobiti uporabo zaloga spravi namesto uporabiti zaloga Entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Združena Točka {0} ni mogoče posodobiti uporabo zaloga spravi namesto uporabiti zaloga Entry
 DocType: Quality Inspection,Report Date,Poročilo Datum
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Računi
@@ -4413,20 +4440,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,prejem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,prejem
 ,Sales Register,Prodaja Register
 DocType: Daily Work Summary Group,Send Emails At,Pošlji e-pošte na
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Pogled obrazca
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Odobritev stroškov je obvezna v zahtevi za odhodke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Dodajte uporabnike v svojo organizacijo, razen sebe."
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Ni še nobene stranke!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izkaz denarnih tokov
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Ni ustvarjeno nobeno materialno zahtevo
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
@@ -4449,11 +4477,12 @@
 DocType: Vehicle,Chassis No,podvozje ni
 DocType: Payment Request,Initiated,Začela
 DocType: Production Plan Item,Planned Start Date,Načrtovani datum začetka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Izberite BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Izberite BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Uporabil integrirani davek ITC
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
+DocType: Bank Guarantee,Clauses and Conditions,Klavzule in pogoji
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Project Task,View Timesheet,Ogled Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Končni datum mora biti večji od začetnega datuma
 DocType: Leave Type,Is Encash,Je vnovči
 DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
@@ -4467,9 +4496,10 @@
 DocType: Patient,Alcohol Current Use,Alkoholna trenutna uporaba
 DocType: Student Admission Program,Student Admission Program,Program sprejema študentov
 DocType: Payment Entry,Account Paid To,Račun Izplača
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternativno ime predmeta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Ni bilo mogoče predložiti plačilnega lista <br> \ Možni razlogi: <br> \ 1. Neto plačilo je manjše od 0. <br> \ 2. E-poštni naslov podjetja, ki je naveden v poveljniku zaposlenega, ni veljaven. <br>"
@@ -4479,7 +4509,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} proračun za račun {1} na {2} {3} je {4}. Bo prekoračen za {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Out Kol
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,in unchcked Onemogočeno v
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serija je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finančne storitve
 DocType: Student Sibling,Student ID,Student ID
@@ -4491,14 +4520,16 @@
 DocType: Complaint,Complaint,Pritožba
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Vnos vračila
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Vsi oddelki
 DocType: Patient,Alcohol Past Use,Pretekla uporaba alkohola
 DocType: Fertilizer Content,Fertilizer Content,Vsebina gnojil
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematično / Stuck
 DocType: Tax Rule,Billing State,Država za zaračunavanje
 DocType: Share Transfer,Transfer,Prenos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Delovni nalog {0} morate preklicati pred preklicem tega prodajnega naloga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
@@ -4522,10 +4553,11 @@
 DocType: Cheque Print Template,Message to show,Sporočilo za prikaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Maloprodaja
 DocType: Student Attendance,Absent,Odsoten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle izdelek
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Rezultate ni mogoče najti od {0}. Imeti morate stoječe rezultate, ki pokrivajo od 0 do 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
+DocType: Subscription,Current Invoice Start Date,Začetni datum trenutnega računa
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: zahtevan je debetni ali kreditni znesek za {2}
 DocType: GL Entry,Remarks,Opombe
@@ -4535,11 +4567,13 @@
 DocType: Task,Parent Task,Naloga staršev
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Naredite Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Tiskanje in Pisalne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Tiskanje in Pisalne
 DocType: Stock Settings,Show Barcode Field,Prikaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Pošlji Dobavitelj e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plača je že pripravljena za obdobje med {0} in {1}, Pusti obdobje uporabe ne more biti med tem časovnem obdobju."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Pošlji Dobavitelj e-pošte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plača je že pripravljena za obdobje med {0} in {1}, Pusti obdobje uporabe ne more biti med tem časovnem obdobju."
+DocType: Fiscal Year,Auto Created,Samodejno ustvarjeno
 DocType: Chapter Member,Leave Reason,Pustite razlog
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Račun {0} ne obstaja več
 DocType: Guardian Interest,Guardian Interest,Guardian Obresti
 DocType: Volunteer,Availability,Razpoložljivost
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Nastavitev privzetih vrednosti za račune POS
@@ -4548,14 +4582,13 @@
 DocType: Timesheet,Employee Detail,Podrobnosti zaposleni
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
 DocType: Lab Prescription,Test Code,Testna koda
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavitve za spletni strani
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ-ji niso dovoljeni za {0} zaradi postavke ocene rezultatov {1}
 DocType: Job Offer,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Nad
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Skupni znesek {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Skupni znesek {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Omemba če nestandardni plača račun
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Izberite ocenjevalne skupine, razen &quot;vseh skupin za presojo&quot;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Vrstica {0}: Za postavko je potreben stroškovni center {1}
@@ -4566,7 +4599,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
 DocType: Chapter,Region,Regija
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
 DocType: Holiday List,Weekly Off,Tedenski Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Ponovno naloži povezano analizo
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za primer leta 2012, 2012-13"
@@ -4582,7 +4615,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Stroški izločeni sredstvi
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroškovno mesto je zahtevano za postavko {2}
 DocType: Vehicle,Policy No,Pravilnik št
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 DocType: Asset,Straight Line,Ravna črta
 DocType: Project User,Project User,projekt Uporabnik
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4622,21 +4655,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Pot
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Ni mogoče pretvoriti v stroškovni center za knjigo, saj ima otrok vozlišč"
 DocType: Production Plan,Total Planned Qty,Skupno načrtovano število
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Otvoritev Vrednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Otvoritev Vrednost
 DocType: Salary Detail,Formula,Formula
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Prodajni račun
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Prodajni račun
 DocType: Purchase Invoice Item,Total Weight,Totalna teža
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodajo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisija za prodajo
 DocType: Job Offer Term,Value / Description,Vrednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
 DocType: Tax Rule,Billing Country,Zaračunavanje Država
 DocType: Purchase Order Item,Expected Delivery Date,Pričakuje Dostava Datum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vnos naročila restavracij
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
 DocType: Asset Maintenance Task,Assign To Name,Dodeli imenu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Zabava Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Zabava Stroški
 DocType: Hub Settings,Enabled Users,Omogočeni uporabniki
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Naredite Zahteva material
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Odprti Točka {0}
@@ -4649,24 +4682,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Vloge za dopust.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnja Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Pravni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Pravni stroški
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Izberite količino na vrsti
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Izdelava računov za prodajo in nakup
 DocType: Purchase Invoice,Posting Time,Ura vnosa
 DocType: Timesheet,% Amount Billed,% Zaračunani znesek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefonske Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefonske Stroški
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ne Postavka s serijsko št {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ne Postavka s serijsko št {0}
 DocType: Email Digest,Open Notifications,Odprte Obvestila
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika Znesek (družba Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Neposredni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Neposredni stroški
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Potni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Dodajanje po meri naročenega polja v doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Purchase Receipt Item,Sample Quantity,Količina vzorca
+DocType: Bank Guarantee,Name of Beneficiary,Ime upravičenca
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Na podlagi najnovejšega razmerja cene / cene cenika / zadnje stopnje nakupa surovin samodejno posodobite stroške BOM prek načrtovalca.
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matični račun {1} ne pripada podjetju: {2}
@@ -4678,14 +4711,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Poskusno delo
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,komponente plače
 DocType: Program Enrollment Tool,New Academic Year,Novo študijsko leto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Nazaj / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Nazaj / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Skupaj Plačan znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Skupaj Plačan znesek
 DocType: GST Settings,B2C Limit,Omejitev B2C
 DocType: Work Order Item,Transferred Qty,Prenese Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Krmarjenje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Načrtovanje
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Načrtovanje
 DocType: Share Balance,Issued,Izdala
+DocType: Loan,Repayment Start Date,Datum začetka odplačevanja
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,študent dejavnost
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Dobavitelj Id
 DocType: Payment Request,Payment Gateway Details,Plačilo Gateway Podrobnosti
@@ -4698,10 +4732,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Vrsta listov kot priložnostno, bolni itd"
 DocType: Email Digest,Send regular summary reports via Email.,Pošlji redna zbirna poročila preko e-maila.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Prosim, nastavite privzetega računa v Tip Expense Terjatve {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Prosim, nastavite privzetega računa v Tip Expense Terjatve {0}"
 DocType: Assessment Result,Student Name,Student Ime
 DocType: Brand,Item Manager,Element Manager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Plače plačljivo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Plače plačljivo
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
 DocType: Plant Analysis,Collection Datetime,Zbirka Datetime
 DocType: Work Order,Total Operating Cost,Skupni operativni stroški
@@ -4711,9 +4745,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Uporabnik {0} ne obstaja
 DocType: Payment Term,Day(s) after invoice date,Dan (dan) po datumu računa
 DocType: Payment Schedule,Payment Schedule,Urnik plačila
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Kratica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Plačilo vnos že obstaja
+DocType: Subscription,Trial Period End Date,Končni datum poskusnega obdobja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plača predlogo gospodar.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologija
@@ -4730,9 +4764,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponudbe za interesente ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Vse skupine strank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Bilančni Mesečni
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezen. Mogoče zapis Menjalnega tečaja ni ustvarjen za {1} v {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezen. Mogoče zapis Menjalnega tečaja ni ustvarjen za {1} v {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Račun {0}: Matični račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
@@ -4741,14 +4775,15 @@
 DocType: Lab Prescription,Test Created,Ustvarjeno testiranje
 DocType: Healthcare Settings,Custom Signature in Print,Podpis po meri v tisku
 DocType: Account,Temporary,Začasna
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Stranka LPO št.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Stranka LPO št.
 DocType: Program,Courses,Tečaji
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Če onemogočiti, &quot;z besedami&quot; polja ne bo vidna v vsakem poslu"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"To dejanje bo ustavilo prihodnje obračunavanje. Ali ste prepričani, da želite preklicati to naročnino?"
 DocType: Serial No,Distinct unit of an Item,Ločena enota Postavka
 DocType: Supplier Scorecard Criteria,Criteria Name,Ime merila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Nastavite Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Nastavite Company
 DocType: Pricing Rule,Buying,Nabava
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Bolezni in gnojila
 DocType: HR Settings,Employee Records to be created by,"Zapisi zaposlenih, ki ga povzročajo"
@@ -4757,18 +4792,18 @@
 DocType: POS Profile,Apply Discount On,Uporabi popust na
 DocType: Member,Membership Type,Vrsta članstva
 ,Reqd By Date,Reqd po Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Upniki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Upniki
 DocType: Assessment Plan,Assessment Name,Ime ocena
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Prikažite PDC v tisku
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Prikažite PDC v tisku
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Vrstica # {0}: Zaporedna številka je obvezna
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Zaposlitvena ponudba
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Kratica inštituta
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
@@ -4786,7 +4821,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Skupne variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Udeležba na zaposlenega {0} je že označen za ta dan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Udeležba na zaposlenega {0} je že označen za ta dan
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",v minutah Posodobljeno preko &quot;Čas Logu&quot;
 DocType: Customer,From Lead,Iz ponudbe
@@ -4797,6 +4832,7 @@
 DocType: Lab Test,Approved Date,Odobren datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
+DocType: Subscriber,Subscriber Name,Ime naročnika
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Update Tool,Replace,Zamenjaj
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ni izdelkov.
@@ -4806,19 +4842,18 @@
 DocType: Request for Quotation Item,Project Name,Ime projekta
 DocType: Customer,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Izberite račun obrestnih prihodkov v posojilu zaposlenih {0}
 DocType: Work Order,Required Items,Zahtevani Točke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Človeški vir
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo
 DocType: Disease,Treatment Task,Naloga zdravljenja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Davčni Sredstva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Davčni Sredstva
 DocType: BOM Item,BOM No,BOM Ne
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,BOM ki bo nadomestila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronske naprave
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronske naprave
 DocType: Asset,Maintenance Required,Potrebno vzdrževanje
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
@@ -4827,7 +4862,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Izjemna Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Določiti cilje Postavka Group-pametno za te prodaje oseba.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zaloge Older Than [dni]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Sredstvo je obvezna za osnovno sredstvo nakupu / prodaji
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Sredstvo je obvezna za osnovno sredstvo nakupu / prodaji
 DocType: Asset Maintenance Team,Maintenance Team Name,Ime ekipe za vzdrževanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Stranka je obvezna, če je »Možnost od« izbrana kot naročnik"
@@ -4837,19 +4872,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Vrste Expense zahtevka.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},stopnjo za zapisu Prodajni {0} nižja kot njegovi {1}. Prodajni manj morajo vsebovati vsaj {2}
-DocType: Item,Taxes,Davki
+DocType: Subscription,Taxes,Davki
 DocType: Purchase Invoice,capital goods,investicijsko blago
 DocType: Purchase Invoice Item,Weight Per Unit,Teža na enoto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Plačana in ni podal
 DocType: Project,Default Cost Center,Privzet Stroškovni Center
-DocType: Bank Guarantee,End Date,Končni datum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Zaloga Transakcije
 DocType: Budget,Budget Accounts,Proračun računi
 DocType: Employee,Internal Work History,Notranji Delo Zgodovina
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Bilančni Amortizacija Znesek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Spremenljivka Scorecard spremenljivke
-DocType: Employee Loan,Fully Disbursed,celoti izplačano
 DocType: Employee Advance,Due Advance Amount,Znesek vnaprej vnaprej
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
@@ -4873,7 +4906,7 @@
 ,Employee Information,Informacije zaposleni
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Ustvari so privzete davčne predloge za prodajo in nakup.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Ocenjevanje Rezultat zapisa {0} že obstaja.
@@ -4881,7 +4914,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavite Podjetje filtriranje prazno, če skupina Z je &quot;Podjetje&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Napotitev datum ne more biti prihodnji datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,za generiranje ponavljajočih se
 DocType: Stock Entry,Target Warehouse Address,Naslov tarče skladišča
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Zapusti
 DocType: Agriculture Task,End Day,Konec dneva
@@ -4906,11 +4938,10 @@
 DocType: Material Request,% Ordered,% Naročeno
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Študentske skupine temelji igrišče, bo tečaj se potrdi za vsakega študenta od vpisanih Tečaji v programu vpis."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Odkup tečaj
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Share Balance,From No,Od št
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina v družbi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Novo sporočilo od {pošiljatelja}
 DocType: Customer,Customer Primary Address,Primarni naslov stranke
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Glasila
 DocType: Drug Prescription,Description/Strength,Opis / moč
@@ -4919,22 +4950,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Enako postavka je bila vpisana večkrat
 DocType: Department,Leave Block List,Pustite Block List
 DocType: Purchase Invoice,Tax ID,Davčna številka
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno
 DocType: Accounts Settings,Accounts Settings,Računi Nastavitve
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,odobri
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformatiran naslov za {0}, popravite, da nadaljujete."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformatiran naslov za {0}, popravite, da nadaljujete."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",Številka novega računa bo vključena v ime računa kot predpono
 DocType: Maintenance Team Member,Team Member,Član ekipe
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Ni zadetka
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
-DocType: Employee Loan,Rate of Interest (%) / Year,Obrestna mera (%) / leto
+DocType: Loan,Rate of Interest (%) / Year,Obrestna mera (%) / leto
 ,Project Quantity,projekt Količina
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;"
 DocType: Opportunity,To Discuss,Razpravljati
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} enot {1} potrebnih v {2} za dokončanje te transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Obrestna mera (%) Letna
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Začasni računi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Črna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Začasni računi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Črna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka
 DocType: Shareholder,Contact List,Seznam kontaktov
 DocType: Account,Auditor,Revizor
@@ -4942,16 +4973,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} postavke proizvedene
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Nauči se več
 DocType: Cheque Print Template,Distance from top edge,Oddaljenost od zgornjega roba
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cenik {0} je onemogočena ali pa ne obstaja
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cenik {0} je onemogočena ali pa ne obstaja
 DocType: Purchase Invoice,Return,Return
 DocType: Pricing Rule,Disable,Onemogoči
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,"Način plačila je potrebno, da bi plačilo"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,"Način plačila je potrebno, da bi plačilo"
 DocType: Project Task,Pending Review,Dokler Pregled
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Uredite na celotni strani za več možnosti, kot so sredstva, serijski nosi, serije itd."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Imenovanja in posvetovanja
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ni vpisan v serijo {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Sredstvo {0} ne more biti izločeni, saj je že {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Potrebna je preverjanja
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Potrebna je preverjanja
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsoten
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Podjetje za nastavitev ni uspelo
@@ -4963,7 +4994,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Dodaj artikle iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Dodaj artikle iz
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Rastline in zemljišča
 DocType: Cheque Print Template,Regular,redno
 DocType: Fertilizer,Density (if liquid),Gostota (če je tekoča)
@@ -4988,24 +5019,26 @@
 DocType: Payment Entry,Paid Amount,Znesek Plačila
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Raziščite prodajne cikle
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Vstop v zaloge
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Vstop v zaloge
 ,Available Stock for Packing Items,Zaloga za embalirane izdelke
 DocType: Item Variant,Item Variant,Postavka Variant
 ,Work Order Stock Report,Poročilo o delovni nalogi
+DocType: Purchase Receipt,Auto Repeat Detail,Samodejno ponovite podrobnosti
 DocType: Assessment Result Tool,Assessment Result Tool,Ocena Rezultat orodje
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kot nadzornik
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Predlagaj kategorijo
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Odpadno Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu je že ""bremenitev"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""kredit"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Upravljanje kakovosti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Upravljanje kakovosti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Točka {0} je bila onemogočena
 DocType: Project,Total Billable Amount (via Timesheets),Skupni znesek zneska (prek časopisov)
 DocType: Agriculture Task,Previous Business Day,Prejšnji delovni dan
-DocType: Employee Loan,Repay Fixed Amount per Period,Povrne fiksni znesek na obdobje
+DocType: Loan,Repay Fixed Amount per Period,Povrne fiksni znesek na obdobje
 DocType: Employee,Health Insurance No,Zdravstveno zavarovanje št
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Credit Opomba Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Credit Opomba Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Skupaj obdavčljiv znesek
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
 DocType: Opening Invoice Creation Tool,Purchase,Nakup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balance Kol
@@ -5016,16 +5049,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} za {1}
 DocType: Healthcare Settings,Valid number of days,Veljavno število dni
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Stroškovna mesta
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Ponovni zagon naročnine
 DocType: Land Unit,Linked Plant Analysis,Analiza povezanih naprav
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Obrestna mera, po kateri dobavitelj je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Vrstica # {0}: čase v nasprotju z vrsto {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dovoli ničelni stopnji vrednotenja
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Dovoli ničelni stopnji vrednotenja
+DocType: Bank Guarantee,Receiving,Prejemanje
 DocType: Training Event Employee,Invited,povabljen
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Več aktivne strukture plač iskanja za zaposlenega {0} za datumoma
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Gateway račune.
 DocType: Employee,Employment Type,Vrsta zaposlovanje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Osnovna sredstva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Osnovna sredstva
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange dobiček / izguba
 ,GST Purchase Register,DDV Nakup Registracija
 ,Cash Flow,Denarni tok
@@ -5046,9 +5081,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Seznam vseh deležev transakcij
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Štetje
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Štetje
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Določiti je treba začetni datum preizkusnega obdobja in datum konca poskusnega obdobja
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Povprečna hitrost
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
+DocType: Subscription Plan Detail,Plan,Načrt
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
 DocType: Authorization Rule,Customer / Item Name,Stranka / Item Name
@@ -5078,6 +5114,7 @@
 DocType: Work Order,Warehouses,Skladišča
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sredstev ni mogoče prenesti
 DocType: Hotel Room Pricing,Hotel Room Pricing,Cene hotelske sobe
+DocType: Subscription,Days Until Due,Dnevi do dneva
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ta element je različica {0} (predloga).
 DocType: Workstation,per hour,na uro
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
@@ -5086,13 +5123,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Za Študentske skupine temelji Serija bo študent Serija biti potrjena za vse učence od programa vpis.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Porazdelitev
+DocType: Journal Entry Account,Loan,Posojilo
 DocType: Expense Claim Advance,Expense Claim Advance,Advance Claim Advance
 DocType: Lab Test,Report Preference,Prednost poročila
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informacije o prostovoljcih.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Project Manager
 ,Quoted Item Comparison,Citirano Točka Primerjava
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Prekrivanje v dosegu med {0} in {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Čista vrednost sredstev, kot je na"
 DocType: Crop,Produce,Produkt
@@ -5102,7 +5140,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Poraba materiala za izdelavo
 DocType: Item Alternative,Alternative Item Code,Alternativni koda izdelka
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Izberite artikel v Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Izberite artikel v Izdelava
 DocType: Delivery Stop,Delivery Stop,Dostava Stop
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
 DocType: Item,Material Issue,Material Issue
@@ -5112,15 +5150,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
 DocType: BOM,Show Items,prikaži Točke
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od časa ne sme biti večja od do časa.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Ali želite obvestiti vse stranke po elektronski pošti?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Ali želite obvestiti vse stranke po elektronski pošti?
+DocType: Subscription Plan,Billing Interval,Interval zaračunavanja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Nadaljuj
 DocType: Hub Settings,Hub Username,Uporabniško ime vozlišča
 DocType: Salary Detail,Component,Komponenta
 DocType: Assessment Criteria,Assessment Criteria Group,Skupina Merila ocenjevanja
 DocType: Healthcare Settings,Patient Name By,Ime bolnika z
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Vpis v časopisni razgovor za plače od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Vpis v časopisni razgovor za plače od {0} do {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
 DocType: Warehouse,Warehouse Name,Skladišče Name
 DocType: Naming Series,Select Transaction,Izberite Transaction
@@ -5134,23 +5172,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko hranite višino, težo, alergije, zdravstvene pomisleke in podobno"
 DocType: Leave Block List,Applies to Company,Velja za podjetja
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
-DocType: Employee Loan,Disbursement Date,izplačilo Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Prejemniki&quot; niso navedeni
+DocType: Loan,Disbursement Date,izplačilo Datum
 DocType: BOM Update Tool,Update latest price in all BOMs,Posodobi najnovejšo ceno v vseh BOM
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Medicinski zapis
 DocType: Vehicle,Vehicle,vozila
 DocType: Purchase Invoice,In Words,V besedi
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Pred predložitvijo navedite ime banke ali posojilne institucije.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} je treba vložiti
 DocType: POS Profile,Item Groups,postavka Skupine
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Danes je {0} &#39;s rojstni dan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Danes je {0} &#39;s rojstni dan!
 DocType: Sales Order Item,For Production,Za proizvodnjo
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Prosimo, dodajte račun za začasno odpiranje v kontnem okvirju"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Prosimo, dodajte račun za začasno odpiranje v kontnem okvirju"
 DocType: Customer,Customer Primary Contact,Primarni kontakt s strankami
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Časovno zaključni časopis
 DocType: Project Task,View Task,Ogled Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / svinec%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / svinec%
+DocType: Bank Guarantee,Bank Guarantee Type,Vrsta bančne garancije
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Delež računa
 ,Asset Depreciations and Balances,Premoženjem amortizacije in Stanja
@@ -5161,9 +5200,8 @@
 DocType: Production Plan,Include Subcontracted Items,Vključite predmete s podizvajalci
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,pridruži se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Lastnosti variant ni mogoče spremeniti po pretovarjanju zalog. Za to morate narediti novo postavko.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
-DocType: Employee Loan,Repay from Salary,Poplačilo iz Plača
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+DocType: Loan,Repay from Salary,Poplačilo iz Plača
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Zahteva plačilo pred {0} {1} za znesek {2}
 DocType: Salary Slip,Salary Slip,Plača listek
@@ -5187,11 +5225,11 @@
 DocType: Employee Education,Employee Education,Izobraževanje delavec
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dvojnik postavka skupina je našla v tabeli točka skupine
 DocType: Land Unit,Parent Land Unit,Matična enota
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
 DocType: Fertilizer,Fertilizer Name,Ime gnojila
 DocType: Salary Slip,Net Pay,Neto plača
 DocType: Cash Flow Mapping Accounts,Account,Račun
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijska št {0} je že prejela
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serijska št {0} je že prejela
 ,Requested Items To Be Transferred,Zahtevane blago prenaša
 DocType: Expense Claim,Vehicle Log,vozilo Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisotnost vročine (temp&gt; 38,5 ° C / 101,3 ° F ali trajne temp&gt; 38 ° C / 100,4 ° F)"
@@ -5232,24 +5270,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
 DocType: Asset Maintenance,Manufacturing User,Proizvodnja Uporabnik
 DocType: Purchase Invoice,Raw Materials Supplied,"Surovin, dobavljenih"
-DocType: C-Form,Series,Zaporedje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta cenika {0} mora biti {1} ali {2}
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Soil Texture,Ternary Plot,Ternary plot
 DocType: Item Group,Item Classification,Postavka Razvrstitev
 DocType: Driver,License Number,Številka licence
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vzdrževanje Obiščite Namen
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Registracija računa pacientov
 DocType: Crop,Period,Obdobje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Glavna knjiga
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposlenih {0} v odhod {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zaposlenih {0} v odhod {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Poglej ponudbe
 DocType: Program Enrollment Tool,New Program,Nov program
 DocType: Item Attribute Value,Attribute Value,Vrednosti atributa
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 DocType: Salary Detail,Salary Detail,plača Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Prosimo, izberite {0} najprej"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Prosimo, izberite {0} najprej"
 DocType: Appointment Type,Physician,Zdravnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Posvetovanja
@@ -5257,15 +5294,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne more biti večja od načrtovane količine ({2}) v delovnem redu {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas List za proizvodnjo.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Vmesni seštevek
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Lastnosti variant ni mogoče spremeniti po transakciji z delnicami. Za to morate narediti novo postavko.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless Mandat SEPA
 DocType: Physician,Charges,Dajatve
 DocType: Production Plan,Get Items For Work Order,Pridobite predmete za delovni red
 DocType: Salary Detail,Default Amount,Privzeti znesek
 DocType: Lab Test Template,Descriptive,Opisno
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Povzetek tega meseca je
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Določite prodajni cilj, ki ga želite doseči za vaše podjetje."
 ,Project wise Stock Tracking,Projekt pametno Stock Tracking
@@ -5293,11 +5331,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Spletne strani ni bilo mogoče ustvariti
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,"Zaprta zaloga, ki je že bila ustvarjena, ali količina vzorca ni zagotovljena"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,"Zaprta zaloga, ki je že bila ustvarjena, ali količina vzorca ni zagotovljena"
 DocType: Program,Program Abbreviation,Kratica programa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
 DocType: Warranty Claim,Resolved By,Rešujejo s
-DocType: Bank Guarantee,Start Date,Datum začetka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodeli liste za obdobje.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki in depoziti nepravilno izbil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš dodeliti samega sebe kot matični račun
@@ -5312,11 +5349,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ur
 DocType: Project,Expected Start Date,Pričakovani datum začetka
 DocType: Purchase Invoice,04-Correction in Invoice,04-Popravek na računu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Delovni nalog je že ustvarjen za vse elemente z BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Delovni nalog je že ustvarjen za vse elemente z BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Poročilo o variantah
 DocType: Setup Progress Action,Setup Progress Action,Akcijski program Setup Progress
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Nakupni cenik
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Nakupni cenik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Prekliči naročnino
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Izberite stanje vzdrževanja kot dokončano ali odstranite datum zaključka
 DocType: Supplier,Default Payment Terms Template,Predloga za privzete plačilne pogoje
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transakcijski valuta mora biti enaka kot vplačilo valuto
@@ -5327,7 +5365,6 @@
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Ukrep, če skupna mesečna Proračun Prekoračitev"
-DocType: Subscription,Submit on creation,Predloži na ustvarjanje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odstranjevanje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pošta bo poslana vsem aktivnih zaposlenih v družbi na določeni uri, če nimajo počitnic. Povzetek odgovorov bo poslano ob polnoči."
@@ -5346,6 +5383,7 @@
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Cheque Print Template,Cheque Print Template,Ček Print Predloga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon stroškovnih mest
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Število dni po datumu računa je preteklo pred preklicem naročnine ali označitve naročnine kot neplačano
 DocType: Lab Test Template,Sample Collection,Zbiranje vzorcev
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
 DocType: Price List,Price List Name,Cenik Ime
@@ -5354,7 +5392,7 @@
 DocType: Account,Income,Prihodki
 DocType: Industry Type,Industry Type,Industrija Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nekaj je šlo narobe!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Račun {0} je že bil predložen
 DocType: Supplier Scorecard Scoring Criteria,Score,ocena
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Poslovno leto {0} ne obstaja
@@ -5374,12 +5412,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} mora biti vrednost med 0 in 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,"Naslednji amortizacijski datum ne sme biti pred datumom, razpoložljivim za uporabo"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Nezavarovana posojila
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max delovne ure pred Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Načrtovano Datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Total Paid Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Total Paid Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Sporočila večji od 160 znakov, bo razdeljeno v več sporočilih"
 DocType: Purchase Receipt Item,Received and Accepted,Prejme in potrdi
 DocType: Hub Settings,Company and Seller Profile,Profil podjetja in prodajalca
@@ -5393,10 +5431,9 @@
 DocType: Item,Variant Based On,"Varianta, ki temelji na"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Vaše Dobavitelji
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Prosim popravite
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
 DocType: Request for Quotation Item,Supplier Part No,Šifra dela dobavitelj
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonimno
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Prejela od
 DocType: Lead,Converted,Pretvorjena
@@ -5410,6 +5447,7 @@
 DocType: Asset,Assets,Sredstva
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
+DocType: Subscription,Current Invoice End Date,Trenutni datum zaključka računa
 DocType: Payment Term,Due Date Based On,Datum na podlagi datuma
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,"Prosimo, nastavite privzeto skupino strank in ozemlje v nastavitvah prodaj"
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ne obstaja
@@ -5417,7 +5455,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite neusklajene vnose
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Nobena odplačila niso izbrana za vnos v dnevnik
 DocType: Payment Reconciliation,From Invoice Date,Od Datum računa
+DocType: Loan,Disbursed,Izplačano
 DocType: Healthcare Settings,Laboratory Settings,Laboratorijske nastavitve
 DocType: Patient Appointment,Service Unit,Servisna enota
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Uspešno nastavite dobavitelja
@@ -5430,12 +5470,12 @@
 DocType: Share Balance,No of Shares,Število delnic
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Ima serijsko številko"" ne more biti 'Da' za postavko brez zalog"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Izberite Stanje
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: School House,House Name,Naslov
 DocType: Fee Schedule,Total Amount per Student,Skupni znesek na študenta
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Električno
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Električno
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte preostanek organizacije kot uporabnike. Dodate lahko tudi povabi stranke na vašem portalu jih dodate iz imenika
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
 DocType: Grant Application,Requested Amount,Zahtevani znesek
@@ -5445,7 +5485,7 @@
 DocType: Crop Cycle,Detected Diseases,Detektirane bolezni
 DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče
 DocType: Item,Customer Code,Koda za stranke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 DocType: Asset Maintenance Task,Last Completion Date,Zadnji datum zaključka
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
@@ -5453,9 +5493,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless nastavitve
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Zaloga Sredstva
 DocType: Restaurant,Active Menu,Aktivni meni
 DocType: Target Detail,Target Qty,Ciljna Kol
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Proti posojilu: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Naročilo Nastavitve
 DocType: Student Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
@@ -5464,9 +5505,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
 DocType: Vehicle Log,Odometer,števec kilometrov
 DocType: Production Plan Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
 DocType: Chapter,Chapter Head,Poglavje glave
 DocType: Payment Term,Month(s) after the end of the invoice month,Mesec (i) po koncu meseca računa
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektna dejavnost / naloga.
@@ -5474,11 +5515,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ustvarjajo plače kombineže
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Datetime rezultatov laboratorija ne more biti pred testiranjem datetime
 DocType: POS Profile,Allow user to edit Discount,Dovoli uporabniku urejanje popusta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Pridobite stranke od
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Pridobite stranke od
 DocType: Purchase Invoice Item,Include Exploded Items,Vključi eksplodirane elemente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Odkup je treba preveriti, če se uporablja za izbrana kot {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100"
 DocType: Shipping Rule,Restrict to Countries,Omeji na države
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,zaračunavanje storitev ure
 DocType: Project,Total Sales Amount (via Sales Order),Skupni znesek prodaje (preko prodajnega naloga)
@@ -5497,6 +5539,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Ocenjevalec
 DocType: Payment Entry,Allocate Payment Amount,Dodeli znesek plačila
+DocType: Subscription Plan,Subscription Plan,Naročni načrt
 DocType: Employee External Work History,Salary,Plača
 DocType: Serial No,Delivery Document Type,Dostava Document Type
 DocType: Sales Order,Partly Delivered,Delno Delivered
@@ -5521,9 +5564,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Staranje Razpon 2
 DocType: SG Creation Tool Course,Max Strength,Max moč
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Namestitev prednastavitev
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Za kupca ni izbranega obvestila o dostavi {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Za kupca ni izbranega obvestila o dostavi {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM nadomesti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Izberite elemente glede na datum dostave
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Izberite elemente glede na datum dostave
 DocType: Grant Application,Has any past Grant Record,Ima dodeljen zapis
 ,Sales Analytics,Prodajna analitika
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Na voljo {0}
@@ -5542,7 +5585,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
 DocType: Selling Settings,Settings for Selling Module,Nastavitve za modul Prodaja
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervacija hotelske sobe
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Storitev za stranke
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Storitev za stranke
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponudba kandidat Job.
@@ -5559,7 +5602,7 @@
 DocType: Fees,Student Details,Podrobnosti študenta
 DocType: Purchase Invoice Item,Stock Qty,Stock Kol
 DocType: Purchase Invoice Item,Stock Qty,Stock Kol
-DocType: Employee Loan,Repayment Period in Months,Vračilo Čas v mesecih
+DocType: Loan,Repayment Period in Months,Vračilo Čas v mesecih
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Napaka: Ni veljaven id?
 DocType: Naming Series,Update Series Number,Posodobi številko zaporedja
 DocType: Account,Equity,Kapital
@@ -5568,7 +5611,7 @@
 DocType: Task,Closing Date,Zapiranje Datum
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 DocType: Timesheet,Work Detail,Delovna detajl
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inženir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inženir
 DocType: Journal Entry,Total Amount Currency,Skupni znesek Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
@@ -5614,13 +5657,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Podatki o donatorju.
 DocType: Request for Quotation,Supplier Detail,Dobavitelj Podrobnosti
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Napaka v formuli ali stanja: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Obračunani znesek
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Obračunani znesek
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Uteži meril morajo biti do 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Udeležba
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,zalogi
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Ustvarjanje {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Vir in Target skladišča ne more biti enaka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Davčna predloga za nabavne transakcije
@@ -5644,14 +5686,14 @@
 DocType: Shipping Rule,Fixed,Popravljeno
 DocType: Vehicle Service,Clutch Plate,sklopka Plate
 DocType: Company,Round Off Account,Zaokrožijo račun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativni stroški
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
-DocType: Journal Entry,Subscription,Naročnina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Naročnina
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Čakanje v kreiranju
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Odpovedni rok
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Odpovedni rok
 DocType: Asset Category,Asset Category Name,Sredstvo Kategorija Ime
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je koren ozemlje in ga ni mogoče urejati.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime New Sales oseba
@@ -5664,7 +5706,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Pustite neoznačeno, če ne želite, da razmisli serije, hkrati pa seveda temelji skupin."
 DocType: Asset,Frequency of Depreciation (Months),Pogostost amortizacijo (meseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Credit račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Prikaži ničelnimi vrednostmi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin
@@ -5672,7 +5714,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
 DocType: Hub Settings,Company Logo,Logo podjetja
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 DocType: Healthcare Settings,Patient Registration,Registracija pacientov
@@ -5707,11 +5749,10 @@
 DocType: Journal Entry,Total Debit,Skupaj Debetna
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Privzete Končano Blago Skladišče
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Izberite Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodaja oseba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodaja oseba
 DocType: Hotel Room Package,Amenities,Amenities
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Proračun in Center Stroški
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Večkratni način plačila ni dovoljen
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
 ,Appointment Analytics,Imenovanje Analytics
 DocType: Vehicle Service,Half Yearly,Polletni
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -5728,6 +5769,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Pustite prazno, če bi študenti skupin na leto"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Če je označeno, Total no. delovnih dni bo vključeval praznike, in to se bo zmanjšala vrednost plač dan na"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikacije, ki uporabljajo trenutni ključ, ne bodo imele dostopa, ali ste prepričani?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Skupaj predplačila
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Spremeni kodo šablone
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Izraz Končni datum ne more biti zgodnejši od datuma Term Start. Popravite datum in poskusite znova.
@@ -5738,8 +5780,9 @@
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 DocType: Cheque Print Template,Signatory Position,podpisnik Položaj
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Nastavi kot Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Nastavi kot Lost
 DocType: Timesheet,Total Billable Hours,Skupaj plačljivih ur
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Število dni, v katerem mora naročnik plačati račune, ki jih ustvari ta naročnina"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Prejem plačilnih Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ta temelji na transakcijah zoper to stranko. Oglejte si časovnico spodaj za podrobnosti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka plačila za vnos zneska {2}"
@@ -5758,12 +5801,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Company,Company Info,Informacije o podjetju
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Izberite ali dodati novo stranko
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ta temelji na prisotnosti tega zaposlenega
 DocType: Assessment Result,Summary,Povzetek
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Označi udeležbo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Debetni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Debetni račun
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Vnos naročila restavracije
@@ -5775,7 +5818,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Znesek nakupa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Zaslužki zaposlencev
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Zaslužki zaposlencev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Work Order,Manufactured Qty,Izdelano Kol
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Delnice ne obstajajo z {0}
@@ -5783,12 +5826,12 @@
 DocType: Asset,Out of Order,Ne deluje
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 DocType: Projects Settings,Ignore Workstation Time Overlap,Prezri čas prekrivanja delovne postaje
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Izberite številke Serija
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Računi zbrana strankam.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 DocType: Patient Service Unit,Medical Administrator,Zdravstveni administrator
 DocType: Assessment Plan,Schedule,Urnik
 DocType: Account,Parent Account,Matični račun
@@ -5818,15 +5861,16 @@
 DocType: Asset Repair,Repair Status,Stanje popravila
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
 DocType: POS Profile,Account for Change Amount,Račun za znesek spremembe
 DocType: Purchase Invoice,input service,vnosna storitev
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Član vzdrževalne ekipe
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza tal
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Šifra predmeta:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vnesite Expense račun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Zaloga
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
 DocType: Employee,Current Address,Trenutni naslov
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno"
 DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti
@@ -5875,19 +5919,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Vstopnine za {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Ime spremenljivke
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
 DocType: Asset,Asset Category,sredstvo Kategorija
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plača ne more biti negativna
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Postavka Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material za dobavitelja
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Načrtovanje materialnih zahtev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Trošarina Račun
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Praga {0}% pojavi več kot enkrat
 DocType: Expense Claim,Employees Email Id,Zaposleni Email Id
 DocType: Employee Attendance Tool,Marked Attendance,markirana Udeležba
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kratkoročne obveznosti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kratkoročne obveznosti
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Časovnik je presegel dane ure.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov
 DocType: Patient,A Positive,Pozitiven
@@ -5898,9 +5942,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ima trenutno {1} oceno dobavitelja in naročila temu dobavitelju je treba izdajati s previdnostjo
 DocType: Asset Maintenance Team,Asset Maintenance Team,Ekipa za vzdrževanje sredstev
-DocType: Employee Loan,Loan Type,posojilo Vrsta
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} je bilo uspešno poslano
+DocType: Loan,Loan Type,posojilo Vrsta
 DocType: Scheduling Tool,Scheduling Tool,razporejanje orodje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana"
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5932,7 +5977,7 @@
 DocType: Item,Units of Measure,Merske enote
 DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah
 DocType: Sales Invoice,Customer's Purchase Order Date,Stranke Naročilo Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Osnovni kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Osnovni kapital
 DocType: Shopping Cart Settings,Show Public Attachments,Prikaži Javna Priključki
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
 DocType: Restaurant Reservation,Reservation Time,Čas rezervacije
@@ -5947,7 +5992,7 @@
 DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Vrstica # {0}: Reqd po datumu ne more biti pred datumom transakcije
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Izbrani izdelki
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Oblikovalec
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
@@ -5957,20 +6002,20 @@
 DocType: Driver,Expiry Date,Rok uporabnosti
 DocType: Healthcare Settings,Employee name and designation in print,Ime in oznaka zaposlenega v tiskani obliki
 ,accounts-browser,računi brskalnik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Prosimo, izberite kategorijo najprej"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Če želite, da pretirano zaračunavanje ali over-naročanje, posodobi &quot;dodatku&quot; v delniških nastavitvah ali točko."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Poldnevni)
 DocType: Payment Term,Credit Days,Kreditne dnevi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Prosimo, izberite Patient, da dobite laboratorijske teste"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Naj Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Pridobi artikle iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Pridobi artikle iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Dobavni rok dni
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ali je prihodek od davka na dohodek
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Označite to, če je študent s stalnim prebivališčem v Hostel inštituta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
 ,Stock Summary,Stock Povzetek
@@ -5981,10 +6026,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: BOM Operation,Operating Cost(Company Currency),Obratovalni stroški (družba Valuta)
-DocType: Employee Loan Application,Rate of Interest,Obrestna mera
+DocType: Loan Application,Rate of Interest,Obrestna mera
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: Item,Shelf Life In Days,Rok uporabe v dnevih
 DocType: GL Entry,Is Opening,Je Odpiranje
+DocType: Department,Expense Approvers,Odobritve za stroške
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
 DocType: Journal Entry,Subscription Section,Naročniška sekcija
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Račun {0} ne obstaja
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 40e2c5e..5f65e86 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Raportet e Vlerësimit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Consumer Products
-DocType: Purchase Receipt,Subscription Detail,Detaji i Abonimit
 DocType: Supplier Scorecard,Notify Supplier,Njoftoni Furnizuesin
 DocType: Item,Customer Items,Items të konsumatorëve
 DocType: Project,Costing and Billing,Kushton dhe Faturimi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
 DocType: Item,Publish Item to hub.erpnext.com,Publikojë pika për hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Njoftime Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,vlerësim
 DocType: Item,Default Unit of Measure,Gabim Njësia e Masës
 DocType: SMS Center,All Sales Partner Contact,Të gjitha Sales Partner Kontakt
-DocType: Employee,Leave Approvers,Lini Aprovuesit
+DocType: Department,Leave Approvers,Lini Aprovuesit
 DocType: Sales Partner,Dealer,Tregtar
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,hetimet
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Kontrolloni disponueshmërinë
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Kjo është e bazuar në transaksionet kundër këtij Furnizuesi. Shih afat kohor më poshtë për detaje
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Tatimi aktual lloji nuk mund të përfshihen në normë Item në rresht {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Tatimi aktual lloji nuk mund të përfshihen në normë Item në rresht {0}
 DocType: Bank Guarantee,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Kërkohet nga
 DocType: Delivery Note,Return Against Delivery Note,Kthehu Kundër dorëzimit Shënim
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kokat (ose grupe) kundër të cilit Hyrjet e kontabilitetit janë bërë dhe bilancet janë të mirëmbajtura.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Nuk ka skeda të pagave të paraqitura për t&#39;u përpunuar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Nuk ka skeda të pagave të paraqitura për t&#39;u përpunuar.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Trego të hapur
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Është e nevojshme që sot të merret vetë ky veprim për ato që përmenden më sipër
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Seria Përditësuar sukses
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,arkë
 DocType: Pricing Rule,Apply On,Apliko On
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Të gjitha Furnizuesi Kontakt
 DocType: Support Settings,Support Settings,Cilësimet mbështetje
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Item Status skadimit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Draft Bank
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Draft Bank
 DocType: Membership,membership validaty section,seksioni validaty anëtarësimit
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 DocType: Consultation,Consultation,këshillim
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Marrja e faqes
 DocType: Opening Invoice Creation Tool Item,Quantity,Sasi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Llogaritë tabelë nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Kredi (obligimeve)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Llogaritë tabelë nuk mund të jetë bosh.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Kredi (obligimeve)
 DocType: Employee Education,Year of Passing,Viti i kalimit
 DocType: Item,Country of Origin,Vendi i origjinës
 DocType: Soil Texture,Soil Texture Criteria,Kriteret e Cilësi të Tokës
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detajet e Fillimit të Kontaktit
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Çështjet e hapura
 DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
 DocType: Lab Test Groups,Add new line,Shto një rresht të ri
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Kujdes shëndetësor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vonesa në pagesa (ditë)
@@ -89,7 +85,7 @@
 ,Delay Days,Vonesa Ditët
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faturë
+DocType: Subscription Invoice,Invoice,Faturë
 DocType: Purchase Invoice Item,Item Weight Details,Pesha Detajet e artikullit
 DocType: Asset Maintenance Log,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total Shuma kushton
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Punë në vazhdim
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Ju lutemi zgjidhni data
 DocType: Daily Work Summary Group,Holiday List,Festa Lista
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Llogaritar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Llogaritar
 DocType: Hub Settings,Selling Price List,Lista e Çmimeve të Shitjes
 DocType: Patient,Tobacco Current Use,Përdorimi aktual i duhanit
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Shitja e normës
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Shitja e normës
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefoni Asnjë
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Dërgimi fillestar i email-it është dërguar
 ,Sales Partners Commission,Shitjet Partnerët Komisioni
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Vlera Pas Zhvlerësimi
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,i lidhur
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,date Pjesëmarrja nuk mund të jetë më pak se data bashkuar punëmarrësit
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,date Pjesëmarrja nuk mund të jetë më pak se data bashkuar punëmarrësit
 DocType: Grading Scale,Grading Scale Name,Nota Scale Emri
-DocType: Subscription,Repeat on Day,Përsëriteni Ditën
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Kjo është një llogari rrënjë dhe nuk mund të redaktohen.
 DocType: Sales Invoice,Company Address,adresa e kompanise
 DocType: BOM,Operations,Operacionet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nuk mund të vendosni autorizim në bazë të zbritje për {0}
+DocType: Subscription,Subscription Start Date,Data e nisjes së abonimit
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bashkangjit CSV fotografi me dy kolona, njëra për emrin e vjetër dhe një për emrin e ri"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne asnje vitit aktiv Fiskal.
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Artikull Code: {1} dhe klientit: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Data e përfundimit të periudhës së gjykimit nuk mund të jetë përpara datës së fillimit të periudhës së gjykimit
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Hapja për një punë.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM nuk është specifikuar për nënkontraktimin e sendit {0} në rreshtin {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Njëjta kompani është futur më shumë se një herë
 DocType: Patient,Married,I martuar
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nuk lejohet për {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Të marrë sendet nga
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Të marrë sendet nga
 DocType: Price List,Price Not UOM Dependant,Çmimi nuk është UOM i varur
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Lloji Tatimore
 ,Completed Work Orders,Urdhrat e Kompletuara të Punës
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Shuma e tatueshme
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Shuma e tatueshme
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rreshti # {0}: Referenca Lloji i Dokumentit duhet të jetë një nga Kërkesat e Shpenzimeve ose Hyrja në Regjistrim
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Zgjidh BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Rreshti # {0}: Referenca Lloji i Dokumentit duhet të jetë një nga Kërkesat e Shpenzimeve ose Hyrja në Regjistrim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Zgjidh BOM
 DocType: SMS Log,SMS Log,SMS Identifikohu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostoja e Artikujve dorëzohet
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Menaxhoni shumën paraprake që i jepet punonjësit
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Njoftimi i Dorëzimit
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Llogaria Pay Vetëm
-DocType: Employee Loan,Repay Over Number of Periods,Paguaj Over numri i periudhave
+DocType: Loan,Repay Over Number of Periods,Paguaj Over numri i periudhave
 DocType: Stock Entry,Additional Costs,Kostot shtesë
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
 DocType: Lead,Product Enquiry,Produkt Enquiry
 DocType: Education Settings,Validate Batch for Students in Student Group,Vlereso Batch për Studentët në Grupin e Studentëve
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nuk ka rekord leje gjetur për punonjës {0} për {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nuk ka rekord leje gjetur për punonjës {0} për {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ju lutemi shkruani kompani parë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Ju lutemi zgjidhni kompania e parë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Ju lutemi zgjidhni kompania e parë
 DocType: Employee Education,Under Graduate,Nën diplomuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Vendosni modelin e parazgjedhur për Njoftimin e Statusit të Lëvizjes në Cilësimet e HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Kredi punonjës
 DocType: Fee Schedule,Send Payment Request Email,Dërgoni Email Kërkesën për Pagesë
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,S&#39;aktivizohet me sukses.
 DocType: Assessment Result,Grade,Gradë
 DocType: Restaurant Table,No of Seats,Jo e Vendeve
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Për të shtuar lëndë dinamike, përdorni etiketat jinja si <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: Asset Maintenance Task,Asset Maintenance Task,Detyra e mirëmbajtjes së aseteve
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Paga vjetore
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Paga vjetore
 DocType: Daily Work Summary,Daily Work Summary,Daily Përmbledhje Work
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} është e ngrirë
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Shpenzimet
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Shpenzimet
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Zgjidhni Target Magazina
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Zgjidhni Target Magazina
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ju lutemi shkruani Preferred miqve
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Ju lutemi shkruani Preferred miqve
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra Hyrja
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Adresa Primare
 DocType: Production Plan,Material Request Detail,Detaji i Kërkesës Materiale
 DocType: Selling Settings,Default Quotation Validity Days,Ditët e vlefshmërisë së çmimeve të çmimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ndryshimi Shuma
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Kategoritë e Licencës së Drejtimit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Ju lutemi shkruani datën e dorëzimit
 DocType: Depreciation Schedule,Make Depreciation Entry,Bëni Amortizimi Hyrja
+DocType: HR Settings,Leave Settings,Lini Parametrat
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Kërkesë Type
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,bëni punonjës
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Transmetimi
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Modaliteti i konfigurimit të POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Çaktivizon krijimin e regjistrave të kohës ndaj urdhrave të punës. Operacionet nuk do të gjurmohen kundër Rendit Punë
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Ekzekutim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Ekzekutim
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detajet e operacioneve të kryera.
 DocType: Asset Maintenance Log,Maintenance Status,Mirëmbajtja Statusi
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detajet e Anëtarësimit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Konsumatorëve&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Furnizuesi është i detyruar kundrejt llogarisë pagueshme {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikuj dhe Çmimeve
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Gjithsej orë: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Nga Data duhet të jetë brenda vitit fiskal. Duke supozuar Nga Data = {0}
 DocType: Drug Prescription,Interval,interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,preferencë
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,preferencë
 DocType: Grant Application,Individual,Individ
 DocType: Academic Term,Academics User,akademikët User
 DocType: Cheque Print Template,Amount In Figure,Shuma Në Figurën
-DocType: Employee Loan Application,Loan Info,kredi Info
+DocType: Loan Application,Loan Info,kredi Info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plani për vizita të mirëmbajtjes.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Periudha e rezultateve të furnitorit
 DocType: Share Transfer,Share Transfer,Transferimi i aksioneve
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Modeli i artikullit
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,biokimi
 DocType: Job Offer,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Vlera out
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Vlera out
 DocType: Woocommerce Settings,Woocommerce Settings,Cilësimet e Woocommerce
 DocType: Production Plan,Sales Orders,Sales Urdhërat
 DocType: Purchase Taxes and Charges,Valuation,Vlerësim
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Gabim Territorit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizion
 DocType: Work Order Operation,Updated via 'Time Log',Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Zgjidhni konsumatorin ose furnizuesin.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: Company,Enable Perpetual Inventory,Aktivizo Inventari Përhershëm
+DocType: Bank Guarantee,Charges Incurred,Ngarkesat e kryera
 DocType: Company,Default Payroll Payable Account,Default Payroll Llogaria e pagueshme
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Është Hapja Hyrja
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Rezultati personal
 DocType: Delivery Stop,Contact Name,Kontakt Emri
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteret e vlerësimit kurs
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Identiteti i taksave:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Identiteti i taksave:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student ID:
 DocType: POS Customer Group,POS Customer Group,POS Group Customer
 DocType: Land Unit,Land Unit describing various land assets,Njësia e Tokës që përshkruan pasuritë e ndryshme të tokës
@@ -375,9 +372,8 @@
 ,Open Work Orders,Urdhërat e Hapur të Punës
 DocType: Payment Term,Credit Months,Muajt e Kredisë
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay Net nuk mund të jetë më pak se 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Për të ndaluar dërgimin e njoftimeve të përsëritura të gabimit nga sistemi, ne kemi kontrolluar fushën e Kufizuar në pajtim"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Lë në vit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Lë në vit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni &#39;A Advance&#39; kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
 DocType: Email Digest,Profit & Loss,Fitimi dhe Humbja
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Ju lutemi të organizoni Studentët nën Grupet Studentore
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Banka Entries
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Banka Entries
 DocType: Crop,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursi Group Student Krijimi Tool
 DocType: Lead,Do Not Contact,Mos Kontaktoni
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Njerëzit të cilët japin mësim në organizatën tuaj
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Course Scheduling Tool,Course Start Date,Sigurisht Data e fillimit
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publikojë në Hub
 DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Detajet Blerje
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Citate të reja
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails paga shqip për punonjës të bazuar në email preferuar zgjedhur në punonjësi
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Aprovuesi i parë Leave në listë do të jetë vendosur si default Leave aprovuesi
 DocType: Tax Rule,Shipping County,Shipping County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Mëso
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Mëso
 DocType: Asset,Next Depreciation Date,Zhvlerësimi Data Next
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteti Kosto për punonjës
 DocType: Accounts Settings,Settings for Accounts,Cilësimet për Llogaritë
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Çeqet e papaguara dhe Depozitat për të pastruar
 DocType: Item,Synced With Hub,Synced Me Hub
 DocType: Driver,Fleet Manager,Fleet Menaxher
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nuk mund të jetë negative për artikull {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nuk mund të jetë negative për artikull {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Gabuar Fjalëkalimi
 DocType: Item,Variant Of,Variant i
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Ju lutemi përcaktoni vlerën e dhomës së hotelit në {}
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Lloji Faturë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Ofrimit Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Ofrimit Shënim
 DocType: Consultation,Encounter Impression,Impresioni i takimit
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kostoja e asetit të shitur
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Course Scheduling Tool,Course Scheduling Tool,Sigurisht caktimin Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgjent] Gabim gjatë krijimit të përsëritjes% s për% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
 DocType: Land Unit,LInked Analysis,LInked Analiza
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Periudha e aplikimit nuk mund të jetë në të dy regjistrimet e shpërndarjes
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Periudha e aplikimit nuk mund të jetë në të dy regjistrimet e shpërndarjes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Marra
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Krijo Grupet Student
 DocType: Volunteer,Weekends,fundjavë
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Credit Note Shuma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Credit Note Shuma
 DocType: Setup Progress Action,Action Document,Dokumenti i Veprimit
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Mallrat përfunduar
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Shto Items
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Cilësia Inspektimi Parametri
+DocType: Leave Application,Leave Approver Name,Lini Emri aprovuesi
 DocType: Depreciation Schedule,Schedule Date,Orari Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Fitimet, Zbritjet dhe komponentëve të tjerë e pagave"
 DocType: Packed Item,Packed Item,Item mbushur
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
 DocType: Healthcare Settings,Require Lab Test Approval,Kërkoni miratimin e testit të laboratorit
 DocType: Salary Slip Timesheet,Working Hours,Orari i punës
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Gjithsej Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Gjithsej Outstanding
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
 DocType: Dosage Strength,Strength,Forcë
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Krijo një klient i ri
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Kosto harxhuese
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
 DocType: Student Log,Medical,Mjekësor
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Arsyeja për humbjen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Arsyeja për humbjen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Përditëso numrin e llogarisë
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Owner Lead nuk mund të jetë i njëjtë si Lead
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Shuma e ndarë nuk mund të më e madhe se shuma e parregulluara
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,I vetëm
 DocType: Salary Slip,Total Loan Repayment,Ripagimi Total Loan
 DocType: Account,Cost of Goods Sold,Kostoja e mallrave të shitura
-DocType: Subscription,Yearly,Vjetor
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
 DocType: Drug Prescription,Dosage,dozim
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Shitja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Shitja Rate
 DocType: Assessment Plan,Examiner Name,Emri Examiner
 DocType: Lab Test Template,No Result,asnjë Rezultat
 DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ju lutem shkruani emrin e kompanisë e parë
 DocType: Purchase Invoice,Supplier Name,Furnizuesi Emri
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lexoni Manualin ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Shfaq fletët e të gjithë anëtarëve të departamentit në kalendar
 DocType: Purchase Invoice,01-Sales Return,01-Kthimi i shitjeve
 DocType: Account,Is Group,Është grup
 DocType: Email Digest,Pending Purchase Orders,Në pritje urdhëron Blerje
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Fushë e detyrueshme - Viti akademik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} nuk është i lidhur me {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Rregulloje tekstin hyrës që shkon si një pjesë e asaj email. Secili transaksion ka një tekst të veçantë hyrëse.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Ju lutemi të vendosur llogari parazgjedhur pagueshëm për kompaninë {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Ju lutemi të vendosur llogari parazgjedhur pagueshëm për kompaninë {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transaksioni nuk lejohet kundër urdhrit të ndaluar të punës {0}
 DocType: Setup Progress Action,Min Doc Count,Min Dokumenti i Numrit
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervuar për shitje
 DocType: Packing Slip,From Package No.,Nga Paketa nr
 DocType: Item Attribute,To Range,Në rang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nuk mund të ndryshojë metodën e vlerësimit, pasi ka transaksione kundër disa artikuj që nuk kanë se është metodë e vlerësimit"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Të letrave me vlerë dhe depozita
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nuk mund të ndryshojë metodën e vlerësimit, pasi ka transaksione kundër disa artikuj që nuk kanë se është metodë e vlerësimit"
 DocType: Student Report Generation Tool,Attended by Parents,Të ndjekur nga Prindërit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Patient,AB Positive,AB Pozitiv
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Pjesëmarrja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponenti Paga për pasqyrë e mungesave pagave bazë.
 DocType: Sales Order Item,Used for Production Plan,Përdoret për Planin e prodhimit
-DocType: Employee Loan,Total Payment,Pagesa Total
+DocType: Loan,Total Payment,Pagesa Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Nuk mund të anulohet transaksioni për Urdhrin e Përfunduar të Punës.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Operacioneve (në minuta)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} është anuluar në mënyrë veprimi nuk mund të përfundojë
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pjesë mjaftueshme për të ndërtuar
 DocType: POS Profile User,POS Profile User,Profili i POS-ut
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Të ardhurat direkte
+DocType: Subscription Invoice,Subscription Invoice,Fatura e abonimit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Të ardhurat direkte
 DocType: Patient Appointment,Date TIme,Data Përmbledhje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Zyrtar Administrativ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Zyrtar Administrativ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Vendosja e kompanisë dhe taksave
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
 DocType: Codification Table,Codification Table,Tabela e kodifikimit
 DocType: Timesheet Detail,Hrs,orë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Ju lutem, përzgjidhni Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry Detail,Difference Account,Llogaria Diferenca
 DocType: Purchase Invoice,Supplier GSTIN,furnizuesi GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Modeli i përcaktimit të rrjedhës së parasë së gatshme
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
+DocType: Bank Guarantee,Providing,Sigurimi
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Nuk lejohet, konfiguroni Lab Test Template sipas kërkesës"
 DocType: Patient,Risk Factors,Faktoret e rrezikut
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
 DocType: Healthcare Settings,Appointment Confirmation,Konfirmimi i Emërimit
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Mbyllja (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Përshëndetje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Leviz Item
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Tashmë vendosni parazgjedhjen në pozicionin {0} për përdoruesin {1}, me mirësi default me aftësi të kufizuara"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Vlerat e akumuluara
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territori kërkohet në Profilin e POS
 DocType: Supplier,Prevent RFQs,Parandalimi i RFQ-ve
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Bëni Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Lëshimi i pagës i paraqitur për periudhën nga {0} në {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Lëshimi i pagës i paraqitur për periudhën nga {0} në {1}
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Data e Dërgesës së Transportit
 DocType: Production Plan,Production Plan,Plani i prodhimit
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Hapja e Faturave të Faturës
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Shitjet Kthehu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Shënim: gjethet total alokuara {0} nuk duhet të jetë më pak se gjethet e miratuara tashmë {1} për periudhën
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Set Qty në Transaksionet bazuar në Serial No Input
 ,Total Stock Summary,Total Stock Përmbledhje
 DocType: Announcement,Posted By,postuar Nga
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ju lutemi të vendosur Kompaninë
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Ju lutemi të vendosur Kompaninë
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Training Result Employee,Training Result Employee,Rezultati Training punonjës
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
-DocType: Repayment Schedule,Principal Amount,shumën e principalit
-DocType: Employee Loan Application,Total Payable Interest,Interesi i përgjithshëm për t&#39;u paguar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,shumën e principalit
+DocType: Loan Application,Total Payable Interest,Interesi i përgjithshëm për t&#39;u paguar
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totali Outstanding: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Fatura pasqyrë e mungesave
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
 DocType: Restaurant Reservation,Restaurant Reservation,Rezervim Restoranti
 DocType: Land Unit,Land Unit Name,Emri i Njësisë së Tokës
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Propozimi Shkrimi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Mbarimi
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Njoftoni Konsumatorët përmes Email-it
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Njoftoni Konsumatorët përmes Email-it
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Një person tjetër Sales {0} ekziston me të njëjtin id punonjës
 DocType: Employee Advance,Claimed Amount,Shuma e kërkuar
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Pagesa Gateway Llogaria nuk është krijuar, ju lutemi krijoni një të tillë me dorë."
 DocType: Supplier Scorecard,Per Year,Në vit
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Nuk ka të drejtë për pranim në këtë program sipas DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 DocType: Sales Invoice,Sales Taxes and Charges,Shitjet Taksat dhe Tarifat
 DocType: Employee,Organization Profile,Organizata Profilin
 DocType: Vital Signs,Height (In Meter),Lartësia (në metër)
 DocType: Student,Sibling Details,Details vëlla
 DocType: Vehicle Service,Vehicle Service,Shërbimi Vehicle
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatikisht shkakton kërkesa reagime në bazë të kushteve.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Automatikisht shkakton kërkesa reagime në bazë të kushteve.
 DocType: Employee,Reason for Resignation,Arsyeja për dorëheqjen
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Template për vlerësimit të punës.
 DocType: Sales Invoice,Credit Note Issued,Credit Note Hedhur në qarkullim
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Mirëmbajtja Orari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pastaj Çmimeve Rregullat janë filtruar në bazë të konsumatorëve, Grupi Customer, Territorit, Furnizuesin, Furnizuesi Lloji, fushatën, Sales Partner etj"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Ndryshimi neto në Inventarin
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Menaxhimi Loan punonjës
 DocType: Employee,Passport Number,Pasaporta Numri
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Raporti me Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menaxher
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Menaxher
 DocType: Payment Entry,Payment From / To,Pagesa nga /
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vendosni llogarinë në Depo {0}
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,Transferimi materiale
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Nuk mund të gjente rrugën
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Hapja (Dr)
+DocType: Loan,Applicant,kërkues
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postimi duhet të jetë pas {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Për të bërë dokumente të përsëritura
 ,GST Itemised Purchase Register,GST e detajuar Blerje Regjistrohu
 DocType: Course Scheduling Tool,Reschedule,riskedulimin
-DocType: Employee Loan,Total Interest Payable,Interesi i përgjithshëm për t&#39;u paguar
+DocType: Loan,Total Interest Payable,Interesi i përgjithshëm për t&#39;u paguar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taksat zbarkoi Kosto dhe Tarifat
 DocType: Work Order Operation,Actual Start Time,Aktuale Koha e fillimit
 DocType: BOM Operation,Operation Time,Operacioni Koha
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,fund
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,bazë
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,bazë
 DocType: Timesheet,Total Billed Hours,Orët totale faturuara
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Shkruani Off Shuma
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Shkruani Off Shuma
 DocType: Leave Block List Allow,Allow User,Lejojë përdoruesin
 DocType: Journal Entry,Bill No,Bill Asnjë
 DocType: Company,Gain/Loss Account on Asset Disposal,Llogaria Gain / Humbja në hedhjen e Aseteve
 DocType: Vehicle Log,Service Details,Details shërbimit
 DocType: Vehicle Log,Service Details,Details shërbimit
-DocType: Subscription,Quarterly,Tremujor
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,grupuar
 DocType: Selling Settings,Delivery Note Required,Ofrimit Shënim kërkuar
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Koha Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush të lëndëve të para në bazë të
 DocType: Sales Invoice,Port Code,Kodi Port
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Magazina Rezervë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Magazina Rezervë
 DocType: Lead,Lead is an Organization,Udhëheqësi është një organizatë
 DocType: Guardian Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales para
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,Llogaritë
 DocType: Vehicle,Odometer Value (Last),Vlera rrugëmatës (i fundit)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Modelet e kritereve të rezultateve të ofruesve.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Pagesa Hyrja është krijuar tashmë
 DocType: Request for Quotation,Get Suppliers,Merrni Furnizuesit
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview Paga Shqip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview Paga Shqip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Llogaria {0} ka hyrë disa herë
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Ju mund të rinovoni vetëm nëse anëtarësimi juaj mbaron brenda 30 ditëve
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Përzgjidhni vetëm nëse keni skedarë të dokumentit Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Supplier Scorecard,Per Week,Në javë
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Student Gjithsej
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Credit Card Hyrja
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Company dhe Llogaritë
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,në Vlera
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,në Vlera
 DocType: Asset Settings,Depreciation Options,Opsionet e zhvlerësimit
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Koha e pavlefshme e regjistrimit
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Koha e pavlefshme e regjistrimit
 DocType: Lead,Campaign Name,Emri fushatë
 DocType: Hotel Room,Capacity,kapacitet
 DocType: Selling Settings,Close Opportunity After Days,Mbylle Opportunity pas ditë
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Budget,Budget Against,Kundër buxheti
 DocType: Employee,Cell Number,Numri Cell
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nuk ka punonjës për kriteret e dhëna. Kontrolloni që Slipet e pagave nuk janë krijuar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nuk ka punonjës për kriteret e dhëna. Kontrolloni që Slipet e pagave nuk janë krijuar.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Zgjidh një tabelë
 DocType: BOM,Website Specifications,Specifikimet Website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} është një adresë e pavlefshme email në &#39;Përfituesit&#39;
 DocType: Special Test Items,Particulars,Të dhënat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
 DocType: Warranty Claim,CI-,Pri-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Asset,Maintenance,Mirëmbajtje
+DocType: Subscriber,Subscriber,pajtimtar
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Ju lutemi ndryshoni statusin e projektit
 DocType: Item,Maximum sample quantity that can be retained,Sasia maksimale e mostrës që mund të ruhet
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Default settings për Shportë
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Shto Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset braktiset via Journal Hyrja {0}
-DocType: Employee Loan,Interest Income Account,Llogaria ardhurat nga interesi
+DocType: Loan,Interest Income Account,Llogaria ardhurat nga interesi
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Thirrja e Shqyrtimit të dërguar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknologji
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Shko te
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ngritja llogari PE
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Asset Repair,Downtime,kohë joproduktive
 DocType: Account,Liability,Detyrim
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Termi akademik:
 DocType: Salary Detail,Do not include in total,Mos përfshini në total
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Sasia e mostrës {0} nuk mund të jetë më e madhe sesa {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Lista e Çmimeve nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Request for Quotation Supplier,Send Email,Dërgo Email
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 DocType: Item,Max Sample Quantity,Sasi Maksimale e mostrës
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Nuk ka leje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Nuk ka leje
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Cito kërkohet
 DocType: Vital Signs,Heart Rate / Pulse,Shkalla e zemrës / Pulsi
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
@@ -1087,11 +1083,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Testet Lab dhe Shenjat Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Asnjë punonjës gjetur
-DocType: Subscription,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grupi Student është përditësuar tashmë.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupi Student është përditësuar tashmë.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Përditësimi i projektit.
 DocType: SMS Center,All Customer Contact,Të gjitha Customer Kontakt
 DocType: Land Unit,Tree Details,Tree Details
@@ -1141,7 +1136,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Të gjitha Item Grupet
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
 DocType: Work Order,Item To Manufacture,Item Për Prodhimi
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} statusi është {2}
@@ -1155,7 +1149,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Reselect, nëse adresa e zgjedhur është redaktuar pas ruajtjes"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 DocType: Item,Hub Publishing Details,Detajet e botimit të Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Hapja&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Hapja&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Hapur për të bërë
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
 DocType: Lab Test Template,Result Format,Formati i rezultatit
@@ -1165,7 +1159,7 @@
 DocType: Payroll Entry,Bimonthly,dy herë në muaj
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Përmbajtja e plehut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Hulumtim dhe Zhvillim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Hulumtim dhe Zhvillim
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Shuma për Bill
 DocType: Company,Registration Details,Detajet e regjistrimit
 DocType: Timesheet,Total Billed Amount,Shuma totale e faturuar
@@ -1179,7 +1173,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Kufizo limitin e kreditit në Urdhërin e Shitjes
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Vlerësimit të performancës.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Duke bërë të mundur &#39;Përdorimi për Shportë&#39;, si Shporta është aktivizuar dhe duhet të ketë të paktën një Rule Tax per Shporta"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagesa Hyrja {0} është e lidhur kundrejt Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagesa Hyrja {0} është e lidhur kundrejt Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Point-of-Sale
@@ -1213,7 +1207,7 @@
 DocType: Restaurant Table,Minimum Seating,Vendndodhja minimale
 DocType: Item Attribute,Item Attribute Values,Vlerat Item ia atribuojnë
 DocType: Examination Result,Examination Result,Ekzaminimi Result
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Pranimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referenca DOCTYPE duhet të jetë një nga {0}
@@ -1221,15 +1215,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Work Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} duhet të jetë aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Asnjë artikull në dispozicion për transferim
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Asnjë artikull në dispozicion për transferim
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Mbyllja (Hapja + Gjithsej)
 DocType: Journal Entry,Depreciation Entry,Zhvlerësimi Hyrja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuloje Vizitat Materiale {0} para anulimit të kësaj vizite Mirëmbajtja
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
 DocType: Pricing Rule,Rate or Discount,Rate ose zbritje
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerkohet Qty
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoritet
 DocType: Hub Settings,Custom Data,Të Dhënat Custom
@@ -1241,9 +1235,9 @@
 DocType: Medical Code,Medical Code Standard,Kodi i Mjekësisë Standard
 DocType: Soil Texture,Clay Composition (%),Përbërja e argjilës (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Ju lutemi ruani para se të caktoni detyrën.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Vlera e bilancit
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Vlera e bilancit
 DocType: Lab Test,Lab Technician,Teknik i laboratorit
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Lista Sales Çmimi
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Nëse kontrollohet, një klient do të krijohet, i mapuar tek Pacienti. Faturat e pacientit do të krijohen kundër këtij klienti. Ju gjithashtu mund të zgjidhni Klientin ekzistues gjatë krijimit të pacientit."
 DocType: Bank Reconciliation,Account Currency,Llogaria Valuta
@@ -1251,16 +1245,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Ju lutemi të përmendim rrumbullohem Llogari në Kompaninë
 DocType: Purchase Receipt,Range,Varg
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Fee Structure,Components,komponentet
 DocType: Item Barcode,Item Barcode,Item Barkodi
 DocType: Woocommerce Settings,Endpoints,endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","për tu gjeneruar. Nëse vonohet, do të duhet të ndryshoni manualisht fushën &quot;Repeat on Day of Month&quot; të kësaj"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
 DocType: Share Transfer,From Folio No,Nga Folio Nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
@@ -1295,16 +1287,17 @@
 DocType: Asset,Available-for-use Date,Data e disponueshme për përdorim
 DocType: Guardian,Guardian Name,Emri Guardian
 DocType: Cheque Print Template,Has Print Format,Ka Print Format
-DocType: Employee Loan,Sanctioned,sanksionuar
+DocType: Loan,Sanctioned,sanksionuar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
 DocType: Crop Cycle,Crop Cycle,Cikli i kulturave
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Për sendet e &#39;Produkt Bundle&#39;, depo, pa serial dhe Serisë Nuk do të konsiderohet nga &#39;Paketimi listë&#39; tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send &#39;produkt Bundle&#39;, këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në &#39;Paketimi listë&#39; tryezë."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Për sendet e &#39;Produkt Bundle&#39;, depo, pa serial dhe Serisë Nuk do të konsiderohet nga &#39;Paketimi listë&#39; tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send &#39;produkt Bundle&#39;, këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në &#39;Paketimi listë&#39; tryezë."
 DocType: Student Admission,Publish on website,Publikojë në faqen e internetit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Furnizuesi Data e faturës nuk mund të jetë më i madh se mbi postimet Data
+DocType: Subscription,Cancelation Date,Data e anulimit
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
 DocType: Agriculture Task,Agriculture Task,Detyra e Bujqësisë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Të ardhurat indirekte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Të ardhurat indirekte
 DocType: Student Attendance Tool,Student Attendance Tool,Pjesëmarrja Student Tool
 DocType: Restaurant Menu,Price List (Auto created),Lista e çmimeve (krijuar automatikisht)
 DocType: Cheque Print Template,Date Settings,Data Settings
@@ -1331,6 +1324,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,metër
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Datetime testimi i laboratorit nuk mund të jetë para datës së grumbullimit
+DocType: Subscription Plan,Cost,kosto
 DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonjës Ditëlindja Përkujtesat
 DocType: Expense Claim,Total Advance Amount,Shuma totale e parapagimit
 DocType: Delivery Stop,Estimated Arrival,Arritja e parashikuar
@@ -1342,15 +1336,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
 DocType: Timesheet Detail,Bill,Fature
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,E bardhë
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,E bardhë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty nuk është në dispozicion për {4} në depo {1} të postimi kohën e hyrjes ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Ju mund të zgjidhni vetëm një maksimum prej një opsioni nga lista e kutive të zgjedhjes.
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
 DocType: Item,Automatically Create New Batch,Automatikisht Krijo grumbull të ri
 DocType: Item,Automatically Create New Batch,Automatikisht Krijo grumbull të ri
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Caktimi i {0} në {1} (rreshti {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Bëj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Caktimi i {0} në {1} (rreshti {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Bëj
 DocType: Student Admission,Admission Start Date,Pranimi Data e fillimit
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Punonjës i ri
@@ -1366,7 +1360,7 @@
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 DocType: Repayment Schedule,Balance Loan Amount,Bilanci Shuma e Kredisë
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Orari i kursit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Stock Options
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Çaktivizo marrjen e Detajet e fundit të Blerjes në Rendit Blerje
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,A jeni të vërtetë doni për të rivendosur këtë pasuri braktiset?
@@ -1385,11 +1379,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Paketimi Shqip Item
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Llogarisë Bankare
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Ju lutem specifikoni një {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Krijimi i variantit ka qenë në radhë.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Përmbledhje e punës për {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Miratuesi i parë i Lëshimit në listë do të caktohet si Lëshuesi i Parazgjedhur.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Plan,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} nuk mund të jetë negative
 DocType: Training Event,Self-Study,Self-Study
@@ -1402,7 +1397,7 @@
 DocType: Workstation,Wages,Pagat
 DocType: Asset Maintenance,Maintenance Manager Name,Emri Menaxheri i Mirëmbajtjes
 DocType: Agriculture Task,Urgent,Urgjent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Ju lutem specifikoni një ID te vlefshme Row për rresht {0} në tryezë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Ju lutem specifikoni një ID te vlefshme Row për rresht {0} në tryezë {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nuk mund të gjeni ndryshore:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Ju lutemi zgjidhni një fushë për të redaktuar nga numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Nuk mund të jetë një element i aseteve fikse si Ledger Stock është krijuar.
@@ -1414,7 +1409,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Emri i modelit të inspektimit të cilësisë
 DocType: Project,First Email,Emaili i Parë
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Shuma Shitja
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Shuma Shitja
 DocType: Repayment Schedule,Interest Amount,Shuma e interesit
 DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
 DocType: Share Transfer,Issue,Çështje
@@ -1428,10 +1423,10 @@
 DocType: Tax Rule,Shipping State,Shteti Shipping
 ,Projected Quantity as Source,Sasia e parashikuar si Burimi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Udhëtimi i udhëtimit
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Udhëtimi i udhëtimit
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Lloji i transferimit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Shitjet Shpenzimet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Shitjet Shpenzimet
 DocType: Consultation,Diagnosis,diagnozë
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
@@ -1440,12 +1435,13 @@
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Kodi Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Sales Order {0} është {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Zgjidh llogarinë e të ardhurave nga interesi në kredi {0}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Marrja e aksioneve Entries
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
 DocType: Item,Default Supplier,Gabim Furnizuesi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Mbi prodhimin Allowance Përqindja
-DocType: Employee Loan,Repayment Schedule,sHLYERJES
+DocType: Loan,Repayment Schedule,sHLYERJES
 DocType: Shipping Rule Condition,Shipping Rule Condition,Rregulla Transporti Kushti
 DocType: Holiday List,Get Weekly Off Dates,Merr e pushimit javor Datat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
@@ -1460,7 +1456,7 @@
 DocType: Education Settings,Attendance Freeze Date,Pjesëmarrja Freeze Data
 DocType: Education Settings,Attendance Freeze Date,Pjesëmarrja Freeze Data
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Shiko të gjitha Produktet
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Shiko të gjitha Produktet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead Minimumi moshes (ditë)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Lead Minimumi moshes (ditë)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Të gjitha BOM
@@ -1469,14 +1465,16 @@
 DocType: Expense Claim,From Employee,Nga punonjësi
 DocType: Driver,Cellphone Number,Numri i celularit
 DocType: Project,Monitor Progress,Monitorimi i progresit
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
 DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja
+DocType: Supplier Quotation,Auto Repeat Section,Seksioni i përsëritjes automatike
 DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data
 DocType: Appraisal Template Goal,Key Performance Area,Key Zona Performance
 DocType: Program Enrollment,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Atributi i pavlefshëm
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Sasia duhet të jetë më e vogël se ose e barabartë me {0}
+DocType: Department Approver,Department Approver,Deputeti i Departamentit
 DocType: SMS Center,Total Characters,Totali Figurë
 DocType: Employee Advance,Claimed,pretenduar
 DocType: Crop,Row Spacing,Hapësira e Rreshtit
@@ -1486,6 +1484,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagesa Pajtimi Faturë
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Kontributi%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Sipas Settings Blerja në qoftë Rendit Blerje Kërkohet == &#39;PO&#39;, pastaj për krijimin Blerje Faturën, përdoruesi duhet të krijoni Rendit Blerje parë për pikën {0}"
+,HSN-wise-summary of outward supplies,HSN-përmbledhje e menjëhershme e furnizimeve të jashtme
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numrat e regjistrimit kompani për referencë tuaj. Numrat e taksave etj
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
@@ -1499,7 +1498,7 @@
 DocType: Setup Progress Action,Action Name,Emri i Veprimit
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,fillimi Year
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Para 2 shifrat e GSTIN duhet të përputhen me numrin e Shtetit {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Data e fillimit të periudhës së fatura aktual
 DocType: Salary Slip,Leave Without Pay,Lini pa pagesë
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapaciteti Planifikimi Gabim
@@ -1517,26 +1516,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fushat do të kopjohen vetëm në kohën e krijimit.
 DocType: Setup Progress Action,Domains,Fushat
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Data e Fillimit' nuk mund të jetë më i madh se 'Data e Mbarimit'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Drejtuesit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Drejtuesit
 DocType: Cheque Print Template,Payer Settings,Cilësimet paguesit
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
 DocType: Purchase Invoice,Is Return,Është Kthimi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Kujdes
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Dita e fillimit është më e madhe se dita e mbarimit në detyrë &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Kthimi / Debiti Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Kthimi / Debiti Note
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kodi artikull nuk mund të ndryshohet për të Serial Nr
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Kodi artikull nuk mund të ndryshohet për të Serial Nr
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Konvertimi Faktori
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ju lutemi shkruani kodin Item për të marrë Numri i Serisë
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
-DocType: Employee Loan,Partially Disbursed,lëvrohet pjesërisht
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Dhënia e informacionit.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Dhënia e informacionit.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Bazës së të dhënave Furnizuesi.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Nuk mund të rifilloni një Abonimi që nuk anulohet.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
 DocType: Fee Validity,Valid Till,E vlefshme deri
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Takimi Mësues i Prindërve Gjithsej
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
@@ -1549,7 +1548,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Ndryshimi i Grupit të Klientit për Klientin e përzgjedhur nuk është i lejuar.
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Përditësimi i afatit të mbërritjes.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Përditësimi i afatit të mbërritjes.
 DocType: Program Enrollment Tool,Enrollment Details,Detajet e Regjistrimit
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Ju lutemi zgjidhni një klient
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Purchase Order,Group same items,Grupi njëjta artikuj
 DocType: Purchase Invoice,Disable Rounded Total,Disable rrumbullakosura Total
-DocType: Employee Loan Application,Repayment Info,Info Ripagimi
+DocType: Department,Parent Department,Departamenti i Prindërve
+DocType: Loan Application,Repayment Info,Info Ripagimi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
 DocType: Maintenance Team Member,Maintenance Role,Roli i Mirëmbajtjes
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Ngritja Punonjësit
 DocType: Sales Order,SO-,KËSHTU QË-
 DocType: Hotel Room Reservation,Hotel Reservation User,Përdoruesi i Rezervimit të Hoteleve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Hulumtim
+DocType: Subscription Settings,Subscription Settings,Parametrat e pajtimit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Hulumtim
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Ju lutem specifikoni të paktën një atribut në tabelë Atributet
 DocType: Announcement,All Students,Të gjitha Studentët
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 DocType: Crop Cycle,Less than a year,Më pak se një vit
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 DocType: Crop,Yield UOM,Yield UOM
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
 DocType: Item,Is Item from Hub,Është pika nga Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Aktiviteti lloji është i detyrueshëm.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Dividentët e paguar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Dividentët e paguar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger Kontabilitet
 DocType: Stock Reconciliation,Difference Amount,Shuma Diferenca
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} në Lini në {1}
 DocType: Purchase Invoice,Reverse Charge,Ngarkesa e kundërt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Fitime të mbajtura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Fitime të mbajtura
 DocType: Purchase Invoice,05-Change in POS,05-Ndryshimi në POS
 DocType: Vehicle Log,Service Detail,Detail shërbimit
 DocType: BOM,Item Description,Përshkrimi i artikullit
@@ -1619,12 +1620,12 @@
 DocType: Opportunity Item,Opportunity Item,Mundësi Item
 ,Student and Guardian Contact Details,Student dhe Guardian Detajet e Kontaktit
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Për të furnizuesit {0} Adresa Email është e nevojshme për të dërguar një email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Hapja e përkohshme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Hapja e përkohshme
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Shiko Qendrën
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 DocType: Patient Appointment,More Info,More Info
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
 DocType: Supplier Scorecard,Scorecard Actions,Veprimet Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Shembull: Master në Shkenca Kompjuterike
 DocType: Purchase Invoice,Rejected Warehouse,Magazina refuzuar
@@ -1634,7 +1635,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,në
 DocType: Supplier Quotation Item,Lead Time in days,Lead Koha në ditë
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Pagesa e pagës nga {0} në {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Pagesa e pagës nga {0} në {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
@@ -1643,9 +1644,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Recetat e testit të laboratorit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,I vogël
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,I vogël
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Hapja e artikullit të krijimit të faturës
 DocType: Education Settings,Employee Number,Numri punonjës
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Anuloni Faturën pas Periudhës së Grace
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
 DocType: Project,% Completed,% Kompletuar
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
@@ -1659,7 +1661,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Datat e testimit laboratorik
 DocType: Email Digest,Add Quote,Shto Citim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Shpenzimet indirekte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
 DocType: Agriculture Analysis Criteria,Agriculture,Bujqësi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync Master Data
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Pajisje kapitale
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Ju lutemi të vendosni fillimisht Kodin e Artikullit
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
+DocType: Subscription Plan,Billing Interval Count,Numërimi i intervalit të faturimit
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 DocType: Antibiotic,Antibiotic,antibiotik
 ,Team Updates,Ekipi Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Për Furnizuesin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Vendosja Tipi Llogarisë ndihmon në zgjedhjen e kësaj llogarie në transaksionet.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompania Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Krijo Print Format
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Elementi alternativ nuk duhet të jetë i njëjtë me kodin e artikullit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Finalizimi i vlerësimit të përkohshëm
 DocType: Salary Slip,Bank Account No.,Llogarisë Bankare Nr
@@ -1742,7 +1745,7 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Kërkesë për Kuotim Furnizuesit
 DocType: Healthcare Settings,Registration Message,Mesazhi i regjistrimit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hardware
 DocType: Prescription Dosage,Prescription Dosage,Dozimi i recetës
 DocType: Attendance,HR Manager,Menaxher HR
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Ju lutem zgjidhni një Company
@@ -1773,7 +1776,7 @@
 DocType: Project,Start and End Dates,Filloni dhe Fundi Datat
 ,Delivered Items To Be Billed,Items dorëzohet për t&#39;u faturuar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Hapur BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
 DocType: Authorization Rule,Average Discount,Discount mesatar
 DocType: Project Update,Great/Quickly,Madhe / shpejt
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1782,8 +1785,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Ju lutem, përzgjidhni tufa për artikull në pako"
 DocType: Asset,Depreciation Schedules,Oraret e amortizimit
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Llogaritë pasuese mund të zgjidhen në cilësimet e GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Llogaritë pasuese mund të zgjidhen në cilësimet e GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 DocType: Payment Request,Transaction Currency,Transaction Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Nga {0} | {1} {2}
@@ -1794,6 +1797,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily largohet
 DocType: POS Profile,Campaign,Fushatë
 DocType: Supplier,Name and Type,Emri dhe lloji i
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Miratimi Statusi duhet të jetë &quot;miratuar&quot; ose &quot;Refuzuar &#39;
 DocType: Physician,Contacts and Address,Kontaktet dhe Adresa
 DocType: Purchase Invoice,Contact Person,Personi kontaktues
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Pritet Data e Fillimit &#39;nuk mund të jetë më i madh se&quot; Data e Përfundimit e pritshme&#39;
@@ -1807,19 +1811,20 @@
 DocType: Student Admission,Eligibility and Details,Pranueshmëria dhe Detajet
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Kërkesë për Kuotim është me aftësi të kufizuara për qasje nga portali, për më shumë konfigurimet e portalit kontrollit."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Rezultati i rezultatit të furnitorit që shënon variablën
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Blerja Shuma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Blerja Shuma
 DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kishte gabime në krijimin e orarit të lëndëve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Miratuesi i parë i shpenzimeve në listë do të vendoset si menaxher i parave të shpenzimeve.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,nuk mund të jetë më i madh se 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Detail,Depends on Leave Without Pay,Varet në pushim pa pagesë
@@ -1840,14 +1845,15 @@
 DocType: Package Code,Package Code,Kodi paketë
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Nxënës
 DocType: Purchase Invoice,Company GSTIN,Company GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Detaje taksave tryezë sforcuar nga mjeshtri pika si një varg dhe të depozituara në këtë fushë. Përdoret për taksat dhe tatimet
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Lëreni aprovuesin e detyrueshëm në pushim
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Rregulla taksë për transaksionet.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Termi i pagesës në rresht {0} është ndoshta një kopje.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Bujqësia (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Shqip Paketimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Zyra Qira
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS settings portë
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Shqip Paketimi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Zyra Qira
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup SMS settings portë
 DocType: Disease,Common Name,Emer i perbashket
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import dështoi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
 DocType: Vital Signs,Blood Pressure,Presioni i gjakut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analist
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Shitjet Detajet
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Vlereso regjistruar Kursin për Studentët në Grupin e Studentëve
 DocType: Notification Control,Expense Claim Rejected,Shpenzim Kërkesa Refuzuar
 DocType: Item,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Qeveri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Qeveri
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Kërkesa {0} ekziston për Log automjeteve
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Emri Institute
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Ju lutemi shkruani shlyerjes Shuma
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Ju lutemi shkruani shlyerjes Shuma
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variantet pika
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Sherbime
 DocType: HR Settings,Email Salary Slip to Employee,Email Paga Slip për të punësuarit
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Zgjidhni mundshëm Furnizuesi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Zgjidhni mundshëm Furnizuesi
 DocType: Sales Invoice,Source,Burim
 DocType: Customer,"Select, to make the customer searchable with these fields","Përzgjidhni, për ta bërë konsumatorin të kërkueshëm me këto fusha"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Shfaq të mbyllura
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Cash Flow nga Investimi
 DocType: Program Course,Program Course,Kursi program
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Homepage,Company Tagline for website homepage,Kompania Tagline për faqen e internetit
 DocType: Item Group,Item Group Name,Item Emri i Grupit
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Detajet e Memphership
 DocType: Leave Block List,Block Holidays on important days.,Festat bllok në ditë të rëndësishme.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Futni të gjitha vlerat (et) e kërkuara të rezultatit
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
-DocType: Employee Loan,Monthly Repayment Amount,Shuma mujore e pagesës
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
+DocType: Loan,Monthly Repayment Amount,Shuma mujore e pagesës
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Hapja e faturave
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
 DocType: UOM,UOM Name,Emri UOM
 DocType: GST HSN Code,HSN Code,Kodi HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Shuma Kontribut
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Përdoruesi {0} është caktuar tashmë tek Mjeku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kuti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,mundur Furnizuesi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,mundur Furnizuesi
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Shpërndarja mujore
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Marresit Lista është e zbrazët. Ju lutem krijoni Marresit Lista
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Shëndetësia (beta)
@@ -2001,7 +2008,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Asnjë informacion që të dal
 DocType: Shipping Rule Condition,From Value,Nga Vlera
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
-DocType: Employee Loan,Repayment Method,Metoda Ripagimi
+DocType: Loan,Repayment Method,Metoda Ripagimi
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Nëse zgjidhet, faqja Faqja do të jetë paracaktuar Item Grupi për faqen e internetit"
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
@@ -2010,7 +2017,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certifikata e kërkuar
 DocType: Company,Default Holiday List,Default Festa Lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Nga kohë dhe për kohën e {1} është mbivendosje me {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Detyrimet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Invoice,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Zgjidh kompanisë
@@ -2018,7 +2025,7 @@
 DocType: Student Report Generation Tool,Print Section,Seksioni i Printimit
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Përdoruesi {0} nuk ka ndonjë Profil POS të parazgjedhur. Kontrolloni Default në Row {1} për këtë Përdorues.
 DocType: Student Group,Set 0 for no limit,Set 0 për pa limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Rreshti {idx}: {field} kërkohet për të krijuar Faturat e Hapjes {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Adresa Fillestare dhe Detajet e Kontaktit
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ridergo Pagesa Email
@@ -2029,10 +2036,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Ju lutem zgjidhni të paktën një domain.
 DocType: Dependent Task,Dependent Task,Detyra e varur
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
 DocType: SMS Center,Receiver List,Marresit Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Kërko Item
 DocType: Payment Schedule,Payment Amount,Shuma e pagesës
@@ -2042,7 +2049,7 @@
 DocType: Assessment Plan,Grading Scale,Scale Nota
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,përfunduar tashmë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importi i suksesshëm!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
@@ -2053,17 +2060,16 @@
 DocType: Quotation Item,Quotation Item,Citat Item
 DocType: Customer,Customer POS Id,Customer POS Id
 DocType: Account,Account Name,Emri i llogarisë
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} sasi {1} nuk mund të jetë një pjesë
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} sasi {1} nuk mund të jetë një pjesë
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Ju lutemi shkruani URL Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizuesi Lloji mjeshtër.
 DocType: Purchase Order Item,Supplier Part Number,Furnizuesi Pjesa Numër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
 DocType: Share Balance,To No,Për Nr
-DocType: Subscription,Reference Document,Dokumenti Referenca
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} është anuluar ose ndaluar
 DocType: Accounts Settings,Credit Controller,Kontrolluesi krediti
-DocType: Grant Application,Applicant Type,Lloji i aplikantit
+DocType: Loan,Applicant Type,Lloji i aplikantit
 DocType: Purchase Invoice,03-Deficiency in services,03-Mangësi në shërbime
 DocType: Delivery Note,Vehicle Dispatch Date,Automjeteve Dërgimi Data
 DocType: Healthcare Settings,Default Medical Code Standard,Standardi i Kodit të Mjekësisë Default
@@ -2074,13 +2080,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% faturuar
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Burimeve Njerëzore
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Burimeve Njerëzore
 DocType: Lead,Upper Income,Të ardhurat e sipërme
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,hedh poshtë
 DocType: Journal Entry Account,Debit in Company Currency,Debit në kompanisë Valuta
 DocType: BOM Item,BOM Item,Bom Item
 DocType: Appraisal,For Employee,Për punonjësit
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Bëni disbursimi Hyrja
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Bëni disbursimi Hyrja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance kundër Furnizuesit duhet të debiti
 DocType: Company,Default Values,Vlerat Default
 DocType: Membership,INR,INR
@@ -2110,10 +2116,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} duhet të jetë më i madh se 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Në dispozicion
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Në dispozicion
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planifikimi i kapaciteteve për (ditë)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Prokurimit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Fushë e detyrueshme - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Fushë e detyrueshme - Program
 DocType: Special Test Template,Result Component,Komponenti i rezultatit
@@ -2134,7 +2140,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Përfshijnë pushimet brenda lë si gjethe
 DocType: Sales Invoice,Packed Items,Items të mbushura
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garanci Padia kundër Serial Nr
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Total&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Total&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivizo Shporta
 DocType: Employee,Permanent Address,Adresa e përhershme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2152,10 +2158,10 @@
 DocType: Selling Settings,Selling Settings,Shitja Settings
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Konfirmo veprimin
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Auctions Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,përmbushje
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Shiko në Shportë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Shpenzimet e marketingut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Nuk mund të krijohen kritere standarde. Ju lutemi riemërtoni kriteret
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
@@ -2178,9 +2184,9 @@
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Material Request,Transferred,transferuar
 DocType: Vehicle,Doors,Dyer
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Mblidhni Tarifën për Regjistrimin e Pacientëve
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nuk mund të ndryshojë Atributet pas transaksionit të aksioneve. Bëni një artikull të ri dhe transferoni stokun në artikullin e ri
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Nuk mund të ndryshojë Atributet pas transaksionit të aksioneve. Bëni një artikull të ri dhe transferoni stokun në artikullin e ri
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,Breakup Tax
 DocType: Packing Slip,PS-,PS-
@@ -2216,12 +2222,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch Asnjë
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Përparimet e punonjësve
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 DocType: Grant Application,Assessment  Mark (Out of 10),Vlerësimi Mark (Nga 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Kryesor
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
@@ -2230,15 +2237,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Email Digest,Annual Expenses,Shpenzimet vjetore
 DocType: Item,Variants,Variantet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Shuma e ndarë
 DocType: Sales Team,Contribution to Net Total,Kontributi në Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
 DocType: Territory,Territory Name,Territori Emri
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Ju mund të keni vetëm Planet me të njëjtin cikel faturimi në një Abonimi
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikuesi për një punë.
 DocType: Purchase Order Item,Warehouse and Reference,Magazina dhe Referenca
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutore dhe informacione të tjera të përgjithshme në lidhje me furnizuesit tuaj
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,vlerësime
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Ngjarje Trajnimi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Rruga kryeson nga burimi kryesor.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Ju lutemi shkruani
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Ju lutemi shkruani
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Mirëmbajtja e regjistrit
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Pesha neto i kësaj pakete. (Llogaritet automatikisht si shumë të peshës neto të artikujve)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,Për të ofruar dhe Bill
 DocType: Student Group,Instructors,instruktorët
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Menaxhimi i aksioneve
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Pagesa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Pagesa
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Magazina {0} nuk është e lidhur me ndonjë llogari, ju lutemi të përmendim llogari në procesverbal depo apo vendosur llogari inventarit parazgjedhur në kompaninë {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Menaxho urdhërat tuaj
 DocType: Work Order Operation,Actual Time and Cost,Koha aktuale dhe kostos
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Leave Aplikimi
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Në
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,barcodes
 DocType: Hub Category,Hub Node,Hub Nyja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Koleg
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Koleg
 DocType: Asset Movement,Asset Movement,Lëvizja e aseteve
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Urdhri i punës {0} duhet të dorëzohet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Shporta e re
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Monedha e faturimit duhet të jetë e barabartë me monedhën e parave të kompanisë ose monedhën e llogarisë së partisë
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
 DocType: Soil Texture,Loam,tokë pjellore
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rreshti {0}: Data e duhur nuk mund të jetë para datës së postimit
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rreshti {0}: Data e duhur nuk mund të jetë para datës së postimit
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Kryej pagesa Hyrja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
 ,Sales Invoice Trends,Shitjet Trendet faturave
 DocType: Leave Application,Apply / Approve Leaves,Aplikoni / Miratimi Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Për
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Mund t&#39;i referohet rresht vetëm nëse tipi është ngarkuar &quot;Për Previous Shuma Row &#39;ose&#39; Previous Row Total&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Mund t&#39;i referohet rresht vetëm nëse tipi është ngarkuar &quot;Për Previous Shuma Row &#39;ose&#39; Previous Row Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Ofrimit Magazina
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Pema e Qendrave te Kostos financiare.
 DocType: Serial No,Delivery Document No,Ofrimit Dokumenti Asnjë
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Konsumi i materialit nuk është vendosur në Cilësimet e Prodhimtaria.
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ka Variantet
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nuk mund të mbivlerësohet për Item {0} në rresht {1} më shumë se {2}. Për të lejuar mbi-faturimin, ju lutemi vendosni në Settings Stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nuk mund të mbivlerësohet për Item {0} në rresht {1} më shumë se {2}. Për të lejuar mbi-faturimin, ju lutemi vendosni në Settings Stock"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Përditësoni përgjigjen
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Zgjidhni programin e parë
 DocType: Patient Appointment,Patient Age,Mosha e pacientit
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Menaxhimi i Projekteve
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial no {0} është kthyer tashmë
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial no {0} është kthyer tashmë
 DocType: Supplier,Supplier of Goods or Services.,Furnizuesi i mallrave ose shërbimeve.
 DocType: Budget,Fiscal Year,Viti Fiskal
 DocType: Asset Maintenance Log,Planned,planifikuar
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Llogaritë e llogarive të arkëtueshme që do të përdoren nëse nuk vendosen në pacient për të rezervuar akuzat e Konsultimit.
 DocType: Vehicle Log,Fuel Price,Fuel Price
+DocType: Bank Guarantee,Margin Money,Paratë e margjinës
 DocType: Budget,Budget,Buxhet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Cakto hapur
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
@@ -2352,16 +2360,16 @@
 DocType: Lead,Follow Up,Ndiqe
 DocType: Item,Is Sales Item,Është Item Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
 DocType: Maintenance Visit,Maintenance Time,Mirëmbajtja Koha
 ,Amount to Deliver,Shuma për të Ofruar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Artikulli i njëjtë është futur disa herë. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Data e fillimit nuk mund të jetë më herët se Year Data e fillimit të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Ka pasur gabime.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Punonjësi {0} ka aplikuar për {1} mes {2} dhe {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Ka pasur gabime.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Punonjësi {0} ka aplikuar për {1} mes {2} dhe {3}:
 DocType: Guardian,Guardian Interests,Guardian Interesat
 DocType: Naming Series,Current Value,Vlera e tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
 DocType: Education Settings,Instructor Records to be created by,Regjistruesi i instruktorit të krijohet nga
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} krijuar
 DocType: GST Account,GST Account,Llogari GST
@@ -2380,8 +2388,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Shtuar te Favoritet
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Asnjë pagë pagese nuk është paraqitur për kriteret e përzgjedhura më lartë OSE paga e pagës tashmë e dorëzuar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Detyrat dhe Taksat
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Asnjë pagë pagese nuk është paraqitur për kriteret e përzgjedhura më lartë OSE paga e pagës tashmë e dorëzuar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Detyrat dhe Taksat
 DocType: Projects Settings,Projects Settings,Projekte Cilësimet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ju lutem shkruani datën Reference
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
@@ -2391,27 +2399,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Pema e sendit grupeve.
 DocType: Production Plan,Total Produced Qty,Totali i Prodhimit
 DocType: Payroll Entry,Get Employee Details,Merrni Detajet e Punonjësve
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
 DocType: Asset,Sold,i shitur
 ,Item-wise Purchase History,Historia Blerje pika-mençur
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
 DocType: Account,Frozen,I ngrirë
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Shuma (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,"Lende e pare, lende e paperpunuar"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,"Lende e pare, lende e paperpunuar"
 DocType: Payment Reconciliation Payment,Reference Row,Reference Row
 DocType: Installation Note,Installation Time,Instalimi Koha
 DocType: Sales Invoice,Accounting Details,Detajet Kontabilitet
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Fshij gjitha transaksionet për këtë kompani
 DocType: Patient,O Positive,O Pozitive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investimet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokimet
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteret e pranimit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Nuk ka ripagesa në dispozicion për Regjistrimin e Gazetës
 DocType: Item Attribute,Attribute Name,Atribut Emri
 DocType: BOM,Show In Website,Shfaq Në Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Trego sasia në faqen
-DocType: Employee Loan Application,Total Payable Amount,Shuma totale e pagueshme
+DocType: Loan Application,Total Payable Amount,Shuma totale e pagueshme
 DocType: Task,Expected Time (in hours),Koha pritet (në orë)
 DocType: Item Reorder,Check in (group),Kontrolloni në (grupi)
 DocType: Soil Texture,Silt,baltë
@@ -2430,7 +2439,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Bëj pagesën
 DocType: Room,Room Name,Room Emri
 DocType: Prescription Duration,Prescription Duration,Kohëzgjatja e recetës
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 DocType: Activity Cost,Costing Rate,Kushton Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Adresat dhe kontaktet Customer
 ,Campaign Efficiency,Efikasiteti fushatë
@@ -2450,11 +2459,11 @@
 DocType: Chapter,Chapter,kapitull
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Palë
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Llogaria e parazgjedhur do të përditësohet automatikisht në POS Fatura kur kjo mënyrë të përzgjidhet.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
 DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Adresat Sales partner dhe Kontakte
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Half Data Day duhet të jetë midis Nga Data dhe deri më sot
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Half Data Day duhet të jetë midis Nga Data dhe deri më sot
 DocType: Maintenance Schedule Detail,Actual Date,Aktuale Data
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Vendosni Qendrën e Kostos së Parazgjedhur në {0} kompani.
 DocType: Item,Has Batch No,Ka Serisë Asnjë
@@ -2472,7 +2481,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet)
 DocType: Soil Texture,Soil Type,Lloji i dheut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Mesazh i ri
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandati i GoCardless
@@ -2492,7 +2500,7 @@
 DocType: Hub Category,Hub Category,Kategoria Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
-DocType: Employee Loan,Loan Amount,Shuma e kredisë
+DocType: Loan,Loan Amount,Shuma e kredisë
 DocType: Student Report Generation Tool,Add Letterhead,Shto me shkronja
 DocType: Program Enrollment,Self-Driving Vehicle,Self-Driving automjeteve
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Përputhësi i rezultatit të furnitorit
@@ -2521,9 +2529,9 @@
 DocType: Cash Flow Mapper,Position,pozitë
 DocType: Patient,Patient Details,Detajet e pacientit
 DocType: Patient,B Positive,B Pozitiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 DocType: Patient Medical Record,Patient Medical Record,Regjistrimi mjekësor pacient
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup për jo-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportiv
@@ -2531,8 +2539,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Gjithsej aktuale
 DocType: Lab Test UOM,Test UOM,Test UOM
 DocType: Student Siblings,Student Siblings,Vëllai dhe motra e studentëve
+DocType: Subscription Plan Detail,Subscription Plan Detail,Detaji i Planit të Abonimit
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Njësi
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Ju lutem specifikoni Company
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Ju lutem specifikoni Company
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
 DocType: Asset Maintenance Task,Maintenance Task,Detyra e mirëmbajtjes
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Vendosni Limit B2C në Cilësimet GST.
@@ -2546,6 +2555,7 @@
 ,BOM Search,Bom Kërko
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Kostoja totale e materialit të konsumuar (nëpërmjet regjistrimit të stoqeve)
 DocType: Hub Settings,Company Registered,Regjistri i kompanisë
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Data nuk mund të jetë më pak se Data
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publikoni &quot;Në Stock&quot; ose &quot;Not in Stock&quot; në Hub bazuar në stokun në dispozicion në këtë depo.
 DocType: Vehicle,Fuel Type,Fuel Lloji
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
@@ -2553,17 +2563,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pas kërkesave materiale janë ngritur automatikisht bazuar në nivelin e ri të rendit zërit
 DocType: Email Digest,Pending Sales Orders,Në pritje Sales urdhëron
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 DocType: Employee,Create User Permission,Krijo lejen e përdoruesit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 DocType: Healthcare Settings,Remind Before,Kujtoj Para
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
 DocType: Salary Component,Deduction,Zbritje
 DocType: Item,Retain Sample,Mbajeni mostër
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Nga koha dhe në kohë është i detyrueshëm.
 DocType: Stock Reconciliation Item,Amount Difference,shuma Diferenca
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ju lutemi shkruani punonjës Id i këtij personi të shitjes
 DocType: Territory,Classification of Customers by region,Klasifikimi i Konsumatorëve sipas rajonit
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Në prodhim
@@ -2573,8 +2584,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Llogaritur Banka bilanci Deklarata
 DocType: Normal Test Template,Normal Test Template,Modeli i Testimit Normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,përdorues me aftësi të kufizuara
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Citat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Nuk mund të caktohet një RFQ e pranuar në asnjë kuotë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Nuk mund të caktohet një RFQ e pranuar në asnjë kuotë
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Zbritje Total
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Zgjidh një llogari për të shtypur në monedhën e llogarisë
@@ -2582,7 +2593,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Kjo bazohet në transaksione kundër këtij Pacienti. Shiko detajet më poshtë për detaje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kosto Përditësuar
 DocType: Patient,Date of Birth,Data e lindjes
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Item {0} tashmë është kthyer
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Vendosja e Scorecard Furnizues
@@ -2593,14 +2604,15 @@
 DocType: Work Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Përshkrimi i punës
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Përshkrimi i punës
 DocType: Student Applicant,Applied,i aplikuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Ri-hapur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Ri-hapur
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty sipas Stock UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Emri Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Shitje zbritje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
+DocType: Department Approver,Approver,Aprovuesi
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Fusha Për Aksionarin nuk mund të jetë bosh
 DocType: Guardian,Work Address,puna Adresa
@@ -2614,21 +2626,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Gjithsej shuma e akorduar (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
 DocType: BOM,Scrap Material Cost,Scrap Material Kosto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
 DocType: Grant Application,Email Notification Sent,Njoftimi me email u dërgua
 DocType: Purchase Invoice,In Words (Company Currency),Me fjalë (Kompania Valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Kodi i artikullit, depoja, sasia kërkohet në radhë"
-DocType: Pricing Rule,Supplier,Furnizuesi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Kodi i artikullit, depoja, sasia kërkohet në radhë"
+DocType: Bank Guarantee,Supplier,Furnizuesi
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Shfaq Detajet e Pagesës
 DocType: Consultation,Consultation Time,Koha e konsultimit
 DocType: C-Form,Quarter,Çerek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Shpenzimet Ndryshme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Shpenzimet Ndryshme
 DocType: Global Defaults,Default Company,Gabim i kompanisë
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Shpenzim apo llogari Diferenca është e detyrueshme për Item {0} si ndikon vlerën e përgjithshme e aksioneve
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Emri i Bankës
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Siper
-DocType: Employee Loan,Employee Loan Account,Llogaria Loan punonjës
 DocType: Leave Application,Total Leave Days,Ditët Totali i pushimeve
 DocType: Email Digest,Note: Email will not be sent to disabled users,Shënim: Email nuk do të dërgohet për përdoruesit me aftësi të kufizuara
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numri i bashkëveprimit
@@ -2644,7 +2655,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Pesha (në kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitujt / emri i kapitullit lënë boshin automatikisht të vendosur pas ruajtjes së kapitullit.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Vendosni Llogaritë GST në Cilësimet GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Vendosni Llogaritë GST në Cilësimet GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Lloj i biznesit
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kostoja e blerjes së Re
@@ -2653,12 +2664,13 @@
 DocType: Grant Application,Grant Description,Përshkrimi i Grantit
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
 DocType: Student Guardian,Others,Të tjerët
+DocType: Subscription,Discounts,Zbritje
 DocType: Payment Entry,Unallocated Amount,Shuma pashpërndarë
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Një produkt apo një shërbim që është blerë, shitur apo mbajtur në magazinë."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nuk ka përditësime më shumë
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Kjo mbulon të gjitha tabelat e rezultateve të lidhura me këtë Setup
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item nuk duhet të jetë një Bundle Product. Ju lutemi të heq arikullin &#39;{0}&#39; dhe për të shpëtuar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankar
@@ -2667,21 +2679,24 @@
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ju lutem klikoni në &quot;Generate&quot; Listën për të marrë orarin
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
 DocType: Grading Scale,Grading Scale Intervals,Intervalet Nota Scale
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Fitimi për vitin
+DocType: Bank Guarantee,Name of Bank,Emri i Bankës
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Hyrja për {2} mund të bëhet vetëm në monedhën: {3}
 DocType: Fee Schedule,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Pema e llogarive financiare.
+DocType: Bank Guarantee,Reference Document Type,Referenca Document Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapping Flow Flow
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Inventar serialized
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Emailja nuk gjendet në kontaktin e parazgjedhur
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gjeni sekret
-DocType: Employee Loan,Account Info,Llogaria Info
+DocType: Loan,Account Info,Llogaria Info
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
 DocType: Fees,Include Payment,Përfshi Pagesën
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} grupeve studentore krijuar.
@@ -2689,24 +2704,24 @@
 DocType: Sales Invoice,Total Billing Amount,Shuma totale Faturimi
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programi në Strukturën e Tarifave dhe Grupi Studentor {0} janë të ndryshme.
 DocType: Fee Schedule,Receivable Account,Llogaria e arkëtueshme
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
 DocType: Quotation Item,Stock Balance,Stock Bilanci
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Rendit Shitjet për Pagesa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Me pagesën e tatimit
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tri kopje për furnizuesit
 DocType: Land Unit,Is Container,Është kontejner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Kjo do të jetë dita e 1 e ciklit të kulturave
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Purchase Invoice Item,Weight UOM,Pesha UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Lista e Aksionarëve në dispozicion me numra foli
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Paga e punonjësve
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Trego atributet e variantit
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Trego atributet e variantit
 DocType: Student,Blood Group,Grup gjaku
 DocType: Course,Course Name,Emri i kursit
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Përdoruesit të cilët mund të miratojë aplikacione të lënë një punonjës të veçantë për
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Zyra Pajisje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Zyra Pajisje
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Kompanitë
 DocType: Supplier Scorecard,Scoring Setup,Vendosja e programit
@@ -2725,7 +2740,7 @@
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debi Për të është e nevojshme
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Blerje Lista e Çmimeve
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelet e variablave të rezultateve të rezultateve të furnizuesit.
 DocType: Job Offer Term,Offer Term,Term Oferta
 DocType: Asset,Quality Manager,Menaxheri Cilësia
@@ -2737,13 +2752,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Total papaguar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operacioni
 DocType: Supplier Scorecard,Supplier Score,Rezultati i Furnizuesit
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Gjithsej faturuara Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Gjithsej faturuara Amt
 DocType: Supplier,Warn RFQs,Paralajmëroj RFQ-të
 DocType: BOM,Conversion Rate,Shkalla e konvertimit
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Product Kërko
 DocType: Assessment Plan,To Time,Për Koha
 DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
+DocType: Loan,Total Amount Paid,Shuma totale e paguar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Ju lutemi zgjidhni Pranimin e Studentit i cili është i detyrueshëm për aplikantin e paguar të studentëve
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Ju lutemi zgjidhni listën e çmimeve për të publikuar çmimet
@@ -2753,19 +2769,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Kompletuar Qty nuk mund të jetë më shumë se {1} për funksionimin {2}
 DocType: Manufacturing Settings,Allow Overtime,Lejo jashtë orarit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, ju lutem, përdorni Stock Hyrja"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, ju lutem, përdorni Stock Hyrja"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, ju lutem, përdorni Stock Hyrja"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, ju lutem, përdorni Stock Hyrja"
 DocType: Training Event Employee,Training Event Employee,Trajnimi Event punonjës
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Mostrat maksimale - {0} mund të ruhen për Serinë {1} dhe Pikën {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Shtoni Vendndodhjet e Kohës
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Shkalla aktuale Vlerësimi
 DocType: Training Event,Advance,avancoj
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,për të bërë përsëritje përsëri.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Cilësimet e portës së pagesës GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange Gain / Humbje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange Gain / Humbje
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rreshti # {0}: Llogaria {1} nuk i përket kompanisë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rreshti # {0}: Llogaria {1} nuk i përket kompanisë {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},E pamundur për të gjetur DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
@@ -2784,7 +2799,6 @@
 DocType: Bin,Actual Quantity,Sasia aktuale
 DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonimi ka qenë {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Programi i Programit të Tarifave
 DocType: Fee Schedule Program,Student Batch,Batch Student
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,bëni Student
@@ -2800,14 +2814,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Jo Dorëzuar
 ,Bank Clearance Summary,Pastrimi Përmbledhje Banka
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
 DocType: Appraisal Goal,Appraisal Goal,Vlerësimi Qëllimi
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Sugjerojeni kategorinë?
 DocType: Stock Reconciliation Item,Current Amount,Shuma e tanishme
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Ndërtesat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Ndërtesat
 DocType: Fee Schedule,Fee Structure,Struktura Fee
 DocType: Timesheet Detail,Costing Amount,Kushton Shuma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
 DocType: Student Admission Program,Application Fee,Tarifë aplikimi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Submit Kuponi pagave
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Zbritje Maxiumm për Item {0} është {1}%
@@ -2815,12 +2828,13 @@
 DocType: Sales Partner,Address & Contacts,Adresa dhe Kontaktet
 DocType: SMS Log,Sender Name,Sender Emri
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Kriteret e Analizës së Bujqësisë
+DocType: HR Settings,Leave Approval Notification Template,Lëreni modelin e njoftimit të miratimit
 DocType: POS Profile,[Select],[Zgjidh]
 DocType: Vital Signs,Blood Pressure (diastolic),Presioni i gjakut (diastolik)
 DocType: SMS Log,Sent To,Dërguar në
 DocType: Agriculture Task,Holiday Management,Menaxhimi i Festave
 DocType: Payment Request,Make Sales Invoice,Bëni Sales Faturë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Programe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Programe
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
 DocType: Company,For Reference Only.,Vetëm për referencë.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Mjeku {0} nuk është i disponueshëm në {1}
@@ -2838,7 +2852,7 @@
 DocType: Employee,New Workplace,New Workplace
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Konsumi material
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Bëje si Mbyllur
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Nuk ka artikull me Barkodi {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Nuk ka artikull me Barkodi {0}
 DocType: Normal Test Items,Require Result Value,Kërkoni vlerën e rezultatit
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOM
@@ -2853,19 +2867,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Asnjë Struktura aktiv apo Paga parazgjedhur gjetur për punonjës {0} për të dhënë data
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Periodik
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detajet e modelit të përcaktimit të fluksit monetar
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Menaxhimi i Kredive
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track ardhurat veçantë dhe shpenzimet për verticals produkt apo ndarjet.
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Trego Paga Shqip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Trego Paga Shqip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Material Transferimi
 DocType: Fees,Send Payment Request,Dërgo Kërkesën për Pagesë
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
 DocType: Water Analysis,Origin,origjinë
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Llogaria Shuma Zgjidh ndryshim
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
@@ -2880,14 +2894,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,A është përgjegjësia e tatimit mbi të ardhurat
 DocType: Grading Scale Interval,Grade Description,Grade Përshkrimi
 DocType: Stock Entry,Purchase Receipt No,Pranimi Blerje Asnjë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Kaparosje
 DocType: Sales Invoice, Shipping Bill Number,Numër i llogarisë së transportit
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Gjurmimi
 DocType: Asset Maintenance Log,Actions performed,Veprimet e kryera
 DocType: Cash Flow Mapper,Section Leader,Drejtuesi i Seksionit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Punonjës
+DocType: Bank Guarantee,Fixed Deposit Number,Numri i depozitave fikse
 DocType: Asset Repair,Failure Date,Data e dështimit
 DocType: Sample Collection,Collected Time,Koha e mbledhur
 DocType: Company,Sales Monthly History,Historia mujore e shitjeve
@@ -2904,10 +2919,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Je i sigurt që dëshiron ta anulosh këtë takim?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paketa e Çmimeve të Dhomës së Hotelit
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales tubacionit
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Fetch Updates Updating
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Llogaria {0} nuk përputhet me Kompaninë {1} në Mode e Llogarisë: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kursi:
@@ -2917,7 +2933,7 @@
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Nuk u krijua urdhër pune
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Slip Paga e punonjësit të {0} krijuar tashmë për këtë periudhë
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutike
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
 DocType: Purchase Invoice,Credit To,Kredia për
@@ -2935,7 +2951,7 @@
 DocType: Request for Quotation Supplier,No Quote,Asnjë citim
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Gateway Account,Payment Account,Llogaria e pagesës
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompensues Off
 DocType: Job Offer,Accepted,Pranuar
@@ -2948,7 +2964,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ju lutem sigurohuni që ju me të vërtetë dëshironi të fshini të gjitha transaksionet për këtë kompani. Të dhënat tuaja mjeshtër do të mbetet ashtu siç është. Ky veprim nuk mund të zhbëhet.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Rezultatet e kërkimit
 DocType: Room,Room Number,Numri Room
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Referenca e pavlefshme {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Referenca e pavlefshme {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 DocType: Journal Entry Account,Payroll Entry,Hyrja në listën e pagave
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Shikoni Regjistrimet e Tarifave
@@ -2958,7 +2974,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Lab Test Sample,Lab Test Sample,Shembulli i testit të laboratorit
 DocType: Item Variant Settings,Allow Rename Attribute Value,Lejo rinumërimin e vlerës së atributeve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Hyrja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
 DocType: Restaurant,Invoice Series Prefix,Prefiksi i Serisë së Faturës
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
@@ -2966,8 +2982,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integrimi i Google Maps nuk është i aktivizuar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,Data e skadimit të anëtarësisë
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} duhet të jetë negative në dokumentin e kthimit
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} duhet të jetë negative në dokumentin e kthimit
 ,Minutes to First Response for Issues,Minuta për Përgjigje e parë për Çështje
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Emri i institutit për të cilat ju jeni të vendosur deri këtë sistem.
@@ -2986,7 +3003,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Njësia e Masës
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Mundësi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Mundësi
 DocType: Operation,Default Workstation,Gabim Workstation
 DocType: Notification Control,Expense Claim Approved Message,Shpenzim Kërkesa Miratuar mesazh
 DocType: Payment Entry,Deductions or Loss,Zbritjet apo Humbje
@@ -3024,7 +3041,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Dërgo Pa Paguhet nuk përputhet me të dhënat Leave Aplikimi miratuara
 DocType: Campaign,Campaign-.####,Fushata -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Bëni Faturë
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Bilanci i mbetur
@@ -3034,7 +3051,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fundi Viti
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Driver,Driver,shofer
 DocType: Vital Signs,Nutrition Values,Vlerat e të ushqyerit
 DocType: Lab Test Template,Is billable,Është e pagueshme
@@ -3045,7 +3062,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Aktuale Start Date (via Koha Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Gama plakjen 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Shuma totale e paradhënies nuk mund të jetë më e madhe se shuma totale e kërkuar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Shuma totale e paradhënies nuk mund të jetë më e madhe se shuma totale e kërkuar
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3080,7 +3097,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Zgjidhni vlerat e atributeve
 DocType: Purchase Invoice,Reason For Issuing document,Arsyeja për lëshimin e dokumentit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Next kontaktoni me nuk mund të jetë i njëjtë si adresë Lead Email
 DocType: Tax Rule,Billing City,Faturimi i qytetit
@@ -3097,7 +3114,8 @@
 DocType: Warranty Claim,Service Address,Shërbimi Adresa
 DocType: Asset Maintenance Task,Calibration,kalibrim
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} është një festë e kompanisë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures dhe Regjistrimet
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Lini Njoftimin e Statusit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures dhe Regjistrimet
 DocType: Item,Manufacture,Prodhim
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Kompani e konfigurimit
 ,Lab Test Report,Raporti i testimit të laboratorit
@@ -3113,7 +3131,6 @@
 DocType: Crop,Planting Area,Sipërfaqja e mbjelljes
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Kjo mund të jetë për shkak të disa adresave të pavlefshme të
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ju shtuar
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Rezultati Training
@@ -3123,16 +3140,17 @@
 DocType: Products Settings,Products per Page,Produktet per
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Mjeshtër degë organizatë.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Shpenzimet komunale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mbi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Ditari Hyrja {1} nuk ka llogari {2} ose tashmë krahasohen kundër një kupon
 DocType: Supplier Scorecard Criteria,Criteria Weight,Pesha e kritereve
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Lini Njoftimin e Miratimit
 DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Paga Bazuar në pasqyrë e mungesave
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Shkalla e Blerjes
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Shkalla e Blerjes
 DocType: Notification Control,Sales Order Message,Sales Rendit Mesazh
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Vlerat Default si Company, Valuta, vitin aktual fiskal, etj"
 DocType: Payment Entry,Payment Type,Lloji Pagesa
@@ -3155,6 +3173,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Cilësimet Shporta
 DocType: Journal Entry,Accounting Entries,Entries Kontabilitetit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nëse Rregullimi i Përcaktuar i Çmimeve është bërë për &#39;Rate&#39;, ajo do të mbishkruajë Listën e Çmimeve. Norma e çmimeve të tarifës është norma përfundimtare, kështu që nuk duhet të aplikohet ulje e mëtejshme. Prandaj, në transaksione si Sales Order, Order Purchase etc, do të kërkohet në fushën &#39;Rate&#39;, në vend të &#39;Rate Rate Rate&#39; fushë."
+DocType: Journal Entry,Paid Loan,Kredia e paguar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate Hyrja. Ju lutem kontrolloni Autorizimi Rregulla {0}
 DocType: Journal Entry Account,Reference Due Date,Data e duhur e referimit
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3171,7 +3190,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
 DocType: Patient Service Unit,Parent Service Unit,Njësia e Shërbimit të Prindërve
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,bëni përdoruesin
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikimi i paketës për shpërndarjen (për shtyp)
@@ -3190,7 +3209,7 @@
 DocType: Shareholder,SH-,sh-
 DocType: Account,Income Account,Llogaria ardhurat
 DocType: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Ofrimit të
 DocType: Volunteer,Weekdays,gjatë ditëve të javës
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: Restaurant Menu,Restaurant Menu,Menuja e Restorantit
@@ -3198,7 +3217,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Bëje llogari inventarit parazgjedhur për inventarit të përhershëm
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Bëje llogari inventarit parazgjedhur për inventarit të përhershëm
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Dërgo Grant Rishikimi Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage është e plotë, nuk ka shpëtuar"
@@ -3206,10 +3225,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Kapaciteti i dhomës
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Tashmë ekziston regjistri për artikullin {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Ju do të humbni regjistrat e faturave të krijuara më parë. Jeni i sigurt se doni të rifilloni këtë pajtim?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Taksa e regjistrimit
 DocType: Budget,Cost Center,Qendra Kosto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Kupon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Kupon #
 DocType: Notification Control,Purchase Order Message,Rendit Blerje mesazh
 DocType: Tax Rule,Shipping Country,Shipping Vendi
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Fshih Id Tatimore e konsumatorit nga transaksionet e shitjeve
@@ -3218,20 +3238,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rregulla e Çmimeve është bërë për të prishësh LISTA E ÇMIMEVE / definojnë përqindje zbritje, në bazë të disa kritereve."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazina mund të ndryshohet vetëm përmes Stock Hyrja / dorëzimit Shënim / Pranimi Blerje
 DocType: Employee Education,Class / Percentage,Klasa / Përqindja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Tatimi mbi të ardhurat
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Shkoni te Letrat me Letër
+DocType: Subscription,Cancel At End Of Period,Anulo në fund të periudhës
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Asnjë artikull i përzgjedhur për transferim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Asnjë artikull i përzgjedhur për transferim
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
 DocType: Vehicle,Electric,elektrik
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Gain / Humbja në hedhjen e Aseteve
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Gain / Humbja në hedhjen e Aseteve
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Në tabelën e mëposhtme do të përzgjidhen vetëm Aplikuesi i Studentit me statusin &quot;Miratuar&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Numri i llogarisë për llogarinë {0} nuk është në dispozicion. <br> Ju lutemi konfiguroni saktë skedën e llogarive tuaja.
 DocType: Task,Depends on Tasks,Varet Detyrat
@@ -3246,6 +3267,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Jo në magazinë
 DocType: Volunteer,Volunteer Skills,Aftësitë vullnetare
 DocType: Appraisal,HR User,HR User
+DocType: Bank Guarantee,Reference Document Name,Emri i Dokumentit të Referencës
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taksat dhe Tarifat zbritet
 apps/erpnext/erpnext/hooks.py +142,Issues,Çështjet
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusi duhet të jetë një nga {0}
@@ -3259,7 +3281,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Shumë i madh
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Shumë i madh
+DocType: Loan,Loan Application,Aplikimi i huasë
 DocType: Crop,Scientific Name,Emer shkencor
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,gjithsej Leaves
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Reselect, nëse kontakti i zgjedhur është redaktuar pas ruajtjes"
@@ -3268,13 +3291,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Numri çek
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,I madh
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,I madh
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Të gjitha grupet e vlerësimit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Të gjitha grupet e vlerësimit
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Magazina Emri
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territor
@@ -3295,9 +3318,10 @@
 DocType: Fees,Fees,tarifat
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specifikoni Exchange Rate për të kthyer një monedhë në një tjetër
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Citat {0} është anuluar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Shuma totale Outstanding
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Shuma totale Outstanding
 DocType: Sales Partner,Targets,Synimet
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Regjistro numrin e SIREN në dosjen e informacionit të kompanisë
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 DocType: Price List,Price List Master,Lista e Çmimeve Master
 DocType: GST Account,CESS Account,Llogaria CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
@@ -3306,6 +3330,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Zgjidh Patient
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Emri i parametrit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; dhe &#39;refuzuar&#39; mund të dorëzohet
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student Group Emri është i detyrueshëm në rresht {0}
 DocType: Homepage,Products to be shown on website homepage,Produktet që do të shfaqet në faqen e internetit
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
@@ -3339,14 +3364,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Fatura tashmë është krijuar për të gjitha orët e faturimit
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Emri error: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Është kostoja e financimit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vendosni klientin e parazgjedhur në Cilësimet e Restorantit
 ,Salary Register,Paga Regjistrohu
 DocType: Warehouse,Parent Warehouse,Magazina Parent
-DocType: C-Form Invoice Detail,Net Total,Net Total
+DocType: Subscription,Net Total,Net Total
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Default BOM nuk u gjet për Item {0} dhe Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Përcaktojnë lloje të ndryshme të kredive
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Përcaktojnë lloje të ndryshme të kredive
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Shuma Outstanding
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Koha (në minuta)
@@ -3378,11 +3403,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root Llogaria duhet të jetë një grup i
 DocType: Drug Prescription,Drug Prescription,Prescription e drogës
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Paguhet / Mbyllur
+DocType: Loan,Repaid/Closed,Paguhet / Mbyllur
 DocType: Item,Total Projected Qty,Total projektuar Qty
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Shkalla e vlerësimit nuk është gjetur për Item {0}, e cila kërkohet të bëjë shënime të kontabilitetit për {1} {2}. Nëse artikulli është duke u kryer si një zë zero vlerësimi në {1}, ju lutemi përmendni atë në tabelën {1} Item. Përndryshe, ju lutemi krijoni një transaksion të aksioneve në hyrje për artikullin ose përmendni normën e vlerësimit në regjistrin e artikullit dhe pastaj provoni paraqitjen / anulimin e këtij hyrjes"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kodi Kursi
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: POS Settings,Use POS in Offline Mode,Përdorni POS në modalitetin Offline
@@ -3402,16 +3426,15 @@
 DocType: Purchase Invoice,Deemed Export,Shqyrtuar Eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Përqindja zbritje mund të aplikohet ose ndaj një listë të çmimeve apo për të gjithë listën e çmimeve.
-DocType: Subscription,Half-yearly,Gjashtëmujor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Lab Test,LabTest Approver,Aprovuesi i LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ju kanë vlerësuar tashmë me kriteret e vlerësimit {}.
 DocType: Vehicle Service,Engine Oil,Vaj makine
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Rendi i punës i krijuar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Rendi i punës i krijuar: {0}
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
-DocType: Employee Loan,Loan Details,kredi Details
+DocType: Loan,Loan Details,kredi Details
 DocType: Company,Default Inventory Account,Llogaria Default Inventar
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Numrat e folio nuk përputhen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Kompletuar Qty duhet të jetë më e madhe se zero.
@@ -3423,19 +3446,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Një lidhje me të gjitha Njësitë Tokësore në të cilat Pri rritet
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nuk mund të kthehet më shumë se {1} për Item {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nuk mund të kthehet më shumë se {1} për Item {2}
 DocType: Item Group,Show this slideshow at the top of the page,Trego këtë slideshow në krye të faqes
 DocType: BOM,Item UOM,Item UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Shuma e taksave Pas Shuma ulje (Kompania Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
 DocType: Cheque Print Template,Primary Settings,Parametrat kryesore
 DocType: Purchase Invoice,Select Supplier Address,Zgjidh Furnizuesi Adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Shto Punonjës
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Shto Punonjës
 DocType: Purchase Invoice Item,Quality Inspection,Cilësia Inspektimi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Vogla
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Vogla
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
 DocType: Payment Request,Mute Email,Mute Email
@@ -3455,11 +3478,10 @@
 DocType: SMS Log,No of Sent SMS,Nr i SMS dërguar
 DocType: Antibiotic,Healthcare Administrator,Administrator i Shëndetësisë
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Vendosni një Target
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
 DocType: Dosage Strength,Dosage Strength,Forca e dozimit
 DocType: Account,Expense Account,Llogaria shpenzim
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Program
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Ngjyra
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Ngjyra
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteret plan vlerësimi
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Data e skadencës është e detyrueshme për artikullin e zgjedhur
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Parandalimi i urdhrave të blerjes
@@ -3472,18 +3494,18 @@
 DocType: Patient,Personal and Social History,Historia personale dhe sociale
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Përdoruesi {0} krijoi
 DocType: Fee Schedule,Fee Breakup for each student,Shkëputja e taksës për secilin nxënës
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Ndrysho kodin
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,naftë
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Student Pjesëmarrja mujore Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Rregullat e transportit të aplikueshme vetëm për shitjen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Deri
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupi Student ose Course Orari është i detyrueshëm
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grupi Student ose Course Orari është i detyrueshëm
@@ -3504,7 +3526,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listoni produktet ose shërbimet që bleni ose sillni.
 DocType: Water Analysis,Storage Temperature,Temperatura e magazinimit
 DocType: Employee Attendance Tool,Unmarked Attendance,Pjesëmarrja pashënuar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Studiues
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Studiues
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Regjistrimi Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Data e fillimit duhet të jetë më pak se data e përfundimit të detyrës {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Emri ose adresa është e detyrueshme
@@ -3517,7 +3539,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe RFQ-të për këtë furnizues duhet të lëshohen me kujdes."
 DocType: Chapter,Non Profit Manager,Menaxheri i Jofitimit
 DocType: BOM,Total Cost(Company Currency),Kosto totale (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial Asnjë {0} krijuar
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial Asnjë {0} krijuar
 DocType: Homepage,Company Description for website homepage,Përshkrimi i kompanisë për faqen e internetit
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Emri suplier
@@ -3527,11 +3549,10 @@
 DocType: Employee,You can enter any date manually,Ju mund të hyjë në çdo datë me dorë
 DocType: Healthcare Settings,Result Printed,Rezultati Printuar
 DocType: Asset Category Account,Depreciation Expense Account,Llogaria Zhvlerësimi Shpenzimet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Periudha provuese
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Shiko {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Periudha provuese
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Project,Total Costing Amount (via Timesheets),Shuma totale e kostos (përmes Timesheets)
-DocType: Employee Advance,Expense Approver,Shpenzim aprovuesi
+DocType: Department,Expense Approver,Shpenzim aprovuesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
 DocType: Project,Hourly,çdo orë
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Non-Group Grupit
@@ -3541,7 +3562,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Për datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,Të bëjë pagesën përmes Journal Hyrja
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Shtypur On
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Shtypur On
 DocType: Item,Inspection Required before Delivery,Inspektimi i nevojshëm para dorëzimit
 DocType: Item,Inspection Required before Purchase,Inspektimi i nevojshëm para se Blerja
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivitetet në pritje
@@ -3551,7 +3572,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Sasia minimale e porosisë
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Organizata juaj
 DocType: Fee Component,Fees Category,tarifat Category
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Sasia
 DocType: Supplier Scorecard,Notify Employee,Njoftoni punonjësin
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shkruani emrin e fushatës nëse burimi i hetimit është fushatë
@@ -3561,7 +3582,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Reorder Niveli
 DocType: Company,Chart Of Accounts Template,Chart e Llogarive Stampa
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazina pranuar
@@ -3569,10 +3590,11 @@
 DocType: Item,Valuation Method,Vlerësimi Metoda
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Gjysma Dita
 DocType: Sales Invoice,Sales Team,Sales Ekipi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Hyrja Duplicate
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Hyrja Duplicate
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Futni emrin e Përfituesit para se të dorëzoni.
 DocType: Program Enrollment Tool,Get Students,Get Studentët
 DocType: Serial No,Under Warranty,Nën garanci
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Gabim]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Gabim]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Me fjalë do të jetë i dukshëm një herë ju ruani Rendit Sales.
 ,Employee Birthday,Punonjës Ditëlindja
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Ju lutemi zgjidhni Data e Përfundimit për Riparimin e Përfunduar
@@ -3591,7 +3613,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Rezervuar për nën-kontraktim
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
 DocType: Shopping Cart Settings,Orders,Urdhërat
-DocType: Employee Leave Approver,Leave Approver,Lini aprovuesi
+DocType: Department,Leave Approver,Lini aprovuesi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Ju lutem, përzgjidhni një grumbull"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Emri Grupi i Vlerësimit
@@ -3636,7 +3658,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Objekti i artikullit të përgjuar
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL për RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Kjo email është autogenerated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Vlera e pritshme pas së dobishme
@@ -3661,22 +3682,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Pjesëmarrja Record {0} ekziston kundër Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Zhvlerësimi Eliminuar shkak të dispozicion të aseteve
-DocType: Member,Member,anëtar
+DocType: Loan,Member,anëtar
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Adresat
 DocType: Work Order Item,Work Order Item,Artikulli i Renditjes së Punës
 DocType: Pricing Rule,Item Code,Kodi i artikullit
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Menaxheri i Bujqësisë
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
 DocType: Supplier Scorecard Period,Variables,Variablat
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Mbyllja (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Size
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
 DocType: Sales Invoice,Write Off Outstanding Amount,Shkruani Off Outstanding Shuma
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Llogaria {0} nuk përputhet me Kompaninë {1}
@@ -3684,7 +3705,6 @@
 DocType: Stock Settings,Default Stock UOM,Gabim Stock UOM
 DocType: Asset,Number of Depreciations Booked,Numri i nënçmime rezervuar
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qty Total
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Kundër Huazim e punonjësve: {0}
 DocType: Landed Cost Item,Receipt Document,Dokumenti Receipt
 DocType: Employee Education,School/University,Shkolla / Universiteti
 DocType: Payment Request,Reference Details,Referenca Detajet
@@ -3695,7 +3715,7 @@
 DocType: Asset,Double Declining Balance,Dyfishtë rënie Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,mënyrë të mbyllura nuk mund të anulohet. Hap për të anulluar.
 DocType: Student Guardian,Father,Atë
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 DocType: Attendance,On Leave,Në ikje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
@@ -3709,10 +3729,10 @@
 DocType: Lead,Lower Income,Të ardhurat më të ulëta
 DocType: Restaurant Order Entry,Current Order,Rendi aktual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Burimi dhe depo objektiv nuk mund të jetë i njëjtë për të rresht {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Shkoni te Programet
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rresht {0} # Shuma e alokuar {1} nuk mund të jetë më e madhe se shuma e pakushtuar {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rresht {0} # Shuma e alokuar {1} nuk mund të jetë më e madhe se shuma e pakushtuar {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
@@ -3735,7 +3755,6 @@
 DocType: Payment Terms Template,Payment Terms,Kushtet e pagesës
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minutë
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Shko tek Furnizuesit
@@ -3755,30 +3774,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Ju lutemi vendosni ID Email për Studentin për të dërguar Kërkesën e Pagesës
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Ju lutemi vendosni ID Email për Studentin për të dërguar Kërkesën e Pagesës
 DocType: Patient,Medical History,Histori mjekesore
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Llogaria Overdraft Banka
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Llogaria Overdraft Banka
 DocType: Patient,Patient ID,ID e pacientit
 DocType: Physician Schedule,Schedule Name,Orari Emri
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Bëni Kuponi pagave
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Shto të Gjithë Furnizuesit
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Shto të Gjithë Furnizuesit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Shuma e ndarë nuk mund të jetë më e madhe se shuma e papaguar.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Shfleto bom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Kredi të siguruara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Kredi të siguruara
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Posting Data dhe Koha
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ju lutemi të vendosur Llogaritë zhvlerësimit lidhur në Kategorinë Aseteve {0} ose kompanisë {1}
 DocType: Lab Test Groups,Normal Range,Gama normale
 DocType: Academic Term,Academic Year,Vit akademik
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Shitja në dispozicion
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Hapja Bilanci ekuitetit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Hapja Bilanci ekuitetit
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,mbetur
 DocType: Appraisal,Appraisal,Vlerësim
+DocType: Loan,Loan Account,Llogaria e huasë
 DocType: Purchase Invoice,GST Details,Detajet e GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email dërguar për furnizuesit {0}
 DocType: Item,Default Sales Unit of Measure,Njësia e shitjes së paracaktuar të masës
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Vit akademik:
+DocType: Subscription,Past Due Date,Data e Kaluar e Kaluar
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Mos lejoni të vendosni elementin alternativ për artikullin {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data përsëritet
@@ -3791,7 +3812,7 @@
 DocType: Patient Appointment,Patient Appointment,Emërimi i pacientit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Miratimi Rolit nuk mund të jetë i njëjtë si rolin rregulli është i zbatueshëm për
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Çabonoheni nga ky Dërgoje Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Merrni Furnizuesit Nga
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Merrni Furnizuesit Nga
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} nuk u gjet për Item {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Shkoni në Kurse
 DocType: Accounts Settings,Show Inclusive Tax In Print,Trego taksën përfshirëse në shtyp
@@ -3799,10 +3820,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesazh dërguar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Llogari me nyje të fëmijëve nuk mund të vendosen si librit
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim&gt; Cilësimet e Arsimit
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në bazë monedhën klientit
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Shuma neto (Kompania Valuta)
 DocType: Physician,Physician Schedules,Oraret e mjekut
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Shuma totale e paradhënies nuk mund të jetë më e madhe se shuma totale e sanksionuar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Shuma totale e paradhënies nuk mund të jetë më e madhe se shuma totale e sanksionuar
 DocType: Salary Slip,Hour Rate,Ore Rate
 DocType: Stock Settings,Item Naming By,Item Emërtimi By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
@@ -3820,6 +3842,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nuk lejohet të përtërini transaksioneve të aksioneve të vjetër se {0}
 DocType: BOM,Inspection Required,Kerkohet Inspektimi
 DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Shkruani numrin e garancisë së Bankës përpara se të dorëzoni.
 DocType: Driving License Category,Class,klasë
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Rendi i punës nuk mund të ngrihet kundër një modeli artikull
@@ -3830,7 +3853,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim&gt; Cilësimet e Arsimit
 DocType: Serial No,Is Cancelled,Është anuluar
 DocType: Student Group,Group Based On,Grupi i bazuar në
 DocType: Student Group,Group Based On,Grupi i bazuar në
@@ -3842,9 +3864,10 @@
 DocType: Cheque Print Template,Cheque Height,Çek Lartësia
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
 DocType: Setup Progress,Setup Progress,Progresi i konfigurimit
+DocType: Expense Claim,Approval Status,Miratimi Statusi
 DocType: Hub Settings,Publish Items to Hub,Botojë artikuj për Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Nga Vlera duhet të jetë më pak se të vlerës në rresht {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,kontrollo të gjitha
 ,Issued Items Against Work Order,Lëshuar Artikuj Kundër Rendit Punë
 DocType: Vehicle Log,Invoice Ref,faturë Ref
@@ -3875,12 +3898,11 @@
 DocType: Customs Tariff Number,Tariff Number,Numri Tarifa
 DocType: Work Order Item,Available Qty at WIP Warehouse,Qty në dispozicion në WIP Magazina
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projektuar
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
-DocType: Employee Loan,Employee Loan Application,Punonjës Loan Application
 DocType: Issue,Opening Date,Hapja Data
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Ju lutemi ruani pacientin së pari
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Ju lutemi ruani pacientin së pari
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Pjesëmarrja është shënuar sukses.
 DocType: Program Enrollment,Public Transport,Transporti publik
 DocType: Soil Texture,Silt Composition (%),Përbërja (%)
@@ -3899,7 +3921,7 @@
 ,Item Balance (Simple),Bilanci i artikullit (I thjeshtë)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
 DocType: POS Profile,Write Off Account,Shkruani Off Llogari
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debit Shënim AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debit Shënim AMT
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Shuma Discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
@@ -3922,6 +3944,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Sales Order Data
 DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
 DocType: Assessment Plan,Assessment Plan,Plani i vlerësimit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Hyrja Reverse Journal
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klienti {0} është krijuar.
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Aktualisht nuk ka të aksioneve në dispozicion në ndonjë depo
@@ -3935,14 +3958,15 @@
 DocType: Journal Entry,Stock Entry,Stock Hyrja
 DocType: Payment Entry,Payment References,Referencat e pagesës
 DocType: C-Form,C-FORM-,C-pritet të marrin
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Numri i intervaleve për fushën e intervalit p.sh. nëse Interval është &#39;Ditë&#39; dhe Numërimi i Intervale i Faturimit është 3, faturat do të gjenerohen çdo 3 ditë"
 DocType: Vehicle,Insurance Details,Details Insurance
 DocType: Account,Payable,Për t&#39;u paguar
 DocType: Share Balance,Share Type,Lloji i aksioneve
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ju lutemi shkruani Periudhat Ripagimi
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Ju lutemi shkruani Periudhat Ripagimi
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Debitorët ({0})
 DocType: Pricing Rule,Margin,diferencë
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Klientët e Rinj
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto% Fitimi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto% Fitimi
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Ndrysho Profilin e POS
 DocType: Bank Reconciliation Detail,Clearance Date,Pastrimi Data
@@ -3952,10 +3976,11 @@
 DocType: Lead,Address Desc,Adresuar Përshkrimi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partia është e detyrueshme
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rreshtat me datat e dyfishta të gjetjeve në rreshta të tjerë u gjetën: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rreshtat me datat e dyfishta të gjetjeve në rreshta të tjerë u gjetën: {list}
 DocType: Topic,Topic Name,Topic Emri
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Vendosni modelin e parazgjedhur për Njoftimin e Miratimit të Lëshimit në Cilësimet e HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Atleast një nga shitjen apo blerjen duhet të zgjidhen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Përzgjidhni një punonjës që të merrni punonjësin përpara.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Përzgjidhni një punonjës që të merrni punonjësin përpara.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Zgjidh një datë të vlefshme
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Zgjidhni natyrën e biznesit tuaj.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3974,7 +3999,7 @@
 DocType: Asset Movement,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Libri i aksioneve
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Fatura Sales {0} krijuar
 DocType: Employee,Confirmation Date,Konfirmimi Data
 DocType: C-Form,Total Invoiced Amount,Shuma totale e faturuar
@@ -3983,7 +4008,7 @@
 DocType: Account,Accumulated Depreciation,Zhvlerësimi i akumuluar
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Emri i Përhershëm
 DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
-DocType: Employee Loan Application,Required by Date,Kërkohet nga Data
+DocType: Loan Application,Required by Date,Kërkohet nga Data
 DocType: Lead,Lead Owner,Lead Owner
 DocType: Production Plan,Sales Orders Detail,Detajet e porosive të shitjeve
 DocType: Bin,Requested Quantity,kërkohet Sasia
@@ -3996,10 +4021,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Zbritja Total - shlyerjen e kredisë
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Paga Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variante të shumëfishta
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dorëzuar
+DocType: Subscription,Trial Period Start Date,Data e fillimit të periudhës së gjykimit
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Ju lutemi identifikohuni si një përdorues tjetër.
@@ -4020,12 +4046,11 @@
 DocType: Student Guardian,Student Guardian,Guardian Student
 DocType: Member,Member Name,Emri i Anëtarit
 DocType: Stock Settings,Use Naming Series,Përdorni Serinë Naming
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,në abonim
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 DocType: Membership,Payment Details,Detajet e pagesës
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Bom Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Ndalohet Rendi i Punës nuk mund të anulohet, të anullohet së pari të anulohet"
 DocType: Asset,Journal Entry for Scrap,Journal Hyrja për skrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
@@ -4045,6 +4070,7 @@
 DocType: Land Unit,Land Unit,Njësia e Tokës
 ,Purchase Analytics,Analytics Blerje
 DocType: Sales Invoice Item,Delivery Note Item,Ofrimit Shënim Item
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Fatura aktuale {0} mungon
 DocType: Asset Maintenance Log,Task,Detyrë
 DocType: Purchase Taxes and Charges,Reference Row #,Referenca Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
@@ -4057,7 +4083,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / Humbja e llogarisë
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Punonjës dhe Pjesëmarrja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forumi Komuniteti
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Qty aktuale në magazinë
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Qty aktuale në magazinë
@@ -4072,7 +4098,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard Shitja Vlerësoni
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
 DocType: Cash Flow Mapper,Section Name,Emri i seksionit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Reorder Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hapje e tanishme e punës
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Shkruani Off
@@ -4083,9 +4109,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Në pritje për përditësimin e çmimit të fundit në të gjitha dokumentet e materialeve. Mund të duhen disa minuta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Emri i llogarisë së re. Shënim: Ju lutem mos krijoni llogari për klientët dhe furnizuesit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Klientit&gt; Territori
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Shteti parazgjedhur i mençur Adresa Templates
 DocType: Water Analysis,Appearance,shfaqje
+DocType: HR Settings,Leave Status Notification Template,Lëreni Modulin e Njoftimit të Statusit
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Blerja e çmimit të listës së çmimeve
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Informacioni i anëtarit.
@@ -4108,7 +4134,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Nuk lejohet. Ju lutemi disable Template Test
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
 DocType: Crop Cycle,Linked Land Unit,Njësia e lidhur tokësore
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
@@ -4124,7 +4150,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Shko te Përdoruesit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN pavlefshme ose Shkruani NA për paregjistruar
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tarifa Regjistrimi
@@ -4140,14 +4166,14 @@
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 DocType: Company,Create Chart Of Accounts Based On,Krijoni planin kontabël në bazë të
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Nuk mund të konvertohet në jo-grup. Detyrat e fëmijëve ekzistojnë.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
 ,Stock Ageing,Stock plakjen
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} ekzistojnë kundër aplikantit studentore {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Rregullimi i Llogaritjeve (Valuta e Kompanisë)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,pasqyrë e mungesave
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,pasdite
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Cheque Print Template,Scanned Cheque,skanuar çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
@@ -4163,7 +4189,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projekti {0} tashmë ekziston
 DocType: Medical Department,Nursing User,Përdorues i Infermierisë
 DocType: Plant Analysis,Plant Analysis Criterias,Kriteret e Analizës së Bimëve
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Përgjegjësitë
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} nuk i përket Grumbullit {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Përgjegjësitë
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Periudha e vlefshmërisë së këtij citati ka përfunduar.
 DocType: Expense Claim Account,Expense Claim Account,Llogaria Expense Kërkesa
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lejoni shkëmbimin e stale të këmbimit
@@ -4185,11 +4212,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Bëni variantet
 DocType: Item,Default BOM,Gabim bom
 DocType: Project,Total Billed Amount (via Sales Invoices),Shuma Totale e Faturuar (përmes Faturat e Shitjes)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debit Shënim Shuma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debit Shënim Shuma
 DocType: Project Update,Not Updated,Nuk është përditësuar
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Ka mospërputhje në mes të normës, jo të aksioneve dhe shumës së llogaritur"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Outstanding Amt Total
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Outstanding Amt Total
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
 DocType: Employee Advance,Advance Account,Llogaria paraprake
 DocType: Job Offer,Job Offer Terms,Termat e ofertës së punës
@@ -4198,7 +4225,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automobilistik
 DocType: Vehicle,Insurance Company,Kompania e sigurimeve
 DocType: Asset Category Account,Fixed Asset Account,Llogaria Fixed Asset
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,variabël
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,variabël
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nga dorëzim Shënim
 DocType: Chapter,Members,Anëtarët
 DocType: Student,Student Email Address,Student Email Adresa
@@ -4221,7 +4248,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Mjek praktikant
 DocType: Delivery Stop,Address Name,adresa Emri
 DocType: Stock Entry,From BOM,Nga bom
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Ndarja e {0} njësive të {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Ndarja e {0} njësive të {1}
 DocType: Assessment Code,Assessment Code,Kodi i vlerësimit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
@@ -4229,25 +4256,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
 DocType: Bank Reconciliation Detail,Payment Document,Dokumenti pagesa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Gabim gjatë vlerësimit të formulës së kritereve
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
+DocType: Subscription,Plans,planet
 DocType: Salary Slip,Salary Structure,Struktura e pagave
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Materiali çështje
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ndodhi një gabim gjatë krijimit të përsëritjes
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Materiali çështje
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Nuk Grupet Student krijuar.
 DocType: Purchase Invoice Item,Serial No,Serial Asnjë
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Shuma mujore e pagesës nuk mund të jetë më e madhe se Shuma e Kredisë
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Shuma mujore e pagesës nuk mund të jetë më e madhe se Shuma e Kredisë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rreshti # {0}: Data e pritshme e dorëzimit nuk mund të jetë para datës së porosisë së blerjes
 DocType: Purchase Invoice,Print Language,Print Gjuha
 DocType: Salary Slip,Total Working Hours,Gjithsej Orari i punës
 DocType: Sales Invoice,Customer PO Details,Detajet e Klientit
-DocType: Subscription,Next Schedule Date,Data e ardhshme e orarit
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Llogaria e hapjes së përkohshme
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
@@ -4275,11 +4301,11 @@
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Nga dhe në datat e kërkuara
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Asnjë punonjës për kriteret e përmendura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
 DocType: Hotel Settings,Default Customer,Customer Default
 DocType: Assessment Plan,Supervisor Name,Emri Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Mos konfirmoni nëse emërimi është krijuar për të njëjtën ditë
@@ -4303,16 +4329,16 @@
 DocType: Journal Entry Account,Employee Advance,Advance punonjës
 DocType: Payroll Entry,Payroll Frequency,Payroll Frekuenca
 DocType: Lab Test Template,Sensitivity,ndjeshmëri
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Raw Material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Bimët dhe makineri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Bimët dhe makineri
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily Settings Përmbledhje Work
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Ju lutemi shkruani Reqd by Date
 DocType: Payment Entry,Internal Transfer,Transfer të brendshme
 DocType: Asset Maintenance,Maintenance Tasks,Detyrat e Mirmbajtjes
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ose Qty objektiv ose shuma e synuar është e detyrueshme
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
 DocType: Leave Control Panel,Carry Forward,Bart
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në Ledger
@@ -4320,13 +4346,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Integrimet ERPNext
 DocType: Crop Cycle,Detected Disease,Zbulohet Sëmundja
 ,Produced,Prodhuar
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Data e fillimit të ripagimit nuk mund të jetë para datës së disbursimit.
 DocType: Item,Item Code for Suppliers,Item Kodi për Furnizuesit
 DocType: Issue,Raised By (Email),Ngritur nga (Email)
 DocType: Training Event,Trainer Name,Emri trajner
 DocType: Mode of Payment,General,I përgjithshëm
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikimi i fundit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos kërkuar për Item serialized {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos kërkuar për Item serialized {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Pagesat ndeshje me faturat
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
@@ -4340,7 +4367,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Enable / disable monedhave.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} në Ditën e Gjashtë Ditëve në {1}
 DocType: Production Plan,Get Material Request,Get materiale Kërkesë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Shpenzimet postare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Shpenzimet postare
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 ,Item Variant Details,Detajet e variantit të artikullit
@@ -4351,9 +4378,9 @@
 DocType: Drug Prescription,Hour,Orë
 DocType: Restaurant Order Entry,Last Sales Invoice,Fatura e shitjeve të fundit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Ju lutem zgjidhni Qty kundër sendit {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 DocType: Company,Monthly Sales Target,Synimi i shitjeve mujore
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
@@ -4361,7 +4388,7 @@
 DocType: Item,Default Material Request Type,Default Kërkesa Tipe Materiali
 DocType: Supplier Scorecard,Evaluation Period,Periudha e vlerësimit
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,I panjohur
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Rendi i punës nuk është krijuar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Rendi i punës nuk është krijuar
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: Purchase Invoice,Export Type,Lloji i eksportit
 DocType: Salary Slip Loan,Salary Slip Loan,Kredia për paga
@@ -4377,7 +4404,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Përmbledhja e hapjes së faturave
 DocType: Education Settings,Education Manager,Menaxher i Arsimit
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Gjatësia minimale në mes të çdo impianti në fushë për rritje optimale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, në vend që të përdorin Stock Hyrja"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} nuk mund të përditësohet duke përdorur Stock pajtimit, në vend që të përdorin Stock Hyrja"
 DocType: Quality Inspection,Report Date,Raporti Data
 DocType: Student,Middle Name,emri i dytë
 DocType: C-Form,Invoices,Faturat
@@ -4407,20 +4434,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Faturë
 ,Sales Register,Shitjet Regjistrohu
 DocType: Daily Work Summary Group,Send Emails At,Dërgo email Në
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Shiko formularin
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Provuesi i shpenzimeve është i detyrueshëm në kërkesë për shpenzime
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Shtojini përdoruesit në organizatën tuaj, përveç vetes."
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Nuk ka Konsumatorët akoma!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pasqyra Cash Flow
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Asnjë kërkesë materiale nuk është krijuar
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Liçensë
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
@@ -4443,11 +4471,12 @@
 DocType: Vehicle,Chassis No,Shasia No
 DocType: Payment Request,Initiated,Iniciuar
 DocType: Production Plan Item,Planned Start Date,Planifikuar Data e Fillimit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Ju lutem zgjidhni një BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Ju lutem zgjidhni një BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Availed ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
+DocType: Bank Guarantee,Clauses and Conditions,Klauzola dhe Kushtet
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
 DocType: Project Task,View Timesheet,Shiko pamjen time
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Data e përfundimit duhet të jetë më e madhe se data e fillimit
 DocType: Leave Type,Is Encash,Është marr me para në dorë
 DocType: Leave Allocation,New Leaves Allocated,Gjethet e reja të alokuar
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
@@ -4461,9 +4490,10 @@
 DocType: Patient,Alcohol Current Use,Përdorimi aktual i alkoolit
 DocType: Student Admission Program,Student Admission Program,Programi i pranimit të studentëve
 DocType: Payment Entry,Account Paid To,Llogaria Paid To
+DocType: Subscription Settings,Grace Period,Periudha e Grace
 DocType: Item Alternative,Alternative Item Name,Emri i artikullit alternativ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Nuk mund të paraqiste ndonjë gabim pagese <br> \ Arsyet e mundshme: <br> \ 1. Pagesa neto është më e vogël se 0. <br> \ 2. Adresa e emailit e kompanisë e përcaktuar në zotëruesin e punonjësve nuk është e vlefshme. <br>
@@ -4473,7 +4503,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Buxheti për Llogarinë {1} kundër {2} {3} është {4}. Ajo do të kalojë nga {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Nga Qty
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,dhe unchcked Disabled në
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Seria është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Shërbimet Financiare
 DocType: Student Sibling,Student ID,ID Student
@@ -4485,14 +4514,16 @@
 DocType: Complaint,Complaint,ankim
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Bëni hyrjen e ripagimit
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Të gjitha Departamentet
 DocType: Patient,Alcohol Past Use,Përdorimi i mëparshëm i alkoolit
 DocType: Fertilizer Content,Fertilizer Content,Përmbajtja e plehut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematike / Stuck
 DocType: Tax Rule,Billing State,Shteti Faturimi
 DocType: Share Transfer,Transfer,Transferim
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Urdhri i Punës {0} duhet të anulohet para se të anulohet ky Urdhër Shitje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
@@ -4516,10 +4547,11 @@
 DocType: Cheque Print Template,Message to show,Mesazhi për të treguar
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Me pakicë
 DocType: Student Attendance,Absent,Që mungon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle produkt
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Nuk mund të gjej rezultatin duke filluar nga {0}. Duhet të kesh pikët e qendrës që mbulojnë 0 deri në 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
+DocType: Subscription,Current Invoice Start Date,Data Fillestare e Faturës
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ose debiti ose shuma e kredisë është e nevojshme për {2}
 DocType: GL Entry,Remarks,Vërejtje
@@ -4529,11 +4561,13 @@
 DocType: Task,Parent Task,Detyra e Prindit
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,bëni Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print dhe Stationery
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print dhe Stationery
 DocType: Stock Settings,Show Barcode Field,Trego Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Dërgo email furnizuesi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Paga përpunuar tashmë për periudhën ndërmjet {0} dhe {1}, Lini periudha e aplikimit nuk mund të jetë në mes të këtyre datave."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Dërgo email furnizuesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Paga përpunuar tashmë për periudhën ndërmjet {0} dhe {1}, Lini periudha e aplikimit nuk mund të jetë në mes të këtyre datave."
+DocType: Fiscal Year,Auto Created,Krijuar automatikisht
 DocType: Chapter Member,Leave Reason,Lëreni Arsyen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faturë {0} nuk ekziston më
 DocType: Guardian Interest,Guardian Interest,Guardian Interesi
 DocType: Volunteer,Availability,disponueshmëri
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Vendosni vlerat e parazgjedhur për faturat POS
@@ -4541,14 +4575,13 @@
 DocType: Project,Time to send,Koha për të dërguar
 DocType: Timesheet,Employee Detail,Detail punonjës
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
 DocType: Lab Prescription,Test Code,Kodi i Testimit
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Parametrat për faqen e internetit
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Kerkesat e kerkesave nuk lejohen per {0} per shkak te nje standarti te rezultateve te {1}
 DocType: Job Offer,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Sipër
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Shuma totale {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Shuma totale {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Përmend në qoftë se llogaria jo-standarde pagueshme
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Ju lutemi zgjidhni grupin e vlerësimit të tjera se &quot;të gjitha grupet e vlerësimit &#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rresht {0}: Qendra kosto është e nevojshme për një artikull {1}
@@ -4559,7 +4592,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza e ujit
 DocType: Chapter,Region,Rajon
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
 DocType: Holiday List,Weekly Off,Weekly Off
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Rifresko Analizimin e Lidhur
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Për shembull 2012, 2012-13"
@@ -4575,7 +4608,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kostoja e asetit braktiset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
 DocType: Vehicle,Policy No,Politika No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
 DocType: Asset,Straight Line,Vijë e drejtë
 DocType: Project User,Project User,User Project
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,ndarje
@@ -4612,21 +4645,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Rrugë
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Nuk mund të konvertohet Qendra Kosto të librit si ajo ka nyje fëmijë
 DocType: Production Plan,Total Planned Qty,Totali i planifikuar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Vlera e hapjes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Vlera e hapjes
 DocType: Salary Detail,Formula,formulë
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Modeli i testimit të laboratorit
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Llogaria e Shitjes
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Llogaria e Shitjes
 DocType: Purchase Invoice Item,Total Weight,Pesha Totale
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisioni për Shitje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Komisioni për Shitje
 DocType: Job Offer Term,Value / Description,Vlera / Përshkrim
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
 DocType: Tax Rule,Billing Country,Faturimi Vendi
 DocType: Purchase Order Item,Expected Delivery Date,Pritet Data e dorëzimit
 DocType: Restaurant Order Entry,Restaurant Order Entry,Regjistrimi i Restorantit
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
 DocType: Asset Maintenance Task,Assign To Name,Cakto për emrin
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Shpenzimet Argëtim
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Shpenzimet Argëtim
 DocType: Hub Settings,Enabled Users,Përdoruesit e lejuar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Bëni materiale Kërkesë
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Hapur Artikull {0}
@@ -4639,24 +4672,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aplikimet për leje.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 DocType: Vehicle,Last Carbon Check,Last Kontrolloni Carbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Shpenzimet ligjore
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Shpenzimet ligjore
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Ju lutemi zgjidhni sasinë në rresht
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Bëni hapjen e shitjeve dhe blerjeve të faturave
 DocType: Purchase Invoice,Posting Time,Posting Koha
 DocType: Timesheet,% Amount Billed,% Shuma faturuar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Shpenzimet telefonike
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Shpenzimet telefonike
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontrolloni këtë në qoftë se ju doni për të detyruar përdoruesit për të zgjedhur një seri përpara se të kryeni. Nuk do të ketë parazgjedhur në qoftë se ju kontrolloni këtë.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
 DocType: Email Digest,Open Notifications,Njoftimet Hapur
 DocType: Payment Entry,Difference Amount (Company Currency),Dallimi Shuma (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Shpenzimet direkte
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Shpenzimet direkte
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Shpenzimet e udhëtimit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Shto fushën me parapagesë në doktorin {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Purchase Receipt Item,Sample Quantity,Sasia e mostrës
+DocType: Bank Guarantee,Name of Beneficiary,Emri i Përfituesit
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Përditësimi i çmimit BOM automatikisht nëpërmjet Planifikuesit, bazuar në normën e fundit të vlerësimit / normën e çmimeve / normën e fundit të blerjes së lëndëve të para."
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
@@ -4668,14 +4701,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Provë
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponentet e pagave
 DocType: Program Enrollment Tool,New Academic Year,New Year akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Kthimi / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Kthimi / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Gjithsej shuma e paguar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Gjithsej shuma e paguar
 DocType: GST Settings,B2C Limit,Kufizimi B2C
 DocType: Work Order Item,Transferred Qty,Transferuar Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Vozitja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planifikim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planifikim
 DocType: Share Balance,Issued,Lëshuar
+DocType: Loan,Repayment Start Date,Data e fillimit të ripagimit
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Aktiviteti Student
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Furnizuesi Id
 DocType: Payment Request,Payment Gateway Details,Pagesa Gateway Details
@@ -4688,10 +4722,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Lloji i lë si rastësor, të sëmurë etj"
 DocType: Email Digest,Send regular summary reports via Email.,Dërgo raporte të rregullta përmbledhje nëpërmjet Email.
 DocType: Payment Entry,PE-,pe-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Ju lutemi të vendosur llogarinë e paracaktuar në Expense kërkesën Lloji {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Ju lutemi të vendosur llogarinë e paracaktuar në Expense kërkesën Lloji {0}
 DocType: Assessment Result,Student Name,Emri i studentit
 DocType: Brand,Item Manager,Item Menaxher
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Payroll pagueshme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Payroll pagueshme
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
 DocType: Plant Analysis,Collection Datetime,Data e mbledhjes
 DocType: Work Order,Total Operating Cost,Gjithsej Kosto Operative
@@ -4701,9 +4735,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Përdoruesi {0} nuk ekziston
 DocType: Payment Term,Day(s) after invoice date,Ditë (a) pas datës së faturës
 DocType: Payment Schedule,Payment Schedule,Orari i pagesës
-DocType: Subscription,SUB-,nën-
 DocType: Item Attribute Value,Abbreviation,Shkurtim
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Pagesa Hyrja tashmë ekziston
+DocType: Subscription,Trial Period End Date,Data e përfundimit të periudhës së gjykimit
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Mjeshtër paga template.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,patologji
@@ -4720,9 +4754,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Të gjitha grupet e konsumatorëve
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumuluar mujore
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
@@ -4731,14 +4765,15 @@
 DocType: Lab Prescription,Test Created,Krijuar test
 DocType: Healthcare Settings,Custom Signature in Print,Nënshkrimi me porosi në shtyp
 DocType: Account,Temporary,I përkohshëm
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,LPO Nr. I Klientit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,LPO Nr. I Klientit
 DocType: Program,Courses,kurse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Nëse disable, &quot;me fjalë&quot; fushë nuk do të jetë i dukshëm në çdo transaksion"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ky veprim do të ndalojë faturimin e ardhshëm. Je i sigurt që dëshiron ta anulosh këtë abonim?
 DocType: Serial No,Distinct unit of an Item,Njësi të dallueshme nga një artikull
 DocType: Supplier Scorecard Criteria,Criteria Name,Emri i kritereve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Ju lutemi të vendosur Company
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Ju lutemi të vendosur Company
 DocType: Pricing Rule,Buying,Blerje
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Sëmundjet dhe plehrat
 DocType: HR Settings,Employee Records to be created by,Të dhënat e punonjësve që do të krijohet nga
@@ -4747,17 +4782,17 @@
 DocType: POS Profile,Apply Discount On,Aplikoni zbritje në
 DocType: Member,Membership Type,Lloji i Anëtarësimit
 ,Reqd By Date,Reqd By Date
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditorët
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditorët
 DocType: Assessment Plan,Assessment Name,Emri i vlerësimit
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Shfaq PDC në Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Shfaq PDC në Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Asnjë Serial është i detyrueshëm
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Tatimore urti Detail
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ofertë pune
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Shkurtesa Institute
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Sasi ({0}) nuk mund të jetë një pjesë në rradhë {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Sasi ({0}) nuk mund të jetë një pjesë në rradhë {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
@@ -4775,7 +4810,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ndryshimi Total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nëse aktivizuar, sistemi do të shpallë shënimet e kontabilitetit për inventarizimin automatikisht."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerimi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Pjesëmarrja për {0} punonjësi është shënuar tashmë për këtë ditë
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Pjesëmarrja për {0} punonjësi është shënuar tashmë për këtë ditë
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",në minuta Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 DocType: Customer,From Lead,Nga Lead
@@ -4786,6 +4821,7 @@
 DocType: Lab Test,Approved Date,Data e Aprovuar
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
+DocType: Subscriber,Subscriber Name,Emri i pajtimtarit
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Update Tool,Replace,Zëvendësoj
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nuk ka produkte gjet.
@@ -4795,19 +4831,18 @@
 DocType: Request for Quotation Item,Project Name,Emri i Projektit
 DocType: Customer,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Zgjidh llogarinë e të ardhurave nga interesi në kredinë e punonjësve {0}
 DocType: Work Order,Required Items,Items kërkuara
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Burimeve Njerëzore
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pajtimi Pagesa Pagesa
 DocType: Disease,Treatment Task,Detyra e Trajtimit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Pasuritë tatimore
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Pasuritë tatimore
 DocType: BOM Item,BOM No,Bom Asnjë
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Update Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Pajisje elektronike
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Pajisje elektronike
 DocType: Asset,Maintenance Required,Kërkohet Mirëmbajtja
 DocType: Account,Debit,Debi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
@@ -4816,7 +4851,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amt Outstanding
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Caqet e përcaktuara Item Grupi-mençur për këtë person të shitjes.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stoqet Freeze vjetër se [Ditët]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset është e detyrueshme për të aseteve fikse blerje / shitje
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset është e detyrueshme për të aseteve fikse blerje / shitje
 DocType: Asset Maintenance Team,Maintenance Team Name,Emri i ekipit të mirëmbajtjes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nëse dy ose më shumë Rregullat e Çmimeve janë gjetur në bazë të kushteve të mësipërme, Prioritet është aplikuar. Prioritet është një numër mes 0 deri ne 20, ndërsa vlera e parazgjedhur është zero (bosh). Numri më i lartë do të thotë se do të marrë përparësi nëse ka rregulla të shumta çmimeve me kushte të njëjta."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Klienti është i detyrueshëm nëse &quot;Mundësi Nga&quot; zgjidhet si Klient
@@ -4825,19 +4860,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lejo përdoruesit e mëposhtme të miratojë Dërgo Aplikacione për ditë bllok.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Llojet e shpenzimeve kërkesës.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Shitjen e normës për elementit {0} është më e ulët se saj {1}. Shitja e normës duhet të jetë atleast {2}
-DocType: Item,Taxes,Tatimet
+DocType: Subscription,Taxes,Tatimet
 DocType: Purchase Invoice,capital goods,mallra kapitale
 DocType: Purchase Invoice Item,Weight Per Unit,Pesha për njësi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Paguar dhe nuk dorëzohet
 DocType: Project,Default Cost Center,Qendra Kosto e albumit
-DocType: Bank Guarantee,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksionet e aksioneve
 DocType: Budget,Budget Accounts,Llogaritë e buxhetit
 DocType: Employee,Internal Work History,Historia e brendshme
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumuluar Shuma Zhvlerësimi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Ekuiteti privat
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Vleresimi i rezultateve te furnitorit
-DocType: Employee Loan,Fully Disbursed,lëvrohet plotësisht
 DocType: Employee Advance,Due Advance Amount,Shuma e duhur paraprake
 DocType: Maintenance Visit,Customer Feedback,Feedback Customer
 DocType: Account,Expense,Shpenzim
@@ -4861,7 +4894,7 @@
 ,Employee Information,Informacione punonjës
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Modelet e taksave të parazgjedhur për shitje dhe blerje krijohen.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Regjistrimi i rezultatit të rezultatit {0} tashmë ekziston.
@@ -4869,7 +4902,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Ju lutemi të vendosur Company filtër bosh nëse Group By është &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Posting Data nuk mund të jetë data e ardhmja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,për gjenerimin e përsëritjes
 DocType: Stock Entry,Target Warehouse Address,Adresën e Objektit të Objektit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Lini Rastesishme
 DocType: Agriculture Task,End Day,Dita e Fundit
@@ -4894,11 +4926,10 @@
 DocType: Material Request,% Ordered,% Urdhërohet
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Për Grupin bazuar Course Studentëve, kursi do të miratohet për çdo student nga kurset e regjistruar në programin e regjistrimit."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Punë me copë
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Blerja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Share Balance,From No,Nga Nr
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Mesazh i ri nga {sender}
 DocType: Customer,Customer Primary Address,Adresa Primare e Klientit
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletinet
 DocType: Drug Prescription,Description/Strength,Përshkrimi / Forca
@@ -4907,22 +4938,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Same artikull është futur disa herë
 DocType: Department,Leave Block List,Lini Blloko Lista
 DocType: Purchase Invoice,Tax ID,ID e taksave
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} nuk është setup për Serial Nr. Kolona duhet të jetë bosh
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} nuk është setup për Serial Nr. Kolona duhet të jetë bosh
 DocType: Accounts Settings,Accounts Settings,Llogaritë Settings
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,miratoj
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Adresa pa format malformues për {0}, fillo të vazhdosh."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Adresa pa format malformues për {0}, fillo të vazhdosh."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Numri i llogarisë së re, do të përfshihet në emrin e llogarisë si një prefiks"
 DocType: Maintenance Team Member,Team Member,Anëtar i ekipit
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Asnjë rezultat për të paraqitur
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
-DocType: Employee Loan,Rate of Interest (%) / Year,Norma e interesit (%) / Viti
+DocType: Loan,Rate of Interest (%) / Year,Norma e interesit (%) / Viti
 ,Project Quantity,Sasia Project
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;"
 DocType: Opportunity,To Discuss,Për të diskutuar
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} për të përfunduar këtë transaksion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Norma e interesit (%) vjetore
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Llogaritë e përkohshme
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,E zezë
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Llogaritë e përkohshme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,E zezë
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Shpërthimi i artikullit
 DocType: Shareholder,Contact List,Lista e Kontakteve
 DocType: Account,Auditor,Revizor
@@ -4930,16 +4961,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} artikuj prodhuara
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Mëso më shumë
 DocType: Cheque Print Template,Distance from top edge,Largësia nga buzë të lartë
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Lista e Çmimeve {0} është me aftësi të kufizuara ose nuk ekziston
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Lista e Çmimeve {0} është me aftësi të kufizuara ose nuk ekziston
 DocType: Purchase Invoice,Return,Kthimi
 DocType: Pricing Rule,Disable,Disable
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Mënyra e pagesës është e nevojshme për të bërë një pagesë
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Mënyra e pagesës është e nevojshme për të bërë një pagesë
 DocType: Project Task,Pending Review,Në pritje Rishikimi
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Modifiko në faqen e plotë për më shumë opsione si asetet, numrat serial, batch etj."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Emërimet dhe konsultimet
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} nuk është i regjistruar në grumbull {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nuk mund të braktiset, pasi ajo është tashmë {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Verifikimet e kërkuara
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Verifikimet e kërkuara
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Mungon
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Dështoi në konfigurimin e kompanisë
@@ -4951,7 +4982,7 @@
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Komponenti Fee
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Menaxhimi Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Shto artikuj nga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Shto artikuj nga
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Bimët dhe tokat
 DocType: Cheque Print Template,Regular,i rregullt
 DocType: Fertilizer,Density (if liquid),Dendësia (nëse është e lëngshme)
@@ -4976,24 +5007,26 @@
 DocType: Payment Entry,Paid Amount,Paid Shuma
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Eksploro Cikullin e Shitjes
 DocType: Assessment Plan,Supervisor,mbikëqyrës
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Regjistrimi i aksioneve mbajtëse
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Regjistrimi i aksioneve mbajtëse
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 ,Work Order Stock Report,Raporti i Renditjes së Rendit të Punës
+DocType: Purchase Receipt,Auto Repeat Detail,Detyrimi i përsëritjes automatike
 DocType: Assessment Result Tool,Assessment Result Tool,Vlerësimi Rezultati Tool
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Si Supervizor
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Sugjerojeni Kategorinë
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Menaxhimit të Cilësisë
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Menaxhimit të Cilësisë
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
 DocType: Project,Total Billable Amount (via Timesheets),Shuma totale e faturimit (përmes Timesheets)
 DocType: Agriculture Task,Previous Business Day,Dita e mëparshme e punës
-DocType: Employee Loan,Repay Fixed Amount per Period,Paguaj shuma fikse për një periudhë
+DocType: Loan,Repay Fixed Amount per Period,Paguaj shuma fikse për një periudhë
 DocType: Employee,Health Insurance No,Sigurimi Shëndetësor nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Credit Note Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Shuma Totale e Tatueshme
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
 DocType: Opening Invoice Creation Tool,Purchase,Blerje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Bilanci Qty
@@ -5004,15 +5037,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} për {1}
 DocType: Healthcare Settings,Valid number of days,Numri i ditëve të vlefshme
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Qendrat e kostos
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Rinis abonim
 DocType: Land Unit,Linked Plant Analysis,Analizë e bimëve të lidhur
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Shkalla në të cilën furnizuesit e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konfliktet timings me radhë {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Lejo Zero Vlerësimit Vlerësoni
+DocType: Bank Guarantee,Receiving,marrja e
 DocType: Training Event Employee,Invited,Të ftuar
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Strukturat aktive pagave gjetur për punonjës {0} për të dhënë data
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Llogaritë Gateway.
 DocType: Employee,Employment Type,Lloji Punësimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Mjetet themelore
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Mjetet themelore
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Humbje
 ,GST Purchase Register,GST Blerje Regjistrohu
 ,Cash Flow,Cash Flow
@@ -5032,9 +5067,10 @@
 DocType: Academic Term,Term Start Date,Term Data e fillimit
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista e të gjitha transaksioneve të aksioneve
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Duhet të përcaktohet si data e fillimit të periudhës së gjykimit dhe data e përfundimit të periudhës së gjykimit
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Norma mesatare
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Shuma totale e pagesës në orarin e pagesës duhet të jetë e barabartë me grandin / totalin e rrumbullakët
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Shuma totale e pagesës në orarin e pagesës duhet të jetë e barabartë me grandin / totalin e rrumbullakët
+DocType: Subscription Plan Detail,Plan,plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanca Deklarata Banka sipas Librit Kryesor
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
 DocType: Authorization Rule,Customer / Item Name,Customer / Item Emri
@@ -5064,6 +5100,7 @@
 DocType: Work Order,Warehouses,Depot
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv nuk mund të transferohet
 DocType: Hotel Room Pricing,Hotel Room Pricing,Çmimi i dhomës së hotelit
+DocType: Subscription,Days Until Due,Ditë deri në kohën e duhur
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ky Artikull është një variant i {0} (Shabllon).
 DocType: Workstation,per hour,në orë
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,blerje
@@ -5072,13 +5109,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Për Grupin Batch bazuar Studentëve, grupi i Studentëve do të miratohet për çdo student nga Regjistrimi Programit."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Shpërndarje
+DocType: Journal Entry Account,Loan,hua
 DocType: Expense Claim Advance,Expense Claim Advance,Kërkesa e Shpenzimit të Shpenzimeve
 DocType: Lab Test,Report Preference,Preferencë e raportit
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Informacione vullnetare.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Menaxher i Projektit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Menaxher i Projektit
 ,Quoted Item Comparison,Cituar Item Krahasimi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Mbivendosja në pikët midis {0} dhe {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dërgim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Vlera neto e aseteve si në
 DocType: Crop,Produce,prodhoj
@@ -5088,7 +5126,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Konsumi material për prodhim
 DocType: Item Alternative,Alternative Item Code,Kodi Alternativ i Artikullit
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Zgjidhni Items të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Zgjidhni Items të Prodhimi
 DocType: Delivery Stop,Delivery Stop,Dorëzimi i ndalimit
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
 DocType: Item,Material Issue,Materiali Issue
@@ -5098,15 +5136,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
 DocType: BOM,Show Items,Shfaq Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nga koha nuk mund të jetë më i madh se në kohë.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,A doni të njoftoni të gjithë klientët me email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,A doni të njoftoni të gjithë klientët me email?
+DocType: Subscription Plan,Billing Interval,Intervali i faturimit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Vazhdoj
 DocType: Hub Settings,Hub Username,Hub Emri i përdoruesit
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteret e vlerësimit Group
 DocType: Healthcare Settings,Patient Name By,Emri i pacientit nga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Hyrja në Regjistrimin Përgjegjës për pagat nga {0} në {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Hyrja në Regjistrimin Përgjegjës për pagat nga {0} në {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
 DocType: Warehouse,Warehouse Name,Magazina Emri
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
@@ -5120,22 +5158,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Këtu ju mund të mbajë lartësia, pesha, alergji, shqetësimet mjekësore etj"
 DocType: Leave Block List,Applies to Company,Zbatohet për Kompaninë
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
-DocType: Employee Loan,Disbursement Date,disbursimi Date
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Përfituesit&#39; nuk janë të specifikuara
+DocType: Loan,Disbursement Date,disbursimi Date
 DocType: BOM Update Tool,Update latest price in all BOMs,Përditësoni çmimin e fundit në të gjitha BOM-et
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Regjistri mjekësor
 DocType: Vehicle,Vehicle,automjet
 DocType: Purchase Invoice,In Words,Me fjalë të
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Futni emrin e bankës ose të institucionit kreditues përpara se të dorëzoni.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} duhet të dorëzohet
 DocType: POS Profile,Item Groups,Grupet artikull
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Sot është {0} &#39;s ditëlindjen!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Sot është {0} &#39;s ditëlindjen!
 DocType: Sales Order Item,For Production,Për Prodhimit
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Ju lutemi të shtoni një llogari të Hapjes së Përkohshme në Kartën e Llogarive
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Ju lutemi të shtoni një llogari të Hapjes së Përkohshme në Kartën e Llogarive
 DocType: Customer,Customer Primary Contact,Kontakti Primar i Klientit
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Ditari i mbylljes së periudhës
 DocType: Project Task,View Task,Shiko Task
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Lloji i Garancisë Bankare
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Pjesa e faturës
 ,Asset Depreciations and Balances,Nënçmime aseteve dhe Bilancet
@@ -5146,9 +5185,8 @@
 DocType: Production Plan,Include Subcontracted Items,Përfshini artikujt e nënkontraktuar
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,bashkohem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Nuk mund të ndryshojë pronat e variantit pas transakcionit të stoqeve. Ju do të keni për të bërë një artikull të ri për ta bërë këtë.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
-DocType: Employee Loan,Repay from Salary,Paguajë nga paga
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+DocType: Loan,Repay from Salary,Paguajë nga paga
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Kerkuar pagesën kundër {0} {1} për sasi {2}
 DocType: Salary Slip,Salary Slip,Shqip paga
@@ -5172,11 +5210,11 @@
 DocType: Employee Education,Employee Education,Arsimimi punonjës
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Grupi Duplicate artikull gjenden në tabelën e grupit artikull
 DocType: Land Unit,Parent Land Unit,Njësia e tokës parësore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
 DocType: Fertilizer,Fertilizer Name,Emri i plehut
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Cash Flow Mapping Accounts,Account,Llogari
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
 ,Requested Items To Be Transferred,Items kërkuar të transferohet
 DocType: Expense Claim,Vehicle Log,Vehicle Identifikohu
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Prania e etheve (temp&gt; 38.5 ° C / 101.3 ° F ose temperatura e qëndrueshme&gt; 38 ° C / 100.4 ° F)
@@ -5217,24 +5255,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
 DocType: Asset Maintenance,Manufacturing User,Prodhim i përdoruesit
 DocType: Purchase Invoice,Raw Materials Supplied,Lëndëve të para furnizuar
-DocType: C-Form,Series,Seri
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valuta e listës së çmimeve {0} duhet të jetë {1} ose {2}
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Soil Texture,Ternary Plot,Komplot tresh
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
 DocType: Driver,License Number,Numri i licencës
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Zhvillimin e Biznesit Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Zhvillimin e Biznesit Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Mirëmbajtja Vizitoni Qëllimi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Regjistrimi i Faturës së Pacientëve
 DocType: Crop,Period,Periudhë
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Përgjithshëm Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},I punësuar {0} për të lënë në {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},I punësuar {0} për të lënë në {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Shiko kryeson
 DocType: Program Enrollment Tool,New Program,Program i ri
 DocType: Item Attribute Value,Attribute Value,Atribut Vlera
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 DocType: Salary Detail,Salary Detail,Paga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
 DocType: Appointment Type,Physician,mjek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,konsultimet
@@ -5242,15 +5279,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nuk mund të jetë më i madh se sasia e planifikuar ({2}) në Urdhërin e Punës {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Sheet Koha për prodhimin.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Nëntotali
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Nuk mund të ndryshojë pronat e variantit pas transaksionit të aksioneve. Ju do të keni për të bërë një artikull të ri për ta bërë këtë.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandati i SEPA për GoCardless
 DocType: Physician,Charges,akuzat
 DocType: Production Plan,Get Items For Work Order,Merrni artikujt për porosinë e punës
 DocType: Salary Detail,Default Amount,Gabim Shuma
 DocType: Lab Test Template,Descriptive,përshkrues
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Magazina nuk gjendet ne sistem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazina nuk gjendet ne sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Përmbledhje këtij muaji
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspektimi Leximi Cilësia
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Vendosni një qëllim të shitjes që dëshironi të arrini për kompaninë tuaj.
 ,Project wise Stock Tracking,Projekti Ndjekja mençur Stock
@@ -5278,11 +5316,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Dështoi në krijimin e faqes së internetit
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Regjistrimi i aksioneve të mbajtjes tashmë të krijuar ose Sasia e mostrës nuk është dhënë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Regjistrimi i aksioneve të mbajtjes tashmë të krijuar ose Sasia e mostrës nuk është dhënë
 DocType: Program,Program Abbreviation,Shkurtesa program
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
-DocType: Bank Guarantee,Start Date,Data e Fillimit
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alokimi i lë për një periudhë.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Çeqet dhe Depozitat pastruar gabimisht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
@@ -5297,11 +5334,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Orë
 DocType: Project,Expected Start Date,Pritet Data e Fillimit
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korrigjimi në Faturë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Rendi i punës i krijuar për të gjitha artikujt me BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Rendi i punës i krijuar për të gjitha artikujt me BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Raportet e variantit
 DocType: Setup Progress Action,Setup Progress Action,Aksioni i progresit të instalimit
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Lista e Çmimeve të Blerjes
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Lista e Çmimeve të Blerjes
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Hiq pika në qoftë se akuza nuk është i zbatueshëm për këtë artikull
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Anulo abonimin
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Ju lutem zgjidhni Statusin e Mirëmbajtjes si Komplet ose hiqni Datën e Përfundimit
 DocType: Supplier,Default Payment Terms Template,Modeli i parazgjedhur i pagesave
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Monedha transaksion duhet të jetë i njëjtë si pagesë Gateway valutë
@@ -5312,7 +5350,6 @@
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Veprimi në qoftë akumuluar tejkaluar buxhetin mujor
-DocType: Subscription,Submit on creation,Submit në krijimin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
 DocType: Asset,Disposal Date,Shkatërrimi Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email do të dërgohet të gjithë të punësuarve aktive e shoqërisë në orë të caktuar, në qoftë se ata nuk kanë pushim. Përmbledhje e përgjigjeve do të dërgohet në mesnatë."
@@ -5330,6 +5367,7 @@
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Çek Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiku i Qendrave te Kostos
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Numri i ditëve pas datës së faturës ka kaluar para anulimit të abonimit ose shënimit të abonimit si të papaguar
 DocType: Lab Test Template,Sample Collection,Sample Collection
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
@@ -5338,7 +5376,7 @@
 DocType: Account,Income,Të ardhura
 DocType: Industry Type,Industry Type,Industria Type
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Diçka shkoi keq!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 DocType: Supplier Scorecard Scoring Criteria,Score,rezultat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Viti Fiskal {0} nuk ekziston
@@ -5358,12 +5396,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} duhet të jetë një vlerë midis 0 dhe 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Data tjetër e zhvlerësimit nuk mund të jetë para datës së disponueshme për përdorim
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Kredi pasiguruar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max orarit të punës kundër pasqyrë e mungesave
 DocType: Maintenance Schedule Detail,Scheduled Date,Data e planifikuar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Totale e paguar Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Totale e paguar Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesazhet më të mëdha se 160 karaktere do të ndahet në mesazhe të shumta
 DocType: Purchase Receipt Item,Received and Accepted,Marrë dhe pranuar
 DocType: Hub Settings,Company and Seller Profile,Profili i Kompanisë dhe Shitësit
@@ -5377,10 +5415,9 @@
 DocType: Item,Variant Based On,Variant i bazuar në
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Furnizuesit tuaj
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Ju lutem korrigjoni
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
 DocType: Request for Quotation Item,Supplier Part No,Furnizuesi Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,anonim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Marrë nga
 DocType: Lead,Converted,Konvertuar
@@ -5394,6 +5431,7 @@
 DocType: Asset,Assets,asetet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
+DocType: Subscription,Current Invoice End Date,Data e Fundit e Faturës
 DocType: Payment Term,Due Date Based On,Datë e bazuar në bazë
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Ju lutemi vendosni grupin e parazgjedhur të konsumatorëve dhe territorin në Cilësimet e shitjes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} nuk ekziston
@@ -5401,7 +5439,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Asnjë shlyerje e zgjedhur për Regjistrimin e Gazetës
 DocType: Payment Reconciliation,From Invoice Date,Nga Faturë Data
+DocType: Loan,Disbursed,disbursuar
 DocType: Healthcare Settings,Laboratory Settings,Cilësimet laboratorike
 DocType: Patient Appointment,Service Unit,Njësia e Shërbimit
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Vendosni me sukses Furnizuesin
@@ -5414,12 +5454,12 @@
 DocType: Share Balance,No of Shares,Jo të aksioneve
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Zgjidh statusin
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: School House,House Name,Emri House
 DocType: Fee Schedule,Total Amount per Student,Shuma totale për student
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrik
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Shto pjesën tjetër të organizatës suaj si përdoruesit e juaj. Ju gjithashtu mund të shtoni ftojë konsumatorët për portalin tuaj duke shtuar ato nga Kontaktet
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
 DocType: Grant Application,Requested Amount,Shuma e Kërkuar
@@ -5429,7 +5469,7 @@
 DocType: Crop Cycle,Detected Diseases,Sëmundjet e zbuluara
 DocType: Stock Entry,Default Source Warehouse,Gabim Burimi Magazina
 DocType: Item,Customer Code,Kodi Klientit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 DocType: Asset Maintenance Task,Last Completion Date,Data e përfundimit të fundit
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
@@ -5437,9 +5477,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Cilësimet GoCardless
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Pasuritë e aksioneve
 DocType: Restaurant,Active Menu,Meny aktiv
 DocType: Target Detail,Target Qty,Target Qty
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Kundër huasë: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Cilësimet Checkout
 DocType: Student Attendance,Present,I pranishëm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
@@ -5448,9 +5489,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
 DocType: Vehicle Log,Odometer,rrugëmatës
 DocType: Production Plan Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
 DocType: Chapter,Chapter Head,Kreu i Kapitullit
 DocType: Payment Term,Month(s) after the end of the invoice month,Muaj (a) pas përfundimit të muajit të faturës
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Aktiviteti i projekt / detyra.
@@ -5458,11 +5499,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generate paga rrëshqet
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Data e rezultatit të laboratorit nuk mund të jetë para testimit të datetime
 DocType: POS Profile,Allow user to edit Discount,Lejo përdoruesin të redaktojë zbritje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Merrni klientët nga
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Merrni klientët nga
 DocType: Purchase Invoice Item,Include Exploded Items,Përfshirja e artikujve të eksploduar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Blerja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
 DocType: Shipping Rule,Restrict to Countries,Kufizo vendet
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,faturimit Hours
 DocType: Project,Total Sales Amount (via Sales Order),Shuma totale e shitjeve (me anë të shitjes)
@@ -5481,6 +5523,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Balta
 DocType: Grant Application,Assessment  Manager,Menaxheri i Vlerësimit
 DocType: Payment Entry,Allocate Payment Amount,Alokimi Shuma e pagesës
+DocType: Subscription Plan,Subscription Plan,Plani i abonimit
 DocType: Employee External Work History,Salary,Rrogë
 DocType: Serial No,Delivery Document Type,Ofrimit Dokumenti Type
 DocType: Sales Order,Partly Delivered,Dorëzuar Pjesërisht
@@ -5505,9 +5548,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Gama plakjen 2
 DocType: SG Creation Tool Course,Max Strength,Max Forca
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalimi i paravendosjeve
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Nuk ka Shënim për Dorëzim të zgjedhur për Klientin {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Nuk ka Shënim për Dorëzim të zgjedhur për Klientin {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Bom zëvendësohet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Zgjedhni artikujt bazuar në Datën e Dorëzimit
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Zgjedhni artikujt bazuar në Datën e Dorëzimit
 DocType: Grant Application,Has any past Grant Record,Ka ndonjë të kaluar Grant Record
 ,Sales Analytics,Sales Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Në dispozicion {0}
@@ -5526,7 +5569,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosto të lëndëve të para furnizuar
 DocType: Selling Settings,Settings for Selling Module,Cilësimet për shitjen Module
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervimi i dhomës së hotelit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Shërbimi ndaj klientit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Shërbimi ndaj klientit
 DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Detail Klientit
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta kandidat a Job.
@@ -5542,7 +5585,7 @@
 DocType: Fees,Student Details,Detajet e Studentit
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
 DocType: Purchase Invoice Item,Stock Qty,Stock Qty
-DocType: Employee Loan,Repayment Period in Months,Afati i pagesës në muaj
+DocType: Loan,Repayment Period in Months,Afati i pagesës në muaj
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
 DocType: Naming Series,Update Series Number,Update Seria Numri
 DocType: Account,Equity,Barazia
@@ -5551,7 +5594,7 @@
 DocType: Task,Closing Date,Data e mbylljes
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
 DocType: Timesheet,Work Detail,Detajet e punës
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Inxhinier
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Inxhinier
 DocType: Journal Entry,Total Amount Currency,Total Shuma Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Kuvendet Kërko Nën
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
@@ -5597,13 +5640,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Informacioni mbi tipin e donatorit.
 DocType: Request for Quotation,Supplier Detail,furnizuesi Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error ne formulen ose gjendje: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Shuma e faturuar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Shuma e faturuar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Peshat e kriterit duhet të shtojnë deri në 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Pjesëmarrje
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Stock Items
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nëse nuk kontrollohet, lista do të duhet të shtohet për çdo Departamentit ku ajo duhet të zbatohet."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Krijimi i {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Burimi dhe Target Warehouse nuk mund të jetë e njëjtë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
@@ -5627,14 +5669,14 @@
 DocType: Shipping Rule,Fixed,fiks
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Shpenzimet administrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Shpenzimet administrative
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Këshillues
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
-DocType: Journal Entry,Subscription,abonim
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,abonim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Krijimi i tarifës në pritje
 DocType: Appraisal Goal,Score Earned,Vota fituara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Periudha Njoftim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Periudha Njoftim
 DocType: Asset Category,Asset Category Name,Asset Category Emri
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Kjo është një territor rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Emri i ri Sales Person
@@ -5647,7 +5689,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dërgo pakontrolluar në qoftë se ju nuk doni të marrin në konsideratë duke bërë grumbull grupet kurs të bazuar.
 DocType: Asset,Frequency of Depreciation (Months),Frekuenca e Zhvlerësimit (Muaj)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Llogaria e Kredisë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Trego zero vlerat
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Sasia e sendit të marra pas prodhimit / ripaketimin nga sasi të caktuara të lëndëve të para
@@ -5655,7 +5697,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
 DocType: Hub Settings,Company Logo,Logo e kompanisë
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 DocType: Healthcare Settings,Patient Registration,Regjistrimi i pacientit
@@ -5690,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,Debiti i përgjithshëm
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default përfunduara Mallra Magazina
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Ju lutemi zgjidhni Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Hotel Room Package,Amenities,pajisje
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Buxheti dhe Qendra Kosto
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mënyra e parazgjedhur e pagesës nuk lejohet
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,për
 ,Appointment Analytics,Analiza e emërimeve
 DocType: Vehicle Service,Half Yearly,Gjysma vjetore
 DocType: Lead,Blog Subscriber,Blog Subscriber
@@ -5710,6 +5751,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lini bosh në qoftë se ju bëni studentëve grupet në vit
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nëse kontrolluar, Gjithsej nr. i ditëve të punës do të përfshijë pushimet, dhe kjo do të zvogëlojë vlerën e pagave Per Day"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Aplikacionet që përdorin çelësin aktual nuk do të jenë në gjendje të hyjnë, jeni i sigurt?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,Advance Total
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Ndrysho kodin e modelit
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Term End Date nuk mund të jetë më herët se data e fillimit Term. Ju lutem, Korrigjo datat dhe provoni përsëri."
@@ -5721,8 +5763,9 @@
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 DocType: Cheque Print Template,Signatory Position,Pozita nënshkruese
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Bëje si Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Bëje si Lost
 DocType: Timesheet,Total Billable Hours,Gjithsej orëve billable
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Numri i ditëve që Përdoruesi duhet të paguajë faturat e krijuara nga ky abonim
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagesa Pranimi Shënim
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Kjo është e bazuar në transaksionet kundër këtij Klientit. Shih afat kohor më poshtë për detaje
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Shuma e alokuar {1} duhet të jetë më pak se ose e barabartë me shumën e pagesës Hyrja {2}
@@ -5741,12 +5784,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Company,Company Info,Company Info
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Zgjidhni ose shtoni klient të ri
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Kjo është e bazuar në pjesëmarrjen e këtij punonjësi
 DocType: Assessment Result,Summary,përmbledhje
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Pjesëmarrja e Markut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Llogaria Debiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Llogaria Debiti
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Produkti i Renditjes
@@ -5758,7 +5801,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Shuma Blerje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Përfitimet e Punonjësve
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Përfitimet e Punonjësve
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Work Order,Manufactured Qty,Prodhuar Qty
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Aksionet nuk ekzistojnë me {0}
@@ -5766,12 +5809,12 @@
 DocType: Asset,Out of Order,Jashtë përdorimit
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignore Time Workstation Mbivendosje
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Zgjidh Batch Numbers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 DocType: Patient Service Unit,Medical Administrator,Administrator Mjekësor
 DocType: Assessment Plan,Schedule,Orar
 DocType: Account,Parent Account,Llogaria prind
@@ -5801,15 +5844,16 @@
 DocType: Asset Repair,Repair Status,Gjendja e Riparimit
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
 DocType: POS Profile,Account for Change Amount,Llogaria për Ndryshim Shuma
 DocType: Purchase Invoice,input service,shërbimi i hyrjes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Anëtar i ekipit të mirëmbajtjes
 DocType: Agriculture Analysis Criteria,Soil Analysis,Analiza e tokës
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kodi i kursit:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
 DocType: Employee,Current Address,Adresa e tanishme
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nëse pika është një variant i një tjetër çështje pastaj përshkrimin, imazhi, çmimi, taksat, etj do të vendoset nga template përveç nëse specifikohet shprehimisht"
 DocType: Serial No,Purchase / Manufacture Details,Blerje / Detajet Prodhimi
@@ -5858,19 +5902,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Regjistrimet për {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Emri i ndryshueshëm
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
 DocType: Asset,Asset Category,Asset Category
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Paguajnë neto nuk mund të jetë negative
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Tatimi i artikullit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Materiale për Furnizuesin
 DocType: Soil Texture,Loamy Sand,Rërë e pangopur
 DocType: Production Plan,Material Request Planning,Planifikimi i Kërkesave Materiale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Akciza Faturë
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Pragun {0}% shfaqet më shumë se një herë
 DocType: Expense Claim,Employees Email Id,Punonjësit Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Pjesëmarrja e shënuar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Detyrimet e tanishme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Detyrimet e tanishme
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timer tejkalonte orët e dhëna.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Dërgo SMS në masë për kontaktet tuaja
 DocType: Patient,A Positive,Një pozitive
@@ -5881,9 +5925,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe Urdhërat e Blerjes për këtë furnizues duhet të lëshohen me kujdes."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Ekipi i Mirëmbajtjes së Aseteve
-DocType: Employee Loan,Loan Type,Lloji Loan
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} është dërguar me sukses
+DocType: Loan,Loan Type,Lloji Loan
 DocType: Scheduling Tool,Scheduling Tool,caktimin Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Pika për të prodhuar apo ripaketohen
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5915,7 +5960,7 @@
 DocType: Item,Units of Measure,Njësitë e masës
 DocType: Manufacturing Settings,Allow Production on Holidays,Lejo Prodhimi në pushime
 DocType: Sales Invoice,Customer's Purchase Order Date,Konsumatorit Rendit Blerje Data
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Trego Attachments publike
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
 DocType: Restaurant Reservation,Reservation Time,Koha e rezervimit
@@ -5930,7 +5975,7 @@
 DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rreshti # {0}: Reqd by Date nuk mund të jetë para datës së transaksionit
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produkte Featured
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Projektues
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
@@ -5940,20 +5985,20 @@
 DocType: Driver,Expiry Date,Data e Mbarimit
 DocType: Healthcare Settings,Employee name and designation in print,Emri i punonjësit dhe emërtimi në shtyp
 ,accounts-browser,Llogaritë-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Mjeshtër projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Për të lejuar mbi-faturimit ose mbi-urdhërimin, të rinovuar &quot;Allowance&quot; në Stock Settings ose Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Gjysme Dite)
 DocType: Payment Term,Credit Days,Ditët e kreditit
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Ju lutemi, përzgjidhni Pacientin për të marrë Testet Lab"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Bëni Serisë Student
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Lead ditësh
 DocType: Cash Flow Mapping,Is Income Tax Expense,Është shpenzimi i tatimit mbi të ardhurat
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontrolloni këtë nëse studenti banon në Hostel e Institutit.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
 ,Stock Summary,Stock Përmbledhje
@@ -5964,10 +6009,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: BOM Operation,Operating Cost(Company Currency),Kosto Operative (Company Valuta)
-DocType: Employee Loan Application,Rate of Interest,Norma e interesit
+DocType: Loan Application,Rate of Interest,Norma e interesit
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: Item,Shelf Life In Days,Jeta në skarë në ditë
 DocType: GL Entry,Is Opening,Është Hapja
+DocType: Department,Expense Approvers,Prokurorët e shpenzimeve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
 DocType: Journal Entry,Subscription Section,Seksioni i abonimit
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Llogaria {0} nuk ekziston
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index e980c4a..786851d 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -1,4 +1,4 @@
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Početno stanje'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Početno stanje'
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Prosjek dnevne isporuke
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Kreirajte uplatu
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio!
@@ -11,6 +11,7 @@
 DocType: Item Reorder,Item Reorder,Dopuna artikla
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi grešku
 DocType: Salary Slip,Net Pay,Neto plaćanje
+DocType: Payment Entry,Internal Transfer,Interni prenos
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Kreirajte novog kupca
 DocType: Item Variant Attribute,Attribute,Atribut
@@ -24,9 +25,9 @@
 DocType: Activity Cost,Projects User,Projektni korisnik
 DocType: Lead,Address Desc,Opis adrese
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),Saldo (Du - Po)
 DocType: Salary Structure,Select employees for current Salary Structure,Izaberite Zaposlene za trenutnu strukturu plata
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja korpa
-DocType: Bank Guarantee,End Date,Datum završetka
 DocType: Consultation,Doctor,Doktor
 DocType: Payment Entry,Payment From / To,Plaćanje od / za
 DocType: Purchase Invoice,Grand Total (Company Currency),Za plaćanje (Valuta preduzeća)
@@ -51,28 +52,28 @@
 DocType: Journal Entry Account,Purchase Invoice,Faktura nabavke
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje fiskalne godine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +114,Group by Voucher,Grupiši po knjiženjima
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Ukupno preostalo
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Ukupno preostalo
 DocType: HR Settings,Email Salary Slip to Employee,Pošalji platnu listu Zaposlenom
 DocType: Item,Customer Code,Šifra kupca
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dozvolite više prodajnih naloga koji su vezani sa porudžbenicom kupca
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Total Outgoing,Ukupno isporučeno
 DocType: Consultation,Consultation Time,Vrijeme pregleda
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Korisnik {0} je već označen kao Zaposleni {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Korisnik {0} je već označen kao Zaposleni {1}
 ,Sales Register,Pregled Prodaje
 DocType: Sales Order,%  Delivered,% Isporučeno
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} kreirana za Zaposlenog {1} za dati period
 DocType: Journal Entry Account,Party Balance,Stanje kupca
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno zaposlenom {1} za period {2} {3}
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Molimo podesite polje Korisnički ID u evidenciji Zaposlenih radi podešavanja zaduženja Zaposlenih
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Molimo podesite polje Korisnički ID u evidenciji Zaposlenih radi podešavanja zaduženja Zaposlenih
 DocType: Project,Task Completion,Završenost zadataka
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Obilježi kao izgubljenu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Obilježi kao izgubljenu
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupovina
 apps/erpnext/erpnext/accounts/party.py +396,{0} {1} is not active,{0} {1} nije aktivan
 DocType: Bin,Reserved Quantity,Rezervisana količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Povraćaj / knjižno odobrenje
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Povraćaj / knjižno odobrenje
 DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Dodaj stavke iz  БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Dodaj stavke iz  БОМ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2037,Please select customer,Odaberite kupca
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 ,Stock Summary,Pregled zalihe
@@ -97,7 +98,7 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Stablo Vrste artikala
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji konkretnom Zaposlenom mogu odobriti odsustvo
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupa kupaca / kupci
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Pregled potraživanja od kupaca
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Pregled potraživanja od kupaca
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Iz otpremnice
 DocType: Account,Tax,Porez
 DocType: Bank Reconciliation,Account Currency,Valuta računa
@@ -110,8 +111,8 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Datum fakture dobavljača ne može biti veći od datuma otvaranja fakture
 DocType: Production Plan,Sales Orders,Prodajni nalozi
 DocType: Item,Manufacturer Part Number,Proizvođačka šifra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosječna vrijednost nabavke
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Zaduženja zaposlenih: {0}
+DocType: Sales Invoice Item,Discount and Margin,Popust i marža
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Prosječna vrijednost nabavke
 DocType: Sales Order Item,Gross Profit,Bruto dobit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +120,Group by Account,Grupiši po računu.
 DocType: Opening Invoice Creation Tool Item,Item Name,Naziv artikla
@@ -119,19 +120,20 @@
 DocType: Item,Will also apply for variants,Biće primijenjena i na varijante
 DocType: Purchase Invoice,Total Advance,Ukupno Avans
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Prodajni nalog za plaćanje
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada ni jednom skladištu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada ni jednom skladištu
 ,Sales Analytics,Prodajna analitika
 DocType: Patient Appointment,Patient Age,Starost pacijenta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Zaposleni ne može izvještavati sebi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposleni ne može izvještavati sebi
 DocType: Sales Invoice,Customer Address,Adresa kupca
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Imenovanja Zaposlenih (npr. Izvršni direktor, Direktor, itd.) ."
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Ukupan iznos {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Ukupno bez PDV-a (duguje)
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Slovima (izvoz) će biti vidljiv onda kad sačuvate otpremnicu
 DocType: Opportunity,Opportunity Date,Datum prilike
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označeno prisustvo HTML
 DocType: Sales Invoice Item,Delivery Note Item,Pozicija otpremnice
 DocType: Sales Invoice,Customer's Purchase Order,Porudžbenica kupca
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Dodaj stavke iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Dodaj stavke iz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Od {0} do {1}
 DocType: C-Form,Total Invoiced Amount,Ukupno fakturisano
 DocType: Purchase Invoice,Supplier Invoice Date,Datum fakture dobavljača
@@ -148,12 +150,12 @@
 DocType: Cash Flow Mapping Accounts,Account,Račun
 DocType: Company,Default Employee Advance Account,Podrazumjevani račun zaposlenog
 apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,Računovodstvo: {0} može samo da se ažurira u dijelu Promjene na zalihama
-DocType: Employee Leave Approver,Leave Approver,Odobrava izlaske s posla
+DocType: Department,Leave Approver,Odobrava izlaske s posla
 DocType: Authorization Rule,Customer or Item,Kupac ili proizvod
 DocType: Upload Attendance,Attendance To Date,Prisustvo do danas
 DocType: Material Request Plan Item,Requested Qty,Tražena kol
 DocType: Education Settings,Attendance Freeze Date,Datum zamrzavanja prisustva
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ne postoji artikal sa serijskim brojem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ne postoji artikal sa serijskim brojem {0}
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,Serial Number Series,Serijski broj serije
 DocType: Purchase Order,Delivered,Isporučeno
@@ -164,6 +166,7 @@
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +157,Physician not available on {0},Ljekar nije dostupan u {0}
+DocType: Payment Entry,Receive,Prijem
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Uplata već postoji
@@ -180,11 +183,11 @@
 DocType: Antibiotic,Healthcare Administrator,Administrator klinike
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovaj prodajni nalog na bilo kom projektu
 DocType: Quotation Item,Stock Balance,Pregled trenutne zalihe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Greška]
 DocType: Supplier,Supplier Details,Detalji o dobavljaču
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum zajednice
 ,Batch Item Expiry Status,Pregled artikala sa rokom trajanja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Plaćanje
 ,Sales Partners Commission,Provizija za prodajne partnere
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenovnik {0} je zaključan
@@ -198,7 +201,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Početno stanje (Po)
 DocType: Academic Term,Academics User,Akademski korisnik
 DocType: Student,Blood Group,Krvna grupa
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za dati kriterijum nema Zaposlenih. Provjerite da li su platne liste već kreirane
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za dati kriterijum nema Zaposlenih. Provjerite da li su platne liste već kreirane
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izjava o računu
 DocType: Delivery Note,Billing Address,Adresa za naplatu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +446,All Territories,Sve države
@@ -206,7 +209,7 @@
 DocType: Bin,Ordered Quantity,Poručena količina
 DocType: Lab Test Template,Standard Selling Rate,Standarna prodajna cijena
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Ukupno preostalo: {0}
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
 DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
 DocType: Student Attendance,Student Attendance,Prisustvo učenika
 apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Dodaj potrošeno vrijeme
@@ -219,18 +222,19 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Odsustvo i prisustvo
 ,Trial Balance for Party,Struktura dugovanja
 DocType: Program Enrollment Tool,New Program,Novi program
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Oporezivi iznos
 DocType: Product Bundle Item,Product Bundle Item,Sastavljeni proizvodi
 DocType: Payroll Entry,Select Employees,Odaberite Zaposlene
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Kreiraj evidenciju o Zaposlenom kako bi upravljali odsustvom, potraživanjima za troškove i platnim spiskovima"
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ovo se zasniva na pohađanju ovog zaposlenog
 DocType: Lead,Address & Contact,Adresa i kontakt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Napravi
 DocType: Bin,Reserved Qty for Production,Rezervisana kol. za proizvodnju
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ovo praćenje je zasnovano na kretanje zaliha. Pogledajte {0} za više detalja
 DocType: Training Event Employee,Training Event Employee,Obuke Zaposlenih
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti
 DocType: Consultation,Consultation Date,Datum pregleda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodajni agent
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodajni agent
 DocType: Item,Default Warehouse,Podrazumijevano skladište
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно не постоје залихе у складишту
 DocType: Company,Default Letter Head,Podrazumijevano zaglavlje
@@ -273,7 +277,7 @@
 DocType: Patient Appointment,Patient Appointment,Zakazivanje pacijenata
 DocType: BOM,Show In Website,Prikaži na web sajtu
 DocType: Payment Entry,Paid Amount,Uplaćeno
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Ukupno plaćeno
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Ukupno plaćeno
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +237,Purchase Receipt {0} is not submitted,Prijem robe {0} nije potvrđen
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Proizvodi i cijene
 DocType: Payment Entry,Account Paid From,Račun plaćen preko
@@ -281,19 +285,18 @@
 DocType: Purchase Invoice,Supplier Warehouse,Skladište dobavljača
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je obavezan podatak
 DocType: Item,Manufacturer,Proizvođač
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodajni iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodajni iznos
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Molimo podesite datum zasnivanja radnog odnosa {0}
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite isporukuili prijem robe ukoliko ne premaši ovaj procenat
 DocType: Shopping Cart Settings,Orders,Porudžbine
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Upravljanje kreditima Zaposlenih
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Promjene na zalihama
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Dodaj stavke iz
 ,Daily Timesheet Summary,Pregled dnevnog potrošenog vremena
 DocType: Project Task,View Timesheet,Pogledaj potrošeno vrijeme
 DocType: Purchase Invoice,Rounded Total (Company Currency),Zaokruženi ukupan iznos (valuta preduzeća)
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Isplatna lista Zaposlenog {0} kreirana je već za ovaj period
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ovaj artikal ima varijante, onda ne može biti biran u prodajnom nalogu."
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nije nađena evidancija o odsustvu Zaposlenog {0} za {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Nije nađena evidancija o odsustvu Zaposlenog {0} za {1}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijene iz cjenovnika (%)
 DocType: Item,Item Attribute,Atribut artikla
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
@@ -304,8 +307,8 @@
 DocType: Employee Internal Work History,Employee Internal Work History,Interna radna istorija Zaposlenog
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Korpa je prazna
 DocType: Patient,Patient Details,Detalji o pacijentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Unos zaliha {0} nije potvrđen
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Unos zaliha {0} nije potvrđen
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Ostatak svijeta
 DocType: Work Order,Additional Operating Cost,Dodatni operativni troškovi
 DocType: Purchase Invoice,Rejected Warehouse,Odbijeno skladište
 DocType: Asset Repair,Manufacturing Manager,Menadžer proizvodnje
@@ -313,7 +316,7 @@
 DocType: Purchase Invoice Item,Is Fixed Asset,Artikal je osnovno sredstvo
 ,POS,POS
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Timesheet {0} is already completed or cancelled,Potrošeno vrijeme {0} je već potvrđeno ili otkazano
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Pola dana)
 DocType: Shipping Rule,Net Weight,Neto težina
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Zapis o prisustvu {0} постоји kod studenata {1}
 DocType: Payment Entry Reference,Outstanding,Preostalo
@@ -330,11 +333,12 @@
 DocType: Quality Inspection,Report Date,Datum izvještaja
 DocType: POS Profile,Item Groups,Vrste artikala
 DocType: Pricing Rule,Discount Percentage,Procenat popusta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobit%
 DocType: Payment Request,Payment Request,Upit za plaćanje
 ,Purchase Analytics,Analiza nabavke
 DocType: Land Unit,Tree Details,Detalji stabla
 DocType: Upload Attendance,Upload Attendance,Priloži evidenciju
+DocType: GL Entry,Against,Povezano sa
 DocType: Grant Application,Requested Amount,Traženi iznos
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa email, telefon, poruke, posjete, itd."
 DocType: Purchase Order,Customer Contact Email,Kontakt e-mail kupca
@@ -349,11 +353,11 @@
 DocType: POS Item Group,Item Group,Vrste artikala
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +68,Age (Days),Starost (Dani)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Početno stanje (Du)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Preostalo za plaćanje
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Preostalo za plaćanje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idite na radnu površinu i krenite sa radom u programu
 DocType: Sales Person,Name and Employee ID,Ime i ID Zaposlenog
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikal {0} se javlja više puta u cjenovniku {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca
@@ -364,7 +368,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +57,Ageing Range 3,Opseg dospijeća 3
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Payment Entry,Account Paid To,Račun plaćen u
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Učesnik ne može biti označen za buduće datume
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Učesnik ne može biti označen za buduće datume
 DocType: Stock Entry,Sales Invoice No,Broj fakture prodaje
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Potrošeno vrijeme
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nemojte slati podsjetnik o rođendanima Zaposlenih
@@ -375,21 +379,24 @@
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +133,Please select a warehouse,Izaberite skladište
+DocType: Purchase Receipt Item,Received and Accepted,Primio i prihvatio
 DocType: Project,Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima
 DocType: Upload Attendance,Upload HTML,Priloži HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Usluge
 apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Korpa sa artiklima
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Ukupno plaćeno
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Ukupno plaćeno
 DocType: Warehouse,Warehouse Detail,Detalji o skldištu
 DocType: Quotation Item,Quotation Item,Stavka sa ponude
 DocType: Journal Entry Account,Employee Advance,Napredak Zaposlenog
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i veza
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Nalog {2} je neaktivan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,No Remarks,Nema napomene
 DocType: Notification Control,Purchase Receipt Message,Poruka u Prijemu robe
 DocType: Purchase Invoice,Taxes and Charges Deducted,Umanjeni porezi i naknade
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Ukupno fakturisano
+DocType: Sales Invoice,Include Payment (POS),Uključi POS plaćanje
+DocType: Sales Invoice,Customer PO Details,Pregled porudžbine kupca
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Ukupno fakturisano
 apps/erpnext/erpnext/public/js/stock_analytics.js +54,Select Brand...,Izaberite brend
 DocType: Item,Default Unit of Measure,Podrazumijevana jedinica mjere
 DocType: Purchase Invoice Item,Serial No,Serijski broj
@@ -429,10 +436,10 @@
 DocType: Purchase Order Item,Billed Amt,Fakturisani iznos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Ponuda dobavljaču {0} је kreirana
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dozvoljeno mijenjati Promjene na zalihama starije od {0}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Dodaj Zaposlenog
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Dodaj Zaposlenog
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Podešavanja Zaposlenih
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Skladište nije pronađeno u sistemu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Prisustvo zaposlenog {0} је već označeno za ovaj dan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sistemu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Prisustvo zaposlenog {0} је već označeno za ovaj dan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +267,Employee relieved on {0} must be set as 'Left',"Zaposleni smijenjen na {0} mora biti označen kao ""Napustio"""
 ,Lab Test Report,Izvještaj labaratorijskog testa
 DocType: Sales Invoice,Customer Name,Naziv kupca
@@ -448,7 +455,7 @@
 DocType: Project Task,Pending Review,Čeka provjeru
 DocType: Item,Default Selling Cost Center,Podrazumijevani centar troškova
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Još uvijek nema kupaca!
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Povraćaj prodaje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Povraćaj prodaje
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ovo je zasnovano na transkcijama ovog klijenta. Pogledajte vremensku liniju ispod za dodatne informacije
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Timesheet,Kreiraj potrošeno vrijeme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +65,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodajni nalog {0}već postoji veza sa porudžbenicom kupca {1}
@@ -464,16 +471,16 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervisana za proizvodnju
 DocType: Pricing Rule,Pricing Rule Help,Pravilnik za cijene pomoć
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Opseg dospijeća 2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Primanja Zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Primanja Zaposlenih
 DocType: POS Item Group,POS Item Group,POS Vrsta artikala
 DocType: Lead,Lead,Lead
 DocType: HR Settings,Employee Settings,Podešavanja zaposlenih
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledajte sve proizvode
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Pogledajte sve proizvode
 DocType: Patient Medical Record,Patient Medical Record,Medicinski karton pacijenta
 DocType: Shareholder,Address and Contacts,Adresa i kontakti
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ovo je zasnovano na transkcijama ovog preduzeća. Pogledajte vremensku liniju ispod za dodatne informacije
 DocType: Student Attendance Tool,Batch,Serija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Prijem robe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Prijem robe
 DocType: Item,Warranty Period (in days),Garantni rok (u danima)
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Korisnička baza podataka
 DocType: Attendance,Attendance Date,Datum prisustva
@@ -502,6 +509,7 @@
 DocType: Salary Component,Salary Component,Компонента плате
 DocType: Sales Invoice,Customer's Purchase Order Date,Datum porudžbenice kupca
 DocType: Item,Country of Origin,Zemlja porijekla
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Molimo izaberite registar Zaposlenih prvo
 DocType: Quotation,Order Type,Vrsta porudžbine
 DocType: BOM Item,Rate & Amount,Cijena i iznos sa rabatom
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Priloži evidenciju iz .csv datoteke
@@ -509,6 +517,7 @@
 DocType: Purchase Invoice,Tax ID,Poreski broj
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +42,WIP Warehouse,Wip skladište
 ,Itemwise Recommended Reorder Level,Pregled preporučenih nivoa dopune
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} veza sa računom {1} na datum {2}
 ,Requested Items To Be Ordered,Tražene stavke za isporuku
 DocType: Employee Attendance Tool,Unmarked Attendance,Neobilježeno prisustvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +585,Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen
@@ -524,7 +533,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Ponuda {0} je otkazana
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Purchase Order,Customer Mobile No,Broj telefona kupca
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Kol. za dopunu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Kol. za dopunu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Premještanje artikala
 DocType: Buying Settings,Buying Settings,Podešavanja nabavke
 DocType: Expense Claim,From Employee,Od Zaposlenog
@@ -532,13 +541,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +51,Stock Levels,Nivoi zalihe
 DocType: Sales Invoice Item,Rate With Margin (Company Currency),Cijena sa popustom (Valuta preduzeća)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Saldo (Po)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Sastavnica
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Sastavnica
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,Prodaja i povraćaji
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sinhronizuj podatke iz centrale
 DocType: Sales Person,Sales Person Name,Ime prodajnog agenta
 DocType: Landed Cost Voucher,Purchase Receipts,Prijemi robe
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje formi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prisustvo zaposlenog {0} je već označeno
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Prisustvo zaposlenog {0} je već označeno
 DocType: Project,% Complete Method,% metod vrednovanja završetka projekta
 DocType: Purchase Invoice,Overdue,Istekao
 DocType: Purchase Invoice,Posting Time,Vrijeme izrade računa
@@ -570,10 +579,10 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Postoji još jedan Prodavac {0} sa istim ID zaposlenog
 DocType: Item Group,Item Group Name,Naziv vrste artikala
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Isto ime grupe kupca već postoji. Promijenite ime kupca ili izmijenite grupu kupca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedan  {0} # {1} postoji u vezanom Unosu zaliha {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedan  {0} # {1} postoji u vezanom Unosu zaliha {2}
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Dobavljač
 DocType: Item,Has Serial No,Ima serijski broj
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposleni {0} na pola radnog vremena {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Zaposleni {0} na pola radnog vremena {1}
 DocType: Payment Entry,Difference Amount (Company Currency),Razlika u iznosu (Valuta)
 apps/erpnext/erpnext/public/js/utils.js +55,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Preduzeće i računi
@@ -590,14 +599,14 @@
 DocType: Project User,Project User,Projektni user
 DocType: Item,Customer Items,Proizvodi kupca
 DocType: Stock Reconciliation,SR/,SR /
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Stavka {0} je otkazana
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Stanje vrijed.
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Stavka {0} je otkazana
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Stanje vrijed.
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Prodajni nalog je obavezan za artikal {0}
 DocType: Consultation,Patient,Pacijent
 DocType: Stock Entry,Default Target Warehouse,Prijemno skladište
 DocType: GL Entry,Voucher No,Br. dokumenta
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Prisustvo je uspješno obilježeno.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serijski broj {0} kreiran
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serijski broj {0} kreiran
 DocType: Account,Asset,Osnovna sredstva
 DocType: Payment Entry,Received Amount,Iznos uplate
 ,Sales Funnel,Prodajni lijevak
@@ -607,13 +616,11 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Authorization Rule,Customer / Item Name,Kupac / Naziv proizvoda
 DocType: Timesheet,Total Billed Amount,Ukupno fakturisano
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Prijem vrije.
-DocType: Employee Loan,Employee Loan Application,Zahtjev  za kredit Zaposlenog
-DocType: Employee Loan,Employee Loan Account,Krediti za Zaposlene
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Prijem vrije.
 DocType: Expense Claim,Employees Email Id,ID email Zaposlenih
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,Tree Type,Tip stabla
 DocType: Stock Entry,Update Rate and Availability,Izmijenite cijenu i dostupnost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Ponuda dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Ponuda dobavljača
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladište
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade dodate
 DocType: Work Order,Warehouses,Skladišta
@@ -625,7 +632,7 @@
 DocType: Account,Stock,Zalihe
 DocType: Customer Group,Customer Group Name,Naziv grupe kupca
 DocType: Item,Is Sales Item,Da li je prodajni artikal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturisano
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturisano
 DocType: Purchase Invoice,Edit Posting Date and Time,Izmijeni datum i vrijeme dokumenta
 ,Inactive Customers,Neaktivni kupci
 DocType: Stock Entry Detail,Stock Entry Detail,Detalji unosa zaliha
@@ -642,11 +649,12 @@
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat za prisustvo Zaposlenih
 DocType: Salary Slip,Payment Days,Dana za plaćanje
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Zapošljavanje
+DocType: Purchase Invoice,Taxes and Charges Calculation,Izračun Poreza
 DocType: Appraisal,For Employee,Za Zaposlenog
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uslovi i odredbe šablon
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,Unos zaliha {0} je kreiran
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Pogledajte u korpi
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +567,Discount,Popust
 DocType: Packing Slip,Net Weight UOM,Neto težina  JM
 DocType: Selling Settings,Sales Order Required,Prodajni nalog je obavezan
@@ -670,7 +678,7 @@
 DocType: Account,Is Group,Je grupa
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 DocType: Item,Item Code for Suppliers,Dobavljačeva šifra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Povraćaj / knjižno zaduženje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Povraćaj / knjižno zaduženje
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
 ,LeaderBoard,Tabla
 DocType: Lab Test Groups,Lab Test Groups,Labaratorijske grupe
@@ -697,7 +705,7 @@
 ,Employees working on a holiday,Zaposleni koji rade za vrijeme praznika
 DocType: Payment Entry,Allocate Payment Amount,Poveži uplaćeni iznos
 DocType: Patient,Patient ID,ID pacijenta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Datum i vrijeme štampe
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Datum i vrijeme štampe
 DocType: Sales Invoice,Debit To,Zaduženje za
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalna podešavanja
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Keriraj Zaposlenog
@@ -707,13 +715,13 @@
 DocType: Asset,Journal Entry for Scrap,Knjiženje rastura i loma
 DocType: Item,Website Warehouse,Skladište web sajta
 DocType: Sales Invoice Item,Customer's Item Code,Šifra kupca
-DocType: Pricing Rule,Supplier,Dobavljači
+DocType: Bank Guarantee,Supplier,Dobavljači
 DocType: Purchase Invoice,Additional Discount Amount,Iznos dodatnog popusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 DocType: Announcement,Student,Student
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Naziv dobavljača
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,Prijem količine
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prodajna cijena
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Prodajna cijena
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Uvoz uspješan!
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Prikaži kao formu
@@ -730,9 +738,10 @@
 DocType: Stock Reconciliation,Difference Amount,Razlika u iznosu
 DocType: Journal Entry,User Remark,Korisnička napomena
 DocType: Notification Control,Quotation Message,Ponuda - poruka
+DocType: Purchase Order,% Received,% Primljeno
 DocType: Journal Entry,Stock Entry,Unos zaliha
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenovnik
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosječna prodajna cijena
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Prodajni cjenovnik
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Prosječna prodajna cijena
 DocType: Item,End of Life,Kraj proizvodnje
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
 DocType: Selling Settings,Default Customer Group,Podrazumijevana grupa kupaca
@@ -741,15 +750,14 @@
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno bez PDV-a (Valuta preduzeća)
 DocType: Healthcare Settings,Patient Name,Ime pacijenta
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
-DocType: Bank Guarantee,Start Date,Datum početka
 DocType: Notification Control,Delivery Note Message,Poruka na otpremnici
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne može se obrisati serijski broj {0}, dok god se nalazi u dijelu Promjene na zalihama"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne može se obrisati serijski broj {0}, dok god se nalazi u dijelu Promjene na zalihama"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novi Zaposleni
 apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,Kupci na čekanju
 DocType: Purchase Invoice,Price List Currency,Valuta Cjenovnika
 DocType: Authorization Rule,Applicable To (Employee),Primjenljivo na (zaposlene)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektni menadzer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektni menadzer
 DocType: Journal Entry,Accounts Receivable,Potraživanja od kupaca
 DocType: Purchase Invoice Item,Rate,Cijena sa popustom
 DocType: Project Task,View Task,Pogledaj zadatak
@@ -757,10 +765,10 @@
 DocType: Account,Expense,Rashod
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter-i
 DocType: Purchase Invoice,Select Supplier Address,Izaberite adresu dobavljača
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
 DocType: Restaurant Order Entry,Add Item,Dodaj stavku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Sve grupe kupca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Sve grupe kupca
 ,Employee Birthday,Rođendan Zaposlenih
 DocType: Project,Total Billed Amount (via Sales Invoices),Ukupno fakturisano (putem fakture prodaje)
 DocType: Purchase Invoice Item,Weight UOM,JM Težina
@@ -772,15 +780,14 @@
 DocType: Upload Attendance,Attendance From Date,Datum početka prisustva
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Artikli na zalihama
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Nova korpa
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Početna vrijednost
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Početna vrijednost
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Podešavanje stanja na {0}, pošto Zaposleni koji se priključio Prodavcima nema koririsnički ID {1}"
 DocType: Upload Attendance,Import Attendance,Uvoz prisustva
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analitika
 DocType: Email Digest,Bank Balance,Stanje na računu
 DocType: Education Settings,Employee Number,Broj Zaposlenog
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Novi {0}: # {1}
 DocType: Purchase Receipt Item,Rate and Amount,Cijena i vrijednost sa popustom
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Ukupno bez PDV-a'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Ukupno bez PDV-a'
 DocType: Purchase Invoice,Total Taxes and Charges,Porez
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Nisu pronađene aktivne ili podrazumjevane strukture plate za Zaposlenog {0} za dati period
 DocType: Purchase Order Item,Supplier Part Number,Dobavljačeva šifra
@@ -796,14 +803,14 @@
 DocType: Mode of Payment,General,Opšte
 DocType: Supplier,Default Payable Accounts,Podrazumijevani nalog za plaćanje
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Cijena: {0}
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Otpisati iznos
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Preostalo za plaćanje
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Otpisati iznos
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Preostalo za plaćanje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,Nije plaćeno i nije isporučeno
 DocType: Asset Maintenance Log,Planned,Planirano
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Izaberite cjenovnik
 DocType: Quality Inspection,Item Serial No,Seriski broj artikla
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Usluga kupca
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Usluga kupca
 DocType: Project Task,Working,U toku
 DocType: Cost Center,Stock User,Korisnik zaliha
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Glavna knjiga
@@ -816,36 +823,36 @@
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kontakt i adresa kupca
 DocType: Healthcare Settings,Employee name and designation in print,Ime i pozicija Zaposlenog
 DocType: Material Request Item,For Warehouse,Za skladište
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nabavni cjenovnik
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Nabavni cjenovnik
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +89,Please select Physician and Date,Izaberite ljekara i datum
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Pregled obaveze prema dobavljačima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnice {0} moraju biti otkazane prije otkazivanja prodajnog naloga
-DocType: Employee Loan,Total Payment,Ukupno plaćeno
+DocType: Loan,Total Payment,Ukupno plaćeno
 DocType: POS Settings,POS Settings,POS podešavanja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Iznos nabavke
 DocType: Purchase Invoice Item,Valuation Rate,Prosječna nab. cijena
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 DocType: Purchase Invoice,Invoice Copy,Kopija Fakture
 DocType: Journal Entry Account,Purchase Order,Porudžbenica
 DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
 DocType: GL Entry,Voucher Type,Vrsta dokumenta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski broj {0} je već primljen
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serijski broj {0} je već primljen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
 DocType: Material Request,% Ordered,%  Poručenog
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Cjenovnik nije odabran
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Cjenovnik nije odabran
 DocType: POS Profile,Apply Discount On,Primijeni popust na
 DocType: Item,Total Projected Qty,Ukupna projektovana količina
 DocType: Shipping Rule Condition,Shipping Rule Condition,Uslovi  pravila nabavke
 apps/erpnext/erpnext/config/stock.py +318,Opening Stock Balance,Početno stanje zalihe
 ,Customer Credit Balance,Kreditni limit kupca
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Adresa još nije dodata.
-DocType: C-Form Invoice Detail,Net Total,Ukupno bez PDV-a
+DocType: Subscription,Net Total,Ukupno bez PDV-a
 DocType: Sales Invoice,Total Qty,Ukupna kol.
 DocType: Purchase Invoice,Return,Povraćaj
 DocType: Sales Order Item,Delivery Warehouse,Skladište dostave
 DocType: Purchase Invoice,Total (Company Currency),Ukupno bez PDV-a (Valuta)
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Prilika
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Prilika
 DocType: Sales Order,Fully Delivered,Kompletno isporučeno
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se podrazumijeva za sve tipove Zaposlenih
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Označi prisustvo za više radnika
@@ -876,17 +883,16 @@
 DocType: Opening Invoice Creation Tool Item,Quantity,Količina
 DocType: Buying Settings,Purchase Receipt Required,Prijem robe je obavezan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je obavezna za Cjenovnik {0}
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Izdavanje vrije.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Izdavanje vrije.
 DocType: POS Customer Group,Customer Group,Grupa kupaca
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se jedino može promijeniti u dijelu Unos zaliha / Otpremnica / Prijem robe
 apps/erpnext/erpnext/hooks.py +136,Request for Quotations,Zahtjev za ponude
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Naučite
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučite
 DocType: Timesheet,Employee Detail,Detalji o Zaposlenom
 DocType: POS Profile,Ignore Pricing Rule,Zanemari pravilnik o cijenama
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Payment Entry,Cheque/Reference No,Broj izvoda
-DocType: C-Form,Series,Vrsta dokumenta
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Datum prisustva ne može biti raniji od datuma ulaska zaposlenog
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Datum prisustva ne može biti raniji od datuma ulaska zaposlenog
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kutija
 DocType: Payment Entry,Total Allocated Amount,Ukupno povezani iznos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese
@@ -903,36 +909,37 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervisana kol.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1753,Not items found,Ništa nije pronađeno
 DocType: Item,Copy From Item Group,Kopiraj iz vrste artikala
+DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 DocType: Purchase Taxes and Charges,On Net Total,Na ukupno bez PDV-a
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% završen
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} se ne nalazi u aktivnim poslovnim godinama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Brzo knjiženje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Brzo knjiženje
 DocType: Sales Order,Partly Delivered,Djelimično isporučeno
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Stanje
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvaliteta
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,Računovodstveni iskazi
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
 DocType: Project Type,Projects Manager,Projektni menadžer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Ponuda {0} ne propada {1}
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi ili usluge.
 DocType: Purchase Invoice,Rounded Total,Zaokruženi ukupan iznos
 DocType: Request for Quotation Supplier,Download PDF,Preuzmi PDF
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Ponuda
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Ponuda
 DocType: Lead,Mobile No.,Mobilni br.
 DocType: Item,Has Variants,Ima varijante
 DocType: Price List Country,Price List Country,Zemlja cjenovnika
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Datum dospijeća je obavezan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Korpa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Promjene na zalihama prije {0} su zamrznute
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposleni {0} nije aktivan ili ne postoji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Zaposleni {0} nije aktivan ili ne postoji
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Saldo (Du)
 DocType: Sales Invoice,Product Bundle Help,Sastavnica Pomoć
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Ukupno bez PDV-a {0} ({1})
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,ili
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahtjev za ponudu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
-DocType: Employee Advance,Expense Approver,Odobravatalj troškova
+DocType: Department,Expense Approver,Odobravatalj troškova
 DocType: Purchase Invoice,Supplier Invoice Details,Detalji sa fakture dobavljača
 DocType: Purchase Order,To Bill,Za fakturisanje
 apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Gant dijagram
@@ -940,14 +947,14 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,Naći aktivnu platnu strukturu {0} za zaposlenog {1} za određeni datum
 DocType: Company,Chart Of Accounts Template,Templejt za kontni plan
 DocType: Employee Attendance Tool,Marked Attendance,Označeno prisustvo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1}
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Ljekar {0} nije dostupan {1}
 DocType: Payment Entry Reference,Supplier Invoice No,Broj fakture dobavljača
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalna podešavanja za cjelokupan proces proizvodnje.
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос robe za proizvodnju
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalji o primarnom kontaktu
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposleni {0} na odsustvu {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Zaposleni {0} na odsustvu {1}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Vezni dokument
 DocType: Account,Accounts,Računi
 ,Requested,Tražena
@@ -966,9 +973,9 @@
 ,Ordered Items To Be Billed,Poručeni artikli za fakturisanje
 apps/erpnext/erpnext/config/education.py +230,Other Reports,Ostali izvještaji
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Kupovina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Otpremnice
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Otpremnice
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječima će biti vidljivo tek kada sačuvate prodajni nalog.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Прикажи одсечак плате
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Прикажи одсечак плате
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Troškovi aktivnosti po zaposlenom
 DocType: Journal Entry Account,Sales Order,Prodajni nalog
 DocType: Stock Entry,Customer or Supplier Details,Detalji kupca ili dobavljača
@@ -985,7 +992,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura {0} mora biti otkazana prije otkazivanja ovog prodajnog naloga
 DocType: Email Digest,New Quotations,Nove ponude
 apps/erpnext/erpnext/projects/doctype/project/project.js +95,Save the document first.,Prvo sačuvajte dokument
-DocType: Journal Entry Account,Employee Loan,Zajmovi Zaposlenih
 DocType: Item,Units of Measure,Jedinica mjere
 DocType: Antibiotic,Healthcare,Klinika
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Trenutna količina na zalihama
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 10353e6..0c6967b 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Одбацити Материјал Посетите {0} пре отказивања ове гаранцији
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Извештаји о процени
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Производи широке потрошње
-DocType: Purchase Receipt,Subscription Detail,Детаљи претплате
 DocType: Supplier Scorecard,Notify Supplier,Обавестите добављача
 DocType: Item,Customer Items,Предмети Цустомер
 DocType: Project,Costing and Billing,Коштају и обрачуна
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
 DocType: Item,Publish Item to hub.erpnext.com,Објављивање ставку да хуб.ерпнект.цом
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Уведомления по электронной почте
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,процена
 DocType: Item,Default Unit of Measure,Уобичајено Јединица мере
 DocType: SMS Center,All Sales Partner Contact,Све продаје партнер Контакт
-DocType: Employee,Leave Approvers,Оставите Аппроверс
+DocType: Department,Leave Approvers,Оставите Аппроверс
 DocType: Sales Partner,Dealer,Трговац
 DocType: Work Order,WO-,ВО-
 DocType: Consultation,Investigations,Истраге
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Провери доступност
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ово је засновано на трансакције против тог добављача. Погледајте рок доле за детаље
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,правни
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Актуелне тип порез не може бити укључен у стопу тачка у низу {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,правни
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Актуелне тип порез не може бити укључен у стопу тачка у низу {0}
 DocType: Bank Guarantee,Customer,Купац
 DocType: Purchase Receipt Item,Required By,Обавезно Би
 DocType: Delivery Note,Return Against Delivery Note,Повратак против отпремница
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Хеадс (или групе) против које рачуноводствене уноси се праве и биланси се одржавају.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Нема поднесених плата за обраду.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Нема поднесених плата за обраду.
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,схов отворен
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Неопходно је и данас предузети ову акцију за горе поменуто понављање
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Провери
 DocType: Pricing Rule,Apply On,Нанесите на
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Све Снабдевач Контакт
 DocType: Support Settings,Support Settings,Подршка подешавања
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Батцх артикла истека статус
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Банка Нацрт
 DocType: Membership,membership validaty section,чланак валидити сецтион
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 DocType: Consultation,Consultation,Консултације
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материјал
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Израда веб странице
 DocType: Opening Invoice Creation Tool Item,Quantity,Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Кредиты ( обязательства)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
 DocType: Item,Country of Origin,Земља порекла
 DocType: Soil Texture,Soil Texture Criteria,Критеријуми за текстуру земље
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Примарне контактне информације
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Отворених питања
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 DocType: Lab Test Groups,Add new line,Додајте нову линију
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,здравство
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Кашњење у плаћању (Дани)
@@ -89,7 +85,7 @@
 ,Delay Days,Дани одлагања
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Фактура
+DocType: Subscription Invoice,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Детаљна тежина артикла
 DocType: Asset Maintenance Log,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ров # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ров # {0}:
 DocType: Timesheet,Total Costing Amount,Укупно Цостинг Износ
 DocType: Delivery Note,Vehicle No,Нема возила
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Изаберите Ценовник
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Ворк Ин Прогресс
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Молимо одаберите датум
 DocType: Daily Work Summary Group,Holiday List,Холидаи Листа
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,рачуновођа
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,рачуновођа
 DocType: Hub Settings,Selling Price List,Продајна цена
 DocType: Patient,Tobacco Current Use,Употреба дувана
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Продајна стопа
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Продајна стопа
 DocType: Cost Center,Stock User,Сток Корисник
 DocType: Soil Analysis,(Ca+Mg)/K,(Ца + Мг) / К
 DocType: Company,Phone No,Тел
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Нови {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Послато је обавештење о почетној е-пошти
 ,Sales Partners Commission,Продаја Партнери Комисија
 DocType: Soil Texture,Sandy Clay Loam,Санди Цлаи Лоам
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Вредност Након Амортизација
 DocType: Student,O+,А +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,повезан
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Датум Присуство не може бити мањи од уласку датума запосленог
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Датум Присуство не може бити мањи од уласку датума запосленог
 DocType: Grading Scale,Grading Scale Name,Скала оцењивања Име
-DocType: Subscription,Repeat on Day,Понављам на дан
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,То јекорен рачун и не може се мењати .
 DocType: Sales Invoice,Company Address,Адреса предузећа
 DocType: BOM,Operations,Операције
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
+DocType: Subscription,Subscription Start Date,Датум почетка претплате
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ни у ком активном фискалној години.
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референца: {0}, Код товара: {1} Цустомер: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Датум завршетка пробног периода не може бити пре почетка пробног периода
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отварање за посао.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},БОМ није наведен за ставку подизвођача {0} на реду {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Patient,Married,Ожењен
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Није дозвољено за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Гет ставке из
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Гет ставке из
 DocType: Price List,Price Not UOM Dependant,Цена није УОМ зависна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,кочница уље
 DocType: Tax Rule,Tax Type,Пореска Тип
 ,Completed Work Orders,Завршени радни налоги
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,опорезиви износ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,опорезиви износ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтни тип документа мора бити један од потраживања трошкова или уноса дневника
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Избор БОМ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Ред # {0}: Референтни тип документа мора бити један од потраживања трошкова или уноса дневника
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Избор БОМ
 DocType: SMS Log,SMS Log,СМС Пријава
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Трошкови уручене пошиљке
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Управљају износ који се даје запосленом
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Обавештење о испоруци
 DocType: Journal Entry,Opening Entry,Отварање Ентри
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Рачун плаћате само
-DocType: Employee Loan,Repay Over Number of Periods,Отплатити Овер број периода
+DocType: Loan,Repay Over Number of Periods,Отплатити Овер број периода
 DocType: Stock Entry,Additional Costs,Додатни трошкови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
 DocType: Lead,Product Enquiry,Производ Енкуири
 DocType: Education Settings,Validate Batch for Students in Student Group,Потврди Батцх за студенте у Студентском Групе
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Но одсуство запис фоунд фор запосленом {0} за {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Но одсуство запис фоунд фор запосленом {0} за {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Молимо унесите прва компанија
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Одредите прво Компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Одредите прво Компанија
 DocType: Employee Education,Under Graduate,Под Дипломац
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Молимо подесите подразумевани образац за обавештење о статусу Леаве Статус у ХР поставкама.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
 DocType: Soil Analysis,Ca/K,Ца / К
-DocType: Journal Entry Account,Employee Loan,zaposleni кредита
 DocType: Fee Schedule,Send Payment Request Email,Пошаљите захтев за плаћање
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Некретнине
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Успешно нерегистровани.
 DocType: Assessment Result,Grade,разред
 DocType: Restaurant Table,No of Seats,Број седишта
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Да бисте додали динамичку тему, користите јинџинске ознаке <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: Asset Maintenance Task,Asset Maintenance Task,Задатак одржавања средстава
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Годишња плата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Годишња плата
 DocType: Daily Work Summary,Daily Work Summary,Дневни Рад Преглед
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} је замрзнут
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Акции Расходы
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Акции Расходы
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Селецт Таргет Варехоусе
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Селецт Таргет Варехоусе
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Молимо Вас да унесете предност контакт емаил
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Молимо Вас да унесете предност контакт емаил
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,ЦомпАукНум
 DocType: Journal Entry,Contra Entry,Цонтра Ступање
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Примарна адреса
 DocType: Production Plan,Material Request Detail,Захтев за материјал за материјал
 DocType: Selling Settings,Default Quotation Validity Days,Подразумевани дани валуте квотирања
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 DocType: Sales Invoice,Change Amount,Промена Износ
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Возачке дозволе категорије
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Молимо унесите датум испоруке
 DocType: Depreciation Schedule,Make Depreciation Entry,Маке Трошкови Ентри
+DocType: HR Settings,Leave Settings,Оставите подешавања
 DocType: Appraisal Template Goal,KRA,Гром
 DocType: Lead,Request Type,Захтев Тип
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Маке Емплоиее
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,радиодифузија
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Начин подешавања ПОС (Онлине / Оффлине)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Онемогућава креирање евиденција времена против радних налога. Операције неће бити праћене радним налогом
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,извршење
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,извршење
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Asset Maintenance Log,Maintenance Status,Одржавање статус
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Детаљи о чланству
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Добављач је обавезан против плативог обзир {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Предмети и цене
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Укупно часова: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датума треба да буде у оквиру фискалне године. Под претпоставком Од датума = {0}
 DocType: Drug Prescription,Interval,Интервал
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Предност
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Предност
 DocType: Grant Application,Individual,Појединац
 DocType: Academic Term,Academics User,akademici Корисник
 DocType: Cheque Print Template,Amount In Figure,Износ На слици
-DocType: Employee Loan Application,Loan Info,kredit информације
+DocType: Loan Application,Loan Info,kredit информације
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План одржавања посете.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период добављача Сцорецард
 DocType: Share Transfer,Share Transfer,Схаре Трансфер
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Шаблон предмета
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Биокемија
 DocType: Job Offer,Select Terms and Conditions,Изаберите Услови
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,od Вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,od Вредност
 DocType: Woocommerce Settings,Woocommerce Settings,Вооцоммерце Сеттингс
 DocType: Production Plan,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Уобичајено Територија
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,телевизија
 DocType: Work Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Изаберите купца или добављача.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,ЈоурналЦоде
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Company,Enable Perpetual Inventory,Омогући Перпетуал Инвентори
+DocType: Bank Guarantee,Charges Incurred,Напуштени трошкови
 DocType: Company,Default Payroll Payable Account,Уобичајено Плате плаћају рачун
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Упдате-маил Група
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Прилагођени резултат
 DocType: Delivery Stop,Contact Name,Контакт Име
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критеријуми процене цоурсе
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Пиб:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Пиб:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Студент ИД:
 DocType: POS Customer Group,POS Customer Group,ПОС клијента Група
 DocType: Land Unit,Land Unit describing various land assets,Земаљска јединица која описује различите имовине земљишта
@@ -375,9 +372,8 @@
 ,Open Work Orders,Отворите радне налоге
 DocType: Payment Term,Credit Months,Кредитни месеци
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Нето плата не може бити мања од 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Да бисте зауставили слање понављајућих обавештења о грешци из система, у претплати смо означили поље Дисаблед"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Леавес по години
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
 DocType: Email Digest,Profit & Loss,Губитак профита
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Молим поставите студенте под студентске групе
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Банк unosi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Банк unosi
 DocType: Crop,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Студент Група Стварање Алат курс
 DocType: Lead,Do Not Contact,Немојте Контакт
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Људи који предају у вашој организацији
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Софтваре Девелопер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Course Scheduling Tool,Course Start Date,Наравно Почетак
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Објављивање у Хуб
 DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 ,GSTR-2,ГСТР-2
 DocType: Item,Purchase Details,Куповина Детаљи
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Мак Граде
 DocType: Email Digest,New Quotations,Нове понуде
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Емаилс плата клизање да запосленом на основу пожељног е-маил одабран у запосленог
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Tax Rule,Shipping County,Достава жупанија
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Научити
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Научити
 DocType: Asset,Next Depreciation Date,Следећа Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Активност Трошкови по запосленом
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Изузетне чекова и депозити до знања
 DocType: Item,Synced With Hub,Синхронизују са Хуб
 DocType: Driver,Fleet Manager,флота директор
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може бити негативна за ставку {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може бити негативна за ставку {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Молимо подесите Хотел Роом Рате на {}
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Opening Invoice Creation Tool,Invoice Type,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Обавештење о пријему пошиљке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Обавештење о пријему пошиљке
 DocType: Consultation,Encounter Impression,Енцоунтер Импрессион
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Набавна вредност продате Ассет
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Course Scheduling Tool,Course Scheduling Tool,Наравно Распоред Алат
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Ургент] Грешка приликом креирања понављајућег% с за% с
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
 DocType: Land Unit,LInked Analysis,ЛИнкед Аналисис
 DocType: Item Tax,Tax Rate,Пореска стопа
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Период примене не може бити преко две евиденције алокације
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Период примене не може бити преко две евиденције алокације
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Примљено
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створити студентских група
 DocType: Volunteer,Weekends,Викенди
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Кредит Напомена Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Кредит Напомена Износ
 DocType: Setup Progress Action,Action Document,Акциони документ
 DocType: Chapter Member,Website URL,Вебсите УРЛ
 ,Finished Goods,готове робе
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ЕРПНект демо
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додај артикле
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ставка Провера квалитета Параметар
+DocType: Leave Application,Leave Approver Name,Оставите одобраватељ Име
 DocType: Depreciation Schedule,Schedule Date,Распоред Датум
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Зарада, пореза и других плата компоненте"
 DocType: Packed Item,Packed Item,Испорука Напомена Паковање јединице
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Захтев за понуду
 DocType: Healthcare Settings,Require Lab Test Approval,Захтевати одобрење за тестирање лабораторија
 DocType: Salary Slip Timesheet,Working Hours,Радно време
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Тотал Оутстандинг
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Тотал Оутстандинг
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
 DocType: Dosage Strength,Strength,Снага
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Креирајте нови клијента
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Потрошни трошкова
 DocType: Purchase Receipt,Vehicle Date,Датум возила
 DocType: Student Log,Medical,медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Разлог за губљење
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Разлог за губљење
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Ажурирај број рачуна
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Олово Власник не може бити исти као и олова
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Издвојила износ не може већи од износа неприлагонене
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Самац
 DocType: Salary Slip,Total Loan Repayment,Укупно Отплата кредита
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
-DocType: Subscription,Yearly,Годишње
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Унесите трошка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Унесите трошка
 DocType: Drug Prescription,Dosage,Дозирање
 DocType: Journal Entry Account,Sales Order,Продаја Наручите
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Про. Продајни
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Про. Продајни
 DocType: Assessment Plan,Examiner Name,испитивач Име
 DocType: Lab Test Template,No Result,Без резултата
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Молимо унесите прво име компаније
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте ЕРПНект Мануал
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Покажите листе свих чланова Одељења у календару
 DocType: Purchase Invoice,01-Sales Return,01-Повратак продаје
 DocType: Account,Is Group,Је група
 DocType: Email Digest,Pending Purchase Orders,Куповина на чекању Ордерс
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Обавезно поље - школска година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} није повезан са {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Прилагодите уводни текст који иде као део тог поште. Свака трансакција има посебан уводном тексту.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Молимо поставите подразумевани се плаћају рачун за предузећа {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Молимо поставите подразумевани се плаћају рачун за предузећа {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Трансакција није дозвољена заустављена Радни налог {0}
 DocType: Setup Progress Action,Min Doc Count,Мин Доц Цоунт
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Резервисан за продају
 DocType: Packing Slip,From Package No.,Од Пакет број
 DocType: Item Attribute,To Range,У распону
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не могу променити метод процене, јер постоје трансакције против неких ставки које га нема сопствену метод вредновања"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не могу променити метод процене, јер постоје трансакције против неких ставки које га нема сопствену метод вредновања"
 DocType: Student Report Generation Tool,Attended by Parents,Присуствују родитељи
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Patient,AB Positive,АБ Позитиван
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Гледалаца рекорд.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за плате на основу ТимеСхеет.
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
-DocType: Employee Loan,Total Payment,Укупан износ
+DocType: Loan,Total Payment,Укупан износ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Не могу отказати трансакцију за Завршени радни налог.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} је отказана тако да акција не може бити завршен
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Довољно Делови за изградњу
 DocType: POS Profile User,POS Profile User,ПОС Профил корисника
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
+DocType: Subscription Invoice,Subscription Invoice,Рачун за претплату
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Прямая прибыль
 DocType: Patient Appointment,Date TIme,Датум време
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Административни службеник
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Успостављање предузећа и пореза
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
 DocType: Codification Table,Codification Table,Табела кодификације
 DocType: Timesheet Detail,Hrs,хрс
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Молимо изаберите Цомпани
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry Detail,Difference Account,Разлика налог
 DocType: Purchase Invoice,Supplier GSTIN,добављач ГСТИН
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Шаблон за мапирање готовог тока
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
+DocType: Bank Guarantee,Providing,Пружање
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Није допуштено, конфигурирати Лаб Тест Темплате по потреби"
 DocType: Patient,Risk Factors,Фактори ризика
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
 DocType: Healthcare Settings,Appointment Confirmation,Потврда о именовању
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Затварање (Цр)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здраво
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,мове артикла
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Већ је постављено подразумевано у профилу пос {0} за корисника {1}, љубазно онемогућено подразумевано"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,акумулиране вредности
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Територија је потребна у ПОС профилу
 DocType: Supplier,Prevent RFQs,Спречите РФКс
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Маке Продаја Наручите
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Износ плата за период од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Износ плата за период од {0} до {1}
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Датум испоруке
 DocType: Production Plan,Production Plan,План производње
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Отварање алата за креирање фактуре
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Продаја Ретурн
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Напомена: Укупно издвојена лишће {0} не сме бити мањи од већ одобрених лишћа {1} за период
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Поставите количину у трансакцијама на основу Серијски број улаза
 ,Total Stock Summary,Укупно Сток Преглед
 DocType: Announcement,Posted By,Поставио
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Додељена сума не може бити негативан
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Подесите Цомпани
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Подесите Цомпани
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Training Result Employee,Training Result Employee,Обука запослених Резултат
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
-DocType: Repayment Schedule,Principal Amount,Основицу
-DocType: Employee Loan Application,Total Payable Interest,Укупно оплате камата
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Основицу
+DocType: Loan Application,Total Payable Interest,Укупно оплате камата
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Укупно изузетно: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продаја Фактура Тимесхеет
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
 DocType: Restaurant Reservation,Restaurant Reservation,Резервација ресторана
 DocType: Land Unit,Land Unit Name,Назив јединице земље
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Писање предлога
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Писање предлога
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаћање Ступање дедукције
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Окончање
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Обавештавајте купце путем е-поште
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Обавештавајте купце путем е-поште
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Још једна особа Продаја {0} постоји са истим запослених ид
 DocType: Employee Advance,Claimed Amount,Захтевани износ
 apps/erpnext/erpnext/config/education.py +180,Masters,Мајстори
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Паимент Гатеваи налог није створен, ручно направите."
 DocType: Supplier Scorecard,Per Year,Годишње
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Није прихватљиво за пријем у овом програму према ДОБ-у
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
 DocType: Sales Invoice,Sales Taxes and Charges,Продаја Порези и накнаде
 DocType: Employee,Organization Profile,Профиль организации
 DocType: Vital Signs,Height (In Meter),Висина (у метрима)
 DocType: Student,Sibling Details,Сиблинг Детаљи
 DocType: Vehicle Service,Vehicle Service,Сервис возила
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Аутоматски активира захтев повратне на основу услова.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Аутоматски активира захтев повратне на основу услова.
 DocType: Employee,Reason for Resignation,Разлог за оставку
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Шаблон для аттестации .
 DocType: Sales Invoice,Credit Note Issued,Кредит Напомена Издато
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Одржавање Распоред
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Нето промена у инвентару
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Запослени Менаџмент кредита
 DocType: Employee,Passport Number,Пасош Број
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Однос са Гуардиан2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,менаџер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,менаџер
 DocType: Payment Entry,Payment From / To,Плаћање Фром /
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Молимо поставите налог у складишту {0}
@@ -894,24 +890,24 @@
 DocType: Item,Material Transfer,Пренос материјала
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Не могу пронаћи путању за
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Открытие (д-р )
+DocType: Loan,Applicant,Подносилац захтева
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Да правите понављајуће документе
 ,GST Itemised Purchase Register,ПДВ ставкама Куповина Регистрација
 DocType: Course Scheduling Tool,Reschedule,Поново распоред
-DocType: Employee Loan,Total Interest Payable,Укупно камати
+DocType: Loan,Total Interest Payable,Укупно камати
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Истовара порези и таксе
 DocType: Work Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,завршити
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,база
 DocType: Timesheet,Total Billed Hours,Укупно Обрачунате сат
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Отпис Износ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Отпис Износ
 DocType: Leave Block List Allow,Allow User,Дозволите кориснику
 DocType: Journal Entry,Bill No,Бил Нема
 DocType: Company,Gain/Loss Account on Asset Disposal,Добитак / губитак налог на средства одлагању
 DocType: Vehicle Log,Service Details,Сервице Детаљи
 DocType: Vehicle Log,Service Details,Сервице Детаљи
-DocType: Subscription,Quarterly,Тромесечни
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,ЕцритуреЛиб
 DocType: Lab Test Template,Grouped,Груписано
 DocType: Selling Settings,Delivery Note Required,Испорука Напомена Обавезно
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Распоред
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Бацкфлусх сировине на основу
 DocType: Sales Invoice,Port Code,Порт Цоде
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Резервни склад
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Резервни склад
 DocType: Lead,Lead is an Organization,Олово је организација
 DocType: Guardian Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Пре продаје
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,Рачуни
 DocType: Vehicle,Odometer Value (Last),Одометер вредност (Задња)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони за критеријуме резултата добављача.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Плаћање Ступање је већ направљена
 DocType: Request for Quotation,Get Suppliers,Узмите добављача
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Преглед плата Слип
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Преглед плата Слип
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Можете обновити само ако ваше чланство истекне у року од 30 дана
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Само изаберите ако имате поставке Мап Фловер Доцументс
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Supplier Scorecard,Per Week,Недељно
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Тотал Студент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Фицхиер дес Ецритурес Цомптаблес [ФЕЦ]
 DocType: Journal Entry,Credit Card Entry,Кредитна картица Ступање
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанија и рачуни
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,у вредности
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,у вредности
 DocType: Asset Settings,Depreciation Options,Опције амортизације
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Неисправно време слања порука
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Неисправно време слања порука
 DocType: Lead,Campaign Name,Назив кампање
 DocType: Hotel Room,Capacity,Капацитет
 DocType: Selling Settings,Close Opportunity After Days,Близу Прилика Након неколико дана
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Наруџбенице купца Нема
 DocType: Budget,Budget Against,буџет protiv
 DocType: Employee,Cell Number,Мобилни број
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дат критериј нема запосленог. Проверите да ли су листови плата још увек нису креирани.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дат критериј нема запосленог. Проверите да ли су листови плата још увек нису креирани.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изаберите табелу
 DocType: BOM,Website Specifications,Сајт Спецификације
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} је неважећа адреса е-поште у &#39;Примаоцима&#39;
 DocType: Special Test Items,Particulars,Спецулатионс
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} типа {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Од {0} типа {1}
 DocType: Warranty Claim,CI-,ЦИ-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
 DocType: Student,A+,А +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правила постоји са истим критеријумима, молимо вас да решавају конфликте са приоритетом. Цена Правила: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Asset,Maintenance,Одржавање
+DocType: Subscriber,Subscriber,Претплатник
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Молимо Вас да ажурирате свој статус пројекта
 DocType: Item,Maximum sample quantity that can be retained,Максимална количина узорка која се може задржати
@@ -1076,26 +1072,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Дефаулт сеттингс фор Корпа
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Додај Тимеслотс
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Средство укинуо преко књижење {0}
-DocType: Employee Loan,Interest Income Account,Приход од камата рачуна
+DocType: Loan,Interest Income Account,Приход од камата рачуна
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Послати позив за преглед
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,биотехнологија
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Офис эксплуатационные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Офис эксплуатационные расходы
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Иди на
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Подешавање Емаил налога
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Молимо унесите прва тачка
 DocType: Asset Repair,Downtime,Време заустављања
 DocType: Account,Liability,одговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Академски термин:
 DocType: Salary Detail,Do not include in total,Не укључујте у потпуности
 DocType: Company,Default Cost of Goods Sold Account,Уобичајено Набавна вредност продате робе рачуна
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Количина узорка {0} не може бити већа од примљене количине {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Request for Quotation Supplier,Send Email,Сенд Емаил
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 DocType: Item,Max Sample Quantity,Максимална количина узорка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Без дозвола
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Без дозвола
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Цитирај молио
 DocType: Vital Signs,Heart Rate / Pulse,Срце / пулса
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
@@ -1106,12 +1102,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Лабораторијски тестови и витални знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не работник не найдено
-DocType: Subscription,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студент Група је већ ажуриран.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студент Група је већ ажуриран.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Ажурирање пројекта.
 DocType: SMS Center,All Customer Contact,Све Кориснички Контакт
 DocType: Land Unit,Tree Details,трее Детаљи
@@ -1161,7 +1156,6 @@
 DocType: Stock Entry,STE-,аортна
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Все Группы товаров
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Work Order,Item To Manufacture,Ставка за производњу
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,ЦомптеЛиб
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} статус {2}
@@ -1175,7 +1169,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Поново изабери, ако је одабрана адреса уређена након чувања"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 DocType: Item,Hub Publishing Details,Детаљи издавања станице
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Отварање&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Отварање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
 DocType: Lab Test Template,Result Format,Формат резултата
@@ -1185,7 +1179,7 @@
 DocType: Payroll Entry,Bimonthly,часопис који излази свака два месеца
 DocType: Vehicle Service,Brake Pad,brake Пад
 DocType: Fertilizer,Fertilizer Contents,Садржај ђубрива
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Истраживање и развој
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Истраживање и развој
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Износ на Предлог закона
 DocType: Company,Registration Details,Регистрација Детаљи
 DocType: Timesheet,Total Billed Amount,Укупно Приходована Износ
@@ -1199,7 +1193,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Провјерите кредитни лимит за обилазницу на налогу за продају
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Учинка.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Омогућавање &#39;Користи се за Корпа &quot;, као што је омогућено Корпа и требало би да постоји најмање један Пореска правила за Корпа"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ступање плаћање {0} је повезан против налога {1}, провери да ли треба да се повуче као напредак у овој фактури."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ступање плаћање {0} је повезан против налога {1}, провери да ли треба да се повуче као напредак у овој фактури."
 DocType: Sales Invoice Item,Stock Details,Сток Детаљи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Пројекат Вредност
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Место продаје
@@ -1233,7 +1227,7 @@
 DocType: Restaurant Table,Minimum Seating,Минимално седиште
 DocType: Item Attribute,Item Attribute Values,Итем Особина Вредности
 DocType: Examination Result,Examination Result,преглед резултата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Куповина Пријем
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Референце Тип документа мора бити један од {0}
@@ -1241,15 +1235,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Work Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,БОМ {0} мора бити активна
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Нема ставки за пренос
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Нема ставки за пренос
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Затварање (отварање + укупно)
 DocType: Journal Entry,Depreciation Entry,Амортизација Ступање
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Crop Cycle,ISO 8016 standard,ИСО 8016 стандард
 DocType: Pricing Rule,Rate or Discount,Стопа или попуст
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обавезно Кол
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Омиљени
 DocType: Hub Settings,Custom Data,Кориснички подаци
@@ -1261,9 +1255,9 @@
 DocType: Medical Code,Medical Code Standard,Медицал Цоде Стандард
 DocType: Soil Texture,Clay Composition (%),Глина састав (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Молимо вас да сачувате пре него што додате задатак.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Биланс Вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Биланс Вредност
 DocType: Lab Test,Lab Technician,Лаборант
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Продаја Ценовник
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ако се провери, биће креиран корисник, мапиран на Патиент. Пацијентове фактуре ће бити створене против овог Корисника. Такође можете изабрати постојећег купца током стварања Пацијента."
 DocType: Bank Reconciliation,Account Currency,Рачун Валута
@@ -1271,16 +1265,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Молимо да наведете заокружују рачун у компанији
 DocType: Purchase Receipt,Range,Домет
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
 DocType: Item Barcode,Item Barcode,Ставка Баркод
 DocType: Woocommerce Settings,Endpoints,Ендпоинтс
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","да се генерише. Ако је одложено, морате ручно промијенити поље &quot;Понови на дан дана&quot; овога"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
 DocType: Share Transfer,From Folio No,Од Фолио Но
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
@@ -1315,16 +1307,17 @@
 DocType: Asset,Available-for-use Date,Датум доступан за употребу
 DocType: Guardian,Guardian Name,гуардиан Име
 DocType: Cheque Print Template,Has Print Format,Има Принт Формат
-DocType: Employee Loan,Sanctioned,санкционисан
+DocType: Loan,Sanctioned,санкционисан
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,је обавезно. Можда Мењачница запис није створен за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
 DocType: Crop Cycle,Crop Cycle,Цроп Цицле
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;производ&#39; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За &#39;производ&#39; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
 DocType: Student Admission,Publish on website,Објави на сајту
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Добављач Фактура Датум не може бити већи од датума када је послата
+DocType: Subscription,Cancelation Date,Датум отказивања
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
 DocType: Agriculture Task,Agriculture Task,Пољопривреда задатак
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Косвенная прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Косвенная прибыль
 DocType: Student Attendance Tool,Student Attendance Tool,Студент Присуство Алат
 DocType: Restaurant Menu,Price List (Auto created),Ценовник (Аутоматски креиран)
 DocType: Cheque Print Template,Date Settings,Датум Поставке
@@ -1351,6 +1344,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Метар
 DocType: Workstation,Electricity Cost,Струја Трошкови
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Тестирање лабораторије за датотиме не може бити пре снимања датетиме
+DocType: Subscription Plan,Cost,Трошкови
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
 DocType: Expense Claim,Total Advance Amount,Укупан авансни износ
 DocType: Delivery Stop,Estimated Arrival,Процењено време доласка
@@ -1362,15 +1356,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
 DocType: Timesheet Detail,Bill,рачун
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бео
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Из листе поља за потврду можете изабрати највише једне опције.
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
 DocType: Item,Automatically Create New Batch,Аутоматски Направи нови Батцх
 DocType: Item,Automatically Create New Batch,Аутоматски Направи нови Батцх
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Додјељивање {0} до {1} (ред {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Правити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Додјељивање {0} до {1} (ред {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Правити
 DocType: Student Admission,Admission Start Date,Улаз Датум почетка
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Нови запослени
@@ -1386,7 +1380,7 @@
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс Износ кредита
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Распоред курса
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Сток Опције
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Онемогућите преузимање задње куповне детаље у налогу за куповину
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
@@ -1405,11 +1399,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Паковање Слип Итем
 DocType: Purchase Invoice,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Наведите {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Креирање варијанте је стављено у ред.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Преглед радова за {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Атрибут сто је обавезно
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Први лист за отпустање на листи биће постављен као подразумевани Одобрење за дозволу.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Plan,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} не може бити негативан
 DocType: Training Event,Self-Study,Само-студирање
@@ -1422,7 +1417,7 @@
 DocType: Workstation,Wages,Плате
 DocType: Asset Maintenance,Maintenance Manager Name,Име менаџера одржавања
 DocType: Agriculture Task,Urgent,Хитан
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Наведите важећу Ров ИД за редом {0} у табели {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Наведите важећу Ров ИД за редом {0} у табели {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Није могуће пронаћи варијаблу:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Молимо изаберите поље за уређивање из нумпад-а
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Не може бити основна ставка средства као што је креирана књига залиха.
@@ -1434,7 +1429,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Назив шаблона за проверу квалитета
 DocType: Project,First Email,Прва е-пошта
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Резервисано Магацин у Продаја Наручите / складиште готове робе
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продаја Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продаја Износ
 DocType: Repayment Schedule,Interest Amount,Износ камате
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Share Transfer,Issue,Емисија
@@ -1448,10 +1443,10 @@
 DocType: Tax Rule,Shipping State,Достава Држава
 ,Projected Quantity as Source,Пројектована Количина као извор
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Достава путовања
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Достава путовања
 DocType: Student,A-,А-
 DocType: Share Transfer,Transfer Type,Тип преноса
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Коммерческие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Коммерческие расходы
 DocType: Consultation,Diagnosis,Дијагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
@@ -1460,12 +1455,13 @@
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Поштански број
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Салес Ордер {0} је {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Изаберите каматни приход у кредиту {0}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
 DocType: Item,Default Supplier,Уобичајено Снабдевач
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над производњом Исправка Проценат
-DocType: Employee Loan,Repayment Schedule,отплате
+DocType: Loan,Repayment Schedule,отплате
 DocType: Shipping Rule Condition,Shipping Rule Condition,Достава Правило Стање
 DocType: Holiday List,Get Weekly Off Dates,Гет Офф Недељно Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше , чем Дата начала"
@@ -1480,7 +1476,7 @@
 DocType: Education Settings,Attendance Freeze Date,Присуство Замрзавање Датум
 DocType: Education Settings,Attendance Freeze Date,Присуство Замрзавање Датум
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Погледајте остале производе
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Погледајте остале производе
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минималну предност (дани)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Минималну предност (дани)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,sve БОМ
@@ -1489,14 +1485,16 @@
 DocType: Expense Claim,From Employee,Од запосленог
 DocType: Driver,Cellphone Number,број мобилног
 DocType: Project,Monitor Progress,Напредак монитора
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Направите унос Дифференце
+DocType: Supplier Quotation,Auto Repeat Section,Ауто Репеат Одељак
 DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума
 DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област
 DocType: Program Enrollment,Transportation,транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,неважећи Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} должны быть представлены
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Количина мора бити мањи од или једнак {0}
+DocType: Department Approver,Department Approver,Одељење Одељења
 DocType: SMS Center,Total Characters,Укупно Карактери
 DocType: Employee Advance,Claimed,Тврди
 DocType: Crop,Row Spacing,Размак редова
@@ -1506,6 +1504,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаћање Помирење Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Допринос%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Према куповина Сеттингс ако Потребна је поруџбеница == &#39;ДА&#39;, а затим за стварање фактури, корисник треба да креира налога за куповину прво за ставку {0}"
+,HSN-wise-summary of outward supplies,ХСН-мудар-резиме оутерних залиха
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,. Компанија регистарски бројеви за референцу Порески бројеви итд
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
@@ -1519,7 +1518,7 @@
 DocType: Setup Progress Action,Action Name,Назив акције
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,старт Година
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Прве 2 цифре ГСТИН треба да одговара државном бројем {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,ПДЦ / ЛЦ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,ПДЦ / ЛЦ
 DocType: Purchase Invoice,Start date of current invoice's period,Почетак датум периода текуће фактуре за
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Капацитет Планирање Грешка
@@ -1537,26 +1536,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поља ће бити копирана само у тренутку креирања.
 DocType: Setup Progress Action,Domains,Домени
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,управљање
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,управљање
 DocType: Cheque Print Template,Payer Settings,обвезник Подешавања
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Опрез
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Дан почетка је већи од краја дана у задатку &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Повратак / задужењу
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Повратак / задужењу
 DocType: Price List Country,Price List Country,Ценовник Земља
 DocType: Item,UOMs,УОМс
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
 DocType: Purchase Invoice Item,UOM Conversion Factor,УОМ конверзије фактор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Молимо Вас да унесете Код товара да се број серије
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
-DocType: Employee Loan,Partially Disbursed,Делимично Додељено
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Грант информације.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Грант информације.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдевач базе података.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Не можете поново покренути претплату која није отказана.
 DocType: Account,Balance Sheet,баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
 DocType: Fee Validity,Valid Till,Важи до
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Укупно састанак учитеља родитеља
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
@@ -1569,7 +1568,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Промена клијентске групе за изабраног клијента није дозвољена.
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Ажурирање процењених времена доласка.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ажурирање процењених времена доласка.
 DocType: Program Enrollment Tool,Enrollment Details,Детаљи уписа
 DocType: Purchase Invoice Item,Net Rate,Нето курс
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Изаберите купца
@@ -1590,18 +1589,20 @@
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Purchase Order,Group same items,Група исте ставке
 DocType: Purchase Invoice,Disable Rounded Total,Онемогући Роундед Укупно
-DocType: Employee Loan Application,Repayment Info,otplata информације
+DocType: Department,Parent Department,Одељење родитеља
+DocType: Loan Application,Repayment Info,otplata информације
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 DocType: Maintenance Team Member,Maintenance Role,Улога одржавања
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Фискална година {0} није пронађен
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Фискална година {0} није пронађен
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Подешавање Запослени
 DocType: Sales Order,SO-,ТАКО-
 DocType: Hotel Room Reservation,Hotel Reservation User,Резервација корисника хотела
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Student,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,истраживање
+DocType: Subscription Settings,Subscription Settings,Подешавања претплате
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Announcement,All Students,Сви студенти
@@ -1612,19 +1613,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Crop Cycle,Less than a year,Мање од годину дана
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Студент Мобилни број
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 DocType: Crop,Yield UOM,Принос УОМ
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
 DocType: Item,Is Item from Hub,Је ставка из чворишта
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Ред {0}: Тип активност је обавезна.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Исплаћене дивиденде
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Исплаћене дивиденде
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Књиговодство Леџер
 DocType: Stock Reconciliation,Difference Amount,Разлика Износ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Др {0} на пустању на {1}
 DocType: Purchase Invoice,Reverse Charge,Обрнути пуњење
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Нераспоређене добити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Нераспоређене добити
 DocType: Purchase Invoice,05-Change in POS,05-Промена у ПОС
 DocType: Vehicle Log,Service Detail,сервис Детаљ
 DocType: BOM,Item Description,Ставка Опис
@@ -1639,12 +1640,12 @@
 DocType: Opportunity Item,Opportunity Item,Прилика шифра
 ,Student and Guardian Contact Details,Студент и Гуардиан контакт детаљи
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За добављача {0} е-маил адреса је дужан да пошаље е-маил
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Привремени Отварање
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Привремени Отварање
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Виев Хуб
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Patient Appointment,More Info,Више информација
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Процена курс потребно за предмета на ред {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Процена курс потребно за предмета на ред {0}
 DocType: Supplier Scorecard,Scorecard Actions,Акције Сцорецард
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Пример: Мастерс ин Цомпутер Сциенце
 DocType: Purchase Invoice,Rejected Warehouse,Одбијен Магацин
@@ -1654,7 +1655,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,у
 DocType: Supplier Quotation Item,Lead Time in days,Олово Време у данима
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Обавезе према добављачима Преглед
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Исплата зараде из {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Исплата зараде из {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
@@ -1663,9 +1664,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Тестирање лабораторијских тестова
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Мали
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Отварање алата за креирање фактуре
 DocType: Education Settings,Employee Number,Запослени Број
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Откажи фактуру након грејс периода
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 DocType: Project,% Completed,Завршено %
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
@@ -1679,7 +1681,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораторијско тестирање Датетиме
 DocType: Email Digest,Add Quote,Додај Куоте
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,косвенные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 DocType: Agriculture Analysis Criteria,Agriculture,пољопривреда
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Синц мастер података
@@ -1709,16 +1711,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Молимо прво поставите код за ставку
 DocType: Item,ITEM-,Артикл-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
+DocType: Subscription Plan,Billing Interval Count,Броју интервала обрачуна
 DocType: Sales Invoice Item,Edit Description,Измени опис
 DocType: Antibiotic,Antibiotic,Антибиотик
 ,Team Updates,тим ажурирања
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Створити Принт Формат
@@ -1744,7 +1747,7 @@
 DocType: POS Item Group,POS Item Group,ПОС Тачка Група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Алтернативна ставка не сме бити иста као код ставке
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Завршетак привремене процене
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
@@ -1761,7 +1764,7 @@
 DocType: BOM Operation,Workstation,Воркстатион
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Захтев за понуду добављача
 DocType: Healthcare Settings,Registration Message,Регистрација порука
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,аппаратные средства
 DocType: Prescription Dosage,Prescription Dosage,Досаге на рецепт
 DocType: Attendance,HR Manager,ХР Менаџер
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Изаберите Цомпани
@@ -1792,7 +1795,7 @@
 DocType: Project,Start and End Dates,Почетни и завршни датуми
 ,Delivered Items To Be Billed,Испоручени артикала буду наплаћени
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Отворено БОМ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
 DocType: Project Update,Great/Quickly,Одлично / брзо
 DocType: Purchase Invoice Item,UOM,УОМ
@@ -1801,8 +1804,8 @@
 DocType: Employee,EMP/,ЕБ /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Молимо одаберите серије за дозирано ставку
 DocType: Asset,Depreciation Schedules,Амортизација Распоред
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Следећи налоги могу бити изабрани у ГСТ Подешавања:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Следећи налоги могу бити изабрани у ГСТ Подешавања:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
 DocType: Payment Request,Transaction Currency,трансакција Валута
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1813,6 +1816,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Просек Дневни Одлазећи
 DocType: POS Profile,Campaign,Кампања
 DocType: Supplier,Name and Type,Име и тип
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
 DocType: Physician,Contacts and Address,Контакти и адреса
 DocType: Purchase Invoice,Contact Person,Контакт особа
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекивани датум почетка"" не може бити већи од ""Очекивани датум завршетка"""
@@ -1826,19 +1830,20 @@
 DocType: Student Admission,Eligibility and Details,Подобност и Детаљи
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Нето промена у основном средству
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од датетиме
 DocType: Email Digest,For Company,За компаније
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација дневник.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Захтев за понуду је онемогућен да приступа из портала, за више подешавања провере портала."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Добављач Сцорецард Сцоринг Вариабле
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Куповина Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Куповина Износ
 DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Дошло је до грешака приликом креирања курса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Први Екпенс Аппровер на листи биће постављен као подразумевани Екпенс Аппровер.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,не може бити већи од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1859,15 +1864,16 @@
 DocType: Package Code,Package Code,пакет код
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,шегрт
 DocType: Purchase Invoice,Company GSTIN,kompanija ГСТИН
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Негативна Количина није дозвољено
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативна Количина није дозвољено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Пореска детаљ сто учитани из тачка мајстора у виду стринг и складиште у овој области.
  Користи се за таксама и накнадама"
 DocType: Supplier Scorecard Period,SSC-,ССЦ-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Запослени не може пријавити за себе.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Оставите одобрење у обавезној апликацији
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Пореска Правило за трансакције.
@@ -1895,15 +1901,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Рок плаћања на реду {0} је вероватно дупликат.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Пољопривреда (бета)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Паковање Слип
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,аренда площади для офиса
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,аренда площади для офиса
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
 DocType: Disease,Common Name,Уобичајено име
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
 DocType: Vital Signs,Blood Pressure,Крвни притисак
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,аналитичар
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,аналитичар
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детаљи продаје
 DocType: Quality Inspection,QI-,КИ-
@@ -1913,15 +1919,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Потврди уписани курс за студенте у Студентском Групе
 DocType: Notification Control,Expense Claim Rejected,Расходи потраживање Одбијен
 DocType: Item,Item Attribute,Итем Атрибут
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,правительство
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,правительство
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Расход Захтев {0} већ постоји за Дневник возила
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Институт Име
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Молимо Вас да унесете отплате Износ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Молимо Вас да унесете отплате Износ
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Ставка Варијанте
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Услуге
 DocType: HR Settings,Email Salary Slip to Employee,Емаил плата Слип да запосленом
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Изабери Могући Супплиер
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Изабери Могући Супплиер
 DocType: Sales Invoice,Source,Извор
 DocType: Customer,"Select, to make the customer searchable with these fields",Изаберите да бисте учинили купцу да се претражи помоћу ових поља
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,схов затворено
@@ -1938,7 +1944,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Новчани ток од Инвестирање
 DocType: Program Course,Program Course,програм предмета
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Homepage,Company Tagline for website homepage,Компанија Таглине за интернет страницама
 DocType: Item Group,Item Group Name,Ставка Назив групе
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен
@@ -1968,10 +1974,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Мемеберсхип Детаилс
 DocType: Leave Block List,Block Holidays on important days.,Блоцк Холидаис он важним данима.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Молимо унесите све потребне вриједности резултата
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Потраживања од купаца Преглед
-DocType: Employee Loan,Monthly Repayment Amount,Месечна отплата Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Потраживања од купаца Преглед
+DocType: Loan,Monthly Repayment Amount,Месечна отплата Износ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Отварање фактура
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Молимо поставите Усер ИД поље у запису запослених за постављање Емплоиее Роле
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Молимо поставите Усер ИД поље у запису запослених за постављање Емплоиее Роле
 DocType: UOM,UOM Name,УОМ Име
 DocType: GST HSN Code,HSN Code,ХСН код
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Допринос Износ
@@ -1993,7 +1999,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Корисник {0} је већ додељен лекару {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,коробка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,могуће добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,могуће добављача
+DocType: Journal Entry,JV-RET-,ЈВ-РЕТ-
 DocType: Budget,Monthly Distribution,Месечни Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Здравствена заштита (бета)
@@ -2021,7 +2028,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Производња Количина је обавезно
-DocType: Employee Loan,Repayment Method,Начин отплате
+DocType: Loan,Repayment Method,Начин отплате
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако је означено, Почетна страница ће бити подразумевани тачка група за сајт"
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Захтеви за рачун предузећа.
@@ -2030,7 +2037,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Сертификат је потребан
 DocType: Company,Default Holiday List,Уобичајено Холидаи Лист
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од времена и доба {1} преклапа са {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Акции Обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Акции Обязательства
 DocType: Purchase Invoice,Supplier Warehouse,Снабдевач Магацин
 DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Изаберите компанију
@@ -2038,7 +2045,7 @@
 DocType: Student Report Generation Tool,Print Section,Одсек за штампу
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Корисник {0} нема подразумевани ПОС профил. Провјерите подразумевану вредност у редоследу {1} за овог корисника.
 DocType: Student Group,Set 0 for no limit,Сет 0 без ограничења
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Ров {идк}: {поље} је неопходно за креирање Опенинг {инвоице_типе} фактура
 DocType: Customer,Primary Address and Contact Detail,Примарна адреса и контакт детаљи
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Поново плаћања Емаил
@@ -2049,10 +2056,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Изаберите бар један домен.
 DocType: Dependent Task,Dependent Task,Зависна Задатак
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
 DocType: SMS Center,Receiver List,Пријемник Листа
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Тражи артикла
 DocType: Payment Schedule,Payment Amount,Плаћање Износ
@@ -2062,7 +2069,7 @@
 DocType: Assessment Plan,Grading Scale,скала оцењивања
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,већ завршено
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Стоцк Ин Ханд
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Стоцк Ин Ханд
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Увоз Успешна !
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
@@ -2073,17 +2080,16 @@
 DocType: Quotation Item,Quotation Item,Понуда шифра
 DocType: Customer,Customer POS Id,Кориснички ПОС-ИД
 DocType: Account,Account Name,Име налога
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Унесите УРЛ адресу Вооцоммерце Сервера
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 DocType: Share Balance,To No,Да не
-DocType: Subscription,Reference Document,Ознака документа
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} отказан или заустављен
 DocType: Accounts Settings,Credit Controller,Кредитни контролер
-DocType: Grant Application,Applicant Type,Тип подносиоца захтева
+DocType: Loan,Applicant Type,Тип подносиоца захтева
 DocType: Purchase Invoice,03-Deficiency in services,03-Недостатак услуга
 DocType: Delivery Note,Vehicle Dispatch Date,Отпрема Возила Датум
 DocType: Healthcare Settings,Default Medical Code Standard,Стандардни медицински кодни стандард
@@ -2094,13 +2100,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Приходована
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Человеческие ресурсы
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Одбити
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна у Компанија валути
 DocType: BOM Item,BOM Item,БОМ шифра
 DocType: Appraisal,For Employee,За запосленог
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Маке исплата Ентри
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Маке исплата Ентри
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
 DocType: Company,Default Values,Уобичајено Вредности
 DocType: Membership,INR,ИНР
@@ -2130,10 +2136,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора бити већи од 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Стоцк Аваилабле
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Стоцк Аваилабле
 DocType: Manufacturing Settings,Capacity Planning For (Days),Капацитет планирање за (дана)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,набавка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обавезно поље - програм
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обавезно поље - програм
 DocType: Special Test Template,Result Component,Компонента резултата
@@ -2154,7 +2160,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,"Укључи празнике у листовима, као лишће"
 DocType: Sales Invoice,Packed Items,Пакују артикала
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гаранција Тужба против серијским бројем
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Укупно&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Укупно&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Омогући Корпа
 DocType: Employee,Permanent Address,Стална адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2172,10 +2178,10 @@
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Потврди акцију
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Онлине Аукције
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,испуњење
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Погледај у корпу
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинговые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Не могу да креирам стандардне критеријуме. Преименујте критеријуме
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
@@ -2197,9 +2203,9 @@
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Material Request,Transferred,пренети
 DocType: Vehicle,Doors,vrata
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Прикупити накнаду за регистрацију пацијента
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Не могу мењати атрибуте након трансакције са акцијама. Направите нову ставку и ставите трансфер на нову ставку
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Не могу мењати атрибуте након трансакције са акцијама. Направите нову ставку и ставите трансфер на нову ставку
 DocType: Course Assessment Criteria,Weightage,Веигхтаге
 DocType: Purchase Invoice,Tax Breakup,porez на распад
 DocType: Packing Slip,PS-,ПС-
@@ -2235,12 +2241,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Purchase Invoice Item,Batch No,Групно Нема
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Напредак запослених
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 DocType: Grant Application,Assessment  Mark (Out of 10),Ознака оцене (од 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Гуардиан2 Мобилни број
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,основной
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
@@ -2249,15 +2256,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Email Digest,Annual Expenses,Годишњи трошкови
 DocType: Item,Variants,Варијанте
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
 DocType: Sales Team,Contribution to Net Total,Допринос нето укупни
 DocType: Sales Invoice Item,Customer's Item Code,Шифра купца
 DocType: Stock Reconciliation,Stock Reconciliation,Берза помирење
 DocType: Territory,Territory Name,Територија Име
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Планове можете имати само са истим циклусом фактурисања на Претплати
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносилац захтева за посао.
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
@@ -2268,10 +2276,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,аппраисалс
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Догађаји обуке
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Трацк Леадс би Леад Соурце.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Унесите
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Унесите
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Дневник одржавања
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето тежина овог пакета. (Израчунава аутоматски као збир нето тежине предмета)
@@ -2279,11 +2287,11 @@
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: Student Group,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Управљање акцијама
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Плаћање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Плаћање
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Магацин {0} није повезан на било који рачун, молимо вас да поменете рачун у складиште записник или сет налог подразумевани инвентара у компанији {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Организујте своје налоге
 DocType: Work Order Operation,Actual Time and Cost,Тренутно време и трошак
@@ -2293,7 +2301,7 @@
 DocType: Student Leave Application,Student Leave Application,Студент одсуство примене
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Бундле ставке у време продаје.
@@ -2303,7 +2311,7 @@
 DocType: Item,Barcodes,Бар кодови
 DocType: Hub Category,Hub Node,Хуб Ноде
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,помоћник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,помоћник
 DocType: Asset Movement,Asset Movement,средство покрет
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Радни налог {0} мора бити поднет
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Нова корпа
@@ -2321,13 +2329,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Валута за обрачун мора бити једнака валути валуте компаније или валуте партијског рачуна
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 DocType: Soil Texture,Loam,Лоам
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Ред {0}: Дуе Дате не може бити пре датума објављивања
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Ред {0}: Дуе Дате не може бити пре датума објављивања
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Уплатите Ентри
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Продаје Фактура трендови
 DocType: Leave Application,Apply / Approve Leaves,Нанесите / Цоунт Леавес
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Због
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку , только если тип заряда «О Предыдущая сумма Row » или « Предыдущая Row Всего"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку , только если тип заряда «О Предыдущая сумма Row » или « Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Испорука Складиште
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дрво центара финансијске трошкове.
 DocType: Serial No,Delivery Document No,Достава докумената Нема
@@ -2341,7 +2348,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Потрошња материјала није подешена у подешавањима за производњу.
 DocType: Student,Student Mobile Number,Студент Број мобилног телефона
 DocType: Item,Has Variants,Хас Варијанте
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не могу претерати за ставку {0} у реду {1} више од {2}. Да бисте омогућили прекомерно плаћање, молимо вас поставите у опцију &quot;Поставке залиха&quot;"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не могу претерати за ставку {0} у реду {1} више од {2}. Да бисте омогућили прекомерно плаћање, молимо вас поставите у опцију &quot;Поставке залиха&quot;"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Упдате Респонсе
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
@@ -2353,12 +2360,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Прво изаберите програм
 DocType: Patient Appointment,Patient Age,Пацијентско доба
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Управљање пројектима
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Серијски број {0} је већ враћен
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Серијски број {0} је већ враћен
 DocType: Supplier,Supplier of Goods or Services.,Добављач робе или услуга.
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Asset Maintenance Log,Planned,Планирано
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Подразумевани рачуни потраживања који ће се користити ако нису постављени у Пацијенту да резервишу Консултације.
 DocType: Vehicle Log,Fuel Price,Гориво Цена
+DocType: Bank Guarantee,Margin Money,Маргин Монеи
 DocType: Budget,Budget,Буџет
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Сет Опен
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
@@ -2372,16 +2380,16 @@
 DocType: Lead,Follow Up,Пратити
 DocType: Item,Is Sales Item,Да ли продаје артикла
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ставка Група дрво
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Одржавање време
 ,Amount to Deliver,Износ на Избави
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Иста ставка је унета више пута. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум почетка не може бити раније него годину дана датум почетка академске године на коју се израз је везан (академска година {}). Молимо исправите датуме и покушајте поново.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Било је грешака .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Запосленик {0} већ је пријавио за {1} између {2} и {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Било је грешака .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Запосленик {0} већ је пријавио за {1} између {2} и {3}:
 DocType: Guardian,Guardian Interests,Гуардиан Интереси
 DocType: Naming Series,Current Value,Тренутна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
 DocType: Education Settings,Instructor Records to be created by,Инструкторске записе које креира
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создан
 DocType: GST Account,GST Account,ГСТ налог
@@ -2400,8 +2408,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Додато у Фаворитес
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ниједан образовни лист који је достављен за горе наведене критеријуме ИЛИ већ достављен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Пошлины и налоги
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ниједан образовни лист који је достављен за горе наведене критеријуме ИЛИ већ достављен
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Пошлины и налоги
 DocType: Projects Settings,Projects Settings,Подешавања пројеката
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
@@ -2411,27 +2419,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарные группы .
 DocType: Production Plan,Total Produced Qty,Укупно произведени количина
 DocType: Payroll Entry,Get Employee Details,Добијте податке о запосленима
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продат
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Основица (Фирма валута)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Сировине
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Сировине
 DocType: Payment Reconciliation Payment,Reference Row,референце Ред
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Књиговодство Детаљи
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Обриши све трансакције за ову компанију
 DocType: Patient,O Positive,О Позитивно
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,издвајања
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критеријуми за пријем
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Унесите Материјални захтеве у горњој табели
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Нема враћања за унос дневника
 DocType: Item Attribute,Attribute Name,Назив атрибута
 DocType: BOM,Show In Website,Схов у сајт
 DocType: Shopping Cart Settings,Show Quantity in Website,Схов Количина на сајту
-DocType: Employee Loan Application,Total Payable Amount,Укупно плаћају износ
+DocType: Loan Application,Total Payable Amount,Укупно плаћају износ
 DocType: Task,Expected Time (in hours),Очекивано време (у сатима)
 DocType: Item Reorder,Check in (group),Цхецк ин (група)
 DocType: Soil Texture,Silt,Силт
@@ -2450,7 +2459,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Извршити уплату
 DocType: Room,Room Name,роом Име
 DocType: Prescription Duration,Prescription Duration,Трајање рецепта
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите се не може применити / отказана пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите се не може применити / отказана пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
 DocType: Activity Cost,Costing Rate,Кошта курс
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Кориснички Адресе и контакти
 ,Campaign Efficiency,kampanja Ефикасност
@@ -2470,11 +2479,11 @@
 DocType: Chapter,Chapter,Поглавље
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,пара
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Подразумевани налог ће се аутоматски ажурирати у ПОС рачуну када је изабран овај режим.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
 DocType: Asset,Depreciation Schedule,Амортизација Распоред
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Продаја Партнер адресе и контакт
 DocType: Bank Reconciliation Detail,Against Account,Против налога
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Пола Дан Датум треба да буде између Од датума и до данас
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Пола Дан Датум треба да буде између Од датума и до данас
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Подесите Центар за подразумеване трошкове у {0} компанији.
 DocType: Item,Has Batch No,Има Батцх Нема
@@ -2492,7 +2501,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет)
 DocType: Soil Texture,Soil Type,Врста земљишта
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Нова порука
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
 DocType: GoCardless Mandate,GoCardless Mandate,ГоЦардлесс Мандате
@@ -2512,7 +2520,7 @@
 DocType: Hub Category,Hub Category,Главна категорија
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Број возила
-DocType: Employee Loan,Loan Amount,Износ позајмице
+DocType: Loan,Loan Amount,Износ позајмице
 DocType: Student Report Generation Tool,Add Letterhead,Додај слово
 DocType: Program Enrollment,Self-Driving Vehicle,Селф-Дривинг возила
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Добављач Сцорецард Стандинг
@@ -2541,9 +2549,9 @@
 DocType: Cash Flow Mapper,Position,Позиција
 DocType: Patient,Patient Details,Детаљи пацијента
 DocType: Patient,B Positive,Б Позитивно
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Аббр не може бити празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Пацијент медицински запис
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,спортски
@@ -2551,8 +2559,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Укупно Стварна
 DocType: Lab Test UOM,Test UOM,Тест УОМ
 DocType: Student Siblings,Student Siblings,Студент Браћа и сестре
+DocType: Subscription Plan Detail,Subscription Plan Detail,Детаљи претплате
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,блок
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Молимо наведите фирму
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
 DocType: Asset Maintenance Task,Maintenance Task,Задатак одржавања
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Молимо поставите Б2Ц Лимит у ГСТ Сеттингс.
@@ -2567,6 +2576,7 @@
 ,BOM Search,БОМ Тражи
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Укупни трошкови потрошње материјала (путем залиха залиха)
 DocType: Hub Settings,Company Registered,Регистрована компанија
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Датум не може бити мањи од датума
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Објавите &quot;На лагеру&quot; или &quot;Нема на лагеру&quot; на Хуб-у на основу расположивих залиха у овом складишту.
 DocType: Vehicle,Fuel Type,Врста горива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Молимо наведите валуту у Друштву
@@ -2574,17 +2584,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Сток стање у батцх {0} ће постати негативна {1} за {2} тачком у складишту {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следећи материјал захтеви су аутоматски подигнута на основу нивоа поновног реда ставке
 DocType: Email Digest,Pending Sales Orders,У току продајних налога
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 DocType: Employee,Create User Permission,Креирајте дозволу корисника
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
 DocType: Healthcare Settings,Remind Before,Подсети Пре
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,материал_рекуест_итем
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
 DocType: Salary Component,Deduction,Одузимање
 DocType: Item,Retain Sample,Задржи узорак
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од времена и времена је обавезно.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Разлика
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
 DocType: Territory,Classification of Customers by region,Класификација купаца по региону
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,У производњи
@@ -2594,8 +2605,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Обрачуната банка Биланс
 DocType: Normal Test Template,Normal Test Template,Нормални тестни шаблон
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,искључени корисник
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Понуда
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Не можете поставити примљени РФК на Но Куоте
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Не можете поставити примљени РФК на Но Куоте
 DocType: Quotation,QTN-,КТН-
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Изаберите налог за штампање у валути рачуна
@@ -2603,7 +2614,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ово се заснива на трансакцијама против овог пацијента. Погледајте детаље испод
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Трошкови ажурирано
 DocType: Patient,Date of Birth,Датум рођења
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Пункт {0} уже вернулся
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Поставка Сцорецард Сетуп
@@ -2614,14 +2625,15 @@
 DocType: Work Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Опис посла
 DocType: Student Applicant,Applied,примењен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Снова откройте
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Снова откройте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Гуардиан2 Име
 DocType: Purchase Invoice,02-Post Sale Discount,Попуст 02-поштарина
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције."
+DocType: Department Approver,Approver,Одобраватељ
 ,SO Qty,ТАКО Кол
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Поље За дионичара не може бити празно
 DocType: Guardian,Work Address,rad Адреса
@@ -2635,21 +2647,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Укупно додељени износ (Фирма валута)
 DocType: Purchase Order Item,To be delivered to customer,Који ће бити достављен купца
 DocType: BOM,Scrap Material Cost,Отпадног материјала Трошкови
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
 DocType: Grant Application,Email Notification Sent,Послато обавештење о е-пошти
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Код ставке, складиште, количина су потребна у реду"
-DocType: Pricing Rule,Supplier,Добављач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Код ставке, складиште, количина су потребна у реду"
+DocType: Bank Guarantee,Supplier,Добављач
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Прикажи податке о плаћању
 DocType: Consultation,Consultation Time,Време консултације
 DocType: C-Form,Quarter,Четврт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Прочие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Уобичајено Компанија
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
 DocType: Payment Request,PR,ПР
 DocType: Cheque Print Template,Bank Name,Име банке
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Изнад
-DocType: Employee Loan,Employee Loan Account,Запослени кредита рачуна
 DocType: Leave Application,Total Leave Days,Укупно ЛЕАВЕ Дана
 DocType: Email Digest,Note: Email will not be sent to disabled users,Напомена: Е-маил неће бити послат са инвалидитетом корисницима
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број Интерацтион
@@ -2665,7 +2676,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Тежина (у килограму)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",поглавља / цхаптер_наме оставите празно аутоматски након подешавања поглавља.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Молимо поставите ГСТ налоге у ГСТ подешавањима
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Молимо поставите ГСТ налоге у ГСТ подешавањима
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Врста пословања
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Трошкови куповини
@@ -2674,12 +2685,13 @@
 DocType: Grant Application,Grant Description,Грант Опис
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
 DocType: Student Guardian,Others,другие
+DocType: Subscription,Discounts,Попусти
 DocType: Payment Entry,Unallocated Amount,Неалоцирано Износ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Порези и накнаде
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Производ или сервис који се купити, продати или држати у складишту."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Нема више ажурирања
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ово покрива све системе резултата који су везани за овај Сетуп
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Дете артикла не би требало да буде Бундле производа. Молимо Вас да уклоните ставку `{0} &#39;и сачувати
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,банкарство
@@ -2688,21 +2700,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
 DocType: Bin,Ordered Quantity,Наручено Количина
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Grading Scale,Grading Scale Intervals,Скала оцењивања Интервали
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Добит за годину
+DocType: Bank Guarantee,Name of Bank,Име банке
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Рачуноводство Улаз за {2} може се вршити само у валути: {3}
 DocType: Fee Schedule,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дрво финансијских рачуна.
+DocType: Bank Guarantee,Reference Document Type,Референтна Тип документа
 DocType: Cash Flow Mapping,Cash Flow Mapping,Мапирање токова готовине
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} против Салес Ордер {1}
 DocType: Account,Fixed Asset,Исправлена активами
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Серијализоване Инвентар
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Е-пошта није пронађена у подразумеваном контакту
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерирај тајну
-DocType: Employee Loan,Account Info,račun информације
+DocType: Loan,Account Info,račun информације
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
 DocType: Fees,Include Payment,Укључи плаћање
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Студент Групе створио.
@@ -2710,24 +2725,24 @@
 DocType: Sales Invoice,Total Billing Amount,Укупно обрачуна Износ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програм у структури накнада и студентској групи {0} су различити.
 DocType: Fee Schedule,Receivable Account,Потраживања рачуна
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
 DocType: Quotation Item,Stock Balance,Берза Биланс
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Продаја Налог за плаћања
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Директор
 DocType: Purchase Invoice,With Payment of Tax,Уз плаћање пореза
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Три примерка за добављача
 DocType: Land Unit,Is Container,Је контејнер
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Ово ће бити дан 1 циклуса усјева
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Молимо изаберите исправан рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Молимо изаберите исправан рачун
 DocType: Purchase Invoice Item,Weight UOM,Тежина УОМ
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Списак доступних акционара са бројевима фолије
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура запослених
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Прикажи варијантне атрибуте
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Прикажи варијантне атрибуте
 DocType: Student,Blood Group,Крв Група
 DocType: Course,Course Name,Назив курса
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,оборудование офиса
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол
 DocType: Fiscal Year,Companies,Компаније
 DocType: Supplier Scorecard,Scoring Setup,Подешавање бодова
@@ -2746,7 +2761,7 @@
 DocType: Stock Entry,Total Incoming Value,Укупна вредност Долазни
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Дебитна Да је потребно
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Куповина Ценовник
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони варијабли индекса добављача.
 DocType: Job Offer Term,Offer Term,Понуда Рок
 DocType: Asset,Quality Manager,Руководилац квалитета
@@ -2758,13 +2773,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Укупно Неплаћени: {0}
 DocType: BOM Website Operation,BOM Website Operation,БОМ Сајт Операција
 DocType: Supplier Scorecard,Supplier Score,Проценат добављача
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Укупно фактурисано Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Укупно фактурисано Амт
 DocType: Supplier,Warn RFQs,Упозоравајте РФКс
 DocType: BOM,Conversion Rate,Стопа конверзије
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Претрага производа
 DocType: Assessment Plan,To Time,За време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
+DocType: Loan,Total Amount Paid,Укупан износ плаћен
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Молимо изаберите Студентски пријем који је обавезан за ученику који је платио
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Изаберите ценовник за објављивање цене
@@ -2774,19 +2790,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} отключена
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршен количина не може бити више од {1} за операцију {2}
 DocType: Manufacturing Settings,Allow Overtime,Дозволи Овертиме
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализед артикла {0} не може да се ажурира преко Стоцк помирење, користите Стоцк унос"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализед артикла {0} не може да се ажурира преко Стоцк помирење, користите Стоцк унос"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализед артикла {0} не може да се ажурира преко Стоцк помирење, користите Стоцк унос"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Сериализед артикла {0} не може да се ажурира преко Стоцк помирење, користите Стоцк унос"
 DocType: Training Event Employee,Training Event Employee,Тренинг догађај запослених
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максимални узорци - {0} могу бити задржани за Батцх {1} и Итем {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Адд Тиме Слотс
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} серијски бројеви који су потребни за тачком {1}. Ви сте под условом {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тренутни Процена курс
 DocType: Training Event,Advance,Адванце
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,због поновног понављања.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,ГоЦардлесс поставке гатеваи плаћања
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Курсне / Губитак
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Курсне / Губитак
 DocType: Opportunity,Lost Reason,Лост Разлог
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Рачун {1} не припада компанији {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Рачун {1} не припада компанији {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не могу да пронађем ДоцТипе {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
@@ -2805,7 +2820,6 @@
 DocType: Bin,Actual Quantity,Стварна Количина
 DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серијски број {0} није пронађен
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Претплата је била {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програм распоређивања накнада
 DocType: Fee Schedule Program,Student Batch,студент партије
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Маке Студент
@@ -2821,14 +2835,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Е-трговина ГСТИН
 DocType: Sales Order,Not Delivered,Није Испоручено
 ,Bank Clearance Summary,Банка Чишћење Резиме
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
 DocType: Appraisal Goal,Appraisal Goal,Процена Гол
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Предложи категорију?
 DocType: Stock Reconciliation Item,Current Amount,Тренутни Износ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,zgrade
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,zgrade
 DocType: Fee Schedule,Fee Structure,naknada Структура
 DocType: Timesheet Detail,Costing Amount,Кошта Износ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
 DocType: Student Admission Program,Application Fee,Накнада за апликацију
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Пошаљи Слип платама
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1} %
@@ -2836,12 +2849,13 @@
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Сендер Наме
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Критеријуми за анализу пољопривреде
+DocType: HR Settings,Leave Approval Notification Template,Оставите шаблон за упозорење о одобрењу
 DocType: POS Profile,[Select],[ Изаберите ]
 DocType: Vital Signs,Blood Pressure (diastolic),Крвни притисак (дијастолни)
 DocType: SMS Log,Sent To,Послат
 DocType: Agriculture Task,Holiday Management,Холидаи Манагемент
 DocType: Payment Request,Make Sales Invoice,Маке Салес фактура
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Програми
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Програми
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
 DocType: Company,For Reference Only.,За справки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Лекар {0} није доступан на {1}
@@ -2859,7 +2873,7 @@
 DocType: Employee,New Workplace,Новом радном месту
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Потрошња материјала
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Постави као Цлосед
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Нет товара со штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Нет товара со штрих-кодом {0}
 DocType: Normal Test Items,Require Result Value,Захтевај вредност резултата
 DocType: Item,Show a slideshow at the top of the page,Приказивање слајдова на врху странице
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,БОМ
@@ -2874,19 +2888,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Који се враћа
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Детаљи шаблона за мапирање готовог тока
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Управљање зајмовима
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Пратите посебан Приходи и расходи за вертикала производа или подела.
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Схов плата Слип
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Схов плата Слип
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Пренос материјала
 DocType: Fees,Send Payment Request,Пошаљите захтев за плаћање
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 DocType: Water Analysis,Origin,Порекло
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Молимо поставите понављају након снимања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
@@ -2901,14 +2915,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Да ли је порез на доходак
 DocType: Grading Scale Interval,Grade Description,граде Опис
 DocType: Stock Entry,Purchase Receipt No,Куповина Пријем Нема
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,задаток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,задаток
 DocType: Sales Invoice, Shipping Bill Number,Број испоруке
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,следљивост
 DocType: Asset Maintenance Log,Actions performed,Изведене акције
 DocType: Cash Flow Mapper,Section Leader,Руководилац одјела
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Источник финансирования ( обязательства)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Источник финансирования ( обязательства)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Запосленик
+DocType: Bank Guarantee,Fixed Deposit Number,Фиксни депозитни број
 DocType: Asset Repair,Failure Date,Датум отказа
 DocType: Sample Collection,Collected Time,Скупљено време
 DocType: Company,Sales Monthly History,Месечна историја продаје
@@ -2925,10 +2940,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Да ли сте сигурни да желите да откажете овај термин?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за хотелску собу
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Продаја Цевовод
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Изврши ажурирање претплате
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Рачун {0} не поклапа са Компаније {1} у режиму рачуна: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Курс:
@@ -2938,7 +2954,7 @@
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Стварање радних налога
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Плата Слип запосленог {0} већ створен за овај период
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,фармацевтический
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Трошкови Купљено
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
 DocType: Purchase Invoice,Credit To,Кредит би
@@ -2956,7 +2972,7 @@
 DocType: Request for Quotation Supplier,No Quote,Но Куоте
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Gateway Account,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Наведите компанија наставити
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Нето Промена Потраживања
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Компенсационные Выкл
 DocType: Job Offer,Accepted,Примљен
@@ -2968,7 +2984,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Резултати претраге
 DocType: Room,Room Number,Број собе
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Неважећи референца {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Неважећи референца {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 DocType: Journal Entry Account,Payroll Entry,Унос плаћања
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Виев Феес Рецордс
@@ -2978,7 +2994,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Lab Test Sample,Lab Test Sample,Узорак за лабораторијско испитивање
 DocType: Item Variant Settings,Allow Rename Attribute Value,Дозволи преименовати вриједност атрибута
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Брзо Јоурнал Ентри
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Restaurant,Invoice Series Prefix,Префикс серије рачуна
 DocType: Employee,Previous Work Experience,Претходно радно искуство
@@ -2986,8 +3002,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Интеграција Гоогле мапа није омогућена
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не представлено
+DocType: Subscription,Trialling,Триаллинг
 DocType: Member,Membership Expiry Date,Датум истека чланства
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} мора бити негативан у повратном документу
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} мора бити негативан у повратном документу
 ,Minutes to First Response for Issues,Минутес то први одговор на питања
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Име института за коју се постављање овог система.
@@ -3006,7 +3023,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Јединица мере
 DocType: Fiscal Year,Year End Date,Датум завршетка године
 DocType: Task Depends On,Task Depends On,Задатак Дубоко У
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Прилика
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Прилика
 DocType: Operation,Default Workstation,Уобичајено Воркстатион
 DocType: Notification Control,Expense Claim Approved Message,Расходи потраживање Одобрено поруку
 DocType: Payment Entry,Deductions or Loss,Дедуцтионс или губитак
@@ -3044,7 +3061,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Оставите без плате се не слаже са одобреним подацима одсуство примене
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
 DocType: Membership,USD,Амерички долар
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Маке фактуру
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Преостали износ
@@ -3054,7 +3071,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,До краја године
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Driver,Driver,Возач
 DocType: Vital Signs,Nutrition Values,Вредности исхране
 DocType: Lab Test Template,Is billable,Да ли се може уплатити
@@ -3065,7 +3082,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Стварна Датум почетка (преко Тиме Схеет)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Старење Опсег 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Укупан износ аванса не може бити већи од укупне тражене количине
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Укупан износ аванса не може бити већи од укупне тражене количине
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3120,7 +3137,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Изаберите вриједности атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Разлог за издавање документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Следећа контактирати путем не може бити исто као водећи Емаил Аддресс
 DocType: Tax Rule,Billing City,Биллинг Цити
@@ -3137,7 +3154,8 @@
 DocType: Warranty Claim,Service Address,Услуга Адреса
 DocType: Asset Maintenance Task,Calibration,Калибрација
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} је празник компаније
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Намештај и инвентар
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Оставите статусну поруку
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Намештај и инвентар
 DocType: Item,Manufacture,Производња
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Сетуп Цомпани
 ,Lab Test Report,Извештај лабораторије
@@ -3153,7 +3171,6 @@
 DocType: Crop,Planting Area,Сала за садњу
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Ово може бити због неких неважећих е-маил адреса у
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Додали сте
 DocType: Purchase Taxes and Charges,Parenttype,Паренттипе
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,obuka Резултат
@@ -3163,16 +3180,17 @@
 DocType: Products Settings,Products per Page,Производи по страници
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Пријави грешку
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Коммунальные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Изнад
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: Јоурнал Ентри {1} нема налог {2} или већ упарен против другог ваучера
 DocType: Supplier Scorecard Criteria,Criteria Weight,Критериј Тежина
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Оставите одобрење за одобрење
 DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Плата Слип основу ТимеСхеет
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Стопа куповине
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Стопа куповине
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Плаћање Тип
@@ -3195,6 +3213,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Корпа Подешавања
 DocType: Journal Entry,Accounting Entries,Аццоунтинг уноси
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако је одабрано одредиште за цене &quot;Рате&quot;, он ће преписати ценовник. Стопа прављења цена је коначна стопа, тако да се не би требао користити додатни попуст. Стога, у трансакцијама као што су Наруџбина продаје, Наруџбеница итд., Она ће бити преузета у поље &#39;Рате&#39;, а не на поље &#39;Прице Лист Рате&#39;."
+DocType: Journal Entry,Paid Loan,Паид Лоан
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Дублировать запись. Пожалуйста, проверьте Авторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Референтни датум рока
 DocType: Purchase Order,Ref SQ,Реф СК
@@ -3211,7 +3230,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платни списак
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
 DocType: Patient Service Unit,Parent Service Unit,Јединица за родитеље
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Маке корисника
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација пакета за испоруку (за штампу)
@@ -3230,7 +3249,7 @@
 DocType: Shareholder,SH-,СХ-
 DocType: Account,Income Account,Приходи рачуна
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Испорука
 DocType: Volunteer,Weekdays,Радним данима
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: Restaurant Menu,Restaurant Menu,Ресторан мени
@@ -3238,7 +3257,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Сет Дефаулт инвентар рачун за вечити инвентар
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Сет Дефаулт инвентар рачун за вечити инвентар
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Пошаљите е-маил за грантове
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Локалну меморију је пуна, није сачувао"
@@ -3246,10 +3265,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Капацитет собе
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Већ постоји запис за ставку {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Реф
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Изгубићете податке о претходно генерисаним рачунима. Да ли сте сигурни да желите поново покренути ову претплату?
 DocType: Lab Test,LP-,ЛП-
 DocType: Healthcare Settings,Registration Fee,Котизација
 DocType: Budget,Cost Center,Трошкови центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Куповина поруку Ордер
 DocType: Tax Rule,Shipping Country,Достава Земља
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Хиде Так ИД клијента је од продајне трансакције
@@ -3258,20 +3278,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Шеф маркетинга и продаје
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Шеф маркетинга и продаје
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,подоходный налог
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Идите у Леттерхеадс
+DocType: Subscription,Cancel At End Of Period,Откажи на крају периода
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Није изабрана ставка за пренос
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Није изабрана ставка за пренос
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
 DocType: Vehicle,Electric,електрични
 DocType: Task,% Progress,% Напредак
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Добитак / губитак по имовине одлагању
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Добитак / губитак по имовине одлагању
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Само студентски кандидат са статусом &quot;Одобрено&quot; биће изабран у доњој табели.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Број рачуна за налог {0} није доступан. <br> Молимо правилно подесите свој рачун.
 DocType: Task,Depends on Tasks,Зависи од Задаци
@@ -3286,6 +3307,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Није у стању
 DocType: Volunteer,Volunteer Skills,Волонтерске вештине
 DocType: Appraisal,HR User,ХР Корисник
+DocType: Bank Guarantee,Reference Document Name,Референтни назив документа
 DocType: Purchase Invoice,Taxes and Charges Deducted,Порези и накнаде одузима
 apps/erpnext/erpnext/hooks.py +142,Issues,Питања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
@@ -3299,7 +3321,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Екстра велики
+DocType: Loan,Loan Application,Кредитног захтева
 DocType: Crop,Scientific Name,Научно име
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Укупно Лишће
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Поново изабери, ако је одабрани контакт уређен након чувања"
@@ -3308,13 +3331,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Број
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,местный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Велики
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Велики
 DocType: Homepage Featured Product,Homepage Featured Product,Страница Представљамо производа
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Све процене Групе
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Све процене Групе
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нови Магацин Име
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Укупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
@@ -3335,9 +3358,10 @@
 DocType: Fees,Fees,naknade
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Цитата {0} отменяется
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Преостали дио кредита
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Преостали дио кредита
 DocType: Sales Partner,Targets,Мете
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Молимо регистрирајте број СИРЕН-а у информациону датотеку компаније
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 DocType: Price List,Price List Master,Ценовник Мастер
 DocType: GST Account,CESS Account,ЦЕСС налог
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
@@ -3346,6 +3370,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Изаберите Пацијент
 DocType: Price List,Applicable for Countries,Важи за земље
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Име параметра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Остави само Апликације које имају статус &quot;Одобрено&quot; и &quot;Одбијен&quot; могу се доставити
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Студент Име групе је обавезно у реду {0}
 DocType: Homepage,Products to be shown on website homepage,Производи који се приказује на интернет страницама
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
@@ -3391,14 +3416,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Рачун који је већ креиран за сва времена плаћања
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Име грешка: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Је финансијски трошак
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Ако више од једног пакета истог типа (за штампу)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Подесите подразумевани купац у подешавањима ресторана
 ,Salary Register,плата Регистрација
 DocType: Warehouse,Parent Warehouse,родитељ Магацин
-DocType: C-Form Invoice Detail,Net Total,Нето Укупно
+DocType: Subscription,Net Total,Нето Укупно
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Стандардно БОМ није пронађен за тачком {0} и пројекат {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Дефинисати различите врсте кредита
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Дефинисати различите врсте кредита
 DocType: Bin,FCFS Rate,Стопа ФЦФС
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Изванредна Износ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Време (у мин)
@@ -3430,11 +3455,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Корен Рачун мора бити група
 DocType: Drug Prescription,Drug Prescription,Пресцриптион другс
 DocType: Fees,FEE.,НАКНАДА.
-DocType: Employee Loan,Repaid/Closed,Отплаћује / Цлосед
+DocType: Loan,Repaid/Closed,Отплаћује / Цлосед
 DocType: Item,Total Projected Qty,Укупна пројектована количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Стопа процене није пронађена за ставку {0}, која је обавезна да изврши рачуноводствене уносе за {1} {2}. Ако је ставка трансакција као ставка нулте стопе процене у {1}, молимо вас да наведете то у табели {1} Итем. У супротном, молимо вас да креирате долазни промет са акцијама за ставку или наведете стопу процене у запису Ставке, а затим покушајте да пошаљете / поништите овај унос"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 DocType: Course,Course Code,Наравно код
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 DocType: POS Settings,Use POS in Offline Mode,Користите ПОС у Оффлине начину
@@ -3454,16 +3478,15 @@
 DocType: Purchase Invoice,Deemed Export,Изгледа извоз
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Проценат може да се примени било против ценовнику или за све Ценовником.
-DocType: Subscription,Half-yearly,Полугодишње
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Lab Test,LabTest Approver,ЛабТест Аппровер
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Већ сте оцијенили за критеријуми за оцењивање {}.
 DocType: Vehicle Service,Engine Oil,Моторно уље
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Креирани радни налоги: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Креирани радни налоги: {0}
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
-DocType: Employee Loan,Loan Details,kredit Детаљи
+DocType: Loan,Loan Details,kredit Детаљи
 DocType: Company,Default Inventory Account,Уобичајено Инвентар налог
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Фолио бројеви се не подударају
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
@@ -3475,19 +3498,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Веза са свим земљишним јединицама у којима расту усеви
 DocType: Account,Root Type,Корен Тип
 DocType: Item,FIFO,"ФИФО,"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не могу да се врате више од {1} за тачком {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не могу да се врате више од {1} за тачком {2}
 DocType: Item Group,Show this slideshow at the top of the page,Покажи ову пројекцију слајдова на врху странице
 DocType: BOM,Item UOM,Ставка УОМ
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износ пореза Након Износ попуста (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Cheque Print Template,Primary Settings,primarni Подешавања
 DocType: Purchase Invoice,Select Supplier Address,Избор добављача Адреса
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Додај Запослени
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Додај Запослени
 DocType: Purchase Invoice Item,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Ектра Смалл
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Ектра Смалл
 DocType: Company,Standard Template,стандард Шаблон
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
@@ -3507,11 +3530,10 @@
 DocType: SMS Log,No of Sent SMS,Број послатих СМС
 DocType: Antibiotic,Healthcare Administrator,Администратор здравствене заштите
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Поставите циљ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
 DocType: Dosage Strength,Dosage Strength,Снага дозе
 DocType: Account,Expense Account,Трошкови налога
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,софтвер
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Боја
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критеријуми процене План
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Датум истека је обавезан за изабрану ставку
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Превент Ордер Ордерс
@@ -3524,18 +3546,18 @@
 DocType: Patient,Personal and Social History,Лична и друштвена историја
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Корисник {0} је креиран
 DocType: Fee Schedule,Fee Breakup for each student,Накнада за сваки студент
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Промени код
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
 DocType: Stock Reconciliation,SR/,СР /
 DocType: Vehicle,Diesel,дизел
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Прайс-лист Обмен не выбран
 DocType: Purchase Invoice,Availed ITC Cess,Искористио ИТЦ Цесс
 ,Student Monthly Attendance Sheet,Студент Месечно Присуство лист
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило о испоруци примењује се само за продају
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Пројекат Датум почетка
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,До
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Преименовање Лог
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студент група или предмета Распоред је обавезна
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студент група или предмета Распоред је обавезна
@@ -3556,7 +3578,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Наведите своје производе или услуге које купујете или продајете.
 DocType: Water Analysis,Storage Temperature,Температура складиштења
 DocType: Employee Attendance Tool,Unmarked Attendance,Необележен Присуство
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,истраживач
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,истраживач
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Програм Упис Алат Студентски
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Датум почетка требало би да буде мањи од крајњег датума за задатак {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Име или е-маил је обавезан
@@ -3569,7 +3591,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} тренутно има {1} Сцорецард става и РФКс овог добављача треба издати опрезно.
 DocType: Chapter,Non Profit Manager,Менаџер непрофитне организације
 DocType: BOM,Total Cost(Company Currency),Укупни трошкови (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Серийный номер {0} создан
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Серийный номер {0} создан
 DocType: Homepage,Company Description for website homepage,Опис Компаније за веб страницу
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За практичност потрошача, ови кодови могу да се користе у штампаним форматима као што су фактуре и отпремнице"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,суплиер Име
@@ -3579,11 +3601,10 @@
 DocType: Employee,You can enter any date manually,Можете да ручно унесете било који датум
 DocType: Healthcare Settings,Result Printed,Ресулт Принтед
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација Трошкови рачуна
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Пробни период
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Прегледати {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Пробни период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Project,Total Costing Amount (via Timesheets),Укупни износ трошкова (преко Тимесхеета)
-DocType: Employee Advance,Expense Approver,Расходи одобраватељ
+DocType: Department,Expense Approver,Расходи одобраватељ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
 DocType: Project,Hourly,По сату
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Нон-групе до групе
@@ -3593,7 +3614,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да датетиме
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
 DocType: Accounts Settings,Make Payment via Journal Entry,Извршити уплату преко Јоурнал Ентри
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Штампано на
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Штампано на
 DocType: Item,Inspection Required before Delivery,Инспекција Потребна пре испоруке
 DocType: Item,Inspection Required before Purchase,Инспекција Потребна пре куповине
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Пендинг Активности
@@ -3603,7 +3624,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,минимална количина поруџбине
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Ваш Организација
 DocType: Fee Component,Fees Category,naknade Категорија
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Амт
 DocType: Supplier Scorecard,Notify Employee,Нотифи Емплоиее
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
@@ -3613,7 +3634,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Реордер Ниво
 DocType: Company,Chart Of Accounts Template,Контни план Темплате
 DocType: Attendance,Attendance Date,Гледалаца Датум
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Ставка Цена ажуриран за {0} у ценовником {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Ставка Цена ажуриран за {0} у ценовником {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
 DocType: Purchase Invoice Item,Accepted Warehouse,Прихваћено Магацин
@@ -3621,10 +3642,11 @@
 DocType: Item,Valuation Method,Процена Метод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Марка Пола дан
 DocType: Sales Invoice,Sales Team,Продаја Тим
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Дупликат унос
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дупликат унос
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Унесите име Корисника пре подношења.
 DocType: Program Enrollment Tool,Get Students,Гет Студенти
 DocType: Serial No,Under Warranty,Под гаранцијом
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Изаберите датум завршетка за комплетно поправку
@@ -3643,7 +3665,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Резервисано за подуговарање
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
 DocType: Shopping Cart Settings,Orders,Поруџбине
-DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
+DocType: Department,Leave Approver,Оставите Аппровер
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Изаберите серију
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,ЈоурналЛиб
 DocType: Assessment Group,Assessment Group Name,Процена Име групе
@@ -3688,7 +3710,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Хуб трацкед итем
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,Оригинал на РЕЦИПИЕНТ
 DocType: Asset Category Account,Accumulated Depreciation Account,Исправка вриједности рачуна
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Овај е-маил је аутогенерисан
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Program Enrollment,Boarding Student,ЈУ Студентски
 DocType: Asset,Expected Value After Useful Life,Очекује Вредност Након користан Лифе
@@ -3713,22 +3734,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Присуство Рекорд {0} постоји против Студента {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Амортизација Елиминисан због продаје имовине
-DocType: Member,Member,Члан
+DocType: Loan,Member,Члан
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управљање адресе
 DocType: Work Order Item,Work Order Item,Итем Ордер Итем
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Пољопривредни менаџер
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
 DocType: Supplier Scorecard Period,Variables,Варијабле
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Затварање (др)
 DocType: Cheque Print Template,Cheque Size,Чек величина
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Серийный номер {0} не в наличии
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
 DocType: Sales Invoice,Write Off Outstanding Amount,Отпис неизмирени износ
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Рачун {0} не поклапа са Компаније {1}
@@ -3737,7 +3758,6 @@
 DocType: Stock Settings,Default Stock UOM,Уобичајено берза УОМ
 DocType: Asset,Number of Depreciations Booked,Број Амортизација Жути картони
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Количина Укупно
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Против Емплоиее кредита: {0}
 DocType: Landed Cost Item,Receipt Document,prijem dokument
 DocType: Employee Education,School/University,Школа / Универзитет
 DocType: Payment Request,Reference Details,Референтна Детаљи
@@ -3748,7 +3768,7 @@
 DocType: Asset,Double Declining Balance,Доубле дегресивне
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Затворен поредак не може бити отказана. Отварати да откаже.
 DocType: Student Guardian,Father,отац
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 DocType: Attendance,On Leave,На одсуству
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Гет Упдатес
@@ -3762,10 +3782,10 @@
 DocType: Lead,Lower Income,Доња прихода
 DocType: Restaurant Order Entry,Current Order,Тренутни ред
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Иди на програме
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Расподијељена количина {1} не може бити већа од незадовољне количине {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Расподијељена количина {1} не може бити већа од незадовољне количине {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
@@ -3788,7 +3808,6 @@
 DocType: Payment Terms Template,Payment Terms,Услови плаћања
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,минут
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 DocType: Chapter,Meetup Embed HTML,Упознајте Ембед ХТМЛ
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Иди на добављаче
@@ -3808,30 +3827,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Молимо подесите Емаил ИД за Студент да бисте послали Захтев за плаћање
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Молимо подесите Емаил ИД за Студент да бисте послали Захтев за плаћање
 DocType: Patient,Medical History,Медицинска историја
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Банк Овердрафт счета
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Банк Овердрафт счета
 DocType: Patient,Patient ID,ИД пацијента
 DocType: Physician Schedule,Schedule Name,Распоред Име
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Маке плата Слип
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Додај све добављаче
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Додај све добављаче
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Додељени износ не може бити већи од преостали износ.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Бровсе БОМ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Обеспеченные кредиты
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Обеспеченные кредиты
 DocType: Purchase Invoice,Edit Posting Date and Time,Едит Књижење Датум и време
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Молимо поставите рачуна везаним амортизације средстава категорије {0} или компаније {1}
 DocType: Lab Test Groups,Normal Range,Нормалан опсег
 DocType: Academic Term,Academic Year,Академска година
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Доступна продаја
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Почетно стање Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Почетно стање Капитал
 DocType: Lead,CRM,ЦРМ
 DocType: Purchase Invoice,N,Н
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,остали
 DocType: Appraisal,Appraisal,Процена
+DocType: Loan,Loan Account,Кредитни рачун
 DocType: Purchase Invoice,GST Details,ГСТ Детаилс
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Емаил који је послат добављачу {0}
 DocType: Item,Default Sales Unit of Measure,Подразумевана продајна јединица мјере
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Академска година:
+DocType: Subscription,Past Due Date,Датум прошлости
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Не дозволите да поставите алтернативу за ставку {0}
 DocType: Opportunity,OPTY-,ОПТИ-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се понавља
@@ -3844,7 +3865,7 @@
 DocType: Patient Appointment,Patient Appointment,Именовање пацијента
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Унсубсцрибе из овог Емаил Дигест
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Добијте добављаче
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Добијте добављаче
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} није пронађен за ставку {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Иди на курсеве
 DocType: Accounts Settings,Show Inclusive Tax In Print,Прикажи инклузивни порез у штампи
@@ -3852,10 +3873,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Порука је послата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Рачун са дететом чворова не може да се подеси као књиге
 DocType: C-Form,II,ИИИ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Молимо вас да подесите систем именовања инструктора у образовању&gt; Образовне поставке
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Стопа по којој се Ценовник валута претвара у основну валуту купца
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: Physician,Physician Schedules,Распоред лекара
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Укупан износ аванса не може бити већи од укупног санкционисаног износа
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Укупан износ аванса не може бити већи од укупног санкционисаног износа
 DocType: Salary Slip,Hour Rate,Стопа час
 DocType: Stock Settings,Item Naming By,Шифра назив под
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
@@ -3873,6 +3895,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Није дозвољено да ажурирате акција трансакције старије од {0}
 DocType: BOM,Inspection Required,Инспекција Обавезно
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Унесите број гаранције банке пре подношења.
 DocType: Driving License Category,Class,Класа
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Радни налог се не може покренути против шаблона за ставке
@@ -3883,7 +3906,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Assessment Plan,Program,програм
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Молимо вас да подесите систем именовања инструктора у образовању&gt; Образовне поставке
 DocType: Serial No,Is Cancelled,Да ли Отказан
 DocType: Student Group,Group Based On,Групу на основу
 DocType: Student Group,Group Based On,Групу на основу
@@ -3895,9 +3917,10 @@
 DocType: Cheque Print Template,Cheque Height,Чек Висина
 DocType: Supplier,Supplier Details,Добављачи Детаљи
 DocType: Setup Progress,Setup Progress,Напредак подешавања
+DocType: Expense Claim,Approval Status,Статус одобравања
 DocType: Hub Settings,Publish Items to Hub,Објављивање артикле у Хуб
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Štiklirati sve
 ,Issued Items Against Work Order,Издате ставке против радног налога
 DocType: Vehicle Log,Invoice Ref,фактура Реф
@@ -3928,12 +3951,11 @@
 DocType: Customs Tariff Number,Tariff Number,Тарифни број
 DocType: Work Order Item,Available Qty at WIP Warehouse,Доступно Количина у ВИП Варехоусе
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,пројектован
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
 DocType: Notification Control,Quotation Message,Цитат Порука
-DocType: Employee Loan,Employee Loan Application,Запослени Захтев за кредит
 DocType: Issue,Opening Date,Датум отварања
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Молим вас прво спасите пацијента
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Молим вас прво спасите пацијента
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Присуство је успешно обележен.
 DocType: Program Enrollment,Public Transport,Јавни превоз
 DocType: Soil Texture,Silt Composition (%),Силт композиција (%)
@@ -3951,7 +3973,7 @@
 ,Item Balance (Simple),Баланс предмета (Једноставно)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Рачуни подигао Добављачи.
 DocType: POS Profile,Write Off Account,Отпис налог
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Дебит ноте Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Дебит ноте Амт
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
@@ -3974,6 +3996,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Продаја Датум поруџбине
 DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
 DocType: Assessment Plan,Assessment Plan,Процена план
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Реверсе Јоурнал Ентри
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клијент {0} је креиран.
 DocType: Stock Settings,Limit Percent,лимит Проценат
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно нема доступних трговина на залихама
@@ -3987,14 +4010,15 @@
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Payment Entry,Payment References,плаћања Референце
 DocType: C-Form,C-FORM-,"С-путем,"
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Број интервала за интервално поље, нпр. Ако је Интервал &quot;Дани&quot; и број обрачунског интервала је 3, фактуре ће бити генериране сваких 3 дана"
 DocType: Vehicle,Insurance Details,осигурање Детаљи
 DocType: Account,Payable,к оплате
 DocType: Share Balance,Share Type,Тип дељења
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Молимо Вас да унесете отплате Периоди
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Молимо Вас да унесете отплате Периоди
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Дужници ({0})
 DocType: Pricing Rule,Margin,Маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нове Купци
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Бруто добит%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Бруто добит%
 DocType: Appraisal Goal,Weightage (%),Веигхтаге (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Промените ПОС профил
 DocType: Bank Reconciliation Detail,Clearance Date,Чишћење Датум
@@ -4004,10 +4028,11 @@
 DocType: Lead,Address Desc,Адреса Десц
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Парти је обавезно
 DocType: Journal Entry,JV-,ЈВ-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Редови са дуплицираним датумима у другим редовима су пронађени: {лист}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Редови са дуплицираним датумима у другим редовима су пронађени: {лист}
 DocType: Topic,Topic Name,Назив теме
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Молимо подесите подразумевани образац за обавјештење о одобрењу одобрења у ХР поставкама.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Барем један од продајете или купујете морају бити изабрани
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Изаберите запосленог да запослени напредује.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Изаберите запосленог да запослени напредује.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Изаберите важећи датум
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Изаберите природу вашег посла.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4026,7 +4051,7 @@
 DocType: Asset Movement,Source Warehouse,Извор Магацин
 DocType: Installation Note,Installation Date,Инсталација Датум
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Схаре Ледгер
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: имовине {1} не припада компанији {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: имовине {1} не припада компанији {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Продајна фактура {0} креирана
 DocType: Employee,Confirmation Date,Потврда Датум
 DocType: C-Form,Total Invoiced Amount,Укупан износ Фактурисани
@@ -4035,7 +4060,7 @@
 DocType: Account,Accumulated Depreciation,Акумулирана амортизација
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Стално име
 DocType: Stock Entry,Customer or Supplier Details,Купца или добављача Детаљи
-DocType: Employee Loan Application,Required by Date,Рекуиред би Дате
+DocType: Loan Application,Required by Date,Рекуиред би Дате
 DocType: Lead,Lead Owner,Олово Власник
 DocType: Production Plan,Sales Orders Detail,Продајна наруџбина Детаил
 DocType: Bin,Requested Quantity,Тражени Количина
@@ -4048,10 +4073,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плате - Укупно Одузимање - Отплата кредита
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Плата Слип ИД
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Вишеструке варијанте
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Испоручено
+DocType: Subscription,Trial Period Start Date,Датум почетка пробног периода
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Молимо пријавите се као други корисник.
@@ -4072,12 +4098,11 @@
 DocType: Student Guardian,Student Guardian,студент Гардијан
 DocType: Member,Member Name,Име члан
 DocType: Stock Settings,Use Naming Series,Користите Наминг Сериес
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,у претплати
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 DocType: Membership,Payment Details,Podaci o plaćanju
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,БОМ курс
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Прекинуто радно поруџбање не може се отказати, Унстоп први да откаже"
 DocType: Asset,Journal Entry for Scrap,Јоурнал Ентри за отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
@@ -4097,6 +4122,7 @@
 DocType: Land Unit,Land Unit,Ланд Унит
 ,Purchase Analytics,Куповина Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Испорука Напомена Ставка
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Недостаје тренутна фактура {0}
 DocType: Asset Maintenance Log,Task,Задатак
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Број партије је обавезна за ставку {0}
@@ -4109,7 +4135,7 @@
 DocType: Company,Exchange Gain / Loss Account,Курсне / успеха
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Запослени и Присуство
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Попуните формулар и да га сачувате
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Попуните формулар и да га сачувате
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Стварна количина на лагеру
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Стварна количина на лагеру
@@ -4124,7 +4150,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Стандард Продаја курс
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
 DocType: Cash Flow Mapper,Section Name,Назив одељка
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Реордер ком
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Реордер ком
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Цуррент Јоб Опенингс
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписати
@@ -4135,9 +4161,9 @@
 DocType: Task,depends_on,депендс_он
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очекује се ажурирање најновије цене у свим материјалима. Може потрајати неколико минута.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земља мудар подразумевана адреса шаблон
 DocType: Water Analysis,Appearance,Изглед
+DocType: HR Settings,Leave Status Notification Template,Оставите шаблон за статусно стање
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Авг. Стопа листе куповних цена
 DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Информације о члановима.
@@ -4160,7 +4186,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Није дозвољено. Молим вас искључите Тест Темплате
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Crop Cycle,Linked Land Unit,Линкед Ланд Унит
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
@@ -4176,7 +4202,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Иди на Кориснике
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Неважећи ГСТИН или Ентер НА за регистровани
 DocType: Training Event,Seminar,семинар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Програм Упис накнада
@@ -4192,14 +4218,14 @@
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 DocType: Company,Create Chart Of Accounts Based On,Створити контни план на основу
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Не могу да претворим у не-групу. Постоје задаци за децу.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Студент {0} постоје против подносиоца пријаве студента {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Прилагођавање заокруживања (валута компаније)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Распоред
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Батцх:
 DocType: Volunteer,Afternoon,Поподневни
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Cheque Print Template,Scanned Cheque,скенирана Чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
@@ -4215,7 +4241,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Пројекат {0} већ постоји
 DocType: Medical Department,Nursing User,Нурсинг Усер
 DocType: Plant Analysis,Plant Analysis Criterias,Критеријуми за анализу биљака
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Одговорности
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Серијски број {0} не припада Батцх {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Одговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Рок важности ове понуде је завршен.
 DocType: Expense Claim Account,Expense Claim Account,Расходи Захтев налог
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволите старе курсеве
@@ -4237,11 +4264,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Правите варијанте
 DocType: Item,Default BOM,Уобичајено БОМ
 DocType: Project,Total Billed Amount (via Sales Invoices),Укупан фактурисани износ (преко фактура продаје)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Задужењу Износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Задужењу Износ
 DocType: Project Update,Not Updated,Није ажурирано
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Постоје недоследности између стопе, без акција и израчунате количине"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Укупно Изванредна Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Укупно Изванредна Амт
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
 DocType: Employee Advance,Advance Account,Адванце Аццоунт
 DocType: Job Offer,Job Offer Terms,Услови понуде посла
@@ -4250,7 +4277,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,аутомобилски
 DocType: Vehicle,Insurance Company,Осигурање
 DocType: Asset Category Account,Fixed Asset Account,Основних средстава налог
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,варијабла
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,варијабла
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из доставница
 DocType: Chapter,Members,Чланови
 DocType: Student,Student Email Address,Студент-маил адреса
@@ -4274,7 +4301,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,стажиста
 DocType: Delivery Stop,Address Name,Адреса Име
 DocType: Stock Entry,From BOM,Од БОМ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Раздвајање {0} јединица {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Раздвајање {0} јединица {1}
 DocType: Assessment Code,Assessment Code,Процена код
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
@@ -4282,25 +4309,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,dokument плаћање
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Грешка у процјени формула за критеријуме
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+DocType: Subscription,Plans,Планови
 DocType: Salary Slip,Salary Structure,Плата Структура
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Питање Материјал
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Дошло је до грешке приликом стварања понављајуће
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Нема Студент Групе створио.
 DocType: Purchase Invoice Item,Serial No,Серијски број
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може бити већи од кредита Износ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може бити већи од кредита Износ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Ред # {0}: Очекивани датум испоруке не може бити пре датума куповине налога
 DocType: Purchase Invoice,Print Language,принт Језик
 DocType: Salary Slip,Total Working Hours,Укупно Радно време
 DocType: Sales Invoice,Customer PO Details,Цустомер ПО Детаљи
-DocType: Subscription,Next Schedule Date,Следећи датум распореда
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Привремени рачун за отварање
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Унесите вредност мора бити позитивна
@@ -4329,11 +4355,11 @@
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,"От и До даты , необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Нема запослених по наведеним критеријумима
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
 DocType: Hotel Settings,Default Customer,Дефаулт Цустомер
 DocType: Assessment Plan,Supervisor Name,Супервизор Име
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдите да ли је заказан термин за исти дан
@@ -4358,16 +4384,16 @@
 DocType: Journal Entry Account,Employee Advance,Адванце Емплоиее
 DocType: Payroll Entry,Payroll Frequency,паиролл Фреквенција
 DocType: Lab Test Template,Sensitivity,Осетљивост
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,сырье
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Постројења и машине
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Постројења и машине
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Свакодневном раду Преглед подешавања
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Молимо унесите Рекд по датуму
 DocType: Payment Entry,Internal Transfer,Интерни пренос
 DocType: Asset Maintenance,Maintenance Tasks,Задаци одржавања
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Молимо Вас да изаберете датум постања први
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Молимо Вас да изаберете датум постања први
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
 DocType: Leave Control Panel,Carry Forward,Пренети
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
@@ -4375,14 +4401,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ЕРПНект Интегратионс
 DocType: Crop Cycle,Detected Disease,Детектована болест
 ,Produced,произведен
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Датум почетка отплате не може бити пре Датума исплате.
 DocType: Item,Item Code for Suppliers,Код за добављаче артикла
 DocType: Issue,Raised By (Email),Подигао (Е-маил)
 DocType: Training Event,Trainer Name,тренер Име
 DocType: Mode of Payment,General,Општи
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последњи Комуникација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последњи Комуникација
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Утакмица плаћања са фактурама
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
@@ -4396,7 +4423,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Др {0} на Пола дана Оставите на {1}
 DocType: Production Plan,Get Material Request,Гет Материал захтев
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Почтовые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 ,Item Variant Details,Детаљи варијанте производа
@@ -4407,9 +4434,9 @@
 DocType: Drug Prescription,Hour,час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последња продаја фактура
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Молимо вас да изаберете Кти против ставке {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Все эти предметы уже выставлен счет
 DocType: Company,Monthly Sales Target,Месечна продајна мета
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
@@ -4417,7 +4444,7 @@
 DocType: Item,Default Material Request Type,Уобичајено Материјал Врста Захтева
 DocType: Supplier Scorecard,Evaluation Period,Период евалуације
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Непознат
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Радни налог није креиран
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Радни налог није креиран
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: Purchase Invoice,Export Type,Тип извоза
 DocType: Salary Slip Loan,Salary Slip Loan,Зараду за плате
@@ -4433,8 +4460,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Отварање резимеа фактура
 DocType: Education Settings,Education Manager,Менаџер образовања
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Минимална дужина између сваке биљке у пољу за оптималан раст
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирано артикла {0} не може да се ажурира преко Стоцк помирење, уместо тога користе Стоцк унос"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирано артикла {0} не може да се ажурира преко Стоцк помирење, уместо тога користе Стоцк унос"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирано артикла {0} не може да се ажурира преко Стоцк помирење, уместо тога користе Стоцк унос"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Дозирано артикла {0} не може да се ажурира преко Стоцк помирење, уместо тога користе Стоцк унос"
 DocType: Quality Inspection,Report Date,Извештај Дате
 DocType: Student,Middle Name,Средње име
 DocType: C-Form,Invoices,Рачуни
@@ -4467,20 +4494,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Признаница
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Признаница
 ,Sales Register,Продаја Регистрација
 DocType: Daily Work Summary Group,Send Emails At,Шаљу мејлове на
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Форм Виев
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Трошкови одобрења обавезни у потраживању трошкова
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Додајте кориснике у своју организацију, осим себе."
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Но Купци иет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај о токовима готовине
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Није направљен материјални захтев
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
@@ -4503,11 +4531,12 @@
 DocType: Vehicle,Chassis No,шасија Нема
 DocType: Payment Request,Initiated,Покренут
 DocType: Production Plan Item,Planned Start Date,Планирани датум почетка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Изаберите БОМ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Изаберите БОМ
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Коришћен ИТЦ интегрисани порез
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
+DocType: Bank Guarantee,Clauses and Conditions,Клаузуле и услови
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
 DocType: Project Task,View Timesheet,Виев Тимесхеет
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Крајњи датум мора бити већи од почетног датума
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Leave Allocation,New Leaves Allocated,Нови Леавес Издвојена
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
@@ -4521,9 +4550,10 @@
 DocType: Patient,Alcohol Current Use,Употреба алкохола
 DocType: Student Admission Program,Student Admission Program,Студентски пријемни програм
 DocType: Payment Entry,Account Paid To,Рачун Паид То
+DocType: Subscription Settings,Grace Period,Грејс период
 DocType: Item Alternative,Alternative Item Name,Алтернативни назив предмета
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Није могуће поднети било који плати <br> \ Могући разлози: <br> \ 1. Нето плаћа је мања од 0. <br> \ 2. Е-адреса компаније назначена у мастеру запосленог није важећа. <br>
@@ -4533,7 +4563,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} буџета за налог {1} против {2} {3} је {4}. То ће премашити по {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Од Кол
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и унцхцкед Онемогућено у
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Финансијске услуге
 DocType: Student Sibling,Student ID,студентска
@@ -4545,14 +4574,16 @@
 DocType: Complaint,Complaint,Жалба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Изврши отплату
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Сви одјели
 DocType: Patient,Alcohol Past Use,Употреба алкохола у прошлости
 DocType: Fertilizer Content,Fertilizer Content,Садржај ђубрива
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Кр
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Кр
 DocType: Project Update,Problematic/Stuck,Проблематиц / Стуцк
 DocType: Tax Rule,Billing State,Тецх Стате
 DocType: Share Transfer,Transfer,Пренос
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Радни налог {0} мора бити отказан прије отказивања овог продајног налога
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
@@ -4576,10 +4607,11 @@
 DocType: Cheque Print Template,Message to show,Порука схов
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Малопродаја
 DocType: Student Attendance,Absent,Одсутан
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Није могуће пронаћи резултат који почиње са {0}. Морате имати стојеће резултате који покривају 0 до 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
+DocType: Subscription,Current Invoice Start Date,Датум почетка фактуре
 DocType: Timesheet,TS-,ТС-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Или дебитне или кредитне количина је потребна за {2}
 DocType: GL Entry,Remarks,Примедбе
@@ -4589,11 +4621,13 @@
 DocType: Task,Parent Task,Задатак родитеља
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Маке Леад
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Принт и Папирна
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Принт и Папирна
 DocType: Stock Settings,Show Barcode Field,Схов Баркод Поље
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Пошаљи Супплиер Емаилс
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Плата већ обрађени за период од {0} и {1}, Оставите период апликација не може бити између овај период."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Пошаљи Супплиер Емаилс
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Плата већ обрађени за период од {0} и {1}, Оставите период апликација не може бити између овај период."
+DocType: Fiscal Year,Auto Created,Ауто Цреатед
 DocType: Chapter Member,Leave Reason,Оставите разлог
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Рачун {0} више не постоји
 DocType: Guardian Interest,Guardian Interest,гуардиан камата
 DocType: Volunteer,Availability,Доступност
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Подеси подразумеване вредности за ПОС Рачуне
@@ -4602,14 +4636,13 @@
 DocType: Timesheet,Employee Detail,zaposleni Детаљи
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Гуардиан1 маил ИД
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Гуардиан1 маил ИД
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Следећи датум је дан и поновите на дан месеца морају бити једнаки
 DocType: Lab Prescription,Test Code,Тест Цоде
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Подешавања за интернет страницама
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},РФК-ови нису дозвољени за {0} због стања стола за резултат {1}
 DocType: Job Offer,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Горе
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Укупан износ {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Укупан износ {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Поменули да нестандардни плаћа рачун
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Молимо одаберите групу процене осим &quot;Све за оцењивање група&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Ред {0}: Цена центра је потребна за ставку {1}
@@ -4620,7 +4653,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Анализа воде
 DocType: Chapter,Region,Регија
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Поново учитај анализу
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За нпр 2012, 2012-13"
@@ -4636,7 +4669,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Трошкови укинуо Ассет
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
 DocType: Vehicle,Policy No,politika Нема
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Гет ставки из производа Бундле
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,projekat Корисник
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Разделити
@@ -4676,21 +4709,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Пут
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге , как это имеет дочерние узлы"
 DocType: Production Plan,Total Planned Qty,Укупна планирана количина
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Отварање Вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Отварање Вредност
 DocType: Salary Detail,Formula,формула
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Сериал #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Сериал #
 DocType: Lab Test Template,Lab Test Template,Лаб тест шаблон
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Рачун продаје
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Рачун продаје
 DocType: Purchase Invoice Item,Total Weight,Укупна маса
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комиссия по продажам
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Комиссия по продажам
 DocType: Job Offer Term,Value / Description,Вредност / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
 DocType: Purchase Order Item,Expected Delivery Date,Очекивани Датум испоруке
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ордер Ордер Ентри
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
 DocType: Asset Maintenance Task,Assign To Name,Додели име
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,представительские расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,представительские расходы
 DocType: Hub Settings,Enabled Users,Омогућени корисници
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Маке Материал захтев
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Отворено артикла {0}
@@ -4703,24 +4736,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Пријаве за одмор.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
 DocType: Vehicle,Last Carbon Check,Последња Угљен Одлазак
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,судебные издержки
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,судебные издержки
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Молимо одаберите количину на реду
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Отворите рачуне за продају и куповину
 DocType: Purchase Invoice,Posting Time,Постављање Време
 DocType: Timesheet,% Amount Billed,% Фактурисаних износа
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Проверите ово ако желите да натера кориснику да одабере серију пре чувања. Неће бити подразумевано ако проверите ово.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Нет товара с серийным № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Нет товара с серийным № {0}
 DocType: Email Digest,Open Notifications,Отворене Обавештења
 DocType: Payment Entry,Difference Amount (Company Currency),Разлика Износ (Фирма валута)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,прямые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,прямые расходы
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нови Кориснички Приход
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Командировочные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додајте прилагођено поље Претплата у доцтипе {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Purchase Receipt Item,Sample Quantity,Количина узорка
+DocType: Bank Guarantee,Name of Beneficiary,Име корисника
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Аутоматско ажурирање трошкова БОМ-а путем Планера, на основу најновије процене стопе цена / цене цена / последње цене сировина."
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
@@ -4732,14 +4765,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,пробни рад
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата компоненте
 DocType: Program Enrollment Tool,New Academic Year,Нова школска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Повратак / одобрењу кредита
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Повратак / одобрењу кредита
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Укупно Плаћени износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Укупно Плаћени износ
 DocType: GST Settings,B2C Limit,Б2Ц Лимит
 DocType: Work Order Item,Transferred Qty,Пренето Кти
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигација
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,планирање
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,планирање
 DocType: Share Balance,Issued,Издато
+DocType: Loan,Repayment Start Date,Датум почетка отплате
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,студент Активност
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Добављач Ид
 DocType: Payment Request,Payment Gateway Details,Паимент Гатеваи Детаљи
@@ -4752,10 +4786,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листова као што су повремене, болесне итд"
 DocType: Email Digest,Send regular summary reports via Email.,Пошаљи редовне збирне извештаје путем е-маил.
 DocType: Payment Entry,PE-,ПЕ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
 DocType: Assessment Result,Student Name,Име студента
 DocType: Brand,Item Manager,Тачка директор
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,паиролл оплате
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,паиролл оплате
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
 DocType: Plant Analysis,Collection Datetime,Колекција Датетиме
 DocType: Work Order,Total Operating Cost,Укупни оперативни трошкови
@@ -4765,9 +4799,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Пользователь {0} не существует
 DocType: Payment Term,Day(s) after invoice date,Дан (а) након датума фактуре
 DocType: Payment Schedule,Payment Schedule,Динамика плаћања
-DocType: Subscription,SUB-,СУБ-
 DocType: Item Attribute Value,Abbreviation,Скраћеница
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Плаћање Ступање већ постоји
+DocType: Subscription,Trial Period End Date,Датум завршетка пробног периода
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Шаблоном Зарплата .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Патологија
@@ -4784,9 +4818,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,картон Месечно
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
@@ -4795,14 +4829,15 @@
 DocType: Lab Prescription,Test Created,Тест Цреатед
 DocType: Healthcare Settings,Custom Signature in Print,Прилагођени потпис у штампи
 DocType: Account,Temporary,Привремен
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Кориснички ЛПО бр.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Кориснички ЛПО бр.
 DocType: Program,Courses,kursevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,секретар
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ако онемогућавање, &quot;у речима&quot; пољу неће бити видљив у свакој трансакцији"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ова акција ће зауставити будуће обрачунавање. Да ли сте сигурни да желите отказати ову претплату?
 DocType: Serial No,Distinct unit of an Item,Разликује јединица стране јединице
 DocType: Supplier Scorecard Criteria,Criteria Name,Име критеријума
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Молимо поставите Цомпани
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Молимо поставите Цомпани
 DocType: Pricing Rule,Buying,Куповина
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Болести и ђубрива
 DocType: HR Settings,Employee Records to be created by,Евиденција запослених које ће креирати
@@ -4811,18 +4846,18 @@
 DocType: POS Profile,Apply Discount On,Аппли попуста на
 DocType: Member,Membership Type,Тип чланства
 ,Reqd By Date,Рекд по датуму
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Повериоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Повериоци
 DocType: Assessment Plan,Assessment Name,Процена Име
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Покажите ПДЦ у Штампање
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Покажите ПДЦ у Штампање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ред # {0}: Серијски број је обавезан
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Понуда за посао
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Институт држава
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 DocType: Consultation,C-,Ц-
 DocType: Attendance,ATT-,АТТ-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
@@ -4840,7 +4875,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Укупна разлика
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако је укључен, систем ће писати уносе рачуноводствене инвентар аутоматски."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,посредништво
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Присуство за запосленог {0} је већ означена за овај дан
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Присуство за запосленог {0} је већ означена за овај дан
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","у Минутес 
  ажурирано преко 'Време Приступи'"
@@ -4852,6 +4887,7 @@
 DocType: Lab Test,Approved Date,Одобрени датум
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
+DocType: Subscriber,Subscriber Name,Име претплатника
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Update Tool,Replace,Заменити
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Нема нађених производа.
@@ -4861,19 +4897,18 @@
 DocType: Request for Quotation Item,Project Name,Назив пројекта
 DocType: Customer,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Изаберемо рачун прихода од камата у запосленом кредиту {0}
 DocType: Work Order,Required Items,тражених ставки
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Људски Ресурси
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаћање Плаћање Помирење
 DocType: Disease,Treatment Task,Третман задатака
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,налоговые активы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,налоговые активы
 DocType: BOM Item,BOM No,БОМ Нема
 DocType: Instructor,INS/,ИНС /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Update Tool,The BOM which will be replaced,БОМ који ће бити замењен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,електронске опреме
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,електронске опреме
 DocType: Asset,Maintenance Required,Одржавање је потребно
 DocType: Account,Debit,Задужење
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
@@ -4882,7 +4917,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Изузетан Амт
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставите циљеве ставку Групе мудро ову особу продаје.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [ дней ]"
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: имовине је обавезан за фиксни средстава куповине / продаје
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: имовине је обавезан за фиксни средстава куповине / продаје
 DocType: Asset Maintenance Team,Maintenance Team Name,Име тима за одржавање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако два или више Цене Правила су пронадјени на основу горе наведеним условима, Приоритет се примењује. Приоритет је број између 0 до 20, док стандардна вредност нула (празно). Већи број значи да ће имати предност ако постоји више Цене Правила са истим условима."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Корисник је обавезан ако је изабрана опција &quot;Опција од&quot; као Корисник
@@ -4892,19 +4927,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Врсте расхода потраживања.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Продајном курсу за ставку {0} је нижи од својих {1}. Продаје стопа буде атлеаст {2}
-DocType: Item,Taxes,Порези
+DocType: Subscription,Taxes,Порези
 DocType: Purchase Invoice,capital goods,капиталних производа
 DocType: Purchase Invoice Item,Weight Per Unit,Тежина по јединици
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Паид и није испоручена
 DocType: Project,Default Cost Center,Уобичајено Трошкови Центар
-DocType: Bank Guarantee,End Date,Датум завршетка
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,stock Трансакције
 DocType: Budget,Budget Accounts,рачуна буџета
 DocType: Employee,Internal Work History,Интерни Рад Историја
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Исправка вриједности Количина
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Добављач Сцорецард Вариабле
-DocType: Employee Loan,Fully Disbursed,potpuno Додељено
 DocType: Employee Advance,Due Advance Amount,Дуе Адванце Амоунт
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
@@ -4928,7 +4961,7 @@
 ,Employee Information,Запослени Информације
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Основани порезни предлошци за продају и куповину су створени.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Оцењивање Резултат записа {0} већ постоји.
@@ -4936,7 +4969,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Молимо поставите Фирма филтер празно ако Група По је &#39;Фирма&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Датум постања не може бити будућност датум
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,за стварање понављајуће
 DocType: Stock Entry,Target Warehouse Address,Адреса циљне магацине
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Повседневная Оставить
 DocType: Agriculture Task,End Day,Крајњи дан
@@ -4961,11 +4993,10 @@
 DocType: Material Request,% Ordered,% Од А до Ж
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За Студент Гроуп курс заснован, Курс ће бити потврђена за сваког студента из уписаних курсева у програм Упис."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,рад плаћен на акорд
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Про. Куповни
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Про. Куповни
 DocType: Share Balance,From No,Од бр
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Нова порука од {пошиљаоца}
 DocType: Customer,Customer Primary Address,Примарна адреса клијента
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтен
 DocType: Drug Prescription,Description/Strength,Опис / снага
@@ -4974,22 +5005,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Исто ставка је ушла више пута
 DocType: Department,Leave Block List,Оставите Блоцк Лист
 DocType: Purchase Invoice,Tax ID,ПИБ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Рачуни Подешавања
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,одобрити
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Малформатирана адреса за {0}, поправите за наставак."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Малформатирана адреса за {0}, поправите за наставак."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",Број новог налога ће бити укључен у име налога као префикс
 DocType: Maintenance Team Member,Team Member,Члан тима
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Нема резултата који треба да пошаљу
 DocType: Customer,Sales Partner and Commission,Продаја партнера и Комисија
-DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стопа (%) / Иеар
+DocType: Loan,Rate of Interest (%) / Year,Каматна стопа (%) / Иеар
 ,Project Quantity,projekat Количина
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;"
 DocType: Opportunity,To Discuss,Да Дисцусс
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} јединице {1} потребна {2} довршите ову трансакцију.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стопа (%) Годишња
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Привремене рачуни
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Црн
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Привремене рачуни
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Shareholder,Contact List,Контакт листа
 DocType: Account,Auditor,Ревизор
@@ -4997,16 +5028,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ставки производе
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Сазнајте више
 DocType: Cheque Print Template,Distance from top edge,Удаљеност од горње ивице
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Ценовник {0} је онемогућена или не постоји
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Ценовник {0} је онемогућена или не постоји
 DocType: Purchase Invoice,Return,Повратак
 DocType: Pricing Rule,Disable,запрещать
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Начин плаћања је обавезан да изврши уплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Начин плаћања је обавезан да изврши уплату
 DocType: Project Task,Pending Review,Чека критику
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Измените на целој страници за више опција као што су имовина, серијски нос, серије итд."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Именовања и консултације
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} није уписано у Батцх {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Средство {0} не може бити укинута, јер је већ {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Потребно је проверити
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Потребно је проверити
 DocType: Task,Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Екпенсе потраживања)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,марк Одсутан
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Није успело да подеси компанију
@@ -5018,7 +5049,7 @@
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управљање возним парком
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Адд ставке из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Адд ставке из
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Цроп &amp; Ландс
 DocType: Cheque Print Template,Regular,редован
 DocType: Fertilizer,Density (if liquid),Густина (ако је течност)
@@ -5043,24 +5074,26 @@
 DocType: Payment Entry,Paid Amount,Плаћени Износ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Истражите кола за продају
 DocType: Assessment Plan,Supervisor,надзорник
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Задржавање залиха залиха
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Задржавање залиха залиха
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 ,Work Order Stock Report,Извештај о радном налогу
+DocType: Purchase Receipt,Auto Repeat Detail,Ауто Репеат Детаил
 DocType: Assessment Result Tool,Assessment Result Tool,Алат Резултат процена
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Као супервизор
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Предложи категорију
 DocType: BOM Scrap Item,BOM Scrap Item,БОМ отпад артикла
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Достављени налози се не могу избрисати
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Управљање квалитетом
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Управљање квалитетом
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Итем {0} је онемогућен
 DocType: Project,Total Billable Amount (via Timesheets),Укупан износ износа (преко Тимесхеета)
 DocType: Agriculture Task,Previous Business Day,Претходни радни дан
-DocType: Employee Loan,Repay Fixed Amount per Period,Отплатити фиксан износ по периоду
+DocType: Loan,Repay Fixed Amount per Period,Отплатити фиксан износ по периоду
 DocType: Employee,Health Insurance No,Здравствено осигурање бр
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Кредит Напомена Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Кредит Напомена Амт
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Укупан износ опорезивања
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
 DocType: Opening Invoice Creation Tool,Purchase,Куповина
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Стање Кол
@@ -5071,15 +5104,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 DocType: Healthcare Settings,Valid number of days,Важи број дана
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Цост центри
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Рестарт претплата
 DocType: Land Unit,Linked Plant Analysis,Линкед Плант Аналисис
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Стопа по којој је добављач валута претвара у основну валуту компаније
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ров # {0}: ТИМИНГС сукоби са редом {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволите Зеро Вредновање Рате
+DocType: Bank Guarantee,Receiving,Пријем
 DocType: Training Event Employee,Invited,позван
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Више активни структуре плате фоунд фор запосленом {0} за одређени датум
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Сетуп Гатеваи рачуни.
 DocType: Employee,Employment Type,Тип запослења
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,капитальные активы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,капитальные активы
 DocType: Payment Entry,Set Exchange Gain / Loss,Сет курсне / Губитак
 ,GST Purchase Register,ПДВ Куповина Регистрација
 ,Cash Flow,Protok novca
@@ -5099,9 +5134,10 @@
 DocType: Academic Term,Term Start Date,Термин Датум почетка
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Списак свих дионица трансакција
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,опп Точка
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},У прилогу {0} {1} #
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Морају се подесити датум почетка пробног периода и датум завршетка пробног периода
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Просечна стопа
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Укупан износ плаћања у распореду плаћања мора бити једнак Гранд / заокруженом укупно
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Укупан износ плаћања у распореду плаћања мора бити једнак Гранд / заокруженом укупно
+DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банка Биланс по Главној књизи
 DocType: Job Applicant,Applicant Name,Подносилац захтева Име
 DocType: Authorization Rule,Customer / Item Name,Кориснички / Назив
@@ -5131,6 +5167,7 @@
 DocType: Work Order,Warehouses,Складишта
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} имовина не може се пренети
 DocType: Hotel Room Pricing,Hotel Room Pricing,Хотелска соба Прицинг
+DocType: Subscription,Days Until Due,Дани до доспијећа
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ова ставка је варијанта {0} (Темплате).
 DocType: Workstation,per hour,на сат
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Куповина
@@ -5139,13 +5176,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","За студентске групе Серија засноване, Студентски Серија ће бити потврђена за сваки студент из програма упис."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Дистрибуција
+DocType: Journal Entry Account,Loan,Зајам
 DocType: Expense Claim Advance,Expense Claim Advance,Адванце Цлаим Адванце
 DocType: Lab Test,Report Preference,Предност извештаја
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Волонтерске информације.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Пројецт Манагер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Пројецт Манагер
 ,Quoted Item Comparison,Цитирано артикла Поређење
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Преклапање у бодовима између {0} и {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Нето вредност имовине као на
 DocType: Crop,Produce,Продукт
@@ -5155,7 +5193,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Потрошња материјала за производњу
 DocType: Item Alternative,Alternative Item Code,Алтернативни код артикла
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Изабери ставке у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Изабери ставке у Производња
 DocType: Delivery Stop,Delivery Stop,Достава Стоп
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
@@ -5165,15 +5203,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапун и детерџент
 DocType: BOM,Show Items,Схов Предмети
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Фром Тиме не може бити већи од на време.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Желите ли да обавестите све купце путем е-поште?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Желите ли да обавестите све купце путем е-поште?
+DocType: Subscription Plan,Billing Interval,Интервал зарачунавања
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Резиме
 DocType: Hub Settings,Hub Username,Хуб Усернаме
 DocType: Salary Detail,Component,Саставни део
 DocType: Assessment Criteria,Assessment Criteria Group,Критеријуми за процену Група
 DocType: Healthcare Settings,Patient Name By,Име пацијента од
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Обавештење о дневном обрачуну за плате од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Обавештење о дневном обрачуну за плате од {0} до {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
@@ -5187,23 +5225,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
 DocType: Leave Block List,Applies to Company,Примењује се на предузећа
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
-DocType: Employee Loan,Disbursement Date,isplata Датум
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Примаоци&#39; нису наведени
+DocType: Loan,Disbursement Date,isplata Датум
 DocType: BOM Update Tool,Update latest price in all BOMs,Ажурирај најновију цену у свим БОМ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Медицински запис
 DocType: Vehicle,Vehicle,Возило
 DocType: Purchase Invoice,In Words,У Вордс
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Пре подношења наведите назив банке или кредитне институције.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} морају бити поднети
 DocType: POS Profile,Item Groups,итем Групе
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
 DocType: Sales Order Item,For Production,За производњу
 DocType: Payment Request,payment_url,паимент_урл
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Молимо вас да додате рачун за привремени отварање на контном плану
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Молимо вас да додате рачун за привремени отварање на контном плану
 DocType: Customer,Customer Primary Contact,Примарни контакт клијента
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Часопис за затварање периода
 DocType: Project Task,View Task,Погледај Задатак
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Опп / Олово%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Опп / Олово%
+DocType: Bank Guarantee,Bank Guarantee Type,Тип гаранције банке
 DocType: Material Request,MREQ-,МРЕК-
 DocType: Payment Schedule,Invoice Portion,Портфељ фактуре
 ,Asset Depreciations and Balances,Средстава Амортизација и ваге
@@ -5214,9 +5253,8 @@
 DocType: Production Plan,Include Subcontracted Items,Укључите предмете са подуговарачима
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Не могу променити својства варијанте након трансакције. За то ћете морати направити нову ставку.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
-DocType: Employee Loan,Repay from Salary,Отплатити од плате
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+DocType: Loan,Repay from Salary,Отплатити од плате
 DocType: Leave Application,LAP/,ЛАП /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Тражећи исплату од {0} {1} за износ {2}
 DocType: Salary Slip,Salary Slip,Плата Слип
@@ -5240,11 +5278,11 @@
 DocType: Employee Education,Employee Education,Запослени Образовање
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Дупликат ставка група наћи у табели тачка групе
 DocType: Land Unit,Parent Land Unit,Родитељска јединица
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
 DocType: Fertilizer,Fertilizer Name,Име ђубрива
 DocType: Salary Slip,Net Pay,Нето плата
 DocType: Cash Flow Mapping Accounts,Account,рачун
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серийный номер {0} уже получил
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Серийный номер {0} уже получил
 ,Requested Items To Be Transferred,Тражени Артикли ће се пренети
 DocType: Expense Claim,Vehicle Log,возило се
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Присуство грознице (температура&gt; 38,5 ° Ц / 101,3 ° Ф или трајна темп&gt; 38 ° Ц / 100,4 ° Ф)"
@@ -5285,24 +5323,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
 DocType: Asset Maintenance,Manufacturing User,Производња Корисник
 DocType: Purchase Invoice,Raw Materials Supplied,Сировине комплету
-DocType: C-Form,Series,серија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Валута ценовника {0} мора бити {1} или {2}
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Soil Texture,Ternary Plot,Тернари плот
 DocType: Item Group,Item Classification,Итем Класификација
 DocType: Driver,License Number,Број лиценце
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Менаџер за пословни развој
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Менаџер за пословни развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржавање посета Сврха
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Регистрација фактуре пацијента
 DocType: Crop,Period,период
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Главна књига
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Запослени {0} на одмору на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Запослени {0} на одмору на {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Погледај Леадс
 DocType: Program Enrollment Tool,New Program,Нови програм
 DocType: Item Attribute Value,Attribute Value,Вредност атрибута
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 DocType: Salary Detail,Salary Detail,плата Детаљ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Изаберите {0} први
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Изаберите {0} први
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консултације
@@ -5310,15 +5347,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не може бити већа од планиране количине ({2}) у радном налогу {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Време лист за производњу.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,сума ставке
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Не могу променити својства варијанте након трансакције са акцијама. За то ћете морати направити нову ставку.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,ГоЦардлесс СЕПА Мандат
 DocType: Physician,Charges,Накнаде
 DocType: Production Plan,Get Items For Work Order,Добијте ставке за радни налог
 DocType: Salary Detail,Default Amount,Уобичајено Износ
 DocType: Lab Test Template,Descriptive,Дескриптивно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Складиште није пронађен у систему
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Складиште није пронађен у систему
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Овај месец је Преглед
 DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Поставите циљ продаје који желите остварити за своју компанију.
 ,Project wise Stock Tracking,Пројекат мудар Праћење залиха
@@ -5346,11 +5384,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Неуспело је направити веб страницу
 DocType: Soil Analysis,Mg/K,Мг / К
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Већ створени унос задржавања залиха или количина узорка нису обезбеђени
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Већ створени унос задржавања залиха или количина узорка нису обезбеђени
 DocType: Program,Program Abbreviation,програм држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Warranty Claim,Resolved By,Решен
-DocType: Bank Guarantee,Start Date,Датум почетка
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити погрешно ситуацију
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
@@ -5365,11 +5402,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Радно време
 DocType: Project,Expected Start Date,Очекивани датум почетка
 DocType: Purchase Invoice,04-Correction in Invoice,04-Исправка у фактури
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Радни налог већ је креиран за све предмете са БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Радни налог већ је креиран за све предмете са БОМ
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Извештај о варијантама
 DocType: Setup Progress Action,Setup Progress Action,Сетуп Прогресс Ацтион
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Куповни ценовник
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Куповни ценовник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Отказати претплату
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Изаберите стање одржавања као завршено или уклоните датум завршетка
 DocType: Supplier,Default Payment Terms Template,Подразумевани образац за плаћање
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Трансакција валуте мора бити исти као паимент гатеваи валуте
@@ -5380,7 +5418,6 @@
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција ако целокупна месечна буџет Екцеедед
-DocType: Subscription,Submit on creation,Пошаљи на стварању
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Валута за {0} мора бити {1}
 DocType: Asset,Disposal Date,odlaganje Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Емаилс ће бити послат свим активних радника компаније у датом сат времена, ако немају одмора. Сажетак одговора ће бити послат у поноћ."
@@ -5399,6 +5436,7 @@
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Cheque Print Template,Cheque Print Template,Чек Штампа Шаблон
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Дијаграм трошкова центара
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Број дана након датума израчуна фактуре пре истека преузимања претплате или обележавања обиљежавања као неплаћеног
 DocType: Lab Test Template,Sample Collection,Сампле Цоллецтион
 ,Requested Items To Be Ordered,Тражени ставке за Ж
 DocType: Price List,Price List Name,Ценовник Име
@@ -5407,7 +5445,7 @@
 DocType: Account,Income,доход
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нешто није у реду!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 DocType: Supplier Scorecard Scoring Criteria,Score,скор
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Фискална година {0} не постоји
@@ -5427,12 +5465,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} треба да буде вредност између 0 и 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Следећи датум амортизације не може бити пре расположивог датума употребе
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,необеспеченных кредитов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
 DocType: Student,B+,Б +
 DocType: HR Settings,Max working hours against Timesheet,Мак радног времена против ТимеСхеет
 DocType: Maintenance Schedule Detail,Scheduled Date,Планиран датум
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Укупно Плаћени Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Укупно Плаћени Амт
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Порука већи од 160 карактера ће бити подељен на више Упис
 DocType: Purchase Receipt Item,Received and Accepted,Примио и прихватио
 DocType: Hub Settings,Company and Seller Profile,Профил фирме и продавца
@@ -5446,10 +5484,9 @@
 DocType: Item,Variant Based On,Варијанту засновану на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Ваши Добављачи
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Молим вас исправите
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 DocType: Request for Quotation Item,Supplier Part No,Добављач Део Бр
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Анонимно
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Primio od
 DocType: Lead,Converted,Претворено
@@ -5463,6 +5500,7 @@
 DocType: Asset,Assets,Средства
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
+DocType: Subscription,Current Invoice End Date,Тренутни датум завршетка рачуна
 DocType: Payment Term,Due Date Based On,Дуе Дате Басед Он
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Молимо подесите подразумевану групу и територију у продајном подешавању
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} не постоји
@@ -5470,7 +5508,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,За унос дневника нису изабрана никаква отплата
 DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
+DocType: Loan,Disbursed,Исплаћено
 DocType: Healthcare Settings,Laboratory Settings,Лабораторијске поставке
 DocType: Patient Appointment,Service Unit,Сервисна јединица
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Успешно поставите добављача
@@ -5483,12 +5523,12 @@
 DocType: Share Balance,No of Shares,Број акција
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Изаберите Статус
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: School House,House Name,хоусе Име
 DocType: Fee Schedule,Total Amount per Student,Укупан износ по ученику
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,электрический
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,электрический
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Додајте остатак свог организације као своје кориснике. Такође можете да додате позвати купце да вашем порталу тако да их додају из контаката
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
 DocType: Grant Application,Requested Amount,Тражени износ
@@ -5498,7 +5538,7 @@
 DocType: Crop Cycle,Detected Diseases,Откривене болести
 DocType: Stock Entry,Default Source Warehouse,Уобичајено Извор Магацин
 DocType: Item,Customer Code,Кориснички Код
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Подсетник за рођендан за {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Подсетник за рођендан за {0}
 DocType: Asset Maintenance Task,Last Completion Date,Последњи датум завршетка
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
@@ -5506,9 +5546,10 @@
 DocType: GoCardless Settings,GoCardless Settings,ГоЦардлесс Сеттингс
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,фондовые активы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,фондовые активы
 DocType: Restaurant,Active Menu,Активни мени
 DocType: Target Detail,Target Qty,Циљна Кол
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Против кредита: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Плаћање подешавања
 DocType: Student Attendance,Present,Представљање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
@@ -5517,9 +5558,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
 DocType: Vehicle Log,Odometer,мерач за пређени пут
 DocType: Production Plan Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
 DocType: Chapter,Chapter Head,Глава главе
 DocType: Payment Term,Month(s) after the end of the invoice month,Месец (и) након краја мјесеца фактуре
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Пројекат активност / задатак.
@@ -5527,11 +5568,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериши стаје ПЛАТА
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Датетиме резултата лабораторије не може бити пре тестирања датетиме
 DocType: POS Profile,Allow user to edit Discount,Дозволите кориснику да уређује попуст
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Узмите купце
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Узмите купце
 DocType: Purchase Invoice Item,Include Exploded Items,Укључите експлодиране ставке
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Куповина се мора проверити, ако је применљиво Јер је изабрана као {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Shipping Rule,Restrict to Countries,Ограничите земље
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,обрачун сат
 DocType: Project,Total Sales Amount (via Sales Order),Укупан износ продаје (преко продајног налога)
@@ -5550,6 +5592,7 @@
 DocType: Soil Texture,Sandy Clay,Санди Цлаи
 DocType: Grant Application,Assessment  Manager,Менаџер процене
 DocType: Payment Entry,Allocate Payment Amount,Издвојити Износ за плаћање
+DocType: Subscription Plan,Subscription Plan,План претплате
 DocType: Employee External Work History,Salary,Плата
 DocType: Serial No,Delivery Document Type,Испорука Доцумент Типе
 DocType: Sales Order,Partly Delivered,Делимично Испоручено
@@ -5575,9 +5618,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Старење Опсег 2
 DocType: SG Creation Tool Course,Max Strength,мак Снага
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталирање подешавања
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Није одабрана белешка за испоруку за купца {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Није одабрана белешка за испоруку за купца {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,БОМ заменио
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Изаберите ставке на основу датума испоруке
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Изаберите ставке на основу датума испоруке
 DocType: Grant Application,Has any past Grant Record,Има било какав прошли Грант Рецорд
 ,Sales Analytics,Продаја Аналитика
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Доступно {0}
@@ -5596,7 +5639,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервација хотела
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Кориснички сервис
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Кориснички сервис
 DocType: BOM,Thumbnail,Умањени
 DocType: Item Customer Detail,Item Customer Detail,Ставка Кориснички Детаљ
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Понуда кандидат посла.
@@ -5612,7 +5655,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Студенти су уписани
 DocType: Fees,Student Details,Студент Детаилс
 DocType: Purchase Invoice Item,Stock Qty,стоцк ком
-DocType: Employee Loan,Repayment Period in Months,Период отплате у месецима
+DocType: Loan,Repayment Period in Months,Период отплате у месецима
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Грешка: Не важи? Ид?
 DocType: Naming Series,Update Series Number,Упдате Број
 DocType: Account,Equity,капитал
@@ -5621,7 +5664,7 @@
 DocType: Task,Closing Date,Датум затварања
 DocType: Sales Order Item,Produced Quantity,Произведена количина
 DocType: Timesheet,Work Detail,Ворк Детаил
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,инжењер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,инжењер
 DocType: Journal Entry,Total Amount Currency,Укупан износ Валута
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Тражи Суб скупштине
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
@@ -5667,13 +5710,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Информације о донатору.
 DocType: Request for Quotation,Supplier Detail,добављач Детаљ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Грешка у формули или стања: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Фактурисани износ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Фактурисани износ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Тегови критеријума морају додати до 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Похађање
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,залихама
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако се не проверава, листа ће морати да се дода сваком одељењу где има да се примењује."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Креирање {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Изворни и циљни Магацин не могу бити исти
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
@@ -5697,14 +5739,14 @@
 DocType: Shipping Rule,Fixed,Фиксна
 DocType: Vehicle Service,Clutch Plate,цлутцх плате
 DocType: Company,Round Off Account,Заокружити рачун
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,административные затраты
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,административные затраты
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
-DocType: Journal Entry,Subscription,Претплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Претплата
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Пендинг Цреатион Фее
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Отказни рок
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Отказни рок
 DocType: Asset Category,Asset Category Name,Средство Име категорије
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,То јекорен територија и не могу да се мењају .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Продаја нових особа Име
@@ -5717,7 +5759,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,ЕцритуреНум
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Остави неконтролисано ако не желите да размотри серије правећи курса на бази групе.
 DocType: Asset,Frequency of Depreciation (Months),Учесталост амортизације (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Кредитни рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
@@ -5725,7 +5767,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
 DocType: Hub Settings,Company Logo,Лого компаније
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 DocType: Healthcare Settings,Patient Registration,Регистрација пацијената
@@ -5760,11 +5802,10 @@
 DocType: Journal Entry,Total Debit,Укупно задуживање
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Уобичајено готове робе Складиште
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Изаберите Пацијент
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продаја Особа
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продаја Особа
 DocType: Hotel Room Package,Amenities,Погодности
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Буџет и трошкова центар
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Вишеструки начин плаћања није дозвољен
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
 ,Appointment Analytics,Именовање аналитике
 DocType: Vehicle Service,Half Yearly,Пола Годишњи
 DocType: Lead,Blog Subscriber,Блог Претплатник
@@ -5781,6 +5822,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Оставите празно ако се студентима групе годишње
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Уколико је означено, Укупно нема. радних дана ће се укључити празника, а то ће смањити вредност зараде по дану"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Апликације које користе тренутни кључ неће моћи да приступе, да ли сте сигурни?"
+DocType: Subscription Settings,Prorate,Прорате
 DocType: Purchase Invoice,Total Advance,Укупно Адванце
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Промените шаблон шаблона
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Рок Датум завршетка не може бити раније од рока датума почетка. Молимо исправите датуме и покушајте поново.
@@ -5791,8 +5833,9 @@
 DocType: Opportunity Item,Basic Rate,Основна стопа
 DocType: GL Entry,Credit Amount,Износ кредита
 DocType: Cheque Print Template,Signatory Position,potpisnik Позиција
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Постави као Лост
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Постави као Лост
 DocType: Timesheet,Total Billable Hours,Укупно наплативе сат
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Број дана које претплатник мора платити фактуре које генерише ова претплата
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаћање Пријем Напомена
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ово је засновано на трансакције против овог клијента. Погледајте рок доле за детаље
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Ред {0}: Додељени износ {1} мора бити мање или једнако на износ уплате ступања {2}
@@ -5811,12 +5854,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Изабрати или додати новог купца
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ово је засновано на похађања овог запосленог
 DocType: Assessment Result,Summary,Резиме
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Марк Аттенданце
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Текући рачуни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Ресторан за унос ставке
@@ -5828,7 +5871,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Куповина Количина
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,До краја године не може бити пре почетка године
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Примања запослених
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Примања запослених
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Work Order,Manufactured Qty,Произведено Кол
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Акције не постоје са {0}
@@ -5836,12 +5879,12 @@
 DocType: Asset,Out of Order,Неисправно
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 DocType: Projects Settings,Ignore Workstation Time Overlap,Пребаците преклапање радне станице
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Изаберите Батцх Бројеви
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Рачуни подигао купцима.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 DocType: Patient Service Unit,Medical Administrator,Медицински администратор
 DocType: Assessment Plan,Schedule,Распоред
 DocType: Account,Parent Account,Родитељ рачуна
@@ -5871,15 +5914,16 @@
 DocType: Asset Repair,Repair Status,Статус поправке
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 DocType: POS Profile,Account for Change Amount,Рачун за промене Износ
 DocType: Purchase Invoice,input service,улазна услуга
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Члан тима за одржавање
 DocType: Agriculture Analysis Criteria,Soil Analysis,Анализа земљишта
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Шифра курса:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Унесите налог Екпенсе
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
@@ -5928,19 +5972,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Пријемни за {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Име променљиве
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
 DocType: Asset,Asset Category,средство Категорија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Чистая зарплата не может быть отрицательным
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Материјал за добављача
 DocType: Soil Texture,Loamy Sand,Лоами Санд
 DocType: Production Plan,Material Request Planning,Планирање захтјева за материјал
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Акцизе фактура
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Тресхолд {0}% појављује више пута
 DocType: Expense Claim,Employees Email Id,Запослени Емаил ИД
 DocType: Employee Attendance Tool,Marked Attendance,Приметан Присуство
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Текущие обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Текущие обязательства
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Тајмер је прекорачио задате време.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Пошаљи СМС масовне вашим контактима
 DocType: Patient,A Positive,Позитиван
@@ -5951,9 +5995,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} тренутно има {1} Сцорецард става, а наруџбине за овај добављач треба издати опрезно."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Тим за одржавање имовине
-DocType: Employee Loan,Loan Type,Тип кредита
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} је успешно поднет
+DocType: Loan,Loan Type,Тип кредита
 DocType: Scheduling Tool,Scheduling Tool,Заказивање Алат
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,кредитна картица
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,кредитна картица
 DocType: BOM,Item to be manufactured or repacked,Ставка да буду произведени или препакује
 DocType: Employee Education,Major/Optional Subjects,Мајор / Опциони предмети
 DocType: Sales Invoice Item,Drop Ship,Дроп Схип
@@ -5985,7 +6030,7 @@
 DocType: Item,Units of Measure,Мерних јединица
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволите производња на празницима
 DocType: Sales Invoice,Customer's Purchase Order Date,Наруџбенице купца Датум
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Капитал Сток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Капитал Сток
 DocType: Shopping Cart Settings,Show Public Attachments,Схов Публиц Прилози
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
 DocType: Restaurant Reservation,Reservation Time,Време резервације
@@ -6000,7 +6045,7 @@
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Ред # {0}: Рекд по датуму не може бити пре датума трансакције
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Најновији производи
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Услови коришћења шаблона
 DocType: Serial No,Delivery Details,Достава Детаљи
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
@@ -6010,20 +6055,20 @@
 DocType: Driver,Expiry Date,Датум истека
 DocType: Healthcare Settings,Employee name and designation in print,Име и ознака запосленика у штампи
 ,accounts-browser,рачуни-претраживач
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Прво изаберите категорију
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Пројекат господар.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Како би се омогућило над-наплате или преко-наручивања, упдате &quot;Исправка&quot; на лагеру подешавања или тачке."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Пола дана)
 DocType: Payment Term,Credit Days,Кредитни Дана
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Молимо изаберите Пацијент да бисте добили лабораторијске тестове
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Маке Студент Батцх
 DocType: Fee Schedule,FRQ.,ФРК.
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Олово Дани Тиме
 DocType: Cash Flow Mapping,Is Income Tax Expense,Да ли је порез на доходак
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Проверите ово ако је ученик борави у Института Хостел.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
 ,Stock Summary,стоцк Преглед
@@ -6034,10 +6079,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: BOM Operation,Operating Cost(Company Currency),Оперативни трошкови (Фирма валута)
-DocType: Employee Loan Application,Rate of Interest,Ниво интересовања
+DocType: Loan Application,Rate of Interest,Ниво интересовања
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: Item,Shelf Life In Days,Рок трајања у данима
 DocType: GL Entry,Is Opening,Да ли Отварање
+DocType: Department,Expense Approvers,Издаци за трошкове
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
 DocType: Journal Entry,Subscription Section,Субсцриптион Сецтион
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Счет {0} не существует
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 100c05c..e76acba 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Bedömningsrapporter
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Konsumentprodukter
-DocType: Purchase Receipt,Subscription Detail,Prenumerationsdetalj
 DocType: Supplier Scorecard,Notify Supplier,Meddela Leverantör
 DocType: Item,Customer Items,Kundartiklar
 DocType: Project,Costing and Billing,Kostnadsberäkning och fakturering
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
 DocType: Item,Publish Item to hub.erpnext.com,Publish Post som hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-postmeddelanden
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Utvärdering
 DocType: Item,Default Unit of Measure,Standard mätenhet
 DocType: SMS Center,All Sales Partner Contact,Alla försäljningspartners kontakter
-DocType: Employee,Leave Approvers,Ledighetsgodkännare
+DocType: Department,Leave Approvers,Ledighetsgodkännare
 DocType: Sales Partner,Dealer,Återförsäljare
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,undersökningar
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Kontrollera tillgänglighet
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Detta grundar sig på transaktioner mot denna leverantör. Se tidslinje nedan för mer information
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Rättslig
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Verklig typskatt kan inte ingå i produktomsättning i rad {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Rättslig
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Verklig typskatt kan inte ingå i produktomsättning i rad {0}
 DocType: Bank Guarantee,Customer,Kunden
 DocType: Purchase Receipt Item,Required By,Krävs av
 DocType: Delivery Note,Return Against Delivery Note,Återgå mot Följesedel
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Huvudtyper (eller grupper) mot vilka bokföringsposter görs och balanser upprätthålls.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Det finns inga inlämnade löneskalor att bearbeta.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Det finns inga inlämnade löneskalor att bearbeta.
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Visa öppna
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Det är nödvändigt att vidta denna åtgärd idag i dag för ovan nämnda återkommande
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Serie uppdaterats
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Checka ut
 DocType: Pricing Rule,Apply On,Applicera på
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Alla Leverantörskontakter
 DocType: Support Settings,Support Settings,support Inställningar
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch Punkt Utgångs Status
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bankväxel
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bankväxel
 DocType: Membership,membership validaty section,medlemskapsvalideringsavsnittet
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 DocType: Consultation,Consultation,Samråd
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Skapa hemsida
 DocType: Opening Invoice Creation Tool Item,Quantity,Kvantitet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Konton tabell kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Lån (skulder)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Konton tabell kan inte vara tomt.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Lån (skulder)
 DocType: Employee Education,Year of Passing,Passerande År
 DocType: Item,Country of Origin,Ursprungsland
 DocType: Soil Texture,Soil Texture Criteria,Marktexturkriterier
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Primär kontaktuppgifter
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,öppna frågor
 DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
 DocType: Lab Test Groups,Add new line,Lägg till en ny rad
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sjukvård
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Försenad betalning (dagar)
@@ -89,7 +85,7 @@
 ,Delay Days,Fördröjningsdagar
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Faktura
+DocType: Subscription Invoice,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Produkt Vikt detaljer
 DocType: Asset Maintenance Log,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Rad # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Rad # {0}:
 DocType: Timesheet,Total Costing Amount,Totala Kalkyl Mängd
 DocType: Delivery Note,Vehicle No,Fordons nr
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Välj Prislista
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Pågående Arbete
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Välj datum
 DocType: Daily Work Summary Group,Holiday List,Holiday Lista
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Revisor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Revisor
 DocType: Hub Settings,Selling Price List,Försäljningsprislista
 DocType: Patient,Tobacco Current Use,Tobaks nuvarande användning
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Försäljningsfrekvens
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Försäljningsfrekvens
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefonnr
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Ny {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Initial Email Notification Sent
 ,Sales Partners Commission,Försäljning Partners kommissionen
 DocType: Soil Texture,Sandy Clay Loam,Sandig Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Värde efter avskrivningar
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relaterad
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Närvaro datum kan inte vara mindre än arbetstagarens Inträdesdatum
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Närvaro datum kan inte vara mindre än arbetstagarens Inträdesdatum
 DocType: Grading Scale,Grading Scale Name,Bedömningsskala Namn
-DocType: Subscription,Repeat on Day,Upprepa på dagen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Detta är en root-kontot och kan inte ändras.
 DocType: Sales Invoice,Company Address,Företags Adress
 DocType: BOM,Operations,Verksamhet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Det går inte att ställa in tillstånd på grund av rabatt för {0}
+DocType: Subscription,Subscription Start Date,Prenumerations startdatum
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bifoga CSV-fil med två kolumner, en för det gamla namnet och en för det nya namnet"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} inte i någon aktiv räkenskapsår.
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referens: {0}, Artikelnummer: {1} och Kund: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Pröva period Slutdatum kan inte vara före startdatum för prövningsperiod
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Öppning för ett jobb.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM är inte specificerat för underleverantörsobjekt {0} i rad {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samma Företaget anges mer än en gång
 DocType: Patient,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ej tillåtet för {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Få objekt från
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Få objekt från
 DocType: Price List,Price Not UOM Dependant,Pris inte UOM beroende
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkten {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,bromsolja
 DocType: Tax Rule,Tax Type,Skatte Typ
 ,Completed Work Orders,Avslutade arbetsorder
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Skattepliktiga belopp
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Skattepliktiga belopp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
 DocType: BOM,Item Image (if not slideshow),Produktbild (om inte bildspel)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referensdokumenttyp måste vara ett av kostnadskrav eller journalinmatning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Välj BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referensdokumenttyp måste vara ett av kostnadskrav eller journalinmatning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Välj BOM
 DocType: SMS Log,SMS Log,SMS-logg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad levererat gods
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Hantera förskott belopp som ges till Medarbetaren
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Leveransnotifiering
 DocType: Journal Entry,Opening Entry,Öppnings post
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Endast konto Pay
-DocType: Employee Loan,Repay Over Number of Periods,Repay Över Antal perioder
+DocType: Loan,Repay Over Number of Periods,Repay Över Antal perioder
 DocType: Stock Entry,Additional Costs,Merkostnader
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
 DocType: Lead,Product Enquiry,Produkt Förfrågan
 DocType: Education Settings,Validate Batch for Students in Student Group,Validera sats för studenter i studentgruppen
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen ledighet rekord hittades för arbetstagare {0} för {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Ingen ledighet rekord hittades för arbetstagare {0} för {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ange företaget först
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Välj Företaget först
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Välj Företaget först
 DocType: Employee Education,Under Graduate,Enligt Graduate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Vänligen ange standardmall för meddelandet om status för vänsterstatus i HR-inställningar.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Employee Loan
 DocType: Fee Schedule,Send Payment Request Email,Skicka betalningsförfrågan via e-post
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Fastighet
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Framgångsrikt oregistrerad.
 DocType: Assessment Result,Grade,Kvalitet
 DocType: Restaurant Table,No of Seats,Antal platser
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","För att lägga till dynamiskt ämne, använd jinja-taggar som <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: Asset Maintenance Task,Asset Maintenance Task,Asset Maintenance Task
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Årslön
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Årslön
 DocType: Daily Work Summary,Daily Work Summary,Dagliga Work Sammandrag
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} är fryst
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stock Kostnader
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stock Kostnader
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Välj Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Välj Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ange Preferred Kontakt Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Ange Preferred Kontakt Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Konteringsanteckning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Primäradress
 DocType: Production Plan,Material Request Detail,Materialförfrågan Detalj
 DocType: Selling Settings,Default Quotation Validity Days,Standard Offertid Giltighetsdagar
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ändra Mängd
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Körkortskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Ange leveransdatum
 DocType: Depreciation Schedule,Make Depreciation Entry,Göra Av- Entry
+DocType: HR Settings,Leave Settings,Lämna inställningar
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ av förfrågan
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,göra Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Sändning
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Inställningsläge för POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Inaktiverar skapandet av tidsloggen mot arbetsorder. Verksamheten får inte spåras mot arbetsorder
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Exekvering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Exekvering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
 DocType: Asset Maintenance Log,Maintenance Status,Underhåll Status
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Medlemsuppgifter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverantör krävs mot betalkonto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Produkter och prissättning
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Totalt antal timmar: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Från Datum bör ligga inom räkenskapsåret. Förutsatt Från Datum = {0}
 DocType: Drug Prescription,Interval,Intervall
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Preferens
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Preferens
 DocType: Grant Application,Individual,Individuell
 DocType: Academic Term,Academics User,akademiker Användar
 DocType: Cheque Print Template,Amount In Figure,Belopp I figur
-DocType: Employee Loan Application,Loan Info,Loan info
+DocType: Loan Application,Loan Info,Loan info
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planer för underhållsbesök.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Leverantörens scorecardperiod
 DocType: Share Transfer,Share Transfer,Delöverföring
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Artikelmall
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokemi
 DocType: Job Offer,Select Terms and Conditions,Välj Villkor
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ut Värde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ut Värde
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-inställningar
 DocType: Production Plan,Sales Orders,Kundorder
 DocType: Purchase Taxes and Charges,Valuation,Värdering
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Standard Område
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Tv
 DocType: Work Order Operation,Updated via 'Time Log',Uppdaterad via &quot;Time Log&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Välj kund eller leverantör.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: Company,Enable Perpetual Inventory,Aktivera evigt lager
+DocType: Bank Guarantee,Charges Incurred,Avgifter uppkommit
 DocType: Company,Default Payroll Payable Account,Standard Lön Betal konto
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Uppdatera E-postgrupp
 DocType: Sales Invoice,Is Opening Entry,Är öppen anteckning
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Anpassat resultat
 DocType: Delivery Stop,Contact Name,Kontaktnamn
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier för bedömning Course
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Skatte ID:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Skatte ID:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Student-ID:
 DocType: POS Customer Group,POS Customer Group,POS Kundgrupp
 DocType: Land Unit,Land Unit describing various land assets,Tomtenhet som beskriver olika marktillgångar
@@ -375,9 +372,8 @@
 ,Open Work Orders,Öppna arbetsorder
 DocType: Payment Term,Credit Months,Kreditmånader
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Nettolön kan inte vara mindre än 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",För att sluta skicka repeterande felmeddelanden från systemet har vi markerat Inaktiverat fält i prenumerationen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Avgångar per år
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Avgångar per år
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
 DocType: Email Digest,Profit & Loss,Vinst förlust
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Vänligen uppsättning studenter under studentgrupper
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,bankAnteckningar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,bankAnteckningar
 DocType: Crop,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Kontakta ej
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Personer som undervisar i organisationen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Mjukvaruutvecklare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Course Scheduling Tool,Course Start Date,Kursstart
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Publicera i Hub
 DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Inköpsdetaljer
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Nya Citat
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-post lönebesked till anställd baserat på föredragna e-post väljs i Employee
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den första Lämna godkännare i listan kommer att anges som standard Lämna godkännare
 DocType: Tax Rule,Shipping County,Frakt County
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Lär dig
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Lär dig
 DocType: Asset,Next Depreciation Date,Nästa Av- Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per anställd
 DocType: Accounts Settings,Settings for Accounts,Inställningar för konton
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående checkar och insättningar för att rensa
 DocType: Item,Synced With Hub,Synkroniserad med Hub
 DocType: Driver,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} kan inte vara negativt för produkten {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} kan inte vara negativt för produkten {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Fel Lösenord
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Ange hotellets rumspris på {}
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Opening Invoice Creation Tool,Invoice Type,Faktura Typ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Följesedel
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Kostnader för sålda Asset
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naturligtvis Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] Fel vid skapande av återkommande% s för% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
 DocType: Land Unit,LInked Analysis,Analys
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Ansökningsperioden kan inte över två fördelningsrekord
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Ansökningsperioden kan inte över två fördelningsrekord
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Emot
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skapa studentgrupper
 DocType: Volunteer,Weekends,helger
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kreditnotbelopp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kreditnotbelopp
 DocType: Setup Progress Action,Action Document,Handlingsdokument
 DocType: Chapter Member,Website URL,Webbadress
 ,Finished Goods,Färdiga Varor
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Lägg produkter
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Produktkvalitetskontroll Parameter
+DocType: Leave Application,Leave Approver Name,Ledighetsgodkännare Namn
 DocType: Depreciation Schedule,Schedule Date,Schema Datum
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Resultat, Avdrag och andra lönedelar"
 DocType: Packed Item,Packed Item,Packad artikel
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Offertförfrågan
 DocType: Healthcare Settings,Require Lab Test Approval,Kräv laboratorietest godkännande
 DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Totalt Utestående
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Totalt Utestående
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
 DocType: Dosage Strength,Strength,Styrka
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Skapa en ny kund
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Förbrukningsartiklar Kostnad
 DocType: Purchase Receipt,Vehicle Date,Fordons Datum
 DocType: Student Log,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Anledning till att förlora
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Anledning till att förlora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Uppdatera kontonummer
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Bly Ägaren kan inte vara densamma som den ledande
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Tilldelade mängden kan inte större än ojusterad belopp
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Singel
 DocType: Salary Slip,Total Loan Repayment,Totala låne Återbetalning
 DocType: Account,Cost of Goods Sold,Kostnad för sålda varor
-DocType: Subscription,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ange kostnadsställe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Ange kostnadsställe
 DocType: Drug Prescription,Dosage,Dosering
 DocType: Journal Entry Account,Sales Order,Kundorder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Säljkurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Säljkurs
 DocType: Assessment Plan,Examiner Name,examiner Namn
 DocType: Lab Test Template,No Result,Inget resultat
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ange företagetsnamn först
 DocType: Purchase Invoice,Supplier Name,Leverantörsnamn
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Läs ERPNext Manual
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Visa löv av alla avdelningsmedlemmar i kalendern
 DocType: Purchase Invoice,01-Sales Return,01-Försäljning Retur
 DocType: Account,Is Group,Är grupperad
 DocType: Email Digest,Pending Purchase Orders,I avvaktan på beställningar
@@ -605,13 +600,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Obligatoriskt fält - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} är inte associerad med {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Anpassa inledande text som går som en del av e-postmeddelandet. Varje transaktion har en separat introduktionstext.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Vänligen ange det betalda kontot för företaget {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Vänligen ange det betalda kontot för företaget {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Transaktion tillåts inte mot stoppad Arbetsorder {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserverade till salu
 DocType: Packing Slip,From Package No.,Från Paket No.
 DocType: Item Attribute,To Range,Range
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan inte ändra värderingsmetoden, eftersom det finns transaktioner mot vissa poster som inte har egen värderingsmetod"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Värdepapper och inlåning
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan inte ändra värderingsmetoden, eftersom det finns transaktioner mot vissa poster som inte har egen värderingsmetod"
 DocType: Student Report Generation Tool,Attended by Parents,Närvarade av föräldrar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Patient,AB Positive,AB Positiv
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Närvaro lista
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lönedel för tidrapport baserad lönelistan.
 DocType: Sales Order Item,Used for Production Plan,Används för produktionsplan
-DocType: Employee Loan,Total Payment,Total betalning
+DocType: Loan,Total Payment,Total betalning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Kan inte avbryta transaktionen för slutförd arbetsorder.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minuter)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} avbryts så åtgärden kan inte slutföras
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tillräckligt med delar för att bygga
 DocType: POS Profile User,POS Profile User,POS Profil Användare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkt inkomst
+DocType: Subscription Invoice,Subscription Invoice,Prenumerationsfaktura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Direkt inkomst
 DocType: Patient Appointment,Date TIme,Datum Tid
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Handläggare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Handläggare
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Inrätta företag och skatter
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
 DocType: Codification Table,Codification Table,Kodifierings tabell
 DocType: Timesheet Detail,Hrs,H
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Välj Företag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Välj Företag
 DocType: Stock Entry Detail,Difference Account,Differenskonto
 DocType: Purchase Invoice,Supplier GSTIN,Leverantör GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Cash Flow Mapping Template
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
+DocType: Bank Guarantee,Providing,tillhandahålla
 DocType: Account,Profit and Loss,Resultaträkning
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Ej tillåtet, konfigurera Lab Test Template efter behov"
 DocType: Patient,Risk Factors,Riskfaktorer
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
 DocType: Healthcare Settings,Appointment Confirmation,Avtalsbekräftelse
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Closing (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hallå
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Flytta objekt
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Ange redan standard i posprofil {0} för användare {1}, vänligt inaktiverad standard"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ackumulerade värden
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territoriet är obligatoriskt i POS-profilen
 DocType: Supplier,Prevent RFQs,Förhindra RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Skapa kundorder
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Löneskalan lämnas in för perioden från {0} till {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Löneskalan lämnas in för perioden från {0} till {1}
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Fraktpostdatum
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Öppnande av fakturaverktyg
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Obs: Totala antalet allokerade blad {0} inte bör vara mindre än vad som redan har godkänts blad {1} för perioden
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Ange antal i transaktioner baserat på serienummeringång
 ,Total Stock Summary,Total lageröversikt
 DocType: Announcement,Posted By,Postat av
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
@@ -789,15 +787,15 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Vänligen ställ in företaget
 DocType: Share Balance,Share Balance,Aktiebalans
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Training Result Employee,Training Result Employee,Utbildning Resultat anställd
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En aktuell lagerlokal mot vilken lagernoteringar görs.
-DocType: Repayment Schedule,Principal Amount,Kapitalbelopp
-DocType: Employee Loan Application,Total Payable Interest,Totalt betalas ränta
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Kapitalbelopp
+DocType: Loan Application,Total Payable Interest,Totalt betalas ränta
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Totalt utestående: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fakturan Tidrapport
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
@@ -806,10 +804,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurangbokning
 DocType: Land Unit,Land Unit Name,Tomtenhetens namn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Förslagsskrivning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Avslutar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Meddela kunder via e-post
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Meddela kunder via e-post
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annan säljare {0} finns med samma anställningsid
 DocType: Employee Advance,Claimed Amount,Skyldigt belopp
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -828,13 +826,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betalning Gateway konto inte skapat, vänligen skapa ett manuellt."
 DocType: Supplier Scorecard,Per Year,Per år
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Inte berättigad till antagning i detta program enligt DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Sales Invoice,Sales Taxes and Charges,Försäljnings skatter och avgifter
 DocType: Employee,Organization Profile,Organisation Profil
 DocType: Vital Signs,Height (In Meter),Höjd (In Meter)
 DocType: Student,Sibling Details,syskon Detaljer
 DocType: Vehicle Service,Vehicle Service,Vehicle service
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,utlöser automatiskt återkopplingsbegäran baserad på förhållanden.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,utlöser automatiskt återkopplingsbegäran baserad på förhållanden.
 DocType: Employee,Reason for Resignation,Anledning till Avgång
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Mall för utvecklingssamtal.
 DocType: Sales Invoice,Credit Note Issued,Kreditnota utfärdad
@@ -849,10 +846,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Underhållsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sedan prissättningsregler filtreras bort baserat på kundens, Customer Group, Territory, leverantör, leverantör typ, kampanj, Sales Partner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Nettoförändring i Inventory
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Anställd lånehantering
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relation med Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Chef
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Chef
 DocType: Payment Entry,Payment From / To,Betalning från / till
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vänligen ange konto i lager {0}
@@ -894,24 +890,24 @@
 DocType: Item,Material Transfer,Material Transfer
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Det gick inte att hitta sökväg för
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Öppning (Dr)
+DocType: Loan,Applicant,Sökande
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Bokningstidsstämpel måste vara efter {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Att göra återkommande dokument
 ,GST Itemised Purchase Register,GST Artized Purchase Register
 DocType: Course Scheduling Tool,Reschedule,Boka om
-DocType: Employee Loan,Total Interest Payable,Total ränta
+DocType: Loan,Total Interest Payable,Total ränta
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter och avgifter
 DocType: Work Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Drifttid
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Yta
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Bas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Bas
 DocType: Timesheet,Total Billed Hours,Totalt Fakturerade Timmar
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Avskrivningsbelopp
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Avskrivningsbelopp
 DocType: Leave Block List Allow,Allow User,Tillåt användaren
 DocType: Journal Entry,Bill No,Fakturanr
 DocType: Company,Gain/Loss Account on Asset Disposal,Vinst / Förlust konto på Asset Avfallshantering
 DocType: Vehicle Log,Service Details,Service detaljer
 DocType: Vehicle Log,Service Details,Service detaljer
-DocType: Subscription,Quarterly,Kvartals
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,grupperade
 DocType: Selling Settings,Delivery Note Required,Följesedel Krävs
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Tidrapportering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Återrapportering Råvaror Based On
 DocType: Sales Invoice,Port Code,Hamnkod
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Reservlager
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Reservlager
 DocType: Lead,Lead is an Organization,Bly är en organisation
 DocType: Guardian Interest,Interest,Intressera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,Konton
 DocType: Vehicle,Odometer Value (Last),Vägmätare Value (Senaste)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Mallar med leverantörsspecifika kriterier.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marknadsföring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marknadsföring
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Betalning Entry redan har skapats
 DocType: Request for Quotation,Get Suppliers,Få leverantörer
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Rad # {0}: Asset {1} inte kopplad till punkt {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Förhandsvisning lönebesked
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Rad # {0}: Asset {1} inte kopplad till punkt {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Förhandsvisning lönebesked
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} har angetts flera gånger
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Du kan bara förnya om ditt medlemskap löper ut inom 30 dagar
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Välj bara om du har inställningar för Cash Flow Mapper-dokument
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Supplier Scorecard,Per Week,Per vecka
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Totalt Student
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kreditkorts logg
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Företag och konton
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Värde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Värde
 DocType: Asset Settings,Depreciation Options,Avskrivningsalternativ
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Ogiltig inläggstid
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Ogiltig inläggstid
 DocType: Lead,Campaign Name,Kampanjens namn
 DocType: Hotel Room,Capacity,Kapacitet
 DocType: Selling Settings,Close Opportunity After Days,Nära möjlighet efter dagar
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Budget,Budget Against,budget mot
 DocType: Employee,Cell Number,Mobilnummer
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det finns ingen anställd för de angivna kriterierna. Kontrollera att löneavgifter inte redan har skapats.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det finns ingen anställd för de angivna kriterierna. Kontrollera att löneavgifter inte redan har skapats.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automaterial Framställningar Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Välj en tabell
 DocType: BOM,Website Specifications,Webbplats Specifikationer
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} är en ogiltig e-postadress i &quot;Mottagare&quot;
 DocType: Special Test Items,Particulars,uppgifter
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
 DocType: Warranty Claim,CI-,Cl
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Asset,Maintenance,Underhåll
+DocType: Subscriber,Subscriber,Abonnent
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Uppdatera din projektstatus
 DocType: Item,Maximum sample quantity that can be retained,Maximal provkvantitet som kan behållas
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinställningarna för Varukorgen
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Lägg till Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Asset skrotas via Journal Entry {0}
-DocType: Employee Loan,Interest Income Account,Ränteintäkter Account
+DocType: Loan,Interest Income Account,Ränteintäkter Account
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Granska inbjudan skickad
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotechnology
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Kontor underhållskostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Kontor underhållskostnader
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gå till
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ställa in e-postkonto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ange Artikel först
 DocType: Asset Repair,Downtime,Driftstopp
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Academic Term:
 DocType: Salary Detail,Do not include in total,Inkludera inte totalt
 DocType: Company,Default Cost of Goods Sold Account,Standardkostnad Konto Sålda Varor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Provkvantitet {0} kan inte vara mer än mottagen kvantitet {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Prislista inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Request for Quotation Supplier,Send Email,Skicka Epost
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 DocType: Item,Max Sample Quantity,Max provkvantitet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Inget Tillstånd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Inget Tillstånd
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Begärt citat
 DocType: Vital Signs,Heart Rate / Pulse,Hjärtfrekvens / puls
 DocType: Company,Default Bank Account,Standard bankkonto
@@ -1087,11 +1083,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab-test och vitala tecken
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen anställd hittades
-DocType: Subscription,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Studentgruppen är redan uppdaterad.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen är redan uppdaterad.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Projektuppdatering.
 DocType: SMS Center,All Customer Contact,Alla Kundkontakt
 DocType: Land Unit,Tree Details,Tree Detaljerad information
@@ -1141,7 +1136,6 @@
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,Import Närvaro
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Alla artikelgrupper
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
 DocType: Work Order,Item To Manufacture,Produkt för att tillverka
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status är {2}
@@ -1155,7 +1149,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",Återmarkera om den valda adressen redigeras efter spara
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Öppna&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Öppna&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öppna för att göra
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
 DocType: Lab Test Template,Result Format,Resultatformat
@@ -1165,7 +1159,7 @@
 DocType: Payroll Entry,Bimonthly,Varannan månad
 DocType: Vehicle Service,Brake Pad,Brake Pad
 DocType: Fertilizer,Fertilizer Contents,Innehåll för gödselmedel
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Forskning &amp; Utveckling
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Forskning &amp; Utveckling
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Belopp till fakturera
 DocType: Company,Registration Details,Registreringsdetaljer
 DocType: Timesheet,Total Billed Amount,Totala fakturerade beloppet
@@ -1179,7 +1173,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Bifoga kreditgränskontroll vid Försäljningsorder
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Utvecklingssamtal.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivera användning för Varukorgen &quot;, som Kundvagnen är aktiverad och det bör finnas åtminstone en skattebestämmelse för Varukorgen"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betalning Entry {0} är kopplad mot Order {1}, kontrollera om det ska dras i förskott i denna faktura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betalning Entry {0} är kopplad mot Order {1}, kontrollera om det ska dras i förskott i denna faktura."
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Butiksförsäljnig
@@ -1213,7 +1207,7 @@
 DocType: Restaurant Table,Minimum Seating,Minsta sätet
 DocType: Item Attribute,Item Attribute Values,Produkt Attribut Värden
 DocType: Examination Result,Examination Result,Examination Resultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Inköpskvitto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Valutakurs mästare.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referens Doctype måste vara en av {0}
@@ -1221,15 +1215,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Work Order,Plan material for sub-assemblies,Planera material för underenheter
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} måste vara aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Inga objekt tillgängliga för överföring
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Inga objekt tillgängliga för överföring
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Stängning (Öppning + Totalt)
 DocType: Journal Entry,Depreciation Entry,avskrivningar Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material {0} innan du avbryter detta Underhållsbesök
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016-standarden
 DocType: Pricing Rule,Rate or Discount,Betygsätt eller rabatt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Obligatorisk Antal
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,favoriter
 DocType: Hub Settings,Custom Data,Anpassade data
@@ -1241,9 +1235,9 @@
 DocType: Medical Code,Medical Code Standard,Medicinsk kod Standard
 DocType: Soil Texture,Clay Composition (%),Lerkomposition (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Var god spara innan du ansluter uppgiften.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balans Värde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balans Värde
 DocType: Lab Test,Lab Technician,Labbtekniker
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Försäljning Prislista
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Om den är markerad kommer en kund att skapas, mappad till patienten. Patientfakturor kommer att skapas mot den här kunden. Du kan också välja befintlig kund medan du skapar patienten."
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
@@ -1251,16 +1245,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Ango Avrundningskonto i bolaget
 DocType: Purchase Receipt,Range,Intervall
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Fee Structure,Components,Komponenter
 DocType: Item Barcode,Item Barcode,Produkt Streckkod
 DocType: Woocommerce Settings,Endpoints,endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",att genereras. Om försenad måste du manuellt ändra fältet &quot;Repetera på dag i månad&quot; här
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
 DocType: Share Transfer,From Folio No,Från Folio nr
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
@@ -1295,16 +1287,17 @@
 DocType: Asset,Available-for-use Date,Tillgänglig för användning Datum
 DocType: Guardian,Guardian Name,Guardian Namn
 DocType: Cheque Print Template,Has Print Format,Har Utskriftsformat
-DocType: Employee Loan,Sanctioned,sanktionerade
+DocType: Loan,Sanctioned,sanktionerade
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,är obligatoriskt. Kanske Valutaväxling posten inte skapas för
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
 DocType: Crop Cycle,Crop Cycle,Beskärningscykel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","För ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","För ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
 DocType: Student Admission,Publish on website,Publicera på webbplats
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Leverantörsfakturor Datum kan inte vara större än Publiceringsdatum
+DocType: Subscription,Cancelation Date,Avbokningsdatum
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
 DocType: Agriculture Task,Agriculture Task,Jordbruksuppgift
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Indirekt inkomst
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Indirekt inkomst
 DocType: Student Attendance Tool,Student Attendance Tool,Student Närvaro Tool
 DocType: Restaurant Menu,Price List (Auto created),Prislista (automatiskt skapad)
 DocType: Cheque Print Template,Date Settings,Datum Inställningar
@@ -1331,6 +1324,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Meter
 DocType: Workstation,Electricity Cost,Elkostnad
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Labtestning datetime kan inte vara före datetime samling
+DocType: Subscription Plan,Cost,Kosta
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
 DocType: Expense Claim,Total Advance Amount,Total förskottsbelopp
 DocType: Delivery Stop,Estimated Arrival,Beräknad ankomsttid
@@ -1342,15 +1336,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
 DocType: Timesheet Detail,Bill,Räkningen
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Vit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antal inte tillgängligt för {4} i lager {1} vid utstationering tidpunkt för angivelsen ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Du kan bara välja högst ett alternativ från listan med kryssrutor.
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
 DocType: Item,Automatically Create New Batch,Skapa automatiskt nytt parti
 DocType: Item,Automatically Create New Batch,Skapa automatiskt nytt parti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Tilldela {0} till {1} (rad {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Göra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Tilldela {0} till {1} (rad {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Göra
 DocType: Student Admission,Admission Start Date,Antagning startdatum
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Ny anställd
@@ -1366,7 +1360,7 @@
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 DocType: Repayment Schedule,Balance Loan Amount,Balans Lånebelopp
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,schema Course
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Optioner
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Optioner
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Inaktivera Hämta senaste inköpsdetaljer i inköpsorder
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Vill du verkligen vill återställa detta skrotas tillgång?
@@ -1385,11 +1379,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Följesedels artikel
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Specificera en {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Varianter har skapats i kö.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Arbetsöversikt för {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Attributtabell är obligatoriskt
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Den första lämnar godkännaren i listan kommer att ställas in som standardladdare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Plan,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} kan inte vara negativ
 DocType: Training Event,Self-Study,Självstudie
@@ -1402,7 +1397,7 @@
 DocType: Workstation,Wages,Löner
 DocType: Asset Maintenance,Maintenance Manager Name,Underhållsansvarig namn
 DocType: Agriculture Task,Urgent,Brådskande
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Vänligen ange en giltig rad ID för rad {0} i tabellen {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Vänligen ange en giltig rad ID för rad {0} i tabellen {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Det gick inte att hitta variabel:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Var god välj ett fält för att redigera från numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Kan inte vara en anläggningstillgång när lagerbokföringen är skapad.
@@ -1414,7 +1409,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kvalitetsinspektionsmallnamn
 DocType: Project,First Email,Första Email
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Försäljningsbelopp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Försäljningsbelopp
 DocType: Repayment Schedule,Interest Amount,räntebelopp
 DocType: Serial No,Creation Document No,Skapande Dokument nr
 DocType: Share Transfer,Issue,Problem
@@ -1428,10 +1423,10 @@
 DocType: Tax Rule,Shipping State,Frakt State
 ,Projected Quantity as Source,Projicerade Kvantitet som källa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Leveransresa
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Leveransresa
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Överföringstyp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Försäljnings Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Försäljnings Kostnader
 DocType: Consultation,Diagnosis,Diagnos
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard handla
 DocType: GL Entry,Against,Mot
@@ -1440,12 +1435,13 @@
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Kundorder {0} är {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Välj ränteintäkter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Göra Stock Inlägg
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
 DocType: Item,Default Supplier,Standard Leverantör
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Överproduktion Tillåter Procent
-DocType: Employee Loan,Repayment Schedule,återbetalningsplan
+DocType: Loan,Repayment Schedule,återbetalningsplan
 DocType: Shipping Rule Condition,Shipping Rule Condition,Frakt Regel skick
 DocType: Holiday List,Get Weekly Off Dates,Hämta Veckodagar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
@@ -1460,7 +1456,7 @@
 DocType: Education Settings,Attendance Freeze Date,Dagsfrysningsdatum
 DocType: Education Settings,Attendance Freeze Date,Dagsfrysningsdatum
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visa alla produkter
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Visa alla produkter
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimal ledningsålder (dagar)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimal ledningsålder (dagar)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,alla stycklistor
@@ -1469,14 +1465,16 @@
 DocType: Expense Claim,From Employee,Från anställd
 DocType: Driver,Cellphone Number,telefon nummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
 DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg
+DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Närvaro Från datum
 DocType: Appraisal Template Goal,Key Performance Area,Nyckelperformance Områden
 DocType: Program Enrollment,Transportation,Transportfordon
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Ogiltig Attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} måste lämnas in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Kvantitet måste vara mindre än eller lika med {0}
+DocType: Department Approver,Department Approver,Avdelningsgodkännare
 DocType: SMS Center,Total Characters,Totalt Tecken
 DocType: Employee Advance,Claimed,hävdade
 DocType: Crop,Row Spacing,Row Spacing
@@ -1486,6 +1484,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalning Avstämning Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Bidrag%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",Enligt Köpinställningarna om beställning krävs == &#39;JA&#39; och sedan för att skapa Köpfaktura måste användaren skapa Köporder först för objektet {0}
+,HSN-wise-summary of outward supplies,HSN-vis-sammanfattning av utåtriktade varor
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Organisationsnummer som referens. Skattenummer etc.
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
@@ -1499,7 +1498,7 @@
 DocType: Setup Progress Action,Action Name,Åtgärdsnamn
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Year
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},De första 2 siffrorna i GSTIN ska matcha med statligt nummer {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum för aktuell faktura period
 DocType: Salary Slip,Leave Without Pay,Lämna utan lön
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapacitetsplanering Error
@@ -1517,26 +1516,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fält kopieras endast över tiden vid skapandet.
 DocType: Setup Progress Action,Domains,Domäner
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Ledning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Ledning
 DocType: Cheque Print Template,Payer Settings,Payer Inställningar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
 DocType: Purchase Invoice,Is Return,Är Returnerad
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Varning
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Startdagen är större än slutdagen i uppgiften &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Retur / debetnota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prislista Land
 DocType: Item,UOMs,UOM
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Produkt kod kan inte ändras för serienummer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Produkt kod kan inte ändras för serienummer
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Omvandlingsfaktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ange Post kod för att få Batch nummer
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
-DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Bevilja information.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Bevilja information.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverantörsdatabas.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Du kan inte starta om en prenumeration som inte avbryts.
 DocType: Account,Balance Sheet,Balansräkning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
 DocType: Fee Validity,Valid Till,Giltig till
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Totalt föräldrars lärarmöte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
@@ -1549,7 +1548,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Ändring av kundgrupp för vald kund är inte tillåtet.
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Uppdaterar beräknade ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Uppdaterar beräknade ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Inskrivningsdetaljer
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Var god välj en kund
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Purchase Order,Group same items,Grupp samma objekt
 DocType: Purchase Invoice,Disable Rounded Total,Inaktivera avrundat Totalbelopp
-DocType: Employee Loan Application,Repayment Info,återbetalning info
+DocType: Department,Parent Department,Föräldraavdelningen
+DocType: Loan Application,Repayment Info,återbetalning info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
 DocType: Maintenance Team Member,Maintenance Role,Underhålls roll
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Ställa in Anställda
 DocType: Sales Order,SO-,SÅ-
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellbokningsanvändare
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Välj prefix först
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Forskning
+DocType: Subscription Settings,Subscription Settings,Prenumerationsinställningar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Ange minst ett attribut i tabellen attribut
 DocType: Announcement,All Students,Alla studenter
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 DocType: Crop Cycle,Less than a year,Mindre än ett år
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 DocType: Crop,Yield UOM,Utbyte UOM
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
 DocType: Item,Is Item from Hub,Är objekt från nav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstyp är obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Lämnad utdelning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Lämnad utdelning
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Redovisning Ledger
 DocType: Stock Reconciliation,Difference Amount,Differensbelopp
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} på Leave på {1}
 DocType: Purchase Invoice,Reverse Charge,Omvänd laddning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Balanserade vinstmedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Balanserade vinstmedel
 DocType: Purchase Invoice,05-Change in POS,05-Ändra i POS
 DocType: Vehicle Log,Service Detail,tjänsten Detalj
 DocType: BOM,Item Description,Produktbeskrivning
@@ -1619,12 +1620,12 @@
 DocType: Opportunity Item,Opportunity Item,Möjlighet Punkt
 ,Student and Guardian Contact Details,Student och Guardian Kontaktuppgifter
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: För leverantören {0} E-postadress krävs för att skicka e-post
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Tillfällig Öppning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Tillfällig Öppning
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Visa nav
 ,Employee Leave Balance,Anställd Avgångskostnad
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 DocType: Patient Appointment,More Info,Mer Information
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard Actions
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Exempel: Masters i datavetenskap
 DocType: Purchase Invoice,Rejected Warehouse,Avvisat Lager
@@ -1634,7 +1635,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,till
 DocType: Supplier Quotation Item,Lead Time in days,Ledtid i dagar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Utbetalning av lön från {0} till {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Utbetalning av lön från {0} till {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Kundorder {0} är inte giltig
@@ -1643,9 +1644,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Liten
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Öppnande av fakturaobjektverktygsartikel
 DocType: Education Settings,Employee Number,Anställningsnummer
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Avbryt faktura efter grace period
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
 DocType: Project,% Completed,% Slutfört
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
@@ -1659,7 +1661,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratory Testing Datetime
 DocType: Email Digest,Add Quote,Lägg Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Indirekta kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
 DocType: Agriculture Analysis Criteria,Agriculture,Jordbruk
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sync basdata
@@ -1689,16 +1691,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital Utrustning
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Vänligen ange produktkoden först
 DocType: Item,ITEM-,PUNKT-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
+DocType: Subscription Plan,Billing Interval Count,Faktureringsintervallräkning
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 DocType: Antibiotic,Antibiotic,Antibiotikum
 ,Team Updates,team Uppdateringar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,För Leverantör
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ställa Kontotyp hjälper i att välja detta konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totalsumma (Företagsvaluta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Skapa utskriftsformat
@@ -1724,7 +1727,7 @@
 DocType: POS Item Group,POS Item Group,POS Artikelgrupp
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Alternativet får inte vara samma som artikelnumret
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
 DocType: Sales Partner,Target Distribution,Target Fördelning
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Slutförande av preliminär bedömning
 DocType: Salary Slip,Bank Account No.,Bankkonto nr
@@ -1741,7 +1744,7 @@
 DocType: BOM Operation,Workstation,Arbetsstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offertförfrågan Leverantör
 DocType: Healthcare Settings,Registration Message,Registreringsmeddelande
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Hårdvara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Hårdvara
 DocType: Prescription Dosage,Prescription Dosage,Receptbelagd dosering
 DocType: Attendance,HR Manager,HR-chef
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Välj ett företag
@@ -1772,7 +1775,7 @@
 DocType: Project,Start and End Dates,Start- och slutdatum
 ,Delivered Items To Be Billed,Levererade artiklar att faktureras
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Öppen BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
 DocType: Project Update,Great/Quickly,Great / Snabbt
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1781,8 +1784,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Var god välj satser för batched item
 DocType: Asset,Depreciation Schedules,avskrivningstider
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Följande konton kan väljas i GST-inställningar:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Följande konton kan väljas i GST-inställningar:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 DocType: Payment Request,Transaction Currency,transaktionsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Från {0} | {1} {2}
@@ -1793,6 +1796,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daglig Utgång
 DocType: POS Profile,Campaign,Kampanj
 DocType: Supplier,Name and Type,Namn och typ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Godkännandestatus måste vara ""Godkänd"" eller ""Avvisad"""
 DocType: Physician,Contacts and Address,Kontakter och adress
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Förväntat startdatum"" kan inte vara större än ""Förväntat slutdatum"""
@@ -1806,19 +1810,20 @@
 DocType: Student Admission,Eligibility and Details,Behörighet och detaljer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offertförfrågan är inaktiverad att komma åt från portalen, för mer kontroll portalens inställningar."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverantör Scorecard Scorevariabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Köpa mängd
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Köpa mängd
 DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det fanns fel som skapade kursschema
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den första expense-godkännaren i listan kommer att ställas som standard Expense Approver.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,kan inte vara större än 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Detail,Depends on Leave Without Pay,Beror på avgång utan lön
@@ -1839,14 +1844,15 @@
 DocType: Package Code,Package Code,Package Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Lärling
 DocType: Purchase Invoice,Company GSTIN,Företaget GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skatte detalj tabell hämtas från punkt mästare som en sträng och lagras i detta område. Används för skatter och avgifter
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Lämna godkännare Obligatorisk i lämnaransökan
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Skatte Regel för transaktioner.
@@ -1874,15 +1880,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Betalningstiden i rad {0} är eventuellt en dubblett.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Jordbruk (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Följesedel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kontorshyra
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS-gateway-inställningar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Följesedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorshyra
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 DocType: Disease,Common Name,Vanligt namn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import misslyckades!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
 DocType: Vital Signs,Blood Pressure,Blodtryck
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analytiker
 DocType: Item,Inventory,Inventering
 DocType: Item,Sales Details,Försäljnings Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1892,15 +1898,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Bekräfta inskrivna kurs för studenter i studentgruppen
 DocType: Notification Control,Expense Claim Rejected,Räkning avvisas
 DocType: Item,Item Attribute,Produkt Attribut
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Regeringen
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Regeringen
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Räkningen {0} finns redan för fordons Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institute Namn
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Ange återbetalningsbeloppet
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Ange återbetalningsbeloppet
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Produkt Varianter
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Tjänster
 DocType: HR Settings,Email Salary Slip to Employee,E-lönebesked till anställd
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Välj Möjliga Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Välj Möjliga Leverantör
 DocType: Sales Invoice,Source,Källa
 DocType: Customer,"Select, to make the customer searchable with these fields","Välj, för att göra kunden sökbar med dessa fält"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show stängd
@@ -1917,7 +1923,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Följesedlar avbryts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Kassaflöde från investeringsverksamheten
 DocType: Program Course,Program Course,program Kurs
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Homepage,Company Tagline for website homepage,Företag Tagline för webbplats hemsida
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
@@ -1947,10 +1953,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Detaljer
 DocType: Leave Block List,Block Holidays on important days.,Block Semester på viktiga dagar.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Vänligen ange alla nödvändiga resultatvärden (er)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Kundfordringar Sammanfattning
-DocType: Employee Loan,Monthly Repayment Amount,Månatliga återbetalningen belopp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Kundfordringar Sammanfattning
+DocType: Loan,Monthly Repayment Amount,Månatliga återbetalningen belopp
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Öppna fakturor
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
 DocType: UOM,UOM Name,UOM Namn
 DocType: GST HSN Code,HSN Code,HSN-kod
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Bidragsbelopp
@@ -1972,7 +1978,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Användaren {0} är redan tilldelad läkare {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standardlager krävs för vald post
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Låda
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,möjlig Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,möjlig Leverantör
+DocType: Journal Entry,JV-RET-,JV-retro
 DocType: Budget,Monthly Distribution,Månads Fördelning
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottagare Lista är tom. Skapa Mottagare Lista
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sjukvård (beta)
@@ -2000,7 +2007,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Inga produkter att packa
 DocType: Shipping Rule Condition,From Value,Från Värde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
-DocType: Employee Loan,Repayment Method,återbetalning Metod
+DocType: Loan,Repayment Method,återbetalning Metod
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Om markerad startsidan vara standardArtikelGrupp för webbplatsen
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Anspråk på företagets bekostnad.
@@ -2009,7 +2016,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Certifikat krävs
 DocType: Company,Default Holiday List,Standard kalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Från tid och att tiden på {1} överlappar med {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Skulder
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stock Skulder
 DocType: Purchase Invoice,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Välj företag
@@ -2017,7 +2024,7 @@
 DocType: Student Report Generation Tool,Print Section,Utskriftsavsnitt
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Användaren {0} har ingen standard POS-profil. Kontrollera standard i rad {1} för den här användaren.
 DocType: Student Group,Set 0 for no limit,Set 0 för ingen begränsning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Rad {idx}: {field} krävs för att skapa Fakturor för öppning {faktura_type}
 DocType: Customer,Primary Address and Contact Detail,Primär adress och kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Skicka om Betalning E
@@ -2028,10 +2035,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Var god välj minst en domän.
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
 DocType: SMS Center,Receiver List,Mottagare Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Sök Produkt
 DocType: Payment Schedule,Payment Amount,Betalningsbelopp
@@ -2041,7 +2048,7 @@
 DocType: Assessment Plan,Grading Scale,Betygsskala
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,redan avslutat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Lager i handen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Lager i handen
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import lyckades!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
@@ -2052,17 +2059,16 @@
 DocType: Quotation Item,Quotation Item,Offert Artikel
 DocType: Customer,Customer POS Id,Kundens POS-ID
 DocType: Account,Account Name,Kontonamn
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} kvantitet {1} inte kan vara en fraktion
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} kvantitet {1} inte kan vara en fraktion
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Vänligen ange webbadress för WoCommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverantör Typ mästare.
 DocType: Purchase Order Item,Supplier Part Number,Leverantör Artikelnummer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
 DocType: Share Balance,To No,Till nr
-DocType: Subscription,Reference Document,referensdokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} är avbruten eller stoppad
 DocType: Accounts Settings,Credit Controller,Kreditcontroller
-DocType: Grant Application,Applicant Type,Sökande Typ
+DocType: Loan,Applicant Type,Sökande Typ
 DocType: Purchase Invoice,03-Deficiency in services,03-brist på tjänster
 DocType: Delivery Note,Vehicle Dispatch Date,Fordon Avgångs Datum
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Medical Code Standard
@@ -2073,13 +2079,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Fakturerad
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personal Resurser
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Personal Resurser
 DocType: Lead,Upper Income,Övre inkomst
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Avvisa
 DocType: Journal Entry Account,Debit in Company Currency,Debet i bolaget Valuta
 DocType: BOM Item,BOM Item,BOM Punkt
 DocType: Appraisal,For Employee,För anställd
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Gör utbetalning Entry
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Gör utbetalning Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverantören måste debitera
 DocType: Company,Default Values,Standardvärden
 DocType: Membership,INR,INR
@@ -2109,10 +2115,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} måste vara större än 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Lager tillgänglig
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Lager tillgänglig
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitetsplanering för (Dagar)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Anskaffning
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligatoriskt fält - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Obligatoriskt fält - Program
 DocType: Special Test Template,Result Component,Resultatkomponent
@@ -2133,7 +2139,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Inkludera semester inom ledighet som ledighet
 DocType: Sales Invoice,Packed Items,Packade artiklar
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantianspråk mot serienummer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivera Varukorgen
 DocType: Employee,Permanent Address,Permanent Adress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2151,10 +2157,10 @@
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Bekräfta åtgärd
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Uppfyllelse
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Visa i varukorgen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marknadsföringskostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Kan inte skapa standardkriterier. Vänligen byt namn på kriterierna
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
@@ -2177,9 +2183,9 @@
 DocType: Upload Attendance,Get Template,Hämta mall
 DocType: Material Request,Transferred,Överförd
 DocType: Vehicle,Doors,dörrar
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Complete!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Samla avgift för patientregistrering
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan inte ändra attribut efter aktiehandel. Skapa ett nytt objekt och överför lagret till det nya objektet
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Kan inte ändra attribut efter aktiehandel. Skapa ett nytt objekt och överför lagret till det nya objektet
 DocType: Course Assessment Criteria,Weightage,Vikt
 DocType: Purchase Invoice,Tax Breakup,Skatteavbrott
 DocType: Packing Slip,PS-,PS-
@@ -2215,12 +2221,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Purchase Invoice Item,Batch No,Batch nr
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Medarbetarförskott
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 DocType: Grant Application,Assessment  Mark (Out of 10),Bedömningsmärke (av 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Huvud
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
@@ -2229,15 +2236,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Email Digest,Annual Expenses,årliga kostnader
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Avsatt mängd
 DocType: Sales Team,Contribution to Net Total,Bidrag till Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
 DocType: Territory,Territory Name,Territorium Namn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Du kan bara ha planer med samma faktureringsperiod i en prenumeration
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sökande av ett jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Lager och referens
 DocType: Supplier,Statutory info and other general information about your Supplier,Lagstadgad information och annan allmän information om din leverantör
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,bedömningar
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Utbildningshändelser
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Spåra ledningar av blykälla.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Stig på
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Stig på
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Underhållsloggen
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovikten av detta paket. (Beräknas automatiskt som summan av nettovikt av objekt)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,Att leverera och Bill
 DocType: Student Group,Instructors,instruktörer
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} måste lämnas in
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Aktiehantering
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Betalning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Betalning
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",Lager {0} är inte länkat till något konto. Vänligen ange kontot i lageret eller sätt in det vanliga kontot i företaget {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Hantera order
 DocType: Work Order Operation,Actual Time and Cost,Faktisk tid och kostnad
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,Student Lämna Application
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundlade poster vid tidpunkten för försäljning.
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,streck~~POS=TRUNC
 DocType: Hub Category,Hub Node,Nav Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Rörelse
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Arbetsorder {0} måste lämnas in
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,ny vagn
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta måste vara lika med antingen standardbolagets valuta eller parti konto konto valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 DocType: Soil Texture,Loam,Lerjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Rad {0}: Förfallodatum kan inte vara innan bokningsdatum
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Rad {0}: Förfallodatum kan inte vara innan bokningsdatum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Skapa inbetalninginlägg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
 ,Sales Invoice Trends,Fakturan Trender
 DocType: Leave Application,Apply / Approve Leaves,Ansök / Godkänn ledigheter
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,För
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan hänvisa till rad endast om avgiften är ""På föregående v Belopp"" eller ""Föregående rad Total"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan hänvisa till rad endast om avgiften är ""På föregående v Belopp"" eller ""Föregående rad Total"""
 DocType: Sales Order Item,Delivery Warehouse,Leverans Lager
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Träd av finansiella kostnadsställen.
 DocType: Serial No,Delivery Document No,Leverans Dokument nr
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Materialförbrukning är inte inställd på tillverkningsinställningar.
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan inte överföras för punkt {0} i rad {1} mer än {2}. För att tillåta överfakturering, var god ange i lagerinställningar"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan inte överföras för punkt {0} i rad {1} mer än {2}. För att tillåta överfakturering, var god ange i lagerinställningar"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Uppdatera svar
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Välj programmet först
 DocType: Patient Appointment,Patient Age,Patientåldern
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Hantera projekt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serienummer {0} har redan returnerats
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serienummer {0} har redan returnerats
 DocType: Supplier,Supplier of Goods or Services.,Leverantör av varor eller tjänster.
 DocType: Budget,Fiscal Year,Räkenskapsår
 DocType: Asset Maintenance Log,Planned,Planerad
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Standardfordringar som kan användas om den inte är inställd på patienten för att boka konsultavgifter.
 DocType: Vehicle Log,Fuel Price,bränsle~~POS=TRUNC Pris
+DocType: Bank Guarantee,Margin Money,Marginalpengar
 DocType: Budget,Budget,Budget
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Ange öppet
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
@@ -2352,16 +2360,16 @@
 DocType: Lead,Follow Up,Uppföljning
 DocType: Item,Is Sales Item,Är Försäljningsobjekt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Produktgruppträdet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
 DocType: Maintenance Visit,Maintenance Time,Servicetid
 ,Amount to Deliver,Belopp att leverera
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Samma sak har skrivits in flera gånger. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Startdatum kan inte vara tidigare än året Startdatum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Det fanns fel.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Anställd {0} har redan ansökt om {1} mellan {2} och {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Det fanns fel.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Anställd {0} har redan ansökt om {1} mellan {2} och {3}:
 DocType: Guardian,Guardian Interests,Guardian Intressen
 DocType: Naming Series,Current Value,Nuvarande Värde
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
 DocType: Education Settings,Instructor Records to be created by,Instruktörsrekord som ska skapas av
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} skapad
 DocType: GST Account,GST Account,GST-konto
@@ -2380,8 +2388,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Lades till Favoriter
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen löneavgift gjord för att lämna in för ovanstående valda kriterier ELLER lön som redan lämnats in
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Tullar och skatter
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen löneavgift gjord för att lämna in för ovanstående valda kriterier ELLER lön som redan lämnats in
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Tullar och skatter
 DocType: Projects Settings,Projects Settings,Projektinställningar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ange Referensdatum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
@@ -2391,27 +2399,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Träd artikelgrupper.
 DocType: Production Plan,Total Produced Qty,Totalt producerad mängd
 DocType: Payroll Entry,Get Employee Details,Få anställdas detaljer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
 DocType: Asset,Sold,Såld
 ,Item-wise Purchase History,Produktvis Köphistorik
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
 DocType: Account,Frozen,Fryst
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basbelopp (Company valuta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Råmaterial
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Råmaterial
 DocType: Payment Reconciliation Payment,Reference Row,referens Row
 DocType: Installation Note,Installation Time,Installationstid
 DocType: Sales Invoice,Accounting Details,Redovisning Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Ta bort alla transaktioner för detta företag
 DocType: Patient,O Positive,O Positiv
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investeringarna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,anslag
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptanskriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Inga återbetalningar är tillgängliga för Journal Entry
 DocType: Item Attribute,Attribute Name,Attribut Namn
 DocType: BOM,Show In Website,Visa i Webbsida
 DocType: Shopping Cart Settings,Show Quantity in Website,Visa Kvantitet i Website
-DocType: Employee Loan Application,Total Payable Amount,Total Betalbelopp
+DocType: Loan Application,Total Payable Amount,Total Betalbelopp
 DocType: Task,Expected Time (in hours),Förväntad tid (i timmar)
 DocType: Item Reorder,Check in (group),Checka in (grupp)
 DocType: Soil Texture,Silt,Slam
@@ -2430,7 +2439,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Betala
 DocType: Room,Room Name,Rums Namn
 DocType: Prescription Duration,Prescription Duration,Receptlängd
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 DocType: Activity Cost,Costing Rate,Kalkylfrekvens
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kund adresser och kontakter
 ,Campaign Efficiency,Kampanjseffektivitet
@@ -2449,11 +2458,11 @@
 DocType: Chapter,Chapter,Kapitel
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Standardkonto uppdateras automatiskt i POS-faktura när det här läget är valt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Välj BOM och Antal för produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Välj BOM och Antal för produktion
 DocType: Asset,Depreciation Schedule,avskrivningsplanen
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Försäljningspartneradresser och kontakter
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Halv Dag Datum bör vara mellan Från datum och hittills
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Halv Dag Datum bör vara mellan Från datum och hittills
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskt Datum
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Ange standardkostnadscentret i {0} företaget.
 DocType: Item,Has Batch No,Har Sats nr
@@ -2471,7 +2480,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering)
 DocType: Soil Texture,Soil Type,Marktyp
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Nytt meddelande
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2491,7 +2499,7 @@
 DocType: Hub Category,Hub Category,Navkategori
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
-DocType: Employee Loan,Loan Amount,Lånebelopp
+DocType: Loan,Loan Amount,Lånebelopp
 DocType: Student Report Generation Tool,Add Letterhead,Lägg till brevpapper
 DocType: Program Enrollment,Self-Driving Vehicle,Självkörande fordon
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Leverantörs Scorecard Standing
@@ -2520,9 +2528,9 @@
 DocType: Cash Flow Mapper,Position,Placera
 DocType: Patient,Patient Details,Patientdetaljer
 DocType: Patient,B Positive,B Positiv
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Förkortning kan inte vara tomt
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grupp till icke-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2530,8 +2538,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totalt Faktisk
 DocType: Lab Test UOM,Test UOM,Testa UOM
 DocType: Student Siblings,Student Siblings,elev Syskon
+DocType: Subscription Plan Detail,Subscription Plan Detail,Prenumerationsplandetaljer
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Enhet
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Ange Företag
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Ange Företag
 ,Customer Acquisition and Loyalty,Kundförvärv och Lojalitet
 DocType: Asset Maintenance Task,Maintenance Task,Underhållsuppgift
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Ange B2C-gränsvärden i GST-inställningar.
@@ -2546,6 +2555,7 @@
 ,BOM Search,BOM Sök
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Total förbrukad materialkostnad (via lagerinmatning)
 DocType: Hub Settings,Company Registered,Företag Registrerat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Till datum kan inte vara mindre än Från datum
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publicera &quot;I lager&quot; eller &quot;Ej i lager&quot; på nav baserat på lager som finns i lageret.
 DocType: Vehicle,Fuel Type,Bränsletyp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ange valuta i bolaget
@@ -2553,17 +2563,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i Batch {0} kommer att bli negativ {1} till punkt {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Efter Material Framställningar har höjts automatiskt baserat på punkt re-order nivå
 DocType: Email Digest,Pending Sales Orders,I väntan på kundorder
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 DocType: Employee,Create User Permission,Skapa användarbehörighet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Healthcare Settings,Remind Before,Påminn före
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
 DocType: Salary Component,Deduction,Avdrag
 DocType: Item,Retain Sample,Behåll provet
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Rad {0}: Från tid och till tid är obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,mängd Skillnad
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ange anställnings Id för denna säljare
 DocType: Territory,Classification of Customers by region,Klassificering av kunder per region
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,I produktion
@@ -2573,8 +2584,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beräknat Kontoutdrag balans
 DocType: Normal Test Template,Normal Test Template,Normal testmall
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,inaktiverad användare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Offert
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Kan inte ställa in en mottagen RFQ till No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Offert
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Kan inte ställa in en mottagen RFQ till No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Välj ett konto för att skriva ut i kontovaluta
@@ -2582,7 +2593,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Detta baseras på transaktioner mot denna patient. Se tidslinjen nedan för detaljer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Kostnad Uppdaterad
 DocType: Patient,Date of Birth,Födelsedatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Punkt {0} redan har returnerat
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Leverans Scorecard Setup
@@ -2593,14 +2604,15 @@
 DocType: Work Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Arbetsbeskrivning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Arbetsbeskrivning
 DocType: Student Applicant,Applied,Applicerad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Återuppta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Återuppta
 DocType: Sales Invoice Item,Qty as per Stock UOM,Antal per lager UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Namn
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post Försäljningsrabatt
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
+DocType: Department Approver,Approver,Godkännare
 ,SO Qty,SO Antal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Fältet till aktieägare kan inte vara tomt
 DocType: Guardian,Work Address,arbete Adress
@@ -2614,21 +2626,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Sammanlagda anslaget (Company valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
 DocType: BOM,Scrap Material Cost,Skrot Material Kostnad
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
 DocType: Grant Application,Email Notification Sent,E-postmeddelande skickat
 DocType: Purchase Invoice,In Words (Company Currency),I ord (Företagsvaluta)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Artikelnummer, lager, kvantitet krävs på rad"
-DocType: Pricing Rule,Supplier,Leverantör
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Artikelnummer, lager, kvantitet krävs på rad"
+DocType: Bank Guarantee,Supplier,Leverantör
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Visa betalningsdetaljer
 DocType: Consultation,Consultation Time,Samrådstid
 DocType: C-Form,Quarter,Kvartal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Diverse Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Diverse Utgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Utgift eller differens konto är obligatoriskt för punkt {0} som den påverkar totala lagervärdet
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Namn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Ovan
-DocType: Employee Loan,Employee Loan Account,Anställd Lånekonto
 DocType: Leave Application,Total Leave Days,Totalt semesterdagar
 DocType: Email Digest,Note: Email will not be sent to disabled users,Obs: E-post kommer inte att skickas till inaktiverade användare
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
@@ -2644,7 +2655,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Vikt (i kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",kapitel / kapitel_namn lämna tomt automatiskt efter att du har sparat kapitel.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Ange GST-konton i GST-inställningar
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Ange GST-konton i GST-inställningar
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Typ av företag
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Kostnader för nya inköp
@@ -2653,12 +2664,13 @@
 DocType: Grant Application,Grant Description,Grant Beskrivning
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
 DocType: Student Guardian,Others,Annat
+DocType: Subscription,Discounts,rabatter
 DocType: Payment Entry,Unallocated Amount,oallokerad Mängd
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En produkt eller en tjänst som köps, säljs eller hålls i lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Inga fler uppdateringar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Detta täcker alla scorecards kopplade till denna inställning
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Objekt bör inte vara en produkt Bundle. Ta bort objektet `{0}` och spara
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bank
@@ -2667,21 +2679,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Klicka på ""Skapa schema"" för att få schemat"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
 DocType: Bin,Ordered Quantity,Beställd kvantitet
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
 DocType: Grading Scale,Grading Scale Intervals,Betygsskal
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,årets vinst
+DocType: Bank Guarantee,Name of Bank,Bankens namn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: kontering för {2} kan endast göras i valuta: {3}
 DocType: Fee Schedule,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Träd av finansräkenskaperna.
+DocType: Bank Guarantee,Reference Document Type,Referensdokument Typ
 DocType: Cash Flow Mapping,Cash Flow Mapping,Kassaflödesmappning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serial numrerade Inventory
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post hittades inte i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generera hemlighet
-DocType: Employee Loan,Account Info,Kontoinformation
+DocType: Loan,Account Info,Kontoinformation
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
 DocType: Fees,Include Payment,Inkludera betalning
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Studentgrupper skapade.
@@ -2689,24 +2704,24 @@
 DocType: Sales Invoice,Total Billing Amount,Totalt Fakturerings Mängd
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program i avgiftsstrukturen och studentgruppen {0} är olika.
 DocType: Fee Schedule,Receivable Account,Fordran Konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
 DocType: Quotation Item,Stock Balance,Lagersaldo
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Kundorder till betalning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,vd
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,vd
 DocType: Purchase Invoice,With Payment of Tax,Med betalning av skatt
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLIKAT FÖR LEVERANTÖR
 DocType: Land Unit,Is Container,Är Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Detta blir dag 1 i grödan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Välj rätt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Välj rätt konto
 DocType: Purchase Invoice Item,Weight UOM,Vikt UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Förteckning över tillgängliga aktieägare med folienummer
 DocType: Salary Structure Employee,Salary Structure Employee,Lönestruktur anställd
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Visa variantegenskaper
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Visa variantegenskaper
 DocType: Student,Blood Group,Blodgrupp
 DocType: Course,Course Name,KURSNAMN
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Användare som kan godkänna en specifik arbetstagarens ledighet applikationer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Kontorsutrustning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Kontorsutrustning
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Företag
 DocType: Supplier Scorecard,Scoring Setup,Scoring Setup
@@ -2725,7 +2740,7 @@
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debitering krävs
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Inköps Prislista
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mallar med leverantörsspecifika variabler.
 DocType: Job Offer Term,Offer Term,Erbjudandet Villkor
 DocType: Asset,Quality Manager,Kvalitetsansvarig
@@ -2737,13 +2752,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Totalt Obetalda: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webbplats Operation
 DocType: Supplier Scorecard,Supplier Score,Leverantörspoäng
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Sammanlagt fakturerat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Sammanlagt fakturerat Amt
 DocType: Supplier,Warn RFQs,Varna RFQs
 DocType: BOM,Conversion Rate,Omvandlingsfrekvens
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Sök produkt
 DocType: Assessment Plan,To Time,Till Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
+DocType: Loan,Total Amount Paid,Summa Betald Betalning
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Vänligen välj Studenttillträde, vilket är obligatoriskt för den studerande som betalas"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Var god välj en prislista för att publicera priser
@@ -2753,19 +2769,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prislista {0} är inaktiverad
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},V {0}: Genomförd Antal kan inte vara mer än {1} för drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillåt övertid
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialiserat objekt {0} kan inte uppdateras med Stock Avstämning, använd varningsinmatning"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialiserat objekt {0} kan inte uppdateras med Stock Avstämning, använd varningsinmatning"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialiserat objekt {0} kan inte uppdateras med Stock Avstämning, använd varningsinmatning"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialiserat objekt {0} kan inte uppdateras med Stock Avstämning, använd varningsinmatning"
 DocType: Training Event Employee,Training Event Employee,Utbildning Händelse anställd
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Maximala prov - {0} kan behållas för sats {1} och punkt {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Lägg till tidsluckor
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nuvarande värderingensomsättning
 DocType: Training Event,Advance,Förskott
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,för att återkomma igen.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless betalnings gateway-inställningar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Exchange vinst / förlust
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Exchange vinst / förlust
 DocType: Opportunity,Lost Reason,Förlorad Anledning
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Rad # {0}: Konto {1} hör inte till företag {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Rad # {0}: Konto {1} hör inte till företag {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Det gick inte att hitta DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
@@ -2784,7 +2799,6 @@
 DocType: Bin,Actual Quantity,Verklig Kvantitet
 DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Löpnummer {0} hittades inte
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Prenumerationen har varit {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Avgiftsschema Program
 DocType: Fee Schedule Program,Student Batch,elev Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,gör Student
@@ -2800,14 +2814,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-handel GSTIN
 DocType: Sales Order,Not Delivered,Inte Levererad
 ,Bank Clearance Summary,Banken Clearance Sammanfattning
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
 DocType: Appraisal Goal,Appraisal Goal,Bedömning Mål
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Föreslå kategori?
 DocType: Stock Reconciliation Item,Current Amount,nuvarande belopp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Byggnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Byggnader
 DocType: Fee Schedule,Fee Structure,avgift struktur
 DocType: Timesheet Detail,Costing Amount,Kalkyl Mängd
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 DocType: Student Admission Program,Application Fee,Anmälningsavgift
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Skicka lönebeskedet
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maximum rabatt för punkt {0} är {1}%
@@ -2815,12 +2828,13 @@
 DocType: Sales Partner,Address & Contacts,Adress och kontakter
 DocType: SMS Log,Sender Name,Avsändarnamn
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Jordbruksanalys Kriterier
+DocType: HR Settings,Leave Approval Notification Template,Lämna godkännandemall för godkännande
 DocType: POS Profile,[Select],[Välj]
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtryck (diastoliskt)
 DocType: SMS Log,Sent To,Skickat Till
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Skapa fakturan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Mjukvara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Mjukvara
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
 DocType: Company,For Reference Only.,För referens.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Läkare {0} är inte tillgänglig på {1}
@@ -2838,7 +2852,7 @@
 DocType: Employee,New Workplace,Ny Arbetsplats
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Materialförbrukning
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ange som Stängt
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Ingen produkt med streckkod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Ingen produkt med streckkod {0}
 DocType: Normal Test Items,Require Result Value,Kräver resultatvärde
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,stycklistor
@@ -2853,19 +2867,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard lönestruktur hittades för arbetstagare {0} för de givna datum
 DocType: Leave Block List,Allow Users,Tillåt användare
 DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Återkommande
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Kassaflödesmallar Detaljer
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Lånhantering
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spåra separat intäkter och kostnader för produkt vertikaler eller divisioner.
 DocType: Rename Tool,Rename Tool,Ändrings Verktyget
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Visa lönebesked
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Visa lönebesked
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfermaterial
 DocType: Fees,Send Payment Request,Skicka betalningsförfrågan
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
 DocType: Water Analysis,Origin,Ursprung
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Ställ återkommande efter att ha sparat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Välj förändringsbelopp konto
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
@@ -2880,14 +2894,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Är inkomstskattansvar
 DocType: Grading Scale Interval,Grade Description,grade Beskrivning
 DocType: Stock Entry,Purchase Receipt No,Inköpskvitto Nr
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Handpenning
 DocType: Sales Invoice, Shipping Bill Number,Frakträkningsnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,spårbarhet
 DocType: Asset Maintenance Log,Actions performed,Åtgärder utförda
 DocType: Cash Flow Mapper,Section Leader,Sektionsledare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Källa fonderna (skulder)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Källa fonderna (skulder)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Anställd
+DocType: Bank Guarantee,Fixed Deposit Number,Fast Deponeringsnummer
 DocType: Asset Repair,Failure Date,Fel datum
 DocType: Sample Collection,Collected Time,Samlad tid
 DocType: Company,Sales Monthly History,Försäljning månadshistoria
@@ -2904,10 +2919,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Är du säker på att du vill avbryta detta möte?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellrumsprispaket
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Hämta prenumerationsuppdateringar
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Konto {0} matchar inte företaget {1} i Konto: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurs:
@@ -2917,7 +2933,7 @@
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Inga arbetsorder skapade
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Lönebesked av personal {0} redan skapats för denna period
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmaceutiska
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Farmaceutiska
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
 DocType: Purchase Invoice,Credit To,Kredit till
@@ -2935,7 +2951,7 @@
 DocType: Request for Quotation Supplier,No Quote,Inget citat
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Gateway Account,Payment Account,Betalningskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Ange vilket bolag för att fortsätta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Kompensations Av
 DocType: Job Offer,Accepted,Godkända
@@ -2948,7 +2964,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Se till att du verkligen vill ta bort alla transaktioner för företag. Dina basdata kommer att förbli som det är. Denna åtgärd kan inte ångras.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,sökresultat
 DocType: Room,Room Number,Rumsnummer
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Ogiltig referens {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Ogiltig referens {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 DocType: Journal Entry Account,Payroll Entry,Löneinmatning
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Visa avgifter
@@ -2958,7 +2974,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Prov
 DocType: Item Variant Settings,Allow Rename Attribute Value,Tillåt Byt namn på attributvärde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
 DocType: Restaurant,Invoice Series Prefix,Faktura Serie Prefix
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
@@ -2966,8 +2982,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Integreringen av Google Maps är inte aktiverad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} inte lämnad
+DocType: Subscription,Trialling,testar
 DocType: Member,Membership Expiry Date,Medlemskapets utgångsdatum
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} måste vara negativ i gengäld dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} måste vara negativ i gengäld dokument
 ,Minutes to First Response for Issues,Minuter till First Response för frågor
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
@@ -2986,7 +3003,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Måttenhet
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Möjlighet
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Möjlighet
 DocType: Operation,Default Workstation,Standard arbetsstation
 DocType: Notification Control,Expense Claim Approved Message,Räkningen Godkänd Meddelande
 DocType: Payment Entry,Deductions or Loss,Avdrag eller förlust
@@ -3024,7 +3041,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Lämna utan lön inte stämmer överens med godkända Lämna ansökan registrerar
 DocType: Campaign,Campaign-.####,Kampanj -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nästa steg
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Skapa Faktura
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Återstående balans
@@ -3034,7 +3051,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slut År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Driver,Driver,Förare
 DocType: Vital Signs,Nutrition Values,Näringsvärden
 DocType: Lab Test Template,Is billable,Är fakturerbar
@@ -3045,7 +3062,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Faktiska startdatum (via Tidrapportering)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Åldringsräckvidd 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Det totala förskottsbeloppet får inte vara större än det totala beloppet
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Det totala förskottsbeloppet får inte vara större än det totala beloppet
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3080,7 +3097,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Välj Attributvärden
 DocType: Purchase Invoice,Reason For Issuing document,Orsak för att utfärda dokument
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Nästa Kontakta Vid kan inte vara densamma som den ledande e-postadress
 DocType: Tax Rule,Billing City,Fakturerings Ort
@@ -3097,7 +3114,8 @@
 DocType: Warranty Claim,Service Address,Serviceadress
 DocType: Asset Maintenance Task,Calibration,Kalibrering
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} är en företagsferie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Möbler och inventarier
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Lämna statusmeddelande
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Möbler och inventarier
 DocType: Item,Manufacture,Tillverkning
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
@@ -3113,7 +3131,6 @@
 DocType: Crop,Planting Area,Planteringsområde
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Installation Note Item,Installed Qty,Installerat antal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Detta kan vara på grund av några ogiltiga e-postadresser i
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Du har lagt till
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,utbildning Resultat
@@ -3123,16 +3140,17 @@
 DocType: Products Settings,Products per Page,Produkter per sida
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organisation gren ledare.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Utility Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ovan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rad # {0}: Journal Entry {1} har inte hänsyn {2} eller redan matchas mot en annan kupong
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vikt
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Lämna godkännandemeddelande
 DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Lön Slip Baserat på Tidrapport
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Köpkurs
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Köpkurs
 DocType: Notification Control,Sales Order Message,Kundorder Meddelande
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ange standardvärden som bolaget, Valuta, varande räkenskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalning Typ
@@ -3155,6 +3173,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Varukorgen Inställningar
 DocType: Journal Entry,Accounting Entries,Bokföringsposter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Om vald prissättning regel är gjord för &quot;Rate&quot;, kommer den att skriva över Prislista. Prissättning Regelkurs är slutkursen, så ingen ytterligare rabatt ska tillämpas. Därför kommer det i transaktioner som Försäljningsorder, Inköpsorder mm att hämtas i fältet &quot;Rate&quot; istället för &quot;Price List Rate&quot; -fältet."
+DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicera post. Kontrollera autentiseringsregel {0}
 DocType: Journal Entry Account,Reference Due Date,Referens förfallodatum
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3171,7 +3190,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Löner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
 DocType: Patient Service Unit,Parent Service Unit,Föräldra serviceenhet
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,gör Användare
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifiering av paketet för leverans (för utskrift)
@@ -3190,7 +3209,7 @@
 DocType: Shareholder,SH-,SH
 DocType: Account,Income Account,Inkomst konto
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Leverans
 DocType: Volunteer,Weekdays,vardagar
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: Restaurant Menu,Restaurant Menu,Restaurangmeny
@@ -3198,7 +3217,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Ange standardinventeringskonto för evig inventering
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Ange standardinventeringskonto för evig inventering
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Skicka Grant Review Email
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Localstorage är full, inte spara"
@@ -3206,10 +3225,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Rumskapacitet
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Det finns redan en post för objektet {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Du kommer att förlora register över tidigare genererade fakturor. Är du säker på att du vill starta om den här prenumerationen?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Anmälningsavgift
 DocType: Budget,Cost Center,Kostnadscenter
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Rabatt #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Rabatt #
 DocType: Notification Control,Purchase Order Message,Inköpsorder Meddelande
 DocType: Tax Rule,Shipping Country,Frakt Land
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Kundens Tax Id från Försäljningstransaktioner
@@ -3218,20 +3238,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prissättning regel görs för att skriva Prislista / definiera rabatt procentsats baserad på vissa kriterier.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan endast ändras via lagerposter / följesedel / inköpskvitto
 DocType: Employee Education,Class / Percentage,Klass / Procent
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Chef för Marknad och Försäljning
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Chef för Marknad och Försäljning
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Inkomstskatt
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spår leder med Industry Type.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Gå till Letterheads
+DocType: Subscription,Cancel At End Of Period,Avbryt vid slutet av perioden
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Inga objekt valda för överföring
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Inga objekt valda för överföring
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% framsteg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Vinst / förlust på Asset Avfallshantering
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Vinst / förlust på Asset Avfallshantering
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Endast studentansökaren med statusen &quot;Godkänd&quot; kommer att väljas i tabellen nedan.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Kontonummer för konto {0} är inte tillgängligt. <br> Ställ in din kontoplan korrekt.
 DocType: Task,Depends on Tasks,Beror på Uppgifter
@@ -3246,6 +3267,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Inte i lager
 DocType: Volunteer,Volunteer Skills,Volontärfärdigheter
 DocType: Appraisal,HR User,HR-Konto
+DocType: Bank Guarantee,Reference Document Name,Referensdokumentnamn
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter och avgifter Avdragen
 apps/erpnext/erpnext/hooks.py +142,Issues,Frågor
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status måste vara en av {0}
@@ -3259,7 +3281,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} är inaktiverad
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-retro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra Stor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Extra Stor
+DocType: Loan,Loan Application,Låneansökan
 DocType: Crop,Scientific Name,Vetenskapligt namn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Totalt löv
 DocType: Customer,"Reselect, if the chosen contact is edited after save",Välj om den valda kontakten är redigerad efter spara
@@ -3268,13 +3291,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Check Nummer
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hemsida Aktuell produkt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Alla bedömningsgrupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Alla bedömningsgrupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Ny Lager Namn
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
@@ -3295,9 +3318,10 @@
 DocType: Fees,Fees,avgifter
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Ange växelkursen för att konvertera en valuta till en annan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Offert {0} avbryts
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Totala utestående beloppet
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Totala utestående beloppet
 DocType: Sales Partner,Targets,Mål
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Vänligen registrera SIREN-numret i företagsinformationsfilen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 DocType: Price List,Price List Master,Huvudprislista
 DocType: GST Account,CESS Account,CESS-konto
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
@@ -3306,6 +3330,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Välj patient
 DocType: Price List,Applicable for Countries,Gäller Länder
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parameternamn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Endast Lämna applikationer med status &#39;Godkänd&#39; och &#39;Avvisad&#39; kan lämnas in
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Student gruppnamn är obligatorisk i rad {0}
 DocType: Homepage,Products to be shown on website homepage,Produkter som ska visas på startsidan för webbplatsen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
@@ -3339,14 +3364,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Faktura som redan skapats för alla faktureringstimmar
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Namn fel: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Är finansieringskostnad
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Ange standardkund i Restauranginställningar
 ,Salary Register,lön Register
 DocType: Warehouse,Parent Warehouse,moderLager
-DocType: C-Form Invoice Detail,Net Total,Netto Totalt
+DocType: Subscription,Net Total,Netto Totalt
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Standard BOM hittades inte för punkt {0} och projekt {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definiera olika lån typer
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Definiera olika lån typer
 DocType: Bin,FCFS Rate,FCFS betyg
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Utestående Belopp
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i min)
@@ -3378,11 +3403,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Root Hänsyn måste vara en grupp
 DocType: Drug Prescription,Drug Prescription,Drug Prescription
 DocType: Fees,FEE.,AVGIFT.
-DocType: Employee Loan,Repaid/Closed,Återbetalas / Stängd
+DocType: Loan,Repaid/Closed,Återbetalas / Stängd
 DocType: Item,Total Projected Qty,Totala projicerade Antal
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Värderingsfrekvensen hittades inte för objektet {0}, vilket krävs för att göra bokföringsuppgifter för {1} {2}. Om objektet handlar som en nollvärdesfaktor i {1}, ange det i {1} Item-tabellen. Annars kan du skapa en inkommande aktieaffär för objektet eller ange värderingsfrekvensen i objektposten och försök sedan skicka in / av den här posten"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Course,Course Code,Kurskod
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: POS Settings,Use POS in Offline Mode,Använd POS i offline-läge
@@ -3402,16 +3426,15 @@
 DocType: Purchase Invoice,Deemed Export,Fördjupad export
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt Procent kan appliceras antingen mot en prislista eller för alla prislistor.
-DocType: Subscription,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Kontering för lager
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Du har redan bedömt för bedömningskriterierna {}.
 DocType: Vehicle Service,Engine Oil,Motorolja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Arbetsorder skapade: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Arbetsorder skapade: {0}
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
-DocType: Employee Loan,Loan Details,Loan Detaljer
+DocType: Loan,Loan Details,Loan Detaljer
 DocType: Company,Default Inventory Account,Standard Inventory Account
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numren matchar inte
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,V {0}: Genomförd Antal måste vara större än noll.
@@ -3423,19 +3446,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,En länk till alla markenheter där grödan växer
 DocType: Account,Root Type,Root Typ
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Rad # {0}: Det går inte att returnera mer än {1} till artikel {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Rad # {0}: Det går inte att returnera mer än {1} till artikel {2}
 DocType: Item Group,Show this slideshow at the top of the page,Visa denna bildspel längst upp på sidan
 DocType: BOM,Item UOM,Produkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebelopp efter rabatt Belopp (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
 DocType: Cheque Print Template,Primary Settings,primära inställningar
 DocType: Purchase Invoice,Select Supplier Address,Välj Leverantör Adress
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Lägg till anställda
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Lägg till anställda
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontroll
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Liten
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Liten
 DocType: Company,Standard Template,standardmall
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
 DocType: Payment Request,Mute Email,Mute E
@@ -3455,11 +3478,10 @@
 DocType: SMS Log,No of Sent SMS,Antal skickade SMS
 DocType: Antibiotic,Healthcare Administrator,Sjukvårdsadministratör
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Ange ett mål
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
 DocType: Dosage Strength,Dosage Strength,Dosstyrka
 DocType: Account,Expense Account,Utgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programvara
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Färg
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Färg
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Bedömningsplanskriterier
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Förfallodatum är obligatoriskt för vald produkt
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Förhindra köporder
@@ -3472,18 +3494,18 @@
 DocType: Patient,Personal and Social History,Personlig och social historia
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Användare {0} skapad
 DocType: Fee Schedule,Fee Breakup for each student,Avgift för varje elev
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Ändra kod
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Prislista Valuta inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Prislista Valuta inte valt
 DocType: Purchase Invoice,Availed ITC Cess,Utnyttjade ITC Cess
 ,Student Monthly Attendance Sheet,Student Monthly Närvaro Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Fraktregeln gäller endast för Försäljning
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Tills
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgrupp eller kursplan är obligatorisk
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgrupp eller kursplan är obligatorisk
@@ -3504,7 +3526,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lista dina produkter eller tjänster som du köper eller säljer.
 DocType: Water Analysis,Storage Temperature,Förvaringstemperatur
 DocType: Employee Attendance Tool,Unmarked Attendance,omärkt Närvaro
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Forskare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Forskare
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programmet Inskrivning Tool Student
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Startdatum bör vara mindre än slutdatum för uppgift {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Namn eller e-post är obligatoriskt
@@ -3517,7 +3539,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} har för närvarande ett {1} leverantörscorekort och RFQs till denna leverantör bör utfärdas med försiktighet.
 DocType: Chapter,Non Profit Manager,Non Profit Manager
 DocType: BOM,Total Cost(Company Currency),Totalkostnad (Company valuta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Löpnummer {0} skapades
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Löpnummer {0} skapades
 DocType: Homepage,Company Description for website homepage,Beskrivning av företaget för webbplats hemsida
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Namn
@@ -3527,11 +3549,10 @@
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
 DocType: Healthcare Settings,Result Printed,Resultat skrivet
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivningar konto
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Provanställning
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visa {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Provanställning
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Project,Total Costing Amount (via Timesheets),Totalkostnadsbelopp (via tidskrifter)
-DocType: Employee Advance,Expense Approver,Utgiftsgodkännare
+DocType: Department,Expense Approver,Utgiftsgodkännare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
 DocType: Project,Hourly,Varje timme
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Icke-grupp till grupp
@@ -3541,7 +3562,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Till Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Gör betalning via Journal Entry
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Tryckt på
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Tryckt på
 DocType: Item,Inspection Required before Delivery,Inspektion krävs innan leverans
 DocType: Item,Inspection Required before Purchase,Inspektion krävs innan köp
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Väntande Verksamhet
@@ -3551,7 +3572,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimum antal
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Din organisation
 DocType: Fee Component,Fees Category,avgifter Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Ange avlösningsdatum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ant
 DocType: Supplier Scorecard,Notify Employee,Meddela medarbetare
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ange namnet på kampanjen om källförfrågan är kampanjen
@@ -3561,7 +3582,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Ombeställningsnivå
 DocType: Company,Chart Of Accounts Template,Konto Mall
 DocType: Attendance,Attendance Date,Närvaro Datum
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
 DocType: Purchase Invoice Item,Accepted Warehouse,Godkänt Lager
@@ -3569,10 +3590,11 @@
 DocType: Item,Valuation Method,Värderingsmetod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Halvdag
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Duplicera post
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicera post
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Ange mottagarens namn innan du skickar in.
 DocType: Program Enrollment Tool,Get Students,Få studenter
 DocType: Serial No,Under Warranty,Under garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Fel]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Fel]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord kommer att synas när du sparar kundorder.
 ,Employee Birthday,Anställd Födelsedag
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Var god välj Slutdatum för slutfört reparation
@@ -3591,7 +3613,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Reserveras för underleverantörer
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 DocType: Shopping Cart Settings,Orders,Beställningar
-DocType: Employee Leave Approver,Leave Approver,Ledighetsgodkännare
+DocType: Department,Leave Approver,Ledighetsgodkännare
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Var god välj ett parti
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Bedömning Gruppnamn
@@ -3636,7 +3658,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Navspårad artikel
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FÖR MOTTAGARE
 DocType: Asset Category Account,Accumulated Depreciation Account,Ackumulerade avskrivningar konto
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Det här e-postmeddelandet är autogenererat
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
 DocType: Program Enrollment,Boarding Student,Boarding Student
 DocType: Asset,Expected Value After Useful Life,Förväntat värde eller återanvändas
@@ -3661,22 +3682,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Publikrekord {0} finns mot Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Avskrivningar Utslagen på grund av avyttring av tillgångar
-DocType: Member,Member,Medlem
+DocType: Loan,Member,Medlem
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Hantera Adresser
 DocType: Work Order Item,Work Order Item,Arbeta beställningsobjekt
 DocType: Pricing Rule,Item Code,Produktkod
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Jordbrukschef
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
 DocType: Supplier Scorecard Period,Variables,variabler
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Closing (Dr)
 DocType: Cheque Print Template,Cheque Size,Check Storlek
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Löpnummer {0} inte i lager
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Löpnummer {0} inte i lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Avskrivning utestående belopp
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Konto {0} matchar inte företaget {1}
@@ -3685,7 +3706,6 @@
 DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
 DocType: Asset,Number of Depreciations Booked,Antal Avskrivningar bokat
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Antal totalt
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Mot anställd lån: {0}
 DocType: Landed Cost Item,Receipt Document,kvitto Dokument
 DocType: Employee Education,School/University,Skola / Universitet
 DocType: Payment Request,Reference Details,Referens Detaljer
@@ -3696,7 +3716,7 @@
 DocType: Asset,Double Declining Balance,Dubbel degressiv
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Sluten ordning kan inte avbrytas. ÖPPNA för att avbryta.
 DocType: Student Guardian,Father,Far
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; kan inte kontrolleras för anläggningstillgång försäljning
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; kan inte kontrolleras för anläggningstillgång försäljning
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 DocType: Attendance,On Leave,tjänstledig
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hämta uppdateringar
@@ -3710,10 +3730,10 @@
 DocType: Lead,Lower Income,Lägre intäkter
 DocType: Restaurant Order Entry,Current Order,Nuvarande ordning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Källa och mål lager kan inte vara samma för rad {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Gå till Program
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rad {0} # Tilldelad mängd {1} kan inte vara större än oavkrävat belopp {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rad {0} # Tilldelad mängd {1} kan inte vara större än oavkrävat belopp {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
@@ -3736,7 +3756,6 @@
 DocType: Payment Terms Template,Payment Terms,Betalningsvillkor
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
 DocType: Chapter,Meetup Embed HTML,Meetup Bädda in HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Gå till Leverantörer
@@ -3756,30 +3775,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Ange e-postadressen för studenten för att skicka betalningsförfrågan
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Ange e-postadressen för studenten för att skicka betalningsförfrågan
 DocType: Patient,Medical History,Medicinsk historia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Checkräknings konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Checkräknings konto
 DocType: Patient,Patient ID,Patient ID
 DocType: Physician Schedule,Schedule Name,Schema namn
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Skapa lönebeskedet
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Lägg till alla leverantörer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Lägg till alla leverantörer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rad # {0}: Tilldelad mängd kan inte vara större än utestående belopp.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Bläddra BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Säkrade lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Säkrade lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Redigera Publiceringsdatum och tid
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ställ Avskrivningar relaterade konton i tillgångsslag {0} eller Company {1}
 DocType: Lab Test Groups,Normal Range,Normal Range
 DocType: Academic Term,Academic Year,Akademiskt år
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Tillgänglig försäljning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Ingående balans kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Ingående balans kapital
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Återstående
 DocType: Appraisal,Appraisal,Värdering
+DocType: Loan,Loan Account,Lånekonto
 DocType: Purchase Invoice,GST Details,GST-detaljer
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},E-post som skickas till leverantören {0}
 DocType: Item,Default Sales Unit of Measure,Standardförsäljningsenhet av åtgärd
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademiskt år:
+DocType: Subscription,Past Due Date,Förfallodagen
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Tillåt inte att ange alternativ objekt för objektet {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum upprepas
@@ -3792,7 +3813,7 @@
 DocType: Patient Appointment,Patient Appointment,Patientavnämning
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkännande Roll kan inte vara samma som roll regel är tillämplig på
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Avbeställa Facebook Twitter Digest
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Få leverantörer av
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Få leverantörer av
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} hittades inte för artikel {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Gå till kurser
 DocType: Accounts Settings,Show Inclusive Tax In Print,Visa inklusiv skatt i tryck
@@ -3800,10 +3821,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Meddelande Skickat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Konto med underordnade noder kan inte ställas in som huvudbok
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vänligen installera Instruktör Naming System i Utbildning&gt; Utbildningsinställningar
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,I takt med vilket Prislistans valuta omvandlas till kundens basvaluta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobelopp (Företagsvaluta)
 DocType: Physician,Physician Schedules,Läkarplaner
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Det totala förskottsbeloppet får inte vara större än det totala sanktionerade beloppet
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Det totala förskottsbeloppet får inte vara större än det totala sanktionerade beloppet
 DocType: Salary Slip,Hour Rate,Tim värde
 DocType: Stock Settings,Item Naming By,Produktnamn Genom
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
@@ -3821,6 +3843,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ej tillåtet att uppdatera lagertransaktioner äldre än {0}
 DocType: BOM,Inspection Required,Inspektion krävs
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Ange bankgarantienummer innan du skickar in.
 DocType: Driving License Category,Class,Klass
 DocType: Sales Order,Fully Billed,Fullt fakturerad
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Arbetsorder kan inte höjas mot en objektmall
@@ -3831,7 +3854,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Assessment Plan,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vänligen installera Instruktör Naming System i Utbildning&gt; Utbildningsinställningar
 DocType: Serial No,Is Cancelled,Är Inställd
 DocType: Student Group,Group Based On,Grupp baserad på
 DocType: Student Group,Group Based On,Grupp baserad på
@@ -3843,9 +3865,10 @@
 DocType: Cheque Print Template,Cheque Height,Check Höjd
 DocType: Supplier,Supplier Details,Leverantör Detaljer
 DocType: Setup Progress,Setup Progress,Setup Progress
+DocType: Expense Claim,Approval Status,Godkännandestatus
 DocType: Hub Settings,Publish Items to Hub,Publicera produkter i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Från Talet måste vara lägre än värdet i rad {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Elektronisk Överföring
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Kontrollera alla
 ,Issued Items Against Work Order,Utgivna poster mot arbetsorder
 DocType: Vehicle Log,Invoice Ref,faktura Ref
@@ -3876,12 +3899,11 @@
 DocType: Customs Tariff Number,Tariff Number,tariff Number
 DocType: Work Order Item,Available Qty at WIP Warehouse,Tillgänglig mängd vid WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projicerad
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
-DocType: Employee Loan,Employee Loan Application,Employee låneansökan
 DocType: Issue,Opening Date,Öppningsdatum
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Spara patienten först
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Spara patienten först
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Närvaro har markerats med framgång.
 DocType: Program Enrollment,Public Transport,Kollektivtrafik
 DocType: Soil Texture,Silt Composition (%),Siltkomposition (%)
@@ -3900,7 +3922,7 @@
 ,Item Balance (Simple),Artikelbalans (Enkel)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
 DocType: POS Profile,Write Off Account,Avskrivningskonto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debitnotifikation Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debitnotifikation Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbelopp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
@@ -3923,6 +3945,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Kundorder Datum
 DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
 DocType: Assessment Plan,Assessment Plan,Bedömningsplan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kund {0} är skapad.
 DocType: Stock Settings,Limit Percent,gräns Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,För närvarande finns ingen lager i lager
@@ -3936,14 +3959,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,betalnings~~POS=TRUNC Referenser
 DocType: C-Form,C-FORM-,C-Form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Antal intervaller för intervallfältet, t ex om intervallet är &quot;dagar&quot; och faktureringsintervalsräkning är 3, fakturor kommer att genereras var tredje dag"
 DocType: Vehicle,Insurance Details,Insurance Information
 DocType: Account,Payable,Betalning sker
 DocType: Share Balance,Share Type,Share Type
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ange återbetalningstider
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Ange återbetalningstider
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Gäldenär ({0})
 DocType: Pricing Rule,Margin,Marginal
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nya kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttovinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruttovinst%
 DocType: Appraisal Goal,Weightage (%),Vikt (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Ändra POS-profil
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
@@ -3953,10 +3977,11 @@
 DocType: Lead,Address Desc,Adress fallande
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Party är obligatoriskt
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Rader med dubbla förfallodatum i andra rader hittades: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Rader med dubbla förfallodatum i andra rader hittades: {list}
 DocType: Topic,Topic Name,ämnet Namn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Ange standardmall för meddelandet om godkännandet av godkännande i HR-inställningar.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Minst en av de sålda eller köpta måste väljas
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Välj en anställd för att få arbetstagaren att gå vidare.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Välj en anställd för att få arbetstagaren att gå vidare.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Var god välj ett giltigt datum
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Välj typ av ditt företag.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3975,7 +4000,7 @@
 DocType: Asset Movement,Source Warehouse,Källa Lager
 DocType: Installation Note,Installation Date,Installations Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dela Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Försäljningsfaktura {0} skapad
 DocType: Employee,Confirmation Date,Bekräftelsedatum
 DocType: C-Form,Total Invoiced Amount,Sammanlagt fakturerat belopp
@@ -3984,7 +4009,7 @@
 DocType: Account,Accumulated Depreciation,Ackumulerade avskrivningar
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående namn
 DocType: Stock Entry,Customer or Supplier Details,Kund eller leverantör Detaljer
-DocType: Employee Loan Application,Required by Date,Krävs Datum
+DocType: Loan Application,Required by Date,Krävs Datum
 DocType: Lead,Lead Owner,Prospekt ägaren
 DocType: Production Plan,Sales Orders Detail,Försäljningsorder detalj
 DocType: Bin,Requested Quantity,begärda Kvantitet
@@ -3997,10 +4022,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Summa Avdrag - Loan Återbetalning
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Lön Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flera varianter
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Levererad
+DocType: Subscription,Trial Period Start Date,Försöksperiodens startdatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Vänligen logga in som en annan användare.
@@ -4021,12 +4047,11 @@
 DocType: Student Guardian,Student Guardian,Student Guardian
 DocType: Member,Member Name,Medlemsnamn
 DocType: Stock Settings,Use Naming Series,Använd Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,i prenumerationen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 DocType: Membership,Payment Details,Betalningsinformation
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM betyg
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stoppad Arbetsorder kan inte avbrytas, Avbryt den först för att avbryta"
 DocType: Asset,Journal Entry for Scrap,Journal Entry för skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
@@ -4046,6 +4071,7 @@
 DocType: Land Unit,Land Unit,Tomtenhet
 ,Purchase Analytics,Inköps analyser
 DocType: Sales Invoice Item,Delivery Note Item,Följesedel Anteckningspunkt
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Nuvarande faktura {0} saknas
 DocType: Asset Maintenance Log,Task,Uppgift
 DocType: Purchase Taxes and Charges,Reference Row #,Referens Rad #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
@@ -4058,7 +4084,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange vinst / förlust konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Anställd och närvaro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Syfte måste vara en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Fyll i formuläret och spara det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Fyll i formuläret och spara det
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktisk antal i lager
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Faktisk antal i lager
@@ -4073,7 +4099,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standard säljkurs
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
 DocType: Cash Flow Mapper,Section Name,Avsnittsnamn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Ombeställningskvantitet
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Ombeställningskvantitet
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nuvarande jobb Öppningar
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Avskrivning
@@ -4084,9 +4110,9 @@
 DocType: Task,depends_on,beror på
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Köpt för uppdatering av senaste priset i allt material. Det kan ta några minuter.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Namn på ett nytt konto. Obs: Vänligen inte skapa konton för kunder och leverantörer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landsvis standard adressmallar
 DocType: Water Analysis,Appearance,Utseende
+DocType: HR Settings,Leave Status Notification Template,Meddelandemall för status för meddelanden
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Prislista för köpprislista
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Medlemsinformation.
@@ -4109,7 +4135,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Inte tillåten. Avaktivera testmallen
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
 DocType: Crop Cycle,Linked Land Unit,Länkade enhet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
@@ -4125,7 +4151,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Gå till Användare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Ogiltig GSTIN eller Ange NA för oregistrerad
 DocType: Training Event,Seminar,Seminarium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program inskrivningsavgift
@@ -4141,14 +4167,14 @@
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 DocType: Company,Create Chart Of Accounts Based On,Skapa konto Baserad på
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Kan inte konvertera det till icke-grupp. Barnuppgifter finns.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
 ,Stock Ageing,Lager Åldrande
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} finns mot elev sökande {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Avrundningsjustering (företagsvaluta)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,tidrapport
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Sats:
 DocType: Volunteer,Afternoon,Eftermiddag
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Cheque Print Template,Scanned Cheque,skannad Check
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
@@ -4164,7 +4190,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Projektet {0} finns redan
 DocType: Medical Department,Nursing User,Sjuksköterska användare
 DocType: Plant Analysis,Plant Analysis Criterias,Plantanalyskriterier
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Ansvarsområden
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serienummer {0} hör inte till batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Ansvarsområden
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Giltighetstiden för denna notering har upphört.
 DocType: Expense Claim Account,Expense Claim Account,Räkningen konto
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillåt inaktuella valutakurser
@@ -4186,11 +4213,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Gör variationer
 DocType: Item,Default BOM,Standard BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Totalt fakturerat belopp (via försäljningsfakturor)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debiteringsnotering Belopp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debiteringsnotering Belopp
 DocType: Project Update,Not Updated,Inte uppdaterad
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Det finns inkonsekvenser mellan räntan, antal aktier och beräknat belopp"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Totalt Utestående Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
 DocType: Employee Advance,Advance Account,Förskottskonto
 DocType: Job Offer,Job Offer Terms,Arbetsvillkor
@@ -4199,7 +4226,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Fordon
 DocType: Vehicle,Insurance Company,Försäkringsbolag
 DocType: Asset Category Account,Fixed Asset Account,Fast tillgångskonto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Variabel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Från Följesedel
 DocType: Chapter,Members,medlemmar
 DocType: Student,Student Email Address,Student E-postadress
@@ -4223,7 +4250,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
 DocType: Delivery Stop,Address Name,Adressnamn
 DocType: Stock Entry,From BOM,Från BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Splitting {0} enheter av {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Splitting {0} enheter av {1}
 DocType: Assessment Code,Assessment Code,bedömning kod
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Grundläggande
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
@@ -4231,25 +4258,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
 DocType: Bank Reconciliation Detail,Payment Document,betalning Dokument
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Fel vid utvärdering av kriterierna
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
+DocType: Subscription,Plans,Plans
 DocType: Salary Slip,Salary Structure,Lönestruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Problem Material
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ett fel uppstod när du skapade återkommande
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Problem Material
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Inga studentgrupper skapas.
 DocType: Purchase Invoice Item,Serial No,Serienummer
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månatliga återbetalningen belopp kan inte vara större än Lånebelopp
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Månatliga återbetalningen belopp kan inte vara större än Lånebelopp
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ange servicedetaljer först
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Rad # {0}: Förväntad leveransdatum kan inte vara före inköpsdatum
 DocType: Purchase Invoice,Print Language,print Språk
 DocType: Salary Slip,Total Working Hours,Totala arbetstiden
 DocType: Sales Invoice,Customer PO Details,Kundens PO-uppgifter
-DocType: Subscription,Next Schedule Date,Nästa schemaläggningsdatum
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tillfälligt öppnings konto
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Ange värde måste vara positiv
@@ -4278,11 +4304,11 @@
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Från och Till datum krävs
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Inga anställda för nämnda kriterier
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
 DocType: Hotel Settings,Default Customer,Standardkund
 DocType: Assessment Plan,Supervisor Name,Supervisor Namn
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekräfta inte om mötet är skapat för samma dag
@@ -4306,16 +4332,16 @@
 DocType: Journal Entry Account,Employee Advance,Anställd Advance
 DocType: Payroll Entry,Payroll Frequency,löne Frekvens
 DocType: Lab Test Template,Sensitivity,Känslighet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Råmaterial
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Växter och maskinerier
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Växter och maskinerier
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Det dagliga arbetet Sammanfattning Inställningar
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Vänligen ange Reqd by Date
 DocType: Payment Entry,Internal Transfer,Intern transaktion
 DocType: Asset Maintenance,Maintenance Tasks,Underhållsuppgifter
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Antingen mål antal eller målbeloppet är obligatorisk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Välj Publiceringsdatum först
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Välj Publiceringsdatum först
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadsställe med befintliga transaktioner kan inte omvandlas till liggaren
@@ -4323,14 +4349,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Upptäckt sjukdom
 ,Produced,Producerat
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Återbetalning Startdatum kan inte vara före Utbetalningsdatum.
 DocType: Item,Item Code for Suppliers,Produkt kod för leverantörer
 DocType: Issue,Raised By (Email),Höjt av (e-post)
 DocType: Training Event,Trainer Name,Trainer Namn
 DocType: Mode of Payment,General,Allmänt
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Senaste kommunikationen
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Senaste kommunikationen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos krävs för Serialiserad Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos krävs för Serialiserad Punkt {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Match Betalningar med fakturor
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
@@ -4344,7 +4371,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Aktivera / inaktivera valutor.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dr {0} på Halv dagars ledighet på {1}
 DocType: Production Plan,Get Material Request,Få Material Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Post Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Post Kostnader
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 ,Item Variant Details,Varianter av varianter
@@ -4355,9 +4382,9 @@
 DocType: Drug Prescription,Hour,Timme
 DocType: Restaurant Order Entry,Last Sales Invoice,Sista försäljningsfaktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Var god välj Antal mot objekt {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 DocType: Company,Monthly Sales Target,Månadsförsäljningsmål
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
@@ -4365,7 +4392,7 @@
 DocType: Item,Default Material Request Type,Standard Material Typ av förfrågan
 DocType: Supplier Scorecard,Evaluation Period,Utvärderingsperiod
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Okänd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Arbetsorder inte skapad
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Arbetsorder inte skapad
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: Purchase Invoice,Export Type,Exportera typ
 DocType: Salary Slip Loan,Salary Slip Loan,Lönebetalningslån
@@ -4381,8 +4408,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Sammanfattning av fakturoröppning
 DocType: Education Settings,Education Manager,Utbildningschef
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Minsta längd mellan varje växt i fältet för optimal tillväxt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan inte uppdateras med Stock Avstämning, istället använda Lagerinmatning"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan inte uppdateras med Stock Avstämning, istället använda Lagerinmatning"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan inte uppdateras med Stock Avstämning, istället använda Lagerinmatning"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan inte uppdateras med Stock Avstämning, istället använda Lagerinmatning"
 DocType: Quality Inspection,Report Date,Rapportdatum
 DocType: Student,Middle Name,Mellannamn
 DocType: C-Form,Invoices,Fakturor
@@ -4415,20 +4442,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Mottagande
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Mottagande
 ,Sales Register,Försäljningsregistret
 DocType: Daily Work Summary Group,Send Emails At,Skicka e-post Vid
 DocType: Quotation,Quotation Lost Reason,Anledning förlorad Offert
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form View
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Expense Approver Obligatorisk i Kostnadskrav
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Lägg till användare till din organisation, annat än dig själv."
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Inga kunder än!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kassaflödesanalys
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Ingen materiell förfrågan skapad
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
@@ -4451,11 +4479,12 @@
 DocType: Vehicle,Chassis No,chassi nr
 DocType: Payment Request,Initiated,Initierad
 DocType: Production Plan Item,Planned Start Date,Planerat startdatum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Var god välj en BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Var god välj en BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Availed ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
+DocType: Bank Guarantee,Clauses and Conditions,Klausuler och villkor
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
 DocType: Project Task,View Timesheet,Visa tidtabell
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Slutdatumet måste vara större än startdatumet
 DocType: Leave Type,Is Encash,Är incheckad
 DocType: Leave Allocation,New Leaves Allocated,Nya Ledigheter Avsatta
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
@@ -4469,9 +4498,10 @@
 DocType: Patient,Alcohol Current Use,Alkoholströmanvändning
 DocType: Student Admission Program,Student Admission Program,Studentträningsprogram
 DocType: Payment Entry,Account Paid To,Konto betalt för att
+DocType: Subscription Settings,Grace Period,Grace Period
 DocType: Item Alternative,Alternative Item Name,Alternativt artikelnamn
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Kunde inte skicka in någon löneskalning <br> \ Möjliga orsaker: <br> \ 1. Netto lön är mindre än 0. <br> \ 2. Företagets e-postadress som anges i anställdens mästare är inte giltig. <br>
@@ -4481,7 +4511,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget för kontot {1} mot {2} {3} är {4}. Det kommer att överskrida av {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # Hänsyn måste vara av typen &quot;Fast Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Ut Antal
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,och unchcked Disabled in the
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Serien är obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansiella Tjänster
 DocType: Student Sibling,Student ID,Student-ID
@@ -4493,14 +4522,16 @@
 DocType: Complaint,Complaint,Klagomål
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gör återbetalningsinmatning
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Alla avdelningar
 DocType: Patient,Alcohol Past Use,Alkohol tidigare användning
 DocType: Fertilizer Content,Fertilizer Content,Gödselinnehåll
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Problematisk / Stuck
 DocType: Tax Rule,Billing State,Faktureringsstaten
 DocType: Share Transfer,Transfer,Överföring
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Arbetsorder {0} måste avbrytas innan du avbryter denna försäljningsorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
@@ -4524,10 +4555,11 @@
 DocType: Cheque Print Template,Message to show,Meddelande för att visa
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Detaljhandeln
 DocType: Student Attendance,Absent,Frånvarande
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Produktpaket
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Det gick inte att hitta poäng från {0}. Du måste ha stående poäng som täcker 0 till 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
+DocType: Subscription,Current Invoice Start Date,Nuvarande fakturans startdatum
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: krävs antingen debet eller kreditbelopp för {2}
 DocType: GL Entry,Remarks,Anmärkningar
@@ -4537,11 +4569,13 @@
 DocType: Task,Parent Task,Föräldrauppgift
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,gör Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Print och brevpapper
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Print och brevpapper
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Skicka e-post Leverantörs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Lön redan behandlas för perioden mellan {0} och {1} Lämna ansökningstiden kan inte vara mellan detta datumintervall.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Skicka e-post Leverantörs
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Lön redan behandlas för perioden mellan {0} och {1} Lämna ansökningstiden kan inte vara mellan detta datumintervall.
+DocType: Fiscal Year,Auto Created,Automatisk skapad
 DocType: Chapter Member,Leave Reason,Lämna anledning
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} existerar inte längre
 DocType: Guardian Interest,Guardian Interest,Guardian intresse
 DocType: Volunteer,Availability,Tillgänglighet
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Ange standardvärden för POS-fakturor
@@ -4550,14 +4584,13 @@
 DocType: Timesheet,Employee Detail,anställd Detalj
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
 DocType: Lab Prescription,Test Code,Testkod
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Inställningar för webbplats hemsida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ är inte tillåtna för {0} på grund av ett styrkort som står för {1}
 DocType: Job Offer,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Ovan
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Summa belopp {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Summa belopp {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Nämn om inte-standard betalnings konto
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Var god välj bedömningsgruppen annan än &quot;Alla bedömningsgrupper&quot;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Rad {0}: Kostnadscentrum krävs för ett objekt {1}
@@ -4568,7 +4601,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Vattenanalys
 DocType: Chapter,Region,Region
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
 DocType: Holiday List,Weekly Off,Veckovis Av
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Uppdatera länkad analys
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","För t.ex. 2012, 2012-13"
@@ -4584,7 +4617,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Kostnad för skrotas Asset
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
 DocType: Vehicle,Policy No,policy Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Få artiklar från produkt Bundle
 DocType: Asset,Straight Line,Rak linje
 DocType: Project User,Project User,projektAnvändar
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Dela
@@ -4624,21 +4657,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Väg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Det går inte att konvertera kostnadsställe till huvudbok då den har underordnade noder
 DocType: Production Plan,Total Planned Qty,Totalt planerat antal
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,öppnings Värde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,öppnings Värde
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Seriell #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seriell #
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Försäljningskonto
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Försäljningskonto
 DocType: Purchase Invoice Item,Total Weight,Totalvikt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Försäljningsprovision
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Försäljningsprovision
 DocType: Job Offer Term,Value / Description,Värde / Beskrivning
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Förväntat leveransdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurang Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
 DocType: Asset Maintenance Task,Assign To Name,Tilldela till namn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Representationskostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Representationskostnader
 DocType: Hub Settings,Enabled Users,Aktiverade användare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Gör Material Request
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Öppen föremål {0}
@@ -4651,24 +4684,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Ansökan om ledighet.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 DocType: Vehicle,Last Carbon Check,Sista Carbon Check
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Rättsskydds
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Rättsskydds
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Var god välj antal på rad
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Gör öppningsförsäljnings- och inköpsfakturor
 DocType: Purchase Invoice,Posting Time,Boknings Tid
 DocType: Timesheet,% Amount Billed,% Belopp fakturerat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon Kostnader
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Markera det här om du vill tvinga användaren att välja en serie innan du sparar. Det blir ingen standard om du kontrollera detta.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
 DocType: Email Digest,Open Notifications,Öppna Meddelanden
 DocType: Payment Entry,Difference Amount (Company Currency),Skillnad Belopp (Company valuta)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Direkta kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Direkta kostnader
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Resekostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Lägg till anpassat fält Prenumeration i doktypen {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Purchase Receipt Item,Sample Quantity,Provkvantitet
+DocType: Bank Guarantee,Name of Beneficiary,Stödmottagarens namn
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppdatera BOM-kostnad automatiskt via Scheduler, baserat på senaste värderingsfrekvens / prislista / senaste inköpshastighet för råvaror."
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
@@ -4680,14 +4713,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Skyddstillsyn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lönedelar
 DocType: Program Enrollment Tool,New Academic Year,Nytt läsår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Retur / kreditnota
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Sammanlagda belopp som betalats
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Sammanlagda belopp som betalats
 DocType: GST Settings,B2C Limit,B2C Limit
 DocType: Work Order Item,Transferred Qty,Överfört Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigera
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planering
 DocType: Share Balance,Issued,Utfärdad
+DocType: Loan,Repayment Start Date,Återbetalning Startdatum
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Studentaktivitet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Leverantör Id
 DocType: Payment Request,Payment Gateway Details,Betalning Gateway Detaljer
@@ -4700,10 +4734,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ av löv som tillfällig, sjuka etc."
 DocType: Email Digest,Send regular summary reports via Email.,Skicka regelbundna sammanfattande rapporter via e-post.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Ställ in standardkonto i räkningen typ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Ställ in standardkonto i räkningen typ {0}
 DocType: Assessment Result,Student Name,Elevs namn
 DocType: Brand,Item Manager,Produktansvarig
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Lön Betalning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Lön Betalning
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
 DocType: Plant Analysis,Collection Datetime,Samling Datetime
 DocType: Work Order,Total Operating Cost,Totala driftskostnaderna
@@ -4713,9 +4747,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Användare {0} inte existerar
 DocType: Payment Term,Day(s) after invoice date,Dag (er) efter fakturadatum
 DocType: Payment Schedule,Payment Schedule,Betalningsplan
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Förkortning
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Betalning Entry redan existerar
+DocType: Subscription,Trial Period End Date,Pröva period Slutdatum
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lön mall mästare.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologi
@@ -4732,9 +4766,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Alla kundgrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ackumulerade månads
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
@@ -4743,14 +4777,15 @@
 DocType: Lab Prescription,Test Created,Test Skapad
 DocType: Healthcare Settings,Custom Signature in Print,Anpassad signatur i utskrift
 DocType: Account,Temporary,Tillfällig
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Kund LPO nr
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Kund LPO nr
 DocType: Program,Courses,Kurser
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuell Fördelning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekreterare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekreterare
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Om inaktivera, &quot;uttrycker in&quot; fältet inte kommer att vara synlig i någon transaktion"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Den här åtgärden stoppar framtida fakturering. Är du säker på att du vill avbryta denna prenumeration?
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet för en försändelse
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterier Namn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Vänligen ange företaget
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Vänligen ange företaget
 DocType: Pricing Rule,Buying,Köpa
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Sjukdomar och gödselmedel
 DocType: HR Settings,Employee Records to be created by,Personal register som skall skapas av
@@ -4759,18 +4794,18 @@
 DocType: POS Profile,Apply Discount On,Tillämpa rabatt på
 DocType: Member,Membership Type,typ av medlemskap
 ,Reqd By Date,Reqd Efter datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Borgenärer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Borgenärer
 DocType: Assessment Plan,Assessment Name,bedömning Namn
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Visa PDC i Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Visa PDC i Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Rad # {0}: Löpnummer är obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Produktvis Skatte Detalj
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Jobb erbjudande
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institute Förkortning
 ,Item-wise Price List Rate,Produktvis Prislistavärde
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,attrak-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
@@ -4788,7 +4823,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Totalt Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Om det är aktiverat, kommer systemet att skicka bokföringsposter för inventering automatiskt."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Närvaro för arbetstagare {0} är redan märkt för denna dag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Närvaro för arbetstagare {0} är redan märkt för denna dag
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","i protokollet Uppdaterad via ""Tidslog"""
 DocType: Customer,From Lead,Från Prospekt
@@ -4799,6 +4834,7 @@
 DocType: Lab Test,Approved Date,Godkänd datum
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
+DocType: Subscriber,Subscriber Name,Abonnentens namn
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Update Tool,Replace,Ersätt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Inga produkter hittades.
@@ -4808,19 +4844,18 @@
 DocType: Request for Quotation Item,Project Name,Projektnamn
 DocType: Customer,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Välj ränteintäkter konto i anställningslån {0}
 DocType: Work Order,Required Items,nödvändiga objekt
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Personal administration
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betalning Avstämning Betalning
 DocType: Disease,Treatment Task,Behandlingsuppgift
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Skattefordringar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Skattefordringar
 DocType: BOM Item,BOM No,BOM nr
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Update Tool,The BOM which will be replaced,BOM som kommer att ersättas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,elektronisk utrustning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,elektronisk utrustning
 DocType: Asset,Maintenance Required,Underhåll krävs
 DocType: Account,Debit,Debit-
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
@@ -4829,7 +4864,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Utestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Uppsatta mål Punkt Gruppvis för säljare.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Lager Äldre än [dagar]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rad # {0}: Asset är obligatoriskt för anläggningstillgång köp / försäljning
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rad # {0}: Asset är obligatoriskt för anläggningstillgång köp / försäljning
 DocType: Asset Maintenance Team,Maintenance Team Name,Underhållsgruppsnamn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Om två eller flera Prissättningsregler hittas baserat på ovanstående villkor, tillämpas prioritet . Prioritet är ett tal mellan 0 till 20, medan standardvärdet är noll (tom). Högre siffra innebär det kommer att ha företräde om det finns flera prissättningsregler med samma villkor."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Kunden är obligatorisk om &quot;Opportunity From&quot; är vald som Kund
@@ -4839,19 +4874,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Olika typer av utgiftsräkning.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Försäljningsfrekvensen för objektet {0} är lägre än dess {1}. Försäljningsfrekvensen bör vara minst {2}
-DocType: Item,Taxes,Skatter
+DocType: Subscription,Taxes,Skatter
 DocType: Purchase Invoice,capital goods,kapitalvaror
 DocType: Purchase Invoice Item,Weight Per Unit,Vikt per enhet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Betald och inte levererats
 DocType: Project,Default Cost Center,Standardkostnadsställe
-DocType: Bank Guarantee,End Date,Slutdatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,aktietransaktioner
 DocType: Budget,Budget Accounts,budget-konton
 DocType: Employee,Internal Work History,Intern Arbetserfarenhet
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Ackumulerade avskrivningar Belopp
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Privatkapital
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Leverantörs Scorecard Variable
-DocType: Employee Loan,Fully Disbursed,fullt Utbetalt
 DocType: Employee Advance,Due Advance Amount,Förskottsbelopp
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
@@ -4875,7 +4908,7 @@
 ,Employee Information,Anställd Information
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standardskattmallar för försäljning och inköp skapas.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Bedömningsresultatrekord {0} existerar redan.
@@ -4883,7 +4916,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vänligen ange Företagets filter tomt om Group By är &quot;Company&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Publiceringsdatum kan inte vara framtida tidpunkt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,för att generera de återkommande
 DocType: Stock Entry,Target Warehouse Address,Mållageradress
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Tillfällig ledighet
 DocType: Agriculture Task,End Day,Slutdag
@@ -4908,11 +4940,10 @@
 DocType: Material Request,% Ordered,% Beordrade
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",För kursbaserad studentgrupp kommer kursen att valideras för varje student från de inskrivna kurser i programinsökan.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Ackord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Köpkurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Avg. Köpkurs
 DocType: Share Balance,From No,Från nr
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Nytt meddelande från {avsändare}
 DocType: Customer,Customer Primary Address,Kundens primära adress
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Drug Prescription,Description/Strength,Beskrivning / Styrka
@@ -4921,22 +4952,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Samma objekt har angetts flera gånger
 DocType: Department,Leave Block List,Lämna Block List
 DocType: Purchase Invoice,Tax ID,Skatte ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Produkt  {0} är inte inställt för Serial Nos. Kolumn måste vara tom
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Produkt  {0} är inte inställt för Serial Nos. Kolumn måste vara tom
 DocType: Accounts Settings,Accounts Settings,Kontoinställningar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Godkänna
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Malformaterad adress för {0}, vänligen fixa för att fortsätta."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Malformaterad adress för {0}, vänligen fixa för att fortsätta."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Antal nya konton, det kommer att ingå i kontonamnet som ett prefix"
 DocType: Maintenance Team Member,Team Member,Lagmedlem
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Inget resultat att skicka in
 DocType: Customer,Sales Partner and Commission,Försäljningen Partner och kommissionen
-DocType: Employee Loan,Rate of Interest (%) / Year,Hastighet av intresse (%) / år
+DocType: Loan,Rate of Interest (%) / Year,Hastighet av intresse (%) / år
 ,Project Quantity,projekt Kvantitet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;
 DocType: Opportunity,To Discuss,Att Diskutera
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} behövs i {2} för att slutföra denna transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Hastighet av intresse (%) Årlig
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Tillfälliga konton
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Svart
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Tillfälliga konton
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosions Punkt
 DocType: Shareholder,Contact List,Kontaktlista
 DocType: Account,Auditor,Redigerare
@@ -4944,16 +4975,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} objekt producerade
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Läs mer
 DocType: Cheque Print Template,Distance from top edge,Avståndet från den övre kanten
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Prislista {0} är inaktiverad eller inte existerar
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Prislista {0} är inaktiverad eller inte existerar
 DocType: Purchase Invoice,Return,Återgå
 DocType: Pricing Rule,Disable,Inaktivera
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Verk betalning krävs för att göra en betalning
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Verk betalning krävs för att göra en betalning
 DocType: Project Task,Pending Review,Väntar På Granskning
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Redigera i hel sida för fler alternativ som tillgångar, serienummer, partier etc."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Möten och samråd
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} är inte inskriven i batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Tillgångs {0} kan inte skrotas, eftersom det redan är {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Kontroller krävs
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Kontroller krävs
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Frånvarande
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Misslyckades med att konfigurera företaget
@@ -4965,7 +4996,7 @@
 DocType: Homepage,Tag Line,Tag Linje
 DocType: Fee Component,Fee Component,avgift Komponent
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Lägga till objekt från
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Lägga till objekt från
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Grödor &amp; Lands
 DocType: Cheque Print Template,Regular,Regelbunden
 DocType: Fertilizer,Density (if liquid),Densitet (om vätska)
@@ -4990,24 +5021,26 @@
 DocType: Payment Entry,Paid Amount,Betalt belopp
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Utforska försäljningscykel
 DocType: Assessment Plan,Supervisor,Handledare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Retention Stock Entry
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Retention Stock Entry
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 ,Work Order Stock Report,Arbetsordningsbeståndsrapport
+DocType: Purchase Receipt,Auto Repeat Detail,Auto Repeat Detail
 DocType: Assessment Result Tool,Assessment Result Tool,Bedömningsresultatverktyg
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Som tillsynsman
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Föreslå kategori
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Punkt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kvalitetshantering
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kvalitetshantering
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} har inaktiverats
 DocType: Project,Total Billable Amount (via Timesheets),Totala fakturabeloppet (via tidstabeller)
 DocType: Agriculture Task,Previous Business Day,Tidigare företagsdag
-DocType: Employee Loan,Repay Fixed Amount per Period,Återbetala fast belopp per period
+DocType: Loan,Repay Fixed Amount per Period,Återbetala fast belopp per period
 DocType: Employee,Health Insurance No,Sjukförsäkring nr
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kreditnot Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kreditnot Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Totala skattepliktiga beloppet
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
 DocType: Opening Invoice Creation Tool,Purchase,Inköp
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balans Antal
@@ -5018,16 +5051,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} för {1}
 DocType: Healthcare Settings,Valid number of days,Giltigt antal dagar
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Kostnadsställen
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Starta om prenumerationen
 DocType: Land Unit,Linked Plant Analysis,Länkad analys av växter
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,I takt med vilket leverantörens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rad # {0}: Konflikt med tider rad {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillåt nollvärderingsfrekvens
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillåt nollvärderingsfrekvens
+DocType: Bank Guarantee,Receiving,Tar emot
 DocType: Training Event Employee,Invited,inbjuden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Flera aktiva lönestruktur hittades för arbetstagare {0} för de givna datum
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup Gateway konton.
 DocType: Employee,Employment Type,Anställnings Typ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Fasta tillgångar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Fasta tillgångar
 DocType: Payment Entry,Set Exchange Gain / Loss,Ställ Exchange vinst / förlust
 ,GST Purchase Register,GST inköpsregister
 ,Cash Flow,Pengaflöde
@@ -5047,9 +5082,10 @@
 DocType: Academic Term,Term Start Date,Term Startdatum
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Lista över alla aktie transaktioner
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppräknare
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Härmed bifogas {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Både provperiodens startdatum och provperiodens slutdatum måste ställas in
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Genomsnitt
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totala betalningsbeloppet i betalningsplanen måste vara lika med Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totala betalningsbeloppet i betalningsplanen måste vara lika med Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Planen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutdrag balans per huvudbok
 DocType: Job Applicant,Applicant Name,Sökandes Namn
 DocType: Authorization Rule,Customer / Item Name,Kund / artikelnamn
@@ -5079,6 +5115,7 @@
 DocType: Work Order,Warehouses,Lager
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tillgång kan inte överföras
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotellrumspriser
+DocType: Subscription,Days Until Due,Dagar fram till förfall
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Denna artikel är en variant av {0} (mall).
 DocType: Workstation,per hour,per timme
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Köp av
@@ -5087,13 +5124,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",För gruppbaserad studentgrupp kommer studentenbatchen att valideras för varje student från programansökan.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Fördelning
+DocType: Journal Entry Account,Loan,Lån
 DocType: Expense Claim Advance,Expense Claim Advance,Expense Claim Advance
 DocType: Lab Test,Report Preference,Rapportpreferens
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Frivillig information.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektledare
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Projektledare
 ,Quoted Item Comparison,Citerade föremål Jämförelse
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Överlappa i poäng mellan {0} och {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Skicka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Substansvärdet på
 DocType: Crop,Produce,Producera
@@ -5103,7 +5141,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Materialförbrukning för tillverkning
 DocType: Item Alternative,Alternative Item Code,Alternativ produktkod
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Välj produkter i Tillverkning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Välj produkter i Tillverkning
 DocType: Delivery Stop,Delivery Stop,Leveransstopp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
 DocType: Item,Material Issue,Materialproblem
@@ -5113,15 +5151,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
 DocType: BOM,Show Items,Visa artiklar
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Från Tiden kan inte vara större än då.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Vill du anmäla alla kunder via e-post?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Vill du anmäla alla kunder via e-post?
+DocType: Subscription Plan,Billing Interval,Faktureringsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Återuppta
 DocType: Hub Settings,Hub Username,Hub Användarnamn
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Bedömningskriteriegrupp
 DocType: Healthcare Settings,Patient Name By,Patientnamn Av
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Inträde för löner från {0} till {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Inträde för löner från {0} till {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
@@ -5135,22 +5173,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Här kan du behålla längd, vikt, allergier, medicinska problem etc"
 DocType: Leave Block List,Applies to Company,Gäller Företag
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
-DocType: Employee Loan,Disbursement Date,utbetalning Datum
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Mottagare&quot; inte specificerat
+DocType: Loan,Disbursement Date,utbetalning Datum
 DocType: BOM Update Tool,Update latest price in all BOMs,Uppdatera senaste priset i alla BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Vårdjournal
 DocType: Vehicle,Vehicle,Fordon
 DocType: Purchase Invoice,In Words,I Ord
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Ange bankens eller utlåningsinstitutets namn innan du skickar in.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} måste lämnas in
 DocType: POS Profile,Item Groups,artikelgrupper
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Idag är {0} s födelsedag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Idag är {0} s födelsedag!
 DocType: Sales Order Item,For Production,För produktion
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Lägg till ett tillfälligt öppnings konto i kontoplan
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Lägg till ett tillfälligt öppnings konto i kontoplan
 DocType: Customer,Customer Primary Contact,Kund Primärkontakt
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Periodens avslutande tidskrift
 DocType: Project Task,View Task,Se uppgifter
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Bankgaranti Typ
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fakturahandel
 ,Asset Depreciations and Balances,Asset Avskrivningar och saldon
@@ -5161,9 +5200,8 @@
 DocType: Production Plan,Include Subcontracted Items,Inkludera underleverantörer
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Ansluta sig
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Kan inte ändra Variantegenskaper efter lagertransmission. Du måste skapa ett nytt objekt för att göra detta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
-DocType: Employee Loan,Repay from Salary,Repay från Lön
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+DocType: Loan,Repay from Salary,Repay från Lön
 DocType: Leave Application,LAP/,KNÄ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Begärande betalning mot {0} {1} för mängden {2}
 DocType: Salary Slip,Salary Slip,Lön Slip
@@ -5187,11 +5225,11 @@
 DocType: Employee Education,Employee Education,Anställd Utbildning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dubblett grupp finns i posten grupptabellen
 DocType: Land Unit,Parent Land Unit,Föräldrajordsenhet
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
 DocType: Fertilizer,Fertilizer Name,Namn på gödselmedel
 DocType: Salary Slip,Net Pay,Nettolön
 DocType: Cash Flow Mapping Accounts,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serienummer {0} redan har mottagits
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Serienummer {0} redan har mottagits
 ,Requested Items To Be Transferred,Efterfrågade artiklar som ska överföras
 DocType: Expense Claim,Vehicle Log,fordonet Log
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Förekomst av feber (temp&gt; 38,5 ° C eller upprepad temperatur&gt; 38 ° C / 100,4 ° F)"
@@ -5232,24 +5270,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
 DocType: Asset Maintenance,Manufacturing User,Tillverkningsanvändare
 DocType: Purchase Invoice,Raw Materials Supplied,Råvaror Levereras
-DocType: C-Form,Series,Serie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Valutan i prislistan {0} måste vara {1} eller {2}
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,Produkt Klassificering
 DocType: Driver,License Number,Licensnummer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Servicebesökets syfte
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Faktura Patient Registration
 DocType: Crop,Period,Period
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Allmän huvudbok
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Medarbetare {0} på Lämna på {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Medarbetare {0} på Lämna på {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se prospekts
 DocType: Program Enrollment Tool,New Program,nytt program
 DocType: Item Attribute Value,Attribute Value,Attribut Värde
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 DocType: Salary Detail,Salary Detail,lön Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Välj {0} först
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Välj {0} först
 DocType: Appointment Type,Physician,Läkare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,samråd
@@ -5257,15 +5294,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan inte vara större än den planerade kvantiteten ({2}) i arbetsorder {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tidrapportering för tillverkning.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Delsumma
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan inte ändra Variantegenskaper efter aktiehandel. Du måste skapa ett nytt objekt för att göra detta.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA-mandat
 DocType: Physician,Charges,Kostnader
 DocType: Production Plan,Get Items For Work Order,Få artiklar för arbetsorder
 DocType: Salary Detail,Default Amount,Standard Mängd
 DocType: Lab Test Template,Descriptive,Beskrivande
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Lagret hittades inte i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Lagret hittades inte i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Månadens Sammanfattning
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontroll Läsning
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Ange ett försäljningsmål som du vill uppnå för ditt företag.
 ,Project wise Stock Tracking,Projektvis lager Spårning
@@ -5293,11 +5331,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Misslyckades med att skapa webbplats
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry redan skapad eller Provkvantitet ej angiven
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Retention Stock Entry redan skapad eller Provkvantitet ej angiven
 DocType: Program,Program Abbreviation,program Förkortning
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
 DocType: Warranty Claim,Resolved By,Åtgärdad av
-DocType: Bank Guarantee,Start Date,Start Datum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Tilldela avgångar under en period.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checkar och Insättningar rensas felaktigt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
@@ -5312,11 +5349,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timmar
 DocType: Project,Expected Start Date,Förväntat startdatum
 DocType: Purchase Invoice,04-Correction in Invoice,04-Korrigering i Faktura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Arbetsorder som redan är skapad för alla artiklar med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Arbetsorder som redan är skapad för alla artiklar med BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant Detaljer Report
 DocType: Setup Progress Action,Setup Progress Action,Inställning Progress Action
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Köpa prislista
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Köpa prislista
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Ta bort alternativ om avgifter inte är tillämpade för denna post
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Avbryt prenumeration
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Vänligen välj Underhållsstatus som Slutförd eller ta bort Slutdatum
 DocType: Supplier,Default Payment Terms Template,Standardbetalningsvillkor Mall
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Transaktions valutan måste vara samma som Payment Gateway valuta
@@ -5327,7 +5365,6 @@
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Åtgärder om sammanlagda månadsbudgeten överskrids
-DocType: Subscription,Submit on creation,Lämna in en skapelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Valuta för {0} måste vara {1}
 DocType: Asset,Disposal Date,bortskaffande Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post kommer att skickas till alla aktiva anställda i bolaget vid en given timme, om de inte har semester. Sammanfattning av svaren kommer att sändas vid midnatt."
@@ -5345,6 +5382,7 @@
 DocType: Batch,Parent Batch,Föräldragrupp
 DocType: Cheque Print Template,Cheque Print Template,Check utskriftsmall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kontoplan på Kostnadsställen
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Antal dagar efter fakturadatum har förflutit innan du avbryter prenumerationen eller prenumerationen som obetald
 DocType: Lab Test Template,Sample Collection,Provsamling
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
 DocType: Price List,Price List Name,Pris Listnamn
@@ -5353,7 +5391,7 @@
 DocType: Account,Income,Inkomst
 DocType: Industry Type,Industry Type,Industrityp
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Något gick snett!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 DocType: Supplier Scorecard Scoring Criteria,Score,Göra
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Räkenskapsårets {0} inte existerar
@@ -5373,12 +5411,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} bör vara ett värde mellan 0 och 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Nästa avskrivningsdatum kan inte vara före tillgängliga datum för användning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Lån utan säkerhet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbetstid mot tidrapport
 DocType: Maintenance Schedule Detail,Scheduled Date,Planerat datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Totalt betalade Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Totalt betalade Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meddelanden som är större än 160 tecken delas in i flera meddelanden
 DocType: Purchase Receipt Item,Received and Accepted,Mottagit och godkänt
 DocType: Hub Settings,Company and Seller Profile,Företag och säljare profil
@@ -5392,10 +5430,9 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Dina Leverantörer
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Vänligen korrigera
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
 DocType: Request for Quotation Item,Supplier Part No,Leverantör varunummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonym
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Mottagen från
 DocType: Lead,Converted,Konverterad
@@ -5409,6 +5446,7 @@
 DocType: Asset,Assets,Tillgångar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
+DocType: Subscription,Current Invoice End Date,Aktuell faktura Slutdatum
 DocType: Payment Term,Due Date Based On,Förfallodatum baserad på
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Ange standard kundgrupp och -område i Säljinställningar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} existerar inte
@@ -5416,7 +5454,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Inga återbetalningar valdes för Journal Entry
 DocType: Payment Reconciliation,From Invoice Date,Från fakturadatum
+DocType: Loan,Disbursed,Utbetalt
 DocType: Healthcare Settings,Laboratory Settings,Laboratorieinställningar
 DocType: Patient Appointment,Service Unit,Serviceenhet
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Framgångsrikt sätta leverantör
@@ -5429,12 +5469,12 @@
 DocType: Share Balance,No of Shares,Antal aktier
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Välj Status
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: School House,House Name,Hus-namn
 DocType: Fee Schedule,Total Amount per Student,Summa belopp per student
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrisk
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lägg till resten av din organisation som dina användare. Du kan också bjuda in Kunder till din portal genom att lägga till dem från Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
 DocType: Grant Application,Requested Amount,Begärt belopp
@@ -5444,7 +5484,7 @@
 DocType: Crop Cycle,Detected Diseases,Upptäckta sjukdomar
 DocType: Stock Entry,Default Source Warehouse,Standardkälla Lager
 DocType: Item,Customer Code,Kund kod
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Påminnelse födelsedag för {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 DocType: Asset Maintenance Task,Last Completion Date,Sista slutdatum
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
@@ -5452,9 +5492,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless-inställningar
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Stock Tillgångar
 DocType: Restaurant,Active Menu,Aktiv meny
 DocType: Target Detail,Target Qty,Mål Antal
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Mot lån: {0}
 DocType: Shopping Cart Settings,Checkout Settings,kassa Inställningar
 DocType: Student Attendance,Present,Närvarande
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
@@ -5463,9 +5504,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
 DocType: Vehicle Log,Odometer,Vägmätare
 DocType: Production Plan Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM inte innehåller någon lagervara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM inte innehåller någon lagervara
 DocType: Chapter,Chapter Head,Kapitelhuvud
 DocType: Payment Term,Month(s) after the end of the invoice month,Månad (er) efter fakturamånadens slut
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektverksamhet / uppgift.
@@ -5473,11 +5514,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generera lönebesked
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Labresultatets datetime kan inte vara innan du testar datetime
 DocType: POS Profile,Allow user to edit Discount,Tillåt användaren att redigera rabatt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Få kunder från
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Få kunder från
 DocType: Purchase Invoice Item,Include Exploded Items,Inkludera explosiva artiklar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Köp måste anges, i förekommande fall väljs som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
 DocType: Shipping Rule,Restrict to Countries,Begränsa till länder
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings Timmar
 DocType: Project,Total Sales Amount (via Sales Order),Totala försäljningsbelopp (via försäljningsorder)
@@ -5496,6 +5538,7 @@
 DocType: Soil Texture,Sandy Clay,Sandig Clay
 DocType: Grant Application,Assessment  Manager,Bedömningschef
 DocType: Payment Entry,Allocate Payment Amount,Tilldela Betalningsbelopp
+DocType: Subscription Plan,Subscription Plan,Prenumerationsplan
 DocType: Employee External Work History,Salary,Lön
 DocType: Serial No,Delivery Document Type,Leverans Dokumenttyp
 DocType: Sales Order,Partly Delivered,Delvis Levererad
@@ -5520,9 +5563,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Åldringsräckvidd 2
 DocType: SG Creation Tool Course,Max Strength,max Styrka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installera förinställningar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Ingen leveransnotering vald för kund {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Ingen leveransnotering vald för kund {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM ersatte
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Välj objekt baserat på leveransdatum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Välj objekt baserat på leveransdatum
 DocType: Grant Application,Has any past Grant Record,Har någon tidigare Grant Record
 ,Sales Analytics,Försäljnings Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Tillgängliga {0}
@@ -5541,7 +5584,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvaror Levererans Kostnad
 DocType: Selling Settings,Settings for Selling Module,Inställningar för att sälja Modul
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellrum Bokning
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Kundtjänst
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Kundtjänst
 DocType: BOM,Thumbnail,Miniatyr
 DocType: Item Customer Detail,Item Customer Detail,Produktdetaljer kund
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Erbjud kandidaten ett jobb.
@@ -5558,7 +5601,7 @@
 DocType: Fees,Student Details,Studentuppgifter
 DocType: Purchase Invoice Item,Stock Qty,Lager Antal
 DocType: Purchase Invoice Item,Stock Qty,Lager Antal
-DocType: Employee Loan,Repayment Period in Months,Återbetalning i månader
+DocType: Loan,Repayment Period in Months,Återbetalning i månader
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fel: Inte ett giltigt id?
 DocType: Naming Series,Update Series Number,Uppdatera Serie Nummer
 DocType: Account,Equity,Eget kapital
@@ -5567,7 +5610,7 @@
 DocType: Task,Closing Date,Slutdatum
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
 DocType: Timesheet,Work Detail,Arbetsdetaljer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Ingenjör
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Ingenjör
 DocType: Journal Entry,Total Amount Currency,Totalt Belopp Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Sök Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
@@ -5613,13 +5656,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donor Typ information.
 DocType: Request for Quotation,Supplier Detail,leverantör Detalj
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Fel i formel eller ett tillstånd: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Fakturerade belopp
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Fakturerade belopp
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Kriterievikter måste lägga till upp till 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Närvaro
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,lager
 DocType: BOM,Materials,Material
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Om inte markerad, måste listan läggas till varje avdelning där den måste tillämpas."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Skapa {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Källa och Mål Warehouse kan inte vara samma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
@@ -5643,14 +5685,14 @@
 DocType: Shipping Rule,Fixed,Fast
 DocType: Vehicle Service,Clutch Plate,kopplingslamell
 DocType: Company,Round Off Account,Avrunda konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Administrativa kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Administrativa kostnader
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Konsultering
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
-DocType: Journal Entry,Subscription,Prenumeration
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Prenumeration
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Avgift skapande väntar
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Uppsägningstid
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Uppsägningstid
 DocType: Asset Category,Asset Category Name,Asset Kategori Namn
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Detta är en rot territorium och kan inte ändras.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ny försäljnings Person Namn
@@ -5664,7 +5706,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av avskrivningar (månader)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,KUNDKONTO
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Visa nollvärden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antal av objekt som erhålls efter tillverkning / ompackning från givna mängder av råvaror
@@ -5672,7 +5714,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
 DocType: Hub Settings,Company Logo,Företagslogotyp
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 DocType: Healthcare Settings,Patient Registration,Patientregistrering
@@ -5707,11 +5749,10 @@
 DocType: Journal Entry,Total Debit,Totalt bankkort
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard färdigvarulagret
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Var god välj Patient
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Försäljnings person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Försäljnings person
 DocType: Hotel Room Package,Amenities,Bekvämligheter
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget och kostnadsställe
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Multipla standard betalningssätt är inte tillåtet
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,för
 ,Appointment Analytics,Utnämningsanalys
 DocType: Vehicle Service,Half Yearly,Halvår
 DocType: Lead,Blog Subscriber,Blogg Abonnent
@@ -5728,6 +5769,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lämna tomma om du gör elever grupper per år
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Om markerad, Totalt antal. arbetsdagar kommer att omfatta helgdagar, och detta kommer att minska värdet av lönen per dag"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Appar som använder nuvarande nyckel kommer inte att kunna komma åt, är du säker?"
+DocType: Subscription Settings,Prorate,prorata
 DocType: Purchase Invoice,Total Advance,Totalt Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Ändra mallkod
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termen Slutdatum kan inte vara tidigare än Term startdatum. Rätta datum och försök igen.
@@ -5739,8 +5781,9 @@
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 DocType: Cheque Print Template,Signatory Position,tecknaren Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Ange som förlorade
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Ange som förlorade
 DocType: Timesheet,Total Billable Hours,Totalt debiterbara timmar
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Antal dagar som abonnenten måste betala fakturor som genereras av denna prenumeration
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Kvitto Notera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Detta grundar sig på transaktioner mot denna kund. Se tidslinje nedan för mer information
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med betalning Entry belopp {2}
@@ -5759,12 +5802,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Company,Company Info,Företagsinfo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Välj eller lägga till en ny kund
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Detta är baserat på närvaron av detta till anställda
 DocType: Assessment Result,Summary,Sammanfattning
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Bankkortkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Bankkortkonto
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restaurang Order Entry Item
@@ -5776,7 +5819,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Köpesumma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverantör Offert {0} skapades
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,End år kan inte vara före startåret
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Ersättningar till anställda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Ersättningar till anställda
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Work Order,Manufactured Qty,Tillverkas Antal
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Aktierna existerar inte med {0}
@@ -5784,12 +5827,12 @@
 DocType: Asset,Out of Order,Trasig
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ignorera överlappning av arbetsstationen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Vänligen ange ett standardkalender för anställd {0} eller Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Vänligen ange ett standardkalender för anställd {0} eller Company {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Välj batchnummer
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fakturor till kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 DocType: Patient Service Unit,Medical Administrator,Medicinsk administratör
 DocType: Assessment Plan,Schedule,Tidtabell
 DocType: Account,Parent Account,Moderbolaget konto
@@ -5819,15 +5862,16 @@
 DocType: Asset Repair,Repair Status,Reparationsstatus
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Välj Anställningsregister först.
 DocType: POS Profile,Account for Change Amount,Konto för förändring Belopp
 DocType: Purchase Invoice,input service,inmatningstjänst
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Underhållspersonal
 DocType: Agriculture Analysis Criteria,Soil Analysis,Jordanalys
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kurskod:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ange utgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
 DocType: Employee,Current Address,Nuvarande Adress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Om artikeln är en variant av ett annat objekt kommer beskrivning, bild, prissättning, skatter etc att ställas från mallen om inte annat uttryckligen anges"
 DocType: Serial No,Purchase / Manufacture Details,Inköp / Tillverknings Detaljer
@@ -5876,19 +5920,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Antagning för {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Variabelt namn
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
 DocType: Asset,Asset Category,tillgångsslag
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolön kan inte vara negativ
 DocType: Purchase Order,Advance Paid,Förskottsbetalning
 DocType: Item,Item Tax,Produkt Skatt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Material till leverantören
 DocType: Soil Texture,Loamy Sand,Lerig sand
 DocType: Production Plan,Material Request Planning,Material Beställningsplanering
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Punkt Faktura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Tröskel {0}% visas mer än en gång
 DocType: Expense Claim,Employees Email Id,Anställdas E-post Id
 DocType: Employee Attendance Tool,Marked Attendance,Marked Närvaro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Nuvarande Åtaganden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Nuvarande Åtaganden
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Timern översteg de angivna timmarna.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Skicka mass SMS till dina kontakter
 DocType: Patient,A Positive,En positiv
@@ -5899,9 +5943,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har för närvarande ett {1} leverantörssortkort, och inköpsorder till denna leverantör bör utfärdas med försiktighet."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
-DocType: Employee Loan,Loan Type,lånetyp
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} har skickats in framgångsrikt
+DocType: Loan,Loan Type,lånetyp
 DocType: Scheduling Tool,Scheduling Tool,schemaläggning Tool
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Produkt som skall tillverkas eller packas
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5933,7 +5978,7 @@
 DocType: Item,Units of Measure,Måttenheter
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillåt Produktion på helgdagar
 DocType: Sales Invoice,Customer's Purchase Order Date,Kundens inköpsorder Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Kapital Lager
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Kapital Lager
 DocType: Shopping Cart Settings,Show Public Attachments,Visa offentliga bilagor
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
 DocType: Restaurant Reservation,Reservation Time,Bokningstid
@@ -5948,7 +5993,7 @@
 DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Rad # {0}: Reqd by Date kan inte vara före Transaktionsdatum
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Utvalda Produkter
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
@@ -5958,20 +6003,20 @@
 DocType: Driver,Expiry Date,Utgångsdatum
 DocType: Healthcare Settings,Employee name and designation in print,Anställdsnamn och beteckning i tryck
 ,accounts-browser,konton-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vänligen välj kategori först
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektchef.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","För att möjliggöra överfakturering eller över beställning, uppdatera &quot;ersättning&quot; i lager inställningar eller objekt."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Halv Dag)
 DocType: Payment Term,Credit Days,Kreditdagar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Var god välj Patient för att få Lab Test
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Göra Student Batch
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Ledtid dagar
 DocType: Cash Flow Mapping,Is Income Tax Expense,Är inkomstskattkostnad
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kolla här om studenten är bosatt vid institutets vandrarhem.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
 ,Stock Summary,lager Sammanfattning
@@ -5982,10 +6027,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: BOM Operation,Operating Cost(Company Currency),Driftskostnad (Company valuta)
-DocType: Employee Loan Application,Rate of Interest,RÄNTEFOT
+DocType: Loan Application,Rate of Interest,RÄNTEFOT
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: Item,Shelf Life In Days,Hållbarhet i dagar
 DocType: GL Entry,Is Opening,Är Öppning
+DocType: Department,Expense Approvers,Expense Approvers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
 DocType: Journal Entry,Subscription Section,Prenumerationsavsnitt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Kontot {0} existerar inte
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index a83a512..bc91d81 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Futa Ziara ya Nyenzo {0} kabla ya kufuta madai ya Waranti
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Ripoti za Tathmini
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Bidhaa za Watumiaji
-DocType: Purchase Receipt,Subscription Detail,Maelezo ya usajili
 DocType: Supplier Scorecard,Notify Supplier,Arifaza Wasambazaji
 DocType: Item,Customer Items,Vitu vya Wateja
 DocType: Project,Costing and Billing,Gharama na Ulipaji
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Akaunti {0}: Akaunti ya Mzazi {1} haiwezi kuwa kiongozi
 DocType: Item,Publish Item to hub.erpnext.com,Chapisha Jumuiya ya hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Arifa za Barua pepe
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Tathmini
 DocType: Item,Default Unit of Measure,Kitengo cha Kupima chaguo-msingi
 DocType: SMS Center,All Sales Partner Contact,Mawasiliano Yote ya Mshirika wa Mauzo
-DocType: Employee,Leave Approvers,Acha vibali
+DocType: Department,Leave Approvers,Acha vibali
 DocType: Sales Partner,Dealer,Muzaji
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Uchunguzi
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Angalia upatikanaji
 DocType: Job Applicant,Job Applicant,Mwombaji wa Ayubu
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Hii inategemea mashirikiano dhidi ya Wasambazaji huu. Tazama kalenda ya chini kwa maelezo zaidi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Kisheria
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Kodi halisi ya aina haiwezi kuingizwa katika kiwango cha kipengee kwenye mstari {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Kisheria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Kodi halisi ya aina haiwezi kuingizwa katika kiwango cha kipengee kwenye mstari {0}
 DocType: Bank Guarantee,Customer,Wateja
 DocType: Purchase Receipt Item,Required By,Inahitajika
 DocType: Delivery Note,Return Against Delivery Note,Kurudi dhidi ya Kumbuka utoaji
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Akaunti ya benki haiwezi kuitwa jina la {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Viongozi (au makundi) ambayo Maingilio ya Uhasibu hufanywa na mizani huhifadhiwa.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Bora kwa {0} haiwezi kuwa chini ya sifuri ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Hakuna Slips za Mshahara zilizosajiliwa.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Hakuna Slips za Mshahara zilizosajiliwa.
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Acha Jina Aina
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Onyesha wazi
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ni muhimu kuchukua hatua hii leo yenyewe kwa mara kwa mara iliyotajwa hapo juu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Mfululizo umehifadhiwa kwa ufanisi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Angalia
 DocType: Pricing Rule,Apply On,Tumia Ombi
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Mawasiliano Yote ya Wasambazaji
 DocType: Support Settings,Support Settings,Mipangilio ya Kusaidia
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Tarehe ya Mwisho Inayotarajiwa haiwezi kuwa chini ya Tarehe ya Mwanzo Iliyotarajiwa
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kiwango lazima kiwe sawa na {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Maombi Mpya ya Kuacha
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kiwango lazima kiwe sawa na {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Kipengee cha Muhtasari wa Kipengee Hali
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Rasimu ya Benki
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Rasimu ya Benki
 DocType: Membership,membership validaty section,uanachama wa validaty sehemu
 DocType: Mode of Payment Account,Mode of Payment Account,Akaunti ya Akaunti ya Malipo
 DocType: Consultation,Consultation,Ushauri
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Nyenzo
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Kufanya tovuti
 DocType: Opening Invoice Creation Tool Item,Quantity,Wingi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Jedwali la Akaunti hawezi kuwa tupu.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Mikopo (Madeni)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Jedwali la Akaunti hawezi kuwa tupu.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Mikopo (Madeni)
 DocType: Employee Education,Year of Passing,Mwaka wa Kupitisha
 DocType: Item,Country of Origin,Nchi ya asili
 DocType: Soil Texture,Soil Texture Criteria,Vigezo vya Maandishi ya Udongo
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Maelezo ya Mawasiliano ya Msingi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Masuala ya Fungua
 DocType: Production Plan Item,Production Plan Item,Kipengee cha Mpango wa Uzalishaji
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Mtumiaji {0} tayari amepewa Wafanyakazi {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Mtumiaji {0} tayari amepewa Wafanyakazi {1}
 DocType: Lab Test Groups,Add new line,Ongeza mstari mpya
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Huduma ya afya
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kuchelewa kwa malipo (Siku)
@@ -89,7 +85,7 @@
 ,Delay Days,Siku za kuchelewa
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gharama za Huduma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Invoice
+DocType: Subscription Invoice,Invoice,Invoice
 DocType: Purchase Invoice Item,Item Weight Details,Kipengee Maelezo ya Uzito
 DocType: Asset Maintenance Log,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Mwaka wa Fedha {0} inahitajika
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} hailingani na {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kiasi cha jumla ya gharama
 DocType: Delivery Note,Vehicle No,Hakuna Gari
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Tafadhali chagua Orodha ya Bei
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Kazi inaendelea
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Tafadhali chagua tarehe
 DocType: Daily Work Summary Group,Holiday List,Orodha ya likizo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Mhasibu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Mhasibu
 DocType: Hub Settings,Selling Price List,Orodha ya Bei ya Kuuza
 DocType: Patient,Tobacco Current Use,Tabibu Matumizi ya Sasa
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Kiwango cha Mauzo
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Kiwango cha Mauzo
 DocType: Cost Center,Stock User,Mtumiaji wa hisa
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,No Simu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Mpya {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Arifa ya awali ya barua pepe iliyotumwa
 ,Sales Partners Commission,Tume ya Washirika wa Mauzo
 DocType: Soil Texture,Sandy Clay Loam,Mchanga wa Clay Mchanga
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Thamani Baada ya kushuka kwa thamani
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Kuhusiana
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Tarehe ya kuhudhuria haiwezi kuwa chini ya tarehe ya kujiunga na mfanyakazi
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Tarehe ya kuhudhuria haiwezi kuwa chini ya tarehe ya kujiunga na mfanyakazi
 DocType: Grading Scale,Grading Scale Name,Kuweka Jina la Scale
-DocType: Subscription,Repeat on Day,Rudia Siku
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Hii ni akaunti ya mizizi na haiwezi kuhaririwa.
 DocType: Sales Invoice,Company Address,Anwani ya Kampuni
 DocType: BOM,Operations,Uendeshaji
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Haiwezi kuweka idhini kulingana na Punguzo la {0}
+DocType: Subscription,Subscription Start Date,Tarehe ya Kuanza ya Usajili
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Weka faili ya .csv na nguzo mbili, moja kwa jina la zamani na moja kwa jina jipya"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} sio mwaka wowote wa Fedha.
 DocType: Packed Item,Parent Detail docname,Jina la jina la Mzazi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rejea: {0}, Msimbo wa Item: {1} na Wateja: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Tarehe ya mwisho ya kipindi cha majaribio Haiwezi kuwa kabla ya Tarehe ya Kuanza ya Kipindi
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kilo
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Kufungua kwa Kazi.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM haijainishwa kwa kipengee cha kutenganisha {0} katika mfululizo {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Kampuni sawa imeingia zaidi ya mara moja
 DocType: Patient,Married,Ndoa
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Hairuhusiwi kwa {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pata vitu kutoka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Pata vitu kutoka
 DocType: Price List,Price Not UOM Dependant,Bei Si UOM Inategemea
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Hifadhi haiwezi kurekebishwa dhidi ya Kumbuka Utoaji {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Bidhaa {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Mafuta ya Brake
 DocType: Tax Rule,Tax Type,Aina ya Kodi
 ,Completed Work Orders,Maagizo ya Kazi Iliyokamilishwa
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Kiwango cha Ushuru
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Kiwango cha Ushuru
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Huna mamlaka ya kuongeza au kusasisha safu kabla ya {0}
 DocType: BOM,Item Image (if not slideshow),Image Image (kama si slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kiwango cha Saa / 60) * Muda halisi wa Uendeshaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Madai ya Madai au Ingia ya Jarida
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Chagua BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Madai ya Madai au Ingia ya Jarida
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Chagua BOM
 DocType: SMS Log,SMS Log,Ingia ya SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Gharama ya Vitu Vilivyotolewa
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Dhibiti kiasi cha mapema kilichopewa Waajiriwa
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Arifa ya utoaji
 DocType: Journal Entry,Opening Entry,Kuingia Uingiaji
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Malipo ya Akaunti tu
-DocType: Employee Loan,Repay Over Number of Periods,Rejesha Zaidi ya Kipindi cha Kipindi
+DocType: Loan,Repay Over Number of Periods,Rejesha Zaidi ya Kipindi cha Kipindi
 DocType: Stock Entry,Additional Costs,Gharama za ziada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Akaunti na shughuli zilizopo haziwezi kubadilishwa kuwa kikundi.
 DocType: Lead,Product Enquiry,Utafutaji wa Bidhaa
 DocType: Education Settings,Validate Batch for Students in Student Group,Thibitisha Batch kwa Wanafunzi katika Kikundi cha Wanafunzi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Hakuna rekodi ya kuondoka iliyopatikana kwa mfanyakazi {0} kwa {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Hakuna rekodi ya kuondoka iliyopatikana kwa mfanyakazi {0} kwa {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Tafadhali ingiza kampuni kwanza
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Tafadhali chagua Kampuni kwanza
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Tafadhali chagua Kampuni kwanza
 DocType: Employee Education,Under Graduate,Chini ya Uhitimu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Tafadhali weka template default kwa Taarifa ya Hali ya Kuacha katika Mipangilio ya HR.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Gharama ya jumla
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Mkopo wa Wafanyakazi
 DocType: Fee Schedule,Send Payment Request Email,Tuma Email Request Request
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Item {0} haipo katika mfumo au imeisha muda
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Imefanikiwa bila usajili.
 DocType: Assessment Result,Grade,Daraja
 DocType: Restaurant Table,No of Seats,Hakuna Viti
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Ili kuongeza somo la nguvu, tumia tags za jinja kama <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Iliyotolewa na Wafanyabiashara
 DocType: Asset Maintenance Task,Asset Maintenance Task,Kazi ya Matengenezo ya Mali
 DocType: SMS Center,All Contact,Mawasiliano yote
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Mshahara wa Kila mwaka
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Mshahara wa Kila mwaka
 DocType: Daily Work Summary,Daily Work Summary,Muhtasari wa Kazi ya Kila siku
 DocType: Period Closing Voucher,Closing Fiscal Year,Kufunga Mwaka wa Fedha
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} imehifadhiwa
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Tafadhali chagua Kampuni iliyopo kwa kuunda Chati ya Akaunti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Gharama za Hifadhi
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Tafadhali chagua Kampuni iliyopo kwa kuunda Chati ya Akaunti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Gharama za Hifadhi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Chagua Ghala la Target
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Tafadhali ingiza barua pepe ya Mawasiliano ya Preferred
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Tafadhali ingiza barua pepe ya Mawasiliano ya Preferred
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Uingizaji wa Contra
 DocType: Journal Entry Account,Credit in Company Currency,Mikopo katika Kampuni ya Fedha
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Anwani ya Msingi
 DocType: Production Plan,Material Request Detail,Maelezo ya Maelezo ya Nyenzo
 DocType: Selling Settings,Default Quotation Validity Days,Siku za Uthibitishaji wa Nukuu za Default
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Ili ni pamoja na kodi katika mstari {0} katika kiwango cha kipengee, kodi katika safu {1} lazima pia ziingizwe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Ili ni pamoja na kodi katika mstari {0} katika kiwango cha kipengee, kodi katika safu {1} lazima pia ziingizwe"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Mipangilio ya Moduli ya HR
 DocType: SMS Center,SMS Center,Kituo cha SMS
 DocType: Sales Invoice,Change Amount,Badilisha kiasi
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Makundi ya leseni ya kuendesha gari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Tafadhali ingiza tarehe ya utoaji
 DocType: Depreciation Schedule,Make Depreciation Entry,Fanya kuingia kwa kushuka kwa thamani
+DocType: HR Settings,Leave Settings,Acha Mipangilio
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Aina ya Ombi
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Fanya Waajiriwa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Matangazo
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Mipangilio ya POS (Online / Offline)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Inalemaza uumbaji wa kumbukumbu za wakati dhidi ya Maagizo ya Kazi. Uendeshaji hautafuatiwa dhidi ya Kazi ya Kazi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Utekelezaji
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Utekelezaji
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Maelezo ya shughuli zilizofanywa.
 DocType: Asset Maintenance Log,Maintenance Status,Hali ya Matengenezo
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Maelezo ya Uanachama
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Muuzaji inahitajika dhidi ya akaunti inayolipwa {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Vitu na bei
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Masaa yote: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Kutoka Tarehe lazima iwe ndani ya Mwaka wa Fedha. Kutokana na Tarehe = {0}
 DocType: Drug Prescription,Interval,Muda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Upendeleo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Upendeleo
 DocType: Grant Application,Individual,Kila mtu
 DocType: Academic Term,Academics User,Mwanafunzi wa Wasomi
 DocType: Cheque Print Template,Amount In Figure,Kiasi Kielelezo
-DocType: Employee Loan Application,Loan Info,Info Loan
+DocType: Loan Application,Loan Info,Info Loan
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Mpango wa ziara za matengenezo.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Kipindi cha Scorecard Kipindi
 DocType: Share Transfer,Share Transfer,Shiriki Uhamisho
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Kigezo cha Kigezo
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochemistry
 DocType: Job Offer,Select Terms and Conditions,Chagua Masharti na Masharti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Thamani ya nje
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Thamani ya nje
 DocType: Woocommerce Settings,Woocommerce Settings,Mipangilio ya Woocommerce
 DocType: Production Plan,Sales Orders,Maagizo ya Mauzo
 DocType: Purchase Taxes and Charges,Valuation,Vigezo
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Eneo la Default
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisheni
 DocType: Work Order Operation,Updated via 'Time Log',Imesasishwa kupitia &#39;Ingia ya Muda&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Kiasi cha juu hawezi kuwa kikubwa kuliko {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Chagua mteja au muuzaji.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Kiasi cha juu hawezi kuwa kikubwa kuliko {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Orodha ya Mfululizo kwa Shughuli hii
 DocType: Company,Enable Perpetual Inventory,Wezesha Mali ya daima
+DocType: Bank Guarantee,Charges Incurred,Malipo yaliyoingizwa
 DocType: Company,Default Payroll Payable Account,Akaunti ya malipo ya malipo ya malipo
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Sasisha Kikundi cha Barua pepe
 DocType: Sales Invoice,Is Opening Entry,"Je, unafungua kuingia"
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Matokeo ya Desturi
 DocType: Delivery Stop,Contact Name,Jina la Mawasiliano
 DocType: Course Assessment Criteria,Course Assessment Criteria,Vigezo vya Tathmini ya Kozi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Id ya kodi:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Id ya kodi:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Kitambulisho cha Mwanafunzi:
 DocType: POS Customer Group,POS Customer Group,Kundi la Wateja wa POS
 DocType: Land Unit,Land Unit describing various land assets,Kitengo cha Ardhi kuelezea mali mbalimbali za ardhi
@@ -374,9 +371,8 @@
 ,Open Work Orders,Omba Kazi za Kazi
 DocType: Payment Term,Credit Months,Miezi ya Mikopo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Pay haiwezi kuwa chini ya 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Ili kuacha kutuma arifa za kurudia hitilafu kutoka kwa mfumo, tumeangalia shamba la Walemavu katika usajili"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Tarehe ya Kuondoa lazima iwe kubwa kuliko Tarehe ya kujiunga
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Majani kwa mwaka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Tarehe ya Kuondoa lazima iwe kubwa kuliko Tarehe ya kujiunga
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Majani kwa mwaka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Tafadhali angalia &#39;Je, Advance&#39; dhidi ya Akaunti {1} ikiwa hii ni kuingia mapema."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Ghala {0} sio wa kampuni {1}
 DocType: Email Digest,Profit & Loss,Faida &amp; Kupoteza
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kiwango cha jumla cha gharama (kupitia Karatasi ya Muda)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Tafadhali kuanzisha Wanafunzi chini ya Vikundi vya Wanafunzi
 DocType: Item Website Specification,Item Website Specification,Ufafanuzi wa Tovuti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Acha Kuzuiwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Kipengee {0} kilifikia mwisho wa maisha kwa {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Entries ya Benki
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Acha Kuzuiwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Kipengee {0} kilifikia mwisho wa maisha kwa {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Entries ya Benki
 DocType: Crop,Annual,Kila mwaka
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Toleo la Upatanisho wa hisa
 DocType: Stock Entry,Sales Invoice No,Nambari ya ankara ya mauzo
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kozi ya Uumbaji wa Wanafunzi wa Wanafunzi
 DocType: Lead,Do Not Contact,Usiwasiliane
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Watu ambao hufundisha katika shirika lako
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Msanidi Programu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Msanidi Programu
 DocType: Item,Minimum Order Qty,Kiwango cha chini cha Uchina
 DocType: Pricing Rule,Supplier Type,Aina ya Wasambazaji
 DocType: Course Scheduling Tool,Course Start Date,Tarehe ya Kuanza Kozi
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Chapisha katika Hub
 DocType: Student Admission,Student Admission,Uingizaji wa Wanafunzi
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Kipengee {0} kimefutwa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Ombi la Nyenzo
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Kipengee {0} kimefutwa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Ombi la Nyenzo
 DocType: Bank Reconciliation,Update Clearance Date,Sasisha tarehe ya kufuta
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Maelezo ya Ununuzi
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Daraja la Max
 DocType: Email Digest,New Quotations,Nukuu mpya
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Mipango ya mishahara ya barua pepe kwa mfanyakazi kulingana na barua pepe iliyopendekezwa iliyochaguliwa katika Mfanyakazi
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Msaidizi wa kwanza wa Kuondoka kwenye orodha utawekwa kama Msaidizi wa Kuacha wa Kuacha
 DocType: Tax Rule,Shipping County,Kata ya Meli
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Jifunze
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Jifunze
 DocType: Asset,Next Depreciation Date,Tarehe ya Uzito ya pili
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Shughuli ya Gharama kwa Wafanyakazi
 DocType: Accounts Settings,Settings for Accounts,Mipangilio ya Akaunti
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheki Bora na Deposits ili kufuta
 DocType: Item,Synced With Hub,Ilifananishwa na Hub
 DocType: Driver,Fleet Manager,Meneja wa Fleet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} haiwezi kuwa hasi kwa kipengee {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} haiwezi kuwa hasi kwa kipengee {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Nywila isiyo sahihi
 DocType: Item,Variant Of,Tofauti Ya
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Uchina uliokamilika hauwezi kuwa mkubwa kuliko &#39;Uchina kwa Utengenezaji&#39;
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Tafadhali weka Kiwango cha Chumba cha Hoteli kwenye {}
 DocType: Journal Entry,Multi Currency,Fedha nyingi
 DocType: Opening Invoice Creation Tool,Invoice Type,Aina ya ankara
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Kumbuka Utoaji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Kumbuka Utoaji
 DocType: Consultation,Encounter Impression,Kukutana na Mchapishaji
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Kuweka Kodi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Gharama ya Malipo ya Kuuza
@@ -501,11 +496,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Jina la waajiriwa (kwa mfano Mkurugenzi Mtendaji, Mkurugenzi nk)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kiwango ambacho Fedha ya Wateja inabadilishwa kwa sarafu ya msingi ya wateja
 DocType: Course Scheduling Tool,Course Scheduling Tool,Chombo cha Mpangilio wa Kozi
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invoice ya Ununuzi haiwezi kufanywa dhidi ya mali iliyopo {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,Hitilafu [ya haraka] wakati wa kujenga% s mara kwa mara kwa% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invoice ya Ununuzi haiwezi kufanywa dhidi ya mali iliyopo {1}
 DocType: Land Unit,LInked Analysis,Uchunguzi LInked
 DocType: Item Tax,Tax Rate,Kiwango cha Kodi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Kipindi cha maombi haiwezi kuwa rekodi mbili za ugawaji
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Kipindi cha maombi haiwezi kuwa rekodi mbili za ugawaji
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} tayari imetengwa kwa Mfanyakazi {1} kwa muda {2} hadi {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Invozi ya Ununuzi {0} imewasilishwa tayari
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Kundi Hakuna lazima iwe sawa na {1} {2}
@@ -519,7 +513,7 @@
 DocType: Purchase Order,% Received,Imepokea
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Unda Vikundi vya Wanafunzi
 DocType: Volunteer,Weekends,Mwishoni mwa wiki
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kiwango cha Kumbuka Mikopo
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kiwango cha Kumbuka Mikopo
 DocType: Setup Progress Action,Action Document,Kitambulisho cha Hatua
 DocType: Chapter Member,Website URL,URL ya Tovuti
 ,Finished Goods,Bidhaa zilizokamilishwa
@@ -533,6 +527,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ongeza Vitu
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kipimo cha Ubora wa Bidhaa
+DocType: Leave Application,Leave Approver Name,Acha Jina la Msaidizi
 DocType: Depreciation Schedule,Schedule Date,Tarehe ya Ratiba
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Mapato, Deductions na vipengele vingine vya Mshahara"
 DocType: Packed Item,Packed Item,Kipengee cha Ufungashaji
@@ -549,7 +544,7 @@
 DocType: Request for Quotation,Request for Quotation,Ombi la Nukuu
 DocType: Healthcare Settings,Require Lab Test Approval,Inahitaji idhini ya Mtihani wa Lab
 DocType: Salary Slip Timesheet,Working Hours,Saa za kazi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Jumla ya Kipaumbele
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Jumla ya Kipaumbele
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Badilisha idadi ya mwanzo / ya sasa ya mlolongo wa mfululizo uliopo.
 DocType: Dosage Strength,Strength,Nguvu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Unda Wateja wapya
@@ -562,7 +557,7 @@
 DocType: Workstation,Consumable Cost,Gharama zinazoweza kutumika
 DocType: Purchase Receipt,Vehicle Date,Tarehe ya Gari
 DocType: Student Log,Medical,Matibabu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Sababu ya kupoteza
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Sababu ya kupoteza
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Sasisha Nambari ya Akaunti
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Mmiliki wa kiongozi hawezi kuwa sawa na Kiongozi
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Kiwango kilichowekwa hawezi kuwa kikubwa zaidi kuliko kiasi ambacho haijasimamiwa
@@ -572,11 +567,10 @@
 DocType: Lab Test Template,Single,Mmoja
 DocType: Salary Slip,Total Loan Repayment,Ulipaji wa Mkopo wa Jumla
 DocType: Account,Cost of Goods Sold,Gharama ya bidhaa zilizouzwa
-DocType: Subscription,Yearly,Kila mwaka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Tafadhali ingiza Kituo cha Gharama
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Tafadhali ingiza Kituo cha Gharama
 DocType: Drug Prescription,Dosage,Kipimo
 DocType: Journal Entry Account,Sales Order,Uagizaji wa Mauzo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Mg. Kiwango cha Mauzo
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Mg. Kiwango cha Mauzo
 DocType: Assessment Plan,Examiner Name,Jina la Mchunguzi
 DocType: Lab Test Template,No Result,Hakuna Matokeo
 DocType: Purchase Invoice Item,Quantity and Rate,Wingi na Kiwango
@@ -585,6 +579,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Tafadhali ingiza jina la kampuni kwanza
 DocType: Purchase Invoice,Supplier Name,Jina la wauzaji
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Soma Mwongozo wa ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Onyesha Majani ya Wajumbe Wote wa Idara Katika Kalenda
 DocType: Purchase Invoice,01-Sales Return,Kurudi kwa Mauzo ya 01
 DocType: Account,Is Group,Ni Kikundi
 DocType: Email Digest,Pending Purchase Orders,Maagizo ya Ununuzi yaliyotarajiwa
@@ -601,13 +596,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Sehemu ya lazima - Mwaka wa Elimu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} haihusiani na {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Customize maandishi ya utangulizi ambayo huenda kama sehemu ya barua pepe hiyo. Kila shughuli ina maandishi tofauti ya utangulizi.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Tafadhali weka akaunti ya malipo yenye malipo ya kampuni {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Tafadhali weka akaunti ya malipo yenye malipo ya kampuni {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Shughuli haziruhusiwi dhidi ya kusimamishwa Kazi ya Kazi {0}
 DocType: Setup Progress Action,Min Doc Count,Hesabu ya Kidogo
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Mipangilio ya Global kwa mchakato wa utengenezaji wote.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaunti Yamehifadhiwa Upto
 DocType: SMS Log,Sent On,Imepelekwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Ishara {0} imechaguliwa mara nyingi kwenye Jedwali la Attributes
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Ishara {0} imechaguliwa mara nyingi kwenye Jedwali la Attributes
 DocType: HR Settings,Employee record is created using selected field. ,Rekodi ya wafanyakazi ni kuundwa kwa kutumia shamba iliyochaguliwa.
 DocType: Sales Order,Not Applicable,Siofaa
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Likizo ya bwana.
@@ -630,8 +625,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Imehifadhiwa kwa ajili ya kuuza
 DocType: Packing Slip,From Package No.,Kutoka kwa pakiti No.
 DocType: Item Attribute,To Range,Kupanga
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Usalama na Deposits
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Haiwezi kubadilisha njia ya hesabu, kwa kuwa kuna shughuli dhidi ya vitu vingine ambavyo hazina njia ya hesabu"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Usalama na Deposits
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Haiwezi kubadilisha njia ya hesabu, kwa kuwa kuna shughuli dhidi ya vitu vingine ambavyo hazina njia ya hesabu"
 DocType: Student Report Generation Tool,Attended by Parents,Kuhudhuria na Wazazi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Majani yote yaliyotengwa ni lazima
 DocType: Patient,AB Positive,AB Chanya
@@ -640,7 +635,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Kuhudhuria rekodi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Kipengele cha Mshahara kwa malipo ya nyakati ya maraheet.
 DocType: Sales Order Item,Used for Production Plan,Kutumika kwa Mpango wa Uzalishaji
-DocType: Employee Loan,Total Payment,Malipo ya Jumla
+DocType: Loan,Total Payment,Malipo ya Jumla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Haiwezi kufuta manunuzi ya Amri ya Kazi Iliyokamilishwa.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Muda Kati ya Uendeshaji (kwa muda mfupi)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} imefutwa ili hatua haiwezi kukamilika
@@ -656,15 +651,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Andika orodha ya wateja wako wachache. Wanaweza kuwa mashirika au watu binafsi.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Vipande vyenye Kujenga
 DocType: POS Profile User,POS Profile User,Mtumiaji wa Programu ya POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Mapato ya moja kwa moja
+DocType: Subscription Invoice,Subscription Invoice,Invoice ya Usajili
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Mapato ya moja kwa moja
 DocType: Patient Appointment,Date TIme,Tarehe TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Haiwezi kuchuja kulingana na Akaunti, ikiwa imewekwa na Akaunti"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Afisa wa Usimamizi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Afisa wa Usimamizi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kuanzisha kampuni na kodi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Tafadhali chagua kozi
 DocType: Codification Table,Codification Table,Jedwali la Ushauri
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Tafadhali chagua Kampuni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Tafadhali chagua Kampuni
 DocType: Stock Entry Detail,Difference Account,Akaunti ya Tofauti
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN wa Wasambazaji
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Haiwezi kufunga kazi kama kazi yake ya kutegemea {0} haijafungwa.
@@ -689,6 +685,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Kigezo cha Ramani ya Mapato ya Fedha
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial hakuna bidhaa haiwezi kuwa sehemu
 DocType: Journal Entry,Difference (Dr - Cr),Tofauti (Dr - Cr)
+DocType: Bank Guarantee,Providing,Kutoa
 DocType: Account,Profit and Loss,Faida na Kupoteza
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Hairuhusiwi, sanidi Kigezo cha Mtihani wa Lab kama inavyohitajika"
 DocType: Patient,Risk Factors,Mambo ya Hatari
@@ -720,7 +717,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Nambari ya ankara ya wasambazaji
 DocType: Territory,For reference,Kwa kumbukumbu
 DocType: Healthcare Settings,Appointment Confirmation,Uthibitisho wa Uteuzi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Haiwezi kufuta Serial No {0}, kama inatumiwa katika ushirikiano wa hisa"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Haiwezi kufuta Serial No {0}, kama inatumiwa katika ushirikiano wa hisa"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Kufungwa (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Sawa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Hoja Item
@@ -745,11 +742,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Tayari kuweka default katika profile posho {0} kwa mtumiaji {1}, kwa uzima imefungwa kuwa default"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Mwaka wa fedha / uhasibu.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Maadili yaliyokusanywa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Samahani, Serial Nos haiwezi kuunganishwa"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Samahani, Serial Nos haiwezi kuunganishwa"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory Inahitajika katika POS Profile
 DocType: Supplier,Prevent RFQs,Zuia RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Fanya Mauzo ya Mauzo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Slip ya Mshahara imewasilishwa kwa kipindi cha {0} hadi {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Slip ya Mshahara imewasilishwa kwa kipindi cha {0} hadi {1}
 DocType: Project Task,Project Task,Kazi ya Mradi
 ,Lead Id,Weka Id
 DocType: C-Form Invoice Detail,Grand Total,Jumla ya Jumla
@@ -770,8 +767,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Tarehe ya Bendera ya Utoaji
 DocType: Production Plan,Production Plan,Mpango wa Uzalishaji
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Kufungua Chombo cha Uumbaji wa Invoice
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Kurudi kwa Mauzo
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Kurudi kwa Mauzo
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Kumbuka: Majani yote yaliyotengwa {0} hayapaswi kuwa chini ya majani yaliyoidhinishwa tayari {1} kwa muda
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Weka Uchina katika Shughuli kulingana na Serial No Input
 ,Total Stock Summary,Jumla ya muhtasari wa hisa
 DocType: Announcement,Posted By,Imewekwa By
 DocType: Item,Delivered by Supplier (Drop Ship),Imetolewa na Wafanyabiashara (Drop Ship)
@@ -782,15 +780,15 @@
 DocType: Quotation,Quotation To,Nukuu Kwa
 DocType: Lead,Middle Income,Mapato ya Kati
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Kufungua (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Kipengee cha Kupima kwa Kipengee cha Bidhaa {0} hawezi kubadilishwa moja kwa moja kwa sababu tayari umefanya shughuli au UOM mwingine. Utahitaji kujenga kipengee kipya cha kutumia UOM tofauti ya UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Kipengee cha Kupima kwa Kipengee cha Bidhaa {0} hawezi kubadilishwa moja kwa moja kwa sababu tayari umefanya shughuli au UOM mwingine. Utahitaji kujenga kipengee kipya cha kutumia UOM tofauti ya UOM.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Kiwango kilichowekwa hawezi kuwa hasi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Tafadhali weka Kampuni
 DocType: Share Balance,Share Balance,Shiriki Mizani
 DocType: Purchase Order Item,Billed Amt,Alilipwa Amt
 DocType: Training Result Employee,Training Result Employee,Matokeo ya Mafunzo ya Mfanyakazi
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ghala la mantiki ambalo vituo vya hisa vinafanywa.
-DocType: Repayment Schedule,Principal Amount,Kiasi kikubwa
-DocType: Employee Loan Application,Total Payable Interest,Jumla ya Maslahi ya kulipa
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Kiasi kikubwa
+DocType: Loan Application,Total Payable Interest,Jumla ya Maslahi ya kulipa
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Jumla ya Kipaumbele: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Timesheet ya Mauzo ya Mauzo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Tarehe ya Kumbukumbu na Kitabu cha Marejeo inahitajika kwa {0}
@@ -799,10 +797,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Unda kumbukumbu za Wafanyakazi kusimamia majani, madai ya gharama na malipo"
 DocType: Restaurant Reservation,Restaurant Reservation,Uhifadhi wa Mkahawa
 DocType: Land Unit,Land Unit Name,Jina la Kitengo cha Ardhi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Kuandika Proposal
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Kuandika Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Utoaji wa Kuingia kwa Malipo
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Kufunga juu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Wajulishe Wateja kupitia Barua pepe
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Wajulishe Wateja kupitia Barua pepe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Mtu mwingine wa Mauzo {0} yupo na id idumu ya mfanyakazi
 DocType: Employee Advance,Claimed Amount,Kiasi kilichodaiwa
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -820,13 +818,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Akaunti ya Gateway ya Malipo haijatengenezwa, tafadhali ingiza moja kwa moja."
 DocType: Supplier Scorecard,Per Year,Kwa mwaka
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Haikubaliki kuingia kwenye programu hii kama DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
 DocType: Sales Invoice,Sales Taxes and Charges,Malipo ya Kodi na Malipo
 DocType: Employee,Organization Profile,Profaili ya Shirika
 DocType: Vital Signs,Height (In Meter),Urefu (Katika mita)
 DocType: Student,Sibling Details,Maelezo ya Kikabila
 DocType: Vehicle Service,Vehicle Service,Huduma ya Gari
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Inatoa moja kwa moja ombi la maoni kulingana na hali.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Inatoa moja kwa moja ombi la maoni kulingana na hali.
 DocType: Employee,Reason for Resignation,Sababu ya Kuondolewa
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Kigezo cha tathmini za utendaji.
 DocType: Sales Invoice,Credit Note Issued,Maelezo ya Mikopo imeondolewa
@@ -841,10 +838,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Ratiba ya Matengenezo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Kisha Kanuni za Bei zinachaguliwa kwa kuzingatia Wateja, Kikundi cha Wateja, Wilaya, Wasambazaji, Aina ya Wafanyabiashara, Kampeni, Mshiriki wa Mauzo nk."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Mabadiliko ya Net katika Mali
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Usimamizi wa Mikopo ya Waajiriwa
 DocType: Employee,Passport Number,Nambari ya Pasipoti
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Uhusiano na Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Meneja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Meneja
 DocType: Payment Entry,Payment From / To,Malipo Kutoka / Kwa
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Mpaka mpya wa mkopo ni chini ya kiasi cha sasa cha sasa kwa wateja. Kizuizi cha mkopo kinapaswa kuwa kikubwa {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Tafadhali weka akaunti katika Warehouse {0}
@@ -886,23 +882,23 @@
 DocType: Item,Material Transfer,Uhamisho wa Nyenzo
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Haikuweza kupata njia
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Ufunguzi (Dk)
+DocType: Loan,Applicant,Mwombaji
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kutuma timestamp lazima iwe baada ya {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Kufanya nyaraka za mara kwa mara
 ,GST Itemised Purchase Register,GST Kujiandikisha Ununuzi wa Item
 DocType: Course Scheduling Tool,Reschedule,Rekebisha
-DocType: Employee Loan,Total Interest Payable,Jumla ya Maslahi ya Kulipa
+DocType: Loan,Total Interest Payable,Jumla ya Maslahi ya Kulipa
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Malipo ya Gharama na Malipo
 DocType: Work Order Operation,Actual Start Time,Muda wa Kuanza
 DocType: BOM Operation,Operation Time,Muda wa Uendeshaji
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Kumaliza
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Msingi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Msingi
 DocType: Timesheet,Total Billed Hours,Masaa Yote yaliyolipwa
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Andika Kiasi
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Andika Kiasi
 DocType: Leave Block List Allow,Allow User,Ruhusu Mtumiaji
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaunti ya Kupoteza / Kupoteza juu ya Upunguzaji wa Mali
 DocType: Vehicle Log,Service Details,Maelezo ya Huduma
-DocType: Subscription,Quarterly,Jumatatu
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,AndikaLib
 DocType: Lab Test Template,Grouped,Yameunganishwa
 DocType: Selling Settings,Delivery Note Required,Kumbuka Utoaji Inahitajika
@@ -913,7 +909,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Karatasi ya Muda
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Vipande vya Raw vya Backflush Kulingana na
 DocType: Sales Invoice,Port Code,Kanuni ya Bandari
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Ghala la Hifadhi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Ghala la Hifadhi
 DocType: Lead,Lead is an Organization,Kiongozi ni Shirika
 DocType: Guardian Interest,Interest,Hamu
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Mauzo ya awali
@@ -925,12 +921,12 @@
 DocType: Account,Accounts,Akaunti
 DocType: Vehicle,Odometer Value (Last),Thamani ya Odometer (Mwisho)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Matukio ya vigezo vya scorecard ya wasambazaji.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Masoko
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Masoko
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Kuingia kwa Malipo tayari kuundwa
 DocType: Request for Quotation,Get Suppliers,Pata Wauzaji
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock sasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Mstari # {0}: Malipo {1} haihusishwa na Item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Angalia Slip ya Mshahara
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Mstari # {0}: Malipo {1} haihusishwa na Item {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Angalia Slip ya Mshahara
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akaunti {0} imeingizwa mara nyingi
 DocType: Account,Expenses Included In Valuation,Malipo Pamoja na Valuation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Unaweza tu upya kama wanachama wako muda wake ndani ya siku 30
@@ -940,7 +936,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Chagua tu ikiwa umeweka hati za Mapato ya Mapato ya Fedha
 DocType: Email Digest,Next email will be sent on:,Imefuata barua pepe itatumwa kwenye:
 DocType: Supplier Scorecard,Per Week,Kila wiki
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Item ina tofauti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Item ina tofauti.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jumla ya Mwanafunzi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Kipengee {0} haipatikani
 DocType: Bin,Stock Value,Thamani ya Hifadhi
@@ -961,9 +957,9 @@
 ,Fichier des Ecritures Comptables [FEC],Faili la Maandiko ya Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kuingia Kadi ya Mikopo
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kampuni na Akaunti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Kwa Thamani
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Kwa Thamani
 DocType: Asset Settings,Depreciation Options,Chaguzi za uchafuzi
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Muda usio sahihi wa Kuchapa
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Muda usio sahihi wa Kuchapa
 DocType: Lead,Campaign Name,Jina la Kampeni
 DocType: Hotel Room,Capacity,Uwezo
 DocType: Selling Settings,Close Opportunity After Days,Fungua Fursa Baada ya Siku
@@ -988,7 +984,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Nambari ya Ununuzi wa Wateja No
 DocType: Budget,Budget Against,Bajeti ya Dhidi
 DocType: Employee,Cell Number,Nambari ya Kiini
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Hakuna mfanyakazi kwa vigezo vinavyopewa. Angalia kwamba Slips za Mshahara bado haijaundwa.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Hakuna mfanyakazi kwa vigezo vinavyopewa. Angalia kwamba Slips za Mshahara bado haijaundwa.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Maombi ya Nyenzo za Auto yanayotokana
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Potea
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Huwezi kuingia hati ya sasa katika safu ya &#39;Against Journal Entry&#39;
@@ -1000,15 +996,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Tafadhali chagua meza
 DocType: BOM,Website Specifications,Ufafanuzi wa tovuti
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ni anwani ya barua pepe batili katika &#39;Wapokeaji&#39;
 DocType: Special Test Items,Particulars,Maelezo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Kutoka {0} ya aina {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Kutoka {0} ya aina {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Kiini cha Kubadilisha ni lazima
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Sheria nyingi za Bei zipo na vigezo sawa, tafadhali tatua mgogoro kwa kuwapa kipaumbele. Kanuni za Bei: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Haiwezi kuzima au kufuta BOM kama inavyounganishwa na BOM nyingine
 DocType: Asset,Maintenance,Matengenezo
+DocType: Subscriber,Subscriber,Msajili
 DocType: Item Attribute Value,Item Attribute Value,Thamani ya Thamani ya Bidhaa
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Tafadhali sasisha Hali yako ya Mradi
 DocType: Item,Maximum sample quantity that can be retained,Upeo wa kiwango cha sampuli ambacho kinaweza kuhifadhiwa
@@ -1046,26 +1042,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Mipangilio ya mipangilio ya Kifaa cha Ununuzi
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Ongeza Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Mali yamepigwa kupitia Entri ya Journal {0}
-DocType: Employee Loan,Interest Income Account,Akaunti ya Mapato ya riba
+DocType: Loan,Interest Income Account,Akaunti ya Mapato ya riba
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Kagua Mwaliko uliotumwa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Bioteknolojia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Malipo ya Matengenezo ya Ofisi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Malipo ya Matengenezo ya Ofisi
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Enda kwa
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Kuweka Akaunti ya Barua pepe
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Tafadhali ingiza kipengee kwanza
 DocType: Asset Repair,Downtime,Downtime
 DocType: Account,Liability,Dhima
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kizuizi cha Hesabu haiwezi kuwa kikubwa kuliko Kiasi cha Madai katika Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kizuizi cha Hesabu haiwezi kuwa kikubwa kuliko Kiasi cha Madai katika Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Muda wa Elimu:
 DocType: Salary Detail,Do not include in total,Usijumuishe kwa jumla
 DocType: Company,Default Cost of Goods Sold Account,Akaunti ya Kuuza Gharama ya Bidhaa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Mfano wa wingi {0} hauwezi kuwa zaidi ya kupokea kiasi {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Orodha ya Bei haichaguliwa
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Orodha ya Bei haichaguliwa
 DocType: Employee,Family Background,Familia ya Background
 DocType: Request for Quotation Supplier,Send Email,Kutuma barua pepe
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Onyo: Sakilili batili {0}
 DocType: Item,Max Sample Quantity,Max Mfano Wingi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Hakuna Ruhusa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Hakuna Ruhusa
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Quote Iliombwa
 DocType: Vital Signs,Heart Rate / Pulse,Kiwango cha Moyo / Pulse
 DocType: Company,Default Bank Account,Akaunti ya Akaunti ya Default
@@ -1076,11 +1072,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Vitu vinavyo na uzito mkubwa vitaonyeshwa juu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Majaribio ya Lab na Ishara za Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Upatanisho wa Benki ya Ufafanuzi
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Row # {0}: Mali {1} lazima iwasilishwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Row # {0}: Mali {1} lazima iwasilishwa
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Hakuna mfanyakazi aliyepatikana
-DocType: Subscription,Stopped,Imesimamishwa
 DocType: Item,If subcontracted to a vendor,Ikiwa unatambuliwa kwa muuzaji
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Kundi la Wanafunzi tayari limehifadhiwa.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kundi la Wanafunzi tayari limehifadhiwa.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Mwisho wa Mradi.
 DocType: SMS Center,All Customer Contact,Mawasiliano ya Wateja wote
 DocType: Land Unit,Tree Details,Maelezo ya Miti
@@ -1130,7 +1125,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Weka Mahudhurio
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Vikundi vyote vya Item
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tuma ujumbe wa moja kwa moja kwenye uwasilishaji wa shughuli.
 DocType: Work Order,Item To Manufacture,Mchapishaji wa Utengenezaji
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} hali ni {2}
@@ -1144,7 +1138,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Pitia tena, ikiwa anwani iliyochaguliwa imebadilishwa baada ya kuokoa"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Tofauti ya kipengee {0} tayari ipo na sifa sawa
 DocType: Item,Hub Publishing Details,Maelezo ya Uchapishaji wa Hub
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Kufungua&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Kufungua&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Fungua Kufanya
 DocType: Notification Control,Delivery Note Message,Ujumbe wa Kumbuka Utoaji
 DocType: Lab Test Template,Result Format,Fomu ya matokeo
@@ -1154,7 +1148,7 @@
 DocType: Payroll Entry,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,Padha ya Breki
 DocType: Fertilizer,Fertilizer Contents,Mbolea Yaliyomo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Utafiti na Maendeleo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Utafiti na Maendeleo
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Kiasi cha Bill
 DocType: Company,Registration Details,Maelezo ya Usajili
 DocType: Timesheet,Total Billed Amount,Kiasi kilicholipwa
@@ -1168,7 +1162,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Kagua kikomo cha mkopo wa Udhibiti wa Mauzo
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Tathmini ya utendaji.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Kuwezesha &#39;Matumizi kwa Ununuzi wa Ununuzi&#39;, kama Kifaa cha Ununuzi kinawezeshwa na kuna lazima iwe na Kanuni moja ya Ushuru kwa Kundi la Ununuzi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Uingiaji wa Malipo {0} umeunganishwa dhidi ya Amri {1}, angalia ikiwa inapaswa kuvutwa kama mapema katika ankara hii."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Uingiaji wa Malipo {0} umeunganishwa dhidi ya Amri {1}, angalia ikiwa inapaswa kuvutwa kama mapema katika ankara hii."
 DocType: Sales Invoice Item,Stock Details,Maelezo ya hisa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Thamani ya Mradi
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Uhakika wa Kuuza
@@ -1202,7 +1196,7 @@
 DocType: Restaurant Table,Minimum Seating,Kukaa chini
 DocType: Item Attribute,Item Attribute Values,Kipengee cha sifa za Maadili
 DocType: Examination Result,Examination Result,Matokeo ya Uchunguzi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Receipt ya Ununuzi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Receipt ya Ununuzi
 ,Received Items To Be Billed,Vipokee Vipokee vya Kulipwa
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Kiwango cha ubadilishaji wa fedha.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Doctype ya Kumbukumbu lazima iwe moja ya {0}
@@ -1210,15 +1204,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Haiwezi kupata Muda wa Slot katika siku zifuatazo {0} kwa Uendeshaji {1}
 DocType: Work Order,Plan material for sub-assemblies,Panga nyenzo kwa makusanyiko ndogo
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Washirika wa Mauzo na Wilaya
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} lazima iwe hai
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Hakuna Vipengele vinavyopatikana kwa uhamisho
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} lazima iwe hai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Hakuna Vipengele vinavyopatikana kwa uhamisho
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Kufungwa (Kufungua + Jumla)
 DocType: Journal Entry,Depreciation Entry,Kuingia kwa kushuka kwa thamani
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Tafadhali chagua aina ya hati kwanza
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Futa Ziara Nyenzo {0} kabla ya kufuta Kutembelea Utunzaji huu
 DocType: Crop Cycle,ISO 8016 standard,Kiwango cha ISO 8016
 DocType: Pricing Rule,Rate or Discount,Kiwango au Punguzo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Hakuna {0} si ya Bidhaa {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Serial Hakuna {0} si ya Bidhaa {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Uliohitajika Uchina
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Mapendeleo
 DocType: Hub Settings,Custom Data,Takwimu za Desturi
@@ -1230,9 +1224,9 @@
 DocType: Medical Code,Medical Code Standard,Kanuni ya Matibabu ya Kiwango
 DocType: Soil Texture,Clay Composition (%),Muundo wa Clay (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Tafadhali salama kabla ya kugawa kazi.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Thamani ya usawa
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Thamani ya usawa
 DocType: Lab Test,Lab Technician,Mtaalamu wa Lab
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Orodha ya Bei ya Mauzo
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Orodha ya Bei ya Mauzo
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Ikiwa imechungwa, mteja atatengenezwa, amechukuliwa kwa Mgonjwa. Invoice za Mgonjwa zitaundwa dhidi ya Wateja hawa. Unaweza pia kuchagua Wateja aliyepo wakati wa kujenga Mgonjwa."
 DocType: Bank Reconciliation,Account Currency,Fedha za Akaunti
@@ -1240,16 +1234,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Tafadhali tuma Akaunti ya Pande zote katika Kampuni
 DocType: Purchase Receipt,Range,Rangi
 DocType: Supplier,Default Payable Accounts,Akaunti ya malipo yenye malipo
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mfanyakazi {0} haifanyi kazi au haipo
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Mfanyakazi {0} haifanyi kazi au haipo
 DocType: Fee Structure,Components,Vipengele
 DocType: Item Barcode,Item Barcode,Msimbo wa Barcode
 DocType: Woocommerce Settings,Endpoints,Mwisho
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Tafadhali ingiza Kundi la Mali katika Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Vipengee vya Toleo {0} vinavyosasishwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Vipengee vya Toleo {0} vinavyosasishwa
 DocType: Quality Inspection Reading,Reading 6,Kusoma 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ili kuzalishwa. Ikiwa imechelewa, utahitajika kubadilisha &quot;Rudia Siku ya Mwezi&quot; shamba hili"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Haiwezi {0} {1} {2} bila ankara yoyote mbaya
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Haiwezi {0} {1} {2} bila ankara yoyote mbaya
 DocType: Share Transfer,From Folio No,Kutoka No ya Folio
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ununuzi wa ankara ya awali
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Uingiaji wa mikopo hauwezi kuunganishwa na {1}
@@ -1284,16 +1276,17 @@
 DocType: Asset,Available-for-use Date,Inapatikana kwa tarehe Tarehe
 DocType: Guardian,Guardian Name,Jina la Mlinzi
 DocType: Cheque Print Template,Has Print Format,Ina Chapisho la Kuchapa
-DocType: Employee Loan,Sanctioned,Imeteuliwa
+DocType: Loan,Sanctioned,Imeteuliwa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,ni lazima. Labda Rekodi ya ubadilishaji Fedha haikuundwa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Tafadhali taja Serial Hakuna kwa Bidhaa {1}
 DocType: Crop Cycle,Crop Cycle,Mzunguko wa Mazao
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Kwa vitu vya &#39;Bidhaa Bundle&#39;, Ghala, Serial No na Batch Hakuna itazingatiwa kutoka kwenye orodha ya &#39;Orodha ya Ufungashaji&#39;. Ikiwa Hakuna Ghala na Batch No ni sawa kwa vitu vyote vya kuingiza kwa bidhaa yoyote ya &#39;Bidhaa Bundle&#39;, maadili haya yanaweza kuingizwa kwenye meza kuu ya Bidhaa, maadili yatakopwa kwenye &#39;Orodha ya Ufungashaji&#39;."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Kwa vitu vya &#39;Bidhaa Bundle&#39;, Ghala, Serial No na Batch Hakuna itazingatiwa kutoka kwenye orodha ya &#39;Orodha ya Ufungashaji&#39;. Ikiwa Hakuna Ghala na Batch No ni sawa kwa vitu vyote vya kuingiza kwa bidhaa yoyote ya &#39;Bidhaa Bundle&#39;, maadili haya yanaweza kuingizwa kwenye meza kuu ya Bidhaa, maadili yatakopwa kwenye &#39;Orodha ya Ufungashaji&#39;."
 DocType: Student Admission,Publish on website,Chapisha kwenye tovuti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Tarehe ya Invozi ya Wasambazaji haiwezi kuwa kubwa kuliko Tarehe ya Kuweka
+DocType: Subscription,Cancelation Date,Tarehe ya kufuta
 DocType: Purchase Invoice Item,Purchase Order Item,Nambari ya Utaratibu wa Ununuzi
 DocType: Agriculture Task,Agriculture Task,Kazi ya Kilimo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Mapato ya moja kwa moja
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Mapato ya moja kwa moja
 DocType: Student Attendance Tool,Student Attendance Tool,Chombo cha Kuhudhuria Wanafunzi
 DocType: Restaurant Menu,Price List (Auto created),Orodha ya Bei (Iliundwa kwa Auto)
 DocType: Cheque Print Template,Date Settings,Mpangilio wa Tarehe
@@ -1319,6 +1312,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Mita
 DocType: Workstation,Electricity Cost,Gharama za Umeme
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Siku ya tarehe ya kupima Lab haiwezi kuwa kabla ya tarehe ya kukusanya
+DocType: Subscription Plan,Cost,Gharama
 DocType: HR Settings,Don't send Employee Birthday Reminders,Usitumie Makumbusho ya Siku ya Kuzaliwa
 DocType: Expense Claim,Total Advance Amount,Jumla ya Mapendekezo ya Kiasi
 DocType: Delivery Stop,Estimated Arrival,Ufikiaji uliotarajiwa
@@ -1330,14 +1324,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Pakia kichwa chako na alama. (unaweza kuwahariri baadaye).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Tarehe ya Uzito ya pili imeingia kama tarehe iliyopita
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Nyeupe
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Nyeupe
 DocType: SMS Center,All Lead (Open),Viongozi wote (Ufunguzi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Uliopatikana kwa {4} katika ghala {1} wakati wa kutuma muda wa kuingia ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Unaweza kuchagua chaguo moja tu kutoka kwenye orodha ya masanduku ya kuangalia.
 DocType: Purchase Invoice,Get Advances Paid,Pata Mafanikio ya kulipwa
 DocType: Item,Automatically Create New Batch,Unda Batch Mpya kwa moja kwa moja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Kuagiza {0} kwa {1} (mstari {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Fanya
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Kuagiza {0} kwa {1} (mstari {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Fanya
 DocType: Student Admission,Admission Start Date,Tarehe ya Kuanza Kuingia
 DocType: Journal Entry,Total Amount in Words,Jumla ya Kiasi kwa Maneno
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Mfanyakazi Mpya
@@ -1353,7 +1347,7 @@
 DocType: Holiday List,Holiday List Name,Jina la Orodha ya likizo
 DocType: Repayment Schedule,Balance Loan Amount,Kiwango cha Mikopo
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Ratiba ya Kozi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Chaguzi za hisa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Chaguzi za hisa
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Lemaza Kurejesha Maelezo ya Mwisho ya Ununuzi katika Ununuzi wa Utaratibu
 DocType: Journal Entry Account,Expense Claim,Madai ya Madai
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,"Je, kweli unataka kurejesha mali hii iliyokatwa?"
@@ -1372,11 +1366,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Ufungashaji wa Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Akaunti ya Fedha / Benki
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Tafadhali taja {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Vipengee vilivyoondolewa bila mabadiliko katika wingi au thamani.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Vipengee vilivyoondolewa bila mabadiliko katika wingi au thamani.
 DocType: Delivery Note,Delivery To,Utoaji Kwa
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Uumbaji wa viumbe umefungwa.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Muhtasari wa Kazi kwa {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Toleo la meza ni lazima
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Msaidizi wa kwanza wa Kuondoka kwenye orodha utawekwa kama Msaidizi wa Kuacha wa Kuacha.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Toleo la meza ni lazima
 DocType: Production Plan,Get Sales Orders,Pata Maagizo ya Mauzo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} haiwezi kuwa hasi
 DocType: Training Event,Self-Study,Kujitegemea
@@ -1388,7 +1383,7 @@
 DocType: Workstation,Wages,Mishahara
 DocType: Asset Maintenance,Maintenance Manager Name,Jina la Meneja wa Matengenezo
 DocType: Agriculture Task,Urgent,Haraka
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Tafadhali taja Kitambulisho cha Row halali kwa mstari {0} katika jedwali {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Tafadhali taja Kitambulisho cha Row halali kwa mstari {0} katika jedwali {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Haiwezi kupata variable:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Tafadhali chagua shamba kuhariri kutoka numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Haiwezi kuwa kitu cha kudumu cha mali kama Stock Ledger imeundwa.
@@ -1400,7 +1395,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Jina la Kigezo cha Ukaguzi wa Ubora
 DocType: Project,First Email,Barua ya Kwanza
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Ghala iliyohifadhiwa katika Mauzo ya Hifadhi / Bidhaa Zilizohitimishwa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Kuuza Kiasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kuuza Kiasi
 DocType: Repayment Schedule,Interest Amount,Kiwango cha riba
 DocType: Serial No,Creation Document No,Hati ya Uumbaji No
 DocType: Share Transfer,Issue,Suala
@@ -1414,10 +1409,10 @@
 DocType: Tax Rule,Shipping State,Jimbo la Mtoaji
 ,Projected Quantity as Source,Wengi uliopangwa kama Chanzo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Kipengee lazima kiongezwe kwa kutumia &#39;Pata Vitu kutoka kwenye Kitufe cha Ununuzi&#39;
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Safari ya Utoaji
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Safari ya Utoaji
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Aina ya Uhamisho
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Gharama za Mauzo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Gharama za Mauzo
 DocType: Consultation,Diagnosis,Utambuzi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Ununuzi wa kawaida
 DocType: GL Entry,Against,Dhidi
@@ -1426,12 +1421,13 @@
 DocType: Sales Partner,Implementation Partner,Utekelezaji wa Mshiriki
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Namba ya Posta
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Amri ya Mauzo {0} ni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Chagua akaunti ya mapato ya riba kwa mkopo {0}
 DocType: Opportunity,Contact Info,Maelezo ya Mawasiliano
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Kufanya Entries Stock
 DocType: Packing Slip,Net Weight UOM,Uzito wa Uzito wa Nambari
 DocType: Item,Default Supplier,Muuzaji wa Default
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Kwa Asilimia ya Uwezo wa Uzalishaji
-DocType: Employee Loan,Repayment Schedule,Ratiba ya Ulipaji
+DocType: Loan,Repayment Schedule,Ratiba ya Ulipaji
 DocType: Shipping Rule Condition,Shipping Rule Condition,Hali ya Kanuni ya Utoaji
 DocType: Holiday List,Get Weekly Off Dates,Pata Dondoo za Majuma
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tarehe ya Mwisho haiwezi kuwa chini ya Tarehe ya Mwanzo
@@ -1445,7 +1441,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Umri wa Umri
 DocType: Education Settings,Attendance Freeze Date,Tarehe ya Kuhudhuria Tarehe
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Andika orodha ya wachache wa wauzaji wako. Wanaweza kuwa mashirika au watu binafsi.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Tazama Bidhaa Zote
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Tazama Bidhaa Zote
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Umri wa Kiongozi wa Chini (Siku)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,BOM zote
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},Vyumba vya aina ya aina {0} hazipatikani kwa {1}
@@ -1453,14 +1449,16 @@
 DocType: Expense Claim,From Employee,Kutoka kwa Mfanyakazi
 DocType: Driver,Cellphone Number,Nambari ya simu ya mkononi
 DocType: Project,Monitor Progress,Kufuatilia Maendeleo
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Tahadhari: Mfumo hautaangalia overbilling tangu kiasi cha Bidhaa {0} katika {1} ni sifuri
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Tahadhari: Mfumo hautaangalia overbilling tangu kiasi cha Bidhaa {0} katika {1} ni sifuri
 DocType: Journal Entry,Make Difference Entry,Fanya Tofauti Kuingia
+DocType: Supplier Quotation,Auto Repeat Section,Sehemu ya kurudia kwa urahisi
 DocType: Upload Attendance,Attendance From Date,Kuhudhuria Tarehe Tarehe
 DocType: Appraisal Template Goal,Key Performance Area,Eneo la Ufanisi
 DocType: Program Enrollment,Transportation,Usafiri
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Attribute batili
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} lazima iwasilishwa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Wingi lazima iwe chini au sawa na {0}
+DocType: Department Approver,Department Approver,Idhini ya Idara
 DocType: SMS Center,Total Characters,Washirika wa jumla
 DocType: Employee Advance,Claimed,Alidai
 DocType: Crop,Row Spacing,Upeo wa Row
@@ -1470,6 +1468,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Malipo ya Upatanisho wa Malipo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Mchango%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Kwa mujibu wa Mipangilio ya Ununuzi ikiwa Utaratibu wa Ununuzi Unahitajika == &#39;Ndiyo&#39;, kisha kwa Kuunda Invoice ya Ununuzi, mtumiaji anahitaji kuunda Utaratibu wa Ununuzi kwanza kwa kipengee {0}"
+,HSN-wise-summary of outward supplies,Sura ya HSN-hekima ya vifaa vya nje
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nambari za usajili wa Kampuni kwa kumbukumbu yako. Nambari za kodi nk
 DocType: Sales Partner,Distributor,Wasambazaji
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ununuzi wa Ununuzi wa Kusafirishwa
@@ -1483,7 +1482,7 @@
 DocType: Setup Progress Action,Action Name,Jina la Hatua
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Mwaka wa Mwanzo
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Majina ya kwanza ya GSTIN yanapaswa kufanana na Nambari ya Jimbo {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Tarehe ya mwanzo wa kipindi cha ankara ya sasa
 DocType: Salary Slip,Leave Without Pay,Acha bila Bila Kulipa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Hitilafu ya Kupanga Uwezo
@@ -1501,26 +1500,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Mashamba yatakopwa zaidi wakati wa uumbaji.
 DocType: Setup Progress Action,Domains,Domains
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Tarehe sahihi ya Kuanza' haiwezi kuwa kubwa zaidi kuliko 'Tarehe ya mwisho ya mwisho'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Usimamizi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Usimamizi
 DocType: Cheque Print Template,Payer Settings,Mipangilio ya Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Hii itaongezwa kwenye Kanuni ya Nambari ya Mchapishaji. Kwa mfano, ikiwa kichwa chako ni &quot;SM&quot;, na msimbo wa kipengee ni &quot;T-SHIRT&quot;, msimbo wa kipengee wa kipengee utakuwa &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (kwa maneno) itaonekana baada ya kuokoa Slip ya Mshahara.
 DocType: Purchase Invoice,Is Return,Inarudi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Tahadhari
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Siku ya kuanza ni kubwa kuliko siku ya mwisho katika kazi &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Kurudi / Kumbuka Debit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Kurudi / Kumbuka Debit
 DocType: Price List Country,Price List Country,Orodha ya Bei ya Nchi
 DocType: Item,UOMs,UOM
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} salama ya serial kwa Bidhaa {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Msimbo wa kipengee hauwezi kubadilishwa kwa Nambari ya Serial.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Msimbo wa kipengee hauwezi kubadilishwa kwa Nambari ya Serial.
 DocType: Purchase Invoice Item,UOM Conversion Factor,Kipengele cha Kubadili UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Tafadhali ingiza Msimbo wa Nambari ili kupata Nambari ya Batch
 DocType: Stock Settings,Default Item Group,Kikundi cha Kichwa cha Kichwa
-DocType: Employee Loan,Partially Disbursed,Kutengwa kwa sehemu
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Ruhusu habari.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Ruhusu habari.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Duka la wauzaji.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Huwezi kuanzisha upya Usajili ambao haujahairiwa.
 DocType: Account,Balance Sheet,Karatasi ya Mizani
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Kituo cha Gharama kwa Bidhaa na Msimbo wa Bidhaa &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Kituo cha Gharama kwa Bidhaa na Msimbo wa Bidhaa &#39;
 DocType: Fee Validity,Valid Till,Halali Mpaka
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Jumla ya Mkutano wa Mwalimu wa Wazazi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Njia ya Malipo haijasanidiwa. Tafadhali angalia, kama akaunti imewekwa kwenye Mfumo wa Malipo au kwenye POS Profile."
@@ -1533,7 +1532,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Nambari iliyokataliwa haiwezi kuingizwa katika Kurudi kwa Ununuzi
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Kubadilisha Kundi la Wateja kwa Wateja waliochaguliwa hairuhusiwi.
 ,Purchase Order Items To Be Billed,Vitu vya Utaratibu wa Ununuzi Ili Kulipwa
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Inasasisha nyakati za kuwasili za makadirio.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Inasasisha nyakati za kuwasili za makadirio.
 DocType: Program Enrollment Tool,Enrollment Details,Maelezo ya Uandikishaji
 DocType: Purchase Invoice Item,Net Rate,Kiwango cha Nambari
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Tafadhali chagua mteja
@@ -1552,18 +1551,20 @@
 DocType: Global Defaults,Current Fiscal Year,Mwaka wa Fedha wa sasa
 DocType: Purchase Order,Group same items,Jumuisha vitu sawa
 DocType: Purchase Invoice,Disable Rounded Total,Lemaza Jumla ya Mviringo
-DocType: Employee Loan Application,Repayment Info,Maelezo ya kulipa
+DocType: Department,Parent Department,Idara ya Mzazi
+DocType: Loan Application,Repayment Info,Maelezo ya kulipa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;Entries&#39; haiwezi kuwa tupu
 DocType: Maintenance Team Member,Maintenance Role,Dhamana ya Matengenezo
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Mstari wa Duplicate {0} na sawa {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Mstari wa Duplicate {0} na sawa {1}
 ,Trial Balance,Mizani ya majaribio
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Mwaka wa Fedha {0} haukupatikana
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Mwaka wa Fedha {0} haukupatikana
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Kuweka Wafanyakazi
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Tafadhali chagua kiambatisho kwanza
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Utafiti
+DocType: Subscription Settings,Subscription Settings,Mipangilio ya usajili
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Utafiti
 DocType: Maintenance Visit Purpose,Work Done,Kazi Imefanyika
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Tafadhali taja angalau sifa moja katika meza ya Tabia
 DocType: Announcement,All Students,Wanafunzi wote
@@ -1574,19 +1575,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Kundi la Bidhaa limekuwa na jina moja, tafadhali ubadilisha jina la kipengee au uunda jina la kundi la bidhaa"
 DocType: Crop Cycle,Less than a year,Chini ya mwaka
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Namba ya Mkono ya Mwanafunzi
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Mwisho wa Dunia
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Mwisho wa Dunia
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} haiwezi kuwa na Kundi
 DocType: Crop,Yield UOM,Uzao UOM
 ,Budget Variance Report,Ripoti ya Tofauti ya Bajeti
 DocType: Salary Slip,Gross Pay,Pato la Pato
 DocType: Item,Is Item from Hub,Ni kitu kutoka Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Aina ya Shughuli ni lazima.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Mgawanyiko ulipwa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Mgawanyiko ulipwa
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger ya Uhasibu
 DocType: Stock Reconciliation,Difference Amount,Tofauti Kiasi
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Dr {0} juu ya Acha juu ya {1}
 DocType: Purchase Invoice,Reverse Charge,Malipo ya Reverse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Mapato yaliyohifadhiwa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Mapato yaliyohifadhiwa
 DocType: Purchase Invoice,05-Change in POS,05-Badilisha katika POS
 DocType: Vehicle Log,Service Detail,Maelezo ya Huduma
 DocType: BOM,Item Description,Maelezo ya maelezo
@@ -1601,12 +1602,12 @@
 DocType: Opportunity Item,Opportunity Item,Kitu cha Fursa
 ,Student and Guardian Contact Details,Mwanafunzi na Mlinzi Maelezo ya Mawasiliano
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Kwa wauzaji {0} Anwani ya barua pepe inahitajika kutuma barua pepe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Ufunguo wa Muda
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Ufunguo wa Muda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Tazama Hub
 ,Employee Leave Balance,Mizani ya Waajiriwa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Mizani ya Akaunti {0} lazima iwe {1}
 DocType: Patient Appointment,More Info,Maelezo zaidi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Kiwango cha Vigezo kinachohitajika kwa Bidhaa katika mstari {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Kiwango cha Vigezo kinachohitajika kwa Bidhaa katika mstari {0}
 DocType: Supplier Scorecard,Scorecard Actions,Vitendo vya kadi ya alama
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Mfano: Masters katika Sayansi ya Kompyuta
 DocType: Purchase Invoice,Rejected Warehouse,Ghala iliyokataliwa
@@ -1616,7 +1617,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,kwa
 DocType: Supplier Quotation Item,Lead Time in days,Tembea Muda katika siku
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Muhtasari wa Kulipa Akaunti
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Malipo ya mshahara kutoka {0} hadi {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Malipo ya mshahara kutoka {0} hadi {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Haiidhinishwa kuhariri Akaunti iliyohifadhiwa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pata ankara bora
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Uagizaji wa Mauzo {0} halali
@@ -1625,9 +1626,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Maagizo ya Majaribio ya Lab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jalada la jumla / Vipimo vya uhamisho {0} katika Maombi ya Vifaa {1} \ hawezi kuwa kubwa zaidi kuliko kiasi kilichoombwa {2} kwa Bidhaa {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Ndogo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Ndogo
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Kufungua Kitufe cha Uumbaji wa Dawa ya Invoice
 DocType: Education Settings,Employee Number,Nambari ya Waajiriwa
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Futa Invoice Baada ya Kipindi cha Grace
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Kesi Hakuna (s) tayari kutumika. Jaribu kutoka kwenye Uchunguzi Hapana {0}
 DocType: Project,% Completed,Imekamilika
 ,Invoiced Amount (Exculsive Tax),Kiasi kilichotolewa (kodi ya nje)
@@ -1641,7 +1643,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Wakati wa Tathmini ya Maabara
 DocType: Email Digest,Add Quote,Ongeza Nukuu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Kipengele cha ufunuo wa UOM kinahitajika kwa UOM: {0} katika Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Gharama zisizo sahihi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Gharama zisizo sahihi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Uchina ni lazima
 DocType: Agriculture Analysis Criteria,Agriculture,Kilimo
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Sawa Data ya Mwalimu
@@ -1671,16 +1673,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Kwa {0}, akaunti za mikopo tu zinaweza kuunganishwa dhidi ya kuingia mwingine kwa debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumla ya yote uzito wa kazi lazima 1. Tafadhali weka uzito wa kazi zote za Mradi ipasavyo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Kumbuka Utoaji {0} haujawasilishwa
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Kipengee {0} kinafaa kuwa kitu cha Chini
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Vifaa vya Capital
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Kipengee {0} kinafaa kuwa kitu cha Chini
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Vifaa vya Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule ya bei ni ya kwanza kuchaguliwa kulingana na shamba la &#39;Weka On&#39;, ambayo inaweza kuwa Item, Kikundi cha Bidhaa au Brand."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Tafadhali weka Kanuni ya Kwanza
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Asilimia ya jumla iliyotengwa kwa timu ya mauzo inapaswa kuwa 100
+DocType: Subscription Plan,Billing Interval Count,Muda wa Kipaji cha Hesabu
 DocType: Sales Invoice Item,Edit Description,Hariri Maelezo
 DocType: Antibiotic,Antibiotic,Antibiotic
 ,Team Updates,Updates ya Timu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Kwa Wafanyabiashara
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Kwa Wafanyabiashara
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Kuweka Aina ya Akaunti husaidia katika kuchagua Akaunti hii katika shughuli.
 DocType: Purchase Invoice,Grand Total (Company Currency),Jumla ya Jumla (Kampuni ya Fedha)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Unda Format Print
@@ -1706,7 +1709,7 @@
 DocType: POS Item Group,POS Item Group,Kundi la Bidhaa la POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Ujumbe wa barua pepe:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Kitu mbadala haipaswi kuwa sawa na msimbo wa bidhaa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} sio Kipengee {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} sio Kipengee {1}
 DocType: Sales Partner,Target Distribution,Usambazaji wa Target
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Kukamilisha tathmini ya muda
 DocType: Salary Slip,Bank Account No.,Akaunti ya Akaunti ya Benki
@@ -1722,7 +1725,7 @@
 DocType: BOM Operation,Workstation,Kazi ya kazi
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Ombi la Mtoaji wa Nukuu
 DocType: Healthcare Settings,Registration Message,Ujumbe wa Usajili
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Vifaa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Vifaa
 DocType: Prescription Dosage,Prescription Dosage,Kipimo cha Dawa
 DocType: Attendance,HR Manager,Meneja wa HR
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Tafadhali chagua Kampuni
@@ -1753,7 +1756,7 @@
 DocType: Project,Start and End Dates,Anza na Mwisho Dates
 ,Delivered Items To Be Billed,Vitu vilivyopakiwa Kufanywa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Fungua BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Ghala haiwezi kubadilishwa kwa Nambari ya Serial.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Ghala haiwezi kubadilishwa kwa Nambari ya Serial.
 DocType: Authorization Rule,Average Discount,Average Discount
 DocType: Project Update,Great/Quickly,Kubwa / haraka
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1762,8 +1765,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Tafadhali chagua vikundi vya kipengee cha kupigwa
 DocType: Asset,Depreciation Schedules,Ratiba ya kushuka kwa thamani
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Kufuatia akaunti inaweza kuchaguliwa katika Mipangilio ya GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Kipindi cha maombi hawezi kuwa nje ya kipindi cha ugawaji wa kuondoka
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Kufuatia akaunti inaweza kuchaguliwa katika Mipangilio ya GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Kipindi cha maombi hawezi kuwa nje ya kipindi cha ugawaji wa kuondoka
 DocType: Activity Cost,Projects,Miradi
 DocType: Payment Request,Transaction Currency,Fedha ya Ushirika
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Kutoka {0} | {1} {2}
@@ -1774,6 +1777,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Kuondoka Kila siku
 DocType: POS Profile,Campaign,Kampeni
 DocType: Supplier,Name and Type,Jina na Aina
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Hali ya kibali lazima iwe &#39;Imeidhinishwa&#39; au &#39;Imekataliwa&#39;
 DocType: Physician,Contacts and Address,Mawasiliano na Anwani
 DocType: Purchase Invoice,Contact Person,Kuwasiliana na mtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tarehe ya Mwanzo Inatarajiwa&#39; haiwezi kuwa kubwa zaidi kuliko &#39;Tarehe ya Mwisho Inatarajiwa&#39;
@@ -1787,19 +1791,20 @@
 DocType: Student Admission,Eligibility and Details,Uhalali na Maelezo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Mabadiliko ya Net katika Mali isiyohamishika
 DocType: Leave Control Panel,Leave blank if considered for all designations,Acha tupu ikiwa inachukuliwa kwa sifa zote
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Malipo ya aina ya &#39;Kweli&#39; katika mstari {0} haiwezi kuingizwa katika Kiwango cha Bidhaa
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Malipo ya aina ya &#39;Kweli&#39; katika mstari {0} haiwezi kuingizwa katika Kiwango cha Bidhaa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Kutoka wakati wa Tarehe
 DocType: Email Digest,For Company,Kwa Kampuni
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Ingia ya mawasiliano.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ombi la Nukuu imezimwa ili kufikia kutoka kwenye bandari, kwa mipangilio zaidi ya kuzingatia porta."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorecard ya Wafanyabiashara Mboresho
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kununua Kiasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Kununua Kiasi
 DocType: Sales Invoice,Shipping Address Name,Jina la Jina la Mafikisho
 DocType: Material Request,Terms and Conditions Content,Masharti na Masharti Maudhui
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kulikuwa na hitilafu za kuunda ratiba ya kozi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,haiwezi kuwa zaidi ya 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Kipengee {0} si kitu cha hisa
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Mpangilio wa kwanza wa gharama katika orodha utawekwa kama Msaidizi wa gharama ya chini.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,haiwezi kuwa zaidi ya 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Kipengee {0} si kitu cha hisa
 DocType: Maintenance Visit,Unscheduled,Haijahamishwa
 DocType: Employee,Owned,Imepewa
 DocType: Salary Detail,Depends on Leave Without Pay,Inategemea kuondoka bila kulipa
@@ -1820,14 +1825,15 @@
 DocType: Package Code,Package Code,Kanuni ya pakiti
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Mwanafunzi
 DocType: Purchase Invoice,Company GSTIN,Kampuni ya GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Wengi hauna kuruhusiwa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Wengi hauna kuruhusiwa
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Maelezo ya kodi ya kodi imetengwa kutoka kwa bwana wa bidhaa kama kamba na kuhifadhiwa kwenye uwanja huu. Iliyotumika kwa Kodi na Malipo
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Mfanyakazi hawezi kujijulisha mwenyewe.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mfanyakazi hawezi kujijulisha mwenyewe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ikiwa akaunti imehifadhiwa, maingilio yanaruhusiwa watumiaji waliozuiwa."
 DocType: Email Digest,Bank Balance,Mizani ya Benki
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Kuingia kwa Uhasibu kwa {0}: {1} inaweza tu kufanywa kwa fedha: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Acha Msaidizi Wajibu wa Kuacha Maombi
 DocType: Job Opening,"Job profile, qualifications required etc.","Profaili ya kazi, sifa zinazohitajika nk."
 DocType: Journal Entry Account,Account Balance,Mizani ya Akaunti
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Sheria ya Ushuru kwa ajili ya shughuli.
@@ -1855,15 +1861,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Ghala la chanzo ni lazima kwa mstari {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Muda wa Malipo katika mstari {0} inawezekana kuwa duplicate.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Kilimo (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Ufungashaji wa Ufungashaji
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Kodi ya Ofisi
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sanidi mipangilio ya uingizaji wa SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Ufungashaji wa Ufungashaji
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kodi ya Ofisi
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Sanidi mipangilio ya uingizaji wa SMS
 DocType: Disease,Common Name,Jina la kawaida
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Ingiza Imeshindwa!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hakuna anwani iliyoongezwa bado.
 DocType: Workstation Working Hour,Workstation Working Hour,Kazi ya Kazi ya Kazini
 DocType: Vital Signs,Blood Pressure,Shinikizo la damu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Mchambuzi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Mchambuzi
 DocType: Item,Inventory,Uuzaji
 DocType: Item,Sales Details,Maelezo ya Mauzo
 DocType: Quality Inspection,QI-,QI-
@@ -1873,15 +1879,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Thibitisha Kozi iliyosajiliwa kwa Wanafunzi katika Kikundi cha Wanafunzi
 DocType: Notification Control,Expense Claim Rejected,Madai ya Madai yamekataliwa
 DocType: Item,Item Attribute,Kipengee cha kipengee
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Serikali
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Serikali
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Madai ya Madai {0} tayari yupo kwa Ingia ya Gari
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Jina la Taasisi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Tafadhali ingiza Kiwango cha kulipa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Tafadhali ingiza Kiwango cha kulipa
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Tofauti ya Tofauti
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Huduma
 DocType: HR Settings,Email Salary Slip to Employee,Mshahara wa Salari ya barua pepe kwa Mfanyakazi
 DocType: Cost Center,Parent Cost Center,Kituo cha Gharama ya Mzazi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Chagua Wasambazaji Inawezekana
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Chagua Wasambazaji Inawezekana
 DocType: Sales Invoice,Source,Chanzo
 DocType: Customer,"Select, to make the customer searchable with these fields","Chagua, ili uweze kutafutwa na mteja na mashamba haya"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Onyesha imefungwa
@@ -1898,7 +1904,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Kulipishwa kwa Slip (s) kufutwa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Mtoko wa Fedha kutoka Uwekezaji
 DocType: Program Course,Program Course,Kozi ya Programu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Mashtaka ya Mizigo na Usambazaji
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Mashtaka ya Mizigo na Usambazaji
 DocType: Homepage,Company Tagline for website homepage,Tagline ya kampuni ya homepage ya tovuti
 DocType: Item Group,Item Group Name,Jina la Kikundi cha Bidhaa
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Kuchukuliwa
@@ -1928,10 +1934,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Maelezo ya Usajili
 DocType: Leave Block List,Block Holidays on important days.,Zima Holidays siku za muhimu.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Tafadhali ingiza Thamani zote za Thamani zinazohitajika
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Muhtasari wa Akaunti ya Kupokea
-DocType: Employee Loan,Monthly Repayment Amount,Kiasi cha kulipa kila mwezi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Muhtasari wa Akaunti ya Kupokea
+DocType: Loan,Monthly Repayment Amount,Kiasi cha kulipa kila mwezi
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Invoices za Ufunguzi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Tafadhali weka shamba la Kitambulisho cha Mtumiaji katika rekodi ya Wafanyakazi ili kuweka Kazi ya Wafanyakazi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Tafadhali weka shamba la Kitambulisho cha Mtumiaji katika rekodi ya Wafanyakazi ili kuweka Kazi ya Wafanyakazi
 DocType: UOM,UOM Name,Jina la UOM
 DocType: GST HSN Code,HSN Code,Msimbo wa HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Mchango wa Mchango
@@ -1952,7 +1958,8 @@
 DocType: Purchase Receipt,Transporter Details,Maelezo ya Transporter
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Ghala la msingi linahitajika kwa kipengee kilichochaguliwa
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Sanduku
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Wafanyabiashara wawezekana
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Wafanyabiashara wawezekana
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Usambazaji wa kila mwezi
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Orodha ya Receiver haina tupu. Tafadhali tengeneza Orodha ya Kupokea
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Huduma ya afya (beta)
@@ -1979,7 +1986,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Hakuna Vipande vya kuingiza
 DocType: Shipping Rule Condition,From Value,Kutoka kwa Thamani
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Uzalishaji wa Wingi ni lazima
-DocType: Employee Loan,Repayment Method,Njia ya kulipa
+DocType: Loan,Repayment Method,Njia ya kulipa
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ikiwa hunakiliwa, Ukurasa wa Mwanzo utakuwa Kikundi cha Kichwa cha Kichwa cha tovuti"
 DocType: Quality Inspection Reading,Reading 4,Kusoma 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Madai kwa gharama za kampuni.
@@ -1988,7 +1995,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Cheti Inahitajika
 DocType: Company,Default Holiday List,Orodha ya Likizo ya Default
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Kutoka wakati na kwa wakati wa {1} linaingiliana na {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Mkopo wa Mkopo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Mkopo wa Mkopo
 DocType: Purchase Invoice,Supplier Warehouse,Ghala la Wafanyabiashara
 DocType: Opportunity,Contact Mobile No,Wasiliana No Simu ya Simu
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Chagua Kampuni
@@ -1996,7 +2003,7 @@
 DocType: Student Report Generation Tool,Print Section,Sehemu ya Magazeti
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Mtumiaji {0} hana Profaili ya POS ya default. Angalia Default kwa Row {1} kwa Mtumiaji huyu.
 DocType: Student Group,Set 0 for no limit,Weka 0 bila kikomo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Siku (s) ambayo unaomba kwa ajili ya kuondoka ni likizo. Hauhitaji kuomba kuondoka.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Siku (s) ambayo unaomba kwa ajili ya kuondoka ni likizo. Hauhitaji kuomba kuondoka.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} inahitajika ili kuunda ankara za kufungua {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Anwani ya Msingi na Maelezo ya Mawasiliano
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Tuma barua pepe ya malipo
@@ -2007,10 +2014,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Tafadhali chagua angalau kikoa kimoja.
 DocType: Dependent Task,Dependent Task,Kazi ya Kudumu
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Sababu ya ubadilishaji kwa chaguo-msingi Kipimo cha Kupima lazima iwe 1 kwenye mstari {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Kuondoka kwa aina {0} haiwezi kuwa zaidi kuliko {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Kuondoka kwa aina {0} haiwezi kuwa zaidi kuliko {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Jaribu kupanga shughuli kwa siku X kabla.
 DocType: HR Settings,Stop Birthday Reminders,Weka Vikumbusho vya Kuzaliwa
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Tafadhali weka Akaunti ya Kulipa ya Payroll ya Kipawa katika Kampuni {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Tafadhali weka Akaunti ya Kulipa ya Payroll ya Kipawa katika Kampuni {0}
 DocType: SMS Center,Receiver List,Orodha ya Kupokea
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Tafuta kitu
 DocType: Payment Schedule,Payment Amount,Kiwango cha Malipo
@@ -2020,7 +2027,7 @@
 DocType: Assessment Plan,Grading Scale,Kuweka Scale
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Kipimo cha Upimaji {0} kiliingizwa zaidi ya mara moja kwenye Jedwali la Kubadilisha Ubadilishaji
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Tayari imekamilika
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Stock In Hand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Stock In Hand
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Ingiza Mafanikio!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Ombi la Malipo tayari lipo {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Gharama ya Vitu Vipitishwa
@@ -2031,17 +2038,16 @@
 DocType: Quotation Item,Quotation Item,Nukuu ya Nukuu
 DocType: Customer,Customer POS Id,Idhaa ya POS ya Wateja
 DocType: Account,Account Name,Jina la Akaunti
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Kutoka Tarehe haiwezi kuwa kubwa kuliko Tarehe
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Serial Hapana {0} wingi {1} haiwezi kuwa sehemu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Kutoka Tarehe haiwezi kuwa kubwa kuliko Tarehe
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Serial Hapana {0} wingi {1} haiwezi kuwa sehemu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Tafadhali ingiza URL ya Woocommerce Server
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Aina ya Wafanyabiashara.
 DocType: Purchase Order Item,Supplier Part Number,Nambari ya Sehemu ya Wasambazaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Kiwango cha uongofu hawezi kuwa 0 au 1
 DocType: Share Balance,To No,Hapana
-DocType: Subscription,Reference Document,Hati ya Kumbukumbu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} imefutwa au imesimamishwa
 DocType: Accounts Settings,Credit Controller,Mdhibiti wa Mikopo
-DocType: Grant Application,Applicant Type,Aina ya Msaidizi
+DocType: Loan,Applicant Type,Aina ya Msaidizi
 DocType: Purchase Invoice,03-Deficiency in services,Upungufu wa 03 katika huduma
 DocType: Delivery Note,Vehicle Dispatch Date,Tarehe ya Kuondoa Gari
 DocType: Healthcare Settings,Default Medical Code Standard,Kiwango cha Kiwango cha Matibabu cha Kudumu
@@ -2052,13 +2058,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Imelipwa
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Nambari iliyohifadhiwa
 DocType: Party Account,Party Account,Akaunti ya Chama
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Rasilimali
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Rasilimali
 DocType: Lead,Upper Income,Mapato ya Juu
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Kataa
 DocType: Journal Entry Account,Debit in Company Currency,Debit katika Fedha ya Kampuni
 DocType: BOM Item,BOM Item,Kipengee cha BOM
 DocType: Appraisal,For Employee,Kwa Mfanyakazi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Fanya Uingiaji wa Malipo
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Fanya Uingiaji wa Malipo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Kabla ya Mtoaji lazima awe deni
 DocType: Company,Default Values,Maadili ya Maadili
 DocType: Membership,INR,INR
@@ -2087,10 +2093,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Jumla (bila ya Kodi)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Hesabu ya Kiongozi
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} lazima iwe kubwa kuliko 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Inapatikana
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stock Inapatikana
 DocType: Manufacturing Settings,Capacity Planning For (Days),Mipango ya Uwezo Kwa (Siku)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Ununuzi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Hakuna vitu vilivyo na mabadiliko yoyote kwa wingi au thamani.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Hakuna vitu vilivyo na mabadiliko yoyote kwa wingi au thamani.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Sehemu ya lazima - Programu
 DocType: Special Test Template,Result Component,Matokeo ya kipengele
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Madai ya udhamini
@@ -2110,7 +2116,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Jumuisha likizo ndani ya majani kama majani
 DocType: Sales Invoice,Packed Items,Vipuri vilivyowekwa
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Madai ya Udhamini dhidi ya Namba ya Serial.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Jumla&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Jumla&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Wezesha Kifaa cha Ununuzi
 DocType: Employee,Permanent Address,Anwani ya Kudumu
 DocType: Consultation,Medication,Dawa
@@ -2126,10 +2132,10 @@
 DocType: Selling Settings,Selling Settings,Kuuza Mipangilio
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Thibitisha Hatua
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Madaada ya mtandaoni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Tafadhali taja ama Wingi au Valuation Rate au wote wawili
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Tafadhali taja ama Wingi au Valuation Rate au wote wawili
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Utekelezaji
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Angalia katika Kifaa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Malipo ya Masoko
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Malipo ya Masoko
 ,Item Shortage Report,Ripoti ya uhaba wa habari
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Haiwezi kuunda vigezo vigezo. Tafadhali renama vigezo
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Uzito umetajwa, \ nSafadhali kutaja &quot;Uzito UOM&quot; pia"
@@ -2151,9 +2157,9 @@
 DocType: Upload Attendance,Get Template,Pata Kigezo
 DocType: Material Request,Transferred,Imehamishwa
 DocType: Vehicle,Doors,Milango
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Setup Kamili!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Setup Kamili!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kukusanya ada kwa Usajili wa Mgonjwa
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Haiwezi kubadilisha sifa baada ya shughuli za hisa. Panga Ncha mpya na uhamishe hisa kwenye Ncha mpya
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Haiwezi kubadilisha sifa baada ya shughuli za hisa. Panga Ncha mpya na uhamishe hisa kwenye Ncha mpya
 DocType: Course Assessment Criteria,Weightage,Uzito
 DocType: Purchase Invoice,Tax Breakup,Kuvunja kodi
 DocType: Packing Slip,PS-,PS-
@@ -2189,11 +2195,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Upatanisho JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Safu nyingi za safu. Tuma taarifa na uchapishe kwa kutumia programu ya lahajedwali.
 DocType: Purchase Invoice Item,Batch No,Bundi No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Maendeleo ya Waajiriwa
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Ruhusu Amri nyingi za Mauzo dhidi ya Utaratibu wa Ununuzi wa Wateja
 DocType: Student Group Instructor,Student Group Instructor,Mwalimu wa Kikundi cha Wanafunzi
 DocType: Grant Application,Assessment  Mark (Out of 10),Marko ya Tathmini (nje ya 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Simu ya Mkono Hakuna
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Kuu
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Kuu
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Tofauti
 DocType: Naming Series,Set prefix for numbering series on your transactions,Weka kiambishi kwa mfululizo wa nambari kwenye shughuli zako
 DocType: Employee Attendance Tool,Employees HTML,Waajiri HTML
@@ -2202,15 +2209,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Fursa kutoka shamba ni lazima
 DocType: Email Digest,Annual Expenses,Gharama za kila mwaka
 DocType: Item,Variants,Tofauti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Fanya Order ya Ununuzi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Fanya Order ya Ununuzi
 DocType: SMS Center,Send To,Tuma kwa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Hakuna usawa wa kutosha wa kuondoka kwa Aina ya Kuondoka {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Hakuna usawa wa kutosha wa kuondoka kwa Aina ya Kuondoka {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ilipunguzwa kiasi
 DocType: Sales Team,Contribution to Net Total,Mchango kwa Jumla ya Net
 DocType: Sales Invoice Item,Customer's Item Code,Msimbo wa Bidhaa ya Wateja
 DocType: Stock Reconciliation,Stock Reconciliation,Upatanisho wa hisa
 DocType: Territory,Territory Name,Jina la Wilaya
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Ghala ya Maendeleo ya Kazi inahitajika kabla ya Wasilisha
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Unaweza tu kuwa na Mipango yenye mzunguko wa bili sawa katika Usajili
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Mwombaji wa Kazi.
 DocType: Purchase Order Item,Warehouse and Reference,Ghala na Kumbukumbu
 DocType: Supplier,Statutory info and other general information about your Supplier,Maelezo ya kisheria na maelezo mengine ya jumla kuhusu Mtoa Wako
@@ -2218,10 +2226,10 @@
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Nguvu ya Kikundi cha Wanafunzi
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Tathmini
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Mazoezi ya Mafunzo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplicate Serial Hakuna aliingia kwa Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplicate Serial Hakuna aliingia kwa Item {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Orodha inayoongozwa na Chanzo cha Kiongozi.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Hali ya Utawala wa Usafirishaji
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Tafadhali ingiza
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Tafadhali ingiza
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Ingia ya Matengenezo
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Tafadhali weka kichujio kulingana na Bidhaa au Ghala
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Uzito wavu wa mfuko huu. (mahesabu ya moja kwa moja kama jumla ya uzito wa vitu)
@@ -2229,11 +2237,11 @@
 DocType: Sales Order,To Deliver and Bill,Kutoa na Bill
 DocType: Student Group,Instructors,Wafundishaji
 DocType: GL Entry,Credit Amount in Account Currency,Mikopo Kiasi katika Fedha ya Akaunti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} lazima iwasilishwa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} lazima iwasilishwa
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Shiriki Usimamizi
 DocType: Authorization Control,Authorization Control,Kudhibiti Udhibiti
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ghala iliyokataliwa ni lazima dhidi ya Kitu kilichokataliwa {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Malipo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Malipo
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Ghala {0} haihusishwa na akaunti yoyote, tafadhali taja akaunti katika rekodi ya ghala au kuweka akaunti ya hesabu ya msingi kwa kampuni {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Dhibiti amri zako
 DocType: Work Order Operation,Actual Time and Cost,Muda na Gharama halisi
@@ -2243,7 +2251,7 @@
 DocType: Student Leave Application,Student Leave Application,Maombi ya Kuondoka kwa Wanafunzi
 DocType: Item,Will also apply for variants,Pia itatumika kwa vipengee
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Mali haziwezi kufutwa, kama tayari {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mfanyakazi {0} kwenye siku ya nusu kwenye {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Mfanyakazi {0} kwenye siku ya nusu kwenye {1}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Vifungu vya vitu wakati wa kuuza.
 DocType: Material Request Plan Item,Actual Qty,Uhakika halisi
@@ -2252,7 +2260,7 @@
 DocType: Item,Barcodes,Barcodes
 DocType: Hub Category,Hub Node,Node ya Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Umeingiza vitu vya duplicate. Tafadhali tengeneza na jaribu tena.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Washirika
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Washirika
 DocType: Asset Movement,Asset Movement,Mwendo wa Mali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Kazi ya Kazi {0} lazima iwasilishwa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,New Cart
@@ -2270,13 +2278,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Fedha ya kulipia lazima iwe sawa na sarafu au kampuni ya sarafu ya kampuni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Inaonyesha kwamba mfuko ni sehemu ya utoaji huu (Tu Rasimu)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Row {0}: Tarehe ya Tuzo haiwezi kuwa kabla ya kutuma tarehe
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Row {0}: Tarehe ya Tuzo haiwezi kuwa kabla ya kutuma tarehe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Fanya Uingiaji wa Malipo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Wingi wa Bidhaa {0} lazima iwe chini ya {1}
 ,Sales Invoice Trends,Mwelekeo wa Mauzo ya Invoice
 DocType: Leave Application,Apply / Approve Leaves,Tumia / Thibitisha Majani
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Kwa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Inaweza kutaja safu tu ikiwa aina ya malipo ni &#39;Juu ya Uliopita Mshahara Kiasi&#39; au &#39;Uliopita Row Jumla&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Inaweza kutaja safu tu ikiwa aina ya malipo ni &#39;Juu ya Uliopita Mshahara Kiasi&#39; au &#39;Uliopita Row Jumla&#39;
 DocType: Sales Order Item,Delivery Warehouse,Ghala la Utoaji
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Mti wa vituo vya gharama za kifedha.
 DocType: Serial No,Delivery Document No,Nambari ya Hati ya Utoaji
@@ -2290,7 +2297,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Matumizi ya Nyenzo haijawekwa katika Mipangilio ya Uzalishaji.
 DocType: Student,Student Mobile Number,Namba ya Simu ya Wanafunzi
 DocType: Item,Has Variants,Ina tofauti
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Haiwezi kupindua kwa Item {0} katika mstari {1} zaidi ya {2}. Ili kuruhusu kulipia zaidi, tafadhali pangilia kwenye Mipangilio ya Hifadhi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Haiwezi kupindua kwa Item {0} katika mstari {1} zaidi ya {2}. Ili kuruhusu kulipia zaidi, tafadhali pangilia kwenye Mipangilio ya Hifadhi"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Sasisha jibu
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Tayari umechagua vitu kutoka {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Jina la Usambazaji wa Kila mwezi
@@ -2301,12 +2308,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Chagua programu kwanza
 DocType: Patient Appointment,Patient Age,Umri mgonjwa
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Miradi ya Kusimamia
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Serial hakuna {0} imerudi tayari
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Serial hakuna {0} imerudi tayari
 DocType: Supplier,Supplier of Goods or Services.,Uuzaji wa Bidhaa au Huduma.
 DocType: Budget,Fiscal Year,Mwaka wa fedha
 DocType: Asset Maintenance Log,Planned,Imepangwa
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Akaunti zilizopatikana zinazotumiwa kutumiwa ikiwa haziwekwa katika Mgonjwa ili uweke gharama za ushauri.
 DocType: Vehicle Log,Fuel Price,Bei ya Mafuta
+DocType: Bank Guarantee,Margin Money,Margin Pesa
 DocType: Budget,Budget,Bajeti
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Weka wazi
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Vifaa vya Mali isiyohamishika lazima iwe kipengee cha hisa.
@@ -2320,16 +2328,16 @@
 DocType: Lead,Follow Up,Fuatilia
 DocType: Item,Is Sales Item,Ni Bidhaa ya Mauzo
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Mti wa Kikundi cha Bidhaa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Kipengee {0} si kuanzisha kwa Serial Nos. Angalia kipengee cha kitu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Kipengee {0} si kuanzisha kwa Serial Nos. Angalia kipengee cha kitu
 DocType: Maintenance Visit,Maintenance Time,Muda wa Matengenezo
 ,Amount to Deliver,Kiasi cha Kutoa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Kitu kimoja kimeingizwa mara nyingi. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarehe ya Kuanza ya Mwisho haiwezi kuwa mapema zaidi kuliko Tarehe ya Mwanzo wa Mwaka wa Mwaka wa Chuo ambao neno hilo linaunganishwa (Mwaka wa Chuo {}). Tafadhali tengeneza tarehe na jaribu tena.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Kulikuwa na makosa.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Mfanyakazi {0} tayari ameomba kwa {1} kati ya {2} na {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Kulikuwa na makosa.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Mfanyakazi {0} tayari ameomba kwa {1} kati ya {2} na {3}:
 DocType: Guardian,Guardian Interests,Maslahi ya Guardian
 DocType: Naming Series,Current Value,Thamani ya sasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Miaka kadhaa ya fedha ikopo kwa tarehe {0}. Tafadhali weka kampuni katika Mwaka wa Fedha
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Miaka kadhaa ya fedha ikopo kwa tarehe {0}. Tafadhali weka kampuni katika Mwaka wa Fedha
 DocType: Education Settings,Instructor Records to be created by,Kumbukumbu ya Mwalimu ili kuundwa na
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} imeundwa
 DocType: GST Account,GST Account,Akaunti ya GST
@@ -2348,8 +2356,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Tarehe ya Kutokana haiwezi kuwa kabla ya Tarehe ya Kuweka
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Imeongezwa kwa Mapendeleo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Hakuna kuingizwa kwa mshahara kupatikana kwa kuwasilisha kwa vigezo vilivyochaguliwa hapo AU au malipo ya mshahara tayari yamewasilishwa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Kazi na Kodi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Hakuna kuingizwa kwa mshahara kupatikana kwa kuwasilisha kwa vigezo vilivyochaguliwa hapo AU au malipo ya mshahara tayari yamewasilishwa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Kazi na Kodi
 DocType: Projects Settings,Projects Settings,Mipangilio ya Miradi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Tafadhali ingiza tarehe ya Marejeo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} funguo za kulipa haziwezi kuchujwa na {1}
@@ -2359,27 +2367,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Mti wa Vikundi vya Bidhaa.
 DocType: Production Plan,Total Produced Qty,Uchina uliozalishwa
 DocType: Payroll Entry,Get Employee Details,Pata Maelezo ya Waajiri
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Haiwezi kutaja nambari ya mstari zaidi kuliko au sawa na nambari ya mstari wa sasa kwa aina hii ya malipo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Haiwezi kutaja nambari ya mstari zaidi kuliko au sawa na nambari ya mstari wa sasa kwa aina hii ya malipo
 DocType: Asset,Sold,Inauzwa
 ,Item-wise Purchase History,Historia ya Ununuzi wa hekima
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Tafadhali bonyeza &#39;Weka Ratiba&#39; ya Kuchukua Serial Hakuna Aliongeza kwa Item {0}
 DocType: Account,Frozen,Frozen
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Kiasi cha Msingi (Fedha la Kampuni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Malighafi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Malighafi
 DocType: Payment Reconciliation Payment,Reference Row,Row Reference
 DocType: Installation Note,Installation Time,Muda wa Ufungaji
 DocType: Sales Invoice,Accounting Details,Maelezo ya Uhasibu
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Futa Shughuli zote za Kampuni hii
 DocType: Patient,O Positive,O Chanya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Uwekezaji
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Uwekezaji
 DocType: Issue,Resolution Details,Maelezo ya Azimio
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Ugawaji
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Vigezo vya Kukubali
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Tafadhali ingiza Maombi ya Nyenzo katika meza iliyo hapo juu
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Hakuna malipo ya kutosha kwa Kuingia kwa Journal
 DocType: Item Attribute,Attribute Name,Jina la sifa
 DocType: BOM,Show In Website,Onyesha kwenye tovuti
 DocType: Shopping Cart Settings,Show Quantity in Website,Onyesha Wingi kwenye Tovuti
-DocType: Employee Loan Application,Total Payable Amount,Kiasi Kilivyoteuliwa
+DocType: Loan Application,Total Payable Amount,Kiasi Kilivyoteuliwa
 DocType: Task,Expected Time (in hours),Muda Unaotarajiwa (kwa saa)
 DocType: Item Reorder,Check in (group),Angalia (kikundi)
 DocType: Soil Texture,Silt,Silt
@@ -2398,7 +2407,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Fanya Malipo
 DocType: Room,Room Name,Jina la Chumba
 DocType: Prescription Duration,Prescription Duration,Muda wa Dawa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Kuondoka hakuwezi kutumiwa / kufutwa kabla ya {0}, kama usawa wa kuondoka tayari umepelekwa katika rekodi ya ugawaji wa kuondoka baadaye {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Kuondoka hakuwezi kutumiwa / kufutwa kabla ya {0}, kama usawa wa kuondoka tayari umepelekwa katika rekodi ya ugawaji wa kuondoka baadaye {1}"
 DocType: Activity Cost,Costing Rate,Kiwango cha gharama
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Anwani za Wateja Na Mawasiliano
 ,Campaign Efficiency,Ufanisi wa Kampeni
@@ -2416,11 +2425,11 @@
 DocType: Chapter,Chapter,Sura
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Jozi
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Akaunti ya msingi itasasishwa moja kwa moja katika ankara ya POS wakati hali hii inachaguliwa.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Chagua BOM na Uchina kwa Uzalishaji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Chagua BOM na Uchina kwa Uzalishaji
 DocType: Asset,Depreciation Schedule,Ratiba ya kushuka kwa thamani
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Mauzo ya Mazungumzo ya Washiriki na Mawasiliano
 DocType: Bank Reconciliation Detail,Against Account,Dhidi ya Akaunti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Tarehe ya Siku ya Nusu inapaswa kuwa kati ya Tarehe na Tarehe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Tarehe ya Siku ya Nusu inapaswa kuwa kati ya Tarehe na Tarehe
 DocType: Maintenance Schedule Detail,Actual Date,Tarehe halisi
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Tafadhali weka Kituo cha Ghali cha Default katika {0} kampuni.
 DocType: Item,Has Batch No,Ina Bande No
@@ -2438,7 +2447,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Tarehe ya mwisho ya mwisho (kupitia Karatasi ya Muda)
 DocType: Soil Texture,Soil Type,Aina ya Udongo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Kiasi {0} {1} dhidi ya {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Ujumbe mpya
 ,Quotation Trends,Mwelekeo wa Nukuu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Kikundi cha kipengee ambacho hakijajwa katika kipengee cha bidhaa kwa kipengee {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Hati ya GoCardless
@@ -2458,7 +2466,7 @@
 DocType: Hub Category,Hub Category,Jamii ya Hub
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nambari ya Gari
-DocType: Employee Loan,Loan Amount,Kiasi cha Mikopo
+DocType: Loan,Loan Amount,Kiasi cha Mikopo
 DocType: Student Report Generation Tool,Add Letterhead,Ongeza kichwa cha barua
 DocType: Program Enrollment,Self-Driving Vehicle,Gari ya kujitegemea
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Washirika wa Scorecard Wamesimama
@@ -2486,9 +2494,9 @@
 DocType: Cash Flow Mapper,Position,Nafasi
 DocType: Patient,Patient Details,Maelezo ya Mgonjwa
 DocType: Patient,B Positive,B Chanya
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
 DocType: Leave Block List Allow,Leave Block List Allow,Acha orodha ya kuzuia Kuruhusu
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
 DocType: Patient Medical Record,Patient Medical Record,Kumbukumbu ya Matibabu Mgonjwa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Gundi kwa Wasio Kikundi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Michezo
@@ -2496,8 +2504,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Jumla halisi
 DocType: Lab Test UOM,Test UOM,UOM ya mtihani
 DocType: Student Siblings,Student Siblings,Ndugu wa Wanafunzi
+DocType: Subscription Plan Detail,Subscription Plan Detail,Mpango wa Usajili
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Kitengo
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Tafadhali taja Kampuni
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Tafadhali taja Kampuni
 ,Customer Acquisition and Loyalty,Upatikanaji wa Wateja na Uaminifu
 DocType: Asset Maintenance Task,Maintenance Task,Kazi ya Matengenezo
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Tafadhali weka Mpaka wa B2C katika Mipangilio ya GST.
@@ -2511,6 +2520,7 @@
 ,BOM Search,Utafutaji wa BOM
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Jumla ya Gharama za Nyenzo Zilizotumiwa (kupitia Uingiaji wa hisa)
 DocType: Hub Settings,Company Registered,Kampuni iliyosajiliwa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Tarehe haiwezi kuwa chini ya Tarehe Kutoka Tarehe
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Chapisha &quot;Katika Hifadhi&quot; au &quot;Sio katika Hifadhi&quot; kwenye Hifadhi kulingana na hisa zilizopo katika ghala hii.
 DocType: Vehicle,Fuel Type,Aina ya mafuta
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Tafadhali taja fedha katika Kampuni
@@ -2518,17 +2528,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Usawa wa hisa katika Batch {0} utakuwa hasi {1} kwa Bidhaa {2} kwenye Ghala {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ufuatiliaji wa Nyenzo zifuatayo umefufuliwa kwa moja kwa moja kulingana na ngazi ya re-order ya Item
 DocType: Email Digest,Pending Sales Orders,Amri ya Mauzo inasubiri
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Akaunti {0} ni batili. Fedha ya Akaunti lazima iwe {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Akaunti {0} ni batili. Fedha ya Akaunti lazima iwe {1}
 DocType: Employee,Create User Permission,Unda Ruhusa ya Mtumiaji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
 DocType: Healthcare Settings,Remind Before,Kumkumbusha Kabla
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Kipengele cha kubadilisha UOM kinahitajika katika mstari {0}
 DocType: Production Plan Item,material_request_item,vifaa_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Uagizaji wa Mauzo, Invoice ya Mauzo au Ingiza Jarida"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu lazima iwe moja ya Uagizaji wa Mauzo, Invoice ya Mauzo au Ingiza Jarida"
 DocType: Salary Component,Deduction,Utoaji
 DocType: Item,Retain Sample,Weka Mfano
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Kutoka wakati na muda ni lazima.
 DocType: Stock Reconciliation Item,Amount Difference,Tofauti tofauti
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Item Bei imeongezwa kwa {0} katika Orodha ya Bei {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Item Bei imeongezwa kwa {0} katika Orodha ya Bei {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Tafadhali ingiza Id Idhini ya mtu huyu wa mauzo
 DocType: Territory,Classification of Customers by region,Uainishaji wa Wateja kwa kanda
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Katika Uzalishaji
@@ -2538,8 +2549,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Usawa wa Taarifa ya Benki
 DocType: Normal Test Template,Normal Test Template,Kigezo cha Mtihani wa kawaida
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,mtumiaji mlemavu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Nukuu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Haiwezi kuweka RFQ iliyopokea kwa No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Nukuu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Haiwezi kuweka RFQ iliyopokea kwa No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Utoaji Jumla
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Chagua akaunti ili uchapishe katika sarafu ya akaunti
@@ -2547,7 +2558,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hii inategemea shughuli za Mgonjwa. Tazama kalenda ya chini kwa maelezo zaidi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Gharama ya Kusasishwa
 DocType: Patient,Date of Birth,Tarehe ya kuzaliwa
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Kipengee {0} kimerejea
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Kipengee {0} kimerejea
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mwaka wa Fedha ** inawakilisha Mwaka wa Fedha. Entries zote za uhasibu na shughuli nyingine kubwa zinapatikana dhidi ya ** Mwaka wa Fedha **.
 DocType: Opportunity,Customer / Lead Address,Anwani ya Wateja / Kiongozi
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Kuweka Scorecard Setup
@@ -2558,14 +2569,15 @@
 DocType: Work Order Operation,Actual Operation Time,Saa halisi ya Uendeshaji
 DocType: Authorization Rule,Applicable To (User),Inafaa kwa (Mtumiaji)
 DocType: Purchase Taxes and Charges,Deduct,Deduct
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Maelezo ya Kazi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Maelezo ya Kazi
 DocType: Student Applicant,Applied,Imewekwa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Fungua tena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Fungua tena
 DocType: Sales Invoice Item,Qty as per Stock UOM,Uchina kama kwa hisa ya UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Jina la Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02-Chapisha Kuuza Discount
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Tabia maalum isipokuwa &quot;-&quot;, &quot;#&quot;, &quot;.&quot; na &quot;/&quot; haruhusiwi katika kutaja mfululizo"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Weka Orodha ya Kampeni za Mauzo. Weka wimbo wa Waongoza, Nukuu, Mauzo ya Mauzo nk kutoka Kampeni ili kupima Kurudi kwenye Uwekezaji."
+DocType: Department Approver,Approver,Msaidizi
 ,SO Qty,Uchina huo
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Shamba Kwa Mshirika hauwezi kuwa tupu
 DocType: Guardian,Work Address,Anwani ya Kazi
@@ -2579,21 +2591,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kiasi kilichopangwa (Kampuni ya Fedha)
 DocType: Purchase Order Item,To be delivered to customer,Ili kupelekwa kwa wateja
 DocType: BOM,Scrap Material Cost,Gharama za Nyenzo za Nyenzo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Serial Hakuna {0} sio Ghala lolote
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Serial Hakuna {0} sio Ghala lolote
 DocType: Grant Application,Email Notification Sent,Arifa ya barua pepe imetumwa
 DocType: Purchase Invoice,In Words (Company Currency),Katika Maneno (Fedha la Kampuni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Msimbo wa kipengee, ghala, wingi unahitajika kwenye mstari"
-DocType: Pricing Rule,Supplier,Mtoa huduma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Msimbo wa kipengee, ghala, wingi unahitajika kwenye mstari"
+DocType: Bank Guarantee,Supplier,Mtoa huduma
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Onyesha Maelezo ya Malipo
 DocType: Consultation,Consultation Time,Muda wa Ushauri
 DocType: C-Form,Quarter,Quarter
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Malipo tofauti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Malipo tofauti
 DocType: Global Defaults,Default Company,Kampuni ya Kichwa
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Akaunti au Tofauti akaunti ni lazima kwa Item {0} kama inathiri thamani ya jumla ya hisa
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Jina la Benki
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,Akaunti ya Mikopo ya Wafanyakazi
 DocType: Leave Application,Total Leave Days,Siku zote za kuondoka
 DocType: Email Digest,Note: Email will not be sent to disabled users,Kumbuka: Barua pepe haitatumwa kwa watumiaji walemavu
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Idadi ya Mahusiano
@@ -2608,7 +2619,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Uzito (Kilogramu)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",sura / sura_nameacha kuondoka tupu bila malipo baada ya kuhifadhi sura.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Tafadhali weka Akaunti za GST katika Mipangilio ya GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Tafadhali weka Akaunti za GST katika Mipangilio ya GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Aina ya Biashara
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Tafadhali chagua Kiwango kilichopakiwa, Aina ya Invoice na Nambari ya Invoice katika safu moja"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Gharama ya Ununuzi Mpya
@@ -2617,12 +2628,13 @@
 DocType: Grant Application,Grant Description,Maelezo ya Ruzuku
 DocType: Purchase Invoice Item,Rate (Company Currency),Kiwango (Fedha la Kampuni)
 DocType: Student Guardian,Others,Wengine
+DocType: Subscription,Discounts,Punguzo
 DocType: Payment Entry,Unallocated Amount,Kiasi kilichowekwa
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Haiwezi kupata kitu kinachofanana. Tafadhali chagua thamani nyingine ya {0}.
 DocType: POS Profile,Taxes and Charges,Kodi na Malipo
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bidhaa au Huduma inayotunuliwa, kuuzwa au kuhifadhiwa katika hisa."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Hakuna updates tena
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Haiwezi kuchagua aina ya malipo kama &#39;Juu ya Mda mrefu wa Mshahara&#39; au &#39;Kwenye Mstari Uliopita&#39; kwa mstari wa kwanza
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Haiwezi kuchagua aina ya malipo kama &#39;Juu ya Mda mrefu wa Mshahara&#39; au &#39;Kwenye Mstari Uliopita&#39; kwa mstari wa kwanza
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Hii inashughulikia alama zote za alama zilizowekwa kwenye Setup hii
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Item ya Watoto haipaswi kuwa Bundle ya Bidhaa. Tafadhali ondoa kitu `{0}` na uhifadhi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banking
@@ -2630,45 +2642,48 @@
 DocType: Vehicle Service,Service Item,Kitu cha Huduma
 DocType: Bank Guarantee,Bank Guarantee,Dhamana ya Benki
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Tafadhali bonyeza &#39;Generate Schedule&#39; ili kupata ratiba
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
 DocType: Bin,Ordered Quantity,Amri ya Amri
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",km &quot;Kujenga zana kwa wajenzi&quot;
 DocType: Grading Scale,Grading Scale Intervals,Kuweka vipindi vya Scale
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Faida kwa mwaka
+DocType: Bank Guarantee,Name of Bank,Jina la Benki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kuingia kwa Akaunti ya {2} inaweza tu kufanywa kwa fedha: {3}
 DocType: Fee Schedule,In Process,Katika Mchakato
 DocType: Authorization Rule,Itemwise Discount,Kutoa Pesa
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Mti wa akaunti za kifedha.
+DocType: Bank Guarantee,Reference Document Type,Aina ya Kumbukumbu ya Kumbukumbu
 DocType: Cash Flow Mapping,Cash Flow Mapping,Mapato ya Mapato ya Fedha
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} dhidi ya Uagizaji wa Mauzo {1}
 DocType: Account,Fixed Asset,Mali isiyohamishika
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Mali isiyohamishika
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Barua pepe haipatikani kwa kuwasiliana na wakati wote
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Kuzalisha siri
-DocType: Employee Loan,Account Info,Maelezo ya Akaunti
+DocType: Loan,Account Info,Maelezo ya Akaunti
 DocType: Activity Type,Default Billing Rate,Kiwango cha kulipa chaguo-msingi
 DocType: Fees,Include Payment,Jumuisha Malipo
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Vikundi vya Wanafunzi viliundwa.
 DocType: Sales Invoice,Total Billing Amount,Kiwango cha Jumla cha kulipia
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Mpango katika muundo wa ada na kikundi cha wanafunzi {0} ni tofauti.
 DocType: Fee Schedule,Receivable Account,Akaunti ya Kupokea
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Row # {0}: Malipo {1} tayari {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Row # {0}: Malipo {1} tayari {2}
 DocType: Quotation Item,Stock Balance,Mizani ya hisa
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Mauzo ya Malipo ya Malipo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Mkurugenzi Mtendaji
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Mkurugenzi Mtendaji
 DocType: Purchase Invoice,With Payment of Tax,Kwa Malipo ya Kodi
 DocType: Expense Claim Detail,Expense Claim Detail,Tumia maelezo ya dai
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,FINDA KWA MFASHAJI
 DocType: Land Unit,Is Container,"Je, kuna Chombo"
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Hii itakuwa siku 1 ya mzunguko wa mazao
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Tafadhali chagua akaunti sahihi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Tafadhali chagua akaunti sahihi
 DocType: Purchase Invoice Item,Weight UOM,Uzito UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Orodha ya Washiriki waliopatikana na namba za folio
 DocType: Salary Structure Employee,Salary Structure Employee,Mshirika wa Mshahara
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Onyesha sifa za Tofauti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Onyesha sifa za Tofauti
 DocType: Student,Blood Group,Kikundi cha Damu
 DocType: Course,Course Name,Jina la kozi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Watumiaji ambao wanaweza kupitisha maombi ya kuondoka kwa mfanyakazi maalum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Vifaa vya ofisi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Vifaa vya ofisi
 DocType: Purchase Invoice Item,Qty,Uchina
 DocType: Fiscal Year,Companies,Makampuni
 DocType: Supplier Scorecard,Scoring Setup,Kuweka Kuweka
@@ -2687,7 +2702,7 @@
 DocType: Stock Entry,Total Incoming Value,Thamani ya Ingizo Yote
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debit To inahitajika
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets kusaidia kuweka wimbo wa muda, gharama na bili kwa activites kufanyika kwa timu yako"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Orodha ya Bei ya Ununuzi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Orodha ya Bei ya Ununuzi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Matukio ya vigezo vya scorecard za wasambazaji.
 DocType: Job Offer Term,Offer Term,Muda wa Kutoa
 DocType: Asset,Quality Manager,Meneja wa Ubora
@@ -2699,13 +2714,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Jumla isiyolipwa: {0}
 DocType: BOM Website Operation,BOM Website Operation,Huduma ya tovuti ya BOM
 DocType: Supplier Scorecard,Supplier Score,Score ya Wasambazaji
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Jumla ya Amt Invoiced
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Jumla ya Amt Invoiced
 DocType: Supplier,Warn RFQs,Thibitisha RFQs
 DocType: BOM,Conversion Rate,Kiwango cha Kubadilisha
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Utafutaji wa Bidhaa
 DocType: Assessment Plan,To Time,Kwa Muda
 DocType: Authorization Rule,Approving Role (above authorized value),Idhini ya Kupitisha (juu ya thamani iliyoidhinishwa)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Mikopo Kwa akaunti lazima iwe akaunti ya kulipwa
+DocType: Loan,Total Amount Paid,Jumla ya Malipo
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Tafadhali chagua Uingizaji wa Mwanafunzi ambao ni lazima kwa mwombaji aliyepwa msamaha
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Upungufu wa BOM: {0} hawezi kuwa mzazi au mtoto wa {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Tafadhali chagua Orodha ya Bei ili kuchapisha bei
@@ -2715,18 +2731,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Orodha ya Bei {0} imezimwa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Uchina uliokamilika hauwezi kuwa zaidi ya {1} kwa uendeshaji {2}
 DocType: Manufacturing Settings,Allow Overtime,Ruhusu muda wa ziada
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Item ya Msingi {0} haiwezi kurekebishwa kwa kutumia Upatanisho wa Stock, tafadhali utumie Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Item ya Msingi {0} haiwezi kurekebishwa kwa kutumia Upatanisho wa Stock, tafadhali utumie Stock Entry"
 DocType: Training Event Employee,Training Event Employee,Mafunzo ya Tukio la Mfanyakazi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Sampuli za Upeo - {0} zinaweza kuhifadhiwa kwa Batch {1} na Bidhaa {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Ongeza Muda wa Muda
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Hesabu inahitajika kwa Bidhaa {1}. Umetoa {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Hesabu inahitajika kwa Bidhaa {1}. Umetoa {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Kiwango cha Thamani ya sasa
 DocType: Training Event,Advance,Mapema
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,kwa kufanya mara kwa mara tena.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Mipangilio ya njia ya malipo ya GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Kubadilisha / Kupoteza
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Kubadilisha / Kupoteza
 DocType: Opportunity,Lost Reason,Sababu iliyopotea
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Akaunti {1} si ya kampuni {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Akaunti {1} si ya kampuni {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Haikuweza kupata DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Anwani mpya
 DocType: Quality Inspection,Sample Size,Ukubwa wa Mfano
@@ -2745,7 +2760,6 @@
 DocType: Bin,Actual Quantity,Kiasi halisi
 DocType: Shipping Rule,example: Next Day Shipping,mfano: Utoaji wa siku inayofuata
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Hapana {0} haipatikani
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Usajili umekuwa {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Mpango wa ratiba ya ada
 DocType: Fee Schedule Program,Student Batch,Kundi la Wanafunzi
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Fanya Mwanafunzi
@@ -2760,14 +2774,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-commerce GSTIN
 DocType: Sales Order,Not Delivered,Haikutolewa
 ,Bank Clearance Summary,Muhtasari wa Muhtasari wa Benki
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Unda na udhibiti majaribio ya barua pepe kila siku, kila wiki na kila mwezi."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Unda na udhibiti majaribio ya barua pepe kila siku, kila wiki na kila mwezi."
 DocType: Appraisal Goal,Appraisal Goal,Lengo la Kutathmini
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Panga Jamii?
 DocType: Stock Reconciliation Item,Current Amount,Kiwango cha sasa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Majengo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Majengo
 DocType: Fee Schedule,Fee Structure,Mfumo wa Mali
 DocType: Timesheet Detail,Costing Amount,Kiwango cha gharama
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
 DocType: Student Admission Program,Application Fee,Malipo ya Maombi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Tuma Slip ya Mshahara
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm discount kwa Item {0} ni {1}%
@@ -2775,12 +2788,13 @@
 DocType: Sales Partner,Address & Contacts,Anwani na Mawasiliano
 DocType: SMS Log,Sender Name,Jina la Sender
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Vigezo vya Uchambuzi wa Kilimo
+DocType: HR Settings,Leave Approval Notification Template,Acha Kigezo cha Arifa Idhini
 DocType: POS Profile,[Select],[Chagua]
 DocType: Vital Signs,Blood Pressure (diastolic),Shinikizo la damu (diastoli)
 DocType: SMS Log,Sent To,Imepelekwa
 DocType: Agriculture Task,Holiday Management,Usimamizi wa Likizo
 DocType: Payment Request,Make Sales Invoice,Fanya ankara ya Mauzo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Tarehe ya Kuwasiliana inayofuata haiwezi kuwa katika siku za nyuma
 DocType: Company,For Reference Only.,Kwa Kumbukumbu Tu.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Daktari {0} haipatikani kwenye {1}
@@ -2798,7 +2812,7 @@
 DocType: Employee,New Workplace,Sehemu Mpya ya Kazi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Matumizi ya Nyenzo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Weka kama Imefungwa
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Hakuna kitu na Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Hakuna kitu na Barcode {0}
 DocType: Normal Test Items,Require Result Value,Thamani ya Thamani ya Uhitaji
 DocType: Item,Show a slideshow at the top of the page,Onyesha slideshow juu ya ukurasa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2813,19 +2827,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Hakuna muundo wa Mshahara wa Mshahara au wa Mteja uliopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
 DocType: Leave Block List,Allow Users,Ruhusu Watumiaji
 DocType: Purchase Order,Customer Mobile No,Nambari ya Simu ya Wateja
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Inaendelea
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Maelezo ya Kigezo cha Mapangilio ya Fedha
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Usimamizi wa Mikopo
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Fuatilia Mapato na gharama tofauti kwa vipimo vya bidhaa au mgawanyiko.
 DocType: Rename Tool,Rename Tool,Badilisha jina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Sasisha Gharama
 DocType: Item Reorder,Item Reorder,Kipengee Upya
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Onyesha Slip ya Mshahara
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Nyenzo za Uhamisho
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Onyesha Slip ya Mshahara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Nyenzo za Uhamisho
 DocType: Fees,Send Payment Request,Tuma Ombi la Malipo
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Taja shughuli, gharama za uendeshaji na kutoa Operesheni ya kipekee bila shughuli zako."
 DocType: Water Analysis,Origin,Mwanzo
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hati hii imepungua kwa {0} {1} kwa kipengee {4}. Je! Unafanya mwingine {3} dhidi ya sawa {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Chagua akaunti ya kubadilisha kiasi
 DocType: Purchase Invoice,Price List Currency,Orodha ya Bei ya Fedha
 DocType: Naming Series,User must always select,Mtumiaji lazima ague daima
@@ -2840,14 +2854,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,"Je, ni kodi ya kodi?"
 DocType: Grading Scale Interval,Grade Description,Maelezo ya Daraja
 DocType: Stock Entry,Purchase Receipt No,Ununuzi wa Receipt No
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Fedha za Kulipwa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Fedha za Kulipwa
 DocType: Sales Invoice, Shipping Bill Number,Nambari ya Bili ya Utoaji
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Ufuatiliaji
 DocType: Asset Maintenance Log,Actions performed,Vitendo vilifanyika
 DocType: Cash Flow Mapper,Section Leader,Kiongozi wa sehemu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Chanzo cha Mfuko (Madeni)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Chanzo cha Mfuko (Madeni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Wingi katika mstari {0} ({1}) lazima iwe sawa na wingi wa viwandani {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Mfanyakazi
+DocType: Bank Guarantee,Fixed Deposit Number,Nambari ya Amana zisizohamishika
 DocType: Asset Repair,Failure Date,Tarehe ya Kushindwa
 DocType: Sample Collection,Collected Time,Wakati uliokusanywa
 DocType: Company,Sales Monthly History,Historia ya Mwezi ya Mauzo
@@ -2864,10 +2879,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Una uhakika unataka kufuta miadi hii?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakiti ya bei ya chumba cha Hoteli
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Bomba la Mauzo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Tafadhali weka akaunti ya msingi katika Kipengele cha Mshahara {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Tafadhali weka akaunti ya msingi katika Kipengele cha Mshahara {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Inahitajika
 DocType: Rename Tool,File to Rename,Funga Kurejesha tena
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Pata Updates za Usajili
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Akaunti {0} hailingani na Kampuni {1} katika Mode ya Akaunti: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},BOM iliyojulikana {0} haipo kwa Bidhaa {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kozi:
@@ -2877,7 +2893,7 @@
 DocType: Notification Control,Expense Claim Approved,Madai ya Madai yaliidhinishwa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Hakuna Amri za Kazi zilizoundwa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa kipindi hiki
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Madawa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Madawa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Gharama ya Vitu Vilivyotunzwa
 DocType: Selling Settings,Sales Order Required,Amri ya Mauzo Inahitajika
 DocType: Purchase Invoice,Credit To,Mikopo Kwa
@@ -2895,7 +2911,7 @@
 DocType: Request for Quotation Supplier,No Quote,Hakuna Nukuu
 DocType: Warranty Claim,Raised By,Iliyotolewa na
 DocType: Payment Gateway Account,Payment Account,Akaunti ya Malipo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Tafadhali taja Kampuni ili kuendelea
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Tafadhali taja Kampuni ili kuendelea
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Mabadiliko ya Nambari katika Akaunti ya Kukubalika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Off Compensation
 DocType: Job Offer,Accepted,Imekubaliwa
@@ -2907,7 +2923,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Tafadhali hakikisha unataka kufuta shughuli zote za kampuni hii. Data yako bwana itabaki kama ilivyo. Hatua hii haiwezi kufutwa.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Matokeo ya Utafutaji
 DocType: Room,Room Number,Idadi ya Chumba
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Kumbukumbu batili {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Kumbukumbu batili {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Lebo ya Rule ya Utoaji
 DocType: Journal Entry Account,Payroll Entry,Kuingia kwa Mishahara
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Angalia Kumbukumbu za Malipo
@@ -2917,7 +2933,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
 DocType: Lab Test Sample,Lab Test Sample,Mfano wa Mtihani wa Lab
 DocType: Item Variant Settings,Allow Rename Attribute Value,Ruhusu Unda Thamani ya Thamani
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Huwezi kubadili kiwango kama BOM imetajwa agianst kitu chochote
 DocType: Restaurant,Invoice Series Prefix,Msaada wa Mfululizo wa Invoice
 DocType: Employee,Previous Work Experience,Uzoefu wa Kazi uliopita
@@ -2925,8 +2941,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Tafadhali ingiza Kiini kilichopangwa kwa Bidhaa {0} kwenye safu {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Ushirikiano wa Ramani za Google haukuwezeshwa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} haijawasilishwa
+DocType: Subscription,Trialling,Inakuja
 DocType: Member,Membership Expiry Date,Tarehe ya Kumalizika kwa Uanachama
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} lazima iwe hasi katika hati ya kurudi
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} lazima iwe hasi katika hati ya kurudi
 ,Minutes to First Response for Issues,Dakika kwa Maswali ya kwanza ya Masuala
 DocType: Purchase Invoice,Terms and Conditions1,Masharti na Masharti1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Jina la taasisi ambayo unaanzisha mfumo huu.
@@ -2945,7 +2962,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Kitengo cha Kupima
 DocType: Fiscal Year,Year End Date,Tarehe ya Mwisho wa Mwaka
 DocType: Task Depends On,Task Depends On,Kazi inategemea
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Fursa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Fursa
 DocType: Operation,Default Workstation,Kituo cha Kazi cha Kazi
 DocType: Notification Control,Expense Claim Approved Message,Ujumbe ulioidhinishwa wa dai
 DocType: Payment Entry,Deductions or Loss,Kupoteza au kupoteza
@@ -2983,7 +3000,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Acha bila ya kulipa hailingani na kumbukumbu za Maombi ya Kuondoka
 DocType: Campaign,Campaign-.####,Kampeni -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hatua Zingine
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Tafadhali usambaze vitu maalum kwa viwango bora zaidi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Tafadhali usambaze vitu maalum kwa viwango bora zaidi
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fanya ankara
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Kudumisha Mizani
@@ -2992,7 +3009,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,Barcode {0} sio sahihi {1} kificho
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Mwisho wa Mwaka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Kiongozi%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Tarehe ya Mwisho wa Mkataba lazima iwe kubwa kuliko Tarehe ya Kujiunga
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Tarehe ya Mwisho wa Mkataba lazima iwe kubwa kuliko Tarehe ya Kujiunga
 DocType: Driver,Driver,Dereva
 DocType: Vital Signs,Nutrition Values,Maadili ya lishe
 DocType: Lab Test Template,Is billable,Ni billable
@@ -3003,7 +3020,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Tarehe ya Kuanza Kuanza (kupitia Karatasi ya Muda)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Hii ni tovuti ya mfano iliyozalishwa kutoka ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Kipindi cha kuzeeka 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Jumla ya kiasi cha mapema haiwezi kuwa kubwa zaidi kuliko jumla ya kiasi kilichodaiwa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Jumla ya kiasi cha mapema haiwezi kuwa kubwa zaidi kuliko jumla ya kiasi kilichodaiwa
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3038,7 +3055,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Haiwezi kuzalisha kipengee zaidi {0} kuliko kiasi cha Mauzo ya Mauzo {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Chagua Maadili ya Tabia
 DocType: Purchase Invoice,Reason For Issuing document,Sababu ya Kuondoa hati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Uingiaji wa hisa {0} haujawasilishwa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Uingiaji wa hisa {0} haujawasilishwa
 DocType: Payment Reconciliation,Bank / Cash Account,Akaunti ya Benki / Cash
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Kuwasiliana Nafuatayo hawezi kuwa sawa na Anwani ya barua pepe
 DocType: Tax Rule,Billing City,Mji wa kulipia
@@ -3055,7 +3072,8 @@
 DocType: Warranty Claim,Service Address,Anwani ya Huduma
 DocType: Asset Maintenance Task,Calibration,Calibration
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ni likizo ya kampuni
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures na Marekebisho
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Acha Arifa ya Hali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Furnitures na Marekebisho
 DocType: Item,Manufacture,Tengeneza
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Kampuni ya Kuweka
 ,Lab Test Report,Ripoti ya Mtihani wa Lab
@@ -3071,7 +3089,6 @@
 DocType: Crop,Planting Area,Eneo la Kupanda
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumla (Uchina)
 DocType: Installation Note Item,Installed Qty,Uchina uliowekwa
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Hii inaweza kuwa kwa sababu ya Anwani za barua pepe zisizo sahihi katika
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Uliongeza
 DocType: Purchase Taxes and Charges,Parenttype,Mzazi
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Matokeo ya Mafunzo
@@ -3081,16 +3098,17 @@
 DocType: Products Settings,Products per Page,Bidhaa kwa Ukurasa
 DocType: Stock Ledger Entry,Outgoing Rate,Kiwango cha Kuondoka
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Shirika la tawi la taasisi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,au
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,au
 DocType: Sales Order,Billing Status,Hali ya kulipia
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ripoti Suala
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Malipo ya matumizi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Malipo ya matumizi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-juu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kuingia kwa Machapishaji {1} hawana akaunti {2} au tayari kuendana na chaguo jingine
 DocType: Supplier Scorecard Criteria,Criteria Weight,Vigezo vya uzito
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Acha Arifa ya Idhini
 DocType: Buying Settings,Default Buying Price List,Orodha ya Bei ya Kichuuzi
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Kulipwa kwa Mshahara Kulingana na Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kiwango cha kununua
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Kiwango cha kununua
 DocType: Notification Control,Sales Order Message,Ujumbe wa Utaratibu wa Mauzo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Weka Maadili ya Hifadhi kama Kampuni, Fedha, Sasa Fedha ya Sasa, nk."
 DocType: Payment Entry,Payment Type,Aina ya malipo
@@ -3112,6 +3130,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Mipangilio ya Cart Shopping
 DocType: Journal Entry,Accounting Entries,Uingizaji wa Uhasibu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ikiwa Rule ya bei iliyochaguliwa imefanywa kwa &#39;Kiwango&#39;, itatawala Orodha ya Bei. Kiwango cha Rule ya bei ni kiwango cha mwisho, kwa hiyo hakuna punguzo zaidi linapaswa kutumiwa. Kwa hiyo, katika shughuli kama Maagizo ya Mauzo, Utaratibu wa Ununuzi nk, itafutwa kwenye uwanja wa &#39;Kiwango&#39;, badala ya shamba la &quot;Orodha ya Thamani.&quot;"
+DocType: Journal Entry,Paid Loan,Mikopo iliyolipwa
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Kuingia kwa Duplicate. Tafadhali angalia Sheria ya Uidhinishaji {0}
 DocType: Journal Entry Account,Reference Due Date,Tarehe ya Kutokana na Kumbukumbu
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3128,7 +3147,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Ratiba ya Matengenezo haijazalishwa kwa vitu vyote. Tafadhali bonyeza &#39;Generate Schedule&#39;
 ,To Produce,Kuzalisha
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mishahara
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Kwa mstari {0} katika {1}. Ili ni pamoja na {2} katika kiwango cha kipengee, safu {3} lazima ziingizwe pia"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Kwa mstari {0} katika {1}. Ili ni pamoja na {2} katika kiwango cha kipengee, safu {3} lazima ziingizwe pia"
 DocType: Patient Service Unit,Parent Service Unit,Kitengo cha Utumishi wa Mzazi
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Fanya Mtumiaji
 DocType: Packing Slip,Identification of the package for the delivery (for print),Utambulisho wa mfuko wa utoaji (kwa kuchapishwa)
@@ -3146,7 +3165,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Akaunti ya Mapato
 DocType: Payment Request,Amount in customer's currency,Kiasi cha fedha za wateja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Utoaji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Utoaji
 DocType: Volunteer,Weekdays,Siku za wiki
 DocType: Stock Reconciliation Item,Current Qty,Uchina wa sasa
 DocType: Restaurant Menu,Restaurant Menu,Mkahawa wa Menyu
@@ -3154,7 +3173,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Eneo la Ujibu wa Ufunguo
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Majaribio ya Wanafunzi husaidia kufuatilia mahudhurio, tathmini na ada kwa wanafunzi"
 DocType: Payment Entry,Total Allocated Amount,Kiasi kilichopangwa
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Weka akaunti ya hesabu ya msingi kwa hesabu ya daima
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Weka akaunti ya hesabu ya msingi kwa hesabu ya daima
 DocType: Item Reorder,Material Request Type,Aina ya Uomba wa Nyenzo
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Tuma Email Review Review
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Mitaa ya Mitaa imejaa, haikuhifadhi"
@@ -3162,10 +3181,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Uwezo wa Chumba
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Tayari rekodi ipo kwa kipengee {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Utapoteza rekodi za ankara zinazozalishwa hapo awali. Una uhakika unataka kuanzisha upya usajili huu?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Malipo ya Usajili
 DocType: Budget,Cost Center,Kituo cha Gharama
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ujumbe wa Utaratibu wa Ununuzi
 DocType: Tax Rule,Shipping Country,Nchi ya Meli
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ficha Ideni ya Kodi ya Wateja kutoka kwa Mauzo ya Mauzo
@@ -3174,20 +3194,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Sheria ya bei ni kufuta Orodha ya Bei / kufafanua asilimia ya discount, kulingana na vigezo vingine."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Ghala inaweza tu kubadilishwa kupitia Stock Entry / Delivery Kumbuka / Ununuzi Receipt
 DocType: Employee Education,Class / Percentage,Hatari / Asilimia
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Mkuu wa Masoko na Mauzo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Mkuu wa Masoko na Mauzo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Kodi ya mapato
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Orodha inayoongozwa na Aina ya Viwanda.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Nenda kwenye Barua
+DocType: Subscription,Cancel At End Of Period,Futa Wakati wa Mwisho
 DocType: Item Supplier,Item Supplier,Muuzaji wa Bidhaa
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Tafadhali chagua thamani ya {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Hakuna Vichaguliwa kwa uhamisho
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Tafadhali chagua thamani ya {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Hakuna Vichaguliwa kwa uhamisho
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Anwani zote.
 DocType: Company,Stock Settings,Mipangilio ya hisa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Kuunganisha inawezekana tu kama mali zifuatazo zimefanana katika kumbukumbu zote mbili. Ni Kikundi, Aina ya Mizizi, Kampuni"
 DocType: Vehicle,Electric,Umeme
 DocType: Task,% Progress,Maendeleo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Kupata / Kupoteza kwa Upunguzaji wa Mali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Kupata / Kupoteza kwa Upunguzaji wa Mali
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Msaidizi wa Mwanafunzi tu na hali &quot;Imeidhinishwa&quot; itachaguliwa katika meza hapa chini.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Nambari ya Akaunti kwa akaunti {0} haipatikani. <br> Tafadhali kuanzisha Chati yako ya Akaunti kwa usahihi.
 DocType: Task,Depends on Tasks,Inategemea Kazi
@@ -3202,6 +3223,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Sio katika Hifadhi
 DocType: Volunteer,Volunteer Skills,Ujuzi wa Kujitolea
 DocType: Appraisal,HR User,Mtumiaji wa HR
+DocType: Bank Guarantee,Reference Document Name,Jina la Kumbukumbu la Kumbukumbu
 DocType: Purchase Invoice,Taxes and Charges Deducted,Kodi na Malipo zimefutwa
 apps/erpnext/erpnext/hooks.py +142,Issues,Mambo
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Hali lazima iwe moja ya {0}
@@ -3215,7 +3237,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} imezimwa
 DocType: Supplier,Billing Currency,Fedha ya kulipia
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Ziada kubwa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Ziada kubwa
+DocType: Loan,Loan Application,Maombi ya Mikopo
 DocType: Crop,Scientific Name,Jina la Sayansi
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Jumla ya Majani
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Pitia tena, ikiwa mteule aliyechaguliwa amehaririwa baada ya kuokoa"
@@ -3224,13 +3247,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Angalia Nambari
 ,Sales Browser,Kivinjari cha Mauzo
 DocType: Journal Entry,Total Credit,Jumla ya Mikopo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Onyo: Nyingine {0} # {1} ipo dhidi ya kuingia kwa hisa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Onyo: Nyingine {0} # {1} ipo dhidi ya kuingia kwa hisa {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Mitaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Mikopo na Maendeleo (Mali)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Wadaiwa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Kubwa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Kubwa
 DocType: Homepage Featured Product,Homepage Featured Product,Bidhaa ya Matukio ya Ukurasa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Makundi yote ya Tathmini
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Makundi yote ya Tathmini
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Jina jipya la ghala
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Jumla {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Nchi
@@ -3251,9 +3274,10 @@
 DocType: Fees,Fees,Malipo
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Taja Kiwango cha Kubadilika kubadilisha fedha moja hadi nyingine
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Nukuu {0} imefutwa
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Jumla ya Kiasi Kikubwa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Jumla ya Kiasi Kikubwa
 DocType: Sales Partner,Targets,Malengo
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Tafadhali kujiandikisha namba ya SIREN katika faili ya habari ya kampuni
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 DocType: Price List,Price List Master,Orodha ya Bei Mwalimu
 DocType: GST Account,CESS Account,Akaunti ya CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Shughuli zote za Mauzo zinaweza kutambulishwa dhidi ya watu wengi wa Mauzo ** ili uweze kuweka na kufuatilia malengo.
@@ -3262,6 +3286,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Chagua Mgonjwa
 DocType: Price List,Applicable for Countries,Inahitajika kwa Nchi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Jina la Kipimo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Tu Acha Maombi na hali &#39;Imeidhinishwa&#39; na &#39;Imekataliwa&#39; inaweza kuwasilishwa
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Jina la Kikundi cha Wanafunzi ni lazima katika mstari {0}
 DocType: Homepage,Products to be shown on website homepage,Bidhaa zinazoonyeshwa kwenye ukurasa wa nyumbani wa tovuti
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Huu ni kikundi cha wateja wa mizizi na hauwezi kuhaririwa.
@@ -3294,14 +3319,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Dawa tayari imeundwa kwa masaa yote ya kulipa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Jina la kosa: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Ni Gharama za Fedha
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Mahudhurio ya mfanyakazi {0} tayari amewekwa alama
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Mahudhurio ya mfanyakazi {0} tayari amewekwa alama
 DocType: Packing Slip,If more than one package of the same type (for print),Ikiwa zaidi ya mfuko mmoja wa aina moja (kwa kuchapishwa)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Tafadhali weka mteja default katika Mipangilio ya Mkahawa
 ,Salary Register,Daftari ya Mshahara
 DocType: Warehouse,Parent Warehouse,Ghala la Mzazi
-DocType: C-Form Invoice Detail,Net Total,Jumla ya Net
+DocType: Subscription,Net Total,Jumla ya Net
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},BOM ya kutosha haipatikani kwa Item {0} na Mradi {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Eleza aina mbalimbali za mkopo
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Eleza aina mbalimbali za mkopo
 DocType: Bin,FCFS Rate,Kiwango cha FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Kiasi Kikubwa
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Muda (kwa mchana)
@@ -3333,11 +3358,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Akaunti ya mizizi lazima iwe kikundi
 DocType: Drug Prescription,Drug Prescription,Dawa ya Dawa
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,Kulipwa / Kufungwa
+DocType: Loan,Repaid/Closed,Kulipwa / Kufungwa
 DocType: Item,Total Projected Qty,Jumla ya Uchina uliopangwa
 DocType: Monthly Distribution,Distribution Name,Jina la Usambazaji
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kiwango cha kiwango cha thamani haipatikani kwa Bidhaa {0}, ambayo inahitajika kufanya fomu za uhasibu kwa {1} {2}. Ikiwa kipengee kinatumia kama kiwango cha kiwango cha hesabu ya kiwango cha {1}, tafadhali angalia kuwa kwenye {1} meza ya jedwali. Vinginevyo, tafadhali tengeneza shughuli za hisa zinazoingia kwa kipengee au tumaja kiwango cha hesabu katika rekodi ya Bidhaa, kisha jaribu kuwasilisha / kufuta kufungua hii"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 DocType: Course,Course Code,Msimbo wa Kozi
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Ukaguzi wa Ubora unaohitajika kwa Bidhaa {0}
 DocType: POS Settings,Use POS in Offline Mode,Tumia POS katika Hali ya Nje
@@ -3357,16 +3381,15 @@
 DocType: Purchase Invoice,Deemed Export,Exported kuagizwa
 DocType: Stock Entry,Material Transfer for Manufacture,Uhamisho wa Nyenzo kwa Utengenezaji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Asilimia ya Punguzo inaweza kutumika ama dhidi ya orodha ya bei au orodha zote za bei.
-DocType: Subscription,Half-yearly,Nusu ya mwaka
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Kuingia kwa Uhasibu kwa Stock
 DocType: Lab Test,LabTest Approver,Msaidizi wa LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Tayari umehakikishia vigezo vya tathmini {}.
 DocType: Vehicle Service,Engine Oil,Mafuta ya injini
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Amri ya Kazi Iliundwa: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Amri ya Kazi Iliundwa: {0}
 DocType: Sales Invoice,Sales Team1,Timu ya Mauzo1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Kipengee {0} haipo
 DocType: Sales Invoice,Customer Address,Anwani ya Wateja
-DocType: Employee Loan,Loan Details,Maelezo ya Mikopo
+DocType: Loan,Loan Details,Maelezo ya Mikopo
 DocType: Company,Default Inventory Account,Akaunti ya Akaunti ya Default
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Nambari za folio hazifananishi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Uchina uliokamilika lazima uwe mkubwa kuliko sifuri.
@@ -3378,19 +3401,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Kiungo kwa Units zote za Ardhi ambazo Mazao huongezeka
 DocType: Account,Root Type,Aina ya mizizi
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Haiwezi kurudi zaidi ya {1} kwa Bidhaa {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Haiwezi kurudi zaidi ya {1} kwa Bidhaa {2}
 DocType: Item Group,Show this slideshow at the top of the page,Onyesha slideshow hii juu ya ukurasa
 DocType: BOM,Item UOM,Kipengee cha UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kiwango cha Ushuru Baada ya Kiasi cha Fedha (Fedha la Kampuni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Ghala inayolenga ni lazima kwa mstari {0}
 DocType: Cheque Print Template,Primary Settings,Mipangilio ya msingi
 DocType: Purchase Invoice,Select Supplier Address,Chagua Anwani ya Wasambazaji
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Ongeza Waajiriwa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Ongeza Waajiriwa
 DocType: Purchase Invoice Item,Quality Inspection,Ukaguzi wa Ubora
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Kinga ndogo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Kinga ndogo
 DocType: Company,Standard Template,Kigezo cha Kigezo
 DocType: Training Event,Theory,Nadharia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Onyo: Nyenzo Nambari Iliyoombwa ni chini ya Upeo wa chini wa Uagizaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Onyo: Nyenzo Nambari Iliyoombwa ni chini ya Upeo wa chini wa Uagizaji
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akaunti {0} imehifadhiwa
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Shirika la Kisheria / Subsidiary na Chart tofauti ya Akaunti ya Shirika.
 DocType: Payment Request,Mute Email,Tuma barua pepe
@@ -3410,11 +3433,10 @@
 DocType: SMS Log,No of Sent SMS,Hakuna SMS iliyotumwa
 DocType: Antibiotic,Healthcare Administrator,Msimamizi wa Afya
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Weka Lengo
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
 DocType: Dosage Strength,Dosage Strength,Nguvu ya Kipimo
 DocType: Account,Expense Account,Akaunti ya gharama
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Rangi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Rangi
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vigezo vya Mpango wa Tathmini
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Tarehe ya kumalizika ni lazima kwa bidhaa iliyochaguliwa
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zuia Maagizo ya Ununuzi
@@ -3427,18 +3449,18 @@
 DocType: Patient,Personal and Social History,Historia ya kibinafsi na ya kijamii
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Mtumiaji {0} ameundwa
 DocType: Fee Schedule,Fee Breakup for each student,Kulipwa kwa kila mwanafunzi
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Jumla ya mapema ({0}) dhidi ya Amri {1} haiwezi kuwa kubwa kuliko Jumla ya Jumla ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Jumla ya mapema ({0}) dhidi ya Amri {1} haiwezi kuwa kubwa kuliko Jumla ya Jumla ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chagua Usambazaji wa Kila mwezi ili usambaze malengo kwa miezi.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Badilisha Kanuni
 DocType: Purchase Invoice Item,Valuation Rate,Kiwango cha Thamani
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizeli
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Orodha ya Bei Fedha isiyochaguliwa
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Orodha ya Bei Fedha isiyochaguliwa
 DocType: Purchase Invoice,Availed ITC Cess,Imepata ITC Cess
 ,Student Monthly Attendance Sheet,Karatasi ya Wahudumu wa Mwezi kila mwezi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Sheria ya usafirishaji inatumika tu kwa Kuuza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Tarehe ya Kuanza Mradi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Mpaka
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Mpaka
 DocType: Rename Tool,Rename Log,Rejesha Ingia
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Kundi la Wanafunzi au Ratiba ya Kozi ni lazima
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Hifadhi Masaa ya Ulipaji na Masaa ya Kazi sawa na Timesheet
@@ -3458,7 +3480,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Andika orodha ya bidhaa au huduma zako unazouza au kuuza.
 DocType: Water Analysis,Storage Temperature,Joto la Uhifadhi
 DocType: Employee Attendance Tool,Unmarked Attendance,Uhudhurio usiojulikana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Mtafiti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Mtafiti
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Chombo cha Uandikishaji wa Programu Mwanafunzi
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Tarehe ya kuanza lazima iwe chini ya tarehe ya mwisho ya kazi {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Jina au barua pepe ni lazima
@@ -3471,7 +3493,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na RFQs kwa muuzaji huyu inapaswa kutolewa."
 DocType: Chapter,Non Profit Manager,Meneja Msaada
 DocType: BOM,Total Cost(Company Currency),Gharama ya Jumla (Fedha la Kampuni)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Serial Hapana {0} imeundwa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Serial Hapana {0} imeundwa
 DocType: Homepage,Company Description for website homepage,Maelezo ya Kampuni kwa homepage tovuti
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Kwa urahisi wa wateja, kanuni hizi zinaweza kutumiwa katika fomu za kuchapisha kama Invoices na Vidokezo vya Utoaji"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Jina la Juu
@@ -3481,11 +3503,10 @@
 DocType: Employee,You can enter any date manually,Unaweza kuingia tarehe yoyote kwa mkono
 DocType: Healthcare Settings,Result Printed,Matokeo yaliyochapishwa
 DocType: Asset Category Account,Depreciation Expense Account,Akaunti ya gharama ya kushuka kwa thamani
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Muda wa majaribio
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Tazama {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Muda wa majaribio
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Node tu za majani zinaruhusiwa katika shughuli
 DocType: Project,Total Costing Amount (via Timesheets),Kiwango cha jumla cha gharama (kupitia Timesheets)
-DocType: Employee Advance,Expense Approver,Msaidizi wa gharama
+DocType: Department,Expense Approver,Msaidizi wa gharama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: Upendeleo dhidi ya Wateja lazima uwe mkopo
 DocType: Project,Hourly,Kila Saa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Siyo Kikundi kwa Kundi
@@ -3494,7 +3515,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Ili Ufikiaji
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Ingia kwa kudumisha hali ya utoaji wa SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,Fanya Malipo kupitia Ingia ya Machapisho
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Kuchapishwa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Kuchapishwa
 DocType: Item,Inspection Required before Delivery,Ukaguzi unahitajika kabla ya Utoaji
 DocType: Item,Inspection Required before Purchase,Ukaguzi unahitajika kabla ya Ununuzi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Shughuli zinazosubiri
@@ -3504,7 +3525,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Kiwango cha chini cha utaratibu
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Shirika lako
 DocType: Fee Component,Fees Category,Ada ya Jamii
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Tafadhali ingiza tarehe ya kufuta.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Tafadhali ingiza tarehe ya kufuta.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Am
 DocType: Supplier Scorecard,Notify Employee,Wajulishe Waajiriwa
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ingiza jina la kampeni ikiwa chanzo cha uchunguzi ni kampeni
@@ -3514,7 +3535,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Reorder Level
 DocType: Company,Chart Of Accounts Template,Chati ya Kigezo cha Akaunti
 DocType: Attendance,Attendance Date,Tarehe ya Kuhudhuria
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Uvunjaji wa mshahara kulingana na Kupata na Kupunguza.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Akaunti yenye nodes za mtoto haiwezi kubadilishwa kwenye kiongozi
 DocType: Purchase Invoice Item,Accepted Warehouse,Ghala iliyokubaliwa
@@ -3522,10 +3543,11 @@
 DocType: Item,Valuation Method,Njia ya Hesabu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Timu ya Mauzo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Kuingia mara kwa mara
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Kuingia mara kwa mara
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Ingiza jina la Msaidizi kabla ya kuwasilisha.
 DocType: Program Enrollment Tool,Get Students,Pata Wanafunzi
 DocType: Serial No,Under Warranty,Chini ya udhamini
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Hitilafu]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Hitilafu]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Katika Maneno itaonekana wakati unapohifadhi Amri ya Mauzo.
 ,Employee Birthday,Kuzaliwa kwa Waajiriwa
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Tafadhali chagua tarehe ya kukamilisha ya kukamilika kukamilika
@@ -3544,7 +3566,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Imehifadhiwa kwa kuambukizwa ndogo
 DocType: Payment Reconciliation Invoice,Invoice Number,Nambari ya ankara
 DocType: Shopping Cart Settings,Orders,Amri
-DocType: Employee Leave Approver,Leave Approver,Acha Msaidizi
+DocType: Department,Leave Approver,Acha Msaidizi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Tafadhali chagua batch
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Jina la Kundi la Tathmini
@@ -3588,7 +3610,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Kitengo cha Ufuatiliaji wa Hub
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,KIFUNA KWA RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaunti ya Kushuka kwa Uzito
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Barua pepe hii imejitokeza
 DocType: Stock Settings,Freeze Stock Entries,Fungua Entries za Stock
 DocType: Program Enrollment,Boarding Student,Kuogelea Mwanafunzi
 DocType: Asset,Expected Value After Useful Life,Thamani Inayotarajiwa Baada ya Maisha ya Muhimu
@@ -3613,12 +3634,12 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Rekodi ya Mahudhurio {0} ipo dhidi ya Mwanafunzi {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Rejea # {0} dated {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Kushuka kwa thamani kumetolewa kutokana na uondoaji wa mali
-DocType: Member,Member,Mwanachama
+DocType: Loan,Member,Mwanachama
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Dhibiti Anwani
 DocType: Work Order Item,Work Order Item,Jedwali la Kazi ya Kazi
 DocType: Pricing Rule,Item Code,Msimbo wa kipengee
 DocType: Serial No,Warranty / AMC Details,Maelezo ya udhamini / AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Chagua wanafunzi kwa kikundi kwa Kundi la Shughuli
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chagua wanafunzi kwa kikundi kwa Kundi la Shughuli
 DocType: Journal Entry,User Remark,Remark ya Mtumiaji
 DocType: Lead,Market Segment,Sehemu ya Soko
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Meneja wa Kilimo
@@ -3626,7 +3647,7 @@
 DocType: Employee Internal Work History,Employee Internal Work History,Mfanyakazi wa Historia ya Kazi ya Kazi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Kufungwa (Dk)
 DocType: Cheque Print Template,Cheque Size,Angalia Ukubwa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial Hakuna {0} sio katika hisa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial Hakuna {0} sio katika hisa
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template ya kodi kwa kuuza shughuli.
 DocType: Sales Invoice,Write Off Outstanding Amount,Andika Off Kiasi Bora
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Akaunti {0} haifanani na Kampuni {1}
@@ -3634,7 +3655,6 @@
 DocType: Stock Settings,Default Stock UOM,Ufafanuzi wa hisa Uliopita
 DocType: Asset,Number of Depreciations Booked,Idadi ya kushuka kwa thamani iliyopangwa
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Uchina Jumla
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Dhidi ya Mkopo wa Wafanyakazi: {0}
 DocType: Landed Cost Item,Receipt Document,Hati ya Receipt
 DocType: Employee Education,School/University,Shule / Chuo Kikuu
 DocType: Payment Request,Reference Details,Maelezo ya Kumbukumbu
@@ -3645,7 +3665,7 @@
 DocType: Asset,Double Declining Balance,Mizani miwili ya kupungua
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Utaratibu wa kufungwa hauwezi kufutwa. Fungua kufuta.
 DocType: Student Guardian,Father,Baba
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,Mwisho Stock &#39;hauwezi kuchunguziwa kwa uuzaji wa mali fasta
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,Mwisho Stock &#39;hauwezi kuchunguziwa kwa uuzaji wa mali fasta
 DocType: Bank Reconciliation,Bank Reconciliation,Upatanisho wa Benki
 DocType: Attendance,On Leave,Kuondoka
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Pata Marekebisho
@@ -3659,10 +3679,10 @@
 DocType: Lead,Lower Income,Mapato ya chini
 DocType: Restaurant Order Entry,Current Order,Utaratibu wa sasa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Chanzo na ghala la lengo haliwezi kuwa sawa kwa mstari {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Athari ya tofauti lazima iwe akaunti ya aina ya Asset / Dhima, tangu hii Upatanisho wa Stock ni Ufungashaji wa Ufunguzi"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Kiasi kilichopotea hawezi kuwa kikubwa kuliko Kiasi cha Mikopo {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Athari ya tofauti lazima iwe akaunti ya aina ya Asset / Dhima, tangu hii Upatanisho wa Stock ni Ufungashaji wa Ufunguzi"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Kiasi kilichopotea hawezi kuwa kikubwa kuliko Kiasi cha Mikopo {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Nenda kwenye Programu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Kiasi kilichowekwa {1} haiwezi kuwa kikubwa kuliko kiasi kisichojulikana {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Kiasi kilichowekwa {1} haiwezi kuwa kikubwa kuliko kiasi kisichojulikana {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nambari ya Order ya Ununuzi inahitajika kwa Bidhaa {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Tarehe Tarehe&#39; lazima iwe baada ya &#39;Tarehe&#39;
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Haiwezi kubadilisha hali kama mwanafunzi {0} imeunganishwa na programu ya mwanafunzi {1}
@@ -3685,7 +3705,6 @@
 DocType: Payment Terms Template,Payment Terms,Masharti ya Malipo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Amri za Uzalishaji haziwezi kuinuliwa kwa:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Dakika
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 DocType: Purchase Invoice,Purchase Taxes and Charges,Malipo na Malipo ya Ununuzi
 DocType: Chapter,Meetup Embed HTML,Kukutana Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Nenda kwa Wauzaji
@@ -3704,30 +3723,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Nukuu {0} si ya aina {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ratiba ya Ratiba ya Matengenezo
 DocType: Sales Order,%  Delivered,Imetolewa
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Tafadhali weka Kitambulisho cha Barua pepe kwa Mwanafunzi ili kutuma Ombi la Malipo
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Tafadhali weka Kitambulisho cha Barua pepe kwa Mwanafunzi ili kutuma Ombi la Malipo
 DocType: Patient,Medical History,Historia ya Matibabu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Akaunti ya Overdraft ya Benki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Akaunti ya Overdraft ya Benki
 DocType: Patient,Patient ID,Kitambulisho cha Mgonjwa
 DocType: Physician Schedule,Schedule Name,Jina la Ratiba
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Fanya Slip ya Mshahara
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Ongeza Wauzaji Wote
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Ongeza Wauzaji Wote
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Mstari # {0}: Kiasi kilichowekwa hawezi kuwa kikubwa zaidi kuliko kiasi kikubwa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Tafuta BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Mikopo ya Salama
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Mikopo ya Salama
 DocType: Purchase Invoice,Edit Posting Date and Time,Badilisha Tarehe ya Kuchapisha na Muda
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Tafadhali weka Akaunti ya Depreciation kuhusiana na Kundi la Malipo {0} au Kampuni {1}
 DocType: Lab Test Groups,Normal Range,Rangi ya kawaida
 DocType: Academic Term,Academic Year,Mwaka wa Elimu
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Inapatikana Kuuza
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Kufungua Mizani Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Kufungua Mizani Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Inakaa
 DocType: Appraisal,Appraisal,Tathmini
+DocType: Loan,Loan Account,Akaunti ya Mkopo
 DocType: Purchase Invoice,GST Details,Maelezo ya GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Barua pepe imetumwa kwa muuzaji {0}
 DocType: Item,Default Sales Unit of Measure,Kipengee cha Mauzo cha Kiwango cha Mauzo
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Mwaka wa Chuo Kikuu:
+DocType: Subscription,Past Due Date,Tarehe ya Uliopita
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Usiruhusu kuweka kitu mbadala kwa kipengee {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarehe inarudiwa
@@ -3740,7 +3761,7 @@
 DocType: Patient Appointment,Patient Appointment,Uteuzi wa Mgonjwa
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Idhini ya kupitisha haiwezi kuwa sawa na jukumu utawala unaofaa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Ondoa kutoka kwa Ujumbe huu wa Barua pepe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Pata Wauzaji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Pata Wauzaji
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} haipatikani kwa Bidhaa {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Nenda kwa Kozi
 DocType: Accounts Settings,Show Inclusive Tax In Print,Onyesha kodi ya umoja katika kuchapisha
@@ -3748,10 +3769,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ujumbe uliotumwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Akaunti yenye nodes za watoto haiwezi kuweka kama kiongozi
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu&gt; Mipangilio ya Elimu
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Kiwango ambacho sarafu ya orodha ya Bei inabadilishwa kwa sarafu ya msingi ya mteja
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kiasi cha Fedha (Kampuni ya Fedha)
 DocType: Physician,Physician Schedules,Ratiba ya daktari
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Jumla ya kiasi cha mapema haiwezi kuwa kubwa zaidi kuliko kiasi cha jumla kilichowekwa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Jumla ya kiasi cha mapema haiwezi kuwa kubwa zaidi kuliko kiasi cha jumla kilichowekwa
 DocType: Salary Slip,Hour Rate,Kiwango cha Saa
 DocType: Stock Settings,Item Naming By,Kipengele kinachojulikana
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Muda mwingine wa Kuingia Ufungashaji {0} umefanywa baada ya {1}
@@ -3769,6 +3791,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Hairuhusiwi kusasisha ushirikiano wa hisa zaidi kuliko {0}
 DocType: BOM,Inspection Required,Ukaguzi unahitajika
 DocType: Purchase Invoice Item,PR Detail,Maelezo ya PR
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Ingiza Nambari ya Dhamana ya Benki kabla ya kuwasilisha.
 DocType: Driving License Category,Class,Darasa
 DocType: Sales Order,Fully Billed,Imejazwa kikamilifu
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Kazi ya Kazi haiwezi kuinuliwa dhidi ya Kigezo cha Bidhaa
@@ -3779,7 +3802,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Uzito mkubwa wa mfuko. Kawaida uzito wa uzito + uzito wa vifaa vya uzito. (kwa kuchapishwa)
 DocType: Assessment Plan,Program,Programu
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Watumiaji wenye jukumu hili wanaruhusiwa kuweka akaunti zilizohifadhiwa na kujenga / kurekebisha entries za uhasibu dhidi ya akaunti zilizohifadhiwa
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu&gt; Mipangilio ya Elimu
 DocType: Serial No,Is Cancelled,Imeondolewa
 DocType: Student Group,Group Based On,Kundi la msingi
 DocType: Journal Entry,Bill Date,Tarehe ya Bili
@@ -3790,9 +3812,10 @@
 DocType: Cheque Print Template,Cheque Height,Angalia Urefu
 DocType: Supplier,Supplier Details,Maelezo ya Wasambazaji
 DocType: Setup Progress,Setup Progress,Maendeleo ya Kuweka
+DocType: Expense Claim,Approval Status,Hali ya kibali
 DocType: Hub Settings,Publish Items to Hub,Chapisha Vitu kwa Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Kutoka thamani lazima iwe chini kuliko ya thamani katika mstari {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Uhamisho wa Wire
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Uhamisho wa Wire
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Angalia yote
 ,Issued Items Against Work Order,Vitu vinavyochaguliwa dhidi ya kazi
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
@@ -3823,12 +3846,11 @@
 DocType: Customs Tariff Number,Tariff Number,Nambari ya Tari
 DocType: Work Order Item,Available Qty at WIP Warehouse,Uchina Inapatikana katika WIP Ghala
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Imepangwa
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Serial Hakuna {0} si ya Ghala {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Serial Hakuna {0} si ya Ghala {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Kumbuka: Mfumo hautaangalia zaidi utoaji na utoaji wa ziada kwa Bidhaa {0} kama kiasi au kiasi ni 0
 DocType: Notification Control,Quotation Message,Ujumbe wa Nukuu
-DocType: Employee Loan,Employee Loan Application,Maombi ya Mikopo ya Waajiriwa
 DocType: Issue,Opening Date,Tarehe ya Ufunguzi
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Tafadhali salama mgonjwa kwanza
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Tafadhali salama mgonjwa kwanza
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Mahudhurio yamewekwa kwa mafanikio.
 DocType: Program Enrollment,Public Transport,Usafiri wa Umma
 DocType: Soil Texture,Silt Composition (%),Silt Muundo (%)
@@ -3846,7 +3868,7 @@
 ,Item Balance (Simple),Mizani ya Bidhaa (Rahisi)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Miradi iliyotolewa na Wauzaji.
 DocType: POS Profile,Write Off Account,Andika Akaunti
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Kumbuka Debit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Kumbuka Debit Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Kiasi cha Punguzo
 DocType: Purchase Invoice,Return Against Purchase Invoice,Rudi dhidi ya ankara ya ununuzi
 DocType: Item,Warranty Period (in days),Kipindi cha udhamini (katika siku)
@@ -3869,6 +3891,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Tarehe ya Utaratibu wa Mauzo
 DocType: Sales Invoice Item,Delivered Qty,Utoaji Uchina
 DocType: Assessment Plan,Assessment Plan,Mpango wa Tathmini
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Rejea Kuingia kwa Jarida
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Mteja {0} ameundwa.
 DocType: Stock Settings,Limit Percent,Percent Limit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hivi sasa hakuna hisa zinazopatikana katika ghala lolote
@@ -3882,14 +3905,15 @@
 DocType: Journal Entry,Stock Entry,Entry Entry
 DocType: Payment Entry,Payment References,Marejeo ya Malipo
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Idadi ya vipindi kwa uwanja wa kipindi cha mfano kama Ikiwa Muingizo ni &#39;Siku&#39; na Muda wa Kipaji cha Hesabu ni 3, ankara zitazalishwa kila siku 3"
 DocType: Vehicle,Insurance Details,Maelezo ya Bima
 DocType: Account,Payable,Inalipwa
 DocType: Share Balance,Share Type,Shiriki Aina
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Tafadhali ingiza Kipindi cha Malipo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Tafadhali ingiza Kipindi cha Malipo
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Wadaiwa ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Wateja wapya
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Faida Pato%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Faida Pato%
 DocType: Appraisal Goal,Weightage (%),Uzito (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Badilisha Profaili ya POS
 DocType: Bank Reconciliation Detail,Clearance Date,Tarehe ya kufuta
@@ -3899,10 +3923,11 @@
 DocType: Lead,Address Desc,Anwani Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Chama ni lazima
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Inapanda kwa duplicate tarehe kutokana na safu zingine zilipatikana: {orodha}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Inapanda kwa duplicate tarehe kutokana na safu zingine zilipatikana: {orodha}
 DocType: Topic,Topic Name,Jina la Mada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Tafadhali weka template default kwa Acha Acha idhini katika Mipangilio ya HR.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Atleast moja ya Mauzo au Ununuzi lazima ichaguliwe
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Chagua mfanyakazi ili aendelee mfanyakazi.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Chagua mfanyakazi ili aendelee mfanyakazi.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Tafadhali chagua Tarehe halali
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Chagua asili ya biashara yako.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3921,7 +3946,7 @@
 DocType: Asset Movement,Source Warehouse,Ghala la Chanzo
 DocType: Installation Note,Installation Date,Tarehe ya Usanidi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Shirikisha Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Malipo {1} si ya kampuni {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Malipo {1} si ya kampuni {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Invoice ya Mauzo {0} imeundwa
 DocType: Employee,Confirmation Date,Tarehe ya uthibitisho
 DocType: C-Form,Total Invoiced Amount,Kiasi kilichopakiwa
@@ -3930,7 +3955,7 @@
 DocType: Account,Accumulated Depreciation,Kushuka kwa thamani
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Jina lililosimama
 DocType: Stock Entry,Customer or Supplier Details,Maelezo ya Wateja au Wafanyabiashara
-DocType: Employee Loan Application,Required by Date,Inahitajika kwa Tarehe
+DocType: Loan Application,Required by Date,Inahitajika kwa Tarehe
 DocType: Lead,Lead Owner,Mmiliki wa Kiongozi
 DocType: Production Plan,Sales Orders Detail,Maagizo ya Mauzo ya Maelezo
 DocType: Bin,Requested Quantity,Waliombwa Wingi
@@ -3943,10 +3968,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pato la Pato la Jumla - Utoaji Jumla - Ulipaji wa Mikopo
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM ya sasa na BOM Mpya haiwezi kuwa sawa
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Kitambulisho cha Mshahara wa Mshahara
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Tarehe ya Kustaafu lazima iwe kubwa kuliko Tarehe ya kujiunga
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Tarehe ya Kustaafu lazima iwe kubwa kuliko Tarehe ya kujiunga
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Vipengele vingi
 DocType: Sales Invoice,Against Income Account,Dhidi ya Akaunti ya Mapato
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Ametolewa
+DocType: Subscription,Trial Period Start Date,Tarehe ya Kuanza Tarehe
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Kipengee {0}: Iliyoagizwa qty {1} haiwezi kuwa chini ya amri ya chini qty {2} (iliyoelezwa katika Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Asilimia ya Usambazaji wa Kila mwezi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Tafadhali ingia kama mtumiaji mwingine.
@@ -3967,12 +3993,11 @@
 DocType: Student Guardian,Student Guardian,Mlezi wa Mwanafunzi
 DocType: Member,Member Name,Jina la Mwanachama
 DocType: Stock Settings,Use Naming Series,Tumia Mfululizo wa Kumwita
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Malipo ya aina ya thamani haipatikani kama Kuunganisha
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Malipo ya aina ya thamani haipatikani kama Kuunganisha
 DocType: POS Profile,Update Stock,Sasisha Stock
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,katika usajili
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM tofauti kwa vitu itasababisha kutosa (Jumla) thamani ya uzito wa Nambari. Hakikisha kwamba Uzito wa Net wa kila kitu ni katika UOM sawa.
 DocType: Membership,Payment Details,Maelezo ya Malipo
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kiwango cha BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Kiwango cha BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Hifadhi ya Kazi iliyozuiwa haiwezi kufutwa, Fungua kwa kwanza kufuta"
 DocType: Asset,Journal Entry for Scrap,Jarida la Kuingia kwa Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Tafadhali puta vitu kutoka kwa Kumbuka Utoaji
@@ -3991,6 +4016,7 @@
 DocType: Land Unit,Land Unit,Kitengo cha Ardhi
 ,Purchase Analytics,Uchambuzi wa Ununuzi
 DocType: Sales Invoice Item,Delivery Note Item,Nambari ya Kumbuka ya Utoaji
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Invoice ya sasa {0} haipo
 DocType: Asset Maintenance Log,Task,Kazi
 DocType: Purchase Taxes and Charges,Reference Row #,Mstari wa Kumbukumbu #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nambari ya kundi ni lazima kwa Bidhaa {0}
@@ -4002,7 +4028,7 @@
 DocType: Company,Exchange Gain / Loss Account,Pata Akaunti ya Kupoteza / Kupoteza
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Mfanyakazi na Mahudhurio
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Lengo lazima iwe moja ya {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Jaza fomu na uihifadhi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Jaza fomu na uihifadhi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Jumuiya ya Jumuiya
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Kweli qty katika hisa
 DocType: Homepage,"URL for ""All Products""",URL ya &quot;Bidhaa Zote&quot;
@@ -4016,7 +4042,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Kiwango cha Uuzaji wa Standard
 DocType: Account,Rate at which this tax is applied,Kiwango ambacho kodi hii inatumiwa
 DocType: Cash Flow Mapper,Section Name,Jina la Sehemu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Rekebisha Uchina
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Rekebisha Uchina
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Open Job sasa
 DocType: Company,Stock Adjustment Account,Akaunti ya Marekebisho ya Hifadhi
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Andika
@@ -4027,9 +4053,9 @@
 DocType: Task,depends_on,inategemea na
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Imesababishwa kwa uboreshaji wa bei ya hivi karibuni katika Bila zote za Vifaa. Inaweza kuchukua dakika chache.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Jina la Akaunti mpya. Kumbuka: Tafadhali usijenge akaunti kwa Wateja na Wauzaji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nchi za hekima za Hitilafu za Hitilafu za Nchi
 DocType: Water Analysis,Appearance,Mwonekano
+DocType: HR Settings,Leave Status Notification Template,Acha Template ya Arifa ya Hali
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Mg. Kununua orodha ya bei ya bei
 DocType: Sales Order Item,Supplier delivers to Customer,Wasambazaji hutoa kwa Wateja
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Maelezo ya wanachama.
@@ -4052,7 +4078,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Hairuhusiwi. Tafadhali afya Kigezo cha Mtihani
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Asilimia ya Ugawaji lazima iwe sawa na 100%
 DocType: Crop Cycle,Linked Land Unit,Kitengo cha Ardhi kilichohusishwa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Tafadhali chagua Tarehe ya Kuweka kabla ya kuchagua Chama
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Tafadhali chagua Tarehe ya Kuweka kabla ya kuchagua Chama
 DocType: Program Enrollment,School House,Shule ya Shule
 DocType: Serial No,Out of AMC,Nje ya AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Idadi ya kushuka kwa thamani iliyotengenezwa haiwezi kuwa kubwa zaidi kuliko Jumla ya Idadi ya Dhamana
@@ -4068,7 +4094,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Nenda kwa Watumiaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Kiasi kilicholipwa + Andika Kiasi hawezi kuwa kubwa zaidi kuliko Jumla ya Jumla
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} si Nambari ya Batch halali ya Bidhaa {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Kumbuka: Hakuna usawa wa kutosha wa kuondoka kwa Aina ya Kuondoka {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Kumbuka: Hakuna usawa wa kutosha wa kuondoka kwa Aina ya Kuondoka {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN isiyo sahihi au Ingia NA kwa Usajili
 DocType: Training Event,Seminar,Semina
 DocType: Program Enrollment Fee,Program Enrollment Fee,Malipo ya Usajili wa Programu
@@ -4084,14 +4110,14 @@
 DocType: Hub Settings,Publish Availability,Chapisha Upatikanaji
 DocType: Company,Create Chart Of Accounts Based On,Unda Chati ya Hesabu za Akaunti
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Haiwezi kuibadilisha kuwa sio kundi. Kazi za Watoto zipo.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Tarehe ya kuzaliwa haiwezi kuwa kubwa kuliko leo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Tarehe ya kuzaliwa haiwezi kuwa kubwa kuliko leo.
 ,Stock Ageing,Kuzaa hisa
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Mwanafunzi {0} iko juu ya mwombaji wa mwanafunzi {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Marekebisho ya Upangaji (Kampuni ya Fedha)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Kundi:
 DocType: Volunteer,Afternoon,Saa ya asubuhi
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; imezimwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; imezimwa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Weka kama Fungua
 DocType: Cheque Print Template,Scanned Cheque,Angalia Angalia
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Tuma barua pepe moja kwa moja kwa Wafanyabiashara juu ya Kuwasilisha shughuli.
@@ -4107,7 +4133,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Mradi {0} tayari umepo
 DocType: Medical Department,Nursing User,Mtumiaji wa Uuguzi
 DocType: Plant Analysis,Plant Analysis Criterias,Criteria za Uchambuzi wa Kupanda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Majukumu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial Hakuna {0} si ya Kundi {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Majukumu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Kipindi cha uhalali wa nukuu hii imekwisha.
 DocType: Expense Claim Account,Expense Claim Account,Akaunti ya dai ya gharama
 DocType: Accounts Settings,Allow Stale Exchange Rates,Ruhusu Viwango vya Exchange za Stale
@@ -4129,11 +4156,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Fanya vigezo
 DocType: Item,Default BOM,BOM ya default
 DocType: Project,Total Billed Amount (via Sales Invoices),Kiasi kilicholipwa (kwa njia ya Mauzo ya Mauzo)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Takwimu ya Kumbuka ya Debit
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Takwimu ya Kumbuka ya Debit
 DocType: Project Update,Not Updated,Haijasasishwa
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Kuna kutofautiana kati ya kiwango, hakuna ya hisa na kiasi kilichohesabiwa"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Tafadhali rejesha jina la kampuni ili kuthibitisha
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Jumla ya Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Jumla ya Amt
 DocType: Journal Entry,Printing Settings,Mipangilio ya uchapishaji
 DocType: Employee Advance,Advance Account,Akaunti ya Awali
 DocType: Job Offer,Job Offer Terms,Masharti ya Kutoa Kazi
@@ -4142,7 +4169,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Magari
 DocType: Vehicle,Insurance Company,Kampuni ya Bima
 DocType: Asset Category Account,Fixed Asset Account,Akaunti ya Mali isiyohamishika
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Inaweza kubadilika
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Inaweza kubadilika
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Kutoka Kumbuka Utoaji
 DocType: Chapter,Members,Wanachama
 DocType: Student,Student Email Address,Anwani ya barua pepe ya wanafunzi
@@ -4165,7 +4192,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Ndani
 DocType: Delivery Stop,Address Name,Jina la Anwani
 DocType: Stock Entry,From BOM,Kutoka BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Kupunja {0} vitengo vya {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Kupunja {0} vitengo vya {1}
 DocType: Assessment Code,Assessment Code,Kanuni ya Tathmini
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Msingi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Ushirikiano wa hisa kabla ya {0} ni waliohifadhiwa
@@ -4173,25 +4200,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Hakuna kumbukumbu ni lazima ikiwa umeingia Tarehe ya Kumbukumbu
 DocType: Bank Reconciliation Detail,Payment Document,Hati ya Malipo
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Hitilafu ya kutathmini fomu ya vigezo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Tarehe ya kujiunga lazima iwe kubwa zaidi kuliko tarehe ya kuzaliwa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Tarehe ya kujiunga lazima iwe kubwa zaidi kuliko tarehe ya kuzaliwa
+DocType: Subscription,Plans,Mipango
 DocType: Salary Slip,Salary Structure,Mshahara wa Mshahara
 DocType: Account,Bank,Benki
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Ndege
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Matatizo ya Matatizo
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Hitilafu imetokea wakati wa kuunda mara kwa mara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Matatizo ya Matatizo
 DocType: Material Request Item,For Warehouse,Kwa Ghala
 DocType: Employee,Offer Date,Tarehe ya Kutoa
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Nukuu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Wewe uko katika hali ya mkondo. Hutaweza kupakia upya mpaka una mtandao.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hakuna Vikundi vya Wanafunzi vilivyoundwa.
 DocType: Purchase Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Kiwango cha Ushuru wa kila mwezi hawezi kuwa kubwa kuliko Kiwango cha Mikopo
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Kiwango cha Ushuru wa kila mwezi hawezi kuwa kubwa kuliko Kiwango cha Mikopo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Tafadhali ingiza maelezo ya Duka la kwanza
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Tarehe ya Utoaji Inayotarajiwa haiwezi kuwa kabla ya Tarehe ya Utunzaji wa Ununuzi
 DocType: Purchase Invoice,Print Language,Panga Lugha
 DocType: Salary Slip,Total Working Hours,Jumla ya Masaa ya Kazi
 DocType: Sales Invoice,Customer PO Details,Mteja PO Maelezo
-DocType: Subscription,Next Schedule Date,Tarehe ya Ratiba iliyofuata
 DocType: Stock Entry,Including items for sub assemblies,Ikijumuisha vitu kwa makusanyiko ndogo
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Akaunti ya Ufunguzi wa Muda
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Ingiza thamani lazima iwe nzuri
@@ -4219,11 +4245,11 @@
 DocType: Issue,Opening Time,Wakati wa Ufunguzi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Kutoka na Ili tarehe inahitajika
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Usalama &amp; Mchanganyiko wa Bidhaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Kitengo cha Mchapishaji cha Mchapishaji &#39;{0}&#39; lazima iwe sawa na katika Kigezo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Kitengo cha Mchapishaji cha Mchapishaji &#39;{0}&#39; lazima iwe sawa na katika Kigezo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tumia Mahesabu
 DocType: Delivery Note Item,From Warehouse,Kutoka kwa Ghala
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Hakuna wafanyakazi kwa vigezo vilivyotajwa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
 DocType: Hotel Settings,Default Customer,Wateja wa Mteja
 DocType: Assessment Plan,Supervisor Name,Jina la Msimamizi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Usihakikishe ikiwa uteuzi umeundwa kwa siku ile ile
@@ -4247,16 +4273,16 @@
 DocType: Journal Entry Account,Employee Advance,Waajiri wa Mapema
 DocType: Payroll Entry,Payroll Frequency,Frequency Frequency
 DocType: Lab Test Template,Sensitivity,Sensitivity
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Malighafi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Malighafi
 DocType: Leave Application,Follow via Email,Fuata kupitia barua pepe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Mimea na Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Mimea na Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kiwango cha Ushuru Baada ya Kiasi Kikubwa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Mipangilio ya kila siku ya Kazi ya Kazi
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Tafadhali ingiza Reqd kwa Tarehe
 DocType: Payment Entry,Internal Transfer,Uhamisho wa Ndani
 DocType: Asset Maintenance,Maintenance Tasks,Kazi za Matengenezo
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vipi lengo la qty au kiasi lengo ni lazima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Tafadhali chagua Tarehe ya Kuweka kwanza
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Tafadhali chagua Tarehe ya Kuweka kwanza
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Tarehe ya Ufunguzi lazima iwe kabla ya Tarehe ya Kufungwa
 DocType: Leave Control Panel,Carry Forward,Endelea mbele
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kituo cha Gharama na shughuli zilizopo haziwezi kugeuzwa kuwa kiongozi
@@ -4264,13 +4290,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Magonjwa yaliyoambukizwa
 ,Produced,Iliyotayarishwa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Tarehe ya Kulipa Ulipaji haiwezi kuwa kabla ya Tarehe ya Malipo.
 DocType: Item,Item Code for Suppliers,Kanuni ya Nambari ya Wafanyabiashara
 DocType: Issue,Raised By (Email),Iliyotolewa na (Barua pepe)
 DocType: Training Event,Trainer Name,Jina la Mkufunzi
 DocType: Mode of Payment,General,Mkuu
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Mawasiliano ya Mwisho
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Haiwezi kufuta wakati kiwanja ni kwa &#39;Valuation&#39; au &#39;Valuation na Jumla&#39;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serial Nos Inahitajika kwa Bidhaa Serialized {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Haiwezi kufuta wakati kiwanja ni kwa &#39;Valuation&#39; au &#39;Valuation na Jumla&#39;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serial Nos Inahitajika kwa Bidhaa Serialized {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Malipo ya mechi na ankara
 DocType: Journal Entry,Bank Entry,Kuingia kwa Benki
 DocType: Authorization Rule,Applicable To (Designation),Inafaa Kwa (Uteuzi)
@@ -4284,7 +4311,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Wezesha / afya ya fedha.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Dk {0} kwa siku ya nusu Acha {1}
 DocType: Production Plan,Get Material Request,Pata Ombi la Nyenzo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Malipo ya posta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Malipo ya posta
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumla (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Burudani &amp; Burudani
 ,Item Variant Details,Maelezo ya Toleo la Tofauti
@@ -4295,9 +4322,9 @@
 DocType: Drug Prescription,Hour,Saa
 DocType: Restaurant Order Entry,Last Sales Invoice,Hati ya Mwisho ya Mauzo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Tafadhali chagua Uchina dhidi ya bidhaa {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Serial Mpya Hapana haiwezi kuwa na Ghala. Ghala lazima liwekewe na Entry Entry au Receipt ya Ununuzi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Serial Mpya Hapana haiwezi kuwa na Ghala. Ghala lazima liwekewe na Entry Entry au Receipt ya Ununuzi
 DocType: Lead,Lead Type,Aina ya Kiongozi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Huna mamlaka ya kupitisha majani kwenye Tarehe ya Kuzuia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Huna mamlaka ya kupitisha majani kwenye Tarehe ya Kuzuia
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Vipengee hivi vyote tayari vinatumiwa
 DocType: Company,Monthly Sales Target,Lengo la Mauzo ya Mwezi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Inaweza kupitishwa na {0}
@@ -4305,7 +4332,7 @@
 DocType: Item,Default Material Request Type,Aina ya Ombi la Ufafanuzi wa Matumizi
 DocType: Supplier Scorecard,Evaluation Period,Kipimo cha Tathmini
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Haijulikani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Kazi ya Kazi haijatengenezwa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Kazi ya Kazi haijatengenezwa
 DocType: Shipping Rule,Shipping Rule Conditions,Masharti ya Kanuni za Uhamisho
 DocType: Purchase Invoice,Export Type,Aina ya Nje
 DocType: Salary Slip Loan,Salary Slip Loan,Mikopo ya Slip ya Mshahara
@@ -4321,7 +4348,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Kufungua Muhtasari wa ankara
 DocType: Education Settings,Education Manager,Meneja wa Elimu
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Urefu wa chini kati ya kila mmea katika shamba kwa ukuaji bora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kitambulisho cha Mchapishaji {0} hawezi kusasishwa kwa kutumia Upatanisho wa Stock, badala ya kutumia Uingizaji wa hisa"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kitambulisho cha Mchapishaji {0} hawezi kusasishwa kwa kutumia Upatanisho wa Stock, badala ya kutumia Uingizaji wa hisa"
 DocType: Quality Inspection,Report Date,Tarehe ya Ripoti
 DocType: Student,Middle Name,Jina la kati
 DocType: C-Form,Invoices,Invoices
@@ -4351,20 +4378,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Anwani ya barua pepe inapaswa kuwa ya kipekee, tayari ipo kwa {0}"
 DocType: Serial No,AMC Expiry Date,Tarehe ya Kumalizika ya AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Receipt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Receipt
 ,Sales Register,Daftari ya Mauzo
 DocType: Daily Work Summary Group,Send Emails At,Tuma Barua pepe Kwa
 DocType: Quotation,Quotation Lost Reason,Sababu iliyopoteza Nukuu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Rejea ya usafirishaji hakuna {0} dated {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Hakuna kitu cha kuhariri.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Tazama Fomu
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Mpangilio wa gharama unaohitajika katika dai ya gharama
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Muhtasari wa mwezi huu na shughuli zinazosubiri
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Ongeza watumiaji kwenye shirika lako, isipokuwa wewe mwenyewe."
 DocType: Customer Group,Customer Group Name,Jina la Kundi la Wateja
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Hakuna Wateja bado!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Taarifa ya Flow Flow
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Hakuna ombi la nyenzo lililoundwa
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Leseni
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Tafadhali ondoa hii ankara {0} kutoka C-Fomu {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Tafadhali chagua Kuendeleza ikiwa unataka pia kuweka usawa wa mwaka uliopita wa fedha hadi mwaka huu wa fedha
@@ -4387,11 +4415,12 @@
 DocType: Vehicle,Chassis No,Chassis No
 DocType: Payment Request,Initiated,Ilianzishwa
 DocType: Production Plan Item,Planned Start Date,Tarehe ya Kuanza Iliyopangwa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Tafadhali chagua BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Tafadhali chagua BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Taasisi iliyoingizwa ya ITC iliyopatikana
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
+DocType: Bank Guarantee,Clauses and Conditions,Makala na Masharti
 DocType: Serial No,Creation Document Type,Aina ya Hati ya Uumbaji
 DocType: Project Task,View Timesheet,Angalia Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tarehe ya mwisho lazima iwe kubwa kuliko tarehe ya kuanza
 DocType: Leave Type,Is Encash,Ni Encash
 DocType: Leave Allocation,New Leaves Allocated,Majani mapya yamewekwa
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data ya busara ya mradi haipatikani kwa Nukuu
@@ -4405,9 +4434,10 @@
 DocType: Patient,Alcohol Current Use,Pombe Sasa Matumizi
 DocType: Student Admission Program,Student Admission Program,Mpango wa Uingizaji wa Wanafunzi
 DocType: Payment Entry,Account Paid To,Akaunti Ililipwa
+DocType: Subscription Settings,Grace Period,Kipindi cha Neema
 DocType: Item Alternative,Alternative Item Name,Jina la Mchapishaji
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Item ya Mzazi {0} haipaswi kuwa Item ya Hifadhi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Haikuweza kuwasilisha Mpangilio wa Mshahara <br> Sababu zinazowezekana: <br> \ 1. Net kulipa ni chini ya 0. <br> \ 2. Kampuni ya barua pepe ya Kampuni iliyoelezwa katika bwana wa mfanyakazi si sahihi. <br>
@@ -4417,7 +4447,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajeti ya Akaunti {1} dhidi ya {2} {3} ni {4}. Itazidisha {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Akaunti {0} # Akaunti lazima iwe ya aina &#39;Mali isiyohamishika&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Nje ya Uchina
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,na Walemavu wasiozuiwa katika
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Mfululizo ni lazima
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Huduma za Fedha
 DocType: Student Sibling,Student ID,Kitambulisho cha Mwanafunzi
@@ -4429,14 +4458,16 @@
 DocType: Complaint,Complaint,Malalamiko
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
 DocType: Leave Allocation,Unused leaves,Majani yasiyotumika
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Fanya Uingizaji wa Malipo
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Idara zote
 DocType: Patient,Alcohol Past Use,Pombe Matumizi ya Kale
 DocType: Fertilizer Content,Fertilizer Content,Maudhui ya Mbolea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Tatizo / Kuzidi
 DocType: Tax Rule,Billing State,Hali ya kulipia
 DocType: Share Transfer,Transfer,Uhamisho
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Kazi ya Kazi {0} lazima iondoliwe kabla ya kufuta Sheria hii ya Mauzo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Pata BOM ilipungua (ikiwa ni pamoja na mikutano ndogo)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Pata BOM ilipungua (ikiwa ni pamoja na mikutano ndogo)
 DocType: Authorization Rule,Applicable To (Employee),Inafaa kwa (Mfanyakazi)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Tarehe ya Kutokana ni ya lazima
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Uingizaji wa Kushikilia {0} hauwezi kuwa 0
@@ -4460,10 +4491,11 @@
 DocType: Cheque Print Template,Message to show,Ujumbe wa kuonyesha
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Uuzaji
 DocType: Student Attendance,Absent,Haipo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle ya Bidhaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle ya Bidhaa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Haikuweza kupata alama kuanzia {0}. Unahitaji kuwa na alama zilizosimama zinazofunika 0 hadi 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: kumbukumbu isiyo sahihi {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kiguli cha Malipo na Chaguzi
+DocType: Subscription,Current Invoice Start Date,Sasa Tarehe ya Kuanza Anza
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Kiwango cha deni au kiasi cha mkopo kinahitajika kwa {2}
 DocType: GL Entry,Remarks,Maelezo
@@ -4473,11 +4505,13 @@
 DocType: Task,Parent Task,Kazi ya Mzazi
 DocType: Journal Entry,Write Off Based On,Andika Msaada
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Fanya Kiongozi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Chapisha na vifaa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Chapisha na vifaa
 DocType: Stock Settings,Show Barcode Field,Onyesha uwanja wa barcode
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Tuma barua pepe za Wasambazaji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mshahara tayari umeongezwa kwa muda kati ya {0} na {1}, Kuacha kipindi cha maombi hawezi kuwa kati ya tarehe hii ya tarehe."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Tuma barua pepe za Wasambazaji
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mshahara tayari umeongezwa kwa muda kati ya {0} na {1}, Kuacha kipindi cha maombi hawezi kuwa kati ya tarehe hii ya tarehe."
+DocType: Fiscal Year,Auto Created,Auto Iliyoundwa
 DocType: Chapter Member,Leave Reason,Acha Sababu
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Invoice {0} haipo tena
 DocType: Guardian Interest,Guardian Interest,Maslahi ya Guardian
 DocType: Volunteer,Availability,Upatikanaji
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Weka maadili ya msingi ya POS ankara
@@ -4485,14 +4519,13 @@
 DocType: Project,Time to send,Muda wa kutuma
 DocType: Timesheet,Employee Detail,Maelezo ya Waajiriwa
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Barua ya barua pepe
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Siku ya Tarehe inayofuata na kurudia siku ya mwezi lazima iwe sawa
 DocType: Lab Prescription,Test Code,Kanuni ya mtihani
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Mipangilio ya ukurasa wa nyumbani wa wavuti
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs haziruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}
 DocType: Job Offer,Awaiting Response,Inasubiri Jibu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Juu
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Jumla ya Kiasi {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Tabia isiyo sahihi {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Jumla ya Kiasi {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Tabia isiyo sahihi {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Eleza kama akaunti isiyo ya kawaida kulipwa
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Tafadhali chagua kikundi cha tathmini badala ya &#39;Makundi Yote ya Tathmini&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: Kituo cha gharama kinahitajika kwa kipengee {1}
@@ -4503,7 +4536,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Uchambuzi wa Maji
 DocType: Chapter,Region,Mkoa
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Hiari. Mpangilio huu utatumika kufuta katika shughuli mbalimbali.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Kiwango cha Vikwazo Kibaya haruhusiwi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Kiwango cha Vikwazo Kibaya haruhusiwi
 DocType: Holiday List,Weekly Off,Kutoka kwa kila wiki
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Rejesha Upya Uchambuzi
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Kwa mfano 2012, 2012-13"
@@ -4519,7 +4552,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Gharama ya Kutolewa kwa Mali
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kituo cha Gharama ni lazima kwa Bidhaa {2}
 DocType: Vehicle,Policy No,Sera ya Sera
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Pata vipengee kutoka kwenye Mfuko wa Bidhaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Pata vipengee kutoka kwenye Mfuko wa Bidhaa
 DocType: Asset,Straight Line,Sawa Mstari
 DocType: Project User,Project User,Mtumiaji wa Mradi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4555,21 +4588,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Njia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Haiwezi kubadilisha Kituo cha Gharama kwenye kiwanja kama ina nodes za watoto
 DocType: Production Plan,Total Planned Qty,Uchina Uliopangwa
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Thamani ya Ufunguzi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Thamani ya Ufunguzi
 DocType: Salary Detail,Formula,Mfumo
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Kigezo cha Mtihani wa Lab
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Akaunti ya Mauzo
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Akaunti ya Mauzo
 DocType: Purchase Invoice Item,Total Weight,Uzito wote
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Tume ya Mauzo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Tume ya Mauzo
 DocType: Job Offer Term,Value / Description,Thamani / Maelezo
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Malipo {1} haiwezi kufungwa, tayari ni {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Malipo {1} haiwezi kufungwa, tayari ni {2}"
 DocType: Tax Rule,Billing Country,Nchi ya kulipia
 DocType: Purchase Order Item,Expected Delivery Date,Tarehe ya Utoaji Inayotarajiwa
 DocType: Restaurant Order Entry,Restaurant Order Entry,Mkahawa wa Kuingia Uagizaji
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit na Mikopo si sawa kwa {0} # {1}. Tofauti ni {2}.
 DocType: Asset Maintenance Task,Assign To Name,Weka kwa jina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Gharama za Burudani
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Gharama za Burudani
 DocType: Hub Settings,Enabled Users,Watumiaji waliowezeshwa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Fanya ombi la Nyenzo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Fungua Toleo {0}
@@ -4582,24 +4615,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Maombi ya kuondoka.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Akaunti na shughuli zilizopo haziwezi kufutwa
 DocType: Vehicle,Last Carbon Check,Check Carbon Mwisho
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Gharama za Kisheria
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Gharama za Kisheria
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Tafadhali chagua kiasi kwenye mstari
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Fanya Mauzo ya Kufungua na Ununuzi
 DocType: Purchase Invoice,Posting Time,Wakati wa Kuchapa
 DocType: Timesheet,% Amount Billed,Kiasi kinachojazwa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Malipo ya Simu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Malipo ya Simu
 DocType: Sales Partner,Logo,Rangi
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Angalia hii ikiwa unataka kulazimisha mtumiaji kuchagua mfululizo kabla ya kuokoa. Hutakuwa na default ikiwa utaangalia hii.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Hakuna kitu na Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Hakuna kitu na Serial No {0}
 DocType: Email Digest,Open Notifications,Fungua Arifa
 DocType: Payment Entry,Difference Amount (Company Currency),Tofauti Kiasi (Fedha la Kampuni)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Malipo ya moja kwa moja
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Malipo ya moja kwa moja
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Mapato ya Wateja Mpya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Gharama za kusafiri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Gharama za kusafiri
 DocType: Maintenance Visit,Breakdown,Kuvunja
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Ongeza usajili wa desturi kwenye mafundisho {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Akaunti: {0} kwa fedha: {1} haiwezi kuchaguliwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Akaunti: {0} kwa fedha: {1} haiwezi kuchaguliwa
 DocType: Purchase Receipt Item,Sample Quantity,Mfano Wingi
+DocType: Bank Guarantee,Name of Beneficiary,Jina la Mfadhili
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Sasisha BOM gharama moja kwa moja kupitia Mpangilio, kwa kuzingatia kiwango cha hivi karibuni cha kiwango cha bei / bei ya bei / mwisho wa ununuzi wa vifaa vya malighafi."
 DocType: Bank Reconciliation Detail,Cheque Date,Tarehe ya Kuangalia
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Akaunti {0}: Akaunti ya Mzazi {1} si ya kampuni: {2}
@@ -4611,14 +4644,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Vipengele vya Mshahara
 DocType: Program Enrollment Tool,New Academic Year,Mwaka Mpya wa Elimu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Kurudi / Taarifa ya Mikopo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Kurudi / Taarifa ya Mikopo
 DocType: Stock Settings,Auto insert Price List rate if missing,Weka kwa urahisi Orodha ya Bei ya Orodha ikiwa haipo
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Jumla ya kulipwa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Jumla ya kulipwa
 DocType: GST Settings,B2C Limit,Mpaka wa B2C
 DocType: Work Order Item,Transferred Qty,Uchina uliotumwa
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Inasafiri
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Kupanga
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Kupanga
 DocType: Share Balance,Issued,Iliyotolewa
+DocType: Loan,Repayment Start Date,Tarehe ya Kuanza Kulipa
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Shughuli ya Wanafunzi
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Idha ya Wasambazaji
 DocType: Payment Request,Payment Gateway Details,Maelezo ya Gateway ya Malipo
@@ -4633,7 +4667,7 @@
 DocType: Payment Entry,PE-,PE-
 DocType: Assessment Result,Student Name,Jina la Mwanafunzi
 DocType: Brand,Item Manager,Meneja wa Bidhaa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Mishahara ya kulipa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Mishahara ya kulipa
 DocType: Buying Settings,Default Supplier Type,Aina ya Wasambazaji wa Default
 DocType: Plant Analysis,Collection Datetime,Mkusanyiko wa Tarehe
 DocType: Work Order,Total Operating Cost,Gharama ya Uendeshaji Yote
@@ -4643,9 +4677,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Mtumiaji {0} haipo
 DocType: Payment Term,Day(s) after invoice date,Siku (s) baada ya tarehe ya ankara
 DocType: Payment Schedule,Payment Schedule,Ratiba ya Malipo
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Hali
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Kuingia kwa Malipo tayari kuna
+DocType: Subscription,Trial Period End Date,Tarehe ya Mwisho wa Kipindi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Sio kuchapishwa tangu {0} inapozidi mipaka
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Mshauri wa template mshahara.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patholojia
@@ -4662,9 +4696,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes Kuongoza au Wateja.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Kazi Imeruhusiwa kuhariri hisa zilizohifadhiwa
 ,Territory Target Variance Item Group-Wise,Ugawanyiko wa Target Kikundi Kikundi-Hekima
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Vikundi vyote vya Wateja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Vikundi vyote vya Wateja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Imekusanywa kila mwezi
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ni lazima. Kumbukumbu ya Kubadilisha Fedha Labda haikuundwa kwa {1} kwa {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ni lazima. Kumbukumbu ya Kubadilisha Fedha Labda haikuundwa kwa {1} kwa {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Kigezo cha Kodi ni lazima.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Akaunti {0}: Akaunti ya Mzazi {1} haipo
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Orodha ya Bei ya Thamani (Fedha la Kampuni)
@@ -4673,14 +4707,15 @@
 DocType: Lab Prescription,Test Created,Mtihani Umeundwa
 DocType: Healthcare Settings,Custom Signature in Print,Sahihi ya Sahihi katika Kuchapa
 DocType: Account,Temporary,Muda
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,LPO ya Wateja
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,LPO ya Wateja
 DocType: Program,Courses,Mafunzo
 DocType: Monthly Distribution Percentage,Percentage Allocation,Asilimia ya Ugawaji
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Katibu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Katibu
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ikiwa imezima, shamba la &#39;Katika Maneno&#39; halitaonekana katika shughuli yoyote"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Hatua hii itaacha bili ya baadaye. Una uhakika unataka kufuta usajili huu?
 DocType: Serial No,Distinct unit of an Item,Kitengo cha tofauti cha Kipengee
 DocType: Supplier Scorecard Criteria,Criteria Name,Jina la Criteria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Tafadhali weka Kampuni
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Tafadhali weka Kampuni
 DocType: Pricing Rule,Buying,Ununuzi
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Magonjwa &amp; Fertilizers
 DocType: HR Settings,Employee Records to be created by,Kumbukumbu za Waajiri zitaundwa na
@@ -4689,17 +4724,17 @@
 DocType: POS Profile,Apply Discount On,Tumia Ruzuku
 DocType: Member,Membership Type,Aina ya Uanachama
 ,Reqd By Date,Reqd Kwa Tarehe
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Wakopaji
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Wakopaji
 DocType: Assessment Plan,Assessment Name,Jina la Tathmini
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Onyesha PDC katika Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Onyesha PDC katika Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Row # {0}: Serial Hakuna lazima
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Jedwali Maelezo ya kodi ya busara
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Kazi ya Kazi
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Usanidi wa Taasisi
 ,Item-wise Price List Rate,Orodha ya bei ya bei ya bei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Nukuu ya Wafanyabiashara
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Nukuu ya Wafanyabiashara
 DocType: Quotation,In Words will be visible once you save the Quotation.,Katika Maneno itaonekana wakati unapohifadhi Nukuu.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Wingi ({0}) hawezi kuwa sehemu ya mstari {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Wingi ({0}) hawezi kuwa sehemu ya mstari {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Barcode {0} tayari kutumika katika Item {1}
@@ -4717,7 +4752,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Tofauti ya Jumla
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ikiwa imewezeshwa, mfumo utasoma fomu za uhasibu kwa hesabu moja kwa moja."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Uhamisho
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Kuhudhuria kwa mfanyakazi {0} tayari umewekwa alama kwa siku hii
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Kuhudhuria kwa mfanyakazi {0} tayari umewekwa alama kwa siku hii
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",Katika Dakika Iliyopita kupitia &quot;Muda wa Kuingia&quot;
 DocType: Customer,From Lead,Kutoka Kiongozi
@@ -4728,6 +4763,7 @@
 DocType: Lab Test,Approved Date,Tarehe iliyoidhinishwa
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Uuzaji wa kawaida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Atleast ghala moja ni lazima
+DocType: Subscriber,Subscriber Name,Jina la Msajili
 DocType: Serial No,Out of Warranty,Nje ya udhamini
 DocType: BOM Update Tool,Replace,Badilisha
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Hakuna bidhaa zilizopatikana.
@@ -4737,19 +4773,18 @@
 DocType: Request for Quotation Item,Project Name,Jina la Mradi
 DocType: Customer,Mention if non-standard receivable account,Eleza kama akaunti isiyo ya kawaida ya kupokea
 DocType: Journal Entry Account,If Income or Expense,Kama Mapato au Gharama
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Chagua akaunti ya mapato ya riba katika mkopo wa mfanyakazi {0}
 DocType: Work Order,Required Items,Vitu vinavyotakiwa
 DocType: Stock Ledger Entry,Stock Value Difference,Thamani ya Thamani ya Hifadhi
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Rasilimali watu
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Malipo ya Upatanisho wa Malipo
 DocType: Disease,Treatment Task,Kazi ya Matibabu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Mali ya Kodi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Mali ya Kodi
 DocType: BOM Item,BOM No,BOM Hapana
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Uingiaji wa Vitambulisho {0} hauna akaunti {1} au tayari imefananishwa dhidi ya vyeti vingine
 DocType: Item,Moving Average,Kusonga Wastani
 DocType: BOM Update Tool,The BOM which will be replaced,BOM ambayo itabadilishwa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Vifaa vya umeme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Vifaa vya umeme
 DocType: Asset,Maintenance Required,Matengenezo Inahitajika
 DocType: Account,Debit,Debit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Majani yanapaswa kuwekwa kwa mara nyingi ya 0.5
@@ -4758,7 +4793,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amt bora
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Weka malengo Makala ya busara ya Kikundi kwa Mtu wa Mauzo.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zifungia Hifadhi za Kale kuliko [Siku]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Mali ni lazima kwa ajili ya kununua fasta / kuuza mali
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Mali ni lazima kwa ajili ya kununua fasta / kuuza mali
 DocType: Asset Maintenance Team,Maintenance Team Name,Jina la Timu ya Matengenezo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ikiwa Kanuni mbili za bei za bei zinapatikana kulingana na hali zilizo hapo juu, Kipaumbele kinatumika. Kipaumbele ni nambari kati ya 0 hadi 20 wakati thamani ya msingi ni sifuri (tupu). Nambari ya juu ina maana itatangulia kama kuna Kanuni nyingi za bei na hali sawa."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Mteja ni lazima ikiwa &#39;Mfunguo Kutoka&#39; huchaguliwa kama Mteja
@@ -4767,19 +4802,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Ruhusu watumiaji wafuatayo kupitisha Maombi ya Kuacha kwa siku za kuzuia.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Aina ya Madai ya Madai.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Kiwango cha kuuza kwa kipengee {0} ni cha chini kuliko {1} yake. Kiwango cha uuzaji kinapaswa kuwa salama {2}
-DocType: Item,Taxes,Kodi
+DocType: Subscription,Taxes,Kodi
 DocType: Purchase Invoice,capital goods,bidhaa kuu
 DocType: Purchase Invoice Item,Weight Per Unit,Uzito Kwa Kitengo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Ilipwa na Haijaokolewa
 DocType: Project,Default Cost Center,Kituo cha Ghali cha Default
-DocType: Bank Guarantee,End Date,Tarehe ya Mwisho
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Ushirikiano wa hisa
 DocType: Budget,Budget Accounts,Hesabu za Bajeti
 DocType: Employee,Internal Work History,Historia ya Kazi ya Kazi
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kukusanya kiasi cha kushuka kwa thamani
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Scorecard ya Wafanyabiashara Inaweza kubadilika
-DocType: Employee Loan,Fully Disbursed,Kutengwa kabisa
 DocType: Employee Advance,Due Advance Amount,Kutokana na Kiwango cha Mapema
 DocType: Maintenance Visit,Customer Feedback,Maoni ya Wateja
 DocType: Account,Expense,Gharama
@@ -4803,7 +4836,7 @@
 ,Employee Information,Taarifa ya Waajiriwa
 DocType: Stock Entry Detail,Additional Cost,Gharama za ziada
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Haiwezi kuchuja kulingana na Voucher No, ikiwa imewekwa na Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Fanya Nukuu ya Wasambazaji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Fanya Nukuu ya Wasambazaji
 DocType: Quality Inspection,Incoming,Inakuja
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Vidokezo vya kodi za kutosha kwa mauzo na ununuzi vinaloundwa.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Tathmini ya Matokeo ya Tathmini {0} tayari imepo.
@@ -4811,7 +4844,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Tafadhali weka Chujio cha Kampuni kikiwa tupu ikiwa Kundi Na &#39;Kampuni&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Tarehe ya Kuchapisha haiwezi kuwa tarehe ya baadaye
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} hailingani na {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,kwa kuzalisha mara kwa mara
 DocType: Stock Entry,Target Warehouse Address,Anwani ya Wakala ya Ghala
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Kuondoka kwa kawaida
 DocType: Agriculture Task,End Day,Siku ya Mwisho
@@ -4836,11 +4868,10 @@
 DocType: Material Request,% Ordered,Aliamriwa
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kwa Kundi la Wanafunzi la msingi, Kozi itastahikiwa kwa kila Mwanafunzi kutoka Kozi zilizosajiliwa katika Uandikishaji wa Programu."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Mg. Kiwango cha kununua
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Mg. Kiwango cha kununua
 DocType: Share Balance,From No,Kutoka Hapana
 DocType: Task,Actual Time (in Hours),Muda halisi (katika Masaa)
 DocType: Employee,History In Company,Historia Katika Kampuni
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Ujumbe mpya kutoka {mtumaji}
 DocType: Customer,Customer Primary Address,Anwani ya Msingi ya Wateja
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Majarida
 DocType: Drug Prescription,Description/Strength,Maelezo / Nguvu
@@ -4849,21 +4880,21 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Kitu kimoja kimeingizwa mara nyingi
 DocType: Department,Leave Block List,Acha orodha ya kuzuia
 DocType: Purchase Invoice,Tax ID,Kitambulisho cha Ushuru
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Kipengee {0} sio kuanzisha kwa Nakala Zetu. Sawa lazima iwe tupu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Kipengee {0} sio kuanzisha kwa Nakala Zetu. Sawa lazima iwe tupu
 DocType: Accounts Settings,Accounts Settings,Mipangilio ya Akaunti
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Thibitisha
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Anwani isiyofaa ya {0}, tafadhali tengeneza ili uendelee."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Anwani isiyofaa ya {0}, tafadhali tengeneza ili uendelee."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Idadi ya Akaunti mpya, itaingizwa katika jina la akaunti kama kiambishi"
 DocType: Maintenance Team Member,Team Member,Mwanachama wa Timu
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Hakuna matokeo ya kuwasilisha
 DocType: Customer,Sales Partner and Commission,Mshirika wa Mauzo na Tume
-DocType: Employee Loan,Rate of Interest (%) / Year,Kiwango cha Maslahi (%) / Mwaka
+DocType: Loan,Rate of Interest (%) / Year,Kiwango cha Maslahi (%) / Mwaka
 ,Project Quantity,Mradi wa Wingi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumla ya {0} kwa vitu vyote ni sifuri, huenda unapaswa kubadilisha &#39;Kusambaza mishahara ya msingi&#39;"
 DocType: Opportunity,To Discuss,Kujadili
 DocType: Loan Type,Rate of Interest (%) Yearly,Kiwango cha Maslahi (%) Kila mwaka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Akaunti ya Muda
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Nyeusi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Akaunti ya Muda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Nyeusi
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Bidhaa ya Mlipuko
 DocType: Shareholder,Contact List,Orodha ya Mawasiliano
 DocType: Account,Auditor,Mkaguzi
@@ -4871,16 +4902,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} vitu vilivyotengenezwa
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Jifunze zaidi
 DocType: Cheque Print Template,Distance from top edge,Umbali kutoka makali ya juu
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Orodha ya Bei {0} imezimwa au haipo
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Orodha ya Bei {0} imezimwa au haipo
 DocType: Purchase Invoice,Return,Rudi
 DocType: Pricing Rule,Disable,Zima
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Njia ya kulipa inahitajika kufanya malipo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Njia ya kulipa inahitajika kufanya malipo
 DocType: Project Task,Pending Review,Mapitio Yasubiri
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Badilisha katika ukurasa kamili kwa chaguo zaidi kama vile mali, serial nos, batches nk"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Uteuzi na Ushauri
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} haijasajiliwa katika Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Malipo {0} hayawezi kupigwa, kama tayari {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cheki Inahitajika
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cheki Inahitajika
 DocType: Task,Total Expense Claim (via Expense Claim),Madai ya jumla ya gharama (kupitia madai ya gharama)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Weka alama
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Imeshindwa kuanzisha kampuni
@@ -4892,7 +4923,7 @@
 DocType: Homepage,Tag Line,Mstari wa Tag
 DocType: Fee Component,Fee Component,Fomu ya Malipo
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Usimamizi wa Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Ongeza vitu kutoka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Ongeza vitu kutoka
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Mazao na Nchi
 DocType: Cheque Print Template,Regular,Mara kwa mara
 DocType: Fertilizer,Density (if liquid),Uzito wiani (kama kioevu)
@@ -4917,24 +4948,26 @@
 DocType: Payment Entry,Paid Amount,Kiwango kilicholipwa
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Pitia Mzunguko wa Mauzo
 DocType: Assessment Plan,Supervisor,Msimamizi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Kuhifadhi Usajili wa hisa
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Kuhifadhi Usajili wa hisa
 ,Available Stock for Packing Items,Inapatikana Stock kwa Vipuri vya Ufungashaji
 DocType: Item Variant,Item Variant,Tofauti ya Tofauti
 ,Work Order Stock Report,Ripoti ya Kazi ya Kazi ya Kazi
+DocType: Purchase Receipt,Auto Repeat Detail,Fanya maelezo ya kurudi
 DocType: Assessment Result Tool,Assessment Result Tool,Kitabu cha Matokeo ya Tathmini
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Kama Msimamizi
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Panga Jamii
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Kipengee cha Bidhaa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Maagizo yaliyowasilishwa hayawezi kufutwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Usawa wa Akaunti tayari katika Debit, huruhusiwi kuweka &#39;Mizani lazima iwe&#39; kama &#39;Mikopo&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Usimamizi wa Ubora
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Usimamizi wa Ubora
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} imezimwa
 DocType: Project,Total Billable Amount (via Timesheets),Kiwango cha Jumla cha Billable (kupitia Timesheets)
 DocType: Agriculture Task,Previous Business Day,Siku ya Biashara ya awali
-DocType: Employee Loan,Repay Fixed Amount per Period,Rejesha Kiasi kilichopangwa kwa Kipindi
+DocType: Loan,Repay Fixed Amount per Period,Rejesha Kiasi kilichopangwa kwa Kipindi
 DocType: Employee,Health Insurance No,Bima ya Afya Bila
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Tafadhali ingiza kiasi cha Bidhaa {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kumbuka Mkopo Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kumbuka Mkopo Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Jumla ya Kiasi cha Ushuru
 DocType: Employee External Work History,Employee External Work History,Historia ya Kazi ya Wafanyakazi wa Nje
 DocType: Opening Invoice Creation Tool,Purchase,Ununuzi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Kiwango cha usawa
@@ -4945,15 +4978,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} kwa {1}
 DocType: Healthcare Settings,Valid number of days,Nambari ya siku sahihi
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Vituo vya Gharama
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Anza upya Usajili
 DocType: Land Unit,Linked Plant Analysis,Uchunguzi wa Plant unaohusishwa
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Kiwango cha sarafu ya wasambazaji ni chaguo la fedha za kampuni
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Muda unapingana na mstari {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Ruhusu Kiwango cha Vigezo vya Zero
+DocType: Bank Guarantee,Receiving,Kupokea
 DocType: Training Event Employee,Invited,Alialikwa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Miundo ya Mishahara yenye kazi nyingi inayopatikana kwa mfanyakazi {0} kwa tarehe zilizopewa
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Akaunti za Kuweka Gateway.
 DocType: Employee,Employment Type,Aina ya Ajira
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Mali za kudumu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Mali za kudumu
 DocType: Payment Entry,Set Exchange Gain / Loss,Weka Kuchangia / Kupoteza
 ,GST Purchase Register,Daftari ya Ununuzi wa GST
 ,Cash Flow,Mzunguko wa fedha
@@ -4973,9 +5008,10 @@
 DocType: Academic Term,Term Start Date,Tarehe ya Mwisho wa Mwisho
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Orodha ya shughuli zote za kushiriki
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upinzani wa Opp
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Tafadhali pata masharti {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Kipindi cha kwanza cha majaribio Tarehe ya Kuanza na Tarehe ya Mwisho wa Kipindi lazima iwekwa
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Kiwango cha wastani
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
+DocType: Subscription Plan Detail,Plan,Mpango
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Usawa wa Taarifa ya Benki kama kwa Jedwali Mkuu
 DocType: Job Applicant,Applicant Name,Jina la Msaidizi
 DocType: Authorization Rule,Customer / Item Name,Jina la Wateja / Bidhaa
@@ -5005,6 +5041,7 @@
 DocType: Work Order,Warehouses,Maghala
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} mali haiwezi kuhamishwa
 DocType: Hotel Room Pricing,Hotel Room Pricing,Bei ya chumba cha Hoteli
+DocType: Subscription,Days Until Due,Siku hadi Mpangilio
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ncha hii ni Tofauti ya {0} (Kigezo).
 DocType: Workstation,per hour,kwa saa
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Ununuzi
@@ -5013,13 +5050,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Kwa Kundi la Wanafunzi la msingi, Kikundi cha Wanafunzi kitathibitishwa kwa kila Mwanafunzi kutoka Uandikishaji wa Programu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Ghala haiwezi kufutwa kama kuingizwa kwa hisa ya hisa kunapo kwa ghala hili.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Usambazaji
+DocType: Journal Entry Account,Loan,Mikopo
 DocType: Expense Claim Advance,Expense Claim Advance,Tumia Madai ya Ushauri
 DocType: Lab Test,Report Preference,Upendeleo wa Ripoti
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Maelezo ya kujitolea.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Meneja wa mradi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Meneja wa mradi
 ,Quoted Item Comparison,Ilipendekeza Kulinganishwa kwa Bidhaa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Inaingiliana kwa kufunga kati ya {0} na {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Tangaza
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Tangaza
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Upeo wa Max unaruhusiwa kwa bidhaa: {0} ni {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Thamani ya Mali ya Nambari kama ilivyoendelea
 DocType: Crop,Produce,Kuzalisha
@@ -5029,7 +5067,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Matumizi ya Nyenzo kwa Utengenezaji
 DocType: Item Alternative,Alternative Item Code,Msimbo wa Kipengee cha Mbadala
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Jukumu ambalo linaruhusiwa kuwasilisha ushirikiano unaozidi mipaka ya mikopo.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Chagua Vitu Ili Kukuza
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Chagua Vitu Ili Kukuza
 DocType: Delivery Stop,Delivery Stop,Utoaji wa Kuacha
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Usawazishaji wa data ya Mwalimu, inaweza kuchukua muda"
 DocType: Item,Material Issue,Matatizo ya Nyenzo
@@ -5039,15 +5077,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabuni &amp; Daktari
 DocType: BOM,Show Items,Onyesha Vitu
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Kutoka Muda haiwezi kuwa kubwa zaidi kuliko Ili Muda.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Unataka kuwajulisha wateja wote kwa barua pepe?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Unataka kuwajulisha wateja wote kwa barua pepe?
+DocType: Subscription Plan,Billing Interval,Muda wa kulipia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Picha na Video ya Mwendo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Amri
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Rejea
 DocType: Hub Settings,Hub Username,Jina la mtumiaji wa Hub
 DocType: Salary Detail,Component,Kipengele
 DocType: Assessment Criteria,Assessment Criteria Group,Makundi ya Vigezo vya Tathmini
 DocType: Healthcare Settings,Patient Name By,Jina la Mgonjwa Na
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Usajili wa Taarifa ya Mishahara kutoka kwa {0} hadi {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Usajili wa Taarifa ya Mishahara kutoka kwa {0} hadi {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Kufungua Upungufu wa Kusanyiko lazima uwe chini ya sawa na {0}
 DocType: Warehouse,Warehouse Name,Jina la Ghala
 DocType: Naming Series,Select Transaction,Chagua Shughuli
@@ -5061,22 +5099,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hapa unaweza kudumisha urefu, uzito, allergy, matatizo ya matibabu nk"
 DocType: Leave Block List,Applies to Company,Inahitajika kwa Kampuni
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Haiwezi kufuta kwa sababu In Entry In Stock {0} ipo
-DocType: Employee Loan,Disbursement Date,Tarehe ya Malipo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Waliopokea&#39; sio maalum
+DocType: Loan,Disbursement Date,Tarehe ya Malipo
 DocType: BOM Update Tool,Update latest price in all BOMs,Sasisha bei ya hivi karibuni katika BOM zote
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Rekodi ya Matibabu
 DocType: Vehicle,Vehicle,Gari
 DocType: Purchase Invoice,In Words,Katika Maneno
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Ingiza jina la benki au taasisi ya mikopo kabla ya kuwasilisha.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} lazima iwasilishwa
 DocType: POS Profile,Item Groups,Makala ya Vikundi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Leo ni siku ya kuzaliwa ya {0}!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Leo ni siku ya kuzaliwa ya {0}!
 DocType: Sales Order Item,For Production,Kwa Uzalishaji
 DocType: Payment Request,payment_url,malipo_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Tafadhali ongeza Akaunti ya Kufungua Muda katika Chati ya Akaunti
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Tafadhali ongeza Akaunti ya Kufungua Muda katika Chati ya Akaunti
 DocType: Customer,Customer Primary Contact,Mawasiliano ya Msingi ya Wateja
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Nyakati ya Kufunga Juma
 DocType: Project Task,View Task,Tazama Kazi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Upinzani / Kiongozi%
+DocType: Bank Guarantee,Bank Guarantee Type,Aina ya Dhamana ya Benki
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Sehemu ya ankara
 ,Asset Depreciations and Balances,Upungufu wa Mali na Mizani
@@ -5087,9 +5126,8 @@
 DocType: Production Plan,Include Subcontracted Items,Jumuisha Vipengee vidogo
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Jiunge
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Uchina wa Ufupi
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Haiwezi kubadilisha mali tofauti baada ya kupitishwa kwa hisa. Utahitaji kufanya kitu kipya cha kufanya hivyo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Tofauti ya kipengee {0} ipo na sifa sawa
-DocType: Employee Loan,Repay from Salary,Malipo kutoka kwa Mshahara
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Tofauti ya kipengee {0} ipo na sifa sawa
+DocType: Loan,Repay from Salary,Malipo kutoka kwa Mshahara
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Inalipa malipo dhidi ya {0} {1} kwa kiasi {2}
 DocType: Salary Slip,Salary Slip,Kulipwa kwa Mshahara
@@ -5113,11 +5151,11 @@
 DocType: Employee Education,Employee Education,Elimu ya Waajiriwa
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Kundi la kipengee cha kipengee kilichopatikana kwenye meza ya kikundi cha bidhaa
 DocType: Land Unit,Parent Land Unit,Kitengo cha Ardhi cha Mzazi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Inahitajika Kuchukua Maelezo ya Bidhaa.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Inahitajika Kuchukua Maelezo ya Bidhaa.
 DocType: Fertilizer,Fertilizer Name,Jina la Mbolea
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Cash Flow Mapping Accounts,Account,Akaunti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Hakuna Serial {0} tayari imepokea
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Hakuna Serial {0} tayari imepokea
 ,Requested Items To Be Transferred,Vitu Vilivyoombwa Ili Kuhamishwa
 DocType: Expense Claim,Vehicle Log,Ingia ya Magari
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Uwepo wa homa (temp&gt; 38.5 ° C / 101.3 ° F au temp.) 38 ° C / 100.4 ° F)
@@ -5158,24 +5196,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Maneno mengine yoyote, jitihada zinazostahili ambazo zinapaswa kuingia kwenye rekodi."
 DocType: Asset Maintenance,Manufacturing User,Mtengenezaji wa Viwanda
 DocType: Purchase Invoice,Raw Materials Supplied,Vifaa vya Malighafi hutolewa
-DocType: C-Form,Series,Mfululizo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Fedha ya orodha ya bei {0} lazima iwe {1} au {2}
 DocType: Appraisal,Appraisal Template,Kigezo cha Uhakiki
 DocType: Soil Texture,Ternary Plot,Plot ya Ternary
 DocType: Item Group,Item Classification,Uainishaji wa Bidhaa
 DocType: Driver,License Number,Nambari ya Leseni
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Meneja wa Maendeleo ya Biashara
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Meneja wa Maendeleo ya Biashara
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Matengenezo ya Kutembelea Kusudi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Usajili wa Msajili wa Msajili
 DocType: Crop,Period,Kipindi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Mkuu Ledger
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Mfanyakazi {0} juu ya Acha kwenye {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Mfanyakazi {0} juu ya Acha kwenye {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Angalia Waongoza
 DocType: Program Enrollment Tool,New Program,Programu mpya
 DocType: Item Attribute Value,Attribute Value,Thamani ya Thamani
 ,Itemwise Recommended Reorder Level,Inemwise Inapendekezwa Mpangilio wa Mpangilio
 DocType: Salary Detail,Salary Detail,Maelezo ya Mshahara
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Tafadhali chagua {0} kwanza
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Tafadhali chagua {0} kwanza
 DocType: Appointment Type,Physician,Daktari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Kipengee {0} cha Bidhaa {1} kimekamilika.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Majadiliano
@@ -5183,15 +5220,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) haiwezi kuwa kubwa kuliko kiasi kilichopangwa ({2}) katika Kazi ya Kazi {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Karatasi ya Muda kwa ajili ya utengenezaji.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,jumla ndogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Haiwezi kubadilisha mali tofauti baada ya shughuli za hisa. Utahitaji kufanya kitu kipya cha kufanya hivyo.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Mandhari ya SEPA ya GoCardless
 DocType: Physician,Charges,Malipo
 DocType: Production Plan,Get Items For Work Order,Pata Vipengee Kwa Kazi ya Kazi
 DocType: Salary Detail,Default Amount,Kiasi cha malipo
 DocType: Lab Test Template,Descriptive,Maelezo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Ghala haipatikani kwenye mfumo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Ghala haipatikani kwenye mfumo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Muhtasari wa Mwezi huu
 DocType: Quality Inspection Reading,Quality Inspection Reading,Uhakiki wa Uhakiki wa Ubora
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Zuia Hifadhi za Bidha za Kale Kuliko` lazima iwe ndogo kuliko siku% d.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Zuia Hifadhi za Bidha za Kale Kuliko` lazima iwe ndogo kuliko siku% d.
 DocType: Tax Rule,Purchase Tax Template,Kigezo cha Kodi ya Ununuzi
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Weka lengo la mauzo ungependa kufikia kwa kampuni yako.
 ,Project wise Stock Tracking,Ufuatiliaji wa Hitilafu wa Mradi
@@ -5219,11 +5257,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Imeshindwa kuunda tovuti
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maelezo ya Uongofu wa UOM
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Uhifadhi Uingiaji wa hisa umeundwa tayari au Mfano Wingi haujatolewa
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Uhifadhi Uingiaji wa hisa umeundwa tayari au Mfano Wingi haujatolewa
 DocType: Program,Program Abbreviation,Hali ya Mpangilio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Malipo yanasasishwa katika Receipt ya Ununuzi dhidi ya kila kitu
 DocType: Warranty Claim,Resolved By,Ilifanywa na
-DocType: Bank Guarantee,Start Date,Tarehe ya Mwanzo
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Shirikisha majani kwa muda.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheki na Deposits zimeondolewa kwa usahihi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Akaunti {0}: Huwezi kujitolea kama akaunti ya mzazi
@@ -5238,11 +5275,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Masaa
 DocType: Project,Expected Start Date,Tarehe ya Mwanzo Inayotarajiwa
 DocType: Purchase Invoice,04-Correction in Invoice,Marekebisho ya 04 katika ankara
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Kazi ya Kazi imeundwa tayari kwa vitu vyote na BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Kazi ya Kazi imeundwa tayari kwa vitu vyote na BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Ripoti ya Taarifa ya Variant
 DocType: Setup Progress Action,Setup Progress Action,Hatua ya Kuanzisha Programu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Kununua Orodha ya Bei
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Kununua Orodha ya Bei
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Ondoa kipengee ikiwa mashtaka haifai kwa bidhaa hiyo
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Futa Usajili
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Tafadhali chagua Hali ya Matengenezo Kama Imekamilishwa au Tondoa Tarehe ya Kumaliza
 DocType: Supplier,Default Payment Terms Template,Kigezo Masharti ya Malipo ya Kigeni
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Fedha ya ushirikiano lazima iwe sawa na Fedha ya Gateway ya Malipo
@@ -5253,7 +5291,6 @@
 DocType: Employee,Educational Qualification,Ufanisi wa Elimu
 DocType: Workstation,Operating Costs,Gharama za uendeshaji
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hatua kama Bajeti ya Mwezi Yote Ilipatikana
-DocType: Subscription,Submit on creation,Wasilisha kwenye uumbaji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Fedha ya {0} lazima iwe {1}
 DocType: Asset,Disposal Date,Tarehe ya kupoteza
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Barua pepe zitatumwa kwa Wafanyakazi wote wa Kampuni katika saa iliyotolewa, ikiwa hawana likizo. Muhtasari wa majibu itatumwa usiku wa manane."
@@ -5271,6 +5308,7 @@
 DocType: Batch,Parent Batch,Kundi cha Mzazi
 DocType: Cheque Print Template,Cheque Print Template,Angalia Kigezo cha Print
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chati ya Vituo vya Gharama
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Idadi ya siku baada ya tarehe ya ankara imetoka kabla ya kufuta usajili au kusajili usajili bila malipo
 DocType: Lab Test Template,Sample Collection,Mkusanyiko wa Mfano
 ,Requested Items To Be Ordered,Vitu Vilivyoombwa Ili Kuagizwa
 DocType: Price List,Price List Name,Jina la Orodha ya Bei
@@ -5279,7 +5317,7 @@
 DocType: Account,Income,Mapato
 DocType: Industry Type,Industry Type,Aina ya Sekta
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Kitu kilichokosa!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Onyo: Acha programu ina tarehe zifuatazo za kuzuia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Onyo: Acha programu ina tarehe zifuatazo za kuzuia
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Invozi ya Mauzo {0} imetumwa tayari
 DocType: Supplier Scorecard Scoring Criteria,Score,Score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Mwaka wa Fedha {0} haipo
@@ -5298,12 +5336,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Ushauri wa Maandishi ya Uhakika
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} lazima iwe thamani kati ya 0 na 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Tarehe ya Kuondoa Upya ifuatavyo haiwezi kuwa kabla ya Tarehe inapatikana kwa kutumia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Mikopo isiyohakikishiwa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Mikopo isiyohakikishiwa
 DocType: Cost Center,Cost Center Name,Jina la Kituo cha Gharama
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Saa nyingi za kazi dhidi ya Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Tarehe iliyopangwa
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Jumla ya malipo ya Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Jumla ya malipo ya Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Ujumbe mkubwa kuliko wahusika 160 utagawanywa katika ujumbe nyingi
 DocType: Purchase Receipt Item,Received and Accepted,Imepokea na Kukubaliwa
 DocType: Hub Settings,Company and Seller Profile,Kampuni na Profaili ya Wauzaji
@@ -5317,10 +5355,9 @@
 DocType: Item,Variant Based On,Tofauti kulingana na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumla ya uzito uliopangwa lazima iwe 100%. Ni {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Wauzaji wako
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Tafadhali sahihisha
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Haiwezi kuweka kama Lost kama Mauzo Order inafanywa.
 DocType: Request for Quotation Item,Supplier Part No,Sehemu ya Wafanyabiashara No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Haiwezi kufuta wakati kiwanja ni kwa &#39;Valuation&#39; au &#39;Vikwazo na Jumla&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Haiwezi kufuta wakati kiwanja ni kwa &#39;Valuation&#39; au &#39;Vikwazo na Jumla&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Haijulikani
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Imepokea Kutoka
 DocType: Lead,Converted,Ilibadilishwa
@@ -5334,6 +5371,7 @@
 DocType: Asset,Assets,Mali
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Kompyuta
 DocType: Item,List this Item in multiple groups on the website.,Andika kitu hiki katika makundi mengi kwenye tovuti.
+DocType: Subscription,Current Invoice End Date,Sasa Tarehe ya Mwisho ya Invoice
 DocType: Payment Term,Due Date Based On,Kutokana na Tarehe ya Kuzingatia
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Tafadhali weka kikundi cha wateja na chaguo la msingi katika Ununuzi wa Mipangilio
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} haipo
@@ -5341,7 +5379,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Item: {0} haipo katika mfumo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Huna mamlaka ya kuweka thamani iliyosafishwa
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pata Maingiliano yasiyotambulika
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Hakuna malipo yaliyochaguliwa kwa Kuingia kwa Journal
 DocType: Payment Reconciliation,From Invoice Date,Kutoka tarehe ya ankara
+DocType: Loan,Disbursed,Kutengwa
 DocType: Healthcare Settings,Laboratory Settings,Mazingira ya Maabara
 DocType: Patient Appointment,Service Unit,Kitengo cha Huduma
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Tengeneza Wasambazaji kwa Ufanisi
@@ -5354,12 +5394,12 @@
 DocType: Share Balance,No of Shares,Hakuna ya Hisa
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Ina Serial No&#39; haiwezi kuwa &#39;Ndio&#39; kwa bidhaa zisizo za hisa
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Chagua Hali
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Mahudhurio hayawezi kutambuliwa kwa tarehe za baadaye
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Mahudhurio hayawezi kutambuliwa kwa tarehe za baadaye
 DocType: Pricing Rule,Pricing Rule Help,Msaada wa Kanuni ya bei
 DocType: School House,House Name,Jina la Nyumba
 DocType: Fee Schedule,Total Amount per Student,Jumla ya Kiasi kwa Mwanafunzi
 DocType: Purchase Taxes and Charges,Account Head,Kichwa cha Akaunti
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Umeme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Umeme
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ongeza shirika lako lote kama watumiaji wako. Unaweza pia kuongeza Watejaji kwenye bandari yako kwa kuongezea kutoka kwa Washauri
 DocType: Stock Entry,Total Value Difference (Out - In),Tofauti ya Thamani ya Jumla (Nje-Ndani)
 DocType: Grant Application,Requested Amount,Kiasi kilichoombwa
@@ -5369,7 +5409,7 @@
 DocType: Crop Cycle,Detected Diseases,Magonjwa yaliyoambukizwa
 DocType: Stock Entry,Default Source Warehouse,Ghala la Chanzo cha Chanzo
 DocType: Item,Customer Code,Kanuni ya Wateja
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Kikumbusho cha Kuzaliwa kwa {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Kikumbusho cha Kuzaliwa kwa {0}
 DocType: Asset Maintenance Task,Last Completion Date,Tarehe ya mwisho ya kukamilika
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Siku Tangu Toleo la Mwisho
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
@@ -5377,9 +5417,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Mipangilio ya GoCardless
 DocType: Leave Block List,Leave Block List Name,Acha jina la orodha ya kuzuia
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tarehe ya kuanza kwa bima inapaswa kuwa chini ya tarehe ya mwisho ya Bima
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Mali ya Hifadhi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Mali ya Hifadhi
 DocType: Restaurant,Active Menu,Menyu ya Kazi
 DocType: Target Detail,Target Qty,Uchina wa Target
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Dhidi ya mkopo: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Mipangilio ya Checkout
 DocType: Student Attendance,Present,Sasa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Kumbuka Utoaji {0} haipaswi kuwasilishwa
@@ -5388,9 +5429,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Kulipwa kwa mshahara wa mfanyakazi {0} tayari kuundwa kwa karatasi ya muda {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,Iliyoamriwa Uchina
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Item {0} imezimwa
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Item {0} imezimwa
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM haina kitu chochote cha hisa
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM haina kitu chochote cha hisa
 DocType: Chapter,Chapter Head,Mlango Mkuu
 DocType: Payment Term,Month(s) after the end of the invoice month,Mwezi (s) baada ya mwisho wa mwezi wa ankara
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Shughuli ya mradi / kazi.
@@ -5398,11 +5439,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Kuzalisha Slips za Mshahara
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Siku ya tarehe ya matokeo ya Lab haiwezi kuwa kabla ya tarehe ya kupima
 DocType: POS Profile,Allow user to edit Discount,Ruhusu mtumiaji kuhariri Discount
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Pata wateja kutoka
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Pata wateja kutoka
 DocType: Purchase Invoice Item,Include Exploded Items,Jumuisha Vipengee Vipengee
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Ununuzi lazima uangaliwe, ikiwa Inahitajika Ilichaguliwa kama {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Punguzo lazima liwe chini ya 100
 DocType: Shipping Rule,Restrict to Countries,Uzuia Nchi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Andika Kiasi (Dhamana ya Kampuni)
 DocType: Sales Invoice Timesheet,Billing Hours,Masaa ya kulipia
 DocType: Project,Total Sales Amount (via Sales Order),Jumla ya Mauzo Kiasi (kupitia Mauzo ya Mauzo)
@@ -5419,6 +5461,7 @@
 DocType: Soil Texture,Sandy Clay,Mchanga wa Mchanga
 DocType: Grant Application,Assessment  Manager,Meneja wa Tathmini
 DocType: Payment Entry,Allocate Payment Amount,Weka Kiwango cha Malipo
+DocType: Subscription Plan,Subscription Plan,Mpango wa Usajili
 DocType: Employee External Work History,Salary,Mshahara
 DocType: Serial No,Delivery Document Type,Aina ya Nyaraka za Utoaji
 DocType: Sales Order,Partly Delivered,Sehemu iliyotolewa
@@ -5443,9 +5486,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Aina ya kuzeeka 2
 DocType: SG Creation Tool Course,Max Strength,Nguvu ya Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Inaweka presets
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Hakuna Kumbukumbu ya Utoaji iliyochaguliwa kwa Wateja {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Hakuna Kumbukumbu ya Utoaji iliyochaguliwa kwa Wateja {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM imebadilishwa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Chagua Vitu kulingana na tarehe ya utoaji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Chagua Vitu kulingana na tarehe ya utoaji
 DocType: Grant Application,Has any past Grant Record,Ina nakala yoyote ya Ruzuku iliyopita
 ,Sales Analytics,Uchambuzi wa Mauzo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Inapatikana {0}
@@ -5463,7 +5506,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Malighafi ya Raw zinazotolewa
 DocType: Selling Settings,Settings for Selling Module,Mipangilio kwa ajili ya kuuza Moduli
 DocType: Hotel Room Reservation,Hotel Room Reservation,Uhifadhi wa Chumba cha Hoteli
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Huduma kwa wateja
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Huduma kwa wateja
 DocType: BOM,Thumbnail,Picha ndogo
 DocType: Item Customer Detail,Item Customer Detail,Maelezo ya Wateja wa Bidhaa
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Kutoa mgombea Job.
@@ -5479,7 +5522,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Wanafunzi wamejiandikisha
 DocType: Fees,Student Details,Maelezo ya Wanafunzi
 DocType: Purchase Invoice Item,Stock Qty,Kiwanda
-DocType: Employee Loan,Repayment Period in Months,Kipindi cha ulipaji kwa Miezi
+DocType: Loan,Repayment Period in Months,Kipindi cha ulipaji kwa Miezi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hitilafu: Si id idhini?
 DocType: Naming Series,Update Series Number,Sasisha Nambari ya Mfululizo
 DocType: Account,Equity,Equity
@@ -5488,7 +5531,7 @@
 DocType: Task,Closing Date,Tarehe ya kufunga
 DocType: Sales Order Item,Produced Quantity,Waliyotokana na Wingi
 DocType: Timesheet,Work Detail,Maelezo ya Kazi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Mhandisi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Mhandisi
 DocType: Journal Entry,Total Amount Currency,Jumla ya Fedha ya Fedha
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Tafuta Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Msimbo wa kipengee unahitajika kwenye Row No {0}
@@ -5533,13 +5576,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Aina ya Msaidizi wa habari.
 DocType: Request for Quotation,Supplier Detail,Maelezo ya Wasambazaji
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Hitilafu katika fomu au hali: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Kiasi kilichopishwa
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Kiasi kilichopishwa
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Vipimo vya vigezo lazima kuongeza hadi 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Mahudhurio
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Vitu vya hisa
 DocType: BOM,Materials,Vifaa
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ikiwa hakizingatiwa, orodha itahitajika kuongezwa kwa kila Idara ambapo itatakiwa kutumika."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Kujenga {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Hifadhi ya Chanzo na Target haiwezi kuwa sawa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Tarehe ya kuchapisha na muda wa kuchapisha ni lazima
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template ya kodi kwa kununua shughuli.
@@ -5563,14 +5605,14 @@
 DocType: Shipping Rule,Fixed,Zisizohamishika
 DocType: Vehicle Service,Clutch Plate,Bamba la Clutch
 DocType: Company,Round Off Account,Ondoa Akaunti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Gharama za Utawala
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Gharama za Utawala
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Ushauri
 DocType: Customer Group,Parent Customer Group,Kundi la Wateja wa Mzazi
-DocType: Journal Entry,Subscription,Usajili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Usajili
 DocType: Purchase Invoice,Contact Email,Mawasiliano ya barua pepe
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Uumbaji wa Ada Inasubiri
 DocType: Appraisal Goal,Score Earned,Score Ilipatikana
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Kipindi cha Taarifa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Kipindi cha Taarifa
 DocType: Asset Category,Asset Category Name,Jina la Jamii ya Mali
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Hii ni eneo la mizizi na haiwezi kuhaririwa.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jina la mtu mpya wa mauzo
@@ -5583,7 +5625,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,UandishiNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Acha kuondoka bila kufuata kama hutaki kuzingatia kundi wakati wa kufanya makundi ya msingi.
 DocType: Asset,Frequency of Depreciation (Months),Upeo wa kushuka kwa thamani (Miezi)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Akaunti ya Mikopo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Akaunti ya Mikopo
 DocType: Landed Cost Item,Landed Cost Item,Nambari ya Gharama ya Uliopita
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Onyesha maadili ya sifuri
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Wingi wa bidhaa zilizopatikana baada ya viwanda / repacking kutokana na kiasi kilichotolewa cha malighafi
@@ -5591,7 +5633,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Akaunti ya Kulipwa / Kulipa
 DocType: Delivery Note Item,Against Sales Order Item,Dhidi ya Vipengee vya Udhibiti wa Mauzo
 DocType: Hub Settings,Company Logo,Logo ya Kampuni
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Tafadhali taja Thamani ya Attribut kwa sifa {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Tafadhali taja Thamani ya Attribut kwa sifa {0}
 DocType: Item,Default Warehouse,Ghala la Ghalafa
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajeti haipatikani dhidi ya Akaunti ya Kundi {0}
 DocType: Healthcare Settings,Patient Registration,Usajili wa Mgonjwa
@@ -5625,11 +5667,10 @@
 DocType: Journal Entry,Total Debit,Debit Jumla
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Ghala la Wafanyabiashara wa Malifadi
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Tafadhali chagua Mgonjwa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Mtu wa Mauzo
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Mtu wa Mauzo
 DocType: Hotel Room Package,Amenities,Huduma
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Kituo cha Bajeti na Gharama
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Njia ya malipo ya malipo ya kuruhusiwa haiwezi kuruhusiwa
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,kwa
 ,Appointment Analytics,Uchambuzi wa Uteuzi
 DocType: Vehicle Service,Half Yearly,Nusu ya mwaka
 DocType: Lead,Blog Subscriber,Msajili wa Blog
@@ -5645,6 +5686,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Acha tupu ikiwa unafanya makundi ya wanafunzi kwa mwaka
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ikiwa hunakiliwa, Jumla ya. ya siku za kazi zitajumuisha likizo, na hii itapunguza thamani ya mshahara kwa siku"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Programu za kutumia kitufe cha sasa hazitaweza kufikia, una uhakika?"
+DocType: Subscription Settings,Prorate,Pendeza
 DocType: Purchase Invoice,Total Advance,Jumla ya Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Badilisha Msimbo wa Kigezo
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Tarehe ya Mwisho wa Mwisho haiwezi kuwa mapema kuliko Tarehe ya Mwisho wa Mwisho. Tafadhali tengeneza tarehe na jaribu tena.
@@ -5655,8 +5697,9 @@
 DocType: Opportunity Item,Basic Rate,Kiwango cha Msingi
 DocType: GL Entry,Credit Amount,Mikopo
 DocType: Cheque Print Template,Signatory Position,Hali ya Ishara
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Weka kama Imepotea
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Weka kama Imepotea
 DocType: Timesheet,Total Billable Hours,Masaa Yote ya Billable
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Idadi ya siku ambazo msajili anapaswa kulipa ankara zinazozalishwa na usajili huu
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Kumbuka Receipt Kumbuka
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Hii inategemea shughuli za Wateja hii. Tazama kalenda ya chini kwa maelezo zaidi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Kiasi kilichowekwa {1} lazima kiwe chini au kinalingana na Kiasi cha Kuingia kwa Malipo {2}
@@ -5675,12 +5718,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Pata Kiwango cha Ununuzi wa Mwisho
 DocType: Company,Company Info,Maelezo ya Kampuni
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Chagua au kuongeza mteja mpya
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Kituo cha gharama kinahitajika kuandika madai ya gharama
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Kituo cha gharama kinahitajika kuandika madai ya gharama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Matumizi ya Fedha (Mali)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hii inategemea mahudhurio ya Waajiriwa
 DocType: Assessment Result,Summary,Muhtasari
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Akaunti ya Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Akaunti ya Debit
 DocType: Fiscal Year,Year Start Date,Tarehe ya Mwanzo wa Mwaka
 DocType: Attendance,Employee Name,Jina la Waajiriwa
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Mgahawa wa Uagizaji wa Kuagiza
@@ -5692,7 +5735,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ununuzi wa Kiasi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Nukuu ya Wafanyabiashara {0} imeundwa
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Mwaka wa Mwisho hauwezi kuwa kabla ya Mwaka wa Mwanzo
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Faida ya Waajiriwa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Faida ya Waajiriwa
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Wingi uliowekwa lazima iwe sawa kiasi cha Bidhaa {0} mfululizo {1}
 DocType: Work Order,Manufactured Qty,Uchina uliotengenezwa
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Hifadhi haipo na {0}
@@ -5700,12 +5743,12 @@
 DocType: Asset,Out of Order,Nje ya Utaratibu
 DocType: Purchase Receipt Item,Accepted Quantity,Nambari iliyokubaliwa
 DocType: Projects Settings,Ignore Workstation Time Overlap,Kupuuza Muda wa Kazi ya Ufanyika
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Tafadhali weka Orodha ya likizo ya default kwa Waajiriwa {0} au Kampuni {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Tafadhali weka Orodha ya likizo ya default kwa Waajiriwa {0} au Kampuni {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} haipo
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Chagua Hesabu za Batch
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Miradi iliyotolewa kwa Wateja.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ya Mradi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Kiasi hawezi kuwa kikubwa kuliko Kiwango cha Kusubiri dhidi ya Madai ya Madai {1}. Kiasi kinachosubiri ni {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Kiasi hawezi kuwa kikubwa kuliko Kiwango cha Kusubiri dhidi ya Madai ya Madai {1}. Kiasi kinachosubiri ni {2}
 DocType: Patient Service Unit,Medical Administrator,Msimamizi wa Matibabu
 DocType: Assessment Plan,Schedule,Ratiba
 DocType: Account,Parent Account,Akaunti ya Mzazi
@@ -5735,15 +5778,16 @@
 DocType: Asset Repair,Repair Status,Hali ya Ukarabati
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Injili ya mwandishi wa habari.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Uchina Inapatikana Kutoka Kwenye Ghala
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Tafadhali chagua Rekodi ya Waajiri kwanza.
 DocType: POS Profile,Account for Change Amount,Akaunti ya Kiasi cha Mabadiliko
 DocType: Purchase Invoice,input service,huduma ya pembejeo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Chama / Akaunti hailingani na {1} / {2} katika {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Mwanachama wa Timu Mwanachama
 DocType: Agriculture Analysis Criteria,Soil Analysis,Uchunguzi wa ardhi
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Msimbo wa Kozi:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Tafadhali ingiza Akaunti ya gharama
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Tafadhali ingiza Akaunti ya gharama
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu inapaswa kuwa moja ya Utaratibu wa Ununuzi, Invoice ya Ununuzi au Ingia ya Jarida"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Aina ya Kumbukumbu ya Kumbukumbu inapaswa kuwa moja ya Utaratibu wa Ununuzi, Invoice ya Ununuzi au Ingia ya Jarida"
 DocType: Employee,Current Address,Anuani ya sasa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ikiwa kipengee ni tofauti ya kipengee kingine basi maelezo, picha, bei, kodi nk zitawekwa kutoka template isipokuwa waziwazi"
 DocType: Serial No,Purchase / Manufacture Details,Maelezo ya Ununuzi / Utengenezaji
@@ -5791,19 +5835,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Kukubali kwa {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Msimu wa kuweka bajeti, malengo nk."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Jina linalofautiana
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Kipengee {0} ni template, tafadhali chagua moja ya vipengele vyake"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Kipengee {0} ni template, tafadhali chagua moja ya vipengele vyake"
 DocType: Asset,Asset Category,Jamii ya Mali
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Mshahara wa Net hauwezi kuwa hasi
 DocType: Purchase Order,Advance Paid,Ilipwa kulipwa
 DocType: Item,Item Tax,Kodi ya Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Nyenzo kwa Wafanyabiashara
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Nyenzo kwa Wafanyabiashara
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Mipango ya Kuomba Nyenzo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Ankara ya ushuru
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Kizuizi {0}% kinaonekana zaidi ya mara moja
 DocType: Expense Claim,Employees Email Id,Waajiri Barua Id
 DocType: Employee Attendance Tool,Marked Attendance,Kuhudhuria Msajili
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Madeni ya sasa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Madeni ya sasa
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Muda ulizidi masaa uliyopewa.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Tuma SMS ya wingi kwa anwani zako
 DocType: Patient,A Positive,Chanya
@@ -5814,9 +5858,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Uhakika halisi ni lazima
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na Amri ya Ununuzi kwa mtoa huduma hii inapaswa kutolewa."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Timu ya Matengenezo ya Mali
-DocType: Employee Loan,Loan Type,Aina ya Mikopo
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} imewasilishwa kwa mafanikio
+DocType: Loan,Loan Type,Aina ya Mikopo
 DocType: Scheduling Tool,Scheduling Tool,Kitabu cha Mpangilio
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kadi ya Mikopo
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kadi ya Mikopo
 DocType: BOM,Item to be manufactured or repacked,Kipengee cha kutengenezwa au kupakiwa
 DocType: Employee Education,Major/Optional Subjects,Majukumu makubwa / Chaguo
 DocType: Sales Invoice Item,Drop Ship,Turua Utoaji
@@ -5848,7 +5893,7 @@
 DocType: Item,Units of Measure,Units of Measure
 DocType: Manufacturing Settings,Allow Production on Holidays,Ruhusu Uzalishaji kwenye Likizo
 DocType: Sales Invoice,Customer's Purchase Order Date,Tarehe ya Utunzaji wa Wateja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Capital Stock
 DocType: Shopping Cart Settings,Show Public Attachments,Onyesha Viambatisho vya Umma
 DocType: Packing Slip,Package Weight Details,Maelezo ya Ufuatiliaji wa Pakiti
 DocType: Restaurant Reservation,Reservation Time,Muda wa Uhifadhi
@@ -5863,7 +5908,7 @@
 DocType: Purchase Order,To Receive and Bill,Kupokea na Bill
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Row # {0}: Reqd kwa tarehe haiwezi kuwa kabla ya Tarehe ya Ushirika
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Bidhaa zilizojitokeza
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Muumbaji
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Muumbaji
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Masharti na Masharti Kigezo
 DocType: Serial No,Delivery Details,Maelezo ya utoaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Kituo cha gharama kinahitajika kwenye mstari {0} katika meza ya kodi kwa aina {1}
@@ -5873,20 +5918,20 @@
 DocType: Driver,Expiry Date,Tarehe ya mwisho wa matumizi
 DocType: Healthcare Settings,Employee name and designation in print,Jina la mfanyakazi na sifa katika kuchapishwa
 ,accounts-browser,mshambuliaji wa akaunti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Tafadhali chagua Jamii kwanza
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Tafadhali chagua Jamii kwanza
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Mradi wa mradi.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Ili kuruhusu zaidi ya kulipa au kuagiza zaidi, sasisha &quot;Ruzuku&quot; katika Mipangilio ya Hifadhi au Bidhaa."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Uonyeshe alama yoyote kama $ nk karibu na sarafu.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),Nusu Siku
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),Nusu Siku
 DocType: Payment Term,Credit Days,Siku za Mikopo
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Tafadhali chagua Mgonjwa kupata Majaribio ya Lab
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Fanya Kundi la Mwanafunzi
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Inaendelea mbele
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Pata Vitu kutoka kwa BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Pata Vitu kutoka kwa BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Siku za Kiongozi
 DocType: Cash Flow Mapping,Is Income Tax Expense,"Je, gharama ya Kodi ya Mapato"
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Tarehe ya Kuweka lazima iwe sawa na tarehe ya ununuzi {1} ya mali {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Tarehe ya Kuweka lazima iwe sawa na tarehe ya ununuzi {1} ya mali {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Angalia hii ikiwa Mwanafunzi anaishi katika Hosteli ya Taasisi.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Tafadhali ingiza Amri za Mauzo kwenye jedwali hapo juu
 ,Stock Summary,Summary Stock
@@ -5897,10 +5942,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Tarehe ya Marehemu
 DocType: Employee,Reason for Leaving,Sababu ya Kuacha
 DocType: BOM Operation,Operating Cost(Company Currency),Gharama za Uendeshaji (Fedha la Kampuni)
-DocType: Employee Loan Application,Rate of Interest,Kiwango cha Maslahi
+DocType: Loan Application,Rate of Interest,Kiwango cha Maslahi
 DocType: Expense Claim Detail,Sanctioned Amount,Kizuizi
 DocType: Item,Shelf Life In Days,Uhai wa Shelf Katika Siku
 DocType: GL Entry,Is Opening,Inafungua
+DocType: Department,Expense Approvers,Vidokezo vya gharama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Uingizaji wa malipo hauwezi kuunganishwa na {1}
 DocType: Journal Entry,Subscription Section,Sehemu ya Usajili
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Akaunti {0} haipo
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index f089284..93c57ba 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,பொருள் வருகை {0} இந்த உத்தரவாதத்தை கூறுகின்றனர் ரத்து முன் ரத்து
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,மதிப்பீட்டு அறிக்கைகள்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
-DocType: Purchase Receipt,Subscription Detail,சந்தா விவரங்கள்
 DocType: Supplier Scorecard,Notify Supplier,சப்ளையரை அறிவி
 DocType: Item,Customer Items,வாடிக்கையாளர் பொருட்கள்
 DocType: Project,Costing and Billing,செலவு மற்றும் பில்லிங்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,கணக்கு {0}: பெற்றோர் கணக்கு {1} ஒரு பேரேட்டில் இருக்க முடியாது
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com செய்ய உருப்படியை வெளியிட
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,மின்னஞ்சல் அறிவிப்புகள்
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,மதிப்பீட்டு
 DocType: Item,Default Unit of Measure,மெஷர் முன்னிருப்பு அலகு
 DocType: SMS Center,All Sales Partner Contact,அனைத்து விற்பனை வரன்வாழ்க்கை துணை தொடர்பு
-DocType: Employee,Leave Approvers,குற்றம் விட்டு
+DocType: Department,Leave Approvers,குற்றம் விட்டு
 DocType: Sales Partner,Dealer,வாணிகம் செய்பவர்
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,விசாரணைகள்
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,கிடைக்கும் என்பதை சரிபார்க்கவும்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,இந்த சப்ளையர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,சட்ட
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},உண்மையான வகை வரி வரிசையில் மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,சட்ட
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},உண்மையான வகை வரி வரிசையில் மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது {0}
 DocType: Bank Guarantee,Customer,வாடிக்கையாளர்
 DocType: Purchase Receipt Item,Required By,By தேவை
 DocType: Delivery Note,Return Against Delivery Note,விநியோகக் குறிப்பு எதிராக திரும்ப
@@ -44,11 +42,10 @@
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"தலைவர்கள் (குழுக்களின்) எதிராக, 
 கணக்கு  பதிவுகள் செய்யப்படுகின்றன மற்றும் சமநிலைகள் பராமரிக்கப்படுகிறது."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,செயலாற்றுவதற்கு சமர்ப்பிக்கப்படாத எந்த சம்பளமும் இல்லை.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,செயலாற்றுவதற்கு சமர்ப்பிக்கப்படாத எந்த சம்பளமும் இல்லை.
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் இயல்புநிலை
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,திறந்த காட்டு
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,இன்றைய தினம் இந்த நடவடிக்கை மீண்டும் எடுக்கப்பட வேண்டும்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,வெளியேறுதல்
 DocType: Pricing Rule,Apply On,விண்ணப்பிக்க
@@ -57,10 +54,9 @@
 DocType: SMS Center,All Supplier Contact,அனைத்து சப்ளையர் தொடர்பு
 DocType: Support Settings,Support Settings,ஆதரவு அமைப்புகள்
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,தொகுதி பொருள் காலாவதியாகும் நிலை
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,வங்கி உண்டியல்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,வங்கி உண்டியல்
 DocType: Membership,membership validaty section,உறுப்பினர் சரிபார்ப்பு பிரிவு
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 DocType: Consultation,Consultation,கலந்தாய்வின்
@@ -71,8 +67,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,பொருள்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,வலைத்தளத்தை உருவாக்குதல்
 DocType: Opening Invoice Creation Tool Item,Quantity,அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),கடன்கள் ( கடன்)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
 DocType: Item,Country of Origin,உருவான நாடு
 DocType: Soil Texture,Soil Texture Criteria,மண் நுணுக்கம் வரையறைகள்
@@ -80,7 +76,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,முதன்மை தொடர்பு விவரங்கள்
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,திறந்த சிக்கல்கள்
 DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
 DocType: Lab Test Groups,Add new line,புதிய வரி சேர்க்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,உடல்நலம்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
@@ -90,7 +86,7 @@
 ,Delay Days,தாமதம் நாட்கள்
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,விலைப்பட்டியல்
+DocType: Subscription Invoice,Invoice,விலைப்பட்டியல்
 DocType: Purchase Invoice Item,Item Weight Details,பொருள் எடை விவரங்கள்
 DocType: Asset Maintenance Log,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
@@ -99,7 +95,7 @@
 DocType: Salary Component,Abbr,சுருக்கம்
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,ரோ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,ரோ # {0}:
 DocType: Timesheet,Total Costing Amount,மொத்த செலவு தொகை
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
@@ -109,14 +105,13 @@
 DocType: Work Order Operation,Work In Progress,முன்னேற்றம் வேலை
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,தேதியைத் தேர்ந்தெடுக்கவும்
 DocType: Daily Work Summary Group,Holiday List,விடுமுறை பட்டியல்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,கணக்கர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,கணக்கர்
 DocType: Hub Settings,Selling Price List,விலை பட்டியல் விற்பனை
 DocType: Patient,Tobacco Current Use,புகையிலை தற்போதைய பயன்பாடு
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,விலை விற்பனை
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,விலை விற்பனை
 DocType: Cost Center,Stock User,பங்கு பயனர்
 DocType: Soil Analysis,(Ca+Mg)/K,(+ எம்ஜி CA) / கே
 DocType: Company,Phone No,இல்லை போன்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},புதிய {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ஆரம்ப மின்னஞ்சல் அறிவிப்பு அனுப்பப்பட்டது
 ,Sales Partners Commission,விற்பனை பங்குதாரர்கள் ஆணையம்
 DocType: Soil Texture,Sandy Clay Loam,சாண்டி களிமண்
@@ -127,17 +122,18 @@
 DocType: Asset,Value After Depreciation,தேய்மானம் பிறகு மதிப்பு
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,சம்பந்தப்பட்ட
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,வருகை தேதி ஊழியர் இணைந்ததாக தேதி விட குறைவாக இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,வருகை தேதி ஊழியர் இணைந்ததாக தேதி விட குறைவாக இருக்க முடியாது
 DocType: Grading Scale,Grading Scale Name,தரம் பிரித்தல் அளவுகோல் பெயர்
-DocType: Subscription,Repeat on Day,நாளில் திரும்பவும்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,இந்த ரூட் கணக்கு மற்றும் திருத்த முடியாது .
 DocType: Sales Invoice,Company Address,நிறுவன முகவரி
 DocType: BOM,Operations,நடவடிக்கைகள்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},தள்ளுபடி அடிப்படையில் அங்கீகாரம் அமைக்க முடியாது {0}
+DocType: Subscription,Subscription Start Date,சந்தா தொடக்க தேதி
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","இரண்டு பத்திகள், பழைய பெயர் ஒரு புதிய பெயர் ஒன்று CSV கோப்பு இணைக்கவும்"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} எந்த செயலில் நிதியாண்டு இல்லை.
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",குறிப்பு: {0} பொருள் குறியீடு: {1} மற்றும் வாடிக்கையாளர்: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,சோதனை காலம் முடிவடையும் தேதி சோதனை காலம் தொடங்கும் தேதிக்கு முன்பாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,கிலோ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ஒரு வேலை திறப்பு.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{0} வரிசையில் {0} துணை உருப்படிக்கு BOM குறிப்பிடப்படவில்லை
@@ -149,7 +145,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Patient,Married,திருமணம்
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},அனுமதி இல்லை {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,இருந்து பொருட்களை பெற
 DocType: Price List,Price Not UOM Dependant,விலை இல்லை UOM சார்ந்த
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
@@ -180,12 +176,12 @@
 DocType: Vehicle Service,Brake Oil,பிரேக் ஆயில்
 DocType: Tax Rule,Tax Type,வரி வகை
 ,Completed Work Orders,முடிக்கப்பட்ட வேலை ஆணைகள்
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,வரிவிதிக்கத்தக்க தொகை
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,வரிவிதிக்கத்தக்க தொகை
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: BOM,Item Image (if not slideshow),பொருள் படம் (இல்லையென்றால் ஸ்லைடுஷோ)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,வரிசை # {0}: குறிப்பு ஆவண வகை செலவுக் கோரிக்கை அல்லது பத்திரிகை நுழைவு ஒன்றில் இருக்க வேண்டும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM தேர்வு
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,வரிசை # {0}: குறிப்பு ஆவண வகை செலவுக் கோரிக்கை அல்லது பத்திரிகை நுழைவு ஒன்றில் இருக்க வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM தேர்வு
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,வழங்கப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ஊழியருக்கு வழங்கப்பட்ட முன்கூட்டத் தொகையை நிர்வகிக்கவும்
@@ -201,19 +197,19 @@
 DocType: Delivery Trip,Delivery Notification,டெலிவரி அறிவிப்பு
 DocType: Journal Entry,Opening Entry,திறப்பு நுழைவு
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,கணக்கு சம்பளம்
-DocType: Employee Loan,Repay Over Number of Periods,திருப்பி பாடவேளைகள் ஓவர் எண்
+DocType: Loan,Repay Over Number of Periods,திருப்பி பாடவேளைகள் ஓவர் எண்
 DocType: Stock Entry,Additional Costs,கூடுதல் செலவுகள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
 DocType: Education Settings,Validate Batch for Students in Student Group,மாணவர் குழுமத்தின் மாணவர்களுக்கான தொகுதி சரிபார்க்கவும்
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ஊழியர் காணப்படவில்லை விடுப்பு குறிப்பிடும் வார்த்தைகளோ {0} க்கான {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ஊழியர் காணப்படவில்லை விடுப்பு குறிப்பிடும் வார்த்தைகளோ {0} க்கான {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
 DocType: Employee Education,Under Graduate,பட்டதாரி கீழ்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,HR அமைப்புகளில் விடுப்பு நிலை அறிவிப்புக்கான இயல்புநிலை வார்ப்புருவை அமைக்கவும்.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,இலக்கு
 DocType: BOM,Total Cost,மொத்த செலவு
 DocType: Soil Analysis,Ca/K,Ca / கே
-DocType: Journal Entry Account,Employee Loan,பணியாளர் கடன்
 DocType: Fee Schedule,Send Payment Request Email,கட்டணம் கோரிக்கை மின்னஞ்சல் அனுப்பு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,வீடு
@@ -233,21 +229,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,வெற்றிகரமாக பதிவு செய்யப்படவில்லை.
 DocType: Assessment Result,Grade,தரம்
 DocType: Restaurant Table,No of Seats,இடங்கள் இல்லை
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","மாறும் பொருள் சேர்க்க, jinja குறிச்சொற்களை பயன்படுத்த <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: Asset Maintenance Task,Asset Maintenance Task,சொத்து பராமரிப்பு பணி
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,ஆண்டு சம்பளம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,ஆண்டு சம்பளம்
 DocType: Daily Work Summary,Daily Work Summary,தினசரி வேலை சுருக்கம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} உறைந்து
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,பங்கு செலவுகள்
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,பங்கு செலவுகள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,உள்ளிடவும் விருப்பமான தொடர்பு மின்னஞ்சல்
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,உள்ளிடவும் விருப்பமான தொடர்பு மின்னஞ்சல்
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
@@ -268,7 +261,7 @@
 DocType: Customer,Primary Address,முதன்மை முகவரி
 DocType: Production Plan,Material Request Detail,பொருள் கோரிக்கை விரிவாக
 DocType: Selling Settings,Default Quotation Validity Days,இயல்புநிலை மேற்கோள் செல்லுபடியாகும் நாட்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: Sales Invoice,Change Amount,அளவு மாற்ற
@@ -278,26 +271,28 @@
 DocType: Driver,Driving License Categories,உரிமம் வகைகளை டிரைவிங்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,டெலிவரி தேதி உள்ளிடுக
 DocType: Depreciation Schedule,Make Depreciation Entry,தேய்மானம் நுழைவு செய்ய
+DocType: HR Settings,Leave Settings,அமைப்புகளை விடு
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,கோரிக்கை வகை
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,பணியாளர் செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS இன் அமைவு முறை (ஆன்லைன் / ஆஃப்லைன்)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,பணி ஆணைகளுக்கு எதிராக நேர பதிவுகளை உருவாக்குவதை முடக்குகிறது. வேலை ஆணைக்கு எதிராக செயல்பாடுகள் கண்காணிக்கப்படாது
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,நிர்வாகத்தினருக்கு
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,நிர்வாகத்தினருக்கு
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
 DocType: Asset Maintenance Log,Maintenance Status,பராமரிப்பு நிலையை
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,உறுப்பினர் விவரங்கள்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: சப்ளையர் செலுத்த வேண்டிய கணக்கு எதிராக தேவைப்படுகிறது {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,பொருட்கள் மற்றும் விலை
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},மொத்த மணிநேரம் {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},வரம்பு தேதி நிதியாண்டு க்குள் இருக்க வேண்டும். தேதி அனுமானம் = {0}
 DocType: Drug Prescription,Interval,இடைவேளை
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,விருப்பம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,விருப்பம்
 DocType: Grant Application,Individual,தனிப்பட்ட
 DocType: Academic Term,Academics User,கல்வியாளர்கள் பயனர்
 DocType: Cheque Print Template,Amount In Figure,படம் தொகை
-DocType: Employee Loan Application,Loan Info,கடன் தகவல்
+DocType: Loan Application,Loan Info,கடன் தகவல்
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,பராமரிப்பு வருகைகள் திட்டம்.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,சப்ளையர் ஸ்கோர் கார்ட் காலம்
 DocType: Share Transfer,Share Transfer,பகிர்வு பரிமாற்றம்
@@ -313,7 +308,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,பொருள் வார்ப்புரு
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,உயிர்வேதியியல்
 DocType: Job Offer,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,அவுட் மதிப்பு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,அவுட் மதிப்பு
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce அமைப்புகள்
 DocType: Production Plan,Sales Orders,விற்பனை ஆணைகள்
 DocType: Purchase Taxes and Charges,Valuation,மதிப்பு மிக்க
@@ -336,10 +331,12 @@
 DocType: Selling Settings,Default Territory,இயல்புநிலை பிரதேசம்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,தொலை காட்சி
 DocType: Work Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,வாடிக்கையாளர் அல்லது சப்ளையரை தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Company,Enable Perpetual Inventory,இடைவிடாத சரக்கு இயக்கு
+DocType: Bank Guarantee,Charges Incurred,கட்டணம் வசூலிக்கப்பட்டது
 DocType: Company,Default Payroll Payable Account,இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,புதுப்பிக்கப்பட்டது மின்னஞ்சல் குழு
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
@@ -363,7 +360,7 @@
 DocType: Lab Test,Custom Result,விருப்ப முடிவு
 DocType: Delivery Stop,Contact Name,பெயர் தொடர்பு
 DocType: Course Assessment Criteria,Course Assessment Criteria,கோர்ஸ் மதிப்பீடு செய்க மதீப்பீட்டு
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,வரி எண்:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,வரி எண்:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,மாணவர் அடையாளம்:
 DocType: POS Customer Group,POS Customer Group,பிஓஎஸ் வாடிக்கையாளர் குழு
 DocType: Land Unit,Land Unit describing various land assets,பல்வேறு நில சொத்துக்களை விவரிக்கும் காணி அலகு
@@ -376,9 +373,8 @@
 ,Open Work Orders,பணி ஆணைகளை திற
 DocType: Payment Term,Credit Months,கடன் மாதங்கள்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,நிகர சம்பளம் 0 விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","கணினியில் இருந்து மீண்டும் மீண்டும் பிழை அறிவிப்புகளை அனுப்புவதை நிறுத்த, சந்தாவில் உள்ள முடக்கப்பட்ட புலத்தை நாங்கள் சரிபார்க்கிறோம்"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,வருடத்திற்கு விடுப்பு
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,வருடத்திற்கு விடுப்பு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
 DocType: Email Digest,Profit & Loss,லாபம் மற்றும் நஷ்டம்
@@ -386,9 +382,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,மாணவர் குழுக்களுக்கு கீழ் மாணவர்களை அமைத்திடுங்கள்
 DocType: Item Website Specification,Item Website Specification,பொருள் வலைத்தளம் குறிப்புகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,வங்கி பதிவுகள்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,வங்கி பதிவுகள்
 DocType: Crop,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
@@ -396,7 +392,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,மாணவர் குழு உருவாக்கம் கருவி பாடநெறி
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,உங்கள் நிறுவனத்தில் உள்ள கற்பிக்க மக்கள்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,மென்பொருள் டெவலப்பர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,மென்பொருள் டெவலப்பர்
 DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அளவு
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Course Scheduling Tool,Course Start Date,பாடநெறி தொடக்க தேதி
@@ -405,8 +401,8 @@
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
@@ -442,9 +438,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,மேக்ஸ் கிரேடு
 DocType: Email Digest,New Quotations,புதிய மேற்கோள்கள்
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,விருப்பமான மின்னஞ்சல் பணியாளர் தேர்வு அடிப்படையில் ஊழியர் மின்னஞ்சல்கள் சம்பளம் சீட்டு
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
 DocType: Tax Rule,Shipping County,கப்பல் உள்ளூரில்
-apps/erpnext/erpnext/config/desktop.py +167,Learn,அறிய
+apps/erpnext/erpnext/config/desktop.py +159,Learn,அறிய
 DocType: Asset,Next Depreciation Date,அடுத்த தேய்மானம் தேதி
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,பணியாளர் ஒன்றுக்கு நடவடிக்கை செலவு
 DocType: Accounts Settings,Settings for Accounts,கணக்குகளைத் அமைப்புகள்
@@ -454,7 +449,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,மிகச்சிறந்த காசோலைகள் மற்றும் அழிக்க வைப்பு
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
 DocType: Driver,Fleet Manager,கடற்படை மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},ரோ # {0}: {1} உருப்படியை எதிர்மறையாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},ரோ # {0}: {1} உருப்படியை எதிர்மறையாக இருக்க முடியாது {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
@@ -477,7 +472,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},{@} ஹோட்டல் அறை விகிதத்தை தயவுசெய்து அமைக்கவும்
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Opening Invoice Creation Tool,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,டெலிவரி குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,டெலிவரி குறிப்பு
 DocType: Consultation,Encounter Impression,மன அழுத்தத்தை எதிர்கொள்ளுங்கள்
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,விற்கப்பட்டது சொத்து செலவு
@@ -505,11 +500,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
 DocType: Course Scheduling Tool,Course Scheduling Tool,பாடநெறி திட்டமிடல் கருவி
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,% S க்கான% s ஐ மீண்டும் உருவாக்கும்போது [Urgent] பிழை
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
 DocType: Land Unit,LInked Analysis,Lynked பகுப்பாய்வு
 DocType: Item Tax,Tax Rate,வரி விகிதம்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,விண்ணப்ப காலம் இரண்டு ஒதுக்கீடு பதிவுகள் முழுவதும் இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,விண்ணப்ப காலம் இரண்டு ஒதுக்கீடு பதிவுகள் முழுவதும் இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
@@ -523,7 +517,7 @@
 DocType: Purchase Order,% Received,% பெறப்பட்டது
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,மாணவர் குழுக்கள் உருவாக்க
 DocType: Volunteer,Weekends,வார இறுதிநாட்கள்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,கடன் குறிப்பு தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,கடன் குறிப்பு தொகை
 DocType: Setup Progress Action,Action Document,செயல் ஆவணம்
 DocType: Chapter Member,Website URL,வலைத்தளத்தின் URL
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
@@ -537,6 +531,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext டெமோ
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,பொருட்களை சேர்க்க
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,பொருள் தரமான ஆய்வு அளவுரு
+DocType: Leave Application,Leave Approver Name,தரப்பில் சாட்சி பெயர் விடவும்
 DocType: Depreciation Schedule,Schedule Date,அட்டவணை தேதி
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","வருவாய், விலக்கிற்கு மற்றும் பிற சம்பளம் கூறுகளை"
 DocType: Packed Item,Packed Item,டெலிவரி குறிப்பு தடைக்காப்பு பொருள்
@@ -555,7 +550,7 @@
 DocType: Request for Quotation,Request for Quotation,விலைப்பட்டியலுக்கான கோரிக்கை
 DocType: Healthcare Settings,Require Lab Test Approval,லேப் சோதனை ஒப்புதல் தேவை
 DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,மொத்த நிலுவை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,மொத்த நிலுவை
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
 DocType: Dosage Strength,Strength,வலிமை
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
@@ -568,7 +563,7 @@
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
 DocType: Student Log,Medical,மருத்துவம்
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,இழந்து காரணம்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,இழந்து காரணம்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,கணக்கு எண் புதுப்பிக்கவும்
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,முன்னணி உரிமையாளர் முன்னணி அதே இருக்க முடியாது
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ஒதுக்கப்பட்ட தொகை சரிசெய்யப்படாத  அளவு பெரியவனல்லவென்று முடியும்
@@ -578,11 +573,10 @@
 DocType: Lab Test Template,Single,ஒற்றை
 DocType: Salary Slip,Total Loan Repayment,மொத்த கடன் தொகையை திரும்பச் செலுத்துதல்
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
-DocType: Subscription,Yearly,வருடாந்திர
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
 DocType: Drug Prescription,Dosage,மருந்தளவு
 DocType: Journal Entry Account,Sales Order,விற்பனை ஆணை
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
 DocType: Assessment Plan,Examiner Name,பரிசோதகர் பெயர்
 DocType: Lab Test Template,No Result,முடிவு இல்லை
 DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
@@ -591,6 +585,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
 DocType: Purchase Invoice,Supplier Name,வழங்குபவர் பெயர்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext கையேட்டை வாசிக்க
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,நாட்காட்டி அனைத்து திணைக்கள உறுப்பினர்களையும் காண்பி
 DocType: Purchase Invoice,01-Sales Return,01-விற்பனை திருப்பு
 DocType: Account,Is Group,குழு
 DocType: Email Digest,Pending Purchase Orders,கொள்வனவு ஆணையில் நிலுவையில்
@@ -608,12 +603,12 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,கட்டாய துறையில் - கல்வி ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} உடன் தொடர்புடையது இல்லை {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,அந்த மின்னஞ்சல் ஒரு பகுதியாக சென்று அந்த அறிமுக உரை தனிப்பயனாக்கலாம். ஒவ்வொரு நடவடிக்கைக்கும் ஒரு தனி அறிமுக உரை உள்ளது.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},நிறுவனம் இயல்புநிலை செலுத்தப்பட கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},நிறுவனம் இயல்புநிலை செலுத்தப்பட கணக்கு அமைக்கவும் {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,உறைந்த வரை கணக்குகள்
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
@@ -637,8 +632,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,விற்பனை முன்பதிவு
 DocType: Packing Slip,From Package No.,தொகுப்பு எண் இருந்து
 DocType: Item Attribute,To Range,வரையறைக்கு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","அது இல்லை இது சில பொருட்களை எதிராக பரிமாற்றங்கள் உள்ளன, மதிப்பீடு முறை மாற்ற முடியாது சொந்த மதிப்பீட்டு முறை தான்"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","அது இல்லை இது சில பொருட்களை எதிராக பரிமாற்றங்கள் உள்ளன, மதிப்பீடு முறை மாற்ற முடியாது சொந்த மதிப்பீட்டு முறை தான்"
 DocType: Student Report Generation Tool,Attended by Parents,பெற்றோர் கலந்து கொண்டனர்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Patient,AB Positive,AB நேர்மறை
@@ -647,7 +642,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,வருகை பதிவு.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,டைம் ஷீட் சார்ந்த சம்பளம் சம்பளம் உபகரண.
 DocType: Sales Order Item,Used for Production Plan,உற்பத்தி திட்டத்தை பயன்படுத்திய
-DocType: Employee Loan,Total Payment,மொத்த கொடுப்பனவு
+DocType: Loan,Total Payment,மொத்த கொடுப்பனவு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,முழுமையான வேலை ஆணைக்கான பரிவர்த்தனை ரத்துசெய்ய முடியாது.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமிடங்கள்) செயல்களுக்கு இடையே நேரம்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} ஓர் செயல் முடிவடைந்தால் முடியாது ரத்துசெய்யப்பட்டது
@@ -663,16 +658,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,போதும் பாகங்கள் கட்டுவது எப்படி
 DocType: POS Profile User,POS Profile User,POS பயனர் பயனர்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,நேரடி வருமானம்
+DocType: Subscription Invoice,Subscription Invoice,சந்தா விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,நேரடி வருமானம்
 DocType: Patient Appointment,Date TIme,தேதி நேரம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,நிர்வாக அதிகாரி
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,நிறுவனம் மற்றும் வரிகளை அமைத்தல்
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 DocType: Codification Table,Codification Table,குறியீட்டு அட்டவணை
 DocType: Timesheet Detail,Hrs,மணி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Stock Entry Detail,Difference Account,வித்தியாசம் கணக்கு
 DocType: Purchase Invoice,Supplier GSTIN,சப்ளையர் GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
@@ -698,6 +694,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,பணப்பாய்வு வரைபட வார்ப்புரு
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
+DocType: Bank Guarantee,Providing,வழங்குதல்
 DocType: Account,Profit and Loss,இலாப நட்ட
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","அனுமதிக்கப்படவில்லை, லேப் டெஸ்ட் வார்ப்புருவை தேவைப்படும் என கட்டமைக்கவும்"
 DocType: Patient,Risk Factors,ஆபத்து காரணிகள்
@@ -729,7 +726,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
 DocType: Healthcare Settings,Appointment Confirmation,நியமனம் உறுதிப்படுத்தல்
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),நிறைவு (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,வணக்கம்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,உருப்படியை
@@ -754,11 +751,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","பயனர் {1} க்கான பேஸ்புக் சுயவிவரத்தில் {0} முன்னிருப்பாக அமைத்து, தயவுசெய்து இயல்புநிலையாக இயல்புநிலையை அமைக்கவும்"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,திரட்டப்பட்ட கலாச்சாரம்
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS சுயவிவரத்தில் பிரதேசமானது தேவைப்படுகிறது
 DocType: Supplier,Prevent RFQs,RFQ களை தடுக்கவும்
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,விற்பனை ஆணை செய்ய
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} முதல் {1} முதல் காலம் சம்பள சரிவு சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} முதல் {1} முதல் காலம் சம்பள சரிவு சமர்ப்பிக்கப்பட்டது
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
@@ -779,8 +776,9 @@
 DocType: Sales Invoice,Shipping Bill Date,கப்பல் பில் தேதி
 DocType: Production Plan,Production Plan,உற்பத்தி திட்டம்
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,விலைப்பட்டியல் உருவாக்கம் கருவியைத் திறக்கிறது
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,விற்பனை Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,குறிப்பு: மொத்த ஒதுக்கீடு இலைகள் {0} ஏற்கனவே ஒப்புதல் இலைகள் குறைவாக இருக்க கூடாது {1} காலம்
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,சீரியல் இல்லை உள்ளீடு அடிப்படையிலான பரிமாற்றங்களில் Qty ஐ அமைக்கவும்
 ,Total Stock Summary,மொத்த பங்கு சுருக்கம்
 DocType: Announcement,Posted By,பதிவிட்டவர்
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
@@ -791,7 +789,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),திறப்பு (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,நிறுவனத்தின் அமைக்கவும்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,நிறுவனத்தின் அமைக்கவும்
@@ -799,8 +797,8 @@
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Training Result Employee,Training Result Employee,பயிற்சி முடிவு பணியாளர்
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
-DocType: Repayment Schedule,Principal Amount,அசல் தொகை
-DocType: Employee Loan Application,Total Payable Interest,மொத்த செலுத்த வேண்டிய வட்டி
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,அசல் தொகை
+DocType: Loan Application,Total Payable Interest,மொத்த செலுத்த வேண்டிய வட்டி
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},மொத்த நிலுவை: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,விற்பனை விலைப்பட்டியல் டைம் ஷீட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
@@ -809,10 +807,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
 DocType: Restaurant Reservation,Restaurant Reservation,உணவக முன்பதிவு
 DocType: Land Unit,Land Unit Name,காணி அலகு பெயர்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,மானசாவுடன்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,மானசாவுடன்
 DocType: Payment Entry Deduction,Payment Entry Deduction,கொடுப்பனவு நுழைவு விலக்கு
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,வரை போடு
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,மின்னஞ்சல் வழியாக வாடிக்கையாளர்களுக்கு தெரிவிக்கவும்
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,மின்னஞ்சல் வழியாக வாடிக்கையாளர்களுக்கு தெரிவிக்கவும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,மற்றொரு விற்பனைப் {0} அதே பணியாளர் ஐடி கொண்டு உள்ளது
 DocType: Employee Advance,Claimed Amount,உரிமைகோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/education.py +180,Masters,முதுநிலை
@@ -831,13 +829,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","பணம் நுழைவாயில் கணக்கு உருவாக்கப்பட்ட இல்லை, கைமுறையாக ஒரு உருவாக்க வேண்டும்."
 DocType: Supplier Scorecard,Per Year,வருடத்திற்கு
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB இன் படி இந்தத் திட்டத்தில் சேர்க்கைக்கு தகுதியற்றவர் இல்லை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Sales Invoice,Sales Taxes and Charges,விற்பனை வரி மற்றும் கட்டணங்கள்
 DocType: Employee,Organization Profile,அமைப்பு விவரம்
 DocType: Vital Signs,Height (In Meter),உயரம் (மீட்டரில்)
 DocType: Student,Sibling Details,உடன்பிறந்தோர் விபரங்கள்
 DocType: Vehicle Service,Vehicle Service,வாகன சேவை
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,தானாகவே நிலைகளின் அடிப்படையில் கருத்துக்களை கோரிக்கை தூண்டுகிறது.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,தானாகவே நிலைகளின் அடிப்படையில் கருத்துக்களை கோரிக்கை தூண்டுகிறது.
 DocType: Employee,Reason for Resignation,ராஜினாமாவுக்கான காரணம்
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,செயல்பாடு மதிப்பீடு டெம்ப்ளேட் .
 DocType: Sales Invoice,Credit Note Issued,கடன் குறிப்பை வெளியிட்டு
@@ -852,10 +849,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,பராமரிப்பு அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,சரக்கு நிகர மாற்றம்
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,பணியாளர் கடன் மேலாண்மை
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 அரசுடன் உறவு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,மேலாளர்
 DocType: Payment Entry,Payment From / To,/ இருந்து பணம்
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,பொருள் மாற்றம்
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,பாதை கண்டுபிடிக்க முடியவில்லை
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),திறப்பு ( டாக்டர் )
+DocType: Loan,Applicant,விண்ணப்பதாரர்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},பதிவுசெய்ய நேர முத்திரை பின்னர் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,தொடர்ச்சியான ஆவணங்கள் செய்ய
 ,GST Itemised Purchase Register,ஜிஎஸ்டி வகைப்படுத்தப்பட்டவையாகவும் கொள்முதல் பதிவு
 DocType: Course Scheduling Tool,Reschedule,மீண்டும் திட்டமிட
-DocType: Employee Loan,Total Interest Payable,மொத்த வட்டி செலுத்த வேண்டிய
+DocType: Loan,Total Interest Payable,மொத்த வட்டி செலுத்த வேண்டிய
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed செலவு வரிகள் மற்றும் கட்டணங்கள்
 DocType: Work Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,முடிந்தது
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,அடித்தளம்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,அடித்தளம்
 DocType: Timesheet,Total Billed Hours,மொத்த பில் மணி
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,மொத்த தொகை இனிய எழுத
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,மொத்த தொகை இனிய எழுத
 DocType: Leave Block List Allow,Allow User,பயனர் அனுமதி
 DocType: Journal Entry,Bill No,பில் இல்லை
 DocType: Company,Gain/Loss Account on Asset Disposal,சொத்துக்கள் மீது லாபம் / நஷ்டம் கணக்கு
 DocType: Vehicle Log,Service Details,சேவை விவரங்கள்
 DocType: Vehicle Log,Service Details,சேவை விவரங்கள்
-DocType: Subscription,Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,தொகுக்கப்பட்டுள்ளது
 DocType: Selling Settings,Delivery Note Required,டெலிவரி குறிப்பு தேவை
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,நேரம் தாள்
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush மூலப்பொருட்கள் அடித்தளமாகக்
 DocType: Sales Invoice,Port Code,போர்ட் கோட்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,ரிசர்வ் கிடங்கு
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,ரிசர்வ் கிடங்கு
 DocType: Lead,Lead is an Organization,முன்னணி ஒரு அமைப்பு
 DocType: Guardian Interest,Interest,ஆர்வம்
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,முன் விற்பனை
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,கணக்குகள்
 DocType: Vehicle,Odometer Value (Last),ஓடோமீட்டர் மதிப்பு (கடைசி)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,சப்ளையர் ஸ்கோர் கார்ட் அளவுகோல்களின் டெம்ப்ளேட்கள்.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,சந்தைப்படுத்தல்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,சந்தைப்படுத்தல்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,கொடுப்பனவு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட
 DocType: Request for Quotation,Get Suppliers,சப்ளையர்கள் கிடைக்கும்
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,உங்கள் உறுப்பினர் 30 நாட்களுக்குள் காலாவதியாகிவிட்டால் மட்டுமே புதுப்பிக்க முடியும்
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,நீங்கள் பணப்புழக்க மேப்பர் ஆவணங்களை அமைத்தால் மட்டுமே தேர்ந்தெடுக்கவும்
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Supplier Scorecard,Per Week,வாரத்திற்கு
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,மொத்த மாணவர்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],ஃபிஷியர் டெஸ் எக்சிரிச்சர் காம்பப்டுகள் [FEC]
 DocType: Journal Entry,Credit Card Entry,கடன் அட்டை நுழைவு
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,கணக்குகள் நிறுவனம் மற்றும்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,மதிப்பு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,மதிப்பு
 DocType: Asset Settings,Depreciation Options,தேய்மானம் விருப்பங்கள்
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,தவறான இடுகை நேரம்
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,தவறான இடுகை நேரம்
 DocType: Lead,Campaign Name,பிரச்சாரம் பெயர்
 DocType: Hotel Room,Capacity,கொள்ளளவு
 DocType: Selling Settings,Close Opportunity After Days,நாட்கள் பிறகு மூடு வாய்ப்பு
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,வாடிக்கையாளர் கொள்முதல் ஆணை இல்லை
 DocType: Budget,Budget Against,வரவு செலவுத் திட்டத்திற்கு எதிராக
 DocType: Employee,Cell Number,செல் எண்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,கொடுக்கப்பட்ட நிபந்தனைகளுக்கு ஊழியர் இல்லை. சம்பள சரிவுகள் ஏற்கனவே உருவாக்கப்படவில்லை என்பதைச் சரிபார்க்கவும்.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,கொடுக்கப்பட்ட நிபந்தனைகளுக்கு ஊழியர் இல்லை. சம்பள சரிவுகள் ஏற்கனவே உருவாக்கப்படவில்லை என்பதைச் சரிபார்க்கவும்.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ஒரு அட்டவணையைத் தேர்ந்தெடுக்கவும்
 DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} என்பது &#39;பெறுநர்கள்&#39; இன் தவறான மின்னஞ்சல் முகவரி.
 DocType: Special Test Items,Particulars,விவரங்கள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
 DocType: Student,A+,ஒரு +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","பல விலை விதிகள் அளவுகோல் கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் மோதலை தீர்க்க தயவு செய்து. விலை விதிகள்: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Asset,Maintenance,பராமரிப்பு
+DocType: Subscriber,Subscriber,சந்தாதாரர்
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,உங்கள் திட்ட நிலைமையைப் புதுப்பிக்கவும்
 DocType: Item,Maximum sample quantity that can be retained,தக்கவைத்துக்கொள்ளக்கூடிய அதிகபட்ச மாதிரி அளவு
@@ -1077,26 +1073,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,வண்டியில் இயல்புநிலை அமைப்புகளை
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,டைம்ஸ்லோட்டைச் சேர்
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},பத்திரிகை நுழைவு வழியாக முறித்துள்ளது சொத்து {0}
-DocType: Employee Loan,Interest Income Account,வட்டி வருமான கணக்கு
+DocType: Loan,Interest Income Account,வட்டி வருமான கணக்கு
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,அழைப்பிதழ் அனுப்பவும்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,பயோடெக்னாலஜி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,அலுவலகம் பராமரிப்பு செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,அலுவலகம் பராமரிப்பு செலவுகள்
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,செல்க
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,மின்னஞ்சல் கணக்கை அமைத்ததற்கு
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Asset Repair,Downtime,செயல்படாத நேரம்
 DocType: Account,Liability,பொறுப்பு
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,கல்வி காலம்:
 DocType: Salary Detail,Do not include in total,மொத்தத்தில் சேர்க்க வேண்டாம்
 DocType: Company,Default Cost of Goods Sold Account,பொருட்களை விற்பனை கணக்கு இயல்பான செலவு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},மாதிரி அளவு {0} பெறப்பட்ட அளவைவிட அதிகமாக இருக்க முடியாது {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,விலை பட்டியல் தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Request for Quotation Supplier,Send Email,மின்னஞ்சல் அனுப்ப
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 DocType: Item,Max Sample Quantity,அதிகபட்ச மாதிரி அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,அனுமதி இல்லை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,அனுமதி இல்லை
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,கோரிக்கை கோரப்பட்டது
 DocType: Vital Signs,Heart Rate / Pulse,ஹார்ட் ரேட் / பல்ஸ்
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
@@ -1107,11 +1103,10 @@
 DocType: Item,Items with higher weightage will be shown higher,அதிக முக்கியத்துவம் கொண்ட உருப்படிகள் அதிக காட்டப்படும்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,லேப் சோதனைகள் மற்றும் முக்கிய அறிகுறிகள்
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ஊழியர்   இல்லை
-DocType: Subscription,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,திட்டம் மேம்படுத்தல்.
 DocType: SMS Center,All Customer Contact,அனைத்து வாடிக்கையாளர் தொடர்பு
 DocType: Land Unit,Tree Details,மரம் விபரங்கள்
@@ -1161,7 +1156,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,இறக்குமதி வருகை
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,அனைத்து பொருள் குழுக்கள்
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Work Order,Item To Manufacture,பொருள் உற்பத்தி செய்ய
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} நிலை {2} ஆகிறது
@@ -1175,7 +1169,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","தேர்ந்தெடுக்கப்பட்ட முகவரி சேமிக்கப்பட்ட பிறகு திருத்தப்பட்டால், தேர்வுநீக்கம் செய்யவும்"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 DocType: Item,Hub Publishing Details,ஹப் பப்ளிஷிங் விவரங்கள்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;திறந்து&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;திறந்து&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
 DocType: Lab Test Template,Result Format,முடிவு வடிவமைப்பு
@@ -1185,7 +1179,7 @@
 DocType: Payroll Entry,Bimonthly,இருமாதங்களுக்கு ஒருமுறை
 DocType: Vehicle Service,Brake Pad,பிரேக் பேட்
 DocType: Fertilizer,Fertilizer Contents,உரம் பொருளடக்கம்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,ரசீது தொகை
 DocType: Company,Registration Details,பதிவு விவரங்கள்
 DocType: Timesheet,Total Billed Amount,மொத்த பில் தொகை
@@ -1199,7 +1193,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,விற்பனை ஆணை மணிக்கு பைபாஸ் கடன் வரம்பு சோதனை
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,செயல்திறன் மதிப்பிடுதல்.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","இயக்குவதால் என வண்டியில் செயல்படுத்தப்படும், &#39;வண்டியில் பயன்படுத்தவும்&#39; மற்றும் வண்டியில் குறைந்தபட்சம் ஒரு வரி விதி இருக்க வேண்டும்"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","கொடுப்பனவு நுழைவு {0} ஆணை {1}, அது இந்த விலைப்பட்டியல் முன்பணமாக இழுத்து வேண்டும் என்றால் சரிபார்க்க இணைக்கப்பட்டுள்ளது."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","கொடுப்பனவு நுழைவு {0} ஆணை {1}, அது இந்த விலைப்பட்டியல் முன்பணமாக இழுத்து வேண்டும் என்றால் சரிபார்க்க இணைக்கப்பட்டுள்ளது."
 DocType: Sales Invoice Item,Stock Details,பங்கு விபரங்கள்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,திட்ட மதிப்பு
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,புள்ளி விற்பனை
@@ -1233,7 +1227,7 @@
 DocType: Restaurant Table,Minimum Seating,குறைந்தபட்ச சீட்டிங்
 DocType: Item Attribute,Item Attribute Values,பொருள் பண்புக்கூறு கலாச்சாரம்
 DocType: Examination Result,Examination Result,தேர்வு முடிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ரசீது வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},குறிப்பு டாக்டைப் ஒன்றாக இருக்க வேண்டும் {0}
@@ -1241,15 +1235,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Work Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,இடமாற்றத்திற்கான உருப்படிகளும் கிடைக்கவில்லை
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,இடமாற்றத்திற்கான உருப்படிகளும் கிடைக்கவில்லை
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),நிறைவு (திறக்கும் + மொத்தம்)
 DocType: Journal Entry,Depreciation Entry,தேய்மானம் நுழைவு
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 தரநிலை
 DocType: Pricing Rule,Rate or Discount,விகிதம் அல்லது தள்ளுபடி
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,தேவையான அளவு
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,பிடித்த
 DocType: Hub Settings,Custom Data,தனிப்பயன் தரவு
@@ -1262,9 +1256,9 @@
 DocType: Medical Code,Medical Code Standard,மருத்துவ குறியீடு தரநிலை
 DocType: Soil Texture,Clay Composition (%),களிமண் கலவை (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,பணியை ஒதுக்குவதற்கு முன் சேமிக்கவும்.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,இருப்பு மதிப்பு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,இருப்பு மதிப்பு
 DocType: Lab Test,Lab Technician,ஆய்வக தொழில்நுட்ப வல்லுனர்
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,விற்பனை விலை பட்டியல்
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,விற்பனை விலை பட்டியல்
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","சரிபார்க்கப்பட்டால், ஒரு வாடிக்கையாளர் உருவாக்கப்பட்டு, நோயாளிக்கு ஒப்பிடப்படுவார். இந்த வாடிக்கையாளருக்கு எதிராக நோயாளி இரகசியங்கள் உருவாக்கப்படும். நோயாளி உருவாக்கும் போது நீங்கள் ஏற்கனவே வாடிக்கையாளரைத் தேர்ந்தெடுக்கலாம்."
 DocType: Bank Reconciliation,Account Currency,கணக்கு நாணய
@@ -1272,16 +1266,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,நிறுவனத்தின் வட்ட இனிய கணக்கு குறிப்பிடவும்
 DocType: Purchase Receipt,Range,எல்லை
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
 DocType: Item Barcode,Item Barcode,உருப்படியை பார்கோடு
 DocType: Woocommerce Settings,Endpoints,இறுதிப்புள்ளிகள்
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","உருவாக்கப்பட வேண்டும். தாமதமாக இருந்தால், இந்த &quot;மாதத் தினத்தை மீண்டும் செய்&quot; என்பதை கைமுறையாக மாற்ற வேண்டும்"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
 DocType: Share Transfer,From Folio No,ஃபோலியோ இலிருந்து
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
@@ -1316,16 +1308,17 @@
 DocType: Asset,Available-for-use Date,கிடைக்கக்கூடிய தேதி தேதி
 DocType: Guardian,Guardian Name,பாதுகாவலர் பெயர்
 DocType: Cheque Print Template,Has Print Format,அச்சு வடிவம்
-DocType: Employee Loan,Sanctioned,ஒப்புதல்
+DocType: Loan,Sanctioned,ஒப்புதல்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,இது அத்தியாவசியமானதாகும். ஒருவேளை இதற்கான பணப்பரிமாற்றப் பதிவு உருவாக்கபடவில்லை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
 DocType: Crop Cycle,Crop Cycle,பயிர் சுழற்சி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;தயாரிப்பு மூட்டை&#39; பொருட்களை, சேமிப்புக் கிடங்கு, தொ.எ. மற்றும் தொகுதி இல்லை &#39;பேக்கிங்கை பட்டியலில் மேஜையிலிருந்து கருதப்படுகிறது. கிடங்கு மற்றும் தொகுதி இல்லை எந்த &#39;தயாரிப்பு மூட்டை&#39; உருப்படியை அனைத்து பொதி பொருட்களை அதே இருந்தால், அந்த மதிப்புகள் முக்கிய பொருள் அட்டவணை உள்ளிட்ட முடியும், மதிப்புகள் மேஜை &#39;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;தயாரிப்பு மூட்டை&#39; பொருட்களை, சேமிப்புக் கிடங்கு, தொ.எ. மற்றும் தொகுதி இல்லை &#39;பேக்கிங்கை பட்டியலில் மேஜையிலிருந்து கருதப்படுகிறது. கிடங்கு மற்றும் தொகுதி இல்லை எந்த &#39;தயாரிப்பு மூட்டை&#39; உருப்படியை அனைத்து பொதி பொருட்களை அதே இருந்தால், அந்த மதிப்புகள் முக்கிய பொருள் அட்டவணை உள்ளிட்ட முடியும், மதிப்புகள் மேஜை &#39;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
 DocType: Student Admission,Publish on website,வலைத்தளத்தில் வெளியிடு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,சப்ளையர் விவரப்பட்டியல் தேதி பதிவுசெய்ய தேதி விட அதிகமாக இருக்க முடியாது
+DocType: Subscription,Cancelation Date,ரத்து தேதி
 DocType: Purchase Invoice Item,Purchase Order Item,ஆர்டர் பொருள் வாங்க
 DocType: Agriculture Task,Agriculture Task,வேளாண் பணி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,மறைமுக வருமானம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,மறைமுக வருமானம்
 DocType: Student Attendance Tool,Student Attendance Tool,மாணவர் வருகை கருவி
 DocType: Restaurant Menu,Price List (Auto created),விலை பட்டியல் (தானாக உருவாக்கப்பட்டது)
 DocType: Cheque Print Template,Date Settings,தேதி அமைப்புகள்
@@ -1352,6 +1345,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,மீட்டர்
 DocType: Workstation,Electricity Cost,மின்சார செலவு
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ஆய்வக சோதனை தரவுத்தளத்திற்கு முன்பே தரவுத்தளம் இருக்காது
+DocType: Subscription Plan,Cost,செலவு
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
 DocType: Expense Claim,Total Advance Amount,மொத்த முன்கூட்டிய தொகை
 DocType: Delivery Stop,Estimated Arrival,கணக்கிடப்பட்ட வருகை
@@ -1363,15 +1357,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
 DocType: Timesheet Detail,Bill,ரசீது
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,வெள்ளை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,வெள்ளை
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,காசோலை பெட்டிகளில் இருந்து அதிகபட்சமாக ஒரு விருப்பத்தை மட்டும் தேர்ந்தெடுக்கலாம்.
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
 DocType: Item,Automatically Create New Batch,தானாகவே புதிய தொகுதி உருவாக்கவும்
 DocType: Item,Automatically Create New Batch,தானாகவே புதிய தொகுதி உருவாக்கவும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} {1} (வரிசை {2}) க்கு ஒதுக்குதல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,செய்ய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} {1} (வரிசை {2}) க்கு ஒதுக்குதல்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,செய்ய
 DocType: Student Admission,Admission Start Date,சேர்க்கை தொடக்க தேதி
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,புதிய பணியாளர்
@@ -1387,7 +1381,7 @@
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 DocType: Repayment Schedule,Balance Loan Amount,இருப்பு கடன் தொகை
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,அட்டவணை பாடநெறி
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,கொள்முதல் ஆணையில் கடைசி கொள்முதல் விவரங்களை பெறுவதை முடக்கு
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
@@ -1406,11 +1400,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ஸ்லிப் பொருள் பொதி
 DocType: Purchase Invoice,Cash/Bank Account,பண / வங்கி கணக்கு
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},தயவு செய்து குறிப்பிட ஒரு {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,மாறுபட்ட உருவாக்கம் வரிசைப்படுத்தப்பட்டுள்ளது.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} க்கான வேலை சுருக்கம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,பட்டியலில் முதல் விடுப்பு மதிப்பீட்டாளர் முன்னிருப்பு விடுப்பு மதிப்பீட்டாளராக அமைக்கப்படும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Plan,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
 DocType: Training Event,Self-Study,சுய ஆய்வு
@@ -1423,7 +1418,7 @@
 DocType: Workstation,Wages,ஊதியங்கள்
 DocType: Asset Maintenance,Maintenance Manager Name,பராமரிப்பு மேலாளர் பெயர்
 DocType: Agriculture Task,Urgent,அவசரமான
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},அட்டவணையில் வரிசை {0} ஒரு செல்லுபடியாகும் வரிசை ஐடி தயவு செய்து குறிப்பிடவும் {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},அட்டவணையில் வரிசை {0} ஒரு செல்லுபடியாகும் வரிசை ஐடி தயவு செய்து குறிப்பிடவும் {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,மாறி கண்டுபிடிக்க முடியவில்லை:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,நம்பகத்தன்மையிலிருந்து தொகுப்பதற்கு ஒரு புலத்தைத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,பங்கு லெட்ஜர் உருவாக்கிய ஒரு நிலையான சொத்து பொருந்தக்கூடியதாக இருக்க முடியாது.
@@ -1435,7 +1430,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,தர ஆய்வு டெம்ப்ளேட் பெயர்
 DocType: Project,First Email,முதல் மின்னஞ்சல்
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,விற்பனை ஆணை / இறுதிப்பொருட்களாக்கும் கிடங்கில் ஒதுக்கப்பட்ட கிடங்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,விற்பனை தொகை
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,விற்பனை தொகை
 DocType: Repayment Schedule,Interest Amount,வட்டி தொகை
 DocType: Serial No,Creation Document No,உருவாக்கம் ஆவண இல்லை
 DocType: Share Transfer,Issue,சிக்கல்
@@ -1449,10 +1444,10 @@
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 ,Projected Quantity as Source,மூல திட்டமிடப்பட்ட அளவு
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,டெலிவரி பயணம்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,டெலிவரி பயணம்
 DocType: Student,A-,ஏ
 DocType: Share Transfer,Transfer Type,பரிமாற்ற வகை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,விற்பனை செலவு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,விற்பனை செலவு
 DocType: Consultation,Diagnosis,நோய் கண்டறிதல்
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
@@ -1461,12 +1456,13 @@
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,ஜிப் குறியீடு
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},கடனுக்கான வட்டி வருமானக் கணக்கைத் தேர்ந்தெடுத்து {0}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை UOM
 DocType: Item,Default Supplier,இயல்புநிலை சப்ளையர்
 DocType: Manufacturing Settings,Over Production Allowance Percentage,உற்பத்தி கொடுப்பனவான சதவீதம் ஓவர்
-DocType: Employee Loan,Repayment Schedule,திரும்பச் செலுத்துதல் அட்டவணை
+DocType: Loan,Repayment Schedule,திரும்பச் செலுத்துதல் அட்டவணை
 DocType: Shipping Rule Condition,Shipping Rule Condition,கப்பல் விதி நிபந்தனை
 DocType: Holiday List,Get Weekly Off Dates,வாராந்திர இனிய தினங்கள் கிடைக்கும்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,முடிவு தேதி தொடங்கும் நாள் விட குறைவாக இருக்க முடியாது
@@ -1481,7 +1477,7 @@
 DocType: Education Settings,Attendance Freeze Date,வருகை உறைந்து தேதி
 DocType: Education Settings,Attendance Freeze Date,வருகை உறைந்து தேதி
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,உங்கள் சப்ளையர்கள் ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,அனைத்து பொருட்கள் காண்க
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,அனைத்து பொருட்கள் காண்க
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),குறைந்தபட்ச முன்னணி வயது (நாட்கள்)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),குறைந்தபட்ச முன்னணி வயது (நாட்கள்)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,அனைத்து BOM கள்
@@ -1489,14 +1485,16 @@
 DocType: Expense Claim,From Employee,பணியாளர் இருந்து
 DocType: Driver,Cellphone Number,செல்போன் எண்
 DocType: Project,Monitor Progress,மானிட்டர் முன்னேற்றம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
 DocType: Journal Entry,Make Difference Entry,வித்தியாசம் நுழைவு செய்ய
+DocType: Supplier Quotation,Auto Repeat Section,ஆட்டோ மீண்டும் தொடரவும்
 DocType: Upload Attendance,Attendance From Date,வரம்பு தேதி வருகை
 DocType: Appraisal Template Goal,Key Performance Area,முக்கிய செயல்திறன் பகுதி
 DocType: Program Enrollment,Transportation,போக்குவரத்து
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,தவறான கற்பிதம்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},அளவு குறைவாக அல்லது சமமாக இருக்க வேண்டும் {0}
+DocType: Department Approver,Department Approver,துறை மதிப்பீடு
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
 DocType: Employee Advance,Claimed,உரிமைகோரப்பட்டவை
 DocType: Crop,Row Spacing,வரிசை இடைவெளி
@@ -1506,6 +1504,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,கொடுப்பனவு நல்லிணக்க விலைப்பட்டியல்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,பங்களிப்பு%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","வாங்குதல் அமைப்புகள் படி கொள்முதல் ஆணை தேவைப்பட்டால் == &#39;ஆம்&#39;, பின்னர் கொள்முதல் விலைப்பட்டியல் உருவாக்கும், பயனர் உருப்படியை முதல் கொள்முதல் ஆணை உருவாக்க வேண்டும் {0}"
+,HSN-wise-summary of outward supplies,எச்.எஸ்.என் வாரியான-வெளிப்புற பொருட்கள் பற்றிய சுருக்கம்
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,உங்கள் குறிப்பு நிறுவனத்தில் பதிவு எண்கள். வரி எண்கள் போன்ற
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
@@ -1519,7 +1518,7 @@
 DocType: Setup Progress Action,Action Name,அதிரடி பெயர்
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,தொடக்க ஆண்டு
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN முதல் 2 இலக்கங்கள் மாநில எண் பொருந்த வேண்டும் {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் தேதி தொடங்கும்
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
@@ -1537,26 +1536,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,உருவாக்கம் நேரத்தில் மட்டுமே புலங்கள் நகலெடுக்கப்படும்.
 DocType: Setup Progress Action,Domains,களங்கள்
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி' யை விட அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,மேலாண்மை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,மேலாண்மை
 DocType: Cheque Print Template,Payer Settings,செலுத்துவோரை அமைப்புகள்
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பள விபரம் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
 DocType: Purchase Invoice,Is Return,திரும்ப
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,எச்சரிக்கை
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',தொடக்க நாள் பணி முடிவில் நாள் அதிகமாக உள்ளது &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
 DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},பொருட்களை {0} செல்லுபடியாகும் தொடர் இலக்கங்கள் {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,பொருள்  குறியீடு  வரிசை எண் மாற்றப்பட கூடாது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,பொருள்  குறியீடு  வரிசை எண் மாற்றப்பட கூடாது
 DocType: Purchase Invoice Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,தொகுதி எண் பெற கொள்ளவும் பொருள் குறியீடு நுழைய
 DocType: Stock Settings,Default Item Group,இயல்புநிலை பொருள் குழு
-DocType: Employee Loan,Partially Disbursed,பகுதியளவு செலவிட்டு
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,தகவல்களை வழங்குதல்.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,தகவல்களை வழங்குதல்.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,வழங்குபவர் தரவுத்தள.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,ரத்துசெய்யப்படாத சந்தாவை மறுதொடக்கம் செய்ய முடியாது.
 DocType: Account,Balance Sheet,இருப்பு தாள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
 DocType: Fee Validity,Valid Till,செல்லுபடியாகாத காலம்
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,மொத்த பெற்றோர் ஆசிரியர் கூட்டம்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
@@ -1569,7 +1568,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,தேர்ந்தெடுத்த வாடிக்கையாளருக்கு வாடிக்கையாளர் குழுவை மாற்றுதல் அனுமதிக்கப்படாது.
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,மதிப்பிடப்பட்ட வருகையை புதுப்பிக்கிறது.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,மதிப்பிடப்பட்ட வருகையை புதுப்பிக்கிறது.
 DocType: Program Enrollment Tool,Enrollment Details,பதிவு விவரங்கள்
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,ஒரு வாடிக்கையாளரைத் தேர்ந்தெடுக்கவும்
@@ -1590,18 +1589,20 @@
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Purchase Order,Group same items,குழு அதே பொருட்களை
 DocType: Purchase Invoice,Disable Rounded Total,வட்டமான மொத்த முடக்கு
-DocType: Employee Loan Application,Repayment Info,திரும்பச் செலுத்துதல் தகவல்
+DocType: Department,Parent Department,பெற்றோர் திணைக்களம்
+DocType: Loan Application,Repayment Info,திரும்பச் செலுத்துதல் தகவல்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
 DocType: Maintenance Team Member,Maintenance Role,பராமரிப்புப் பத்திரம்
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ஊழியர் அமைத்தல்
 DocType: Sales Order,SO-,அதனால்-
 DocType: Hotel Room Reservation,Hotel Reservation User,ஹோட்டல் முன்பதிவு பயனர்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ஆராய்ச்சி
+DocType: Subscription Settings,Subscription Settings,சந்தா அமைப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ஆராய்ச்சி
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Announcement,All Students,அனைத்து மாணவர்கள்
@@ -1612,18 +1613,18 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Crop Cycle,Less than a year,ஒரு வருடம் குறைவாக
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,மாணவர் மொபைல் எண்
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 DocType: Crop,Yield UOM,விளைச்சல் UOM
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
 DocType: Item,Is Item from Hub,பொருள் இருந்து மையமாக உள்ளது
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,ரோ {0}: நடவடிக்கை வகை கட்டாயமாகும்.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,பங்கிலாபங்களைப்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,பங்கிலாபங்களைப்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,கணக்கியல்  பேரேடு
 DocType: Stock Reconciliation,Difference Amount,வேறுபாடு தொகை
 DocType: Purchase Invoice,Reverse Charge,தலைகீழ் பொறுப்பு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,தக்க வருவாய்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,தக்க வருவாய்
 DocType: Purchase Invoice,05-Change in POS,05-POS இல் மாற்றம்
 DocType: Vehicle Log,Service Detail,சேவை விரிவாக
 DocType: BOM,Item Description,பொருள் விளக்கம்
@@ -1638,12 +1639,12 @@
 DocType: Opportunity Item,Opportunity Item,வாய்ப்பு தகவல்கள்
 ,Student and Guardian Contact Details,மாணவர் மற்றும் கார்டியன் தொடர்பு விவரங்கள்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,ரோ {0}: சப்ளையர் க்கு {0} மின்னஞ்சல் முகவரி மின்னஞ்சல் அனுப்ப வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,தற்காலிக திறப்பு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,தற்காலிக திறப்பு
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ஹப் பார்க்கவும்
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 DocType: Patient Appointment,More Info,மேலும் தகவல்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},மதிப்பீட்டு மதிப்பீடு வரிசையில் பொருள் தேவையான {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},மதிப்பீட்டு மதிப்பீடு வரிசையில் பொருள் தேவையான {0}
 DocType: Supplier Scorecard,Scorecard Actions,ஸ்கோர் கார்டு செயல்கள்
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,உதாரணம்: கணினி அறிவியல் முதுநிலை
 DocType: Purchase Invoice,Rejected Warehouse,நிராகரிக்கப்பட்டது கிடங்கு
@@ -1653,7 +1654,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,செய்ய
 DocType: Supplier Quotation Item,Lead Time in days,நாட்கள் முன்னணி நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,செலுத்தத்தக்க கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} இருந்து சம்பளம் கொடுப்பனவு {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} இருந்து சம்பளம் கொடுப்பனவு {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
@@ -1662,9 +1663,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,லேப் சோதனை பரிந்துரைப்புகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,சிறிய
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,சிறிய
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,விலைப்பட்டியல் உருவாக்கம் கருவிப் பொருள் திறக்கிறது
 DocType: Education Settings,Employee Number,பணியாளர் எண்
+DocType: Subscription Settings,Cancel Invoice After Grace Period,கிரேஸ் காலத்திற்குப் பிறகு விலைப்பட்டியல் ரத்துசெய்யவும்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
 DocType: Project,% Completed,% முடிந்தது
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
@@ -1678,7 +1680,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ஆய்வக சோதனை தரவுத்தளம்
 DocType: Email Digest,Add Quote,ஆனால் சேர்க்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,மறைமுக செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 DocType: Agriculture Analysis Criteria,Agriculture,விவசாயம்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
@@ -1708,16 +1710,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,மூலதன கருவிகள்
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,முதலில் உருப்படி கோட் ஐ அமைக்கவும்
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
+DocType: Subscription Plan,Billing Interval Count,பில்லிங் இடைவெளி எண்ணிக்கை
 DocType: Sales Invoice Item,Edit Description,விளக்கம் திருத்த
 DocType: Antibiotic,Antibiotic,ஆண்டிபயாடிக்
 ,Team Updates,குழு மேம்படுத்தல்கள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,சப்ளையர்
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,அமைத்தல் கணக்கு வகை பரிமாற்றங்கள் இந்த கணக்கு தேர்வு உதவுகிறது.
 DocType: Purchase Invoice,Grand Total (Company Currency),கிராண்ட் மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,அச்சு வடிவம் உருவாக்கு
@@ -1743,7 +1746,7 @@
 DocType: POS Item Group,POS Item Group,பிஓஎஸ் பொருள் குழு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,மாற்று உருப்படி உருப்படியின் குறியீடாக இருக்கக்கூடாது
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-தற்காலிக மதிப்பீடு முடித்தல்
 DocType: Salary Slip,Bank Account No.,வங்கி கணக்கு எண்
@@ -1760,7 +1763,7 @@
 DocType: BOM Operation,Workstation,பணிநிலையம்
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,மேற்கோள் சப்ளையர் கோரிக்கை
 DocType: Healthcare Settings,Registration Message,பதிவு செய்தியிடல்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,வன்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,வன்பொருள்
 DocType: Prescription Dosage,Prescription Dosage,பரிந்துரை மருந்து
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
@@ -1792,7 +1795,7 @@
 DocType: Project,Start and End Dates,தொடக்கம் மற்றும் தேதிகள் End
 ,Delivered Items To Be Billed,கட்டணம் வழங்கப்படும் பொருட்கள்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},BOM திறந்த {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
 DocType: Project Update,Great/Quickly,கிரேட் / விரைவில்
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1801,8 +1804,8 @@
 DocType: Employee,EMP/,ஊழியர் /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,பேட்ச்சுடு உருப்படியை தொகுப்புகளும் தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedules,தேய்மானம் கால அட்டவணைகள்
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,ஜிஎஸ்டி அமைப்புகளில் பின்வரும் கணக்குகள் தேர்ந்தெடுக்கப்படலாம்:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,ஜிஎஸ்டி அமைப்புகளில் பின்வரும் கணக்குகள் தேர்ந்தெடுக்கப்படலாம்:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
 DocType: Payment Request,Transaction Currency,பரிவர்த்தனை நாணய
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},இருந்து {0} | {1} {2}
@@ -1813,6 +1816,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,சராசரியாக தினமும் வெளிச்செல்லும்
 DocType: POS Profile,Campaign,பிரச்சாரம்
 DocType: Supplier,Name and Type,பெயர் மற்றும் வகை
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',அங்கீகாரநிலையை அங்கீகரிக்கப்பட்ட 'அல்லது' நிராகரிக்கப்பட்டது '
 DocType: Physician,Contacts and Address,தொடர்புகள் மற்றும் முகவரி
 DocType: Purchase Invoice,Contact Person,நபர் தொடர்பு
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',' எதிர்பார்த்த தொடக்க தேதி ' 'எதிர்பார்த்த முடிவு தேதி ' ஐ விட அதிகமாக இருக்க முடியாது
@@ -1826,19 +1830,20 @@
 DocType: Student Admission,Eligibility and Details,தகுதி மற்றும் விவரம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},அதிகபட்சம்: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,தேதி நேரம் இருந்து
 DocType: Email Digest,For Company,நிறுவனத்தின்
 apps/erpnext/erpnext/config/support.py +17,Communication log.,தொடர்பாடல் பதிவு.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","விலைப்பட்டியலுக்கான கோரிக்கை மேலும் காசோலை போர்டல் அமைப்புகளை, போர்டல் இருந்து அணுக முடக்கப்பட்டுள்ளது."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,சப்ளையர் ஸ்கோர் கார்ட் மாறி
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,தொகை வாங்கும்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,தொகை வாங்கும்
 DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முகவரி பெயர்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,பாடநெறி அட்டவணையை உருவாக்கும் பிழைகள் இருந்தன
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,"பட்டியலில் முதல் செலவின மதிப்பீடு, முன்னிருப்பு செலவின மதிப்பீட்டாக அமைக்கப்படும்."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1859,15 +1864,16 @@
 DocType: Package Code,Package Code,தொகுப்பு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,வேலை கற்க நியமி
 DocType: Purchase Invoice,Company GSTIN,நிறுவனம் GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ஒரு சரம் போன்ற உருப்படியை மாஸ்டர் இருந்து எடுத்தது இந்த துறையில் சேமிக்கப்படும் வரி விவரம் அட்டவணை.
  வரிகள் மற்றும் கட்டணங்கள் பயன்படுத்திய"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","கணக்கு முடக்கப்படும் என்றால், உள்ளீடுகளை தடை செய்த அனுமதிக்கப்படுகிறது ."
 DocType: Email Digest,Bank Balance,வங்கி மீதி
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,விடுப்பு விண்ணப்பத்தில் கண்டிப்பாக அனுமதியளிக்க வேண்டும்
 DocType: Job Opening,"Job profile, qualifications required etc.","வேலை சுயவிவரத்தை, தகுதிகள் தேவை முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
@@ -1895,15 +1901,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,வரிசையில் செலுத்துதல் கால 0 {0} என்பது ஒரு நகல் ஆகும்.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),விவசாயம் (பீட்டா)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ஸ்லிப் பொதி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
 DocType: Disease,Common Name,பொது பெயர்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,இறக்குமதி தோல்வி!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
 DocType: Vital Signs,Blood Pressure,இரத்த அழுத்தம்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,ஆய்வாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,ஆய்வாளர்
 DocType: Item,Inventory,சரக்கு
 DocType: Item,Sales Details,விற்பனை விவரம்
 DocType: Quality Inspection,QI-,QI-
@@ -1913,15 +1919,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,மாணவர் குழுமத்தின் மாணவர்களுக்கான என்ரோல்ட் கோர்ஸ் சரிபார்க்கவும்
 DocType: Notification Control,Expense Claim Rejected,செலவு  கோரிக்கை நிராகரிக்கப்பட்டது
 DocType: Item,Item Attribute,பொருள் கற்பிதம்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,அரசாங்கம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,அரசாங்கம்
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,செலவு கூறுகின்றனர் {0} ஏற்கனவே வாகன பதிவு உள்ளது
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,நிறுவனம் பெயர்
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,தயவு செய்து கடனைத் திரும்பச் செலுத்தும் தொகை நுழைய
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,தயவு செய்து கடனைத் திரும்பச் செலுத்தும் தொகை நுழைய
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,பொருள் மாறிகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,சேவைகள்
 DocType: HR Settings,Email Salary Slip to Employee,ஊழியர் மின்னஞ்சல் சம்பள விபரம்
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,சாத்தியமான சப்ளையர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,சாத்தியமான சப்ளையர் தேர்ந்தெடுக்கவும்
 DocType: Sales Invoice,Source,மூல
 DocType: Customer,"Select, to make the customer searchable with these fields","தேர்ந்தெடுக்கவும், இந்த துறைகள் வாடிக்கையாளர் தேடலை செய்ய"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,மூடப்பட்டது காட்டு
@@ -1938,7 +1944,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற
 DocType: Program Course,Program Course,திட்டம் பாடநெறி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Homepage,Company Tagline for website homepage,வலைத்தளத்தில் முகப்பு நிறுவனம் கோஷம்
 DocType: Item Group,Item Group Name,பொருள் குழு பெயர்
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட
@@ -1969,10 +1975,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership விவரங்கள்
 DocType: Leave Block List,Block Holidays on important days.,முக்கிய நாட்களில் பிளாக் விடுமுறை.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),தயவு செய்து அனைத்து தேவையான முடிவு மதிப்பு (கள்)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
-DocType: Employee Loan,Monthly Repayment Amount,மாதாந்திர கட்டுந்தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
+DocType: Loan,Monthly Repayment Amount,மாதாந்திர கட்டுந்தொகை
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,தொடுப்புகள் திறக்கப்படுகின்றன
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
 DocType: UOM,UOM Name,மொறட்டுவ பல்கலைகழகம் பெயர்
 DocType: GST HSN Code,HSN Code,HSN குறியீடு
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,பங்களிப்பு தொகை
@@ -1994,7 +2000,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},பயனர் {0} ஏற்கனவே மருத்துவர் {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,பெட்டி
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,சாத்தியமான சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,சாத்தியமான சப்ளையர்
+DocType: Journal Entry,JV-RET-,கூட்டுத் தொழில்-RET-
 DocType: Budget,Monthly Distribution,மாதாந்திர விநியோகம்
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),சுகாதார (பீட்டா)
@@ -2022,7 +2029,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
-DocType: Employee Loan,Repayment Method,திரும்பச் செலுத்துதல் முறை
+DocType: Loan,Repayment Method,திரும்பச் செலுத்துதல் முறை
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","தேர்ந்தெடுக்கப்பட்டால், முகப்பு பக்கம் வலைத்தளத்தில் இயல்புநிலை பொருள் குழு இருக்கும்"
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
@@ -2031,7 +2038,7 @@
 DocType: Asset Maintenance Task,Certificate Required,சான்றிதழ் தேவை
 DocType: Company,Default Holiday List,விடுமுறை பட்டியல் இயல்புநிலை
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},ரோ {0}: நேரம் மற்றும் நேரம் {1} கொண்டு மேலெழும் {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,பங்கு பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,பங்கு பொறுப்புகள்
 DocType: Purchase Invoice,Supplier Warehouse,வழங்குபவர் கிடங்கு
 DocType: Opportunity,Contact Mobile No,மொபைல் எண்  தொடர்பு
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,நிறுவனம் தேர்ந்தெடு
@@ -2039,7 +2046,7 @@
 DocType: Student Report Generation Tool,Print Section,பிரிவை பிரி
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,பயனர் {0} எந்த இயல்புநிலை POS சுயவிவரமும் இல்லை. இந்த பயனருக்கு வரிசையில் {1} இயல்புநிலையை சரிபார்க்கவும்.
 DocType: Student Group,Set 0 for no limit,எந்த எல்லை 0 அமை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} துவக்க {invoice_type} இன்யூசஸ் உருவாக்கத் தேவை
 DocType: Customer,Primary Address and Contact Detail,முதன்மை முகவரி மற்றும் தொடர்பு விவரங்கள்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
@@ -2050,10 +2057,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,குறைந்தது ஒரு டொமைன் தேர்ந்தெடுக்கவும்.
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,தேடல் பொருள்
 DocType: Payment Schedule,Payment Amount,கட்டணம் அளவு
@@ -2063,7 +2070,7 @@
 DocType: Assessment Plan,Grading Scale,தரம் பிரித்தல் ஸ்கேல்
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ஏற்கனவே நிறைவு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,கை பங்கு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,கை பங்கு
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,வெற்றிகரமான இறக்குமதி!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
@@ -2074,17 +2081,16 @@
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
 DocType: Customer,Customer POS Id,வாடிக்கையாளர் பிஓஎஸ் ஐடியை
 DocType: Account,Account Name,கணக்கு பெயர்
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,தொடர் இல {0} அளவு {1} ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,தொடர் இல {0} அளவு {1} ஒரு பகுதியை இருக்க முடியாது
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Woocommerce Server URL ஐ உள்ளிடுக
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
 DocType: Share Balance,To No,இல்லை
-DocType: Subscription,Reference Document,குறிப்பு ஆவண
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ரத்து செய்யப்பட்டது அல்லது நிறுத்தி உள்ளது
 DocType: Accounts Settings,Credit Controller,கடன் கட்டுப்பாட்டாளர்
-DocType: Grant Application,Applicant Type,விண்ணப்பதாரர் வகை
+DocType: Loan,Applicant Type,விண்ணப்பதாரர் வகை
 DocType: Purchase Invoice,03-Deficiency in services,03-சேவைகளில் குறைபாடு
 DocType: Delivery Note,Vehicle Dispatch Date,வாகன அனுப்புகை தேதி
 DocType: Healthcare Settings,Default Medical Code Standard,இயல்புநிலை மருத்துவ குறியீடு தரநிலை
@@ -2095,13 +2101,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% வசூலிக்கப்படும்
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,மனித வளங்கள்
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,மனித வளங்கள்
 DocType: Lead,Upper Income,உயர் வருமானம்
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,நிராகரி
 DocType: Journal Entry Account,Debit in Company Currency,நிறுவனத்தின் நாணய பற்று
 DocType: BOM Item,BOM Item,BOM பொருள்
 DocType: Appraisal,For Employee,பணியாளர் தேவை
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,இரு வாரங்கள் முடிவதற்குள் நுழைவு செய்ய
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,இரு வாரங்கள் முடிவதற்குள் நுழைவு செய்ய
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
 DocType: Company,Default Values,இயல்புநிலை மதிப்புகள்
 DocType: Membership,INR,ரூபாய்
@@ -2131,10 +2137,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,கிடைக்கும் பங்கு
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,கிடைக்கும் பங்கு
 DocType: Manufacturing Settings,Capacity Planning For (Days),(நாட்கள்) கொள்ளளவு திட்டமிடுதல்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,கொள்முதல்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,கட்டாய துறையில் - திட்டம்
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,கட்டாய துறையில் - திட்டம்
 DocType: Special Test Template,Result Component,முடிவு கூறு
@@ -2155,7 +2161,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,இலைகள் போன்ற இலைகள் உள்ள விடுமுறை சேர்க்கவும்
 DocType: Sales Invoice,Packed Items,நிரம்பிய பொருட்கள்
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,வரிசை எண் எதிரான உத்தரவாதத்தை கூறுகின்றனர்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;மொத்தம்&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;மொத்தம்&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,வண்டியில் இயக்கு
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2173,10 +2179,10 @@
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,செயல் என்பதை உறுதிப்படுத்துக
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,நிறைவேற்றுதல்
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,வண்டியில் காண்க
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,நிலையான அளவுகோல்களை உருவாக்க முடியாது. நிபந்தனைகளுக்கு மறுபெயரிடுக
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
@@ -2199,9 +2205,9 @@
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Material Request,Transferred,மாற்றப்பட்டது
 DocType: Vehicle,Doors,கதவுகள்
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,நோயாளி பதிவுக்கான கட்டணம் சேகரிக்கவும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,பங்கு பரிவர்த்தனைக்குப் பிறகு காரியங்களை மாற்ற முடியாது. புதிய உருப்படிக்கு புதிய பொருளை உருவாக்கவும் பங்குகளை பரிமாற்றவும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,பங்கு பரிவர்த்தனைக்குப் பிறகு காரியங்களை மாற்ற முடியாது. புதிய உருப்படிக்கு புதிய பொருளை உருவாக்கவும் பங்குகளை பரிமாற்றவும்
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,வரி முறிவுக்குப்
 DocType: Packing Slip,PS-,PS-
@@ -2237,12 +2243,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,சமரசம் JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Purchase Invoice Item,Batch No,தொகுதி இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,பணியாளர் முன்னேற்றங்கள்
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 DocType: Grant Application,Assessment  Mark (Out of 10),மதிப்பீட்டு மார்க் (10 இலிருந்து)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 கைப்பேசி
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,முதன்மை
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
@@ -2251,15 +2258,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Email Digest,Annual Expenses,வருடாந்த செலவுகள்
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,கொள்முதல் ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,கொள்முதல் ஆணை செய்ய
 DocType: SMS Center,Send To,அனுப்பு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
 DocType: Sales Team,Contribution to Net Total,நிகர மொத்த பங்களிப்பு
 DocType: Sales Invoice Item,Customer's Item Code,வாடிக்கையாளர் பொருள் குறியீடு
 DocType: Stock Reconciliation,Stock Reconciliation,பங்கு நல்லிணக்க
 DocType: Territory,Territory Name,மண்டலம் பெயர்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,ஒரு சந்தாவில் அதே பில்லிங் சுழற்சிகளுடன் நீங்கள் மட்டுமே திட்டங்கள் இருக்கலாம்
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ஒரு வேலை விண்ணப்பதாரர்.
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
@@ -2269,10 +2277,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,மதிப்பீடுகளில்
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,பயிற்சி நிகழ்வுகள்
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,ட்ராக் மூலத்தை வழிநடத்துகிறது.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,தயவுசெய்து உள்ளீடவும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,தயவுசெய்து உள்ளீடவும்
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,பராமரிப்பு பதிவு
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),இந்த தொகுப்பு நிகர எடை. (பொருட்களை நிகர எடை கூடுதல் போன்ற தானாக கணக்கிடப்படுகிறது)
@@ -2280,11 +2288,11 @@
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: Student Group,Instructors,பயிற்றுனர்கள்
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,பகிர்வு மேலாண்மை
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,கொடுப்பனவு
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","கிடங்கு {0} எந்த கணக்கிற்கானது அல்ல என்பதுடன், அந்த நிறுவனம் உள்ள கிடங்கில் பதிவில் கணக்கு அல்லது அமைக்க இயல்புநிலை சரக்கு கணக்கு குறிப்பிட தயவு செய்து {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,உங்கள் ஆர்டர்களை நிர்வகிக்கவும்
 DocType: Work Order Operation,Actual Time and Cost,உண்மையான நேரம் மற்றும் செலவு
@@ -2294,7 +2302,7 @@
 DocType: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,மீது
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,விற்பனை நேரத்தில் பொருட்களை மூட்டை.
@@ -2304,7 +2312,7 @@
 DocType: Item,Barcodes,பார்கோடுகள்
 DocType: Hub Category,Hub Node,மையம் கணு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,இணை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,இணை
 DocType: Asset Movement,Asset Movement,சொத்து இயக்கம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,பணி வரிசை {0} சமர்ப்பிக்கப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,புதிய வண்டி
@@ -2322,13 +2330,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,பில்லிங் நாணயம் இயல்புநிலை நிறுவன நாணய அல்லது கட்சி கணக்கு நாணயத்திற்கு சமமாக இருக்க வேண்டும்
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 DocType: Soil Texture,Loam,லோம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,வரிசை {0}: தேதி தேதி வெளியிடும் தேதி இருக்க முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,வரிசை {0}: தேதி தேதி வெளியிடும் தேதி இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,கொடுப்பனவு நுழைவு செய்ய
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
 ,Sales Invoice Trends,விற்பனை விலைப்பட்டியல் போக்குகள்
 DocType: Leave Application,Apply / Approve Leaves,இலைகள் ஒப்புதல் / விண்ணப்பிக்கவும்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,ஐந்து
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',கட்டணம் வகை அல்லது ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசை அளவு ' மட்டுமே வரிசையில் பார்க்கவும் முடியும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',கட்டணம் வகை அல்லது ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசை அளவு ' மட்டுமே வரிசையில் பார்க்கவும் முடியும்
 DocType: Sales Order Item,Delivery Warehouse,டெலிவரி கிடங்கு
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,நிதி செலவு மையங்கள் மரம்.
 DocType: Serial No,Delivery Document No,டெலிவரி ஆவண இல்லை
@@ -2342,7 +2349,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,பொருள் நுகர்வு உற்பத்தி அமைப்புகளில் அமைக்கப்படவில்லை.
 DocType: Student,Student Mobile Number,மாணவர் மொபைல் எண்
 DocType: Item,Has Variants,வகைகள் உண்டு
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} விட {0} வரிசையில் {0} க்கு மேலாக அதிகரிக்க முடியாது. அதிக பில்லிங் அனுமதிக்க, பங்கு அமைப்புகளில் அமைக்கவும்"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} விட {0} வரிசையில் {0} க்கு மேலாக அதிகரிக்க முடியாது. அதிக பில்லிங் அனுமதிக்க, பங்கு அமைப்புகளில் அமைக்கவும்"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,பதில் புதுப்பிக்கவும்
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
@@ -2354,12 +2361,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,முதலில் நிரலைத் தேர்ந்தெடுக்கவும்
 DocType: Patient Appointment,Patient Age,நோயாளி வயது
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,திட்டங்கள் நிர்வாக
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,சீரியல் இல்லை {0} ஏற்கனவே திரும்பியது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,சீரியல் இல்லை {0} ஏற்கனவே திரும்பியது
 DocType: Supplier,Supplier of Goods or Services.,பொருட்கள் அல்லது சேவைகள் சப்ளையர்.
 DocType: Budget,Fiscal Year,நிதியாண்டு
 DocType: Asset Maintenance Log,Planned,திட்டமிட்ட
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"ஆலோசனைக் கட்டணம் கட்டாயமாக நோயாளிக்கு அமைக்கப்படாவிட்டால், இயலக்கூடிய பெறத்தக்க கணக்குகள் பயன்படுத்தப்பட வேண்டும்."
 DocType: Vehicle Log,Fuel Price,எரிபொருள் விலை
+DocType: Bank Guarantee,Margin Money,மார்ஜின் பணம்
 DocType: Budget,Budget,வரவு செலவு திட்டம்
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,திறந்த அமை
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
@@ -2373,16 +2381,16 @@
 DocType: Lead,Follow Up,பின்தொடரவும்
 DocType: Item,Is Sales Item,விற்பனை பொருள் ஆகும்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,பொருள் குழு மரம்
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,பொருள் {0} சீரியல் எண்கள் சோதனை பொருள் மாஸ்டர் அமைப்பு அல்ல
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,பொருள் {0} சீரியல் எண்கள் சோதனை பொருள் மாஸ்டர் அமைப்பு அல்ல
 DocType: Maintenance Visit,Maintenance Time,பராமரிப்பு நேரம்
 ,Amount to Deliver,அளவு வழங்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},அதே உருப்படியை பல முறை உள்ளிட்டுள்ளது. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால தொடக்க தேதி கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு தொடக்க தேதி முன்னதாக இருக்க முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,பிழைகள் இருந்தன .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,பணியாளர் {0} {2} மற்றும் {3} இடையே {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,பிழைகள் இருந்தன .
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,பணியாளர் {0} {2} மற்றும் {3} இடையே {1}
 DocType: Guardian,Guardian Interests,கார்டியன் ஆர்வம்
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
 DocType: Education Settings,Instructor Records to be created by,பயிற்றுவிப்பாளர் பதிவுகள் உருவாக்கப்பட வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} உருவாக்கப்பட்டது
 DocType: GST Account,GST Account,GST கணக்கு
@@ -2402,8 +2410,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,பிடித்தவையில் சேர்க்கப்பட்டது
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,சம்பள சரிவு இல்லை மேலே தேர்ந்தெடுக்கப்பட்ட அளவுகோல்கள் அல்லது சம்பள சரிவு ஏற்கனவே சமர்ப்பிக்கப்பட்டது
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,கடமைகள் மற்றும் வரி
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,சம்பள சரிவு இல்லை மேலே தேர்ந்தெடுக்கப்பட்ட அளவுகோல்கள் அல்லது சம்பள சரிவு ஏற்கனவே சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,கடமைகள் மற்றும் வரி
 DocType: Projects Settings,Projects Settings,திட்டங்கள் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} கட்டணம் உள்ளீடுகளை மூலம் வடிகட்டி முடியாது {1}
@@ -2413,27 +2421,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,பொருள் குழுக்கள் மரம் .
 DocType: Production Plan,Total Produced Qty,மொத்த உற்பத்தி Qty
 DocType: Payroll Entry,Get Employee Details,பணியாளர் விபரங்களைப் பெறுக
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
 DocType: Asset,Sold,விற்கப்பட்டது
 ,Item-wise Purchase History,பொருள் வாரியான கொள்முதல் வரலாறு
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 DocType: Sales Invoice Payment,Base Amount (Company Currency),அடிப்படை அளவு (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,மூல பொருட்கள்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,மூல பொருட்கள்
 DocType: Payment Reconciliation Payment,Reference Row,குறிப்பு ரோ
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
 DocType: Sales Invoice,Accounting Details,கணக்கு விவரங்கள்
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்கு
 DocType: Patient,O Positive,நேர்மறை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,முதலீடுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ஒதுக்கீடுகள்
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,ஏற்று கொள்வதற்கான நிபந்தனை
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் பொருள் கோரிக்கைகள் நுழைய
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ஜர்னல் நுழைவுக்காக திருப்பிச் செலுத்துதல் இல்லை
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 DocType: BOM,Show In Website,இணையத்தளம் காண்பி
 DocType: Shopping Cart Settings,Show Quantity in Website,இணையத்தளம் கலப்பினமாடுகள் காட்டு
-DocType: Employee Loan Application,Total Payable Amount,மொத்த செலுத்த வேண்டிய தொகை
+DocType: Loan Application,Total Payable Amount,மொத்த செலுத்த வேண்டிய தொகை
 DocType: Task,Expected Time (in hours),எதிர்பார்த்த நேரம் (மணி)
 DocType: Item Reorder,Check in (group),சரிபார்க்க (குழு)
 DocType: Soil Texture,Silt,வண்டல்
@@ -2452,7 +2461,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,பணம் கட்டு
 DocType: Room,Room Name,அறை பெயர்
 DocType: Prescription Duration,Prescription Duration,பரிந்துரைப்பு காலம்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு சாதனை வருகிறது போல், முன் {0} ரத்து / பயன்படுத்த முடியாது விடவும் {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு சாதனை வருகிறது போல், முன் {0} ரத்து / பயன்படுத்த முடியாது விடவும் {1}"
 DocType: Activity Cost,Costing Rate,இதற்கான செலவு மதிப்பீடு
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,வாடிக்கையாளர் முகவரிகள் மற்றும் தொடர்புகள்
 ,Campaign Efficiency,பிரச்சாரத்தின் திறன்
@@ -2471,11 +2480,11 @@
 DocType: Chapter,Chapter,அத்தியாயம்
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,இணை
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,இந்த பயன்முறை தேர்ந்தெடுக்கப்பட்டபோது POS விலைப்பட்டியல் தானாகவே தானாகவே புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedule,தேய்மானம் அட்டவணை
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,விற்பனை பார்ட்னர் முகவரிகள் மற்றும் தொடர்புகள்
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,அரை நாள் தேதி வரம்பு தேதி தேதி இடையே இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,அரை நாள் தேதி வரம்பு தேதி தேதி இடையே இருக்க வேண்டும்
 DocType: Maintenance Schedule Detail,Actual Date,உண்மையான தேதி
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,{0} நிறுவனத்தில் உள்ள இயல்புநிலை விலை மையத்தை அமைத்திடுங்கள்.
 DocType: Item,Has Batch No,கூறு எண் உள்ளது
@@ -2493,7 +2502,6 @@
 DocType: Task,Actual End Date (via Time Sheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக)
 DocType: Soil Texture,Soil Type,மண் வகை
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,புதிய தகவல்
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},"பொருள் குழு குறிப்பிடப்படவில்லை
 உருப்படியை {0} ல் உருப்படியை மாஸ்டர்"
@@ -2514,7 +2522,7 @@
 DocType: Hub Category,Hub Category,ஹப் பகுப்பு
 DocType: Purchase Invoice,SEZ,சிறப்புப் பொருளாதார மண்டலம்
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
-DocType: Employee Loan,Loan Amount,கடன்தொகை
+DocType: Loan,Loan Amount,கடன்தொகை
 DocType: Student Report Generation Tool,Add Letterhead,லெட்டர்ஹெட் சேர்க்கவும்
 DocType: Program Enrollment,Self-Driving Vehicle,சுயமாக ஓட்டும் வாகன
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,சப்ளையர் ஸ்கார்கார்டு ஸ்டாண்டிங்
@@ -2543,9 +2551,9 @@
 DocType: Cash Flow Mapper,Position,நிலை
 DocType: Patient,Patient Details,நோயாளி விவரங்கள்
 DocType: Patient,B Positive,பி நேர்மறை
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
 DocType: Patient Medical Record,Patient Medical Record,நோயாளி மருத்துவ பதிவு
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,விளையாட்டு
@@ -2553,8 +2561,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,உண்மையான மொத்த
 DocType: Lab Test UOM,Test UOM,சோதனை UOM
 DocType: Student Siblings,Student Siblings,மாணவர் உடன்பிறப்புகளின்
+DocType: Subscription Plan Detail,Subscription Plan Detail,சந்தா திட்ட விபரம்
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,அலகு
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
 ,Customer Acquisition and Loyalty,வாடிக்கையாளர் கையகப்படுத்துதல் மற்றும் லாயல்டி
 DocType: Asset Maintenance Task,Maintenance Task,பராமரிப்பு பணி
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,GST அமைப்புகளில் B2C வரம்பை அமைக்கவும்.
@@ -2569,6 +2578,7 @@
 ,BOM Search,"BOM, தேடல்"
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),மொத்த நுகர்வு பொருள் செலவு (பங்கு நுழைவு வழியாக)
 DocType: Hub Settings,Company Registered,நிறுவனம் பதிவுசெய்யப்பட்டது
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,தேதி வரை தேதி குறைவாக இருக்க முடியாது
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ஹப் மீது &quot;பங்குகளில்&quot; அல்லது &quot;நாட்டில் இல்லை பங்கு&quot; வெளியிட இந்த கிடங்கில் பங்கு அடிப்படையில்.
 DocType: Vehicle,Fuel Type,எரிபொருள் வகை
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
@@ -2576,17 +2586,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},தொகுதி பங்குச் சமநிலை {0} மாறும் எதிர்மறை {1} கிடங்கு உள்ள பொருள் {2} ஐந்து {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,பொருள் கோரிக்கைகள் தொடர்ந்து பொருள் மறு ஒழுங்கு நிலை அடிப்படையில் தானாக எழுப்பினார்
 DocType: Email Digest,Pending Sales Orders,விற்பனை ஆணைகள் நிலுவையில்
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 DocType: Employee,Create User Permission,பயனர் அனுமதி உருவாக்க
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Healthcare Settings,Remind Before,முன் நினைவூட்டு
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
 DocType: Production Plan Item,material_request_item,பொருள் கோரிக்கை உருப்படியை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Salary Component,Deduction,கழித்தல்
 DocType: Item,Retain Sample,மாதிரி வைத்திரு
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
 DocType: Stock Reconciliation Item,Amount Difference,தொகை  வேறுபாடு
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல்  {1} ல்
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல்  {1} ல்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
 DocType: Territory,Classification of Customers by region,பிராந்தியம் மூலம் வாடிக்கையாளர்கள் பிரிவுகள்
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,தயாரிப்பில்
@@ -2596,8 +2607,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,கணக்கிடப்படுகிறது வங்கி அறிக்கை சமநிலை
 DocType: Normal Test Template,Normal Test Template,சாதாரண டெஸ்ட் டெம்ப்ளேட்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ஊனமுற்ற பயனர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,மேற்கோள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,எந்தவொரு மேற்கோளிடமும் பெறப்பட்ட RFQ ஐ அமைக்க முடியவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,மேற்கோள்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,எந்தவொரு மேற்கோளிடமும் பெறப்பட்ட RFQ ஐ அமைக்க முடியவில்லை
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,கணக்கு நாணயத்தில் அச்சிட ஒரு கணக்கைத் தேர்ந்தெடுக்கவும்
@@ -2605,7 +2616,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,இந்த நோயாளிக்கு எதிரான பரிவர்த்தனைகளை அடிப்படையாகக் கொண்டது. விபரங்களுக்கு கீழே காலவரிசைப் பார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Patient,Date of Birth,பிறந்த நாள்
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,சப்ளையர் ஸ்கோர் கார்ட் அமைப்பு
@@ -2616,14 +2627,15 @@
 DocType: Work Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,கழித்து
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,வேலை விபரம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,வேலை விபரம்
 DocType: Student Applicant,Applied,பிரயோக
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,மீண்டும் திற
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,மீண்டும் திற
 DocType: Sales Invoice Item,Qty as per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி அளவு
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 பெயர்
 DocType: Purchase Invoice,02-Post Sale Discount,02-அஞ்சல் விற்பனை தள்ளுபடி
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. தடங்கள், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு."
+DocType: Department Approver,Approver,சர்க்கார் தரப்பில் சாட்சி சொல்லும் குற்றவாளி
 ,SO Qty,எனவே அளவு
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,பங்குதாரருக்கு புலம் வெற்று இருக்க முடியாது
 DocType: Guardian,Work Address,பணியிட முகவரி
@@ -2637,21 +2649,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),மொத்த ஒதுக்கப்பட்ட தொகை (நிறுவனத்தின் நாணய)
 DocType: Purchase Order Item,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 DocType: BOM,Scrap Material Cost,குப்பை பொருள் செலவு
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
 DocType: Grant Application,Email Notification Sent,மின்னஞ்சல் அறிவிப்பு அனுப்பப்பட்டது
 DocType: Purchase Invoice,In Words (Company Currency),சொற்கள் (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","பொருள் கோட், கிடங்கு, அளவு வரிசையில் தேவை"
-DocType: Pricing Rule,Supplier,கொடுப்பவர்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","பொருள் கோட், கிடங்கு, அளவு வரிசையில் தேவை"
+DocType: Bank Guarantee,Supplier,கொடுப்பவர்
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,கட்டண விவரங்களைக் காட்டு
 DocType: Consultation,Consultation Time,ஆலோசனை நேரம்
 DocType: C-Form,Quarter,காலாண்டு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,இதர செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,இதர செலவுகள்
 DocType: Global Defaults,Default Company,முன்னிருப்பு நிறுவனத்தின்
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
 DocType: Payment Request,PR,பொது
 DocType: Cheque Print Template,Bank Name,வங்கி பெயர்
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,மேலே
-DocType: Employee Loan,Employee Loan Account,பணியாளர் கடன் கணக்கு
 DocType: Leave Application,Total Leave Days,மொத்த விடுப்பு நாட்கள்
 DocType: Email Digest,Note: Email will not be sent to disabled users,குறிப்பு: மின்னஞ்சல் ஊனமுற்ற செய்த அனுப்ப முடியாது
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,பரஸ்பர எண்ணிக்கை
@@ -2667,7 +2678,7 @@
 DocType: Vital Signs,Weight (In Kilogram),எடை (கிலோகிராம்)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.","அத்தியாயத்தை சேமித்தபின், அத்தியாயங்கள் / chapter_name தானாகவே அமைக்கப்படும்."
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST அமைப்புகளில் GST கணக்குகளை அமைக்கவும்
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST அமைப்புகளில் GST கணக்குகளை அமைக்கவும்
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,வணிக வகை
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,புதிய கொள்முதல் செலவு
@@ -2676,12 +2687,13 @@
 DocType: Grant Application,Grant Description,நன்கொடை விளக்கம்
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Student Guardian,Others,மற்றவை
+DocType: Subscription,Discounts,தள்ளுபடிகள்
 DocType: Payment Entry,Unallocated Amount,ஒதுக்கப்படாத தொகை
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.
 DocType: POS Profile,Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள்
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ஒரு தயாரிப்பு அல்லது, வாங்கி விற்று, அல்லது பங்குச் வைக்கப்படும் என்று ஒரு சேவை."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,மேலும் புதுப்பிப்புகளை இல்லை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,இது இந்த அமைப்புடன் இணைக்கப்பட்ட அனைத்து ஸ்கோர் கார்டுகளையும் உள்ளடக்கியது
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,குழந்தை பொருள் ஒரு தயாரிப்பு மூட்டை இருக்க கூடாது. உருப்படியை நீக்க: {0}: மற்றும் காப்பாற்றுங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,வங்கி
@@ -2690,45 +2702,48 @@
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Grading Scale,Grading Scale Intervals,தரம் பிரித்தல் அளவுகோல் இடைவெளிகள்
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,ஆண்டுக்கான லாபம்
+DocType: Bank Guarantee,Name of Bank,வங்கியின் பெயர்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}:  நுழைவு கணக்கியல் {2} ல் நாணய மட்டுமே அவ்வாறு செய்யமுடியும்: {3}
 DocType: Fee Schedule,In Process,செயல்முறை உள்ள
 DocType: Authorization Rule,Itemwise Discount,இனவாரியாக தள்ளுபடி
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,நிதி கணக்குகள் மரம்.
+DocType: Bank Guarantee,Reference Document Type,குறிப்பு ஆவண வகை
 DocType: Cash Flow Mapping,Cash Flow Mapping,பணப்பாய்வு வரைபடம்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
 DocType: Account,Fixed Asset,நிலையான சொத்து
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,தொடர் சரக்கு
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,இயல்புநிலை தொடர்புகளில் மின்னஞ்சல் இல்லை
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,இரகசியத்தை உருவாக்குங்கள்
-DocType: Employee Loan,Account Info,கணக்கு தகவல்
+DocType: Loan,Account Info,கணக்கு தகவல்
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
 DocType: Fees,Include Payment,கட்டணம் சேர்க்கவும்
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} மாணவர் குழுக்கள் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} மாணவர் குழுக்கள் உருவாக்கப்பட்டது.
 DocType: Sales Invoice,Total Billing Amount,மொத்த பில்லிங் அளவு
 DocType: Fee Schedule,Receivable Account,பெறத்தக்க கணக்கு
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
 DocType: Quotation Item,Stock Balance,பங்கு இருப்பு
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,தலைமை நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,தலைமை நிர்வாக அதிகாரி
 DocType: Purchase Invoice,With Payment of Tax,வரி செலுத்துதல்
 DocType: Expense Claim Detail,Expense Claim Detail,செலவு  கோரிக்கை  விவரம்
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,வினியோகஸ்தரின் மும்மடங்கான
 DocType: Land Unit,Is Container,கொள்கலன் உள்ளது
 DocType: Crop Cycle,This will be day 1 of the crop cycle,இது பயிர் சுழற்சியின் நாள் 1 ஆகும்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ஃபோலியோ எண்களுடன் கிடைக்கும் பங்குதாரர்களின் பட்டியல்
 DocType: Salary Structure Employee,Salary Structure Employee,சம்பளம் அமைப்பு பணியாளர்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,மாற்று பண்புகளை காட்டு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,மாற்று பண்புகளை காட்டு
 DocType: Student,Blood Group,குருதி பகுப்பினம்
 DocType: Course,Course Name,படிப்பின் பெயர்
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ஒரு குறிப்பிட்ட ஊழியர் விடுப்பு விண்ணப்பங்கள் ஒப்புதல் முடியும் பயனர்கள்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,அலுவலக உபகரணங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,அலுவலக உபகரணங்கள்
 DocType: Purchase Invoice Item,Qty,அளவு
 DocType: Fiscal Year,Companies,நிறுவனங்கள்
 DocType: Supplier Scorecard,Scoring Setup,ஸ்கோரிங் அமைப்பு
@@ -2747,7 +2762,7 @@
 DocType: Stock Entry,Total Incoming Value,மொத்த உள்வரும் மதிப்பு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,பற்று தேவைப்படுகிறது
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,கொள்முதல் விலை பட்டியல்
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,சப்ளையர் ஸ்கோர் கார்டு மாறிகளின் டெம்ப்ளேட்கள்.
 DocType: Job Offer Term,Offer Term,சலுகை  கால
 DocType: Asset,Quality Manager,தர மேலாளர்
@@ -2759,13 +2774,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM இணையத்தளம் ஆபரேஷன்
 DocType: Supplier Scorecard,Supplier Score,சப்ளையர் ஸ்கோர்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,மொத்த விலை விவரம் விவரங்கள்
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,மொத்த விலை விவரம் விவரங்கள்
 DocType: Supplier,Warn RFQs,RFQ களை எச்சரிக்கவும்
 DocType: BOM,Conversion Rate,மாற்றம் விகிதம்
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,தயாரிப்பு தேடல்
 DocType: Assessment Plan,To Time,டைம்
 DocType: Authorization Rule,Approving Role (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பாத்திரம் அப்ரூவிங்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
+DocType: Loan,Total Amount Paid,மொத்த தொகை பணம்
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,ஊதியம் பெறும் மாணவர் விண்ணப்பதாரருக்கு கண்டிப்பாகத் தேவைப்படும் மாணவர் சேர்க்கைக்குத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,விலை வெளியிட ஒரு விலை பட்டியல் தேர்ந்தெடுக்கவும்
@@ -2775,19 +2791,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},ரோ {0}: பூர்த்தி அளவு விட முடியாது {1} அறுவை சிகிச்சை {2}
 DocType: Manufacturing Settings,Allow Overtime,அதிக நேரம் அனுமதிக்கவும்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","தொடராக வெளிவரும் பொருள் {0} பங்கு நுழைவு பங்கு நல்லிணக்க பயன்படுத்தி, பயன்படுத்தவும் புதுப்பிக்க முடியாது"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","தொடராக வெளிவரும் பொருள் {0} பங்கு நுழைவு பங்கு நல்லிணக்க பயன்படுத்தி, பயன்படுத்தவும் புதுப்பிக்க முடியாது"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","தொடராக வெளிவரும் பொருள் {0} பங்கு நுழைவு பங்கு நல்லிணக்க பயன்படுத்தி, பயன்படுத்தவும் புதுப்பிக்க முடியாது"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","தொடராக வெளிவரும் பொருள் {0} பங்கு நுழைவு பங்கு நல்லிணக்க பயன்படுத்தி, பயன்படுத்தவும் புதுப்பிக்க முடியாது"
 DocType: Training Event Employee,Training Event Employee,பயிற்சி நிகழ்வு பணியாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,அதிகபட்ச மாதிரிகள் - {0} தொகுதி {1} மற்றும் பொருள் {2} க்கான தக்கவைக்கப்படலாம்.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,நேரம் இடங்கள் சேர்க்கவும்
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} பொருள் தேவையான சீரியல் எண்கள் {1}. நீங்கள் வழங்கிய {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,தற்போதைய மதிப்பீட்டு விகிதம்
 DocType: Training Event,Advance,அட்வான்ஸ்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,மீண்டும் மீண்டும் செய்வதற்காக.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless கட்டணம் நுழைவாயில் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,செலாவணி லாபம் / நஷ்டம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,செலாவணி லாபம் / நஷ்டம்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},வரிசை # {0}: கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது அல்ல {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},வரிசை # {0}: கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது அல்ல {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} கண்டுபிடிக்க முடியவில்லை
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
@@ -2806,7 +2821,6 @@
 DocType: Bin,Actual Quantity,உண்மையான அளவு
 DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,இல்லை தொ.இல. {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},சந்தா {0}
 DocType: Fee Schedule Program,Fee Schedule Program,கட்டணம் அட்டவணை திட்டம்
 DocType: Fee Schedule Program,Student Batch,மாணவர் தொகுதி
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,மாணவர் செய்ய
@@ -2822,14 +2836,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,மின் வணிகம் GSTIN
 DocType: Sales Order,Not Delivered,அனுப்பப்படவில்லை.
 ,Bank Clearance Summary,வங்கி இசைவு சுருக்கம்
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் சுருக்கங்களின் நிர்வகிக்க ."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் சுருக்கங்களின் நிர்வகிக்க ."
 DocType: Appraisal Goal,Appraisal Goal,மதிப்பீட்டு இலக்கு
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,வகை பரிந்துரைக்க
 DocType: Stock Reconciliation Item,Current Amount,தற்போதைய அளவு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,கட்டிடங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,கட்டிடங்கள்
 DocType: Fee Schedule,Fee Structure,கட்டணம் அமைப்பு
 DocType: Timesheet Detail,Costing Amount,இதற்கான செலவு தொகை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Student Admission Program,Application Fee,விண்ணப்பக் கட்டணம்
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,சம்பளம் ஸ்லிப் &#39;to
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,"பொருள் {0} {1}% க்கான 
@@ -2838,12 +2851,13 @@
 DocType: Sales Partner,Address & Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: SMS Log,Sender Name,அனுப்புநர் பெயர்
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,வேளாண் பகுப்பாய்வு அளவுகோல்
+DocType: HR Settings,Leave Approval Notification Template,ஒப்புதல் அறிவிப்பு வார்ப்புருவை விடு
 DocType: POS Profile,[Select],[ தேர்ந்தெடு ]
 DocType: Vital Signs,Blood Pressure (diastolic),இரத்த அழுத்தம் (சிறுநீர்ப்பை)
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 DocType: Agriculture Task,Holiday Management,விடுமுறை மேலாண்மை
 DocType: Payment Request,Make Sales Invoice,விற்பனை விலைப்பட்டியல் செய்ய
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,மென்பொருள்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,மென்பொருள்கள்
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{1} இல் மருத்துவர் {0} கிடைக்கவில்லை
@@ -2861,7 +2875,7 @@
 DocType: Employee,New Workplace,புதிய பணியிடத்தை
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,பொருள் நுகர்வு
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,மூடப்பட்ட அமை
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},பார்கோடு கூடிய உருப்படி {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},பார்கோடு கூடிய உருப்படி {0}
 DocType: Normal Test Items,Require Result Value,முடிவு மதிப்பு தேவை
 DocType: Item,Show a slideshow at the top of the page,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2876,19 +2890,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
 DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி எண்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,ரெக்கியூரிங்
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,பணப் பாய்வு வரைபடம் வார்ப்புரு விவரங்கள்
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,கடன் மேலாண்மை
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,தனி வருமான கண்காணிக்க மற்றும் தயாரிப்பு மேம்பாடுகளையும் அல்லது பிளவுகள் செலவுக்.
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,மாற்றம் பொருள்
 DocType: Fees,Send Payment Request,கட்டணம் கோரிக்கை அனுப்பவும்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 DocType: Water Analysis,Origin,தோற்றம்
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
@@ -2903,14 +2917,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,வருமான வரி பொறுப்பு
 DocType: Grading Scale Interval,Grade Description,தரம் விளக்கம்
 DocType: Stock Entry,Purchase Receipt No,இல்லை சீட்டு வாங்க
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,அக்கறையுடனான பணத்தை
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,அக்கறையுடனான பணத்தை
 DocType: Sales Invoice, Shipping Bill Number,கப்பல் பில் எண்
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,கண்டறிதல்
 DocType: Asset Maintenance Log,Actions performed,செயல்கள் நிகழ்த்தப்பட்டன
 DocType: Cash Flow Mapper,Section Leader,பிரிவு தலைவர்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),நிதி ஆதாரம் ( கடன்)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),நிதி ஆதாரம் ( கடன்)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ஊழியர்
+DocType: Bank Guarantee,Fixed Deposit Number,நிலையான வைப்பு எண்
 DocType: Asset Repair,Failure Date,தோல்வி தேதி
 DocType: Sample Collection,Collected Time,சேகரிக்கப்பட்ட நேரம்
 DocType: Company,Sales Monthly History,விற்பனை மாதாந்திர வரலாறு
@@ -2927,10 +2942,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,இந்த சந்திப்பை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ஹோட்டல் அறை விலை தொகுப்பு
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,விற்பனை பைப்லைன்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,சந்தா புதுப்பிப்புகளை எடுங்கள்
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},கணக்கு {0} {1} கணக்கு முறை உள்ள நிறுவனத்துடன் இணைந்தது பொருந்தவில்லை: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,கோர்ஸ்:
@@ -2940,7 +2956,7 @@
 DocType: Notification Control,Expense Claim Approved,செலவு  கோரிக்கை ஏற்கப்பட்டது
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,வேலை ஆணைகளை உருவாக்கவில்லை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே இந்த காலத்தில் உருவாக்கப்பட்ட
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,மருந்து
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,மருந்து
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,வாங்கிய பொருட்களை செலவு
 DocType: Selling Settings,Sales Order Required,விற்பனை ஆர்டர் தேவை
 DocType: Purchase Invoice,Credit To,கடன்
@@ -2958,7 +2974,7 @@
 DocType: Request for Quotation Supplier,No Quote,இல்லை
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Gateway Account,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Job Offer,Accepted,ஏற்கப்பட்டது
@@ -2971,7 +2987,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,தேடல் முடிவுகள்
 DocType: Room,Room Number,அறை எண்
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 DocType: Journal Entry Account,Payroll Entry,சம்பளப்பட்டியல் நுழைவு
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,காண்க கட்டணம் பதிவுகள்
@@ -2981,7 +2997,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Lab Test Sample,Lab Test Sample,லேப் டெஸ்ட் மாதிரி
 DocType: Item Variant Settings,Allow Rename Attribute Value,பண்புக்கூறு மதிப்பு பெயரை விடு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Restaurant,Invoice Series Prefix,விலைப்பட்டியல் தொடர் முன்னொட்டு
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
@@ -2989,8 +3005,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps ஒருங்கிணைப்பு இயக்கப்படவில்லை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்கப்படவில்லை
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,உறுப்பினர் காலாவதி தேதி
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} திரும்ப ஆவணத்தில் எதிர்மறை இருக்க வேண்டும்
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} திரும்ப ஆவணத்தில் எதிர்மறை இருக்க வேண்டும்
 ,Minutes to First Response for Issues,சிக்கல்கள் முதல் பதில் நிமிடங்கள்
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
@@ -3009,7 +3026,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,அளவிடத்தக்க அலகு
 DocType: Fiscal Year,Year End Date,ஆண்டு முடிவு தேதி
 DocType: Task Depends On,Task Depends On,பணி பொறுத்தது
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,சந்தர்ப்பம்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,சந்தர்ப்பம்
 DocType: Operation,Default Workstation,இயல்புநிலை வேலைநிலையங்களின்
 DocType: Notification Control,Expense Claim Approved Message,செலவு  கோரிக்கை செய்தி அங்கீகரிக்கப்பட்ட
 DocType: Payment Entry,Deductions or Loss,விலக்கிற்கு அல்லது இழப்பு
@@ -3047,7 +3064,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,சம்பளமில்லா விடுப்பு ஒப்புதல் விடுப்பு விண்ணப்பம் பதிவுகள் பொருந்தவில்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
 DocType: Membership,USD,அமெரிக்க டாலர்
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,விலைப்பட்டியல் செய்ய
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,மீதமுள்ள தொகை
@@ -3057,7 +3074,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,இறுதி ஆண்டு
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Driver,Driver,இயக்கி
 DocType: Vital Signs,Nutrition Values,ஊட்டச்சத்து கலாச்சாரம்
 DocType: Lab Test Template,Is billable,பில்லிங் செய்யப்படுகிறது
@@ -3068,7 +3085,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),உண்மையான தொடங்கும் தேதி (நேரம் தாள் வழியாக)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,மூப்படைதலுக்கான ரேஞ்ச்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,மொத்த முன்கூட்டப்பட்ட தொகையை விட மொத்த முன்கூட்டிய தொகை அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,மொத்த முன்கூட்டப்பட்ட தொகையை விட மொத்த முன்கூட்டிய தொகை அதிகமாக இருக்க முடியாது
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3123,7 +3140,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,பண்புக்கூறு மதிப்புகளைத் தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice,Reason For Issuing document,ஆவணம் வழங்குவதற்கான காரணம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,அடுத்து தொடர்பு மூலம் முன்னணி மின்னஞ்சல் முகவரி அதே இருக்க முடியாது
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
@@ -3140,7 +3157,8 @@
 DocType: Warranty Claim,Service Address,சேவை முகவரி
 DocType: Asset Maintenance Task,Calibration,அளவீட்டு
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ஒரு நிறுவனம் விடுமுறை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,மரச்சாமான்கள் மற்றும் சாதனங்கள்
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,நிலை அறிவிப்பை விடு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,மரச்சாமான்கள் மற்றும் சாதனங்கள்
 DocType: Item,Manufacture,உற்பத்தி
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,அமைப்பு நிறுவனம்
 ,Lab Test Report,ஆய்வக சோதனை அறிக்கை
@@ -3156,7 +3174,6 @@
 DocType: Crop,Planting Area,நடவு பகுதி
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,சில தவறான மின்னஞ்சல் முகவரிகளின் காரணமாக இது இருக்கலாம்
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,நீங்கள் சேர்த்தீர்கள்
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,பயிற்சி முடிவு
@@ -3166,16 +3183,17 @@
 DocType: Products Settings,Products per Page,பக்கத்திற்கு தயாரிப்புகள்
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,சிக்கலை புகார்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,பயன்பாட்டு செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,பயன்பாட்டு செலவுகள்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 மேலே
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ரோ # {0}: மற்றொரு ரசீது எதிராக பத்திரிகை நுழைவு {1} கணக்கு இல்லை {2} அல்லது ஏற்கனவே பொருந்தியது
 DocType: Supplier Scorecard Criteria,Criteria Weight,நிபந்தனை எடை
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ஒப்புதல் அறிவிப்பை விடு
 DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
 DocType: Payroll Entry,Salary Slip Based on Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட் அடிப்படையில்
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,வாங்குதல் விகிதம்
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,வாங்குதல் விகிதம்
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 DocType: Payment Entry,Payment Type,கொடுப்பனவு வகை
@@ -3198,6 +3216,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,வண்டியில் அமைப்புகள்
 DocType: Journal Entry,Accounting Entries,கணக்கு பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","தேர்ந்தெடுத்த விலையிடல் விதி &#39;விகிதத்திற்காக&#39; செய்யப்பட்டால், அது விலை பட்டியல் மேலெழுதும். விலையிடல் விகிதம் இறுதி விகிதமாகும், எனவே எந்த கூடுதல் தள்ளுபடிகளும் பயன்படுத்தப்படாது. விற்பனை ஆர்டர், கொள்முதல் ஆணை போன்றவை போன்ற பரிவர்த்தனைகளில், &#39;விலை பட்டியல் விகிதம்&#39; விட &#39;விகிதம்&#39; துறையில் கிடைக்கும்."
+DocType: Journal Entry,Paid Loan,பணம் கடன்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},நுழைவு நகல். அங்கீகார விதி சரிபார்க்கவும் {0}
 DocType: Journal Entry Account,Reference Due Date,குறிப்பு தேதி தேதி
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3214,7 +3233,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/config/hr.py +93,Payroll,சம்பளப்பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
 DocType: Patient Service Unit,Parent Service Unit,பெற்றோர் சேவை பிரிவு
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,பயனர் செய்ய
 DocType: Packing Slip,Identification of the package for the delivery (for print),பிரசவத்திற்கு தொகுப்பின் அடையாள (அச்சுக்கு)
@@ -3233,7 +3252,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,வருமான கணக்கு
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,விநியோகம்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,விநியோகம்
 DocType: Volunteer,Weekdays,வார
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: Restaurant Menu,Restaurant Menu,உணவக மெனு
@@ -3241,7 +3260,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,நிரந்தர சரக்கு இயல்புநிலை சரக்கு கணக்கை அமை
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,நிரந்தர சரக்கு இயல்புநிலை சரக்கு கணக்கை அமை
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,கிராண்ட் ரிவியூ மின்னஞ்சல் அனுப்பு
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",LocalStorage நிரம்பி விட்டதால் காப்பாற்ற முடியவில்லை
@@ -3249,10 +3268,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,அறை கொள்ளளவு
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},உருப்படிக்கு ஏற்கனவே பதிவு செய்யப்பட்டுள்ளது {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,குறிப்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,முன்பு உருவாக்கப்பட்ட பொருட்களின் பதிவுகளை நீங்கள் இழப்பீர்கள். இந்த சந்தாவை நிச்சயமாக மீண்டும் தொடங்க விரும்புகிறீர்களா?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,பதிவு கட்டணம்
 DocType: Budget,Cost Center,செலவு மையம்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,வவுச்சர் #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,வவுச்சர் #
 DocType: Notification Control,Purchase Order Message,ஆர்டர் செய்தி வாங்க
 DocType: Tax Rule,Shipping Country,கப்பல் நாடு
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,விற்பனை பரிவர்த்தனைகள் இருந்து வாடிக்கையாளரின் வரி ஐடி மறை
@@ -3261,20 +3281,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,கிடங்கு மட்டுமே பங்கு நுழைவு / டெலிவரி குறிப்பு / கொள்முதல் ரசீது மூலம் மாற்ற முடியும்
 DocType: Employee Education,Class / Percentage,வர்க்கம் / சதவீதம்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,வருமான வரி
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,லெட்டர்ஹெட்ஸ் செல்க
+DocType: Subscription,Cancel At End Of Period,காலம் முடிவில் ரத்துசெய்
 DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,பரிமாற்றத்திற்கு எந்த உருப்படிகளும் தேர்ந்தெடுக்கப்படவில்லை
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,பரிமாற்றத்திற்கு எந்த உருப்படிகளும் தேர்ந்தெடுக்கப்படவில்லை
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
 DocType: Vehicle,Electric,எலக்ட்ரிக்
 DocType: Task,% Progress,% முன்னேற்றம்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,சொத்துக்கசொத்துக்கள் மீது லாபம் / நஷ்டம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,சொத்துக்கசொத்துக்கள் மீது லாபம் / நஷ்டம்
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",&quot;அங்கீகரிக்கப்பட்ட&quot; நிலையைக் கொண்ட மாணவர் விண்ணப்பதாரர் மட்டுமே கீழே உள்ள அட்டவணையில் தேர்ந்தெடுக்கப்படுவார்.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,கணக்கிற்கான கணக்கு எண் {0} கிடைக்கவில்லை. <br> தயவுசெய்து சரியாக உங்கள் கணக்கின் கணக்குகளை அமைக்கவும்.
 DocType: Task,Depends on Tasks,பணிகளைப் பொறுத்தது
@@ -3289,6 +3310,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,பங்கு இல்லை
 DocType: Volunteer,Volunteer Skills,தன்னார்வ திறன்கள்
 DocType: Appraisal,HR User,அலுவலக பயனர்
+DocType: Bank Guarantee,Reference Document Name,குறிப்பு ஆவணம் பெயர்
 DocType: Purchase Invoice,Taxes and Charges Deducted,கழிக்கப்படும் வரி மற்றும் கட்டணங்கள்
 apps/erpnext/erpnext/hooks.py +142,Issues,சிக்கல்கள்
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},நிலைமை ஒன்றாக இருக்க வேண்டும் {0}
@@ -3302,7 +3324,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,மிகப் பெரியது
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,மிகப் பெரியது
+DocType: Loan,Loan Application,கடன் விண்ணப்பம்
 DocType: Crop,Scientific Name,அறிவியல் பெயர்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,மொத்த இலைகள்
 DocType: Customer,"Reselect, if the chosen contact is edited after save","சேமித்த பிறகு தேர்வு செய்யப்பட்ட தொடர்பு திருத்தப்பட்டால், மீண்டும் தேர்ந்தெடுங்கள்"
@@ -3311,13 +3334,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,காசோலை எண்
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,உள்ளூர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,"இருப்பினும், கடனாளிகள்"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,பெரிய
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,பெரிய
 DocType: Homepage Featured Product,Homepage Featured Product,முகப்பு இடம்பெற்றிருந்தது தயாரிப்பு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,அனைத்து மதிப்பீடு குழுக்கள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,அனைத்து மதிப்பீடு குழுக்கள்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,புதிய கிடங்கு பெயர்
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),மொத்த {0} ({1})
 DocType: C-Form Invoice Detail,Territory,மண்டலம்
@@ -3338,9 +3361,10 @@
 DocType: Fees,Fees,கட்டணம்
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,நாணயமாற்று வீத மற்றொரு வகையில் ஒரு நாணயத்தை மாற்ற குறிப்பிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,மொத்த நிலுவை தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,மொத்த நிலுவை தொகை
 DocType: Sales Partner,Targets,இலக்குகள்
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,நிறுவனத்தின் தகவல் கோப்பில் SIREN எண் பதிவு செய்யவும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 DocType: Price List,Price List Master,விலை பட்டியல் மாஸ்டர்
 DocType: GST Account,CESS Account,CESS கணக்கு
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
@@ -3349,6 +3373,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,நோயாளிக்குத் தேர்ந்தெடுங்கள்
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,அளவுரு பெயர்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ஒரே நிலையை கொண்ட பயன்பாடுகள் &#39;நிராகரிக்கப்பட்டது&#39; &#39;அனுமதிபெற்ற&#39; மற்றும் விடவும் சமர்ப்பிக்க முடியும்
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},மாணவர் குழு பெயர் வரிசையில் கட்டாய {0}
 DocType: Homepage,Products to be shown on website homepage,தயாரிப்புகள் இணைய முகப்பு காட்டப்படுவதற்கு
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
@@ -3394,14 +3419,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,எல்லா பில்லிங் மணிநேரங்களுக்கும் விலைப்பட்டியல் ஏற்கனவே உருவாக்கப்பட்டது
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},பெயர் பிழை: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,நிதி செலவு
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
 DocType: Packing Slip,If more than one package of the same type (for print),அதே வகை மேற்பட்ட தொகுப்பு (அச்சுக்கு)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,உணவக அமைப்பில் இயல்புநிலை வாடிக்கையாளரை அமைக்கவும்
 ,Salary Register,சம்பளம் பதிவு
 DocType: Warehouse,Parent Warehouse,பெற்றோர் கிடங்கு
-DocType: C-Form Invoice Detail,Net Total,நிகர மொத்தம்
+DocType: Subscription,Net Total,நிகர மொத்தம்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},இயல்புநிலை BOM பொருள் காணப்படவில்லை இல்லை {0} மற்றும் திட்ட {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,பல்வேறு கடன் வகைகளில் வரையறுத்து
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,பல்வேறு கடன் வகைகளில் வரையறுத்து
 DocType: Bin,FCFS Rate,FCFS விகிதம்
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,சிறந்த தொகை
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),நேரம் (நிமிடங்களில்)
@@ -3433,10 +3458,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
 DocType: Drug Prescription,Drug Prescription,மருந்து பரிந்துரை
 DocType: Fees,FEE.,கட்டணம்.
-DocType: Employee Loan,Repaid/Closed,தீர்வையான / மூடப்பட்ட
+DocType: Loan,Repaid/Closed,தீர்வையான / மூடப்பட்ட
 DocType: Item,Total Projected Qty,மொத்த உத்தேச அளவு
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 DocType: Course,Course Code,பாடநெறி குறியீடு
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 DocType: POS Settings,Use POS in Offline Mode,POS ஐ ஆஃப்லைன் பயன்முறையில் பயன்படுத்தவும்
@@ -3456,16 +3480,15 @@
 DocType: Purchase Invoice,Deemed Export,ஏற்றுக்கொள்ளப்பட்ட ஏற்றுமதி
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,தள்ளுபடி சதவீதம் விலை பட்டியலை எதிராக அல்லது அனைத்து விலை பட்டியல் ஒன்று பயன்படுத்த முடியும்.
-DocType: Subscription,Half-yearly,அரை ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,ஏற்கனவே மதிப்பீட்டிற்குத் தகுதி மதிப்பீடு செய்யப்பட்டதன் {}.
 DocType: Vehicle Service,Engine Oil,இயந்திர எண்ணெய்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},பணி ஆணைகள் உருவாக்கப்பட்டன: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},பணி ஆணைகள் உருவாக்கப்பட்டன: {0}
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
-DocType: Employee Loan,Loan Details,கடன் விவரங்கள்
+DocType: Loan,Loan Details,கடன் விவரங்கள்
 DocType: Company,Default Inventory Account,இயல்புநிலை சரக்கு கணக்கு
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ஃபோலியோ எண்கள் பொருந்தவில்லை
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
@@ -3477,19 +3500,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,பயிர் வளரும் அனைத்து நில அலகுகளுக்கும் ஒரு இணைப்பு
 DocType: Account,Root Type,ரூட் வகை
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},ரோ # {0}: விட திரும்ப முடியாது {1} பொருள் {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},ரோ # {0}: விட திரும்ப முடியாது {1} பொருள் {2}
 DocType: Item Group,Show this slideshow at the top of the page,பக்கத்தின் மேல் இந்த காட்சியை காட்ட
 DocType: BOM,Item UOM,பொருள் UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),தள்ளுபடி தொகை பின்னர் வரி அளவு (நிறுவனத்தின் நாணயம்)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Cheque Print Template,Primary Settings,முதன்மை அமைப்புகள்
 DocType: Purchase Invoice,Select Supplier Address,சப்ளையர் முகவரி தேர்வு
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ஊழியர் சேர்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ஊழியர் சேர்
 DocType: Purchase Invoice Item,Quality Inspection,தரமான ஆய்வு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,மிகச்சிறியது
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,மிகச்சிறியது
 DocType: Company,Standard Template,ஸ்டாண்டர்ட் வார்ப்புரு
 DocType: Training Event,Theory,தியரி
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
@@ -3509,11 +3532,10 @@
 DocType: SMS Log,No of Sent SMS,அனுப்பப்பட்டது எஸ்எம்எஸ் எண்ணிக்கை
 DocType: Antibiotic,Healthcare Administrator,சுகாதார நிர்வாகி
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ஒரு இலக்கு அமைக்கவும்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
 DocType: Dosage Strength,Dosage Strength,மருந்தளவு வலிமை
 DocType: Account,Expense Account,செலவு கணக்கு
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,மென்பொருள்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,நிறம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,நிறம்
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,மதிப்பீடு திட்டம் தகுதி
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,தேர்ந்தெடுத்த உருப்படிக்கு காலாவதியாகும் தேதி கட்டாயமாகும்
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,வாங்குவதற்கான ஆர்டர்களைத் தடு
@@ -3526,18 +3548,18 @@
 DocType: Patient,Personal and Social History,தனிப்பட்ட மற்றும் சமூக வரலாறு
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,பயனர் {0} உருவாக்கப்பட்டது
 DocType: Fee Schedule,Fee Breakup for each student,ஒவ்வொரு மாணவனுக்கும் கட்டணம் விதிக்கப்படும்
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,குறியீட்டை மாற்றவும்
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
 DocType: Stock Reconciliation,SR/,எஸ்ஆர் /
 DocType: Vehicle,Diesel,டீசல்
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
 DocType: Purchase Invoice,Availed ITC Cess,ITC செஸ் ஐப் பிடித்தது
 ,Student Monthly Attendance Sheet,மாணவர் மாதாந்திர வருகை தாள்
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,விற்பனைக்கு மட்டுமே பொருந்தக்கூடிய கப்பல் விதி
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,திட்ட தொடக்க தேதி
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,வரை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,வரை
 DocType: Rename Tool,Rename Log,பதிவு மறுபெயர்
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,மாணவர் குழு அல்லது கோர்ஸ் அட்டவணை கட்டாயமாகும்
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,டைம் ஷீட் மீது அதே பில்லிங் மணி மற்றும் பணிநேரம் பராமரிக்க
@@ -3557,7 +3579,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,நீங்கள் வாங்க அல்லது விற்கிற உங்கள் தயாரிப்புகள் அல்லது சேவைகளை பட்டியலிடுங்கள்.
 DocType: Water Analysis,Storage Temperature,சேமிப்பு வெப்பநிலை
 DocType: Employee Attendance Tool,Unmarked Attendance,குறியகற்றப்பட்டது வருகை
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,ஆராய்ச்சியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,ஆராய்ச்சியாளர்
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,திட்டம் சேர்க்கை கருவி மாணவர்
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},தொடக்க தேதிக்கு பணி முடிவுக்குத் தேதியை விட குறைவாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,பெயர் அல்லது மின்னஞ்சல் அத்தியாவசியமானதாகும்
@@ -3570,7 +3592,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, மேலும் இந்த சப்ளையருக்கு RFQ கள் எச்சரிக்கையுடன் வழங்கப்பட வேண்டும்."
 DocType: Chapter,Non Profit Manager,இலாப முகாமையாளர்
 DocType: BOM,Total Cost(Company Currency),மொத்த செலவு (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,தொடர் இல {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,தொடர் இல {0} உருவாக்கப்பட்டது
 DocType: Homepage,Company Description for website homepage,இணைய முகப்பு நிறுவனம் விளக்கம்
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","வாடிக்கையாளர்களின் வசதிக்காக, இந்த குறியீடுகள் பற்றுச்சீட்டுகள் மற்றும் டெலிவரி குறிப்புகள் போன்ற அச்சு வடிவங்கள் பயன்படுத்த முடியும்"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier பெயர்
@@ -3580,11 +3602,10 @@
 DocType: Employee,You can enter any date manually,நீங்கள் கைமுறையாக எந்த தேதி நுழைய முடியும்
 DocType: Healthcare Settings,Result Printed,முடிவு அச்சிடப்பட்டது
 DocType: Asset Category Account,Depreciation Expense Account,தேய்மானம் செலவில் கணக்கு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ப்ரொபேஷ்னரி காலம்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} காண்க
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ப்ரொபேஷ்னரி காலம்
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Project,Total Costing Amount (via Timesheets),மொத்த செலவு தொகை (Timesheets வழியாக)
-DocType: Employee Advance,Expense Approver,செலவின தரப்பில் சாட்சி
+DocType: Department,Expense Approver,செலவின தரப்பில் சாட்சி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
 DocType: Project,Hourly,மணிக்கொருமுறை
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,குழு அல்லாத குழு
@@ -3594,7 +3615,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,நாள்நேரம் செய்ய
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
 DocType: Accounts Settings,Make Payment via Journal Entry,பத்திரிகை நுழைவு வழியாக பணம் செலுத்து
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,அச்சிடப்பட்டது அன்று
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,அச்சிடப்பட்டது அன்று
 DocType: Item,Inspection Required before Delivery,பரிசோதனை டெலிவரி முன் தேவையான
 DocType: Item,Inspection Required before Purchase,பரிசோதனை வாங்கும் முன் தேவையான
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,நிலுவையில் நடவடிக்கைகள்
@@ -3604,7 +3625,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,குறைந்தபட்ச ஆர்டர் அளவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,உங்கள் அமைப்பு
 DocType: Fee Component,Fees Category,கட்டணம் பகுப்பு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,விவரங்கள்
 DocType: Supplier Scorecard,Notify Employee,பணியாளரை அறிவி
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
@@ -3614,7 +3635,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Company,Chart Of Accounts Template,கணக்குகள் டெம்ப்ளேட் வரைவு
 DocType: Attendance,Attendance Date,வருகை தேதி
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},விலை பட்டியல் {1} ல்   பொருள் விலை {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},விலை பட்டியல் {1} ல்   பொருள் விலை {0} மேம்படுத்தப்பட்டது
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Purchase Invoice Item,Accepted Warehouse,கிடங்கு ஏற்கப்பட்டது
@@ -3622,10 +3643,11 @@
 DocType: Item,Valuation Method,மதிப்பீட்டு முறை
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,மார்க் அரை நாள்
 DocType: Sales Invoice,Sales Team,விற்பனை குழு
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,நுழைவு நகல்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,நுழைவு நகல்
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,சமர்ப்பிக்கும் முன் பயனாளியின் பெயரை உள்ளிடவும்.
 DocType: Program Enrollment Tool,Get Students,மாணவர்கள் பெற
 DocType: Serial No,Under Warranty,உத்தரவாதத்தின் கீழ்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[பிழை]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[பிழை]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,நீங்கள் விற்பனை ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,முழுமையான பழுதுபார்ப்புக்கான நிறைவு தேதி தேர்ந்தெடுக்கவும்
@@ -3644,7 +3666,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,துணை ஒப்பந்தங்களுக்கான ஒதுக்கீடு
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
 DocType: Shopping Cart Settings,Orders,ஆணைகள்
-DocType: Employee Leave Approver,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
+DocType: Department,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ஒரு தொகுதி தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,மதிப்பீட்டு குழு பெயர்
@@ -3689,7 +3711,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,ஹப் டிராக்க்ட் பொருள்
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,RECIPIENT ஐச் அசல்
 DocType: Asset Category Account,Accumulated Depreciation Account,திரண்ட தேய்மானம் கணக்கு
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,இந்த மின்னஞ்சல் autogenerated
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
 DocType: Program Enrollment,Boarding Student,போர்டிங் மாணவர்
 DocType: Asset,Expected Value After Useful Life,எதிர்பார்த்த மதிப்பு  பயனுள்ள வாழ்க்கை பிறகு
@@ -3713,22 +3734,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},வருகை பதிவு {0} மாணவர் எதிராக உள்ளது {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,தேய்மானம் காரணமாக சொத்துக்களை அகற்றல் வெளியேற்றப்பட்டது
-DocType: Member,Member,உறுப்பினர்
+DocType: Loan,Member,உறுப்பினர்
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Work Order Item,Work Order Item,வேலை ஆணைப் பொருள்
 DocType: Pricing Rule,Item Code,பொருள்  குறியீடு
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
 DocType: Agriculture Analysis Criteria,Agriculture Manager,விவசாய மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
 DocType: Supplier Scorecard Period,Variables,மாறிகள்
 DocType: Employee Internal Work History,Employee Internal Work History,பணியாளர் உள் வேலை வரலாறு
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Cheque Print Template,Cheque Size,காசோலை அளவு
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,பரிவர்த்தனைகள் விற்பனை வரி வார்ப்புரு .
 DocType: Sales Invoice,Write Off Outstanding Amount,சிறந்த தொகை இனிய எழுத
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},கணக்கு {0} நிறுவனத்துடன் இணைந்தது பொருந்தவில்லை {1}
@@ -3737,7 +3758,6 @@
 DocType: Stock Settings,Default Stock UOM,முன்னிருப்பு பங்கு மொறட்டுவ பல்கலைகழகம்
 DocType: Asset,Number of Depreciations Booked,தேய்மானம்  எண்ணிக்கை முன்பதிவு செய்யப்பட்டது
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,மொத்தம் மொத்தம்
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},பணியாளர் கடன் எதிராக: {0}
 DocType: Landed Cost Item,Receipt Document,ரசீது ஆவண
 DocType: Employee Education,School/University,பள்ளி / பல்கலைக்கழகம்
 DocType: Payment Request,Reference Details,குறிப்பு விவரம்
@@ -3748,7 +3768,7 @@
 DocType: Asset,Double Declining Balance,இரட்டை குறைவு சமநிலை
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,மூடப்பட்ட ஆர்டர் ரத்து செய்யப்படும். ரத்து Unclose.
 DocType: Student Guardian,Father,அப்பா
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
 DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லிணக்க
 DocType: Attendance,On Leave,விடுப்பு மீது
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
@@ -3762,10 +3782,10 @@
 DocType: Lead,Lower Income,குறைந்த வருமானம்
 DocType: Restaurant Order Entry,Current Order,தற்போதைய வரிசை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,நிகழ்ச்சிகளுக்கு செல்க
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},வரிசை {0} # ஒதுக்கப்படாத தொகையை {2} விட அதிகமானதாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},வரிசை {0} # ஒதுக்கப்படாத தொகையை {2} விட அதிகமானதாக இருக்க முடியாது {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
@@ -3788,7 +3808,6 @@
 DocType: Payment Terms Template,Payment Terms,கட்டண வரையறைகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,நிமிஷம்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 DocType: Chapter,Meetup Embed HTML,சந்திப்பு HTML ஐ உட்பொதிக்கவும்
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,சப்ளையர்களிடம் செல்க
@@ -3808,30 +3827,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை பொருள்
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,கட்டண கோரிக்கை அனுப்ப மாணவருக்கு மின்னஞ்சல் ஐடியை அமைக்கவும்
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,கட்டண கோரிக்கை அனுப்ப மாணவருக்கு மின்னஞ்சல் ஐடியை அமைக்கவும்
 DocType: Patient,Medical History,மருத்துவ வரலாறு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 DocType: Patient,Patient ID,நோயாளி ஐடி
 DocType: Physician Schedule,Schedule Name,அட்டவணை பெயர்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,சம்பள விபரம்  செய்ய
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,அனைத்து சப்ளையர்களை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,அனைத்து சப்ளையர்களை சேர்க்கவும்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ரோ # {0}: ஒதுக்கப்பட்டவை தொகை நிலுவையில் தொகையை விட அதிகமாக இருக்க முடியாது.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,"உலவ BOM,"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,பிணை கடன்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,பிணை கடன்கள்
 DocType: Purchase Invoice,Edit Posting Date and Time,இடுகையிடுதலுக்கான தேதி மற்றும் நேரம் திருத்த
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},சொத்து வகை {0} அல்லது நிறுவனத்தின் தேய்மானம் தொடர்பான கணக்குகள் அமைக்கவும் {1}
 DocType: Lab Test Groups,Normal Range,சாதாரண வரம்பில்
 DocType: Academic Term,Academic Year,கல்வி ஆண்டில்
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,கிடைக்கும் விற்பனை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
 DocType: Lead,CRM,"CRM,"
 DocType: Purchase Invoice,N,என்
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,மீதமுள்ள
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
+DocType: Loan,Loan Account,கடன் கணக்கு
 DocType: Purchase Invoice,GST Details,GST விவரம்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},சப்ளையர் அனுப்பப்படும் மின்னஞ்சல் {0}
 DocType: Item,Default Sales Unit of Measure,அளவீட்டின் இயல்புநிலை விற்பனை பிரிவு
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,கல்வி ஆண்டில்:
+DocType: Subscription,Past Due Date,கடந்த Due தேதி
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},உருப்படிக்கு மாற்று உருப்படியை அமைக்க அனுமதிக்க மாட்டோம் {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,தேதி மீண்டும்
@@ -3844,7 +3865,7 @@
 DocType: Patient Appointment,Patient Appointment,நோயாளி நியமனம்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,பங்கு ஒப்புதல் ஆட்சி பொருந்தும் பாத்திரம் அதே இருக்க முடியாது
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,இந்த மின்னஞ்சல் டைஜஸ்ட் இருந்து விலகுவதற்காக
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,மூலம் சப்ளையர்கள் கிடைக்கும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,மூலம் சப்ளையர்கள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} பொருள் {0}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,பாடத்திட்டங்களுக்குச் செல்
 DocType: Accounts Settings,Show Inclusive Tax In Print,அச்சு உள்ளிட்ட வரி காட்டு
@@ -3852,10 +3873,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,செய்தி அனுப்பப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,குழந்தை முனைகளில் கணக்கு பேரேடு அமைக்க முடியாது
 DocType: C-Form,II,இரண்டாம்
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,தயவுசெய்து கல்வி&gt; கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,விலை பட்டியல் நாணய வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
 DocType: Purchase Invoice Item,Net Amount (Company Currency),நிகர விலை (நிறுவனத்தின் நாணயம்)
 DocType: Physician,Physician Schedules,மருத்துவர் கால அட்டவணைகள்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,மொத்த ஒப்புதலுக்கான தொகையை விட மொத்த முன்கூட்டி தொகை அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,மொத்த ஒப்புதலுக்கான தொகையை விட மொத்த முன்கூட்டி தொகை அதிகமாக இருக்க முடியாது
 DocType: Salary Slip,Hour Rate,மணி விகிதம்
 DocType: Stock Settings,Item Naming By,பொருள் மூலம் பெயரிடுதல்
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
@@ -3873,6 +3895,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},விட பங்கு பரிவர்த்தனைகள் பழைய இற்றைப்படுத்த முடியாது {0}
 DocType: BOM,Inspection Required,ஆய்வு தேவை
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,சமர்ப்பிக்க முன் வங்கி உத்தரவாத எண் உள்ளிடவும்.
 DocType: Driving License Category,Class,வர்க்கம்
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ஒரு பொருள் வார்ப்புருவுக்கு எதிராக பணி ஆணை எழுப்ப முடியாது
@@ -3883,7 +3906,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Assessment Plan,Program,திட்டம்
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,தயவுசெய்து கல்வி&gt; கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
 DocType: Serial No,Is Cancelled,ரத்து
 DocType: Student Group,Group Based On,குழு அடிப்படையிலான அன்று
 DocType: Student Group,Group Based On,குழு அடிப்படையிலான அன்று
@@ -3895,9 +3917,10 @@
 DocType: Cheque Print Template,Cheque Height,காசோலை உயரம்
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
 DocType: Setup Progress,Setup Progress,அமைப்பு முன்னேற்றம்
+DocType: Expense Claim,Approval Status,ஒப்புதல் நிலைமை
 DocType: Hub Settings,Publish Items to Hub,மையம் வெளியிடு
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},மதிப்பு வரிசையில் மதிப்பு குறைவாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,வயர் மாற்றம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,அனைத்து பாருங்கள்
 ,Issued Items Against Work Order,வேலை ஆணைக்கு எதிராக வழங்கப்பட்ட பொருட்கள்
 DocType: Vehicle Log,Invoice Ref,விலைப்பட்டியல் குறிப்பு
@@ -3928,12 +3951,11 @@
 DocType: Customs Tariff Number,Tariff Number,சுங்கத்தீர்வை எண்
 DocType: Work Order Item,Available Qty at WIP Warehouse,வடிவ WIP கிடங்கு கிடைக்கும் அளவு
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,திட்டமிடப்பட்ட
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
 DocType: Notification Control,Quotation Message,மேற்கோள் செய்தி
-DocType: Employee Loan,Employee Loan Application,பணியாளர் கடன் விண்ணப்ப
 DocType: Issue,Opening Date,தேதி திறப்பு
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,முதலில் நோயாளியை காப்பாற்றுங்கள்
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,முதலில் நோயாளியை காப்பாற்றுங்கள்
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,வருகை வெற்றிகரமாக குறிக்கப்பட்டுள்ளது.
 DocType: Program Enrollment,Public Transport,பொது போக்குவரத்து
 DocType: Soil Texture,Silt Composition (%),சில்ட் கலவை (%)
@@ -3952,7 +3974,7 @@
 ,Item Balance (Simple),பொருள் இருப்பு (எளிய)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
 DocType: POS Profile,Write Off Account,கணக்கு இனிய எழுத
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,பற்று Amt குறிப்பு
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,பற்று Amt குறிப்பு
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
@@ -3975,6 +3997,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,விற்பனை ஆர்டர் தேதி
 DocType: Sales Invoice Item,Delivered Qty,வழங்கப்படும் அளவு
 DocType: Assessment Plan,Assessment Plan,மதிப்பீடு திட்டம்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ஜர்னல் நுழைவுத் தலைகீழ்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,வாடிக்கையாளர் {0} உருவாக்கப்பட்டது.
 DocType: Stock Settings,Limit Percent,எல்லை சதவீதம்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,தற்போது எந்த கிடங்கிலும் பங்கு இல்லை
@@ -3988,14 +4011,15 @@
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Payment Entry,Payment References,கொடுப்பனவு குறிப்புகள்
 DocType: C-Form,C-FORM-,சி படிவம்-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","இடைவெளி களத்திற்கு இடைவெளியின் எண்ணிக்கை எ.கா. இடைவெளி &#39;நாட்கள்&#39; மற்றும் பில்லிங் இடைவெளி எண்ணிக்கை 3 ஆகும், ஒவ்வொரு 3 நாட்கள்"
 DocType: Vehicle,Insurance Details,காப்புறுதி விபரங்கள்
 DocType: Account,Payable,செலுத்த வேண்டிய
 DocType: Share Balance,Share Type,பகிர் வகை
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,தயவு செய்து திரும்பச் செலுத்துதல் பீரியட்ஸ் நுழைய
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,தயவு செய்து திரும்பச் செலுத்துதல் பீரியட்ஸ் நுழைய
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
 DocType: Pricing Rule,Margin,விளிம்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,புதிய வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,மொத்த லாபம்%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,மொத்த லாபம்%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS சுயவிவரத்தை மாற்றுக
 DocType: Bank Reconciliation Detail,Clearance Date,அனுமதி தேதி
@@ -4005,10 +4029,11 @@
 DocType: Lead,Address Desc,இறங்குமுக முகவரி
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,கட்சி அத்தியாவசியமானதாகும்
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},பிற வரிசைகளில் போலி தேதிகளை கொண்ட வரிசைகள் காணப்பட்டன: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},பிற வரிசைகளில் போலி தேதிகளை கொண்ட வரிசைகள் காணப்பட்டன: {list}
 DocType: Topic,Topic Name,தலைப்பு பெயர்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,HR அமைப்புகளில் விடுப்பு அங்கீகார அறிவிப்புக்கான இயல்புநிலை டெம்ப்ளேட்டை அமைக்கவும்.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,விற்பனை அல்லது வாங்கும் குறைந்தபட்சம் ஒரு தேர்வு வேண்டும்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ஊழியர் முன்கூட்டியே பெற ஒரு ஊழியரைத் தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ஊழியர் முன்கூட்டியே பெற ஒரு ஊழியரைத் தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,சரியான தேதி ஒன்றைத் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,உங்கள் வணிக தன்மை தேர்ந்தெடுக்கவும்.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4027,7 +4052,7 @@
 DocType: Asset Movement,Source Warehouse,மூல கிடங்கு
 DocType: Installation Note,Installation Date,நிறுவல் தேதி
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,லெட்ஜர் பகிர்ந்து
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},ரோ # {0}: சொத்து {1} நிறுவனம் சொந்தமானது இல்லை {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},ரோ # {0}: சொத்து {1} நிறுவனம் சொந்தமானது இல்லை {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,விற்பனை விலைப்பட்டியல் {0} உருவாக்கப்பட்டது
 DocType: Employee,Confirmation Date,உறுதிப்படுத்தல் தேதி
 DocType: C-Form,Total Invoiced Amount,மொத்த விலை விவரம் தொகை
@@ -4036,7 +4061,7 @@
 DocType: Account,Accumulated Depreciation,திரட்டப்பட்ட தேய்மானம்
 DocType: Supplier Scorecard Scoring Standing,Standing Name,நின்று பெயர்
 DocType: Stock Entry,Customer or Supplier Details,வாடிக்கையாளருக்கு அல்லது விபரங்கள்
-DocType: Employee Loan Application,Required by Date,டேட் தேவையான
+DocType: Loan Application,Required by Date,டேட் தேவையான
 DocType: Lead,Lead Owner,முன்னணி உரிமையாளர்
 DocType: Production Plan,Sales Orders Detail,விற்பனை ஆணைகள் விவரம்
 DocType: Bin,Requested Quantity,கோரப்பட்ட அளவு
@@ -4049,10 +4074,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,மொத்த பே - மொத்த பொருத்தியறிதல் - கடனாக தொகையை திரும்பச் செலுத்துதல்
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,தற்போதைய BOM மற்றும் நியூ BOM அதே இருக்க முடியாது
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,சம்பளம் ஸ்லிப் ஐடி
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,பல மாறுபாடுகள்
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% வழங்கப்படுகிறது
+DocType: Subscription,Trial Period Start Date,சோதனை காலம் தொடங்கும் தேதி
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,தயவுசெய்து மற்றொரு பயனராக உள்நுழைக.
@@ -4073,12 +4099,11 @@
 DocType: Student Guardian,Student Guardian,மாணவர் கார்டியன்
 DocType: Member,Member Name,உறுப்பினர் பெயர்
 DocType: Stock Settings,Use Naming Series,பெயரிடும் தொடர் பயன்படுத்தவும்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
 DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்க
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,சந்தாவில்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 DocType: Membership,Payment Details,கட்டணம் விவரங்கள்
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM விகிதம்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி பணி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை நீக்கு"
 DocType: Asset,Journal Entry for Scrap,ஸ்கிராப் பத்திரிகை நுழைவு
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
@@ -4098,6 +4123,7 @@
 DocType: Land Unit,Land Unit,நிலம் பிரிவு
 ,Purchase Analytics,கொள்முதல் ஆய்வு
 DocType: Sales Invoice Item,Delivery Note Item,டெலிவரி குறிப்பு பொருள்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,தற்போதைய விலைப்பட்டியல் {0} காணவில்லை
 DocType: Asset Maintenance Log,Task,பணி
 DocType: Purchase Taxes and Charges,Reference Row #,குறிப்பு வரிசை #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},தொகுதி எண் பொருள் கட்டாயமாக {0}
@@ -4110,7 +4136,7 @@
 DocType: Company,Exchange Gain / Loss Account,செலாவணி லாபம் / நஷ்டம் கணக்கு
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,பணியாளர் மற்றும் வருகை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை சேமிக்க"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை சேமிக்க"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,கருத்துக்களம்
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,பங்கு உண்மையான கொத்தமல்லி
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,பங்கு உண்மையான கொத்தமல்லி
@@ -4125,7 +4151,7 @@
 DocType: Lab Test Template,Standard Selling Rate,ஸ்டாண்டர்ட் விற்பனை விகிதம்
 DocType: Account,Rate at which this tax is applied,இந்த வரி செலுத்தப்படுகிறது விகிதத்தில்
 DocType: Cash Flow Mapper,Section Name,பிரிவு பெயர்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,இனிய எழுதவும்
@@ -4136,9 +4162,9 @@
 DocType: Task,depends_on,பொறுத்தது
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,பொருட்கள் அனைத்து பில் சமீபத்திய விலை மேம்படுத்தும் வரிசை. சில நிமிடங்கள் ஆகலாம்.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
 DocType: Water Analysis,Appearance,தோற்றம்
+DocType: HR Settings,Leave Status Notification Template,நிலைப்பாடு அறிவிப்பு வார்ப்புருவை விடு
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,சரா. விலை பட்டியல் விகிதம் வாங்குவது
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,உறுப்பினர் தகவல்.
@@ -4161,7 +4187,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,அனுமதி இல்லை. டெஸ்ட் வார்ப்புருவை முடக்கவும்
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
 DocType: Crop Cycle,Linked Land Unit,இணைந்த நிலம் பிரிவு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 DocType: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
@@ -4177,7 +4203,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,பயனர்களிடம் செல்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,தவறான GSTIN அல்லது பதியப்படாதது க்கான என்ஏ உள்ளிடவும்
 DocType: Training Event,Seminar,கருத்தரங்கு
 DocType: Program Enrollment Fee,Program Enrollment Fee,திட்டம் சேர்க்கை கட்டணம்
@@ -4193,14 +4219,14 @@
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 DocType: Company,Create Chart Of Accounts Based On,கணக்குகளை அடிப்படையில் வரைவு உருவாக்கு
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,அதை அல்லாத குழு மாற்ற முடியாது. குழந்தை பணிகள் உள்ளன.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},மாணவர் {0} மாணவர் விண்ணப்பதாரர் எதிராக உள்ளன {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),வட்டமான சரிசெய்தல் (கம்பெனி நாணய)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,டைம் ஷீட்
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,தொகுதி:
 DocType: Volunteer,Afternoon,மதியம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Cheque Print Template,Scanned Cheque,ஸ்கேன் காசோலை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
@@ -4216,7 +4242,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,திட்டம் {0} ஏற்கனவே உள்ளது
 DocType: Medical Department,Nursing User,நர்சிங் பயனர்
 DocType: Plant Analysis,Plant Analysis Criterias,தாவர பகுப்பாய்வு criterias
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,பொறுப்புகள்
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},சீரியல் இல்லை {0} தொகுதி {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,பொறுப்புகள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,இந்த மேற்கோள் செல்லுபடியாகும் காலம் முடிந்தது.
 DocType: Expense Claim Account,Expense Claim Account,செலவு கூறுகின்றனர் கணக்கு
 DocType: Accounts Settings,Allow Stale Exchange Rates,நிலையான மாற்று விகிதங்களை அனுமதி
@@ -4238,11 +4265,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,மாறுபாடுகளை உருவாக்குங்கள்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),மொத்த விற்பனையாகும் தொகை (விற்பனை பற்றுச்சீட்டுகள் வழியாக)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,டெபிட் குறிப்பு தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,டெபிட் குறிப்பு தொகை
 DocType: Project Update,Not Updated,புதுப்பிக்கப்படவில்லை
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","விகிதங்கள், பங்குகளின் எண்ணிக்கை மற்றும் கணக்கிடப்பட்ட தொகை ஆகியவற்றிற்கு இடையே உள்ள முரண்பாடுகள் உள்ளன"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
 DocType: Employee Advance,Advance Account,முன்கூட்டியே கணக்கு
 DocType: Job Offer,Job Offer Terms,வேலை வாய்ப்பு விதிமுறைகள்
@@ -4251,7 +4278,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,வாகன
 DocType: Vehicle,Insurance Company,காப்பீட்டு நிறுவனம்
 DocType: Asset Category Account,Fixed Asset Account,நிலையான சொத்து கணக்கு
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,மாறி
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,மாறி
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Chapter,Members,உறுப்பினர்கள்
 DocType: Student,Student Email Address,மாணவர் மின்னஞ்சல் முகவரி
@@ -4275,7 +4302,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,நடமாட்டத்தை கட்டுபடுத்து
 DocType: Delivery Stop,Address Name,முகவரி பெயர்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} பிரிவின் {0} பகுதிகள்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} பிரிவின் {0} பகுதிகள்
 DocType: Assessment Code,Assessment Code,மதிப்பீடு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
@@ -4283,25 +4310,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 DocType: Bank Reconciliation Detail,Payment Document,கொடுப்பனவு ஆவண
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,அடிப்படை சூத்திரத்தை மதிப்பிடுவதில் பிழை
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,சேர்ந்த தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,சேர்ந்த தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
+DocType: Subscription,Plans,திட்டங்கள்
 DocType: Salary Slip,Salary Structure,சம்பளம் அமைப்பு
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,பிரச்சினை பொருள்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,மீண்டும் உருவாக்கும்போது பிழை ஏற்பட்டது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,கிடங்கு
 DocType: Employee,Offer Date,சலுகை  தேதி
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,மேற்கோள்கள்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,மாணவர் குழுக்கள் உருவாக்கப்படவில்லை.
 DocType: Purchase Invoice Item,Serial No,இல்லை தொடர்
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,மாதாந்திர கட்டுந்தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது முடியும்
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,மாதாந்திர கட்டுந்தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது முடியும்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,வரிசை # {0}: எதிர்பார்த்த டெலிவரி தேதி கொள்முதல் வரிசை தேதிக்கு முன் இருக்க முடியாது
 DocType: Purchase Invoice,Print Language,அச்சு மொழி
 DocType: Salary Slip,Total Working Hours,மொத்த வேலை நேரங்கள்
 DocType: Sales Invoice,Customer PO Details,வாடிக்கையாளர் PO விவரங்கள்
-DocType: Subscription,Next Schedule Date,அடுத்த அட்டவணை தேதி
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,தற்காலிக திறப்பு கணக்கு
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
@@ -4330,11 +4356,11 @@
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,குறிப்பிடப்பட்ட அளவுகோல்களுக்கு ஊழியர்கள் இல்லை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
 DocType: Hotel Settings,Default Customer,இயல்புநிலை வாடிக்கையாளர்
 DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ஒரே நாளில் சந்திப்பு உருவாக்கப்பட்டது என்றால் உறுதிப்படுத்தாதீர்கள்
@@ -4359,16 +4385,16 @@
 DocType: Journal Entry Account,Employee Advance,ஊழியர் அட்வான்ஸ்
 DocType: Payroll Entry,Payroll Frequency,சம்பளப்பட்டியல் அதிர்வெண்
 DocType: Lab Test Template,Sensitivity,உணர்திறன்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,மூலப்பொருட்களின்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,மூலப்பொருட்களின்
 DocType: Leave Application,Follow via Email,மின்னஞ்சல் வழியாக பின்பற்றவும்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,செடிகள் மற்றும் இயந்திரங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,செடிகள் மற்றும் இயந்திரங்கள்
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,தினசரி வேலை சுருக்கம் அமைப்புகள்
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,தயவுசெய்து தேதியின்படி தேதி சேர்க்கவும்
 DocType: Payment Entry,Internal Transfer,உள்நாட்டு மாற்றம்
 DocType: Asset Maintenance,Maintenance Tasks,பராமரிப்பு பணிகள்
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,இலக்கு அளவு அல்லது இலக்கு அளவு கட்டாயமாகும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் லெட்ஜரிடம் மாற்ற முடியாது
@@ -4376,14 +4402,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext ஒருங்கிணைப்புகள்
 DocType: Crop Cycle,Detected Disease,கண்டறியப்பட்ட நோய்
 ,Produced,உற்பத்தி
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,திரும்பப்பெறல் தேதி முன் திரும்ப முடியாது.
 DocType: Item,Item Code for Suppliers,சப்ளையர்கள் பொருள் குறியீடு
 DocType: Issue,Raised By (Email),(மின்னஞ்சல்) மூலம் எழுப்பப்பட்ட
 DocType: Training Event,Trainer Name,பயிற்சி பெயர்
 DocType: Mode of Payment,General,பொதுவான
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,கடைசியாக தொடர்பாடல்
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,கடைசியாக தொடர்பாடல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',வகை ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' உள்ளது போது கழித்து முடியாது
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},தொடராக பொருள் தொடர் இலக்கங்கள் தேவையான {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',வகை ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' உள்ளது போது கழித்து முடியாது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},தொடராக பொருள் தொடர் இலக்கங்கள் தேவையான {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,பொருள் கொண்ட போட்டி கொடுப்பனவு
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
@@ -4397,7 +4424,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},டாக்டர் {0} அரை நாள் விடுப்பு மீது {1}
 DocType: Production Plan,Get Material Request,பொருள் வேண்டுகோள் பெற
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,தபால் செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,தபால் செலவுகள்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம் (விவரங்கள்)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 ,Item Variant Details,பொருள் மாறுபாடு விவரங்கள்
@@ -4408,9 +4435,9 @@
 DocType: Drug Prescription,Hour,மணி
 DocType: Restaurant Order Entry,Last Sales Invoice,கடைசி விற்பனை விலைப்பட்டியல்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},உருப்படிக்கு எதிராக {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,முன்னணி வகை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
 DocType: Company,Monthly Sales Target,மாதாந்திர விற்பனை இலக்கு
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ஒப்புதல்
@@ -4418,7 +4445,7 @@
 DocType: Item,Default Material Request Type,இயல்புநிலை பொருள் கோரிக்கை வகை
 DocType: Supplier Scorecard,Evaluation Period,மதிப்பீட்டு காலம்
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,தெரியாத
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,வேலை ஆணை உருவாக்கப்படவில்லை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,வேலை ஆணை உருவாக்கப்படவில்லை
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
 DocType: Purchase Invoice,Export Type,ஏற்றுமதி வகை
 DocType: Salary Slip Loan,Salary Slip Loan,சம்பள சரிவு கடன்
@@ -4434,8 +4461,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,தொடுப்புகள் சுருக்கம் திறக்கும்
 DocType: Education Settings,Education Manager,கல்வி மேலாளர்
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,உகந்த வளர்ச்சிக்கான ஒவ்வொரு ஆலைக்கும் இடையே குறைந்தபட்ச நீளம்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","பேட்ச்சுடு பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி புதுப்பிக்க முடியாது, பதிலாக பங்கு நுழைவு பயன்படுத்த"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","பேட்ச்சுடு பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி புதுப்பிக்க முடியாது, பதிலாக பங்கு நுழைவு பயன்படுத்த"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","பேட்ச்சுடு பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி புதுப்பிக்க முடியாது, பதிலாக பங்கு நுழைவு பயன்படுத்த"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","பேட்ச்சுடு பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி புதுப்பிக்க முடியாது, பதிலாக பங்கு நுழைவு பயன்படுத்த"
 DocType: Quality Inspection,Report Date,தேதி அறிக்கை
 DocType: Student,Middle Name,மத்திய பெயர்
 DocType: C-Form,Invoices,பொருள்
@@ -4467,20 +4494,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ரசீது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ரசீது
 ,Sales Register,விற்பனை பதிவு
 DocType: Daily Work Summary Group,Send Emails At,மின்னஞ்சல்களை அனுப்பவும்
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,படிவம் காட்சி
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,செலவினக் கோரிக்கையில் செலவினம் ஒப்படைப்பு கட்டாயம்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","உங்களை தவிர, உங்கள் நிறுவனத்திற்கு பயனர்களைச் சேர்க்கவும்."
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,இதுவரை இல்லை வாடிக்கையாளர்கள்!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,பணப்பாய்வு அறிக்கை
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,பொருள் கோரிக்கை எதுவும் உருவாக்கப்படவில்லை
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,உரிமம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
@@ -4503,11 +4531,12 @@
 DocType: Vehicle,Chassis No,சேஸ் எண்
 DocType: Payment Request,Initiated,தொடங்கப்பட்ட
 DocType: Production Plan Item,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,தயவு செய்து ஒரு BOM ஐ தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,தயவு செய்து ஒரு BOM ஐ தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ஐடிசி ஒருங்கிணைந்த வரி செலுத்தியது
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
+DocType: Bank Guarantee,Clauses and Conditions,கிளைகள் மற்றும் நிபந்தனைகள்
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
 DocType: Project Task,View Timesheet,டைம்ஸ் ஷீட்டைக் காண்க
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,தொடக்க தேதியை விட தேதி தேதியே அதிகமாக இருக்க வேண்டும்
 DocType: Leave Type,Is Encash,ரொக்கமான
 DocType: Leave Allocation,New Leaves Allocated,புதிய ஒதுக்கப்பட்ட இலைகள்
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
@@ -4521,9 +4550,10 @@
 DocType: Patient,Alcohol Current Use,மது தற்போதைய பயன்பாடு
 DocType: Student Admission Program,Student Admission Program,மாணவர் சேர்க்கை திட்டம்
 DocType: Payment Entry,Account Paid To,கணக்கில் பணம்
+DocType: Subscription Settings,Grace Period,கருணை காலம்
 DocType: Item Alternative,Alternative Item Name,மாற்று பொருள் பெயர்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",எந்த சம்பள சரிவுகளையும் சமர்ப்பிக்க முடியவில்லை <br> \ சாத்தியமான காரணங்கள்: <br> \ 1. நிகர சம்பளம் 0 விட குறைவாக உள்ளது. <br> \ 2. ஊழியர் மாஸ்டர் குறிப்பிட்ட நிறுவனத்தின் மின்னஞ்சல் முகவரி செல்லுபடியாகாது. <br>
@@ -4533,7 +4563,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} கணக்கு பட்ஜெட் {1} எதிராக {2} {3} ஆகும் {4}. இது தாண்டிவிட {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,அளவு அவுட்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,மற்றும் unchcked இல் முடக்கப்பட்டது
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,தொடர் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,நிதி சேவைகள்
 DocType: Student Sibling,Student ID,மாணவர் அடையாளம்
@@ -4545,14 +4574,16 @@
 DocType: Complaint,Complaint,புகார்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,மீட்டெடுப்பு நுழைவு செய்யுங்கள்
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,அனைத்து துறைகள்
 DocType: Patient,Alcohol Past Use,மது போஸ்ட் பயன்படுத்து
 DocType: Fertilizer Content,Fertilizer Content,உரம் உள்ளடக்கம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,பிரச்சினைக்குரிய / நிருத்தப்பட்டுள்ளது
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
 DocType: Share Transfer,Transfer,பரிமாற்றம்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,இந்த விற்பனை ஆர்டர் ரத்துசெய்யப்படுவதற்கு முன்பு வேலை ஆர்டர் {0} ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
@@ -4575,10 +4606,11 @@
 DocType: Cheque Print Template,Message to show,செய்தி காட்ட
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,சில்லறை
 DocType: Student Attendance,Absent,வராதிரு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,தயாரிப்பு மூட்டை
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} இல் தொடங்கும் ஸ்கோர் கண்டுபிடிக்க முடியவில்லை. 0 முதல் 100 வரையிலான மதிப்பெண்களை நீங்கள் கொண்டிருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
+DocType: Subscription,Current Invoice Start Date,நடப்பு விலைப்பட்டியல் தொடக்க தேதி
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: பற்று அல்லது கடன் அளவு ஒன்று தேவை {2}
 DocType: GL Entry,Remarks,கருத்துக்கள்
@@ -4588,11 +4620,13 @@
 DocType: Task,Parent Task,பெற்றோர் பணி
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,முன்னணி செய்ய
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
 DocType: Stock Settings,Show Barcode Field,காட்டு பார்கோடு களம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","சம்பளம் ஏற்கனவே இடையே {0} மற்றும் {1}, விட்டு பயன்பாடு காலத்தில் இந்த தேதி வரம்பில் இடையே இருக்க முடியாது காலத்தில் பதப்படுத்தப்பட்ட."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","சம்பளம் ஏற்கனவே இடையே {0} மற்றும் {1}, விட்டு பயன்பாடு காலத்தில் இந்த தேதி வரம்பில் இடையே இருக்க முடியாது காலத்தில் பதப்படுத்தப்பட்ட."
+DocType: Fiscal Year,Auto Created,தானாக உருவாக்கப்பட்டது
 DocType: Chapter Member,Leave Reason,காரணம் விடு
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,விலைப்பட்டியல் {0} இனி இல்லை
 DocType: Guardian Interest,Guardian Interest,பாதுகாவலர்  வட்டி
 DocType: Volunteer,Availability,கிடைக்கும்
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS இன்மைச்களுக்கான அமைவு இயல்புநிலை மதிப்புகள்
@@ -4601,14 +4635,13 @@
 DocType: Timesheet,Employee Detail,பணியாளர் விபரம்
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 மின்னஞ்சல் ஐடி
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 மின்னஞ்சல் ஐடி
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,அடுத்து தேதி நாள் மற்றும் மாதம் நாளில் மீண்டும் சமமாக இருக்க வேண்டும்
 DocType: Lab Prescription,Test Code,டெஸ்ட் கோட்
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,இணைய முகப்பு அமைப்புகள்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} என்ற ஸ்கோர் கார்டு தரவரிசை காரணமாக RFQ கள் {0}
 DocType: Job Offer,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,மேலே
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},மொத்த தொகை {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},மொத்த தொகை {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
 DocType: Supplier,Mention if non-standard payable account,குறிப்பிட தரமற்ற செலுத்தப்பட கணக்கு என்றால்
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',தயவு செய்து &#39;அனைத்து மதிப்பீடு குழுக்கள்&#39; தவிர வேறு மதிப்பீடு குழு தேர்வு
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,EcritureDate
@@ -4618,7 +4651,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,நீர் பகுப்பாய்வு
 DocType: Chapter,Region,பகுதி
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,மீண்டும் இணைக்கப்பட்ட பகுப்பாய்வு
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","உதாரணமாக 2012, 2012-13 க்கான"
@@ -4634,7 +4667,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,முறித்துள்ளது சொத்து செலவு
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் அத்தியாவசியமானதாகும் {2}
 DocType: Vehicle,Policy No,கொள்கை இல்லை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 DocType: Asset,Straight Line,நேர் கோடு
 DocType: Project User,Project User,திட்ட பயனர்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,பிரி
@@ -4674,21 +4707,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,பாதை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,அது குழந்தை முனைகள் என லெட்ஜரிடம் செலவு மையம் மாற்ற முடியாது
 DocType: Production Plan,Total Planned Qty,மொத்த திட்டமிடப்பட்ட Qty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,திறப்பு மதிப்பு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,திறப்பு மதிப்பு
 DocType: Salary Detail,Formula,சூத்திரம்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,தொடர் #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,தொடர் #
 DocType: Lab Test Template,Lab Test Template,லேப் டெஸ்ட் வார்ப்புரு
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,விற்பனை கணக்கு
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,விற்பனை கணக்கு
 DocType: Purchase Invoice Item,Total Weight,மொத்த எடை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,விற்பனையில் கமிஷன்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,விற்பனையில் கமிஷன்
 DocType: Job Offer Term,Value / Description,மதிப்பு / விளக்கம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
 DocType: Purchase Order Item,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 DocType: Restaurant Order Entry,Restaurant Order Entry,உணவகம் ஆர்டர் நுழைவு
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
 DocType: Asset Maintenance Task,Assign To Name,பெயரை ஒதுக்கு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
 DocType: Hub Settings,Enabled Users,இயக்கப்பட்ட பயனர்கள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,பொருள் வேண்டுகோள் செய்ய
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},திறந்த பொருள் {0}
@@ -4701,24 +4734,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,விடுமுறை விண்ணப்பங்கள்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
 DocType: Vehicle,Last Carbon Check,கடந்த கார்பன் சோதனை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,சட்ட செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,சட்ட செலவுகள்
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,வரிசையில் அளவு தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,விற்பனை செய்தல் மற்றும் கொள்முதல் பற்றுச்சீட்டுகளை உருவாக்குங்கள்
 DocType: Purchase Invoice,Posting Time,நேரம் தகவல்களுக்கு
 DocType: Timesheet,% Amount Billed,% தொகை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,தொலைபேசி செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,தொலைபேசி செலவுகள்
 DocType: Sales Partner,Logo,சின்னம்
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,நீங்கள் பயனர் சேமிப்பு முன்பு ஒரு தொடர் தேர்ந்தெடுக்க கட்டாயப்படுத்தும் விரும்பினால் இந்த சோதனை. இந்த சோதனை என்றால் இல்லை இயல்பாக இருக்கும்.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},சீரியல் எண் இல்லை பொருள் {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},சீரியல் எண் இல்லை பொருள் {0}
 DocType: Email Digest,Open Notifications,திறந்த அறிவிப்புகள்
 DocType: Payment Entry,Difference Amount (Company Currency),வேறுபாடு தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,நேரடி செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,நேரடி செலவுகள்
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,புதிய வாடிக்கையாளர் வருவாய்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,போக்குவரத்து செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},டாக்டைப் {0} இல் தனிப்பயன் புலம் சந்தாவைச் சேர்க்கவும்
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
 DocType: Purchase Receipt Item,Sample Quantity,மாதிரி அளவு
+DocType: Bank Guarantee,Name of Beneficiary,பயனாளியின் பெயர்
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","சமீபத்திய மதிப்பீட்டு விகிதம் / விலை பட்டியல் விகிதம் / மூலப்பொருட்களின் கடைசி கொள்முதல் வீதத்தின் அடிப்படையில், திட்டமிடலின் மூலம் தானாக BOM செலவு புதுப்பிக்கவும்."
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
@@ -4730,14 +4763,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,சோதனை காலம்
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,சம்பளம் கூறுகள்
 DocType: Program Enrollment Tool,New Academic Year,புதிய கல்வி ஆண்டு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,திரும்ப / கடன் குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,திரும்ப / கடன் குறிப்பு
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,மொத்த கட்டண தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,மொத்த கட்டண தொகை
 DocType: GST Settings,B2C Limit,B2C வரம்பு
 DocType: Work Order Item,Transferred Qty,அளவு மாற்றம்
 apps/erpnext/erpnext/config/learn.py +11,Navigating,வழிநடத்தல்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,திட்டமிடல்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,திட்டமிடல்
 DocType: Share Balance,Issued,வெளியிடப்படுகிறது
+DocType: Loan,Repayment Start Date,திரும்பத் திரும்பத் திரும்ப தேதி
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,மாணவர் நடவடிக்கை
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,வழங்குபவர் அடையாளம்
 DocType: Payment Request,Payment Gateway Details,பணம் நுழைவாயில் விபரங்கள்
@@ -4750,10 +4784,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","சாதாரண, உடம்பு போன்ற இலைகள் வகை"
 DocType: Email Digest,Send regular summary reports via Email.,மின்னஞ்சல் வழியாக வழக்கமான சுருக்கம் அறிக்கைகள் அனுப்பவும்.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
 DocType: Assessment Result,Student Name,மாணவன் பெயர்
 DocType: Brand,Item Manager,பொருள் மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,செலுத்த வேண்டிய சம்பளப்பட்டியல்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,செலுத்த வேண்டிய சம்பளப்பட்டியல்
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
 DocType: Plant Analysis,Collection Datetime,சேகரிப்பு தரவுத்தளம்
 DocType: Work Order,Total Operating Cost,மொத்த இயக்க செலவு
@@ -4763,9 +4797,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,பயனர் {0} இல்லை
 DocType: Payment Term,Day(s) after invoice date,விலைப்பட்டியல் தேதிக்குப் பிறகு நாள் (கள்)
 DocType: Payment Schedule,Payment Schedule,கட்டண அட்டவணை
-DocType: Subscription,SUB-,துணை
 DocType: Item Attribute Value,Abbreviation,சுருக்கமான
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,கொடுப்பனவு நுழைவு ஏற்கனவே உள்ளது
+DocType: Subscription,Trial Period End Date,சோதனை காலம் முடிவு தேதி
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} வரம்புகளை அதிகமாக இருந்து அங்கீகாரம் இல்லை
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,சம்பளம் வார்ப்புரு மாஸ்டர் .
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,நோய்க்குறியியல்
@@ -4782,9 +4816,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
@@ -4793,14 +4827,15 @@
 DocType: Lab Prescription,Test Created,சோதனை உருவாக்கப்பட்டது
 DocType: Healthcare Settings,Custom Signature in Print,அச்சு இல் தனிபயன் கையொப்பம்
 DocType: Account,Temporary,தற்காலிக
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,வாடிக்கையாளர் LPO எண்.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,வாடிக்கையாளர் LPO எண்.
 DocType: Program,Courses,மைதானங்கள்
 DocType: Monthly Distribution Percentage,Percentage Allocation,சதவீத ஒதுக்கீடு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,காரியதரிசி
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,காரியதரிசி
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","முடக்கினால், துறையில் &#39;வார்த்தையில்&#39; எந்த பரிமாற்றத்தில் காண முடியாது"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,இந்த செயல் எதிர்கால பில்லை நிறுத்தும். இந்த சந்தாவை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
 DocType: Serial No,Distinct unit of an Item,"ஒரு பொருள், மாறுபட்ட அலகு"
 DocType: Supplier Scorecard Criteria,Criteria Name,நிபந்தனை பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,நிறுவனத்தின் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,நிறுவனத்தின் அமைக்கவும்
 DocType: Pricing Rule,Buying,வாங்குதல்
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,நோய்கள் மற்றும் உரங்கள்
 DocType: HR Settings,Employee Records to be created by,பணியாளர் ரெக்கார்ட்ஸ் விவரங்களை வேண்டும்
@@ -4809,17 +4844,17 @@
 DocType: POS Profile,Apply Discount On,தள்ளுபடி விண்ணப்பிக்கவும்
 DocType: Member,Membership Type,உறுப்பினர் வகை
 ,Reqd By Date,தேதி வாக்கில் Reqd
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,பற்றாளர்களின்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,பற்றாளர்களின்
 DocType: Assessment Plan,Assessment Name,மதிப்பீடு பெயர்
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC ஐ அச்சிடுக
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC ஐ அச்சிடுக
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,ரோ # {0}: தொடர் எந்த கட்டாய ஆகிறது
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வாரியாக வரி விவரம்
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,வேலை வாய்ப்பு
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,நிறுவனம் சுருக்கமான
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},அளவு ({0}) வரிசையில் ஒரு பகுதியை இருக்க முடியாது {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},அளவு ({0}) வரிசையில் ஒரு பகுதியை இருக்க முடியாது {1}
 DocType: Consultation,C-,சி
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
@@ -4837,7 +4872,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,மொத்த மாற்றத்துடன்
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","இயலுமைப்படுத்த என்றால், கணினி தானாக சரக்கு கணக்கியல் உள்ளீடுகள் பதிவு."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,தரக
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ஊழியர் {0} வருகை ஏற்கனவே இந்த நாள் குறிக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ஊழியர் {0} வருகை ஏற்கனவே இந்த நாள் குறிக்கப்பட்டுள்ளது
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","நிமிடங்கள்
  'நேரம் பதிவு' வழியாக புதுப்பிக்கப்பட்டது"
@@ -4849,6 +4884,7 @@
 DocType: Lab Test,Approved Date,அங்கீகரிக்கப்பட்ட தேதி
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
+DocType: Subscriber,Subscriber Name,சந்தாதாரர் பெயர்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
 DocType: BOM Update Tool,Replace,பதிலாக
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,இல்லை பொருட்கள் கண்டுபிடிக்கப்பட்டது.
@@ -4858,19 +4894,18 @@
 DocType: Request for Quotation Item,Project Name,திட்டம் பெயர்
 DocType: Customer,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ஊழியர் கடனில் வட்டி வருமானக் கணக்கைத் தேர்ந்தெடுக்கவும் {0}
 DocType: Work Order,Required Items,தேவையான பொருட்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,மையம்  வள
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,கொடுப்பனவு நல்லிணக்க கொடுப்பனவு
 DocType: Disease,Treatment Task,சிகிச்சை பணி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,வரி சொத்துகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,வரி சொத்துகள்
 DocType: BOM Item,BOM No,BOM எண்
 DocType: Instructor,INS/,ஐஎன்எஸ் /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரியாக நகர்கிறது
 DocType: BOM Update Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,மின்னியல் சாதனங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,மின்னியல் சாதனங்கள்
 DocType: Asset,Maintenance Required,பராமரிப்பு தேவை
 DocType: Account,Debit,பற்று
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
@@ -4879,7 +4914,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,மிகச்சிறந்த விவரங்கள்
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,தொகுப்பு இந்த விற்பனை நபர் குழு வாரியான பொருள் குறிவைக்கிறது.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],உறைதல் பங்குகள் பழைய [days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ரோ # {0}: சொத்துக்கான நிலையான சொத்து வாங்க / விற்க அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ரோ # {0}: சொத்துக்கான நிலையான சொத்து வாங்க / விற்க அத்தியாவசியமானதாகும்
 DocType: Asset Maintenance Team,Maintenance Team Name,பராமரிப்பு குழு பெயர்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","இரண்டு அல்லது அதற்கு மேற்பட்ட விலை விதிகள் மேலே நிபந்தனைகளை அடிப்படையாகக் காணப்படுகின்றன என்றால், முன்னுரிமை பயன்படுத்தப்படுகிறது. இயல்புநிலை மதிப்பு பூஜ்யம் (வெற்று) இருக்கும் போது முன்னுரிமை 20 0 இடையில் ஒரு எண். உயர் எண்ணிக்கை அதே நிலையில் பல விலை விதிகள் உள்ளன என்றால் அதை முன்னுரிமை எடுக்கும்."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"வாடிக்கையாளராக &#39;சந்தர்ப்பத்திலிருந்து&#39; தேர்ந்தெடுக்கப்பட்டால், வாடிக்கையாளர் கட்டாயமில்லை"
@@ -4888,19 +4923,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,பின்வரும் பயனர்கள் தொகுதி நாட்கள் விடுப்பு விண்ணப்பங்கள் ஏற்று கொள்ள அனுமதிக்கும்.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,செலவின உரிமைகோரல் வகைகள்.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},அதன் {1} உருப்படியை விகிதம் விற்பனை {0} விட குறைவாக உள்ளது. விகிதம் விற்பனை இருக்க வேண்டும் குறைந்தது {2}
-DocType: Item,Taxes,வரி
+DocType: Subscription,Taxes,வரி
 DocType: Purchase Invoice,capital goods,மூலதன பொருட்கள்
 DocType: Purchase Invoice Item,Weight Per Unit,அலகுக்கு எடை
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ஊதியம் மற்றும் பெறாதபோது
 DocType: Project,Default Cost Center,இயல்புநிலை விலை மையம்
-DocType: Bank Guarantee,End Date,இறுதி நாள்
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,பங்கு பரிவர்த்தனைகள்
 DocType: Budget,Budget Accounts,பட்ஜெட் கணக்குகள்
 DocType: Employee,Internal Work History,உள் வேலை வரலாறு
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,திரண்ட தேய்மானம் தொகை
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,தனியார் சமபங்கு
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,சப்ளையர் ஸ்கோர் கார்ட் மாறி
-DocType: Employee Loan,Fully Disbursed,முழுமையாக வழங்கப் பட
 DocType: Employee Advance,Due Advance Amount,முன் அட்வான்ஸ் தொகை
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
@@ -4924,7 +4957,7 @@
 ,Employee Information,பணியாளர் தகவல்
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,உள்வரும்
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,விற்பனை மற்றும் வாங்குதலுக்கான இயல்புநிலை வரி வார்ப்புருக்கள் உருவாக்கப்படுகின்றன.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,மதிப்பீட்டு முடிவு பதிவேற்றம் {0} ஏற்கனவே உள்ளது.
@@ -4932,7 +4965,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',நிறுவனத்தின் வெற்று வடிகட்ட அமைக்கவும் என்றால் குழுவினராக &#39;நிறுவனத்தின்&#39; ஆகும்
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,பதிவுசெய்ய தேதி எதிர்கால தேதியில் இருக்க முடியாது
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,மீண்டும் உருவாக்குவதற்கு
 DocType: Stock Entry,Target Warehouse Address,இலக்கு கிடங்கு முகவரி
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,தற்செயல் விடுப்பு
 DocType: Agriculture Task,End Day,முடிவு நாள்
@@ -4957,11 +4989,10 @@
 DocType: Material Request,% Ordered,% உத்தரவிட்டார்
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","கோர்ஸ் சார்ந்த மாணவர் குழுக்களுக்கான, கோர்ஸ் திட்டம் பதிவு சேர்ந்தார் பாடப்பிரிவுகள் இருந்து ஒவ்வொரு மாணவர் மதிப்பாய்வு செய்யப்படும்."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,சிறுதுண்டு வேலைக்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Share Balance,From No,இல்லை
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{அனுப்புநர்} இலிருந்து புதிய செய்தி
 DocType: Customer,Customer Primary Address,வாடிக்கையாளர் முதன்மை முகவரி
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,செய்தி மடல்
 DocType: Drug Prescription,Description/Strength,விளக்கம் / வலிமை
@@ -4970,22 +5001,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,அதே பொருளைப் பலமுறை நுழைந்தது வருகிறது
 DocType: Department,Leave Block List,பிளாக் பட்டியல் விட்டு
 DocType: Purchase Invoice,Tax ID,வரி ஐடி
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,பொருள் {0} சீரியல் எண்கள் வரிசை அமைப்பு காலியாக இருக்கவேண்டும் அல்ல
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,பொருள் {0} சீரியல் எண்கள் வரிசை அமைப்பு காலியாக இருக்கவேண்டும் அல்ல
 DocType: Accounts Settings,Accounts Settings,கணக்குகள் அமைப்புகள்
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,ஒப்புதல்
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} க்கான தவறான வடிவமைக்கப்பட்ட முகவரி, தயவுசெய்து தொடரவும்."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} க்கான தவறான வடிவமைக்கப்பட்ட முகவரி, தயவுசெய்து தொடரவும்."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","புதிய கணக்கின் எண்ணிக்கை, இது முன்னொட்டாக கணக்கின் பெயரில் சேர்க்கப்படும்"
 DocType: Maintenance Team Member,Team Member,குழு உறுப்பினர்
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,சமர்ப்பிக்க முடிவு இல்லை
 DocType: Customer,Sales Partner and Commission,விற்பனை பார்ட்னர் மற்றும் கமிஷன்
-DocType: Employee Loan,Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்
+DocType: Loan,Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்
 ,Project Quantity,திட்ட அளவு
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்"
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} அலகுகள் {1} {2} இந்த பரிவர்த்தனையை நிறைவு செய்ய தேவை.
 DocType: Loan Type,Rate of Interest (%) Yearly,வட்டி விகிதம் (%) வருடாந்திரம்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,தற்காலிக கணக்குகளை
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,கருப்பு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,தற்காலிக கணக்குகளை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,கருப்பு
 DocType: BOM Explosion Item,BOM Explosion Item,BOM வெடிப்பு பொருள்
 DocType: Shareholder,Contact List,தொடர்பு பட்டியல்
 DocType: Account,Auditor,ஆடிட்டர்
@@ -4993,16 +5024,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} உற்பத்தி பொருட்களை
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,மேலும் அறிக
 DocType: Cheque Print Template,Distance from top edge,மேல் விளிம்பில் இருந்து தூரம்
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,விலை பட்டியல் {0} முடக்கப்பட்டால் அல்லது இல்லை
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,விலை பட்டியல் {0} முடக்கப்பட்டால் அல்லது இல்லை
 DocType: Purchase Invoice,Return,திரும்ப
 DocType: Pricing Rule,Disable,முடக்கு
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,கட்டணம் செலுத்தும் முறை கட்டணம் செலுத்துவதற்கு தேவைப்படுகிறது
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,கட்டணம் செலுத்தும் முறை கட்டணம் செலுத்துவதற்கு தேவைப்படுகிறது
 DocType: Project Task,Pending Review,விமர்சனம் நிலுவையில்
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","சொத்துக்கள், தொடர்ச்சிகள், பேட்சுகள் போன்ற பல விருப்பங்களுக்கான முழு பக்கத்திலும் திருத்துக."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,நியமனங்கள் மற்றும் ஆலோசனைகள்
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} தொகுதி சேரவில்லை உள்ளது {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",அது ஏற்கனவே உள்ளது என சொத்து {0} குறைத்து முடியாது {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,காசோலைகள் தேவை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,காசோலைகள் தேவை
 DocType: Task,Total Expense Claim (via Expense Claim),(செலவு கூறுகின்றனர் வழியாக) மொத்த செலவு கூறுகின்றனர்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,குறி இல்லாமல்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,நிறுவனத்தை அமைப்பதில் தோல்வி
@@ -5014,7 +5045,7 @@
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,கடற்படை  மேலாண்மை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,இருந்து பொருட்களை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,இருந்து பொருட்களை சேர்க்கவும்
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,பயிர்கள் &amp; நிலங்கள்
 DocType: Cheque Print Template,Regular,வழக்கமான
 DocType: Fertilizer,Density (if liquid),அடர்த்தி (திரவத்தால்)
@@ -5039,24 +5070,26 @@
 DocType: Payment Entry,Paid Amount,பணம் தொகை
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,விற்பனை சுழற்சியை ஆராயுங்கள்
 DocType: Assessment Plan,Supervisor,மேற்பார்வையாளர்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,வைத்திருத்தல் பங்கு நுழைவு
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,வைத்திருத்தல் பங்கு நுழைவு
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 ,Work Order Stock Report,வேலை ஆணை பங்கு அறிக்கை
+DocType: Purchase Receipt,Auto Repeat Detail,ஆட்டோ மீண்டும் விரிவாக
 DocType: Assessment Result Tool,Assessment Result Tool,மதிப்பீடு முடிவு கருவி
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,மேற்பார்வையாளர்
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,வகைப்படுத்தவும்
 DocType: BOM Scrap Item,BOM Scrap Item,டெலி ஸ்க்ராப் பொருள்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,தர மேலாண்மை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,தர மேலாண்மை
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Project,Total Billable Amount (via Timesheets),மொத்த பில்கள் அளவு (டைம்ஸ் ஷீட்ஸ் வழியாக)
 DocType: Agriculture Task,Previous Business Day,முந்தைய வர்த்தக நாள்
-DocType: Employee Loan,Repay Fixed Amount per Period,காலம் ஒன்றுக்கு நிலையான தொகை திருப்பி
+DocType: Loan,Repay Fixed Amount per Period,காலம் ஒன்றுக்கு நிலையான தொகை திருப்பி
 DocType: Employee,Health Insurance No,சுகாதார காப்பீடு இல்லை
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,கடன் குறிப்பு Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,கடன் குறிப்பு Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,மொத்த வரிவிலக்கு தொகை
 DocType: Employee External Work History,Employee External Work History,பணியாளர் வெளி வேலை வரலாறு
 DocType: Opening Invoice Creation Tool,Purchase,கொள்முதல்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,இருப்பு அளவு
@@ -5067,16 +5100,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} க்கான {1}
 DocType: Healthcare Settings,Valid number of days,நாட்கள் செல்லுபடியாகும்
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,செலவு மையங்கள்
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,சந்தா மறுதொடக்கம்
 DocType: Land Unit,Linked Plant Analysis,இணைக்கப்பட்ட தாவர பகுப்பாய்வு
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,அளிப்பாளரின் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ரோ # {0}: வரிசையில் நேரம் மோதல்கள் {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ஜீரோ மதிப்பீடு விகிதம் அனுமதி
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,ஜீரோ மதிப்பீடு விகிதம் அனுமதி
+DocType: Bank Guarantee,Receiving,பெறுதல்
 DocType: Training Event Employee,Invited,அழைப்பு
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,செயலில் உள்ள பல சம்பளம் கட்டமைப்புகள் கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} காணப்படவில்லை
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,அமைப்பு நுழைவாயில் கணக்குகள்.
 DocType: Employee,Employment Type,வேலை வகை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,நிலையான சொத்துக்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,நிலையான சொத்துக்கள்
 DocType: Payment Entry,Set Exchange Gain / Loss,இழப்பு செலாவணி கெயின் அமைக்கவும் /
 ,GST Purchase Register,ஜிஎஸ்டி கொள்முதல் பதிவு
 ,Cash Flow,பண பரிமாற்ற
@@ -5097,9 +5132,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,அனைத்து பங்கு பரிமாற்றங்களின் பட்டியல்
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,எதிரில் கவுண்ட்
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,எதிரில் கவுண்ட்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,இரண்டு சோதனை காலம் தொடங்கும் தேதி மற்றும் சோதனை காலம் முடிவு தேதி அமைக்கப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,சராசரி விகிதம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,கட்டணம் செலுத்திய மொத்த கட்டண தொகை கிராண்ட் / வட்டமான மொத்தம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,கட்டணம் செலுத்திய மொத்த கட்டண தொகை கிராண்ட் / வட்டமான மொத்தம் சமமாக இருக்க வேண்டும்
+DocType: Subscription Plan Detail,Plan,திட்டம்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,பொது பேரேடு படி வங்கி அறிக்கை சமநிலை
 DocType: Job Applicant,Applicant Name,விண்ணப்பதாரர் பெயர்
 DocType: Authorization Rule,Customer / Item Name,வாடிக்கையாளர் / உருப்படி பெயர்
@@ -5129,6 +5165,7 @@
 DocType: Work Order,Warehouses,கிடங்குகள்
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} சொத்து இடமாற்றம் செய்ய முடியாது
 DocType: Hotel Room Pricing,Hotel Room Pricing,ஹோட்டல் அறை விலை
+DocType: Subscription,Days Until Due,நாட்கள் வரை
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாற்று உள்ளது.
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,வாங்கும்
@@ -5137,13 +5174,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","தொகுதி அடிப்படையிலான மாணவர் குழுக்களுக்கான, மாணவர் தொகுதி திட்டம் பதிவு இருந்து ஒவ்வொரு மாணவர் மதிப்பாய்வு செய்யப்படும்."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,பகிர்ந்தளித்தல்
+DocType: Journal Entry Account,Loan,கடன்
 DocType: Expense Claim Advance,Expense Claim Advance,செலவினம் கோரல் அட்வான்ஸ்
 DocType: Lab Test,Report Preference,முன்னுரிமை அறிக்கை
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,தன்னார்வத் தகவல்.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,திட்ட மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,திட்ட மேலாளர்
 ,Quoted Item Comparison,மேற்கோள் காட்டப்பட்டது பொருள் ஒப்பீட்டு
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} மற்றும் {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,அனுப்புகை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,அனுப்புகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,அதிகபட்சம்  தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,நிகர சொத்து மதிப்பு என
 DocType: Crop,Produce,உற்பத்தி
@@ -5153,7 +5191,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,தயாரிப்பிற்கான பொருள் நுகர்வு
 DocType: Item Alternative,Alternative Item Code,மாற்று பொருள் கோட்
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
 DocType: Delivery Stop,Delivery Stop,டெலிவரி நிறுத்துங்கள்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
@@ -5163,15 +5201,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
 DocType: BOM,Show Items,உருப்படிகளைக் காண்பி
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,அவ்வப்போது விட அதிகமாக இருக்க முடியாது.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,எல்லா வாடிக்கையாளர்களையும் மின்னஞ்சல் மூலம் அறிவிக்க விரும்புகிறீர்களா?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,எல்லா வாடிக்கையாளர்களையும் மின்னஞ்சல் மூலம் அறிவிக்க விரும்புகிறீர்களா?
+DocType: Subscription Plan,Billing Interval,பில்லிங் இடைவேளை
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,துவைக்கும் இயந்திரம்
 DocType: Hub Settings,Hub Username,ஹப் பயனர்பெயர்
 DocType: Salary Detail,Component,கூறு
 DocType: Assessment Criteria,Assessment Criteria Group,மதிப்பீடு செய்க மதீப்பீட்டு குழு
 DocType: Healthcare Settings,Patient Name By,மூலம் நோயாளி பெயர்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} முதல் {1} முதல் சம்பளத்திற்கான ஒழுங்கான பத்திரிகை நுழைவு
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} முதல் {1} முதல் சம்பளத்திற்கான ஒழுங்கான பத்திரிகை நுழைவு
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
@@ -5185,23 +5223,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் பராமரிக்க முடியும்"
 DocType: Leave Block List,Applies to Company,நிறுவனத்தின் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
-DocType: Employee Loan,Disbursement Date,இரு வாரங்கள் முடிவதற்குள் தேதி
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;பெறுநர்கள்&#39; குறிப்பிடப்படவில்லை
+DocType: Loan,Disbursement Date,இரு வாரங்கள் முடிவதற்குள் தேதி
 DocType: BOM Update Tool,Update latest price in all BOMs,அனைத்து BOM களில் சமீபத்திய விலை புதுப்பிக்கவும்
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,மருத்துவ பதிவு
 DocType: Vehicle,Vehicle,வாகன
 DocType: Purchase Invoice,In Words,சொற்கள்
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,சமர்ப்பிக்கும் முன் வங்கி அல்லது கடன் நிறுவனங்களின் பெயரை உள்ளிடவும்.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} சமர்ப்பிக்கப்பட வேண்டும்
 DocType: POS Profile,Item Groups,பொருள் குழுக்கள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
 DocType: Sales Order Item,For Production,உற்பத்திக்கான
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,கணக்குகளின் விளக்கப்படத்தில் ஒரு தற்காலிக திறப்பு கணக்கு சேர்க்கவும்
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,கணக்குகளின் விளக்கப்படத்தில் ஒரு தற்காலிக திறப்பு கணக்கு சேர்க்கவும்
 DocType: Customer,Customer Primary Contact,வாடிக்கையாளர் முதன்மை தொடர்பு
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,காலம் முடிவடைகிறது
 DocType: Project Task,View Task,காண்க பணி
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,எதிரில் / முன்னணி%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,எதிரில் / முன்னணி%
+DocType: Bank Guarantee,Bank Guarantee Type,வங்கி உத்தரவாத வகை
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,விலைப்பட்டியல் பகுதி
 ,Asset Depreciations and Balances,சொத்து Depreciations மற்றும் சமநிலைகள்
@@ -5212,9 +5251,8 @@
 DocType: Production Plan,Include Subcontracted Items,துணை பொருட்கள் அடங்கியவை
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,பங்கு பரிவர்த்தனைக்குப் பிறகு மாறுபட்ட பண்புகள் மாற்ற முடியாது. இதை செய்ய நீங்கள் ஒரு புதிய உருப்படியை உருவாக்க வேண்டும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
-DocType: Employee Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+DocType: Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
 DocType: Leave Application,LAP/,மடியில் /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},எதிராக கட்டணம் கோருகிறது {0} {1} அளவு {2}
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
@@ -5238,11 +5276,11 @@
 DocType: Employee Education,Employee Education,பணியாளர் கல்வி
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,உருப்படியை குழு அட்டவணையில் பிரதி உருப்படியை குழு
 DocType: Land Unit,Parent Land Unit,பெற்றோர் மனை பிரிவு
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
 DocType: Fertilizer,Fertilizer Name,உரம் பெயர்
 DocType: Salary Slip,Net Pay,நிகர சம்பளம்
 DocType: Cash Flow Mapping Accounts,Account,கணக்கு
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
 ,Requested Items To Be Transferred,மாற்றப்படுவதற்கு கோரப்பட்ட விடயங்கள்
 DocType: Expense Claim,Vehicle Log,வாகன பதிவு
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),காய்ச்சல் (வெப்பநிலை&gt; 38.5 ° C / 101.3 ° F அல்லது நீடித்த வெப்பம்&gt; 38 ° C / 100.4 ° F)
@@ -5283,23 +5321,22 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
 DocType: Asset Maintenance,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Invoice,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
-DocType: C-Form,Series,தொடர்
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Soil Texture,Ternary Plot,முக்கோணக் கதை
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
 DocType: Driver,License Number,உரிம எண்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,பராமரிப்பு வருகை நோக்கம்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,விலைப்பட்டியல் நோயாளி பதிவு
 DocType: Crop,Period,காலம்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,பொது பேரேடு
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},பணியாளர் {0} அன்று விடுப்பு மீது {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},பணியாளர் {0} அன்று விடுப்பு மீது {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,காண்க லீட்ஸ்
 DocType: Program Enrollment Tool,New Program,புதிய திட்டம்
 DocType: Item Attribute Value,Attribute Value,மதிப்பு பண்பு
 ,Itemwise Recommended Reorder Level,இனவாரியாக மறுவரிசைப்படுத்துக நிலை பரிந்துரைக்கப்படுகிறது
 DocType: Salary Detail,Salary Detail,சம்பளம் விபரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,முதல் {0} தேர்வு செய்க
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,முதல் {0} தேர்வு செய்க
 DocType: Appointment Type,Physician,மருத்துவர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,ஆலோசனைகளை
@@ -5307,15 +5344,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) பணி வரிசையில் திட்டமிடப்பட்ட அளவுக்கு ({2}) அதிகமாக இருக்க முடியாது {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,உற்பத்தி நேரம் தாள்.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,கூட்டுத்தொகை
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,பங்கு பரிவர்த்தனைக்குப் பிறகு மாறுபட்ட பண்புகள் மாற்ற முடியாது. இதை செய்ய நீங்கள் ஒரு புதிய உருப்படியை உருவாக்க வேண்டும்.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA ஆணை
 DocType: Physician,Charges,கட்டணங்கள்
 DocType: Production Plan,Get Items For Work Order,வேலை ஆணை பெறுக
 DocType: Salary Detail,Default Amount,இயல்புநிலை தொகை
 DocType: Lab Test Template,Descriptive,விளக்கமான
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,இந்த மாதம் சுருக்கம்
 DocType: Quality Inspection Reading,Quality Inspection Reading,தரமான ஆய்வு படித்தல்
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,உங்கள் நிறுவனத்திற்கு நீங்கள் அடைய விரும்பும் விற்பனை இலக்கை அமைக்கவும்.
 ,Project wise Stock Tracking,திட்டத்தின் வாரியாக ஸ்டாக் தடமறிதல்
@@ -5343,11 +5381,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,வலைத்தளத்தை உருவாக்க முடியவில்லை
 DocType: Soil Analysis,Mg/K,எம்ஜி / கே
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,வைத்திருத்தல் பங்கு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட அல்லது மாதிரி அளவு வழங்கப்படவில்லை
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,வைத்திருத்தல் பங்கு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட அல்லது மாதிரி அளவு வழங்கப்படவில்லை
 DocType: Program,Program Abbreviation,திட்டம் சுருக்கமான
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
-DocType: Bank Guarantee,Start Date,தொடக்க தேதி
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ஒரு காலத்தில் இலைகள் ஒதுக்க.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,காசோலைகள் மற்றும் வைப்பு தவறாக அகற்றப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
@@ -5362,11 +5399,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,மணி
 DocType: Project,Expected Start Date,எதிர்பார்க்கப்படுகிறது தொடக்க தேதி
 DocType: Purchase Invoice,04-Correction in Invoice,விலைப்பட்டியல் உள்ள 04-திருத்தம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,வேலை ஆர்டர் ஏற்கனவே BOM உடன் அனைத்து பொருட்களுக்கும் உருவாக்கப்பட்டது
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,வேலை ஆர்டர் ஏற்கனவே BOM உடன் அனைத்து பொருட்களுக்கும் உருவாக்கப்பட்டது
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,மாறுபட்ட விவரங்கள் அறிக்கை
 DocType: Setup Progress Action,Setup Progress Action,முன்னேற்றம் செயல்முறை அமைவு
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,விலை பட்டியல் வாங்குவது
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,விலை பட்டியல் வாங்குவது
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,சந்தாவை ரத்துசெய்
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,பராமரிப்பு நிலைமையை நிறைவு செய்து முடிக்க அல்லது நிறைவு தேதி முடிக்க
 DocType: Supplier,Default Payment Terms Template,இயல்புநிலை கொடுப்பனவு விதிமுறைகள் வார்ப்புரு
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,பரிவர்த்தனை நாணய பணம் நுழைவாயில் நாணய அதே இருக்க வேண்டும்
@@ -5377,7 +5415,6 @@
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,அதிரடி என்றால் திரட்டப்பட்ட மாதாந்திர பட்ஜெட்டை மீறய
-DocType: Subscription,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
 DocType: Asset,Disposal Date,நீக்கம் தேதி
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","மின்னஞ்சல்கள் அவர்கள் விடுமுறை இல்லை என்றால், கொடுக்கப்பட்ட நேரத்தில் நிறுவனத்தின் அனைத்து செயலில் ஊழியர் அனுப்பி வைக்கப்படும். மறுமொழிகளின் சுருக்கம் நள்ளிரவில் அனுப்பப்படும்."
@@ -5396,6 +5433,7 @@
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Cheque Print Template,Cheque Print Template,காசோலை அச்சு வார்ப்புரு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,செலவு மையங்கள் விளக்கப்படம்
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,சந்தாவை ரத்து செய்வதற்கு முன்பாக அல்லது விலைப்பட்டியல் அல்லாத சந்தாவை குறிப்பதற்கு முன்பாக விலைப்பட்டியல் தேதி முடிவடைந்த நாட்களின் எண்ணிக்கை
 DocType: Lab Test Template,Sample Collection,மாதிரி சேகரிப்பு
 ,Requested Items To Be Ordered,கேட்டு கேட்டு விடயங்கள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
@@ -5404,7 +5442,7 @@
 DocType: Account,Income,வருமானம்
 DocType: Industry Type,Industry Type,தொழில் வகை
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ஏதோ தவறு நடந்து!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
 DocType: Supplier Scorecard Scoring Criteria,Score,மதிப்பெண்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,நிதியாண்டு {0} இல்லை
@@ -5424,12 +5462,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 மற்றும் 100 க்கு இடையில் ஒரு மதிப்பு இருக்க வேண்டும்
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,அடுத்த தேதியற்ற தேதி முன் கிடைக்காது-க்கு பயன்பாட்டு தேதி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,பிணையற்ற கடன்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,பிணையற்ற கடன்கள்
 DocType: Cost Center,Cost Center Name,மையம் பெயர் செலவு
 DocType: Student,B+,பி
 DocType: HR Settings,Max working hours against Timesheet,அதிகபட்சம்  டைம் ஷீட் எதிராக உழைக்கும் மணி
 DocType: Maintenance Schedule Detail,Scheduled Date,திட்டமிடப்பட்ட தேதி
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,மொத்த பணம் விவரங்கள்
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,மொத்த பணம் விவரங்கள்
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,60 எழுத்துகளுக்கு அதிகமாக செய்திகள் பல செய்திகளை பிரிந்தது
 DocType: Purchase Receipt Item,Received and Accepted,பெற்று ஏற்கப்பட்டது
 DocType: Hub Settings,Company and Seller Profile,நிறுவனம் மற்றும் விற்பனை செய்தது
@@ -5443,10 +5481,9 @@
 DocType: Item,Variant Based On,மாற்று சார்ந்த அன்று
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,உங்கள் சப்ளையர்கள்
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,தயவுசெய்து சரி
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 DocType: Request for Quotation Item,Supplier Part No,சப்ளையர் பகுதி இல்லை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,அநாமதேய
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,பெறப்படும்
 DocType: Lead,Converted,மாற்றப்படுகிறது
@@ -5460,6 +5497,7 @@
 DocType: Asset,Assets,சொத்துக்கள்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,கணினி
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
+DocType: Subscription,Current Invoice End Date,தற்போதைய விலைப்பட்டியல் முடிவு தேதி
 DocType: Payment Term,Due Date Based On,காரணமாக தேதி அடிப்படையில்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,அமைப்புகளை விற்பதில் இயல்புநிலை வாடிக்கையாளர் குழு மற்றும் பிரதேசத்தை அமைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} இல்லை
@@ -5467,7 +5505,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பு இல்லை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ஜர்னல் நுழைவுக்காக திருப்பிச் செலுத்துதல் இல்லை
 DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
+DocType: Loan,Disbursed,செலவிட்டு
 DocType: Healthcare Settings,Laboratory Settings,ஆய்வக அமைப்புகள்
 DocType: Patient Appointment,Service Unit,சேவை பிரிவு
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,சப்ளையர் வெற்றிகரமாக அமைக்கவும்
@@ -5480,12 +5520,12 @@
 DocType: Share Balance,No of Shares,பங்குகளின் எண்ணிக்கை இல்லை
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,நிலைமையைத் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: School House,House Name,ஹவுஸ் பெயர்
 DocType: Fee Schedule,Total Amount per Student,மாணவர் மொத்த தொகை
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,மின்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,மின்
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,உங்கள் பயனர்கள் உங்கள் நிறுவனத்தில் மீதமுள்ள சேர்க்கவும். நீங்கள் தொடர்புகளிலிருந்து சேர்த்து அவற்றை உங்கள் போர்டல் வாடிக்கையாளர்கள் அழைக்க சேர்க்க முடியும்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
 DocType: Grant Application,Requested Amount,கோரப்பட்ட தொகை
@@ -5495,7 +5535,7 @@
 DocType: Crop Cycle,Detected Diseases,கண்டறியப்பட்ட நோய்கள்
 DocType: Stock Entry,Default Source Warehouse,முன்னிருப்பு மூல கிடங்கு
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 DocType: Asset Maintenance Task,Last Completion Date,கடைசி நிறைவு தேதி
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
@@ -5503,9 +5543,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless அமைப்புகள்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,பங்கு சொத்துக்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,பங்கு சொத்துக்கள்
 DocType: Restaurant,Active Menu,செயலில் உள்ள மெனு
 DocType: Target Detail,Target Qty,இலக்கு அளவு
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},கடனுக்கு எதிராக: {0}
 DocType: Shopping Cart Settings,Checkout Settings,வெளியேறுதல்  அமைப்புகள்
 DocType: Student Attendance,Present,தற்போது
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க கூடாது
@@ -5514,9 +5555,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
 DocType: Vehicle Log,Odometer,ஓடோமீட்டர்
 DocType: Production Plan Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
 DocType: Chapter,Chapter Head,பாடம் தலை
 DocType: Payment Term,Month(s) after the end of the invoice month,விலைப்பட்டியல் மாதத்தின் இறுதியில் மாத (கள்)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,திட்ட செயல்பாடு / பணி.
@@ -5524,11 +5565,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,சம்பளம் சீட்டுகள் உருவாக்குதல்
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ஆய்வின் விளைவாக தரவுத்தளத்தை சோதனை செய்வதற்கு முன்பாக இருக்க முடியாது
 DocType: POS Profile,Allow user to edit Discount,தள்ளுபடி திருத்த பயனர் அனுமதி
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,வாடிக்கையாளர்களைப் பெறவும்
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,வாடிக்கையாளர்களைப் பெறவும்
 DocType: Purchase Invoice Item,Include Exploded Items,வெடித்துள்ள பொருட்கள் அடங்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் வாங்குதல், சரிபார்க்கப்பட வேண்டும் {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
 DocType: Shipping Rule,Restrict to Countries,நாடுகளுக்கு கட்டுப்படுத்து
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
 DocType: Sales Invoice Timesheet,Billing Hours,பில்லிங் மணி
 DocType: Project,Total Sales Amount (via Sales Order),மொத்த விற்பனை தொகை (விற்பனை ஆணை வழியாக)
@@ -5546,6 +5588,7 @@
 DocType: Soil Texture,Sandy Clay,சாண்டி களிமண்
 DocType: Grant Application,Assessment  Manager,மதிப்பீட்டு மேலாளர்
 DocType: Payment Entry,Allocate Payment Amount,கட்டணத் தொகை ஒதுக்க
+DocType: Subscription Plan,Subscription Plan,சந்தா திட்டம்
 DocType: Employee External Work History,Salary,சம்பளம்
 DocType: Serial No,Delivery Document Type,டெலிவரி ஆவண வகை
 DocType: Sales Order,Partly Delivered,இதற்கு அனுப்பப்பட்டது
@@ -5571,9 +5614,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,வயதான ரேஞ்ச் 2
 DocType: SG Creation Tool Course,Max Strength,அதிகபட்சம்  வலிமை
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,முன்னமைவுகளை நிறுவுகிறது
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},வாடிக்கையாளர்களுக்கான டெலிவரி குறிப்பு இல்லை
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},வாடிக்கையாளர்களுக்கான டெலிவரி குறிப்பு இல்லை
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM மாற்றவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,டெலிவரி தேதி அடிப்படையில் தேர்ந்தெடுக்கப்பட்ட விடயங்கள்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,டெலிவரி தேதி அடிப்படையில் தேர்ந்தெடுக்கப்பட்ட விடயங்கள்
 DocType: Grant Application,Has any past Grant Record,எந்த முன்னாள் கிராண்ட் ரெக்டும் உள்ளது
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},கிடைக்கும் {0}
@@ -5592,7 +5635,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,மூலப்பொருட்கள் விலை வழங்கியது
 DocType: Selling Settings,Settings for Selling Module,தொகுதி விற்பனையான அமைப்புகள்
 DocType: Hotel Room Reservation,Hotel Room Reservation,ஹோட்டல் ரூம் முன்பதிவு
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,வாடிக்கையாளர் சேவை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,வாடிக்கையாளர் சேவை
 DocType: BOM,Thumbnail,சிறு
 DocType: Item Customer Detail,Item Customer Detail,பொருள் வாடிக்கையாளர் விபரம்
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ஆஃபர் வேட்பாளர் ஒரு வேலை.
@@ -5609,7 +5652,7 @@
 DocType: Fees,Student Details,மாணவர் விவரங்கள்
 DocType: Purchase Invoice Item,Stock Qty,பங்கு அளவு
 DocType: Purchase Invoice Item,Stock Qty,பங்கு அளவு
-DocType: Employee Loan,Repayment Period in Months,மாதங்களில் கடனை திருப்பி செலுத்தும் காலம்
+DocType: Loan,Repayment Period in Months,மாதங்களில் கடனை திருப்பி செலுத்தும் காலம்
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
 DocType: Account,Equity,ஈக்விட்டி
@@ -5618,7 +5661,7 @@
 DocType: Task,Closing Date,தேதி மூடுவது
 DocType: Sales Order Item,Produced Quantity,உற்பத்தி அளவு
 DocType: Timesheet,Work Detail,வேலை விபரம்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,பொறியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,பொறியாளர்
 DocType: Journal Entry,Total Amount Currency,மொத்த தொகை நாணய
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,தேடல் துணை கூட்டங்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் குறியீடு {0}
@@ -5664,13 +5707,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,நன்கொடை வகை தகவல்.
 DocType: Request for Quotation,Supplier Detail,சப்ளையர் விபரம்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},சூத்திரம் அல்லது நிலையில் பிழை: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,விலை விவரம் தொகை
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,விலை விவரம் தொகை
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,அளவுகோல் எடைகள் 100% வரை சேர்க்க வேண்டும்
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,வருகை
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,பங்கு பொருட்கள்
 DocType: BOM,Materials,பொருட்கள்
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","சரி இல்லை என்றால், பட்டியலில் அதை பயன்படுத்த வேண்டும் ஒவ்வொரு துறை சேர்க்க வேண்டும்."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} உருவாக்குதல்
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,மூல மற்றும் அடைவு கிடங்கு அதே இருக்க முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,பரிவர்த்தனைகள் வாங்கும் வரி வார்ப்புரு .
@@ -5694,14 +5736,14 @@
 DocType: Shipping Rule,Fixed,நிலையான
 DocType: Vehicle Service,Clutch Plate,கிளட்ச் தட்டு
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,நிர்வாக செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,நிர்வாக செலவுகள்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,ஆலோசனை
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
-DocType: Journal Entry,Subscription,சந்தா
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,சந்தா
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,கட்டணம் உருவாக்கம் நிலுவையில் உள்ளது
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,அறிவிப்பு காலம்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,அறிவிப்பு காலம்
 DocType: Asset Category,Asset Category Name,சொத்து வகை பெயர்
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,இந்த வேர் பகுதியில் மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,புதிய விற்பனைப் பெயர்
@@ -5715,7 +5757,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
 DocType: Asset,Frequency of Depreciation (Months),தேய்மானம் அதிர்வெண் (மாதங்கள்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,கடன் கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு பொருள்
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
@@ -5723,7 +5765,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
 DocType: Hub Settings,Company Logo,நிறுவனத்தின் லோகோ
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 DocType: Healthcare Settings,Patient Registration,நோயாளி பதிவு
@@ -5757,11 +5799,10 @@
 DocType: Journal Entry,Total Debit,மொத்த பற்று
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,இயல்புநிலை முடிக்கப்பட்ட பொருட்கள் கிடங்கு
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,தயவுசெய்து நோயாளி தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,விற்பனை நபர்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,விற்பனை நபர்
 DocType: Hotel Room Package,Amenities,வசதிகள்
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,கட்டணம் செலுத்திய பல இயல்புநிலை முறை அனுமதிக்கப்படவில்லை
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,அதற்காக
 ,Appointment Analytics,நியமனம் அனலிட்டிக்ஸ்
 DocType: Vehicle Service,Half Yearly,அரையாண்டு
 DocType: Lead,Blog Subscriber,வலைப்பதிவு சந்தாதாரர்
@@ -5778,6 +5819,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,நீங்கள் வருடத்திற்கு மாணவர்கள் குழுக்கள் செய்தால் காலியாக விடவும்
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","சரி என்றால், மொத்த இல்லை. வேலை நாட்கள் விடுமுறை அடங்கும், இந்த நாள் ஒன்றுக்கு சம்பளம் மதிப்பு குறையும்"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","தற்போதைய விசைகளைப் பயன்படுத்தி பயன்பாடுகள் அணுக முடியாது, உறுதியாக இருக்கிறீர்களா?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,மொத்த முன்பணம்
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,டெம்ப்ளேட் கோட் மாற்று
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,கால முடிவு தேதி கால தொடக்க தேதி முன்னதாக இருக்க முடியாது. தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
@@ -5789,8 +5831,9 @@
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 DocType: Cheque Print Template,Signatory Position,கையொப்பமிட தலைப்பு
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,லாஸ்ட் அமை
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,லாஸ்ட் அமை
 DocType: Timesheet,Total Billable Hours,மொத்த பில்லிடக்கூடியது மணி
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,சந்தாதாரர் இந்த சந்தாவால் உருவாக்கப்பட்ட பொருள்களை செலுத்த வேண்டிய நாட்களின் எண்ணிக்கை
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,கட்டணம் ரசீது குறிப்பு
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,இந்த வாடிக்கையாளர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},ரோ {0}: ஒதுக்கப்பட்ட தொகை {1} விட குறைவாக இருக்க அல்லது கொடுப்பனவு நுழைவு அளவு சமம் வேண்டும் {2}
@@ -5809,12 +5852,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,இந்த பணியாளர் வருகை அடிப்படையாக கொண்டது
 DocType: Assessment Result,Summary,சுருக்கம்
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,மார்க் கூட்டம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,பற்று கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,உணவகம் ஆர்டர் நுழைவு பொருள்
@@ -5826,7 +5869,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,கொள்முதல் அளவு
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,பணியாளர் நன்மைகள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,பணியாளர் நன்மைகள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Work Order,Manufactured Qty,உற்பத்தி அளவு
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},பங்குகளை {0}
@@ -5834,12 +5877,12 @@
 DocType: Asset,Out of Order,ஆர்டர் அவுட்
 DocType: Purchase Receipt Item,Accepted Quantity,அளவு ஏற்கப்பட்டது
 DocType: Projects Settings,Ignore Workstation Time Overlap,பணிநிலைய நேர இடைவெளியை புறக்கணி
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} இல்லை
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,தொகுதி எண்கள் தேர்வு
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 DocType: Patient Service Unit,Medical Administrator,மருத்துவ நிர்வாகி
 DocType: Assessment Plan,Schedule,அனுபந்தம்
 DocType: Account,Parent Account,பெற்றோர் கணக்கு
@@ -5869,15 +5912,16 @@
 DocType: Asset Repair,Repair Status,பழுதுபார்க்கும் நிலை
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,கணக்கு ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 DocType: POS Profile,Account for Change Amount,கணக்கு தொகை மாற்றம்
 DocType: Purchase Invoice,input service,உள்ளீடு சேவை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,பராமரிப்பு குழு உறுப்பினர்
 DocType: Agriculture Analysis Criteria,Soil Analysis,மண் பகுப்பாய்வு
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,பாடநெறி குறியீடு:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
@@ -5926,19 +5970,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},சேர்க்கை {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,மாறி பெயர்
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
 DocType: Asset,Asset Category,சொத்து வகை
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,நிகர ஊதியம் எதிர்மறை இருக்க முடியாது
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,பொருள் வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,சப்ளையர் பொருள்
 DocType: Soil Texture,Loamy Sand,லோமாயி மணல்
 DocType: Production Plan,Material Request Planning,பொருள் கோரிக்கை திட்டமிடல்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,கலால் விலைப்பட்டியல்
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,உயர் அளவு {0}% முறை மேல் காட்சிக்கு
 DocType: Expense Claim,Employees Email Id,ஊழியர்கள் மின்னஞ்சல் விலாசம்
 DocType: Employee Attendance Tool,Marked Attendance,அடையாளமிட்ட வருகை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,நடப்பு பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,நடப்பு பொறுப்புகள்
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,கொடுக்கப்பட்ட மணிநேர டைமரைக் கடந்தது.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,உங்கள் தொடர்புகள் வெகுஜன எஸ்எம்எஸ் அனுப்ப
 DocType: Patient,A Positive,நேர்மறை
@@ -5949,9 +5993,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, இந்த சப்ளையருக்கான கொள்முதல் ஆணை எச்சரிக்கையுடன் வெளியிடப்பட வேண்டும்."
 DocType: Asset Maintenance Team,Asset Maintenance Team,சொத்து பராமரிப்பு குழு
-DocType: Employee Loan,Loan Type,கடன் வகை
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} வெற்றிகரமாக சமர்ப்பிக்கப்பட்டது
+DocType: Loan,Loan Type,கடன் வகை
 DocType: Scheduling Tool,Scheduling Tool,திட்டமிடல் கருவி
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,கடன் அட்டை
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது repacked வேண்டும்
 DocType: Employee Education,Major/Optional Subjects,முக்கிய / விருப்ப பாடங்கள்
 DocType: Sales Invoice Item,Drop Ship,டிராப் கப்பல்
@@ -5983,7 +6028,7 @@
 DocType: Item,Units of Measure,அளவின் அலகுகள்
 DocType: Manufacturing Settings,Allow Production on Holidays,விடுமுறை உற்பத்தி அனுமதி
 DocType: Sales Invoice,Customer's Purchase Order Date,வாடிக்கையாளர் கொள்முதல் ஆணை தேதி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,மூலதன கையிருப்பு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,மூலதன கையிருப்பு
 DocType: Shopping Cart Settings,Show Public Attachments,பொது இணைப்புகள் காட்டு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
 DocType: Restaurant Reservation,Reservation Time,முன்பதிவு நேரம்
@@ -5998,7 +6043,7 @@
 DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்றும் பில்
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,வரிசை # {0}: தேதி மாற்றுவதற்கான தேதிக்கு முன்னதாக இருக்க முடியாது
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,சிறப்பு தயாரிப்புகள்
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,வடிவமைப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
 DocType: Serial No,Delivery Details,விநியோக விவரம்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
@@ -6008,20 +6053,20 @@
 DocType: Driver,Expiry Date,காலாவதியாகும் தேதி
 DocType: Healthcare Settings,Employee name and designation in print,அச்சுப் பெயரில் பணியாளர் பெயர் மற்றும் பதவி
 ,accounts-browser,கணக்குகள் உலாவி
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +13,Project master.,திட்டம் மாஸ்டர்.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","பங்கு அமைப்புகள் அல்லது பொருள் உள்ள &quot;அலவன்ஸ்&quot; புதுப்பிக்க, மேல்-பில்லிங் அல்லது மேல்-வரிசைப்படுத்தும் அனுமதிக்க."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(அரை நாள்)
 DocType: Payment Term,Credit Days,கடன் நாட்கள்
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,ஆய்வக சோதனைகளை பெறுவதற்கு நோயாளித் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,மாணவர் தொகுதி செய்ய
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,முன்னோக்கி எடுத்துச்செல்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,நேரம் நாட்கள் வழிவகுக்கும்
 DocType: Cash Flow Mapping,Is Income Tax Expense,வருமான வரி செலவுகள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,மாணவர் நிறுவனத்தின் விடுதி வசிக்கிறார் இந்த பாருங்கள்.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
 ,Stock Summary,பங்கு சுருக்கம்
@@ -6032,10 +6077,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref தேதி
 DocType: Employee,Reason for Leaving,விட்டு காரணம்
 DocType: BOM Operation,Operating Cost(Company Currency),இயக்க செலவு (நிறுவனத்தின் நாணய)
-DocType: Employee Loan Application,Rate of Interest,வட்டி விகிதம்
+DocType: Loan Application,Rate of Interest,வட்டி விகிதம்
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: Item,Shelf Life In Days,நாட்களில் அடுப்பு வாழ்க்கை
 DocType: GL Entry,Is Opening,திறக்கிறது
+DocType: Department,Expense Approvers,செலவின மதிப்புகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
 DocType: Journal Entry,Subscription Section,சந்தா பகுதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,கணக்கு {0} இல்லை
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index 3930b71..09e933e 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,మెటీరియల్ సందర్శించండి {0} ఈ వారంటీ దావా రద్దు ముందు రద్దు
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,అసెస్మెంట్ రిపోర్ట్స్
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,కన్జ్యూమర్ ప్రొడక్ట్స్
-DocType: Purchase Receipt,Subscription Detail,సభ్యత్వ వివరాలు
 DocType: Supplier Scorecard,Notify Supplier,సరఫరాదారుకు తెలియజేయండి
 DocType: Item,Customer Items,కస్టమర్ అంశాలు
 DocType: Project,Costing and Billing,ఖర్చయ్యే బిల్లింగ్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ఖాతా {0}: మాతృ ఖాతా {1} ఒక లెడ్జర్ ఉండకూడదు
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com అంశం ప్రచురించు
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ఇమెయిల్ ప్రకటనలు
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,మూల్యాంకనం
 DocType: Item,Default Unit of Measure,మెజర్ డిఫాల్ట్ యూనిట్
 DocType: SMS Center,All Sales Partner Contact,అన్ని అమ్మకపు భాగస్వామిగా సంప్రదించండి
-DocType: Employee,Leave Approvers,Approvers వదిలి
+DocType: Department,Leave Approvers,Approvers వదిలి
 DocType: Sales Partner,Dealer,డీలర్
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,పరిశోధనల
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,లభ్యతను తనిఖీలు చేయండి
 DocType: Job Applicant,Job Applicant,ఉద్యోగం అభ్యర్థి
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,ఈ ఈ సరఫరాదారు వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,లీగల్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},వాస్తవ రకం పన్ను వరుసగా అంశం రేటు చేర్చబడిన సాధ్యం {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,లీగల్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},వాస్తవ రకం పన్ను వరుసగా అంశం రేటు చేర్చబడిన సాధ్యం {0}
 DocType: Bank Guarantee,Customer,కస్టమర్
 DocType: Purchase Receipt Item,Required By,ద్వారా అవసరం
 DocType: Delivery Note,Return Against Delivery Note,డెలివరీ గమనిక వ్యతిరేకంగా తిరిగి
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,తలలు (లేదా సమూహాలు) ఇది వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు తయారు చేస్తారు మరియు నిల్వలను నిర్వహించబడుతున్నాయి.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ప్రాసెస్ చేయడానికి ఎలాంటి సమర్పించిన జీతం స్లిప్స్ లేవు.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ప్రాసెస్ చేయడానికి ఎలాంటి సమర్పించిన జీతం స్లిప్స్ లేవు.
 DocType: Manufacturing Settings,Default 10 mins,10 నిమిషాలు డిఫాల్ట్
 DocType: Leave Type,Leave Type Name,టైప్ వదిలి పేరు
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ఓపెన్ చూపించు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,పైన పేర్కొన్న పునరావృత కోసం నేడు ఈ చర్యను తీసుకోవలసిన అవసరం ఉంది
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,హోటల్ నుంచి బయటకు వెళ్లడం
 DocType: Pricing Rule,Apply On,న వర్తించు
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,అన్ని సరఫరాదారు సంప్రదించండి
 DocType: Support Settings,Support Settings,మద్దతు సెట్టింగ్లు
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,రో # {0}: రేటు అదే ఉండాలి {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,న్యూ లీవ్ అప్లికేషన్
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,రో # {0}: రేటు అదే ఉండాలి {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,బ్యాచ్ అంశం గడువు హోదా
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Membership,membership validaty section,సభ్యత్వం చెల్లుబాటు విభాగం
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
 DocType: Consultation,Consultation,కన్సల్టేషన్
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,మెటీరియల్
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,వెబ్సైట్ని తయారు చేయడం
 DocType: Opening Invoice Creation Tool Item,Quantity,పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
 DocType: Employee Education,Year of Passing,తరలింపు ఇయర్
 DocType: Item,Country of Origin,మూలం యొక్క దేశం
 DocType: Soil Texture,Soil Texture Criteria,నేల ఆకృతి ప్రమాణం
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,ప్రాథమిక సంప్రదింపు వివరాలు
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ఓపెన్ ఇష్యూస్
 DocType: Production Plan Item,Production Plan Item,ఉత్పత్తి ప్రణాళిక అంశం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},వాడుకరి {0} ఇప్పటికే ఉద్యోగి కేటాయించిన {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},వాడుకరి {0} ఇప్పటికే ఉద్యోగి కేటాయించిన {1}
 DocType: Lab Test Groups,Add new line,క్రొత్త పంక్తిని జోడించండి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,ఆరోగ్య సంరక్షణ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),చెల్లింపు లో ఆలస్యం (రోజులు)
@@ -89,7 +85,7 @@
 ,Delay Days,ఆలస్యం డేస్
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,వాయిస్
+DocType: Subscription Invoice,Invoice,వాయిస్
 DocType: Purchase Invoice Item,Item Weight Details,అంశం బరువు వివరాలు
 DocType: Asset Maintenance Log,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),స్కోరు (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},రో {0}: {1} {2} సరిపోలడం లేదు {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,రో # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,రో # {0}:
 DocType: Timesheet,Total Costing Amount,మొత్తం వ్యయంతో మొత్తం
 DocType: Delivery Note,Vehicle No,వాహనం లేవు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,పని జరుగుచున్నది
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,దయచేసి తేదీని ఎంచుకోండి
 DocType: Daily Work Summary Group,Holiday List,హాలిడే జాబితా
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,అకౌంటెంట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,అకౌంటెంట్
 DocType: Hub Settings,Selling Price List,ధర జాబితా అమ్మకం
 DocType: Patient,Tobacco Current Use,పొగాకు ప్రస్తుత ఉపయోగం
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,రేట్ సెల్లింగ్
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,రేట్ సెల్లింగ్
 DocType: Cost Center,Stock User,స్టాక్ వాడుకరి
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,ఫోన్ సంఖ్య
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},న్యూ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ప్రారంభ ఇమెయిల్ నోటిఫికేషన్ పంపబడింది
 ,Sales Partners Commission,సేల్స్ భాగస్వాములు కమిషన్
 DocType: Soil Texture,Sandy Clay Loam,శాండీ క్లే లోమ్
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,విలువ తరుగుదల తరువాత
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,సంబంధిత
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,హాజరు తేదీ ఉద్యోగి చేరిన తేదీ కంటే తక్కువ ఉండకూడదు
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,హాజరు తేదీ ఉద్యోగి చేరిన తేదీ కంటే తక్కువ ఉండకూడదు
 DocType: Grading Scale,Grading Scale Name,గ్రేడింగ్ స్కేల్ పేరు
-DocType: Subscription,Repeat on Day,రోజు రిపీట్
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ఈ root ఖాతా ఉంది మరియు సవరించడం సాధ్యం కాదు.
 DocType: Sales Invoice,Company Address,సంస్థ చిరునామా
 DocType: BOM,Operations,ఆపరేషన్స్
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},డిస్కౌంట్ ఆధారంగా అధికార సెట్ చెయ్యబడదు {0}
+DocType: Subscription,Subscription Start Date,చందా ప్రారంభ తేదీ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","రెండు నిలువు, పాత పేరు ఒక మరియు కొత్త పేరు కోసం ఒక csv ఫైల్ అటాచ్"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ఏ క్రియాశీల ఫిస్కల్ ఇయర్ లో.
 DocType: Packed Item,Parent Detail docname,మాతృ వివరాలు docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","సూచన: {0}, Item కోడ్: {1} మరియు కస్టమర్: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,ట్రయల్ వ్యవధి ముగింపు తేదీ ట్రయల్ పీరియడ్ ప్రారంభ తేదీకి ముందు ఉండకూడదు
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,కిలొగ్రామ్
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ఒక Job కొరకు తెరవడం.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{0} వరుసలో {0} సబ్ కన్స్ట్రక్టింగ్ అంశం కోసం BOM పేర్కొనబడలేదు.
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,అదే కంపెనీ ఒకసారి కంటే ఎక్కువ ఎంటర్ ఉంది
 DocType: Patient,Married,వివాహితులు
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},కోసం అనుమతి లేదు {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,నుండి అంశాలను పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,నుండి అంశాలను పొందండి
 DocType: Price List,Price Not UOM Dependant,ధర UOM ఆధారపడదు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,బ్రేక్ ఆయిల్
 DocType: Tax Rule,Tax Type,పన్ను టైప్
 ,Completed Work Orders,పూర్తయింది వర్క్ ఆర్డర్స్
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,పన్ను పరిధిలోకి వచ్చే మొత్తం
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,పన్ను పరిధిలోకి వచ్చే మొత్తం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
 DocType: BOM,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ తప్పనిసరిగా వ్యయం దావా లేదా జర్నల్ ఎంట్రీలో ఒకటిగా ఉండాలి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,బిఒఎం ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ తప్పనిసరిగా వ్యయం దావా లేదా జర్నల్ ఎంట్రీలో ఒకటిగా ఉండాలి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,బిఒఎం ఎంచుకోండి
 DocType: SMS Log,SMS Log,SMS లోనికి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,పంపిణీ వస్తువుల ధర
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ఉద్యోగికి ఇచ్చిన ముందటి మొత్తాన్ని నిర్వహించండి
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,డెలివరీ నోటిఫికేషన్
 DocType: Journal Entry,Opening Entry,ఓపెనింగ్ ఎంట్రీ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ఖాతా చెల్లించండి మాత్రమే
-DocType: Employee Loan,Repay Over Number of Periods,చెల్లింపులో కాలాల ఓవర్ సంఖ్య
+DocType: Loan,Repay Over Number of Periods,చెల్లింపులో కాలాల ఓవర్ సంఖ్య
 DocType: Stock Entry,Additional Costs,అదనపు వ్యయాలు
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో ఖాతా సమూహం మార్చబడుతుంది సాధ్యం కాదు.
 DocType: Lead,Product Enquiry,ఉత్పత్తి ఎంక్వయిరీ
 DocType: Education Settings,Validate Batch for Students in Student Group,స్టూడెంట్ గ్రూప్ లో స్టూడెంట్స్ కోసం బ్యాచ్ ప్రమాణీకరించు
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},తోబుట్టువుల సెలవు రికార్డు ఉద్యోగికి దొరకలేదు {0} కోసం {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},తోబుట్టువుల సెలవు రికార్డు ఉద్యోగికి దొరకలేదు {0} కోసం {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,మొదటి కంపెనీ నమోదు చేయండి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,మొదటి కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,మొదటి కంపెనీ దయచేసి ఎంచుకోండి
 DocType: Employee Education,Under Graduate,గ్రాడ్యుయేట్
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,దయచేసి HR సెట్టింగ్ల్లో లీవ్ స్టేట్ నోటిఫికేషన్ కోసం డిఫాల్ట్ టెంప్లేట్ను సెట్ చేయండి.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ఆన్ టార్గెట్
 DocType: BOM,Total Cost,మొత్తం వ్యయం
 DocType: Soil Analysis,Ca/K,CA / K
-DocType: Journal Entry Account,Employee Loan,ఉద్యోగి లోన్
 DocType: Fee Schedule,Send Payment Request Email,చెల్లింపు అభ్యర్థన ఇమెయిల్ను పంపండి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} అంశం వ్యవస్థ ఉనికిలో లేదు లేదా గడువు ముగిసింది
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,హౌసింగ్
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,విజయవంతంగా నమోదు కాలేదు.
 DocType: Assessment Result,Grade,గ్రేడ్
 DocType: Restaurant Table,No of Seats,సీట్ల సంఖ్య
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","డైనమిక్ విషయం జోడించడానికి, వంటి jinja టాగ్లు ఉపయోగించండి <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,సరఫరాదారు ద్వారా పంపిణీ
 DocType: Asset Maintenance Task,Asset Maintenance Task,ఆస్తి నిర్వహణ టాస్క్
 DocType: SMS Center,All Contact,అన్ని సంప్రదించండి
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,వార్షిక జీతం
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,వార్షిక జీతం
 DocType: Daily Work Summary,Daily Work Summary,డైలీ వర్క్ సారాంశం
 DocType: Period Closing Voucher,Closing Fiscal Year,ఫిస్కల్ ఇయర్ మూసివేయడం
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ఘనీభవించిన
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,స్టాక్ ఖర్చులు
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,స్టాక్ ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,నమోదు చేయండి ఇష్టపడే సంప్రదించండి ఇమెయిల్
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,నమోదు చేయండి ఇష్టపడే సంప్రదించండి ఇమెయిల్
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,పద్దు
 DocType: Journal Entry Account,Credit in Company Currency,కంపెనీ కరెన్సీ లో క్రెడిట్
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ప్రాథమిక చిరునామా
 DocType: Production Plan,Material Request Detail,విషయం అభ్యర్థన వివరాలు
 DocType: Selling Settings,Default Quotation Validity Days,డిఫాల్ట్ కొటేషన్ చెల్లుబాటు డేస్
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: Sales Invoice,Change Amount,మొత్తం మారుతుంది
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,డ్రైవింగ్ లైసెన్స్ కేటగిరీలు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,దయచేసి డెలివరీ తేదీని నమోదు చేయండి
 DocType: Depreciation Schedule,Make Depreciation Entry,అరుగుదల ఎంట్రీ చేయండి
+DocType: HR Settings,Leave Settings,సెట్టింగులను వదిలివేయి
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ఉద్యోగి చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,బ్రాడ్కాస్టింగ్
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS యొక్క సెటప్ మోడ్ (ఆన్లైన్ / ఆఫ్లైన్)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,వర్క్ ఆర్డర్స్కు వ్యతిరేకంగా సమయం లాగ్లను రూపొందించడాన్ని నిలిపివేస్తుంది. ఆపరేషన్స్ వర్క్ ఆర్డర్కు వ్యతిరేకంగా ట్రాక్ చేయబడవు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,ఎగ్జిక్యూషన్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,ఎగ్జిక్యూషన్
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,కార్యకలాపాల వివరాలను చేపట్టారు.
 DocType: Asset Maintenance Log,Maintenance Status,నిర్వహణ స్థితి
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,సభ్యత్వ వివరాలు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: సరఫరాదారు చెల్లించవలసిన ఖాతాఫై అవసరం {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,అంశాలు మరియు ధర
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},మొత్తం గంటలు: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},తేదీ నుండి ఫిస్కల్ ఇయర్ లోపల ఉండాలి. తేదీ నుండి ఊహిస్తే = {0}
 DocType: Drug Prescription,Interval,విరామం
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,ప్రాధాన్యత
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,ప్రాధాన్యత
 DocType: Grant Application,Individual,వ్యక్తిగత
 DocType: Academic Term,Academics User,విద్యావేత్తలు వాడుకరి
 DocType: Cheque Print Template,Amount In Figure,మూర్తి లో మొత్తం
-DocType: Employee Loan Application,Loan Info,లోన్ సమాచారం
+DocType: Loan Application,Loan Info,లోన్ సమాచారం
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,నిర్వహణ సందర్శనలకు ప్రణాళిక.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,సరఫరాదారు స్కోరు వ్యవధి
 DocType: Share Transfer,Share Transfer,భాగస్వామ్యం బదిలీ
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,అంశం మూస
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,బయోకెమిస్ట్రీ
 DocType: Job Offer,Select Terms and Conditions,Select నియమాలు మరియు నిబంధనలు
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,అవుట్ విలువ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,అవుట్ విలువ
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce సెట్టింగులు
 DocType: Production Plan,Sales Orders,సేల్స్ ఆర్డర్స్
 DocType: Purchase Taxes and Charges,Valuation,వాల్యువేషన్
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,డిఫాల్ట్ భూభాగం
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,టెలివిజన్
 DocType: Work Order Operation,Updated via 'Time Log',&#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,కస్టమర్ లేదా సరఫరాదారుని ఎంచుకోండి.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,ఈ లావాదేవీ కోసం సిరీస్ జాబితా
 DocType: Company,Enable Perpetual Inventory,శాశ్వత ఇన్వెంటరీ ప్రారంభించు
+DocType: Bank Guarantee,Charges Incurred,ఛార్జీలు చోటు చేసుకున్నాయి
 DocType: Company,Default Payroll Payable Account,డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,ఇమెయిల్ అప్డేట్ గ్రూప్
 DocType: Sales Invoice,Is Opening Entry,ఎంట్రీ ప్రారంభ ఉంది
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,కస్టమ్ ఫలితం
 DocType: Delivery Stop,Contact Name,సంప్రదింపు పేరు
 DocType: Course Assessment Criteria,Course Assessment Criteria,కోర్సు అంచనా ప్రమాణం
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,పన్ను గుర్తింపు:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,పన్ను గుర్తింపు:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,విద్యార్థి ID:
 DocType: POS Customer Group,POS Customer Group,POS కస్టమర్ గ్రూప్
 DocType: Land Unit,Land Unit describing various land assets,ల్యాండ్ యూనిట్ వివిధ భూ ఆస్తులను వివరిస్తుంది
@@ -375,9 +372,8 @@
 ,Open Work Orders,కార్యాలయ ఆర్డర్లు తెరవండి
 DocType: Payment Term,Credit Months,క్రెడిట్ నెలలు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,నికర పే కంటే తక్కువ 0 కాదు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","సిస్టమ్ నుండి పునరావృత లోపం నోటిఫికేషన్లను పంపడాన్ని నిలిపివేయడానికి, మేము చందాలో డిసేబుల్డ్ ఫీల్డ్ను తనిఖీ చేసాము"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,సంవత్సరానికి ఆకులు
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,సంవత్సరానికి ఆకులు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,రో {0}: తనిఖీ చేయండి ఖాతా వ్యతిరేకంగా &#39;అడ్వాన్స్ ఈజ్&#39; {1} ఈ అడ్వాన్సుగా ఎంట్రీ ఉంటే.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
 DocType: Email Digest,Profit & Loss,లాభం &amp; నష్టం
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,స్టూడెంట్ గుంపుల క్రింద విద్యార్థులు సెటప్ చేయండి
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,బ్యాంక్ ఎంట్రీలు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Leave నిరోధిత
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,బ్యాంక్ ఎంట్రీలు
 DocType: Crop,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
 DocType: Stock Entry,Sales Invoice No,సేల్స్ వాయిస్ లేవు
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,స్టూడెంట్ గ్రూప్ సృష్టి సాధనం కోర్సు
 DocType: Lead,Do Not Contact,సంప్రదించండి చేయవద్దు
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,మీ సంస్థ వద్ద బోధిస్తారు వ్యక్తుల
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,సాఫ్ట్వేర్ డెవలపర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,సాఫ్ట్వేర్ డెవలపర్
 DocType: Item,Minimum Order Qty,కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Pricing Rule,Supplier Type,సరఫరాదారు టైప్
 DocType: Course Scheduling Tool,Course Start Date,కోర్సు ప్రారంభ తేదీ
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 ,GSTR-2,GSTR -2
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,మాక్స్ గ్రేడ్
 DocType: Email Digest,New Quotations,న్యూ కొటేషన్స్
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ఇష్టపడే ఇమెయిల్ లో ఉద్యోగి ఎంపిక ఆధారంగా ఉద్యోగి ఇమెయిళ్ళు జీతం స్లిప్
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,జాబితాలో మొదటి లీవ్ అప్రూవర్గా డిఫాల్ట్ లీవ్ అప్రూవర్గా సెట్ చేయబడుతుంది
 DocType: Tax Rule,Shipping County,షిప్పింగ్ కౌంటీ
-apps/erpnext/erpnext/config/desktop.py +167,Learn,తెలుసుకోండి
+apps/erpnext/erpnext/config/desktop.py +159,Learn,తెలుసుకోండి
 DocType: Asset,Next Depreciation Date,తదుపరి అరుగుదల తేదీ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ఉద్యోగి ప్రతి కార్యాచరణ ఖర్చు
 DocType: Accounts Settings,Settings for Accounts,అకౌంట్స్ కోసం సెట్టింగులు
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,అత్యుత్తమ చెక్కుల మరియు క్లియర్ డిపాజిట్లు
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
 DocType: Driver,Fleet Manager,విమానాల మేనేజర్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},రో # {0}: {1} అంశం కోసం ప్రతికూల ఉండకూడదు {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},రో # {0}: {1} అంశం కోసం ప్రతికూల ఉండకూడదు {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},దయచేసి {@} పై హోటల్ రూట్ రేటును సెట్ చేయండి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Opening Invoice Creation Tool,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,డెలివరీ గమనిక
 DocType: Consultation,Encounter Impression,ఎన్కౌంటర్ ఇంప్రెషన్
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,సోల్డ్ ఆస్తి యొక్క ధర
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,కస్టమర్ కరెన్సీ కస్టమర్ బేస్ కరెన్సీ మార్చబడుతుంది రేటుపై
 DocType: Course Scheduling Tool,Course Scheduling Tool,కోర్సు షెడ్యూల్ టూల్
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,% S కోసం పునరావృత% s సృష్టించేటప్పుడు [అర్జంట్] లోపం
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
 DocType: Land Unit,LInked Analysis,Lynked విశ్లేషణ
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,దరఖాస్తు కాలం రెండు కేటాయింపు రికార్డుల్లో ఉండరాదు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,దరఖాస్తు కాలం రెండు కేటాయింపు రికార్డుల్లో ఉండరాదు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% పొందింది
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,విద్యార్థి సమూహాలు సృష్టించండి
 DocType: Volunteer,Weekends,వీకెండ్స్
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,క్రెడిట్ గమనిక మొత్తం
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,క్రెడిట్ గమనిక మొత్తం
 DocType: Setup Progress Action,Action Document,చర్య పత్రం
 DocType: Chapter Member,Website URL,వెబ్సైట్ URL
 ,Finished Goods,తయారైన వస్తువులు
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext డెమో
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,అంశాలు జోడించండి
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,అంశం నాణ్యత తనిఖీ పారామిత
+DocType: Leave Application,Leave Approver Name,అప్రూవర్గా వదిలి పేరు
 DocType: Depreciation Schedule,Schedule Date,షెడ్యూల్ తేదీ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","ఆదాయ, తీసివేతలు మరియు ఇతర జీతం భాగాలు"
 DocType: Packed Item,Packed Item,ప్యాక్ అంశం
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,కొటేషన్ కోసం అభ్యర్థన
 DocType: Healthcare Settings,Require Lab Test Approval,ల్యాబ్ పరీక్ష ఆమోదం అవసరం
 DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,మొత్తం అత్యుత్తమమైనది
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,మొత్తం అత్యుత్తమమైనది
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
 DocType: Dosage Strength,Strength,బలం
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,వినిమయ వ్యయం
 DocType: Purchase Receipt,Vehicle Date,వాహనం తేదీ
 DocType: Student Log,Medical,మెడికల్
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,కోల్పోయినందుకు కారణము
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,కోల్పోయినందుకు కారణము
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,ఖాతా సంఖ్యను నవీకరించండి
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,లీడ్ యజమాని లీడ్ అదే ఉండకూడదు
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,సింగిల్
 DocType: Salary Slip,Total Loan Repayment,మొత్తం లోన్ తిరిగి చెల్లించే
 DocType: Account,Cost of Goods Sold,వస్తువుల ఖర్చు సోల్డ్
-DocType: Subscription,Yearly,వార్షిక
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
 DocType: Drug Prescription,Dosage,మోతాదు
 DocType: Journal Entry Account,Sales Order,అమ్మకాల ఆర్డర్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
 DocType: Assessment Plan,Examiner Name,ఎగ్జామినర్ పేరు
 DocType: Lab Test Template,No Result,తోబుట్టువుల ఫలితం
 DocType: Purchase Invoice Item,Quantity and Rate,పరిమాణ మరియు రేటు
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,మొదటి కంపెనీ పేరును నమోదు చేయండి
 DocType: Purchase Invoice,Supplier Name,సరఫరా చేయువాని పేరు
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext మాన్యువల్ చదువు
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,క్యాలెండర్లో అన్ని డిపార్ట్మెంట్ సభ్యుల ఆకులు చూపించు
 DocType: Purchase Invoice,01-Sales Return,01-సేల్స్ రిటర్న్
 DocType: Account,Is Group,సమూహ
 DocType: Email Digest,Pending Purchase Orders,కొనుగోలు ఉత్తర్వులు పెండింగ్లో
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,తప్పనిసరి రంగంలో - అకాడెమిక్ ఇయర్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} తో సంబంధం లేదు {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ఆ ఈమెయిల్ భాగంగా వెళ్ళే పరిచయ టెక్స్ట్ అనుకూలీకరించండి. ప్రతి లావాదేవీ ఒక ప్రత్యేక పరిచయ టెక్స్ట్ ఉంది.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},కంపెనీ కోసం డిఫాల్ట్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},కంపెనీ కోసం డిఫాల్ట్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},లావాదేవీ ఆపడానికి వ్యతిరేకంగా అనుమతించలేదు పని ఆర్డర్ {0}
 DocType: Setup Progress Action,Min Doc Count,మిన్ డాక్స్ కౌంట్
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,అన్ని తయారీ ప్రక్రియలకు గ్లోబల్ సెట్టింగులు.
 DocType: Accounts Settings,Accounts Frozen Upto,ఘనీభవించిన వరకు అకౌంట్స్
 DocType: SMS Log,Sent On,న పంపిన
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,హాలిడే మాస్టర్.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,అమ్మకానికి రిసర్వ్డ్
 DocType: Packing Slip,From Package No.,ప్యాకేజీ నం నుండి
 DocType: Item Attribute,To Range,రేంజ్ కు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", మదింపు విధానంగా మార్చలేము కొన్ని అంశాలను వ్యతిరేకంగా లావాదేవీలు కలిగి లేని ఉన్నాయి సొంత మదింపు పద్ధతి వార్తలు"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", మదింపు విధానంగా మార్చలేము కొన్ని అంశాలను వ్యతిరేకంగా లావాదేవీలు కలిగి లేని ఉన్నాయి సొంత మదింపు పద్ధతి వార్తలు"
 DocType: Student Report Generation Tool,Attended by Parents,తల్లిదండ్రులు హాజరయ్యారు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,కేటాయించింది మొత్తం ఆకులు తప్పనిసరి
 DocType: Patient,AB Positive,AB అనుకూల
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,హాజరు రికార్డు.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet ఆధారంగా పేరోల్ కోసం జీతం భాగం.
 DocType: Sales Order Item,Used for Production Plan,ఉత్పత్తి ప్లాన్ వుపయోగించే
-DocType: Employee Loan,Total Payment,మొత్తం చెల్లింపు
+DocType: Loan,Total Payment,మొత్తం చెల్లింపు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,పూర్తి వర్క్ ఆర్డర్ కోసం లావాదేవీని రద్దు చేయలేరు.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(నిమిషాలు) ఆపరేషన్స్ మధ్య సమయం
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} చర్య పూర్తి చేయబడదు కాబట్టి రద్దు
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,మీ వినియోగదారులు కొన్ని జాబితా. వారు సంస్థలు లేదా వ్యక్తులతో కావచ్చు.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,తగినంత భాగాలు బిల్డ్
 DocType: POS Profile User,POS Profile User,POS ప్రొఫైల్ వాడుకరి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ప్రత్యక్ష ఆదాయం
+DocType: Subscription Invoice,Subscription Invoice,సబ్స్క్రిప్షన్ ఇన్వాయిస్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,ప్రత్యక్ష ఆదాయం
 DocType: Patient Appointment,Date TIme,తేదీ TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","ఖాతా ద్వారా సమూహం ఉంటే, ఖాతా ఆధారంగా వేరు చేయలేని"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,సంస్థ మరియు పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 DocType: Codification Table,Codification Table,కోడెఫికేషన్ టేబుల్
 DocType: Timesheet Detail,Hrs,గంటలు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
 DocType: Stock Entry Detail,Difference Account,తేడా ఖాతా
 DocType: Purchase Invoice,Supplier GSTIN,సరఫరాదారు GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,నగదు ప్రవాహం మ్యాపింగ్ మూస
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
 DocType: Journal Entry,Difference (Dr - Cr),తేడా (డాక్టర్ - CR)
+DocType: Bank Guarantee,Providing,అందించడం
 DocType: Account,Profit and Loss,లాభం మరియు నష్టం
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","అనుమతించబడలేదు, అవసరమైతే ల్యాబ్ పరీక్ష టెంప్లేట్ను కాన్ఫిగర్ చేయండి"
 DocType: Patient,Risk Factors,ప్రమాద కారకాలు
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,సరఫరాదారు వాయిస్ లేవు
 DocType: Territory,For reference,సూచన కోసం
 DocType: Healthcare Settings,Appointment Confirmation,నియామకం నిర్ధారణ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","తొలగించలేరు సీరియల్ లేవు {0}, ఇది స్టాక్ లావాదేవీలు ఉపయోగిస్తారు వంటి"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","తొలగించలేరు సీరియల్ లేవు {0}, ఇది స్టాక్ లావాదేవీలు ఉపయోగిస్తారు వంటి"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),మూసివేయడం (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,హలో
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,తరలించు అంశం
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","వినియోగదారుడు {1} కోసం సానుకూల ప్రొఫైల్ లో {0} డిఫాల్ట్గా సెట్ చేయండి, దయచేసి సిద్ధంగా డిసేబుల్ చెయ్యబడింది"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,పోగుచేసిన విలువలు
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS ప్రొఫైల్ లో భూభాగం అవసరం
 DocType: Supplier,Prevent RFQs,RFQ లను నిరోధించండి
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} నుండి {1} వరకు కాలం చెల్లించిన జీతం స్లిప్
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} నుండి {1} వరకు కాలం చెల్లించిన జీతం స్లిప్
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,షిప్పింగ్ బిల్ తేదీ
 DocType: Production Plan,Production Plan,ఉత్పత్తి ప్రణాళిక
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,వాయిస్ సృష్టి సాధనాన్ని తెరవడం
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,సేల్స్ చూపించు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,గమనిక: మొత్తం కేటాయించింది ఆకులు {0} ఇప్పటికే ఆమోదం ఆకులు కంటే తక్కువ ఉండకూడదు {1} కాలానికి
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,సీరియల్ నో ఇన్పుట్ ఆధారంగా లావాదేవీల్లో Qty సెట్ చేయండి
 ,Total Stock Summary,మొత్తం స్టాక్ సారాంశం
 DocType: Announcement,Posted By,ద్వారా పోస్ట్
 DocType: Item,Delivered by Supplier (Drop Ship),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,కంపెనీ సెట్ దయచేసి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,కంపెనీ సెట్ దయచేసి
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,బిల్ ఆంట్
 DocType: Training Result Employee,Training Result Employee,శిక్షణ ఫలితం ఉద్యోగి
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,స్టాక్ ఎంట్రీలు తయారు చేస్తారు ఇది వ్యతిరేకంగా ఒక తార్కిక వేర్హౌస్.
-DocType: Repayment Schedule,Principal Amount,ప్రధాన మొత్తం
-DocType: Employee Loan Application,Total Payable Interest,మొత్తం చెల్లించవలసిన వడ్డీ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,ప్రధాన మొత్తం
+DocType: Loan Application,Total Payable Interest,మొత్తం చెల్లించవలసిన వడ్డీ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},మొత్తం అత్యుత్తమమైన: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,సేల్స్ వాయిస్ TIMESHEET
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
 DocType: Restaurant Reservation,Restaurant Reservation,రెస్టారెంట్ రిజర్వేషన్
 DocType: Land Unit,Land Unit Name,ల్యాండ్ యూనిట్ పేరు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,ప్రతిపాదన రాయడం
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,ప్రతిపాదన రాయడం
 DocType: Payment Entry Deduction,Payment Entry Deduction,చెల్లింపు ఎంట్రీ తీసివేత
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,చుట్టి వేయు
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,ఇమెయిల్ ద్వారా కస్టమర్లకు తెలియజేయండి
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,ఇమెయిల్ ద్వారా కస్టమర్లకు తెలియజేయండి
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,మరో సేల్స్ పర్సన్ {0} అదే ఉద్యోగి ఐడితో ఉంది
 DocType: Employee Advance,Claimed Amount,దావా వేసిన మొత్తం
 apps/erpnext/erpnext/config/education.py +180,Masters,మాస్టర్స్
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","చెల్లింపు గేట్వే ఖాతా సృష్టించలేదు, దయచేసి ఒక్క సృష్టించడానికి."
 DocType: Supplier Scorecard,Per Year,సంవత్సరానికి
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB ప్రకారం ఈ కార్యక్రమంలో ప్రవేశానికి అర్హత లేదు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
 DocType: Sales Invoice,Sales Taxes and Charges,సేల్స్ పన్నులు మరియు ఆరోపణలు
 DocType: Employee,Organization Profile,ఆర్గనైజేషన్ ప్రొఫైల్
 DocType: Vital Signs,Height (In Meter),ఎత్తు (మీటర్లో)
 DocType: Student,Sibling Details,తోబుట్టువులు వివరాలు
 DocType: Vehicle Service,Vehicle Service,వాహనం సర్వీస్
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,స్వయంచాలకంగా పరిస్థితులు ఆధారంగా చూడు అభ్యర్థన మీటలు.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,స్వయంచాలకంగా పరిస్థితులు ఆధారంగా చూడు అభ్యర్థన మీటలు.
 DocType: Employee,Reason for Resignation,రాజీనామా కారణం
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,పనితీరు అంచనాలు కోసం టెంప్లేట్.
 DocType: Sales Invoice,Credit Note Issued,క్రెడిట్ గమనిక జారీచేయబడింది
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,నిర్వహణ షెడ్యూల్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","అప్పుడు ధర నిబంధనలకు మొదలైనవి కస్టమర్, కస్టమర్ గ్రూప్, భూభాగం, సరఫరాదారు, సరఫరాదారు పద్ధతి, ప్రచారం, అమ్మకపు భాగస్వామిగా ఆధారంగా వడకట్టేస్తుంది"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,ఇన్వెంటరీ నికర మార్పును
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ఉద్యోగి లోన్ మేనేజ్మెంట్
 DocType: Employee,Passport Number,పాస్పోర్ట్ సంఖ్య
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 తో రిలేషన్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,మేనేజర్
 DocType: Payment Entry,Payment From / To,చెల్లింపు / నుండి
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,మరియు &#39;గ్రూప్ ద్వారా&#39; &#39;ఆధారంగా&#39; అదే ఉండకూడదు
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,మెటీరియల్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,మార్గాన్ని కనుగొనలేకపోయాము
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),ఓపెనింగ్ (డాక్టర్)
+DocType: Loan,Applicant,దరఖాస్తుదారు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},పోస్టింగ్ స్టాంప్ తర్వాత ఉండాలి {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,పునరావృత పత్రాలను చేయడానికి
 ,GST Itemised Purchase Register,జిఎస్టి వర్గీకరించబడ్డాయి కొనుగోలు నమోదు
 DocType: Course Scheduling Tool,Reschedule,వాయిదా
-DocType: Employee Loan,Total Interest Payable,చెల్లించవలసిన మొత్తం వడ్డీ
+DocType: Loan,Total Interest Payable,చెల్లించవలసిన మొత్తం వడ్డీ
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,అడుగుపెట్టాయి ఖర్చు పన్నులు మరియు ఆరోపణలు
 DocType: Work Order Operation,Actual Start Time,వాస్తవ ప్రారంభ సమయం
 DocType: BOM Operation,Operation Time,ఆపరేషన్ సమయం
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,ముగించు
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,బేస్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,బేస్
 DocType: Timesheet,Total Billed Hours,మొత్తం కస్టమర్లకు గంటలు
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
 DocType: Leave Block List Allow,Allow User,వాడుకరి అనుమతించు
 DocType: Journal Entry,Bill No,బిల్ లేవు
 DocType: Company,Gain/Loss Account on Asset Disposal,ఆస్తి తొలగింపు లాభపడిన / నష్టం ఖాతా
 DocType: Vehicle Log,Service Details,సర్వీస్ వివరాలు
 DocType: Vehicle Log,Service Details,సర్వీస్ వివరాలు
-DocType: Subscription,Quarterly,క్వార్టర్లీ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,గుంపు
 DocType: Selling Settings,Delivery Note Required,డెలివరీ గమనిక లు
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,సమయ పట్టిక
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush రా మెటీరియల్స్ బేస్డ్ న
 DocType: Sales Invoice,Port Code,పోర్ట్ కోడ్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,రిజర్వ్ వేర్హౌస్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,రిజర్వ్ వేర్హౌస్
 DocType: Lead,Lead is an Organization,లీడ్ ఒక సంస్థ
 DocType: Guardian Interest,Interest,వడ్డీ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ప్రీ సేల్స్
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,అకౌంట్స్
 DocType: Vehicle,Odometer Value (Last),ఓడోమీటార్ విలువ (చివరి)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,సరఫరాదారు స్కోర్కార్డు ప్రమాణాల యొక్క టెంప్లేట్లు.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,మార్కెటింగ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,మార్కెటింగ్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,చెల్లింపు ఎంట్రీ ఇప్పటికే రూపొందించినవారు ఉంటుంది
 DocType: Request for Quotation,Get Suppliers,సరఫరాదారులు పొందండి
 DocType: Purchase Receipt Item Supplied,Current Stock,ప్రస్తుత స్టాక్
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
 DocType: Account,Expenses Included In Valuation,ఖర్చులు విలువలో
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,మీ సభ్యత్వం 30 రోజుల్లో ముగుస్తుంది ఉంటే మీరు మాత్రమే పునరుద్ధరించవచ్చు
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,మీకు క్యాష్ ఫ్లో ఫ్లాపర్ మ్యాపర్ పత్రాలు ఉంటే మాత్రమే ఎంచుకోండి
 DocType: Email Digest,Next email will be sent on:,తదుపరి ఇమెయిల్ పంపబడుతుంది:
 DocType: Supplier Scorecard,Per Week,వారానికి
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,అంశం రకాల్లో.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,మొత్తం విద్యార్థి
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],ఫిషియర్ డెస్ ఈక్విట్రర్స్ కాంపెబుల్స్ [FEC]
 DocType: Journal Entry,Credit Card Entry,క్రెడిట్ కార్డ్ ఎంట్రీ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,కంపెనీ మరియు అకౌంట్స్
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,విలువ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,విలువ
 DocType: Asset Settings,Depreciation Options,తరుగుదల ఐచ్ఛికాలు
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,చెల్లని పోస్ట్ సమయం
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,చెల్లని పోస్ట్ సమయం
 DocType: Lead,Campaign Name,ప్రచారం పేరు
 DocType: Hotel Room,Capacity,కెపాసిటీ
 DocType: Selling Settings,Close Opportunity After Days,అవకాశ డేస్ తర్వాత దగ్గరి
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ సంఖ్య
 DocType: Budget,Budget Against,బడ్జెట్ వ్యతిరేకంగా
 DocType: Employee,Cell Number,సెల్ సంఖ్య
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ఇవ్వబడిన ప్రమాణాలకు ఉద్యోగి లేదు. జీతం స్లిప్స్ ఇప్పటికే సృష్టించబడలేదు అని తనిఖీ చేయండి.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ఇవ్వబడిన ప్రమాణాలకు ఉద్యోగి లేదు. జీతం స్లిప్స్ ఇప్పటికే సృష్టించబడలేదు అని తనిఖీ చేయండి.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ఆటో మెటీరియల్ అభ్యర్థనలు రూపొందించినవి
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,లాస్ట్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,మీరు కాలమ్ &#39;జర్నల్ ఎంట్రీ వ్యతిరేకంగా&#39; ప్రస్తుత రసీదును ఎంటర్ కాదు
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,దయచేసి ఒక పట్టికను ఎంచుకోండి
 DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} &#39;గ్రహీతలు&#39; లో చెల్లని ఇమెయిల్ చిరునామా
 DocType: Special Test Items,Particulars,వివరముల
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
 DocType: Student,A+,ఒక +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","అదే ప్రమాణాల బహుళ ధర రూల్స్ ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి వివాద పరిష్కారం దయచేసి. ధర నియమాలు: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
 DocType: Asset,Maintenance,నిర్వహణ
+DocType: Subscriber,Subscriber,సబ్స్క్రయిబర్
 DocType: Item Attribute Value,Item Attribute Value,అంశం విలువను ఆపాదించే
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,దయచేసి మీ ప్రాజెక్ట్ స్థితిని నవీకరించండి
 DocType: Item,Maximum sample quantity that can be retained,నిలబెట్టుకోగల గరిష్ట నమూనా పరిమాణం
@@ -1058,26 +1054,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,షాపింగ్ కార్ట్ డిఫాల్ట్ సెట్టింగులను
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,టైమ్స్ లాట్లను జోడించు
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},ఆస్తి జర్నల్ ఎంట్రీ ద్వారా చిత్తు {0}
-DocType: Employee Loan,Interest Income Account,వడ్డీ ఆదాయం ఖాతా
+DocType: Loan,Interest Income Account,వడ్డీ ఆదాయం ఖాతా
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ఆహ్వానం పంపండి సమీక్షించండి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,బయోటెక్నాలజీ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ఆఫీసు నిర్వహణ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ఆఫీసు నిర్వహణ ఖర్చులు
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,వెళ్ళండి
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ఇమెయిల్ ఖాతా ఏర్పాటు
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,మొదటి అంశం నమోదు చేయండి
 DocType: Asset Repair,Downtime,డౌన్టైం
 DocType: Account,Liability,బాధ్యత
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,అకడమిక్ టర్మ్:
 DocType: Salary Detail,Do not include in total,మొత్తంలో చేర్చవద్దు
 DocType: Company,Default Cost of Goods Sold Account,గూడ్స్ సోల్డ్ ఖాతా యొక్క డిఫాల్ట్ ఖర్చు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},నమూనా పరిమాణం {0} పొందింది కంటే ఎక్కువ కాదు {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,ధర జాబితా ఎంచుకోలేదు
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Request for Quotation Supplier,Send Email,ఇమెయిల్ పంపండి
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
 DocType: Item,Max Sample Quantity,మాక్స్ నమూనా పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,అనుమతి లేదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,అనుమతి లేదు
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,కోట్ అభ్యర్థించబడింది
 DocType: Vital Signs,Heart Rate / Pulse,హార్ట్ రేట్ / పల్స్
 DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
@@ -1088,12 +1084,11 @@
 DocType: Item,Items with higher weightage will be shown higher,అధిక వెయిటేజీ ఉన్న అంశాలు అధికంగా చూపబడుతుంది
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,ల్యాబ్ పరీక్షలు మరియు ముఖ్యమైన సంకేతాలు
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,బ్యాంక్ సయోధ్య వివరాలు
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ఏ ఉద్యోగి దొరకలేదు
-DocType: Subscription,Stopped,ఆగిపోయింది
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,ప్రాజెక్ట్ అప్డేట్.
 DocType: SMS Center,All Customer Contact,అన్ని కస్టమర్ సంప్రదించండి
 DocType: Land Unit,Tree Details,ట్రీ వివరాలు
@@ -1143,7 +1138,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,అన్ని అంశం గుంపులు
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
 DocType: Work Order,Item To Manufacture,అంశం తయారీకి
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} స్థితి {2} ఉంది
@@ -1157,7 +1151,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","ఎంపిక చేసిన చిరునామా సేవ్ అయిన తర్వాత సవరించబడితే, ఎంపికను తీసివేయండి"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 DocType: Item,Hub Publishing Details,హబ్ ప్రచురణ వివరాలు
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
 DocType: Lab Test Template,Result Format,ఫలితం ఫార్మాట్
@@ -1167,7 +1161,7 @@
 DocType: Payroll Entry,Bimonthly,పక్ష
 DocType: Vehicle Service,Brake Pad,బ్రేక్ ప్యాడ్
 DocType: Fertilizer,Fertilizer Contents,ఎరువులు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,బిల్ మొత్తం
 DocType: Company,Registration Details,నమోదు వివరాలు
 DocType: Timesheet,Total Billed Amount,మొత్తం కస్టమర్లకు మొత్తం
@@ -1181,7 +1175,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,సేల్స్ ఆర్డర్ వద్ద బైపాస్ క్రెడిట్ పరిమితి చెక్
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,చేసిన పనికి పొగడ్తలు.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","సమర్ధించే షాపింగ్ కార్ట్ ప్రారంభించబడింది వంటి, &#39;షాపింగ్ కార్ట్ ఉపయోగించండి&#39; మరియు షాపింగ్ కార్ట్ కోసం కనీసం ఒక పన్ను రూల్ ఉండాలి"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","చెల్లింపు ఎంట్రీ {0} ఆర్డర్ {1}, ఈ వాయిస్ లో అడ్వాన్సుగా తీసుకున్నాడు తప్పకుండా తనిఖీ వ్యతిరేకంగా ముడిపడి ఉంది."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","చెల్లింపు ఎంట్రీ {0} ఆర్డర్ {1}, ఈ వాయిస్ లో అడ్వాన్సుగా తీసుకున్నాడు తప్పకుండా తనిఖీ వ్యతిరేకంగా ముడిపడి ఉంది."
 DocType: Sales Invoice Item,Stock Details,స్టాక్ వివరాలు
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ప్రాజెక్టు విలువ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,పాయింట్ ఆఫ్ అమ్మకానికి
@@ -1215,7 +1209,7 @@
 DocType: Restaurant Table,Minimum Seating,కనీస సీటింగ్
 DocType: Item Attribute,Item Attribute Values,అంశం లక్షణం విలువలు
 DocType: Examination Result,Examination Result,పరీక్ష ఫలితం
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,కొనుగోలు రసీదులు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,కొనుగోలు రసీదులు
 ,Received Items To Be Billed,స్వీకరించిన అంశాలు బిల్ టు
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,కరెన్సీ మార్పిడి రేటు మాస్టర్.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},రిఫరెన్స్ doctype యొక్క ఒక ఉండాలి {0}
@@ -1223,15 +1217,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
 DocType: Work Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,బదిలీ కోసం అంశాలు ఏవీ అందుబాటులో లేవు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,బదిలీ కోసం అంశాలు ఏవీ అందుబాటులో లేవు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),మూసివేయడం (మొత్తం + తెరవడం)
 DocType: Journal Entry,Depreciation Entry,అరుగుదల ఎంట్రీ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,మొదటి డాక్యుమెంట్ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ఈ నిర్వహణ సందర్శించండి రద్దు ముందు రద్దు మెటీరియల్ సందర్శనల {0}
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 స్టాండర్డ్
 DocType: Pricing Rule,Rate or Discount,రేటు లేదా డిస్కౌంట్
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},సీరియల్ లేవు {0} అంశం చెందినది కాదు {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},సీరియల్ లేవు {0} అంశం చెందినది కాదు {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Required ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,ఇష్టమైన
 DocType: Hub Settings,Custom Data,అనుకూల డేటా
@@ -1243,9 +1237,9 @@
 DocType: Medical Code,Medical Code Standard,మెడికల్ కోడ్ స్టాండర్డ్
 DocType: Soil Texture,Clay Composition (%),క్లే కంపోజిషన్ (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,దయచేసి పనిని కేటాయించే ముందు సేవ్ చేయండి.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,సంతులనం విలువ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,సంతులనం విలువ
 DocType: Lab Test,Lab Technician,ల్యాబ్ టెక్నీషియన్
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,సేల్స్ ధర జాబితా
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,సేల్స్ ధర జాబితా
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","తనిఖీ చేసినట్లయితే, ఒక కస్టమర్ సృష్టించబడుతుంది, రోగికి మ్యాప్ చేయబడుతుంది. ఈ కస్టమర్కు వ్యతిరేకంగా రోగి ఇన్వాయిస్లు సృష్టించబడతాయి. రోగిని సృష్టించేటప్పుడు మీరు ఇప్పటికే ఉన్న కస్టమర్ను కూడా ఎంచుకోవచ్చు."
 DocType: Bank Reconciliation,Account Currency,ఖాతా కరెన్సీ
@@ -1253,16 +1247,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,కంపెనీ లో రౌండ్ ఆఫ్ ఖాతా చెప్పలేదు దయచేసి
 DocType: Purchase Receipt,Range,రేంజ్
 DocType: Supplier,Default Payable Accounts,డిఫాల్ట్ చెల్లించవలసిన అకౌంట్స్
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
 DocType: Item Barcode,Item Barcode,అంశం బార్కోడ్
 DocType: Woocommerce Settings,Endpoints,అంత్య బిందువుల
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ఉత్పన్నం. ఆలస్యమైతే, మీరు మాన్యువల్గా దీనిని &quot;నెలవారీ రోజున పునరావృతం చేయి&quot; ఫీల్డ్ మార్చాలి"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
 DocType: Share Transfer,From Folio No,ఫోలియో నో
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},రో {0}: క్రెడిట్ ఎంట్రీ తో జతచేయవచ్చు ఒక {1}
@@ -1297,16 +1289,17 @@
 DocType: Asset,Available-for-use Date,అందుబాటులో ఉన్న వినియోగ తేదీ
 DocType: Guardian,Guardian Name,గార్డియన్ పేరు
 DocType: Cheque Print Template,Has Print Format,ప్రింట్ ఫార్మాట్ ఉంది
-DocType: Employee Loan,Sanctioned,మంజూరు
+DocType: Loan,Sanctioned,మంజూరు
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు కోసం సృష్టించబడలేదు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},రో # {0}: అంశం కోసం ఏ సీరియల్ రాయండి {1}
 DocType: Crop Cycle,Crop Cycle,పంట చక్రం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ఉత్పత్తి కట్ట అంశాలు, గిడ్డంగి, సీరియల్ లేవు మరియు బ్యాచ్ కోసం కాదు&#39; ప్యాకింగ్ జాబితా &#39;పట్టిక నుండి పరిగణించబడుతుంది. వేర్హౌస్ మరియు బ్యాచ్ ఏ &#39;ఉత్పత్తి కట్ట&#39; అంశం కోసం అన్ని ప్యాకింగ్ అంశాలను ఒకటే ఉంటే, ఆ విలువలు ప్రధాన అంశం పట్టిక ఎంటర్ చెయ్యబడతాయి, విలువలు పట్టిక &#39;జాబితా ప్యాకింగ్&#39; కాపీ అవుతుంది."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;ఉత్పత్తి కట్ట అంశాలు, గిడ్డంగి, సీరియల్ లేవు మరియు బ్యాచ్ కోసం కాదు&#39; ప్యాకింగ్ జాబితా &#39;పట్టిక నుండి పరిగణించబడుతుంది. వేర్హౌస్ మరియు బ్యాచ్ ఏ &#39;ఉత్పత్తి కట్ట&#39; అంశం కోసం అన్ని ప్యాకింగ్ అంశాలను ఒకటే ఉంటే, ఆ విలువలు ప్రధాన అంశం పట్టిక ఎంటర్ చెయ్యబడతాయి, విలువలు పట్టిక &#39;జాబితా ప్యాకింగ్&#39; కాపీ అవుతుంది."
 DocType: Student Admission,Publish on website,వెబ్ సైట్ ప్రచురించు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,సరఫరాదారు ఇన్వాయిస్ తేదీ వ్యాఖ్యలు తేదీ కన్నా ఎక్కువ ఉండకూడదు
+DocType: Subscription,Cancelation Date,రద్దు తేదీ
 DocType: Purchase Invoice Item,Purchase Order Item,ఆర్డర్ అంశం కొనుగోలు
 DocType: Agriculture Task,Agriculture Task,వ్యవసాయ పని
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,పరోక్ష ఆదాయం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,పరోక్ష ఆదాయం
 DocType: Student Attendance Tool,Student Attendance Tool,విద్యార్థి హాజరు టూల్
 DocType: Restaurant Menu,Price List (Auto created),ధర జాబితా (ఆటో సృష్టించబడింది)
 DocType: Cheque Print Template,Date Settings,తేదీ సెట్టింగులు
@@ -1333,6 +1326,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,మీటర్
 DocType: Workstation,Electricity Cost,విద్యుత్ ఖర్చు
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,ల్యాబ్ టెస్టింగ్ తేదీసమయం సేకరణ తేదీకి ముందు ఉండదు
+DocType: Subscription Plan,Cost,ఖరీదు
 DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్మదిన రిమైండర్లు పంపవద్దు
 DocType: Expense Claim,Total Advance Amount,మొత్తం అడ్వాన్స్ మొత్తం
 DocType: Delivery Stop,Estimated Arrival,అంచనా రాక
@@ -1344,15 +1338,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
 DocType: Timesheet Detail,Bill,బిల్
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,వైట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,వైట్
 DocType: SMS Center,All Lead (Open),అన్ని లీడ్ (ఓపెన్)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,మీరు తనిఖీ పెట్టెల జాబితా నుండి గరిష్టంగా ఒక ఎంపికను మాత్రమే ఎంచుకోవచ్చు.
 DocType: Purchase Invoice,Get Advances Paid,అడ్వాన్సెస్ పొందుతారు
 DocType: Item,Automatically Create New Batch,ఆటోమేటిక్గా కొత్త బ్యాచ్ సృష్టించు
 DocType: Item,Automatically Create New Batch,ఆటోమేటిక్గా కొత్త బ్యాచ్ సృష్టించు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} {1} (వరుస {2}) కి కేటాయించడం
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} {1} (వరుస {2}) కి కేటాయించడం
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,చేయండి
 DocType: Student Admission,Admission Start Date,అడ్మిషన్ ప్రారంభ తేదీ
 DocType: Journal Entry,Total Amount in Words,పదాలు లో మొత్తం పరిమాణం
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,కొత్త ఉద్యోగి
@@ -1368,7 +1362,7 @@
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 DocType: Repayment Schedule,Balance Loan Amount,సంతులనం రుణ మొత్తం
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,షెడ్యూల్ కోర్సు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,స్టాక్ ఆప్షన్స్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,స్టాక్ ఆప్షన్స్
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,కొనుగోలు ఆర్డర్లో చివరి కొనుగోలు వివరాలను పొందడం ఆపివేయి
 DocType: Journal Entry Account,Expense Claim,ఖర్చు చెప్పడం
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
@@ -1387,11 +1381,12 @@
 DocType: Packing Slip Item,Packing Slip Item,ప్యాకింగ్ స్లిప్ అంశం
 DocType: Purchase Invoice,Cash/Bank Account,క్యాష్ / బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},దయచేసి పేర్కొనండి ఒక {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,వేరియంట్ సృష్టి క్యూలో చేయబడింది.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} కోసం పని సారాంశం
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,జాబితాలో మొదటి లీవ్ అప్ప్రోవర్ డిఫాల్ట్ లీవ్ అప్రోవర్గా సెట్ చేయబడుతుంది.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Plan,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
 DocType: Training Event,Self-Study,స్వంత చదువు
@@ -1404,7 +1399,7 @@
 DocType: Workstation,Wages,వేతనాలు
 DocType: Asset Maintenance,Maintenance Manager Name,నిర్వహణ మేనేజర్ పేరు
 DocType: Agriculture Task,Urgent,అర్జంట్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},పట్టికలో వరుసగా {0} కోసం చెల్లుబాటులో రో ID పేర్కొనవచ్చు దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},పట్టికలో వరుసగా {0} కోసం చెల్లుబాటులో రో ID పేర్కొనవచ్చు దయచేసి {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,వేరియబుల్ని కనుగొనడం సాధ్యం కాదు:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,దయచేసి నంపాడ్ నుండి సవరించడానికి ఒక ఫీల్డ్ను ఎంచుకోండి
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,స్టాక్ లెడ్జర్ సృష్టించబడిన స్థిరమైన ఆస్తి అంశం కాదు.
@@ -1416,7 +1411,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,నాణ్యత తనిఖీ మూస పేరు
 DocType: Project,First Email,మొదటి ఇమెయిల్
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,సేల్స్ ఆర్డర్ / తయారైన వస్తువులు గిడ్డంగిలో రిసర్వ్డ్ వేర్హౌస్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,సెల్లింగ్ మొత్తం
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,సెల్లింగ్ మొత్తం
 DocType: Repayment Schedule,Interest Amount,వడ్డీ మొత్తం
 DocType: Serial No,Creation Document No,సృష్టి డాక్యుమెంట్ లేవు
 DocType: Share Transfer,Issue,సమస్య
@@ -1430,10 +1425,10 @@
 DocType: Tax Rule,Shipping State,షిప్పింగ్ రాష్ట్రం
 ,Projected Quantity as Source,మూల ప్రొజెక్టెడ్ పరిమాణం
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,డెలివరీ ట్రిప్
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,డెలివరీ ట్రిప్
 DocType: Student,A-,ఒక-
 DocType: Share Transfer,Transfer Type,బదిలీ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,సేల్స్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,సేల్స్ ఖర్చులు
 DocType: Consultation,Diagnosis,డయాగ్నోసిస్
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ప్రామాణిక కొనుగోలు
 DocType: GL Entry,Against,ఎగైనెస్ట్
@@ -1442,12 +1437,13 @@
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,జిప్ కోడ్
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},రుణంలో వడ్డీ ఆదాయం ఖాతాను ఎంచుకోండి {0}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
 DocType: Packing Slip,Net Weight UOM,నికర బరువు UoM
 DocType: Item,Default Supplier,డిఫాల్ట్ సరఫరాదారు
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ఉత్పత్తి అలవెన్స్ శాతం పైగా
-DocType: Employee Loan,Repayment Schedule,తిరిగి చెల్లించే షెడ్యూల్
+DocType: Loan,Repayment Schedule,తిరిగి చెల్లించే షెడ్యూల్
 DocType: Shipping Rule Condition,Shipping Rule Condition,షిప్పింగ్ రూల్ కండిషన్
 DocType: Holiday List,Get Weekly Off Dates,వీక్లీ ఆఫ్ తేదీలు పొందండి
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ముగింపు తేదీ ప్రారంభ తేదీ కంటే తక్కువ ఉండకూడదు
@@ -1462,7 +1458,7 @@
 DocType: Education Settings,Attendance Freeze Date,హాజరు ఫ్రీజ్ తేదీ
 DocType: Education Settings,Attendance Freeze Date,హాజరు ఫ్రీజ్ తేదీ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,మీ సరఫరాదారులు కొన్ని జాబితా. వారు సంస్థలు లేదా వ్యక్తులతో కావచ్చు.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,అన్ని ఉత్పత్తులను చూడండి
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,అన్ని ఉత్పత్తులను చూడండి
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),కనీస లీడ్ వయసు (డేస్)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),కనీస లీడ్ వయసు (డేస్)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,అన్ని BOMs
@@ -1470,14 +1466,16 @@
 DocType: Expense Claim,From Employee,Employee నుండి
 DocType: Driver,Cellphone Number,సెల్ఫోన్ నంబర్
 DocType: Project,Monitor Progress,మానిటర్ ప్రోగ్రెస్
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
 DocType: Journal Entry,Make Difference Entry,తేడా ఎంట్రీ చేయండి
+DocType: Supplier Quotation,Auto Repeat Section,ఆటో రిపీట్ విభాగం
 DocType: Upload Attendance,Attendance From Date,తేదీ నుండి హాజరు
 DocType: Appraisal Template Goal,Key Performance Area,కీ పనితీరు ఏరియా
 DocType: Program Enrollment,Transportation,రవాణా
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,చెల్లని లక్షణం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} సమర్పించాలి
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},పరిమాణం కంటే తక్కువ లేదా సమానంగా ఉండాలి {0}
+DocType: Department Approver,Department Approver,డిపార్ట్మెంట్ అప్రోవేర్
 DocType: SMS Center,Total Characters,మొత్తం అక్షరాలు
 DocType: Employee Advance,Claimed,మధ్య వివాదం
 DocType: Crop,Row Spacing,రో అంతరం
@@ -1487,6 +1485,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,చెల్లింపు సయోధ్య వాయిస్
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,కాంట్రిబ్యూషన్%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","కొనుగోలు సెట్టింగులు ప్రకారం ఉంటే కొనుగోలు ఆర్డర్ అవసరం == &#39;అవును&#39;, అప్పుడు కొనుగోలు వాయిస్ సృష్టించడానికి, యూజర్ అంశం కోసం మొదటి కొనుగోలు ఆర్డర్ సృష్టించాలి {0}"
+,HSN-wise-summary of outward supplies,బాహ్య సరఫరా యొక్క HSN- వారీగా-సారాంశం
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,మీ సూచన కోసం కంపెనీ నమోదు సంఖ్యలు. పన్ను సంఖ్యలు మొదలైనవి
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
@@ -1500,7 +1499,7 @@
 DocType: Setup Progress Action,Action Name,చర్య పేరు
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ప్రారంభ సంవత్సరం
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},మొదటి 2 GSTIN అంకెలు రాష్ట్ర సంఖ్య తో మ్యాచ్ ఉండాలి {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,ప్రస్తుత వాయిస్ యొక్క కాలం తేదీ ప్రారంభించండి
 DocType: Salary Slip,Leave Without Pay,పే లేకుండా వదిలి
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
@@ -1518,26 +1517,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,క్షేత్రాలు సృష్టి సమయంలో మాత్రమే కాపీ చేయబడతాయి.
 DocType: Setup Progress Action,Domains,డొమైన్స్
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;అసలు ప్రారంభ తేదీ&#39; &#39;వాస్తవిక ముగింపు తేదీ&#39; కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,మేనేజ్మెంట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,మేనేజ్మెంట్
 DocType: Cheque Print Template,Payer Settings,చెల్లింపుదారు సెట్టింగులు
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ఈ శ్రేణి Item కోడ్ చేర్చవలసి ఉంటుంది. మీ సంక్షిప్త &quot;SM&quot; మరియు ఉదాహరణకు, అంశం కోడ్ &quot;T- షర్టు&quot;, &quot;T- షర్టు-SM&quot; ఉంటుంది వేరియంట్ అంశం కోడ్"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,మీరు వేతనం స్లిప్ సేవ్ ఒకసారి (మాటలలో) నికర పే కనిపిస్తుంది.
 DocType: Purchase Invoice,Is Return,రాబడి
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,హెచ్చరిక
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',ప్రారంభ రోజు కంటే రోజు చాలా పెద్దది &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
 DocType: Price List Country,Price List Country,ధర జాబితా దేశం
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item కోడ్ సీరియల్ నం కోసం మారలేదు
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Item కోడ్ సీరియల్ నం కోసం మారలేదు
 DocType: Purchase Invoice Item,UOM Conversion Factor,UoM మార్పిడి ఫాక్టర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,బ్యాచ్ సంఖ్య పొందడానికి అంశం కోడ్ను నమోదు చేయండి
 DocType: Stock Settings,Default Item Group,డిఫాల్ట్ అంశం గ్రూప్
-DocType: Employee Loan,Partially Disbursed,పాక్షికంగా పంపించబడతాయి
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,సమాచారం ఇవ్వండి.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,సమాచారం ఇవ్వండి.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,సరఫరాదారు డేటాబేస్.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,మీరు రద్దు చేయని సభ్యత్వాన్ని పునఃప్రారంభించలేరు.
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
 DocType: Fee Validity,Valid Till,చెల్లుతుంది టిల్
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,మొత్తం తల్లిదండ్రుల గురువు సమావేశం
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
@@ -1550,7 +1549,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,రో # {0}: ప్యాక్ చేసిన అంశాల కొనుగోలు చూపించు నమోదు కాదు తిరస్కరించబడిన
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ఎంచుకున్న కస్టమర్ కోసం కస్టమర్ సమూహాన్ని మార్చడం అనుమతించబడదు.
 ,Purchase Order Items To Be Billed,కొనుగోలు ఆర్డర్ అంశాలు బిల్ టు
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,అంచనా రాక సమయాన్ని నవీకరిస్తోంది.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,అంచనా రాక సమయాన్ని నవీకరిస్తోంది.
 DocType: Program Enrollment Tool,Enrollment Details,నమోదు వివరాలు
 DocType: Purchase Invoice Item,Net Rate,నికర రేటు
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,దయచేసి కస్టమర్ను ఎంచుకోండి
@@ -1570,18 +1569,20 @@
 DocType: Global Defaults,Current Fiscal Year,ప్రస్తుత ఆర్థిక సంవత్సరం
 DocType: Purchase Order,Group same items,గ్రూప్ అదే అంశాలను
 DocType: Purchase Invoice,Disable Rounded Total,నున్నటి మొత్తం ఆపివేయి
-DocType: Employee Loan Application,Repayment Info,తిరిగి చెల్లించే సమాచారం
+DocType: Department,Parent Department,పేరెంట్ డిపార్ట్మెంట్
+DocType: Loan Application,Repayment Info,తిరిగి చెల్లించే సమాచారం
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&#39;ఎంట్రీలు&#39; ఖాళీగా ఉండకూడదు
 DocType: Maintenance Team Member,Maintenance Role,నిర్వహణ పాత్ర
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},తో నకిలీ వరుసగా {0} అదే {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},తో నకిలీ వరుసగా {0} అదే {1}
 ,Trial Balance,ట్రయల్ బ్యాలెన్స్
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ఉద్యోగులు ఏర్పాటు
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,హోటల్ రిజర్వేషన్ వినియోగదారు
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,రీసెర్చ్
+DocType: Subscription Settings,Subscription Settings,చందా సెట్టింగులు
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,రీసెర్చ్
 DocType: Maintenance Visit Purpose,Work Done,పని చేసారు
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,గుణాలు పట్టిక లో కనీసం ఒక లక్షణం రాయండి
 DocType: Announcement,All Students,అన్ని స్టూడెంట్స్
@@ -1592,19 +1593,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
 DocType: Crop Cycle,Less than a year,ఒక సంవత్సరం కంటే తక్కువ
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,స్టూడెంట్ మొబైల్ నెంబరు
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ప్రపంచంలోని మిగిలిన
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
 DocType: Crop,Yield UOM,దిగుబడి UOM
 ,Budget Variance Report,బడ్జెట్ విస్తృతి నివేదిక
 DocType: Salary Slip,Gross Pay,స్థూల పే
 DocType: Item,Is Item from Hub,హబ్ నుండి అంశం
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,రో {0}: కార్యాచరణ టైప్ తప్పనిసరి.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,డివిడెండ్ చెల్లించిన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,డివిడెండ్ చెల్లించిన
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,అకౌంటింగ్ లెడ్జర్
 DocType: Stock Reconciliation,Difference Amount,తేడా సొమ్ము
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},డాక్ మీద {0} {1}
 DocType: Purchase Invoice,Reverse Charge,ఛార్జ్ రివర్స్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,అలాగే సంపాదన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,అలాగే సంపాదన
 DocType: Purchase Invoice,05-Change in POS,05-POS లో మార్చండి
 DocType: Vehicle Log,Service Detail,సర్వీస్ వివరాలు
 DocType: BOM,Item Description,వస్తువు వివరణ
@@ -1619,12 +1620,12 @@
 DocType: Opportunity Item,Opportunity Item,అవకాశం అంశం
 ,Student and Guardian Contact Details,స్టూడెంట్ మరియు గార్డియన్ సంప్రదించాల్సిన
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,రో {0}: సరఫరాదారు కోసం {0} ఇమెయిల్ అడ్రసు పంపించవలసిన అవసరం ఉంది
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,తాత్కాలిక ప్రారంభోత్సవం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,తాత్కాలిక ప్రారంభోత్సవం
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,హబ్ చూడండి
 ,Employee Leave Balance,ఉద్యోగి సెలవు సంతులనం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
 DocType: Patient Appointment,More Info,మరింత సమాచారం
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},వరుసగా అంశం అవసరం వాల్యువేషన్ రేటు {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},వరుసగా అంశం అవసరం వాల్యువేషన్ రేటు {0}
 DocType: Supplier Scorecard,Scorecard Actions,స్కోర్కార్డ్ చర్యలు
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ఉదాహరణ: కంప్యూటర్ సైన్స్ మాస్టర్స్
 DocType: Purchase Invoice,Rejected Warehouse,తిరస్కరించబడిన వేర్హౌస్
@@ -1634,7 +1635,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,కు
 DocType: Supplier Quotation Item,Lead Time in days,రోజుల్లో ప్రధాన సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,చెల్లించవలసిన ఖాతాలు సారాంశం
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} నుండి జీతం చెల్లింపు {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} నుండి జీతం చెల్లింపు {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
 DocType: Journal Entry,Get Outstanding Invoices,అసాధారణ ఇన్వాయిస్లు పొందండి
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
@@ -1643,9 +1644,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ల్యాబ్ టెస్ట్ ప్రిస్క్రిప్షన్స్
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,చిన్న
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,చిన్న
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,వాయిస్ సృష్టి సాధనం అంశం తెరవడం
 DocType: Education Settings,Employee Number,Employee సంఖ్య
+DocType: Subscription Settings,Cancel Invoice After Grace Period,గ్రేస్ పీరియడ్ తర్వాత వాయిస్ రద్దు చేయండి
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},కేస్ లేదు (s) ఇప్పటికే ఉపయోగంలో ఉంది. కేస్ నో నుండి ప్రయత్నించండి {0}
 DocType: Project,% Completed,% పూర్తయింది
 ,Invoiced Amount (Exculsive Tax),ఇన్వాయిస్ మొత్తం (Exculsive పన్ను)
@@ -1659,7 +1661,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ప్రయోగశాల టెస్టింగ్ డేటైమ్
 DocType: Email Digest,Add Quote,కోట్ జోడించండి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UoM అవసరం UoM coversion ఫ్యాక్టర్: {0} Item లో: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,పరోక్ష ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,పరోక్ష ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,రో {0}: Qty తప్పనిసరి
 DocType: Agriculture Analysis Criteria,Agriculture,వ్యవసాయం
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
@@ -1690,16 +1692,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,రాజధాని పరికరాలు
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,రాజధాని పరికరాలు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ &#39;న వర్తించు&#39;."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,దయచేసి మొదటి అంశం కోడ్ను సెట్ చేయండి
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
+DocType: Subscription Plan,Billing Interval Count,బిల్లింగ్ విరామం కౌంట్
 DocType: Sales Invoice Item,Edit Description,ఎడిట్ వివరణ
 DocType: Antibiotic,Antibiotic,యాంటిబయోటిక్
 ,Team Updates,టీమ్ నవీకరణలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,సరఫరాదారు కోసం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,సరఫరాదారు కోసం
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ఖాతా రకం చేస్తోంది లావాదేవీలు ఈ ఖాతా ఎంచుకోవడం లో సహాయపడుతుంది.
 DocType: Purchase Invoice,Grand Total (Company Currency),గ్రాండ్ మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ప్రింట్ ఫార్మాట్ సృష్టించు
@@ -1725,7 +1728,7 @@
 DocType: POS Item Group,POS Item Group,POS అంశం గ్రూప్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,సారాంశ ఇమెయిల్:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,ప్రత్యామ్నాయ అంశం అంశం కోడ్ వలె ఉండకూడదు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
 DocType: Sales Partner,Target Distribution,టార్గెట్ పంపిణీ
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-తాత్కాలిక అంచనా యొక్క తుది నిర్ణయం
 DocType: Salary Slip,Bank Account No.,బ్యాంక్ ఖాతా నంబర్
@@ -1742,7 +1745,7 @@
 DocType: BOM Operation,Workstation,కార్యక్షేత్ర
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,కొటేషన్ సరఫరాదారు కోసం అభ్యర్థన
 DocType: Healthcare Settings,Registration Message,నమోదు సందేశం
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,హార్డ్వేర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,హార్డ్వేర్
 DocType: Prescription Dosage,Prescription Dosage,ప్రిస్క్రిప్షన్ మోతాదు
 DocType: Attendance,HR Manager,HR మేనేజర్
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
@@ -1773,7 +1776,7 @@
 DocType: Project,Start and End Dates,ప్రారంభం మరియు తేదీలు ఎండ్
 ,Delivered Items To Be Billed,పంపిణీ అంశాలు బిల్ టు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},ఓపెన్ BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,వేర్హౌస్ సీరియల్ నం కోసం మారలేదు
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,వేర్హౌస్ సీరియల్ నం కోసం మారలేదు
 DocType: Authorization Rule,Average Discount,సగటు డిస్కౌంట్
 DocType: Project Update,Great/Quickly,గ్రేట్ / త్వరగా
 DocType: Purchase Invoice Item,UOM,UoM
@@ -1782,8 +1785,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,దయచేసి సమూహం చేయబడిన అంశం వంతులవారీగా ఎంచుకోండి
 DocType: Asset,Depreciation Schedules,అరుగుదల షెడ్యూల్స్
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST సెట్టింగులలో తరువాత ఖాతాలను ఎంచుకోవచ్చు:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST సెట్టింగులలో తరువాత ఖాతాలను ఎంచుకోవచ్చు:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
 DocType: Activity Cost,Projects,ప్రాజెక్ట్స్
 DocType: Payment Request,Transaction Currency,లావాదేవీ కరెన్సీ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},నుండి {0} | {1} {2}
@@ -1794,6 +1797,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,కనీస డైలీ అవుట్గోయింగ్
 DocType: POS Profile,Campaign,ప్రచారం
 DocType: Supplier,Name and Type,పేరు మరియు టైప్
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',ఆమోద స్థితి &#39;అప్రూవ్డ్ లేదా&#39; తిరస్కరించింది &#39;తప్పక
 DocType: Physician,Contacts and Address,కాంటాక్ట్స్ మరియు చిరునామా
 DocType: Purchase Invoice,Contact Person,పర్సన్ సంప్రదించండి
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ఊహించిన ప్రారంభం తేది&#39; కంటే ఎక్కువ &#39;ఊహించినది ముగింపు తేదీ&#39; ఉండకూడదు
@@ -1807,19 +1811,20 @@
 DocType: Student Admission,Eligibility and Details,అర్హతలు మరియు వివరాలు
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,స్థిర ఆస్తి నికర మార్పును
 DocType: Leave Control Panel,Leave blank if considered for all designations,అన్ని వివరణలకు భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},మాక్స్: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,తేదీసమయం నుండి
 DocType: Email Digest,For Company,కంపెనీ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,కమ్యూనికేషన్ లాగ్.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","కొటేషన్ కోసం అభ్యర్థన చెక్ పోర్టల్ అమర్పులను కోసం, పోర్టల్ నుండి యాక్సెస్ నిలిపివేయబడింది."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,సరఫరాదారు స్కోర్కార్డ్ స్కోరింగ్ వేరియబుల్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,కొనుగోలు సొమ్ము
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,కొనుగోలు సొమ్ము
 DocType: Sales Invoice,Shipping Address Name,షిప్పింగ్ చిరునామా పేరు
 DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,కోర్సు షెడ్యూల్ను సృష్టించే లోపాలు ఉన్నాయి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,జాబితాలోని మొదటి ఖర్చు అప్ప్రోవర్ డిఫాల్ట్ వ్యయ అప్ప్రోవర్గా సెట్ చేయబడుతుంది.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
@@ -1840,14 +1845,15 @@
 DocType: Package Code,Package Code,ప్యాకేజీ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,అప్రెంటిస్
 DocType: Purchase Invoice,Company GSTIN,కంపెనీ GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,ప్రతికూల పరిమాణం అనుమతి లేదు
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,ప్రతికూల పరిమాణం అనుమతి లేదు
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",ఒక స్ట్రింగ్ వంటి అంశం మాస్టర్ నుండి తెచ్చిన మరియు ఈ రంగంలో నిల్వ పన్ను వివరాలు పట్టిక. పన్నులు మరియు ఆరోపణలు వాడిన
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ఖాతా ఘనీభవించిన ఉంటే ప్రవేశాలు పరిమితం వినియోగదారులు అనుమతించబడతాయి.
 DocType: Email Digest,Bank Balance,బ్యాంకు బ్యాలెన్స్
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,లీవ్ దరఖాస్తులో ఆమోదం తప్పనిసరి వదిలి
 DocType: Job Opening,"Job profile, qualifications required etc.","జాబ్ ప్రొఫైల్, అర్హతలు అవసరం మొదలైనవి"
 DocType: Journal Entry Account,Account Balance,ఖాతా నిలువ
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
@@ -1875,15 +1881,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,వరుసలో {0} చెల్లింపు టర్మ్ బహుశా నకిలీ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),వ్యవసాయం (బీటా)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,ప్యాకింగ్ స్లిప్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,ఆఫీసు రెంట్
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ఆఫీసు రెంట్
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
 DocType: Disease,Common Name,సాధారణ పేరు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,దిగుమతి విఫలమైంది!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ఏ చిరునామా ఇంకా జోడించారు.
 DocType: Workstation Working Hour,Workstation Working Hour,కార్యక్షేత్ర పని గంట
 DocType: Vital Signs,Blood Pressure,రక్తపోటు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,అనలిస్ట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,అనలిస్ట్
 DocType: Item,Inventory,ఇన్వెంటరీ
 DocType: Item,Sales Details,సేల్స్ వివరాలు
 DocType: Quality Inspection,QI-,QI-
@@ -1893,15 +1899,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,స్టూడెంట్ గ్రూప్ లో స్టూడెంట్స్ కోసం చేరాడు కోర్సు ప్రమాణీకరించు
 DocType: Notification Control,Expense Claim Rejected,ఖర్చుల వాదనను త్రోసిపుచ్చాడు
 DocType: Item,Item Attribute,అంశం లక్షణం
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,ప్రభుత్వం
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,ప్రభుత్వం
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ఖర్చు చెప్పడం {0} ఇప్పటికే వాహనం లోనికి ప్రవేశించండి ఉంది
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ఇన్స్టిట్యూట్ పేరు
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,తిరిగి చెల్లించే మొత్తాన్ని నమోదు చేయండి
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,తిరిగి చెల్లించే మొత్తాన్ని నమోదు చేయండి
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,అంశం రకరకాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,సర్వీసులు
 DocType: HR Settings,Email Salary Slip to Employee,ఉద్యోగి ఇమెయిల్ వేతనం స్లిప్
 DocType: Cost Center,Parent Cost Center,మాతృ ఖర్చు సెంటర్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,సాధ్యమైన సరఫరాదారు ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,సాధ్యమైన సరఫరాదారు ఎంచుకోండి
 DocType: Sales Invoice,Source,మూల
 DocType: Customer,"Select, to make the customer searchable with these fields","ఎంచుకోండి, ఈ రంగాలతో కస్టమర్ వెతకడానికి"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,మూసి షో
@@ -1918,7 +1924,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,రద్దు ప్యాకింగ్ స్లిప్ (లు)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ
 DocType: Program Course,Program Course,ప్రోగ్రామ్ కోర్సు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు
 DocType: Homepage,Company Tagline for website homepage,వెబ్సైట్ హోమ్ కోసం కంపెనీ ట్యాగ్లైన్
 DocType: Item Group,Item Group Name,అంశం గ్రూప్ పేరు
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,తీసుకోబడినది
@@ -1948,10 +1954,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership వివరాలు
 DocType: Leave Block List,Block Holidays on important days.,ముఖ్యమైన రోజులు బ్లాక్ సెలవులు.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),దయచేసి అవసరమైన అన్ని ఫలితం విలువ (లు) ఇన్పుట్ చేయండి
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,స్వీకరించదగిన ఖాతాలు సారాంశం
-DocType: Employee Loan,Monthly Repayment Amount,మంత్లీ నంతవరకు మొత్తం
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,స్వీకరించదగిన ఖాతాలు సారాంశం
+DocType: Loan,Monthly Repayment Amount,మంత్లీ నంతవరకు మొత్తం
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,ఇన్వాయిస్లు తెరవడం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Employee పాత్ర సెట్ ఒక ఉద్యోగి రికార్డు వాడుకరి ID రంగంలో సెట్ చెయ్యండి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Employee పాత్ర సెట్ ఒక ఉద్యోగి రికార్డు వాడుకరి ID రంగంలో సెట్ చెయ్యండి
 DocType: UOM,UOM Name,UoM పేరు
 DocType: GST HSN Code,HSN Code,HSN కోడ్
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,చందా మొత్తాన్ని
@@ -1973,7 +1979,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},వాడుకరి {0} ఇప్పటికే వైద్యుడికి కేటాయించబడింది {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,బాక్స్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,సాధ్యమైన సరఫరాదారు
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,సాధ్యమైన సరఫరాదారు
+DocType: Journal Entry,JV-RET-,జెవి-RET-
 DocType: Budget,Monthly Distribution,మంత్లీ పంపిణీ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,స్వీకర్త జాబితా ఖాళీగా ఉంది. స్వీకర్త జాబితా సృష్టించడానికి దయచేసి
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),హెల్త్కేర్ (బీటా)
@@ -2001,7 +2008,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ఏ అంశాలు సర్దుకుని
 DocType: Shipping Rule Condition,From Value,విలువ నుంచి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
-DocType: Employee Loan,Repayment Method,తిరిగి చెల్లించే విధానం
+DocType: Loan,Repayment Method,తిరిగి చెల్లించే విధానం
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","తనిఖీ, హోమ్ పేజీ వెబ్సైట్ కోసం డిఫాల్ట్ అంశం గ్రూప్ ఉంటుంది"
 DocType: Quality Inspection Reading,Reading 4,4 పఠనం
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,కంపెనీ వ్యయం కోసం దావాలు.
@@ -2010,7 +2017,7 @@
 DocType: Asset Maintenance Task,Certificate Required,సర్టిఫికేట్ అవసరం
 DocType: Company,Default Holiday List,హాలిడే జాబితా డిఫాల్ట్
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},రో {0}: నుండి సమయం మరియు సమయం {1} తో కలిసిపోయే ఉంది {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,స్టాక్ బాధ్యతలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,స్టాక్ బాధ్యతలు
 DocType: Purchase Invoice,Supplier Warehouse,సరఫరాదారు వేర్హౌస్
 DocType: Opportunity,Contact Mobile No,సంప్రదించండి మొబైల్ లేవు
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,కంపెనీని ఎంచుకోండి
@@ -2018,7 +2025,7 @@
 DocType: Student Report Generation Tool,Print Section,విభాగం ముద్రించు
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,వాడుకరి {0} కు ఎటువంటి డిఫాల్ట్ POS ప్రొఫైల్ లేదు. ఈ వాడుకరి కోసం రో {1} వద్ద డిఫాల్ట్ తనిఖీ చేయండి.
 DocType: Student Group,Set 0 for no limit,ఎటువంటి పరిమితి 0 సెట్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Row {idx}: {field} తెరవడం {invoice_type} ఇన్వాయిస్లు సృష్టించడానికి అవసరం
 DocType: Customer,Primary Address and Contact Detail,ప్రాథమిక చిరునామా మరియు సంప్రదింపు వివరాలు
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
@@ -2029,10 +2036,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,దయచేసి కనీసం ఒక డొమైన్ని ఎంచుకోండి.
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ముందుగానే X రోజులు కార్యకలాపాలు ప్రణాళిక ప్రయత్నించండి.
 DocType: HR Settings,Stop Birthday Reminders,ఆపు జన్మదిన రిమైండర్లు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,శోధన అంశం
 DocType: Payment Schedule,Payment Amount,చెల్లింపు మొత్తం
@@ -2042,7 +2049,7 @@
 DocType: Assessment Plan,Grading Scale,గ్రేడింగ్ స్కేల్
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,ఇప్పటికే పూర్తి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,చేతిలో స్టాక్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,చేతిలో స్టాక్
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,దిగుమతి విజయవంతమైంది!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,జారీచేయబడింది వస్తువుల ధర
@@ -2053,17 +2060,16 @@
 DocType: Quotation Item,Quotation Item,కొటేషన్ అంశం
 DocType: Customer,Customer POS Id,కస్టమర్ POS Id
 DocType: Account,Account Name,ఖాతా పేరు
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,తేదీ తేదీ కంటే ఎక్కువ ఉండకూడదు నుండి
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,సీరియల్ లేవు {0} పరిమాణం {1} ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,తేదీ తేదీ కంటే ఎక్కువ ఉండకూడదు నుండి
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,సీరియల్ లేవు {0} పరిమాణం {1} ఒక భిన్నం ఉండకూడదు
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,దయచేసి Woocommerce Server URL ను నమోదు చేయండి
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,సరఫరాదారు టైప్ మాస్టర్.
 DocType: Purchase Order Item,Supplier Part Number,సరఫరాదారు పార్ట్ సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,మార్పిడి రేటు 0 లేదా 1 ఉండకూడదు
 DocType: Share Balance,To No,లేదు
-DocType: Subscription,Reference Document,రిఫరెన్స్ డాక్యుమెంట్
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} రద్దు లేదా ఆగిపోయిన
 DocType: Accounts Settings,Credit Controller,క్రెడిట్ కంట్రోలర్
-DocType: Grant Application,Applicant Type,అభ్యర్థి రకం
+DocType: Loan,Applicant Type,అభ్యర్థి రకం
 DocType: Purchase Invoice,03-Deficiency in services,సేవలలో 03-డెఫిషియన్సీ
 DocType: Delivery Note,Vehicle Dispatch Date,వాహనం డిస్పాచ్ తేదీ
 DocType: Healthcare Settings,Default Medical Code Standard,డిఫాల్ట్ మెడికల్ కోడ్ స్టాండర్డ్
@@ -2074,13 +2080,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% కస్టమర్లకు
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,ప్రత్యేకించుకోవడమైనది ప్యాక్ చేసిన అంశాల
 DocType: Party Account,Party Account,పార్టీ ఖాతా
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,మానవ వనరులు
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,మానవ వనరులు
 DocType: Lead,Upper Income,ఉన్నత ఆదాయపు
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,తిరస్కరించు
 DocType: Journal Entry Account,Debit in Company Currency,కంపెనీ కరెన్సీ లో డెబిట్
 DocType: BOM Item,BOM Item,బిఒఎం అంశం
 DocType: Appraisal,For Employee,Employee కొరకు
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,చెల్లించుట ఎంట్రీ చేయండి
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,చెల్లించుట ఎంట్రీ చేయండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,రో {0}: సరఫరాదారు వ్యతిరేకంగా అడ్వాన్స్ డెబిట్ తప్పక
 DocType: Company,Default Values,డిఫాల్ట్ విలువలు
 DocType: Membership,INR,INR
@@ -2109,10 +2115,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),మొత్తం (పన్ను లేకుండా)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,లీడ్ కౌంట్
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,స్టాక్ అందుబాటులో ఉంది
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,స్టాక్ అందుబాటులో ఉంది
 DocType: Manufacturing Settings,Capacity Planning For (Days),(రోజులు) పరిమాణ ప్రణాళికా
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ప్రొక్యూర్మెంట్
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,అంశాలను ఎవరూ పరిమాణం లేదా విలువ ఏ మార్పు ఉండదు.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,అంశాలను ఎవరూ పరిమాణం లేదా విలువ ఏ మార్పు ఉండదు.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,తప్పనిసరి రంగంలో - ప్రోగ్రామ్
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,తప్పనిసరి రంగంలో - ప్రోగ్రామ్
 DocType: Special Test Template,Result Component,ఫలితం భాగం
@@ -2133,7 +2139,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,ఆకులు ఆకులు లోపల సెలవులు చేర్చండి
 DocType: Sales Invoice,Packed Items,ప్యాక్ చేసిన అంశాలు
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,సీరియల్ నంబర్ వ్యతిరేకంగా వారంటీ దావా
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;మొత్తం&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;మొత్తం&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,షాపింగ్ కార్ట్ ప్రారంభించు
 DocType: Employee,Permanent Address,శాశ్వత చిరునామా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2151,10 +2157,10 @@
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,చర్యను నిర్థారించండి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,ఆన్లైన్ వేలంపాటలు
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,పరిమాణం లేదా మదింపు రేటు లేదా రెండు గాని రాయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,పరిమాణం లేదా మదింపు రేటు లేదా రెండు గాని రాయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,నిర్వాహ
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,కార్ట్ లో చూడండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,ప్రామాణిక ప్రమాణాలను సృష్టించలేరు. దయచేసి ప్రమాణాల పేరు మార్చండి
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
@@ -2177,9 +2183,9 @@
 DocType: Upload Attendance,Get Template,మూస పొందండి
 DocType: Material Request,Transferred,బదిలీ
 DocType: Vehicle,Doors,ది డోర్స్
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,పేషంట్ రిజిస్ట్రేషన్ కోసం ఫీజుని సేకరించండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,స్టాక్ లావాదేవీ తర్వాత గుణాలు మార్చలేరు. ఒక కొత్త అంశం తయారు మరియు కొత్త వస్తువుకు బదిలీ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,స్టాక్ లావాదేవీ తర్వాత గుణాలు మార్చలేరు. ఒక కొత్త అంశం తయారు మరియు కొత్త వస్తువుకు బదిలీ చేయండి
 DocType: Course Assessment Criteria,Weightage,వెయిటేజీ
 DocType: Purchase Invoice,Tax Breakup,పన్ను వేర్పాటు
 DocType: Packing Slip,PS-,PS-
@@ -2215,12 +2221,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,సయోధ్య JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,చాలా కాలమ్. నివేదిక ఎగుమతి చేయండి మరియు స్ప్రెడ్షీట్ అనువర్తనం ఉపయోగించి ప్రింట్.
 DocType: Purchase Invoice Item,Batch No,బ్యాచ్ లేవు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ఉద్యోగి అభివృద్ధి
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ఒక కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ వ్యతిరేకంగా బహుళ సేల్స్ ఆర్డర్స్ అనుమతించు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 DocType: Grant Application,Assessment  Mark (Out of 10),అసెస్మెంట్ మార్క్ (10 నుండి)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 మొబైల్ లేవు
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,ప్రధాన
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,ప్రధాన
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
@@ -2229,15 +2236,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ఫీల్డ్ నుండి అవకాశం తప్పనిసరి
 DocType: Email Digest,Annual Expenses,వార్షిక ఖర్చులు
 DocType: Item,Variants,రకరకాలు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
 DocType: Sales Team,Contribution to Net Total,నికర మొత్తం కాంట్రిబ్యూషన్
 DocType: Sales Invoice Item,Customer's Item Code,కస్టమర్ యొక్క Item కోడ్
 DocType: Stock Reconciliation,Stock Reconciliation,స్టాక్ సయోధ్య
 DocType: Territory,Territory Name,భూభాగం పేరు
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,మీరు చందాలో ఒకే బిల్లింగ్ చక్రం కలిగిన ప్లాన్లను మాత్రమే కలిగి ఉండవచ్చు
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ఒక Job కొరకు అభ్యర్ధించే.
 DocType: Purchase Order Item,Warehouse and Reference,వేర్హౌస్ మరియు సూచన
 DocType: Supplier,Statutory info and other general information about your Supplier,మీ సరఫరాదారు గురించి స్టాట్యుటరీ సమాచారం మరియు ఇతర సాధారణ సమాచారం
@@ -2248,10 +2256,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,అంచనాలు
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,శిక్షణ కార్యక్రమాలు
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},సీరియల్ అంశం ఏదీ ప్రవేశించింది నకిలీ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},సీరియల్ అంశం ఏదీ ప్రవేశించింది నకిలీ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,లీడ్ సోర్స్ ద్వారా దారితీస్తుంది ట్రాక్.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ఒక షిప్పింగ్ రూల్ ఒక పరిస్థితి
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,దయచేసి నమోదు చెయ్యండి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,దయచేసి నమోదు చెయ్యండి
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,నిర్వహణ లాగ్
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ఈ ప్యాకేజీ యొక్క నికర బరువు. (అంశాలను నికర బరువు మొత్తంగా స్వయంచాలకంగా లెక్కించిన)
@@ -2259,11 +2267,11 @@
 DocType: Sales Order,To Deliver and Bill,బట్వాడా మరియు బిల్
 DocType: Student Group,Instructors,బోధకులు
 DocType: GL Entry,Credit Amount in Account Currency,ఖాతా కరెన్సీ లో క్రెడిట్ మొత్తం
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,భాగస్వామ్యం నిర్వహణ
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,చెల్లింపు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,చెల్లింపు
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",వేర్హౌస్ {0} ఏదైనా ఖాతాకు లింక్ లేదు కంపెనీలో లేదా గిడ్డంగి రికార్డు ఖాతా సిద్ధ జాబితా ఖాతా తెలియజేస్తూ {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,మీ ఆర్డర్లను నిర్వహించండి
 DocType: Work Order Operation,Actual Time and Cost,అసలు సమయం మరియు ఖర్చు
@@ -2273,7 +2281,7 @@
 DocType: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,పై
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,అమ్మకం జరిగే సమయంలో కట్ట అంశాలు.
@@ -2283,7 +2291,7 @@
 DocType: Item,Barcodes,బార్కోడ్లు
 DocType: Hub Category,Hub Node,హబ్ నోడ్
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,మీరు నకిలీ అంశాలను నమోదు చేసారు. సరిదిద్ది మళ్లీ ప్రయత్నించండి.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,అసోసియేట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,అసోసియేట్
 DocType: Asset Movement,Asset Movement,ఆస్తి ఉద్యమం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,కార్య క్రమాన్ని {0} సమర్పించాలి
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,న్యూ కార్ట్
@@ -2301,13 +2309,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ కంపెనీ కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీకి సమానంగా ఉండాలి
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ప్యాకేజీ దూస్రా (మాత్రమే డ్రాఫ్ట్) లో ఒక భాగంగా ఉంది అని సూచిస్తుంది
 DocType: Soil Texture,Loam,లోవామ్
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,రో {0}: తేదీని పోస్ట్ చేసే ముందు తేదీ ఉండకూడదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,రో {0}: తేదీని పోస్ట్ చేసే ముందు తేదీ ఉండకూడదు
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,చెల్లింపు ఎంట్రీ చేయండి
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},అంశం పరిమాణం {0} కంటే తక్కువ ఉండాలి {1}
 ,Sales Invoice Trends,సేల్స్ వాయిస్ ట్రెండ్లులో
 DocType: Leave Application,Apply / Approve Leaves,ఆకులు ఆమోదించండి / వర్తించు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,కోసం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',లేదా &#39;మునుపటి రో మొత్తం&#39; &#39;మునుపటి రో మొత్తం మీద&#39; ఛార్జ్ రకం మాత్రమే ఉంటే వరుసగా సూచించవచ్చు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',లేదా &#39;మునుపటి రో మొత్తం&#39; &#39;మునుపటి రో మొత్తం మీద&#39; ఛార్జ్ రకం మాత్రమే ఉంటే వరుసగా సూచించవచ్చు
 DocType: Sales Order Item,Delivery Warehouse,డెలివరీ వేర్హౌస్
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,ఆర్థిక వ్యయం సెంటర్స్ చెట్టు.
 DocType: Serial No,Delivery Document No,డెలివరీ డాక్యుమెంట్ లేవు
@@ -2321,7 +2328,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,మెటీరియల్ కన్సుమ్ప్షన్ మానుఫాక్చరింగ్ సెట్టింగులలో సెట్ చేయబడలేదు.
 DocType: Student,Student Mobile Number,స్టూడెంట్ మొబైల్ నంబర్
 DocType: Item,Has Variants,రకాల్లో
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} కంటే {2} కంటే ఎక్కువ {0} వస్తువు కోసం overbill చేయలేము. అధిక బిల్లింగ్ను అనుమతించడానికి, దయచేసి స్టాక్ సెట్టింగ్ల్లో సెట్ చేయండి"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} కంటే {2} కంటే ఎక్కువ {0} వస్తువు కోసం overbill చేయలేము. అధిక బిల్లింగ్ను అనుమతించడానికి, దయచేసి స్టాక్ సెట్టింగ్ల్లో సెట్ చేయండి"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,ప్రతిస్పందనని నవీకరించండి
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
@@ -2333,12 +2340,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,మొదట కార్యక్రమం ఎంచుకోండి
 DocType: Patient Appointment,Patient Age,పేషెంట్ యుగం
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,ప్రాజెక్ట్స్ మేనేజింగ్
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,సీరియల్ సంఖ్య {0} ఇప్పటికే తిరిగి వచ్చింది
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,సీరియల్ సంఖ్య {0} ఇప్పటికే తిరిగి వచ్చింది
 DocType: Supplier,Supplier of Goods or Services.,"వస్తు, సేవల సరఫరాదారు."
 DocType: Budget,Fiscal Year,ఆర్థిక సంవత్సరం
 DocType: Asset Maintenance Log,Planned,ప్రణాళిక
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,కన్సల్టేషన్ చార్జీలను బుక్ చేయడానికి రోగిలో సెట్ చేయకపోతే డిఫాల్ట్ స్వీకరించదగిన ఖాతాలు ఉపయోగించబడతాయి.
 DocType: Vehicle Log,Fuel Price,ఇంధన ధర
+DocType: Bank Guarantee,Margin Money,మార్జిన్ మనీ
 DocType: Budget,Budget,బడ్జెట్
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ఓపెన్ సెట్
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
@@ -2352,15 +2360,15 @@
 DocType: Lead,Follow Up,అప్ అనుసరించండి
 DocType: Item,Is Sales Item,సేల్స్ Item ఉంది
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,అంశం గ్రూప్ ట్రీ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. అంశం మాస్టర్ తనిఖీ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. అంశం మాస్టర్ తనిఖీ
 DocType: Maintenance Visit,Maintenance Time,నిర్వహణ సమయం
 ,Amount to Deliver,మొత్తం అందించేందుకు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},అదే అంశం అనేకసార్లు నమోదు చేయబడింది. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ప్రారంభ తేదీ పదం సంబంధమున్న విద్యా సంవత్సరం ఇయర్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,లోపాలు ఉన్నాయి.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,లోపాలు ఉన్నాయి.
 DocType: Guardian,Guardian Interests,గార్డియన్ అభిరుచులు
 DocType: Naming Series,Current Value,కరెంట్ వేల్యూ
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
 DocType: Education Settings,Instructor Records to be created by,బోధకుడు రికార్డ్స్ సృష్టించాలి
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} రూపొందించినవారు
 DocType: GST Account,GST Account,GST ఖాతా
@@ -2379,8 +2387,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
 DocType: Website Item Group,Website Item Group,వెబ్సైట్ అంశం గ్రూప్
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,ఇష్టాలకు జోడించబడింది
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ఇప్పటికే ఎంచుకున్న ప్రమాణం లేదా జీతం స్లిప్ సమర్పించినందుకు జీతం స్లిప్ లేదు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,సుంకాలు మరియు పన్నుల
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ఇప్పటికే ఎంచుకున్న ప్రమాణం లేదా జీతం స్లిప్ సమర్పించినందుకు జీతం స్లిప్ లేదు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,సుంకాలు మరియు పన్నుల
 DocType: Projects Settings,Projects Settings,ప్రాజెక్ట్స్ సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} చెల్లింపు ఎంట్రీలు ద్వారా వడపోత కాదు {1}
@@ -2390,27 +2398,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,అంశం గుంపులు వృక్షమును నేలనుండి మొలిపించెను.
 DocType: Production Plan,Total Produced Qty,మొత్తం ఉత్పత్తి Qty
 DocType: Payroll Entry,Get Employee Details,ఉద్యోగి వివరాలు పొందండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ఈ ఛార్జ్ రకం కోసం ప్రస్తుత వరుస సంఖ్య కంటే ఎక్కువ లేదా సమాన వరుస సంఖ్య చూడండి కాదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ఈ ఛార్జ్ రకం కోసం ప్రస్తుత వరుస సంఖ్య కంటే ఎక్కువ లేదా సమాన వరుస సంఖ్య చూడండి కాదు
 DocType: Asset,Sold,సోల్డ్
 ,Item-wise Purchase History,అంశం వారీగా కొనుగోలు చరిత్ర
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
 DocType: Account,Frozen,ఘనీభవించిన
 DocType: Sales Invoice Payment,Base Amount (Company Currency),బేస్ మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,ముడి సరుకులు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,ముడి సరుకులు
 DocType: Payment Reconciliation Payment,Reference Row,రిఫరెన్స్ రో
 DocType: Installation Note,Installation Time,సంస్థాపన సమయం
 DocType: Sales Invoice,Accounting Details,అకౌంటింగ్ వివరాలు
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ఈ కంపెనీ కోసం అన్ని లావాదేవీలు తొలగించు
 DocType: Patient,O Positive,ఓ అనుకూల
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,ఇన్వెస్ట్మెంట్స్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,ఇన్వెస్ట్మెంట్స్
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,కేటాయింపులు
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,అంగీకారం ప్రమాణం
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,పైన ఇచ్చిన పట్టికలో మెటీరియల్ అభ్యర్థనలు నమోదు చేయండి
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,జర్నల్ ఎంట్రీకి తిరిగి చెల్లింపులు అందుబాటులో లేవు
 DocType: Item Attribute,Attribute Name,పేరు లక్షణం
 DocType: BOM,Show In Website,వెబ్సైట్ షో
 DocType: Shopping Cart Settings,Show Quantity in Website,లో వెబ్సైట్ పరిమాణం చూపించు
-DocType: Employee Loan Application,Total Payable Amount,మొత్తం చెల్లించవలసిన సొమ్ము
+DocType: Loan Application,Total Payable Amount,మొత్తం చెల్లించవలసిన సొమ్ము
 DocType: Task,Expected Time (in hours),(గంటల్లో) ఊహించినది సమయం
 DocType: Item Reorder,Check in (group),లో చెక్ (గ్రూపు)
 DocType: Soil Texture,Silt,సిల్ట్
@@ -2429,7 +2438,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,చెల్లింపు చేయండి
 DocType: Room,Room Name,రూమ్ పేరు
 DocType: Prescription Duration,Prescription Duration,ప్రిస్క్రిప్షన్ వ్యవధి
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉంది ప్రవేశానికి ముందు {0} రద్దు / అనువర్తిత సాధ్యం కాదు వదిలి {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉంది ప్రవేశానికి ముందు {0} రద్దు / అనువర్తిత సాధ్యం కాదు వదిలి {1}
 DocType: Activity Cost,Costing Rate,ఖరీదు రేటు
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,కస్టమర్ చిరునామాల్లో కాంటాక్ట్స్
 ,Campaign Efficiency,ప్రచారం సమర్థత
@@ -2449,11 +2458,11 @@
 DocType: Chapter,Chapter,అధ్యాయము
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,పెయిర్
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,ఈ మోడ్ ఎంచుకోబడినప్పుడు POS వాయిస్లో డిఫాల్ట్ ఖాతా స్వయంచాలకంగా అప్డేట్ అవుతుంది.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
 DocType: Asset,Depreciation Schedule,అరుగుదల షెడ్యూల్
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,అమ్మకపు భాగస్వామిగా చిరునామాల్లో కాంటాక్ట్స్
 DocType: Bank Reconciliation Detail,Against Account,ఖాతా వ్యతిరేకంగా
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,హాఫ్ డే తేదీ తేదీ నుండి నేటివరకు మధ్య ఉండాలి
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,హాఫ్ డే తేదీ తేదీ నుండి నేటివరకు మధ్య ఉండాలి
 DocType: Maintenance Schedule Detail,Actual Date,అసలు తేదీ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,దయచేసి {0} సంస్థలో డిఫాల్ట్ ధర కేంద్రాన్ని సెట్ చేయండి.
 DocType: Item,Has Batch No,బ్యాచ్ లేవు ఉంది
@@ -2471,7 +2480,6 @@
 DocType: Task,Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా)
 DocType: Soil Texture,Soil Type,నేల రకం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,కొత్త సందేశం
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless మాండేట్
@@ -2491,7 +2499,7 @@
 DocType: Hub Category,Hub Category,హబ్ వర్గం
 DocType: Purchase Invoice,SEZ,సెజ్
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
-DocType: Employee Loan,Loan Amount,అప్పు మొత్తం
+DocType: Loan,Loan Amount,అప్పు మొత్తం
 DocType: Student Report Generation Tool,Add Letterhead,లెటర్హెడ్ను జోడించండి
 DocType: Program Enrollment,Self-Driving Vehicle,సెల్ఫ్-డ్రైవింగ్ వాహనం
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,సరఫరాదారు స్కోర్కార్డింగ్ స్టాండింగ్
@@ -2520,9 +2528,9 @@
 DocType: Cash Flow Mapper,Position,స్థానం
 DocType: Patient,Patient Details,పేషెంట్ వివరాలు
 DocType: Patient,B Positive,B అనుకూలమైన
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 DocType: Patient Medical Record,Patient Medical Record,పేషెంట్ మెడికల్ రికార్డ్
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,క్రీడలు
@@ -2530,8 +2538,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,యదార్థమైన మొత్తం
 DocType: Lab Test UOM,Test UOM,టెస్ట్ UOM
 DocType: Student Siblings,Student Siblings,స్టూడెంట్ తోబుట్టువుల
+DocType: Subscription Plan Detail,Subscription Plan Detail,సభ్యత్వ ప్రణాళిక వివరాలు
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,యూనిట్
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,కంపెనీ రాయండి
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,కంపెనీ రాయండి
 ,Customer Acquisition and Loyalty,కస్టమర్ అక్విజిషన్ అండ్ లాయల్టీ
 DocType: Asset Maintenance Task,Maintenance Task,నిర్వహణ టాస్క్
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,దయచేసి GST సెట్టింగులలో B2C పరిమితిని సెట్ చేయండి.
@@ -2545,6 +2554,7 @@
 ,BOM Search,బిఒఎం శోధన
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),మొత్తం వినియోగ పదార్థాల వ్యయం (స్టాక్ ఎంట్రీ ద్వారా)
 DocType: Hub Settings,Company Registered,కంపెనీ రిజిస్టర్ చేయబడింది
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,తేదీ వరకు తేదీ తక్కువగా ఉండకూడదు
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",ఈ గిడ్డంగిలో &quot;స్టాక్ ఇన్&quot; లేదా &quot;నాట్ ఇన్ స్టాక్&quot; హబ్ మీద ఉన్న స్టాక్ ఆధారంగా ప్రచురించండి.
 DocType: Vehicle,Fuel Type,ఇంధన పద్ధతి
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,కంపెనీ లో కరెన్సీ రాయండి
@@ -2552,17 +2562,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},బ్యాచ్ లో స్టాక్ సంతులనం {0} అవుతుంది ప్రతికూల {1} Warehouse వద్ద అంశం {2} కోసం {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,మెటీరియల్ అభ్యర్థనలను తరువాత అంశం యొక్క క్రమాన్ని స్థాయి ఆధారంగా స్వయంచాలకంగా బడ్డాయి
 DocType: Email Digest,Pending Sales Orders,సేల్స్ ఆర్డర్స్ పెండింగ్లో
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
 DocType: Employee,Create User Permission,వాడుకరి అనుమతిని సృష్టించండి
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
 DocType: Healthcare Settings,Remind Before,ముందు గుర్తు చేయండి
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UoM మార్పిడి అంశం వరుసగా అవసరం {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Salary Component,Deduction,తీసివేత
 DocType: Item,Retain Sample,నమూనాను నిలుపుకోండి
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
 DocType: Stock Reconciliation Item,Amount Difference,మొత్తం తక్షణ
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ఈ విక్రయాల వ్యక్తి యొక్క ఉద్యోగి ID నమోదు చేయండి
 DocType: Territory,Classification of Customers by region,ప్రాంతం ద్వారా వినియోగదారుడు వర్గీకరణ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ఉత్పత్తిలో
@@ -2572,8 +2583,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,గణించిన బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Normal Test Template,Normal Test Template,సాధారణ టెస్ట్ మూస
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,వికలాంగ యూజర్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,కొటేషన్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,ఏ కోట్కు అందుకున్న RFQ ను సెట్ చేయలేరు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,కొటేషన్
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,ఏ కోట్కు అందుకున్న RFQ ను సెట్ చేయలేరు
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,ఖాతా కరెన్సీలో ముద్రించడానికి ఒక ఖాతాను ఎంచుకోండి
@@ -2581,7 +2592,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ఇది ఈ రోగికి సంబంధించిన లావాదేవీల ఆధారంగా ఉంది. వివరాలు కోసం కాలక్రమం క్రింద చూడండి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ధర నవీకరించబడింది
 DocType: Patient,Date of Birth,పుట్టిన తేది
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,అంశం {0} ఇప్పటికే తిరిగి చెయ్యబడింది
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,అంశం {0} ఇప్పటికే తిరిగి చెయ్యబడింది
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ఫిస్కల్ ఇయర్ ** ఆర్థిక సంవత్సరం సూచిస్తుంది. అన్ని అకౌంటింగ్ ఎంట్రీలు మరియు ఇతర ప్రధాన లావాదేవీల ** ** ఫిస్కల్ ఇయర్ వ్యతిరేకంగా చూడబడతాయి.
 DocType: Opportunity,Customer / Lead Address,కస్టమర్ / లీడ్ చిరునామా
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,సరఫరాదారు స్కోర్కార్డ్ సెటప్
@@ -2592,14 +2603,15 @@
 DocType: Work Order Operation,Actual Operation Time,అసలు ఆపరేషన్ సమయం
 DocType: Authorization Rule,Applicable To (User),వర్తించదగిన (వాడుకరి)
 DocType: Purchase Taxes and Charges,Deduct,తీసివేయు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,ఉద్యోగ వివరణ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,ఉద్యోగ వివరణ
 DocType: Student Applicant,Applied,అప్లైడ్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,మళ్ళీ తెరువు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,మళ్ళీ తెరువు
 DocType: Sales Invoice Item,Qty as per Stock UOM,ప్యాక్ చేసిన అంశాల స్టాక్ UoM ప్రకారం
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 పేరు
 DocType: Purchase Invoice,02-Post Sale Discount,02-పోస్ట్ అమ్మకానికి డిస్కౌంట్
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","తప్ప ప్రత్యేక అక్షరాలను &quot;-&quot; &quot;.&quot;, &quot;#&quot;, మరియు &quot;/&quot; సిరీస్ నామకరణ లో అనుమతించబడవు"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","సేల్స్ ప్రచారాలు ట్రాక్. లీడ్స్, కొటేషన్స్ ట్రాక్, అమ్మకాల ఉత్తర్వు etc ప్రచారాలు నుండి పెట్టుబడి పై రాబడి కొలవడానికి."
+DocType: Department Approver,Approver,అప్రూవర్గా
 ,SO Qty,SO ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,షేర్ హోల్డర్కు ఫీల్డ్ ఖాళీగా ఉండకూడదు
 DocType: Guardian,Work Address,కార్య చిరునామా
@@ -2613,21 +2625,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),మొత్తం కేటాయించిన మొత్తం (కంపెనీ కరెన్సీ)
 DocType: Purchase Order Item,To be delivered to customer,కస్టమర్ పంపిణీ ఉంటుంది
 DocType: BOM,Scrap Material Cost,స్క్రాప్ మెటీరియల్ కాస్ట్
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,సీరియల్ లేవు {0} ఏదైనా వేర్హౌస్ చెందినది కాదు
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,సీరియల్ లేవు {0} ఏదైనా వేర్హౌస్ చెందినది కాదు
 DocType: Grant Application,Email Notification Sent,ఇమెయిల్ నోటిఫికేషన్ పంపబడింది
 DocType: Purchase Invoice,In Words (Company Currency),వర్డ్స్ (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","అంశం కోడ్, గిడ్డంగి, పరిమాణం వరుసగా అవసరం"
-DocType: Pricing Rule,Supplier,సరఫరాదారు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","అంశం కోడ్, గిడ్డంగి, పరిమాణం వరుసగా అవసరం"
+DocType: Bank Guarantee,Supplier,సరఫరాదారు
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,చెల్లింపు వివరాలను చూపు
 DocType: Consultation,Consultation Time,సంప్రదింపు సమయం
 DocType: C-Form,Quarter,క్వార్టర్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ఇతరాలు ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ఇతరాలు ఖర్చులు
 DocType: Global Defaults,Default Company,డిఫాల్ట్ కంపెనీ
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ఖర్చుల లేదా తక్షణ ఖాతా అంశం {0} వంటి ప్రభావితం మొత్తం మీద స్టాక్ విలువ తప్పనిసరి
 DocType: Payment Request,PR,పిఆర్
 DocType: Cheque Print Template,Bank Name,బ్యాంకు పేరు
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Above
-DocType: Employee Loan,Employee Loan Account,ఉద్యోగి రుణ ఖాతా
 DocType: Leave Application,Total Leave Days,మొత్తం లీవ్ డేస్
 DocType: Email Digest,Note: Email will not be sent to disabled users,గమనిక: ఇమెయిల్ వికలాంగ వినియోగదారులకు పంపబడదు
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ఇంటరాక్షన్ సంఖ్య
@@ -2643,7 +2654,7 @@
 DocType: Vital Signs,Weight (In Kilogram),బరువు (కిలోగ్రాంలో)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",అధ్యాయం సేవ్ చేసిన తర్వాత భాగాలు / chapter_name ఖాళీగా వదిలివేయబడతాయి.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,దయచేసి GST సెట్టింగులలో GST ఖాతాలను సెట్ చేయండి
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,దయచేసి GST సెట్టింగులలో GST ఖాతాలను సెట్ చేయండి
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,వ్యాపార రకం
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","కనీసం ఒక వరుసలో కేటాయించిన మొత్తం, వాయిస్ పద్ధతి మరియు వాయిస్ సంఖ్య దయచేసి ఎంచుకోండి"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,న్యూ కొనుగోలులో ఖర్చు
@@ -2652,12 +2663,13 @@
 DocType: Grant Application,Grant Description,మంజూరు వివరణ
 DocType: Purchase Invoice Item,Rate (Company Currency),రేటు (కంపెనీ కరెన్సీ)
 DocType: Student Guardian,Others,ఇతరత్రా
+DocType: Subscription,Discounts,డిస్కౌంట్
 DocType: Payment Entry,Unallocated Amount,unallocated మొత్తం
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ఒక సరిపోలే అంశం దొరకదు. కోసం {0} కొన్ని ఇతర విలువ దయచేసి ఎంచుకోండి.
 DocType: POS Profile,Taxes and Charges,పన్నులు మరియు ఆరోపణలు
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ఒక ఉత్పత్తి లేదా కొనుగోలు అమ్మిన లేదా స్టాక్ ఉంచే ఒక సేవ.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,మరింత నవీకరణలు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,మొదటి వరుసలో కోసం &#39;మునుపటి రో మొత్తం న&#39; &#39;మునుపటి రో మొత్తం మీద&#39; బాధ్యతలు రకం ఎంచుకోండి లేదా కాదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,మొదటి వరుసలో కోసం &#39;మునుపటి రో మొత్తం న&#39; &#39;మునుపటి రో మొత్తం మీద&#39; బాధ్యతలు రకం ఎంచుకోండి లేదా కాదు
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ఇది ఈ సెటప్కు అనుబందించిన అన్ని స్కోర్కార్డులు వర్తిస్తుంది
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,చైల్డ్ అంశం ఉత్పత్తి కట్ట ఉండకూడదు. దయచేసి అంశాన్ని తీసివేసి `{0}` మరియు సేవ్
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,బ్యాంకింగ్
@@ -2666,45 +2678,48 @@
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,షెడ్యూల్ పొందడానికి &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
 DocType: Bin,Ordered Quantity,క్రమ పరిమాణం
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",ఉదా &quot;బిల్డర్ల కోసం టూల్స్ బిల్డ్&quot;
 DocType: Grading Scale,Grading Scale Intervals,గ్రేడింగ్ స్కేల్ విరామాలు
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,సంవత్సరానికి లాభం
+DocType: Bank Guarantee,Name of Bank,బ్యాంకు పేరు
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} కోసం అకౌంటింగ్ ప్రవేశం మాత్రమే కరెన్సీ తయారు చేయవచ్చు: {3}
 DocType: Fee Schedule,In Process,ప్రక్రియ లో
 DocType: Authorization Rule,Itemwise Discount,Itemwise డిస్కౌంట్
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,ఆర్థిక ఖాతాల చెట్టు.
+DocType: Bank Guarantee,Reference Document Type,సూచన డాక్యుమెంట్ టైప్
 DocType: Cash Flow Mapping,Cash Flow Mapping,క్యాష్ ఫ్లో మాపింగ్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} అమ్మకాల ఆర్డర్ వ్యతిరేకంగా {1}
 DocType: Account,Fixed Asset,స్థిర ఆస్తి
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,సీరియల్ ఇన్వెంటరీ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,డిఫాల్ట్ పరిచయంలో ఇమెయిల్ కనుగొనబడలేదు
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,సీక్రెట్ను రూపొందించండి
-DocType: Employee Loan,Account Info,ఖాతా సమాచారం
+DocType: Loan,Account Info,ఖాతా సమాచారం
 DocType: Activity Type,Default Billing Rate,డిఫాల్ట్ బిల్లింగ్ రేటు
 DocType: Fees,Include Payment,చెల్లింపుని చేర్చండి
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 DocType: Sales Invoice,Total Billing Amount,మొత్తం బిల్లింగ్ మొత్తం
 DocType: Fee Schedule,Receivable Account,స్వీకరించదగిన ఖాతా
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
 DocType: Quotation Item,Stock Balance,స్టాక్ సంతులనం
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,చెల్లింపు కు అమ్మకాల ఆర్డర్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,సియిఒ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,సియిఒ
 DocType: Purchase Invoice,With Payment of Tax,పన్ను చెల్లింపుతో
 DocType: Expense Claim Detail,Expense Claim Detail,ఖర్చు చెప్పడం వివరాలు
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,సరఫరా కోసం మూడు ప్రతులు
 DocType: Land Unit,Is Container,కంటైనర్
 DocType: Crop Cycle,This will be day 1 of the crop cycle,ఈ పంట చక్రంలో రోజు 1 ఉంటుంది
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
 DocType: Purchase Invoice Item,Weight UOM,బరువు UoM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,ఫోలియో సంఖ్యలతో అందుబాటులో ఉన్న వాటాదారుల జాబితా
 DocType: Salary Structure Employee,Salary Structure Employee,జీతం నిర్మాణం ఉద్యోగి
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,వేరియంట్ గుణాలు చూపించు
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,వేరియంట్ గుణాలు చూపించు
 DocType: Student,Blood Group,రక్తం గ్రూపు
 DocType: Course,Course Name,కోర్సు పేరు
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ఒక నిర్దిష్ట ఉద్యోగి సెలవు అప్లికేషన్లు ఆమోదించవచ్చు చేసిన వాడుకరులు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,ఆఫీసు పరికరాలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,ఆఫీసు పరికరాలు
 DocType: Purchase Invoice Item,Qty,ప్యాక్ చేసిన అంశాల
 DocType: Fiscal Year,Companies,కంపెనీలు
 DocType: Supplier Scorecard,Scoring Setup,సెటప్ చేశాడు
@@ -2723,7 +2738,7 @@
 DocType: Stock Entry,Total Incoming Value,మొత్తం ఇన్కమింగ్ విలువ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,డెబిట్ అవసరం ఉంది
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,కొనుగోలు ధర జాబితా
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,సరఫరాదారు స్కోర్కార్డ్ వేరియబుల్స్ యొక్క టెంప్లేట్లు.
 DocType: Job Offer Term,Offer Term,ఆఫర్ టర్మ్
 DocType: Asset,Quality Manager,క్వాలిటీ మేనేజర్
@@ -2735,13 +2750,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
 DocType: BOM Website Operation,BOM Website Operation,బిఒఎం వెబ్సైట్ ఆపరేషన్
 DocType: Supplier Scorecard,Supplier Score,సరఫరాదారు స్కోరు
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,మొత్తం ఇన్వాయిస్ ఆంట్
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,మొత్తం ఇన్వాయిస్ ఆంట్
 DocType: Supplier,Warn RFQs,RFQ లను హెచ్చరించండి
 DocType: BOM,Conversion Rate,మారకపు ధర
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ఉత్పత్తి శోధన
 DocType: Assessment Plan,To Time,సమయం
 DocType: Authorization Rule,Approving Role (above authorized value),(అధికారం విలువ పై) Role ఆమోదిస్తోంది
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,ఖాతాకు క్రెడిట్ ఒక చెల్లించవలసిన ఖాతా ఉండాలి
+DocType: Loan,Total Amount Paid,మొత్తం చెల్లింపు మొత్తం
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,దయచేసి చెల్లించిన విద్యార్ధి దరఖాస్తుదారునికి తప్పనిసరిగా తప్పనిసరి అయిన స్టూడెంట్ అడ్మిషన్ ఎంచుకోండి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},బిఒఎం సూత్రం: {0} యొక్క పేరెంట్ లేదా బాల ఉండకూడదు {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,దయచేసి ధర ప్రచురించడానికి ధర జాబితాను ఎంచుకోండి
@@ -2751,19 +2767,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ధర జాబితా {0} నిలిపివేయబడింది
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల కంటే ఎక్కువగా ఉండకూడదు {1} ఆపరేషన్ కోసం {2}
 DocType: Manufacturing Settings,Allow Overtime,అదనపు అనుమతించు
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి, దయచేసి ఉపయోగించడానికి స్టాక్ ఎంట్రీ నవీకరించడం సాధ్యపడదు"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి, దయచేసి ఉపయోగించడానికి స్టాక్ ఎంట్రీ నవీకరించడం సాధ్యపడదు"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి, దయచేసి ఉపయోగించడానికి స్టాక్ ఎంట్రీ నవీకరించడం సాధ్యపడదు"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి, దయచేసి ఉపయోగించడానికి స్టాక్ ఎంట్రీ నవీకరించడం సాధ్యపడదు"
 DocType: Training Event Employee,Training Event Employee,శిక్షణ ఈవెంట్ ఉద్యోగి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,గరిష్ట నమూనాలు - {0} బ్యాచ్ {1} మరియు అంశం {2} కోసం ఉంచవచ్చు.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,సమయ విభాగాలను జోడించండి
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} అంశం అవసరం సీరియల్ సంఖ్యలు {1}. మీరు అందించిన {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} అంశం అవసరం సీరియల్ సంఖ్యలు {1}. మీరు అందించిన {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ప్రస్తుత లెక్కింపు రేటు
 DocType: Training Event,Advance,అడ్వాన్స్
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,పునరావృతమయ్యేలా చేయడానికి.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless చెల్లింపు గేట్వే సెట్టింగులు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ఎక్స్చేంజ్ పెరుగుట / నష్టం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,ఎక్స్చేంజ్ పెరుగుట / నష్టం
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},రో # {0}: ఖాతా {1} సంస్థకు చెందినది కాదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},రో # {0}: ఖాతా {1} సంస్థకు చెందినది కాదు {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ను కనుగొనడం సాధ్యం కాలేదు
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
@@ -2782,7 +2797,6 @@
 DocType: Bin,Actual Quantity,వాస్తవ పరిమాణం
 DocType: Shipping Rule,example: Next Day Shipping,ఉదాహరణకు: తదుపరి డే షిప్పింగ్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},సభ్యత్వము {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ఫీజు షెడ్యూల్ ప్రోగ్రామ్
 DocType: Fee Schedule Program,Student Batch,స్టూడెంట్ బ్యాచ్
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,స్టూడెంట్ చేయండి
@@ -2797,14 +2811,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ఇ-కామర్స్ GSTIN
 DocType: Sales Order,Not Delivered,పంపిణీ లేదు
 ,Bank Clearance Summary,బ్యాంక్ క్లియరెన్స్ సారాంశం
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",సృష్టించు మరియు రోజువారీ వార మరియు నెలసరి ఇమెయిల్ Digests నిర్వహించండి.
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",సృష్టించు మరియు రోజువారీ వార మరియు నెలసరి ఇమెయిల్ Digests నిర్వహించండి.
 DocType: Appraisal Goal,Appraisal Goal,అప్రైసల్ గోల్
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,వర్గం సూచించండి?
 DocType: Stock Reconciliation Item,Current Amount,ప్రస్తుత మొత్తం
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,భవనాలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,భవనాలు
 DocType: Fee Schedule,Fee Structure,ఫీజు స్ట్రక్చర్
 DocType: Timesheet Detail,Costing Amount,ఖరీదు మొత్తం
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 DocType: Student Admission Program,Application Fee,అప్లికేషన్ రుసుము
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,వేతనం స్లిప్ సమర్పించండి
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,అంశం {0} ఉంది {1}% కోసం Maxiumm డిస్కౌంట్
@@ -2812,12 +2825,13 @@
 DocType: Sales Partner,Address & Contacts,చిరునామా &amp; కాంటాక్ట్స్
 DocType: SMS Log,Sender Name,పంపినవారు పేరు
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,వ్యవసాయ విశ్లేషణ ప్రమాణం
+DocType: HR Settings,Leave Approval Notification Template,ఆమోద నోటిఫికేషన్ టెంప్లేట్ వదిలివేయండి
 DocType: POS Profile,[Select],[ఎంచుకోండి]
 DocType: Vital Signs,Blood Pressure (diastolic),రక్తపోటు (డయాస్టొలిక్)
 DocType: SMS Log,Sent To,పంపిన
 DocType: Agriculture Task,Holiday Management,హాలిడే మేనేజ్మెంట్
 DocType: Payment Request,Make Sales Invoice,సేల్స్ వాయిస్ చేయండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,సాఫ్ట్వేర్పై
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,సాఫ్ట్వేర్పై
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
 DocType: Company,For Reference Only.,సూచన ఓన్లి.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},వైద్యుడు {0} {1} లో అందుబాటులో లేదు
@@ -2835,7 +2849,7 @@
 DocType: Employee,New Workplace,కొత్త కార్యాలయంలో
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,మెటీరియల్ వినియోగం
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ముగించబడినది గా సెట్
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},బార్కోడ్ ఐటెమ్ను {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},బార్కోడ్ ఐటెమ్ను {0}
 DocType: Normal Test Items,Require Result Value,ఫలిత విలువ అవసరం
 DocType: Item,Show a slideshow at the top of the page,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2850,19 +2864,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
 DocType: Leave Block List,Allow Users,వినియోగదారులు అనుమతించు
 DocType: Purchase Order,Customer Mobile No,కస్టమర్ మొబైల్ లేవు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,పునరావృత
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,నగదు ప్రవాహం మ్యాపింగ్ మూస వివరాలు
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,లోన్ మేనేజ్మెంట్
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ప్రత్యేక ఆదాయం ట్రాక్ మరియు ఉత్పత్తి అంశాలతో లేదా విభాగాలు వ్యయం.
 DocType: Rename Tool,Rename Tool,టూల్ పేరుమార్చు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,నవీకరణ ఖర్చు
 DocType: Item Reorder,Item Reorder,అంశం క్రమాన్ని మార్చు
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,జీతం షో స్లిప్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,జీతం షో స్లిప్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
 DocType: Fees,Send Payment Request,చెల్లింపు అభ్యర్థనను పంపండి
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
 DocType: Water Analysis,Origin,మూలం
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
@@ -2877,14 +2891,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,ఆదాయం పన్ను బాధ్యత
 DocType: Grading Scale Interval,Grade Description,గ్రేడ్ వివరణ
 DocType: Stock Entry,Purchase Receipt No,కొనుగోలు రసీదులు లేవు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ఎర్నెస్ట్ మనీ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,ఎర్నెస్ట్ మనీ
 DocType: Sales Invoice, Shipping Bill Number,షిప్పింగ్ బిల్ సంఖ్య
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,కనిపెట్టగలిగే శక్తి
 DocType: Asset Maintenance Log,Actions performed,చర్యలు ప్రదర్శించబడ్డాయి
 DocType: Cash Flow Mapper,Section Leader,విభాగం నాయకుడు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),ఫండ్స్ యొక్క మూలం (లయబిలిటీస్)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),ఫండ్స్ యొక్క మూలం (లయబిలిటీస్)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},వరుసగా పరిమాణం {0} ({1}) మాత్రమే తయారు పరిమాణం సమానంగా ఉండాలి {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Employee
+DocType: Bank Guarantee,Fixed Deposit Number,స్థిర డిపాజిట్ సంఖ్య
 DocType: Asset Repair,Failure Date,వైఫల్యం తేదీ
 DocType: Sample Collection,Collected Time,సేకరించిన సమయం
 DocType: Company,Sales Monthly History,సేల్స్ మంత్లీ హిస్టరీ
@@ -2901,10 +2916,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,మీరు ఖచ్చితంగా ఈ అపాయింట్మెంట్ను రద్దు చేయాలనుకుంటున్నారా?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,హోటల్ రూమ్ ప్రైసింగ్ ప్యాకేజీ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,సేల్స్ పైప్లైన్
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required న
 DocType: Rename Tool,File to Rename,పేరుమార్చు దాఖలు
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,సబ్స్క్రిప్షన్ నవీకరణలను పొందండి
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},ఖాతా {0} {1} లో ఖాతా మోడ్ కంపెనీతో సరిపోలడం లేదు: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},అంశం కోసం లేదు పేర్కొన్న BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,కోర్సు:
@@ -2914,7 +2930,7 @@
 DocType: Notification Control,Expense Claim Approved,ఖర్చు చెప్పడం ఆమోదించబడింది
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,ఏ పని ఆర్డర్లు సృష్టించబడలేదు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే ఈ కాలానికి రూపొందించినవారు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,ఫార్మాస్యూటికల్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,ఫార్మాస్యూటికల్
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,కొనుగోలు వస్తువుల ధర
 DocType: Selling Settings,Sales Order Required,అమ్మకాల ఆర్డర్ అవసరం
 DocType: Purchase Invoice,Credit To,క్రెడిట్
@@ -2932,7 +2948,7 @@
 DocType: Request for Quotation Supplier,No Quote,కోట్ లేదు
 DocType: Warranty Claim,Raised By,లేవనెత్తారు
 DocType: Payment Gateway Account,Payment Account,చెల్లింపు ఖాతా
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,స్వీకరించదగిన ఖాతాలు నికర మార్పును
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,పరిహార ఆఫ్
 DocType: Job Offer,Accepted,Accepted
@@ -2945,7 +2961,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,శోధన ఫలితాలు
 DocType: Room,Room Number,గది సంఖ్య
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},చెల్లని సూచన {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},చెల్లని సూచన {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,షిప్పింగ్ రూల్ లేబుల్
 DocType: Journal Entry Account,Payroll Entry,పేరోల్ ఎంట్రీ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,చూడండి ఫీజు రికార్డ్స్
@@ -2955,7 +2971,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 DocType: Lab Test Sample,Lab Test Sample,ల్యాబ్ పరీక్ష నమూనా
 DocType: Item Variant Settings,Allow Rename Attribute Value,లక్షణం విలువ పేరు మార్చడానికి అనుమతించండి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
 DocType: Restaurant,Invoice Series Prefix,ఇన్వాయిస్ సిరీస్ ప్రిఫిక్స్
 DocType: Employee,Previous Work Experience,మునుపటి పని అనుభవం
@@ -2963,8 +2979,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google మ్యాప్స్ సమన్వయాన్ని ప్రారంభించలేదు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} సమర్పించిన లేదు
+DocType: Subscription,Trialling,జమ చేస్తున్నారు
 DocType: Member,Membership Expiry Date,సభ్యత్వం గడువు తేదీ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} తిరిగి పత్రంలో ప్రతికూల ఉండాలి
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} తిరిగి పత్రంలో ప్రతికూల ఉండాలి
 ,Minutes to First Response for Issues,సమస్యలకు మొదటి రెస్పాన్స్ మినిట్స్
 DocType: Purchase Invoice,Terms and Conditions1,నిబంధనలు మరియు Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
@@ -2983,7 +3000,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,కొలమానం
 DocType: Fiscal Year,Year End Date,ఇయర్ ముగింపు తేదీ
 DocType: Task Depends On,Task Depends On,టాస్క్ ఆధారపడి
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,అవకాశం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,అవకాశం
 DocType: Operation,Default Workstation,డిఫాల్ట్ కార్యక్షేత్ర
 DocType: Notification Control,Expense Claim Approved Message,ఖర్చు చెప్పడం ఆమోదించబడింది సందేశం
 DocType: Payment Entry,Deductions or Loss,తగ్గింపులకు లేదా నష్టం
@@ -3021,7 +3038,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,పే లేకుండా వదిలి లేదు ఆమోదం అప్లికేషన్ లీవ్ రికార్డులు సరిపోలడం లేదు
 DocType: Campaign,Campaign-.####,ప్రచారం -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,తదుపరి దశలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
 DocType: Membership,USD,డాలర్లు
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,వాయిస్ చేయండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,మిగిలిన మొత్తం
@@ -3030,7 +3047,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,బార్ కోడ్ {0} చెల్లుబాటు అయ్యే {1} కోడ్ కాదు
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ముగింపు సంవత్సరం
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,QUOT / లీడ్%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 DocType: Driver,Driver,డ్రైవర్
 DocType: Vital Signs,Nutrition Values,న్యూట్రిషన్ విలువలు
 DocType: Lab Test Template,Is billable,బిల్ చేయదగినది
@@ -3041,7 +3058,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),వాస్తవాధీన ప్రారంభ తేదీ (సమయం షీట్ ద్వారా)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ఈ ఒక ఉదాహరణ వెబ్సైట్ ERPNext నుండి ఆటో ఉత్పత్తి ఉంది
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,ఏజింగ్ రేంజ్ 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,మొత్తం ముందుగా ఉన్న మొత్తాన్ని కన్నా మొత్తం ముందస్తు మొత్తం ఎక్కువగా ఉండకూడదు
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,మొత్తం ముందుగా ఉన్న మొత్తాన్ని కన్నా మొత్తం ముందస్తు మొత్తం ఎక్కువగా ఉండకూడదు
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3076,7 +3093,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,ఎంచుకోండి లక్షణం విలువలు
 DocType: Purchase Invoice,Reason For Issuing document,పత్రం జారీ కోసం కారణం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
 DocType: Payment Reconciliation,Bank / Cash Account,బ్యాంకు / క్యాష్ ఖాతా
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,తదుపరి సంప్రదించండి ద్వారా లీడ్ ఇమెయిల్ అడ్రస్ అదే ఉండకూడదు
 DocType: Tax Rule,Billing City,బిల్లింగ్ సిటీ
@@ -3093,7 +3110,8 @@
 DocType: Warranty Claim,Service Address,సర్వీస్ చిరునామా
 DocType: Asset Maintenance Task,Calibration,అమరిక
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} కంపెనీ సెలవుదినం
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,సామాగ్రీ మరియు ఫిక్స్చర్స్
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,స్థితి నోటిఫికేషన్ వదిలివేయండి
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,సామాగ్రీ మరియు ఫిక్స్చర్స్
 DocType: Item,Manufacture,తయారీ
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,సెటప్ కంపెనీ
 ,Lab Test Report,ల్యాబ్ పరీక్ష నివేదిక
@@ -3109,7 +3127,6 @@
 DocType: Crop,Planting Area,నాటడం ప్రాంతం
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),మొత్తం () ప్యాక్ చేసిన అంశాల
 DocType: Installation Note Item,Installed Qty,ఇన్స్టాల్ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,కొన్ని చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాల కారణంగా ఇది కావచ్చు
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,మీరు జోడించబడ్డారు
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,శిక్షణ ఫలితం
@@ -3119,16 +3136,17 @@
 DocType: Products Settings,Products per Page,పేజీకి ఉత్పత్తులు
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,లేదా
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,లేదా
 DocType: Sales Order,Billing Status,బిల్లింగ్ స్థితి
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ఒక సమస్యను నివేదించండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,యుటిలిటీ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,యుటిలిటీ ఖర్చులు
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ఉపరితలం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,రో # {0}: జర్నల్ ఎంట్రీ {1} లేదు ఖాతా లేదు {2} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
 DocType: Supplier Scorecard Criteria,Criteria Weight,ప్రమాణం బరువు
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ఆమోద నోటిఫికేషన్ వదిలివేయండి
 DocType: Buying Settings,Default Buying Price List,డిఫాల్ట్ కొనుగోలు ధర జాబితా
 DocType: Payroll Entry,Salary Slip Based on Timesheet,జీతం స్లిప్ TIMESHEET ఆధారంగా
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,కొనుగోలు కొనుగోలు
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,కొనుగోలు కొనుగోలు
 DocType: Notification Control,Sales Order Message,అమ్మకాల ఆర్డర్ సందేశం
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","మొదలైనవి కంపెనీ, కరెన్సీ, ప్రస్తుత ఆర్థిక సంవత్సరంలో వంటి సెట్ డిఫాల్ట్ విలువలు"
 DocType: Payment Entry,Payment Type,చెల్లింపు పద్ధతి
@@ -3151,6 +3169,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,షాపింగ్ కార్ట్ సెట్టింగ్స్
 DocType: Journal Entry,Accounting Entries,అకౌంటింగ్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ఎంచుకున్న ప్రైసింగ్ రూల్ &#39;రేట్&#39; కోసం తయారు చేస్తే, ఇది ధర జాబితాను ఓవర్రైట్ చేస్తుంది. ధర నియమావళి రేటు అనేది ఆఖరి రేటు, అందువల్ల తదుపరి డిస్కౌంట్ను ఉపయోగించరాదు. అందువల్ల సేల్స్ ఆర్డర్, పర్చేస్ ఆర్డర్ మొదలైన లావాదేవీలలో, ఇది &#39;ధర జాబితా రేట్&#39; ఫీల్డ్ కాకుండా &#39;రేట్&#39; ఫీల్డ్లో పొందబడుతుంది."
+DocType: Journal Entry,Paid Loan,చెల్లించిన లోన్
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ఎంట్రీ నకిలీ. తనిఖీ చేయండి అధీకృత రూల్ {0}
 DocType: Journal Entry Account,Reference Due Date,రిఫరెన్స్ గడువు తేదీ
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3167,7 +3186,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 ,To Produce,ఉత్పత్తి
 apps/erpnext/erpnext/config/hr.py +93,Payroll,పేరోల్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","వరుస కోసం {0} లో {1}. అంశం రేటు {2} చేర్చడానికి, వరుసలు {3} కూడా చేర్చారు తప్పక"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","వరుస కోసం {0} లో {1}. అంశం రేటు {2} చేర్చడానికి, వరుసలు {3} కూడా చేర్చారు తప్పక"
 DocType: Patient Service Unit,Parent Service Unit,పేరెంట్ సర్వీస్ యూనిట్
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,వాడుకరి చేయండి
 DocType: Packing Slip,Identification of the package for the delivery (for print),డెలివరీ కోసం ప్యాకేజీ గుర్తింపు (ముద్రణ కోసం)
@@ -3185,7 +3204,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,ఆదాయపు ఖాతా
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,డెలివరీ
 DocType: Volunteer,Weekdays,వారపు రోజులు
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
 DocType: Restaurant Menu,Restaurant Menu,రెస్టారెంట్ మెను
@@ -3193,7 +3212,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,శాశ్వత జాబితా కోసం డిఫాల్ట్ జాబితా ఖాతా సెట్
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,శాశ్వత జాబితా కోసం డిఫాల్ట్ జాబితా ఖాతా సెట్
 DocType: Item Reorder,Material Request Type,మెటీరియల్ అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,గ్రాంట్ రివ్యూ ఇమెయిల్ పంపండి
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage పూర్తి, సేవ్ లేదు"
@@ -3201,10 +3220,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,గది సామర్థ్యం
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},అంశానికి ఇప్పటికే రికార్డు ఉంది {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,మీరు గతంలో ఉత్పత్తి చేయబడిన ఇన్వాయిస్ల యొక్క రికార్డులను కోల్పోతారు. మీరు ఖచ్చితంగా ఈ సభ్యత్వాన్ని పునఃప్రారంభించదలిచారా?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,రిజిస్ట్రేషన్ ఫీజు
 DocType: Budget,Cost Center,వ్యయ కేంద్రం
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,ఓచర్ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,ఓచర్ #
 DocType: Notification Control,Purchase Order Message,ఆర్డర్ సందేశం కొనుగోలు
 DocType: Tax Rule,Shipping Country,షిప్పింగ్ దేశం
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,సేల్స్ లావాదేవీలు నుండి కస్టమర్ యొక్క పన్ను ఐడి దాచు
@@ -3213,20 +3233,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ధర నియమం కొన్ని ప్రమాణాల ఆధారంగా, / ధర జాబితా తిరిగి రాస్తుంది డిస్కౌంట్ శాతం నిర్వచించడానికి తయారు చేస్తారు."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,వేర్హౌస్ మాత్రమే స్టాక్ ఎంట్రీ ద్వారా మార్చవచ్చు / డెలివరీ గమనిక / కొనుగోలు రసీదులు
 DocType: Employee Education,Class / Percentage,క్లాస్ / శాతం
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,మార్కెటింగ్ మరియు సేల్స్ హెడ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,మార్కెటింగ్ మరియు సేల్స్ హెడ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ఆదాయ పన్ను
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,లెటర్ హెడ్స్ వెళ్ళండి
+DocType: Subscription,Cancel At End Of Period,కాలం ముగింపులో రద్దు చేయండి
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,బదిలీ కోసం ఎటువంటి అంశాలు ఎంచుకోబడలేదు
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,బదిలీ కోసం ఎటువంటి అంశాలు ఎంచుకోబడలేదు
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,అన్ని చిరునామాలు.
 DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
 DocType: Vehicle,Electric,ఎలక్ట్రిక్
 DocType: Task,% Progress,% ప్రోగ్రెస్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ఆస్తి తొలగింపు లాభపడిన / నష్టం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,ఆస్తి తొలగింపు లాభపడిన / నష్టం
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",దిగువ పట్టికలో &quot;ఆమోదించబడిన&quot; హోదాతో ఉన్న విద్యార్థి అభ్యర్ధి మాత్రమే ఎంపిక చేయబడతారు.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,ఖాతాకు ఖాతా సంఖ్య {0} అందుబాటులో లేదు. <br> దయచేసి మీ చార్ట్ ఖాతాల సరిగ్గా సెటప్ చేయండి.
 DocType: Task,Depends on Tasks,విధులు ఆధారపడి
@@ -3241,6 +3262,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,కాదు స్టాక్
 DocType: Volunteer,Volunteer Skills,వాలంటీర్ నైపుణ్యాలు
 DocType: Appraisal,HR User,ఆర్ వాడుకరి
+DocType: Bank Guarantee,Reference Document Name,సూచన పత్రం పేరు
 DocType: Purchase Invoice,Taxes and Charges Deducted,పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ
 apps/erpnext/erpnext/hooks.py +142,Issues,ఇష్యూస్
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},స్థితి ఒకటి ఉండాలి {0}
@@ -3254,7 +3276,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ఎక్స్ ట్రా లార్జ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,ఎక్స్ ట్రా లార్జ్
+DocType: Loan,Loan Application,లోన్ అప్లికేషన్
 DocType: Crop,Scientific Name,శాస్త్రీయ పేరు
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,మొత్తం ఆకులు
 DocType: Customer,"Reselect, if the chosen contact is edited after save",ఎంపిక చేసిన తర్వాత భద్రపరచిన తర్వాత సవరించాలి
@@ -3263,13 +3286,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,ప్రిపే సంఖ్య
 ,Sales Browser,సేల్స్ బ్రౌజర్
 DocType: Journal Entry,Total Credit,మొత్తం క్రెడిట్
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},హెచ్చరిక: మరో {0} # {1} స్టాక్ ప్రవేశానికి వ్యతిరేకంగా ఉంది {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},హెచ్చరిక: మరో {0} # {1} స్టాక్ ప్రవేశానికి వ్యతిరేకంగా ఉంది {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,స్థానిక
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),రుణాలు మరియు అడ్వాన్సెస్ (ఆస్తులు)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,రుణగ్రస్తులు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,పెద్ద
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,పెద్ద
 DocType: Homepage Featured Product,Homepage Featured Product,హోమ్పేజీ ఫీచర్ ఉత్పత్తి
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,అన్ని అసెస్మెంట్ గుంపులు
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,అన్ని అసెస్మెంట్ గుంపులు
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,న్యూ వేర్హౌస్ పేరు
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),మొత్తం {0} ({1})
 DocType: C-Form Invoice Detail,Territory,భూభాగం
@@ -3290,9 +3313,10 @@
 DocType: Fees,Fees,ఫీజు
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ఎక్స్చేంజ్ రేట్ మరొక లోకి ఒక కరెన్సీ మార్చేందుకు పేర్కొనండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,కొటేషన్ {0} రద్దు
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,మొత్తం అసాధారణ మొత్తాన్ని
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,మొత్తం అసాధారణ మొత్తాన్ని
 DocType: Sales Partner,Targets,టార్గెట్స్
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,దయచేసి సంస్థ సమాచార ఫైల్లోని SIREN నంబర్ను నమోదు చేయండి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 DocType: Price List,Price List Master,ధర జాబితా మాస్టర్
 DocType: GST Account,CESS Account,CESS ఖాతా
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
@@ -3301,6 +3325,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,రోగిని ఎంచుకోండి
 DocType: Price List,Applicable for Countries,దేశాలు వర్తించే
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,పారామీటర్ పేరు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,మాత్రమే స్థితి కూడిన దరఖాస్తులను లీవ్ &#39;ఆమోదించబడింది&#39; మరియు &#39;&#39; తిరస్కరించింది సమర్పించిన చేయవచ్చు
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},స్టూడెంట్ గ్రూప్ పేరు వరుసగా తప్పనిసరి {0}
 DocType: Homepage,Products to be shown on website homepage,ఉత్పత్తులు వెబ్సైట్ హోమ్ చూపబడుతుంది
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ఈ రూట్ కస్టమర్ సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -3333,14 +3358,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,అన్ని బిల్లింగ్ గంటల కోసం ఇప్పటికే ఇన్వాయిస్ సృష్టించబడింది
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},దోషం: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ఆర్థిక వ్యయం
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ఉద్యోగి {0} కోసం హాజరు ఇప్పటికే గుర్తించబడింది
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ఉద్యోగి {0} కోసం హాజరు ఇప్పటికే గుర్తించబడింది
 DocType: Packing Slip,If more than one package of the same type (for print),ఉంటే ఒకే రకమైన ఒకటి కంటే ఎక్కువ ప్యాకేజీ (ముద్రణ కోసం)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,దయచేసి రెస్టారెంట్ సెట్టింగ్లలో డిఫాల్ట్ కస్టమర్ను సెట్ చేయండి
 ,Salary Register,జీతం నమోదు
 DocType: Warehouse,Parent Warehouse,మాతృ వేర్హౌస్
-DocType: C-Form Invoice Detail,Net Total,నికర మొత్తం
+DocType: Subscription,Net Total,నికర మొత్తం
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},డిఫాల్ట్ BOM అంశం దొరకలేదు {0} మరియు ప్రాజెక్ట్ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,వివిధ రకాల రుణాలపై నిర్వచించండి
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,వివిధ రకాల రుణాలపై నిర్వచించండి
 DocType: Bin,FCFS Rate,FCFS రేటు
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,అసాధారణ పరిమాణం
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),సమయం (నిమిషాల్లో)
@@ -3372,10 +3397,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,రూటు ఖాతా సమూహం ఉండాలి
 DocType: Drug Prescription,Drug Prescription,డ్రగ్ ప్రిస్క్రిప్షన్
 DocType: Fees,FEE.,రుసుము.
-DocType: Employee Loan,Repaid/Closed,తిరిగి చెల్లించడం / ముగించబడినది
+DocType: Loan,Repaid/Closed,తిరిగి చెల్లించడం / ముగించబడినది
 DocType: Item,Total Projected Qty,మొత్తం అంచనా ప్యాక్ చేసిన అంశాల
 DocType: Monthly Distribution,Distribution Name,పంపిణీ పేరు
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 DocType: Course,Course Code,కోర్సు కోడ్
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},అంశం కోసం అవసరం నాణ్యత తనిఖీ {0}
 DocType: POS Settings,Use POS in Offline Mode,ఆఫ్లైన్ మోడ్లో POS ని ఉపయోగించండి
@@ -3395,16 +3419,15 @@
 DocType: Purchase Invoice,Deemed Export,డీమ్డ్ ఎక్స్పోర్ట్
 DocType: Stock Entry,Material Transfer for Manufacture,తయారీ కోసం మెటీరియల్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,డిస్కౌంట్ శాతం ఒక ధర జాబితా వ్యతిరేకంగా లేదా అన్ని ధర జాబితా కోసం గాని అన్వయించవచ్చు.
-DocType: Subscription,Half-yearly,సగం వార్షిక
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Lab Test,LabTest Approver,ల్యాబ్ టెస్ట్ అప్ప్రోవర్
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,మీరు ఇప్పటికే అంచనా ప్రమాణం కోసం అంచనా {}.
 DocType: Vehicle Service,Engine Oil,ఇంజన్ ఆయిల్
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},పని ఆర్డర్లు సృష్టించబడ్డాయి: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},పని ఆర్డర్లు సృష్టించబడ్డాయి: {0}
 DocType: Sales Invoice,Sales Team1,సేల్స్ team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
-DocType: Employee Loan,Loan Details,లోన్ వివరాలు
+DocType: Loan,Loan Details,లోన్ వివరాలు
 DocType: Company,Default Inventory Account,డిఫాల్ట్ ఇన్వెంటరీ ఖాతా
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,ఫోలియో సంఖ్యలు సరిపోలడం లేదు
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
@@ -3416,19 +3439,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,పంట పెరుగుతున్న అన్ని ల్యాండ్ యూనిట్లు ఒక లింక్
 DocType: Account,Root Type,రూట్ రకం
 DocType: Item,FIFO,ఎఫ్ఐఎఫ్ఓ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},రో # {0}: కంటే తిరిగి కాంట్ {1} అంశం కోసం {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},రో # {0}: కంటే తిరిగి కాంట్ {1} అంశం కోసం {2}
 DocType: Item Group,Show this slideshow at the top of the page,పేజీ ఎగువన ఈ స్లైడ్ చూపించు
 DocType: BOM,Item UOM,అంశం UoM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},టార్గెట్ గిడ్డంగి వరుసగా తప్పనిసరి {0}
 DocType: Cheque Print Template,Primary Settings,ప్రాథమిక సెట్టింగులు
 DocType: Purchase Invoice,Select Supplier Address,సరఫరాదారు అడ్రస్ ఎంచుకోండి
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ఉద్యోగులను జోడించు
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ఉద్యోగులను జోడించు
 DocType: Purchase Invoice Item,Quality Inspection,నాణ్యత తనిఖీ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,అదనపు చిన్న
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,అదనపు చిన్న
 DocType: Company,Standard Template,ప్రామాణిక మూస
 DocType: Training Event,Theory,థియరీ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
@@ -3448,11 +3471,10 @@
 DocType: SMS Log,No of Sent SMS,పంపిన SMS సంఖ్య
 DocType: Antibiotic,Healthcare Administrator,హెల్త్కేర్ నిర్వాహకుడు
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,టార్గెట్ సెట్ చెయ్యండి
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
 DocType: Dosage Strength,Dosage Strength,మోతాదు శక్తి
 DocType: Account,Expense Account,అధిక వ్యయ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,సాఫ్ట్వేర్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,కలర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,కలర్
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,అసెస్మెంట్ ప్రణాళిక ప్రమాణం
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,ఎంచుకున్న అంశం కోసం గడువు తేదీ తప్పనిసరి
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,కొనుగోలు ఆర్డర్లు అడ్డుకో
@@ -3465,18 +3487,18 @@
 DocType: Patient,Personal and Social History,వ్యక్తిగత మరియు సామాజిక చరిత్ర
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,వినియోగదారు {0} సృష్టించారు
 DocType: Fee Schedule,Fee Breakup for each student,ఫీజు ప్రతి విద్యార్థి కోసం విభజన
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,అసమానంగా నెలల అంతటా లక్ష్యాలను పంపిణీ మంత్లీ పంపిణీ ఎంచుకోండి.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,కోడ్ మార్చండి
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,డీజిల్
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
 DocType: Purchase Invoice,Availed ITC Cess,ITC సెస్ను ఉపయోగించింది
 ,Student Monthly Attendance Sheet,స్టూడెంట్ మంత్లీ హాజరు షీట్
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,సెల్లింగ్ కోసం మాత్రమే షిప్పింగ్ నియమం వర్తిస్తుంది
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ప్రాజెక్ట్ ప్రారంభ తేదీ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,వరకు
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,వరకు
 DocType: Rename Tool,Rename Log,లోనికి ప్రవేశించండి పేరుమార్చు
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,స్టూడెంట్ గ్రూప్ లేదా కోర్సు షెడ్యూల్ తప్పనిసరి
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,బిల్లింగ్ గంటలు మరియు వర్కింగ్ అవర్స్ timesheet అదే నిర్వహించడానికి
@@ -3496,7 +3518,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,మీరు కొనుగోలు లేదా విక్రయించే మీ ఉత్పత్తులను లేదా సేవలను జాబితా చేయండి.
 DocType: Water Analysis,Storage Temperature,నిల్వ ఉష్ణోగ్రత
 DocType: Employee Attendance Tool,Unmarked Attendance,పేరుపెట్టని హాజరు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,పరిశోధకులు
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,పరిశోధకులు
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,ప్రోగ్రామ్ నమోదు టూల్ విద్యార్థి
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,పేరు లేదా ఇమెయిల్ తప్పనిసరి
 DocType: Member,MEM-,MEM-
@@ -3508,7 +3530,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది, మరియు ఈ సరఫరాదారుకి RFQ లు హెచ్చరికతో జారీ చేయాలి."
 DocType: Chapter,Non Profit Manager,లాభరహిత మేనేజర్
 DocType: BOM,Total Cost(Company Currency),మొత్తం వ్యయం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} రూపొందించినవారు సీరియల్ లేవు
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} రూపొందించినవారు సీరియల్ లేవు
 DocType: Homepage,Company Description for website homepage,వెబ్సైట్ హోమ్ కోసం కంపెనీ వివరణ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","వినియోగదారుల సౌలభ్యం కోసం, ఈ సంకేతాలు ఇన్వాయిస్లు మరియు డెలివరీ గమనికలు వంటి ముద్రణ ఫార్మాట్లలో ఉపయోగించవచ్చు"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier పేరు
@@ -3518,11 +3540,10 @@
 DocType: Employee,You can enter any date manually,మీరు మానవీయంగా ఏ తేదీ నమోదు చేయవచ్చు
 DocType: Healthcare Settings,Result Printed,ఫలితం ముద్రించబడింది
 DocType: Asset Category Account,Depreciation Expense Account,అరుగుదల వ్యయం ఖాతా
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ప్రొబేషనరీ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},వీక్షించండి {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ప్రొబేషనరీ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,కేవలం ఆకు నోడ్స్ లావాదేవీ అనుమతించబడతాయి
 DocType: Project,Total Costing Amount (via Timesheets),మొత్తం ఖరీదు మొత్తం (టైమ్ షీట్లు ద్వారా)
-DocType: Employee Advance,Expense Approver,ఖర్చుల అప్రూవర్గా
+DocType: Department,Expense Approver,ఖర్చుల అప్రూవర్గా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,రో {0}: కస్టమర్ వ్యతిరేకంగా అడ్వాన్స్ క్రెడిట్ ఉండాలి
 DocType: Project,Hourly,ప్రతిగంట
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,కాని గ్రూపుకు గ్రూప్
@@ -3531,7 +3552,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,తేదీసమయం కు
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,SMS పంపిణీ స్థితి నిర్వహించాల్సిన దినచర్య
 DocType: Accounts Settings,Make Payment via Journal Entry,జర్నల్ ఎంట్రీ ద్వారా చెల్లింపు చేయండి
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,ప్రింటెడ్ న
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,ప్రింటెడ్ న
 DocType: Item,Inspection Required before Delivery,ఇన్స్పెక్షన్ డెలివరీ ముందు అవసరం
 DocType: Item,Inspection Required before Purchase,తనిఖీ కొనుగోలు ముందు అవసరం
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,పెండింగ్ చర్యలు
@@ -3541,7 +3562,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,కనీస ఆర్డర్ పరిమాణం
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,మీ ఆర్గనైజేషన్
 DocType: Fee Component,Fees Category,ఫీజు వర్గం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ఆంట్
 DocType: Supplier Scorecard,Notify Employee,ఉద్యోగికి తెలియజేయండి
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,విచారణ సోర్స్ ప్రచారం ఉంటే ప్రచారం పేరు ఎంటర్
@@ -3551,7 +3572,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,క్రమాన్ని మార్చు స్థాయి
 DocType: Company,Chart Of Accounts Template,అకౌంట్స్ మూస చార్ట్
 DocType: Attendance,Attendance Date,హాజరు తేదీ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},అంశం ధర {0} లో ధర జాబితా కోసం నవీకరించబడింది {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},అంశం ధర {0} లో ధర జాబితా కోసం నవీకరించబడింది {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ఎర్నింగ్ మరియు తీసివేత ఆధారంగా జీతం విడిపోవటం.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో ఖాతా లెడ్జర్ మార్చబడతాయి కాదు
 DocType: Purchase Invoice Item,Accepted Warehouse,అంగీకరించిన వేర్హౌస్
@@ -3559,10 +3580,11 @@
 DocType: Item,Valuation Method,మదింపు పద్ధతి
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,మార్క్ హాఫ్ డే
 DocType: Sales Invoice,Sales Team,సేల్స్ టీం
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,నకిలీ ఎంట్రీ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,నకిలీ ఎంట్రీ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,సమర్పించే ముందు లబ్ధిదారుడి పేరును నమోదు చేయండి.
 DocType: Program Enrollment Tool,Get Students,స్టూడెంట్స్ పొందండి
 DocType: Serial No,Under Warranty,వారంటీ కింద
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[లోపం]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[లోపం]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,మీరు అమ్మకాల ఉత్తర్వు సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 ,Employee Birthday,Employee పుట్టినరోజు
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,పూర్తి మరమ్మతు కోసం పూర్తి తేదీని దయచేసి ఎంచుకోండి
@@ -3581,7 +3603,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ఉప కాంట్రాక్టు కోసం రిజర్వు చేయబడింది
 DocType: Payment Reconciliation Invoice,Invoice Number,ఇన్వాయిస్ సంఖ్యా
 DocType: Shopping Cart Settings,Orders,ఆర్డర్స్
-DocType: Employee Leave Approver,Leave Approver,అప్రూవర్గా వదిలి
+DocType: Department,Leave Approver,అప్రూవర్గా వదిలి
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,దయచేసి బ్యాచ్ ఎంచుకోండి
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,అసెస్మెంట్ గ్రూప్ పేరు
@@ -3625,7 +3647,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,హబ్ ట్రాక్ చేసిన అంశం
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,స్వీకర్త కోసం ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,పోగుచేసిన తరుగుదల ఖాతా
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,ఈ ఇమెయిల్ ఆటోజెనరేటేడ్
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
 DocType: Program Enrollment,Boarding Student,బోర్డింగ్ విద్యార్థి
 DocType: Asset,Expected Value After Useful Life,వినియోగ జీవితం అయిపోయిన తరువాత ఆశిస్తున్న విలువ
@@ -3650,21 +3671,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},హాజరు రికార్డ్ {0} విద్యార్థి వ్యతిరేకంగా ఉంది {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},సూచన # {0} నాటి {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,అరుగుదల కారణంగా ఆస్తులు పారవేయడం కు తొలగించబడ్డాడు
-DocType: Member,Member,సభ్యుడు
+DocType: Loan,Member,సభ్యుడు
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,చిరునామాలు నిర్వహించండి
 DocType: Work Order Item,Work Order Item,ఆర్డర్ అంశం పని
 DocType: Pricing Rule,Item Code,Item కోడ్
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
 DocType: Agriculture Analysis Criteria,Agriculture Manager,వ్యవసాయ మేనేజర్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 DocType: Supplier Scorecard Period,Variables,వేరియబుల్స్
 DocType: Employee Internal Work History,Employee Internal Work History,Employee అంతర్గత వర్క్ చరిత్ర
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),మూసివేయడం (డాక్టర్)
 DocType: Cheque Print Template,Cheque Size,ప్రిపే సైజు
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,లేదు స్టాక్ సీరియల్ లేవు {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,లేదు స్టాక్ సీరియల్ లేవు {0}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,లావాదేవీలు అమ్మకం పన్ను టెంప్లేట్.
 DocType: Sales Invoice,Write Off Outstanding Amount,అత్యుత్తమ మొత్తం ఆఫ్ వ్రాయండి
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},ఖాతా {0} కంపెనీతో సరిపోలడం లేదు {1}
@@ -3672,7 +3693,6 @@
 DocType: Stock Settings,Default Stock UOM,డిఫాల్ట్ స్టాక్ UoM
 DocType: Asset,Number of Depreciations Booked,Depreciations సంఖ్య బుక్
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Qty మొత్తం
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},ఉద్యోగి లోన్ వ్యతిరేకంగా: {0}
 DocType: Landed Cost Item,Receipt Document,స్వీకరణపై డాక్యుమెంట్
 DocType: Employee Education,School/University,స్కూల్ / విశ్వవిద్యాలయం
 DocType: Payment Request,Reference Details,రిఫరెన్స్ వివరాలు
@@ -3683,7 +3703,7 @@
 DocType: Asset,Double Declining Balance,డబుల్ తగ్గుతున్న సంతులనం
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,క్లోజ్డ్ క్రమంలో రద్దు చేయబడదు. రద్దు Unclose.
 DocType: Student Guardian,Father,తండ్రి
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
 DocType: Bank Reconciliation,Bank Reconciliation,బ్యాంక్ సయోధ్య
 DocType: Attendance,On Leave,సెలవులో ఉన్నాను
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,నవీకరణలు పొందండి
@@ -3697,10 +3717,10 @@
 DocType: Lead,Lower Income,తక్కువ ఆదాయ
 DocType: Restaurant Order Entry,Current Order,ప్రస్తుత ఆర్డర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},మూల మరియు లక్ష్య గిడ్డంగి వరుసగా ఒకే ఉండకూడదు {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ప్రోగ్రామ్లకు వెళ్లండి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},వరుస {0} # కేటాయించబడిన మొత్తాన్ని {2} కంటే ఎక్కువగా కేటాయించబడదు {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},వరుస {0} # కేటాయించబడిన మొత్తాన్ని {2} కంటే ఎక్కువగా కేటాయించబడదు {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;తేదీ నుండి&#39; తర్వాత &#39;తేదీ&#39; ఉండాలి
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
@@ -3723,7 +3743,6 @@
 DocType: Payment Terms Template,Payment Terms,చెల్లింపు నిబందనలు
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,నిమిషం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 DocType: Purchase Invoice,Purchase Taxes and Charges,పన్నులు మరియు ఆరోపణలు కొనుగోలు
 DocType: Chapter,Meetup Embed HTML,మీట్ప్ పొందుపరచు HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,సరఫరాదారులకు వెళ్లండి
@@ -3742,30 +3761,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},కొటేషన్ {0} కాదు రకం {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,నిర్వహణ షెడ్యూల్ అంశం
 DocType: Sales Order,%  Delivered,% పంపిణీ
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,దయచేసి చెల్లింపు అభ్యర్థనను పంపడానికి స్టూడెంట్ కోసం ఇమెయిల్ ID ని సెట్ చేయండి
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,దయచేసి చెల్లింపు అభ్యర్థనను పంపడానికి స్టూడెంట్ కోసం ఇమెయిల్ ID ని సెట్ చేయండి
 DocType: Patient,Medical History,వైద్య చరిత్ర
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,బ్యాంక్ ఓవర్డ్రాఫ్ట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,బ్యాంక్ ఓవర్డ్రాఫ్ట్ ఖాతా
 DocType: Patient,Patient ID,రోగి ID
 DocType: Physician Schedule,Schedule Name,షెడ్యూల్ పేరు
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,వేతనం స్లిప్ చేయండి
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,అన్ని సరఫరాదారులను జోడించండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,అన్ని సరఫరాదారులను జోడించండి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,రో # {0}: కేటాయించిన సొమ్ము బాకీ మొత్తం కంటే ఎక్కువ ఉండకూడదు.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,బ్రౌజ్ BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,సెక్యూర్డ్ లోన్స్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,సెక్యూర్డ్ లోన్స్
 DocType: Purchase Invoice,Edit Posting Date and Time,పోస్ట్ చేసిన తేదీ మరియు సమయం మార్చు
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ఆస్తి వర్గం {0} లేదా కంపెనీ లో అరుగుదల సంబంధించిన అకౌంట్స్ సెట్ దయచేసి {1}
 DocType: Lab Test Groups,Normal Range,సాధారణ శ్రేణి
 DocType: Academic Term,Academic Year,విద్యా సంవత్సరం
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,అందుబాటులో సెల్లింగ్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,మిగిలిన
 DocType: Appraisal,Appraisal,అప్రైసల్
+DocType: Loan,Loan Account,రుణ ఖాతా
 DocType: Purchase Invoice,GST Details,GST వివరాలు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},సరఫరాదారు పంపిన ఇమెయిల్ {0}
 DocType: Item,Default Sales Unit of Measure,కొలత యొక్క డిఫాల్ట్ సేల్స్ యూనిట్
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,విద్యా సంవత్సరం:
+DocType: Subscription,Past Due Date,గత తేదీ తేదీ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},అంశం కోసం ప్రత్యామ్నాయ అంశం సెట్ చేయడానికి అనుమతించవద్దు {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,తేదీ పునరావృతమవుతుంది
@@ -3778,7 +3799,7 @@
 DocType: Patient Appointment,Patient Appointment,పేషెంట్ నియామకం
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,రోల్ ఆమోదిస్తోంది పాలన వర్తిస్తుంది పాత్ర అదే ఉండకూడదు
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ఈ ఇమెయిల్ డైజెస్ట్ నుండి సభ్యత్వాన్ని రద్దు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,ద్వారా సరఫరా పొందండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,ద్వారా సరఫరా పొందండి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},అంశం కోసం {0} కనుగొనబడలేదు {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,కోర్సులు వెళ్ళండి
 DocType: Accounts Settings,Show Inclusive Tax In Print,ప్రింట్లో ఇన్క్లూసివ్ పన్ను చూపించు
@@ -3786,10 +3807,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,సందేశం పంపబడింది
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,పిల్లల నోడ్స్ తో ఖాతా లెడ్జర్ సెట్ కాదు
 DocType: C-Form,II,రెండవ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి ఎడ్యుకేషన్&gt; ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,రేటు ధర జాబితా కరెన్సీ కస్టమర్ యొక్క బేస్ కరెన్సీ మార్చబడుతుంది
 DocType: Purchase Invoice Item,Net Amount (Company Currency),నికర మొత్తం (కంపెనీ కరెన్సీ)
 DocType: Physician,Physician Schedules,వైద్యుడు షెడ్యూల్
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,పూర్తి మంజూరు మొత్తం కంటే మొత్తం ముందస్తు మొత్తం ఎక్కువ కాదు
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,పూర్తి మంజూరు మొత్తం కంటే మొత్తం ముందస్తు మొత్తం ఎక్కువ కాదు
 DocType: Salary Slip,Hour Rate,గంట రేట్
 DocType: Stock Settings,Item Naming By,అంశం ద్వారా నామకరణ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},మరో కాలం ముగింపు ఎంట్రీ {0} తర్వాత జరిగింది {1}
@@ -3807,6 +3829,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},లేదు కంటే పాత స్టాక్ లావాదేవీలు అప్డేట్ అనుమతి {0}
 DocType: BOM,Inspection Required,ఇన్స్పెక్షన్ అవసరం
 DocType: Purchase Invoice Item,PR Detail,పిఆర్ వివరాలు
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,సమర్పించే ముందు బ్యాంకు హామీ సంఖ్యను నమోదు చేయండి.
 DocType: Driving License Category,Class,క్లాస్
 DocType: Sales Order,Fully Billed,పూర్తిగా కస్టమర్లకు
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ఒక అంశం మూసకు వ్యతిరేకంగా వర్క్ ఆర్డర్ ను పెంచలేము
@@ -3817,7 +3840,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ప్యాకేజీ యొక్క స్థూల బరువు. సాధారణంగా నికర బరువు + ప్యాకేజింగ్ పదార్థం బరువు. (ముద్రణ కోసం)
 DocType: Assessment Plan,Program,ప్రోగ్రామ్
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ఈ పాత్ర తో వినియోగదారులు ఘనీభవించిన ఖాతాల వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు ఘనీభవించిన ఖాతాల సెట్ మరియు సృష్టించడానికి / సవరించడానికి అనుమతించింది ఉంటాయి
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి ఎడ్యుకేషన్&gt; ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
 DocType: Serial No,Is Cancelled,రద్దయింది ఉంది
 DocType: Student Group,Group Based On,గ్రూప్ బేస్డ్ న
 DocType: Journal Entry,Bill Date,బిల్ తేదీ
@@ -3828,9 +3850,10 @@
 DocType: Cheque Print Template,Cheque Height,ప్రిపే ఎత్తు
 DocType: Supplier,Supplier Details,సరఫరాదారు వివరాలు
 DocType: Setup Progress,Setup Progress,ప్రోగ్రెస్ సెటప్
+DocType: Expense Claim,Approval Status,ఆమోద స్థితి
 DocType: Hub Settings,Publish Items to Hub,హబ్ కు అంశాలను ప్రచురించడానికి
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},విలువ వరుసగా విలువ కంటే తక్కువ ఉండాలి నుండి {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,వైర్ ట్రాన్స్ఫర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,వైర్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,అన్ని తనిఖీ
 ,Issued Items Against Work Order,వర్క్ ఆర్డర్ వ్యతిరేకంగా జారీ చేసిన అంశాలు
 DocType: Vehicle Log,Invoice Ref,వాయిస్ Ref
@@ -3861,12 +3884,11 @@
 DocType: Customs Tariff Number,Tariff Number,టారిఫ్ సంఖ్య
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP వేర్హౌస్ వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ప్రొజెక్టెడ్
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},సీరియల్ లేవు {0} వేర్హౌస్ చెందినది కాదు {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},సీరియల్ లేవు {0} వేర్హౌస్ చెందినది కాదు {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,గమనిక: {0} పరిమాణం లేదా మొత్తం 0 డెలివరీ ఓవర్ మరియు ఓవర్ బుకింగ్ అంశం కోసం సిస్టమ్ తనిఖీ చెయ్యదు
 DocType: Notification Control,Quotation Message,కొటేషన్ సందేశం
-DocType: Employee Loan,Employee Loan Application,ఉద్యోగి లోన్ అప్లికేషన్
 DocType: Issue,Opening Date,ప్రారంభ తేదీ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,మొదటి రోగిని దయచేసి సేవ్ చేయండి
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,మొదటి రోగిని దయచేసి సేవ్ చేయండి
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,హాజరు విజయవంతంగా మార్క్ చెయ్యబడింది.
 DocType: Program Enrollment,Public Transport,ప్రజా రవాణా
 DocType: Soil Texture,Silt Composition (%),సిల్ట్ కంపోజిషన్ (%)
@@ -3884,7 +3906,7 @@
 ,Item Balance (Simple),అంశం సంతులనం (సింపుల్)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,సప్లయర్స్ పెంచింది బిల్లులు.
 DocType: POS Profile,Write Off Account,ఖాతా ఆఫ్ వ్రాయండి
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,డెబిట్ గమనిక ఆంట్
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,డెబిట్ గమనిక ఆంట్
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,డిస్కౌంట్ మొత్తం
 DocType: Purchase Invoice,Return Against Purchase Invoice,ఎగైనెస్ట్ కొనుగోలు వాయిస్ తిరిగి
 DocType: Item,Warranty Period (in days),(రోజుల్లో) వారంటీ వ్యవధి
@@ -3907,6 +3929,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
 DocType: Sales Invoice Item,Delivered Qty,పంపిణీ ప్యాక్ చేసిన అంశాల
 DocType: Assessment Plan,Assessment Plan,అసెస్మెంట్ ప్రణాళిక
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,రివర్స్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,కస్టమర్ {0} సృష్టించబడింది.
 DocType: Stock Settings,Limit Percent,పరిమితి శాతం
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ఏ గిడ్డంగిలో ప్రస్తుతం స్టాక్ లేదు
@@ -3920,14 +3943,15 @@
 DocType: Journal Entry,Stock Entry,స్టాక్ ఎంట్రీ
 DocType: Payment Entry,Payment References,చెల్లింపు సూచనలు
 DocType: C-Form,C-FORM-,సి ఫారం-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","ఇంటర్వెల్ క్షేత్రం యొక్క విరామాల సంఖ్య ఉదా. ఇంటర్వెల్ &#39;డేస్&#39; మరియు బిల్లింగ్ ఇంటర్వెల్ కౌంట్ 3 అయితే, ఇన్వాయిస్లు ప్రతి 3 రోజులు ఉత్పత్తి చేయబడతాయి"
 DocType: Vehicle,Insurance Details,భీమా వివరాలు
 DocType: Account,Payable,చెల్లించవలసిన
 DocType: Share Balance,Share Type,భాగస్వామ్యం పద్ధతి
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,తిరిగి చెల్లించే కాలాలు నమోదు చేయండి
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,తిరిగి చెల్లించే కాలాలు నమోదు చేయండి
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),రుణగ్రస్తులు ({0})
 DocType: Pricing Rule,Margin,మార్జిన్
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,కొత్త వినియోగదారులు
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,స్థూల లాభం%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,స్థూల లాభం%
 DocType: Appraisal Goal,Weightage (%),వెయిటేజీ (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS ప్రొఫైల్ని మార్చండి
 DocType: Bank Reconciliation Detail,Clearance Date,క్లియరెన్స్ తేదీ
@@ -3937,10 +3961,11 @@
 DocType: Lead,Address Desc,Desc పరిష్కరించేందుకు
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,పార్టీ తప్పనిసరి
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},ఇతర వరుసలలో నకిలీ తేదీలు ఉన్న వరుసలు కనుగొనబడ్డాయి: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},ఇతర వరుసలలో నకిలీ తేదీలు ఉన్న వరుసలు కనుగొనబడ్డాయి: {list}
 DocType: Topic,Topic Name,టాపిక్ పేరు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,దయచేసి HR సెట్టింగ్ల్లో లీవ్ ఆమోద నోటిఫికేషన్ కోసం డిఫాల్ట్ టెంప్లేట్ను సెట్ చేయండి.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,సెల్లింగ్ లేదా కొనుగోలు కనీసం ఒక ఎంపిక చేయాలి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ఉద్యోగి ముందస్తు సంపాదించడానికి ఉద్యోగిని ఎంచుకోండి.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ఉద్యోగి ముందస్తు సంపాదించడానికి ఉద్యోగిని ఎంచుకోండి.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,దయచేసి చెల్లుబాటు అయ్యే తేదీని ఎంచుకోండి
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,మీ వ్యాపార స్వభావం ఎంచుకోండి.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3959,7 +3984,7 @@
 DocType: Asset Movement,Source Warehouse,మూల వేర్హౌస్
 DocType: Installation Note,Installation Date,సంస్థాపన తేదీ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,లెడ్జర్ను భాగస్వామ్యం చేయండి
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},రో # {0}: ఆస్తి {1} లేదు కంపెనీకి చెందిన లేదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},రో # {0}: ఆస్తి {1} లేదు కంపెనీకి చెందిన లేదు {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,సేల్స్ ఇన్వాయిస్ {0} సృష్టించబడింది
 DocType: Employee,Confirmation Date,నిర్ధారణ తేదీ
 DocType: C-Form,Total Invoiced Amount,మొత్తం ఇన్వాయిస్ మొత్తం
@@ -3968,7 +3993,7 @@
 DocType: Account,Accumulated Depreciation,పోగుచేసిన తరుగుదల
 DocType: Supplier Scorecard Scoring Standing,Standing Name,స్టాండింగ్ పేరు
 DocType: Stock Entry,Customer or Supplier Details,కస్టమర్ లేదా సరఫరాదారు వివరాలు
-DocType: Employee Loan Application,Required by Date,తేదీ ద్వారా అవసరం
+DocType: Loan Application,Required by Date,తేదీ ద్వారా అవసరం
 DocType: Lead,Lead Owner,జట్టు యజమాని
 DocType: Production Plan,Sales Orders Detail,సేల్స్ ఆర్డర్స్ వివరాలు
 DocType: Bin,Requested Quantity,అభ్యర్థించిన పరిమాణం
@@ -3981,10 +4006,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,స్థూల పే - మొత్తం తీసివేత - లోన్ తిరిగి చెల్లించే
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,ప్రస్తుత BOM మరియు న్యూ BOM అదే ఉండకూడదు
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,జీతం స్లిప్ ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,బహుళ వైవిధ్యాలు
 DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% పంపిణీ
+DocType: Subscription,Trial Period Start Date,ట్రయల్ పీరియడ్ ప్రారంభ తేదీ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,దయచేసి మరొక యూజర్గా లాగిన్ అవ్వండి.
@@ -4005,12 +4031,11 @@
 DocType: Student Guardian,Student Guardian,స్టూడెంట్ గార్డియన్
 DocType: Member,Member Name,సభ్యుని పేరు
 DocType: Stock Settings,Use Naming Series,నామకరణ సిరీస్ ఉపయోగించండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,వాల్యువేషన్ రకం ఆరోపణలు ఇన్క్లుసివ్ వంటి గుర్తించబడిన చేయవచ్చు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,వాల్యువేషన్ రకం ఆరోపణలు ఇన్క్లుసివ్ వంటి గుర్తించబడిన చేయవచ్చు
 DocType: POS Profile,Update Stock,నవీకరణ స్టాక్
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,చందాలో
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"అంశాలు, వివిధ UoM తప్పు (మొత్తం) నికర బరువు విలువ దారి తీస్తుంది. ప్రతి అంశం యొక్క నికర బరువు అదే UoM లో ఉంది నిర్ధారించుకోండి."
 DocType: Membership,Payment Details,చెల్లింపు వివరాలు
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,బిఒఎం రేటు
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,బిఒఎం రేటు
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","నిలిపివేయబడింది వర్క్ ఆర్డర్ రద్దు చేయబడదు, రద్దు చేయడానికి ముందుగా దాన్ని అన్స్టాప్ చేయండి"
 DocType: Asset,Journal Entry for Scrap,స్క్రాప్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,డెలివరీ గమనిక అంశాలను తీసి దయచేసి
@@ -4030,6 +4055,7 @@
 DocType: Land Unit,Land Unit,ల్యాండ్ యూనిట్
 ,Purchase Analytics,కొనుగోలు Analytics
 DocType: Sales Invoice Item,Delivery Note Item,డెలివరీ గమనిక అంశం
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,ప్రస్తుత ఇన్వాయిస్ {0} లేదు
 DocType: Asset Maintenance Log,Task,టాస్క్
 DocType: Purchase Taxes and Charges,Reference Row #,సూచన రో #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},బ్యాచ్ సంఖ్య అంశం తప్పనిసరి {0}
@@ -4041,7 +4067,7 @@
 DocType: Company,Exchange Gain / Loss Account,ఎక్స్చేంజ్ పెరుగుట / నష్టం ఖాతాకు
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ఉద్యోగి మరియు హాజరు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},ప్రయోజనం ఒకటి ఉండాలి {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,రూపం నింపి దాన్ని సేవ్
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,రూపం నింపి దాన్ని సేవ్
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,కమ్యూనిటీ ఫోరమ్
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,స్టాక్ యాక్చువల్ అంశాల
 DocType: Homepage,"URL for ""All Products""",&quot;అన్ని ఉత్పత్తులు&quot; కోసం URL
@@ -4055,7 +4081,7 @@
 DocType: Lab Test Template,Standard Selling Rate,ప్రామాణిక సెల్లింగ్ రేటు
 DocType: Account,Rate at which this tax is applied,ఈ పన్ను వర్తించబడుతుంది రేటుపై
 DocType: Cash Flow Mapper,Section Name,విభాగం పేరు
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,క్రమాన్ని మార్చు ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,క్రమాన్ని మార్చు ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ప్రస్తుత Job ఖాళీలు
 DocType: Company,Stock Adjustment Account,స్టాక్ అడ్జస్ట్మెంట్ ఖాతా
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ఆఫ్ వ్రాయండి
@@ -4066,9 +4092,9 @@
 DocType: Task,depends_on,ఆధారపడి
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,మెటీరియల్స్ అన్ని బిల్లులో తాజా ధరను నవీకరించడానికి క్యూ. దీనికి కొన్ని నిమిషాలు పట్టవచ్చు.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,కొత్త ఖాతా యొక్క పేరు. గమనిక: వినియోగదారులు మరియు సరఫరాదారులతో కోసం ఖాతాలను సృష్టించడం లేదు దయచేసి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,దేశం వారీగా డిఫాల్ట్ చిరునామా టెంప్లేట్లు
 DocType: Water Analysis,Appearance,స్వరూపం
+DocType: HR Settings,Leave Status Notification Template,స్థితి నోటిఫికేషన్ టెంప్లేట్ వదిలివేయి
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,కనీస. ధర జాబితా రేట్ కొనుగోలు
 DocType: Sales Order Item,Supplier delivers to Customer,సరఫరాదారు కస్టమర్ కు అందిస్తాడు
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,సభ్యుడు సమాచారం.
@@ -4091,7 +4117,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,అనుమతి లేదు. దయచేసి టెస్ట్ మూసను నిలిపివేయండి
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,శాతం కేటాయింపు 100% సమానంగా ఉండాలి
 DocType: Crop Cycle,Linked Land Unit,లింక్డ్ ల్యాండ్ యూనిట్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 DocType: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
@@ -4107,7 +4133,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,వినియోగదారులకు వెళ్లండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,చెల్లించిన మొత్తం పరిమాణం గ్రాండ్ మొత్తం కంటే ఎక్కువ ఉండకూడదు ఆఫ్ వ్రాయండి +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} అంశం కోసం ఒక చెల్లుబాటులో బ్యాచ్ సంఖ్య కాదు {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},గమనిక: లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},గమనిక: లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,చెల్లని GSTIN లేదా నమోదుకాని కోసం NA ఎంటర్
 DocType: Training Event,Seminar,సెమినార్
 DocType: Program Enrollment Fee,Program Enrollment Fee,ప్రోగ్రామ్ నమోదు రుసుము
@@ -4123,14 +4149,14 @@
 DocType: Hub Settings,Publish Availability,అందుబాటు ప్రచురించు
 DocType: Company,Create Chart Of Accounts Based On,అకౌంట్స్ బేస్డ్ న చార్ట్ సృష్టించు
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,గుంపుగా మార్చలేరు. చైల్డ్ విధులు ఉన్నాయి.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
 ,Stock Ageing,స్టాక్ ఏజింగ్
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},స్టూడెంట్ {0} విద్యార్ధి దరఖాస్తుదారు వ్యతిరేకంగా ఉనికిలో {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),వృత్తాకార అడ్జస్ట్మెంట్ (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,సమయ పట్టిక
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,బ్యాచ్:
 DocType: Volunteer,Afternoon,మధ్యాహ్నం
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ఓపెన్ గా సెట్
 DocType: Cheque Print Template,Scanned Cheque,స్కాన్ చేసిన ప్రిపే
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,సమర్పిస్తోంది లావాదేవీలపై కాంటాక్ట్స్ ఆటోమేటిక్ ఇమెయిల్స్ పంపడం.
@@ -4146,7 +4172,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,ప్రాజెక్ట్ {0} ఇప్పటికే ఉంది
 DocType: Medical Department,Nursing User,నర్సింగ్ వాడుకరి
 DocType: Plant Analysis,Plant Analysis Criterias,ప్లాంట్ అనాలిసిస్ క్రైటీరియస్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,బాధ్యతలు
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,బాధ్యతలు
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ఈ ఉల్లేఖన యొక్క కాలం చెల్లినది.
 DocType: Expense Claim Account,Expense Claim Account,ఖర్చు చెప్పడం ఖాతా
 DocType: Accounts Settings,Allow Stale Exchange Rates,స్థిర మార్పిడి రేట్లు అనుమతించు
@@ -4168,11 +4194,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,వైవిధ్యాలు చేయండి
 DocType: Item,Default BOM,డిఫాల్ట్ BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),మొత్తం బిల్లు మొత్తం (సేల్స్ ఇన్వాయిస్లు ద్వారా)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,డెబిట్ గమనిక మొత్తం
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,డెబిట్ గమనిక మొత్తం
 DocType: Project Update,Not Updated,నవీకరించబడలేదు
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","రేట్ల సంఖ్య, వాటాల సంఖ్య మరియు లెక్కించిన మొత్తం మధ్య అసమానతలు ఉన్నాయి"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,మొత్తం అద్భుతమైన ఆంట్
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,మొత్తం అద్భుతమైన ఆంట్
 DocType: Journal Entry,Printing Settings,ప్రింటింగ్ సెట్టింగ్స్
 DocType: Employee Advance,Advance Account,అడ్వాన్స్ అకౌంట్
 DocType: Job Offer,Job Offer Terms,ఉద్యోగ ఆఫర్ నిబంధనలు
@@ -4181,7 +4207,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ఆటోమోటివ్
 DocType: Vehicle,Insurance Company,ఇన్సూరెన్స్ కంపెనీ
 DocType: Asset Category Account,Fixed Asset Account,స్థిర ఆస్తి ఖాతా
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,వేరియబుల్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,వేరియబుల్
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,డెలివరీ గమనిక
 DocType: Chapter,Members,సభ్యులు
 DocType: Student,Student Email Address,స్టూడెంట్ ఇమెయిల్ అడ్రస్
@@ -4205,7 +4231,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,ఇంటర్న్
 DocType: Delivery Stop,Address Name,చిరునామా పేరు
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} విభజన {0} యూనిట్లు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} విభజన {0} యూనిట్లు
 DocType: Assessment Code,Assessment Code,అసెస్మెంట్ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,ప్రాథమిక
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} స్తంభింప ముందు స్టాక్ లావాదేవీలు
@@ -4213,25 +4239,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
 DocType: Bank Reconciliation Detail,Payment Document,చెల్లింపు డాక్యుమెంట్
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,ప్రమాణాల సూత్రాన్ని మూల్యాంకనం చేయడంలో లోపం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,చేరిన తేదీ పుట్టిన తేది కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,చేరిన తేదీ పుట్టిన తేది కంటే ఎక్కువ ఉండాలి
+DocType: Subscription,Plans,ప్రణాళికలు
 DocType: Salary Slip,Salary Structure,జీతం నిర్మాణం
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,వైనానిక
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ఇష్యూ మెటీరియల్
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,పునరావృతమయ్యేటప్పుడు లోపం సంభవించింది
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ఇష్యూ మెటీరియల్
 DocType: Material Request Item,For Warehouse,వేర్హౌస్ కోసం
 DocType: Employee,Offer Date,ఆఫర్ తేదీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,కొటేషన్స్
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,తోబుట్టువుల స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 DocType: Purchase Invoice Item,Serial No,సీరియల్ లేవు
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,మంత్లీ నంతవరకు మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,మంత్లీ నంతవరకు మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,మొదటి Maintaince వివరాలు నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,రో # {0}: ఊహించిన డెలివరీ తేదీని కొనుగోలు ఆర్డర్ తేదీకి ముందు ఉండకూడదు
 DocType: Purchase Invoice,Print Language,ప్రింట్ భాషా
 DocType: Salary Slip,Total Working Hours,మొత్తం వర్కింగ్ అవర్స్
 DocType: Sales Invoice,Customer PO Details,కస్టమర్ PO వివరాలు
-DocType: Subscription,Next Schedule Date,తదుపరి షెడ్యూల్ తేదీ
 DocType: Stock Entry,Including items for sub assemblies,ఉప శాసనసభలకు అంశాలు సహా
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,తాత్కాలిక ప్రారంభ ఖాతా
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
@@ -4260,11 +4285,11 @@
 DocType: Issue,Opening Time,ప్రారంభ సమయం
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,నుండి మరియు అవసరమైన తేదీలు
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,సెక్యూరిటీస్ అండ్ కమోడిటీ ఎక్స్చేంజెస్
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,పేర్కొన్న ప్రమాణం కోసం ఉద్యోగులు లేరు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
 DocType: Hotel Settings,Default Customer,డిఫాల్ట్ కస్టమర్
 DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,అదే రోజున నియామకం సృష్టించబడితే నిర్ధారించవద్దు
@@ -4289,16 +4314,16 @@
 DocType: Journal Entry Account,Employee Advance,ఉద్యోగి అడ్వాన్స్
 DocType: Payroll Entry,Payroll Frequency,పేరోల్ ఫ్రీక్వెన్సీ
 DocType: Lab Test Template,Sensitivity,సున్నితత్వం
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,ముడి సరుకు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,ముడి సరుకు
 DocType: Leave Application,Follow via Email,ఇమెయిల్ ద్వారా అనుసరించండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,మొక్కలు మరియు Machineries
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,మొక్కలు మరియు Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను సొమ్ము
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,డైలీ వర్క్ సారాంశం సెట్టింగులు
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,దయచేసి తేదీ ద్వారా రిక్డ్ నమోదు చేయండి
 DocType: Payment Entry,Internal Transfer,అంతర్గత బదిలీ
 DocType: Asset Maintenance,Maintenance Tasks,నిర్వహణ పనులు
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
 DocType: Leave Control Panel,Carry Forward,కుంటున్న
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ లెడ్జర్ మార్చబడతాయి కాదు
@@ -4306,14 +4331,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext ఇంటిగ్రేషన్లు
 DocType: Crop Cycle,Detected Disease,గుర్తించిన వ్యాధి
 ,Produced,ఉత్పత్తి
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,చెల్లింపు ప్రారంభ తేదీ చెల్లింపు తేదీకి ముందు ఉండకూడదు.
 DocType: Item,Item Code for Suppliers,సప్లయర్స్ కోసం Item కోడ్
 DocType: Issue,Raised By (Email),లేవనెత్తారు (ఇమెయిల్)
 DocType: Training Event,Trainer Name,శిక్షణ పేరు
 DocType: Mode of Payment,General,జనరల్
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,చివరి కమ్యూనికేషన్
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,చివరి కమ్యూనికేషన్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',వర్గం &#39;వాల్యువేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},సీరియల్ అంశం కోసం సీరియల్ మేము అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',వర్గం &#39;వాల్యువేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},సీరియల్ అంశం కోసం సీరియల్ మేము అవసరం {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,రసీదులు చెల్లింపుల మ్యాచ్
 DocType: Journal Entry,Bank Entry,బ్యాంక్ ఎంట్రీ
 DocType: Authorization Rule,Applicable To (Designation),వర్తించదగిన (హోదా)
@@ -4327,7 +4353,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ డిసేబుల్ కరెన్సీలు ప్రారంభించు.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},డాక్టర్ {0} హాఫ్ డే లీవ్ ఆన్ {1}
 DocType: Production Plan,Get Material Request,మెటీరియల్ అభ్యర్థన పొందండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,పోస్టల్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,పోస్టల్ ఖర్చులు
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),మొత్తం (ఆంట్)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,వినోదం &amp; లీజర్
 ,Item Variant Details,అంశం వేరియంట్ వివరాలు
@@ -4338,9 +4364,9 @@
 DocType: Drug Prescription,Hour,అవర్
 DocType: Restaurant Order Entry,Last Sales Invoice,చివరి సేల్స్ ఇన్వాయిస్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},దయచేసి వస్తువుకి వ్యతిరేకంగా Qty ను ఎంచుకోండి {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,కొత్త సీరియల్ లేవు వేర్హౌస్ కలిగి చేయవచ్చు. వేర్హౌస్ స్టాక్ ఎంట్రీ లేదా కొనుగోలు రసీదులు ద్వారా ఏర్పాటు చేయాలి
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,కొత్త సీరియల్ లేవు వేర్హౌస్ కలిగి చేయవచ్చు. వేర్హౌస్ స్టాక్ ఎంట్రీ లేదా కొనుగోలు రసీదులు ద్వారా ఏర్పాటు చేయాలి
 DocType: Lead,Lead Type,లీడ్ టైప్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ఈ అన్ని అంశాలపై ఇప్పటికే ఇన్వాయిస్ చేశారు
 DocType: Company,Monthly Sales Target,మంత్లీ సేల్స్ టార్గెట్
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},ద్వారా ఆమోదం {0}
@@ -4348,7 +4374,7 @@
 DocType: Item,Default Material Request Type,డిఫాల్ట్ మెటీరియల్ అభ్యర్థన రకం
 DocType: Supplier Scorecard,Evaluation Period,మూల్యాంకనం కాలం
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,తెలియని
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,వర్క్ ఆర్డర్ సృష్టించబడలేదు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,వర్క్ ఆర్డర్ సృష్టించబడలేదు
 DocType: Shipping Rule,Shipping Rule Conditions,షిప్పింగ్ రూల్ పరిస్థితులు
 DocType: Purchase Invoice,Export Type,ఎగుమతి రకం
 DocType: Salary Slip Loan,Salary Slip Loan,జీతం స్లిప్ లోన్
@@ -4364,8 +4390,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,ప్రారంభ ఇన్వాయిస్లు సారాంశం
 DocType: Education Settings,Education Manager,ఎడ్యుకేషన్ మేనేజర్
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,వాంఛనీయ వృద్ధి కోసం రంగంలో ప్రతి మొక్క మధ్య కనీస పొడవు
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","సమూహం చేయబడిన అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి నవీకరించబడింది సాధ్యం కాదు, బదులుగా స్టాక్ ఎంట్రీ ఉపయోగించడానికి"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","సమూహం చేయబడిన అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి నవీకరించబడింది సాధ్యం కాదు, బదులుగా స్టాక్ ఎంట్రీ ఉపయోగించడానికి"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","సమూహం చేయబడిన అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి నవీకరించబడింది సాధ్యం కాదు, బదులుగా స్టాక్ ఎంట్రీ ఉపయోగించడానికి"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","సమూహం చేయబడిన అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి నవీకరించబడింది సాధ్యం కాదు, బదులుగా స్టాక్ ఎంట్రీ ఉపయోగించడానికి"
 DocType: Quality Inspection,Report Date,నివేదిక తేదీ
 DocType: Student,Middle Name,మధ్య పేరు
 DocType: C-Form,Invoices,రసీదులు
@@ -4398,20 +4424,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,స్వీకరణపై
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,స్వీకరణపై
 ,Sales Register,సేల్స్ నమోదు
 DocType: Daily Work Summary Group,Send Emails At,వద్ద ఇమెయిల్స్ పంపడం
 DocType: Quotation,Quotation Lost Reason,కొటేషన్ లాస్ట్ కారణము
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,సవరించడానికి ఉంది ఏమీ.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,ఫారమ్ వీక్షణ
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,వ్యయాల దావాలో వ్యయం అప్రోవర్మెంట్ తప్పనిసరి
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",మిమ్మల్ని కాకుండా మీ సంస్థకు వినియోగదారులను జోడించండి.
 DocType: Customer Group,Customer Group Name,కస్టమర్ గ్రూప్ పేరు
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ఇంకా వినియోగదారుడు లేవు!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,లావాదేవి నివేదిక
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,విషయం అభ్యర్థన సృష్టించబడలేదు
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,లైసెన్సు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
@@ -4434,11 +4461,12 @@
 DocType: Vehicle,Chassis No,చట్రపు లేవు
 DocType: Payment Request,Initiated,ప్రారంభించిన
 DocType: Production Plan Item,Planned Start Date,ప్రణాళిక ప్రారంభ తేదీ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,దయచేసి BOM ను ఎంచుకోండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,దయచేసి BOM ను ఎంచుకోండి
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC ఇంటిగ్రేటెడ్ టాక్స్ను ఉపయోగించింది
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
+DocType: Bank Guarantee,Clauses and Conditions,క్లాజులు మరియు షరతులు
 DocType: Serial No,Creation Document Type,సృష్టి డాక్యుమెంట్ టైప్
 DocType: Project Task,View Timesheet,టైమ్ షీట్ చూడండి
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,ముగింపు తేదీ కంటే తేదీ ముగింపు తప్పక ఉండాలి
 DocType: Leave Type,Is Encash,Encash ఉంది
 DocType: Leave Allocation,New Leaves Allocated,కొత్త ఆకులు కేటాయించిన
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
@@ -4452,9 +4480,10 @@
 DocType: Patient,Alcohol Current Use,ఆల్కహాల్ కరెంట్ యూజ్
 DocType: Student Admission Program,Student Admission Program,స్టూడెంట్ అడ్మిషన్ ప్రోగ్రాం
 DocType: Payment Entry,Account Paid To,ఖాతా చెల్లింపు
+DocType: Subscription Settings,Grace Period,గ్రేస్ కాలం
 DocType: Item Alternative,Alternative Item Name,ప్రత్యామ్నాయ అంశం పేరు
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,మాతృ అంశం {0} స్టాక్ అంశం ఉండకూడదు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ఏ జీతం స్లిప్ని సమర్పించలేక పోయాను <br> \ సాధ్యమైన కారణాలు: <br> \ 1. నికర చెల్లింపు 0 కన్నా తక్కువ. <br> \ 2. ఉద్యోగి మాస్టర్ లో పేర్కొన్న కంపెనీ ఇమెయిల్ చిరునామా చెల్లదు. <br>
@@ -4464,7 +4493,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ఖాతా కోసం బడ్జెట్ {1} వ్యతిరేకంగా {2} {3} ఉంది {4}. ఇది మించి {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,మరియు అన్చెక్టెడ్ లో డిసేబుల్డ్
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,సిరీస్ తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,ఫైనాన్షియల్ సర్వీసెస్
 DocType: Student Sibling,Student ID,విద్యార్థి ID
@@ -4476,14 +4504,16 @@
 DocType: Complaint,Complaint,ఫిర్యాదు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,తిరిగి చెల్లించు ఎంట్రీ చేయండి
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,అన్ని విభాగాలు
 DocType: Patient,Alcohol Past Use,ఆల్కహాల్ పాస్ట్ యూజ్
 DocType: Fertilizer Content,Fertilizer Content,ఎరువులు కంటెంట్
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,సమస్యాత్మక / స్టక్
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
 DocType: Share Transfer,Transfer,ట్రాన్స్ఫర్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,ఈ సేల్స్ ఆర్డర్ను రద్దు చేయడానికి ముందు కార్య క్రమం {0} రద్దు చేయాలి
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
@@ -4507,10 +4537,11 @@
 DocType: Cheque Print Template,Message to show,చూపించడానికి సందేశాన్ని
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,రిటైల్
 DocType: Student Attendance,Absent,ఆబ్సెంట్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,ఉత్పత్తి కట్ట
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,ఉత్పత్తి కట్ట
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} వద్ద ప్రారంభమయ్యే స్కోర్ను కనుగొనడం సాధ్యం కాలేదు. మీరు 100 నుండి 100 వరకు ఉన్న స్కోర్లను కలిగి ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},రో {0}: చెల్లని సూచన {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,పన్నులు మరియు ఆరోపణలు మూస కొనుగోలు
+DocType: Subscription,Current Invoice Start Date,ప్రస్తుత ఇన్వాయిస్ ప్రారంభ తేదీ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: గాని డెబిట్ లేదా క్రెడిట్ మొత్తం అవసరమైన {2}
 DocType: GL Entry,Remarks,విశేషాంశాలు
@@ -4520,11 +4551,13 @@
 DocType: Task,Parent Task,మాతృ టాస్క్
 DocType: Journal Entry,Write Off Based On,బేస్డ్ న ఆఫ్ వ్రాయండి
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,లీడ్ చేయండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
 DocType: Stock Settings,Show Barcode Field,షో బార్కోడ్ ఫీల్డ్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","జీతం ఇప్పటికే మధ్య {0} మరియు {1}, అప్లికేషన్ కాలం వదిలి ఈ తేదీ పరిధి మధ్య ఉండకూడదు కాలానికి ప్రాసెస్."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","జీతం ఇప్పటికే మధ్య {0} మరియు {1}, అప్లికేషన్ కాలం వదిలి ఈ తేదీ పరిధి మధ్య ఉండకూడదు కాలానికి ప్రాసెస్."
+DocType: Fiscal Year,Auto Created,ఆటో సృష్టించబడింది
 DocType: Chapter Member,Leave Reason,కారణం వదిలివేయండి
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,వాయిస్ {0} ఇకపై లేదు
 DocType: Guardian Interest,Guardian Interest,గార్డియన్ వడ్డీ
 DocType: Volunteer,Availability,లభ్యత
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS ఇన్వాయిస్లు కోసం డిఫాల్ట్ విలువలను సెటప్ చేయండి
@@ -4533,14 +4566,13 @@
 DocType: Timesheet,Employee Detail,ఉద్యోగి వివరాలు
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ఇమెయిల్ ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ఇమెయిల్ ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,తదుపరి తేదీ రోజు మరియు నెల దినాన రిపీట్ సమానంగా ఉండాలి
 DocType: Lab Prescription,Test Code,టెస్ట్ కోడ్
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,వెబ్సైట్ హోమ్ కోసం సెట్టింగులు
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{0} స్కోర్కార్డ్ స్టాండింగ్ కారణంగా {0} కోసం RFQ లు అనుమతించబడవు
 DocType: Job Offer,Awaiting Response,రెస్పాన్స్ వేచిఉండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,పైన
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},మొత్తం పరిమాణం {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},మొత్తం పరిమాణం {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
 DocType: Supplier,Mention if non-standard payable account,చెప్పలేదు ప్రామాణికం కాని చెల్లించవలసిన ఖాతా ఉంటే
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',దయచేసి &#39;అన్ని అసెస్మెంట్ గుంపులు&#39; కంటే ఇతర అంచనా సమూహం ఎంచుకోండి
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,EcritureDate
@@ -4550,7 +4582,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,నీటి విశ్లేషణ
 DocType: Chapter,Region,ప్రాంతం
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ఐచ్ఛికము. ఈ సెట్టింగ్ వివిధ లావాదేవీలలో ఫిల్టర్ ఉపయోగించబడుతుంది.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
 DocType: Holiday List,Weekly Off,వీక్లీ ఆఫ్
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,రీలోడ్ లింక్డ్ ఎనాలిసిస్
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ఉదా 2012, 2012-13"
@@ -4566,7 +4598,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,చిత్తు ఆస్తి యొక్క ధర
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: కాస్ట్ సెంటర్ అంశం తప్పనిసరి {2}
 DocType: Vehicle,Policy No,విధానం లేవు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 DocType: Asset,Straight Line,సరళ రేఖ
 DocType: Project User,Project User,ప్రాజెక్ట్ యూజర్
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,స్ప్లిట్
@@ -4606,21 +4638,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,మార్గం
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ఇది పిల్లల నోడ్స్ కలిగి లెడ్జర్ కాస్ట్ సెంటర్ మార్చేందుకు కాదు
 DocType: Production Plan,Total Planned Qty,మొత్తం ప్రణాళికాబద్ధమైన Qty
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ఓపెనింగ్ విలువ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ఓపెనింగ్ విలువ
 DocType: Salary Detail,Formula,ఫార్ములా
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,సీరియల్ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,సీరియల్ #
 DocType: Lab Test Template,Lab Test Template,ల్యాబ్ టెస్ట్ మూస
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,సేల్స్ ఖాతా
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,సేల్స్ ఖాతా
 DocType: Purchase Invoice Item,Total Weight,మొత్తం బరువు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,సేల్స్ కమిషన్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,సేల్స్ కమిషన్
 DocType: Job Offer Term,Value / Description,విలువ / వివరణ
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
 DocType: Purchase Order Item,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
 DocType: Restaurant Order Entry,Restaurant Order Entry,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
 DocType: Asset Maintenance Task,Assign To Name,పేరు అప్పగించుము
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,వినోదం ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,వినోదం ఖర్చులు
 DocType: Hub Settings,Enabled Users,ప్రారంభించబడ్డ వినియోగదారులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,మెటీరియల్ అభ్యర్థన చేయడానికి
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},ఓపెన్ అంశం {0}
@@ -4633,24 +4665,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,సెలవు కోసం అప్లికేషన్స్.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,ఇప్పటికే లావాదేవీతో ఖాతా తొలగించడం సాధ్యం కాదు
 DocType: Vehicle,Last Carbon Check,చివరి కార్బన్ పరిశీలించడం
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,లీగల్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,లీగల్ ఖర్చులు
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,దయచేసి వరుసగా న పరిమాణం ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,ప్రారంభ అమ్మకాలు మరియు కొనుగోలు రసీదులు చేయండి
 DocType: Purchase Invoice,Posting Time,పోస్టింగ్ సమయం
 DocType: Timesheet,% Amount Billed,% మొత్తం కస్టమర్లకు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,టెలిఫోన్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,టెలిఫోన్ ఖర్చులు
 DocType: Sales Partner,Logo,లోగో
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,మీరు సేవ్ ముందు వరుస ఎంచుకోండి యూజర్ బలవంతం అనుకుంటే ఈ తనిఖీ. మీరు ఈ తనిఖీ ఉంటే ఏ డిఫాల్ట్ ఉంటుంది.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},సీరియల్ లేవు ఐటెమ్ను {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},సీరియల్ లేవు ఐటెమ్ను {0}
 DocType: Email Digest,Open Notifications,ఓపెన్ ప్రకటనలు
 DocType: Payment Entry,Difference Amount (Company Currency),తేడా మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ప్రత్యక్ష ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ప్రత్యక్ష ఖర్చులు
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,కొత్త కస్టమర్ రెవెన్యూ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ప్రయాణ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ప్రయాణ ఖర్చులు
 DocType: Maintenance Visit,Breakdown,విభజన
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Doctype {0} లో కస్టమ్ ఫీల్డ్ చందాను జోడించు
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
 DocType: Purchase Receipt Item,Sample Quantity,నమూనా పరిమాణం
+DocType: Bank Guarantee,Name of Beneficiary,లబ్ధిదారు పేరు
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",తాజా వాల్యుయేషన్ రేట్ / ధర జాబితా రేటు / ముడి పదార్థాల చివరి కొనుగోలు రేట్ ఆధారంగా షెడ్యూలర్ ద్వారా స్వయంచాలకంగా BOM ధరని నవీకరించండి.
 DocType: Bank Reconciliation Detail,Cheque Date,ప్రిపే తేదీ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ఖాతా {0}: మాతృ ఖాతా {1} సంస్థ చెందదు: {2}
@@ -4662,14 +4694,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,పరిశీలన
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,జీతం భాగాలు
 DocType: Program Enrollment Tool,New Academic Year,కొత్త విద్యా సంవత్సరం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
 DocType: GST Settings,B2C Limit,B2C పరిమితి
 DocType: Work Order Item,Transferred Qty,బదిలీ ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/config/learn.py +11,Navigating,నావిగేట్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,ప్లానింగ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,ప్లానింగ్
 DocType: Share Balance,Issued,జారి చేయబడిన
+DocType: Loan,Repayment Start Date,చెల్లింపు ప్రారంభ తేదీ
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,స్టూడెంట్ ఆక్టివిటీ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,సరఫరాదారు Id
 DocType: Payment Request,Payment Gateway Details,చెల్లింపు గేట్వే వివరాలు
@@ -4682,10 +4715,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","సాధారణం వంటి ఆకులు రకం, జబ్బుపడిన మొదలైనవి"
 DocType: Email Digest,Send regular summary reports via Email.,ఇమెయిల్ ద్వారా సాధారణ సారాంశం నివేదికలు పంపండి.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 DocType: Assessment Result,Student Name,విద్యార్థి పేరు
 DocType: Brand,Item Manager,అంశం మేనేజర్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,పేరోల్ చెల్లించవలసిన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,పేరోల్ చెల్లించవలసిన
 DocType: Buying Settings,Default Supplier Type,డిఫాల్ట్ సరఫరాదారు టైప్
 DocType: Plant Analysis,Collection Datetime,సేకరణ డేటాటైమ్
 DocType: Work Order,Total Operating Cost,మొత్తం నిర్వహణ వ్యయంలో
@@ -4695,9 +4728,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,వాడుకరి {0} ఉనికిలో లేదు
 DocType: Payment Term,Day(s) after invoice date,ఇన్వాయిస్ తేదీ తర్వాత డే (లు)
 DocType: Payment Schedule,Payment Schedule,చెల్లింపు షెడ్యూల్
-DocType: Subscription,SUB-,ఉప
 DocType: Item Attribute Value,Abbreviation,సంక్షిప్త
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,చెల్లింపు ఎంట్రీ ఇప్పటికే ఉంది
+DocType: Subscription,Trial Period End Date,ట్రయల్ గడువు ముగింపు తేదీ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} పరిమితులు మించిపోయింది నుండి authroized లేదు
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,జీతం టెంప్లేట్ మాస్టర్.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,పాథాలజీ
@@ -4714,9 +4747,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
 ,Territory Target Variance Item Group-Wise,భూభాగం టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,పోగుచేసిన మంత్లీ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,పన్ను మూస తప్పనిసరి.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ఖాతా {0}: మాతృ ఖాతా {1} ఉనికిలో లేదు
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ధర జాబితా రేటు (కంపెనీ కరెన్సీ)
@@ -4725,14 +4758,15 @@
 DocType: Lab Prescription,Test Created,పరీక్ష సృష్టించబడింది
 DocType: Healthcare Settings,Custom Signature in Print,ముద్రణలో అనుకూల సంతకం
 DocType: Account,Temporary,తాత్కాలిక
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,కస్టమర్ LPO నం.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,కస్టమర్ LPO నం.
 DocType: Program,Courses,కోర్సులు
 DocType: Monthly Distribution Percentage,Percentage Allocation,శాతం కేటాయింపు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,కార్యదర్శి
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,కార్యదర్శి
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","డిసేబుల్ ఉన్నా, ఫీల్డ్ &#39;వర్డ్స్&#39; ఏ లావాదేవీ లో కనిపించవు"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,ఈ చర్య భవిష్యత్ బిల్లింగ్ను ఆపివేస్తుంది. మీరు ఖచ్చితంగా ఈ సభ్యత్వాన్ని రద్దు చేయాలనుకుంటున్నారా?
 DocType: Serial No,Distinct unit of an Item,ఒక అంశం యొక్క విలక్షణ యూనిట్
 DocType: Supplier Scorecard Criteria,Criteria Name,ప్రమాణం పేరు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,కంపెనీ సెట్ దయచేసి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,కంపెనీ సెట్ దయచేసి
 DocType: Pricing Rule,Buying,కొనుగోలు
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,వ్యాధులు మరియు ఎరువులు
 DocType: HR Settings,Employee Records to be created by,Employee రికార్డ్స్ ద్వారా సృష్టించబడుతుంది
@@ -4741,18 +4775,18 @@
 DocType: POS Profile,Apply Discount On,డిస్కౌంట్ న వర్తించు
 DocType: Member,Membership Type,సభ్యత్వ రకం
 ,Reqd By Date,Reqd తేదీ ద్వారా
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,రుణదాతల
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,రుణదాతల
 DocType: Assessment Plan,Assessment Name,అసెస్మెంట్ పేరు
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,ప్రింట్ లో PDC ను చూపించు
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,ప్రింట్ లో PDC ను చూపించు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,రో # {0}: సీరియల్ సంఖ్య తప్పనిసరి ఉంది
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,అంశం వైజ్ పన్ను వివరాలు
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,జాబ్ ఆఫర్
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,ఇన్స్టిట్యూట్ సంక్షిప్తీకరణ
 ,Item-wise Price List Rate,అంశం వారీగా ధర జాబితా రేటు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 DocType: Consultation,C-,సి
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
@@ -4770,7 +4804,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,మొత్తం మార్పులలో
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ప్రారంభించబడితే, సిస్టమ్ స్వయంచాలకంగా జాబితా కోసం అకౌంటింగ్ ఎంట్రీలు పోస్ట్ ఉంటుంది."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,బ్రోకరేజ్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ఉద్యోగుల {0} హాజరు ఇప్పటికే ఈ రోజు గుర్తించబడింది
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ఉద్యోగుల {0} హాజరు ఇప్పటికే ఈ రోజు గుర్తించబడింది
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",మినిట్స్ లో &#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
 DocType: Customer,From Lead,లీడ్ నుండి
@@ -4781,6 +4815,7 @@
 DocType: Lab Test,Approved Date,ఆమోదించబడిన తేదీ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
+DocType: Subscriber,Subscriber Name,సబ్స్క్రయిబర్ పేరు
 DocType: Serial No,Out of Warranty,వారంటీ బయటకు
 DocType: BOM Update Tool,Replace,పునఃస్థాపించుము
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ఏ ఉత్పత్తులు దొరకలేదు.
@@ -4790,19 +4825,18 @@
 DocType: Request for Quotation Item,Project Name,ప్రాజెక్ట్ పేరు
 DocType: Customer,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
 DocType: Journal Entry Account,If Income or Expense,ఆదాయం వ్యయం ఉంటే
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ఉద్యోగి రుణంలో వడ్డీ ఆదాయం ఖాతాను ఎంచుకోండి {0}
 DocType: Work Order,Required Items,అవసరమైన అంశాలు
 DocType: Stock Ledger Entry,Stock Value Difference,స్టాక్ విలువ తేడా
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,మానవ వనరుల
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,చెల్లింపు సయోధ్య చెల్లింపు
 DocType: Disease,Treatment Task,చికిత్స టాస్క్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,పన్ను ఆస్తులను
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,పన్ను ఆస్తులను
 DocType: BOM Item,BOM No,బిఒఎం లేవు
 DocType: Instructor,INS/,ఐఎన్ఎస్ /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,జర్నల్ ఎంట్రీ {0} {1} లేదా ఇప్పటికే ఇతర రసీదును జతచేసేందుకు ఖాతా లేదు
 DocType: Item,Moving Average,మూవింగ్ సగటు
 DocType: BOM Update Tool,The BOM which will be replaced,భర్తీ చేయబడే BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,ఎలక్ట్రానిక్ పరికరాలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,ఎలక్ట్రానిక్ పరికరాలు
 DocType: Asset,Maintenance Required,నిర్వహణ అవసరం
 DocType: Account,Debit,డెబిట్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ఆకులు 0.5 యొక్క గుణిజాలుగా లో కేటాయించింది తప్పక
@@ -4811,7 +4845,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,అత్యుత్తమ ఆంట్
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,సెట్ లక్ష్యాలను అంశం గ్రూప్ వారీగా ఈ సేల్స్ పర్సన్ కోసం.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ఫ్రీజ్ స్టాక్స్ కంటే పాత [డేస్]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,రో # {0}: ఆస్తి స్థిర ఆస్తి కొనుగోలు / అమ్మకాలు తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,రో # {0}: ఆస్తి స్థిర ఆస్తి కొనుగోలు / అమ్మకాలు తప్పనిసరి
 DocType: Asset Maintenance Team,Maintenance Team Name,నిర్వహణ టీమ్ పేరు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","రెండు లేదా అంతకంటే ఎక్కువ ధర రూల్స్ పై నిబంధనలకు ఆధారంగా కనబడక పోతే, ప్రాధాన్య వర్తించబడుతుంది. డిఫాల్ట్ విలువ సున్నా (ఖాళీ) కు చేరుకుంది ప్రాధాన్యత 20 కు మధ్య 0 ఒక సంఖ్య. హయ్యర్ సంఖ్య అదే పరిస్థితులు బహుళ ధర రూల్స్ ఉన్నాయి ఉంటే అది ప్రాధాన్యత పడుతుంది అంటే."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ఖాతాదారుడిగా &#39;అవకాశం నుండి&#39; ఎంపిక చేయబడితే కస్టమర్ తప్పనిసరి
@@ -4821,19 +4855,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ఖర్చు చెప్పడం రకాలు.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},దాని {1} సెల్లింగ్ అంశం కోసం రేటు {0} కంటే తక్కువగా ఉంటుంది. సెల్లింగ్ రేటు ఉండాలి కనీసం {2}
-DocType: Item,Taxes,పన్నులు
+DocType: Subscription,Taxes,పన్నులు
 DocType: Purchase Invoice,capital goods,మూలధన వస్తువులు
 DocType: Purchase Invoice Item,Weight Per Unit,యూనిట్ ద్వారా బరువు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,చెల్లింపు మరియు పంపిణీ
 DocType: Project,Default Cost Center,డిఫాల్ట్ ఖర్చు సెంటర్
-DocType: Bank Guarantee,End Date,ముగింపు తేదీ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,స్టాక్ లావాదేవీలు
 DocType: Budget,Budget Accounts,బడ్జెట్ అకౌంట్స్
 DocType: Employee,Internal Work History,అంతర్గత వర్క్ చరిత్ర
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,పోగుచేసిన తరుగుదల మొత్తం
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,వ్యక్తిగాతమయిన సమభాగము
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,సరఫరాదారు స్కోర్కార్డ్ వేరియబుల్
-DocType: Employee Loan,Fully Disbursed,పూర్తిగా పంపించబడతాయి
 DocType: Employee Advance,Due Advance Amount,డిఎ అడ్వాన్స్ మొత్తం
 DocType: Maintenance Visit,Customer Feedback,కస్టమర్ అభిప్రాయం
 DocType: Account,Expense,ఖర్చుల
@@ -4857,7 +4889,7 @@
 ,Employee Information,Employee ఇన్ఫర్మేషన్
 DocType: Stock Entry Detail,Additional Cost,అదనపు ఖర్చు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
 DocType: Quality Inspection,Incoming,ఇన్కమింగ్
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,అమ్మకాలు మరియు కొనుగోలు కోసం డిఫాల్ట్ పన్ను టెంప్లేట్లు సృష్టించబడతాయి.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,అసెస్మెంట్ ఫలితం రికార్డు {0} ఇప్పటికే ఉంది.
@@ -4865,7 +4897,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',కంపెనీ ఖాళీ ఫిల్టర్ సెట్ చేయండి బృందంచే &#39;కంపెనీ&#39; ఉంది
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,పోస్ట్ చేసిన తేదీ భవిష్య తేదీలో ఉండకూడదు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},రో # {0}: సీరియల్ లేవు {1} తో సరిపోలడం లేదు {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,పునరావృతమవుతున్నందుకు
 DocType: Stock Entry,Target Warehouse Address,టార్గెట్ వేర్హౌస్ చిరునామా
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,సాధారణం లీవ్
 DocType: Agriculture Task,End Day,ముగింపు రోజు
@@ -4890,11 +4921,10 @@
 DocType: Material Request,% Ordered,% క్రమ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","కోర్సు ఆధారంగా విద్యార్థి సమూహం కోసం, కోర్సు ప్రోగ్రామ్ ఎన్రోల్మెంట్ చేరాడు కోర్సులు నుండి ప్రతి విద్యార్థి కోసం చెల్లుబాటు అవుతుంది."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
 DocType: Share Balance,From No,సంఖ్య నుండి
 DocType: Task,Actual Time (in Hours),(గంటల్లో) వాస్తవ సమయం
 DocType: Employee,History In Company,కంపెనీ చరిత్ర
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{పంపినవారు} నుండి క్రొత్త సందేశం
 DocType: Customer,Customer Primary Address,కస్టమర్ ప్రాథమిక చిరునామా
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,వార్తాలేఖలు
 DocType: Drug Prescription,Description/Strength,వివరణ / శక్తి
@@ -4903,22 +4933,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,అదే అంశం అనేకసార్లు నమోదయ్యేలా
 DocType: Department,Leave Block List,బ్లాక్ జాబితా వదిలి
 DocType: Purchase Invoice,Tax ID,పన్ను ID
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. కాలమ్ ఖాళీగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. కాలమ్ ఖాళీగా ఉండాలి
 DocType: Accounts Settings,Accounts Settings,సెట్టింగులు అకౌంట్స్
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,ఆమోదించడానికి
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} కోసం ఫార్మాట్ చేయబడిన చిరునామా, దయచేసి కొనసాగడానికి దయచేసి పరిష్కరించండి."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} కోసం ఫార్మాట్ చేయబడిన చిరునామా, దయచేసి కొనసాగడానికి దయచేసి పరిష్కరించండి."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","క్రొత్త ఖాతా యొక్క సంఖ్య, ఇది ఖాతా పేరులో ఉపసర్గంగా చేర్చబడుతుంది"
 DocType: Maintenance Team Member,Team Member,జట్టు సభ్యుడు
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,సమర్పించవలసిన ఫలితం లేదు
 DocType: Customer,Sales Partner and Commission,సేల్స్ భాగస్వామిలో మరియు కమిషన్
-DocType: Employee Loan,Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్
+DocType: Loan,Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్
 ,Project Quantity,ప్రాజెక్టు పరిమాణం
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు"
 DocType: Opportunity,To Discuss,చర్చించడానికి
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} యొక్క యూనిట్లలో {1} {2} ఈ లావాదేవీని పూర్తి చేయడానికి అవసరమవుతారు.
 DocType: Loan Type,Rate of Interest (%) Yearly,ఆసక్తి రేటు (%) సుడి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,తాత్కాలిక అకౌంట్స్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,బ్లాక్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,తాత్కాలిక అకౌంట్స్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,బ్లాక్
 DocType: BOM Explosion Item,BOM Explosion Item,బిఒఎం ప్రేలుడు అంశం
 DocType: Shareholder,Contact List,సంప్రదించండి జాబితా
 DocType: Account,Auditor,ఆడిటర్
@@ -4926,16 +4956,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} అంశాలు ఉత్పత్తి
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,ఇంకా నేర్చుకో
 DocType: Cheque Print Template,Distance from top edge,టాప్ అంచు నుండి దూరం
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,ధర జాబితా {0} నిలిపివేస్తే లేదా ఉనికిలో లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,ధర జాబితా {0} నిలిపివేస్తే లేదా ఉనికిలో లేదు
 DocType: Purchase Invoice,Return,రిటర్న్
 DocType: Pricing Rule,Disable,ఆపివేయి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,చెల్లింపు విధానం ఒక చెల్లింపు చేయడానికి అవసరం
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,చెల్లింపు విధానం ఒక చెల్లింపు చేయడానికి అవసరం
 DocType: Project Task,Pending Review,సమీక్ష పెండింగ్లో
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","ఆస్తులు, వరుస సంఖ్య, బ్యాచ్లు మొదలైన మరిన్ని ఎంపికలు కోసం పూర్తి పేజీలో సవరించండి."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,నియామకాలు మరియు సంప్రదింపులు
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} బ్యాచ్ చేరాడు లేదు {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",అది ఇప్పటికే ఉంది ఆస్తుల {0} బహిష్కరించాలని కాదు {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,చెక్కులు అవసరం
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,చెక్కులు అవసరం
 DocType: Task,Total Expense Claim (via Expense Claim),(ఖర్చు చెప్పడం ద్వారా) మొత్తం ఖర్చు చెప్పడం
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,మార్క్ కరువవడంతో
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,సంస్థ సెటప్ చేయడంలో విఫలమైంది
@@ -4947,7 +4977,7 @@
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,నుండి అంశాలను జోడించండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,నుండి అంశాలను జోడించండి
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,పంటలు &amp; భూములు
 DocType: Cheque Print Template,Regular,రెగ్యులర్
 DocType: Fertilizer,Density (if liquid),సాంద్రత (ద్రవం ఉంటే)
@@ -4972,24 +5002,26 @@
 DocType: Payment Entry,Paid Amount,మొత్తం చెల్లించారు
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,సేల్స్ సైకిల్ విశ్లేషించండి
 DocType: Assessment Plan,Supervisor,సూపర్వైజర్
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,నిలుపుదల స్టాక్ ఎంట్రీ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,నిలుపుదల స్టాక్ ఎంట్రీ
 ,Available Stock for Packing Items,ప్యాకింగ్ అంశాలను అందుబాటులో స్టాక్
 DocType: Item Variant,Item Variant,అంశం వేరియంట్
 ,Work Order Stock Report,వర్క్ ఆర్డర్ స్టాక్ రిపోర్ట్
+DocType: Purchase Receipt,Auto Repeat Detail,ఆటో రిపీట్ వివరాలు
 DocType: Assessment Result Tool,Assessment Result Tool,అసెస్మెంట్ ఫలితం టూల్
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,సూపర్వైజర్గా
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,వర్గం సూచించండి
 DocType: BOM Scrap Item,BOM Scrap Item,బిఒఎం స్క్రాప్ అంశం
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,క్వాలిటీ మేనేజ్మెంట్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,క్వాలిటీ మేనేజ్మెంట్
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
 DocType: Project,Total Billable Amount (via Timesheets),మొత్తం బిల్లబుల్ మొత్తం (టైమ్ షీట్లు ద్వారా)
 DocType: Agriculture Task,Previous Business Day,మునుపటి బిజినెస్ డే
-DocType: Employee Loan,Repay Fixed Amount per Period,ఒక్కో వ్యవధి స్థిర మొత్తం చెల్లింపులో
+DocType: Loan,Repay Fixed Amount per Period,ఒక్కో వ్యవధి స్థిర మొత్తం చెల్లింపులో
 DocType: Employee,Health Insurance No,ఆరోగ్య బీమా సంఖ్య
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,క్రెడిట్ గమనిక ఆంట్
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,క్రెడిట్ గమనిక ఆంట్
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,మొత్తం పన్ను చెల్లింపు మొత్తం
 DocType: Employee External Work History,Employee External Work History,Employee బాహ్య వర్క్ చరిత్ర
 DocType: Opening Invoice Creation Tool,Purchase,కొనుగోలు
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,సంతులనం ప్యాక్ చేసిన అంశాల
@@ -5000,16 +5032,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} కోసం {1}
 DocType: Healthcare Settings,Valid number of days,రోజుల సంఖ్య చెల్లుతుంది
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ఖర్చు కేంద్రాలు
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,చందాను పునఃప్రారంభించండి
 DocType: Land Unit,Linked Plant Analysis,లింక్ చేయబడిన ప్లాంట్ విశ్లేషణ
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ఇది సరఫరాదారు యొక్క కరెన్సీ రేటుపై కంపెనీ బేస్ కరెన్సీ మార్చబడుతుంది
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},రో # {0}: వరుస టైమింగ్స్ విభేదాలు {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,అనుమతించు జీరో వాల్యువేషన్ రేటు
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,అనుమతించు జీరో వాల్యువేషన్ రేటు
+DocType: Bank Guarantee,Receiving,స్వీకరిస్తోంది
 DocType: Training Event Employee,Invited,ఆహ్వానించారు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు బహుళ క్రియాశీల జీతం స్ట్రక్చర్స్
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,సెటప్ గేట్వే ఖాతాలు.
 DocType: Employee,Employment Type,ఉపాధి రకం
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,స్థిర ఆస్తులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,స్థిర ఆస్తులు
 DocType: Payment Entry,Set Exchange Gain / Loss,నష్టం సెట్ ఎక్స్చేంజ్ పెరుగుట /
 ,GST Purchase Register,జిఎస్టి కొనుగోలు నమోదు
 ,Cash Flow,నగదు ప్రవాహం
@@ -5030,9 +5064,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,అన్ని వాటా లావాదేవీల జాబితా
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp కౌంట్
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp కౌంట్
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},కనుగొనడానికి దయచేసి జత {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ట్రయల్ పీరియడ్ ప్రారంభ తేదీ మరియు ట్రయల్ వ్యవధి ముగింపు తేదీ సెట్ చేయబడాలి
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,సగటు వెల
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,చెల్లింపు షెడ్యూల్లో మొత్తం చెల్లింపు మొత్తం గ్రాండ్ / వృత్తాకార మొత్తంకి సమానంగా ఉండాలి
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,చెల్లింపు షెడ్యూల్లో మొత్తం చెల్లింపు మొత్తం గ్రాండ్ / వృత్తాకార మొత్తంకి సమానంగా ఉండాలి
+DocType: Subscription Plan Detail,Plan,ప్రణాళిక
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,జనరల్ లెడ్జర్ ప్రకారం బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Job Applicant,Applicant Name,దరఖాస్తుదారు పేరు
 DocType: Authorization Rule,Customer / Item Name,కస్టమర్ / అంశం పేరు
@@ -5062,6 +5097,7 @@
 DocType: Work Order,Warehouses,గిడ్డంగులు
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ఆస్తి బదిలీ సాధ్యం కాదు
 DocType: Hotel Room Pricing,Hotel Room Pricing,హోటల్ రూమ్ ప్రైసింగ్
+DocType: Subscription,Days Until Due,డేస్ వరకు వరకు
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,ఈ అంశం {0} (మూస) యొక్క రూపాంతరం.
 DocType: Workstation,per hour,గంటకు
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,కొనుగోలు
@@ -5070,13 +5106,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","బ్యాచ్ ఆధారంగా స్టూడెంట్ గ్రూప్, స్టూడెంట్ బ్యాచ్ ప్రోగ్రామ్ ఎన్రోల్మెంట్ నుండి ప్రతి విద్యార్థి కోసం చెల్లుబాటు అవుతుంది."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,పంపిణీ
+DocType: Journal Entry Account,Loan,ఋణం
 DocType: Expense Claim Advance,Expense Claim Advance,ఖర్చు చెల్లింపు అడ్వాన్స్
 DocType: Lab Test,Report Preference,నివేదన ప్రాధాన్యత
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,వాలంటీర్ సమాచారం.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ప్రాజెక్ట్ మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ప్రాజెక్ట్ మేనేజర్
 ,Quoted Item Comparison,ఉల్లేఖించిన అంశం పోలిక
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} మరియు {1} మధ్య స్కోర్లో అతివ్యాప్తి
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,డిస్పాచ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,డిస్పాచ్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,అంశం కోసం మాక్స్ డిస్కౌంట్: {0} {1}% ఉంది
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,నికర ఆస్తుల విలువ గా
 DocType: Crop,Produce,ఉత్పత్తి
@@ -5086,7 +5123,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,తయారీ కోసం మెటీరియల్ వినియోగం
 DocType: Item Alternative,Alternative Item Code,ప్రత్యామ్నాయ అంశం కోడ్
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,సెట్ క్రెడిట్ పరిధులకు మించిన లావాదేవీలు submit అనుమతి పాత్ర.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
 DocType: Delivery Stop,Delivery Stop,డెలివరీ ఆపు
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
@@ -5096,15 +5133,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,సబ్బు &amp; డిటర్జెంట్
 DocType: BOM,Show Items,ఐటెమ్లను చూపించు
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ఎప్పటికప్పుడు కంటే ఎక్కువ ఉండకూడదు.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,మీరు అన్ని కస్టమర్లకు ఇమెయిల్ ద్వారా తెలియజేయాలనుకుంటున్నారా?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,మీరు అన్ని కస్టమర్లకు ఇమెయిల్ ద్వారా తెలియజేయాలనుకుంటున్నారా?
+DocType: Subscription Plan,Billing Interval,బిల్లింగ్ విరామం
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,మోషన్ పిక్చర్ &amp; వీడియో
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,క్రమ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,పునఃప్రారంభం
 DocType: Hub Settings,Hub Username,హబ్ యూజర్పేరు
 DocType: Salary Detail,Component,కాంపోనెంట్
 DocType: Assessment Criteria,Assessment Criteria Group,అంచనా ప్రమాణం గ్రూప్
 DocType: Healthcare Settings,Patient Name By,ద్వారా పేషంట్ పేరు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} నుండి {1} నుండి జీతాలు కోసం హక్కు కవరేజ్ జర్నల్ ఎంట్రీ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} నుండి {1} నుండి జీతాలు కోసం హక్కు కవరేజ్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
 DocType: Warehouse,Warehouse Name,వేర్హౌస్ పేరు
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
@@ -5118,23 +5155,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ఇక్కడ మీరు etc ఎత్తు, బరువు, అలెర్జీలు, వైద్య ఆందోళనలు అందుకోగలదు"
 DocType: Leave Block List,Applies to Company,కంపెనీకి వర్తిస్తుంది
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
-DocType: Employee Loan,Disbursement Date,చెల్లించుట తేదీ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;గ్రహీతలు&#39; పేర్కొనబడలేదు
+DocType: Loan,Disbursement Date,చెల్లించుట తేదీ
 DocType: BOM Update Tool,Update latest price in all BOMs,అన్ని BOM లలో తాజా ధరను నవీకరించండి
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,మెడికల్ రికార్డు
 DocType: Vehicle,Vehicle,వాహనం
 DocType: Purchase Invoice,In Words,వర్డ్స్
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,సమర్పించే ముందు బ్యాంకు లేదా రుణ సంస్థ పేరును నమోదు చేయండి.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} సమర్పించబడాలి
 DocType: POS Profile,Item Groups,అంశం గుంపులు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
 DocType: Sales Order Item,For Production,ప్రొడక్షన్
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,దయచేసి ఖాతాల చార్ట్లో తాత్కాలిక ప్రారంభ ఖాతాని జోడించండి
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,దయచేసి ఖాతాల చార్ట్లో తాత్కాలిక ప్రారంభ ఖాతాని జోడించండి
 DocType: Customer,Customer Primary Contact,కస్టమర్ ప్రాథమిక సంప్రదింపు
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,కాలం ముగింపు జర్నల్
 DocType: Project Task,View Task,చూడండి టాస్క్
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / లీడ్%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / లీడ్%
+DocType: Bank Guarantee,Bank Guarantee Type,బ్యాంకు హామీ పద్ధతి
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ఇన్వాయిస్ భాగం
 ,Asset Depreciations and Balances,ఆస్తి Depreciations మరియు నిల్వలను
@@ -5145,9 +5183,8 @@
 DocType: Production Plan,Include Subcontracted Items,సబ్ కన్ఫ్రెక్టెడ్ ఐటెమ్లను చేర్చండి
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,స్టాక్ బదిలీ తర్వాత వేరియంట్ లక్షణాలను మార్చలేరు. దీన్ని చేయటానికి మీరు క్రొత్త వస్తువును తయారు చేసుకోవాలి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
-DocType: Employee Loan,Repay from Salary,జీతం నుండి తిరిగి
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+DocType: Loan,Repay from Salary,జీతం నుండి తిరిగి
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},వ్యతిరేకంగా చెల్లింపు అభ్యర్థించడం {0} {1} మొత్తం {2}
 DocType: Salary Slip,Salary Slip,వేతనం స్లిప్
@@ -5171,11 +5208,11 @@
 DocType: Employee Education,Employee Education,Employee ఎడ్యుకేషన్
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,అంశం సమూహం పట్టిక కనిపించే నకిలీ అంశం సమూహం
 DocType: Land Unit,Parent Land Unit,పేరెంట్ ల్యాండ్ యూనిట్
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
 DocType: Fertilizer,Fertilizer Name,ఎరువులు పేరు
 DocType: Salary Slip,Net Pay,నికర పే
 DocType: Cash Flow Mapping Accounts,Account,ఖాతా
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,సీరియల్ లేవు {0} ఇప్పటికే అందింది
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,సీరియల్ లేవు {0} ఇప్పటికే అందింది
 ,Requested Items To Be Transferred,అభ్యర్థించిన అంశాలు బదిలీ
 DocType: Expense Claim,Vehicle Log,వాహనం లోనికి ప్రవేశించండి
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),జ్వరం ఉండటం (తాత్కాలికంగా&gt; 38.5 ° C / 101.3 ° F లేదా నిరంతర ఉష్ణోగ్రత 38 ° C / 100.4 ° F)
@@ -5216,24 +5253,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ఏ ఇతర స్టర్ రికార్డులలో వెళ్ళాలి అని చెప్పుకోదగిన ప్రయత్నం.
 DocType: Asset Maintenance,Manufacturing User,తయారీ వాడుకరి
 DocType: Purchase Invoice,Raw Materials Supplied,రా మెటీరియల్స్ పంపినవి
-DocType: C-Form,Series,సిరీస్
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},ధర జాబితా యొక్క కరెన్సీ {0} {1} లేదా {2}
 DocType: Appraisal,Appraisal Template,అప్రైసల్ మూస
 DocType: Soil Texture,Ternary Plot,టెర్నరీ ప్లాట్
 DocType: Item Group,Item Classification,అంశం వర్గీకరణ
 DocType: Driver,License Number,లైసెన్స్ సంఖ్య
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,వ్యాపారం అభివృద్ధి మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,వ్యాపారం అభివృద్ధి మేనేజర్
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,నిర్వహణ సందర్శించండి పర్పస్
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,వాయిస్ పేషంట్ రిజిస్ట్రేషన్
 DocType: Crop,Period,కాలం
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,సాధారణ లెడ్జర్
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ఉద్యోగి {0} లో సెలవు {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ఉద్యోగి {0} లో సెలవు {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,చూడండి దారితీస్తుంది
 DocType: Program Enrollment Tool,New Program,కొత్త ప్రోగ్రామ్
 DocType: Item Attribute Value,Attribute Value,విలువ లక్షణం
 ,Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు
 DocType: Salary Detail,Salary Detail,జీతం వివరాలు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
 DocType: Appointment Type,Physician,వైద్యుడు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,సంప్రదింపులు
@@ -5241,15 +5277,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) వర్క్ ఆర్డరులో అనుకున్న పరిమాణము ({2}) కంటే ఎక్కువగా ఉండకూడదు {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,తయారీ కోసం సమయం షీట్.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,పూర్తికాని
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,స్టాక్ లావాదేవీ తర్వాత వేరియంట్ లక్షణాలను మార్చలేరు. దీన్ని చేయటానికి మీరు క్రొత్త వస్తువును తయారు చేసుకోవాలి.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA ఆదేశం
 DocType: Physician,Charges,ఆరోపణలు
 DocType: Production Plan,Get Items For Work Order,వర్క్ ఆర్డర్ కోసం అంశాలను పొందండి
 DocType: Salary Detail,Default Amount,డిఫాల్ట్ మొత్తం
 DocType: Lab Test Template,Descriptive,డిస్క్రిప్టివ్
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ఈ నెల సారాంశం
 DocType: Quality Inspection Reading,Quality Inspection Reading,నాణ్యత తనిఖీ పఠనం
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,మీ సంస్థ కోసం మీరు సాధించాలనుకుంటున్న అమ్మకాల లక్ష్యాన్ని సెట్ చేయండి.
 ,Project wise Stock Tracking,ప్రాజెక్టు వారీగా స్టాక్ ట్రాకింగ్
@@ -5277,11 +5314,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,వెబ్సైట్ని సృష్టించడం విఫలమైంది
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UoM మార్పిడి వివరాలు
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,నిలుపుదల స్టాక్ ఎంట్రీ ఇప్పటికే సృష్టించబడింది లేదా నమూనా పరిమాణం అందించలేదు
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,నిలుపుదల స్టాక్ ఎంట్రీ ఇప్పటికే సృష్టించబడింది లేదా నమూనా పరిమాణం అందించలేదు
 DocType: Program,Program Abbreviation,ప్రోగ్రామ్ సంక్షిప్తీకరణ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి
 DocType: Warranty Claim,Resolved By,ద్వారా పరిష్కరించిన
-DocType: Bank Guarantee,Start Date,ప్రారంబపు తేది
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ఒక కాలానికి ఆకులు కేటాయించుటకు.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,చెక్కుల మరియు డిపాజిట్లు తప్పుగా క్లియర్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ఖాతా {0}: మీరు పేరెంట్ ఖాతా గా కేటాయించలేరు
@@ -5296,11 +5332,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,గంటలు
 DocType: Project,Expected Start Date,ఊహించిన ప్రారంభం తేదీ
 DocType: Purchase Invoice,04-Correction in Invoice,వాయిస్ లో 04-కరెక్షన్
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,వర్క్ ఆర్డర్ ఇప్పటికే BOM తో అన్ని అంశాలను సృష్టించింది
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,వర్క్ ఆర్డర్ ఇప్పటికే BOM తో అన్ని అంశాలను సృష్టించింది
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,వేరియంట్ వివరాలు రిపోర్ట్
 DocType: Setup Progress Action,Setup Progress Action,సెటప్ ప్రోగ్రెస్ యాక్షన్
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,ధర జాబితా కొనుగోలు
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,ధర జాబితా కొనుగోలు
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ఆరోపణలు ఆ అంశం వర్తించదు ఉంటే అంశాన్ని తొలగించు
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,సబ్స్క్రిప్షన్ను రద్దు చేయండి
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,దయచేసి పూర్తి స్థాయి నిర్వహణని పూర్తి చేయండి లేదా పూర్తి చేసిన తేదీని తీసివేయండి
 DocType: Supplier,Default Payment Terms Template,డిఫాల్ట్ చెల్లింపు నిబంధనలు మూస
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,లావాదేవీ కరెన్సీ చెల్లింపు గేట్వే కరెన్సీ అదే ఉండాలి
@@ -5311,7 +5348,6 @@
 DocType: Employee,Educational Qualification,అర్హతలు
 DocType: Workstation,Operating Costs,నిర్వహణ వ్యయాలు
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,యాక్షన్ సేకరించారు మంత్లీ బడ్జెట్ మించింది ఉంటే
-DocType: Subscription,Submit on creation,సృష్టి సమర్పించండి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
 DocType: Asset,Disposal Date,తొలగింపు తేదీ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ఇమెయిళ్ళు వారు సెలవు లేకపోతే, ఇచ్చిన గంట వద్ద కంపెనీ అన్ని యాక్టివ్ ఉద్యోగులు పంపబడును. ప్రతిస్పందనల సారాంశం అర్ధరాత్రి పంపబడుతుంది."
@@ -5330,6 +5366,7 @@
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Cheque Print Template,Cheque Print Template,ప్రిపే ప్రింట్ మూస
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ఖర్చు కేంద్రాలు చార్ట్
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,చందాని రద్దు చేయడానికి లేదా చెల్లించని రుసుముని గుర్తించే ముందు ఇన్వాయిస్ తేదీ ముగిసిన రోజుల తర్వాత
 DocType: Lab Test Template,Sample Collection,నమూనా కలెక్షన్
 ,Requested Items To Be Ordered,అభ్యర్థించిన అంశాలు ఆదేశించింది ఉండాలి
 DocType: Price List,Price List Name,ధర జాబితా పేరు
@@ -5338,7 +5375,7 @@
 DocType: Account,Income,ఆదాయపు
 DocType: Industry Type,Industry Type,పరిశ్రమ రకం
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ఎక్కడో తేడ జరిగింది!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,హెచ్చరిక: వదిలి అప్లికేషన్ క్రింది బ్లాక్ తేదీలను
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,హెచ్చరిక: వదిలి అప్లికేషన్ క్రింది బ్లాక్ తేదీలను
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,వాయిస్ {0} ఇప్పటికే సమర్పించబడింది సేల్స్
 DocType: Supplier Scorecard Scoring Criteria,Score,స్కోరు
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ఫిస్కల్ ఇయర్ {0} ఉనికిలో లేని
@@ -5358,12 +5395,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 మరియు 100 మధ్య విలువ ఉండాలి
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,తరువాతి అప్రిసియేషన్ తేదీ అందుబాటులో ఉండకపోయే తేదీకి ముందు ఉండకూడదు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,హామీలేని రుణాలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,హామీలేని రుణాలు
 DocType: Cost Center,Cost Center Name,ఖర్చు సెంటర్ పేరు
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,మాక్స్ TIMESHEET వ్యతిరేకంగా పని గంటలు
 DocType: Maintenance Schedule Detail,Scheduled Date,షెడ్యూల్డ్ తేదీ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,మొత్తం చెల్లించిన ఆంట్
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,మొత్తం చెల్లించిన ఆంట్
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 అక్షరాల కంటే ఎక్కువ సందేశాలు బహుళ సందేశాలను విభజించబడింది ఉంటుంది
 DocType: Purchase Receipt Item,Received and Accepted,అందుకున్నారు మరియు Accepted
 DocType: Hub Settings,Company and Seller Profile,కంపెనీ మరియు విక్రేత ప్రొఫైల్
@@ -5377,10 +5414,9 @@
 DocType: Item,Variant Based On,వేరియంట్ బేస్డ్ న
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% ఉండాలి కేటాయించిన మొత్తం వెయిటేజీ. ఇది {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,మీ సరఫరాదారులు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,సరిదిద్దండి
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
 DocType: Request for Quotation Item,Supplier Part No,సరఫరాదారు పార్ట్ లేవు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,అనామక
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,నుండి అందుకున్న
 DocType: Lead,Converted,కన్వర్టెడ్
@@ -5394,6 +5430,7 @@
 DocType: Asset,Assets,ఆస్తులు
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
+DocType: Subscription,Current Invoice End Date,ప్రస్తుత వాయిస్ ఎండ్ తేది
 DocType: Payment Term,Due Date Based On,ఆధార తేదీ ఆధారంగా
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,దయచేసి సెల్లింగ్ సెట్టింగులలో డిఫాల్ట్ కస్టమర్ సమూహం మరియు భూభాగాన్ని సెట్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} ఉనికిలో లేని
@@ -5401,7 +5438,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,అంశం: {0} వ్యవస్థ ఉనికిలో లేదు
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,మీరు స్తంభింపచేసిన విలువ సెట్ అధికారం లేదు
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ఎంట్రీలు పొందండి
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,జర్నల్ ఎంట్రీ కోసం తిరిగి చెల్లింపులు ఏవీ ఎంచుకోబడలేదు
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
+DocType: Loan,Disbursed,పంపించబడతాయి
 DocType: Healthcare Settings,Laboratory Settings,ప్రయోగశాల సెట్టింగులు
 DocType: Patient Appointment,Service Unit,సర్వీస్ యూనిట్
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,సరఫరాదారుని విజయవంతంగా సెట్ చేయండి
@@ -5414,12 +5453,12 @@
 DocType: Share Balance,No of Shares,షేర్ల సంఖ్య
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,స్థితిని ఎంచుకోండి
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
 DocType: Pricing Rule,Pricing Rule Help,ధర రూల్ సహాయం
 DocType: School House,House Name,హౌస్ పేరు
 DocType: Fee Schedule,Total Amount per Student,విద్యార్థికి మొత్తం మొత్తం
 DocType: Purchase Taxes and Charges,Account Head,ఖాతా హెడ్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ఎలక్ట్రికల్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ఎలక్ట్రికల్
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,మీ వినియోగదారులు మీ సంస్థ యొక్క మిగిలిన జోడించండి. మీరు కూడా కాంటాక్ట్స్ నుండి వారిని జోడించడం ద్వారా మీ పోర్టల్ వినియోగదారుడు ఆహ్వానించండి జోడించవచ్చు
 DocType: Stock Entry,Total Value Difference (Out - In),మొత్తం విలువ తేడా (అవుట్ - ఇన్)
 DocType: Grant Application,Requested Amount,అభ్యర్థించిన మొత్తం
@@ -5429,7 +5468,7 @@
 DocType: Crop Cycle,Detected Diseases,గుర్తించిన వ్యాధులు
 DocType: Stock Entry,Default Source Warehouse,డిఫాల్ట్ మూల వేర్హౌస్
 DocType: Item,Customer Code,కస్టమర్ కోడ్
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 DocType: Asset Maintenance Task,Last Completion Date,చివరి పూర్తి తేదీ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
@@ -5437,9 +5476,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless సెట్టింగులు
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,స్టాక్ ఆస్తులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,స్టాక్ ఆస్తులు
 DocType: Restaurant,Active Menu,సక్రియ మెను
 DocType: Target Detail,Target Qty,టార్గెట్ ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},రుణం వ్యతిరేకంగా: {0}
 DocType: Shopping Cart Settings,Checkout Settings,తనిఖీ సెట్టింగ్లు
 DocType: Student Attendance,Present,ప్రెజెంట్
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,డెలివరీ గమనిక {0} సమర్పించిన కాకూడదని
@@ -5448,9 +5488,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
 DocType: Vehicle Log,Odometer,ఓడోమీటార్
 DocType: Production Plan Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
 DocType: Chapter,Chapter Head,చాప్టర్ హెడ్
 DocType: Payment Term,Month(s) after the end of the invoice month,ఇన్వాయిస్ నెల ముగిసిన తర్వాత నెల (లు)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,ప్రాజెక్టు చర్య / పని.
@@ -5458,11 +5498,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,జీతం స్లిప్స్ రూపొందించండి
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ల్యాబ్ ఫలితం తేదీసమయం పరీక్షించడానికి ముందు ఉండదు
 DocType: POS Profile,Allow user to edit Discount,వినియోగదారుని డిస్కౌంట్ను సవరించడానికి అనుమతించండి
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,నుండి కస్టమర్లను పొందండి
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,నుండి కస్టమర్లను పొందండి
 DocType: Purchase Invoice Item,Include Exploded Items,ఎక్స్ప్లోడ్ ఐటెమ్లను చేర్చండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",వర్తించే ఎంపిక ఉంది ఉంటే కొనుగోలు తనిఖీ చెయ్యాలి {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,డిస్కౌంట్ 100 కంటే తక్కువ ఉండాలి
 DocType: Shipping Rule,Restrict to Countries,దేశాలకు పరిమితం చేయండి
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
 DocType: Sales Invoice Timesheet,Billing Hours,బిల్లింగ్ గంటలు
 DocType: Project,Total Sales Amount (via Sales Order),మొత్తం సేల్స్ మొత్తం (సేల్స్ ఆర్డర్ ద్వారా)
@@ -5481,6 +5522,7 @@
 DocType: Soil Texture,Sandy Clay,శాండీ క్లే
 DocType: Grant Application,Assessment  Manager,అసెస్మెంట్ మేనేజర్
 DocType: Payment Entry,Allocate Payment Amount,చెల్లింపు మొత్తం కేటాయించాలని
+DocType: Subscription Plan,Subscription Plan,సభ్యత్వ ప్రణాళిక
 DocType: Employee External Work History,Salary,జీతం
 DocType: Serial No,Delivery Document Type,డెలివరీ డాక్యుమెంట్ టైప్
 DocType: Sales Order,Partly Delivered,పాక్షికంగా పంపిణీ
@@ -5505,9 +5547,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,ఏజింగ్ రేంజ్ 2
 DocType: SG Creation Tool Course,Max Strength,మాక్స్ శక్తి
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ప్రీసెట్లు ఇన్స్టాల్ చేస్తోంది
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},కస్టమర్ కోసం డెలివరీ నోట్ ఎంపిక చేయబడలేదు
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},కస్టమర్ కోసం డెలివరీ నోట్ ఎంపిక చేయబడలేదు
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,బిఒఎం భర్తీ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,డెలివరీ తేదీ ఆధారంగా అంశాలను ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,డెలివరీ తేదీ ఆధారంగా అంశాలను ఎంచుకోండి
 DocType: Grant Application,Has any past Grant Record,గత గ్రాంట్ రికార్డు ఉంది
 ,Sales Analytics,సేల్స్ Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},అందుబాటులో {0}
@@ -5526,7 +5568,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,రా మెటీరియల్స్ పంపినవి ఖర్చు
 DocType: Selling Settings,Settings for Selling Module,మాడ్యూల్ సెల్లింగ్ కోసం సెట్టింగులు
 DocType: Hotel Room Reservation,Hotel Room Reservation,హోటల్ రూం రిజర్వేషన్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,వినియోగదారుల సేవ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,వినియోగదారుల సేవ
 DocType: BOM,Thumbnail,సూక్ష్మచిత్రం
 DocType: Item Customer Detail,Item Customer Detail,అంశం కస్టమర్ వివరాలు
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ఆఫర్ అభ్యర్థి ఒక జాబ్.
@@ -5543,7 +5585,7 @@
 DocType: Fees,Student Details,విద్యార్థి వివరాలు
 DocType: Purchase Invoice Item,Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల
 DocType: Purchase Invoice Item,Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల
-DocType: Employee Loan,Repayment Period in Months,నెలల్లో తిరిగి చెల్లించే కాలం
+DocType: Loan,Repayment Period in Months,నెలల్లో తిరిగి చెల్లించే కాలం
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,లోపం: చెల్లని ఐడి?
 DocType: Naming Series,Update Series Number,నవీకరణ సిరీస్ సంఖ్య
 DocType: Account,Equity,ఈక్విటీ
@@ -5552,7 +5594,7 @@
 DocType: Task,Closing Date,ముగింపు తేదీ
 DocType: Sales Order Item,Produced Quantity,ఉత్పత్తి చేసే పరిమాణం
 DocType: Timesheet,Work Detail,పని వివరాలు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,ఇంజినీర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,ఇంజినీర్
 DocType: Journal Entry,Total Amount Currency,మొత్తం పరిమాణం కరెన్సీ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,శోధన సబ్ అసెంబ్లీలకు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
@@ -5598,13 +5640,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,దాత రకం సమాచారం.
 DocType: Request for Quotation,Supplier Detail,సరఫరాదారు వివరాలు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ఫార్ములా లేదా స్థితిలో లోపం: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ఇన్వాయిస్ మొత్తం
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,ప్రమాణం బరువులు తప్పక 100% వరకు ఉండాలి
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,హాజరు
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,స్టాక్ అంశాలు
 DocType: BOM,Materials,మెటీరియల్స్
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","తనిఖీ లేకపోతే, జాబితా అనువర్తిత వుంటుంది పేరు ప్రతి శాఖ చేర్చబడుతుంది ఉంటుంది."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} సృష్టిస్తోంది
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,మూల మరియు టార్గెట్ వేర్హౌస్ అదే ఉండకూడదు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,తేదీ పోస్ట్ మరియు సమయం పోస్ట్ తప్పనిసరి
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,లావాదేవీలు కొనుగోలు కోసం పన్ను టెంప్లేట్.
@@ -5628,14 +5669,14 @@
 DocType: Shipping Rule,Fixed,స్థిర
 DocType: Vehicle Service,Clutch Plate,క్లచ్ ప్లేట్
 DocType: Company,Round Off Account,ఖాతా ఆఫ్ రౌండ్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,పరిపాలనాపరమైన ఖర్చులను
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,పరిపాలనాపరమైన ఖర్చులను
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,కన్సల్టింగ్
 DocType: Customer Group,Parent Customer Group,మాతృ కస్టమర్ గ్రూప్
-DocType: Journal Entry,Subscription,సభ్యత్వ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,సభ్యత్వ
 DocType: Purchase Invoice,Contact Email,సంప్రదించండి ఇమెయిల్
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,ఫీజు సృష్టి పెండింగ్లో ఉంది
 DocType: Appraisal Goal,Score Earned,స్కోరు సాధించాడు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,నోటీసు కాలం
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,నోటీసు కాలం
 DocType: Asset Category,Asset Category Name,ఆస్తి వర్గం పేరు
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ఈ రూట్ భూభాగం ఉంది మరియు సవరించడం సాధ్యం కాదు.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,న్యూ సేల్స్ పర్సన్ పేరు
@@ -5649,7 +5690,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
 DocType: Asset,Frequency of Depreciation (Months),అరుగుదల పౌనఃపున్యం (నెలలు)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,క్రెడిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,క్రెడిట్ ఖాతా
 DocType: Landed Cost Item,Landed Cost Item,అడుగుపెట్టాయి ఖర్చు అంశం
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,సున్నా విలువలు చూపించు
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,అంశం యొక్క మొత్తము ముడి పదార్థాల ఇచ్చిన పరిమాణంలో నుండి repacking / తయారీ తర్వాత పొందిన
@@ -5657,7 +5698,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,స్వీకరించదగిన / చెల్లించవలసిన ఖాతా
 DocType: Delivery Note Item,Against Sales Order Item,అమ్మకాల ఆర్డర్ అంశం వ్యతిరేకంగా
 DocType: Hub Settings,Company Logo,కంపెనీ లోగో
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},బడ్జెట్ గ్రూప్ ఖాతా వ్యతిరేకంగా కేటాయించిన సాధ్యం కాదు {0}
 DocType: Healthcare Settings,Patient Registration,పేషంట్ రిజిస్ట్రేషన్
@@ -5692,11 +5733,10 @@
 DocType: Journal Entry,Total Debit,మొత్తం డెబిట్
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,డిఫాల్ట్ తయారైన వస్తువులు వేర్హౌస్
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,దయచేసి రోగిని ఎంచుకోండి
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,సేల్స్ పర్సన్
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,సేల్స్ పర్సన్
 DocType: Hotel Room Package,Amenities,సదుపాయాలు
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,చెల్లింపు యొక్క బహుళ డిఫాల్ట్ మోడ్ అనుమతించబడదు
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,కొరకు
 ,Appointment Analytics,నియామకం విశ్లేషణలు
 DocType: Vehicle Service,Half Yearly,అర్ధవార్షిక
 DocType: Lead,Blog Subscriber,బ్లాగు సబ్స్క్రయిబర్
@@ -5713,6 +5753,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,మీరు సంవత్సరానికి విద్యార్థులు సమూహాలు చేస్తే ఖాళీ వదిలి
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ఎంచుకుంటే, మొత్తం no. వర్కింగ్ డేస్ సెలవులు కలిగి ఉంటుంది, మరియు ఈ జీతం రోజుకి విలువ తగ్గిస్తుంది"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","ప్రస్తుత కీని ఉపయోగించి అనువర్తనాలు ప్రాప్యత చేయలేవు, మీరు ఖచ్చితంగా ఉన్నారా?"
+DocType: Subscription Settings,Prorate,prorate
 DocType: Purchase Invoice,Total Advance,మొత్తం అడ్వాన్స్
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,మూస కోడ్ మార్చండి
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ టర్మ్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు. దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
@@ -5723,8 +5764,9 @@
 DocType: Opportunity Item,Basic Rate,ప్రాథమిక రేటు
 DocType: GL Entry,Credit Amount,క్రెడిట్ మొత్తం
 DocType: Cheque Print Template,Signatory Position,సంతకం చేసే స్థానం
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,లాస్ట్ గా సెట్
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,లాస్ట్ గా సెట్
 DocType: Timesheet,Total Billable Hours,మొత్తం బిల్ చేయగలరు గంటలు
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,ఈ చందా ద్వారా సృష్టించబడిన ఇన్వాయిస్లు చెల్లించడానికి వినియోగదారుల సంఖ్య
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,చెల్లింపు రసీదు గమనిక
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ఈ ఈ కస్టమర్ వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},రో {0}: కేటాయించిన మొత్తాన్ని {1} కంటే తక్కువకు లేదా చెల్లింపు ఎంట్రీ మొత్తం సమానం తప్పనిసరిగా {2}
@@ -5743,12 +5785,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ఫండ్స్ (ఆస్తులు) యొక్క అప్లికేషన్
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ఈ ఈ ఉద్యోగి హాజరు ఆధారంగా
 DocType: Assessment Result,Summary,సారాంశం
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,మార్క్ హాజరు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,డెబిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,డెబిట్ ఖాతా
 DocType: Fiscal Year,Year Start Date,సంవత్సరం ప్రారంభం తేదీ
 DocType: Attendance,Employee Name,ఉద్యోగి పేరు
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ అంశం
@@ -5760,7 +5802,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,కొనుగోలు మొత్తాన్ని
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ఉద్యోగుల లాభాల
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ఉద్యోగుల లాభాల
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Work Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},వాటాలు {0}
@@ -5768,12 +5810,12 @@
 DocType: Asset,Out of Order,పనిచేయటంలేదు
 DocType: Purchase Receipt Item,Accepted Quantity,అంగీకరించిన పరిమాణం
 DocType: Projects Settings,Ignore Workstation Time Overlap,వర్క్స్టేషన్ టైమ్ అతివ్యాప్తిని విస్మరించు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,బ్యాచ్ సంఖ్యలు ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,వినియోగదారుడు ఎదిగింది బిల్లులు.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ప్రాజెక్ట్ ఐడి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
 DocType: Patient Service Unit,Medical Administrator,మెడికల్ అడ్మినిస్ట్రేటర్
 DocType: Assessment Plan,Schedule,షెడ్యూల్
 DocType: Account,Parent Account,మాతృ ఖాతా
@@ -5803,15 +5845,16 @@
 DocType: Asset Repair,Repair Status,రిపేరు స్థితి
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,అకౌంటింగ్ జర్నల్ ఎంట్రీలు.
 DocType: Delivery Note Item,Available Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
 DocType: POS Profile,Account for Change Amount,మొత్తం చేంజ్ ఖాతా
 DocType: Purchase Invoice,input service,ఇన్పుట్ సేవ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},రో {0}: పార్టీ / ఖాతాతో సరిపోలడం లేదు {1} / {2} లో {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,నిర్వహణ జట్టు సభ్యుడు
 DocType: Agriculture Analysis Criteria,Soil Analysis,నేల విశ్లేషణ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,కోర్సు కోడ్:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
 DocType: Account,Stock,స్టాక్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Employee,Current Address,ప్రస్తుత చిరునామా
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","స్పష్టంగా పేర్కొన్న తప్ప తరువాత అంశం వివరణ, చిత్రం, ధర, పన్నులు టెంప్లేట్ నుండి సెట్ చేయబడతాయి etc మరొక అంశం యొక్క ఒక వైవిధ్యం ఉంటే"
 DocType: Serial No,Purchase / Manufacture Details,కొనుగోలు / తయారీ వివరాలు
@@ -5860,19 +5903,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},కోసం ప్రవేశాలు {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","సెట్ బడ్జెట్లు, లక్ష్యాలను మొదలైనవి కోసం కాలికోద్యోగం"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,వేరియబుల్ పేరు
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
 DocType: Asset,Asset Category,ఆస్తి వర్గం
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,నికర పే ప్రతికూల ఉండకూడదు
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,సరఫరాదారు మెటీరియల్
 DocType: Soil Texture,Loamy Sand,లోమీ ఇసుక
 DocType: Production Plan,Material Request Planning,మెటీరియల్ అభ్యర్థన ప్రణాళిక
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ఎక్సైజ్ వాయిస్
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ప్రభావసీమ {0}% ఒకసారి కంటే ఎక్కువ కనిపిస్తుంది
 DocType: Expense Claim,Employees Email Id,ఉద్యోగులు ఇమెయిల్ ఐడి
 DocType: Employee Attendance Tool,Marked Attendance,గుర్తించ హాజరు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,ప్రస్తుత బాధ్యతలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,ప్రస్తుత బాధ్యతలు
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,టైమర్ ఇచ్చిన గంటలు మించిపోయింది.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,మాస్ SMS మీ పరిచయాలను పంపండి
 DocType: Patient,A Positive,అనుకూలమైనది
@@ -5883,9 +5926,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,వాస్తవ ప్యాక్ చేసిన అంశాల తప్పనిసరి
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది మరియు ఈ సరఫరాదారుకి కొనుగోలు ఆర్డర్లు హెచ్చరికతో జారీ చేయాలి.
 DocType: Asset Maintenance Team,Asset Maintenance Team,ఆస్తి నిర్వహణ బృందం
-DocType: Employee Loan,Loan Type,లోన్ టైప్
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} విజయవంతంగా సమర్పించబడింది
+DocType: Loan,Loan Type,లోన్ టైప్
 DocType: Scheduling Tool,Scheduling Tool,షెడ్యూలింగ్ టూల్
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,క్రెడిట్ కార్డ్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,క్రెడిట్ కార్డ్
 DocType: BOM,Item to be manufactured or repacked,అంశం తయారు లేదా repacked వుంటుంది
 DocType: Employee Education,Major/Optional Subjects,మేజర్ / ఆప్షనల్ సబ్జెక్ట్స్
 DocType: Sales Invoice Item,Drop Ship,డ్రాప్ షిప్
@@ -5917,7 +5961,7 @@
 DocType: Item,Units of Measure,యూనిట్స్ ఆఫ్ మెజర్
 DocType: Manufacturing Settings,Allow Production on Holidays,సెలవులు నిర్మాణం అనుమతించు
 DocType: Sales Invoice,Customer's Purchase Order Date,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ తేదీ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,మూలధన నిల్వలను
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,మూలధన నిల్వలను
 DocType: Shopping Cart Settings,Show Public Attachments,పబ్లిక్ అటాచ్మెంట్లు చూపించు
 DocType: Packing Slip,Package Weight Details,ప్యాకేజీ బరువు వివరాలు
 DocType: Restaurant Reservation,Reservation Time,రిజర్వేషన్ సమయం
@@ -5932,7 +5976,7 @@
 DocType: Purchase Order,To Receive and Bill,స్వీకరించండి మరియు బిల్
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,రో # {0}: తేదీ ద్వారా రికడ్ లావాదేవీ తేదీకి ముందు ఉండకూడదు
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,లక్షణం చేసిన ఉత్పత్తులు
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,డిజైనర్
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,డిజైనర్
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,నియమాలు మరియు నిబంధనలు మూస
 DocType: Serial No,Delivery Details,డెలివరీ వివరాలు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
@@ -5942,20 +5986,20 @@
 DocType: Driver,Expiry Date,గడువు తీరు తేదీ
 DocType: Healthcare Settings,Employee name and designation in print,ముద్రణలో ఉద్యోగి పేరు మరియు హోదా
 ,accounts-browser,ఖాతాల బ్రౌజర్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,మొదటి వర్గం ఎంచుకోండి దయచేసి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,మొదటి వర్గం ఎంచుకోండి దయచేసి
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ప్రాజెక్టు మాస్టర్.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","స్టాక్ సెట్టింగులు లేదా Item లో &quot;అనుమతి&quot; అప్డేట్, ఓవర్ బిల్లింగ్ లేదా ఓవర్ ఆర్దరింగ్ అనుమతించుటకు."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,కరెన్సీ etc $ వంటి ఏ చిహ్నం తదుపరి చూపవద్దు.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(హాఫ్ డే)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(హాఫ్ డే)
 DocType: Payment Term,Credit Days,క్రెడిట్ డేస్
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,దయచేసి ల్యాబ్ పరీక్షలను పొందడానికి రోగిని ఎంచుకోండి
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,సమయం రోజులు లీడ్
 DocType: Cash Flow Mapping,Is Income Tax Expense,ఆదాయ పన్ను ఖర్చు
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,విద్యార్థుల సంస్థ హాస్టల్ వద్ద నివసిస్తున్నారు ఉంది అయితే దీన్ని ఎంచుకోండి.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
 ,Stock Summary,స్టాక్ సారాంశం
@@ -5966,10 +6010,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref తేదీ
 DocType: Employee,Reason for Leaving,వదలి వెళ్ళుటకు కారణాలు
 DocType: BOM Operation,Operating Cost(Company Currency),ఆపరేటింగ్ వ్యయం (కంపెనీ కరెన్సీ)
-DocType: Employee Loan Application,Rate of Interest,వడ్డీ రేటు
+DocType: Loan Application,Rate of Interest,వడ్డీ రేటు
 DocType: Expense Claim Detail,Sanctioned Amount,మంజూరు సొమ్ము
 DocType: Item,Shelf Life In Days,డేస్ లో షెల్ఫ్ లైఫ్
 DocType: GL Entry,Is Opening,ప్రారంభమని
+DocType: Department,Expense Approvers,వ్యయ అంచనాలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},రో {0}: డెబిట్ ప్రవేశం తో జతచేయవచ్చు ఒక {1}
 DocType: Journal Entry,Subscription Section,సభ్యత్వ విభాగం
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,ఖాతా {0} ఉనికిలో లేదు
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 6b7b969..88f0535 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ยกเลิกวัสดุเยี่ยมชม {0} ก่อนที่จะยกเลิกการรับประกันเรียกร้องนี้
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,รายงานการประเมินผล
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
-DocType: Purchase Receipt,Subscription Detail,รายละเอียดการสมัครสมาชิก
 DocType: Supplier Scorecard,Notify Supplier,แจ้งผู้จัดจำหน่าย
 DocType: Item,Customer Items,รายการลูกค้า
 DocType: Project,Costing and Billing,ต้นทุนและการเรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่สามารถแยกประเภท
 DocType: Item,Publish Item to hub.erpnext.com,เผยแพร่รายการที่จะ hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,การแจ้งเตือน ทางอีเมล์
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,การประเมินผล
 DocType: Item,Default Unit of Measure,หน่วยเริ่มต้นของวัด
 DocType: SMS Center,All Sales Partner Contact,ทั้งหมดติดต่อพันธมิตรการขาย
-DocType: Employee,Leave Approvers,ผู้อนุมัติการลา
+DocType: Department,Leave Approvers,ผู้อนุมัติการลา
 DocType: Sales Partner,Dealer,เจ้ามือ
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,สืบสวน
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,ตรวจสอบความพร้อมใช้งาน
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับผู้จัดหาสินค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,กฎหมาย
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,กฎหมาย
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
 DocType: Bank Guarantee,Customer,ลูกค้า
 DocType: Purchase Receipt Item,Required By,ที่จำเป็นโดย
 DocType: Delivery Note,Return Against Delivery Note,กลับไปกับใบส่งมอบ
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,หัว (หรือกลุ่ม) กับบัญชีรายการที่จะทำและจะรักษายอด
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,ไม่มีการส่งบิลเงินเดือนเพื่อดำเนินการ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,ไม่มีการส่งบิลเงินเดือนเพื่อดำเนินการ
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,แสดงเปิด
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,มันเป็นสิ่งที่จำเป็นที่จะดำเนินการในวันนี้เองสำหรับที่กล่าวมาข้างต้นที่เกิดขึ้น
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,เช็คเอาท์
 DocType: Pricing Rule,Apply On,สมัคร เมื่อวันที่
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,ติดต่อผู้ผลิตทั้งหมด
 DocType: Support Settings,Support Settings,การตั้งค่าการสนับสนุน
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,คำร้องขอการลาใหม่
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Batch รายการสถานะหมดอายุ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,ตั๋วแลกเงิน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,ตั๋วแลกเงิน
 DocType: Membership,membership validaty section,สมาชิก validaty ส่วน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 DocType: Consultation,Consultation,การปรึกษาหารือ
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,วัสดุ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ทำเว็บไซต์
 DocType: Opening Invoice Creation Tool Item,Quantity,จำนวน
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
 DocType: Item,Country of Origin,ประเทศแหล่งกำเนิดสินค้า
 DocType: Soil Texture,Soil Texture Criteria,เกณฑ์พื้นผิวดิน
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,รายละเอียดการติดต่อหลัก
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,เปิดประเด็น
 DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
 DocType: Lab Test Groups,Add new line,เพิ่มบรรทัดใหม่
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,การดูแลสุขภาพ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
@@ -89,7 +85,7 @@
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,ใบกำกับสินค้า
+DocType: Subscription Invoice,Invoice,ใบกำกับสินค้า
 DocType: Purchase Invoice Item,Item Weight Details,รายละเอียดน้ำหนักรายการ
 DocType: Asset Maintenance Log,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,แถว # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,แถว # {0}:
 DocType: Timesheet,Total Costing Amount,จํานวนต้นทุนรวม
 DocType: Delivery Note,Vehicle No,เลขยานพาหนะ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,เลือกรายชื่อราคา
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,ทำงานในความคืบหน้า
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,กรุณาเลือกวันที่
 DocType: Daily Work Summary Group,Holiday List,รายการวันหยุด
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,นักบัญชี
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,นักบัญชี
 DocType: Hub Settings,Selling Price List,รายการราคาขาย
 DocType: Patient,Tobacco Current Use,การใช้ในปัจจุบันของยาสูบ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,ราคาขาย
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,ราคาขาย
 DocType: Cost Center,Stock User,หุ้นผู้ใช้
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,โทรศัพท์ไม่มี
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},ใหม่ {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ส่งอีเมลแจ้งเตือนครั้งแรกแล้ว
 ,Sales Partners Commission,สำนักงานคณะกรรมการกำกับการขายหุ้นส่วน
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ค่าหลังจากค่าเสื่อมราคา
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ที่เกี่ยวข้อง
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,วันที่เข้าร่วมประชุมไม่น้อยกว่าวันที่เข้าร่วมของพนักงาน
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,วันที่เข้าร่วมประชุมไม่น้อยกว่าวันที่เข้าร่วมของพนักงาน
 DocType: Grading Scale,Grading Scale Name,การวัดผลการศึกษาชื่อชั่ง
-DocType: Subscription,Repeat on Day,ทำซ้ำในวัน
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,นี่คือบัญชี รากและ ไม่สามารถแก้ไขได้
 DocType: Sales Invoice,Company Address,ที่อยู่ บริษัท
 DocType: BOM,Operations,การดำเนินงาน
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ไม่สามารถตั้งค่า การอนุญาต บนพื้นฐานของ ส่วนลดพิเศษสำหรับ {0}
+DocType: Subscription,Subscription Start Date,วันที่เริ่มต้นการสมัคร
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",แนบไฟล์ csv ที่มีสองคอลัมน์หนึ่งชื่อเก่าและหนึ่งสำหรับชื่อใหม่
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ไม่ได้อยู่ในปีงบประมาณใดๆ
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ข้อมูลอ้างอิง: {0} รหัสรายการ: {1} และลูกค้า: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,วันสิ้นสุดของรอบระยะทดลองไม่สามารถเป็นได้ก่อนวันที่เริ่มทดลองใช้
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,กิโลกรัม
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,เปิดงาน
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},ไม่ได้ระบุ BOM สำหรับรายการรับเหมาช่วง {0} ที่แถว {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Patient,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,รับรายการจาก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,รับรายการจาก
 DocType: Price List,Price Not UOM Dependant,ราคาไม่ขึ้นอยู่ UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},สินค้า {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,น้ำมันเบรค
 DocType: Tax Rule,Tax Type,ประเภทภาษี
 ,Completed Work Orders,ใบสั่งงานที่เสร็จสมบูรณ์
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,จำนวนเงินที่ต้องเสียภาษี
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,จำนวนเงินที่ต้องเสียภาษี
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},คุณยังไม่ได้รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อน {0}
 DocType: BOM,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาที่ดำเนินงานจริง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,แถว # {0}: ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในการเรียกร้องค่าใช้จ่ายหรือบันทึกประจำวัน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,เลือก BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,แถว # {0}: ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในการเรียกร้องค่าใช้จ่ายหรือบันทึกประจำวัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,เลือก BOM
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,จัดการจำนวนเงินล่วงหน้าให้แก่ลูกจ้าง
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,การแจ้งการจัดส่ง
 DocType: Journal Entry,Opening Entry,เปิดรายการ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,บัญชีจ่ายเพียง
-DocType: Employee Loan,Repay Over Number of Periods,ชำระคืนกว่าจำนวนงวด
+DocType: Loan,Repay Over Number of Periods,ชำระคืนกว่าจำนวนงวด
 DocType: Stock Entry,Additional Costs,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 DocType: Lead,Product Enquiry,สอบถามสินค้า
 DocType: Education Settings,Validate Batch for Students in Student Group,ตรวจสอบรุ่นสำหรับนักเรียนในกลุ่มนักเรียน
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ไม่มีประวัติการลาพบพนักงาน {0} สำหรับ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ไม่มีประวัติการลาพบพนักงาน {0} สำหรับ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,กรุณากรอก บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,กรุณาเลือก บริษัท แรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,กรุณาเลือก บริษัท แรก
 DocType: Employee Education,Under Graduate,ภายใต้บัณฑิต
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,โปรดตั้งค่าเทมเพลตมาตรฐานสำหรับการแจ้งเตือนสถานะการลาออกในการตั้งค่า HR
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,เป้าหมาย ที่
 DocType: BOM,Total Cost,ค่าใช้จ่ายรวม
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,เงินกู้พนักงาน
 DocType: Fee Schedule,Send Payment Request Email,ส่งอีเมลคำขอชำระเงิน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,ไม่ได้ลงทะเบียนสำเร็จ
 DocType: Assessment Result,Grade,เกรด
 DocType: Restaurant Table,No of Seats,ไม่มีที่นั่ง
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",ในการเพิ่มเรื่องแบบไดนามิกให้ใช้แท็ก jinja เช่น <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: Asset Maintenance Task,Asset Maintenance Task,งานบำรุงรักษาสินทรัพย์
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,เงินเดือนประจำปี
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,เงินเดือนประจำปี
 DocType: Daily Work Summary,Daily Work Summary,สรุปการทำงานประจำวัน
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,ค่าใช้จ่ายใน สต็อก
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,กรุณาใส่อีเมล์ที่ต้องการติดต่อ
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,กรุณาใส่อีเมล์ที่ต้องการติดต่อ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,ในทางตรงกันข้ามการเข้า
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ที่อยู่หลัก
 DocType: Production Plan,Material Request Detail,รายละเอียดคำขอเนื้อหา
 DocType: Selling Settings,Default Quotation Validity Days,วันที่ถูกต้องของใบเสนอราคาเริ่มต้น
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: Sales Invoice,Change Amount,เปลี่ยนจำนวน
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,ประเภทใบอนุญาตขับรถ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,โปรดป้อนวันที่จัดส่ง
 DocType: Depreciation Schedule,Make Depreciation Entry,บันทึกรายการค่าเสื่อมราคา
+DocType: HR Settings,Leave Settings,ออกจากการตั้งค่า
 DocType: Appraisal Template Goal,KRA,กระ
 DocType: Lead,Request Type,ชนิดของการร้องขอ
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,สร้างพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),โหมดตั้งค่า POS (ออนไลน์ / ออฟไลน์)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,ปิดใช้งานการสร้างบันทึกเวลากับคำสั่งซื้องาน การดำเนินงานจะไม่ถูกติดตามต่อ Work Order
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,การปฏิบัติ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,การปฏิบัติ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
 DocType: Asset Maintenance Log,Maintenance Status,สถานะการบำรุงรักษา
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,รายละเอียดสมาชิก
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ผู้ผลิตเป็นสิ่งจำเป็นสำหรับบัญชีเจ้าหนี้ {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,รายการและราคา
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},ชั่วโมงรวม: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},จากวันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่าตั้งแต่วันที่ = {0}
 DocType: Drug Prescription,Interval,ระยะห่าง
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,การตั้งค่า
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,การตั้งค่า
 DocType: Grant Application,Individual,บุคคล
 DocType: Academic Term,Academics User,นักวิชาการผู้ใช้
 DocType: Cheque Print Template,Amount In Figure,จำนวนเงินในรูปที่
-DocType: Employee Loan Application,Loan Info,ข้อมูลสินเชื่อ
+DocType: Loan Application,Loan Info,ข้อมูลสินเชื่อ
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,แผนสำหรับการเข้าชมการบำรุงรักษา
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,ช่วงจดแต้มของผู้จัดจำหน่าย
 DocType: Share Transfer,Share Transfer,โอนหุ้น
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,เทมเพลตรายการ
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,ชีวเคมี
 DocType: Job Offer,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,ราคาออกมา
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,ราคาออกมา
 DocType: Woocommerce Settings,Woocommerce Settings,การตั้งค่า Woocommerce
 DocType: Production Plan,Sales Orders,ใบสั่งขาย
 DocType: Purchase Taxes and Charges,Valuation,การประเมินค่า
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,ดินแดนเริ่มต้น
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,โทรทัศน์
 DocType: Work Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,เลือกลูกค้าหรือผู้จัดจำหน่าย
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Company,Enable Perpetual Inventory,เปิดใช้พื้นที่โฆษณาถาวร
+DocType: Bank Guarantee,Charges Incurred,ค่าบริการที่เกิดขึ้น
 DocType: Company,Default Payroll Payable Account,เริ่มต้นเงินเดือนบัญชีเจ้าหนี้
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,อีเมลกลุ่มปรับปรุง
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,ผลลัพธ์แบบกำหนดเอง
 DocType: Delivery Stop,Contact Name,ชื่อผู้ติดต่อ
 DocType: Course Assessment Criteria,Course Assessment Criteria,เกณฑ์การประเมินหลักสูตร
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,รหัสภาษี:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,รหัสภาษี:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,รหัสนักศึกษา:
 DocType: POS Customer Group,POS Customer Group,กลุ่มลูกค้า จุดขายหน้าร้าน
 DocType: Land Unit,Land Unit describing various land assets,หน่วยที่ดินอธิบายที่ดินต่างๆ
@@ -375,9 +372,8 @@
 ,Open Work Orders,Open Orders
 DocType: Payment Term,Credit Months,เดือนเครดิต
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,จ่ายสุทธิไม่สามารถน้อยกว่า 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",หากต้องการหยุดส่งการแจ้งเตือนข้อผิดพลาดซ้ำ ๆ จากระบบเราจะตรวจสอบฟิลด์ Disabled ในการสมัครสมาชิก
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,การลาต่อปี
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,การลาต่อปี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Email Digest,Profit & Loss,กำไรขาดทุน
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,โปรดตั้งค่านักเรียนภายใต้กลุ่มนักเรียน
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,รายการธนาคาร
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,รายการธนาคาร
 DocType: Crop,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,คอร์สกลุ่มนักศึกษาสร้างเครื่องมือ
 DocType: Lead,Do Not Contact,ไม่ ติดต่อ
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,คนที่สอนในองค์กรของคุณ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,นักพัฒนาซอฟต์แวร์
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,นักพัฒนาซอฟต์แวร์
 DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Course Scheduling Tool,Course Start Date,แน่นอนวันที่เริ่มต้น
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,ระดับสูงสุด
 DocType: Email Digest,New Quotations,ใบเสนอราคาใหม่
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,สลิปอีเมล์เงินเดือนให้กับพนักงานบนพื้นฐานของอีเมลที่ต้องการเลือกในการพนักงาน
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
 DocType: Tax Rule,Shipping County,การจัดส่งสินค้าเคาน์ตี้
-apps/erpnext/erpnext/config/desktop.py +167,Learn,เรียนรู้
+apps/erpnext/erpnext/config/desktop.py +159,Learn,เรียนรู้
 DocType: Asset,Next Depreciation Date,ถัดไปวันที่ค่าเสื่อมราคา
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ค่าใช้จ่ายในกิจกรรมต่อพนักงาน
 DocType: Accounts Settings,Settings for Accounts,การตั้งค่าสำหรับบัญชี
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,เช็คที่โดดเด่นและเงินฝากที่จะล้าง
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
 DocType: Driver,Fleet Manager,ผู้จัดการกอง
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},แถว # {0}: {1} ไม่สามารถลบสำหรับรายการ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},แถว # {0}: {1} ไม่สามารถลบสำหรับรายการ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,รหัสผ่านไม่ถูกต้อง
 DocType: Item,Variant Of,แตกต่างจาก
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},โปรดตั้งค่าห้องพักโรงแรมเมื่อ {@}
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Opening Invoice Creation Tool,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,หมายเหตุจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,หมายเหตุจัดส่งสินค้า
 DocType: Consultation,Encounter Impression,Encounter Impression
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,ต้นทุนของทรัพย์สินที่ขาย
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Course Scheduling Tool,Course Scheduling Tool,หลักสูตรเครื่องมือการตั้งเวลา
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent] เกิดข้อผิดพลาดขณะสร้าง% s ที่เกิดซ้ำสำหรับ% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
 DocType: Land Unit,LInked Analysis,การวิเคราะห์ LInked
 DocType: Item Tax,Tax Rate,อัตราภาษี
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,ระยะเวลาการสมัครต้องไม่เกินสองระเบียนการจัดสรร
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,ระยะเวลาการสมัครต้องไม่เกินสองระเบียนการจัดสรร
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรสำหรับพนักงาน {1} แล้วสำหรับรอบระยะเวลา {2} ถึง {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,สร้างกลุ่มนักศึกษา
 DocType: Volunteer,Weekends,วันหยุดสุดสัปดาห์
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,เครดิตจำนวนเงิน
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,เครดิตจำนวนเงิน
 DocType: Setup Progress Action,Action Document,เอกสารการกระทำ
 DocType: Chapter Member,Website URL,URL ของเว็บไซต์
 ,Finished Goods,สินค้า สำเร็จรูป
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext สาธิต
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,เพิ่มรายการ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,รายการพารามิเตอร์การตรวจสอบคุณภาพ
+DocType: Leave Application,Leave Approver Name,ชื่อผู้อนุมัติการลา
 DocType: Depreciation Schedule,Schedule Date,กำหนดการ วันที่
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",ผลประกอบการหักเงินเดือนและส่วนประกอบอื่น ๆ
 DocType: Packed Item,Packed Item,จัดส่งสินค้าบรรจุหมายเหตุ
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,ขอใบเสนอราคา
 DocType: Healthcare Settings,Require Lab Test Approval,ต้องได้รับอนุมัติจาก Lab Test
 DocType: Salary Slip Timesheet,Working Hours,เวลาทำการ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,รวมดีเด่น
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,รวมดีเด่น
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
 DocType: Dosage Strength,Strength,ความแข็งแรง
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,สร้างลูกค้าใหม่
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
 DocType: Student Log,Medical,การแพทย์
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,เหตุผล สำหรับการสูญเสีย
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,เหตุผล สำหรับการสูญเสีย
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,อัปเดตหมายเลขบัญชี
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,เจ้าของตะกั่วไม่สามารถเช่นเดียวกับตะกั่ว
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,เดียว
 DocType: Salary Slip,Total Loan Repayment,รวมการชำระคืนเงินกู้
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
-DocType: Subscription,Yearly,ประจำปี
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
 DocType: Drug Prescription,Dosage,ปริมาณ
 DocType: Journal Entry Account,Sales Order,สั่งซื้อขาย
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,เฉลี่ย อัตราการขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,เฉลี่ย อัตราการขาย
 DocType: Assessment Plan,Examiner Name,ชื่อผู้ตรวจสอบ
 DocType: Lab Test Template,No Result,ไม่มีผล
 DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
 DocType: Purchase Invoice,Supplier Name,ชื่อผู้จัดจำหน่าย
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,อ่านคู่มือ ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,แสดงใบสมาชิกของแผนกทั้งหมดในปฏิทิน
 DocType: Purchase Invoice,01-Sales Return,01- ขายกลับ
 DocType: Account,Is Group,มีกลุ่ม
 DocType: Email Digest,Pending Purchase Orders,รอดำเนินการสั่งซื้อ
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,ฟิลด์บังคับ - ปีการศึกษา
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} ไม่มีส่วนเกี่ยวข้องกับ {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ปรับแต่งข้อความเกริ่นนำที่จะไปเป็นส่วนหนึ่งของอีเมลที่ แต่ละรายการมีข้อความเกริ่นนำแยก
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},โปรดตั้งค่าบัญชีค่าตั้งต้นสำหรับ บริษัท {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},โปรดตั้งค่าบัญชีค่าตั้งต้นสำหรับ บริษัท {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},การทำธุรกรรมไม่ได้รับอนุญาตจากคำสั่งซื้อที่หยุดทำงาน {0}
 DocType: Setup Progress Action,Min Doc Count,นับ Min Doc
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,สงวนไว้สำหรับขาย
 DocType: Packing Slip,From Package No.,จากเลขที่แพคเกจ
 DocType: Item Attribute,To Range,ช่วง
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ไม่สามารถเปลี่ยนแปลงวิธีการประเมินเนื่องจากมีธุรกรรมบางอย่างที่ไม่ได้เป็นวิธีการประเมินของตนเอง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,หลักทรัพย์และ เงินฝาก
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ไม่สามารถเปลี่ยนแปลงวิธีการประเมินเนื่องจากมีธุรกรรมบางอย่างที่ไม่ได้เป็นวิธีการประเมินของตนเอง
 DocType: Student Report Generation Tool,Attended by Parents,เข้าร่วมโดยพ่อแม่
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Patient,AB Positive,AB บวก
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,บันทึกการเข้าร่วมประชุม
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ตัวแทนเงินเดือนสำหรับ timesheet ตามบัญชีเงินเดือน
 DocType: Sales Order Item,Used for Production Plan,ที่ใช้ในการวางแผนการผลิต
-DocType: Employee Loan,Total Payment,การชำระเงินรวม
+DocType: Loan,Total Payment,การชำระเงินรวม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,ไม่สามารถยกเลิกการทำธุรกรรมสำหรับคำสั่งซื้อที่เสร็จสมบูรณ์ได้
 DocType: Manufacturing Settings,Time Between Operations (in mins),เวลาระหว่างการดำเนินงาน (ในนาที)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} ถูกยกเลิกดังนั้นการดำเนินการไม่สามารถทำได้
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,อะไหล่พอที่จะสร้าง
 DocType: POS Profile User,POS Profile User,ผู้ใช้โปรไฟล์ POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,รายได้ โดยตรง
+DocType: Subscription Invoice,Subscription Invoice,ใบแจ้งหนี้การสมัครสมาชิก
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,รายได้ โดยตรง
 DocType: Patient Appointment,Date TIme,วันเวลา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,พนักงานธุรการ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,พนักงานธุรการ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,การตั้ง บริษัท และภาษี
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
 DocType: Codification Table,Codification Table,ตารางการแจกแจง
 DocType: Timesheet Detail,Hrs,ชั่วโมง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,กรุณาเลือก บริษัท
 DocType: Stock Entry Detail,Difference Account,บัญชี ที่แตกต่างกัน
 DocType: Purchase Invoice,Supplier GSTIN,ผู้จัดจำหน่าย GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,แม่แบบการทำแผนที่กระแสเงินสด
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
+DocType: Bank Guarantee,Providing,หาก
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",ไม่อนุญาตให้ตั้งค่า Lab Test Template ตามต้องการ
 DocType: Patient,Risk Factors,ปัจจัยเสี่ยง
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
 DocType: Healthcare Settings,Appointment Confirmation,การยืนยันการแต่งตั้ง
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),ปิด (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,สวัสดี
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,ย้ายรายการ
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",ตั้งค่าดีฟอลต์ในโพสต์โปรไฟล์ {0} สำหรับผู้ใช้ {1} เรียบร้อยแล้วโปรดปิดใช้งานค่าเริ่มต้น
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ค่าสะสม
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,ต้องการพื้นที่ในโปรไฟล์ POS
 DocType: Supplier,Prevent RFQs,ป้องกัน RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,สร้างการขายสินค้า
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},ส่งสลิปเงินเดือนเป็นระยะเวลาตั้งแต่ {0} ถึง {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},ส่งสลิปเงินเดือนเป็นระยะเวลาตั้งแต่ {0} ถึง {1}
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,วันที่จัดส่งบิล
 DocType: Production Plan,Production Plan,แผนการผลิต
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,เปิดเครื่องมือสร้างใบแจ้งหนี้
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,ขายกลับ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,ขายกลับ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,หมายเหตุ: ใบที่จัดสรรทั้งหมด {0} ไม่ควรจะน้อยกว่าใบอนุมัติแล้ว {1} สําหรับงวด
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,ตั้งค่าจำนวนในรายการตาม Serial Input ไม่มี
 ,Total Stock Summary,สรุปสต็อคทั้งหมด
 DocType: Announcement,Posted By,โพสโดย
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,โปรดตั้ง บริษัท
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,โปรดตั้ง บริษัท
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Training Result Employee,Training Result Employee,ผลการฝึกอบรมพนักงาน
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
-DocType: Repayment Schedule,Principal Amount,เงินต้น
-DocType: Employee Loan Application,Total Payable Interest,รวมดอกเบี้ยเจ้าหนี้
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,เงินต้น
+DocType: Loan Application,Total Payable Interest,รวมดอกเบี้ยเจ้าหนี้
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},ยอดคงค้างทั้งหมด: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ขายใบแจ้งหนี้ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
 DocType: Restaurant Reservation,Restaurant Reservation,จองร้านอาหาร
 DocType: Land Unit,Land Unit Name,ชื่อหน่วยโฆษณาที่ดิน
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,การเขียน ข้อเสนอ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,การเขียน ข้อเสนอ
 DocType: Payment Entry Deduction,Payment Entry Deduction,หักรายการชำระเงิน
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ห่อ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,แจ้งลูกค้าทางอีเมล
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,แจ้งลูกค้าทางอีเมล
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,อีกคนขาย {0} อยู่กับรหัสพนักงานเดียวกัน
 DocType: Employee Advance,Claimed Amount,จำนวนเงินที่อ้างสิทธิ์
 apps/erpnext/erpnext/config/education.py +180,Masters,ข้อมูลหลัก
@@ -830,13 +828,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",Payment Gateway บัญชีไม่ได้สร้างโปรดสร้างด้วยตนเอง
 DocType: Supplier Scorecard,Per Year,ต่อปี
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,ไม่มีสิทธิ์รับเข้าเรียนในโครงการนี้ต่อ DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Sales Invoice,Sales Taxes and Charges,ภาษีการขายและค่าใช้จ่าย
 DocType: Employee,Organization Profile,องค์กร รายละเอียด
 DocType: Vital Signs,Height (In Meter),ความสูง (เป็นเมตร)
 DocType: Student,Sibling Details,รายละเอียดพี่น้อง
 DocType: Vehicle Service,Vehicle Service,บริการซ่อมบำรุงรถยนต์
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,ทริกเกอร์คำขอข้อเสนอแนะตามเงื่อนไขโดยอัตโนมัติ
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,ทริกเกอร์คำขอข้อเสนอแนะตามเงื่อนไขโดยอัตโนมัติ
 DocType: Employee,Reason for Resignation,เหตุผลในการลาออก
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,แม่แบบสำหรับ การประเมิน ผลการปฏิบัติงาน
 DocType: Sales Invoice,Credit Note Issued,หมายเหตุเครดิตที่ออก
@@ -851,10 +848,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,กำหนดการซ่อมบำรุง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,เปลี่ยนสุทธิในสินค้าคงคลัง
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,การบริหารจัดการเงินกู้พนักงาน
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ความสัมพันธ์กับ Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ผู้จัดการ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,ผู้จัดการ
 DocType: Payment Entry,Payment From / To,การชำระเงินจาก / ถึง
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},โปรดตั้งค่าบัญชีในคลังสินค้า {0}
@@ -896,24 +892,24 @@
 DocType: Item,Material Transfer,โอนวัสดุ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,ไม่สามารถหาเส้นทางสำหรับ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),เปิด ( Dr)
+DocType: Loan,Applicant,ผู้ขอ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},การโพสต์ จะต้องมี การประทับเวลา หลังจาก {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,เพื่อทำเอกสารที่เกิดซ้ำ
 ,GST Itemised Purchase Register,GST ลงทะเบียนซื้อสินค้า
 DocType: Course Scheduling Tool,Reschedule,หมายกำหนดการใหม่
-DocType: Employee Loan,Total Interest Payable,ดอกเบี้ยรวมเจ้าหนี้
+DocType: Loan,Total Interest Payable,ดอกเบี้ยรวมเจ้าหนี้
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ที่ดินภาษีต้นทุนและค่าใช้จ่าย
 DocType: Work Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,เสร็จสิ้น
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,ฐาน
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,ฐาน
 DocType: Timesheet,Total Billed Hours,รวมชั่วโมงการเรียกเก็บเงิน
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,เขียนทันทีจำนวน
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,เขียนทันทีจำนวน
 DocType: Leave Block List Allow,Allow User,อนุญาตให้ผู้ใช้
 DocType: Journal Entry,Bill No,หมายเลขบิล
 DocType: Company,Gain/Loss Account on Asset Disposal,บัญชีกำไร / ขาดทุนจากการขายสินทรัพย์
 DocType: Vehicle Log,Service Details,รายละเอียดการให้บริการ
 DocType: Vehicle Log,Service Details,รายละเอียดการให้บริการ
-DocType: Subscription,Quarterly,ทุกไตรมาส
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,การจัดกลุ่ม
 DocType: Selling Settings,Delivery Note Required,หมายเหตุจัดส่งสินค้าที่จำเป็น
@@ -925,7 +921,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,ใบบันทึกเวลา
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush วัตถุดิบที่ใช้ใน
 DocType: Sales Invoice,Port Code,รหัสพอร์ต
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,คลังสินค้าสำรอง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,คลังสินค้าสำรอง
 DocType: Lead,Lead is an Organization,ผู้นำคือองค์กร
 DocType: Guardian Interest,Interest,ดอกเบี้ย
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ขายก่อน
@@ -937,12 +933,12 @@
 DocType: Account,Accounts,บัญชี
 DocType: Vehicle,Odometer Value (Last),ราคาเครื่องวัดระยะทาง (สุดท้าย)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,เทมเพลตเกณฑ์การให้คะแนนของซัพพลายเออร์
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,การตลาด
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,การตลาด
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,รายการชำระเงินที่สร้างไว้แล้ว
 DocType: Request for Quotation,Get Suppliers,รับซัพพลายเออร์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,คุณสามารถต่ออายุได้เฉพาะเมื่อสมาชิกของคุณหมดอายุภายใน 30 วันเท่านั้น
@@ -952,7 +948,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,เลือกเฉพาะเมื่อคุณได้ตั้งค่าเอกสาร Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Supplier Scorecard,Per Week,ต่อสัปดาห์
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,นักศึกษารวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
@@ -974,9 +970,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,เข้าบัตรเครดิต
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,บริษัท ฯ และบัญชี
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,ในราคา
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,ในราคา
 DocType: Asset Settings,Depreciation Options,ตัวเลือกค่าเสื่อมราคา
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,เวลาผ่านรายการไม่ถูกต้อง
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,เวลาผ่านรายการไม่ถูกต้อง
 DocType: Lead,Campaign Name,ชื่อแคมเปญ
 DocType: Hotel Room,Capacity,ความจุ
 DocType: Selling Settings,Close Opportunity After Days,ปิดโอกาสหลังจากวัน
@@ -1001,7 +997,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,ใบสั่งซื้อของลูกค้าไม่มี
 DocType: Budget,Budget Against,งบประมาณป้องกันและปราบปราม
 DocType: Employee,Cell Number,จำนวนเซลล์
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ไม่มีพนักงานสำหรับเกณฑ์ที่ระบุ ตรวจสอบว่าไม่มีการสร้างสลากเงินเดือนแล้ว
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ไม่มีพนักงานสำหรับเกณฑ์ที่ระบุ ตรวจสอบว่าไม่มีการสร้างสลากเงินเดือนแล้ว
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
@@ -1013,15 +1009,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,โปรดเลือกตาราง
 DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} คือที่อยู่อีเมลที่ไม่ถูกต้องใน &quot;ผู้รับ&quot;
 DocType: Special Test Items,Particulars,รายละเอียด
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
 DocType: Student,A+,A+
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",กฎราคาหลายอยู่กับเกณฑ์เดียวกันโปรดแก้ปัญหาความขัดแย้งโดยการกำหนดลำดับความสำคัญ กฎราคา: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Asset,Maintenance,การบำรุงรักษา
+DocType: Subscriber,Subscriber,สมาชิก
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,โปรดอัปเดตสถานะโครงการของคุณ
 DocType: Item,Maximum sample quantity that can be retained,จำนวนตัวอย่างสูงสุดที่สามารถเก็บรักษาได้
@@ -1078,26 +1074,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,การตั้งค่าเริ่มต้นสำหรับรถเข็น
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,เพิ่ม Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},สินทรัพย์ทิ้งผ่านทางวารสารรายการ {0}
-DocType: Employee Loan,Interest Income Account,บัญชีรายได้ดอกเบี้ย
+DocType: Loan,Interest Income Account,บัญชีรายได้ดอกเบี้ย
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,ส่งคำเชิญแล้ว
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,เทคโนโลยีชีวภาพ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,ไปที่
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,การตั้งค่าบัญชีอีเมล
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Asset Repair,Downtime,หยุดทำงาน
 DocType: Account,Liability,ความรับผิดชอบ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,ระยะเวลาการศึกษา:
 DocType: Salary Detail,Do not include in total,ไม่รวมในทั้งหมด
 DocType: Company,Default Cost of Goods Sold Account,เริ่มต้นค่าใช้จ่ายของบัญชีที่ขายสินค้า
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},ปริมาณตัวอย่าง {0} ไม่สามารถมากกว่าปริมาณที่ได้รับ {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Request for Quotation Supplier,Send Email,ส่งอีเมล์
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 DocType: Item,Max Sample Quantity,จำนวนตัวอย่างสูงสุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,ไม่ได้รับอนุญาต
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,อ้างสิทธิ์ที่ร้องขอ
 DocType: Vital Signs,Heart Rate / Pulse,อัตราหัวใจ / ชีพจร
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
@@ -1108,12 +1104,11 @@
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab Tests และ Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,พบว่า พนักงานที่ ไม่มี
-DocType: Subscription,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,การปรับปรุงโครงการ
 DocType: SMS Center,All Customer Contact,ติดต่อลูกค้าทั้งหมด
 DocType: Land Unit,Tree Details,รายละเอียดต้นไม้
@@ -1163,7 +1158,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,ทั้งหมด รายการ กลุ่ม
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Work Order,Item To Manufacture,รายการที่จะผลิต
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
@@ -1177,7 +1171,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",เลือกใหม่ถ้าที่อยู่ที่เลือกถูกแก้ไขหลังจากบันทึกแล้ว
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 DocType: Item,Hub Publishing Details,รายละเอียด Hub Publishing
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','กำลังเปิด'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','กำลังเปิด'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
 DocType: Lab Test Template,Result Format,รูปแบบผลลัพธ์
@@ -1187,7 +1181,7 @@
 DocType: Payroll Entry,Bimonthly,สองเดือนต่อครั้ง
 DocType: Vehicle Service,Brake Pad,ผ้าเบรค
 DocType: Fertilizer,Fertilizer Contents,สารปุ๋ย
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,การวิจัยและพัฒนา
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,การวิจัยและพัฒนา
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,จำนวนเงินที่จะเรียกเก็บเงิน
 DocType: Company,Registration Details,รายละเอียดการลงทะเบียน
 DocType: Timesheet,Total Billed Amount,รวมเงินที่เรียกเก็บ
@@ -1201,7 +1195,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,ตรวจสอบวงเงินเบิกเกินวงเงินที่ใบสั่งขาย
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,ประเมินผลการปฏิบัติ
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",การเปิดใช้งาน &#39;ใช้สำหรับรถเข็น&#39; เป็นรถเข็นถูกเปิดใช้งานและควรจะมีกฎภาษีอย่างน้อยหนึ่งสำหรับรถเข็น
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",รายการชำระเงิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1} ตรวจสอบว่ามันควรจะดึงล่วงหน้าในใบแจ้งหนี้นี้
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",รายการชำระเงิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1} ตรวจสอบว่ามันควรจะดึงล่วงหน้าในใบแจ้งหนี้นี้
 DocType: Sales Invoice Item,Stock Details,หุ้นรายละเอียด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,มูลค่าโครงการ
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,จุดขาย
@@ -1235,7 +1229,7 @@
 DocType: Restaurant Table,Minimum Seating,ที่นั่งขั้นต่ำ
 DocType: Item Attribute,Item Attribute Values,รายการค่าแอตทริบิวต์
 DocType: Examination Result,Examination Result,ผลการตรวจสอบ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},อ้างอิง Doctype ต้องเป็นหนึ่งใน {0}
@@ -1243,15 +1237,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Work Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} จะต้องใช้งาน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,ไม่มีรายการสำหรับโอน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,ไม่มีรายการสำหรับโอน
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),การปิดบัญชี (การเปิด + ยอดรวม)
 DocType: Journal Entry,Depreciation Entry,รายการค่าเสื่อมราคา
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
 DocType: Crop Cycle,ISO 8016 standard,มาตรฐาน ISO 8016
 DocType: Pricing Rule,Rate or Discount,ราคาหรือส่วนลด
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,จำนวนที่ต้องการ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,รายการโปรด
 DocType: Hub Settings,Custom Data,ข้อมูลที่กำหนดเอง
@@ -1263,9 +1257,9 @@
 DocType: Medical Code,Medical Code Standard,มาตรฐานการแพทย์
 DocType: Soil Texture,Clay Composition (%),องค์ประกอบของดิน (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,โปรดบันทึกก่อนที่จะมอบหมายงาน
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,ความสมดุลของ ความคุ้มค่า
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,ความสมดุลของ ความคุ้มค่า
 DocType: Lab Test,Lab Technician,ช่างเทคนิคห้องปฏิบัติการ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ขายราคาตามรายการ
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,ขายราคาตามรายการ
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",ถ้าเลือกไว้ลูกค้าจะถูกสร้างขึ้นแมปกับผู้ป่วย จะมีการสร้างใบแจ้งหนี้ของผู้ป่วยต่อลูกค้ารายนี้ นอกจากนี้คุณยังสามารถเลือกลูกค้าที่มีอยู่ขณะสร้างผู้ป่วย
 DocType: Bank Reconciliation,Account Currency,สกุลเงินของบัญชี
@@ -1273,16 +1267,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,กรุณาระบุบัญชีรอบปิด บริษัท
 DocType: Purchase Receipt,Range,เทือกเขา
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
 DocType: Item Barcode,Item Barcode,บาร์โค้ดสินค้า
 DocType: Woocommerce Settings,Endpoints,ปลายทาง
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",ที่จะสร้างขึ้น หากล่าช้าคุณจะต้องเปลี่ยนฟิลด์ &quot;ทำซ้ำในช่วงวันที่&quot; ด้วยตนเอง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
 DocType: Share Transfer,From Folio No,จาก Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
@@ -1317,16 +1309,17 @@
 DocType: Asset,Available-for-use Date,วันที่พร้อมใช้งาน
 DocType: Guardian,Guardian Name,ชื่อผู้ปกครอง
 DocType: Cheque Print Template,Has Print Format,มีรูปแบบการพิมพ์
-DocType: Employee Loan,Sanctioned,ตามทำนองคลองธรรม
+DocType: Loan,Sanctioned,ตามทำนองคลองธรรม
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,จำเป็นต้องใช้ ลองตรวจสอบบันทึกแลกเปลี่ยนเงินตราต่างประเทศที่อาจจะยังไม่ได้ถูกสร้างขึ้น
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","สำหรับรายการ &#39;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","สำหรับรายการ &#39;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
 DocType: Student Admission,Publish on website,เผยแพร่บนเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,วันที่จัดจำหน่ายใบแจ้งหนี้ไม่สามารถมีค่ามากกว่าการโพสต์วันที่
+DocType: Subscription,Cancelation Date,วันที่ยกเลิก
 DocType: Purchase Invoice Item,Purchase Order Item,สั่งซื้อสินค้าสั่งซื้อ
 DocType: Agriculture Task,Agriculture Task,งานเกษตร
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,รายได้ ทางอ้อม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,รายได้ ทางอ้อม
 DocType: Student Attendance Tool,Student Attendance Tool,เครื่องมือนักศึกษาเข้าร่วม
 DocType: Restaurant Menu,Price List (Auto created),รายการราคา (สร้างโดยอัตโนมัติ)
 DocType: Cheque Print Template,Date Settings,การตั้งค่าของวันที่
@@ -1353,6 +1346,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,เมตร
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,datetime การทดสอบห้องปฏิบัติการต้องไม่มาก่อน datetime การรวบรวมข้อมูล
+DocType: Subscription Plan,Cost,ราคา
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
 DocType: Expense Claim,Total Advance Amount,ยอดรวมเงินทดรอง
 DocType: Delivery Stop,Estimated Arrival,มาถึงโดยประมาณ
@@ -1364,14 +1358,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
 DocType: Timesheet Detail,Bill,บิล
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ขาว
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,ขาว
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,คุณสามารถเลือกตัวเลือกได้สูงสุดจากรายการกล่องกาเครื่องหมายเท่านั้น
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
 DocType: Item,Automatically Create New Batch,สร้างชุดงานใหม่โดยอัตโนมัติ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),การกำหนด {0} ถึง {1} (แถว {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,สร้าง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),การกำหนด {0} ถึง {1} (แถว {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,สร้าง
 DocType: Student Admission,Admission Start Date,การรับสมัครวันที่เริ่มต้น
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,พนักงานใหม่
@@ -1387,7 +1381,7 @@
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 DocType: Repayment Schedule,Balance Loan Amount,ยอดคงเหลือวงเงินกู้
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ตารางเรียน
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,ตัวเลือกหุ้น
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,ตัวเลือกหุ้น
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,ปิดการใช้งานการเรียกข้อมูลการซื้อครั้งล่าสุดในใบสั่งซื้อ
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
@@ -1406,11 +1400,12 @@
 DocType: Packing Slip Item,Packing Slip Item,บรรจุรายการสลิป
 DocType: Purchase Invoice,Cash/Bank Account,เงินสด / บัญชีธนาคาร
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},โปรดระบุ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,การสร้างชุดตัวเลือกถูกจัดคิว
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},สรุปการทำงานสำหรับ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ผู้ที่จะได้รับการอนุมัติครั้งแรกในรายการจะได้รับการกำหนดเป็นค่าเริ่มต้นการปล่อยให้ผู้อนุมัติ
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Plan,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
 DocType: Training Event,Self-Study,การศึกษาด้วยตนเอง
@@ -1423,7 +1418,7 @@
 DocType: Workstation,Wages,ค่าจ้าง
 DocType: Asset Maintenance,Maintenance Manager Name,ชื่อผู้จัดการฝ่ายบำรุงรักษา
 DocType: Agriculture Task,Urgent,ด่วน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,ไม่สามารถหาตัวแปร:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,โปรดเลือกฟิลด์ที่ต้องการแก้ไขจาก numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,ไม่สามารถเป็นสินทรัพย์ถาวรได้เนื่องจากสร้างบัญชีแยกประเภทแล้ว
@@ -1435,7 +1430,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,ชื่อแม่แบบการตรวจสอบคุณภาพ
 DocType: Project,First Email,อีเมลฉบับแรก
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ปริมาณการขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ปริมาณการขาย
 DocType: Repayment Schedule,Interest Amount,จำนวนเงินที่น่าสนใจ
 DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
 DocType: Share Transfer,Issue,ปัญหา
@@ -1449,10 +1444,10 @@
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 ,Projected Quantity as Source,คาดการณ์ปริมาณเป็นแหล่ง
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,การจัดส่งสินค้า
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,การจัดส่งสินค้า
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ประเภทการโอนย้าย
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,ค่าใช้จ่ายในการขาย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,ค่าใช้จ่ายในการขาย
 DocType: Consultation,Diagnosis,การวินิจฉัยโรค
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
@@ -1461,12 +1456,13 @@
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,รหัสไปรษณีย์
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},เลือกบัญชีเงินฝากดอกเบี้ย {0}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
 DocType: Item,Default Supplier,ผู้ผลิตเริ่มต้น
 DocType: Manufacturing Settings,Over Production Allowance Percentage,การผลิตกว่าร้อยละค่าเผื่อ
-DocType: Employee Loan,Repayment Schedule,กำหนดชำระคืน
+DocType: Loan,Repayment Schedule,กำหนดชำระคืน
 DocType: Shipping Rule Condition,Shipping Rule Condition,สภาพกฎการจัดส่งสินค้า
 DocType: Holiday List,Get Weekly Off Dates,รับวันปิดสัปดาห์
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,วันที่สิ้นสุด ไม่สามารถ จะน้อยกว่า วันเริ่มต้น
@@ -1481,7 +1477,7 @@
 DocType: Education Settings,Attendance Freeze Date,วันที่เข้าร่วมตรึง
 DocType: Education Settings,Attendance Freeze Date,วันที่เข้าร่วมตรึง
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,รายการ บางส่วนของ ซัพพลายเออร์ ของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ดูผลิตภัณฑ์ทั้งหมด
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,ดูผลิตภัณฑ์ทั้งหมด
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),อายุนำขั้นต่ำ (วัน)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),อายุนำขั้นต่ำ (วัน)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,BOMs ทั้งหมด
@@ -1490,14 +1486,16 @@
 DocType: Expense Claim,From Employee,จากพนักงาน
 DocType: Driver,Cellphone Number,หมายเลขโทรศัพท์มือถือ
 DocType: Project,Monitor Progress,ติดตามความคืบหน้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
 DocType: Journal Entry,Make Difference Entry,บันทึกผลต่าง
+DocType: Supplier Quotation,Auto Repeat Section,ส่วนทำซ้ำอัตโนมัติ
 DocType: Upload Attendance,Attendance From Date,ผู้เข้าร่วมจากวันที่
 DocType: Appraisal Template Goal,Key Performance Area,พื้นที่การดำเนินงานหลัก
 DocType: Program Enrollment,Transportation,การขนส่ง
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,แอตทริบิวต์ไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} จำเป็นต้องส่ง
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},ปริมาณต้องน้อยกว่าหรือเท่ากับ {0}
+DocType: Department Approver,Department Approver,ผู้ประเมินกรม
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
 DocType: Employee Advance,Claimed,อ้างว่า
 DocType: Crop,Row Spacing,การเว้นระยะห่างของแถว
@@ -1507,6 +1505,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,กระทบยอดใบแจ้งหนี้การชำระเงิน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,เงินสมทบ%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",ตามการตั้งค่าการซื้อหากต้องการสั่งซื้อสินค้า == &#39;ใช่&#39; จากนั้นสำหรับการสร้างใบกำกับการซื้อผู้ใช้จำเป็นต้องสร้างใบสั่งซื้อก่อนสำหรับรายการ {0}
+,HSN-wise-summary of outward supplies,HSN-wise สรุปของวัสดุสิ้นเปลืองภายนอก
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,เลขทะเบียน บริษัท สำหรับการอ้างอิงของคุณ ตัวเลขภาษี ฯลฯ
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
@@ -1520,7 +1519,7 @@
 DocType: Setup Progress Action,Action Name,ชื่อการกระทำ
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ปีวันเริ่มต้น
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},ตัวเลข 2 หลักแรกของ GSTIN ควรตรงกับหมายเลข State {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,วันที่เริ่มต้นของระยะเวลาการออกใบแจ้งหนี้ปัจจุบัน
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
@@ -1538,26 +1537,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ฟิลด์จะถูกคัดลอกเฉพาะช่วงเวลาของการสร้างเท่านั้น
 DocType: Setup Progress Action,Domains,โดเมน
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,การจัดการ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,การจัดการ
 DocType: Cheque Print Template,Payer Settings,การตั้งค่าการชำระเงิน
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
 DocType: Purchase Invoice,Is Return,คือการกลับมา
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,ความระมัดระวัง
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',วันเริ่มต้นมากกว่าวันสิ้นสุดในงาน &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
 DocType: Price List Country,Price List Country,ราคาประเทศ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} หมายเลขประจำเครื่องที่ถูกต้องสำหรับรายการ {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,รหัสสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,รหัสสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
 DocType: Purchase Invoice Item,UOM Conversion Factor,ปัจจัยการแปลง UOM
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,กรุณากรอกรหัสสินค้าที่จะได้รับหมายเลข Batch
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
-DocType: Employee Loan,Partially Disbursed,การเบิกจ่ายบางส่วน
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,ให้ข้อมูล
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,ให้ข้อมูล
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ฐานข้อมูลผู้ผลิต
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,คุณไม่สามารถรีสตาร์ทการสมัครสมาชิกที่ไม่ได้ยกเลิกได้
 DocType: Account,Balance Sheet,รายงานงบดุล
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
 DocType: Fee Validity,Valid Till,ใช้ได้จนถึง
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,การประชุมครูผู้ปกครองโดยรวม
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
@@ -1570,7 +1569,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,ไม่สามารถเปลี่ยนกลุ่มลูกค้าสำหรับลูกค้าที่เลือกได้
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,กำลังอัปเดตเวลาเดินทางมาถึงโดยประมาณ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,กำลังอัปเดตเวลาเดินทางมาถึงโดยประมาณ
 DocType: Program Enrollment Tool,Enrollment Details,รายละเอียดการลงทะเบียน
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,โปรดเลือกลูกค้า
@@ -1591,18 +1590,20 @@
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Purchase Order,Group same items,รายการกลุ่มเดียวกัน
 DocType: Purchase Invoice,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
-DocType: Employee Loan Application,Repayment Info,ข้อมูลการชำระหนี้
+DocType: Department,Parent Department,ฝ่ายปกครอง
+DocType: Loan Application,Repayment Info,ข้อมูลการชำระหนี้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
 DocType: Maintenance Team Member,Maintenance Role,บทบาทการบำรุงรักษา
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,การตั้งค่าพนักงาน
 DocType: Sales Order,SO-,ดังนั้น-
 DocType: Hotel Room Reservation,Hotel Reservation User,ผู้จองโรงแรม
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,การวิจัย
+DocType: Subscription Settings,Subscription Settings,การตั้งค่าการสมัครสมาชิก
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,การวิจัย
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Announcement,All Students,นักเรียนทุกคน
@@ -1613,19 +1614,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Crop Cycle,Less than a year,น้อยกว่าหนึ่งปี
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,หมายเลขโทรศัพท์มือถือของนักเรียน
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 DocType: Crop,Yield UOM,Yield UOM
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
 DocType: Item,Is Item from Hub,รายการจากฮับ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,แถว {0}: ประเภทกิจกรรมมีผลบังคับใช้
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,การจ่ายเงินปันผล
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,การจ่ายเงินปันผล
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,บัญชีแยกประเภท
 DocType: Stock Reconciliation,Difference Amount,ความแตกต่างจำนวน
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ดร. {0} เมื่อวันที่ Leave on {1}
 DocType: Purchase Invoice,Reverse Charge,Reverse Charge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,กำไรสะสม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,กำไรสะสม
 DocType: Purchase Invoice,05-Change in POS,05 - เปลี่ยน POS
 DocType: Vehicle Log,Service Detail,รายละเอียดบริการ
 DocType: BOM,Item Description,รายละเอียดสินค้า
@@ -1640,12 +1641,12 @@
 DocType: Opportunity Item,Opportunity Item,รายการโอกาส
 ,Student and Guardian Contact Details,นักเรียนและผู้ปกครองรายละเอียดการติดต่อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,แถว {0}: สำหรับผู้จัดจำหน่าย {0} อีเมล์จะต้องส่งอีเมล
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,เปิดชั่วคราว
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,เปิดชั่วคราว
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,ดูฮับ
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 DocType: Patient Appointment,More Info,ข้อมูลเพิ่มเติม
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},อัตราการประเมินที่จำเป็นสำหรับรายการในแถว {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},อัตราการประเมินที่จำเป็นสำหรับรายการในแถว {0}
 DocType: Supplier Scorecard,Scorecard Actions,การดำเนินการตามสกอร์การ์ด
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,ตัวอย่าง: ปริญญาโทในสาขาวิทยาศาสตร์คอมพิวเตอร์
 DocType: Purchase Invoice,Rejected Warehouse,คลังสินค้าปฏิเสธ
@@ -1655,7 +1656,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ไปยัง
 DocType: Supplier Quotation Item,Lead Time in days,ระยะเวลาในวันที่
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,สรุปบัญชีเจ้าหนี้
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},การชำระเงินของเงินเดือนจาก {0} เป็น {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},การชำระเงินของเงินเดือนจาก {0} เป็น {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
@@ -1664,9 +1665,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ข้อกำหนดการทดสอบในแล็บ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,เล็ก
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,เล็ก
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,เปิดรายการเครื่องมือสร้างใบแจ้งหนี้
 DocType: Education Settings,Employee Number,จำนวนพนักงาน
+DocType: Subscription Settings,Cancel Invoice After Grace Period,ยกเลิกใบแจ้งหนี้หลังจากช่วงเวลาผ่อนผัน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
 DocType: Project,% Completed,% เสร็จสมบูรณ์
 ,Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
@@ -1680,7 +1682,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,ห้องปฏิบัติการทดสอบ Datetime
 DocType: Email Digest,Add Quote,เพิ่มอ้าง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 DocType: Agriculture Analysis Criteria,Agriculture,การเกษตร
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,ซิงค์ข้อมูลหลัก
@@ -1711,16 +1713,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,อุปกรณ์ ทุน
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,โปรดตั้งค่ารหัสรายการก่อน
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
+DocType: Subscription Plan,Billing Interval Count,ช่วงเวลาการเรียกเก็บเงิน
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 DocType: Antibiotic,Antibiotic,ยาปฏิชีวนะ
 ,Team Updates,การปรับปรุงทีม
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
 DocType: Purchase Invoice,Grand Total (Company Currency),รวมทั้งสิ้น (สกุลเงิน บริษัท)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,สร้างรูปแบบการพิมพ์
@@ -1746,7 +1749,7 @@
 DocType: POS Item Group,POS Item Group,กลุ่มสินค้า จุดขาย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,รายการทางเลือกต้องไม่เหมือนกับรหัสรายการ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06- สรุปผลการประเมินชั่วคราว
 DocType: Salary Slip,Bank Account No.,เลขที่บัญชีธนาคาร
@@ -1763,7 +1766,7 @@
 DocType: BOM Operation,Workstation,เวิร์คสเตชั่
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,การขอใบเสนอราคาผู้ผลิต
 DocType: Healthcare Settings,Registration Message,ข้อความลงทะเบียน
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ฮาร์ดแวร์
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ฮาร์ดแวร์
 DocType: Prescription Dosage,Prescription Dosage,ปริมาณยาตามใบสั่งแพทย์
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,กรุณาเลือก บริษัท
@@ -1794,7 +1797,7 @@
 DocType: Project,Start and End Dates,เริ่มต้นและสิ้นสุดวันที่
 ,Delivered Items To Be Billed,รายการที่ส่งไปถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},เปิด BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
 DocType: Project Update,Great/Quickly,ที่ดี / ได้อย่างรวดเร็ว
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1803,8 +1806,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,โปรดเลือก batches สำหรับ batched item
 DocType: Asset,Depreciation Schedules,ตารางค่าเสื่อมราคา
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,สามารถเลือกบัญชีต่อไปนี้ในการตั้งค่า GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,สามารถเลือกบัญชีต่อไปนี้ในการตั้งค่า GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
 DocType: Payment Request,Transaction Currency,ธุรกรรมเงินตรา
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},จาก {0} | {1} {2}
@@ -1815,6 +1818,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,เฉลี่ยวันขาออก
 DocType: POS Profile,Campaign,รณรงค์
 DocType: Supplier,Name and Type,ชื่อและประเภท
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
 DocType: Physician,Contacts and Address,ที่อยู่ติดต่อและที่อยู่
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','วันที่คาดว่าจะเริ่มต้น' ไม่สามารถ จะมากกว่า 'วันที่คาดว่าจะจบ'
@@ -1828,19 +1832,20 @@
 DocType: Student Admission,Eligibility and Details,คุณสมบัติและรายละเอียด
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},สูงสุด: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
 apps/erpnext/erpnext/config/support.py +17,Communication log.,บันทึกการสื่อสาร
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",ขอให้เสนอราคาถูกปิดใช้งานในการเข้าถึงจากพอร์ทัลสำหรับการตั้งค่าพอร์ทัลการตรวจสอบมากขึ้น
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ตัวชี้วัดการให้คะแนน Scorecard ของซัพพลายเออร์
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,จำนวนซื้อ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,จำนวนซื้อ
 DocType: Sales Invoice,Shipping Address Name,การจัดส่งสินค้าที่อยู่ชื่อ
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,มีข้อผิดพลาดในการสร้างตารางเรียน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ผู้ประเมินค่าใช้จ่ายรายแรกในรายการจะได้รับการกำหนดให้เป็นผู้ใช้ค่าใช้จ่ายเริ่มต้น
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1861,15 +1866,16 @@
 DocType: Package Code,Package Code,รหัสแพคเกจ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,เด็กฝึกงาน
 DocType: Purchase Invoice,Company GSTIN,บริษัท GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ตารางรายละเอียดภาษีเรียกจากต้นแบบรายการเป็นสตริงและเก็บไว้ในฟิลด์นี้
  ใช้สำหรับภาษีและค่าใช้จ่าย"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ยอดเงินในธนาคาร
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ปล่อยให้คำแนะนำในการสมัคร
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
 DocType: Journal Entry Account,Account Balance,ยอดเงินในบัญชี
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
@@ -1897,15 +1903,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,ระยะชำระเงินที่แถว {0} อาจเป็นรายการที่ซ้ำกัน
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),เกษตรกรรม (เบต้า)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,สลิป
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,สำนักงาน ให้เช่า
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,สลิป
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,สำนักงาน ให้เช่า
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 DocType: Disease,Common Name,ชื่อสามัญ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
 DocType: Vital Signs,Blood Pressure,ความดันโลหิต
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,นักวิเคราะห์
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,นักวิเคราะห์
 DocType: Item,Inventory,รายการสินค้า
 DocType: Item,Sales Details,รายละเอียดการขาย
 DocType: Quality Inspection,QI-,QI-
@@ -1915,15 +1921,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,ตรวจสอบความถูกต้องของหลักสูตรการลงทะเบียนสำหรับนักเรียนในกลุ่มนักเรียน
 DocType: Notification Control,Expense Claim Rejected,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธ
 DocType: Item,Item Attribute,รายการแอตทริบิวต์
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,รัฐบาล
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,รัฐบาล
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ค่าใช้จ่ายในการเรียกร้อง {0} อยู่แล้วสำหรับการเข้าสู่ระบบยานพาหนะ
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ชื่อสถาบัน
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,กรุณากรอกจำนวนเงินการชำระหนี้
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,กรุณากรอกจำนวนเงินการชำระหนี้
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,รายการที่แตกต่าง
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,การบริการ
 DocType: HR Settings,Email Salary Slip to Employee,อีเมล์สลิปเงินเดือนให้กับพนักงาน
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,เลือกผู้ผลิตที่เป็นไปได้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,เลือกผู้ผลิตที่เป็นไปได้
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Customer,"Select, to make the customer searchable with these fields",เลือกเพื่อให้ลูกค้าสามารถค้นหาข้อมูลเหล่านี้ได้
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,แสดงปิด
@@ -1940,7 +1946,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,กระแสเงินสดจากการลงทุน
 DocType: Program Course,Program Course,หลักสูตรโปรแกรม
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Homepage,Company Tagline for website homepage,บริษัท สโลแกนสำหรับหน้าแรกของเว็บไซต์
 DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด
@@ -1970,10 +1976,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,รายละเอียด Memebership
 DocType: Leave Block List,Block Holidays on important days.,วันหยุดที่ถูกบล็อกในวันสำคัญ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),โปรดป้อนข้อมูลผลลัพธ์ที่ต้องการทั้งหมด
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
-DocType: Employee Loan,Monthly Repayment Amount,จำนวนเงินที่ชำระหนี้รายเดือน
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
+DocType: Loan,Monthly Repayment Amount,จำนวนเงินที่ชำระหนี้รายเดือน
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,การเปิดใบแจ้งหนี้
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
 DocType: UOM,UOM Name,ชื่อ UOM
 DocType: GST HSN Code,HSN Code,รหัส HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,จํานวนเงินสมทบ
@@ -1995,7 +2001,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},ผู้ใช้ {0} ได้มอบหมายให้ Physician {1} แล้ว
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,กล่อง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ผู้ผลิตที่เป็นไปได้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ผู้ผลิตที่เป็นไปได้
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,การกระจายรายเดือน
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),สุขภาพ (เบต้า)
@@ -2023,7 +2030,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
-DocType: Employee Loan,Repayment Method,วิธีการชำระหนี้
+DocType: Loan,Repayment Method,วิธีการชำระหนี้
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",หากตรวจสอบหน้าแรกจะเป็นกลุ่มสินค้าเริ่มต้นสำหรับเว็บไซต์
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
@@ -2032,7 +2039,7 @@
 DocType: Asset Maintenance Task,Certificate Required,ต้องมีใบรับรอง
 DocType: Company,Default Holiday List,เริ่มต้นรายการที่ฮอลิเดย์
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},แถว {0}: จากเวลาและเวลาของ {1} มีการทับซ้อนกันด้วย {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,หนี้สิน หุ้น
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,หนี้สิน หุ้น
 DocType: Purchase Invoice,Supplier Warehouse,คลังสินค้าผู้จัดจำหน่าย
 DocType: Opportunity,Contact Mobile No,เบอร์มือถือไม่มี
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,เลือก บริษัท
@@ -2040,7 +2047,7 @@
 DocType: Student Report Generation Tool,Print Section,ส่วนการพิมพ์
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ผู้ใช้ {0} ไม่มีโพรไฟล์ POS มาตรฐานใด ๆ ตรวจสอบการตั้งค่าเริ่มต้นที่แถว {1} สำหรับผู้ใช้รายนี้
 DocType: Student Group,Set 0 for no limit,ตั้ง 0 ไม่มีขีด จำกัด
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,แถว {idx}: {field} จำเป็นต้องสร้างใบแจ้งหนี้ {invoice_type} การเปิด
 DocType: Customer,Primary Address and Contact Detail,ที่อยู่หลักและที่อยู่ติดต่อ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ส่งอีเมล์การชำระเงิน
@@ -2051,10 +2058,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,โปรดเลือกโดเมนอย่างน้อยหนึ่งโดเมน
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,ค้นหาค้นหาสินค้า
 DocType: Payment Schedule,Payment Amount,จำนวนเงินที่ชำระ
@@ -2064,7 +2071,7 @@
 DocType: Assessment Plan,Grading Scale,ระดับคะแนน
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,เสร็จสิ้นแล้ว
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,หุ้นอยู่ในมือ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,หุ้นอยู่ในมือ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,นำ ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
@@ -2075,17 +2082,16 @@
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
 DocType: Customer,Customer POS Id,รหัสลูกค้าของลูกค้า
 DocType: Account,Account Name,ชื่อบัญชี
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,อนุกรม ไม่มี {0} ปริมาณ {1} ไม่สามารถเป็น ส่วนหนึ่ง
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,อนุกรม ไม่มี {0} ปริมาณ {1} ไม่สามารถเป็น ส่วนหนึ่ง
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,โปรดป้อน URL เซิร์ฟเวอร์ Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
 DocType: Share Balance,To No,ถึงไม่มี
-DocType: Subscription,Reference Document,เอกสารอ้างอิง
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} ถูกยกเลิกหรือหยุดแล้ว
 DocType: Accounts Settings,Credit Controller,ควบคุมเครดิต
-DocType: Grant Application,Applicant Type,ประเภทผู้สมัคร
+DocType: Loan,Applicant Type,ประเภทผู้สมัคร
 DocType: Purchase Invoice,03-Deficiency in services,03- ขาดแคลนบริการ
 DocType: Delivery Note,Vehicle Dispatch Date,วันที่ส่งยานพาหนะ
 DocType: Healthcare Settings,Default Medical Code Standard,Standard มาตรฐานการแพทย์
@@ -2096,13 +2102,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,ทรัพยากรบุคคล
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,ทรัพยากรบุคคล
 DocType: Lead,Upper Income,รายได้บน
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,ปฏิเสธ
 DocType: Journal Entry Account,Debit in Company Currency,เดบิตใน บริษัท สกุล
 DocType: BOM Item,BOM Item,รายการ BOM
 DocType: Appraisal,For Employee,สำหรับพนักงาน
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,ทำให้การเบิกจ่ายรายการ
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,ทำให้การเบิกจ่ายรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
 DocType: Company,Default Values,เริ่มต้นค่า
 DocType: Membership,INR,INR
@@ -2132,10 +2138,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ต้องมากกว่า 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,มีสต็อค
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,มีสต็อค
 DocType: Manufacturing Settings,Capacity Planning For (Days),การวางแผนสำหรับความจุ (วัน)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,จัดซื้อจัดจ้าง
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ฟิลด์บังคับ - หลักสูตร
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,ฟิลด์บังคับ - หลักสูตร
 DocType: Special Test Template,Result Component,ส่วนประกอบผลลัพธ์
@@ -2156,7 +2162,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,รวมถึงวันหยุดที่อยู่ในใบเป็นใบ
 DocType: Sales Invoice,Packed Items,บรรจุรายการ
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,รับประกันเรียกร้องกับหมายเลขเครื่อง
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;ทั้งหมด&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;ทั้งหมด&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,เปิดการใช้งานรถเข็น
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2174,10 +2180,10 @@
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ยืนยันการดำเนินการ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,การบรรลุเป้าหมาย
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,ดูในรถเข็น
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,ไม่สามารถสร้างเกณฑ์มาตรฐานได้ โปรดเปลี่ยนชื่อเกณฑ์
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
@@ -2200,9 +2206,9 @@
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Material Request,Transferred,โอน
 DocType: Vehicle,Doors,ประตู
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
 DocType: Healthcare Settings,Collect Fee for Patient Registration,เก็บค่าธรรมเนียมการลงทะเบียนผู้ป่วย
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ไม่สามารถเปลี่ยนแอตทริบิวต์หลังจากการทำธุรกรรมหุ้น สร้างรายการใหม่และโอนสต็อคไปยังรายการใหม่
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,ไม่สามารถเปลี่ยนแอตทริบิวต์หลังจากการทำธุรกรรมหุ้น สร้างรายการใหม่และโอนสต็อคไปยังรายการใหม่
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Purchase Invoice,Tax Breakup,การแบ่งภาษี
 DocType: Packing Slip,PS-,PS-
@@ -2238,12 +2244,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON สมานฉันท์
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Purchase Invoice Item,Batch No,หมายเลขชุด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ความก้าวหน้าของพนักงาน
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 DocType: Grant Application,Assessment  Mark (Out of 10),เครื่องหมายประเมิน (จาก 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 มือถือไม่มี
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,หลัก
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
@@ -2252,15 +2259,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Email Digest,Annual Expenses,ค่าใช้จ่ายประจำปี
 DocType: Item,Variants,ตัวแปร
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,สร้างใบสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
 DocType: Sales Team,Contribution to Net Total,สมทบสุทธิ
 DocType: Sales Invoice Item,Customer's Item Code,รหัสสินค้าของลูกค้า
 DocType: Stock Reconciliation,Stock Reconciliation,สมานฉันท์สต็อก
 DocType: Territory,Territory Name,ชื่อดินแดน
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,คุณสามารถมีแผนเดียวกับรอบการเรียกเก็บเงินเดียวกันในการสมัครรับข้อมูล
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ผู้สมัครงาน
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
@@ -2271,10 +2279,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,การประเมินผล
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,กิจกรรมการฝึกอบรม
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,ติดตามโดย Lead Source
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,กรุณากรอก
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,กรุณากรอก
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,บันทึกการบำรุงรักษา
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),น้ำหนักสุทธิของแพคเกจนี้ (คำนวณโดยอัตโนมัติเป็นที่รวมของน้ำหนักสุทธิของรายการ)
@@ -2282,11 +2290,11 @@
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: Student Group,Instructors,อาจารย์ผู้สอน
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,การจัดการหุ้น
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,วิธีการชำระเงิน
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",คลังสินค้า {0} ไม่ได้เชื่อมโยงกับบัญชีใด ๆ โปรดระบุบัญชีในบันทึกคลังสินค้าหรือตั้งค่าบัญชีพื้นที่เก็บข้อมูลเริ่มต้นใน บริษัท {1}
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,จัดการคำสั่งซื้อของคุณ
 DocType: Work Order Operation,Actual Time and Cost,เวลาที่เกิดขึ้นจริงและค่าใช้จ่าย
@@ -2296,7 +2304,7 @@
 DocType: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,บน
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,กำรายการในเวลาของการขาย
@@ -2306,7 +2314,7 @@
 DocType: Item,Barcodes,บาร์โค้ด
 DocType: Hub Category,Hub Node,Hub โหนด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อนรายการซ้ำกัน กรุณาแก้ไขและลองอีกครั้ง
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ภาคี
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ภาคี
 DocType: Asset Movement,Asset Movement,การเคลื่อนไหวของสินทรัพย์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,สั่งซื้องาน {0} ต้องส่งมา
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,รถเข็นใหม่
@@ -2324,13 +2332,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,สกุลเงินการเรียกเก็บเงินต้องเท่ากับสกุลเงินของ บริษัท หรือสกุลเงินของ บริษัท ที่เป็นค่าเริ่มต้น
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 DocType: Soil Texture,Loam,พื้นที่อันอุดมสมบูรณ์
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,แถว {0}: วันครบกำหนดไม่สามารถเป็นได้ก่อนวันที่ผ่านรายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,แถว {0}: วันครบกำหนดไม่สามารถเป็นได้ก่อนวันที่ผ่านรายการ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,บันทึกรายการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
 ,Sales Invoice Trends,แนวโน้มการขายใบแจ้งหนี้
 DocType: Leave Application,Apply / Approve Leaves,สมัคร / อนุมัติใบ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,สำหรับ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',สามารถดู แถว เฉพาะในกรณีที่ ค่าใช้จ่าย ประเภทคือ ใน แถว หน้า จำนวน 'หรือ' แล้ว แถว รวม
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',สามารถดู แถว เฉพาะในกรณีที่ ค่าใช้จ่าย ประเภทคือ ใน แถว หน้า จำนวน 'หรือ' แล้ว แถว รวม
 DocType: Sales Order Item,Delivery Warehouse,คลังสินค้าจัดส่งสินค้า
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,ต้นไม้ของศูนย์ต้นทุนทางการเงิน
 DocType: Serial No,Delivery Document No,เอกสารจัดส่งสินค้าไม่มี
@@ -2344,7 +2351,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,การบริโภควัสดุไม่ได้รับการตั้งค่าในการตั้งค่าการผลิต
 DocType: Student,Student Mobile Number,หมายเลขโทรศัพท์มือถือของนักเรียน
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",ไม่สามารถทำให้รายการ {0} ในแถว {1} เกินกว่า {2} หากต้องการอนุญาตให้เรียกเก็บเงินเกินโปรดตั้งค่าในการตั้งค่าสต็อก
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",ไม่สามารถทำให้รายการ {0} ในแถว {1} เกินกว่า {2} หากต้องการอนุญาตให้เรียกเก็บเงินเกินโปรดตั้งค่าในการตั้งค่าสต็อก
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,อัปเดตการตอบกลับ
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
@@ -2356,12 +2363,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,เลือกโปรแกรมก่อน
 DocType: Patient Appointment,Patient Age,อายุผู้ป่วย
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,จัดการโครงการ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,ไม่มีเลขที่ประจำผลิตภัณฑ์ {0} ได้รับการส่งคืนแล้ว
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,ไม่มีเลขที่ประจำผลิตภัณฑ์ {0} ได้รับการส่งคืนแล้ว
 DocType: Supplier,Supplier of Goods or Services.,ผู้ผลิตสินค้าหรือบริการ
 DocType: Budget,Fiscal Year,ปีงบประมาณ
 DocType: Asset Maintenance Log,Planned,วางแผน
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,บัญชีลูกหนี้ผิดนัดที่จะใช้หากไม่ได้ระบุไว้ในสมุดรายชื่อผู้ป่วย
 DocType: Vehicle Log,Fuel Price,ราคาน้ำมัน
+DocType: Bank Guarantee,Margin Money,เงิน Margin
 DocType: Budget,Budget,งบประมาณ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,ตั้งค่าเปิด
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
@@ -2375,16 +2383,16 @@
 DocType: Lead,Follow Up,ติดตาม
 DocType: Item,Is Sales Item,รายการขาย
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,กลุ่มสินค้า ต้นไม้
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,รายการที่ {0} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,รายการที่ {0} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
 DocType: Maintenance Visit,Maintenance Time,ระยะเวลาการบำรุงรักษา
 ,Amount to Deliver,ปริมาณการส่ง
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},มีการป้อนรายการเดียวกันหลายครั้ง {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่เริ่มวาระจะต้องไม่เร็วกว่าปีวันเริ่มต้นของปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,มีข้อผิดพลาด ได้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,พนักงาน {0} ใช้ {1} ระหว่าง {2} ถึง {3} แล้ว:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,มีข้อผิดพลาด ได้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,พนักงาน {0} ใช้ {1} ระหว่าง {2} ถึง {3} แล้ว:
 DocType: Guardian,Guardian Interests,สนใจการ์เดียน
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
 DocType: Education Settings,Instructor Records to be created by,บันทึกผู้สอนที่จะสร้างขึ้นโดย
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} สร้าง
 DocType: GST Account,GST Account,บัญชี GST
@@ -2404,8 +2412,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,เพิ่มลงในรายการโปรดแล้ว
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ไม่มีสลิปเงินเดือนที่จะส่งสำหรับเกณฑ์ที่เลือกไว้ข้างต้นหรือส่งสลิปเงินเดือนแล้ว
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,หน้าที่ และภาษี
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ไม่มีสลิปเงินเดือนที่จะส่งสำหรับเกณฑ์ที่เลือกไว้ข้างต้นหรือส่งสลิปเงินเดือนแล้ว
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,หน้าที่ และภาษี
 DocType: Projects Settings,Projects Settings,การตั้งค่าโครงการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} รายการชำระเงินไม่สามารถกรองโดย {1}
@@ -2415,27 +2423,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ต้นไม้ ของ กลุ่ม รายการ
 DocType: Production Plan,Total Produced Qty,จำนวนที่ผลิตรวม
 DocType: Payroll Entry,Get Employee Details,ดูรายละเอียดพนักงาน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
 DocType: Asset,Sold,ขาย
 ,Item-wise Purchase History,ประวัติการซื้อสินค้าที่ชาญฉลาด
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 DocType: Sales Invoice Payment,Base Amount (Company Currency),จํานวนพื้นฐาน ( สกุลเงินบริษัท)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,วัตถุดิบ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,วัตถุดิบ
 DocType: Payment Reconciliation Payment,Reference Row,แถวอ้างอิง
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
 DocType: Sales Invoice,Accounting Details,รายละเอียดบัญชี
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,ลบการทำธุรกรรมทั้งหมดของ บริษัท นี้
 DocType: Patient,O Positive,O Positive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,เงินลงทุน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,การจัดสรร
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,กรุณากรอกคำขอวัสดุในตารางข้างต้น
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,ไม่มีการชำระคืนสำหรับรายการบันทึก
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 DocType: BOM,Show In Website,แสดงในเว็บไซต์
 DocType: Shopping Cart Settings,Show Quantity in Website,แสดงจำนวนสินค้าในเว็บไซต์
-DocType: Employee Loan Application,Total Payable Amount,รวมจำนวนเงินที่จ่าย
+DocType: Loan Application,Total Payable Amount,รวมจำนวนเงินที่จ่าย
 DocType: Task,Expected Time (in hours),เวลาที่คาดว่าจะ (ชั่วโมง)
 DocType: Item Reorder,Check in (group),เช็คอิน (กลุ่ม)
 DocType: Soil Texture,Silt,ตะกอน
@@ -2454,7 +2463,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,การชำระเงิน
 DocType: Room,Room Name,ชื่อห้อง
 DocType: Prescription Duration,Prescription Duration,ระยะเวลากําหนด
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ฝากไม่สามารถใช้ / ยกเลิกก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ฝากไม่สามารถใช้ / ยกเลิกก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
 DocType: Activity Cost,Costing Rate,อัตราการคิดต้นทุน
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,ที่อยู่ของลูกค้าและการติดต่อ
 ,Campaign Efficiency,ประสิทธิภาพแคมเปญ
@@ -2474,11 +2483,11 @@
 DocType: Chapter,Chapter,บท
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,คู่
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,บัญชีเริ่มต้นจะได้รับการปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อเลือกโหมดนี้
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
 DocType: Asset,Depreciation Schedule,กำหนดการค่าเสื่อมราคา
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,ที่อยู่และที่อยู่ติดต่อของฝ่ายขาย
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,ครึ่งวันวันควรอยู่ระหว่างนับจากวันและวันที่
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,ครึ่งวันวันควรอยู่ระหว่างนับจากวันและวันที่
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,โปรดตั้งค่าศูนย์ต้นทุนเริ่มต้นใน บริษัท {0}
 DocType: Item,Has Batch No,ชุดมีไม่มี
@@ -2496,7 +2505,6 @@
 DocType: Task,Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา)
 DocType: Soil Texture,Soil Type,ชนิดของดิน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,ข้อความใหม่
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
 DocType: GoCardless Mandate,GoCardless Mandate,หนังสือมอบอำนาจ GoLCless
@@ -2516,7 +2524,7 @@
 DocType: Hub Category,Hub Category,หมวดหมู่ฮับ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
-DocType: Employee Loan,Loan Amount,การกู้ยืมเงิน
+DocType: Loan,Loan Amount,การกู้ยืมเงิน
 DocType: Student Report Generation Tool,Add Letterhead,เพิ่มหัวจดหมาย
 DocType: Program Enrollment,Self-Driving Vehicle,รถยนต์ขับเอง
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,จัดทำ Scorecard ของผู้จัดหา
@@ -2544,9 +2552,9 @@
 DocType: Cash Flow Mapper,Position,ตำแหน่ง
 DocType: Patient,Patient Details,รายละเอียดผู้ป่วย
 DocType: Patient,B Positive,B บวก
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 DocType: Patient Medical Record,Patient Medical Record,บันทึกการแพทย์ของผู้ป่วย
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,กีฬา
@@ -2554,8 +2562,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
 DocType: Lab Test UOM,Test UOM,ทดสอบ UOM
 DocType: Student Siblings,Student Siblings,พี่น้องนักศึกษา
+DocType: Subscription Plan Detail,Subscription Plan Detail,รายละเอียดแผนการสมัครสมาชิก
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,หน่วย
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,โปรดระบุ บริษัท
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,โปรดระบุ บริษัท
 ,Customer Acquisition and Loyalty,การซื้อ ของลูกค้าและ ความจงรักภักดี
 DocType: Asset Maintenance Task,Maintenance Task,งานบำรุงรักษา
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,โปรดตั้งขีด จำกัด B2C ในการตั้งค่า GST
@@ -2570,6 +2579,7 @@
 ,BOM Search,BOM ค้นหา
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),ค่าใช้จ่ายวัสดุสิ้นเปลืองทั้งหมด (ผ่านรายการสต็อค)
 DocType: Hub Settings,Company Registered,บริษัท จดทะเบียน
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,วันที่ต้องไม่น้อยกว่าวันที่
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",เผยแพร่ &quot;ในสต็อก&quot; หรือ &quot;ไม่อยู่ในสต็อก&quot; บนฮับตามสต็อคที่มีอยู่ในคลังสินค้านี้
 DocType: Vehicle,Fuel Type,ประเภทของน้ำมันเชื้อเพลิง
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
@@ -2577,17 +2587,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},สมดุลหุ้นใน Batch {0} จะกลายเป็นเชิงลบ {1} สำหรับรายการ {2} ที่โกดัง {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
 DocType: Email Digest,Pending Sales Orders,รอดำเนินการคำสั่งขาย
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 DocType: Employee,Create User Permission,สร้างการอนุญาตผู้ใช้
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Healthcare Settings,Remind Before,เตือนก่อน
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Salary Component,Deduction,การหัก
 DocType: Item,Retain Sample,เก็บตัวอย่าง
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
 DocType: Stock Reconciliation Item,Amount Difference,จำนวนเงินที่แตกต่าง
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
 DocType: Territory,Classification of Customers by region,การจำแนกประเภทของลูกค้าตามภูมิภาค
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,ในการผลิต
@@ -2597,8 +2608,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ธนาคารคำนวณยอดเงินงบ
 DocType: Normal Test Template,Normal Test Template,เทมเพลตการทดสอบปกติ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ผู้ใช้ที่ถูกปิดการใช้งาน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,ใบเสนอราคา
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,ไม่สามารถตั้งค่า RFQ ที่ได้รับเป็น No Quote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,ใบเสนอราคา
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,ไม่สามารถตั้งค่า RFQ ที่ได้รับเป็น No Quote
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,หักรวม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,เลือกบัญชีที่จะพิมพ์ในสกุลเงินของบัญชี
@@ -2606,7 +2617,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับผู้ป่วยรายนี้ ดูรายละเอียดจากเส้นเวลาด้านล่าง
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Patient,Date of Birth,วันเกิด
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,การตั้งค่า Scorecard ของผู้จัดหา
@@ -2617,14 +2628,15 @@
 DocType: Work Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,รายละเอียดตำแหน่งงาน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,รายละเอียดตำแหน่งงาน
 DocType: Student Applicant,Applied,ประยุกต์
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Re - เปิด
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Re - เปิด
 DocType: Sales Invoice Item,Qty as per Stock UOM,จำนวนตามสต็อก UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ชื่อ Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,ส่วนลดการขาย 02-post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ติดตามงานส่งเสริมการขาย ติดตามช่องทาง ใบเสนอราคา ใบสั่งขายต่างๆ ฯลฯ จากงานส่งเสริมการตลาดเพื่อวัดอัตราผลตอบแทนจากการลงทุน
+DocType: Department Approver,Approver,อนุมัติ
 ,SO Qty,ดังนั้น จำนวน
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,ฟิลด์ที่ผู้ถือหุ้นต้องไม่เว้นว่างไว้
 DocType: Guardian,Work Address,ที่อยู่ที่ทำงาน
@@ -2638,21 +2650,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),รวมจัดสรร ( บริษัท สกุล)
 DocType: Purchase Order Item,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 DocType: BOM,Scrap Material Cost,ต้นทุนเศษวัสดุ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
 DocType: Grant Application,Email Notification Sent,ส่งอีเมลแจ้งแล้ว
 DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",ต้องใช้รหัสรายการคลังสินค้าปริมาณในแถว
-DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",ต้องใช้รหัสรายการคลังสินค้าปริมาณในแถว
+DocType: Bank Guarantee,Supplier,ผู้จัดจำหน่าย
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,แสดงรายละเอียดการชำระเงิน
 DocType: Consultation,Consultation Time,เวลาการปรึกษาหารือ
 DocType: C-Form,Quarter,ไตรมาส
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
 DocType: Global Defaults,Default Company,บริษัท เริ่มต้น
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
 DocType: Payment Request,PR,พีอาร์
 DocType: Cheque Print Template,Bank Name,ชื่อธนาคาร
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,- ขึ้นไป
-DocType: Employee Loan,Employee Loan Account,พนักงานบัญชีเงินกู้
 DocType: Leave Application,Total Leave Days,วันที่เดินทางทั้งหมด
 DocType: Email Digest,Note: Email will not be sent to disabled users,หมายเหตุ: อีเมล์ของคุณจะไม่ถูกส่งไปยังผู้ใช้คนพิการ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,จำนวนการโต้ตอบ
@@ -2668,7 +2679,7 @@
 DocType: Vital Signs,Weight (In Kilogram),น้ำหนัก (เป็นกิโลกรัม)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",บท / chapter_name ปล่อยว่างไว้โดยอัตโนมัติหลังจากบันทึกบท
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,โปรดตั้งค่าบัญชี GST ในการตั้งค่า GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,โปรดตั้งค่าบัญชี GST ในการตั้งค่า GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,ประเภทของธุรกิจ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,ต้นทุนในการซื้อใหม่
@@ -2677,12 +2688,13 @@
 DocType: Grant Application,Grant Description,คำอธิบาย Grant
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
 DocType: Student Guardian,Others,คนอื่น ๆ
+DocType: Subscription,Discounts,ส่วนลด
 DocType: Payment Entry,Unallocated Amount,จํานวนเงินที่ไม่ได้ปันส่วน
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0}
 DocType: POS Profile,Taxes and Charges,ภาษีและค่าบริการ
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",สินค้าหรือบริการที่มีการซื้อขายหรือเก็บไว้ในสต็อก
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,ไม่มีการปรับปรุงเพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,ซึ่งครอบคลุมหน้าต่างสรุปทั้งหมดที่เชื่อมโยงกับการตั้งค่านี้
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,เด็กรายการไม่ควรจะเป็น Bundle สินค้า โปรดลบรายการ `{0}` และบันทึก
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,การธนาคาร
@@ -2691,21 +2703,24 @@
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","เช่น ""เครื่องมือการสร้างสำหรับผู้ก่อสร้าง """
 DocType: Grading Scale,Grading Scale Intervals,ช่วงการวัดผลการชั่ง
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,กำไรสำหรับปี
+DocType: Bank Guarantee,Name of Bank,ชื่อธนาคาร
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: รายการบัญชีสำหรับ {2} สามารถทำในเฉพาะสกุลเงิน: {3}
 DocType: Fee Schedule,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,ต้นไม้ของบัญชีการเงิน
+DocType: Bank Guarantee,Reference Document Type,เอกสารประเภท
 DocType: Cash Flow Mapping,Cash Flow Mapping,การทำแผนที่กระแสเงินสด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} กับคำสั่งซื้อ {1}
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,เนื่องสินค้าคงคลัง
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ไม่พบอีเมลในรายชื่อติดต่อมาตรฐาน
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,สร้างความลับ
-DocType: Employee Loan,Account Info,ข้อมูลบัญชี
+DocType: Loan,Account Info,ข้อมูลบัญชี
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
 DocType: Fees,Include Payment,รวมการชำระเงิน
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} กลุ่มนักเรียนสร้างขึ้น
@@ -2713,24 +2728,24 @@
 DocType: Sales Invoice,Total Billing Amount,การเรียกเก็บเงินจำนวนเงินรวม
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,หลักสูตรในโครงสร้างค่าธรรมเนียมและกลุ่มนักเรียน {0} แตกต่างกัน
 DocType: Fee Schedule,Receivable Account,ลูกหนี้การค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
 DocType: Quotation Item,Stock Balance,ยอดคงเหลือสต็อก
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,ผู้บริหารสูงสุด
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,ผู้บริหารสูงสุด
 DocType: Purchase Invoice,With Payment of Tax,การชำระภาษี
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE สำหรับซัพพลายเออร์
 DocType: Land Unit,Is Container,เป็นคอนเทนเนอร์
 DocType: Crop Cycle,This will be day 1 of the crop cycle,นี่เป็นวันที่ 1 ของรอบการเพาะปลูก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Purchase Invoice Item,Weight UOM,UOM น้ำหนัก
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,รายชื่อผู้ถือหุ้นที่มีหมายเลข folio
 DocType: Salary Structure Employee,Salary Structure Employee,พนักงานโครงสร้างเงินเดือน
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,แสดงแอ็ตทริบิวต์ Variant
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,แสดงแอ็ตทริบิวต์ Variant
 DocType: Student,Blood Group,กรุ๊ปเลือด
 DocType: Course,Course Name,หลักสูตรการอบรม
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ผู้ใช้ที่สามารถอนุมัติพนักงานเฉพาะแอพพลิเคลา
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,อุปกรณ์ สำนักงาน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,อุปกรณ์ สำนักงาน
 DocType: Purchase Invoice Item,Qty,จำนวน
 DocType: Fiscal Year,Companies,บริษัท
 DocType: Supplier Scorecard,Scoring Setup,ตั้งค่าการให้คะแนน
@@ -2749,7 +2764,7 @@
 DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,เดบิตในการที่จะต้อง
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,ซื้อราคา
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,เทมเพลตของตัวแปรชี้วัดของซัพพลายเออร์
 DocType: Job Offer Term,Offer Term,ระยะเวลาเสนอ
 DocType: Asset,Quality Manager,ผู้จัดการคุณภาพ
@@ -2761,13 +2776,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},รวมค้างชำระ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM การดำเนินงานเว็บไซต์
 DocType: Supplier Scorecard,Supplier Score,คะแนน Supplier
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,รวมใบแจ้งหนี้ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,รวมใบแจ้งหนี้ Amt
 DocType: Supplier,Warn RFQs,เตือน RFQs
 DocType: BOM,Conversion Rate,อัตราการแปลง
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,ค้นหาสินค้า
 DocType: Assessment Plan,To Time,ถึงเวลา
 DocType: Authorization Rule,Approving Role (above authorized value),อนุมัติบทบาท (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
+DocType: Loan,Total Amount Paid,จำนวนเงินที่จ่าย
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,โปรดเลือกการรับนักศึกษาซึ่งเป็นข้อบังคับสำหรับผู้สมัครที่ได้รับค่าเล่าเรียน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,โปรดเลือกรายการราคาเพื่อเผยแพร่ราคา
@@ -2777,19 +2793,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},แถว {0}: เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {1} สำหรับการดำเนินงาน {2}
 DocType: Manufacturing Settings,Allow Overtime,อนุญาตให้ทำงานล่วงเวลา
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",ไม่สามารถอัปเดตรายการแบบต่อเนื่อง {0} โดยใช้การสมานฉวนหุ้นโปรดใช้รายการสต็อก
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",ไม่สามารถอัปเดตรายการแบบต่อเนื่อง {0} โดยใช้การตรวจสอบความสอดคล้องกันได้โปรดใช้รายการสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",ไม่สามารถอัปเดตรายการแบบต่อเนื่อง {0} โดยใช้การสมานฉวนหุ้นโปรดใช้รายการสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",ไม่สามารถอัปเดตรายการแบบต่อเนื่อง {0} โดยใช้การตรวจสอบความสอดคล้องกันได้โปรดใช้รายการสต็อก
 DocType: Training Event Employee,Training Event Employee,กิจกรรมการฝึกอบรมพนักงาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ตัวอย่างสูงสุด - {0} สามารถเก็บไว้สำหรับแบทช์ {1} และรายการ {2}
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,เพิ่มช่วงเวลา
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} เลขหมายประจำเครื่องจำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} เลขหมายประจำเครื่องจำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
 DocType: Stock Reconciliation Item,Current Valuation Rate,อัตราการประเมินมูลค่าปัจจุบัน
 DocType: Training Event,Advance,ความก้าวหน้า
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,สำหรับการทำกิจวัตรอีกครั้ง
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,การตั้งค่าเกตเวย์การชำระเงิน GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,กำไรจากอัตราแลกเปลี่ยน / ขาดทุน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,กำไรจากอัตราแลกเปลี่ยน / ขาดทุน
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},แถว # {0}: บัญชี {1} ไม่ได้เป็นของ บริษัท {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},แถว # {0}: บัญชี {1} ไม่ได้เป็นของ บริษัท {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ไม่พบ DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
@@ -2808,7 +2823,6 @@
 DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง
 DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},สมัครรับข้อมูลแล้ว {0}
 DocType: Fee Schedule Program,Fee Schedule Program,ตารางค่าตอบแทน
 DocType: Fee Schedule Program,Student Batch,ชุดนักศึกษา
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,ทำให้นักศึกษา
@@ -2824,14 +2838,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,อีคอมเมิร์ซ GSTIN
 DocType: Sales Order,Not Delivered,ไม่ได้ส่ง
 ,Bank Clearance Summary,ข้อมูลอย่างย่อ Clearance ธนาคาร
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
 DocType: Appraisal Goal,Appraisal Goal,เป้าหมายการประเมิน
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,แนะนำหมวดหมู่
 DocType: Stock Reconciliation Item,Current Amount,จำนวนเงินในปัจจุบัน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,สิ่งปลูกสร้าง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,สิ่งปลูกสร้าง
 DocType: Fee Schedule,Fee Structure,โครงสร้างค่าธรรมเนียม
 DocType: Timesheet Detail,Costing Amount,ต้นทุนปริมาณ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 DocType: Student Admission Program,Application Fee,ค่าธรรมเนียมการสมัคร
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,ส่งสลิปเงินเดือน
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,ส่วนลด Maxiumm กับ รายการ {0} เป็น {1} %
@@ -2839,12 +2852,13 @@
 DocType: Sales Partner,Address & Contacts,ที่อยู่ติดต่อ &amp;
 DocType: SMS Log,Sender Name,ชื่อผู้ส่ง
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,เกณฑ์การวิเคราะห์การเกษตร
+DocType: HR Settings,Leave Approval Notification Template,ออกจากแม่แบบการแจ้งเตือนการอนุมัติ
 DocType: POS Profile,[Select],[เลือก ]
 DocType: Vital Signs,Blood Pressure (diastolic),ความดันโลหิต (diastolic)
 DocType: SMS Log,Sent To,ส่งไปยัง
 DocType: Agriculture Task,Holiday Management,การจัดการวันหยุด
 DocType: Payment Request,Make Sales Invoice,สร้างใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,โปรแกรม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,โปรแกรม
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},แพทย์ {0} ไม่มีให้บริการใน {1}
@@ -2862,7 +2876,7 @@
 DocType: Employee,New Workplace,สถานที่ทำงานใหม่
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,การบริโภควัสดุ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ตั้งเป็นปิด
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},ไม่มีรายการ ที่มี บาร์โค้ด {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},ไม่มีรายการ ที่มี บาร์โค้ด {0}
 DocType: Normal Test Items,Require Result Value,ต้องมีค่าผลลัพธ์
 DocType: Item,Show a slideshow at the top of the page,สไลด์โชว์ที่ด้านบนของหน้า
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,boms
@@ -2877,19 +2891,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
 DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,การคืน
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,รายละเอียดแม่แบบการร่างกระแสเงินสด
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,การจัดการสินเชื่อ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ติดตามรายได้และค่าใช้จ่ายแยกต่างหากสำหรับแนวดิ่งผลิตภัณฑ์หรือหน่วยงาน
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,โอน วัสดุ
 DocType: Fees,Send Payment Request,ส่งคำขอการชำระเงิน
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 DocType: Water Analysis,Origin,ที่มา
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
@@ -2904,14 +2918,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,เป็นหนี้สินภาษีเงินได้
 DocType: Grading Scale Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
 DocType: Stock Entry,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,เงินมัดจำ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,เงินมัดจำ
 DocType: Sales Invoice, Shipping Bill Number,หมายเลขบิลการจัดส่ง
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ตรวจสอบย้อนกลับ
 DocType: Asset Maintenance Log,Actions performed,ดำเนินการแล้ว
 DocType: Cash Flow Mapper,Section Leader,หัวหน้าแผนก
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),แหล่งที่มาของ เงินทุน ( หนี้สิน )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),แหล่งที่มาของ เงินทุน ( หนี้สิน )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ลูกจ้าง
+DocType: Bank Guarantee,Fixed Deposit Number,หมายเลขเงินฝากประจำ
 DocType: Asset Repair,Failure Date,วันที่ล้มเหลว
 DocType: Sample Collection,Collected Time,เวลาที่รวบรวม
 DocType: Company,Sales Monthly History,ประวัติการขายรายเดือน
@@ -2928,10 +2943,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,คุณแน่ใจหรือว่าต้องการยกเลิกการนัดหมายนี้
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ราคาห้องพัก
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ท่อขาย
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,เรียกข้อมูลอัปเดตการสมัครสมาชิก
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},บัญชี {0} ไม่ตรงกับ บริษัท {1} ในโหมดบัญชี: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,หลักสูตร:
@@ -2941,7 +2957,7 @@
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,ไม่มีการสร้างใบสั่งงาน
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับช่วงเวลานี้
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,เภสัชกรรม
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,เภสัชกรรม
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ค่าใช้จ่ายของรายการที่ซื้อ
 DocType: Selling Settings,Sales Order Required,สั่งซื้อยอดขายที่ต้องการ
 DocType: Purchase Invoice,Credit To,เครดิต
@@ -2959,7 +2975,7 @@
 DocType: Request for Quotation Supplier,No Quote,ไม่มีข้อความ
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Gateway Account,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,ชดเชย ปิด
 DocType: Job Offer,Accepted,ได้รับการยอมรับแล้ว
@@ -2972,7 +2988,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,ผลการค้นหา
 DocType: Room,Room Number,หมายเลขห้อง
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 DocType: Journal Entry Account,Payroll Entry,รายการบัญชีเงินเดือน
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,ดูบันทึกค่าธรรมเนียม
@@ -2982,7 +2998,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 DocType: Item Variant Settings,Allow Rename Attribute Value,อนุญาตให้เปลี่ยนชื่อค่าแอตทริบิวต์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,วารสารรายการด่วน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Restaurant,Invoice Series Prefix,คำนำหน้าของซีรี่ส์ใบแจ้งหนี้
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
@@ -2990,8 +3006,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,การรวมระบบ Google แผนที่ไม่ได้เปิดใช้งาน
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,วันหมดอายุของสมาชิก
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} จะต้องติดลบในเอกสารตีกลับ
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} จะต้องติดลบในเอกสารตีกลับ
 ,Minutes to First Response for Issues,นาทีเพื่อตอบสนองแรกสำหรับปัญหา
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
@@ -3010,7 +3027,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,หน่วยของการวัด
 DocType: Fiscal Year,Year End Date,วันสิ้นปี
 DocType: Task Depends On,Task Depends On,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,โอกาส
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,โอกาส
 DocType: Operation,Default Workstation,เวิร์คสเตชั่เริ่มต้น
 DocType: Notification Control,Expense Claim Approved Message,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติข้อความ
 DocType: Payment Entry,Deductions or Loss,การหักเงินหรือการสูญเสีย
@@ -3048,7 +3065,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,ทิ้งไว้โดยไม่ต้องจ่ายไม่ตรงกับที่ได้รับอนุมัติบันทึกออกจากแอพลิเคชัน
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
 DocType: Membership,USD,ดอลล่าร์
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ทำให้ ใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,ยอดคงเหลือที่เหลืออยู่
@@ -3058,7 +3075,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ปีที่จบ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Driver,Driver,คนขับรถ
 DocType: Vital Signs,Nutrition Values,คุณค่าทางโภชนาการ
 DocType: Lab Test Template,Is billable,เรียกเก็บเงินได้
@@ -3069,7 +3086,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),วันที่เริ่มต้นที่เกิดขึ้นจริง (ผ่านใบบันทึกเวลา)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,ช่วงสูงอายุ 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,จำนวนเงินล่วงหน้าทั้งหมดต้องไม่เกินจำนวนที่เรียกร้อง
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,จำนวนเงินล่วงหน้าทั้งหมดต้องไม่เกินจำนวนที่เรียกร้อง
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3124,7 +3141,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,เลือกค่าแอตทริบิวต์
 DocType: Purchase Invoice,Reason For Issuing document,เหตุผลในการออกเอกสาร
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,ถัดไปติดต่อโดยไม่สามารถเช่นเดียวกับที่อยู่อีเมลตะกั่ว
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
@@ -3141,7 +3158,8 @@
 DocType: Warranty Claim,Service Address,ที่อยู่บริการ
 DocType: Asset Maintenance Task,Calibration,การสอบเทียบ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} เป็นวันหยุดของ บริษัท
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,เฟอร์นิเจอร์และติดตั้ง
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,ออกประกาศสถานะ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,เฟอร์นิเจอร์และติดตั้ง
 DocType: Item,Manufacture,ผลิต
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,ตั้ง บริษัท
 ,Lab Test Report,รายงานการทดสอบห้องปฏิบัติการ
@@ -3157,7 +3175,6 @@
 DocType: Crop,Planting Area,พื้นที่เพาะปลูก
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,ซึ่งอาจเป็นเพราะที่อยู่อีเมลที่ไม่ถูกต้องบางส่วนใน
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,คุณเพิ่ม
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,ผลการฝึกอบรม
@@ -3167,16 +3184,17 @@
 DocType: Products Settings,Products per Page,ผลิตภัณฑ์ต่อหน้า
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,ปริญญาโท สาขา องค์กร
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,รายงาน ฉบับ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ขึ้นไป
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,แถว # {0}: วารสารรายการ {1} ไม่มีบัญชี {2} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
 DocType: Supplier Scorecard Criteria,Criteria Weight,เกณฑ์น้ำหนัก
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,ออกประกาศการอนุมัติ
 DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
 DocType: Payroll Entry,Salary Slip Based on Timesheet,สลิปเงินเดือนจาก Timesheet
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,อัตราการซื้อ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,อัตราการซื้อ
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 DocType: Payment Entry,Payment Type,ประเภท การชำระเงิน
@@ -3199,6 +3217,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,รถเข็นตั้งค่า
 DocType: Journal Entry,Accounting Entries,บัญชีรายการ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","หากเลือกกฎการกำหนดราคาสำหรับ &#39;อัตรา&#39; จะมีการเขียนทับรายการราคา อัตราการกำหนดราคาเป็นอัตราสุดท้ายจึงไม่ควรใช้ส่วนลดเพิ่มเติม ดังนั้นในการทำธุรกรรมเช่นใบสั่งขาย, ใบสั่งซื้อ ฯลฯ จะถูกเรียกใช้ในฟิลด์ &#39;อัตรา&#39; แทนที่จะเป็น &#39;ฟิลด์ราคาตามราคา&#39;"
+DocType: Journal Entry,Paid Loan,เงินกู้ที่ชำระแล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},รายการ ที่ซ้ำกัน กรุณาตรวจสอบ การอนุมัติ กฎ {0}
 DocType: Journal Entry Account,Reference Due Date,วันที่ครบกำหนดอ้างอิง
 DocType: Purchase Order,Ref SQ,SQ Ref
@@ -3215,7 +3234,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/config/hr.py +93,Payroll,บัญชีเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
 DocType: Patient Service Unit,Parent Service Unit,หน่วยบริการผู้ปกครอง
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,ทำให้ผู้ใช้
 DocType: Packing Slip,Identification of the package for the delivery (for print),บัตรประจำตัวของแพคเกจสำหรับการส่งมอบ (สำหรับพิมพ์)
@@ -3234,7 +3253,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,บัญชีรายได้
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,การจัดส่งสินค้า
 DocType: Volunteer,Weekdays,วันธรรมดา
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: Restaurant Menu,Restaurant Menu,เมนูร้านอาหาร
@@ -3242,7 +3261,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ตั้งค่าบัญชีพื้นที่โฆษณาเริ่มต้นสำหรับพื้นที่โฆษณาถาวร
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ตั้งค่าบัญชีพื้นที่โฆษณาเริ่มต้นสำหรับพื้นที่โฆษณาถาวร
 DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,ส่งอีเมลจาก Grant Review
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",LocalStorage เต็มไม่ได้บันทึก
@@ -3250,10 +3269,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,ความจุของห้องพัก
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},มีรายการบันทึกสำหรับรายการ {0} อยู่แล้ว
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,อ้าง
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,คุณจะสูญเสียบันทึกของใบแจ้งหนี้ที่สร้างขึ้นก่อนหน้านี้ แน่ใจหรือไม่ว่าคุณต้องการรีสตาร์ทการสมัครรับข้อมูลนี้
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,ค่าลงทะเบียน
 DocType: Budget,Cost Center,ศูนย์ต้นทุน
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,บัตรกำนัล #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,บัตรกำนัล #
 DocType: Notification Control,Purchase Order Message,ข้อความใบสั่งซื้อ
 DocType: Tax Rule,Shipping Country,การจัดส่งสินค้าประเทศ
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ซ่อนประจำตัวผู้เสียภาษีของลูกค้าจากการทำธุรกรรมการขาย
@@ -3262,20 +3282,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,คลังสินค้า สามารถเปลี่ยนผ่านทาง  รายการสต๊อก / บันทึกการส่งมอบ / ใบสั่งซื้อ
 DocType: Employee Education,Class / Percentage,ระดับ / ร้อยละ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,ภาษีเงินได้
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,ไปที่หัวจดหมาย
+DocType: Subscription,Cancel At End Of Period,ยกเลิกเมื่อสิ้นสุดระยะเวลา
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,ไม่มีรายการที่เลือกสำหรับการถ่ายโอน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,ไม่มีรายการที่เลือกสำหรับการถ่ายโอน
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
 DocType: Vehicle,Electric,ไฟฟ้า
 DocType: Task,% Progress,% ความคืบหน้า
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,กำไร / ขาดทุนจากการขายสินทรัพย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,กำไร / ขาดทุนจากการขายสินทรัพย์
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",เฉพาะผู้สมัครนักเรียนที่มีสถานะ &quot;อนุมัติ&quot; เท่านั้นในตารางด้านล่างนี้
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,หมายเลขบัญชีสำหรับบัญชี {0} ไม่พร้อมใช้งาน <br> โปรดตั้งค่าแผนภูมิบัญชีให้ถูกต้อง
 DocType: Task,Depends on Tasks,ขึ้นอยู่กับงาน
@@ -3290,6 +3311,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,ไม่ได้อยู่ในสต็อก
 DocType: Volunteer,Volunteer Skills,ทักษะอาสาสมัคร
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
+DocType: Bank Guarantee,Reference Document Name,ชื่อเอกสารอ้างอิง
 DocType: Purchase Invoice,Taxes and Charges Deducted,ภาษีและค่าบริการหัก
 apps/erpnext/erpnext/hooks.py +142,Issues,ปัญหา
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},สถานะ ต้องเป็นหนึ่งใน {0}
@@ -3303,7 +3325,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
 DocType: Supplier,Billing Currency,สกุลเงินการเรียกเก็บเงิน
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ขนาดใหญ่พิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,ขนาดใหญ่พิเศษ
+DocType: Loan,Loan Application,การขอสินเชื่อ
 DocType: Crop,Scientific Name,ชื่อวิทยาศาสตร์
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ใบรวม
 DocType: Customer,"Reselect, if the chosen contact is edited after save",ให้เลือกใหม่หากรายชื่อที่เลือกถูกแก้ไขหลังจากบันทึกแล้ว
@@ -3312,13 +3335,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,จำนวนเช็ค
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,ในประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ลูกหนี้
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,ใหญ่
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,ใหญ่
 DocType: Homepage Featured Product,Homepage Featured Product,โฮมเพจสินค้าแนะนำ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,ทุกกลุ่มการประเมิน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,ทุกกลุ่มการประเมิน
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ชื่อคลังสินค้าใหม่
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),รวม {0} ({1})
 DocType: C-Form Invoice Detail,Territory,อาณาเขต
@@ -3339,9 +3362,10 @@
 DocType: Fees,Fees,ค่าธรรมเนียม
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ระบุอัตราแลกเปลี่ยนการแปลงสกุลเงินหนึ่งไปยังอีก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,ยอดคงค้างทั้งหมด
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,ยอดคงค้างทั้งหมด
 DocType: Sales Partner,Targets,เป้าหมาย
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,โปรดลงทะเบียนหมายเลข SIREN ในไฟล์ข้อมูล บริษัท
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 DocType: Price List,Price List Master,ราคาโท
 DocType: GST Account,CESS Account,บัญชี CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
@@ -3350,6 +3374,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,เลือกผู้ป่วย
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,ชื่อพารามิเตอร์
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ทิ้งไว้เพียงการประยุกต์ใช้งานที่มีสถานะ &#39;อนุมัติ&#39; และ &#39;ปฏิเสธ&#39; สามารถส่ง
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},นักศึกษาชื่อกลุ่มมีผลบังคับใช้ในแถว {0}
 DocType: Homepage,Products to be shown on website homepage,ผลิตภัณฑ์ที่จะแสดงบนหน้าแรกของเว็บไซต์
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
@@ -3395,14 +3420,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,สร้างใบแจ้งหนี้สำหรับชั่วโมงการเรียกเก็บเงินแล้ว
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},ข้อผิดพลาดชื่อ: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,ค่าใช้จ่ายทางการเงิน
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
 DocType: Packing Slip,If more than one package of the same type (for print),หากมีมากกว่าหนึ่งแพคเกจประเภทเดียวกัน (พิมพ์)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,โปรดตั้งค่าลูกค้าเริ่มต้นในการตั้งค่าร้านอาหาร
 ,Salary Register,เงินเดือนที่ต้องการสมัครสมาชิก
 DocType: Warehouse,Parent Warehouse,คลังสินค้าผู้ปกครอง
-DocType: C-Form Invoice Detail,Net Total,สุทธิ
+DocType: Subscription,Net Total,สุทธิ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},ไม่พบรายการ BOM เริ่มต้นสำหรับรายการ {0} และโครงการ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,กำหนดประเภทสินเชื่อต่างๆ
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,กำหนดประเภทสินเชื่อต่างๆ
 DocType: Bin,FCFS Rate,อัตรา FCFS
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,ยอดคงค้าง
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),เวลา (นาที)
@@ -3434,11 +3459,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
 DocType: Drug Prescription,Drug Prescription,การกําหนดยา
 DocType: Fees,FEE.,ค่าธรรมเนียม
-DocType: Employee Loan,Repaid/Closed,ชำระคืน / ปิด
+DocType: Loan,Repaid/Closed,ชำระคืน / ปิด
 DocType: Item,Total Projected Qty,รวมประมาณการจำนวน
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",ไม่พบอัตราการประเมินสำหรับรายการ {0} ซึ่งจำเป็นต้องทำรายการทางบัญชีสำหรับ {1} {2} หากรายการกำลังทำธุรกรรมเป็นรายการอัตราการเสียค่าเป็นศูนย์ใน {1} โปรดระบุว่าในตาราง {1} รายการ มิฉะนั้นโปรดสร้างธุรกรรมขาเข้าของรายการหรือระบุอัตราการประเมินค่าในเร็กคอร์ดรายการจากนั้นลองส่ง / ยกเลิกรายการนี้
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 DocType: Course,Course Code,รหัสรายวิชา
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: POS Settings,Use POS in Offline Mode,ใช้ POS ในโหมดออฟไลน์
@@ -3458,16 +3482,15 @@
 DocType: Purchase Invoice,Deemed Export,ถือว่าส่งออก
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ร้อยละส่วนลดสามารถนำไปใช้อย่างใดอย่างหนึ่งกับราคาหรือราคาตามรายการทั้งหมด
-DocType: Subscription,Half-yearly,รายหกเดือน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Lab Test,LabTest Approver,ผู้ประเมิน LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,คุณได้รับการประเมินเกณฑ์การประเมินแล้ว {}
 DocType: Vehicle Service,Engine Oil,น้ำมันเครื่อง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},สร้างคำสั่งงาน: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},สร้างคำสั่งงาน: {0}
 DocType: Sales Invoice,Sales Team1,ขาย Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
-DocType: Employee Loan,Loan Details,รายละเอียดเงินกู้
+DocType: Loan,Loan Details,รายละเอียดเงินกู้
 DocType: Company,Default Inventory Account,บัญชีพื้นที่โฆษณาเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,หมายเลขโอเปอเรชั่นไม่ตรงกัน
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
@@ -3479,19 +3502,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ลิงก์ไปยังหน่วยที่ดินทั้งหมดที่พืชมีการเจริญเติบโต
 DocType: Account,Root Type,ประเภท ราก
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},แถว # {0}: ไม่สามารถกลับมามากกว่า {1} สำหรับรายการ {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},แถว # {0}: ไม่สามารถกลับมามากกว่า {1} สำหรับรายการ {2}
 DocType: Item Group,Show this slideshow at the top of the page,แสดงภาพสไลด์นี้ที่ด้านบนของหน้า
 DocType: BOM,Item UOM,UOM รายการ
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
 DocType: Cheque Print Template,Primary Settings,การตั้งค่าหลัก
 DocType: Purchase Invoice,Select Supplier Address,เลือกที่อยู่ผู้ผลิต
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,เพิ่มพนักงาน
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,เพิ่มพนักงาน
 DocType: Purchase Invoice Item,Quality Inspection,การตรวจสอบคุณภาพ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,ขนาดเล็กเป็นพิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,ขนาดเล็กเป็นพิเศษ
 DocType: Company,Standard Template,แม่แบบมาตรฐาน
 DocType: Training Event,Theory,ทฤษฎี
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
@@ -3511,11 +3534,10 @@
 DocType: SMS Log,No of Sent SMS,ไม่มี SMS ที่ส่ง
 DocType: Antibiotic,Healthcare Administrator,ผู้ดูแลสุขภาพ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ตั้งเป้าหมาย
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 DocType: Dosage Strength,Dosage Strength,ความเข้มข้นของยา
 DocType: Account,Expense Account,บัญชีค่าใช้จ่าย
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ซอฟต์แวร์
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,สี
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,สี
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,เกณฑ์การประเมินผลแผน
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,หมดอายุสำหรับรายการที่เลือก
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ป้องกันคำสั่งซื้อ
@@ -3528,18 +3550,18 @@
 DocType: Patient,Personal and Social History,ประวัติส่วนตัวและสังคม
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,สร้างผู้ใช้ {0} แล้ว
 DocType: Fee Schedule,Fee Breakup for each student,การแบ่งค่าธรรมเนียมสำหรับนักเรียนแต่ละคน
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,เปลี่ยนรหัส
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
 DocType: Stock Reconciliation,SR/,#/
 DocType: Vehicle,Diesel,ดีเซล
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
 DocType: Purchase Invoice,Availed ITC Cess,มี ITC Cess
 ,Student Monthly Attendance Sheet,นักศึกษาแผ่นเข้าร่วมประชุมรายเดือน
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,กฎการจัดส่งสำหรับการขายเท่านั้น
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,วันที่เริ่มต้นโครงการ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,จนกระทั่ง
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,จนกระทั่ง
 DocType: Rename Tool,Rename Log,เปลี่ยนชื่อเข้าสู่ระบบ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,กำหนดกลุ่มนักศึกษาหรือกำหนดหลักสูตร
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,กำหนดกลุ่มนักศึกษาหรือกำหนดหลักสูตร
@@ -3560,7 +3582,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,แสดงรายการผลิตภัณฑ์หรือบริการที่คุณซื้อหรือขาย
 DocType: Water Analysis,Storage Temperature,อุณหภูมิในการจัดเก็บ
 DocType: Employee Attendance Tool,Unmarked Attendance,เข้าร่วมประชุมที่ไม่มีเครื่องหมาย
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,นักวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,นักวิจัย
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,โปรแกรมการลงทะเบียนเรียนเครื่องมือ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},วันที่เริ่มต้นควรน้อยกว่าวันที่สิ้นสุดของงาน {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,ชื่อหรืออีเมล์มีผลบังคับใช้
@@ -3573,7 +3595,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",ขณะนี้ {0} มีสถานะ {1} Scorecard ของผู้จัดหาและ RFQs สำหรับผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
 DocType: Chapter,Non Profit Manager,ผู้จัดการฝ่ายกำไร
 DocType: BOM,Total Cost(Company Currency),ค่าใช้จ่ายรวม ( บริษัท สกุล)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,อนุกรม ไม่มี {0} สร้าง
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,อนุกรม ไม่มี {0} สร้าง
 DocType: Homepage,Company Description for website homepage,รายละเอียด บริษัท สำหรับหน้าแรกของเว็บไซต์
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",เพื่อความสะดวกของลูกค้า รหัสเหล่านี้จะถูกใช้ในการพิมพ์เอกสาร เช่น ใบแจ้งหนี้ และใบนำส่งสินค้า
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ชื่อ suplier
@@ -3583,11 +3605,10 @@
 DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ได้ด้วยตนเอง
 DocType: Healthcare Settings,Result Printed,ผลการพิมพ์
 DocType: Asset Category Account,Depreciation Expense Account,บัญชีค่าเสื่อมราคาค่าใช้จ่าย
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,ระยะเวลาการฝึกงาน
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},ดู {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,ระยะเวลาการฝึกงาน
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Project,Total Costing Amount (via Timesheets),ยอดรวมค่าใช้จ่าย (ผ่าน Timesheets)
-DocType: Employee Advance,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
+DocType: Department,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
 DocType: Project,Hourly,ทุกๆชั่วโมง
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,ที่ไม่ใช่กลุ่มกลุ่ม
@@ -3597,7 +3618,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,เพื่อ Datetime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,ชำระเงินผ่านวารสารรายการ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,พิมพ์บน
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,พิมพ์บน
 DocType: Item,Inspection Required before Delivery,ตรวจสอบก่อนที่จะต้องจัดส่งสินค้า
 DocType: Item,Inspection Required before Purchase,ตรวจสอบที่จำเป็นก่อนที่จะซื้อ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ที่รอดำเนินการกิจกรรม
@@ -3607,7 +3628,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,จำนวนสั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,องค์กรของคุณ
 DocType: Fee Component,Fees Category,ค่าธรรมเนียมหมวดหมู่
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 DocType: Supplier Scorecard,Notify Employee,แจ้งพนักงาน
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
@@ -3617,7 +3638,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Company,Chart Of Accounts Template,ผังบัญชีแม่แบบ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},รายการราคาปรับปรุงสำหรับ {0} ในราคา {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},รายการราคาปรับปรุงสำหรับ {0} ในราคา {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Purchase Invoice Item,Accepted Warehouse,คลังสินค้าได้รับการยอมรับ
@@ -3625,10 +3646,11 @@
 DocType: Item,Valuation Method,วิธีการประเมิน
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,กำหนดให้เป็นครึ่งวัน
 DocType: Sales Invoice,Sales Team,ทีมขาย
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,รายการ ที่ซ้ำกัน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,รายการ ที่ซ้ำกัน
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,ใส่ชื่อผู้รับเงินก่อนยื่น
 DocType: Program Enrollment Tool,Get Students,การรับนักเรียน
 DocType: Serial No,Under Warranty,อยู่ภายในการรับประกัน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[ข้อผิดพลาด]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[ข้อผิดพลาด]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกการสั่งซื้อการขาย
 ,Employee Birthday,วันเกิดของพนักงาน
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,โปรดเลือกวันที่เสร็จสิ้นการซ่อมแซมที่เสร็จสมบูรณ์
@@ -3647,7 +3669,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,สงวนไว้สำหรับสัญญาย่อย
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
 DocType: Shopping Cart Settings,Orders,คำสั่งซื้อ
-DocType: Employee Leave Approver,Leave Approver,ผู้อนุมัติการลา
+DocType: Department,Leave Approver,ผู้อนุมัติการลา
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,โปรดเลือกแบทช์
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,ชื่อกลุ่มการประเมิน
@@ -3692,7 +3714,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,รายการที่ติดตามด้วยฮับ
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,บัญชีค่าเสื่อมราคาสะสม
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,อีเมลนี้ถูกสร้างขึ้นอัตโนมัติ
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Program Enrollment,Boarding Student,นักเรียนกินนอน
 DocType: Asset,Expected Value After Useful Life,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์
@@ -3717,22 +3738,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},ผู้เข้าร่วมบันทึก {0} อยู่กับนักศึกษา {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ค่าเสื่อมราคาตัดออกเนื่องจากการจำหน่ายไปซึ่งสินทรัพย์
-DocType: Member,Member,สมาชิก
+DocType: Loan,Member,สมาชิก
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,การจัดการที่อยู่
 DocType: Work Order Item,Work Order Item,สั่งซื้อสินค้า
 DocType: Pricing Rule,Item Code,รหัสสินค้า
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
 DocType: Agriculture Analysis Criteria,Agriculture Manager,ผู้จัดการฝ่ายการเกษตร
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
 DocType: Supplier Scorecard Period,Variables,ตัวแปร
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),ปิด (Dr)
 DocType: Cheque Print Template,Cheque Size,ขนาดเช็ค
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,แม่แบบ ภาษี สำหรับการขาย ในการทำธุรกรรม
 DocType: Sales Invoice,Write Off Outstanding Amount,เขียนปิดยอดคงค้าง
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},บัญชี {0} ไม่ตรงกับ บริษัท {1}
@@ -3741,7 +3762,6 @@
 DocType: Stock Settings,Default Stock UOM,เริ่มต้น UOM สต็อก
 DocType: Asset,Number of Depreciations Booked,จำนวนค่าเสื่อมราคาจอง
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,จำนวนรวม
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},กับเงินกู้พนักงาน: {0}
 DocType: Landed Cost Item,Receipt Document,เอกสารใบเสร็จรับเงิน
 DocType: Employee Education,School/University,โรงเรียน / มหาวิทยาลัย
 DocType: Payment Request,Reference Details,รายละเอียดอ้างอิง
@@ -3752,7 +3772,7 @@
 DocType: Asset,Double Declining Balance,ยอดลดลงสองครั้ง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ปิดเพื่อไม่สามารถยกเลิกได้ Unclose ที่จะยกเลิก
 DocType: Student Guardian,Father,พ่อ
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,ไม่สามารถตรวจสอบ 'การปรับสต๊อก' สำหรับการขายสินทรัพย์ถาวร
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,ไม่สามารถตรวจสอบ 'การปรับสต๊อก' สำหรับการขายสินทรัพย์ถาวร
 DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธนาคาร
 DocType: Attendance,On Leave,ลา
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ได้รับการปรับปรุง
@@ -3766,10 +3786,10 @@
 DocType: Lead,Lower Income,รายได้ต่ำ
 DocType: Restaurant Order Entry,Current Order,คำสั่งซื้อปัจจุบัน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,ไปที่ Programs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},แถว {0} # จำนวนที่จัดสรรไว้ {1} จะต้องไม่เกินจำนวนที่ไม่มีการอ้างสิทธิ์ {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},แถว {0} # จำนวนที่จัดสรรไว้ {1} จะต้องไม่เกินจำนวนที่ไม่มีการอ้างสิทธิ์ {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
@@ -3792,7 +3812,6 @@
 DocType: Payment Terms Template,Payment Terms,เงื่อนไขการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,นาที
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 DocType: Chapter,Meetup Embed HTML,Meetup ฝัง HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,ไปที่ Suppliers
@@ -3812,30 +3831,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,โปรดตั้งรหัสอีเมลสำหรับนักเรียนเพื่อส่งคำขอการชำระเงิน
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,โปรดตั้งรหัสอีเมลสำหรับนักเรียนเพื่อส่งคำขอการชำระเงิน
 DocType: Patient,Medical History,ประวัติทางการแพทย์
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 DocType: Patient,Patient ID,ID ผู้ป่วย
 DocType: Physician Schedule,Schedule Name,ชื่อกำหนดการ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,สร้างสลิปเงินเดือน
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,เพิ่มซัพพลายเออร์ทั้งหมด
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,เพิ่มซัพพลายเออร์ทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,แถว # {0}: จำนวนที่จัดสรรไว้ต้องไม่เกินยอดค้างชำระ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,ดู BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
 DocType: Purchase Invoice,Edit Posting Date and Time,แก้ไขวันที่โพสต์และเวลา
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},กรุณาตั้งค่าบัญชีที่เกี่ยวข้องกับค่าเสื่อมราคาสินทรัพย์ในหมวดหมู่ {0} หรือ บริษัท {1}
 DocType: Lab Test Groups,Normal Range,ช่วงปกติ
 DocType: Academic Term,Academic Year,ปีการศึกษา
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,ขายได้
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,เปิดทุนคงเหลือ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,เปิดทุนคงเหลือ
 DocType: Lead,CRM,การจัดการลูกค้าสัมพันธ์
 DocType: Purchase Invoice,N,ยังไม่มีข้อความ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,ที่เหลืออยู่
 DocType: Appraisal,Appraisal,การตีราคา
+DocType: Loan,Loan Account,บัญชีเงินกู้
 DocType: Purchase Invoice,GST Details,รายละเอียด GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},อีเมลที่ส่งถึงผู้จัดจำหน่าย {0}
 DocType: Item,Default Sales Unit of Measure,ยอดขายหน่วยวัดเริ่มต้น
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,ปีการศึกษา:
+DocType: Subscription,Past Due Date,วันครบกำหนดที่ผ่านมา
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},ไม่อนุญาตให้ตั้งค่ารายการอื่นสำหรับรายการ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
@@ -3848,7 +3869,7 @@
 DocType: Patient Appointment,Patient Appointment,นัดหมายผู้ป่วย
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,อนุมัติ บทบาท ไม่สามารถเป็น เช่นเดียวกับ บทบาทของ กฎใช้กับ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,ยกเลิกการรับอีเมล์ Digest นี้
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,รับซัพพลายเออร์โดย
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,รับซัพพลายเออร์โดย
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},ไม่พบ {0} สำหรับรายการ {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,ไปที่หลักสูตร
 DocType: Accounts Settings,Show Inclusive Tax In Print,แสดงภาษีแบบรวมในการพิมพ์
@@ -3856,10 +3877,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ข้อความส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,บัญชีที่มีโหนดลูกไม่สามารถกำหนดให้เป็นบัญชีแยกประเภท
 DocType: C-Form,II,ครั้งที่สอง
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา&gt; การตั้งค่าการศึกษา
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
 DocType: Physician,Physician Schedules,ตารางแพทย์
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,จำนวนเงินที่ต้องชำระล่วงหน้าทั้งหมดต้องไม่เกินจำนวนเงินที่ได้รับอนุมัติทั้งหมด
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,จำนวนเงินที่ต้องชำระล่วงหน้าทั้งหมดต้องไม่เกินจำนวนเงินที่ได้รับอนุมัติทั้งหมด
 DocType: Salary Slip,Hour Rate,อัตราชั่วโมง
 DocType: Stock Settings,Item Naming By,รายการการตั้งชื่อตาม
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
@@ -3877,6 +3899,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ไม่ได้รับอนุญาตในการปรับปรุงการทำธุรกรรมหุ้นเก่ากว่า {0}
 DocType: BOM,Inspection Required,การตรวจสอบที่จำเป็น
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,ป้อนหมายเลขการรับประกันธนาคารก่อนส่ง
 DocType: Driving License Category,Class,ชั้น
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,ไม่สามารถสั่งซื้อ Work Order กับเทมเพลตรายการ
@@ -3887,7 +3910,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Assessment Plan,Program,โครงการ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา&gt; การตั้งค่าการศึกษา
 DocType: Serial No,Is Cancelled,เป็นยกเลิก
 DocType: Student Group,Group Based On,กลุ่มตาม
 DocType: Student Group,Group Based On,กลุ่มตาม
@@ -3899,9 +3921,10 @@
 DocType: Cheque Print Template,Cheque Height,เช็คความสูง
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
 DocType: Setup Progress,Setup Progress,ตั้งค่าความคืบหน้า
+DocType: Expense Claim,Approval Status,สถานะการอนุมัติ
 DocType: Hub Settings,Publish Items to Hub,เผยแพร่รายการไปยัง Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},จากค่า ต้องน้อยกว่า ค่า ในแถว {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,โอนเงิน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ตรวจสอบทั้งหมด
 ,Issued Items Against Work Order,การออกรายการสั่งซื้อสินค้า
 DocType: Vehicle Log,Invoice Ref,Ref ใบแจ้งหนี้
@@ -3932,12 +3955,11 @@
 DocType: Customs Tariff Number,Tariff Number,จำนวนภาษี
 DocType: Work Order Item,Available Qty at WIP Warehouse,จำนวนที่มีจำหน่ายที่ WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,ที่คาดการณ์ไว้
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
 DocType: Notification Control,Quotation Message,ข้อความใบเสนอราคา
-DocType: Employee Loan,Employee Loan Application,ขอกู้เงินของพนักงาน
 DocType: Issue,Opening Date,เปิดวันที่
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,โปรดบันทึกผู้ป่วยก่อน
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,โปรดบันทึกผู้ป่วยก่อน
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,ผู้เข้าร่วมได้รับการประสบความสำเร็จในการทำเครื่องหมาย
 DocType: Program Enrollment,Public Transport,การคมนาคมสาธารณะ
 DocType: Soil Texture,Silt Composition (%),องค์ประกอบ Silt (%)
@@ -3956,7 +3978,7 @@
 ,Item Balance (Simple),ยอดรายการ (เรียบง่าย)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ตั๋วเงินยกโดยซัพพลายเออร์
 DocType: POS Profile,Write Off Account,เขียนทันทีบัญชี
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,เดบิตหมายเหตุ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,เดบิตหมายเหตุ Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
@@ -3979,6 +4001,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,วันที่สั่งซื้อขาย
 DocType: Sales Invoice Item,Delivered Qty,จำนวนส่ง
 DocType: Assessment Plan,Assessment Plan,แผนการประเมิน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,สร้างลูกค้า {0} แล้ว
 DocType: Stock Settings,Limit Percent,ร้อยละขีด จำกัด
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ไม่มีคลังสินค้าในคลังสินค้าใด ๆ
@@ -3992,14 +4015,15 @@
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Payment Entry,Payment References,อ้างอิงการชำระเงิน
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",จำนวนช่วงเวลาสำหรับช่วงเวลาเช่นถ้าช่วงคือ &#39;วัน&#39; และช่วงเวลาการเรียกเก็บเงินคือ 3 จะมีการสร้างใบแจ้งหนี้ทุก 3 วัน
 DocType: Vehicle,Insurance Details,รายละเอียดการประกันภัย
 DocType: Account,Payable,ที่ต้องชำระ
 DocType: Share Balance,Share Type,Share Type
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,กรุณากรอกระยะเวลาการชำระคืน
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,กรุณากรอกระยะเวลาการชำระคืน
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),ลูกหนี้ ({0})
 DocType: Pricing Rule,Margin,ขอบ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ลูกค้าใหม่
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% กำไรขั้นต้น
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,% กำไรขั้นต้น
 DocType: Appraisal Goal,Weightage (%),weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,เปลี่ยนโพรไฟล์ POS
 DocType: Bank Reconciliation Detail,Clearance Date,วันที่กวาดล้าง
@@ -4009,10 +4033,11 @@
 DocType: Lead,Address Desc,ลักษณะ ของ ที่อยู่
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,พรรคมีผลบังคับใช้
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},แถวที่มีวันครบกำหนดที่ซ้ำกันในแถวอื่น ๆ พบ: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},แถวที่มีวันครบกำหนดที่ซ้ำกันในแถวอื่น ๆ พบ: {list}
 DocType: Topic,Topic Name,ชื่อกระทู้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,โปรดตั้งค่าเทมเพลตมาตรฐานสำหรับ Leave Approval Notification ใน HR Settings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,อย่างน้อยต้องเลือกหนึ่งในการขาย หรือการซื้อ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,เลือกพนักงานเพื่อรับพนักงานล่วงหน้า
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,เลือกพนักงานเพื่อรับพนักงานล่วงหน้า
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,โปรดเลือกวันที่ที่ถูกต้อง
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,เลือกลักษณะของธุรกิจของคุณ
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4031,7 +4056,7 @@
 DocType: Asset Movement,Source Warehouse,คลังสินค้าที่มา
 DocType: Installation Note,Installation Date,วันที่ติดตั้ง
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,บัญชีแยกประเภท
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},แถว # {0}: สินทรัพย์ {1} ไม่ได้เป็นของ บริษัท {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},แถว # {0}: สินทรัพย์ {1} ไม่ได้เป็นของ บริษัท {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,สร้างใบแจ้งหนี้การขาย {0} แล้ว
 DocType: Employee,Confirmation Date,ยืนยัน วันที่
 DocType: C-Form,Total Invoiced Amount,มูลค่าใบแจ้งหนี้รวม
@@ -4040,7 +4065,7 @@
 DocType: Account,Accumulated Depreciation,ค่าเสื่อมราคาสะสม
 DocType: Supplier Scorecard Scoring Standing,Standing Name,ชื่อยืน
 DocType: Stock Entry,Customer or Supplier Details,ลูกค้าหรือผู้ผลิตรายละเอียด
-DocType: Employee Loan Application,Required by Date,จำเป็นโดยวันที่
+DocType: Loan Application,Required by Date,จำเป็นโดยวันที่
 DocType: Lead,Lead Owner,เจ้าของช่องทาง
 DocType: Production Plan,Sales Orders Detail,รายละเอียดใบสั่งขาย
 DocType: Bin,Requested Quantity,จำนวนการขอใช้บริการ
@@ -4053,10 +4078,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,จ่ายขั้นต้น - ลดรวม - การชำระคืนเงินกู้
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM ปัจจุบันและ ใหม่ BOM ไม่สามารถ จะเหมือนกัน
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,เงินเดือน ID สลิป
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,หลายรูปแบบ
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ส่งแล้ว
+DocType: Subscription,Trial Period Start Date,วันที่เริ่มทดลองใช้
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,โปรดเข้าสู่ระบบในฐานะผู้ใช้รายอื่น
@@ -4077,12 +4103,11 @@
 DocType: Student Guardian,Student Guardian,เดอะการ์เดียนักศึกษา
 DocType: Member,Member Name,ชื่อสมาชิก
 DocType: Stock Settings,Use Naming Series,ใช้ Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,ในการสมัครสมาชิก
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 DocType: Membership,Payment Details,รายละเอียดการชำระเงิน
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,อัตรา BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",หยุดการทำงานสั่งซื้อสินค้าไม่สามารถยกเลิกได้ยกเลิกการยกเลิกก่อนจึงจะยกเลิก
 DocType: Asset,Journal Entry for Scrap,วารสารรายการเศษ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
@@ -4102,6 +4127,7 @@
 DocType: Land Unit,Land Unit,หน่วยที่ดิน
 ,Purchase Analytics,Analytics ซื้อ
 DocType: Sales Invoice Item,Delivery Note Item,รายการจัดส่งสินค้าหมายเหตุ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,ไม่มีใบแจ้งหนี้ปัจจุบัน {0}
 DocType: Asset Maintenance Log,Task,งาน
 DocType: Purchase Taxes and Charges,Reference Row #,อ้างอิง แถว #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
@@ -4114,7 +4140,7 @@
 DocType: Company,Exchange Gain / Loss Account,กำไรจากอัตราแลกเปลี่ยน / บัญชีการสูญเสีย
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,พนักงานและพนักงาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ฟอรั่มชุมชน
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,จำนวนจริงในสต็อก
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,จำนวนจริงในสต็อก
@@ -4129,7 +4155,7 @@
 DocType: Lab Test Template,Standard Selling Rate,มาตรฐานอัตราการขาย
 DocType: Account,Rate at which this tax is applied,อัตราที่ภาษีนี้จะถูกใช้
 DocType: Cash Flow Mapper,Section Name,ชื่อส่วน
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,สั่งซื้อใหม่จำนวน
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,สั่งซื้อใหม่จำนวน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,เปิดงานปัจจุบัน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,เขียนปิด
@@ -4140,9 +4166,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,จัดคิวเพื่ออัปเดตราคาล่าสุดในบิลวัสดุทั้งหมด อาจใช้เวลาสักครู่
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
 DocType: Water Analysis,Appearance,การปรากฏ
+DocType: HR Settings,Leave Status Notification Template,ออกจากเทมเพลตการแจ้งสถานะ
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,เฉลี่ย ราคาเสนอซื้อราคา
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,ข้อมูลสมาชิก
@@ -4165,7 +4191,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,ไม่อนุญาต โปรดปิดเทมเพลตการทดสอบ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
 DocType: Crop Cycle,Linked Land Unit,หน่วยที่ดินที่เชื่อมโยง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 DocType: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
@@ -4181,7 +4207,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,ไปที่ผู้ใช้
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN ไม่ถูกต้องหรือป้อน NA สำหรับที่ไม่ได้ลงทะเบียน
 DocType: Training Event,Seminar,สัมมนา
 DocType: Program Enrollment Fee,Program Enrollment Fee,ค่าลงทะเบียนหลักสูตร
@@ -4197,14 +4223,14 @@
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 DocType: Company,Create Chart Of Accounts Based On,สร้างผังบัญชีอยู่บนพื้นฐานของ
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,ไม่สามารถแปลงเป็นกลุ่มที่ไม่ใช่กลุ่มได้ งานเด็กมีอยู่แล้ว
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},นักศึกษา {0} อยู่กับผู้สมัครนักเรียน {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),การปรับการปัดเศษ (สกุลเงินของ บริษัท )
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,timesheet
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,ตอนบ่าย
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Cheque Print Template,Scanned Cheque,สแกนเช็ค
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
@@ -4220,7 +4246,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,โครงการ {0} มีอยู่แล้ว
 DocType: Medical Department,Nursing User,ผู้ใช้พยาบาล
 DocType: Plant Analysis,Plant Analysis Criterias,เกณฑ์การวิเคราะห์พืช
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ความรับผิดชอบ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Serial No {0} ไม่ได้เป็นของ Batch {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ความรับผิดชอบ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ช่วงสิ้นสุดของใบเสนอราคานี้สิ้นสุดลงแล้ว
 DocType: Expense Claim Account,Expense Claim Account,บัญชีค่าใช้จ่ายเรียกร้อง
 DocType: Accounts Settings,Allow Stale Exchange Rates,อนุญาตอัตราแลกเปลี่ยนที่อ่อนลง
@@ -4242,11 +4269,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,ทำ Variants
 DocType: Item,Default BOM,BOM เริ่มต้น
 DocType: Project,Total Billed Amount (via Sales Invoices),จำนวนเงินที่เรียกเก็บเงินทั้งหมด (ผ่านใบกำกับการขาย)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,วงเงินเดบิตหมายเหตุ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,วงเงินเดบิตหมายเหตุ
 DocType: Project Update,Not Updated,ไม่อัปเดต
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",มีความไม่สอดคล้องกันระหว่างอัตราจำนวนหุ้นและจำนวนที่คำนวณ
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,รวมที่โดดเด่น Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,รวมที่โดดเด่น Amt
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
 DocType: Employee Advance,Advance Account,บัญชี Advance
 DocType: Job Offer,Job Offer Terms,เงื่อนไขการเสนองาน
@@ -4255,7 +4282,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,ยานยนต์
 DocType: Vehicle,Insurance Company,บริษัท ประกันภัย
 DocType: Asset Category Account,Fixed Asset Account,บัญชีสินทรัพย์ถาวร
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,ตัวแปร
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,ตัวแปร
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Chapter,Members,สมาชิก
 DocType: Student,Student Email Address,อีเมล์ของนักศึกษา
@@ -4279,7 +4306,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,แพทย์ฝึกหัด
 DocType: Delivery Stop,Address Name,ชื่อที่อยู่
 DocType: Stock Entry,From BOM,จาก BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},แบ่ง {0} หน่วยจาก {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},แบ่ง {0} หน่วยจาก {1}
 DocType: Assessment Code,Assessment Code,รหัสการประเมิน
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
@@ -4287,25 +4314,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 DocType: Bank Reconciliation Detail,Payment Document,เอกสารการชำระเงิน
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,ข้อผิดพลาดในการประเมินสูตรเกณฑ์
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
+DocType: Subscription,Plans,แผน
 DocType: Salary Slip,Salary Structure,โครงสร้างเงินเดือน
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,ฉบับวัสดุ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,เกิดข้อผิดพลาดขณะสร้างงานที่เกิดขึ้นประจำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ใบเสนอราคา
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,ไม่มีกลุ่มนักศึกษาสร้าง
 DocType: Purchase Invoice Item,Serial No,อนุกรมไม่มี
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,จำนวนเงินที่ชำระหนี้รายเดือนไม่สามารถจะสูงกว่าจำนวนเงินกู้
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,จำนวนเงินที่ชำระหนี้รายเดือนไม่สามารถจะสูงกว่าจำนวนเงินกู้
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,แถว # {0}: คาดว่าวันที่จัดส่งต้องไม่ถึงวันสั่งซื้อ
 DocType: Purchase Invoice,Print Language,ภาษาที่ใช้ในการพิมพ์
 DocType: Salary Slip,Total Working Hours,รวมชั่วโมงทำงาน
 DocType: Sales Invoice,Customer PO Details,รายละเอียดใบสั่งซื้อของลูกค้า
-DocType: Subscription,Next Schedule Date,วันที่กำหนดการถัดไป
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,บัญชีเปิดชั่วคราว
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,ค่าใส่ต้องเป็นบวก
@@ -4334,11 +4360,11 @@
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,จากและถึง วันที่คุณต้องการ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ไม่มีพนักงานสำหรับเกณฑ์ดังกล่าว
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
 DocType: Hotel Settings,Default Customer,ลูกค้าเริ่มต้น
 DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,อย่ายืนยันว่ามีการสร้างการนัดหมายสำหรับวันเดียวกันหรือไม่
@@ -4363,16 +4389,16 @@
 DocType: Journal Entry Account,Employee Advance,พนักงานล่วงหน้า
 DocType: Payroll Entry,Payroll Frequency,เงินเดือนความถี่
 DocType: Lab Test Template,Sensitivity,ความไวแสง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,วัตถุดิบ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,วัตถุดิบ
 DocType: Leave Application,Follow via Email,ผ่านทางอีเมล์ตาม
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,พืชและไบ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,พืชและไบ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,การตั้งค่าการทำงานในชีวิตประจำวันอย่างย่อ
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,โปรดป้อน Reqd by Date
 DocType: Payment Entry,Internal Transfer,โอนภายใน
 DocType: Asset Maintenance,Maintenance Tasks,งานบำรุงรักษา
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
@@ -4380,13 +4406,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,บูรณาการ ERPNext
 DocType: Crop Cycle,Detected Disease,โรคที่ตรวจพบ
 ,Produced,ผลิต
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,วันที่เริ่มต้นชำระคืนต้องไม่เกินวันที่จ่ายเงิน
 DocType: Item,Item Code for Suppliers,รหัสสินค้าสำหรับซัพพลายเออร์
 DocType: Issue,Raised By (Email),โดยยก (อีเมล์)
 DocType: Training Event,Trainer Name,ชื่อเทรนเนอร์
 DocType: Mode of Payment,General,ทั่วไป
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,การสื่อสารครั้งล่าสุด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ไม่ สามารถหัก เมื่อ เป็น หมวดหมู่ สำหรับ ' ประเมิน ' หรือ ' การประเมิน และการ รวม
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ไม่ สามารถหัก เมื่อ เป็น หมวดหมู่ สำหรับ ' ประเมิน ' หรือ ' การประเมิน และการ รวม
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,การชำระเงินการแข่งขันกับใบแจ้งหนี้
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
@@ -4400,7 +4427,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},ดร. {0} ในวันครึ่งทิ้งวันที่ {1}
 DocType: Production Plan,Get Material Request,ได้รับวัสดุที่ขอ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 ,Item Variant Details,รายละเอียดรายละเอียดของรายการ
@@ -4411,9 +4438,9 @@
 DocType: Drug Prescription,Hour,ชั่วโมง
 DocType: Restaurant Order Entry,Last Sales Invoice,ใบเสนอราคาการขายครั้งล่าสุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},โปรดเลือกจำนวนเทียบกับรายการ {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติวันลา ในวันที่ถูกบล็อก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติวันลา ในวันที่ถูกบล็อก
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
 DocType: Company,Monthly Sales Target,เป้าหมายการขายรายเดือน
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},สามารถ ได้รับการอนุมัติ โดย {0}
@@ -4421,7 +4448,7 @@
 DocType: Item,Default Material Request Type,เริ่มต้นขอประเภทวัสดุ
 DocType: Supplier Scorecard,Evaluation Period,ระยะเวลาการประเมินผล
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,ไม่ทราบ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,ไม่ได้สร้างใบสั่งงาน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,ไม่ได้สร้างใบสั่งงาน
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
 DocType: Purchase Invoice,Export Type,ประเภทการส่งออก
 DocType: Salary Slip Loan,Salary Slip Loan,สินเชื่อลื่น
@@ -4437,8 +4464,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,การเปิดบัญชีใบแจ้งหนี้
 DocType: Education Settings,Education Manager,ผู้จัดการฝ่ายการศึกษา
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,ความยาวต่ำสุดระหว่างโรงงานแต่ละต้นในสนามเพื่อการเจริญเติบโตที่ดีที่สุด
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",รายการแบทช์ {0} ไม่สามารถอัปเดตโดยใช้การกระทบยอดหุ้นแทนการใช้รายการสต็อก
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",รายการแบทช์ {0} ไม่สามารถอัปเดตโดยใช้การกระทบยอดหุ้นแทนการใช้รายการสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",รายการแบทช์ {0} ไม่สามารถอัปเดตโดยใช้การกระทบยอดหุ้นแทนการใช้รายการสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",รายการแบทช์ {0} ไม่สามารถอัปเดตโดยใช้การกระทบยอดหุ้นแทนการใช้รายการสต็อก
 DocType: Quality Inspection,Report Date,รายงานวันที่
 DocType: Student,Middle Name,ชื่อกลาง
 DocType: C-Form,Invoices,ใบแจ้งหนี้
@@ -4471,20 +4498,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,ใบเสร็จรับเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,ใบเสร็จรับเงิน
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Daily Work Summary Group,Send Emails At,ส่งอีเมล์ที่
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,มุมมองแบบฟอร์ม
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,ค่าใช้จ่ายที่จำเป็นในการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",เพิ่มผู้ใช้ในองค์กรของคุณนอกเหนือจากตัวคุณเอง
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ยังไม่มีลูกค้า!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,งบกระแสเงินสด
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,ไม่ได้สร้างคำขอเนื้อหา
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,การอนุญาต
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
@@ -4507,11 +4535,12 @@
 DocType: Vehicle,Chassis No,แชสซีไม่มี
 DocType: Payment Request,Initiated,ริเริ่ม
 DocType: Production Plan Item,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,โปรดเลือก BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,โปรดเลือก BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,มีภาษี ITC Integrated Tax
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
+DocType: Bank Guarantee,Clauses and Conditions,ข้อและเงื่อนไข
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
 DocType: Project Task,View Timesheet,ดู Timesheet
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,วันที่สิ้นสุดต้องมากกว่าวันที่เริ่มต้น
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสรร
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
@@ -4525,9 +4554,10 @@
 DocType: Patient,Alcohol Current Use,การใช้แอลกอฮอล์ในปัจจุบัน
 DocType: Student Admission Program,Student Admission Program,โปรแกรมการรับนักศึกษา
 DocType: Payment Entry,Account Paid To,บัญชีชำระเงิน
+DocType: Subscription Settings,Grace Period,ระยะเวลาผ่อนผัน
 DocType: Item Alternative,Alternative Item Name,ชื่อรายการทางเลือก
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",ไม่สามารถส่งสลิปเงินเดือน <br> สาเหตุที่เป็นไปได้: <br> \ 1. ค่าจ้างสุทธิน้อยกว่า 0 <br> \ 2. ที่อยู่อีเมลของ บริษัท ที่ระบุไว้ในหลักของพนักงานไม่ถูกต้อง <br>
@@ -4537,7 +4567,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} งบประมาณสำหรับบัญชี {1} กับ {2} {3} คือ {4} บัญชีจะเกินโดย {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,ออก จำนวน
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,และยกเลิกการปิดใช้งานใน
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,ชุด มีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,บริการทางการเงิน
 DocType: Student Sibling,Student ID,รหัสนักศึกษา
@@ -4549,14 +4578,16 @@
 DocType: Complaint,Complaint,การร้องเรียน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ทำรายการชำระคืน
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,แผนกทั้งหมด
 DocType: Patient,Alcohol Past Use,การใช้แอลกอฮอล์ในอดีต
 DocType: Fertilizer Content,Fertilizer Content,เนื้อหาปุ๋ย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,ปัญหา / ติด
 DocType: Tax Rule,Billing State,สถานะ เรียกเก็บเงิน
 DocType: Share Transfer,Transfer,โอน
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,สั่งซื้องาน {0} ต้องถูกยกเลิกก่อนที่จะยกเลิกใบสั่งขายนี้
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
@@ -4580,10 +4611,11 @@
 DocType: Cheque Print Template,Message to show,ข้อความที่จะแสดง
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,ค้าปลีก
 DocType: Student Attendance,Absent,ขาด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Bundle สินค้า
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,ไม่สามารถหาคะแนนเริ่มต้นที่ {0} คุณต้องมีคะแนนยืนตั้งแต่ 0 ถึง 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
+DocType: Subscription,Current Invoice Start Date,วันที่เริ่มต้นของใบแจ้งหนี้ปัจจุบัน
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: จำนวนเดบิตหรือเครดิตเป็นสิ่งจำเป็นสำหรับ {2}
 DocType: GL Entry,Remarks,ข้อคิดเห็น
@@ -4593,11 +4625,13 @@
 DocType: Task,Parent Task,งานหลัก
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,ทำให้ตะกั่ว
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,พิมพ์และเครื่องเขียน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,พิมพ์และเครื่องเขียน
 DocType: Stock Settings,Show Barcode Field,แสดงฟิลด์บาร์โค้ด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,ส่งอีเมลผู้ผลิต
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",เงินเดือนที่ต้องการการประมวลผลแล้วสำหรับรอบระยะเวลาระหว่าง {0} และ {1} ฝากรับสมัครไม่สามารถอยู่ระหว่างช่วงวันที่นี้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,ส่งอีเมลผู้ผลิต
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",เงินเดือนที่ต้องการการประมวลผลแล้วสำหรับรอบระยะเวลาระหว่าง {0} และ {1} ฝากรับสมัครไม่สามารถอยู่ระหว่างช่วงวันที่นี้
+DocType: Fiscal Year,Auto Created,สร้างอัตโนมัติแล้ว
 DocType: Chapter Member,Leave Reason,ปล่อยเหตุผล
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,ใบแจ้งหนี้ {0} ไม่มีอยู่แล้ว
 DocType: Guardian Interest,Guardian Interest,ผู้ปกครองที่น่าสนใจ
 DocType: Volunteer,Availability,ความพร้อมใช้งาน
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,ตั้งค่าเริ่มต้นสำหรับใบแจ้งหนี้ POS
@@ -4606,14 +4640,13 @@
 DocType: Timesheet,Employee Detail,รายละเอียดการทำงานของพนักงาน
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,รหัสอีเมล Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,รหัสอีเมล Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,วันวันถัดไปและทำซ้ำในวันเดือนจะต้องเท่ากัน
 DocType: Lab Prescription,Test Code,รหัสทดสอบ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,การตั้งค่าสำหรับหน้าแรกของเว็บไซต์
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs ไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากสถานะการจดแต้ม {1}
 DocType: Job Offer,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,สูงกว่า
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},ยอดรวม {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},ยอดรวม {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
 DocType: Supplier,Mention if non-standard payable account,พูดถึงบัญชีที่ต้องชำระเงินที่ไม่ได้มาตรฐาน
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',โปรดเลือกกลุ่มการประเมินอื่นนอกเหนือจาก &#39;กลุ่มการประเมินทั้งหมด&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},แถว {0}: ต้องใช้ศูนย์ต้นทุนสำหรับรายการ {1}
@@ -4624,7 +4657,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,การวิเคราะห์น้ำ
 DocType: Chapter,Region,ภูมิภาค
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,โหลดการวิเคราะห์ที่เชื่อมโยงกัน
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","สำหรับเช่น 2012, 2012-13"
@@ -4640,7 +4673,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,ราคาทุนของสินทรัพย์ทะเลาะวิวาท
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: จำเป็นต้องระบุศูนย์ต้นทุนสำหรับรายการ {2}
 DocType: Vehicle,Policy No,ไม่มีนโยบาย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 DocType: Asset,Straight Line,เส้นตรง
 DocType: Project User,Project User,ผู้ใช้โครงการ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,แยก
@@ -4680,21 +4713,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,เส้นทาง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,ไม่สามารถแปลง ศูนย์ต้นทุน ไปยัง บัญชีแยกประเภท ที่มี ต่อมน้ำเด็ก
 DocType: Production Plan,Total Planned Qty,จำนวนตามแผนทั้งหมด
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,ราคาเปิด
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,ราคาเปิด
 DocType: Salary Detail,Formula,สูตร
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,เทมเพลตการทดสอบ Lab
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,บัญชีขาย
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,บัญชีขาย
 DocType: Purchase Invoice Item,Total Weight,น้ำหนักรวม
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,สำนักงานคณะกรรมการกำกับ การขาย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,สำนักงานคณะกรรมการกำกับ การขาย
 DocType: Job Offer Term,Value / Description,ค่า / รายละเอียด
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,ประเทศการเรียกเก็บเงิน
 DocType: Purchase Order Item,Expected Delivery Date,คาดว่าวันที่ส่ง
 DocType: Restaurant Order Entry,Restaurant Order Entry,รายการสั่งซื้อร้านอาหาร
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
 DocType: Asset Maintenance Task,Assign To Name,กำหนดชื่อ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
 DocType: Hub Settings,Enabled Users,Enabled Users
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,ทำให้วัสดุที่ขอ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},เปิดรายการ {0}
@@ -4707,24 +4740,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,โปรแกรมประยุกต์สำหรับการลา
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
 DocType: Vehicle,Last Carbon Check,ตรวจสอบคาร์บอนล่าสุด
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ค่าใช้จ่ายทางกฎหมาย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,ค่าใช้จ่ายทางกฎหมาย
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,โปรดเลือกปริมาณในแถว
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,เปิดบัญชีขายและใบแจ้งหนี้ซื้อ
 DocType: Purchase Invoice,Posting Time,โพสต์เวลา
 DocType: Timesheet,% Amount Billed,% ของยอดเงินที่เรียกเก็บแล้ว
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ค่าใช้จ่าย โทรศัพท์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ค่าใช้จ่าย โทรศัพท์
 DocType: Sales Partner,Logo,เครื่องหมาย
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ตรวจสอบเรื่องนี้ถ้าคุณต้องการบังคับให้ผู้ใช้เลือกชุดก่อนที่จะบันทึก จะมีค่าเริ่มต้นไม่ถ้าคุณตรวจสอบนี้
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
 DocType: Email Digest,Open Notifications,เปิดการแจ้งเตือน
 DocType: Payment Entry,Difference Amount (Company Currency),ความแตกต่างจำนวนเงิน ( บริษัท สกุล)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,ค่าใช้จ่าย โดยตรง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,ค่าใช้จ่าย โดยตรง
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,รายได้ลูกค้าใหม่
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},เพิ่มการสมัครรับข้อมูลฟิลด์ที่กำหนดเองใน doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
 DocType: Purchase Receipt Item,Sample Quantity,ตัวอย่างปริมาณ
+DocType: Bank Guarantee,Name of Beneficiary,ชื่อผู้รับประโยชน์
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",อัพเดตค่าใช้จ่าย BOM โดยอัตโนมัติผ่าน Scheduler ตามอัตราการประเมินล่าสุด / อัตราราคา / อัตราการซื้อวัตถุดิบครั้งล่าสุด
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
@@ -4736,14 +4769,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,การทดลอง
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ส่วนประกอบเงินเดือน
 DocType: Program Enrollment Tool,New Academic Year,ปีการศึกษาใหม่
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,กลับมา / หมายเหตุเครดิต
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,กลับมา / หมายเหตุเครดิต
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,รวมจำนวนเงินที่จ่าย
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 DocType: GST Settings,B2C Limit,ขีด จำกัด B2C
 DocType: Work Order Item,Transferred Qty,โอน จำนวน
 apps/erpnext/erpnext/config/learn.py +11,Navigating,การนำ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,การวางแผน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,การวางแผน
 DocType: Share Balance,Issued,ออก
+DocType: Loan,Repayment Start Date,วันที่เริ่มชำระคืน
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,กิจกรรมนักศึกษา
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id ผู้ผลิต
 DocType: Payment Request,Payment Gateway Details,การชำระเงินรายละเอียดเกตเวย์
@@ -4756,10 +4790,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",ประเภทของใบเช่นลำลอง ฯลฯ ป่วย
 DocType: Email Digest,Send regular summary reports via Email.,ส่งรายงานสรุปปกติผ่านทางอีเมล์
 DocType: Payment Entry,PE-,วิชาพลศึกษา-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
 DocType: Assessment Result,Student Name,ชื่อนักเรียน
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,เงินเดือนเจ้าหนี้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,เงินเดือนเจ้าหนี้
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
 DocType: Plant Analysis,Collection Datetime,คอลเล็กชัน Datetime
 DocType: Work Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
@@ -4769,9 +4803,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,ผู้ใช้ {0} ไม่อยู่
 DocType: Payment Term,Day(s) after invoice date,วันหลังจากวันที่ในใบแจ้งหนี้
 DocType: Payment Schedule,Payment Schedule,ตารางการชำระเงิน
-DocType: Subscription,SUB-,อนุ
 DocType: Item Attribute Value,Abbreviation,ตัวย่อ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,รายการชำระเงินที่มีอยู่แล้ว
+DocType: Subscription,Trial Period End Date,วันที่สิ้นสุดของรอบระยะทดลอง
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ไม่ authroized ตั้งแต่ {0} เกินขีด จำกัด
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,แม่ เงินเดือน หลัก
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,พยาธิวิทยา
@@ -4788,9 +4822,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ทุกกลุ่ม ลูกค้า
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,ทุกกลุ่ม ลูกค้า
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,สะสมรายเดือน
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีความจำเป็น รายการบันทึกอัตราแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีความจำเป็น รายการบันทึกอัตราแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
@@ -4799,14 +4833,15 @@
 DocType: Lab Prescription,Test Created,ทดสอบสร้างแล้ว
 DocType: Healthcare Settings,Custom Signature in Print,ลายเซ็นที่กำหนดเองในการพิมพ์
 DocType: Account,Temporary,ชั่วคราว
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,ลูกค้า LPO หมายเลข
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,ลูกค้า LPO หมายเลข
 DocType: Program,Courses,หลักสูตร
 DocType: Monthly Distribution Percentage,Percentage Allocation,การจัดสรรร้อยละ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,เลขา
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,เลขา
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",หากปิดการใช้งาน &#39;ในคำว่า&#39; ข้อมูลจะไม่สามารถมองเห็นได้ในการทำธุรกรรมใด ๆ
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,การดำเนินการนี้จะระงับการเรียกเก็บเงินในอนาคต คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการสมัครนี้
 DocType: Serial No,Distinct unit of an Item,หน่วยที่แตกต่างของสินค้า
 DocType: Supplier Scorecard Criteria,Criteria Name,ชื่อเกณฑ์
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,โปรดตั้ง บริษัท
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,โปรดตั้ง บริษัท
 DocType: Pricing Rule,Buying,การซื้อ
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,โรคและปุ๋ย
 DocType: HR Settings,Employee Records to be created by,ระเบียนพนักงานที่จะถูกสร้างขึ้นโดย
@@ -4815,18 +4850,18 @@
 DocType: POS Profile,Apply Discount On,ใช้ส่วนลด
 DocType: Member,Membership Type,ประเภทสมาชิก
 ,Reqd By Date,reqd โดยวันที่
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,เจ้าหนี้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,เจ้าหนี้
 DocType: Assessment Plan,Assessment Name,ชื่อการประเมิน
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,แสดง PDC ใน Print
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,แสดง PDC ใน Print
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,เสนองาน
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,สถาบันชื่อย่อ
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษส่วนในแถว {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษเล็กเศษน้อยในแถว {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษส่วนในแถว {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษเล็กเศษน้อยในแถว {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
@@ -4844,7 +4879,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ความแปรปรวนทั้งหมด
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",ถ้าเปิดใช้งานระบบจะโพสต์รายการบัญชีสำหรับสินค้าคงคลังโดยอัตโนมัติ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,ค่านายหน้า
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,การเข้าร่วมประชุมสำหรับพนักงาน {0} ถูกทำเครื่องหมายแล้วสำหรับวันนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,การเข้าร่วมประชุมสำหรับพนักงาน {0} ถูกทำเครื่องหมายแล้วสำหรับวันนี้
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",เป็นนาที ปรับปรุงผ่านทาง 'บันทึกเวลา'
 DocType: Customer,From Lead,จากช่องทาง
@@ -4855,6 +4890,7 @@
 DocType: Lab Test,Approved Date,วันที่อนุมัติ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
+DocType: Subscriber,Subscriber Name,ชื่อผู้สมัครสมาชิก
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
 DocType: BOM Update Tool,Replace,แทนที่
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ไม่พบผลิตภัณฑ์
@@ -4864,19 +4900,18 @@
 DocType: Request for Quotation Item,Project Name,ชื่อโครงการ
 DocType: Customer,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},เลือกบัญชีรายได้ดอกเบี้ยในเงินกู้ของพนักงาน {0}
 DocType: Work Order,Required Items,รายการที่ต้องการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,ทรัพยากรมนุษย์
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,กระทบยอดการชำระเงิน
 DocType: Disease,Treatment Task,งานบำบัด
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,สินทรัพย์ ภาษี
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,สินทรัพย์ ภาษี
 DocType: BOM Item,BOM No,BOM ไม่มี
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Update Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,อุปกรณ์อิเล็กทรอนิกส์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,อุปกรณ์อิเล็กทรอนิกส์
 DocType: Asset,Maintenance Required,ต้องการการบำรุงรักษา
 DocType: Account,Debit,หักบัญชี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
@@ -4885,7 +4920,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amt ดีเด่น
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั้งเป้ากลุ่มสินค้าที่ชาญฉลาดสำหรับการนี้คนขาย
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ตรึง หุ้น เก่า กว่า [ วัน ]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,แถว # {0}: สินทรัพย์เป็นข้อบังคับสำหรับสินทรัพย์ถาวรซื้อ / ขาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,แถว # {0}: สินทรัพย์เป็นข้อบังคับสำหรับสินทรัพย์ถาวรซื้อ / ขาย
 DocType: Asset Maintenance Team,Maintenance Team Name,ชื่อทีมบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",ถ้าสองคนหรือมากกว่ากฎการกำหนดราคาจะพบตามเงื่อนไขข้างต้นลำดับความสำคัญถูกนำไปใช้ ลำดับความสำคัญเป็นจำนวนระหว่าง 0-20 ในขณะที่ค่าเริ่มต้นเป็นศูนย์ (ว่าง) จำนวนที่สูงขึ้นหมายความว่ามันจะมีความสำคัญถ้ามีกฎกำหนดราคาหลายเงื่อนไขเดียวกัน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,ลูกค้าเป็นผู้มีอำนาจถ้า &#39;Opportunity From&#39; ถูกเลือกเป็น Customer
@@ -4895,19 +4930,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,ชนิดของการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},อัตราการขายสำหรับรายการ {0} ต่ำกว่า {1} อัตราการขายต้องน้อยที่สุด {2}
-DocType: Item,Taxes,ภาษี
+DocType: Subscription,Taxes,ภาษี
 DocType: Purchase Invoice,capital goods,สินค้าทุน
 DocType: Purchase Invoice Item,Weight Per Unit,น้ำหนักต่อหน่วย
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,การชำระเงินและไม่ได้ส่งมอบ
 DocType: Project,Default Cost Center,เริ่มต้นที่ศูนย์ต้นทุน
-DocType: Bank Guarantee,End Date,วันที่สิ้นสุด
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ทำธุรกรรมซื้อขายหุ้น
 DocType: Budget,Budget Accounts,บัญชีงบประมาณ
 DocType: Employee,Internal Work History,ประวัติการทำงานภายใน
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,จำนวนเงินค่าเสื่อมราคาสะสม
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,ตัวแปรชี้วัดของผู้จัดจำหน่าย
-DocType: Employee Loan,Fully Disbursed,การเบิกจ่ายอย่างเต็มที่
 DocType: Employee Advance,Due Advance Amount,จำนวนเงินล่วงหน้า
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
@@ -4931,7 +4964,7 @@
 ,Employee Information,ข้อมูลของพนักงาน
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,เทมเพลตภาษีที่เป็นค่าเริ่มต้นสำหรับการขายและซื้อจะสร้างขึ้น
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,บันทึกผลลัพธ์การประเมิน {0} มีอยู่แล้ว
@@ -4939,7 +4972,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',โปรดตั้งค่าตัวกรอง บริษัท หาก Group By เป็น &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,โพสต์วันที่ไม่สามารถเป็นวันที่ในอนาคต
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,สำหรับการสร้างที่เกิดขึ้นประจำ
 DocType: Stock Entry,Target Warehouse Address,ที่อยู่คลังเป้าหมาย
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,สบาย ๆ ออก
 DocType: Agriculture Task,End Day,วันสิ้นสุด
@@ -4964,11 +4996,10 @@
 DocType: Material Request,% Ordered,% สั่งแล้ว
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",สำหรับกลุ่มนักศึกษาหลักสูตรจะมีการตรวจสอบหลักสูตรสำหรับนักเรียนทุกคนจากหลักสูตรที่ลงทะเบียนเรียนในการลงทะเบียนหลักสูตร
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,งานเหมา
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ราคาซื้อเฉลี่ย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Share Balance,From No,จากไม่มี
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},ข้อความใหม่จาก {sender}
 DocType: Customer,Customer Primary Address,ที่อยู่หลักของลูกค้า
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,จดหมายข่าว
 DocType: Drug Prescription,Description/Strength,คำอธิบาย / ความแข็งแรง
@@ -4977,22 +5008,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: Department,Leave Block List,ฝากรายการบล็อก
 DocType: Purchase Invoice,Tax ID,เลขประจำตัวผู้เสียภาษี
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,รายการที่ {0} ไม่ได้ ติดตั้งสำหรับ คอลัมน์ อนุกรม เลขที่ จะต้องมี ที่ว่างเปล่า
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,รายการที่ {0} ไม่ได้ ติดตั้งสำหรับ คอลัมน์ อนุกรม เลขที่ จะต้องมี ที่ว่างเปล่า
 DocType: Accounts Settings,Accounts Settings,ตั้งค่าบัญชี
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,อนุมัติ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",ที่อยู่ที่จัดรูปแบบไม่ถูกต้องสำหรับ {0} โปรดแก้ไขเพื่อดำเนินการต่อ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",ที่อยู่ที่จัดรูปแบบไม่ถูกต้องสำหรับ {0} โปรดแก้ไขเพื่อดำเนินการต่อ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",หมายเลขบัญชีใหม่จะรวมอยู่ในชื่อบัญชีเป็นคำนำหน้า
 DocType: Maintenance Team Member,Team Member,สมาชิกในทีม
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,ไม่มีผลลัพธ์ที่จะส่ง
 DocType: Customer,Sales Partner and Commission,พันธมิตรการขายและสำนักงานคณะกรรมการกำกับ
-DocType: Employee Loan,Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี
+DocType: Loan,Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี
 ,Project Quantity,จำนวนโครงการ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,ต้องการ {1} อย่างน้อย {0} หน่วย ใน {2} เพื่อที่จะทำธุรกรรมนี้
 DocType: Loan Type,Rate of Interest (%) Yearly,อัตราดอกเบี้ย (%) ประจำปี
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,บัญชีชั่วคราว
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,สีดำ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,บัญชีชั่วคราว
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,สีดำ
 DocType: BOM Explosion Item,BOM Explosion Item,รายการระเบิด BOM
 DocType: Shareholder,Contact List,รายการที่ติดต่อ
 DocType: Account,Auditor,ผู้สอบบัญชี
@@ -5000,16 +5031,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} รายการผลิตแล้ว
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,เรียนรู้เพิ่มเติม
 DocType: Cheque Print Template,Distance from top edge,ระยะห่างจากขอบด้านบน
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,ราคา {0} เป็นคนพิการหรือไม่มีอยู่
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,ราคา {0} เป็นคนพิการหรือไม่มีอยู่
 DocType: Purchase Invoice,Return,กลับ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,โหมดการชำระเงินจะต้องชำระเงิน
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,โหมดการชำระเงินจะต้องชำระเงิน
 DocType: Project Task,Pending Review,รอตรวจทาน
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","แก้ไขในแบบเต็มหน้าสำหรับตัวเลือกเพิ่มเติมเช่นสินทรัพย์, nos อนุกรม ฯลฯ แบทช์"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,การนัดหมายและการปรึกษาหารือ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} ไม่ได้ลงทะเบียนในชุด{2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",สินทรัพย์ {0} ไม่สามารถทิ้งขณะที่มันมีอยู่แล้ว {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,ต้องการตรวจสอบ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,ต้องการตรวจสอบ
 DocType: Task,Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,มาร์คขาด
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,ไม่สามารถตั้งค่า บริษัท
@@ -5021,7 +5052,7 @@
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,การจัดการ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,เพิ่มรายการจาก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,เพิ่มรายการจาก
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,พืชและที่ดิน
 DocType: Cheque Print Template,Regular,ปกติ
 DocType: Fertilizer,Density (if liquid),ความหนาแน่น (ถ้าของเหลว)
@@ -5046,24 +5077,26 @@
 DocType: Payment Entry,Paid Amount,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,สำรวจรอบการขาย
 DocType: Assessment Plan,Supervisor,ผู้ดูแล
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,การเก็บรักษารายการสินค้าคงคลัง
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,การเก็บรักษารายการสินค้าคงคลัง
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 ,Work Order Stock Report,สร้างรายงานการสั่งซื้องาน
+DocType: Purchase Receipt,Auto Repeat Detail,ทำรายละเอียดซ้ำอัตโนมัติ
 DocType: Assessment Result Tool,Assessment Result Tool,เครื่องมือการประเมินผล
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,เป็นหัวหน้างาน
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,แนะนำหมวดหมู่
 DocType: BOM Scrap Item,BOM Scrap Item,BOM เศษรายการ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,การบริหารจัดการคุณภาพ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,การบริหารจัดการคุณภาพ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Project,Total Billable Amount (via Timesheets),ยอดรวม Billable Amount (ผ่าน Timesheets)
 DocType: Agriculture Task,Previous Business Day,วันทำการก่อนหน้า
-DocType: Employee Loan,Repay Fixed Amount per Period,ชำระคืนจำนวนคงที่ต่อปีระยะเวลา
+DocType: Loan,Repay Fixed Amount per Period,ชำระคืนจำนวนคงที่ต่อปีระยะเวลา
 DocType: Employee,Health Insurance No,หมายเลขประกันสุขภาพ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,หมายเหตุเครดิตหมายเหตุ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,หมายเหตุเครดิตหมายเหตุ
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,จำนวนเงินที่ต้องเสียภาษีทั้งหมด
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
 DocType: Opening Invoice Creation Tool,Purchase,ซื้อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,คงเหลือ จำนวน
@@ -5074,16 +5107,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} สำหรับ {1}
 DocType: Healthcare Settings,Valid number of days,จำนวนวันที่ถูกต้อง
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,ศูนย์ต้นทุน
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,รีสตาร์ทการสมัครสมาชิกใหม่
 DocType: Land Unit,Linked Plant Analysis,การวิเคราะห์โรงงานที่เชื่อมโยง
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,อัตราที่สกุลเงินของซัพพลายเออร์จะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},แถว # {0}: ความขัดแย้งกับจังหวะแถว {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,อนุญาตให้ใช้อัตราการประเมินค่าเป็นศูนย์
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,อนุญาตให้ใช้อัตราการประเมินค่าเป็นศูนย์
+DocType: Bank Guarantee,Receiving,การได้รับ
 DocType: Training Event Employee,Invited,ได้รับเชิญ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,หลายโครงสร้างเงินเดือนที่ต้องการใช้งานพบพนักงาน {0} สำหรับวันที่กำหนด
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,บัญชีการติดตั้งเกตเวย์
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,สินทรัพย์ถาวร
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,สินทรัพย์ถาวร
 DocType: Payment Entry,Set Exchange Gain / Loss,ตั้งแลกเปลี่ยนกำไร / ขาดทุน
 ,GST Purchase Register,ลงทะเบียนซื้อ GST
 ,Cash Flow,กระแสเงินสด
@@ -5104,9 +5139,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,รายชื่อการทำธุรกรรมร่วมกันทั้งหมด
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,ต้องตั้งค่าวันที่เริ่มต้นทดลองใช้และวันที่สิ้นสุดระยะทดลองใช้
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,อัตราเฉลี่ย
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,จำนวนเงินที่ชำระในตารางการชำระเงินต้องเท่ากับยอดรวม / ยอดรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,จำนวนเงินที่ชำระในตารางการชำระเงินต้องเท่ากับยอดรวม / ยอดรวม
+DocType: Subscription Plan Detail,Plan,วางแผน
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ยอดเงินบัญชีธนาคารตามบัญชีแยกประเภททั่วไป
 DocType: Job Applicant,Applicant Name,ชื่อผู้ยื่นคำขอ
 DocType: Authorization Rule,Customer / Item Name,ชื่อลูกค้า / รายการ
@@ -5136,6 +5172,7 @@
 DocType: Work Order,Warehouses,โกดัง
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} สินทรัพย์ ไม่สามารถโอนได้
 DocType: Hotel Room Pricing,Hotel Room Pricing,ราคาห้องพักของโรงแรม
+DocType: Subscription,Days Until Due,วันจนถึงวันครบกำหนด
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,รายการนี้เป็น Variant ของ {0} (เทมเพลต)
 DocType: Workstation,per hour,ต่อชั่วโมง
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,การจัดซื้อ
@@ -5144,13 +5181,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",สำหรับกลุ่มนักเรียนที่เป็นกลุ่มแบบแบทช์ชุดนักเรียนจะได้รับการตรวจสอบสำหรับนักเรียนทุกคนจากการลงทะเบียนเรียนของโปรแกรม
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เนื่องจากรายการบัญชีแยกประเภท มีไว้สำหรับคลังสินค้านี้
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,การกระจาย
+DocType: Journal Entry Account,Loan,เงินกู้
 DocType: Expense Claim Advance,Expense Claim Advance,การเรียกร้องค่าสินไหมทดแทนล่วงหน้า
 DocType: Lab Test,Report Preference,การตั้งค่ารายงาน
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,ข้อมูลอาสาสมัคร
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,ผู้จัดการโครงการ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,ผู้จัดการโครงการ
 ,Quoted Item Comparison,เปรียบเทียบรายการที่ยกมา
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},ซ้อนกันระหว่างการให้คะแนนระหว่าง {0} ถึง {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ส่งไป
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,มูลค่าทรัพย์สินสุทธิ ณ วันที่
 DocType: Crop,Produce,ก่อ
@@ -5160,7 +5198,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,การใช้วัสดุเพื่อการผลิต
 DocType: Item Alternative,Alternative Item Code,รหัสรายการทางเลือก
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,เลือกรายการที่จะผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,เลือกรายการที่จะผลิต
 DocType: Delivery Stop,Delivery Stop,หยุดการจัดส่ง
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
 DocType: Item,Material Issue,บันทึกการใช้วัสดุ
@@ -5170,15 +5208,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
 DocType: BOM,Show Items,แสดงรายการ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,จากเวลาที่ไม่สามารถมีค่ามากกว่าการเวลา
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,คุณต้องการแจ้งให้ลูกค้าทราบทางอีเมลหรือไม่?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,คุณต้องการแจ้งให้ลูกค้าทราบทางอีเมลหรือไม่?
+DocType: Subscription Plan,Billing Interval,ช่วงเวลาการเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,ประวัติย่อ
 DocType: Hub Settings,Hub Username,ชื่อผู้ใช้ Hub
 DocType: Salary Detail,Component,ตัวแทน
 DocType: Assessment Criteria,Assessment Criteria Group,กลุ่มเกณฑ์การประเมิน
 DocType: Healthcare Settings,Patient Name By,ชื่อผู้ป่วยโดย
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},รายการบันทึกยอดคงค้างสำหรับเงินเดือนจาก {0} ถึง {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},รายการบันทึกยอดคงค้างสำหรับเงินเดือนจาก {0} ถึง {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
@@ -5192,23 +5230,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
 DocType: Leave Block List,Applies to Company,นำไปใช้กับ บริษัท
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
-DocType: Employee Loan,Disbursement Date,วันที่เบิกจ่าย
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;ผู้รับ&#39; ไม่ได้ระบุ
+DocType: Loan,Disbursement Date,วันที่เบิกจ่าย
 DocType: BOM Update Tool,Update latest price in all BOMs,อัปเดตราคาล่าสุดใน BOM ทั้งหมด
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,บันทึกการแพทย์
 DocType: Vehicle,Vehicle,พาหนะ
 DocType: Purchase Invoice,In Words,จำนวนเงิน (ตัวอักษร)
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,ป้อนชื่อธนาคารหรือสถาบันสินเชื่อก่อนส่ง
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,ต้องส่ง {0} รายการ
 DocType: POS Profile,Item Groups,กลุ่มรายการ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
 DocType: Sales Order Item,For Production,สำหรับการผลิต
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,โปรดเพิ่มบัญชีเปิดชั่วคราวในแผนภูมิบัญชี
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,โปรดเพิ่มบัญชีเปิดชั่วคราวในแผนภูมิบัญชี
 DocType: Customer,Customer Primary Contact,ติดต่อหลักของลูกค้า
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,วารสารปิดบัญชีสิ้นงวด
 DocType: Project Task,View Task,ดูงาน
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,ประเภทการรับประกันธนาคาร
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,ส่วนใบแจ้งหนี้
 ,Asset Depreciations and Balances,ค่าเสื่อมราคาสินทรัพย์และยอดคงเหลือ
@@ -5219,9 +5258,8 @@
 DocType: Production Plan,Include Subcontracted Items,รวมรายการรับเหมาช่วง
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,ไม่สามารถเปลี่ยนแปลงคุณสมบัติ Variant ภายหลังการโอนหุ้น คุณจะต้องทำรายการใหม่เพื่อทำสิ่งนี้
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
-DocType: Employee Loan,Repay from Salary,ชำระคืนจากเงินเดือน
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+DocType: Loan,Repay from Salary,ชำระคืนจากเงินเดือน
 DocType: Leave Application,LAP/,ตัก/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},ร้องขอการชำระเงินจาก {0} {1} สำหรับจำนวนเงิน {2}
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
@@ -5245,11 +5283,11 @@
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,กลุ่มรายการที่ซ้ำกันที่พบในตารางกลุ่มรายการ
 DocType: Land Unit,Parent Land Unit,หน่วยที่ดินปกครอง
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
 DocType: Fertilizer,Fertilizer Name,ชื่อปุ๋ย
 DocType: Salary Slip,Net Pay,จ่ายสุทธิ
 DocType: Cash Flow Mapping Accounts,Account,บัญชี
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
 ,Requested Items To Be Transferred,รายการที่ได้รับการร้องขอจะถูกถ่ายโอน
 DocType: Expense Claim,Vehicle Log,ยานพาหนะเข้าสู่ระบบ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),การมีไข้ (อุณหภูมิ&gt; 38.5 ° C / 101.3 ° F หรืออุณหภูมิคงที่&gt; 38 ° C / 100.4 ° F)
@@ -5290,24 +5328,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
 DocType: Asset Maintenance,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Invoice,Raw Materials Supplied,วัตถุดิบ
-DocType: C-Form,Series,ชุด
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},สกุลเงินของรายการราคา {0} ต้องเป็น {1} หรือ {2}
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
 DocType: Driver,License Number,ใบอนุญาตเลขที่
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,วัตถุประสงค์การเข้ามาบำรุงรักษา
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,ลงทะเบียนผู้ป่วยใบแจ้งหนี้
 DocType: Crop,Period,ระยะเวลา
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,บัญชีแยกประเภท
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},พนักงาน {0} ในทิ้งไว้บน {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},พนักงาน {0} ในทิ้งไว้บน {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ดูนำ
 DocType: Program Enrollment Tool,New Program,โปรแกรมใหม่
 DocType: Item Attribute Value,Attribute Value,ค่าแอตทริบิวต์
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 DocType: Salary Detail,Salary Detail,รายละเอียดเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 DocType: Appointment Type,Physician,แพทย์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,การให้คำปรึกษา
@@ -5315,15 +5352,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ต้องไม่เกินจำนวนที่วางแผนไว้ ({2}) ใน Work Order {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ใบบันทึกเวลาการผลิต
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ไม่ทั้งหมด
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ไม่สามารถเปลี่ยนแปลงคุณสมบัติ Variant ภายหลังการทำธุรกรรมหุ้น คุณจะต้องทำรายการใหม่เพื่อทำสิ่งนี้
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,mandate SEPA GoCardless
 DocType: Physician,Charges,ค่าใช้จ่าย
 DocType: Production Plan,Get Items For Work Order,รับสินค้าสำหรับสั่งทำงาน
 DocType: Salary Detail,Default Amount,จำนวนเงินที่เริ่มต้น
 DocType: Lab Test Template,Descriptive,พรรณนา
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,ไม่พบในโกดัง ระบบ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ไม่พบในโกดัง ระบบ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,ข้อมูลอย่างเดือนนี้
 DocType: Quality Inspection Reading,Quality Inspection Reading,การตรวจสอบคุณภาพการอ่าน
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,ตั้งเป้าหมายการขายที่คุณต้องการเพื่อให้ได้สำหรับ บริษัท ของคุณ
 ,Project wise Stock Tracking,หุ้นติดตามโครงการที่ชาญฉลาด
@@ -5351,11 +5389,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ไม่สามารถสร้างเว็บไซต์
 DocType: Soil Analysis,Mg/K,มก. / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,เก็บสต็อกสินค้าที่จัดเก็บไว้แล้วหรือไม่ได้ระบุจำนวนตัวอย่าง
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,เก็บสต็อกสินค้าที่จัดเก็บไว้แล้วหรือไม่ได้ระบุจำนวนตัวอย่าง
 DocType: Program,Program Abbreviation,ชื่อย่อโปรแกรม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
-DocType: Bank Guarantee,Start Date,วันที่เริ่มต้น
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,จัดสรร ใบ เป็นระยะเวลา
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,เช็คและเงินฝากล้างไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
@@ -5370,11 +5407,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ชั่วโมง
 DocType: Project,Expected Start Date,วันที่เริ่มต้นคาดว่า
 DocType: Purchase Invoice,04-Correction in Invoice,04- แก้ไขในใบแจ้งหนี้
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,สั่งซื้องานที่สร้างไว้แล้วสำหรับทุกรายการที่มี BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,สั่งซื้องานที่สร้างไว้แล้วสำหรับทุกรายการที่มี BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,รายงานรายละเอียดชุดค่าผสม
 DocType: Setup Progress Action,Setup Progress Action,ตั้งค่าความคืบหน้าการดำเนินการ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,รายการราคาซื้อ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,รายการราคาซื้อ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,ยกเลิกการสมัครสมาชิก
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,โปรดเลือกสถานะการซ่อมบำรุงเป็นเสร็จสิ้นหรือลบวันที่เสร็จสิ้น
 DocType: Supplier,Default Payment Terms Template,เทมเพลตเงื่อนไขการชำระเงินเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,สกุลเงินการทำธุรกรรมจะต้องเป็นเช่นเดียวกับการชำระเงินสกุลเงินเกตเวย์
@@ -5385,7 +5423,6 @@
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ดำเนินการหากสะสมเกินงบประมาณรายเดือน
-DocType: Subscription,Submit on creation,ส่งในการสร้าง
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
 DocType: Asset,Disposal Date,วันที่จำหน่าย
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",อีเมลจะถูกส่งไปยังพนักงานที่ใช้งานทั้งหมดของ บริษัท ในเวลาที่กำหนดหากพวกเขาไม่ได้มีวันหยุด บทสรุปของการตอบสนองจะถูกส่งในเวลาเที่ยงคืน
@@ -5404,6 +5441,7 @@
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Cheque Print Template,Cheque Print Template,แม่แบบการพิมพ์เช็ค
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,แผนภูมิของศูนย์ต้นทุน
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,จำนวนวันหลังจากวันที่ในใบแจ้งหนี้ล่วงเลยไปก่อนที่จะยกเลิกการสมัครรับข้อมูลหรือทำเครื่องหมายการสมัครรับข้อมูลเป็นแบบไม่ชำระเงิน
 DocType: Lab Test Template,Sample Collection,การเก็บตัวอย่าง
 ,Requested Items To Be Ordered,รายการที่ได้รับการร้องขอที่จะสั่งซื้อ
 DocType: Price List,Price List Name,ชื่อรายการราคา
@@ -5412,7 +5450,7 @@
 DocType: Account,Income,เงินได้
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,สิ่งที่ผิดพลาด!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Supplier Scorecard Scoring Criteria,Score,คะแนน
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,ปีงบประมาณ {0} ไม่อยู่
@@ -5432,12 +5470,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ควรเป็นค่าระหว่าง 0 ถึง 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,วันที่คิดค่าเสื่อมราคาต่อไปต้องไม่ถึงวันที่ที่พร้อมใช้งาน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
 DocType: Cost Center,Cost Center Name,ค่าใช้จ่ายชื่อศูนย์
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,แม็กซ์ชั่วโมงการทำงานกับ Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,วันที่กำหนด
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,ทั้งหมดที่จ่าย Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,ทั้งหมดที่จ่าย Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,ข้อความที่ยาวกว่า 160 ตัวอักษร จะถูกแบ่งออกเป็นหลายข้อความ
 DocType: Purchase Receipt Item,Received and Accepted,และได้รับการยอมรับ
 DocType: Hub Settings,Company and Seller Profile,ข้อมูล บริษัท และผู้ขาย
@@ -5451,10 +5489,9 @@
 DocType: Item,Variant Based On,ตัวแปรอยู่บนพื้นฐานของ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,ซัพพลายเออร์ ของคุณ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,โปรดแก้ไข
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 DocType: Request for Quotation Item,Supplier Part No,ผู้ผลิตชิ้นส่วน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,ไม่ระบุชื่อ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,ที่ได้รับจาก
 DocType: Lead,Converted,แปลง
@@ -5468,6 +5505,7 @@
 DocType: Asset,Assets,สินทรัพย์
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
+DocType: Subscription,Current Invoice End Date,วันที่สิ้นสุดใบแจ้งหนี้ปัจจุบัน
 DocType: Payment Term,Due Date Based On,Due Date Based On
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,โปรดตั้งกลุ่มลูกค้าและอาณาเขตที่เป็นค่าเริ่มต้นในการตั้งค่าการขาย
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,ไม่มี {0} {1} ในระบบ
@@ -5475,7 +5513,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,ไม่มีการชำระคืนที่เลือกสำหรับรายการบันทึก
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
+DocType: Loan,Disbursed,การเบิกจ่าย
 DocType: Healthcare Settings,Laboratory Settings,การตั้งค่าห้องปฏิบัติการ
 DocType: Patient Appointment,Service Unit,หน่วยบริการ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,ตั้งผู้จัดจำหน่ายสำเร็จแล้ว
@@ -5488,12 +5528,12 @@
 DocType: Share Balance,No of Shares,จำนวนหุ้น
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,เลือกสถานะ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: School House,House Name,ชื่อบ้าน
 DocType: Fee Schedule,Total Amount per Student,จำนวนเงินรวมต่อนักศึกษา
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,ไฟฟ้า
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,ไฟฟ้า
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,เพิ่มส่วนที่เหลือขององค์กรของคุณเป็นผู้ใช้ของคุณ นอกจากนี้คุณยังสามารถเพิ่มเชิญลูกค้าพอร์ทัลของคุณด้วยการเพิ่มจากรายชื่อ
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
 DocType: Grant Application,Requested Amount,จำนวนที่ขอ
@@ -5503,7 +5543,7 @@
 DocType: Crop Cycle,Detected Diseases,โรคที่ตรวจพบ
 DocType: Stock Entry,Default Source Warehouse,คลังสินค้าที่มาเริ่มต้น
 DocType: Item,Customer Code,รหัสลูกค้า
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 DocType: Asset Maintenance Task,Last Completion Date,วันที่เสร็จสมบูรณ์ล่าสุด
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
@@ -5511,9 +5551,10 @@
 DocType: GoCardless Settings,GoCardless Settings,การตั้งค่า GoCardless
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,สินทรัพย์ หุ้น
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,สินทรัพย์ หุ้น
 DocType: Restaurant,Active Menu,เมนูที่ใช้งานอยู่
 DocType: Target Detail,Target Qty,จำนวนเป้าหมาย
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},กับสินเชื่อ: {0}
 DocType: Shopping Cart Settings,Checkout Settings,การตั้งค่าเช็คเอาต์
 DocType: Student Attendance,Present,นำเสนอ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,หมายเหตุ การจัดส่ง {0} จะต้องไม่ถูก ส่งมา
@@ -5522,9 +5563,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
 DocType: Vehicle Log,Odometer,วัดระยะทาง
 DocType: Production Plan Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
 DocType: Chapter,Chapter Head,หัวหน้าบท
 DocType: Payment Term,Month(s) after the end of the invoice month,เดือนหลังจากสิ้นเดือนใบแจ้งหนี้
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,กิจกรรมของโครงการ / งาน
@@ -5532,11 +5573,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,สร้าง Slips เงินเดือน
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,datetime ผลลัพธ์ของห้องปฏิบัติการไม่สามารถเป็นได้ก่อนการทดสอบ datetime
 DocType: POS Profile,Allow user to edit Discount,อนุญาตให้ผู้ใช้แก้ไขส่วนลด
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,รับลูกค้าจาก
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,รับลูกค้าจาก
 DocType: Purchase Invoice Item,Include Exploded Items,รวมรายการที่ระเบิดแล้ว
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",ต้องเลือก การซื้อ ถ้าเลือก ใช้ได้กับ เป็น {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
 DocType: Shipping Rule,Restrict to Countries,จำกัด เฉพาะประเทศ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
 DocType: Sales Invoice Timesheet,Billing Hours,ชั่วโมงทำการเรียกเก็บเงิน
 DocType: Project,Total Sales Amount (via Sales Order),ยอดขายรวม (ผ่านใบสั่งขาย)
@@ -5555,6 +5597,7 @@
 DocType: Soil Texture,Sandy Clay,แซนดี้เคลย์
 DocType: Grant Application,Assessment  Manager,ผู้จัดการประเมินผล
 DocType: Payment Entry,Allocate Payment Amount,จัดสรรจำนวนเงินที่ชำระ
+DocType: Subscription Plan,Subscription Plan,แผนการสมัครสมาชิก
 DocType: Employee External Work History,Salary,เงินเดือน
 DocType: Serial No,Delivery Document Type,ประเภทเอกสารการจัดส่งสินค้า
 DocType: Sales Order,Partly Delivered,ส่งบางส่วน
@@ -5580,9 +5623,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,ช่วงสูงอายุ 2
 DocType: SG Creation Tool Course,Max Strength,ความแรงของแม็กซ์
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,การติดตั้งค่าที่ตั้งล่วงหน้า
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},ไม่ได้เลือกหมายเหตุการจัดส่งสำหรับลูกค้า {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},ไม่ได้เลือกหมายเหตุการจัดส่งสำหรับลูกค้า {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM แทนที่
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,เลือกรายการตามวันที่จัดส่ง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,เลือกรายการตามวันที่จัดส่ง
 DocType: Grant Application,Has any past Grant Record,มี Grant Record ที่ผ่านมา
 ,Sales Analytics,Analytics ขาย
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},ที่มีจำหน่าย {0}
@@ -5601,7 +5644,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,วัตถุดิบที่จำหน่ายค่าใช้จ่าย
 DocType: Selling Settings,Settings for Selling Module,การตั้งค่าสำหรับการขายโมดูล
 DocType: Hotel Room Reservation,Hotel Room Reservation,สำรองห้องพักในโรงแรม
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,บริการลูกค้า
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,บริการลูกค้า
 DocType: BOM,Thumbnail,รูปขนาดย่อ
 DocType: Item Customer Detail,Item Customer Detail,รายละเอียดรายการของลูกค้า
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ผู้สมัครเสนองาน
@@ -5618,7 +5661,7 @@
 DocType: Fees,Student Details,รายละเอียดของนักเรียน
 DocType: Purchase Invoice Item,Stock Qty,จำนวนหุ้น
 DocType: Purchase Invoice Item,Stock Qty,จำนวนหุ้น
-DocType: Employee Loan,Repayment Period in Months,ระยะเวลาชำระหนี้ในเดือน
+DocType: Loan,Repayment Period in Months,ระยะเวลาชำระหนี้ในเดือน
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
 DocType: Account,Equity,ส่วนของเจ้าของ
@@ -5627,7 +5670,7 @@
 DocType: Task,Closing Date,ปิดวันที่
 DocType: Sales Order Item,Produced Quantity,จำนวนที่ผลิต
 DocType: Timesheet,Work Detail,รายละเอียดการทำงาน
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,วิศวกร
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,วิศวกร
 DocType: Journal Entry,Total Amount Currency,รวมสกุลเงินจำนวนเงิน
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ค้นหาประกอบย่อย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
@@ -5673,13 +5716,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ข้อมูลประเภทผู้บริจาค
 DocType: Request for Quotation,Supplier Detail,รายละเอียดผู้จัดจำหน่าย
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},ข้อผิดพลาดในสูตรหรือเงื่อนไข: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,เกณฑ์น้ำหนักต้องเพิ่มได้ถึง 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,การดูแลรักษา
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,รายการที่แจ้ง
 DocType: BOM,Materials,วัสดุ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ถ้าไม่ได้ตรวจสอบรายชื่อจะต้องมีการเพิ่มแต่ละแผนกที่มันจะต้องมีการใช้
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},กำลังสร้าง {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ต้นทางและปลายทางคลังสินค้าไม่สามารถจะเหมือนกัน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,แม่แบบภาษี สำหรับการทำธุรกรรมการซื้อ
@@ -5703,14 +5745,14 @@
 DocType: Shipping Rule,Fixed,คงที่
 DocType: Vehicle Service,Clutch Plate,จานคลัทช์
 DocType: Company,Round Off Account,ปิดรอบบัญชี
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,การให้คำปรึกษา
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
-DocType: Journal Entry,Subscription,การสมัครสมาชิก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,การสมัครสมาชิก
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,การสร้างค่าธรรมเนียมที่รอดำเนินการ
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 DocType: Asset Category,Asset Category Name,สินทรัพย์ชื่อหมวดหมู่
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,นี่คือ ดินแดนของ รากและ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ชื่อใหม่คนขาย
@@ -5724,7 +5766,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
 DocType: Asset,Frequency of Depreciation (Months),ความถี่ของค่าเสื่อมราคา (เดือน)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,บัญชีเครดิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
@@ -5732,7 +5774,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
 DocType: Hub Settings,Company Logo,โลโก้ บริษัท
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 DocType: Healthcare Settings,Patient Registration,การลงทะเบียนผู้ป่วย
@@ -5767,11 +5809,10 @@
 DocType: Journal Entry,Total Debit,เดบิตรวม
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,เริ่มต้นโกดังสินค้าสำเร็จรูป
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,โปรดเลือกผู้ป่วย
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,พนักงานขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,พนักงานขาย
 DocType: Hotel Room Package,Amenities,สิ่งอำนวยความสะดวก
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,โหมดการชำระเงินเริ่มต้นหลายรูปแบบไม่ได้รับอนุญาต
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,สำหรับ
 ,Appointment Analytics,การแต่งตั้ง Analytics
 DocType: Vehicle Service,Half Yearly,ประจำปีครึ่ง
 DocType: Lead,Blog Subscriber,สมาชิกบล็อก
@@ -5788,6 +5829,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,เว้นว่างไว้ถ้าคุณทำกลุ่มนักเรียนต่อปี
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",ถ้าการตรวจสอบรวมกัน ของวันทําการจะรวมถึงวันหยุดและนี้จะช่วยลดค่าของเงินเดือนที่ต้องการต่อวัน
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",แอปที่ใช้คีย์ปัจจุบันจะไม่สามารถเข้าถึงได้คุณแน่ใจหรือ?
+DocType: Subscription Settings,Prorate,แบ่งสันปันส่วน
 DocType: Purchase Invoice,Total Advance,ล่วงหน้ารวม
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,เปลี่ยนรหัสเทมเพลต
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาจะต้องไม่เร็วกว่าระยะเวลาวันที่เริ่มต้น โปรดแก้ไขวันและลองอีกครั้ง
@@ -5799,8 +5841,9 @@
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 DocType: Cheque Print Template,Signatory Position,ตำแหน่งลงนาม
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,ตั้งเป็น ที่หายไป
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,ตั้งเป็น ที่หายไป
 DocType: Timesheet,Total Billable Hours,รวมเวลาที่เรียกเก็บเงิน
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,จำนวนวันที่สมาชิกต้องชำระเงินตามใบแจ้งหนี้ที่สร้างโดยการสมัครรับข้อมูลนี้
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ใบเสร็จรับเงินการชำระเงินหมายเหตุ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับลูกค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},แถว {0}: จัดสรร {1} &#39;จะต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ชำระเงินเข้า {2}
@@ -5819,12 +5862,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,นี้ขึ้นอยู่กับการเข้าร่วมของพนักงานนี้
 DocType: Assessment Result,Summary,สรุป
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,ทำเครื่องหมายการเข้าร่วม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,บัญชีเดบิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,รายการรายการสั่งซื้อของร้านอาหาร
@@ -5836,7 +5879,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ปริมาณการซื้อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ผลประโยชน์ของพนักงาน
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ผลประโยชน์ของพนักงาน
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Work Order,Manufactured Qty,จำนวนการผลิต
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},หุ้นไม่มีอยู่กับ {0}
@@ -5844,12 +5887,12 @@
 DocType: Asset,Out of Order,ชำรุด
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 DocType: Projects Settings,Ignore Workstation Time Overlap,ละเว้นเวิร์กสเตชัน Time Overlap
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: ไม่พบ {1}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,เลือกเลขแบทช์
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
 DocType: Patient Service Unit,Medical Administrator,ผู้ดูแลระบบทางการแพทย์
 DocType: Assessment Plan,Schedule,กำหนดการ
 DocType: Account,Parent Account,บัญชีผู้ปกครอง
@@ -5879,15 +5922,16 @@
 DocType: Asset Repair,Repair Status,สถานะการซ่อมแซม
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,รายการบันทึกบัญชี
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 DocType: POS Profile,Account for Change Amount,บัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: Purchase Invoice,input service,บริการอินพุต
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,สมาชิกทีมบำรุงรักษา
 DocType: Agriculture Analysis Criteria,Soil Analysis,การวิเคราะห์ดิน
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,รหัสรายวิชา:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
@@ -5936,19 +5980,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},การรับสมัครสำหรับ {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 DocType: Supplier Scorecard Scoring Variable,Variable Name,ชื่อตัวแปร
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
 DocType: Asset,Asset Category,ประเภทสินทรัพย์
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,จ่ายสุทธิ ไม่สามารถ ลบ
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,วัสดุในการจัดจำหน่าย
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,การวางแผนคำขอวัสดุ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,สรรพสามิตใบแจ้งหนี้
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,treshold {0}% ปรากฏมากกว่าหนึ่งครั้ง
 DocType: Expense Claim,Employees Email Id,Email รหัสพนักงาน
 DocType: Employee Attendance Tool,Marked Attendance,ผู้เข้าร่วมการทำเครื่องหมาย
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,หนี้สินหมุนเวียน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,หนี้สินหมุนเวียน
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,ตัวจับเวลาเกินชั่วโมงที่ระบุ
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,ส่ง SMS มวลการติดต่อของคุณ
 DocType: Patient,A Positive,เป็นบวก
@@ -5959,9 +6003,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ปัจจุบันมีสถานะ {1} Scorecard ของผู้จัดหาและใบสั่งซื้อของผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
 DocType: Asset Maintenance Team,Asset Maintenance Team,ทีมงานบำรุงรักษาสินทรัพย์
-DocType: Employee Loan,Loan Type,ประเภทเงินกู้
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} ถูกส่งเรียบร้อยแล้ว
+DocType: Loan,Loan Type,ประเภทเงินกู้
 DocType: Scheduling Tool,Scheduling Tool,เครื่องมือการตั้งเวลา
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,บัตรเครดิต
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ repacked
 DocType: Employee Education,Major/Optional Subjects,วิชาเอก / เสริม
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5993,7 +6038,7 @@
 DocType: Item,Units of Measure,หน่วยวัด
 DocType: Manufacturing Settings,Allow Production on Holidays,อนุญาตให้ผลิตในวันหยุด
 DocType: Sales Invoice,Customer's Purchase Order Date,วันที่สั่งซื้อของลูกค้าสั่งซื้อ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,ทุนหลักทรัพย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,ทุนหลักทรัพย์
 DocType: Shopping Cart Settings,Show Public Attachments,แสดงเอกสารแนบสาธารณะ
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
 DocType: Restaurant Reservation,Reservation Time,เวลาจอง
@@ -6008,7 +6053,7 @@
 DocType: Purchase Order,To Receive and Bill,การรับและบิล
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,แถว # {0}: คำแนะนำตามวันที่ไม่สามารถเป็นได้ก่อนวันที่ทำรายการ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,แนะนำผลิตภัณฑ์
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,นักออกแบบ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
 DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
@@ -6018,20 +6063,20 @@
 DocType: Driver,Expiry Date,วันหมดอายุ
 DocType: Healthcare Settings,Employee name and designation in print,ชื่อพนักงานและชื่อในการพิมพ์
 ,accounts-browser,บัญชีเบราว์เซอร์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ต้นแบบโครงการ
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ในการอนุญาตให้มากกว่าการเรียกเก็บเงินหรือการสั่งซื้ออัปเดต &quot;ค่าเผื่อ&quot; ในการตั้งค่าการแจ้งหรือรายการ
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(ครึ่งวัน)
 DocType: Payment Term,Credit Days,วันเครดิต
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,โปรดเลือกผู้ป่วยเพื่อรับการทดสอบ Lab
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,สร้างกลุ่มนักศึกษา
 DocType: Fee Schedule,FRQ.,ฟิลด์ความถี่สูงสุด
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,นำวันเวลา
 DocType: Cash Flow Mapping,Is Income Tax Expense,เป็นค่าใช้จ่ายภาษีเงินได้
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ตรวจสอบว่านักเรียนอาศัยอยู่ที่ Hostel ของสถาบันหรือไม่
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
 ,Stock Summary,แจ้งข้อมูลอย่างย่อ
@@ -6042,10 +6087,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref วันที่สมัคร
 DocType: Employee,Reason for Leaving,เหตุผลที่ลาออก
 DocType: BOM Operation,Operating Cost(Company Currency),ต้นทุนการดำเนินงาน ( บริษัท สกุล)
-DocType: Employee Loan Application,Rate of Interest,อัตราดอกเบี้ย
+DocType: Loan Application,Rate of Interest,อัตราดอกเบี้ย
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: Item,Shelf Life In Days,อายุการเก็บรักษาในวัน
 DocType: GL Entry,Is Opening,คือการเปิด
+DocType: Department,Expense Approvers,ผู้อนุมัติค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
 DocType: Journal Entry,Subscription Section,ส่วนการสมัครสมาชิก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,บัญชี {0} ไม่อยู่
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 44903f5..9c6b3e4 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -5,19 +5,16 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Değerlendirme Raporları
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Tüketici Ürünleri
-DocType: Purchase Receipt,Subscription Detail,Abonelik Ayrıntısı
 DocType: Supplier Scorecard,Notify Supplier,Tedarikçiye bildir
 DocType: Item,Customer Items,Müşteri Öğeler
 DocType: Project,Costing and Billing,Maliyet ve Faturalandırma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com için Öğe Yayınla
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-posta Bildirimleri
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-posta Bildirimleri
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Değerlendirme
 DocType: Item,Default Unit of Measure,Varsayılan Ölçü Birimi
 DocType: SMS Center,All Sales Partner Contact,Bütün Satış Ortağı İrtibatları
-DocType: Employee,Leave Approvers,İzin Onaylayanlar
+DocType: Department,Leave Approvers,İzin Onaylayanlar
 DocType: Sales Partner,Dealer,Satıcı
 DocType: Sales Partner,Dealer,Satıcı
 DocType: Work Order,WO-,WO-
@@ -36,9 +33,9 @@
 DocType: Patient Appointment,Check availability,Uygunluğu kontrol et
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Bu Bu Satıcıya karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Yasal
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Yasal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Gerçek tip vergi satırda Öğe fiyatına dahil edilemez {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Yasal
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Yasal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Gerçek tip vergi satırda Öğe fiyatına dahil edilemez {0}
 DocType: Bank Guarantee,Customer,Müşteri
 DocType: Bank Guarantee,Customer,Müşteri
 DocType: Purchase Receipt Item,Required By,Gerekli
@@ -51,11 +48,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Banka hesabı adı {0} olamaz
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kafaları (veya gruplar) kendisine karşı Muhasebe Girişler yapılır ve dengeler korunur.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,İşlemek için gönderilen Ücret Slipsi yok.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,İşlemek için gönderilen Ücret Slipsi yok.
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Açık olanları göster
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Yukarıda sözü edilen tekrarlanan olaylar için bu hareketi kendisi yapmak gerekiyor
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Seri Başarıyla güncellendi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Çıkış yapmak
 DocType: Pricing Rule,Apply On,Uygula
@@ -65,11 +61,10 @@
 DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi İrtibatları
 DocType: Support Settings,Support Settings,Destek Ayarları
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Toplu Öğe Bitiş Durumu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Banka Havalesi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Banka Havalesi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Banka poliçesi
 DocType: Membership,membership validaty section,üyelik validasyonu bölümü
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Şekli Hesabı
 DocType: Consultation,Consultation,konsültasyon
@@ -81,9 +76,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Web sitesi hazırlama
 DocType: Opening Invoice Creation Tool Item,Quantity,Miktar
 DocType: Opening Invoice Creation Tool Item,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Hesap Tablosu boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Krediler (Yükümlülükler)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Krediler (Yükümlülükler)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Hesap Tablosu boş olamaz.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Krediler (Yükümlülükler)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
 DocType: Item,Country of Origin,Menşei ülke
 DocType: Soil Texture,Soil Texture Criteria,Toprak Doku Kriterleri
@@ -91,7 +86,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Birincil İletişim Bilgileri
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Açık sorunlar
 DocType: Production Plan Item,Production Plan Item,Üretim Planı nesnesi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
 DocType: Lab Test Groups,Add new line,Yeni satır ekle
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sağlık hizmeti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sağlık hizmeti
@@ -102,7 +97,7 @@
 ,Delay Days,Gecikme günleri
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Fatura
+DocType: Subscription Invoice,Invoice,Fatura
 DocType: Purchase Invoice Item,Item Weight Details,Öğe Ağırlık Ayrıntılar
 DocType: Asset Maintenance Log,Periodicity,Periyodik olarak tekrarlanma
 DocType: Asset Maintenance Log,Periodicity,Periyodik olarak tekrarlanma
@@ -115,7 +110,7 @@
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Satır # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Satır # {0}:
 DocType: Timesheet,Total Costing Amount,Toplam Maliyet Tutarı
 DocType: Delivery Note,Vehicle No,Araç No
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Fiyat Listesi seçiniz
@@ -126,15 +121,14 @@
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,tarih seçiniz
 DocType: Daily Work Summary Group,Holiday List,Tatil Listesi
 DocType: Daily Work Summary Group,Holiday List,Tatil Listesi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Muhasebeci
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Muhasebeci
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Muhasebeci
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Muhasebeci
 DocType: Hub Settings,Selling Price List,Satış Fiyatı Listesi
 DocType: Patient,Tobacco Current Use,Tütün Mevcut Kullanımı
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Satış oranı
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Satış oranı
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Soil Analysis,(Ca+Mg)/K,"(Mg + Ca) / K,"
 DocType: Company,Phone No,Telefon No
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Yeni {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Gönderilen İlk E-posta Bildirimi
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 ,Sales Partners Commission,Satış Ortakları Komisyonu
@@ -146,18 +140,19 @@
 DocType: Asset,Value After Depreciation,Amortisman sonra değer
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,İlgili
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Seyirci tarih çalışanın katılmadan tarihten daha az olamaz
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Seyirci tarih çalışanın katılmadan tarihten daha az olamaz
 DocType: Grading Scale,Grading Scale Name,Not Verme Ölçeği Adı
-DocType: Subscription,Repeat on Day,Günde tekrarlayın
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Bu bir kök hesabıdır ve düzenlenemez.
 DocType: Sales Invoice,Company Address,şirket adresi
 DocType: BOM,Operations,Operasyonlar
 DocType: BOM,Operations,Operasyonlar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} için indirim temelinde yetki ayarlanamaz
+DocType: Subscription,Subscription Start Date,Abonelik Başlangıç Tarihi
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Iki sütun, eski adı diğeri yeni isim biriyle .csv dosya eklemek"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} Aktif mali dönem içinde değil.
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Deneme Süresi Bitiş Tarihi Deneme Süresi Başlangıç Tarihinden önce olamaz
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kilogram
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kilogram
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,İş Açılışı.
@@ -172,7 +167,7 @@
 DocType: Patient,Married,Evli
 DocType: Patient,Married,Evli
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Izin verilmez {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Öğeleri alın
 DocType: Price List,Price Not UOM Dependant,Fiyat UOM Bağımlı Değil
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Ürün {0}
@@ -206,12 +201,12 @@
 DocType: Vehicle Service,Brake Oil,Fren Yağı
 DocType: Tax Rule,Tax Type,Vergi Türü
 ,Completed Work Orders,Tamamlanmış İş Emri
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Vergilendirilebilir Tutar
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Vergilendirilebilir Tutar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
 DocType: BOM,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,"Sıra # {0}: Referans Belge Türü, Gider Talebi veya Günlük Girişi olmalıdır"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,seç BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,"Sıra # {0}: Referans Belge Türü, Gider Talebi veya Günlük Girişi olmalıdır"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,seç BOM
 DocType: SMS Log,SMS Log,SMS Kayıtları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Teslim Öğeler Maliyeti
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Çalışana verilen avans miktarını yönetin
@@ -227,21 +222,21 @@
 DocType: Delivery Trip,Delivery Notification,Teslim bildirimi
 DocType: Journal Entry,Opening Entry,Açılış Girdisi
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Hesabı yalnızca öde
-DocType: Employee Loan,Repay Over Number of Periods,Sürelerinin Üzeri sayısı Repay
+DocType: Loan,Repay Over Number of Periods,Sürelerinin Üzeri sayısı Repay
 DocType: Stock Entry,Additional Costs,Ek maliyetler
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Education Settings,Validate Batch for Students in Student Group,Öğrenci Topluluğundaki Öğrenciler İçin Toplu İşi Doğrula
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},çalışan için bulunamadı izin rekor {0} için {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},çalışan için bulunamadı izin rekor {0} için {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Lütfen ilk önce şirketi girin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,İlk Şirket seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,İlk Şirket seçiniz
 DocType: Employee Education,Under Graduate,Lisans
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Lütfen HR Ayarları&#39;nda Durum Bildirimi Bırakma için varsayılan şablonu ayarlayın.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Çalışan Kredi
 DocType: Fee Schedule,Send Payment Request Email,Ödeme Talebi E-postasını Gönder
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Gayrimenkul
@@ -265,22 +260,19 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Başarıyla kayıt dışı edildi.
 DocType: Assessment Result,Grade,sınıf
 DocType: Restaurant Table,No of Seats,Koltuk Sayısı
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",Dinamik konu eklemek için aşağıdaki gibi jinja etiketleri kullanın: <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: Asset Maintenance Task,Asset Maintenance Task,Varlık Bakımı Görevi
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Yıllık Gelir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Yıllık Gelir
 DocType: Daily Work Summary,Daily Work Summary,Günlük Çalışma Özeti
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} donduruldu
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stok Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Stok Giderleri
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stok Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Hedef Ambarı&#39;nı seçin
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Tercih İletişim Email giriniz
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Tercih İletişim Email giriniz
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Hesaba Alacak Girişi
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
@@ -301,7 +293,7 @@
 DocType: Customer,Primary Address,Birincil Adres
 DocType: Production Plan,Material Request Detail,Malzeme İstek Ayrıntısı
 DocType: Selling Settings,Default Quotation Validity Days,Varsayılan Teklif Geçerlilik Günleri
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
@@ -313,6 +305,7 @@
 DocType: Driver,Driving License Categories,Sürücü Belgesi Kategorileri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Lütfen Teslimat Tarihini Giriniz
 DocType: Depreciation Schedule,Make Depreciation Entry,Amortisman kaydı yap
+DocType: HR Settings,Leave Settings,Ayarları Bırak
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
@@ -321,22 +314,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS&#39;un kurulum modu (Çevrimiçi / Çevrimdışı)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,İş Emirlerine karşı zaman kayıtlarının oluşturulmasını devre dışı bırakır. İş emrine karşı operasyonlar izlenmez
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Yerine Getirme
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Operasyonların detayları gerçekleştirdi.
 DocType: Asset Maintenance Log,Maintenance Status,Bakım Durumu
 DocType: Asset Maintenance Log,Maintenance Status,Bakım Durumu
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Üyelik Detayları
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Borç hesabı {2} için tedarikçi tanımlanmalıdır
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Öğeler ve Fiyatlandırma
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Toplam saat: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Tarihten itibaren Mali yıl içinde olmalıdır Tarihten itibaren  = {0} varsayılır
 DocType: Drug Prescription,Interval,Aralık
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Tercih
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Tercih
 DocType: Grant Application,Individual,Bireysel
 DocType: Academic Term,Academics User,Akademik Kullanıcı
 DocType: Cheque Print Template,Amount In Figure,Miktar (Figür)
-DocType: Employee Loan Application,Loan Info,kredi Bilgisi
+DocType: Loan Application,Loan Info,kredi Bilgisi
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Bakım ziyaretleri planı
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tedarikçi Puan Kartı Dönemi
 DocType: Share Transfer,Share Transfer,Paylaşım Transferi
@@ -354,7 +348,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Öğe Şablonu
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,biokimya
 DocType: Job Offer,Select Terms and Conditions,Şartlar ve Koşulları Seç
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,out Değeri
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,out Değeri
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Ayarları
 DocType: Production Plan,Sales Orders,Satış Siparişleri
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
@@ -381,11 +375,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizyon
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizyon
 DocType: Work Order Operation,Updated via 'Time Log','Zaman Log' aracılığıyla Güncelleme
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Müşteri veya tedarikçiyi seçin.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Company,Enable Perpetual Inventory,Sürekli Envanteri Etkinleştir
+DocType: Bank Guarantee,Charges Incurred,Yapılan Ücretler
 DocType: Company,Default Payroll Payable Account,Standart Bordro Ödenecek Hesap
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,E-posta grubunu güncelle
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
@@ -410,7 +406,7 @@
 DocType: Lab Test,Custom Result,Özel Sonuç
 DocType: Delivery Stop,Contact Name,İletişim İsmi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Ders Değerlendirme Kriterleri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Vergi numarası:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Vergi numarası:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Öğrenci Kimliği:
 DocType: POS Customer Group,POS Customer Group,POS Müşteri Grubu
 DocType: Land Unit,Land Unit describing various land assets,Çeşitli arazi varlıklarını açıklayan Arazi Birimi
@@ -423,9 +419,8 @@
 ,Open Work Orders,İş Emirlerini Aç
 DocType: Payment Term,Credit Months,Kredi Ayları
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net Ücret az 0 olamaz
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Sistemden tekrar eden hata bildirimlerini göndermeyi durdurmak için, abonelikte Devre Dışı alanını işaretledik"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Yıl başına bırakır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Yıl başına bırakır
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
 DocType: Email Digest,Profit & Loss,Kar kaybı
@@ -434,9 +429,9 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Lütfen Öğrencileri Öğrenci Grupları Altına Kurun
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Banka Girişleri
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Banka Girişleri
 DocType: Crop,Annual,Yıllık
 DocType: Crop,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Mutabakat Kalemi
@@ -445,8 +440,8 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Öğrenci Grubu Oluşturma Aracı Kursu
 DocType: Lead,Do Not Contact,İrtibata Geçmeyin
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,kuruluşunuz öğretmek insanlar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Yazılım Geliştirici
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Yazılım Geliştirici
 DocType: Item,Minimum Order Qty,Minimum Sipariş Miktarı
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
@@ -456,9 +451,9 @@
 DocType: Item,Publish in Hub,Hub Yayınla
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Satın alma Detayları
@@ -499,9 +494,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maksimum Sınıf
 DocType: Email Digest,New Quotations,Yeni Fiyat Teklifleri
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Çalışan seçilen tercih edilen e-posta dayalı çalışana e-postalar maaş kayma
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,İlk kullanıcı sistem yöneticisi olacaktır (daha sonra değiştirebilirsiniz)
 DocType: Tax Rule,Shipping County,Kargo İlçe
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Öğrenin
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Öğrenin
 DocType: Asset,Next Depreciation Date,Bir sonraki değer kaybı tarihi
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Çalışan başına Etkinlik Maliyeti
 DocType: Accounts Settings,Settings for Accounts,Hesaplar için Ayarlar
@@ -511,7 +505,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Üstün Çekler ve temizlemek için Mevduat
 DocType: Item,Synced With Hub,Hub ile Senkronize
 DocType: Driver,Fleet Manager,Filo Yöneticisi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Satır # {0}: {1} öğe için negatif olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Satır # {0}: {1} öğe için negatif olamaz {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Yanlış Şifre
 DocType: Item,Variant Of,Of Varyant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
@@ -535,7 +529,7 @@
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Opening Invoice Creation Tool,Invoice Type,Fatura Türü
 DocType: Opening Invoice Creation Tool,Invoice Type,Fatura Türü
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,İrsaliye
 DocType: Consultation,Encounter Impression,Karşılaşma İzlenim
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Satılan Varlığın Maliyeti
@@ -564,11 +558,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ders Planlama Aracı
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Acil] yinelenen %s oluşturulurken hata oluştu (%s için)
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
 DocType: Land Unit,LInked Analysis,Soluk Analiz
 DocType: Item Tax,Tax Rate,Vergi Oranı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Başvuru süresi iki tahsis kaydı boyunca olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Başvuru süresi iki tahsis kaydı boyunca olamaz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
@@ -584,7 +577,7 @@
 DocType: Purchase Order,% Received,% Alındı
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Öğrenci Grupları Oluşturma
 DocType: Volunteer,Weekends,Hafta sonları
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredi Not Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredi Not Tutarı
 DocType: Setup Progress Action,Action Document,Eylem Belgesi
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Mamüller
@@ -601,6 +594,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demosu
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ürünler Ekle
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ürün Kalite Kontrol Parametreleri
+DocType: Leave Application,Leave Approver Name,Onaylayan Adı bırakın
 DocType: Depreciation Schedule,Schedule Date,Program Tarihi
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Kazanç, İndirim ve diğer Maaş bileşenleri"
 DocType: Packed Item,Packed Item,Paketli Ürün
@@ -622,7 +616,7 @@
 DocType: Request for Quotation,Request for Quotation,Fiyat Teklif Talebi
 DocType: Healthcare Settings,Require Lab Test Approval,Laboratuvar Testi Onayı Gerektirir
 DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Toplam Üstün
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Toplam Üstün
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
 DocType: Dosage Strength,Strength,kuvvet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Yeni müşteri oluştur
@@ -637,8 +631,8 @@
 DocType: Purchase Receipt,Vehicle Date,Araç Tarihi
 DocType: Student Log,Medical,Tıbbi
 DocType: Student Log,Medical,Tıbbi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Hesap Numarasını Güncelle
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Müşteri Aday Kaydı Sahibi Müşteri Adayı olamaz
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,"Ayrılmış miktar, ayarlanmamış miktardan büyük olamaz."
@@ -649,14 +643,12 @@
 DocType: Lab Test Template,Single,Bireysel
 DocType: Salary Slip,Total Loan Repayment,Toplam Kredi Geri Ödeme
 DocType: Account,Cost of Goods Sold,Satışların Maliyeti
-DocType: Subscription,Yearly,Yıllık
-DocType: Subscription,Yearly,Yıllık
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Maliyet Merkezi giriniz
 DocType: Drug Prescription,Dosage,Dozaj
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ort. Satış Oranı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Ort. Satış Oranı
 DocType: Assessment Plan,Examiner Name,sınav Adı
 DocType: Lab Test Template,No Result,Sonuç yok
 DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
@@ -666,6 +658,7 @@
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext kitapçığını okuyun
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Takvimde Tüm Bölüm Üyelerinin Yapraklarını Göster
 DocType: Purchase Invoice,01-Sales Return,01-Satış İadesi
 DocType: Account,Is Group,Is Grubu
 DocType: Email Digest,Pending Purchase Orders,Satınalma Siparişleri Bekleyen
@@ -684,13 +677,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Zorunlu alan - Akademik Yıl
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},"{0} {1}, {2} {3} ile ilişkili değil"
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"E-postanın bir parçası olarak giden giriş metnini özelleştirin, her işlemin ayrı giriş metni vardır"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Lütfen {0} şirketi için varsayılan ödenebilir hesabı ayarlayın.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Lütfen {0} şirketi için varsayılan ödenebilir hesabı ayarlayın.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},İşlem durdurulmuş iş emrine karşı izin verilmiyor {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Sayısı
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
@@ -718,8 +711,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,İkinci saklıdır
 DocType: Packing Slip,From Package No.,Ambalaj Numarasından.
 DocType: Item Attribute,To Range,Range
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Kendi değerleme yöntemine sahip olmayan bazı ürünlere karşı işlemler olduğu için değerleme yöntemini değiştiremezsiniz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Teminatlar ve Mevduatlar
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Kendi değerleme yöntemine sahip olmayan bazı ürünlere karşı işlemler olduğu için değerleme yöntemini değiştiremezsiniz
 DocType: Student Report Generation Tool,Attended by Parents,Ebeveynlerin Katıldığı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Patient,AB Positive,AB Pozitif
@@ -729,7 +722,7 @@
 DocType: Salary Structure,Salary Component for timesheet based payroll.,zaman çizelgesi tabanlı bordro için maaş Bileşeni.
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
-DocType: Employee Loan,Total Payment,Toplam ödeme
+DocType: Loan,Total Payment,Toplam ödeme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Tamamlanmış İş Emri için işlem iptal edilemez.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içinde) Operasyonlar Arası Zaman
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} iptal edildi, bu nedenle eylem tamamlanamadı"
@@ -745,18 +738,19 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Yeter Parçaları Build
 DocType: POS Profile User,POS Profile User,POS Profil Kullanıcıları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
+DocType: Subscription Invoice,Subscription Invoice,Abonelik Faturası
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Doğrudan Gelir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Doğrudan Gelir
 DocType: Patient Appointment,Date TIme,Tarih Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Şirket ve vergileri ayarlama
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,saat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Firma seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Firma seçiniz
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 DocType: Purchase Invoice,Supplier GSTIN,Tedarikçi GSTIN
@@ -786,6 +780,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
+DocType: Bank Guarantee,Providing,Sağlama
 DocType: Account,Profit and Loss,Kar ve Zarar
 DocType: Account,Profit and Loss,Kar ve Zarar
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","İzin verilmediğinde, Lab Test Şablonunu gerektiği gibi yapılandırın"
@@ -820,7 +815,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Territory,For reference,Referans için
 DocType: Healthcare Settings,Appointment Confirmation,Randevu onayı
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Kapanış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Kapanış (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Merhaba
@@ -852,11 +847,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","{1} kullanıcısı için {0} pos profilinde varsayılan olarak varsayılan değer ayarladınız, varsayılan olarak lütfen devre dışı bırakıldı"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Birikmiş Değerler
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profilinde Bölge Gerekiyor
 DocType: Supplier,Prevent RFQs,RFQ&#39;ları önle
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Satış Emri verin
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},{0} &#39;dan {1}&#39; e kadar dönem için gönderilen maaş kaydı
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},{0} &#39;dan {1}&#39; e kadar dönem için gönderilen maaş kaydı
 DocType: Project Task,Project Task,Proje Görevi
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
@@ -879,8 +874,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Nakliye Faturası Tarihi
 DocType: Production Plan,Production Plan,Üretim planı
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Fatura Yaratma Aracını Açma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Satış İade
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Satış İade
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Not: Toplam tahsis edilen yaprakları {0} zaten onaylanmış yaprakları daha az olmamalıdır {1} dönem için
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Seri No Girdisine Göre İşlemlerde Miktar Ayarla
 ,Total Stock Summary,Toplam Stok Özeti
 DocType: Announcement,Posted By,Tarafından gönderildi
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
@@ -894,7 +890,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Atama yapılan miktar negatif olamaz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lütfen şirketi ayarlayın.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Lütfen şirketi ayarlayın.
@@ -902,8 +898,8 @@
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Training Result Employee,Training Result Employee,Eğitim Sonucu Çalışan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
-DocType: Repayment Schedule,Principal Amount,Anapara tutarı
-DocType: Employee Loan Application,Total Payable Interest,Toplam Ödenecek faiz
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Anapara tutarı
+DocType: Loan Application,Total Payable Interest,Toplam Ödenecek faiz
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Toplam Üstün: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Satış Faturası Çizelgesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
@@ -912,11 +908,11 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Rezervasyonu
 DocType: Land Unit,Land Unit Name,Arazi Ünitesi Adı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Teklifi Yazma
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Teklifi Yazma
 DocType: Payment Entry Deduction,Payment Entry Deduction,Ödeme Giriş Kesintisi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Sarma
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Müşterileri e-postayla bilgilendirin
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Müşterileri e-postayla bilgilendirin
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Başka Satış Kişi {0} aynı Çalışan kimliği ile var
 DocType: Employee Advance,Claimed Amount,İddia Edilen Tutar
 apps/erpnext/erpnext/config/education.py +180,Masters,Alanlar
@@ -936,13 +932,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Ödeme Gateway Hesabı oluşturulmaz, el bir tane oluşturun lütfen."
 DocType: Supplier Scorecard,Per Year,Yıl başına
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Bu programda DOB&#39;a göre kabul edilmemek
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Sales Invoice,Sales Taxes and Charges,Satış Vergi ve Harçlar
 DocType: Employee,Organization Profile,Kuruluş Profili
 DocType: Vital Signs,Height (In Meter),Yükseklik (Metrede)
 DocType: Student,Sibling Details,kardeş Detaylar
 DocType: Vehicle Service,Vehicle Service,araç Servis
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Otomatik koşullarına dayalı geribildirim isteği tetikler.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Otomatik koşullarına dayalı geribildirim isteği tetikler.
 DocType: Employee,Reason for Resignation,İstifa Nedeni
 DocType: Employee,Reason for Resignation,İstifa Nedeni
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Performans değerlendirmeleri için şablon.
@@ -960,12 +955,11 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Envanter Net Değişim
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Çalışan Kredi Yönetimi
 DocType: Employee,Passport Number,Pasaport Numarası
 DocType: Employee,Passport Number,Pasaport Numarası
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ile İlişkisi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Yönetici
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Yönetici
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Yönetici
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Yönetici
 DocType: Payment Entry,Payment From / To,From / To Ödeme
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Lütfen deposunu {0} &#39;da hesaba koy
@@ -1013,26 +1007,25 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Için yol bulunamadı
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Açılış (Dr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Açılış (Dr)
+DocType: Loan,Applicant,Başvuru sahibi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Gönderme zamanı damgası {0}'dan sonra olmalıdır
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Yinelenen belgeleri yapmak için
 ,GST Itemised Purchase Register,GST&#39;ye göre Satın Alınan Kayıt
 DocType: Course Scheduling Tool,Reschedule,Yeniden Planlama
-DocType: Employee Loan,Total Interest Payable,Ödenecek Toplam Faiz
+DocType: Loan,Total Interest Payable,Ödenecek Toplam Faiz
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Indi Maliyet Vergiler ve Ücretler
 DocType: Work Order Operation,Actual Start Time,Gerçek Başlangıç Zamanı
 DocType: BOM Operation,Operation Time,Çalışma Süresi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Bitiş
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,baz
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,baz
 DocType: Timesheet,Total Billed Hours,Toplam Faturalı Saat
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Şüpheli Alacak Miktarı
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Şüpheli Alacak Miktarı
 DocType: Leave Block List Allow,Allow User,Kullanıcıya izin ver
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Company,Gain/Loss Account on Asset Disposal,Varlık Bertaraf karı / Zarar Hesabı
 DocType: Vehicle Log,Service Details,Hizmet Detayları
 DocType: Vehicle Log,Service Details,Hizmet Detayları
-DocType: Subscription,Quarterly,Üç ayda bir
-DocType: Subscription,Quarterly,Üç ayda bir
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,gruplanmış
 DocType: Selling Settings,Delivery Note Required,İrsaliye Gerekli
@@ -1044,7 +1037,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Mesai Kartı
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Hammaddeleri Dayalı
 DocType: Sales Invoice,Port Code,Liman Kodu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Depo Deposu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Depo Deposu
 DocType: Lead,Lead is an Organization,Kurşun bir Teşkilattır
 DocType: Guardian Interest,Interest,Faiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Ön satış
@@ -1058,14 +1051,14 @@
 DocType: Account,Accounts,Hesaplar
 DocType: Vehicle,Odometer Value (Last),Sayaç Değeri (Son)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Tedarikçi puan kartı kriterlerinin şablonları.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Pazarlama
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Ödeme giriş zaten yaratılır
 DocType: Request for Quotation,Get Suppliers,Tedarikçiler Al
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},"Satır {0}: Sabit Varlık {1}, {2} kalemiyle ilişkilendirilmiş değil"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Önizleme Maaş Kayma
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},"Satır {0}: Sabit Varlık {1}, {2} kalemiyle ilişkilendirilmiş değil"
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Önizleme Maaş Kayma
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Üyeliğinizin süresi 30 gün içinde dolarsa yenileyebilirsiniz
@@ -1075,7 +1068,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Yalnızca nakit Akış Eşleştiricisi belgelerinizi kurduysanız seçin
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Supplier Scorecard,Per Week,Haftada
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Toplam Öğrenci
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
@@ -1100,9 +1093,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredi Kartı Girişi
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Şirket ve Hesaplar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Değer
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Değer
 DocType: Asset Settings,Depreciation Options,Amortisman Seçenekleri
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Geçersiz Gönderme Süresi
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Geçersiz Gönderme Süresi
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Hotel Room,Capacity,Kapasite
@@ -1130,7 +1123,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numarası
 DocType: Budget,Budget Against,bütçe Karşı
 DocType: Employee,Cell Number,Hücre sayısı
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Verilen ölçütler için çalışan yok. Maaş Fişlerinin henüz oluşturulmadığını kontrol edin.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Verilen ölçütler için çalışan yok. Maaş Fişlerinin henüz oluşturulmadığını kontrol edin.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
@@ -1145,9 +1138,8 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Lütfen bir tablo seçin
 DocType: BOM,Website Specifications,Web Sitesi Özellikleri
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0}, &#39;Alıcılar&#39; bölümünde geçersiz bir e-posta adresidir"
 DocType: Special Test Items,Particulars,Ayrıntılar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 DocType: Student,A+,A+
@@ -1155,6 +1147,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
 DocType: Asset,Maintenance,Bakım
 DocType: Asset,Maintenance,Bakım
+DocType: Subscriber,Subscriber,Abone
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Lütfen Proje Durumunuzu Güncelleyin
 DocType: Item,Maximum sample quantity that can be retained,Tutulabilen maksimum numune miktarı
@@ -1212,29 +1205,29 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alışveriş Sepeti Varsayılan ayarları
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Timeslots ekle
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},"Varlık, Kayıt Girdisi {0} ile hurda edildi"
-DocType: Employee Loan,Interest Income Account,Faiz Gelir Hesabı
+DocType: Loan,Interest Income Account,Faiz Gelir Hesabı
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Gönderilen Davetiyeyi İnceleme
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biyoteknoloji
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biyoteknoloji
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Ofis Bakım Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Ofis Bakım Giderleri
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Gidin
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-posta Hesabı Oluşturma
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Ürün Kodu girin
 DocType: Asset Repair,Downtime,Kesinti
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademik Dönem:
 DocType: Salary Detail,Do not include in total,Toplamda yer almama
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},"Örnek miktarı {0}, alınan miktardan {1} fazla olamaz."
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Fiyat Listesi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Fiyat Listesi seçilmemiş
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 DocType: Item,Max Sample Quantity,Maksimum Numune Miktarı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,İzin yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,İzin yok
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Alıntı İstek İsteği
 DocType: Vital Signs,Heart Rate / Pulse,Nabız / Darbe
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -1247,13 +1240,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratuar Testleri ve Hayati İşaretler
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Mutabakat Ayrıntısı
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Çalışan bulunmadı
-DocType: Subscription,Stopped,Durduruldu
-DocType: Subscription,Stopped,Durduruldu
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Proje Güncelleme.
 DocType: SMS Center,All Customer Contact,Bütün Müşteri İrtibatları
 DocType: Land Unit,Tree Details,ağaç Detayları
@@ -1305,7 +1296,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Yoklamayı İçe Aktar
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Bütün Ürün Grupları
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Work Order,Item To Manufacture,Üretilecek Ürün
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} durum {2} olduğu
@@ -1320,7 +1310,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",Seçilen adres kaydedildikten sonra değiştirilirse yeniden seç
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 DocType: Item,Hub Publishing Details,Hub Yayınlama Ayrıntıları
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&#39;Açılış&#39;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&#39;Açılış&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do Aç
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
 DocType: Lab Test Template,Result Format,Sonuç Biçimi
@@ -1331,8 +1321,8 @@
 DocType: Payroll Entry,Bimonthly,İki ayda bir
 DocType: Vehicle Service,Brake Pad,Fren pedalı
 DocType: Fertilizer,Fertilizer Contents,Gübre İçeriği
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Araştırma ve Geliştirme
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Araştırma ve Geliştirme
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Faturalanacak Tutar
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Company,Registration Details,Kayıt Detayları
@@ -1349,7 +1339,7 @@
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Performans değerlendirme.
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Performans değerlendirme.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Etkinleştirme Alışveriş Sepeti etkin olarak, &#39;Alışveriş Sepeti için kullan&#39; ve Alışveriş Sepeti için en az bir vergi Kural olmalıdır"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ödeme giriş {0} Sipariş, bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol karşı bağlantılıdır."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ödeme giriş {0} Sipariş, bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol karşı bağlantılıdır."
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Satış Noktası
@@ -1386,7 +1376,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimum Oturma
 DocType: Item Attribute,Item Attribute Values,Ürün Özellik Değerler
 DocType: Examination Result,Examination Result,Sınav Sonucu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Satın Alma İrsaliyesi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Satın Alma İrsaliyesi
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Ana Döviz Kuru.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Referans Doctype biri olmalı {0}
@@ -1394,15 +1384,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Work Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Hayır Öğeler transfer için kullanılabilir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Hayır Öğeler transfer için kullanılabilir
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Kapanış (Açılış + Toplam)
 DocType: Journal Entry,Depreciation Entry,Amortisman kayıt
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Bu Bakım Ziyaretini iptal etmeden önce Malzeme Ziyareti {0} iptal edin
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standardı
 DocType: Pricing Rule,Rate or Discount,Oran veya İndirim
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seri No {0} Ürün {1} e ait değil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Seri No {0} Ürün {1} e ait değil
 DocType: Purchase Receipt Item Supplied,Required Qty,Gerekli Adet
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Favoriler
 DocType: Hub Settings,Custom Data,Özel veri
@@ -1415,9 +1405,9 @@
 DocType: Medical Code,Medical Code Standard,Tıbbi Kod Standardı
 DocType: Soil Texture,Clay Composition (%),Kil Kompozisyonu (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Görev atamadan önce lütfen kaydedin.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Denge Değeri
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Denge Değeri
 DocType: Lab Test,Lab Technician,Laboratuvar teknisyeni
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Satış Fiyat Listesi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Satış Fiyat Listesi
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","İşaretlenirse, Hasta ile eşleştirilen bir müşteri oluşturulur. Bu Müşteri&#39;ye karşı hasta faturaları oluşturulacaktır. Hasta oluşturulurken mevcut Müşteri&#39;yi seçebilirsiniz."
 DocType: Bank Reconciliation,Account Currency,Hesabın Döviz Cinsi
@@ -1426,17 +1416,15 @@
 DocType: Purchase Receipt,Range,Aralık
 DocType: Purchase Receipt,Range,Aralık
 DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Fee Structure,Components,Bileşenler
 DocType: Item Barcode,Item Barcode,Ürün Barkodu
 DocType: Item Barcode,Item Barcode,Ürün Barkodu
 DocType: Woocommerce Settings,Endpoints,Endpoints
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","oluşturulacak. Gecikmeli ise, bunun &quot;Ayın Gününde Tekrarla&quot; alanını manuel olarak değiştirmeniz gerekecek"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
 DocType: Share Transfer,From Folio No,Folio No&#39;dan
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
@@ -1473,17 +1461,18 @@
 DocType: Asset,Available-for-use Date,Kullanıma Hazır Tarih
 DocType: Guardian,Guardian Name,Muhafız adı
 DocType: Cheque Print Template,Has Print Format,Baskı Biçimi vardır
-DocType: Employee Loan,Sanctioned,onaylanmış
+DocType: Loan,Sanctioned,onaylanmış
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Döviz kur kayıdının yaratılamadığı hesap
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz
 DocType: Crop Cycle,Crop Cycle,Mahsul Çevrimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;Ürün Bundle&#39; öğeler, Depo, Seri No ve Toplu No &#39;Ambalaj Listesi&#39; tablodan kabul edilecektir. Depo ve Toplu Hayır herhangi bir &#39;Ürün Bundle&#39; öğe için tüm ambalaj öğeler için aynı ise, bu değerler ana Öğe tabloda girilebilir, değerler tablosu &#39;Listesi Ambalaj&#39; kopyalanacaktır."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;Ürün Bundle&#39; öğeler, Depo, Seri No ve Toplu No &#39;Ambalaj Listesi&#39; tablodan kabul edilecektir. Depo ve Toplu Hayır herhangi bir &#39;Ürün Bundle&#39; öğe için tüm ambalaj öğeler için aynı ise, bu değerler ana Öğe tabloda girilebilir, değerler tablosu &#39;Listesi Ambalaj&#39; kopyalanacaktır."
 DocType: Student Admission,Publish on website,Web sitesinde yayımlamak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,"Tedarikçi Fatura Tarihi, postalama tarihinden büyük olamaz"
+DocType: Subscription,Cancelation Date,İptal Tarihi
 DocType: Purchase Invoice Item,Purchase Order Item,Satınalma Siparişi Ürünleri
 DocType: Agriculture Task,Agriculture Task,Tarım Görevi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dolaylı Gelir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Dolaylı Gelir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Dolaylı Gelir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Dolaylı Gelir
 DocType: Student Attendance Tool,Student Attendance Tool,Öğrenci Devam Aracı
 DocType: Restaurant Menu,Price List (Auto created),Fiyat Listesi (Otomatik oluşturuldu)
 DocType: Cheque Print Template,Date Settings,Tarih Ayarları
@@ -1514,6 +1503,7 @@
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,"Laboratuvar testi tarih saati, toplama tarihinden önce olamaz"
+DocType: Subscription Plan,Cost,Maliyet
 DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Doğumgünü Hatırlatmalarını gönderme
 DocType: Expense Claim,Total Advance Amount,Toplam Avans Tutarı
 DocType: Delivery Stop,Estimated Arrival,tahmini varış
@@ -1525,15 +1515,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
 DocType: Timesheet Detail,Bill,Fatura
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Beyaz
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Müşteri Adayları (Açık)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Satır {0}: için Adet mevcut değil {4} depoda {1} giriş saati gönderme de ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Onay kutuları listesinden yalnızca en fazla bir seçenek seçebilirsiniz.
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
 DocType: Item,Automatically Create New Batch,Otomatik olarak Yeni Toplu Oluştur
 DocType: Item,Automatically Create New Batch,Otomatik olarak Yeni Toplu Oluştur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{1} (satır {2}) &#39;e {0} atama
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Oluştur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{1} (satır {2}) &#39;e {0} atama
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Oluştur
 DocType: Student Admission,Admission Start Date,Kabul Başlangıç Tarihi
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Yeni çalışan
@@ -1550,7 +1540,7 @@
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Repayment Schedule,Balance Loan Amount,Bakiye Kredi Miktarı
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Program Ders
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Stok Seçenekleri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Stok Seçenekleri
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Satın Alma Siparişinde Son Satın Alma Ayrıntılarını Getirmeyi Devre Dışı Bırak
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
@@ -1571,11 +1561,12 @@
 DocType: Purchase Invoice,Cash/Bank Account,Kasa / Banka Hesabı
 DocType: Purchase Invoice,Cash/Bank Account,Kasa / Banka Hesabı
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Lütfen belirtin a {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Varyant oluşturma işlemi sıraya alındı.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} için iş özeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Özellik tablosu zorunludur
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,"Listedeki ilk İzin Verici, varsayılan İzin Verme Onaylayıcı olarak ayarlanır."
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Plan,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} negatif olamaz
@@ -1590,7 +1581,7 @@
 DocType: Asset Maintenance,Maintenance Manager Name,Bakım Yöneticisi Adı
 DocType: Agriculture Task,Urgent,Acil
 DocType: Agriculture Task,Urgent,Acil
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Tablodaki satır {0} için geçerli Satır kimliği belirtiniz {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Tablodaki satır {0} için geçerli Satır kimliği belirtiniz {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Değişken bulunamadı:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Lütfen numpad&#39;den düzenlemek için bir alan seçin
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Stok Defteri oluşturulduğunda sabit bir varlık kalemi olamaz.
@@ -1602,7 +1593,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Kalite Kontrol Şablonu Adı
 DocType: Project,First Email,İlk e-posta
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Satış Tutarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Satış Tutarı
 DocType: Repayment Schedule,Interest Amount,Faiz Tutarı
 DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
 DocType: Share Transfer,Issue,Sayı
@@ -1617,11 +1608,11 @@
 DocType: Tax Rule,Shipping State,Nakliye Devlet
 ,Projected Quantity as Source,Kaynak olarak Öngörülen Miktarı
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Teslimat Gezisi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Teslimat Gezisi
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Aktarım Türü
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Satış Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Satış Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Satış Giderleri
 DocType: Consultation,Diagnosis,tanı
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart Satın Alma
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart Satın Alma
@@ -1633,13 +1624,14 @@
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Posta Kodu
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Satış Sipariş {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},{0} kredisinde faiz gelir hesabını seçin
 DocType: Opportunity,Contact Info,İletişim Bilgileri
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Stok Girişleri Yapımı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık Ölçü Birimi
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üretim Ödeneği Yüzde üzerinde
-DocType: Employee Loan,Repayment Schedule,Geri Ödeme Plan
+DocType: Loan,Repayment Schedule,Geri Ödeme Plan
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kargo Kural Şartları
 DocType: Holiday List,Get Weekly Off Dates,Haftalık Hesap Kesim tarihlerini alın
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
@@ -1655,7 +1647,7 @@
 DocType: Education Settings,Attendance Freeze Date,Seyirci Dondurma Tarihi
 DocType: Education Settings,Attendance Freeze Date,Seyirci Dondurma Tarihi
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Tüm Ürünleri görüntüle
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Tüm Ürünleri görüntüle
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum Müşteri Aday Kaydı Yaşı (Gün)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimum Müşteri Aday Kaydı Yaşı (Gün)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Tüm malzeme listeleri
@@ -1664,8 +1656,9 @@
 DocType: Expense Claim,From Employee,Çalışanlardan
 DocType: Driver,Cellphone Number,cep telefonu numarası
 DocType: Project,Monitor Progress,İzleme İlerlemesi
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
 DocType: Journal Entry,Make Difference Entry,Fark Girişi yapın
+DocType: Supplier Quotation,Auto Repeat Section,Otomatik Tekrar Bölümü
 DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım
 DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı
 DocType: Program Enrollment,Transportation,Taşıma
@@ -1673,6 +1666,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,geçersiz Özellik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} teslim edilmelidir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Miktara göre daha az veya ona eşit olmalıdır {0}
+DocType: Department Approver,Department Approver,Bölüm Onaycısı
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: Employee Advance,Claimed,İddia Edilen
@@ -1683,6 +1677,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Ödeme Mutabakat Faturası
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Katkı%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Satın Alma Siparişi Gereklise Satın Alma Ayarlarına göre == &#39;EVET&#39;, ardından Satın Alma Faturası oluşturmak için kullanıcı {0} öğesi için önce Satın Alma Siparişi yaratmalıdır."
+,HSN-wise-summary of outward supplies,Dışa açık malzemelerin HSN-bilge özeti
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Referans için şirket kayıt numaraları. Vergi numaraları vb
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
@@ -1697,7 +1692,7 @@
 DocType: Setup Progress Action,Action Name,İşlem Adı
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Başlangıç yılı
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN&#39;in ilk 2 hanesi {0} durum numarasıyla eşleşmelidir.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Cari fatura döneminin Başlangıç tarihi
 DocType: Salary Slip,Leave Without Pay,Ücretsiz İzin
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Kapasite Planlama Hatası
@@ -1711,35 +1706,35 @@
 ,GST Sales Register,GST Satış Kaydı
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Talep edecek bir şey yok
-apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Alan adlarınızı seçin
+apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Çalışma alanlarınızı seçin
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Başka bir bütçe rekoru &#39;{0}&#39; zaten karşı var {1} &#39;{2}&#39; mali yıl için {3}
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Alanlar yalnızca oluşturulma anında kopyalanır.
-DocType: Setup Progress Action,Domains,Alanlar
+DocType: Setup Progress Action,Domains,Çalışma Alanları
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Yönetim
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Yönetim
 DocType: Cheque Print Template,Payer Settings,ödeyici Ayarları
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
 DocType: Purchase Invoice,Is Return,İade mi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Dikkat
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',"Başlangıç günü, &#39;{0}&#39; görevi bitiş günden daha büyük"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,İade / Borç Dekontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,İade / Borç Dekontu
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
 DocType: Item,UOMs,Ölçü Birimleri
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
 DocType: Purchase Invoice Item,UOM Conversion Factor,Ölçü Birimi Dönüşüm Katsayısı
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Toplu Numarası almak için Ürün Kodu giriniz
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
-DocType: Employee Loan,Partially Disbursed,Kısmen dönemlerde toplanan
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Bilgi verin.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Bilgi verin.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tedarikçi Veritabanı.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,İptal edilmeyen bir Aboneliği başlatamazsınız.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
 DocType: Fee Validity,Valid Till,Kadar geçerli
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Toplam Veliler Öğretmen Toplantısı
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
@@ -1753,7 +1748,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Seçilen Müşteri için Müşteri Grubunu değiştirmeye izin verilmiyor.
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Tahmini varış zamanları güncelleniyor.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Tahmini varış zamanları güncelleniyor.
 DocType: Program Enrollment Tool,Enrollment Details,Kayıt Ayrıntıları
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Lütfen bir müşteri seçin
@@ -1777,20 +1772,22 @@
 DocType: Purchase Order,Group same items,Grup aynı öğeleri
 DocType: Purchase Invoice,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Purchase Invoice,Disable Rounded Total,Yuvarlak toplam devre dışı
-DocType: Employee Loan Application,Repayment Info,Geri Ödeme Bilgisi
+DocType: Department,Parent Department,Ana Bölüm
+DocType: Loan Application,Repayment Info,Geri Ödeme Bilgisi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Girdiler' boş olamaz
 DocType: Maintenance Team Member,Maintenance Role,Bakım Rolü
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Çalışanlar kurma
 DocType: Sales Order,SO-,YANİ-
 DocType: Hotel Room Reservation,Hotel Reservation User,Otel Rezervasyonu Kullanıcısı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Önce Ön ek seçiniz
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Araştırma
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Araştırma
+DocType: Subscription Settings,Subscription Settings,Abonelik ayarları
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Araştırma
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Nitelikler masada en az bir özellik belirtin
 DocType: Announcement,All Students,Tüm Öğrenciler
@@ -1802,20 +1799,20 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 DocType: Crop Cycle,Less than a year,Bir yıldan daha az
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Öğrenci Mobil No
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 DocType: Crop,Yield UOM,Verim UOM
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
 DocType: Item,Is Item from Hub,Hub&#39;dan Öğe Var mı
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Satır {0}: Etkinlik Türü zorunludur.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Temettü Ücretli
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Temettü Ücretli
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Muhasebe Defteri
 DocType: Stock Reconciliation,Difference Amount,Fark Tutarı
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},{0} tarihinde {1} tarihinde Bırakın
 DocType: Purchase Invoice,Reverse Charge,Geri tepki
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Dağıtılmamış Karlar
-DocType: Purchase Invoice,05-Change in POS,05-POS&#39;da Değişim
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Dağıtılmamış Karlar
+DocType: Purchase Invoice,05-Change in POS,05-POS Değişimi
 DocType: Vehicle Log,Service Detail,hizmet Detayı
 DocType: BOM,Item Description,Ürün Tanımı
 DocType: Student Sibling,Student Sibling,Öğrenci Kardeş
@@ -1829,13 +1826,13 @@
 DocType: Opportunity Item,Opportunity Item,Fırsat Ürünü
 ,Student and Guardian Contact Details,Öğrenci ve Guardian İletişim Bilgileri
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Satır {0}: tedarikçisi için {0} E-posta Adresi e-posta göndermek için gereklidir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Geçici Açma
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Geçici Açma
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Gösteri Merkezi
 ,Employee Leave Balance,Çalışanın Kalan İzni
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 DocType: Patient Appointment,More Info,Daha Fazla Bilgi
 DocType: Patient Appointment,More Info,Daha Fazla Bilgi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
 DocType: Supplier Scorecard,Scorecard Actions,Kart Kartı İşlemleri
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Örnek: Bilgisayar Bilimleri Yüksek Lisans
 DocType: Purchase Invoice,Rejected Warehouse,Reddedilen Depo
@@ -1847,7 +1844,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,için
 DocType: Supplier Quotation Item,Lead Time in days,Teslim Zamanı gün olarak
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Ödeme Hesabı Özeti
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},için {0} maaş ödeme {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},için {0} maaş ödeme {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
@@ -1856,9 +1853,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Testi Reçeteleri
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Küçük
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Küçük
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Açılış Fatura Oluşturma Aracı Öğe
 DocType: Education Settings,Employee Number,Çalışan sayısı
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Grace Döneminden Sonra Fatura İptal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
 DocType: Project,% Completed,% Tamamlanan
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
@@ -1873,8 +1871,8 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratuvar Testi Datetime
 DocType: Email Digest,Add Quote,Alıntı ekle
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi dönüştürme katsayısı gereklidir.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Dolaylı Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Dolaylı Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Dolaylı Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 DocType: Agriculture Analysis Criteria,Agriculture,Tarım
@@ -1910,18 +1908,19 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Sermaye Ekipmanları
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Lütfen Önce Öğe Kodunu ayarlayın
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
+DocType: Subscription Plan,Billing Interval Count,Faturalama Aralığı Sayısı
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 DocType: Antibiotic,Antibiotic,Antibiyotik
 ,Team Updates,Ekip Güncellemeleri
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Tedarikçi İçin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hesap Türünü ayarlamak işlemlerde bu hesabı seçeren yardımcı olur
 DocType: Purchase Invoice,Grand Total (Company Currency),Genel Toplam (ޞirket para birimi)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Baskı Biçimi oluştur
@@ -1950,7 +1949,7 @@
 DocType: POS Item Group,POS Item Group,POS Ürün Grubu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,"Alternatif öğe, ürün koduyla aynı olmamalıdır"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Ürün Ağacı {0} {1} Kalemine ait değil
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Ürün Ağacı {0} {1} Kalemine ait değil
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06- Geçici değerlendirme sonuçlandırması
 DocType: Salary Slip,Bank Account No.,Banka Hesap No
@@ -1968,8 +1967,8 @@
 DocType: BOM Operation,Workstation,İş İstasyonu
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fiyat Teklif Talebi Tedarikçisi
 DocType: Healthcare Settings,Registration Message,Kayıt Mesajı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Donanım
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Donanım
 DocType: Prescription Dosage,Prescription Dosage,Reçeteli Dozaj
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
@@ -2004,20 +2003,20 @@
 DocType: Project,Start and End Dates,Başlangıç ve Tarihler End
 ,Delivered Items To Be Billed,Faturalanacak Teslim edilen Ürünler
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Açık BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Project Update,Great/Quickly,Büyük / Çabuk
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Birim
 DocType: Rename Tool,Utilities,Programlar
 DocType: POS Profile,Accounting,Muhasebe
 DocType: POS Profile,Accounting,Muhasebe
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Toplanan öğe için lütfen toplu seç
 DocType: Asset,Depreciation Schedules,Amortisman Çizelgeleri
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST Ayarları&#39;nda aşağıdaki hesaplar seçilebilir:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST Ayarları&#39;nda aşağıdaki hesaplar seçilebilir:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
 DocType: Payment Request,Transaction Currency,İşlem Döviz
@@ -2031,6 +2030,7 @@
 DocType: POS Profile,Campaign,Kampanya
 DocType: POS Profile,Campaign,Kampanya
 DocType: Supplier,Name and Type,Adı ve Türü
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Onay Durumu 'Onaylandı' veya 'Reddedildi' olmalıdır
 DocType: Physician,Contacts and Address,Kişiler ve Adres
 DocType: Purchase Invoice,Contact Person,İrtibat Kişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
@@ -2048,7 +2048,7 @@
 DocType: Student Admission,Eligibility and Details,Uygunluk ve Ayrıntılar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Sabit Varlık Net Değişim
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
@@ -2056,12 +2056,13 @@
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Iletişim günlüğü.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Teklif Talebi daha fazla onay portalı ayarları için, portaldan erişim devre dışı bırakılır."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tedarikçi Puan Kartı Değişken Skorlama
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Alım Miktarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Alım Miktarı
 DocType: Sales Invoice,Shipping Address Name,Teslimat Adresi İsmi
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ders Programı Oluşturma Hataları Oluştu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Listedeki ilk Gider Onaycısı varsayılan Gider Onaylayıcı olarak ayarlanacaktır.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 'den daha büyük olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Detail,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
@@ -2086,15 +2087,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Çırak
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Çırak
 DocType: Purchase Invoice,Company GSTIN,Şirket GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Negatif Miktara izin verilmez
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatif Miktara izin verilmez
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Bir dize olarak madde ustadan getirilen ve bu alanda depolanan vergi detay tablo.
  Vergi ve Ücretleri için kullanılır"
 DocType: Supplier Scorecard Period,SSC-,SSc
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
 DocType: Email Digest,Bank Balance,Banka Bakiyesi
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,İzin Verme Başvurusunu Tamamlama Zorunlu Bırakın
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
@@ -2126,18 +2128,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"{0} Satırındaki Ödeme Süresi, muhtemelen bir kopyadır."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Tarım (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Ambalaj Makbuzu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ofis Kiraları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ofis Kiraları
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Ambalaj Makbuzu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 DocType: Disease,Common Name,Yaygın isim
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,İçe Aktarma Başarısız!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
 DocType: Vital Signs,Blood Pressure,Kan basıncı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analist
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Analist
 DocType: Item,Inventory,Stok
 DocType: Item,Sales Details,Satış Ayrıntılar
 DocType: Quality Inspection,QI-,QI-
@@ -2147,17 +2149,17 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Kayıtlı Dersi Öğrenci Grubu Öğrencileri için Doğrula
 DocType: Notification Control,Expense Claim Rejected,Gider Talebi Reddedildi
 DocType: Item,Item Attribute,Ürün Özellik
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Devlet
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Devlet
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Gider Talep {0} zaten Araç giriş için var
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Kurum İsmi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,geri ödeme miktarı giriniz
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,geri ödeme miktarı giriniz
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Öğe Türevleri
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Servisler
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Servisler
 DocType: HR Settings,Email Salary Slip to Employee,Çalışan e-posta Maaş Kayma
 DocType: Cost Center,Parent Cost Center,Ana Maliyet Merkezi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Olası Tedarikçi seçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Olası Tedarikçi seçin
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
 DocType: Customer,"Select, to make the customer searchable with these fields",Müşteriyi bu alanlarla aranabilir yapmak için seçin
@@ -2177,7 +2179,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Yatırım Nakit Akışı
 DocType: Program Course,Program Course,programı Ders
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Homepage,Company Tagline for website homepage,web sitesinin ana Company Slogan
 DocType: Item Group,Item Group Name,Ürün Grup Adı
 DocType: Item Group,Item Group Name,Ürün Grup Adı
@@ -2209,10 +2211,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership Detayları
 DocType: Leave Block List,Block Holidays on important days.,Önemli günlerde Blok Tatil.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Lütfen bütün gerekli değerleri giriniz.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Alacak Hesapları Özeti
-DocType: Employee Loan,Monthly Repayment Amount,Aylık Geri Ödeme Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Alacak Hesapları Özeti
+DocType: Loan,Monthly Repayment Amount,Aylık Geri Ödeme Tutarı
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Faturaları Açma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
 DocType: UOM,UOM Name,Ölçü Birimi
 DocType: GST HSN Code,HSN Code,HSN Kodu
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Katkı Tutarı
@@ -2236,7 +2238,8 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kutu
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kutu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Olası Tedarikçi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Olası Tedarikçi
+DocType: Journal Entry,JV-RET-,JV-ret
 DocType: Budget,Monthly Distribution,Aylık Dağılımı
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Alıcı listesi boş. Alıcı listesi oluşturunuz
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sağlık (beta)
@@ -2268,7 +2271,7 @@
 DocType: Shipping Rule Condition,From Value,Değerden
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-DocType: Employee Loan,Repayment Method,Geri Ödeme Yöntemi
+DocType: Loan,Repayment Method,Geri Ödeme Yöntemi
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Seçili ise, Ana sayfa web sitesi için varsayılan Ürün Grubu olacak"
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Şirket Gideri Talepleri.
@@ -2277,7 +2280,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifika Gerekli
 DocType: Company,Default Holiday List,Tatil Listesini Standart
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Satır {0}: Zaman ve zaman {1} ile örtüşen {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stok Yükümlülükleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Stok Yükümlülükleri
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
@@ -2286,7 +2289,7 @@
 DocType: Student Report Generation Tool,Print Section,Baskı bölümü
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,{0} kullanıcısının varsayılan POS Profili yok. Bu Kullanıcı için Satır {1} &#39;te Varsayılan&#39;ı işaretleyin.
 DocType: Student Group,Set 0 for no limit,hiçbir sınırı 0 olarak ayarlayın
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Satır {idx}: {field} Açılış {invoice_type} Faturalar oluşturmak için gereklidir
 DocType: Customer,Primary Address and Contact Detail,Birincil Adres ve İletişim Ayrıntısı
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ödeme E-posta tekrar gönder
@@ -2297,10 +2300,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Lütfen en az bir alan adı seçin.
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Arama Öğe
@@ -2311,7 +2314,7 @@
 DocType: Assessment Plan,Grading Scale,Notlandırma ölçeği
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Zaten tamamlandı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Elde Edilen Stoklar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Elde Edilen Stoklar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,İçe Aktarım Başarılı!
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,İçe Aktarım Başarılı!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Ödeme Talebi zaten var {0}
@@ -2324,17 +2327,16 @@
 DocType: Customer,Customer POS Id,Müşteri POS Kimliği
 DocType: Account,Account Name,Hesap adı
 DocType: Account,Account Name,Hesap adı
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Seri No {0} miktar {1} kesir olamaz
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Seri No {0} miktar {1} kesir olamaz
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Lütfen Woocommerce Sunucusu URL&#39;sini girin
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tedarikçi Türü Alanı.
 DocType: Purchase Order Item,Supplier Part Number,Tedarikçi Parti Numarası
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
 DocType: Share Balance,To No,Hayır için
-DocType: Subscription,Reference Document,referans Belgesi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} iptal edilmiş veya durdurulmuş
 DocType: Accounts Settings,Credit Controller,Kredi Kontrolü
-DocType: Grant Application,Applicant Type,Başvuru Sahibi Türü
+DocType: Loan,Applicant Type,Başvuru Sahibi Türü
 DocType: Purchase Invoice,03-Deficiency in services,03-Hizmetlerdeki yetersizlik
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
@@ -2346,15 +2348,15 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Faturalandırıldı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,İnsan Kaynakları
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,İnsan Kaynakları
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Lead,Upper Income,Üst Gelir
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,reddetmek
 DocType: Journal Entry Account,Debit in Company Currency,Şirket Para Birimi Bankamatik
 DocType: BOM Item,BOM Item,BOM Ürün
 DocType: Appraisal,For Employee,Çalışanlara
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Ödeme Girişi yapın
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Ödeme Girişi yapın
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Satır {0}: Tedarikçi karşı Advance debit gerekir
 DocType: Company,Default Values,Varsayılan Değerler
 DocType: Membership,INR,INR
@@ -2386,10 +2388,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} değeri 0 dan büyük olmalı
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stok mevcut
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Stok mevcut
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Gün) için Kapasite Planlama
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,tedarik
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Zorunlu alan - Program
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Zorunlu alan - Program
 DocType: Special Test Template,Result Component,Sonuç Bileşeni
@@ -2411,7 +2413,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Yapraklar gibi yaprakları içinde tatil dahil
 DocType: Sales Invoice,Packed Items,Paketli Ürünler
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Seri No. karşı Garanti İddiası
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;Toplam&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;Toplam&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Alışveriş Sepeti etkinleştirin
 DocType: Employee,Permanent Address,Daimi Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2432,11 +2434,11 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,İşlemi Onaylayın
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Müzayede
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Online Müzayede
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,yerine getirme
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Sepet Görüntüle
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Pazarlama Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Pazarlama Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Pazarlama Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün Yetersizliği Raporu
 ,Item Shortage Report,Ürün Yetersizliği Raporu
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Standart ölçütler oluşturulamıyor. Lütfen ölçütleri yeniden adlandırın
@@ -2461,9 +2463,9 @@
 DocType: Upload Attendance,Get Template,Şablon alın
 DocType: Material Request,Transferred,aktarılan
 DocType: Vehicle,Doors,Kapılar
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Hasta Kayıt için Toplama Ücreti
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Hisse senedi işleminden sonra nitelikleri değiştiremezsiniz. Yeni Bir Öğe Yapın ve Stokları Yeni Öğe Taşı
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Hisse senedi işleminden sonra nitelikleri değiştiremezsiniz. Yeni Bir Öğe Yapın ve Stokları Yeni Öğe Taşı
 DocType: Course Assessment Criteria,Weightage,Ağırlık
 DocType: Purchase Invoice,Tax Breakup,Vergi dağılımı
 DocType: Packing Slip,PS-,ps
@@ -2503,13 +2505,14 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
 DocType: Purchase Invoice Item,Batch No,Parti No
 DocType: Purchase Invoice Item,Batch No,Parti No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Çalışan Gelişmeleri
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Müşterinin Satın Alma Siparişine karşılık birden fazla Satış Siparişine izin ver.
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 DocType: Grant Application,Assessment  Mark (Out of 10),Değerlendirme Markası (10 üzerinden)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil yok
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Ana
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
@@ -2518,9 +2521,9 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Email Digest,Annual Expenses,yıllık giderler
 DocType: Item,Variants,Varyantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
 DocType: Payment Reconciliation Payment,Allocated amount,Ayrılan miktar
 DocType: Sales Team,Contribution to Net Total,Net Toplam Katkı
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
@@ -2529,6 +2532,7 @@
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Mutabakatı
 DocType: Territory,Territory Name,Bölge Adı
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Abonelikte yalnızca aynı faturalandırma döngüsüne sahip Planlarınız olabilir
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,İş için aday
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
@@ -2539,11 +2543,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Değerlendirme
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Eğitim Etkinlikleri
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Lead Source tarafından Leads izleyin.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nakliye Kuralı için koşul
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Girin lütfen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Girin lütfen
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Bakım Günlüğü
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Bu paketin net ağırlığı (Ürünlerin net toplamından otomatik olarak hesaplanır)
@@ -2551,12 +2555,12 @@
 DocType: Sales Order,To Deliver and Bill,Teslim edilecek ve Faturalanacak
 DocType: Student Group,Instructors,Ders
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Ürün Ağacı {0} devreye alınmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Ürün Ağacı {0} devreye alınmalıdır
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Paylaşım Yönetimi
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Tahsilat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Tahsilat
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Depo {0} herhangi bir hesaba bağlı değil, lütfen depo kaydındaki hesaptaki sözcükten veya {1} şirketindeki varsayılan envanter hesabını belirtin."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,siparişlerinizi yönetin
 DocType: Work Order Operation,Actual Time and Cost,Gerçek Zaman ve Maliyet
@@ -2566,7 +2570,7 @@
 DocType: Student Leave Application,Student Leave Application,Öğrenci bırak Uygulaması
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Üzerinde
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Satış zamanı toplam Ürünler.
@@ -2576,8 +2580,8 @@
 DocType: Item,Barcodes,barkodlar
 DocType: Hub Category,Hub Node,Hub Düğüm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Yinelenen Ürünler girdiniz. Lütfen düzeltip yeniden deneyin.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Ortak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Ortak
 DocType: Asset Movement,Asset Movement,Varlık Hareketi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,İş emri {0} sunulmalıdır
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Yeni Sepet
@@ -2596,14 +2600,13 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,"Faturalandırma para birimi, varsayılan şirketin para birimi veya parti hesabı para birimine eşit olmalıdır"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 DocType: Soil Texture,Loam,verimli toprak
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Satır {0}: Teslim Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Satır {0}: Teslim Tarihi gönderim tarihinden önce olamaz
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Ödeme Girdisi Oluştur
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
 ,Sales Invoice Trends,Satış Faturası Trendler
 ,Sales Invoice Trends,Satış Faturası Trendler
 DocType: Leave Application,Apply / Approve Leaves,Yapraklar Onayla / Uygula
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,İçin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Eğer ücret biçimi 'Önceki Ham Miktar' veya 'Önceki Ham Totk' ise referans verebilir
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Eğer ücret biçimi 'Önceki Ham Miktar' veya 'Önceki Ham Totk' ise referans verebilir
 DocType: Sales Order Item,Delivery Warehouse,Teslim Depo
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı.
 DocType: Serial No,Delivery Document No,Teslim Belge No
@@ -2618,7 +2621,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Malzeme Ayarları Üretim Ayarları&#39;nda ayarlanmamıştır.
 DocType: Student,Student Mobile Number,Öğrenci Cep Numarası
 DocType: Item,Has Variants,Varyasyoları var
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{1} Satırındaki {0} Öğe için {2} öğeden fazla tahsil edilemez. Üzerinde faturalandırmaya izin vermek için, lütfen Stok Ayarları&#39;nda ayarlayın."
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{1} Satırındaki {0} Öğe için {2} öğeden fazla tahsil edilemez. Üzerinde faturalandırmaya izin vermek için, lütfen Stok Ayarları&#39;nda ayarlayın."
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Yanıt Güncelle
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
@@ -2629,12 +2632,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Önce programı seçin
 DocType: Patient Appointment,Patient Age,Hasta Yaşı
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Projeleri yönetme
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,{0} seri numarası zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,{0} seri numarası zaten gönderildi
 DocType: Supplier,Supplier of Goods or Services.,Mal veya Hizmet alanı.
 DocType: Budget,Fiscal Year,Mali yıl
 DocType: Asset Maintenance Log,Planned,planlı
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Hastada Danışma masraflarını karşılamak için ayarlanmamışsa, kullanılacak varsayılan alacak hesapları."
 DocType: Vehicle Log,Fuel Price,yakıt Fiyatı
+DocType: Bank Guarantee,Margin Money,Marj Parası
 DocType: Budget,Budget,Bütçe
 DocType: Budget,Budget,Bütçe
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Aç ayarla
@@ -2650,18 +2654,18 @@
 DocType: Item,Is Sales Item,Satış Maddesi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Ürün {0} Seri No Kontrol ürünü değildir, Ürün alanını kontrol ediniz"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,"Ürün {0} Seri No Kontrol ürünü değildir, Ürün alanını kontrol ediniz"
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 ,Amount to Deliver,Teslim edilecek tutar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Aynı öğe birden çok kez girildi. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Başlangıç Tarihi terim bağlantılı olduğu için Akademik Yılı Year Başlangıç Tarihi daha önce olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Hatalar vardı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,"Çalışan {0}, {1} için {2} ve {3} arasında zaten başvuruda bulundu:"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Hatalar vardı
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,"Çalışan {0}, {1} için {2} ve {3} arasında zaten başvuruda bulundu:"
 DocType: Guardian,Guardian Interests,Guardian İlgi
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
 DocType: Education Settings,Instructor Records to be created by,Öğretmen Kayıtları tarafından oluşturulacak
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
@@ -2685,8 +2689,8 @@
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Favorilerime eklendi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yukarıdaki kriterlere göre maaş fişi bulunamadı VEYA maaş fişi zaten gönderildi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Harç ve Vergiler
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yukarıdaki kriterlere göre maaş fişi bulunamadı VEYA maaş fişi zaten gönderildi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Harç ve Vergiler
 DocType: Projects Settings,Projects Settings,Projeler Ayarları
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Referrans tarihi girin
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
@@ -2696,30 +2700,31 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Ürün Grupları Ağacı
 DocType: Production Plan,Total Produced Qty,Toplam Üretilen Miktar
 DocType: Payroll Entry,Get Employee Details,Çalışan Detaylarını Alın
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
 DocType: Asset,Sold,Satıldı
 ,Item-wise Purchase History,Ürün bilgisi Satın Alma Geçmişi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
 DocType: Account,Frozen,Dondurulmuş
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Esas Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,İşlenmemiş içerikler
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,İşlenmemiş içerikler
 DocType: Payment Reconciliation Payment,Reference Row,referans Satır
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Sales Invoice,Accounting Details,Muhasebe Detayları
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Bu şirket için bütün İşlemleri sil
 DocType: Patient,O Positive,O Olumlu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Yatırımlar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Yatırımlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Yatırımlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
 DocType: Issue,Resolution Details,Karar Detayları
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atamalar
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Onaylanma Kriterleri
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Dergi Girişi için geri ödeme yok
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 DocType: BOM,Show In Website,Web sitesinde Göster
 DocType: Shopping Cart Settings,Show Quantity in Website,Web Sitesi Miktarı göster
-DocType: Employee Loan Application,Total Payable Amount,Toplam Ödenecek Tutar
+DocType: Loan Application,Total Payable Amount,Toplam Ödenecek Tutar
 DocType: Task,Expected Time (in hours),(Saat) Beklenen Zaman
 DocType: Item Reorder,Check in (group),(Grup) kontrol
 DocType: Soil Texture,Silt,alüvyon
@@ -2739,7 +2744,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Ödeme yapmak
 DocType: Room,Room Name,Oda ismi
 DocType: Prescription Duration,Prescription Duration,Reçete Süresi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
 DocType: Activity Cost,Costing Rate,Maliyet Oranı
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim Bilgileri
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Müşteri Adresleri Ve İletişim
@@ -2762,11 +2767,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Çift
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Çift
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Bu mod seçildiğinde, POS Fatura&#39;da varsayılan hesap otomatik olarak güncellenecektir."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
 DocType: Asset,Depreciation Schedule,Amortisman Programı
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Satış Ortağı Adresleri ve Kişiler
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Yarım Gün Tarih Tarihinden ve Tarihi arasında olmalıdır
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Yarım Gün Tarih Tarihinden ve Tarihi arasında olmalıdır
 DocType: Maintenance Schedule Detail,Actual Date,Gerçek Tarih
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Lütfen {0} şirketindeki Varsayılan Maliyet Merkezi&#39;ni ayarlayın.
 DocType: Item,Has Batch No,Parti No Var
@@ -2785,7 +2790,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Gerçek tamamlanma tarihi (Zaman Tablosu'ndan)
 DocType: Soil Texture,Soil Type,Toprak tipi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Miktar {0} {2} karşılığı {1} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Yeni Mesaj
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless Mandate
@@ -2807,7 +2811,7 @@
 DocType: Hub Category,Hub Category,Hub Kategorisi
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
-DocType: Employee Loan,Loan Amount,Kredi miktarı
+DocType: Loan,Loan Amount,Kredi miktarı
 DocType: Student Report Generation Tool,Add Letterhead,Antetli Kağıt Ekle
 DocType: Program Enrollment,Self-Driving Vehicle,Kendinden Sürüşlü Araç
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Tedarikçi Puan Kartı Daimi
@@ -2838,9 +2842,9 @@
 DocType: Cash Flow Mapper,Position,pozisyon
 DocType: Patient,Patient Details,Hasta Ayrıntıları
 DocType: Patient,B Positive,B Olumlu
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 DocType: Patient Medical Record,Patient Medical Record,Hasta Tıbbi Kayıt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Spor
@@ -2849,10 +2853,11 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Gerçek Toplam
 DocType: Lab Test UOM,Test UOM,UOM testi
 DocType: Student Siblings,Student Siblings,Öğrenci Kardeşleri
+DocType: Subscription Plan Detail,Subscription Plan Detail,Abonelik Planı Ayrıntısı
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Birim
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Birim
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Şirket belirtiniz
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Şirket belirtiniz
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Şirket belirtiniz
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Şirket belirtiniz
 ,Customer Acquisition and Loyalty,Müşteri Kazanma ve Bağlılık
 ,Customer Acquisition and Loyalty,Müşteri Edinme ve Sadakat
 DocType: Asset Maintenance Task,Maintenance Task,Bakım Görevi
@@ -2870,6 +2875,7 @@
 ,BOM Search,Ürün Ağacı Arama
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Toplam Tüketim Maliyeti Maliyeti (Stok Girişi ile)
 DocType: Hub Settings,Company Registered,Şirket kayıtlı
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,"Tarihe, Başlangıç Tarihinden daha az olamaz"
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Yayın için &quot;Stokta&quot; ya da &quot;Stokta Bulunmadı&quot; on Hub bu stokta mevcut bulunan stokları esas alın.
 DocType: Vehicle,Fuel Type,Yakıt tipi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Şirket para belirtiniz
@@ -2877,18 +2883,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Malzeme İstekleri ardından öğesinin yeniden sipariş seviyesine göre otomatik olarak gündeme gelmiş
 DocType: Email Digest,Pending Sales Orders,Satış Siparişleri Bekleyen
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 DocType: Employee,Create User Permission,Kullanıcı İzni Yarat
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Healthcare Settings,Remind Before,Daha Önce Hatırlat
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ölçü Birimi Dönüşüm katsayısı satır {0} da gereklidir
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
 DocType: Salary Component,Deduction,Kesinti
 DocType: Salary Component,Deduction,Kesinti
 DocType: Item,Retain Sample,Numune Alın
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Satır {0}: From Time ve Zaman için zorunludur.
 DocType: Stock Reconciliation Item,Amount Difference,tutar Farkı
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bu satış kişinin Çalışan Kimliği giriniz
 DocType: Territory,Classification of Customers by region,Bölgelere göre Müşteriler sınıflandırılması
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Üretimde
@@ -2898,8 +2905,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Hesaplanan Banka Hesap bakiyesi
 DocType: Normal Test Template,Normal Test Template,Normal Test Şablonu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Engelli kullanıcı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Fiyat Teklifi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Alınan bir RFQ&#39;yi Teklif Değil olarak ayarlayamıyorum
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Fiyat Teklifi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Alınan bir RFQ&#39;yi Teklif Değil olarak ayarlayamıyorum
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
@@ -2909,7 +2916,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Maliyet Güncelleme
 DocType: Patient,Date of Birth,Doğum tarihi
 DocType: Patient,Date of Birth,Doğum tarihi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri Adresi
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Tedarikçi Puan Kartı Kurulumu
@@ -2920,14 +2927,16 @@
 DocType: Work Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,İş Tanımı
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,İş Tanımı
 DocType: Student Applicant,Applied,Başvuruldu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Yeniden açın
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Yeniden açın
 DocType: Sales Invoice Item,Qty as per Stock UOM,Her Stok Ölçü Birimi (birim) için miktar
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Adı
 DocType: Purchase Invoice,02-Post Sale Discount,02-Satış Sonrası İndirimi
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Satış Kampanyaları Takip Edin. İlanlar, Özlü Sözler takip edin, Satış Sipariş vb Kampanyalar dan Yatırım Dönüş ölçmek için."
+DocType: Department Approver,Approver,Onaylayan
+DocType: Department Approver,Approver,Onaylayan
 ,SO Qty,SO Adet
 ,SO Qty,SO Adet
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Hissedar Sahası boş olamaz
@@ -2943,25 +2952,24 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Toplam Ayrılan Tutar (Şirket Para Birimi)
 DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
 DocType: BOM,Scrap Material Cost,Hurda Malzeme Maliyet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
 DocType: Grant Application,Email Notification Sent,Gönderilen E-posta Bildirimi
 DocType: Purchase Invoice,In Words (Company Currency),Sözlü (Firma para birimi) olarak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Öğe Kod, depo, miktar miktar satırında gereklidir"
-DocType: Pricing Rule,Supplier,Tedarikçi
-DocType: Pricing Rule,Supplier,Tedarikçi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Öğe Kod, depo, miktar miktar satırında gereklidir"
+DocType: Bank Guarantee,Supplier,Tedarikçi
+DocType: Bank Guarantee,Supplier,Tedarikçi
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Ödeme Ayrıntılarını Göster
 DocType: Consultation,Consultation Time,Danışma Zamanı
 DocType: C-Form,Quarter,Çeyrek
 DocType: C-Form,Quarter,Çeyrek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Çeşitli Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Çeşitli Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Çeşitli Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Çeşitli Giderler
 DocType: Global Defaults,Default Company,Standart Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Ürün {0} için gider veya fark hesabı bütün stok değerini etkilediği için zorunludur
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banka Adı
 DocType: Cheque Print Template,Bank Name,Banka Adı
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Üstte
-DocType: Employee Loan,Employee Loan Account,Çalışan Kredi Hesabı
 DocType: Leave Application,Total Leave Days,Toplam bırak Günler
 DocType: Email Digest,Note: Email will not be sent to disabled users,Not: E-posta engelli kullanıcılara gönderilmeyecektir
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Etkileşim Sayısı
@@ -2977,7 +2985,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Ağırlık (Kilogram cinsinden)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",bölüm kaydedildikten sonra bölüm otomatik olarak ayarlanır.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Lütfen GST Ayarlarını GST Ayarlarında Ayarlayın
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Lütfen GST Ayarlarını GST Ayarlarında Ayarlayın
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,İş türü
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Yeni Satın Alma Maliyeti
@@ -2988,12 +2996,13 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Student Guardian,Others,Diğer
 DocType: Student Guardian,Others,Diğer
+DocType: Subscription,Discounts,İndirimler
 DocType: Payment Entry,Unallocated Amount,ayrılmamış Tutar
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bir Ürün veya satın alınan, satılan veya stokta tutulan bir hizmet."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Artık güncelleme
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,İlk satır için ücret tipi 'Önceki satır tutarında' veya 'Önceki satır toplamında' olarak seçilemez
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,İlk satır için ücret tipi 'Önceki satır tutarında' veya 'Önceki satır toplamında' olarak seçilemez
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Bu, bu Kurulum ile bağlantılı tüm puan kartlarını kapsar"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Çocuk Ürün Ürün Paketi olmamalıdır. öğeyi kaldırmak `{0}` ve saklayın
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bankacılık
@@ -3003,47 +3012,50 @@
 DocType: Bank Guarantee,Bank Guarantee,Banka Garantisi
 DocType: Bank Guarantee,Bank Guarantee,Banka Garantisi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Programı almak için 'Program Oluştura' tıklayınız
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serileri ile Katılım için numaralandırma dizisini ayarlayın
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
-apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
+apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","örneğin: ""Yazılım Çözümleri"""
 DocType: Grading Scale,Grading Scale Intervals,Not Verme Ölçeği Aralıkları
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Yılın karı
+DocType: Bank Guarantee,Name of Bank,Bankanın ismi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} için muhasebe kaydı yalnızca bu para birimi ile yapılabilir: {3}
 DocType: Fee Schedule,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,mali hesaplarının Ağacı.
+DocType: Bank Guarantee,Reference Document Type,Referans Belge Türü
 DocType: Cash Flow Mapping,Cash Flow Mapping,Nakit Akışı Eşleme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Serileştirilmiş Envanteri
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Varsayılan iletişimde e-posta bulunamadı
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gizli Oluştur
-DocType: Employee Loan,Account Info,Hesap Bilgisi
+DocType: Loan,Account Info,Hesap Bilgisi
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
 DocType: Fees,Include Payment,Ödeme Dahil Et
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,Öğrenci Grupları {0} oluşturuldu.
 DocType: Sales Invoice,Total Billing Amount,Toplam Fatura Tutarı
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Ücret Yapısı ve Öğrenci Grubu {0} içindeki program farklıdır.
 DocType: Fee Schedule,Receivable Account,Alacak Hesabı
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Ödeme Satış Sipariş
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Vergi Ödeme İle
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Tedarikçi için TRIPLICATE
 DocType: Land Unit,Is Container,Konteyner mu
 DocType: Crop Cycle,This will be day 1 of the crop cycle,"Bu, mahsul döngüsü 1. gündür"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Doğru hesabı seçin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Doğru hesabı seçin
 DocType: Purchase Invoice Item,Weight UOM,Ağırlık Ölçü Birimi
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Folio numaraları ile mevcut Hissedarların listesi
 DocType: Salary Structure Employee,Salary Structure Employee,Maaş Yapısı Çalışan
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Varyant Özelliklerini Göster
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Varyant Özelliklerini Göster
 DocType: Student,Blood Group,Kan grubu
 DocType: Student,Blood Group,Kan grubu
 DocType: Course,Course Name,Ders Adı
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Belirli bir çalışanın izni uygulamalarını onaylayabilir Kullanıcılar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Ofis Gereçleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Ofis Gereçleri
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Fiscal Year,Companies,Şirketler
@@ -3064,7 +3076,7 @@
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Bankamatik To gereklidir
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Satınalma Fiyat Listesi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tedarikçi puan kartı değişkenlerinin şablonları.
 DocType: Job Offer Term,Offer Term,Teklif Dönem
 DocType: Asset,Quality Manager,Kalite Müdürü
@@ -3077,13 +3089,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Toplam Ödenmemiş: {0}
 DocType: BOM Website Operation,BOM Website Operation,Ürün Ağacı Web Sitesi Operasyonu
 DocType: Supplier Scorecard,Supplier Score,Tedarikçi Puanı
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Toplam Faturalandırılan Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Toplam Faturalandırılan Tutarı
 DocType: Supplier,Warn RFQs,RFQ&#39;ları uyar
 DocType: BOM,Conversion Rate,Dönüşüm oranı
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Ürün Arama
 DocType: Assessment Plan,To Time,Zamana
 DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Hesaba için Kredi bir Ödenecek hesabı olması gerekir
+DocType: Loan,Total Amount Paid,Toplamda ödenen miktar
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Lütfen ödenen öğrenci başvurusu için zorunlu Öğrenci Kabulünü seçin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Lütfen fiyatlandırma yayınlamak için bir fiyat listesi seçin
@@ -3095,20 +3108,19 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Satır {0}: Tamamlandı Adet fazla olamaz {1} operasyon için {2}
 DocType: Manufacturing Settings,Allow Overtime,Fazla mesaiye izin ver
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serileştirilmiş Öğe {0} Stok Mutabakatı kullanılarak güncellenemez, lütfen Stok Girişi kullanın"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serileştirilmiş Öğe {0} Stok Mutabakatı kullanılarak güncellenemez, lütfen Stok Girişi kullanın"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serileştirilmiş Öğe {0} Stok Mutabakatı kullanılarak güncellenemez, lütfen Stok Girişi kullanın"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serileştirilmiş Öğe {0} Stok Mutabakatı kullanılarak güncellenemez, lütfen Stok Girişi kullanın"
 DocType: Training Event Employee,Training Event Employee,Eğitim Etkinlik Çalışan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,"Maksimum Örnekler - {0}, Toplu İş {1} ve Madde {2} için tutulabilir."
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Zaman Dilimleri Ekleme
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Güncel Değerleme Oranı
 DocType: Training Event,Advance,İlerlemek
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,tekrarlanan tekrar yapmak için.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ödeme ağ geçidi ayarları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Kambiyo Kâr / Zarar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Kambiyo Kâr / Zarar
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},"Sıra # {0}: Hesap {1}, şirkete {2} ait değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},"Sıra # {0}: Hesap {1}, şirkete {2} ait değil"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} bulunamadı
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Miktarı
@@ -3128,7 +3140,6 @@
 DocType: Bin,Actual Quantity,Gerçek Miktar
 DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Bulunamadı Seri No {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Abonelik {0} oldu
 DocType: Fee Schedule Program,Fee Schedule Program,Ücret Programı Programı
 DocType: Fee Schedule Program,Student Batch,Öğrenci Toplu
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Öğrenci olun
@@ -3145,14 +3156,13 @@
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 ,Bank Clearance Summary,Banka Gümrükleme Özet
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Günlük, haftalık ve aylık e-posta özetleri oluştur."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Günlük, haftalık ve aylık e-posta özetleri oluştur."
 DocType: Appraisal Goal,Appraisal Goal,Değerlendirme Hedefi
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Kategori Öner
 DocType: Stock Reconciliation Item,Current Amount,Güncel Tutar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Binalar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Binalar
 DocType: Fee Schedule,Fee Structure,ücret Yapısı
 DocType: Timesheet Detail,Costing Amount,Maliyet Tutarı
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 DocType: Student Admission Program,Application Fee,Başvuru ücreti
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Bordro Gönder
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
@@ -3161,13 +3171,14 @@
 DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Tarımsal Analiz Kriterleri
+DocType: HR Settings,Leave Approval Notification Template,Onay Bildirim Şablonunu Bırak
 DocType: POS Profile,[Select],[Seç]
 DocType: POS Profile,[Select],[Seç]
 DocType: Vital Signs,Blood Pressure (diastolic),Kan Basıncı (diyastolik)
 DocType: SMS Log,Sent To,Gönderildiği Kişi
 DocType: Agriculture Task,Holiday Management,Tatil Yönetimi
 DocType: Payment Request,Make Sales Invoice,Satış Faturası Oluştur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Yazılımlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Yazılımlar
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
 DocType: Company,For Reference Only.,Başvuru için sadece.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Hekim {0} {1} üzerinde mevcut değil
@@ -3188,7 +3199,7 @@
 DocType: Employee,New Workplace,Yeni İş Yeri
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Malzeme tüketimi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Kapalı olarak ayarla
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Barkodlu Ürün Yok {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Barkodlu Ürün Yok {0}
 DocType: Normal Test Items,Require Result Value,Sonuç Değerini Gerektir
 DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Ürün Ağaçları
@@ -3206,20 +3217,20 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Verilen tarihler için çalışan {0} için bulunamadı aktif veya varsayılan Maaş Yapısı
 DocType: Leave Block List,Allow Users,Kullanıcılara izin ver
 DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Yinelenen
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Nakit Akışı Eşleme Şablonu Ayrıntıları
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Kredi Yönetimi
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ayrı Gelir izlemek ve ürün dikey veya bölümler için Gider.
 DocType: Rename Tool,Rename Tool,yeniden adlandırma aracı
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Güncelleme Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Göster Maaş Kayma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Göster Maaş Kayma
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer Malzemesi
 DocType: Fees,Send Payment Request,Ödeme Talebi Gönderme
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
 DocType: Water Analysis,Origin,Menşei
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Seç değişim miktarı hesabı
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
@@ -3236,16 +3247,17 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Gelir Vergisi Yükümlülüğü Var mı
 DocType: Grading Scale Interval,Grade Description,sınıf Açıklama
 DocType: Stock Entry,Purchase Receipt No,Satın alma makbuzu numarası
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
-DocType: Sales Invoice, Shipping Bill Number,Nakliye Faturası Numarası
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Kaparo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Kaparo
+DocType: Sales Invoice, Shipping Bill Number,Kargo Fatura Numarası
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,izlenebilirlik
 DocType: Asset Maintenance Log,Actions performed,Yapılan eylemler
 DocType: Cash Flow Mapper,Section Leader,Bölüm Lideri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
 DocType: Supplier Scorecard Scoring Standing,Employee,Çalışan
 DocType: Supplier Scorecard Scoring Standing,Employee,Çalışan
+DocType: Bank Guarantee,Fixed Deposit Number,Sabit Mevduat Numarası
 DocType: Asset Repair,Failure Date,Başarısızlık Tarihi
 DocType: Sample Collection,Collected Time,Toplanan Zaman
 DocType: Company,Sales Monthly History,Satış Aylık Tarihi
@@ -3263,10 +3275,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Bu randevuyu iptal etmek istediğinize emin misiniz?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Otel Odasında Fiyatlandırma Paketi
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,satış Hattı
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Abonelik Güncellemeleri Al
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},"Hesap {0}, Şirket {1} Hesap Modu'yla eşleşmiyor: {2}"
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Ders:
@@ -3276,7 +3289,7 @@
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,İş emri oluşturulmadı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,çalışanın maaş Kuponu {0} zaten bu dönem için oluşturulan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Ecza
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Ecza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
 DocType: Purchase Invoice,Credit To,Kredi için
@@ -3296,8 +3309,8 @@
 DocType: Request for Quotation Supplier,No Quote,Alıntı yapılmadı
 DocType: Warranty Claim,Raised By,Talep eden
 DocType: Payment Gateway Account,Payment Account,Ödeme Hesabı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Telafi İzni
 DocType: Job Offer,Accepted,Onaylanmış
@@ -3310,7 +3323,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Bu şirkete ait bütün işlemleri silmek istediğinizden emin olun. Ana veriler olduğu gibi kalacaktır. Bu işlem geri alınamaz.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,arama sonuçları
 DocType: Room,Room Number,Oda numarası
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Geçersiz referans {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Geçersiz referans {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
 DocType: Journal Entry Account,Payroll Entry,Bordro Girişi
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Ücret Kayıtlarını Görüntüleme
@@ -3320,7 +3333,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Lab Test Sample,Lab Test Sample,Laboratuvar Testi Örneği
 DocType: Item Variant Settings,Allow Rename Attribute Value,Öznitelik Değerini Yeniden Adlandırmaya İzin Ver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Hızlı Kayıt Girdisi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 DocType: Restaurant,Invoice Series Prefix,Fatura Serisi Öneki
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
@@ -3329,8 +3342,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps entegrasyonu etkin değil
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} teslim edilmedi
+DocType: Subscription,Trialling,trialling
 DocType: Member,Membership Expiry Date,Üyelik Sona Erme Tarihi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} return belgesinde negatif olmalıdır
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} return belgesinde negatif olmalıdır
 ,Minutes to First Response for Issues,Sorunları İlk Tepki Dakika
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
@@ -3351,8 +3365,8 @@
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Task Depends On,Task Depends On,Görev Bağlıdır
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Fırsat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Fırsat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Fırsat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Fırsat
 DocType: Operation,Default Workstation,Standart İstasyonu
 DocType: Notification Control,Expense Claim Approved Message,Gideri Talebi Onay Mesajı
 DocType: Payment Entry,Deductions or Loss,Kesintiler veya Zararı
@@ -3394,7 +3408,7 @@
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
 DocType: Membership,USD,Amerikan Doları
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fatura Oluştur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Kalan Bakiye
@@ -3404,7 +3418,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,bitiş yılı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Driver,Driver,sürücü
 DocType: Vital Signs,Nutrition Values,Beslenme Değerleri
 DocType: Lab Test Template,Is billable,Faturalandırılabilir mi
@@ -3415,7 +3429,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Gerçek başlangış tarihi (Zaman Tablosu'ndan)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Yaşlanma Aralığı 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,"Toplam avans miktarı, talep edilen toplam tutar kadar olamaz"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,"Toplam avans miktarı, talep edilen toplam tutar kadar olamaz"
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3470,7 +3484,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Özellik Değerlerini Seç
 DocType: Purchase Invoice,Reason For Issuing document,Belgenin Verilmesi Nedeni
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Sonraki İletişim Sorumlusu Müşteri Aday Kaydının E-posta Adresi ile aynı olamaz
@@ -3490,7 +3504,8 @@
 DocType: Warranty Claim,Service Address,Servis Adresi
 DocType: Asset Maintenance Task,Calibration,ayarlama
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} bir şirket tatili
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Döşeme ve demirbaşlar
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Durum Bildirimini Bırak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Döşeme ve demirbaşlar
 DocType: Item,Manufacture,Üretim
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Kurulum Şirketi
 ,Lab Test Report,Lab Test Raporu
@@ -3508,8 +3523,7 @@
 DocType: Crop,Planting Area,Dikim Alanı
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
 DocType: Installation Note Item,Installed Qty,Kurulan Miktar
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Bunun nedeni, telefonunuzdaki bazı geçersiz E-posta Adresleri olabilir."
-apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Sen ekledin
+apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Eklenen:
 DocType: Purchase Taxes and Charges,Parenttype,Ana Tip
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Eğitim Sonucu
 DocType: Purchase Invoice,Is Paid,Ücretli mi
@@ -3519,19 +3533,20 @@
 DocType: Products Settings,Products per Page,Sayfa Başına Ürünler
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Kuruluş Şube Alanı
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Hata Bildir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Yardımcı Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Yardımcı Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Yardımcı Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 üzerinde
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
 DocType: Supplier Scorecard Criteria,Criteria Weight,Ölçütler Ağırlık
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Onay Bildirimini Bırak
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Çizelgesi dayanarak maaş Kayma
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Alış oranı
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Alış oranı
 DocType: Notification Control,Sales Order Message,Satış Sipariş Mesajı
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 DocType: Payment Entry,Payment Type,Ödeme Şekli
@@ -3556,6 +3571,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Alışveriş Sepeti Ayarları
 DocType: Journal Entry,Accounting Entries,Muhasebe Girişler
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Seçilen Fiyatlandırma Kuralları &#39;Oran&#39; için yapılmışsa, Ücret Listesinin üzerine yazacaktır. Fiyatlandırma Kuralı oranı son oran, dolayısıyla daha fazla indirim uygulanmamalıdır. Bu nedenle, Satış Siparişi, Satın Alma Siparişi gibi işlemlerde, &#39;Fiyat Listesi Oranı&#39; alanından ziyade &#39;Oran&#39; alanına getirilir."
+DocType: Journal Entry,Paid Loan,Ücretli Kredi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Girişi çoğaltın. Yetkilendirme Kuralı kontrol edin {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Girişi çoğaltın. Yetkilendirme Kuralı kontrol edin {0}
 DocType: Journal Entry Account,Reference Due Date,Referans Sona Erme Tarihi
@@ -3574,7 +3590,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bordro
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
 DocType: Patient Service Unit,Parent Service Unit,Ana Hizmet Birimi
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Kullanıcı Yap
 DocType: Packing Slip,Identification of the package for the delivery (for print),(Baskı için) teslimat için ambalajın tanımlanması
@@ -3594,7 +3610,7 @@
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Payment Request,Amount in customer's currency,Müşterinin para miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,İrsaliye
 DocType: Volunteer,Weekdays,Hafta içi
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: Restaurant Menu,Restaurant Menu,Restaurant Menü
@@ -3602,7 +3618,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Sürekli envanter için varsayılan envanter hesabı ayarla
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Sürekli envanter için varsayılan envanter hesabı ayarla
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Grant İnceleme E-postasını gönder
@@ -3612,11 +3628,12 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Zaten {0} öğesi için kayıt var
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Önceden oluşturulan faturaların kayıtlarını kaybedersiniz. Bu aboneliği tekrar başlatmak istediğinizden emin misiniz?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Kayıt ücreti
 DocType: Budget,Cost Center,Maliyet Merkezi
 DocType: Budget,Cost Center,Maliyet Merkezi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Föy #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Föy #
 DocType: Notification Control,Purchase Order Message,Satınalma Siparişi Mesajı
 DocType: Tax Rule,Shipping Country,Nakliye Ülke
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Satış İşlemler gelen Müşterinin Vergi Kimliği gizleme
@@ -3626,16 +3643,17 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depo yalnızca Stok Girdisi / İrsaliye / Satın Alım Makbuzu üzerinden değiştirilebilir
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Gelir vergisi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Gelir vergisi
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Sanayi Tipine Göre izleme talebi.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Antetli Kâğıtlara Git
+DocType: Subscription,Cancel At End Of Period,Dönem Sonunda İptal
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Transfer için hiçbir öğe seçilmedi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Transfer için hiçbir öğe seçilmedi
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
@@ -3643,7 +3661,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
 DocType: Vehicle,Electric,Elektrik
 DocType: Task,% Progress,% İlerleme
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Varlık Bertaraf Kâr / Zarar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Varlık Bertaraf Kâr / Zarar
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Aşağıdaki tabloda yalnızca &quot;Onaylandı&quot; durumuna sahip Öğrenci Başvurusu seçilecektir.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Hesap {0} için hesap numarası mevcut değil. <br> Lütfen Hesap Tablonuzu doğru ayarlayın.
 DocType: Task,Depends on Tasks,Görevler bağlıdır
@@ -3659,6 +3677,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Stokta yok
 DocType: Volunteer,Volunteer Skills,Gönüllülük Becerileri
 DocType: Appraisal,HR User,İK Kullanıcı
+DocType: Bank Guarantee,Reference Document Name,Referans Doküman Adı
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mahsup Vergi ve Harçlar
 apps/erpnext/erpnext/hooks.py +142,Issues,Sorunlar
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Durum şunlardan biri olmalıdır {0}
@@ -3672,7 +3691,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} devre dışı
 DocType: Supplier,Billing Currency,Fatura Para Birimi
 DocType: Sales Invoice,SINV-RET-,SINV-ret
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Ekstra Büyük
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Ekstra Büyük
+DocType: Loan,Loan Application,Kredi başvurusu
 DocType: Crop,Scientific Name,Bilimsel ad
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Toplam Yapraklar
 DocType: Customer,"Reselect, if the chosen contact is edited after save",Kaydedildikten sonra seçilen kişi düzenlenirse yeniden seç
@@ -3683,15 +3703,15 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Yerel
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Büyük
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Büyük
 DocType: Homepage Featured Product,Homepage Featured Product,Anasayfa Özel Ürün
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Bütün Değerlendirme Grupları
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Bütün Değerlendirme Grupları
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Yeni Depo Adı
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Toplam {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Bölge
@@ -3714,9 +3734,10 @@
 DocType: Fees,Fees,harç
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Döviz Kuru içine başka bir para birimi dönüştürme belirtin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Teklif {0} iptal edildi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Toplam Alacakların Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Toplam Alacakların Tutarı
 DocType: Sales Partner,Targets,Hedefler
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Lütfen SİREN numarasını şirket bilgi dosyasına kaydettirin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini Kurun&gt; HR Ayarları
 DocType: Price List,Price List Master,Fiyat Listesi Ana
 DocType: GST Account,CESS Account,CESS Hesabı
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Ayarlamak ve hedefleri izleyebilirsiniz böylece tüm satış işlemleri birden ** Satış Kişilerin ** karşı etiketlenmiş olabilir.
@@ -3726,6 +3747,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Hastayı seçin
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametre Adı
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Sadece sunulabilir &#39;Reddedildi&#39; &#39;Onaylandı&#39; ve statülü Uygulamaları bırakın
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Öğrenci Grubu Adı satırda zorunludur {0}
 DocType: Homepage,Products to be shown on website homepage,Ürünler web sitesi ana sayfasında gösterilecek
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
@@ -3771,15 +3793,15 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,"Fatura, tüm faturalandırma saatleri için zaten oluşturuldu"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Adı hatası: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Mali Maliyet mi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Lütfen Restoran Ayarları&#39;nda varsayılan müşteriyi ayarlayın
 ,Salary Register,Maaş Kayıt
 DocType: Warehouse,Parent Warehouse,Ana Depo
-DocType: C-Form Invoice Detail,Net Total,Net Toplam
-DocType: C-Form Invoice Detail,Net Total,Net Toplam
+DocType: Subscription,Net Total,Net Toplam
+DocType: Subscription,Net Total,Net Toplam
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Öğe {0} ve Proje {1} için varsayılan BOM bulunamadı
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Çeşitli kredi türlerini tanımlama
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Çeşitli kredi türlerini tanımlama
 DocType: Bin,FCFS Rate,FCFS Oranı
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Bekleyen Tutar
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(Dakika cinsinden) Zaman
@@ -3812,12 +3834,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Kök Hesabı bir grup olmalı
 DocType: Drug Prescription,Drug Prescription,İlaç Reçetesi
 DocType: Fees,FEE.,FEE.
-DocType: Employee Loan,Repaid/Closed,/ Ödenmiş Kapalı
+DocType: Loan,Repaid/Closed,/ Ödenmiş Kapalı
 DocType: Item,Total Projected Qty,Tahmini toplam Adet
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} için muhasebe kayıtları yapmak için gerekli olan {0} Öğesi için değerleme oranı bulunamadı. Öğe {1} &#39;de sıfır değerleme oranı maddesi olarak işlem yapıyorsa, lütfen bunu {1} Öğe tablosunda belirtin. Aksi takdirde, lütfen öğe için gelen bir hisse senedi işlemini oluşturun veya Öğe kayıtlarında değerleme oranını belirtin ve daha sonra bu girişi göndermeyi / iptal etmeyi deneyin"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen {0} için İsimlendirme Serisini Kurulum&gt; Ayarlar&gt; İsimlendirme Dizisi ile ayarlayın
 DocType: Course,Course Code,Kurs kodu
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: POS Settings,Use POS in Offline Mode,Çevrimdışı Modda POS kullanın
@@ -3838,18 +3859,17 @@
 DocType: Purchase Invoice,Deemed Export,İhracatın Dengesi
 DocType: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,İndirim Yüzdesi bir Fiyat listesine veya bütün fiyat listelerine karşı uygulanabilir.
-DocType: Subscription,Half-yearly,Yarı Yıllık
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Lab Test,LabTest Approver,LabTest Onaylayıcısı
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Zaten değerlendirme kriteri {} için değerlendirdiniz.
 DocType: Vehicle Service,Engine Oil,Motor yağı
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Oluşturulan İş Emirleri: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Oluşturulan İş Emirleri: {0}
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
-DocType: Employee Loan,Loan Details,kredi Detayları
+DocType: Loan,Loan Details,kredi Detayları
 DocType: Company,Default Inventory Account,Varsayılan Envanter Hesabı
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio numaraları eşleşmiyor
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Satır {0}: Tamamlandı Adet sıfırdan büyük olmalıdır.
@@ -3858,24 +3878,24 @@
 DocType: Antibiotic,Antibiotic Name,Antibiyotik adı
 DocType: Purchase Invoice,Apply Additional Discount On,Ek İndirim On Uygula
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,Türü seçin ...
-DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tarimda büyüyen tüm Kara Birimlerine bir baglanti
+DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tarımda büyüyen tüm kara parçalarına yönelik bağlantı
 DocType: Account,Root Type,Kök Tipi
 DocType: Account,Root Type,Kök Tipi
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Satır # {0}: daha geri olamaz {1} Öğe için {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Satır # {0}: daha geri olamaz {1} Öğe için {2}
 DocType: Item Group,Show this slideshow at the top of the page,Sayfanın üstünde bu slayt gösterisini göster
 DocType: BOM,Item UOM,Ürün Ölçü Birimi
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),İndirim Tutarından sonraki Vergi Tutarı (Şirket Para Biriminde)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
 DocType: Cheque Print Template,Primary Settings,İlköğretim Ayarlar
 DocType: Purchase Invoice,Select Supplier Address,Seç Tedarikçi Adresi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Çalışan ekle
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Çalışan ekle
 DocType: Purchase Invoice Item,Quality Inspection,Kalite Kontrol
 DocType: Purchase Invoice Item,Quality Inspection,Kalite Kontrol
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Extra Small
 DocType: Company,Standard Template,standart Şablon
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
@@ -3899,13 +3919,12 @@
 DocType: SMS Log,No of Sent SMS,Gönderilen SMS sayısı
 DocType: Antibiotic,Healthcare Administrator,Sağlık Yöneticisi
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Hedef belirleyin
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serileri ile Katılım için numaralandırma dizisini ayarlayın
 DocType: Dosage Strength,Dosage Strength,Dozaj Mukavemeti
 DocType: Account,Expense Account,Gider Hesabı
 DocType: Account,Expense Account,Gider Hesabı
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Yazılım
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Renk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Renk
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Değerlendirme Planı Kriterleri
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Seçilen kalem için son kullanma tarihi zorunludur
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Satınalma Siparişlerini Önleme
@@ -3918,19 +3937,19 @@
 DocType: Patient,Personal and Social History,Kişisel ve Sosyal Tarih
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,{0} kullanıcısı oluşturuldu
 DocType: Fee Schedule,Fee Breakup for each student,Her öğrenci için Ücret Ayrılması
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Kodu Değiştir
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 DocType: Purchase Invoice,Availed ITC Cess,Bilinen ITC Cess
 ,Student Monthly Attendance Sheet,Öğrenci Aylık Hazirun Cetveli
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Nakliye kuralı yalnızca Satış için geçerlidir
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç Tarihi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Kadar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Öğrenci Grubu veya Ders Programı zorunludur
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Öğrenci Grubu veya Ders Programı zorunludur
@@ -3953,8 +3972,8 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Satın aldığınız veya sattığınız ürünleri veya hizmetleri listeleyin.
 DocType: Water Analysis,Storage Temperature,Depolama sıcaklığı
 DocType: Employee Attendance Tool,Unmarked Attendance,Işaretsiz Seyirci
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Araştırmacı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Araştırmacı
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programı Kaydı Aracı Öğrenci
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},{0} görevi için başlangıç tarihi bitiş tarihinden daha az olmalı
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Adı veya E-posta zorunludur
@@ -3969,8 +3988,8 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı&#39;na sahip ve bu tedarikçinin RFQ&#39;ları dikkatli bir şekilde verilmelidir.
 DocType: Chapter,Non Profit Manager,Kâr Dışı Müdür
 DocType: BOM,Total Cost(Company Currency),Toplam Maliyet (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Seri No {0} oluşturuldu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Seri No {0} oluşturuldu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Seri No {0} oluşturuldu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Seri No {0} oluşturuldu
 DocType: Homepage,Company Description for website homepage,web sitesinin ana Firma Açıklaması
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Adı
@@ -3980,11 +3999,10 @@
 DocType: Employee,You can enter any date manually,Elle herhangi bir tarihi girebilirsiniz
 DocType: Healthcare Settings,Result Printed,Basılmış Sonuç
 DocType: Asset Category Account,Depreciation Expense Account,Amortisman Giderleri Hesabı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Deneme süresi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} görüntüleme
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Deneme süresi
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Project,Total Costing Amount (via Timesheets),Toplam Maliyetleme Tutarı (Çalışma Sayfası Tablosu Üzerinden)
-DocType: Employee Advance,Expense Approver,Gider Approver
+DocType: Department,Expense Approver,Gider Approver
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
 DocType: Project,Hourly,Saatlik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Grup grup dışı
@@ -3994,7 +4012,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DateTime için
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
 DocType: Accounts Settings,Make Payment via Journal Entry,Dergi Giriş aracılığıyla Ödeme Yap
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Baskılı Açık
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Baskılı Açık
 DocType: Item,Inspection Required before Delivery,Muayene Teslim önce Gerekli
 DocType: Item,Inspection Required before Purchase,Muayene Satın Alma önce Gerekli
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Bekleyen Etkinlikleri
@@ -4004,7 +4022,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,minimum sipariş miktarı
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Kuruluşunuz
 DocType: Fee Component,Fees Category,Ücretler Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Çalışana bildir
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sorgu kaynağı kampanya ise kampanya adı girin
@@ -4015,7 +4033,7 @@
 DocType: Company,Chart Of Accounts Template,Hesaplar Şablon Grafik
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Ürün Fiyatı {0} Fiyat Listesi için güncellenmiş {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Ürün Fiyatı {0} Fiyat Listesi için güncellenmiş {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Kazanç ve Kesintiye göre Maaş Aralığı.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
 DocType: Purchase Invoice Item,Accepted Warehouse,Kabul edilen depo
@@ -4026,12 +4044,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Yarım Gün İşaretle
 DocType: Sales Invoice,Sales Team,Satış Ekibi
 DocType: Sales Invoice,Sales Team,Satış Ekibi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Girdiyi Kopyala
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Girdiyi Kopyala
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Gönderilmeden önce Faydalanıcının adını girin.
 DocType: Program Enrollment Tool,Get Students,Öğrenciler alın
 DocType: Serial No,Under Warranty,Garanti Altında
 DocType: Serial No,Under Warranty,Garanti Altında
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Hata]
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Hata]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Satış emrini kaydettiğinizde görünür olacaktır.
 ,Employee Birthday,Çalışan Doğum Günü
 ,Employee Birthday,Çalışan Doğum Günü
@@ -4055,7 +4074,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Shopping Cart Settings,Orders,Siparişler
-DocType: Employee Leave Approver,Leave Approver,İzin Onaylayan
+DocType: Department,Leave Approver,İzin Onaylayan
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Lütfen bir parti seçin
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Değerlendirme Grubu Adı
@@ -4101,7 +4120,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub İzlenen Öğe
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ALIŞVERİŞ MADDESİ İÇİN ORİJİNAL
 DocType: Asset Category Account,Accumulated Depreciation Account,Birikmiş Amortisman Hesabı
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Bu e-posta otomatik olarak oluşturuldu
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
 DocType: Program Enrollment,Boarding Student,Yatılı Öğrenci
 DocType: Asset,Expected Value After Useful Life,Kullanım süresi sonunda beklenen değer
@@ -4129,24 +4147,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortisman nedeniyle varlıkların elden çıkarılması elendi
-DocType: Member,Member,üye
+DocType: Loan,Member,üye
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Adresleri yönetin
 DocType: Work Order Item,Work Order Item,İş Emri Öğesi
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Tarım Müdürü
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen Tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen Tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
 DocType: Supplier Scorecard Period,Variables,Değişkenler
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Kapanış (Dr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Kapanış (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Boyutu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Seri No {0} stokta değil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Seri No {0} stokta değil
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Satış işlemleri için vergi şablonu.
 DocType: Sales Invoice,Write Off Outstanding Amount,Vadesi Dolmuş Şüpheli Alacak Miktarı
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},"Hesap {0}, Şirket {1} ile eşleşmiyor"
@@ -4155,7 +4173,6 @@
 DocType: Stock Settings,Default Stock UOM,Varsayılan Stok Ölçü Birimi
 DocType: Asset,Number of Depreciations Booked,Amortismanlar sayısı rezervasyonu
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Adet Toplam
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Karşılık Çalışan Borcu: {0}
 DocType: Landed Cost Item,Receipt Document,makbuz Belgesi
 DocType: Employee Education,School/University,Okul / Üniversite
 DocType: Payment Request,Reference Details,Referans Detayları
@@ -4166,7 +4183,7 @@
 DocType: Asset,Double Declining Balance,Çift Azalan Bakiye
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Kapalı sipariş iptal edilemez. iptal etmek için açıklamak.
 DocType: Student Guardian,Father,baba
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Mutabakatı
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Attendance,On Leave,İzinli
@@ -4182,10 +4199,10 @@
 DocType: Lead,Lower Income,Alt Gelir
 DocType: Restaurant Order Entry,Current Order,Geçerli Sipariş
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Kaynak ve hedef depo Satır {0} için aynu olamaz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",Bu Stok Mutabakatı bir Hesap Açılış Kaydı olduğundan fark hesabının aktif ya da pasif bir hesap tipi olması gerekmektedir
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",Bu Stok Mutabakatı bir Hesap Açılış Kaydı olduğundan fark hesabının aktif ya da pasif bir hesap tipi olması gerekmektedir
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Programlara Git
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Satır {0} # Tahsis edilen tutar {1}, talep edilmeyen tutardan {2} daha büyük olamaz"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Satır {0} # Tahsis edilen tutar {1}, talep edilmeyen tutardan {2} daha büyük olamaz"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
@@ -4209,7 +4226,6 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Dakika
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Dakika
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini Kurun&gt; HR Ayarları
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
 DocType: Chapter,Meetup Embed HTML,Tanışma HTML Göm
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Tedarikçiler Listesine Git
@@ -4230,32 +4246,34 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Lütfen Ödeme İsteğini göndermek için Öğrencinin E-posta Kimliği&#39;ni ayarlayın.
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Lütfen Ödeme İsteğini göndermek için Öğrencinin E-posta Kimliği&#39;ni ayarlayın.
 DocType: Patient,Medical History,Tıbbi geçmiş
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 DocType: Patient,Patient ID,Hasta Kimliği
 DocType: Physician Schedule,Schedule Name,Program Adı
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Maaş Makbuzu Oluştur
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Tüm Tedarikçiler Ekleyin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Tüm Tedarikçiler Ekleyin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Sıra # {0}: Tahsis Edilen Miktar, ödenmemiş tutardan büyük olamaz."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,BOM Araştır
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Teminatlı Krediler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Teminatlı Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Teminatlı Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Teminatlı Krediler
 DocType: Purchase Invoice,Edit Posting Date and Time,Düzenleme Gönderme Tarihi ve Saati
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Lütfen Değer Kaybı ile ilgili Hesapları, Varlık Kategori {0} veya Firma {1} içinde belirleyin"
 DocType: Lab Test Groups,Normal Range,Normal aralık
 DocType: Academic Term,Academic Year,Akademik Yıl
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Mevcut Satış
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Açılış Bakiyesi Hisse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Açılış Bakiyesi Hisse
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N-
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Kalan
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
+DocType: Loan,Loan Account,Borç hesabı
 DocType: Purchase Invoice,GST Details,GST Detayları
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},{0} tedarikçisine e-posta gönderildi
 DocType: Item,Default Sales Unit of Measure,Varsayılan Öğe Satış Birimi
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Akademik yıl:
+DocType: Subscription,Past Due Date,Son Tarih
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},{0} öğesi için alternatif öğe ayarlamaya izin verilmez
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarih tekrarlanır
@@ -4268,7 +4286,7 @@
 DocType: Patient Appointment,Patient Appointment,Hasta Randevusu
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Onaylama Rolü kuralın uygulanabilir olduğu rolle aynı olamaz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Bu e-posta Digest aboneliğinden çık
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Tarafından Satıcı Alın
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Tarafından Satıcı Alın
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} öğesi için {0} bulunamadı
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Kurslara Git
 DocType: Accounts Settings,Show Inclusive Tax In Print,Yazdırılacak Dahil Vergilerini Göster
@@ -4277,10 +4295,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Alt düğümleri olan hesaplar Hesap Defteri olarak ayarlanamaz
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitmen Adlandırma Sistemi&gt; Eğitim Ayarları&#39;nı kurun
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Fiyat listesi para biriminin müşterinin temel para birimine dönüştürülme oranı
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Tutar (Şirket Para)
 DocType: Physician,Physician Schedules,Hekim Programları
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,"Toplam avans miktarı, toplam onaylanan tutardan fazla olamaz"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,"Toplam avans miktarı, toplam onaylanan tutardan fazla olamaz"
 DocType: Salary Slip,Hour Rate,Saat Hızı
 DocType: Salary Slip,Hour Rate,Saat Hızı
 DocType: Stock Settings,Item Naming By,Ürün adlandırma
@@ -4300,6 +4319,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} dan eski stok işlemlerini güncellemeye izin yok
 DocType: BOM,Inspection Required,Muayene Gerekli
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Göndermeden önce Banka Garanti Numarasını girin.
 DocType: Driving License Category,Class,Sınıf
 DocType: Sales Order,Fully Billed,Tam Faturalı
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,"İş Emri, Öğe Şablonuna karşı yükseltilemez"
@@ -4310,7 +4330,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Assessment Plan,Program,program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitmen Adlandırma Sistemi&gt; Eğitim Ayarları&#39;nı kurun
 DocType: Serial No,Is Cancelled,İptal edilmiş
 DocType: Student Group,Group Based On,Ona Dayalı Grup
 DocType: Student Group,Group Based On,Ona Dayalı Grup
@@ -4322,10 +4341,12 @@
 DocType: Cheque Print Template,Cheque Height,Çek Yükseklik
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
 DocType: Setup Progress,Setup Progress,Kurulum İlerlemesi
+DocType: Expense Claim,Approval Status,Onay Durumu
+DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Hub Settings,Publish Items to Hub,Hub Öğe yayınlayın
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"Değerden, {0} satırındaki değerden az olmalıdır"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Elektronik transfer
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Tümünü kontrol
 ,Issued Items Against Work Order,İş Emrine Karşı Verilmiş Ürünler
 DocType: Vehicle Log,Invoice Ref,fatura Ref
@@ -4359,13 +4380,12 @@
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP Ambarında Mevcut Miktar
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Öngörülen
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
 DocType: Notification Control,Quotation Message,Teklif Mesajı
-DocType: Employee Loan,Employee Loan Application,Çalışan Kredi Başvurusu
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Lütfen önce hastayı kaydedin
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Lütfen önce hastayı kaydedin
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Mevcudiyet başarıyla işaretlendi
 DocType: Program Enrollment,Public Transport,Toplu taşıma
 DocType: Soil Texture,Silt Composition (%),Silt Kompozisyonu (%)
@@ -4384,7 +4404,7 @@
 ,Item Balance (Simple),Öğe Dengesi (Basit)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
 DocType: POS Profile,Write Off Account,Şüpheli Alacaklar Hesabı
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Borç Notu Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Borç Notu Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,İndirim Tutarı
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,İndirim Tutarı
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
@@ -4409,6 +4429,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Invoice Item,Delivered Qty,Teslim Edilen Miktar
 DocType: Assessment Plan,Assessment Plan,Değerlendirme Planı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Ters Günlük Girişi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Müşteri {0} oluşturuldu.
 DocType: Stock Settings,Limit Percent,Sınır Yüzde
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Şu an herhangi bir depoda stok yok
@@ -4422,14 +4443,15 @@
 DocType: Journal Entry,Stock Entry,Stok Girişleri
 DocType: Payment Entry,Payment References,Ödeme Referansları
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Aralık alanı için aralıkların sayısı, örneğin &#39;Günler&#39; ve Faturalama Aralığı 3 ise, faturalar her 3 günde bir oluşturulur."
 DocType: Vehicle,Insurance Details,Sigorta Detayları
 DocType: Account,Payable,Borç
 DocType: Share Balance,Share Type,Paylaşım Türü
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Geri Ödeme Süreleri giriniz
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Geri Ödeme Süreleri giriniz
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Borçlular ({0})
 DocType: Pricing Rule,Margin,Kar Marjı
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yeni Müşteriler
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brüt Kazanç%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brüt Kazanç%
 DocType: Appraisal Goal,Weightage (%),Ağırlık (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS Profilini Değiştir
 DocType: Bank Reconciliation Detail,Clearance Date,Gümrükleme Tarih
@@ -4439,10 +4461,11 @@
 DocType: Lead,Address Desc,Azalan Adres
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Parti zorunludur
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Diğer satırlarda yinelenen son tarih bulunan satırlar bulundu: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Diğer satırlarda yinelenen son tarih bulunan satırlar bulundu: {list}
 DocType: Topic,Topic Name,Konu Adı
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Lütfen HR Ayarları&#39;nda Onay Onay Bildirimi için varsayılan şablonu ayarlayın.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Satış veya Alıştan en az biri seçilmelidir
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Çalışan avansını elde etmek için bir çalışan seçin.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Çalışan avansını elde etmek için bir çalışan seçin.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Lütfen geçerli bir tarih seçiniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,işinizin doğası seçin.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4463,7 +4486,7 @@
 DocType: Installation Note,Installation Date,Kurulum Tarihi
 DocType: Installation Note,Installation Date,Kurulum Tarihi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Defteri Birlikte Paylaş
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Satış Fatura {0} oluşturuldu
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: Employee,Confirmation Date,Onay Tarihi
@@ -4473,7 +4496,7 @@
 DocType: Account,Accumulated Depreciation,Birikmiş Amortisman
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Daimi Adı
 DocType: Stock Entry,Customer or Supplier Details,Müşteri ya da Tedarikçi Detayları
-DocType: Employee Loan Application,Required by Date,Tarihe Göre Gerekli
+DocType: Loan Application,Required by Date,Tarihe Göre Gerekli
 DocType: Lead,Lead Owner,Talep Yaratma Sahibi
 DocType: Production Plan,Sales Orders Detail,Satış Siparişleri Ayrıntısı
 DocType: Bin,Requested Quantity,istenen Miktar
@@ -4488,10 +4511,11 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Maaş Kayma kimliği
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Çoklu Varyantlar
 DocType: Sales Invoice,Against Income Account,Karşılık Gelir Hesabı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Teslim Edildi
+DocType: Subscription,Trial Period Start Date,Deneme Süresi Başlangıç Tarihi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Lütfen başka bir kullanıcı olarak giriş yapınız.
@@ -4513,12 +4537,11 @@
 DocType: Student Guardian,Student Guardian,Öğrenci Guardian
 DocType: Member,Member Name,Üye adı
 DocType: Stock Settings,Use Naming Series,Adlandırma Dizisini Kullan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,abonelikte
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı Ölçü Birimi yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 DocType: Membership,Payment Details,Ödeme detayları
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Ürün Ağacı Oranı
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Ürün Ağacı Oranı
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Durdurulan İş Emri iptal edilemez, İptal etmeden önce kaldır"
 DocType: Asset,Journal Entry for Scrap,Hurda için kayıt girişi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
@@ -4538,6 +4561,7 @@
 DocType: Land Unit,Land Unit,Kara Birimi
 ,Purchase Analytics,Satın alma analizleri
 DocType: Sales Invoice Item,Delivery Note Item,İrsaliye Ürünleri
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Şu fatura {0} eksik
 DocType: Asset Maintenance Log,Task,Görev
 DocType: Asset Maintenance Log,Task,Görev
 DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı #
@@ -4551,7 +4575,7 @@
 DocType: Company,Exchange Gain / Loss Account,Kambiyo Kâr / Zarar Hesabı
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Çalışan ve Seyirci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Formu doldurun ve kaydedin
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Formu doldurun ve kaydedin
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Güncel stok miktarı
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Güncel stok miktarı
@@ -4567,7 +4591,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standart Satış Oranı
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
 DocType: Cash Flow Mapper,Section Name,Bölüm adı
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Yeniden Sipariş Adet
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Yeniden Sipariş Adet
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Güncel İş Olanakları
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
@@ -4579,9 +4603,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Tüm Malzeme Listesi&#39;nde en son fiyatı güncellemek için bekletildi. Birkaç dakika sürebilir.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Yeni Hesabın Adı. Not: Müşteriler ve Tedarikçiler için hesap oluşturmayın
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Ülke bilgisi varsayılan adres şablonları
 DocType: Water Analysis,Appearance,Görünüm
+DocType: HR Settings,Leave Status Notification Template,Durum Bildirimi Şablonunu Bırak
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Ort. Alış Fiyatı Liste Oranı
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Üye bilgisi.
@@ -4605,7 +4629,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,İzin verilmedi. Lütfen Test Şablonu&#39;nu devre dışı bırakın
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
 DocType: Crop Cycle,Linked Land Unit,Bağlı Arazi Birimi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
@@ -4622,7 +4646,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Kullanıcılara Git
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen Tutar ve Şüpheli Alacak Tutarı toplamı Genel Toplamdan fazla olamaz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Kayıtlı Olmadığı İçin Geçersiz GSTIN veya Gir NA
 DocType: Training Event,Seminar,seminer
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Kayıt Ücreti
@@ -4640,14 +4664,14 @@
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 DocType: Company,Create Chart Of Accounts Based On,Hesaplar Tabanlı On Of grafik oluşturma
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Grup dışı olarak dönüştürülemez. Çocuk Görevleri var.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
 ,Stock Ageing,Stok Yaşlanması
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Öğrenci {0} öğrenci başvuru karşı mevcut {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Yuvarlama Ayarı (Şirket Kuru)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Zaman çizelgesi
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Toplu:
 DocType: Volunteer,Afternoon,Öğleden sonra
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Cheque Print Template,Scanned Cheque,taranan Çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
@@ -4664,7 +4688,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,{0} projesi zaten mevcut
 DocType: Medical Department,Nursing User,Hemşirelik kullanıcısı
 DocType: Plant Analysis,Plant Analysis Criterias,Bitki Analizi Kriterleri
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Sorumluluklar
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},"{0} Seri Numarası, {1} Batch&#39;a ait değil"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Sorumluluklar
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Bu fiyat teklifinin geçerlilik süresi sona erdi.
 DocType: Expense Claim Account,Expense Claim Account,Gider Talep Hesabı
 DocType: Accounts Settings,Allow Stale Exchange Rates,Eski Döviz Kurlarına İzin Ver
@@ -4687,11 +4712,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Varyasyonları Oluşturun
 DocType: Item,Default BOM,Standart BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Toplam Faturalandırılan Tutar (Satış Faturaları ile)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Borç Not Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Borç Not Tutarı
 DocType: Project Update,Not Updated,Güncellenmedi
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Oran, pay sayısı ve hesaplanan tutar arasında tutarsızlıklar vardır"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Toplam Alacakların Tutarı
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Toplam Alacakların Tutarı
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
 DocType: Employee Advance,Advance Account,Peşin Hesap
 DocType: Job Offer,Job Offer Terms,İş Teklifi Koşulları
@@ -4701,7 +4726,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Otomotiv
 DocType: Vehicle,Insurance Company,Sigorta şirketi
 DocType: Asset Category Account,Fixed Asset Account,Sabit Varlık Hesabı
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Değişken
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Değişken
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,İrsaliyeden
 DocType: Chapter,Members,Üyeler
 DocType: Student,Student Email Address,Öğrenci E-Posta Adresi
@@ -4728,7 +4753,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Stajyer
 DocType: Delivery Stop,Address Name,Adres Adı
 DocType: Stock Entry,From BOM,BOM Gönderen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} biriminin {0} biriminin bölünmesi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} biriminin {0} biriminin bölünmesi
 DocType: Assessment Code,Assessment Code,Değerlendirme Kodu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Temel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Temel
@@ -4737,15 +4762,15 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
 DocType: Bank Reconciliation Detail,Payment Document,Ödeme Belgesi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Kriter formülünü değerlendirirken hata oluştu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
+DocType: Subscription,Plans,Planlar
 DocType: Salary Slip,Salary Structure,Maaş Yapısı
 DocType: Salary Slip,Salary Structure,Maaş Yapısı
 DocType: Account,Bank,Banka
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Havayolu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Sayı Malzeme
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Yinelenen oluşturulurken bir hata oluştu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Sayı Malzeme
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Employee,Offer Date,Teklif Tarihi
@@ -4755,13 +4780,12 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hiçbir Öğrenci Grupları oluşturuldu.
 DocType: Purchase Invoice Item,Serial No,Seri No
 DocType: Purchase Invoice Item,Serial No,Seri No
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Aylık Geri Ödeme Tutarı Kredi Miktarı daha büyük olamaz
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Aylık Geri Ödeme Tutarı Kredi Miktarı daha büyük olamaz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Lütfen ilk önce Bakım Detayını girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,"Sıra # {0}: Beklenen Teslim Tarihi, Satın Alma Siparişi Tarihinden önce olamaz"
 DocType: Purchase Invoice,Print Language,baskı Dili
 DocType: Salary Slip,Total Working Hours,Toplam Çalışma Saatleri
 DocType: Sales Invoice,Customer PO Details,Müşteri PO Ayrıntıları
-DocType: Subscription,Next Schedule Date,Sonraki Program Tarihi
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Geçici Açılış Hesabı
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Enter değeri pozitif olmalıdır
@@ -4793,11 +4817,11 @@
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Tarih aralığı gerekli
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Sözü edilen ölçütler için çalışan yok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
 DocType: Hotel Settings,Default Customer,Varsayılan Müşteri
 DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Aynı gün için randevu oluşturulup oluşturulmadığını teyit etmeyin
@@ -4824,18 +4848,18 @@
 DocType: Journal Entry Account,Employee Advance,Çalışan Avansı
 DocType: Payroll Entry,Payroll Frequency,Bordro Frekansı
 DocType: Lab Test Template,Sensitivity,Duyarlılık
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Hammadde
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Hammadde
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Hammadde
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Hammadde
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Bitkiler ve Makinaları
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Bitkiler ve Makinaları
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Günlük Çalışma Özet Ayarları
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Lütfen Reqd&#39;yi Tarihe Göre Girin
 DocType: Payment Entry,Internal Transfer,İç transfer
 DocType: Asset Maintenance,Maintenance Tasks,Bakım Görevleri
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hedef miktarı veya hedef tutarı zorunludur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
 DocType: Leave Control Panel,Carry Forward,Nakletmek
 DocType: Leave Control Panel,Carry Forward,Nakletmek
@@ -4845,6 +4869,7 @@
 DocType: Crop Cycle,Detected Disease,Algılanan Hastalık
 ,Produced,Üretilmiş
 ,Produced,Üretilmiş
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,"Geri Ödeme Başlangıç Tarihi, Ödeme Tarihinden önce olamaz."
 DocType: Item,Item Code for Suppliers,Tedarikçi Ürün Kodu
 DocType: Issue,Raised By (Email),(Email)  ile talep eden
 DocType: Training Event,Trainer Name,eğitmen Adı
@@ -4852,8 +4877,8 @@
 DocType: Mode of Payment,General,Genel
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Son İletişim
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Son İletişim
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Seri Ürün{0} için Seri numaraları gereklidir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Seri Ürün{0} için Seri numaraları gereklidir
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Faturalar ile maç Ödemeleri
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
@@ -4868,8 +4893,8 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},"{0}, yarım güne {1}"
 DocType: Production Plan,Get Material Request,Malzeme İsteği alın
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Posta Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Posta Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Posta Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Toplam (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
@@ -4883,9 +4908,9 @@
 DocType: Drug Prescription,Hour,Saat
 DocType: Restaurant Order Entry,Last Sales Invoice,Son Satış Faturası
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Lütfen {0} öğesine karşı Miktar seçin
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Blok Tarihlerdeki çıkışları onaylama yetkiniz yok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Blok Tarihlerdeki çıkışları onaylama yetkiniz yok
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Bütün bu ürünler daha önce faturalandırılmıştır
 DocType: Company,Monthly Sales Target,Aylık Satış Hedefi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
@@ -4893,7 +4918,7 @@
 DocType: Item,Default Material Request Type,Standart Malzeme Talebi Tipi
 DocType: Supplier Scorecard,Evaluation Period,Değerlendirme Süresi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Bilinmeyen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,İş Emri oluşturulmadı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,İş Emri oluşturulmadı
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: Purchase Invoice,Export Type,İhracat Şekli
 DocType: Salary Slip Loan,Salary Slip Loan,Maaş Kaybı Kredisi
@@ -4910,8 +4935,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Faturaları Açma Özeti
 DocType: Education Settings,Education Manager,Eğitim Müdürü
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Optimal büyüme için tarladaki her bitki arasındaki minimum uzunluk
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Harmanlanmış Madde {0}, Stok Mutabakatı kullanılarak güncellenemez, bunun yerine Stok Girişi kullanın"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Harmanlanmış Madde {0}, Stok Mutabakatı kullanılarak güncellenemez, bunun yerine Stok Girişi kullanın"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Harmanlanmış Madde {0}, Stok Mutabakatı kullanılarak güncellenemez, bunun yerine Stok Girişi kullanın"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Harmanlanmış Madde {0}, Stok Mutabakatı kullanılarak güncellenemez, bunun yerine Stok Girişi kullanın"
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: Student,Middle Name,İkinci ad
@@ -4944,9 +4969,9 @@
 DocType: BOM,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +47,Net Change in Equity,Özkaynak Net Değişim
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","{0} E-posta adresi zaten var, benzersiz olmalıdır."
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Makbuz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Makbuz
 ,Sales Register,Satış Kayıt
 ,Sales Register,Satış Kayıt
 DocType: Daily Work Summary Group,Send Emails At,At e-postalar gönderin
@@ -4954,6 +4979,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Düzenlenecek bir şey yok
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Form Görünümü
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Gider Talebi&#39;nde Harcama Uygunluğu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",Kendiniz dışındaki kullanıcılarınızı kuruluşunuza ekleyin.
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
@@ -4961,7 +4987,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Henüz müşteri yok!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Nakit Akım Tablosu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Malzeme isteği oluşturulmadı
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisans
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
@@ -4985,11 +5011,12 @@
 DocType: Vehicle,Chassis No,şasi No
 DocType: Payment Request,Initiated,Başlatılan
 DocType: Production Plan Item,Planned Start Date,Planlanan Başlangıç Tarihi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Lütfen bir BOM seçin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Lütfen bir BOM seçin
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Bilinen ITC Entegre Vergi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
+DocType: Bank Guarantee,Clauses and Conditions,Şartlar ve Koşullar
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
 DocType: Project Task,View Timesheet,Çizelgeyi görüntüle
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Bitiş tarihi başlangıç tarihinden daha büyük olmalıdır
 DocType: Leave Type,Is Encash,Bozdurulmuş
 DocType: Leave Allocation,New Leaves Allocated,Tahsis Edilen Yeni İzinler
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
@@ -5005,9 +5032,10 @@
 DocType: Patient,Alcohol Current Use,Alkol Kullanımı
 DocType: Student Admission Program,Student Admission Program,Öğrenci Kabul Programı
 DocType: Payment Entry,Account Paid To,Hesap şuna ödenmiş
+DocType: Subscription Settings,Grace Period,Grace dönemi
 DocType: Item Alternative,Alternative Item Name,Alternatif öğe adı
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Maaş Fişi sunamadı <br> \ Olası nedenler: <br> \ 1. Net ücret 0'dan düşüktür. <br> \ 2. Şirketin ana şefinde belirtilen Şirket E-posta Adresi geçerli değildir. <br>
@@ -5019,7 +5047,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} {2} {3} için {1} bütçe hesabı {4} tanımlıdır. Bütçe {5} kadar aşılacaktır.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Satır {0}: Hesap türü 'Sabit Varlık' olmalıdır
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Çıkış Miktarı
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,ve engellenmemiş Engelli
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Seri zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Finansal Hizmetler
@@ -5032,15 +5059,17 @@
 DocType: Complaint,Complaint,şikâyet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Geri Ödeme Girişi Yap
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Bütün bölümler
 DocType: Patient,Alcohol Past Use,Alkol Geçmiş Kullanım
 DocType: Fertilizer Content,Fertilizer Content,Gübre İçerik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Sorunlu / Stuck
 DocType: Tax Rule,Billing State,Fatura Kamu
 DocType: Share Transfer,Transfer,Transfer
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Bu Müşteri Siparişi iptal edilmeden önce İş Emri {0} iptal edilmelidir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
@@ -5066,10 +5095,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Perakende
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Perakende
 DocType: Student Attendance,Absent,Eksik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Ürün Paketi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} &#39;da başlayan skor bulunamadı. 0&#39;dan 100&#39;e kadar olan ayakta puanlara sahip olmanız gerekir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
+DocType: Subscription,Current Invoice Start Date,Mevcut Fatura Başlangıç Tarihi
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: {2} için borç ya da alacak tutarı girilmelidir
 DocType: GL Entry,Remarks,Açıklamalar
@@ -5080,11 +5110,13 @@
 DocType: Task,Parent Task,Ana Görev
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Müşteri Adayı Oluştur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Baskı ve Kırtasiye
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Baskı ve Kırtasiye
 DocType: Stock Settings,Show Barcode Field,Göster Barkod Alanı
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Tedarikçi E-postalarını Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Maaş zaten {0} ve {1}, bu tarih aralığında olamaz başvuru süresini bırakın arasındaki dönem için işlenmiş."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Tedarikçi E-postalarını Gönder
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Maaş zaten {0} ve {1}, bu tarih aralığında olamaz başvuru süresini bırakın arasındaki dönem için işlenmiş."
+DocType: Fiscal Year,Auto Created,Otomatik Oluşturuldu
 DocType: Chapter Member,Leave Reason,Nedenini Bırak
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Fatura {0} artık mevcut değil
 DocType: Guardian Interest,Guardian Interest,Guardian İlgi
 DocType: Volunteer,Availability,Kullanılabilirlik
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS Faturaları için varsayılan değerleri ayarlayın
@@ -5093,14 +5125,13 @@
 DocType: Timesheet,Employee Detail,Çalışan Detay
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-posta Kimliği
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 E-posta Kimliği
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
 DocType: Lab Prescription,Test Code,Test Kodu
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Web sitesi ana sayfası için Ayarlar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} puan kartının statüsü nedeniyle {0} için tekliflere izin verilmiyor.
 DocType: Job Offer,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Yukarıdaki
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Toplam Tutar {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Toplam Tutar {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Standart dışı borç hesabı ise
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Lütfen &#39;Tüm Değerlendirme Grupları&#39; dışındaki değerlendirme grubunu seçin.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},{0} Satırı: {1} öğesi için maliyet merkezi gerekiyor
@@ -5111,7 +5142,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Su Analizi
 DocType: Chapter,Region,Bölge
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
 DocType: Holiday List,Weekly Off,Haftalık İzin
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Bağlantılı Analizi Yeniden Yükle
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
@@ -5130,7 +5161,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Hurdaya Varlığın Maliyeti
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
 DocType: Vehicle,Policy No,Politika yok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 DocType: Asset,Straight Line,Düz Çizgi
 DocType: Project User,Project User,Proje Kullanıcısı
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Bölünmüş
@@ -5171,24 +5202,24 @@
 DocType: Supplier Scorecard Scoring Variable,Path,yol
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Çocuk nodları olduğundan Maliyet Merkezi ana deftere dönüştürülemez
 DocType: Production Plan,Total Planned Qty,Toplam Planlanan Adet
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,açılış Değeri
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,açılış Değeri
 DocType: Salary Detail,Formula,formül
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Seri #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seri #
 DocType: Lab Test Template,Lab Test Template,Lab Test Şablonu
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Satış hesabı
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Satış hesabı
 DocType: Purchase Invoice Item,Total Weight,Toplam ağırlık
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Satış Komisyonu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Satış Komisyonu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Satış Komisyonu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Satış Komisyonu
 DocType: Job Offer Term,Value / Description,Değer / Açıklama
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
 DocType: Tax Rule,Billing Country,Fatura Ülkesi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran Siparişi Girişi
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
 DocType: Asset Maintenance Task,Assign To Name,İsim Ata
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Eğlence Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Eğlence Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Eğlence Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Eğlence Giderleri
 DocType: Hub Settings,Enabled Users,Etkin Kullanıcılar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Malzeme İsteği olun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Açık Öğe {0}
@@ -5201,31 +5232,31 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,İzin başvuruları.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
 DocType: Vehicle,Last Carbon Check,Son Karbon Kontrol
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Yasal Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Yasal Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Yasal Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Lütfen satırdaki miktarı seçin
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Açılış Satış Yapmak ve Fatura Almak
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Timesheet,% Amount Billed,% Faturalanan Tutar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon Giderleri
 DocType: Sales Partner,Logo,Logo
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kullanıcıya kaydetmeden önce seri seçtirmek istiyorsanız işaretleyin. Eğer işaretlerseniz atanmış seri olmayacaktır.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
 DocType: Email Digest,Open Notifications,Açık Bildirimler
 DocType: Payment Entry,Difference Amount (Company Currency),Fark Tutarı (Şirket Para Birimi)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Doğrudan Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Doğrudan Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Doğrudan Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Doğrudan Giderler
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Yeni Müşteri Gelir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Seyahat Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Seyahat Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Seyahat Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},{0} doctype&#39;da özel alan Aboneliği ekleyin
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Purchase Receipt Item,Sample Quantity,Numune Miktarı
+DocType: Bank Guarantee,Name of Beneficiary,Yararlanıcının Adı
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM maliyetini, son değerleme oranı / fiyat listesi oranı / son hammadde alım oranı temel alınarak, Zamanlayıcı aracılığıyla otomatik olarak güncelleyin."
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
@@ -5238,15 +5269,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Deneme Süresi
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Maaş Bileşenleri
 DocType: Program Enrollment Tool,New Academic Year,Yeni Akademik Yıl
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,İade / Kredi Notu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,İade / Kredi Notu
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Toplam Ödenen Tutar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Toplam Ödenen Tutar
 DocType: GST Settings,B2C Limit,B2C Sınırı
 DocType: Work Order Item,Transferred Qty,Transfer Edilen Miktar
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Gezinme
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planlama
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Planlama
 DocType: Share Balance,Issued,Veriliş
+DocType: Loan,Repayment Start Date,Geri Ödeme Başlangıç Tarihi
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Öğrenci Etkinliği
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Tedarikçi Kimliği
 DocType: Payment Request,Payment Gateway Details,Ödeme Gateway Detayları
@@ -5259,10 +5291,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Normal, hastalık vb izin tipleri"
 DocType: Email Digest,Send regular summary reports via Email.,E-posta yoluyla düzenli özet raporlar gönder.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Gider Talep Tip varsayılan hesap ayarlayın {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Gider Talep Tip varsayılan hesap ayarlayın {0}
 DocType: Assessment Result,Student Name,Öğrenci adı
 DocType: Brand,Item Manager,Ürün Yöneticisi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Ödenecek Bordro
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Ödenecek Bordro
 DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
 DocType: Plant Analysis,Collection Datetime,Koleksiyon Datetime
 DocType: Work Order,Total Operating Cost,Toplam İşletme Maliyeti
@@ -5275,9 +5307,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Kullanıcı {0} yok
 DocType: Payment Term,Day(s) after invoice date,Fatura tarihinden sonraki günler
 DocType: Payment Schedule,Payment Schedule,Ödeme PLANI
-DocType: Subscription,SUB-,ALT-
 DocType: Item Attribute Value,Abbreviation,Kısaltma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Ödeme giriş zaten var
+DocType: Subscription,Trial Period End Date,Deneme Süresi Bitiş Tarihi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maaş Şablon Alanı.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patoloji
@@ -5294,9 +5326,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Bütün Müşteri Grupları
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Aylık Birikim
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Vergi şablonu zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
@@ -5306,16 +5338,17 @@
 DocType: Lab Prescription,Test Created,Test Oluşturuldu
 DocType: Healthcare Settings,Custom Signature in Print,Baskıda Özel İmza
 DocType: Account,Temporary,Geçici
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Müşteri LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Müşteri LPO No.
 DocType: Program,Courses,Dersler
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekreter
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Sekreter
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","devre dışı ise, bu alanda &#39;sözleriyle&#39; herhangi bir işlem görünür olmayacak"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"Bu işlem, gelecekteki faturalandırmayı durduracak. Bu aboneliği iptal etmek istediğinizden emin misiniz?"
 DocType: Serial No,Distinct unit of an Item,Bir Öğe Farklı birim
 DocType: Supplier Scorecard Criteria,Criteria Name,Ölçütler Adı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Lütfen şirket ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Lütfen şirket ayarlayın
 DocType: Pricing Rule,Buying,Satın alma
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Hastalıklar ve Gübreler
 DocType: HR Settings,Employee Records to be created by,Oluşturulacak Çalışan Kayıtları
@@ -5324,18 +5357,18 @@
 DocType: POS Profile,Apply Discount On,İndirim On Uygula
 DocType: Member,Membership Type,üyelik tipi
 ,Reqd By Date,Teslim Tarihi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Alacaklılar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Alacaklılar
 DocType: Assessment Plan,Assessment Name,Değerlendirme Adı
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,PDC&#39;yi Yazdır&#39;da Göster
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,PDC&#39;yi Yazdır&#39;da Göster
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Satır # {0}: Seri No zorunludur
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Ürün Vergi Detayları
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,İş teklifi
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Enstitü Kısaltma
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},{0} barkodu zaten {1} ürününde kullanılmış
@@ -5356,7 +5389,7 @@
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Etkinse, sistem otomatik olarak envanter için muhasebe kayıtlarını yayınlayacaktır"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Komisyonculuk
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Komisyonculuk
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,çalışan {0} için Seyirci zaten bu gün için işaretlenmiş
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,çalışan {0} için Seyirci zaten bu gün için işaretlenmiş
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","Dakika 
  'Zaman Log' aracılığıyla Güncelleme"
@@ -5371,6 +5404,7 @@
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,En az bir depo zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,En az bir depo zorunludur
+DocType: Subscriber,Subscriber Name,Abone Adı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Update Tool,Replace,Değiştir
@@ -5382,21 +5416,20 @@
 DocType: Request for Quotation Item,Project Name,Proje Adı
 DocType: Customer,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Çalışan kredisinde faiz gelir hesabını seçin {0}
 DocType: Work Order,Required Items,gerekli Öğeler
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,İnsan Kaynakları
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Ödeme Mutabakat Ödemesi
 DocType: Disease,Treatment Task,Tedavi Görevi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Vergi Varlıkları
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Vergi Varlıkları
 DocType: BOM Item,BOM No,BOM numarası
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Update Tool,The BOM which will be replaced,Değiştirilecek BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektronik Ekipmanlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektronik Ekipmanlar
 DocType: Asset,Maintenance Required,Bakım gerekli
 DocType: Account,Debit,Borç
 DocType: Account,Debit,Borç
@@ -5406,7 +5439,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Alacak tutarı
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Bu Satış Kişisi için Ürün Grubu hedefleri ayarlayın
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] daha eski donmuş stoklar
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Satır # {0}: Varlık sabit kıymet alım / satım için zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Satır # {0}: Varlık sabit kıymet alım / satım için zorunludur
 DocType: Asset Maintenance Team,Maintenance Team Name,Bakım Takım Adı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Müşteri olarak &#39;Fırsat Fırsatı&#39; seçilmişse, müşteri zorunludur"
@@ -5417,14 +5450,12 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Gider talebi Türleri.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"{0} öğesinin satış oranı, onun {1} değerinden düşük. Satış oranı atleast olmalıdır {2}"
-DocType: Item,Taxes,Vergiler
-DocType: Item,Taxes,Vergiler
+DocType: Subscription,Taxes,Vergiler
+DocType: Subscription,Taxes,Vergiler
 DocType: Purchase Invoice,capital goods,sermaye malları
 DocType: Purchase Invoice Item,Weight Per Unit,Birim Ağırlığı
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Ödendi ancak Teslim Edilmedi
 DocType: Project,Default Cost Center,Standart Maliyet Merkezi
-DocType: Bank Guarantee,End Date,Bitiş Tarihi
-DocType: Bank Guarantee,End Date,Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stok İşlemleri
 DocType: Budget,Budget Accounts,Bütçe Hesapları
 DocType: Employee,Internal Work History,İç Çalışma Geçmişi
@@ -5432,7 +5463,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Özel Sermaye
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Özel Sermaye
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Tedarikçi Puan Kartı Değişkeni
-DocType: Employee Loan,Fully Disbursed,Tamamen dönemlerde toplanan
 DocType: Employee Advance,Due Advance Amount,Vadeli Avans Tutarı
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
@@ -5458,7 +5488,7 @@
 ,Employee Information,Çalışan Bilgileri
 DocType: Stock Entry Detail,Additional Cost,Ek maliyet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Satışlar ve satın alımlar için varsayılan vergi şablonları oluşturulmuştur.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Değerlendirme Sonuç kaydı {0} zaten var.
@@ -5466,7 +5496,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Gruplandırılmış &#39;Şirket&#39; ise lütfen şirket filtresini boş olarak ayarlayın.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Gönderme Tarihi gelecek tarih olamaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,tekrarlanan üretmek için
 DocType: Stock Entry,Target Warehouse Address,Hedef Depo Adresi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Mazeret İzni
 DocType: Agriculture Task,End Day,Gün sonu
@@ -5493,11 +5522,10 @@
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kurs Tabanlı Öğrenci Grubu için, Kurs, Kayıt Edilen Program Kayıt Kurslarından her öğrenci için geçerli olacak."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Parça başı iş
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Parça başı iş
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ort. Alış Oranı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Share Balance,From No,Hayır&#39;dan
 DocType: Task,Actual Time (in Hours),Gerçek Zaman (Saat olarak)
 DocType: Employee,History In Company,Şirketteki Geçmişi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{Gönderen} &#39;den gelen yeni mesaj
 DocType: Customer,Customer Primary Address,Müşteri Birincil Adres
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Haber Bültenleri
 DocType: Drug Prescription,Description/Strength,Açıklama / Güç
@@ -5506,22 +5534,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Aynı madde birden çok kez girildi
 DocType: Department,Leave Block List,İzin engel listesi
 DocType: Purchase Invoice,Tax ID,Vergi numarası
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Ürün {0} Seri No kurulumu değildir. Sütun boş bırakılmalıdır
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Ürün {0} Seri No kurulumu değildir. Sütun boş bırakılmalıdır
 DocType: Accounts Settings,Accounts Settings,Hesap ayarları
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Onayla
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} için biçimlendirilmiş adres, lütfen devam etmeyi düzeltin."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} için biçimlendirilmiş adres, lütfen devam etmeyi düzeltin."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Yeni Hesap numarası, hesap adına bir ön ek olarak eklenecektir"
 DocType: Maintenance Team Member,Team Member,Takım üyesi
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Gönderilecek Sonuç Yok
 DocType: Customer,Sales Partner and Commission,Satış Ortağı ve Komisyon
-DocType: Employee Loan,Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı
+DocType: Loan,Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı
 ,Project Quantity,Proje Miktarı
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır
 DocType: Opportunity,To Discuss,Görüşülecek
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {0} birim {1} gerekli.
 DocType: Loan Type,Rate of Interest (%) Yearly,İlgi Oranı (%) Yıllık
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Geçici Hesaplar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Siyah
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Geçici Hesaplar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Siyah
 DocType: BOM Explosion Item,BOM Explosion Item,Ürün Ağacı Patlatılmış Malzemeler
 DocType: Shareholder,Contact List,Kişi listesi
 DocType: Account,Auditor,Denetçi
@@ -5529,16 +5557,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} ürün üretildi
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Daha fazla bilgi edin
 DocType: Cheque Print Template,Distance from top edge,üst kenarından uzaklık
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Fiyat Listesi {0} devre dışı veya yok
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Fiyat Listesi {0} devre dışı veya yok
 DocType: Purchase Invoice,Return,Dönüş
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Ödeme Modu ödeme yapmak için gereklidir
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Ödeme Modu ödeme yapmak için gereklidir
 DocType: Project Task,Pending Review,Bekleyen İnceleme
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Öğeler, seri no&#39;lar, gruplar vb. Gibi daha fazla seçenek için tam sayfayı düzenleyin."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Randevular ve İstişareler
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Küme {2} &#39;ye kayıtlı değil
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","{0} varlığı hurda edilemez, {1} da var olarak gözüküyor"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Çekler Gerekli
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Çekler Gerekli
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Gelmedi işaretle
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kurulum şirketi başarısız oldu
@@ -5550,7 +5578,7 @@
 DocType: Homepage,Tag Line,Etiket Hattı
 DocType: Fee Component,Fee Component,ücret Bileşeni
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Filo yönetimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Öğelerden ekle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Öğelerden ekle
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Mahsuller ve Arsalar
 DocType: Cheque Print Template,Regular,Düzenli
 DocType: Fertilizer,Density (if liquid),Yoğunluk (sıvı varsa)
@@ -5579,25 +5607,27 @@
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Satış Döngüsünü Keşfedin
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Stok Saklama Stokları
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Stok Saklama Stokları
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 ,Work Order Stock Report,İş Emri Stok Raporu
+DocType: Purchase Receipt,Auto Repeat Detail,Otomatik tekrar detay
 DocType: Assessment Result Tool,Assessment Result Tool,Değerlendirme Sonucu Aracı
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Süpervizör olarak
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Kategori öner
 DocType: BOM Scrap Item,BOM Scrap Item,Ürün Ağacı Hurda Kalemi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Gönderilen emir silinemez
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} devredışı bırakılmış
 DocType: Project,Total Billable Amount (via Timesheets),Toplam Faturalandırılabilir Tutar (Çalışma Sayfası Tablosu ile)
 DocType: Agriculture Task,Previous Business Day,Önceki İş Günü
-DocType: Employee Loan,Repay Fixed Amount per Period,Dönem başına Sabit Tutar Repay
+DocType: Loan,Repay Fixed Amount per Period,Dönem başına Sabit Tutar Repay
 DocType: Employee,Health Insurance No,Sağlık Sigortası Hayır
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredi Notu Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredi Notu Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Toplam Vergilendirilebilir Tutar
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
 DocType: Opening Invoice Creation Tool,Purchase,Satın Alım
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Denge Adet
@@ -5608,18 +5638,20 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} için {1}
 DocType: Healthcare Settings,Valid number of days,Geçerli gün sayısı
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Maliyet Merkezleri
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Aboneliği Yeniden Başlat
 DocType: Land Unit,Linked Plant Analysis,Bağlı Bitki Analizi
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tedarikçinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Satır # {0}: satır ile Gecikme çatışmalar {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Sıfır Değerleme Oranına izin ver
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Sıfır Değerleme Oranına izin ver
+DocType: Bank Guarantee,Receiving,kabul
 DocType: Training Event Employee,Invited,davetli
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Verilen tarihler için çalışan {0} bulundu birden çok etkin Maaş Yapıları
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Kur Gateway hesapları.
 DocType: Employee,Employment Type,İstihdam Tipi
 DocType: Employee,Employment Type,İstihdam Tipi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Duran Varlıklar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Duran Varlıklar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Duran Varlıklar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Duran Varlıklar
 DocType: Payment Entry,Set Exchange Gain / Loss,Değişim Kazanç Set / Zarar
 ,GST Purchase Register,GST Satın Alma Kaydı
 ,Cash Flow,Nakit Akışı
@@ -5642,9 +5674,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Tüm hisse senedi işlemlerinin listesi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Sayısı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Sayısı
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Her iki Deneme Süresi Başlangıç Tarihi ve Deneme Dönemi Bitiş Tarihi ayarlanmalıdır
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Ortalama oran
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ödeme Planındaki Toplam Ödeme Tutarı Grand / Rounded Total&#39;e eşit olmalıdır.
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ödeme Planındaki Toplam Ödeme Tutarı Grand / Rounded Total&#39;e eşit olmalıdır.
+DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Genel Muhasebe uyarınca Banka Hesap bakiyesi
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
 DocType: Authorization Rule,Customer / Item Name,Müşteri / Ürün İsmi
@@ -5678,6 +5711,7 @@
 DocType: Work Order,Warehouses,Depolar
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} varlığı transfer edilemez
 DocType: Hotel Room Pricing,Hotel Room Pricing,Otel Odasının Fiyatlandırması
+DocType: Subscription,Days Until Due,Sona Ertelenen Günler
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,"Bu Öğe, {0} (Şablon) değişkenidir."
 DocType: Workstation,per hour,saat başına
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,satın alma
@@ -5687,15 +5721,16 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Dağıtım
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Dağıtım
+DocType: Journal Entry Account,Loan,borç
 DocType: Expense Claim Advance,Expense Claim Advance,Gider Talep İlerlemesi
 DocType: Lab Test,Report Preference,Rapor Tercihi
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Gönüllü bilgi.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Proje Müdürü
 ,Quoted Item Comparison,Kote Ürün Karşılaştırma
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} ile {1} arasındaki skorlamanın üst üste gelmesi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Sevk
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Sevk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Malzeme {0 }için izin verilen maksimum indirim} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Net Aktif değeri olarak
 DocType: Crop,Produce,Üretmek
@@ -5706,7 +5741,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Üretimde Malzeme Tüketimi
 DocType: Item Alternative,Alternative Item Code,Alternatif Ürün Kodu
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,İmalat Öğe seç
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,İmalat Öğe seç
 DocType: Delivery Stop,Delivery Stop,Teslimat Durdur
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
 DocType: Item,Material Issue,Malzeme Verilişi
@@ -5718,17 +5753,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
 DocType: BOM,Show Items,göster Öğeler
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Zaman zaman daha büyük olamaz.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Tüm müşterilere e-posta ile haber vermek istiyor musunuz?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Tüm müşterilere e-posta ile haber vermek istiyor musunuz?
+DocType: Subscription Plan,Billing Interval,Faturalama Aralığı
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Devam et
 DocType: Hub Settings,Hub Username,Hub Kullanıcı Adı
 DocType: Salary Detail,Component,Bileşen
 DocType: Assessment Criteria,Assessment Criteria Group,Değerlendirme Ölçütleri Grup
 DocType: Healthcare Settings,Patient Name By,Hasta Adı Tarafından
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} - {1} tarihleri arasında maaşlar için Tahakkuk Günlük Girişi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} - {1} tarihleri arasında maaşlar için Tahakkuk Günlük Girişi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Warehouse,Warehouse Name,Depo Adı
@@ -5745,24 +5780,25 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Burada boy, kilo, alerji, tıbbi endişeler vb  muhafaza edebilirsiniz"
 DocType: Leave Block List,Applies to Company,Şirket için geçerli
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
-DocType: Employee Loan,Disbursement Date,Ödeme tarihi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Alıcılar&#39; belirtilmemiş
+DocType: Loan,Disbursement Date,Ödeme tarihi
 DocType: BOM Update Tool,Update latest price in all BOMs,Tüm BOM&#39;larda en son fiyatı güncelleyin
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Tıbbi kayıt
 DocType: Vehicle,Vehicle,araç
 DocType: Purchase Invoice,In Words,Kelimelerle
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Göndermeden önce banka veya kredi kurumunun adını girin.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} gönderilmelidir
 DocType: POS Profile,Item Groups,Öğe Grupları
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Bugün {0} 'in doğum günü!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Bugün {0} 'in doğum günü!
 DocType: Sales Order Item,For Production,Üretim için
 DocType: Sales Order Item,For Production,Üretim için
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Lütfen Hesap Planında bir Geçici Açılış hesabı ekleyin
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Lütfen Hesap Planında bir Geçici Açılış hesabı ekleyin
 DocType: Customer,Customer Primary Contact,Müşteri Birincil Temas
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Dönem Kapanış Dergisi
 DocType: Project Task,View Task,Görevleri Göster
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Satış Fırsatı/Müşteri Adayı yüzdesi
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Satış Fırsatı/Müşteri Adayı yüzdesi
+DocType: Bank Guarantee,Bank Guarantee Type,Banka Garanti Türü
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Fatura Porsiyonu
 ,Asset Depreciations and Balances,Varlık Değer Kayıpları ve Hesapları
@@ -5774,9 +5810,8 @@
 DocType: Production Plan,Include Subcontracted Items,Taahhütlü Öğeleri Dahil Et
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Birleştir
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Stok değişiminden sonra Variant özelliklerini değiştiremezsiniz. Bunu yapmak için yeni bir Öğe hazırlamanız gerekecek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
-DocType: Employee Loan,Repay from Salary,Maaş dan ödemek
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+DocType: Loan,Repay from Salary,Maaş dan ödemek
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},"karşı ödeme talep {0}, {1} miktarda {2}"
 DocType: Salary Slip,Salary Slip,Bordro
@@ -5801,12 +5836,12 @@
 DocType: Employee Education,Employee Education,Çalışan Eğitimi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,öğe grubu tablosunda bulunan yinelenen öğe grubu
 DocType: Land Unit,Parent Land Unit,Ana Kara Birimi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
 DocType: Fertilizer,Fertilizer Name,Gübre Adı
 DocType: Salary Slip,Net Pay,Net Ödeme
 DocType: Cash Flow Mapping Accounts,Account,Hesap
 DocType: Cash Flow Mapping Accounts,Account,Hesap
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Seri No {0} zaten alınmış
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Seri No {0} zaten alınmış
 ,Requested Items To Be Transferred,Transfer edilmesi istenen Ürünler
 DocType: Expense Claim,Vehicle Log,araç Giriş
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Ateşin varlığı (sıcaklık&gt; 38.5 ° C / 101.3 ° F veya sürekli&gt; 38 ° C / 100.4 ° F)
@@ -5851,27 +5886,25 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
 DocType: Asset Maintenance,Manufacturing User,Üretim Kullanıcı
 DocType: Purchase Invoice,Raw Materials Supplied,Tedarik edilen Hammaddeler
-DocType: C-Form,Series,Seriler
-DocType: C-Form,Series,Seriler
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},{0} fiyat listesinin para birimi {1} veya {2} olmalıdır.
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Soil Texture,Ternary Plot,Üç parsel
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
 DocType: Driver,License Number,Lisans numarası
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,İş Geliştirme Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,İş Geliştirme Müdürü
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bakım ziyareti Amacı
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Fatura Hasta Kayıt
 DocType: Crop,Period,Dönem
 DocType: Crop,Period,Dönem
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Genel Muhasebe
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Genel Muhasebe
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},üzerinde İzni Çalışan {0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},üzerinde İzni Çalışan {0} {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Görünüm İlanlar
 DocType: Program Enrollment Tool,New Program,yeni Program
 DocType: Item Attribute Value,Attribute Value,Değer Özellik
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 DocType: Salary Detail,Salary Detail,Maaş Detay
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Önce {0} seçiniz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Önce {0} seçiniz
 DocType: Appointment Type,Physician,Doktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,{0} partisindeki {1} ürününün ömrü doldu
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,istişareler
@@ -5880,17 +5913,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},"{0} ({1}), İş Emrinde {3} planlanan miktardan ({2}) fazla olamaz"
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Üretim için Mesai Kartı.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ara toplam
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Stok işleminden sonra Varyant özellikleri değiştirilemez. Bunu yapmak için yeni bir öğe yapmanız gerekecek.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA Mandate
 DocType: Physician,Charges,Masraflar
 DocType: Production Plan,Get Items For Work Order,İş Emri İçin Öğeleri Alın
 DocType: Salary Detail,Default Amount,Standart Tutar
 DocType: Salary Detail,Default Amount,Standart Tutar
 DocType: Lab Test Template,Descriptive,Tanımlayıcı
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Sistemde depo bulunmadı
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sistemde depo bulunmadı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Bu Ayın Özeti
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
 DocType: Tax Rule,Purchase Tax Template,Vergi Şablon Satınalma
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Şirketiniz için ulaşmak istediğiniz bir satış hedefi belirleyin.
 ,Project wise Stock Tracking,Proje bilgisi Stok Takibi
@@ -5923,12 +5957,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Web sitesi oluşturulamadı
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Ölçü Birimi Dönüşüm Detayı
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Elde edilen stok tutarı girişi veya Numune Miktarı mevcut değil
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Elde edilen stok tutarı girişi veya Numune Miktarı mevcut değil
 DocType: Program,Program Abbreviation,Program Kısaltma
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
-DocType: Bank Guarantee,Start Date,Başlangıç Tarihi
-DocType: Bank Guarantee,Start Date,Başlangıç Tarihi
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dönem için izinlerin atamasını yap.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Çekler ve Mevduat yanlış temizlenir
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
@@ -5945,11 +5977,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Saat
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
 DocType: Purchase Invoice,04-Correction in Invoice,04-Faturada Düzeltme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM ile tüm öğeler için önceden oluşturulmuş olan İş Emri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM ile tüm öğeler için önceden oluşturulmuş olan İş Emri
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Varyant Detayları Raporu
 DocType: Setup Progress Action,Setup Progress Action,Kurulum İlerleme Eylemi
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Alış Fiyatı Listesi
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Alış Fiyatı Listesi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Aboneliği iptal et
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Lütfen Bakım Durumunu Tamamlandı olarak seçin veya Bitiş Tarihi kaldırın
 DocType: Supplier,Default Payment Terms Template,Varsayılan Ödeme Koşulları Şablonu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,İşlem birimi Ödeme Gateway para birimi olarak aynı olmalıdır
@@ -5960,7 +5993,6 @@
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Birikimli Aylık Bütçe aşıldıysa yapılacak işlem
-DocType: Subscription,Submit on creation,oluşturma Gönder
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
 DocType: Asset,Disposal Date,Bertaraf tarihi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Onlar tatil yoksa e-postalar, verilen saatte şirketin tüm Aktif Çalışanların gönderilecektir. Yanıtların Özeti gece yarısı gönderilecektir."
@@ -5980,6 +6012,7 @@
 DocType: Batch,Parent Batch,Ana Parti
 DocType: Cheque Print Template,Cheque Print Template,Çek Baskı Şablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Aboneliği iptal etmeden veya aboneliği ücretsiz olarak işaretlemeden önce fatura tarihinden sonraki gün sayısı geçmiştir.
 DocType: Lab Test Template,Sample Collection,Örnek koleksiyon
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
 DocType: Price List,Price List Name,Fiyat Listesi Adı
@@ -5991,7 +6024,7 @@
 DocType: Account,Income,Gelir
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Bir şeyler yanlış gitti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 DocType: Supplier Scorecard Scoring Criteria,Score,Gol
@@ -6014,14 +6047,14 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Satış Noktası Profili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,"{0}, 0 ile 100 arasında bir değer olmalıdır"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Sonraki Amortisman Tarihi daha önce olamaz Kullanıma hazır tarih
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Teminatsız Krediler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Teminatsız Krediler
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Student,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Max Çizelgesi karşı çalışma saatleri
 DocType: Maintenance Schedule Detail,Scheduled Date,Program Tarihi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Toplam Ücretli Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Toplam Ücretli Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakterden daha büyük mesajlar birden fazla mesaja bölünecektir
 DocType: Purchase Receipt Item,Received and Accepted,Alındı ve Kabul edildi
 DocType: Hub Settings,Company and Seller Profile,Şirket ve Satıcı Profili
@@ -6036,10 +6069,9 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Lütfen düzeltin
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 DocType: Request for Quotation Item,Supplier Part No,Tedarikçi Parça No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Dan alındı
 DocType: Lead,Converted,Dönüştürülmüş
@@ -6056,6 +6088,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Bilgisayar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
+DocType: Subscription,Current Invoice End Date,Mevcut Fatura Bitiş Tarihi
 DocType: Payment Term,Due Date Based On,Tarihli Vade Tarihi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Lütfen satış ayarlarında varsayılan müşteri grubu ve alanını ayarlayın
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} mevcut değil
@@ -6063,7 +6096,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Donmuş değeri ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Dergi Girişi için herhangi bir geri ödeme seçilmedi
 DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
+DocType: Loan,Disbursed,Önceki dönemlerde toplanan
 DocType: Healthcare Settings,Laboratory Settings,Laboratuar Ayarları
 DocType: Patient Appointment,Service Unit,Servis Ünitesi
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Tedarikçi Başarıyla Ayarlandı
@@ -6078,14 +6113,14 @@
 DocType: Share Balance,No of Shares,Pay Sayısı
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Durum Seç
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: School House,House Name,Evin adı
 DocType: Fee Schedule,Total Amount per Student,Öğrenci Başına Toplam Tutar
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrik
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektrik
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,kullanıcılarınıza olarak kuruluşunuz geri kalanını ekleyin. Ayrıca Rehber onları ekleyerek portalına Müşteriler davet ekleyebilir
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
 DocType: Grant Application,Requested Amount,Talep edilen miktar
@@ -6097,7 +6132,7 @@
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Item,Customer Code,Müşteri Kodu
 DocType: Item,Customer Code,Müşteri Kodu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 DocType: Asset Maintenance Task,Last Completion Date,Son Bitiş Tarihi
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
@@ -6105,10 +6140,11 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Ayarları
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Hazır Varlıklar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Hazır Varlıklar
 DocType: Restaurant,Active Menu,Aktif Menü
 DocType: Target Detail,Target Qty,Hedef Miktarı
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Krediye Karşı: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Ödeme Ayarları
 DocType: Student Attendance,Present,Mevcut
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
@@ -6119,9 +6155,9 @@
 DocType: Vehicle Log,Odometer,Kilometre sayacı
 DocType: Production Plan Item,Ordered Qty,Sipariş Miktarı
 DocType: Production Plan Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Ürün Ağacı hiç stoklanan kalem içermiyor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Ürün Ağacı hiç stoklanan kalem içermiyor
 DocType: Chapter,Chapter Head,Bölüm Başkanı
 DocType: Payment Term,Month(s) after the end of the invoice month,Fatura ayının bitiminden sonraki aylar
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Proje faaliyeti / görev.
@@ -6129,11 +6165,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Maaş Makbuzu Oluşturun
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,"Lab sonuç datetime, datetime testinden önce olamaz"
 DocType: POS Profile,Allow user to edit Discount,Kullanıcının indirimli düzenlemesine izin ver
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Müşterileri şu adresten alın:
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Müşterileri şu adresten alın:
 DocType: Purchase Invoice Item,Include Exploded Items,Patlatılmış Öğeleri Dahil Et
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","Eğer Uygulanabilir {0} olarak seçilirse, alım kontrol edilmelidir."
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,İndirim 100'den az olmalıdır
 DocType: Shipping Rule,Restrict to Countries,Ülkelere Kısıtla
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen {0} için İsimlendirme Serisini Kurulum&gt; Ayarlar&gt; İsimlendirme Dizisi ile ayarlayın
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Şüpheli Alacak Miktarı (Şirketin Kurunda)
 DocType: Sales Invoice Timesheet,Billing Hours,Fatura Saatleri
 DocType: Project,Total Sales Amount (via Sales Order),Toplam Satış Tutarı (Satış Siparişi Yoluyla)
@@ -6153,6 +6190,7 @@
 DocType: Soil Texture,Sandy Clay,Kumlu kil
 DocType: Grant Application,Assessment  Manager,Değerlendirme Müdürü
 DocType: Payment Entry,Allocate Payment Amount,Ödeme Tutarı ayır
+DocType: Subscription Plan,Subscription Plan,Abonelik Planı
 DocType: Employee External Work History,Salary,Maaş
 DocType: Employee External Work History,Salary,Maaş
 DocType: Serial No,Delivery Document Type,Teslim Belge Türü
@@ -6181,9 +6219,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Yaşlanma Aralığı 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Önayarları yükleme
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Müşteri için {} dağıtım Notu seçilmedi
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Müşteri için {} dağıtım Notu seçilmedi
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM yerine
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Teslimat Tarihine Göre Öğe Seç
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Teslimat Tarihine Göre Öğe Seç
 DocType: Grant Application,Has any past Grant Record,Geçmiş Hibe Kayıtları var mı
 ,Sales Analytics,Satış Analizleri
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Uygun {0}
@@ -6203,8 +6241,8 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tedarik edilen Hammadde  Maliyeti
 DocType: Selling Settings,Settings for Selling Module,Modülü Satış için Ayarlar
 DocType: Hotel Room Reservation,Hotel Room Reservation,Otel Odaları Rezervasyonu
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Müşteri Hizmetleri
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Müşteri Hizmetleri
 DocType: BOM,Thumbnail,Başparmak tırnağı
 DocType: Item Customer Detail,Item Customer Detail,Ürün Müşteri Detayı
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Teklif aday İş.
@@ -6221,7 +6259,7 @@
 DocType: Fees,Student Details,Öğrenci Ayrıntıları
 DocType: Purchase Invoice Item,Stock Qty,Stok Miktarı
 DocType: Purchase Invoice Item,Stock Qty,Stok Miktarı
-DocType: Employee Loan,Repayment Period in Months,Aylar içinde Geri Ödeme Süresi
+DocType: Loan,Repayment Period in Months,Aylar içinde Geri Ödeme Süresi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hata: Geçerli bir kimliği?
 DocType: Naming Series,Update Series Number,Seri Numaralarını Güncelle
 DocType: Account,Equity,Özkaynak
@@ -6233,13 +6271,13 @@
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
 DocType: Timesheet,Work Detail,Çalışma detay
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Mühendis
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Mühendis
 DocType: Journal Entry,Total Amount Currency,Toplam Tutar Para Birimi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Arama Alt Kurullar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: GST Account,SGST Account,SGST Hesabı
-apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,Öğelere Git
+apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,Ürünlere Git
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Purchase Taxes and Charges,Actual,Gerçek
@@ -6291,14 +6329,13 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donör Türü bilgileri.
 DocType: Request for Quotation,Supplier Detail,Tedarikçi Detayı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Formül ya da durumun hata: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Faturalanan Tutar
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Faturalanan Tutar
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Ölçüt ağırlıkları% 100&#39;e varmalıdır
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Katılım
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Katılım
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Stok Öğeler
 DocType: BOM,Materials,Materyaller
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","İşaretli değilse, liste uygulanması gereken her Departmana eklenmelidir"
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} oluşturma
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kaynak ve hedef Depo aynı olamaz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
@@ -6323,16 +6360,16 @@
 DocType: Shipping Rule,Fixed,Sabit
 DocType: Vehicle Service,Clutch Plate,Debriyaj Plakası
 DocType: Company,Round Off Account,Yuvarlama Hesabı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Yönetim Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Yönetim Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Yönetim Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Danışmanlık
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Danışmanlık
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
-DocType: Journal Entry,Subscription,abone
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,abone
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Ücret Oluşturma Bekliyor
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,İhbar Süresi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,İhbar Süresi
 DocType: Asset Category,Asset Category Name,Varlık Kategorisi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Bu bir kök bölgedir ve düzenlenemez.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Yeni Satış Kişi Adı
@@ -6346,7 +6383,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
 DocType: Asset,Frequency of Depreciation (Months),Amortisman Frekans (Ay)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kredi hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Sıfır değerleri göster
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Üretimden sonra elde edilen Ürün miktarı/ ham maddelerin belli miktarlarında yeniden ambalajlama
@@ -6354,7 +6391,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Kalemi karşılığı
 DocType: Hub Settings,Company Logo,Şirket logosu
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
@@ -6390,11 +6427,10 @@
 DocType: Journal Entry,Total Debit,Toplam Borç
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standart bitirdi Eşya Depo
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Lütfen hastayı seçin
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Satış Personeli
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Satış Personeli
 DocType: Hotel Room Package,Amenities,Kolaylıklar
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Bütçe ve Maliyet Merkezi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Birden fazla varsayılan ödeme moduna izin verilmiyor
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,için
 ,Appointment Analytics,Randevu Analizi
 DocType: Vehicle Service,Half Yearly,Yarım Yıllık
 DocType: Lead,Blog Subscriber,Blog Abonesi
@@ -6411,6 +6447,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Öğrenci gruplarını yılda bir kere yaparsanız boş bırakın.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Seçili ise,toplam çalışma günleri sayısı tatilleri içerecektir ve bu da Günlük ücreti düşürecektir"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Geçerli anahtarı kullanan uygulamalar erişemez, emin misiniz?"
+DocType: Subscription Settings,Prorate,eşit olarak dağıtmak
 DocType: Purchase Invoice,Total Advance,Toplam Advance
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Şablon Kodunu Değiştir
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Terim Bitiş Tarihi Dönem Başlangıç Tarihi daha önce olamaz. tarihleri düzeltmek ve tekrar deneyin.
@@ -6423,9 +6460,10 @@
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
 DocType: Cheque Print Template,Signatory Position,İmzacı pozisyonu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Kayıp olarak ayarla
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Kayıp olarak ayarla
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Kayıp olarak ayarla
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Kayıp olarak ayarla
 DocType: Timesheet,Total Billable Hours,Toplam Faturalanabilir Saat
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Abonenin bu abonelik tarafından oluşturulan faturaları ödemek zorunda olduğu gün sayısı
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ödeme Makbuzu Not
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,"Bu, bu Müşteriye karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Satır {0}: Ayrılan miktarı {1} daha az olması veya Ödeme giriş miktarı eşittir gerekir {2}
@@ -6445,12 +6483,12 @@
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Seçmek veya yeni müşteri eklemek
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Bu, bu Çalışan katılımı esas alır"
 DocType: Assessment Result,Summary,özet
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Seyirci İzleme
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Borç Hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Borç Hesabı
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Attendance,Employee Name,Çalışan Adı
@@ -6464,7 +6502,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Satın alma miktarı
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Çalışanlara Sağlanan Faydalar
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Çalışanlara Sağlanan Faydalar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Work Order,Manufactured Qty,Üretilen Miktar
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},{0} ile paylaşımlar mevcut değil
@@ -6473,12 +6511,12 @@
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Projects Settings,Ignore Workstation Time Overlap,İş İstasyonu Zaman Çakışmasını Yoksay
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Çalışan bir varsayılan Tatil Listesi set Lütfen {0} veya Şirket {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Çalışan bir varsayılan Tatil Listesi set Lütfen {0} veya Şirket {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} mevcut değil
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Toplu Numaraları Seç
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Müşterilere artırılan faturalar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 DocType: Patient Service Unit,Medical Administrator,Tıbbi Yönetici
 DocType: Assessment Plan,Schedule,Program
 DocType: Account,Parent Account,Ana Hesap
@@ -6512,17 +6550,18 @@
 DocType: Asset Repair,Repair Status,Onarım Durumu
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depodaki Boş Adet
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 DocType: POS Profile,Account for Change Amount,Değişim Miktarı Hesabı
 DocType: Purchase Invoice,input service,girdi hizmeti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Bakım Ekibi Üyesi
 DocType: Agriculture Analysis Criteria,Soil Analysis,Toprak Analizi
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kurs kodu:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Gider Hesabı girin
 DocType: Account,Stock,Stok
 DocType: Account,Stock,Stok
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
@@ -6578,21 +6617,21 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} için Kabul
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Değişken Adı
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
 DocType: Asset,Asset Category,Varlık Kategorisi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net ödeme negatif olamaz
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net ödeme negatif olamaz
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
 DocType: Item,Item Tax,Ürün Vergisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Tedarikçi Malzeme
 DocType: Soil Texture,Loamy Sand,Loanty Sand
 DocType: Production Plan,Material Request Planning,Malzeme İstek Planlaması
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Tüketim Fatura
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,"Eşik {0},% kereden fazla görünür"
 DocType: Expense Claim,Employees Email Id,Çalışanların e-posta adresleri
 DocType: Employee Attendance Tool,Marked Attendance,İşaretlenmiş Devamlılık
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Kısa Vadeli Borçlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Kısa Vadeli Borçlar
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Zamanlayıcı verilen saatleri aştı.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Kişilerinize toplu SMS Gönder
 DocType: Patient,A Positive,A Pozitif
@@ -6603,9 +6642,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı&#39;na sahip ve bu tedarikçiye Satın Alma Siparişleri dikkatle verilmelidir.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Varlık Bakım Ekibi
-DocType: Employee Loan,Loan Type,kredi Türü
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} başarıyla gönderildi
+DocType: Loan,Loan Type,kredi Türü
 DocType: Scheduling Tool,Scheduling Tool,zamanlama Aracı
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredi kartı
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredi kartı
 DocType: BOM,Item to be manufactured or repacked,Üretilecek veya yeniden paketlenecek Ürün
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
 DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
@@ -6639,7 +6679,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Holidays Üretim izin ver
 DocType: Sales Invoice,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 DocType: Sales Invoice,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Öz sermaye
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Öz sermaye
 DocType: Shopping Cart Settings,Show Public Attachments,Genel Ekleri Göster
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
 DocType: Restaurant Reservation,Reservation Time,Rezervasyon Süresi
@@ -6654,7 +6694,7 @@
 DocType: Purchase Order,To Receive and Bill,Teslimat ve Ödeme
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,"Sıra # {0}: Reqd by Date, İşlem Tarihinden önce olamaz"
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Özel Ürünler
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Tasarımcı
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Tasarımcı
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
@@ -6665,21 +6705,21 @@
 DocType: Driver,Expiry Date,Son kullanma tarihi
 DocType: Healthcare Settings,Employee name and designation in print,Basılı çalışan ismi ve ismi
 ,accounts-browser,hesap-tarayıcısı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,İlk Kategori seçiniz
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,İlk Kategori seçiniz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,İlk Kategori seçiniz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proje alanı.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Stok Ayarları veya maddesinde &quot;Ödeneği&quot; güncelleme, faturalama veya aşırı-sipariş izin vermek için."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Yarım Gün)
 DocType: Payment Term,Credit Days,Kredi Günleri
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Lab Testleri almak için lütfen Hasta&#39;yı seçin
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Öğrenci Toplu yapın
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Teslim zamanı Günü
 DocType: Cash Flow Mapping,Is Income Tax Expense,Gelir Vergisi Gideridir?
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Öğrenci Enstitü Pansiyonunda ikamet ediyorsa bunu kontrol edin.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
 ,Stock Summary,Stok Özeti
@@ -6691,10 +6731,11 @@
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: BOM Operation,Operating Cost(Company Currency),İşletme Maliyeti (Şirket Para Birimi)
-DocType: Employee Loan Application,Rate of Interest,Faiz oranı
+DocType: Loan Application,Rate of Interest,Faiz oranı
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
 DocType: Item,Shelf Life In Days,Gün Raf Ömrü
 DocType: GL Entry,Is Opening,Açılır
+DocType: Department,Expense Approvers,Gider Onaylayanları
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
 DocType: Journal Entry,Subscription Section,Abonelik Bölümü
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Hesap {0} yok
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 2beb8cf..21fc983 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Скасувати Матеріал Відвідати {0} до скасування Дана гарантія претензії
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Звіти про оцінку
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Споживацькі товари
-DocType: Purchase Receipt,Subscription Detail,Подробиці передплати
 DocType: Supplier Scorecard,Notify Supplier,Повідомити Постачальника
 DocType: Item,Customer Items,Предмети з клієнтами
 DocType: Project,Costing and Billing,Калькуляція і білінг
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} не може бути книга
 DocType: Item,Publish Item to hub.erpnext.com,Опублікувати пункт в hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Повідомлення по електронній пошті
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,оцінка
 DocType: Item,Default Unit of Measure,Одиниця виміру за замовчуванням
 DocType: SMS Center,All Sales Partner Contact,Усі контакти торгового партнеру
-DocType: Employee,Leave Approvers,Погоджувачі відпусток
+DocType: Department,Leave Approvers,Погоджувачі відпусток
 DocType: Sales Partner,Dealer,Дилер
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Розслідування
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Перевірте наявність
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Це засновано на операціях проти цього постачальника. Див графік нижче для отримання докладної інформації
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Правовий
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Фактичний тип податку не може бути включений у вартість товару в рядку {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Правовий
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Фактичний тип податку не може бути включений у вартість товару в рядку {0}
 DocType: Bank Guarantee,Customer,Клієнт
 DocType: Purchase Receipt Item,Required By,Потрібно За
 DocType: Delivery Note,Return Against Delivery Note,Повернутися На накладної
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Керівники (або групи), проти якого Бухгалтерські записи виробляються і залишки зберігаються."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Процесу обробки заробітної плати не подано.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Процесу обробки заробітної плати не подано.
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Назва типу відпустки
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показати відкритий
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Сьогодні це заходи необхідно прийняти для вищезгаданого повторюваного
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Серії оновлені успішно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Перевірити
 DocType: Pricing Rule,Apply On,Віднести до
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Всі постачальником Зв&#39;язатися
 DocType: Support Settings,Support Settings,налаштування підтримки
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Нова заява на відпустку
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
 ,Batch Item Expiry Status,Пакетна Пункт експірації Статус
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Банківський чек
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Банківський чек
 DocType: Membership,membership validaty section,розділ підтвердження членства
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 DocType: Consultation,Consultation,Консультація
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,матеріал
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Створення сайту
 DocType: Opening Invoice Creation Tool Item,Quantity,Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Кредити (зобов&#39;язання)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Кредити (зобов&#39;язання)
 DocType: Employee Education,Year of Passing,Рік проходження
 DocType: Item,Country of Origin,Країна народження
 DocType: Soil Texture,Soil Texture Criteria,Критерії текстури грунту
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Основна контактна інформація
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,відкриті питання
 DocType: Production Plan Item,Production Plan Item,Виробничий план товару
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
 DocType: Lab Test Groups,Add new line,Додати нову лінію
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Охорона здоров&#39;я
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Затримка в оплаті (дні)
@@ -89,7 +85,7 @@
 ,Delay Days,Затримки днів
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Рахунок-фактура
+DocType: Subscription Invoice,Invoice,Рахунок-фактура
 DocType: Purchase Invoice Item,Item Weight Details,Деталі ваги Деталі
 DocType: Asset Maintenance Log,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Треба зазначити бюджетний період {0}
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Ряд # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Ряд # {0}:
 DocType: Timesheet,Total Costing Amount,Загальна вартість
 DocType: Delivery Note,Vehicle No,Автомобіль номер
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Будь ласка, виберіть Прайс-лист"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,В роботі
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Будь ласка, виберіть дати"
 DocType: Daily Work Summary Group,Holiday List,Список вихідних
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Бухгалтер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Бухгалтер
 DocType: Hub Settings,Selling Price List,Ціновий продаж
 DocType: Patient,Tobacco Current Use,Використання тютюну
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Рейтинг продажів
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Рейтинг продажів
 DocType: Cost Center,Stock User,Складській користувач
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,№ Телефону
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Новий {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Початкове сповіщення електронною поштою надіслано
 ,Sales Partners Commission,Комісія партнерів
 DocType: Soil Texture,Sandy Clay Loam,Піщана глиняна сухариця
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Значення після амортизації
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Зв'язані
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,"Дата Відвідуваність не може бути менше, ніж приєднання дати працівника"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,"Дата Відвідуваність не може бути менше, ніж приєднання дати працівника"
 DocType: Grading Scale,Grading Scale Name,Градація шкали Ім&#39;я
-DocType: Subscription,Repeat on Day,Повторіть день
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Це корінь рахунку і не можуть бути змінені.
 DocType: Sales Invoice,Company Address,адреса компанії
 DocType: BOM,Operations,Операції
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не вдається встановити дозвіл на основі Знижка на {0}
+DocType: Subscription,Subscription Start Date,Дата початку передплати
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Долучіть файл .csv з двома колонками, одна для старої назви і одна для нової назви"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не існує в жодному активному бюджетному періоді
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Посилання: {0}, Код товару: {1} і клієнта: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Дата закінчення випробувального періоду Не може бути до Дата початку випробувального періоду
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Вакансія
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM не вказано для субпідрядного пункту {0} у рядку {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Patient,Married,Одружений
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускається для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Отримати елементи з
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Отримати елементи з
 DocType: Price List,Price Not UOM Dependant,Ціна не залежить від УОМ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,гальмівні масла
 DocType: Tax Rule,Tax Type,Тип податку
 ,Completed Work Orders,Завершені робочі замовлення
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Оподатковувана сума
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Оподатковувана сума
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"У Вас немає прав, щоб додавати або оновлювати записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Тарифна ставка / 60) * Фактичний Час роботи
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Рядок # {0}: Тип довідкового документа повинен бути одним із претензій на витрати або Журнал
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Виберіть BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Рядок # {0}: Тип довідкового документа повинен бути одним із претензій на витрати або Журнал
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Виберіть BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Вартість комплектності
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,"Керуйте сумою заздалегідь, що надається працівнику"
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Повідомлення про доставку
 DocType: Journal Entry,Opening Entry,Операція введення залишків
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Рахунок Оплатити тільки
-DocType: Employee Loan,Repay Over Number of Periods,Погашати Over Кількість періодів
+DocType: Loan,Repay Over Number of Periods,Погашати Over Кількість періодів
 DocType: Stock Entry,Additional Costs,Додаткові витрати
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
 DocType: Lead,Product Enquiry,Запит про продукт
 DocType: Education Settings,Validate Batch for Students in Student Group,Перевірка Batch для студентів в студентській групі
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Немає відпустки знайдена запис для співробітника {0} для {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Немає відпустки знайдена запис для співробітника {0} для {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Будь ласка, введіть компанія вперше"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Будь ласка, виберіть компанію спочатку"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Будь ласка, виберіть компанію спочатку"
 DocType: Employee Education,Under Graduate,Під Випускник
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,"Будь ласка, встановіть шаблон за замовчуванням для сповіщення про стан залишення в налаштуваннях персоналу."
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Цільова На
 DocType: BOM,Total Cost,Загальна вартість
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,співробітник позики
 DocType: Fee Schedule,Send Payment Request Email,Надіслати електронною поштою запит на оплату
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Нерухомість
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Успішно незареєстрований.
 DocType: Assessment Result,Grade,клас
 DocType: Restaurant Table,No of Seats,Кількість місць
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Щоб додати динамічний предмет, використовуйте теги jinja, такі як <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Доставлено постачальником
 DocType: Asset Maintenance Task,Asset Maintenance Task,Завдання з обслуговування майна
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Річна заробітна плата
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Річна заробітна плата
 DocType: Daily Work Summary,Daily Work Summary,Щодня Резюме Робота
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття бюджетного періоду
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} заблоковано
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Витрати на запаси
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Витрати на запаси
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Виберіть Target Warehouse
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Виберіть Target Warehouse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Будь ласка, введіть Preferred Контакт E-mail"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Будь ласка, введіть Preferred Контакт E-mail"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Виправна запис
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Основна адреса
 DocType: Production Plan,Material Request Detail,Детальний опис матеріалів
 DocType: Selling Settings,Default Quotation Validity Days,Дня довіреності щодо котирувань
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Налаштування модуля HR
 DocType: SMS Center,SMS Center,SMS-центр
 DocType: Sales Invoice,Change Amount,Сума змін
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Категорії авторизації
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Будь ласка, введіть дату доставки"
 DocType: Depreciation Schedule,Make Depreciation Entry,Створити операцію амортизації
+DocType: HR Settings,Leave Settings,Залишити налаштування
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запиту
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,зробити Employee
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Радіомовлення
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Режим налаштування POS (онлайн / офлайн)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Вимикає створення журналів часу проти робочих замовлень. Операції не відстежуються з робочого замовлення
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Виконання
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Виконання
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детальна інформація про виконані операції.
 DocType: Asset Maintenance Log,Maintenance Status,Стан Технічного обслуговування
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Інформація про членство
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Постачальник повинен мати Платіжний рахунок {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Товари та ціни
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Загальна кількість годин: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Від дати"" має бути в межах бюджетного періоду. Припускаючи, що ""Від дати"" = {0}"
 DocType: Drug Prescription,Interval,Інтервал
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Перевага
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Перевага
 DocType: Grant Application,Individual,Індивідуальний
 DocType: Academic Term,Academics User,академіки Користувач
 DocType: Cheque Print Template,Amount In Figure,Сума цифрами
-DocType: Employee Loan Application,Loan Info,Позика інформація
+DocType: Loan Application,Loan Info,Позика інформація
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План візитів для тех. обслуговування.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Поточний показник показника постачальника
 DocType: Share Transfer,Share Transfer,Частка передачі
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Шаблон елемента
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Біохімія
 DocType: Job Offer,Select Terms and Conditions,Виберіть умови та положення
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Розхід у Сумі
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Розхід у Сумі
 DocType: Woocommerce Settings,Woocommerce Settings,Налаштування Woocommerce
 DocType: Production Plan,Sales Orders,Замовлення клієнта
 DocType: Purchase Taxes and Charges,Valuation,Оцінка
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Територія за замовчуванням
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Телебачення
 DocType: Work Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Виберіть клієнта або постачальника.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Список серій для даної транзакції
 DocType: Company,Enable Perpetual Inventory,Включення перманентної інвентаризації
+DocType: Bank Guarantee,Charges Incurred,Нарахування витрат
 DocType: Company,Default Payroll Payable Account,За замовчуванням Payroll оплати рахунків
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Оновлення Email Group
 DocType: Sales Invoice,Is Opening Entry,Введення залишків
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Користувацький результат
 DocType: Delivery Stop,Contact Name,Контактна особа
 DocType: Course Assessment Criteria,Course Assessment Criteria,Критерії оцінки курсу
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ІПН:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ІПН:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Ідентифікатор студента:
 DocType: POS Customer Group,POS Customer Group,POS Група клієнтів
 DocType: Land Unit,Land Unit describing various land assets,"Земельний блок, що описує різні земельні активи"
@@ -375,9 +372,8 @@
 ,Open Work Orders,Відкрити робочі замовлення
 DocType: Payment Term,Credit Months,Кредитні місяці
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,"Net Pay не може бути менше, ніж 0"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Щоб зупинити надсилання сповіщень про повторювані помилки в системі, ми позначили поле &quot;Відключені&quot; в підписці"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,"Дата звільнення повинна бути більше, ніж дата влаштування"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Листя на рік
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,"Дата звільнення повинна бути більше, ніж дата влаштування"
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Листя на рік
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, поставте відмітку 'Аванс"" у рахунку {1}, якщо це авансовий запис."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
 DocType: Email Digest,Profit & Loss,Прибуток та збиток
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,"Будь-ласка, налаштуйте студентів за групами студентів"
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Банківські записи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Банківські записи
 DocType: Crop,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Позиція Інвентаризації
 DocType: Stock Entry,Sales Invoice No,Номер вихідного рахунку-фактури
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Курс Студентська група Інструмент створення
 DocType: Lead,Do Not Contact,Чи не Контакти
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,"Люди, які викладають у вашій організації"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Розробник програмного забезпечення
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Розробник програмного забезпечення
 DocType: Item,Minimum Order Qty,Мінімальна к-сть замовлень
 DocType: Pricing Rule,Supplier Type,Тип постачальника
 DocType: Course Scheduling Tool,Course Start Date,Дата початку курсу
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Опублікувати в Hub
 DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Територія
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Замовлення матеріалів
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Закупівля детальніше
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Макс. Оцінка
 DocType: Email Digest,New Quotations,Нова пропозиція
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Електронні листи зарплати ковзання співробітнику на основі кращого електронної пошти, обраного в Employee"
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Перший погоджувач відпусток у списку буде погоджувачем за замовчуванням
 DocType: Tax Rule,Shipping County,Область доставки
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Навчитися
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Навчитися
 DocType: Asset,Next Depreciation Date,Наступна дата амортизації
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Діяльність Вартість одного працівника
 DocType: Accounts Settings,Settings for Accounts,Налаштування для рахунків
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"""Неочищені"" чеки та депозити"
 DocType: Item,Synced With Hub,Синхронізуються з Hub
 DocType: Driver,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Рядок # {0}: {1} не може бути негативним по пункту {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Рядок # {0}: {1} не може бути негативним по пункту {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Невірний пароль
 DocType: Item,Variant Of,Варіант
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва"""
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Будь ласка, встановіть вартість номера готелю на {}"
 DocType: Journal Entry,Multi Currency,Мультивалютна
 DocType: Opening Invoice Creation Tool,Invoice Type,Тип рахунку-фактури
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Накладна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Накладна
 DocType: Consultation,Encounter Impression,Зустрічне враження
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Налаштування податків
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Собівартість проданих активів
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Посада працівника (як-от, генеральний директор, директор тощо)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Курс, за яким валюта покупця конвертується у базову валюту покупця"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планування Інструмент
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Терміново] Помилка при створенні повторюваних% s для% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
 DocType: Land Unit,LInked Analysis,Занурений аналіз
 DocType: Item Tax,Tax Rate,Ставка податку
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Період заявки не може бути розподілений між двома записами про розподіл
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Період заявки не може бути розподілений між двома записами про розподіл
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Робітника {1} для періоду {2} в {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Номер партії має бути таким же, як {1} {2}"
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створення студентських груп
 DocType: Volunteer,Weekends,Вихідні
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Кредит Примітка Сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Кредит Примітка Сума
 DocType: Setup Progress Action,Action Document,Документ дій
 DocType: Chapter Member,Website URL,Посилання на сайт
 ,Finished Goods,Готові вироби
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Додати товари
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Параметр сертифікату якості для номенклатурної позиції
+DocType: Leave Application,Leave Approver Name,Ім'я погоджувача відпустки
 DocType: Depreciation Schedule,Schedule Date,Розклад Дата
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Нарахування, відрахування та інші компоненти зарплати"
 DocType: Packed Item,Packed Item,Упакування товару
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,Запит пропозиції
 DocType: Healthcare Settings,Require Lab Test Approval,Потрібне підтвердження випробування на випробування
 DocType: Salary Slip Timesheet,Working Hours,Робочі години
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Усього видатних
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Усього видатних
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
 DocType: Dosage Strength,Strength,Сила
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Створення нового клієнта
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,Вартість витратних
 DocType: Purchase Receipt,Vehicle Date,Дата
 DocType: Student Log,Medical,Медична
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Причина втрати
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Причина втрати
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Оновити номер рахунку
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,"Ведучий власник не може бути такою ж, як свинець"
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Розподілена сума не може перевищувати неврегульовану
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,Одиночний
 DocType: Salary Slip,Total Loan Repayment,Загальна сума погашення кредиту
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
-DocType: Subscription,Yearly,Річний
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Будь ласка, введіть центр витрат"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,"Будь ласка, введіть центр витрат"
 DocType: Drug Prescription,Dosage,Дозування
 DocType: Journal Entry Account,Sales Order,Замовлення клієнта
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Сер. ціна прод.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Сер. ціна прод.
 DocType: Assessment Plan,Examiner Name,ім&#39;я Examiner
 DocType: Lab Test Template,No Result,немає результату
 DocType: Purchase Invoice Item,Quantity and Rate,Кількість та ціна
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
 DocType: Purchase Invoice,Supplier Name,Назва постачальника
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте керівництво ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Показати сторінки всіх членів департаменту в календарі
 DocType: Purchase Invoice,01-Sales Return,01-продаж повернення
 DocType: Account,Is Group,це група
 DocType: Email Digest,Pending Purchase Orders,Замовлення на придбання в очікуванні
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Обов&#39;язкове поле - Академічний рік
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Налаштуйте вступний текст, який йде як частина цього e-mail. Кожна операція має окремий вступний текст."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Будь ласка, встановіть за замовчуванням заборгованості рахунки для компанії {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Будь ласка, встановіть за замовчуванням заборгованості рахунки для компанії {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Транзакція не дозволена проти зупинки Робочий наказ {0}
 DocType: Setup Progress Action,Min Doc Count,Міні-графа доктора
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заблоковано по
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер вихідних.
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Зарезервовано для продажу
 DocType: Packing Slip,From Package No.,З пакета №
 DocType: Item Attribute,To Range,Для Діапазон
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Неможливо змінити метод оцінки, так як є угоди щодо деяких пунктів, які не мають його власний метод оцінки"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Цінні папери та депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Неможливо змінити метод оцінки, так як є угоди щодо деяких пунктів, які не мають його власний метод оцінки"
 DocType: Student Report Generation Tool,Attended by Parents,Участь батьків
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Patient,AB Positive,AB Positive
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Запис відвідування.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Компонент зарплати для відомостей основаних на тебелях
 DocType: Sales Order Item,Used for Production Plan,Використовується для виробничого плану
-DocType: Employee Loan,Total Payment,Загальна оплата
+DocType: Loan,Total Payment,Загальна оплата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Неможливо скасувати транзакцію для завершеного робочого замовлення.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Час між операціями (в хв)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} є скасованим так що дія не може бути завершена
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Досить частини для зборки
 DocType: POS Profile User,POS Profile User,Користувач POS Профіль
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Пряма прибуток
+DocType: Subscription Invoice,Subscription Invoice,Рахунок передплати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Пряма прибуток
 DocType: Patient Appointment,Date TIme,"Дата, час"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Адміністративний співробітник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Адміністративний співробітник
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Налагодження компанії та податків
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
 DocType: Codification Table,Codification Table,Таблиця кодифікації
 DocType: Timesheet Detail,Hrs,годин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Stock Entry Detail,Difference Account,Рахунок різниці
 DocType: Purchase Invoice,Supplier GSTIN,Постачальник GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Шаблон картирования грошових потоків
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
+DocType: Bank Guarantee,Providing,Надання
 DocType: Account,Profit and Loss,Про прибутки та збитки
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Не дозволяється налаштувати шаблон тестування лабораторії, якщо потрібно"
 DocType: Patient,Risk Factors,Фактори ризику
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Номер рахунку постачальника
 DocType: Territory,For reference,Для довідки
 DocType: Healthcare Settings,Appointment Confirmation,Підтвердження призначення
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, оскільки він використовується у складських операціях"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, оскільки він використовується у складських операціях"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),На кінець (Кт)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Здравствуйте
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,перемістити елемент
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Вже встановлено стандарт в профілі {0} для користувача {1}, люб&#39;язно відключений за замовчуванням"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,накопичені значення
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","На жаль, серійні номери не можуть бути об'єднані"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","На жаль, серійні номери не можуть бути об'єднані"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Територія потрібна в профілі POS
 DocType: Supplier,Prevent RFQs,Запобігання тендерних пропозицій
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Зробити замовлення на продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},"Сплав заробітної плати, поданий на період з {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},"Сплав заробітної плати, поданий на період з {0} до {1}"
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Дата про доставку
 DocType: Production Plan,Production Plan,План виробництва
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Інструмент створення відкритого рахунку-фактури
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Продажі Повернутися
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примітка: Сумарна кількість виділених листя {0} не повинно бути менше, ніж вже затверджених листя {1} на період"
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Вкажіть кількість в операціях на основі послідовного введення
 ,Total Stock Summary,Всі Резюме Фото
 DocType: Announcement,Posted By,Автор
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Пряма доставка)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,Пропозиція для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),На початок (Кт)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Розподілена сума не може бути негативною
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Будь ласка, встановіть компанії"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Будь ласка, встановіть компанії"
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,Сума виставлених рахунків
 DocType: Training Result Employee,Training Result Employee,Навчання Результат Співробітник
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Уявний склад, на якому зроблено Рух ТМЦ."
-DocType: Repayment Schedule,Principal Amount,Основна сума
-DocType: Employee Loan Application,Total Payable Interest,Загальна заборгованість за відсотками
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Основна сума
+DocType: Loan Application,Total Payable Interest,Загальна заборгованість за відсотками
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Усього видатних: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Розклад вихідних рахунків-фактур
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Підстава:Номер та Підстава:Дата необхідні для {0}
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
 DocType: Restaurant Reservation,Restaurant Reservation,Бронювання ресторану
 DocType: Land Unit,Land Unit Name,Назва земельної одиниці
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Пропозиція Написання
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Пропозиція Написання
 DocType: Payment Entry Deduction,Payment Entry Deduction,Відрахування з Оплати
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Підведенню
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Повідомте клієнтів електронною поштою
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Повідомте клієнтів електронною поштою
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Інший Відповідальний з продажу {0} існує з тим же ідентифікатором працівника
 DocType: Employee Advance,Claimed Amount,Заявлена сума
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Обліковий запис платіжного шлюзу не створено, створіть його вручну будь-ласка."
 DocType: Supplier Scorecard,Per Year,В рік
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Недоступно для вступу в цю програму згідно з DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 DocType: Sales Invoice,Sales Taxes and Charges,Податки та збори з продажу
 DocType: Employee,Organization Profile,Профіль організації
 DocType: Vital Signs,Height (In Meter),Висота (в метрі)
 DocType: Student,Sibling Details,подробиці Споріднені
 DocType: Vehicle Service,Vehicle Service,обслуговування автомобіля
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Автоматично запускає запит на зворотний зв&#39;язок в залежності від умов.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Автоматично запускає запит на зворотний зв&#39;язок в залежності від умов.
 DocType: Employee,Reason for Resignation,Причина відставки
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Шаблон для оцінки ефективності роботи.
 DocType: Sales Invoice,Credit Note Issued,Кредит видається довідка
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Графік регламентних робіт
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тоді Цінові правила фільтруються на основі Замовника, Групи покупця, Території, Постачальника, Типу постачальника, Кампанії, Торгового партнера і т.д."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Чиста зміна в інвентаризації
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Управління кредитів співробітників
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Зв&#39;язок з Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менеджер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / з
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Будь ласка, встановіть обліковий запис у складі {0}"
@@ -895,23 +891,23 @@
 DocType: Item,Material Transfer,Матеріал Передача
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Не вдалося знайти шлях для
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),На початок (Дт)
+DocType: Loan,Applicant,Заявник
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp повинна бути більша {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Зробити повторювані документи
 ,GST Itemised Purchase Register,GST деталізувати Купівля Реєстрація
 DocType: Course Scheduling Tool,Reschedule,Перепланувати
-DocType: Employee Loan,Total Interest Payable,Загальний відсоток кредиторів
+DocType: Loan,Total Interest Payable,Загальний відсоток кредиторів
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Податки та збори з кінцевої вартості
 DocType: Work Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,обробка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,база
 DocType: Timesheet,Total Billed Hours,Всього Оплачувані Годинник
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Списання Сума
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Списання Сума
 DocType: Leave Block List Allow,Allow User,Дозволити користувачеві
 DocType: Journal Entry,Bill No,Bill №
 DocType: Company,Gain/Loss Account on Asset Disposal,Рахунок прибутків/збитків при ліквідації активів
 DocType: Vehicle Log,Service Details,сервіс Детальніше
-DocType: Subscription,Quarterly,Щоквартальний
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Групувати
 DocType: Selling Settings,Delivery Note Required,Необхідна накладна
@@ -923,7 +919,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Розклад
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,З зворотним промиванням Сировина матеріали на основі
 DocType: Sales Invoice,Port Code,Код порту
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Резервний склад
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Резервний склад
 DocType: Lead,Lead is an Organization,Ведуча є організацією
 DocType: Guardian Interest,Interest,інтерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Препродаж
@@ -935,12 +931,12 @@
 DocType: Account,Accounts,Бухгалтерські рахунки
 DocType: Vehicle,Odometer Value (Last),Одометр Value (Last)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Шаблони критеріїв показників постачальників.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Оплату вже створено
 DocType: Request for Quotation,Get Suppliers,Отримайте Постачальників
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Рядок # {0}: Asset {1} не пов&#39;язаний з п {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Рядок # {0}: Asset {1} не пов&#39;язаний з п {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
 DocType: Account,Expenses Included In Valuation,"Витрати, що включаються в оцінку"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Ви можете оновити лише якщо членство закінчується протягом 30 днів
@@ -950,7 +946,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,"Виберіть лише, якщо ви встановили документи Cash Flow Mapper"
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Supplier Scorecard,Per Week,На тиждень
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Номенклатурна позиція має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Номенклатурна позиція має варіанти.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Загальна кількість студентів
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Значення запасів
@@ -972,9 +968,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Вступ Кредитна карта
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компанія та Рахунки
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,У Сумі
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,У Сумі
 DocType: Asset Settings,Depreciation Options,Вартість амортизації
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Неправильний час публікації
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Неправильний час публікації
 DocType: Lead,Campaign Name,Назва кампанії
 DocType: Hotel Room,Capacity,Потужність
 DocType: Selling Settings,Close Opportunity After Days,Закрити Opportunity Після днів
@@ -999,7 +995,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Номер оригінала замовлення клієнта
 DocType: Budget,Budget Against,Бюджет по
 DocType: Employee,Cell Number,Номер мобільного
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для даного критерію немає працівника. Перевірте, що плати за зарплату ще не створені."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для даного критерію немає працівника. Перевірте, що плати за зарплату ще не створені."
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Автоматичне Замовлення матеріалів згенероване
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести даний документ у колонку «Згідно проводки'
@@ -1011,15 +1007,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Будь ласка, виберіть таблицю"
 DocType: BOM,Website Specifications,Характеристики веб-сайту
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - це недійсна електронна адреса в &quot;Одержувачі&quot;
 DocType: Special Test Items,Particulars,Особливості
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: З {0} типу {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: З {0} типу {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати норми витрат, якщо вони пов'язані з іншими"
 DocType: Asset,Maintenance,Технічне обслуговування
+DocType: Subscriber,Subscriber,Абонент
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Будь ласка, оновіть свій статус проекту"
 DocType: Item,Maximum sample quantity that can be retained,"Максимальна кількість зразків, яку можна зберегти"
@@ -1057,26 +1053,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Налаштування за замовчуванням для кошик
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Додати часові ділянки
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Зіпсовані активи згідно проводки{0}
-DocType: Employee Loan,Interest Income Account,Рахунок Процентні доходи
+DocType: Loan,Interest Income Account,Рахунок Процентні доходи
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Оприлюднений запрошення надіслано
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Біотехнологія
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Витрати утримання офісу
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Витрати утримання офісу
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Йти до
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Налаштування облікового запису електронної пошти
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Asset Repair,Downtime,Простій
 DocType: Account,Liability,Відповідальність
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Академічний термін:
 DocType: Salary Detail,Do not include in total,Не включайте в цілому
 DocType: Company,Default Cost of Goods Sold Account,Рахунок собівартості проданих товарів за замовчуванням
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Обсяг вибірки {0} не може перевищувати отриману кількість {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Прайс-лист не вибраний
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Прайс-лист не вибраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Request for Quotation Supplier,Send Email,Відправити e-mail
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
 DocType: Item,Max Sample Quantity,Максимальна кількість примірників
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Немає доступу
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Немає доступу
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Писати пишуть запит
 DocType: Vital Signs,Heart Rate / Pulse,Серцевий ритм / імпульс
 DocType: Company,Default Bank Account,Банківський рахунок за замовчуванням
@@ -1087,12 +1083,11 @@
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Лабораторні тести та життєво важливі ознаки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Деталі банківської виписки
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {1} повинен бути представлений
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {1} повинен бути представлений
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Жоден працівник не знайдено
-DocType: Subscription,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо підряджено постачальникові
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студентська група вже була поновлена.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студентська група вже була поновлена.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Оновлення проекту.
 DocType: SMS Center,All Customer Contact,Всі Контакти клієнта
 DocType: Land Unit,Tree Details,деталі Дерева
@@ -1142,7 +1137,6 @@
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваності
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Всі Групи товарів
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Work Order,Item To Manufacture,Елемент Виробництво
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} статус {2}
@@ -1156,7 +1150,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Змініть вибір, якщо обрана адреса буде відредагована після збереження"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 DocType: Item,Hub Publishing Details,Публікація концентратора
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',"""Відкривається"""
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',"""Відкривається"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Відкрити To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
 DocType: Lab Test Template,Result Format,Формат результатів
@@ -1166,7 +1160,7 @@
 DocType: Payroll Entry,Bimonthly,два рази на місяць
 DocType: Vehicle Service,Brake Pad,Гальмівна колодка
 DocType: Fertilizer,Fertilizer Contents,Зміст добрив
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Дослідження і розвиток
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Дослідження і розвиток
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Сума до оплати
 DocType: Company,Registration Details,Реєстраційні дані
 DocType: Timesheet,Total Billed Amount,Загальна сума Оголошений
@@ -1180,7 +1174,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Обійти обмеження кредитного ліміту на замовлення клієнта
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Продуктивність оцінка.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включення &quot;Використовувати для Кошику», як Кошик включена і має бути принаймні один податок Правило Кошик"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Документ оплати {0} прив'язаний до замовлення {1}, перевірте, чи не потрібно підтягнути це як передоплату у цьому рахунку-фактурі."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Документ оплати {0} прив'язаний до замовлення {1}, перевірте, чи не потрібно підтягнути це як передоплату у цьому рахунку-фактурі."
 DocType: Sales Invoice Item,Stock Details,Фото Деталі
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Вартість проекту
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,POS
@@ -1214,7 +1208,7 @@
 DocType: Restaurant Table,Minimum Seating,Мінімальна кількість сидінь
 DocType: Item Attribute,Item Attribute Values,Пункт значень атрибутів
 DocType: Examination Result,Examination Result,експертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Прихідна накладна
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Прихідна накладна
 ,Received Items To Be Billed,"Отримані позиції, на які не виставлені рахунки"
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Майстер курсів валют.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Довідник Doctype повинен бути одним з {0}
@@ -1222,15 +1216,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Work Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Торгові партнери та території
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,"Немає елементів, доступних для передачі"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,"Немає елементів, доступних для передачі"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Закриття (Відкриття + Усього)
 DocType: Journal Entry,Depreciation Entry,Операція амортизації
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
 DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
 DocType: Pricing Rule,Rate or Discount,Ставка або знижка
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до номенклатурної позиції {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до номенклатурної позиції {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необхідна к-сть
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Вибране
 DocType: Hub Settings,Custom Data,Спеціальні дані
@@ -1242,9 +1236,9 @@
 DocType: Medical Code,Medical Code Standard,Медичний кодекс Стандарт
 DocType: Soil Texture,Clay Composition (%),Композиція глини (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Будь ласка, збережіть перед призначенням завдання."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Значення сальдо
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Значення сальдо
 DocType: Lab Test,Lab Technician,Технічна лабораторія
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Продажі Прайс-лист
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Якщо буде встановлено прапорець, клієнт буде створений, підключений до пацієнта. З цією Клієнтом буде створено рахунки-пацієнти. Ви також можете вибрати існуючого Клієнта під час створення пацієнта."
 DocType: Bank Reconciliation,Account Currency,Валюта рахунку
@@ -1252,16 +1246,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Будь ласка, вкажіть округлити рахунок в Компанії"
 DocType: Purchase Receipt,Range,Діапазон
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
 DocType: Item Barcode,Item Barcode,Пункт Штрих
 DocType: Woocommerce Settings,Endpoints,Кінцеві точки
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Варіанти позиції {0} оновлено
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Варіанти позиції {0} оновлено
 DocType: Quality Inspection Reading,Reading 6,Читання 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","бути згенерованим. Якщо буде затримано, вам доведеться вручну змінити поле &quot;Повторити в день місяця&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
 DocType: Share Transfer,From Folio No,Від Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Передоплата по вхідному рахунку
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
@@ -1296,16 +1288,17 @@
 DocType: Asset,Available-for-use Date,Доступна для використання дата
 DocType: Guardian,Guardian Name,ім&#39;я опікуна
 DocType: Cheque Print Template,Has Print Format,Має формат друку
-DocType: Employee Loan,Sanctioned,санкціоновані
+DocType: Loan,Sanctioned,санкціоновані
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,"є обов'язковим. Можливо, що запис ""Обмін валюти"" не створений"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
 DocType: Crop Cycle,Crop Cycle,Цикл вирощування
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для елементів ""комплекту"" , склад, серійний номер та № пакету будуть братися з таблиці ""комплектації"". Якщо склад та партія є однаковими для всіх пакувальних компонентів для будь-якого ""комплекту"", ці значення можуть бути введені в основній таблиці позицій, значення будуть скопійовані в таблицю ""комлектації""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для елементів ""комплекту"" , склад, серійний номер та № пакету будуть братися з таблиці ""комплектації"". Якщо склад та партія є однаковими для всіх пакувальних компонентів для будь-якого ""комплекту"", ці значення можуть бути введені в основній таблиці позицій, значення будуть скопійовані в таблицю ""комлектації""."
 DocType: Student Admission,Publish on website,Опублікувати на веб-сайті
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Дата рахунку постачальника не може бути більше за дату створення
+DocType: Subscription,Cancelation Date,Дата скасування
 DocType: Purchase Invoice Item,Purchase Order Item,Позиція замовлення на придбання
 DocType: Agriculture Task,Agriculture Task,Завдання сільського господарства
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Непряме прибуток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Непряме прибуток
 DocType: Student Attendance Tool,Student Attendance Tool,Student Учасники Інструмент
 DocType: Restaurant Menu,Price List (Auto created),Прайс-лист (авто створений)
 DocType: Cheque Print Template,Date Settings,Налаштування дати
@@ -1332,6 +1325,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,метр
 DocType: Workstation,Electricity Cost,Вартість електроенергії
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Лабораторне тестування datetime не може перебувати до дати datetime collection
+DocType: Subscription Plan,Cost,Вартість
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
 DocType: Expense Claim,Total Advance Amount,Загальна сума авансового платежу
 DocType: Delivery Stop,Estimated Arrival,Очікуване прибуття
@@ -1343,15 +1337,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Білий
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Білий
 DocType: SMS Center,All Lead (Open),Всі Lead (відкрито)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Рядок {0}: К-сть недоступна для {4} на складі {1} на час проведення ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Ви можете вибрати максимум одного параметра зі списку прапорців.
 DocType: Purchase Invoice,Get Advances Paid,Взяти видані аванси
 DocType: Item,Automatically Create New Batch,Автоматичне створення нового пакета
 DocType: Item,Automatically Create New Batch,Автоматичне створення нового пакета
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Призначення {0} - {1} (рядок {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Зробити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Призначення {0} - {1} (рядок {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Зробити
 DocType: Student Admission,Admission Start Date,Прийом Початкова дата
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Новий працівник
@@ -1367,7 +1361,7 @@
 DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сума кредиту
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Розклад курсу
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Опціони
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Опціони
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Вимкнути отримання останніх відомостей про покупку в замовленні на купівлю
 DocType: Journal Entry Account,Expense Claim,Авансовий звіт
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
@@ -1386,11 +1380,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Упаковка товару ковзання
 DocType: Purchase Invoice,Cash/Bank Account,Готівковий / Банківський рахунок
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Введіть {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Варіант створення було поставлено в чергу.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Резюме робіт для {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Перший Затверджувач залишків у списку буде встановлено як Затверджувач залишення за замовчуванням.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Plan,Get Sales Orders,Отримати Замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} не може бути від’ємним
 DocType: Training Event,Self-Study,Самоосвіта
@@ -1403,7 +1398,7 @@
 DocType: Workstation,Wages,Заробітна плата
 DocType: Asset Maintenance,Maintenance Manager Name,Ім&#39;я менеджера технічного обслуговування
 DocType: Agriculture Task,Urgent,Терміновий
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Будь ласка, вкажіть дійсний ідентифікатор рядка для рядка {0} в таблиці {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},"Будь ласка, вкажіть дійсний ідентифікатор рядка для рядка {0} в таблиці {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Не вдається знайти змінну:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Будь ласка, виберіть поле для редагування з цифри"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Не може бути елементом основних засобів, оскільки створюється фондова книга."
@@ -1415,7 +1410,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Назва шаблону перевірки якості
 DocType: Project,First Email,Перша електронна пошта
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продаж Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продаж Сума
 DocType: Repayment Schedule,Interest Amount,відсотки Сума
 DocType: Serial No,Creation Document No,Створення документа Немає
 DocType: Share Transfer,Issue,Проблема
@@ -1429,10 +1424,10 @@
 DocType: Tax Rule,Shipping State,Штат доставки
 ,Projected Quantity as Source,Запланована кількість як джерело
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Подорож доставки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Подорож доставки
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип передачі
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Витрати на збут
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Витрати на збут
 DocType: Consultation,Diagnosis,Діагностика
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
@@ -1441,12 +1436,13 @@
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Поштовий індекс
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Замовлення клієнта {0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Виберіть обліковий запис процентних доходів у кредиті {0}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Створення Руху ТМЦ
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
 DocType: Item,Default Supplier,Постачальник за замовчуванням
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на виробництво Відсоток
-DocType: Employee Loan,Repayment Schedule,погашення Розклад
+DocType: Loan,Repayment Schedule,погашення Розклад
 DocType: Shipping Rule Condition,Shipping Rule Condition,Умова правил доставки
 DocType: Holiday List,Get Weekly Off Dates,Отримати щотижневі вихідні
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата закінчення не може бути менше, ніж Дата початку"
@@ -1461,7 +1457,7 @@
 DocType: Education Settings,Attendance Freeze Date,Учасники Заморожування Дата
 DocType: Education Settings,Attendance Freeze Date,Учасники Заморожування Дата
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Показати всі товари
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Показати всі товари
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Мінімальний Lead Вік (дні)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Мінімальний Lead Вік (дні)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,все ВВП
@@ -1470,14 +1466,16 @@
 DocType: Expense Claim,From Employee,Від працівника
 DocType: Driver,Cellphone Number,Номер мобільного телефону
 DocType: Project,Monitor Progress,Прогрес монітора
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так як суми по позиції {0} в {1} дорівнює нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так як суми по позиції {0} в {1} дорівнює нулю
 DocType: Journal Entry,Make Difference Entry,Зробити запис Difference
+DocType: Supplier Quotation,Auto Repeat Section,Автоматична повторна секція
 DocType: Upload Attendance,Attendance From Date,Відвідуваність з дати
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площа Продуктивність
 DocType: Program Enrollment,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,неправильний атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} повинен бути проведений
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Кількість повинна бути менше або дорівнює {0}
+DocType: Department Approver,Department Approver,Урядовий затверджувач
 DocType: SMS Center,Total Characters,Загалом символів
 DocType: Employee Advance,Claimed,Заявлено
 DocType: Crop,Row Spacing,Пробіл рядків
@@ -1487,6 +1485,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Рахунок-фактура на корегуючу оплату
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Внесок%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Згідно Налаштування Купівля якщо Purchase Order Required == «YES», то для створення рахунку-фактурі, користувачеві необхідно створити замовлення на поставку першої для пункту {0}"
+,HSN-wise-summary of outward supplies,HSN-мудрий - резюме зовнішніх поставок
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Правило доставки для кошику
@@ -1500,7 +1499,7 @@
 DocType: Setup Progress Action,Action Name,Назва дії
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,рік початку
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},Перші 2 цифри GSTIN повинні збігатися з державним номером {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Початкова дата поточного періоду виставлення рахунків
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Планування потужностей Помилка
@@ -1518,26 +1517,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поля будуть скопійовані лише в момент створення.
 DocType: Setup Progress Action,Domains,Галузі
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж ""Дата фактичного завершення"""
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Управління
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Управління
 DocType: Cheque Print Template,Payer Settings,Налаштування платника
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до коду варіанту. Наприклад, якщо ваша абревіатура ""СМ"", і код товару ""Футболки"", тоді код варіанту буде ""Футболки-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
 DocType: Purchase Invoice,Is Return,Повернення
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Обережно
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',"Початковий день більше, ніж кінець дня в задачі &#39;{0}&#39;"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Повернення / дебетові Примітка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Повернення / дебетові Примітка
 DocType: Price List Country,Price List Country,Ціни Країна
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} дійсні серійні номери для позиції {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код товару не може бути змінена для серійним номером
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Код товару не може бути змінена для серійним номером
 DocType: Purchase Invoice Item,UOM Conversion Factor,Коефіцієнт перетворення Одиниця виміру
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Будь ласка, введіть код товару, щоб отримати номер партії"
 DocType: Stock Settings,Default Item Group,Група за замовчуванням
-DocType: Employee Loan,Partially Disbursed,частково Освоєно
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Надайте інформацію.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Надайте інформацію.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База даних постачальника
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,"Ви не можете перезапустити підписку, яку не скасовано."
 DocType: Account,Balance Sheet,Бухгалтерський баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
 DocType: Fee Validity,Valid Till,Дійсний до
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Загальна зустріч батьків з вчителями
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
@@ -1550,7 +1549,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилену к-сть не можна вводити у Повернення постачальнику
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Зміна Групи Клієнтів для обраного Клієнта не допускається.
 ,Purchase Order Items To Be Billed,"Позиції Замовлення на придбання, на які не виставлені рахунки"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Оновлення очікуваного часу прибуття.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Оновлення очікуваного часу прибуття.
 DocType: Program Enrollment Tool,Enrollment Details,Подробиці про реєстрацію
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,"Будь ласка, виберіть покупця"
@@ -1571,18 +1570,20 @@
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Purchase Order,Group same items,Група ж пункти
 DocType: Purchase Invoice,Disable Rounded Total,Відключити Заокруглений підсумок
-DocType: Employee Loan Application,Repayment Info,погашення інформація
+DocType: Department,Parent Department,Батьківський відділ
+DocType: Loan Application,Repayment Info,погашення інформація
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
 DocType: Maintenance Team Member,Maintenance Role,Роль обслуговування
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Оборотно-сальдова відомість
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Налаштування працівників
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронювання готелів користувачем
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 DocType: Student,O-,О
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Дослідження
+DocType: Subscription Settings,Subscription Settings,Параметри передплати
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Дослідження
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Announcement,All Students,всі студенти
@@ -1593,19 +1594,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
 DocType: Crop Cycle,Less than a year,Менше року
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Позиція {0} не може мати партій
 DocType: Crop,Yield UOM,Вихід UOM
 ,Budget Variance Report,Звіт по розбіжностях бюджету
 DocType: Salary Slip,Gross Pay,Повна Платне
 DocType: Item,Is Item from Hub,Є товар від центру
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Рядок {0}: Вид діяльності є обов&#39;язковим.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,"Дивіденди, що сплачуються"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,"Дивіденди, що сплачуються"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Бухгалтерська книга
 DocType: Stock Reconciliation,Difference Amount,Різниця на суму
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Д-р {0} на Виїзд на {1}
 DocType: Purchase Invoice,Reverse Charge,Зворотна зарядка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Нерозподілений чистий прибуток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Нерозподілений чистий прибуток
 DocType: Purchase Invoice,05-Change in POS,05-зміна POS
 DocType: Vehicle Log,Service Detail,деталь обслуговування
 DocType: BOM,Item Description,Опис товару
@@ -1620,12 +1621,12 @@
 DocType: Opportunity Item,Opportunity Item,Позиція Нагоди
 ,Student and Guardian Contact Details,Студент і дбайливець Контактна інформація
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Рядок {0}: Для постачальника {0} Адреса електронної пошти необхідно надіслати електронною поштою
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Тимчасове відкриття
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Тимчасове відкриття
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Переглянути концентратор
 ,Employee Leave Balance,Залишок днів відпусток працівника
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Сальдо на рахунку {0} повинно бути завжди {1}
 DocType: Patient Appointment,More Info,Більше інформації
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Собівартість обов'язкова для рядка {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Собівартість обов'язкова для рядка {0}
 DocType: Supplier Scorecard,Scorecard Actions,Дії Scorecard
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Приклад: магістр комп'ютерних наук
 DocType: Purchase Invoice,Rejected Warehouse,Склад для відхиленого
@@ -1635,7 +1636,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,для
 DocType: Supplier Quotation Item,Lead Time in days,Час на поставку в днях
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Зведена кредиторська заборгованість
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Виплата заробітної плати від {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Виплата заробітної плати від {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не дозволено редагувати заблокований рахунок {0}
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачені рахунки-фактури
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
@@ -1644,9 +1645,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторія тестових рецептів
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Загальна кількість  / Переміщена кількість {0} у Замовленні матеріалів {1} \ не може бути більше необхідної кількості {2} для позиції {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Невеликий
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Невеликий
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Відкриття інструменту створення рахунку-фактури
 DocType: Education Settings,Employee Number,Кількість працівників
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Скасувати рахунок-фактуру після пільгового періоду
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
 DocType: Project,% Completed,% Виконано
 ,Invoiced Amount (Exculsive Tax),Сума за рахунками (Exculsive вартість)
@@ -1660,7 +1662,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораторне випробування Datetime
 DocType: Email Digest,Add Quote,Додати Цитата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Непрямі витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
 DocType: Agriculture Analysis Criteria,Agriculture,Сільське господарство
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Дані майстра синхронізації
@@ -1691,16 +1693,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Накладна {0} не проведена
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капітальні обладнання
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,"Будь ласка, спочатку встановіть Код товару"
 DocType: Item,ITEM-,item-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
+DocType: Subscription Plan,Billing Interval Count,Графік інтервалу платежів
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 DocType: Antibiotic,Antibiotic,Антибіотик
 ,Team Updates,команда поновлення
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Для Постачальника
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Встановлення типу рахунку допомагає у виборі цього рахунку в операціях.
 DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (валюта компанії)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Створення Формат друку
@@ -1726,7 +1729,7 @@
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,"Альтернативний елемент не повинен бути таким самим, як код елемента"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
 DocType: Sales Partner,Target Distribution,Розподіл цілей
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Завершення попередньої оцінки
 DocType: Salary Slip,Bank Account No.,№ банківського рахунку
@@ -1743,7 +1746,7 @@
 DocType: BOM Operation,Workstation,Робоча станція
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запит на комерційну пропозицію Постачальника
 DocType: Healthcare Settings,Registration Message,Реєстраційне повідомлення
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Апаратний
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Апаратний
 DocType: Prescription Dosage,Prescription Dosage,Рецептурна доза
 DocType: Attendance,HR Manager,менеджер з персоналу
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Будь ласка, виберіть компанію"
@@ -1774,7 +1777,7 @@
 DocType: Project,Start and End Dates,Дати початку і закінчення
 ,Delivered Items To Be Billed,"Поставлені товари, на які не виставлені рахунки"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Відкрити ВВП {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
 DocType: Authorization Rule,Average Discount,Середня Знижка
 DocType: Project Update,Great/Quickly,Великий / Швидко
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1783,8 +1786,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Будь ласка, виберіть партію для дозованого пункту"
 DocType: Asset,Depreciation Schedules,Розклади амортизації
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,У налаштуваннях GST можуть бути обрані такі облікові записи:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути за межами періоду призначених відпусток
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,У налаштуваннях GST можуть бути обрані такі облікові записи:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути за межами періоду призначених відпусток
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валюта операції
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},З {0} | {1} {2}
@@ -1795,6 +1798,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Середньоденний розхід
 DocType: POS Profile,Campaign,Кампанія
 DocType: Supplier,Name and Type,Найменування і тип
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Статус офіційного затвердження повинні бути «Схвалено&quot; або &quot;Відхилено&quot;
 DocType: Physician,Contacts and Address,Контакти та адреса
 DocType: Purchase Invoice,Contact Person,Контактна особа
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',"""Дата очікуваного початку"" не може бути пізніше, ніж ""Дата очікуваного закінчення"""
@@ -1808,19 +1812,20 @@
 DocType: Student Admission,Eligibility and Details,Відповідність та подробиці
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Чиста зміна в основних фондів
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо для всіх посад"
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з&#39;єднань.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запит пропозиції недоступний з порталу, перевірте налаштування порталу."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Варіатор оцінки скорингової картки постачальника
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сума купівлі
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Сума купівлі
 DocType: Sales Invoice,Shipping Address Name,Ім'я адреси доставки
 DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Були помилки, створюючи Розклад курсу"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Перший підтверджувач витрат у списку буде встановлено як затверджувач витрат за замовчуванням.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,не може бути більше ніж 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Detail,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1841,14 +1846,15 @@
 DocType: Package Code,Package Code,код пакету
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Учень
 DocType: Purchase Invoice,Company GSTIN,компанія GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Негативний Кількість не допускається
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативний Кількість не допускається
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Податковий деталь стіл вуха від майстра пункт у вигляді рядка і зберігаються в цій галузі. Використовується з податків і зборів
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Співробітник не може повідомити собі.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Співробітник не може повідомити собі.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Якщо обліковий запис заморожується, записи дозволяється заборонених користувачів."
 DocType: Email Digest,Bank Balance,Банківський баланс
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Залишити затверджувача обов&#39;язково в додатку залишити
 DocType: Job Opening,"Job profile, qualifications required etc.","Профіль роботи, потрібна кваліфікація і т.д."
 DocType: Journal Entry Account,Account Balance,Баланс
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Податкове правило для операцій
@@ -1876,15 +1882,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Вихідний склад є обов'язковим для рядка {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"Термін оплати в рядку {0}, можливо, дублює."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Сільське господарство (бета-версія)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Пакувальний лист
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Оренда площі для офісу
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Пакувальний лист
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Оренда площі для офісу
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
 DocType: Disease,Common Name,Звичайне ім&#39;я
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Імпорт вдалося!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Жодної адреси ще не додано
 DocType: Workstation Working Hour,Workstation Working Hour,Робочі години робочої станції
 DocType: Vital Signs,Blood Pressure,Кров&#39;яний тиск
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Аналітик
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Аналітик
 DocType: Item,Inventory,Інвентаризація
 DocType: Item,Sales Details,Продажі Детальніше
 DocType: Quality Inspection,QI-,Qi-
@@ -1894,15 +1900,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Перевірка Enrolled курс для студентів в студентській групі
 DocType: Notification Control,Expense Claim Rejected,Авансовий звіт відхилено
 DocType: Item,Item Attribute,Атрибути номенклатури
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Уряд
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Уряд
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Претензія {0} вже існує для журналу автомобіля
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,ім&#39;я інститут
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Будь ласка, введіть Сума погашення"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,"Будь ласка, введіть Сума погашення"
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Варіанти номенклатурної позиції
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Послуги
 DocType: HR Settings,Email Salary Slip to Employee,Відправити Зарплатний розрахунок працівнику e-mail-ом
 DocType: Cost Center,Parent Cost Center,Батьківський центр витрат
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Вибір можливого постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Вибір можливого постачальника
 DocType: Sales Invoice,Source,Джерело
 DocType: Customer,"Select, to make the customer searchable with these fields","Виберіть, щоб зробити клієнта доступними для пошуку за цими полями"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показати закрито
@@ -1919,7 +1925,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Рух грошових коштів від інвестицій
 DocType: Program Course,Program Course,програма курсу
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Вантажні та експедиторські збори
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Вантажні та експедиторські збори
 DocType: Homepage,Company Tagline for website homepage,Гасло компанії для головної сторінки веб-сайту
 DocType: Item Group,Item Group Name,Назва групи номенклатури
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий
@@ -1949,10 +1955,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Інформація про спонсорство
 DocType: Leave Block List,Block Holidays on important days.,Заблокувати вихідні на важливі дати
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Введіть всі необхідні значення результатів
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Зведена дебіторська заборгованість
-DocType: Employee Loan,Monthly Repayment Amount,Щомісячна сума погашення
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Зведена дебіторська заборгованість
+DocType: Loan,Monthly Repayment Amount,Щомісячна сума погашення
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Відкриття рахунків-фактур
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
 DocType: UOM,UOM Name,Ім&#39;я Одиниця виміру
 DocType: GST HSN Code,HSN Code,HSN код
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Сума внеску
@@ -1974,7 +1980,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Користувач {0} вже призначений лікарю {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Коробка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,можливий постачальник
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,можливий постачальник
+DocType: Journal Entry,JV-RET-,СП-РЕТ-
 DocType: Budget,Monthly Distribution,Місячний розподіл
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Список отримувачів порожній. Створіть його будь-ласка
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Охорона здоров&#39;я (бета-версія)
@@ -2002,7 +2009,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,"Немає нічого, щоб упакувати"
 DocType: Shipping Rule Condition,From Value,Від вартості
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
-DocType: Employee Loan,Repayment Method,спосіб погашення
+DocType: Loan,Repayment Method,спосіб погашення
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Якщо позначено, то головною сторінкою веб-сайту буде ""Група об’єктів"" за замовчуванням"
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Претензії рахунок компанії.
@@ -2011,7 +2018,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Сертифікат обов&#39;язковий
 DocType: Company,Default Holiday List,Список вихідних за замовчуванням
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Рядок {0}: Від часу і часу {1} перекривається з {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Зобов'язання по запасах
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Зобов'язання по запасах
 DocType: Purchase Invoice,Supplier Warehouse,Склад постачальника
 DocType: Opportunity,Contact Mobile No,№ мобільного Контакту
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Виберіть компанію
@@ -2019,7 +2026,7 @@
 DocType: Student Report Generation Tool,Print Section,Друк розділу
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Користувач {0} не має стандартного профілю POS. Перевірте за замовчуванням в рядку {1} для цього Користувача.
 DocType: Student Group,Set 0 for no limit,Встановіть 0 для жодних обмежень
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Ряд {idx}: {поле} необхідний для створення відкритої {invoice_type} рахунків-фактур
 DocType: Customer,Primary Address and Contact Detail,Основна адреса та контактні дані
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплати на e-mail
@@ -2030,10 +2037,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,"Будь ласка, виберіть принаймні один домен."
 DocType: Dependent Task,Dependent Task,Залежить Завдання
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте планувати операції X днів вперед.
 DocType: HR Settings,Stop Birthday Reminders,Стоп нагадування про дні народження
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
 DocType: SMS Center,Receiver List,Список отримувачів
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Пошук товару
 DocType: Payment Schedule,Payment Amount,Сума оплати
@@ -2043,7 +2050,7 @@
 DocType: Assessment Plan,Grading Scale,оціночна шкала
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Вже завершено
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,товарна готівку
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,товарна готівку
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Імпорт успішно!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Запит про оплату {0} вже існує
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
@@ -2054,17 +2061,16 @@
 DocType: Quotation Item,Quotation Item,Позиція у пропозиції
 DocType: Customer,Customer POS Id,Клієнт POS Id
 DocType: Account,Account Name,Ім&#39;я рахунку
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Серійний номер {0} кількість {1} не може бути дробною
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Серійний номер {0} кількість {1} не може бути дробною
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Будь ласка, введіть URL-адресу сервера Woocommerce"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,головний Тип постачальника
 DocType: Purchase Order Item,Supplier Part Number,Номер деталі постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
 DocType: Share Balance,To No,Ні
-DocType: Subscription,Reference Document,довідковий документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} скасовано або припинено
 DocType: Accounts Settings,Credit Controller,Кредитний контролер
-DocType: Grant Application,Applicant Type,Тип заявника
+DocType: Loan,Applicant Type,Тип заявника
 DocType: Purchase Invoice,03-Deficiency in services,03-дефіцит послуг
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
 DocType: Healthcare Settings,Default Medical Code Standard,Стандартний стандарт медичного коду
@@ -2075,13 +2081,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Оплачено
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервована к-сть
 DocType: Party Account,Party Account,Рахунок контрагента
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадри
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Кадри
 DocType: Lead,Upper Income,Верхня прибуток
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,відхиляти
 DocType: Journal Entry Account,Debit in Company Currency,Дебет у валюті компанії
 DocType: BOM Item,BOM Item,Позиція Норм витрат
 DocType: Appraisal,For Employee,Для працівника
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Зробити запис виплат
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Зробити запис виплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Аванси по постачальнику повинні бути у дебеті
 DocType: Company,Default Values,Значення за замовчуванням
 DocType: Membership,INR,INR
@@ -2111,10 +2117,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} має бути більше 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Наявна акція
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Наявна акція
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планування потужності протягом (днів)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Закупівля
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обов&#39;язкове поле - Програма
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Обов&#39;язкове поле - Програма
 DocType: Special Test Template,Result Component,Результат компонентів
@@ -2135,7 +2141,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Включити вихідні у відпустках як відпустку
 DocType: Sales Invoice,Packed Items,Упаковані товари
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Гарантія Позов проти серійним номером
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Разом'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Разом'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включити Кошик
 DocType: Employee,Permanent Address,Постійна адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2153,10 +2159,10 @@
 DocType: Selling Settings,Selling Settings,Налаштування продаж
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Підтвердити дію
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Інтернет Аукціони
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,"Будь ласка, зазначте кількість або собівартість або разом"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Будь ласка, зазначте кількість або собівартість або разом"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,звершення
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Дивіться в кошик
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетингові витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Повідомлення про нестачу номенклатурних позицій
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,"Неможливо створити стандартні критерії. Будь ласка, перейменуйте критерії"
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
@@ -2179,9 +2185,9 @@
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Material Request,Transferred,передано
 DocType: Vehicle,Doors,двері
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,Встановлення ERPNext завершено!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,Встановлення ERPNext завершено!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Збір плати за реєстрацію пацієнтів
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Неможливо змінити Атрибути після транзакції з акціями. Зробіть новий предмет і перемістіть товар до нового пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Неможливо змінити Атрибути після транзакції з акціями. Зробіть новий предмет і перемістіть товар до нового пункту
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,податки Розпад
 DocType: Packing Slip,PS-,PS-
@@ -2217,12 +2223,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирення JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Purchase Invoice Item,Batch No,Партія №
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Аванси працівників
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 DocType: Grant Application,Assessment  Mark (Out of 10),Оцінка (з 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Немає
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії ваших операцій
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
@@ -2231,15 +2238,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Поле ""З"" у Нагоді є обов'язковим"
 DocType: Email Digest,Annual Expenses,річні витрати
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Зробіть Замовлення на придбання
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Зробіть Замовлення на придбання
 DocType: SMS Center,Send To,Відправити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Недостатньо днів залишилося для типу відпусток {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Недостатньо днів залишилося для типу відпусток {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Розподілена сума
 DocType: Sales Team,Contribution to Net Total,Внесок у Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Інвентаризація
 DocType: Territory,Territory Name,Територія Ім&#39;я
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,"Склад ""в роботі"" необхідний щоб провести"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,У Підписках можна використовувати лише Плани з тим самим платіжним циклом
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Претендент на роботу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутна інформація та інша загальна інформація про вашого постачальника
@@ -2250,10 +2258,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,"За проводкою {0} не має ніякого невідповідного {1}, запису"
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,атестації
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Навчальні заходи
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Відслідковування потенційних клієнтів.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умова для Правила доставки
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Будь ласка введіть
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Будь ласка введіть
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Журнал технічного обслуговування
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Вага нетто цього пакета. (розраховується автоматично як сума чистого ваги товарів)
@@ -2261,11 +2269,11 @@
 DocType: Sales Order,To Deliver and Bill,Для доставки та виставлення рахунків
 DocType: Student Group,Instructors,інструктори
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,Норми витрат {0} потрібно провести
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,Норми витрат {0} потрібно провести
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Управління акціями
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Оплата
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Склад {0} не пов&#39;язаний з якою-небудь обліковим записом, будь ласка, вкажіть обліковий запис в складської записи або встановити обліковий запис за замовчуванням інвентаризації в компанії {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Керуйте свої замовлення
 DocType: Work Order Operation,Actual Time and Cost,Фактичний час і вартість
@@ -2275,7 +2283,7 @@
 DocType: Student Leave Application,Student Leave Application,Студент Залишити заявку
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,на
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Комплектувати у момент продажу.
@@ -2285,7 +2293,7 @@
 DocType: Item,Barcodes,Штрих-коди
 DocType: Hub Category,Hub Node,Вузол концентратора
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели елементи, що повторюються. Будь-ласка, виправіть та спробуйте ще раз."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Асоціювати
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Асоціювати
 DocType: Asset Movement,Asset Movement,Рух активів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Замовлення на роботі {0} необхідно подати
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Нова кошик
@@ -2303,13 +2311,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Платіжна валюта повинна дорівнювати валюті чи валюті облікового запису партії компанії за умовчанням
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Рядок {0}: Дата закінчення не може бути до дати опублікування
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Рядок {0}: Дата закінчення не може бути до дати опублікування
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Створити Оплату
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
 ,Sales Invoice Trends,Динаміка вихідних рахунків
 DocType: Leave Application,Apply / Approve Leaves,Застосувати / Затвердити Листя
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Для
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете посилатися на рядок, тільки якщо тип стягнення ""На суму попереднього рядка» або «На загальну суму попереднього рядка"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете посилатися на рядок, тільки якщо тип стягнення ""На суму попереднього рядка» або «На загальну суму попереднього рядка"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дерево центрів фінансових витрат.
 DocType: Serial No,Delivery Document No,Доставка Документ №
@@ -2323,7 +2330,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Масштабне споживання не встановлено в налаштуваннях виробництва.
 DocType: Student,Student Mobile Number,Студент Мобільний телефон
 DocType: Item,Has Variants,Має Варіанти
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не можна переоформити для пункту {0} у рядку {1} більше {2}. Щоб дозволити надмірну оплату, встановіть у налаштуваннях запасів"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не можна переоформити для пункту {0} у рядку {1} більше {2}. Щоб дозволити надмірну оплату, встановіть у налаштуваннях запасів"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Оновити відповідь
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва помісячного розподілу
@@ -2335,12 +2342,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Спочатку виберіть програму
 DocType: Patient Appointment,Patient Age,Вік хворого
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Управління проектами
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Серійний номер {0} вже повернуто
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Серійний номер {0} вже повернуто
 DocType: Supplier,Supplier of Goods or Services.,Постачальник товарів або послуг.
 DocType: Budget,Fiscal Year,Бюджетний період
 DocType: Asset Maintenance Log,Planned,Запланований
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Дебіторська заборгованість за замовчуванням, яка використовується, якщо не встановлено в Пацієнтці, щоб замовити консультаційні витрати."
 DocType: Vehicle Log,Fuel Price,паливо Ціна
+DocType: Bank Guarantee,Margin Money,Маржинальні гроші
 DocType: Budget,Budget,Бюджет
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Встановити Відкрити
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
@@ -2354,16 +2362,16 @@
 DocType: Lead,Follow Up,Слідувати
 DocType: Item,Is Sales Item,Продаєм цей товар
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Дерево Групи Об’єктів
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
 DocType: Maintenance Visit,Maintenance Time,Час Технічного обслуговування
 ,Amount to Deliver,Сума Поставте
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Той самий пункт введено кілька разів. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата початку не може бути раніше, ніж рік Дата початку навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Трапились помилки.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Працівник {0} вже подав заявку на {1} між {2} і {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Трапились помилки.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Працівник {0} вже подав заявку на {1} між {2} і {3}:
 DocType: Guardian,Guardian Interests,хранителі Інтереси
 DocType: Naming Series,Current Value,Поточна вартість
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовому році"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовому році"
 DocType: Education Settings,Instructor Records to be created by,"Інструктор записів, які потрібно створити"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} створено
 DocType: GST Account,GST Account,Обліковий запис GST
@@ -2382,8 +2390,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
 DocType: Website Item Group,Website Item Group,Група об’єктів веб-сайту
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Додано до вибраного
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Жодний звіт про заробітну плату, який не визначено для подання за вказаним вище критерієм, АБО ОГЛЯДНИЙ ОГЛЯД, який вже подано"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Мита і податки
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Жодний звіт про заробітну плату, який не визначено для подання за вказаним вище критерієм, АБО ОГЛЯДНИЙ ОГЛЯД, який вже подано"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Мита і податки
 DocType: Projects Settings,Projects Settings,Налаштування проектів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Будь ласка, введіть дату Reference"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплати не можуть бути відфільтровані по {1}
@@ -2393,27 +2401,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарні групи.
 DocType: Production Plan,Total Produced Qty,Загальний обсяг випуску
 DocType: Payroll Entry,Get Employee Details,Отримати інформацію про працівника
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можна посилатися на номер рядка, що перевищує або рівний поточному для цього типу стягнення"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можна посилатися на номер рядка, що перевищує або рівний поточному для цього типу стягнення"
 DocType: Asset,Sold,проданий
 ,Item-wise Purchase History,Попозиційна історія закупівель
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку ""Згенерувати розклад"" щоб отримати серійний номер позиції {0}"
 DocType: Account,Frozen,Заблоковано
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базова сума (Компанія Валюта)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Сировина
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Сировина
 DocType: Payment Reconciliation Payment,Reference Row,посилання Row
 DocType: Installation Note,Installation Time,Час встановлення
 DocType: Sales Invoice,Accounting Details,Бухгалтеський облік. Детальніше
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Видалити всі транзакції цієї компанії
 DocType: Patient,O Positive,O Позитивний
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Інвестиції
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерії приймання
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Будь ласка, введіть Замовлення матеріалів у наведену вище таблицю"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Немає виплат для вступу до журналу
 DocType: Item Attribute,Attribute Name,Ім'я атрибуту
 DocType: BOM,Show In Website,Показувати на веб-сайті
 DocType: Shopping Cart Settings,Show Quantity in Website,Показати Кількість в веб-сайт
-DocType: Employee Loan Application,Total Payable Amount,Загальна сума оплачується
+DocType: Loan Application,Total Payable Amount,Загальна сума оплачується
 DocType: Task,Expected Time (in hours),Очікуваний час (в годинах)
 DocType: Item Reorder,Check in (group),Заїзд (група)
 DocType: Soil Texture,Silt,Іл
@@ -2432,7 +2441,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,платежі
 DocType: Room,Room Name,номер Найменування
 DocType: Prescription Duration,Prescription Duration,Тривалість рецепту
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути надана або відмінена {0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути надана або відмінена {0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток {1}"
 DocType: Activity Cost,Costing Rate,Кошторисна вартість
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Адреси та контакти клієнта
 ,Campaign Efficiency,ефективність кампанії
@@ -2452,11 +2461,11 @@
 DocType: Chapter,Chapter,Глава
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Пара
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Стандартний обліковий запис буде автоматично оновлено в рахунку-фактурі POS, коли вибрано цей режим."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
 DocType: Asset,Depreciation Schedule,Запланована амортизація
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Партнер з продажу Адреси та контакти
 DocType: Bank Reconciliation Detail,Against Account,Кор.рахунок
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Поаяся Дата повинна бути в межах від дати і до теперішнього часу
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Поаяся Дата повинна бути в межах від дати і до теперішнього часу
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Установіть Центр заощаджень за замовчуванням у компанії {0}.
 DocType: Item,Has Batch No,Має номер партії
@@ -2474,7 +2483,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу)
 DocType: Soil Texture,Soil Type,Тип грунту
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Нове повідомлення
 ,Quotation Trends,Тренд пропозицій
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Mandate GoCardless
@@ -2494,7 +2502,7 @@
 DocType: Hub Category,Hub Category,Категорія концентратора
 DocType: Purchase Invoice,SEZ,СЕЗ
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
-DocType: Employee Loan,Loan Amount,Розмір позики
+DocType: Loan,Loan Amount,Розмір позики
 DocType: Student Report Generation Tool,Add Letterhead,Додати бланк
 DocType: Program Enrollment,Self-Driving Vehicle,Самостійне водіння автомобіля
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Поставщик Scorecard Standing
@@ -2523,9 +2531,9 @@
 DocType: Cash Flow Mapper,Position,Позиція
 DocType: Patient,Patient Details,Деталі пацієнта
 DocType: Patient,B Positive,B Позитивний
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
 DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
 DocType: Patient Medical Record,Patient Medical Record,Пацієнтська медична довідка
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спортивний
@@ -2533,8 +2541,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Загальний фактичний
 DocType: Lab Test UOM,Test UOM,Випробувати UOM
 DocType: Student Siblings,Student Siblings,"Студентські Брати, сестри"
+DocType: Subscription Plan Detail,Subscription Plan Detail,Детальний план підписки
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Блок
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Будь ласка, сформулюйте компанії"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Будь ласка, сформулюйте компанії"
 ,Customer Acquisition and Loyalty,Придбання та лояльність клієнтів
 DocType: Asset Maintenance Task,Maintenance Task,Забезпечення
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,"Будь ласка, встановіть ліміт B2C в налаштуваннях GST."
@@ -2549,6 +2558,7 @@
 ,BOM Search,Пошук норм
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Загальна витрата матеріальної цінності (через вхід в акції)
 DocType: Hub Settings,Company Registered,Компанія зареєстрована
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,"До дати не може бути менше, ніж від дати"
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Публікуйте &quot;На складі&quot; або &quot;Немає в наявності&quot; на концентраторі на основі наявних на складі запасів.
 DocType: Vehicle,Fuel Type,Тип палива
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
@@ -2556,17 +2566,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Залишок в партії {0} стане негативним {1} для позиції {2} на складі {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Наступне Замовлення матеріалів буде створено автоматично згідно рівня дозамовлення для даної позиції
 DocType: Email Digest,Pending Sales Orders,Замовлення клієнтів в очікуванні
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 DocType: Employee,Create User Permission,Створити праву користувача
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 DocType: Healthcare Settings,Remind Before,Нагадаю раніше
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
 DocType: Salary Component,Deduction,Відрахування
 DocType: Item,Retain Sample,Зберегти зразок
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Рядок {0}: Від часу і часу є обов&#39;язковим.
 DocType: Stock Reconciliation Item,Amount Difference,сума різниця
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Ціна товару додається для {0} у прайс-листі {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Ціна товару додається для {0} у прайс-листі {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Будь ласка, введіть ідентифікатор працівника для цього Відповідального з продажу"
 DocType: Territory,Classification of Customers by region,Класифікація клієнтів по регіонах
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,У виробництві
@@ -2576,8 +2587,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Розрахунковий банк собі баланс
 DocType: Normal Test Template,Normal Test Template,Шаблон нормального тесту
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,відключений користувач
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Пропозиція
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Не вдається встановити отриманий RFQ без котирування
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Пропозиція
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Не вдається встановити отриманий RFQ без котирування
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всього відрахування
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Виберіть обліковий запис для друку в валюті рахунку
@@ -2585,7 +2596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Це базується на операціях проти цього пацієнта. Нижче наведено докладну інформацію про часовій шкалі
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Вартість Оновлене
 DocType: Patient,Date of Birth,Дата народження
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Пункт {0} вже повернулися
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Бюджетний період ** являє собою бюджетний період. Всі бухгалтерські та інші основні операції відслідковуються у розрізі **Бюджетного періоду**.
 DocType: Opportunity,Customer / Lead Address,Адреса Клієнта /  Lead-а
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Установка Scorecard постачальника
@@ -2596,14 +2607,15 @@
 DocType: Work Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Описання роботи
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Описання роботи
 DocType: Student Applicant,Applied,прикладна
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Знову відкрийте
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Знову відкрийте
 DocType: Sales Invoice Item,Qty as per Stock UOM,Кількість у складській од.вим.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,ім&#39;я Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,Знижка з продажу 02-Post
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім ""-"" ""."", ""#"", і ""/"" не допускаються у назві серій"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте за кампаніями продаж. Слідкуйте за лідами, пропозиціями, замовленнями покупців і т.д. з кампаній, щоб оцінити повернення інвестицій."
+DocType: Department Approver,Approver,Затверджуючий
 ,SO Qty,SO К-сть
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Поле «Акціонер» не може бути пустим
 DocType: Guardian,Work Address,Адреса місця роботи
@@ -2617,21 +2629,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Загальна розподілена сума (валюта компанії)
 DocType: Purchase Order Item,To be delivered to customer,Для поставлятися замовнику
 DocType: BOM,Scrap Material Cost,Лом Матеріал Вартість
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить до жодного складу
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить до жодного складу
 DocType: Grant Application,Email Notification Sent,Надіслано сповіщення електронною поштою
 DocType: Purchase Invoice,In Words (Company Currency),Прописом (Валюта Компанії)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Код товару, склад, кількість необхідні по рядку"
-DocType: Pricing Rule,Supplier,Постачальник
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Код товару, склад, кількість необхідні по рядку"
+DocType: Bank Guarantee,Supplier,Постачальник
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Показати деталі платежу
 DocType: Consultation,Consultation Time,Час консультації
 DocType: C-Form,Quarter,Чверть
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Різні витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Різні витрати
 DocType: Global Defaults,Default Company,За замовчуванням Компанія
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Рахунок витрат або рахунок різниці є обов'язковим для {0}, оскільки впливає на вартість запасів"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Назва банку
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-вище
-DocType: Employee Loan,Employee Loan Account,Співробітник позичкового рахунку
 DocType: Leave Application,Total Leave Days,Всього днів відпустки
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примітка: E-mail НЕ буде відправлено користувачів з обмеженими можливостями
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,кількість взаємодії
@@ -2647,7 +2658,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Вага (у кілограмі)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",голови / head_name залишати порожній автоматично після збереження розділу.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,"Будь ласка, встановіть GST-рахунки в налаштуваннях GST"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,"Будь ласка, встановіть GST-рахунки в налаштуваннях GST"
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Вид бізнесу
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть суму розподілу, тип та номер рахунку-фактури в принаймні одному рядку"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Вартість нової покупки
@@ -2656,12 +2667,13 @@
 DocType: Grant Application,Grant Description,Опис гранту
 DocType: Purchase Invoice Item,Rate (Company Currency),Ціна (у валюті компанії)
 DocType: Student Guardian,Others,Інші
+DocType: Subscription,Discounts,Знижки
 DocType: Payment Entry,Unallocated Amount,Нерозподілена сума
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}."
 DocType: POS Profile,Taxes and Charges,Податки та збори
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт або послуга, що купується, продається, або зберігається на складі."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Немає більше оновлень
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можна обрати тип стягнення «На суму попереднього рядка» або «На Загальну суму попереднього рядка 'для першого рядка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можна обрати тип стягнення «На суму попереднього рядка» або «На Загальну суму попереднього рядка 'для першого рядка
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,"Це охоплює всі показники, пов&#39;язані з цією установкою"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Підпорядкована позиція не повинна бути комплектом. Будь ласка, видаліть позицію `{0}` та збережіть"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Банківські
@@ -2670,21 +2682,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку ""Згенерувати розклад"", щоб отримати розклад"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
 DocType: Bin,Ordered Quantity,Замовлену кількість
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Інтервали Оціночна шкала
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Прибуток за рік
+DocType: Bank Guarantee,Name of Bank,Назва Банку
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Бухгалтерія Вхід для {2} може бути зроблено тільки в валюті: {3}
 DocType: Fee Schedule,In Process,В процесі
 DocType: Authorization Rule,Itemwise Discount,Itemwise Знижка
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дерево фінансових рахунків.
+DocType: Bank Guarantee,Reference Document Type,Посилання Тип документа
 DocType: Cash Flow Mapping,Cash Flow Mapping,Планування грошових потоків
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Серійний Інвентар
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Електронна пошта не знайдено у контакті за замовчуванням
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерувати таємницю
-DocType: Employee Loan,Account Info,Інформація про акаунт
+DocType: Loan,Account Info,Інформація про акаунт
 DocType: Activity Type,Default Billing Rate,Ціна для виставлення у рахунку за замовчуванням
 DocType: Fees,Include Payment,Включити платіж
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Студентські групи створені.
@@ -2692,24 +2707,24 @@
 DocType: Sales Invoice,Total Billing Amount,Разом сума до оплати
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програма в структурі плати та група студентів {0} відрізняються.
 DocType: Fee Schedule,Receivable Account,Рахунок дебеторки
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
 DocType: Quotation Item,Stock Balance,Залишки на складах
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Замовлення клієнта в Оплату
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,генеральний директор
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,генеральний директор
 DocType: Purchase Invoice,With Payment of Tax,Із сплатою податку
 DocType: Expense Claim Detail,Expense Claim Detail,Деталі Авансового звіту
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Triplicate ДЛЯ ПОСТАЧАЛЬНИКІВ
 DocType: Land Unit,Is Container,Є контейнер
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Це буде перший день циклу врожаю
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Будь ласка, виберіть правильний рахунок"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Purchase Invoice Item,Weight UOM,Одиниця ваги
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Список доступних акціонерів з номерами фоліо
 DocType: Salary Structure Employee,Salary Structure Employee,Працівник Структури зарплати
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Показати варіанти атрибутів
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Показати варіанти атрибутів
 DocType: Student,Blood Group,Група крові
 DocType: Course,Course Name,Назва курсу
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть погодити  заяви на відпустки певного працівника"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Устаткування офісу
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Устаткування офісу
 DocType: Purchase Invoice Item,Qty,К-сть
 DocType: Fiscal Year,Companies,Компанії
 DocType: Supplier Scorecard,Scoring Setup,Налаштування підрахунку голосів
@@ -2728,7 +2743,7 @@
 DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Дебет вимагається
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупівлі
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Прайс-лист закупівлі
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони постачальників показників змінної.
 DocType: Job Offer Term,Offer Term,Пропозиція термін
 DocType: Asset,Quality Manager,Менеджер з якості
@@ -2740,13 +2755,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Загальна сума невиплачених: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операція Сайт
 DocType: Supplier Scorecard,Supplier Score,Показник постачальника
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Всього у рахунках
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Всього у рахунках
 DocType: Supplier,Warn RFQs,Попереджати Запити
 DocType: BOM,Conversion Rate,Обмінний курс
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Пошук продукту
 DocType: Assessment Plan,To Time,Часу
 DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
+DocType: Loan,Total Amount Paid,Загальна сума сплачена
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Будь-ласка, оберіть Student Admission, який є обов&#39;язковим для платника заявника"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},Рекурсія у Нормах: {0} не може бути батьківським або підлеглим елементом {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Будь ласка, виберіть ціновий список, щоб опублікувати вартість"
@@ -2756,19 +2772,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} відключено
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Рядок {0}: Завершена Кількість не може бути більше, ніж {1} для операції {2}"
 DocType: Manufacturing Settings,Allow Overtime,Дозволити Овертайм
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Пункт {0} не може бути оновлений за допомогою Stock Примирення, будь ласка, використовуйте стік запис"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Пункт {0} не може бути оновлений за допомогою Stock Примирення, будь ласка, використовуйте стік запис"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Пункт {0} не може бути оновлений за допомогою Stock Примирення, будь ласка, використовуйте стік запис"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Пункт {0} не може бути оновлений за допомогою Stock Примирення, будь ласка, використовуйте стік запис"
 DocType: Training Event Employee,Training Event Employee,Навчання співробітників Подія
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максимальна кількість зразків - {0} можна зберегти для партії {1} та елемента {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Додати часові слоти
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для позиції {1}. Ви надали {2}."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} Серійні номери, необхідні для позиції {1}. Ви надали {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна собівартість
 DocType: Training Event,Advance,Аванс
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,для повторного повторення.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Налаштування платіжного шлюзу GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Обмін Прибуток / збиток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Обмін Прибуток / збиток
 DocType: Opportunity,Lost Reason,Забули Причина
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Рядок № {0}: рахунок {1} не належить компанії {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Рядок № {0}: рахунок {1} не належить компанії {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не вдається знайти DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
@@ -2787,7 +2802,6 @@
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,Приклад: Відправка наступного дня
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серійний номер {0} не знайдений
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Підписка була {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Програма розкладів платежів
 DocType: Fee Schedule Program,Student Batch,Student Batch
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,зробити Студент
@@ -2803,14 +2817,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Електронна комерція GSTIN
 DocType: Sales Order,Not Delivered,Не доставлено
 ,Bank Clearance Summary,Результат банківського клірінгу
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Створення і управління щоденні, щотижневі та щомісячні дайджести новин."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Створення і управління щоденні, щотижневі та щомісячні дайджести новин."
 DocType: Appraisal Goal,Appraisal Goal,Оцінка Мета
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Запропонувати категорію?
 DocType: Stock Reconciliation Item,Current Amount,Поточна сума
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,будівлі
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,будівлі
 DocType: Fee Schedule,Fee Structure,структура оплати
 DocType: Timesheet Detail,Costing Amount,Калькуляція Сума
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 DocType: Student Admission Program,Application Fee,реєстраційний внесок
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Провести Зарплатний розрахунок
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Maxiumm знижка Item {0} {1}%
@@ -2818,12 +2831,13 @@
 DocType: Sales Partner,Address & Contacts,Адреса та контакти
 DocType: SMS Log,Sender Name,Ім&#39;я відправника
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Критерії аналізу сільського господарства
+DocType: HR Settings,Leave Approval Notification Template,Залиште шаблон сповіщення про схвалення
 DocType: POS Profile,[Select],[Виберіть]
 DocType: Vital Signs,Blood Pressure (diastolic),Артеріальний тиск (діастолічний)
 DocType: SMS Log,Sent To,Відправлено
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Зробити вихідний рахунок
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Softwares
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Softwares
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
 DocType: Company,For Reference Only.,Для довідки тільки.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Лікар {0} недоступний на {1}
@@ -2841,7 +2855,7 @@
 DocType: Employee,New Workplace,Нове місце праці
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Матеріальне споживання
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Встановити як Закрито
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Немає товару зі штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Немає товару зі штрих-кодом {0}
 DocType: Normal Test Items,Require Result Value,Вимагати значення результату
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2856,19 +2870,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Незнайдено жодної активної Структури зарплати або Структури зарплати за замовчуванням для співробітника {0} для зазначених дат
 DocType: Leave Block List,Allow Users,Надання користувачам
 DocType: Purchase Order,Customer Mobile No,Замовник Мобільна Немає
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Періодичність
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Інформація про шаблон картки грошових потоків
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Кредитний менеджмент
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Відслідковувати окремо доходи та витрати для виробничої вертикалі або підрозділів.
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Показати Зарплатний розрахунок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Показати Зарплатний розрахунок
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Передача матеріалів
 DocType: Fees,Send Payment Request,Надіслати запит на оплату
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 DocType: Water Analysis,Origin,Походження
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,Вибрати рахунок для суми змін
 DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
@@ -2883,14 +2897,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Відповідальність за податок на прибуток
 DocType: Grading Scale Interval,Grade Description,оцінка Опис
 DocType: Stock Entry,Purchase Receipt No,Прихідна накладна номер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Аванс-завдаток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Аванс-завдаток
 DocType: Sales Invoice, Shipping Bill Number,Номер рахунку доставки
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,простежуваність
 DocType: Asset Maintenance Log,Actions performed,Виконані дії
 DocType: Cash Flow Mapper,Section Leader,Лідер розділу
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
 DocType: Supplier Scorecard Scoring Standing,Employee,Працівник
+DocType: Bank Guarantee,Fixed Deposit Number,Номер фіксованого депозиту
 DocType: Asset Repair,Failure Date,Дата невдачі
 DocType: Sample Collection,Collected Time,Зібраний час
 DocType: Company,Sales Monthly History,Щомісячна історія продажу
@@ -2907,10 +2922,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,"Ви впевнені, що хочете скасувати цю зустріч?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет бронювання номерів у готелі
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Воронка продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Rename Tool,File to Rename,Файл Перейменувати
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Будь ласка, виберіть Норми для елемента в рядку {0}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Отримати оновлення підписки
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Рахунок {0} не збігається з Компанією {1} в режимі рахунку: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Зазначених Норм витрат {0} не існує для позиції {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Курс:
@@ -2920,7 +2936,7 @@
 DocType: Notification Control,Expense Claim Approved,Авансовий звіт погоджено
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,"Немає робочих замовлень, створених"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Зарплатний розрахунок для працівника {0} вже створено за цей період
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Фармацевтична
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Фармацевтична
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Вартість куплених виробів
 DocType: Selling Settings,Sales Order Required,Необхідне Замовлення клієнта
 DocType: Purchase Invoice,Credit To,Кредит на
@@ -2938,7 +2954,7 @@
 DocType: Request for Quotation Supplier,No Quote,Ніяких цитат
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Рахунок оплати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Чиста зміна дебіторської заборгованості
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Компенсаційні Викл
 DocType: Job Offer,Accepted,Прийняті
@@ -2951,7 +2967,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Результати пошуку
 DocType: Room,Room Number,Номер кімнати
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Неприпустима посилання {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Неприпустима посилання {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Ярлик правил доставки
 DocType: Journal Entry Account,Payroll Entry,Заробітна плата за вхід
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Перегляньте звіти про комісійні
@@ -2961,7 +2977,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
 DocType: Lab Test Sample,Lab Test Sample,Лабораторія випробувань зразка
 DocType: Item Variant Settings,Allow Rename Attribute Value,Дозволити значення атрибуту &quot;Перейменувати&quot;
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Швидка проводка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Швидка проводка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
 DocType: Restaurant,Invoice Series Prefix,Префікс серії рахунків-фактур
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
@@ -2969,8 +2985,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть планову к-сть для номенклатури {0} в рядку {1}"
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Інтеграція з Картами Google не активована
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} не проведений
+DocType: Subscription,Trialling,Тріаллінг
 DocType: Member,Membership Expiry Date,Дата закінчення членства
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} повинен бути негативним у зворотному документі
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} повинен бути негативним у зворотному документі
 ,Minutes to First Response for Issues,Протокол до First Response у справах
 DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
@@ -2989,7 +3006,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Одиниця виміру
 DocType: Fiscal Year,Year End Date,Дата закінчення року
 DocType: Task Depends On,Task Depends On,Завдання залежить від
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Нагода
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Нагода
 DocType: Operation,Default Workstation,За замовчуванням робоча станція
 DocType: Notification Control,Expense Claim Approved Message,Повідомлення при погодженні авансового звіту
 DocType: Payment Entry,Deductions or Loss,Відрахування або збиток
@@ -3027,7 +3044,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Відпустка за свій рахунок не відповідає затвердженим записам заяв на відпустку
 DocType: Campaign,Campaign-.####,Кампанія -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Наступні кроки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
 DocType: Membership,USD,Дол. США
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Зробити рахунок-фактуру
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Залишковий баланс
@@ -3037,7 +3054,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,кінець року
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Кінцева дата контракту повинна бути більше ніж дата влаштування
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Кінцева дата контракту повинна бути більше ніж дата влаштування
 DocType: Driver,Driver,Водій
 DocType: Vital Signs,Nutrition Values,Харчування цінності
 DocType: Lab Test Template,Is billable,Оплачується
@@ -3048,7 +3065,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Фактична дата початку (за допомогою Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Цей зразок сайту згенерований автоматично з ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Старіння Діапазон 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Загальна авансова сума не може перевищувати загальну заявлену суму
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Загальна авансова сума не може перевищувати загальну заявлену суму
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3083,7 +3100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Виберіть значення атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Причина для видачі документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Готівковий рахунок
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"Наступний Контакт До не може бути таким же, як Lead Адреса електронної пошти"
 DocType: Tax Rule,Billing City,Місто (оплата)
@@ -3100,7 +3117,8 @@
 DocType: Warranty Claim,Service Address,Адреса послуги
 DocType: Asset Maintenance Task,Calibration,Калібрування
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} - це свято компанії
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Меблі і Світильники
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Залишити сповіщення про статус
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Меблі і Світильники
 DocType: Item,Manufacture,Виробництво
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Налаштування компанії
 ,Lab Test Report,Лабораторія тестового звіту
@@ -3116,7 +3134,6 @@
 DocType: Crop,Planting Area,Посадка площі
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
 DocType: Installation Note Item,Installed Qty,Встановлена к-сть
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Це може бути з-за деяких недійсних адрес електронної пошти в
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Ви додали
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,навчання Результат
@@ -3126,16 +3143,17 @@
 DocType: Products Settings,Products per Page,Продукція на сторінку
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідна ставка
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Організація філії господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,або
 DocType: Sales Order,Billing Status,Статус рахунків
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Повідомити про проблему
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Комунальні витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Комунальні витрати
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Понад 90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Рядок # {0}: Проводка {1} не має рахунку {2} або вже прив'язана до іншого документу
 DocType: Supplier Scorecard Criteria,Criteria Weight,Критерії ваги
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Залишити повідомлення про схвалення
 DocType: Buying Settings,Default Buying Price List,Прайс-лист закупівлі за замовчуванням
 DocType: Payroll Entry,Salary Slip Based on Timesheet,"Зарплатний розрахунок, на основі табелю-часу"
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ціна покупки
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Ціна покупки
 DocType: Notification Control,Sales Order Message,Повідомлення замовлення клієнта
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як-от компанія, валюта, поточний фінансовий рік і т.д."
 DocType: Payment Entry,Payment Type,Тип оплати
@@ -3158,6 +3176,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Налаштування кошику
 DocType: Journal Entry,Accounting Entries,Бухгалтерські проводки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Якщо вибрано Правило ціноутворення для «Оцінити», воно буде перезаписати Прайс-лист. Коефіцієнт регулювання цін є кінцевою ставкою, тому подальша знижка не повинна застосовуватися. Отже, у таких транзакціях, як замовлення на купівлю, замовлення на купівлю і т. Д., Воно буде вивантажуватись у полі «Оцінка», а не поле «Ціновий курс»."
+DocType: Journal Entry,Paid Loan,Платний кредит
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Дублювати запис. Будь ласка, перевірте Авторизація Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Довідкова дата
 DocType: Purchase Order,Ref SQ,Посилання SQ
@@ -3174,7 +3193,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Не для всіх позицій згенероване Заплановане тех. обслуговування. Натисніть ""Згенерувати розклад"" будь-ласка"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Платіжна відомість
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
 DocType: Patient Service Unit,Parent Service Unit,Батьківський відділ обслуговування
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,зробити користувача
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
@@ -3192,7 +3211,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Рахунок доходів
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Доставка
 DocType: Volunteer,Weekdays,Будні дні
 DocType: Stock Reconciliation Item,Current Qty,Поточна к-сть
 DocType: Restaurant Menu,Restaurant Menu,Меню ресторану
@@ -3200,7 +3219,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
 DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Встановити рахунок товарно-матеріальних запасів за замовчуванням для безперервної інвентаризації
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Встановити рахунок товарно-матеріальних запасів за замовчуванням для безперервної інвентаризації
 DocType: Item Reorder,Material Request Type,Тип Замовлення матеріалів
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Надіслати електронний лист перегляду гранту
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage повна, не врятувало"
@@ -3208,10 +3227,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Ємність кімнати
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Уже існує запис для елемента {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Посилання
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,"Ви втратите записи про раніше сформовані рахунки-фактури. Ви впевнені, що хочете перезапустити цю підписку?"
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Реєстраційний внесок
 DocType: Budget,Cost Center,Центр витрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Документ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Документ #
 DocType: Notification Control,Purchase Order Message,Повідомлення Замовлення на придбання
 DocType: Tax Rule,Shipping Country,Країна доставки
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Приховати Податковий ідентифікатор клієнта від угоди купівлі-продажу
@@ -3220,20 +3240,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Цінові правила робляться для перезапису Прайс-листів або встановлення відсотку знижки на основі певних критеріїв.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через Рух ТМЦ / Накладну / Прихідну накладну
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Податок на прибуток
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Перейти на бланки
+DocType: Subscription,Cancel At End Of Period,Скасувати наприкінці періоду
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Немає елементів для переміщення
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Немає елементів для переміщення
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Налаштування інвентаря
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 DocType: Vehicle,Electric,електричний
 DocType: Task,% Progress,% Прогрес
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Прибуток / збиток від вибуття основних засобів
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Прибуток / збиток від вибуття основних засобів
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",У таблиці нижче буде виділено лише студент-заявник із статусом &quot;Затверджено&quot;.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"Номер рахунку для облікового запису {0} недоступний. <br> Будь ласка, правильно налаштуйте свою схему рахунків."
 DocType: Task,Depends on Tasks,Залежно від завдань
@@ -3248,6 +3269,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Немає на складі
 DocType: Volunteer,Volunteer Skills,Волонтерські навички
 DocType: Appraisal,HR User,HR Користувач
+DocType: Bank Guarantee,Reference Document Name,Назва довідкового документа
 DocType: Purchase Invoice,Taxes and Charges Deducted,Відраховані податки та збори
 apps/erpnext/erpnext/hooks.py +142,Issues,Питань
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Стан повинен бути одним з {0}
@@ -3261,7 +3283,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} відключений
 DocType: Supplier,Billing Currency,Валюта оплати
 DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Дуже великий
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Дуже великий
+DocType: Loan,Loan Application,Заявка на позику
 DocType: Crop,Scientific Name,Наукове ім&#39;я
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,всього Листя
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Зніміть вибір, якщо вибраний контакт буде відредагований після збереження"
@@ -3270,13 +3293,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Кількість
 ,Sales Browser,Переглядач продажів
 DocType: Journal Entry,Total Credit,Всього Кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Увага: Інший {0} # {1} існує по Руху ТМЦ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Увага: Інший {0} # {1} існує по Руху ТМЦ {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Місцевий
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Боржники
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Великий
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Великий
 DocType: Homepage Featured Product,Homepage Featured Product,Головна Рекомендовані продукт
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Всі групи по оцінці
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Всі групи по оцінці
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новий склад Ім&#39;я
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Підсумок {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територія
@@ -3297,9 +3320,10 @@
 DocType: Fees,Fees,Збори
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Вкажіть обмінний курс для перетворення однієї валюти в іншу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Пропозицію {0} скасовано
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Загальна непогашена сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Загальна непогашена сума
 DocType: Sales Partner,Targets,Цільові
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Будь ласка, зареєструйте номер SIREN у файлі інформації компанії"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 DocType: Price List,Price List Master,Майстер Прайс-листа
 DocType: GST Account,CESS Account,Обліковий запис CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Для всіх операцій продажу можна вказувати декількох ""Відповідальних з продажу"", так що ви можете встановлювати та контролювати цілі."
@@ -3308,6 +3332,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Виберіть пацієнта
 DocType: Price List,Applicable for Countries,Стосується для країн
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Назва параметру
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Тільки залиште додатки зі статусом «Схвалено» і «Відхилено» можуть бути представлені
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Студентська група Ім&#39;я є обов&#39;язковим в рядку {0}
 DocType: Homepage,Products to be shown on website homepage,"Продукти, що будуть показані на головній сторінці веб-сайту"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
@@ -3341,14 +3366,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Рахунок-фактура вже створено для всіх годин біллінгу
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Помилка Ім&#39;я: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Є фінансова вартість
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Відвідуваність працівника {0} вже внесена
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Відвідуваність працівника {0} вже внесена
 DocType: Packing Slip,If more than one package of the same type (for print),Якщо більш ніж один пакет того ж типу (для друку)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,"Будь ласка, встановіть клієнт за замовчуванням у налаштуваннях ресторану"
 ,Salary Register,дохід Реєстрація
 DocType: Warehouse,Parent Warehouse,Батьківський елемент складу
-DocType: C-Form Invoice Detail,Net Total,Чистий підсумок
+DocType: Subscription,Net Total,Чистий підсумок
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Стандартна BOM не знайдена для елемента {0} та Project {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Визначення різних видів кредиту
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Визначення різних видів кредиту
 DocType: Bin,FCFS Rate,FCFS вартість
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Непогашена сума
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Час (в хв)
@@ -3380,11 +3405,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Корінь аккаунт має бути група
 DocType: Drug Prescription,Drug Prescription,Препарат для наркотиків
 DocType: Fees,FEE.,ЗБІР.
-DocType: Employee Loan,Repaid/Closed,Повернений / Closed
+DocType: Loan,Repaid/Closed,Повернений / Closed
 DocType: Item,Total Projected Qty,Загальна запланована Кількість
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Коефіцієнт оцінки не знайдено для елемента {0}, який необхідний для ведення облікових записів за {1} {2}. Якщо позиція веде транзакцію як нульова ставка оцінки вартості в {1}, будь-ласка, зазначте це в таблиці {1} Item. В іншому випадку, будь ласка, створіть вхідну транзакцію за каталогію або зазначте оцінку ставки в запису елемента, а потім спробуйте подати / скасувати цю статтю"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 DocType: Course,Course Code,код курсу
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Для позиції {0} необхідний сертифікат якості
 DocType: POS Settings,Use POS in Offline Mode,Використовувати POS в автономному режимі
@@ -3404,16 +3428,15 @@
 DocType: Purchase Invoice,Deemed Export,Розглянуто Експорт
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Знижка у відсотках можна застосовувати або стосовно прайс-листа або для всіх прайс-лист.
-DocType: Subscription,Half-yearly,Піврічний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Проводки по запасах
 DocType: Lab Test,LabTest Approver,LabTest Approver
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Ви вже оцінили за критеріями оцінки {}.
 DocType: Vehicle Service,Engine Oil,Машинне мастило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Створено робочі замовлення: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Створено робочі замовлення: {0}
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Адреса клієнта
-DocType: Employee Loan,Loan Details,кредит Детальніше
+DocType: Loan,Loan Details,кредит Детальніше
 DocType: Company,Default Inventory Account,За замовчуванням інвентаризації рахунки
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Номери фоліо не співпадають
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершена кількість має бути більше нуля.
@@ -3425,19 +3448,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Посилання на всі земельні підрозділи, в яких рослина зростає"
 DocType: Account,Root Type,Корінь Тип
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Чи не можете повернути понад {1} для п {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Чи не можете повернути понад {1} для п {2}
 DocType: Item Group,Show this slideshow at the top of the page,Показати це слайд-шоу на верху сторінки
 DocType: BOM,Item UOM,Пункт Одиниця виміру
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сума податку після скидки Сума (Компанія валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Склад призначення є обов'язковим для рядку {0}
 DocType: Cheque Print Template,Primary Settings,Основні налаштування
 DocType: Purchase Invoice,Select Supplier Address,Виберіть адресу постачальника
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Додати співробітників
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Додати співробітників
 DocType: Purchase Invoice Item,Quality Inspection,Сертифікат якості
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Дуже невеликий
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Дуже невеликий
 DocType: Company,Standard Template,Стандартний шаблон
 DocType: Training Event,Theory,теорія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Рахунок {0} заблоковано
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 DocType: Payment Request,Mute Email,Відключення E-mail
@@ -3457,11 +3480,10 @@
 DocType: SMS Log,No of Sent SMS,Кількість відправлених SMS
 DocType: Antibiotic,Healthcare Administrator,Адміністратор охорони здоров&#39;я
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Встановіть ціль
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
 DocType: Dosage Strength,Dosage Strength,Дозувальна сила
 DocType: Account,Expense Account,Рахунок витрат
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Програмне забезпечення
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Колір
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Колір
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Критерії оцінки плану
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Дат закінчується обов&#39;язково для вибраного товару
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Запобігати замовленням на купівлю
@@ -3474,18 +3496,18 @@
 DocType: Patient,Personal and Social History,Особиста та суспільна історія
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Користувач {0} створений
 DocType: Fee Schedule,Fee Breakup for each student,Платіжний розрив для кожного студента
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) за замовленням {1} не може бути більше, ніж загальний підсумок ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) за замовленням {1} не може бути більше, ніж загальний підсумок ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілених цілей за місяць.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Змінити код
 DocType: Purchase Invoice Item,Valuation Rate,Собівартість
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Валюту прайс-листа не вибрано
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Валюту прайс-листа не вибрано
 DocType: Purchase Invoice,Availed ITC Cess,Отримав ITC Cess
 ,Student Monthly Attendance Sheet,Student Щомісячна відвідуваність Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило доставки застосовується тільки для продажу
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата початку
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,До
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Перейменувати Вхід
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студентська група або розклад курсу є обов&#39;язковою
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Студентська група або розклад курсу є обов&#39;язковою
@@ -3506,7 +3528,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Перелічіть свої товари чи послуги, які ви купуєте або продаєте."
 DocType: Water Analysis,Storage Temperature,Температура зберігання
 DocType: Employee Attendance Tool,Unmarked Attendance,Невнесена відвідуваність
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Дослідник
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Дослідник
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Програма набору студентів для навчання Інструмент
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},"Дата початку має бути меншою, ніж кінцева дата завдання {0}"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Або адреса електронної пошти є обов&#39;язковим
@@ -3519,7 +3541,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і запити на поставку цього постачальника повинні бути випущені з обережністю."
 DocType: Chapter,Non Profit Manager,Неприбутковий менеджер
 DocType: BOM,Total Cost(Company Currency),Загальна вартість (Компанія Валюта)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Серійний номер {0} створено
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Серійний номер {0} створено
 DocType: Homepage,Company Description for website homepage,Опис компанії для головної сторінки веб-сайту
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для зручності клієнтів, ці коди можуть бути використані в друкованих формах, таких, як рахунки-фактури та розхідні накладні"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ім&#39;я Suplier
@@ -3529,11 +3551,10 @@
 DocType: Employee,You can enter any date manually,Ви можете ввести будь-яку дату вручну
 DocType: Healthcare Settings,Result Printed,Результат друкується
 DocType: Asset Category Account,Depreciation Expense Account,Рахунок витрат амортизації
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Випробувальний термін
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Переглянути {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Випробувальний термін
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки елементи (не групи) дозволені в операціях
 DocType: Project,Total Costing Amount (via Timesheets),Загальна сума витрат (за допомогою розсилок)
-DocType: Employee Advance,Expense Approver,Витрати затверджує
+DocType: Department,Expense Approver,Витрати затверджує
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Ряд {0}: Аванси по клієнту повинні бути у кредиті
 DocType: Project,Hourly,Погодинно
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Перетворити елемент у групу
@@ -3543,7 +3564,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
 DocType: Accounts Settings,Make Payment via Journal Entry,Платити згідно Проводки
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,надруковано на
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,надруковано на
 DocType: Item,Inspection Required before Delivery,Огляд Обов&#39;язковий перед поставкою
 DocType: Item,Inspection Required before Purchase,Огляд Необхідні перед покупкою
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В очікуванні Діяльність
@@ -3553,7 +3574,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Мінімальна Кількість Замовлення
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Ваша організація
 DocType: Fee Component,Fees Category,тарифи Категорія
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Будь ласка, введіть дату зняття."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Сум
 DocType: Supplier Scorecard,Notify Employee,Повідомити співробітника
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім'я кампанії, якщо джерелом зацікавленості є кампанія"
@@ -3563,7 +3584,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Рівень перезамовлення
 DocType: Company,Chart Of Accounts Template,План рахунків бухгалтерського обліку шаблону
 DocType: Attendance,Attendance Date,Дата
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Ціна товару оновлена для {0} у прайс-листі {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Ціна товару оновлена для {0} у прайс-листі {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Розшифровка зарплати по нарахуваннях та відрахуваннях.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
 DocType: Purchase Invoice Item,Accepted Warehouse,Прийнято на склад
@@ -3571,10 +3592,11 @@
 DocType: Item,Valuation Method,Метод Оцінка
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Відзначити Півдня
 DocType: Sales Invoice,Sales Team,Відділ продажів
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Дублікат запис
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дублікат запис
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Перед подачею введіть ім&#39;я Бенефіціара.
 DocType: Program Enrollment Tool,Get Students,отримати Студенти
 DocType: Serial No,Under Warranty,Під гарантії
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Помилка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Помилка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Прописом буде видно, як тільки ви збережете замовлення клієнта."
 ,Employee Birthday,Співробітник народження
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,"Будь ласка, виберіть Дата завершення для завершеного ремонту"
@@ -3593,7 +3615,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Зарезервований для підрядних контрактів
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер рахунку-фактури
 DocType: Shopping Cart Settings,Orders,Замовлення
-DocType: Employee Leave Approver,Leave Approver,Погоджувач відпустки
+DocType: Department,Leave Approver,Погоджувач відпустки
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Будь ласка, виберіть партію"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Назва групи по оцінці
@@ -3638,7 +3660,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Відстежуваний елемент концентратора
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГІНАЛ ДЛЯ ОТРИМУВАЧА
 DocType: Asset Category Account,Accumulated Depreciation Account,Рахунок накопиченого зносу
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Цей електронний лист створено автоматично
 DocType: Stock Settings,Freeze Stock Entries,Заморозити Рухи ТМЦ
 DocType: Program Enrollment,Boarding Student,інтернат студент
 DocType: Asset,Expected Value After Useful Life,Очікувана вартість після терміну використання
@@ -3663,22 +3684,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Рекордне {0} існує проти Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Амортизація видалена у зв'язку з ліквідацією активів
-DocType: Member,Member,Член
+DocType: Loan,Member,Член
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Керування адресами
 DocType: Work Order Item,Work Order Item,Пункт завдання роботи
 DocType: Pricing Rule,Item Code,Код товару
 DocType: Serial No,Warranty / AMC Details,Гарантія / Деталі контракту на річне обслуговування
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 DocType: Journal Entry,User Remark,Зауваження користувача
 DocType: Lead,Market Segment,Сегмент ринку
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Менеджер з сільського господарства
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
 DocType: Supplier Scorecard Period,Variables,Змінні
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),На кінець (Дт)
 DocType: Cheque Print Template,Cheque Size,Розмір чеку
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Серійний номер {0} не в наявності
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Серійний номер {0} не в наявності
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Податковий шаблон для операцій продажу.
 DocType: Sales Invoice,Write Off Outstanding Amount,Списання суми заборгованості
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Рахунок {0} не збігається з Компанією {1}
@@ -3687,7 +3708,6 @@
 DocType: Stock Settings,Default Stock UOM,Одиниця виміру за замовчуванням
 DocType: Asset,Number of Depreciations Booked,Кількість проведених амортизацій
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Кількість загальної кількості
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Проти Співробітника кредиту: {0}
 DocType: Landed Cost Item,Receipt Document,Вхідний документ
 DocType: Employee Education,School/University,Школа / університет
 DocType: Payment Request,Reference Details,Посилання Детальніше
@@ -3698,7 +3718,7 @@
 DocType: Asset,Double Declining Balance,Double Declining Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Закритий замовлення не може бути скасований. Скасувати відкриватися.
 DocType: Student Guardian,Father,батько
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,"""Оновити запаси"" не може бути позначено для продажу основних засобів"
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,"""Оновити запаси"" не може бути позначено для продажу основних засобів"
 DocType: Bank Reconciliation,Bank Reconciliation,Звірка з банком
 DocType: Attendance,On Leave,У відпустці
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Підписатись на новини
@@ -3712,10 +3732,10 @@
 DocType: Lead,Lower Income,Нижня дохід
 DocType: Restaurant Order Entry,Current Order,Поточний порядок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Вихідний та цільовий склад не можуть бути однаковими у рядку {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Перейдіть до програм
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Рядок {0} # Розподілена сума {1} не може перевищувати суму, яку не було заявлено {2}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Рядок {0} # Розподілена сума {1} не може перевищувати суму, яку не було заявлено {2}"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
@@ -3738,7 +3758,6 @@
 DocType: Payment Terms Template,Payment Terms,Терміни оплати
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Хвилин
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 DocType: Purchase Invoice,Purchase Taxes and Charges,Податки та збори закупівлі
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Перейдіть до Постачальників
@@ -3758,30 +3777,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Пропозиція {0} НЕ типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Номенклатура Запланованого обслуговування
 DocType: Sales Order,%  Delivered,Доставлено%
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Вкажіть ідентифікатор електронної пошти для Студентки, щоб відправити запит на оплату"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Вкажіть ідентифікатор електронної пошти для Студентки, щоб відправити запит на оплату"
 DocType: Patient,Medical History,Медична історія
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Овердрафт рахунок
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Овердрафт рахунок
 DocType: Patient,Patient ID,Ідентифікатор пацієнта
 DocType: Physician Schedule,Schedule Name,Назва розкладу
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Зробити Зарплатний розрахунок
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Додати всіх постачальників
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Додати всіх постачальників
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Рядок # {0}: Виділена сума не може бути більше суми заборгованості.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Переглянути норми
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Забезпечені кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Забезпечені кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Редагування проводок Дата і час
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Будь ласка, встановіть рахунки, що відносяться до амортизації у категорії активу {0} або компанії {1}"
 DocType: Lab Test Groups,Normal Range,Нормальний діапазон
 DocType: Academic Term,Academic Year,Навчальний рік
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Доступні продажі
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Відкриття Баланс акцій
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Відкриття Баланс акцій
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,решті
 DocType: Appraisal,Appraisal,Оцінка
+DocType: Loan,Loan Account,Рахунок позики
 DocType: Purchase Invoice,GST Details,Деталі GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Електронна пошта відправляється постачальнику {0}
 DocType: Item,Default Sales Unit of Measure,Одиниця виміру за замовчуванням
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Навчальний рік:
+DocType: Subscription,Past Due Date,Минула дата сплати
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Не дозволяється встановлювати альтернативний елемент для елемента {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторюється
@@ -3794,7 +3815,7 @@
 DocType: Patient Appointment,Patient Appointment,Призначення пацієнта
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Затвердження роль не може бути такою ж, як роль правило застосовно до"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Відмовитися від цієї Email Дайджест
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Отримати постачальників за
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Отримати постачальників за
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} не знайдено для Продукту {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Перейти до курсів
 DocType: Accounts Settings,Show Inclusive Tax In Print,Покажіть інклюзивний податок у друку
@@ -3802,10 +3823,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Повідомлення відправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,"Рахунок з дочірніх вузлів, не може бути встановлений як книгу"
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті&gt; Параметри освіти"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Курс, за яким валюта прайс-листа конвертується у базову валюту покупця"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
 DocType: Physician,Physician Schedules,Розклад лікарів
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Сума авансового платежу не може перевищувати загальної санкціонованої суми
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Сума авансового платежу не може перевищувати загальної санкціонованої суми
 DocType: Salary Slip,Hour Rate,Тарифна ставка
 DocType: Stock Settings,Item Naming By,Найменування номенклатурних позицій за
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Ще одна операція закриття періоду {0} була зроблена після {1}
@@ -3823,6 +3845,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
 DocType: BOM,Inspection Required,Вимагається інспекція
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Введіть номер банківського гарантії перед поданням.
 DocType: Driving License Category,Class,Клас
 DocType: Sales Order,Fully Billed,Повністю включено у рахунки
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Замовлення на роботі не можна висувати проти шаблону елемента
@@ -3833,7 +3856,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Assessment Plan,Program,Програма
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заблоковані рахунки і створювати / змінювати проводки по заблокованих рахунках
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті&gt; Параметри освіти"
 DocType: Serial No,Is Cancelled,Скасовується
 DocType: Student Group,Group Based On,Група Based On
 DocType: Student Group,Group Based On,Група Based On
@@ -3845,9 +3867,10 @@
 DocType: Cheque Print Template,Cheque Height,Висота чеку
 DocType: Supplier,Supplier Details,Постачальник: Подробиці
 DocType: Setup Progress,Setup Progress,Налаштування прогресу
+DocType: Expense Claim,Approval Status,Стан затвердження
 DocType: Hub Settings,Publish Items to Hub,Опублікувати товари в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"З значення має бути менше, ніж значення в рядку в {0}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Банківський переказ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Перевірити все
 ,Issued Items Against Work Order,Видано предмети проти порядку роботи
 DocType: Vehicle Log,Invoice Ref,Рахунок-фактура Посилання
@@ -3878,12 +3901,11 @@
 DocType: Customs Tariff Number,Tariff Number,тарифний номер
 DocType: Work Order Item,Available Qty at WIP Warehouse,Доступний Кількість на складі WIP
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Прогнозований
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить до складу {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить до складу {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
 DocType: Notification Control,Quotation Message,Повідомлення пропозиції
-DocType: Employee Loan,Employee Loan Application,Служить заявка на отримання кредиту
 DocType: Issue,Opening Date,Дата розкриття
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,"Будь ласка, спочатку збережіть пацієнта"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,"Будь ласка, спочатку збережіть пацієнта"
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Глядачі були успішно відзначені.
 DocType: Program Enrollment,Public Transport,Громадський транспорт
 DocType: Soil Texture,Silt Composition (%),Композиція іл (%)
@@ -3902,7 +3924,7 @@
 ,Item Balance (Simple),Баланс позиції (простий)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
 DocType: POS Profile,Write Off Account,Рахунок списання
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Дебетові Примітка Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Дебетові Примітка Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернення згідно вхідного рахунку
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
@@ -3925,6 +3947,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Дата Замовлення клієнта
 DocType: Sales Invoice Item,Delivered Qty,Доставлена к-сть
 DocType: Assessment Plan,Assessment Plan,план оцінки
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Вступ до зворотного журналу
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клієнт {0} створено.
 DocType: Stock Settings,Limit Percent,граничне Відсоток
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,На даний момент немає запасів на будь-якому складі
@@ -3938,14 +3961,15 @@
 DocType: Journal Entry,Stock Entry,Рух ТМЦ
 DocType: Payment Entry,Payment References,посилання оплати
 DocType: C-Form,C-FORM-,C-form-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Кількість інтервалів для інтервального поля, наприклад, якщо інтервал - &quot;Днів&quot; і граф інтервалів платежів - 3, рахунки-фактури будуть генеруватися кожні 3 дні"
 DocType: Vehicle,Insurance Details,Страхування Детальніше
 DocType: Account,Payable,До оплати
 DocType: Share Balance,Share Type,Поділитися типом
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Будь ласка, введіть терміни погашення"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,"Будь ласка, введіть терміни погашення"
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Боржники ({0})
 DocType: Pricing Rule,Margin,маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нові клієнти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Загальний прибуток %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Загальний прибуток %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Змінити профіль POS
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance дата
@@ -3955,10 +3979,11 @@
 DocType: Lead,Address Desc,Опис адреси
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Контрагент є обов'язковим
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Були знайдені рядки з дубльованими термінами в інших рядках: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Були знайдені рядки з дубльованими термінами в інших рядках: {list}
 DocType: Topic,Topic Name,Назва теми
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,"Будь ласка, встановіть шаблон за замовчуванням для сповіщення про затвердження залишення в налаштуваннях персоналу."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Принаймні один з продажу або покупки повинен бути обраний
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,"Виберіть співробітника, щоб заздалегідь отримати працівника."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,"Виберіть співробітника, щоб заздалегідь отримати працівника."
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,"Будь ласка, виберіть дійсну дату"
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Виберіть характер вашого бізнесу.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3977,7 +4002,7 @@
 DocType: Asset Movement,Source Warehouse,Вихідний склад
 DocType: Installation Note,Installation Date,Дата встановлення
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Поділитись Леджером
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {1} не належить компанії {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {1} не належить компанії {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Рахунок продажу {0} створено
 DocType: Employee,Confirmation Date,Дата підтвердження
 DocType: C-Form,Total Invoiced Amount,Всього Сума за рахунками
@@ -3986,7 +4011,7 @@
 DocType: Account,Accumulated Depreciation,Накопичений знос
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Постійне ім&#39;я
 DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
-DocType: Employee Loan Application,Required by Date,потрібно Дата
+DocType: Loan Application,Required by Date,потрібно Дата
 DocType: Lead,Lead Owner,Власник Lead-а
 DocType: Production Plan,Sales Orders Detail,Деталі замовлень на продаж
 DocType: Bin,Requested Quantity,Необхідна кількість
@@ -3999,10 +4024,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Разом Відрахування - Погашення кредиту
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Нові норми не можуть бути такими ж як поточні
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID Зарплатного розрахунку
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Кілька варіантів
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставлено
+DocType: Subscription,Trial Period Start Date,Дата початку випробувального періоду
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,"Будь ласка, увійдіть як інший користувач."
@@ -4023,12 +4049,11 @@
 DocType: Student Guardian,Student Guardian,Студент-хранитель
 DocType: Member,Member Name,Ім&#39;я учасника
 DocType: Stock Settings,Use Naming Series,Використовуйте серію імен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
 DocType: POS Profile,Update Stock,Оновити запас
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в передплаті
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 DocType: Membership,Payment Details,Платіжні реквізити
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Вартість згідно норми
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Вартість згідно норми
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Завершений робочий ордер не може бути скасований, перш ніж скасувати, зупинити його"
 DocType: Asset,Journal Entry for Scrap,Проводка для брухту
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
@@ -4048,6 +4073,7 @@
 DocType: Land Unit,Land Unit,Земельна одиниця
 ,Purchase Analytics,Аналітика закупівель
 DocType: Sales Invoice Item,Delivery Note Item,Позиція накладної
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Поточний рахунок {0} відсутній
 DocType: Asset Maintenance Log,Task,Завдання
 DocType: Purchase Taxes and Charges,Reference Row #,Посилання ряд #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Номер партії є обов'язковим для позиції {0}
@@ -4060,7 +4086,7 @@
 DocType: Company,Exchange Gain / Loss Account,Прибутки/збитки від курсової різниці
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Працівник та відвідування
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Мета повинна бути одним з {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Заповніть форму і зберегти його
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Заповніть форму і зберегти його
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Фактичне кількість на складі
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Фактичне кількість на складі
@@ -4075,7 +4101,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Стандартна вартість продажу
 DocType: Account,Rate at which this tax is applied,Вартість при якій застосовується цей податок
 DocType: Cash Flow Mapper,Section Name,Назва розділу
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Кількість перезамовлення
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Кількість перезамовлення
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Поточні вакансії Вакансії
 DocType: Company,Stock Adjustment Account,Рахунок підлаштування інвентаря
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списувати
@@ -4086,9 +4112,9 @@
 DocType: Task,depends_on,залежить від
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Очікується оновлення останньої ціни у всіх Білльових Матеріалах. Це може зайняти кілька хвилин.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Країнозалежний шаблон адреси за замовчуванням
 DocType: Water Analysis,Appearance,Зовнішній вигляд
+DocType: HR Settings,Leave Status Notification Template,Залиште шаблон сповіщення про статус
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Сер. Купівля тарифу на ціни
 DocType: Sales Order Item,Supplier delivers to Customer,Постачальник доставляє клієнтові
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Інформація про членство.
@@ -4111,7 +4137,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Не дозволено. Вимкніть тестовий шаблон
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Розподіл відсотків має дорівнювати 100%
 DocType: Crop Cycle,Linked Land Unit,Пов&#39;язана земельна одиниця
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
@@ -4128,7 +4154,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,"Оплачена сума + Сума списання не може бути більше, ніж загальний підсумок"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},"{0} не є допустимим номером партії 
 для товару {1}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Примітка: Недостатньо днів залишилося для типу відпусток {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Примітка: Недостатньо днів залишилося для типу відпусток {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Invalid GSTIN або Enter NA для Незареєстрований
 DocType: Training Event,Seminar,семінар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Програма Зарахування Плата
@@ -4144,14 +4170,14 @@
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 DocType: Company,Create Chart Of Accounts Based On,"Створення плану рахунків бухгалтерського обліку, засновані на"
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Неможливо перетворити його в негрупу. Дитячі завдання існують.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Застарівання інвентаря
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Student {0} існує проти студента заявника {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Регулювання округлення (Валюта компанії)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Табель робочого часу
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Пакет:
 DocType: Volunteer,Afternoon,Вдень
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' неактивний
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' неактивний
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Cheque Print Template,Scanned Cheque,Сканований чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
@@ -4167,7 +4193,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Проект {0} вже існує
 DocType: Medical Department,Nursing User,Медичний користувач
 DocType: Plant Analysis,Plant Analysis Criterias,Критерії аналізу стану
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Обов&#39;язки
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Серійний номер {0} не належить до партії {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Обов&#39;язки
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Термін дії цієї цитати закінчився.
 DocType: Expense Claim Account,Expense Claim Account,Рахунок Авансового звіту
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволити стабільний курс обміну
@@ -4189,11 +4216,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Зробити варіанти
 DocType: Item,Default BOM,Норми за замовчуванням
 DocType: Project,Total Billed Amount (via Sales Invoices),Загальна сума виставлених рахунків (через рахунки-фактури)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Дебет Примітка Сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Дебет Примітка Сума
 DocType: Project Update,Not Updated,Не оновлюється
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Існують невідповідності між ставкою, без акцій та обчисленою сумою"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Будь ласка, повторіть введення назви компанії, щоб підтвердити"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Загальна неоплачена сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Загальна неоплачена сума
 DocType: Journal Entry,Printing Settings,Налаштування друку
 DocType: Employee Advance,Advance Account,Авансовий рахунок
 DocType: Job Offer,Job Offer Terms,Умови надання пропозицій роботи
@@ -4202,7 +4229,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Автомобільний
 DocType: Vehicle,Insurance Company,Страхова компанія
 DocType: Asset Category Account,Fixed Asset Account,Рахунок основних засобів
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,змінна
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,змінна
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,З накладної
 DocType: Chapter,Members,Члени
 DocType: Student,Student Email Address,Студент E-mail адреса
@@ -4226,7 +4253,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Інтерн
 DocType: Delivery Stop,Address Name,Адреса Ім&#39;я
 DocType: Stock Entry,From BOM,З норм
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Розщеплення {0} одиниць {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Розщеплення {0} одиниць {1}
 DocType: Assessment Code,Assessment Code,код оцінки
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Складські операції до {0} заблоковано
@@ -4234,25 +4261,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платіжний документ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Помилка при оцінці формули критеріїв
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,"Дата влаштування повинні бути більше, ніж дата народження"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,"Дата влаштування повинні бути більше, ніж дата народження"
+DocType: Subscription,Plans,Плани
 DocType: Salary Slip,Salary Structure,Структура зарплати
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Матеріал Випуск
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Під час створення повторюваних сталася помилка
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Дата пропозиції
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Пропозиції
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Жоден студент групи не створено.
 DocType: Purchase Invoice Item,Serial No,Серійний номер
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Щомісячне погашення Сума не може бути більше, ніж сума позики"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,"Щомісячне погашення Сума не може бути більше, ніж сума позики"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Будь ласка, введіть деталі тех. обслуговування"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Рядок # {0}: очікувана дата доставки не може передувати даті замовлення на купівлю
 DocType: Purchase Invoice,Print Language,Мова друку
 DocType: Salary Slip,Total Working Hours,Всього годин роботи
 DocType: Sales Invoice,Customer PO Details,Інформація про замовлення PO
-DocType: Subscription,Next Schedule Date,Дата наступного розкладу
 DocType: Stock Entry,Including items for sub assemblies,Включаючи позиції для наівфабрикатів
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Тимчасовий відкритий рахунок
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Значення має бути позитивним
@@ -4281,11 +4307,11 @@
 DocType: Issue,Opening Time,Час відкриття
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,"Від і До дати, необхідних"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Немає працівників за вказаними критеріями
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
 DocType: Hotel Settings,Default Customer,За замовчуванням клієнт
 DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Не підтверджуйте, якщо зустріч призначена для того самого дня"
@@ -4310,16 +4336,16 @@
 DocType: Journal Entry Account,Employee Advance,Працівник Аванс
 DocType: Payroll Entry,Payroll Frequency,Розрахунок заробітної плати Частота
 DocType: Lab Test Template,Sensitivity,Чутливість
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Сировина
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Сировина
 DocType: Leave Application,Follow via Email,З наступною відправкою e-mail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Рослини і Механізмів
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Рослини і Механізмів
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Щоденні Налаштування роботи Резюме
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,"Будь ласка, введіть Reqd за датою"
 DocType: Payment Entry,Internal Transfer,внутрішній переказ
 DocType: Asset Maintenance,Maintenance Tasks,Забезпечення завдань
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Кінцева к-сть або сума є обов'язковими
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
 DocType: Leave Control Panel,Carry Forward,Переносити
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Центр витрат з існуючими операціями, не може бути перетворений у книгу"
@@ -4327,14 +4353,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext Integrations
 DocType: Crop Cycle,Detected Disease,Виявлена хвороба
 ,Produced,Вироблений
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Початкова дата погашення не може передувати даті виплати.
 DocType: Item,Item Code for Suppliers,Код товару для постачальників
 DocType: Issue,Raised By (Email),Raised By (E-mail)
 DocType: Training Event,Trainer Name,ім&#39;я тренера
 DocType: Mode of Payment,General,Генеральна
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Останній зв&#39;язок
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Останній зв&#39;язок
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Серійні номери обов'язкові для серіалізованої позиції номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Серійні номери обов'язкові для серіалізованої позиції номенклатури {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Зв'язати платежі з рахунками-фактурами
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Посада)
@@ -4348,7 +4375,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Включити / відключити валюти.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Д-р {0} на пів дня Залишити на {1}
 DocType: Production Plan,Get Material Request,Отримати Замовлення матеріалів
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Поштові витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Поштові витрати
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Разом (Сум)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 ,Item Variant Details,Пункт Варіант Детальніше
@@ -4359,9 +4386,9 @@
 DocType: Drug Prescription,Hour,Година
 DocType: Restaurant Order Entry,Last Sales Invoice,Останній продаж рахунків-фактур
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},"Будь-ласка, виберіть Qty проти пункту {0}"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може мати склад. Склад повинен бути встановлений Рухом ТМЦ або Прихідною накладною
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може мати склад. Склад повинен бути встановлений Рухом ТМЦ або Прихідною накладною
 DocType: Lead,Lead Type,Тип Lead-а
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Ви не уповноважений погоджувати відпустки на заблоковані дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Ви не уповноважений погоджувати відпустки на заблоковані дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,На всі ці позиції вже виставлений рахунок
 DocType: Company,Monthly Sales Target,Місячний ціль продажу
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може бути схвалене {0}
@@ -4369,7 +4396,7 @@
 DocType: Item,Default Material Request Type,Тип Замовлення матеріалів за замовчуванням
 DocType: Supplier Scorecard,Evaluation Period,Період оцінки
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,невідомий
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Порядок роботи не створено
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Порядок роботи не створено
 DocType: Shipping Rule,Shipping Rule Conditions,Умови правил доставки
 DocType: Purchase Invoice,Export Type,Тип експорту
 DocType: Salary Slip Loan,Salary Slip Loan,Зарплата Скип Кредит
@@ -4385,8 +4412,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Відкриття рахунків-фактур Резюме
 DocType: Education Settings,Education Manager,Менеджер з питань освіти
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Мінімальна довжина між кожною рослиною в полі для оптимального зростання
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Рулонірованний Пункт {0} не може бути оновлений за допомогою Stock Примирення, а не використовувати стік запис"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Рулонірованний Пункт {0} не може бути оновлений за допомогою Stock Примирення, а не використовувати стік запис"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Рулонірованний Пункт {0} не може бути оновлений за допомогою Stock Примирення, а не використовувати стік запис"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Рулонірованний Пункт {0} не може бути оновлений за допомогою Stock Примирення, а не використовувати стік запис"
 DocType: Quality Inspection,Report Date,Дата звіту
 DocType: Student,Middle Name,батькові
 DocType: C-Form,Invoices,Рахунки-фактури
@@ -4419,20 +4446,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,розписка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,розписка
 ,Sales Register,Реєстр продаж
 DocType: Daily Work Summary Group,Send Emails At,Електронна пошта на
 DocType: Quotation,Quotation Lost Reason,Причина втрати пропозиції
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},Посилання на операцію № {0} від {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема що редагувати
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Вид форми
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,"Затверджувач витрат, обов&#39;язковий для заявки на витрати"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Додайте користувачів до своєї організації, крім вас."
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Немає клієнтів ще!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Звіт про рух грошових коштів
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Не було створено жодного матеріального запиту
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ліцензія
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
@@ -4455,11 +4483,12 @@
 DocType: Vehicle,Chassis No,шасі Немає
 DocType: Payment Request,Initiated,З ініціативи
 DocType: Production Plan Item,Planned Start Date,Планована дата початку
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,"Будь ласка, виберіть BOM"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,"Будь ласка, виберіть BOM"
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Отримав інтегрований податок ІТЦ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
+DocType: Bank Guarantee,Clauses and Conditions,Статті та умови
 DocType: Serial No,Creation Document Type,Створення типу документа
 DocType: Project Task,View Timesheet,Переглянути таблиці розкладів
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,"Дата завершення повинна бути більшою, ніж дата початку"
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Leave Allocation,New Leaves Allocated,Призначити днів відпустки
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Проектні дані не доступні для пропозиції
@@ -4473,9 +4502,10 @@
 DocType: Patient,Alcohol Current Use,Використання алкогольних напоїв
 DocType: Student Admission Program,Student Admission Program,Програма прийому студентів
 DocType: Payment Entry,Account Paid To,Рахунок оплати
+DocType: Subscription Settings,Grace Period,Пільговий період
 DocType: Item Alternative,Alternative Item Name,Альтернативний Назва Назва
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Батьківській елемент {0} не повинен бути складським
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>","Не вдалося подати будь-яку зарплатню <br> \ Можливі причини: <br> \ 1. Чистий платіж менше 0. <br> \ 2. Адреса електронної пошти компанії, вказана в головному службовці підприємства, недійсна. <br>"
@@ -4485,7 +4515,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет рахунку {1} проти {2} {3} одно {4}. Він буде перевищувати {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Рядок {0} # Рахунок повинен бути типу &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Розхід у к-сті
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,і незафіксований. вимкнено в
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Серії є обов'язковими
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Фінансові послуги
 DocType: Student Sibling,Student ID,Student ID
@@ -4497,14 +4526,16 @@
 DocType: Complaint,Complaint,Скарга
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Внести рахунок на погашення
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Всі кафедри
 DocType: Patient,Alcohol Past Use,Спиртне минуле використання
 DocType: Fertilizer Content,Fertilizer Content,Вміст добрив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Проблемний / Застряг
 DocType: Tax Rule,Billing State,Штат (оплата)
 DocType: Share Transfer,Transfer,Переклад
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,"Замовлення на роботі {0} потрібно скасувати, перш ніж скасовувати цей замовлення на продаж"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
@@ -4528,10 +4559,11 @@
 DocType: Cheque Print Template,Message to show,Повідомлення
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Роздрібна торгівля
 DocType: Student Attendance,Absent,Відсутній
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Комплект
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Комплект
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Не вдається знайти оцінку, починаючи з {0}. Вам потрібно мати бали, що складають від 0 до 100"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Шаблон податків та зборів на закупку
+DocType: Subscription,Current Invoice Start Date,Початкова дата рахунка-фактури
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: або дебетова або кредитна сума потрібна для {2}
 DocType: GL Entry,Remarks,Зауваження
@@ -4541,11 +4573,13 @@
 DocType: Task,Parent Task,Батьківська задача
 DocType: Journal Entry,Write Off Based On,Списання заснований на
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,зробити Lead
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Друк та канцелярські
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Друк та канцелярські
 DocType: Stock Settings,Show Barcode Field,Показати поле штрих-коду
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Надіслати Постачальник електронних листів
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата вже оброблена за період між {0} і {1}, Період відпустки не може бути в межах цього діапазону дат."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Надіслати Постачальник електронних листів
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата вже оброблена за період між {0} і {1}, Період відпустки не може бути в межах цього діапазону дат."
+DocType: Fiscal Year,Auto Created,Авто створений
 DocType: Chapter Member,Leave Reason,Залиште Розум
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Рахунок-фактура {0} більше не існує
 DocType: Guardian Interest,Guardian Interest,опікун Відсотки
 DocType: Volunteer,Availability,Наявність
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Встановити значення за замовчуванням для рахунків-фактур POS
@@ -4554,14 +4588,13 @@
 DocType: Timesheet,Employee Detail,Дані працівника
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ІД епошти охоронця
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ІД епошти охоронця
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,день Дата наступного і повторити на День місяця має дорівнювати
 DocType: Lab Prescription,Test Code,Тестовий код
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Налаштування домашньої сторінки веб-сайту
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Запити на RFQ не дозволені для {0} через показник показника показника {1}
 DocType: Job Offer,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Вище
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Загальна сума {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Загальна сума {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Згадка якщо нестандартні до оплати рахунків
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Будь ласка, виберіть групу оцінки, крім «всіх груп за оцінкою»"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Рядок {0}: для пункту {1} потрібен центр витрат.
@@ -4572,7 +4605,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Аналіз води
 DocType: Chapter,Region,Область
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Необов'язково. Цей параметр буде використовуватися для фільтрації в різних операціях.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
 DocType: Holiday List,Weekly Off,Щотижневий вихідний
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Перезавантажити пов&#39;язаний аналіз
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Наприклад 2012, 2012-13"
@@ -4588,7 +4621,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Вартість списаних активів
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Центр витрат є обов'язковим для елементу {2}
 DocType: Vehicle,Policy No,політика Ні
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Отримати елементи з комплекту
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Отримати елементи з комплекту
 DocType: Asset,Straight Line,Лінійний
 DocType: Project User,Project User,проект Користувач
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,розщеплений
@@ -4627,21 +4660,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Шлях
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити центр витрат у книгу, оскільки він має дочірні вузли"
 DocType: Production Plan,Total Planned Qty,Загальна кількість запланованих
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Сума на початок роботи
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Сума на початок роботи
 DocType: Salary Detail,Formula,формула
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Серійний #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Серійний #
 DocType: Lab Test Template,Lab Test Template,Шаблон Lab Test
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Рахунок продажів
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Рахунок продажів
 DocType: Purchase Invoice Item,Total Weight,Загальна вага
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комісія з продажу
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Комісія з продажу
 DocType: Job Offer Term,Value / Description,Значення / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
 DocType: Tax Rule,Billing Country,Країна (оплата)
 DocType: Purchase Order Item,Expected Delivery Date,Очікувана дата поставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Замовлення ресторану
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
 DocType: Asset Maintenance Task,Assign To Name,Призначити ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Представницькі витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Представницькі витрати
 DocType: Hub Settings,Enabled Users,Увімкнув користувачів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Зробити запит Матеріал
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Відкрити Пункт {0}
@@ -4654,24 +4687,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Заявки на відпустку.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
 DocType: Vehicle,Last Carbon Check,Останній Carbon Перевірити
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судові витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Судові витрати
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Будь ласка, виберіть кількість по ряду"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Зробити відкриття рахунків-фактур для продажу та придбання
 DocType: Purchase Invoice,Posting Time,Час запису
 DocType: Timesheet,% Amount Billed,Виставлено рахунків на %
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Телефон Витрати
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Перевірте це, якщо ви хочете, щоб змусити користувача вибрати ряд перед збереженням. Там не буде за замовчуванням, якщо ви перевірити це."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Немає товару з серійним № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Немає товару з серійним № {0}
 DocType: Email Digest,Open Notifications,Відкриті Повідомлення
 DocType: Payment Entry,Difference Amount (Company Currency),Різниця на суму (у валюті компанії)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Прямі витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Прямі витрати
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Виручка від нових клієнтів
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Витрати на відрядження
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Додати спеціальну підписку на поле в doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
 DocType: Purchase Receipt Item,Sample Quantity,Обсяг вибірки
+DocType: Bank Guarantee,Name of Beneficiary,Назва Бенефіціара
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Оновити вартість BOM автоматично за допомогою Планувальника, виходячи з останньої норми курсу / цінового списку / останньої ціни закупівлі сировини."
 DocType: Bank Reconciliation Detail,Cheque Date,Дата чеку
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьківський рахунок {1} не належить компанії: {2}
@@ -4683,14 +4716,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Випробувальний термін
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатні Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новий навчальний рік
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Повернення / Кредит Примітка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Повернення / Кредит Примітка
 DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціна для автовставки
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Всього сплачена сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Всього сплачена сума
 DocType: GST Settings,B2C Limit,Ліміт B2C
 DocType: Work Order Item,Transferred Qty,Переведений Кількість
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навігаційний
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Планування
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Планування
 DocType: Share Balance,Issued,Виданий
+DocType: Loan,Repayment Start Date,Дата початку погашення
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Студентська діяльність
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Id постачальника
 DocType: Payment Request,Payment Gateway Details,Деталі платіжного шлюзу
@@ -4703,10 +4737,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип відсутності, як-от випадкова, хвороба і т.д."
 DocType: Email Digest,Send regular summary reports via Email.,Відправити регулярні зведені звіти по електронній пошті.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
 DocType: Assessment Result,Student Name,Ім&#39;я студента
 DocType: Brand,Item Manager,Стан менеджер
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,Розрахунок заробітної плати оплачується
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,Розрахунок заробітної плати оплачується
 DocType: Buying Settings,Default Supplier Type,Тип постачальника за замовчуванням
 DocType: Plant Analysis,Collection Datetime,Колекція Datetime
 DocType: Work Order,Total Operating Cost,Загальна експлуатаційна вартість
@@ -4716,9 +4750,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Користувач {0} не існує
 DocType: Payment Term,Day(s) after invoice date,День (-и) після дати виставлення рахунку-фактури
 DocType: Payment Schedule,Payment Schedule,Графік платежів
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Скорочення
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Оплата вже існує
+DocType: Subscription,Trial Period End Date,Дата закінчення випробувального періоду
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не так Authroized {0} перевищує межі
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Майстер зарплатних шаблонів
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Патологія
@@ -4735,9 +4769,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Квоти для Lead-ів або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль з дозволом редагувати заблоковані складські рухи
 ,Territory Target Variance Item Group-Wise,Розбіжності цілей по територіях (по групах товарів)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Всі групи покупців
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Всі групи покупців
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Накопичений в місяць
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Податковий шаблон є обов'язковим
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батьківський рахунок не існує {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціна з прайс-листа (валюта компанії)
@@ -4746,14 +4780,15 @@
 DocType: Lab Prescription,Test Created,Тест створений
 DocType: Healthcare Settings,Custom Signature in Print,Користувацька підпис у друкованому вигляді
 DocType: Account,Temporary,Тимчасовий
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Замовник LPO №
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Замовник LPO №
 DocType: Program,Courses,курси
 DocType: Monthly Distribution Percentage,Percentage Allocation,Відсотковий розподіл
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Якщо відключити, поле ""прописом"" не буде видно у жодній операції"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,"Ця дія призведе до призупинення майбутніх платежів. Ви впевнені, що хочете скасувати цю підписку?"
 DocType: Serial No,Distinct unit of an Item,Окремий підрозділ в пункті
 DocType: Supplier Scorecard Criteria,Criteria Name,Назва критерію
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,"Будь ласка, встановіть компанії"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,"Будь ласка, встановіть компанії"
 DocType: Pricing Rule,Buying,Купівля
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Хвороби та добрива
 DocType: HR Settings,Employee Records to be created by,"Співробітник звіти, які будуть створені"
@@ -4762,18 +4797,18 @@
 DocType: POS Profile,Apply Discount On,Застосувати знижки на
 DocType: Member,Membership Type,Тип членства
 ,Reqd By Date,Reqd за датою
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Кредитори
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Кредитори
 DocType: Assessment Plan,Assessment Name,оцінка Ім&#39;я
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Показати PDC у друк
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Показати PDC у друк
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Ряд # {0}: Серійний номер є обов&#39;язковим
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрий Податковий Подробиці
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Пропозиція про роботу
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Абревіатура інституту
 ,Item-wise Price List Rate,Ціни прайс-листів по-товарно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Пропозиція постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Пропозиція постачальника
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Прописом"" буде видно, як тільки ви збережете пропозицію."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,попит-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
@@ -4791,7 +4826,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Всього розбіжність
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Якщо опція включена, то система буде автоматично створювати бухгалтерські проводки для номенклатури."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Брокерська діяльність
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Участь для працівника {0} вже позначено на цей день
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Участь для працівника {0} вже позначено на цей день
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
 DocType: Customer,From Lead,З Lead-а
@@ -4802,6 +4837,7 @@
 DocType: Lab Test,Approved Date,Затверджена дата
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
+DocType: Subscriber,Subscriber Name,Ім&#39;я абонента
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Update Tool,Replace,Замінювати
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не знайдено продуктів.
@@ -4811,19 +4847,18 @@
 DocType: Request for Quotation Item,Project Name,Назва проекту
 DocType: Customer,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Вибір рахунку процентних доходів у кредиті працівника {0}
 DocType: Work Order,Required Items,необхідні товари
 DocType: Stock Ledger Entry,Stock Value Difference,Різниця значень запасів
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Людський ресурс
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата узгодження
 DocType: Disease,Treatment Task,Задача лікування
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Податкові активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Податкові активи
 DocType: BOM Item,BOM No,Номер Норм
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Проводка {0} не має рахунку {1} або вже прив'язана до іншого документу
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Update Tool,The BOM which will be replaced,"Норми, які будуть замінені"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,електронні прилади
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,електронні прилади
 DocType: Asset,Maintenance Required,Необхідне технічне обслуговування
 DocType: Account,Debit,Дебет
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
@@ -4832,7 +4867,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Неоплачена сума
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Встановити цілі по групах для цього Відповідального з продажу.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Заморожувати запаси старше ніж [днiв]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Рядок # {0}: Актив є обов&#39;язковим для фіксованого активу покупки / продажу
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Рядок # {0}: Актив є обов&#39;язковим для фіксованого активу покупки / продажу
 DocType: Asset Maintenance Team,Maintenance Team Name,Назва команди технічного обслуговування
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Якщо є два або більше Правил на основі зазначених вище умов, застосовується пріоритет. Пріоритет являє собою число від 0 до 20 зі значенням за замовчуванням , що дорівнює нулю (порожній). Більше число для певного правила означає, що воно буде мати більший пріоритет серед правил з такими ж умовами."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Клієнт є обов&#39;язковим, якщо &quot;Клієнт&quot; вибрано &quot;Можливість від&quot;"
@@ -4842,19 +4877,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Типи Авансових звітів.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},"ставка для пункту продажу {0} нижче, ніж його {1}. курс продажу повинен бути принаймні {2}"
-DocType: Item,Taxes,Податки
+DocType: Subscription,Taxes,Податки
 DocType: Purchase Invoice,capital goods,капітальні товари
 DocType: Purchase Invoice Item,Weight Per Unit,Вага на одиницю
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Платні і не доставляється
 DocType: Project,Default Cost Center,Центр доходів/витрат за замовчуванням
-DocType: Bank Guarantee,End Date,Дата закінчення
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операції з інвентарем
 DocType: Budget,Budget Accounts,рахунки бюджету
 DocType: Employee,Internal Work History,Внутрішня Історія роботи
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Сума накопиченого зносу
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Варіатор Scorecard постачальника
-DocType: Employee Loan,Fully Disbursed,повністю Освоєно
 DocType: Employee Advance,Due Advance Amount,Сума авансового платежу
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
@@ -4878,14 +4911,13 @@
 ,Employee Information,Співробітник Інформація
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",Неможливо фільтрувати по номеру документу якщо згруповано по документах
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Зробити пропозицію постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Зробити пропозицію постачальника
 DocType: Quality Inspection,Incoming,Вхідний
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Шаблони податку за замовчуванням для продажу та покупки створені.
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Будь ласка, встановіть фільтр компанії порожнім, якщо група До є «Компанія»"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Дата розміщення не може бути майбутня дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,для генерування повторюваних
 DocType: Stock Entry,Target Warehouse Address,Адреса цільового складу
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Непланована відпустка
 DocType: Agriculture Task,End Day,Кінець дня
@@ -4910,11 +4942,10 @@
 DocType: Material Request,% Ordered,% Замовлено
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для заснованого курсу студентської групи, Курс буде перевірятися для кожного студента з зарахованих курсів в програмі зарахування."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Відрядна робота
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Сер. ціна закупівлі
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Сер. ціна закупівлі
 DocType: Share Balance,From No,Від №
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Нове повідомлення від {sender}
 DocType: Customer,Customer Primary Address,Основна адреса клієнта
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Розсилка
 DocType: Drug Prescription,Description/Strength,Опис / Сила
@@ -4923,22 +4954,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Той же пункт був введений кілька разів
 DocType: Department,Leave Block List,Список блокування відпусток
 DocType: Purchase Invoice,Tax ID,ІПН
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не налаштований на послідовний пп. Колонка повинна бути порожньою
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не налаштований на послідовний пп. Колонка повинна бути порожньою
 DocType: Accounts Settings,Accounts Settings,Налаштування рахунків
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,затвердити
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Малформатована адреса для {0}, будь ласка, виправте, щоб продовжити."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Малформатована адреса для {0}, будь ласка, виправте, щоб продовжити."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Кількість нових акаунтів, вона буде включена в назву облікового запису як префікс"
 DocType: Maintenance Team Member,Team Member,Член команди
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Немає результатів для надсилання
 DocType: Customer,Sales Partner and Commission,Торговий партнер та комісія
-DocType: Employee Loan,Rate of Interest (%) / Year,Процентна ставка (%) / рік
+DocType: Loan,Rate of Interest (%) / Year,Процентна ставка (%) / рік
 ,Project Quantity,проект Кількість
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»"
 DocType: Opportunity,To Discuss,Обговорити
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,"{0} одиниць {1} необхідні {2}, щоб завершити цю угоду."
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентна ставка (%) Річний
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Тимчасові рахунки
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Чорний
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Тимчасові рахунки
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Складова продукції згідно норм
 DocType: Shareholder,Contact List,Список контактів
 DocType: Account,Auditor,Аудитор
@@ -4946,16 +4977,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} виготовлені товари
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Вивчайте більше
 DocType: Cheque Print Template,Distance from top edge,Відстань від верхнього краю
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Прайс-лист {0} відключений або не існує
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Прайс-лист {0} відключений або не існує
 DocType: Purchase Invoice,Return,Повернення
 DocType: Pricing Rule,Disable,Відключити
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Спосіб оплати потрібно здійснити оплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Спосіб оплати потрібно здійснити оплату
 DocType: Project Task,Pending Review,В очікуванні відгук
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Редагувати повну сторінку для отримання додаткових параметрів, таких як активи, серійні номери, партії тощо."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Призначення та консультації
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} не надійшов у Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може бути утилізовані, як це вже {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Потрібні чеки
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Потрібні чеки
 DocType: Task,Total Expense Claim (via Expense Claim),Всього витрат (за Авансовим звітом)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Відсутня
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Не вдалося встановити компанію
@@ -4967,7 +4998,7 @@
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управління флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Додати елементи з
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Додати елементи з
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Тварини та землі
 DocType: Cheque Print Template,Regular,регулярне
 DocType: Fertilizer,Density (if liquid),Щільність (якщо рідина)
@@ -4992,24 +5023,26 @@
 DocType: Payment Entry,Paid Amount,Виплачена сума
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Дослідіть цикл продажу
 DocType: Assessment Plan,Supervisor,Супервайзер
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Вхід утримання запасу
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Вхід утримання запасу
 ,Available Stock for Packing Items,Доступно для пакування
 DocType: Item Variant,Item Variant,Варіант номенклатурної позиції
 ,Work Order Stock Report,Звіт про стан роботи на замовлення
+DocType: Purchase Receipt,Auto Repeat Detail,Автоматичне повторення деталей
 DocType: Assessment Result Tool,Assessment Result Tool,Оцінка результату інструмент
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Як керівник
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Запропонуйте категорію
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Управління якістю
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Управління якістю
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} відключена
 DocType: Project,Total Billable Amount (via Timesheets),"Загальна сума, що підлягає обігу (через розсилки)"
 DocType: Agriculture Task,Previous Business Day,Попередній робочий день
-DocType: Employee Loan,Repay Fixed Amount per Period,Погашати фіксовану суму за період
+DocType: Loan,Repay Fixed Amount per Period,Погашати фіксовану суму за період
 DocType: Employee,Health Insurance No,Медичне страхування немає
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Кредит Примітка Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Кредит Примітка Amt
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Загальна сума податкової декларації
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 DocType: Opening Invoice Creation Tool,Purchase,Купівля
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Кількісне сальдо
@@ -5020,16 +5053,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 DocType: Healthcare Settings,Valid number of days,Дійсна кількість днів
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Центри витрат
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Перезапустити підписку
 DocType: Land Unit,Linked Plant Analysis,Пов&#39;язаний аналіз рослин
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Курс, за яким валюта постачальника конвертується у базову валюту компанії"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: таймінги конфлікти з низкою {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволити нульову Незалежну оцінку Оцінити
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Дозволити нульову Незалежну оцінку Оцінити
+DocType: Bank Guarantee,Receiving,Прийом
 DocType: Training Event Employee,Invited,запрошений
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,"Кілька активних Зарплатні структури, знайдені для працівника {0} для зазначених дат"
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Налаштування шлюзу рахунку.
 DocType: Employee,Employment Type,Вид зайнятості
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Основні активи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Основні активи
 DocType: Payment Entry,Set Exchange Gain / Loss,Встановити Курсова прибуток / збиток
 ,GST Purchase Register,GST Купівля Реєстрація
 ,Cash Flow,Рух грошових коштів
@@ -5050,9 +5085,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Список всіх транзакцій угоди
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp граф
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp граф
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},Додається {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,"Потрібно встановити як початкову, так і кінцеву дату пробного періоду"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Середня ставка
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Загальна сума платежу у графіку платежів повинна дорівнювати величині / округленому загальному
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Загальна сума платежу у графіку платежів повинна дорівнювати величині / округленому загальному
+DocType: Subscription Plan Detail,Plan,Планувати
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовий звіт за Головну книгу
 DocType: Job Applicant,Applicant Name,Заявник Ім&#39;я
 DocType: Authorization Rule,Customer / Item Name,Замовник / Назва товару
@@ -5082,6 +5118,7 @@
 DocType: Work Order,Warehouses,Склади
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не може бути передано
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ціни на готельні номери
+DocType: Subscription,Days Until Due,Днів до закінчення строку дії
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Цей пункт є Варіант {0} (шаблон).
 DocType: Workstation,per hour,в годину
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупівля
@@ -5090,13 +5127,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Для заснованої Batch Student Group, студентський Batch буде перевірятися для кожного студента з програми Зарахування."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки для нього існує запис у складській книзі."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Збут
+DocType: Journal Entry Account,Loan,Кредит
 DocType: Expense Claim Advance,Expense Claim Advance,Попередня вимога про витрати
 DocType: Lab Test,Report Preference,Налаштування звіту
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Волонтерська інформація.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Керівник проекту
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Керівник проекту
 ,Quoted Item Comparison,Цитується Порівняння товару
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},"Перехрещення, забиваючи від {0} і {1}"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Відправка
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Відправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Макс дозволена знижка для позиції: {0} = {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,"Чиста вартість активів, як на"
 DocType: Crop,Produce,Продукувати
@@ -5106,7 +5144,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Матеріальний потік для виробництва
 DocType: Item Alternative,Alternative Item Code,Код альтернативного елемента
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, що дозволяє проводити операції, які перевищують ліміти кредитів."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Вибір елементів для виготовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Вибір елементів для виготовлення
 DocType: Delivery Stop,Delivery Stop,Зупинка доставки
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
 DocType: Item,Material Issue,Матеріал Випуск
@@ -5116,15 +5154,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Мило та миючі засоби
 DocType: BOM,Show Items,Показати товари
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Від часу не може бути більше часу.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Ви хочете повідомити всіх клієнтів електронною поштою?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Ви хочете повідомити всіх клієнтів електронною поштою?
+DocType: Subscription Plan,Billing Interval,Інтервал платежів
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Кіно & Відео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Замовлено
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Резюме
 DocType: Hub Settings,Hub Username,Ім&#39;я користувача Hub
 DocType: Salary Detail,Component,компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерії оцінки Група
 DocType: Healthcare Settings,Patient Name By,Ім&#39;я пацієнта по
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Журнал накопичувального журналу про заробітну плату від {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Журнал накопичувального журналу про заробітну плату від {0} до {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
 DocType: Warehouse,Warehouse Name,Назва складу
 DocType: Naming Series,Select Transaction,Виберіть операцію
@@ -5138,23 +5176,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
 DocType: Leave Block List,Applies to Company,Відноситься до Компанії
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що проведений Рух ТМЦ {0} існує"
-DocType: Employee Loan,Disbursement Date,витрачання Дата
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&quot;Одержувачі&quot; не вказано
+DocType: Loan,Disbursement Date,витрачання Дата
 DocType: BOM Update Tool,Update latest price in all BOMs,Оновити останню ціну у всіх БОМ
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Медичний запис
 DocType: Vehicle,Vehicle,транспортний засіб
 DocType: Purchase Invoice,In Words,Прописом
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Перед подачею введіть назву банку або кредитної установи.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} потрібно затвердити
 DocType: POS Profile,Item Groups,Групи товарів
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
 DocType: Sales Order Item,For Production,Для виробництва
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Будь ласка, додайте тимчасовий обліковий запис на карті рахунків"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Будь ласка, додайте тимчасовий обліковий запис на карті рахунків"
 DocType: Customer,Customer Primary Contact,Початковий контакт з клієнтом
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Журнал Закриття періоду
 DocType: Project Task,View Task,Подивитися Завдання
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ОПП / Свинець%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ОПП / Свинець%
+DocType: Bank Guarantee,Bank Guarantee Type,Тип банківської гарантії
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Частка рахунків-фактур
 ,Asset Depreciations and Balances,Амортизація та баланси
@@ -5165,9 +5204,8 @@
 DocType: Production Plan,Include Subcontracted Items,Включіть субпідрядні елементи
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,приєднатися
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Брак к-сті
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,"Неможливо змінити властивості Variant після перетворення запасу. Щоб зробити це, вам доведеться створити новий елемент."
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
-DocType: Employee Loan,Repay from Salary,Погашати із заробітної плати
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+DocType: Loan,Repay from Salary,Погашати із заробітної плати
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Запит платіж проти {0} {1} на суму {2}
 DocType: Salary Slip,Salary Slip,Зарплатний розрахунок
@@ -5191,11 +5229,11 @@
 DocType: Employee Education,Employee Education,Співробітник Освіта
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Повторювана група знахідку в таблиці групи товарів
 DocType: Land Unit,Parent Land Unit,Батьківський фонд
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
 DocType: Fertilizer,Fertilizer Name,Назва мінеральних добрив
 DocType: Salary Slip,Net Pay,"Сума ""на руки"""
 DocType: Cash Flow Mapping Accounts,Account,Рахунок
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серійний номер {0} вже отриманий
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Серійний номер {0} вже отриманий
 ,Requested Items To Be Transferred,"Номенклатура, що ми замовили але не отримали"
 DocType: Expense Claim,Vehicle Log,автомобіль Вхід
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наявність лихоманки (температура&gt; 38,5 ° С / 101,3 ° F або стійка температура&gt; 38 ° C / 100,4 ° F)"
@@ -5236,24 +5274,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
 DocType: Asset Maintenance,Manufacturing User,Виробництво користувача
 DocType: Purchase Invoice,Raw Materials Supplied,Давальна сировина
-DocType: C-Form,Series,Серії
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Валюта прайс-листа {0} має бути {1} або {2}
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Soil Texture,Ternary Plot,Трінарний ділянка
 DocType: Item Group,Item Classification,Пункт Класифікація
 DocType: Driver,License Number,Номер ліцензії
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,менеджер з розвитку бізнесу
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,менеджер з розвитку бізнесу
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Мета візиту Технічного обслуговування
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Реєстрація рахунків-пацієнтів
 DocType: Crop,Period,Період
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Головна бухгалтерська книга
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Співробітник {0} відпустки по {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Співробітник {0} відпустки по {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Подивитися Lead-и
 DocType: Program Enrollment Tool,New Program,Нова програма
 DocType: Item Attribute Value,Attribute Value,Значення атрибуту
 ,Itemwise Recommended Reorder Level,Рекомендовані рівні перезамовлення по товарах
 DocType: Salary Detail,Salary Detail,Заробітна плата: Подробиці
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 DocType: Appointment Type,Physician,Лікар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Партія {0} номенклатурної позиції {1} протермінована.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Консультації
@@ -5261,15 +5298,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не може перевищувати заплановану кількість ({2}) у робочому замовленні {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Час Лист для виготовлення.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,проміжний підсумок
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Не вдається змінити властивості Variant після транзакції з цінними паперами. Щоб зробити це, вам доведеться створити новий елемент."
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless Mandate SEPA
 DocType: Physician,Charges,Збори
 DocType: Production Plan,Get Items For Work Order,Отримати елементи для замовлення роботи
 DocType: Salary Detail,Default Amount,За замовчуванням сума
 DocType: Lab Test Template,Descriptive,Описовий
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Склад не знайдений у системі
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Склад не знайдений у системі
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Резюме цього місяця
 DocType: Quality Inspection Reading,Quality Inspection Reading,Зчитування сертифікату якості
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
 DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,"Встановіть ціль продажу, яку хочете досягти для своєї компанії."
 ,Project wise Stock Tracking,Стеження за запасами у рамках проекту
@@ -5297,11 +5335,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Не вдалося створити веб-сайт
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Внесені запаси запасу вже створені або кількість проб не вказана
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Внесені запаси запасу вже створені або кількість проб не вказана
 DocType: Program,Program Abbreviation,Абревіатура програми
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Збори у прихідній накладній оновлюються по кожній позиції
 DocType: Warranty Claim,Resolved By,Вирішили За
-DocType: Bank Guarantee,Start Date,Дата початку
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Виділяють листя протягом.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,"Чеки та депозити неправильно ""очищені"""
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити рахунок як батьківський до себе
@@ -5316,11 +5353,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часів
 DocType: Project,Expected Start Date,Очікувана дата початку
 DocType: Purchase Invoice,04-Correction in Invoice,04-виправлення в рахунку-фактурі
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Замовлення на роботу вже створено для всіх елементів з BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Замовлення на роботу вже створено для всіх елементів з BOM
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Звіт про деталі варіантів
 DocType: Setup Progress Action,Setup Progress Action,Налаштування виконання дій
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Купівля прайс-листа
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Купівля прайс-листа
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Видалити елемент, якщо стяхгнення не застосовуються до нього"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Скасувати підписку
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,"Будь-ласка, виберіть технічне обслуговування як завершено або видаліть дату завершення"
 DocType: Supplier,Default Payment Terms Template,Шаблон для стандартних умов платежу
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,"Валюта операції повинна бути такою ж, як валюта платіжного шлюзу"
@@ -5331,7 +5369,6 @@
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Дія, якщо накопичений місячний бюджет перевищено"
-DocType: Subscription,Submit on creation,Провести по створенню
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Валюта для {0} має бути {1}
 DocType: Asset,Disposal Date,Утилізація Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Електронні листи будуть відправлені до всіх активні працівники компанії на даний час, якщо у них немає відпустки. Резюме відповідей буде відправлений опівночі."
@@ -5350,6 +5387,7 @@
 DocType: Batch,Parent Batch,батько Batch
 DocType: Cheque Print Template,Cheque Print Template,Шаблон друку чеків
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Перелік центрів витрат
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Кількість днів, коли дата рахунка-фактури минула до скасування підписки або маркування підписки як неоплаченої"
 DocType: Lab Test Template,Sample Collection,Збірка зразків
 ,Requested Items To Be Ordered,Номенклатура до замовлення
 DocType: Price List,Price List Name,Назва прайс-листа
@@ -5358,7 +5396,7 @@
 DocType: Account,Income,Дохід
 DocType: Industry Type,Industry Type,Галузь
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Щось пішло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Увага: Заяви на відпустки містять такі заблоковані дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Увага: Заяви на відпустки містять такі заблоковані дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Вихідний рахунок {0} вже проведений
 DocType: Supplier Scorecard Scoring Criteria,Score,рахунок
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Фінансовий рік {0} не існує
@@ -5378,12 +5416,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,POS- Профіль
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} має бути значення від 0 до 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Наступна дата амортизації не може передувати даті доступної для використання
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Незабезпечені кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Незабезпечені кредити
 DocType: Cost Center,Cost Center Name,Назва центру витрат
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Максимальна кількість робочих годин за табелем робочого часу
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланована дата
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Загальна оплачена сума
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Загальна оплачена сума
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Повідомлення більше ніж 160 символів будуть розділені на кілька повідомлень
 DocType: Purchase Receipt Item,Received and Accepted,Отримав і прийняв
 DocType: Hub Settings,Company and Seller Profile,Профіль компанії та продавця
@@ -5397,10 +5435,9 @@
 DocType: Item,Variant Based On,Варіант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Ваші Постачальники
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Будь ласка, виправте"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 DocType: Request for Quotation Item,Supplier Part No,Номер деталі постачальника
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Анонімний
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Отримано від
 DocType: Lead,Converted,Перероблений
@@ -5414,6 +5451,7 @@
 DocType: Asset,Assets,Активи
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Включити цей товар у декілька груп на веб сайті.
+DocType: Subscription,Current Invoice End Date,Поточна дата завершення рахунку-фактури
 DocType: Payment Term,Due Date Based On,Due Date Based On
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,В налаштуваннях продажу встановіть групу клієнтів і територію за умовчанням
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} не існує
@@ -5421,7 +5459,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Вам не дозволено встановлювати блокування
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Жодні виплати не вибрані для вступу до журналу
 DocType: Payment Reconciliation,From Invoice Date,Рахунки-фактури з датою від
+DocType: Loan,Disbursed,Виплачено
 DocType: Healthcare Settings,Laboratory Settings,Налаштування лабораторії
 DocType: Patient Appointment,Service Unit,Сервісний відділ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Успішно встановите постачальника
@@ -5434,12 +5474,12 @@
 DocType: Share Balance,No of Shares,Кількість акцій
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Виберіть статус
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Відвідуваність не можна вносити для майбутніх дат
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Відвідуваність не можна вносити для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Довідка з цінових правил
 DocType: School House,House Name,Назва будинку
 DocType: Fee Schedule,Total Amount per Student,Загальна сума на одного студента
 DocType: Purchase Taxes and Charges,Account Head,Рахунок
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Електричний
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Електричний
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додайте решту вашої організації в якості користувачів. Ви можете також додати запрошувати клієнтів на ваш портал, додавши їх зі списку контактів"
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна різниця (Розх - Прих)
 DocType: Grant Application,Requested Amount,Запитана сума
@@ -5449,7 +5489,7 @@
 DocType: Crop Cycle,Detected Diseases,Виявлені захворювання
 DocType: Stock Entry,Default Source Warehouse,Склад - джерело за замовчуванням
 DocType: Item,Customer Code,Код клієнта
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Нагадування про день народження для {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Нагадування про день народження для {0}
 DocType: Asset Maintenance Task,Last Completion Date,Дата завершення останнього завершення
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
@@ -5457,9 +5497,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Налаштування GoCardless
 DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Складські запаси
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Складські запаси
 DocType: Restaurant,Active Menu,Активне меню
 DocType: Target Detail,Target Qty,Цільова Кількість
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Проти кредиту: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Налаштування
 DocType: Student Attendance,Present,Присутній
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Накладна {0} не повинні бути проведеною
@@ -5468,9 +5509,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Production Plan Item,Ordered Qty,Замовлена (ordered) к-сть
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заблоковано по
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,Норми не містять жодного елементу запасів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,Норми не містять жодного елементу запасів
 DocType: Chapter,Chapter Head,Глава глави
 DocType: Payment Term,Month(s) after the end of the invoice month,Місяць після закінчення місяця рахунка-фактури
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Проектна діяльність / завдання.
@@ -5478,11 +5519,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Згенерувати Зарплатні розрахунки
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Датчик результату datetime не може бути перед тестом datetime
 DocType: POS Profile,Allow user to edit Discount,Дозволити користувачеві редагувати знижки
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Отримуйте клієнтів від
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Отримуйте клієнтів від
 DocType: Purchase Invoice Item,Include Exploded Items,Включити вибухнуті елементи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","""Купівля"" повинно бути позначено, якщо ""Застосовне для"" обране як {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
 DocType: Shipping Rule,Restrict to Countries,Обмежити лише країни
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Оплачувані години
 DocType: Project,Total Sales Amount (via Sales Order),Загальна сума продажів (через замовлення клієнта)
@@ -5501,6 +5543,7 @@
 DocType: Soil Texture,Sandy Clay,Піщана глина
 DocType: Grant Application,Assessment  Manager,Менеджер з оцінювання
 DocType: Payment Entry,Allocate Payment Amount,Розподілити суму платежу
+DocType: Subscription Plan,Subscription Plan,План підписки
 DocType: Employee External Work History,Salary,Зарплата
 DocType: Serial No,Delivery Document Type,Доставка Тип документа
 DocType: Sales Order,Partly Delivered,Частково доставлений
@@ -5524,9 +5567,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Старіння Діапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальна міцність
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Встановлення пресетів
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Примітка доставки не вибрана для Клієнта {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Примітка доставки не вибрана для Клієнта {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,Норми замінено
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Виберіть елементи на основі дати доставки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Виберіть елементи на основі дати доставки
 DocType: Grant Application,Has any past Grant Record,Має будь-яку минулу реєстр грантів
 ,Sales Analytics,Аналітика продажів
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Доступно {0}
@@ -5545,7 +5588,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Вартість давальної сировини
 DocType: Selling Settings,Settings for Selling Module,Налаштування модуля Продаж
 DocType: Hotel Room Reservation,Hotel Room Reservation,Бронювання номеру готелю
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Обслуговування клієнтів
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Обслуговування клієнтів
 DocType: BOM,Thumbnail,Мініатюра
 DocType: Item Customer Detail,Item Customer Detail,Пункт Подробиці клієнтів
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Пропозиція кандидата на роботу.
@@ -5562,7 +5605,7 @@
 DocType: Fees,Student Details,Студентські подробиці
 DocType: Purchase Invoice Item,Stock Qty,Фото Кількість
 DocType: Purchase Invoice Item,Stock Qty,Фото Кількість
-DocType: Employee Loan,Repayment Period in Months,Період погашення в місцях
+DocType: Loan,Repayment Period in Months,Період погашення в місцях
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Помилка: Чи не діє ID?
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
 DocType: Account,Equity,Капітал
@@ -5571,7 +5614,7 @@
 DocType: Task,Closing Date,Дата закриття
 DocType: Sales Order Item,Produced Quantity,Здобуте кількість
 DocType: Timesheet,Work Detail,Деталь роботи
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Інженер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Інженер
 DocType: Journal Entry,Total Amount Currency,Загальна сума валюти
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Пошук Sub Асамблей
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
@@ -5616,13 +5659,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Інформація про донора.
 DocType: Request for Quotation,Supplier Detail,Постачальник: Подробиці
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Помилка у формулі або умова: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Сума за рахунками
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Сума за рахунками
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Критеріальні ваги повинні складати до 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Відвідуваність
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Stock Items
 DocType: BOM,Materials,Матеріали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Якщо не позначено, то список буде потрібно додати до кожного відділу, де він має бути застосований."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Створення {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Вихідний та цільовий склад не можуть бути однаковими
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Дата та час розміщення/створення є обов'язковими
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Податковий шаблон для операцій покупки.
@@ -5646,14 +5688,14 @@
 DocType: Shipping Rule,Fixed,Виправлено
 DocType: Vehicle Service,Clutch Plate,диск зчеплення
 DocType: Company,Round Off Account,Рахунок заокруглення
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Адміністративні витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Адміністративні витрати
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
-DocType: Journal Entry,Subscription,Підписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Підписка
 DocType: Purchase Invoice,Contact Email,Контактний Email
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Очікує створити плату
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Примітка Період
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Примітка Період
 DocType: Asset Category,Asset Category Name,Назва категорії активів
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Це корінь територія і не можуть бути змінені.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ім'я нового Відповідального з продажу
@@ -5667,7 +5709,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизації (місяців)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Рахунок з кредитовим сальдо
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
@@ -5675,7 +5717,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Рахунок Кредиторської / Дебіторської заборгованості
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
 DocType: Hub Settings,Company Logo,Логотип компанії
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,Склад за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 DocType: Healthcare Settings,Patient Registration,Реєстрація пацієнта
@@ -5710,11 +5752,10 @@
 DocType: Journal Entry,Total Debit,Всього Дебет
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Склад готової продукції за замовчуванням
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,"Будь ласка, виберіть пацієнта"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Відповідальний з продажу
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Відповідальний з продажу
 DocType: Hotel Room Package,Amenities,Зручності
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет та центр витрат
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Кілька типовий спосіб оплати за замовчуванням заборонено
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
 ,Appointment Analytics,Призначення Analytics
 DocType: Vehicle Service,Half Yearly,Півроку
 DocType: Lead,Blog Subscriber,Абонент блогу
@@ -5731,6 +5772,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Залиште поле порожнім, якщо ви робите груп студентів на рік"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Якщо позначено, ""Загальна кількість робочих днів"" буде включати в себе свята, і це призведе до зниження розміру ""Зарплати за день"""
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Програми, які використовують поточний ключ, не зможуть отримати доступ, чи впевнені ви?"
+DocType: Subscription Settings,Prorate,Прорат
 DocType: Purchase Invoice,Total Advance,Аванс загалом
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Змінити шаблонний код
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Термін Дата закінчення не може бути раніше, ніж термін Дата початку. Будь ласка, виправте дату і спробуйте ще раз."
@@ -5742,8 +5784,9 @@
 DocType: Opportunity Item,Basic Rate,Базова ціна
 DocType: GL Entry,Credit Amount,Сума кредиту
 DocType: Cheque Print Template,Signatory Position,Положення підпису
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Встановити як Втрачений
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Встановити як Втрачений
 DocType: Timesheet,Total Billable Hours,Всього оплачуваних годин
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,"Кількість днів, протягом яких абонент повинен оплатити рахунки-фактури, створені за цією підпискою"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Отримання Примітка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Згідно операцій по цьому клієнту. Див графік нижче для отримання докладної інформації
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Рядок {0}: Розподілена сума {1} повинна бути менше або дорівнювати сумі Оплати {2}
@@ -5762,12 +5805,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Вибрати або додати нового клієнта
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Це засновано на відвідуваності цього співробітника
 DocType: Assessment Result,Summary,Резюме
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Позначити присутність
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Дебетовий рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Дата початку року
 DocType: Attendance,Employee Name,Ім'я працівника
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Замовлення на замовлення ресторану
@@ -5779,7 +5822,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Закупівельна сума
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Виплати працівникам
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Виплати працівникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Work Order,Manufactured Qty,Вироблена к-сть
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Акції не існує з {0}
@@ -5787,12 +5830,12 @@
 DocType: Asset,Out of Order,Вийшов з ладу
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнята кількість
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ігнорувати час перекриття робочої станції
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} не існує
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Вибір номер партії
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Рядок № {0}: Сума не може бути більша ніж сума до погодження по Авансовому звіту {1}. Сума до погодження = {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Рядок № {0}: Сума не може бути більша ніж сума до погодження по Авансовому звіту {1}. Сума до погодження = {2}
 DocType: Patient Service Unit,Medical Administrator,Медичний адміністратор
 DocType: Assessment Plan,Schedule,Графік
 DocType: Account,Parent Account,Батьківський рахунок
@@ -5822,15 +5865,16 @@
 DocType: Asset Repair,Repair Status,Ремонт статусу
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступна к-сть на вихідному складі
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
 DocType: POS Profile,Account for Change Amount,Рахунок для суми змін
 DocType: Purchase Invoice,input service,служба введення
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Член технічного обслуговування
 DocType: Agriculture Analysis Criteria,Soil Analysis,Аналіз грунту
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Код курсу:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Інвентар
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо товар є варіантом іншого, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано інше"
 DocType: Serial No,Purchase / Manufacture Details,Закупівля / Виробництво: Детальніше
@@ -5879,19 +5923,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Вступникам для {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Назва змінної
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Номенклатурна позиція {0} - шаблон, виберіть один з його варіантів"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Номенклатурна позиція {0} - шаблон, виберіть один з його варіантів"
 DocType: Asset,Asset Category,Категорія активів
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,"Сума ""на руки"" не може бути від'ємною"
 DocType: Purchase Order,Advance Paid,Попередньо оплачено
 DocType: Item,Item Tax,Податки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Матеріал Постачальнику
 DocType: Soil Texture,Loamy Sand,Лиственний пісок
 DocType: Production Plan,Material Request Planning,Планування запиту матеріалів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Акцизний Рахунок
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% з&#39;являється більше одного разу
 DocType: Expense Claim,Employees Email Id,ІД епошти співробітника
 DocType: Employee Attendance Tool,Marked Attendance,Внесена відвідуваність
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Поточні зобов&#39;язання
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Поточні зобов&#39;язання
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Таймер перевищив задані години.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Відправити SMS масового вашим контактам
 DocType: Patient,A Positive,Позитивний
@@ -5902,9 +5946,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична к-сть обов'язкова
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і замовлення на придбання для цього постачальника повинні бути випущені з обережністю."
 DocType: Asset Maintenance Team,Asset Maintenance Team,Команда з обслуговування майна
-DocType: Employee Loan,Loan Type,Тип кредиту
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} успішно надіслано
+DocType: Loan,Loan Type,Тип кредиту
 DocType: Scheduling Tool,Scheduling Tool,планування Інструмент
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Кредитна карта
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Кредитна карта
 DocType: BOM,Item to be manufactured or repacked,Пункт має бути виготовлений чи перепакована
 DocType: Employee Education,Major/Optional Subjects,Основні / Додаткові Суб&#39;єкти
 DocType: Sales Invoice Item,Drop Ship,Пряма доставка
@@ -5936,7 +5981,7 @@
 DocType: Item,Units of Measure,одиниці виміру
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволити виробництво на вихідних
 DocType: Sales Invoice,Customer's Purchase Order Date,Дата оригінала замовлення клієнта
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Основний капітал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Основний капітал
 DocType: Shopping Cart Settings,Show Public Attachments,Показати Публічні вкладення
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
 DocType: Restaurant Reservation,Reservation Time,Час бронювання
@@ -5951,7 +5996,7 @@
 DocType: Purchase Order,To Receive and Bill,Отримати та виставити рахунки
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Рядок # {0}: Reqd за датою не може бути перед датою транзакції
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Рекомендовані товари
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Шаблон положень та умов
 DocType: Serial No,Delivery Details,Деталі доставки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
@@ -5961,20 +6006,20 @@
 DocType: Driver,Expiry Date,Термін придатності
 DocType: Healthcare Settings,Employee name and designation in print,Ім&#39;я та найменування співробітника у друкованому вигляді
 ,accounts-browser,переглядач рахунків
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Ласка, виберіть категорію спершу"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Ласка, виберіть категорію спершу"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстер проекту.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Щоб дозволити over-billing або over-ordering, змініть ""Дозвіл"" в налаштуваннях інвентаря або даної позиції."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не показувати жодних символів на кшталт ""₴"" і подібних поряд з валютами."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Половина дня)
 DocType: Payment Term,Credit Days,Кредитні Дні
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Будь ласка, виберіть Пацієнта, щоб отримати лабораторні тести"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Make Student Batch
 DocType: Fee Schedule,FRQ.,FRQ
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Отримати елементи з норм
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Отримати елементи з норм
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Час на поставку в днях
 DocType: Cash Flow Mapping,Is Income Tax Expense,Витрати з податку на прибуток
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Перевірте це, якщо студент проживає в гуртожитку інституту."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
 ,Stock Summary,сумарний стік
@@ -5985,10 +6030,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Підстава: Дата
 DocType: Employee,Reason for Leaving,Причина звільнення
 DocType: BOM Operation,Operating Cost(Company Currency),Експлуатаційні витрати (Компанія Валюта)
-DocType: Employee Loan Application,Rate of Interest,відсоткова ставка
+DocType: Loan Application,Rate of Interest,відсоткова ставка
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонована сума
 DocType: Item,Shelf Life In Days,Термін зберігання в дні
 DocType: GL Entry,Is Opening,Введення залишків
+DocType: Department,Expense Approvers,Затвердження витрат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
 DocType: Journal Entry,Subscription Section,Передплатна секція
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Рахунок {0} не існує
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index b963a19..ac44749 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,مواد کا {0} اس دعوی وارنٹی منسوخ کرنے سے پہلے منسوخ
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,تشخیص کی رپورٹ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,صارفین کی مصنوعات
-DocType: Purchase Receipt,Subscription Detail,سبسکرائب کریں تفصیل
 DocType: Supplier Scorecard,Notify Supplier,سپلائر کو مطلع کریں
 DocType: Item,Customer Items,کسٹمر اشیاء
 DocType: Project,Costing and Billing,لاگت اور بلنگ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,اکاؤنٹ {0}: والدین اکاؤنٹ {1} ایک اکاؤنٹ نہیں ہو سکتا
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com کرنے آئٹم شائع
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ای میل نوٹیفیکیشن
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,تشخیص
 DocType: Item,Default Unit of Measure,پیمائش کی پہلے سے طے شدہ یونٹ
 DocType: SMS Center,All Sales Partner Contact,تمام سیلز پارٹنر رابطہ
-DocType: Employee,Leave Approvers,Approvers چھوڑ دو
+DocType: Department,Leave Approvers,Approvers چھوڑ دو
 DocType: Sales Partner,Dealer,ڈیلر
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,تحقیقات
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,دستیابی کی جانچ پڑتال کریں
 DocType: Job Applicant,Job Applicant,ملازمت کی درخواست گزار
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,یہ اس سپلائر خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,قانونی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},اصل قسم ٹیکس صف میں شے کی درجہ بندی میں شامل نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,قانونی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},اصل قسم ٹیکس صف میں شے کی درجہ بندی میں شامل نہیں کیا جا سکتا {0}
 DocType: Bank Guarantee,Customer,کسٹمر
 DocType: Purchase Receipt Item,Required By,طرف سے کی ضرورت
 DocType: Delivery Note,Return Against Delivery Note,ترسیل کے نوٹ خلاف واپسی
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,سربراہان (یا گروپ) جس کے خلاف اکاؤنٹنگ اندراجات بنا رہے ہیں اور توازن برقرار رکھا جاتا ہے.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,کوئی پیشگی تنخواہ پر عمل کرنے کے لئے نہیں ہیں.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,کوئی پیشگی تنخواہ پر عمل کرنے کے لئے نہیں ہیں.
 DocType: Manufacturing Settings,Default 10 mins,10 منٹس پہلے سے طے شدہ
 DocType: Leave Type,Leave Type Name,قسم کا نام چھوڑ دو
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,کھلی دکھائیں
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,یہ ضروری ہے کہ اس کارروائی کو آج ہی ذکر شدہ بار بار کے لۓ لے جا سکے
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,اس کو دیکھو
 DocType: Pricing Rule,Apply On,پر لگائیں
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,تمام سپلائر سے رابطہ
 DocType: Support Settings,Support Settings,سپورٹ ترتیبات
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,صف # {0}: شرح کے طور پر ایک ہی ہونا چاہیے {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,نیا رخصت کی درخواست
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,صف # {0}: شرح کے طور پر ایک ہی ہونا چاہیے {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,بیچ آئٹم ختم ہونے کی حیثیت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,بینک ڈرافٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,بینک ڈرافٹ
 DocType: Membership,membership validaty section,رکنیت درستی سیکشن
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
 DocType: Consultation,Consultation,مشاورت
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ویب سائٹ بنانا
 DocType: Opening Invoice Creation Tool Item,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),قرضے (واجبات)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),قرضے (واجبات)
 DocType: Employee Education,Year of Passing,پاسنگ کا سال
 DocType: Item,Country of Origin,پیدائشی ملک
 DocType: Soil Texture,Soil Texture Criteria,مٹی بنانا معیار
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,بنیادی رابطے کی تفصیلات
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,کھولیں مسائل
 DocType: Production Plan Item,Production Plan Item,پیداوار کی منصوبہ بندی آئٹم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},صارف {0} پہلے ہی ملازم کو تفویض کیا جاتا ہے {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},صارف {0} پہلے ہی ملازم کو تفویض کیا جاتا ہے {1}
 DocType: Lab Test Groups,Add new line,نئی لائن شامل کریں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,صحت کی دیکھ بھال
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ادائیگی میں تاخیر (دن)
@@ -89,7 +85,7 @@
 ,Delay Days,تاخیر کے دن
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,انوائس
+DocType: Subscription Invoice,Invoice,انوائس
 DocType: Purchase Invoice Item,Item Weight Details,آئٹم وزن کی تفصیلات
 DocType: Asset Maintenance Log,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),اسکور (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},صف {0}: {1} {2} کے ساتھ مطابقت نہیں ہے {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,صف # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,صف # {0}:
 DocType: Timesheet,Total Costing Amount,کل لاگت رقم
 DocType: Delivery Note,Vehicle No,گاڑی نہیں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,کام جاری ہے
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,تاریخ منتخب کیجیے
 DocType: Daily Work Summary Group,Holiday List,چھٹیوں فہرست
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,اکاؤنٹنٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,اکاؤنٹنٹ
 DocType: Hub Settings,Selling Price List,قیمت کی فہرست فروخت
 DocType: Patient,Tobacco Current Use,تمباکو موجودہ استعمال
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,فروخت کی شرح
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,فروخت کی شرح
 DocType: Cost Center,Stock User,اسٹاک صارف
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + MG) / K
 DocType: Company,Phone No,فون نمبر
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},نیا {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,ابتدائی ای میل کی اطلاع بھیجا
 ,Sales Partners Commission,سیلز شراکت دار کمیشن
 DocType: Soil Texture,Sandy Clay Loam,سینڈی کلیے لوام
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,ہراس کے بعد ویلیو
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,متعلقہ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,حاضری کی تاریخ ملازم کی میں شمولیت کی تاریخ سے کم نہیں ہو سکتا
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,حاضری کی تاریخ ملازم کی میں شمولیت کی تاریخ سے کم نہیں ہو سکتا
 DocType: Grading Scale,Grading Scale Name,گریڈنگ پیمانے نام
-DocType: Subscription,Repeat on Day,دن پر دہرائیں
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,یہ ایک جڑ اکاؤنٹ ہے اور میں ترمیم نہیں کیا جا سکتا.
 DocType: Sales Invoice,Company Address,کمپنی ایڈریس
 DocType: BOM,Operations,آپریشنز
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},کے لئے ڈسکاؤنٹ کی بنیاد پر اجازت مقرر نہیں کر سکتے ہیں {0}
+DocType: Subscription,Subscription Start Date,سبسکرائب کریں شروع کی تاریخ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",دو کالموں، پرانے نام کے لئے ایک اور نئے نام کے لئے ایک کے ساتھ CSV فائل منسلک کریں
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} میں کوئی فعال مالی سال نہیں.
 DocType: Packed Item,Parent Detail docname,والدین تفصیل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",حوالہ: {0}، آئٹم کوڈ: {1} اور کسٹمر: {2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,آزمائشی مدت کے اختتام تاریخ آزمائشی دورہ شروع ہونے سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,کلو
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ایک کام کے لئے کھولنے.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},بوم ذیلی کنکریٹ کرنے والے آئٹم {0} کے لئے قطار {1} کے لئے مخصوص نہیں ہے.
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ایک ہی کمپنی ایک سے زیادہ بار داخل کیا جاتا ہے
 DocType: Patient,Married,شادی
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},کی اجازت نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,سے اشیاء حاصل
 DocType: Price List,Price Not UOM Dependant,قیمت UOM انحصار نہیں ہے
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},پروڈکٹ {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,وقفے تیل
 DocType: Tax Rule,Tax Type,ٹیکس کی قسم
 ,Completed Work Orders,مکمل کام کے حکم
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,قابل ٹیکس رقم
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,قابل ٹیکس رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
 DocType: BOM,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,قطار # {0}: ریفرنس دستاویز کی قسم میں اخراجات کا دعوی یا جرنل انٹری ہونا لازمی ہے
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM منتخب
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,قطار # {0}: ریفرنس دستاویز کی قسم میں اخراجات کا دعوی یا جرنل انٹری ہونا لازمی ہے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM منتخب
 DocType: SMS Log,SMS Log,ایس ایم ایس لاگ ان
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ہونے والا اشیا کی لاگت
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,ملازمت کو دی گئی پیشگی رقم کا انتظام کریں
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,ترسیل کی اطلاع
 DocType: Journal Entry,Opening Entry,افتتاحی انٹری
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,اکاؤنٹ تنخواہ صرف
-DocType: Employee Loan,Repay Over Number of Periods,دوران ادوار کی تعداد ادا
+DocType: Loan,Repay Over Number of Periods,دوران ادوار کی تعداد ادا
 DocType: Stock Entry,Additional Costs,اضافی اخراجات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,موجودہ لین دین کے ساتھ اکاؤنٹ گروپ میں تبدیل نہیں کیا جا سکتا.
 DocType: Lead,Product Enquiry,مصنوعات کی انکوائری
 DocType: Education Settings,Validate Batch for Students in Student Group,طالب علم گروپ کے طلبا کے بیچ کی توثیق
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ملازم کیلئے کوئی چھٹی ریکارڈ {0} کے لئے {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},ملازم کیلئے کوئی چھٹی ریکارڈ {0} کے لئے {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,پہلی کمپنی داخل کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,پہلی کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,پہلی کمپنی کا انتخاب کریں
 DocType: Employee Education,Under Graduate,گریجویٹ کے تحت
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,براہ کرم انسانی حقوق کی ترتیبات میں چھوڑ اسٹیٹ نوٹیفیکیشن کے لئے ڈیفالٹ سانچے مقرر کریں.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ہدف پر
 DocType: BOM,Total Cost,کل لاگت
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,ملازم قرض
 DocType: Fee Schedule,Send Payment Request Email,ای میل ادائیگی کی درخواست بھیجیں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} آئٹم نظام میں موجود نہیں ہے یا ختم ہو گیا ہے
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,ریل اسٹیٹ کی
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,کامیابی سے غیر رجسٹرڈ.
 DocType: Assessment Result,Grade,گریڈ
 DocType: Restaurant Table,No of Seats,نشستوں کی تعداد
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","متحرک موضوع کو شامل کرنے کے لئے، جینجا ٹیگ استعمال کریں <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,سپلائر کی طرف سے نجات بخشی
 DocType: Asset Maintenance Task,Asset Maintenance Task,اثاثہ بحالی کا کام
 DocType: SMS Center,All Contact,تمام رابطہ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,سالانہ تنخواہ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,سالانہ تنخواہ
 DocType: Daily Work Summary,Daily Work Summary,روز مرہ کے کام کا خلاصہ
 DocType: Period Closing Voucher,Closing Fiscal Year,مالی سال بند
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,اسٹاک اخراجات
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,اسٹاک اخراجات
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,کے ھدف گودام کریں
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,کے ھدف گودام کریں
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,داخل کریں ترجیحی رابطہ ای میل
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,داخل کریں ترجیحی رابطہ ای میل
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,برعکس انٹری
 DocType: Journal Entry Account,Credit in Company Currency,کمپنی کرنسی میں کریڈٹ
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,ابتدائی پتہ
 DocType: Production Plan,Material Request Detail,مواد کی درخواست کی تفصیل
 DocType: Selling Settings,Default Quotation Validity Days,پہلے سے طے شدہ کوٹمنٹ والوتی دن
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: Sales Invoice,Change Amount,رقم تبدیل
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,ڈرائیونگ لائسنس زمرہ جات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,ڈلیوری کی تاریخ درج کریں
 DocType: Depreciation Schedule,Make Depreciation Entry,ہراس اندراج
+DocType: HR Settings,Leave Settings,ترتیبات چھوڑ دو
 DocType: Appraisal Template Goal,KRA,سے Kra
 DocType: Lead,Request Type,درخواست کی قسم
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,ملازم بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,نشریات
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS کی سیٹ اپ موڈ (آن لائن / آف لائن)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,کام کے حکم کے خلاف وقت کی لاگت کی تخلیق کو غیر فعال کرتا ہے. آپریشن آرڈر کے خلاف کارروائی نہیں کی جائے گی
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,پھانسی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,پھانسی
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,آپریشن کی تفصیلات سے کئے گئے.
 DocType: Asset Maintenance Log,Maintenance Status,بحالی رتبہ
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,رکنیت کی تفصیلات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: پائیدار اکاؤنٹ {2} کے خلاف سپلائر کی ضرورت ہے
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,اشیا اور قیمتوں کا تعین
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},کل گھنٹے: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},تاریخ سے مالیاتی سال کے اندر اندر ہونا چاہئے. تاریخ سے سنبھالنے = {0}
 DocType: Drug Prescription,Interval,وقفہ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,پسند
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,پسند
 DocType: Grant Application,Individual,انفرادی
 DocType: Academic Term,Academics User,ماہرین تعلیم یوزر
 DocType: Cheque Print Template,Amount In Figure,پیکر میں رقم
-DocType: Employee Loan Application,Loan Info,قرض کی معلومات
+DocType: Loan Application,Loan Info,قرض کی معلومات
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,بحالی کے دوروں کے لئے منصوبہ بندی.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,سپلائر اسکور کارڈ کا دورہ
 DocType: Share Transfer,Share Transfer,اشتراک ٹرانسفر
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,آئٹم سانچہ
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,بایو کیمسٹری
 DocType: Job Offer,Select Terms and Conditions,منتخب کریں شرائط و ضوابط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,آؤٹ ویلیو
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,آؤٹ ویلیو
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ترتیبات
 DocType: Production Plan,Sales Orders,فروخت کے احکامات
 DocType: Purchase Taxes and Charges,Valuation,تشخیص
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,پہلے سے طے شدہ علاقہ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ٹیلی ویژن
 DocType: Work Order Operation,Updated via 'Time Log',&#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,کسٹمر یا سپلائر منتخب کریں.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,اس ٹرانزیکشن کے لئے سیریز
 DocType: Company,Enable Perpetual Inventory,ہمیشہ انوینٹری فعال
+DocType: Bank Guarantee,Charges Incurred,الزامات لگے گئے ہیں
 DocType: Company,Default Payroll Payable Account,پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,ای میل تازہ کاری گروپ
 DocType: Sales Invoice,Is Opening Entry,انٹری افتتاح ہے
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,اپنی مرضی کے نتائج
 DocType: Delivery Stop,Contact Name,رابطے کا نام
 DocType: Course Assessment Criteria,Course Assessment Criteria,بلاشبہ تشخیص کا معیار
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,ٹیکس شناخت:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,ٹیکس شناخت:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,طالب علم کی شناخت:
 DocType: POS Customer Group,POS Customer Group,POS گاہک گروپ
 DocType: Land Unit,Land Unit describing various land assets,زمینی یونٹ مختلف زمین کے اثاثوں کی وضاحت کرتے ہیں
@@ -375,9 +372,8 @@
 ,Open Work Orders,کھولیں کام آرڈر
 DocType: Payment Term,Credit Months,کریڈٹ مہینے
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,نیٹ پے 0 سے کم نہیں ہو سکتا
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",سسٹم سے بار بار غلطی کی اطلاعات بھیجنے سے روکنے کے لئے، ہم نے رکنیت میں معذور فیلڈ کی جانچ پڑتال کی ہے
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,سال پتے فی
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,سال پتے فی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,صف {0}: براہ مہربانی چیک کریں کے اکاؤنٹ کے خلاف &#39;ایڈوانس ہے&#39; {1} اس پیشگی اندراج ہے.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
 DocType: Email Digest,Profit & Loss,منافع اور نقصان
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,برائے مہربانی طالب علموں کے طلبا کے تحت طلب کریں
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,بینک لکھے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,چھوڑ کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,بینک لکھے
 DocType: Crop,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
 DocType: Stock Entry,Sales Invoice No,فروخت انوائس کوئی
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,طالب علم گروپ کی تخلیق کا آلہ کورس
 DocType: Lead,Do Not Contact,سے رابطہ نہیں کرتے
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,آپ کی تنظیم میں پڑھانے والے لوگ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,سافٹ ویئر ڈویلپر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,سافٹ ویئر ڈویلپر
 DocType: Item,Minimum Order Qty,کم از کم آرڈر کی مقدار
 DocType: Pricing Rule,Supplier Type,پردایک قسم
 DocType: Course Scheduling Tool,Course Start Date,کورس شروع کرنے کی تاریخ
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,حب میں شائع
 DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,خریداری کی تفصیلات
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,زیادہ سے زیادہ گریڈ
 DocType: Email Digest,New Quotations,نئی کوٹیشن
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,ترجیحی ای میل ملازم میں منتخب کی بنیاد پر ملازم کو ای میلز تنخواہ کی پرچی
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,فہرست میں پہلے رخصت کی منظوری دینے والا پہلے سے طے شدہ چھوڑ گواہ کے طور پر قائم کیا جائے گا
 DocType: Tax Rule,Shipping County,شپنگ کاؤنٹی
-apps/erpnext/erpnext/config/desktop.py +167,Learn,جانیے
+apps/erpnext/erpnext/config/desktop.py +159,Learn,جانیے
 DocType: Asset,Next Depreciation Date,اگلا ہراس تاریخ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فی ملازم سرگرمی لاگت
 DocType: Accounts Settings,Settings for Accounts,اکاؤنٹس کے لئے ترتیبات
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بقایا چیک اور صاف کرنے کے لئے جمع
 DocType: Item,Synced With Hub,حب کے ساتھ موافقت پذیر
 DocType: Driver,Fleet Manager,فلیٹ مینیجر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},قطار # {0}: {1} شے کے لئے منفی نہیں ہوسکتا ہے {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},قطار # {0}: {1} شے کے لئے منفی نہیں ہوسکتا ہے {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,غلط شناختی لفظ
 DocType: Item,Variant Of,کے مختلف
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
@@ -474,7 +469,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},براہ کرم ہوٹل روم کی شرح مقرر کریں {}
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Opening Invoice Creation Tool,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,ترسیل کے نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,ترسیل کے نوٹ
 DocType: Consultation,Encounter Impression,تصادم کا اثر
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ٹیکس قائم
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,فروخت اثاثہ کی قیمت
@@ -502,11 +497,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,کسٹمر کرنسی کسٹمر کی بنیاد کرنسی تبدیل کیا جاتا ہے جس میں شرح
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس شیڈولنگ کا آلہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[متوقع]٪ s کے لئے دوبارہ بارش٪ s بنانے میں خرابی
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
 DocType: Land Unit,LInked Analysis,LInked تجزیہ
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,درخواست کا دورہ دو مختص ریکارڈوں میں نہیں ہوسکتا ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,درخواست کا دورہ دو مختص ریکارڈوں میں نہیں ہوسکتا ہے
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
@@ -520,7 +514,7 @@
 DocType: Purchase Order,% Received,٪ موصول
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,طلبہ تنظیموں بنائیں
 DocType: Volunteer,Weekends,اختتام ہفتہ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,کریڈٹ نوٹ رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,کریڈٹ نوٹ رقم
 DocType: Setup Progress Action,Action Document,ایکشن دستاویز
 DocType: Chapter Member,Website URL,ویب سائٹ URL
 ,Finished Goods,تیار اشیاء
@@ -534,6 +528,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ڈیمو
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,مادے کا اضافہ
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,آئٹم کے معیار معائنہ پیرامیٹر
+DocType: Leave Application,Leave Approver Name,منظوری دینے والا چھوڑ دو نام
 DocType: Depreciation Schedule,Schedule Date,شیڈول تاریخ
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",آمدنی، کٹوتی اور دیگر تنخواہ کے اجزاء
 DocType: Packed Item,Packed Item,پیک آئٹم
@@ -550,7 +545,7 @@
 DocType: Request for Quotation,Request for Quotation,کوٹیشن کے لئے درخواست
 DocType: Healthcare Settings,Require Lab Test Approval,لیب ٹیسٹ کی منظوری کی ضرورت ہے
 DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,کل بقایا
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,کل بقایا
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
 DocType: Dosage Strength,Strength,طاقت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,ایک نئے گاہک بنائیں
@@ -563,7 +558,7 @@
 DocType: Workstation,Consumable Cost,فراہمی لاگت
 DocType: Purchase Receipt,Vehicle Date,گاڑی تاریخ
 DocType: Student Log,Medical,میڈیکل
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,کھونے کے لئے کی وجہ سے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,کھونے کے لئے کی وجہ سے
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,اکاؤنٹ نمبر اپ ڈیٹ کریں
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,لیڈ مالک لیڈ کے طور پر ہی نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
@@ -573,11 +568,10 @@
 DocType: Lab Test Template,Single,سنگل
 DocType: Salary Slip,Total Loan Repayment,کل قرض کی واپسی
 DocType: Account,Cost of Goods Sold,فروخت سامان کی قیمت
-DocType: Subscription,Yearly,سالانہ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لاگت مرکز درج کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,لاگت مرکز درج کریں
 DocType: Drug Prescription,Dosage,خوراک
 DocType: Journal Entry Account,Sales Order,سیلز آرڈر
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,اوسط. فروخت کی شرح
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,اوسط. فروخت کی شرح
 DocType: Assessment Plan,Examiner Name,آڈیٹر نام
 DocType: Lab Test Template,No Result,کوئی نتیجہ
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار اور شرح
@@ -586,6 +580,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,پہلی کمپنی کا نام درج کریں
 DocType: Purchase Invoice,Supplier Name,سپلائر کے نام
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext دستی پڑھیں
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,کیلنڈر میں تمام محکمہ اراکین کی چھلانگ دکھائیں
 DocType: Purchase Invoice,01-Sales Return,01 سیلز واپسی
 DocType: Account,Is Group,ہے گروپ
 DocType: Email Digest,Pending Purchase Orders,خریداری کے آرڈر زیر التوا
@@ -603,13 +598,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,لازمی فیلڈ - تعلیمی سال
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{2} {1} سے متعلق نہیں ہے {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,اس ای میل کا ایک حصہ کے طور پر چلا جاتا ہے کہ تعارفی متن کی تخصیص کریں. ہر ٹرانزیکشن ایک علیحدہ تعارفی متن ہے.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},کمپنی کے لیے ڈیفالٹ قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},کمپنی کے لیے ڈیفالٹ قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},کام آرڈر {0} کو روکنے کے خلاف ٹرانزیکشن کی اجازت نہیں دی گئی
 DocType: Setup Progress Action,Min Doc Count,کم از کم ڈیک شمار
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تمام مینوفیکچرنگ کے عمل کے لئے عالمی ترتیبات.
 DocType: Accounts Settings,Accounts Frozen Upto,منجمد تک اکاؤنٹس
 DocType: SMS Log,Sent On,پر بھیجا
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
@@ -633,8 +628,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,فروخت کے لئے محفوظ
 DocType: Packing Slip,From Package No.,پیکیج نمبر سے
 DocType: Item Attribute,To Range,کی حد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,سیکورٹیز اور جمع
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",کچھ آئٹمز کے خلاف لین دین جو نہیں ہے جس سے ہیں کے طور پر، تشخیص کا طریقہ تبدیل نہیں ہوسکتی کی اپنی تشخیص کا طریقہ ہے
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,سیکورٹیز اور جمع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",کچھ آئٹمز کے خلاف لین دین جو نہیں ہے جس سے ہیں کے طور پر، تشخیص کا طریقہ تبدیل نہیں ہوسکتی کی اپنی تشخیص کا طریقہ ہے
 DocType: Student Report Generation Tool,Attended by Parents,والدین کی طرف سے شرکت کی
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مختص کل پتے لازمی ہے
 DocType: Patient,AB Positive,AB مثبت
@@ -643,7 +638,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,حاضری کا ریکارڈ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet بنیاد پے رول کے لئے تنخواہ کے اجزاء.
 DocType: Sales Order Item,Used for Production Plan,پیداوار کی منصوبہ بندی کے لئے استعمال کیا جاتا ہے
-DocType: Employee Loan,Total Payment,کل ادائیگی
+DocType: Loan,Total Payment,کل ادائیگی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,مکمل کام کے آرڈر کے لئے ٹرانزیکشن منسوخ نہیں کر سکتا.
 DocType: Manufacturing Settings,Time Between Operations (in mins),(منٹ میں) آپریشنز کے درمیان وقت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} لہذا کارروائی مکمل نہیں کیا جا سکتا ہے منسوخ کر دیا ہے
@@ -659,16 +654,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,آپ کے گاہکوں میں سے چند ایک کی فہرست. وہ تنظیموں یا افراد کے ہو سکتا ہے.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس بہت کچھ حصوں کی تعمیر
 DocType: POS Profile User,POS Profile User,POS پروفائل صارف
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,براہ راست آمدنی
+DocType: Subscription Invoice,Subscription Invoice,سبسکرپشن انوائس
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,براہ راست آمدنی
 DocType: Patient Appointment,Date TIme,تاریخ وقت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",اکاؤنٹ کی طرف سے گروپ ہے، اکاؤنٹ کی بنیاد پر فلٹر نہیں کر سکتے ہیں
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ایڈمنسٹریٹو آفیسر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,ایڈمنسٹریٹو آفیسر
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,کمپنی اور ٹیکس قائم کرنا
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
 DocType: Codification Table,Codification Table,کوڈڈیکشن ٹیبل
 DocType: Timesheet Detail,Hrs,بجے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,کمپنی کا انتخاب کریں
 DocType: Stock Entry Detail,Difference Account,فرق اکاؤنٹ
 DocType: Purchase Invoice,Supplier GSTIN,سپلائر GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
@@ -694,6 +690,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,کیش فلو تعریفیں سانچہ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
 DocType: Journal Entry,Difference (Dr - Cr),فرق (ڈاکٹر - CR)
+DocType: Bank Guarantee,Providing,فراہم کرنا
 DocType: Account,Profit and Loss,نفع اور نقصان
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",اجازت نہیں ہے، ضرورت کے مطابق لیب ٹیسٹ سانچہ کو ترتیب دیں
 DocType: Patient,Risk Factors,خطرہ عوامل
@@ -725,7 +722,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,سپلائر انوائس کوئی
 DocType: Territory,For reference,حوالے کے لیے
 DocType: Healthcare Settings,Appointment Confirmation,تقرری کی تصدیق
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",حذف نہیں کرسکتے ہیں سیریل کوئی {0}، یہ اسٹاک لین دین میں استعمال کیا جاتا ہے کے طور پر
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",حذف نہیں کرسکتے ہیں سیریل کوئی {0}، یہ اسٹاک لین دین میں استعمال کیا جاتا ہے کے طور پر
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),بند (CR)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,ہیلو
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,منتقل آئٹم
@@ -750,11 +747,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",پہلے ہی صارف پروفائل {1} کے لئے {0} پے پروفائل میں ڈیفالٹ مقرر کیا ہے، تو پہلے سے طے شدہ طور پر غیر فعال کر دیا گیا ہے
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع اقدار
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,پی او ایس پروفائل میں علاقے کی ضرورت ہے
 DocType: Supplier,Prevent RFQs,آر ایف پی کی روک تھام
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,سیلز آرڈر بنائیں
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},تنخواہ پرچی {0} سے {1} کی مدت کے لئے پیش کی گئی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},تنخواہ پرچی {0} سے {1} کی مدت کے لئے پیش کی گئی
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
@@ -775,8 +772,9 @@
 DocType: Sales Invoice,Shipping Bill Date,شپنگ بل کی تاریخ
 DocType: Production Plan,Production Plan,پیداوار کی منصوبہ بندی
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,افتتاحی انوائس تخلیق کا آلہ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,سیلز واپس
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,سیلز واپس
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوٹ: کل روانہ مختص {0} پہلے ہی منظور پتیوں سے کم نہیں ہونا چاہئے {1} مدت کے لئے
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,سیریل نمبر ان پٹ پر مبنی ٹرانزیکشن میں مقدار مقرر کریں
 ,Total Stock Summary,کل اسٹاک خلاصہ
 DocType: Announcement,Posted By,کی طرف سے پوسٹ
 DocType: Item,Delivered by Supplier (Drop Ship),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
@@ -787,7 +785,7 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,کمپنی قائم کی مہربانی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,کمپنی قائم کی مہربانی
@@ -795,8 +793,8 @@
 DocType: Purchase Order Item,Billed Amt,بل AMT
 DocType: Training Result Employee,Training Result Employee,تربیت کا نتیجہ ملازم
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,اسٹاک اندراجات بنا رہے ہیں جس کے خلاف ایک منطقی گودام.
-DocType: Repayment Schedule,Principal Amount,اصل رقم
-DocType: Employee Loan Application,Total Payable Interest,کل قابل ادائیگی دلچسپی
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,اصل رقم
+DocType: Loan Application,Total Payable Interest,کل قابل ادائیگی دلچسپی
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},کل بقایا: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فروخت انوائس Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
@@ -805,10 +803,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
 DocType: Restaurant Reservation,Restaurant Reservation,ریسٹورانٹ ریزرویشن
 DocType: Land Unit,Land Unit Name,زمینی یونٹ کا نام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,تجویز تحریری طور پر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,تجویز تحریری طور پر
 DocType: Payment Entry Deduction,Payment Entry Deduction,ادائیگی انٹری کٹوتی
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,ختم کرو
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,گاہکوں کو ای میل کے ذریعے مطلع کریں
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,گاہکوں کو ای میل کے ذریعے مطلع کریں
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ایک فروخت شخص {0} اسی ملازم ID کے ساتھ موجود
 DocType: Employee Advance,Claimed Amount,دعوی رقم
 apps/erpnext/erpnext/config/education.py +180,Masters,ماسٹرز
@@ -827,13 +825,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",ادائیگی کے گیٹ وے اکاؤنٹ نہیں، دستی طور پر ایک بنانے کے لئے براہ مہربانی.
 DocType: Supplier Scorecard,Per Year,سالانہ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,DOB کے مطابق اس پروگرام میں داخل ہونے کے اہل نہیں
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Sales Invoice,Sales Taxes and Charges,سیلز ٹیکس اور الزامات
 DocType: Employee,Organization Profile,تنظیم پروفائل
 DocType: Vital Signs,Height (In Meter),اونچائی (میٹر میں)
 DocType: Student,Sibling Details,بھائی کی تفصیلات دیکھیں
 DocType: Vehicle Service,Vehicle Service,گاڑی کی خدمت
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,خود کار طریقے سے حالات کی بنیاد پر فیڈ بیک کی درخواست تحریک.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,خود کار طریقے سے حالات کی بنیاد پر فیڈ بیک کی درخواست تحریک.
 DocType: Employee,Reason for Resignation,استعفی کی وجہ
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,کارکردگی تشخیص کے لئے سانچہ.
 DocType: Sales Invoice,Credit Note Issued,کریڈٹ نوٹ اجراء
@@ -848,10 +845,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,بحالی کے شیڈول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",پھر قیمتوں کا تعین قواعد وغیرہ کسٹمر، کسٹمر گروپ، علاقہ، سپلائر، سپلائر کی قسم، مہم، سیلز پارٹنر کی بنیاد پر فلٹر کر رہے ہیں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,انوینٹری میں خالص تبدیلی
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,ملازم قرض کے انتظام
 DocType: Employee,Passport Number,پاسپورٹ نمبر
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ساتھ تعلق
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,مینیجر
 DocType: Payment Entry,Payment From / To,/ سے ادائیگی
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},کسٹمر کے لئے موجودہ کریڈٹ کی حد سے کم نئی کریڈٹ کی حد کم ہے. کریڈٹ کی حد کم از کم ہے {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},برائے مہربانی گودام میں اکاؤنٹ مقرر کریں {0}
@@ -893,24 +889,24 @@
 DocType: Item,Material Transfer,مواد کی منتقلی
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,راستہ تلاش نہیں کر سکا
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),افتتاحی (ڈاکٹر)
+DocType: Loan,Applicant,درخواست دہندگان
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},پوسٹنگ ٹائمسٹیمپ کے بعد ہونا ضروری ہے {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,ریورسنگ دستاویزات بنانے کے لئے
 ,GST Itemised Purchase Register,GST آئٹمائزڈ خریداری رجسٹر
 DocType: Course Scheduling Tool,Reschedule,تجزیہ کریں
-DocType: Employee Loan,Total Interest Payable,کل سود قابل ادائیگی
+DocType: Loan,Total Interest Payable,کل سود قابل ادائیگی
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,لینڈڈ لاگت ٹیکسز اور چارجز
 DocType: Work Order Operation,Actual Start Time,اصل وقت آغاز
 DocType: BOM Operation,Operation Time,آپریشن کے وقت
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,ختم
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,بنیاد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,بنیاد
 DocType: Timesheet,Total Billed Hours,کل بل گھنٹے
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,رقم لکھیں
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,رقم لکھیں
 DocType: Leave Block List Allow,Allow User,صارف کی اجازت
 DocType: Journal Entry,Bill No,بل نہیں
 DocType: Company,Gain/Loss Account on Asset Disposal,ایسیٹ تلفی پر حاصل / نقصان کے اکاؤنٹ
 DocType: Vehicle Log,Service Details,سروس کی تفصیلات دیکھیں
 DocType: Vehicle Log,Service Details,سروس کی تفصیلات دیکھیں
-DocType: Subscription,Quarterly,سہ ماہی
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,گروپ
 DocType: Selling Settings,Delivery Note Required,ترسیل کے نوٹ کی ضرورت ہے
@@ -922,7 +918,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,وقت شیٹ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مال کی بنیاد پر
 DocType: Sales Invoice,Port Code,پورٹ کوڈ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,ریزرو گودام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,ریزرو گودام
 DocType: Lead,Lead is an Organization,لیڈ تنظیم ہے
 DocType: Guardian Interest,Interest,دلچسپی
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پہلی فروخت
@@ -934,12 +930,12 @@
 DocType: Account,Accounts,اکاؤنٹس
 DocType: Vehicle,Odometer Value (Last),odometer قیمت (سابقہ)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,سپلائر سکور کارڈ کے معیار کے سانچے.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,مارکیٹنگ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,مارکیٹنگ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,ادائیگی انٹری پہلے ہی تخلیق کیا جاتا ہے
 DocType: Request for Quotation,Get Suppliers,سپلائرز حاصل کریں
 DocType: Purchase Receipt Item Supplied,Current Stock,موجودہ اسٹاک
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
 DocType: Account,Expenses Included In Valuation,اخراجات تشخیص میں شامل
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,اگر آپ کی رکنیت 30 دن کے اندر ختم ہوتی ہے تو آپ صرف تجدید کرسکتے ہیں
@@ -949,7 +945,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,صرف منتخب کریں اگر آپ نے کیش فلو میپر دستاویزات کو سیٹ اپ کیا ہے
 DocType: Email Digest,Next email will be sent on:,پیچھے اگلا، دوسرا ای میل پر بھیجا جائے گا:
 DocType: Supplier Scorecard,Per Week,فی ہفتہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,آئٹم مختلف حالتوں ہے.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,کل طالب علم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
@@ -970,9 +966,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,کریڈٹ کارڈ انٹری
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,کمپنی اور اکاؤنٹس
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,قدر میں
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,قدر میں
 DocType: Asset Settings,Depreciation Options,استحصال کے اختیارات
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,غلط پوسٹنگ وقت
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,غلط پوسٹنگ وقت
 DocType: Lead,Campaign Name,مہم کا نام
 DocType: Hotel Room,Capacity,صلاحیت
 DocType: Selling Settings,Close Opportunity After Days,دن کے بعد موقع بند کریں
@@ -997,7 +993,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,گاہک کی خریداری آرڈر نمبر
 DocType: Budget,Budget Against,بجٹ کے خلاف
 DocType: Employee,Cell Number,سیل نمبر
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,دیئے گئے معیار کے لئے کوئی ملازم نہیں ہے. چیک کریں کہ تنخواہ سلپس پہلے ہی نہیں بنائی گئی ہیں.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,دیئے گئے معیار کے لئے کوئی ملازم نہیں ہے. چیک کریں کہ تنخواہ سلپس پہلے ہی نہیں بنائی گئی ہیں.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,آٹو مواد درخواستوں پیدا
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,کھو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,آپ کے کالم &#39;جرنل اندراج کے خلاف&#39; میں موجودہ واؤچر داخل نہیں ہو سکتا
@@ -1010,13 +1006,14 @@
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,براہ کرم میز منتخب کریں
 DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
 DocType: Special Test Items,Particulars,نصاب
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: سے {0} قسم کا {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: سے {0} قسم کا {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",اسی معیار کے ساتھ ایک سے زیادہ قیمت کے قوانین موجود ہیں، براہ کرم ترجیحات کو تفویض کرکے تنازعات کو حل کریں. قیمت کے قواعد: {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
 DocType: Asset,Maintenance,بحالی
+DocType: Subscriber,Subscriber,سبسکرائب
 DocType: Item Attribute Value,Item Attribute Value,شے کی قیمت خاصیت
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,براہ کرم اپنی پراجیکٹ کی حیثیت کو اپ ڈیٹ کریں
 DocType: Item,Maximum sample quantity that can be retained,زیادہ سے زیادہ نمونہ کی مقدار جو برقرار رکھی جا سکتی ہے
@@ -1054,26 +1051,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,خریداری کی ٹوکری کے لئے پہلے سے طے شدہ ترتیبات
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Timeslots شامل کریں
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},جرنل انٹری {0} کے ذریعے گرا دیا اثاثہ
-DocType: Employee Loan,Interest Income Account,سودی آمدنی اکاؤنٹ
+DocType: Loan,Interest Income Account,سودی آمدنی اکاؤنٹ
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,دعوت نامہ بھیجنے کا جائزہ لیں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,جیو ٹیکنالوجی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,آفس دیکھ بھال کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,آفس دیکھ بھال کے اخراجات
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,کے پاس جاؤ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ای میل اکاؤنٹ سیٹ اپ کیا
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,پہلی شے داخل کریں
 DocType: Asset Repair,Downtime,Downtime
 DocType: Account,Liability,ذمہ داری
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,تعلیمی اصطلاح:
 DocType: Salary Detail,Do not include in total,کل میں شامل نہ کریں
 DocType: Company,Default Cost of Goods Sold Account,سامان فروخت اکاؤنٹ کے پہلے سے طے شدہ لاگت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},نمونہ مقدار {0} وصول شدہ مقدار سے زیادہ نہیں ہوسکتا ہے {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,قیمت کی فہرست منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Request for Quotation Supplier,Send Email,ای میل بھیجیں
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
 DocType: Item,Max Sample Quantity,زیادہ سے زیادہ نمونہ مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,کوئی اجازت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,کوئی اجازت
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,اقتباس کی درخواست
 DocType: Vital Signs,Heart Rate / Pulse,دل کی شرح / پلس
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
@@ -1084,12 +1081,11 @@
 DocType: Item,Items with higher weightage will be shown higher,اعلی اہمیت کے ساتھ اشیاء زیادہ دکھایا جائے گا
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,لیب ٹیسٹ اور اہم نشانیاں
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بینک مصالحتی تفصیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,کوئی ملازم پایا
-DocType: Subscription,Stopped,روک
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,پراجیکٹ اپ ڈیٹ
 DocType: SMS Center,All Customer Contact,تمام کسٹمر رابطہ
 DocType: Land Unit,Tree Details,درخت کی تفصیلات دیکھیں
@@ -1139,7 +1135,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,تمام آئٹم گروپس
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
 DocType: Work Order,Item To Manufacture,اشیاء تیار کرنے کے لئے
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} {2} درجا ہے
@@ -1153,7 +1148,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",منتخب کرنے کے بعد، منتخب کردہ ایڈریس کو بچانے کے بعد میں ترمیم کیا جاتا ہے
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 DocType: Item,Hub Publishing Details,ہب پبلشنگ کی تفصیلات
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',افتتاحی'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',افتتاحی'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
 DocType: Lab Test Template,Result Format,نتیجہ کی شکل
@@ -1163,7 +1158,7 @@
 DocType: Payroll Entry,Bimonthly,دو ماہی
 DocType: Vehicle Service,Brake Pad,وقفے پیڈ
 DocType: Fertilizer,Fertilizer Contents,کھاد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,بل رقم
 DocType: Company,Registration Details,رجسٹریشن کی تفصیلات
 DocType: Timesheet,Total Billed Amount,کل بل کی رقم
@@ -1177,7 +1172,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,سیلز آرڈر پر کریڈٹ کی حد چیک کریں
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,کارکردگی تشخیص.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",کو چالو کرنے کے طور پر خریداری کی ٹوکری چالو حالت میں ہے، &#39;خریداری کی ٹوکری کے لئے استعمال کریں&#39; اور خریداری کی ٹوکری کے لئے کم از کم ایک ٹیکس حکمرانی نہیں ہونا چاہئے
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ادائیگی انٹری {0} آرڈر {1}، اسے اس انوائس میں پیشگی کے طور پر نکالا جانا چاہئے تو چیک خلاف منسلک ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ادائیگی انٹری {0} آرڈر {1}، اسے اس انوائس میں پیشگی کے طور پر نکالا جانا چاہئے تو چیک خلاف منسلک ہے.
 DocType: Sales Invoice Item,Stock Details,اسٹاک کی تفصیلات
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,پروجیکٹ ویلیو
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,پوائنٹ کے فروخت
@@ -1211,7 +1206,7 @@
 DocType: Restaurant Table,Minimum Seating,کم سے کم نشست
 DocType: Item Attribute,Item Attribute Values,آئٹم خاصیت فہرست
 DocType: Examination Result,Examination Result,امتحان کے نتائج
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,خریداری کی رسید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,خریداری کی رسید
 ,Received Items To Be Billed,موصول ہونے والی اشیاء بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,کرنسی کی شرح تبادلہ ماسٹر.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},حوالۂ ڈاٹپائپ میں سے ایک ہونا لازمی ہے {0}
@@ -1219,15 +1214,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
 DocType: Work Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,منتقلی کے لئے دستیاب اشیاء نہیں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,منتقلی کے لئے دستیاب اشیاء نہیں
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),بند (کھولنے + کل)
 DocType: Journal Entry,Depreciation Entry,ہراس انٹری
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,پہلی دستاویز کی قسم منتخب کریں
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,اس کی بحالی کا منسوخ کرنے سے پہلے منسوخ مواد دورہ {0}
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 معیار
 DocType: Pricing Rule,Rate or Discount,شرح یا ڈسکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سیریل نمبر {0} آئٹم سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},سیریل نمبر {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوبہ مقدار
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,پسندیدہ
 DocType: Hub Settings,Custom Data,اپنی مرضی کے مطابق ڈیٹا
@@ -1239,9 +1234,9 @@
 DocType: Medical Code,Medical Code Standard,میڈیکل کوڈ سٹینڈرڈ
 DocType: Soil Texture,Clay Composition (%),مٹی ساخت (٪)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,کام کو تفویض کرنے سے قبل براہ کرم محفوظ کریں.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,بیلنس ویلیو
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,بیلنس ویلیو
 DocType: Lab Test,Lab Technician,ماہر تجربہ گاہ
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,سیلز قیمت کی فہرست
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,سیلز قیمت کی فہرست
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",اگر جانچ پڑتال ہو تو، ایک کسٹمر تخلیق کیا جائے گا، مریض کو نقدی. اس گاہک کے خلاف مریض انوائس بنائے جائیں گے. آپ مریض پیدا کرنے کے دوران موجودہ کسٹمر بھی منتخب کرسکتے ہیں.
 DocType: Bank Reconciliation,Account Currency,اکاؤنٹ کی کرنسی
@@ -1249,16 +1244,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,کمپنی میں گول آف اکاؤنٹ کا ذکر کریں
 DocType: Purchase Receipt,Range,رینج
 DocType: Supplier,Default Payable Accounts,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹس
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
 DocType: Item Barcode,Item Barcode,آئٹم بارکوڈ
 DocType: Woocommerce Settings,Endpoints,اختتام
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},براہ مہربانی آئٹم {0} میں اثاثہ زمرہ درج کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",پیدا کرنے کے لئے. اگر تاخیر ہو تو، آپ کو دستی طور پر &quot;مہینے کے دن پر دوپہر&quot; کو تبدیل کرنا پڑے گا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
 DocType: Share Transfer,From Folio No,فولیو نمبر سے
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: کریڈٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
@@ -1293,16 +1286,17 @@
 DocType: Asset,Available-for-use Date,استعمال کے لئے دستیاب تاریخ
 DocType: Guardian,Guardian Name,سرپرست کا نام
 DocType: Cheque Print Template,Has Print Format,پرنٹ کی شکل ہے
-DocType: Employee Loan,Sanctioned,منظور
+DocType: Loan,Sanctioned,منظور
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ موجودنھئں
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},صف # {0}: شے کے لئے کوئی سیریل کی وضاحت کریں {1}
 DocType: Crop Cycle,Crop Cycle,فصل کا سائیکل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",&#39;پروڈکٹ بنڈل&#39; اشیاء، گودام، سیریل نمبر اور بیچ کے لئے نہیں &#39;پیکنگ کی فہرست کی میز سے غور کیا جائے گا. گودام اور بیچ کسی بھی &#39;پروڈکٹ بنڈل&#39; شے کے لئے تمام پیکنگ اشیاء کے لئے ایک ہی ہیں، ان اقدار بنیادی شے کے ٹیبل میں داخل کیا جا سکتا، اقدار ٹیبل &#39;پیکنگ کی فہرست&#39; کے لئے کاپی کیا جائے گا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",&#39;پروڈکٹ بنڈل&#39; اشیاء، گودام، سیریل نمبر اور بیچ کے لئے نہیں &#39;پیکنگ کی فہرست کی میز سے غور کیا جائے گا. گودام اور بیچ کسی بھی &#39;پروڈکٹ بنڈل&#39; شے کے لئے تمام پیکنگ اشیاء کے لئے ایک ہی ہیں، ان اقدار بنیادی شے کے ٹیبل میں داخل کیا جا سکتا، اقدار ٹیبل &#39;پیکنگ کی فہرست&#39; کے لئے کاپی کیا جائے گا.
 DocType: Student Admission,Publish on website,ویب سائٹ پر شائع کریں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,سپلائر انوائس تاریخ پوسٹنگ کی تاریخ سے زیادہ نہیں ہو سکتا
+DocType: Subscription,Cancelation Date,منسوخ تاریخ
 DocType: Purchase Invoice Item,Purchase Order Item,آرڈر شے کی خریداری
 DocType: Agriculture Task,Agriculture Task,زراعت کا کام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,بالواسطہ آمدنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,بالواسطہ آمدنی
 DocType: Student Attendance Tool,Student Attendance Tool,طلبا کی حاضری کا آلہ
 DocType: Restaurant Menu,Price List (Auto created),قیمت کی فہرست (آٹو تخلیق)
 DocType: Cheque Print Template,Date Settings,تاریخ کی ترتیبات
@@ -1329,6 +1323,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,میٹر
 DocType: Workstation,Electricity Cost,بجلی کی لاگت
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,لیبار ٹیسٹنگ ڈیٹیٹ ٹائم کی تاریخ سے پہلے جمع نہیں ہوسکتی ہے
+DocType: Subscription Plan,Cost,لاگت
 DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگرہ کی یاددہانیاں نہ بھیجیں
 DocType: Expense Claim,Total Advance Amount,مجموعی رقم کی رقم
 DocType: Delivery Stop,Estimated Arrival,متوقع آمد
@@ -1340,15 +1335,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
 DocType: Timesheet Detail,Bill,بل
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,وائٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,وائٹ
 DocType: SMS Center,All Lead (Open),تمام لیڈ (کھولیں) تیار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,آپ چیک بکس کی فہرست سے زیادہ سے زیادہ ایک اختیار منتخب کرسکتے ہیں.
 DocType: Purchase Invoice,Get Advances Paid,پیشگی ادا کرنے
 DocType: Item,Automatically Create New Batch,خود کار طریقے سے نئی کھیپ بنائیں
 DocType: Item,Automatically Create New Batch,خود کار طریقے سے نئی کھیپ بنائیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} کو {1} کرنے کے لئے (قطار {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,بنائیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} کو {1} کرنے کے لئے (قطار {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,بنائیں
 DocType: Student Admission,Admission Start Date,داخلے شروع کرنے کی تاریخ
 DocType: Journal Entry,Total Amount in Words,الفاظ میں کل رقم
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,نیا کارکن
@@ -1364,7 +1359,7 @@
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 DocType: Repayment Schedule,Balance Loan Amount,بیلنس قرض کی رقم
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,شیڈول کورس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,اسٹاک اختیارات
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,اسٹاک اختیارات
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,خرید آرڈر میں آخری خریداری کی تفصیلات حاصل کرنے کو غیر فعال کریں
 DocType: Journal Entry Account,Expense Claim,اخراجات کا دعوی
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
@@ -1383,11 +1378,12 @@
 DocType: Packing Slip Item,Packing Slip Item,پیکنگ پرچی آئٹم
 DocType: Purchase Invoice,Cash/Bank Account,کیش / بینک اکاؤنٹ
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},وضاحت کریں ایک {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,مختلف تخلیق کی گئی ہے.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} کے لئے کام کا خلاصہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,وصف میز لازمی ہے
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,فہرست میں پہلے سے ہی جانے والے پہلے سے ہی پہلے سے طے شدہ وقت کے طور پر مقرر کی جائے گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Plan,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} منفی نہیں ہو سکتا
 DocType: Training Event,Self-Study,خود مطالعہ
@@ -1400,7 +1396,7 @@
 DocType: Workstation,Wages,اجرتوں
 DocType: Asset Maintenance,Maintenance Manager Name,بحالی مینیجر کا نام
 DocType: Agriculture Task,Urgent,ارجنٹ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},ٹیبل میں قطار {0} کے لئے ایک درست صف ID کی وضاحت براہ کرم {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},ٹیبل میں قطار {0} کے لئے ایک درست صف ID کی وضاحت براہ کرم {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,متغیر تلاش کرنے میں ناکام
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,براہ مہربانی numpad سے ترمیم کرنے کے لئے فیلڈ کا انتخاب کریں
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,اسٹاک لیزر کی تشکیل کے طور پر ایک مقررہ اثاثہ اشیاء نہیں ہوسکتی ہے.
@@ -1412,7 +1408,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,معیار معائنہ سانچہ نام
 DocType: Project,First Email,پہلا ای میل
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,سیلز آرڈر / ختم سامان گودام میں محفوظ گودام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,فروخت رقم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,فروخت رقم
 DocType: Repayment Schedule,Interest Amount,سود کی رقم
 DocType: Serial No,Creation Document No,تخلیق دستاویز
 DocType: Share Transfer,Issue,مسئلہ
@@ -1426,10 +1422,10 @@
 DocType: Tax Rule,Shipping State,شپنگ ریاست
 ,Projected Quantity as Source,ماخذ کے طور پر پیش مقدار
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,ترسیل کا دورہ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,ترسیل کا دورہ
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ٹرانسمیشن کی قسم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,فروخت کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,فروخت کے اخراجات
 DocType: Consultation,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,سٹینڈرڈ خرید
 DocType: GL Entry,Against,کے خلاف
@@ -1438,12 +1434,13 @@
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,زپ کوڈ
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},قرض میں دلچسپی آمدنی کا اکاؤنٹ منتخب کریں {0}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
 DocType: Packing Slip,Net Weight UOM,نیٹ وزن UOM
 DocType: Item,Default Supplier,پہلے سے طے شدہ پردایک
 DocType: Manufacturing Settings,Over Production Allowance Percentage,پیداوار الاؤنس فی صد سے زائد
-DocType: Employee Loan,Repayment Schedule,واپسی کے شیڈول
+DocType: Loan,Repayment Schedule,واپسی کے شیڈول
 DocType: Shipping Rule Condition,Shipping Rule Condition,شپنگ حکمرانی حالت
 DocType: Holiday List,Get Weekly Off Dates,ویکلی آف تاریخوں کو حاصل
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ختم ہونے کی تاریخ شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
@@ -1458,7 +1455,7 @@
 DocType: Education Settings,Attendance Freeze Date,حاضری جھروکے تاریخ
 DocType: Education Settings,Attendance Freeze Date,حاضری جھروکے تاریخ
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,اپنے سپلائرز میں سے چند ایک کی فہرست. وہ تنظیموں یا افراد کے ہو سکتا ہے.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,تمام مصنوعات دیکھیں
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,تمام مصنوعات دیکھیں
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),کم از کم کے لیڈ عمر (دن)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),کم از کم کے لیڈ عمر (دن)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,تمام BOMs
@@ -1467,14 +1464,16 @@
 DocType: Expense Claim,From Employee,ملازم سے
 DocType: Driver,Cellphone Number,موبائل نمبر
 DocType: Project,Monitor Progress,نگرانی کی ترقی
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
 DocType: Journal Entry,Make Difference Entry,فرق اندراج
+DocType: Supplier Quotation,Auto Repeat Section,خود کار طریقے سے سیکشن
 DocType: Upload Attendance,Attendance From Date,تاریخ سے حاضری
 DocType: Appraisal Template Goal,Key Performance Area,کلیدی کارکردگی کے علاقے
 DocType: Program Enrollment,Transportation,نقل و حمل
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,غلط خاصیت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},مقدار {0} سے کم یا برابر ہونا ضروری ہے
+DocType: Department Approver,Department Approver,محکمہ تقریبا
 DocType: SMS Center,Total Characters,کل کردار
 DocType: Employee Advance,Claimed,دعوی کیا
 DocType: Crop,Row Spacing,قطار کی جگہ
@@ -1484,6 +1483,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ادائیگی مصالحتی انوائس
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,شراکت٪
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",خریدنے کی ترتیبات کے مطابق اگر خریداری کی ضرورت ہوتی ہے تو == &#39;ہاں&#39;، پھر خریداری انوائس کی تخلیق کے لۓ، صارف کو شے کے لئے سب سے پہلے خریداری آرڈر تیار کرنے کی ضرورت ہے {0}
+,HSN-wise-summary of outward supplies,بیرونی سامان کی HSN وار - خلاصہ
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,آپ کا حوالہ کے لئے کمپنی کی رجسٹریشن نمبر. ٹیکس نمبر وغیرہ
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
@@ -1497,7 +1497,7 @@
 DocType: Setup Progress Action,Action Name,ایکشن کا نام
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,شروع سال
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN کے پہلے 2 ہندسوں ریاست تعداد کے ساتھ ملنے چاہئے {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,موجودہ انوائس کی مدت کے شروع کرنے کی تاریخ
 DocType: Salary Slip,Leave Without Pay,بغیر تنخواہ چھٹی
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
@@ -1515,25 +1515,25 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,صرف تخلیق کے وقت فیلڈز کو کاپی کیا جائے گا.
 DocType: Setup Progress Action,Domains,ڈومینز
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&#39;اصل تاریخ آغاز&#39; &#39;اصل تاریخ اختتام&#39; سے زیادہ نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,مینجمنٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,مینجمنٹ
 DocType: Cheque Print Template,Payer Settings,بوگتانکرتا ترتیبات
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",یہ مختلف کی آئٹم کوڈ منسلک کیا جائے گا. آپ مخفف &quot;ایس ایم&quot; ہے، اور اگر مثال کے طور پر، شے کے کوڈ &quot;ٹی شرٹ&quot;، &quot;ٹی شرٹ-ایس ایم&quot; ہو جائے گا ویرینٹ کی شے کوڈ آن ہے
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,آپ کو تنخواہ پرچی بچانے بار (الفاظ میں) نیٹ پے نظر آئے گا.
 DocType: Purchase Invoice,Is Return,واپسی ہے
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,احتیاط
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,واپس / ڈیبٹ نوٹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,واپس / ڈیبٹ نوٹ
 DocType: Price List Country,Price List Country,قیمت کی فہرست ملک
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} شے کے لئے درست سیریل نمبر {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,آئٹم کوڈ سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,آئٹم کوڈ سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM تبادلوں فیکٹر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,بیچ نمبر حاصل کرنے آئٹم کوڈ داخل کریں
 DocType: Stock Settings,Default Item Group,پہلے سے طے شدہ آئٹم گروپ
-DocType: Employee Loan,Partially Disbursed,جزوی طور پر زرعی قرضوں کی فراہمی
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,گرانٹ معلومات
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,گرانٹ معلومات
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پردایک ڈیٹا بیس.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,آپ ایک سبسکرپشن کو دوبارہ شروع نہیں کرسکتے جو منسوخ نہیں ہوسکتا.
 DocType: Account,Balance Sheet,بیلنس شیٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
 DocType: Fee Validity,Valid Till,تک مؤثر
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,کل والدین ٹیچر میٹنگ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
@@ -1546,7 +1546,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,صف # {0}: مقدار خریداری واپس میں داخل نہیں کیا جا سکتا مسترد
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,منتخب کسٹمر کے لئے کسٹمر گروپ کو تبدیل کرنے کی اجازت نہیں ہے.
 ,Purchase Order Items To Be Billed,خریداری کے آرڈر اشیا بل بھیجا جائے کرنے کے لئے
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,متوقع آنے والے اوقات کو اپ ڈیٹ کرنا.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,متوقع آنے والے اوقات کو اپ ڈیٹ کرنا.
 DocType: Program Enrollment Tool,Enrollment Details,اندراج کی تفصیلات
 DocType: Purchase Invoice Item,Net Rate,نیٹ کی شرح
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,برائے مہربانی ایک کسٹمر منتخب کریں
@@ -1567,18 +1567,20 @@
 DocType: Global Defaults,Current Fiscal Year,رواں مالی سال
 DocType: Purchase Order,Group same items,گروپ ایک ہی اشیاء
 DocType: Purchase Invoice,Disable Rounded Total,مدور کل غیر فعال
-DocType: Employee Loan Application,Repayment Info,باز ادائیگی کی معلومات
+DocType: Department,Parent Department,والدین کے محکمہ
+DocType: Loan Application,Repayment Info,باز ادائیگی کی معلومات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""entries"" خالی نہیں ہو سکتا"
 DocType: Maintenance Team Member,Maintenance Role,بحالی رول
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},کے ساتھ ڈپلیکیٹ قطار {0} اسی {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},کے ساتھ ڈپلیکیٹ قطار {0} اسی {1}
 ,Trial Balance,مقدمے کی سماعت توازن
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,مالی سال {0} نہیں ملا
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,مالی سال {0} نہیں ملا
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,ملازمین کو مقرر
 DocType: Sales Order,SO-,دینے واال
 DocType: Hotel Room Reservation,Hotel Reservation User,ہوٹل ریزرویشن صارف
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,ریسرچ
+DocType: Subscription Settings,Subscription Settings,سبسکرائب کی ترتیبات
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,ریسرچ
 DocType: Maintenance Visit Purpose,Work Done,کام ہو گیا
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,صفات ٹیبل میں کم از کم ایک وصف کی وضاحت کریں
 DocType: Announcement,All Students,تمام طلباء
@@ -1589,19 +1591,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
 DocType: Crop Cycle,Less than a year,ایک سال سے کم
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,طالب علم کے موبائل نمبر
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,باقی دنیا کے
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
 DocType: Crop,Yield UOM,یوم UOM
 ,Budget Variance Report,بجٹ تغیر رپورٹ
 DocType: Salary Slip,Gross Pay,مجموعی ادائیگی
 DocType: Item,Is Item from Hub,ہب سے آئٹم ہے
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,صف {0}: سرگرمی کی قسم لازمی ہے.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,فائدہ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,فائدہ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,اکاؤنٹنگ لیجر
 DocType: Stock Reconciliation,Difference Amount,فرق رقم
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},ڈاکٹر {0} چھوڑ دو {2}
 DocType: Purchase Invoice,Reverse Charge,ریورس چارج
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,برقرار رکھا آمدنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,برقرار رکھا آمدنی
 DocType: Purchase Invoice,05-Change in POS,05 میں تبدیلی - POS
 DocType: Vehicle Log,Service Detail,سروس کا تفصیل
 DocType: BOM,Item Description,آئٹم تفصیل
@@ -1616,12 +1618,12 @@
 DocType: Opportunity Item,Opportunity Item,موقع آئٹم
 ,Student and Guardian Contact Details,طالب علم اور گارڈین کے رابطے کی تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,صف {0}: سپلائر کے لئے {0} ای میل ایڈریس ای میل بھیجنے کی ضرورت ہے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,عارضی افتتاحی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,عارضی افتتاحی
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,حب دیکھیں
 ,Employee Leave Balance,ملازم کی رخصت بیلنس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
 DocType: Patient Appointment,More Info,مزید معلومات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},قطار میں آئٹم کیلئے مطلوب شرح کی ضرورت {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},قطار میں آئٹم کیلئے مطلوب شرح کی ضرورت {0}
 DocType: Supplier Scorecard,Scorecard Actions,اسکور کارڈ کے اعمال
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,مثال: کمپیوٹر سائنس میں ماسٹرز
 DocType: Purchase Invoice,Rejected Warehouse,مسترد گودام
@@ -1631,7 +1633,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,کے لئے
 DocType: Supplier Quotation Item,Lead Time in days,دنوں میں وقت کی قیادت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,قابل ادائیگی اکاؤنٹس کے خلاصے
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} سے تنخواہ کی ادائیگی {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} سے تنخواہ کی ادائیگی {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
 DocType: Journal Entry,Get Outstanding Invoices,بقایا انوائس حاصل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
@@ -1640,9 +1642,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,لیب ٹیسٹ نسخہ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مسئلہ / ٹرانسفر کی مقدار {0} مواد کی درخواست میں {1} \ {2} کی درخواست کی مقدار آئٹم کے لئے سے زیادہ نہیں ہو سکتا {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,چھوٹے
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,چھوٹے
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,افتتاحی انوائس تخلیق کا آلہ آئٹم آئٹم
 DocType: Education Settings,Employee Number,ملازم نمبر
+DocType: Subscription Settings,Cancel Invoice After Grace Period,فضل مدت کے بعد انوائس کو منسوخ کریں
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},کیس نہیں (ے) پہلے سے استعمال میں. کیس نہیں سے کوشش {0}
 DocType: Project,% Completed,٪ مکمل
 ,Invoiced Amount (Exculsive Tax),انوائس کی رقم (Exculsive ٹیکس)
@@ -1656,7 +1659,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,لیبارٹری ٹیسٹنگ ڈیٹیٹ ٹائم
 DocType: Email Digest,Add Quote,اقتباس میں شامل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM لئے ضروری UOM coversion عنصر: {0} آئٹم میں: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,بالواسطہ اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,بالواسطہ اخراجات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,صف {0}: مقدار لازمی ہے
 DocType: Agriculture Analysis Criteria,Agriculture,زراعت
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
@@ -1687,16 +1690,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,کیپٹل سازوسامان
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,کیپٹل سازوسامان
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان &#39;پر لگائیں&#39;.
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,براہ مہربانی سب سے پہلے آئٹم کا کوڈ مقرر کریں
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
+DocType: Subscription Plan,Billing Interval Count,بلنگ انٹراول شمار
 DocType: Sales Invoice Item,Edit Description,ترمیم تفصیل
 DocType: Antibiotic,Antibiotic,اینٹی بائیوٹک
 ,Team Updates,ٹیم کی تازہ ترین معلومات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,سپلائر کے لئے
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,سپلائر کے لئے
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,اکاؤنٹ کی قسم مقرر لین دین میں اس اکاؤنٹ کو منتخب کرنے میں مدد ملتی ہے.
 DocType: Purchase Invoice,Grand Total (Company Currency),گرینڈ کل (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,پرنٹ کی شکل بنائیں
@@ -1722,7 +1726,7 @@
 DocType: POS Item Group,POS Item Group,POS آئٹم گروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ڈائجسٹ ای میل کریں:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,متبادل شے کو شے کوڈ کے طور پر ہی نہیں ہونا چاہئے
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Sales Partner,Target Distribution,ہدف تقسیم
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - حتمی تجزیہ کی حتمی
 DocType: Salary Slip,Bank Account No.,بینک اکاؤنٹ نمبر
@@ -1738,7 +1742,7 @@
 DocType: BOM Operation,Workstation,کارگاہ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,کوٹیشن سپلائر کے لئے درخواست
 DocType: Healthcare Settings,Registration Message,رجسٹریشن پیغام
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,ہارڈ ویئر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,ہارڈ ویئر
 DocType: Prescription Dosage,Prescription Dosage,پریزنٹیشن ڈوسج
 DocType: Attendance,HR Manager,HR مینیجر
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,ایک کمپنی کا انتخاب کریں
@@ -1769,7 +1773,7 @@
 DocType: Project,Start and End Dates,شروع کریں اور تواریخ اختتام
 ,Delivered Items To Be Billed,ہونے والا اشیا بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},کھولیں بوم {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,گودام سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,گودام سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
 DocType: Authorization Rule,Average Discount,اوسط ڈسکاؤنٹ
 DocType: Project Update,Great/Quickly,عظیم / جلدی سے
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1778,8 +1782,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,batched شے کے لئے بیچوں براہ مہربانی منتخب کریں
 DocType: Asset,Depreciation Schedules,ہراس کے شیڈول
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,مندرجہ بالا اکاؤنٹس کو جی ایس ایس کی ترتیبات میں منتخب کیا جا سکتا ہے:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,مندرجہ بالا اکاؤنٹس کو جی ایس ایس کی ترتیبات میں منتخب کیا جا سکتا ہے:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
 DocType: Activity Cost,Projects,منصوبوں
 DocType: Payment Request,Transaction Currency,ٹرانزیکشن ست
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},سے {0} | {1} {2}
@@ -1790,6 +1794,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,اوسط یومیہ سبکدوش ہونے والے
 DocType: POS Profile,Campaign,مہم
 DocType: Supplier,Name and Type,نام اور قسم
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',منظوری کی حیثیت &#39;منظور&#39; یا &#39;مسترد&#39; ہونا ضروری ہے
 DocType: Physician,Contacts and Address,رابطوں اور ایڈریس
 DocType: Purchase Invoice,Contact Person,رابطے کا بندہ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',کی متوقع شروع کرنے کی تاریخ &#39;سے زیادہ&#39; متوقع تاریخ اختتام &#39;نہیں ہو سکتا
@@ -1803,19 +1808,20 @@
 DocType: Student Admission,Eligibility and Details,اہلیت اور تفصیلات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,فکسڈ اثاثہ میں خالص تبدیلی
 DocType: Leave Control Panel,Leave blank if considered for all designations,تمام مراتب کے لئے غور کیا تو خالی چھوڑ دیں
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},زیادہ سے زیادہ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,تریخ ویلہ سے
 DocType: Email Digest,For Company,کمپنی کے لئے
 apps/erpnext/erpnext/config/support.py +17,Communication log.,مواصلات لاگ ان کریں.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",کوٹیشن کے لئے درخواست میں مزید چیک کے پورٹل کی ترتیبات کے لئے، پورٹل سے رسائی کے لئے غیر فعال ہے.
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سپلائر اسکور کارڈ سکورنگ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,خرید رقم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,خرید رقم
 DocType: Sales Invoice,Shipping Address Name,شپنگ ایڈریس کا نام
 DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,کورس شیڈول بنانے میں غلطیاں موجود تھیں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,اس فہرست میں پہلی اخراجات کا تعین ڈیفالٹ اخراجات کے طور پر مقرر کیا جائے گا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
@@ -1836,14 +1842,15 @@
 DocType: Package Code,Package Code,پیکیج کوڈ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,شکشو
 DocType: Purchase Invoice,Company GSTIN,کمپنی GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,منفی مقدار کی اجازت نہیں ہے
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,منفی مقدار کی اجازت نہیں ہے
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",ایک تار کے طور پر اشیاء کے مالک سے دلوایا اور اس میدان میں ذخیرہ ٹیکس تفصیل میز. ٹیکسز اور چارجز کے لئے استعمال کیا جاتا ہے
 DocType: Supplier Scorecard Period,SSC-,ایس ایس ایس-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اکاؤنٹ منجمد ہے، اندراجات محدود صارفین کو اجازت دی جاتی ہے.
 DocType: Email Digest,Bank Balance,بینک کی بیلنس
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,ایپلی کیشن چھوڑ دو
 DocType: Job Opening,"Job profile, qualifications required etc.",ایوب پروفائل، قابلیت کی ضرورت وغیرہ
 DocType: Journal Entry Account,Account Balance,اکاؤنٹ بیلنس
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
@@ -1871,15 +1878,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,قطار {0} پر ادائیگی کی اصطلاح ممکنہ طور پر ایک نقل ہے.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),زراعت (بیٹا)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,پیکنگ پرچی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر کرایہ پر دستیاب
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر کرایہ پر دستیاب
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
 DocType: Disease,Common Name,عام نام
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,درآمد میں ناکام!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,کوئی ایڈریس کی ابھی تک شامل.
 DocType: Workstation Working Hour,Workstation Working Hour,کارگاہ قیامت کام کرنا
 DocType: Vital Signs,Blood Pressure,فشار خون
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,تجزیہ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,تجزیہ
 DocType: Item,Inventory,انوینٹری
 DocType: Item,Sales Details,سیلز کی تفصیلات
 DocType: Quality Inspection,QI-,QI-
@@ -1889,15 +1896,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,طالب علم گروپ کے طلبا کے لئے داخلہ لیا کورس کی توثیق
 DocType: Notification Control,Expense Claim Rejected,اخراجات دعوے کی تردید کی
 DocType: Item,Item Attribute,آئٹم خاصیت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,حکومت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,حکومت
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,اخراج کا دعوی {0} پہلے ہی گاڑی لاگ ان کے لئے موجود ہے
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,انسٹی ٹیوٹ نام
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,واپسی کی رقم درج کریں
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,واپسی کی رقم درج کریں
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,آئٹم متغیرات
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,خدمات
 DocType: HR Settings,Email Salary Slip to Employee,ملازم کو ای میل تنخواہ کی پرچی
 DocType: Cost Center,Parent Cost Center,والدین لاگت مرکز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,ممکنہ سپلائر کریں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,ممکنہ سپلائر کریں
 DocType: Sales Invoice,Source,ماخذ
 DocType: Customer,"Select, to make the customer searchable with these fields",منتخب کریں، کسٹمر کو ان شعبوں کے ساتھ تلاش کرنے کے لۓ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,بند کر کے دکھائیں
@@ -1914,7 +1921,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,منسوخ پیکنگ پرچی (ے)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,سرمایہ کاری سے کیش فلو
 DocType: Program Course,Program Course,پروگرام کے کورس
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز
 DocType: Homepage,Company Tagline for website homepage,ویب سائٹ کے ہوم پیج کے لئے کمپنی ٹیگ لائن
 DocType: Item Group,Item Group Name,آئٹم گروپ کا نام
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,لیا
@@ -1944,10 +1951,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,یادگار تفصیلات
 DocType: Leave Block List,Block Holidays on important days.,اہم دن پر بلاک چھٹیاں.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),براہ کرم ان تمام مطلوبہ نتائج کا انعقاد کریں
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,اکاؤنٹس وصولی کا خلاصہ
-DocType: Employee Loan,Monthly Repayment Amount,ماہانہ واپسی کی رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,اکاؤنٹس وصولی کا خلاصہ
+DocType: Loan,Monthly Repayment Amount,ماہانہ واپسی کی رقم
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,افتتاحی انوائس
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,ملازم کردار کو قائم کرنے کا ملازم ریکارڈ میں صارف کی شناخت میدان مقرر کریں
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,ملازم کردار کو قائم کرنے کا ملازم ریکارڈ میں صارف کی شناخت میدان مقرر کریں
 DocType: UOM,UOM Name,UOM نام
 DocType: GST HSN Code,HSN Code,HSN کوڈ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,شراکت رقم
@@ -1969,7 +1976,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},صارف {0} پہلے سے ہی ڈاکٹر کو مقرر کیا گیا ہے {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,باکس
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,ممکنہ سپلائر
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,ممکنہ سپلائر
+DocType: Journal Entry,JV-RET-,JV- RET-
 DocType: Budget,Monthly Distribution,ماہانہ تقسیم
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,وصول فہرست خالی ہے. وصول فہرست تشکیل دے براہ مہربانی
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),صحت کی دیکھ بھال (بیٹا)
@@ -1997,7 +2005,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,کوئی شے پیک کرنے کے لئے
 DocType: Shipping Rule Condition,From Value,قیمت سے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,مینوفیکچرنگ مقدار لازمی ہے
-DocType: Employee Loan,Repayment Method,باز ادائیگی کا طریقہ
+DocType: Loan,Repayment Method,باز ادائیگی کا طریقہ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",جانچ پڑتال کی تو، گھر کے صفحے ویب سائٹ کے لئے پہلے سے طے شدہ آئٹم گروپ ہو جائے گا
 DocType: Quality Inspection Reading,Reading 4,4 پڑھنا
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,کمپنی اخراجات کے دعوے.
@@ -2006,7 +2014,7 @@
 DocType: Asset Maintenance Task,Certificate Required,سرٹیفکیٹ کی ضرورت ہے
 DocType: Company,Default Holiday List,چھٹیوں فہرست پہلے سے طے شدہ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: وقت اور کرنے کے وقت سے {1} ساتھ اتیویاپی ہے {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,اسٹاک واجبات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,اسٹاک واجبات
 DocType: Purchase Invoice,Supplier Warehouse,پردایک گودام
 DocType: Opportunity,Contact Mobile No,موبائل سے رابطہ کریں کوئی
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,کمپنی منتخب کریں
@@ -2014,7 +2022,7 @@
 DocType: Student Report Generation Tool,Print Section,پرنٹ سیکشن
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,یوزر {0} میں کوئی ڈیفالٹ پی ایس او پروفائل نہیں ہے. اس صارف کے لئے قطار {1} قطار پر ڈیفالٹ چیک کریں.
 DocType: Student Group,Set 0 for no limit,کوئی حد 0 سیٹ کریں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,صف {بت): {فیلڈ} کھولنے {invoice_type} انوائس تخلیق کرنے کی ضرورت ہے
 DocType: Customer,Primary Address and Contact Detail,ابتدائی پتہ اور رابطے کی تفصیل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ادائیگی ای میل بھیج
@@ -2025,10 +2033,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,براہ کرم کم سے کم ایک ڈومین منتخب کریں.
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,پیشگی ایکس دنوں کے لئے کی منصوبہ بندی کرنے کی کوشش کریں.
 DocType: HR Settings,Stop Birthday Reminders,سٹاپ سالگرہ تخسمارک
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 DocType: SMS Center,Receiver List,وصول کی فہرست
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,تلاش آئٹم
 DocType: Payment Schedule,Payment Amount,ادائیگی کی رقم
@@ -2038,7 +2046,7 @@
 DocType: Assessment Plan,Grading Scale,گریڈنگ پیمانے
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,پہلے ہی مکمل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,ہاتھ میں اسٹاک
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,ہاتھ میں اسٹاک
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,درآمد کامیاب!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تاریخ اجراء اشیا کی لاگت
@@ -2049,17 +2057,16 @@
 DocType: Quotation Item,Quotation Item,کوٹیشن آئٹم
 DocType: Customer,Customer POS Id,کسٹمر POS کی شناخت
 DocType: Account,Account Name,کھاتے کا نام
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,تاریخ تاریخ سے زیادہ نہیں ہو سکتا ہے
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,سیریل نمبر {0} مقدار {1} ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,تاریخ تاریخ سے زیادہ نہیں ہو سکتا ہے
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,سیریل نمبر {0} مقدار {1} ایک حصہ نہیں ہو سکتا
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,برائے مہربانی Woocommerce سرور URL
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,پردایک قسم ماسٹر.
 DocType: Purchase Order Item,Supplier Part Number,پردایک حصہ نمبر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,تبادلے کی شرح 0 یا 1 نہیں ہو سکتا
 DocType: Share Balance,To No,نہیں
-DocType: Subscription,Reference Document,حوالہ دستاویز
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} منسوخ یا بند کر دیا ہے
 DocType: Accounts Settings,Credit Controller,کریڈٹ کنٹرولر
-DocType: Grant Application,Applicant Type,درخواست دہندگان کی قسم
+DocType: Loan,Applicant Type,درخواست دہندگان کی قسم
 DocType: Purchase Invoice,03-Deficiency in services,خدمات میں 03 کی کمی
 DocType: Delivery Note,Vehicle Dispatch Date,گاڑی ڈسپیچ کی تاریخ
 DocType: Healthcare Settings,Default Medical Code Standard,پہلے سے طے شدہ میڈیکل کوڈ سٹینڈرڈ
@@ -2070,13 +2077,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ بل
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,محفوظ مقدار
 DocType: Party Account,Party Account,پارٹی کے اکاؤنٹ
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,انسانی وسائل
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,انسانی وسائل
 DocType: Lead,Upper Income,بالائی آمدنی
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,مسترد
 DocType: Journal Entry Account,Debit in Company Currency,کمپنی کرنسی میں ڈیبٹ
 DocType: BOM Item,BOM Item,BOM آئٹم
 DocType: Appraisal,For Employee,ملازم کے لئے
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,فراہمی انٹری بنائیں
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,فراہمی انٹری بنائیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,صف {0}: سپلائر کے خلاف ایڈوانس ڈیبٹ ہونا ضروری ہے
 DocType: Company,Default Values,طے شدہ اقدار
 DocType: Membership,INR,INR
@@ -2106,10 +2113,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}صفر سےبڈا ھونا ڇاھۓ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,اسٹاک دستیاب ہے
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,اسٹاک دستیاب ہے
 DocType: Manufacturing Settings,Capacity Planning For (Days),(دن) کے لئے صلاحیت کی منصوبہ بندی
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,حصولی کے
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,اشیاء میں سے کوئی بھی مقدار یا قدر میں کوئی تبدیلی ہے.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,اشیاء میں سے کوئی بھی مقدار یا قدر میں کوئی تبدیلی ہے.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,لازمی فیلڈ - پروگرام
 DocType: Special Test Template,Result Component,نتیجہ اجزاء
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,وارنٹی دعوی
@@ -2129,7 +2136,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,پتے کے طور پر پتیوں کے اندر تعطیلات شامل
 DocType: Sales Invoice,Packed Items,پیک اشیا
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,سیریل نمبر کے خلاف دعوی وارنٹی
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;کل&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;کل&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,خریداری کی ٹوکری فعال
 DocType: Employee,Permanent Address,مستقل پتہ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2147,10 +2154,10 @@
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,ایکشن کی توثیق کریں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,آن لائن نیلامیوں
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,مقدار یا تشخیص کی شرح یا دونوں یا تو وضاحت کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,مقدار یا تشخیص کی شرح یا دونوں یا تو وضاحت کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,تکمیل
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,ٹوکری میں دیکھیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,مارکیٹنگ کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,معیاری معیار نہیں بن سکتا. براہ کرم معیار کا نام تبدیل کریں
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
@@ -2173,9 +2180,9 @@
 DocType: Upload Attendance,Get Template,سانچے حاصل
 DocType: Material Request,Transferred,منتقل
 DocType: Vehicle,Doors,دروازے
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,مریض کے رجسٹریشن کے لئے فیس جمع کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,سٹاک ٹرانزیکشن کے بعد خصوصیات تبدیل نہیں کر سکتے ہیں. نیا آئٹم بنائیں اور نئے آئٹم کو اسٹاک منتقل کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,سٹاک ٹرانزیکشن کے بعد خصوصیات تبدیل نہیں کر سکتے ہیں. نیا آئٹم بنائیں اور نئے آئٹم کو اسٹاک منتقل کریں
 DocType: Course Assessment Criteria,Weightage,اہمیت
 DocType: Purchase Invoice,Tax Breakup,ٹیکس بریک اپ
 DocType: Packing Slip,PS-,PS-
@@ -2211,12 +2218,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,مصالحتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,بہت زیادہ کالم. رپورٹ برآمد اور ایک سپریڈ شیٹ کی درخواست کا استعمال کرتے ہوئے پرنٹ.
 DocType: Purchase Invoice Item,Batch No,بیچ کوئی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,ملازمت کی نفاذ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ایک گاہک کی خریداری کے آرڈر کے خلاف ایک سے زیادہ سیلز آرڈر کرنے کی اجازت دیں
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 DocType: Grant Application,Assessment  Mark (Out of 10),تشخیص مارک (10 سے باہر)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبائل نمبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,مین
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,مین
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
@@ -2225,15 +2233,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,میدان سے مواقع لازمی ہے
 DocType: Email Digest,Annual Expenses,سالانہ اخراجات
 DocType: Item,Variants,متغیرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
 DocType: Sales Team,Contribution to Net Total,نیٹ کل کی شراکت
 DocType: Sales Invoice Item,Customer's Item Code,گاہک کی آئٹم کوڈ
 DocType: Stock Reconciliation,Stock Reconciliation,اسٹاک مصالحتی
 DocType: Territory,Territory Name,علاقے کا نام
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,آپ صرف ایک رکنیت میں اسی بلنگ سائیکل کے ساتھ منصوبوں کو صرف کرسکتے ہیں
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ایک کام کے لئے درخواست.
 DocType: Purchase Order Item,Warehouse and Reference,گودام اور حوالہ
 DocType: Supplier,Statutory info and other general information about your Supplier,اپنے سپلائر کے بارے میں قانونی معلومات اور دیگر عمومی معلومات
@@ -2242,10 +2251,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,تشخیص
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,ٹریننگ واقعات
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},سیریل کوئی آئٹم کے لئے داخل نقل {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},سیریل کوئی آئٹم کے لئے داخل نقل {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,لیڈ ماخذ کی طرف سے لیڈز کو ٹریک کریں.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ایک شپنگ حکمرانی کے لئے ایک شرط
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,درج کریں
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,درج کریں
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,بحالی لاگ ان
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),اس پیکج کی خالص وزن. (اشیاء کی خالص وزن کی رقم کے طور پر خود کار طریقے سے شمار کیا جاتا)
@@ -2253,11 +2262,11 @@
 DocType: Sales Order,To Deliver and Bill,نجات اور بل میں
 DocType: Student Group,Instructors,انسٹرکٹر
 DocType: GL Entry,Credit Amount in Account Currency,اکاؤنٹ کی کرنسی میں قرضے کی رقم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,اشتراک مینجمنٹ
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,ادائیگی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,ادائیگی
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",گودام {0} کسی بھی اکاؤنٹ سے منسلک نہیں ہے، براہ مہربانی کمپنی میں گودام ریکارڈ میں اکاؤنٹ یا سیٹ ڈیفالٹ انوینٹری اکاؤنٹ ذکر {1}.
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,آپ کے احکامات کو منظم کریں
 DocType: Work Order Operation,Actual Time and Cost,اصل وقت اور لاگت
@@ -2267,7 +2276,7 @@
 DocType: Student Leave Application,Student Leave Application,Student کی رخصت کی درخواست
 DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",اثاثہ منسوخ نہیں کیا جاسکتا ہے، کیونکہ یہ پہلے سے ہی ہے {0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},کل کام کرنے کا گھنٹوں زیادہ سے زیادہ کام کے گھنٹوں سے زیادہ نہیں ہونا چاہئے {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,پر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,فروخت کے وقت بنڈل اشیاء.
@@ -2277,7 +2286,7 @@
 DocType: Item,Barcodes,بارکوڈ
 DocType: Hub Category,Hub Node,حب گھنڈی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,آپ کو ڈپلیکیٹ اشیاء میں داخل ہے. کو بہتر بنانے اور دوبارہ کوشش کریں.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ایسوسی ایٹ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,ایسوسی ایٹ
 DocType: Asset Movement,Asset Movement,ایسیٹ موومنٹ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,کام آرڈر {0} جمع ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,نیا ٹوکری
@@ -2295,13 +2304,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,بلنگ کی کرنسی کو پہلے ہی ڈیفالٹ کمپنی کی کرنسی یا پارٹی اکاؤنٹ کرنسی کے برابر ہونا ضروری ہے
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),پیکیج اس کی ترسیل (صرف ڈرافٹ) کا ایک حصہ ہے کہ اشارہ کرتا ہے
 DocType: Soil Texture,Loam,لوام
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,صف {0}: تاریخ کی تاریخ تاریخ سے پہلے نہیں ہوسکتی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,صف {0}: تاریخ کی تاریخ تاریخ سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ادائیگی اندراج
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},شے کے لئے مقدار {0} سے کم ہونا چاہئے {1}
 ,Sales Invoice Trends,فروخت انوائس رجحانات
 DocType: Leave Application,Apply / Approve Leaves,پتے منظور / لگائیں
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,کے لئے
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',یا &#39;پچھلے صف کل&#39; &#39;پچھلے صف کی رقم پر انچارج قسم ہے صرف اس صورت میں رجوع کر سکتے ہیں صف
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',یا &#39;پچھلے صف کل&#39; &#39;پچھلے صف کی رقم پر انچارج قسم ہے صرف اس صورت میں رجوع کر سکتے ہیں صف
 DocType: Sales Order Item,Delivery Warehouse,ڈلیوری گودام
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,مالیاتی لاگت کے مراکز کا درخت.
 DocType: Serial No,Delivery Document No,ڈلیوری دستاویز
@@ -2330,6 +2338,7 @@
 DocType: Asset Maintenance Log,Planned,منصوبہ بندی
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,پہلے سے طے شدہ رسید کرنے والے اکاؤنٹس استعمال کرنے کے لئے مریض میں مقرر کنسلٹنٹس کے الزامات کے مطابق نہیں ہوتے ہیں.
 DocType: Vehicle Log,Fuel Price,ایندھن کی قیمت
+DocType: Bank Guarantee,Margin Money,مارجن منی
 DocType: Budget,Budget,بجٹ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,کھولیں مقرر کریں
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
@@ -2343,13 +2352,13 @@
 DocType: Lead,Follow Up,فالو کریں
 DocType: Item,Is Sales Item,سیلز آئٹم
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,آئٹم گروپ درخت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. آئٹم ماسٹر چیک
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. آئٹم ماسٹر چیک
 DocType: Maintenance Visit,Maintenance Time,بحالی وقت
 ,Amount to Deliver,رقم فراہم کرنے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},اسی چیز کو کئی بار درج کیا گیا ہے. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ٹرم شروع کرنے کی تاریخ جس کی اصطلاح منسلک ہے کے تعلیمی سال سال شروع تاریخ سے پہلے نہیں ہو سکتا (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,غلطیاں تھیں.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,ملازم {0} پہلے ہی {1} کے درمیان {2} اور {3} کے لئے درخواست کر چکے ہیں:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,غلطیاں تھیں.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,ملازم {0} پہلے ہی {1} کے درمیان {2} اور {3} کے لئے درخواست کر چکے ہیں:
 DocType: Guardian,Guardian Interests,گارڈین دلچسپیاں
 DocType: Naming Series,Current Value,موجودہ قیمت
 DocType: Education Settings,Instructor Records to be created by,انسٹریکٹر ریکارڈز کی طرف سے پیدا کی جائے گی
@@ -2370,8 +2379,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
 DocType: Website Item Group,Website Item Group,ویب سائٹ آئٹم گروپ
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,پسندیدہ میں شامل
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,مندرجہ ذیل منتخب کردہ معیار یا تنخواہ پرچی کے لئے جمع کرنے کے لئے کوئی تنخواہ پرچی نہیں مل سکی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,ڈیوٹی اور ٹیکس
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,مندرجہ ذیل منتخب کردہ معیار یا تنخواہ پرچی کے لئے جمع کرنے کے لئے کوئی تنخواہ پرچی نہیں مل سکی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,ڈیوٹی اور ٹیکس
 DocType: Projects Settings,Projects Settings,منصوبوں کی ترتیبات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,حوالہ کوڈ داخل کریں.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ادائیگی اندراجات کی طرف سے فلٹر نہیں کیا جا سکتا {1}
@@ -2381,27 +2390,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,آئٹم گروپس کا درخت.
 DocType: Production Plan,Total Produced Qty,کل پیداوار مقدار
 DocType: Payroll Entry,Get Employee Details,ملازمت کی تفصیلات حاصل کریں
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,اس چارج کی قسم کے لئے موجودہ صفیں سے زیادہ یا برابر صفیں رجوع نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,اس چارج کی قسم کے لئے موجودہ صفیں سے زیادہ یا برابر صفیں رجوع نہیں کر سکتے ہیں
 DocType: Asset,Sold,فروخت
 ,Item-wise Purchase History,آئٹم وار خریداری کی تاریخ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
 DocType: Account,Frozen,منجمد
 DocType: Sales Invoice Payment,Base Amount (Company Currency),بنیادی مقدار (کمپنی کرنسی)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,خام مال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,خام مال
 DocType: Payment Reconciliation Payment,Reference Row,حوالہ صف
 DocType: Installation Note,Installation Time,کی تنصیب کا وقت
 DocType: Sales Invoice,Accounting Details,اکاؤنٹنگ تفصیلات
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,اس کمپنی کے لئے تمام معاملات حذف
 DocType: Patient,O Positive,اے مثبت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,سرمایہ کاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,سرمایہ کاری
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تین ہلاک
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,قبولیت کا کلیہ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,مندرجہ بالا جدول میں مواد درخواستیں داخل کریں
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,جرنل اندراج کیلئے کوئی ادائیگی نہیں
 DocType: Item Attribute,Attribute Name,نام وصف
 DocType: BOM,Show In Website,ویب سائٹ میں دکھائیں
 DocType: Shopping Cart Settings,Show Quantity in Website,ویب سائٹ میں مقدار دکھائیں
-DocType: Employee Loan Application,Total Payable Amount,کل قابل ادائیگی رقم
+DocType: Loan Application,Total Payable Amount,کل قابل ادائیگی رقم
 DocType: Task,Expected Time (in hours),(گھنٹوں میں) متوقع وقت
 DocType: Item Reorder,Check in (group),میں چیک کریں (گروپ)
 DocType: Soil Texture,Silt,Silt
@@ -2420,7 +2430,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,ادائیگی کرنا
 DocType: Room,Room Name,کمرے کا نام
 DocType: Prescription Duration,Prescription Duration,نسخہ دورانیہ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر، پہلے {0} منسوخ / لاگو نہیں کیا جا سکتا ہے چھوڑ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر، پہلے {0} منسوخ / لاگو نہیں کیا جا سکتا ہے چھوڑ {1}
 DocType: Activity Cost,Costing Rate,لاگت کی شرح
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,کسٹمر پتے اور رابطے
 ,Campaign Efficiency,مہم مستعدی
@@ -2439,11 +2449,11 @@
 DocType: Chapter,Chapter,باب
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,جوڑی
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,جب اس موڈ کو منتخب کیا جاتا ہے تو ڈیفالٹ اکاؤنٹ خود کار طریقے سے پی ایس او انوائس میں اپ ڈیٹ کیا جائے گا.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
 DocType: Asset,Depreciation Schedule,ہراس کا شیڈول
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,فروخت پارٹنر پتے اور روابط
 DocType: Bank Reconciliation Detail,Against Account,کے اکاؤنٹ کے خلاف
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,آدھا دن تاریخ تاریخ سے اور تاریخ کے درمیان ہونا چاہئے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,آدھا دن تاریخ تاریخ سے اور تاریخ کے درمیان ہونا چاہئے
 DocType: Maintenance Schedule Detail,Actual Date,اصل تاریخ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,براہ کرم کمپنی {0} میں ڈیفالٹ لاگت سینٹر مقرر کریں.
 DocType: Item,Has Batch No,بیچ نہیں ہے
@@ -2461,7 +2471,6 @@
 DocType: Task,Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے)
 DocType: Soil Texture,Soil Type,مٹی کی قسم
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,نیا پیغام
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless منڈیٹ
@@ -2481,7 +2490,7 @@
 DocType: Hub Category,Hub Category,حب زمرہ
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,گاڑی نمبر
-DocType: Employee Loan,Loan Amount,قرضے کی رقم
+DocType: Loan,Loan Amount,قرضے کی رقم
 DocType: Student Report Generation Tool,Add Letterhead,لیٹر ہیڈ شامل کریں
 DocType: Program Enrollment,Self-Driving Vehicle,خود ڈرائیونگ وہیکل
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,سپلائر اسکور کارڈ اسٹینڈنگ
@@ -2510,9 +2519,9 @@
 DocType: Cash Flow Mapper,Position,مقام
 DocType: Patient,Patient Details,مریض کی تفصیلات
 DocType: Patient,B Positive,بی مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 DocType: Patient Medical Record,Patient Medical Record,مریض میڈیکل ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,کھیل
@@ -2520,8 +2529,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,اصل کل
 DocType: Lab Test UOM,Test UOM,ٹیسٹ UOM
 DocType: Student Siblings,Student Siblings,طالب علم بھائی بہن
+DocType: Subscription Plan Detail,Subscription Plan Detail,سبسکرپشن منصوبہ کی تفصیل
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,یونٹ
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,کمپنی کی وضاحت کریں
 ,Customer Acquisition and Loyalty,گاہک حصول اور وفاداری
 DocType: Asset Maintenance Task,Maintenance Task,بحالی کا کام
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,براہ کرم GST ترتیبات میں B2C کی حد مقرر کریں.
@@ -2536,6 +2546,7 @@
 ,BOM Search,Bom تلاش
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),مجموعی سامان کی قیمت (اسٹاک انٹری کے ذریعے)
 DocType: Hub Settings,Company Registered,کمپنی رجسٹرڈ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,تاریخ سے تاریخ سے کم نہیں ہوسکتی ہے
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",اس گودام میں اسٹاک کی بنیاد پر حب پر &quot;اسٹاک میں&quot; یا &quot;نہیں میں اسٹاک&quot; شائع کریں.
 DocType: Vehicle,Fuel Type,ایندھن کی قسم
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,کمپنی میں کرنسی کی وضاحت کریں
@@ -2543,17 +2554,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},بیچ میں اسٹاک توازن {0} بن جائے گا منفی {1} گودام شے {2} کے لئے {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,مواد درخواست درج ذیل آئٹم کی دوبارہ آرڈر کی سطح کی بنیاد پر خود کار طریقے سے اٹھایا گیا ہے
 DocType: Email Digest,Pending Sales Orders,سیلز احکامات زیر التواء
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
 DocType: Employee,Create User Permission,صارف کی اجازت بنائیں
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Healthcare Settings,Remind Before,پہلے یاد رکھیں
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM تبادلوں عنصر قطار میں کی ضرورت ہے {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
 DocType: Salary Component,Deduction,کٹوتی
 DocType: Item,Retain Sample,نمونہ برقرار رکھنا
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
 DocType: Stock Reconciliation Item,Amount Difference,رقم فرق
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,اس کی فروخت کے شخص کے ملازم کی شناخت درج کریں
 DocType: Territory,Classification of Customers by region,خطے کی طرف سے صارفین کی درجہ بندی
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,پیداوار میں
@@ -2563,8 +2575,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محسوب بینک کا گوشوارہ توازن
 DocType: Normal Test Template,Normal Test Template,عام ٹیسٹ سانچہ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معذور صارف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,کوٹیشن
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,کوئی اقتباس نہیں موصول آر ایف آر مقرر نہیں کرسکتا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,کوٹیشن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,کوئی اقتباس نہیں موصول آر ایف آر مقرر نہیں کرسکتا
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کل کٹوتی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,اکاؤنٹ کرنسی میں پرنٹ کرنے کا ایک اکاؤنٹ منتخب کریں
@@ -2572,7 +2584,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,یہ اس مریض کے خلاف ٹرانزیکشنز پر مبنی ہے. تفصیلات کے لئے ذیل میں ٹائم لائن ملاحظہ کریں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,لاگت اپ ڈیٹ
 DocType: Patient,Date of Birth,پیدائش کی تاریخ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,آئٹم {0} پہلے ہی واپس کر دیا گیا ہے
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,آئٹم {0} پہلے ہی واپس کر دیا گیا ہے
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالی سال ** ایک مالی سال کی نمائندگی کرتا ہے. تمام اکاؤنٹنگ اندراجات اور دیگر اہم لین دین *** مالی سال کے ساقھ ٹریک کر رہے ہیں.
 DocType: Opportunity,Customer / Lead Address,کسٹمر / لیڈ ایڈریس
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,سپلائر اسکور کارڈ سیٹ اپ
@@ -2583,14 +2595,15 @@
 DocType: Work Order Operation,Actual Operation Time,اصل آپریشن کے وقت
 DocType: Authorization Rule,Applicable To (User),لاگو (صارف)
 DocType: Purchase Taxes and Charges,Deduct,منہا
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,کام کی تفصیل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,کام کی تفصیل
 DocType: Student Applicant,Applied,اطلاقی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,دوبارہ کھولنے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,دوبارہ کھولنے
 DocType: Sales Invoice Item,Qty as per Stock UOM,مقدار اسٹاک UOM کے مطابق
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نام
 DocType: Purchase Invoice,02-Post Sale Discount,02-فروخت فروخت ڈسکاؤنٹ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",سوائے خصوصی کردار &quot;-&quot; &quot;.&quot;، &quot;#&quot;، اور &quot;/&quot; سیریز کا نام میں اس کی اجازت نہیں
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",سیلز مہمات کا ٹریک رکھنے. لیڈز، کوٹیشن کا ٹریک رکھنے، سیلز آرڈر وغیرہ مہمات میں سے سرمایہ کاری پر واپسی کا اندازہ لگانے کے.
+DocType: Department Approver,Approver,گواہ
 ,SO Qty,تو مقدار
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,شیئر ہولڈر کو میدان خالی نہیں کیا جا سکتا
 DocType: Guardian,Work Address,دفتر کا پتہ
@@ -2604,21 +2617,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),کل مختص رقم (کمپنی کرنسی)
 DocType: Purchase Order Item,To be delivered to customer,گاہک کے حوالے کیا جائے گا
 DocType: BOM,Scrap Material Cost,سکریپ مواد کی لاگت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,سیریل نمبر {0} کسی گودام سے تعلق نہیں ہے
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,سیریل نمبر {0} کسی گودام سے تعلق نہیں ہے
 DocType: Grant Application,Email Notification Sent,ای میل کی اطلاع بھیجا
 DocType: Purchase Invoice,In Words (Company Currency),الفاظ میں (کمپنی کرنسی)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",آئٹم کوڈ، گودام، مقدار قطار پر ضروری ہے
-DocType: Pricing Rule,Supplier,پردایک
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",آئٹم کوڈ، گودام، مقدار قطار پر ضروری ہے
+DocType: Bank Guarantee,Supplier,پردایک
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,ادائیگی کی تفصیلات دکھائیں
 DocType: Consultation,Consultation Time,مشاورت کا وقت
 DocType: C-Form,Quarter,کوارٹر
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,متفرق اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,متفرق اخراجات
 DocType: Global Defaults,Default Company,پہلے سے طے شدہ کمپنی
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجات یا فرق اکاؤنٹ آئٹم {0} کے طور پر اس کے اثرات مجموعی اسٹاک قیمت کے لئے لازمی ہے
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,بینک کا نام
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,اوپر
-DocType: Employee Loan,Employee Loan Account,ملازم قرض اکاؤنٹ
 DocType: Leave Application,Total Leave Days,کل رخصت دنوں
 DocType: Email Digest,Note: Email will not be sent to disabled users,نوٹ: ای میل معذور صارفین کو نہیں بھیجی جائے گی
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,تعامل کی تعداد
@@ -2634,7 +2646,7 @@
 DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",فصلوں کو بچانے کے بعد بابوں کا نام
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,براہ کرم GST ترتیبات میں GST اکاؤنٹس مقرر کریں
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,براہ کرم GST ترتیبات میں GST اکاؤنٹس مقرر کریں
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,کاروبار کی قسم
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",کم سے کم ایک قطار میں مختص رقم، انوائس کی قسم اور انوائس تعداد کو منتخب کریں
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,نئی خریداری کی لاگت
@@ -2643,12 +2655,13 @@
 DocType: Grant Application,Grant Description,گرانٹ تفصیل
 DocType: Purchase Invoice Item,Rate (Company Currency),شرح (کمپنی کرنسی)
 DocType: Student Guardian,Others,دیگر
+DocType: Subscription,Discounts,ڈسکاؤنٹ
 DocType: Payment Entry,Unallocated Amount,Unallocated رقم
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,ایک کے ملاپ شے نہیں مل سکتی. کے لئے {0} کسی دوسرے قدر منتخب کریں.
 DocType: POS Profile,Taxes and Charges,ٹیکسز اور چارجز
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ایک پروڈکٹ یا، خریدا فروخت یا اسٹاک میں رکھا جاتا ہے کہ ایک سروس.
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,مزید کوئی بھی اپ ڈیٹ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,پہلی صف کے لئے &#39;پچھلے صف کل پر&#39; &#39;پچھلے صف کی رقم پر&#39; کے طور پر چارج کی قسم منتخب کریں یا نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,پہلی صف کے لئے &#39;پچھلے صف کل پر&#39; &#39;پچھلے صف کی رقم پر&#39; کے طور پر چارج کی قسم منتخب کریں یا نہیں کر سکتے ہیں
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,اس میں اس سیٹ اپ سے منسلک تمام سکور کارڈز شامل ہیں
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,چائلڈ آئٹم ایک پروڈکٹ بنڈل نہیں ہونا چاہئے. براہ مہربانی شے کو دور `{0}` اور محفوظ کریں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,بینکنگ
@@ -2657,21 +2670,24 @@
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,شیڈول حاصل کرنے کے لئے پیدا شیڈول &#39;پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
 DocType: Bin,Ordered Quantity,کا حکم دیا مقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",مثلا &quot;عمارت سازوں کے لئے، فورم کے اوزار کی تعمیر&quot;
 DocType: Grading Scale,Grading Scale Intervals,گریڈنگ پیمانے وقفے
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,سال کے لئے منافع
+DocType: Bank Guarantee,Name of Bank,بینک کا نام
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: اکاؤنٹنگ انٹری {2} کے لئے صرف کرنسی میں بنایا جا سکتا ہے: {3}
 DocType: Fee Schedule,In Process,اس عمل میں
 DocType: Authorization Rule,Itemwise Discount,Itemwise ڈسکاؤنٹ
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,مالیاتی اکاؤنٹس کا درخت.
+DocType: Bank Guarantee,Reference Document Type,حوالہ دستاویز کی قسم
 DocType: Cash Flow Mapping,Cash Flow Mapping,کیش فلو تعریفیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} سیلز آرڈر کے خلاف {1}
 DocType: Account,Fixed Asset,مستقل اثاثے
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,serialized کی انوینٹری
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,پہلے سے طے شدہ رابطہ میں ای میل نہیں مل سکا
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,خفیہ بنائیں
-DocType: Employee Loan,Account Info,اکاونٹ کی معلومات
+DocType: Loan,Account Info,اکاونٹ کی معلومات
 DocType: Activity Type,Default Billing Rate,پہلے سے طے شدہ بلنگ کی شرح
 DocType: Fees,Include Payment,ادائیگی شامل کریں
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} طلبہ تنظیموں پیدا.
@@ -2679,24 +2695,24 @@
 DocType: Sales Invoice,Total Billing Amount,کل بلنگ رقم
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,فیس ساخت اور طالب علم گروپ {0} میں پروگرام مختلف ہیں.
 DocType: Fee Schedule,Receivable Account,وصولی اکاؤنٹ
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},قطار # {0}: اثاثہ {1} پہلے سے ہی ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},قطار # {0}: اثاثہ {1} پہلے سے ہی ہے {2}
 DocType: Quotation Item,Stock Balance,اسٹاک توازن
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,ادائیگی سیلز آرڈر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,سی ای او
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,سی ای او
 DocType: Purchase Invoice,With Payment of Tax,ٹیکس کی ادائیگی کے ساتھ
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجات دعوی تفصیل
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,سپلائر کے لئے تین پرت
 DocType: Land Unit,Is Container,کنٹینر ہے
 DocType: Crop Cycle,This will be day 1 of the crop cycle,یہ فصل سائیکل کا دن 1 ہوگا
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,درست اکاؤنٹ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,درست اکاؤنٹ منتخب کریں
 DocType: Purchase Invoice Item,Weight UOM,وزن UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,فولیو نمبروں کے ساتھ دستیاب حصول داروں کی فہرست
 DocType: Salary Structure Employee,Salary Structure Employee,تنخواہ ساخت ملازم
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,مختلف خصوصیات دکھائیں
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,مختلف خصوصیات دکھائیں
 DocType: Student,Blood Group,خون کا گروپ
 DocType: Course,Course Name,کورس کا نام
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ایک مخصوص ملازم کی چھٹی ایپلی کیشنز منظور کر سکتے ہیں جو صارفین
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,آفس سازوسامان
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,آفس سازوسامان
 DocType: Purchase Invoice Item,Qty,مقدار
 DocType: Fiscal Year,Companies,کمپنی
 DocType: Supplier Scorecard,Scoring Setup,سیٹنگ سیٹ
@@ -2715,7 +2731,7 @@
 DocType: Stock Entry,Total Incoming Value,کل موصولہ ویلیو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,قیمت خرید کی فہرست
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,سپلائر سکور کارڈ متغیر کے سانچے.
 DocType: Job Offer Term,Offer Term,پیشکش ٹرم
 DocType: Asset,Quality Manager,کوالٹی منیجر
@@ -2727,13 +2743,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},کل غیر مقفل: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ویب سائٹ آپریشن
 DocType: Supplier Scorecard,Supplier Score,سپلائر اسکور
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,کل انوائس AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,کل انوائس AMT
 DocType: Supplier,Warn RFQs,آر ایف پیز کو خبردار کریں
 DocType: BOM,Conversion Rate,تبادلوں کی شرح
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,مصنوعات کی تلاش
 DocType: Assessment Plan,To Time,وقت
 DocType: Authorization Rule,Approving Role (above authorized value),(مجاز کی قیمت سے اوپر) کردار منظوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,اکاؤنٹ کریڈٹ ایک قابل ادائیگی اکاؤنٹ ہونا ضروری ہے
+DocType: Loan,Total Amount Paid,ادا کردہ کل رقم
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,برائے مہربانی طالب علم داخلہ منتخب کریں جو ادا طلبہ کے درخواست دہندگان کے لئے لازمی ہے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,قیمتوں کا تعین شائع کرنے کے لئے برائے مہربانی قیمت کی فہرست منتخب کریں
@@ -2743,19 +2760,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قیمت کی فہرست {0} غیر فعال ہے
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},قطار {0}: مکمل مقدار {1} آپریشن کے لئے {2} سے زیادہ نہیں ہوسکتا ہے
 DocType: Manufacturing Settings,Allow Overtime,اوور ٹائم کی اجازت دیں
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",serialized کی آئٹم {0} اسٹاک انٹری اسٹاک مصالحت کا استعمال کرتے ہوئے استعمال کریں اپ ڈیٹ نہیں کیا جا سکتا
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",serialized کی آئٹم {0} اسٹاک انٹری اسٹاک مصالحت کا استعمال کرتے ہوئے استعمال کریں اپ ڈیٹ نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",serialized کی آئٹم {0} اسٹاک انٹری اسٹاک مصالحت کا استعمال کرتے ہوئے استعمال کریں اپ ڈیٹ نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",serialized کی آئٹم {0} اسٹاک انٹری اسٹاک مصالحت کا استعمال کرتے ہوئے استعمال کریں اپ ڈیٹ نہیں کیا جا سکتا
 DocType: Training Event Employee,Training Event Employee,تربیت ایونٹ ملازم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,زیادہ سے زیادہ نمونے - {1} بیچ {1} اور آئٹم {2} کے لئے برقرار رکھا جا سکتا ہے.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,ٹائم سلاٹس شامل کریں
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شے کے لئے کی ضرورت ہے سیریل نمبر {1}. آپ کی فراہم کردہ {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} شے کے لئے کی ضرورت ہے سیریل نمبر {1}. آپ کی فراہم کردہ {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,موجودہ تشخیص کی شرح
 DocType: Training Event,Advance,ایڈوانس
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,دوبارہ دوبارہ بنانے کے لئے.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless ادائیگی کے گیٹ وے کی ترتیبات
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,ایکسچینج گین / نقصان
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,ایکسچینج گین / نقصان
 DocType: Opportunity,Lost Reason,کھو وجہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},قطار # {0}: اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},قطار # {0}: اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ڈس ٹائپ تلاش کرنے میں ناکام {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
@@ -2774,7 +2790,6 @@
 DocType: Bin,Actual Quantity,اصل مقدار
 DocType: Shipping Rule,example: Next Day Shipping,مثال: اگلے دن شپنگ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},سبسکرائب کریں {0}
 DocType: Fee Schedule Program,Fee Schedule Program,فیس شیڈول پروگرام
 DocType: Fee Schedule Program,Student Batch,Student کی بیچ
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,طالب علم بنائیں
@@ -2789,14 +2804,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,ای کامرس GSTIN
 DocType: Sales Order,Not Delivered,نجات نہیں
 ,Bank Clearance Summary,بینک کلیئرنس خلاصہ
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",بنائیں اور، یومیہ، ہفتہ وار اور ماہانہ ای میل ڈائجسٹ کا انتظام.
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",بنائیں اور، یومیہ، ہفتہ وار اور ماہانہ ای میل ڈائجسٹ کا انتظام.
 DocType: Appraisal Goal,Appraisal Goal,تشخیص گول
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,تجویز کردہ زمرہ؟
 DocType: Stock Reconciliation Item,Current Amount,موجودہ رقم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,عمارات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,عمارات
 DocType: Fee Schedule,Fee Structure,فیس ڈھانچہ
 DocType: Timesheet Detail,Costing Amount,لاگت رقم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
 DocType: Student Admission Program,Application Fee,درخواست کی فیس
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,تنخواہ پرچی جمع کرائیں
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,آئٹم {0} ہے {1} فیصد Maxiumm ڈسکاؤنٹ
@@ -2804,12 +2818,13 @@
 DocType: Sales Partner,Address & Contacts,ایڈریس اور رابطے
 DocType: SMS Log,Sender Name,مرسل کے نام
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,زراعت تجزیہ معیار
+DocType: HR Settings,Leave Approval Notification Template,منظوری کی اطلاع کے سانچے چھوڑ دو
 DocType: POS Profile,[Select],[چونے]
 DocType: Vital Signs,Blood Pressure (diastolic),بلڈ پریشر (ڈائاسولک)
 DocType: SMS Log,Sent To,کو بھیجا
 DocType: Agriculture Task,Holiday Management,چھٹیوں کا انتظام
 DocType: Payment Request,Make Sales Invoice,فروخت انوائس بنائیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,سافٹ ویئر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,سافٹ ویئر
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
 DocType: Company,For Reference Only.,صرف ریفرنس کے لئے.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2577,Select Batch No,بیچ منتخب نہیں
@@ -2826,7 +2841,7 @@
 DocType: Employee,New Workplace,نئے کام کی جگہ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,مواد کی کھپت
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,بند کے طور پر مقرر
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},بارکوڈ کے ساتھ کوئی آئٹم {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},بارکوڈ کے ساتھ کوئی آئٹم {0}
 DocType: Normal Test Items,Require Result Value,ضرورت کے نتائج کی ضرورت ہے
 DocType: Item,Show a slideshow at the top of the page,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2841,19 +2856,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
 DocType: Leave Block List,Allow Users,صارفین کو اجازت دے
 DocType: Purchase Order,Customer Mobile No,کسٹمر موبائل نہیں
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,مکرر
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,کیش فلو تعریفیں سانچہ کی تفصیلات
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,قرض مینجمنٹ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,علیحدہ آمدنی ٹریک اور مصنوعات کاریکشیتر یا تقسیم کے لئے اخراجات.
 DocType: Rename Tool,Rename Tool,آلہ کا نام تبدیل کریں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,اپ ڈیٹ لاگت
 DocType: Item Reorder,Item Reorder,آئٹم ترتیب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,دکھائیں تنخواہ کی پرچی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,دکھائیں تنخواہ کی پرچی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,منتقلی مواد
 DocType: Fees,Send Payment Request,ادائیگی کی درخواست بھیجیں
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
 DocType: Water Analysis,Origin,اصل
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
@@ -2868,14 +2883,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,آمدنی ٹیک ذمہ داری ہے
 DocType: Grading Scale Interval,Grade Description,گریڈ تفصیل
 DocType: Stock Entry,Purchase Receipt No,خریداری کی رسید نہیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیانا رقم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,بیانا رقم
 DocType: Sales Invoice, Shipping Bill Number,شپنگ بل نمبر
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability کے
 DocType: Asset Maintenance Log,Actions performed,عمل انجام دیا
 DocType: Cash Flow Mapper,Section Leader,سیکشن لیڈر
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),فنڈز کا ماخذ (واجبات)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),فنڈز کا ماخذ (واجبات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},قطار میں مقدار {0} ({1}) تیار مقدار کے طور پر ایک ہی ہونا چاہیے {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,ملازم
+DocType: Bank Guarantee,Fixed Deposit Number,مقررہ جمع رقم
 DocType: Asset Repair,Failure Date,ناکامی کی تاریخ
 DocType: Sample Collection,Collected Time,جمع کردہ وقت
 DocType: Company,Sales Monthly History,فروخت ماہانہ تاریخ
@@ -2892,10 +2908,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,کیا آپ واقعی اس مقررہ کو منسوخ کرنا چاہتے ہیں؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ہوٹل کمرہ قیمتوں کا تعین پیکیج
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,فروخت کی پائپ لائن
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب پر
 DocType: Rename Tool,File to Rename,فائل کا نام تبدیل کرنے
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},براہ کرم بوم میں آئٹم کیلئے صف {0} منتخب کریں.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,سبسکرائب کریں تازہ ترین معلومات
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},اکاؤنٹ {0} کمپنی {1} اکاؤنٹ سے موڈ میں نہیں ملتا ہے: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},شے کے لئے موجود نہیں ہے واضع BOM {0} {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,کورس:
@@ -2905,7 +2922,7 @@
 DocType: Notification Control,Expense Claim Approved,اخراجات کلیم منظور
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,کوئی کام آرڈر نہیں بنایا گیا
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,ملازم کی تنخواہ کی پرچی {0} نے پہلے ہی اس کی مدت کے لئے پیدا
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,دواسازی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,دواسازی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,خریدی اشیاء کی لاگت
 DocType: Selling Settings,Sales Order Required,سیلز آرڈر کی ضرورت ہے
 DocType: Purchase Invoice,Credit To,کریڈٹ
@@ -2923,7 +2940,7 @@
 DocType: Request for Quotation Supplier,No Quote,کوئی اقتباس نہیں
 DocType: Warranty Claim,Raised By,طرف سے اٹھائے گئے
 DocType: Payment Gateway Account,Payment Account,ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,اکاؤنٹس وصولی میں خالص تبدیلی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,مائکر آف
 DocType: Job Offer,Accepted,قبول کر لیا
@@ -2936,7 +2953,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,تلاش کے نتائج
 DocType: Room,Room Number,کمرہ نمبر
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},غلط حوالہ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},غلط حوالہ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,شپنگ حکمرانی لیبل
 DocType: Journal Entry Account,Payroll Entry,پے رول انٹری
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,فیس ریکارڈز دیکھیں
@@ -2946,7 +2963,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 DocType: Lab Test Sample,Lab Test Sample,لیب ٹیسٹنگ نمونہ
 DocType: Item Variant Settings,Allow Rename Attribute Value,خصوصیت قیمت کا نام تبدیل کرنے کی اجازت دیں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,فوری جرنل اندراج
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,فوری جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
 DocType: Restaurant,Invoice Series Prefix,انوائس سیریل پریفکس
 DocType: Employee,Previous Work Experience,گزشتہ کام کا تجربہ
@@ -2954,8 +2971,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Maps انضمام فعال نہیں ہے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} جمع نہیں ہے
+DocType: Subscription,Trialling,ٹرائلنگ
 DocType: Member,Membership Expiry Date,رکنیت ختم ہونے کی تاریخ
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} واپسی دستاویز میں منفی ہونا ضروری ہے
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} واپسی دستاویز میں منفی ہونا ضروری ہے
 ,Minutes to First Response for Issues,مسائل کے لئے پہلا رسپانس منٹ
 DocType: Purchase Invoice,Terms and Conditions1,شرائط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
@@ -2974,7 +2992,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,پیمائش کی اکائی
 DocType: Fiscal Year,Year End Date,سال کے آخر تاریخ
 DocType: Task Depends On,Task Depends On,کام پر انحصار کرتا ہے
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,موقع
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,موقع
 DocType: Operation,Default Workstation,پہلے سے طے شدہ کارگاہ
 DocType: Notification Control,Expense Claim Approved Message,اخراجات کلیم منظور پیغام
 DocType: Payment Entry,Deductions or Loss,کٹوتیوں یا گمشدگی
@@ -3012,7 +3030,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,بغیر تنخواہ چھٹی منظور شدہ رخصت کی درخواست ریکارڈ کے ساتھ میل نہیں کھاتا
 DocType: Campaign,Campaign-.####,مہم -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,اگلے مراحل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
 DocType: Membership,USD,امریکن روپے
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس بنائیں
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,بقیہ رقم
@@ -3022,7 +3040,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,اختتام سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,معاہدہ اختتام تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,معاہدہ اختتام تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 DocType: Driver,Driver,ڈرائیور
 DocType: Vital Signs,Nutrition Values,غذائی اقدار
 DocType: Lab Test Template,Is billable,قابل ہے
@@ -3033,7 +3051,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),اصل آغاز کی تاریخ (وقت شیٹ کے ذریعے)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,یہ ایک مثال ویب سائٹ ERPNext سے آٹو پیدا کیا جاتا ہے
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,خستہ رینج 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,کل پیشگی رقم کل دعوی رقم سے زیادہ نہیں ہوسکتی ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,کل پیشگی رقم کل دعوی رقم سے زیادہ نہیں ہوسکتی ہے
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3068,7 +3086,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,خصوصیت اقدار منتخب کریں
 DocType: Purchase Invoice,Reason For Issuing document,دستاویز جاری کرنے کے لۓ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
 DocType: Payment Reconciliation,Bank / Cash Account,بینک / کیش اکاؤنٹ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,اگلا رابطے کی طرف سے لیڈ ای میل ایڈریس کے طور پر ایک ہی نہیں ہو سکتا
 DocType: Tax Rule,Billing City,بلنگ شہر
@@ -3085,7 +3103,8 @@
 DocType: Warranty Claim,Service Address,سروس ایڈریس
 DocType: Asset Maintenance Task,Calibration,انشانکن
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} ایک کمپنی کی چھٹی ہے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,فرنیچر اور فکسچر
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,حیثیت کی اطلاع چھوڑ دو
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,فرنیچر اور فکسچر
 DocType: Item,Manufacture,تیاری
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,سیٹ اپ کمپنی
 ,Lab Test Report,لیب ٹیسٹ کی رپورٹ
@@ -3101,7 +3120,6 @@
 DocType: Crop,Planting Area,پودے لگانا ایریا
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),کل (مقدار)
 DocType: Installation Note Item,Installed Qty,نصب مقدار
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,اس میں کچھ غلط ای میل ایڈریسز کی وجہ سے ہوسکتا ہے
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,آپ نے مزید کہا
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,تربیت کا نتیجہ
@@ -3111,16 +3129,17 @@
 DocType: Products Settings,Products per Page,فی صفحہ مصنوعات
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,تنظیم شاخ ماسٹر.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,یا
 DocType: Sales Order,Billing Status,بلنگ کی حیثیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ایک مسئلہ کی اطلاع دیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,یوٹیلٹی اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,یوٹیلٹی اخراجات
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,۹۰ سے بڑھ کر
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,صف # {0}: جرنل اندراج {1} اکاؤنٹ نہیں ہے {2} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
 DocType: Supplier Scorecard Criteria,Criteria Weight,معیار وزن
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,منظوری کی اطلاع چھوڑ دو
 DocType: Buying Settings,Default Buying Price List,پہلے سے طے شدہ خرید قیمت کی فہرست
 DocType: Payroll Entry,Salary Slip Based on Timesheet,تنخواہ کی پرچی Timesheet کی بنیاد پر
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,خریداری کی شرح
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,خریداری کی شرح
 DocType: Notification Control,Sales Order Message,سیلز آرڈر پیغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",وغیرہ کمپنی، کرنسی، رواں مالی سال کی طرح پہلے سے طے شدہ اقدار
 DocType: Payment Entry,Payment Type,ادائیگی کی قسم
@@ -3143,6 +3162,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,خریداری کی ٹوکری کی ترتیبات
 DocType: Journal Entry,Accounting Entries,اکاؤنٹنگ اندراجات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",اگر &#39;قیمت&#39; کے لئے منتخب کردہ قیمت کا تعین کرنے والا اصول بنایا جاتا ہے تو، یہ قیمت کی فہرست کو اوور کر دیں گے. قیمتوں کا تعین کرنے کی شرح کی شرح حتمی شرح ہے، لہذا مزید رعایت نہیں کی جاسکتی ہے. لہذا، سیلز آرڈر، خریداری آرڈر وغیرہ جیسے ٹرانزیکشن میں، یہ &#39;قیمت فہرست کی شرح&#39; فیلڈ کے بجائے &#39;شرح&#39; فیلڈ میں لے جائے گا.
+DocType: Journal Entry,Paid Loan,ادا کردہ قرض
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},انٹری نقل. براہ مہربانی چیک کریں کی اجازت حکمرانی {0}
 DocType: Journal Entry Account,Reference Due Date,حوالہ کی تاریخ کی تاریخ
 DocType: Purchase Order,Ref SQ,ممبران SQ
@@ -3159,7 +3179,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 ,To Produce,پیدا کرنے کے لئے
 apps/erpnext/erpnext/config/hr.py +93,Payroll,پے رول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",صف کے لئے {0} میں {1}. شے کی درجہ بندی میں {2} شامل کرنے کے لئے، قطار {3} بھی شامل کیا جانا چاہئے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",صف کے لئے {0} میں {1}. شے کی درجہ بندی میں {2} شامل کرنے کے لئے، قطار {3} بھی شامل کیا جانا چاہئے
 DocType: Patient Service Unit,Parent Service Unit,والدین سروس یونٹ
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,یوزر بنائیں
 DocType: Packing Slip,Identification of the package for the delivery (for print),کی ترسیل کے لئے پیکج کی شناخت (پرنٹ کے لئے)
@@ -3178,7 +3198,7 @@
 DocType: Shareholder,SH-,ایسیچ-
 DocType: Account,Income Account,انکم اکاؤنٹ
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,ڈلیوری
 DocType: Volunteer,Weekdays,ہفتے کے دن
 DocType: Stock Reconciliation Item,Current Qty,موجودہ مقدار
 DocType: Restaurant Menu,Restaurant Menu,ریسٹورانٹ مینو
@@ -3186,7 +3206,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,ہمیشہ کی انوینٹری کے لئے پہلے سے طے شدہ انوینٹری اکاؤنٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,ہمیشہ کی انوینٹری کے لئے پہلے سے طے شدہ انوینٹری اکاؤنٹ
 DocType: Item Reorder,Material Request Type,مواد درخواست کی قسم
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,گرانٹ کا جائزہ ای میل بھیجیں
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
@@ -3194,10 +3214,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,کمرہ کی صلاحیت
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},آئٹم کے لئے پہلے ہی ریکارڈ موجود ہے {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,ممبران
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,آپ پہلے سے تیار کردہ انوائس کے ریکارڈ کھو جائیں گے. کیا آپ واقعی اس رکنیت کو دوبارہ شروع کرنا چاہتے ہیں؟
 DocType: Lab Test,LP-,ایل پی-
 DocType: Healthcare Settings,Registration Fee,رجسٹریشن فیس
 DocType: Budget,Cost Center,لاگت مرکز
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,واؤچر #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,واؤچر #
 DocType: Notification Control,Purchase Order Message,آرڈر پیغام خریدیں
 DocType: Tax Rule,Shipping Country,شپنگ ملک
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,سیلز معاملات سے گاہک کی ٹیکس ID چھپائیں
@@ -3206,20 +3227,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قیمتوں کا تعین اصول کچھ معیار کی بنیاد پر، / قیمت کی فہرست ادلیکھت ڈسکاؤنٹ فی صد کی وضاحت کرنے کے لئے بنایا ہے.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,گودام صرف اسٹاک انٹری کے ذریعے تبدیل کیا جا سکتا / ڈلیوری نوٹ / خریداری کی رسید
 DocType: Employee Education,Class / Percentage,کلاس / فیصد
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,مارکیٹنگ اور سیلز کے سربراہ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,مارکیٹنگ اور سیلز کے سربراہ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,انکم ٹیکس
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,لیٹر ہیڈز پر جائیں
+DocType: Subscription,Cancel At End Of Period,مدت کے آخر میں منسوخ کریں
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,منتقلی کے لئے منتخب کردہ کوئی آئٹم نہیں
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,منتقلی کے لئے منتخب کردہ کوئی آئٹم نہیں
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام پتے.
 DocType: Company,Stock Settings,اسٹاک ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
 DocType: Vehicle,Electric,بجلی
 DocType: Task,% Progress,٪ پروگریس
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,حاصل / ایسیٹ تلفی پر نقصان
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,حاصل / ایسیٹ تلفی پر نقصان
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",حیثیت &quot;منظور شدہ&quot; کے ساتھ صرف طالب علم درخواست دہندگان کو مندرجہ ذیل میز میں منتخب کیا جائے گا.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,اکاؤنٹ {0} کے لئے اکاؤنٹ نمبر دستیاب نہیں ہے. <br> برائے مہربانی اپنے اکاؤنٹس کے چارٹ درست طریقے سے ترتیب دیں.
 DocType: Task,Depends on Tasks,ٹاسکس پر انحصار کرتا ہے
@@ -3234,6 +3256,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,نہیں اسٹاک میں
 DocType: Volunteer,Volunteer Skills,رضاکارانہ مہارتیں
 DocType: Appraisal,HR User,HR صارف
+DocType: Bank Guarantee,Reference Document Name,حوالہ دستاویز کا نام
 DocType: Purchase Invoice,Taxes and Charges Deducted,ٹیکسز اور الزامات کٹوتی
 apps/erpnext/erpnext/hooks.py +142,Issues,مسائل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},سٹیٹس سے ایک ہونا ضروری {0}
@@ -3247,7 +3270,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
 DocType: Supplier,Billing Currency,بلنگ کی کرنسی
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,اضافی بڑا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,اضافی بڑا
+DocType: Loan,Loan Application,قرض کی درخواست
 DocType: Crop,Scientific Name,سائنسی نام
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,کل پتے
 DocType: Customer,"Reselect, if the chosen contact is edited after save",منتخب کریں، اگر بچانے کے بعد منتخب کردہ رابطہ میں ترمیم کیا جاتا ہے
@@ -3256,13 +3280,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,چیک نمبر
 ,Sales Browser,سیلز براؤزر
 DocType: Journal Entry,Total Credit,کل کریڈٹ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},انتباہ: ایک {0} # {1} اسٹاک داخلے کے خلاف موجود {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},انتباہ: ایک {0} # {1} اسٹاک داخلے کے خلاف موجود {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,مقامی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),قرضوں اور ایڈوانسز (اثاثے)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,دیندار
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,بڑے
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,بڑے
 DocType: Homepage Featured Product,Homepage Featured Product,مرکزی صفحہ نمایاں مصنوعات کی
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,تمام تعین گروپ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,تمام تعین گروپ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نیا گودام نام
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),کل {0} ({1})
 DocType: C-Form Invoice Detail,Territory,علاقہ
@@ -3283,9 +3307,10 @@
 DocType: Fees,Fees,فیس
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,زر مبادلہ کی شرح دوسرے میں ایک کرنسی میں تبدیل کرنے کی وضاحت کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,کوٹیشن {0} منسوخ کر دیا ہے
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,کل بقایا رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,کل بقایا رقم
 DocType: Sales Partner,Targets,اہداف
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,براہ مہربانی کمپنی کی معلومات کی فائل میں سیر نمبر درج کریں
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 DocType: Price List,Price List Master,قیمت کی فہرست ماسٹر
 DocType: GST Account,CESS Account,CESS اکاؤنٹ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
@@ -3294,6 +3319,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,مریض کو منتخب کریں
 DocType: Price List,Applicable for Countries,ممالک کے لئے قابل اطلاق
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,پیرامیٹر کا نام
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,صرف حیثیت کے ساتھ درخواستیں چھوڑ دو &#39;منظور&#39; اور &#39;مسترد&#39; جمع کی جا سکتی
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},طالب علم گروپ کا نام صف {0} میں ضروری ہے
 DocType: Homepage,Products to be shown on website homepage,مصنوعات کی ویب سائٹ کے ہوم پیج پر دکھایا جائے گا
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,یہ ایک جڑ کسٹمر گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -3327,14 +3353,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,انوائس نے پہلے سے ہی تمام بلنگ کے گھنٹوں کے لئے تیار کیا
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},نام کی غلطی: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,مالیاتی لاگت ہے
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
 DocType: Packing Slip,If more than one package of the same type (for print),تو اسی قسم کی ایک سے زیادہ پیکج (پرنٹ کے لئے)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,براہ کرم ریستوران ترتیبات میں ڈیفالٹ کسٹمر مقرر کریں
 ,Salary Register,تنخواہ رجسٹر
 DocType: Warehouse,Parent Warehouse,والدین گودام
-DocType: C-Form Invoice Detail,Net Total,نیٹ کل
+DocType: Subscription,Net Total,نیٹ کل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},پہلے سے طے شدہ BOM آئٹم کے لئے نہیں پایا {0} اور پروجیکٹ {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,مختلف قرض کی اقسام کی وضاحت کریں
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,مختلف قرض کی اقسام کی وضاحت کریں
 DocType: Bin,FCFS Rate,FCFS شرح
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,بقایا رقم
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ٹائم (منٹ میں)
@@ -3366,11 +3392,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,روٹ اکاؤنٹ ایک گروپ ہونا ضروری ہے
 DocType: Drug Prescription,Drug Prescription,دوا نسخہ
 DocType: Fees,FEE.,فیس.
-DocType: Employee Loan,Repaid/Closed,چکایا / بند کر دیا
+DocType: Loan,Repaid/Closed,چکایا / بند کر دیا
 DocType: Item,Total Projected Qty,کل متوقع مقدار
 DocType: Monthly Distribution,Distribution Name,ڈسٹری بیوشن کا نام
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",آئٹم {0} کے لئے وابستہ کی شرح نہیں، جس میں {1} {2} کے اکاؤنٹنگ اندراج کرنا ضروری ہے. اگر آئٹم 1 {1} میں صفر کی قیمتوں کی شرح کی شرح کے طور پر ٹرانسمیشن کررہا ہے تو، براہ کرم اسے {1} آئٹم ٹیبل میں بتائیں. دوسری صورت میں، براہ کرم شے کے لئے آنے والا اسٹاک ٹرانزیکشن بنائیں یا شے کی ریکارڈ میں قیمتوں کی شرح کا ذکر کریں، اور پھر اس اندراج جمع کرانے / منسوخ کرنے کی کوشش کریں.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 DocType: Course,Course Code,کورس کوڈ
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},آئٹم کے لئے ضروری معیار معائنہ {0}
 DocType: POS Settings,Use POS in Offline Mode,آف لائن موڈ میں POS استعمال کریں
@@ -3390,16 +3415,15 @@
 DocType: Purchase Invoice,Deemed Export,ڈیمیٹڈ برآمد
 DocType: Stock Entry,Material Transfer for Manufacture,تیاری کے لئے مواد کی منتقلی
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ڈسکاؤنٹ فی صد قیمت کی فہرست کے خلاف یا تمام قیمت کی فہرست کے لئے یا تو لاگو کیا جا سکتا.
-DocType: Subscription,Half-yearly,چھماہی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Lab Test,LabTest Approver,LabTest کے قریب
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,آپ نے پہلے ہی تشخیص کے معیار کے تعین کی ہے {}.
 DocType: Vehicle Service,Engine Oil,انجن کا تیل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},کام کے حکموں کو تشکیل دیا گیا: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},کام کے حکموں کو تشکیل دیا گیا: {0}
 DocType: Sales Invoice,Sales Team1,سیلز Team1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Sales Invoice,Customer Address,گاہک پتہ
-DocType: Employee Loan,Loan Details,قرض کی تفصیلات
+DocType: Loan,Loan Details,قرض کی تفصیلات
 DocType: Company,Default Inventory Account,پہلے سے طے شدہ انوینٹری اکاؤنٹ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,فولیو نمبر مماثل نہیں ہیں
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
@@ -3411,19 +3435,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,تمام زمین یونٹس کا ایک لنک جس میں فصل بڑھ رہی ہے
 DocType: Account,Root Type,جڑ کی قسم
 DocType: Item,FIFO,فیفو
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},صف # {0}: سے زیادہ واپس نہیں کر سکتے ہیں {1} شے کے لئے {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},صف # {0}: سے زیادہ واپس نہیں کر سکتے ہیں {1} شے کے لئے {2}
 DocType: Item Group,Show this slideshow at the top of the page,صفحے کے سب سے اوپر اس سلائڈ شو دکھانے کے
 DocType: BOM,Item UOM,آئٹم UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},ہدف گودام صف کے لئے لازمی ہے {0}
 DocType: Cheque Print Template,Primary Settings,بنیادی ترتیبات
 DocType: Purchase Invoice,Select Supplier Address,منتخب سپلائر ایڈریس
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,ملازمین شامل کریں
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,ملازمین شامل کریں
 DocType: Purchase Invoice Item,Quality Inspection,معیار معائنہ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,اضافی چھوٹے
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,اضافی چھوٹے
 DocType: Company,Standard Template,سٹینڈرڈ سانچہ
 DocType: Training Event,Theory,نظریہ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
@@ -3443,11 +3467,10 @@
 DocType: SMS Log,No of Sent SMS,بھیجے گئے SMS کی کوئی
 DocType: Antibiotic,Healthcare Administrator,صحت کی انتظامیہ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,ایک ہدف مقرر کریں
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
 DocType: Dosage Strength,Dosage Strength,خوراک کی طاقت
 DocType: Account,Expense Account,ایکسپینس اکاؤنٹ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,سافٹ ویئر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,رنگین
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,رنگین
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,تشخیص کی منصوبہ بندی کا کلیہ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,ختم ہونے کی تاریخ منتخب کردہ شے کے لئے لازمی ہے
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,خریداری کے احکامات کو روکیں
@@ -3460,18 +3483,18 @@
 DocType: Patient,Personal and Social History,ذاتی اور سماجی تاریخ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,صارف {0} پیدا ہوا
 DocType: Fee Schedule,Fee Breakup for each student,ہر طالب علم کے لئے فیس بریک اپ
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اسمان ماہ میں اہداف تقسیم کرنے ماہانہ تقسیم کریں.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,کوڈ تبدیل کریں
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ڈیزل
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
 DocType: Purchase Invoice,Availed ITC Cess,آئی ٹی سی سیس کا دورہ
 ,Student Monthly Attendance Sheet,Student کی ماہانہ حاضری شیٹ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,فروخت کے لئے صرف شپنگ اصول لاگو ہوتا ہے
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,اس منصوبے کے آغاز کی تاریخ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,جب تک
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,جب تک
 DocType: Rename Tool,Rename Log,لاگ ان کا نام تبدیل کریں
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,طالب علم گروپ یا کورس شیڈول لازمی ہے
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,طالب علم گروپ یا کورس شیڈول لازمی ہے
@@ -3492,7 +3515,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,آپ کی مصنوعات یا خدمات جو آپ خریدتے ہیں یا فروخت کرتے ہیں وہ فہرست کریں.
 DocType: Water Analysis,Storage Temperature,ذخیرہ اندوزی کا درجہ حرارت
 DocType: Employee Attendance Tool,Unmarked Attendance,بے نشان حاضری
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,محقق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,محقق
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,پروگرام کے اندراج کے آلے کے طالب علم
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},آغاز کی تاریخ کو کام کے لئے ختم ہونے والی تاریخ سے کم ہونا چاہئے {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,نام یا ای میل لازمی ہے
@@ -3505,7 +3528,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو آر ایف پی کو احتیاط سے جاری کیا جاسکتا ہے.
 DocType: Chapter,Non Profit Manager,غیر منافع بخش مینیجر
 DocType: BOM,Total Cost(Company Currency),کل لاگت (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,{0} پیدا سیریل نمبر
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,{0} پیدا سیریل نمبر
 DocType: Homepage,Company Description for website homepage,ویب سائٹ کے ہوم پیج کے لئے کمپنی کی تفصیل
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",گاہکوں کی سہولت کے لئے، یہ کوڈ انوائس اور ترسیل نوٹوں کی طرح پرنٹ کی شکل میں استعمال کیا جا سکتا
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier نام
@@ -3515,11 +3538,10 @@
 DocType: Employee,You can enter any date manually,آپ کو دستی طور کسی بھی تاریخ درج کر سکتے ہیں
 DocType: Healthcare Settings,Result Printed,نتائج پرنٹ
 DocType: Asset Category Account,Depreciation Expense Account,ہراس خرچ کے حساب
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,آزماءیشی عرصہ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},دیکھیں {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,آزماءیشی عرصہ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,صرف پتی نوڈس ٹرانزیکشن میں اجازت دی جاتی ہے
 DocType: Project,Total Costing Amount (via Timesheets),مجموعی قیمت (ٹائم شیشے کے ذریعہ)
-DocType: Employee Advance,Expense Approver,اخراجات کی منظوری دینے والا
+DocType: Department,Expense Approver,اخراجات کی منظوری دینے والا
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,صف {0}: کسٹمر کے خلاف کی کریڈٹ ہونا ضروری ہے
 DocType: Project,Hourly,گھنٹہ وار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,گروپ غیر گروپ
@@ -3528,7 +3550,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,تریخ ویلہ لئے
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,ایس ایم ایس کی ترسیل کی حیثیت برقرار رکھنے کے لئے نوشتہ جات
 DocType: Accounts Settings,Make Payment via Journal Entry,جرنل اندراج کے ذریعے ادائیگی
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,طباعت پر
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,طباعت پر
 DocType: Item,Inspection Required before Delivery,انسپکشن ڈیلیوری سے پہلے کی ضرورت
 DocType: Item,Inspection Required before Purchase,انسپکشن خریداری سے پہلے کی ضرورت
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,زیر سرگرمیاں
@@ -3538,7 +3560,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,کم از کم منگوانے والی مقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,اپنی تنظیم
 DocType: Fee Component,Fees Category,فیس زمرہ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,ملازم مطلع کریں
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,انکوائری کے ذریعہ مہم ہے تو مہم کا نام درج کریں
@@ -3548,7 +3570,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,ترتیب لیول
 DocType: Company,Chart Of Accounts Template,اکاؤنٹس سانچے کا چارٹ
 DocType: Attendance,Attendance Date,حاضری تاریخ
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},شے کی قیمت {0} میں قیمت کی فہرست کے لئے اپ ڈیٹ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},شے کی قیمت {0} میں قیمت کی فہرست کے لئے اپ ڈیٹ {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,کمائی اور کٹوتی کی بنیاد پر تنخواہ ٹوٹنے.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ اکاؤنٹ اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
 DocType: Purchase Invoice Item,Accepted Warehouse,منظور گودام
@@ -3556,10 +3578,11 @@
 DocType: Item,Valuation Method,تشخیص کا طریقہ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,مارک آدھے دن
 DocType: Sales Invoice,Sales Team,سیلز ٹیم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,ڈوپلیکیٹ اندراج
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ڈوپلیکیٹ اندراج
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,جمع کرنے سے قبل لفافی کے نام درج کریں.
 DocType: Program Enrollment Tool,Get Students,طلبا حاصل کریں
 DocType: Serial No,Under Warranty,وارنٹی کے تحت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[خرابی]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[خرابی]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,آپ کی فروخت کے آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
 ,Employee Birthday,ملازم سالگرہ
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,مکمل مرمت کے لئے مکمل کرنے کی تاریخ کا انتخاب کریں
@@ -3578,7 +3601,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,ذیلی معاہدہ کرنے کے لئے محفوظ ہے
 DocType: Payment Reconciliation Invoice,Invoice Number,انوائس تعداد
 DocType: Shopping Cart Settings,Orders,احکامات
-DocType: Employee Leave Approver,Leave Approver,منظوری دینے والا چھوڑ دو
+DocType: Department,Leave Approver,منظوری دینے والا چھوڑ دو
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,ایک بیچ براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,صحافی
 DocType: Assessment Group,Assessment Group Name,تجزیہ گروپ کا نام
@@ -3623,7 +3646,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,حب ٹریک کردہ آئٹم
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,وصول کنندہ کے لئے ORIGINAL
 DocType: Asset Category Account,Accumulated Depreciation Account,جمع ہراس اکاؤنٹ
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,یہ ای میل autogenerated ہے
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
 DocType: Program Enrollment,Boarding Student,بورڈنگ طالب علم
 DocType: Asset,Expected Value After Useful Life,مفید زندگی کے بعد کی متوقع قدر
@@ -3648,22 +3670,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},حاضری کا ریکارڈ {0} طالب علم کے خلاف موجود {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},حوالہ # {0} ء {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,ہراس اثاثوں کی تلفی کی وجہ سے کرنے کا خاتمہ
-DocType: Member,Member,رکن
+DocType: Loan,Member,رکن
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,پتے کا انتظام
 DocType: Work Order Item,Work Order Item,کام آرڈر آئٹم
 DocType: Pricing Rule,Item Code,آئٹم کوڈ
 DocType: Serial No,Warranty / AMC Details,وارنٹی / AMC تفصیلات
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 DocType: Journal Entry,User Remark,صارف تبصرہ
 DocType: Lead,Market Segment,مارکیٹ کے علاقے
 DocType: Agriculture Analysis Criteria,Agriculture Manager,زراعت مینیجر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},ادائیگی کی رقم مجموعی منفی بقایا رقم {0} سے زیادہ نہیں ہوسکتی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},ادائیگی کی رقم مجموعی منفی بقایا رقم {0} سے زیادہ نہیں ہوسکتی ہے
 DocType: Supplier Scorecard Period,Variables,متغیرات
 DocType: Employee Internal Work History,Employee Internal Work History,ملازم اندرونی کام تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),بند (ڈاکٹر)
 DocType: Cheque Print Template,Cheque Size,چیک سائز
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,نہیں اسٹاک میں سیریل نمبر {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,نہیں اسٹاک میں سیریل نمبر {0}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,لین دین کی فروخت کے لئے ٹیکس سانچے.
 DocType: Sales Invoice,Write Off Outstanding Amount,بقایا رقم لکھنے
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},اکاؤنٹ {0} کمپنی کے ساتھ میل نہیں کھاتا {1}
@@ -3672,7 +3694,6 @@
 DocType: Stock Settings,Default Stock UOM,پہلے سے طے شدہ اسٹاک UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations کی تعداد بک
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,مقدار کل
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},ملازمین کے قرضے کے خلاف: {0}
 DocType: Landed Cost Item,Receipt Document,رسید دستاویز
 DocType: Employee Education,School/University,سکول / یونیورسٹی
 DocType: Payment Request,Reference Details,حوالہ تفصیلات
@@ -3683,7 +3704,7 @@
 DocType: Asset,Double Declining Balance,ڈبل کمی توازن
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,بند آرڈر منسوخ نہیں کیا جا سکتا. منسوخ کرنے کے لئے Unclose.
 DocType: Student Guardian,Father,فادر
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;اپ ڈیٹ اسٹاک&#39; فکسڈ اثاثہ کی فروخت کے لئے نہیں کی جانچ پڑتال کی جا سکتی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;اپ ڈیٹ اسٹاک&#39; فکسڈ اثاثہ کی فروخت کے لئے نہیں کی جانچ پڑتال کی جا سکتی ہے
 DocType: Bank Reconciliation,Bank Reconciliation,بینک مصالحتی
 DocType: Attendance,On Leave,چھٹی پر
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,تازہ ترین معلومات حاصل کریں
@@ -3697,10 +3718,10 @@
 DocType: Lead,Lower Income,کم آمدنی
 DocType: Restaurant Order Entry,Current Order,موجودہ آرڈر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},ذریعہ اور ہدف گودام صف کے لئے ہی نہیں ہو سکتا {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},معاوضہ رقم قرض کی رقم سے زیادہ نہیں ہوسکتی ہے {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},معاوضہ رقم قرض کی رقم سے زیادہ نہیں ہوسکتی ہے {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,پروگراموں پر جائیں
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},قطار {0} # تخصیص کردہ رقم {1} غیر مقفل شدہ رقم سے زیادہ نہیں ہوسکتی ہے {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},قطار {0} # تخصیص کردہ رقم {1} غیر مقفل شدہ رقم سے زیادہ نہیں ہوسکتی ہے {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;تاریخ سے&#39; کے بعد &#39;تاریخ کے لئے&#39; ہونا ضروری ہے
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},حیثیت کو تبدیل نہیں کر سکتے کیونکہ طالب علم {0} طالب علم کی درخواست کے ساتھ منسلک ہے {1}
@@ -3723,7 +3744,6 @@
 DocType: Payment Terms Template,Payment Terms,ادائیگی کی شرائط
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,منٹ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 DocType: Purchase Invoice,Purchase Taxes and Charges,ٹیکس اور الزامات کی خریداری
 DocType: Chapter,Meetup Embed HTML,میٹنگ اپ ایچ ٹی ایم ایل کو شامل کریں
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,سپلائرز پر جائیں
@@ -3743,30 +3763,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},کوٹیشن {0} نہیں قسم کی {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,بحالی کے شیڈول آئٹم
 DocType: Sales Order,%  Delivered,پھچ چوکا ٪
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,براہ کرم طالب علم کے لئے ادائیگی کی درخواست بھیجنے کے لئے ای میل کی شناخت کریں
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,براہ کرم طالب علم کے لئے ادائیگی کی درخواست بھیجنے کے لئے ای میل کی شناخت کریں
 DocType: Patient,Medical History,طبی تاریخ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,بینک وورڈرافٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,بینک وورڈرافٹ اکاؤنٹ
 DocType: Patient,Patient ID,مریض کی شناخت
 DocType: Physician Schedule,Schedule Name,شیڈول کا نام
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,تنخواہ پرچی بنائیں
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,تمام سپلائرز شامل کریں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,تمام سپلائرز شامل کریں
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,صف # {0}: مختص رقم بقایا رقم سے زیادہ نہیں ہو سکتا.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,براؤز BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,محفوظ قرضوں
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,محفوظ قرضوں
 DocType: Purchase Invoice,Edit Posting Date and Time,ترمیم پوسٹنگ کی تاریخ اور وقت
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},میں اثاثہ زمرہ {0} یا کمپنی ہراس متعلقہ اکاؤنٹس مقرر مہربانی {1}
 DocType: Lab Test Groups,Normal Range,عام رینج
 DocType: Academic Term,Academic Year,تعلیمی سال
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,دستیاب فروخت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,ن
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,باقی
 DocType: Appraisal,Appraisal,تشخیص
+DocType: Loan,Loan Account,قرض اکاؤنٹ
 DocType: Purchase Invoice,GST Details,GST تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},ای میل بھیجنے والے کو {0}
 DocType: Item,Default Sales Unit of Measure,ماپنے ڈیفالٹ سیلز یونٹ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,تعلیمی سال:
+DocType: Subscription,Past Due Date,ماضی کی تاریخ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,مجاز دستخط
@@ -3778,7 +3800,7 @@
 DocType: Patient Appointment,Patient Appointment,مریض کی تقرری
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,کردار منظوری حکمرانی کے لئے لاگو ہوتا ہے کردار کے طور پر ہی نہیں ہو سکتا
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,اس ای میل ڈائجسٹ سے رکنیت ختم
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,سپلائرز کی طرف سے حاصل کریں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,سپلائرز کی طرف سے حاصل کریں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} آئٹم کے لئے نہیں مل سکا {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,کورسز پر جائیں
 DocType: Accounts Settings,Show Inclusive Tax In Print,پرنٹ میں شامل ٹیکس دکھائیں
@@ -3786,10 +3808,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیغام بھیجا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,بچے نوڈس کے ساتھ اکاؤنٹ اکاؤنٹ کے طور پر مقرر نہیں کیا جا سکتا
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیمی&gt; تعلیمی ترتیبات میں انسٹرکٹر نامیاتی نظام قائم کریں
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,شرح جس قیمت کی فہرست کرنسی میں گاہکوں کی بنیاد کرنسی تبدیل کیا جاتا ہے
 DocType: Purchase Invoice Item,Net Amount (Company Currency),نیول رقم (کمپنی کرنسی)
 DocType: Physician,Physician Schedules,معالج شیڈول
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,کل پیشگی رقم مجموعی منظور شدہ رقم سے زیادہ نہیں ہوسکتی ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,کل پیشگی رقم مجموعی منظور شدہ رقم سے زیادہ نہیں ہوسکتی ہے
 DocType: Salary Slip,Hour Rate,گھنٹے کی شرح
 DocType: Stock Settings,Item Naming By,شے کی طرف سے نام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ایک اور مدت بند انٹری {0} کے بعد بنایا گیا ہے {1}
@@ -3807,6 +3830,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},نہیں کے مقابلے میں بڑی عمر کے اسٹاک لین دین کو اپ ڈیٹ کرنے کی اجازت دی {0}
 DocType: BOM,Inspection Required,معائنہ مطلوب
 DocType: Purchase Invoice Item,PR Detail,پی آر تفصیل
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,جمع کرنے سے پہلے بینک گارنٹی نمبر درج کریں.
 DocType: Driving License Category,Class,کلاس
 DocType: Sales Order,Fully Billed,مکمل طور پر بل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,آئٹم کے آرڈر کے خلاف کام آرڈر نہیں اٹھایا جا سکتا ہے
@@ -3817,7 +3841,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),پیکج کی مجموعی وزن. عام طور پر نیٹ وزن پیکیجنگ مواد وزن. (پرنٹ کے لئے)
 DocType: Assessment Plan,Program,پروگرام کا
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,اس کردار کے ساتھ صارفین کو منجمد اکاؤنٹس کے خلاف اکاؤنٹنگ اندراجات منجمد اکاؤنٹس قائم کرنے اور تخلیق / ترمیم کریں کرنے کی اجازت ہے
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیمی&gt; تعلیمی ترتیبات میں انسٹریکٹر نامی نظام قائم کریں
 DocType: Serial No,Is Cancelled,منسوخ ہے
 DocType: Student Group,Group Based On,گروپ کی بنیاد پر
 DocType: Journal Entry,Bill Date,بل تاریخ
@@ -3828,9 +3851,10 @@
 DocType: Cheque Print Template,Cheque Height,چیک اونچائی
 DocType: Supplier,Supplier Details,پردایک تفصیلات
 DocType: Setup Progress,Setup Progress,سیٹ اپ پیش رفت
+DocType: Expense Claim,Approval Status,منظوری کی حیثیت
 DocType: Hub Settings,Publish Items to Hub,حب اشیا شائع
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},قیمت صف میں قدر سے کم ہونا ضروری ہے سے {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,وائر ٹرانسفر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,وائر ٹرانسفر
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,تمام چیک کریں
 ,Issued Items Against Work Order,کام آرڈر کے خلاف جاری اشیاء
 DocType: Vehicle Log,Invoice Ref,انوائس کے ممبران
@@ -3861,12 +3885,11 @@
 DocType: Customs Tariff Number,Tariff Number,ٹیرف نمبر
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP گودام پر دستیاب قی
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,متوقع
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},سیریل نمبر {0} گودام سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},سیریل نمبر {0} گودام سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,نوٹ: {0} مقدار یا رقم 0 ہے کے طور پر کی ترسیل اور زیادہ بکنگ شے کے لئے نظام کی جانچ پڑتال نہیں کرے گا
 DocType: Notification Control,Quotation Message,کوٹیشن پیغام
-DocType: Employee Loan,Employee Loan Application,ملازم کے قرض کی درخواست
 DocType: Issue,Opening Date,افتتاحی تاریخ
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,براہ کرم سب سے پہلے مریض کو محفوظ کریں
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,براہ کرم سب سے پہلے مریض کو محفوظ کریں
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,حاضری کامیابی سے نشان لگا دیا گیا ہے.
 DocType: Program Enrollment,Public Transport,پبلک ٹرانسپورٹ
 DocType: Soil Texture,Silt Composition (%),سلت ساختہ (٪)
@@ -3884,7 +3907,7 @@
 ,Item Balance (Simple),آئٹم بیلنس (سادہ)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,سپلائر کی طرف سے اٹھائے بل.
 DocType: POS Profile,Write Off Account,اکاؤنٹ لکھنے
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,ڈیبٹ نوٹ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,ڈیبٹ نوٹ AMT
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,ڈسکاؤنٹ رقم
 DocType: Purchase Invoice,Return Against Purchase Invoice,کے خلاف خریداری کی رسید واپس
 DocType: Item,Warranty Period (in days),(دن میں) وارنٹی مدت
@@ -3907,6 +3930,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,سیلز آرڈر کی تاریخ
 DocType: Sales Invoice Item,Delivered Qty,ہونے والا مقدار
 DocType: Assessment Plan,Assessment Plan,تشخیص کی منصوبہ بندی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,ریورس جرنل انٹری
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,کسٹمر {0} پیدا ہوتا ہے.
 DocType: Stock Settings,Limit Percent,حد فیصد
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,فی الحال کوئی اسٹاک کسی بھی گودام میں دستیاب نہیں ہے
@@ -3920,14 +3944,15 @@
 DocType: Journal Entry,Stock Entry,اسٹاک انٹری
 DocType: Payment Entry,Payment References,ادائیگی حوالہ جات
 DocType: C-Form,C-FORM-,C-کریں-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",وقفہ فیلڈ کے لئے وقفے کی تعداد مثال کے طور پر اگر انٹراول &#39;دن&#39; اور بلنگ کی منتقلی کا شمار 3 ہے، تو انوائس ہر 3 دنوں میں پیدا ہوجائے گی.
 DocType: Vehicle,Insurance Details,انشورنس کی تفصیلات دیکھیں
 DocType: Account,Payable,قابل ادائیگی
 DocType: Share Balance,Share Type,اشتراک کی قسم
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,واپسی کا دورانیہ درج کریں
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,واپسی کا دورانیہ درج کریں
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),دیندار ({0})
 DocType: Pricing Rule,Margin,مارجن
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نئے گاہکوں
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,کل منافع ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,کل منافع ٪
 DocType: Appraisal Goal,Weightage (%),اہمیت (٪)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS پروفائل کو تبدیل کریں
 DocType: Bank Reconciliation Detail,Clearance Date,کلیئرنس تاریخ
@@ -3937,10 +3962,11 @@
 DocType: Lead,Address Desc,DESC ایڈریس
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,پارٹی لازمی ہے
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},دوسرے صفوں میں ڈپلیکیٹ کی تاریخوں کے ساتھ ریلوے پایا گیا: {فہرست}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},دوسرے صفوں میں ڈپلیکیٹ کی تاریخوں کے ساتھ ریلوے پایا گیا: {فہرست}
 DocType: Topic,Topic Name,موضوع کا نام
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,براہ کرم HR ترتیبات میں اجازت منظوری کی اطلاع کیلئے ڈیفالٹ سانچے مقرر کریں.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,فروخت یا خرید کی کم سے کم ایک منتخب ہونا ضروری ہے
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,ملازم کو پیش کرنے کے لئے ملازم کا انتخاب کریں.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,ملازم کو پیش کرنے کے لئے ملازم کا انتخاب کریں.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,براہ کرم ایک درست تاریخ منتخب کریں
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,آپ کے کاروبار کی نوعیت کو منتخب کریں.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3959,7 +3985,7 @@
 DocType: Asset Movement,Source Warehouse,ماخذ گودام
 DocType: Installation Note,Installation Date,تنصیب کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,شریک لیڈر
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},صف # {0}: اثاثہ {1} کی کمپنی سے تعلق نہیں ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},صف # {0}: اثاثہ {1} کی کمپنی سے تعلق نہیں ہے {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,سیلز انوائس {0} نے پیدا کیا
 DocType: Employee,Confirmation Date,توثیق تاریخ
 DocType: C-Form,Total Invoiced Amount,کل انوائس کی رقم
@@ -3968,7 +3994,7 @@
 DocType: Account,Accumulated Depreciation,جمع ہراس
 DocType: Supplier Scorecard Scoring Standing,Standing Name,اسٹینڈنگ نام
 DocType: Stock Entry,Customer or Supplier Details,مستقل خریدار یا سپلائر تفصیلات
-DocType: Employee Loan Application,Required by Date,تاریخ کی طرف سے کی ضرورت
+DocType: Loan Application,Required by Date,تاریخ کی طرف سے کی ضرورت
 DocType: Lead,Lead Owner,لیڈ مالک
 DocType: Production Plan,Sales Orders Detail,سیلز آرڈر کی تفصیل
 DocType: Bin,Requested Quantity,درخواست کی مقدار
@@ -3981,10 +4007,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,مجموعی پے - کل کٹوتی - قرض کی واپسی
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,موجودہ BOM اور نئی BOM ہی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,تنخواہ کی پرچی ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ایک سے زیادہ متغیرات
 DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ پھنچ گیا
+DocType: Subscription,Trial Period Start Date,آزمائشی مدت شروع کی تاریخ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ماہانہ تقسیم فی صد
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,براہ کرم دوسرے صارف کے طور پر لاگ ان کریں.
@@ -4005,12 +4032,11 @@
 DocType: Student Guardian,Student Guardian,طالب علم گارڈین
 DocType: Member,Member Name,رکن کا نام
 DocType: Stock Settings,Use Naming Series,نام کا سلسلہ استعمال کریں
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,تشخیص قسم کے الزامات شامل کے طور پر نشان نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,تشخیص قسم کے الزامات شامل کے طور پر نشان نہیں کر سکتے ہیں
 DocType: POS Profile,Update Stock,اپ ڈیٹ اسٹاک
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,رکنیت میں
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,اشیاء کے لئے مختلف UOM غلط (کل) نیٹ وزن کی قیمت کی قیادت کریں گے. ہر شے کے نیٹ وزن اسی UOM میں ہے اس بات کو یقینی بنائیں.
 DocType: Membership,Payment Details,ادائیگی کی تفصیلات
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM کی شرح
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM کی شرح
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",روک دیا کام کا آرڈر منسوخ نہیں کیا جاسکتا، اسے منسوخ کرنے کے لئے سب سے پہلے غیرقانونی
 DocType: Asset,Journal Entry for Scrap,سکریپ کے لئے جرنل اندراج
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ترسیل کے نوٹ سے اشیاء پر ھیںچو کریں
@@ -4030,6 +4056,7 @@
 DocType: Land Unit,Land Unit,زمین کا یونٹ
 ,Purchase Analytics,خریداری کے تجزیات
 DocType: Sales Invoice Item,Delivery Note Item,ترسیل کے نوٹ آئٹم
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,موجودہ انوائس {0} غائب ہے
 DocType: Asset Maintenance Log,Task,ٹاسک
 DocType: Purchase Taxes and Charges,Reference Row #,حوالہ صف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},بیچ نمبر شے کے لئے لازمی ہے {0}
@@ -4042,7 +4069,7 @@
 DocType: Company,Exchange Gain / Loss Account,ایکسچینج حاصل / نقصان کے اکاؤنٹ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ملازم اور حاضری
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},مقصد میں سے ایک ہونا ضروری ہے {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,فارم بھریں اور اس کو بچانے کے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,فارم بھریں اور اس کو بچانے کے
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,فورم
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,اسٹاک میں اصل قی
 DocType: Homepage,"URL for ""All Products""",کے لئے &quot;تمام مصنوعات&quot; URL
@@ -4056,7 +4083,7 @@
 DocType: Lab Test Template,Standard Selling Rate,سٹینڈرڈ فروخت کی شرح
 DocType: Account,Rate at which this tax is applied,اس ٹیکس لاگو کیا جاتا ہے جس میں شرح
 DocType: Cash Flow Mapper,Section Name,سیکشن کا نام
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,ترتیب مقدار
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,ترتیب مقدار
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,موجودہ کام سوراخ
 DocType: Company,Stock Adjustment Account,اسٹاک ایڈجسٹمنٹ بلنگ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لکھ دینا
@@ -4067,9 +4094,9 @@
 DocType: Task,depends_on,منحصرکرتاہے
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,مواد کے تمام بلوں میں تازہ ترین قیمت کو اپ ڈیٹ کرنے کے لئے قطع نظر. یہ چند منٹ لگ سکتا ہے.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نئے اکاؤنٹ کا نام. نوٹ: صارفین اور سپلائرز کے اکاؤنٹس کی تخلیق نہیں کرتے ہیں براہ مہربانی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ملک وار طے شدہ ایڈریس سانچے
 DocType: Water Analysis,Appearance,ظہور
+DocType: HR Settings,Leave Status Notification Template,اسٹیٹ نوٹیفیکیشن سانچہ چھوڑ دو
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,اوسط. قیمت کی فہرست کی قیمت خریدیں
 DocType: Sales Order Item,Supplier delivers to Customer,پردایک کسٹمر کو فراہم
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,رکن کی معلومات.
@@ -4092,7 +4119,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,اجازت نہیں. برائے مہربانی ٹیسٹ سانچہ کو غیر فعال کریں
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,فیصدی ایلوکیشن 100٪ کے برابر ہونا چاہئے
 DocType: Crop Cycle,Linked Land Unit,لنک لینڈ یونٹ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
@@ -4108,7 +4135,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,صارفین پر جائیں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ادائیگی کی رقم رقم گرینڈ کل سے زیادہ نہیں ہو سکتا لکھنے +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} شے کے لئے ایک درست بیچ نمبر نہیں ہے {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},نوٹ: حکم کی قسم کے لئے کافی چھٹی توازن نہیں ہے {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},نوٹ: حکم کی قسم کے لئے کافی چھٹی توازن نہیں ہے {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,غلط GSTIN یا غیر رجسٹرڈ لئے NA درج
 DocType: Training Event,Seminar,سیمینار
 DocType: Program Enrollment Fee,Program Enrollment Fee,پروگرام کے اندراج کی فیس
@@ -4124,14 +4151,14 @@
 DocType: Hub Settings,Publish Availability,دستیابی شائع
 DocType: Company,Create Chart Of Accounts Based On,اکاؤنٹس کی بنیاد پر چارٹ بنائیں
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,اسے غیر گروپ میں تبدیل نہیں کر سکتا. بچے کے کام موجود ہیں.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
 ,Stock Ageing,اسٹاک خستہ
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},طالب علم {0} طالب علم کے درخواست دہندگان کے خلاف موجود ہے {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),راؤنڈنگ ایڈجسٹمنٹ (کمپنی کی کرنسی)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,وقت شیٹ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,بیچ:
 DocType: Volunteer,Afternoon,دوپہر
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,کھولنے کے طور پر مقرر کریں
 DocType: Cheque Print Template,Scanned Cheque,سکین شدہ چیک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,جمع لین دین پر خود کار طریقے سے رابطے ای میلز بھیجیں.
@@ -4147,7 +4174,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,پروجیکٹ {0} پہلے ہی موجود ہے
 DocType: Medical Department,Nursing User,نرسنگ صارف
 DocType: Plant Analysis,Plant Analysis Criterias,پلانٹ تجزیہ Criterias
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,ذمہ داریاں
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},سیریل نمبر {0} بیچ سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,ذمہ داریاں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,اس کوٹیشن کی مدت کی مدت ختم ہوگئی ہے.
 DocType: Expense Claim Account,Expense Claim Account,اخراجات دعوی اکاؤنٹ
 DocType: Accounts Settings,Allow Stale Exchange Rates,اسٹیل ایکسچینج کی قیمت کی اجازت دیں
@@ -4169,11 +4197,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,متغیرات بنائیں
 DocType: Item,Default BOM,پہلے سے طے شدہ BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),کل بل رقم (سیلز انوائس کے ذریعہ)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,ڈیبٹ نوٹ رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,ڈیبٹ نوٹ رقم
 DocType: Project Update,Not Updated,تازہ کاری نہیں
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",شرح، نمبروں میں سے نہیں اور حساب کی رقم کے درمیان متضاد ہیں
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,دوبارہ ٹائپ کمپنی کا نام کی توثیق کے لئے براہ کرم
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,کل بقایا AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,کل بقایا AMT
 DocType: Journal Entry,Printing Settings,پرنٹنگ ترتیبات
 DocType: Employee Advance,Advance Account,ایڈوانس اکاؤنٹ
 DocType: Job Offer,Job Offer Terms,ملازمت کی پیشکش کی شرائط
@@ -4182,7 +4210,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,آٹوموٹو
 DocType: Vehicle,Insurance Company,انشورنس کمپنی
 DocType: Asset Category Account,Fixed Asset Account,فکسڈ اثاثہ اکاؤنٹ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,رکن کی
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,رکن کی
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ترسیل کے نوٹ سے
 DocType: Chapter,Members,اراکین
 DocType: Student,Student Email Address,طالب علم کا ای میل ایڈریس
@@ -4206,7 +4234,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,انٹرن
 DocType: Delivery Stop,Address Name,ایڈریس نام
 DocType: Stock Entry,From BOM,BOM سے
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} کی تقسیم {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} کی تقسیم {0}
 DocType: Assessment Code,Assessment Code,تشخیص کے کوڈ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,بنیادی
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} منجمد کر رہے ہیں سے پہلے اسٹاک لین دین
@@ -4214,25 +4242,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
 DocType: Bank Reconciliation Detail,Payment Document,ادائیگی دستاویز
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,معیار فارمولہ کا اندازہ کرنے میں خرابی
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,شمولیت کی تاریخ پیدائش کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,شمولیت کی تاریخ پیدائش کی تاریخ سے زیادہ ہونا چاہیے
+DocType: Subscription,Plans,منصوبوں
 DocType: Salary Slip,Salary Structure,تنخواہ ساخت
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,ایئرلائن
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,مسئلہ مواد
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,بار بار پیدا کرنے میں ایک خرابی ہوئی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,مسئلہ مواد
 DocType: Material Request Item,For Warehouse,گودام کے لئے
 DocType: Employee,Offer Date,پیشکش تاریخ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,کوٹیشن
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,کوئی بھی طالب علم گروپ بنائے.
 DocType: Purchase Invoice Item,Serial No,سیریل نمبر
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ماہانہ واپسی کی رقم قرض کی رقم سے زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,ماہانہ واپسی کی رقم قرض کی رقم سے زیادہ نہیں ہو سکتا
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,پہلے Maintaince تفصیلات درج کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,قطار # {0}: متوقع ترسیل کی تاریخ خریداری آرڈر کی تاریخ سے پہلے نہیں ہوسکتی ہے
 DocType: Purchase Invoice,Print Language,پرنٹ کریں زبان
 DocType: Salary Slip,Total Working Hours,کل کام کے گھنٹے
 DocType: Sales Invoice,Customer PO Details,کسٹمر PO تفصیلات
-DocType: Subscription,Next Schedule Date,اگلی شیڈول تاریخ
 DocType: Stock Entry,Including items for sub assemblies,ذیلی اسمبلیوں کے لئے اشیاء سمیت
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,عارضی افتتاحی اکاؤنٹ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,درج قدر مثبت ہونا چاہئے
@@ -4261,11 +4288,11 @@
 DocType: Issue,Opening Time,افتتاحی وقت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,سے اور مطلوبہ تاریخوں کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,سیکورٹیز اینڈ ایکسچینج کماڈٹی
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ذکر کردہ معیار کے لئے کوئی ملازم نہیں
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
 DocType: Hotel Settings,Default Customer,ڈیفالٹ کسٹمر
 DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,اس بات کی توثیق نہ کریں کہ ایک ہی دن کے لئے اپوزیشن کا قیام کیا گیا ہے
@@ -4290,16 +4317,16 @@
 DocType: Journal Entry Account,Employee Advance,ملازم ایڈوانس
 DocType: Payroll Entry,Payroll Frequency,پے رول فریکوئینسی
 DocType: Lab Test Template,Sensitivity,حساسیت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,خام مال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,خام مال
 DocType: Leave Application,Follow via Email,ای میل کے ذریعے عمل کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,پودے اور مشینری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,پودے اور مشینری
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,روز مرہ کے کام کا خلاصہ ترتیبات
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,براہ مہربانی دوبارہ کوشش کریں
 DocType: Payment Entry,Internal Transfer,اندرونی منتقلی
 DocType: Asset Maintenance,Maintenance Tasks,بحالی کے کام
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,بہر ہدف مقدار یا ہدف رقم لازمی ہے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
 DocType: Leave Control Panel,Carry Forward,آگے لے جانے
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,موجودہ لین دین کے ساتھ سرمایہ کاری سینٹر اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
@@ -4307,14 +4334,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext انٹیگریشن
 DocType: Crop Cycle,Detected Disease,پتہ چلا بیماری
 ,Produced,تیار
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,واپسی کی تاریخ شروع ہونے کی تاریخ سے پہلے نہیں ہوسکتی ہے.
 DocType: Item,Item Code for Suppliers,سپلائر کے لئے آئٹم کوڈ
 DocType: Issue,Raised By (Email),طرف سے اٹھائے گئے (ای میل)
 DocType: Training Event,Trainer Name,ٹرینر نام
 DocType: Mode of Payment,General,جنرل
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخری مواصلات
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخری مواصلات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; کے لئے ہے جب کٹوتی نہیں کر سکتے ہیں
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},serialized کی شے کے لئے سیریل نمبر مطلوب {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; کے لئے ہے جب کٹوتی نہیں کر سکتے ہیں
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},serialized کی شے کے لئے سیریل نمبر مطلوب {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,انوائس کے ساتھ ملائیں ادائیگیاں
 DocType: Journal Entry,Bank Entry,بینک انٹری
 DocType: Authorization Rule,Applicable To (Designation),لاگو (عہدہ)
@@ -4328,7 +4356,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,کو فعال / غیر فعال کریں کرنسیاں.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},ڈاکٹر {0} نصف دن کی چھٹی پر {1}
 DocType: Production Plan,Get Material Request,مواد گذارش حاصل کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,پوسٹل اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,پوسٹل اخراجات
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),کل (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,تفریح اور تفریح
 ,Item Variant Details,آئٹم مختلف تفصیلات
@@ -4339,9 +4367,9 @@
 DocType: Drug Prescription,Hour,قیامت
 DocType: Restaurant Order Entry,Last Sales Invoice,آخری سیلز انوائس
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},براہ کرم مقدار کے خلاف مقدار کا انتخاب کریں {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نیا سیریل کوئی گودام ہیں کر سکتے ہیں. گودام اسٹاک اندراج یا خریداری کی رسید کی طرف سے مقرر کیا جانا چاہیے
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نیا سیریل کوئی گودام ہیں کر سکتے ہیں. گودام اسٹاک اندراج یا خریداری کی رسید کی طرف سے مقرر کیا جانا چاہیے
 DocType: Lead,Lead Type,لیڈ کی قسم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,ان تمام اشیاء کو پہلے ہی انوائس کیا گیا ہے
 DocType: Company,Monthly Sales Target,ماہانہ سیلز کا نشانہ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},کی طرف سے منظور کیا جا سکتا ہے {0}
@@ -4349,7 +4377,7 @@
 DocType: Item,Default Material Request Type,پہلے سے طے شدہ مواد کی گذارش پروپوزل کی گذارش
 DocType: Supplier Scorecard,Evaluation Period,تشخیص کا دورہ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,نامعلوم
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,کام آرڈر نہیں بنایا گیا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,کام آرڈر نہیں بنایا گیا
 DocType: Shipping Rule,Shipping Rule Conditions,شپنگ حکمرانی ضوابط
 DocType: Purchase Invoice,Export Type,برآمد کی قسم
 DocType: Salary Slip Loan,Salary Slip Loan,تنخواہ سلپ قرض
@@ -4365,8 +4393,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,افتتاحی انوائس خلاصہ
 DocType: Education Settings,Education Manager,تعلیم مینیجر
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,زیادہ سے زیادہ ترقی کے لئے میدان میں ہر پلانٹ کے درمیان کم از کم لمبائی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Batched آئٹم {0} اسٹاک مصالحت کا استعمال کرتے ہوئے اپ ڈیٹ نہیں کیا جا سکتا، اس کی بجائے اسٹاک انٹری کا استعمال
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Batched آئٹم {0} اسٹاک مصالحت کا استعمال کرتے ہوئے اپ ڈیٹ نہیں کیا جا سکتا، اس کی بجائے اسٹاک انٹری کا استعمال
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Batched آئٹم {0} اسٹاک مصالحت کا استعمال کرتے ہوئے اپ ڈیٹ نہیں کیا جا سکتا، اس کی بجائے اسٹاک انٹری کا استعمال
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",Batched آئٹم {0} اسٹاک مصالحت کا استعمال کرتے ہوئے اپ ڈیٹ نہیں کیا جا سکتا، اس کی بجائے اسٹاک انٹری کا استعمال
 DocType: Quality Inspection,Report Date,رپورٹ کی تاریخ
 DocType: Student,Middle Name,درمیانی نام
 DocType: C-Form,Invoices,انوائس
@@ -4399,20 +4427,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",ای میل پتہ منفرد ہونا ضروری ہے، پہلے ہی {0} کے لئے موجود ہے.
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,رسید
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,رسید
 ,Sales Register,سیلز رجسٹر
 DocType: Daily Work Summary Group,Send Emails At,پر ای میلز بھیجیں
 DocType: Quotation,Quotation Lost Reason,کوٹیشن کھو وجہ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},ٹرانزیکشن ریفرنس کوئی {0} بتاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ترمیم کرنے کے لئے کچھ بھی نہیں ہے.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,فارم دیکھیں
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,اخراجات کا دعوی
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",اپنے آپ کے علاوہ اپنے تنظیم میں صارفین کو شامل کریں.
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,ابھی تک کوئی گاہک!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,کیش فلو کا بیان
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,کوئی مادی درخواست نہیں کی گئی
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,لائسنس
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
@@ -4435,11 +4464,12 @@
 DocType: Vehicle,Chassis No,چیسی کوئی
 DocType: Payment Request,Initiated,شروع
 DocType: Production Plan Item,Planned Start Date,منصوبہ بندی شروع کرنے کی تاریخ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,براہ کرم ایک BOM منتخب کریں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,براہ کرم ایک BOM منتخب کریں
 DocType: Purchase Invoice,Availed ITC Integrated Tax,آئی ٹی سی انٹیگریٹڈ ٹیکس کو حاصل کیا
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
+DocType: Bank Guarantee,Clauses and Conditions,بندوں اور شرائط
 DocType: Serial No,Creation Document Type,تخلیق دستاویز کی قسم
 DocType: Project Task,View Timesheet,ٹائم شیٹ دیکھیں
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,اختتام تاریخ شروع ہونے کی تاریخ سے زیادہ ہونا ضروری ہے
 DocType: Leave Type,Is Encash,بنانا ہے
 DocType: Leave Allocation,New Leaves Allocated,نئے پتے مختص
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
@@ -4453,9 +4483,10 @@
 DocType: Patient,Alcohol Current Use,الکحل موجودہ استعمال
 DocType: Student Admission Program,Student Admission Program,طالب علم داخلہ پروگرام
 DocType: Payment Entry,Account Paid To,اکاؤنٹ کے لئے ادا کی
+DocType: Subscription Settings,Grace Period,رعایتی مدت
 DocType: Item Alternative,Alternative Item Name,متبادل آئٹم کا نام
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,والدین آئٹم {0} اسٹاک آئٹم نہیں ہونا چاہئے
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",کسی تنخواہ پرچی کو جمع نہیں کیا جا سکا <br> \ ممنوع وجوہات: <br> \ 1. نیٹ ورک 0 سے کم ہے. <br> \ 2. ملازم ماسٹر میں بیان کردہ کمپنی ای میل پتہ درست نہیں ہے. <br>
@@ -4465,7 +4496,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} اکاؤنٹ کے بجٹ {1} خلاف {2} {3} ہے {4}. اس کی طرف سے تجاوز کرے گا {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',صف {0} # اکاؤنٹ کی قسم کا ہونا چاہیے &#39;فکسڈ اثاثہ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,مقدار باہر
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,اور اس میں معذور غیر مقفل
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,سیریز لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,مالیاتی خدمات
 DocType: Student Sibling,Student ID,طالب علم کی شناخت
@@ -4477,14 +4507,16 @@
 DocType: Complaint,Complaint,شکایت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,تنخواہ داخلہ بنائیں
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,تمام محکموں
 DocType: Patient,Alcohol Past Use,شراب ماضی کا استعمال
 DocType: Fertilizer Content,Fertilizer Content,ارورائزر مواد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,کروڑ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,کروڑ
 DocType: Project Update,Problematic/Stuck,مسئلہ / پھنس گیا
 DocType: Tax Rule,Billing State,بلنگ ریاست
 DocType: Share Transfer,Transfer,منتقلی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,اس سیلز آرڈر کو منسوخ کرنے سے پہلے کام کا آرڈر {0} منسوخ ہونا ضروری ہے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
@@ -4508,10 +4540,11 @@
 DocType: Cheque Print Template,Message to show,ظاہر کرنے کے لئے پیغام
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,پرچون
 DocType: Student Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,پروڈکٹ بنڈل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,پروڈکٹ بنڈل
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} سے شروع ہونے والے سکور کو تلاش کرنے میں ناکام. آپ کو 0 سے 100 ڈھکنے والے اسکورز کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},صف {0}: غلط حوالہ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ٹیکسز اور الزامات سانچہ خریداری
+DocType: Subscription,Current Invoice Start Date,موجودہ انوائس شروع کی تاریخ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: {2} کے لئے کسی بھی ڈیبٹ یا کریڈٹ رقم کی ضرورت ہے.
 DocType: GL Entry,Remarks,ریمارکس
@@ -4521,11 +4554,13 @@
 DocType: Task,Parent Task,والدین کا کام
 DocType: Journal Entry,Write Off Based On,کی بنیاد پر لکھنے
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,لیڈ بنائیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,پرنٹ اور سٹیشنری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,پرنٹ اور سٹیشنری
 DocType: Stock Settings,Show Barcode Field,دکھائیں بارکوڈ فیلڈ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,پردایک ای میلز بھیجیں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تنخواہ پہلے سے ہی درمیان {0} اور {1}، درخواست مدت چھوڑیں اس تاریخ کی حد کے درمیان نہیں ہو سکتا مدت کے لئے کارروائی کی.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,پردایک ای میلز بھیجیں
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تنخواہ پہلے سے ہی درمیان {0} اور {1}، درخواست مدت چھوڑیں اس تاریخ کی حد کے درمیان نہیں ہو سکتا مدت کے لئے کارروائی کی.
+DocType: Fiscal Year,Auto Created,آٹو تیار
 DocType: Chapter Member,Leave Reason,وجہ چھوڑ دو
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,انوائس {0} اب موجود نہیں ہے
 DocType: Guardian Interest,Guardian Interest,گارڈین دلچسپی
 DocType: Volunteer,Availability,دستیابی
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS انوائس کے لئے ڈیفالٹ اقدار سیٹ کریں
@@ -4534,14 +4569,13 @@
 DocType: Timesheet,Employee Detail,ملازم کی تفصیل
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ای میل آئی ڈی
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ای میل آئی ڈی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,اگلی تاریخ کے دن اور مہینے کے دن دہرائیں برابر ہونا چاہیے
 DocType: Lab Prescription,Test Code,ٹیسٹ کوڈ
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,ویب سائٹ کے ہوم پیج کے لئے ترتیبات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} کے سکور کارڈ کے کھڑے ہونے کی وجہ سے RFQ کو {0} کی اجازت نہیں ہے.
 DocType: Job Offer,Awaiting Response,جواب کا منتظر
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,اوپر
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},کل رقم {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},غلط وصف {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},کل رقم {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},غلط وصف {0} {1}
 DocType: Supplier,Mention if non-standard payable account,ذکر غیر معیاری قابل ادائیگی اکاؤنٹ ہے تو
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',&#39;تمام تعین گروپ&#39; کے علاوہ کسی اور کا تعین گروپ براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},قطار {0}: ایک آئٹم {1} کے لئے لاگت مرکز کی ضرورت ہے
@@ -4552,7 +4586,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,پانی تجزیہ
 DocType: Chapter,Region,ریجن
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
 DocType: Holiday List,Weekly Off,ویکلی آف
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,لنکڈ تجزیہ دوبارہ لوڈ کریں
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",مثال کے طور پر 2012، 2012-13 کے لئے
@@ -4568,7 +4602,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,ختم کر دیا اثاثہ کی قیمت
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
 DocType: Vehicle,Policy No,پالیسی نہیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
 DocType: Asset,Straight Line,سیدھی لکیر
 DocType: Project User,Project User,پروجیکٹ صارف
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,سپلٹ
@@ -4607,21 +4641,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,راستہ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,یہ بچے نوڈ ہے کے طور پر لیجر لاگت مرکز میں تبدیل نہیں کرسکتا
 DocType: Production Plan,Total Planned Qty,کل منصوبہ بندی کی مقدار
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,افتتاحی ویلیو
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,افتتاحی ویلیو
 DocType: Salary Detail,Formula,فارمولہ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,سیریل نمبر
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سیریل نمبر
 DocType: Lab Test Template,Lab Test Template,لیب ٹیسٹنگ سانچہ
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,سیلز اکاؤنٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,سیلز اکاؤنٹ
 DocType: Purchase Invoice Item,Total Weight,کل وزن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,فروخت پر کمیشن
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,فروخت پر کمیشن
 DocType: Job Offer Term,Value / Description,ویلیو / تفصیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
 DocType: Tax Rule,Billing Country,بلنگ کا ملک
 DocType: Purchase Order Item,Expected Delivery Date,متوقع تاریخ کی ترسیل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ریسٹورنٹ آرڈر انٹری
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ڈیبٹ اور کریڈٹ {0} # کے لئے برابر نہیں {1}. فرق ہے {2}.
 DocType: Asset Maintenance Task,Assign To Name,نام کو تفویض کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,تفریح اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,تفریح اخراجات
 DocType: Hub Settings,Enabled Users,فعال صارفین
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,مواد درخواست کر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},اوپن آئٹم {0}
@@ -4634,24 +4668,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,چھٹی کے لئے درخواستیں.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,موجودہ لین دین کے ساتھ اکاؤنٹ خارج کر دیا نہیں کیا جا سکتا
 DocType: Vehicle,Last Carbon Check,آخری کاربن چیک کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانونی اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,قانونی اخراجات
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,صف پر مقدار براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,کھولنے کی فروخت اور خریداری انوائس بنائیں
 DocType: Purchase Invoice,Posting Time,پوسٹنگ وقت
 DocType: Timesheet,% Amount Billed,٪ رقم بل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,ٹیلی فون اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,ٹیلی فون اخراجات
 DocType: Sales Partner,Logo,علامت (لوگو)
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,آپ کی بچت سے پہلے ایک سلسلہ منتخب کرنے کے لئے صارف کو مجبور کرنا چاہتے ہیں تو اس کی جانچ پڑتال. آپ کو اس کی جانچ پڑتال اگر کوئی پہلے سے طے شدہ ہو گا.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},سیریل نمبر کے ساتھ کوئی آئٹم {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},سیریل نمبر کے ساتھ کوئی آئٹم {0}
 DocType: Email Digest,Open Notifications,کھولیں نوٹیفیکیشن
 DocType: Payment Entry,Difference Amount (Company Currency),فرق رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,براہ راست اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,براہ راست اخراجات
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نئے گاہک ریونیو
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,سفر کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,سفر کے اخراجات
 DocType: Maintenance Visit,Breakdown,خرابی
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},doctype میں اپنی مرضی کے میدان سبسکرپشن شامل کریں {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
 DocType: Purchase Receipt Item,Sample Quantity,نمونہ مقدار
+DocType: Bank Guarantee,Name of Beneficiary,فائدہ مند کا نام
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تازہ ترین قیمتوں کی شرح / قیمت کی فہرست کی شرح / خام مال کی آخری خریداری کی شرح پر مبنی بوم خود بخود لاگت کریں.
 DocType: Bank Reconciliation Detail,Cheque Date,چیک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},اکاؤنٹ {0}: والدین اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے: {2}
@@ -4663,14 +4697,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,پروبیشن
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,تنخواہ کے اجزاء
 DocType: Program Enrollment Tool,New Academic Year,نئے تعلیمی سال
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,واپسی / کریڈٹ نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,واپسی / کریڈٹ نوٹ
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,کل ادا کی گئی رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,کل ادا کی گئی رقم
 DocType: GST Settings,B2C Limit,B2C حد
 DocType: Work Order Item,Transferred Qty,منتقل مقدار
 apps/erpnext/erpnext/config/learn.py +11,Navigating,گشت
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,منصوبہ بندی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,منصوبہ بندی
 DocType: Share Balance,Issued,جاری کردیا گیا
+DocType: Loan,Repayment Start Date,واپسی کی تاریخ شروع
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,طالب علم کی سرگرمی
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,پردایک شناخت
 DocType: Payment Request,Payment Gateway Details,ادائیگی کے گیٹ وے کی تفصیلات دیکھیں
@@ -4683,10 +4718,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",آرام دہ اور پرسکون طرح پتیوں کی قسم، بیمار وغیرہ
 DocType: Email Digest,Send regular summary reports via Email.,ای میل کے ذریعے باقاعدہ سمری رپورٹ بھیجنے.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 DocType: Assessment Result,Student Name,طالب علم کا نام
 DocType: Brand,Item Manager,آئٹم مینیجر
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,قابل ادائیگی پے رول
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,قابل ادائیگی پے رول
 DocType: Buying Settings,Default Supplier Type,پہلے سے طے شدہ پردایک قسم
 DocType: Plant Analysis,Collection Datetime,ڈیٹیٹ وقت جمع
 DocType: Work Order,Total Operating Cost,کل آپریٹنگ لاگت
@@ -4696,9 +4731,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,صارف {0} موجود نہیں ہے
 DocType: Payment Term,Day(s) after invoice date,انوائس کی تاریخ کے بعد دن
 DocType: Payment Schedule,Payment Schedule,ادائیگی کے شیڈول
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,مخفف
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,ادائیگی انٹری پہلے سے موجود ہے
+DocType: Subscription,Trial Period End Date,آزمائشی مدت کے اختتام کی تاریخ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} حدود سے تجاوز کے بعد authroized نہیں
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,تنخواہ سانچے ماسٹر.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,ریاضی
@@ -4715,9 +4750,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
 ,Territory Target Variance Item Group-Wise,علاقہ ھدف تغیر آئٹم گروپ حکیم
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,تمام کسٹمر گروپوں
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,تمام کسٹمر گروپوں
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,جمع ماہانہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,ٹیکس سانچہ لازمی ہے.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,اکاؤنٹ {0}: والدین اکاؤنٹ {1} موجود نہیں ہے
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قیمت کی فہرست شرح (کمپنی کرنسی)
@@ -4726,14 +4761,15 @@
 DocType: Lab Prescription,Test Created,ٹیسٹ تیار
 DocType: Healthcare Settings,Custom Signature in Print,پرنٹ میں اپنی مرضی کے دستخط
 DocType: Account,Temporary,عارضی
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,کسٹمر ایل پی او نمبر
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,کسٹمر ایل پی او نمبر
 DocType: Program,Courses,کورسز
 DocType: Monthly Distribution Percentage,Percentage Allocation,فیصدی ایلوکیشن
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,سیکرٹری
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,سیکرٹری
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",غیر فعال اگر، میدان کے الفاظ میں &#39;کسی بھی ٹرانزیکشن میں نظر نہیں آئیں گے
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,یہ عمل مستقبل بلنگ کو روک دے گا. کیا آپ واقعی اس رکنیت کو منسوخ کرنا چاہتے ہیں؟
 DocType: Serial No,Distinct unit of an Item,آئٹم کے مخصوص یونٹ
 DocType: Supplier Scorecard Criteria,Criteria Name,معیار کا نام
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,کمپنی قائم کی مہربانی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,کمپنی قائم کی مہربانی
 DocType: Pricing Rule,Buying,خرید
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,بیماریوں اور کھادیں
 DocType: HR Settings,Employee Records to be created by,ملازم کے ریکارڈ کی طرف سے پیدا کیا جا کرنے کے لئے
@@ -4742,18 +4778,18 @@
 DocType: POS Profile,Apply Discount On,رعایت پر لاگو کریں
 DocType: Member,Membership Type,رکنیت کی قسم
 ,Reqd By Date,Reqd تاریخ کی طرف سے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,قرض
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,قرض
 DocType: Assessment Plan,Assessment Name,تشخیص نام
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,پرنٹ میں پی ڈی سی دکھائیں
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,پرنٹ میں پی ڈی سی دکھائیں
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,صف # {0}: سیریل کوئی لازمی ہے
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,آئٹم حکمت ٹیکس تفصیل
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,ملازمت کی پیشکش
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,انسٹی ٹیوٹ مخفف
 ,Item-wise Price List Rate,آئٹم وار قیمت کی فہرست شرح
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
@@ -4771,7 +4807,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,کل تغیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",فعال ہے تو، نظام خود کار طریقے کی انوینٹری کے لئے اکاؤنٹنگ اندراجات پوسٹ کریں گے.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,بروکریج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,ملازم {0} کے لئے حاضری پہلے ہی اس دن کے لئے نشان لگا دیا گیا
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,ملازم {0} کے لئے حاضری پہلے ہی اس دن کے لئے نشان لگا دیا گیا
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",منٹ میں &#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
 DocType: Customer,From Lead,لیڈ سے
@@ -4782,6 +4818,7 @@
 DocType: Lab Test,Approved Date,منظور شدہ تاریخ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
+DocType: Subscriber,Subscriber Name,سبسکرائب کا نام
 DocType: Serial No,Out of Warranty,وارنٹی سے باہر
 DocType: BOM Update Tool,Replace,بدل دیں
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,نہیں کی مصنوعات مل گیا.
@@ -4791,19 +4828,18 @@
 DocType: Request for Quotation Item,Project Name,پراجیکٹ کا نام
 DocType: Customer,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
 DocType: Journal Entry Account,If Income or Expense,آمدنی یا اخراجات تو
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},ملازم قرض {0} میں سود کی آمدنی کا اکاؤنٹ منتخب کریں
 DocType: Work Order,Required Items,مطلوبہ اشیاء
 DocType: Stock Ledger Entry,Stock Value Difference,اسٹاک کی قیمت فرق
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,انسانی وسائل
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ادائیگی مفاہمت ادائیگی
 DocType: Disease,Treatment Task,علاج کا کام
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,ٹیکس اثاثے
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,ٹیکس اثاثے
 DocType: BOM Item,BOM No,BOM کوئی
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,جرنل اندراج {0} {1} یا پہلے سے ہی دیگر واؤچر خلاف مماثلت اکاؤنٹ نہیں ہے
 DocType: Item,Moving Average,حرکت پذیری اوسط
 DocType: BOM Update Tool,The BOM which will be replaced,تبدیل کیا جائے گا جس میں BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,الیکٹرانک آلات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,الیکٹرانک آلات
 DocType: Asset,Maintenance Required,بحالی کی ضرورت ہے
 DocType: Account,Debit,ڈیبٹ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,پتے 0.5 ملٹی میں مختص ہونا ضروری ہے
@@ -4812,7 +4848,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,بقایا AMT
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مقرر مقاصد آئٹم گروپ وار اس کی فروخت کے شخص کے لئے.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],جھروکے سٹاکس بڑی عمر کے مقابلے [دنوں]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,صف # {0}: اثاثہ فکسڈ اثاثہ خرید / فروخت کے لئے لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,صف # {0}: اثاثہ فکسڈ اثاثہ خرید / فروخت کے لئے لازمی ہے
 DocType: Asset Maintenance Team,Maintenance Team Name,بحالی ٹیم کا نام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",دو یا زیادہ قیمتوں کا تعین قواعد مندرجہ بالا شرائط پر مبنی پایا جاتا ہے تو، ترجیح کا اطلاق ہوتا ہے. ڈیفالٹ قدر صفر (خالی) ہے جبکہ ترجیح 20 0 درمیان ایک بڑی تعداد ہے. زیادہ تعداد ایک ہی شرائط کے ساتھ ایک سے زیادہ قیمتوں کا تعین قوانین موجود ہیں تو یہ مقدم لے جائے گا کا مطلب ہے.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,گاہک کے طور پر &#39;مواقع سے&#39; منتخب کیا جاتا ہے تو کسٹمر لازمی ہے
@@ -4821,19 +4857,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,مندرجہ ذیل صارفین بلاک دنوں کے لئے چھوڑ درخواستیں منظور کرنے کی اجازت دیں.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,خرچ دعوی کی اقسام.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},آئٹم {0} کے لئے فروخت کی شرح اس سے کم ہے {1}. فروخت کی شرح کو کم از کم ہونا چاہئے {2}
-DocType: Item,Taxes,ٹیکسز
+DocType: Subscription,Taxes,ٹیکسز
 DocType: Purchase Invoice,capital goods,دارالحکومت سامان
 DocType: Purchase Invoice Item,Weight Per Unit,یونٹ فی وزن
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ادا کی اور نجات نہیں
 DocType: Project,Default Cost Center,پہلے سے طے شدہ لاگت مرکز
-DocType: Bank Guarantee,End Date,آخری تاریخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,اسٹاک معاملات
 DocType: Budget,Budget Accounts,بجٹ کے اکاؤنٹس
 DocType: Employee,Internal Work History,اندرونی کام تاریخ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,جمع ہراس رقم
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,نجی ایکوئٹی
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,سپلائر اسکور کارڈ متغیر
-DocType: Employee Loan,Fully Disbursed,مکمل طور پر زرعی قرضوں کی فراہمی
 DocType: Employee Advance,Due Advance Amount,کی وجہ سے اضافی رقم
 DocType: Maintenance Visit,Customer Feedback,کسٹمر آپ کی رائے
 DocType: Account,Expense,اخراجات
@@ -4857,7 +4891,7 @@
 ,Employee Information,ملازم کی معلومات
 DocType: Stock Entry Detail,Additional Cost,اضافی لاگت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,پردایک کوٹیشن بنائیں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,پردایک کوٹیشن بنائیں
 DocType: Quality Inspection,Incoming,موصولہ
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,سیلز اور خریداری کے لئے پہلے سے طے شدہ ٹیکس ٹیمپلیٹس بنائے جاتے ہیں.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,تشخیص کا نتیجہ ریکارڈ {0} پہلے ہی موجود ہے.
@@ -4865,7 +4899,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',اگر گروپ سے &#39;کمپنی&#39; ہے کمپنی فلٹر کو خالی مقرر مہربانی
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,پوسٹنگ کی تاریخ مستقبل کی تاریخ میں نہیں ہو سکتا
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},صف # {0}: سیریل نمبر {1} کے ساتھ مطابقت نہیں ہے {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,بار بار پیدا کرنے کے لئے
 DocType: Stock Entry,Target Warehouse Address,ہدف گودام ایڈریس
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,آرام دہ اور پرسکون کی رخصت
 DocType: Agriculture Task,End Day,اختتام دن
@@ -4890,11 +4923,10 @@
 DocType: Material Request,% Ordered,٪سامان آرڈرھوگیا
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",کورس کی بنیاد پر طالب علم گروپ کے لئے، کورس کے پروگرام اندراج میں اندراج کورس سے ہر طالب علم کے لئے جائز قرار دیا جائے گا.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,اوسط. خرید کی شرح
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,اوسط. خرید کی شرح
 DocType: Share Balance,From No,نمبر سے نہیں
 DocType: Task,Actual Time (in Hours),(گھنٹوں میں) اصل وقت
 DocType: Employee,History In Company,کمپنی کی تاریخ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{بھیجنے والا} سے نیا پیغام
 DocType: Customer,Customer Primary Address,کسٹمر پرائمری ایڈریس
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامے
 DocType: Drug Prescription,Description/Strength,تفصیل / طاقت
@@ -4903,22 +4935,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ایک ہی شے کے کئی بار داخل کیا گیا ہے
 DocType: Department,Leave Block List,بلاک فہرست چھوڑ دو
 DocType: Purchase Invoice,Tax ID,ٹیکس شناخت
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. کالم خالی ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. کالم خالی ہونا ضروری ہے
 DocType: Accounts Settings,Accounts Settings,ترتیبات اکاؤنٹس
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,منظور کریں
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",{0} کے لئے مطلع شدہ پتہ، برائے مہربانی جاری رکھیں.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",{0} کے لئے مطلع شدہ پتہ، برائے مہربانی جاری رکھیں.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",نیا اکاؤنٹ کی تعداد، اس اکاؤنٹ کا نام میں ایک سابقہ طور پر شامل کیا جائے گا
 DocType: Maintenance Team Member,Team Member,ٹیم کے رکن
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,جمع کرنے کا کوئی نتیجہ نہیں
 DocType: Customer,Sales Partner and Commission,سیلز پارٹنر اور کمیشن
-DocType: Employee Loan,Rate of Interest (%) / Year,سود (٪) / سال کی شرح
+DocType: Loan,Rate of Interest (%) / Year,سود (٪) / سال کی شرح
 ,Project Quantity,پروجیکٹ مقدار
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",تمام اشیاء کے لئے کل {0} صفر ہے، کیا آپ کو تبدیل کرنا چاہئے &#39;پر مبنی چارج تقسیم&#39;
 DocType: Opportunity,To Discuss,بحث کرنے کے لئے
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} کی اکائیوں {1} {2} اس لین دین کو مکمل کرنے میں ضرورت.
 DocType: Loan Type,Rate of Interest (%) Yearly,سود کی شرح (٪) سالانہ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,عارضی اکاؤنٹس
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,سیاہ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,عارضی اکاؤنٹس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,سیاہ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM دھماکہ آئٹم
 DocType: Shareholder,Contact List,رابطے کی فہرست
 DocType: Account,Auditor,آڈیٹر
@@ -4926,16 +4958,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} سے تیار اشیاء
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,اورجانیے
 DocType: Cheque Print Template,Distance from top edge,اوپر کے کنارے سے فاصلہ
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,قیمت کی فہرست {0} غیر فعال ہے یا موجود نہیں ہے
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,قیمت کی فہرست {0} غیر فعال ہے یا موجود نہیں ہے
 DocType: Purchase Invoice,Return,واپس
 DocType: Pricing Rule,Disable,غیر فعال کریں
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,ادائیگی کا طریقہ ایک ادائیگی کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,ادائیگی کا طریقہ ایک ادائیگی کرنے کے لئے کی ضرورت ہے
 DocType: Project Task,Pending Review,زیر جائزہ
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",اثاثوں، سیریل نو، بیچ وغیرہ جیسے زیادہ اختیارات کیلئے مکمل صفحہ میں ترمیم کریں.
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,اپیلمنٹ اور کنسلٹنٹس
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} بیچ میں اندراج نہیں ہے {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",یہ پہلے سے ہی ہے کے طور پر اثاثہ {0}، ختم نہیں کیا جا سکتا {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,چیک کی ضرورت ہے
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,چیک کی ضرورت ہے
 DocType: Task,Total Expense Claim (via Expense Claim),(خرچ دعوی ذریعے) کل اخراجات کا دعوی
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک غائب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,کمپنی قائم کرنے میں ناکام
@@ -4947,7 +4979,7 @@
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,بیڑے کے انتظام
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,سے اشیاء شامل کریں
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,سے اشیاء شامل کریں
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,فصلوں اور زمین
 DocType: Cheque Print Template,Regular,باقاعدگی سے
 DocType: Fertilizer,Density (if liquid),کثافت (اگر مائع)
@@ -4972,24 +5004,26 @@
 DocType: Payment Entry,Paid Amount,ادائیگی کی رقم
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,سیلز سائیکل کا پتہ لگائیں
 DocType: Assessment Plan,Supervisor,سپروائزر
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,ریٹری اسٹاک انٹری
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,ریٹری اسٹاک انٹری
 ,Available Stock for Packing Items,پیکنگ اشیاء کے لئے دستیاب اسٹاک
 DocType: Item Variant,Item Variant,آئٹم مختلف
 ,Work Order Stock Report,کام آرڈر سٹاک کی رپورٹ
+DocType: Purchase Receipt,Auto Repeat Detail,آٹو دوبارہ دوہری تفصیل
 DocType: Assessment Result Tool,Assessment Result Tool,تشخیص کے نتائج کا آلہ
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,سپروائزر کے طور پر
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,تجویز کردہ زمرہ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM سکریپ آئٹم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,معیار منظم رکھنا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,معیار منظم رکھنا
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
 DocType: Project,Total Billable Amount (via Timesheets),کل بلبل رقم (ٹائم شیشے کے ذریعہ)
 DocType: Agriculture Task,Previous Business Day,پچھلے کاروباری دن
-DocType: Employee Loan,Repay Fixed Amount per Period,فی وقفہ مقررہ رقم ادا
+DocType: Loan,Repay Fixed Amount per Period,فی وقفہ مقررہ رقم ادا
 DocType: Employee,Health Insurance No,ہیلتھ انشورنس نمبر
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,کریڈٹ نوٹ AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,کریڈٹ نوٹ AMT
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,کل ٹیکس قابل رقم
 DocType: Employee External Work History,Employee External Work History,ملازم بیرونی کام کی تاریخ
 DocType: Opening Invoice Creation Tool,Purchase,خریداری
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,بیلنس مقدار
@@ -5000,16 +5034,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} کے لئے {1}
 DocType: Healthcare Settings,Valid number of days,دن کی درست تعداد
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,لاگت کے مراکز
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,سبسکرائب کریں دوبارہ شروع کریں
 DocType: Land Unit,Linked Plant Analysis,منسلک پلانٹ تجزیہ
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,جس سپلائر کی کرنسی میں شرح کمپنی کے اساسی کرنسی میں تبدیل کیا جاتا
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},صف # {0}: صف کے ساتھ اوقات تنازعات {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازت دیں زیرو تشخیص کی شرح
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازت دیں زیرو تشخیص کی شرح
+DocType: Bank Guarantee,Receiving,وصول کرنا
 DocType: Training Event Employee,Invited,مدعو
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے ایک سے زیادہ فعال تنخواہ تعمیرات
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,سیٹ اپ گیٹ وے اکاؤنٹس.
 DocType: Employee,Employment Type,ملازمت کی قسم
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,مقرر اثاثے
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,مقرر اثاثے
 DocType: Payment Entry,Set Exchange Gain / Loss,ایکسچینج حاصل مقرر کریں / خسارہ
 ,GST Purchase Register,جی ایس ٹی کی خریداری رجسٹر
 ,Cash Flow,پیسے کا بہاو
@@ -5030,9 +5066,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,سب ٹرانزیکشن کی فہرست
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,بالمقابل شمار
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,بالمقابل شمار
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},تلاش کریں منسلک {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,آزمائشی مدت کے دوران شروع کی تاریخ اور آزمائشی مدت کے اختتام کی تاریخ کو مقرر کیا جانا چاہئے
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,اوسط قیمت
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ادائیگی شیڈول میں کل ادائیگی کی رقم گرینڈ / گولڈ کل کے برابر ہونا ضروری ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ادائیگی شیڈول میں کل ادائیگی کی رقم گرینڈ / گولڈ کل کے برابر ہونا ضروری ہے
+DocType: Subscription Plan Detail,Plan,منصوبہ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,جنرل لیجر کے مطابق بینک کا گوشوارہ توازن
 DocType: Job Applicant,Applicant Name,درخواست گزار کا نام
 DocType: Authorization Rule,Customer / Item Name,کسٹمر / نام شے
@@ -5062,6 +5099,7 @@
 DocType: Work Order,Warehouses,گوداموں
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} اثاثہ منتقل نہیں کیا جا سکتا
 DocType: Hotel Room Pricing,Hotel Room Pricing,ہوٹل روم کی قیمتوں کا تعین
+DocType: Subscription,Days Until Due,وجہ تک
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,یہ آئٹم {0} (سانچہ) کی ایک مختلف ہے.
 DocType: Workstation,per hour,فی گھنٹہ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,پرچیزنگ
@@ -5070,13 +5108,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",بیچ مبنی طالب علم گروپ کے طور پر، طالب علم بیچ پروگرام کے اندراج سے ہر طالب علم کے لئے جائز قرار دیا جائے گا.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,تقسیم
+DocType: Journal Entry Account,Loan,قرض
 DocType: Expense Claim Advance,Expense Claim Advance,اخراج دعوی ایڈانسنس
 DocType: Lab Test,Report Preference,رپورٹ کی ترجیح
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,رضاکارانہ معلومات.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,پروجیکٹ مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,پروجیکٹ مینیجر
 ,Quoted Item Comparison,نقل آئٹم موازنہ
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} اور {1} کے درمیان اسکور میں اوورلوپ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,ڈسپیچ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,ڈسپیچ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,شے کے لئے کی اجازت زیادہ سے زیادہ ڈسکاؤنٹ: {0} {1}٪ ہے
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,خالص اثاثہ قدر کے طور پر
 DocType: Crop,Produce,پیدا
@@ -5086,7 +5125,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,تعمیر کے لئے مواد کی کھپت
 DocType: Item Alternative,Alternative Item Code,متبادل آئٹم کوڈ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,مقرر کریڈٹ کی حد سے تجاوز ہے کہ لین دین پیش کرنے کی اجازت ہے کہ کردار.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
 DocType: Delivery Stop,Delivery Stop,ترسیل بند
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
@@ -5096,15 +5135,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,صابن اور ڈٹرجنٹ
 DocType: BOM,Show Items,اشیا دکھائیں
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,وقت سے وقت سے زیادہ نہیں ہو سکتا.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,کیا آپ ای میل کے ذریعے تمام گاہکوں کو مطلع کرنا چاہتے ہیں؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,کیا آپ ای میل کے ذریعے تمام گاہکوں کو مطلع کرنا چاہتے ہیں؟
+DocType: Subscription Plan,Billing Interval,بلنگ کے وقفہ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,موشن پکچر اور ویڈیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,کا حکم دیا
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,دوبارہ شروع کریں
 DocType: Hub Settings,Hub Username,حب صارف نام
 DocType: Salary Detail,Component,اجزاء
 DocType: Assessment Criteria,Assessment Criteria Group,تشخیص کا معیار گروپ
 DocType: Healthcare Settings,Patient Name By,مریض کا نام
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},{0} سے {1} سے تنخواہ کے لئے اکادری جرنل انٹری
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},{0} سے {1} سے تنخواہ کے لئے اکادری جرنل انٹری
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},مجموعی قیمتوں کا تعین کھولنے کے برابر {0}
 DocType: Warehouse,Warehouse Name,گودام نام
 DocType: Naming Series,Select Transaction,منتخب ٹرانزیکشن
@@ -5118,23 +5157,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",یہاں آپ کو وغیرہ اونچائی، وزن، یلرجی، طبی خدشات کو برقرار رکھنے کے کر سکتے ہیں
 DocType: Leave Block List,Applies to Company,کمپنی پر لاگو ہوتا ہے
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
-DocType: Employee Loan,Disbursement Date,ادائیگی کی تاریخ
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;وصول کنندگان&#39; متعین نہیں ہیں
+DocType: Loan,Disbursement Date,ادائیگی کی تاریخ
 DocType: BOM Update Tool,Update latest price in all BOMs,تمام بی ایمز میں تازہ ترین قیمت اپ ڈیٹ کریں
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,میڈیکل ریکارڈ
 DocType: Vehicle,Vehicle,وہیکل
 DocType: Purchase Invoice,In Words,الفاظ میں
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,جمع کرنے سے پہلے بینک یا قرض دینے والے ادارے کا نام درج کریں.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} جمع ہونا لازمی ہے
 DocType: POS Profile,Item Groups,آئٹم گروپس
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
 DocType: Sales Order Item,For Production,پیداوار کے لئے
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,برائے مہربانی اکاؤنٹس کے چارٹ میں عارضی افتتاحی اکاؤنٹ شامل کریں
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,برائے مہربانی اکاؤنٹس کے چارٹ میں عارضی افتتاحی اکاؤنٹ شامل کریں
 DocType: Customer,Customer Primary Contact,کسٹمر پرائمری رابطہ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,دورہ جرنل آفس
 DocType: Project Task,View Task,لنک ٹاسک
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,بالمقابل / لیڈ٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,بالمقابل / لیڈ٪
+DocType: Bank Guarantee,Bank Guarantee Type,بینک گارنٹی کی قسم
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,انوائس پرکرن
 ,Asset Depreciations and Balances,ایسیٹ Depreciations اور توازن
@@ -5145,9 +5185,8 @@
 DocType: Production Plan,Include Subcontracted Items,ذیلی کنسریٹڈ اشیاء شامل کریں
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,اسٹاک ٹرانسمیشن کے بعد مختلف خصوصیات کو تبدیل نہیں کر سکتے ہیں. ایسا کرنا آپ کو نیا آئٹم بنانا ہوگا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
-DocType: Employee Loan,Repay from Salary,تنخواہ سے ادا
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+DocType: Loan,Repay from Salary,تنخواہ سے ادا
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},{2} {1} کے خلاف ادائیگی {2}
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
@@ -5171,11 +5210,11 @@
 DocType: Employee Education,Employee Education,ملازم تعلیم
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,مثنی شے گروپ شے گروپ کے ٹیبل میں پایا
 DocType: Land Unit,Parent Land Unit,والدین لینڈ یونٹ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
 DocType: Fertilizer,Fertilizer Name,کھاد کا نام
 DocType: Salary Slip,Net Pay,نقد ادائیگی
 DocType: Cash Flow Mapping Accounts,Account,اکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,سیریل نمبر {0} پہلے سے حاصل کیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,سیریل نمبر {0} پہلے سے حاصل کیا گیا ہے
 ,Requested Items To Be Transferred,درخواست کی اشیاء منتقل کیا جائے
 DocType: Expense Claim,Vehicle Log,گاڑیوں کے تبا
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),بخار کی موجودگی (طلبا&gt; 38.5 ° C / 101.3 ° F یا مستحکم طے شدہ&gt; 38 ° C / 100.4 ° F)
@@ -5216,24 +5255,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کسی بھی دوسرے ریمارکس، ریکارڈ میں جانا چاہئے کہ قابل ذکر کوشش.
 DocType: Asset Maintenance,Manufacturing User,مینوفیکچرنگ صارف
 DocType: Purchase Invoice,Raw Materials Supplied,خام مال فراہم
-DocType: C-Form,Series,سیریز
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},قیمت فہرست {0} کی کرنسی ہونا ضروری ہے {1} یا {2}
 DocType: Appraisal,Appraisal Template,تشخیص سانچہ
 DocType: Soil Texture,Ternary Plot,ٹرنری پلاٹ
 DocType: Item Group,Item Classification,آئٹم کی درجہ بندی
 DocType: Driver,License Number,لائسنس نمبر
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,بزنس ڈیولپمنٹ مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,بزنس ڈیولپمنٹ مینیجر
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,بحالی کا مقصد
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,انوائس کے مریض رجسٹریشن
 DocType: Crop,Period,مدت
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,جنرل لیجر
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},ملازم {0} پر چھوڑنے پر {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},ملازم {0} پر چھوڑنے پر {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,لنک لیڈز
 DocType: Program Enrollment Tool,New Program,نیا پروگرام
 DocType: Item Attribute Value,Attribute Value,ویلیو وصف
 ,Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش
 DocType: Salary Detail,Salary Detail,تنخواہ تفصیل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
 DocType: Appointment Type,Physician,ڈاکٹر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,آئٹم کے بیچ {0} {1} ختم ہو گیا ہے.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشاورت
@@ -5241,15 +5279,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) کام کی آرڈر {3} میں منصوبہ بندی کی مقدار ({2}) سے زیادہ نہیں ہوسکتا ہے.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,مینوفیکچرنگ کے لئے وقت شیٹ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ذیلی کل
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,سٹاک ٹرانزیکشن کے بعد مختلف خصوصیات کو تبدیل نہیں کر سکتے ہیں. ایسا کرنا آپ کو نیا آئٹم بنانا ہوگا.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA مینڈیٹ
 DocType: Physician,Charges,چارجز
 DocType: Production Plan,Get Items For Work Order,کام آرڈر کے لئے اشیاء حاصل کریں
 DocType: Salary Detail,Default Amount,پہلے سے طے شدہ رقم
 DocType: Lab Test Template,Descriptive,تشریحی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,اس ماہ کے خلاصے
 DocType: Quality Inspection Reading,Quality Inspection Reading,معیار معائنہ پڑھنا
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,آپ کی کمپنی کے لئے حاصل کرنے کے لئے ایک فروخت کا مقصد مقرر کریں.
 ,Project wise Stock Tracking,پروجیکٹ وار اسٹاک ٹریکنگ
@@ -5277,11 +5316,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,ویب سائٹ بنانے میں ناکام
 DocType: Soil Analysis,Mg/K,MG / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تبادلوں تفصیل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,رکنیت اسٹاک انٹری نے پہلے ہی تشکیل یا نمونہ مقدار فراہم نہیں کی
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,رکنیت اسٹاک انٹری نے پہلے ہی تشکیل یا نمونہ مقدار فراہم نہیں کی
 DocType: Program,Program Abbreviation,پروگرام کا مخفف
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے
 DocType: Warranty Claim,Resolved By,کی طرف سے حل
-DocType: Bank Guarantee,Start Date,شروع کرنے کی تاریخ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ایک مدت کے لئے پتے مختص.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چیک اور ڈپازٹس غلط کی منظوری دے دی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,اکاؤنٹ {0}: آپ والدین کے اکاؤنٹ کے طور پر خود کی وضاحت نہیں کر سکتے ہیں
@@ -5296,11 +5334,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,گھنٹے
 DocType: Project,Expected Start Date,متوقع شروع کرنے کی تاریخ
 DocType: Purchase Invoice,04-Correction in Invoice,انوائس میں 04-اصلاح
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,کام آرڈر پہلے ہی BOM کے ساتھ تمام اشیاء کے لئے تیار کیا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,کام آرڈر پہلے ہی BOM کے ساتھ تمام اشیاء کے لئے تیار کیا
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,مختلف تفصیلات کی رپورٹ
 DocType: Setup Progress Action,Setup Progress Action,سیٹ اپ ترقی ایکشن
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,قیمت کی فہرست خریدنا
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,قیمت کی فہرست خریدنا
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,الزامات اس شے پر لاگو نہیں ہے تو ہم شے کو ہٹا دیں
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,سبسکرائب کریں منسوخ کریں
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,براہ کرم مکمل طور پر بحالی کی حیثیت کا انتخاب کریں یا ختم ہونے کی تاریخ کو ہٹائیں
 DocType: Supplier,Default Payment Terms Template,پہلے سے طے شدہ ادائیگی کی شرائط سانچہ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,ٹرانزیکشن کی کرنسی ادائیگی کے گیٹ وے کرنسی کے طور پر ایک ہی ہونا چاہیے
@@ -5311,7 +5350,6 @@
 DocType: Employee,Educational Qualification,تعلیمی اہلیت
 DocType: Workstation,Operating Costs,آپریٹنگ اخراجات
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ایکشن اگر جمع ماہانہ بجٹ سے تجاوز
-DocType: Subscription,Submit on creation,تخلیق پر جمع کرائیں
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} کیلئے کرنسی ہونا ضروری ہے {1}
 DocType: Asset,Disposal Date,ڈسپوزل تاریخ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ای میلز، دی وقت کمپنی کے تمام فعال ملازمین کو بھیجی جائے گی وہ چھٹی نہیں ہے تو. جوابات کا خلاصہ آدھی رات کو بھیجا جائے گا.
@@ -5330,6 +5368,7 @@
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Cheque Print Template,Cheque Print Template,چیک پرنٹ سانچہ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,لاگت کے مراکز کا چارٹ
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,رکنیت کو منسوخ کرنے سے قبل یا رقم ادا کرنے کے بعد انوائس کی تاریخ میں ناکام ہوگیا ہے
 DocType: Lab Test Template,Sample Collection,نمونہ مجموعہ
 ,Requested Items To Be Ordered,درخواست کی اشیاء حکم دیا جائے گا
 DocType: Price List,Price List Name,قیمت کی فہرست کا نام
@@ -5338,7 +5377,7 @@
 DocType: Account,Income,انکم
 DocType: Industry Type,Industry Type,صنعت کی قسم
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,کچھ غلط ہو گیا!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,انتباہ: چھوڑ درخواست مندرجہ ذیل بلاک تاریخوں پر مشتمل ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,انتباہ: چھوڑ درخواست مندرجہ ذیل بلاک تاریخوں پر مشتمل ہے
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,انوائس {0} پہلے ہی پیش کیا گیا ہے فروخت
 DocType: Supplier Scorecard Scoring Criteria,Score,اسکور
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,مالی سال {0} موجود نہیں ہے
@@ -5358,12 +5397,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 اور 100 کے درمیان ایک قدر ہونا چاہئے
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,اگلے قیمت کی قیمت کی تاریخ دستیاب کے لئے دستیاب تاریخ سے پہلے نہیں ہوسکتی ہے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,امائبھوت قرض
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,امائبھوت قرض
 DocType: Cost Center,Cost Center Name,لاگت مرکز نام
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,میکس Timesheet خلاف کام کے گھنٹوں
 DocType: Maintenance Schedule Detail,Scheduled Date,تخسوچت تاریخ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,کل ادا AMT
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,کل ادا AMT
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 حروف سے زیادہ پیغامات سے زیادہ پیغامات میں تقسیم کیا جائے گا
 DocType: Purchase Receipt Item,Received and Accepted,موصول ہوئی ہے اور قبول کر لیا
 DocType: Hub Settings,Company and Seller Profile,کمپنی اور بیچنے والا پروفائل
@@ -5377,10 +5416,9 @@
 DocType: Item,Variant Based On,ویرینٹ بنیاد پر
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100٪ ہونا چاہئے تفویض کل اہمیت. یہ {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,اپنے سپلائرز
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,براہ کرم درست کریں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
 DocType: Request for Quotation Item,Supplier Part No,پردایک حصہ نہیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,گمنام
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,کی طرف سے موصول
 DocType: Lead,Converted,تبدیل
@@ -5394,6 +5432,7 @@
 DocType: Asset,Assets,اثاثہ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,کمپیوٹر
 DocType: Item,List this Item in multiple groups on the website.,ویب سائٹ پر ایک سے زیادہ گروہوں میں اس شے کی فہرست.
+DocType: Subscription,Current Invoice End Date,موجودہ انوائس اختتام کی تاریخ
 DocType: Payment Term,Due Date Based On,کی وجہ سے تاریخ کی بنیاد پر
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,بیچنے والے ترتیبات میں ڈیفالٹ کسٹمر گروپ اور علاقہ مقرر کریں
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} کا کوئی وجود نہیں
@@ -5401,7 +5440,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,آئٹم: {0} نظام میں موجود نہیں ہے
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,آپ منجمد قیمت مقرر کرنے کی اجازت نہیں ہے
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled لکھے حاصل
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,جرنل اندراج کیلئے کوئی ادائیگی نہیں کی گئی
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
+DocType: Loan,Disbursed,منایا
 DocType: Healthcare Settings,Laboratory Settings,لیبارٹری کی ترتیبات
 DocType: Patient Appointment,Service Unit,سروس یونٹ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,کامیابی سے سیٹ سپلائر
@@ -5414,12 +5455,12 @@
 DocType: Share Balance,No of Shares,حصوں میں سے کوئی نہیں
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,حیثیت کا انتخاب کریں
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
 DocType: Pricing Rule,Pricing Rule Help,قیمتوں کا تعین حکمرانی کی مدد
 DocType: School House,House Name,ایوان نام
 DocType: Fee Schedule,Total Amount per Student,طالب علم فی کل رقم
 DocType: Purchase Taxes and Charges,Account Head,اکاؤنٹ ہیڈ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,الیکٹریکل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,الیکٹریکل
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,آپ کے صارفین کے طور پر آپ کی تنظیم کے باقی میں شامل کریں. آپ بھی رابطے سے انہیں شامل کر کے اپنے پورٹل پر صارفین کی دعوت دیتے ہیں شامل کر سکتے ہیں
 DocType: Stock Entry,Total Value Difference (Out - In),کل قیمت فرق (باہر - میں)
 DocType: Grant Application,Requested Amount,درخواست کی رقم
@@ -5429,7 +5470,7 @@
 DocType: Crop Cycle,Detected Diseases,پتہ چلا بیماری
 DocType: Stock Entry,Default Source Warehouse,پہلے سے طے شدہ ماخذ گودام
 DocType: Item,Customer Code,کسٹمر کوڈ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 DocType: Asset Maintenance Task,Last Completion Date,آخری تکمیل کی تاریخ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
@@ -5437,9 +5478,10 @@
 DocType: GoCardless Settings,GoCardless Settings,گوڈورلیس ترتیبات
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,اسٹاک اثاثوں
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,اسٹاک اثاثوں
 DocType: Restaurant,Active Menu,فعال مینو
 DocType: Target Detail,Target Qty,ہدف کی مقدار
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},قرض کے خلاف: {0}
 DocType: Shopping Cart Settings,Checkout Settings,چیک آؤٹ ترتیبات
 DocType: Student Attendance,Present,موجودہ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,ترسیل کے نوٹ {0} پیش نہیں کیا جانا چاہئے
@@ -5448,9 +5490,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},ملازم کی تنخواہ کی پرچی {0} کے پاس پہلے وقت شیٹ کے لئے پیدا {1}
 DocType: Vehicle Log,Odometer,مسافت پیما
 DocType: Production Plan Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
 DocType: Chapter,Chapter Head,باب سر
 DocType: Payment Term,Month(s) after the end of the invoice month,انوائس مہینے کے اختتام کے بعد مہینے
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,پروجیکٹ سرگرمی / کام.
@@ -5458,11 +5500,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تنخواہ تخم پیدا
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,ڈیٹا لیٹر کا دورہ کرنے سے پہلے ٹیسٹ ٹیٹو سے پہلے نہیں ہوسکتا ہے
 DocType: POS Profile,Allow user to edit Discount,صارف کو ڈسکاؤنٹ میں ترمیم کرنے کی اجازت دیں
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,گاہکوں سے حاصل کریں
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,گاہکوں سے حاصل کریں
 DocType: Purchase Invoice Item,Include Exploded Items,دھماکہ خیز اشیاء شامل کریں
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",قابل اطلاق کے لئے کے طور پر منتخب کیا جاتا ہے تو خریدنے، جانچ پڑتال ہونا ضروری {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ڈسکاؤنٹ کم 100 ہونا ضروری ہے
 DocType: Shipping Rule,Restrict to Countries,ممالک پر پابندی
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
 DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
 DocType: Project,Total Sales Amount (via Sales Order),کل سیلز رقم (سیلز آرڈر کے ذریعے)
@@ -5480,6 +5523,7 @@
 DocType: Soil Texture,Sandy Clay,سینڈی مٹی
 DocType: Grant Application,Assessment  Manager,تشخیص مینیجر
 DocType: Payment Entry,Allocate Payment Amount,ادائیگی رقم مختص
+DocType: Subscription Plan,Subscription Plan,سبسکرپشن کی منصوبہ بندی
 DocType: Employee External Work History,Salary,تنخواہ
 DocType: Serial No,Delivery Document Type,ڈلیوری دستاویز کی قسم
 DocType: Sales Order,Partly Delivered,جزوی طور پر ہونے والا
@@ -5504,9 +5548,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,خستہ حد: 2
 DocType: SG Creation Tool Course,Max Strength,زیادہ سے زیادہ طاقت
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,presets انسٹال
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},کسٹمر {}} کے لئے کوئی ترسیل نوٹ منتخب نہیں کیا گیا
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},کسٹمر {}} کے لئے کوئی ترسیل نوٹ منتخب نہیں کیا گیا
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM تبدیل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,ترسیل کی تاریخ پر مبنی اشیاء منتخب کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,ترسیل کی تاریخ پر مبنی اشیاء منتخب کریں
 DocType: Grant Application,Has any past Grant Record,پچھلے گرانٹ ریکارڈ ہے
 ,Sales Analytics,سیلز تجزیات
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},دستیاب {0}
@@ -5525,7 +5569,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مال فراہم لاگت
 DocType: Selling Settings,Settings for Selling Module,ماڈیول فروخت کے لئے ترتیبات
 DocType: Hotel Room Reservation,Hotel Room Reservation,ہوٹل کمرہ ریزرویشن
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,کسٹمر سروس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,کسٹمر سروس
 DocType: BOM,Thumbnail,تھمب نیل
 DocType: Item Customer Detail,Item Customer Detail,آئٹم کسٹمر تفصیل سے
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,پیشکش امیدوار ایک ملازمت.
@@ -5541,7 +5585,7 @@
 DocType: Fees,Student Details,طالب علم کی تفصیلات
 DocType: Purchase Invoice Item,Stock Qty,اسٹاک قی
 DocType: Purchase Invoice Item,Stock Qty,اسٹاک قی
-DocType: Employee Loan,Repayment Period in Months,مہینے میں واپسی کی مدت
+DocType: Loan,Repayment Period in Months,مہینے میں واپسی کی مدت
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,خرابی: ایک درست شناختی نمبر؟
 DocType: Naming Series,Update Series Number,اپ ڈیٹ سلسلہ نمبر
 DocType: Account,Equity,اکوئٹی
@@ -5550,7 +5594,7 @@
 DocType: Task,Closing Date,آخری تاریخ
 DocType: Sales Order Item,Produced Quantity,تیار مقدار
 DocType: Timesheet,Work Detail,کام کی تفصیل
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,انجینئر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,انجینئر
 DocType: Journal Entry,Total Amount Currency,کل رقم ست
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,تلاش ذیلی اسمبلی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},آئٹم کوڈ صف کوئی ضرورت {0}
@@ -5596,13 +5640,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,ڈونر کی قسم کی معلومات.
 DocType: Request for Quotation,Supplier Detail,پردایک تفصیل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},فارمولا یا حالت میں خرابی: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,انوائس کی رقم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,انوائس کی رقم
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,معیار کے وزن 100٪
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,حاضری
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,اسٹاک اشیا
 DocType: BOM,Materials,مواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",نہیں کی جانچ پڑتال تو، فہرست یہ لاگو کیا جا کرنے کے لئے ہے جہاں ہر سیکشن میں شامل کرنا پڑے گا.
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} تخلیق کرنا
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ذریعہ اور ہدف گودام ہی نہیں ہو سکتا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,تاریخ پوسٹنگ اور وقت پوسٹنگ لازمی ہے
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,لین دین کی خریداری کے لئے ٹیکس سانچے.
@@ -5625,14 +5668,14 @@
 DocType: Shipping Rule,Fixed,فکسڈ
 DocType: Vehicle Service,Clutch Plate,کلچ پلیٹ
 DocType: Company,Round Off Account,اکاؤنٹ گول
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,انتظامی اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,انتظامی اخراجات
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,کنسلٹنگ
 DocType: Customer Group,Parent Customer Group,والدین گاہک گروپ
-DocType: Journal Entry,Subscription,سبسکرائب کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,سبسکرائب کریں
 DocType: Purchase Invoice,Contact Email,رابطہ ای میل
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,فیس تخلیق کی منتقلی
 DocType: Appraisal Goal,Score Earned,سکور حاصل کی
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,نوٹس کی مدت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,نوٹس کی مدت
 DocType: Asset Category,Asset Category Name,ایسیٹ قسم کا نام
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,یہ ایک جڑ علاقہ ہے اور میں ترمیم نہیں کیا جا سکتا.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نیا سیلز شخص کا نام
@@ -5646,7 +5689,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
 DocType: Asset,Frequency of Depreciation (Months),فرسودگی کے تعدد (مہینے)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,کریڈٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,کریڈٹ اکاؤنٹ
 DocType: Landed Cost Item,Landed Cost Item,لینڈڈ شے کی قیمت
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر اقدار دکھائیں
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,شے کی مقدار خام مال کی دی گئی مقدار سے repacking / مینوفیکچرنگ کے بعد حاصل
@@ -5654,7 +5697,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,وصولی / قابل ادائیگی اکاؤنٹ
 DocType: Delivery Note Item,Against Sales Order Item,سیلز آرڈر آئٹم خلاف
 DocType: Hub Settings,Company Logo,کمپنی کی علامت
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بجٹ گروپ کے اکاؤنٹ کے خلاف مقرر نہیں کیا جا سکتا {0}
 DocType: Healthcare Settings,Patient Registration,مریض کا رجسٹریشن
@@ -5689,11 +5732,10 @@
 DocType: Journal Entry,Total Debit,کل ڈیبٹ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,پہلے سے طے شدہ تیار مال گودام
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,براہ کرم مریض کو منتخب کریں
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروخت شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,فروخت شخص
 DocType: Hotel Room Package,Amenities,سہولیات
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,بجٹ اور لاگت سینٹر
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ادائیگی کے ایک سے زیادہ ڈیفالٹ موڈ کی اجازت نہیں ہے
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,کے لئے
 ,Appointment Analytics,تقرری تجزیات
 DocType: Vehicle Service,Half Yearly,چھماہی
 DocType: Lead,Blog Subscriber,بلاگ سبسکرائبر
@@ -5710,6 +5752,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,آپ ہر سال طلباء گروپوں بنا دیں تو خالی چھوڑ دیں
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",جانچ پڑتال تو، کل کوئی. کام کے دنوں کے چھٹیوں کے شامل ہوں گے، اور اس تنخواہ فی دن کی قیمت کم ہو جائے گا
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",موجودہ کلید کا استعمال کرتے ہوئے اطلاقات تک رسائی حاصل نہیں ہو گی، کیا آپ کو یقین ہے؟
+DocType: Subscription Settings,Prorate,پراجیکٹ
 DocType: Purchase Invoice,Total Advance,کل ایڈوانس
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,سانچہ کوڈ تبدیل کریں
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,اصطلاح آخر تاریخ ٹرم شروع کرنے کی تاریخ سے پہلے نہیں ہو سکتا. تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
@@ -5721,8 +5764,9 @@
 DocType: Opportunity Item,Basic Rate,بنیادی شرح
 DocType: GL Entry,Credit Amount,کریڈٹ کی رقم
 DocType: Cheque Print Template,Signatory Position,دستخط پوزیشن
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
 DocType: Timesheet,Total Billable Hours,کل بل قابل گھنٹے
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,اس رکنیت کی طرف سے پیدا ہونے والے انوائسوں کو سبسکرائب کرنے والے دن کی تعداد
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ادائیگی کی رسید نوٹ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,یہ کسٹمر کے خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},قطار {0}: اختصاص کردہ رقم {1} ادائیگی کی ادائیگی کی رقم {2} سے کم یا مساوی ہونا ضروری ہے
@@ -5741,12 +5785,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,منتخب یا نئے گاہک شامل
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),فنڈز (اثاثے) کی درخواست
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,یہ اس ملازم کی حاضری پر مبنی ہے
 DocType: Assessment Result,Summary,خلاصہ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,حاضری مارک کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,ڈیبٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,ڈیبٹ اکاؤنٹ
 DocType: Fiscal Year,Year Start Date,سال شروع کرنے کی تاریخ
 DocType: Attendance,Employee Name,ملازم کا نام
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,ریسٹورنٹ آرڈر انٹری آئٹم
@@ -5758,7 +5802,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,خریداری کی رقم
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,پیدا کردہ سپروٹیشن {0}
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,ملازم فوائد
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,ملازم فوائد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Work Order,Manufactured Qty,تیار مقدار
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},حصوں {0} کے ساتھ موجود نہیں ہیں
@@ -5766,12 +5810,12 @@
 DocType: Asset,Out of Order,حکم سے باہر
 DocType: Purchase Receipt Item,Accepted Quantity,منظور مقدار
 DocType: Projects Settings,Ignore Workstation Time Overlap,ورکاسٹیشن ٹائم اوورلوپ کو نظر انداز کریں
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},براہ کرم ملازمت {0} یا کمپنی {1} کیلئے پہلے سے طے شدہ چھٹی کی فہرست مقرر کریں.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},براہ کرم ملازمت {0} یا کمپنی {1} کیلئے پہلے سے طے شدہ چھٹی کی فہرست مقرر کریں.
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} نہیں موجود
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,منتخب بیچ نمبر
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,گاہکوں کو اٹھایا بل.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروجیکٹ کی شناخت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
 DocType: Patient Service Unit,Medical Administrator,میڈیکل ایڈمنسٹریٹر
 DocType: Assessment Plan,Schedule,شیڈول
 DocType: Account,Parent Account,والدین کے اکاؤنٹ
@@ -5801,15 +5845,16 @@
 DocType: Asset Repair,Repair Status,مرمت کی حیثیت
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,اکاؤنٹنگ جرنل اندراج.
 DocType: Delivery Note Item,Available Qty at From Warehouse,گودام سے پر دستیاب مقدار
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
 DocType: POS Profile,Account for Change Amount,رقم تبدیلی کے لئے اکاؤنٹ
 DocType: Purchase Invoice,input service,ان پٹ سروس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},صف {0}: پارٹی / اکاؤنٹ کے ساتھ میل نہیں کھاتا {1} / {2} میں {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,بحالی ٹیم کے رکن
 DocType: Agriculture Analysis Criteria,Soil Analysis,مٹی تجزیہ
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,کورس کا کوڈ:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
 DocType: Account,Stock,اسٹاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
 DocType: Employee,Current Address,موجودہ پتہ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",واضح طور پر مخصوص جب تک شے تو وضاحت، تصویر، قیمتوں کا تعین، ٹیکس سانچے سے مقرر کیا جائے گا وغیرہ کسی اور شے کی ایک مختلف ہے تو
 DocType: Serial No,Purchase / Manufacture Details,خریداری / تیاری تفصیلات
@@ -5857,19 +5902,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} کے لئے داخلہ
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
 DocType: Supplier Scorecard Scoring Variable,Variable Name,متغیر نام
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
 DocType: Asset,Asset Category,ایسیٹ زمرہ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,نیٹ تنخواہ منفی نہیں ہو سکتا
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,سپلائر مواد
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,مواد کی درخواست کی منصوبہ بندی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,ایکسائز انوائس
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ایک بار سے زیادہ ظاہر ہوتا ہے
 DocType: Expense Claim,Employees Email Id,ملازمین ای میل کی شناخت
 DocType: Employee Attendance Tool,Marked Attendance,نشان حاضری
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,موجودہ قرضوں
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,موجودہ قرضوں
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,ٹائمر نے اس گھنٹوں سے زیادہ وقت گزارے.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,بڑے پیمانے پر ایس ایم ایس اپنے رابطوں کو بھیجیں
 DocType: Patient,A Positive,ایک مثبت
@@ -5880,9 +5925,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,اصل مقدار لازمی ہے
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو خریدنے والے احکامات کو احتیاط کے ساتھ جاری کیا جانا چاہئے.
 DocType: Asset Maintenance Team,Asset Maintenance Team,اثاثہ بحالی کی ٹیم
-DocType: Employee Loan,Loan Type,قرض کی قسم
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} کو کامیابی سے جمع کردی گئی ہے
+DocType: Loan,Loan Type,قرض کی قسم
 DocType: Scheduling Tool,Scheduling Tool,شیڈولنگ کا آلہ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,کریڈٹ کارڈ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,کریڈٹ کارڈ
 DocType: BOM,Item to be manufactured or repacked,آئٹم تیار یا repacked جائے کرنے کے لئے
 DocType: Employee Education,Major/Optional Subjects,میجر / اختیاری مضامین
 DocType: Sales Invoice Item,Drop Ship,ڈراپ جہاز
@@ -5914,7 +5960,7 @@
 DocType: Item,Units of Measure,پیمائش کی اکائیوں
 DocType: Manufacturing Settings,Allow Production on Holidays,چھٹیاں پیداوار کی اجازت دیتے ہیں
 DocType: Sales Invoice,Customer's Purchase Order Date,گاہک کی خریداری آرڈر کی تاریخ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,دارالحکومت اسٹاک
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,دارالحکومت اسٹاک
 DocType: Shopping Cart Settings,Show Public Attachments,پبلک منسلک دکھائیں
 DocType: Packing Slip,Package Weight Details,پیکیج وزن تفصیلات
 DocType: Restaurant Reservation,Reservation Time,ریزرویشن کا وقت
@@ -5929,7 +5975,7 @@
 DocType: Purchase Order,To Receive and Bill,وصول کرنے اور بل میں
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,قطار # {0}: ٹرانزیکشن کی تاریخ سے قبل تاریخ کی طرف سے ریقڈ نہیں ہوسکتی
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,نمایاں مصنوعات
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,ڈیزائنر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,ڈیزائنر
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,شرائط و ضوابط سانچہ
 DocType: Serial No,Delivery Details,ڈلیوری تفصیلات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
@@ -5939,20 +5985,20 @@
 DocType: Driver,Expiry Date,خاتمے کی تاریخ
 DocType: Healthcare Settings,Employee name and designation in print,ملازم کا نام اور پرنٹ میں نامزد
 ,accounts-browser,اکاؤنٹس براؤزر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,پہلے زمرہ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,پہلے زمرہ منتخب کریں
 apps/erpnext/erpnext/config/projects.py +13,Project master.,پروجیکٹ ماسٹر.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",زیادہ بلنگ یا زیادہ حکم دینے کی اجازت دیتے ہیں کے لئے، سٹاک ترتیبات یا آئٹم میں اپ ڈیٹ &quot;بھتہ&quot;.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,کرنسیاں وغیرہ $ طرح کسی بھی علامت اگلے ظاہر نہیں کیا.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),آدھا دن
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),آدھا دن
 DocType: Payment Term,Credit Days,کریڈٹ دنوں
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,لیب ٹیسٹ حاصل کرنے کے لئے مریض کا انتخاب کریں
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Student کی بیچ بنائیں
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM سے اشیاء حاصل
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,وقت دن کی قیادت
 DocType: Cash Flow Mapping,Is Income Tax Expense,آمدنی ٹیک خرچ ہے
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,طالب علم انسٹی ٹیوٹ کے ہاسٹل میں رہائش پذیر ہے تو اس کو چیک کریں.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
 ,Stock Summary,اسٹاک کا خلاصہ
@@ -5963,10 +6009,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ممبران تاریخ
 DocType: Employee,Reason for Leaving,جانے کی وجہ
 DocType: BOM Operation,Operating Cost(Company Currency),آپریٹنگ لاگت (کمپنی کرنسی)
-DocType: Employee Loan Application,Rate of Interest,سود کی شرح
+DocType: Loan Application,Rate of Interest,سود کی شرح
 DocType: Expense Claim Detail,Sanctioned Amount,منظور رقم
 DocType: Item,Shelf Life In Days,شیلف زندگی میں دن
 DocType: GL Entry,Is Opening,افتتاحی ہے
+DocType: Department,Expense Approvers,اخراجات متنازعہ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},صف {0}: ڈیبٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
 DocType: Journal Entry,Subscription Section,سبسکرائب سیکشن
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,اکاؤنٹ {0} موجود نہیں ہے
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 864c7a6..ad17b31 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ushbu kafolat talabnomasini bekor qilishdan avval materialni bekor qilish {0} ga tashrif buyuring
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Baholash bo&#39;yicha hisobot
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Iste&#39;molchi mahsulotlari
-DocType: Purchase Receipt,Subscription Detail,Obuna batafsil
 DocType: Supplier Scorecard,Notify Supplier,Yetkazib beruvchini xabardor qiling
 DocType: Item,Customer Items,Xaridor elementlari
 DocType: Project,Costing and Billing,Xarajatlar va billing
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Hisob {0}: Ota-hisob {1} hisob kitobi bo&#39;lishi mumkin emas
 DocType: Item,Publish Item to hub.erpnext.com,Ob&#39;ektni hub.erpnext.com ga joylashtiring
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Email bayonnomalari
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Baholash
 DocType: Item,Default Unit of Measure,Standart o&#39;lchov birligi
 DocType: SMS Center,All Sales Partner Contact,Barcha Sotuvdagi hamkori bilan aloqa
-DocType: Employee,Leave Approvers,Tasdiqlovchilar qoldiring
+DocType: Department,Leave Approvers,Tasdiqlovchilar qoldiring
 DocType: Sales Partner,Dealer,Diler
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Tadqiqotlar
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Mavjudligini tekshirib ko&#39;ring
 DocType: Job Applicant,Job Applicant,Ish beruvchi
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Bu Ta&#39;minotchi bilan tuzilgan bitimlarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Huquqiy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Haqiqiy turdagi soliqni {0} qatoridagi Item Rate ga qo&#39;shish mumkin emas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Huquqiy
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Haqiqiy turdagi soliqni {0} qatoridagi Item Rate ga qo&#39;shish mumkin emas
 DocType: Bank Guarantee,Customer,Xaridor
 DocType: Purchase Receipt Item,Required By,Kerakli
 DocType: Delivery Note,Return Against Delivery Note,Xatoga qarshi qaytib kelish Eslatma
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Bank hisobi {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Buxgalteriya yozuvlari yozilgan va muvozanatlar saqlanib turadigan rahbarlar (yoki guruhlar).
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} uchun ustunlik noldan kam bo&#39;lishi mumkin emas ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Jarayon uchun hech qanday taqdim etilmagan Ish haqi slipslari mavjud emas.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Jarayon uchun hech qanday taqdim etilmagan Ish haqi slipslari mavjud emas.
 DocType: Manufacturing Settings,Default 10 mins,Standart 10 daqiqa
 DocType: Leave Type,Leave Type Name,Tovar nomi qoldiring
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Ko&#39;rish ochiq
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Ushbu harakatni bugungi kunda yuqorida eslatib o&#39;tilgan davrda olish kerak
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Series muvaffaqiyatli yangilandi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Tekshirib ko&#39;rmoq
 DocType: Pricing Rule,Apply On,Ilova
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Barcha yetkazib beruvchi bilan aloqa
 DocType: Support Settings,Support Settings,Yordam sozlamalari
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Kutilayotgan yakunlangan sana kutilgan boshlanish sanasidan kam bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Baho {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Yangi ishga tushirish
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Baho {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Partiya mahsulotining amal qilish muddati
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Bank loyihasi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Bank loyihasi
 DocType: Membership,membership validaty section,a&#39;zolik qoidalari
 DocType: Mode of Payment Account,Mode of Payment Account,To&#39;lov shakli hisob
 DocType: Consultation,Consultation,Maslamat
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiallar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Veb-sayt yaratish
 DocType: Opening Invoice Creation Tool Item,Quantity,Miqdor
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Hisoblar jadvali bo&#39;sh bo&#39;lishi mumkin emas.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Kreditlar (majburiyatlar)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Hisoblar jadvali bo&#39;sh bo&#39;lishi mumkin emas.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Kreditlar (majburiyatlar)
 DocType: Employee Education,Year of Passing,O&#39;tish yili
 DocType: Item,Country of Origin,Ishlab chiqaruvchi mamlakat; ta&#39;minotchi mamlakat
 DocType: Soil Texture,Soil Texture Criteria,Tuproq to&#39;qimalarining mezonlari
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Birlamchi aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Muammolarni ochish
 DocType: Production Plan Item,Production Plan Item,Ishlab chiqarish rejasi elementi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},{0} {0} {{{}} foydalanuvchisi allaqachon tayinlangan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},{0} {0} {{{}} foydalanuvchisi allaqachon tayinlangan
 DocType: Lab Test Groups,Add new line,Yangi qator qo&#39;shing
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sog&#39;liqni saqlash
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),To&#39;lovni kechiktirish (kunlar)
@@ -89,7 +85,7 @@
 ,Delay Days,Kechikish kunlari
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Xizmat ketadi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Billing
+DocType: Subscription Invoice,Invoice,Billing
 DocType: Purchase Invoice Item,Item Weight Details,Og&#39;irligi haqida ma&#39;lumot
 DocType: Asset Maintenance Log,Periodicity,Muntazamlik
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Moliyaviy yil {0} talab qilinadi
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} {3} bilan mos emas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,# {0} qatori:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,# {0} qatori:
 DocType: Timesheet,Total Costing Amount,Jami xarajat summasi
 DocType: Delivery Note,Vehicle No,Avtomobil raqami
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,"Iltimos, narxlar ro&#39;yxatini tanlang"
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Ishlar davom etmoqda
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,"Iltimos, tarixni tanlang"
 DocType: Daily Work Summary Group,Holiday List,Dam olish ro&#39;yxati
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Hisobchi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Hisobchi
 DocType: Hub Settings,Selling Price List,Sotuvlar narxlari
 DocType: Patient,Tobacco Current Use,Tamaki foydalanish
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Sotish darajasi
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Sotish darajasi
 DocType: Cost Center,Stock User,Tayyor foydalanuvchi
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telefon raqami
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},Yangi {0}: # {1}
 DocType: Delivery Trip,Initial Email Notification Sent,Dastlabki elektron pochta xabari yuborildi
 ,Sales Partners Commission,Savdo hamkorlari komissiyasi
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Amortizatsiyadan keyin qiymat
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Bilan bog&#39;liq
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,Davomiylik sanasi xodimning ishtirok etish kunidan kam bo&#39;lmasligi kerak
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,Davomiylik sanasi xodimning ishtirok etish kunidan kam bo&#39;lmasligi kerak
 DocType: Grading Scale,Grading Scale Name,Baholash o&#39;lchovi nomi
-DocType: Subscription,Repeat on Day,Kunni takrorlang
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Bu ildiz hisob hisoblanadi va tahrirlanmaydi.
 DocType: Sales Invoice,Company Address,Kompaniya manzili
 DocType: BOM,Operations,Operatsiyalar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} uchun chegirmalar asosida avtorizatsiyani sozlab bo&#39;lmaydi
+DocType: Subscription,Subscription Start Date,Obunani boshlash sanasi
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Ikki ustunli .csv faylini qo&#39;shing, ulardan bittasi eski nom uchun, ikkinchisi esa yangi nom uchun"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} har qanday faol Moliya yilida emas.
 DocType: Packed Item,Parent Detail docname,Ota-ona batafsil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Malumot: {0}, mahsulot kodi: {1} va mijoz: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Sinov muddati tugash sanasi Sinov davri boshlanish sanasidan oldin bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ish uchun ochilish.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},{1} qatorida {0} subpudratchilar uchun BOM ko&#39;rsatilgan emas
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Xuddi shu kompaniya bir necha marta kiritilgan
 DocType: Patient,Married,Turmushga chiqdi
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} uchun ruxsat berilmagan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Elementlarni oling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Elementlarni oling
 DocType: Price List,Price Not UOM Dependant,Narx UOMga qaram emas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Stokni etkazib berishga qarshi yangilanib bo&#39;lmaydi. {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Mahsulot {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,Tormoz yog&#39;i
 DocType: Tax Rule,Tax Type,Soliq turi
 ,Completed Work Orders,Tugallangan ish buyurtmalari
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Soliq summasi
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Soliq summasi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan oldin kiritilgan yozuvlarni qo&#39;shish yoki yangilash uchun ruxsat yo&#39;q
 DocType: BOM,Item Image (if not slideshow),Mavzu tasvir (agar slayd-shou bo&#39;lmasa)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Soat / 60) * Haqiqiy operatsiya vaqti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,# {0} satri: Hujjatning Hujjat turi xarajat shikoyati yoki jurnali kiritmasidan biri bo&#39;lishi kerak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,BOM-ni tanlang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,# {0} satri: Hujjatning Hujjat turi xarajat shikoyati yoki jurnali kiritmasidan biri bo&#39;lishi kerak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,BOM-ni tanlang
 DocType: SMS Log,SMS Log,SMS-jurnali
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Etkazib beriladigan mahsulotlarning narxi
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Xodimga berilgan avans miqdorini boshqaring
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Etkazib berish bayonoti
 DocType: Journal Entry,Opening Entry,Kirish ochish
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Hisob faqatgina to&#39;laydi
-DocType: Employee Loan,Repay Over Number of Periods,Davr sonini qaytaring
+DocType: Loan,Repay Over Number of Periods,Davr sonini qaytaring
 DocType: Stock Entry,Additional Costs,Qo&#39;shimcha xarajatlar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Mavjud tranzaktsiyadagi hisobni guruhga aylantirish mumkin emas.
 DocType: Lead,Product Enquiry,Mahsulot so&#39;rovnomasi
 DocType: Education Settings,Validate Batch for Students in Student Group,Talaba guruhidagi talabalar uchun partiyani tasdiqlash
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},{1} uchun xodimlar uchun {0} yozuvi yo&#39;q
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},{1} uchun xodimlar uchun {0} yozuvi yo&#39;q
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Iltimos, kompaniyani birinchi kiriting"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,"Iltimos, kompaniyani tanlang"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,"Iltimos, kompaniyani tanlang"
 DocType: Employee Education,Under Graduate,Magistr darajasida
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Chiqish sozlamalari uchun Leave Status Notification holatini ko&#39;rsatish uchun standart shablonni o&#39;rnating.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Nishonni yoqing
 DocType: BOM,Total Cost,Jami xarajat
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,Xodimlarning qarzlari
 DocType: Fee Schedule,Send Payment Request Email,To&#39;lov uchun so&#39;rov yuborish uchun E-mail
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,{0} mahsuloti tizimda mavjud emas yoki muddati tugagan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Ko `chmas mulk
@@ -232,20 +228,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Muvaffaqiyatsiz ro&#39;yxatdan o&#39;tkazilmagan.
 DocType: Assessment Result,Grade,Baholash
 DocType: Restaurant Table,No of Seats,O&#39;rindiqlar soni
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Dinamik mavzuni qo'shish uchun, kabi jinja teglaridan foydalaning <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Yetkazib beruvchining etkazib beruvchisi
 DocType: Asset Maintenance Task,Asset Maintenance Task,Assotsiatsiyalash bo&#39;yicha topshiriq
 DocType: SMS Center,All Contact,Barcha aloqa
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Yillik ish haqi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Yillik ish haqi
 DocType: Daily Work Summary,Daily Work Summary,Kundalik ish xulosasi
 DocType: Period Closing Voucher,Closing Fiscal Year,Moliyaviy yil yakuni
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1} muzlatilgan
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Hisoblar jadvali yaratish uchun mavjud Kompaniya-ni tanlang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Aksiyadorlik xarajatlari
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Hisoblar jadvali yaratish uchun mavjud Kompaniya-ni tanlang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Aksiyadorlik xarajatlari
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Maqsadli omborni tanlang
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Marhamat qilib, tanlangan aloqa elektron pochta manzilini kiriting"
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,"Marhamat qilib, tanlangan aloqa elektron pochta manzilini kiriting"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra kirish
 DocType: Journal Entry Account,Credit in Company Currency,Kompaniya valyutasida kredit
@@ -266,7 +259,7 @@
 DocType: Customer,Primary Address,Birlamchi manzil
 DocType: Production Plan,Material Request Detail,Materiallar bo&#39;yicha batafsil ma&#39;lumot
 DocType: Selling Settings,Default Quotation Validity Days,Standart quotatsiya amal qilish kunlari
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Mavzu kursiga {0} qatoridagi soliqni kiritish uchun qatorlar {1} da soliqlar ham kiritilishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Mavzu kursiga {0} qatoridagi soliqni kiritish uchun qatorlar {1} da soliqlar ham kiritilishi kerak
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,HR moduli uchun sozlamalar
 DocType: SMS Center,SMS Center,SMS markazi
 DocType: Sales Invoice,Change Amount,Miqdorni o&#39;zgartirish
@@ -276,26 +269,28 @@
 DocType: Driver,Driving License Categories,Haydovchilik guvohnomasi kategoriyalari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,"Iltimos, etkazib berish sanasi kiriting"
 DocType: Depreciation Schedule,Make Depreciation Entry,Amortizatsiyani kiritish
+DocType: HR Settings,Leave Settings,Sozlamalar qoldiring
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,So&#39;rov turi
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Xodim yarat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radioeshittirish
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POSning sozlash rejimi (Onlayn / Offlayn)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Ish buyurtmalariga qarshi vaqt jadvallarini yaratishni o&#39;chirib qo&#39;yadi. Operatsiyalarni Ish tartibi bo&#39;yicha kuzatib bo&#39;lmaydi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Ijroiya
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Ijroiya
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Faoliyatning tafsilotlari.
 DocType: Asset Maintenance Log,Maintenance Status,Xizmat holati
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Registratsiya tafsilotlari
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Yetkazib beruvchi to&#39;lash kerak hisobiga {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Mahsulotlar va narxlanish
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Umumiy soatlar: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Sana boshlab Moliya yilida bo&#39;lishi kerak. Sana = {0}
 DocType: Drug Prescription,Interval,Interval
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Tanlash
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Tanlash
 DocType: Grant Application,Individual,Individual
 DocType: Academic Term,Academics User,Akademiklar foydalanuvchisi
 DocType: Cheque Print Template,Amount In Figure,Shaklidagi miqdor
-DocType: Employee Loan Application,Loan Info,Kredit haqida ma&#39;lumot
+DocType: Loan Application,Loan Info,Kredit haqida ma&#39;lumot
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Ta&#39;minot tashriflari rejasi.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Yetkazib beruvchi Kuzatuv davri
 DocType: Share Transfer,Share Transfer,Almashuvni o&#39;tkazish
@@ -311,7 +306,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Mavzu shablonni
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biokimyo
 DocType: Job Offer,Select Terms and Conditions,Qoidalar va shartlarni tanlang
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Chiqish qiymati
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Chiqish qiymati
 DocType: Woocommerce Settings,Woocommerce Settings,Woosommerce sozlamalari
 DocType: Production Plan,Sales Orders,Savdo buyurtmalarini
 DocType: Purchase Taxes and Charges,Valuation,Baholash
@@ -334,10 +329,12 @@
 DocType: Selling Settings,Default Territory,Default Territory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televizor
 DocType: Work Order Operation,Updated via 'Time Log',&quot;Time log&quot; orqali yangilangan
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},Avans miqdori {0} {1} dan ortiq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Mijozni yoki yetkazib beruvchini tanlang.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},Avans miqdori {0} {1} dan ortiq bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Ushbu tranzaksiya uchun Series ro&#39;yxati
 DocType: Company,Enable Perpetual Inventory,Doimiy inventarizatsiyani yoqish
+DocType: Bank Guarantee,Charges Incurred,To&#39;lovlar kelib tushdi
 DocType: Company,Default Payroll Payable Account,Ish haqi to&#39;lanadigan hisob qaydnomasi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,E-pochta guruhini yangilang
 DocType: Sales Invoice,Is Opening Entry,Kirish ochilmoqda
@@ -361,7 +358,7 @@
 DocType: Lab Test,Custom Result,Maxsus natija
 DocType: Delivery Stop,Contact Name,Kontakt nomi
 DocType: Course Assessment Criteria,Course Assessment Criteria,Kurs baholash mezonlari
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Soliq kodi:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Soliq kodi:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Isoning shogirdi kimligi:
 DocType: POS Customer Group,POS Customer Group,Qalin xaridorlar guruhi
 DocType: Land Unit,Land Unit describing various land assets,Turli er mulklarini tavsiflovchi er uchastkasi
@@ -374,9 +371,8 @@
 ,Open Work Orders,Ochiq ish buyurtmalari
 DocType: Payment Term,Credit Months,Kredit oylari
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Net ulush 0 dan kam bo&#39;lmasligi kerak
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",Tizimdan takroriy xato xabardorlarini jo&#39;natishni to&#39;xtatish uchun obunadagi &quot;O&#39;chirish&quot; maydonini tekshirdik
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Ajratish sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Yillar davomida barglar
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ajratish sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Yillar davomida barglar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: agar bu oldindan yoziladigan bo&#39;lsa, {1} hisobiga &quot;Ish haqi&quot; ni tekshiring."
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},{0} ombori {1} kompaniyasiga tegishli emas
 DocType: Email Digest,Profit & Loss,Qor va ziyon
@@ -384,9 +380,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Jami xarajat summasi (vaqt jadvalidan)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Talabalar uchun Talabalar Guruhi ostida tanlansin
 DocType: Item Website Specification,Item Website Specification,Veb-saytning spetsifikatsiyasi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Blokdan chiqing
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},{0} elementi {1} da umrining oxiriga yetdi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bank yozuvlari
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Blokdan chiqing
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},{0} elementi {1} da umrining oxiriga yetdi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bank yozuvlari
 DocType: Crop,Annual,Yillik
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Qimmatli qog&#39;ozlar bitimining elementi
 DocType: Stock Entry,Sales Invoice No,Sotuvdagi hisob-faktura №
@@ -394,7 +390,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Isoning shogirdi guruhini yaratish vositasi kursi
 DocType: Lead,Do Not Contact,Aloqa qilmang
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Tashkilotingizda ta&#39;lim beradigan odamlar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Dastur ishlab chiqaruvchisi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Dastur ishlab chiqaruvchisi
 DocType: Item,Minimum Order Qty,Minimal Buyurtma miqdori
 DocType: Pricing Rule,Supplier Type,Yetkazib beruvchi turi
 DocType: Course Scheduling Tool,Course Start Date,Kurs boshlanishi
@@ -403,8 +399,8 @@
 DocType: Item,Publish in Hub,Hubda nashr qiling
 DocType: Student Admission,Student Admission,Talabalarni qabul qilish
 ,Terretory,Teror
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,{0} mahsuloti bekor qilindi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Materiallar talabi
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,{0} mahsuloti bekor qilindi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Materiallar talabi
 DocType: Bank Reconciliation,Update Clearance Date,Bo&#39;shatish tarixini yangilash
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Xarid haqida ma&#39;lumot
@@ -440,9 +436,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Maks daraja
 DocType: Email Digest,New Quotations,Yangi takliflar
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Xodimga ish haqi elektron pochtasi xodimiga tanlangan e-pochtaga asoslanib yuboriladi
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Ro&#39;yxatdagi birinchi Approverni jo&#39;natsangiz, asl qiymati &quot;Approver qoldiring&quot; deb belgilanadi"
 DocType: Tax Rule,Shipping County,Yuk tashish hududi
-apps/erpnext/erpnext/config/desktop.py +167,Learn,O&#39;rganish
+apps/erpnext/erpnext/config/desktop.py +159,Learn,O&#39;rganish
 DocType: Asset,Next Depreciation Date,Keyingi Amortizatsiya sanasi
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Xodimga ko&#39;ra harajatlar
 DocType: Accounts Settings,Settings for Accounts,Hisob sozlamalari
@@ -452,7 +447,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Olinadigan chexlar va depozitlar
 DocType: Item,Synced With Hub,Hub bilan sinxronlangan
 DocType: Driver,Fleet Manager,Filo menejeri
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},{{0} qatori: {1} element {2} uchun salbiy bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},{{0} qatori: {1} element {2} uchun salbiy bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Noto&#39;g&#39;ri parol
 DocType: Item,Variant Of,Variant Of
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Tugallangan Miqdor &quot;Katta ishlab chiqarish&quot; dan katta bo&#39;lishi mumkin emas
@@ -473,7 +468,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},"Iltimos, Hotel Room Rate ni {} belgilang."
 DocType: Journal Entry,Multi Currency,Ko&#39;p valyuta
 DocType: Opening Invoice Creation Tool,Invoice Type,Faktura turi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Yetkazib berish eslatmasi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Yetkazib berish eslatmasi
 DocType: Consultation,Encounter Impression,Ta&#39;sir bilan taaluqli
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Soliqni o&#39;rnatish
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Sotilgan aktivlarning qiymati
@@ -500,11 +495,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Xodimning nomi (masalan, Bosh direktor, Direktor va boshqalar)."
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Xaridor valyutasi mijozning asosiy valyutasiga aylantirilgan tarif
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursni rejalashtirish vositasi
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Xarid-faktura mavjud mavjudotga qarshi {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Urgent]% s uchun takrorlanuvchi% s yaratishda xato
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Xarid-faktura mavjud mavjudotga qarshi {1}
 DocType: Land Unit,LInked Analysis,Inked Analiz
 DocType: Item Tax,Tax Rate,Soliq stavkasi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Ilova davri ikkita ajratma yozuvlari bo&#39;yicha bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Ilova davri ikkita ajratma yozuvlari bo&#39;yicha bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{2} dan {3} gacha bo&#39;lgan xodim uchun {1} uchun ajratilgan {0}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Xaridni taqdim etgan {0} allaqachon yuborilgan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},# {0} satrida: {1} {2}
@@ -518,7 +512,7 @@
 DocType: Purchase Order,% Received,Qabul qilingan
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Talabalar guruhini yaratish
 DocType: Volunteer,Weekends,Dam olish kunlari
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Kredit eslatma miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Kredit eslatma miqdori
 DocType: Setup Progress Action,Action Document,Hujjat
 DocType: Chapter Member,Website URL,Veb-sayt manzili
 ,Finished Goods,Tayyor mahsulotlar
@@ -532,6 +526,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNekst demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Ma&#39;lumotlar qo&#39;shish
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Mahsulot sifatini tekshirish parametrlari
+DocType: Leave Application,Leave Approver Name,Taxminiy nomi qoldiring
 DocType: Depreciation Schedule,Schedule Date,Jadval sanasi
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Daromadlar, ajratmalar va boshqa Ish haqi komponentlari"
 DocType: Packed Item,Packed Item,Paket qo&#39;yilgan
@@ -548,7 +543,7 @@
 DocType: Request for Quotation,Request for Quotation,Buyurtma uchun so&#39;rov
 DocType: Healthcare Settings,Require Lab Test Approval,Laboratoriya tekshiruvini tasdiqlashni talab qiling
 DocType: Salary Slip Timesheet,Working Hours,Ish vaqti
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Umumiy natija
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Umumiy natija
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mavjud ketma-ketlikning boshlang&#39;ich / to`g`ri qatorini o`zgartirish.
 DocType: Dosage Strength,Strength,Kuch-quvvat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Yangi xaridorni yarating
@@ -561,7 +556,7 @@
 DocType: Workstation,Consumable Cost,Sarflanadigan narx
 DocType: Purchase Receipt,Vehicle Date,Avtomobil tarixi
 DocType: Student Log,Medical,Tibbiy
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Yo&#39;qotish sababi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Yo&#39;qotish sababi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Hisob raqami yangilang
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Qo&#39;rg&#39;oshin egasi qo&#39;rg&#39;oshin bilan bir xil bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,Ajratilgan miqdordan tuzatilmaydigan miqdordan ortiq bo&#39;lmaydi
@@ -571,11 +566,10 @@
 DocType: Lab Test Template,Single,Yagona
 DocType: Salary Slip,Total Loan Repayment,Jami kreditni qaytarish
 DocType: Account,Cost of Goods Sold,Sotilgan mol-mulki
-DocType: Subscription,Yearly,Har yili
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Xarajat markazini kiriting
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Xarajat markazini kiriting
 DocType: Drug Prescription,Dosage,Dozaj
 DocType: Journal Entry Account,Sales Order,Savdo buyurtmasi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ort Sotish darajasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Ort Sotish darajasi
 DocType: Assessment Plan,Examiner Name,Ekspert nomi
 DocType: Lab Test Template,No Result,Natija yo&#39;q
 DocType: Purchase Invoice Item,Quantity and Rate,Miqdor va foiz
@@ -584,6 +578,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Avval kompaniya nomini kiriting
 DocType: Purchase Invoice,Supplier Name,Yetkazib beruvchi nomi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext qo&#39;llanmasini o&#39;qing
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Taqvimda barcha bo&#39;lim a&#39;zolarining barglarini ko&#39;rsatish
 DocType: Purchase Invoice,01-Sales Return,01-Sotuvdagi Qaytish
 DocType: Account,Is Group,Guruh
 DocType: Email Digest,Pending Purchase Orders,Buyurtma buyurtmalarini kutish
@@ -600,13 +595,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Majburiy maydon - Akademik yil
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} bilan bog&#39;lanmagan
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Ushbu e-pochtaning bir qismi sifatida kiritilgan kirish matnini moslashtiring. Har bir bitim alohida kirish matnga ega.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},"Iltimos, {0} kompaniyangiz uchun to&#39;langan pulli hisobni tanlang"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},"Iltimos, {0} kompaniyangiz uchun to&#39;langan pulli hisobni tanlang"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Jarayon to&#39;xtatilgan ish tartibiga qarshi ruxsat etilmagan {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Barcha ishlab chiqarish jarayonlari uchun global sozlamalar.
 DocType: Accounts Settings,Accounts Frozen Upto,Hisoblar muzlatilgan
 DocType: SMS Log,Sent On,Yuborildi
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Xususiyat {0} xususiyati bir nechta marta Attributes jadvalida tanlangan
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Xususiyat {0} xususiyati bir nechta marta Attributes jadvalida tanlangan
 DocType: HR Settings,Employee record is created using selected field. ,Ishchi yozuvi tanlangan maydon yordamida yaratiladi.
 DocType: Sales Order,Not Applicable,Taalluqli emas
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Dam olish ustasi.
@@ -629,8 +624,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Savdo uchun ajratilgan
 DocType: Packing Slip,From Package No.,To&#39;plam №
 DocType: Item Attribute,To Range,Oralig&#39;ida
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Qimmatli Qog&#39;ozlar va depozitlar
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Baholash usulini o&#39;zgartira olmaydi, chunki o&#39;z baholash uslubiga ega bo&#39;lmagan ayrim narsalarga nisbatan operatsiyalar mavjud"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Qimmatli Qog&#39;ozlar va depozitlar
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Baholash usulini o&#39;zgartira olmaydi, chunki o&#39;z baholash uslubiga ega bo&#39;lmagan ayrim narsalarga nisbatan operatsiyalar mavjud"
 DocType: Student Report Generation Tool,Attended by Parents,Ota-onalar ishtirok etdi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Berilgan barglarning barchasi majburiydir
 DocType: Patient,AB Positive,Evropa Ittifoqi ijobiy
@@ -639,7 +634,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Ishtirok etish yozuvi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Zamonaviy ish haqi bo&#39;yicha ish haqi komponenti.
 DocType: Sales Order Item,Used for Production Plan,Ishlab chiqarish rejasi uchun ishlatiladi
-DocType: Employee Loan,Total Payment,Jami to&#39;lov
+DocType: Loan,Total Payment,Jami to&#39;lov
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Tugallangan ish tartibi uchun jurnali bekor qilolmaydi.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Operatsiyalar o&#39;rtasida vaqt (daq.)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,"{0} {1} bekor qilinadi, shuning uchun amal bajarilmaydi"
@@ -655,15 +650,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Mijozlaringizning bir qismini ro&#39;yxatlang. Ular tashkilotlar yoki shaxslar bo&#39;lishi mumkin.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Qurilish uchun yetarli qismlar
 DocType: POS Profile User,POS Profile User,Qalin Foydalanuvchining profili
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,To&#39;g&#39;ridan-to&#39;g&#39;ri daromad
+DocType: Subscription Invoice,Subscription Invoice,Obuna Billing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,To&#39;g&#39;ridan-to&#39;g&#39;ri daromad
 DocType: Patient Appointment,Date TIme,Sana TIme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Hisob asosida guruhlangan bo&#39;lsa, hisob qaydnomasi asosida filtrlay olmaydi"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Ma&#39;muriy xodim
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Ma&#39;muriy xodim
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kompaniya va soliqlarni o&#39;rnatish
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Iltimos, kursni tanlang"
 DocType: Codification Table,Codification Table,Kodlashtirish jadvali
 DocType: Timesheet Detail,Hrs,Hr
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,"Iltimos, Kompaniya-ni tanlang"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,"Iltimos, Kompaniya-ni tanlang"
 DocType: Stock Entry Detail,Difference Account,Farq hisob
 DocType: Purchase Invoice,Supplier GSTIN,Yetkazib beruvchi GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Vazifani yopib bo&#39;lmaydi, chunki unga bog&#39;liq {0} vazifasi yopilmaydi."
@@ -688,6 +684,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Pul oqimi xaritalash shabloni
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Serial hech bir element qisman bo&#39;lolmaydi
 DocType: Journal Entry,Difference (Dr - Cr),Farq (shifokor - Cr)
+DocType: Bank Guarantee,Providing,Ta&#39;minlash
 DocType: Account,Profit and Loss,Qor va ziyon
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Hech qanday ruxsat berilmaydi, kerak bo&#39;lganda Lab viktorina jadvalini sozlang"
 DocType: Patient,Risk Factors,Xavf omillari
@@ -719,7 +716,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Yetkazib beruvchi hisob raqami №
 DocType: Territory,For reference,Malumot uchun
 DocType: Healthcare Settings,Appointment Confirmation,Uchrashuvni tasdiqlash
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Serial No {0} o&#39;chirib tashlanmaydi, chunki u birja bitimlarida qo&#39;llaniladi"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Serial No {0} o&#39;chirib tashlanmaydi, chunki u birja bitimlarida qo&#39;llaniladi"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Yakunlovchi (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Salom
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Ob&#39;ektni siljiting
@@ -744,11 +741,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",{0} uchun {0} profilidagi profilni sukut saqlab qo&#39;ygansiz
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Moliyaviy / hisobot yili.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Biriktirilgan qiymatlar
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Kechirasiz, Serial Nos birlashtirilmaydi"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Kechirasiz, Serial Nos birlashtirilmaydi"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Territory qalin rejimida talab qilinadi
 DocType: Supplier,Prevent RFQs,RFQlarni oldini olish
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Savdo buyurtmasini bajaring
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Ish staji {0} dan {1} gacha bo&#39;lgan muddatga taqdim etildi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Ish staji {0} dan {1} gacha bo&#39;lgan muddatga taqdim etildi
 DocType: Project Task,Project Task,Loyiha vazifasi
 ,Lead Id,Qurilish no
 DocType: C-Form Invoice Detail,Grand Total,Jami
@@ -769,8 +766,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Yuk tashish kuni
 DocType: Production Plan,Production Plan,Ishlab chiqarish rejasi
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Billingni ochish vositasini ochish
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Sotishdan qaytish
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Sotishdan qaytish
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Eslatma: Ajratilgan jami {0} barglari davr uchun tasdiqlangan {1} barglaridan kam bo&#39;lmasligi kerak
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Serial No Input ga asoslangan operatsiyalarda Miqdorni belgilash
 ,Total Stock Summary,Jami Qisqacha Xulosa
 DocType: Announcement,Posted By,Muallif tomonidan
 DocType: Item,Delivered by Supplier (Drop Ship),Yetkazib beruvchi tomonidan yetkazib beriladigan (Drop Ship)
@@ -781,15 +779,15 @@
 DocType: Quotation,Quotation To,Qabul qilish
 DocType: Lead,Middle Income,O&#39;rta daromad
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Ochilish (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"{0} elementi uchun standart o&#39;lchov birligi bevosita o&#39;zgartirilmaydi, chunki siz boshqa UOM bilan ba&#39;zi bitimlar (tranzaktsiyalar) qildingiz. Boshqa bir standart UOM dan foydalanish uchun yangi element yaratishingiz lozim."
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"{0} elementi uchun standart o&#39;lchov birligi bevosita o&#39;zgartirilmaydi, chunki siz boshqa UOM bilan ba&#39;zi bitimlar (tranzaktsiyalar) qildingiz. Boshqa bir standart UOM dan foydalanish uchun yangi element yaratishingiz lozim."
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Ajratilgan mablag&#39; salbiy bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,"Iltimos, kompaniyani tanlang"
 DocType: Share Balance,Share Balance,Hissa balansi
 DocType: Purchase Order Item,Billed Amt,Billing qilingan Amt
 DocType: Training Result Employee,Training Result Employee,Ta&#39;lim natijalari Xodim
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Qimmatbaho qog&#39;ozlar kiritilgan mantiqiy ombor.
-DocType: Repayment Schedule,Principal Amount,Asosiy miqdori
-DocType: Employee Loan Application,Total Payable Interest,To&#39;lanadigan foiz
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Asosiy miqdori
+DocType: Loan Application,Total Payable Interest,To&#39;lanadigan foiz
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Umumiy natija: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sotuvdagi taqdim etgan vaqt jadvalini
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Yo&#39;naltiruvchi Yo&#39;naltiruvchi va Yo&#39;naltiruvchi {0}
@@ -798,10 +796,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Barglarni, xarajat da&#39;vatlarini va ish haqini boshqarish uchun xodimlar yozuvlarini yarating"
 DocType: Restaurant Reservation,Restaurant Reservation,Restoran rezervasyoni
 DocType: Land Unit,Land Unit Name,Er uchastkasining nomi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Takliflarni Yozish
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Takliflarni Yozish
 DocType: Payment Entry Deduction,Payment Entry Deduction,To&#39;lovni to&#39;lashni kamaytirish
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Tiklash
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,E-pochta orqali mijozlarni xabardor qilish
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,E-pochta orqali mijozlarni xabardor qilish
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Boshqa bir Sotuvdagi Shaxs {0} bir xil xodim identifikatori mavjud
 DocType: Employee Advance,Claimed Amount,Da&#39;vo qilingan miqdori
 apps/erpnext/erpnext/config/education.py +180,Masters,Masters
@@ -819,13 +817,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","To&#39;lov shlyuzi hisobini yaratib bo&#39;lmadi, iltimos, bir qo&#39;lda yarating."
 DocType: Supplier Scorecard,Per Year,Bir yilda
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Ushbu dasturda DOBga mos kelmasligi mumkin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
 DocType: Sales Invoice,Sales Taxes and Charges,Sotishdan olinadigan soliqlar va yig&#39;imlar
 DocType: Employee,Organization Profile,Tashkilot profili
 DocType: Vital Signs,Height (In Meter),Balandligi (metrda)
 DocType: Student,Sibling Details,Birodarimiz batafsil
 DocType: Vehicle Service,Vehicle Service,Avtomobil xizmati
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Qoidalarga asoslangan qayta tiklanish so&#39;rovini avtomatik ravishda ishga tushiradi.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Qoidalarga asoslangan qayta tiklanish so&#39;rovini avtomatik ravishda ishga tushiradi.
 DocType: Employee,Reason for Resignation,Istefoning sababi
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Ishlashni baholash uchun shablon.
 DocType: Sales Invoice,Credit Note Issued,Kredit notasi chiqarildi
@@ -840,10 +837,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Xizmat jadvali
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Keyin narxlash qoidalari xaridorlar, xaridorlar guruhi, hududi, yetkazib beruvchisi, yetkazib beruvchi turi, aksiya, savdo bo&#39;yicha hamkor va boshqalar asosida filtrlanadi."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Inventarizatsiyada aniq o&#39;zgarishlar
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Xodimlarning qarzlarini boshqarish
 DocType: Employee,Passport Number,Pasport raqami
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 bilan aloqalar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menejer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Menejer
 DocType: Payment Entry,Payment From / To,To&#39;lov / To
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yangi kredit limiti mijoz uchun mavjud summasidan kamroq. Kredit cheklovi atigi {0} bo&#39;lishi kerak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Iltimos, hisob qaydnomasini {0}"
@@ -885,23 +881,23 @@
 DocType: Item,Material Transfer,Materiallarni uzatish
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Yo&#39;l topilmadi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Ochilish (doktor)
+DocType: Loan,Applicant,Ariza beruvchi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Vaqt tamg&#39;asini yuborish {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Takroriy hujjatlar yaratish
 ,GST Itemised Purchase Register,GST mahsulotini sotib olish registratsiyasi
 DocType: Course Scheduling Tool,Reschedule,Qaytadan rejalashtirish
-DocType: Employee Loan,Total Interest Payable,To&#39;lanadigan foizlar
+DocType: Loan,Total Interest Payable,To&#39;lanadigan foizlar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Foydali soliqlar va yig&#39;imlar
 DocType: Work Order Operation,Actual Start Time,Haqiqiy boshlash vaqti
 DocType: BOM Operation,Operation Time,Foydalanish muddati
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Tugatish
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Asosiy
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Asosiy
 DocType: Timesheet,Total Billed Hours,Jami hisoblangan soat
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Miqdorni yozing
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Miqdorni yozing
 DocType: Leave Block List Allow,Allow User,Foydalanuvchiga ruxsat berish
 DocType: Journal Entry,Bill No,Bill №
 DocType: Company,Gain/Loss Account on Asset Disposal,Aktivni yo&#39;qotish bo&#39;yicha daromad / yo&#39;qotish hisobi
 DocType: Vehicle Log,Service Details,Xizmat haqida ma&#39;lumot
-DocType: Subscription,Quarterly,Har chorakda
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Guruhlangan
 DocType: Selling Settings,Delivery Note Required,Yetkazib berish eslatmasi kerak
@@ -912,7 +908,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Vaqt varaqasi
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Chuqur xomashyo asosida ishlab chiqarilgan
 DocType: Sales Invoice,Port Code,Port kodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Zaxira ombori
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Zaxira ombori
 DocType: Lead,Lead is an Organization,Qo&#39;rg&#39;oshin tashkilot
 DocType: Guardian Interest,Interest,Foiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Old savdo
@@ -924,12 +920,12 @@
 DocType: Account,Accounts,Hisoblar
 DocType: Vehicle,Odometer Value (Last),Odometer qiymati (oxirgi)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Yetkazib beruvchilar koeffitsienti mezonlari namunalari.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,To&#39;lov kirish allaqachon yaratilgan
 DocType: Request for Quotation,Get Suppliers,Yetkazuvchilarni qabul qiling
 DocType: Purchase Receipt Item Supplied,Current Stock,Joriy aktsiyalar
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},{0} qator: Asset {1} {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Preview ish haqi slip
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},{0} qator: Asset {1} {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Preview ish haqi slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,{0} hisobi bir necha marta kiritilgan
 DocType: Account,Expenses Included In Valuation,Baholashda ishtirok etish xarajatlari
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Sizning a&#39;zoning 30 kun ichida amal qilish muddati tugaguncha yangilanishi mumkin
@@ -939,7 +935,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Faqat sizda naqd pul oqimining Mapper hujjatlari mavjudligini tanlang
 DocType: Email Digest,Next email will be sent on:,Keyingi elektron pochta orqali yuboriladi:
 DocType: Supplier Scorecard,Per Week,Haftasiga
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Mavzu variantlarga ega.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Mavzu variantlarga ega.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Jami talabalar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} elementi topilmadi
 DocType: Bin,Stock Value,Qimmatli qog&#39;ozlar qiymati
@@ -960,9 +956,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Kompartiyalari [FEC]
 DocType: Journal Entry,Credit Card Entry,Kredit kartalarini rasmiylashtirish
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Kompaniya va Hisoblar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,Qiymatida
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,Qiymatida
 DocType: Asset Settings,Depreciation Options,Amortizatsiya imkoniyatlari
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Noto&#39;g&#39;ri joylashtirish vaqti
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Noto&#39;g&#39;ri joylashtirish vaqti
 DocType: Lead,Campaign Name,Kampaniya nomi
 DocType: Hotel Room,Capacity,Imkoniyatlar
 DocType: Selling Settings,Close Opportunity After Days,Kunlardan keyin imkoniyatni yoqing
@@ -987,7 +983,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Xaridorning Buyurtma no
 DocType: Budget,Budget Against,Byudjetga qarshi
 DocType: Employee,Cell Number,Hujayra raqami
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ushbu mezon bo&#39;yicha xodimlar yo&#39;q. Ish haqi tovarlarining hali yaratilmaganligini tekshiring.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ushbu mezon bo&#39;yicha xodimlar yo&#39;q. Ish haqi tovarlarining hali yaratilmaganligini tekshiring.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Avtomatik material talablari yaratildi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Yo&#39;qotilgan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,&quot;Jurnalga qarshi&quot; ustunidan hozirgi kvotani kirita olmaysiz
@@ -999,15 +995,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Iltimos, jadval tanlang"
 DocType: BOM,Website Specifications,Veb-saytning texnik xususiyatlari
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - &quot;Qabul qiluvchilar&quot; bo&#39;limida noto&#39;g&#39;ri e-pochta manzili
 DocType: Special Test Items,Particulars,Xususan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} dan {0} dan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: {1} dan {0} dan
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertatsiya qilish omillari majburiydir
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Ko&#39;p narx qoidalari bir xil mezonlarga ega, iltimos, birinchi o&#39;ringa tayinlash orqali mojaroni hal qiling. Narxlar qoidalari: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOMni boshqa BOMlar bilan bog&#39;langanidek o&#39;chirib qo&#39;yish yoki bekor qilish mumkin emas
 DocType: Asset,Maintenance,Xizmat
+DocType: Subscriber,Subscriber,Abonent
 DocType: Item Attribute Value,Item Attribute Value,Mavzu xususiyati qiymati
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,"Iltimos, loyihangizning holatini yangilang"
 DocType: Item,Maximum sample quantity that can be retained,Tutilishi mumkin bo&#39;lgan maksimal namuna miqdori
@@ -1044,26 +1040,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Savatga savatni uchun standart sozlamalar
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Timeslots-ni qo&#39;shish
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Aktivlar jurnal jurnali orqali {0}
-DocType: Employee Loan,Interest Income Account,Foiz daromadi hisob
+DocType: Loan,Interest Income Account,Foiz daromadi hisob
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Taklifni ko&#39;rib chiqish yuborildi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotexnologiya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Xizmat uchun xizmat xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Xizmat uchun xizmat xarajatlari
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Boring
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-pochta qayd yozuvini sozlash
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,"Iltimos, avval Elementni kiriting"
 DocType: Asset Repair,Downtime,Chaqiruv
 DocType: Account,Liability,Javobgarlik
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsiyalangan pul miqdori {0} qatorida da&#39;vo miqdori qiymatidan katta bo&#39;lmasligi kerak.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsiyalangan pul miqdori {0} qatorida da&#39;vo miqdori qiymatidan katta bo&#39;lmasligi kerak.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Akademik atamalar:
 DocType: Salary Detail,Do not include in total,Hammaga qo&#39;shmang
 DocType: Company,Default Cost of Goods Sold Account,Sotilgan hisoblangan tovarlarning qiymati
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},{0} o&#39;rnak miqdori qabul qilingan miqdordan ortiq bo&#39;lishi mumkin emas {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Narxlar ro&#39;yxati tanlanmagan
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Narxlar ro&#39;yxati tanlanmagan
 DocType: Employee,Family Background,Oila fondi
 DocType: Request for Quotation Supplier,Send Email,Elektron pochta yuborish
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Ogohlantirish: yaroqsiz {0}
 DocType: Item,Max Sample Quantity,Maksimal namunalar miqdori
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Izoh yo&#39;q
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Izoh yo&#39;q
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,So&#39;ralgan
 DocType: Vital Signs,Heart Rate / Pulse,Yurak urishi / zarba
 DocType: Company,Default Bank Account,Standart bank hisobi
@@ -1074,11 +1070,10 @@
 DocType: Item,Items with higher weightage will be shown higher,Yuqori vaznli narsalar yuqoriroq bo&#39;ladi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Laboratoriya testlari va hayotiy belgilar
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank kelishuvi batafsil
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,# {0} satri: Asset {1} yuborilishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,# {0} satri: Asset {1} yuborilishi kerak
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Hech qanday xodim topilmadi
-DocType: Subscription,Stopped,To&#39;xtadi
 DocType: Item,If subcontracted to a vendor,Agar sotuvchiga subpudrat berilsa
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Talabalar guruhi allaqachon yangilangan.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Talabalar guruhi allaqachon yangilangan.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Loyiha yangilanishi.
 DocType: SMS Center,All Customer Contact,Barcha xaridorlar bilan bog&#39;laning
 DocType: Land Unit,Tree Details,Daraxt detallari
@@ -1128,7 +1123,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importni davom ettirish
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Barcha elementlar guruhlari
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Transaktsiyalarni topshirish haqida xabarni avtomatik tuzish.
 DocType: Work Order,Item To Manufacture,Mahsulot ishlab chiqarish
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} holat {2}
@@ -1142,7 +1136,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Tanlangan manzil saqlashdan so&#39;ng tahrirlangan taqdirda, qayta belgilanadi"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Mavzu Variant {0} allaqachon bir xil atributlarga ega
 DocType: Item,Hub Publishing Details,Hub nashriyot tafsilotlari
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',&quot;Ochilish&quot;
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',&quot;Ochilish&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do To Do
 DocType: Notification Control,Delivery Note Message,Yetkazib berish eslatmasi
 DocType: Lab Test Template,Result Format,Natijada formati
@@ -1152,7 +1146,7 @@
 DocType: Payroll Entry,Bimonthly,Ikki oyda
 DocType: Vehicle Service,Brake Pad,Tormoz paneli
 DocType: Fertilizer,Fertilizer Contents,Go&#39;ng tarkibi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Tadqiqot va Loyihalash
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Tadqiqot va Loyihalash
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Bill miqdori
 DocType: Company,Registration Details,Ro&#39;yxatga olish ma&#39;lumotlari
 DocType: Timesheet,Total Billed Amount,To&#39;lov miqdori
@@ -1166,7 +1160,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Sotish tartibi bo&#39;yicha kredit cheklovlarini tekshirib o&#39;tish
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Ishlashni baholash.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",Xarid qilish vositasi yoqilganligi uchun &quot;Savatga savatni ishlatish&quot; funksiyasini yoqish va savat uchun kamida bitta Soliq qoidasi bo&#39;lishi kerak
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","To&#39;lov usuli {0} Buyurtmani {1} buyrug&#39;iga binoan bog&#39;langan, ushbu hisob-fakturada avans sifatida ko&#39;rib chiqilishi kerakligini tekshiring."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","To&#39;lov usuli {0} Buyurtmani {1} buyrug&#39;iga binoan bog&#39;langan, ushbu hisob-fakturada avans sifatida ko&#39;rib chiqilishi kerakligini tekshiring."
 DocType: Sales Invoice Item,Stock Details,Aksiya haqida ma&#39;lumot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Loyiha qiymati
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Sotuv nuqtasi
@@ -1200,7 +1194,7 @@
 DocType: Restaurant Table,Minimum Seating,Minimal yashash joyi
 DocType: Item Attribute,Item Attribute Values,Xususiyatning qiymatlari
 DocType: Examination Result,Examination Result,Test natijalari
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Xarid qilish arizasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Xarid qilish arizasi
 ,Received Items To Be Billed,Qabul qilinadigan buyumlar
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Ayirboshlash kursi ustasi.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Malumot Doctype {0} dan biri bo&#39;lishi kerak
@@ -1208,15 +1202,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Operatsion {1} uchun keyingi {0} kunda Time Slotni topib bo&#39;lmadi
 DocType: Work Order,Plan material for sub-assemblies,Sub-assemblies uchun rejalashtirilgan material
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Savdo hamkorlari va hududi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} faol bo&#39;lishi kerak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,O&#39;tkazish uchun hech narsa mavjud emas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} faol bo&#39;lishi kerak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,O&#39;tkazish uchun hech narsa mavjud emas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Yakunlovchi (ochilish + jami)
 DocType: Journal Entry,Depreciation Entry,Amortizatsiyani kiritish
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,"Iltimos, avval hujjat turini tanlang"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialni bekor qilish Bu Xizmat tashrifini bekor qilishdan avval {0} tashrif
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standarti
 DocType: Pricing Rule,Rate or Discount,Tezlik yoki chegirma
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No {0} seriyasi {1} mahsulotiga tegishli emas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},No {0} seriyasi {1} mahsulotiga tegishli emas
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerakli son
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Sevimlilar
 DocType: Hub Settings,Custom Data,Maxsus ma&#39;lumotlar
@@ -1228,9 +1222,9 @@
 DocType: Medical Code,Medical Code Standard,Tibbiyot kodeksi
 DocType: Soil Texture,Clay Composition (%),Gil tarkibi (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,"Iltimos, vazifani tayinlashdan oldin saqlab qo&#39;ying."
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Balans qiymati
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Balans qiymati
 DocType: Lab Test,Lab Technician,Laboratoriya bo&#39;yicha mutaxassis
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sotuvlar narxlari ro&#39;yxati
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Sotuvlar narxlari ro&#39;yxati
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Agar belgilansa, mijoz yaratiladi, bemorga ko&#39;rsatiladi. Ushbu xaridorga qarshi bemor to&#39;lovlari yaratiladi. Siz shuningdek, mavjud bemorni yaratishda mavjud mijozni tanlashingiz mumkin."
 DocType: Bank Reconciliation,Account Currency,Hisob valyutasi
@@ -1238,16 +1232,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,"Iltimos, kompaniyadagi Yagona hisob qaydnomasidan foydalaning"
 DocType: Purchase Receipt,Range,Oralig&#39;i
 DocType: Supplier,Default Payable Accounts,To&#39;lanadigan qarz hisoblari
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xodim {0} faol emas yoki mavjud emas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Xodim {0} faol emas yoki mavjud emas
 DocType: Fee Structure,Components,Komponentlar
 DocType: Item Barcode,Item Barcode,Mahsulot shtrix kodi
 DocType: Woocommerce Settings,Endpoints,Oxirgi fikrlar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},"Iltimos, {0} dagi Asset kategoriyasi kiriting"
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Mavzu Variantlari {0} yangilandi
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Mavzu Variantlari {0} yangilandi
 DocType: Quality Inspection Reading,Reading 6,O&#39;qish 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","ishlab chiqariladi. Kechiktirilsa, siz &quot;Oyning kuni bilan takrorlang&quot; maydonini qo&#39;lda o&#39;zgartiring"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} hech qanday salbiy taqdim etgan holda taqdim etilmaydi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} hech qanday salbiy taqdim etgan holda taqdim etilmaydi
 DocType: Share Transfer,From Folio No,Folyodan No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Xarid-faktura avansini sotib oling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: kredit yozuvini {1} bilan bog&#39;lash mumkin emas
@@ -1282,16 +1274,17 @@
 DocType: Asset,Available-for-use Date,Foydalanish uchun yaroqli kun
 DocType: Guardian,Guardian Name,Guardian nomi
 DocType: Cheque Print Template,Has Print Format,Bosib chiqarish formati mavjud
-DocType: Employee Loan,Sanctioned,Sanktsiya
+DocType: Loan,Sanctioned,Sanktsiya
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,"majburiydir. Ehtimol, valyuta ayirboshlash yozuvi yaratilmagan bo&#39;lishi mumkin"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Iltimos, mahsulot uchun {1}"
 DocType: Crop Cycle,Crop Cycle,O&#39;simlik aylanishi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&quot;Paket ro&#39;yxati&quot; jadvalidan &#39;Mahsulot paketi&#39; elementlari, QXI, seriya raqami va lotin raqami ko&#39;rib chiqilmaydi. Qimmatli qog&#39;ozlar va partiyalar raqami &quot;mahsulot paketi&quot; elementi uchun barcha qadoqlash buyumlari uchun bir xil bo&#39;lsa, ushbu qiymatlar asosiy element jadvaliga kiritilishi mumkin, qadriyatlar &#39;Paket ro&#39;yxati&#39; jadvaliga ko&#39;chiriladi."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&quot;Paket ro&#39;yxati&quot; jadvalidan &#39;Mahsulot paketi&#39; elementlari, QXI, seriya raqami va lotin raqami ko&#39;rib chiqilmaydi. Qimmatli qog&#39;ozlar va partiyalar raqami &quot;mahsulot paketi&quot; elementi uchun barcha qadoqlash buyumlari uchun bir xil bo&#39;lsa, ushbu qiymatlar asosiy element jadvaliga kiritilishi mumkin, qadriyatlar &#39;Paket ro&#39;yxati&#39; jadvaliga ko&#39;chiriladi."
 DocType: Student Admission,Publish on website,Saytda e&#39;lon qiling
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Yetkazib beruvchi hisob-fakturasi sanasi yuborish kunidan kattaroq bo&#39;lishi mumkin emas
+DocType: Subscription,Cancelation Date,Bekor qilish sanasi
 DocType: Purchase Invoice Item,Purchase Order Item,Buyurtma Buyurtma Buyurtma
 DocType: Agriculture Task,Agriculture Task,Qishloq xo&#39;jaligi masalalari
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Bilvosita daromad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Bilvosita daromad
 DocType: Student Attendance Tool,Student Attendance Tool,Isoning shogirdi qatnashish vositasi
 DocType: Restaurant Menu,Price List (Auto created),Narxlar ro&#39;yxati (Avtomatik yaratilgan)
 DocType: Cheque Print Template,Date Settings,Sana Sozlamalari
@@ -1317,6 +1310,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metr
 DocType: Workstation,Electricity Cost,Elektr narx
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Laboratoriya tekshiruvi datetime yig&#39;ishdan oldin datetime vaqtini topa olmaydi
+DocType: Subscription Plan,Cost,Xarajatlar
 DocType: HR Settings,Don't send Employee Birthday Reminders,Xodimlarga Tug&#39;ilgan kun eslatmalarini yubormang
 DocType: Expense Claim,Total Advance Amount,Umumiy avans miqdori
 DocType: Delivery Stop,Estimated Arrival,Bashoratli vorisi
@@ -1328,14 +1322,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Sizning xat boshingizni va logotipingizni yuklang. (keyinchalik ularni tahrirlashingiz mumkin).
 DocType: Timesheet Detail,Bill,Bill
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Keyingi Amortizatsiya tarixi o&#39;tgan sana sifatida kiritiladi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Oq rang
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Oq rang
 DocType: SMS Center,All Lead (Open),Barcha qo&#39;rg&#39;oshin (ochiq)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: ({2} {3}) kirish vaqtida {1} omborida {4} uchun mavjud emas
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Tekshirish qutilarining faqat bitta variantini tanlashingiz mumkin.
 DocType: Purchase Invoice,Get Advances Paid,Avanslarni to&#39;lang
 DocType: Item,Automatically Create New Batch,Avtomatik ravishda yangi guruh yaratish
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),{0} - {1} ga (qator {2}) tayinlash
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Qilish
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),{0} - {1} ga (qator {2}) tayinlash
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Qilish
 DocType: Student Admission,Admission Start Date,Qabul boshlash sanasi
 DocType: Journal Entry,Total Amount in Words,So&#39;zlarning umumiy miqdori
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Yangi xodim
@@ -1351,7 +1345,7 @@
 DocType: Holiday List,Holiday List Name,Dam olish ro&#39;yxati nomi
 DocType: Repayment Schedule,Balance Loan Amount,Kreditning qoldig&#39;i
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Jadval kursi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Aksiyadorlik imkoniyatlari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Aksiyadorlik imkoniyatlari
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Xarid qilish tartibidagi so&#39;nggi sotib olish ma&#39;lumotlarini o&#39;chirib qo&#39;yish
 DocType: Journal Entry Account,Expense Claim,Xarajat shikoyati
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,"Chindan ham, bu eskirgan obyektni qayta tiklashni xohlaysizmi?"
@@ -1370,11 +1364,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Paket sariq qismi
 DocType: Purchase Invoice,Cash/Bank Account,Naqd / Bank hisobi
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},"Iltimos, {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Sifat yoki qiymat o&#39;zgarmasdan chiqarilgan elementlar.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Sifat yoki qiymat o&#39;zgarmasdan chiqarilgan elementlar.
 DocType: Delivery Note,Delivery To,Etkazib berish
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Variantni yaratish navbatga qo&#39;yildi.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0} uchun ish xulosasi
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Xususiyat jadvali majburiydir
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,"Ro&#39;yxatdagi birinchi Approverni jo&#39;natsangiz, asl qiymati &quot;Approver qoldiring&quot; deb belgilanadi."
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Xususiyat jadvali majburiydir
 DocType: Production Plan,Get Sales Orders,Savdo buyurtmalarini oling
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} salbiy bo&#39;lishi mumkin emas
 DocType: Training Event,Self-Study,O&#39;z-o&#39;zini tadqiq qilish
@@ -1386,7 +1381,7 @@
 DocType: Workstation,Wages,Ish haqi
 DocType: Asset Maintenance,Maintenance Manager Name,Xizmat menejeri nomi
 DocType: Agriculture Task,Urgent,Shoshilinch
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Iltimos {1} jadvalidagi {0} qatoriga tegishli joriy qatorni identifikatorini ko&#39;rsating
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Iltimos {1} jadvalidagi {0} qatoriga tegishli joriy qatorni identifikatorini ko&#39;rsating
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Argumentlar topilmadi:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,"Iltimos, numpad dan tahrir qilish uchun maydonni tanlang"
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,"Qimmatli qog&#39;ozlar bazasi yaratilganligi sababli, asosiy vosita bo&#39;lishi mumkin emas."
@@ -1398,7 +1393,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Sifat nazorati shablonini nomi
 DocType: Project,First Email,Birinchi e-pochta
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Savdo Buyurtma va tugagan tovarlar omborida zaxiralangan ombor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Sotish miqdori
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Sotish miqdori
 DocType: Repayment Schedule,Interest Amount,Foiz miqdori
 DocType: Serial No,Creation Document No,Yaratilish hujjati №
 DocType: Share Transfer,Issue,Nashr
@@ -1412,10 +1407,10 @@
 DocType: Tax Rule,Shipping State,Yuk tashish holati
 ,Projected Quantity as Source,Bashoratli miqdori manba sifatida
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Buyumni &quot;Xarid qilish arizalaridan olish&quot; tugmachasi yordamida qo&#39;shib qo&#39;yish kerak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Etkazib berish
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Etkazib berish
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Transfer turi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Savdo xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Savdo xarajatlari
 DocType: Consultation,Diagnosis,Tashxis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart xarid
 DocType: GL Entry,Against,Qarshi
@@ -1424,12 +1419,13 @@
 DocType: Sales Partner,Implementation Partner,Dasturni amalga oshirish bo&#39;yicha hamkor
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Pochta indeksi
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Savdo Buyurtma {0} - {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},{0} da kredit foizli daromad hisobini tanlang
 DocType: Opportunity,Contact Info,Aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Aktsiyalarni kiritish
 DocType: Packing Slip,Net Weight UOM,Og&#39;irligi UOM
 DocType: Item,Default Supplier,Standart ta&#39;minotchi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ishlab chiqarishdan olinadigan foyda ulushi foizi
-DocType: Employee Loan,Repayment Schedule,To&#39;lov rejasi
+DocType: Loan,Repayment Schedule,To&#39;lov rejasi
 DocType: Shipping Rule Condition,Shipping Rule Condition,Yuk tashish qoidalari holati
 DocType: Holiday List,Get Weekly Off Dates,Haftalik yopiq sanalar oling
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tugash sanasi Boshlanish sanasidan past bo&#39;lishi mumkin emas
@@ -1443,7 +1439,7 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,O&#39;rtacha yoshi
 DocType: Education Settings,Attendance Freeze Date,Ishtirok etishni to&#39;xtatish sanasi
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Ta&#39;minlovchilaringizning bir qismini ro&#39;yxatlang. Ular tashkilotlar yoki shaxslar bo&#39;lishi mumkin.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Barcha mahsulotlari ko&#39;rish
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Barcha mahsulotlari ko&#39;rish
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Minimal qo&#39;rg&#39;oshin yoshi (kunlar)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Barcha BOMlar
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0} turidagi mehmonxona xonalarida {1}
@@ -1451,14 +1447,16 @@
 DocType: Expense Claim,From Employee,Ishchidan
 DocType: Driver,Cellphone Number,Mobil telefon raqami
 DocType: Project,Monitor Progress,Monitoring jarayoni
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Ogohlantirish: tizim {1} da {0} uchun pul miqdori nol bo&#39;lgani uchun tizim ortiqcha miqdorda tekshirilmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Ogohlantirish: tizim {1} da {0} uchun pul miqdori nol bo&#39;lgani uchun tizim ortiqcha miqdorda tekshirilmaydi
 DocType: Journal Entry,Make Difference Entry,Farqlarni kiritish
+DocType: Supplier Quotation,Auto Repeat Section,Avtomatik qayta-qism
 DocType: Upload Attendance,Attendance From Date,Sana boshlab ishtirok etish
 DocType: Appraisal Template Goal,Key Performance Area,Asosiy ishlash maydoni
 DocType: Program Enrollment,Transportation,Tashish
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Noto&#39;g&#39;ri attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} yuborilishi kerak
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Miqdori {0} dan kam yoki unga teng bo&#39;lishi kerak
+DocType: Department Approver,Department Approver,Bo&#39;limni tasdiqlash
 DocType: SMS Center,Total Characters,Jami belgilar
 DocType: Employee Advance,Claimed,Da&#39;vo qilingan
 DocType: Crop,Row Spacing,Qator oralig&#39;i
@@ -1468,6 +1466,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,To&#39;lovni tasdiqlash uchun schyot-faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Qatnashish%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Buyurtma buyurtma qilish sharti bilan sotib olish buyurtmasi bo&#39;yicha == &#39;YES&#39; bo&#39;lsa, u holda Xarid-fakturani yaratishda foydalanuvchi avval {0}"
+,HSN-wise-summary of outward supplies,HSN-donasi - tashqi manbalar sarlavhalari
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Malumot uchun kompaniya raqamlarini ro&#39;yxatdan o&#39;tkazish. Soliq raqamlari va h.k.
 DocType: Sales Partner,Distributor,Distribyutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Xarid qilish savatni Yuk tashish qoidalari
@@ -1481,7 +1480,7 @@
 DocType: Setup Progress Action,Action Name,Ro&#39;yxatdan o&#39;tish nomi
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Boshlanish yili
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTINning birinchi 2 ta raqami {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Joriy hisob-kitob davri boshlanish sanasi
 DocType: Salary Slip,Leave Without Pay,To&#39;lovsiz qoldiring
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Imkoniyatlarni rejalashtirish xatosi
@@ -1499,26 +1498,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Maydonlar faqat yaratilish vaqtida nusxalanadi.
 DocType: Setup Progress Action,Domains,Domenlar
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Haqiqiy boshlanish sanasi&quot; &quot;haqiqiy tugatish sanasi&quot; dan katta bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Boshqarish
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Boshqarish
 DocType: Cheque Print Template,Payer Settings,To&#39;lovchining sozlamalari
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bunga Variantning Mahsulot kodiga qo&#39;shiladi. Misol uchun, qisqartma &quot;SM&quot; bo&#39;lsa va element kodi &quot;T-SHIRT&quot; bo&#39;lsa, variantning element kodi &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Ish haqi miqdorini saqlaganingizdan so&#39;ng, aniq to&#39;lov (so&#39;zlar bilan) ko&#39;rinadi."
 DocType: Purchase Invoice,Is Return,Qaytish
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,E&#39;tibor bering
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Boshlanish kuni &quot;{0}&quot; vazifasida so&#39;nggi kundan katta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Qaytaring / Debet Eslatma
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Qaytaring / Debet Eslatma
 DocType: Price List Country,Price List Country,Narxlar ro&#39;yxati
 DocType: Item,UOMs,UOMlar
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{1} uchun {0} joriy ketma-ket nos
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mahsulot kodini ketma-ket kod uchun o&#39;zgartirish mumkin emas.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Mahsulot kodini ketma-ket kod uchun o&#39;zgartirish mumkin emas.
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ishlab chiqarish omili
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Partiya raqami olish uchun mahsulot kodini kiriting
 DocType: Stock Settings,Default Item Group,Standart element guruhi
-DocType: Employee Loan,Partially Disbursed,Qisman to&#39;langan
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Grant haqida ma&#39;lumot.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Grant haqida ma&#39;lumot.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Yetkazib beruvchi ma&#39;lumotlar bazasi.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Bekor qilinmagan obunani qayta boshlash mumkin emas.
 DocType: Account,Balance Sheet,Balanslar varaqasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Xarajat markazi Mahsulot kodi bo&#39;lgan mahsulot uchun &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Xarajat markazi Mahsulot kodi bo&#39;lgan mahsulot uchun &#39;
 DocType: Fee Validity,Valid Till,Tilligacha amal qiling
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Ota-onalar o&#39;qituvchilari yig&#39;ilishi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",To&#39;lov tartibi sozlanmagan. Hisobni to&#39;lov usulida yoki Qalin profilda o&#39;rnatganligini tekshiring.
@@ -1531,7 +1530,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,# {0} qatori: Rad etilgan Qty Xarid qilishni qaytarib bo&#39;lmaydi
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Tanlangan mijoz uchun xaridorlar guruhini o&#39;zgartirishga ruxsat berilmaydi.
 ,Purchase Order Items To Be Billed,Buyurtma buyurtmalarini sotib olish uchun to&#39;lovlar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Bashoratli borar vaqtlarini yangilash.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Bashoratli borar vaqtlarini yangilash.
 DocType: Program Enrollment Tool,Enrollment Details,Ro&#39;yxatga olish ma&#39;lumotlari
 DocType: Purchase Invoice Item,Net Rate,Sof kurs
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,"Iltimos, mijozni tanlang"
@@ -1550,18 +1549,20 @@
 DocType: Global Defaults,Current Fiscal Year,Joriy moliya yili
 DocType: Purchase Order,Group same items,Guruhlarga bir xil narsalar
 DocType: Purchase Invoice,Disable Rounded Total,Rounded Totalni o&#39;chirib qo&#39;yish
-DocType: Employee Loan Application,Repayment Info,To&#39;lov ma&#39;lumoti
+DocType: Department,Parent Department,Ota-ona bo&#39;limi
+DocType: Loan Application,Repayment Info,To&#39;lov ma&#39;lumoti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,&quot;Yozuvlar&quot; bo&#39;sh bo&#39;lishi mumkin emas
 DocType: Maintenance Team Member,Maintenance Role,Xizmat roli
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Shu {1} bilan {0} qatorini nusxalash
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Shu {1} bilan {0} qatorini nusxalash
 ,Trial Balance,Sinov balansi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Moliyaviy yil {0} topilmadi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Moliyaviy yil {0} topilmadi
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Xodimlarni o&#39;rnatish
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Mehmonxona Rezervasyoni
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,"Iltimos, avval prefiksni tanlang"
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Tadqiqot
+DocType: Subscription Settings,Subscription Settings,Obuna sozlamalari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Tadqiqot
 DocType: Maintenance Visit Purpose,Work Done,Ish tugadi
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,"Iltimos, atributlar jadvalidagi kamida bitta xususiyatni ko&#39;rsating"
 DocType: Announcement,All Students,Barcha talabalar
@@ -1572,18 +1573,18 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Mavzu guruhi bir xil nom bilan mavjud bo&#39;lib, element nomini o&#39;zgartiring yoki element guruhini o&#39;zgartiring"
 DocType: Crop Cycle,Less than a year,Bir yildan kamroq
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Talabalar uchun mobil telefon raqami
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Dunyoning qolgan qismi
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Dunyoning qolgan qismi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} bandda partiyalar mavjud emas
 DocType: Crop,Yield UOM,Hosildorlik
 ,Budget Variance Report,Byudjet o&#39;zgaruvchilari hisoboti
 DocType: Salary Slip,Gross Pay,Brüt to&#39;lov
 DocType: Item,Is Item from Hub,Uyadan uydir
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Row {0}: Faoliyat turi majburiydir.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,To&#39;langan mablag&#39;lar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,To&#39;langan mablag&#39;lar
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Buxgalterlik hisobi
 DocType: Stock Reconciliation,Difference Amount,Farqi miqdori
 DocType: Purchase Invoice,Reverse Charge,Qaytarib oling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Yig&#39;ilib qolgan oylik maoshlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Yig&#39;ilib qolgan oylik maoshlari
 DocType: Purchase Invoice,05-Change in POS,05-POS-da o&#39;zgarish
 DocType: Vehicle Log,Service Detail,Sizga xizmat ko&#39;rsatuvchi batafsil
 DocType: BOM,Item Description,Mavzu tavsifi
@@ -1598,12 +1599,12 @@
 DocType: Opportunity Item,Opportunity Item,Imkoniyat elementi
 ,Student and Guardian Contact Details,Isoning shogirdi va Guardian bilan aloqa ma&#39;lumotlarini
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: yetkazib beruvchi uchun {0} elektron pochta manzili uchun elektron pochta manzili talab qilinadi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Vaqtinchalik ochilish
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Vaqtinchalik ochilish
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Hub-ni ko&#39;rish
 ,Employee Leave Balance,Xodimlarning balansidan chiqishi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Hisob uchun {0} muvozanat har doim {1} bo&#39;lishi kerak
 DocType: Patient Appointment,More Info,Qo&#39;shimcha ma&#39;lumot
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},{0} qatoridagi element uchun baholanish darajasi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},{0} qatoridagi element uchun baholanish darajasi
 DocType: Supplier Scorecard,Scorecard Actions,Scorecard faoliyati
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Misol: Kompyuter fanlari magistri
 DocType: Purchase Invoice,Rejected Warehouse,Rad etilgan ombor
@@ -1613,16 +1614,17 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,uchun
 DocType: Supplier Quotation Item,Lead Time in days,Bir necha kun ichida yetkazish vaqti
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,To&#39;lanadigan qarz hisoboti
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},{0} dan {1} ga qadar ish haqini to&#39;lash
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},{0} dan {1} ga qadar ish haqini to&#39;lash
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Muzlatilgan hisobni tahrirlash uchun vakolatli emas {0}
 DocType: Journal Entry,Get Outstanding Invoices,Katta foyda olish
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Savdo Buyurtmani {0} haqiqiy emas
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Takliflar uchun yangi so&#39;rov uchun ogohlantir
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Xarid qilish buyurtmalari xaridlarni rejalashtirish va kuzatib borishingizga yordam beradi
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratoriya testlari retseptlari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Kichik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Kichik
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Billingni yaratish vositasi elementini ochish
 DocType: Education Settings,Employee Number,Xodimlarning soni
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Yuborilgan muddatdan keyin hisobni bekor qilish
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Hech qanday holatlar mavjud emas. Hech qanday {0}
 DocType: Project,% Completed,% Bajarildi
 ,Invoiced Amount (Exculsive Tax),Xarajatlar miqdori (ortiqcha soliqlar)
@@ -1636,7 +1638,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoriya sinovlari Datetime
 DocType: Email Digest,Add Quote,Iqtibos qo&#39;shish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},UOM uchun UOM koversion faktorlari talab qilinadi: {0}: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Bilvosita xarajatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Bilvosita xarajatlar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Row {0}: Miqdor majburiydir
 DocType: Agriculture Analysis Criteria,Agriculture,Qishloq xo&#39;jaligi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Master ma&#39;lumotlarini sinxronlash
@@ -1666,16 +1668,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} uchun faqat kredit hisoblari boshqa to&#39;lov usullariga bog&#39;liq bo&#39;lishi mumkin
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Barcha topshiriqlarning umumiy og&#39;irligi 1 bo&#39;lishi kerak. Iltimos, barcha loyiha vazifalarining vaznini mos ravishda moslang"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Yetkazib berish eslatmasi {0} yuborilmadi
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,{0} mahsuloti sub-shartnoma qo&#39;yilgan bo&#39;lishi kerak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital uskunalar
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,{0} mahsuloti sub-shartnoma qo&#39;yilgan bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Kapital uskunalar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Raqobatchilarimiz qoidasi &quot;Apply O&#39;n&quot; maydoniga asoslanib tanlangan, bular Item, Item Group yoki Tovar bo&#39;lishi mumkin."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Avval Mahsulot kodini o&#39;rnating
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Savdo jamoasi uchun jami ajratilgan foiz 100 bo&#39;lishi kerak
+DocType: Subscription Plan,Billing Interval Count,Billing oralig&#39;i soni
 DocType: Sales Invoice Item,Edit Description,Tartibga solish tavsifi
 DocType: Antibiotic,Antibiotic,Antibiotik
 ,Team Updates,Jamoa yangiliklari
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Yetkazib beruvchiga
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Yetkazib beruvchiga
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hisobni sozlashni sozlash operatsiyalarda ushbu hisobni tanlashda yordam beradi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompaniya valyutasi)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Chop etish formatini yaratish
@@ -1701,7 +1704,7 @@
 DocType: POS Item Group,POS Item Group,Qalin modda guruhi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pochtasi:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Shu bilan bir qatorda element element kodi bilan bir xil bo&#39;lmasligi kerak
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} {1} mahsulotiga tegishli emas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} {1} mahsulotiga tegishli emas
 DocType: Sales Partner,Target Distribution,Nishon tarqatish
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Vaqtinchalik baholashni yakunlash
 DocType: Salary Slip,Bank Account No.,Bank hisob raqami
@@ -1717,7 +1720,7 @@
 DocType: BOM Operation,Workstation,Ish stantsiyani
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Buyurtma beruvchi etkazib beruvchisi
 DocType: Healthcare Settings,Registration Message,Ro&#39;yxatdan o&#39;tish xabar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Uskuna
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Uskuna
 DocType: Prescription Dosage,Prescription Dosage,Reçetesiz dozaj
 DocType: Attendance,HR Manager,Kadrlar bo&#39;yicha menejer
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,"Iltimos, kompaniyani tanlang"
@@ -1747,7 +1750,7 @@
 DocType: Project,Start and End Dates,Boshlanish va tugash sanalari
 ,Delivered Items To Be Billed,Taqdim etiladigan narsalar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Serial raqami uchun omborni o&#39;zgartirib bo&#39;lmaydi.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Serial raqami uchun omborni o&#39;zgartirib bo&#39;lmaydi.
 DocType: Authorization Rule,Average Discount,O&#39;rtacha chegirma
 DocType: Project Update,Great/Quickly,Katta / tez
 DocType: Purchase Invoice Item,UOM,UOM
@@ -1756,8 +1759,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,"Iltimos, yig&#39;ilgan element uchun partiyalarni tanlang"
 DocType: Asset,Depreciation Schedules,Amortizatsiya jadvallari
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,GST sozlamalarida quyidagi hisoblarni tanlash mumkin:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Ariza soatlari tashqaridan ajratilgan muddatning tashqarisida bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,GST sozlamalarida quyidagi hisoblarni tanlash mumkin:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ariza soatlari tashqaridan ajratilgan muddatning tashqarisida bo&#39;lishi mumkin emas
 DocType: Activity Cost,Projects,Loyihalar
 DocType: Payment Request,Transaction Currency,Jurnal valyutasi
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},{0} dan {1} {2}
@@ -1768,6 +1771,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: POS Profile,Campaign,Kampaniya
 DocType: Supplier,Name and Type,Ismi va turi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',Tasdiqlash maqomi &quot;Tasdiqlangan&quot; yoki &quot;Rad etilgan&quot; bo&#39;lishi kerak
 DocType: Physician,Contacts and Address,Kontaktlar va manzil
 DocType: Purchase Invoice,Contact Person,Bog&#39;lanish uchun shahs
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bashoratli boshlanish sanasi&quot; kutilgan &quot;tugash sanasi&quot; dan kattaroq bo&#39;la olmaydi
@@ -1781,19 +1785,20 @@
 DocType: Student Admission,Eligibility and Details,Imtiyoz va tafsilotlar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Ruxsat etilgan aktivlardagi aniq o&#39;zgarish
 DocType: Leave Control Panel,Leave blank if considered for all designations,Barcha belgilar uchun hisobga olingan holda bo&#39;sh qoldiring
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} qatoridagi &quot;Haqiqiy&quot; turidagi to&#39;lovni &quot;Oddiy qiymat&quot; ga qo&#39;shish mumkin emas
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} qatoridagi &quot;Haqiqiy&quot; turidagi to&#39;lovni &quot;Oddiy qiymat&quot; ga qo&#39;shish mumkin emas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime&#39;dan
 DocType: Email Digest,For Company,Kompaniya uchun
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Aloqa yozuvi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ilovaning so&#39;rovi portaldan kirish uchun o&#39;chirib qo&#39;yilgan, portalni yanada aniqroq tekshirish uchun."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Yetkazib beruvchi Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Xarid qilish miqdori
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Xarid qilish miqdori
 DocType: Sales Invoice,Shipping Address Name,Yuk tashish manzili nomi
 DocType: Material Request,Terms and Conditions Content,Shartlar va shartlar tarkibi
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Dars jadvali yaratishda xatolar yuz berdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,100 dan ortiq bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,{0} elementi aktsiyalar elementi emas
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Ro&#39;yxatdagi dastlabki xarajatlarning dastlabki qiymatini tasdiqlash uchun standart Expense Approver deb belgilanadi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,100 dan ortiq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,{0} elementi aktsiyalar elementi emas
 DocType: Maintenance Visit,Unscheduled,Rejalashtirilmagan
 DocType: Employee,Owned,Egasi
 DocType: Salary Detail,Depends on Leave Without Pay,Pulsiz qoldiring
@@ -1814,14 +1819,15 @@
 DocType: Package Code,Package Code,Paket kodi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Chiragcha
 DocType: Purchase Invoice,Company GSTIN,Kompaniya GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Salbiy miqdorda ruxsat berilmaydi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Salbiy miqdorda ruxsat berilmaydi
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Element ustasidan magistral sifatida olib kelingan va ushbu sohada saqlangan soliq batafsil jadvali. Soliqlar va yig&#39;imlar uchun ishlatiladi
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Xodim o&#39;z oldiga hisobot bera olmaydi.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xodim o&#39;z oldiga hisobot bera olmaydi.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Agar hisob buzilgan bo&#39;lsa, kirishlar cheklangan foydalanuvchilarga ruxsat etiladi."
 DocType: Email Digest,Bank Balance,Bank balansi
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} uchun buxgalteriya yozuvi: {1} faqatgina valyutada bo&#39;lishi mumkin: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Muvofiqlashtiruvchining majburiy topshirig&#39;ini tasdiqlang
 DocType: Job Opening,"Job profile, qualifications required etc.","Ishchi profil, talablar va boshqalar."
 DocType: Journal Entry Account,Account Balance,Hisob balansi
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Bitim uchun soliq qoidalari.
@@ -1849,15 +1855,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Resurs ombori {0} qatoriga kiritilishi shart
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,"{0} qatoridagi to&#39;lov muddati, ehtimol, ikki nusxadir."
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Qishloq xo&#39;jaligi (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Qoplamali sumkasi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Ofis ijarasi
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS-gateway sozlamalarini to&#39;g&#39;rilash
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Qoplamali sumkasi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis ijarasi
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,SMS-gateway sozlamalarini to&#39;g&#39;rilash
 DocType: Disease,Common Name,Umumiy nom
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Import amalga oshmadi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Hech qanday manzil hali qo&#39;shilmagan.
 DocType: Workstation Working Hour,Workstation Working Hour,Ish stantsiyani ish vaqti
 DocType: Vital Signs,Blood Pressure,Qon bosimi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Tahlilchi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Tahlilchi
 DocType: Item,Inventory,Inventarizatsiya
 DocType: Item,Sales Details,Sotish tafsilotlari
 DocType: Quality Inspection,QI-,QI-
@@ -1867,15 +1873,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Talaba guruhidagi talabalar uchun ro&#39;yxatdan o&#39;tgan kursni tasdiqlash
 DocType: Notification Control,Expense Claim Rejected,Eksport e&#39;tirishi rad etildi
 DocType: Item,Item Attribute,Mavzu tavsifi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Hukumat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Hukumat
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Avtomobil logi uchun {0} xarajat talabi allaqachon mavjud
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Institutning nomi
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,To&#39;lov miqdorini kiriting
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,To&#39;lov miqdorini kiriting
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Variant variantlari
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Xizmatlar
 DocType: HR Settings,Email Salary Slip to Employee,E-pochtani ish haqi xodimiga aylantirish
 DocType: Cost Center,Parent Cost Center,Ota-xarajatlar markazi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Mumkin etkazib beruvchini tanlang
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Mumkin etkazib beruvchini tanlang
 DocType: Sales Invoice,Source,Manba
 DocType: Customer,"Select, to make the customer searchable with these fields",Xaridorni ushbu maydonlar bo&#39;yicha qidirish uchun tanlang
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Yopiq ko&#39;rsatilsin
@@ -1892,7 +1898,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Ambalaj kipleri bekor qilindi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Investitsiyalardan pul oqimi
 DocType: Program Course,Program Course,Dastur kursi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Yuk va ekspeditorlik xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Yuk va ekspeditorlik xarajatlari
 DocType: Homepage,Company Tagline for website homepage,Veb-saytning asosiy sahifasi uchun Kompaniya Tagline
 DocType: Item Group,Item Group Name,Mavzu guruh nomi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Qabul qilingan
@@ -1922,10 +1928,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Imzolar haqida ma&#39;lumot
 DocType: Leave Block List,Block Holidays on important days.,Muhim kunlardagi dam olish kunlari.
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),"Iltimos, barcha kerakli Natijani qiymatini kiriting"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Qabul qilinadigan hisobvaraqlarning qisqacha bayoni
-DocType: Employee Loan,Monthly Repayment Amount,Oylik to&#39;lov miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Qabul qilinadigan hisobvaraqlarning qisqacha bayoni
+DocType: Loan,Monthly Repayment Amount,Oylik to&#39;lov miqdori
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Xarajatlarni ochish
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,"Iltimos, foydalanuvchi identifikatorini Xodimlar roliga o&#39;rnatish uchun Xodimlar ro&#39;yxatiga qo&#39;ying"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,"Iltimos, foydalanuvchi identifikatorini Xodimlar roliga o&#39;rnatish uchun Xodimlar ro&#39;yxatiga qo&#39;ying"
 DocType: UOM,UOM Name,UOM nomi
 DocType: GST HSN Code,HSN Code,HSN kodi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Qatnashchining miqdori
@@ -1947,7 +1953,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},{0} {{} {1} shifokoriga allaqachon tayinlangan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Tanlangan element uchun odatiy ombor kerak
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Mumkin bo&#39;lgan yetkazib beruvchi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Mumkin bo&#39;lgan yetkazib beruvchi
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Oylik tarqatish
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Qabul qiladiganlar ro&#39;yxati bo&#39;sh. Iltimos, qabul qiluvchi ro&#39;yxatini yarating"
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Sog&#39;liqni saqlash (beta)
@@ -1974,7 +1981,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,To&#39;plam uchun hech narsa yo&#39;q
 DocType: Shipping Rule Condition,From Value,Qiymatdan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Ishlab chiqarish miqdori majburiydir
-DocType: Employee Loan,Repayment Method,Qaytarilish usuli
+DocType: Loan,Repayment Method,Qaytarilish usuli
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Agar belgilansa, Bosh sahifa veb-sayt uchun standart elementlar guruhi bo&#39;ladi"
 DocType: Quality Inspection Reading,Reading 4,O&#39;qish 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Kompaniya xarajatlari uchun da&#39;vo.
@@ -1983,7 +1990,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Sertifikat kerak
 DocType: Company,Default Holiday List,Standart dam olish ro&#39;yxati
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: {1} dan vaqt va vaqtdan {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Qarz majburiyatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Qarz majburiyatlari
 DocType: Purchase Invoice,Supplier Warehouse,Yetkazib beruvchi ombori
 DocType: Opportunity,Contact Mobile No,Mobil raqami bilan bog&#39;laning
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Kompaniya-ni tanlang
@@ -1991,7 +1998,7 @@
 DocType: Student Report Generation Tool,Print Section,Bosma bo&#39;limi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,{0} foydalanuvchida hech qanday standart qalin profil mavjud emas. Ushbu foydalanuvchi uchun Row {1} -dan standartni tekshiring.
 DocType: Student Group,Set 0 for no limit,Hech qanday chegara uchun 0-ni tanlang
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dam olish uchun ariza topshirgan kun (lar) bayramdir. Siz ta&#39;tilga ariza berishingiz shart emas.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dam olish uchun ariza topshirgan kun (lar) bayramdir. Siz ta&#39;tilga ariza berishingiz shart emas.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Roy {idx}: {field} Opening {invoice_type} Xarajatlarni yaratish uchun talab qilinadi
 DocType: Customer,Primary Address and Contact Detail,Birlamchi manzil va aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,To&#39;lov E-pochtasini qayta yuboring
@@ -2002,7 +2009,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,"Iltimos, kamida bitta domenni tanlang."
 DocType: Dependent Task,Dependent Task,Qaram vazifa
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Birlamchi o&#39;lchov birligi uchun ishlab chiqarish omili {0} qatorida 1 bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},{0} tipidagi qoldiring {1} dan uzun bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},{0} tipidagi qoldiring {1} dan uzun bo&#39;lishi mumkin emas
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,X kun oldin rejalashtirilgan operatsiyalarni sinab ko&#39;ring.
 DocType: HR Settings,Stop Birthday Reminders,Tug&#39;ilgan kunlar eslatmalarini to&#39;xtatish
 DocType: SMS Center,Receiver List,Qabul qiluvchi ro&#39;yxati
@@ -2014,7 +2021,7 @@
 DocType: Assessment Plan,Grading Scale,Baholash o&#39;lchovi
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,O&#39;lchov birligi {0} bir necha marta kiritilgan
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,To&#39;liq bajarildi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Al-Qoida
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Al-Qoida
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Import muvaffaqiyatli!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},To&#39;lov bo&#39;yicha so&#39;rov allaqachon {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chiqarilgan mahsulotlarning narxi
@@ -2025,17 +2032,16 @@
 DocType: Quotation Item,Quotation Item,Tavsif varag&#39;i
 DocType: Customer,Customer POS Id,Xaridor QO&#39;ShI Id
 DocType: Account,Account Name,Hisob nomi
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Sana Sana&#39;dan ko&#39;ra kattaroq bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Seriya No {0} miqdori {1} bir qism emas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,Sana Sana&#39;dan ko&#39;ra kattaroq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Seriya No {0} miqdori {1} bir qism emas
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,"Iltimos, Woocommerce Server URL manzilini kiriting"
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Yetkazib beruvchi turi ustasi.
 DocType: Purchase Order Item,Supplier Part Number,Yetkazib beruvchi qismi raqami
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Ishlab chiqarish darajasi 0 yoki 1 bo&#39;lishi mumkin emas
 DocType: Share Balance,To No,Yo&#39;q
-DocType: Subscription,Reference Document,Malumot hujjati
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} bekor qilindi yoki to&#39;xtatildi
 DocType: Accounts Settings,Credit Controller,Kredit nazoratchisi
-DocType: Grant Application,Applicant Type,Ariza beruvchi turi
+DocType: Loan,Applicant Type,Ariza beruvchi turi
 DocType: Purchase Invoice,03-Deficiency in services,03 - Xizmatlarning etishmasligi
 DocType: Delivery Note,Vehicle Dispatch Date,Avtomobilni jo&#39;natish sanasi
 DocType: Healthcare Settings,Default Medical Code Standard,Standart tibbiy standartlar standarti
@@ -2046,13 +2052,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% to&#39;ldirildi
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Saqlandi Qty
 DocType: Party Account,Party Account,Partiya hisoblari
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Kadrlar bo&#39;limi
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Kadrlar bo&#39;limi
 DocType: Lead,Upper Income,Yuqori daromad
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rad etish
 DocType: Journal Entry Account,Debit in Company Currency,Kompaniya valyutasidagi debet
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Ishchi uchun
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,To&#39;lovni kiritish
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,To&#39;lovni kiritish
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Yetkazib beruvchiga qarshi oldindan qarzdor bo&#39;lishi kerak
 DocType: Company,Default Values,Standart qiymatlar
 DocType: Membership,INR,INR
@@ -2081,10 +2087,10 @@
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Hammasi bo&#39;lib (soliqsiz)
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Qo&#39;rg&#39;oshin soni
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 dan katta bo&#39;lishi kerak
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Mavjudotlar mavjud
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Mavjudotlar mavjud
 DocType: Manufacturing Settings,Capacity Planning For (Days),Imkoniyatlarni rejalashtirish (kunlar)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Xarid qilish
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Hech qaysi mahsulot miqdori yoki qiymati o&#39;zgarmas.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Hech qaysi mahsulot miqdori yoki qiymati o&#39;zgarmas.
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Majburiy maydon - Dastur
 DocType: Special Test Template,Result Component,Natija komponenti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Kafolat talabi
@@ -2104,7 +2110,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Bayramlardagi bayramlarni barglar sifatida qo&#39;shish
 DocType: Sales Invoice,Packed Items,Paketlangan narsalar
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Seriya raqami bo&#39;yicha kafolat talabi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&quot;Umumiy&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&quot;Umumiy&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Savatga savatni faollashtirish
 DocType: Employee,Permanent Address,Doimiy yashash joyi
 DocType: Consultation,Medication,Dori-darmon
@@ -2120,10 +2126,10 @@
 DocType: Selling Settings,Selling Settings,Sotish sozlamalari
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Amalni tasdiqlang
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Onlayn auktsionlar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Miqdor yoki baholash bahosini yoki ikkalasini ham ko&#39;rsating
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Miqdor yoki baholash bahosini yoki ikkalasini ham ko&#39;rsating
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Tugatish
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Savatda ko&#39;rish
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Marketing xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Marketing xarajatlari
 ,Item Shortage Report,Mavzu kamchiliklari haqida hisobot
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,"Standart mezonlarni yaratib bo&#39;lmaydi. Iltimos, mezonlarni qayta nomlash"
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Og&#39;irligi ko&#39;rsatilgan, \ n &quot;Og&#39;irligi UOM&quot; ni ham eslang"
@@ -2145,9 +2151,9 @@
 DocType: Upload Attendance,Get Template,Andoza olish
 DocType: Material Request,Transferred,O&#39;tkazildi
 DocType: Vehicle,Doors,Eshiklar
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext O&#39;rnatish tugallandi!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext O&#39;rnatish tugallandi!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Kasalni ro&#39;yxatdan o&#39;tkazish uchun yig&#39;im to&#39;lash
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Birja bitimidan keyin Xususiyatlarni o&#39;zgartirib bo&#39;lmaydi. Yangi mahsulotni yarating va yangi mahsulotga aktsiyalaringizni topshiring
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Birja bitimidan keyin Xususiyatlarni o&#39;zgartirib bo&#39;lmaydi. Yangi mahsulotni yarating va yangi mahsulotga aktsiyalaringizni topshiring
 DocType: Course Assessment Criteria,Weightage,Og&#39;irligi
 DocType: Purchase Invoice,Tax Breakup,Soliq to&#39;lash
 DocType: Packing Slip,PS-,PS-
@@ -2183,11 +2189,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Moslik JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Juda ko&#39;p ustunlar. Hisobotni eksport qiling va elektron jadval ilovasidan foydalaning.
 DocType: Purchase Invoice Item,Batch No,Partiya no
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Ishchilarning avanslari
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Xaridorning Buyurtma buyrug&#39;iga qarshi bir nechta Sotish Buyurtmalariga ruxsat berish
 DocType: Student Group Instructor,Student Group Instructor,Talabalar guruhining o&#39;qituvchisi
 DocType: Grant Application,Assessment  Mark (Out of 10),Baholash belgisi (10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil raqami
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Asosiy
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Asosiy
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sizning operatsiyalaringizda raqamlash seriyasi uchun prefiksni o&#39;rnating
 DocType: Employee Attendance Tool,Employees HTML,Xodimlar HTML
@@ -2196,15 +2203,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Fursatdan dalolat majburiy
 DocType: Email Digest,Annual Expenses,Yillik xarajatlar
 DocType: Item,Variants,Variantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Buyurtma buyurtma qiling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Buyurtma buyurtma qiling
 DocType: SMS Center,Send To,Yuborish
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},{0} to`g`ri to`g`ri uchun muvozanat etarli emas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},{0} to`g`ri to`g`ri uchun muvozanat etarli emas
 DocType: Payment Reconciliation Payment,Allocated amount,Ajratilgan mablag&#39;
 DocType: Sales Team,Contribution to Net Total,Net jami hissa ulushi
 DocType: Sales Invoice Item,Customer's Item Code,Xaridorning mahsulot kodi
 DocType: Stock Reconciliation,Stock Reconciliation,Qimmatli qog&#39;ozlar bilan kelishuv
 DocType: Territory,Territory Name,Hududning nomi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Yuborishdan oldin ishlaydigan ishlab chiqarish ombori talab qilinadi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Obunada faqat bitta hisob-kitob davriga ega Planlar mavjud
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ish uchun murojaat etuvchi.
 DocType: Purchase Order Item,Warehouse and Reference,QXI va Yo&#39;naltiruvchi
 DocType: Supplier,Statutory info and other general information about your Supplier,Ta&#39;minlovchingiz haqidagi qonuniy ma&#39;lumotlar va boshqa umumiy ma&#39;lumotlar
@@ -2213,10 +2221,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Jurnalga qarshi kiritilgan {0} yozuviga mos bo&#39;lmagan {1} yozuvi mavjud emas
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,Baholash
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,O&#39;quv mashg&#39;ulotlari
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Duplikat ketma-ket No {0} element uchun kiritilgan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Duplikat ketma-ket No {0} element uchun kiritilgan
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Qo&#39;rg&#39;oshin manbai yordamida kuzatib boring.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Yuk tashish qoidalari uchun shart
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,"Iltimos, kiring"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,"Iltimos, kiring"
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Xizmat yozuvi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,"Iltimos, filtrni yoki odatiy ob&#39;ektni tanlang"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Ushbu paketning sof og&#39;irligi. (mahsulotning sof og&#39;irligi yig&#39;indisi sifatida avtomatik ravishda hisoblanadi)
@@ -2224,11 +2232,11 @@
 DocType: Sales Order,To Deliver and Bill,Taqdim etish va Bill
 DocType: Student Group,Instructors,O&#39;qituvchilar
 DocType: GL Entry,Credit Amount in Account Currency,Hisob valyutasida kredit summasi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} yuborilishi kerak
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} yuborilishi kerak
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Hissa boshqarish
 DocType: Authorization Control,Authorization Control,Avtorizatsiya nazorati
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Roy # {0}: Rad etilgan QXI rad etilgan elementga qarshi majburiydir {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,To&#39;lov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,To&#39;lov
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","{0} ombori har qanday hisobga bog&#39;lanmagan bo&#39;lsa, iltimos, zaxiradagi yozuvni qayd qiling yoki kompaniya {1} da odatiy inventarizatsiya hisobini o&#39;rnating."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Buyurtmalarni boshqaring
 DocType: Work Order Operation,Actual Time and Cost,Haqiqiy vaqt va narx
@@ -2237,7 +2245,7 @@
 DocType: Student Leave Application,Student Leave Application,Talabalar uchun ariza
 DocType: Item,Will also apply for variants,"Shuningdek, variantlar uchun ham qo&#39;llaniladi"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Aktivni bekor qilish mumkin emas, chunki allaqachon {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Yarim kun {1} da xizmatdosh {0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Yarim kun {1} da xizmatdosh {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Umumiy ish soatlari eng ko&#39;p ish vaqti {0} dan ortiq bo&#39;lmasligi kerak
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Yoqilgan
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Sotuv vaqtidagi narsalarni to&#39;plash.
@@ -2247,7 +2255,7 @@
 DocType: Item,Barcodes,Barkodlar
 DocType: Hub Category,Hub Node,Uyadan tugun
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Siz ikki nusxadagi ma&#39;lumotlar kiritdingiz. Iltimos, tuzatish va qayta urinib ko&#39;ring."
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Birgalikda
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Birgalikda
 DocType: Asset Movement,Asset Movement,Asset harakati
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Buyurtma {0} topshirilishi kerak
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Yangi savat
@@ -2265,13 +2273,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,To&#39;lov valyutasi odatiy kompaniyaning valyutasiga yoki partiyaning hisobvaraqlariga teng bo&#39;lishi kerak
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paket ushbu etkazib berishning bir qismi ekanligini ko&#39;rsatadi (faqat loyiha)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Row {0}: sanasi sanasidan oldin sanasi bo&#39;lmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Row {0}: sanasi sanasidan oldin sanasi bo&#39;lmaydi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,To&#39;lovni kiritish
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},{0} uchun mahsulot miqdori {1} dan kam bo&#39;lishi kerak
 ,Sales Invoice Trends,Sotuvdagi taqdim etgan tendentsiyalari
 DocType: Leave Application,Apply / Approve Leaves,Yaproqlarni qo&#39;llash / tasdiqlash
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Uchun
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Qatorni faqatgina &#39;On oldingi satr miqdori&#39; yoki &#39;oldingi qatorni jami&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Qatorni faqatgina &#39;On oldingi satr miqdori&#39; yoki &#39;oldingi qatorni jami&#39;
 DocType: Sales Order Item,Delivery Warehouse,Etkazib beriladigan ombor
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Moliyaviy xarajatlar markazlarining daraxti.
 DocType: Serial No,Delivery Document No,Yetkazib berish hujjati №
@@ -2285,7 +2292,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Ishlab chiqarish sozlamalarida Materiallar sarflanishi belgilanmagan.
 DocType: Student,Student Mobile Number,Isoning shogirdi mobil raqami
 DocType: Item,Has Variants,Varyantlar mavjud
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{1} qatorda {2} dan ortiq {0} mahsulotiga ortiqcha to&#39;lov berilmaydi. Haddan ortiq hisob-kitoblarga ruxsat berish uchun, Stok Sozlamalarni-ni tanlang"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{1} qatorda {2} dan ortiq {0} mahsulotiga ortiqcha to&#39;lov berilmaydi. Haddan ortiq hisob-kitoblarga ruxsat berish uchun, Stok Sozlamalarni-ni tanlang"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Javobni yangilash
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},{0} {1} dan tanlangan elementlarni tanladingiz
 DocType: Monthly Distribution,Name of the Monthly Distribution,Oylik tarqatish nomi
@@ -2296,12 +2303,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Avval dasturni tanlang
 DocType: Patient Appointment,Patient Age,Bemor yoshi
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Loyihalarni boshqarish
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Hech bir {0} ketma-ketligi qaytarilmadi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Hech bir {0} ketma-ketligi qaytarilmadi
 DocType: Supplier,Supplier of Goods or Services.,Mahsulot yoki xizmatlarni yetkazib beruvchi.
 DocType: Budget,Fiscal Year,Moliyaviy yil
 DocType: Asset Maintenance Log,Planned,Rejalashtirilgan
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,"Agar bemorda konsultatsiya uchun to&#39;lovlar belgilanmagan bo&#39;lsa, foydalaniladigan debitorlik hisoblari."
 DocType: Vehicle Log,Fuel Price,Yoqilg&#39;i narxi
+DocType: Bank Guarantee,Margin Money,Margin pul
 DocType: Budget,Budget,Byudjet
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Ochish-ni tanlang
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Ruxsat etilgan aktiv elementi qimmatli qog&#39;oz emas.
@@ -2315,16 +2323,16 @@
 DocType: Lead,Follow Up,Kuzatish
 DocType: Item,Is Sales Item,Savdo punkti
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Mavzu guruh daraxti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} mahsuloti ketma-ketlik uchun sozlanmagan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,{0} mahsuloti ketma-ketlik uchun sozlanmagan
 DocType: Maintenance Visit,Maintenance Time,Xizmat muddati
 ,Amount to Deliver,Taqdim etiladigan summalar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Xuddi shu element bir necha marta kiritilgan. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Davrning boshlanishi sana atamasi bilan bog&#39;liq bo&#39;lgan Akademik yilning Yil boshlanishi sanasidan oldin bo&#39;lishi mumkin emas (Akademik yil (})). Iltimos, sanalarni tahrirlang va qaytadan urinib ko&#39;ring."
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Xatolar bor edi.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,{0} xizmatdoshi {1} uchun {2} va {3}) orasida allaqachon murojaat qilgan:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Xatolar bor edi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,{0} xizmatdoshi {1} uchun {2} va {3}) orasida allaqachon murojaat qilgan:
 DocType: Guardian,Guardian Interests,Guardian manfaatlari
 DocType: Naming Series,Current Value,Joriy qiymat
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"{0} sana uchun bir necha moliyaviy yillar mavjud. Iltimos, kompaniyani Moliyaviy yilga qo&#39;ying"
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"{0} sana uchun bir necha moliyaviy yillar mavjud. Iltimos, kompaniyani Moliyaviy yilga qo&#39;ying"
 DocType: Education Settings,Instructor Records to be created by,O&#39;qituvchi tomonidan yaratiladigan yozuvlar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} yaratildi
 DocType: GST Account,GST Account,GST hisobi
@@ -2343,8 +2351,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Yetkazish sanasi o&#39;tilganlik sanasi sanasidan oldin bo&#39;la olmaydi
 DocType: Website Item Group,Website Item Group,Veb-sayt elementi guruhi
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Sevimlilarga qo&#39;shildi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga YoKI ish haqi to`plami topshirilmadi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Vazifalar va soliq
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga YoKI ish haqi to`plami topshirilmadi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Vazifalar va soliq
 DocType: Projects Settings,Projects Settings,Loyihalar sozlamalari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Iltimos, arizani kiriting"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} to&#39;lov yozuvlari {1} tomonidan filtrlanmaydi
@@ -2354,27 +2362,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Mavzu guruhlari daraxti.
 DocType: Production Plan,Total Produced Qty,Jami ishlab chiqarilgan Miqdor
 DocType: Payroll Entry,Get Employee Details,Xodimlarning ma&#39;lumotlarini olish
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Ushbu zaryad turi uchun joriy satr raqamidan kattaroq yoki kattaroq satrlarni topib bo&#39;lmaydi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Ushbu zaryad turi uchun joriy satr raqamidan kattaroq yoki kattaroq satrlarni topib bo&#39;lmaydi
 DocType: Asset,Sold,Sotildi
 ,Item-wise Purchase History,Ob&#39;ektga qarab sotib olish tarixi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},{0} elementiga qo&#39;shilgan ketma-ketlik uchun &quot;Jadvalni yarat&quot; tugmasini bosing
 DocType: Account,Frozen,Muzlatilgan
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Asosiy miqdor (Kompaniya valyutasi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Xom ashyolar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Xom ashyolar
 DocType: Payment Reconciliation Payment,Reference Row,Reference Row
 DocType: Installation Note,Installation Time,O&#39;rnatish vaqti
 DocType: Sales Invoice,Accounting Details,Hisobot tafsilotlari
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Ushbu kompaniyaning barcha operatsiyalarini o&#39;chirish
 DocType: Patient,O Positive,U ijobiy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Investitsiyalar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Investitsiyalar
 DocType: Issue,Resolution Details,Qaror ma&#39;lumotlari
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Ajratishlar
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Qabul shartlari
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,"Iltimos, yuqoridagi jadvalda Materiallar talablarini kiriting"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Jurnalga kirish uchun to&#39;lovlar yo&#39;q
 DocType: Item Attribute,Attribute Name,Xususiyat nomi
 DocType: BOM,Show In Website,Saytda ko&#39;rsatish
 DocType: Shopping Cart Settings,Show Quantity in Website,Saytdagi miqdori
-DocType: Employee Loan Application,Total Payable Amount,To&#39;lanadigan qarz miqdori
+DocType: Loan Application,Total Payable Amount,To&#39;lanadigan qarz miqdori
 DocType: Task,Expected Time (in hours),Kutilgan vaqt (soatda)
 DocType: Item Reorder,Check in (group),Kirish (guruh)
 DocType: Soil Texture,Silt,Silt
@@ -2393,7 +2402,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,To&#39;lovni amalga oshirish
 DocType: Room,Room Name,Xona nomi
 DocType: Prescription Duration,Prescription Duration,Rezektsiya davomiyligi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","{0} dan oldingi ruxsatni bekor qilish yoki bekor qilish mumkin emas, chunki kelajakda ajratilgan mablag &#39;ajratish yozuvida {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","{0} dan oldingi ruxsatni bekor qilish yoki bekor qilish mumkin emas, chunki kelajakda ajratilgan mablag &#39;ajratish yozuvida {1}"
 DocType: Activity Cost,Costing Rate,Xarajat darajasi
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Mijozlar manzillari va aloqalar
 ,Campaign Efficiency,Kampaniya samaradorligi
@@ -2411,11 +2420,11 @@
 DocType: Chapter,Chapter,Bo&#39;lim
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Juft
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,"Ushbu rejim tanlangach, standart hisob avtomatik ravishda qalin hisob-fakturada yangilanadi."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Ishlab chiqarish uchun BOM va Qty ni tanlang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Ishlab chiqarish uchun BOM va Qty ni tanlang
 DocType: Asset,Depreciation Schedule,Amortizatsiya jadvali
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Savdo hamkorlari manzili va aloqalar
 DocType: Bank Reconciliation Detail,Against Account,Hisobga qarshi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,Yarim kunlik sana Sana va Tarix orasida bo&#39;lishi kerak
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,Yarim kunlik sana Sana va Tarix orasida bo&#39;lishi kerak
 DocType: Maintenance Schedule Detail,Actual Date,Haqiqiy sana
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,"Iltimos, {0} kompaniyasidagi Standart xarajatlar markazini tanlang."
 DocType: Item,Has Batch No,Partiya no
@@ -2433,7 +2442,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali)
 DocType: Soil Texture,Soil Type,Tuproq turi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},{0} {1} miqdori {2} {3} ga qarshi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Yangi xabar
 ,Quotation Trends,Iqtiboslar tendentsiyalari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},{0} element uchun maqola ustidagi ob&#39;ektlar guruhi
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardsiz Mandate
@@ -2453,7 +2461,7 @@
 DocType: Hub Category,Hub Category,Hub-toifa
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Avtomobil raqami
-DocType: Employee Loan,Loan Amount,Kredit miqdori
+DocType: Loan,Loan Amount,Kredit miqdori
 DocType: Student Report Generation Tool,Add Letterhead,Antetli qo&#39;shing
 DocType: Program Enrollment,Self-Driving Vehicle,O&#39;z-o&#39;zidan avtomashina vositasi
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Yetkazib beruvchi Koreya kartasi
@@ -2481,9 +2489,9 @@
 DocType: Cash Flow Mapper,Position,Obyekt
 DocType: Patient,Patient Details,Bemor batafsil
 DocType: Patient,B Positive,B ijobiy
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo&#39;lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo&#39;lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
 DocType: Leave Block List Allow,Leave Block List Allow,Bloklashlar ro&#39;yxatini qoldiring
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Abbr bo&#39;sh yoki bo&#39;sh joy bo&#39;la olmaydi
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Abbr bo&#39;sh yoki bo&#39;sh joy bo&#39;la olmaydi
 DocType: Patient Medical Record,Patient Medical Record,Kasal Tibbiy Ro&#39;yxatdan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Guruh bo&#39;lmaganlar guruhiga
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2491,8 +2499,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Jami haqiqiy
 DocType: Lab Test UOM,Test UOM,UOMni sinab ko&#39;ring
 DocType: Student Siblings,Student Siblings,Talaba birodarlari
+DocType: Subscription Plan Detail,Subscription Plan Detail,Obuna rejasi batafsil
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Birlik
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,"Iltimos, kompaniyani ko&#39;rsating"
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Iltimos, kompaniyani ko&#39;rsating"
 ,Customer Acquisition and Loyalty,Mijozlarni xarid qilish va sodiqlik
 DocType: Asset Maintenance Task,Maintenance Task,Xizmat topshirish
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,"Iltimos, B2C Limitni GST Sozlamalarida o&#39;rnating."
@@ -2506,23 +2515,25 @@
 ,BOM Search,BOM qidirish
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Jami iste&#39;mol qilinadigan materiallar qiymati (aktsiyalar orqali)
 DocType: Hub Settings,Company Registered,Kompaniya ro&#39;yxatdan o&#39;tgan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,Kiritish uchun sana Sana&#39;dan kam bo&#39;lishi mumkin emas
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Ushbu omborda mavjud bo&#39;lgan kabinetga asosida &quot;In Stock&quot; yoki &quot;Stokta emas&quot; ni chop eting.
 DocType: Vehicle,Fuel Type,Yoqilg&#39;i turi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Iltimos, kompaniyadagi valyutani ko&#39;rsating"
 DocType: Workstation,Wages per hour,Bir soatlik ish haqi
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Materiallar so&#39;rovlaridan so&#39;ng, Materiallar buyurtma buyurtma darajasi bo&#39;yicha avtomatik ravishda to&#39;ldirildi"
 DocType: Email Digest,Pending Sales Orders,Kutilayotgan Sotuvdagi Buyurtma
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Hisob {0} yaroqsiz. Hisob valyutasi {1} bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Hisob {0} yaroqsiz. Hisob valyutasi {1} bo&#39;lishi kerak
 DocType: Employee,Create User Permission,Foydalanuvchi uchun ruxsat yaratish
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
 DocType: Healthcare Settings,Remind Before,Avval eslatish
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},{0} qatorida UOM o&#39;tkazish faktori talab qilinadi
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# {0} sath: Ariza Hujjat turi Sotuvdagi Buyurtma, Sotuvdagi Billing yoki Jurnal Yozuvi bo&#39;lishi kerak"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# {0} sath: Ariza Hujjat turi Sotuvdagi Buyurtma, Sotuvdagi Billing yoki Jurnal Yozuvi bo&#39;lishi kerak"
 DocType: Salary Component,Deduction,O&#39;chirish
 DocType: Item,Retain Sample,Namunani saqlang
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Row {0}: Vaqt va vaqtdan boshlab majburiydir.
 DocType: Stock Reconciliation Item,Amount Difference,Miqdori farqi
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},{1} narxlar ro&#39;yxatida {0} uchun qo&#39;shilgan narx
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},{1} narxlar ro&#39;yxatida {0} uchun qo&#39;shilgan narx
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Iltimos, ushbu savdo vakili xodimining identifikatorini kiriting"
 DocType: Territory,Classification of Customers by region,Mintaqalar bo&#39;yicha mijozlarni tasniflash
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Ishlab chiqarishda
@@ -2532,8 +2543,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Bank hisob-kitob balansi hisoblangan
 DocType: Normal Test Template,Normal Test Template,Oddiy viktorina namunasi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,o&#39;chirilgan foydalanuvchi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Tavsif
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Hechqisi taklif qilinmagan RFQni o&#39;rnatib bo&#39;lmaydi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Tavsif
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Hechqisi taklif qilinmagan RFQni o&#39;rnatib bo&#39;lmaydi
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jami cheklov
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Hisob valyutasini chop etish uchun hisobni tanlang
@@ -2541,7 +2552,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Bu bemorga qilingan operatsiyalarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Qiymati yangilandi
 DocType: Patient,Date of Birth,Tug&#39;ilgan sana
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,{0} elementi allaqachon qaytarilgan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,{0} elementi allaqachon qaytarilgan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Moliyaviy yil ** moliyaviy yilni anglatadi. Barcha buxgalteriya yozuvlari va boshqa muhim bitimlar ** moliyaviy yilga nisbatan ** kuzatiladi.
 DocType: Opportunity,Customer / Lead Address,Xaridor / qo&#39;rg&#39;oshin manzili
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Yetkazib beruvchi Koreya kartasi
@@ -2552,14 +2563,15 @@
 DocType: Work Order Operation,Actual Operation Time,Haqiqiy operatsiya vaqti
 DocType: Authorization Rule,Applicable To (User),Qo&#39;llaniladigan To (User)
 DocType: Purchase Taxes and Charges,Deduct,Deduct
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Ishning tavsifi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Ishning tavsifi
 DocType: Student Applicant,Applied,Amalga oshirildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Qayta oching
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Qayta oching
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qimmatli qog&#39;ozlar aktsiyadorlik jamiyati bo&#39;yicha
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 Ismi
 DocType: Purchase Invoice,02-Post Sale Discount,02-Post sotuvi chegirma
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Maxsus belgilar &quot;-&quot;, &quot;#&quot;, &quot;.&quot; va &quot;/&quot; seriyasining nomlanishiga ruxsat berilmaydi"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Savdo kampaniyalarini kuzating. Qimmatli qog&#39;ozlar, takliflar, Sotuvdagi Buyurtma va boshqalar."
+DocType: Department Approver,Approver,Tasdiqlash
 ,SO Qty,SO Miqdor
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Aktsiyadorlar uchun maydon bo&#39;sh bo&#39;lishi mumkin emas
 DocType: Guardian,Work Address,Ish manzili
@@ -2573,21 +2585,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Jami ajratilgan mablag&#39;lar (Kompaniya valyutasi)
 DocType: Purchase Order Item,To be delivered to customer,Xaridorga etkazib berish
 DocType: BOM,Scrap Material Cost,Hurda Materiallari narxi
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,No {0} seriyali har qanday omborga tegishli emas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,No {0} seriyali har qanday omborga tegishli emas
 DocType: Grant Application,Email Notification Sent,E-pochta xabari yuborildi
 DocType: Purchase Invoice,In Words (Company Currency),So&#39;zlarda (Kompaniya valyutasi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Mahsulot kodi, omborxona, miqdor miqdori talab qilinadi"
-DocType: Pricing Rule,Supplier,Yetkazib beruvchi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Mahsulot kodi, omborxona, miqdor miqdori talab qilinadi"
+DocType: Bank Guarantee,Supplier,Yetkazib beruvchi
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,To&#39;lov ma&#39;lumotlarini ko&#39;rsatish
 DocType: Consultation,Consultation Time,Maslahatlash vaqti
 DocType: C-Form,Quarter,Chorak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Har xil xarajatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Har xil xarajatlar
 DocType: Global Defaults,Default Company,Standart kompaniya
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Xarajat yoki farq statistikasi {0} elementi uchun majburiy, chunki u umumiy qimmatbaho qiymatga ta&#39;sir qiladi"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank nomi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Uyni
-DocType: Employee Loan,Employee Loan Account,Ishchilarning qarz hisoblari
 DocType: Leave Application,Total Leave Days,Jami chiqish kunlari
 DocType: Email Digest,Note: Email will not be sent to disabled users,Eslatma: E-pochta nogironlar foydalanuvchilariga yuborilmaydi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,O&#39;zaro munosabatlar soni
@@ -2602,7 +2613,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Og&#39;irligi (kilogrammda)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",bo&#39;limlari / chapter_name qismni saqlashdan so&#39;ng avtomatik ravishda sozlansin.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,GST sozlamalarida GST sozlamalarini belgilang
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,GST sozlamalarida GST sozlamalarini belgilang
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Biznes turi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Iltimos, atigi bir qatorda ajratilgan miqdori, hisob-faktura turi va hisob-faktura raqami-ni tanlang"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Yangi xarid qiymati
@@ -2611,12 +2622,13 @@
 DocType: Grant Application,Grant Description,Grantlar tavsifi
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarif (Kompaniya valyutasi)
 DocType: Student Guardian,Others,Boshqalar
+DocType: Subscription,Discounts,Chegirmalar
 DocType: Payment Entry,Unallocated Amount,Dividendlar miqdori
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Mos keladigan elementni topib bo&#39;lmadi. {0} uchun boshqa qiymatni tanlang.
 DocType: POS Profile,Taxes and Charges,Soliqlar va yig&#39;imlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Xarid qilingan, sotiladigan yoki sotiladigan mahsulot yoki xizmat."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Boshqa yangilanishlar yo&#39;q
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,To&#39;lov turi &quot;Birinchi qatorda oldingi miqdorda&quot; yoki &quot;Birinchi qatorda oldingi qatorda&quot; tanlanmaydi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,To&#39;lov turi &quot;Birinchi qatorda oldingi miqdorda&quot; yoki &quot;Birinchi qatorda oldingi qatorda&quot; tanlanmaydi
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Ushbu sozlash bilan bog&#39;liq barcha ko&#39;rsatkichlar mavjud
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Bola mahsuloti mahsulot to&#39;plami bo&#39;lmasligi kerak. Iltimos, `{0}` dan olib tashlang va saqlang"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Bank xizmatlari
@@ -2624,45 +2636,48 @@
 DocType: Vehicle Service,Service Item,Xizmat elementi
 DocType: Bank Guarantee,Bank Guarantee,Bank kafolati
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Jadvalni olish uchun &quot;Jadvalni yarat&quot; tugmasini bosing
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlash seriyasini sozlang"
 DocType: Bin,Ordered Quantity,Buyurtma miqdori
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","Masalan, &quot;Quruvchilar uchun asboblarni yaratish&quot;"
 DocType: Grading Scale,Grading Scale Intervals,Baholash o&#39;lchov oralig&#39;i
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,Yil uchun foyda
+DocType: Bank Guarantee,Name of Bank,Bankning nomi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} uchun: {2} uchun buxgalterlik yozuvi faqat valyutada amalga oshirilishi mumkin: {3}
 DocType: Fee Schedule,In Process,Jarayonida
 DocType: Authorization Rule,Itemwise Discount,Imtiyozli miqdor
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Moliyaviy hisoblar daraxti.
+DocType: Bank Guarantee,Reference Document Type,Hujjatning turi
 DocType: Cash Flow Mapping,Cash Flow Mapping,Pul oqimi xaritalash
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} Sotuvdagi buyurtmalariga nisbatan {1}
 DocType: Account,Fixed Asset,Ruxsat etilgan aktiv
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Seriyali inventar
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pochta manzili standart kontaktda topilmadi
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Yashirin yaratish
-DocType: Employee Loan,Account Info,Hisob ma&#39;lumotlari
+DocType: Loan,Account Info,Hisob ma&#39;lumotlari
 DocType: Activity Type,Default Billing Rate,Standart billing darajasi
 DocType: Fees,Include Payment,To&#39;lovni qo&#39;shing
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Talabalar guruhlari yaratildi.
 DocType: Sales Invoice,Total Billing Amount,To&#39;lov miqdori
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Ish haqi tarkibi va talabalar guruhi {0} da dastur boshqacha.
 DocType: Fee Schedule,Receivable Account,Oladigan Hisob
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},# {0} satri: Asset {1} allaqachon {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},# {0} satri: Asset {1} allaqachon {2}
 DocType: Quotation Item,Stock Balance,Kabinetga balansi
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Sotish Buyurtma To&#39;lovi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,Bosh ijrochi direktor
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,Bosh ijrochi direktor
 DocType: Purchase Invoice,With Payment of Tax,Soliq to&#39;lash bilan
 DocType: Expense Claim Detail,Expense Claim Detail,Xarajatlar bo&#39;yicha da&#39;vo tafsiloti
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Yetkazib beruvchiga TRIPLIKAT
 DocType: Land Unit,Is Container,Konteyner
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Bu hosildorlikning 1-kunidir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,"Iltimos, to&#39;g&#39;ri hisobni tanlang"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,"Iltimos, to&#39;g&#39;ri hisobni tanlang"
 DocType: Purchase Invoice Item,Weight UOM,Og&#39;irligi UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Folio raqamlari mavjud bo&#39;lgan aktsiyadorlar ro&#39;yxati
 DocType: Salary Structure Employee,Salary Structure Employee,Ish haqi tuzilishi xodimi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Variant xususiyatlarini ko&#39;rsatish
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Variant xususiyatlarini ko&#39;rsatish
 DocType: Student,Blood Group,Qon guruhi
 DocType: Course,Course Name,Kurs nomi
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Muayyan xodimning ruxsatnomalarini tasdiqlashi mumkin bo&#39;lgan foydalanuvchilar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Ofis uskunalari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Ofis uskunalari
 DocType: Purchase Invoice Item,Qty,Miqdor
 DocType: Fiscal Year,Companies,Kompaniyalar
 DocType: Supplier Scorecard,Scoring Setup,Sozlamalarni baholash
@@ -2681,7 +2696,7 @@
 DocType: Stock Entry,Total Incoming Value,Jami kirish qiymati
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,Debet kerak
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Vaqt jadvallari sizning jamoangiz tomonidan amalga oshiriladigan tadbirlar uchun vaqtni, narxni va hisob-kitoblarni kuzatish imkonini beradi"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Sotib olish narxlari ro&#39;yxati
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Sotib olish narxlari ro&#39;yxati
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Yetkazib beruvchilar kartalari o&#39;zgaruvchilari shabloni.
 DocType: Job Offer Term,Offer Term,Taklif muddati
 DocType: Asset,Quality Manager,Sifat menejeri
@@ -2693,13 +2708,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Jami to&#39;lanmagan: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM veb-sayt operatsiyasi
 DocType: Supplier Scorecard,Supplier Score,Yetkazib beruvchi reytingi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Jami Faturali Amet
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Jami Faturali Amet
 DocType: Supplier,Warn RFQs,RFQlarni ogohlantir
 DocType: BOM,Conversion Rate,Ishlab chiqarish darajasi
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Mahsulot qidirish
 DocType: Assessment Plan,To Time,Vaqtgacha
 DocType: Authorization Rule,Approving Role (above authorized value),Rolni tasdiqlash (vakolatli qiymatdan yuqoriroq)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Kredit Hisob uchun to&#39;lanadigan hisob bo&#39;lishi kerak
+DocType: Loan,Total Amount Paid,To&#39;langan pul miqdori
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Iltimos, to&#39;ldirilgan talaba nomzodiga majburiy bo&#39;lgan talabgor qabul qiling"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} ota-ona yoki {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,"Narxlarni nashr qilish uchun iltimos, narxlar ro&#39;yxatini tanlang"
@@ -2709,18 +2725,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Narxlar ro&#39;yxati {0} o&#39;chirildi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: bajarilgan Qty {1} dan foydalanish uchun {2} dan ortiq bo&#39;lishi mumkin emas
 DocType: Manufacturing Settings,Allow Overtime,Vaqtdan ortiq ishlashga ruxsat berish
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} orqali kabinetga kelishuvi yordamida yangilanib bo&#39;lmaydigan, Iltimos, kabinetga kirishini kiriting"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} orqali kabinetga kelishuvi yordamida yangilanib bo&#39;lmaydigan, Iltimos, kabinetga kirishini kiriting"
 DocType: Training Event Employee,Training Event Employee,O&#39;quv xodimini tayyorlash
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Eng ko&#39;p namuna - {0} Batch {1} va Item {2} uchun saqlanishi mumkin.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Vaqt oraliqlarini qo&#39;shish
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriya raqamlari {1} uchun kerak. Siz {2} berilgansiz.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriya raqamlari {1} uchun kerak. Siz {2} berilgansiz.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Joriy baholash darajasi
 DocType: Training Event,Advance,Advance
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,qayta-qayta qilish uchun.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardsiz to&#39;lov shluzi sozlamalari
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Almashinish / Zarar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Almashinish / Zarar
 DocType: Opportunity,Lost Reason,Yo&#39;qotilgan sabab
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},# {0} qatori: Hisob {1} kompaniyaga tegishli emas {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},# {0} qatori: Hisob {1} kompaniyaga tegishli emas {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} topilmadi
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yangi manzil
 DocType: Quality Inspection,Sample Size,Namuna o&#39;lchami
@@ -2739,7 +2754,6 @@
 DocType: Bin,Actual Quantity,Haqiqiy miqdori
 DocType: Shipping Rule,example: Next Day Shipping,Masalan: Keyingi Kunlik Yuk tashish
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Seriya no {0} topilmadi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Obuna {0} bo&#39;ldi
 DocType: Fee Schedule Program,Fee Schedule Program,Ish haqi dasturi
 DocType: Fee Schedule Program,Student Batch,Talabalar guruhi
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Talabani tayyorlang
@@ -2754,14 +2768,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,E-tijorat GSTIN
 DocType: Sales Order,Not Delivered,Qabul qilinmadi
 ,Bank Clearance Summary,Bankni ochish xulosasi
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Kundalik, haftalik va oylik elektron pochta digestlarini yarating va boshqaring."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Kundalik, haftalik va oylik elektron pochta digestlarini yarating va boshqaring."
 DocType: Appraisal Goal,Appraisal Goal,Baholash maqsadi
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Turkumni taklif qilasizmi?
 DocType: Stock Reconciliation Item,Current Amount,Joriy miqdor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Binolar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Binolar
 DocType: Fee Schedule,Fee Structure,To&#39;lov tarkibi
 DocType: Timesheet Detail,Costing Amount,Xarajatlar miqdori
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
 DocType: Student Admission Program,Application Fee,Ariza narxi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Ish haqi slipini topshirish
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,{0} uchun Maxiumm chegirma {1}%
@@ -2769,12 +2782,13 @@
 DocType: Sales Partner,Address & Contacts,Manzil va Kontaktlar
 DocType: SMS Log,Sender Name,Yuboruvchi nomi
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Qishloq xo&#39;jaligini tahlil qilish mezonlari
+DocType: HR Settings,Leave Approval Notification Template,Tasdiqnomani tasdiqlash shablonini qoldiring
 DocType: POS Profile,[Select],[Tanlash]
 DocType: Vital Signs,Blood Pressure (diastolic),Qon bosimi (diastolik)
 DocType: SMS Log,Sent To,Yuborilgan
 DocType: Agriculture Task,Holiday Management,Dam olishni boshqarish
 DocType: Payment Request,Make Sales Invoice,Sotuvdagi hisob-fakturani tanlang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,Dasturlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,Dasturlar
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Keyingi kontakt tarixi o&#39;tmishda bo&#39;lishi mumkin emas
 DocType: Company,For Reference Only.,Faqat ma&#39;lumot uchun.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{1} shifokori {1} da mavjud emas
@@ -2792,7 +2806,7 @@
 DocType: Employee,New Workplace,Yangi ish joyi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Moddiy iste&#39;mol
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Yopiq qilib belgilang
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},{0} shtrixli element yo&#39;q
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},{0} shtrixli element yo&#39;q
 DocType: Normal Test Items,Require Result Value,Natijada qiymat talab qiling
 DocType: Item,Show a slideshow at the top of the page,Sahifaning yuqori qismidagi slayd-shouni ko&#39;rsatish
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,Boms
@@ -2807,19 +2821,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Berilgan sana uchun ishlaydigan {0} uchun faol yoki standart ish haqi tuzilishi topilmadi
 DocType: Leave Block List,Allow Users,Foydalanuvchilarga ruxsat berish
 DocType: Purchase Order,Customer Mobile No,Mijozlar Mobil raqami
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Ikkilamchi
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Pul oqimi xaritalash shablonini tafsilotlar
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Kreditni boshqarish
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Mahsulot vertikal yoki bo&#39;linmalari uchun alohida daromad va xarajatlarni izlang.
 DocType: Rename Tool,Rename Tool,Vositachi nomini o&#39;zgartirish
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Narxni yangilash
 DocType: Item Reorder,Item Reorder,Mahsulot qayta tartibga solish
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Ish haqi slipini ko&#39;rsatish
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Transfer materiallari
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Ish haqi slipini ko&#39;rsatish
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Transfer materiallari
 DocType: Fees,Send Payment Request,To&#39;lov talabnomasini yuboring
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Operatsiyalarni, operatsion narxini belgilang va sizning operatsiyalaringizni bajarish uchun noyob Operatsiyani taqdim eting."
 DocType: Water Analysis,Origin,Kelib chiqishi
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ushbu hujjat {4} uchun {0} {1} tomonidan cheklangan. {2} ga qarshi yana bitta {3} qilyapsizmi?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,O&#39;zgarish miqdorini tanlang
 DocType: Purchase Invoice,Price List Currency,Narxlari valyutasi
 DocType: Naming Series,User must always select,Foydalanuvchiga har doim tanlangan bo&#39;lishi kerak
@@ -2834,13 +2848,14 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Daromad solig&#39;i bo&#39;yicha javobgarlik
 DocType: Grading Scale Interval,Grade Description,Obyekt ta&#39;rifi
 DocType: Stock Entry,Purchase Receipt No,Xarid qilish no
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pul ishlang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Pul ishlang
 DocType: Sales Invoice, Shipping Bill Number,Yuk tashish raqami
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Izlanadiganlik
 DocType: Asset Maintenance Log,Actions performed,Amallar bajarildi
 DocType: Cash Flow Mapper,Section Leader,Bo&#39;lim rahbari
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Jamg&#39;arma mablag&#39;lari (majburiyatlar)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Jamg&#39;arma mablag&#39;lari (majburiyatlar)
 DocType: Supplier Scorecard Scoring Standing,Employee,Xodim
+DocType: Bank Guarantee,Fixed Deposit Number,Ruxsat etilgan depozit raqami
 DocType: Asset Repair,Failure Date,Xato tarixi
 DocType: Sample Collection,Collected Time,To&#39;plangan vaqt
 DocType: Company,Sales Monthly History,Savdo oylik tarixi
@@ -2857,10 +2872,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Siz ushbu uchrashuvni bekor qilmoqchimisiz?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Mehmonxona Xona narxlash to&#39;plami
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Savdo Quvuri
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},"Iltimos, ish haqi komponentida {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},"Iltimos, ish haqi komponentida {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Majburiy On
 DocType: Rename Tool,File to Rename,Qayta nomlash uchun fayl
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Iltimos, Row {0} qatori uchun BOM-ni tanlang"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Obunani yangilang
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Hisob {0} Hisob holatida Kompaniya {1} bilan mos emas: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},{1} mahsulot uchun belgilangan BOM {0} mavjud emas
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Kurs:
@@ -2870,7 +2886,7 @@
 DocType: Notification Control,Expense Claim Approved,Xarajat talabi ma&#39;qullangan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Ish buyurtmalari yaratilmagan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Ish staji Bu davr uchun allaqachon yaratilgan {0} xodim
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Dori-darmon
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Dori-darmon
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Xarid qilingan buyumlarning narxi
 DocType: Selling Settings,Sales Order Required,Savdo buyurtmasi kerak
 DocType: Purchase Invoice,Credit To,Kredit berish
@@ -2888,7 +2904,7 @@
 DocType: Request for Quotation Supplier,No Quote,Hech qanday taklif yo&#39;q
 DocType: Warranty Claim,Raised By,Ko&#39;tarilgan
 DocType: Payment Gateway Account,Payment Account,To&#39;lov qaydnomasi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Davom etish uchun kompaniyani ko&#39;rsating
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Davom etish uchun kompaniyani ko&#39;rsating
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Xarid oluvchilarning aniq o&#39;zgarishi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Compensatory Off
 DocType: Job Offer,Accepted,Qabul qilingan
@@ -2900,7 +2916,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Iltimos, ushbu kompaniya uchun barcha operatsiyalarni o&#39;chirib tashlamoqchimisiz. Sizning asosiy ma&#39;lumotlaringiz qoladi. Ushbu amalni bekor qilish mumkin emas."
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,Qidiruv natijalari
 DocType: Room,Room Number,Xona raqami
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Noto&#39;g&#39;ri reference {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Noto&#39;g&#39;ri reference {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Yuk tashish qoidalari yorlig&#39;i
 DocType: Journal Entry Account,Payroll Entry,Ish haqi miqdori
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Narxlar yozuvlarini ko&#39;rish
@@ -2910,7 +2926,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog&#39;ozlar yangilanib bo&#39;lmadi, hisob-faktura tomchi qoplama mahsulotini o&#39;z ichiga oladi."
 DocType: Lab Test Sample,Lab Test Sample,Laborotoriya namunasi
 DocType: Item Variant Settings,Allow Rename Attribute Value,Nomini o&#39;zgartirish xususiyatiga ruxsat bering
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Tez jurnalni kiritish
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Tez jurnalni kiritish
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Agar BOM biron-bir elementni eslatmasa, tarifni o&#39;zgartira olmaysiz"
 DocType: Restaurant,Invoice Series Prefix,Billing-uz prefiksi
 DocType: Employee,Previous Work Experience,Oldingi ish tajribasi
@@ -2918,8 +2934,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},{1} qatorida {0} uchun rejalashtirilgan sonni kiriting
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google Xaritalar integratsiyasi yoqilmagan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} yuborilmadi
+DocType: Subscription,Trialling,Tajovuz
 DocType: Member,Membership Expiry Date,Registratsiya sanasi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} qaytariladigan hujjatda salbiy bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} qaytariladigan hujjatda salbiy bo&#39;lishi kerak
 ,Minutes to First Response for Issues,Muammolar uchun birinchi javob uchun daqiqalar
 DocType: Purchase Invoice,Terms and Conditions1,Shartlar va shartlar1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Ushbu tizimni tashkil qilayotgan institut nomi.
@@ -2938,7 +2955,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,O&#39;lchov birligi
 DocType: Fiscal Year,Year End Date,Yil tugash sanasi
 DocType: Task Depends On,Task Depends On,Vazifa bog&#39;liq
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Imkoniyat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Imkoniyat
 DocType: Operation,Default Workstation,Standart ish stantsiyani
 DocType: Notification Control,Expense Claim Approved Message,Xarajat da&#39;vo tasdiqlangan xabar
 DocType: Payment Entry,Deductions or Loss,O&#39;chirish yoki yo&#39;qotish
@@ -2976,7 +2993,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,"Pulsiz qoldirish, tasdiqlangan Taqdimnoma arizalari bilan mos emas"
 DocType: Campaign,Campaign-.####,Kampaniya - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Keyingi qadamlar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,"Iltimos, ko&#39;rsatilgan narsalarni eng yaxshi narxlarda bering"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,"Iltimos, ko&#39;rsatilgan narsalarni eng yaxshi narxlarda bering"
 DocType: Membership,USD,USD
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Billing-ni tanlang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Qolgan muvozanat
@@ -2985,7 +3002,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +498,Barcode {0} is not a valid {1} code,{0} shtrix kodi joriy {1} kod emas
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Year
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Qisqacha / qo&#39;rg&#39;oshin%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Shartnoma tugash sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Shartnoma tugash sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
 DocType: Driver,Driver,Drayv
 DocType: Vital Signs,Nutrition Values,Oziqlanish qiymati
 DocType: Lab Test Template,Is billable,To&#39;lanishi mumkin
@@ -2996,7 +3013,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Haqiqiy boshlash sanasi (vaqt jadvalidan orqali)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Bu ERPNext-dan avtomatik tarzda yaratilgan veb-sayt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Qarish oralig&#39;i 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Umumiy avans miqdori jami talab qilingan miqdordan ko&#39;p bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Umumiy avans miqdori jami talab qilingan miqdordan ko&#39;p bo&#39;lishi mumkin emas
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3030,7 +3047,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteNum,CompteNum
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Nitelik qiymatlarini tanlang
 DocType: Purchase Invoice,Reason For Issuing document,Hujjatni berish uchun sabab
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} yuborilmadi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Stock Entry {0} yuborilmadi
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / pul hisob
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,Keyingi kontaktni Kontakt Email manzili bilan bir xil bo&#39;lmaydi
 DocType: Tax Rule,Billing City,Billing Siti
@@ -3047,7 +3064,8 @@
 DocType: Warranty Claim,Service Address,Xizmat manzili
 DocType: Asset Maintenance Task,Calibration,Kalibrlash
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} kompaniya bayramidir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Mebel va anjomlar
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Vaziyat bayonnomasini qoldiring
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Mebel va anjomlar
 DocType: Item,Manufacture,Ishlab chiqarish
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Kompaniya o&#39;rnatish
 ,Lab Test Report,Laborotoriya test hisobot
@@ -3063,7 +3081,6 @@
 DocType: Crop,Planting Area,O&#39;sish maydoni
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Hammasi bo&#39;lib (Miqdor)
 DocType: Installation Note Item,Installed Qty,O&#39;rnatilgan Miqdor
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,"Buning sababi, ba&#39;zi bir bekor E-pochta manzili"
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Siz qo&#39;shildingiz
 DocType: Purchase Taxes and Charges,Parenttype,Parent turi
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Ta&#39;lim natijasi
@@ -3073,16 +3090,17 @@
 DocType: Products Settings,Products per Page,Har bir sahifa uchun mahsulotlar
 DocType: Stock Ledger Entry,Outgoing Rate,Chiqish darajasi
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Tashkilot filialining ustasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,yoki
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,yoki
 DocType: Sales Order,Billing Status,Billing holati
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Muammo haqida xabar bering
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Kommunal xizmat xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Kommunal xizmat xarajatlari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-yuqorida
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,{{0} qatori: {1} yozuvi {2} hisobiga ega emas yoki boshqa kafelga qarama-qarshi
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterlar Og&#39;irligi
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Tasdiqlash xabarnomasidan chiqing
 DocType: Buying Settings,Default Buying Price List,Standart xarid narxlari
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Vaqt jadvaliga asosan ish haqi miqdori
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Xarid qilish darajasi
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Xarid qilish darajasi
 DocType: Notification Control,Sales Order Message,Savdo buyurtma xabarlari
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Kompaniya, valyuta, joriy moliyaviy yil, va hokazo kabi standart qiymatlarni o&#39;rnating."
 DocType: Payment Entry,Payment Type,To&#39;lov turi
@@ -3104,6 +3122,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Xarid savatni sozlamalari
 DocType: Journal Entry,Accounting Entries,Buxgalteriya yozuvlari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Agar tanlangan narxlash qoidasi &quot;Rate&quot; uchun tuzilgan bo&#39;lsa, u narxlari ro&#39;yxatiga yoziladi. Raqobatchilar Qoida stavkasi oxirgi kurs hisoblanadi, shuning uchun hech qanday chegirmalar qo&#39;llanilmaydi. Shuning uchun, Sotuvdagi Buyurtma, Xarid qilish Buyurtma va shunga o&#39;xshash operatsiyalarda, u &quot;Narxlar ro&#39;yxati darajasi&quot; o&#39;rniga &quot;Ovoz&quot; maydoniga keltiriladi."
+DocType: Journal Entry,Paid Loan,Pulli kredit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Ikki nusxadagi yozuv. Iltimos, tasdiqlash qoidasini {0}"
 DocType: Journal Entry Account,Reference Due Date,Malumot sanasi
 DocType: Purchase Order,Ref SQ,Ref SQ
@@ -3120,7 +3139,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Xizmat jadvali barcha elementlar uchun yaratilmaydi. &quot;Jadvalni yarat&quot; tugmasini bosing
 ,To Produce,Ishlab chiqarish
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Ish haqi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1} da {0} qator uchun. Mavzu kursiga {2} ni qo&#39;shish uchun {3} qatorlari ham qo&#39;shilishi kerak
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1} da {0} qator uchun. Mavzu kursiga {2} ni qo&#39;shish uchun {3} qatorlari ham qo&#39;shilishi kerak
 DocType: Patient Service Unit,Parent Service Unit,Ota-onalar xizmati
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Foydalanuvchi qilish
 DocType: Packing Slip,Identification of the package for the delivery (for print),Yetkazib berish paketini aniqlash (chop etish uchun)
@@ -3138,7 +3157,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Daromad hisobvarag&#39;i
 DocType: Payment Request,Amount in customer's currency,Mijozning valyutadagi miqdori
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Yetkazib berish
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Yetkazib berish
 DocType: Volunteer,Weekdays,Hafta kunlari
 DocType: Stock Reconciliation Item,Current Qty,Joriy Miqdor
 DocType: Restaurant Menu,Restaurant Menu,Restoran menyusi
@@ -3146,7 +3165,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Asosiy mas&#39;uliyat maydoni
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Talaba to&#39;dalari talabalar uchun tashrif buyurish, baholash va to&#39;lovlarni kuzatishda sizga yordam beradi"
 DocType: Payment Entry,Total Allocated Amount,Jami ajratilgan mablag&#39;lar
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Doimiy ro&#39;yxatga olish uchun odatiy inventarizatsiyadan foydalaning
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Doimiy ro&#39;yxatga olish uchun odatiy inventarizatsiyadan foydalaning
 DocType: Item Reorder,Material Request Type,Materiallar talabi turi
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Grantlar bo&#39;yicha ko&#39;rib chiqish elektron pochta manzilini yuboring
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","LocalStorage to&#39;liq, saqlanmadi"
@@ -3154,10 +3173,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Xona hajmi
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},{0} elementi uchun allaqachon qayd mavjud
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Ref
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Siz ilgari ishlab chiqarilgan hisob-fakturalarni yo&#39;qotasiz. Ushbu obunani qayta ishga tushirishga ishonchingiz komilmi?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Ro&#39;yxatdan o&#39;tish badallari
 DocType: Budget,Cost Center,Xarajat markazi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Buyurtma xabarni sotib olish
 DocType: Tax Rule,Shipping Country,Yuk tashish davlati
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Mijozning soliq kodini sotish operatsiyalaridan yashirish
@@ -3166,20 +3186,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Raqobatchilar qoidasi narx-navo varag&#39;ining ustiga yozish uchun belgilanadi / ba&#39;zi mezonlarga asoslanib chegirma foizini belgilaydi.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Omborxonani faqat aktsiyalarni qabul qilish / etkazib berish eslatmasi / sotib olish haqidagi ma&#39;lumotnoma orqali o&#39;zgartirish mumkin
 DocType: Employee Education,Class / Percentage,Sinf / foiz
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Marketing va sotish boshqarmasi boshlig&#39;i
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Marketing va sotish boshqarmasi boshlig&#39;i
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Daromad solig&#39;i
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Sanoat turiga qarab kuzatish.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Antetli qog&#39;ozlarga o&#39;ting
+DocType: Subscription,Cancel At End Of Period,Davr oxirida bekor qilish
 DocType: Item Supplier,Item Supplier,Mahsulot etkazib beruvchisi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},"Iltimos, {0} uchun kotirovka qiymatini tanlang {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,O&#39;tkazish uchun tanlangan ma&#39;lumotlar yo&#39;q
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},"Iltimos, {0} uchun kotirovka qiymatini tanlang {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,O&#39;tkazish uchun tanlangan ma&#39;lumotlar yo&#39;q
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Barcha manzillar.
 DocType: Company,Stock Settings,Kabinetga sozlamalari
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Birlashma faqatgina ikkita yozuvda bir xil xususiyatlar mavjud bo&#39;lganda mumkin. Guruh, Ildiz turi, Kompaniya"
 DocType: Vehicle,Electric,Elektr
 DocType: Task,% Progress,% Progress
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Aktivlarni yo&#39;qotish bo&#39;yicha daromad / yo&#39;qotish
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Aktivlarni yo&#39;qotish bo&#39;yicha daromad / yo&#39;qotish
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Faqat &quot;Tasdiqlangan&quot; maqomiga ega bo&#39;lgan talabalar arizasi quyidagi jadvalda tanlanadi.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,"{0} hisob qaydnomasi raqami mavjud emas. <br> Iltimos, Hisoblar jadvalini to'g'ri sozlang."
 DocType: Task,Depends on Tasks,Vazifalarga bog&#39;liq
@@ -3194,6 +3215,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Stoktaki emas
 DocType: Volunteer,Volunteer Skills,Ko&#39;ngilli ko&#39;nikmalar
 DocType: Appraisal,HR User,HR foydalanuvchisi
+DocType: Bank Guarantee,Reference Document Name,Namunaviy hujjat nomi
 DocType: Purchase Invoice,Taxes and Charges Deducted,Soliqlar va yig&#39;imlar kamaytirildi
 apps/erpnext/erpnext/hooks.py +142,Issues,Muammolar
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Vaziyat {0} dan biri bo&#39;lishi kerak
@@ -3207,7 +3229,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} o&#39;chirib qo&#39;yilgan
 DocType: Supplier,Billing Currency,To&#39;lov valyutasi
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Juda katta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Juda katta
+DocType: Loan,Loan Application,Kreditlash uchun ariza
 DocType: Crop,Scientific Name,Ilmiy ism
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Jami barglar
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Tanlangan kontakt saqlanganidan so&#39;ng qayta tanlansa, qayta tanlov qiling"
@@ -3216,13 +3239,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Raqamni tekshiring
 ,Sales Browser,Sotuvlar brauzeri
 DocType: Journal Entry,Total Credit,Jami kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Ogohlantirish: {0} # {1} boshqa {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Ogohlantirish: {0} # {1} boshqa {0}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Mahalliy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditlar va avanslar (aktivlar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Qarzdorlar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Katta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Katta
 DocType: Homepage Featured Product,Homepage Featured Product,Bosh sahifa Featured Mahsulot
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Barcha baholash guruhlari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Barcha baholash guruhlari
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Yangi ombor nomi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Jami {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Hudud
@@ -3243,9 +3266,10 @@
 DocType: Fees,Fees,Narxlar
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Bir valyutani boshqasiga aylantirish uchun ayirboshlash kursini tanlang
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Quotatsiya {0} bekor qilindi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Umumiy natija miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Umumiy natija miqdori
 DocType: Sales Partner,Targets,Maqsadlar
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,"Iltimos, kompaniya ma&#39;lumot faylida SIREN raqamini ro&#39;yxatdan o&#39;tkazing"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 DocType: Price List,Price List Master,Narxlar ro&#39;yxati ustasi
 DocType: GST Account,CESS Account,CESS hisob
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Barcha Sotuvdagi Jurnallarni bir nechta ** Sotuvdagi Shaxslarga ** joylashtirishingiz mumkin, shunday qilib maqsadlarni belgilashingiz va monitoring qilishingiz mumkin."
@@ -3254,6 +3278,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Kasalni tanlang
 DocType: Price List,Applicable for Countries,Davlatlar uchun amal qiladi
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Parametrning nomi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Faqat &quot;Tasdiqlangan&quot; va &quot;Rad etilgan&quot; ilovalarni qoldiring
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Isoning shogirdi guruhi nomi {0} qatorida majburiydir.
 DocType: Homepage,Products to be shown on website homepage,Veb-saytning asosiy sahifasida ko&#39;rsatiladigan mahsulotlar
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Bu ildiz mijozlar guruhidir va tahrirlanmaydi.
@@ -3285,14 +3310,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Hisob-faktura barcha hisob-kitob soatlarida yaratilgan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ism xato: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Moliya narximi?
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Xodimga ({0} davomi allaqachon belgilangan
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Xodimga ({0} davomi allaqachon belgilangan
 DocType: Packing Slip,If more than one package of the same type (for print),Agar bir xil turdagi bir nechta paketi (chop etish uchun)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Restoran sozlamalarida standart mijozni tanlang
 ,Salary Register,Ish haqi registrati
 DocType: Warehouse,Parent Warehouse,Ota-onalar
-DocType: C-Form Invoice Detail,Net Total,Net Jami
+DocType: Subscription,Net Total,Net Jami
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},{0} va Project {1} uchun standart BOM topilmadi
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Turli xil kredit turlarini aniqlang
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Turli xil kredit turlarini aniqlang
 DocType: Bin,FCFS Rate,FCFS bahosi
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Ustun miqdori
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Soat (daqiqa)
@@ -3324,11 +3349,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Ildiz hisobi guruh bo&#39;lishi kerak
 DocType: Drug Prescription,Drug Prescription,Dori retsepti
 DocType: Fees,FEE.,Fee.
-DocType: Employee Loan,Repaid/Closed,Qaytarilgan / yopiq
+DocType: Loan,Repaid/Closed,Qaytarilgan / yopiq
 DocType: Item,Total Projected Qty,Jami loyiha miqdori
 DocType: Monthly Distribution,Distribution Name,Tarqatish nomi
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} uchun buxgalter yozuvlarini kiritish uchun talab qilinadigan {0} elementi uchun baholanish darajasi topilmadi. Agar element {1} da nol qiymatni baholash darajasi elementi sifatida ishlayotgan bo&#39;lsa, iltimos, {1} Mavzu jadvalidagi buni eslatib o&#39;ting. Aks holda, mahsulot ro&#39;yxatiga kiritilgan qimmatli qog&#39;ozlar bilan bog&#39;liq bitim tuzing yoki qiymat qaydini qaydlang va keyin ushbu yozuvni taqdim etishni / bekor qilib ko&#39;ring."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 DocType: Course,Course Code,Kurs kodi
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},{0} mahsulot uchun sifat nazorati zarur
 DocType: POS Settings,Use POS in Offline Mode,Oflayn rejimida QO&#39;yi ishlatish
@@ -3348,16 +3372,15 @@
 DocType: Purchase Invoice,Deemed Export,Qabul qilingan eksport
 DocType: Stock Entry,Material Transfer for Manufacture,Ishlab chiqarish uchun material etkazib berish
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Chegirma foizlar yoki Narxlar ro&#39;yxatiga yoki barcha Narxlar ro&#39;yxatiga nisbatan qo&#39;llanilishi mumkin.
-DocType: Subscription,Half-yearly,Yarim yillik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Qimmatli qog&#39;ozlar uchun hisob yozuvi
 DocType: Lab Test,LabTest Approver,LabTest Approval
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Siz allaqachon baholash mezonlari uchun baholagansiz {}.
 DocType: Vehicle Service,Engine Oil,Motor moyi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Yaratilgan ishlar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Yaratilgan ishlar: {0}
 DocType: Sales Invoice,Sales Team1,Savdo guruhi1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,{0} elementi mavjud emas
 DocType: Sales Invoice,Customer Address,Mijozlar manzili
-DocType: Employee Loan,Loan Details,Kredit tafsilotlari
+DocType: Loan,Loan Details,Kredit tafsilotlari
 DocType: Company,Default Inventory Account,Inventarizatsiyadan hisob qaydnomasi
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Folio raqamlari mos emas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Tugallangan Miqdor noldan katta bo&#39;lishi kerak.
@@ -3369,19 +3392,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,O&#39;simliklar o&#39;sadigan barcha yer uchastkalari bilan bog&#39;lanish
 DocType: Account,Root Type,Ildiz turi
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},{0} qatori: {1} dan ortiq {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},{0} qatori: {1} dan ortiq {2}
 DocType: Item Group,Show this slideshow at the top of the page,Ushbu slayd-shouni sahifaning yuqori qismida ko&#39;rsatish
 DocType: BOM,Item UOM,UOM mahsuloti
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Chegirma miqdori bo&#39;yicha soliq summasi (Kompaniya valyutasi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Nishon ombor {0} satr uchun majburiydir.
 DocType: Cheque Print Template,Primary Settings,Asosiy sozlamalar
 DocType: Purchase Invoice,Select Supplier Address,Ta&#39;minlovchining manzilini tanlang
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Ishchilarni qo&#39;shish
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Ishchilarni qo&#39;shish
 DocType: Purchase Invoice Item,Quality Inspection,Sifatni tekshirish
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Qo&#39;shimcha kichik
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Qo&#39;shimcha kichik
 DocType: Company,Standard Template,Standart shablon
 DocType: Training Event,Theory,Nazariya
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Ogohlantirish: Kerakli ma&#39;lumot Minimum Buyurtma miqdori ostida
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Ogohlantirish: Kerakli ma&#39;lumot Minimum Buyurtma miqdori ostida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,{0} hisobi muzlatilgan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Yuridik shaxs / Tashkilotga qarashli alohida hisob-kitob rejasi bo&#39;lgan filial.
 DocType: Payment Request,Mute Email,E-pochtani o&#39;chirish
@@ -3401,11 +3424,10 @@
 DocType: SMS Log,No of Sent SMS,Yuborilgan SMS yo&#39;q
 DocType: Antibiotic,Healthcare Administrator,Sog&#39;liqni saqlash boshqaruvchisi
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Nishonni o&#39;rnating
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlash seriyasini sozlang"
 DocType: Dosage Strength,Dosage Strength,Dozalash kuchi
 DocType: Account,Expense Account,Xisob-kitobi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Dasturiy ta&#39;minot
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Rang
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Rang
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Baholashni baholash mezonlari
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Tanlangan element uchun tugatish sanasi majburiydir
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Buyurtma buyurtmalaridan saqlanish
@@ -3418,18 +3440,18 @@
 DocType: Patient,Personal and Social History,Shaxsiy va ijtimoiy tarix
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Foydalanuvchi {0} yaratildi
 DocType: Fee Schedule,Fee Breakup for each student,Har bir talaba uchun to&#39;lovni taqsimlash
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Buyurtma {1} ga nisbatan umumiy oldindan ({0}) Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Buyurtma {1} ga nisbatan umumiy oldindan ({0}) Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Oylar bo&#39;ylab maqsadlarni teng darajada taqsimlash uchun oylik tarqatish-ni tanlang.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Kodni o&#39;zgartirish
 DocType: Purchase Invoice Item,Valuation Rate,Baholash darajasi
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Narxlar ro&#39;yxati Valyutasi tanlanmagan
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Narxlar ro&#39;yxati Valyutasi tanlanmagan
 DocType: Purchase Invoice,Availed ITC Cess,Qabul qilingan ITC Cess
 ,Student Monthly Attendance Sheet,Talabalar oylik davomiyligi varaqasi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Yuk tashish qoidasi faqat Sotish uchun amal qiladi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Loyiha boshlanish sanasi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,To
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,To
 DocType: Rename Tool,Rename Log,Jurnalni qayta nomlash
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Talabalar guruhi yoki kurslar jadvali majburiydir
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Billing vaqtlarini va ish soatlarini vaqt jadvalini bilan bir xil saqlang
@@ -3449,7 +3471,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Siz sotib olgan yoki sotgan mahsulot va xizmatlarni ro&#39;yxatlang.
 DocType: Water Analysis,Storage Temperature,Saqlash harorati
 DocType: Employee Attendance Tool,Unmarked Attendance,Belgilangan tomoshabin
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Tadqiqotchi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Tadqiqotchi
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Dasturni ro&#39;yxatga olish vositasi
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Boshlanish sanasi {0} vazifasi uchun tugatish sanasidan past bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ism yoki elektron pochta manzili majburiydir
@@ -3462,7 +3484,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi hisoblagichi mavjud va bu yetkazib beruvchiga RFQ ehtiyotkorlik bilan berilishi kerak.
 DocType: Chapter,Non Profit Manager,Qor bo&#39;lmagan menedjer
 DocType: BOM,Total Cost(Company Currency),Jami xarajat (Kompaniya valyutasi)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Seriya no {0} yaratildi
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Seriya no {0} yaratildi
 DocType: Homepage,Company Description for website homepage,Veb-saytning ota-sahifasi uchun Kompaniya tavsifi
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",Xaridorlar qulayligi uchun bu kodlar Xarajatlarni va etkazib berish eslatmalari kabi bosma formatlarda qo&#39;llanilishi mumkin
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Superial nomi
@@ -3472,11 +3494,10 @@
 DocType: Employee,You can enter any date manually,Har qanday sanani qo&#39;lda kiritishingiz mumkin
 DocType: Healthcare Settings,Result Printed,Chop etilgan natija
 DocType: Asset Category Account,Depreciation Expense Account,Amortizatsiya ketadi hisob
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Sinov muddati
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},{0} ko&#39;rinishi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Sinov muddati
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Jurnal paytida faqat bargli tugunlarga ruxsat beriladi
 DocType: Project,Total Costing Amount (via Timesheets),Jami xarajat summasi (vaqt jadvallari orqali)
-DocType: Employee Advance,Expense Approver,Xarajatlarni taqsimlash
+DocType: Department,Expense Approver,Xarajatlarni taqsimlash
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Row {0}: mijozga qarshi avans kredit bo&#39;lishi kerak
 DocType: Project,Hourly,Soat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Guruh bo&#39;lmagan guruhga
@@ -3485,7 +3506,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime-ga
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Sms yetkazib berish holatini saqlab qolish uchun qaydlar
 DocType: Accounts Settings,Make Payment via Journal Entry,Jurnalga kirish orqali to&#39;lovni amalga oshiring
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,Chop etilgan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,Chop etilgan
 DocType: Item,Inspection Required before Delivery,Etkazib berishdan oldin tekshirish kerak
 DocType: Item,Inspection Required before Purchase,Sotib olishdan oldin tekshirish kerak
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kutilayotgan amallar
@@ -3495,7 +3516,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Minimal buyurtma miqdori
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Tashkilotingiz
 DocType: Fee Component,Fees Category,Narxlar toifasi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,"Iltimos, bo&#39;sh vaqtni kiriting."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,"Iltimos, bo&#39;sh vaqtni kiriting."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Xodimlarni xabardor qiling
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"So&#39;rovnomaning manbasi kampaniya bo&#39;lsa, kampaniyaning nomini kiriting"
@@ -3512,10 +3533,11 @@
 DocType: Item,Valuation Method,Baholash usuli
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Yarim kunni nishonlang
 DocType: Sales Invoice,Sales Team,Savdo guruhi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Ikki nusxadagi kirish
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Ikki nusxadagi kirish
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Foydali tomonning nomini topshirishdan oldin kiriting.
 DocType: Program Enrollment Tool,Get Students,Talabalarni oling
 DocType: Serial No,Under Warranty,Kafolat ostida
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Xato]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Xato]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Savdo buyurtmasini saqlaganingizdan so&#39;ng So&#39;zlarda paydo bo&#39;ladi.
 ,Employee Birthday,Xodimlarning tug&#39;ilgan kuni
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Tugallangan ta&#39;mirlash uchun tugagan sanani tanlang
@@ -3533,7 +3555,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Sub-shartnoma uchun ajratilgan
 DocType: Payment Reconciliation Invoice,Invoice Number,Billing raqami
 DocType: Shopping Cart Settings,Orders,Buyurtma
-DocType: Employee Leave Approver,Leave Approver,Approvatni qoldiring
+DocType: Department,Leave Approver,Approvatni qoldiring
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,"Iltimos, partiyani tanlang"
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Baholash guruhining nomi
@@ -3577,7 +3599,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Uyadan izlangan ob&#39;ekt
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL FOR RECIPIENT
 DocType: Asset Category Account,Accumulated Depreciation Account,Yig&#39;ilgan Amortisman hisobi
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Ushbu e-pochta autentifikatsiyalangan
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
 DocType: Program Enrollment,Boarding Student,Yatılı shogirdi
 DocType: Asset,Expected Value After Useful Life,Foydali hayotdan keyin kutilgan qiymat
@@ -3601,21 +3622,21 @@
 DocType: Fee Schedule Program,Total Students,Jami talabalar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},{{1}} {{0}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Amortizatsiya Aktivlarni yo&#39;qotish oqibatida yo&#39;qotilgan
-DocType: Member,Member,Ro&#39;yxatdan
+DocType: Loan,Member,Ro&#39;yxatdan
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manzillarni boshqarish
 DocType: Work Order Item,Work Order Item,Buyurtma buyurtmasi
 DocType: Pricing Rule,Item Code,Mahsulot kodi
 DocType: Serial No,Warranty / AMC Details,Kafolat / AMC tafsilotlari
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Faoliyatga asoslangan guruh uchun talabalarni qo&#39;lda tanlang
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Faoliyatga asoslangan guruh uchun talabalarni qo&#39;lda tanlang
 DocType: Journal Entry,User Remark,Foydalanuvchi eslatmasi
 DocType: Lead,Market Segment,Bozor segmenti
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Qishloq xo&#39;jalik boshqaruvchisi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},To&#39;langan pul miqdori jami salbiy ortiqcha {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},To&#39;langan pul miqdori jami salbiy ortiqcha {0}
 DocType: Supplier Scorecard Period,Variables,Argumentlar
 DocType: Employee Internal Work History,Employee Internal Work History,Xodimning ichki ish tarixi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Yakunlovchi (doktor)
 DocType: Cheque Print Template,Cheque Size,Hajmi tekshirilsin
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Serial No {0} aksiyada mavjud emas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Serial No {0} aksiyada mavjud emas
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Jurnallarni sotish uchun soliq shablonni.
 DocType: Sales Invoice,Write Off Outstanding Amount,Katta miqdorda yozing
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Hisob {0} Kompaniya bilan {1}
@@ -3623,7 +3644,6 @@
 DocType: Stock Settings,Default Stock UOM,Foydalanuvchi kabinetga UOM
 DocType: Asset,Number of Depreciations Booked,Ilova qilingan amortizatsiya miqdori
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Miqdor jami
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Xodimlarga qarzga qarshi: {0}
 DocType: Landed Cost Item,Receipt Document,Qabul hujjati
 DocType: Employee Education,School/University,Maktab / Universitet
 DocType: Payment Request,Reference Details,Ma&#39;lumotnoma ma&#39;lumotlari
@@ -3634,7 +3654,7 @@
 DocType: Asset,Double Declining Balance,Ikki marta tushgan muvozanat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Yopiq buyurtmani bekor qilish mumkin emas. Bekor qilish uchun yoping.
 DocType: Student Guardian,Father,Ota
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,&#39;Qimmatli qog&#39;ozlar yangilanishi&#39; moddiy aktivlarni sotish uchun tekshirib bo&#39;lmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,&#39;Qimmatli qog&#39;ozlar yangilanishi&#39; moddiy aktivlarni sotish uchun tekshirib bo&#39;lmaydi
 DocType: Bank Reconciliation,Bank Reconciliation,Bank bilan kelishuv
 DocType: Attendance,On Leave,Chiqishda
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Yangilanishlarni oling
@@ -3648,10 +3668,10 @@
 DocType: Lead,Lower Income,Kam daromad
 DocType: Restaurant Order Entry,Current Order,Joriy Buyurtma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Resurs va maqsadli omborlar {0} qatori uchun bir xil bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Farq Hisobi Hisob-kitobi bo&#39;lishi kerak, chunki bu fondning kelishuvi ochilish yozuvi"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Ish haqi miqdori Kredit summasidan katta bo&#39;lishi mumkin emas {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Farq Hisobi Hisob-kitobi bo&#39;lishi kerak, chunki bu fondning kelishuvi ochilish yozuvi"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Ish haqi miqdori Kredit summasidan katta bo&#39;lishi mumkin emas {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Dasturlarga o&#39;ting
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Ajratilgan miqdor {1} da&#39;vo qilinmagan miqdordan ortiq bo&#39;lmasligi mumkin {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Ajratilgan miqdor {1} da&#39;vo qilinmagan miqdordan ortiq bo&#39;lmasligi mumkin {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},{0} band uchun xaridni tartib raqami talab qilinadi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Sana&quot; kunidan keyin &quot;To Date&quot;
 DocType: Asset,Fully Depreciated,To&#39;liq Amortizatsiyalangan
@@ -3673,7 +3693,6 @@
 DocType: Payment Terms Template,Payment Terms,To&#39;lov shartlari
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Mahsulotlar buyurtmalarini quyidagi sabablarga ko&#39;ra olish mumkin:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 DocType: Purchase Invoice,Purchase Taxes and Charges,Soliqlar va yig&#39;imlar xarid qilish
 DocType: Chapter,Meetup Embed HTML,Meetup Embed HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Ta&#39;minlovchilarga boring
@@ -3690,30 +3709,32 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +60,Item Code is mandatory because Item is not automatically numbered,"Mahsulot kodi majburiydir, chunki ob&#39;ekt avtomatik ravishda raqamlangan emas"
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Xizmat jadvali
 DocType: Sales Order,%  Delivered,% Taslim bo&#39;ldi
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,"Iltimos, to&#39;lov talabnomasini yuborish uchun Talabaga Email ID-ni belgilang"
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,"Iltimos, to&#39;lov talabnomasini yuborish uchun Talabaga Email ID-ni belgilang"
 DocType: Patient,Medical History,Tibbiyot tarixi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bankning omonat hisoboti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Bankning omonat hisoboti
 DocType: Patient,Patient ID,Kasal kimligi
 DocType: Physician Schedule,Schedule Name,Jadval nomi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Ish haqini kamaytirish
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Barcha etkazib beruvchilarni qo&#39;shish
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Barcha etkazib beruvchilarni qo&#39;shish
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Ajratilgan miqdori uncha katta bo&#39;lmagan miqdordan ortiq bo&#39;lishi mumkin emas.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,BOM-ga ko&#39;z tashlang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Kafolatlangan kreditlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Kafolatlangan kreditlar
 DocType: Purchase Invoice,Edit Posting Date and Time,Kundalik sana va vaqtni tahrirlash
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Amalga oshirilgan hisob-kitoblarni {0} obyekti yoki Kompaniya {1}
 DocType: Lab Test Groups,Normal Range,Oddiy intervalli
 DocType: Academic Term,Academic Year,O&#39;quv yili
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Sotuvga tayyor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Balansni muomalaga kiritish
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Balansni muomalaga kiritish
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,Qoldik
 DocType: Appraisal,Appraisal,Baholash
+DocType: Loan,Loan Account,Kredit hisoboti
 DocType: Purchase Invoice,GST Details,GST tafsilotlari
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},{0} yetkazib beruvchiga yuborilgan elektron xat
 DocType: Item,Default Sales Unit of Measure,Standart savdo birligi o&#39;lchovi
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,O&#39;quv yil:
+DocType: Subscription,Past Due Date,O&#39;tgan muddat
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},{0} elementi uchun muqobil elementni o&#39;rnatishga ruxsat berish
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Sana takrorlanadi
@@ -3726,7 +3747,7 @@
 DocType: Patient Appointment,Patient Appointment,Bemorni tayinlash
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Ishtirokni tasdiqlash qoida sifatida qo&#39;llanilishi mumkin bo&#39;lgan rolga o&#39;xshamaydi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Ushbu e-pochta xujjatidan obunani bekor qilish
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Ta&#39;minlovchilarni qabul qiling
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Ta&#39;minlovchilarni qabul qiling
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{1} elementi uchun {0} topilmadi
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Kurslarga o&#39;ting
 DocType: Accounts Settings,Show Inclusive Tax In Print,Chop etish uchun inklyuziv soliqni ko&#39;rsating
@@ -3734,10 +3755,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Xabar yuborildi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,"Bola düğümleri bo&#39;lgan hisob, kitoblar sifatida ayarlanamaz"
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Marhamat, Ta&#39;lim bo&#39;yicha o&#39;qituvchilarni nomlash tizimini sozlash&gt; Ta&#39;lim sozlamalari"
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Narxlar ro&#39;yxati valyutasi mijozning asosiy valyutasiga aylantirildi
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Sof miqdori (Kompaniya valyutasi)
 DocType: Physician,Physician Schedules,Doktor jadvallari
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Umumiy avans miqdori jami ruxsat etilgan miqdordan ortiq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Umumiy avans miqdori jami ruxsat etilgan miqdordan ortiq bo&#39;lishi mumkin emas
 DocType: Salary Slip,Hour Rate,Soat darajasi
 DocType: Stock Settings,Item Naming By,Nomlanishi nomga ega
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Boshqa bir davrni yopish {0} {1}
@@ -3755,6 +3777,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} dan katta aktsiyalarini yangilash uchun ruxsat berilmadi
 DocType: BOM,Inspection Required,Tekshirish kerak
 DocType: Purchase Invoice Item,PR Detail,PR batafsil
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Ishlatishdan oldin bank kafolat raqamini kiriting.
 DocType: Driving License Category,Class,Sinf
 DocType: Sales Order,Fully Billed,To&#39;liq to&#39;ldirilgan
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Buyurtma Buyurtma elementini shablonga qarshi ko&#39;tarib bo&#39;lmaydi
@@ -3765,7 +3788,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketning umumiy og&#39;irligi. Odatda aniq og&#39;irlik + qadoqlash materialining og&#39;irligi. (chop etish uchun)
 DocType: Assessment Plan,Program,Dastur
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Ushbu rolga ega foydalanuvchilar muzlatilgan hisoblarni o&#39;rnatish va muzlatilgan hisoblarga qarshi buxgalter yozuvlarini yaratish / o&#39;zgartirishga ruxsat beriladi
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Marhamat, Ta&#39;lim bo&#39;yicha o&#39;qituvchilarni nomlash tizimini sozlash&gt; Ta&#39;lim sozlamalari"
 DocType: Serial No,Is Cancelled,Bekor qilinadi
 DocType: Student Group,Group Based On,Guruh asoslangan
 DocType: Journal Entry,Bill Date,Bill tarixi
@@ -3776,9 +3798,10 @@
 DocType: Cheque Print Template,Cheque Height,Balandligini tekshiring
 DocType: Supplier,Supplier Details,Yetkazib beruvchi ma&#39;lumotlari
 DocType: Setup Progress,Setup Progress,O&#39;rnatish jarayoni
+DocType: Expense Claim,Approval Status,Tasdiqlash maqomi
 DocType: Hub Settings,Publish Items to Hub,Uyalarga nashr qilish
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Qiymatdan {0} qatorda qiymatdan kam bo&#39;lishi kerak
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Telegraf ko&#39;chirmasi
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Telegraf ko&#39;chirmasi
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Barchasini tekshiring
 ,Issued Items Against Work Order,Ishga qarshi buyruqlar chiqarilgan buyumlar
 DocType: Vehicle Log,Invoice Ref,Faktura
@@ -3809,12 +3832,11 @@
 DocType: Customs Tariff Number,Tariff Number,Tarif raqami
 DocType: Work Order Item,Available Qty at WIP Warehouse,WIP omborxonasida mavjud Miqdor
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Loyihalashtirilgan
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},No {0} seriyali Warehouse {1} ga tegishli emas
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},No {0} seriyali Warehouse {1} ga tegishli emas
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Izoh: tizim {0} mahsulotiga ortiqcha yoki miqdor miqdori 0 bo&#39;lgani uchun ortiqcha yetkazib berishni va ortiqcha arizani tekshirmaydi
 DocType: Notification Control,Quotation Message,Iqtibos Xabar
-DocType: Employee Loan,Employee Loan Application,Xodimlarning qarz olish
 DocType: Issue,Opening Date,Ochilish tarixi
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,"Iltimos, avvalo kasalni saqlang"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,"Iltimos, avvalo kasalni saqlang"
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Ishtirok etish muvaffaqiyatli o&#39;tdi.
 DocType: Program Enrollment,Public Transport,Jamoat transporti
 DocType: Soil Texture,Silt Composition (%),Shiling tarkibi (%)
@@ -3832,7 +3854,7 @@
 ,Item Balance (Simple),Mavzu balansi (oddiy)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Yetkazuvchilar tomonidan ko&#39;tarilgan qonun loyihalari.
 DocType: POS Profile,Write Off Account,Hisobni yozing
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Debet-Not Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Debet-Not Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Chegirma miqdori
 DocType: Purchase Invoice,Return Against Purchase Invoice,Xarajatlarni sotib olishdan voz kechish
 DocType: Item,Warranty Period (in days),Kafolat muddati (kunlar)
@@ -3855,6 +3877,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Savdo Buyurtma sanasi
 DocType: Sales Invoice Item,Delivered Qty,Miqdori topshirilgan
 DocType: Assessment Plan,Assessment Plan,Baholash rejasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Jurnalga teskari qaytish
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Xaridor {0} yaratildi.
 DocType: Stock Settings,Limit Percent,Limit ulushi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hozirda biron-bir omborda stok yo&#39;q
@@ -3868,14 +3891,15 @@
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,To&#39;lov zikr qilish
 DocType: C-Form,C-FORM-,C-FORM-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Interval maydonidagi intervallar soni, masalan, Interval - &quot;Kun&quot; va Billing Interval Count - 3 bo&#39;lsa, faktura har 3 kunda"
 DocType: Vehicle,Insurance Details,Sug&#39;urta detallari
 DocType: Account,Payable,To&#39;lanishi kerak
 DocType: Share Balance,Share Type,Share toifa
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,To&#39;lov muddatlarini kiriting
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,To&#39;lov muddatlarini kiriting
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Qarzdorlar ({0})
 DocType: Pricing Rule,Margin,Marjin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yangi mijozlar
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Yalpi foyda %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Yalpi foyda %
 DocType: Appraisal Goal,Weightage (%),Og&#39;irligi (%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,POS profilini o&#39;zgartirish
 DocType: Bank Reconciliation Detail,Clearance Date,Bo&#39;shatish sanasi
@@ -3885,10 +3909,11 @@
 DocType: Lead,Address Desc,Manzil raq
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Partiya majburiydir
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Boshqa qatorlardagi takroriy sanalarni ko&#39;rsatadigan qatorlar topildi: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Boshqa qatorlardagi takroriy sanalarni ko&#39;rsatadigan qatorlar topildi: {list}
 DocType: Topic,Topic Name,Mavzu nomi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Chiqish sozlamalarida tasdiqlashni tasdiqlash xabarnomasi uchun standart shablonni o&#39;rnating.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Eng ko&#39;p sotilgan yoki sotilgan mahsulotlardan biri tanlangan bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Xodimni oldindan olish uchun xodimni tanlang.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Xodimni oldindan olish uchun xodimni tanlang.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,"Iltimos, to&#39;g&#39;ri Sana tanlang"
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Biznesingizning xususiyatini tanlang.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3907,7 +3932,7 @@
 DocType: Asset Movement,Source Warehouse,Resurs ombori
 DocType: Installation Note,Installation Date,O&#39;rnatish sanasi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledgerni ulashing
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},{0} qator: Asset {1} kompaniyaga tegishli emas {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},{0} qator: Asset {1} kompaniyaga tegishli emas {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Savdo shaxsi {0} yaratildi
 DocType: Employee,Confirmation Date,Tasdiqlash sanasi
 DocType: C-Form,Total Invoiced Amount,Umumiy hisobdagi mablag &#39;
@@ -3916,7 +3941,7 @@
 DocType: Account,Accumulated Depreciation,Yig&#39;ilgan Amortizatsiya
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Doimiy ism
 DocType: Stock Entry,Customer or Supplier Details,Xaridor yoki yetkazib beruvchi ma&#39;lumotlari
-DocType: Employee Loan Application,Required by Date,Sana bo&#39;yicha talab qilinadi
+DocType: Loan Application,Required by Date,Sana bo&#39;yicha talab qilinadi
 DocType: Lead,Lead Owner,Qurilish egasi
 DocType: Production Plan,Sales Orders Detail,Savdo buyurtma detali
 DocType: Bin,Requested Quantity,Kerakli miqdor
@@ -3929,10 +3954,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brüt to&#39;lash - Jami cheklov - Kreditni qaytarish
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,Joriy BOM va yangi BOM bir xil bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,Ish haqi miqdori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Pensiya tarixi sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Pensiya tarixi sanasi qo&#39;shilish sanasidan katta bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Bir nechta varianti
 DocType: Sales Invoice,Against Income Account,Daromad hisobiga qarshi
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% taslim etildi
+DocType: Subscription,Trial Period Start Date,Sinov davri boshlanishi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,{0} elementi: Buyurtma berilgan qty {1} minimal buyurtma miqdordan kam {2} dan kam bo&#39;lmasligi kerak.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Oylik tarqatish foizi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Iltimos boshqa foydalanuvchi sifatida kiring.
@@ -3953,12 +3979,11 @@
 DocType: Student Guardian,Student Guardian,Talaba himoyachisi
 DocType: Member,Member Name,Ro&#39;yxatdan nomi
 DocType: Stock Settings,Use Naming Series,Naming seriyasidan foydalaning
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Baholashning turi to&#39;lovlari inklyuziv sifatida belgilanishi mumkin emas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Baholashning turi to&#39;lovlari inklyuziv sifatida belgilanishi mumkin emas
 DocType: POS Profile,Update Stock,Stokni yangilang
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,obunada
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ma&#39;lumotlar uchun turli UOM noto&#39;g&#39;ri (Total) Net Og&#39;irligi qiymatiga olib keladi. Har bir elementning aniq vazniga bir xil UOM ichida ekanligiga ishonch hosil qiling.
 DocType: Membership,Payment Details,To&#39;lov ma&#39;lumoti
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM darajasi
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM darajasi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","To&#39;xtatilgan ish tartibi bekor qilinishi mumkin emas, bekor qilish uchun avval uni to&#39;xtatib turish"
 DocType: Asset,Journal Entry for Scrap,Hurda uchun jurnalni kiritish
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Iltimos, mahsulotni etkazib berish Eslatma"
@@ -3978,6 +4003,7 @@
 DocType: Land Unit,Land Unit,Er uchastkasi
 ,Purchase Analytics,Analytics xarid qiling
 DocType: Sales Invoice Item,Delivery Note Item,Yetkazib berish eslatmasi elementi
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Joriy {0} hisob-kitobi yo&#39;q
 DocType: Asset Maintenance Log,Task,Vazifa
 DocType: Purchase Taxes and Charges,Reference Row #,Yo&#39;naltirilgan satr #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partiya raqami {0} element uchun majburiydir.
@@ -3989,7 +4015,7 @@
 DocType: Company,Exchange Gain / Loss Account,Birgalikdagi daromad / yo&#39;qotish hisobi
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Xodimlar va qatnashish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Maqsad {0} dan biri bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Shaklni to&#39;ldiring va uni saqlang
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Shaklni to&#39;ldiring va uni saqlang
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Jamoa forumi
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Aksiyada haqiqiy miqdor
 DocType: Homepage,"URL for ""All Products""",&quot;Barcha mahsulotlar&quot; uchun URL
@@ -4003,7 +4029,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Standart sotish bahosi
 DocType: Account,Rate at which this tax is applied,Ushbu soliq qo&#39;llaniladigan stavka
 DocType: Cash Flow Mapper,Section Name,Bo&#39;lim nomi
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Miqdorni qayta tartiblashtirish
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Miqdorni qayta tartiblashtirish
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Joriy ish o&#39;rinlari
 DocType: Company,Stock Adjustment Account,Qimmatli qog&#39;ozlarni tartibga solish hisobi
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Hisobdan o&#39;chirish
@@ -4014,9 +4040,9 @@
 DocType: Task,depends_on,ga bog&#39;liq
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Barcha materiallar materiallarida eng so&#39;nggi narxni yangilash uchun navbatda turdi. Bir necha daqiqa o&#39;tishi mumkin.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Yangi hisob nomi. Eslatma: Iltimos, mijozlar va etkazib beruvchilar uchun hisoblar yarating"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country wise wise manzili Shablonlar
 DocType: Water Analysis,Appearance,Tashqi ko&#39;rinishi
+DocType: HR Settings,Leave Status Notification Template,Vaziyat bayonnomasi shablonini qoldiring
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Ort Sotib olish narxlarining ro&#39;yxati
 DocType: Sales Order Item,Supplier delivers to Customer,Yetkazib beruvchi xaridorga yetkazib beradi
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Ro&#39;yxatdan ma&#39;lumotlari.
@@ -4039,7 +4065,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Ruxsat berilmaydi. Viktorina jadvalini o&#39;chirib qo&#39;ying
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Foizlarni taqsimlash 100%
 DocType: Crop Cycle,Linked Land Unit,Bog&#39;langan er uchastkasi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Tomonni tanlashdan oldin sanasi sanasini tanlang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Tomonni tanlashdan oldin sanasi sanasini tanlang
 DocType: Program Enrollment,School House,Maktab uyi
 DocType: Serial No,Out of AMC,AMCdan tashqarida
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Qayd qilingan amortizatsiya miqdori jami Amortizatsiya miqdoridan ko&#39;p bo&#39;lishi mumkin emas
@@ -4055,7 +4081,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Foydalanuvchilarga o&#39;ting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,To&#39;langan pul miqdori + Write Off To&#39;lov miqdori Grand Totaldan katta bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} {1} element uchun haqiqiy partiya raqami emas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Izoh: Tovar {0} uchun qoldirilgan muvozanat etarli emas.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Izoh: Tovar {0} uchun qoldirilgan muvozanat etarli emas.
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,GSTIN noto&#39;g&#39;ri yoki ro&#39;yxatdan o&#39;tish uchun NA kiriting
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Dasturni ro&#39;yxatga olish uchun to&#39;lov
@@ -4071,14 +4097,14 @@
 DocType: Hub Settings,Publish Availability,Mavjudligi e&#39;lon qiling
 DocType: Company,Create Chart Of Accounts Based On,Hisoblar jadvalini tuzish
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Guruhni guruhga o&#39;tkazib bo&#39;lmadi. Bola vazifalari mavjud.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Tug&#39;ilgan sanasi bugungi kunda katta bo&#39;lmasligi mumkin.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Tug&#39;ilgan sanasi bugungi kunda katta bo&#39;lmasligi mumkin.
 ,Stock Ageing,Qarshi qarish
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Isoning shogirdi {0} talaba arizachiga nisbatan {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Dumaloq tuzatish (Kompaniya valyutasi)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Vaqt jadvallari
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partiya:
 DocType: Volunteer,Afternoon,Kunduzi
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} &#39;{1}&#39; o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} &#39;{1}&#39; o&#39;chirib qo&#39;yilgan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ochiq qilib belgilang
 DocType: Cheque Print Template,Scanned Cheque,Skaner qilingan tekshiruv
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Jurnallarni yuborish haqida Kontaktlar ga avtomatik elektron pochta xabarlarini yuboring.
@@ -4094,7 +4120,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,{0} loyihasi allaqachon mavjud
 DocType: Medical Department,Nursing User,Hemşirelik Foydalanuvchi bilan
 DocType: Plant Analysis,Plant Analysis Criterias,O&#39;simliklarni tahlil qilish mezonlari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Mas&#39;uliyat
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},No {0} ketma-ketligi {1} guruhiga tegishli emas
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Mas&#39;uliyat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ushbu tirnoqning amal qilish muddati tugadi.
 DocType: Expense Claim Account,Expense Claim Account,Xarajat shikoyati qaydnomasi
 DocType: Accounts Settings,Allow Stale Exchange Rates,Sovuq valyuta kurslariga ruxsat berish
@@ -4116,11 +4143,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Variantlarni tanlang
 DocType: Item,Default BOM,Standart BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),Jami to&#39;lov miqdori (Savdo shkaflari orqali)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,Debet qaydnomasi miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,Debet qaydnomasi miqdori
 DocType: Project Update,Not Updated,Yangilangan emas
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Hisoblangan foizlar miqdori, aktsiyalar soni va hisoblangan miqdorlar o&#39;rtasidagi ziddiyatlar mavjud"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,"Iltimos, tasdiqlash uchun kompaniya nomini qayta kiriting"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Umumiy qarzdor
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Umumiy qarzdor
 DocType: Journal Entry,Printing Settings,Chop etish sozlamalari
 DocType: Employee Advance,Advance Account,Advance hisob
 DocType: Job Offer,Job Offer Terms,Ish taklifi shartlari
@@ -4129,7 +4156,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Avto
 DocType: Vehicle,Insurance Company,Sug&#39;urta kompaniyasi
 DocType: Asset Category Account,Fixed Asset Account,Ruxsat etilgan aktivlar hisobi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,Argumentlar
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,Argumentlar
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Etkazib berish eslatmasidan
 DocType: Chapter,Members,A&#39;zolar
 DocType: Student,Student Email Address,Isoning shogirdi elektron pochta manzili
@@ -4152,7 +4179,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Stajyer
 DocType: Delivery Stop,Address Name,Manzil nomi
 DocType: Stock Entry,From BOM,BOM&#39;dan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},{1} {0} qismini ajratish
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},{1} {0} qismini ajratish
 DocType: Assessment Code,Assessment Code,Baholash kodi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Asosiy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} dan oldin birja bitimlari muzlatilgan
@@ -4160,25 +4187,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Malumot sanasi kiritilgan bo&#39;lsa, Yo&#39;naltiruvchi raqami majburiy emas"
 DocType: Bank Reconciliation Detail,Payment Document,To&#39;lov hujjati
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Me&#39;riy formulani baholashda xato
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Kiritilgan sana Tug&#39;ilgan kundan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Kiritilgan sana Tug&#39;ilgan kundan katta bo&#39;lishi kerak
+DocType: Subscription,Plans,Rejalar
 DocType: Salary Slip,Salary Structure,Ish haqi tuzilishi
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aviakompaniya
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Muammo materiallari
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Ikki nusxadagi yaratish paytida xatolik yuz berdi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Muammo materiallari
 DocType: Material Request Item,For Warehouse,QXI uchun
 DocType: Employee,Offer Date,Taklif sanasi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Qo&#39;shtirnoq
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Siz oflayn rejasiz. Tarmoqqa ega bo&#39;lguncha qayta yuklay olmaysiz.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Hech qanday talabalar guruhi yaratilmagan.
 DocType: Purchase Invoice Item,Serial No,Serial №
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Oylik qaytarib beriladigan pul miqdori Kredit miqdoridan kattaroq bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,Oylik qaytarib beriladigan pul miqdori Kredit miqdoridan kattaroq bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Iltimos, birinchi navbatda Tafsilotlarni kiriting"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Kutilayotgan etkazib berish sanasi Buyurtma tarixidan oldin bo&#39;lishi mumkin emas
 DocType: Purchase Invoice,Print Language,Chop etish tili
 DocType: Salary Slip,Total Working Hours,Umumiy ish vaqti
 DocType: Sales Invoice,Customer PO Details,Xaridor po ma&#39;lumotlari
-DocType: Subscription,Next Schedule Date,Keyingi Jadval tarixi
 DocType: Stock Entry,Including items for sub assemblies,Sub assemblies uchun elementlarni o&#39;z ichiga oladi
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Vaqtinchalik ochilish hisobi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Qiymatni kiritish ijobiy bo&#39;lishi kerak
@@ -4206,11 +4232,11 @@
 DocType: Issue,Opening Time,Vaqtni ochish
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,Kerakli kunlardan boshlab
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Qimmatli qog&#39;ozlar va BUyuMLAR birjalari
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',&#39;{0}&#39; variantining standart o&#39;lchov birligi &#39;{1}&#39; shablonidagi kabi bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',&#39;{0}&#39; variantining standart o&#39;lchov birligi &#39;{1}&#39; shablonidagi kabi bo&#39;lishi kerak
 DocType: Shipping Rule,Calculate Based On,Oddiy qiymatni hisoblash
 DocType: Delivery Note Item,From Warehouse,QXIdan
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ko&#39;rsatilgan mezonlarga xodimlar yo&#39;q
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo&#39;q
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo&#39;q
 DocType: Hotel Settings,Default Customer,Standart mijoz
 DocType: Assessment Plan,Supervisor Name,Boshqaruvchi nomi
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Xuddi shu kuni Uchrashuvni tashkil etganligini tasdiqlamang
@@ -4234,16 +4260,16 @@
 DocType: Journal Entry Account,Employee Advance,Ishchi Advance
 DocType: Payroll Entry,Payroll Frequency,Bordro chastotasi
 DocType: Lab Test Template,Sensitivity,Ta&#39;sirchanlik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Xom ashyo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Xom ashyo
 DocType: Leave Application,Follow via Email,Elektron pochta orqali qiling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,O&#39;simliklar va mashinalari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,O&#39;simliklar va mashinalari
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Chegirma summasi bo&#39;yicha soliq summasi
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Kundalik ish sarlavhalari sozlamalari
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Iltimos sanasi bo&#39;yicha Reqd kiriting
 DocType: Payment Entry,Internal Transfer,Ichki pul o&#39;tkazish
 DocType: Asset Maintenance,Maintenance Tasks,Xizmat vazifalari
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nishon miqdor yoki maqsad miqdori majburiydir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,"Marhamat, birinchi marta o&#39;tilganlik sanasi tanlang"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,"Marhamat, birinchi marta o&#39;tilganlik sanasi tanlang"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Ochilish sanasi tugash sanasidan oldin bo&#39;lishi kerak
 DocType: Leave Control Panel,Carry Forward,Oldinga boring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Amalga oshirilgan operatsiyalarni bajarish uchun xarajatlar markaziy hisob kitobiga o&#39;tkazilmaydi
@@ -4251,13 +4277,14 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext integratsiyasi
 DocType: Crop Cycle,Detected Disease,Yuqumli kasalliklar
 ,Produced,Ishlab chiqarilgan
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,To&#39;lov boshlanish sanasi to&#39;lov kunidan oldin bo&#39;lishi mumkin emas.
 DocType: Item,Item Code for Suppliers,Ta&#39;minlovchilar uchun mahsulot kodi
 DocType: Issue,Raised By (Email),Qabul qilingan (Email)
 DocType: Training Event,Trainer Name,Trainer nomi
 DocType: Mode of Payment,General,Umumiy
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Oxirgi muloqot
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',&quot;Baholash&quot; yoki &quot;Baholash va jami&quot;
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Serileştirilmiş Mahsulot uchun Serial Nos kerak {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',&quot;Baholash&quot; yoki &quot;Baholash va jami&quot;
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Serileştirilmiş Mahsulot uchun Serial Nos kerak {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Xarajatlarni hisob-kitob qilish
 DocType: Journal Entry,Bank Entry,Bank kartasi
 DocType: Authorization Rule,Applicable To (Designation),Qo&#39;llanishi mumkin (belgilash)
@@ -4271,7 +4298,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Pullarni yoqish / o&#39;chirish.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Yarim kunlik doktor {0} {1} da qoldiring
 DocType: Production Plan,Get Material Request,Moddiy talablarni oling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Pochta xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Pochta xarajatlari
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jami (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,O&#39;yin-kulgi va hordiq
 ,Item Variant Details,Mavzu variantlari tafsilotlari
@@ -4282,9 +4309,9 @@
 DocType: Drug Prescription,Hour,Soat
 DocType: Restaurant Order Entry,Last Sales Invoice,Oxirgi Sotuvdagi Billing
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},"Iltimos, {0} elementiga qarshi Qty ni tanlang"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Yangi seriyali yo&#39;q, QXK bo&#39;lishi mumkin emas. QXI kabinetga kirish yoki Xarid qilish Qabulnomasi bilan o&#39;rnatilishi kerak"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Yangi seriyali yo&#39;q, QXK bo&#39;lishi mumkin emas. QXI kabinetga kirish yoki Xarid qilish Qabulnomasi bilan o&#39;rnatilishi kerak"
 DocType: Lead,Lead Type,Qo&#39;rg&#39;oshin turi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Siz bloklangan sana bo&#39;yicha barglarni tasdiqlash uchun vakolatga ega emassiz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Siz bloklangan sana bo&#39;yicha barglarni tasdiqlash uchun vakolatga ega emassiz
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Bu barcha narsalar allaqachon faturalanmıştı
 DocType: Company,Monthly Sales Target,Oylik Sotuvdagi Nishon
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tomonidan tasdiqlangan bo&#39;lishi mumkin
@@ -4292,7 +4319,7 @@
 DocType: Item,Default Material Request Type,Standart material talabi turi
 DocType: Supplier Scorecard,Evaluation Period,Baholash davri
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,Noma&#39;lum
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Ish tartibi yaratilmadi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Ish tartibi yaratilmadi
 DocType: Shipping Rule,Shipping Rule Conditions,Yuk tashish qoida shartlari
 DocType: Purchase Invoice,Export Type,Eksport turi
 DocType: Salary Slip Loan,Salary Slip Loan,Ish haqi pul mablag&#39;lari
@@ -4308,7 +4335,7 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Xarajatlarni qisqacha tavsifi
 DocType: Education Settings,Education Manager,Ta&#39;lim menejeri
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Tegishli o&#39;sish uchun har bir o&#39;simlikning minimal uzunligi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kiyinilgan {0} mahsulotini kabinetga kelishuvidan foydalanib yangilash mumkin emas, buning o&#39;rniga kabinetga kirishini ishlatish"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Kiyinilgan {0} mahsulotini kabinetga kelishuvidan foydalanib yangilash mumkin emas, buning o&#39;rniga kabinetga kirishini ishlatish"
 DocType: Quality Inspection,Report Date,Hisobot sanasi
 DocType: Student,Middle Name,Otasini ismi
 DocType: C-Form,Invoices,Xarajatlar
@@ -4339,19 +4366,20 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pochta manzili noyob bo&#39;lishi kerak, {0} uchun allaqachon mavjud"
 DocType: Serial No,AMC Expiry Date,AMC tugash sanasi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Qabul qilish
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Qabul qilish
 ,Sales Register,Savdo registri
 DocType: Daily Work Summary Group,Send Emails At,Elektron pochta xabarlarini yuborish
 DocType: Quotation,Quotation Lost Reason,Iqtibos yo&#39;qolgan sabab
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tahrir qilish uchun hech narsa yo&#39;q.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Formasi ko&#39;rinishi
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Xarajatlarni majburiy hisobga olishda tasdiqlash
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Bu oy uchun xulosa va kutilayotgan tadbirlar
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",Foydalanuvchilarni o&#39;zingizning tashkilotingizdan tashqari tashkilotga qo&#39;shing.
 DocType: Customer Group,Customer Group Name,Mijozlar guruhi nomi
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Hozir mijozlar yo&#39;q!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naqd pul oqimlari bayonoti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Hech qanday material talabi yaratilmagan
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredit summasi {0} maksimum kredit summasidan oshib ketmasligi kerak.
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredit summasi {0} maksimum kredit summasidan oshib ketmasligi kerak.
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Litsenziya
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Agar avvalgi moliyaviy yil balanslarini ushbu moliyaviy yilga qo&#39;shishni xohlasangiz, iltimos, Tashkillashtirishni tanlang"
 DocType: GL Entry,Against Voucher Type,Voucher turiga qarshi
@@ -4373,11 +4401,12 @@
 DocType: Vehicle,Chassis No,Yo&#39;lak No
 DocType: Payment Request,Initiated,Boshlandi
 DocType: Production Plan Item,Planned Start Date,Rejalashtirilgan boshlanish sanasi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,"Iltimos, BOM-ni tanlang"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,"Iltimos, BOM-ni tanlang"
 DocType: Purchase Invoice,Availed ITC Integrated Tax,ITC Integrated Tax solingan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
+DocType: Bank Guarantee,Clauses and Conditions,Maqolalar va shartlar
 DocType: Serial No,Creation Document Type,Hujjatning tuzilishi
 DocType: Project Task,View Timesheet,Vaqt jadvalini ko&#39;rish
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Tugash sanasi boshlanish sanasidan katta bo&#39;lishi kerak
 DocType: Leave Type,Is Encash,Encashmi?
 DocType: Leave Allocation,New Leaves Allocated,Yangi barglar ajratildi
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Loyiha bo&#39;yicha ma&#39;lumot quyish uchun mavjud emas
@@ -4391,9 +4420,10 @@
 DocType: Patient,Alcohol Current Use,Spirtli ichimliklarni ishlatish
 DocType: Student Admission Program,Student Admission Program,Talabalarni qabul qilish dasturi
 DocType: Payment Entry,Account Paid To,Hisoblangan pul
+DocType: Subscription Settings,Grace Period,Imtiyozli davr
 DocType: Item Alternative,Alternative Item Name,Shu bilan bir qatorda Mahsulot nomi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,{0} Ota-ona element Stock kabinetga bo&#39;lishi shart emas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Hech qanday haq to'lashni taqdim eta olmadim <br> \ Mumkin sabablar: <br> \ 1. Net ish haqi 0 dan kam. <br> \ 2. Kompaniya xodimi ko'rsatilgan elektron pochta manzili haqiqiy emas. <br>
@@ -4403,7 +4433,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} {1} {2} {3} ga qarshi hisob qaydnomasi {4}. {5} dan oshib ketadi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Hisob turi &quot;Ruxsat etilgan obyekt&quot; turi bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Miqdori
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,va unchcked o&#39;chirilgan
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Seriya majburiy
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Moliyaviy xizmatlar
 DocType: Student Sibling,Student ID,Isoning shogirdi kimligi
@@ -4415,13 +4444,15 @@
 DocType: Complaint,Complaint,Shikoyat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
 DocType: Leave Allocation,Unused leaves,Foydalanilmagan barglar
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,To&#39;lovni to&#39;lashni amalga oshiring
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Barcha bo&#39;limlar
 DocType: Patient,Alcohol Past Use,Spirtli ichimliklarni o&#39;tmishda ishlatish
 DocType: Fertilizer Content,Fertilizer Content,Go&#39;ng tarkibi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Muammoli / Stuck
 DocType: Tax Rule,Billing State,Billing davlati
 DocType: Share Transfer,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),"Fetch portlash qilingan BOM (sub-assemblies, shu jumladan)"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),"Fetch portlash qilingan BOM (sub-assemblies, shu jumladan)"
 DocType: Authorization Rule,Applicable To (Employee),Qo&#39;llanilishi mumkin (xodim)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,To&#39;lov sanasi majburiydir
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,{0} xususiyati uchun ortish 0 bo&#39;lishi mumkin emas
@@ -4445,10 +4476,11 @@
 DocType: Cheque Print Template,Message to show,Ko&#39;rsatiladigan xabar
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Chakana savdo
 DocType: Student Attendance,Absent,Yo&#39;q
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Mahsulot to&#39;plami
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Mahsulot to&#39;plami
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,{0} da boshlangan balni topib bo&#39;lmadi. Siz 0 dan 100 gacha bo&#39;lgan sog&#39;lom balllarga ega bo&#39;lishingiz kerak
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: yaroqsiz ma&#39;lumot {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Xarajatlar va to&#39;lovlar shablonini sotib oling
+DocType: Subscription,Current Invoice Start Date,Joriy Billing Boshlash sanasi
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},"{0} {1}: {2} uchun, debet yoki kredit summasi talab qilinadi"
 DocType: GL Entry,Remarks,Izohlar
@@ -4458,11 +4490,13 @@
 DocType: Task,Parent Task,Ota-ona vazifasi
 DocType: Journal Entry,Write Off Based On,Yopiq asosida yozish
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Qo&#39;rg&#39;oshin bo&#39;ling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Chop etish va ish yuritish
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,Chop etish va ish yuritish
 DocType: Stock Settings,Show Barcode Field,Barcode maydonini ko&#39;rsatish
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Yetkazib beruvchi elektron pochta xabarlarini yuborish
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","{0} va {1} oralig&#39;idagi davrda allaqachon ishlov berilgan ish haqi, ushbu muddat oralig&#39;ida ariza berish muddati qoldirilmasligi kerak."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Yetkazib beruvchi elektron pochta xabarlarini yuborish
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","{0} va {1} oralig&#39;idagi davrda allaqachon ishlov berilgan ish haqi, ushbu muddat oralig&#39;ida ariza berish muddati qoldirilmasligi kerak."
+DocType: Fiscal Year,Auto Created,Avtomatik yaratildi
 DocType: Chapter Member,Leave Reason,Reasonni qoldiring
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Faktura {0} endi yo&#39;q
 DocType: Guardian Interest,Guardian Interest,Guardian qiziqishi
 DocType: Volunteer,Availability,Mavjudligi
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,POS hisob-fakturalarida standart qiymatlarni sozlash
@@ -4470,13 +4504,12 @@
 DocType: Project,Time to send,Yuborish vaqti
 DocType: Timesheet,Employee Detail,Xodimlar haqida batafsil
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 Email identifikatori
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Keyingi kunning kuni va oyning takroriy kuni teng bo&#39;lishi kerak
 DocType: Lab Prescription,Test Code,Sinov kodi
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Veb-sayt bosh sahifasining sozlamalari
 DocType: Job Offer,Awaiting Response,Javobni kutish
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Yuqorida
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Jami miqdori {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},{0} {1} atributi noto&#39;g&#39;ri
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Jami miqdori {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},{0} {1} atributi noto&#39;g&#39;ri
 DocType: Supplier,Mention if non-standard payable account,Nodavlat to&#39;lanadigan hisob qaydnomasini qayd etish
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',"Iltimos, barcha baholash guruhlaridan boshqa baholash guruhini tanlang."
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: xarajat markazi {1}
@@ -4487,7 +4520,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Suvni tahlil qilish
 DocType: Chapter,Region,Mintaqa
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Majburiy emas. Ushbu parametr turli operatsiyalarda filtrlash uchun ishlatiladi.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Salbiy baholash darajasi ruxsat etilmaydi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Salbiy baholash darajasi ruxsat etilmaydi
 DocType: Holiday List,Weekly Off,Haftalik yopiq
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Bog&#39;langan tahlilni qayta tiklash
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Masalan, 2012, 2012-13 yy"
@@ -4503,7 +4536,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Chiqib ketgan aktivlarning qiymati
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: narxlari markazi {2}
 DocType: Vehicle,Policy No,Siyosat No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Mahsulot paketidagi narsalarni oling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Mahsulot paketidagi narsalarni oling
 DocType: Asset,Straight Line,To&#39;g&#39;ri chiziq
 DocType: Project User,Project User,Loyiha foydalanuvchisi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Split
@@ -4539,21 +4572,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Yo&#39;l
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Xarajatli markazni kitob nusxa ko&#39;chirish qurilmasiga aylantira olmaysiz, chunki u tugmachalarga ega"
 DocType: Production Plan,Total Planned Qty,Jami rejalashtirilgan miqdori
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Ochilish qiymati
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Ochilish qiymati
 DocType: Salary Detail,Formula,Formulalar
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Seriya #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seriya #
 DocType: Lab Test Template,Lab Test Template,Laboratoriya viktorina namunasi
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Savdo hisobi
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Savdo hisobi
 DocType: Purchase Invoice Item,Total Weight,Jami Og&#39;irligi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Savdo bo&#39;yicha komissiya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Savdo bo&#39;yicha komissiya
 DocType: Job Offer Term,Value / Description,Qiymati / ta&#39;rifi
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# {0} qatori: Asset {1} yuborib bo&#39;lolmaydi, allaqachon {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# {0} qatori: Asset {1} yuborib bo&#39;lolmaydi, allaqachon {2}"
 DocType: Tax Rule,Billing Country,Billing davlati
 DocType: Purchase Order Item,Expected Delivery Date,Kutilayotgan etkazib berish sanasi
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran Buyurtma yozuvi
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet va kredit {0} # {1} uchun teng emas. Farqi {2} dir.
 DocType: Asset Maintenance Task,Assign To Name,Ismni belgilash
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,O&#39;yin xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,O&#39;yin xarajatlari
 DocType: Hub Settings,Enabled Users,Faol foydalanuvchilar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Materiallar talabini bajarish
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},{0} bandini ochish
@@ -4566,24 +4599,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Dam olish uchun arizalar.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Mavjud amal bilan hisob o&#39;chirilmaydi
 DocType: Vehicle,Last Carbon Check,Oxirgi Karbon nazorati
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Huquqiy xarajatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Huquqiy xarajatlar
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,"Iltimos, qatordagi miqdorni tanlang"
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Savdo va Xaridlar Xarajatlarni ochish
 DocType: Purchase Invoice,Posting Time,Vaqtni yuborish vaqti
 DocType: Timesheet,% Amount Billed,% To&#39;lov miqdori
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Telefon xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Telefon xarajatlari
 DocType: Sales Partner,Logo,Asosiy
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Foydalanuvchini saqlashdan oldin bir qatorni tanlashga majburlashni xohlasangiz, buni tekshiring. Buni tekshirsangiz, hech qanday ko&#39;rsatuv bo&#39;lmaydi."
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Hech narsa Serialli yo&#39;q {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Hech narsa Serialli yo&#39;q {0}
 DocType: Email Digest,Open Notifications,Bildirishnomalarni oching
 DocType: Payment Entry,Difference Amount (Company Currency),Ajratilgan mablag&#39;lar (Kompaniya valyutasi)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,To&#39;g&#39;ridan-to&#39;g&#39;ri xarajatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,To&#39;g&#39;ridan-to&#39;g&#39;ri xarajatlar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Yangi xaridorlar daromadi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Sayohat xarajatlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Sayohat xarajatlari
 DocType: Maintenance Visit,Breakdown,Buzilmoq
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},{0} doctype dagi maxsus maydon obunani qo&#39;shish
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Hisob: {0} valyutaga: {1} tanlanmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Hisob: {0} valyutaga: {1} tanlanmaydi
 DocType: Purchase Receipt Item,Sample Quantity,Namuna miqdori
+DocType: Bank Guarantee,Name of Beneficiary,Benefisiarning nomi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Tez-tez yangilanadigan narxlarni / narx ro&#39;yxatining nisbati / xom ashyoning so&#39;nggi sotib olish nisbati asosida Scheduler orqali BOM narxini avtomatik ravishda yangilang.
 DocType: Bank Reconciliation Detail,Cheque Date,Tekshirish sanasi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Hisob {0}: Ota-hisob {1} kompaniyaga tegishli emas: {2}
@@ -4595,14 +4628,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Sinov
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Ish haqi komponentlari
 DocType: Program Enrollment Tool,New Academic Year,Yangi o&#39;quv yili
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Qaytaring / Kredit eslatma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Qaytaring / Kredit eslatma
 DocType: Stock Settings,Auto insert Price List rate if missing,Avtotexnika uchun narxlash ro&#39;yxati mavjud emas
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,To&#39;langan pul miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,To&#39;langan pul miqdori
 DocType: GST Settings,B2C Limit,B2C limiti
 DocType: Work Order Item,Transferred Qty,Miqdor o&#39;tkazildi
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigatsiya
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Rejalashtirish
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Rejalashtirish
 DocType: Share Balance,Issued,Berilgan sana
+DocType: Loan,Repayment Start Date,To&#39;lov boshlanish sanasi
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Talabalar faoliyati
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Yetkazib beruvchi identifikatori
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Details
@@ -4615,10 +4649,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Oddiy, kasal va hokazo. Barglar turi."
 DocType: Email Digest,Send regular summary reports via Email.,Elektron pochta orqali muntazam abstrakt hisobotlar yuboring.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},"Iltimos, xarajat shikoyati toifasiga kiritilgan standart hisobni tanlang {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},"Iltimos, xarajat shikoyati toifasiga kiritilgan standart hisobni tanlang {0}"
 DocType: Assessment Result,Student Name,Isoning shogirdi nomi
 DocType: Brand,Item Manager,Mavzu menejeri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,To&#39;lanadigan qarzlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,To&#39;lanadigan qarzlar
 DocType: Buying Settings,Default Supplier Type,Standart etkazib beruvchi turi
 DocType: Plant Analysis,Collection Datetime,Datetime yig&#39;ish
 DocType: Work Order,Total Operating Cost,Jami Operatsion XARAJATLAR
@@ -4628,9 +4662,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,{0} foydalanuvchisi mavjud emas
 DocType: Payment Term,Day(s) after invoice date,Billing sanasi so&#39;ng kun (lar)
 DocType: Payment Schedule,Payment Schedule,To&#39;lov jadvali
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Qisqartirish
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,To&#39;lov usuli allaqachon mavjud
+DocType: Subscription,Trial Period End Date,Sinov muddati tugash sanasi
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} dan boshlab authroized emas
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Ish haqi shabloni ustasi.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologiya
@@ -4647,9 +4681,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Qabul qiluvchi yoki mijozlarga takliflar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Muzlatilgan zahiralarni tartibga solishga rolik
 ,Territory Target Variance Item Group-Wise,Hududning maqsadli o&#39;zgarishi Mavzu guruh - dono
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Barcha xaridorlar guruhlari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Barcha xaridorlar guruhlari
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Yil olingan oy
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} majburiydir. Ehtimol, valyuta ayirboshlash yozuvi {1} - {2} uchun yaratilmagan."
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} majburiydir. Ehtimol, valyuta ayirboshlash yozuvi {1} - {2} uchun yaratilmagan."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Soliq namunasi majburiydir.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Hisob {0}: Ota-hisob {1} mavjud emas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Narhlar kursi (Kompaniya valyutasi)
@@ -4658,14 +4692,15 @@
 DocType: Lab Prescription,Test Created,Test yaratildi
 DocType: Healthcare Settings,Custom Signature in Print,Bosma uchun maxsus imzo
 DocType: Account,Temporary,Vaqtinchalik
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Xaridor LPO No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Xaridor LPO No.
 DocType: Program,Courses,Kurslar
 DocType: Monthly Distribution Percentage,Percentage Allocation,Foizlarni ajratish
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Kotib
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Kotib
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Agar o&#39;chirib qo&#39;yilsa, &quot;So&#39;zlar&quot; maydonida hech qanday operatsiyani ko&#39;rish mumkin bo&#39;lmaydi"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Ushbu amal kelajakdagi hisob-kitoblarni to&#39;xtatadi. Haqiqatan ham ushbu obunani bekor qilmoqchimisiz?
 DocType: Serial No,Distinct unit of an Item,Ob&#39;ektning aniq birligi
 DocType: Supplier Scorecard Criteria,Criteria Name,Kriterlar nomi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,"Iltimos, kompaniyani tanlang"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,"Iltimos, kompaniyani tanlang"
 DocType: Pricing Rule,Buying,Sotib olish
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Kasallik va go&#39;ng
 DocType: HR Settings,Employee Records to be created by,Tomonidan yaratiladigan xodimlar yozuvlari
@@ -4674,17 +4709,17 @@
 DocType: POS Profile,Apply Discount On,Dasturni yoqish
 DocType: Member,Membership Type,Registratsiya turi
 ,Reqd By Date,Sana bo&#39;yicha sana
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Kreditorlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Kreditorlar
 DocType: Assessment Plan,Assessment Name,Baholashning nomi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Chop etishdagi PDC-ni ko&#39;rsatish
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Chop etishdagi PDC-ni ko&#39;rsatish
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,# {0} qatori: seriya raqami majburiy emas
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Maqola Wise Soliq Batafsil
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Ishga taklif
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut qisqartmasi
 ,Item-wise Price List Rate,Narh-navolar narxi ro&#39;yxati
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Yetkazib beruvchi kotirovkasi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Yetkazib beruvchi kotirovkasi
 DocType: Quotation,In Words will be visible once you save the Quotation.,So&#39;zlarni saqlaganingizdan so&#39;ng so&#39;zlar ko&#39;rinadi.
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Miqdor ({0}) qatorda {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Miqdor ({0}) qatorda {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},{1} {{1} shtrix kodi
@@ -4702,7 +4737,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Jami o&#39;zgarish
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Agar yoqilgan bo&#39;lsa, tizim avtomatik ravishda inventarizatsiyadan o&#39;tkazish uchun buxgalteriya yozuvlarini yuboradi."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerlik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Xodimga {0} davomi bu kun uchun belgilandi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Xodimga {0} davomi bu kun uchun belgilandi
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",daqiqada &quot;Time log&quot; orqali yangilangan.
 DocType: Customer,From Lead,Qo&#39;rg&#39;oshin
@@ -4713,6 +4748,7 @@
 DocType: Lab Test,Approved Date,Tasdiqlangan sana
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart sotish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Eng kamida bir omborxona majburiydir
+DocType: Subscriber,Subscriber Name,Obunachi nomi
 DocType: Serial No,Out of Warranty,Kafolatli emas
 DocType: BOM Update Tool,Replace,O&#39;zgartiring
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Hech qanday mahsulot topilmadi.
@@ -4722,19 +4758,18 @@
 DocType: Request for Quotation Item,Project Name,Loyiha nomi
 DocType: Customer,Mention if non-standard receivable account,Standart bo&#39;lmagan deb hisob-kitobni eslab qoling
 DocType: Journal Entry Account,If Income or Expense,Agar daromad yoki xarajat bo&#39;lsa
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Ishchilarning kreditida foizlar daromadi hisobini tanlang {0}
 DocType: Work Order,Required Items,Kerakli ma&#39;lumotlar
 DocType: Stock Ledger Entry,Stock Value Difference,Hissa qiymatining o&#39;zgarishi
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Inson resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,To&#39;lovni tasdiqlash to&#39;lovi
 DocType: Disease,Treatment Task,Davolash vazifasi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Soliq aktivlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Soliq aktivlari
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Kundalik yozuv {0} da {1} hisobiga ega emas yoki boshqa to&#39;lovlarga qarshi allaqachon mos kelgan
 DocType: Item,Moving Average,O&#39;rtacha harakatlanuvchi
 DocType: BOM Update Tool,The BOM which will be replaced,O&#39;zgartiriladigan BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Elektron uskunalar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Elektron uskunalar
 DocType: Asset,Maintenance Required,Xizmat talab qilinadi
 DocType: Account,Debit,Debet
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Barglari 0,5 foizga bo&#39;linadi"
@@ -4743,7 +4778,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amaldor Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ushbu Sotuvdagi Shaxs uchun Maqsadlar guruhini aniqlang.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Qimmatbaho qog&#39;ozlarni qisqartirish [Days]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset asosiy vositalarni sotib olish va sotish uchun majburiydir
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset asosiy vositalarni sotib olish va sotish uchun majburiydir
 DocType: Asset Maintenance Team,Maintenance Team Name,Ta&#39;minot jamoasi nomi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Yuqoridagi shartlarga asosan ikki yoki undan ko&#39;proq narx belgilash qoidalari mavjud bo&#39;lsa, birinchi o&#39;ringa qo&#39;llaniladi. Prioritet 0 dan 20 gacha bo&#39;lgan sonni ko&#39;rsatib, standart qiymat nol (bo&#39;sh). Agar yuqorida ko&#39;rsatilgan shartlarga ega bo&#39;lgan bir nechta narxlash qoidalari mavjud bo&#39;lsa, yuqoriroq raqam birinchi o&#39;ringa ega bo&#39;lishni anglatadi."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,"Xaridor sifatida &quot;Imkoniyatdan&quot; tanlangan bo&#39;lsa, xaridor majburiydir"
@@ -4752,19 +4787,17 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Quyidagi foydalanuvchilarga bloklangan kunlar uchun Ilovalarni jo&#39;nating.
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Xarajatlar shikoyati turlari.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},{0} elementi uchun sotish darajasi {1} dan past. Sotish narxi atleast {2}
-DocType: Item,Taxes,Soliqlar
+DocType: Subscription,Taxes,Soliqlar
 DocType: Purchase Invoice,capital goods,kapital mollari
 DocType: Purchase Invoice Item,Weight Per Unit,Birlikning og&#39;irligi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,To&#39;langan va etkazib berilmagan
 DocType: Project,Default Cost Center,Standart xarajatlar markazi
-DocType: Bank Guarantee,End Date,Tugash sanasi
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transactions
 DocType: Budget,Budget Accounts,Byudjet hisobi
 DocType: Employee,Internal Work History,Ichki ishlash tarixi
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Yig&#39;ilgan Amortizatsiya summasi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Xususiy kapital
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Yetkazib beruvchi Scorecard o&#39;zgaruvchan
-DocType: Employee Loan,Fully Disbursed,To&#39;liq to&#39;langan
 DocType: Employee Advance,Due Advance Amount,Avans miqdorining oshirilishi
 DocType: Maintenance Visit,Customer Feedback,Xaridorlarning fikri
 DocType: Account,Expense,Xarajatlar
@@ -4788,7 +4821,7 @@
 ,Employee Information,Xodimlar haqida ma&#39;lumot
 DocType: Stock Entry Detail,Additional Cost,Qo&#39;shimcha xarajatlar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Voucher tomonidan guruhlangan bo&#39;lsa, Voucher No ga asoslangan holda filtrlay olmaydi"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Yetkazib beruvchini taklif eting
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Yetkazib beruvchini taklif eting
 DocType: Quality Inspection,Incoming,Kiruvchi
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Savdo va xarid uchun odatiy soliq namunalari yaratilgan.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Baholash natijasi {0} allaqachon mavjud.
@@ -4796,7 +4829,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Guruh tomonidan &quot;Kompaniya&quot; bo&#39;lsa, Kompaniya filtrini bo&#39;sh qoldiring."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Kiritilgan sana kelajakdagi sana bo&#39;la olmaydi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},# {0} qatori: ketma-ket No {1} {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,takroriy yaratish uchun
 DocType: Stock Entry,Target Warehouse Address,Nishon QXI manzili
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Oddiy chiqish
 DocType: Agriculture Task,End Day,Oxiri kuni
@@ -4821,11 +4853,10 @@
 DocType: Material Request,% Ordered,% Buyurtma qilingan
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurs asosidagi talabalar guruhi uchun Kursni ro&#39;yxatdan o&#39;tishda ro&#39;yxatdan o&#39;tgan kurslardan har bir talaba uchun tasdiqlanadi.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Perework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ort Xarid qilish darajasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Ort Xarid qilish darajasi
 DocType: Share Balance,From No,Yo&#39;q
 DocType: Task,Actual Time (in Hours),Haqiqiy vaqt (soati)
 DocType: Employee,History In Company,Kompaniya tarixida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},{Sender} dan yangi xabar
 DocType: Customer,Customer Primary Address,Xaridorning asosiy manzili
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Axborotnomalar
 DocType: Drug Prescription,Description/Strength,Tavsif / kuch
@@ -4834,22 +4865,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Xuddi shu element bir necha marta kiritilgan
 DocType: Department,Leave Block List,Bloklar ro&#39;yxatini qoldiring
 DocType: Purchase Invoice,Tax ID,Soliq identifikatori
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} elementi ketma-ketlik uchun sozlanmagan. Ustun bo&#39;sh bo&#39;lishi kerak
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,{0} elementi ketma-ketlik uchun sozlanmagan. Ustun bo&#39;sh bo&#39;lishi kerak
 DocType: Accounts Settings,Accounts Settings,Hisob sozlamalari
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Tasdiqlang
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","{0} uchun noto&#39;g&#39;ri manzil, davom etish uchun tuzatishni iltimos qiling."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","{0} uchun noto&#39;g&#39;ri manzil, davom etish uchun tuzatishni iltimos qiling."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Yangi hisob raqami, u old nomdagi hisob nomiga kiritiladi"
 DocType: Maintenance Team Member,Team Member,Jamoa a&#39;zosi
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Yuborish uchun natija yo&#39;q
 DocType: Customer,Sales Partner and Commission,Savdo hamkori va komissiyasi
-DocType: Employee Loan,Rate of Interest (%) / Year,Foiz stavkasi (%) / yil
+DocType: Loan,Rate of Interest (%) / Year,Foiz stavkasi (%) / yil
 ,Project Quantity,Loyiha miqdori
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Barcha elementlar uchun {0} nolga teng bo&#39;lsa, siz &quot;Distribute Charges Based On&quot;"
 DocType: Opportunity,To Discuss,Muhokama qilish
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,Ushbu amalni bajarish uchun {2} da {1} {1} kerak.
 DocType: Loan Type,Rate of Interest (%) Yearly,Foiz stavkasi (%) Yillik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Vaqtinchalik hisob qaydnomalari
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Qora
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Vaqtinchalik hisob qaydnomalari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Qora
 DocType: BOM Explosion Item,BOM Explosion Item,BOM portlash elementi
 DocType: Shareholder,Contact List,Kontaktlar ro&#39;yxati
 DocType: Account,Auditor,Auditor
@@ -4857,16 +4888,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} mahsulot ishlab chiqarildi
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Ko&#39;proq ma&#39;lumot olish
 DocType: Cheque Print Template,Distance from top edge,Yuqori tomondan masofa
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Narxlar ro&#39;yxati {0} o&#39;chirib qo&#39;yilgan yoki mavjud emas
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Narxlar ro&#39;yxati {0} o&#39;chirib qo&#39;yilgan yoki mavjud emas
 DocType: Purchase Invoice,Return,Qaytish
 DocType: Pricing Rule,Disable,O&#39;chirish
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,To&#39;lovni amalga oshirish uchun to&#39;lov shakli talab qilinadi
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,To&#39;lovni amalga oshirish uchun to&#39;lov shakli talab qilinadi
 DocType: Project Task,Pending Review,Ko&#39;rib chiqishni kutish
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Aktivlar, ketma-ket noslar, partiyalar va h.k. kabi qo&#39;shimcha variantlar uchun to&#39;liq sahifada tahrir qiling."
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Uchrashuvlar va maslahatlar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} Batch {2} ga kiritilmagan
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",{0} obyekti allaqachon {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Tekshirishlar kerak
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Tekshirishlar kerak
 DocType: Task,Total Expense Claim (via Expense Claim),Jami xarajatlar bo&#39;yicha da&#39;vo (mablag &#39;to&#39;lovi bo&#39;yicha)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Luqo Absent
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Kompaniya o&#39;rnatilmadi
@@ -4878,7 +4909,7 @@
 DocType: Homepage,Tag Line,Tag qatori
 DocType: Fee Component,Fee Component,Narxlar komponenti
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Filo boshqarish
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Narsalarni qo&#39;shish
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Narsalarni qo&#39;shish
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,O&#39;simliklar va erlar
 DocType: Cheque Print Template,Regular,Muntazam
 DocType: Fertilizer,Density (if liquid),Zichlik (suyuqlik bo&#39;lsa)
@@ -4903,24 +4934,26 @@
 DocType: Payment Entry,Paid Amount,To&#39;langan pul miqdori
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Sotish tsiklini o&#39;rganing
 DocType: Assessment Plan,Supervisor,Boshqaruvchi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Saqlash fondini kiritish
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Saqlash fondini kiritish
 ,Available Stock for Packing Items,Paket buyumlari mavjud
 DocType: Item Variant,Item Variant,Variant variantlari
 ,Work Order Stock Report,Ish staji bo&#39;yicha hisobot
+DocType: Purchase Receipt,Auto Repeat Detail,Avto-qayta takrorlash
 DocType: Assessment Result Tool,Assessment Result Tool,Ko&#39;rib natijasi vositasi
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Boshqaruvchi sifatida
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Turkumni taklif qiling
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Hurdası mahsulotlari
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,Berilgan buyurtmalarni o&#39;chirib bo&#39;lmaydi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Debet-da hisob balansi mavjud bo&#39;lsa, sizda &quot;Balance Must Be&quot; (&quot;Balans Must Be&quot;) &quot;Credit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Sifat menejmenti
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Sifat menejmenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} mahsuloti o&#39;chirib qo&#39;yildi
 DocType: Project,Total Billable Amount (via Timesheets),Jami to&#39;lov miqdori (vaqt jadvallari orqali)
 DocType: Agriculture Task,Previous Business Day,Avvalgi ish kuni
-DocType: Employee Loan,Repay Fixed Amount per Period,Davr uchun belgilangan miqdorni to&#39;lash
+DocType: Loan,Repay Fixed Amount per Period,Davr uchun belgilangan miqdorni to&#39;lash
 DocType: Employee,Health Insurance No,Sog&#39;liqni saqlash sug&#39;urtasi No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Iltimos, {0} mahsulot uchun miqdorni kiriting"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Kredit eslatma
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Kredit eslatma
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Soliqqa tortiladigan jami miqdori
 DocType: Employee External Work History,Employee External Work History,Xodimning tashqi ish tarixi
 DocType: Opening Invoice Creation Tool,Purchase,Sotib olish
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Balans miqdori
@@ -4931,15 +4964,17 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{1} uchun {0}
 DocType: Healthcare Settings,Valid number of days,To&#39;g&#39;ri kunlar soni
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Xarajat markazlari
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Obunani qayta ishga tushiring
 DocType: Land Unit,Linked Plant Analysis,Bog&#39;langan o&#39;simlik tahlili
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Ta&#39;minlovchining valyutasi qaysi kompaniyaning asosiy valyutasiga aylantiriladigan darajasi
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},# {0} satr: vaqt {1} qatori bilan zid
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Nolinchi baholash darajasiga ruxsat berish
+DocType: Bank Guarantee,Receiving,Qabul qilish
 DocType: Training Event Employee,Invited,Taklif etilgan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Berilgan sana uchun xodim {0} uchun bir nechta faol ish haqi tuzilmasi topildi
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Gateway hisoblarini sozlash.
 DocType: Employee,Employment Type,Bandlik turi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Asosiy vositalar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Asosiy vositalar
 DocType: Payment Entry,Set Exchange Gain / Loss,Exchange Gain / Lossni o&#39;rnatish
 ,GST Purchase Register,GST Xarid qilish Register
 ,Cash Flow,Pul muomalasi
@@ -4959,9 +4994,10 @@
 DocType: Academic Term,Term Start Date,Yil boshlanish sanasi
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Barcha ulushlarning bitimlar ro&#39;yxati
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},"Iltimos, iltimos, {0} # {1}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Sinov muddati boshlanish sanasi va Sinov muddati tugashi kerak
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,O&#39;rtacha narx
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To&#39;lov tarifidagi umumiy to&#39;lov miqdori Grand / Rounded Totalga teng bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To&#39;lov tarifidagi umumiy to&#39;lov miqdori Grand / Rounded Totalga teng bo&#39;lishi kerak
+DocType: Subscription Plan Detail,Plan,Reja
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank Bosh balansidagi balans balansi
 DocType: Job Applicant,Applicant Name,Ariza beruvchi nomi
 DocType: Authorization Rule,Customer / Item Name,Xaridor / Mahsulot nomi
@@ -4991,6 +5027,7 @@
 DocType: Work Order,Warehouses,Omborlar
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktivni o&#39;tkazish mumkin emas
 DocType: Hotel Room Pricing,Hotel Room Pricing,Mehmonxona Xona narxlash
+DocType: Subscription,Days Until Due,Kunlarga qadar kunlar
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Ushbu element {0} ning bir variantidir (Andoza).
 DocType: Workstation,per hour,soatiga
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Xarid qilish
@@ -4999,13 +5036,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Partiyalarga asoslangan talabalar guruhi uchun Talabalar partiyasi dasturni ro&#39;yxatga olishdan har bir talaba uchun tasdiqlanadi.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ushbu ombor uchun kabinetga hisob yozuvi mavjud bo&#39;lib, omborni o&#39;chirib bo&#39;lmaydi."
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Tarqatish
+DocType: Journal Entry Account,Loan,Kredit
 DocType: Expense Claim Advance,Expense Claim Advance,Xarajatlar bo&#39;yicha da&#39;vo Advance
 DocType: Lab Test,Report Preference,Hisobot afzalligi
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Ixtiyoriy ma&#39;lumot.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Proyekt menejeri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Proyekt menejeri
 ,Quoted Item Comparison,Qisqartirilgan ob&#39;ektni solishtirish
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0} va {1} orasida
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Dispetcher
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Dispetcher
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Element uchun ruxsat etilgan maksimal chegirma: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,Net aktiv qiymati
 DocType: Crop,Produce,Mahsulot
@@ -5015,7 +5053,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Ishlab chiqarish uchun moddiy iste&#39;mol
 DocType: Item Alternative,Alternative Item Code,Muqobil mahsulot kodi
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredit limitlarini oshib ketadigan bitimlar taqdim etishga ruxsat berilgan rol.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Mahsulotni tayyorlash buyrug&#39;ini tanlang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Mahsulotni tayyorlash buyrug&#39;ini tanlang
 DocType: Delivery Stop,Delivery Stop,Yetkazib berish to&#39;xtashi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Magistr ma&#39;lumotlarini sinxronlash, biroz vaqt talab qilishi mumkin"
 DocType: Item,Material Issue,Moddiy muammolar
@@ -5025,15 +5063,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sovun va detarjen
 DocType: BOM,Show Items,Ma&#39;lumotlar ko&#39;rsatish
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Vaqtdan Vaqtga qaraganda Kattaroq bo&#39;la olmaydi.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Barcha mijozlarni elektron pochta orqali xabardor qilishni xohlaysizmi?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Barcha mijozlarni elektron pochta orqali xabardor qilishni xohlaysizmi?
+DocType: Subscription Plan,Billing Interval,Billing oralig&#39;i
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Buyurtma qilingan
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Rezyume; qayta boshlash
 DocType: Hub Settings,Hub Username,Server nomi
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Baholash mezonlari guruhi
 DocType: Healthcare Settings,Patient Name By,Bemor nomi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal {0} dan {1} ga qadar oylik maosh uchun
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal {0} dan {1} ga qadar oylik maosh uchun
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Yig&#39;ilgan Amortizatsiyani ochish {0} ga teng bo&#39;lishi kerak.
 DocType: Warehouse,Warehouse Name,Ombor nomi
 DocType: Naming Series,Select Transaction,Jurnalni tanlang
@@ -5047,22 +5085,23 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Bu erda siz balandlik, og&#39;irlik, allergiya, tibbiy xavotir va h.k.larni saqlashingiz mumkin"
 DocType: Leave Block List,Applies to Company,Kompaniya uchun amal qiladi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,"Bekor qilolmaysiz, chunki taqdim etilgan Stock Entry {0} mavjud"
-DocType: Employee Loan,Disbursement Date,To&#39;lov sanasi
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Qabul qiluvchilar&#39; ko&#39;rsatilmagan
+DocType: Loan,Disbursement Date,To&#39;lov sanasi
 DocType: BOM Update Tool,Update latest price in all BOMs,Barcha BOMlarda oxirgi narxni yangilang
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Tibbiy ma&#39;lumot
 DocType: Vehicle,Vehicle,Avtomobil
 DocType: Purchase Invoice,In Words,So&#39;zlarda
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Qabul qilishdan oldin bank yoki kredit tashkilotining nomini kiriting.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} yuborilishi kerak
 DocType: POS Profile,Item Groups,Mavzu guruhlari
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Bugun {0} tug&#39;ilgan kun!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Bugun {0} tug&#39;ilgan kun!
 DocType: Sales Order Item,For Production,Ishlab chiqarish uchun
 DocType: Payment Request,payment_url,to&#39;lov_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,"Iltimos, Hisoblar jadvalida vaqtinchalik ochilish hisobini qo&#39;shing"
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,"Iltimos, Hisoblar jadvalida vaqtinchalik ochilish hisobini qo&#39;shing"
 DocType: Customer,Customer Primary Contact,Birlamchi mijoz bilan aloqa
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Davrni yopish jurnali
 DocType: Project Task,View Task,Vazifani ko&#39;ring
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Bank kafolati turi
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Billing qismi
 ,Asset Depreciations and Balances,Assotsiatsiyalangan amortizatsiya va balans
@@ -5073,9 +5112,8 @@
 DocType: Production Plan,Include Subcontracted Items,Subpudratli narsalarni qo&#39;shish
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Ishtirok etish
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Miqdori miqdori
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Birja transkripsiyasidan keyin Variant xususiyatlarini o&#39;zgartirib bo&#39;lmaydi. Buning uchun yangi mahsulotni yaratish kerak bo&#39;ladi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,{0} mahsulot varianti bir xil xususiyatlarga ega
-DocType: Employee Loan,Repay from Salary,Ish haqidan to&#39;lash
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,{0} mahsulot varianti bir xil xususiyatlarga ega
+DocType: Loan,Repay from Salary,Ish haqidan to&#39;lash
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},{0} {1} dan {2}
 DocType: Salary Slip,Salary Slip,Ish haqi miqdori
@@ -5099,11 +5137,11 @@
 DocType: Employee Education,Employee Education,Xodimlarni o&#39;qitish
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Elementlar guruhi jadvalida topilgan nusxalash elementlari guruhi
 DocType: Land Unit,Parent Land Unit,Ota-ona uchastkasi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Ma&#39;lumotlar ma&#39;lumotlarini olish kerak.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Ma&#39;lumotlar ma&#39;lumotlarini olish kerak.
 DocType: Fertilizer,Fertilizer Name,Go&#39;ng nomi
 DocType: Salary Slip,Net Pay,Net to&#39;lov
 DocType: Cash Flow Mapping Accounts,Account,Hisob
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,No {0} seriyali allaqachon qabul qilingan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,No {0} seriyali allaqachon qabul qilingan
 ,Requested Items To Be Transferred,Talab qilingan narsalarni yuborish
 DocType: Expense Claim,Vehicle Log,Avtomobil logi
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Isitmaning mavjudligi (temp&gt; 38.5 ° C / 101.3 ° F yoki doimiy temp&gt; 38 ° C / 100.4 ° F)
@@ -5144,13 +5182,12 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Boshqa yozuvlar, yozuvlardagi diqqat-e&#39;tiborli harakatlar."
 DocType: Asset Maintenance,Manufacturing User,Ishlab chiqarish foydalanuvchisi
 DocType: Purchase Invoice,Raw Materials Supplied,Xom-ashyo etkazib berildi
-DocType: C-Form,Series,Series
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Narxlar ro&#39;yxatining {0} valyutasi {1} yoki {2}
 DocType: Appraisal,Appraisal Template,Baholash shabloni
 DocType: Soil Texture,Ternary Plot,Ternary uchastkasi
 DocType: Item Group,Item Classification,Mavzu tasnifi
 DocType: Driver,License Number,Litsenziya raqami
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Ish oshirish menejeri
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Ish oshirish menejeri
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Xizmat tashrif maqsadi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Billingni ro&#39;yxatdan o&#39;tkazish
 DocType: Crop,Period,Davr
@@ -5160,22 +5197,23 @@
 DocType: Item Attribute Value,Attribute Value,Xususiyat bahosi
 ,Itemwise Recommended Reorder Level,Tavsiya etilgan buyurtmaning darajasi
 DocType: Salary Detail,Salary Detail,Ish haqi bo&#39;yicha batafsil
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Avval {0} ni tanlang
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Avval {0} ni tanlang
 DocType: Appointment Type,Physician,Shifokor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,{1} banddagi {0} guruhining amal qilish muddati tugadi.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Maslahatlar
 DocType: Sales Invoice,Commission,Komissiya
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Ishlab chiqarish uchun vaqt jadvalini.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Jami summ
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Birja bitimidan so&#39;ng Variant xususiyatlarini o&#39;zgartirib bo&#39;lmaydi. Buning uchun yangi mahsulotni yaratish kerak bo&#39;ladi.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA mandati
 DocType: Physician,Charges,Narxlar
 DocType: Production Plan,Get Items For Work Order,Buyurtma ishlarini bajarish uchun narsalarni oling
 DocType: Salary Detail,Default Amount,Standart miqdor
 DocType: Lab Test Template,Descriptive,Ta&#39;riflovchi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Tizimda mavjud bo&#39;lmagan ombor
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Tizimda mavjud bo&#39;lmagan ombor
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Ushbu oyning qisqacha bayoni
 DocType: Quality Inspection Reading,Quality Inspection Reading,Sifatni tekshirishni o&#39;qish
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Stocks Older&quot; dan kamida% d kun bo&#39;lishi kerak.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Stocks Older&quot; dan kamida% d kun bo&#39;lishi kerak.
 DocType: Tax Rule,Purchase Tax Template,Xarid qilish shablonini sotib oling
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Sizning kompaniya uchun erishmoqchi bo&#39;lgan savdo maqsadini belgilang.
 ,Project wise Stock Tracking,Loyihani oqilona kuzatish
@@ -5203,11 +5241,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Veb-sayt yaratilmadi
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ishlab chiqarish ma&#39;lumoti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Ta&#39;minlangan aktsiyadorlik jamg&#39;armasi yaratilgan yoki taqlid miqdori berilmagan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Ta&#39;minlangan aktsiyadorlik jamg&#39;armasi yaratilgan yoki taqlid miqdori berilmagan
 DocType: Program,Program Abbreviation,Dastur qisqartmasi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,To&#39;lovlar har bir elementga nisbatan Buyurtmachnomada yangilanadi
 DocType: Warranty Claim,Resolved By,Qaror bilan
-DocType: Bank Guarantee,Start Date,Boshlanish vaqti
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Bir vaqtlar barglarini ajratib turing.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chexlar va depozitlar noto&#39;g&#39;ri tozalanadi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Hisob {0}: Siz uni yuqori hisob sifatida belgilashingiz mumkin emas
@@ -5222,11 +5259,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Soatlar
 DocType: Project,Expected Start Date,Kutilayotgan boshlanish sanasi
 DocType: Purchase Invoice,04-Correction in Invoice,04-fakturadagi tuzatish
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,BOM bilan ishlaydigan barcha elementlar uchun yaratilgan buyurtma
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,BOM bilan ishlaydigan barcha elementlar uchun yaratilgan buyurtma
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Variant tafsilotlari haqida hisobot
 DocType: Setup Progress Action,Setup Progress Action,O&#39;rnatish progress progress
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Narxlar ro&#39;yxatini sotib olish
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Narxlar ro&#39;yxatini sotib olish
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Ushbu elementga to&#39;lovlar tegishli bo&#39;lmasa, elementni olib tashlang"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Obunani bekor qilish
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Marhamat qilib Xizmat Statusini Tugallangan yoki tugatish sanasini tanlang
 DocType: Supplier,Default Payment Terms Template,Standart to&#39;lov shartlari shabloni
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Jurnal valyutasi to&#39;lov shluzi valyutasi bilan bir xil bo&#39;lishi kerak
@@ -5237,7 +5275,6 @@
 DocType: Employee,Educational Qualification,Ta&#39;lim malakasi
 DocType: Workstation,Operating Costs,Operatsion xarajatlar
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Yig&#39;ilgan oylik byudjetdan oshiq bo&#39;lgan harakatlar
-DocType: Subscription,Submit on creation,Yaratishni topshirish
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},{0} uchun valyuta {1} bo&#39;lishi kerak
 DocType: Asset,Disposal Date,Chiqarish sanasi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Agar dam olishlari bo&#39;lmasa, elektron pochta xabarlari kompaniyaning barcha faol xodimlariga berilgan vaqtda yuboriladi. Javoblarning qisqacha bayoni yarim tunda yuboriladi."
@@ -5255,6 +5292,7 @@
 DocType: Batch,Parent Batch,Ota-ona partiyasi
 DocType: Cheque Print Template,Cheque Print Template,Chop shablonini tekshiring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Xarajat markazlari jadvali
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Obuna bekor qilinishidan yoki obunani belgilashdan oldin to&#39;lov kunidan so&#39;ng o&#39;tgan kunlar soni to&#39;lanmagan deb hisoblanadi
 DocType: Lab Test Template,Sample Collection,Namunani yig&#39;ish
 ,Requested Items To Be Ordered,Buyurtma qilingan buyurtma qilingan narsalar
 DocType: Price List,Price List Name,Narhlar ro&#39;yxati nomi
@@ -5263,7 +5301,7 @@
 DocType: Account,Income,Daromad
 DocType: Industry Type,Industry Type,Sanoat turi
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nimadir noto&#39;g&#39;ri bajarildi!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,"Ogohlantirish: Arizani qoldiring, keyinchalik bloklangan sanalarni o&#39;z ichiga oladi"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,"Ogohlantirish: Arizani qoldiring, keyinchalik bloklangan sanalarni o&#39;z ichiga oladi"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Savdo shaxsi {0} allaqachon yuborilgan
 DocType: Supplier Scorecard Scoring Criteria,Score,Hisob
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Moliyaviy yil {0} mavjud emas
@@ -5283,12 +5321,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Sotuv nuqtasi profili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 dan 100 orasida qiymat bo&#39;lishi kerak
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Keyingi Amortizatsiya tarixi foydalanish uchun tayyor bo&#39;lgan sanadan oldin bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Ta&#39;minlanmagan kreditlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Ta&#39;minlanmagan kreditlar
 DocType: Cost Center,Cost Center Name,Xarajat markazi nomi
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Vaqt jadvaliga qarshi maksimal ish vaqti
 DocType: Maintenance Schedule Detail,Scheduled Date,Rejalashtirilgan sana
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Hammasi bo&#39;lib to&#39;lanadi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Hammasi bo&#39;lib to&#39;lanadi
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 belgidan kattaroq xabarlar bir nechta xabarlarga bo&#39;linadi
 DocType: Purchase Receipt Item,Received and Accepted,Qabul qilingan va qabul qilingan
 DocType: Hub Settings,Company and Seller Profile,Kompaniya va sotuvchi profil
@@ -5302,10 +5340,9 @@
 DocType: Item,Variant Based On,Variant asosida
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Belgilangan jami vaznda 100% bo&#39;lishi kerak. Bu {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Sizning etkazib beruvchilaringiz
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,"Iltimos, to&#39;g&#39;rilang"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,Savdo buyurtmasi sifatida yo&#39;qolgan deb belgilanmaydi.
 DocType: Request for Quotation Item,Supplier Part No,Yetkazib beruvchi qism No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Qaysi kategoriya uchun &quot;Baholash&quot; yoki &quot;Vaulusiya va jami&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Qaysi kategoriya uchun &quot;Baholash&quot; yoki &quot;Vaulusiya va jami&quot;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Anonim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Qabul qilingan
 DocType: Lead,Converted,O&#39;tkazilgan
@@ -5319,6 +5356,7 @@
 DocType: Asset,Assets,Aktivlar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Kompyuter
 DocType: Item,List this Item in multiple groups on the website.,Ushbu elementni veb-saytdagi bir nechta guruhda ko&#39;rsating.
+DocType: Subscription,Current Invoice End Date,Joriy hisob-fakturaning tugash sanasi
 DocType: Payment Term,Due Date Based On,O&#39;tkazilgan sana asosida
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Savdo sozlamalarida standart mijozlar guruhini va hududni tanlang
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} mavjud emas
@@ -5326,7 +5364,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Mavzu: {0} tizimda mavjud emas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Siz muzlatilgan qiymatni belgilash huquqiga ega emassiz
 DocType: Payment Reconciliation,Get Unreconciled Entries,Bog&#39;liq bo&#39;lmagan yozuvlarni qabul qiling
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Jurnalga kirish uchun to&#39;lovlar tanlanmadi
 DocType: Payment Reconciliation,From Invoice Date,Faktura sanasidan boshlab
+DocType: Loan,Disbursed,Qabul qilingan
 DocType: Healthcare Settings,Laboratory Settings,Laboratoriya sozlamalari
 DocType: Patient Appointment,Service Unit,Xizmat birligi
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Muvaffaqiyatli etkazib beruvchini tanlang
@@ -5339,12 +5379,12 @@
 DocType: Share Balance,No of Shares,Hissa yo&#39;q
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Seriya Yo&#39;q&quot; yo&#39;q stokli mahsulot uchun &quot;Ha&quot; bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Status-ni tanlang
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kelgusi sanalar uchun tomosha qilish mumkin emas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Kelgusi sanalar uchun tomosha qilish mumkin emas
 DocType: Pricing Rule,Pricing Rule Help,Raqobat qoidalari yordami
 DocType: School House,House Name,Uyning nomi
 DocType: Fee Schedule,Total Amount per Student,Talaba boshiga jami miqdor
 DocType: Purchase Taxes and Charges,Account Head,Hisob boshlig&#39;i
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elektr
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Elektr
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Tashkilotingiz qolgan qismini foydalanuvchilar sifatida qo&#39;shing. Siz shuningdek mijozlaringizni Kontaktlar ro&#39;yxatidan qo&#39;shib, portalga taklif qilishingiz mumkin"
 DocType: Stock Entry,Total Value Difference (Out - In),Jami qiymat farqi (Out - In)
 DocType: Grant Application,Requested Amount,Kerakli miqdor
@@ -5354,7 +5394,7 @@
 DocType: Crop Cycle,Detected Diseases,Aniqlangan kasalliklar
 DocType: Stock Entry,Default Source Warehouse,Standart manbalar ombori
 DocType: Item,Customer Code,Xaridor kodi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0} uchun tug&#39;ilgan kun eslatmasi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0} uchun tug&#39;ilgan kun eslatmasi
 DocType: Asset Maintenance Task,Last Completion Date,Oxirgi tugash sanasi
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Oxirgi Buyurtma berib o&#39;tgan kunlar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo&#39;lishi kerak
@@ -5362,9 +5402,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardsiz Sozlamalar
 DocType: Leave Block List,Leave Block List Name,Blok ro&#39;yxati nomini qoldiring
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sug&#39;urtaning boshlanish sanasi sug&#39;urta tugagan sanadan kam bo&#39;lishi kerak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Fond aktivlari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Fond aktivlari
 DocType: Restaurant,Active Menu,Faol menyu
 DocType: Target Detail,Target Qty,Nishon Miqdor
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Qarzga qarshi: {0}
 DocType: Shopping Cart Settings,Checkout Settings,To&#39;lov sozlamalari
 DocType: Student Attendance,Present,Mavjud
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Yetkazib berish eslatmasi {0} yuborilmasligi kerak
@@ -5373,9 +5414,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Ish staji {1} vaqt jadvalini uchun yaratilgan ({0})
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Production Plan Item,Ordered Qty,Buyurtma miqdori
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,{0} element o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,{0} element o&#39;chirib qo&#39;yilgan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOMda biron-bir mahsulot elementi yo&#39;q
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOMda biron-bir mahsulot elementi yo&#39;q
 DocType: Chapter,Chapter Head,Bo&#39;lim boshlig&#39;i
 DocType: Payment Term,Month(s) after the end of the invoice month,Hisob-fakturaning oyi tugagandan so&#39;ng oy (lar)
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Loyiha faoliyati / vazifasi.
@@ -5383,11 +5424,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ish haqi slipslarini yaratish
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Datetime sinov muddati datetime sinovdan oldin bo&#39;lishi mumkin emas
 DocType: POS Profile,Allow user to edit Discount,Foydalanuvchiga chegirmalar tuzishga ruxsat berish
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Xaridorlarni xarid qiling
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Xaridorlarni xarid qiling
 DocType: Purchase Invoice Item,Include Exploded Items,Portlatilgan narsalarni qo&#39;shish
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","{0} sifatida tanlangan bo&#39;lsa, xarid qilishni tekshirish kerak"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskont 100 dan kam bo&#39;lishi kerak
 DocType: Shipping Rule,Restrict to Countries,Davlatlarni cheklash
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Miqdorni yozing (Kompaniya valyutasi)
 DocType: Sales Invoice Timesheet,Billing Hours,To&#39;lov vaqti
 DocType: Project,Total Sales Amount (via Sales Order),Jami Sotuvdagi miqdori (Sotuvdagi Buyurtma orqali)
@@ -5404,6 +5446,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Baholash menejeri
 DocType: Payment Entry,Allocate Payment Amount,To&#39;lov miqdorini ajratish
+DocType: Subscription Plan,Subscription Plan,Obuna rejasi
 DocType: Employee External Work History,Salary,Ish haqi
 DocType: Serial No,Delivery Document Type,Hujjatning turi
 DocType: Sales Order,Partly Delivered,Qisman etkazib berildi
@@ -5428,9 +5471,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Qarish oralig&#39;i 2
 DocType: SG Creation Tool Course,Max Strength,Maks kuch
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Oldindan o&#39;rnatish
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Buyurtmachilar uchun {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Buyurtmachilar uchun {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM almashtirildi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Etkazib berish sanasi asosida narsalarni tanlang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Etkazib berish sanasi asosida narsalarni tanlang
 DocType: Grant Application,Has any past Grant Record,O&#39;tgan Grantlar rekordi mavjud
 ,Sales Analytics,Savdo tahlillari
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},{0} mavjud
@@ -5448,7 +5491,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Xom ashyo materiallari bilan ta&#39;minlangan
 DocType: Selling Settings,Settings for Selling Module,Sotuvdagi modulni sozlash
 DocType: Hotel Room Reservation,Hotel Room Reservation,Mehmonxona xonalari uchun rezervasyon
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Mijozlarga hizmat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Mijozlarga hizmat
 DocType: BOM,Thumbnail,Kichik rasm
 DocType: Item Customer Detail,Item Customer Detail,Xaridorlar uchun batafsil ma&#39;lumot
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Nomzodga Job taklif qiling.
@@ -5464,7 +5507,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +66,{0} Students have been enrolled,{0} Talabalar ro&#39;yxatga olindi
 DocType: Fees,Student Details,Talaba tafsilotlari
 DocType: Purchase Invoice Item,Stock Qty,Qissa soni
-DocType: Employee Loan,Repayment Period in Months,Oylardagi qaytarish davri
+DocType: Loan,Repayment Period in Months,Oylardagi qaytarish davri
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Xato: haqiqiy emas kim?
 DocType: Naming Series,Update Series Number,Series raqamini yangilash
 DocType: Account,Equity,Haqiqat
@@ -5473,7 +5516,7 @@
 DocType: Task,Closing Date,Yakunlovchi sana
 DocType: Sales Order Item,Produced Quantity,Ishlab chiqarilgan miqdor
 DocType: Timesheet,Work Detail,Ish batafsil
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Muhandis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Muhandis
 DocType: Journal Entry,Total Amount Currency,Jami valyuta miqdori
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Qidiruv Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Yo&#39;q qatorida zarur bo&#39;lgan mahsulot kodi yo&#39;q {0}
@@ -5518,13 +5561,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Donor turi haqida ma&#39;lumot.
 DocType: Request for Quotation,Supplier Detail,Yetkazib beruvchi ma&#39;lumotlarni
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Formulada yoki vaziyatda xato: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Xarajatlar miqdori
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Xarajatlar miqdori
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Mezonning og&#39;irliklari 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Ishtirok etish
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Qimmatli qog&#39;ozlar
 DocType: BOM,Materials,Materiallar
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Belgilangan bo&#39;lmasa, ro&#39;yxat qo&#39;llanilishi kerak bo&#39;lgan har bir Bo&#39;limga qo&#39;shilishi kerak."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},{0} yaratish
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Resurs va maqsadli omborlar bir xil bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Yozish sanasi va joylashtirish vaqti majburiydir
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Jurnallarni sotib olish uchun soliq shablonni.
@@ -5548,14 +5590,14 @@
 DocType: Shipping Rule,Fixed,Ruxsat etilgan
 DocType: Vehicle Service,Clutch Plate,Debriyaj plitasi
 DocType: Company,Round Off Account,Dumaloq hisob qaydnomasi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Ma&#39;muriy xarajatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Ma&#39;muriy xarajatlar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Konsalting
 DocType: Customer Group,Parent Customer Group,Ota-xaridorlar guruhi
-DocType: Journal Entry,Subscription,Obuna
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Obuna
 DocType: Purchase Invoice,Contact Email,E-pochtaga murojaat qiling
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Ish haqi yaratilishi kutilmoqda
 DocType: Appraisal Goal,Score Earned,Quloqqa erishildi
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Bildirishnoma muddati
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Bildirishnoma muddati
 DocType: Asset Category,Asset Category Name,Asset kategoriyasi nomi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Bu ildiz hududidir va tahrirlanmaydi.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Yangi Sotuvdagi Shaxs ismi
@@ -5568,7 +5610,7 @@
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kursga asoslangan guruhlarni tashkil qilishda partiyani ko&#39;rib chiqishni istamasangiz, belgilanmasdan qoldiring."
 DocType: Asset,Frequency of Depreciation (Months),Amortizatsiya chastotasi (oy)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Kredit hisobi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Kredit hisobi
 DocType: Landed Cost Item,Landed Cost Item,Chiqindilar narxlari
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Nolinchi qiymatlarni ko&#39;rsatish
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Berilgan miqdorda xom ashyoni ishlab chiqarish / qayta ishlashdan so&#39;ng olingan mahsulot miqdori
@@ -5576,7 +5618,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Oladigan / to&#39;lanadigan hisob
 DocType: Delivery Note Item,Against Sales Order Item,Savdo Buyurtma Mahsulotiga qarshi
 DocType: Hub Settings,Company Logo,Kompaniya logotipi
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},"Iltimos, attribut qiymati uchun {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},"Iltimos, attribut qiymati uchun {0}"
 DocType: Item,Default Warehouse,Standart ombor
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Byudjetga {0} Guruh hisobi bo&#39;yicha topshirish mumkin emas
 DocType: Healthcare Settings,Patient Registration,Bemorni ro&#39;yxatdan o&#39;tkazish
@@ -5610,11 +5652,10 @@
 DocType: Journal Entry,Total Debit,Jami debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standart tayyorlangan tovarlar ombori
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,"Marhamat, Klinik-ni tanlang"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Savdo vakili
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Savdo vakili
 DocType: Hotel Room Package,Amenities,Xususiyatlar
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Byudjet va xarajatlar markazi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Ko&#39;p ko&#39;rsatiladigan to&#39;lov shakli yo&#39;l qo&#39;yilmaydi
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,uchun
 ,Appointment Analytics,Uchrashuv tahlillari
 DocType: Vehicle Service,Half Yearly,Yarim yillik
 DocType: Lead,Blog Subscriber,Blog Obuna
@@ -5630,6 +5671,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Agar talabalar guruhlarini yil davomida qilsangiz, bo&#39;sh qoldiring"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Belgilangan bo&#39;lsa, Jami no. Ish kunlari davomida bayramlar bo&#39;ladi va bu kunlik ish haqining qiymatini kamaytiradi"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Joriy kalitdan foydalanadigan ilovalar kirish imkoniga ega emas, ishonchingiz komilmi?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Jami avans
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Andoza kodini o&#39;zgartirish
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Davrning oxirgi sanasi Davrning boshlanishi sanasidan oldin bo&#39;lishi mumkin emas. Iltimos, sanalarni tahrirlang va qaytadan urinib ko&#39;ring."
@@ -5640,8 +5682,9 @@
 DocType: Opportunity Item,Basic Rate,Asosiy darajasi
 DocType: GL Entry,Credit Amount,Kredit miqdori
 DocType: Cheque Print Template,Signatory Position,Imzo varaqasi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Lost sifatida sozlash
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Lost sifatida sozlash
 DocType: Timesheet,Total Billable Hours,Jami hisoblangan soatlar
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Abonent ushbu obuna orqali hisob-fakturalarni to&#39;lashi kerak bo&#39;lgan kunlar soni
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,To&#39;lov ma&#39;lumotnomasi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,"Bu esa, ushbu xaridorga qarshi qilingan operatsiyalarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: ajratilgan miqdor {1} To&#39;lovni kiritish miqdoridan kam yoki teng bo&#39;lishi kerak {2}
@@ -5660,12 +5703,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,So&#39;nggi xarid narxini oling
 DocType: Company,Company Info,Kompaniya haqida ma&#39;lumot
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Yangi mijozni tanlang yoki qo&#39;shing
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,Xarajat markazidan mablag &#39;sarflashni talab qilish kerak
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,Xarajat markazidan mablag &#39;sarflashni talab qilish kerak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Jamg&#39;armalar (aktivlar) ni qo&#39;llash
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Bu ushbu xodimning ishtirokiga asoslangan
 DocType: Assessment Result,Summary,Xulosa
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Markni tomosha qilish
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Hisob qaydnomasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Hisob qaydnomasi
 DocType: Fiscal Year,Year Start Date,Yil boshlanish sanasi
 DocType: Attendance,Employee Name,Xodimlarning nomi
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Restoran Buyurtma bandini buyurtma qiling
@@ -5677,7 +5720,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Xarid miqdori
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Yetkazib beruvchi quo {0} yaratildi
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,End Year Year Year oldin bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Ishchilarning nafaqalari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Ishchilarning nafaqalari
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},To&#39;ldirilgan miqdor {1} qatorda {0} uchun teng miqdorga ega bo&#39;lishi kerak
 DocType: Work Order,Manufactured Qty,Ishlab chiqarilgan Miqdor
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},{0} bilan aktsiyalar mavjud emas
@@ -5685,12 +5728,12 @@
 DocType: Asset,Out of Order,Tartibsiz
 DocType: Purchase Receipt Item,Accepted Quantity,Qabul qilingan miqdor
 DocType: Projects Settings,Ignore Workstation Time Overlap,Ish stantsiyasining vaqtni uzib qo&#39;ymaslik
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},"Iltimos, xizmatdoshlar uchun {0} yoki Kompaniya {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},"Iltimos, xizmatdoshlar uchun {0} yoki Kompaniya {1}"
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} mavjud emas
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Partiya raqamlarini tanlang
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Xarajatlar mijozlarga yetkazildi.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Loyiha Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No {0} qatori: Miqdor kutilgan qarz miqdori bo&#39;yicha da&#39;volardan {1} dan yuqori bo&#39;lishi mumkin emas. Kutilayotgan miqdor {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No {0} qatori: Miqdor kutilgan qarz miqdori bo&#39;yicha da&#39;volardan {1} dan yuqori bo&#39;lishi mumkin emas. Kutilayotgan miqdor {2}
 DocType: Patient Service Unit,Medical Administrator,Tibbiy boshqaruvchi
 DocType: Assessment Plan,Schedule,Jadval
 DocType: Account,Parent Account,Ota-hisob
@@ -5720,15 +5763,16 @@
 DocType: Asset Repair,Repair Status,Ta&#39;mirlash holati
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Buxgalteriya jurnali yozuvlari.
 DocType: Delivery Note Item,Available Qty at From Warehouse,QXIdagi mavjud Quti
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Avval Employee Record-ni tanlang.
 DocType: POS Profile,Account for Change Amount,O&#39;zgarish miqdorini hisobga olish
 DocType: Purchase Invoice,input service,kirish xizmati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partiya / Hisob {3} {4} da {1} / {2}
 DocType: Maintenance Team Member,Maintenance Team Member,Xizmat jamoasi a&#39;zosi
 DocType: Agriculture Analysis Criteria,Soil Analysis,Tuproq tahlil qilish
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Kurs kodi:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Marhamat, hisobni kiriting"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,"Marhamat, hisobni kiriting"
 DocType: Account,Stock,Aksiyalar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# {0} satri: Hujjatning Hujjat turi Buyurtma Buyurtma, Buyurtma Xarajati yoki Jurnal Yozuvi bo&#39;lishi kerak"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# {0} satri: Hujjatning Hujjat turi Buyurtma Buyurtma, Buyurtma Xarajati yoki Jurnal Yozuvi bo&#39;lishi kerak"
 DocType: Employee,Current Address,Joriy manzil
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Agar element boshqa narsaning varianti bo&#39;lsa, u holda tavsif, tasvir, narxlanish, soliq va boshqalar shablondan aniq belgilanmagan bo&#39;lsa"
 DocType: Serial No,Purchase / Manufacture Details,Sotib olish / ishlab chiqarish detali
@@ -5776,19 +5820,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},{0} uchun qabul
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Byudjetni belgilashning mavsumiyligi, maqsadlari va boshqalar."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Argumentlar nomi
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","{0} element shablon bo&#39;lib, uning variantlaridan birini tanlang"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","{0} element shablon bo&#39;lib, uning variantlaridan birini tanlang"
 DocType: Asset,Asset Category,Asset kategoriyasi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net to&#39;lov salbiy bo&#39;lishi mumkin emas
 DocType: Purchase Order,Advance Paid,Avans to&#39;langan
 DocType: Item,Item Tax,Mahsulot solig&#39;i
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Yetkazib beruvchiga material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Yetkazib beruvchiga material
 DocType: Soil Texture,Loamy Sand,Loamy Sand
 DocType: Production Plan,Material Request Planning,Materialni rejalashtirishni rejalashtirish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Aksiz billing
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% bir martadan ortiq ko&#39;rinadi
 DocType: Expense Claim,Employees Email Id,Xodimlarning elektron pochta manzili
 DocType: Employee Attendance Tool,Marked Attendance,Belgilangan ishtirok
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Joriy majburiyatlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Joriy majburiyatlar
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Taymer belgilangan soatdan oshib ketdi.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Kontaktlaringizga ommaviy SMS yuboring
 DocType: Patient,A Positive,Ijobiy
@@ -5799,9 +5843,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Haqiqiy miqdori majburiydir
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi reyting kartasiga ega va ushbu etkazib beruvchiga Buyurtma buyurtmalari ehtiyotkorlik bilan berilishi kerak.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Aktivlarni texnik xizmat ko&#39;rsatish guruhi
-DocType: Employee Loan,Loan Type,Kredit turi
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} muvaffaqiyatli topshirildi
+DocType: Loan,Loan Type,Kredit turi
 DocType: Scheduling Tool,Scheduling Tool,Vositachi rejalashtirish
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Kredit karta
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Kredit karta
 DocType: BOM,Item to be manufactured or repacked,Mahsulot ishlab chiqariladi yoki qayta paketlanadi
 DocType: Employee Education,Major/Optional Subjects,Asosiy / Tanlovlar
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -5832,7 +5877,7 @@
 DocType: Item,Units of Measure,O&#39;lchov birliklari
 DocType: Manufacturing Settings,Allow Production on Holidays,Bayramlarda ishlab chiqarishga ruxsat berish
 DocType: Sales Invoice,Customer's Purchase Order Date,Buyurtmachining Buyurtma tarixi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Sarmoya birjasi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Sarmoya birjasi
 DocType: Shopping Cart Settings,Show Public Attachments,Ommaviy ilovalarni ko&#39;rsatish
 DocType: Packing Slip,Package Weight Details,Paket Og&#39;irligi haqida ma&#39;lumot
 DocType: Restaurant Reservation,Reservation Time,Rezervasyon muddati
@@ -5847,7 +5892,7 @@
 DocType: Purchase Order,To Receive and Bill,Qabul qilish va tasdiqlash uchun
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Roy # {0}: Sana bo&#39;yicha Reqd Jurnal kunidan oldin bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Tanlangan mahsulotlar
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Dizayner
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Dizayner
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Shartlar va shartlar shabloni
 DocType: Serial No,Delivery Details,Yetkazib berish haqida ma&#39;lumot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Narxlar markazi {1} qatoridagi Vergiler jadvalidagi {0} qatorida talab qilinadi
@@ -5857,20 +5902,20 @@
 DocType: Driver,Expiry Date,Tugash muddati
 DocType: Healthcare Settings,Employee name and designation in print,Xodimlarning nomi va nashri chop etilgan
 ,accounts-browser,hisob-brauzer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Iltimos, oldin Turkum tanlang"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,"Iltimos, oldin Turkum tanlang"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Loyiha bo&#39;yicha mutaxassis.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",Haddan ortiq hisob-kitob qilish yoki buyurtma berishga ruxsat berish uchun Stokirovka sozlamalarida yoki Item-da &quot;Allowance&quot; -ni yangilang.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Valyutalar yonida $ va shunga o&#39;xshash biron bir belgi ko&#39;rsatilmasin.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Yarim kun)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Yarim kun)
 DocType: Payment Term,Credit Days,Kredit kuni
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,"Lab Testlarini olish uchun Marhamat, Bemor-ni tanlang"
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Talabalar guruhini yaratish
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Oldinga harakat qilmoqda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,BOM&#39;dan ma&#39;lumotlar ol
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,BOM&#39;dan ma&#39;lumotlar ol
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Uchrashuv vaqtlari
 DocType: Cash Flow Mapping,Is Income Tax Expense,Daromad solig&#39;i tushumi
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# {0} qatori: joylashtirish sanasi {1} aktivining {1} sotib olish sanasi bilan bir xil bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# {0} qatori: joylashtirish sanasi {1} aktivining {1} sotib olish sanasi bilan bir xil bo&#39;lishi kerak
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Talabaning Institut Pansionida istiqomat qilishini tekshiring.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yuqoridagi jadvalda Savdo buyurtmalarini kiriting
 ,Stock Summary,Qisqacha tavsifi
@@ -5881,10 +5926,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Qayta sanasi
 DocType: Employee,Reason for Leaving,Ketish sababi
 DocType: BOM Operation,Operating Cost(Company Currency),Faoliyat xarajati (Kompaniya valyutasi)
-DocType: Employee Loan Application,Rate of Interest,Foiz stavkasi
+DocType: Loan Application,Rate of Interest,Foiz stavkasi
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktsiya miqdori
 DocType: Item,Shelf Life In Days,Raf umri kunlarda
 DocType: GL Entry,Is Opening,Ochilishmi?
+DocType: Department,Expense Approvers,Xarajatlarni tasdiqlovchi hujjatlar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit yozuvini {1} bilan bog&#39;lash mumkin emas
 DocType: Journal Entry,Subscription Section,Obuna bo&#39;limi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,{0} hisobi mavjud emas
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 82a5e12..73a03fb 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before cancelling this Warranty Claim
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,Báo cáo đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
-DocType: Purchase Receipt,Subscription Detail,Chi tiết đăng ký
 DocType: Supplier Scorecard,Notify Supplier,Thông báo cho Nhà cung cấp
 DocType: Item,Customer Items,Mục khách hàng
 DocType: Project,Costing and Billing,Chi phí và thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: tài khoản mẹ {1} không thể là một sổ cái
 DocType: Item,Publish Item to hub.erpnext.com,Xuất bản mẫu hàng tới hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Thông báo email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,Đánh giá
 DocType: Item,Default Unit of Measure,Đơn vị đo mặc định
 DocType: SMS Center,All Sales Partner Contact,Tất cả Liên hệ Đối tác Bán hàng
-DocType: Employee,Leave Approvers,Để lại người phê duyệt
+DocType: Department,Leave Approvers,Để lại người phê duyệt
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,Điều tra
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,Sẵn sàng kiểm tra
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Điều này được dựa trên các giao dịch với nhà cung cấp này. Xem dòng thời gian dưới đây để biết chi tiết
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Hợp lêk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Thuế loại hình thực tế không thể được liệt kê trong định mức vật tư ở hàng {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,Hợp lêk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},Thuế loại hình thực tế không thể được liệt kê trong định mức vật tư ở hàng {0}
 DocType: Bank Guarantee,Customer,Khách hàng
 DocType: Purchase Receipt Item,Required By,Yêu cầu bởi
 DocType: Delivery Note,Return Against Delivery Note,Trả về đối với giấy báo giao hàng
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Tài khoản ngân hàng không thể được đặt tên là {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Người đứng đầu (hoặc nhóm) đối với các bút toán kế toán được thực hiện và các số dư còn duy trì
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Đặc biệt cho {0} không thể nhỏ hơn không ({1})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,Không có phiếu lương đã được đệ trình để xử lý.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,Không có phiếu lương đã được đệ trình để xử lý.
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Hiện mở
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,Cần phải thực hiện hành động này ngay hôm nay chính nó cho các định kỳ được đề cập ở trên
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,Loạt Cập nhật thành công
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Kiểm tra
 DocType: Pricing Rule,Apply On,Áp dụng trên
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,Tất cả Liên hệ Nhà cung cấp
 DocType: Support Settings,Support Settings,Cài đặt hỗ trợ
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,Ngày dự kiến kết thúc không thể nhỏ hơn Ngày bắt đầu dự kiến
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,hàng # {0}: giá phải giống {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,Đơn xin nghỉ phép mới
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,hàng # {0}: giá phải giống {1}: {2} ({3} / {4})
 ,Batch Item Expiry Status,Tình trạng hết lô hàng
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Hối phiếu ngân hàng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,Hối phiếu ngân hàng
 DocType: Membership,membership validaty section,thành viên hợp lệ phần
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
 DocType: Consultation,Consultation,Tư vấn
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Vật liệu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Làm trang web
 DocType: Opening Invoice Creation Tool Item,Quantity,Số lượng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Bảng tài khoản không được bỏ trống
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Các khoản vay (Nợ phải trả)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,Bảng tài khoản không được bỏ trống
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),Các khoản vay (Nợ phải trả)
 DocType: Employee Education,Year of Passing,Year of Passing
 DocType: Item,Country of Origin,Nước sản xuất
 DocType: Soil Texture,Soil Texture Criteria,Tiêu chuẩn kết cấu đất
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Chi tiết liên hệ chính
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Các vấn đề mở
 DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
 DocType: Lab Test Groups,Add new line,Thêm dòng mới
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
@@ -89,7 +85,7 @@
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,Hóa đơn
+DocType: Subscription Invoice,Invoice,Hóa đơn
 DocType: Purchase Invoice Item,Item Weight Details,Chi tiết Trọng lượng Chi tiết
 DocType: Asset Maintenance Log,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,Viết tắt
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Dãy {0}: {1} {2} không phù hợp với {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,Hàng # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Hàng # {0}:
 DocType: Timesheet,Total Costing Amount,Tổng chi phí
 DocType: Delivery Note,Vehicle No,Phương tiện số
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,Vui lòng chọn Bảng giá
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,Đang trong tiến độ hoàn thành
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Vui lòng chọn ngày
 DocType: Daily Work Summary Group,Holiday List,Danh sách kỳ nghỉ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Kế toán viên
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,Kế toán viên
 DocType: Hub Settings,Selling Price List,Bảng giá bán
 DocType: Patient,Tobacco Current Use,Sử dụng thuốc lá
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Giá bán
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,Giá bán
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Số điện thoại
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},New {0}: #{1}
 DocType: Delivery Trip,Initial Email Notification Sent,Đã gửi Thông báo Email ban đầu
 ,Sales Partners Commission,Hoa hồng đại lý bán hàng
 DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,Giá trị Sau khi khấu hao
 DocType: Student,O+,O+
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,có liên quan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,ngày tham dự không thể ít hơn ngày tham gia của người lao động
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,ngày tham dự không thể ít hơn ngày tham gia của người lao động
 DocType: Grading Scale,Grading Scale Name,Phân loại khoảng tên
-DocType: Subscription,Repeat on Day,Lặp lại vào ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Đây là một tài khoản gốc và không thể được chỉnh sửa.
 DocType: Sales Invoice,Company Address,Địa chỉ công ty
 DocType: BOM,Operations,Tác vụ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Không thể thiết lập ủy quyền trên cơ sở giảm giá cho {0}
+DocType: Subscription,Subscription Start Date,Ngày bắt đầu đăng ký
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Đính kèm tập tin .csv với hai cột, một cho tên tuổi và một cho tên mới"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} không trong bất kỳ năm tài chính có hiệu lực nào.
 DocType: Packed Item,Parent Detail docname,chi tiết tên tài liệu gốc
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,Ngày kết thúc giai đoạn dùng thử không thể trước ngày bắt đầu giai đoạn dùng thử
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Mở đầu cho một công việc.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},BOM không được chỉ định cho mục thầu phụ {0} tại hàng {1}
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Cùng Công ty được nhập nhiều hơn một lần
 DocType: Patient,Married,Kết hôn
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Không được phép cho {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Lấy dữ liệu từ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,Lấy dữ liệu từ
 DocType: Price List,Price Not UOM Dependant,Giá Không phụ thuộc UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Sản phẩm {0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,dầu phanh
 DocType: Tax Rule,Tax Type,Loại thuế
 ,Completed Work Orders,Đơn đặt hàng Hoàn thành
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,Lượng nhập chịu thuế
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,Lượng nhập chịu thuế
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Bạn không được phép thêm hoặc cập nhật bút toán trước ngày {0}
 DocType: BOM,Item Image (if not slideshow),Hình ảnh mẫu hàng (nếu không phải là slideshow)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tỷ lệ giờ / 60) * Thời gian hoạt động thực tế
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Hàng # {0}: Loại tài liệu tham khảo phải là một trong Yêu cầu bồi thường hoặc Đăng ký tạp chí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,Chọn BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Hàng # {0}: Loại tài liệu tham khảo phải là một trong Yêu cầu bồi thường hoặc Đăng ký tạp chí
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,Chọn BOM
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Chi phí của mục Delivered
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Quản lý khoản tạm ứng cho Người lao động
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,Thông báo giao hàng
 DocType: Journal Entry,Opening Entry,Mở nhập
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tài khoản Chỉ Thanh toán
-DocType: Employee Loan,Repay Over Number of Periods,Trả Trong số kỳ
+DocType: Loan,Repay Over Number of Periods,Trả Trong số kỳ
 DocType: Stock Entry,Additional Costs,Chi phí bổ sung
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,Không thể chuyển đổi sang loại nhóm vì Tài khoản vẫn còn giao dịch
 DocType: Lead,Product Enquiry,Đặt hàng sản phẩm
 DocType: Education Settings,Validate Batch for Students in Student Group,Xác nhận tính hợp lệ cho sinh viên trong nhóm học sinh
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Không có bản ghi để lại được tìm thấy cho nhân viên {0} với {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},Không có bản ghi để lại được tìm thấy cho nhân viên {0} với {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vui lòng nhập công ty đầu tiên
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,Vui lòng chọn Công ty đầu tiên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,Vui lòng chọn Công ty đầu tiên
 DocType: Employee Education,Under Graduate,Chưa tốt nghiệp
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,Vui lòng đặt mẫu mặc định cho Thông báo trạng thái rời khỏi trong Cài đặt nhân sự.
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Journal Entry Account,Employee Loan,nhân viên vay
 DocType: Fee Schedule,Send Payment Request Email,Gửi Email yêu cầu thanh toán
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,địa ốc
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,Đã đăng ký thành công.
 DocType: Assessment Result,Grade,Cấp
 DocType: Restaurant Table,No of Seats,Số ghế
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Để thêm chủ đề động, hãy sử dụng thẻ jinja như <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: Asset Maintenance Task,Asset Maintenance Task,Nhiệm vụ Bảo trì Tài sản
 DocType: SMS Center,All Contact,Tất cả Liên hệ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,Mức lương hàng năm
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,Mức lương hàng năm
 DocType: Daily Work Summary,Daily Work Summary,Tóm tắt công việc hàng ngày
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0}{1} bị đóng băng
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Chi phí hàng tồn kho
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,Chi phí hàng tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Chọn Kho mục tiêu
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,Chọn Kho mục tiêu
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vui lòng nhập Preferred Liên hệ Email
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,Vui lòng nhập Preferred Liên hệ Email
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,Contra nhập
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,Địa chỉ Chính
 DocType: Production Plan,Material Request Detail,Yêu cầu Tài liệu Chi tiết
 DocType: Selling Settings,Default Quotation Validity Days,Các ngày hiệu lực mặc định
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, các loại thuế tại hàng {1} cũng phải được thêm vào"
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, các loại thuế tại hàng {1} cũng phải được thêm vào"
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 DocType: Sales Invoice,Change Amount,thay đổi Số tiền
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,Lái xe hạng mục
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Vui lòng nhập ngày giao hàng
 DocType: Depreciation Schedule,Make Depreciation Entry,Tạo bút toán khấu hao
+DocType: HR Settings,Leave Settings,Rời khỏi cài đặt
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Yêu cầu Loại
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,Tạo nhân viên
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Phát thanh truyền hình
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Chế độ cài đặt POS (Trực tuyến / Ngoại tuyến)
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,Vô hiệu hóa việc tạo ra các bản ghi thời gian chống lại Đơn hàng làm việc. Các hoạt động sẽ không được theo dõi đối với Đơn đặt hàng Làm việc
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Thực hiện
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,Thực hiện
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Asset Maintenance Log,Maintenance Status,Tình trạng bảo trì
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Chi tiết thành viên
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Nhà cung cấp được yêu cầu đối với Khoản phải trả {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Hàng hóa và giá cả
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Tổng số giờ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Từ ngày phải được trong năm tài chính. Giả sử Từ ngày = {0}
 DocType: Drug Prescription,Interval,Khoảng thời gian
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,Ưu tiên
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,Ưu tiên
 DocType: Grant Application,Individual,cá nhân
 DocType: Academic Term,Academics User,Người dùng học thuật
 DocType: Cheque Print Template,Amount In Figure,Số tiền Trong hình
-DocType: Employee Loan Application,Loan Info,Thông tin cho vay
+DocType: Loan Application,Loan Info,Thông tin cho vay
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Lập kế hoạch cho lần bảo trì.
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Thời gian ghi điểm của nhà cung cấp
 DocType: Share Transfer,Share Transfer,Chuyển nhượng cổ phần
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Mẫu mục
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Hóa sinh
 DocType: Job Offer,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,Giá trị hiện
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,Giá trị hiện
 DocType: Woocommerce Settings,Woocommerce Settings,Cài đặt Thương mại điện tử
 DocType: Production Plan,Sales Orders,Đơn đặt hàng bán hàng
 DocType: Purchase Taxes and Charges,Valuation,Định giá
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,Địa bàn mặc định
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Tivi
 DocType: Work Order Operation,Updated via 'Time Log',Cập nhật thông qua 'Thời gian đăng nhập'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,Chọn khách hàng hoặc nhà cung cấp.
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: Company,Enable Perpetual Inventory,Cấp quyền vĩnh viễn cho kho
+DocType: Bank Guarantee,Charges Incurred,Khoản phí phát sinh
 DocType: Company,Default Payroll Payable Account,Mặc định lương Account Payable
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Cập nhật Email Nhóm
 DocType: Sales Invoice,Is Opening Entry,Được mở cửa nhập
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,Kết quả Tuỳ chỉnh
 DocType: Delivery Stop,Contact Name,Tên Liên hệ
 DocType: Course Assessment Criteria,Course Assessment Criteria,Các tiêu chí đánh giá khóa học
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,Id Thuế:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,Id Thuế:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,Thẻ học sinh:
 DocType: POS Customer Group,POS Customer Group,Nhóm Khách hàng POS
 DocType: Land Unit,Land Unit describing various land assets,Đơn vị đất mô tả các tài sản đất khác nhau
@@ -375,9 +372,8 @@
 ,Open Work Orders,Mở đơn hàng
 DocType: Payment Term,Credit Months,Tháng tín dụng
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Tiền thực trả không thể ít hơn 0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Để ngừng gửi các thông báo lỗi lặp đi lặp lại từ hệ thống, chúng tôi đã kiểm tra trường Tắt trong đăng ký"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,Các di dời mỗi năm
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,Các di dời mỗi năm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Hàng {0}: Vui lòng kiểm tra 'là cấp cao' đối với tài khoản {1} nếu điều này là một  bút toán cấp cao.
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
 DocType: Email Digest,Profit & Loss,Mất lợi nhuận
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Tổng chi phí (thông qua thời gian biểu)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,Xin vui lòng thiết lập Sinh viên theo Nhóm sinh viên
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,Đã chặn việc dời đi
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,Bút toán Ngân hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,Đã chặn việc dời đi
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,Bút toán Ngân hàng
 DocType: Crop,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Mẫu cổ phiếu hòa giải
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Nhóm Sinh viên Công cụ tạo khóa học
 DocType: Lead,Do Not Contact,Không Liên hệ
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,Những người giảng dạy tại các tổ chức của bạn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Phần mềm phát triển
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,Phần mềm phát triển
 DocType: Item,Minimum Order Qty,Số lượng đặt hàng tối thiểu
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Course Scheduling Tool,Course Start Date,Khóa học Ngày bắt đầu
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,Xuất bản trong trung tâm
 DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Khu vực
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,Yêu cầu nguyên liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,Yêu cầu nguyên liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,Thông tin chi tiết mua hàng
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Max Grade
 DocType: Email Digest,New Quotations,Trích dẫn mới
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,trượt email lương cho nhân viên dựa trên email ưa thích lựa chọn trong nhân viên
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt di dời đầu tiên trong danh sách sẽ được thiết lập như là người phê duyệt di dời mặc định
 DocType: Tax Rule,Shipping County,vận Chuyển trong quận
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Học
+apps/erpnext/erpnext/config/desktop.py +159,Learn,Học
 DocType: Asset,Next Depreciation Date,Kỳ hạn khấu hao tiếp theo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Chi phí hoạt động cho một nhân viên
 DocType: Accounts Settings,Settings for Accounts,Cài đặt cho tài khoản
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Séc đặc biệt và tiền gửi để xóa
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
 DocType: Driver,Fleet Manager,Người quản lý đội xe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Hàng # {0}: {1} không thể là số âm cho mặt hàng {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},Hàng # {0}: {1} không thể là số âm cho mặt hàng {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,Sai Mật Khẩu
 DocType: Item,Variant Of,biến thể của
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},Vui lòng đặt Giá phòng khách sạn vào {}
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Opening Invoice Creation Tool,Invoice Type,Loại hóa đơn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,Phiếu giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,Phiếu giao hàng
 DocType: Consultation,Encounter Impression,Gặp Ấn tượng
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Chi phí của tài sản bán
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tỷ Giá được quy đổi từ tỷ giá của khách hàng về tỷ giá khách hàng chung
 DocType: Course Scheduling Tool,Course Scheduling Tool,Khóa học Lập kế hoạch cụ
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Hàng # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[Khẩn cấp] Lỗi trong khi tạo định kỳ% s cho% s
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Hàng # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
 DocType: Land Unit,LInked Analysis,Phân tích LInked
 DocType: Item Tax,Tax Rate,Thuế suất
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,Thời gian đăng ký không thể nằm trong hai bản ghi phân bổ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,Thời gian đăng ký không thể nằm trong hai bản ghi phân bổ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân phối cho nhân viên {1} cho kỳ {2} đến {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Hóa đơn mua hàng {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},Hàng # {0}:  Số hiệu lô hàng phải giống như {1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,% đã nhận
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tạo Sinh viên nhóm
 DocType: Volunteer,Weekends,Cuối tuần
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,Số lượng ghi chú tín dụng
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,Số lượng ghi chú tín dụng
 DocType: Setup Progress Action,Action Document,Tài liệu hành động
 DocType: Chapter Member,Website URL,Website URL
 ,Finished Goods,Hoàn thành Hàng
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Thêm mục
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kiểm tra chất lượng sản phẩm Thông số
+DocType: Leave Application,Leave Approver Name,Để lại Tên Người phê duyệt
 DocType: Depreciation Schedule,Schedule Date,Lịch trình ngày
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Thu nhập, khấu trừ và các thành phần khác Mức lương"
 DocType: Packed Item,Packed Item,Hàng đóng gói
@@ -552,7 +547,7 @@
 DocType: Request for Quotation,Request for Quotation,Yêu cầu báo giá
 DocType: Healthcare Settings,Require Lab Test Approval,Yêu cầu phê duyệt thử nghiệm Lab
 DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,Tổng số
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,Tổng số
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
 DocType: Dosage Strength,Strength,Sức mạnh
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,Tạo một khách hàng mới
@@ -565,7 +560,7 @@
 DocType: Workstation,Consumable Cost,Chi phí tiêu hao
 DocType: Purchase Receipt,Vehicle Date,Ngày của phương tiện
 DocType: Student Log,Medical,Y khoa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,Lý do mất
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,Lý do mất
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,Cập nhật số tài khoản
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,Người sở hữu Tiềm năng không thể trùng với Tiềm năng
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,số lượng phân bổ có thể không lớn hơn số tiền không điều chỉnh
@@ -575,11 +570,10 @@
 DocType: Lab Test Template,Single,DUy nhất
 DocType: Salary Slip,Total Loan Repayment,Tổng số trả nợ
 DocType: Account,Cost of Goods Sold,Chi phí hàng bán
-DocType: Subscription,Yearly,Hàng năm
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
 DocType: Drug Prescription,Dosage,Liều dùng
 DocType: Journal Entry Account,Sales Order,Đơn đặt hàng
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Giá bán bình quân
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Giá bán bình quân
 DocType: Assessment Plan,Examiner Name,Tên người dự thi
 DocType: Lab Test Template,No Result,Không kết quả
 DocType: Purchase Invoice Item,Quantity and Rate,Số lượng và tỷ giá
@@ -588,6 +582,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vui lòng nhập tên công ty đầu tiên
 DocType: Purchase Invoice,Supplier Name,Tên nhà cung cấp
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Đọc sổ tay ERPNext
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,Hiển thị các lá của tất cả các thành viên của bộ phận trong lịch
 DocType: Purchase Invoice,01-Sales Return,01-Trả hàng
 DocType: Account,Is Group,là Nhóm
 DocType: Email Digest,Pending Purchase Orders,Đơn đặt hàng cấp phát
@@ -605,13 +600,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,Trường Bắt buộc - Năm Học
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1} không liên kết với {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Tùy chỉnh văn bản giới thiệu mà đi như một phần của email đó. Mỗi giao dịch có văn bản giới thiệu riêng biệt.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},Vui lòng đặt tài khoản phải trả mặc định cho công ty {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},Vui lòng đặt tài khoản phải trả mặc định cho công ty {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},Giao dịch không được phép đối với lệnh đặt hàng bị ngừng hoạt động {0}
 DocType: Setup Progress Action,Min Doc Count,Số liệu Min Doc
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Thiết lập chung cho tất cả quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,Đóng băng tài khoản đến ngày
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
@@ -635,8 +630,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dành cho các bán
 DocType: Packing Slip,From Package No.,Từ gói thầu số
 DocType: Item Attribute,To Range,để khoanh vùng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Không thể thay đổi phương pháp định giá vì có các giao dịch đối với một số mặt hàng không có phương pháp định giá riêng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,Chứng khoán và tiền gửi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Không thể thay đổi phương pháp định giá vì có các giao dịch đối với một số mặt hàng không có phương pháp định giá riêng
 DocType: Student Report Generation Tool,Attended by Parents,Tham dự bởi cha mẹ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tổng số nghỉ phép được phân bổ là bắt buộc
 DocType: Patient,AB Positive,AB Tích cực
@@ -645,7 +640,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Kỷ lục tham dự.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Phần lương cho bảng thời gian biểu dựa trên bảng lương
 DocType: Sales Order Item,Used for Production Plan,Sử dụng cho kế hoạch sản xuất
-DocType: Employee Loan,Total Payment,Tổng tiền thanh toán
+DocType: Loan,Total Payment,Tổng tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,Không thể hủy giao dịch cho Đơn đặt hàng công việc đã hoàn thành.
 DocType: Manufacturing Settings,Time Between Operations (in mins),Thời gian giữa các thao tác (bằng phút)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1} đã được hủy nên thao tác không thể hoàn thành
@@ -661,16 +656,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,lên danh sách một vài khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Phần đủ để xây dựng
 DocType: POS Profile User,POS Profile User,Người dùng Hồ sơ POS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Thu nhập trực tiếp
+DocType: Subscription Invoice,Subscription Invoice,Hóa đơn đăng ký
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,Thu nhập trực tiếp
 DocType: Patient Appointment,Date TIme,Ngày giờ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm theo tài khoản"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Nhân viên hành chính
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,Nhân viên hành chính
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Thành lập công ty và thuế
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
 DocType: Codification Table,Codification Table,Bảng mã hoá
 DocType: Timesheet Detail,Hrs,giờ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,Vui lòng chọn Công ty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry Detail,Difference Account,Tài khoản chênh lệch
 DocType: Purchase Invoice,Supplier GSTIN,Mã số nhà cung cấp
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
@@ -696,6 +692,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,Mẫu Bản đồ Lưu chuyển tiền tệ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
+DocType: Bank Guarantee,Providing,Cung cấp
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required","Không được phép, cấu hình Lab Test Template theo yêu cầu"
 DocType: Patient,Risk Factors,Các yếu tố rủi ro
@@ -727,7 +724,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
 DocType: Healthcare Settings,Appointment Confirmation,Xác nhận cuộc hẹn
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa số Seri {0}, vì nó được sử dụng trong các giao dịch hàng tồn kho"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa số Seri {0}, vì nó được sử dụng trong các giao dịch hàng tồn kho"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),Đóng cửa (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,xin chào
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Di chuyển mục
@@ -752,11 +749,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Đã đặt mặc định trong tiểu sử vị trí {0} cho người dùng {1}, hãy vô hiệu hóa mặc định"
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Giá trị lũy kế
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Xin lỗi, không thể hợp nhất các số sê ri"
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged","Xin lỗi, không thể hợp nhất các số sê ri"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,Lãnh thổ được yêu cầu trong Hồ sơ POS
 DocType: Supplier,Prevent RFQs,Ngăn chặn RFQs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Thực hiện bán hàng đặt hàng
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},Phiếu lương đã được gửi cho khoảng thời gian từ {0} đến {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},Phiếu lương đã được gửi cho khoảng thời gian từ {0} đến {1}
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,ID Tiềm năng
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
@@ -777,8 +774,9 @@
 DocType: Sales Invoice,Shipping Bill Date,Ngày gửi hóa đơn
 DocType: Production Plan,Production Plan,Kế hoạch sản xuất
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Mở Công cụ Tạo Hóa Đơn
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,Bán hàng trở lại
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Lưu ý: Tổng di dời phân bổ {0} không được nhỏ hơn các di dời đã được phê duyệt {1} cho giai đoạn
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Đặt số lượng trong giao dịch dựa trên sê-ri không có đầu vào
 ,Total Stock Summary,Tóm tắt Tổng số
 DocType: Announcement,Posted By,Gửi bởi
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
@@ -789,7 +787,7 @@
 DocType: Quotation,Quotation To,định giá tới
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Hãy đặt Công ty
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Hãy đặt Công ty
@@ -797,8 +795,8 @@
 DocType: Purchase Order Item,Billed Amt,Amt đã lập hóa đơn
 DocType: Training Result Employee,Training Result Employee,Đào tạo Kết quả của nhân viên
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một Kho thích hợp gắn với các phiếu nhập kho đã được tạo
-DocType: Repayment Schedule,Principal Amount,Số tiền chính
-DocType: Employee Loan Application,Total Payable Interest,Tổng số lãi phải trả
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,Số tiền chính
+DocType: Loan Application,Total Payable Interest,Tổng số lãi phải trả
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},Tổng số: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Số tham khảo và ngày tham khảo là cần thiết cho {0}
@@ -807,10 +805,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
 DocType: Restaurant Reservation,Restaurant Reservation,Đặt phòng khách sạn
 DocType: Land Unit,Land Unit Name,Tên Đơn Vị Đất
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Đề nghị Viết
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,Đề nghị Viết
 DocType: Payment Entry Deduction,Payment Entry Deduction,Bút toán thanh toán khấu trừ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Đóng gói
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Thông báo Khách hàng qua Email
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,Thông báo Khách hàng qua Email
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Nhân viên kd {0} đã tồn tại
 DocType: Employee Advance,Claimed Amount,Số Tiền Yêu Cầu
 apps/erpnext/erpnext/config/education.py +180,Masters,Chủ
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Cổng thanh toán tài khoản không được tạo ra, hãy tạo một cách thủ công."
 DocType: Supplier Scorecard,Per Year,Mỗi năm
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,Không đủ điều kiện tham gia vào chương trình này theo DOB
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 DocType: Sales Invoice,Sales Taxes and Charges,Thuế bán hàng và lệ phí
 DocType: Employee,Organization Profile,Hồ sơ Tổ chức
 DocType: Vital Signs,Height (In Meter),Chiều cao (In Meter)
 DocType: Student,Sibling Details,Thông tin chi tiết anh chị em ruột
 DocType: Vehicle Service,Vehicle Service,Dịch vụ của phương tiện
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Tự động kích hoạt các yêu cầu thông tin phản hồi dựa trên điều kiện.
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,Tự động kích hoạt các yêu cầu thông tin phản hồi dựa trên điều kiện.
 DocType: Employee,Reason for Resignation,Lý do từ chức
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Mẫu dùng cho thẩm định hiệu suất
 DocType: Sales Invoice,Credit Note Issued,Credit Note Ban hành
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Lịch trình bảo trì
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Và các quy tắc báo giá được lọc xem dựa trên khách hàng, nhóm khách hàng, địa bàn, NCC, loại NCC, Chiến dịch, đối tác bán hàng .v..v"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,Chênh lệch giá tịnh trong kho
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Quản lý nhân viên vay
 DocType: Employee,Passport Number,Số hộ chiếu
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Mối quan hệ với Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Chi cục trưởng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,Chi cục trưởng
 DocType: Payment Entry,Payment From / To,Thanh toán Từ / Đến
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số tồn đọng chưa trả cho khách hàng. Hạn mức tín dụng phải ít nhất {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vui lòng đặt tài khoản trong Kho {0}
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,Vận chuyển nguyên liệu
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,Không thể tìm đường cho
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),Mở (Dr)
+DocType: Loan,Applicant,Người nộp đơn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Đăng dấu thời gian phải sau ngày {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Để tạo tài liệu định kỳ
 ,GST Itemised Purchase Register,Đăng ký mua bán GST chi tiết
 DocType: Course Scheduling Tool,Reschedule,Sắp xếp lại
-DocType: Employee Loan,Total Interest Payable,Tổng số lãi phải trả
+DocType: Loan,Total Interest Payable,Tổng số lãi phải trả
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Thuế Chi phí hạ cánh và Lệ phí
 DocType: Work Order Operation,Actual Start Time,Thời điểm bắt đầu thực tế
 DocType: BOM Operation,Operation Time,Thời gian hoạt động
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,Hoàn thành
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,Cơ sở
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,Cơ sở
 DocType: Timesheet,Total Billed Hours,Tổng số giờ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,Viết Tắt Số tiền
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,Viết Tắt Số tiền
 DocType: Leave Block List Allow,Allow User,Cho phép tài
 DocType: Journal Entry,Bill No,Hóa đơn số
 DocType: Company,Gain/Loss Account on Asset Disposal,TK Lãi/Lỗ thanh lý tài sản
 DocType: Vehicle Log,Service Details,Chi tiết dịch vụ
 DocType: Vehicle Log,Service Details,Chi tiết dịch vụ
-DocType: Subscription,Quarterly,Quý
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,Nhóm
 DocType: Selling Settings,Delivery Note Required,Phải có Phiếu giao hàng
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Thời gian biểu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Súc rửa nguyên liệu thô được dựa vào
 DocType: Sales Invoice,Port Code,Cảng Mã
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,Kho dự trữ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,Kho dự trữ
 DocType: Lead,Lead is an Organization,Tiềm năng là một Tổ chức
 DocType: Guardian Interest,Interest,Quan tâm
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,Tài khoản kế toán
 DocType: Vehicle,Odometer Value (Last),Giá trị đo đường (cuối)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Mẫu tiêu chí của nhà cung cấp thẻ điểm.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,Bút toán thanh toán đã được tạo ra
 DocType: Request for Quotation,Get Suppliers,Nhận nhà cung cấp
 DocType: Purchase Receipt Item Supplied,Current Stock,Tồn kho hiện tại
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},Dòng #{0}: Tài sản {1} không liên kết với mục {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,Xem trước bảng lương
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},Dòng #{0}: Tài sản {1} không liên kết với mục {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,Xem trước bảng lương
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tài khoản {0} đã được nhập nhiều lần
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,Bạn chỉ có thể gia hạn nếu hội viên của bạn hết hạn trong vòng 30 ngày
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,Chỉ cần chọn nếu bạn đã thiết lập tài liệu Lập biểu Cash Flow Mapper
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi vào:
 DocType: Supplier Scorecard,Per Week,Mỗi tuần
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Tổng số sinh viên
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị tồn
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,Thẻ tín dụng nhập
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Công ty và các tài khoản
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,trong Gía trị
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,trong Gía trị
 DocType: Asset Settings,Depreciation Options,Tùy chọn khấu hao
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,Thời gian gửi không hợp lệ
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,Thời gian gửi không hợp lệ
 DocType: Lead,Campaign Name,Tên chiến dịch
 DocType: Hotel Room,Capacity,Sức chứa
 DocType: Selling Settings,Close Opportunity After Days,Đóng Opportunity Sau ngày
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,số hiệu đơn mua của khách
 DocType: Budget,Budget Against,Ngân sách với
 DocType: Employee,Cell Number,Số di động
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Không có nhân viên nào cho các tiêu chí nhất định. Kiểm tra xem phiếu lương chưa được tạo.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Không có nhân viên nào cho các tiêu chí nhất định. Kiểm tra xem phiếu lương chưa được tạo.
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mất
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện hành tại cột 'Chứng từ đối ứng'
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vui lòng chọn một bảng
 DocType: BOM,Website Specifications,Thông số kỹ thuật website
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} là địa chỉ email không hợp lệ trong &#39;Người nhận&#39;
 DocType: Special Test Items,Particulars,Các chi tiết
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,Hàng {0}: Nhân tố chuyển đổi là bắt buộc
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Asset,Maintenance,Bảo trì
+DocType: Subscriber,Subscriber,Người đăng kí
 DocType: Item Attribute Value,Item Attribute Value,GIá trị thuộc tính mẫu hàng
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,Vui lòng cập nhật trạng thái dự án của bạn
 DocType: Item,Maximum sample quantity that can be retained,Số lượng mẫu tối đa có thể được giữ lại
@@ -1058,26 +1054,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Các thiết lập mặc định cho Giỏ hàng
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,Thêm Timeslots
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Tài sản bị tháo dỡ qua Journal nhập {0}
-DocType: Employee Loan,Interest Income Account,Tài khoản thu nhập lãi
+DocType: Loan,Interest Income Account,Tài khoản thu nhập lãi
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Đã gửi lời mời phản hồi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Công nghệ sinh học
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Chi phí bảo trì văn phòng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Chi phí bảo trì văn phòng
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,Đi đến
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Thiết lập tài khoản email
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,Vui lòng nhập mục đầu tiên
 DocType: Asset Repair,Downtime,Thời gian chết
 DocType: Account,Liability,Trách nhiệm
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,Học thuật:
 DocType: Salary Detail,Do not include in total,Không bao gồm trong tổng số
 DocType: Company,Default Cost of Goods Sold Account,Mặc định Chi phí tài khoản hàng bán
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},Số lượng mẫu {0} không được nhiều hơn số lượng nhận được {1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,Danh sách giá không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Request for Quotation Supplier,Send Email,Gởi thư
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
 DocType: Item,Max Sample Quantity,Số lượng Mẫu Tối đa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,Không quyền hạn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,Không quyền hạn
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,Yêu cầu được yêu cầu
 DocType: Vital Signs,Heart Rate / Pulse,Nhịp tim / Pulse
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
@@ -1088,12 +1084,11 @@
 DocType: Item,Items with higher weightage will be shown higher,Mẫu vật với trọng lượng lớn hơn sẽ được hiển thị ở chỗ cao hơn
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,Lab thử nghiệm và dấu hiệu quan trọng
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Chi tiết Bảng đối chiếu tài khoản ngân hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,Hàng # {0}: {1} tài sản phải nộp
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,Hàng # {0}: {1} tài sản phải nộp
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Không có nhân viên được tìm thấy
-DocType: Subscription,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,Cập nhật dự án.
 DocType: SMS Center,All Customer Contact,Tất cả Liên hệ Khách hàng
 DocType: Land Unit,Tree Details,Cây biểu thị chi tiết
@@ -1143,7 +1138,6 @@
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Tất cả các nhóm hàng
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
 DocType: Work Order,Item To Manufacture,Để mục Sản xuất
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}trạng thái là {2}
@@ -1157,7 +1151,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save","Chọn lại, nếu địa chỉ đã chọn được chỉnh sửa sau khi lưu"
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,Biến thể mẫu hàng {0} đã tồn tại với cùng một thuộc tính
 DocType: Item,Hub Publishing Details,Chi tiết Xuất bản Trung tâm
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening','Đang mở'
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening','Đang mở'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Mở để làm
 DocType: Notification Control,Delivery Note Message,Tin nhắn lưu ý cho việc giao hàng
 DocType: Lab Test Template,Result Format,Định dạng kết quả
@@ -1167,7 +1161,7 @@
 DocType: Payroll Entry,Bimonthly,hai tháng một lần
 DocType: Vehicle Service,Brake Pad,đệm phanh
 DocType: Fertilizer,Fertilizer Contents,Phân bón Nội dung
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Nghiên cứu & Phát triể
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,Nghiên cứu & Phát triể
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Số tiền Bill
 DocType: Company,Registration Details,Thông tin chi tiết đăng ký
 DocType: Timesheet,Total Billed Amount,Tổng số được lập hóa đơn
@@ -1181,7 +1175,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,Kiểm tra giới hạn tín dụng Bypass tại Lệnh bán hàng
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,Đánh giá hiệu quả.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Bật &#39;Sử dụng cho Giỏ hàng &quot;, như Giỏ hàng được kích hoạt và phải có ít nhất một Rule thuế cho Giỏ hàng"
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Bút toán thanh toán {0} được liên với thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Bút toán thanh toán {0} được liên với thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
 DocType: Sales Invoice Item,Stock Details,Chi tiết hàng tồn kho
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,Điểm bán hàng
@@ -1215,7 +1209,7 @@
 DocType: Restaurant Table,Minimum Seating,Ghế tối thiểu
 DocType: Item Attribute,Item Attribute Values,Các giá trị thuộc tính mẫu hàng
 DocType: Examination Result,Examination Result,Kết quả kiểm tra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,Biên lai nhận hàng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,Biên lai nhận hàng
 ,Received Items To Be Billed,Những mẫu hàng nhận được để lập hóa đơn
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Tổng tỷ giá hối đoái.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},Loại tài liệu tham khảo phải là 1 trong {0}
@@ -1223,15 +1217,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm khe thời gian trong {0} ngày tới cho hoạt động {1}
 DocType: Work Order,Plan material for sub-assemblies,Lên nguyên liệu cho các lần lắp ráp phụ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Đại lý bán hàng và địa bàn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0} phải hoạt động
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,Không có mục nào để chuyển
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0} phải hoạt động
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,Không có mục nào để chuyển
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),Đóng cửa (Mở + Tổng cộng)
 DocType: Journal Entry,Depreciation Entry,Nhập Khấu hao
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hủy bỏ {0} thăm Vật liệu trước khi hủy bỏ bảo trì đăng nhập này
 DocType: Crop Cycle,ISO 8016 standard,Tiêu chuẩn ISO 8016
 DocType: Pricing Rule,Rate or Discount,Xếp hạng hoặc Giảm giá
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Số lượng yêu cầu
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,Yêu thích
 DocType: Hub Settings,Custom Data,Dữ liệu Tuỳ chỉnh
@@ -1243,9 +1237,9 @@
 DocType: Medical Code,Medical Code Standard,Tiêu chuẩn về Mã y tế
 DocType: Soil Texture,Clay Composition (%),Thành phần Sét (%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Vui lòng lưu trước khi phân công nhiệm vụ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,Giá trị số dư
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,Giá trị số dư
 DocType: Lab Test,Lab Technician,Kỹ thuật viên phòng thí nghiệm
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,Danh sách bán hàng giá
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Nếu được chọn, một khách hàng sẽ được tạo, được ánh xạ tới Bệnh nhân. Hoá đơn Bệnh nhân sẽ được tạo ra đối với Khách hàng này. Bạn cũng có thể chọn Khách hàng hiện tại trong khi tạo Bệnh nhân."
 DocType: Bank Reconciliation,Account Currency,Tiền tệ Tài khoản
@@ -1253,16 +1247,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,Xin đề cập đến Round tài khoản tại Công ty Tắt
 DocType: Purchase Receipt,Range,Tầm
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Fee Structure,Components,Các thành phần
 DocType: Item Barcode,Item Barcode,Mục mã vạch
 DocType: Woocommerce Settings,Endpoints,Điểm cuối
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},Vui lòng nhập loại tài sản trong mục {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this","được tạo ra. Nếu bị trì hoãn, bạn sẽ phải thay đổi thủ công trường &quot;Lặp lại vào ngày của tháng&quot; trong trường hợp này"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
 DocType: Share Transfer,From Folio No,Từ Folio Số
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Hóa đơn mua hàng cao cấp
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Hàng {0}: lối vào tín dụng không thể được liên kết với một {1}
@@ -1297,16 +1289,17 @@
 DocType: Asset,Available-for-use Date,Ngày sẵn sàng để sử dụng
 DocType: Guardian,Guardian Name,Tên người giám hộ
 DocType: Cheque Print Template,Has Print Format,Có Định dạng In
-DocType: Employee Loan,Sanctioned,xử phạt
+DocType: Loan,Sanctioned,xử phạt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},Hàng # {0}: Hãy xác định số sê ri cho mục {1}
 DocType: Crop Cycle,Crop Cycle,Crop Cycle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Đối với  'sản phẩm lô', Kho Hàng, Số Seri và Số Lô sẽ được xem xét từ bảng 'Danh sách đóng gói'. Nếu kho và số Lô giống nhau cho tất cả các mặt hàng đóng gói cho bất kỳ mặt hàng 'Hàng hóa theo lô', những giá trị có thể được nhập vào bảng hàng hóa chính, giá trị này sẽ được sao chép vào bảng 'Danh sách đóng gói'."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Đối với  'sản phẩm lô', Kho Hàng, Số Seri và Số Lô sẽ được xem xét từ bảng 'Danh sách đóng gói'. Nếu kho và số Lô giống nhau cho tất cả các mặt hàng đóng gói cho bất kỳ mặt hàng 'Hàng hóa theo lô', những giá trị có thể được nhập vào bảng hàng hóa chính, giá trị này sẽ được sao chép vào bảng 'Danh sách đóng gói'."
 DocType: Student Admission,Publish on website,Xuất bản trên trang web
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Ngày trên h.đơn mua hàng không thể lớn hơn ngày hạch toán
+DocType: Subscription,Cancelation Date,Ngày hủy
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
 DocType: Agriculture Task,Agriculture Task,Nhiệm vụ Nông nghiệp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Thu nhập gián tiếp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,Thu nhập gián tiếp
 DocType: Student Attendance Tool,Student Attendance Tool,Công cụ điểm danh sinh viên
 DocType: Restaurant Menu,Price List (Auto created),Bảng Giá (Tự động tạo ra)
 DocType: Cheque Print Template,Date Settings,Cài đặt ngày
@@ -1333,6 +1326,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Mét
 DocType: Workstation,Electricity Cost,Chi phí điện
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,Lab thử nghiệm datetime có thể không được trước datetime bộ sưu tập
+DocType: Subscription Plan,Cost,Giá cả
 DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân viên sinh Nhắc nhở
 DocType: Expense Claim,Total Advance Amount,Tổng số tiền ứng trước
 DocType: Delivery Stop,Estimated Arrival,Ước tính đến
@@ -1344,15 +1338,15 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Tải lên tiêu đề trang và logo. (Bạn có thể chỉnh sửa chúng sau này).
 DocType: Timesheet Detail,Bill,Hóa đơn
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Kỳ hạn khấu hao tiếp theo được nhập vào như kỳ hạn cũ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Trắng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,Trắng
 DocType: SMS Center,All Lead (Open),Tất cả Tiềm năng (Mở)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Hàng {0}: Số lượng không có sẵn cho {4} trong kho {1} tại đăng thời gian nhập cảnh ({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Bạn chỉ có thể chọn tối đa một tùy chọn từ danh sách các hộp kiểm.
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
 DocType: Item,Automatically Create New Batch,Tự động tạo hàng loạt
 DocType: Item,Automatically Create New Batch,Tự động tạo hàng loạt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),Chỉ định {0} đến {1} (hàng {2})
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,Tạo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),Chỉ định {0} đến {1} (hàng {2})
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,Tạo
 DocType: Student Admission,Admission Start Date,Ngày bắt đầu nhập học
 DocType: Journal Entry,Total Amount in Words,Tổng tiền bằng chữ
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Nhân viên mới
@@ -1368,7 +1362,7 @@
 DocType: Holiday List,Holiday List Name,Tên Danh Sách Kỳ Nghỉ
 DocType: Repayment Schedule,Balance Loan Amount,Số dư vay nợ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,lịch học
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,Tùy chọn hàng tồn kho
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,Tùy chọn hàng tồn kho
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Vô hiệu Tìm nạp chi tiết mua hàng cuối cùng trong đơn mua hàng
 DocType: Journal Entry Account,Expense Claim,Chi phí khiếu nại
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,Bạn có thực sự muốn khôi phục lại tài sản bị tháo dỡ này?
@@ -1387,11 +1381,12 @@
 DocType: Packing Slip Item,Packing Slip Item,Mẫu hàng bảng đóng gói
 DocType: Purchase Invoice,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Vui lòng ghi rõ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,Sáng tạo biến thể đã được xếp hàng đợi.
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},Bản tóm tắt công việc cho {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Đầu tiên để lại phê duyệt trong danh sách sẽ được thiết lập như là mặc định để lại phê duyệt.
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Plan,Get Sales Orders,Chọn đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0} không được âm
 DocType: Training Event,Self-Study,Tự học
@@ -1404,7 +1399,7 @@
 DocType: Workstation,Wages,Tiền lương
 DocType: Asset Maintenance,Maintenance Manager Name,Tên quản lý bảo trì
 DocType: Agriculture Task,Urgent,Khẩn cấp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},Hãy xác định một ID Row hợp lệ cho {0} hàng trong bảng {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},Hãy xác định một ID Row hợp lệ cho {0} hàng trong bảng {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Không thể tìm thấy biến:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,Vui lòng chọn một trường để chỉnh sửa từ numpad
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,Không thể là một mục tài sản cố định như Led Ledger được tạo ra.
@@ -1416,7 +1411,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,Tên mẫu kiểm tra chất lượng
 DocType: Project,First Email,Email đầu tiên
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Số tiền bán
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Số tiền bán
 DocType: Repayment Schedule,Interest Amount,Số tiền lãi
 DocType: Serial No,Creation Document No,Tạo ra văn bản số
 DocType: Share Transfer,Issue,Nội dung:
@@ -1430,10 +1425,10 @@
 DocType: Tax Rule,Shipping State,Vận Chuyển bang
 ,Projected Quantity as Source,Số lượng dự kiến như nguồn
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Hàng hóa phải được bổ sung bằng cách sử dụng nút 'lấy hàng từ biên lai nhận hàng'
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,Giao hàng tận nơi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,Giao hàng tận nơi
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Loại Chuyển
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Chi phí bán hàng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,Chi phí bán hàng
 DocType: Consultation,Diagnosis,Chẩn đoán
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Mua hàng mặc định
 DocType: GL Entry,Against,Chống lại
@@ -1442,12 +1437,13 @@
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,Mã Bưu Chính
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},Đơn hàng {0} là {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},Chọn tài khoản thu nhập lãi suất trong khoản vay {0}
 DocType: Opportunity,Contact Info,Thông tin Liên hệ
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,Làm Bút toán tồn kho
 DocType: Packing Slip,Net Weight UOM,Trọng lượng  tịnh UOM
 DocType: Item,Default Supplier,Nhà cung cấp mặc định
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Phần trăm sản xuất vượt mức cho phép
-DocType: Employee Loan,Repayment Schedule,Kế hoạch trả nợ
+DocType: Loan,Repayment Schedule,Kế hoạch trả nợ
 DocType: Shipping Rule Condition,Shipping Rule Condition,Điều kiện quy tắc vận chuyển
 DocType: Holiday List,Get Weekly Off Dates,Nhận ngày nghỉ hàng tuần
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Ngày kết thúc không thể nhỏ hơn Bắt đầu ngày
@@ -1462,7 +1458,7 @@
 DocType: Education Settings,Attendance Freeze Date,Ngày đóng băng
 DocType: Education Settings,Attendance Freeze Date,Ngày đóng băng
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức hoặc cá nhân.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Xem Tất cả Sản phẩm
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Xem Tất cả Sản phẩm
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Độ tuổi Tiềm năng tối thiểu (Ngày)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Độ tuổi Tiềm năng tối thiểu (Ngày)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Tất cả BOMs
@@ -1471,14 +1467,16 @@
 DocType: Expense Claim,From Employee,Từ nhân viên
 DocType: Driver,Cellphone Number,Số điện thoại di động
 DocType: Project,Monitor Progress,Theo dõi tiến độ
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra quá hạn với số tiền = 0 cho vật tư {0} trong {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra quá hạn với số tiền = 0 cho vật tư {0} trong {1}
 DocType: Journal Entry,Make Difference Entry,Tạo bút toán khác biệt
+DocType: Supplier Quotation,Auto Repeat Section,Phần lặp lại tự động
 DocType: Upload Attendance,Attendance From Date,Có mặt Từ ngày
 DocType: Appraisal Template Goal,Key Performance Area,Khu vực thực hiện chính
 DocType: Program Enrollment,Transportation,Vận chuyển
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,Thuộc tính không hợp lệ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1} phải được đệ trình
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},Số lượng phải nhỏ hơn hoặc bằng {0}
+DocType: Department Approver,Department Approver,Bộ phê duyệt
 DocType: SMS Center,Total Characters,Tổng số chữ
 DocType: Employee Advance,Claimed,Đã yêu cầu
 DocType: Crop,Row Spacing,Khoảng cách hàng
@@ -1488,6 +1486,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Hóa đơn hòa giải thanh toán
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,Đóng góp%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","Theo các cài đặt mua bán, nếu đơn đặt hàng đã yêu cầu == 'CÓ', với việc tạo lập hóa đơn mua hàng,   người dùng cần phải tạo lập hóa đơn mua hàng đầu tiên cho danh mục {0}"
+,HSN-wise-summary of outward supplies,HSN-wise-tóm tắt các nguồn cung cấp bên ngoài
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Số đăng ký công ty để bạn tham khảo. Số thuế vv
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Quy tắc vận chuyển giỏ hàng mua sắm
@@ -1501,7 +1500,7 @@
 DocType: Setup Progress Action,Action Name,Tên hành động
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Năm bắt đầu
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},2 số đầu của số tài khoản GST nên phù hợp với  số của bang {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,Ngày bắt đầu hóa đơn hiện tại
 DocType: Salary Slip,Leave Without Pay,Rời đi mà không trả
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,Công suất Lỗi Kế hoạch
@@ -1519,26 +1518,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Các trường sẽ được sao chép chỉ trong thời gian tạo ra.
 DocType: Setup Progress Action,Domains,Tên miền
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','Ngày Bắt đầu Thực tế' không thể sau 'Ngày Kết thúc Thực tế'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Quản lý
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,Quản lý
 DocType: Cheque Print Template,Payer Settings,Cài đặt người trả tiền
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Tiền thực phải trả (bằng chữ) sẽ hiện ra khi bạn lưu bảng lương
 DocType: Purchase Invoice,Is Return,Là trả lại
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,Cảnh cáo
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',Ngày bắt đầu lớn hơn ngày kết thúc trong tác vụ &#39;{0}&#39;
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,Trả về /Ghi chú nợ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,Trả về /Ghi chú nợ
 DocType: Price List Country,Price List Country,Giá Danh sách Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0} Các dãy số hợp lệ cho vật liệu {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mã hàng không có thể được thay đổi cho Số sản
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Mã hàng không có thể được thay đổi cho Số sản
 DocType: Purchase Invoice Item,UOM Conversion Factor,UOM chuyển đổi yếu tố
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vui lòng nhập Item Code để có được Số lô
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
-DocType: Employee Loan,Partially Disbursed,phần giải ngân
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Cấp thông tin.
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,Cấp thông tin.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,Bạn không thể khởi động lại Đăng ký không bị hủy.
 DocType: Account,Balance Sheet,Bảng Cân đối kế toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
 DocType: Fee Validity,Valid Till,Hợp lệ đến
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,Tổng số Phụ huynh Họp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không đượcđịnh hình. Vui lòng kiểm tra, dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên hồ sơ POS"
@@ -1551,7 +1550,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,Hàng # {0}: Bị từ chối Số lượng không thể được nhập vào Hàng trả lại
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,Thay đổi Nhóm Khách hàng cho Khách hàng đã Chọn không được phép.
 ,Purchase Order Items To Be Billed,Các mẫu hóa đơn mua hàng được lập hóa đơn
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,Đang cập nhật thời gian đến dự kiến.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Đang cập nhật thời gian đến dự kiến.
 DocType: Program Enrollment Tool,Enrollment Details,Chi tiết đăng ký
 DocType: Purchase Invoice Item,Net Rate,Tỷ giá thuần
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,Vui lòng chọn một khách hàng
@@ -1572,18 +1571,20 @@
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Purchase Order,Group same items,Nhóm sản phẩm tương tự
 DocType: Purchase Invoice,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
-DocType: Employee Loan Application,Repayment Info,Thông tin thanh toán
+DocType: Department,Parent Department,Phòng phụ huynh
+DocType: Loan Application,Repayment Info,Thông tin thanh toán
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,"""Bút toán"" không thể để trống"
 DocType: Maintenance Team Member,Maintenance Role,Vai trò Bảo trì
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,số dư thử nghiệm
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,Thiết lập Nhân viên
 DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,Khách đặt phòng khách sạn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Nghiên cứu
+DocType: Subscription Settings,Subscription Settings,Cài đặt đăng ký
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,Nghiên cứu
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,Xin vui lòng ghi rõ ít nhất một thuộc tính trong bảng thuộc tính
 DocType: Announcement,All Students,Tất cả học sinh
@@ -1594,19 +1595,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 DocType: Crop Cycle,Less than a year,Chưa đầy một năm
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Sinh viên Điện thoại di động số
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Mẫu hàng {0} không thể theo lô
 DocType: Crop,Yield UOM,Yield UOM
 ,Budget Variance Report,Báo cáo chênh lệch ngân sách
 DocType: Salary Slip,Gross Pay,Tổng trả
 DocType: Item,Is Item from Hub,Mục từ Hub
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,Dãy {0}: Loại hoạt động là bắt buộc.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,Cổ tức trả tiền
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,Cổ tức trả tiền
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Sổ cái hạch toán
 DocType: Stock Reconciliation,Difference Amount,Chênh lệch Số tiền
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},Tiến sĩ {0} vào Ngày nghỉ trên {1}
 DocType: Purchase Invoice,Reverse Charge,Hoàn phí
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,Thu nhập giữ lại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,Thu nhập giữ lại
 DocType: Purchase Invoice,05-Change in POS,05-Thay đổi trong POS
 DocType: Vehicle Log,Service Detail,Chi tiết dịch vụ
 DocType: BOM,Item Description,Mô tả hạng mục
@@ -1621,12 +1622,12 @@
 DocType: Opportunity Item,Opportunity Item,Hạng mục cơ hội
 ,Student and Guardian Contact Details,Sinh viên và người giám hộ Chi tiết liên lạc
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,Hàng  {0}: Đối với nhà cung cấp {0} Địa chỉ email được yêu cầu để gửi email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,Mở cửa tạm thời
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,Mở cửa tạm thời
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,Xem Hub
 ,Employee Leave Balance,Để lại cân nhân viên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Số dư cho Tài khoản {0} luôn luôn phải {1}
 DocType: Patient Appointment,More Info,Xem thông tin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Đinh giá phải có cho mục ở hàng {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},Đinh giá phải có cho mục ở hàng {0}
 DocType: Supplier Scorecard,Scorecard Actions,Hành động Thẻ điểm
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,Ví dụ: Thạc sĩ Khoa học Máy tính
 DocType: Purchase Invoice,Rejected Warehouse,Kho chứa hàng mua bị từ chối
@@ -1636,7 +1637,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,đến
 DocType: Supplier Quotation Item,Lead Time in days,Thời gian Tiềm năng theo ngày
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,Sơ lược các tài khoản phải trả
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},Trả lương từ {0} đến {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},Trả lương từ {0} đến {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đóng băng {0}
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
@@ -1645,9 +1646,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,Nhỏ
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Mở công cụ tạo mục lục hóa đơn
 DocType: Education Settings,Employee Number,Số nhân viên
+DocType: Subscription Settings,Cancel Invoice After Grace Period,Hủy hóa đơn sau thời gian gia hạn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
 DocType: Project,% Completed,% Hoàn thành
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế độc quyền )
@@ -1661,7 +1663,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,Thử nghiệm phòng thí nghiệm Datetime
 DocType: Email Digest,Add Quote,Thêm Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Chi phí gián tiếp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
 DocType: Agriculture Analysis Criteria,Agriculture,Nông nghiệp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,Dữ liệu Sync Thạc sĩ
@@ -1692,16 +1694,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng khối lượng nhiệm vụ nhiệm vụ cần được 1. Vui lòng điều chỉnh khối lượng của tất cả các công việc của dự án một cách hợp lý
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,Phiếu giao hàng {0} không được ghi
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Thiết bị vốn
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Luật giá được lựa chọn đầu tiên dựa vào trường ""áp dụng vào"", có thể trở thành mẫu hàng, nhóm mẫu hàng, hoặc nhãn hiệu."
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,Vui lòng đặt mã mục đầu tiên
 DocType: Item,ITEM-,MỤC-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
+DocType: Subscription Plan,Billing Interval Count,Số lượng khoảng thời gian thanh toán
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 DocType: Antibiotic,Antibiotic,Kháng sinh
 ,Team Updates,Cập nhật nhóm
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,Cho Nhà cung cấp
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Loại Cài đặt Tài khoản giúp trong việc lựa chọn tài khoản này trong các giao dịch.
 DocType: Purchase Invoice,Grand Total (Company Currency),Tổng cộng (Tiền tệ công ty)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Tạo Format In
@@ -1727,7 +1730,7 @@
 DocType: POS Item Group,POS Item Group,Nhóm POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,Mục thay thế không được giống với mã mục
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
 DocType: Sales Partner,Target Distribution,phân bổ mục tiêu
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Tổng kết Đánh giá tạm thời
 DocType: Salary Slip,Bank Account No.,Tài khoản ngân hàng số
@@ -1744,7 +1747,7 @@
 DocType: BOM Operation,Workstation,Trạm làm việc
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Yêu cầu báo giá Nhà cung cấp
 DocType: Healthcare Settings,Registration Message,Thông báo Đăng ký
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Phần cứng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,Phần cứng
 DocType: Prescription Dosage,Prescription Dosage,Liều kê đơn
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,Hãy lựa chọn một công ty
@@ -1775,7 +1778,7 @@
 DocType: Project,Start and End Dates,Ngày bắt đầu và kết thúc
 ,Delivered Items To Be Billed,Chỉ tiêu giao được lập hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Mở BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Không thể đổi kho cho Số seri
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Không thể đổi kho cho Số seri
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
 DocType: Project Update,Great/Quickly,Tuyệt vời / Nhanh chóng
 DocType: Purchase Invoice Item,UOM,Đơn vị đo lường
@@ -1784,8 +1787,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,Vui lòng chọn lô cho mục hàng loạt
 DocType: Asset,Depreciation Schedules,Lịch khấu hao
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,Các tài khoản sau có thể được chọn trong Cài đặt GST:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,Các tài khoản sau có thể được chọn trong Cài đặt GST:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
 DocType: Payment Request,Transaction Currency,giao dịch tiền tệ
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},Từ {0} | {1} {2}
@@ -1796,6 +1799,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: POS Profile,Campaign,Chiến dịch
 DocType: Supplier,Name and Type,Tên và Loại
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',"Tình trạng phê duyệt phải được ""chấp thuận"" hoặc ""từ chối"""
 DocType: Physician,Contacts and Address,Địa chỉ liên hệ và Địa chỉ
 DocType: Purchase Invoice,Contact Person,Người Liên hệ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date','Ngày Bắt đầu Dự kiến' không a  thể sau 'Ngày Kết thúc Dự kiến'
@@ -1809,19 +1813,20 @@
 DocType: Student Admission,Eligibility and Details,Tính hợp lệ và chi tiết
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,Chênh lệch giá tịnh  trong Tài sản cố định
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},Tối đa: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.","Yêu cầu báo giá được vô hiệu hóa truy cập từ cổng thông tin, cho biết thêm cài đặt cổng kiểm tra."
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quy mô ghi điểm của nhà cung cấp thẻ chấm điểm
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Số tiền mua
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Số tiền mua
 DocType: Sales Invoice,Shipping Address Name,tên địa chỉ vận chuyển
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Có lỗi khi tạo Lịch học
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Người phê duyệt chi phí đầu tiên trong danh sách sẽ được đặt làm Công cụ phê duyệt chi phí mặc định.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,không có thể lớn hơn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Detail,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
@@ -1842,14 +1847,15 @@
 DocType: Package Code,Package Code,Mã gói
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Người học việc
 DocType: Purchase Invoice,Company GSTIN,GSTIN công ty
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,Số lượng âm không được cho  phép
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Số lượng âm không được cho  phép
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Bảng chi tiết thuế được lấy từ từ chủ mẫu hàng như một chuỗi và được lưu trữ tại mục này. Được sử dụng cho các loại thuế và chi phí
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,số dư Ngân hàng
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,Để lại phê duyệt bắt buộc trong ứng dụng Leave
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư Tài khoản
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Luật thuế cho các giao dịch
@@ -1877,15 +1883,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,Thời hạn thanh toán ở hàng {0} có thể trùng lặp.
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),Nông nghiệp (beta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,Bảng đóng gói
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,Thuê văn phòng
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,Bảng đóng gói
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Thuê văn phòng
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 DocType: Disease,Common Name,Tên gọi chung
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Nhập thất bại!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Chưa có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Giờ làm việc tại trạm
 DocType: Vital Signs,Blood Pressure,Huyết áp
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Chuyên viên phân tích
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,Chuyên viên phân tích
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
 DocType: Quality Inspection,QI-,QI-
@@ -1895,15 +1901,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Xác nhận khoá học đã đăng ký cho sinh viên trong nhóm học sinh
 DocType: Notification Control,Expense Claim Rejected,Chi phí yêu cầu bồi thường bị từ chối
 DocType: Item,Item Attribute,Giá trị thuộc tính
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Chính phủ.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,Chính phủ.
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Chi phí khiếu nại {0} đã tồn tại cho Log xe
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Tên học viện
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,Vui lòng nhập trả nợ Số tiền
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,Vui lòng nhập trả nợ Số tiền
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,Mục Biến thể
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Dịch vụ
 DocType: HR Settings,Email Salary Slip to Employee,Gửi mail bảng lương tới nhân viên
 DocType: Cost Center,Parent Cost Center,Trung tâm chi phí gốc
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,Chọn thể Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,Chọn thể Nhà cung cấp
 DocType: Sales Invoice,Source,Nguồn
 DocType: Customer,"Select, to make the customer searchable with these fields","Chọn, để làm cho khách hàng tìm kiếm được với các trường này"
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Hiển thị đã đóng
@@ -1920,7 +1926,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,Bảng đóng gói bị hủy
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư
 DocType: Program Course,Program Course,Khóa học chương trình
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Homepage,Company Tagline for website homepage,Công ty Tagline cho trang chủ của trang web
 DocType: Item Group,Item Group Name,Tên nhóm mẫu hàng
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,được lấy
@@ -1953,10 +1959,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Thông tin chi tiết về Memebership
 DocType: Leave Block List,Block Holidays on important days.,Khối ngày nghỉ vào những ngày quan trọng
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),Vui lòng nhập tất cả các Giá trị Kết quả bắt buộc
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,Sơ lược các tài khoản phải thu
-DocType: Employee Loan,Monthly Repayment Amount,Số tiền trả hàng tháng
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,Sơ lược các tài khoản phải thu
+DocType: Loan,Monthly Repayment Amount,Số tiền trả hàng tháng
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Hóa đơn mở
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
 DocType: UOM,UOM Name,Tên Đơn vị tính
 DocType: GST HSN Code,HSN Code,Mã HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,Số tiền đóng góp
@@ -1978,7 +1984,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},Người dùng {0} đã được chỉ định cho Bác sĩ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,hộp
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,Nhà cung cấp có thể
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,Nhà cung cấp có thể
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,Phân phối hàng tháng
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Danh sách người nhận có sản phẩm nào. Hãy tạo nhận Danh sách
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Chăm sóc sức khoẻ (beta)
@@ -2006,7 +2013,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Không có mẫu hàng để đóng gói
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
-DocType: Employee Loan,Repayment Method,Phương pháp trả nợ
+DocType: Loan,Repayment Method,Phương pháp trả nợ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Nếu được kiểm tra, trang chủ sẽ là mặc định mục Nhóm cho trang web"
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Tuyên bố cho chi phí công ty.
@@ -2015,7 +2022,7 @@
 DocType: Asset Maintenance Task,Certificate Required,Yêu cầu Giấy chứng nhận
 DocType: Company,Default Holiday List,Mặc định Danh sách khách sạn Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},Hàng {0}: Từ Thời gian và tới thời gian {1} là chồng chéo với {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Phải trả Hàng tồn kho
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,Phải trả Hàng tồn kho
 DocType: Purchase Invoice,Supplier Warehouse,Nhà cung cấp kho
 DocType: Opportunity,Contact Mobile No,Số Di động Liên hệ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,Chọn công ty
@@ -2023,7 +2030,7 @@
 DocType: Student Report Generation Tool,Print Section,Phần In
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Người dùng {0} không có bất kỳ Hồ sơ POS mặc định. Kiểm tra Mặc định ở hàng {1} cho Người dùng này.
 DocType: Student Group,Set 0 for no limit,Đặt 0 để không giới hạn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,Hàng {idx}: {field} là bắt buộc để tạo Hóa đơn mở {invoice_type}
 DocType: Customer,Primary Address and Contact Detail,Chi tiết Địa chỉ và Chi tiết Liên hệ chính
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gửi lại Email Thanh toán
@@ -2034,10 +2041,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,Vui lòng chọn ít nhất một tên miền.
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},Rời khỏi loại {0} không thể dài hơn {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},Rời khỏi loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng nhắc nhở ngày sinh nhật
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
 DocType: SMS Center,Receiver List,Danh sách người nhận
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,Tìm hàng
 DocType: Payment Schedule,Payment Amount,Số tiền thanh toán
@@ -2047,7 +2054,7 @@
 DocType: Assessment Plan,Grading Scale,Phân loại
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo lường {0} đã được nhập vào nhiều hơn một lần trong Bảng yếu tổ chuyển đổi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,Đã hoàn thành
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,Hàng có sẵn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,Hàng có sẵn
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Nhập khẩu thành công!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
@@ -2058,17 +2065,16 @@
 DocType: Quotation Item,Quotation Item,Báo giá mẫu hàng
 DocType: Customer,Customer POS Id,POS ID Khách hàng
 DocType: Account,Account Name,Tên Tài khoản
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"""Từ ngày"" không có thể lớn hơn ""Đến ngày"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,"""Từ ngày"" không có thể lớn hơn ""Đến ngày"""
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,Vui lòng nhập URL của Máy chủ Woocommerce
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Loại nhà cung cấp tổng thể.
 DocType: Purchase Order Item,Supplier Part Number,Mã số của Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
 DocType: Share Balance,To No,Đến Không
-DocType: Subscription,Reference Document,Tài liệu tham khảo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1} đã huỷ bỏ hoặc đã dừng
 DocType: Accounts Settings,Credit Controller,Bộ điều khiển tín dụng
-DocType: Grant Application,Applicant Type,Loại người nộp đơn
+DocType: Loan,Applicant Type,Loại người nộp đơn
 DocType: Purchase Invoice,03-Deficiency in services,03-Thiếu dịch vụ
 DocType: Delivery Note,Vehicle Dispatch Date,Ngày gửi phương tiện
 DocType: Healthcare Settings,Default Medical Code Standard,Tiêu chuẩn Mã y tế Mặc định
@@ -2079,13 +2085,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% hóa đơn đã lập
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên đối tác
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Nhân sự
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,Nhân sự
 DocType: Lead,Upper Income,Thu nhập trên
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Từ chối
 DocType: Journal Entry Account,Debit in Company Currency,Nợ Công ty ngoại tệ
 DocType: BOM Item,BOM Item,Mục BOM
 DocType: Appraisal,For Employee,Cho nhân viên
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Tạo bút toán giải ngân
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,Tạo bút toán giải ngân
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Dãy {0}: Cấp cao đối với nhà cung cấp phải là khoản nợ
 DocType: Company,Default Values,Giá trị mặc định
 DocType: Membership,INR,INR
@@ -2115,10 +2121,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm Tiềm năng
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm Tiềm năng
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} phải lớn hơn 0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Cổ phiếu có sẵn
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,Cổ phiếu có sẵn
 DocType: Manufacturing Settings,Capacity Planning For (Days),Năng lực Kế hoạch Đối với (Ngày)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Tạp vụ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,Không có mẫu hàng nào thay đổi số lượng hoặc giá trị
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,Không có mẫu hàng nào thay đổi số lượng hoặc giá trị
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Trường bắt buộc - Chương trình
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,Trường bắt buộc - Chương trình
 DocType: Special Test Template,Result Component,Hợp phần kết quả
@@ -2139,7 +2145,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,Bao gồm các ngày lễ trong các lần nghỉ như là các lần nghỉ
 DocType: Sales Invoice,Packed Items,Hàng đóng gói
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Yêu cầu bảo hành theo Số sê ri
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','Tổng'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','Tổng'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Kích hoạt Giỏ hàng
 DocType: Employee,Permanent Address,Địa chỉ thường trú
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2157,10 +2163,10 @@
 DocType: Selling Settings,Selling Settings,thiết lập thông số bán hàng
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,Xác nhận hành động
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,hoàn thành
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,Xem Giỏ hàng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Chi phí tiếp thị
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,Không thể tạo tiêu chuẩn chuẩn. Vui lòng đổi tên tiêu chí
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến cả  ""Weight UOM"""
@@ -2183,9 +2189,9 @@
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Material Request,Transferred,Đã được vận chuyển
 DocType: Vehicle,Doors,cửa ra vào
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Thu Phí Đăng ký Bệnh nhân
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Không thể thay đổi Thuộc tính sau khi giao dịch chứng khoán. Tạo một khoản mới và chuyển cổ phiếu sang Mục mới
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,Không thể thay đổi Thuộc tính sau khi giao dịch chứng khoán. Tạo một khoản mới và chuyển cổ phiếu sang Mục mới
 DocType: Course Assessment Criteria,Weightage,Trọng lượng
 DocType: Purchase Invoice,Tax Breakup,Chia thuế
 DocType: Packing Slip,PS-,PS
@@ -2221,12 +2227,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Purchase Invoice Item,Batch No,Số hiệu lô
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,Tiến bộ nhân viên
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn bán cùng trên 1 đơn mua hàng của khách
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 DocType: Grant Application,Assessment  Mark (Out of 10),Đánh giá Đánh giá (Trong số 10)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Số di động Guardian2
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,Chính
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Biến thể
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
@@ -2235,15 +2242,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ lĩnh vực là bắt buộc
 DocType: Email Digest,Annual Expenses,Chi phí hàng năm
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,Đặt mua
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,Đặt mua
 DocType: SMS Center,Send To,Để gửi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Loại di dời {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Loại di dời {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Số lượng phân bổ
 DocType: Sales Team,Contribution to Net Total,Đóng góp cho tổng số
 DocType: Sales Invoice Item,Customer's Item Code,Mã hàng của khách hàng
 DocType: Stock Reconciliation,Stock Reconciliation,"Kiểm kê, chốt kho"
 DocType: Territory,Territory Name,Tên địa bàn
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,Kho xưởng đang trong tiến độ hoàn thành được là cần thiết trước khi duyệt
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,Bạn chỉ có thể có Gói với cùng chu kỳ thanh toán trong Đăng ký
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Nộp đơn xin việc.
 DocType: Purchase Order Item,Warehouse and Reference,Kho hàng và tham chiếu
 DocType: Supplier,Statutory info and other general information about your Supplier,Thông tin theo luật định và các thông tin chung khác về nhà cung cấp của bạn
@@ -2254,10 +2262,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,đánh giá
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Sự kiện đào tạo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Trùng lặp số sê  ri đã nhập cho mẫu hàng {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},Trùng lặp số sê  ri đã nhập cho mẫu hàng {0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,Theo dõi theo Leads Nguồn.
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,1 điều kiện cho quy tắc giao hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,Vui lòng nhập
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,Vui lòng nhập
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,Nhật ký bảo dưỡng
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,Xin hãy thiết lập bộ lọc dựa trên Item hoặc kho
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Trọng lượng tịnh của gói này. (Tính toán tự động như tổng khối lượng tịnh của sản phẩm)
@@ -2265,11 +2273,11 @@
 DocType: Sales Order,To Deliver and Bill,Giao hàng và thanh toán
 DocType: Student Group,Instructors,Giảng viên
 DocType: GL Entry,Credit Amount in Account Currency,Số tiền trong tài khoản ngoại tệ tín dụng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0} phải được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0} phải được đệ trình
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,Quản lý Chia sẻ
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Hàng  # {0}: Nhà Kho bị hủy là bắt buộc với mẫu hàng bị hủy {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,Thanh toán
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,Thanh toán
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Kho {0} không được liên kết tới bất kì tài khoản nào, vui lòng đề cập tới tài khoản trong bản ghi nhà kho hoặc thiết lập tài khoản kho mặc định trong công ty {1}"
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Quản lý đơn đặt hàng của bạn
 DocType: Work Order Operation,Actual Time and Cost,Thời gian và chi phí thực tế
@@ -2279,7 +2287,7 @@
 DocType: Student Leave Application,Student Leave Application,Ứng dụng Để lại Sinh viên
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc tối đa {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Bật
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Gói mẫu hàng tại thời điểm bán.
@@ -2289,7 +2297,7 @@
 DocType: Item,Barcodes,Mã vạch
 DocType: Hub Category,Hub Node,Nút trung tâm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mục trùng lặp. Xin khắc phục và thử lại.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Liên kết
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,Liên kết
 DocType: Asset Movement,Asset Movement,Phong trào Asset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,Đơn hàng công việc {0} phải được nộp
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,Giỏ hàng mới
@@ -2307,13 +2315,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,Đơn vị tiền tệ thanh toán phải bằng đơn vị tiền tệ của công ty mặc định hoặc tiền của tài khoản của bên thứ ba
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói này một phần của việc phân phối (Chỉ bản nháp)
 DocType: Soil Texture,Loam,Tiếng ồn
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,Hàng {0}: Ngày hết hạn không thể trước ngày đăng
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,Hàng {0}: Ngày hết hạn không thể trước ngày đăng
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Thực hiện thanh toán nhập
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
 ,Sales Invoice Trends,Hóa đơn bán hàng Xu hướng
 DocType: Leave Application,Apply / Approve Leaves,Áp dụng / Phê duyệt Leaves
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Đối với
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Kho nhận hàng
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Cây biểu thị các trung tâm chi phí tài chính
 DocType: Serial No,Delivery Document No,Giao văn bản số
@@ -2327,7 +2334,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,Tiêu thụ Vật liệu không được đặt trong Cài đặt Sản xuất.
 DocType: Student,Student Mobile Number,Số di động Sinh viên
 DocType: Item,Has Variants,Có biến thể
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Không thể overbill cho Khoản {0} trong hàng {1} nhiều hơn {2}. Để cho phép thanh toán quá mức, vui lòng đặt trong Cài đặt kho"
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Không thể overbill cho Khoản {0} trong hàng {1} nhiều hơn {2}. Để cho phép thanh toán quá mức, vui lòng đặt trong Cài đặt kho"
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Cập nhật phản hồi
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên phân phối hàng tháng
@@ -2339,12 +2346,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Chọn chương trình đầu tiên
 DocType: Patient Appointment,Patient Age,Tuổi bệnh nhân
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Quản lý dự án
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,Số không có {0} đã được trả về
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,Số không có {0} đã được trả về
 DocType: Supplier,Supplier of Goods or Services.,Nhà cung cấp hàng hóa hoặc dịch vụ.
 DocType: Budget,Fiscal Year,Năm tài chính
 DocType: Asset Maintenance Log,Planned,Kế hoạch
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Tài khoản phải thu mặc định sẽ được sử dụng nếu không đặt trong Bệnh nhân để ghi chi phí tư vấn.
 DocType: Vehicle Log,Fuel Price,nhiên liệu Giá
+DocType: Bank Guarantee,Margin Money,Tiền ký quỹ
 DocType: Budget,Budget,Ngân sách
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,Đặt Mở
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,Tài sản cố định mục phải là một mẫu hàng không tồn kho.
@@ -2358,16 +2366,16 @@
 DocType: Lead,Follow Up,Theo sát
 DocType: Item,Is Sales Item,Là hàng bán
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Cây nhóm mẫu hàng
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
 DocType: Maintenance Visit,Maintenance Time,Thời gian bảo trì
 ,Amount to Deliver,Số tiền để Cung cấp
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},Cùng một mục đã được nhập nhiều lần. {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Ngày bắt đầu hạn không thể sớm hơn Ngày Năm Bắt đầu của năm học mà điều khoản này được liên kết (Năm học{}). Xin vui lòng sửa ngày và thử lại.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,Có một số lỗi.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,Nhân viên {0} đã áp dụng cho {1} giữa {2} và {3}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,Có một số lỗi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,Nhân viên {0} đã áp dụng cho {1} giữa {2} và {3}:
 DocType: Guardian,Guardian Interests,người giám hộ Sở thích
 DocType: Naming Series,Current Value,Giá trị hiện tại
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
 DocType: Education Settings,Instructor Records to be created by,Tài liệu hướng dẫn được tạo ra bởi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} được tạo ra
 DocType: GST Account,GST Account,Tài khoản GST
@@ -2387,8 +2395,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
 DocType: Website Item Group,Website Item Group,Nhóm các mục Website
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,Thêm vào yêu thích
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Không tìm thấy phiếu lương cho các tiêu chí đã chọn ở trên hoặc phiếu lương đã nộp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Nhiệm vụ và thuế
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Không tìm thấy phiếu lương cho các tiêu chí đã chọn ở trên hoặc phiếu lương đã nộp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,Nhiệm vụ và thuế
 DocType: Projects Settings,Projects Settings,Cài đặt Dự án
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vui lòng nhập ngày tham khảo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} bút toán thanh toán không thể được lọc bởi {1}
@@ -2398,27 +2406,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Cây biểu thị Các nhóm mẫu hàng
 DocType: Production Plan,Total Produced Qty,Tổng số lượng sản xuất
 DocType: Payroll Entry,Get Employee Details,Nhận Chi tiết Nhân viên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
 DocType: Asset,Sold,Đã bán
 ,Item-wise Purchase History,Mẫu hàng - lịch sử mua hàng thông minh
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy số seri  bổ sung cho hàng {0}
 DocType: Account,Frozen,Đông lạnh
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Số tiền cơ sở(Công ty ngoại tệ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,Nguyên liệu thô
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,Nguyên liệu thô
 DocType: Payment Reconciliation Payment,Reference Row,dãy tham chiếu
 DocType: Installation Note,Installation Time,Thời gian cài đặt
 DocType: Sales Invoice,Accounting Details,Chi tiết hạch toán
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,Xóa tất cả các giao dịch cho công ty này
 DocType: Patient,O Positive,O tích cực
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Các khoản đầu tư
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Chi tiết giải quyết
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,phân bổ
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Tiêu chí chấp nhận
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,Không có khoản hoàn trả nào cho mục nhập nhật ký
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 DocType: BOM,Show In Website,Hiện Trong Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Hiện Số lượng trong Website
-DocType: Employee Loan Application,Total Payable Amount,Tổng số tiền phải nộp
+DocType: Loan Application,Total Payable Amount,Tổng số tiền phải nộp
 DocType: Task,Expected Time (in hours),Thời gian dự kiến (trong giờ)
 DocType: Item Reorder,Check in (group),Kiểm tra trong (nhóm)
 DocType: Soil Texture,Silt,Silt
@@ -2437,7 +2446,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,Thanh toán
 DocType: Room,Room Name,Tên phòng
 DocType: Prescription Duration,Prescription Duration,Thời gian theo toa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Việc nghỉ không thể áp dụng / hủy bỏ trước khi {0}, vì sô nghỉ trung bình đã được chuyển tiếp trong bản ghi phân bổ nghỉ phép trong tương lai {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Việc nghỉ không thể áp dụng / hủy bỏ trước khi {0}, vì sô nghỉ trung bình đã được chuyển tiếp trong bản ghi phân bổ nghỉ phép trong tương lai {1}"
 DocType: Activity Cost,Costing Rate,Chi phí Rate
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Địa chỉ Khách hàng Và Liên hệ
 ,Campaign Efficiency,Hiệu quả Chiến dịch
@@ -2457,11 +2466,11 @@
 DocType: Chapter,Chapter,Chương
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Đôi
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,Tài khoản mặc định sẽ được tự động cập nhật trong Hóa đơn POS khi chế độ này được chọn.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
 DocType: Asset,Depreciation Schedule,Kế hoạch khấu hao
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Địa chỉ đối tác bán hàng và liên hệ
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,"Kỳ hạn nửa ngày nên ở giữa mục ""từ ngày"" và ""tới ngày"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,"Kỳ hạn nửa ngày nên ở giữa mục ""từ ngày"" và ""tới ngày"""
 DocType: Maintenance Schedule Detail,Actual Date,Ngày thực tế
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,Vui lòng thiết lập Trung tâm chi phí mặc định trong {0} công ty.
 DocType: Item,Has Batch No,Có hàng loạt Không
@@ -2479,7 +2488,6 @@
 DocType: Task,Actual End Date (via Time Sheet),Ngày kết thúc thực tế (thông qua thời gian biểu)
 DocType: Soil Texture,Soil Type,Loại đất
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,Tin nhắn mới
 ,Quotation Trends,Các Xu hướng dự kê giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
 DocType: GoCardless Mandate,GoCardless Mandate,Ủy quyền GoCard
@@ -2499,7 +2507,7 @@
 DocType: Hub Category,Hub Category,Danh mục Trung tâm
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Số phương tiện
-DocType: Employee Loan,Loan Amount,Số tiền vay
+DocType: Loan,Loan Amount,Số tiền vay
 DocType: Student Report Generation Tool,Add Letterhead,Thêm Đầu giấy
 DocType: Program Enrollment,Self-Driving Vehicle,Phương tiện tự lái
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Nhà cung cấp thẻ điểm chấm điểm
@@ -2528,9 +2536,9 @@
 DocType: Cash Flow Mapper,Position,Chức vụ
 DocType: Patient,Patient Details,Chi tiết Bệnh nhân
 DocType: Patient,B Positive,B dương tính
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng  # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng  # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại danh sách chặn cho phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,Viết tắt ko được để trống
 DocType: Patient Medical Record,Patient Medical Record,Hồ sơ Y khoa Bệnh nhân
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Nhóm Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Các môn thể thao
@@ -2538,8 +2546,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Tổng số thực tế
 DocType: Lab Test UOM,Test UOM,Kiểm tra UOM
 DocType: Student Siblings,Student Siblings,Anh chị em sinh viên
+DocType: Subscription Plan Detail,Subscription Plan Detail,Chi tiết gói đăng ký
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Đơn vị
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,Vui lòng ghi rõ Công ty
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,Vui lòng ghi rõ Công ty
 ,Customer Acquisition and Loyalty,Khách quay lại và khách trung thành
 DocType: Asset Maintenance Task,Maintenance Task,Nhiệm vụ bảo trì
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,Vui lòng đặt Giới hạn B2C trong Cài đặt GST.
@@ -2554,6 +2563,7 @@
 ,BOM Search,Tìm kiếm BOM
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),Tổng chi phí nguyên vật liệu tiêu thụ (thông qua nhập hàng)
 DocType: Hub Settings,Company Registered,Công ty đăng ký
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,To Date không thể nhỏ hơn From Date
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Xuất bản &quot;In Stock&quot; hoặc &quot;Not in stock&quot; trên Hub dựa trên cổ phiếu có sẵn trong kho này.
 DocType: Vehicle,Fuel Type,Loại nhiên liệu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
@@ -2561,17 +2571,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Số tồn kho in Batch {0} sẽ bị âm {1} cho khoản mục {2} tại Kho {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Các yêu cầu về chất liệu dưới đây đã được nâng lên tự động dựa trên mức độ sắp xếp lại danh mục của
 DocType: Email Digest,Pending Sales Orders,Trong khi chờ hàng đơn đặt hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản ngắn hạn phải là {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản ngắn hạn phải là {1}
 DocType: Employee,Create User Permission,Tạo phép người dùng
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã mục&gt; Nhóm sản phẩm&gt; Thương hiệu
 DocType: Healthcare Settings,Remind Before,Nhắc trước
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Hàng # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong các đơn đặt hàng, hóa đơn hàng hóa, hoặc bút toán nhật ký"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Hàng # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong các đơn đặt hàng, hóa đơn hàng hóa, hoặc bút toán nhật ký"
 DocType: Salary Component,Deduction,Khấu trừ
 DocType: Item,Retain Sample,Giữ mẫu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Hàng{0}: Từ Thời gian và Tới thời gin là bắt buộc.
 DocType: Stock Reconciliation Item,Amount Difference,Số tiền khác biệt
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},Giá mẫu hàng được thêm vào cho {0} trong danh sách giá {1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},Giá mẫu hàng được thêm vào cho {0} trong danh sách giá {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vui lòng nhập Id nhân viên của người bán hàng này
 DocType: Territory,Classification of Customers by region,Phân loại khách hàng theo vùng
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,Trong sản xuất
@@ -2581,8 +2592,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Số dư trên bảng kê Ngân hàng tính ra
 DocType: Normal Test Template,Normal Test Template,Mẫu kiểm tra thông thường
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,đã vô hiệu hóa người dùng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,Báo giá
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,Không thể thiết lập một RFQ nhận được để Không có Trích dẫn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,Báo giá
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,Không thể thiết lập một RFQ nhận được để Không có Trích dẫn
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Tổng số trích
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,Chọn tài khoản để in bằng tiền tệ của tài khoản
@@ -2590,7 +2601,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Điều này dựa trên các giao dịch đối với Bệnh nhân này. Xem dòng thời gian bên dưới để biết chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,Chi phí đã được cập nhật
 DocType: Patient,Date of Birth,Ngày sinh
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,Mục {0} đã được trả lại
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Năm tài chính** đại diện cho một năm tài chính. Tất cả các bút toán kế toán và giao dịch chính khác được theo dõi  với **năm tài chính **.
 DocType: Opportunity,Customer / Lead Address,Địa chỉ Khách hàng / Tiềm năng
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Cài đặt Thẻ điểm của nhà cung cấp
@@ -2601,14 +2612,15 @@
 DocType: Work Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,Mô Tả Công Việc
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,Mô Tả Công Việc
 DocType: Student Applicant,Applied,Ứng dụng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,Mở lại
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,Mở lại
 DocType: Sales Invoice Item,Qty as per Stock UOM,Số lượng theo như chứng khoán UOM
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Tên Guardian2
 DocType: Purchase Invoice,02-Post Sale Discount,02- Giảm giá hậu bán hàng
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Kí tự đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép khi đặt tên hàng loạt"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Theo dõi các Chiến dịch Bán hàng. Đo lường các Tiềm năng,  Bảng Báo giá, Đơn hàng v.v.. từ các Chiến dịch để đánh giá Lợi tức Đầu tư."
+DocType: Department Approver,Approver,Người Xét Duyệt
 ,SO Qty,Số lượng SO
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,Trường Đối với Cổ Đông không được để trống
 DocType: Guardian,Work Address,Địa chỉ làm việc
@@ -2622,21 +2634,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Tổng số tiền được phân bổ (Công ty ngoại tệ)
 DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 DocType: BOM,Scrap Material Cost,Chi phí phế liệu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
 DocType: Grant Application,Email Notification Sent,Đã Gửi Thông báo Email
 DocType: Purchase Invoice,In Words (Company Currency),Trong từ (Công ty tiền tệ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row","Mã hàng, kho hàng, số lượng được yêu cầu trên hàng"
-DocType: Pricing Rule,Supplier,Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row","Mã hàng, kho hàng, số lượng được yêu cầu trên hàng"
+DocType: Bank Guarantee,Supplier,Nhà cung cấp
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,Hiển thị chi tiết thanh toán
 DocType: Consultation,Consultation Time,Thời gian tham vấn
 DocType: C-Form,Quarter,Phần tư
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Chi phí hỗn tạp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,Chi phí hỗn tạp
 DocType: Global Defaults,Default Company,Công ty mặc định
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Chi phí hoặc khác biệt tài khoản là bắt buộc đối với mục {0} vì nó tác động tổng thể giá trị cổ phiếu
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Tên ngân hàng
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-Trên
-DocType: Employee Loan,Employee Loan Account,Tài khoản vay nhân viên
 DocType: Leave Application,Total Leave Days,Tổng số ngày nghỉ phép
 DocType: Email Digest,Note: Email will not be sent to disabled users,Lưu ý: Email sẽ không được gửi đến người dùng bị chặn
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Số lần tương tác
@@ -2652,7 +2663,7 @@
 DocType: Vital Signs,Weight (In Kilogram),Trọng lượng (tính bằng kilogram)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",chương / chapter_name để trống tự động thiết lập sau khi lưu chương.
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,Vui lòng thiết lập Tài khoản GST trong Cài đặt GST
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,Vui lòng thiết lập Tài khoản GST trong Cài đặt GST
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Loại hình kinh doanh
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Chi phí mua hàng mới
@@ -2661,12 +2672,13 @@
 DocType: Grant Application,Grant Description,Mô tả Grant
 DocType: Purchase Invoice Item,Rate (Company Currency),Tỷ giá (TIền tệ công ty)
 DocType: Student Guardian,Others,Các thông tin khác
+DocType: Subscription,Discounts,Giảm giá
 DocType: Payment Entry,Unallocated Amount,Số tiền chưa được phân bổ
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và phí
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Một sản phẩm hay một dịch vụ được mua, bán hoặc lưu giữ trong kho."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Không có bản cập nhật
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Điều này bao gồm tất cả các thẻ điểm gắn liền với Thiết lập này
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Con hàng không phải là một gói sản phẩm. Hãy loại bỏ mục &#39;{0} `và tiết kiệm
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Công việc ngân hàng
@@ -2675,21 +2687,24 @@
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vui lòng click vào 'Tạo Lịch trình' để có được lịch trình
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số để tham dự qua Thiết lập&gt; Chuỗi đánh số
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà thầu"""
 DocType: Grading Scale,Grading Scale Intervals,Phân loại các khoảng thời gian
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,lợi nhuận của năm
+DocType: Bank Guarantee,Name of Bank,Tên ngân hàng
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán Kế toán cho {2} chỉ có thể được tạo ra với tiền tệ: {3}
 DocType: Fee Schedule,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Mẫu hàng thông minh giảm giá
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Cây tài khoản tài chính.
+DocType: Bank Guarantee,Reference Document Type,Tài liệu tham chiếu Type
 DocType: Cash Flow Mapping,Cash Flow Mapping,Lập bản đồ tiền mặt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} gắn với Đơn đặt hàng {1}
 DocType: Account,Fixed Asset,Tài sản cố định
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,Hàng tồn kho được tuần tự
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Không tìm thấy email trong liên hệ mặc định
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Tạo bí mật
-DocType: Employee Loan,Account Info,Thông tin tài khoản
+DocType: Loan,Account Info,Thông tin tài khoản
 DocType: Activity Type,Default Billing Rate,tỉ lệ thanh toán mặc định
 DocType: Fees,Include Payment,Bao gồm Thanh toán
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Các nhóm sinh viên được tạo ra.
@@ -2697,24 +2712,24 @@
 DocType: Sales Invoice,Total Billing Amount,Tổng số tiền Thanh toán
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Chương trình trong Cấu trúc Phí và Nhóm Sinh viên {0} khác.
 DocType: Fee Schedule,Receivable Account,Tài khoản phải thu
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},Hàng# {0}: Tài sản {1}  đã {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},Hàng# {0}: Tài sản {1}  đã {2}
 DocType: Quotation Item,Stock Balance,Số tồn kho
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Với việc thanh toán thuế
 DocType: Expense Claim Detail,Expense Claim Detail,Chi tiết Chi phí khiếu nại
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,TRIPLICATE CHO CUNG CẤP
 DocType: Land Unit,Is Container,Là Container
 DocType: Crop Cycle,This will be day 1 of the crop cycle,Đây sẽ là ngày 1 của chu kỳ canh tác
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,Vui lòng chọn đúng tài khoản
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,Vui lòng chọn đúng tài khoản
 DocType: Purchase Invoice Item,Weight UOM,Trọng lượng UOM
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,Danh sách cổ đông có số lượng folio
 DocType: Salary Structure Employee,Salary Structure Employee,Cơ cấu tiền lương của nhân viên
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,Hiển thị Thuộc tính Variant
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,Hiển thị Thuộc tính Variant
 DocType: Student,Blood Group,Nhóm máu
 DocType: Course,Course Name,Tên khóa học
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Người dùng có thể duyệt các ứng dụng nghỉ phép một nhân viên nào đó
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Thiết bị văn phòng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,Thiết bị văn phòng
 DocType: Purchase Invoice Item,Qty,Số lượng
 DocType: Fiscal Year,Companies,Các công ty
 DocType: Supplier Scorecard,Scoring Setup,Thiết lập điểm số
@@ -2733,7 +2748,7 @@
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị tới
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,nợ được yêu cầu
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","các bảng thời gian biểu giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,Danh sách mua Giá
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mẫu của các biến thẻ điểm của nhà cung cấp.
 DocType: Job Offer Term,Offer Term,Thời hạn Cung cấp
 DocType: Asset,Quality Manager,Quản lý chất lượng
@@ -2745,13 +2760,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
 DocType: BOM Website Operation,BOM Website Operation,Hoạt động Website BOM
 DocType: Supplier Scorecard,Supplier Score,Điểm của nhà cung cấp
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,Tổng số Hoá đơn Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,Tổng số Hoá đơn Amt
 DocType: Supplier,Warn RFQs,Cảnh báo RFQ
 DocType: BOM,Conversion Rate,Tỷ lệ chuyển đổi
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Tìm kiếm sản phẩm
 DocType: Assessment Plan,To Time,Giờ
 DocType: Authorization Rule,Approving Role (above authorized value),Phê duyệt Role (trên giá trị ủy quyền)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
+DocType: Loan,Total Amount Paid,Tổng số tiền thanh toán
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,Vui lòng chọn Sinh viên nhập học là bắt buộc đối với sinh viên nộp phí
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM đệ quy: {0} khôg thể là loại tổng hoặc loại con của {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,Vui lòng chọn Bảng giá để xuất bản giá
@@ -2761,19 +2777,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Dãy {0}: Đã hoàn thành Số lượng không thể có nhiều hơn {1} cho hoạt động {2}
 DocType: Manufacturing Settings,Allow Overtime,Cho phép làm việc ngoài giờ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Không thể cập nhật hàng hóa {0} bằng cách sử dụng tính toán Hòa giải hàng hoá, vui lòng sử dụng Mục nhập chứng khoán"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Không thể cập nhật hàng hóa {0} bằng cách sử dụng tính toán Hòa giải hàng hoá, vui lòng sử dụng Mục nhập chứng khoán"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Không thể cập nhật hàng hóa {0} bằng cách sử dụng tính toán Hòa giải hàng hoá, vui lòng sử dụng Mục nhập chứng khoán"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Không thể cập nhật hàng hóa {0} bằng cách sử dụng tính toán Hòa giải hàng hoá, vui lòng sử dụng Mục nhập chứng khoán"
 DocType: Training Event Employee,Training Event Employee,Đào tạo nhân viên tổ chức sự kiện
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Các mẫu tối đa - {0} có thể được giữ lại cho Batch {1} và Item {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,Thêm khe thời gian
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} những dãy số được yêu cầu cho vật liệu {1}. Bạn đã cung cấp {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} những dãy số được yêu cầu cho vật liệu {1}. Bạn đã cung cấp {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Hiện tại Rate Định giá
 DocType: Training Event,Advance,Nâng cao
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,để lặp lại.
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,Cài đặt cổng thanh toán GoCardless
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Trao đổi Lãi / lỗ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,Trao đổi Lãi / lỗ
 DocType: Opportunity,Lost Reason,Lý do bị mất
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},Hàng # {0}: Tài khoản {1} không thuộc về công ty {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},Hàng # {0}: Tài khoản {1} không thuộc về công ty {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Không thể tìm thấy DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
@@ -2792,7 +2807,6 @@
 DocType: Bin,Actual Quantity,Số lượng thực tế
 DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Số thứ tự {0} không tìm thấy
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},Đăng ký đã được {0}
 DocType: Fee Schedule Program,Fee Schedule Program,Chương trình Biểu phí
 DocType: Fee Schedule Program,Student Batch,hàng loạt sinh viên
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,Tạo Sinh viên
@@ -2808,14 +2822,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,Thương mại điện tử GSTIN
 DocType: Sales Order,Not Delivered,Không được vận chuyển
 ,Bank Clearance Summary,Bản tóm lược giải tỏa ngân hàng
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
 DocType: Appraisal Goal,Appraisal Goal,Thẩm định mục tiêu
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,Đề xuất loại?
 DocType: Stock Reconciliation Item,Current Amount,Số tiền hiện tại
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,Các tòa nhà
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,Các tòa nhà
 DocType: Fee Schedule,Fee Structure,Cơ cấu phí
 DocType: Timesheet Detail,Costing Amount,Chi phí tiền
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 DocType: Student Admission Program,Application Fee,Phí đăng ký
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,Trình Lương trượt
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,Giảm giá tối đa cho mục {0} {1}%
@@ -2823,12 +2836,13 @@
 DocType: Sales Partner,Address & Contacts,Địa chỉ & Liên hệ
 DocType: SMS Log,Sender Name,Tên người gửi
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,Tiêu chí Phân tích Nông nghiệp
+DocType: HR Settings,Leave Approval Notification Template,Để lại mẫu thông báo phê duyệt
 DocType: POS Profile,[Select],[Chọn]
 DocType: Vital Signs,Blood Pressure (diastolic),Huyết áp (tâm trương)
 DocType: SMS Log,Sent To,Gửi Đến
 DocType: Agriculture Task,Holiday Management,Quản lý kỳ nghỉ
 DocType: Payment Request,Make Sales Invoice,Làm Mua hàng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,phần mềm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,phần mềm
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể  ở dạng quá khứ
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},Bác sĩ {0} không có mặt trên {1}
@@ -2846,7 +2860,7 @@
 DocType: Employee,New Workplace,Nơi làm việc mới
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,Vật tư tiêu hao
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Đặt làm đóng
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},Không có  mẫu hàng với mã vạch {0}
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},Không có  mẫu hàng với mã vạch {0}
 DocType: Normal Test Items,Require Result Value,Yêu cầu Giá trị Kết quả
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,BOMs
@@ -2861,19 +2875,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,Không có cấu trúc lương có hiệu lực hoặc mặc định được tìm thấy cho nhân viên {0} với các kỳ hạn có sẵn
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
 DocType: Purchase Order,Customer Mobile No,Số điện thoại khách hàng
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,Định kỳ
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Chi tiết Mẫu Bản đồ Tiền mặt
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,Quản lý khoản vay
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Theo dõi thu nhập và chi phí riêng cho ngành dọc sản phẩm hoặc bộ phận.
 DocType: Rename Tool,Rename Tool,Công cụ đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,Trượt Hiện Lương
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,Trượt Hiện Lương
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,Vật liệu chuyển
 DocType: Fees,Send Payment Request,Gửi yêu cầu thanh toán
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và số hiệu của  một hoạt động độc nhất tới các hoạt động của bạn"
 DocType: Water Analysis,Origin,Gốc
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này bị quá giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,tài khoản số lượng Chọn thay đổi
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
@@ -2888,14 +2902,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,Trách nhiệm pháp lý về Thuế thu nhập
 DocType: Grading Scale Interval,Grade Description,lớp Mô tả
 DocType: Stock Entry,Purchase Receipt No,Số biên lai nhận hàng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền cọc
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Tiền cọc
 DocType: Sales Invoice, Shipping Bill Number,Số vận đơn
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Truy xuất nguồn gốc
 DocType: Asset Maintenance Log,Actions performed,Tác vụ đã thực hiện
 DocType: Cash Flow Mapper,Section Leader,Lãnh đạo nhóm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Nguồn vốn (nợ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),Nguồn vốn (nợ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Nhân viên
+DocType: Bank Guarantee,Fixed Deposit Number,Số tiền gửi cố định
 DocType: Asset Repair,Failure Date,Ngày Thất bại
 DocType: Sample Collection,Collected Time,Thời gian thu thập
 DocType: Company,Sales Monthly History,Lịch sử hàng tháng bán hàng
@@ -2912,10 +2927,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,Bạn có chắc chắn muốn hủy cuộc hẹn này không?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Gói giá phòng khách sạn
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Đường ống dẫn bán hàng
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Đã yêu cầu với
 DocType: Rename Tool,File to Rename,Đổi tên tệp tin
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,Tìm nạp cập nhật đăng ký
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},Tài khoảng {0} không phù hợp với Công ty {1} tại phương thức tài khoản: {2}
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,Khóa học:
@@ -2925,7 +2941,7 @@
 DocType: Notification Control,Expense Claim Approved,Chi phí khiếu nại được phê duyệt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,Không có Đơn đặt hàng làm việc nào được tạo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Phiếu lương của nhân viên {0} đã được tạo ra trong giai đoạn này
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Dược phẩm
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,Dược phẩm
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Selling Settings,Sales Order Required,Đơn đặt hàng đã yêu cầu
 DocType: Purchase Invoice,Credit To,Để tín dụng
@@ -2943,7 +2959,7 @@
 DocType: Request for Quotation Supplier,No Quote,Không có câu
 DocType: Warranty Claim,Raised By,đưa lên bởi
 DocType: Payment Gateway Account,Payment Account,Tài khoản thanh toán
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,Chênh lệch giá tịnh trong tài khoản phải thu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Đền bù Tắt
 DocType: Job Offer,Accepted,Chấp nhận
@@ -2956,7 +2972,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Hãy chắc chắn rằng bạn thực sự muốn xóa tất cả các giao dịch cho công ty này. Dữ liệu tổng thể của bạn vẫn được giữ nguyên. Thao tác này không thể được hoàn tác.
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,kết quả tìm kiếm
 DocType: Room,Room Number,Số phòng
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},Tham chiếu không hợp lệ {0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Tham chiếu không hợp lệ {0} {1}
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển nhãn hàng
 DocType: Journal Entry Account,Payroll Entry,Mục nhập biên chế
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,Xem Hồ sơ Phí
@@ -2966,7 +2982,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
 DocType: Lab Test Sample,Lab Test Sample,Mẫu thử nghiệm phòng thí nghiệm
 DocType: Item Variant Settings,Allow Rename Attribute Value,Cho phép Đổi tên Giá trị Thuộc tính
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,Bút toán nhật ký
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,Bút toán nhật ký
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu BOM đã được đối ứng với vật tư bất kỳ.
 DocType: Restaurant,Invoice Series Prefix,Tiền tố của Dòng hoá đơn
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
@@ -2974,8 +2990,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Tích hợp Google Maps không được bật
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} chưa được đệ trình
+DocType: Subscription,Trialling,Trialling
 DocType: Member,Membership Expiry Date,Ngày hết hạn thành viên
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0} phải là số âm trong tài liệu trả về
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0} phải là số âm trong tài liệu trả về
 ,Minutes to First Response for Issues,Các phút tới phản hồi đầu tiên cho kết quả
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,Tên của tổ chức  mà bạn đang thiết lập hệ thống này.
@@ -2994,7 +3011,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,Đơn vị đo
 DocType: Fiscal Year,Year End Date,Ngày kết thúc năm
 DocType: Task Depends On,Task Depends On,Nhiệm vụ Phụ thuộc vào
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,Cơ hội
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,Cơ hội
 DocType: Operation,Default Workstation,Mặc định Workstation
 DocType: Notification Control,Expense Claim Approved Message,Thông báo yêu cầu bồi thường chi phí được chấp thuận
 DocType: Payment Entry,Deductions or Loss,Các khoản giảm trừ khả năng mất vốn
@@ -3032,7 +3049,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,Để lại Nếu không phải trả tiền không phù hợp với hồ sơ Để lại ứng dụng đã được phê duyệt
 DocType: Campaign,Campaign-.####,Chiến dịch.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Những bước tiếp theo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
 DocType: Membership,USD,đô la Mỹ
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Làm cho hóa đơn
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,Số dư còn lại
@@ -3042,7 +3059,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,cuối Năm
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Báo giá/Tiềm năng %
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Báo giá/Tiềm năng %
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày gia nhập
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày gia nhập
 DocType: Driver,Driver,Người lái xe
 DocType: Vital Signs,Nutrition Values,Giá trị dinh dưỡng
 DocType: Lab Test Template,Is billable,Có thể thanh toán
@@ -3053,7 +3070,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),Ngày bắt đầu thực tế (thông qua thời gian biểu)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,Phạm vi Ageing 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,Tổng số tiền tạm ứng không được lớn hơn tổng số tiền đã yêu cầu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,Tổng số tiền tạm ứng không được lớn hơn tổng số tiền đã yêu cầu
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3088,7 +3105,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất {0} nhiều hơn số lượng trên đơn đặt hàng {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,Chọn Giá trị Thuộc tính
 DocType: Purchase Invoice,Reason For Issuing document,Lý do phát hành tài liệu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Bút toán hàng tồn kho{0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,Bút toán hàng tồn kho{0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng /Tiền mặt
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,"""Liên hệ Tiếp theo bởi "" không thể giống như Địa chỉ Email của tiềm năng"
 DocType: Tax Rule,Billing City,Thành phố thanh toán
@@ -3105,7 +3122,8 @@
 DocType: Warranty Claim,Service Address,Địa chỉ dịch vụ
 DocType: Asset Maintenance Task,Calibration,Hiệu chuẩn
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0} là một kỳ nghỉ của công ty
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Nội thất và Đèn
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,Để lại thông báo trạng thái
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,Nội thất và Đèn
 DocType: Item,Manufacture,Chế tạo
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,Thiết lập công ty
 ,Lab Test Report,Báo cáo thử nghiệm Lab
@@ -3121,7 +3139,6 @@
 DocType: Crop,Planting Area,Diện tích trồng trọt
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Điều này có thể là do một số địa chỉ email không hợp lệ trong
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,Bạn đã thêm
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Kết quả đào tạo
@@ -3131,16 +3148,17 @@
 DocType: Products Settings,Products per Page,Sản phẩm trên mỗi trang
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ giá đầu ra
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,hoặc
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,hoặc
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Báo lỗi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Chi phí tiện ích
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,Chi phí tiện ích
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Trên - 90
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Hàng # {0}: Bút toán nhật ký {1} không có tài khoản {2} hoặc đã xuất hiện đối với chứng từ khác
 DocType: Supplier Scorecard Criteria,Criteria Weight,Tiêu chí Trọng lượng
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,Để lại thông báo phê duyệt
 DocType: Buying Settings,Default Buying Price List,Bảng giá mua hàng mặc định
 DocType: Payroll Entry,Salary Slip Based on Timesheet,Phiếu lương Dựa trên bảng thời gian
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tỷ lệ mua
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,Tỷ lệ mua
 DocType: Notification Control,Sales Order Message,Thông báo đơn đặt hàng
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Thiết lập giá trị mặc định như Công ty, tiền tệ, năm tài chính hiện tại, vv"
 DocType: Payment Entry,Payment Type,Loại thanh toán
@@ -3163,6 +3181,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Cài đặt giỏ hàng mua sắm
 DocType: Journal Entry,Accounting Entries,Các bút toán hạch toán
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nếu chọn Quy tắc Đặt giá cho &#39;Tỷ lệ&#39;, nó sẽ ghi đè lên Bảng giá. Định mức giá là tỷ lệ cuối cùng, vì vậy không nên giảm giá thêm nữa. Do đó, trong các giao dịch như Đơn đặt hàng Bán hàng, Đặt hàng mua hàng vv, nó sẽ được tìm nạp trong trường &#39;Giá&#39;, chứ không phải là trường &#39;Bảng giá Giá&#39;."
+DocType: Journal Entry,Paid Loan,Trả tiền vay
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},HIện bút toán trùng lặp. Vui lòng kiểm tra Quy định ủy quyền {0}
 DocType: Journal Entry Account,Reference Due Date,Ngày hết hạn tham chiếu
 DocType: Purchase Order,Ref SQ,Tài liệu tham khảo SQ
@@ -3179,7 +3198,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bảng lương
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
 DocType: Patient Service Unit,Parent Service Unit,Đơn vị Dịch vụ Phụ Huynh
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,Tạo người dùng
 DocType: Packing Slip,Identification of the package for the delivery (for print),Xác định các gói hàng cho việc giao hàng (cho  in ấn)
@@ -3198,7 +3217,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,Tài khoản thu nhập
 DocType: Payment Request,Amount in customer's currency,Tiền quy đổi theo ngoại tệ của khách
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,Giao hàng
 DocType: Volunteer,Weekdays,Ngày thường
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 DocType: Restaurant Menu,Restaurant Menu,Thực đơn nhà hàng
@@ -3206,7 +3225,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,Trách nhiệm chính
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Các đợt sinh viên giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,Thiết lập tài khoản kho mặc định cho kho vĩnh viễn
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,Thiết lập tài khoản kho mặc định cho kho vĩnh viễn
 DocType: Item Reorder,Material Request Type,Loại nguyên liệu yêu cầu
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,Gửi Email đánh giá tài trợ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save","Lưu trữ Cục bộ là đầy đủ, không lưu"
@@ -3214,10 +3233,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,Dung tích phòng
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},Bản ghi đã tồn tại cho mục {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Tài liệu tham khảo
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,Bạn sẽ mất các bản ghi hóa đơn đã tạo trước đó. Bạn có chắc chắn muốn khởi động lại đăng ký này không?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Phí đăng ký
 DocType: Budget,Cost Center,Bộ phận chi phí
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,Chứng từ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Chứng từ #
 DocType: Notification Control,Purchase Order Message,Thông báo Mua hàng
 DocType: Tax Rule,Shipping Country,Vận Chuyển quốc gia
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ẩn MST của khách hàng từ giao dịch bán hàng
@@ -3226,20 +3246,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Quy tắc định giá được thực hiện để ghi đè lên Giá liệt kê / xác định tỷ lệ phần trăm giảm giá, dựa trên một số tiêu chí."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Kho chỉ có thể biến động phát sinh thông qua chứng từ nhập kho / BB giao hàng (bán) / BB nhận hàng (mua)
 DocType: Employee Education,Class / Percentage,Lớp / Tỷ lệ phần trăm
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Thuế thu nhập
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Theo dõi Tiềm năng theo Loại Ngành.
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,Tới Tiêu đề thư
+DocType: Subscription,Cancel At End Of Period,Hủy vào cuối kỳ
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,Không có mục nào được chọn để chuyển
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,Không có mục nào được chọn để chuyển
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Kết hợp chỉ có hiệu lực nếu các tài sản dưới đây giống nhau trong cả hai bản ghi. Là nhóm, kiểu gốc, Công ty"
 DocType: Vehicle,Electric,Điện
 DocType: Task,% Progress,% đang xử lý
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Lãi / lỗ khi nhượng lại tài sản
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,Lãi / lỗ khi nhượng lại tài sản
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",Chỉ học sinh có tình trạng &quot;Chấp nhận&quot; sẽ được chọn trong bảng dưới đây.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,Số tài khoản cho tài khoản {0} không có sẵn. <br> Xin vui lòng thiết lập chính xác bảng xếp hạng của bạn.
 DocType: Task,Depends on Tasks,Phụ thuộc vào nhiệm vụ
@@ -3254,6 +3275,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,Không trong kho
 DocType: Volunteer,Volunteer Skills,Kỹ năng Tình nguyện
 DocType: Appraisal,HR User,Người sử dụng nhân sự
+DocType: Bank Guarantee,Reference Document Name,Tên tài liệu tham khảo
 DocType: Purchase Invoice,Taxes and Charges Deducted,Thuế và lệ phí được khấu trừ
 apps/erpnext/erpnext/hooks.py +142,Issues,Vấn đề
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tình trạng phải là một trong {0}
@@ -3267,7 +3289,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1} bị vô hiệu
 DocType: Supplier,Billing Currency,Ngoại tệ thanh toán
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Cực lớn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,Cực lớn
+DocType: Loan,Loan Application,Đơn xin vay tiền
 DocType: Crop,Scientific Name,Tên khoa học
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Tổng số nghỉ phép
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Chọn lại, nếu liên hệ đã chọn được chỉnh sửa sau khi lưu"
@@ -3276,13 +3299,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Số séc
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # {1} khác tồn tại gắn với phát sinh nhập kho {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # {1} khác tồn tại gắn với phát sinh nhập kho {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Các khoản cho vay và Tiền đặt trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Lớn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,Lớn
 DocType: Homepage Featured Product,Homepage Featured Product,Sản phẩm nổi bật trên trang chủ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,Tất cả đánh giá Groups
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,Tất cả đánh giá Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,tên kho mới
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),Tổng số {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Địa bàn
@@ -3303,9 +3326,10 @@
 DocType: Fees,Fees,phí
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Xác định thị trường ngoại tệ để chuyển đổi một giá trị tiền tệ với một giá trị khác
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,Tổng số tiền nợ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,Tổng số tiền nợ
 DocType: Sales Partner,Targets,Mục tiêu
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,Vui lòng đăng ký số SIREN trong tệp thông tin công ty
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng thiết lập Hệ thống đặt tên nhân viên trong nguồn nhân lực&gt; Cài đặt nhân sự
 DocType: Price List,Price List Master,Giá Danh sách Thầy
 DocType: GST Account,CESS Account,Tài khoản CESS
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả các giao dịch bán hàng đều được gắn tag với nhiều **Nhân viên kd **  vì thế bạn có thể thiết lập và giám sát các mục tiêu kinh doanh
@@ -3314,6 +3338,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Chọn bệnh nhân
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Tên thông số
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Chỉ Rời khỏi ứng dụng với tình trạng &#39;Chấp Nhận&#39; và &#39;từ chối&#39; có thể được gửi
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Tên sinh viên Group là bắt buộc trong hàng {0}
 DocType: Homepage,Products to be shown on website homepage,Sản phẩm sẽ được hiển thị trên trang chủ của trang web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Đây là một nhóm khách hàng gốc và không thể được chỉnh sửa.
@@ -3359,14 +3384,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,Hóa đơn đã được tạo cho tất cả giờ thanh toán
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Tên lỗi: {0}
 DocType: Cash Flow Mapping,Is Finance Cost,Chi phí Tài chính
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Vui lòng đặt khách hàng mặc định trong Cài đặt nhà hàng
 ,Salary Register,Mức lương Đăng ký
 DocType: Warehouse,Parent Warehouse,Kho chính
-DocType: C-Form Invoice Detail,Net Total,Tổng thuần
+DocType: Subscription,Net Total,Tổng thuần
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},Không tìm thấy BOM mặc định cho Mục {0} và Dự án {1}
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Xác định các loại cho vay khác nhau
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,Xác định các loại cho vay khác nhau
 DocType: Bin,FCFS Rate,FCFS Tỷ giá
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Số tiền nợ
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Thời gian (bằng phút)
@@ -3398,11 +3423,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,Tài khoản gốc phải là một nhóm
 DocType: Drug Prescription,Drug Prescription,Thuốc theo toa
 DocType: Fees,FEE.,CHI PHÍ.
-DocType: Employee Loan,Repaid/Closed,Hoàn trả / đóng
+DocType: Loan,Repaid/Closed,Hoàn trả / đóng
 DocType: Item,Total Projected Qty,Tổng số lượng đã được lên dự án
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tỷ lệ định giá không tìm thấy cho Mục {0}, yêu cầu phải làm các mục kế toán cho {1} {2}. Nếu mục đang giao dịch dưới dạng mục tỷ lệ không bằng giá trị trong {1}, vui lòng đề cập rằng trong mục {1} Bảng mục. Nếu không, vui lòng tạo một giao dịch chứng khoán đến cho mặt hàng hoặc đề cập đến tỷ lệ định giá trong bản ghi mục, và sau đó thử gửi / hủy mục nhập này"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 DocType: Course,Course Code,Mã khóa học
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},Duyệt chất lượng là cần thiết cho mục {0}
 DocType: POS Settings,Use POS in Offline Mode,Sử dụng POS trong chế độ Ngoại tuyến
@@ -3422,16 +3446,15 @@
 DocType: Purchase Invoice,Deemed Export,Xuất khẩu được cho là hợp pháp
 DocType: Stock Entry,Material Transfer for Manufacture,Vận chuyển nguyên liệu để sản xuất
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Tỷ lệ phần trăm giảm giá có thể được áp dụng hoặc chống lại một danh sách giá hay cho tất cả Bảng giá.
-DocType: Subscription,Half-yearly,Nửa năm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
 DocType: Lab Test,LabTest Approver,Người ước lượng LabTest
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,Bạn đã đánh giá các tiêu chí đánh giá {}.
 DocType: Vehicle Service,Engine Oil,Dầu động cơ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},Đơn hàng Công việc Đã Được Tạo: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},Đơn hàng Công việc Đã Được Tạo: {0}
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
-DocType: Employee Loan,Loan Details,Chi tiết vay
+DocType: Loan,Loan Details,Chi tiết vay
 DocType: Company,Default Inventory Account,tài khoản mặc định
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,Các số folio không khớp
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,dãy {0}: Đã hoàn thành Số lượng phải lớn hơn không.
@@ -3443,19 +3466,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Liên kết đến tất cả các Đơn vị Đất đai trong đó Cây trồng đang phát triển
 DocType: Account,Root Type,Loại gốc
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},Hàng # {0}: Không thể trả về nhiều hơn {1} cho mẫu hàng {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},Hàng # {0}: Không thể trả về nhiều hơn {1} cho mẫu hàng {2}
 DocType: Item Group,Show this slideshow at the top of the page,Hiển thị slideshow này ở trên cùng của trang
 DocType: BOM,Item UOM,Đơn vị tính cho mục
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Số tiền thuế Sau khuyến mãi (Tiền công ty)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
 DocType: Cheque Print Template,Primary Settings,Cài đặt chính
 DocType: Purchase Invoice,Select Supplier Address,Chọn nhà cung cấp Địa chỉ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,Thêm nhân viên
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,Thêm nhân viên
 DocType: Purchase Invoice Item,Quality Inspection,Kiểm tra chất lượng
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Tắm nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,Tắm nhỏ
 DocType: Company,Standard Template,Mẫu chuẩn
 DocType: Training Event,Theory,Lý thuyết
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Tài khoản {0} bị đóng băng
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
 DocType: Payment Request,Mute Email,Tắt tiếng email
@@ -3475,11 +3498,10 @@
 DocType: SMS Log,No of Sent SMS,Số các tin SMS đã gửi
 DocType: Antibiotic,Healthcare Administrator,Quản trị viên chăm sóc sức khoẻ
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,Đặt một mục tiêu
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 DocType: Dosage Strength,Dosage Strength,Sức mạnh liều
 DocType: Account,Expense Account,Tài khoản chi phí
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Phần mềm
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Màu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,Màu
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Tiêu chuẩn Kế hoạch đánh giá
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,Ngày hết hạn là bắt buộc đối với mặt hàng đã chọn
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Ngăn chặn Đơn đặt hàng
@@ -3492,18 +3514,18 @@
 DocType: Patient,Personal and Social History,Lịch sử cá nhân và xã hội
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Người dùng {0} đã tạo
 DocType: Fee Schedule,Fee Breakup for each student,Phí phân chia cho mỗi học sinh
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Tổng cộng ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Tổng cộng ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Thay đổi Mã
 DocType: Purchase Invoice Item,Valuation Rate,Định giá
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dầu diesel
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
 DocType: Purchase Invoice,Availed ITC Cess,Có sẵn ITC Cess
 ,Student Monthly Attendance Sheet,Sinh viên tham dự hàng tháng Bảng
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Quy tắc vận chuyển chỉ áp dụng cho Bán hàng
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,Cho đến khi
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Lịch Sinh Hoạt của Nhóm Sinh Viên hoặc Khóa Học là bắt buộc
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Lịch Sinh Hoạt của Nhóm Sinh Viên hoặc Khóa Học là bắt buộc
@@ -3524,7 +3546,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Liệt kê các sản phẩm hoặc dịch vụ bạn mua hoặc bán.
 DocType: Water Analysis,Storage Temperature,Nhiệt độ lưu trữ
 DocType: Employee Attendance Tool,Unmarked Attendance,không có mặt
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Nhà nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,Nhà nghiên cứu
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Chương trình học sinh ghi danh Công cụ
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},Ngày bắt đầu phải ngắn hơn ngày kết thúc cho công việc {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Tên hoặc Email là bắt buộc
@@ -3537,7 +3559,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và các yêu cầu RFQ cho nhà cung cấp này phải được ban hành thận trọng.
 DocType: Chapter,Non Profit Manager,Quản lý phi lợi nhuận
 DocType: BOM,Total Cost(Company Currency),Tổng chi phí (Công ty ngoại tệ)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,Không nối tiếp {0} tạo
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,Không nối tiếp {0} tạo
 DocType: Homepage,Company Description for website homepage,Công ty Mô tả cho trang chủ của trang web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã này có thể được sử dụng trong các định dạng in hóa đơn và biên bản giao hàng"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Tên suplier
@@ -3547,11 +3569,10 @@
 DocType: Employee,You can enter any date manually,Bạn có thể nhập bất kỳ ngày bằng thủ công
 DocType: Healthcare Settings,Result Printed,Kết quả in
 DocType: Asset Category Account,Depreciation Expense Account,TK Chi phí Khấu hao
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,Thời gian thử việc
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Xem {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,Thời gian thử việc
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Project,Total Costing Amount (via Timesheets),Tổng số tiền chi phí (thông qua Timesheets)
-DocType: Employee Advance,Expense Approver,Người phê duyệt chi phí
+DocType: Department,Expense Approver,Người phê duyệt chi phí
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Dòng số {0}: Khách hàng tạm ứng phải bên Có
 DocType: Project,Hourly,Hàng giờ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,Không nhóm tới Nhóm
@@ -3561,7 +3582,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Tới ngày giờ
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,Các đăng nhập cho việc duy trì tin nhắn  tình trạng giao hàng
 DocType: Accounts Settings,Make Payment via Journal Entry,Hãy thanh toán qua Journal nhập
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,In vào
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,In vào
 DocType: Item,Inspection Required before Delivery,Kiểm tra bắt buộc trước khi giao hàng
 DocType: Item,Inspection Required before Purchase,Kiểm tra bắt buộc trước khi mua hàng
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Các hoạt động cấp phát
@@ -3571,7 +3592,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,Số lượng đặt hàng tối thiểu
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,Tổ chức của bạn
 DocType: Fee Component,Fees Category,phí Thể loại
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,Vui lòng nhập ngày giảm.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Thông báo cho nhân viên
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nhập tên của chiến dịch nếu nguồn gốc của cuộc điều tra là chiến dịch
@@ -3581,7 +3602,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,Sắp xếp lại Cấp
 DocType: Company,Chart Of Accounts Template,Chart of Accounts Template
 DocType: Attendance,Attendance Date,Ngày có mặt
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},Giá mẫu hàng cập nhật cho {0} trong Danh sách  {1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},Giá mẫu hàng cập nhật cho {0} trong Danh sách  {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Chia tiền lương dựa trên thu nhập và khấu trừ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,Tài khoản có các nút TK con không thể chuyển đổi sang sổ cái được
 DocType: Purchase Invoice Item,Accepted Warehouse,Xác nhận kho hàng
@@ -3589,10 +3610,11 @@
 DocType: Item,Valuation Method,Phương pháp định giá
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Đánh dấu Nửa ngày
 DocType: Sales Invoice,Sales Team,Đội ngũ bán hàng
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,Bút toán trùng lặp
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Bút toán trùng lặp
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,Nhập tên của người thụ hưởng trước khi gửi.
 DocType: Program Enrollment Tool,Get Students,Nhận học sinh
 DocType: Serial No,Under Warranty,Theo Bảo hành
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[Lỗi]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[Lỗi]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,'Bằng chữ' sẽ được hiển thị khi bạn lưu đơn bán hàng.
 ,Employee Birthday,Nhân viên sinh nhật
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,Vui lòng chọn Thời điểm hoàn thành để hoàn thành việc sửa chữa
@@ -3611,7 +3633,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,Dành cho hợp đồng phụ
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
 DocType: Shopping Cart Settings,Orders,Đơn đặt hàng
-DocType: Employee Leave Approver,Leave Approver,Để phê duyệt
+DocType: Department,Leave Approver,Để phê duyệt
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,Vui lòng chọn một đợt
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,Tên Nhóm Đánh giá
@@ -3656,7 +3678,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Mục theo dõi trung tâm
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,HƯỚNG D ORN ĐỂ NHẬN
 DocType: Asset Category Account,Accumulated Depreciation Account,Tài khoản khấu hao lũy kế
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Email này được tạo tự động
 DocType: Stock Settings,Freeze Stock Entries,Bút toán đóng băng tồn kho
 DocType: Program Enrollment,Boarding Student,Sinh viên nội trú
 DocType: Asset,Expected Value After Useful Life,Giá trị dự kiến After Life viết
@@ -3681,22 +3702,22 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Attendance Ghi {0} tồn tại đối với Sinh viên {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},THam chiếu # {0} được đặt kỳ hạn {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,Khấu hao Loại bỏ do thanh lý tài sản
-DocType: Member,Member,Hội viên
+DocType: Loan,Member,Hội viên
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Quản lý địa chỉ
 DocType: Work Order Item,Work Order Item,Đơn hàng công việc
 DocType: Pricing Rule,Item Code,Mã hàng
 DocType: Serial No,Warranty / AMC Details,Bảo hành /chi tiết AMC
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
 DocType: Journal Entry,User Remark,Lưu ý người dùng
 DocType: Lead,Market Segment,Phân khúc thị trường
 DocType: Agriculture Analysis Criteria,Agriculture Manager,Quản lý Nông nghiệp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
 DocType: Supplier Scorecard Period,Variables,Biến
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Cheque Print Template,Cheque Size,Kích Séc
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Mẫu thông số thuế cho các giao dịch bán hàng
 DocType: Sales Invoice,Write Off Outstanding Amount,Viết Tắt số lượng nổi bật
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Tài khoản {0} không phù hợp với Công ty {1}
@@ -3705,7 +3726,6 @@
 DocType: Stock Settings,Default Stock UOM,Mặc định Cổ UOM
 DocType: Asset,Number of Depreciations Booked,Số khấu hao Thẻ Vàng
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,Tổng số
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Chống lại nhân viên cho vay: {0}
 DocType: Landed Cost Item,Receipt Document,Chứng từ thư
 DocType: Employee Education,School/University,Học / Đại học
 DocType: Payment Request,Reference Details,Chi tiết tham khảo
@@ -3716,7 +3736,7 @@
 DocType: Asset,Double Declining Balance,Đôi Balance sụt giảm
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,Để khép kín không thể bị hủy bỏ. Khám phá hủy.
 DocType: Student Guardian,Father,Cha
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,'Cập Nhật kho hàng' không thể được kiểm tra  việc buôn bán tài sản cố định
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,'Cập Nhật kho hàng' không thể được kiểm tra  việc buôn bán tài sản cố định
 DocType: Bank Reconciliation,Bank Reconciliation,Bảng đối chiếu tài khoản ngân hàng
 DocType: Attendance,On Leave,Nghỉ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nhận thông tin cập nhật
@@ -3730,10 +3750,10 @@
 DocType: Lead,Lower Income,Thu nhập thấp
 DocType: Restaurant Order Entry,Current Order,Đơn hàng hiện tại
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},Nguồn và kho đích không thể giống nhau tại hàng {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,Đi đến Chương trình
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Hàng {0} # Số tiền được phân bổ {1} không được lớn hơn số tiền chưa được xác nhận {2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Hàng {0} # Số tiền được phân bổ {1} không được lớn hơn số tiền chưa được xác nhận {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải sau 'Đến Ngày'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
@@ -3756,7 +3776,6 @@
 DocType: Payment Terms Template,Payment Terms,Điều khoản thanh toán
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Phút
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
 DocType: Purchase Invoice,Purchase Taxes and Charges,Mua các loại thuế và các loại tiền công
 DocType: Chapter,Meetup Embed HTML,Nhúng HTML Meetup HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,Chuyển đến Nhà cung cấp
@@ -3776,30 +3795,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Báo giá {0} không thuộc loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Đã giao
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Vui lòng đặt ID Email cho Sinh viên để gửi yêu cầu Thanh toán
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,Vui lòng đặt ID Email cho Sinh viên để gửi yêu cầu Thanh toán
 DocType: Patient,Medical History,Tiền sử bệnh
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 DocType: Patient,Patient ID,ID Bệnh nhân
 DocType: Physician Schedule,Schedule Name,Tên Lịch
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Làm cho lương trượt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,Thêm Tất cả Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,Thêm Tất cả Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Hàng # {0}: Khoản tiền phân bổ không thể lớn hơn số tiền chưa thanh toán.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,duyệt BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Các khoản cho vay được bảo đảm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,Các khoản cho vay được bảo đảm
 DocType: Purchase Invoice,Edit Posting Date and Time,Chỉnh sửa ngày và giờ đăng
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Hãy thiết lập tài khoản liên quan Khấu hao trong phân loại của cải {0} hoặc Công ty {1}
 DocType: Lab Test Groups,Normal Range,Dãy thông thường
 DocType: Academic Term,Academic Year,Năm học
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,Bán có sẵn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Khai mạc Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,Khai mạc Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,còn lại
 DocType: Appraisal,Appraisal,Thẩm định
+DocType: Loan,Loan Account,Tài khoản cho vay
 DocType: Purchase Invoice,GST Details,Chi tiết GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},Email đã được gửi đến NCC {0}
 DocType: Item,Default Sales Unit of Measure,Đơn vị Bán hàng mặc định của Đo lường
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,Năm học:
+DocType: Subscription,Past Due Date,Ngày đến hạn
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},Không cho phép đặt mục thay thế cho mục {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ngày lặp lại
@@ -3812,7 +3833,7 @@
 DocType: Patient Appointment,Patient Appointment,Bổ nhiệm Bệnh nhân
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Phê duyệt Vai trò không thể giống như vai trò của quy tắc là áp dụng để
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Hủy đăng ký từ Email phân hạng này
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,Nhận các nhà cung cấp theo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,Nhận các nhà cung cấp theo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0} không tìm thấy cho khoản {1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,Đi tới các Khoá học
 DocType: Accounts Settings,Show Inclusive Tax In Print,Hiển thị Thuế Nhập Khẩu
@@ -3820,10 +3841,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gửi tin nhắn
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Không thể thiết lập là sổ cái vì Tài khoản có các node TK con
 DocType: C-Form,II,II
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Hướng dẫn trong Giáo dục&gt; Cài đặt Giáo dục
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,tỷ giá mà báo giá được quy đổi về tỷ giá khách hàng chung
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Số lượng tịnh(tiền tệ công ty)
 DocType: Physician,Physician Schedules,Lịch bác sĩ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,Tổng số tiền tạm ứng không được lớn hơn tổng số tiền bị xử phạt
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,Tổng số tiền tạm ứng không được lớn hơn tổng số tiền bị xử phạt
 DocType: Salary Slip,Hour Rate,Tỷ lệ giờ
 DocType: Stock Settings,Item Naming By,Mẫu hàng đặt tên bởi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
@@ -3841,6 +3863,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Không được cập nhật giao dịch tồn kho cũ hơn {0}
 DocType: BOM,Inspection Required,Kiểm tra yêu cầu
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,Nhập số bảo lãnh của ngân hàng trước khi gửi.
 DocType: Driving License Category,Class,Lớp học
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,Đơn đặt hàng công việc không được tăng lên so với Mẫu mặt hàng
@@ -3851,7 +3874,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường là khối lượng tịnh + trọng lượng vật liệu. (Đối với việc in)
 DocType: Assessment Plan,Program,chương trình
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Người dạy học trong Giáo dục&gt; Cài đặt Giáo dục
 DocType: Serial No,Is Cancelled,Được hủy bỏ
 DocType: Student Group,Group Based On,Dựa trên nhóm
 DocType: Student Group,Group Based On,Dựa trên nhóm
@@ -3863,9 +3885,10 @@
 DocType: Cheque Print Template,Cheque Height,Chiều cao Séc
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
 DocType: Setup Progress,Setup Progress,Tiến trình thiết lập
+DocType: Expense Claim,Approval Status,Tình trạng chính
 DocType: Hub Settings,Publish Items to Hub,Xuất bản mẫu hàng tới trung tâm
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Từ giá trị phải nhỏ hơn giá trị trong hàng {0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Chuyển khoản
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Kiểm tra tất cả
 ,Issued Items Against Work Order,Các hạng mục đã phát hành đối với Đơn đặt hàng Làm việc
 DocType: Vehicle Log,Invoice Ref,Tham chiếu hóa đơn
@@ -3896,12 +3919,11 @@
 DocType: Customs Tariff Number,Tariff Number,Số thuế
 DocType: Work Order Item,Available Qty at WIP Warehouse,Số lượng có sẵn tại WIP Warehouse
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Dự kiến
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra  phân phối quá mức và đặt trước quá mức cho mẫu {0} như số lượng hoặc số lượng là 0
 DocType: Notification Control,Quotation Message,thông tin báo giá
-DocType: Employee Loan,Employee Loan Application,Ứng dụng lao động cho vay
 DocType: Issue,Opening Date,Mở ngày
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,Xin lưu bệnh nhân đầu tiên
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,Xin lưu bệnh nhân đầu tiên
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Tham dự đã được đánh dấu thành công.
 DocType: Program Enrollment,Public Transport,Phương tiện giao thông công cộng
 DocType: Soil Texture,Silt Composition (%),Thành phần Silt (%)
@@ -3920,7 +3942,7 @@
 ,Item Balance (Simple),Số dư mục (Đơn giản)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Hóa đơn từ NCC
 DocType: POS Profile,Write Off Account,Viết Tắt tài khoản
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,Nợ tiền mặt amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,Nợ tiền mặt amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Trả về với hóa đơn mua hàng
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong...ngày)
@@ -3943,6 +3965,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,Ngày đơn đặt hàng
 DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
 DocType: Assessment Plan,Assessment Plan,Kế hoạch đánh giá
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Đã tạo {0} khách hàng.
 DocType: Stock Settings,Limit Percent,phần trăm giới hạn
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hiện tại không có hàng hóa dự trữ nào trong nhà kho
@@ -3956,14 +3979,15 @@
 DocType: Journal Entry,Stock Entry,Chứng từ kho
 DocType: Payment Entry,Payment References,Tài liệu tham khảo thanh toán
 DocType: C-Form,C-FORM-,C-MẪU-
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days","Số khoảng thời gian cho trường khoảng thời gian, ví dụ: nếu Khoảng thời gian là &#39;Ngày&#39; và Số lượng khoảng thời gian thanh toán là 3, hóa đơn sẽ được tạo 3 ngày một lần"
 DocType: Vehicle,Insurance Details,Chi tiết bảo hiểm
 DocType: Account,Payable,Phải nộp
 DocType: Share Balance,Share Type,Loại chia sẻ
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vui lòng nhập kỳ hạn trả nợ
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,Vui lòng nhập kỳ hạn trả nợ
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),Con nợ ({0})
 DocType: Pricing Rule,Margin,Biên
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Khách hàng mới
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Lợi nhuận gộp%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Lợi nhuận gộp%
 DocType: Appraisal Goal,Weightage (%),Trọng lượng(%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,Thay đổi Hồ sơ POS
 DocType: Bank Reconciliation Detail,Clearance Date,Ngày chốt sổ
@@ -3973,10 +3997,11 @@
 DocType: Lead,Address Desc,Giải quyết quyết định
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,Đối tác là bắt buộc
 DocType: Journal Entry,JV-,JV-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},Đã tìm thấy các hàng trùng lặp trong các hàng khác: {list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},Đã tìm thấy các hàng trùng lặp trong các hàng khác: {list}
 DocType: Topic,Topic Name,Tên chủ đề
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,Vui lòng đặt mẫu mặc định cho Thông báo chấp thuận để lại trong Cài đặt nhân sự.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,Ít nhất bán hàng hoặc mua hàng phải được lựa chọn
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,Chọn một nhân viên để có được nhân viên trước.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,Chọn một nhân viên để có được nhân viên trước.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,Vui lòng chọn ngày hợp lệ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Chọn bản chất của doanh nghiệp của bạn.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3995,7 +4020,7 @@
 DocType: Asset Movement,Source Warehouse,Kho nguồn
 DocType: Installation Note,Installation Date,Cài đặt ngày
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Chia sẻ sổ cái
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},Hàng # {0}: {1} tài sản không thuộc về công ty {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},Hàng # {0}: {1} tài sản không thuộc về công ty {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,Hóa đơn bán hàng {0} đã được tạo
 DocType: Employee,Confirmation Date,Ngày Xác nhận
 DocType: C-Form,Total Invoiced Amount,Tổng số tiền đã lập Hoá đơn
@@ -4004,7 +4029,7 @@
 DocType: Account,Accumulated Depreciation,Khấu hao lũy kế
 DocType: Supplier Scorecard Scoring Standing,Standing Name,Tên thường trực
 DocType: Stock Entry,Customer or Supplier Details,Chi tiết khách hàng hoặc nhà cung cấp
-DocType: Employee Loan Application,Required by Date,Theo yêu cầu của ngày
+DocType: Loan Application,Required by Date,Theo yêu cầu của ngày
 DocType: Lead,Lead Owner,Người sở hữu Tiềm năng
 DocType: Production Plan,Sales Orders Detail,Chi tiết đơn đặt hàng bán hàng
 DocType: Bin,Requested Quantity,yêu cầu Số lượng
@@ -4017,10 +4042,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Tổng trả- Tổng Trích - trả nợ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,ID Phiếu lương
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Nhiều biến thể
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Đã giao hàng
+DocType: Subscription,Trial Period Start Date,Ngày bắt đầu giai đoạn dùng thử
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,Vui lòng đăng nhập như một người dùng khác.
@@ -4041,12 +4067,11 @@
 DocType: Student Guardian,Student Guardian,Người giám hộ sinh viên
 DocType: Member,Member Name,Tên thành viên
 DocType: Stock Settings,Use Naming Series,Sử dụng Naming Series
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là toàn bộ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là toàn bộ
 DocType: POS Profile,Update Stock,Cập nhật hàng tồn kho
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,trong đăng ký
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến (Tổng) giá trị Trọng lượng Tịnh không chính xác. Hãy chắc chắn rằng Trọng lượng Tịnh của mỗi hạng mục là trong cùng một UOM.
 DocType: Membership,Payment Details,Chi tiết Thanh toán
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Tỷ giá BOM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,Tỷ giá BOM
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Đơn đặt hàng công việc đã ngừng làm việc không thể hủy, hãy dỡ bỏ nó trước để hủy bỏ"
 DocType: Asset,Journal Entry for Scrap,BÚt toán nhật ký cho hàng phế liệu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Hãy kéo các mục từ phiếu giao hàng
@@ -4066,6 +4091,7 @@
 DocType: Land Unit,Land Unit,Đơn vị đất
 ,Purchase Analytics,Phân tích mua hàng
 DocType: Sales Invoice Item,Delivery Note Item,Mục của Phiếu giao hàng
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,Hóa đơn hiện tại {0} bị thiếu
 DocType: Asset Maintenance Log,Task,Nhiệm vụ
 DocType: Purchase Taxes and Charges,Reference Row #,dãy tham chiếu #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Số hiệu Lô là bắt buộc đối với mục {0}
@@ -4078,7 +4104,7 @@
 DocType: Company,Exchange Gain / Loss Account,Trao đổi Gain / Tài khoản lỗ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Nhân viên và chấm công
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},Mục đích phải là một trong {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,Điền vào mẫu và lưu nó
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,Điền vào mẫu và lưu nó
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Cộng đồng Diễn đàn
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Số lượng thực tế trong kho
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Số lượng thực tế trong kho
@@ -4093,7 +4119,7 @@
 DocType: Lab Test Template,Standard Selling Rate,Tỷ giá bán hàng tiêu chuẩn
 DocType: Account,Rate at which this tax is applied,Tỷ giá ở mức thuế này được áp dụng
 DocType: Cash Flow Mapper,Section Name,Tên phần
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,Sắp xếp lại Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,Sắp xếp lại Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hiện tại Hở Job
 DocType: Company,Stock Adjustment Account,Tài khoản Điều chỉnh Hàng tồn kho
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Viết tắt
@@ -4104,9 +4130,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Hàng đợi để cập nhật giá mới nhất trong tất cả Hóa đơn. Có thể mất vài phút.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Tên tài khoản mới. Lưu ý: Vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nước khôn ngoan Địa chỉ mặc định Templates
 DocType: Water Analysis,Appearance,Xuất hiện
+DocType: HR Settings,Leave Status Notification Template,Để lại mẫu thông báo trạng thái
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,Avg. Giá mua Bảng giá
 DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,Thông tin thành viên.
@@ -4129,7 +4155,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,Không được phép. Vui lòng vô hiệu mẫu kiểm tra
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
 DocType: Crop Cycle,Linked Land Unit,Đơn vị Đất Liên kết
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Vui lòng chọn ngày đăng bài trước khi lựa chọn đối tác
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,Vui lòng chọn ngày đăng bài trước khi lựa chọn đối tác
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
@@ -4145,7 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,Chuyển đến Người dùng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} không phải là một dãy số hợp lệ với vật liệu  {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Loại di dời {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Loại di dời {0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,Tài khoản GST không hợp lệ hoặc nhập Không hợp lệ cho Không đăng ký
 DocType: Training Event,Seminar,Hội thảo
 DocType: Program Enrollment Fee,Program Enrollment Fee,Chương trình Lệ phí đăng ký
@@ -4161,14 +4187,14 @@
 DocType: Hub Settings,Publish Availability,Xuất bản hiệu lực
 DocType: Company,Create Chart Of Accounts Based On,Tạo Chart of Accounts Dựa On
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Không thể chuyển nó sang nhóm không. Nhiệm vụ trẻ em tồn tại.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
 ,Stock Ageing,Hàng tồn kho cũ dần
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},Sinh viên {0} tồn tại đối với người nộp đơn sinh viên {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Điều chỉnh Làm tròn (Đơn vị tiền tệ của Công ty)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Thời gian biểu
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Hàng loạt:
 DocType: Volunteer,Afternoon,Buổi chiều
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Cheque Print Template,Scanned Cheque,quét Séc
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động tới các Liên hệ khi Đệ trình các giao dịch.
@@ -4184,7 +4210,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,Dự án {0} đã tồn tại
 DocType: Medical Department,Nursing User,Người điều dưỡng
 DocType: Plant Analysis,Plant Analysis Criterias,Phân tích thực vật Tiêu chí
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,Trách nhiệm
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},Số sê-ri {0} không thuộc về Lô {1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,Trách nhiệm
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Thời hạn hiệu lực của báo giá này đã kết thúc.
 DocType: Expense Claim Account,Expense Claim Account,Tài khoản chi phí khiếu nại
 DocType: Accounts Settings,Allow Stale Exchange Rates,Cho phép tỷ giá hối đoái cũ
@@ -4206,11 +4233,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,Thực hiện các biến thể
 DocType: Item,Default BOM,BOM mặc định
 DocType: Project,Total Billed Amount (via Sales Invoices),Tổng số Khoản Thanh Toán (Thông qua Hóa Đơn Bán Hàng)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,khoản nợ tiền mặt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,khoản nợ tiền mặt
 DocType: Project Update,Not Updated,Chưa cập nhật
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated","Có sự không nhất quán giữa tỷ lệ, số cổ phần và số tiền được tính"
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,Tổng số nợ Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Journal Entry,Printing Settings,Cài đặt In ấn
 DocType: Employee Advance,Advance Account,Tài khoản trước
 DocType: Job Offer,Job Offer Terms,Điều khoản của việc làm
@@ -4219,7 +4246,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Ô tô
 DocType: Vehicle,Insurance Company,Công ty bảo hiểm
 DocType: Asset Category Account,Fixed Asset Account,Tài khoản TSCĐ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,biến số
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,biến số
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Từ Phiếu giao hàng
 DocType: Chapter,Members,Các thành viên
 DocType: Student,Student Email Address,Địa chỉ Email Sinh viên
@@ -4243,7 +4270,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Tập
 DocType: Delivery Stop,Address Name,Tên địa chỉ
 DocType: Stock Entry,From BOM,Từ BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},Tách {0} đơn vị của {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},Tách {0} đơn vị của {1}
 DocType: Assessment Code,Assessment Code,Mã Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Cơ bản
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Giao dịch hàng tồn kho trước ngày {0} được đóng băng
@@ -4251,25 +4278,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Số tham khảo là bắt buộc nếu bạn đã nhập vào kỳ hạn tham khảo
 DocType: Bank Reconciliation Detail,Payment Document,Tài liệu Thanh toán
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,Lỗi khi đánh giá công thức tiêu chuẩn
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,Ngày gia nhập phải lớn hơn ngày sinh
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Ngày gia nhập phải lớn hơn ngày sinh
+DocType: Subscription,Plans,Các kế hoạch
 DocType: Salary Slip,Salary Structure,Cơ cấu tiền lương
 DocType: Account,Bank,Ngân hàng
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Hãng hàng không
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,Vấn đề liệu
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,Đã xảy ra lỗi khi tạo định kỳ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho hàng
 DocType: Employee,Offer Date,Kỳ hạn Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Các bản dự kê giá
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,Không có nhóm học sinh được tạo ra.
 DocType: Purchase Invoice Item,Serial No,Không nối tiếp
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,SỐ tiền trả  hàng tháng không thể lớn hơn Số tiền vay
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,SỐ tiền trả  hàng tháng không thể lớn hơn Số tiền vay
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Thông tin chi tiết vui lòng nhập Maintaince đầu tiên
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Hàng # {0}: Ngày giao hàng dự kiến không được trước ngày đặt hàng mua hàng
 DocType: Purchase Invoice,Print Language,In Ngôn ngữ
 DocType: Salary Slip,Total Working Hours,Tổng số giờ làm việc
 DocType: Sales Invoice,Customer PO Details,Chi tiết khách hàng PO
-DocType: Subscription,Next Schedule Date,Ngày Lịch kế tiếp
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tài khoản Mở Tạm Thời
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,Nhập giá trị phải được tích cực
@@ -4298,11 +4324,11 @@
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,"""Từ ngày đến ngày"" phải có"
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Delivery Note Item,From Warehouse,Từ kho
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Không có nhân viên nào cho các tiêu chí đã đề cập
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
 DocType: Hotel Settings,Default Customer,Khách hàng Mặc định
 DocType: Assessment Plan,Supervisor Name,Tên Supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Không xác nhận nếu cuộc hẹn được tạo ra cho cùng một ngày
@@ -4327,16 +4353,16 @@
 DocType: Journal Entry Account,Employee Advance,Advance Employee
 DocType: Payroll Entry,Payroll Frequency,Biên chế tần số
 DocType: Lab Test Template,Sensitivity,Nhạy cảm
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,Nguyên liệu thô
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,Nguyên liệu thô
 DocType: Leave Application,Follow via Email,Theo qua email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Cây và Máy móc thiết bị
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,Cây và Máy móc thiết bị
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Tiền thuế sau khi chiết khấu
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Cài đặt Tóm tắt công việc hàng ngày
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,Vui lòng nhập Reqd theo ngày
 DocType: Payment Entry,Internal Transfer,Chuyển nội bộ
 DocType: Asset Maintenance,Maintenance Tasks,Công việc bảo trì
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,số lượng mục tiêu là bắt buộc
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,Vui lòng chọn ngày đăng bài đầu tiên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,Vui lòng chọn ngày đăng bài đầu tiên
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,Ngày Khai mạc nên trước ngày kết thúc
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Chi phí bộ phận với các phát sinh hiện có không thể được chuyển đổi sang sổ cái
@@ -4344,14 +4370,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,Tích hợp ERP
 DocType: Crop Cycle,Detected Disease,Phát hiện bệnh
 ,Produced,Sản xuất
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,Ngày bắt đầu thanh toán không được trước ngày giải ngân.
 DocType: Item,Item Code for Suppliers,Mã số mẫu hàng  cho nhà cung cấp
 DocType: Issue,Raised By (Email),đưa lên bởi (Email)
 DocType: Training Event,Trainer Name,tên người huấn luyện
 DocType: Mode of Payment,General,Chung
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Lần giao tiếp cuối
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Lần giao tiếp cuối
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},Nối tiếp Nos Yêu cầu cho In nhiều mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},Nối tiếp Nos Yêu cầu cho In nhiều mục {0}
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Thanh toán phù hợp với hoá đơn
 DocType: Journal Entry,Bank Entry,Bút toán NH
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
@@ -4365,7 +4392,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},Tiến sĩ {0} vào Ngày nghỉ nửa ngày Nghỉ phép vào {1}
 DocType: Production Plan,Get Material Request,Nhận Chất liệu Yêu cầu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Chi phí bưu điện
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,Chi phí bưu điện
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 ,Item Variant Details,Chi tiết biến thể của Chi tiết
@@ -4376,9 +4403,9 @@
 DocType: Drug Prescription,Hour,Giờ
 DocType: Restaurant Order Entry,Last Sales Invoice,Hóa đơn bán hàng cuối cùng
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},Vui lòng chọn Số lượng đối với mặt hàng {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Dãy số mới không thể có  kho hàng. Kho hàng phải đượcthiết lập bởi Bút toán kho dự trữ  hoặc biên lai mua hàng
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Dãy số mới không thể có  kho hàng. Kho hàng phải đượcthiết lập bởi Bút toán kho dự trữ  hoặc biên lai mua hàng
 DocType: Lead,Lead Type,Loại Tiềm năng
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt nghỉ trên Các khối kỳ hạn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt nghỉ trên Các khối kỳ hạn
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 DocType: Company,Monthly Sales Target,Mục tiêu bán hàng hàng tháng
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được duyệt bởi {0}
@@ -4386,7 +4413,7 @@
 DocType: Item,Default Material Request Type,Mặc định liệu yêu cầu Loại
 DocType: Supplier Scorecard,Evaluation Period,Thời gian thẩm định
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,không xác định
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,Đơn hàng công việc chưa tạo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,Đơn hàng công việc chưa tạo
 DocType: Shipping Rule,Shipping Rule Conditions,Các điều kiện cho quy tắc vận  chuyển
 DocType: Purchase Invoice,Export Type,Loại xuất khẩu
 DocType: Salary Slip Loan,Salary Slip Loan,Khoản Vay Lương
@@ -4402,8 +4429,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,Mở Tóm lược Hóa đơn
 DocType: Education Settings,Education Manager,Quản lý Giáo dục
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,Chiều dài tối thiểu giữa mỗi nhà máy trong cánh đồng để tăng trưởng tối ưu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Vật tư theo đợt {0} không thể được cập nhật bằng cách sử dụng Bảng điều hòa hàng kho , thay vào đó sử dụng bút toàn hàng kho"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Vật tự theo đợt {0} không thể được cập nhật bằng cách sử dụng bảng điều hòa kho,  khoán, thay vào đó sử dụng bút toán hàng kho"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Vật tư theo đợt {0} không thể được cập nhật bằng cách sử dụng Bảng điều hòa hàng kho , thay vào đó sử dụng bút toàn hàng kho"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Vật tự theo đợt {0} không thể được cập nhật bằng cách sử dụng bảng điều hòa kho,  khoán, thay vào đó sử dụng bút toán hàng kho"
 DocType: Quality Inspection,Report Date,Báo cáo ngày
 DocType: Student,Middle Name,Tên đệm
 DocType: C-Form,Invoices,Hoá đơn
@@ -4436,20 +4463,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,Phiếu nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,Phiếu nhận
 ,Sales Register,Đăng ký bán hàng
 DocType: Daily Work Summary Group,Send Emails At,Gửi email Tại
 DocType: Quotation,Quotation Lost Reason,lý do bảng báo giá mất
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,Xem Mẫu
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,Chi phí phê duyệt bắt buộc trong yêu cầu chi tiêu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.","Thêm người dùng vào tổ chức của bạn, ngoài chính bạn."
 DocType: Customer Group,Customer Group Name,Tên Nhóm khách hàng
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Chưa có Khách!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,Không có yêu cầu vật liệu được tạo
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,bằng
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
@@ -4472,11 +4500,12 @@
 DocType: Vehicle,Chassis No,chassis Không
 DocType: Payment Request,Initiated,Được khởi xướng
 DocType: Production Plan Item,Planned Start Date,Ngày bắt đầu lên kế hoạch
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,Vui lòng chọn một BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,Vui lòng chọn một BOM
 DocType: Purchase Invoice,Availed ITC Integrated Tax,Thuế tích hợp ITC đã sử dụng
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
+DocType: Bank Guarantee,Clauses and Conditions,Điều khoản và điều kiện
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
 DocType: Project Task,View Timesheet,Xem tờ báo
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,Ngày kết thúc phải lớn hơn ngày bắt đầu
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
 DocType: Leave Allocation,New Leaves Allocated,Những sự cho phép mới được phân bổ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dữ liệu chuyên-dự án không có sẵn cho báo giá
@@ -4490,9 +4519,10 @@
 DocType: Patient,Alcohol Current Use,Sử dụng rượu
 DocType: Student Admission Program,Student Admission Program,Chương trình nhập học cho sinh viên
 DocType: Payment Entry,Account Paid To,Tài khoản Thụ hưởng
+DocType: Subscription Settings,Grace Period,Thời gian ân hạn
 DocType: Item Alternative,Alternative Item Name,Tên hạng mục thay thế
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Mẫu gốc {0} không thể là mẫu tồn kho
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",Không thể gửi phiếu lương <br> \ Lý do có thể: <br> \ 1. Tiền lương thực ít hơn 0. <br> \ 2. Địa chỉ Email Công ty được chỉ định trong tổng thể của nhân viên không hợp lệ. <br>
@@ -4502,7 +4532,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Ngân sách cho tài khoản {1} đối với {2} {3} là {4}. Nó sẽ vượt qua {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',"Hàng {0} # Tài khoản phải được loại 'tài sản cố định """
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Số lượng ra
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,và unchcked Disabled trong
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,Series là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Dịch vụ tài chính
 DocType: Student Sibling,Student ID,thẻ học sinh
@@ -4514,14 +4543,16 @@
 DocType: Complaint,Complaint,Lời phàn nàn
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
 DocType: Leave Allocation,Unused leaves,Quyền nghỉ phép chưa sử dụng
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Thực hiện mục trả nợ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,Tất cả bộ ngành
 DocType: Patient,Alcohol Past Use,Uống rượu quá khứ
 DocType: Fertilizer Content,Fertilizer Content,Nội dung Phân bón
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,Cr
 DocType: Project Update,Problematic/Stuck,Có vấn đề / Stuck
 DocType: Tax Rule,Billing State,Bang thanh toán
 DocType: Share Transfer,Transfer,Truyền
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,Đơn hàng công việc {0} phải được hủy bỏ trước khi hủy Lệnh bán hàng này
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,Ngày đến hạn là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Tăng cho thuộc tính  {0} không thể là 0
@@ -4545,10 +4576,11 @@
 DocType: Cheque Print Template,Message to show,Tin nhắn để hiển thị
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Lĩnh vực bán lẻ
 DocType: Student Attendance,Absent,Vắng mặt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Sản phẩm lô
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,Sản phẩm lô
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,Không thể tìm thấy điểm số bắt đầu từ {0}. Bạn cần phải có điểm đứng bao gồm 0 đến 100
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Hàng {0}: tham chiếu không hợp lệ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và mẫu phí
+DocType: Subscription,Current Invoice Start Date,Ngày bắt đầu hóa đơn hiện tại
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Cả khoản nợ lẫn số tín dụng đều là yêu cầu bắt buộc với {2}
 DocType: GL Entry,Remarks,Ghi chú
@@ -4558,11 +4590,13 @@
 DocType: Task,Parent Task,Công việc của Phụ Huynh
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Tạo Tiềm năng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,In và Văn phòng phẩm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,In và Văn phòng phẩm
 DocType: Stock Settings,Show Barcode Field,Hiện Dòng mã vạch
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,Gửi email Nhà cung cấp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mức lương đã được xử lý cho giai đoạn giữa {0} và {1}, Giai đoạn bỏ ứng dụng không thể giữa khoảng kỳ hạn này"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,Gửi email Nhà cung cấp
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mức lương đã được xử lý cho giai đoạn giữa {0} và {1}, Giai đoạn bỏ ứng dụng không thể giữa khoảng kỳ hạn này"
+DocType: Fiscal Year,Auto Created,Tự động tạo
 DocType: Chapter Member,Leave Reason,Để lại lý do
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,Hoá đơn {0} không còn tồn tại
 DocType: Guardian Interest,Guardian Interest,người giám hộ lãi
 DocType: Volunteer,Availability,khả dụng
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Thiết lập các giá trị mặc định cho các hoá đơn POS
@@ -4571,14 +4605,13 @@
 DocType: Timesheet,Employee Detail,Nhân viên chi tiết
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,ID Email Guardian1
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,Ngày của kỳ hạn tiếp theo và Ngày lặp lại của tháng phải bằng nhau
 DocType: Lab Prescription,Test Code,Mã kiểm tra
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Cài đặt cho trang chủ của trang web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},Các yêu cầu RFQ không được phép trong {0} do bảng điểm của điểm số {1}
 DocType: Job Offer,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,Ở trên
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},Tổng số Tiền {0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},Tổng số Tiền {0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Đề cập đến tài khoản phải trả phi tiêu chuẩn
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',Vui lòng chọn nhóm đánh giá khác với &#39;Tất cả các Nhóm Đánh giá&#39;
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Hàng {0}: Yêu cầu trung tâm chi phí cho một mặt hàng {1}
@@ -4589,7 +4622,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,Phân tích nước
 DocType: Chapter,Region,Vùng
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc xem các giao dịch khác nhau.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,Tỷ lệ định giá âm không được cho phép
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Tỷ lệ định giá âm không được cho phép
 DocType: Holiday List,Weekly Off,Nghỉ hàng tuần
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,Tải lại Phân tích Liên kết
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ví dụ như năm 2012, 2012-13"
@@ -4605,7 +4638,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Chi phí của tài sản Loại bỏ
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:Trung tâm chi phí là bắt buộc đối với vật liệu {2}
 DocType: Vehicle,Policy No,chính sách Không
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
 DocType: Asset,Straight Line,Đường thẳng
 DocType: Project User,Project User,Dự án tài
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,Chia
@@ -4644,21 +4677,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,Con đường
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,Không thể chuyển đổi Chi phí bộ phận sổ cái vì nó có các nút con
 DocType: Production Plan,Total Planned Qty,Tổng số lượng dự kiến
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,Giá trị mở
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,Giá trị mở
 DocType: Salary Detail,Formula,Công thức
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Mẫu thử nghiệm Lab
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,Tài khoản bán hàng
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,Tài khoản bán hàng
 DocType: Purchase Invoice Item,Total Weight,Tổng khối lượng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Hoa hồng trên doanh thu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,Hoa hồng trên doanh thu
 DocType: Job Offer Term,Value / Description,Giá trị / Mô tả
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Hàng # {0}: {1} tài sản không thể gửi, nó đã được {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Hàng # {0}: {1} tài sản không thể gửi, nó đã được {2}"
 DocType: Tax Rule,Billing Country,Quốc gia thanh toán
 DocType: Purchase Order Item,Expected Delivery Date,Ngày Dự kiến giao hàng
 DocType: Restaurant Order Entry,Restaurant Order Entry,Đăng nhập
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng với {0} # {1}. Sự khác biệt là {2}.
 DocType: Asset Maintenance Task,Assign To Name,Gán Tên
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Chi phí Giải trí
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,Chi phí Giải trí
 DocType: Hub Settings,Enabled Users,Người dùng Bật
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,Hãy Chất liệu Yêu cầu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Mở hàng {0}
@@ -4671,24 +4704,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Ứng dụng cho nghỉ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,Không thể xóa TK vì vẫn còn giao dịch
 DocType: Vehicle,Last Carbon Check,Kiểm tra Carbon lần cuối
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Chi phí pháp lý
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,Chi phí pháp lý
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,Vui lòng chọn số lượng trên hàng
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Thực hiện mở hóa đơn bán hàng và mua hàng
 DocType: Purchase Invoice,Posting Time,Thời gian gửi bài
 DocType: Timesheet,% Amount Billed,% Số tiền đã ghi hóa đơn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Chi phí điện thoại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,Chi phí điện thoại
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kiểm tra này nếu bạn muốn ép buộc người dùng lựa chọn một loạt trước khi lưu. Sẽ không có mặc định nếu bạn kiểm tra này.
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},Không có mẫu hàng với dãy số {0}
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},Không có mẫu hàng với dãy số {0}
 DocType: Email Digest,Open Notifications,Mở các Thông Báo
 DocType: Payment Entry,Difference Amount (Company Currency),Chênh lệch Số tiền (Công ty ngoại tệ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Chi phí trực tiếp
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,Chi phí trực tiếp
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Doanh thu khách hàng mới
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Chi phí đi lại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Thêm Đăng ký trường tùy chỉnh trong doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
 DocType: Purchase Receipt Item,Sample Quantity,Số mẫu
+DocType: Bank Guarantee,Name of Beneficiary,Tên của người thụ hưởng
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Cập nhật BOM tự động thông qua Scheduler, dựa trên tỷ lệ định giá mới nhất / tỷ giá / tỷ lệ mua cuối cùng của nguyên vật liệu."
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: tài khoản mẹ {1} không thuộc về công ty: {2}
@@ -4700,14 +4733,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Quản chế
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,các phần lương
 DocType: Program Enrollment Tool,New Academic Year,Năm học mới
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,Trả về/Ghi chú tín dụng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,Trả về/Ghi chú tín dụng
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,Tổng số tiền trả
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,Tổng số tiền trả
 DocType: GST Settings,B2C Limit,Giới hạn B2C
 DocType: Work Order Item,Transferred Qty,Số lượng chuyển giao
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Thông qua
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Hoạch định
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,Hoạch định
 DocType: Share Balance,Issued,Ban hành
+DocType: Loan,Repayment Start Date,Ngày bắt đầu thanh toán
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Hoạt động của sinh viên
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Nhà cung cấp Id
 DocType: Payment Request,Payment Gateway Details,Chi tiết Cổng thanh toán
@@ -4720,10 +4754,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Các loại nghỉ phép như bình thường, bệnh vv"
 DocType: Email Digest,Send regular summary reports via Email.,Gửi báo cáo tóm tắt thường xuyên qua Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},Hãy thiết lập tài khoản mặc định trong Loại Chi phí khiếu nại {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},Hãy thiết lập tài khoản mặc định trong Loại Chi phí khiếu nại {0}
 DocType: Assessment Result,Student Name,Tên học sinh
 DocType: Brand,Item Manager,Quản lý mẫu hàng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,bảng lương phải trả
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,bảng lương phải trả
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
 DocType: Plant Analysis,Collection Datetime,Bộ sưu tập Datetime
 DocType: Work Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
@@ -4733,9 +4767,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,Người sử dụng {0} không tồn tại
 DocType: Payment Term,Day(s) after invoice date,Ngày sau ngày lập hoá đơn
 DocType: Payment Schedule,Payment Schedule,Lịch trình thanh toán
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Rút gọn
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,Bút toán thanh toán đã tồn tại
+DocType: Subscription,Trial Period End Date,Ngày kết thúc giai đoạn dùng thử
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Không được phép từ {0} vượt qua các giới hạn
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lương mẫu chủ.
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Bệnh học
@@ -4752,9 +4786,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Tiềm năng hoặc Khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ phiếu đóng băng
 ,Territory Target Variance Item Group-Wise,Phương sai mục tiêu mẫu hàng theo khu vực Nhóm - Thông minh
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Tất cả các nhóm khách hàng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,Tất cả các nhóm khách hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,tích lũy hàng tháng
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho {1} tới {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho {1} tới {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,Mẫu thuế là bắt buộc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Tài khoản {0}: tài khoản mẹ {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
@@ -4763,14 +4797,15 @@
 DocType: Lab Prescription,Test Created,Đã tạo thử nghiệm
 DocType: Healthcare Settings,Custom Signature in Print,Chữ in trong In
 DocType: Account,Temporary,Tạm thời
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,Số LPO của Khách Hàng
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,Số LPO của Khách Hàng
 DocType: Program,Courses,Các khóa học
 DocType: Monthly Distribution Percentage,Percentage Allocation,Tỷ lệ phần trăm phân bổ
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Thư ký
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,Thư ký
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Nếu vô hiệu hóa, trường ""trong  "" sẽ không được hiển thị trong bất kỳ giao dịch"
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,Hành động này sẽ ngừng thanh toán trong tương lai. Bạn có chắc chắn muốn hủy đăng ký này không?
 DocType: Serial No,Distinct unit of an Item,Đơn vị riêng biệt của một khoản
 DocType: Supplier Scorecard Criteria,Criteria Name,Tên tiêu chí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,Vui lòng thiết lập công ty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,Vui lòng thiết lập công ty
 DocType: Pricing Rule,Buying,Mua hàng
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,Bệnh &amp; phân bón
 DocType: HR Settings,Employee Records to be created by,Nhân viên ghi được tạo ra bởi
@@ -4779,18 +4814,18 @@
 DocType: POS Profile,Apply Discount On,Áp dụng Giảm giá Trên
 DocType: Member,Membership Type,Loại thành viên
 ,Reqd By Date,Reqd theo địa điểm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,Nợ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,Nợ
 DocType: Assessment Plan,Assessment Name,Tên Đánh giá
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,Hiển thị PDC trong In
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,Hiển thị PDC trong In
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,Hàng # {0}: Số sê ri là bắt buộc
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,mục chi tiết thuế thông minh
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,Tuyển dụng
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Viện Tên viết tắt
 ,Item-wise Price List Rate,Mẫu hàng - danh sách tỷ giá thông minh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,Báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,Báo giá của NCC
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Bằng chữ"" sẽ được hiển thị ngay khi bạn lưu các báo giá."
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
@@ -4808,7 +4843,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Tổng số phương sai
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nếu được kích hoạt, hệ thống sẽ tự động đăng sổ kế toán để kiểm kê hàng hóa."
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Môi giới
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,Attendance cho nhân viên {0} đã được đánh dấu ngày này
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,Attendance cho nhân viên {0} đã được đánh dấu ngày này
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",trong số phút đã cập nhật thông qua 'lần đăng nhập'
 DocType: Customer,From Lead,Từ  Tiềm năng
@@ -4819,6 +4854,7 @@
 DocType: Lab Test,Approved Date,Ngày được chấp thuận
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Bán hàng tiêu chuẩn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
+DocType: Subscriber,Subscriber Name,Tên người đăng ký
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Update Tool,Replace,Thay thế
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Không sản phẩm nào được tìm thấy
@@ -4828,19 +4864,18 @@
 DocType: Request for Quotation Item,Project Name,Tên dự án
 DocType: Customer,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},Chọn tài khoản thu nhập từ lãi {0}
 DocType: Work Order,Required Items,mục bắt buộc
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,Nguồn Nhân Lực
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Hòa giải thanh toán thanh toán
 DocType: Disease,Treatment Task,Nhiệm vụ điều trị
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Thuế tài sản
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Thuế tài sản
 DocType: BOM Item,BOM No,số hiệu BOM
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Update Tool,The BOM which will be replaced,BOM được thay thế
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Thiết bị điện tử
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,Thiết bị điện tử
 DocType: Asset,Maintenance Required,Yêu cầu bảo trì
 DocType: Account,Debit,Thẻ ghi nợ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Các di dời phải được phân bổ trong bội số của 0,5"
@@ -4849,7 +4884,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Amt nổi bật
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Mục tiêu đề ra mục Nhóm-khôn ngoan cho người bán hàng này.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Đóng băng tồn kho cũ hơn [Ngày]
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Hàng # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Hàng # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
 DocType: Asset Maintenance Team,Maintenance Team Name,Tên nhóm bảo trì
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,Khách hàng là bắt buộc nếu &#39;Opportunity From&#39; được chọn là Khách hàng
@@ -4859,19 +4894,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Các loại chi phí yêu cầu bồi thường.
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Tỷ lệ bán hàng cho mặt hàng {0} thấp hơn {1} của nó. Tỷ lệ bán hàng phải là ít nhất {2}
-DocType: Item,Taxes,Các loại thuế
+DocType: Subscription,Taxes,Các loại thuế
 DocType: Purchase Invoice,capital goods,hàng hóa vốn
 DocType: Purchase Invoice Item,Weight Per Unit,Trọng lượng trên mỗi đơn vị
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,đã trả và không chuyển
 DocType: Project,Default Cost Center,Bộ phận chi phí mặc định
-DocType: Bank Guarantee,End Date,Ngày kết thúc
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Giao dịch hàng tồn kho
 DocType: Budget,Budget Accounts,Tài khoản ngân sách
 DocType: Employee,Internal Work History,Quá trình công tác nội bộ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Lượng khấu hao lũy kế
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Biến Thẻ Điểm của Nhà cung cấp
-DocType: Employee Loan,Fully Disbursed,giải ngân đầy đủ
 DocType: Employee Advance,Due Advance Amount,Số tiền tạm ứng
 DocType: Maintenance Visit,Customer Feedback,Phản hồi từ khách hàng
 DocType: Account,Expense,chi tiêu
@@ -4895,7 +4928,7 @@
 ,Employee Information,Thông tin nhân viên
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên số hiệu Voucher, nếu nhóm theo Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,Tạo báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,Tạo báo giá của NCC
 DocType: Quality Inspection,Incoming,Đến
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Mẫu thuế mặc định cho bán hàng và mua hàng được tạo.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,Bản ghi kết quả đánh giá {0} đã tồn tại.
@@ -4903,7 +4936,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vui lòng đặt Bộ lọc của Công ty trống nếu Nhóm theo là &#39;Công ty&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Viết bài ngày không thể ngày trong tương lai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},Hàng # {0}: Số sê ri{1} không phù hợp với {2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,để tạo ra định kỳ
 DocType: Stock Entry,Target Warehouse Address,Địa chỉ Kho Mục tiêu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Để lại bình thường
 DocType: Agriculture Task,End Day,Ngày kết thúc
@@ -4928,11 +4960,10 @@
 DocType: Material Request,% Ordered,% đã đặt
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Đối với Nhóm Sinh viên dựa trên Khóa học, khóa học sẽ được xác nhận cho mỗi Sinh viên từ các môn học ghi danh tham gia vào Chương trình Ghi danh."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Việc làm ăn khoán
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Giá mua bình quân
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Giá mua bình quân
 DocType: Share Balance,From No,Từ Không
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (tính bằng giờ)
 DocType: Employee,History In Company,Lịch sử trong công ty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},Bài viết mới từ {sender}
 DocType: Customer,Customer Primary Address,Địa chỉ Chính của Khách hàng
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Bản tin
 DocType: Drug Prescription,Description/Strength,Mô tả / Sức mạnh
@@ -4941,22 +4972,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,Cùng mục đã được nhập nhiều lần
 DocType: Department,Leave Block List,Để lại danh sách chặn
 DocType: Purchase Invoice,Tax ID,Mã số thuế
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,Mục {0} không phải là thiết lập cho Serial Nos Cột phải bỏ trống
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,Mục {0} không phải là thiết lập cho Serial Nos Cột phải bỏ trống
 DocType: Accounts Settings,Accounts Settings,Thiết lập các Tài khoản
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,Tán thành
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.","Địa chỉ không định dạng cho {0}, hãy khắc phục để tiếp tục."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.","Địa chỉ không định dạng cho {0}, hãy khắc phục để tiếp tục."
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix","Số tài khoản mới, nó sẽ được bao gồm trong tên tài khoản như một tiền tố"
 DocType: Maintenance Team Member,Team Member,Thành viên của đội
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Không có kết quả để gửi
 DocType: Customer,Sales Partner and Commission,Đại lý bán hàng và hoa hồng
-DocType: Employee Loan,Rate of Interest (%) / Year,Lãi suất thị trường (%) / năm
+DocType: Loan,Rate of Interest (%) / Year,Lãi suất thị trường (%) / năm
 ,Project Quantity,Dự án Số lượng
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi 'Đóng góp cho các loại phí dựa vào '"
 DocType: Opportunity,To Discuss,Để thảo luận
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} để hoàn thành giao dịch này.
 DocType: Loan Type,Rate of Interest (%) Yearly,Lãi suất thị trường (%) hàng năm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Tài khoản tạm thời
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Đen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,Tài khoản tạm thời
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,Đen
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Shareholder,Contact List,Danh sách Liên hệ
 DocType: Account,Auditor,Người kiểm tra
@@ -4964,16 +4995,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0} mục được sản xuất
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,Tìm hiểu thêm
 DocType: Cheque Print Template,Distance from top edge,Khoảng cách từ mép trên
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,Danh sách Price {0} bị vô hiệu hóa hoặc không tồn tại
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,Danh sách Price {0} bị vô hiệu hóa hoặc không tồn tại
 DocType: Purchase Invoice,Return,Trả về
 DocType: Pricing Rule,Disable,Vô hiệu hóa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,Phương thức thanh toán là cần thiết để thực hiện thanh toán
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,Phương thức thanh toán là cần thiết để thực hiện thanh toán
 DocType: Project Task,Pending Review,Đang chờ xem xét
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.","Chỉnh sửa trong trang đầy đủ để có thêm các tùy chọn như tài sản, hàng loạt, lô, vv"
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,Bổ nhiệm và Tham vấn
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} không được ghi danh trong Batch {2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Tài sản {0} không thể được loại bỏ, vì nó đã được {1}"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,Cần kiểm tra
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,Cần kiểm tra
 DocType: Task,Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua số yêu cầu bồi thường chi phí )
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Đánh dấu vắng mặt
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,Không thể thiết lập công ty
@@ -4985,7 +5016,7 @@
 DocType: Homepage,Tag Line,Dòng đánh dấu
 DocType: Fee Component,Fee Component,phí Component
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Quản lý đội tàu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,Thêm các mục từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,Thêm các mục từ
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,Cây trồng và Đất đai
 DocType: Cheque Print Template,Regular,quy luật
 DocType: Fertilizer,Density (if liquid),Mật độ (nếu chất lỏng)
@@ -5010,24 +5041,26 @@
 DocType: Payment Entry,Paid Amount,Số tiền thanh toán
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,Khám phá chu kỳ bán hàng
 DocType: Assessment Plan,Supervisor,Giám sát viên
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,Đăng ký
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,Đăng ký
 ,Available Stock for Packing Items,Có sẵn tồn kho để đóng gói sản phẩm
 DocType: Item Variant,Item Variant,Biến thể mẫu hàng
 ,Work Order Stock Report,Làm việc Báo cáo chứng khoán
+DocType: Purchase Receipt,Auto Repeat Detail,Tự động lặp lại chi tiết
 DocType: Assessment Result Tool,Assessment Result Tool,Công cụ đánh giá kết quả
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,Làm giám sát viên
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,Đề xuất loại
 DocType: BOM Scrap Item,BOM Scrap Item,BOM mẫu hàng phế thải
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tài khoản đang dư Nợ, bạn không được phép thiết lập 'Số Dư TK phải' là 'Có'"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Quản lý chất lượng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,Quản lý chất lượng
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
 DocType: Project,Total Billable Amount (via Timesheets),Tổng số tiền Có thể Lập hoá đơn (thông qua Timesheets)
 DocType: Agriculture Task,Previous Business Day,Ngày làm việc trước
-DocType: Employee Loan,Repay Fixed Amount per Period,Trả cố định Số tiền cho mỗi thời kỳ
+DocType: Loan,Repay Fixed Amount per Period,Trả cố định Số tiền cho mỗi thời kỳ
 DocType: Employee,Health Insurance No,Bảo hiểm sức khoẻ số
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,Amt ghi chú tín dụng
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,Amt ghi chú tín dụng
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,Tổng số tiền phải chịu thuế
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
 DocType: Opening Invoice Creation Tool,Purchase,Mua
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Đại lượng cân bằng
@@ -5038,16 +5071,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} cho {1}
 DocType: Healthcare Settings,Valid number of days,Số ngày hợp lệ
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Bộ phận chi phí
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,Khởi động lại đăng ký
 DocType: Land Unit,Linked Plant Analysis,Phân tích thực vật liên kết
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tỷ giá ở mức mà tiền tệ của nhà cùng cấp được chuyển đổi tới mức giá tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: xung đột  thời gian với hàng {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Cho phép Tỷ lệ Đánh giá Không
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Cho phép Tỷ lệ Đánh giá Không
+DocType: Bank Guarantee,Receiving,Đang nhận
 DocType: Training Event Employee,Invited,mời
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,Nhiều cấu trúc lương hoạt động tìm thấy cho {0} nhân viên cho những ngày được
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Thiết lập các tài khoản Gateway.
 DocType: Employee,Employment Type,Loại việc làm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Tài sản cố định
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,Tài sản cố định
 DocType: Payment Entry,Set Exchange Gain / Loss,Đặt khoán Lãi / lỗ
 ,GST Purchase Register,Đăng ký mua bán GST
 ,Cash Flow,Dòng tiền
@@ -5068,9 +5103,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,Danh sách tất cả giao dịch cổ phiếu
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Đếm ngược
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Đếm ngược
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,Cả ngày bắt đầu giai đoạn dùng thử và ngày kết thúc giai đoạn dùng thử phải được đặt
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tỷ lệ trung bình
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Tổng số tiền thanh toán trong lịch thanh toán phải bằng tổng số tiền lớn / tròn
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Tổng số tiền thanh toán trong lịch thanh toán phải bằng tổng số tiền lớn / tròn
+DocType: Subscription Plan Detail,Plan,Kế hoạch
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Báo cáo số dư ngân hàng theo Sổ cái tổng
 DocType: Job Applicant,Applicant Name,Tên đơn
 DocType: Authorization Rule,Customer / Item Name,Khách hàng / tên hàng hóa
@@ -5100,6 +5136,7 @@
 DocType: Work Order,Warehouses,Kho
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể chuyển giao
 DocType: Hotel Room Pricing,Hotel Room Pricing,Giá phòng khách sạn
+DocType: Subscription,Days Until Due,Ngày đến hạn
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Mục này là một biến thể của {0} (Bản mẫu).
 DocType: Workstation,per hour,mỗi giờ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua
@@ -5108,13 +5145,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Đối với nhóm sinh viên theo từng đợt, nhóm sinh viên sẽ được xác nhận cho mỗi sinh viên từ Chương trình đăng ký."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Không thể xóa kho vì có chứng từ kho phát sinh.
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Gửi đến:
+DocType: Journal Entry Account,Loan,Tiền vay
 DocType: Expense Claim Advance,Expense Claim Advance,Yêu cầu bồi thường chi phí
 DocType: Lab Test,Report Preference,Sở thích Báo cáo
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,Thông tin tình nguyện.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Giám đốc dự án
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,Giám đốc dự án
 ,Quoted Item Comparison,So sánh mẫu hàng đã được báo giá
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Chồng chéo nhau trong việc ghi điểm giữa {0} và {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Công văn
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,GIá trị tài sản thuần như trên
 DocType: Crop,Produce,Sản xuất
@@ -5124,7 +5162,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,Tiêu hao vật liệu cho sản xuất
 DocType: Item Alternative,Alternative Item Code,Mã mục thay thế
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,Chọn mục để Sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,Chọn mục để Sản xuất
 DocType: Delivery Stop,Delivery Stop,Giao hàng tận nơi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
 DocType: Item,Material Issue,Nguyên vật liệu
@@ -5134,15 +5172,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
 DocType: BOM,Show Items,Hiện Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Từ Thời gian không thể lớn hơn  Tới thời gian
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,Bạn có muốn thông báo cho tất cả khách hàng bằng email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,Bạn có muốn thông báo cho tất cả khách hàng bằng email?
+DocType: Subscription Plan,Billing Interval,Khoảng thời gian thanh toán
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Tiếp tục
 DocType: Hub Settings,Hub Username,Tên đăng nhập của Hub
 DocType: Salary Detail,Component,Hợp phần
 DocType: Assessment Criteria,Assessment Criteria Group,Các tiêu chí đánh giá Nhóm
 DocType: Healthcare Settings,Patient Name By,Tên bệnh nhân theo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},Tạp chí Accrual cho các khoản tiền lương từ {0} đến {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},Tạp chí Accrual cho các khoản tiền lương từ {0} đến {1}
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
@@ -5156,23 +5194,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ở đây bạn có thể duy trì chiều cao, cân nặng, dị ứng, mối quan tâm y tế vv"
 DocType: Leave Block List,Applies to Company,Áp dụng đối với Công ty
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
-DocType: Employee Loan,Disbursement Date,ngày giải ngân
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;Người nhận&#39; không được chỉ định
+DocType: Loan,Disbursement Date,ngày giải ngân
 DocType: BOM Update Tool,Update latest price in all BOMs,Cập nhật giá mới nhất trong tất cả các BOMs
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,Hồ sơ y tế
 DocType: Vehicle,Vehicle,phương tiện
 DocType: Purchase Invoice,In Words,Trong từ
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,Nhập tên ngân hàng hoặc tổ chức cho vay trước khi gửi.
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} phải được gửi
 DocType: POS Profile,Item Groups,Nhóm hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,Hôm nay là sinh nhật của {0}!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,Hôm nay là sinh nhật của {0}!
 DocType: Sales Order Item,For Production,Cho sản xuất
 DocType: Payment Request,payment_url,thanh toán_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,Vui lòng thêm một tài khoản Mở Tạm Thời trong Biểu đồ Tài khoản
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,Vui lòng thêm một tài khoản Mở Tạm Thời trong Biểu đồ Tài khoản
 DocType: Customer,Customer Primary Contact,Khách hàng chính Liên hệ
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,Tạp chí Kết thúc kỳ
 DocType: Project Task,View Task,Xem Nhiệm vụ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Cơ hội/Tiềm năng %
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Ngược/Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,Loại bảo lãnh ngân hàng
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,Phần hóa đơn
 ,Asset Depreciations and Balances,Khấu hao và dư tài sản
@@ -5183,9 +5222,8 @@
 DocType: Production Plan,Include Subcontracted Items,Bao gồm các Sản phẩm được Ký Hợp đồng
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,Tham gia
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Lượng thiếu hụt
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,Không thể thay đổi các thuộc tính Variant sau khi chuyển đổi cổ phiếu. Bạn sẽ phải thực hiện một mục mới để làm điều này.
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,Biến thể mẫu hàng {0} tồn tại với cùng một thuộc tính
-DocType: Employee Loan,Repay from Salary,Trả nợ từ lương
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,Biến thể mẫu hàng {0} tồn tại với cùng một thuộc tính
+DocType: Loan,Repay from Salary,Trả nợ từ lương
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},Yêu cầu thanh toán đối với {0} {1} cho số tiền {2}
 DocType: Salary Slip,Salary Slip,phiếu lương
@@ -5209,11 +5247,11 @@
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Nhóm bút toán trùng lặp được tìm thấy trong bảng nhóm mẫu hàng
 DocType: Land Unit,Parent Land Unit,Đơn vị Phụ Huynh
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
 DocType: Fertilizer,Fertilizer Name,Tên phân bón
 DocType: Salary Slip,Net Pay,Tiền thực phải trả
 DocType: Cash Flow Mapping Accounts,Account,Tài khoản
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
 ,Requested Items To Be Transferred,Mục yêu cầu được chuyển giao
 DocType: Expense Claim,Vehicle Log,nhật ký phương tiện
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Sự có mặt của sốt (nhiệt độ&gt; 38,5 ° C / 101,3 ° F hoặc nhiệt độ ổn định&gt; 38 ° C / 100,4 ° F)"
@@ -5254,24 +5292,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
 DocType: Asset Maintenance,Manufacturing User,Người dùng sản xuất
 DocType: Purchase Invoice,Raw Materials Supplied,Nguyên liệu thô đã được cung cấp
-DocType: C-Form,Series,Series
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},Đơn vị tiền tệ của bảng giá {0} phải là {1} hoặc {2}
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
 DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,PHân loại mẫu hàng
 DocType: Driver,License Number,Số giấy phép
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Giám đốc phát triển kinh doanh
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,Giám đốc phát triển kinh doanh
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bảo trì đăng nhập Mục đích
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Đăng ký bệnh nhân hóa đơn
 DocType: Crop,Period,Thời gian
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Sổ cái chung
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} nghỉ trên {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},Employee {0} nghỉ trên {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Xem Tiềm năng
 DocType: Program Enrollment Tool,New Program,Chương trình mới
 DocType: Item Attribute Value,Attribute Value,Attribute Value
 ,Itemwise Recommended Reorder Level,Mẫu hàng thông minh được gợi ý sắp xếp lại theo cấp độ
 DocType: Salary Detail,Salary Detail,Chi tiết lương
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,Vui lòng chọn {0} đầu tiên
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,Vui lòng chọn {0} đầu tiên
 DocType: Appointment Type,Physician,Bác sĩ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,Lô {0} của mục {1} đã hết hạn.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Tham vấn
@@ -5279,15 +5316,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) không được lớn hơn số lượng đã lên kế hoạch ({2}) trong Đơn hàng công việc {3}
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,thời gian biểu cho sản xuất.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Không thể thay đổi các thuộc tính Biến thể sau giao dịch chứng khoán. Bạn sẽ phải tạo một Item mới để làm điều này.
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,Giấy phép SEPA do GoCard
 DocType: Physician,Charges,Phí
 DocType: Production Plan,Get Items For Work Order,Lấy hàng để làm việc Đặt hàng
 DocType: Salary Detail,Default Amount,Số tiền mặc định
 DocType: Lab Test Template,Descriptive,Mô tả
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,Không tìm thấy kho này trong hệ thống
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Không tìm thấy kho này trong hệ thống
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Tóm tắt của tháng này
 DocType: Quality Inspection Reading,Quality Inspection Reading,Đọc kiểm tra chất lượng
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,'Để cách li hàng tồn kho cũ' nên nhỏ hơn %d ngày
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Để cách li hàng tồn kho cũ' nên nhỏ hơn %d ngày
 DocType: Tax Rule,Purchase Tax Template,Mua  mẫu thuế
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,Đặt mục tiêu bán hàng bạn muốn đạt được cho công ty của bạn.
 ,Project wise Stock Tracking,Theo dõi biến động vật tư theo dự án
@@ -5315,11 +5353,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,Không thể tạo trang web
 DocType: Soil Analysis,Mg/K,Mg / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,Xem chi tiết UOM Chuyển đổi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,Tài khoản lưu giữ đã được tạo hoặc Số lượng mẫu không được cung cấp
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,Tài khoản lưu giữ đã được tạo hoặc Số lượng mẫu không được cung cấp
 DocType: Program,Program Abbreviation,Tên viết tắt chương trình
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật trên Phiếu nhận hàng gắn với từng vật tư
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
-DocType: Bank Guarantee,Start Date,Ngày bắt đầu
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Phân bổ lá trong một thời gian.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chi phiếu và tiền gửi không đúng xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó làm tài khoản mẹ
@@ -5334,11 +5371,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Giờ
 DocType: Project,Expected Start Date,Ngày Dự kiến sẽ bắt đầu
 DocType: Purchase Invoice,04-Correction in Invoice,04-Chỉnh sửa trong Hóa đơn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,Đơn hàng công việc đã được tạo cho tất cả các mặt hàng có Hội đồng quản trị
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,Đơn hàng công việc đã được tạo cho tất cả các mặt hàng có Hội đồng quản trị
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Báo cáo chi tiết về biến thể
 DocType: Setup Progress Action,Setup Progress Action,Thiết lập Tiến hành Tiến bộ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Bảng giá mua
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,Bảng giá mua
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Xóa VTHH nếu chi phí là không áp dụng đối với VTHH đó
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,Hủy đăng ký
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Vui lòng chọn Trạng thái Bảo trì đã hoàn thành hoặc xóa Ngày Hoàn thành
 DocType: Supplier,Default Payment Terms Template,Mẫu Điều khoản Thanh toán Mặc định
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,Đồng tiền giao dịch phải được giống như thanh toán tiền tệ Cổng
@@ -5349,7 +5387,6 @@
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hành động nếu tích lũy ngân sách hàng tháng  vượt trội
-DocType: Subscription,Submit on creation,Gửi về sáng tạo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
 DocType: Asset,Disposal Date,Ngày xử lý
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email sẽ được gửi đến tất cả các nhân viên tích cực của công ty tại các giờ nhất định, nếu họ không có ngày nghỉ. Tóm tắt phản hồi sẽ được gửi vào lúc nửa đêm."
@@ -5368,6 +5405,7 @@
 DocType: Batch,Parent Batch,Nhóm gốc
 DocType: Cheque Print Template,Cheque Print Template,Mẫu In Séc
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Biểu đồ Bộ phận chi phí
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Số ngày sau ngày lập hóa đơn đã trôi qua trước khi hủy đăng ký hoặc đánh dấu đăng ký là chưa thanh toán
 DocType: Lab Test Template,Sample Collection,Bộ sưu tập mẫu
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
 DocType: Price List,Price List Name,Danh sách giá Tên
@@ -5376,7 +5414,7 @@
 DocType: Account,Income,Thu nhập
 DocType: Industry Type,Industry Type,Loại ngành
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Một cái gì đó đã đi sai!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,Cảnh báo: ứng dụng gỡ bỏ có chứa khoảng ngày sau
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,Cảnh báo: ứng dụng gỡ bỏ có chứa khoảng ngày sau
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 DocType: Supplier Scorecard Scoring Criteria,Score,Ghi bàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Năm tài chính {0} không tồn tại
@@ -5396,12 +5434,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} phải là một giá trị từ 0 đến 100
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,Ngày khấu hao tiếp theo không thể trước ngày có sẵn để sử dụng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Các khoản cho vay không có bảo đảm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Tên bộ phận chi phí
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Tối đa giờ làm việc với Thời khóa biểu
 DocType: Maintenance Schedule Detail,Scheduled Date,Dự kiến ngày
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,Tổng Amt được trả
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,Tổng Amt được trả
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Thư lớn hơn 160 ký tự sẽ được chia thành nhiều tin nhắn
 DocType: Purchase Receipt Item,Received and Accepted,Nhận được và chấp nhận
 DocType: Hub Settings,Company and Seller Profile,Hồ sơ Công ty và Người bán
@@ -5415,10 +5453,9 @@
 DocType: Item,Variant Based On,Ngôn ngữ địa phương dựa trên
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Tổng số trọng lượng ấn định nên là 100%. Nó là {0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,Các nhà cung cấp của bạn
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Hãy sửa lại
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,"Không thể thiết lập là ""thất bại"" vì đơn đặt hàng đã được tạo"
 DocType: Request for Quotation Item,Supplier Part No,Mã số của Nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,Vô danh
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,Nhận được từ
 DocType: Lead,Converted,Chuyển đổi
@@ -5432,6 +5469,7 @@
 DocType: Asset,Assets,Tài sản
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
+DocType: Subscription,Current Invoice End Date,Ngày kết thúc hóa đơn hiện tại
 DocType: Payment Term,Due Date Based On,Ngày Dư Dựa Dựa Trên
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Vui lòng đặt nhóm khách hàng và lãnh thổ mặc định trong Cài đặt bán
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1} không tồn tại
@@ -5439,7 +5477,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,Mẫu hàng: {0} không tồn tại trong hệ thống
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đóng băng
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Bút toán không hài hòa
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,Không có khoản hoàn trả nào được chọn cho mục nhập nhật ký
 DocType: Payment Reconciliation,From Invoice Date,Từ ngày lập danh đơn
+DocType: Loan,Disbursed,Đã giải ngân
 DocType: Healthcare Settings,Laboratory Settings,Cài đặt Phòng thí nghiệm
 DocType: Patient Appointment,Service Unit,Đơn vị dịch vụ
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,Thiết lập Nhà cung cấp thành công
@@ -5452,12 +5492,12 @@
 DocType: Share Balance,No of Shares,Số cổ phần
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,'Có chuỗi số' không thể là 'Có' cho vật liệu không lưu kho
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,Chọn Trạng thái
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: School House,House Name,Tên nhà
 DocType: Fee Schedule,Total Amount per Student,Tổng số tiền trên mỗi sinh viên
 DocType: Purchase Taxes and Charges,Account Head,Tài khoản chính
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Hệ thống điện
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,Hệ thống điện
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Thêm phần còn lại của tổ chức của bạn như người dùng của bạn. Bạn cũng có thể thêm mời khách hàng đến cổng thông tin của bạn bằng cách thêm chúng từ Danh bạ
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (ra - vào)
 DocType: Grant Application,Requested Amount,Số tiền yêu cầu
@@ -5467,7 +5507,7 @@
 DocType: Crop Cycle,Detected Diseases,Phát hiện bệnh
 DocType: Stock Entry,Default Source Warehouse,Kho nguồn mặc định
 DocType: Item,Customer Code,Mã số khách hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
 DocType: Asset Maintenance Task,Last Completion Date,Ngày Hoàn thành Mới
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ngày tính từ lần yêu cầu cuối cùng
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
@@ -5475,9 +5515,10 @@
 DocType: GoCardless Settings,GoCardless Settings,Cài đặt GoCard
 DocType: Leave Block List,Leave Block List Name,Để lại tên danh sách chặn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ngày Bảo hiểm bắt đầu phải ít hơn ngày kết thúc Bảo hiểm
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản hàng tồn kho
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Tài sản hàng tồn kho
 DocType: Restaurant,Active Menu,Menu hoạt động
 DocType: Target Detail,Target Qty,Số lượng mục tiêu
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},Chống lại khoản vay: {0}
 DocType: Shopping Cart Settings,Checkout Settings,Thiết lập Checkout
 DocType: Student Attendance,Present,Nay
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Phiếu giao hàng {0} không phải nộp
@@ -5486,9 +5527,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},Phiếu lương của nhân viên {0} đã được tạo ra cho bảng thời gian {1}
 DocType: Vehicle Log,Odometer,mét kế
 DocType: Production Plan Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,Hàng tồn kho đóng băng cho tới
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM không chứa bất kỳ mẫu hàng tồn kho nào
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM không chứa bất kỳ mẫu hàng tồn kho nào
 DocType: Chapter,Chapter Head,Trưởng chương
 DocType: Payment Term,Month(s) after the end of the invoice month,Tháng sau ngày kết thúc tháng thanh toán
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Hoạt động dự án / nhiệm vụ.
@@ -5496,11 +5537,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tạo ra bảng lương
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,Lab kết quả datetime không thể trước khi kiểm tra datetime
 DocType: POS Profile,Allow user to edit Discount,Cho phép người dùng chỉnh sửa Giảm giá
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,Lấy khách hàng từ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,Lấy khách hàng từ
 DocType: Purchase Invoice Item,Include Exploded Items,Bao gồm các mục đã Phát hiện
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}","QUá trình mua bán phải được đánh dấu, nếu ""Được áp dụng cho"" được lựa chọn là  {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
 DocType: Shipping Rule,Restrict to Countries,Hạn chế đối với các quốc gia
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Hàng loạt Đặt tên cho {0} thông qua Thiết lập&gt; Cài đặt&gt; Hàng loạt Đặt tên
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Tiền công ty)
 DocType: Sales Invoice Timesheet,Billing Hours,Giờ Thanh toán
 DocType: Project,Total Sales Amount (via Sales Order),Tổng số tiền bán hàng (qua Lệnh bán hàng)
@@ -5519,6 +5561,7 @@
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Grant Application,Assessment  Manager,Quản lý Đánh giá
 DocType: Payment Entry,Allocate Payment Amount,Phân bổ số tiền thanh toán
+DocType: Subscription Plan,Subscription Plan,Gói đăng ký
 DocType: Employee External Work History,Salary,Lương
 DocType: Serial No,Delivery Document Type,Loại tài liệu giao hàng
 DocType: Sales Order,Partly Delivered,Một phần được Giao
@@ -5544,9 +5587,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,Ageing đun 2
 DocType: SG Creation Tool Course,Max Strength,Sức tối đa
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Cài đặt các giá trị cài sẵn
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},Không có Lưu ý Phân phối nào được Chọn cho Khách hàng {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},Không có Lưu ý Phân phối nào được Chọn cho Khách hàng {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM đã thay thế
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,Chọn các mục dựa trên ngày giao hàng
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,Chọn các mục dựa trên ngày giao hàng
 DocType: Grant Application,Has any past Grant Record,Có bất kỳ hồ sơ tài trợ nào trong quá khứ
 ,Sales Analytics,Bán hàng Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},Sẵn {0}
@@ -5565,7 +5608,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Chi phí nguyên liệu thô được cung cấp
 DocType: Selling Settings,Settings for Selling Module,Thiết lập module bán hàng
 DocType: Hotel Room Reservation,Hotel Room Reservation,Đặt phòng khách sạn
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Dịch vụ chăm sóc khách hàng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,Dịch vụ chăm sóc khách hàng
 DocType: BOM,Thumbnail,Hình đại diện
 DocType: Item Customer Detail,Item Customer Detail,Mục chi tiết khách hàng
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Yêu cầu  ứng cử viên một công việc.
@@ -5582,7 +5625,7 @@
 DocType: Fees,Student Details,Chi tiết Sinh viên
 DocType: Purchase Invoice Item,Stock Qty,Số lượng cổ phiếu
 DocType: Purchase Invoice Item,Stock Qty,Số lượng cổ phiếu
-DocType: Employee Loan,Repayment Period in Months,Thời gian trả nợ trong tháng
+DocType: Loan,Repayment Period in Months,Thời gian trả nợ trong tháng
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
 DocType: Naming Series,Update Series Number,Cập nhật số sê ri
 DocType: Account,Equity,Vốn chủ sở hữu
@@ -5591,7 +5634,7 @@
 DocType: Task,Closing Date,Ngày Đóng cửa
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
 DocType: Timesheet,Work Detail,Chi tiết công việc
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Kỹ sư
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,Kỹ sư
 DocType: Journal Entry,Total Amount Currency,Tổng tiền
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblies Tìm kiếm Sub
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
@@ -5637,13 +5680,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,Thông tin loại nhà tài trợ.
 DocType: Request for Quotation,Supplier Detail,Nhà cung cấp chi tiết
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Lỗi trong công thức hoặc điều kiện: {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,Số tiền ghi trên hoá đơn
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,Số tiền ghi trên hoá đơn
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Tiêu chí trọng lượng phải bổ sung lên đến 100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Tham gia
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,các mẫu hàng tồn kho
 DocType: BOM,Materials,Nguyên liệu
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nếu không kiểm tra, danh sách sẽ phải được thêm vào mỗi Bộ, nơi nó đã được áp dụng."
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},Tạo {0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Nguồn và kho đích không được giống nhau
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,bản thiết lập mẫu đối với thuế cho giao dịch mua hàng
@@ -5667,14 +5709,14 @@
 DocType: Shipping Rule,Fixed,đã sửa
 DocType: Vehicle Service,Clutch Plate,Clutch tấm
 DocType: Company,Round Off Account,tài khoản làm tròn số
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Chi phí hành chính
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,Chi phí hành chính
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Nhóm mẹ của nhóm khách hàng
-DocType: Journal Entry,Subscription,Đăng ký
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,Đăng ký
 DocType: Purchase Invoice,Contact Email,Email Liên hệ
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Đang Thực hiện Phí
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,Thông báo Thời gian
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,Thông báo Thời gian
 DocType: Asset Category,Asset Category Name,Tên tài sản
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Đây là địa bàn gốc và không thể chỉnh sửa
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Tên  người bán hàng mới
@@ -5688,7 +5730,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
 DocType: Asset,Frequency of Depreciation (Months),Tần số của Khấu hao (Tháng)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,Tài khoản tín dụng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Hiện không có giá trị
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Số lượng mặt hàng thu được sau khi sản xuất / đóng gói lại từ số lượng có sẵn của các nguyên liệu thô
@@ -5696,7 +5738,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,Tài khoản phải thu/phải trả
 DocType: Delivery Note Item,Against Sales Order Item,Theo hàng hóa được đặt mua
 DocType: Hub Settings,Company Logo,Logo Công ty
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 DocType: Healthcare Settings,Patient Registration,Đăng ký bệnh nhân
@@ -5731,11 +5773,10 @@
 DocType: Journal Entry,Total Debit,Tổng số Nợ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Kho chứa SP hoàn thành mặc định
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,Hãy chọn Bệnh nhân
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Người bán hàng
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Người bán hàng
 DocType: Hotel Room Package,Amenities,Tiện nghi
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Ngân sách và Trung tâm chi phí
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Không cho phép nhiều chế độ mặc định
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,cho
 ,Appointment Analytics,Analytics bổ nhiệm
 DocType: Vehicle Service,Half Yearly,Nửa năm
 DocType: Lead,Blog Subscriber,Người theo dõi blog
@@ -5752,6 +5793,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Để trống nếu bạn thực hiện nhóm sinh viên mỗi năm
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nếu được kiểm tra, Tổng số. của ngày làm việc sẽ bao gồm các ngày lễ, và điều này sẽ làm giảm giá trị của Lương trung bình mỗi ngày"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?","Ứng dụng sử dụng khóa hiện tại sẽ không thể truy cập, bạn có chắc không?"
+DocType: Subscription Settings,Prorate,Prorate
 DocType: Purchase Invoice,Total Advance,Tổng số trước
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Thay đổi Mã Mẫu
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Những ngày cuối kỳ không thể sớm hơn so với ngày bắt đầu kỳ. Xin vui lòng sửa ngày và thử lại.
@@ -5763,8 +5805,9 @@
 DocType: Opportunity Item,Basic Rate,Tỷ giá cơ bản
 DocType: GL Entry,Credit Amount,Số tiền tín dụng
 DocType: Cheque Print Template,Signatory Position,chức vụ người ký
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,Thiết lập như Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,Thiết lập như Lost
 DocType: Timesheet,Total Billable Hours,Tổng số giờ được Lập hoá đơn
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,Số ngày mà người đăng ký phải trả hóa đơn do đăng ký này tạo
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Phiếu tiếp nhận thanh toán
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Điều này được dựa trên các giao dịch với khách hàng này. Xem dòng thời gian dưới đây để biết chi tiết
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Dãy {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền thanh toán nhập {2}
@@ -5783,12 +5826,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,Tỷ giá nhận cuối
 DocType: Company,Company Info,Thông tin công ty
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,Chọn hoặc thêm khách hàng mới
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Điều này được dựa trên sự tham gia của nhân viên này
 DocType: Assessment Result,Summary,Tóm lược
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Đăng ký tham dự
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,Nợ TK
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,Nợ TK
 DocType: Fiscal Year,Year Start Date,Ngày bắt đầu năm
 DocType: Attendance,Employee Name,Tên nhân viên
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Nhà hàng Order Entry Item
@@ -5800,7 +5843,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Chi phí mua hàng
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Báo giá của Nhà cung cấp {0} đã tạo
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,Lợi ích của nhân viên
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,Lợi ích của nhân viên
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Work Order,Manufactured Qty,Số lượng sản xuất
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},Cổ phần không tồn tại với {0}
@@ -5808,12 +5851,12 @@
 DocType: Asset,Out of Order,Out of Order
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 DocType: Projects Settings,Ignore Workstation Time Overlap,Bỏ qua thời gian làm việc của chồng chéo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},Hãy thiết lập mặc định Tốt Danh sách nhân viên với {0} hoặc Công ty {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},Hãy thiết lập mặc định Tốt Danh sách nhân viên với {0} hoặc Công ty {1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Chọn Batch Numbers
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Hóa đơn đã đưa khách hàng
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Hàng số {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Hàng số {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
 DocType: Patient Service Unit,Medical Administrator,Quản trị viên Y tế
 DocType: Assessment Plan,Schedule,Lập lịch quét
 DocType: Account,Parent Account,Tài khoản gốc
@@ -5843,15 +5886,16 @@
 DocType: Asset Repair,Repair Status,Trạng thái Sửa chữa
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Sổ nhật biên kế toán.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
 DocType: POS Profile,Account for Change Amount,Tài khoản giao dịch số Tiền
 DocType: Purchase Invoice,input service,dịch vụ đầu vào
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Hàng {0}: Đối tác / tài khoản không khớp với {1} / {2} trong {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,Thành viên Nhóm Bảo trì
 DocType: Agriculture Analysis Criteria,Soil Analysis,Phân tích đất
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,Mã khóa học:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Hàng  # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc  bút toán nhật ký"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Hàng  # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc  bút toán nhật ký"
 DocType: Employee,Current Address,Địa chỉ hiện tại
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nếu tài liệu là một biến thể của một item sau đó mô tả, hình ảnh, giá cả, thuế vv sẽ được thiết lập từ các mẫu trừ khi được quy định một cách rõ ràng"
 DocType: Serial No,Purchase / Manufacture Details,Thông tin chi tiết mua / Sản xuất
@@ -5900,19 +5944,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Tuyển sinh cho {0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","Tính mùa vụ để thiết lập ngân sách, mục tiêu, vv"
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Tên biến
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
 DocType: Asset,Asset Category,Loại tài khoản tài sản
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,TIền thực trả không thể âm
 DocType: Purchase Order,Advance Paid,Trước Paid
 DocType: Item,Item Tax,Thuế mẫu hàng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,Nguyên liệu tới nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,Nguyên liệu tới nhà cung cấp
 DocType: Soil Texture,Loamy Sand,Cát nhôm
 DocType: Production Plan,Material Request Planning,Lập kế hoạch Yêu cầu Vật liệu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,Tiêu thụ đặc biệt Invoice
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Ngưỡng {0}% xuất hiện nhiều lần
 DocType: Expense Claim,Employees Email Id,Nhân viên Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Đánh dấu có mặt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Nợ ngắn hạn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,Nợ ngắn hạn
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,Bộ đếm thời gian đã vượt quá số giờ nhất định.
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,Gửi SMS hàng loạt tới các liên hệ của bạn
 DocType: Patient,A Positive,A Tích cực
@@ -5923,9 +5967,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và Đơn hàng mua cho nhà cung cấp này nên được cấp một cách thận trọng.
 DocType: Asset Maintenance Team,Asset Maintenance Team,Đội bảo trì tài sản
-DocType: Employee Loan,Loan Type,Loại cho vay
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0} đã được gửi thành công
+DocType: Loan,Loan Type,Loại cho vay
 DocType: Scheduling Tool,Scheduling Tool,Công cụ lập kế hoạch
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Thẻ tín dụng
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,Thẻ tín dụng
 DocType: BOM,Item to be manufactured or repacked,Mục được sản xuất hoặc đóng gói lại
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
 DocType: Sales Invoice Item,Drop Ship,Thả tàu
@@ -5957,7 +6002,7 @@
 DocType: Item,Units of Measure,Đơn vị đo lường
 DocType: Manufacturing Settings,Allow Production on Holidays,Cho phép sản xuất vào ngày lễ
 DocType: Sales Invoice,Customer's Purchase Order Date,Ngày của đơn mua hàng
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,Tồn kho ban đầu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,Tồn kho ban đầu
 DocType: Shopping Cart Settings,Show Public Attachments,Hiển thị các tệp đính kèm công khai
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
 DocType: Restaurant Reservation,Reservation Time,Thời gian đặt trước
@@ -5972,7 +6017,7 @@
 DocType: Purchase Order,To Receive and Bill,Nhận và thanh toán
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,Hàng # {0}: Yêu cầu theo ngày không thể trước ngày giao dịch
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Các sản phẩm
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,Nhà thiết kế
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Điều khoản và Điều kiện mẫu
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},Phải có Chi phí bộ phận ở hàng {0} trong bảng Thuế cho loại {1}
@@ -5982,20 +6027,20 @@
 DocType: Driver,Expiry Date,Ngày hết hiệu lực
 DocType: Healthcare Settings,Employee name and designation in print,Tên nhân viên và tên gọi trong ấn phẩm
 ,accounts-browser,tài khoản trình duyệt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,Vui lòng chọn mục đầu tiên
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Chủ dự án.
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Để cho phép qua thanh toán hoặc qua đặt hàng, cập nhật &quot;Trợ cấp&quot; trong kho Cài đặt hoặc Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(Nửa ngày)
 DocType: Payment Term,Credit Days,Ngày tín dụng
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,Vui lòng chọn Bệnh nhân để nhận Lab Tests
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Tạo đợt sinh viên
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Được truyền thẳng về phía trước
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,Các ngày Tiềm năng
 DocType: Cash Flow Mapping,Is Income Tax Expense,Chi phí Thuế Thu nhập
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Hàng # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Hàng # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kiểm tra điều này nếu Sinh viên đang cư trú tại Nhà nghỉ của Viện.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
 ,Stock Summary,Tóm tắt cổ phiếu
@@ -6006,10 +6051,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Kỳ hạn tham khảo
 DocType: Employee,Reason for Leaving,Lý do Rời đi
 DocType: BOM Operation,Operating Cost(Company Currency),Chi phí điều hành (Công ty ngoại tệ)
-DocType: Employee Loan Application,Rate of Interest,lãi suất thị trường
+DocType: Loan Application,Rate of Interest,lãi suất thị trường
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: Item,Shelf Life In Days,Kệ Life In Days
 DocType: GL Entry,Is Opening,Được mở cửa
+DocType: Department,Expense Approvers,Chi phí giới thiệu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Hàng {0}: Nợ mục không thể được liên kết với một {1}
 DocType: Journal Entry,Subscription Section,Phần đăng ký
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,Tài khoản {0} không tồn tại
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index b17709d..feb0807 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -3,17 +3,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,評估報告
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,消費類產品
-DocType: Purchase Receipt,Subscription Detail,訂閱細節
 DocType: Supplier Scorecard,Notify Supplier,通知供應商
 DocType: Item,Customer Items,客戶項目
 DocType: Project,Costing and Billing,成本核算和計費
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,帳戶{0}:父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,電子郵件通知
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,評估
 DocType: Item,Default Unit of Measure,預設的計量單位
 DocType: SMS Center,All Sales Partner Contact,所有的銷售合作夥伴聯絡
-DocType: Employee,Leave Approvers,休假審批人
+DocType: Department,Leave Approvers,休假審批人
 DocType: Sales Partner,Dealer,零售商
 DocType: Consultation,Investigations,調查
 DocType: Restaurant Order Entry,Click Enter To Add,點擊輸入要添加
@@ -26,7 +24,7 @@
 DocType: Patient Appointment,Check availability,檢查可用性
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
 DocType: Bank Guarantee,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
 DocType: Delivery Note,Return Against Delivery Note,射向送貨單
@@ -37,21 +35,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭(或組)針對其會計分錄是由和平衡得以維持。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,沒有提交工資單要處理。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,沒有提交工資單要處理。
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公開顯示
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,今天有必要採取這一行動,重複上述
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯絡
 DocType: Support Settings,Support Settings,支持設置
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:速率必須與{1}:{2}({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,新假期申請
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:速率必須與{1}:{2}({3} / {4})
 ,Batch Item Expiry Status,批處理項到期狀態
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,銀行匯票
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,銀行匯票
 DocType: Membership,membership validaty section,會員身份驗證部分
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 DocType: Consultation,Consultation,會診
@@ -61,8 +57,8 @@
 DocType: Academic Term,Academic Term,學期
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,製作網站
 DocType: Opening Invoice Creation Tool Item,Quantity,數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,賬表不能為空。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),借款(負債)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,賬表不能為空。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),借款(負債)
 DocType: Employee Education,Year of Passing,路過的一年
 DocType: Item,Country of Origin,出生國家
 DocType: Soil Texture,Soil Texture Criteria,土壤質地標準
@@ -70,7 +66,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,主要聯繫方式
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,開放式問題
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付(天)
 DocType: Payment Terms Template Detail,Payment Terms Template Detail,付款條款模板細節
@@ -78,7 +74,7 @@
 ,Delay Days,延遲天數
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},序號:{0}已在銷售發票中引用:{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,發票
+DocType: Subscription Invoice,Invoice,發票
 DocType: Purchase Invoice Item,Item Weight Details,項目重量細節
 DocType: Asset Maintenance Log,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
@@ -94,14 +90,13 @@
 DocType: Work Order Operation,Work In Progress,在製品
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
 DocType: Daily Work Summary Group,Holiday List,假日列表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,會計人員
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,會計人員
 DocType: Hub Settings,Selling Price List,賣價格表
 DocType: Patient,Tobacco Current Use,煙草當前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,賣出率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,賣出率
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Soil Analysis,(Ca+Mg)/K,(鈣+鎂)/ K
 DocType: Company,Phone No,電話號碼
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},新{0}:#{1}
 DocType: Delivery Trip,Initial Email Notification Sent,初始電子郵件通知已發送
 ,Sales Partners Commission,銷售合作夥伴佣金
 DocType: Purchase Invoice,Rounding Adjustment,舍入調整
@@ -110,16 +105,17 @@
 DocType: Payment Request,Payment Request,付錢請求
 DocType: Asset,Value After Depreciation,折舊後
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有關
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
 DocType: Grading Scale,Grading Scale Name,分級標準名稱
-DocType: Subscription,Repeat on Day,一天重複
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,這是一個 root 帳戶,不能被編輯。
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
+DocType: Subscription,Subscription Start Date,訂閱開始日期
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列,一為舊名稱,一個用於新名稱
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}不以任何活性會計年度。
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考:{0},商品編號:{1}和顧客:{2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,試用期結束日期不能在試用期開始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,公斤
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},沒有為行{1}的轉包商品{0}指定BOM
@@ -129,7 +125,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,取得項目來源
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,取得項目來源
 DocType: Price List,Price Not UOM Dependant,價格不依賴於UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
@@ -158,12 +154,12 @@
 DocType: Vehicle Service,Brake Oil,剎車油
 DocType: Tax Rule,Tax Type,稅收類型
 ,Completed Work Orders,完成的工作訂單
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,應稅金額
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,應稅金額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
 DocType: BOM,Item Image (if not slideshow),產品圖片(如果不是幻燈片)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(工時率/ 60)*實際操作時間
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:參考文檔類型必須是費用索賠或日記帳分錄之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,選擇BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:參考文檔類型必須是費用索賠或日記帳分錄之一
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,選擇BOM
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,管理給予員工的預付金額
@@ -178,19 +174,19 @@
 DocType: Delivery Trip,Delivery Notification,送達通知
 DocType: Journal Entry,Opening Entry,開放報名
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,賬戶只需支付
-DocType: Employee Loan,Repay Over Number of Periods,償還期的超過數
+DocType: Loan,Repay Over Number of Periods,償還期的超過數
 DocType: Stock Entry,Additional Costs,額外費用
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
 DocType: Education Settings,Validate Batch for Students in Student Group,驗證學生組學生的批次
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,請首先選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,請首先選擇公司
 DocType: Employee Education,Under Graduate,根據研究生
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,請在人力資源設置中設置離職狀態通知的默認模板。
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標在
 DocType: BOM,Total Cost,總成本
 DocType: Soil Analysis,Ca/K,鈣/ K
-DocType: Journal Entry Account,Employee Loan,員工貸款
 DocType: Fee Schedule,Send Payment Request Email,發送付款請求電子郵件
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,房地產
@@ -207,20 +203,17 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,成功註銷。
 DocType: Assessment Result,Grade,年級
 DocType: Restaurant Table,No of Seats,座位數
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",要添加動態主題,請使用jinja標籤<div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: Asset Maintenance Task,Asset Maintenance Task,資產維護任務
 DocType: SMS Center,All Contact,所有聯絡
 DocType: Daily Work Summary,Daily Work Summary,每日工作總結
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1}被凍結
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,庫存費用
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,庫存費用
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,選擇目標倉庫
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,選擇目標倉庫
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
 DocType: Journal Entry,Contra Entry,魂斗羅進入
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Lab Test UOM,Lab Test UOM,實驗室測試UOM
@@ -237,7 +230,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +190,Example: Basic Mathematics,例如:基礎數學
 DocType: Production Plan,Material Request Detail,材料請求詳情
 DocType: Selling Settings,Default Quotation Validity Days,默認報價有效天數
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,設定人力資源模塊
 DocType: Sales Invoice,Change Amount,漲跌額
 DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,設置B2C的發票值。 B2CL和B2CS根據此發票值計算。
@@ -246,25 +239,27 @@
 DocType: Driver,Driving License Categories,駕駛執照類別
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,請輸入交貨日期
 DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
+DocType: HR Settings,Leave Settings,保留設置
 DocType: Lead,Request Type,請求類型
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,廣播
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS(在線/離線)的設置模式
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根據工作訂單創建時間日誌。不得根據工作指令跟踪操作
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,執行
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,執行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
 DocType: Asset Maintenance Log,Maintenance Status,維修狀態
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,會員資格
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}:需要對供應商應付賬款{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,項目和定價
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},總時間:{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期={0}
 DocType: Drug Prescription,Interval,間隔
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,偏愛
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,偏愛
 DocType: Grant Application,Individual,個人
 DocType: Academic Term,Academics User,學術界用戶
 DocType: Cheque Print Template,Amount In Figure,量圖
-DocType: Employee Loan Application,Loan Info,貸款信息
+DocType: Loan Application,Loan Info,貸款信息
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,規劃維護訪問。
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,供應商記分卡期
 DocType: Share Transfer,Share Transfer,股份轉讓
@@ -280,7 +275,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,項目模板
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,生物化學
 DocType: Job Offer,Select Terms and Conditions,選擇條款和條件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,輸出值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,輸出值
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce設置
 DocType: Production Plan,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
@@ -302,9 +297,11 @@
 DocType: Selling Settings,Default Territory,預設地域
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,電視
 DocType: Work Order Operation,Updated via 'Time Log',經由“時間日誌”更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,選擇客戶或供應商。
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
 DocType: Company,Enable Perpetual Inventory,啟用永久庫存
+DocType: Bank Guarantee,Charges Incurred,收費發生
 DocType: Company,Default Payroll Payable Account,默認情況下,應付職工薪酬帳戶
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,更新電子郵件組
 DocType: Sales Invoice,Is Opening Entry,是開放登錄
@@ -327,7 +324,7 @@
 DocType: Lab Test,Custom Result,自定義結果
 DocType: Delivery Stop,Contact Name,聯絡人姓名
 DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,稅號:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,稅號:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,學生卡:
 DocType: POS Customer Group,POS Customer Group,POS客戶群
 DocType: Land Unit,Land Unit describing various land assets,描繪各種土地資產的土地單位
@@ -337,25 +334,24 @@
 ,Open Work Orders,打開工作訂單
 DocType: Payment Term,Credit Months,信貸月份
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,淨工資不能低於0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",要停止從系統發送重複的錯誤通知,我們已經在訂閱中選中了“禁用”字段
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,每年葉
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,每年葉
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}:請檢查'是推進'對帳戶{1},如果這是一個進步條目。
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Email Digest,Profit & Loss,利潤損失
 DocType: Task,Total Costing Amount (via Time Sheet),總成本計算量(通過時間表)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,請設置學生組的學生
 DocType: Item Website Specification,Item Website Specification,項目網站規格
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,銀行條目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,銀行條目
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
 DocType: Lead,Do Not Contact,不要聯絡
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,誰在您的組織教人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,軟件開發人員
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Course Scheduling Tool,Course Start Date,課程開始日期
@@ -364,8 +360,8 @@
 DocType: Item,Publish in Hub,在發布中心
 DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +448,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
@@ -396,9 +392,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,最高等級
 DocType: Email Digest,New Quotations,新報價
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
 DocType: Tax Rule,Shipping County,航運縣
-apps/erpnext/erpnext/config/desktop.py +167,Learn,學習
+apps/erpnext/erpnext/config/desktop.py +159,Learn,學習
 DocType: Asset,Next Depreciation Date,接下來折舊日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
@@ -408,7 +403,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
 DocType: Driver,Fleet Manager,車隊經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能為負值對項{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能為負值對項{2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
@@ -428,7 +423,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},請在{}上設置酒店房價
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Opening Invoice Creation Tool,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,出售資產的成本
 apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
@@ -452,10 +447,9 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",員工指定(例如總裁,總監等) 。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:採購發票不能對現有資產進行{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[緊急]為%s創建循環%s時出錯
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:採購發票不能對現有資產進行{1}
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,申請期限不能跨越兩個分配記錄
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,申請期限不能跨越兩個分配記錄
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},行#{0}:批號必須與{1} {2}
@@ -469,7 +463,7 @@
 DocType: Purchase Order,% Received,% 已收
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
 DocType: Volunteer,Weekends,週末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,信用額度
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,信用額度
 DocType: Setup Progress Action,Action Document,行動文件
 DocType: Chapter Member,Website URL,網站網址
 DocType: Delivery Note,Instructions,說明
@@ -481,6 +475,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服務器的GoCardless配置似乎存在問題。別擔心,如果失敗,這筆款項將退還給您的帳戶。
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加項目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
+DocType: Leave Application,Leave Approver Name,離開批准人姓名
 DocType: Depreciation Schedule,Schedule Date,排定日期
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",收入,扣減等工資組成部分
 DocType: Packed Item,Packed Item,盒裝產品
@@ -499,7 +494,7 @@
 DocType: Request for Quotation,Request for Quotation,詢價
 DocType: Healthcare Settings,Require Lab Test Approval,需要實驗室測試批准
 DocType: Salary Slip Timesheet,Working Hours,工作時間
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,總計傑出
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,總計傑出
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
 DocType: Dosage Strength,Strength,強度
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,創建一個新的客戶
@@ -509,7 +504,7 @@
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Purchase Receipt,Vehicle Date,車日期
 DocType: Student Log,Medical,醫療
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,原因丟失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,原因丟失
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,更新帳號
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,主導所有人不能等同於主導者
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
@@ -518,10 +513,10 @@
 DocType: Lab Test Template,Single,單
 DocType: Salary Slip,Total Loan Repayment,總貸款還款
 DocType: Account,Cost of Goods Sold,銷貨成本
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,請輸入成本中心
 DocType: Drug Prescription,Dosage,劑量
 DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均。賣出價
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,平均。賣出價
 DocType: Assessment Plan,Examiner Name,考官名稱
 DocType: Lab Test Template,No Result,沒有結果
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
@@ -530,6 +525,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,請先輸入公司名稱
 DocType: Purchase Invoice,Supplier Name,供應商名稱
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,在日曆中顯示所有部門成員的葉子
 DocType: Purchase Invoice,01-Sales Return,01-銷售退貨
 DocType: Account,Is Group,是集團
 DocType: Email Digest,Pending Purchase Orders,待採購訂單
@@ -547,13 +543,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,必修課 - 學年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1}與{2} {3}無關
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},不允許對停止的工單{0}進行交易
 DocType: Setup Progress Action,Min Doc Count,最小文件計數
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
@@ -571,8 +567,8 @@
 DocType: Payroll Entry,Select Payroll Period,選擇工資期
 DocType: Packing Slip,From Package No.,從包裹編號
 DocType: Item Attribute,To Range,為了範圍
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,證券及存款
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法,因為有一些項目沒有自己的估值方法的交易
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,證券及存款
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法,因為有一些項目沒有自己的估值方法的交易
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Patient,AB Positive,AB積極
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
@@ -580,7 +576,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤記錄。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
-DocType: Employee Loan,Total Payment,總付款
+DocType: Loan,Total Payment,總付款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,無法取消已完成工單的交易。
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間(以分鐘計)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消,因此無法完成操作
@@ -594,15 +590,16 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足夠的配件組裝
 DocType: POS Profile User,POS Profile User,POS配置文件用戶
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收入
+DocType: Subscription Invoice,Subscription Invoice,訂閱發票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,直接收入
 DocType: Patient Appointment,Date TIme,約會時間
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",7 。總計:累積總數達到了這一點。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,政務主任
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,政務主任
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和稅收
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
 DocType: Codification Table,Codification Table,編纂表
 DocType: Timesheet Detail,Hrs,小時
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,請選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,請選擇公司
 DocType: Stock Entry Detail,Difference Account,差異帳戶
 DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
@@ -655,7 +652,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 DocType: Healthcare Settings,Appointment Confirmation,預約確認
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0},因為它採用的是現貨交易
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0},因為它採用的是現貨交易
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),關閉(Cr)
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移動項目
 DocType: Serial No,Warranty Period (Days),保修期限(天數)
@@ -677,10 +674,10 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已經在用戶{1}的pos配置文件{0}中設置了默認值,請禁用默認值
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,財務/會計年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積值
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",對不起,序列號無法合併
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",對不起,序列號無法合併
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要領域
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,製作銷售訂單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},從{0}到{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},從{0}到{1}
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
@@ -700,8 +697,9 @@
 DocType: Sales Invoice,Shipping Bill Date,運費單日期
 DocType: Production Plan,Production Plan,生產計劃
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打開發票創建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,銷貨退回
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注:總分配葉{0}應不低於已核定葉{1}期間
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根據序列號輸入設置交易數量
 ,Total Stock Summary,總庫存總結
 DocType: Announcement,Posted By,發布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨(直接發運)
@@ -711,14 +709,14 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),開啟(Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,分配金額不能為負
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,請設定公司
 DocType: Share Balance,Share Balance,份額平衡
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Training Result Employee,Training Result Employee,訓練結果員工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
-DocType: Employee Loan Application,Total Payable Interest,合計應付利息
+DocType: Loan Application,Total Payable Interest,合計應付利息
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},總計:{0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,銷售發票時間表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
@@ -727,10 +725,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉,報銷和工資
 DocType: Restaurant Reservation,Restaurant Reservation,餐廳預訂
 DocType: Land Unit,Land Unit Name,土地單位名稱
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,提案寫作
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,提案寫作
 DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,包起來
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,通過電子郵件通知客戶
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,通過電子郵件通知客戶
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
 DocType: Employee Advance,Claimed Amount,聲明金額
 apps/erpnext/erpnext/config/education.py +180,Masters,資料主檔
@@ -748,12 +746,11 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建,請手動創建一個。
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的規定,沒有資格參加本計劃
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,項目代碼&gt;項目組&gt;品牌
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
 DocType: Student,Sibling Details,兄弟姐妹詳情
 DocType: Vehicle Service,Vehicle Service,汽車服務
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
 DocType: Employee,Reason for Resignation,辭退原因
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,模板的績效考核。
 DocType: Sales Invoice,Credit Note Issued,信用票據發行
@@ -767,10 +764,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶,客戶群組,領地,供應商,供應商類型,活動,銷售合作夥伴等。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,在庫存淨變動
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,員工貸款管理
 DocType: Employee,Passport Number,護照號碼
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,與關係Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,經理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,經理
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},請在倉庫{0}中設置帳戶
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
@@ -806,22 +802,22 @@
 DocType: Item,Material Transfer,物料轉倉
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路徑
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),開啟(Dr)
+DocType: Loan,Applicant,申請人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,複製文件
 ,GST Itemised Purchase Register,GST成品採購登記冊
-DocType: Employee Loan,Total Interest Payable,合計應付利息
+DocType: Loan,Total Interest Payable,合計應付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Work Order Operation,Actual Start Time,實際開始時間
 DocType: BOM Operation,Operation Time,操作時間
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,基礎
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,核銷金額
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,核銷金額
 DocType: Leave Block List Allow,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失帳戶
 DocType: Vehicle Log,Service Details,服務細節
 DocType: Vehicle Log,Service Details,服務細節
-DocType: Subscription,Quarterly,每季
 DocType: Lab Test Template,Grouped,分組
 DocType: Selling Settings,Delivery Note Required,要求送貨單
 DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
@@ -832,7 +828,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
 DocType: Sales Invoice,Port Code,港口代碼
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,儲備倉庫
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,儲備倉庫
 DocType: Lead,Lead is an Organization,領導是一個組織
 DocType: Guardian Interest,Interest,利益
 DocType: Instructor Log,Other Details,其他詳細資訊
@@ -841,12 +837,12 @@
 DocType: Account,Accounts,會計
 DocType: Vehicle,Odometer Value (Last),里程表值(最後)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供應商計分卡標準模板。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,市場營銷
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,市場營銷
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,已創建付款輸入
 DocType: Request for Quotation,Get Suppliers,獲取供應商
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:資產{1}不掛項目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,預覽工資單
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:資產{1}不掛項目{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,預覽工資單
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帳戶{0}已多次輸入
 DocType: Account,Expenses Included In Valuation,支出計入估值
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,如果您的會員資格在30天內到期,您只能續訂
@@ -856,7 +852,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在設置了“現金流量映射器”文檔時才能選擇
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送:
 DocType: Supplier Scorecard,Per Week,每個星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,項目已變種。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
@@ -874,9 +870,9 @@
 DocType: Hub Settings,Publish,發布
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司與賬戶
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,在數值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,在數值
 DocType: Asset Settings,Depreciation Options,折舊選項
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,發佈時間無效
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,發佈時間無效
 DocType: Lead,Campaign Name,活動名稱
 DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
 DocType: Driver,License Details,許可證詳情
@@ -899,7 +895,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Budget,Budget Against,反對財政預算案
 DocType: Employee,Cell Number,手機號碼
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,給定的標準沒有僱員。檢查工資單還沒有被創建。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,給定的標準沒有僱員。檢查工資單還沒有被創建。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
@@ -909,13 +905,13 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}項目{2}所需的序列號。你已經提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,請選擇一張桌子
 DocType: BOM,Website Specifications,網站規格
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的無效電子郵件地址
 DocType: Special Test Items,Particulars,細節
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}:從{0}類型{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}:從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,列#{0}:轉換係數是強制性的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則,同樣的標準存在,請通過分配優先解決衝突。價格規則:{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
 DocType: Asset,Maintenance,維護
+DocType: Subscriber,Subscriber,訂戶
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,請更新您的項目狀態
 DocType: Item,Maximum sample quantity that can be retained,可以保留的最大樣品數量
@@ -971,24 +967,24 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,添加時代
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
-DocType: Employee Loan,Interest Income Account,利息收入賬戶
+DocType: Loan,Interest Income Account,利息收入賬戶
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,審核邀請已發送
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,生物技術
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Office維護費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,Office維護費用
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,請先輸入品項
 DocType: Asset Repair,Downtime,停機
 DocType: Account,Liability,責任
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,學術期限:
 DocType: Salary Detail,Do not include in total,不包括在內
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,未選擇價格列表
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,未選擇價格列表
 DocType: Request for Quotation Supplier,Send Email,發送電子郵件
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},警告:無效的附件{0}
 DocType: Item,Max Sample Quantity,最大樣品量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,無權限
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,無權限
 DocType: Vital Signs,Heart Rate / Pulse,心率/脈搏
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +59,"To filter based on Party, select Party Type first",要根據黨的篩選,選擇黨第一類型
@@ -998,12 +994,11 @@
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,實驗室測試和重要標誌
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,行#{0}:資產{1}必須提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,行#{0}:資產{1}必須提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
-DocType: Subscription,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,學生組已經更新。
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,學生組已經更新。
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,項目更新。
 DocType: SMS Center,All Customer Contact,所有的客戶聯絡
 DocType: Land Unit,Tree Details,樹詳細信息
@@ -1051,7 +1046,6 @@
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
 DocType: Upload Attendance,Import Attendance,進口出席
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有項目群組
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Work Order,Item To Manufacture,產品製造
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的狀態為{2}
 DocType: Water Analysis,Collection Temperature ,收集溫度
@@ -1063,7 +1057,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",重新選擇,如果所選地址在保存後被編輯
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 DocType: Item,Hub Publishing Details,Hub發布細節
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',“開放”
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',“開放”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Lab Test Template,Result Format,結果格式
@@ -1071,7 +1065,7 @@
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
 DocType: Vehicle Service,Brake Pad,剎車片
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,研究與發展
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,研究與發展
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
 DocType: Timesheet,Total Billed Amount,總開單金額
@@ -1085,7 +1079,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,在銷售訂單旁邊繞過信貸限額檢查
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,績效考核。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”,而應該有購物車至少有一個稅務規則
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1},檢查它是否應該被拉到作為預先在該發票聯。
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1},檢查它是否應該被拉到作為預先在該發票聯。
 DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,銷售點
@@ -1113,7 +1107,7 @@
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
 DocType: Examination Result,Examination Result,考試成績
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
@@ -1121,15 +1115,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Work Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM {0}必須是積極的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,沒有可用於傳輸的項目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,沒有可用於傳輸的項目
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),閉幕(開幕+總計)
 DocType: Journal Entry,Depreciation Entry,折舊分錄
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前,材質訪問{0}
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016標準
 DocType: Pricing Rule,Rate or Discount,價格或折扣
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,最愛
 DocType: Hub Settings,Custom Data,自定義數據
@@ -1140,9 +1134,9 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +25,Creating {0} Invoice,創建{0}發票
 DocType: Medical Code,Medical Code Standard,醫療代碼標準
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,在分配任務之前請保存。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,餘額
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,餘額
 DocType: Lab Test,Lab Technician,實驗室技術員
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,銷售價格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果選中,將創建一個客戶,映射到患者。將針對該客戶創建病人發票。您也可以在創建患者時選擇現有客戶。
 DocType: Bank Reconciliation,Account Currency,賬戶幣種
@@ -1150,16 +1144,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,請註明舍入賬戶的公司
 DocType: Purchase Receipt,Range,範圍
 DocType: Supplier,Default Payable Accounts,預設應付帳款
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Fee Structure,Components,組件
 DocType: Item Barcode,Item Barcode,商品條碼
 DocType: Woocommerce Settings,Endpoints,端點
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",被生成。如果延遲,您將不得不手動更改“每月重複”字段
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Share Transfer,From Folio No,來自Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}:信用記錄無法被鏈接的{1}
@@ -1193,12 +1185,12 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},列#{0}:請為項目{1}指定序號
 DocType: Crop Cycle,Crop Cycle,作物週期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
 DocType: Student Admission,Publish on website,發布在網站上
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 DocType: Agriculture Task,Agriculture Task,農業任務
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,間接收入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,間接收入
 DocType: Student Attendance Tool,Student Attendance Tool,學生考勤工具
 DocType: Restaurant Menu,Price List (Auto created),價目表(自動創建)
 DocType: Cheque Print Template,Date Settings,日期設定
@@ -1241,8 +1233,8 @@
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 DocType: Item,Automatically Create New Batch,自動創建新批
 DocType: Item,Automatically Create New Batch,自動創建新批
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),將{0}分配給{1}(第{2}行)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),將{0}分配給{1}(第{2}行)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,使
 DocType: Student Admission,Admission Start Date,入學開始日期
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新員工
@@ -1258,7 +1250,7 @@
 DocType: Holiday List,Holiday List Name,假日列表名稱
 DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,課程時間表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,股票期權
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,股票期權
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,取消採購訂單中的上次採購詳細信息
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產?
@@ -1277,10 +1269,11 @@
 DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: Purchase Invoice,Cash/Bank Account,現金/銀行帳戶
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},請指定{0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,變體創建已經排隊。
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,屬性表是強制性的
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一個請假批准者將被設置為默認的批准批准者。
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Plan,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0}不能為負數
 DocType: Training Event,Self-Study,自習
@@ -1290,7 +1283,7 @@
 DocType: Workstation,Wages,工資
 DocType: Asset Maintenance,Maintenance Manager Name,維護經理姓名
 DocType: Agriculture Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,無法找到變量:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,不能成為股票分類賬創建的固定資產項目。
@@ -1301,7 +1294,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,質量檢驗模板名稱
 DocType: Project,First Email,第一郵件
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,銷售金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,銷售金額
 DocType: Repayment Schedule,Interest Amount,利息金額
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Share Transfer,Issue,問題
@@ -1314,10 +1307,10 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 ,Projected Quantity as Source,預計庫存量的來源
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,送貨之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,送貨之旅
 DocType: Student,A-,一個-
 DocType: Share Transfer,Transfer Type,轉移類型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,銷售費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,銷售費用
 DocType: Consultation,Diagnosis,診斷
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
@@ -1326,12 +1319,13 @@
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,郵政編碼
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},銷售訂單{0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},選擇貸款{0}中的利息收入帳戶
 DocType: Opportunity,Contact Info,聯絡方式
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,過度生產容許比例
-DocType: Employee Loan,Repayment Schedule,還款計劃
+DocType: Loan,Repayment Schedule,還款計劃
 DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,結束日期不能小於開始日期
@@ -1345,7 +1339,7 @@
 DocType: Education Settings,Attendance Freeze Date,出勤凍結日期
 DocType: Education Settings,Attendance Freeze Date,出勤凍結日期
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有產品
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,查看所有產品
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡(天)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡(天)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,所有的材料明細表
@@ -1354,13 +1348,15 @@
 DocType: Expense Claim,From Employee,從員工
 DocType: Driver,Cellphone Number,手機號碼
 DocType: Project,Monitor Progress,監視進度
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
+DocType: Supplier Quotation,Auto Repeat Section,自動重複部分
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
 DocType: Program Enrollment,Transportation,運輸
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,無效屬性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1}必須提交
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},量必須小於或等於{0}
+DocType: Department Approver,Department Approver,部門批准人
 DocType: SMS Center,Total Characters,總字元數
 DocType: Employee Advance,Claimed,聲稱
 DocType: Crop,Row Spacing,行間距
@@ -1370,6 +1366,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,貢獻%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根據購買設置,如果需要採購訂單==&#39;是&#39;,那麼為了創建採購發票,用戶需要首先為項目{0}創建採購訂單
+,HSN-wise-summary of outward supplies,HSN明智的向外供應摘要
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼,供大家參考。稅務號碼等
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
@@ -1398,23 +1395,24 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段將僅在創建時復制。
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,管理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,管理
 DocType: Cheque Print Template,Payer Settings,付款人設置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如,如果你的英文縮寫為“SM”,而該項目的代碼是“T-SHIRT”,該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存,淨付款就會被顯示出來。
 DocType: Purchase Invoice,Is Return,退貨
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',開始日期大於任務“{0}”的結束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,返回/借記注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,返回/借記注
 DocType: Price List Country,Price List Country,價目表國家
 DocType: Item,UOMs,計量單位
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
 DocType: Purchase Invoice Item,UOM Conversion Factor,計量單位換算係數
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
 DocType: Stock Settings,Default Item Group,預設項目群組
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,您無法重新啟動未取消的訂閱。
 DocType: Account,Balance Sheet,資產負債表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,總計家長教師會議
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
@@ -1426,7 +1424,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,行#{0}:駁回採購退貨數量不能進入
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,更新預計到達時間。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,更新預計到達時間。
 DocType: Program Enrollment Tool,Enrollment Details,註冊詳情
 DocType: Purchase Invoice Item,Net Rate,淨費率
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,請選擇一個客戶
@@ -1447,15 +1445,17 @@
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Purchase Order,Group same items,組相同的項目
 DocType: Purchase Invoice,Disable Rounded Total,禁用圓角總
-DocType: Employee Loan Application,Repayment Info,還款信息
+DocType: Department,Parent Department,家長部門
+DocType: Loan Application,Repayment Info,還款信息
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分錄”不能是空的
 DocType: Maintenance Team Member,Maintenance Role,維護角色
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},重複的行{0}同{1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,會計年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,建立職工
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店預訂用戶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,請先選擇前綴稱號
+DocType: Subscription Settings,Subscription Settings,訂閱設置
 DocType: Maintenance Visit Purpose,Work Done,工作完成
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
 DocType: Announcement,All Students,所有學生
@@ -1464,7 +1464,7 @@
 DocType: Grading Scale,Intervals,間隔
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 DocType: Crop,Yield UOM,產量UOM
 ,Budget Variance Report,預算差異報告
@@ -1484,11 +1484,11 @@
 DocType: Opportunity Item,Opportunity Item,項目的機會
 ,Student and Guardian Contact Details,學生和監護人聯繫方式
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,行{0}:對於供應商{0}的電郵地址發送電子郵件
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,臨時開通
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,臨時開通
 ,Employee Leave Balance,員工休假餘額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
 DocType: Patient Appointment,More Info,更多訊息
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
 DocType: Supplier Scorecard,Scorecard Actions,記分卡操作
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,舉例:碩士計算機科學
 DocType: Purchase Invoice,Rejected Warehouse,拒絕倉庫
@@ -1498,7 +1498,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,到
 DocType: Supplier Quotation Item,Lead Time in days,交貨天期
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},從{0}工資支付{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},從{0}工資支付{1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,銷售訂單{0}無效
@@ -1509,6 +1509,7 @@
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,打開發票創建工具項目
 DocType: Education Settings,Employee Number,員工人數
+DocType: Subscription Settings,Cancel Invoice After Grace Period,在寬限期後取消發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},案例編號已在使用中( S) 。從案例沒有嘗試{0}
 DocType: Project,% Completed,%已完成
 ,Invoiced Amount (Exculsive Tax),發票金額(Exculsive稅)
@@ -1520,7 +1521,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,實驗室測試日期時間
 DocType: Email Digest,Add Quote,添加報價
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,間接費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,間接費用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,列#{0}:數量是強制性的
 DocType: Agriculture Analysis Criteria,Agriculture,農業
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,同步主數據
@@ -1548,15 +1549,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0},只有貸方帳戶可以連接另一個借方分錄
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」,「項目群組」或「品牌」,而選擇定價規則。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,請先設定商品代碼
 DocType: Item,ITEM-,項目-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
+DocType: Subscription Plan,Billing Interval Count,計費間隔計數
 DocType: Sales Invoice Item,Edit Description,編輯說明
 ,Team Updates,團隊更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
@@ -1580,7 +1582,7 @@
 DocType: POS Item Group,POS Item Group,POS項目組
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代項目不能與項目代碼相同
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-定期評估
 DocType: Salary Slip,Bank Account No.,銀行賬號
@@ -1623,14 +1625,14 @@
 DocType: Project,Start and End Dates,開始和結束日期
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},開放BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,公用事業
 DocType: POS Profile,Accounting,會計
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,請為批量選擇批次
 DocType: Asset,Depreciation Schedules,折舊計劃
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,以下帳戶可能在GST設置中選擇:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,以下帳戶可能在GST設置中選擇:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},從{0} | {1} {2}
@@ -1641,6 +1643,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,平均每日傳出
 DocType: POS Profile,Campaign,競賽
 DocType: Supplier,Name and Type,名稱和類型
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
 DocType: Physician,Contacts and Address,聯繫人和地址
 DocType: Purchase Invoice,Contact Person,聯絡人
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
@@ -1653,19 +1656,20 @@
 DocType: Student Admission,Eligibility and Details,資格和細節
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開,如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},最大數量:{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈,為更多的檢查門戶設置。
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供應商記分卡評分變量
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,購買金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,購買金額
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,創建課程表時出現錯誤
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,項{0}不是缺貨登記
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一個費用審批人將被設置為默認的費用審批人。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,不能大於100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Detail,Depends on Leave Without Pay,依賴於無薪休假
@@ -1683,13 +1687,14 @@
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
 DocType: Package Code,Package Code,封裝代碼
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,負數量是不允許
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表,成為字串並存儲在這欄位。用於稅賦及費用
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,員工不能報告自己。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結,條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}:{1}只能在貨幣做:{2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,在離職申請中允許Approver為強制性
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況,學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,稅收規則進行的交易。
@@ -1715,15 +1720,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付條款可能是重複的。
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),農業(測試版)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,包裝單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,辦公室租金
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,設置短信閘道設置
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,包裝單
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,辦公室租金
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,設置短信閘道設置
 DocType: Disease,Common Name,通用名稱
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,導入失敗!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
 DocType: Vital Signs,Blood Pressure,血壓
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,分析人士
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,分析人士
 DocType: Item,Inventory,庫存
 DocType: Item,Sales Details,銷售詳細資訊
 DocType: Opportunity,With Items,隨著項目
@@ -1734,11 +1739,11 @@
 DocType: Item,Item Attribute,項目屬性
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,報銷{0}已經存在車輛日誌
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,學院名稱
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,請輸入還款金額
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,請輸入還款金額
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,項目變體
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服務
 DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,選擇潛在供應商
 DocType: Customer,"Select, to make the customer searchable with these fields",選擇,使客戶可以使用這些字段進行搜索
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
@@ -1754,7 +1759,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,包裝單( S)已取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,從投資現金流
 DocType: Program Course,Program Course,課程計劃
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,貨運代理費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,貨運代理費
 DocType: Homepage,Company Tagline for website homepage,公司標語的網站主頁
 DocType: Item Group,Item Group Name,項目群組名稱
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
@@ -1783,10 +1788,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership細節
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),請輸入所有必需的結果值(s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,應收賬款匯總
-DocType: Employee Loan,Monthly Repayment Amount,每月還款額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,應收賬款匯總
+DocType: Loan,Monthly Repayment Amount,每月還款額
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,打開發票
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 DocType: GST HSN Code,HSN Code,HSN代碼
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,貢獻金額
@@ -1805,7 +1810,7 @@
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用戶{0}已分配給醫師{1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,默認倉庫需要選中的項目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,可能的供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,可能的供應商
 DocType: Budget,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),醫療保健(beta)
@@ -1828,7 +1833,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,生產數量是必填的
-DocType: Employee Loan,Repayment Method,還款方式
+DocType: Loan,Repayment Method,還款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果選中,主頁將是網站的默認項目組
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,索賠費用由公司負責。
@@ -1837,14 +1842,14 @@
 DocType: Asset Maintenance Task,Certificate Required,證書要求
 DocType: Company,Default Holiday List,預設假日表列
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}:從時間和結束時間{1}是具有重疊{2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,現貨負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,現貨負債
 DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯絡手機號碼
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,選擇公司
 ,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用戶{0}沒有任何默認的POS配置文件。檢查此用戶的行{1}處的默認值。
 DocType: Student Group,Set 0 for no limit,為不限制設為0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,需要行{idx}:{field}才能創建開票{invoice_type}發票
 DocType: Customer,Primary Address and Contact Detail,主要地址和聯繫人詳情
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
@@ -1855,9 +1860,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,請選擇至少一個域名。
 DocType: Dependent Task,Dependent Task,相關任務
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: SMS Center,Receiver List,收受方列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,搜索項目
 DocType: Payment Schedule,Payment Amount,付款金額
@@ -1866,7 +1871,7 @@
 DocType: Assessment Plan,Grading Scale,分級量表
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,已經完成
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,庫存在手
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,庫存在手
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,導入成功!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
@@ -1877,15 +1882,14 @@
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Customer,Customer POS Id,客戶POS ID
 DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,起始日期不能大於結束日期
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,起始日期不能大於結束日期
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,請輸入Woocommerce服務器網址
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,轉化率不能為0或1
-DocType: Subscription,Reference Document,參考文獻
 DocType: Accounts Settings,Credit Controller,信用控制器
-DocType: Grant Application,Applicant Type,申請人類型
+DocType: Loan,Applicant Type,申請人類型
 DocType: Purchase Invoice,03-Deficiency in services,03-服務不足
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
 DocType: Healthcare Settings,Default Medical Code Standard,默認醫療代碼標準
@@ -1895,12 +1899,12 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}%已開立帳單
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力資源
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力資源
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒絕
 DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
 DocType: BOM Item,BOM Item,BOM項目
 DocType: Appraisal,For Employee,對於員工
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,請輸入支付
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,請輸入支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}:提前對供應商必須扣除
 DocType: Company,Default Values,默認值
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
@@ -1927,10 +1931,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,現貨供應
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,現貨供應
 DocType: Manufacturing Settings,Capacity Planning For (Days),產能規劃的範圍(天)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,採購
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,強制性領域 - 計劃
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,強制性領域 - 計劃
 DocType: Special Test Template,Result Component,結果組件
@@ -1948,7 +1952,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
 DocType: Sales Invoice,Packed Items,盒裝項目
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,針對序列號保修索賠
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total','總數'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','總數'
 DocType: Shopping Cart Settings,Enable Shopping Cart,啟用購物車
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
@@ -1965,10 +1969,10 @@
 DocType: Selling Settings,Selling Settings,銷售設置
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,確認操作
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,網上拍賣
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,履行
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,查看你的購物車
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,市場推廣開支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,無法創建標準條件。請重命名標準
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,請同時註明“重量計量單位”
@@ -1991,9 +1995,9 @@
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Material Request,Transferred,轉入
 DocType: Vehicle,Doors,門
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext設定完成!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext設定完成!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登記費
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
 DocType: Course Assessment Criteria,Weightage,權重
 DocType: Purchase Invoice,Tax Breakup,稅收分解
 DocType: Member,Non Profit Member,非盈利會員
@@ -2025,12 +2029,13 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表,並使用試算表程式進行列印。
 DocType: Purchase Invoice Item,Batch No,批號
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,員工發展
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
 DocType: Student Group Instructor,Student Group Instructor,學生組教練
 DocType: Student Group Instructor,Student Group Instructor,學生組教練
 DocType: Grant Application,Assessment  Mark (Out of 10),評估標記(滿分10分)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手機號碼
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,主頁
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
@@ -2038,15 +2043,16 @@
 DocType: Employee,Leave Encashed?,離開兌現?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,貢獻淨合計
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
 DocType: Territory,Territory Name,地區名稱
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,提交之前,需要填入在製品倉庫
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,您只能在訂閱中擁有相同結算週期的計劃
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
@@ -2057,10 +2063,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,估價
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培訓活動
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,通過鉛源追踪潛在客戶。
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,請輸入
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,請輸入
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,維護日誌
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 (當項目的淨重量總和自動計算)
@@ -2068,7 +2074,7 @@
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒絕倉庫是強制性的反對否決項{1}
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何帳戶關聯,請在倉庫記錄中提及該帳戶,或在公司{1}中設置默認庫存帳戶。
@@ -2080,7 +2086,7 @@
 DocType: Student Leave Application,Student Leave Application,學生請假申請
 DocType: Item,Will also apply for variants,同時將申請變種
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",資產不能被取消,因為它已經是{0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},員工{0}上半天{1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},員工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在銷售時捆綁項目。
@@ -2090,7 +2096,7 @@
 DocType: Item,Barcodes,條形碼
 DocType: Hub Category,Hub Node,樞紐節點
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正,然後再試一次。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,關聯
 DocType: Asset Movement,Asset Movement,資產運動
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,必須提交工單{0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,新的車
@@ -2105,13 +2111,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,電信
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,帳單貨幣必須等於默認公司的貨幣或帳戶幣種
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分(僅草案)
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,行{0}:到期日期不能在發布日期之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,行{0}:到期日期不能在發布日期之前
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,製作付款分錄
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
 ,Sales Invoice Trends,銷售發票趨勢
 DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,對於
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
@@ -2125,7 +2130,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生產設置中設置。
 DocType: Student,Student Mobile Number,學生手機號碼
 DocType: Item,Has Variants,有變種
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1}行中的項目{0}不能超過{2}。要允許超額結算,請在庫存設置中進行設置
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1}行中的項目{0}不能超過{2}。要允許超額結算,請在庫存設置中進行設置
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新響應
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
@@ -2137,12 +2142,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,首先選擇程序
 DocType: Patient Appointment,Patient Age,患者年齡
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,項目管理
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,序列號{0}已被返回
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,序列號{0}已被返回
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget,Fiscal Year,財政年度
 DocType: Asset Maintenance Log,Planned,計劃
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,如果沒有在患者中設置隱性應收帳款,請諮詢費用。
 DocType: Vehicle Log,Fuel Price,燃油價格
+DocType: Bank Guarantee,Margin Money,保證金
 DocType: Budget,Budget,預算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,設置打開
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
@@ -2156,15 +2162,15 @@
 DocType: Lead,Follow Up,跟進
 DocType: Item,Is Sales Item,是銷售項目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,項目群組的樹狀結構
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定,請檢查項目主檔
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定,請檢查項目主檔
 DocType: Maintenance Visit,Maintenance Time,維護時間
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},相同的物品已被多次輸入。 {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早(學年{})。請更正日期,然後再試一次。
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,有錯誤。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,員工{0}已在{2}和{3}之間申請{1}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,有錯誤。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,員工{0}已在{2}和{3}之間申請{1}:
 DocType: Guardian,Guardian Interests,守護興趣
 DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
 DocType: Education Settings,Instructor Records to be created by,導師記錄由
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已新增
 DocType: GST Account,GST Account,GST帳戶
@@ -2183,8 +2189,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,已添加到收藏夾
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,關稅和稅款
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,關稅和稅款
 DocType: Projects Settings,Projects Settings,項目設置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
@@ -2194,7 +2200,7 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,項目群組樹。
 DocType: Production Plan,Total Produced Qty,總生產數量
 DocType: Payroll Entry,Get Employee Details,獲取員工細節
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,全部項目的購買歷史
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
@@ -2203,14 +2209,15 @@
 DocType: Sales Invoice,Accounting Details,會計細節
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,刪除所有交易本公司
 DocType: Patient,O Positive,O積極
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,投資
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,驗收標準
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,請輸入在上表請求材料
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,沒有可用於日記帳分錄的還款
 DocType: Item Attribute,Attribute Name,屬性名稱
 DocType: BOM,Show In Website,顯示在網站
 DocType: Shopping Cart Settings,Show Quantity in Website,顯示在網站數量
-DocType: Employee Loan Application,Total Payable Amount,合計應付額
+DocType: Loan Application,Total Payable Amount,合計應付額
 DocType: Task,Expected Time (in hours),預期時間(以小時計)
 DocType: Item Reorder,Check in (group),檢查(組)
 ,Qty to Order,訂購數量
@@ -2225,7 +2232,7 @@
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
 DocType: Room,Room Name,房間名稱
 DocType: Prescription Duration,Prescription Duration,處方時間
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消,因為假平衡已經被搬入轉發在未來休假分配記錄{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消,因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,客戶的地址和聯絡方式
 ,Campaign Efficiency,運動效率
 ,Campaign Efficiency,運動效率
@@ -2243,11 +2250,11 @@
 DocType: Chapter,Chapter,章節
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,對
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,選擇此模式後,默認帳戶將在POS發票中自動更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,選擇BOM和數量生產
 DocType: Asset,Depreciation Schedule,折舊計劃
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,銷售合作夥伴地址和聯繫人
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,請在{0}公司中設置默認成本中心。
 DocType: Item,Has Batch No,有批號
@@ -2283,7 +2290,7 @@
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
 DocType: Hub Category,Hub Category,中心類別
 DocType: Purchase Receipt,Vehicle Number,車號
-DocType: Employee Loan,Loan Amount,貸款額度
+DocType: Loan,Loan Amount,貸款額度
 DocType: Student Report Generation Tool,Add Letterhead,添加信頭
 DocType: Program Enrollment,Self-Driving Vehicle,自駕車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供應商記分卡站立
@@ -2311,9 +2318,9 @@
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
 DocType: Patient,Patient Details,患者細節
 DocType: Patient,B Positive,B積極
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:訂購數量必須是1,因為項目是固定資產。請使用單獨的行多數量。
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:訂購數量必須是1,因為項目是固定資產。請使用單獨的行多數量。
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
 DocType: Patient Medical Record,Patient Medical Record,病人醫療記錄
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,體育
@@ -2321,8 +2328,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,實際總計
 DocType: Lab Test UOM,Test UOM,測試UOM
 DocType: Student Siblings,Student Siblings,學生兄弟姐妹
+DocType: Subscription Plan Detail,Subscription Plan Detail,訂閱計劃詳情
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,請註明公司
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶取得和忠誠度
 DocType: Asset Maintenance Task,Maintenance Task,維護任務
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,請在GST設置中設置B2C限制。
@@ -2335,6 +2343,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,報銷
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),總消耗材料成本(通過股票輸入)
 DocType: Hub Settings,Company Registered,公司註冊
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,迄今不能少於起始日期
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基於倉庫中的庫存,在Hub上發布“庫存”或“庫存”。
 DocType: Vehicle,Fuel Type,燃料類型
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,請公司指定的貨幣
@@ -2342,15 +2351,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
 DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 DocType: Employee,Create User Permission,創建用戶權限
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,項目代碼&gt;項目組&gt;品牌
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:參考文件類型必須是銷售訂單之一,銷售發票或日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:參考文件類型必須是銷售訂單之一,銷售發票或日記帳分錄
 DocType: Salary Component,Deduction,扣除
 DocType: Item,Retain Sample,保留樣品
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}:從時間和時間是強制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金額差異
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生產中
@@ -2359,13 +2369,13 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
 DocType: Normal Test Template,Normal Test Template,正常測試模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,報價
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
 DocType: Salary Slip,Total Deduction,扣除總額
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,選擇一個賬戶以賬戶貨幣進行打印
 ,Production Analytics,生產Analytics(分析)
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,這是基於對這個病人的交易。有關詳情,請參閱下面的時間表
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,項{0}已被退回
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,項{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供應商記分卡設置
@@ -2376,14 +2386,15 @@
 DocType: Work Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於(用戶)
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,職位描述
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,職位描述
 DocType: Student Applicant,Applied,應用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,重新打開
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,重新打開
 DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名稱
 DocType: Purchase Invoice,02-Post Sale Discount,02-售後折扣
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”,“”,“#”,和“/”未命名序列允許
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息,報價,銷售訂單等,從競賽來衡量投資報酬。
+DocType: Department Approver,Approver,審批人
 ,SO Qty,SO數量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,“股東”字段不能為空
 DocType: Appraisal,Calculate Total Score,計算總分
@@ -2396,18 +2407,17 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額(公司幣種)
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 DocType: BOM,Scrap Material Cost,廢料成本
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 DocType: Grant Application,Email Notification Sent,電子郵件通知已發送
 DocType: Purchase Invoice,In Words (Company Currency),大寫(Company Currency)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
-DocType: Pricing Rule,Supplier,供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
+DocType: Bank Guarantee,Supplier,供應商
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,顯示付款詳情
 DocType: Consultation,Consultation Time,諮詢時間
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,雜項開支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言, 費用或差異帳戶是強制必填的,因為它影響整個庫存總值。
 DocType: Cheque Print Template,Bank Name,銀行名稱
-DocType: Employee Loan,Employee Loan Account,員工貸款賬戶
 DocType: Leave Application,Total Leave Days,總休假天數
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意:電子郵件將不會被發送到被禁用的用戶
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
@@ -2422,7 +2432,7 @@
 DocType: Vital Signs,Weight (In Kilogram),體重(公斤)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",保存章節後自動設置章節/章節名稱。
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,請在GST設置中設置GST帳戶
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,請在GST設置中設置GST帳戶
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,業務類型
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,新的採購成本
@@ -2435,7 +2445,7 @@
 DocType: POS Profile,Taxes and Charges,稅收和收費
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買,出售或持有的股票。
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,沒有更多的更新
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,這涵蓋了與此安裝程序相關的所有記分卡
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,銀行業
@@ -2444,41 +2454,44 @@
 DocType: Bank Guarantee,Bank Guarantee,銀行擔保
 DocType: Bank Guarantee,Bank Guarantee,銀行擔保
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置考勤編號系列
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,年度利潤
+DocType: Bank Guarantee,Name of Bank,銀行名稱
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言:{3}
 DocType: Fee Schedule,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,財務賬目的樹。
+DocType: Bank Guarantee,Reference Document Type,參考文檔類型
 DocType: Cash Flow Mapping,Cash Flow Mapping,現金流量映射
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,序列化庫存
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默認聯繫人中找不到電子郵件
-DocType: Employee Loan,Account Info,帳戶信息
+DocType: Loan,Account Info,帳戶信息
 DocType: Activity Type,Default Billing Rate,默認計費率
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}創建學生組。
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}創建學生組。
 DocType: Sales Invoice,Total Billing Amount,總結算金額
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,費用結構和學生組{0}中的課程是不同的。
 DocType: Fee Schedule,Receivable Account,應收賬款
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},行#{0}:資產{1}已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},行#{0}:資產{1}已經是{2}
 DocType: Quotation Item,Stock Balance,庫存餘額
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,銷售訂單到付款
 DocType: Purchase Invoice,With Payment of Tax,繳納稅款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供應商提供服務
 DocType: Crop Cycle,This will be day 1 of the crop cycle,這將是作物週期的第一天
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,請選擇正確的帳戶
 DocType: Purchase Invoice Item,Weight UOM,重量計量單位
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,包含folio號碼的可用股東名單
 DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,顯示變體屬性
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,顯示變體屬性
 DocType: Course,Course Name,課程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,辦公設備
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,辦公設備
 DocType: Purchase Invoice Item,Qty,數量
 DocType: Fiscal Year,Companies,企業
 DocType: Supplier Scorecard,Scoring Setup,得分設置
@@ -2497,7 +2510,7 @@
 DocType: Stock Entry,Total Incoming Value,總收入值
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,借方是必填項
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間,費用和結算由你的團隊做activites
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,採購價格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
 DocType: Job Offer Term,Offer Term,要約期限
 DocType: Asset,Quality Manager,質量經理
@@ -2509,12 +2522,13 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},總未付:{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM網站運營
 DocType: Supplier Scorecard,Supplier Score,供應商分數
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,總開票金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,總開票金額
 DocType: BOM,Conversion Rate,兌換率
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,產品搜索
 DocType: Assessment Plan,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授權值)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+DocType: Loan,Total Amount Paid,總金額支付
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,請選擇付費學生申請者必須入學的學生
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸: {0}不能父母或兒童{2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,請選擇一個價目表來發布價格
@@ -2524,18 +2538,17 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,價格表{0}被禁用
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}:已完成的數量不能超過{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允許加班
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
 DocType: Training Event Employee,Training Event Employee,培訓活動的員工
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以為批次{1}和項目{2}保留最大樣本數量{0}。
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,添加時間插槽
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再次重複出現。
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless支付網關設置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,兌換收益/損失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},行#{0}:帳戶{1}不屬於公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},行#{0}:帳戶{1}不屬於公司{2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},無法找到DocType {0}
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,請輸入收據憑證
@@ -2551,7 +2564,6 @@
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如:次日發貨
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},訂閱已經{0}
 DocType: Fee Schedule Program,Fee Schedule Program,費用計劃計劃
 DocType: Fee Schedule Program,Student Batch,學生批
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使學生
@@ -2565,13 +2577,12 @@
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
 DocType: Purchase Invoice,E-commerce GSTIN,電子商務GSTIN
 ,Bank Clearance Summary,銀行結算摘要
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",建立和管理每日,每週和每月的電子郵件摘要。
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",建立和管理每日,每週和每月的電子郵件摘要。
 DocType: Appraisal Goal,Appraisal Goal,考核目標
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,建議分類?
 DocType: Stock Reconciliation Item,Current Amount,電流量
 DocType: Fee Schedule,Fee Structure,費用結構
 DocType: Timesheet Detail,Costing Amount,成本核算金額
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Student Admission Program,Application Fee,報名費
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,提交工資單
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣:{1}%
@@ -2583,7 +2594,7 @@
 DocType: Vital Signs,Blood Pressure (diastolic),血壓(舒張)
 DocType: SMS Log,Sent To,發給
 DocType: Payment Request,Make Sales Invoice,做銷售發票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,軟件
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,軟件
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,接下來跟日期不能過去
 DocType: Company,For Reference Only.,僅供參考。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{1}醫生{0}不可用
@@ -2597,7 +2608,7 @@
 DocType: Employee,Employment Details,就業資訊
 DocType: Employee,New Workplace,新工作空間
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,設置為關閉
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},沒有條碼{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},沒有條碼{0}的品項
 DocType: Normal Test Items,Require Result Value,需要結果值
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,物料清單
@@ -2612,16 +2623,16 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,經常性
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,現金流量映射模板細節
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,貸款管理
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,轉印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,顯示工資單
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,轉印材料
 DocType: Fees,Send Payment Request,發送付款請求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制,通過{0} {1}項{4}。你在做另一個{3}對同一{2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,請設置保存後復發
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
@@ -2635,13 +2646,14 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,是所得稅責任
 DocType: Grading Scale Interval,Grade Description,等級說明
 DocType: Stock Entry,Purchase Receipt No,採購入庫單編號
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保證金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,保證金
 DocType: Sales Invoice, Shipping Bill Number,運費清單號碼
 DocType: Asset Maintenance Log,Actions performed,已執行的操作
 DocType: Cash Flow Mapper,Section Leader,科長
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),資金來源(負債)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),資金來源(負債)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
 DocType: Supplier Scorecard Scoring Standing,Employee,僱員
+DocType: Bank Guarantee,Fixed Deposit Number,定期存款編號
 DocType: Asset Repair,Failure Date,失敗日期
 DocType: Sample Collection,Collected Time,收集時間
 DocType: Company,Sales Monthly History,銷售月曆
@@ -2658,8 +2670,9 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房間價格套餐
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,獲取訂閱更新
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,課程:
@@ -2668,7 +2681,7 @@
 DocType: Notification Control,Expense Claim Approved,報銷批准
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,沒有創建工作訂單
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,製藥
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 DocType: Purchase Invoice,Credit To,信貸
@@ -2683,7 +2696,7 @@
 DocType: Upload Attendance,Attendance To Date,出席會議日期
 DocType: Request for Quotation Supplier,No Quote,沒有報價
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,請註明公司以處理
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,應收賬款淨額變化
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,補假
 DocType: Job Offer,Accepted,接受的
@@ -2695,7 +2708,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,搜索結果
 DocType: Room,Room Number,房間號
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},無效的參考{0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},無效的參考{0} {1}
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 DocType: Journal Entry Account,Payroll Entry,工資項目
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,查看費用記錄
@@ -2705,15 +2718,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
 DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
 DocType: Item Variant Settings,Allow Rename Attribute Value,允許重命名屬性值
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,快速日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,你不能改變速度,如果BOM中提到反對的任何項目
 DocType: Restaurant,Invoice Series Prefix,發票系列前綴
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google地圖集成未啟用
+DocType: Subscription,Trialling,試用
 DocType: Member,Membership Expiry Date,會員到期日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0}必須返回文檔中負
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0}必須返回文檔中負
 ,Minutes to First Response for Issues,分鐘的問題第一個反應
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
@@ -2731,7 +2745,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,機會
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,機會
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
 DocType: Payment Entry,Deductions or Loss,扣除或損失
@@ -2763,7 +2777,7 @@
 DocType: SMS Log,No of Requested SMS,無的請求短信
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ## # #
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,製作發票
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +86,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡,{0}不允許採購訂單。
@@ -2771,7 +2785,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Driver,Driver,司機
 DocType: Vital Signs,Nutrition Values,營養價值觀
 DocType: Lab Test Template,Is billable,是可計費的
@@ -2781,7 +2795,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),實際開始日期(通過時間表)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,老齡範圍1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,總預付金額不能超過索賠總額
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,總預付金額不能超過索賠總額
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2835,7 +2849,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,選擇屬性值
 DocType: Purchase Invoice,Reason For Issuing document,簽發文件的原因
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金帳戶
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
 DocType: Tax Rule,Billing City,結算城市
@@ -2850,7 +2864,8 @@
 DocType: Projects Settings,Ignore Employee Time Overlap,忽略員工時間重疊
 DocType: Warranty Claim,Service Address,服務地址
 DocType: Asset Maintenance Task,Calibration,校準
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,家具及固定裝置
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,離開狀態通知
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,家具及固定裝置
 DocType: Item,Manufacture,製造
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,安裝公司
 ,Lab Test Report,實驗室測試報告
@@ -2865,7 +2880,6 @@
 DocType: Crop,Planting Area,種植面積
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計(數量)
 DocType: Installation Note Item,Installed Qty,安裝數量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,這可能是因為一些無效的電子郵件地址
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,訓練結果
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
@@ -2874,12 +2888,12 @@
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,組織分支主檔。
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,報告問題
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,公用事業費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行#{0}:日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
 DocType: Supplier Scorecard Criteria,Criteria Weight,標準重量
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
 DocType: Payroll Entry,Salary Slip Based on Timesheet,基於時間表工資單
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,購買率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,購買率
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司,貨幣,當前財政年度等
 DocType: Payment Entry,Payment Type,付款類型
@@ -2901,6 +2915,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,購物車設定
 DocType: Journal Entry,Accounting Entries,會計分錄
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選定的定價規則是針對“費率”制定的,則會覆蓋價目表。定價規則費率是最終費率,因此不應再應用更多折扣。因此,在諸如銷售訂單,採購訂單等交易中,它將在&#39;費率&#39;字段中取代,而不是在&#39;價格列表率&#39;字段中取出。
+DocType: Journal Entry,Paid Loan,付費貸款
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
 DocType: Journal Entry Account,Reference Due Date,參考到期日
 DocType: Purchase Order,Ref SQ,參考SQ
@@ -2916,7 +2931,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工資表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率,行{3}也必須包括
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率,行{3}也必須包括
 DocType: Patient Service Unit,Parent Service Unit,家長服務單位
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,使用戶
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼(用於列印)
@@ -2932,14 +2947,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +314,For row {0}: Enter planned qty,對於行{0}:輸入計劃的數量
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一頁
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤,評估和費用
 DocType: Payment Entry,Total Allocated Amount,總撥款額
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
 DocType: Item Reorder,Material Request Type,材料需求類型
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,發送格蘭特回顧郵件
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",localStorage的是滿的,沒救
@@ -2947,8 +2962,9 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,房間容量
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},已有記錄存在項目{0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,參考
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您將失去先前生成的發票記錄。您確定要重新啟用此訂閱嗎?
 DocType: Healthcare Settings,Registration Fee,註冊費用
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,憑證#
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,憑證#
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,從銷售交易隱藏客戶的稅號
@@ -2956,19 +2972,19 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比,基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類/百分比
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,營銷和銷售主管
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,營銷和銷售主管
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,所得稅
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,去信頭
 DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,沒有選擇轉移項目
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,沒有選擇轉移項目
 DocType: Company,Stock Settings,庫存設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
 DocType: Vehicle,Electric,電動
 DocType: Task,% Progress,%進展
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,在資產處置收益/損失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,在資產處置收益/損失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中將只選擇狀態為“已批准”的學生申請人。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帳戶{0}的帳戶號碼不可用。 <br>請正確設置您的會計科目表。
 DocType: Task,Depends on Tasks,取決於任務
@@ -2981,6 +2997,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,沒存貨
 DocType: Volunteer,Volunteer Skills,志願者技能
 DocType: Appraisal,HR User,HR用戶
+DocType: Bank Guarantee,Reference Document Name,參考文件名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
 apps/erpnext/erpnext/hooks.py +142,Issues,問題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
@@ -2993,7 +3010,8 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,學生入學
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,特大號
+DocType: Loan,Loan Application,申請貸款
 DocType: Crop,Scientific Name,科學名稱
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,葉總
 DocType: Customer,"Reselect, if the chosen contact is edited after save",重新選擇,如果所選聯繫人在保存後被編輯
@@ -3002,12 +3020,12 @@
 DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對庫存分錄{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對庫存分錄{2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款(資產)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
 DocType: Homepage Featured Product,Homepage Featured Product,首頁推薦產品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,所有評估組
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,所有評估組
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名稱
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),總{0}({1})
 DocType: C-Form Invoice Detail,Territory,領土
@@ -3028,9 +3046,10 @@
 DocType: Fees,Fees,費用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,{0}報價被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,未償還總額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,未償還總額
 DocType: Sales Partner,Targets,目標
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Price List,Price List Master,價格表主檔
 DocType: GST Account,CESS Account,CESS帳戶
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易,可以用來標記針對多個**銷售**的人,這樣你可以設置和監控目標。
@@ -3039,6 +3058,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,選擇患者
 DocType: Price List,Applicable for Countries,適用於國家
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,參數名稱
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”,就可以提交
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
 DocType: Homepage,Products to be shown on website homepage,在網站首頁中顯示的產品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統,通過網路技術,向私人有限公司提供整合的工具,在一個小的組織管理大多數流程。有關Web註釋,或購買託管,想得到更多資訊,請連結
@@ -3082,14 +3102,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,發票已在所有結算時間創建
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名稱錯誤:{0}
 DocType: Cash Flow Mapping,Is Finance Cost,財務成本
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹(用於列印)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,請在“餐廳設置”中設置默認客戶
 ,Salary Register,薪酬註冊
 DocType: Warehouse,Parent Warehouse,家長倉庫
-DocType: C-Form Invoice Detail,Net Total,總淨值
+DocType: Subscription,Net Total,總淨值
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,定義不同的貸款類型
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,定義不同的貸款類型
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,未償還的金額
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間(分鐘)
 DocType: Project Task,Working,工作的
@@ -3117,11 +3137,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,根帳戶必須是一組
 DocType: Drug Prescription,Drug Prescription,藥物處方
 DocType: Fees,FEE.,費用。
-DocType: Employee Loan,Repaid/Closed,償還/關閉
+DocType: Loan,Repaid/Closed,償還/關閉
 DocType: Item,Total Projected Qty,預計總數量
 DocType: Monthly Distribution,Distribution Name,分配名稱
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",對於{1} {2}進行會計分錄所需的項目{0},找不到估值。如果該項目在{1}中作為零估值率項目進行交易,請在{1}項目表中提及。否則,請在項目記錄中創建貨物的進貨庫存交易或提交估值費率,然後嘗試提交/取消此條目
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Course,Course Code,課程代碼
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: POS Settings,Use POS in Offline Mode,在離線模式下使用POS
@@ -3141,16 +3160,15 @@
 DocType: Purchase Invoice,Deemed Export,被視為出口
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
-DocType: Subscription,Half-yearly,每半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,存貨的會計分錄
 DocType: Lab Test,LabTest Approver,LabTest審批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
 DocType: Vehicle Service,Engine Oil,機油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},創建的工單:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},創建的工單:{0}
 DocType: Sales Invoice,Sales Team1,銷售團隊1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
-DocType: Employee Loan,Loan Details,貸款詳情
+DocType: Loan,Loan Details,貸款詳情
 DocType: Company,Default Inventory Account,默認庫存帳戶
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,作品集編號不匹配
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}:已完成數量必須大於零。
@@ -3161,18 +3179,18 @@
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,選擇類型...
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,與作物生長的所有土地單位的鏈接
 DocType: Account,Root Type,root類型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:無法返回超過{1}項{2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:無法返回超過{1}項{2}
 DocType: Item Group,Show this slideshow at the top of the page,這顯示在幻燈片頁面頂部
 DocType: BOM,Item UOM,項目計量單位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後,優惠金額(公司貨幣)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Cheque Print Template,Primary Settings,主要設置
 DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,添加員工
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,添加員工
 DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
 DocType: Company,Standard Template,標準模板
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
@@ -3192,11 +3210,10 @@
 DocType: SMS Log,No of Sent SMS,沒有發送短信
 DocType: Antibiotic,Healthcare Administrator,醫療管理員
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,設定目標
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置考勤編號系列
 DocType: Dosage Strength,Dosage Strength,劑量強度
 DocType: Account,Expense Account,費用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,顏色
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,顏色
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,評估計劃標準
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,有效期限對所選項目是強制性的
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止採購訂單
@@ -3208,12 +3225,12 @@
 DocType: Patient,Personal and Social History,個人和社會史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用戶{0}已創建
 DocType: Fee Schedule,Fee Breakup for each student,每名學生的費用分手
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前({0})對二階{1}不能大於總計({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前({0})對二階{1}不能大於總計({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,更改代碼
 DocType: Stock Reconciliation,SR/,序號 /
 DocType: Vehicle,Diesel,柴油機
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,尚未選擇價格表之貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,尚未選擇價格表之貨幣
 DocType: Purchase Invoice,Availed ITC Cess,採用ITC Cess
 ,Student Monthly Attendance Sheet,學生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,運費規則僅適用於銷售
@@ -3237,7 +3254,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所購買或出售的產品或服務。
 DocType: Water Analysis,Storage Temperature,儲存溫度
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,研究員
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,研究員
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,計劃註冊學生工具
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},開始日期應該小於任務{0}的結束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或電子郵件是強制性
@@ -3249,7 +3266,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡,並且謹慎地向該供應商發出詢價。
 DocType: Chapter,Non Profit Manager,非營利經理
 DocType: BOM,Total Cost(Company Currency),總成本(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,序列號{0}創建
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,序列號{0}創建
 DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶,這些代碼可以在列印格式,如發票和送貨單使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
@@ -3259,10 +3276,10 @@
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
 DocType: Healthcare Settings,Result Printed,結果打印
 DocType: Asset Category Account,Depreciation Expense Account,折舊費用帳戶
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,試用期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,試用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
 DocType: Project,Total Costing Amount (via Timesheets),總成本金額(通過時間表)
-DocType: Employee Advance,Expense Approver,費用審批
+DocType: Department,Expense Approver,費用審批
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}:提前對客戶必須是信用
 DocType: Project,Hourly,每小時
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,非集團集團
@@ -3279,7 +3296,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,最小起訂量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的組織
 DocType: Fee Component,Fees Category,費用類別
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,請輸入解除日期。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Supplier Scorecard,Notify Employee,通知員工
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱,如果查詢來源是運動
@@ -3288,17 +3305,18 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,重新排序級別
 DocType: Company,Chart Of Accounts Template,圖表帳戶模板
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,馬克半天
 DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,重複的條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重複的條目
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,在提交之前輸入受益人的姓名。
 DocType: Program Enrollment Tool,Get Students,讓學生
 DocType: Serial No,Under Warranty,在保修期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存,就會顯示出來。
 ,Employee Birthday,員工生日
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,請選擇完成修復的完成日期
@@ -3313,7 +3331,7 @@
 DocType: Sales Invoice Item,Customer Warehouse (Optional),客戶倉庫(可選)
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
 DocType: Shopping Cart Settings,Orders,訂單
-DocType: Employee Leave Approver,Leave Approver,休假審批人
+DocType: Department,Leave Approver,休假審批人
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,請選擇一個批次
 DocType: Assessment Group,Assessment Group Name,評估小組名稱
 DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
@@ -3354,7 +3372,6 @@
 apps/erpnext/erpnext/accounts/party.py +317,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註:由於/參考日期由{0}天超過了允許客戶的信用天數(S)
 apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,學生申請
 DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,此電子郵件是自動生成的
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Program Enrollment,Boarding Student,寄宿學生
 DocType: Asset,Expected Value After Useful Life,期望值使用壽命結束後
@@ -3378,19 +3395,19 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},參考# {0}於{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
-DocType: Member,Member,會員
+DocType: Loan,Member,會員
 DocType: Work Order Item,Work Order Item,工作訂單項目
 DocType: Pricing Rule,Item Code,產品編號
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
 DocType: Agriculture Analysis Criteria,Agriculture Manager,農業經理
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
 DocType: Supplier Scorecard Period,Variables,變量
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),關閉(Dr)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,序列號{0}無貨
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,序列號{0}無貨
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,稅務模板賣出的交易。
 DocType: Sales Invoice,Write Off Outstanding Amount,核銷額(億元)
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},帳戶{0}與公司{1}不符
@@ -3399,7 +3416,6 @@
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
 DocType: Asset,Number of Depreciations Booked,預訂折舊數
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,數量總計
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},對員工貸款:{0}
 DocType: Employee Education,School/University,學校/大學
 DocType: Payment Request,Reference Details,詳細參考訊息
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用壽命結束後必須小於總消費金額
@@ -3408,7 +3424,7 @@
 DocType: Asset,Double Declining Balance,雙倍餘額遞減
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
 DocType: Student Guardian,Father,父親
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,“更新股票&#39;不能檢查固定資產出售
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,“更新股票&#39;不能檢查固定資產出售
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
@@ -3420,10 +3436,10 @@
 DocType: Lead,Lower Income,較低的收入
 DocType: Restaurant Order Entry,Current Order,當前訂單
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶,因為此庫存調整是一個開始分錄
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶,因為此庫存調整是一個開始分錄
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,轉到程序
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#分配的金額{1}不能大於無人認領的金額{2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#分配的金額{1}不能大於無人認領的金額{2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
@@ -3444,7 +3460,6 @@
 DocType: Payment Terms Template,Payment Terms,付款條件
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,製作訂單不能上調:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分鐘
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供應商
 ,Qty to Receive,未到貨量
@@ -3462,27 +3477,29 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,%交付
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,請設置學生的電子郵件ID以發送付款請求
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,請設置學生的電子郵件ID以發送付款請求
 DocType: Patient,Medical History,醫學史
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,銀行透支戶口
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,銀行透支戶口
 DocType: Physician Schedule,Schedule Name,計劃名稱
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,製作工資單
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,添加所有供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,添加所有供應商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行#{0}:分配金額不能大於未結算金額。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,瀏覽BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,抵押貸款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,抵押貸款
 DocType: Purchase Invoice,Edit Posting Date and Time,編輯投稿時間
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},請設置在資產類別{0}或公司折舊相關帳戶{1}
 DocType: Lab Test Groups,Normal Range,普通範圍
 DocType: Academic Term,Academic Year,學年
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,可用銷售
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,期初餘額權益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,期初餘額權益
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩餘
 DocType: Appraisal,Appraisal,評價
+DocType: Loan,Loan Account,貸款帳戶
 DocType: Purchase Invoice,GST Details,消費稅細節
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},電子郵件發送到供應商{0}
 DocType: Item,Default Sales Unit of Measure,默認銷售單位
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,學年:
+DocType: Subscription,Past Due Date,過去的截止日期
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},不允許為項目{0}設置替代項目
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
@@ -3494,17 +3511,18 @@
 DocType: Patient Appointment,Patient Appointment,患者預約
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,獲得供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,獲得供應商
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},找不到項目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去課程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中顯示包含稅
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",銀行賬戶,從日期到日期是強制性的
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,發送訊息
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額(公司貨幣)
 DocType: Physician,Physician Schedules,醫師時間表
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,總預付金額不得超過全部認可金額
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,總預付金額不得超過全部認可金額
 DocType: Salary Slip,Hour Rate,小時率
 DocType: Stock Settings,Item Naming By,產品命名規則
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
@@ -3521,6 +3539,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
 DocType: BOM,Inspection Required,需要檢驗
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,在提交之前輸入銀行保證號碼。
 DocType: Driving License Category,Class,類
 DocType: Sales Order,Fully Billed,完全開票
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,工作訂單不能針對項目模板產生
@@ -3529,7 +3548,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +137,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 (用於列印)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶,並新增/修改對凍結帳戶的會計分錄
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 DocType: Serial No,Is Cancelled,被註銷
 DocType: Student Group,Group Based On,基於組
 DocType: Student Group,Group Based On,基於組
@@ -3540,9 +3558,10 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析標準
 DocType: Supplier,Supplier Details,供應商詳細資訊
 DocType: Setup Progress,Setup Progress,設置進度
+DocType: Expense Claim,Approval Status,審批狀態
 DocType: Hub Settings,Publish Items to Hub,發布項目到集線器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},來源值必須小於列{0}的值
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,電匯
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,電匯
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,全面檢查
 ,Issued Items Against Work Order,針對工單發布物品
 DocType: Vehicle Log,Invoice Ref,發票編號
@@ -3571,12 +3590,11 @@
 DocType: Customs Tariff Number,Tariff Number,稅則號
 DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP倉庫可用的數量
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,預計
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注:系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
 DocType: Notification Control,Quotation Message,報價訊息
-DocType: Employee Loan,Employee Loan Application,職工貸款申請
 DocType: Issue,Opening Date,開幕日期
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,請先保存患者
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,請先保存患者
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,出席已成功標記。
 DocType: Soil Texture,Silt Composition (%),粉塵成分(%)
 DocType: Journal Entry,Remark,備註
@@ -3594,7 +3612,7 @@
 ,Item Balance (Simple),物品餘額(簡單)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,借方票據
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,借方票據
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限(天數)
@@ -3616,6 +3634,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
 DocType: Assessment Plan,Assessment Plan,評估計劃
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,反向日記帳分錄
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客戶{0}已創建。
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前任何倉庫沒有庫存
 ,Payment Period Based On Invoice Date,基於發票日的付款期
@@ -3626,9 +3645,10 @@
 DocType: Assessment Plan,Examiner,檢查員
 DocType: Journal Entry,Stock Entry,存貨分錄
 DocType: Payment Entry,Payment References,付款參考
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",間隔字段的間隔數,例如,如果間隔為&#39;天數&#39;並且計費間隔計數為3,則會每3天生成一次發票
 DocType: Vehicle,Insurance Details,保險詳情
 DocType: Share Balance,Share Type,分享類型
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,請輸入還款期
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,請輸入還款期
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),債務人({0})
 DocType: Pricing Rule,Margin,餘量
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客戶
@@ -3638,10 +3658,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +95,Company name not same,公司名稱不一樣
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,黨是強制性
 DocType: Journal Entry,JV-,將N-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重複到期日的行:{list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重複到期日的行:{list}
 DocType: Topic,Topic Name,主題名稱
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,請在人力資源設置中為離職審批通知設置默認模板。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,選擇一名員工以推進員工。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,選擇一名員工以推進員工。
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,請選擇一個有效的日期
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,選擇您的業務的性質。
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3659,7 +3680,7 @@
 DocType: Appointment Type,Default Duration,默認時長
 DocType: Asset Movement,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},行#{0}:資產{1}不屬於公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},行#{0}:資產{1}不屬於公司{2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,已創建銷售發票{0}
 DocType: Employee,Confirmation Date,確認日期
 DocType: C-Form,Total Invoiced Amount,發票總金額
@@ -3677,9 +3698,10 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,工資單編號
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,多種變體
 DocType: Sales Invoice,Against Income Account,對收入帳戶
+DocType: Subscription,Trial Period Start Date,試用期開始日期
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}:有序數量{1}不能低於最低訂貨量{2}(項中定義)。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,請以其他用戶身份登錄。
@@ -3698,12 +3720,11 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
 DocType: Student Guardian,Student Guardian,學生家長
 DocType: Member,Member Name,成員名字
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,在訂閱
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的(總)淨重值。確保每個項目的淨重是在同一個計量單位。
 DocType: Membership,Payment Details,付款詳情
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM率
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作訂單不能取消,先取消它
 DocType: Asset,Journal Entry for Scrap,日記帳分錄報廢
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,請送貨單拉項目
@@ -3722,6 +3743,7 @@
 DocType: Land Unit,Land Unit,土地單位
 ,Purchase Analytics,採購分析
 DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,當前發票{0}缺失
 DocType: Asset Maintenance Log,Task,任務
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
@@ -3734,7 +3756,7 @@
 DocType: Company,Exchange Gain / Loss Account,兌換收益/損失帳戶
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},目的必須是一個{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,填寫表格,並將其保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,填寫表格,並將其保存
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,實際庫存數量
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,實際庫存數量
@@ -3749,7 +3771,7 @@
 DocType: Lab Test Template,Standard Selling Rate,標準銷售率
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 DocType: Cash Flow Mapper,Section Name,部分名稱
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,再訂購數量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,再訂購數量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,當前職位空缺
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
@@ -3758,9 +3780,9 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}:從{1}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注:請不要創建帳戶的客戶和供應商
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Water Analysis,Appearance,出現
+DocType: HR Settings,Leave Status Notification Template,離開狀態通知模板
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均。買價格表價格
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,會員信息。
@@ -3782,7 +3804,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,不允許。請禁用測試模板
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
 DocType: Crop Cycle,Linked Land Unit,相關的土地單位
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,在選擇之前,甲方請選擇發布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,在選擇之前,甲方請選擇發布日期
 DocType: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
@@ -3798,7 +3820,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,轉到用戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
 DocType: Training Event,Seminar,研討會
 DocType: Program Enrollment Fee,Program Enrollment Fee,計劃註冊費
@@ -3814,7 +3836,7 @@
 DocType: Hub Settings,Publish Availability,發布房源
 DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,無法將其轉換為非組。子任務存在。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,出生日期不能大於今天。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四捨五入調整(公司貨幣)
@@ -3834,7 +3856,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,項目{0}已經存在
 DocType: Medical Department,Nursing User,護理用戶
 DocType: Plant Analysis,Plant Analysis Criterias,植物分析標準
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,職責
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},序列號{0}不屬於批次{1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,職責
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此報價的有效期已經結束。
 DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Accounts Settings,Allow Stale Exchange Rates,允許陳舊的匯率
@@ -3855,10 +3878,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,變種
 DocType: Item,Default BOM,預設的BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),總開票金額(通過銷售發票)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,借方票據金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,借方票據金額
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",費率,股份數量和計算的金額之間不一致
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,總街貨量金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,總街貨量金額
 DocType: Journal Entry,Printing Settings,列印設定
 DocType: Employee Advance,Advance Account,預付帳戶
 DocType: Job Offer,Job Offer Terms,招聘條款
@@ -3866,7 +3889,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽車
 DocType: Vehicle,Insurance Company,保險公司
 DocType: Asset Category Account,Fixed Asset Account,固定資產帳戶
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,變量
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,變量
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,從送貨單
 DocType: Chapter,Members,會員
 DocType: Student,Student Email Address,學生的電子郵件地址
@@ -3888,7 +3911,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,實習生
 DocType: Delivery Stop,Address Name,地址名稱
 DocType: Stock Entry,From BOM,從BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},拆分{1}個{0}個單元
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},拆分{1}個{0}個單元
 DocType: Assessment Code,Assessment Code,評估準則
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
@@ -3896,24 +3919,23 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期,參考編號是強制性的
 DocType: Bank Reconciliation Detail,Payment Document,付款單據
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,評估標準公式時出錯
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
+DocType: Subscription,Plans,計劃
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,發行材料
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,創建循環時出現錯誤
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載,直到你有網絡。
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,沒有學生團體創建的。
 DocType: Purchase Invoice Item,Serial No,序列號
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,請先輸入維護細節
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行#{0}:預計交貨日期不能在採購訂單日期之前
 DocType: Purchase Invoice,Print Language,打印語言
 DocType: Salary Slip,Total Working Hours,總的工作時間
 DocType: Sales Invoice,Customer PO Details,客戶PO詳細信息
-DocType: Subscription,Next Schedule Date,下一個附表日期
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,臨時開戶
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,輸入值必須為正
@@ -3941,11 +3963,11 @@
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,沒有僱員提到的標準
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
 DocType: Hotel Settings,Default Customer,默認客戶
 DocType: Assessment Plan,Supervisor Name,主管名稱
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要確認是否在同一天創建約會
@@ -3971,28 +3993,29 @@
 DocType: Payroll Entry,Payroll Frequency,工資頻率
 DocType: Lab Test Template,Sensitivity,靈敏度
 DocType: Leave Application,Follow via Email,透過電子郵件追蹤
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,廠房和機械設備
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,廠房和機械設備
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,請輸入按日期請求
 DocType: Payment Entry,Internal Transfer,內部轉賬
 DocType: Asset Maintenance,Maintenance Tasks,維護任務
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,請選擇發布日期第一
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,開業日期應該是截止日期之前,
 DocType: Leave Control Panel,Carry Forward,發揚
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心,不能轉換為總賬
 DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
 DocType: Crop Cycle,Detected Disease,檢測到的疾病
 ,Produced,生產
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,還款開始日期不能在付款日期之前。
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),由(電子郵件)提出
 DocType: Training Event,Trainer Name,培訓師姓名
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
-apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,匹配付款與發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
+apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,付款與發票對照
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於(指定)
 DocType: Fees,Student Email,學生電子郵件
@@ -4002,7 +4025,7 @@
 DocType: Guardian,Interests,興趣
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,啟用/禁用的貨幣。
 DocType: Production Plan,Get Material Request,獲取材質要求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,郵政費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,郵政費用
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 ,Item Variant Details,項目變體的詳細信息
 DocType: Quality Inspection,Item Serial No,產品序列號
@@ -4012,16 +4035,16 @@
 DocType: Drug Prescription,Hour,小時
 DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},請選擇項目{0}的數量
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,主導類型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,在限制的日期,您無權批准休假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,在限制的日期,您無權批准休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,所有這些項目已開具發票
 DocType: Company,Monthly Sales Target,每月銷售目標
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Hotel Room,Hotel Room Type,酒店房間類型
 DocType: Item,Default Material Request Type,默認材料請求類型
 DocType: Supplier Scorecard,Evaluation Period,評估期
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,工作訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,工作訂單未創建
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: Purchase Invoice,Export Type,導出類型
 DocType: Salary Slip Loan,Salary Slip Loan,工資單貸款
@@ -4037,8 +4060,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,打開發票摘要
 DocType: Education Settings,Education Manager,教育經理
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,每個工廠之間的最小長度為最佳的增長
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新,而是使用庫存條目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新,而是使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新,而是使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新,而是使用庫存條目
 DocType: Quality Inspection,Report Date,報告日期
 DocType: Student,Middle Name,中間名字
 DocType: C-Form,Invoices,發票
@@ -4068,20 +4091,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的,已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,收據
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,收據
 ,Sales Register,銷售登記
 DocType: Daily Work Summary Group,Send Emails At,發送電子郵件在
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,無內容可供編輯
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,表單視圖
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,費用審批人必須在費用索賠中
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,本月和待活動總結
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",將用戶添加到您的組織,而不是您自己。
 DocType: Customer Group,Customer Group Name,客戶群組名稱
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,還沒有客戶!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,沒有創建重要請求
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉,如果你還需要包括上一會計年度的資產負債葉本財年
@@ -4103,11 +4127,12 @@
 DocType: Vehicle,Chassis No,底盤無
 DocType: Payment Request,Initiated,啟動
 DocType: Production Plan Item,Planned Start Date,計劃開始日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,請選擇一個物料清單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,請選擇一個物料清單
 DocType: Purchase Invoice,Availed ITC Integrated Tax,有效的ITC綜合稅收
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供應商&gt;供應商類型
+DocType: Bank Guarantee,Clauses and Conditions,條款和條件
 DocType: Serial No,Creation Document Type,創建文件類型
 DocType: Project Task,View Timesheet,查看時間表
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,結束日期必須大於開始日期
 DocType: Leave Type,Is Encash,為兌現
 DocType: Leave Allocation,New Leaves Allocated,新的排假
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
@@ -4121,9 +4146,10 @@
 DocType: Patient,Alcohol Current Use,酒精當前使用
 DocType: Student Admission Program,Student Admission Program,學生入學計劃
 DocType: Payment Entry,Account Paid To,賬戶付至
+DocType: Subscription Settings,Grace Period,寬限期
 DocType: Item Alternative,Alternative Item Name,替代項目名稱
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",無法提交任何薪資單<br> \可能的原因: <br> \ 1.淨工資小於0。 <br> \ 2.員工主數據中指定的公司電子郵件地址無效。 <br>
@@ -4133,7 +4159,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算帳戶{1}對{2} {3}是{4}。這將超過{5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',行{0}#賬戶的類型必須是&#39;固定資產&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,輸出數量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,並unchcked在禁用
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,系列是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,金融服務
 DocType: Student Sibling,Student ID,學生卡
@@ -4143,13 +4168,15 @@
 DocType: Stock Entry Detail,Basic Amount,基本金額
 DocType: Training Event,Exam,考試
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,進行還款分錄
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,所有部門
 DocType: Patient,Alcohol Past Use,酒精過去使用
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,鉻
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,鉻
 DocType: Project Update,Problematic/Stuck,問題/卡住
 DocType: Tax Rule,Billing State,計費狀態
 DocType: Share Transfer,Transfer,轉讓
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前,必須先取消工單{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
 DocType: Authorization Rule,Applicable To (Employee),適用於(員工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -4170,10 +4197,11 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定價規則被如何應用?
 DocType: Stock Entry,Delivery Note No,送貨單號
 DocType: Cheque Print Template,Message to show,信息顯示
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,產品包
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,無法從{0}開始獲得分數。你需要有0到100的常規分數
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}:無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
+DocType: Subscription,Current Invoice Start Date,當前發票開始日期
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}:無論是借方或貸方金額需要{2}
 DocType: GL Entry,Remarks,備註
 DocType: Hotel Room Amenity,Hotel Room Amenity,酒店客房舒適
@@ -4183,9 +4211,11 @@
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使鉛
 DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,發送電子郵件供應商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1},留下申請期之間不能在此日期範圍內的時期。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1},留下申請期之間不能在此日期範圍內的時期。
+DocType: Fiscal Year,Auto Created,自動創建
 DocType: Chapter Member,Leave Reason,離開原因
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,發票{0}不再存在
 DocType: Guardian Interest,Guardian Interest,衛利息
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,設置POS發票的默認值
 apps/erpnext/erpnext/config/hr.py +182,Training,訓練
@@ -4193,13 +4223,12 @@
 DocType: Timesheet,Employee Detail,員工詳細信息
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天,重複上月的天必須相等
 DocType: Lab Prescription,Test Code,測試代碼
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,對網站的主頁設置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},由於{1}的記分卡,{0}不允許使用RFQ
 DocType: Job Offer,Awaiting Response,正在等待回應
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},總金額{0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},無效的屬性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},總金額{0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},無效的屬性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}:項目{1}需要費用中心
@@ -4208,7 +4237,7 @@
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 DocType: Chapter,Region,區域
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,負面評價率是不允許的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,重新加載鏈接分析
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
@@ -4222,7 +4251,7 @@
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,沒有資料
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,報廢資產成本
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,從產品包取得項目
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,項目用戶
 DocType: GL Entry,Is Advance,為進
@@ -4257,20 +4286,20 @@
 DocType: Supplier Scorecard Scoring Variable,Path,路徑
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬,因為它有子節點
 DocType: Production Plan,Total Planned Qty,總計劃數量
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,開度值
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,序列號
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,開度值
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,序列號
 DocType: Lab Test Template,Lab Test Template,實驗室測試模板
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,銷售帳戶
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,銷售帳戶
 DocType: Purchase Invoice Item,Total Weight,總重量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,銷售佣金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,銷售佣金
 DocType: Job Offer Term,Value / Description,值/說明
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:資產{1}無法提交,這已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:資產{1}無法提交,這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
 DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐廳訂單錄入
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}#不等於{1}。區別是{2}。
 DocType: Asset Maintenance Task,Assign To Name,分配到名稱
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,娛樂費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,娛樂費用
 DocType: Hub Settings,Enabled Users,已啟用的用戶
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,製作材料要求
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
@@ -4283,23 +4312,22 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,申請許可。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 DocType: Vehicle,Last Carbon Check,最後檢查炭
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,法律費用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,請選擇行數量
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,打開銷售和購買發票
 DocType: Purchase Invoice,Posting Time,登錄時間
 DocType: Timesheet,% Amount Billed,(%)金額已開立帳單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,電話費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,電話費
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列,則勾選此項。如果您勾選此項,則將沒有預設值。
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},沒有序號{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},沒有序號{0}的品項
 DocType: Email Digest,Open Notifications,打開通知
 DocType: Payment Entry,Difference Amount (Company Currency),差異金額(公司幣種)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,直接費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,直接費用
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,差旅費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},在文檔類型{0}中添加自定義字段訂閱
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
 DocType: Purchase Receipt Item,Sample Quantity,樣品數量
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率,通過計劃程序自動更新BOM成本。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
@@ -4310,13 +4338,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,緩刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工資組件
 DocType: Program Enrollment Tool,New Academic Year,新學年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,返回/信用票據
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,返回/信用票據
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率,如果丟失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,總支付金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,總支付金額
 DocType: Work Order Item,Transferred Qty,轉讓數量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,規劃
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,規劃
 DocType: Share Balance,Issued,發行
+DocType: Loan,Repayment Start Date,還款開始日期
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,學生活動
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供應商編號
 DocType: Payment Request,Payment Gateway Details,支付網關細節
@@ -4327,10 +4356,10 @@
 DocType: Sales Partner,Contact Desc,聯絡倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心,生病等類型
 DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
 DocType: Assessment Result,Student Name,學生姓名
 DocType: Brand,Item Manager,項目經理
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,應付職工薪酬
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,應付職工薪酬
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
 DocType: Plant Analysis,Collection Datetime,收集日期時間
 DocType: Work Order,Total Operating Cost,總營運成本
@@ -4342,6 +4371,7 @@
 DocType: Payment Schedule,Payment Schedule,付款時間表
 DocType: Item Attribute Value,Abbreviation,縮寫
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,付款項目已存在
+DocType: Subscription,Trial Period End Date,試用期結束日期
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪資套版主檔。
 DocType: Hotel Room,Hotel Manager,酒店經理
@@ -4356,9 +4386,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,所有客戶群組
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率(公司貨幣)
@@ -4367,14 +4397,15 @@
 DocType: Lab Prescription,Test Created,測試創建
 DocType: Healthcare Settings,Custom Signature in Print,自定義簽名打印
 DocType: Account,Temporary,臨時
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,客戶LPO號
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,客戶LPO號
 DocType: Program,Courses,培訓班
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“,在詞”字段不會在任何交易可見
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作將停止未來的結算。您確定要取消此訂閱嗎?
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Supplier Scorecard Criteria,Criteria Name,標準名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,請設公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,請設公司
 DocType: Pricing Rule,Buying,採購
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病與肥料
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
@@ -4382,18 +4413,18 @@
 DocType: POS Profile,Apply Discount On,申請折扣
 DocType: Member,Membership Type,會員類型
 ,Reqd By Date,REQD按日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,債權人
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,債權人
 DocType: Assessment Plan,Assessment Name,評估名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,在打印中顯示PDC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,在打印中顯示PDC
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,行#{0}:序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,工作機會
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存,就會顯示出來。
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
 DocType: Item,Opening Stock,打開股票
@@ -4404,7 +4435,7 @@
 DocType: Employee,Personal Email,個人電子郵件
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,總方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用,系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'","在分
 經由“時間日誌”更新"
@@ -4414,6 +4445,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +567,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,至少要有一間倉庫
+DocType: Subscriber,Subscriber Name,訂戶名稱
 DocType: BOM Update Tool,Replace,更換
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到產品。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}針對銷售發票{1}
@@ -4421,17 +4453,16 @@
 DocType: Request for Quotation Item,Project Name,專案名稱
 DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},在員工貸款{0}中選擇利息收入帳戶
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 DocType: Disease,Treatment Task,治療任務
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得稅資產
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Update Tool,The BOM which will be replaced,這將被替換的物料清單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,電子設備
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,電子設備
 DocType: Asset,Maintenance Required,需要維護
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Work Order,Operation Cost,運營成本
@@ -4439,7 +4470,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,優秀的金額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:資產是必須的固定資產購買/銷售
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:資產是必須的固定資產購買/銷售
 DocType: Asset Maintenance Team,Maintenance Team Name,維護組名稱
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果兩個或更多的定價規則是基於上述條件發現,優先級被應用。優先權是一個介於0到20,而預設值是零(空)。數字越大,意味著其將優先考慮是否有與相同條件下多個定價規則。
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,如果選擇“機會來源”作為客戶,則客戶是強制性的
@@ -4449,19 +4480,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,報銷的類型。
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
-DocType: Item,Taxes,稅
+DocType: Subscription,Taxes,稅
 DocType: Purchase Invoice,capital goods,資本貨物
 DocType: Purchase Invoice Item,Weight Per Unit,每單位重量
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
-DocType: Bank Guarantee,End Date,結束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
 DocType: Budget,Budget Accounts,預算科目
 DocType: Employee,Internal Work History,內部工作經歷
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,累計折舊額
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,私募股權投資
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,供應商記分卡變數
-DocType: Employee Loan,Fully Disbursed,全額支付
 DocType: Employee Advance,Due Advance Amount,到期金額
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
@@ -4483,7 +4512,7 @@
 ,Employee Information,僱員資料
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
@@ -4491,7 +4520,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”,請設置公司過濾器空白
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,發布日期不能是未來的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:序列號{1}不相匹配{2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,用於生成循環
 DocType: Stock Entry,Target Warehouse Address,目標倉庫地址
 DocType: Agriculture Task,End Day,結束的一天
 ,Delivery Note Trends,送貨單趨勢
@@ -4512,11 +4540,10 @@
 DocType: Material Request,% Ordered,% 已訂購
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",對於基於課程的學生小組,課程將從入學課程中的每個學生確認。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均。買入價
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均。買入價
 DocType: Share Balance,From No,來自No
 DocType: Task,Actual Time (in Hours),實際時間(小時)
 DocType: Employee,History In Company,公司歷史
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},來自{sender}的新留言
 DocType: Customer,Customer Primary Address,客戶主要地址
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
 DocType: Drug Prescription,Description/Strength,說明/力量
@@ -4524,9 +4551,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,同一項目已進入多次
 DocType: Department,Leave Block List,休假區塊清單
 DocType: Purchase Invoice,Tax ID,稅號
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號,此列必須為空白
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號,此列必須為空白
 DocType: Accounts Settings,Accounts Settings,帳戶設定
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",格式為{0}的地址格式,請修復以繼續。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",格式為{0}的地址格式,請修復以繼續。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",新帳號的數量,將作為前綴包含在帳號名稱中
 DocType: Maintenance Team Member,Team Member,隊員
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,沒有結果提交
@@ -4534,7 +4561,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零,可能是你應該“基於分佈式費用”改變
 DocType: Opportunity,To Discuss,為了討論
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,臨時帳戶
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,臨時帳戶
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Shareholder,Contact List,聯繫人列表
 DocType: Account,Auditor,核數師
@@ -4542,16 +4569,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,生產{0}項目
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,學到更多
 DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,退貨
 DocType: Pricing Rule,Disable,關閉
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,付款方式需要進行付款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,付款方式需要進行付款
 DocType: Project Task,Pending Review,待審核
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",在整頁上編輯更多選項,如資產,序列號,批次等。
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,預約和諮詢
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未註冊批次{2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄,因為它已經是{1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,需要檢查
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,需要檢查
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷(通過費用報銷)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
 DocType: Asset Repair,Asset Repair,資產修復
@@ -4562,7 +4589,7 @@
 DocType: Homepage,Tag Line,標語
 DocType: Fee Component,Fee Component,收費組件
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,車隊的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,新增項目從
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,新增項目從
 DocType: Fertilizer,Density (if liquid),密度(如果液體)
 apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100%
 DocType: Purchase Order Item,Last Purchase Rate,最後預訂價
@@ -4585,24 +4612,26 @@
 DocType: Payment Entry,Paid Amount,支付的金額
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索銷售週期
 DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,保留股票入場
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,保留股票入場
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 ,Work Order Stock Report,工單庫存報表
+DocType: Purchase Receipt,Auto Repeat Detail,自動重複細節
 DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,作為主管
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,建議類別
 DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,提交的訂單不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶,不允許設為信用帳戶
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,品質管理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,品質管理
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,項{0}已被禁用
 DocType: Project,Total Billable Amount (via Timesheets),總計費用金額(通過時間表)
 DocType: Agriculture Task,Previous Business Day,前一個營業日
-DocType: Employee Loan,Repay Fixed Amount per Period,償還每期固定金額
+DocType: Loan,Repay Fixed Amount per Period,償還每期固定金額
 DocType: Employee,Health Insurance No,健康保險No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,信用證
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,信用證
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,應納稅總額
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 DocType: Opening Invoice Creation Tool,Purchase,採購
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,餘額數量
@@ -4612,6 +4641,7 @@
 DocType: Appointment Type,Appointment Type,預約類型
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
 DocType: Healthcare Settings,Valid number of days,有效天數
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,重新啟動訂閱
 DocType: Land Unit,Linked Plant Analysis,鏈接的工廠分析
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:與排時序衝突{1}
@@ -4621,7 +4651,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定資產
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定資產
 DocType: Payment Entry,Set Exchange Gain / Loss,設置兌換收益/損失
 ,GST Purchase Register,消費稅購買登記冊
 ,Cash Flow,現金周轉
@@ -4639,8 +4669,9 @@
 DocType: Work Order,Planned Operating Cost,計劃運營成本
 DocType: Academic Term,Term Start Date,期限起始日期
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,所有股份交易清單
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},隨函附上{0}#{1}
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
+DocType: Subscription Plan Detail,Plan,計劃
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶/品項名稱
@@ -4675,13 +4706,14 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +106,Customer LPO,客戶LPO
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",對於基於批次的學生組,學生批次將由課程註冊中的每位學生進行驗證。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除,因為庫存分錄帳尚存在。
+DocType: Journal Entry Account,Loan,貸款
 DocType: Expense Claim Advance,Expense Claim Advance,費用索賠預付款
 DocType: Lab Test,Report Preference,報告偏好
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,志願者信息。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,專案經理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,專案經理
 ,Quoted Item Comparison,項目報價比較
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之間的得分重疊
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,調度
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣:{1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,淨資產值作為
 DocType: Crop,Produce,生產
@@ -4691,7 +4723,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,材料消耗製造
 DocType: Item Alternative,Alternative Item Code,替代項目代碼
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,選擇項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,選擇項目,以製造
 DocType: Delivery Stop,Delivery Stop,交貨停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",主數據同步,這可能需要一些時間
 DocType: Item,Material Issue,發料
@@ -4701,13 +4733,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
 DocType: BOM,Show Items,顯示項目
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶?
+DocType: Subscription Plan,Billing Interval,計費間隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,恢復
 DocType: Hub Settings,Hub Username,Hub用戶名
 DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
@@ -4724,13 +4756,15 @@
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,醫療記錄
 DocType: Vehicle,Vehicle,車輛
 DocType: Purchase Invoice,In Words,大寫
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,在提交之前輸入銀行或貸款機構的名稱。
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,必須提交{0}
 DocType: POS Profile,Item Groups,項目組
 DocType: Sales Order Item,For Production,對於生產
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶賬戶
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶賬戶
 DocType: Customer,Customer Primary Contact,客戶主要聯繫人
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,期間結束日誌
 DocType: Project Task,View Task,查看任務
+DocType: Bank Guarantee,Bank Guarantee Type,銀行擔保類型
 DocType: Payment Schedule,Invoice Portion,發票部分
 ,Asset Depreciations and Balances,資產折舊和平衡
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +370,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
@@ -4739,9 +4773,8 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值,點擊“設為預設”
 DocType: Production Plan,Include Subcontracted Items,包括轉包物料
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,庫存轉換後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
-DocType: Employee Loan,Repay from Salary,從工資償還
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+DocType: Loan,Repay from Salary,從工資償還
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Salary Slip,Salary Slip,工資單
 DocType: Lead,Lost Quotation,遺失報價
@@ -4762,11 +4795,11 @@
 DocType: Employee Education,Employee Education,員工教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
 DocType: Land Unit,Parent Land Unit,家長土地單位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,需要獲取項目細節。
 DocType: Fertilizer,Fertilizer Name,肥料名稱
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Cash Flow Mapping Accounts,Account,帳戶
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,已收到序號{0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,已收到序號{0}
 ,Requested Items To Be Transferred,將要轉倉的需求項目
 DocType: Expense Claim,Vehicle Log,車輛登錄
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),發燒(溫度&gt; 38.5°C / 101.3°F或持續溫度&gt; 38°C / 100.4°F)
@@ -4806,29 +4839,30 @@
 DocType: Soil Texture,Ternary Plot,三元劇情
 DocType: Item Group,Item Classification,項目分類
 DocType: Driver,License Number,許可證號
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,業務發展經理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,業務發展經理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,發票患者登記
 DocType: Crop,Period,期間
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,總帳
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},僱員{0}上離開{1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},僱員{0}上離開{1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
 DocType: Item Attribute Value,Attribute Value,屬性值
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 DocType: Salary Detail,Salary Detail,薪酬詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,請先選擇{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,請先選擇{0}
 DocType: Appointment Type,Physician,醫師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}({1})不能大於工單{3}中的計劃數量({2})
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授權
 DocType: Physician,Charges,收費
 DocType: Production Plan,Get Items For Work Order,獲取工作訂單的物品
 DocType: Salary Detail,Default Amount,預設數量
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,倉庫系統中未找到
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,倉庫系統中未找到
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於%d天。
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於%d天。
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,為您的公司設定您想要實現的銷售目標。
 ,Project wise Stock Tracking,項目明智的庫存跟踪
@@ -4856,11 +4890,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,無法創建網站
 DocType: Soil Analysis,Mg/K,鎂/ K
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
 DocType: Program,Program Abbreviation,計劃縮寫
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
-DocType: Bank Guarantee,Start Date,開始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
@@ -4873,11 +4906,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
 DocType: Purchase Invoice,04-Correction in Invoice,04-發票糾正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,變體詳細信息報告
 DocType: Setup Progress Action,Setup Progress Action,設置進度動作
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,買價格表
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,買價格表
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,刪除項目,如果收費並不適用於該項目
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,取消訂閱
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,請選擇維護狀態為已完成或刪除完成日期
 DocType: Supplier,Default Payment Terms Template,默認付款條款模板
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
@@ -4887,7 +4921,6 @@
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果積累了每月預算超出行動
-DocType: Subscription,Submit on creation,提交關於創建
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},貨幣{0}必須{1}
 DocType: Asset,Disposal Date,處置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工,如果他們沒有假期。回复摘要將在午夜被發送。
@@ -4902,6 +4935,7 @@
 DocType: Cash Flow Mapper,Section Footer,章節頁腳
 apps/erpnext/erpnext/stock/doctype/item/item.js +304,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心的圖
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,在取消訂閱或將訂閱標記為未付之前,發票日期之後的天數已過
 DocType: Lab Test Template,Sample Collection,樣品收集
 ,Requested Items To Be Ordered,將要採購的需求項目
 DocType: Price List,Price List Name,價格列表名稱
@@ -4910,7 +4944,7 @@
 DocType: Account,Income,收入
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,出事了!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
 DocType: Purchase Invoice Item,Amount (Company Currency),金額(公司貨幣)
@@ -4927,11 +4961,11 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}應該是0到100之間的一個值
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,下一個折舊日期不能在可供使用的日期之前
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,無抵押貸款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,數金額金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
 DocType: Purchase Receipt Item,Received and Accepted,收貨及允收
 DocType: Hub Settings,Company and Seller Profile,公司和賣方簡介
@@ -4944,10 +4978,9 @@
 DocType: Item,Variant Based On,基於變異對
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 % 。這是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供應商
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,請更正
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
 DocType: Request for Quotation Item,Supplier Part No,供應商部件號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總&#39;不能扣除
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,從......收到
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
@@ -4960,12 +4993,14 @@
 DocType: Asset,Assets,資產
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
+DocType: Subscription,Current Invoice End Date,當前發票結束日期
 DocType: Payment Term,Due Date Based On,到期日基於
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,請在“銷售設置”中設置默認客戶組和領域
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項,允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,項:{0}不存在於系統中
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,沒有為日記帳分錄選擇還款
 DocType: Payment Reconciliation,From Invoice Date,從發票日期
 DocType: Healthcare Settings,Laboratory Settings,實驗室設置
 DocType: Patient Appointment,Service Unit,服務單位
@@ -4979,11 +5014,11 @@
 DocType: Share Balance,No of Shares,股份數目
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,選擇狀態
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能標記為未來的日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Fee Schedule,Total Amount per Student,學生總數
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,電子的
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,電子的
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的組織的其餘部分用戶。您還可以添加邀請客戶到您的門戶網站通過從聯繫人中添加它們
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差(輸出 - )
 DocType: Grant Application,Requested Amount,請求金額
@@ -4993,16 +5028,17 @@
 DocType: Crop Cycle,Detected Diseases,檢測到的疾病
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},生日提醒{0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},生日提醒{0}
 DocType: Asset Maintenance Task,Last Completion Date,最後完成日期
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: GoCardless Settings,GoCardless Settings,GoCardless設置
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,庫存資產
 DocType: Restaurant,Active Menu,活動菜單
 DocType: Target Detail,Target Qty,目標數量
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},反對貸款:{0}
 DocType: Shopping Cart Settings,Checkout Settings,結帳設定
 DocType: Student Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送貨單{0}不能提交
@@ -5010,19 +5046,20 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
 DocType: Production Plan Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM不包含任何庫存項目
 DocType: Payment Term,Month(s) after the end of the invoice month,發票月份結束後的月份
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,專案活動/任務。
 DocType: Vehicle Log,Refuelling Details,加油詳情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,實驗結果日期時間不能在測試日期時間之前
 DocType: POS Profile,Allow user to edit Discount,允許用戶編輯折扣
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,從中獲取客戶
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,從中獲取客戶
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查,如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: Shipping Rule,Restrict to Countries,限製到國家
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額(公司貨幣)
 DocType: Sales Invoice Timesheet,Billing Hours,結算時間
 DocType: Project,Total Sales Amount (via Sales Order),總銷售額(通過銷售訂單)
@@ -5040,6 +5077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
 DocType: Grant Application,Assessment  Manager,評估經理
 DocType: Payment Entry,Allocate Payment Amount,分配付款金額
+DocType: Subscription Plan,Subscription Plan,訂閱計劃
 DocType: Employee External Work History,Salary,薪水
 DocType: Serial No,Delivery Document Type,交付文件類型
 DocType: Item Variant Settings,Do not update variants on save,不要在保存時更新變體
@@ -5063,9 +5101,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +616,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安裝預置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM取代
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,根據交付日期選擇項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,根據交付日期選擇項目
 DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎?
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -5080,7 +5118,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房間預訂
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,顧客服務
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,顧客服務
 DocType: BOM,Thumbnail,縮略圖
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,報價候選作業。
@@ -5095,7 +5133,7 @@
 DocType: Fees,Student Details,學生細節
 DocType: Purchase Invoice Item,Stock Qty,庫存數量
 DocType: Purchase Invoice Item,Stock Qty,庫存數量
-DocType: Employee Loan,Repayment Period in Months,在月還款期
+DocType: Loan,Repayment Period in Months,在月還款期
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,錯誤:沒有有效的身份證?
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
@@ -5104,7 +5142,7 @@
 DocType: Task,Closing Date,截止日期
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
 DocType: Timesheet,Work Detail,工作細節
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,工程師
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,工程師
 DocType: Journal Entry,Total Amount Currency,總金額幣種
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},於列{0}需要產品編號
@@ -5145,12 +5183,11 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,捐助者類型信息。
 DocType: Request for Quotation,Supplier Detail,供應商詳細
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},誤差在式或條件:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,發票金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,發票金額
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,標準重量必須達100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,出勤
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,庫存產品
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取,則該列表將被加到每個應被應用到的部門。
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},創建{0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目標倉庫不能相同
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,稅務模板購買交易。
@@ -5172,10 +5209,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +124,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Vehicle Service,Clutch Plate,離合器壓盤
 DocType: Company,Round Off Account,四捨五入賬戶
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,行政開支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
-DocType: Journal Entry,Subscription,訂閱
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,訂閱
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,費用創作待定
 DocType: Appraisal Goal,Score Earned,得分
@@ -5190,7 +5227,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量,請不要選中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量,請不要選中。
 DocType: Asset,Frequency of Depreciation (Months),折舊率(月)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,信用賬戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
@@ -5198,7 +5235,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
 DocType: Hub Settings,Company Logo,公司標誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 DocType: Healthcare Settings,Patient Registration,病人登記
@@ -5229,11 +5266,10 @@
 DocType: Journal Entry,Total Debit,借方總額
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,請選擇患者
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,銷售人員
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,銷售人員
 DocType: Hotel Room Package,Amenities,設施
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,預算和成本中心
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允許多種默認付款方式
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,為了
 ,Appointment Analytics,預約分析
 DocType: Lead,Blog Subscriber,網誌訂閱者
 DocType: Guardian,Alternate Number,備用號碼
@@ -5258,8 +5294,9 @@
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 DocType: Cheque Print Template,Signatory Position,簽署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,設為失落
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,設為失落
 DocType: Timesheet,Total Billable Hours,總計費時間
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,用戶必須支付此訂閱生成的發票的天數
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收貨注意事項
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,這是基於對這個顧客的交易。詳情請參閱以下時間表
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}:分配金額{1}必須小於或等於輸入付款金額{2}
@@ -5278,7 +5315,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Company,Company Info,公司資訊
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,選擇或添加新客戶
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用(資產)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,這是基於該員工的考勤
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,出席人數
@@ -5293,7 +5330,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購買金額
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供應商報價{0}創建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,結束年份不能啟動年前
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,員工福利
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,員工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Work Order,Manufactured Qty,生產數量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},這些份額不存在於{0}
@@ -5301,11 +5338,11 @@
 DocType: Asset,Out of Order,亂序
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 DocType: Projects Settings,Ignore Workstation Time Overlap,忽略工作站時間重疊
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,選擇批號
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
 DocType: Patient Service Unit,Medical Administrator,醫療管理員
 DocType: Assessment Plan,Schedule,時間表
 DocType: Account,Parent Account,父帳戶
@@ -5332,14 +5369,15 @@
 DocType: Asset Repair,Repair Status,維修狀態
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,請選擇員工記錄第一。
 DocType: POS Profile,Account for Change Amount,帳戶漲跌額
 DocType: Purchase Invoice,input service,輸入服務
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客戶不與匹配{1} / {2} {3} {4}
 DocType: Maintenance Team Member,Maintenance Team Member,維護團隊成員
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,課程編號:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:參考文件類型必須是採購訂單之一,購買發票或日記帳分錄
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:參考文件類型必須是採購訂單之一,購買發票或日記帳分錄
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目,然後描述,圖像,定價,稅費等會從模板中設定的一個變體,除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購/製造詳細資訊
@@ -5381,18 +5419,18 @@
 apps/erpnext/erpnext/hooks.py +151,Admission,入場
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",季節性設置預算,目標等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,變量名
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",項目{0}是一個模板,請選擇它的一個變體
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",項目{0}是一個模板,請選擇它的一個變體
 DocType: Asset,Asset Category,資產類別
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,淨工資不能為負
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,材料到供應商
 DocType: Production Plan,Material Request Planning,物料請求計劃
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,消費稅發票
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現%不止一次
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,流動負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,流動負債
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,計時器超出了指定的小時數
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,發送群發短信到您的聯絡人
 DocType: Patient,A Positive,積極的
@@ -5403,7 +5441,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡,而採購訂單應謹慎提供給供應商。
 DocType: Asset Maintenance Team,Asset Maintenance Team,資產維護團隊
-DocType: Employee Loan,Loan Type,貸款類型
+DocType: Loan,Loan Type,貸款類型
 DocType: Scheduling Tool,Scheduling Tool,調度工具
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
 DocType: Employee Education,Major/Optional Subjects,大/選修課
@@ -5446,7 +5484,7 @@
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,行號{0}:按日期請求不能在交易日期之前
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色產品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,設計師
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
@@ -5456,7 +5494,7 @@
 DocType: Driver,Expiry Date,到期時間
 DocType: Healthcare Settings,Employee name and designation in print,員工姓名和印刷品名稱
 ,accounts-browser,賬戶瀏覽器
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,請先選擇分類
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨,庫存設置或更新項目“津貼”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
@@ -5464,10 +5502,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,請選擇患者以獲得實驗室測試
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,交貨期天
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得稅費用
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:過帳日期必須是相同的購買日期{1}資產的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:過帳日期必須是相同的購買日期{1}資產的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果學生住在學院的旅館,請檢查。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
 ,Stock Summary,股票摘要
@@ -5480,6 +5518,7 @@
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: Item,Shelf Life In Days,保質期天數
 DocType: GL Entry,Is Opening,是開幕
+DocType: Department,Expense Approvers,費用審批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}:借方條目不能與{1}連接
 DocType: Journal Entry,Subscription Section,認購科
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,帳戶{0}不存在
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 1250a03..3e2b18b 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -4,17 +4,15 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
 apps/erpnext/erpnext/config/education.py +118,Assessment Reports,评估报告
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,消费类产品
-DocType: Purchase Receipt,Subscription Detail,订阅细节
 DocType: Supplier Scorecard,Notify Supplier,通知供应商
 DocType: Item,Customer Items,客户物料
 DocType: Project,Costing and Billing,成本核算和计费
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +88,Email Notifications,邮件通知
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,评估
 DocType: Item,Default Unit of Measure,默认计量单位
 DocType: SMS Center,All Sales Partner Contact,所有的销售合作伙伴联系人
-DocType: Employee,Leave Approvers,假期审批人
+DocType: Department,Leave Approvers,假期审批人
 DocType: Sales Partner,Dealer,经销商
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,调查
@@ -31,8 +29,8 @@
 DocType: Patient Appointment,Check availability,检查可用性
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,这是基于对这种供应商的交易。详情请参阅以下时间表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,法律
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Legal,法律
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
 DocType: Bank Guarantee,Customer,客户
 DocType: Purchase Receipt Item,Required By,必选
 DocType: Delivery Note,Return Against Delivery Note,射向送货单
@@ -43,11 +41,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},银行账户不能命名为{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),未付{0}不能小于零( {1} )
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +348,There are no submitted Salary Slips to process.,没有提交工资单要处理。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +356,There are no submitted Salary Slips to process.,没有提交工资单要处理。
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,今天有必要采取这一行动,重复上述
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,查看
 DocType: Pricing Rule,Apply On,应用于
@@ -56,10 +53,9 @@
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Support Settings,Support Settings,支持设置
 apps/erpnext/erpnext/projects/doctype/project/project.py +75,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +121,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:速率必须与{1}:{2}({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,New Leave Application,新建假期申请
+apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:速率必须与{1}:{2}({3} / {4})
 ,Batch Item Expiry Status,批处理项到期状态
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,银行汇票
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +185,Bank Draft,银行汇票
 DocType: Membership,membership validaty section,会员身份验证部分
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 DocType: Consultation,Consultation,会诊
@@ -70,8 +66,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,制作网站
 DocType: Opening Invoice Creation Tool Item,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,账表不能为空。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),借款(负债)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +552,Accounts table cannot be blank.,账表不能为空。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Loans (Liabilities),借款(负债)
 DocType: Employee Education,Year of Passing,按年排序
 DocType: Item,Country of Origin,原产国
 DocType: Soil Texture,Soil Texture Criteria,土壤质地标准
@@ -79,7 +75,7 @@
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,主要联系方式
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,开放式问题
 DocType: Production Plan Item,Production Plan Item,生产计划项目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +150,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 DocType: Lab Test Groups,Add new line,添加新行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,医疗保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付(天)
@@ -89,7 +85,7 @@
 ,Delay Days,延迟天数
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +899,Serial Number: {0} is already referenced in Sales Invoice: {1},序号:{0}已在销售发票中引用:{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +889,Invoice,发票
+DocType: Subscription Invoice,Invoice,发票
 DocType: Purchase Invoice Item,Item Weight Details,项目重量细节
 DocType: Asset Maintenance Log,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
@@ -98,7 +94,7 @@
 DocType: Salary Component,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分(0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +77,Row # {0}:,行#{0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,行#{0}:
 DocType: Timesheet,Total Costing Amount,总成本计算金额
 DocType: Delivery Note,Vehicle No,车辆编号
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,请选择价格表
@@ -108,14 +104,13 @@
 DocType: Work Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,请选择日期
 DocType: Daily Work Summary Group,Holiday List,假期列表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,会计
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Accountant,会计
 DocType: Hub Settings,Selling Price List,卖价格表
 DocType: Patient,Tobacco Current Use,烟草当前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,卖出率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,卖出率
 DocType: Cost Center,Stock User,库存用户
 DocType: Soil Analysis,(Ca+Mg)/K,(钙+镁)/ K
 DocType: Company,Phone No,电话号码
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +239,New {0}: #{1},新建 {0}:#{1}
 DocType: Delivery Trip,Initial Email Notification Sent,初始电子邮件通知已发送
 ,Sales Partners Commission,销售合作伙伴佣金
 DocType: Soil Texture,Sandy Clay Loam,桑迪粘土壤土
@@ -126,17 +121,18 @@
 DocType: Asset,Value After Depreciation,折旧后
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有关
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,考勤日期不得少于员工的加盟日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance date can not be less than employee's joining date,考勤日期不得少于员工的加盟日期
 DocType: Grading Scale,Grading Scale Name,分级标准名称
-DocType: Subscription,Repeat on Day,一天重复
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,这是一个root帐户,不能被编辑。
 DocType: Sales Invoice,Company Address,公司地址
 DocType: BOM,Operations,操作
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能为{0}设置折扣授权
+DocType: Subscription,Subscription Start Date,订阅开始日期
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列,一为旧名称,一个用于新名称
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考:{0},商品编号:{1}和顾客:{2}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,试用期结束日期不能在试用期开始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,千克
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +114,BOM is not specified for subcontracting item {0} at row {1},没有为行{1}的转包商品{0}指定BOM
@@ -148,7 +144,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Patient,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,从获取物料
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Get items from,从获取物料
 DocType: Price List,Price Not UOM Dependant,价格不依赖于UOM
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
@@ -179,12 +175,12 @@
 DocType: Vehicle Service,Brake Oil,刹车油
 DocType: Tax Rule,Tax Type,税收类型
 ,Completed Work Orders,完成的工作订单
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +581,Taxable Amount,应税金额
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +582,Taxable Amount,应税金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(小时率/ 60)*实际操作时间
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:参考文档类型必须是费用索赔或日记帐分录之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +975,Select BOM,选择BOM
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:参考文档类型必须是费用索赔或日记帐分录之一
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
 apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,管理给予员工的预付金额
@@ -200,19 +196,19 @@
 DocType: Delivery Trip,Delivery Notification,送达通知
 DocType: Journal Entry,Opening Entry,开放报名
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户仅用于支付
-DocType: Employee Loan,Repay Over Number of Periods,偿还期的超过数
+DocType: Loan,Repay Over Number of Periods,偿还期的超过数
 DocType: Stock Entry,Additional Costs,额外费用
 apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 DocType: Education Settings,Validate Batch for Students in Student Group,验证学生组学生的批次
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到员工的假期记录{0} {1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +36,No leave record found for employee {0} for {1},未找到员工的假期记录{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +365,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +371,Please select Company first,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,Please set default template for Leave Status Notification in HR Settings.,请在人力资源设置中设置离职状态通知的默认模板。
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目标类型
 DocType: BOM,Total Cost,总成本
 DocType: Soil Analysis,Ca/K,钙/ K
-DocType: Journal Entry Account,Employee Loan,员工贷款
 DocType: Fee Schedule,Send Payment Request Email,发送付款请求电子邮件
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,物料{0}不存在于系统中或已过期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,房地产
@@ -232,21 +228,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,成功注销。
 DocType: Assessment Result,Grade,年级
 DocType: Restaurant Table,No of Seats,座位数
-DocType: Subscription,"To add dynamic subject, use jinja tags like
-
-<div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>",要添加动态主题,请使用jinja标签<div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: Asset Maintenance Task,Asset Maintenance Task,资产维护任务
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Annual Salary,年薪
 DocType: Daily Work Summary,Daily Work Summary,每日工作总结
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
 apps/erpnext/erpnext/accounts/party.py +392,{0} {1} is frozen,{0} {1}已冻结
-apps/erpnext/erpnext/setup/doctype/company/company.py +140,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,库存费用
+apps/erpnext/erpnext/setup/doctype/company/company.py +141,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +81,Stock Expenses,库存费用
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,选择目标仓库
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,选择目标仓库
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,请输入首选电子邮件联系
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +69,Please enter Preferred Contact Email,请输入首选电子邮件联系
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
@@ -267,7 +260,7 @@
 DocType: Customer,Primary Address,主要地址
 DocType: Production Plan,Material Request Detail,材料请求详情
 DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
-apps/erpnext/erpnext/controllers/accounts_controller.py +802,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款,行{0}项率,税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +806,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款,行{0}项率,税收行{1}也必须包括在内
 apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: Sales Invoice,Change Amount,涨跌额
@@ -277,26 +270,28 @@
 DocType: Driver,Driving License Categories,驾驶执照类别
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,请输入交货日期
 DocType: Depreciation Schedule,Make Depreciation Entry,计提折旧进入
+DocType: HR Settings,Leave Settings,保留设置
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,请求类型
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,广播
 apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),POS(在线/离线)的设置模式
 DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根据工作订单创建时间日志。不得根据工作指令跟踪操作
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,执行
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +192,Execution,执行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
 DocType: Asset Maintenance Log,Maintenance Status,维护状态
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,会员资格
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}:供应商对于应付账款科目来说是必输的{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间:{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
 DocType: Drug Prescription,Interval,间隔
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +253,Preference,偏爱
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +254,Preference,偏爱
 DocType: Grant Application,Individual,个人
 DocType: Academic Term,Academics User,学术界用户
 DocType: Cheque Print Template,Amount In Figure,量图
-DocType: Employee Loan Application,Loan Info,贷款信息
+DocType: Loan Application,Loan Info,贷款信息
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,规划维护访问。
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,供应商记分卡期
 DocType: Share Transfer,Share Transfer,股份转让
@@ -312,7 +307,7 @@
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,项目模板
 apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,生物化学
 DocType: Job Offer,Select Terms and Conditions,选择条款和条件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Out Value,输出值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,输出值
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce设置
 DocType: Production Plan,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
@@ -335,10 +330,12 @@
 DocType: Selling Settings,Default Territory,默认地区
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,电视
 DocType: Work Order Operation,Updated via 'Time Log',通过“时间日志”更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +430,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,选择客户或供应商。
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +431,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Company,Enable Perpetual Inventory,启用永久库存
+DocType: Bank Guarantee,Charges Incurred,收费发生
 DocType: Company,Default Payroll Payable Account,默认情况下,应付职工薪酬帐户
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,更新电子邮件组
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
@@ -362,7 +359,7 @@
 DocType: Lab Test,Custom Result,自定义结果
 DocType: Delivery Stop,Contact Name,联系人姓名
 DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Tax Id: ,税号:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,税号:
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,学生卡:
 DocType: POS Customer Group,POS Customer Group,POS客户群
 DocType: Land Unit,Land Unit describing various land assets,描绘各种土地资产的土地单位
@@ -375,9 +372,8 @@
 ,Open Work Orders,打开工作订单
 DocType: Payment Term,Credit Months,信贷月份
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,净工资不能低于0
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",要停止从系统发送重复的错误通知,我们已经在订阅中选中了“禁用”字段
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Leaves per Year,每年叶
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Leaves per Year,每年叶
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}:请检查'是推进'对帐户{1},如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +219,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Email Digest,Profit & Loss,利润损失
@@ -385,9 +381,9 @@
 DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量(通过时间表)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,请设置学生组的学生
 DocType: Item Website Specification,Item Website Specification,项目网站规格
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +449,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +740,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +83,Bank Entries,银行条目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +457,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +741,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,银行条目
 DocType: Crop,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -395,7 +391,7 @@
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,学生组创建工具课程
 DocType: Lead,Do Not Contact,不要联系
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,谁在您的组织教人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,软件开发人员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Course Scheduling Tool,Course Start Date,课程开始日期
@@ -404,8 +400,8 @@
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +762,Item {0} is cancelled,物料{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1064,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} is cancelled,物料{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1066,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,购买详情
@@ -441,9 +437,8 @@
 DocType: Supplier Scorecard Scoring Standing,Max Grade,最高等级
 DocType: Email Digest,New Quotations,新报价
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,电子邮件工资单员工根据员工选择首选的电子邮件
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,休假审批人列表中的第一个将被设为默认审批人
 DocType: Tax Rule,Shipping County,航运县
-apps/erpnext/erpnext/config/desktop.py +167,Learn,学习
+apps/erpnext/erpnext/config/desktop.py +159,Learn,学习
 DocType: Asset,Next Depreciation Date,接下来折旧日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
@@ -453,7 +448,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,待清帐支票及存款
 DocType: Item,Synced With Hub,与Hub同步
 DocType: Driver,Fleet Manager,车队经理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能为负值对项{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +544,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能为负值对项{2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +86,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +406,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
@@ -475,7 +470,7 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},请在{}上设置酒店房价
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Opening Invoice Creation Tool,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +939,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +942,Delivery Note,送货单
 DocType: Consultation,Encounter Impression,遇到印象
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,出售资产的成本
@@ -503,11 +498,10 @@
 apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",雇员职位(例如总裁,总监等) 。
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
 DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:采购发票不能对现有资产进行{1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +257,[Urgent] Error while creating recurring %s for %s,[紧急]为%s创建循环%s时出错
+apps/erpnext/erpnext/controllers/accounts_controller.py +627,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行#{0}:采购发票不能对现有资产进行{1}
 DocType: Land Unit,LInked Analysis,LInked分析
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +73,Application period cannot be across two allocation records,申请期限不能跨越两个分配记录
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two allocation records,申请期限不能跨越两个分配记录
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +92,Row # {0}: Batch No must be same as {1} {2},行#{0}:批号必须与{1} {2}
@@ -521,7 +515,7 @@
 DocType: Purchase Order,% Received,%已收货
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
 DocType: Volunteer,Weekends,周末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Credit Note Amount,信用额度
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,信用额度
 DocType: Setup Progress Action,Action Document,行动文件
 DocType: Chapter Member,Website URL,网站网址
 ,Finished Goods,成品
@@ -535,6 +529,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext演示
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加项目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,项目质量检验参数
+DocType: Leave Application,Leave Approver Name,假期审批人姓名
 DocType: Depreciation Schedule,Schedule Date,计划任务日期
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",收入,扣减等工资组成部分
 DocType: Packed Item,Packed Item,盒装产品
@@ -553,7 +548,7 @@
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Healthcare Settings,Require Lab Test Approval,需要实验室测试批准
 DocType: Salary Slip Timesheet,Working Hours,工作时间
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Outstanding,总计杰出
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,总计杰出
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
 DocType: Dosage Strength,Strength,强度
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1534,Create a new Customer,创建一个新的客户
@@ -566,7 +561,7 @@
 DocType: Workstation,Consumable Cost,耗材成本
 DocType: Purchase Receipt,Vehicle Date,车日期
 DocType: Student Log,Medical,医药
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Reason for losing,原因丢失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,原因丢失
 apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,更新帐号
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
 apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,已核销金额不能超过未调整金额
@@ -576,11 +571,10 @@
 DocType: Lab Test Template,Single,单身
 DocType: Salary Slip,Total Loan Repayment,总贷款还款
 DocType: Account,Cost of Goods Sold,销货成本
-DocType: Subscription,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,请输入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,请输入成本中心
 DocType: Drug Prescription,Dosage,剂量
 DocType: Journal Entry Account,Sales Order,销售订单
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均卖出价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,平均卖出价
 DocType: Assessment Plan,Examiner Name,考官名称
 DocType: Lab Test Template,No Result,没有结果
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
@@ -589,6 +583,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,请先输入公司名称
 DocType: Purchase Invoice,Supplier Name,供应商名称
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,在日历中显示所有部门成员的叶子
 DocType: Purchase Invoice,01-Sales Return,01-销售退货
 DocType: Account,Is Group,是集团
 DocType: Email Digest,Pending Purchase Orders,待采购订单
@@ -606,13 +601,13 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +220,{0} {1} is not associated with {2} {3},{0} {1}与{2} {3}无关
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本,每个邮件的简介文本是独立的。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Please set default payable account for the company {0},请为公司{0}设置预设应付账款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Please set default payable account for the company {0},请为公司{0}设置预设应付账款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +553,Transaction not allowed against stopped Work Order {0},不允许对停止的工单{0}进行交易
 DocType: Setup Progress Action,Min Doc Count,最小文件计数
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +700,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
@@ -636,8 +631,8 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,保留出售
 DocType: Packing Slip,From Package No.,起始包号
 DocType: Item Attribute,To Range,为了范围
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法,因为有一些项目没有自己的估值方法的交易
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,证券及存款
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法,因为有一些项目没有自己的估值方法的交易
 DocType: Student Report Generation Tool,Attended by Parents,由父母出席
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,请填写总已核销休假
 DocType: Patient,AB Positive,AB积极
@@ -646,7 +641,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤记录。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基于时间表工资。
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
-DocType: Employee Loan,Total Payment,总付款
+DocType: Loan,Total Payment,总付款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,Cannot cancel transaction for Completed Work Order.,无法取消已完成工单的交易。
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间(以分钟)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +132,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消,因此无法完成操作
@@ -662,16 +657,17 @@
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,列出一些你的客户,他们可以是组织或个人。
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足够的配件组装
 DocType: POS Profile User,POS Profile User,POS配置文件用户
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收益
+DocType: Subscription Invoice,Subscription Invoice,订阅发票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Direct Income,直接收益
 DocType: Patient Appointment,Date TIme,约会时间
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Administrative Officer,行政主任
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和税收
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 DocType: Codification Table,Codification Table,编纂表
 DocType: Timesheet Detail,Hrs,小时
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +349,Please select Company,请选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Company,请选择公司
 DocType: Stock Entry Detail,Difference Account,差异科目
 DocType: Purchase Invoice,Supplier GSTIN,供应商GSTIN
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
@@ -697,6 +693,7 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,现金流量映射模板
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2551,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
+DocType: Bank Guarantee,Providing,提供
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",不允许,根据需要配置实验室测试模板
 DocType: Patient,Risk Factors,风险因素
@@ -728,7 +725,7 @@
 DocType: Payment Entry Reference,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 DocType: Healthcare Settings,Appointment Confirmation,预约确认
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0},因为它采用的是现货交易
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +159,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0},因为它采用的是现货交易
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),结算(信用)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,你好
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移动项目
@@ -753,11 +750,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已经在用户{1}的pos配置文件{0}中设置了默认值,请禁用默认值
 apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",抱歉,序列号无法合并
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +163,"Sorry, Serial Nos cannot be merged",抱歉,序列号无法合并
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要领域
 DocType: Supplier,Prevent RFQs,防止RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,创建销售订单
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},从{0}到{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},从{0}到{1}
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -778,8 +775,9 @@
 DocType: Sales Invoice,Shipping Bill Date,运费单日期
 DocType: Production Plan,Production Plan,生产计划
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打开发票创建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +853,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注:总分配叶{0}应不低于已核定叶{1}期间
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根据序列号输入设置交易数量
 ,Total Stock Summary,总库存总结
 DocType: Announcement,Posted By,发布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货(直接发运)
@@ -790,7 +788,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),开幕(CR )
-apps/erpnext/erpnext/stock/doctype/item/item.py +872,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,因为该物料已经有使用别的计量单位的交易记录存在了,不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料,以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +873,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,因为该物料已经有使用别的计量单位的交易记录存在了,不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料,以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,调配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
@@ -798,8 +796,8 @@
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Training Result Employee,Training Result Employee,训练结果员工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
-DocType: Repayment Schedule,Principal Amount,本金
-DocType: Employee Loan Application,Total Payable Interest,合计应付利息
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,本金
+DocType: Loan Application,Total Payable Interest,合计应付利息
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},总计:{0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
@@ -808,10 +806,10 @@
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶,报销和工资
 DocType: Restaurant Reservation,Restaurant Reservation,餐厅预订
 DocType: Land Unit,Land Unit Name,土地单位名称
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,提案写作
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Proposal Writing,提案写作
 DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,包起来
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,通过电子邮件通知客户
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,通过电子邮件通知客户
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
 DocType: Employee Advance,Claimed Amount,声明金额
 apps/erpnext/erpnext/config/education.py +180,Masters,主数据
@@ -829,13 +827,12 @@
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建,请手动创建一个。
 DocType: Supplier Scorecard,Per Year,每年
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的规定,没有资格参加本计划
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,项目代码&gt;项目组&gt;品牌
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Employee,Organization Profile,组织简介
 DocType: Vital Signs,Height (In Meter),身高(米)
 DocType: Student,Sibling Details,兄弟姐妹详情
 DocType: Vehicle Service,Vehicle Service,汽车服务
-apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自动触发基于条件的反馈请求。
+apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,自动触发基于条件的反馈请求。
 DocType: Employee,Reason for Resignation,原因辞职
 apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,绩效考核模板。
 DocType: Sales Invoice,Credit Note Issued,信用票据发行
@@ -850,10 +847,9 @@
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户,客户组,地区,供应商,供应商类型,活动,销售合作伙伴等条件过滤。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Change in Inventory,在库存净变动
-apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,员工贷款管理
 DocType: Employee,Passport Number,护照号码
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,与关系Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Manager,经理
 DocType: Payment Entry,Payment From / To,支付自/至
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},请在仓库{0}中设置帐户
@@ -895,24 +891,24 @@
 DocType: Item,Material Transfer,物料转移
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路径
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),开幕(博士)
+DocType: Loan,Applicant,申请人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,复制文件
 ,GST Itemised Purchase Register,GST物料明细台帐
 DocType: Course Scheduling Tool,Reschedule,改期
-DocType: Employee Loan,Total Interest Payable,合计应付利息
+DocType: Loan,Total Interest Payable,合计应付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Work Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +337,Finish,完
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +422,Base,基础
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1553,Write Off Amount,核销金额
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1554,Write Off Amount,核销金额
 DocType: Leave Block List Allow,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
 DocType: Company,Gain/Loss Account on Asset Disposal,在资产处置收益/损失帐户
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Vehicle Log,Service Details,服务细节
-DocType: Subscription,Quarterly,季度
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,分组
 DocType: Selling Settings,Delivery Note Required,送货单是必须项
@@ -924,7 +920,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,基于..进行原物料倒扣账
 DocType: Sales Invoice,Port Code,港口代码
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +957,Reserve Warehouse,储备仓库
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +959,Reserve Warehouse,储备仓库
 DocType: Lead,Lead is an Organization,领导是一个组织
 DocType: Guardian Interest,Interest,利息
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
@@ -936,12 +932,12 @@
 DocType: Account,Accounts,会计
 DocType: Vehicle,Odometer Value (Last),里程表值(最后)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供应商计分卡标准模板。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,市场营销
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +110,Marketing,市场营销
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +303,Payment Entry is already created,付款记录已创建
 DocType: Request for Quotation,Get Suppliers,获取供应商
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:资产{1}不挂项目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +404,Preview Salary Slip,预览工资单
+apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} does not linked to Item {2},行#{0}:资产{1}不挂项目{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +406,Preview Salary Slip,预览工资单
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帐户{0}已多次输入
 DocType: Account,Expenses Included In Valuation,开支计入估值
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,如果您的会员资格在30天内到期,您只能续订
@@ -951,7 +947,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在设置了“现金流量映射器”文档时才能选择
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间:
 DocType: Supplier Scorecard,Per Week,每个星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +667,Item has variants.,项目有变体。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
@@ -973,9 +969,9 @@
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司与账户
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,In Value,金额
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,金额
 DocType: Asset Settings,Depreciation Options,折旧选项
-apps/erpnext/erpnext/utilities/transaction_base.py +35,Invalid Posting Time,发布时间无效
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,发布时间无效
 DocType: Lead,Campaign Name,活动名称
 DocType: Hotel Room,Capacity,容量
 DocType: Selling Settings,Close Opportunity After Days,关闭机会后日
@@ -1000,7 +996,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Budget,Budget Against,预算对象
 DocType: Employee,Cell Number,手机号码
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +450,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +458,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,已自动生成材料需求
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
@@ -1012,15 +1008,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +887,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}项目{2}所需的序列号。你已经提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
 DocType: BOM,Website Specifications,网站规格
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的无效电子邮件地址
 DocType: Special Test Items,Particulars,细节
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}:申请者{0} 假期类型{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}:申请者{0} 假期类型{1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Row {0}: Conversion Factor is mandatory,行{0}:转换系数是强制性的
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +344,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则,同样的标准存在,请分配优先级解决冲突。价格规则:{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM,因为它被其他BOM引用。
 DocType: Asset,Maintenance,维护
+DocType: Subscriber,Subscriber,订户
 DocType: Item Attribute Value,Item Attribute Value,项目属性值
 apps/erpnext/erpnext/projects/doctype/project/project.py +406,Please Update your Project Status,请更新您的项目状态
 DocType: Item,Maximum sample quantity that can be retained,可以保留的最大样品数量
@@ -1069,26 +1065,26 @@
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,添加时代
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
-DocType: Employee Loan,Interest Income Account,利息收入账户
+DocType: Loan,Interest Income Account,利息收入账户
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,审核邀请已发送
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,生物技术
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,办公维护费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,去
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件帐户
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Asset Repair,Downtime,停机
 DocType: Account,Liability,负债
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,学术期限:
 DocType: Salary Detail,Do not include in total,不包括在内
 DocType: Company,Default Cost of Goods Sold Account,默认销货成本科目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1177,Sample quantity {0} cannot be more than received quantity {1},采样数量{0}不能超过接收数量{1}
-apps/erpnext/erpnext/stock/get_item_details.py +369,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +372,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Request for Quotation Supplier,Send Email,发送电子邮件
 apps/erpnext/erpnext/stock/doctype/item/item.py +228,Warning: Invalid Attachment {0},警告:无效的附件{0}
 DocType: Item,Max Sample Quantity,最大样品量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +766,No Permission,无此权限
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +772,No Permission,无此权限
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,引用要求
 DocType: Vital Signs,Heart Rate / Pulse,心率/脉搏
 DocType: Company,Default Bank Account,默认银行账户
@@ -1099,12 +1095,11 @@
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,实验室测试和重要标志
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐明细
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,Row #{0}: Asset {1} must be submitted,行#{0}:资产{1}必须提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} must be submitted,行#{0}:资产{1}必须提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何雇员
-DocType: Subscription,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,学生组已经更新。
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,项目更新。
 DocType: SMS Center,All Customer Contact,所有的客户联系人
 DocType: Land Unit,Tree Details,树详细信息
@@ -1154,7 +1149,6 @@
 DocType: Stock Entry,STE-,甜菊
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有品目群组
-apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Work Order,Item To Manufacture,要生产的项目
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的状态为{2}
@@ -1168,7 +1162,7 @@
 DocType: Customer,"Reselect, if the chosen address is edited after save",重新选择,如果所选地址在保存后被编辑
 apps/erpnext/erpnext/stock/doctype/item/item.js +544,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
 DocType: Item,Hub Publishing Details,Hub发布细节
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +123,'Opening',“打开”
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Lab Test Template,Result Format,结果格式
@@ -1178,7 +1172,7 @@
 DocType: Payroll Entry,Bimonthly,半月刊
 DocType: Vehicle Service,Brake Pad,刹车片
 DocType: Fertilizer,Fertilizer Contents,肥料含量
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,研究与发展
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Research & Development,研究与发展
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,待开票金额
 DocType: Company,Registration Details,报名详情
 DocType: Timesheet,Total Billed Amount,总开单金额
@@ -1192,7 +1186,7 @@
 DocType: Customer,Bypass credit limit check at Sales Order,在销售订单旁边绕过信贷限额检查
 apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,绩效考核。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +100,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作为启用的购物车已启用“使用购物车”,而应该有购物车至少有一个税务规则
-apps/erpnext/erpnext/controllers/accounts_controller.py +412,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款记录{0}已关联到订单{1},请看看是否可以作为预付款关联到本发票。
+apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款记录{0}已关联到订单{1},请看看是否可以作为预付款关联到本发票。
 DocType: Sales Invoice Item,Stock Details,库存详细信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,项目价值
 apps/erpnext/erpnext/config/selling.py +326,Point-of-Sale,销售点
@@ -1226,7 +1220,7 @@
 DocType: Restaurant Table,Minimum Seating,最小的座位
 DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +845,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
@@ -1234,15 +1228,15 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +341,Unable to find Time Slot in the next {0} days for Operation {1},在未来{0}天操作{1}无可用时间(档期)
 DocType: Work Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +601,BOM {0} must be active,BOM{0}必须处于激活状态
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +414,No Items available for transfer,没有可用于传输的项目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +602,BOM {0} must be active,BOM{0}必须处于激活状态
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +413,No Items available for transfer,没有可用于传输的项目
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +218,Closing (Opening + Total),闭幕(开幕+总计)
 DocType: Journal Entry,Depreciation Entry,折旧分录
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 DocType: Crop Cycle,ISO 8016 standard,ISO 8016标准
 DocType: Pricing Rule,Rate or Discount,价格或折扣
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +215,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,最爱
 DocType: Hub Settings,Custom Data,自定义数据
@@ -1254,9 +1248,9 @@
 DocType: Medical Code,Medical Code Standard,医疗代码标准
 DocType: Soil Texture,Clay Composition (%),粘土成分(%)
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,在分配任务之前请保存。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Balance Value,余额值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,余额值
 DocType: Lab Test,Lab Technician,实验室技术员
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,销售价格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果选中,将创建一个客户,映射到患者。将针对该客户创建病人发票。您也可以在创建患者时选择现有客户。
 DocType: Bank Reconciliation,Account Currency,账户币种
@@ -1264,16 +1258,14 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,请注明舍入账户的公司
 DocType: Purchase Receipt,Range,范围
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +50,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
 DocType: Item Barcode,Item Barcode,品目条码
 DocType: Woocommerce Settings,Endpoints,端点
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +329,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,Item Variants {0} updated,项目变体{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +662,Item Variants {0} updated,项目变体{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
-of this",被生成。如果延迟,您将不得不手动更改“每月重复”字段
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Cannot {0} {1} {2} without any negative outstanding invoice,没有未付发票(负数),无法{0} {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,没有未付发票(负数),无法{0} {1} {2}
 DocType: Share Transfer,From Folio No,来自Folio No
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}:信用记录无法被链接的{1}
@@ -1308,16 +1300,17 @@
 DocType: Asset,Available-for-use Date,可供使用的日期
 DocType: Guardian,Guardian Name,监护人姓名
 DocType: Cheque Print Template,Has Print Format,有打印格式
-DocType: Employee Loan,Sanctioned,制裁
+DocType: Loan,Sanctioned,制裁
 apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +151,Row #{0}: Please specify Serial No for Item {1},行#{0}:请注明序号为项目{1}
 DocType: Crop Cycle,Crop Cycle,作物周期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品,这些值可以在主项表中输入,值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品,这些值可以在主项表中输入,值将被复制到“装箱单”表。
 DocType: Student Admission,Publish on website,发布在网站上
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
+DocType: Subscription,Cancelation Date,取消日期
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 DocType: Agriculture Task,Agriculture Task,农业任务
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,间接收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +133,Indirect Income,间接收益
 DocType: Student Attendance Tool,Student Attendance Tool,学生考勤工具
 DocType: Restaurant Menu,Price List (Auto created),价目表(自动创建)
 DocType: Cheque Print Template,Date Settings,日期设定
@@ -1344,6 +1337,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,仪表
 DocType: Workstation,Electricity Cost,电力成本
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,实验室测试日期时间不能在收集日期时间之前
+DocType: Subscription Plan,Cost,成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
 DocType: Expense Claim,Total Advance Amount,总预付金额
 DocType: Delivery Stop,Estimated Arrival,预计抵达时间
@@ -1355,14 +1349,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑)。
 DocType: Timesheet Detail,Bill,账单
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,白
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +209,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户(开放)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +310,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:数量不适用于{4}在仓库{1}在发布条目的时间({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,您只能从复选框列表中选择最多一个选项。
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 DocType: Item,Automatically Create New Batch,自动创建新批
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +635,Assigning {0} to {1} (row {2}),将{0}分配给{1}(第{2}行)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Make ,生成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Assigning {0} to {1} (row {2}),将{0}分配给{1}(第{2}行)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Make ,生成
 DocType: Student Admission,Admission Start Date,入学开始日期
 DocType: Journal Entry,Total Amount in Words,总金额词
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新员工
@@ -1378,7 +1372,7 @@
 DocType: Holiday List,Holiday List Name,假期列表名称
 DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程时间表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Stock Options,库存选项
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,Stock Options,库存选项
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,取消采购订单中的上次采购详细信息
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +267,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产?
@@ -1397,11 +1391,12 @@
 DocType: Packing Slip Item,Packing Slip Item,装箱单项目
 DocType: Purchase Invoice,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},请指定{0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
 apps/erpnext/erpnext/stock/doctype/item/item.js +415,Variant creation has been queued.,变体创建已经排队。
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}的工作摘要
-apps/erpnext/erpnext/stock/doctype/item/item.py +696,Attribute table is mandatory,属性表是强制性的
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一个请假批准者将被设置为默认的批准批准者。
+apps/erpnext/erpnext/stock/doctype/item/item.py +697,Attribute table is mandatory,属性表是强制性的
 DocType: Production Plan,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0}不能为负
 DocType: Training Event,Self-Study,自习
@@ -1414,7 +1409,7 @@
 DocType: Workstation,Wages,工资
 DocType: Asset Maintenance,Maintenance Manager Name,维护经理姓名
 DocType: Agriculture Task,Urgent,加急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,无法找到变量:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
 apps/erpnext/erpnext/stock/doctype/item/item.py +264,Cannot be a fixed asset item as Stock Ledger is created.,不能成为股票分类账创建的固定资产项目。
@@ -1426,7 +1421,7 @@
 DocType: Quality Inspection Template,Quality Inspection Template Name,质量检验模板名称
 DocType: Project,First Email,第一邮件
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,销售金额
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,销售金额
 DocType: Repayment Schedule,Interest Amount,利息总额
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Share Transfer,Issue,问题
@@ -1440,10 +1435,10 @@
 DocType: Tax Rule,Shipping State,运输状态
 ,Projected Quantity as Source,预计库存量的来源
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +858,Delivery Trip,送货之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,送货之旅
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,转移类型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,销售费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Sales Expenses,销售费用
 DocType: Consultation,Diagnosis,诊断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
@@ -1452,12 +1447,13 @@
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1624,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +252,Sales Order {0} is {1},销售订单{0} {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +296,Select interest income account in loan {0},选择贷款{0}中的利息收入帐户
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
-DocType: Employee Loan,Repayment Schedule,还款计划
+DocType: Loan,Repayment Schedule,还款计划
 DocType: Shipping Rule Condition,Shipping Rule Condition,配送规则条件
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,结束日期不能小于开始日期
@@ -1472,7 +1468,7 @@
 DocType: Education Settings,Attendance Freeze Date,出勤冻结日期
 DocType: Education Settings,Attendance Freeze Date,出勤冻结日期
 apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商,他们可以是组织或个人。
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有产品
+apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,查看所有产品
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄(天)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄(天)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,所有的材料明细表
@@ -1481,14 +1477,16 @@
 DocType: Expense Claim,From Employee,来自员工
 DocType: Driver,Cellphone Number,手机号码
 DocType: Project,Monitor Progress,监视进度
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: 因为{1}中的物件{0}为零,系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: 因为{1}中的物件{0}为零,系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
+DocType: Supplier Quotation,Auto Repeat Section,自动重复部分
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
 DocType: Program Enrollment,Transportation,运输
 apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,无效属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +240,{0} {1} must be submitted,{0} {1}必须提交
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},量必须小于或等于{0}
+DocType: Department Approver,Department Approver,部门批准人
 DocType: SMS Center,Total Characters,总字符
 DocType: Employee Advance,Claimed,声称
 DocType: Crop,Row Spacing,行间距
@@ -1498,6 +1496,7 @@
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +38,Contribution %,贡献%
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根据购买设置,如果需要采购订单==&#39;是&#39;,那么为了创建采购发票,用户需要首先为项目{0}创建采购订单
+,HSN-wise-summary of outward supplies,HSN明智的向外供应摘要
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码,供大家参考。税务号码等
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
@@ -1511,7 +1510,7 @@
 DocType: Setup Progress Action,Action Name,动作名称
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,开始年份
 apps/erpnext/erpnext/regional/india/utils.py +25,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位数字应与状态号{0}匹配
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
 DocType: Salary Slip,Leave Without Pay,无薪假期
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +385,Capacity Planning Error,容量规划错误
@@ -1529,26 +1528,26 @@
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段将仅在创建时复制。
 DocType: Setup Progress Action,Domains,域
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,管理人员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Management,管理人员
 DocType: Cheque Print Template,Payer Settings,付款人设置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如,如果你的英文缩写为“SM”,而该项目的代码是“T-SHIRT”,该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
 DocType: Purchase Invoice,Is Return,再来
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,Caution,警告
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',开始日期大于任务“{0}”的结束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +815,Return / Debit Note,退货/借记单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Return / Debit Note,退货/借记单
 DocType: Price List Country,Price List Country,价目表国家
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +212,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
 DocType: Purchase Invoice Item,UOM Conversion Factor,计量单位换算系数
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
 DocType: Stock Settings,Default Item Group,默认物料群组
-DocType: Employee Loan,Partially Disbursed,部分已支付
-apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,授予信息。
+apps/erpnext/erpnext/config/non_profit.py +93,Grant information.,授予信息。
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,您无法重新启动未取消的订阅。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +750,Cost Center For Item with Item Code ',成本中心:品目代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',成本中心:品目代码‘
 DocType: Fee Validity,Valid Till,有效期至
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,总计家长教师会议
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS机配置中有设置账户。
@@ -1561,7 +1560,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +322,Row #{0}: Rejected Qty can not be entered in Purchase Return,行#{0}:驳回采购退货数量不能进入
 apps/erpnext/erpnext/stock/doctype/item/item.js +182,Changing Customer Group for the selected Customer is not allowed.,不允许更改所选客户的客户组。
 ,Purchase Order Items To Be Billed,待开票采购订单明细
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Updating estimated arrival times.,更新预计到达时间。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,更新预计到达时间。
 DocType: Program Enrollment Tool,Enrollment Details,注册详情
 DocType: Purchase Invoice Item,Net Rate,净费率
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +152,Please select a customer,请选择一个客户
@@ -1582,18 +1581,20 @@
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Purchase Order,Group same items,合并相同物料
 DocType: Purchase Invoice,Disable Rounded Total,禁用元整后金额
-DocType: Employee Loan Application,Repayment Info,还款信息
+DocType: Department,Parent Department,家长部门
+DocType: Loan Application,Repayment Info,还款信息
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分录”不能为空
 DocType: Maintenance Team Member,Maintenance Role,维护角色
-apps/erpnext/erpnext/utilities/transaction_base.py +92,Duplicate row {0} with same {1},重复的行{0}同{1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算平衡表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +443,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +451,Fiscal Year {0} not found,会计年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +309,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店预订用户
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,请选择前缀第一
 DocType: Student,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,研究
+DocType: Subscription Settings,Subscription Settings,订阅设置
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
@@ -1604,19 +1605,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +526,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
 DocType: Crop Cycle,Less than a year,不到一年
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +104,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 DocType: Crop,Yield UOM,产量UOM
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
 DocType: Item,Is Item from Hub,是来自Hub的Item
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}:活动类型是强制性的。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Dividends Paid,股利支付
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Dividends Paid,股利支付
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,会计总帐
 DocType: Stock Reconciliation,Difference Amount,差额
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Leave on {1},在{1}上留下博士{0}
 DocType: Purchase Invoice,Reverse Charge,反向充电
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +172,Retained Earnings,留存收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Retained Earnings,留存收益
 DocType: Purchase Invoice,05-Change in POS,05-更改POS
 DocType: Vehicle Log,Service Detail,服务细节
 DocType: BOM,Item Description,项目说明
@@ -1631,12 +1632,12 @@
 DocType: Opportunity Item,Opportunity Item,项目的机会
 ,Student and Guardian Contact Details,学生和监护人联系方式
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,行{0}:对于供应商{0}的电邮地址发送电子邮件
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Opening,临时开通
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +73,Temporary Opening,临时开通
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +9,View Hub,查看中心
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Patient Appointment,More Info,更多信息
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
 DocType: Supplier Scorecard,Scorecard Actions,记分卡操作
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,举例:硕士计算机科学
 DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
@@ -1646,7 +1647,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,至
 DocType: Supplier Quotation Item,Lead Time in days,在天交货期
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +70,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +326,Payment of salary from {0} to {1},从{0}工资支付{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +334,Payment of salary from {0} to {1},从{0}工资支付{1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未付发票
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +84,Sales Order {0} is not valid,销售订单{0}无效
@@ -1655,9 +1656,10 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,实验室测试处方
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +166,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Small,小
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,打开发票创建工具项目
 DocType: Education Settings,Employee Number,雇员编号
+DocType: Subscription Settings,Cancel Invoice After Grace Period,在宽限期后取消发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},箱号已被使用,请尝试从{0}开始
 DocType: Project,% Completed,% 已完成
 ,Invoiced Amount (Exculsive Tax),已开票金额(未含税)
@@ -1671,7 +1673,7 @@
 DocType: Plant Analysis,Laboratory Testing Datetime,实验室测试日期时间
 DocType: Email Digest,Add Quote,添加报价
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1145,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,间接支出
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Indirect Expenses,间接支出
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row {0}: Qty is mandatory,行{0}:数量是强制性的
 DocType: Agriculture Analysis Criteria,Agriculture,农业
 apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Master Data,同步主数据
@@ -1702,16 +1704,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",对于{0},贷方分录只能选择贷方账户
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Delivery Note {0} is not submitted,送货单{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +148,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,资本设备
+apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段,可以是项目,项目组或品牌。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +246,Please set the Item Code first,请先设定商品代码
 DocType: Item,ITEM-,项目-
 apps/erpnext/erpnext/controllers/selling_controller.py +123,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
+DocType: Subscription Plan,Billing Interval Count,计费间隔计数
 DocType: Sales Invoice Item,Edit Description,编辑说明
 DocType: Antibiotic,Antibiotic,抗生素
 ,Team Updates,团队更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +912,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +914,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计(公司货币)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,创建打印格式
@@ -1737,7 +1740,7 @@
 DocType: POS Item Group,POS Item Group,POS项目组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代项目不能与项目代码相同
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +617,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +618,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-定期评估
 DocType: Salary Slip,Bank Account No.,银行账号
@@ -1754,7 +1757,7 @@
 DocType: BOM Operation,Workstation,工作站
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,询价供应商
 DocType: Healthcare Settings,Registration Message,注册信息
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Hardware,硬件
 DocType: Prescription Dosage,Prescription Dosage,处方用量
 DocType: Attendance,HR Manager,人力资源经理
 apps/erpnext/erpnext/accounts/party.py +175,Please select a Company,请选择一个公司
@@ -1785,7 +1788,7 @@
 DocType: Project,Start and End Dates,开始和结束日期
 ,Delivered Items To Be Billed,无开账单的已交付品目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},开放BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Project Update,Great/Quickly,大/快速
 DocType: Purchase Invoice Item,UOM,计量单位
@@ -1794,8 +1797,8 @@
 DocType: Employee,EMP/,EMP /
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +138,Please select batches for batched item ,请为批量选择批次
 DocType: Asset,Depreciation Schedules,折旧计划
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +192,Following accounts might be selected in GST Settings:,以下帐户可能在GST设置中选择:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +70,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,以下帐户可能在GST设置中选择:
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 DocType: Payment Request,Transaction Currency,交易货币
 apps/erpnext/erpnext/controllers/buying_controller.py +31,From {0} | {1} {2},来自{0} | {1} {2}
@@ -1806,6 +1809,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Avg Daily Outgoing,平均每日出货
 DocType: POS Profile,Campaign,活动
 DocType: Supplier,Name and Type,名称和类型
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +63,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
 DocType: Physician,Contacts and Address,联系人和地址
 DocType: Purchase Invoice,Contact Person,联络人
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
@@ -1819,19 +1823,20 @@
 DocType: Student Admission,Eligibility and Details,资格和细节
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +812,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +403,Max: {0},最大值:{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉,为更多的检查门户设置。
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供应商记分卡评分变量
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,采购数量
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,采购数量
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时出现错误
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +581,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +752,Item {0} is not a stock Item,物料{0}不是库存物料
+DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/stock/doctype/item/item.py +753,Item {0} is not a stock Item,物料{0}不是库存物料
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
@@ -1852,14 +1857,15 @@
 DocType: Package Code,Package Code,封装代码
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,学徒
 DocType: Purchase Invoice,Company GSTIN,公司GSTIN
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +105,Negative Quantity is not allowed,负数量是不允许的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",从物件大师取得税项详细信息表,嵌入在此字段内。用作税金和费用。
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +160,Employee cannot report to himself.,雇员不能向自己报告。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结,则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
 apps/erpnext/erpnext/accounts/party.py +240,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}:{1}只能在货币做:{2}
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,在离职申请中允许Approver为强制性
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况,要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
 apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,税收规则进行的交易。
@@ -1887,15 +1893,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付条款可能是重复的。
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),农业(测试版)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Packing Slip,装箱单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,办公室租金
-apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,短信网关的设置
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,装箱单
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
+apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,短信网关的设置
 DocType: Disease,Common Name,通用名称
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,导入失败!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
 DocType: Vital Signs,Blood Pressure,血压
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,分析员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Analyst,分析员
 DocType: Item,Inventory,库存
 DocType: Item,Sales Details,销售详情
 DocType: Quality Inspection,QI-,QI-
@@ -1905,15 +1911,15 @@
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,验证学生组学生入学课程
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
 DocType: Item,Item Attribute,项目属性
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Government,政府
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,报销{0}已经存在车辆日志
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,机构名称
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,请输入还款金额
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,请输入还款金额
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,项目变体
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服务
 DocType: HR Settings,Email Salary Slip to Employee,通过电子邮件发送工资单给员工
 DocType: Cost Center,Parent Cost Center,父成本中心
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Select Possible Supplier,选择潜在供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Select Possible Supplier,选择潜在供应商
 DocType: Sales Invoice,Source,源
 DocType: Customer,"Select, to make the customer searchable with these fields",选择,使客户可以使用这些字段进行搜索
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
@@ -1930,7 +1936,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +295,Packing Slip(s) cancelled,装箱单( S)取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +36,Cash Flow from Investing,投资现金流
 DocType: Program Course,Program Course,课程计划
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,货运及转运费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Freight and Forwarding Charges,货运及转运费
 DocType: Homepage,Company Tagline for website homepage,公司标语的网站主页
 DocType: Item Group,Item Group Name,项目群组名称
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
@@ -1960,10 +1966,10 @@
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership细节
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),请输入所有必需的结果值(s)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +106,Accounts Receivable Summary,应收账款汇总
-DocType: Employee Loan,Monthly Repayment Amount,每月还款额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +113,Accounts Receivable Summary,应收账款汇总
+DocType: Loan,Monthly Repayment Amount,每月还款额
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,打开发票
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +196,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +190,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 DocType: GST HSN Code,HSN Code,HSN代码
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution Amount,贡献金额
@@ -1985,7 +1991,8 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用户{0}已分配给医师{1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2696,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1038,Possible Supplier,可能的供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1040,Possible Supplier,可能的供应商
+DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),医疗保健(beta)
@@ -2013,7 +2020,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +655,Manufacturing Quantity is mandatory,生产数量为必须项
-DocType: Employee Loan,Repayment Method,还款方式
+DocType: Loan,Repayment Method,还款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果选中,主页将是网站的默认项目组
 DocType: Quality Inspection Reading,Reading 4,阅读4
 apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,公司开支报销
@@ -2022,7 +2029,7 @@
 DocType: Asset Maintenance Task,Certificate Required,证书要求
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}:从时间和结束时间{1}是具有重叠{2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,库存负债
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Stock Liabilities,库存负债
 DocType: Purchase Invoice,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +403,Select Company,选择公司
@@ -2030,7 +2037,7 @@
 DocType: Student Report Generation Tool,Print Section,打印部分
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用户{0}没有任何默认的POS配置文件。检查此用户的行{1}处的默认值。
 DocType: Student Group,Set 0 for no limit,为不限制设为0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日,无需申请休假。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日,无需申请休假。
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,需要行{idx}:{field}才能创建开票{invoice_type}发票
 DocType: Customer,Primary Address and Contact Detail,主要地址和联系人详情
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
@@ -2041,10 +2048,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,请选择至少一个域名。
 DocType: Dependent Task,Dependent Task,相关任务
 apps/erpnext/erpnext/stock/doctype/item/item.py +444,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +188,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +200,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +243,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1094,Search Item,搜索项目
 DocType: Payment Schedule,Payment Amount,付款金额
@@ -2054,7 +2061,7 @@
 DocType: Assessment Plan,Grading Scale,分级量表
 apps/erpnext/erpnext/stock/doctype/item/item.py +438,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +665,Already completed,已经完成
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,库存在手
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,库存在手
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,导入成功!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
@@ -2065,17 +2072,16 @@
 DocType: Quotation Item,Quotation Item,报价品目
 DocType: Customer,Customer POS Id,客户POS ID
 DocType: Account,Account Name,帐户名称
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,起始日期不能大于结束日期
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +528,From Date cannot be greater than To Date,起始日期不能大于结束日期
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +200,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,请输入Woocommerce服务器网址
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Share Balance,To No,至No
-DocType: Subscription,Reference Document,参考文献
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +229,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
-DocType: Grant Application,Applicant Type,申请人类型
+DocType: Loan,Applicant Type,申请人类型
 DocType: Purchase Invoice,03-Deficiency in services,03-服务不足
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
 DocType: Healthcare Settings,Default Medical Code Standard,默认医疗代码标准
@@ -2086,13 +2092,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}%帐单
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留数量
 DocType: Party Account,Party Account,往来单位科目
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力资源
+apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒绝
 DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
 DocType: BOM Item,BOM Item,BOM品目
 DocType: Appraisal,For Employee,对员工
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,请输入支付
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,请输入支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}:提前对供应商必须扣除
 DocType: Company,Default Values,默认值
 DocType: Membership,INR,INR
@@ -2122,10 +2128,10 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必须大于0
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,现货供应
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,现货供应
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量规划的期限(天)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,采购
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +66,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性领域 - 计划
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性领域 - 计划
 DocType: Special Test Template,Result Component,结果组件
@@ -2146,7 +2152,7 @@
 DocType: Leave Type,Include holidays within leaves as leaves,包括休假期间的节假日
 DocType: Sales Invoice,Packed Items,盒装项目
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,针对序列号提出的保修申请
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +209,'Total',&#39;总&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;总&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -2164,10 +2170,10 @@
 DocType: Selling Settings,Selling Settings,销售设置
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +110,Confirm Action,确认操作
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,网上拍卖
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +100,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,订单履行
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,查看你的购物车
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,市场营销开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Marketing Expenses,市场营销开支
 ,Item Shortage Report,项目短缺报告
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,无法创建标准条件。请重命名标准
 apps/erpnext/erpnext/stock/doctype/item/item.js +311,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,\n请注明“重量计量单位”
@@ -2190,9 +2196,9 @@
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Material Request,Transferred,转入
 DocType: Vehicle,Doors,门
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +116,ERPNext Setup Complete!,ERPNext设置完成!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext设置完成!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登记费
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Purchase Invoice,Tax Breakup,税收分解
 DocType: Packing Slip,PS-,PS-
@@ -2228,11 +2234,12 @@
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表,并使用电子表格应用程序进行打印。
 DocType: Purchase Invoice Item,Batch No,批号
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,员工发展
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 DocType: Student Group Instructor,Student Group Instructor,学生组教练
 DocType: Grant Application,Assessment  Mark (Out of 10),评估标记(满分10分)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手机号码
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
@@ -2241,15 +2248,16 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1149,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +144,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
 DocType: Payment Reconciliation Payment,Allocated amount,已核销金额
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
 DocType: Territory,Territory Name,区域名称
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +204,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +77,You can only have Plans with the same billing cycle in a Subscription,您只能在订阅中拥有相同结算周期的计划
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
@@ -2260,10 +2268,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +261,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/config/hr.py +142,Appraisals,绩效评估
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培训活动
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +207,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,通过铅源追踪潜在客户。
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +168,Please enter ,请输入
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +162,Please enter ,请输入
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,维护日志
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。(根据内容物件的净重自动计算)
@@ -2271,11 +2279,11 @@
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: Student Group,Instructors,教师
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +605,BOM {0} must be submitted,BOM{0}未提交
 apps/erpnext/erpnext/config/accounts.py +460,Share Management,股份管理
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +333,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +810,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +812,Payment,付款
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何科目关联,请在仓库或公司{1}主数据中设置默认库存科目。
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的订单
 DocType: Work Order Operation,Actual Time and Cost,实际时间和成本
@@ -2285,7 +2293,7 @@
 DocType: Student Leave Application,Student Leave Application,学生请假申请
 DocType: Item,Will also apply for variants,会同时应用于变体
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +217,"Asset cannot be cancelled, as it is already {0}",资产不能被取消,因为它已经是{0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +30,Employee {0} on Half day on {1},员工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,用于销售的产品组合。
@@ -2295,7 +2303,7 @@
 DocType: Item,Barcodes,条形码
 DocType: Hub Category,Hub Node,Hub节点
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Work Order {0} must be submitted,必须提交工单{0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2210,New Cart,新的车
@@ -2313,13 +2321,12 @@
 apps/erpnext/erpnext/accounts/party.py +263,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或帐户币种
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分(仅草稿)
 DocType: Soil Texture,Loam,壤土
-apps/erpnext/erpnext/controllers/accounts_controller.py +707,Row {0}: Due Date cannot be before posting date,行{0}:到期日期不能在发布日期之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +711,Row {0}: Due Date cannot be before posting date,行{0}:到期日期不能在发布日期之前
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,创建付款分录
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
 ,Sales Invoice Trends,销售发票趋势
 DocType: Leave Application,Apply / Approve Leaves,申请/审批假期
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,对于
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
@@ -2333,7 +2340,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +181,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生产设置中设置。
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1}行中的项目{0}不能超过{2}。要允许超额结算,请在库存设置中进行设置
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1}行中的项目{0}不能超过{2}。要允许超额结算,请在库存设置中进行设置
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新响应
 apps/erpnext/erpnext/public/js/utils.js +374,You have already selected items from {0} {1},您已经选择从项目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
@@ -2345,12 +2352,13 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,首先选择程序
 DocType: Patient Appointment,Patient Age,患者年龄
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,项目管理
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +224,Serial no {0} has been already returned,序列号{0}已被返回
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +226,Serial no {0} has been already returned,序列号{0}已被返回
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget,Fiscal Year,财政年度
 DocType: Asset Maintenance Log,Planned,计划
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,如果没有在患者中设置隐性应收帐款,请咨询费用。
 DocType: Vehicle Log,Fuel Price,燃油价格
+DocType: Bank Guarantee,Margin Money,保证金
 DocType: Budget,Budget,预算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +65,Set Open,设置打开
 apps/erpnext/erpnext/stock/doctype/item/item.py +258,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
@@ -2364,16 +2372,16 @@
 DocType: Lead,Follow Up,跟进
 DocType: Item,Is Sales Item,可销售?
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,项目群组树
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,物料{0}没有启用序列号管理功能,请进入物料主数据中修改
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,物料{0}没有启用序列号管理功能,请进入物料主数据中修改
 DocType: Maintenance Visit,Maintenance Time,维护时间
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},相同的物品已被多次输入。 {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,这个词开始日期不能超过哪个术语链接学年的开学日期较早(学年{})。请更正日期,然后再试一次。
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +190,There were errors.,有错误发生。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +166,Employee {0} has already applied for {1} between {2} and {3} : ,员工{0}已在{2}和{3}之间申请{1}:
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,有错误发生。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3} : ,员工{0}已在{2}和{3}之间申请{1}:
 DocType: Guardian,Guardian Interests,守护兴趣
 DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +273,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
+apps/erpnext/erpnext/controllers/accounts_controller.py +277,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
 DocType: Education Settings,Instructor Records to be created by,导师记录由
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已创建
 DocType: GST Account,GST Account,GST帐户
@@ -2393,8 +2401,8 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +339,Added to Favourites,已添加到收藏夹
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,No salary slip found to submit for the above selected criteria OR salary slip already submitted,没有发现提交上述选定标准或已提交工资单的工资单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,关税与税项
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +471,No salary slip found to submit for the above selected criteria OR salary slip already submitted,没有发现提交上述选定标准或已提交工资单的工资单
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Duties and Taxes,关税与税项
 DocType: Projects Settings,Projects Settings,项目设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,参考日期请输入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款记录不能由{1}过滤
@@ -2404,27 +2412,28 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,树的项目组。
 DocType: Production Plan,Total Produced Qty,总生产数量
 DocType: Payroll Entry,Get Employee Details,获取员工细节
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 DocType: Asset,Sold,出售
 ,Item-wise Purchase History,逐项采购历史
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额(公司币种)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +928,Raw Materials,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +930,Raw Materials,原料
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
 apps/erpnext/erpnext/setup/doctype/company/company.js +113,Delete all the Transactions for this Company,删除所有交易本公司
 DocType: Patient,O Positive,O积极
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,投资
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Investments,投资
 DocType: Issue,Resolution Details,详细解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,验收标准
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,请输入在上表请求材料
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,没有可用于日记帐分录的还款
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: BOM,Show In Website,在网站上显示
 DocType: Shopping Cart Settings,Show Quantity in Website,显示在网站数量
-DocType: Employee Loan Application,Total Payable Amount,合计应付额
+DocType: Loan Application,Total Payable Amount,合计应付额
 DocType: Task,Expected Time (in hours),预期时间(以小时计)
 DocType: Item Reorder,Check in (group),检查(组)
 DocType: Soil Texture,Silt,淤泥
@@ -2443,7 +2452,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +363,Make Payment,付款
 DocType: Room,Room Name,房间名称
 DocType: Prescription Duration,Prescription Duration,处方时间
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消,因为假平衡已经被搬入转发在未来休假分配记录{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消,因为假平衡已经被搬入转发在未来休假分配记录{1}
 DocType: Activity Cost,Costing Rate,成本率
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,客户的地址和联系方式
 ,Campaign Efficiency,运动效率
@@ -2463,11 +2472,11 @@
 DocType: Chapter,Chapter,章节
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,对
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后,默认帐户将在POS发票中自动更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +970,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
 DocType: Bank Reconciliation Detail,Against Account,针对科目
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +63,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,请在{0}公司中设置默认成本中心。
 DocType: Item,Has Batch No,有批号
@@ -2485,7 +2494,6 @@
 DocType: Task,Actual End Date (via Time Sheet),实际结束日期(通过时间表)
 DocType: Soil Texture,Soil Type,土壤类型
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +387,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,New Message,新消息
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任务
@@ -2505,7 +2513,7 @@
 DocType: Hub Category,Hub Category,中心类别
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,车号
-DocType: Employee Loan,Loan Amount,贷款额度
+DocType: Loan,Loan Amount,贷款额度
 DocType: Student Report Generation Tool,Add Letterhead,添加信头
 DocType: Program Enrollment,Self-Driving Vehicle,自驾车
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供应商记分卡站立
@@ -2534,9 +2542,9 @@
 DocType: Cash Flow Mapper,Position,位置
 DocType: Patient,Patient Details,患者细节
 DocType: Patient,B Positive,B积极
-apps/erpnext/erpnext/controllers/accounts_controller.py +596,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:订购数量必须是1,因为项目是固定资产。请使用单独的行多数量。
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:订购数量必须是1,因为项目是固定资产。请使用单独的行多数量。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +317,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +348,Abbr can not be blank or space,缩写不能为空或空格
 DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
 apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,体育
@@ -2544,8 +2552,9 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,实际总
 DocType: Lab Test UOM,Test UOM,测试UOM
 DocType: Student Siblings,Student Siblings,学生兄弟姐妹
+DocType: Subscription Plan Detail,Subscription Plan Detail,订阅计划详情
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,单位
-apps/erpnext/erpnext/stock/get_item_details.py +138,Please specify Company,请注明公司
+apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Asset Maintenance Task,Maintenance Task,维护任务
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +118,Please set B2C Limit in GST Settings.,请在GST设置中设置B2C限制。
@@ -2560,6 +2569,7 @@
 ,BOM Search,BOM搜索
 DocType: Project,Total Consumed Material Cost  (via Stock Entry),总消耗材料成本(通过股票输入)
 DocType: Hub Settings,Company Registered,公司注册
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +125,To Date cannot be less than From Date,迄今不能少于起始日期
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基于仓库中的库存,在Hub上发布“库存”或“库存”。
 DocType: Vehicle,Fuel Type,燃料类型
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,请公司指定的货币
@@ -2567,17 +2577,18 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中,仓库{3}中品目{2}的库存余额将变为{1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列资料的要求已自动根据项目的重新排序水平的提高
 DocType: Email Digest,Pending Sales Orders,待完成销售订单
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +316,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 DocType: Employee,Create User Permission,创建用户权限
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,项目代码&gt;项目组&gt;品牌
 DocType: Healthcare Settings,Remind Before,提醒之前
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1087,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:参考文件类型必须是销售订单之一,销售发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:参考文件类型必须是销售订单之一,销售发票或日记帐分录
 DocType: Salary Component,Deduction,扣款
 DocType: Item,Retain Sample,保留样品
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}:从时间和时间是强制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金额差异
-apps/erpnext/erpnext/stock/get_item_details.py +356,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +359,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生产中
@@ -2587,8 +2598,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 DocType: Normal Test Template,Normal Test Template,正常测试模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +919,Quotation,报价
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +984,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +922,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +986,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +18,Select an account to print in account currency,选择一个账户以账户货币进行打印
@@ -2596,7 +2607,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关详情,请参阅下面的时间表
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,成本更新
 DocType: Patient,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +133,Item {0} has already been returned,物料{0}已被退回
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +138,Item {0} has already been returned,物料{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供应商记分卡设置
@@ -2607,14 +2618,15 @@
 DocType: Work Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Re-open,重新打开
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +876,Re-open,重新打开
 DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名称
 DocType: Purchase Invoice,02-Post Sale Discount,02-售后折扣
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号,""-"",""#"","".""和""/""除外"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪营销活动。追踪来自营销活动的线索,报价,销售订单等,统计投资回报率。
+DocType: Department Approver,Approver,审批者
 ,SO Qty,销售订单数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +91,The field To Shareholder cannot be blank,“股东”字段不能为空
 DocType: Guardian,Work Address,工作地址
@@ -2628,21 +2640,20 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),总拨款额(公司币种)
 DocType: Purchase Order Item,To be delivered to customer,由供应商直接出货给客户(直接发运)
 DocType: BOM,Scrap Material Cost,废料成本
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 DocType: Grant Application,Email Notification Sent,电子邮件通知已发送
 DocType: Purchase Invoice,In Words (Company Currency),大写金额(公司货币)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1018,"Item Code, warehouse, quantity are required on row",在行上需要项目代码,仓库,数量
-DocType: Pricing Rule,Supplier,供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1020,"Item Code, warehouse, quantity are required on row",在行上需要项目代码,仓库,数量
+DocType: Bank Guarantee,Supplier,供应商
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,显示付款详情
 DocType: Consultation,Consultation Time,咨询时间
 DocType: C-Form,Quarter,季
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,杂项开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +227,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,银行名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +30,-Above,-以上
-DocType: Employee Loan,Employee Loan Account,员工贷款账户
 DocType: Leave Application,Total Leave Days,总休假天数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意:邮件不会发送给已禁用用户
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
@@ -2658,7 +2669,7 @@
 DocType: Vital Signs,Weight (In Kilogram),体重(公斤)
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",保存章节后自动设置章节/章节名称。
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Please set GST Accounts in GST Settings,请在GST设置中设置GST帐户
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +212,Please set GST Accounts in GST Settings,请在GST设置中设置GST帐户
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,业务类型
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额,发票类型和发票号码
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,新的采购成本
@@ -2667,12 +2678,13 @@
 DocType: Grant Application,Grant Description,授予说明
 DocType: Purchase Invoice Item,Rate (Company Currency),单价(公司货币)
 DocType: Student Guardian,Others,他人
+DocType: Subscription,Discounts,折扣
 DocType: Payment Entry,Unallocated Amount,未分配金额
 apps/erpnext/erpnext/templates/includes/product_page.js +91,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 DocType: POS Profile,Taxes and Charges,税项和收费
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",库存中已被购买,销售或保留的一个产品或服务。
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,没有更多的更新
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,这涵盖了与此安装程序相关的所有记分卡
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,银行业
@@ -2681,21 +2693,24 @@
 DocType: Bank Guarantee,Bank Guarantee,银行担保
 DocType: Bank Guarantee,Bank Guarantee,银行担保
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具!”
 DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,年度利润
+DocType: Bank Guarantee,Name of Bank,银行名称
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位:{3}
 DocType: Fee Schedule,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,财务账目的树。
+DocType: Bank Guarantee,Reference Document Type,参考文档类型
 DocType: Cash Flow Mapping,Cash Flow Mapping,现金流量映射
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,序列化库存
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默认联系人中找不到电子邮件
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,生成秘密
-DocType: Employee Loan,Account Info,帐户信息
+DocType: Loan,Account Info,帐户信息
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Fees,Include Payment,包括付款
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}学生组已创建
@@ -2703,24 +2718,24 @@
 DocType: Sales Invoice,Total Billing Amount,总结算金额
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,费用结构和学生组{0}中的课程是不同的。
 DocType: Fee Schedule,Receivable Account,应收账款
-apps/erpnext/erpnext/controllers/accounts_controller.py +618,Row #{0}: Asset {1} is already {2},行#{0}:资产{1}已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +622,Row #{0}: Asset {1} is already {2},行#{0}:资产{1}已经是{2}
 DocType: Quotation Item,Stock Balance,库存余额
 apps/erpnext/erpnext/config/selling.py +321,Sales Order to Payment,销售订单到付款
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,缴纳税款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供应商提供服务
 DocType: Land Unit,Is Container,是容器
 DocType: Crop Cycle,This will be day 1 of the crop cycle,这将是作物周期的第一天
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +871,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +877,Please select correct account,请选择正确的帐户
 DocType: Purchase Invoice Item,Weight UOM,重量计量单位
 apps/erpnext/erpnext/config/accounts.py +466,List of available Shareholders with folio numbers,包含folio号码的可用股东名单
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,显示变体属性
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +50,Show Variant Attributes,显示变体属性
 DocType: Student,Blood Group,血型
 DocType: Course,Course Name,课程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,可以为特定用户批准假期的用户
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,办公设备
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,办公设备
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企业
 DocType: Supplier Scorecard,Scoring Setup,得分设置
@@ -2739,7 +2754,7 @@
 DocType: Stock Entry,Total Incoming Value,总传入值
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To is required,借记是必需的
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间,费用和结算由你的团队做activites
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,采购价格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
 DocType: Job Offer Term,Offer Term,录取通知条款
 DocType: Asset,Quality Manager,质量经理
@@ -2751,13 +2766,14 @@
 apps/erpnext/erpnext/public/js/utils.js +108,Total Unpaid: {0},总未付:{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
 DocType: Supplier Scorecard,Supplier Score,供应商分数
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +225,Total Invoiced Amt,总开票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,总开票金额
 DocType: Supplier,Warn RFQs,警告RFQs
 DocType: BOM,Conversion Rate,兑换率
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,产品搜索
 DocType: Assessment Plan,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授权值)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+DocType: Loan,Total Amount Paid,总金额支付
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,请选择付费学生申请者必须入学的学生
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,请选择一个价目表来发布价格
@@ -2767,19 +2783,18 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,价格表{0}被禁用
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}:已完成的数量不能超过{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允许加班
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新,请使用库存条目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +148,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新,请使用库存条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新,请使用库存条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新,请使用库存条目
 DocType: Training Event Employee,Training Event Employee,培训活动的员工
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1189,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以为批次{1}和项目{2}保留最大样本数量{0}。
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,添加时间插槽
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,物料{1}需要{0}的序列号。您已提供{2}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,{0} Serial Numbers required for Item {1}. You have provided {2}.,物料{1}需要{0}的序列号。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Training Event,Advance,提前
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,再次重复出现。
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless支付网关设置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,兑换收益/损失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Exchange Gain/Loss,兑换收益/损失
 DocType: Opportunity,Lost Reason,丧失原因
-apps/erpnext/erpnext/controllers/accounts_controller.py +265,Row #{0}: Account {1} does not belong to company {2},行#{0}:帐户{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,Row #{0}: Account {1} does not belong to company {2},行#{0}:帐户{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},无法找到DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
@@ -2798,7 +2813,6 @@
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如:次日发货
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列号{0}未找到
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +291,Subscription has been {0},订阅已经{0}
 DocType: Fee Schedule Program,Fee Schedule Program,费用计划计划
 DocType: Fee Schedule Program,Student Batch,学生批
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使学生
@@ -2814,14 +2828,13 @@
 DocType: Purchase Invoice,E-commerce GSTIN,电子商务GSTIN
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,银行结算摘要
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",创建和管理每日,每周和每月的电子邮件摘要。
+apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",创建和管理每日,每周和每月的电子邮件摘要。
 DocType: Appraisal Goal,Appraisal Goal,评估目标
 apps/erpnext/erpnext/public/js/hub/hub_form.js +420,Suggest Category?,建议分类?
 DocType: Stock Reconciliation Item,Current Amount,电流量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +58,Buildings,房屋
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,房屋
 DocType: Fee Schedule,Fee Structure,费用结构
 DocType: Timesheet Detail,Costing Amount,成本核算金额
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Student Admission Program,Application Fee,报名费
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +52,Submit Salary Slip,提交工资单
 apps/erpnext/erpnext/controllers/selling_controller.py +137,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
@@ -2829,12 +2842,13 @@
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,农业分析标准
+DocType: HR Settings,Leave Approval Notification Template,留下批准通知模板
 DocType: POS Profile,[Select],[选择]
 DocType: Vital Signs,Blood Pressure (diastolic),血压(舒张)
 DocType: SMS Log,Sent To,发给
 DocType: Agriculture Task,Holiday Management,度假管理
 DocType: Payment Request,Make Sales Invoice,创建销售发票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,软件
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,软件
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +112,Physician {0} not available on {1},{1}医生{0}不可用
@@ -2852,7 +2866,7 @@
 DocType: Employee,New Workplace,新建工作地点
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +330,Material Consumption,材料消耗
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,设置为关闭
-apps/erpnext/erpnext/stock/get_item_details.py +127,No Item with Barcode {0},没有条码为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +130,No Item with Barcode {0},没有条码为{0}的品目
 DocType: Normal Test Items,Require Result Value,需要结果值
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,物料清单
@@ -2867,19 +2881,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +1,Recurring,经常性
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,现金流量映射模板细节
+apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,贷款管理
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,项目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +473,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +849,Transfer Material,转印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +475,Show Salary Slip,显示工资单
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +851,Transfer Material,转印材料
 DocType: Fees,Send Payment Request,发送付款请求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程,操作成本及向流程指定唯一的流程编号
 DocType: Water Analysis,Origin,起源
 apps/erpnext/erpnext/controllers/status_updater.py +204,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制,通过{0} {1}项{4}。你在做另一个{3}对同一{2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1155,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1153,Please set recurring after saving,请设置保存后复发
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +769,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
@@ -2894,14 +2908,15 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,是所得税责任
 DocType: Grading Scale Interval,Grade Description,等级说明
 DocType: Stock Entry,Purchase Receipt No,购买收据号码
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,保证金
 DocType: Sales Invoice, Shipping Bill Number,运费清单号码
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,可追溯性
 DocType: Asset Maintenance Log,Actions performed,已执行的操作
 DocType: Cash Flow Mapper,Section Leader,科长
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),资金来源(负债)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Source of Funds (Liabilities),资金来源(负债)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +473,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Supplier Scorecard Scoring Standing,Employee,雇员
+DocType: Bank Guarantee,Fixed Deposit Number,定期存款编号
 DocType: Asset Repair,Failure Date,失败日期
 DocType: Sample Collection,Collected Time,收集时间
 DocType: Company,Sales Monthly History,销售月历
@@ -2918,10 +2933,11 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +233,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,获取订阅更新
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帐户{0}与帐户模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +480,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,课程:
@@ -2931,7 +2947,7 @@
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工作订单
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,医药
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Pharmaceutical,医药
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
 DocType: Purchase Invoice,Credit To,入贷
@@ -2949,7 +2965,7 @@
 DocType: Request for Quotation Supplier,No Quote,没有报价
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +909,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +911,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +27,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,补假
 DocType: Job Offer,Accepted,已接受
@@ -2961,7 +2977,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,搜索结果
 DocType: Room,Room Number,房间号
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Invalid reference {0} {1},无效的参考{0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},无效的参考{0} {1}
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 DocType: Journal Entry Account,Payroll Entry,工资项目
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,查看费用记录
@@ -2971,7 +2987,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含由供应商交货(直接发运)项目。
 DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
 DocType: Item Variant Settings,Allow Rename Attribute Value,允许重命名属性值
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +491,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +497,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM,你不能更改其税率
 DocType: Restaurant,Invoice Series Prefix,发票系列前缀
 DocType: Employee,Previous Work Experience,以前的工作经验
@@ -2979,8 +2995,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google地图集成未启用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}未提交
+DocType: Subscription,Trialling,试用
 DocType: Member,Membership Expiry Date,会员到期日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,{0} must be negative in return document,{0}在返回文档中必须为负
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,{0} must be negative in return document,{0}在返回文档中必须为负
 ,Minutes to First Response for Issues,分钟的问题第一个反应
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,该机构的名称要为其建立这个系统。
@@ -2999,7 +3016,7 @@
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1026,Opportunity,机会
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1028,Opportunity,机会
 DocType: Operation,Default Workstation,默认工作台
 DocType: Notification Control,Expense Claim Approved Message,报销批准消息
 DocType: Payment Entry,Deductions or Loss,扣除或损失
@@ -3037,7 +3054,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
 DocType: Campaign,Campaign-.####,活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +798,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
 DocType: Membership,USD,美元
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,创建发票
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,Remaining Balance,保持平衡
@@ -3047,7 +3064,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,结束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅%
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Driver,Driver,司机
 DocType: Vital Signs,Nutrition Values,营养价值观
 DocType: Lab Test Template,Is billable,是可计费的
@@ -3058,7 +3075,7 @@
 DocType: Task,Actual Start Date (via Time Sheet),实际开始日期(通过时间表)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +43,Ageing Range 1,账龄范围1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Total advance amount cannot be greater than total claimed amount,总预付金额不能超过索赔总额
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +218,Total advance amount cannot be greater than total claimed amount,总预付金额不能超过索赔总额
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3105,7 +3122,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +391,Select Attribute Values,选择属性值
 DocType: Purchase Invoice,Reason For Issuing document,签发文件的原因
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,库存记录{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +545,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,接着联系到不能相同铅邮箱地址
 DocType: Tax Rule,Billing City,结算城市
@@ -3122,7 +3139,8 @@
 DocType: Warranty Claim,Service Address,服务地址
 DocType: Asset Maintenance Task,Calibration,校准
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +97,{0} is a company holiday,{0}是公司假期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,家具及固定装置
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,离开状态通知
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,家具及固定装置
 DocType: Item,Manufacture,生产
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,安装公司
 ,Lab Test Report,实验室测试报告
@@ -3138,7 +3156,6 @@
 DocType: Crop,Planting Area,种植面积
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计(数量)
 DocType: Installation Note Item,Installed Qty,已安装数量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,这可能是因为一些无效的电子邮件地址
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,你加了
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,培训结果
@@ -3148,16 +3165,17 @@
 DocType: Products Settings,Products per Page,每页产品
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +313, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +317, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,基础设施费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +252,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行#{0}:日记条目{1}没有帐户{2}或已经对另一凭证匹配
 DocType: Supplier Scorecard Criteria,Criteria Weight,标准重量
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,留下批准通知
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 DocType: Payroll Entry,Salary Slip Based on Timesheet,基于时间表工资单
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,购买率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,购买率
 DocType: Notification Control,Sales Order Message,销售订单信息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司,货币,当前财政年度等的默认值
 DocType: Payment Entry,Payment Type,付款类型
@@ -3180,6 +3198,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,购物车设置
 DocType: Journal Entry,Accounting Entries,会计分录
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选定的定价规则是针对“费率”制定的,则会覆盖价目表。定价规则费率是最终费率,因此不应再应用更多折扣。因此,在诸如销售订单,采购订单等交易中,它将在&#39;费率&#39;字段中取代,而不是在&#39;价格列表率&#39;字段中取出。
+DocType: Journal Entry,Paid Loan,付费贷款
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重复的条目,请检查授权规则{0}
 DocType: Journal Entry Account,Reference Due Date,参考到期日
 DocType: Purchase Order,Ref SQ,参考SQ
@@ -3196,7 +3215,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成,请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率,行{3}也必须包括
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率,行{3}也必须包括
 DocType: Patient Service Unit,Parent Service Unit,家长服务单位
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,使用户
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的标志(用于打印)
@@ -3215,7 +3234,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +825,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +840,Delivery,交货
 DocType: Volunteer,Weekdays,平日
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: Restaurant Menu,Restaurant Menu,餐厅菜单
@@ -3223,7 +3242,7 @@
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤,评估和费用
 DocType: Payment Entry,Total Allocated Amount,总拨款额
-apps/erpnext/erpnext/setup/doctype/company/company.py +151,Set default inventory account for perpetual inventory,设置永续库存模式下的默认库存科目
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Set default inventory account for perpetual inventory,设置永续库存模式下的默认库存科目
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,发送格兰特回顾邮件
 apps/erpnext/erpnext/accounts/page/pos/pos.js +848,"LocalStorage is full, did not save",localStorage的是满的,没救
@@ -3231,10 +3250,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,房间容量
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},已有记录存在项目{0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,参考
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您将失去先前生成的发票记录。您确定要重新启用此订阅吗?
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,注册费用
 DocType: Budget,Cost Center,成本中心
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +46,Voucher #,凭证 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,凭证 #
 DocType: Notification Control,Purchase Order Message,采购订单的消息
 DocType: Tax Rule,Shipping Country,航运国家
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,从销售交易隐藏客户的税号
@@ -3243,20 +3263,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比,基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,营销和销售主管
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Head of Marketing and Sales,营销和销售主管
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,所得税
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,去信头
+DocType: Subscription,Cancel At End Of Period,在期末取消
 DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1256,Please enter Item Code to get batch no,请输入产品编号,以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +880,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +419,No Items selected for transfer,没有选择转移项目
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1254,Please enter Item Code to get batch no,请输入产品编号,以获得批号
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +418,No Items selected for transfer,没有选择转移项目
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的,如果以下属性中均有记载相同。是集团,根型,公司
 DocType: Vehicle,Electric,电动
 DocType: Task,% Progress,%进展
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,在资产处置收益/损失
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Gain/Loss on Asset Disposal,在资产处置收益/损失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中将只选择状态为“已批准”的学生申请人。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帐户{0}的帐户号码不可用。 <br>请正确设置您的会计科目表。
 DocType: Task,Depends on Tasks,取决于任务
@@ -3271,6 +3292,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +22,Not in Stock,断货
 DocType: Volunteer,Volunteer Skills,志愿者技能
 DocType: Appraisal,HR User,HR用户
+DocType: Bank Guarantee,Reference Document Name,参考文件名称
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
 apps/erpnext/erpnext/hooks.py +142,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
@@ -3284,7 +3306,8 @@
 apps/erpnext/erpnext/accounts/party.py +388,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +201,Extra Large,特大号
+DocType: Loan,Loan Application,申请贷款
 DocType: Crop,Scientific Name,科学名称
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,总休假
 DocType: Customer,"Reselect, if the chosen contact is edited after save",重新选择,如果所选联系人在保存后被编辑
@@ -3293,13 +3316,13 @@
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总贷方金额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告:针对库存记录{2}存在另一个{0}#{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +548,Warning: Another {0} # {1} exists against stock entry {2},警告:针对库存记录{2}存在另一个{0}#{1}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款(资产)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,大
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Large,大
 DocType: Homepage Featured Product,Homepage Featured Product,首页推荐产品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +248,All Assessment Groups,所有评估组
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +249,All Assessment Groups,所有评估组
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
 apps/erpnext/erpnext/accounts/report/financial_statements.py +259,Total {0} ({1}),总{0}({1})
 DocType: C-Form Invoice Detail,Territory,区域
@@ -3320,9 +3343,10 @@
 DocType: Fees,Fees,费用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,报价{0}已被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +126,Total Outstanding Amount,总待处理金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,总待处理金额
 DocType: Sales Partner,Targets,目标
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,请在公司信息文件中注册SIREN号码
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Price List,Price List Master,价格表大师
 DocType: GST Account,CESS Account,CESS帐户
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**,方便你设置和监控目标。
@@ -3331,6 +3355,7 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,选择患者
 DocType: Price List,Applicable for Countries,适用于国家
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,参数名称
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +42,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”,就可以提交
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
 DocType: Homepage,Products to be shown on website homepage,在网站首页中显示的产品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具,在一个小的组织管理大多数进程。有关Web注释,或购买托管楝更多信息,请访问
@@ -3364,14 +3389,14 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,发票已在所有结算时间创建
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},名称错误:{0}
 DocType: Cash Flow Mapping,Is Finance Cost,财务成本
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包(用于打印)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,请在“餐厅设置”中设置默认客户
 ,Salary Register,薪酬注册
 DocType: Warehouse,Parent Warehouse,家长仓库
-DocType: C-Form Invoice Detail,Net Total,总净
+DocType: Subscription,Net Total,总净
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +570,Default BOM not found for Item {0} and Project {1},项目{0}和项目{1}找不到默认BOM
-apps/erpnext/erpnext/config/hr.py +168,Define various loan types,定义不同的贷款类型
+apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,定义不同的贷款类型
 DocType: Bin,FCFS Rate,FCFS率
 DocType: Opening Invoice Creation Tool Item,Outstanding Amount,未付金额
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),时间(分钟)
@@ -3403,11 +3428,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root Account must be a group,根帐户必须是一组
 DocType: Drug Prescription,Drug Prescription,药物处方
 DocType: Fees,FEE.,费用。
-DocType: Employee Loan,Repaid/Closed,偿还/关闭
+DocType: Loan,Repaid/Closed,偿还/关闭
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
 apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0},找不到估值。如果该项目在{1}中作为零估值率项目进行交易,请在{1}项目表中提及。否则,请在项目记录中创建货物的进货库存交易或提交估值费率,然后尝试提交/取消此条目
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Course,Course Code,课程代码
 apps/erpnext/erpnext/controllers/stock_controller.py +337,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: POS Settings,Use POS in Offline Mode,在离线模式下使用POS
@@ -3427,16 +3451,15 @@
 DocType: Purchase Invoice,Deemed Export,被视为出口
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
-DocType: Subscription,Half-yearly,半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,库存的会计分录
 DocType: Lab Test,LabTest Approver,LabTest审批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
 DocType: Vehicle Service,Engine Oil,机油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1006,Work Orders Created: {0},创建的工单:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},创建的工单:{0}
 DocType: Sales Invoice,Sales Team1,销售团队1
 apps/erpnext/erpnext/stock/doctype/item/item.py +547,Item {0} does not exist,物料{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
-DocType: Employee Loan,Loan Details,贷款详情
+DocType: Loan,Loan Details,贷款详情
 DocType: Company,Default Inventory Account,默认存货科目
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +192,The folio numbers are not matching,作品集编号不匹配
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}:已完成数量必须大于零。
@@ -3448,19 +3471,19 @@
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,与作物生长的所有土地单位的链接
 DocType: Account,Root Type,根类型
 DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:无法返回超过{1}项{2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +141,Row # {0}: Cannot return more than {1} for Item {2},行#{0}:无法返回超过{1}项{2}
 DocType: Item Group,Show this slideshow at the top of the page,在页面顶部显示此幻灯片
 DocType: BOM,Item UOM,项目计量单位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后,优惠金额(公司货币)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Cheque Print Template,Primary Settings,主要设置
 DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +407,Add Employees,添加员工
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +409,Add Employees,添加员工
 DocType: Purchase Invoice Item,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,超小
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Extra Small,超小
 DocType: Company,Standard Template,标准模板
 DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +806,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +808,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的,带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
@@ -3480,11 +3503,10 @@
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Antibiotic,Healthcare Administrator,医疗管理员
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,设定目标
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
 DocType: Dosage Strength,Dosage Strength,剂量强度
 DocType: Account,Expense Account,开支帐户
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,软件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +204,Colour,颜色
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,评估计划标准
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Expiry date is mandatory for selected item,有效期限对所选项目是强制性的
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止采购订单
@@ -3497,18 +3519,18 @@
 DocType: Patient,Personal and Social History,个人和社会史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用户{0}已创建
 DocType: Fee Schedule,Fee Breakup for each student,每名学生的费用分手
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前({0})对二阶{1}不能大于总计({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前({0})对二阶{1}不能大于总计({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配,请选择“月度分布”。
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,更改代码
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,柴油机
-apps/erpnext/erpnext/stock/get_item_details.py +388,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +391,Price List Currency not selected,价格表货币没有选择
 DocType: Purchase Invoice,Availed ITC Cess,采用ITC Cess
 ,Student Monthly Attendance Sheet,学生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,运费规则仅适用于销售
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,项目开始日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Until,直到
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
@@ -3529,7 +3551,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所购买或出售的产品或服务。
 DocType: Water Analysis,Storage Temperature,储存温度
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,研究员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +138,Researcher,研究员
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,计划注册学生工具
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},开始日期应该小于任务{0}的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或电子邮件是强制性
@@ -3542,7 +3564,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡,并且谨慎地向该供应商发出询价。
 DocType: Chapter,Non Profit Manager,非营利经理
 DocType: BOM,Total Cost(Company Currency),总成本(公司货币)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +321,Serial No {0} created,序列号{0}已创建
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +330,Serial No {0} created,序列号{0}已创建
 DocType: Homepage,Company Description for website homepage,公司介绍了网站的首页
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户,这些代码可以在打印格式(如发票和送货单)中使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,供应商名称
@@ -3552,11 +3574,10 @@
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Healthcare Settings,Result Printed,结果打印
 DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +233,Probationary Period,试用期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},查看{0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Probationary Period,试用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Project,Total Costing Amount (via Timesheets),总成本金额(通过时间表)
-DocType: Employee Advance,Expense Approver,开支审批人
+DocType: Department,Expense Approver,开支审批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}:提前对客户必须是信用
 DocType: Project,Hourly,每小时
 apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,非集团集团
@@ -3566,7 +3587,7 @@
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
 apps/erpnext/erpnext/config/selling.py +302,Logs for maintaining sms delivery status,日志维护短信发送状态
 DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +235,Printed On,印上
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,印上
 DocType: Item,Inspection Required before Delivery,分发前所需检查
 DocType: Item,Inspection Required before Purchase,付款前所需检查
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
@@ -3576,7 +3597,7 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,最小起订量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的组织
 DocType: Fee Component,Fees Category,费用类别
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Please enter relieving date.,请输入解除日期。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
 DocType: Supplier Scorecard,Notify Employee,通知员工
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
@@ -3586,7 +3607,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Reorder Level,重新排序级别
 DocType: Company,Chart Of Accounts Template,图表帐户模板
 DocType: Attendance,Attendance Date,考勤日期
-apps/erpnext/erpnext/stock/get_item_details.py +352,Item Price updated for {0} in Price List {1},项目价格更新{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +355,Item Price updated for {0} in Price List {1},项目价格更新{0}价格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
 DocType: Purchase Invoice Item,Accepted Warehouse,已接收的仓库
@@ -3594,10 +3615,11 @@
 DocType: Item,Valuation Method,估值方法
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,马克半天
 DocType: Sales Invoice,Sales Team,销售团队
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +87,Duplicate entry,重复的条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重复的条目
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,在提交之前输入受益人的姓名。
 DocType: Program Enrollment Tool,Get Students,让学生
 DocType: Serial No,Under Warranty,在保修期内
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +516,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,请选择完成修复的完成日期
@@ -3616,7 +3638,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,留作分包合同
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
 DocType: Shopping Cart Settings,Orders,订单
-DocType: Employee Leave Approver,Leave Approver,假期审批人
+DocType: Department,Leave Approver,假期审批人
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +314,Please select a batch,请选择一个批次
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,评估小组名称
@@ -3661,7 +3683,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub跟踪物品
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,收件人原件
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,此电子邮件是自动生成的
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Program Enrollment,Boarding Student,寄宿学生
 DocType: Asset,Expected Value After Useful Life,期望值使用寿命结束后
@@ -3686,21 +3707,21 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},参考# {0}记载日期为{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
-DocType: Member,Member,会员
+DocType: Loan,Member,会员
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
 DocType: Work Order Item,Work Order Item,工作订单项目
 DocType: Pricing Rule,Item Code,项目编号
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,为基于活动的组手动选择学生
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
 DocType: Agriculture Analysis Criteria,Agriculture Manager,农业经理
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +966,Paid Amount cannot be greater than total negative outstanding amount {0},支付金额不能大于总未付金额{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},支付金额不能大于总未付金额{0}
 DocType: Supplier Scorecard Period,Variables,变量
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +238,Serial No {0} not in stock,序列号{0}无库存
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +245,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
 DocType: Sales Invoice,Write Off Outstanding Amount,注销未付金额
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},帐户{0}与公司{1}不符
@@ -3708,7 +3729,6 @@
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Asset,Number of Depreciations Booked,预订折旧数
 apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,数量总计
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},对员工贷款:{0}
 DocType: Landed Cost Item,Receipt Document,收到文件
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,详细参考信息
@@ -3719,7 +3739,7 @@
 DocType: Asset,Double Declining Balance,双倍余额递减
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
 DocType: Student Guardian,Father,父亲
-apps/erpnext/erpnext/controllers/accounts_controller.py +627,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
+apps/erpnext/erpnext/controllers/accounts_controller.py +631,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 DocType: Attendance,On Leave,休假
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
@@ -3733,10 +3753,10 @@
 DocType: Lead,Lower Income,较低收益
 DocType: Restaurant Order Entry,Current Order,当前订单
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户,因为此库存盘点在期初进行
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户,因为此库存盘点在期初进行
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,转到程序
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +205,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#分配的金额{1}不能大于无人认领的金额{2}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +211,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}#分配的金额{1}不能大于无人认领的金额{2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
@@ -3759,7 +3779,6 @@
 DocType: Payment Terms Template,Payment Terms,付款条件
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,Productions Orders cannot be raised for:,制作订单不能上调:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分钟
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 DocType: Chapter,Meetup Embed HTML,Meetup嵌入HTML
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供应商
@@ -3779,30 +3798,32 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,%已交付
-apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,请设置学生的电子邮件ID以发送付款请求
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,请设置学生的电子邮件ID以发送付款请求
 DocType: Patient,Medical History,医学史
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,银行透支账户
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Bank Overdraft Account,银行透支账户
 DocType: Patient,Patient ID,病人ID
 DocType: Physician Schedule,Schedule Name,计划名称
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,创建工资单
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +840,Add All Suppliers,添加所有供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +842,Add All Suppliers,添加所有供应商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +94,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行#{0}:已分配金额不能大于未付金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,浏览BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,抵押贷款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Secured Loans,抵押贷款
 DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},请设置在资产类别{0}或公司折旧相关帐户{1}
 DocType: Lab Test Groups,Normal Range,普通范围
 DocType: Academic Term,Academic Year,学年
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,可用销售
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,期初余额权益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Opening Balance Equity,期初余额权益
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,ñ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩余
 DocType: Appraisal,Appraisal,绩效评估
+DocType: Loan,Loan Account,贷款帐户
 DocType: Purchase Invoice,GST Details,消费税细节
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},电子邮件发送到供应商{0}
 DocType: Item,Default Sales Unit of Measure,默认销售单位
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Academic Year: ,学年:
+DocType: Subscription,Past Due Date,过去的截止日期
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},不允许为项目{0}设置替代项目
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重复
@@ -3815,7 +3836,7 @@
 DocType: Patient Appointment,Patient Appointment,患者预约
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,从该电子邮件摘要退订
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +830,Get Suppliers By,获得供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +832,Get Suppliers By,获得供应商
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},找不到项目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去课程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中显示包含税
@@ -3823,10 +3844,11 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,帐户与子节点不能被设置为分类帐
 DocType: C-Form,II,二
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价目表货币转换成客户的基础货币后的单价
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额(公司货币)
 DocType: Physician,Physician Schedules,医师时间表
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +215,Total advance amount cannot be greater than total sanctioned amount,总预付金额不得超过全部认可金额
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +221,Total advance amount cannot be greater than total sanctioned amount,总预付金额不得超过全部认可金额
 DocType: Salary Slip,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,项目命名方式
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
@@ -3844,6 +3866,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: BOM,Inspection Required,需要检验
 DocType: Purchase Invoice Item,PR Detail,PR详细
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,在提交之前输入银行保证号码。
 DocType: Driving License Category,Class,类
 DocType: Sales Order,Fully Billed,完全开票
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +426,Work Order cannot be raised against a Item Template,工作订单不能针对项目模板产生
@@ -3854,7 +3877,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量,通常是净重+包装材料的重量。 (用于打印)
 DocType: Assessment Plan,Program,程序
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 DocType: Serial No,Is Cancelled,是否注销
 DocType: Student Group,Group Based On,基于组
 DocType: Student Group,Group Based On,基于组
@@ -3866,9 +3888,10 @@
 DocType: Cheque Print Template,Cheque Height,支票高度
 DocType: Supplier,Supplier Details,供应商详情
 DocType: Setup Progress,Setup Progress,设置进度
+DocType: Expense Claim,Approval Status,审批状态
 DocType: Hub Settings,Publish Items to Hub,发布项目到集线器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}的起始值必须更小
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,Wire Transfer,电汇
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,全面检查
 ,Issued Items Against Work Order,针对工单发布物品
 DocType: Vehicle Log,Invoice Ref,发票编号
@@ -3899,12 +3922,11 @@
 DocType: Customs Tariff Number,Tariff Number,税则号
 DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP仓库可用的数量
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,预计
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
 apps/erpnext/erpnext/controllers/status_updater.py +177,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意:系统将不会为品目{0}检查超额发货或超额预订,因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
-DocType: Employee Loan,Employee Loan Application,职工贷款申请
 DocType: Issue,Opening Date,开幕日期
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +86,Please save the patient first,请先保存患者
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,请先保存患者
 apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,出席已成功标记。
 DocType: Program Enrollment,Public Transport,公共交通
 DocType: Soil Texture,Silt Composition (%),粉尘成分(%)
@@ -3923,7 +3945,7 @@
 ,Item Balance (Simple),物品余额(简单)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
 DocType: POS Profile,Write Off Account,核销帐户
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Debit Note Amt,借方票据
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,借方票据
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限(天数)
@@ -3946,6 +3968,7 @@
 DocType: Production Plan Sales Order,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 DocType: Assessment Plan,Assessment Plan,评估计划
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Reverse Journal Entry,反向日记帐分录
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客户{0}已创建。
 DocType: Stock Settings,Limit Percent,限制百分比
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前没有任何仓库可用的库存
@@ -3959,14 +3982,15 @@
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Payment Entry,Payment References,付款参考
 DocType: C-Form,C-FORM-,C-形式 -
+DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",间隔字段的间隔数,例如,如果间隔为&#39;天数&#39;并且计费间隔计数为3,则会每3天生成一次发票
 DocType: Vehicle,Insurance Details,保险详情
 DocType: Account,Payable,支付
 DocType: Share Balance,Share Type,分享类型
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,请输入还款期
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,请输入还款期
 apps/erpnext/erpnext/shopping_cart/cart.py +378,Debtors ({0}),债务人({0})
 DocType: Pricing Rule,Margin,利润
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,毛利%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,毛利%
 DocType: Appraisal Goal,Weightage (%),权重(%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,更改POS配置文件
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
@@ -3976,10 +4000,11 @@
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +113,Party is mandatory,请输入往来单位
 DocType: Journal Entry,JV-,将N-
-apps/erpnext/erpnext/controllers/accounts_controller.py +714,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重复到期日的行:{list}
+apps/erpnext/erpnext/controllers/accounts_controller.py +718,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重复到期日的行:{list}
 DocType: Topic,Topic Name,主题名称
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +241,Please set default template for Leave Approval Notification in HR Settings.,请在人力资源设置中为离职审批通知设置默认模板。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +290,Select an employee to get the employee advance.,选择一名员工以推进员工。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,选择一名员工以推进员工。
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,请选择一个有效的日期
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,选择您的业务的性质。
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -3998,7 +4023,7 @@
 DocType: Asset Movement,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +606,Row #{0}: Asset {1} does not belong to company {2},行#{0}:资产{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +610,Row #{0}: Asset {1} does not belong to company {2},行#{0}:资产{1}不属于公司{2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,已创建销售发票{0}
 DocType: Employee,Confirmation Date,确认日期
 DocType: C-Form,Total Invoiced Amount,发票总金额
@@ -4007,7 +4032,7 @@
 DocType: Account,Accumulated Depreciation,累计折旧
 DocType: Supplier Scorecard Scoring Standing,Standing Name,常务名称
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
-DocType: Employee Loan Application,Required by Date,按日期必填
+DocType: Loan Application,Required by Date,按日期必填
 DocType: Lead,Lead Owner,线索所有者
 DocType: Production Plan,Sales Orders Detail,销售订单明细
 DocType: Bin,Requested Quantity,要求的数量
@@ -4020,10 +4045,11 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +29,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,工资单编号
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,多种变体
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}%交付
+DocType: Subscription,Trial Period Start Date,试用期开始日期
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}:有序数量{1}不能低于最低订货量{2}(项中定义)。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +62,Please login as another user.,请以其他用户身份登录。
@@ -4044,12 +4070,11 @@
 DocType: Student Guardian,Student Guardian,学生家长
 DocType: Member,Member Name,成员名字
 DocType: Stock Settings,Use Naming Series,使用命名系列
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,在订阅
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的(总)净重值。请确保每个品目的净重使用同一个计量单位。
 DocType: Membership,Payment Details,付款详情
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM税率
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +225,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作订单不能取消,先取消停止
 DocType: Asset,Journal Entry for Scrap,日记帐分录报废
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,请送货单拉项目
@@ -4069,6 +4094,7 @@
 DocType: Land Unit,Land Unit,土地单位
 ,Purchase Analytics,购买Analytics(分析)
 DocType: Sales Invoice Item,Delivery Note Item,送货单品目
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,当前发票{0}缺失
 DocType: Asset Maintenance Log,Task,任务
 DocType: Purchase Taxes and Charges,Reference Row #,参考行#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},物料{0}必须指定批次号
@@ -4081,7 +4107,7 @@
 DocType: Company,Exchange Gain / Loss Account,兑换收益/损失帐户
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +105,Purpose must be one of {0},目的必须是一个{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Fill the form and save it,填写表格并保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,填写表格并保存
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,实际库存数量
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,实际库存数量
@@ -4096,7 +4122,7 @@
 DocType: Lab Test Template,Standard Selling Rate,标准销售率
 DocType: Account,Rate at which this tax is applied,应用此税率的单价
 DocType: Cash Flow Mapper,Section Name,部分名称
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +77,Reorder Qty,再订购数量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,再订购数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,当前职位空缺
 DocType: Company,Stock Adjustment Account,库存调整账户
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,抹杀
@@ -4107,9 +4133,9 @@
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +60,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注:请不要创建帐户的客户和供应商
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Water Analysis,Appearance,出现
+DocType: HR Settings,Leave Status Notification Template,离开状态通知模板
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均。买价格表价格
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,会员信息。
@@ -4132,7 +4158,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,不允许。请禁用测试模板
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 %
 DocType: Crop Cycle,Linked Land Unit,相关的土地单位
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,在选择往来单位之前请先选择记帐日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +586,Please select Posting Date before selecting Party,在选择往来单位之前请先选择记帐日期
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
@@ -4148,7 +4174,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,转到用户
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,Note: There is not enough leave balance for Leave Type {0},注意:假期类型{0}的余量不足
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Note: There is not enough leave balance for Leave Type {0},注意:假期类型{0}的余量不足
 apps/erpnext/erpnext/regional/india/utils.py +16,Invalid GSTIN or Enter NA for Unregistered,无效的GSTIN或输入NA未注册
 DocType: Training Event,Seminar,研讨会
 DocType: Program Enrollment Fee,Program Enrollment Fee,计划注册费
@@ -4164,14 +4190,14 @@
 DocType: Hub Settings,Publish Availability,发布房源
 DocType: Company,Create Chart Of Accounts Based On,创建图表的帐户根据
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,无法将其转换为非组。子任务存在。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date of Birth cannot be greater than today.,出生日期不能大于今天。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},学生{0}存在针对学生申请{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四舍五入调整(公司货币)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,时间表
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,批量:
 DocType: Volunteer,Afternoon,下午
-apps/erpnext/erpnext/controllers/accounts_controller.py +258,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Cheque Print Template,Scanned Cheque,支票扫描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
@@ -4187,7 +4213,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Project {0} already exists,项目{0}已经存在
 DocType: Medical Department,Nursing User,护理用户
 DocType: Plant Analysis,Plant Analysis Criterias,植物分析标准
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Responsibilities,职责
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +236,Serial No {0} does not belong to Batch {1},序列号{0}不属于批次{1}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +240,Responsibilities,职责
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此报价的有效期已经结束。
 DocType: Expense Claim Account,Expense Claim Account,报销账户
 DocType: Accounts Settings,Allow Stale Exchange Rates,允许陈旧的汇率
@@ -4209,11 +4236,11 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +372,Make Variants,变种
 DocType: Item,Default BOM,默认的BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),总开票金额(通过销售发票)
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +125,Debit Note Amount,借方票据金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,借方票据金额
 DocType: Project Update,Not Updated,未更新
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +106,"There are inconsistencies between the rate, no of shares and the amount calculated",费率,股份数量和计算的金额之间不一致
 apps/erpnext/erpnext/setup/doctype/company/company.js +89,Please re-type company name to confirm,请确认重新输入公司名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +228,Total Outstanding Amt,总待处理金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,总待处理金额
 DocType: Journal Entry,Printing Settings,打印设置
 DocType: Employee Advance,Advance Account,预付帐户
 DocType: Job Offer,Job Offer Terms,招聘条款
@@ -4222,7 +4249,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽车
 DocType: Vehicle,Insurance Company,保险公司
 DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +424,Variable,变量
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +426,Variable,变量
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
 DocType: Chapter,Members,会员
 DocType: Student,Student Email Address,学生的电子邮件地址
@@ -4246,7 +4273,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,实习生
 DocType: Delivery Stop,Address Name,地址名称
 DocType: Stock Entry,From BOM,从BOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +639,Splitting {0} units of {1},拆分{1}个{0}个单位
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +641,Splitting {0} units of {1},拆分{1}个{0}个单位
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
@@ -4254,25 +4281,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果输入参考日期,参考编号是强制输入的
 DocType: Bank Reconciliation Detail,Payment Document,付款单据
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,评估标准公式时出错
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
+DocType: Subscription,Plans,计划
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +853,Issue Material,发料
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,创建循环时出现错误
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +855,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,录取日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
 apps/erpnext/erpnext/accounts/page/pos/pos.js +735,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载,直到你有网络。
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,没有学生团体创建的。
 DocType: Purchase Invoice Item,Serial No,序列号
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请输入您的详细维护性第一
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行#{0}:预计交货日期不能在采购订单日期之前
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Sales Invoice,Customer PO Details,客户PO详细信息
-DocType: Subscription,Next Schedule Date,下一个附表日期
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,临时开户
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1964,Enter value must be positive,输入值必须为正
@@ -4301,11 +4327,11 @@
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +89,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,没有雇员提到的标准
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +955,No Items with Bill of Materials to Manufacture,不与物料清单的项目,以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,不与物料清单的项目,以制造
 DocType: Hotel Settings,Default Customer,默认客户
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要确认是否在同一天创建约会
@@ -4330,16 +4356,16 @@
 DocType: Journal Entry Account,Employee Advance,员工晋升
 DocType: Payroll Entry,Payroll Frequency,工资频率
 DocType: Lab Test Template,Sensitivity,灵敏度
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Raw Material,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,植物和机械设备
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,植物和机械设备
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
 apps/erpnext/erpnext/controllers/buying_controller.py +463,Please enter Reqd by Date,请输入按日期请求
 DocType: Payment Entry,Internal Transfer,内部转账
 DocType: Asset Maintenance,Maintenance Tasks,维护任务
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +372,Please select Posting Date first,请选择发布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,开业日期应该是截止日期之前,
 DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
@@ -4347,14 +4373,15 @@
 DocType: GoCardless Mandate,ERPNext Integrations,ERPNext集成
 DocType: Crop Cycle,Detected Disease,检测到的疾病
 ,Produced,生产
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,还款开始日期不能在付款日期之前。
 DocType: Item,Item Code for Suppliers,对于供应商项目编号
 DocType: Issue,Raised By (Email),提出(电子邮件)
 DocType: Training Event,Trainer Name,讲师姓名
 DocType: Mode of Payment,General,一般
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +240,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +247,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
 apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,匹配付款与发票
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(职位)
@@ -4368,7 +4395,7 @@
 apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,启用/禁用货币。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +105,Dr {0} on Half day Leave on {1},{0}博士半天在{1}
 DocType: Production Plan,Get Material Request,获取材质要求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,邮政费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Postal Expenses,邮政费用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共(AMT)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 ,Item Variant Details,项目变体的详细信息
@@ -4379,9 +4406,9 @@
 DocType: Drug Prescription,Hour,小时
 DocType: Restaurant Order Entry,Last Sales Invoice,上次销售发票
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +793,Please select Qty against item {0},请选择项目{0}的数量
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库,仓库只能通过库存记录和采购收据设置。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库,仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +114,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +125,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +394,All these items have already been invoiced,这些品目都已开具发票
 DocType: Company,Monthly Sales Target,每月销售目标
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
@@ -4389,7 +4416,7 @@
 DocType: Item,Default Material Request Type,默认物料申请类型
 DocType: Supplier Scorecard,Evaluation Period,评估期
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +954,Work Order not created,工作订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,工作订单未创建
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: Purchase Invoice,Export Type,导出类型
 DocType: Salary Slip Loan,Salary Slip Loan,工资单贷款
@@ -4405,8 +4432,8 @@
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,打开发票摘要
 DocType: Education Settings,Education Manager,教育经理
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,每个工厂之间的最小长度为最佳的增长
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新,而是使用库存条目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +152,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新,而是使用库存条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新,而是使用库存条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新,而是使用库存条目
 DocType: Quality Inspection,Report Date,报告日期
 DocType: Student,Middle Name,中间名字
 DocType: C-Form,Invoices,发票
@@ -4439,20 +4466,21 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +220,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的,已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +880,Receipt,收据
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Receipt,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Group,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +381,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,表单视图
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,费用审批人必须在费用索赔中
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,本月和待活动总结
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",将用户添加到您的组织,而不是您自己。
 DocType: Customer Group,Customer Group Name,客户群组名称
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,还没有客户!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +473,No material request created,没有创建重要请求
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
+apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +491,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转,如果你还需要包括上一会计年度的资产负债叶本财年
@@ -4475,11 +4503,12 @@
 DocType: Vehicle,Chassis No,底盘无
 DocType: Payment Request,Initiated,已初始化
 DocType: Production Plan Item,Planned Start Date,计划开始日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +622,Please select a BOM,请选择一个物料清单
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,Please select a BOM,请选择一个物料清单
 DocType: Purchase Invoice,Availed ITC Integrated Tax,有效的ITC综合税收
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
+DocType: Bank Guarantee,Clauses and Conditions,条款和条件
 DocType: Serial No,Creation Document Type,创建文件类型
 DocType: Project Task,View Timesheet,查看时间表
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,结束日期必须大于开始日期
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
@@ -4493,9 +4522,10 @@
 DocType: Patient,Alcohol Current Use,酒精当前使用
 DocType: Student Admission Program,Student Admission Program,学生入学计划
 DocType: Payment Entry,Account Paid To,账户支付至
+DocType: Subscription Settings,Grace Period,宽限期
 DocType: Item Alternative,Alternative Item Name,替代项目名称
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +466,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +474,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",无法提交任何薪资单<br> \可能的原因: <br> \ 1.净工资小于0。 <br> \ 2.员工主数据中指定的公司电子邮件地址无效。 <br>
@@ -4505,7 +4535,6 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} 账户{1}对于{2}{3}的预算是{4}. 预期增加{5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',行{0}#账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,输出数量
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,并unchcked在禁用
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +41,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
@@ -4517,14 +4546,16 @@
 DocType: Complaint,Complaint,抱怨
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的休假
+apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,进行还款分录
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +9,All Departments,所有部门
 DocType: Patient,Alcohol Past Use,酒精过去使用
 DocType: Fertilizer Content,Fertilizer Content,肥料含量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +187,Cr,信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +193,Cr,信用
 DocType: Project Update,Problematic/Stuck,问题/卡住
 DocType: Tax Rule,Billing State,计费状态
 DocType: Share Transfer,Transfer,转让
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前,必须先取消工单{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +919,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +137,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -4548,10 +4579,11 @@
 DocType: Cheque Print Template,Message to show,信息显示
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,零售
 DocType: Student Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Product Bundle,产品包
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,无法从{0}开始获得分数。你需要有0到100的常规分数
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}:无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
+DocType: Subscription,Current Invoice Start Date,当前发票开始日期
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}:借方或贷方金额是必输的{2}
 DocType: GL Entry,Remarks,备注
@@ -4561,11 +4593,13 @@
 DocType: Task,Parent Task,父任务
 DocType: Journal Entry,Write Off Based On,核销基于
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使铅
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,打印和文具
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +809,Send Supplier Emails,发送电子邮件供应商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1},留下申请期之间不能在此日期范围内的时期。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +811,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1},留下申请期之间不能在此日期范围内的时期。
+DocType: Fiscal Year,Auto Created,自动创建
 DocType: Chapter Member,Leave Reason,离开原因
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,发票{0}不再存在
 DocType: Guardian Interest,Guardian Interest,卫利息
 DocType: Volunteer,Availability,可用性
 apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,设置POS发票的默认值
@@ -4574,14 +4608,13 @@
 DocType: Timesheet,Employee Detail,员工详细信息
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1电子邮件ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1电子邮件ID
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天,重复上月的天必须相等
 DocType: Lab Prescription,Test Code,测试代码
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,对网站的主页设置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},由于{1}的记分卡,{0}不允许使用RFQ
 DocType: Job Offer,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +82,Above,以上
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1489,Total Amount {0},总金额{0}
-apps/erpnext/erpnext/controllers/item_variant.py +306,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1490,Total Amount {0},总金额{0}
+apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},无效的属性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',请选择“所有评估组”以外的评估组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}:项目{1}需要费用中心
@@ -4592,7 +4625,7 @@
 DocType: Agriculture Analysis Criteria,Water Analysis,水分析
 DocType: Chapter,Region,区域
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +110,Negative Valuation Rate is not allowed,负评估价格是不允许的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,重新加载链接分析
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012,2012-13
@@ -4608,7 +4641,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,报废资产成本
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是品目{2}的必须项
 DocType: Vehicle,Policy No,政策:
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +686,Get Items from Product Bundle,从产品包获取物料
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +688,Get Items from Product Bundle,从产品包获取物料
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,分裂
@@ -4647,21 +4680,21 @@
 DocType: Supplier Scorecard Scoring Variable,Path,路径
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为总账,因为它有子项。
 DocType: Production Plan,Total Planned Qty,总计划数量
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,Opening Value,开度值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,开度值
 DocType: Salary Detail,Formula,式
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +48,Serial #,序列号
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,序列号
 DocType: Lab Test Template,Lab Test Template,实验室测试模板
-apps/erpnext/erpnext/setup/doctype/company/company.py +181,Sales Account,销售帐户
+apps/erpnext/erpnext/setup/doctype/company/company.py +182,Sales Account,销售帐户
 DocType: Purchase Invoice Item,Total Weight,总重量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,销售佣金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +95,Commission on Sales,销售佣金
 DocType: Job Offer Term,Value / Description,值/说明
-apps/erpnext/erpnext/controllers/accounts_controller.py +630,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:资产{1}无法提交,这已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +634,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}:资产{1}无法提交,这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐厅订单录入
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}#不等于{1}。不同的是{2}。
 DocType: Asset Maintenance Task,Assign To Name,分配到名称
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,娱乐费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Entertainment Expenses,娱乐费用
 DocType: Hub Settings,Enabled Users,已启用的用户
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +99,Make Material Request,制作材料要求
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开项目{0}
@@ -4674,24 +4707,24 @@
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,假期申请。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +164,Account with existing transaction can not be deleted,有交易的科目不能被删除
 DocType: Vehicle,Last Carbon Check,最后检查炭
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Legal Expenses,法律费用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +145,Please select quantity on row ,请选择行数量
 apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,打开销售和购买发票
 DocType: Purchase Invoice,Posting Time,发布时间
 DocType: Timesheet,% Amount Billed,(%)金额帐单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,电话费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Telephone Expenses,电话费
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Serial No {0},没有序列号为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +134,No Item with Serial No {0},没有序列号为{0}的品目
 DocType: Email Digest,Open Notifications,打开通知
 DocType: Payment Entry,Difference Amount (Company Currency),差异金额(公司币种)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,直接开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Direct Expenses,直接开支
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,差旅费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},在文档类型{0}中添加自定义字段订阅
-apps/erpnext/erpnext/controllers/accounts_controller.py +822,Account: {0} with currency: {1} can not be selected,帐号:{0}币种:{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +826,Account: {0} with currency: {1} can not be selected,帐号:{0}币种:{1}不能选择
 DocType: Purchase Receipt Item,Sample Quantity,样品数量
+DocType: Bank Guarantee,Name of Beneficiary,受益人姓名
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货估价/价格表单价/最近的原材料采购单价自动更新BOM成本。
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
@@ -4703,14 +4736,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +811,Return / Credit Note,退货/退款单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +826,Return / Credit Note,退货/退款单
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率,如果丢失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +124,Total Paid Amount,总支付金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,总支付金额
 DocType: GST Settings,B2C Limit,B2C限制
 DocType: Work Order Item,Transferred Qty,转让数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,规划
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Planning,规划
 DocType: Share Balance,Issued,发行
+DocType: Loan,Repayment Start Date,还款开始日期
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,学生活动
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供应商编号
 DocType: Payment Request,Payment Gateway Details,支付网关详情
@@ -4723,10 +4757,10 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",休假类型,比如调休,病假等
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +282,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +287,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
 DocType: Assessment Result,Student Name,学生姓名
 DocType: Brand,Item Manager,项目经理
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,应付职工薪酬
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Payroll Payable,应付职工薪酬
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 DocType: Plant Analysis,Collection Datetime,收集日期时间
 DocType: Work Order,Total Operating Cost,总营运成本
@@ -4736,9 +4770,9 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +47,User {0} does not exist,用户{0}不存在
 DocType: Payment Term,Day(s) after invoice date,发票日期后的天数
 DocType: Payment Schedule,Payment Schedule,付款时间表
-DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,缩写
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,付款记录已存在
+DocType: Subscription,Trial Period End Date,试用期结束日期
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许,因为{0}超出范围
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪资模板大师。
 apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,病理
@@ -4755,9 +4789,9 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
 ,Territory Target Variance Item Group-Wise,按物料组的区域目标差异
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,所有客户群组
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,All Customer Groups,所有客户群组
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累计
-apps/erpnext/erpnext/controllers/accounts_controller.py +783,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
+apps/erpnext/erpnext/controllers/accounts_controller.py +787,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +44,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率(公司货币)
@@ -4766,14 +4800,15 @@
 DocType: Lab Prescription,Test Created,测试已创建
 DocType: Healthcare Settings,Custom Signature in Print,自定义签名打印
 DocType: Account,Temporary,临时
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +114,Customer LPO No.,客户LPO号
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,客户LPO号
 DocType: Program,Courses,培训班
 DocType: Monthly Distribution Percentage,Percentage Allocation,核销百分比
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,秘书
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Secretary,秘书
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“,在词”字段不会在任何交易可见
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作将停止未来的结算。您确定要取消此订阅吗?
 DocType: Serial No,Distinct unit of an Item,品目的属性
 DocType: Supplier Scorecard Criteria,Criteria Name,标准名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1295,Please set Company,请设公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1299,Please set Company,请设公司
 DocType: Pricing Rule,Buying,采购
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病与肥料
 DocType: HR Settings,Employee Records to be created by,雇员记录创建于
@@ -4782,18 +4817,18 @@
 DocType: POS Profile,Apply Discount On,申请折扣
 DocType: Member,Membership Type,会员类型
 ,Reqd By Date,需求日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,债权人
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Creditors,债权人
 DocType: Assessment Plan,Assessment Name,评估名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +94,Show PDC in Print,在打印中显示PDC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +95,Show PDC in Print,在打印中显示PDC
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No is mandatory,行#{0}:序列号是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,项目特定的税项详情
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Job Offer,工作机会
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,机构缩写
 ,Item-wise Price List Rate,逐项价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
-apps/erpnext/erpnext/utilities/transaction_base.py +164,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
+apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +492,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
@@ -4811,7 +4846,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总差异
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用,系统将自动为库存创建会计分录。
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,佣金
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Attendance for employee {0} is already marked for this day,考勤员工{0}已标记为这一天
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +207,Attendance for employee {0} is already marked for this day,考勤员工{0}已标记为这一天
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",单位为分钟,通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
@@ -4822,6 +4857,7 @@
 DocType: Lab Test,Approved Date,批准日期
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +205,Atleast one warehouse is mandatory,必须选择至少一个仓库
+DocType: Subscriber,Subscriber Name,订户名称
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Update Tool,Replace,更换
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到产品。
@@ -4831,19 +4867,18 @@
 DocType: Request for Quotation Item,Project Name,项目名称
 DocType: Customer,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +288,Select interest income account in employee loan {0},在员工贷款{0}中选择利息收入帐户
 DocType: Work Order,Required Items,所需物品
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 DocType: Disease,Treatment Task,治疗任务
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得税资产
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得税资产
 DocType: BOM Item,BOM No,BOM编号
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Update Tool,The BOM which will be replaced,此物料清单将被替换
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,电子设备
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,电子设备
 DocType: Asset,Maintenance Required,需要维护
 DocType: Account,Debit,借方
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
@@ -4852,7 +4887,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,未付金额
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
-apps/erpnext/erpnext/controllers/accounts_controller.py +600,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:资产是必须的固定资产购买/销售
+apps/erpnext/erpnext/controllers/accounts_controller.py +604,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行#{0}:资产是必须的固定资产购买/销售
 DocType: Asset Maintenance Team,Maintenance Team Name,维护组名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则,则会应用优先级别。优先权是一个介于0到20的数字,默认值是零(或留空)。数字越大,意味着优先级别越高。
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,如果选择“机会来源”作为客户,则客户是强制性的
@@ -4862,19 +4897,17 @@
 apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,费用报销类型。
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
-DocType: Item,Taxes,税
+DocType: Subscription,Taxes,税
 DocType: Purchase Invoice,capital goods,资本货物
 DocType: Purchase Invoice Item,Weight Per Unit,每单位重量
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
-DocType: Bank Guarantee,End Date,结束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
 DocType: Budget,Budget Accounts,预算科目
 DocType: Employee,Internal Work History,内部工作经历
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,累计折旧额
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,私募股权投资
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,供应商记分卡变数
-DocType: Employee Loan,Fully Disbursed,全额支付
 DocType: Employee Advance,Due Advance Amount,到期金额
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
@@ -4898,7 +4931,7 @@
 ,Employee Information,雇员资料
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +48,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +918,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +920,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,评估结果记录{0}已经存在。
@@ -4906,7 +4939,6 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”,请设置公司过滤器空白
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,发布日期不能是未来的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +102,Row # {0}: Serial No {1} does not match with {2} {3},行#{0}:序列号{1}不相匹配{2} {3}
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,用于生成循环
 DocType: Stock Entry,Target Warehouse Address,目标仓库地址
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,事假
 DocType: Agriculture Task,End Day,结束的一天
@@ -4931,11 +4963,10 @@
 DocType: Material Request,% Ordered,%  已排序
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",对于基于课程的学生组,课程将从入学课程中的每个学生确认。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,计件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均买入价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均买入价
 DocType: Share Balance,From No,来自No
 DocType: Task,Actual Time (in Hours),实际时间(小时)
 DocType: Employee,History In Company,公司内历史
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,New Message from {sender},来自{sender}的新留言
 DocType: Customer,Customer Primary Address,客户主要地址
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
 DocType: Drug Prescription,Description/Strength,说明/力量
@@ -4944,22 +4975,22 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,同一项目已进入多次
 DocType: Department,Leave Block List,禁离日列表
 DocType: Purchase Invoice,Tax ID,税号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能,序列号必须留空
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能,序列号必须留空
 DocType: Accounts Settings,Accounts Settings,账户设置
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,批准
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +69,"Malformatted address for {0}, please fix to continue.",格式为{0}的地址格式,请修复以继续。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",格式为{0}的地址格式,请修复以继续。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",新帐号的数量,将作为前缀包含在帐号名称中
 DocType: Maintenance Team Member,Team Member,队员
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,没有结果提交
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
-DocType: Employee Loan,Rate of Interest (%) / Year,利息(%)/年的速率
+DocType: Loan,Rate of Interest (%) / Year,利息(%)/年的速率
 ,Project Quantity,工程量
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零,可能是你应该“基于分布式费用”改变
 DocType: Opportunity,To Discuss,为了讨论
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
 DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例(%)年
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,临时账户
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,黑
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Temporary Accounts,临时账户
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Shareholder,Contact List,联系人列表
 DocType: Account,Auditor,审计员
@@ -4967,16 +4998,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +132,{0} items produced,{0}物料已生产
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,学到更多
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
-apps/erpnext/erpnext/stock/get_item_details.py +367,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +370,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
 DocType: Pricing Rule,Disable,禁用
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Mode of payment is required to make a payment,付款方式需要进行付款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +183,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",在整页上编辑更多的选项,如资产,序列号,批次等。
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,预约和咨询
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未注册批次{2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃,因为它已经是{1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,Cheques Required,需要检查
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,需要检查
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销(通过费用报销)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,未能成立公司
@@ -4988,7 +5019,7 @@
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +204,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1080,Add items from,添加项目..
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1082,Add items from,添加项目..
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,作物和土地
 DocType: Cheque Print Template,Regular,定期
 DocType: Fertilizer,Density (if liquid),密度(如果液体)
@@ -5013,24 +5044,26 @@
 DocType: Payment Entry,Paid Amount,支付的金额
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索销售周期
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +869,Retention Stock Entry,保留股票入场
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +871,Retention Stock Entry,保留股票入场
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,项目变体
 ,Work Order Stock Report,工单库存报表
+DocType: Purchase Receipt,Auto Repeat Detail,自动重复细节
 DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +24,As Supervisor,作为主管
 apps/erpnext/erpnext/public/js/hub/hub_form.js +376,Suggest Category,建议类别
 DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
 apps/erpnext/erpnext/accounts/page/pos/pos.js +895,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方',不能设置为'贷方'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,质量管理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Quality Management,质量管理
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,物料{0}已被禁用
 DocType: Project,Total Billable Amount (via Timesheets),总计费用金额(通过时间表)
 DocType: Agriculture Task,Previous Business Day,前一个营业日
-DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
+DocType: Loan,Repay Fixed Amount per Period,偿还每期固定金额
 DocType: Employee,Health Insurance No,健康保险No
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +227,Credit Note Amt,信用证
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,信用证
+apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,应纳税总额
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Opening Invoice Creation Tool,Purchase,采购
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,余额数量
@@ -5041,16 +5074,18 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 DocType: Healthcare Settings,Valid number of days,有效天数
 apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,成本中心
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,重新启动订阅
 DocType: Land Unit,Linked Plant Analysis,链接的工厂分析
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:与排时序冲突{1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
+DocType: Bank Guarantee,Receiving,接收
 DocType: Training Event Employee,Invited,邀请
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
 apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,固定资产
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定资产
 DocType: Payment Entry,Set Exchange Gain / Loss,设置兑换收益/损失
 ,GST Purchase Register,消费税相关采购台账
 ,Cash Flow,现金流量表
@@ -5071,9 +5106,10 @@
 apps/erpnext/erpnext/config/accounts.py +471,List of all share transactions,所有股份交易清单
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +244,Please find attached {0} #{1},随函附上{0}#{1}
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,必须设置试用期开始日期和试用期结束日期
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均率
-apps/erpnext/erpnext/controllers/accounts_controller.py +730,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于大/圆
+apps/erpnext/erpnext/controllers/accounts_controller.py +734,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于大/圆
+DocType: Subscription Plan Detail,Plan,计划
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,银行对账单余额按总帐
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
@@ -5103,6 +5139,7 @@
 DocType: Work Order,Warehouses,仓库
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}资产不得转让
 DocType: Hotel Room Pricing,Hotel Room Pricing,酒店房间价格
+DocType: Subscription,Days Until Due,天至期限
 apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,此项目是{0}(模板)的变体。
 DocType: Workstation,per hour,每小时
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
@@ -5111,13 +5148,14 @@
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",对于基于批次的学生组,学生批次将由课程注册中的每位学生进行验证。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除,因为此仓库有库存分类账分录。
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,分配
+DocType: Journal Entry Account,Loan,贷款
 DocType: Expense Claim Advance,Expense Claim Advance,费用索赔预付款
 DocType: Lab Test,Report Preference,报告偏好
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,志愿者信息。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,项目经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Project Manager,项目经理
 ,Quoted Item Comparison,项目报价比较
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之间的得分重叠
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,净资产值作为
 DocType: Crop,Produce,生产
@@ -5127,7 +5165,7 @@
 DocType: Stock Entry,Material Consumption for Manufacture,材料消耗制造
 DocType: Item Alternative,Alternative Item Code,替代项目代码
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +990,Select Items to Manufacture,选择项目,以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,选择项目,以制造
 DocType: Delivery Stop,Delivery Stop,交付停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +963,"Master data syncing, it might take some time",主数据同步,这可能需要一些时间
 DocType: Item,Material Issue,发料
@@ -5137,15 +5175,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
 DocType: BOM,Show Items,显示项目
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +92,Do you want to notify all the customers by email?,你想通过电子邮件通知所有的客户?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,你想通过电子邮件通知所有的客户?
+DocType: Subscription Plan,Billing Interval,计费间隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,影视业
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,恢复
 DocType: Hub Settings,Hub Username,Hub用户名
 DocType: Salary Detail,Component,零件
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 DocType: Healthcare Settings,Patient Name By,病人姓名By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计日记帐分录
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计日记帐分录
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
@@ -5159,23 +5197,24 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里,你可以保持身高,体重,过敏,医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +231,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因为提交的仓储记录{0}已经存在
-DocType: Employee Loan,Disbursement Date,支付日期
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;收件人&#39;未指定
+DocType: Loan,Disbursement Date,支付日期
 DocType: BOM Update Tool,Update latest price in all BOMs,更新所有BOM的最新价格
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,医疗记录
 DocType: Vehicle,Vehicle,车辆
 DocType: Purchase Invoice,In Words,大写金额
+apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,在提交之前输入银行或贷款机构的名称。
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,必须提交{0}
 DocType: POS Profile,Item Groups,项目组
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +222,Today is {0}'s birthday!,今天是{0}的生日!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Today is {0}'s birthday!,今天是{0}的生日!
 DocType: Sales Order Item,For Production,对生产
 DocType: Payment Request,payment_url,payment_url
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +186,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开户账户
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开户账户
 DocType: Customer,Customer Primary Contact,客户主要联系人
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,期间结束日志
 DocType: Project Task,View Task,查看任务
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+DocType: Bank Guarantee,Bank Guarantee Type,银行担保类型
 DocType: Material Request,MREQ-,MREQ-
 DocType: Payment Schedule,Invoice Portion,发票部分
 ,Asset Depreciations and Balances,资产折旧和平衡
@@ -5186,9 +5225,8 @@
 DocType: Production Plan,Include Subcontracted Items,包括转包物料
 apps/erpnext/erpnext/projects/doctype/project/project.py +220,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +672,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,库存转换后不能更改Variant属性。你将不得不做一个新的项目来做到这一点。
-apps/erpnext/erpnext/stock/doctype/item/item.py +714,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
-DocType: Employee Loan,Repay from Salary,从工资偿还
+apps/erpnext/erpnext/stock/doctype/item/item.py +715,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+DocType: Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
 DocType: Salary Slip,Salary Slip,工资单
@@ -5212,11 +5250,11 @@
 DocType: Employee Education,Employee Education,雇员教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
 DocType: Land Unit,Parent Land Unit,家长土地单位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1114,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1112,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 DocType: Fertilizer,Fertilizer Name,肥料名称
 DocType: Salary Slip,Net Pay,净支付金额
 DocType: Cash Flow Mapping Accounts,Account,账户
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,序列号{0}已收到过
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +219,Serial No {0} has already been received,序列号{0}已收到过
 ,Requested Items To Be Transferred,要求要传输的项目
 DocType: Expense Claim,Vehicle Log,车辆登录
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),发烧(温度&gt; 38.5°C / 101.3°F或持续温度&gt; 38°C / 100.4°F)
@@ -5257,24 +5295,23 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论,值得一提的努力,应该在记录中。
 DocType: Asset Maintenance,Manufacturing User,生产用户
 DocType: Purchase Invoice,Raw Materials Supplied,供应的原料
-DocType: C-Form,Series,系列
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},价目表{0}的货币必须是{1}或{2}
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Soil Texture,Ternary Plot,三元剧情
 DocType: Item Group,Item Classification,项目分类
 DocType: Driver,License Number,许可证号
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,业务发展经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +132,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,发票患者登记
 DocType: Crop,Period,期
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,总帐
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},雇员{0}上离开{1}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Employee {0} on Leave on {1},雇员{0}上离开{1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看(销售)线索
 DocType: Program Enrollment Tool,New Program,新程序
 DocType: Item Attribute Value,Attribute Value,属性值
 ,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
 DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1070,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,请选择{0}第一
 DocType: Appointment Type,Physician,医师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1005,Batch {0} of Item {1} has expired.,物料{1}的批号{0} 已过期。
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,磋商
@@ -5282,15 +5319,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +187,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}({1})不能大于工单{3}中的计划数量({2})
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易后不能更改Variant属性。你将不得不做一个新的项目来做到这一点。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授权
 DocType: Physician,Charges,收费
 DocType: Production Plan,Get Items For Work Order,获取工作订单的物品
 DocType: Salary Detail,Default Amount,默认金额
 DocType: Lab Test Template,Descriptive,描述的
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +95,Warehouse not found in the system,仓库在系统中未找到
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,仓库在系统中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报告
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比%d天小。
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比%d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,为您的公司设定您想要实现的销售目标。
 ,Project wise Stock Tracking,项目明智的库存跟踪
@@ -5318,11 +5356,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,无法创建网站
 DocType: Soil Analysis,Mg/K,镁/ K
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +924,Retention Stock Entry already created or Sample Quantity not provided,已创建保留库存条目或未提供“样品数量”
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +926,Retention Stock Entry already created or Sample Quantity not provided,已创建保留库存条目或未提供“样品数量”
 DocType: Program,Program Abbreviation,计划缩写
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
-DocType: Bank Guarantee,Start Date,开始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
@@ -5337,11 +5374,12 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
 DocType: Purchase Invoice,04-Correction in Invoice,04-发票纠正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +963,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
 apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,变体详细信息报告
 DocType: Setup Progress Action,Setup Progress Action,设置进度动作
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,买价格表
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,买价格表
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,删除项目,如果收费并不适用于该项目
+apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,取消订阅
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,请选择维护状态为已完成或删除完成日期
 DocType: Supplier,Default Payment Terms Template,默认付款条款模板
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
@@ -5352,7 +5390,6 @@
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果积累了每月预算超出行动
-DocType: Subscription,Submit on creation,提交关于创建
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +483,Currency for {0} must be {1},货币{0}必须{1}
 DocType: Asset,Disposal Date,处置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工,如果他们没有假期。回复摘要将在午夜被发送。
@@ -5371,6 +5408,7 @@
 DocType: Batch,Parent Batch,父母批
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心表
+DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,在取消订阅或将订阅标记为未付之前,发票日期之后的天数已过
 DocType: Lab Test Template,Sample Collection,样品收集
 ,Requested Items To Be Ordered,要求项目要订购
 DocType: Price List,Price List Name,价格列表名称
@@ -5379,7 +5417,7 @@
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,发现错误!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Warning: Leave application contains following block dates,警告:申请的假期含有以下的禁离日
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +116,Warning: Leave application contains following block dates,警告:申请的假期含有以下的禁离日
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 DocType: Supplier Scorecard Scoring Criteria,Score,得分了
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,会计年度{0}不存在
@@ -5399,12 +5437,12 @@
 apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}应该是0到100之间的一个值
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +94,Next Depreciation Date cannot be before Available-for-use Date,下一个折旧日期不能在可供使用的日期之前
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,无担保贷款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,最大工作时间针对时间表
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +226,Total Paid Amt,数金额金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
 DocType: Purchase Receipt Item,Received and Accepted,收到并接受
 DocType: Hub Settings,Company and Seller Profile,公司和卖方简介
@@ -5418,10 +5456,9 @@
 DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 % 。这是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供应商
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,请更正
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失,因为已有销售订单。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,匿名
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +377,Received From,从......收到
 DocType: Lead,Converted,已转换
@@ -5435,6 +5472,7 @@
 DocType: Asset,Assets,资产
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
+DocType: Subscription,Current Invoice End Date,当前发票结束日期
 DocType: Payment Term,Due Date Based On,到期日基于
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,请在“销售设置”中设置默认客户组和领域
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not exist,{0} {1}不存在
@@ -5442,7 +5480,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,项目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +106,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未对帐/结清分录
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,没有为日记帐分录选择还款
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
+DocType: Loan,Disbursed,支付
 DocType: Healthcare Settings,Laboratory Settings,实验室设置
 DocType: Patient Appointment,Service Unit,服务单位
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,成功设置供应商
@@ -5455,12 +5495,12 @@
 DocType: Share Balance,No of Shares,股份数目
 apps/erpnext/erpnext/stock/doctype/item/item.py +448,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,选择状态
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能标记为未来的日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +42,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: School House,House Name,房名
 DocType: Fee Schedule,Total Amount per Student,学生总数
 DocType: Purchase Taxes and Charges,Account Head,账户抬头
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,电气
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Electrical,电气
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差(输出 - )
 DocType: Grant Application,Requested Amount,请求金额
@@ -5470,7 +5510,7 @@
 DocType: Crop Cycle,Detected Diseases,检测到的疾病
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Birthday Reminder for {0},{0}的生日提醒
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +215,Birthday Reminder for {0},{0}的生日提醒
 DocType: Asset Maintenance Task,Last Completion Date,最后完成日期
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
@@ -5478,9 +5518,10 @@
 DocType: GoCardless Settings,GoCardless Settings,GoCardless设置
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,库存资产
 DocType: Restaurant,Active Menu,活动菜单
 DocType: Target Detail,Target Qty,目标数量
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},反对贷款:{0}
 DocType: Shopping Cart Settings,Checkout Settings,结帐设置
 DocType: Student Attendance,Present,现
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送货单{0}不能提交
@@ -5489,9 +5530,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Production Plan Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +744,Item {0} is disabled,物料{0}已被禁用
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Item {0} is disabled,物料{0}已被禁用
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +930,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +932,BOM does not contain any stock item,BOM不包含任何库存项目
 DocType: Chapter,Chapter Head,章主管
 DocType: Payment Term,Month(s) after the end of the invoice month,发票月份结束后的月份
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,项目活动/任务。
@@ -5499,11 +5540,12 @@
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,实验结果日期时间不能在测试日期时间之前
 DocType: POS Profile,Allow user to edit Discount,允许用户编辑折扣
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +55,Get customers from,从中获取客户
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,从中获取客户
 DocType: Purchase Invoice Item,Include Exploded Items,包含爆炸物品
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: Shipping Rule,Restrict to Countries,限制到国家
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额(公司货币)
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
 DocType: Project,Total Sales Amount (via Sales Order),总销售额(通过销售订单)
@@ -5522,6 +5564,7 @@
 DocType: Soil Texture,Sandy Clay,桑迪粘土
 DocType: Grant Application,Assessment  Manager,评估经理
 DocType: Payment Entry,Allocate Payment Amount,分配付款金额
+DocType: Subscription Plan,Subscription Plan,订阅计划
 DocType: Employee External Work History,Salary,工资
 DocType: Serial No,Delivery Document Type,交货文档类型
 DocType: Sales Order,Partly Delivered,部分交付
@@ -5547,9 +5590,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +50,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安装预置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,No Delivery Note selected for Customer {},没有为客户{}选择送货单
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},没有为客户{}选择送货单
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM已替换
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select Items based on Delivery Date,根据交付日期选择项目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,根据交付日期选择项目
 DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗?
 ,Sales Analytics,销售分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},可用{0}
@@ -5568,7 +5611,7 @@
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房间预订
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,顾客服务
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Customer Service,顾客服务
 DocType: BOM,Thumbnail,缩略图
 DocType: Item Customer Detail,Item Customer Detail,项目客户详情
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,为求职者提供一份工作
@@ -5585,7 +5628,7 @@
 DocType: Fees,Student Details,学生细节
 DocType: Purchase Invoice Item,Stock Qty,库存数量
 DocType: Purchase Invoice Item,Stock Qty,库存数量
-DocType: Employee Loan,Repayment Period in Months,在月还款期
+DocType: Loan,Repayment Period in Months,在月还款期
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,错误:没有有效的身份证?
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
@@ -5594,7 +5637,7 @@
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
 DocType: Timesheet,Work Detail,工作细节
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,工程师
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Engineer,工程师
 DocType: Journal Entry,Total Amount Currency,总金额币种
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},行{0}中的项目编号是必须项
@@ -5640,13 +5683,12 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,捐助者类型信息。
 DocType: Request for Quotation,Supplier Detail,供应商详细
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},公式或条件错误:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +106,Invoiced Amount,已开票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,已开票金额
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,标准重量必须达100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,考勤
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,库存产品
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中,此列表将需要手动添加到部门。
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +111,Creating {0},创建{0}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目标仓库不能相同
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +628,Posting date and posting time is mandatory,发布日期和发布时间是必需的
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,采购业务的税项模板。
@@ -5670,14 +5712,14 @@
 DocType: Shipping Rule,Fixed,固定
 DocType: Vehicle Service,Clutch Plate,离合器压盘
 DocType: Company,Round Off Account,四舍五入账户
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,行政开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
-DocType: Journal Entry,Subscription,订阅
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Subscription,订阅
 DocType: Purchase Invoice,Contact Email,联络人电邮
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,费用创作待定
 DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +241,Notice Period,通知期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +242,Notice Period,通知期
 DocType: Asset Category,Asset Category Name,资产类别名称
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,这是一个root区域,无法被编辑。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新销售人员的姓名
@@ -5691,7 +5733,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量,请不要选中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量,请不要选中。
 DocType: Asset,Frequency of Depreciation (Months),折旧率(月)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Credit Account,信用账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +506,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
@@ -5699,7 +5741,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
 DocType: Hub Settings,Company Logo,公司标志
-apps/erpnext/erpnext/stock/doctype/item/item.py +709,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 DocType: Healthcare Settings,Patient Registration,病人登记
@@ -5734,11 +5776,10 @@
 DocType: Journal Entry,Total Debit,总借方金额
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +108,Please select Patient,请选择患者
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,销售人员
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,销售人员
 DocType: Hotel Room Package,Amenities,设施
 apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,预算和成本中心
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允许多种默认付款方式
-apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,为了
 ,Appointment Analytics,预约分析
 DocType: Vehicle Service,Half Yearly,半年度
 DocType: Lead,Blog Subscriber,博客订阅者
@@ -5755,6 +5796,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年制作学生团体,请留空
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选,工作日总数将包含假期,这将会降低“日工资”的值。
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",使用当前密钥的应用程序将无法访问,您确定吗?
+DocType: Subscription Settings,Prorate,按比例分配
 DocType: Purchase Invoice,Total Advance,总垫款
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,更改模板代码
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,该期限结束日期不能超过期限开始日期。请更正日期,然后再试一次。
@@ -5766,8 +5808,9 @@
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +173,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,设置为丧失
 DocType: Timesheet,Total Billable Hours,总计费时间
+DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,用户必须支付此订阅生成的发票的天数
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收据
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}:分配金额{1}必须小于或等于输入付款金额{2}
@@ -5786,12 +5829,12 @@
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1385,Select or add new customer,选择或添加新客户
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +173,Cost center is required to book an expense claim,成本中心需要预订费用报销
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
 DocType: Assessment Result,Summary,概要
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,出席人数
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +494,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +500,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,年度起始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
@@ -5803,7 +5846,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,购买金额
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供应商报价{0}创建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +103,End Year cannot be before Start Year,结束年份不能启动年前
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Employee Benefits,员工福利
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +235,Employee Benefits,员工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +264,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Work Order,Manufactured Qty,已生产数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +78,The shares don't exist with the {0},这些份额不存在{0}
@@ -5811,12 +5854,12 @@
 DocType: Asset,Out of Order,乱序
 DocType: Purchase Receipt Item,Accepted Quantity,已接受数量
 DocType: Projects Settings,Ignore Workstation Time Overlap,忽略工作站时间重叠
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +243,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
 apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}:{1}不存在
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,选择批号
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}:金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}:金额不能大于金额之前对报销{1}。待审核金额为{2}
 DocType: Patient Service Unit,Medical Administrator,医疗管理员
 DocType: Assessment Plan,Schedule,计划任务
 DocType: Account,Parent Account,父帐户
@@ -5846,15 +5889,16 @@
 DocType: Asset Repair,Repair Status,维修状态
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,请选择员工记录第一。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
 DocType: Purchase Invoice,input service,输入服务
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:往来单位/科目{1} / {2}与{3} {4}不匹配
 DocType: Maintenance Team Member,Maintenance Team Member,维护团队成员
 DocType: Agriculture Analysis Criteria,Soil Analysis,土壤分析
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,课程编号:
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,请输入您的费用帐户
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1095,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:参考文件类型必须是采购订单之一,购买发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行#{0}:参考文件类型必须是采购订单之一,购买发票或日记帐分录
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体,那么它的描述,图片,价格,税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
@@ -5903,19 +5947,19 @@
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",设置季节性的预算,目标等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,变量名
-apps/erpnext/erpnext/stock/get_item_details.py +144,"Item {0} is a template, please select one of its variants",物料{0}是一个模板,请选择它的一个变体
+apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",物料{0}是一个模板,请选择它的一个变体
 DocType: Asset,Asset Category,资产类别
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,净支付金额不能为负数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +885,Material to Supplier,材料到供应商
 DocType: Soil Texture,Loamy Sand,泥沙
 DocType: Production Plan,Material Request Planning,物料请求计划
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +676,Excise Invoice,消费税发票
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现%不止一次
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
 DocType: Employee Attendance Tool,Marked Attendance,显着的出席
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,流动负债
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Current Liabilities,流动负债
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,计时器超出了指定的小时数
 apps/erpnext/erpnext/config/selling.py +297,Send mass SMS to your contacts,向你的联系人群发短信。
 DocType: Patient,A Positive,积极的
@@ -5926,9 +5970,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +92,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡,而采购订单应谨慎提供给供应商。
 DocType: Asset Maintenance Team,Asset Maintenance Team,资产维护团队
-DocType: Employee Loan,Loan Type,贷款类型
+apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0}已成功提交
+DocType: Loan,Loan Type,贷款类型
 DocType: Scheduling Tool,Scheduling Tool,调度工具
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,信用卡
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +181,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的项目
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 DocType: Sales Invoice Item,Drop Ship,由供应商交货(直接发运)
@@ -5960,7 +6005,7 @@
 DocType: Item,Units of Measure,计量单位
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Invoice,Customer's Purchase Order Date,客户的采购订单日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Capital Stock,股本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Capital Stock,股本
 DocType: Shopping Cart Settings,Show Public Attachments,显示公共附件
 DocType: Packing Slip,Package Weight Details,包装重量详情
 DocType: Restaurant Reservation,Reservation Time,预订时间
@@ -5975,7 +6020,7 @@
 DocType: Purchase Order,To Receive and Bill,接收和比尔
 apps/erpnext/erpnext/controllers/buying_controller.py +461,Row #{0}: Reqd by Date cannot be before Transaction Date,行号{0}:按日期请求不能在交易日期之前
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色产品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,设计师
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +495,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
@@ -5985,20 +6030,20 @@
 DocType: Driver,Expiry Date,到期时间
 DocType: Healthcare Settings,Employee name and designation in print,打印出来显示的员工姓名和职位
 ,accounts-browser,账户浏览器
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,属性是相同的两个记录。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
 apps/erpnext/erpnext/controllers/status_updater.py +212,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货,库存设置或更新项目“津贴”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号,例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +431, (Half Day),(半天)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +440, (Half Day),(半天)
 DocType: Payment Term,Credit Days,信用期
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,请选择患者以获得实验室测试
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,让学生批
 DocType: Fee Schedule,FRQ.,FRQ。
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +841,Get Items from BOM,从物料清单获取物料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +843,Get Items from BOM,从物料清单获取物料
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +40,Lead Time Days,交货天数
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用
-apps/erpnext/erpnext/controllers/accounts_controller.py +621,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:过帐日期必须是相同的购买日期{1}资产的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +625,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:过帐日期必须是相同的购买日期{1}资产的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果学生住在学院的旅馆,请检查。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,请在上表中输入销售订单
 ,Stock Summary,库存摘要
@@ -6009,10 +6054,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: BOM Operation,Operating Cost(Company Currency),营业成本(公司货币)
-DocType: Employee Loan Application,Rate of Interest,利率
+DocType: Loan Application,Rate of Interest,利率
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: Item,Shelf Life In Days,保质期天数
 DocType: GL Entry,Is Opening,是否起始
+DocType: Department,Expense Approvers,费用审批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}:借记条目不能与连接的{1}
 DocType: Journal Entry,Subscription Section,认购科
 apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account {0} does not exist,科目{0}不存在
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index f9aac1c..617354d 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -78,7 +78,7 @@
  "icon": "fa fa-magic", 
  "idx": 1, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json
index ffd9a7f..d8f3146 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.json
+++ b/erpnext/utilities/doctype/sms_log/sms_log.json
@@ -256,7 +256,7 @@
  "icon": "fa fa-mobile-phone", 
  "idx": 1, 
  "in_create": 0, 
- "in_dialog": 0, 
+
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
index 6e4db1b..5563fb0 100644
--- a/erpnext/utilities/page/leaderboard/leaderboard.js
+++ b/erpnext/utilities/page/leaderboard/leaderboard.js
@@ -85,7 +85,7 @@
 
 		this.$sidebar_list.on('click', 'li', function(e) {
 			let $li = $(this);
-			let doctype = $li.find('span').html();
+			let doctype = $li.find('span').attr("doctype-value");
 
 			me.options.selected_company = frappe.defaults.get_default('company');
 			me.options.selected_doctype = doctype;
@@ -172,7 +172,7 @@
 			$container.find(".leaderboard-list").html(me.render_list_view(res.message));
 		} else {
 			me.$graph_area.hide();
-			me.message = "No items found.";
+			me.message = __("No items found.");
 			$container.find(".leaderboard-list").html(me.render_list_view());
 		}
 	},
@@ -301,7 +301,7 @@
 	get_sidebar_item: function(item) {
 		return $(`<li class="strong module-sidebar-item">
 			<a class="module-link">
-			<span>${ item }</span></a>
+			<span doctype-value="${item}">${ __(item) }</span></a>
 		</li>`);
 	}
 });
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 0c2b6c5..d3769a2 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -13,12 +13,6 @@
 class UOMMustBeIntegerError(frappe.ValidationError): pass
 
 class TransactionBase(StatusUpdater):
-	def load_notification_message(self):
-		dt = self.doctype.lower().replace(" ", "_")
-		if int(frappe.db.get_value("Notification Control", None, dt) or 0):
-			self.set("__notification_message",
-				frappe.db.get_value("Notification Control", None, dt + "_message"))
-
 	def validate_posting_time(self):
 		# set Edit Posting Date and Time to 1 while data import
 		if frappe.flags.in_import and self.posting_date:
diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py
index 5bd855f..0377a0a 100644
--- a/erpnext/utilities/user_progress_utils.py
+++ b/erpnext/utilities/user_progress_utils.py
@@ -63,7 +63,7 @@
 				doc = frappe.get_doc({
 					"doctype":"Supplier",
 					"supplier_name": supplier,
-					"supplier_type": _("Local"),
+					"supplier_group": _("Local"),
 					"company": defaults.get("company")
 				}).insert()
 
@@ -110,7 +110,10 @@
 					"is_stock_item": 1,
 					"item_group": _("Products"),
 					"stock_uom": _(args.get("item_uom_" + str(i))),
-					"default_warehouse": default_warehouse
+					"item_defaults": [{
+						"default_warehouse": default_warehouse,
+						"company": defaults.get("company_name")
+					}]
 				}).insert()
 
 			except frappe.NameError:
diff --git a/travis/bench_init.sh b/travis/bench_init.sh
index a8bb492..f96269b 100755
--- a/travis/bench_init.sh
+++ b/travis/bench_init.sh
@@ -4,5 +4,5 @@
 curl -I https://github.com/frappe/frappe/tree/$TRAVIS_BRANCH | head -n 1 | cut -d $' ' -f2 | (
 	read response;
 	[ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop';
-	bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch
+	bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch --python $(which python)
 )